Merge pull request #6024 from BitGo/fix-marinade-stake-flow

fix(sdk-coin-sol): set isMarinade flag during from raw build

Author: noel-bitgo

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

@@ -267,7 +267,11 @@ function parseStakingActivateInstructions(
       fromAddress: stakingInstructions.create?.fromPubkey.toString() || '',
       stakingAddress: stakingInstructions.initialize?.stakePubkey.toString() || '',
       amount: stakingInstructions.create?.lamports.toString() || '',
-      validator: stakingInstructions.delegate?.votePubkey.toString() || '',
+      validator:
+        stakingInstructions.delegate?.votePubkey.toString() ||
+        stakingInstructions.initialize?.authorized.staker.toString() ||
+        '',
+      isMarinade: stakingInstructions.delegate === undefined,
     },
   };
   instructionData.push(stakingActivate);

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

@@ -31,9 +31,8 @@ export class StakingActivateBuilder extends TransactionBuilder {
         this.sender(activateInstruction.params.fromAddress);
         this.stakingAddress(activateInstruction.params.stakingAddress);
         this.amount(activateInstruction.params.amount);
-        if (activateInstruction.params.validator && activateInstruction.params.validator !== '') {
-          this.validator(activateInstruction.params.validator);
-        }
+        this.validator(activateInstruction.params.validator);
+        this.isMarinade(activateInstruction.params.isMarinade ?? false);
       }
     }
   }

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

@@ -66,6 +66,7 @@ describe('Instruction Parser Staking Tests: ', function () {
           stakingAddress: stakingAccount.toString(),
           validator: validator.toString(),
           amount,
+          isMarinade: false,
         },
       };
 
@@ -135,6 +136,7 @@ describe('Instruction Parser Staking Tests: ', function () {
           stakingAddress: stakingAccount.toString(),
           validator: validator.toString(),
           amount,
+          isMarinade: false,
         },
       };
 
@@ -186,6 +188,7 @@ describe('Instruction Parser Staking Tests: ', function () {
           stakingAddress: stakingAccount.toString(),
           validator: validator.toString(),
           amount,
+          isMarinade: false,
         },
       };
 
@@ -232,6 +235,7 @@ describe('Instruction Parser Staking Tests: ', function () {
           stakingAddress: stakingAccount.toString(),
           validator: validator.toString(),
           amount,
+          isMarinade: false,
         },
       };
 

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

@@ -75,7 +75,8 @@ describe('Sol Staking Activate Builder', () => {
             fromAddress: wallet.pub,
             stakingAddress: stakeAccount.pub,
             amount: amount,
-            validator: '',
+            validator: validator.pub,
+            isMarinade: true,
           },
         },
       ]);
@@ -151,7 +152,8 @@ describe('Sol Staking Activate Builder', () => {
             fromAddress: wallet.pub,
             stakingAddress: stakeAccount.pub,
             amount: amount,
-            validator: '',
+            validator: validator.pub,
+            isMarinade: true,
           },
         },
       ]);
@@ -211,7 +213,8 @@ describe('Sol Staking Activate Builder', () => {
             fromAddress: wallet.pub,
             stakingAddress: stakeAccount.pub,
             amount: amount,
-            validator: '',
+            validator: validator.pub,
+            isMarinade: true,
           },
         },
       ]);
@@ -274,7 +277,8 @@ describe('Sol Staking Activate Builder', () => {
             fromAddress: wallet.pub,
             stakingAddress: stakeAccount.pub,
             amount: amount,
-            validator: '',
+            validator: validator.pub,
+            isMarinade: true,
           },
         },
       ]);
@@ -413,6 +417,24 @@ describe('Sol Staking Activate Builder', () => {
         should.equal(rawTx, testData.STAKING_ACTIVATE_SIGNED_TX);
       });
 
+      it('Marinade: build from an unsigned staking activate and sign it', async () => {
+        const txBuilder = factory.from(testData.MARINADE_STAKING_ACTIVATE_UNSIGNED_TX);
+
+        txBuilder.sign({ key: wallet.prv });
+        txBuilder.sign({ key: stakeAccount.prv });
+        const tx = await txBuilder.build();
+        tx.inputs.length.should.equal(1);
+        tx.inputs[0].should.deepEqual({
+          address: wallet.pub,
+          value: amount,
+          coin: 'tsol',
+        });
+        tx.outputs.length.should.equal(1);
+        const rawTx = tx.toBroadcastFormat();
+        should.equal(Utils.isValidRawTransaction(rawTx), true);
+        should.equal(rawTx, testData.MARINADE_STAKING_ACTIVATE_SIGNED_TX);
+      });
+
       it('build from an unsigned staking activate with memo and sign it', async () => {
         const txBuilder = factory.from(testData.STAKING_ACTIVATE_UNSIGNED_TX_WITH_MEMO);
         txBuilder.sign({ key: wallet.prv });

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

@@ -107,6 +107,7 @@ describe('Sol Transaction Builder', async () => {
           stakingAddress: '7dRuGFbU2y2kijP6o1LYNzVyz4yf13MooqoionCzv5Za',
           amount: '300000',
           validator: 'CyjoLt3kjqB57K7ewCBHmnHq3UgEj3ak6A7m6EsBsuhA',
+          isMarinade: false,
         },
       },
     ]);