feat(mbe); fix recovery consolidation for eddsa

Author: cpatino-intive

src/api/master/clients/enclavedExpressClient.ts

@@ -16,6 +16,7 @@ import {
   MPCTx,
   MPCSweepTxs,
   MPCTxs,
+  MPCUnsignedTx,
 } from '@bitgo/sdk-core';
 import { RecoveryTransaction } from '@bitgo/sdk-coin-trx';
 import { superagentRequestFactory, buildApiClient, ApiClient } from '@api-ts/superagent-wrapper';
@@ -205,6 +206,11 @@ export class EnclavedExpressClient {
           txRequest.signableHex = firstTx.unsignedTx?.serializedTx || '';
           txRequest.derivationPath = firstTx.unsignedTx?.derivationPath || '';
         }
+      } else if ('transactions' in tx && Array.isArray(tx.transactions)) {
+        // RecoveryTxRequest
+        const firstTransaction = tx.transactions[0] as MPCUnsignedTx;
+        txRequest.signableHex = firstTransaction.unsignedTx?.serializedTx || '';
+        txRequest.derivationPath = firstTransaction.unsignedTx?.derivationPath || '';
       } else if ('signableHex' in tx) {
         // MPCTx format
         txRequest.signableHex = tx.signableHex || '';

src/api/master/handlers/recoveryConsolidationsWallet.ts

@@ -71,9 +71,9 @@ export async function handleRecoveryConsolidationsOnPrem(
   const coin = req.decoded.coin;
   const enclavedExpressClient = req.enclavedExpressClient;
 
-  const isMPC = true;
+  const isMPC = req.decoded.multisigType === 'tss';
 
-  const { commonKeychain, apiKey } = req.decoded;
+  const { commonKeychain, apiKey = '' } = req.decoded;
   let { userPub, backupPub, bitgoPub } = req.decoded;
 
   if (isMPC) {

src/api/master/routers/masterApiSpec.ts

@@ -200,11 +200,12 @@ const RecoveryConsolidationsWalletRequest = {
   userPub: t.union([t.undefined, t.string]),
   backupPub: t.union([t.undefined, t.string]),
   bitgoPub: t.union([t.undefined, t.string]),
+  multisigType: t.union([t.literal('onchain'), t.literal('tss')]),
   commonKeychain: t.union([t.undefined, t.string]),
   tokenContractAddress: t.union([t.undefined, t.string]),
   startingScanIndex: t.union([t.undefined, t.number]),
   endingScanIndex: t.union([t.undefined, t.number]),
-  apiKey: t.string,
+  apiKey: t.union([t.undefined, t.string]),
   durableNonces: t.union([
     t.undefined,
     t.type({

src/shared/coinUtils.ts

@@ -2,7 +2,7 @@ import { AbstractEthLikeNewCoins } from '@bitgo/abstract-eth';
 import { BackupKeyRecoveryTransansaction, FormattedOfflineVaultTxInfo } from '@bitgo/abstract-utxo';
 import { CoinFamily } from '@bitgo/statics';
 import { BaseCoin } from 'bitgo';
-import { AbstractUtxoCoin, Eos, Stx, Xtz, Sol, Trx } from 'bitgo/dist/types/src/v2/coins';
+import { AbstractUtxoCoin, Eos, Stx, Xtz } from 'bitgo/dist/types/src/v2/coins';
 
 export function isEthLikeCoin(coin: BaseCoin): coin is AbstractEthLikeNewCoins {
   const isEthPure = isFamily(coin, CoinFamily.ETH);
@@ -52,14 +52,6 @@ export function isXtzCoin(coin: BaseCoin): coin is Xtz {
   return isFamily(coin, CoinFamily.XTZ);
 }
 
-export function isSolCoin(coin: BaseCoin): coin is Sol {
-  return isFamily(coin, CoinFamily.SOL);
-}
-
-export function isTrxCoin(coin: BaseCoin): coin is Trx {
-  return isFamily(coin, CoinFamily.TRX);
-}
-
 function isFamily(coin: BaseCoin, family: CoinFamily) {
   return Boolean(coin && coin.getFamily() === family);
 }