@ignitionfi/fogo-stake-pool 1.0.0 → 1.0.2

package/dist/index.iife.js

@@ -19013,7 +19013,7 @@ var solanaStakePool = (function (exports, node_buffer) {
 	// Public key that identifies the SPL Stake Pool program.
 	const STAKE_POOL_PROGRAM_ID = new PublicKey('SP1s4uFeTAX9jsXXmwyDs1gxYYf7cdDZ8qHUHVxE1yr');
 	// Public key that identifies the SPL Stake Pool program deployed to devnet.
-	const DEVNET_STAKE_POOL_PROGRAM_ID = new 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
@@ -19024,7 +19024,7 @@ var solanaStakePool = (function (exports, node_buffer) {
 	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 = LAMPORTS_PER_SOL;
+	const MINIMUM_ACTIVE_STAKE = 1000000;
 
 	/**
 	 * Populate a buffer of instruction data using an InstructionType
@@ -22018,40 +22018,63 @@ var solanaStakePool = (function (exports, node_buffer) {
 	    }
 	    const minBalanceForRentExemption = await connection.getMinimumBalanceForRentExemption(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',