@jpool/bond-sdk 0.9.0-next.7 → 0.9.0-next.9

package/dist/index.d.mts

@@ -1227,17 +1227,6 @@ type Jbond = {
                         ];
                         "type": "u64";
                     },
-                    {
-                        "name": "status";
-                        "docs": [
-                            "Current status of the bond"
-                        ];
-                        "type": {
-                            "defined": {
-                                "name": "bondStatus";
-                            };
-                        };
-                    },
                     {
                         "name": "sessionStartTs";
                         "docs": [
@@ -1262,23 +1251,6 @@ type Jbond = {
                 ];
             };
         },
-        {
-            "name": "bondStatus";
-            "type": {
-                "kind": "enum";
-                "variants": [
-                    {
-                        "name": "active";
-                    },
-                    {
-                        "name": "inactive";
-                    },
-                    {
-                        "name": "pending";
-                    }
-                ];
-            };
-        },
         {
             "name": "bondType";
             "docs": [
@@ -1534,7 +1506,7 @@ type BondType = IdlTypes<Jbond>['bondType'];
 type CollateralType = IdlTypes<Jbond>['collateralType'];
 type BondStateStats = {
     totalCollected: number;
-    totalMembers: number;
+    status: SessionStatus;
 };
 declare const bondTypeToSeed: {
     performance: Seeds;
@@ -1823,7 +1795,12 @@ declare class JBondClient {
     /**
      * Get all bond states with total collected collateral
      */
-    getAllBondStates(_bondType: BondType): Promise<Array<[BondState, number]>>;
+    getAllBondStates(bondType: BondType): Promise<Array<[BondState, BondStateStats]>>;
+    /**
+     * Get session status for bond state
+     */
+    private getBondStateSessionStatus;
+    /** Get all validator bonds for a given bond state */
     private getValidatorBondsByState;
     /**
      * Fetch validator bond data or null if not found

package/dist/index.d.ts

@@ -1227,17 +1227,6 @@ type Jbond = {
                         ];
                         "type": "u64";
                     },
-                    {
-                        "name": "status";
-                        "docs": [
-                            "Current status of the bond"
-                        ];
-                        "type": {
-                            "defined": {
-                                "name": "bondStatus";
-                            };
-                        };
-                    },
                     {
                         "name": "sessionStartTs";
                         "docs": [
@@ -1262,23 +1251,6 @@ type Jbond = {
                 ];
             };
         },
-        {
-            "name": "bondStatus";
-            "type": {
-                "kind": "enum";
-                "variants": [
-                    {
-                        "name": "active";
-                    },
-                    {
-                        "name": "inactive";
-                    },
-                    {
-                        "name": "pending";
-                    }
-                ];
-            };
-        },
         {
             "name": "bondType";
             "docs": [
@@ -1534,7 +1506,7 @@ type BondType = IdlTypes<Jbond>['bondType'];
 type CollateralType = IdlTypes<Jbond>['collateralType'];
 type BondStateStats = {
     totalCollected: number;
-    totalMembers: number;
+    status: SessionStatus;
 };
 declare const bondTypeToSeed: {
     performance: Seeds;
@@ -1823,7 +1795,12 @@ declare class JBondClient {
     /**
      * Get all bond states with total collected collateral
      */
-    getAllBondStates(_bondType: BondType): Promise<Array<[BondState, number]>>;
+    getAllBondStates(bondType: BondType): Promise<Array<[BondState, BondStateStats]>>;
+    /**
+     * Get session status for bond state
+     */
+    private getBondStateSessionStatus;
+    /** Get all validator bonds for a given bond state */
     private getValidatorBondsByState;
     /**
      * Fetch validator bond data or null if not found

package/dist/index.js

@@ -4615,6 +4615,40 @@ var SessionStatus = /* @__PURE__ */ ((SessionStatus2) => {
 // src/utils/index.ts
 init_cjs_shims();
 
+// src/utils/enum-utils.ts
+init_cjs_shims();
+function getVariant(v) {
+  const key = Object.keys(v)[0];
+  return [key, v[key]];
+}
+function variantArgs(payload) {
+  if (Array.isArray(payload)) {
+    return payload;
+  }
+  if (payload && typeof payload === "object") {
+    const numericKeys = Object.keys(payload).filter((k) => String(+k) === k);
+    if (numericKeys.length) {
+      return numericKeys.sort((a, b) => +a - +b).map((k) => payload[k]);
+    }
+    return [payload];
+  }
+  return [payload];
+}
+function matchVariant(v, handlers) {
+  const [k, data] = getVariant(v);
+  const h = handlers[k];
+  if (!h) {
+    throw new Error(`Unhandled variant: ${k}`);
+  }
+  return h(...variantArgs(data));
+}
+function variantKey(v) {
+  return Object.keys(v)[0];
+}
+function sameVariant(a, b) {
+  return variantKey(a) === variantKey(b);
+}
+
 // src/utils/wallet.ts
 init_cjs_shims();
 function isVersionedTransaction(tx) {
@@ -6000,17 +6034,6 @@ var jbond_default = {
             ],
             type: "u64"
           },
-          {
-            name: "status",
-            docs: [
-              "Current status of the bond"
-            ],
-            type: {
-              defined: {
-                name: "BondStatus"
-              }
-            }
-          },
           {
             name: "session_start_ts",
             docs: [
@@ -6035,23 +6058,6 @@ var jbond_default = {
         ]
       }
     },
-    {
-      name: "BondStatus",
-      type: {
-        kind: "enum",
-        variants: [
-          {
-            name: "Active"
-          },
-          {
-            name: "Inactive"
-          },
-          {
-            name: "Pending"
-          }
-        ]
-      }
-    },
     {
       name: "BondType",
       docs: [
@@ -6413,13 +6419,8 @@ var JBondClient = class _JBondClient {
     return this;
   }
   getBondTypeSeed(bondType) {
-    if ("performance" in bondType) {
-      return "performance" /* PerformanceBond */;
-    }
-    if ("crowdfunding" in bondType) {
-      return "crowdfunding" /* CrowdFundingBond */;
-    }
-    throw new Error(`Unknown bond type: ${JSON.stringify(bondType)}`);
+    const [k] = getVariant(bondType);
+    return bondTypeToSeed[k];
   }
   /**
    * Program Derived Addresses (PDAs)
@@ -6574,13 +6575,16 @@ var JBondClient = class _JBondClient {
       reserveTokenAccount: null,
       mint: null
     };
-    if ("token" in props.collateralType) {
-      accounts.reserveTokenAccount = splToken.getAssociatedTokenAddressSync(
-        props.collateralType.token[0],
-        props.reserve
-      );
-      accounts.mint = props.collateralType.token[0];
-    }
+    matchVariant(props.collateralType, {
+      native: () => {
+      },
+      token: (mint) => {
+        accounts.reserveTokenAccount = splToken.getAssociatedTokenAddressSync(mint, props.reserve);
+        accounts.mint = mint;
+      },
+      stakeAccount: () => {
+      }
+    });
     return this.program.methods.bondInitialize({
       name: props.name,
       bondType: props.bondType,
@@ -6609,7 +6613,7 @@ var JBondClient = class _JBondClient {
       throw new Error("Missing creator");
     }
     const collateralType = (await this.getBondState(bondType, name)).collateralType;
-    const acct = {
+    const accounts = {
       bondState,
       validatorBond,
       identity,
@@ -6621,12 +6625,18 @@ var JBondClient = class _JBondClient {
       bondTokenAccount: null,
       mint: null
     };
-    if ("token" in collateralType) {
-      const mint = collateralType.token[0];
-      const bondTokenAccount = splToken.getAssociatedTokenAddressSync(mint, validatorBond, true);
-      Object.assign(acct, { mint, bondTokenAccount });
-    }
-    return this.program.methods.bondRegister(bondType, name).accountsPartial(acct).instruction();
+    matchVariant(collateralType, {
+      native: () => {
+      },
+      token: (mint) => {
+        accounts.bondTokenAccount = splToken.getAssociatedTokenAddressSync(mint, validatorBond, true);
+        Object.assign(accounts, { mint, bondTokenAccount: accounts.bondTokenAccount });
+      },
+      stakeAccount: () => {
+        throw new Error("Stake account collateral type is not currently supported");
+      }
+    });
+    return this.program.methods.bondRegister(bondType, name).accountsPartial(accounts).instruction();
   }
   async buildTopUpIXs(props) {
     const { bondType, voteAccount, collateral, name } = props;
@@ -6659,19 +6669,23 @@ var JBondClient = class _JBondClient {
       associatedTokenProgram: null,
       stakeProgram: null
     };
-    if ("token" in collateralType) {
-      const mint = collateralType.token[0];
-      accounts.payerTokenAccount = splToken.getAssociatedTokenAddressSync(mint, payer);
-      accounts.bondTokenAccount = splToken.getAssociatedTokenAddressSync(mint, validatorBond, true);
-      accounts.tokenProgram = splToken.TOKEN_PROGRAM_ID;
-      accounts.associatedTokenProgram = splToken.ASSOCIATED_TOKEN_PROGRAM_ID;
-    } else if ("stakeAccount" in collateralType) {
-      if (!collateral.stakeAccount) {
-        throw new Error("Missing stakeAccount for stake collateral");
-      }
-      accounts.stakeAccount = collateral.stakeAccount;
-      accounts.stakeProgram = web3_js.StakeProgram.programId;
-    }
+    matchVariant(collateralType, {
+      native: () => {
+      },
+      token: (mint) => {
+        accounts.payerTokenAccount = splToken.getAssociatedTokenAddressSync(mint, payer);
+        accounts.bondTokenAccount = splToken.getAssociatedTokenAddressSync(mint, validatorBond, true);
+        accounts.tokenProgram = splToken.TOKEN_PROGRAM_ID;
+        accounts.associatedTokenProgram = splToken.ASSOCIATED_TOKEN_PROGRAM_ID;
+      },
+      stakeAccount: () => {
+        if (!collateral.stakeAccount) {
+          throw new Error("Missing stakeAccount for stake collateral");
+        }
+        accounts.stakeAccount = collateral.stakeAccount;
+        accounts.stakeProgram = web3_js.StakeProgram.programId;
+      }
+    });
     instructions.push(
       await this.program.methods.bondTopUp(this.lamports(collateral.amount)).accountsPartial(accounts).instruction()
     );
@@ -6699,18 +6713,22 @@ var JBondClient = class _JBondClient {
       tokenProgram: null,
       stakeProgram: null
     };
-    if ("token" in collateralType) {
-      const mint = collateralType.token[0];
-      accounts.destinationTokenAccount = splToken.getAssociatedTokenAddressSync(mint, destination, true);
-      accounts.bondTokenAccount = splToken.getAssociatedTokenAddressSync(mint, validatorBond, true);
-      accounts.tokenProgram = splToken.TOKEN_PROGRAM_ID;
-    } else if ("stakeAccount" in collateralType) {
-      if (!withdraw.stakeAccount) {
-        throw new Error("Missing stakeAccount for stake collateral");
-      }
-      accounts.stakeAccount = withdraw.stakeAccount;
-      accounts.stakeProgram = web3_js.StakeProgram.programId;
-    }
+    matchVariant(collateralType, {
+      native: () => {
+      },
+      token: (mint) => {
+        accounts.destinationTokenAccount = splToken.getAssociatedTokenAddressSync(mint, destination, true);
+        accounts.bondTokenAccount = splToken.getAssociatedTokenAddressSync(mint, validatorBond, true);
+        accounts.tokenProgram = splToken.TOKEN_PROGRAM_ID;
+      },
+      stakeAccount: () => {
+        if (!withdraw.stakeAccount) {
+          throw new Error("Missing stakeAccount for stake collateral");
+        }
+        accounts.stakeAccount = withdraw.stakeAccount;
+        accounts.stakeProgram = web3_js.StakeProgram.programId;
+      }
+    });
     return this.program.methods.bondWithdraw(this.lamports(withdraw.amount)).accountsPartial(accounts).instruction();
   }
   async buildClaimIx(props) {
@@ -6735,19 +6753,23 @@ var JBondClient = class _JBondClient {
       tokenProgram: null,
       stakeProgram: null
     };
-    if ("token" in collateralType) {
-      const mint = collateralType.token[0];
-      accounts.destinationTokenAccount = splToken.getAssociatedTokenAddressSync(mint, reserve, true);
-      accounts.bondTokenAccount = splToken.getAssociatedTokenAddressSync(mint, validatorBond, true);
-      accounts.reserveTokenAccount = splToken.getAssociatedTokenAddressSync(mint, reserve, true);
-      accounts.tokenProgram = splToken.TOKEN_PROGRAM_ID;
-    } else if ("stakeAccount" in collateralType) {
-      if (!claim.stakeAccount) {
-        throw new Error("Missing stakeAccount for stake collateral");
-      }
-      accounts.stakeAccount = claim.stakeAccount;
-      accounts.stakeProgram = web3_js.StakeProgram.programId;
-    }
+    matchVariant(collateralType, {
+      native: () => {
+      },
+      token: (mint) => {
+        accounts.destinationTokenAccount = splToken.getAssociatedTokenAddressSync(mint, reserve, true);
+        accounts.bondTokenAccount = splToken.getAssociatedTokenAddressSync(mint, validatorBond, true);
+        accounts.reserveTokenAccount = splToken.getAssociatedTokenAddressSync(mint, reserve, true);
+        accounts.tokenProgram = splToken.TOKEN_PROGRAM_ID;
+      },
+      stakeAccount: () => {
+        if (!claim.stakeAccount) {
+          throw new Error("Missing stakeAccount for stake collateral");
+        }
+        accounts.stakeAccount = claim.stakeAccount;
+        accounts.stakeProgram = web3_js.StakeProgram.programId;
+      }
+    });
     return this.program.methods.bondClaim(this.lamports(props.claim.amount)).accountsPartial(
       accounts
     ).instruction();
@@ -6784,11 +6806,11 @@ var JBondClient = class _JBondClient {
   /**
    * Get all bond states with total collected collateral
    */
-  async getAllBondStates(_bondType) {
+  async getAllBondStates(bondType) {
     const bondStates = [];
     const bondStateAccounts = await this.program.account.bondState.all();
     for (const { account: state } of bondStateAccounts) {
-      if (!("crowdfunding" in state.bondType)) {
+      if (!sameVariant(state.bondType, bondType)) {
         continue;
       }
       const validatorBonds = await this.getValidatorBondsByState(state.bondType, state.name);
@@ -6797,11 +6819,26 @@ var JBondClient = class _JBondClient {
           (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]);
+      const bondStateStats = {
+        totalCollected: balances.reduce((sum, v) => sum + v, 0),
+        status: await this.getBondStateSessionStatus(state)
+      };
+      bondStates.push([state, bondStateStats]);
     }
     return bondStates;
   }
+  /**
+   * Get session status for bond state
+   */
+  async getBondStateSessionStatus(bondState) {
+    const now = Math.floor(Date.now() / 1e3);
+    if (bondState.sessionFinishTs.toNumber() > now) {
+      return 0 /* Live */;
+    } else {
+      return 1 /* Finished */;
+    }
+  }
+  /** Get all validator bonds for a given bond state */
   async getValidatorBondsByState(bondType, bondName) {
     const validatorBonds = [];
     const bondStatePda = this.pda.bondState(bondType, bondName)[0];
@@ -6850,20 +6887,35 @@ var JBondClient = class _JBondClient {
     const [address] = this.pda.validatorBond(bondType, bondName, new web3_js.PublicKey(vote));
     const bondStateData = await this.getBondState(bondType, bondName);
     const bondStateCollateralType = bondStateData.collateralType;
-    if ("token" in bondStateCollateralType) {
-      const mint = bondStateCollateralType.token[0];
-      const tokenAccount = splToken.getAssociatedTokenAddressSync(mint, address, true);
-      const balance = await this.connection.getTokenAccountBalance(tokenAccount);
-      return Number(balance.value.uiAmount ?? 0);
-    }
-    const accountInfo = await this.connection.getAccountInfo(address).catch(() => null);
-    if (!accountInfo) {
-      return 0;
-    }
-    const { data, lamports } = accountInfo;
-    const rentExempt = await this.connection.getMinimumBalanceForRentExemption(data.length);
-    const availableBalance = Math.max(0, lamports - rentExempt);
-    return availableBalance;
+    return await matchVariant(bondStateCollateralType, {
+      native: async () => {
+        const accountInfo = await this.connection.getAccountInfo(address).catch(() => null);
+        if (!accountInfo) {
+          return 0;
+        }
+        const { data, lamports } = accountInfo;
+        const rentExempt = await this.connection.getMinimumBalanceForRentExemption(data.length);
+        return Math.max(0, lamports - rentExempt);
+      },
+      token: async (mint) => {
+        const tokenAccount = splToken.getAssociatedTokenAddressSync(mint, address, true);
+        try {
+          const balance = await this.connection.getTokenAccountBalance(tokenAccount);
+          return Number(balance.value.uiAmount ?? 0);
+        } catch {
+          return 0;
+        }
+      },
+      stakeAccount: async () => {
+        const accountInfo = await this.connection.getAccountInfo(address).catch(() => null);
+        if (!accountInfo) {
+          return 0;
+        }
+        const { data, lamports } = accountInfo;
+        const rentExempt = await this.connection.getMinimumBalanceForRentExemption(data.length);
+        return Math.max(0, lamports - rentExempt);
+      }
+    });
   }
   /**
    * Load stake pool account and cache it if not already cached