Merge pull request #6664 from BitGo/harit/jito-withdraw-stake

feat(jito): implements staking deactivate

Author: haritkapadia

examples/ts/sol/stake-jito.ts

@@ -59,7 +59,14 @@ async function main() {
     .sender(account.publicKey.toBase58())
     .stakingAddress(JITO_STAKE_POOL_ADDRESS)
     .validator(JITO_STAKE_POOL_ADDRESS)
-    .isJito(true)
+    .stakingTypeParams({
+      type: 'JITO',
+      stakePoolData: {
+        managerFeeAccount: stakePoolAccount.account.data.managerFeeAccount.toString(),
+        poolMint: stakePoolAccount.account.data.poolMint.toString(),
+        reserveStake: stakePoolAccount.account.data.toString(),
+      }
+    })
     .nonce(recentBlockhash.blockhash)
   txBuilder.sign({ key: account.secretKey })
   const tx = await txBuilder.build()
@@ -85,7 +92,7 @@ const getAccount = () => {
   const secretKey = process.env.ACCOUNT_SECRET_KEY
   if (publicKey === undefined || secretKey === undefined) {
     const { publicKey, secretKey } = Keypair.generate()
-    console.log('Here is a new account to save into your .env file.')
+    console.log('# Here is a new account to save into your .env file.')
     console.log(`ACCOUNT_PUBLIC_KEY=${publicKey.toBase58()}`)
     console.log(`ACCOUNT_SECRET_KEY=${bs58.encode(secretKey)}`)
     throw new Error("Missing account information")

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

@@ -38,6 +38,8 @@ export enum ValidInstructionTypesEnum {
   MintTo = 'MintTo',
   Burn = 'Burn',
   DepositSol = 'DepositSol',
+  WithdrawStake = 'WithdrawStake',
+  Approve = 'Approve',
 }
 
 // Internal instructions types
@@ -58,6 +60,8 @@ export enum InstructionBuilderTypes {
   MintTo = 'MintTo',
   Burn = 'Burn',
   CustomInstruction = 'CustomInstruction',
+  Approve = 'Approve',
+  WithdrawStake = 'WithdrawStake',
 }
 
 export const VALID_SYSTEM_INSTRUCTION_TYPES: ValidInstructionTypes[] = [
@@ -80,7 +84,9 @@ export const VALID_SYSTEM_INSTRUCTION_TYPES: ValidInstructionTypes[] = [
   ValidInstructionTypesEnum.SetPriorityFee,
   ValidInstructionTypesEnum.MintTo,
   ValidInstructionTypesEnum.Burn,
+  ValidInstructionTypesEnum.Approve,
   ValidInstructionTypesEnum.DepositSol,
+  ValidInstructionTypesEnum.WithdrawStake,
 ];
 
 /** Const to check the order of the Wallet Init instructions when decode */
@@ -111,6 +117,13 @@ export const jitoStakingActivateInstructionsIndexes = {
   DepositSol: 1,
 } as const;
 
+/** Const to check the order of the Jito Staking Activate instructions when decode */
+export const jitoStakingDeactivateInstructionsIndexes = {
+  Approve: 0,
+  Create: 1,
+  WithdrawStake: 2,
+} as const;
+
 /** Const to check the order of the Staking Authorize instructions when decode */
 export const stakingAuthorizeInstructionsIndexes = {
   Authorize: 0,

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

@@ -3,6 +3,7 @@ import { DecodedCloseAccountInstruction } from '@solana/spl-token';
 import { Blockhash, StakeInstructionType, SystemInstructionType, TransactionSignature } from '@solana/web3.js';
 import { InstructionBuilderTypes } from './constants';
 import { StakePoolInstructionType } from '@solana/spl-stake-pool';
+import { DepositSolStakePoolData, WithdrawStakeStakePoolData } from './jitoStakePoolOperations';
 
 // TODO(STLX-9890): Add the interfaces for validityWindow and SequenceId
 export interface SolanaKeys {
@@ -41,6 +42,7 @@ export type InstructionParams =
   | StakingDelegate
   | MintTo
   | Burn
+  | Approve
   | CustomInstruction;
 
 export interface Memo {
@@ -107,15 +109,38 @@ export interface Burn {
   };
 }
 
+export interface Approve {
+  type: InstructionBuilderTypes.Approve;
+  params: {
+    accountAddress: string;
+    delegateAddress: string;
+    ownerAddress: string;
+    amount: string;
+    programId?: string;
+  };
+}
+
+export enum StakingType {
+  NATIVE = 'NATIVE',
+  MARINADE = 'MARINADE',
+  JITO = 'JITO',
+}
+
+export interface JitoStakingActivateParams {
+  stakePoolData: DepositSolStakePoolData;
+}
+
+export type StakingActivateExtraParams = JitoStakingActivateParams;
+
 export interface StakingActivate {
   type: InstructionBuilderTypes.StakingActivate;
   params: {
     fromAddress: string;
     stakingAddress: string;
     amount: string;
     validator: string;
-    isMarinade?: boolean;
-    isJito?: boolean;
+    stakingType: StakingType;
+    extraParams?: StakingActivateExtraParams;
   };
 }
 
@@ -124,14 +149,23 @@ export interface StakingDelegate {
   params: { stakingAddress: string; fromAddress: string; validator: string };
 }
 
+export interface JitoStakingDeactivateParams {
+  stakePoolData: WithdrawStakeStakePoolData;
+  validatorAddress: string;
+  transferAuthorityAddress: string;
+}
+
+export type StakingDeactivateExtraParams = JitoStakingDeactivateParams;
+
 export interface StakingDeactivate {
   type: InstructionBuilderTypes.StakingDeactivate;
   params: {
     fromAddress: string;
     stakingAddress: string;
     amount?: string;
     unstakingAddress?: string;
-    isMarinade?: boolean;
+    stakingType: StakingType;
+    extraParams?: StakingDeactivateExtraParams;
     recipients?: Recipient[];
   };
 }
@@ -187,7 +221,8 @@ export type ValidInstructionTypes =
   | 'TokenTransfer'
   | 'SetPriorityFee'
   | 'MintTo'
-  | 'Burn';
+  | 'Burn'
+  | 'Approve';
 
 export type StakingAuthorizeParams = {
   stakingAddress: string;