feat(mbe): final logic update

Author: cpatino-intive

src/api/master/handlers/eddsa.ts

@@ -9,6 +9,7 @@ import {
   EddsaUtils,
   BaseCoin,
   ApiKeyShare,
+  TxRequest,
 } from '@bitgo/sdk-core';
 import { EnclavedExpressClient } from '../clients/enclavedExpressClient';
 import { exchangeEddsaCommitments } from '@bitgo/sdk-core/dist/src/bitgo/tss/common';

src/api/master/handlers/handleConsolidate.ts

@@ -2,13 +2,11 @@ import {
   RequestTracer,
   KeyIndices,
   BuildConsolidationTransactionOptions,
-  PrebuildAndSignTransactionOptions,
   getTxRequest,
 } from '@bitgo/sdk-core';
 import logger from '../../../logger';
 import { MasterApiSpecRouteRequest } from '../routers/masterApiSpec';
-import { getWalletAndSigningKeychain } from '../handlerUtils';
-import { signAndSendMultisig } from './handleSendMany';
+import { getWalletAndSigningKeychain, makeCustomSigningFunction } from '../handlerUtils';
 import { signAndSendTxRequests } from './transactionRequests';
 
 export async function handleConsolidate(
@@ -55,42 +53,43 @@ export async function handleConsolidate(
 
     const unsignedBuilds = await wallet.buildAccountConsolidations(consolidationParams);
 
-    logger.info(
+    logger.debug(
       `Consolidation request for wallet ${walletId} with ${unsignedBuilds.length} unsigned builds`,
     );
 
     if (unsignedBuilds && unsignedBuilds.length > 0) {
       for (const unsignedBuild of unsignedBuilds) {
-        const unsignedBuildWithOptions: PrebuildAndSignTransactionOptions = Object.assign(
-          {},
-          consolidationParams,
-        );
-        unsignedBuildWithOptions.apiVersion = consolidationParams.apiVersion;
-        unsignedBuildWithOptions.prebuildTx = unsignedBuild;
-
-        const txRequest = await getTxRequest(bitgo, wallet.id(), unsignedBuild.txRequestId!, reqId);
-
         try {
-          const sendTx = isMPC
+          const result = isMPC
             ? await signAndSendTxRequests(
                 bitgo,
                 wallet,
-                txRequest,
+                await getTxRequest(
+                  bitgo,
+                  wallet.id(),
+                  (() => {
+                    if (!unsignedBuild.txRequestId) {
+                      throw new Error('Missing txRequestId in unsigned build');
+                    }
+                    return unsignedBuild.txRequestId;
+                  })(),
+                  reqId,
+                ),
                 enclavedExpressClient,
                 signingKeychain,
                 reqId,
               )
-            : await signAndSendMultisig(
-                wallet,
-                params.source,
-                unsignedBuild,
-                unsignedBuildWithOptions,
-                enclavedExpressClient,
-                signingKeychain,
-                reqId,
-              );
-
-          successfulTxs.push(sendTx);
+            : await wallet.sendAccountConsolidation({
+                ...consolidationParams,
+                prebuildTx: unsignedBuild,
+                customSigningFunction: makeCustomSigningFunction({
+                  enclavedExpressClient,
+                  source: params.source,
+                  pub: signingKeychain.pub!,
+                }),
+              });
+
+          successfulTxs.push(result);
         } catch (e) {
           console.dir(e);
           failedTxs.push(e as any);

src/api/master/handlers/handleSendMany.ts

@@ -214,21 +214,16 @@ export async function signAndSendMultisig(
     pub: signingKeychain.pub,
   });
 
-  console.log('Signed transaction:', JSON.stringify(signedTx, null, 2));
-
   // Get extra prebuild parameters
-  const extraParams =
-    Array.isArray(params.recipients) && params.recipients.length > 0
-      ? await wallet.baseCoin.getExtraPrebuildParams({
-          ...params,
-          wallet,
-        })
-      : {};
+  const extraParams = await wallet.baseCoin.getExtraPrebuildParams({
+    ...params,
+    wallet,
+  });
 
   // Combine the signed transaction with extra parameters
   const finalTxParams = { ...signedTx, ...extraParams };
 
-  console.log('Final transaction parameters:', JSON.stringify(finalTxParams, null, 2));
   // Submit the half signed transaction
-  return await wallet.submitTransaction(finalTxParams, reqId);
+  const result = (await wallet.submitTransaction(finalTxParams, reqId)) as any;
+  return result;
 }