chore(root): merge conflicts

TICKET: WP-0000

Author: zahin-mohammad

examples/ts/btc/lightning/list-invoices.ts

@@ -58,7 +58,7 @@ async function main(): Promise<void> {
       status,
       limit: limit ? BigInt(limit) : undefined,
     };
-    const invoices = await lightning.listInvoices(query);
+    const { invoices } = await lightning.listInvoices(query);
 
     // Display invoice summary
     console.log(`\nFound ${invoices.length} invoices:`);

examples/ts/btc/lightning/list-payments.ts

@@ -54,7 +54,7 @@ async function main(): Promise<void> {
     }
 
     // List payments with the provided filters
-    const payments = await lightning.listPayments(queryParams);
+    const { payments } = await lightning.listPayments(queryParams);
 
     // Display payment summary
     console.log(`\nFound ${payments.length} payments:`);

examples/ts/nft/list-wallet-addresses-by-balance.ts

@@ -0,0 +1,29 @@
+/**
+ * List address of an NFT on a wallet.
+ *
+ * Copyright 2025, BitGo, Inc.  All Rights Reserved.
+ */
+import { BitGoAPI } from '@bitgo/sdk-api';
+import { Tapt } from '@bitgo/sdk-coin-apt';
+require('dotenv').config({ path: '../../../.env' });
+
+const bitgo = new BitGoAPI({
+  accessToken: process.env.TESTNET_ACCESS_TOKEN,
+  env: 'test',
+});
+
+const coin = 'tapt';
+bitgo.register(coin, Tapt.createInstance);
+
+const walletId = '';
+
+async function main() {
+  const wallet = await bitgo.coin(coin).wallets().get({ id: walletId });
+  const addresses = await wallet.addressesByBalance({
+    nftCollectionId: '',
+    nftId: '',
+  });
+  console.log(JSON.stringify(addresses.addresses));
+}
+
+main().catch((e) => console.error(e));

examples/ts/nft/nft-consolidation-send.ts

@@ -32,7 +32,6 @@ async function main() {
 
   const sendConsolidations = await wallet.sendAccountConsolidations({
     walletPassphrase,
-    consolidateAddresses: [''],
     nftCollectionId: '',
     nftId: '',
   });

modules/abstract-cosmos/package.json

@@ -39,6 +39,7 @@
   },
   "dependencies": {
     "@bitgo/sdk-core": "^35.0.1",
+    "@bitgo/sdk-lib-mpc": "^10.3.0",
     "@bitgo/secp256k1": "^1.3.3",
     "@bitgo/statics": "^54.0.1",
     "@cosmjs/amino": "^0.29.5",

modules/abstract-cosmos/src/cosmosCoin.ts

@@ -1,4 +1,5 @@
 import {
+  AuditDecryptedKeyParams,
   BaseCoin,
   BaseTransaction,
   BitGoBase,
@@ -43,6 +44,7 @@ import {
 } from './lib';
 import { ROOT_PATH } from './lib/constants';
 import utils from './lib/utils';
+import { auditEcdsaPrivateKey } from '@bitgo/sdk-lib-mpc';
 
 /**
  * Cosmos accounts support memo Id based addresses
@@ -665,4 +667,13 @@ export class CosmosCoin<CustomMessage = never> extends BaseCoin {
   getKeyPair(publicKey: string): CosmosKeyPair {
     throw new Error('Method not implemented');
   }
+
+  /** @inheritDoc **/
+  auditDecryptedKey({ multiSigType, publicKey, prv }: AuditDecryptedKeyParams) {
+    if (multiSigType !== 'tss') {
+      throw new Error('Unsupported multiSigType');
+    } else {
+      auditEcdsaPrivateKey(prv as string, publicKey as string);
+    }
+  }
 }

modules/abstract-eth/src/abstractEthLikeCoin.ts

@@ -2,14 +2,18 @@
  * @prettier
  */
 import type * as EthLikeCommon from '@ethereumjs/common';
-import { CoinFamily, BaseCoin as StaticsBaseCoin } from '@bitgo/statics';
+import { CoinFamily, BaseCoin as StaticsBaseCoin, EthereumNetwork } from '@bitgo/statics';
 import { bip32 } from '@bitgo/secp256k1';
 import { randomBytes } from 'crypto';
 import {
+  AuditDecryptedKeyParams,
   BaseCoin,
+  bitcoin,
   BitGoBase,
   FullySignedTransaction,
   HalfSignedAccountTransaction,
+  isValidPrv,
+  isValidXprv,
   KeyPair,
   MethodNotImplementedError,
   ParsedTransaction,
@@ -25,6 +29,7 @@ import BigNumber from 'bignumber.js';
 
 import { isValidEthAddress, KeyPair as EthKeyPair, TransactionBuilder } from './lib';
 import { VerifyEthAddressOptions } from './abstractEthLikeNewCoins';
+import { auditEcdsaPrivateKey } from '@bitgo/sdk-lib-mpc';
 
 export interface EthSignTransactionOptions extends SignTransactionOptions {
   txPrebuild: TransactionPrebuild;
@@ -107,6 +112,10 @@ export abstract class AbstractEthLikeCoin extends BaseCoin {
     return Math.pow(10, this._staticsCoin.decimalPlaces);
   }
 
+  getChainId(): number {
+    return (this._staticsCoin.network as EthereumNetwork).chainId;
+  }
+
   /** @inheritDoc */
   isEVM(): boolean {
     return true;
@@ -226,4 +235,21 @@ export abstract class AbstractEthLikeCoin extends BaseCoin {
    * @return a new transaction builder
    */
   protected abstract getTransactionBuilder(common?: EthLikeCommon.default): TransactionBuilder;
+
+  /** @inheritDoc */
+  auditDecryptedKey({ multiSigType, publicKey, prv }: AuditDecryptedKeyParams): void {
+    if (multiSigType === 'tss') {
+      auditEcdsaPrivateKey(prv as string, publicKey as string);
+    } else {
+      if (!isValidPrv(prv) && !isValidXprv(prv)) {
+        throw new Error('Invalid private key');
+      }
+      if (publicKey) {
+        const genPubKey = bitcoin.HDNode.fromBase58(prv).neutered().toBase58();
+        if (genPubKey !== publicKey) {
+          throw new Error('Incorrect xpub');
+        }
+      }
+    }
+  }
 }

modules/abstract-eth/src/abstractEthLikeNewCoins.ts

@@ -533,6 +533,7 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
    */
   async queryAddressBalance(address: string): Promise<any> {
     const result = await this.recoveryBlockchainExplorerQuery({
+      chainid: this.getChainId().toString(),
       module: 'account',
       action: 'balance',
       address: address,
@@ -634,6 +635,7 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
     const sequenceIdArgs = optionalDeps.ethAbi.rawEncode([], []);
     const sequenceIdData = Buffer.concat([sequenceIdMethodSignature, sequenceIdArgs]).toString('hex');
     const result = await this.recoveryBlockchainExplorerQuery({
+      chainid: this.getChainId().toString(),
       module: 'proxy',
       action: 'eth_call',
       to: address,
@@ -842,6 +844,7 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
     let nonce = 0;
 
     const result = await this.recoveryBlockchainExplorerQuery({
+      chainid: this.getChainId().toString(),
       module: 'account',
       action: 'txlist',
       address,
@@ -1631,6 +1634,7 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
     }
 
     const result = await this.recoveryBlockchainExplorerQuery({
+      chainid: this.getChainId().toString(),
       module: 'account',
       action: 'tokenbalance',
       contractaddress: tokenContractAddress,
@@ -2775,6 +2779,7 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
   async getGasPriceFromExternalAPI(wrongChainCoin: string): Promise<BN> {
     try {
       const res = await this.recoveryBlockchainExplorerQuery({
+        chainid: this.getChainId().toString(),
         module: 'proxy',
         action: 'eth_gasPrice',
       });
@@ -2796,6 +2801,7 @@ export abstract class AbstractEthLikeNewCoins extends AbstractEthLikeCoin {
   async getGasLimitFromExternalAPI(intendedChain: string, from: string, to: string, data: string): Promise<BN> {
     try {
       const res = await this.recoveryBlockchainExplorerQuery({
+        chainid: this.getChainId().toString(),
         module: 'proxy',
         action: 'eth_estimateGas',
         from,

modules/abstract-eth/src/ethLikeToken.ts

@@ -258,6 +258,7 @@ export class EthLikeToken extends AbstractEthLikeNewCoins {
     let backupKeyNonce = 0;
 
     const result = await this.recoveryBlockchainExplorerQuery({
+      chainid: this.getChainId().toString(),
       module: 'account',
       action: 'txlist',
       address: backupKeyAddress,

modules/abstract-lightning/src/abstractLightningCoin.ts

@@ -1,4 +1,5 @@
 import {
+  AuditDecryptedKeyParams,
   BaseCoin,
   BitGoBase,
   KeyPair,
@@ -61,4 +62,10 @@ export abstract class AbstractLightningCoin extends BaseCoin {
   signTransaction(params: SignTransactionOptions): Promise<SignedTransaction> {
     throw new Error('Method not implemented.');
   }
+
+  /** @inheritDoc */
+  auditDecryptedKey(params: AuditDecryptedKeyParams) {
+    /** https://bitgoinc.atlassian.net/browse/BTC-2149 */
+    throw new Error('Method not implemented.');
+  }
 }