Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

solution: new ui for bitcoin cancel tx #1345

Merged
merged 1 commit into from
Nov 23, 2023
Merged

solution: new ui for bitcoin cancel tx #1345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/core/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import * as blockchains from './blockchains';
import * as config from './config';
import * as workflow from './transaction/workflow';
import * as utils from './utils';
import * as workflow from './workflow';

export * as PersistentState from './persistentState';
export { BackendApi } from './BackendApi';
Expand Down
71 changes: 36 additions & 35 deletions ...re/src/workflow/CreateTxConverter.spec.ts → ...rc/transaction/workflow/TxBuilder.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import { BigAmount } from '@emeraldpay/bigamount';
import { Satoshi, Wei } from '@emeraldpay/bigamount-crypto';
import { BitcoinEntry, EthereumEntry } from '@emeraldpay/emerald-vault-core';
import { InputUtxo, TokenData, TokenRegistry, amountFactory, blockchainIdToCode } from '../blockchains';
import { DEFAULT_GAS_LIMIT, EthereumTransactionType } from '../transaction/ethereum';
import { DEFAULT_VKB_FEE } from './CreateBitcoinTx';
import { CreateTxConverter, FeeRange } from './CreateTxConverter';
import { TxTarget, isBitcoinCreateTx, isErc20CreateTx, isEthereumCreateTx } from './types';

describe('CreateTxConverter', () => {
import { InputUtxo, TokenData, TokenRegistry, amountFactory, blockchainIdToCode } from '../../blockchains';
import { DEFAULT_GAS_LIMIT, EthereumTransactionType } from '../ethereum';
import { DEFAULT_VKB_FEE } from './create-tx/CreateBitcoinTx';
import { isAnyBitcoinCreateTx, isErc20CreateTx, isEthereumCreateTx } from './create-tx/types';
import { TxBuilder } from './TxBuilder';
import { FeeRange, TxTarget } from './types';

describe('TxBuilder', () => {
const tokenData: TokenData = {
name: 'Wrapped Ether',
blockchain: 100,
Expand Down Expand Up @@ -173,7 +174,7 @@ describe('CreateTxConverter', () => {
}

it('create initial BTC tx', () => {
const { createTx } = new CreateTxConverter(
const { createTx } = new TxBuilder(
{
feeRange: ethFeeRange,
asset: 'BTC',
Expand All @@ -186,7 +187,7 @@ describe('CreateTxConverter', () => {
tokenRegistry,
);

const isCorrectCreateTx = isBitcoinCreateTx(createTx);
const isCorrectCreateTx = isAnyBitcoinCreateTx(createTx);

expect(isCorrectCreateTx).toBeTruthy();

Expand All @@ -202,7 +203,7 @@ describe('CreateTxConverter', () => {
});

it('create initial ETH tx', () => {
const { createTx } = new CreateTxConverter(
const { createTx } = new TxBuilder(
{
feeRange: ethFeeRange,
asset: 'ETH',
Expand Down Expand Up @@ -235,7 +236,7 @@ describe('CreateTxConverter', () => {
});

it('create initial ERC20 tx', () => {
const { createTx } = new CreateTxConverter(
const { createTx } = new TxBuilder(
{
feeRange: ethFeeRange,
asset: tokenData.address,
Expand Down Expand Up @@ -273,7 +274,7 @@ describe('CreateTxConverter', () => {
});

it('create initial ETC tx', () => {
const { createTx } = new CreateTxConverter(
const { createTx } = new TxBuilder(
{
feeRange: ethFeeRange,
asset: 'ETC',
Expand Down Expand Up @@ -306,7 +307,7 @@ describe('CreateTxConverter', () => {
});

it('create initial ERC20 tx with allowance', () => {
const { createTx } = new CreateTxConverter(
const { createTx } = new TxBuilder(
{
feeRange: ethFeeRange,
ownerAddress: ethOwnerAddress,
Expand Down Expand Up @@ -346,7 +347,7 @@ describe('CreateTxConverter', () => {
});

it('change asset from ETH to ERC20 token', () => {
const { createTx: ethCreateTx } = new CreateTxConverter(
const { createTx: ethCreateTx } = new TxBuilder(
{
feeRange: ethFeeRange,
asset: 'ETH',
Expand All @@ -367,7 +368,7 @@ describe('CreateTxConverter', () => {
ethCreateTx.amount = new Wei(1);
ethCreateTx.to = ethToAddress;

const { createTx: erc20CreateTx } = new CreateTxConverter(
const { createTx: erc20CreateTx } = new TxBuilder(
{
feeRange: ethFeeRange,
asset: tokenData.address,
Expand Down Expand Up @@ -408,7 +409,7 @@ describe('CreateTxConverter', () => {
});

it('change asset from ETH to ERC20 token with max amount', () => {
const { createTx: ethCreateTx } = new CreateTxConverter(
const { createTx: ethCreateTx } = new TxBuilder(
{
feeRange: ethFeeRange,
asset: 'ETH',
Expand All @@ -431,7 +432,7 @@ describe('CreateTxConverter', () => {
ethCreateTx.target = TxTarget.SEND_ALL;
ethCreateTx.rebalance();

const { createTx: erc20CreateTx } = new CreateTxConverter(
const { createTx: erc20CreateTx } = new TxBuilder(
{
feeRange: ethFeeRange,
asset: tokenData.address,
Expand Down Expand Up @@ -472,7 +473,7 @@ describe('CreateTxConverter', () => {
});

it('change asset from ERC20 token to ETH with max amount', () => {
const { createTx: erc20CreateTx } = new CreateTxConverter(
const { createTx: erc20CreateTx } = new TxBuilder(
{
feeRange: ethFeeRange,
asset: tokenData.address,
Expand All @@ -495,7 +496,7 @@ describe('CreateTxConverter', () => {
erc20CreateTx.target = TxTarget.SEND_ALL;
erc20CreateTx.rebalance();

const { createTx: ethCreateTx } = new CreateTxConverter(
const { createTx: ethCreateTx } = new TxBuilder(
{
feeRange: ethFeeRange,
asset: 'ETH',
Expand Down Expand Up @@ -535,7 +536,7 @@ describe('CreateTxConverter', () => {
});

it('change entry from BTC to ETH', () => {
const { createTx: btcCreateTx } = new CreateTxConverter(
const { createTx: btcCreateTx } = new TxBuilder(
{
asset: 'BTC',
entry: btcEntry,
Expand All @@ -548,15 +549,15 @@ describe('CreateTxConverter', () => {
tokenRegistry,
);

const isCorrectCreateTx = isBitcoinCreateTx(btcCreateTx);
const isCorrectCreateTx = isAnyBitcoinCreateTx(btcCreateTx);

expect(isCorrectCreateTx).toBeTruthy();

if (isCorrectCreateTx) {
btcCreateTx.amount = new Satoshi(1);
btcCreateTx.to = btcToAddress;

const { createTx: ethCreateTx } = new CreateTxConverter(
const { createTx: ethCreateTx } = new TxBuilder(
{
feeRange: ethFeeRange,
asset: 'ETH',
Expand Down Expand Up @@ -592,7 +593,7 @@ describe('CreateTxConverter', () => {
});

it('change entry from ETH to BTC', () => {
const { createTx: ethCreateTx } = new CreateTxConverter(
const { createTx: ethCreateTx } = new TxBuilder(
{
feeRange: ethFeeRange,
asset: 'ETH',
Expand All @@ -613,7 +614,7 @@ describe('CreateTxConverter', () => {
ethCreateTx.amount = new Wei(1);
ethCreateTx.to = ethToAddress;

const { createTx: btcCreateTx } = new CreateTxConverter(
const { createTx: btcCreateTx } = new TxBuilder(
{
asset: 'BTC',
entry: btcEntry,
Expand All @@ -627,7 +628,7 @@ describe('CreateTxConverter', () => {
tokenRegistry,
);

const isConvertedCreateTx = isBitcoinCreateTx(btcCreateTx);
const isConvertedCreateTx = isAnyBitcoinCreateTx(btcCreateTx);

expect(isConvertedCreateTx).toBeTruthy();

Expand All @@ -645,7 +646,7 @@ describe('CreateTxConverter', () => {
});

it('change entry from ETH to ETC', () => {
const { createTx: ethCreateTx } = new CreateTxConverter(
const { createTx: ethCreateTx } = new TxBuilder(
{
asset: 'ETH',
entry: ethEntry1,
Expand All @@ -666,7 +667,7 @@ describe('CreateTxConverter', () => {
ethCreateTx.amount = new Wei(1);
ethCreateTx.to = ethToAddress;

const { createTx: etcCreateTx } = new CreateTxConverter(
const { createTx: etcCreateTx } = new TxBuilder(
{
feeRange: ethFeeRange,
asset: 'ETC',
Expand Down Expand Up @@ -702,7 +703,7 @@ describe('CreateTxConverter', () => {
});

it('change entry from ETH to other ETH', () => {
const { createTx: eth1CreateTx } = new CreateTxConverter(
const { createTx: eth1CreateTx } = new TxBuilder(
{
asset: 'ETH',
entry: ethEntry1,
Expand All @@ -723,7 +724,7 @@ describe('CreateTxConverter', () => {
eth1CreateTx.amount = new Wei(1);
eth1CreateTx.to = ethToAddress;

const { createTx: eth2CreateTx } = new CreateTxConverter(
const { createTx: eth2CreateTx } = new TxBuilder(
{
feeRange: ethFeeRange,
asset: 'ETH',
Expand Down Expand Up @@ -759,7 +760,7 @@ describe('CreateTxConverter', () => {
});

it('restore ETH tx', () => {
const { createTx: ethCreateTx } = new CreateTxConverter(
const { createTx: ethCreateTx } = new TxBuilder(
{
feeRange: ethFeeRange,
asset: 'ETH',
Expand All @@ -782,7 +783,7 @@ describe('CreateTxConverter', () => {
ethCreateTx.target = TxTarget.SEND_ALL;
ethCreateTx.rebalance();

const { createTx: restoredEthCreateTx } = new CreateTxConverter(
const { createTx: restoredEthCreateTx } = new TxBuilder(
{
feeRange: ethFeeRange,
asset: 'ETH',
Expand Down Expand Up @@ -820,7 +821,7 @@ describe('CreateTxConverter', () => {
});

it('restore ERC20 tx', () => {
const { createTx: erc20CreateTx } = new CreateTxConverter(
const { createTx: erc20CreateTx } = new TxBuilder(
{
feeRange: ethFeeRange,
asset: tokenData.address,
Expand All @@ -843,7 +844,7 @@ describe('CreateTxConverter', () => {
erc20CreateTx.target = TxTarget.SEND_ALL;
erc20CreateTx.rebalance();

const { createTx: restoredErc20CreateTx } = new CreateTxConverter(
const { createTx: restoredErc20CreateTx } = new TxBuilder(
{
feeRange: ethFeeRange,
asset: tokenData.address,
Expand Down Expand Up @@ -884,7 +885,7 @@ describe('CreateTxConverter', () => {
});

it('restore ERC20 tx with allowance', () => {
const { createTx: erc20CreateTx } = new CreateTxConverter(
const { createTx: erc20CreateTx } = new TxBuilder(
{
feeRange: ethFeeRange,
asset: tokenData.address,
Expand All @@ -907,7 +908,7 @@ describe('CreateTxConverter', () => {
erc20CreateTx.target = TxTarget.SEND_ALL;
erc20CreateTx.rebalance();

const { createTx: restoredErc20CreateTx } = new CreateTxConverter(
const { createTx: restoredErc20CreateTx } = new TxBuilder(
{
feeRange: ethFeeRange,
ownerAddress: ethOwnerAddress,
Expand Down
Loading
Loading