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

package/dist/index.mjs

@@ -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,9 +6865,14 @@ 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
@@ -6934,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)
@@ -6946,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);
@@ -6961,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;
         }
@@ -6971,7 +6976,7 @@ 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) {
@@ -6997,7 +7002,6 @@ var JBondClient = class _JBondClient {
         );
         return balances.reduce((sum, v) => sum + v, 0);
       },
-      // TODO
       token: async (mint) => {
         const tokenAccounts = votes.map((vote) => {
           const [validatorBondAddress] = this.pda.validatorBond(bondType, bondName, new PublicKey(vote));