fix(sdk-coin-sol): add missing deactivate to jito unstaking

BREAKING CHANGE: There is now 1 more
instruction (StakeProgram.deactivate) in JITO StakingDeactivate
transaction.

Ticket: SC-3176

Author: haritkapadia

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

@@ -578,7 +578,7 @@ type JitoUnstakingInstructions = UnstakingInstructions & {
 };
 
 function isJitoUnstakingInstructions(ui: UnstakingInstructions): ui is JitoUnstakingInstructions {
-  return ui.withdrawStake !== undefined;
+  return ui.withdrawStake !== undefined && ui.deactivate !== undefined;
 }
 
 type MarinadeUnstakingInstructions = UnstakingInstructions & {
@@ -595,7 +595,7 @@ type NativeUnstakingInstructions = UnstakingInstructions & {
 };
 
 function isNativeUnstakingInstructions(ui: UnstakingInstructions): ui is NativeUnstakingInstructions {
-  return ui.deactivate !== undefined;
+  return ui.withdrawStake === undefined && ui.deactivate !== undefined;
 }
 
 function getStakingTypeFromUnstakingInstructions(ui: UnstakingInstructions): SolStakingTypeEnum {
@@ -824,7 +824,6 @@ function validateUnstakingInstructions(unstakingInstructions: UnstakingInstructi
     'split',
     'deactivate',
     'transfer',
-    'withdrawStake',
   ] as const;
   if (unstakingInstructionsKeys.every((k) => !!unstakingInstructions[k] === (k === 'transfer'))) {
     return;
@@ -841,6 +840,11 @@ function validateUnstakingInstructions(unstakingInstructions: UnstakingInstructi
     throw new NotSupported('Invalid deactivate stake transaction, missing deactivate stake account instruction');
   }
 
+  // This is a stake pool instruction, not a partial unstake
+  if (unstakingInstructions.withdrawStake) {
+    return;
+  }
+
   if (!unstakingInstructions.allocate) {
     throw new NotSupported(
       'Invalid partial deactivate stake transaction, missing allocate unstake account instruction'

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

@@ -108,9 +108,8 @@ export type DepositSolStakePoolData = Pick<StakePoolData, 'poolMint' | 'reserveS
  * Construct Solana depositSol stake pool instruction from parameters.
  *
  * @param {DepositSolInstructionsParams} params - parameters for staking to stake pool
- * @param poolMint - pool mint derived from getStakePoolAccount
- * @param reserveStake - reserve account derived from getStakePoolAccount
- * @param managerFeeAccount - manager fee account derived from getStakePoolAccount
+ * @param {DepositSolStakePoolData} stakePool - data from getStakePoolAccount needed for DepositSol
+ * @param createAssociatedTokenAccount
  * @returns {TransactionInstruction}
  */
 export function depositSolInstructions(
@@ -219,13 +218,11 @@ export interface WithdrawStakeInstructionsParams {
 export type WithdrawStakeStakePoolData = Pick<StakePoolData, 'poolMint' | 'validatorListAccount' | 'managerFeeAccount'>;
 
 /**
- * Construct Solana depositSol stake pool instruction from parameters.
+ * Construct Solana withdrawStake stake pool instructions from parameters.
  *
- * @param {DepositSolInstructionsParams} params - parameters for staking to stake pool
- * @param poolMint - pool mint derived from getStakePoolAccount
- * @param reserveStake - reserve account derived from getStakePoolAccount
- * @param managerFeeAccount - manager fee account derived from getStakePoolAccount
- * @returns {TransactionInstruction}
+ * @param {WithdrawStakeInstructionsParams} params - parameters for unstaking from stake pool
+ * @param {WithdrawStakeStakePoolData} stakePool - data from getStakePoolAccount needed for WithdrawStake
+ * @returns {TransactionInstruction[]}
  */
 export function withdrawStakeInstructions(
   params: WithdrawStakeInstructionsParams,
@@ -271,6 +268,10 @@ export function withdrawStakeInstructions(
       poolTokens: Number(poolAmount),
       withdrawAuthority,
     }),
+    ...StakeProgram.deactivate({
+      stakePubkey: destinationStakeAccount,
+      authorizedPubkey: tokenOwner,
+    }).instructions,
   ];
 }
 

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

@@ -208,7 +208,7 @@ export const MARINADE_STAKING_DEACTIVATE_SIGNED_TX =
   'AaiHUOzzeJaUzpdkm2BmLJI3AVOhFHTD5BnVMwUH3lRv8hKpH1fnXiXNm6ghZgNwhggXBAqhL3t4XEl+H7T95gIBAAIEReV5vPklPPaLR9/x+zo6XCwhusWyPAmuEqbgVWvwi0EL/kczKamI94jNtLT/BR9nkfa/PR2IU6d7qaEV8VVC3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABUpTWpkpIQZNJOhxYNo4fHw1td28kruB5B+oQEEFRI3jMtr5L6vs6LY/96RABeX9/Zr6FYdWthxalfkEs7jQgQICAgABDAIAAABgGCMAAAAAAAMAbntcIlByZXBhcmVGb3JSZXZva2VcIjp7XCJ1c2VyXCI6XCI1aHI1ZmlzUGk2RFhOdXVScG01WFVienBpRW5tZHl4WHVCRFR3endaajVQZX1cIixcImFtb3VudFwiOlwiNTAwMDAwMDAwMDAwXCJ9';
 
 export const JITO_STAKING_DEACTIVATE_SIGNED_TX =
-  'A1+g/k5rxNY5h3qNtjw3j+t8JuhLZvzJ8+e3CSsE7PCp95lI1mj9iY/NSP0eUEBcvWpGj9CIE8CEG+EzwFcfGADpjAnLDx2pfjVqrUsJXY07JsXxCfeuSaUsoPU9JHJpROexYB/0eZUBf+dwTtiJ43vUsM7oRFdJnfMnQXnHHFoNKQ6UmtfSOXKvrYkGUYUb/Ch6fy++GtUnSR1PmNsxgs+10JXZbwM7mDIdV8jSVhKm76M+RobwxuNscbWhuCKODwMBBg9F5Xm8+SU89otH3/H7OjpcLCG6xbI8Ca4SpuBVa/CLQWJ7L7oBJ2H5uRm8+Uy7TJ3IBR2fCTKZMU05SSMyaL3p6Lfi7T4mzoclKbPedsv+JDs60KtRcBK6Y7CHyYejKikcg6pe+BOG2OETfAVS9ftz6va1oE4onLBolJ2N+ZOOhCPgdQm63e39tRapC5GXu1BHQyVdDjfF/13OiiQe7cQxl9rD5vZLBx1Aaz7SV4hmv2ZhGp4LQEU67b++EtDrIi8J5qP+7PmQMuHB32uXItyzY057jjRAk2vDSwzByOtSH/zRQemDLK8QrZF0lcoPJxtbKTzUcCfqc3AH7UDrOaC9BIo+CMO0lb4X9FQn2JvsW4DH4mlcGGTXZ0PbOb7TRtYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFTlniTAUaihSnsel5fw4Szfp0kCFmUxlaalEqbxZmArBoFO1Mr2ihdGcv2shgMaY+hOoV76HUS3IpP229sAFlAGodgXkTdUKpg0N73+KnqyVX9TXIp4citopJ3AAAAAAAan1RcYx3TJKFZjmGkdXraLXrijm0ttXHNVWyEAAAAABt324ddloZPZy+FGzut5rBy0he1fWzeROoz1hX7/AKnjMtr5L6vs6LY/96RABeX9/Zr6FYdWthxalfkEs7jQgQMOAwMCAAkE6AMAAAAAAAAJAgABNAAAAACA1SIAAAAAAMgAAAAAAAAABqHYF5E3VCqYNDe9/ip6slV/U1yKeHIraKSdwAAAAAALDQgECgUBAAIDBgcNDgwJCugDAAAAAAAA';
+  'A7txZr55CtSJogfV1ihB1JOIuVbmhAh7BCl4hJeTBcbrq6KT+Jzbbjx4qEXDgRnMtY7cb9xnekOHUfKkW9D2RQpchl2oH4Np/+Oghy7QNjKrodZsFlqhiYoo+Zx0Bjf+Hwq35h/zVd1kHRTkaB1ebZwDeEejPrFgNCpkqxRh9ZgOMBethjkNPCrqzk50pOqx1ktJik5loScyp/81bggjQASE4jMdtET/a2jpFJeG34GZLIY6r+LNTXtGsK53qyR9CQMBBg9F5Xm8+SU89otH3/H7OjpcLCG6xbI8Ca4SpuBVa/CLQWJ7L7oBJ2H5uRm8+Uy7TJ3IBR2fCTKZMU05SSMyaL3p6Lfi7T4mzoclKbPedsv+JDs60KtRcBK6Y7CHyYejKikcg6pe+BOG2OETfAVS9ftz6va1oE4onLBolJ2N+ZOOhCPgdQm63e39tRapC5GXu1BHQyVdDjfF/13OiiQe7cQxl9rD5vZLBx1Aaz7SV4hmv2ZhGp4LQEU67b++EtDrIi8J5qP+7PmQMuHB32uXItyzY057jjRAk2vDSwzByOtSH/zRQemDLK8QrZF0lcoPJxtbKTzUcCfqc3AH7UDrOaC9BIo+CMO0lb4X9FQn2JvsW4DH4mlcGGTXZ0PbOb7TRtYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFTlniTAUaihSnsel5fw4Szfp0kCFmUxlaalEqbxZmArBoFO1Mr2ihdGcv2shgMaY+hOoV76HUS3IpP229sAFlAGodgXkTdUKpg0N73+KnqyVX9TXIp4citopJ3AAAAAAAan1RcYx3TJKFZjmGkdXraLXrijm0ttXHNVWyEAAAAABt324ddloZPZy+FGzut5rBy0he1fWzeROoz1hX7/AKnjMtr5L6vs6LY/96RABeX9/Zr6FYdWthxalfkEs7jQgQQOAwMCAAkE6AMAAAAAAAAJAgABNAAAAACA1SIAAAAAAMgAAAAAAAAABqHYF5E3VCqYNDe9/ip6slV/U1yKeHIraKSdwAAAAAALDQgECgUBAAIDBgcNDgwJCugDAAAAAAAADAMBDQAEBQAAAA==';
 
 export const STAKING_DEACTIVATE_SIGNED_TX_single =
   'AUfyWtl4IUxhH21qX/H03hJZer1XxQaxL2r/uDTM/u1GzBIyePCHu78O2SkWGEYP6eDdiY3OLfJmUM1jiy8NCAoBAAIEReV5vPklPPaLR9/x+zo6XCwhusWyPAmuEqbgVWvwi0Fiey+6ASdh+bkZvPlMu0ydyAUdnwkymTFNOUkjMmi96Qah2BeRN1QqmDQ3vf4qerJVf1NcinhyK2ikncAAAAAABqfVFxjHdMkoVmOYaR1etoteuKObS21cc1VbIQAAAADjMtr5L6vs6LY/96RABeX9/Zr6FYdWthxalfkEs7jQgQECAwEDAAQFAAAA';