Merge pull request #5934 from BitGo/SC-1534

feat(sdk-coin-sol): add support for marinade staking

Author: Vijay-Jagannathan

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

@@ -77,7 +77,13 @@ export interface TokenTransfer {
 
 export interface StakingActivate {
   type: InstructionBuilderTypes.StakingActivate;
-  params: { fromAddress: string; stakingAddress: string; amount: string; validator: string };
+  params: {
+    fromAddress: string;
+    stakingAddress: string;
+    amount: string;
+    validator: string;
+    isMarinade?: boolean;
+  };
 }
 
 export interface StakingDelegate {
@@ -87,7 +93,12 @@ export interface StakingDelegate {
 
 export interface StakingDeactivate {
   type: InstructionBuilderTypes.StakingDeactivate;
-  params: { fromAddress: string; stakingAddress: string; amount?: string; unstakingAddress?: string };
+  params: {
+    fromAddress: string;
+    stakingAddress: string;
+    amount?: string;
+    unstakingAddress?: string;
+  };
 }
 
 export interface StakingWithdraw {

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

@@ -325,10 +325,17 @@ interface StakingInstructions {
 function validateStakingInstructions(stakingInstructions: StakingInstructions) {
   if (!stakingInstructions.create) {
     throw new NotSupported('Invalid staking activate transaction, missing create stake account instruction');
-  } else if (!stakingInstructions.initialize) {
-    throw new NotSupported('Invalid staking activate transaction, missing initialize stake account instruction');
-  } else if (!stakingInstructions.delegate) {
-    throw new NotSupported('Invalid staking activate transaction, missing delegate instruction');
+  }
+
+  if (!stakingInstructions.initialize && stakingInstructions.delegate) {
+    return;
+  } else if (!stakingInstructions.delegate && stakingInstructions.initialize) {
+    return;
+  } else if (!stakingInstructions.delegate && !stakingInstructions.initialize) {
+    // If both are missing something is wrong
+    throw new NotSupported(
+      'Invalid staking activate transaction, missing initialize stake account/delegate instruction'
+    );
   }
 }
 

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

@@ -200,33 +200,44 @@ function createNonceAccountInstruction(data: WalletInit): TransactionInstruction
  */
 function stakingInitializeInstruction(data: StakingActivate): TransactionInstruction[] {
   const {
-    params: { fromAddress, stakingAddress, amount, validator },
+    params: { fromAddress, stakingAddress, amount, validator, isMarinade },
   } = data;
   assert(fromAddress, 'Missing fromAddress param');
   assert(stakingAddress, 'Missing stakingAddress param');
   assert(amount, 'Missing amount param');
   assert(validator, 'Missing validator param');
+  assert(isMarinade !== undefined, 'Missing isMarinade param');
 
   const fromPubkey = new PublicKey(fromAddress);
   const stakePubkey = new PublicKey(stakingAddress);
-
+  const validatorPubkey = new PublicKey(validator);
   const tx = new Transaction();
 
+  const stakerPubkey = isMarinade ? validatorPubkey : fromPubkey;
   const walletInitStaking = StakeProgram.createAccount({
     fromPubkey,
     stakePubkey,
-    authorized: new Authorized(fromPubkey, fromPubkey), // staker and withdrawer
-    lockup: new Lockup(0, 0, fromPubkey), // Lookup sets the minimum epoch to withdraw, by default is 0,0 which means there's no minimum limit
+    authorized: new Authorized(stakerPubkey, fromPubkey), // staker and withdrawer
+    lockup: new Lockup(0, 0, fromPubkey), // No minimum epoch to withdraw
     lamports: new BigNumber(amount).toNumber(),
   });
   tx.add(walletInitStaking);
 
-  const delegateStaking = StakeProgram.delegate({
-    stakePubkey: new PublicKey(stakingAddress),
-    authorizedPubkey: new PublicKey(fromAddress),
-    votePubkey: new PublicKey(validator),
-  });
-  tx.add(delegateStaking);
+  if (isMarinade) {
+    const initializeStaking = StakeProgram.initialize({
+      stakePubkey,
+      authorized: new Authorized(stakerPubkey, fromPubkey), // staker and withdrawer
+      lockup: new Lockup(0, 0, fromPubkey), // No minimum epoch to withdraw
+    });
+    tx.add(initializeStaking);
+  } else {
+    const delegateStaking = StakeProgram.delegate({
+      stakePubkey: new PublicKey(stakingAddress),
+      authorizedPubkey: new PublicKey(fromAddress),
+      votePubkey: new PublicKey(validator),
+    });
+    tx.add(delegateStaking);
+  }
 
   return tx.instructions;
 }
@@ -246,8 +257,8 @@ function stakingDeactivateInstruction(data: StakingDeactivate): TransactionInstr
 
   if (data.params.amount && data.params.unstakingAddress) {
     const tx = new Transaction();
-
     const unstakingAddress = new PublicKey(data.params.unstakingAddress);
+
     const allocateAccount = SystemProgram.allocate({
       accountPubkey: unstakingAddress,
       space: StakeProgram.space,

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

@@ -12,6 +12,7 @@ export class StakingActivateBuilder extends TransactionBuilder {
   protected _amount: string;
   protected _stakingAddress: string;
   protected _validator: string;
+  protected _isMarinade = false;
 
   constructor(_coinConfig: Readonly<CoinConfig>) {
     super(_coinConfig);
@@ -77,12 +78,23 @@ export class StakingActivateBuilder extends TransactionBuilder {
     return this;
   }
 
+  /**
+   * Set isMarinade flag
+   * @param {boolean} flag - true if the transaction is for Marinade, false by default if not set
+   * @returns {StakingActivateBuilder} This staking builder
+   */
+  isMarinade(flag: boolean): this {
+    this._isMarinade = flag;
+    return this;
+  }
+
   /** @inheritdoc */
   protected async buildImplementation(): Promise<Transaction> {
     assert(this._sender, 'Sender must be set before building the transaction');
     assert(this._stakingAddress, 'Staking Address must be set before building the transaction');
     assert(this._validator, 'Validator must be set before building the transaction');
     assert(this._amount, 'Amount must be set before building the transaction');
+    assert(this._isMarinade !== undefined, 'isMarinade must be set before building the transaction');
 
     if (this._sender === this._stakingAddress) {
       throw new BuildTransactionError('Sender address cannot be the same as the Staking address');
@@ -95,6 +107,7 @@ export class StakingActivateBuilder extends TransactionBuilder {
         stakingAddress: this._stakingAddress,
         amount: this._amount,
         validator: this._validator,
+        isMarinade: this._isMarinade,
       },
     };
     this._instructionsData = [stakingAccountData];

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

@@ -149,15 +149,27 @@ export const validator = {
 export const STAKING_ACTIVATE_SIGNED_TX =
   'AgqGWxEJnQ6oPZd9ysQx+RoWZiNC5caG1vZfCKihyobmUMA/mj7tUVV3j02GUl25Cm7letLefgUz9WB+kXAe4ABUzgW/NnG7GeZGxTVAsEWxGK93sc/cNVFODjkf97ap2bugoN48UG3jBA0JvcNa35xPVrJVdB8VW8dWe/jfxSgMAgAHCUXlebz5JTz2i0ff8fs6OlwsIbrFsjwJrhKm4FVr8ItBYnsvugEnYfm5Gbz5TLtMncgFHZ8JMpkxTTlJIzJovekAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALH5eXiaHEfRPEjYei8nFxDrf5MmCVEXMWKQvWwp2vXZBqHYF5E3VCqYNDe9/ip6slV/U1yKeHIraKSdwAAAAAAGodgXpQIFC2gHkebObbiOHltxUPYfxnkKTrTRAAAAAAan1RcYx3TJKFZjmGkdXraLXrijm0ttXHNVWyEAAAAABqfVFxksXFEhjMlMPUrxf1ja7gibof1E49vZigAAAAAGp9UXGTWE0P7tm7NDHRMga+VEKBtXuFZsxTdf9AAAAOMy2vkvq+zotj/3pEAF5f39mvoVh1a2HFqV+QSzuNCBAwICAAE0AAAAAOCTBAAAAAAAyAAAAAAAAAAGodgXkTdUKpg0N73+KnqyVX9TXIp4citopJ3AAAAAAAQCAQd0AAAAAEXlebz5JTz2i0ff8fs6OlwsIbrFsjwJrhKm4FVr8ItBReV5vPklPPaLR9/x+zo6XCwhusWyPAmuEqbgVWvwi0EAAAAAAAAAAAAAAAAAAAAAReV5vPklPPaLR9/x+zo6XCwhusWyPAmuEqbgVWvwi0EEBgEDBggFAAQCAAAA';
 
+export const MARINADE_STAKING_ACTIVATE_SIGNED_TX =
+  'Aodp9uNPAhWZ9SesBxRWoNmLjivx4i6F4fFRrMxY2xMNp1asK+QQeirVas40uHLJr8Athv/bjPwAn2GWSYRbMQdVB9LxO7+GcXyVuHKzDgkzJ2lbu/vLCdnc2xeTYPOUir1CNxut782E+xNIMRcso/h09jWT0Iyluulp1369rIoAAgADBUXlebz5JTz2i0ff8fs6OlwsIbrFsjwJrhKm4FVr8ItBYnsvugEnYfm5Gbz5TLtMncgFHZ8JMpkxTTlJIzJovekAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAah2BeRN1QqmDQ3vf4qerJVf1NcinhyK2ikncAAAAAABqfVFxksXFEhjMlMPUrxf1ja7gibof1E49vZigAAAADjMtr5L6vs6LY/96RABeX9/Zr6FYdWthxalfkEs7jQgQMCAgABNAAAAADgkwQAAAAAAMgAAAAAAAAABqHYF5E3VCqYNDe9/ip6slV/U1yKeHIraKSdwAAAAAADAgEEdAAAAACx+Xl4mhxH0TxI2HovJxcQ63+TJglRFzFikL1sKdr12UXlebz5JTz2i0ff8fs6OlwsIbrFsjwJrhKm4FVr8ItBAAAAAAAAAAAAAAAAAAAAAEXlebz5JTz2i0ff8fs6OlwsIbrFsjwJrhKm4FVr8ItBAwIBBHQAAAAAsfl5eJocR9E8SNh6LycXEOt/kyYJURcxYpC9bCna9dlF5Xm8+SU89otH3/H7OjpcLCG6xbI8Ca4SpuBVa/CLQQAAAAAAAAAAAAAAAAAAAABF5Xm8+SU89otH3/H7OjpcLCG6xbI8Ca4SpuBVa/CLQQ==';
+
 export const STAKING_ACTIVATE_SIGNED_TX_WITH_MEMO =
   'AsTWc6tgb0h6qBA/kcVgr35lpWYxit9d99IscSJ5OUHkTz4AUK0dI7MNX9kw1GMIvxGKg7uw709b/9K1CeUgRgHdrX1nKO30P/91RhNMJpknfdDHmq48duVvvPRhlXirbMNm0yqn2q4iEWk3U8pS4ASPAU2L0jlk1NSqnw5sxMcOAgAICkXlebz5JTz2i0ff8fs6OlwsIbrFsjwJrhKm4FVr8ItBYnsvugEnYfm5Gbz5TLtMncgFHZ8JMpkxTTlJIzJovekAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALH5eXiaHEfRPEjYei8nFxDrf5MmCVEXMWKQvWwp2vXZBUpTWpkpIQZNJOhxYNo4fHw1td28kruB5B+oQEEFRI0GodgXkTdUKpg0N73+KnqyVX9TXIp4citopJ3AAAAAAAah2BelAgULaAeR5s5tuI4eW3FQ9h/GeQpOtNEAAAAABqfVFxjHdMkoVmOYaR1etoteuKObS21cc1VbIQAAAAAGp9UXGSxcUSGMyUw9SvF/WNruCJuh/UTj29mKAAAAAAan1RcZNYTQ/u2bs0MdEyBr5UQoG1e4VmzFN1/0AAAA4zLa+S+r7Oi2P/ekQAXl/f2a+hWHVrYcWpX5BLO40IEEAgIAATQAAAAA4JMEAAAAAADIAAAAAAAAAAah2BeRN1QqmDQ3vf4qerJVf1NcinhyK2ikncAAAAAABQIBCHQAAAAAReV5vPklPPaLR9/x+zo6XCwhusWyPAmuEqbgVWvwi0FF5Xm8+SU89otH3/H7OjpcLCG6xbI8Ca4SpuBVa/CLQQAAAAAAAAAAAAAAAAAAAABF5Xm8+SU89otH3/H7OjpcLCG6xbI8Ca4SpuBVa/CLQQUGAQMHCQYABAIAAAAEAAl0ZXN0IG1lbW8=';
 
+export const MARINADE_STAKING_ACTIVATE_SIGNED_TX_WITH_MEMO =
+  'AiriA0wy5ry4BSx6cdfDIs0qUwNL2UUzy7cxN7N2UpL2YVYzik46JhV/XoyVHlkojeGzS12dzX7SDqZladSAOAVqgKMwC62EhEiyQ7CtOcELPWhLpxhrxteoHWk0NqLVBytYKrbV8+HGu9hc7bWu9U6LSgsB4XyLVd/aFJKoHBAIAgAEBkXlebz5JTz2i0ff8fs6OlwsIbrFsjwJrhKm4FVr8ItBYnsvugEnYfm5Gbz5TLtMncgFHZ8JMpkxTTlJIzJovekAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVKU1qZKSEGTSTocWDaOHx8NbXdvJK7geQfqEBBBUSNBqHYF5E3VCqYNDe9/ip6slV/U1yKeHIraKSdwAAAAAAGp9UXGSxcUSGMyUw9SvF/WNruCJuh/UTj29mKAAAAAOMy2vkvq+zotj/3pEAF5f39mvoVh1a2HFqV+QSzuNCBBAICAAE0AAAAAOCTBAAAAAAAyAAAAAAAAAAGodgXkTdUKpg0N73+KnqyVX9TXIp4citopJ3AAAAAAAQCAQV0AAAAALH5eXiaHEfRPEjYei8nFxDrf5MmCVEXMWKQvWwp2vXZReV5vPklPPaLR9/x+zo6XCwhusWyPAmuEqbgVWvwi0EAAAAAAAAAAAAAAAAAAAAAReV5vPklPPaLR9/x+zo6XCwhusWyPAmuEqbgVWvwi0EEAgEFdAAAAACx+Xl4mhxH0TxI2HovJxcQ63+TJglRFzFikL1sKdr12UXlebz5JTz2i0ff8fs6OlwsIbrFsjwJrhKm4FVr8ItBAAAAAAAAAAAAAAAAAAAAAEXlebz5JTz2i0ff8fs6OlwsIbrFsjwJrhKm4FVr8ItBAwAJdGVzdCBtZW1v';
+
 export const STAKING_ACTIVATE_UNSIGNED_TX =
   'AgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAHCUXlebz5JTz2i0ff8fs6OlwsIbrFsjwJrhKm4FVr8ItBYnsvugEnYfm5Gbz5TLtMncgFHZ8JMpkxTTlJIzJovekAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALH5eXiaHEfRPEjYei8nFxDrf5MmCVEXMWKQvWwp2vXZBqHYF5E3VCqYNDe9/ip6slV/U1yKeHIraKSdwAAAAAAGodgXpQIFC2gHkebObbiOHltxUPYfxnkKTrTRAAAAAAan1RcYx3TJKFZjmGkdXraLXrijm0ttXHNVWyEAAAAABqfVFxksXFEhjMlMPUrxf1ja7gibof1E49vZigAAAAAGp9UXGTWE0P7tm7NDHRMga+VEKBtXuFZsxTdf9AAAAOMy2vkvq+zotj/3pEAF5f39mvoVh1a2HFqV+QSzuNCBAwICAAE0AAAAAOCTBAAAAAAAyAAAAAAAAAAGodgXkTdUKpg0N73+KnqyVX9TXIp4citopJ3AAAAAAAQCAQd0AAAAAEXlebz5JTz2i0ff8fs6OlwsIbrFsjwJrhKm4FVr8ItBReV5vPklPPaLR9/x+zo6XCwhusWyPAmuEqbgVWvwi0EAAAAAAAAAAAAAAAAAAAAAReV5vPklPPaLR9/x+zo6XCwhusWyPAmuEqbgVWvwi0EEBgEDBggFAAQCAAAA';
 
+export const MARINADE_STAKING_ACTIVATE_UNSIGNED_TX =
+  'AgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgADBUXlebz5JTz2i0ff8fs6OlwsIbrFsjwJrhKm4FVr8ItBYnsvugEnYfm5Gbz5TLtMncgFHZ8JMpkxTTlJIzJovekAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAah2BeRN1QqmDQ3vf4qerJVf1NcinhyK2ikncAAAAAABqfVFxksXFEhjMlMPUrxf1ja7gibof1E49vZigAAAADjMtr5L6vs6LY/96RABeX9/Zr6FYdWthxalfkEs7jQgQMCAgABNAAAAADgkwQAAAAAAMgAAAAAAAAABqHYF5E3VCqYNDe9/ip6slV/U1yKeHIraKSdwAAAAAADAgEEdAAAAACx+Xl4mhxH0TxI2HovJxcQ63+TJglRFzFikL1sKdr12UXlebz5JTz2i0ff8fs6OlwsIbrFsjwJrhKm4FVr8ItBAAAAAAAAAAAAAAAAAAAAAEXlebz5JTz2i0ff8fs6OlwsIbrFsjwJrhKm4FVr8ItBAwIBBHQAAAAAsfl5eJocR9E8SNh6LycXEOt/kyYJURcxYpC9bCna9dlF5Xm8+SU89otH3/H7OjpcLCG6xbI8Ca4SpuBVa/CLQQAAAAAAAAAAAAAAAAAAAABF5Xm8+SU89otH3/H7OjpcLCG6xbI8Ca4SpuBVa/CLQQ==';
+
 export const STAKING_ACTIVATE_UNSIGNED_TX_WITH_MEMO =
   'AgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAICkXlebz5JTz2i0ff8fs6OlwsIbrFsjwJrhKm4FVr8ItBYnsvugEnYfm5Gbz5TLtMncgFHZ8JMpkxTTlJIzJovekAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALH5eXiaHEfRPEjYei8nFxDrf5MmCVEXMWKQvWwp2vXZBUpTWpkpIQZNJOhxYNo4fHw1td28kruB5B+oQEEFRI0GodgXkTdUKpg0N73+KnqyVX9TXIp4citopJ3AAAAAAAah2BelAgULaAeR5s5tuI4eW3FQ9h/GeQpOtNEAAAAABqfVFxjHdMkoVmOYaR1etoteuKObS21cc1VbIQAAAAAGp9UXGSxcUSGMyUw9SvF/WNruCJuh/UTj29mKAAAAAAan1RcZNYTQ/u2bs0MdEyBr5UQoG1e4VmzFN1/0AAAA4zLa+S+r7Oi2P/ekQAXl/f2a+hWHVrYcWpX5BLO40IEEAgIAATQAAAAA4JMEAAAAAADIAAAAAAAAAAah2BeRN1QqmDQ3vf4qerJVf1NcinhyK2ikncAAAAAABQIBCHQAAAAAReV5vPklPPaLR9/x+zo6XCwhusWyPAmuEqbgVWvwi0FF5Xm8+SU89otH3/H7OjpcLCG6xbI8Ca4SpuBVa/CLQQAAAAAAAAAAAAAAAAAAAABF5Xm8+SU89otH3/H7OjpcLCG6xbI8Ca4SpuBVa/CLQQUGAQMHCQYABAIAAAAEAAl0ZXN0IG1lbW8=';
 
+export const MARINADE_STAKING_ACTIVATE_UNSIGNED_TX_WITH_MEMO =
+  'AgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAEBkXlebz5JTz2i0ff8fs6OlwsIbrFsjwJrhKm4FVr8ItBYnsvugEnYfm5Gbz5TLtMncgFHZ8JMpkxTTlJIzJovekAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVKU1qZKSEGTSTocWDaOHx8NbXdvJK7geQfqEBBBUSNBqHYF5E3VCqYNDe9/ip6slV/U1yKeHIraKSdwAAAAAAGp9UXGSxcUSGMyUw9SvF/WNruCJuh/UTj29mKAAAAAOMy2vkvq+zotj/3pEAF5f39mvoVh1a2HFqV+QSzuNCBBAICAAE0AAAAAOCTBAAAAAAAyAAAAAAAAAAGodgXkTdUKpg0N73+KnqyVX9TXIp4citopJ3AAAAAAAQCAQV0AAAAALH5eXiaHEfRPEjYei8nFxDrf5MmCVEXMWKQvWwp2vXZReV5vPklPPaLR9/x+zo6XCwhusWyPAmuEqbgVWvwi0EAAAAAAAAAAAAAAAAAAAAAReV5vPklPPaLR9/x+zo6XCwhusWyPAmuEqbgVWvwi0EEAgEFdAAAAACx+Xl4mhxH0TxI2HovJxcQ63+TJglRFzFikL1sKdr12UXlebz5JTz2i0ff8fs6OlwsIbrFsjwJrhKm4FVr8ItBAAAAAAAAAAAAAAAAAAAAAEXlebz5JTz2i0ff8fs6OlwsIbrFsjwJrhKm4FVr8ItBAwAJdGVzdCBtZW1v';
+
 export const STAKING_DEACTIVATE_SIGNED_TX =
   'AUfyWtl4IUxhH21qX/H03hJZer1XxQaxL2r/uDTM/u1GzBIyePCHu78O2SkWGEYP6eDdiY3OLfJmUM1jiy8NCAoBAAIEReV5vPklPPaLR9/x+zo6XCwhusWyPAmuEqbgVWvwi0Fiey+6ASdh+bkZvPlMu0ydyAUdnwkymTFNOUkjMmi96Qah2BeRN1QqmDQ3vf4qerJVf1NcinhyK2ikncAAAAAABqfVFxjHdMkoVmOYaR1etoteuKObS21cc1VbIQAAAADjMtr5L6vs6LY/96RABeX9/Zr6FYdWthxalfkEs7jQgQECAwEDAAQFAAAA';
 

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

@@ -275,14 +275,9 @@ describe('Instruction Parser Staking Tests: ', function () {
       }, 'Invalid staking activate transaction, missing create stake account instruction');
 
       should.throws(() => {
-        const instructions = [stakingActivateInstructions[0], ...stakingDelegateInstructions];
+        const instructions = [stakingActivateInstructions[0]];
         instructionParamsFactory(TransactionType.StakingActivate, instructions);
-      }, 'Invalid staking activate transaction, missing initialize stake account instruction');
-
-      should.throws(() => {
-        const instructions = [...stakingActivateInstructions];
-        instructionParamsFactory(TransactionType.StakingActivate, instructions);
-      }, 'Invalid staking activate transaction, missing delegate instruction');
+      }, 'Invalid staking activate transaction, missing initialize stake account/delegate instruction');
     });
   });