@ignitionfi/spl-stake-pool 1.1.25 → 1.1.26

package/dist/index.browser.cjs.js

@@ -832,7 +832,7 @@ async function prepareWithdrawAccounts(connection, stakePool, stakePoolAddress,
     const stakePoolProgramId = getStakePoolProgramId(connection.rpcEndpoint);
     const validatorListAcc = await connection.getAccountInfo(stakePool.validatorList);
     const validatorList = ValidatorListLayout.decode(validatorListAcc === null || validatorListAcc === void 0 ? void 0 : validatorListAcc.data);
-    if (!(validatorList === null || validatorList === void 0 ? void 0 : validatorList.validators) || (validatorList === null || validatorList === void 0 ? void 0 : validatorList.validators.length) == 0) {
+    if (!(validatorList === null || validatorList === void 0 ? void 0 : validatorList.validators) || (validatorList === null || validatorList === void 0 ? void 0 : validatorList.validators.length) === 0) {
         throw new Error('No accounts found');
     }
     const minBalanceForRentExemption = await connection.getMinimumBalanceForRentExemption(web3_js.StakeProgram.space);
@@ -887,9 +887,9 @@ async function prepareWithdrawAccounts(connection, stakePool, stakePoolAddress,
         denominator: fee.denominator,
     };
     for (const type of ['preferred', 'active', 'transient', 'reserve']) {
-        const filteredAccounts = accounts.filter(a => a.type == type);
+        const filteredAccounts = accounts.filter(a => a.type === type);
         for (const { stakeAddress, voteAddress, lamports } of filteredAccounts) {
-            if (lamports.lte(minBalance) && type == 'transient') {
+            if (lamports.lte(minBalance) && type === 'transient') {
                 continue;
             }
             let availableForWithdrawal = calcPoolTokensForDeposit(stakePool, lamports);
@@ -1664,38 +1664,25 @@ class StakePoolInstruction {
     /**
      * Creates a transaction instruction to withdraw SOL from a deactivated user stake account using a Fogo session.
      * The stake account must be fully deactivated (inactive).
-     * User receives full stake balance (payer's rent contribution compensates for reduced split).
      */
     static withdrawFromStakeAccountWithSession(params) {
-        // For u64::MAX (full withdrawal), we need to manually encode since buffer-layout doesn't handle bigint well
-        const U64_MAX = BigInt('18446744073709551615');
-        const isFullWithdrawal = params.lamports >= U64_MAX;
-        // Manually create the instruction data buffer using Uint8Array for browser compatibility
-        // Layout: u8 instruction (1) + u64 lamports (8) + u64 userStakeSeed (8) = 17 bytes
-        const data = new Uint8Array(17);
-        data[0] = 30; // instruction discriminator (WithdrawFromStakeAccountWithSession = 30)
-        // Write lamports as u64 little-endian (bytes 1-8)
-        const lamportsBigInt = isFullWithdrawal ? U64_MAX : params.lamports;
-        for (let i = 0; i < 8; i++) {
-            data[1 + i] = Number((lamportsBigInt >> BigInt(i * 8)) & BigInt(0xff));
-        }
-        // Write userStakeSeed as u64 little-endian (bytes 9-16)
-        const seedBigInt = BigInt(params.userStakeSeed);
-        for (let i = 0; i < 8; i++) {
-            data[9 + i] = Number((seedBigInt >> BigInt(i * 8)) & BigInt(0xff));
-        }
-        // Account order matches Rust: stake_account, recipient, clock, stake_history, session_signer
+        const type = STAKE_POOL_INSTRUCTION_LAYOUTS.WithdrawFromStakeAccountWithSession;
+        const data = encodeData(type, {
+            lamports: params.lamports,
+            userStakeSeed: params.userStakeSeed,
+        });
         const keys = [
             { pubkey: params.userStakeAccount, isSigner: false, isWritable: true },
             { pubkey: params.userWallet, isSigner: false, isWritable: true },
             { pubkey: web3_js.SYSVAR_CLOCK_PUBKEY, isSigner: false, isWritable: false },
             { pubkey: web3_js.SYSVAR_STAKE_HISTORY_PUBKEY, isSigner: false, isWritable: false },
             { pubkey: params.sessionSigner, isSigner: true, isWritable: false },
+            { pubkey: web3_js.StakeProgram.programId, isSigner: false, isWritable: false },
         ];
         return new web3_js.TransactionInstruction({
             programId: params.programId,
             keys,
-            data: Buffer.from(data),
+            data,
         });
     }
     /**