@jpool/bond-sdk 0.9.0-next.5 → 0.9.0-next.6

package/dist/index.d.mts

@@ -1533,6 +1533,10 @@ type BondState = IdlAccounts<Jbond>['bondState'];
 type ValidatorBond = IdlAccounts<Jbond>['validatorBond'];
 type BondType = IdlTypes<Jbond>['bondType'];
 type CollateralType = IdlTypes<Jbond>['collateralType'];
+type BondStateStats = {
+    totalCollected: number;
+    totalMembers: number;
+};
 declare const bondTypeToSeed: {
     performance: Seeds;
     crowdfunding: Seeds;
@@ -1835,8 +1839,11 @@ declare class JBondClient {
      */
     getGlobalState(): Promise<GlobalState>;
     getBondState(bondType: BondType, bondName: string): Promise<BondState>;
-    getAllBondStates(_bondType: BondType): Promise<BondState[]>;
-    getBondStateSessionStatus(bondType: BondType, bondName: string): Promise<SessionStatus>;
+    /**
+     * Get all bond states with total collected collateral
+     */
+    getAllBondStates(_bondType: BondType): Promise<Array<[BondState, number]>>;
+    private getValidatorBondsByState;
     /**
      * Fetch validator bond data or null if not found
      * @param bondType
@@ -1875,4 +1882,4 @@ declare class JBondClient {
     private ensureUser;
 }
 
-export { BondClientEnv, type BondCollateral, type BondConfigureProps, type BondInitializeProps, type BondState, BondTransactionType, type BondType, BondTypeVariant, type ClaimProps, type ClientOptions, type CollateralType, ENV_PROGRAM_ID, type EpochHistoryItem, type GetHistoryGroupedProps, type GetHistoryProps, type GlobalConfigureProps, type GlobalInitializeProps, type GlobalState, JBondClient, JPOOL_STAKE_POOL, type Jbond, NodeWallet, type RegisterValidatorProps, Seeds, SessionStatus, type SetWithdrawAuthorityProps, type TopUpCollateralProps, type TransactionHistoryItem, type ValidatorBond, type WithdrawCollateralProps, bondTypeToSeed };
+export { BondClientEnv, type BondCollateral, type BondConfigureProps, type BondInitializeProps, type BondState, type BondStateStats, BondTransactionType, type BondType, BondTypeVariant, type ClaimProps, type ClientOptions, type CollateralType, ENV_PROGRAM_ID, type EpochHistoryItem, type GetHistoryGroupedProps, type GetHistoryProps, type GlobalConfigureProps, type GlobalInitializeProps, type GlobalState, JBondClient, JPOOL_STAKE_POOL, type Jbond, NodeWallet, type RegisterValidatorProps, Seeds, SessionStatus, type SetWithdrawAuthorityProps, type TopUpCollateralProps, type TransactionHistoryItem, type ValidatorBond, type WithdrawCollateralProps, bondTypeToSeed };

package/dist/index.d.ts

@@ -1533,6 +1533,10 @@ type BondState = IdlAccounts<Jbond>['bondState'];
 type ValidatorBond = IdlAccounts<Jbond>['validatorBond'];
 type BondType = IdlTypes<Jbond>['bondType'];
 type CollateralType = IdlTypes<Jbond>['collateralType'];
+type BondStateStats = {
+    totalCollected: number;
+    totalMembers: number;
+};
 declare const bondTypeToSeed: {
     performance: Seeds;
     crowdfunding: Seeds;
@@ -1835,8 +1839,11 @@ declare class JBondClient {
      */
     getGlobalState(): Promise<GlobalState>;
     getBondState(bondType: BondType, bondName: string): Promise<BondState>;
-    getAllBondStates(_bondType: BondType): Promise<BondState[]>;
-    getBondStateSessionStatus(bondType: BondType, bondName: string): Promise<SessionStatus>;
+    /**
+     * Get all bond states with total collected collateral
+     */
+    getAllBondStates(_bondType: BondType): Promise<Array<[BondState, number]>>;
+    private getValidatorBondsByState;
     /**
      * Fetch validator bond data or null if not found
      * @param bondType
@@ -1875,4 +1882,4 @@ declare class JBondClient {
     private ensureUser;
 }
 
-export { BondClientEnv, type BondCollateral, type BondConfigureProps, type BondInitializeProps, type BondState, BondTransactionType, type BondType, BondTypeVariant, type ClaimProps, type ClientOptions, type CollateralType, ENV_PROGRAM_ID, type EpochHistoryItem, type GetHistoryGroupedProps, type GetHistoryProps, type GlobalConfigureProps, type GlobalInitializeProps, type GlobalState, JBondClient, JPOOL_STAKE_POOL, type Jbond, NodeWallet, type RegisterValidatorProps, Seeds, SessionStatus, type SetWithdrawAuthorityProps, type TopUpCollateralProps, type TransactionHistoryItem, type ValidatorBond, type WithdrawCollateralProps, bondTypeToSeed };
+export { BondClientEnv, type BondCollateral, type BondConfigureProps, type BondInitializeProps, type BondState, type BondStateStats, BondTransactionType, type BondType, BondTypeVariant, type ClaimProps, type ClientOptions, type CollateralType, ENV_PROGRAM_ID, type EpochHistoryItem, type GetHistoryGroupedProps, type GetHistoryProps, type GlobalConfigureProps, type GlobalInitializeProps, type GlobalState, JBondClient, JPOOL_STAKE_POOL, type Jbond, NodeWallet, type RegisterValidatorProps, Seeds, SessionStatus, type SetWithdrawAuthorityProps, type TopUpCollateralProps, type TransactionHistoryItem, type ValidatorBond, type WithdrawCollateralProps, bondTypeToSeed };

package/dist/index.js

@@ -7047,23 +7047,42 @@ var JBondClient = class _JBondClient {
     const [bondState] = this.pda.bondState(bondType, bondName);
     return await this.program.account.bondState.fetch(bondState);
   }
-  /// Fetch all bond states by type
+  /**
+   * Get all bond states with total collected collateral
+   */
   async getAllBondStates(_bondType) {
     const bondStates = [];
     const bondStateAccounts = await this.program.account.bondState.all();
-    for (const { account } of bondStateAccounts) {
-      bondStates.push(account);
+    for (const { account: state } of bondStateAccounts) {
+      if (!("crowdfunding" in state.bondType)) {
+        continue;
+      }
+      const validatorBonds = await this.getValidatorBondsByState(state.bondType, state.name);
+      const balances = await Promise.all(
+        validatorBonds.map(
+          (vb) => this.getValidatorBondBalance(state.bondType, state.name, vb.voteAccount).then((v) => v ?? 0)
+        )
+      );
+      const totalCollected = balances.reduce((sum, v) => sum + v, 0);
+      bondStates.push([state, totalCollected]);
     }
     return bondStates;
   }
-  async getBondStateSessionStatus(bondType, bondName) {
-    const bondState = await this.getBondState(bondType, bondName);
-    const now = Math.floor(Date.now() / 1e3);
-    if (bondState.sessionFinishTs.toNumber() > now) {
-      return 0 /* Live */;
-    } else {
-      return 1 /* Finished */;
+  async getValidatorBondsByState(bondType, bondName) {
+    const validatorBonds = [];
+    const bondStatePda = this.pda.bondState(bondType, bondName)[0];
+    const validatorBondAccounts = await this.program.account.validatorBond.all([
+      {
+        memcmp: {
+          offset: 8,
+          bytes: bondStatePda.toBase58()
+        }
+      }
+    ]);
+    for (const { account: vb } of validatorBondAccounts) {
+      validatorBonds.push(vb);
     }
+    return validatorBonds;
   }
   /**
    * Fetch validator bond data or null if not found
@@ -7073,7 +7092,6 @@ var JBondClient = class _JBondClient {
    */
   async getValidatorBond(bondType, bondName, vote) {
     const [address] = this.pda.validatorBond(bondType, bondName, new web3_js.PublicKey(vote));
-    console.log("Fetching validator bond at address:", address.toString());
     return await this.program.account.validatorBond.fetchNullable(address);
   }
   /**