@jpool/bond-sdk 0.9.0-next.16 → 0.9.0-next.18

package/dist/index.js

@@ -4600,6 +4600,10 @@ var BondTypeVariant = {
   Performance: { performance: {} },
   Crowdfunding: { crowdfunding: {} }
 };
+var BondStateStatusVariant = {
+  Active: { active: {} },
+  Disabled: { disabled: {} }
+};
 var BondTransactionType = /* @__PURE__ */ ((BondTransactionType2) => {
   BondTransactionType2["Deposit"] = "deposit";
   BondTransactionType2["Withdrawal"] = "withdrawal";
@@ -4994,68 +4998,6 @@ var jbond_default = {
         }
       ]
     },
-    {
-      name: "bond_disable",
-      docs: [
-        "Disables a validator's bond, preventing it from participating further."
-      ],
-      discriminator: [
-        159,
-        156,
-        97,
-        253,
-        70,
-        122,
-        117,
-        129
-      ],
-      accounts: [
-        {
-          name: "bond_state",
-          writable: true
-        },
-        {
-          name: "authority",
-          writable: true,
-          signer: true,
-          relations: [
-            "bond_state"
-          ]
-        }
-      ],
-      args: []
-    },
-    {
-      name: "bond_enable",
-      docs: [
-        "Enables a previously disabled validator's bond."
-      ],
-      discriminator: [
-        133,
-        48,
-        84,
-        9,
-        117,
-        131,
-        164,
-        128
-      ],
-      accounts: [
-        {
-          name: "bond_state",
-          writable: true
-        },
-        {
-          name: "authority",
-          writable: true,
-          signer: true,
-          relations: [
-            "bond_state"
-          ]
-        }
-      ],
-      args: []
-    },
     {
       name: "bond_initialize",
       docs: [
@@ -5078,8 +5020,7 @@ var jbond_default = {
       ],
       accounts: [
         {
-          name: "global_state",
-          writable: true
+          name: "global_state"
         },
         {
           name: "bond_state",
@@ -5115,7 +5056,10 @@ var jbond_default = {
         {
           name: "authority",
           writable: true,
-          signer: true
+          signer: true,
+          relations: [
+            "global_state"
+          ]
         },
         {
           name: "reserve"
@@ -5981,6 +5925,16 @@ var jbond_default = {
       type: {
         kind: "struct",
         fields: [
+          {
+            name: "status",
+            type: {
+              option: {
+                defined: {
+                  name: "BondStatus"
+                }
+              }
+            }
+          },
           {
             name: "new_reserve",
             type: {
@@ -6153,6 +6107,9 @@ var jbond_default = {
           },
           {
             name: "status",
+            docs: [
+              "Current status of the bond"
+            ],
             type: {
               defined: {
                 name: "BondStatus"
@@ -6638,14 +6595,6 @@ var JBondClient = class _JBondClient {
     const ix = await this.buildBondFinishIx(props);
     return this.provider.sendAndConfirm?.(new web3_js.Transaction().add(ix));
   }
-  async bondEnable(props) {
-    const ix = await this.buildBondEnableIx(props);
-    return this.provider.sendAndConfirm?.(new web3_js.Transaction().add(ix));
-  }
-  async bondDisable(props) {
-    const ix = await this.buildBondDisableIx(props);
-    return this.provider.sendAndConfirm?.(new web3_js.Transaction().add(ix));
-  }
   async buildBondGlobalStateInitializeIx(props) {
     const [globalState] = this.pda.globalState();
     const authority = props.authority ?? this.provider.wallet?.publicKey;
@@ -6703,6 +6652,7 @@ var JBondClient = class _JBondClient {
   async buildConfigureIx(props) {
     const [bondState] = this.pda.bondState(props.bondType, props.name);
     return this.program.methods.bondConfigure({
+      status: props.bondStateStatus ?? null,
       newReserve: props.newReserve ?? null,
       newAuthority: props.newAuthority ?? null
     }).accountsStrict({
@@ -6718,7 +6668,7 @@ var JBondClient = class _JBondClient {
     if (!creator) {
       throw new Error("Missing creator");
     }
-    const collateralType = (await this.getBondState(bondType, name))[0].collateralType;
+    const collateralType = (await this.getBondState(bondType, name)).bond_state.collateralType;
     const accounts = {
       bondState,
       validatorBond,
@@ -6761,7 +6711,7 @@ var JBondClient = class _JBondClient {
         creator: props.payer
       }));
     }
-    const collateralType = (await this.getBondState(bondType, name))[0].collateralType;
+    const collateralType = (await this.getBondState(bondType, name)).bond_state.collateralType;
     const accounts = {
       bondState,
       validatorBond,
@@ -6798,7 +6748,7 @@ var JBondClient = class _JBondClient {
     if (!payer || !destination) {
       throw new Error("Missing payer/destination");
     }
-    const collateralType = (await this.getBondState(bondType, name))[0].collateralType;
+    const collateralType = (await this.getBondState(bondType, name)).bond_state.collateralType;
     const accounts = {
       bondState,
       validatorBond,
@@ -6826,12 +6776,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))[0].reserve;
+    const reserve = props.reserve ?? (await this.getBondState(bondType, name)).bond_state.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))[0].collateralType;
+    const collateralType = (await this.getBondState(bondType, name)).bond_state.collateralType;
     const accounts = {
       bondState,
       validatorBond,
@@ -6880,20 +6830,6 @@ var JBondClient = class _JBondClient {
       authority: this.program.provider.wallet?.publicKey
     }).instruction();
   }
-  async buildBondEnableIx(props) {
-    const [bondState] = this.pda.bondState(props.bondType, props.name);
-    return this.program.methods.bondEnable().accountsPartial({
-      bondState,
-      authority: this.program.provider.wallet?.publicKey
-    }).instruction();
-  }
-  async buildBondDisableIx(props) {
-    const [bondState] = this.pda.bondState(props.bondType, props.name);
-    return this.program.methods.bondDisable().accountsPartial({
-      bondState,
-      authority: this.program.provider.wallet?.publicKey
-    }).instruction();
-  }
   /**
    * Fetch global state or throw if not found
    */
@@ -6905,10 +6841,14 @@ var JBondClient = class _JBondClient {
    * Fetch bond state with stats
    * @param bondType - Type of the bond
    * @param bondName - Name of the bond
+   * @param withStats
    */
   async getBondState(bondType, bondName, withStats = false) {
     const bondState = await this.program.account.bondState.fetch(this.pda.bondState(bondType, bondName)[0]);
-    return [bondState, withStats ? await this.getBondStateStats(bondState) : null];
+    return {
+      bond_state: bondState,
+      state_stats: withStats ? await this.getBondStateStats(bondState) : null
+    };
   }
   /**
    * Get all bond states with total collected collateral
@@ -6924,7 +6864,12 @@ var JBondClient = class _JBondClient {
         continue;
       }
       const bondStateStats = await this.getBondStateStats(state);
-      bondStates.push([state, bondStateStats]);
+      bondStates.push(
+        {
+          bond_state: state,
+          state_stats: bondStateStats
+        }
+      );
     }
     return bondStates;
   }
@@ -6939,7 +6884,9 @@ var JBondClient = class _JBondClient {
       return 1 /* Finished */;
     }
   }
-  /** Get all validator bonds for a given bond state */
+  /**
+   * Get all validator bonds for a given bond state
+   */
   async getValidatorBondsByState(bondType, bondName) {
     const validatorBonds = [];
     const bondStatePda = this.pda.bondState(bondType, bondName)[0];
@@ -6958,9 +6905,6 @@ var JBondClient = class _JBondClient {
   }
   /**
    * Fetch validator bond data or null if not found
-   * @param bondType
-   * @param bondName
-   * @param vote
    */
   async getValidatorBond(bondType, bondName, vote) {
     const [address] = this.pda.validatorBond(bondType, bondName, new web3_js.PublicKey(vote));
@@ -6975,7 +6919,7 @@ var JBondClient = class _JBondClient {
    */
   async getBondCollateralType(bondType, bondName) {
     const bondState = await this.getBondState(bondType, bondName);
-    return bondState[0].collateralType;
+    return bondState.bond_state.collateralType;
   }
   /**
    * Get validator bond account balance (in SOL)
@@ -6987,7 +6931,7 @@ var JBondClient = class _JBondClient {
   async getValidatorBondBalance(bondType, bondName, vote) {
     const [address] = this.pda.validatorBond(bondType, bondName, new web3_js.PublicKey(vote));
     const bondStateData = await this.getBondState(bondType, bondName);
-    const bondStateCollateralType = bondStateData[0].collateralType;
+    const bondStateCollateralType = bondStateData.bond_state.collateralType;
     return await matchVariant(bondStateCollateralType, {
       native: async () => {
         const accountInfo = await this.connection.getAccountInfo(address).catch(() => null);
@@ -7009,10 +6953,12 @@ var JBondClient = class _JBondClient {
       }
     });
   }
-  // Get total collected collateral for a bond state
+  /**
+   * Get total collected collateral for a bond state
+   */
   async getBondStateTotalCollected(bondType, bondName, votes) {
     const bondStateData = await this.getBondState(bondType, bondName);
-    const bondStateCollateralType = bondStateData[0].collateralType;
+    const bondStateCollateralType = bondStateData.bond_state.collateralType;
     const chunk = (arr, n = 100) => {
       const res = [];
       for (let i = 0; i < arr.length; i += n) {
@@ -7070,6 +7016,11 @@ var JBondClient = class _JBondClient {
       }
     });
   }
+  /**
+   * Get bond state stats
+   * @param state
+   * @private
+   */
   async getBondStateStats(state) {
     const validatorBonds = await this.getValidatorBondsByState(state.bondType, state.name);
     const totalCollected = await this.getBondStateTotalCollected(
@@ -7077,11 +7028,10 @@ var JBondClient = class _JBondClient {
       state.name,
       validatorBonds.map((vb) => vb.voteAccount)
     );
-    const bondStateStats = {
+    return {
       totalCollected,
-      status: await this.getBondStateSessionStatus(state)
+      status: this.getBondStateSessionStatus(state)
     };
-    return bondStateStats;
   }
   /**
    * Load stake pool account and cache it if not already cached
@@ -7129,6 +7079,7 @@ buffer/index.js:
 */
 
 exports.BondClientEnv = BondClientEnv;
+exports.BondStateStatusVariant = BondStateStatusVariant;
 exports.BondTransactionType = BondTransactionType;
 exports.BondTypeVariant = BondTypeVariant;
 exports.ENV_PROGRAM_ID = ENV_PROGRAM_ID;