@jpool/bond-sdk 0.9.0-next.13 → 0.9.0-next.15

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { Program, AnchorProvider, BN } from '@coral-xyz/anchor';
 import { getStakePoolAccount, STAKE_POOL_PROGRAM_ID, StakePoolInstruction } from '@solana/spl-stake-pool';
-import { TOKEN_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync } from '@solana/spl-token';
+import { TOKEN_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync, ACCOUNT_SIZE, AccountLayout } from '@solana/spl-token';
 import { PublicKey, Transaction, SystemProgram, LAMPORTS_PER_SOL } from '@solana/web3.js';
 import bs58 from 'bs58';
 
@@ -6682,7 +6682,7 @@ var JBondClient = class _JBondClient {
     if (!creator) {
       throw new Error("Missing creator");
     }
-    const collateralType = (await this.getBondState(bondType, name)).collateralType;
+    const collateralType = (await this.getBondState(bondType, name))[0].collateralType;
     const accounts = {
       bondState,
       validatorBond,
@@ -6725,7 +6725,7 @@ var JBondClient = class _JBondClient {
         creator: props.payer
       }));
     }
-    const collateralType = (await this.getBondState(bondType, name)).collateralType;
+    const collateralType = (await this.getBondState(bondType, name))[0].collateralType;
     const accounts = {
       bondState,
       validatorBond,
@@ -6762,7 +6762,7 @@ var JBondClient = class _JBondClient {
     if (!payer || !destination) {
       throw new Error("Missing payer/destination");
     }
-    const collateralType = (await this.getBondState(bondType, name)).collateralType;
+    const collateralType = (await this.getBondState(bondType, name))[0].collateralType;
     const accounts = {
       bondState,
       validatorBond,
@@ -6790,12 +6790,12 @@ var JBondClient = class _JBondClient {
     const { bondType, name } = props;
     const [bondState] = this.pda.bondState(bondType, name);
     const [validatorBond] = this.pda.validatorBond(bondType, name, props.voteAccount);
-    const reserve = props.reserve ?? (await this.getBondState(bondType, name)).reserve;
+    const reserve = props.reserve ?? (await this.getBondState(bondType, name))[0].reserve;
     const authority = props.authority ?? this.program.provider.wallet?.publicKey;
     if (!reserve) {
       throw new Error("Reserve not set");
     }
-    const collateralType = (await this.getBondState(bondType, name)).collateralType;
+    const collateralType = (await this.getBondState(bondType, name))[0].collateralType;
     const accounts = {
       bondState,
       validatorBond,
@@ -6865,21 +6865,29 @@ var JBondClient = class _JBondClient {
     const [globalState] = this.pda.globalState();
     return await this.program.account.globalState.fetch(globalState);
   }
+  /**
+   * Fetch bond state with stats
+   * @param bondType - Type of the bond
+   * @param bondName - Name of the bond
+   */
   async getBondState(bondType, bondName) {
-    const [bondState] = this.pda.bondState(bondType, bondName);
-    return await this.program.account.bondState.fetch(bondState);
+    const bondState = await this.program.account.bondState.fetch(this.pda.bondState(bondType, bondName)[0]);
+    return [bondState, await this.getBondStateStats(bondState)];
   }
   /**
    * Get all bond states with total collected collateral
    */
-  async getAllBondStates(bondType) {
+  async getAllBondStates(bondType, session_status) {
     const bondStates = [];
     const bondStateAccounts = await this.program.account.bondState.all();
     for (const { account: state } of bondStateAccounts) {
       if (!sameVariant(state.bondType, bondType)) {
         continue;
       }
-      const bondStateStats = await this.getBondStateStats(state.bondType, state.name);
+      if (session_status !== void 0 && this.getBondStateSessionStatus(state) !== session_status) {
+        continue;
+      }
+      const bondStateStats = await this.getBondStateStats(state);
       bondStates.push([state, bondStateStats]);
     }
     return bondStates;
@@ -6887,7 +6895,7 @@ var JBondClient = class _JBondClient {
   /**
    * Get session status for bond state
    */
-  async getBondStateSessionStatus(bondState) {
+  getBondStateSessionStatus(bondState) {
     const now = Math.floor(Date.now() / 1e3);
     if (bondState.sessionFinishTs.toNumber() > now) {
       return 0 /* Live */;
@@ -6931,7 +6939,7 @@ var JBondClient = class _JBondClient {
    */
   async getBondCollateralType(bondType, bondName) {
     const bondState = await this.getBondState(bondType, bondName);
-    return bondState.collateralType;
+    return bondState[0].collateralType;
   }
   /**
    * Get validator bond account balance (in SOL)
@@ -6943,7 +6951,7 @@ var JBondClient = class _JBondClient {
   async getValidatorBondBalance(bondType, bondName, vote) {
     const [address] = this.pda.validatorBond(bondType, bondName, new PublicKey(vote));
     const bondStateData = await this.getBondState(bondType, bondName);
-    const bondStateCollateralType = bondStateData.collateralType;
+    const bondStateCollateralType = bondStateData[0].collateralType;
     return await matchVariant(bondStateCollateralType, {
       native: async () => {
         const accountInfo = await this.connection.getAccountInfo(address).catch(() => null);
@@ -6958,7 +6966,7 @@ var JBondClient = class _JBondClient {
         const tokenAccount = getAssociatedTokenAddressSync(mint, address, true);
         try {
           const balance = await this.connection.getTokenAccountBalance(tokenAccount);
-          return Number(balance.value.uiAmount ?? 0);
+          return Number(balance.value.uiAmount ?? 0) * LAMPORTS_PER_SOL;
         } catch {
           return 0;
         }
@@ -6968,7 +6976,14 @@ var JBondClient = class _JBondClient {
   // Get total collected collateral for a bond state
   async getBondStateTotalCollected(bondType, bondName, votes) {
     const bondStateData = await this.getBondState(bondType, bondName);
-    const bondStateCollateralType = bondStateData.collateralType;
+    const bondStateCollateralType = bondStateData[0].collateralType;
+    const chunk = (arr, n = 100) => {
+      const res = [];
+      for (let i = 0; i < arr.length; i += n) {
+        res.push(arr.slice(i, i + n));
+      }
+      return res;
+    };
     return await matchVariant(bondStateCollateralType, {
       native: async () => {
         const addresses = votes.map((vote) => {
@@ -6992,35 +7007,43 @@ var JBondClient = class _JBondClient {
           const [validatorBondAddress] = this.pda.validatorBond(bondType, bondName, new PublicKey(vote));
           return getAssociatedTokenAddressSync(mint, validatorBondAddress, true);
         });
-        const accountInfos = await this.connection.getMultipleAccountsInfo(tokenAccounts);
-        const balances = await Promise.all(
-          accountInfos.map(async (accountInfo) => {
-            if (!accountInfo) {
-              return 0;
+        if (tokenAccounts.length === 0) {
+          return 0;
+        }
+        let total = 0n;
+        for (const part of chunk(tokenAccounts, 100)) {
+          const infos = await this.connection.getMultipleAccountsInfo(part).catch(() => []);
+          for (let i = 0; i < infos.length; i++) {
+            const info = infos[i];
+            if (!info) {
+              continue;
+            }
+            if (info.data.length !== ACCOUNT_SIZE) {
+              continue;
             }
             try {
-              const balance = await this.connection.getTokenAccountBalance(tokenAccounts[accountInfos.indexOf(accountInfo)]);
-              return Number(balance.value.uiAmount ?? 0) * LAMPORTS_PER_SOL;
+              const acc = AccountLayout.decode(info.data);
+              const raw = BigInt(acc.amount.toString());
+              total += raw;
             } catch {
-              return 0;
             }
-          })
-        );
-        return balances.reduce((sum, v) => sum + v, 0);
+          }
+        }
+        const asNumber = Number(total);
+        return Number.isFinite(asNumber) ? asNumber : Number.MAX_SAFE_INTEGER;
       }
     });
   }
-  async getBondStateStats(bondType, bondName) {
-    const bondState = await this.getBondState(bondType, bondName);
-    const validatorBonds = await this.getValidatorBondsByState(bondState.bondType, bondState.name);
+  async getBondStateStats(state) {
+    const validatorBonds = await this.getValidatorBondsByState(state.bondType, state.name);
     const totalCollected = await this.getBondStateTotalCollected(
-      bondType,
-      bondName,
+      state.bondType,
+      state.name,
       validatorBonds.map((vb) => vb.voteAccount)
     );
     const bondStateStats = {
       totalCollected,
-      status: await this.getBondStateSessionStatus(bondState)
+      status: await this.getBondStateSessionStatus(state)
     };
     return bondStateStats;
   }