solution: add create tx target validation

emeraldpay · Dec 28, 2023 · e2f003e · e2f003e
1 parent a5f9906
commit e2f003e
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 4 deletions.
diff --git a/packages/core/src/transaction/workflow/create-tx/CreateBitcoinTx.ts b/packages/core/src/transaction/workflow/create-tx/CreateBitcoinTx.ts
@@ -209,6 +209,10 @@ export class CreateBitcoinTx implements BitcoinTx {
     this.rebalance();
   }
 
+  get target(): TxTarget {
+    return this.tx.target;
+  }
+
   set target(target: TxTarget) {
     this.tx.target = target;
 
@@ -380,6 +384,10 @@ export class CreateBitcoinTx implements BitcoinTx {
       return ValidationResult.INSUFFICIENT_FUNDS;
     }
 
+    if (!this.validateTarget()) {
+      return ValidationResult.INCORRECT_TARGET_AMOUNT;
+    }
+
     return ValidationResult.OK;
   }
 
@@ -390,4 +398,21 @@ export class CreateBitcoinTx implements BitcoinTx {
 
     return sequence < MAX_SEQUENCE ? sequence + 1 : MAX_SEQUENCE;
   }
+
+  private validateTarget(): boolean {
+    const {
+      totalToSpend,
+      tx: { amount, target },
+    } = this;
+
+    if (target === TxTarget.SEND_ALL) {
+      if (amount == null) {
+        return false;
+      }
+
+      return totalToSpend.minus(this.getFees()).equals(amount);
+    }
+
+    return true;
+  }
 }
diff --git a/packages/core/src/transaction/workflow/create-tx/CreateErc20ApproveTx.ts b/packages/core/src/transaction/workflow/create-tx/CreateErc20ApproveTx.ts
@@ -265,6 +265,8 @@ export class CreateErc20ApproveTx implements Erc20ApproveTxDetails {
     this.totalBalance = totalBalance;
     this.totalTokenBalance = totalTokenBalance;
     this.type = iep1559 ? EthereumTransactionType.EIP1559 : EthereumTransactionType.LEGACY;
+
+    this.rebalance();
   }
 
   validate(): ValidationResult {

diff --git a/packages/core/src/transaction/workflow/create-tx/CreateErc20ConvertTx.ts b/packages/core/src/transaction/workflow/create-tx/CreateErc20ConvertTx.ts
@@ -277,6 +277,8 @@ export class CreateErc20ConvertTx implements Erc20ConvertTxDetails {
     this.totalBalance = totalBalance;
     this.totalTokenBalance = totalTokenBalance;
     this.type = iep1559 ? EthereumTransactionType.EIP1559 : EthereumTransactionType.LEGACY;
+
+    this.rebalance();
   }
 
   validate(): ValidationResult {
@@ -302,6 +304,28 @@ export class CreateErc20ConvertTx implements Erc20ConvertTxDetails {
       }
     }
 
+    if (!this.validateTarget()) {
+      return ValidationResult.INCORRECT_TARGET_AMOUNT;
+    }
+
     return ValidationResult.OK;
   }
+
+  validateTarget(): boolean {
+    const { amount, asset, target, token, totalBalance, totalTokenBalance } = this;
+
+    if (target === TxTarget.SEND_ALL) {
+      if (totalBalance == null || totalTokenBalance == null) {
+        return false;
+      }
+
+      if (asset.toLowerCase() === token.address.toLowerCase()) {
+        return amount.equals(totalTokenBalance);
+      } else {
+        return amount.plus(this.getFees()).equals(totalBalance);
+      }
+    }
+
+    return true;
+  }
 }
diff --git a/packages/core/src/transaction/workflow/create-tx/CreateErc20Tx.ts b/packages/core/src/transaction/workflow/create-tx/CreateErc20Tx.ts
@@ -256,9 +256,25 @@ export class CreateErc20Tx implements Erc20TxDetails, EthereumTx<BigAmount> {
       return ValidationResult.INSUFFICIENT_FUNDS;
     }
 
+    if (!this.validateTarget()) {
+      return ValidationResult.INCORRECT_TARGET_AMOUNT;
+    }
+
     return ValidationResult.OK;
   }
 
+  public validateTarget(): boolean {
+    if (this.target === TxTarget.SEND_ALL) {
+      if (this.totalTokenBalance == null) {
+        return false;
+      }
+
+      return this.getTotal().equals(this.totalTokenBalance);
+    }
+
+    return true;
+  }
+
   public rebalance(): boolean {
     if (this.target === TxTarget.SEND_ALL) {
       if (this.totalTokenBalance == null) {

diff --git a/packages/core/src/transaction/workflow/create-tx/CreateEtherTx.spec.ts b/packages/core/src/transaction/workflow/create-tx/CreateEtherTx.spec.ts
@@ -1,7 +1,7 @@
 import { Wei } from '@emeraldpay/bigamount-crypto';
 import BigNumber from 'bignumber.js';
 import { BlockchainCode } from '../../../blockchains';
-import { EthereumPlainTx, TxMetaType, TxTarget, ValidationResult } from '../types';
+import { EthereumBasicPlainTx, TxMetaType, TxTarget, ValidationResult } from '../types';
 import { CreateEtherTx } from './CreateEtherTx';
 
 describe('CreateEthereumTx', () => {
@@ -298,7 +298,7 @@ describe('CreateEthereumTx', () => {
   });
 
   it('reads from dumps', () => {
-    const dump: EthereumPlainTx = {
+    const dump: EthereumBasicPlainTx = {
       amount: '999580000000500002/WEI',
       asset: 'ETH',
       blockchain: BlockchainCode.ETH,
@@ -326,7 +326,7 @@ describe('CreateEthereumTx', () => {
   });
 
   it('reads from dumps, manual tx', () => {
-    const dump: EthereumPlainTx = {
+    const dump: EthereumBasicPlainTx = {
       amount: '999580000000500002/WEI',
       asset: 'ETH',
       blockchain: BlockchainCode.ETH,

diff --git a/packages/core/src/transaction/workflow/create-tx/CreateEtherTx.ts b/packages/core/src/transaction/workflow/create-tx/CreateEtherTx.ts
@@ -205,6 +205,10 @@ export class CreateEtherTx implements TxDetails, EthereumTx<WeiAny> {
       return ValidationResult.INSUFFICIENT_FUNDS;
     }
 
+    if (!this.validateTarget()) {
+      return ValidationResult.INCORRECT_TARGET_AMOUNT;
+    }
+
     return ValidationResult.OK;
   }
 

diff --git a/packages/core/src/transaction/workflow/types.ts b/packages/core/src/transaction/workflow/types.ts
@@ -23,7 +23,7 @@ export enum TxMetaType {
 }
 
 export enum ValidationResult {
-  INSUFFICIENT_FEE_PRICE,
+  INCORRECT_TARGET_AMOUNT,
   INSUFFICIENT_FUNDS,
   INSUFFICIENT_TOKEN_FUNDS,
   NO_CHANGE_ADDRESS,