fix(mbe): added etherscan api token as recovery params

TICKET: WP-5168

Author: alextse-bg

masterBitgoExpress.json

@@ -462,9 +462,6 @@
                   "ledgerSequenceDelta": {
                     "type": "number"
                   },
-                  "gasPrice": {
-                    "type": "number"
-                  },
                   "noSplitChange": {
                     "type": "boolean"
                   },
@@ -762,6 +759,36 @@
                   "coinSpecificParams": {
                     "type": "object",
                     "properties": {
+                      "ecdsaCosmosLikeRecoverySpecificParams": {
+                        "type": "object",
+                        "properties": {
+                          "rootAddress": {
+                            "type": "string"
+                          }
+                        },
+                        "required": [
+                          "rootAddress"
+                        ]
+                      },
+                      "ecdsaEthLikeRecoverySpecificParams": {
+                        "type": "object",
+                        "properties": {
+                          "apiKey": {
+                            "type": "string"
+                          },
+                          "bitgoDestinationAddress": {
+                            "type": "string"
+                          },
+                          "walletContractAddress": {
+                            "type": "string"
+                          }
+                        },
+                        "required": [
+                          "apiKey",
+                          "bitgoDestinationAddress",
+                          "walletContractAddress"
+                        ]
+                      },
                       "evmRecoveryOptions": {
                         "type": "object",
                         "properties": {

src/__tests__/api/master/recoveryWalletMpcV2.test.ts

@@ -58,7 +58,7 @@ describe('MBE mpcv2 recovery', () => {
   it('should recover a HETH (an eth-like) wallet by calling the enclaved express service', async () => {
     const etherscanTxlistNock = nock('https://api.etherscan.io')
       .get(
-        `/v2/api?chainid=17000&module=account&action=txlist&address=0x43442e403d64d29c4f64065d0c1a0e8edc03d6c8`,
+        `/v2/api?chainid=17000&module=account&action=txlist&address=0x43442e403d64d29c4f64065d0c1a0e8edc03d6c8&apikey=etherscan-api-key`,
       )
       .matchHeader('any', () => true)
       .reply(200, {
@@ -71,7 +71,7 @@ describe('MBE mpcv2 recovery', () => {
 
     const etherscanBalanceNock = nock('https://api.etherscan.io')
       .get(
-        `/v2/api?chainid=17000&module=account&action=balance&address=0x43442e403d64d29c4f64065d0c1a0e8edc03d6c8`,
+        `/v2/api?chainid=17000&module=account&action=balance&address=0x43442e403d64d29c4f64065d0c1a0e8edc03d6c8&apikey=etherscan-api-key`,
       )
       .matchHeader('any', () => true)
       .reply(200, {
@@ -105,6 +105,7 @@ describe('MBE mpcv2 recovery', () => {
           ecdsaEthLikeRecoverySpecificParams: {
             walletContractAddress: '0x43442e403d64d29c4f64065d0c1a0e8edc03d6c8',
             bitgoDestinationAddress: '0x43442e403d64d29c4f64065d0c1a0e8edc03d6c8', //placeholder
+            apiKey: `etherscan-api-key`,
           },
         },
       });

src/api/master/handlers/recoverEcdsaWallets.ts

@@ -1,4 +1,3 @@
-import type { AbstractEthLikeNewCoins } from '@bitgo-beta/sdk-coin-eth';
 import { BaseCoin, BitGoBase, Ecdsa } from '@bitgo-beta/sdk-core';
 import { EnclavedExpressClient } from '../clients/enclavedExpressClient';
 import { isCosmosLikeCoin, isEthLikeCoin } from '../../../shared/coinUtils';
@@ -124,17 +123,15 @@ export async function recoverEcdsaMPCv2Wallets(
     const { AbstractEthLikeNewCoins } = await import('@bitgo-beta/sdk-coin-eth');
     const { TransactionFactory } = await import('@ethereumjs/tx');
 
-    const ethCoin = baseCoin as AbstractEthLikeNewCoins; // all eth-like coins should implement this interface
     const unsignedTxFull = TransactionFactory.fromSerializedData(
       Buffer.from(unsignedTx.signableHex, 'hex'),
     );
 
-    const ethCommmon = AbstractEthLikeNewCoins['getEthLikeCommon'](
-      params.ethLikeParams?.eip1559,
-      params.ethLikeParams?.replayProtectionOptions,
-    );
-    const signedTx = await ethCoin['getSignedTxFromSignature'](
-      ethCommmon,
+    const ethCommon = AbstractEthLikeNewCoins.getCustomChainCommon(params.ethLikeParams?.replayProtectionOptions?.chain as number);
+    ethCommon.setHardfork(params.ethLikeParams?.replayProtectionOptions?.hardfork as string);
+
+    const signedTx = await baseCoin['getSignedTxFromSignature'](
+      ethCommon,
       unsignedTxFull,
       signature,
     );

src/api/master/handlers/recoveryWallet.ts

@@ -271,6 +271,7 @@ export async function handleRecoveryWalletOnPrem(
           gasLimit,
           bitgoDestinationAddress: coinSpecificParams?.ecdsaEthLikeRecoverySpecificParams
             ?.bitgoDestinationAddress as string,
+          apiKey: coinSpecificParams?.ecdsaEthLikeRecoverySpecificParams?.apiKey,
         };
       } else if (isCosmosLikeCoin(sdkCoin)) {
         params.cosmosLikeParams = {

src/api/master/routers/masterApiSpec.ts

@@ -79,6 +79,7 @@ export const RecoveryParamTypes = {
   ecdsaEthLikeRecoverySpecificParams: t.type({
     walletContractAddress: t.string,
     bitgoDestinationAddress: t.string,
+    apiKey: t.string,
   }),
 
   // ECDSA Cosmos-like recovery specific parameters

src/shared/coinUtils.ts

@@ -4,7 +4,7 @@ import {
   FormattedOfflineVaultTxInfo,
 } from '@bitgo-beta/abstract-utxo';
 import { CosmosCoin } from '@bitgo-beta/abstract-cosmos';
-import { CoinFamily } from '@bitgo-beta/statics';
+import { CoinFamily, CoinFeature } from '@bitgo-beta/statics';
 import { BaseCoin } from '@bitgo-beta/sdk-core';
 import { AbstractUtxoCoin } from '@bitgo-beta/abstract-utxo';
 import { type Xtz, type Txtz } from '@bitgo-beta/sdk-coin-xtz';
@@ -34,27 +34,8 @@ export function isEthLikeCoin(coin: BaseCoin): coin is AbstractEthLikeNewCoins {
   return isEthPure || isEthLike;
 }
 
-// TODO: this typeguard should not work
 export function isCosmosLikeCoin(coin: BaseCoin): coin is CosmosCoin {
-  const isCosmosLike =
-    isFamily(coin, CoinFamily.ASI) ||
-    isFamily(coin, CoinFamily.ATOM) ||
-    isFamily(coin, CoinFamily.BABY) ||
-    isFamily(coin, CoinFamily.BLD) ||
-    isFamily(coin, CoinFamily.COREUM) ||
-    isFamily(coin, CoinFamily.CRONOS) ||
-    isFamily(coin, CoinFamily.HASH) ||
-    isFamily(coin, CoinFamily.INITIA) ||
-    isFamily(coin, CoinFamily.INJECTIVE) ||
-    isFamily(coin, CoinFamily.ISLM) ||
-    isFamily(coin, CoinFamily.MANTRA) ||
-    isFamily(coin, CoinFamily.OSMO) ||
-    // isFamily(coin, CoinFamily.RUNE) ||
-    isFamily(coin, CoinFamily.SEI) ||
-    isFamily(coin, CoinFamily.TIA) ||
-    isFamily(coin, CoinFamily.ZETA);
-
-  return isCosmosLike;
+  return coin.getConfig().features.includes(CoinFeature.COSMOS_LIKE_COINS);
 }
 
 export function isUtxoCoin(coin: BaseCoin): coin is AbstractUtxoCoin {