feat(mbe): fix comments

Author: cpatino-intive

src/api/master/handlers/handleConsolidate.ts

@@ -1,4 +1,4 @@
-import { RequestTracer, KeyIndices, CustomSigningFunction } from '@bitgo/sdk-core';
+import { RequestTracer, KeyIndices } from '@bitgo/sdk-core';
 import logger from '../../../logger';
 import { MasterApiSpecRouteRequest } from '../routers/masterApiSpec';
 import { getWalletAndSigningKeychain, makeCustomSigningFunction } from '../../../shared/coinUtils';

src/api/master/handlers/handleConsolidateUnspents.ts

@@ -1,46 +1,34 @@
-import { RequestTracer, KeyIndices, CustomSigningFunction } from '@bitgo/sdk-core';
+import { RequestTracer, KeyIndices } from '@bitgo/sdk-core';
 import logger from '../../../logger';
 import { MasterApiSpecRouteRequest } from '../routers/masterApiSpec';
+import { getWalletAndSigningKeychain, makeCustomSigningFunction } from '../../../shared/coinUtils';
 
 export async function handleConsolidateUnspents(
-  req: MasterApiSpecRouteRequest<'v1.wallet.consolidateUnspents', 'post'>,
+  req: MasterApiSpecRouteRequest<'v1.wallet.consolidateunspents', 'post'>,
 ) {
   const enclavedExpressClient = req.enclavedExpressClient;
   const reqId = new RequestTracer();
   const bitgo = req.bitgo;
-  const baseCoin = bitgo.coin(req.params.coin);
   const params = req.decoded;
   const walletId = req.params.walletId;
-  const wallet = await baseCoin.wallets().get({ id: walletId, reqId });
-
-  if (!wallet) {
-    throw new Error(`Wallet ${walletId} not found`);
-  }
-
-  // Get the signing keychain based on source
-  const keyIdIndex = params.source === 'user' ? KeyIndices.USER : KeyIndices.BACKUP;
-  const signingKeychain = await baseCoin.keychains().get({
-    id: wallet.keyIds()[keyIdIndex],
+  const coin = req.params.coin;
+
+  const { wallet, signingKeychain } = await getWalletAndSigningKeychain({
+    bitgo,
+    coin,
+    walletId,
+    params,
+    reqId,
+    KeyIndices,
   });
 
-  if (!signingKeychain || !signingKeychain.pub) {
-    throw new Error(`Signing keychain for ${params.source} not found`);
-  }
-
-  if (params.pubkey && params.pubkey !== signingKeychain.pub) {
-    throw new Error(`Pub provided does not match the keychain on wallet for ${params.source}`);
-  }
-
   try {
     // Create custom signing function that delegates to EBE
-    const customSigningFunction: CustomSigningFunction = async (signParams) => {
-      const signedTx = await enclavedExpressClient.signMultisig({
-        txPrebuild: signParams.txPrebuild,
-        source: params.source,
-        pub: signingKeychain.pub!,
-      });
-      return signedTx;
-    };
+    const customSigningFunction = makeCustomSigningFunction({
+      enclavedExpressClient,
+      source: params.source,
+      pub: signingKeychain.pub!,
+    });
 
     // Prepare consolidation parameters
     const consolidationParams = {

src/api/master/routers/masterApiSpec.ts

@@ -294,6 +294,21 @@ export const MasterApiSpec = apiSpec({
       description: 'Accelerate transaction',
     }),
   },
+  'v1.wallet.consolidateunspents': {
+    post: httpRoute({
+      method: 'POST',
+      path: '/api/{coin}/wallet/{walletId}/consolidateunspents',
+      request: httpRequest({
+        params: {
+          walletId: t.string,
+          coin: t.string,
+        },
+        body: ConsolidateUnspentsRequest,
+      }),
+      response: ConsolidateUnspentsResponse,
+      description: 'Consolidate unspents',
+    }),
+  },
 });
 
 export type MasterApiSpec = typeof MasterApiSpec;
@@ -362,5 +377,13 @@ export function createMasterApiRouter(
     }),
   ]);
 
+  router.post('v1.wallet.consolidateunspents', [
+    responseHandler<MasterExpressConfig>(async (req: express.Request) => {
+      const typedReq = req as GenericMasterApiSpecRouteRequest;
+      const result = await handleConsolidateUnspents(typedReq);
+      return Response.ok(result);
+    }),
+  ]);
+
   return router;
 }