Merge pull request #7732 from BitGo/COIN-6732

chore: fix unsigned sweep consolidation not working for SUI and SOL

Author: Venkat-Annavazzala

modules/sdk-coin-sol/src/sol.ts

@@ -1074,7 +1074,7 @@ export class Sol extends BaseCoin {
     }
 
     const bitgoKey = params.bitgoKey.replace(/\s/g, '');
-    const isUnsignedSweep = !params.userKey && !params.backupKey && !params.walletPassphrase;
+    const isUnsignedSweep = !params.walletPassphrase;
 
     // Build the transaction
     const MPC = await EDDSAMethods.getInitializedMpcInstance();
@@ -1575,7 +1575,7 @@ export class Sol extends BaseCoin {
    * @param {string} [params.endingScanIndex] - receive address index to end scanning at. default to startingScanIndex + 20 (exclusive).
    */
   async recoverConsolidations(params: SolConsolidationRecoveryOptions): Promise<MPCTxs | MPCSweepTxs> {
-    const isUnsignedSweep = !params.userKey && !params.backupKey && !params.walletPassphrase;
+    const isUnsignedSweep = !params.walletPassphrase;
     const startIdx = params.startingScanIndex || 1;
     const endIdx = params.endingScanIndex || startIdx + DEFAULT_SCAN_FACTOR;
 

modules/sdk-coin-sol/test/unit/sol.ts

@@ -2111,16 +2111,6 @@ describe('SOL:', function () {
         })
         .should.rejectedWith('missing backupKey');
 
-      // missing wallet passphrase
-      await basecoin
-        .recover({
-          userKey: testData.keys.userKey,
-          backupKey: testData.keys.backupKey,
-          bitgoKey: testData.keys.bitgoKey,
-          recoveryDestination: testData.keys.destinationPubKey,
-        })
-        .should.rejectedWith('missing wallet passphrase');
-
       // incorrect wallet passphrase, user key, backup key combination
       await basecoin
         .recover({

modules/sdk-coin-sui/src/sui.ts

@@ -425,7 +425,7 @@ export class Sui extends BaseCoin {
         payment: inputCoins,
       });
 
-      const isUnsignedSweep = !params.userKey && !params.backupKey && !params.walletPassphrase;
+      const isUnsignedSweep = !params.walletPassphrase;
       if (isUnsignedSweep) {
         return this.buildUnsignedSweepTransaction(txBuilder, senderAddress, bitgoKey, idx, derivationPath);
       }
@@ -509,7 +509,7 @@ export class Sui extends BaseCoin {
       payment: gasObjects,
     });
 
-    const isUnsignedSweep = !params.userKey && !params.backupKey && !params.walletPassphrase;
+    const isUnsignedSweep = !params.walletPassphrase;
     if (isUnsignedSweep) {
       return this.buildUnsignedSweepTransaction(txBuilder, senderAddress, bitgoKey, idx, derivationPath, token);
     }
@@ -733,7 +733,7 @@ export class Sui extends BaseCoin {
    * @param {string} [params.endingScanIndex] - receive address index to end scanning at. default to startingScanIndex + 20 (exclusive).
    */
   async recoverConsolidations(params: MPCConsolidationRecoveryOptions): Promise<MPCTxs | MPCSweepTxs> {
-    const isUnsignedSweep = !params.userKey && !params.backupKey && !params.walletPassphrase;
+    const isUnsignedSweep = !params.walletPassphrase;
     const startIdx = utils.validateNonNegativeNumber(
       1,
       'Invalid starting index to scan for addresses',