Merge pull request #6719 from BitGo/harit/jito-raw-parse-fix

fix(sdk-coin-sol): set correct jito activate instruction indexes

Author: haritkapadia

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

@@ -115,7 +115,7 @@ export const marinadeStakingActivateInstructionsIndexes = {
 
 /** Const to check the order of the Jito Staking Activate instructions when decode */
 export const jitoStakingActivateInstructionsIndexes = {
-  AtaInit: 0,
+  InitializeAssociatedTokenAccount: 0,
   DepositSol: 1,
 } as const;
 

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

@@ -282,7 +282,11 @@ export function matchTransactionTypeByInstructionsOrder(
 
   // Check instructions by order using the index.
   for (const keyName of instructionsKeys) {
-    const result = getInstructionType(instructionsCopy[instructionIndexes[keyName]]);
+    const index = instructionIndexes[keyName];
+    if (index >= instructionsCopy.length) {
+      return false;
+    }
+    const result = getInstructionType(instructionsCopy[index]);
     if (result !== keyName) {
       return false;
     }

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

@@ -156,10 +156,9 @@ describe('Sol Staking Activate Builder', () => {
       const rawTx = tx.toBroadcastFormat();
       should.equal(Utils.isValidRawTransaction(rawTx), true);
       should.equal(rawTx, testData.JITO_STAKING_ACTIVATE_SIGNED_TX);
-      factory.from(testData.JITO_STAKING_ACTIVATE_SIGNED_TX);
-      const coin = coins.get('tsol');
-      const tx2 = new Transaction(coin);
-      tx2.fromRawTransaction(rawTx);
+      const builderFromRawTx = factory.from(rawTx);
+      const rebuiltTx = await builderFromRawTx.build();
+      rebuiltTx.toJson().instructionsData.should.deepEqual(txJson.instructionsData);
     });
 
     it('build a create and delegate staking signed tx with memo', async () => {