chore(advanced-wallets): use bitgoPublicGpgKey consistently

Ticket: WP-5232

Author: pranavjain97

src/__tests__/api/enclaved/signMpcTransaction.test.ts

@@ -122,7 +122,7 @@ describe('signMpcTransaction', () => {
         source: 'user',
         pub: 'DSqMPMsMAbEJVNuPKv1ZFdzt6YvJaDPDddfeW7ajtqds',
         txRequest: mockTxRequest,
-        bitgoGpgPubKey: bitgoGpgPubKey,
+        bitgoPublicGpgKey: bitgoGpgPubKey,
       };
 
       const mockDataKeyResponse = {
@@ -275,46 +275,19 @@ describe('signMpcTransaction', () => {
     });
 
     it('should fail for unsupported share type', async () => {
-      const user = MPC.keyShare(1, 2, 3);
-      const backup = MPC.keyShare(2, 2, 3);
-      const bitgo = MPC.keyShare(3, 2, 3);
-
-      const userSigningMaterial = {
-        uShare: user.uShare,
-        bitgoYShare: bitgo.yShares[1],
-        backupYShare: backup.yShares[1],
-      };
-
-      const mockKmsResponse = {
-        prv: JSON.stringify(userSigningMaterial),
-        pub: 'DSqMPMsMAbEJVNuPKv1ZFdzt6YvJaDPDddfeW7ajtqds',
-        source: 'user',
-        type: 'independent',
-      };
-
       const input = {
         source: 'user',
         pub: 'DSqMPMsMAbEJVNuPKv1ZFdzt6YvJaDPDddfeW7ajtqds',
         txRequest: mockTxRequest,
       };
 
-      const kmsNock = nock(kmsUrl)
-        .get(`/key/${input.pub}`)
-        .query({ source: 'user', useLocalEncipherment: false })
-        .reply(200, mockKmsResponse);
-
       const response = await agent
         .post(`/api/${coin}/mpc/sign/invalid`)
         .set('Authorization', `Bearer ${accessToken}`)
         .send(input);
 
-      response.status.should.equal(500);
+      response.status.should.equal(400);
       response.body.should.have.property('error');
-      response.body.details.should.equal(
-        'Share type invalid not supported for EDDSA, only commitment, G and R share generation is supported.',
-      );
-
-      kmsNock.done();
     });
 
     it('should fail when required fields are missing', async () => {
@@ -389,7 +362,7 @@ describe('signMpcTransaction', () => {
         source: 'user',
         pub: 'mock-ecdsa-public-key',
         txRequest: mockTxRequest,
-        bitgoGpgPubKey: bitgoGpgKey.public,
+        bitgoPublicGpgKey: bitgoGpgKey.public,
       };
 
       const mockDataKeyResponse = {
@@ -449,7 +422,7 @@ describe('signMpcTransaction', () => {
         source: 'user',
         pub: 'mock-ecdsa-public-key',
         txRequest: txRequestRound1,
-        bitgoGpgPubKey: bitgoGpgKey.public,
+        bitgoPublicGpgKey: bitgoGpgKey.public,
         encryptedDataKey,
         encryptedUserGpgPrvKey,
         encryptedRound1Session,
@@ -501,7 +474,7 @@ describe('signMpcTransaction', () => {
         source: 'user',
         pub: 'mock-ecdsa-public-key',
         txRequest: txRequestRound2,
-        bitgoGpgPubKey: bitgoGpgKey.public,
+        bitgoPublicGpgKey: bitgoGpgKey.public,
         encryptedDataKey,
         encryptedUserGpgPrvKey,
         encryptedRound2Session,
@@ -643,36 +616,19 @@ describe('signMpcTransaction', () => {
     });
 
     it('should fail for unsupported share type', async () => {
-      const mockKmsResponse = {
-        prv: 'mock-ecdsa-private-key',
-        pub: 'mock-ecdsa-public-key',
-        source: 'user',
-        type: 'independent',
-      };
-
       const input = {
         source: 'user',
         pub: 'mock-ecdsa-public-key',
         txRequest: mockTxRequest,
       };
 
-      const kmsNock = nock(kmsUrl)
-        .get(`/key/${input.pub}`)
-        .query({ source: 'user', useLocalEncipherment: true })
-        .reply(200, mockKmsResponse);
-
       const response = await agent
         .post(`/api/${coin}/mpc/sign/invalid`)
         .set('Authorization', `Bearer ${accessToken}`)
         .send(input);
 
-      response.status.should.equal(500);
+      response.status.should.equal(400);
       response.body.should.have.property('error');
-      response.body.details.should.equal(
-        'Share type invalid not supported for MPCv2, only MPCv2Round1, MPCv2Round2 and MPCv2Round3 is supported.',
-      );
-
-      kmsNock.done();
     });
   });
 });

src/api/enclaved/handlers/signMpcTransaction.ts

@@ -68,7 +68,7 @@ interface EddsaSigningParams {
   userToBitgoRShare?: SignShare;
   encryptedUserToBitgoRShare?: EncryptedSignerShareRecord;
   bitgoToUserCommitment?: CommitmentShareRecord;
-  bitgoGpgPubKey?: string;
+  bitgoPublicGpgKey?: string;
 }
 
 // Unified parameters for handleEcdsaSigning - includes all possible fields
@@ -77,7 +77,7 @@ interface EcdsaSigningParams {
   shareType: ShareType;
   txRequest: TxRequest;
   prv: string;
-  bitgoGpgPubKey?: string;
+  bitgoPublicGpgKey?: string;
   encryptedDataKey?: string;
   encryptedUserGpgPrvKey?: string;
   encryptedRound1Session?: string;
@@ -119,15 +119,15 @@ export async function signMpcTransaction(req: EnclavedApiSpecRouteRequest<'v1.mp
         userToBitgoRShare: req.decoded.userToBitgoRShare,
         encryptedUserToBitgoRShare: req.decoded.encryptedUserToBitgoRShare,
         bitgoToUserCommitment: req.decoded.bitgoToUserCommitment,
-        bitgoGpgPubKey: req.decoded.bitgoGpgPubKey,
+        bitgoPublicGpgKey: req.decoded.bitgoPublicGpgKey,
       });
     } else if (mpcAlgorithm === MPCType.ECDSA) {
       return await handleEcdsaMpcV2Signing(req.bitgo, req.config, {
         coin: coinInstance,
-        shareType,
+        shareType: shareType as ShareType,
         txRequest: req.decoded.txRequest,
         prv,
-        bitgoGpgPubKey: req.decoded.bitgoGpgPubKey,
+        bitgoPublicGpgKey: req.decoded.bitgoPublicGpgKey,
         encryptedDataKey: req.decoded.encryptedDataKey,
         encryptedUserGpgPrvKey: req.decoded.encryptedUserGpgPrvKey,
         encryptedRound1Session: req.decoded.encryptedRound1Session,
@@ -164,23 +164,23 @@ async function handleEddsaSigning(
     userToBitgoRShare,
     encryptedUserToBitgoRShare,
     bitgoToUserCommitment,
-    bitgoGpgPubKey,
+    bitgoPublicGpgKey,
   } = params;
 
   // Create EddsaUtils instance using the coin's bitgo instance
   const eddsaUtils = new EddsaUtils(bitgo, coin);
 
   switch (shareType.toLowerCase()) {
     case ShareType.Commitment: {
-      if (!bitgoGpgPubKey) {
-        throw new Error('bitgoGpgPubKey is required for commitment share generation');
+      if (!bitgoPublicGpgKey) {
+        throw new Error('bitgoPublicGpgKey is required for commitment share generation');
       }
       const dataKey = await generateDataKey({ keyType: 'AES-256', cfg });
       const commitmentParams: CommitmentShareParams = {
         txRequest,
         prv,
         walletPassphrase: dataKey.plaintextKey,
-        bitgoGpgPubKey,
+        bitgoGpgPubKey: bitgoPublicGpgKey,
       };
       return {
         ...(await eddsaUtils.createCommitmentShareFromTxRequest(commitmentParams)),
@@ -257,8 +257,8 @@ async function handleEcdsaMpcV2Signing(
       if (!params.encryptedDataKey) {
         throw new Error('encryptedDataKey from Round 1 is required for MPCv2 Round 2');
       }
-      if (!params.bitgoGpgPubKey) {
-        throw new Error('bitgoGpgPubKey is required for MPCv2 Round 2');
+      if (!params.bitgoPublicGpgKey) {
+        throw new Error('bitgoPublicGpgKey is required for MPCv2 Round 2');
       }
       if (!params.encryptedUserGpgPrvKey) {
         throw new Error('encryptedUserGpgPrvKey is required for MPCv2 Round 2');
@@ -274,7 +274,7 @@ async function handleEcdsaMpcV2Signing(
         txRequest: params.txRequest,
         prv: params.prv,
         walletPassphrase: plaintextDataKey,
-        bitgoPublicGpgKey: params.bitgoGpgPubKey,
+        bitgoPublicGpgKey: params.bitgoPublicGpgKey,
         encryptedUserGpgPrvKey: params.encryptedUserGpgPrvKey,
         encryptedRound1Session: params.encryptedRound1Session,
       });
@@ -283,7 +283,7 @@ async function handleEcdsaMpcV2Signing(
       if (!params.encryptedDataKey) {
         throw new Error('encryptedDataKey from Round 1 is required for MPCv2 Round 3');
       }
-      if (!params.bitgoGpgPubKey) {
+      if (!params.bitgoPublicGpgKey) {
         throw new Error('bitgoGpgPubKey is required for MPCv2 Round 3');
       }
       if (!params.encryptedUserGpgPrvKey) {
@@ -300,7 +300,7 @@ async function handleEcdsaMpcV2Signing(
         txRequest: params.txRequest,
         prv: params.prv,
         walletPassphrase: plaintextDataKey,
-        bitgoPublicGpgKey: params.bitgoGpgPubKey,
+        bitgoPublicGpgKey: params.bitgoPublicGpgKey,
         encryptedUserGpgPrvKey: params.encryptedUserGpgPrvKey,
         encryptedRound2Session: params.encryptedRound2Session,
       });

src/api/master/clients/enclavedExpressClient.ts

@@ -90,7 +90,7 @@ interface RecoveryMultisigOptions {
 
 interface SignMpcCommitmentParams {
   txRequest: TxRequest;
-  bitgoGpgPubKey: string;
+  bitgoPublicGpgKey: string;
   source: 'user' | 'backup';
   pub: string;
 }
@@ -146,7 +146,6 @@ interface SignMpcV2Round2Params {
   encryptedRound1Session: string;
   encryptedDataKey: string;
   bitgoPublicGpgKey: string;
-  bitgoGpgPubKey: string;
 }
 
 export interface SignMpcV2Round2Response {
@@ -160,7 +159,6 @@ interface SignMpcV2Round3Params {
   encryptedRound2Session: string;
   encryptedDataKey: string;
   bitgoPublicGpgKey: string;
-  bitgoGpgPubKey: string;
 }
 
 export interface SignMpcV2Round3Response {

src/api/master/handlers/ecdsa.ts

@@ -59,7 +59,7 @@ export async function handleEcdsaSigning(
       encryptedDataKey: round1Response.encryptedDataKey,
       encryptedRound1Session: round1Response.encryptedRound1Session,
       encryptedUserGpgPrvKey: round1Response.encryptedUserGpgPrvKey,
-      bitgoGpgPubKey: params.bitgoPublicGpgKey,
+      bitgoPublicGpgKey: params.bitgoPublicGpgKey,
     });
     round2Response = response;
     return response;
@@ -83,7 +83,7 @@ export async function handleEcdsaSigning(
       encryptedDataKey: round1Response.encryptedDataKey,
       encryptedRound2Session: round2Response.encryptedRound2Session,
       encryptedUserGpgPrvKey: round1Response.encryptedUserGpgPrvKey,
-      bitgoGpgPubKey: params.bitgoPublicGpgKey,
+      bitgoPublicGpgKey: params.bitgoPublicGpgKey,
     });
   };
 

src/api/master/handlers/eddsa.ts

@@ -35,7 +35,7 @@ export async function handleEddsaSigning(
     encryptedDataKey,
   } = await enclavedExpressClient.signMpcCommitment({
     txRequest,
-    bitgoGpgPubKey: bitgoGpgKey.armor(),
+    bitgoPublicGpgKey: bitgoGpgKey.armor(),
     source: 'user',
     pub: commonKeychain,
   });

src/enclavedBitgoExpress/routers/enclavedApiSpec.ts

@@ -91,7 +91,7 @@ const SignMpcRequest = {
   userToBitgoRShare: t.union([t.undefined, t.any]),
   encryptedUserToBitgoRShare: t.union([t.undefined, t.any]),
   bitgoToUserCommitment: t.union([t.undefined, t.any]),
-  bitgoGpgPubKey: t.union([t.undefined, t.string]),
+  bitgoPublicGpgKey: t.union([t.undefined, t.string]),
   encryptedDataKey: t.union([t.undefined, t.string]),
 
   // ECDSA MPCv2 specific fields
@@ -337,7 +337,14 @@ export const EnclavedAPiSpec = apiSpec({
       request: httpRequest({
         params: {
           coin: t.string,
-          shareType: t.string,
+          shareType: t.union([
+            t.literal('commitment'),
+            t.literal('r'),
+            t.literal('g'),
+            t.literal('mpcv2round1'),
+            t.literal('mpcv2round2'),
+            t.literal('mpcv2round3'),
+          ]),
         },
         body: SignMpcRequest,
       }),