chore: fix types for sendmany

Ticket: WP-4634

Author: pranavjain97

src/masterBitgoExpress/enclavedExpressClient.ts

@@ -3,8 +3,7 @@ import https from 'https';
 import debug from 'debug';
 import { MasterExpressConfig } from '../types';
 import { TlsMode } from '../types';
-import { SignMultisigOptions } from '../types/masterApiTypes';
-import { SignedTransaction } from '@bitgo/sdk-core';
+import { SignedTransaction, TransactionPrebuild } from '@bitgo/sdk-core';
 
 const debugLogger = debug('bitgo:express:enclavedExpressClient');
 
@@ -24,6 +23,12 @@ export interface IndependentKeychainResponse {
   coin: string;
 }
 
+interface SignMultisigOptions {
+  txPrebuild: TransactionPrebuild;
+  source: 'user' | 'backup';
+  pub: string;
+}
+
 export class EnclavedExpressClient {
   private readonly baseUrl: string;
   private readonly enclavedExpressCert: string;
@@ -119,7 +124,7 @@ export class EnclavedExpressClient {
 
     try {
       const res = await this.configureRequest(
-        superagent.post(`${this.baseUrl}/api/${this.coin}/signMultisig`).type('json'),
+        superagent.post(`${this.baseUrl}/api/${this.coin}/multisig/sign`).type('json'),
       ).send(params);
 
       return res.body;

src/masterBitgoExpress/handleSendMany.ts

@@ -2,10 +2,22 @@ import { RequestTracer, PrebuildTransactionOptions, Memo } from '@bitgo/sdk-core
 import { BitGoRequest } from '../types/request';
 import { createEnclavedExpressClient } from './enclavedExpressClient';
 import logger from '../logger';
-import { SendManyRequest } from './routers/masterApiSpec';
-import { TypeOf } from 'io-ts';
+import { MasterApiSpecRouteRequest } from './routers/masterApiSpec';
 
-export async function handleSendMany(req: BitGoRequest) {
+/**
+ * Defines the structure for a single recipient in a send-many transaction.
+ * This provides strong typing and autocompletion within the handler.
+ */
+interface Recipient {
+  address: string;
+  amount: string | number;
+  feeLimit?: string;
+  data?: string;
+  tokenName?: string;
+  tokenData?: any;
+}
+
+export async function handleSendMany(req: MasterApiSpecRouteRequest<'v1.wallet.sendMany', 'post'>) {
   const enclavedExpressClient = createEnclavedExpressClient(req.config, req.params.coin);
   if (!enclavedExpressClient) {
     throw new Error('Please configure enclaved express configs to sign the transactions.');
@@ -14,13 +26,16 @@ export async function handleSendMany(req: BitGoRequest) {
   const bitgo = req.bitgo;
   const baseCoin = bitgo.coin(req.params.coin);
 
-  const params = req.body as TypeOf<typeof SendManyRequest>;
+  const params = req.decoded;
+  params.recipients = params.recipients as Recipient[];
+
   const walletId = req.params.walletId;
   const wallet = await baseCoin.wallets().get({ id: walletId, reqId });
   if (!wallet) {
     throw new Error(`Wallet ${walletId} not found`);
   }
 
+  // @ts-ignore
   if (wallet.type() !== 'cold' || wallet.subType() !== 'onPrem') {
     throw new Error('Wallet is not an on-prem wallet');
   }
@@ -33,7 +48,7 @@ export async function handleSendMany(req: BitGoRequest) {
 
   // Find the user keychain for signing
   const signingKeychain = signingKeychains.find((k) => k.source === params.source);
-  if (!signingKeychain) {
+  if (!signingKeychain || !signingKeychain.pub) {
     throw new Error(`Signing keychain for ${params.source} not found`);
   }
 

src/masterBitgoExpress/routers/masterApiSpec.ts

@@ -13,7 +13,7 @@ import {
 } from '@api-ts/typed-express-router';
 import { Response } from '@api-ts/response';
 import express from 'express';
-import { BitGoRequest, isBitGoRequest } from '../../types/request';
+import { BitGoRequest } from '../../types/request';
 import { MasterExpressConfig } from '../../config';
 import { handleGenerateWalletOnPrem } from '../generateWallet';
 import { prepareBitGo, responseHandler } from '../../shared/middleware';
@@ -44,50 +44,37 @@ const GenerateWalletRequest = {
   isDistributedCustody: t.union([t.undefined, t.boolean]),
 };
 
-export const SendManyRequest = t.intersection([
-  t.type({
-    pubkey: t.string,
-    source: t.union([t.literal('user'), t.literal('backup')]),
-    recipients: t.array(
-      t.type({
-        address: t.string,
-        amount: t.union([t.string, t.number]),
-        feeLimit: t.union([t.undefined, t.string]),
-        data: t.union([t.undefined, t.string]),
-        tokenName: t.union([t.undefined, t.string]),
-        tokenData: t.union([t.undefined, t.any]),
-      }),
-    ),
-  }),
-  t.partial({
-    numBlocks: t.number,
-    feeRate: t.number,
-    feeMultiplier: t.number,
-    maxFeeRate: t.number,
-    minConfirms: t.number,
-    enforceMinConfirmsForChange: t.boolean,
-    targetWalletUnspents: t.number,
-    message: t.string,
-    minValue: t.union([t.number, t.string]),
-    maxValue: t.union([t.number, t.string]),
-    sequenceId: t.string,
-    lastLedgerSequence: t.number,
-    ledgerSequenceDelta: t.number,
-    gasPrice: t.number,
-    noSplitChange: t.boolean,
-    unspents: t.array(t.string),
-    comment: t.string,
-    otp: t.string,
-    changeAddress: t.string,
-    allowExternalChangeAddress: t.boolean,
-    instant: t.boolean,
-    memo: t.string,
-    transferId: t.number,
-    eip1559: t.any,
-    gasLimit: t.number,
-    custodianTransactionId: t.string,
-  }),
-]);
+export const SendManyRequest = {
+  pubkey: t.string,
+  source: t.union([t.literal('user'), t.literal('backup')]),
+  recipients: t.array(t.any),
+  numBlocks: t.union([t.undefined, t.number]),
+  feeRate: t.union([t.undefined, t.number]),
+  feeMultiplier: t.union([t.undefined, t.number]),
+  maxFeeRate: t.union([t.undefined, t.number]),
+  minConfirms: t.union([t.undefined, t.number]),
+  enforceMinConfirmsForChange: t.union([t.undefined, t.boolean]),
+  targetWalletUnspents: t.union([t.undefined, t.number]),
+  message: t.union([t.undefined, t.string]),
+  minValue: t.union([t.undefined, t.union([t.number, t.string])]),
+  maxValue: t.union([t.undefined, t.union([t.number, t.string])]),
+  sequenceId: t.union([t.undefined, t.string]),
+  lastLedgerSequence: t.union([t.undefined, t.number]),
+  ledgerSequenceDelta: t.union([t.undefined, t.number]),
+  gasPrice: t.union([t.undefined, t.number]),
+  noSplitChange: t.union([t.undefined, t.boolean]),
+  unspents: t.union([t.undefined, t.array(t.string)]),
+  comment: t.union([t.undefined, t.string]),
+  otp: t.union([t.undefined, t.string]),
+  changeAddress: t.union([t.undefined, t.string]),
+  allowExternalChangeAddress: t.union([t.undefined, t.boolean]),
+  instant: t.union([t.undefined, t.boolean]),
+  memo: t.union([t.undefined, t.string]),
+  transferId: t.union([t.undefined, t.number]),
+  eip1559: t.union([t.undefined, t.any]),
+  gasLimit: t.union([t.undefined, t.number]),
+  custodianTransactionId: t.union([t.undefined, t.string]),
+};
 
 export const SendManyResponse: HttpResponse = {
   // TODO: Get type from public types repo / Wallet Platform
@@ -102,7 +89,7 @@ export const SendManyResponse: HttpResponse = {
 export const MasterApiSpec = apiSpec({
   'v1.wallet.generate': {
     post: httpRoute({
-      method: 'POST',
+      method: 'POST' as const,
       path: '/{coin}/wallet/generate',
       request: httpRequest({
         params: {