add allowance check

seanrulez · Jun 27, 2024 · ad54b08 · ad54b08
1 parent c072586
commit ad54b08
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/packages/bitcore-wallet-service/src/lib/chain/eth/index.ts b/packages/bitcore-wallet-service/src/lib/chain/eth/index.ts
@@ -414,7 +414,7 @@ export class EthChain implements IChain {
         const txpTotalAmount =
           (opts.multisigContractAddress || opts.tokenAddress) && txp.payProUrl
             ? getInvoiceValue(txp)
-            : txp.getTotalAmount(opts);
+            : txp.getTotalAmount();
 
         if (totalAmount < txpTotalAmount) {
           return cb(Errors.INSUFFICIENT_FUNDS);

diff --git a/packages/bitcore-wallet-service/src/lib/model/txproposal.ts b/packages/bitcore-wallet-service/src/lib/model/txproposal.ts
@@ -367,7 +367,7 @@ export class TxProposal {
    * @return {Number} total amount of all outputs excluding change output
    */
   getTotalAmount() {
-    return _.sumBy(this.outputs, 'amount');
+    return Number((this.outputs || []).reduce((total, o) => total += BigInt(o.amount), 0n));
   }
 
   /**

diff --git a/packages/bitcore-wallet-service/src/lib/server.ts b/packages/bitcore-wallet-service/src/lib/server.ts
@@ -2558,7 +2558,7 @@ export class WalletService implements IWalletService {
                   return next();
                 },
                 async next => {
-                  if (_.isNumber(opts.fee) && !_.isEmpty(opts.inputs)) return next();
+                  if (!isNaN(opts.fee) && (opts.inputs || []).length > 0) return next();
                   try {
                     ({ feePerKb, gasPrice, maxGasFee, priorityGasFee, gasLimit, fee } = await ChainService.getFee(this, wallet, opts));
                   } catch (error) {
@@ -2677,6 +2677,25 @@ export class WalletService implements IWalletService {
                   if (opts.dryRun) return next();
                   this._store(wallet, txp.escrowAddress, next, true);
                 },
+                next => {
+                  if (!txp.multiSendContractAddress || !txp.tokenAddress) {
+                    return next(); 
+                  }
+                  // Check that the multisend contract is approved in the token contract for the total amount
+                  const bc = this._getBlockchainExplorer(wallet.chain, wallet.network);
+                  if (!bc) return cb(new Error('Could not get blockchain explorer instance'));
+                  bc.getTokenAllowance({
+                    tokenAddress: txp.tokenAddress,
+                    ownerAddress: txp.from,
+                    spenderAddress: txp.multiSendContractAddress
+                  }, (err, allowance) => {
+                    if (err) { return next(err); }
+                    if (BigInt(allowance) < BigInt(txp.getTotalAmount())) {
+                      return next(new Error(`Insufficient token allowance. Allowed: ${BigInt(allowance)}, Want: ${BigInt(txp.getTotalAmount())}`));
+                    }
+                    return next();
+                  });
+                },
                 next => {
                   if (!changeAddress || wallet.singleAddress || opts.dryRun || opts.changeAddress) return next();
 
@@ -4093,7 +4112,7 @@ export class WalletService implements IWalletService {
     );
   }
 
-  getTxHistoryV8(bc, wallet, opts, skip, limit, cb) {
+  getTxHistoryV8(bc: V8, wallet, opts, skip, limit, cb) {
     let bcHeight,
       bcHash,
       sinceTx,

diff --git a/packages/bitcore-wallet-service/tsconfig.json b/packages/bitcore-wallet-service/tsconfig.json
@@ -3,7 +3,8 @@
     "lib": [
       "es5",
       "es6",
-      "es2017"
+      "es2017",
+      "es2020"
     ],
     "noImplicitAny": false,
     "removeComments": true,
@@ -14,7 +15,7 @@
     "experimentalDecorators": true,
     "moduleResolution": "node",
     "esModuleInterop": true,
-    "target": "es5",
+    "target": "ES2020",
     "typeRoots": [
       "./node_modules/@types"
     ],