@ignitionfi/spl-stake-pool 1.1.10 → 1.1.12

package/dist/instructions.d.ts

@@ -158,7 +158,8 @@ export type WithdrawWsolWithSessionParams = {
     solWithdrawAuthority?: PublicKey;
     wsolMint: PublicKey;
     programSigner: PublicKey;
-    poolTokens: number;
+    poolTokensIn: number;
+    minimumLamportsOut: number;
 };
 /**
  * Deposit SOL directly into the pool's reserve account. The output is a "pool" token
@@ -279,7 +280,7 @@ export declare class StakePoolInstruction {
     /**
      * Creates a transaction instruction to deposit WSOL into a stake pool.
      */
-    static depositWsolWithSession(params: DepositSolParams & {
+    static depositWsolWithSession(params: Omit<DepositSolParams, 'lamports'> & {
         wsolMint: PublicKey;
         wsolTokenAccount: PublicKey;
         wsolTransientAccount: PublicKey;
@@ -287,6 +288,8 @@ export declare class StakePoolInstruction {
         tokenProgramId: PublicKey;
         programId: PublicKey;
         payer?: PublicKey;
+        lamportsIn: number;
+        minimumPoolTokensOut: number;
     }): TransactionInstruction;
     /**
      * Creates a transaction instruction to withdraw active stake from a stake pool.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ignitionfi/spl-stake-pool",
-  "version": "1.1.10",
+  "version": "1.1.12",
   "description": "Ignition Stake Pool SDK for FOGO",
   "contributors": [
     "Anza Maintainers <maintainers@anza.xyz>",

package/src/index.ts

@@ -295,6 +295,7 @@ export async function depositWsolWithSession(
   signerOrSession: PublicKey,
   userPubkey: PublicKey,
   lamports: number,
+  minimumPoolTokensOut: number = 0,
   destinationTokenAccount?: PublicKey,
   referrerTokenAccount?: PublicKey,
   depositAuthority?: PublicKey,
@@ -318,13 +319,12 @@ export async function depositWsolWithSession(
     )
   }
 
-  const stakePoolAccount = await getStakePoolAccount(
-    connection,
-    stakePoolAddress,
-  )
+  const stakePoolAccount = await getStakePoolAccount(connection, stakePoolAddress)
   const stakePoolProgramId = getStakePoolProgramId(connection.rpcEndpoint)
   const stakePool = stakePoolAccount.account.data
 
+  // stakePool.tokenProgramId
+
   const instructions: TransactionInstruction[] = []
 
   // Create token account if not specified
@@ -335,7 +335,7 @@ export async function depositWsolWithSession(
     )
     instructions.push(
       createAssociatedTokenAccountIdempotentInstruction(
-        signerOrSession,
+        payer ?? signerOrSession,
         associatedAddress,
         userPubkey,
         stakePool.poolMint,
@@ -369,10 +369,10 @@ export async function depositWsolWithSession(
       managerFeeAccount: stakePool.managerFeeAccount,
       referralPoolAccount: referrerTokenAccount ?? destinationTokenAccount,
       poolMint: stakePool.poolMint,
-      lamports,
+      lamportsIn: lamports,
+      minimumPoolTokensOut,
       withdrawAuthority,
       depositAuthority,
-
       wsolMint: NATIVE_MINT,
       wsolTokenAccount,
       wsolTransientAccount,
@@ -834,6 +834,7 @@ export async function withdrawWsolWithSession(
   signerOrSession: PublicKey,
   userPubkey: PublicKey,
   amount: number,
+  minimumLamportsOut: number = 0,
   solWithdrawAuthority?: PublicKey,
 ) {
   const stakePoolAccount = await getStakePoolAccount(connection, stakePoolAddress)
@@ -890,7 +891,8 @@ export async function withdrawWsolWithSession(
       solWithdrawAuthority,
       wsolMint: NATIVE_MINT,
       programSigner,
-      poolTokens,
+      poolTokensIn: poolTokens,
+      minimumLamportsOut,
     }),
   )
 

package/src/instructions.ts

@@ -214,14 +214,16 @@ export const STAKE_POOL_INSTRUCTION_LAYOUTS: {
     index: 27,
     layout: BufferLayout.struct<any>([
       BufferLayout.u8('instruction'),
-      BufferLayout.ns64('lamports'),
+      BufferLayout.ns64('lamportsIn'),
+      BufferLayout.ns64('minimumPoolTokensOut'),
     ]),
   },
   WithdrawWsolWithSession: {
     index: 28,
     layout: BufferLayout.struct<any>([
       BufferLayout.u8('instruction'),
-      BufferLayout.ns64('poolTokens'),
+      BufferLayout.ns64('poolTokensIn'),
+      BufferLayout.ns64('minimumLamportsOut'),
     ]),
   },
 })
@@ -383,7 +385,8 @@ export type WithdrawWsolWithSessionParams = {
   solWithdrawAuthority?: PublicKey
   wsolMint: PublicKey
   programSigner: PublicKey
-  poolTokens: number
+  poolTokensIn: number
+  minimumLamportsOut: number
 }
 
 /**
@@ -954,7 +957,7 @@ export class StakePoolInstruction {
   /**
    * Creates a transaction instruction to deposit WSOL into a stake pool.
    */
-  static depositWsolWithSession(params: DepositSolParams & {
+  static depositWsolWithSession(params: Omit<DepositSolParams, 'lamports'> & {
     wsolMint: PublicKey
     wsolTokenAccount: PublicKey
     wsolTransientAccount: PublicKey
@@ -962,9 +965,14 @@ export class StakePoolInstruction {
     tokenProgramId: PublicKey
     programId: PublicKey
     payer?: PublicKey
+    lamportsIn: number
+    minimumPoolTokensOut: number
   }): TransactionInstruction {
     const type = STAKE_POOL_INSTRUCTION_LAYOUTS.DepositWsolWithSession
-    const data = encodeData(type, { lamports: params.lamports })
+    const data = encodeData(type, {
+      lamportsIn: params.lamportsIn,
+      minimumPoolTokensOut: params.minimumPoolTokensOut,
+    })
 
     const keys = [
       { pubkey: params.stakePool, isSigner: false, isWritable: true },
@@ -1104,7 +1112,10 @@ export class StakePoolInstruction {
     params: WithdrawWsolWithSessionParams,
   ): TransactionInstruction {
     const type = STAKE_POOL_INSTRUCTION_LAYOUTS.WithdrawWsolWithSession
-    const data = encodeData(type, { poolTokens: params.poolTokens })
+    const data = encodeData(type, {
+      poolTokensIn: params.poolTokensIn,
+      minimumLamportsOut: params.minimumLamportsOut,
+    })
 
     const keys = [
       { pubkey: params.stakePool, isSigner: false, isWritable: true },