@ignitionfi/spl-stake-pool 1.1.22 → 1.1.24

package/dist/constants.d.ts

@@ -9,4 +9,5 @@ export declare const DEVNET_STAKE_POOL_PROGRAM_ID: PublicKey;
 export declare const MAX_VALIDATORS_TO_UPDATE = 4;
 export declare const EPHEMERAL_STAKE_SEED_PREFIX: Buffer<ArrayBuffer>;
 export declare const TRANSIENT_STAKE_SEED_PREFIX: Buffer<ArrayBuffer>;
+export declare const USER_STAKE_SEED_PREFIX: Buffer<ArrayBuffer>;
 export declare const MINIMUM_ACTIVE_STAKE = 1000000000;

package/dist/index.browser.cjs.js

@@ -453,6 +453,8 @@ const MAX_VALIDATORS_TO_UPDATE = 4;
 const EPHEMERAL_STAKE_SEED_PREFIX = node_buffer.Buffer.from('ephemeral');
 // Seed used to derive transient stake accounts.
 const TRANSIENT_STAKE_SEED_PREFIX = node_buffer.Buffer.from('transient');
+// Seed for user stake account created during session withdrawal
+const USER_STAKE_SEED_PREFIX = node_buffer.Buffer.from('user_stake');
 // Minimum amount of staked SOL required in a validator stake account to allow
 // for merges without a mismatch on credits observed
 const MINIMUM_ACTIVE_STAKE = web3_js.LAMPORTS_PER_SOL;
@@ -561,6 +563,19 @@ function findMetadataAddress(stakePoolMintAddress) {
     const [publicKey] = web3_js.PublicKey.findProgramAddressSync([node_buffer.Buffer.from('metadata'), METADATA_PROGRAM_ID.toBuffer(), stakePoolMintAddress.toBuffer()], METADATA_PROGRAM_ID);
     return publicKey;
 }
+/**
+ * Generates the user stake account PDA for session-based withdrawals.
+ * The PDA is derived from the user's wallet and a unique seed.
+ */
+function findUserStakeProgramAddress(programId, userWallet, seed) {
+    const seedBN = typeof seed === 'number' ? new BN(seed) : seed;
+    const [publicKey] = web3_js.PublicKey.findProgramAddressSync([
+        USER_STAKE_SEED_PREFIX,
+        userWallet.toBuffer(),
+        seedBN.toArrayLike(node_buffer.Buffer, 'le', 8),
+    ], programId);
+    return publicKey;
+}
 
 class BNLayout extends bufferLayout.Layout {
     constructor(span, signed, property) {
@@ -1123,6 +1138,7 @@ const STAKE_POOL_INSTRUCTION_LAYOUTS = Object.freeze({
             BufferLayout__namespace.u8('instruction'),
             BufferLayout__namespace.ns64('poolTokensIn'),
             BufferLayout__namespace.ns64('minimumLamportsOut'),
+            BufferLayout__namespace.ns64('userStakeSeed'),
         ]),
     },
 });
@@ -1558,9 +1574,9 @@ class StakePoolInstruction {
     }
     /**
      * Creates a transaction instruction to withdraw WSOL from a stake pool using a session.
+     * Rent for ATA creation (if needed) is paid from the withdrawal amount.
      */
     static withdrawWsolWithSession(params) {
-        var _a;
         const type = STAKE_POOL_INSTRUCTION_LAYOUTS.WithdrawWsolWithSession;
         const data = encodeData(type, {
             poolTokensIn: params.poolTokensIn,
@@ -1581,7 +1597,6 @@ class StakePoolInstruction {
             { pubkey: params.tokenProgramId, isSigner: false, isWritable: false },
             { pubkey: params.wsolMint, isSigner: false, isWritable: false },
             { pubkey: params.programSigner, isSigner: false, isWritable: true },
-            { pubkey: (_a = params.payer) !== null && _a !== void 0 ? _a : params.userTransferAuthority, isSigner: true, isWritable: true },
             { pubkey: params.userWallet, isSigner: false, isWritable: false },
             { pubkey: web3_js.SystemProgram.programId, isSigner: false, isWritable: false },
         ];
@@ -1602,12 +1617,14 @@ class StakePoolInstruction {
     }
     /**
      * Creates a transaction instruction to withdraw stake from a stake pool using a Fogo session.
+     * The stake account is created as a PDA and rent is paid from the withdrawal amount.
      */
     static withdrawStakeWithSession(params) {
         const type = STAKE_POOL_INSTRUCTION_LAYOUTS.WithdrawStakeWithSession;
         const data = encodeData(type, {
             poolTokensIn: params.poolTokensIn,
             minimumLamportsOut: params.minimumLamportsOut,
+            userStakeSeed: params.userStakeSeed,
         });
         const keys = [
             { pubkey: params.stakePool, isSigner: false, isWritable: true },
@@ -1624,6 +1641,7 @@ class StakePoolInstruction {
             { pubkey: params.tokenProgramId, isSigner: false, isWritable: false },
             { pubkey: web3_js.StakeProgram.programId, isSigner: false, isWritable: false },
             { pubkey: params.programSigner, isSigner: false, isWritable: false },
+            { pubkey: web3_js.SystemProgram.programId, isSigner: false, isWritable: false },
         ];
         return new web3_js.TransactionInstruction({
             programId: params.programId,
@@ -2197,8 +2215,9 @@ async function withdrawSol(connection, stakePoolAddress, tokenOwner, solReceiver
 }
 /**
  * Creates instructions required to withdraw wSOL from a stake pool.
+ * Rent for ATA creation (if needed) is paid from the withdrawal amount.
  */
-async function withdrawWsolWithSession(connection, stakePoolAddress, signerOrSession, userPubkey, amount, minimumLamportsOut = 0, solWithdrawAuthority, payer) {
+async function withdrawWsolWithSession(connection, stakePoolAddress, signerOrSession, userPubkey, amount, minimumLamportsOut = 0, solWithdrawAuthority) {
     const stakePoolAccount = await getStakePoolAccount(connection, stakePoolAddress);
     const stakePoolProgramId = getStakePoolProgramId(connection.rpcEndpoint);
     const stakePool = stakePoolAccount.account.data;
@@ -2231,7 +2250,6 @@ async function withdrawWsolWithSession(connection, stakePoolAddress, signerOrSes
         wsolMint: splToken.NATIVE_MINT,
         programSigner,
         userWallet: userPubkey,
-        payer,
         poolTokensIn: poolTokens,
         minimumLamportsOut,
     }));
@@ -2241,10 +2259,45 @@ async function withdrawWsolWithSession(connection, stakePoolAddress, signerOrSes
     };
 }
 /**
- * Creates instructions required to withdraw stake from a stake pool using a Fogo session.
- * The withdrawn stake account will be authorized to the user's wallet.
+ * Finds the next available seed for creating a user stake PDA.
+ * Scans from startSeed until an unused PDA is found.
+ *
+ * @param connection - Solana connection
+ * @param programId - The stake pool program ID
+ * @param userPubkey - User's wallet (used for PDA derivation)
+ * @param startSeed - Starting seed to search from (default: 0)
+ * @param maxSeed - Maximum seed to check before giving up (default: 1000)
+ * @returns The next available seed
+ * @throws Error if no available seed found within maxSeed
  */
-async function withdrawStakeWithSession(connection, stakePoolAddress, signerOrSession, userPubkey, amount, payer, useReserve = false, voteAccountAddress, minimumLamportsOut = 0, validatorComparator) {
+async function findNextUserStakeSeed(connection, programId, userPubkey, startSeed = 0, maxSeed = 1000) {
+    for (let seed = startSeed; seed < startSeed + maxSeed; seed++) {
+        const pda = findUserStakeProgramAddress(programId, userPubkey, seed);
+        const account = await connection.getAccountInfo(pda);
+        if (!account) {
+            return seed;
+        }
+    }
+    throw new Error(`No available user stake seed found between ${startSeed} and ${startSeed + maxSeed - 1}`);
+}
+/**
+ * Withdraws stake from a stake pool using a Fogo session.
+ *
+ * The on-chain program creates stake account PDAs, so no pre-creation step is needed.
+ * Rent for the stake account PDAs is paid from the withdrawal amount.
+ *
+ * @param connection - Solana connection
+ * @param stakePoolAddress - The stake pool to withdraw from
+ * @param signerOrSession - The session signer public key
+ * @param userPubkey - User's wallet (used for PDA derivation and token ownership)
+ * @param amount - Amount of pool tokens to withdraw
+ * @param userStakeSeedStart - Starting seed for user stake PDA derivation (default: 0)
+ * @param useReserve - Whether to withdraw from reserve (default: false)
+ * @param voteAccountAddress - Optional specific validator to withdraw from
+ * @param minimumLamportsOut - Minimum lamports to receive (slippage protection)
+ * @param validatorComparator - Optional comparator for validator selection
+ */
+async function withdrawStakeWithSession(connection, stakePoolAddress, signerOrSession, userPubkey, amount, userStakeSeedStart = 0, useReserve = false, voteAccountAddress, minimumLamportsOut = 0, validatorComparator) {
     const stakePoolAccount = await getStakePoolAccount(connection, stakePoolAddress);
     const stakePoolProgramId = getStakePoolProgramId(connection.rpcEndpoint);
     const stakePool = stakePoolAccount.account.data;
@@ -2295,6 +2348,7 @@ async function withdrawStakeWithSession(connection, stakePoolAddress, signerOrSe
     }
     const instructions = [];
     const stakeAccountPubkeys = [];
+    const userStakeSeeds = [];
     // Max 5 accounts to prevent an error: "Transaction too large"
     const maxWithdrawAccounts = 5;
     let i = 0;
@@ -2302,26 +2356,12 @@ async function withdrawStakeWithSession(connection, stakePoolAddress, signerOrSe
         if (i >= maxWithdrawAccounts) {
             break;
         }
-        // Create a deterministic stake account address using a seed
-        // This avoids needing the new account to sign (required for sessions)
-        // We use payer as base so only payer needs to sign (payer = basePubkey)
-        // The seed includes timestamp + random component to ensure uniqueness
-        const uniqueId = `${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-        const seed = `ws:${uniqueId}:${i}`.slice(0, 32); // Seed max 32 chars
-        const stakeReceiverPubkey = await web3_js.PublicKey.createWithSeed(payer, seed, web3_js.StakeProgram.programId);
+        // Derive the stake account PDA for this withdrawal
+        const userStakeSeed = userStakeSeedStart + i;
+        const stakeReceiverPubkey = findUserStakeProgramAddress(stakePoolProgramId, userPubkey, userStakeSeed);
         stakeAccountPubkeys.push(stakeReceiverPubkey);
-        // Create the stake account using createAccountWithSeed
-        // Since basePubkey === fromPubkey (both are payer), only payer needs to sign
-        instructions.push(web3_js.SystemProgram.createAccountWithSeed({
-            fromPubkey: payer,
-            newAccountPubkey: stakeReceiverPubkey,
-            basePubkey: payer,
-            seed,
-            lamports: stakeAccountRentExemption,
-            space: web3_js.StakeProgram.space,
-            programId: web3_js.StakeProgram.programId,
-        }));
-        // Add the withdraw stake with session instruction
+        userStakeSeeds.push(userStakeSeed);
+        // The on-chain program will create the stake account PDA
         instructions.push(StakePoolInstruction.withdrawStakeWithSession({
             programId: stakePoolProgramId,
             stakePool: stakePoolAddress,
@@ -2337,12 +2377,14 @@ async function withdrawStakeWithSession(connection, stakePoolAddress, signerOrSe
             programSigner,
             poolTokensIn: withdrawAccount.poolAmount.toNumber(),
             minimumLamportsOut,
+            userStakeSeed,
         }));
         i++;
     }
     return {
         instructions,
         stakeAccountPubkeys,
+        userStakeSeeds,
     };
 }
 async function addValidatorToPool(connection, stakePoolAddress, validatorVote, seed) {
@@ -2720,6 +2762,13 @@ exports.decreaseValidatorStake = decreaseValidatorStake;
 exports.depositSol = depositSol;
 exports.depositStake = depositStake;
 exports.depositWsolWithSession = depositWsolWithSession;
+exports.findEphemeralStakeProgramAddress = findEphemeralStakeProgramAddress;
+exports.findNextUserStakeSeed = findNextUserStakeSeed;
+exports.findStakeProgramAddress = findStakeProgramAddress;
+exports.findTransientStakeProgramAddress = findTransientStakeProgramAddress;
+exports.findUserStakeProgramAddress = findUserStakeProgramAddress;
+exports.findWithdrawAuthorityProgramAddress = findWithdrawAuthorityProgramAddress;
+exports.findWsolTransientProgramAddress = findWsolTransientProgramAddress;
 exports.getStakeAccount = getStakeAccount;
 exports.getStakePoolAccount = getStakePoolAccount;
 exports.getStakePoolAccounts = getStakePoolAccounts;