Merge branch 'master' into WP-7080-address-verification-icp

Author: danielzhao122

modules/abstract-cosmos/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [11.15.17](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2025-12-05)
+
+**Note:** Version bump only for package @bitgo/abstract-cosmos
+
+
+
+
+
+## [11.15.16](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2025-12-04)
+
+**Note:** Version bump only for package @bitgo/abstract-cosmos
+
+
+
+
+
 ## [11.15.15](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2025-11-26)
 
 **Note:** Version bump only for package @bitgo/abstract-cosmos

modules/abstract-cosmos/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bitgo/abstract-cosmos",
-  "version": "11.15.15",
+  "version": "11.15.17",
   "description": "BitGo SDK coin library for COSMOS base implementation",
   "main": "./dist/src/index.js",
   "types": "./dist/src/index.d.ts",
@@ -38,10 +38,10 @@
     ]
   },
   "dependencies": {
-    "@bitgo/sdk-core": "^36.22.0",
+    "@bitgo/sdk-core": "^36.23.1",
     "@bitgo/sdk-lib-mpc": "^10.8.1",
     "@bitgo/secp256k1": "^1.7.0",
-    "@bitgo/statics": "^58.15.0",
+    "@bitgo/statics": "^58.16.1",
     "@cosmjs/amino": "^0.29.5",
     "@cosmjs/crypto": "^0.30.1",
     "@cosmjs/encoding": "^0.29.5",

modules/abstract-eth/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [24.19.1](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2025-12-05)
+
+**Note:** Version bump only for package @bitgo/abstract-eth
+
+
+
+
+
+# [24.19.0](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2025-12-04)
+
+
+### Bug Fixes
+
+* **abstract-eth:** fix TSS consolidation verification for ETH wallets ([45f4f53](https://github.com/BitGo/BitGoJS/commit/45f4f530e836de35fda1c3201a113b786628de13))
+
+
+### Features
+
+* add tx explanation for TxIntentMismatch errors ([feed271](https://github.com/BitGo/BitGoJS/commit/feed271ec7ae1ae099adf3eb100a532b12d03228))
+
+
+
+
+
 # [24.18.0](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2025-11-26)
 
 

modules/abstract-eth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bitgo/abstract-eth",
-  "version": "24.18.0",
+  "version": "24.19.1",
   "description": "BitGo SDK coin library for ETH base implementation",
   "main": "./dist/src/index.js",
   "types": "./dist/src/index.d.ts",
@@ -40,10 +40,10 @@
     ]
   },
   "dependencies": {
-    "@bitgo/sdk-core": "^36.22.0",
+    "@bitgo/sdk-core": "^36.23.1",
     "@bitgo/sdk-lib-mpc": "^10.8.1",
     "@bitgo/secp256k1": "^1.7.0",
-    "@bitgo/statics": "^58.15.0",
+    "@bitgo/statics": "^58.16.1",
     "@ethereumjs/common": "^2.6.5",
     "@ethereumjs/rlp": "^4.0.0",
     "@ethereumjs/tx": "^3.3.0",
@@ -60,8 +60,8 @@
     "superagent": "^9.0.1"
   },
   "devDependencies": {
-    "@bitgo/sdk-api": "^1.71.7",
-    "@bitgo/sdk-test": "^9.1.15",
+    "@bitgo/sdk-api": "^1.71.9",
+    "@bitgo/sdk-test": "^9.1.17",
     "@types/keccak": "^3.0.5"
   },
   "gitHead": "18e460ddf02de2dbf13c2aa243478188fb539f0c",

modules/abstract-eth/src/abstractEthLikeNewCoins.ts

@@ -3031,6 +3031,34 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
     return txPrebuild.coin === nativeCoin;
   }
 
+  /**
+   * Generate transaction explanation for error reporting
+   * @param txPrebuild - Transaction prebuild containing txHex and fee info
+   * @returns Stringified JSON explanation
+   */
+  private async getTxExplanation(txPrebuild?: TransactionPrebuild): Promise<string | undefined> {
+    if (!txPrebuild?.txHex || !txPrebuild?.gasPrice) {
+      return undefined;
+    }
+
+    try {
+      const explanation = await this.explainTransaction({
+        txHex: txPrebuild.txHex,
+        feeInfo: {
+          fee: txPrebuild.gasPrice.toString(),
+        },
+      });
+      return JSON.stringify(explanation, null, 2);
+    } catch (e) {
+      const errorDetails = {
+        error: 'Failed to parse transaction explanation',
+        txHex: txPrebuild.txHex,
+        details: e instanceof Error ? e.message : String(e),
+      };
+      return JSON.stringify(errorDetails, null, 2);
+    }
+  }
+
   /**
    * Verify if a tss transaction is valid
    *
@@ -3045,15 +3073,25 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
     const { txParams, txPrebuild, wallet } = params;
 
     // Helper to throw TxIntentMismatchRecipientError with recipient details
-    const throwRecipientMismatch = (message: string, mismatchedRecipients: Recipient[]): never => {
-      throw new TxIntentMismatchRecipientError(message, undefined, [txParams], txPrebuild?.txHex, mismatchedRecipients);
+    const throwRecipientMismatch = async (message: string, mismatchedRecipients: Recipient[]): Promise<never> => {
+      const txExplanation = await this.getTxExplanation(txPrebuild);
+      throw new TxIntentMismatchRecipientError(
+        message,
+        undefined,
+        [txParams],
+        txPrebuild?.txHex,
+        mismatchedRecipients,
+        txExplanation
+      );
     };
 
     if (
       !txParams?.recipients &&
       !(
         txParams.prebuildTx?.consolidateId ||
-        (txParams.type && ['acceleration', 'fillNonce', 'transferToken', 'tokenApproval'].includes(txParams.type))
+        txPrebuild?.consolidateId ||
+        (txParams.type &&
+          ['acceleration', 'fillNonce', 'transferToken', 'tokenApproval', 'consolidate'].includes(txParams.type))
       )
     ) {
       throw new Error('missing txParams');
@@ -3077,12 +3115,13 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
         const txJson = tx.toJson();
         if (txJson.data === '0x') {
           if (expectedAmount !== txJson.value) {
-            throwRecipientMismatch('the transaction amount in txPrebuild does not match the value given by client', [
-              { address: txJson.to, amount: txJson.value },
-            ]);
+            await throwRecipientMismatch(
+              'the transaction amount in txPrebuild does not match the value given by client',
+              [{ address: txJson.to, amount: txJson.value }]
+            );
           }
           if (expectedDestination.toLowerCase() !== txJson.to.toLowerCase()) {
-            throwRecipientMismatch('destination address does not match with the recipient address', [
+            await throwRecipientMismatch('destination address does not match with the recipient address', [
               { address: txJson.to, amount: txJson.value },
             ]);
           }
@@ -3112,20 +3151,50 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
           }
 
           if (expectedTokenAmount !== amount.toString()) {
-            throwRecipientMismatch('the transaction amount in txPrebuild does not match the value given by client', [
-              { address: addHexPrefix(recipientAddress.toString()), amount: amount.toString() },
-            ]);
+            await throwRecipientMismatch(
+              'the transaction amount in txPrebuild does not match the value given by client',
+              [{ address: addHexPrefix(recipientAddress.toString()), amount: amount.toString() }]
+            );
           }
 
           if (expectedRecipientAddress !== addHexPrefix(recipientAddress.toString()).toLowerCase()) {
-            throwRecipientMismatch('destination address does not match with the recipient address', [
+            await throwRecipientMismatch('destination address does not match with the recipient address', [
               { address: addHexPrefix(recipientAddress.toString()), amount: amount.toString() },
             ]);
           }
         }
       }
     }
 
+    // Verify consolidation transactions send to base address
+    if (params.verification?.consolidationToBaseAddress) {
+      const coinSpecific = wallet.coinSpecific();
+      if (!coinSpecific || !coinSpecific.baseAddress) {
+        throw new Error('Unable to determine base address for consolidation');
+      }
+      const baseAddress = coinSpecific.baseAddress;
+
+      if (!txPrebuild.txHex) {
+        throw new Error('missing txHex in txPrebuild');
+      }
+
+      const txBuilder = this.getTransactionBuilder();
+      txBuilder.from(txPrebuild.txHex);
+      const tx = await txBuilder.build();
+      const txJson = tx.toJson();
+
+      // Verify the transaction recipient matches the base address
+      if (!txJson.to) {
+        throw new Error('Consolidation transaction is missing recipient address');
+      }
+
+      if (txJson.to.toLowerCase() !== baseAddress.toLowerCase()) {
+        await throwRecipientMismatch('Consolidation transaction recipient does not match wallet base address', [
+          { address: txJson.to, amount: txJson.value },
+        ]);
+      }
+    }
+
     return true;
   }
 
@@ -3149,8 +3218,16 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
     }
 
     // Helper to throw TxIntentMismatchRecipientError with recipient details
-    const throwRecipientMismatch = (message: string, mismatchedRecipients: Recipient[]): never => {
-      throw new TxIntentMismatchRecipientError(message, undefined, [txParams], txPrebuild?.txHex, mismatchedRecipients);
+    const throwRecipientMismatch = async (message: string, mismatchedRecipients: Recipient[]): Promise<never> => {
+      const txExplanation = await this.getTxExplanation(txPrebuild);
+      throw new TxIntentMismatchRecipientError(
+        message,
+        undefined,
+        [txParams],
+        txPrebuild?.txHex,
+        mismatchedRecipients,
+        txExplanation
+      );
     };
 
     if (!txParams?.recipients || !txPrebuild?.recipients || !wallet) {
@@ -3180,7 +3257,7 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
       const expectedHopAddress = optionalDeps.ethUtil.stripHexPrefix(decodedHopTx.getSenderAddress().toString());
       const actualHopAddress = optionalDeps.ethUtil.stripHexPrefix(txPrebuild.recipients[0].address);
       if (expectedHopAddress.toLowerCase() !== actualHopAddress.toLowerCase()) {
-        throwRecipientMismatch('recipient address of txPrebuild does not match hop address', [
+        await throwRecipientMismatch('recipient address of txPrebuild does not match hop address', [
           { address: txPrebuild.recipients[0].address, amount: txPrebuild.recipients[0].amount.toString() },
         ]);
       }
@@ -3200,17 +3277,18 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
       if (txParams.tokenName) {
         const expectedTotalAmount = new BigNumber(0);
         if (!expectedTotalAmount.isEqualTo(txPrebuild.recipients[0].amount)) {
-          throwRecipientMismatch('batch token transaction amount in txPrebuild should be zero for token transfers', [
-            { address: txPrebuild.recipients[0].address, amount: txPrebuild.recipients[0].amount.toString() },
-          ]);
+          await throwRecipientMismatch(
+            'batch token transaction amount in txPrebuild should be zero for token transfers',
+            [{ address: txPrebuild.recipients[0].address, amount: txPrebuild.recipients[0].amount.toString() }]
+          );
         }
       } else {
         let expectedTotalAmount = new BigNumber(0);
         for (let i = 0; i < recipients.length; i++) {
           expectedTotalAmount = expectedTotalAmount.plus(recipients[i].amount);
         }
         if (!expectedTotalAmount.isEqualTo(txPrebuild.recipients[0].amount)) {
-          throwRecipientMismatch(
+          await throwRecipientMismatch(
             'batch transaction amount in txPrebuild received from BitGo servers does not match txParams supplied by client',
             [{ address: txPrebuild.recipients[0].address, amount: txPrebuild.recipients[0].amount.toString() }]
           );
@@ -3223,7 +3301,7 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
         !batcherContractAddress ||
         batcherContractAddress.toLowerCase() !== txPrebuild.recipients[0].address.toLowerCase()
       ) {
-        throwRecipientMismatch('recipient address of txPrebuild does not match batcher address', [
+        await throwRecipientMismatch('recipient address of txPrebuild does not match batcher address', [
           { address: txPrebuild.recipients[0].address, amount: txPrebuild.recipients[0].amount.toString() },
         ]);
       }
@@ -3234,25 +3312,27 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
       }
       const expectedAmount = new BigNumber(recipients[0].amount);
       if (!expectedAmount.isEqualTo(txPrebuild.recipients[0].amount)) {
-        throwRecipientMismatch(
+        await throwRecipientMismatch(
           'normal transaction amount in txPrebuild received from BitGo servers does not match txParams supplied by client',
           [{ address: txPrebuild.recipients[0].address, amount: txPrebuild.recipients[0].amount.toString() }]
         );
       }
       if (this.isETHAddress(recipients[0].address) && recipients[0].address !== txPrebuild.recipients[0].address) {
-        throwRecipientMismatch(
+        await throwRecipientMismatch(
           'destination address in normal txPrebuild does not match that in txParams supplied by client',
           [{ address: txPrebuild.recipients[0].address, amount: txPrebuild.recipients[0].amount.toString() }]
         );
       }
     }
     // Check coin is correct for all transaction types
     if (!this.verifyCoin(txPrebuild)) {
+      const txExplanation = await this.getTxExplanation(txPrebuild);
       throw new TxIntentMismatchError(
         'coin in txPrebuild did not match that in txParams supplied by client',
         undefined,
         [txParams],
-        txPrebuild?.txHex
+        txPrebuild?.txHex,
+        txExplanation
       );
     }
     return true;

modules/abstract-lightning/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.5.3](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2025-12-05)
+
+**Note:** Version bump only for package @bitgo/abstract-lightning
+
+
+
+
+
+## [7.5.2](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2025-12-04)
+
+**Note:** Version bump only for package @bitgo/abstract-lightning
+
+
+
+
+
 ## [7.5.1](https://github.com/BitGo/BitGoJS/compare/@bitgo/[email protected]...@bitgo/[email protected]) (2025-11-26)
 
 **Note:** Version bump only for package @bitgo/abstract-lightning

modules/abstract-lightning/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bitgo/abstract-lightning",
-  "version": "7.5.1",
+  "version": "7.5.3",
   "description": "BitGo SDK coin library for base Lightning Network coin implementation",
   "main": "./dist/src/index.js",
   "types": "./dist/src/index.d.ts",
@@ -40,9 +40,9 @@
   },
   "dependencies": {
     "@bitgo/public-types": "5.43.1",
-    "@bitgo/sdk-core": "^36.22.0",
-    "@bitgo/statics": "^58.15.0",
-    "@bitgo/utxo-lib": "^11.16.1",
+    "@bitgo/sdk-core": "^36.23.1",
+    "@bitgo/statics": "^58.16.1",
+    "@bitgo/utxo-lib": "^11.18.0",
     "bip174": "npm:@bitgo-forks/[email protected]",
     "bs58check": "^2.1.2",
     "fp-ts": "^2.12.2",