@ignitionfi/fogo-stake-pool 1.0.0 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ignitionfi/fogo-stake-pool",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Fogo Stake Pool SDK",
   "contributors": [
     "Anza Maintainers <maintainers@anza.xyz>",
@@ -45,8 +45,8 @@
     "superstruct": "^2.0.2"
   },
   "devDependencies": {
-    "@rollup/plugin-alias": "^5.1.1",
-    "@rollup/plugin-commonjs": "^28.0.1",
+    "@rollup/plugin-alias": "^6.0.0",
+    "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-multi-entry": "^6.0.0",
     "@rollup/plugin-node-resolve": "^16.0.0",
@@ -58,10 +58,10 @@
     "@types/node-fetch": "^2.6.12",
     "cross-env": "^10.0.0",
     "jest": "^30.0.3",
-    "rimraf": "^6.0.1",
+    "rimraf": "^6.1.2",
     "rollup": "^4.28.0",
-    "rollup-plugin-dts": "^6.1.1",
-    "ts-jest": "^29.2.5"
+    "rollup-plugin-dts": "^6.3.0",
+    "ts-jest": "^29.4.6"
   },
   "jest": {
     "moduleFileExtensions": [
@@ -80,9 +80,9 @@
     "build": "tsc && cross-env NODE_ENV=production rollup -c",
     "dev": "tsc && cross-env NODE_ENV=production rollup -c -w",
     "build:program": "cargo build-sbf --manifest-path=../program/Cargo.toml",
-    "format": "prettier --check src test",
-    "format:fix": "prettier --write src test",
-    "lint": "eslint --max-warnings 0 .",
+    "format": "eslint .",
+    "format:fix": "eslint . --fix",
+    "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "test": "jest",
     "clean": "rimraf ./dist"

package/src/constants.ts

@@ -11,7 +11,7 @@ export const METADATA_MAX_URI_LENGTH = 200
 export const STAKE_POOL_PROGRAM_ID = new PublicKey('SP1s4uFeTAX9jsXXmwyDs1gxYYf7cdDZ8qHUHVxE1yr')
 
 // Public key that identifies the SPL Stake Pool program deployed to devnet.
-export const DEVNET_STAKE_POOL_PROGRAM_ID = new PublicKey('DPoo15wWDqpPJJtS2MUZ49aRxqz5ZaaJCJP4z8bLuib')
+export const DEVNET_STAKE_POOL_PROGRAM_ID = STAKE_POOL_PROGRAM_ID
 
 // Maximum number of validators to update during UpdateValidatorListBalance.
 export const MAX_VALIDATORS_TO_UPDATE = 4
@@ -27,4 +27,4 @@ export const USER_STAKE_SEED_PREFIX = 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
-export const MINIMUM_ACTIVE_STAKE = LAMPORTS_PER_SOL
+export const MINIMUM_ACTIVE_STAKE = 1_000_000

package/src/layouts.ts

@@ -84,6 +84,7 @@ export function futureEpoch<T>(layout: Layout<T>, property?: string): LayoutCls<
   return new FutureEpochLayout<T>(layout, property)
 }
 
+/* eslint-disable ts/no-redeclare -- Superstruct pattern: type + const with same name */
 export type StakeAccountType = Infer<typeof StakeAccountType>
 export const StakeAccountType = enums(['uninitialized', 'initialized', 'delegated', 'rewardsPool'])
 
@@ -123,6 +124,7 @@ export const StakeAccount = type({
   type: StakeAccountType,
   info: optional(StakeAccountInfo),
 })
+/* eslint-enable ts/no-redeclare */
 export interface Lockup {
   unixTimestamp: BN
   epoch: BN

package/src/utils/stake.ts

@@ -65,14 +65,13 @@ export async function prepareWithdrawAccounts(
   )
   const minBalance = new BN(minBalanceForRentExemption + MINIMUM_ACTIVE_STAKE)
 
-  let accounts = [] as Array<{
-    type: 'preferred' | 'active' | 'transient' | 'reserve'
-    voteAddress?: PublicKey | undefined
+  // First, collect all stake account addresses we need to check
+  const accountsToFetch: Array<{
+    type: 'preferred' | 'active' | 'transient'
+    voteAddress: PublicKey
     stakeAddress: PublicKey
-    lamports: BN
-  }>
+  }> = []
 
-  // Prepare accounts
   for (const validator of validatorList.validators) {
     if (validator.status !== ValidatorStakeInfoStatus.Active) {
       continue
@@ -84,34 +83,63 @@ export async function prepareWithdrawAccounts(
       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 = stakePool?.preferredWithdrawValidatorVoteAddress?.equals(
-        validator.voteAccountAddress,
-      )
-      accounts.push({
+    const isPreferred = stakePool?.preferredWithdrawValidatorVoteAddress?.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: ValidatorAccount[] = []
+
+  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,
       })
     }
   }
@@ -119,8 +147,9 @@ export async function prepareWithdrawAccounts(
   // 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((reserveStake?.lamports ?? 0) - minBalanceForRentExemption)
+  // Add reserve stake using actual balance (last item in batch fetch)
+  const reserveAccountInfo = accountInfos[accountInfos.length - 1]
+  const reserveStakeBalance = new BN((reserveAccountInfo?.lamports ?? 0) - minBalanceForRentExemption)
   if (reserveStakeBalance.gt(new BN(0))) {
     accounts.push({
       type: 'reserve',