@ignitionfi/fogo-stake-pool 1.0.0 → 1.0.1

package/dist/index.cjs.js

@@ -446,7 +446,7 @@ const METADATA_MAX_URI_LENGTH = 200;
 // Public key that identifies the SPL Stake Pool program.
 const STAKE_POOL_PROGRAM_ID = new web3_js.PublicKey('SP1s4uFeTAX9jsXXmwyDs1gxYYf7cdDZ8qHUHVxE1yr');
 // Public key that identifies the SPL Stake Pool program deployed to devnet.
-const DEVNET_STAKE_POOL_PROGRAM_ID = new web3_js.PublicKey('DPoo15wWDqpPJJtS2MUZ49aRxqz5ZaaJCJP4z8bLuib');
+const DEVNET_STAKE_POOL_PROGRAM_ID = STAKE_POOL_PROGRAM_ID;
 // Maximum number of validators to update during UpdateValidatorListBalance.
 const MAX_VALIDATORS_TO_UPDATE = 4;
 // Seed for ephemeral stake account
@@ -837,40 +837,63 @@ async function prepareWithdrawAccounts(connection, stakePool, stakePoolAddress,
     }
     const minBalanceForRentExemption = await connection.getMinimumBalanceForRentExemption(web3_js.StakeProgram.space);
     const minBalance = new BN(minBalanceForRentExemption + MINIMUM_ACTIVE_STAKE);
-    let accounts = [];
-    // Prepare accounts
+    // First, collect all stake account addresses we need to check
+    const accountsToFetch = [];
     for (const validator of validatorList.validators) {
         if (validator.status !== ValidatorStakeInfoStatus.Active) {
             continue;
         }
         const stakeAccountAddress = await findStakeProgramAddress(stakePoolProgramId, validator.voteAccountAddress, stakePoolAddress);
-        // For active stake accounts, subtract the minimum balance that must remain
-        // to allow for merges and maintain rent exemption
-        const availableActiveLamports = validator.activeStakeLamports.sub(minBalance);
-        if (availableActiveLamports.gt(new BN(0))) {
-            const isPreferred = (_a = stakePool === null || stakePool === void 0 ? void 0 : stakePool.preferredWithdrawValidatorVoteAddress) === null || _a === void 0 ? void 0 : _a.equals(validator.voteAccountAddress);
-            accounts.push({
+        const isPreferred = (_a = stakePool === null || stakePool === void 0 ? void 0 : stakePool.preferredWithdrawValidatorVoteAddress) === null || _a === void 0 ? void 0 : _a.equals(validator.voteAccountAddress);
+        // Add active stake account if validator list indicates it has stake
+        if (validator.activeStakeLamports.gt(new BN(0))) {
+            accountsToFetch.push({
                 type: isPreferred ? 'preferred' : 'active',
                 voteAddress: validator.voteAccountAddress,
                 stakeAddress: stakeAccountAddress,
-                lamports: availableActiveLamports,
             });
         }
-        const transientStakeLamports = validator.transientStakeLamports.sub(minBalance);
-        if (transientStakeLamports.gt(new BN(0))) {
+        // Add transient stake account if validator list indicates it has stake
+        if (validator.transientStakeLamports.gt(new BN(0))) {
             const transientStakeAccountAddress = await findTransientStakeProgramAddress(stakePoolProgramId, validator.voteAccountAddress, stakePoolAddress, validator.transientSeedSuffixStart);
-            accounts.push({
+            accountsToFetch.push({
                 type: 'transient',
                 voteAddress: validator.voteAccountAddress,
                 stakeAddress: transientStakeAccountAddress,
-                lamports: transientStakeLamports,
+            });
+        }
+    }
+    // Fetch all stake accounts + reserve in one batch call
+    const addressesToFetch = [
+        ...accountsToFetch.map(a => a.stakeAddress),
+        stakePool.reserveStake,
+    ];
+    const accountInfos = await connection.getMultipleAccountsInfo(addressesToFetch);
+    // Build accounts list using actual on-chain balances
+    let accounts = [];
+    for (let i = 0; i < accountsToFetch.length; i++) {
+        const { type, voteAddress, stakeAddress } = accountsToFetch[i];
+        const accountInfo = accountInfos[i];
+        if (!accountInfo) {
+            continue;
+        }
+        // Use actual on-chain balance instead of validator list value
+        const actualLamports = new BN(accountInfo.lamports);
+        const availableLamports = actualLamports.sub(minBalance);
+        if (availableLamports.gt(new BN(0))) {
+            accounts.push({
+                type,
+                voteAddress,
+                stakeAddress,
+                lamports: availableLamports,
             });
         }
     }
     // Sort from highest to lowest balance
     accounts = accounts.sort(compareFn || ((a, b) => b.lamports.sub(a.lamports).toNumber()));
-    const reserveStake = await connection.getAccountInfo(stakePool.reserveStake);
-    const reserveStakeBalance = new BN(((_b = reserveStake === null || reserveStake === void 0 ? void 0 : reserveStake.lamports) !== null && _b !== void 0 ? _b : 0) - minBalanceForRentExemption);
+    // Add reserve stake using actual balance (last item in batch fetch)
+    const reserveAccountInfo = accountInfos[accountInfos.length - 1];
+    const reserveStakeBalance = new BN(((_b = reserveAccountInfo === null || reserveAccountInfo === void 0 ? void 0 : reserveAccountInfo.lamports) !== null && _b !== void 0 ? _b : 0) - minBalanceForRentExemption);
     if (reserveStakeBalance.gt(new BN(0))) {
         accounts.push({
             type: 'reserve',