fix(mbe): fix/tested mpcv2 signing with custom fns

Ticket: WP-5232

Author: pranavjain97

src/api/master/clients/enclavedExpressClient.ts

@@ -597,30 +597,29 @@ export class EnclavedExpressClient {
     }
   }
 
-/**
- * Create custom MPCv2 Round 1 signing function for enclaved express client
- */
-export function signMPCv2Round1(
-  enclavedExpressClient: EnclavedExpressClient,
-  source: 'user' | 'backup',
-  pub: string,
-): (params: SignMpcV2Round1Params) => Promise<SignMpcV2Round1Response> {
-  return async function (params): Promise<SignMpcV2Round1Response> {
-    if (!enclavedExpressClient['coin']) {
+  /**
+   * Sign MPCv2 Round 1
+   */
+  async signMPCv2Round1(
+    source: 'user' | 'backup',
+    pub: string,
+    params: SignMpcV2Round1Params,
+  ): Promise<SignMpcV2Round1Response> {
+    if (!this['coin']) {
       throw new Error('Coin must be specified to sign an MPCv2 Round 1');
     }
 
     try {
-      let request = enclavedExpressClient['apiClient']['v1.mpc.sign'].post({
-        coin: enclavedExpressClient['coin'],
+      let request = this['apiClient']['v1.mpc.sign'].post({
+        coin: this['coin'],
         shareType: 'mpcv2round1',
         ...params,
         source,
         pub,
       });
 
-      if (enclavedExpressClient['tlsMode'] === TlsMode.MTLS) {
-        request = request.agent(enclavedExpressClient['createHttpsAgent']());
+      if (this['tlsMode'] === TlsMode.MTLS) {
+        request = request.agent(this['createHttpsAgent']());
       }
       const response = await request.decodeExpecting(200);
       return response.body;
@@ -629,33 +628,31 @@ export function signMPCv2Round1(
       debugLogger('Failed to sign mpcv2 round 1: %s', err.message);
       throw err;
     }
-  };
-}
+  }
 
-/**
- * Create custom MPCv2 Round 2 signing function for enclaved express client
- */
-export function signMPCv2Round2(
-  enclavedExpressClient: EnclavedExpressClient,
-  source: 'user' | 'backup',
-  pub: string,
-): (params: SignMpcV2Round2Params) => Promise<SignMpcV2Round2Response> {
-  return async function (params): Promise<SignMpcV2Round2Response> {
-    if (!enclavedExpressClient['coin']) {
+  /**
+   * Sign MPCv2 Round 2
+   */
+  async signMPCv2Round2(
+    source: 'user' | 'backup',
+    pub: string,
+    params: SignMpcV2Round2Params,
+  ): Promise<SignMpcV2Round2Response> {
+    if (!this['coin']) {
       throw new Error('Coin must be specified to sign an MPCv2 Round 2');
     }
 
     try {
-      let request = enclavedExpressClient['apiClient']['v1.mpc.sign'].post({
-        coin: enclavedExpressClient['coin'],
+      let request = this['apiClient']['v1.mpc.sign'].post({
+        coin: this['coin'],
         shareType: 'mpcv2round2',
         ...params,
         source,
         pub,
       });
 
-      if (enclavedExpressClient['tlsMode'] === TlsMode.MTLS) {
-        request = request.agent(enclavedExpressClient['createHttpsAgent']());
+      if (this['tlsMode'] === TlsMode.MTLS) {
+        request = request.agent(this['createHttpsAgent']());
       }
       const response = await request.decodeExpecting(200);
       return response.body;
@@ -664,33 +661,31 @@ export function signMPCv2Round2(
       debugLogger('Failed to sign mpcv2 round 2: %s', err.message);
       throw err;
     }
-  };
-}
+  }
 
-/**
- * Create custom MPCv2 Round 3 signing function for enclaved express client
- */
-export function signMPCv2Round3(
-  enclavedExpressClient: EnclavedExpressClient,
-  source: 'user' | 'backup',
-  pub: string,
-): (params: SignMpcV2Round3Params) => Promise<SignMpcV2Round3Response> {
-  return async function (params): Promise<SignMpcV2Round3Response> {
-    if (!enclavedExpressClient['coin']) {
+  /**
+   * Sign MPCv2 Round 3
+   */
+  async signMPCv2Round3(
+    source: 'user' | 'backup',
+    pub: string,
+    params: SignMpcV2Round3Params,
+  ): Promise<SignMpcV2Round3Response> {
+    if (!this['coin']) {
       throw new Error('Coin must be specified to sign an MPCv2 Round 3');
     }
 
     try {
-      let request = enclavedExpressClient['apiClient']['v1.mpc.sign'].post({
-        coin: enclavedExpressClient['coin'],
+      let request = this['apiClient']['v1.mpc.sign'].post({
+        coin: this['coin'],
         shareType: 'mpcv2round3',
         ...params,
         source,
         pub,
       });
 
-      if (enclavedExpressClient['tlsMode'] === TlsMode.MTLS) {
-        request = request.agent(enclavedExpressClient['createHttpsAgent']());
+      if (this['tlsMode'] === TlsMode.MTLS) {
+        request = request.agent(this['createHttpsAgent']());
       }
       const response = await request.decodeExpecting(200);
       return response.body;
@@ -699,7 +694,7 @@ export function signMPCv2Round3(
       debugLogger('Failed to sign mpcv2 round 3: %s', err.message);
       throw err;
     }
-  };
+  }
 }
 
 /**

src/api/master/handlers/ecdsa.ts

@@ -11,9 +11,6 @@ import {
   EnclavedExpressClient,
   SignMpcV2Round1Response,
   SignMpcV2Round2Response,
-  signMPCv2Round1,
-  signMPCv2Round2,
-  signMPCv2Round3,
 } from '../clients/enclavedExpressClient';
 
 export async function handleEcdsaSigning(
@@ -33,13 +30,13 @@ export async function handleEcdsaSigning(
   let round2Response: SignMpcV2Round2Response;
 
   // Create custom signing methods that maintain state
-  const customRound1Signer = async (params: { txRequest: TxRequest }) => {
-    const response = await signMPCv2Round1(enclavedExpressClient, source, commonKeychain)(params);
+  const customMPCv2Round1Generator = async (params: { txRequest: TxRequest }) => {
+    const response = await enclavedExpressClient.signMPCv2Round1(source, commonKeychain, params);
     round1Response = response;
     return response;
   };
 
-  const customRound2Signer = async (params: {
+  const customMPCv2Round2Generator = async (params: {
     txRequest: TxRequest;
     encryptedUserGpgPrvKey: string;
     encryptedRound1Session: string;
@@ -48,11 +45,7 @@ export async function handleEcdsaSigning(
     if (!round1Response) {
       throw new Error('Round 1 must be completed before Round 2');
     }
-    const response = await signMPCv2Round2(
-      enclavedExpressClient,
-      source,
-      commonKeychain,
-    )({
+    const response = await enclavedExpressClient.signMPCv2Round2(source, commonKeychain, {
       ...params,
       encryptedDataKey: round1Response.encryptedDataKey,
       encryptedRound1Session: round1Response.encryptedRound1Session,
@@ -63,20 +56,16 @@ export async function handleEcdsaSigning(
     return response;
   };
 
-  const customRound3Signer = async (params: {
+  const customMPCv2Round3Generator = async (params: {
     txRequest: TxRequest;
     encryptedUserGpgPrvKey: string;
     encryptedRound2Session: string;
     bitgoPublicGpgKey: string;
   }) => {
     if (!round2Response) {
-      throw new Error('Round 1 must be completed before Round 3');
+      throw new Error('Round 2 must be completed before Round 3');
     }
-    return await signMPCv2Round3(
-      enclavedExpressClient,
-      source,
-      commonKeychain,
-    )({
+    return await enclavedExpressClient.signMPCv2Round3(source, commonKeychain, {
       ...params,
       encryptedDataKey: round1Response.encryptedDataKey,
       encryptedRound2Session: round2Response.encryptedRound2Session,
@@ -88,9 +77,9 @@ export async function handleEcdsaSigning(
   // Use the existing signEcdsaMPCv2TssUsingExternalSigner method with our custom signers
   return await ecdsaMPCv2Utils.signEcdsaMPCv2TssUsingExternalSigner(
     { txRequest, reqId },
-    customRound1Signer,
-    customRound2Signer,
-    customRound3Signer,
+    customMPCv2Round1Generator,
+    customMPCv2Round2Generator,
+    customMPCv2Round3Generator,
     RequestType.tx,
   );
 }