Merge pull request #5763 from BitGo/WIN-4768

fix(sdk-coin-sol): set fee for unsigned sweep

Author: hitansh-madan

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

@@ -788,12 +788,6 @@ export class Sol extends BaseCoin {
     let totalFee = new BigNumber(0);
     let totalFeeForTokenRecovery = new BigNumber(0);
 
-    if (params.durableNonce) {
-      const durableNonceInfo = await this.getAccountInfo(params.durableNonce.publicKey);
-      blockhash = durableNonceInfo.blockhash;
-      authority = durableNonceInfo.authority;
-    }
-
     // check for possible token recovery, recover the token provide by user
     if (params.tokenContractAddress) {
       const tokenAccounts = await this.getTokenAccountsByOwner(bs58EncodedPublicKey);
@@ -876,6 +870,10 @@ export class Sol extends BaseCoin {
     }
 
     if (params.durableNonce) {
+      const durableNonceInfo = await this.getAccountInfo(params.durableNonce.publicKey);
+      blockhash = durableNonceInfo.blockhash;
+      authority = durableNonceInfo.authority;
+
       txBuilder.nonce(blockhash, {
         walletNonceAddress: params.durableNonce.publicKey,
         authWalletAddress: authority,
@@ -886,13 +884,43 @@ export class Sol extends BaseCoin {
     const unsignedTransactionWithoutFee = (await txBuilder.build()) as Transaction;
     const serializedMessage = unsignedTransactionWithoutFee.solTransaction.serializeMessage().toString('base64');
 
-    const feePerSignature = await this.getFeeForMessage(serializedMessage);
-    const baseFee = params.durableNonce ? feePerSignature * 2 : feePerSignature;
+    const baseFee = await this.getFeeForMessage(serializedMessage);
+    const feePerSignature = params.durableNonce ? baseFee / 2 : baseFee;
     totalFee = totalFee.plus(new BigNumber(baseFee));
     totalFeeForTokenRecovery = totalFeeForTokenRecovery.plus(new BigNumber(baseFee));
     if (totalFee.gt(balance)) {
       throw Error('Did not find address with funds to recover');
     }
+
+    if (params.tokenContractAddress) {
+      // Check if there is sufficient native solana to recover tokens
+      if (new BigNumber(balance).lt(totalFeeForTokenRecovery)) {
+        throw Error(
+          'Not enough funds to pay for recover tokens fees, have: ' +
+            balance +
+            ' need: ' +
+            totalFeeForTokenRecovery.toString()
+        );
+      }
+      txBuilder.fee({ amount: feePerSignature });
+    } else {
+      const netAmount = new BigNumber(balance).minus(totalFee);
+      txBuilder = factory
+        .getTransferBuilder()
+        .nonce(blockhash)
+        .sender(bs58EncodedPublicKey)
+        .send({ address: params.recoveryDestination, amount: netAmount.toString() })
+        .feePayer(bs58EncodedPublicKey)
+        .fee({ amount: feePerSignature });
+
+      if (params.durableNonce) {
+        txBuilder.nonce(blockhash, {
+          walletNonceAddress: params.durableNonce.publicKey,
+          authWalletAddress: authority,
+        });
+      }
+    }
+
     if (!isUnsignedSweep) {
       // Sign the txn
       if (!params.userKey) {
@@ -907,25 +935,6 @@ export class Sol extends BaseCoin {
         throw new Error('missing wallet passphrase');
       }
 
-      if (params.tokenContractAddress) {
-        totalFeeForTokenRecovery = totalFeeForTokenRecovery.plus(new BigNumber(baseFee));
-        // Check if there is sufficient native solana to recover tokens
-        if (new BigNumber(balance).lt(totalFeeForTokenRecovery)) {
-          throw Error(
-            'Not enough funds to pay for recover tokens fees, have: ' +
-              balance +
-              ' need: ' +
-              totalFeeForTokenRecovery.toString()
-          );
-        }
-        txBuilder.fee({ amount: feePerSignature });
-      } else {
-        totalFee = new BigNumber(baseFee);
-        const netAmount = new BigNumber(balance).minus(totalFee);
-        txBuilder
-          .send({ address: params.recoveryDestination, amount: netAmount.toString() })
-          .fee({ amount: feePerSignature });
-      }
       // build the transaction with fee
       const unsignedTransaction = (await txBuilder.build()) as Transaction;
 

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

@@ -1431,9 +1431,10 @@ describe('SOL:', function () {
     const sandBox = sinon.createSandbox();
     const coin = coins.get('tsol');
     const usdtMintAddress = '9cgpBeNZ2HnLda7NWaaU1i3NyTstk2c4zCMUcoAGsi9C';
+    let callBack;
 
     beforeEach(() => {
-      const callBack = sandBox.stub(Sol.prototype, 'getDataFromNode' as keyof Sol);
+      callBack = sandBox.stub(Sol.prototype, 'getDataFromNode' as keyof Sol);
 
       callBack
         .withArgs({
@@ -1963,6 +1964,24 @@ describe('SOL:', function () {
     });
 
     it('should recover sol tokens to recovery destination with existing token accounts for unsigned sweep recoveries', async function () {
+      const feeResponse = testData.SolResponses.getFeesForMessageResponse;
+      feeResponse.body.result.value = 10000;
+      callBack
+        .withArgs({
+          payload: {
+            id: '1',
+            jsonrpc: '2.0',
+            method: 'getFeeForMessage',
+            params: [
+              sinon.match.string,
+              {
+                commitment: 'finalized',
+              },
+            ],
+          },
+        })
+        .resolves(feeResponse);
+
       const tokenTxn = (await basecoin.recover({
         bitgoKey: testData.wrwUser.bitgoKey,
         recoveryDestination: testData.keys.destinationPubKey2,