refactor: followups for splitting awm

Ticket: WCN-1082

Author: danielpeng1

src/__tests__/api/advancedWalletManager/recoveryMultisigTransaction.test.ts

@@ -264,7 +264,7 @@ describe('UTXO recovery — external signing mode', () => {
     backupNock.done();
   });
 
-  it('should return 500 if user sign call fails', async () => {
+  it('surfaces key-provider signing failures as BitgoApiResponseError', async () => {
     nock(keyProviderUrl)
       .post('/sign', (body) => body.source === 'user')
       .reply(500, { message: 'HSM error' });
@@ -278,7 +278,8 @@ describe('UTXO recovery — external signing mode', () => {
       coin,
     });
 
-    response.status.should.equal(500);
+    response.body.error.should.equal('BitGoApiResponseError');
+    response.body.details.should.eql({ keySource: 'user' });
   });
 
   it('keyToSign=user: calls user key provider only and returns a half-signed tx', async () => {

src/__tests__/api/master/asyncJobWorker.test.ts

@@ -676,36 +676,5 @@ describe('asyncJobWorker', () => {
         /expected txHex or halfSigned/,
       );
     });
-
-    it('uses awmBackupResponse as the final tx for split-AWM two-phase recovery', async () => {
-      const halfSignedHex = 'half-signed-tx-hex';
-      const fullSignedHex = 'full-signed-tx-hex';
-      const job = makeRecoveryJob({
-        awmResponse: awmOk({ txHex: halfSignedHex }),
-        awmBackupResponse: awmOk({ txHex: fullSignedHex }),
-      });
-
-      const updateNock = nock(BRIDGE_URL)
-        .patch(
-          `/job/${job.jobId}`,
-          (body) => body.status === 'complete' && body.result?.txHex === fullSignedHex,
-        )
-        .reply(204);
-
-      await handleMultisigRecoveryOperation(job, bridge, bitgo);
-
-      updateNock.done();
-    });
-
-    it('throws when awmBackupResponse is present but not a valid signed transaction', async () => {
-      const job = makeRecoveryJob({
-        awmResponse: awmOk({ txHex: 'half-signed-tx-hex' }),
-        awmBackupResponse: { status: 200, body: { bad: 'shape' } },
-      });
-
-      await handleMultisigRecoveryOperation(job, bridge, bitgo).should.be.rejectedWith(
-        /expected txHex or halfSigned/,
-      );
-    });
   });
 });

src/__tests__/api/master/multisigRecoveryUtils.test.ts

@@ -86,7 +86,7 @@ describe('multisigRecoveryUtils', () => {
       bridgeNock.done();
     });
 
-    it('submits with user,backup sources for split-AWM recovery', async () => {
+    it('accepts multiple sources when explicitly passed', async () => {
       const jobId = 'job-456';
       const bridgeNock = nock(bridgeUrl)
         .post(`/api/${coin}/multisig/recovery`, (body) => {

src/__tests__/api/master/recoveryConsolidationsWallet.test.ts

@@ -9,7 +9,10 @@ import {
   BitGoAPITestHarness,
   DEFAULT_ASYNC_MODE_CONFIG,
   makeMasterExpressTestConfig,
+  makeSplitAwmMasterExpressConfig,
   nockAsyncMultisigRecoveryJob,
+  nockAsyncRecoveryJobBypass,
+  nockSplitAwmMultisigRecovery,
 } from './testUtils';
 
 describe('POST /api/v1/:coin/advancedwallet/recoveryconsolidations', () => {
@@ -735,4 +738,74 @@ describe('POST /api/v1/:coin/advancedwallet/recoveryconsolidations', () => {
       );
     });
   });
+
+  describe('Split AWM (separate user and backup AWMs)', () => {
+    const halfSignedTxHex = 'half-signed-trx-tx';
+    const fullSignedTxHex = 'signed-trx-tx';
+
+    const trxConsolidationRequest = {
+      multisigType: 'onchain' as const,
+      userPub: mockUserPub,
+      backupPub: mockBackupPub,
+      bitgoPub: mockBitgoPub,
+      tokenContractAddress: trxTokenContractAddress,
+      startingScanIndex: 1,
+      endingScanIndex: 3,
+    };
+
+    function nockTrxTwoAddressConsolidationScan() {
+      const tronBalanceWithToken = {
+        data: [{ balance: 200_000_000, trc20: [{ [trxTokenContractAddress]: '1000000' }] }],
+      };
+      nock(tronBase).get(`/v1/accounts/${TRX_ADDR_1}`).reply(200, tronBalanceWithToken);
+      nock(tronBase).post('/wallet/triggersmartcontract').reply(200, { transaction: TRON_MOCK_TX });
+      nock(tronBase).get(`/v1/accounts/${TRX_ADDR_2}`).reply(200, tronBalanceWithToken);
+      nock(tronBase).post('/wallet/triggersmartcontract').reply(200, { transaction: TRON_MOCK_TX });
+    }
+
+    it('calls user AWM with keyToSign=user then backup AWM with keyToSign=backup per tx', async () => {
+      nockTrxTwoAddressConsolidationScan();
+      const { userAwmNock, backupAwmNock } = nockSplitAwmMultisigRecovery({
+        coin: 'trx',
+        halfSignedTxHex,
+        fullSignedTxHex,
+        times: 2,
+      });
+
+      const response = await request
+        .agent(expressApp(makeSplitAwmMasterExpressConfig()))
+        .post('/api/v1/trx/advancedwallet/recoveryconsolidations')
+        .set('Authorization', `Bearer ${accessToken}`)
+        .send(trxConsolidationRequest);
+
+      response.status.should.equal(200);
+      response.body.signedTxs.should.have.length(2);
+      response.body.signedTxs[0].should.have.property('txHex', fullSignedTxHex);
+      userAwmNock.done();
+      backupAwmNock.done();
+    });
+
+    it('stays sync when async mode is enabled (bridge is not called)', async () => {
+      nockTrxTwoAddressConsolidationScan();
+      const bridgeNock = nockAsyncRecoveryJobBypass('trx');
+      const { userAwmNock, backupAwmNock } = nockSplitAwmMultisigRecovery({
+        coin: 'trx',
+        halfSignedTxHex,
+        fullSignedTxHex,
+        times: 2,
+      });
+
+      const response = await request
+        .agent(expressApp(makeSplitAwmMasterExpressConfig({ asyncEnabled: true })))
+        .post('/api/v1/trx/advancedwallet/recoveryconsolidations')
+        .set('Authorization', `Bearer ${accessToken}`)
+        .send(trxConsolidationRequest);
+
+      response.status.should.equal(200);
+      response.body.signedTxs.should.have.length(2);
+      userAwmNock.done();
+      backupAwmNock.done();
+      bridgeNock.isDone().should.be.false();
+    });
+  });
 });