Merge branch 'master' into rel/latest

Author: alebusse

modules/bitgo/test/v2/unit/internal/tssUtils/ecdsa.ts

@@ -1674,7 +1674,7 @@ describe('TSS Ecdsa Utils:', async function () {
         '!@#$^0c70545b519bb7bbc7195fd4b7d5bfc873bfd38b18596e4b47a05b6a88d552e2e8319cb31e279b99dbe54115a983d35e86679af96d81b7478d1df368f76a8'; // 129 chars
       should(() =>
         ECDSAUtils.EcdsaUtils.validateCommonKeychainPublicKey(commonKeychainWithInvalidCharacters)
-      ).throwError('Unknown point format');
+      ).throwError(/^Invalid commonKeychain, error:/);
     });
   });
 

modules/sdk-coin-apt/src/apt.ts

@@ -183,16 +183,6 @@ export class Apt extends BaseCoin {
     throw new Error('Method not implemented.');
   }
 
-  /** @inheritDoc */
-  getGasTankLowBalanceAlertThresholdFactor(): number {
-    return 200;
-  }
-
-  /** @inheritDoc */
-  getGasTankMinBalanceRecommendationFactor(): number {
-    return 1000;
-  }
-
   private getBuilder(): TransactionBuilderFactory {
     return new TransactionBuilderFactory(coins.get(this.getChain()));
   }

modules/sdk-coin-apt/test/unit/apt.ts

@@ -57,15 +57,11 @@ describe('APT:', function () {
     apt.getFamily().should.equal('apt');
     apt.getFullName().should.equal('Aptos');
     apt.getBaseFactor().should.equal(1e8);
-    apt.getGasTankLowBalanceAlertThresholdFactor().should.equal(200);
-    apt.getGasTankMinBalanceRecommendationFactor().should.equal(1000);
 
     tapt.getChain().should.equal('tapt');
     tapt.getFamily().should.equal('apt');
     tapt.getFullName().should.equal('Testnet Aptos');
     tapt.getBaseFactor().should.equal(1e8);
-    tapt.getGasTankLowBalanceAlertThresholdFactor().should.equal(200);
-    tapt.getGasTankMinBalanceRecommendationFactor().should.equal(1000);
   });
 
   it('is valid pub', function () {

modules/sdk-coin-arbeth/test/unit/arbeth.ts

@@ -106,8 +106,6 @@ describe('Arbitrum', function () {
       arbeth.getFamily().should.equal('arbeth');
       arbeth.getFullName().should.equal('Arbitrum Ethereum (L2 Chain)');
       arbeth.getBaseFactor().should.equal(1e18);
-      arbeth.getGasTankLowBalanceAlertThresholdFactor().should.equal(2);
-      arbeth.getGasTankMinBalanceRecommendationFactor().should.equal(10);
     });
 
     it('should return the right info for tarbeth', function () {
@@ -118,8 +116,6 @@ describe('Arbitrum', function () {
       tarbeth.getFamily().should.equal('arbeth');
       tarbeth.getFullName().should.equal('Testnet Arbitrum Ethereum (L2 Chain)');
       tarbeth.getBaseFactor().should.equal(1e18);
-      tarbeth.getGasTankLowBalanceAlertThresholdFactor().should.equal(2);
-      tarbeth.getGasTankMinBalanceRecommendationFactor().should.equal(10);
     });
   });
 

modules/sdk-coin-avaxp/package.json

@@ -51,10 +51,10 @@
     "@bitgo/sdk-core": "^29.0.0",
     "@bitgo/statics": "^51.0.1",
     "@bitgo/utxo-lib": "^11.2.2",
+    "@noble/curves": "1.8.1",
     "avalanche": "3.15.3",
     "bignumber.js": "^9.0.0",
     "create-hash": "^1.2.0",
-    "elliptic": "^6.6.1",
     "ethereumjs-util": "7.1.5",
     "lodash": "^4.17.14",
     "safe-buffer": "^5.2.1"

modules/sdk-coin-avaxp/src/lib/utils.ts

@@ -22,7 +22,7 @@ import { Signature } from 'avalanche/dist/common';
 import { Credential } from 'avalanche/dist/common/credentials';
 import { NodeIDStringToBuffer } from 'avalanche/dist/utils';
 import * as createHash from 'create-hash';
-import { ec } from 'elliptic';
+import { secp256k1 } from '@noble/curves/secp256k1';
 import { ADDRESS_SEPARATOR, DeprecatedOutput, DeprecatedTx, Output } from './iface';
 
 export class Utils implements BaseUtils {
@@ -101,15 +101,12 @@ export class Utils implements BaseUtils {
       if (pub.length === 66 && firstByte !== '02' && firstByte !== '03') return false;
 
       if (!this.allHexChars(pub)) return false;
-
       pubBuf = BufferAvax.from(pub, 'hex');
     }
     // validate the public key
-    const secp256k1 = new ec('secp256k1');
     try {
-      const keyPair = secp256k1.keyFromPublic(pubBuf);
-      const { result } = keyPair.validate();
-      return result;
+      secp256k1.ProjectivePoint.fromHex(pubBuf.toString('hex'));
+      return true;
     } catch (e) {
       return false;
     }

modules/sdk-coin-coredao/test/resources.ts

@@ -0,0 +1,44 @@
+const getTxListRequestNonBitGoRecovery: Record<string, string> = {
+  module: 'account',
+  action: 'txlist',
+  sort: 'desc',
+  address: '0x594886d686261172b95fae7401841843504f156b',
+};
+
+const getTxListResponseNonBitGoRecovery: Record<string, unknown> = {
+  status: '1',
+  result: [
+    {
+      hash: '0xede855d43d70ea1bb75db63d4f75113dae0845f0d4bdb0b2d8bda55249c70812',
+      nonce: '23',
+      from: '0x594886d686261172b95fae7401841843504f156b',
+    },
+  ],
+  message: 'OK',
+};
+
+const getBalanceRequestNonBitGoRecovery: Record<string, string> = {
+  module: 'account',
+  action: 'balance',
+  address: '0x594886d686261172b95fae7401841843504f156b',
+};
+
+const getBalanceResponseNonBitGoRecovery: Record<string, unknown> = {
+  status: '1',
+  result: 100000000000000000,
+  message: 'OK',
+};
+
+export const mockDataNonBitGoRecovery = {
+  recoveryDestination: '0x224056675da79dac836c330704e9b091a7fc2e1c',
+  userKeyData:
+    '{"iv":"1j/pXswlTT5JEkqmopflwA==","v":1,"iter":10000,"ks":256,"ts":64,"mode":"ccm","adata":"","cipher":"aes","salt":"yA1ls3UYGwk=","ct":"DWf+iaYWSig20VhHWiNYurPyONJO4rAMC0Erxp06SUlLVdLAiD4bHsjNhh3t8OeuVQLlAkfqDBOufVV6DGFcRaBK5KE/mjON2XSIVk+GW8K/ZbdxYpvyFX2zKQtONUP4OXhSrKghgJb7nHCTWtHFPuP734IIKTA1s+iPp4Ojafd7nwXh9uKV5lfD8hSKKt6oWcAqGIeyTk2EUl948wbKdxECgXA3noGHGeDEd4i17VnR44gu9A7A2YB2hQamrn5u1T6uAbNJomYcvD2szzo3bqEi9vFA8WMrX6MYvmTlH21NM5KsxZPPSIHaBlBL/w1bnwgrC6qLEQChnWOIinVepUmWj+NQWkRADbyz9gJLQZtYIcOO1YOoNMKr96a/0zKoktjOrL4d6e617RSWyeOC+OMCtIwBw/LHaQyFzCtuwdtSaG6xoDJIkT0mW7AFX6veu6xK6DM2S2/dNrFlF2cT8a0KO+L4uiA5QcsznPiYv7uUmC2SbX2nskBd2xe6+TpF9VcMMYNk6P01YXj+w9zVUtZRNRv9ke8rMq0Tg8LdorfDqCS15TB86P5iSEOgjP4xXzw5s+5QVhO1Y+4RQuDFW7tDRto0XWZlY7jFg/ NJ7PXOipNPasFjBKHROhM9gq5V4sT5opjbetUHqFGaJC4sRY4HvO9Y+oxFk7khJkK40EFlQzvDCkmDOTjVv/fb5N2kJjq7IGeZTsEeFA90fogUM2DGvwnBB0icggHLS2px40/RHlK2jz3V1XQp5ecddhLzc38/lik9MUsmtTlK3VB5WjGfDRSLBZqy1hjsvKlvKTbpVkg937X/Wun62c4kquYzSJIHd0UanAKd5D7O+oIoUZR7FgpbDQoutRhVflDTyYpOq7tSJOrYbjA1qEJVWJqeFIKdfQ9ZboT9aFq3aGQxuk7mz9CyrKVRQfPBrjzEbW8mKCqpJLUshKXkcETnlNzSBbOuPokIRz+nM3rlYFevk4oiA418QdH3rK+gPQv4NkKHGcZlb3Vzro85seOZVqzgITXadXUznBG0/mYmY+Iqe1zHI1nDDGrxCqzpK4v31M2e7xyPu/kMHZYKNvM0k2jy"}',
+  backupKeyData:
+    '{"iv":"LYD8I6UEfqMEmFgwC/YR+w==","v":1,"iter":10000,"ks":256,"ts":64,"mode":"ccm","adata":"","cipher":"aes","salt":"IxVKifwPPWU=","ct":"qw+MmwAoinYPgyAbVKGbKDKFaNv+tyj9W1ird+MdVrLBurYoccf1wESdBpLVIIEaljXHZD/uxXSxOHtIjM4tUpnwajI5fSG0pYa2p048uN4K54tBtCJqj1W1jPyDVdaGEi6TheI5jGjKPEnI3J4ZPbQ7BfeT0WceIX3S9dT+VETug6vAf4axU8phIejCRuHgnvtErx/xiKH3zSDnc3oOSjHfoz0ujR/ZLtb4FRPaXujgRDISqoR4CtN7io3myq2NArzNsYi6PluD/jp80My+1jImIrmDqY+DVgGTDBAOz97eL9lXS2uiw3VuoPUSsQCdCrIjnhsq0BtL/W53eZbrXH565Bykm6L6DqJLJeVOrIMUAG/An1X9iUSqmHDFr7SW2z6NCy624vC3ulBRUcji44XHcmm4eVU1SgZDlzB00wBTNxHObIVJwWX8ZP33bYjeav3WBClXrC3b0CqEVzY7F3nLT8I6q1bb0WrRzB3blX7Avf0FylnUN0QbN1mQLUA01LZYof3+gPFCfDEzT/qX8EpgcxLpGgd8T4sj7RKjv0rHBZ462l1yh4lN2PqmZW/10UkyTYYqr0Jw3neYFHQTLoS2FqBNkftyBYkO8eiVXvbeaHuCugiDBB963cNR3nE1a6UqHH1Ime1K6chAoUZlq5arfT3OPR4lPpWXXwigznNcUMMJVQhGVJI1siEOXR1b78fe12VTD1PKhRQC5J9UvE3nBRoXoEWkj1b3/UQfUF6ITQQYDg8lZYKdRYyOlrQDS56oVI1HF8uR0+IQSbtshWSw4OrN6FPHf6ZuhcwX3PSvZwXpNVndxKII8pgFAn0SyQAFsWVY/4OKCO/O+PJkg7ODcJo/S9BAqcxmInBWgnaLMEhCGl77xVELW/B8wVOEVC3ApGtQsjg1CQg/PWsJY5EDkVykejiRTZyim9C84hZSL6bSpDCGOWnEEkI1U9gQlE0kkj1ZBQpe7xxOJ7jhWqNC800orDNsSIdOlDvD/SXX1zHf88aby9VNkUUwb6D9cUItuVkL4gllk/7aTnt0UIoiy8X6Z3w3z3tQi4i9pEZNeM3kG0nlQX12Q7788YNR"}',
+  walletRootAddress: '0x594886d686261172b95fae7401841843504f156b',
+  walletPassphrase: 'test_1234_test',
+  getTxListRequest: getTxListRequestNonBitGoRecovery,
+  getTxListResponse: getTxListResponseNonBitGoRecovery,
+  getBalanceRequest: getBalanceRequestNonBitGoRecovery,
+  getBalanceResponse: getBalanceResponseNonBitGoRecovery,
+};

modules/sdk-coin-coredao/test/unit/coredao.ts

@@ -3,11 +3,13 @@ import * as should from 'should';
 import { TestBitGo, TestBitGoAPI } from '@bitgo/sdk-test';
 import { BitGoAPI } from '@bitgo/sdk-api';
 
-import { Coredao, Tcoredao } from '../../src/index';
+import { Coredao, Tcoredao } from '../../src';
 import nock from 'nock';
 
 import { FeeMarketEIP1559Transaction } from '@ethereumjs/tx';
 import { stripHexPrefix } from '@ethereumjs/util';
+import { common } from '@bitgo/sdk-core';
+import { mockDataNonBitGoRecovery } from '../resources';
 
 const bitgo: TestBitGoAPI = TestBitGo.decorate(BitGoAPI, { env: 'test' });
 
@@ -46,67 +48,26 @@ describe('Coredao', function () {
 
   describe('Build Recover Transaction', function () {
     const bitgo = TestBitGo.decorate(BitGoAPI, { env: 'test' });
-    const getTxListRequest: Record<string, string> = {
-      module: 'account',
-      action: 'txlist',
-      sort: 'desc',
-      address: '0x594886d686261172b95fae7401841843504f156b',
-    };
-
-    const getTxListResponse: Record<string, unknown> = {
-      status: '1',
-      result: [
-        {
-          hash: '0xede855d43d70ea1bb75db63d4f75113dae0845f0d4bdb0b2d8bda55249c70812',
-          nonce: '23',
-          from: '0x594886d686261172b95fae7401841843504f156b',
-        },
-      ],
-      message: 'OK',
-    };
-
-    const getBalanceRequest: Record<string, string> = {
-      module: 'account',
-      action: 'balance',
-      address: '0x594886d686261172b95fae7401841843504f156b',
-    };
-
-    const getBalanceResponse: Record<string, unknown> = {
-      status: '1',
-      result: 100000000000000000,
-      message: 'OK',
-    };
-
-    const mockData = {
-      recoveryDestination: '0x224056675da79dac836c330704e9b091a7fc2e1c',
-      userKeyData:
-        '{"iv":"1j/pXswlTT5JEkqmopflwA==","v":1,"iter":10000,"ks":256,"ts":64,"mode":"ccm","adata":"","cipher":"aes","salt":"yA1ls3UYGwk=","ct":"DWf+iaYWSig20VhHWiNYurPyONJO4rAMC0Erxp06SUlLVdLAiD4bHsjNhh3t8OeuVQLlAkfqDBOufVV6DGFcRaBK5KE/mjON2XSIVk+GW8K/ZbdxYpvyFX2zKQtONUP4OXhSrKghgJb7nHCTWtHFPuP734IIKTA1s+iPp4Ojafd7nwXh9uKV5lfD8hSKKt6oWcAqGIeyTk2EUl948wbKdxECgXA3noGHGeDEd4i17VnR44gu9A7A2YB2hQamrn5u1T6uAbNJomYcvD2szzo3bqEi9vFA8WMrX6MYvmTlH21NM5KsxZPPSIHaBlBL/w1bnwgrC6qLEQChnWOIinVepUmWj+NQWkRADbyz9gJLQZtYIcOO1YOoNMKr96a/0zKoktjOrL4d6e617RSWyeOC+OMCtIwBw/LHaQyFzCtuwdtSaG6xoDJIkT0mW7AFX6veu6xK6DM2S2/dNrFlF2cT8a0KO+L4uiA5QcsznPiYv7uUmC2SbX2nskBd2xe6+TpF9VcMMYNk6P01YXj+w9zVUtZRNRv9ke8rMq0Tg8LdorfDqCS15TB86P5iSEOgjP4xXzw5s+5QVhO1Y+4RQuDFW7tDRto0XWZlY7jFg/ NJ7PXOipNPasFjBKHROhM9gq5V4sT5opjbetUHqFGaJC4sRY4HvO9Y+oxFk7khJkK40EFlQzvDCkmDOTjVv/fb5N2kJjq7IGeZTsEeFA90fogUM2DGvwnBB0icggHLS2px40/RHlK2jz3V1XQp5ecddhLzc38/lik9MUsmtTlK3VB5WjGfDRSLBZqy1hjsvKlvKTbpVkg937X/Wun62c4kquYzSJIHd0UanAKd5D7O+oIoUZR7FgpbDQoutRhVflDTyYpOq7tSJOrYbjA1qEJVWJqeFIKdfQ9ZboT9aFq3aGQxuk7mz9CyrKVRQfPBrjzEbW8mKCqpJLUshKXkcETnlNzSBbOuPokIRz+nM3rlYFevk4oiA418QdH3rK+gPQv4NkKHGcZlb3Vzro85seOZVqzgITXadXUznBG0/mYmY+Iqe1zHI1nDDGrxCqzpK4v31M2e7xyPu/kMHZYKNvM0k2jy"}',
-      backupKeyData:
-        '{"iv":"LYD8I6UEfqMEmFgwC/YR+w==","v":1,"iter":10000,"ks":256,"ts":64,"mode":"ccm","adata":"","cipher":"aes","salt":"IxVKifwPPWU=","ct":"qw+MmwAoinYPgyAbVKGbKDKFaNv+tyj9W1ird+MdVrLBurYoccf1wESdBpLVIIEaljXHZD/uxXSxOHtIjM4tUpnwajI5fSG0pYa2p048uN4K54tBtCJqj1W1jPyDVdaGEi6TheI5jGjKPEnI3J4ZPbQ7BfeT0WceIX3S9dT+VETug6vAf4axU8phIejCRuHgnvtErx/xiKH3zSDnc3oOSjHfoz0ujR/ZLtb4FRPaXujgRDISqoR4CtN7io3myq2NArzNsYi6PluD/jp80My+1jImIrmDqY+DVgGTDBAOz97eL9lXS2uiw3VuoPUSsQCdCrIjnhsq0BtL/W53eZbrXH565Bykm6L6DqJLJeVOrIMUAG/An1X9iUSqmHDFr7SW2z6NCy624vC3ulBRUcji44XHcmm4eVU1SgZDlzB00wBTNxHObIVJwWX8ZP33bYjeav3WBClXrC3b0CqEVzY7F3nLT8I6q1bb0WrRzB3blX7Avf0FylnUN0QbN1mQLUA01LZYof3+gPFCfDEzT/qX8EpgcxLpGgd8T4sj7RKjv0rHBZ462l1yh4lN2PqmZW/10UkyTYYqr0Jw3neYFHQTLoS2FqBNkftyBYkO8eiVXvbeaHuCugiDBB963cNR3nE1a6UqHH1Ime1K6chAoUZlq5arfT3OPR4lPpWXXwigznNcUMMJVQhGVJI1siEOXR1b78fe12VTD1PKhRQC5J9UvE3nBRoXoEWkj1b3/UQfUF6ITQQYDg8lZYKdRYyOlrQDS56oVI1HF8uR0+IQSbtshWSw4OrN6FPHf6ZuhcwX3PSvZwXpNVndxKII8pgFAn0SyQAFsWVY/4OKCO/O+PJkg7ODcJo/S9BAqcxmInBWgnaLMEhCGl77xVELW/B8wVOEVC3ApGtQsjg1CQg/PWsJY5EDkVykejiRTZyim9C84hZSL6bSpDCGOWnEEkI1U9gQlE0kkj1ZBQpe7xxOJ7jhWqNC800orDNsSIdOlDvD/SXX1zHf88aby9VNkUUwb6D9cUItuVkL4gllk/7aTnt0UIoiy8X6Z3w3z3tQi4i9pEZNeM3kG0nlQX12Q7788YNR"}',
-      walletRootAddress: '0x594886d686261172b95fae7401841843504f156b',
-      walletPassphrase: 'test_1234_test',
-      explorerUrl: 'https://app.test.btcs.network',
-      getTxListRequest: getTxListRequest,
-      getTxListResponse: getTxListResponse,
-      getBalanceRequest: getBalanceRequest,
-      getBalanceResponse: getBalanceResponse,
-    };
+    const explorerUrl = common.Environments[bitgo.getEnv()].coredaoExplorerBaseUrl as string;
 
     it('should generate a signed non-bitgo recovery tx', async () => {
-      nock(mockData.explorerUrl)
+      nock(explorerUrl)
         .get('/api')
         .twice()
-        .query(mockData.getTxListRequest)
-        .reply(200, mockData.getTxListResponse);
-      nock(mockData.explorerUrl).get('/api').query(mockData.getBalanceRequest).reply(200, mockData.getBalanceResponse);
+        .query(mockDataNonBitGoRecovery.getTxListRequest)
+        .reply(200, mockDataNonBitGoRecovery.getTxListResponse);
+      nock(explorerUrl)
+        .get('/api')
+        .query(mockDataNonBitGoRecovery.getBalanceRequest)
+        .reply(200, mockDataNonBitGoRecovery.getBalanceResponse);
 
       const baseCoin: any = bitgo.coin('tcoredao');
       const transaction = await baseCoin.recover({
-        userKey: mockData.userKeyData,
-        backupKey: mockData.backupKeyData,
-        walletContractAddress: mockData.walletRootAddress,
-        walletPassphrase: mockData.walletPassphrase,
-        recoveryDestination: mockData.recoveryDestination,
+        userKey: mockDataNonBitGoRecovery.userKeyData,
+        backupKey: mockDataNonBitGoRecovery.backupKeyData,
+        walletContractAddress: mockDataNonBitGoRecovery.walletRootAddress,
+        walletPassphrase: mockDataNonBitGoRecovery.walletPassphrase,
+        recoveryDestination: mockDataNonBitGoRecovery.recoveryDestination,
         isTss: true,
         eip1559: { maxFeePerGas: 20000000000, maxPriorityFeePerGas: 10000000000 },
         gasLimit: 500000,
@@ -119,10 +80,10 @@ describe('Coredao', function () {
       transaction.should.have.property('id');
       transaction.should.have.property('tx');
       const tx = FeeMarketEIP1559Transaction.fromSerializedTx(Buffer.from(stripHexPrefix(transaction.tx), 'hex'));
-      tx.getSenderAddress().toString().should.equal(mockData.walletRootAddress);
+      tx.getSenderAddress().toString().should.equal(mockDataNonBitGoRecovery.walletRootAddress);
       const jsonTx = tx.toJSON();
       jsonTx.chainId?.should.equal('0x45a');
-      jsonTx.to?.should.equal(mockData.recoveryDestination);
+      jsonTx.to?.should.equal(mockDataNonBitGoRecovery.recoveryDestination);
     });
   });
 });

modules/sdk-coin-icp/package.json

@@ -46,8 +46,8 @@
     "@dfinity/agent": "^2.2.0",
     "@dfinity/candid": "^2.2.0",
     "@dfinity/principal": "^2.2.0",
-    "crc-32": "^1.2.2",
-    "elliptic": "^6.6.1"
+    "@noble/curves": "1.8.1",
+    "crc-32": "^1.2.2"
   },
   "devDependencies": {
     "@bitgo/sdk-api": "^1.58.9",

modules/sdk-coin-icp/src/lib/utils.ts

@@ -1,13 +1,11 @@
 import { BaseUtils, KeyPair } from '@bitgo/sdk-core';
-import elliptic from 'elliptic';
+import { secp256k1 } from '@noble/curves/secp256k1';
 import { Principal as DfinityPrincipal } from '@dfinity/principal';
 import * as agent from '@dfinity/agent';
 import crypto from 'crypto';
 import crc32 from 'crc-32';
 import { KeyPair as IcpKeyPair } from './keyPair';
 
-const Secp256k1Curve = new elliptic.ec('secp256k1');
-
 export class Utils implements BaseUtils {
   isValidAddress(address: string): boolean {
     throw new Error('Method not implemented.');
@@ -102,11 +100,9 @@ export class Utils implements BaseUtils {
   }
 
   derivePrincipalFromPublicKey(publicKeyHex: string): DfinityPrincipal {
-    const publicKeyBuffer = Buffer.from(publicKeyHex, 'hex');
-
     try {
-      const ellipticKey = Secp256k1Curve.keyFromPublic(publicKeyBuffer);
-      const uncompressedPublicKeyHex = ellipticKey.getPublic(false, 'hex');
+      const point = secp256k1.ProjectivePoint.fromHex(publicKeyHex);
+      const uncompressedPublicKeyHex = point.toHex(false);
       const derEncodedKey = agent.wrapDER(Buffer.from(uncompressedPublicKeyHex, 'hex'), agent.SECP256K1_OID);
       const principalId = DfinityPrincipal.selfAuthenticating(Buffer.from(derEncodedKey));
       const principal = DfinityPrincipal.fromUint8Array(principalId.toUint8Array());