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

package/dist/index.d.mts

@@ -264,8 +264,8 @@ type Jbond = {
             "name": "bondLockFunds";
             "docs": [
                 "Locks funds for both the current and upcoming epoch.",
-                "Moves collateral from available to locked state, making it unavailable for withdrawal for the current and next epoch.",
-                "# Errors",
+                "Moves collateral from available to locked state, making it unavailable for withdrawal for",
+                "the current and next epoch. # Errors",
                 "Fails if the validator is not active, or if there are insufficient available funds."
             ];
             "discriminator": [
@@ -520,6 +520,37 @@ type Jbond = {
                 }
             ];
         },
+        {
+            "name": "bondRemove";
+            "docs": [
+                "Removes bond state"
+            ];
+            "discriminator": [
+                121,
+                112,
+                246,
+                177,
+                181,
+                8,
+                18,
+                220
+            ];
+            "accounts": [
+                {
+                    "name": "bondState";
+                    "writable": true;
+                },
+                {
+                    "name": "authority";
+                    "writable": true;
+                    "signer": true;
+                    "relations": [
+                        "bondState"
+                    ];
+                }
+            ];
+            "args": [];
+        },
         {
             "name": "bondSetWithdrawAuthority";
             "docs": [
@@ -706,7 +737,7 @@ type Jbond = {
                 "",
                 "This function should be called at epoch boundaries to update the bond's",
                 "`last_update_epoch` and move the `next_epoch_locked` amount into",
-                "`current_epoch_locked`. It ensures that the update only occurs once per epoch.",
+                "`locked`. It ensures that the update only occurs once per epoch.",
                 "",
                 "# Errors",
                 "Returns [`BondError::InvalidEpoch`] if called more than once in the same epoch,",
@@ -1734,16 +1765,16 @@ type Jbond = {
                         "type": "u8";
                     },
                     {
-                        "name": "nextEpochLocked";
+                        "name": "locked";
                         "docs": [
-                            "Amount of collateral locked for the next epoch"
+                            "Amount of collateral currently locked"
                         ];
                         "type": "u64";
                     },
                     {
-                        "name": "currentEpochLocked";
+                        "name": "nextEpochLocked";
                         "docs": [
-                            "Amount of collateral locked for the current epoch"
+                            "Amount of collateral locked for the next epoch"
                         ];
                         "type": "u64";
                     },
@@ -1933,6 +1964,11 @@ type BondFinishProps = {
     bondType: BondType;
     name: string;
 };
+type BondRemoveProps = {
+    bondType: BondType;
+    name: string;
+    authority?: PublicKey;
+};
 
 type GetHistoryOpts = {
     cluster?: Cluster;
@@ -2074,6 +2110,7 @@ declare class JBondClient {
      * Finish crowdfunding bond session
      */
     bondFinish(props: BondFinishProps): Promise<string | undefined>;
+    bondRemove(props: BondRemoveProps): Promise<string | undefined>;
     /**
      * Build global state initialize instruction
      */
@@ -2142,6 +2179,10 @@ declare class JBondClient {
         voteAccount: PublicKeyInitData;
         payer: PublicKey;
     }): Promise<TransactionInstruction>;
+    /**
+     *  Build bond remove instruction
+     */
+    getBondRemoveIx(props: BondRemoveProps): Promise<TransactionInstruction>;
     /**
      * Build test set last update epoch instruction
      * NOTE!: This instruction is for testing purposes only.
@@ -2294,8 +2335,8 @@ declare class JBondClient {
         withdrawalAuthority: PublicKey | null;
         createdAt: bn_js;
         bump: number;
+        locked: bn_js;
         nextEpochLocked: bn_js;
-        currentEpochLocked: bn_js;
         lastUpdateEpoch: bn_js;
         publicKey: PublicKey;
     }>;
@@ -2341,4 +2382,4 @@ declare const CROWDFUNDING_BOND_SEED = "crowdfunding";
  */
 declare const ENV_PROGRAM_ID: Record<string, PublicKey>;
 
-export { BOND_STATE_SEED, type BondConfigureProps, type BondFinishProps, type BondInitializeProps, type BondLockFunds, type BondReleaseFunds, type BondStartProps, type BondState, type BondStateStats, type BondStateStatus, BondTransactionType, BondType, CROWDFUNDING_BOND_SEED, type ClaimAllProps, type ClaimProps, type CollateralType, ENV_PROGRAM_ID, type EpochHistoryItem, GLOBAL_STATE_SEED, type GetHistoryGroupedProps, type GetHistoryProps, type GlobalConfigureProps, type GlobalInitializeProps, type GlobalState, JBondClient, JBondClientEnv, type JBondClientOptions, type Jbond, NodeWallet, type RegisterValidatorProps, STANDARD_BOND_SEED, SessionStatus, type SetWithdrawAuthorityProps, type TopUpCollateralProps, type TransactionHistoryItem, VALIDATOR_BOND_SEED, type ValidatorBond, type WithdrawCollateralProps };
+export { BOND_STATE_SEED, type BondConfigureProps, type BondFinishProps, type BondInitializeProps, type BondLockFunds, type BondReleaseFunds, type BondRemoveProps, type BondStartProps, type BondState, type BondStateStats, type BondStateStatus, BondTransactionType, BondType, CROWDFUNDING_BOND_SEED, type ClaimAllProps, type ClaimProps, type CollateralType, ENV_PROGRAM_ID, type EpochHistoryItem, GLOBAL_STATE_SEED, type GetHistoryGroupedProps, type GetHistoryProps, type GlobalConfigureProps, type GlobalInitializeProps, type GlobalState, JBondClient, JBondClientEnv, type JBondClientOptions, type Jbond, NodeWallet, type RegisterValidatorProps, STANDARD_BOND_SEED, SessionStatus, type SetWithdrawAuthorityProps, type TopUpCollateralProps, type TransactionHistoryItem, VALIDATOR_BOND_SEED, type ValidatorBond, type WithdrawCollateralProps };

package/dist/index.d.ts

@@ -264,8 +264,8 @@ type Jbond = {
             "name": "bondLockFunds";
             "docs": [
                 "Locks funds for both the current and upcoming epoch.",
-                "Moves collateral from available to locked state, making it unavailable for withdrawal for the current and next epoch.",
-                "# Errors",
+                "Moves collateral from available to locked state, making it unavailable for withdrawal for",
+                "the current and next epoch. # Errors",
                 "Fails if the validator is not active, or if there are insufficient available funds."
             ];
             "discriminator": [
@@ -520,6 +520,37 @@ type Jbond = {
                 }
             ];
         },
+        {
+            "name": "bondRemove";
+            "docs": [
+                "Removes bond state"
+            ];
+            "discriminator": [
+                121,
+                112,
+                246,
+                177,
+                181,
+                8,
+                18,
+                220
+            ];
+            "accounts": [
+                {
+                    "name": "bondState";
+                    "writable": true;
+                },
+                {
+                    "name": "authority";
+                    "writable": true;
+                    "signer": true;
+                    "relations": [
+                        "bondState"
+                    ];
+                }
+            ];
+            "args": [];
+        },
         {
             "name": "bondSetWithdrawAuthority";
             "docs": [
@@ -706,7 +737,7 @@ type Jbond = {
                 "",
                 "This function should be called at epoch boundaries to update the bond's",
                 "`last_update_epoch` and move the `next_epoch_locked` amount into",
-                "`current_epoch_locked`. It ensures that the update only occurs once per epoch.",
+                "`locked`. It ensures that the update only occurs once per epoch.",
                 "",
                 "# Errors",
                 "Returns [`BondError::InvalidEpoch`] if called more than once in the same epoch,",
@@ -1734,16 +1765,16 @@ type Jbond = {
                         "type": "u8";
                     },
                     {
-                        "name": "nextEpochLocked";
+                        "name": "locked";
                         "docs": [
-                            "Amount of collateral locked for the next epoch"
+                            "Amount of collateral currently locked"
                         ];
                         "type": "u64";
                     },
                     {
-                        "name": "currentEpochLocked";
+                        "name": "nextEpochLocked";
                         "docs": [
-                            "Amount of collateral locked for the current epoch"
+                            "Amount of collateral locked for the next epoch"
                         ];
                         "type": "u64";
                     },
@@ -1933,6 +1964,11 @@ type BondFinishProps = {
     bondType: BondType;
     name: string;
 };
+type BondRemoveProps = {
+    bondType: BondType;
+    name: string;
+    authority?: PublicKey;
+};
 
 type GetHistoryOpts = {
     cluster?: Cluster;
@@ -2074,6 +2110,7 @@ declare class JBondClient {
      * Finish crowdfunding bond session
      */
     bondFinish(props: BondFinishProps): Promise<string | undefined>;
+    bondRemove(props: BondRemoveProps): Promise<string | undefined>;
     /**
      * Build global state initialize instruction
      */
@@ -2142,6 +2179,10 @@ declare class JBondClient {
         voteAccount: PublicKeyInitData;
         payer: PublicKey;
     }): Promise<TransactionInstruction>;
+    /**
+     *  Build bond remove instruction
+     */
+    getBondRemoveIx(props: BondRemoveProps): Promise<TransactionInstruction>;
     /**
      * Build test set last update epoch instruction
      * NOTE!: This instruction is for testing purposes only.
@@ -2294,8 +2335,8 @@ declare class JBondClient {
         withdrawalAuthority: PublicKey | null;
         createdAt: bn_js;
         bump: number;
+        locked: bn_js;
         nextEpochLocked: bn_js;
-        currentEpochLocked: bn_js;
         lastUpdateEpoch: bn_js;
         publicKey: PublicKey;
     }>;
@@ -2341,4 +2382,4 @@ declare const CROWDFUNDING_BOND_SEED = "crowdfunding";
  */
 declare const ENV_PROGRAM_ID: Record<string, PublicKey>;
 
-export { BOND_STATE_SEED, type BondConfigureProps, type BondFinishProps, type BondInitializeProps, type BondLockFunds, type BondReleaseFunds, type BondStartProps, type BondState, type BondStateStats, type BondStateStatus, BondTransactionType, BondType, CROWDFUNDING_BOND_SEED, type ClaimAllProps, type ClaimProps, type CollateralType, ENV_PROGRAM_ID, type EpochHistoryItem, GLOBAL_STATE_SEED, type GetHistoryGroupedProps, type GetHistoryProps, type GlobalConfigureProps, type GlobalInitializeProps, type GlobalState, JBondClient, JBondClientEnv, type JBondClientOptions, type Jbond, NodeWallet, type RegisterValidatorProps, STANDARD_BOND_SEED, SessionStatus, type SetWithdrawAuthorityProps, type TopUpCollateralProps, type TransactionHistoryItem, VALIDATOR_BOND_SEED, type ValidatorBond, type WithdrawCollateralProps };
+export { BOND_STATE_SEED, type BondConfigureProps, type BondFinishProps, type BondInitializeProps, type BondLockFunds, type BondReleaseFunds, type BondRemoveProps, type BondStartProps, type BondState, type BondStateStats, type BondStateStatus, BondTransactionType, BondType, CROWDFUNDING_BOND_SEED, type ClaimAllProps, type ClaimProps, type CollateralType, ENV_PROGRAM_ID, type EpochHistoryItem, GLOBAL_STATE_SEED, type GetHistoryGroupedProps, type GetHistoryProps, type GlobalConfigureProps, type GlobalInitializeProps, type GlobalState, JBondClient, JBondClientEnv, type JBondClientOptions, type Jbond, NodeWallet, type RegisterValidatorProps, STANDARD_BOND_SEED, SessionStatus, type SetWithdrawAuthorityProps, type TopUpCollateralProps, type TransactionHistoryItem, VALIDATOR_BOND_SEED, type ValidatorBond, type WithdrawCollateralProps };

package/dist/index.js

@@ -4574,7 +4574,7 @@ var VALIDATOR_BOND_SEED = "validator_bond";
 var STANDARD_BOND_SEED = "standard";
 var CROWDFUNDING_BOND_SEED = "crowdfunding";
 var ENV_PROGRAM_ID = {
-  // [BondClientEnv.DEV]: new PublicKey('...'),
+  //   [JBondClientEnv.DEV]: new PublicKey('...'),
 };
 
 // src/history.ts
@@ -5012,8 +5012,8 @@ var jbond_default = {
       name: "bond_lock_funds",
       docs: [
         "Locks funds for both the current and upcoming epoch.",
-        "Moves collateral from available to locked state, making it unavailable for withdrawal for the current and next epoch.",
-        "# Errors",
+        "Moves collateral from available to locked state, making it unavailable for withdrawal for",
+        "the current and next epoch. # Errors",
         "Fails if the validator is not active, or if there are insufficient available funds."
       ],
       discriminator: [
@@ -5268,6 +5268,37 @@ var jbond_default = {
         }
       ]
     },
+    {
+      name: "bond_remove",
+      docs: [
+        "Removes bond state"
+      ],
+      discriminator: [
+        121,
+        112,
+        246,
+        177,
+        181,
+        8,
+        18,
+        220
+      ],
+      accounts: [
+        {
+          name: "bond_state",
+          writable: true
+        },
+        {
+          name: "authority",
+          writable: true,
+          signer: true,
+          relations: [
+            "bond_state"
+          ]
+        }
+      ],
+      args: []
+    },
     {
       name: "bond_set_withdraw_authority",
       docs: [
@@ -5454,7 +5485,7 @@ var jbond_default = {
         "",
         "This function should be called at epoch boundaries to update the bond's",
         "`last_update_epoch` and move the `next_epoch_locked` amount into",
-        "`current_epoch_locked`. It ensures that the update only occurs once per epoch.",
+        "`locked`. It ensures that the update only occurs once per epoch.",
         "",
         "# Errors",
         "Returns [`BondError::InvalidEpoch`] if called more than once in the same epoch,",
@@ -6482,16 +6513,16 @@ var jbond_default = {
             type: "u8"
           },
           {
-            name: "next_epoch_locked",
+            name: "locked",
             docs: [
-              "Amount of collateral locked for the next epoch"
+              "Amount of collateral currently locked"
             ],
             type: "u64"
           },
           {
-            name: "current_epoch_locked",
+            name: "next_epoch_locked",
             docs: [
-              "Amount of collateral locked for the current epoch"
+              "Amount of collateral locked for the next epoch"
             ],
             type: "u64"
           },
@@ -6831,6 +6862,10 @@ var JBondClient = class _JBondClient {
     const ix = await this.getBondSessionFinishIx(props);
     return this.provider.sendAndConfirm?.(new web3_js.Transaction().add(ix));
   }
+  async bondRemove(props) {
+    const ix = await this.getBondRemoveIx(props);
+    return this.provider.sendAndConfirm?.(new web3_js.Transaction().add(ix));
+  }
   /**
    * Build global state initialize instruction
    */
@@ -7132,6 +7167,15 @@ var JBondClient = class _JBondClient {
     const [validatorBond, _] = this.pda.validatorBond(bondType, bondName, voteAccount);
     return this.program.methods.bondUpdate().accountsPartial({ validatorBond, payer }).instruction();
   }
+  /**
+   *  Build bond remove instruction
+   */
+  async getBondRemoveIx(props) {
+    const { bondType, name } = props;
+    const [bondState] = this.pda.bondState(bondType, name);
+    const authority = props.authority ?? this.provider.wallet?.publicKey;
+    return this.program.methods.bondRemove().accountsPartial({ bondState, authority }).instruction();
+  }
   /**
    * Build test set last update epoch instruction
    * NOTE!: This instruction is for testing purposes only.
@@ -7190,7 +7234,7 @@ var JBondClient = class _JBondClient {
    */
   async getAvailableCollateral(bondType, bondName, voteAccount) {
     const validatorBond = await this.getValidatorBond(bondType, bondName, voteAccount);
-    return await this.getValidatorBondBalance(bondType, bondName, voteAccount) - validatorBond.currentEpochLocked.toNumber();
+    return await this.getValidatorBondBalance(bondType, bondName, voteAccount) - validatorBond.locked.toNumber();
   }
   /**
    * Get all bond states with total collected collateral