@jpool/bond-sdk 0.11.0-next.9 → 0.11.1

package/dist/index.js

@@ -33,9 +33,9 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// ../../node_modules/.pnpm/tsup@8.5.0_@swc+core@1.13.5_@swc+helpers@0.5.17__jiti@2.5.1_postcss@8.5.6_tsx@4.20.5_typescript@5.9.3_yaml@2.8.1/node_modules/tsup/assets/cjs_shims.js
+// ../../node_modules/.pnpm/tsup@8.5.0_@swc+core@1.13.5_@swc+helpers@0.5.17__jiti@2.5.1_postcss@8.5.8_tsx@4.20.5_typescript@5.9.3_yaml@2.8.1/node_modules/tsup/assets/cjs_shims.js
 var init_cjs_shims = __esm({
-  "../../node_modules/.pnpm/tsup@8.5.0_@swc+core@1.13.5_@swc+helpers@0.5.17__jiti@2.5.1_postcss@8.5.6_tsx@4.20.5_typescript@5.9.3_yaml@2.8.1/node_modules/tsup/assets/cjs_shims.js"() {
+  "../../node_modules/.pnpm/tsup@8.5.0_@swc+core@1.13.5_@swc+helpers@0.5.17__jiti@2.5.1_postcss@8.5.8_tsx@4.20.5_typescript@5.9.3_yaml@2.8.1/node_modules/tsup/assets/cjs_shims.js"() {
   }
 });
 
@@ -4568,20 +4568,15 @@ var import_bn = __toESM(require_bn());
 
 // src/constants.ts
 init_cjs_shims();
-var GLOBAL_STATE_SEED = "global_state";
-var BOND_STATE_SEED = "bond_state";
-var VALIDATOR_BOND_SEED = "validator_bond";
-var STANDARD_BOND_SEED = "standard";
-var CROWDFUNDING_BOND_SEED = "crowdfunding";
-var ENV_PROGRAM_ID = {
-  // [BondClientEnv.DEV]: new PublicKey('...'),
-};
-
-// src/history.ts
-init_cjs_shims();
 
 // src/types/index.ts
 init_cjs_shims();
+var JBondClientEnv = /* @__PURE__ */ ((JBondClientEnv2) => {
+  JBondClientEnv2["DEV"] = "dev";
+  JBondClientEnv2["STAGE"] = "stage";
+  JBondClientEnv2["PROD"] = "prod";
+  return JBondClientEnv2;
+})(JBondClientEnv || {});
 var SessionStatus = /* @__PURE__ */ ((SessionStatus2) => {
   SessionStatus2[SessionStatus2["Live"] = 0] = "Live";
   SessionStatus2[SessionStatus2["Finished"] = 1] = "Finished";
@@ -4599,7 +4594,20 @@ var BondTransactionType = /* @__PURE__ */ ((BondTransactionType2) => {
   return BondTransactionType2;
 })(BondTransactionType || {});
 
+// src/constants.ts
+var GLOBAL_STATE_SEED = "global_state";
+var BOND_STATE_SEED = "bond_state";
+var VALIDATOR_BOND_SEED = "validator_bond";
+var STANDARD_BOND_SEED = "standard";
+var CROWDFUNDING_BOND_SEED = "crowdfunding";
+var ENV_PROGRAM_ID = {
+  ["dev" /* DEV */]: "Fo17edWRJewZNTRibgx9iTfjywCW6dzS81VwBLmPFVq1",
+  ["stage" /* STAGE */]: "Fo17edWRJewZNTRibgx9iTfjywCW6dzS81VwBLmPFVq1",
+  ["prod" /* PROD */]: "BondQ7KqZreTcW2UbeTNDcLCJQ3aXAtLn2Fm6ftaJDU"
+};
+
 // src/history.ts
+init_cjs_shims();
 var { bs58 } = anchor.utils.bytes;
 var HistoryManager = class {
   constructor(client) {
@@ -4759,10 +4767,10 @@ function slotToEpoch(slot, cluster) {
 
 // src/idl/jbond.json
 var jbond_default = {
-  address: "Fo17edWRJewZNTRibgx9iTfjywCW6dzS81VwBLmPFVq1",
+  address: "BondQ7KqZreTcW2UbeTNDcLCJQ3aXAtLn2Fm6ftaJDU",
   metadata: {
     name: "jbond",
-    version: "0.2.1",
+    version: "0.2.5",
     spec: "0.1.0",
     description: "Jpool Bond Program"
   },
@@ -4837,7 +4845,10 @@ var jbond_default = {
         },
         {
           name: "authority",
-          signer: true
+          signer: true,
+          relations: [
+            "bond_state"
+          ]
         },
         {
           name: "bond_token_account",
@@ -5011,10 +5022,12 @@ 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.",
+        "Locks funds immediately, making them unavailable for withdrawal.",
+        "The locked amount takes effect immediately in the current epoch.",
+        "",
         "# Errors",
-        "Fails if the validator is not active, or if there are insufficient available funds."
+        "Fails if the bond type is not lockable, if the amount is zero,",
+        "or if there are insufficient available funds."
       ],
       discriminator: [
         117,
@@ -5033,7 +5046,39 @@ var jbond_default = {
         },
         {
           name: "validator_bond",
-          writable: true
+          writable: true,
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  118,
+                  97,
+                  108,
+                  105,
+                  100,
+                  97,
+                  116,
+                  111,
+                  114,
+                  95,
+                  98,
+                  111,
+                  110,
+                  100
+                ]
+              },
+              {
+                kind: "account",
+                path: "bond_state"
+              },
+              {
+                kind: "account",
+                path: "validator_bond.vote_account",
+                account: "ValidatorBond"
+              }
+            ]
+          }
         },
         {
           name: "bond_token_account",
@@ -5079,7 +5124,34 @@ var jbond_default = {
       accounts: [
         {
           name: "bond_state",
-          writable: true
+          writable: true,
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  98,
+                  111,
+                  110,
+                  100,
+                  95,
+                  115,
+                  116,
+                  97,
+                  116,
+                  101
+                ]
+              },
+              {
+                kind: "arg",
+                path: "bond_type"
+              },
+              {
+                kind: "arg",
+                path: "bond_name"
+              }
+            ]
+          }
         },
         {
           name: "validator_bond",
@@ -5167,10 +5239,13 @@ var jbond_default = {
     {
       name: "bond_release_funds",
       docs: [
-        "Releases locked funds after an epoch ends.",
-        "Moves collateral from locked back to available state, allowing withdrawals.",
+        "Queues funds for unlock in the next epoch.",
+        "The unlock is delayed by one epoch for security - funds remain locked",
+        "in the current epoch but will be available after epoch transition.",
+        "",
         "# Errors",
-        "Fails if the validator is not active, or if there are insufficient locked funds."
+        "Fails if the bond type is not lockable, if the amount is zero,",
+        "or if the amount exceeds currently locked funds."
       ],
       discriminator: [
         184,
@@ -5184,9 +5259,45 @@ var jbond_default = {
       ],
       accounts: [
         {
-          name: "validator_bond",
+          name: "bond_state",
           writable: true
         },
+        {
+          name: "validator_bond",
+          writable: true,
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  118,
+                  97,
+                  108,
+                  105,
+                  100,
+                  97,
+                  116,
+                  111,
+                  114,
+                  95,
+                  98,
+                  111,
+                  110,
+                  100
+                ]
+              },
+              {
+                kind: "account",
+                path: "bond_state"
+              },
+              {
+                kind: "account",
+                path: "validator_bond.vote_account",
+                account: "ValidatorBond"
+              }
+            ]
+          }
+        },
         {
           name: "payer",
           writable: true,
@@ -5200,6 +5311,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: [
@@ -5382,15 +5524,12 @@ var jbond_default = {
     {
       name: "bond_update",
       docs: [
-        "Transitions locked funds between epochs for a validator bond.",
-        "",
-        "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.",
+        "Applies any pending unlocks from previous epochs.",
         "",
-        "# Errors",
-        "Returns [`BondError::InvalidEpoch`] if called more than once in the same epoch,",
-        "or if the system clock cannot be accessed."
+        "This instruction is optional - all other operations now automatically",
+        "sync the epoch state. It is kept for backwards compatibility and can",
+        "be used to explicitly trigger epoch synchronization without performing",
+        "another operation."
       ],
       discriminator: [
         237,
@@ -5409,7 +5548,6 @@ var jbond_default = {
         },
         {
           name: "payer",
-          writable: true,
           signer: true
         }
       ],
@@ -5632,80 +5770,6 @@ var jbond_default = {
       ],
       args: []
     },
-    {
-      name: "migrate_bond",
-      docs: [
-        "Migrates validator bond data from legacy structure to new structure."
-      ],
-      discriminator: [
-        107,
-        119,
-        59,
-        110,
-        76,
-        18,
-        37,
-        163
-      ],
-      accounts: [
-        {
-          name: "bond_state",
-          writable: true
-        },
-        {
-          name: "legacy_validator_bond",
-          writable: true
-        },
-        {
-          name: "legacy_vote_account"
-        },
-        {
-          name: "validator_bond",
-          writable: true,
-          pda: {
-            seeds: [
-              {
-                kind: "const",
-                value: [
-                  118,
-                  97,
-                  108,
-                  105,
-                  100,
-                  97,
-                  116,
-                  111,
-                  114,
-                  95,
-                  98,
-                  111,
-                  110,
-                  100
-                ]
-              },
-              {
-                kind: "account",
-                path: "bond_state"
-              },
-              {
-                kind: "account",
-                path: "legacy_vote_account"
-              }
-            ]
-          }
-        },
-        {
-          name: "creator",
-          writable: true,
-          signer: true
-        },
-        {
-          name: "system_program",
-          address: "11111111111111111111111111111111"
-        }
-      ],
-      args: []
-    },
     {
       name: "session_finish",
       docs: [
@@ -5816,6 +5880,19 @@ var jbond_default = {
     }
   ],
   events: [
+    {
+      name: "BondConfigured",
+      discriminator: [
+        141,
+        252,
+        43,
+        54,
+        45,
+        157,
+        81,
+        14
+      ]
+    },
     {
       name: "BondFinished",
       discriminator: [
@@ -5829,6 +5906,32 @@ var jbond_default = {
         191
       ]
     },
+    {
+      name: "BondInitialized",
+      discriminator: [
+        73,
+        68,
+        161,
+        2,
+        214,
+        12,
+        169,
+        53
+      ]
+    },
+    {
+      name: "BondRemoved",
+      discriminator: [
+        177,
+        200,
+        116,
+        123,
+        1,
+        244,
+        161,
+        240
+      ]
+    },
     {
       name: "BondStarted",
       discriminator: [
@@ -5843,16 +5946,16 @@ var jbond_default = {
       ]
     },
     {
-      name: "CollateralToppedUp",
+      name: "CollateralDeposited",
       discriminator: [
-        189,
-        137,
-        204,
-        58,
+        244,
+        62,
+        77,
+        11,
         135,
-        182,
-        19,
-        176
+        112,
+        61,
+        96
       ]
     },
     {
@@ -5868,6 +5971,19 @@ var jbond_default = {
         82
       ]
     },
+    {
+      name: "CompensationBurned",
+      discriminator: [
+        177,
+        198,
+        90,
+        188,
+        47,
+        95,
+        20,
+        174
+      ]
+    },
     {
       name: "CompensationClaimed",
       discriminator: [
@@ -5881,6 +5997,32 @@ var jbond_default = {
         32
       ]
     },
+    {
+      name: "FundsLocked",
+      discriminator: [
+        227,
+        93,
+        162,
+        69,
+        181,
+        4,
+        71,
+        157
+      ]
+    },
+    {
+      name: "FundsUnlocked",
+      discriminator: [
+        11,
+        240,
+        184,
+        107,
+        86,
+        187,
+        196,
+        128
+      ]
+    },
     {
       name: "ValidatorRegistered",
       discriminator: [
@@ -5893,33 +6035,46 @@ var jbond_default = {
         95,
         72
       ]
+    },
+    {
+      name: "WithdrawAuthorityChanged",
+      discriminator: [
+        91,
+        149,
+        224,
+        49,
+        187,
+        48,
+        190,
+        100
+      ]
     }
   ],
   errors: [
     {
       code: 6e3,
-      name: "InvalidVoteAccount",
-      msg: "Invalid vote account"
+      name: "Forbidden",
+      msg: "Forbidden"
     },
     {
       code: 6001,
-      name: "IdentityMismatch",
-      msg: "Identity does not match vote account"
+      name: "Unauthorized",
+      msg: "Unauthorized"
     },
     {
       code: 6002,
-      name: "InsufficientCollateral",
-      msg: "Insufficient collateral amount"
+      name: "InvalidVoteAccount",
+      msg: "Invalid vote account"
     },
     {
       code: 6003,
-      name: "TargetAprTooLow",
-      msg: "Target APR is below minimum threshold"
+      name: "IdentityMismatch",
+      msg: "Vote account identity mismatch"
     },
     {
       code: 6004,
-      name: "MathOverflow",
-      msg: "Math overflow"
+      name: "InvalidMint",
+      msg: "Invalid mint address"
     },
     {
       code: 6005,
@@ -5928,98 +6083,53 @@ var jbond_default = {
     },
     {
       code: 6006,
-      name: "ValidatorNotActive",
-      msg: "Validator bond account is not active"
+      name: "InvalidArgument",
+      msg: "Invalid argument"
     },
     {
       code: 6007,
-      name: "ValidatorAlreadyRegistered",
-      msg: "Validator already registered"
+      name: "InsufficientBalance",
+      msg: "Insufficient balance"
     },
     {
       code: 6008,
-      name: "Unauthorized",
-      msg: "Unauthorized"
+      name: "MathOverflow",
+      msg: "Math overflow"
     },
     {
       code: 6009,
-      name: "WithdrawalLockedNearEpochEnd",
-      msg: "Withdrawals are locked near the end of the epoch."
+      name: "Overflow",
+      msg: "Arithmetic overflow"
     },
     {
       code: 6010,
-      name: "MissingTokenAccounts",
-      msg: "Missing token accounts for token collateral type"
+      name: "BondNotRemovable",
+      msg: "Bond cannot be removed"
     },
     {
       code: 6011,
-      name: "MissingTokenProgram",
-      msg: "Token program is required for token collateral type"
+      name: "MissingTokenAccounts",
+      msg: "Missing token accounts"
     },
     {
       code: 6012,
-      name: "InvalidMint",
-      msg: "Invalid mint for token collateral type"
+      name: "MissingTokenProgram",
+      msg: "Missing token program"
     },
     {
       code: 6013,
       name: "MissingStakeAccount",
-      msg: "Stake account is required for stake account collateral type"
+      msg: "Missing stake account"
     },
     {
       code: 6014,
       name: "MissingStakeProgram",
-      msg: "Stake program is required for stake account collateral type"
+      msg: "Missing stake program"
     },
     {
       code: 6015,
-      name: "BondFinished",
-      msg: "Bond is finished (deposits/withdrawals disabled)"
-    },
-    {
-      code: 6016,
-      name: "BondNotFinished",
-      msg: "Bond is not finished"
-    },
-    {
-      code: 6017,
       name: "UnsupportedCollateralType",
       msg: "Unsupported collateral type"
-    },
-    {
-      code: 6018,
-      name: "Overflow",
-      msg: "Math operation overflowed"
-    },
-    {
-      code: 6019,
-      name: "IncorrectBondType",
-      msg: "Incorrect bond type for this operation"
-    },
-    {
-      code: 6020,
-      name: "BondNotFinishable",
-      msg: "This bond type can't be finished"
-    },
-    {
-      code: 6021,
-      name: "InvalidArgument",
-      msg: "Invalid argument provided"
-    },
-    {
-      code: 6022,
-      name: "BondNotDisabled",
-      msg: "Bond is not disabled"
-    },
-    {
-      code: 6023,
-      name: "BondNotEnabled",
-      msg: "Bond is not enabled"
-    },
-    {
-      code: 6024,
-      name: "InvalidEpoch",
-      msg: "Invalid epoch for this operation"
     }
   ],
   types: [
@@ -6053,6 +6163,26 @@ var jbond_default = {
         ]
       }
     },
+    {
+      name: "BondConfigured",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "bond",
+            type: "pubkey"
+          },
+          {
+            name: "authority",
+            type: "pubkey"
+          },
+          {
+            name: "timestamp",
+            type: "i64"
+          }
+        ]
+      }
+    },
     {
       name: "BondFinished",
       type: {
@@ -6108,6 +6238,46 @@ var jbond_default = {
         ]
       }
     },
+    {
+      name: "BondInitialized",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "bond",
+            type: "pubkey"
+          },
+          {
+            name: "authority",
+            type: "pubkey"
+          },
+          {
+            name: "timestamp",
+            type: "i64"
+          }
+        ]
+      }
+    },
+    {
+      name: "BondRemoved",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "bond",
+            type: "pubkey"
+          },
+          {
+            name: "authority",
+            type: "pubkey"
+          },
+          {
+            name: "timestamp",
+            type: "i64"
+          }
+        ]
+      }
+    },
     {
       name: "BondStarted",
       type: {
@@ -6261,7 +6431,7 @@ var jbond_default = {
       }
     },
     {
-      name: "CollateralToppedUp",
+      name: "CollateralDeposited",
       type: {
         kind: "struct",
         fields: [
@@ -6331,6 +6501,34 @@ var jbond_default = {
         ]
       }
     },
+    {
+      name: "CompensationBurned",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "validator",
+            type: "pubkey"
+          },
+          {
+            name: "amount",
+            type: "u64"
+          },
+          {
+            name: "post_balance",
+            type: "u64"
+          },
+          {
+            name: "epoch",
+            type: "u64"
+          },
+          {
+            name: "timestamp",
+            type: "i64"
+          }
+        ]
+      }
+    },
     {
       name: "CompensationClaimed",
       type: {
@@ -6359,6 +6557,54 @@ var jbond_default = {
         ]
       }
     },
+    {
+      name: "FundsLocked",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "validator",
+            type: "pubkey"
+          },
+          {
+            name: "amount",
+            type: "u64"
+          },
+          {
+            name: "total_locked",
+            type: "u64"
+          },
+          {
+            name: "epoch",
+            type: "u64"
+          }
+        ]
+      }
+    },
+    {
+      name: "FundsUnlocked",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "validator",
+            type: "pubkey"
+          },
+          {
+            name: "amount",
+            type: "u64"
+          },
+          {
+            name: "pending_unlock",
+            type: "u64"
+          },
+          {
+            name: "epoch",
+            type: "u64"
+          }
+        ]
+      }
+    },
     {
       name: "GlobalConfigureData",
       type: {
@@ -6453,23 +6699,23 @@ 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 (unavailable for withdrawal)"
             ],
             type: "u64"
           },
           {
-            name: "current_epoch_locked",
+            name: "pending_unlock",
             docs: [
-              "Amount of collateral locked for the current epoch"
+              "Pending unlock amount (will reduce `locked` next epoch)"
             ],
             type: "u64"
           },
           {
-            name: "last_update_epoch",
+            name: "pending_unlock_epoch",
             docs: [
-              "The last epoch when the bond was updated"
+              "Epoch when pending_unlock was queued"
             ],
             type: "u64"
           }
@@ -6482,7 +6728,7 @@ var jbond_default = {
         kind: "struct",
         fields: [
           {
-            name: "identity",
+            name: "validator",
             type: "pubkey"
           },
           {
@@ -6495,6 +6741,30 @@ var jbond_default = {
           }
         ]
       }
+    },
+    {
+      name: "WithdrawAuthorityChanged",
+      type: {
+        kind: "struct",
+        fields: [
+          {
+            name: "validator",
+            type: "pubkey"
+          },
+          {
+            name: "old_authority",
+            type: {
+              option: "pubkey"
+            }
+          },
+          {
+            name: "new_authority",
+            type: {
+              option: "pubkey"
+            }
+          }
+        ]
+      }
     }
   ],
   constants: [
@@ -6627,20 +6897,13 @@ function getBondTypeSeed(type) {
 }
 
 // src/client.ts
-var JBondClientEnv = /* @__PURE__ */ ((JBondClientEnv2) => {
-  JBondClientEnv2["DEV"] = "dev";
-  JBondClientEnv2["STAGE"] = "stage";
-  JBondClientEnv2["PROD"] = "prod";
-  return JBondClientEnv2;
-})(JBondClientEnv || {});
 var JBondClient = class _JBondClient {
   constructor(provider, options) {
     this.provider = provider;
     this.options = options ?? {};
-    this.program = new anchor.Program(jbond_default, this.provider);
   }
   options;
-  program;
+  _program = null;
   get history() {
     return new HistoryManager(this);
   }
@@ -6669,11 +6932,24 @@ var JBondClient = class _JBondClient {
   static fromKeypair(connection, keypair, options) {
     return _JBondClient.fromWallet(connection, new NodeWallet(keypair), options);
   }
+  /**
+   * Get or create the program instance
+   */
+  get program() {
+    if (!this._program) {
+      jbond_default.address = this.programId.toBase58();
+      this._program = new anchor.Program(jbond_default, this.provider);
+    }
+    return this._program;
+  }
   /**
    * Get the current program ID.
    */
   get programId() {
-    return this.options.programId ?? this.program.programId;
+    if (this.options.programId) {
+      return this.options.programId;
+    }
+    return new web3_js.PublicKey(ENV_PROGRAM_ID["prod" /* PROD */]);
   }
   /**
    * Get the current connection.
@@ -6685,7 +6961,13 @@ var JBondClient = class _JBondClient {
    * Set the environment.
    */
   env(env) {
-    return this.configure("programId", ENV_PROGRAM_ID[env]);
+    const envProgramId = ENV_PROGRAM_ID[env];
+    if (!envProgramId) {
+      throw new Error(`Invalid environment: ${env}`);
+    }
+    this._program = null;
+    this.debug(`Set environment to ${env} with program ID: ${envProgramId.toString()}`);
+    return this.configure("programId", new web3_js.PublicKey(envProgramId));
   }
   /**
    * Configure a specific option.
@@ -6802,6 +7084,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
    */
@@ -7015,9 +7301,14 @@ var JBondClient = class _JBondClient {
       native: () => {
       },
       token: (mint) => {
-        accounts.destinationTokenAccount = splToken.getAssociatedTokenAddressSync(mint, reserve, true);
         accounts.bondTokenAccount = splToken.getAssociatedTokenAddressSync(mint, validatorBond, true);
-        accounts.reserveTokenAccount = splToken.getAssociatedTokenAddressSync(mint, reserve, true);
+        if (reserve.equals(mint)) {
+          accounts.reserveTokenAccount = null;
+          accounts.destinationTokenAccount = null;
+        } else {
+          accounts.destinationTokenAccount = splToken.getAssociatedTokenAddressSync(mint, reserve, true);
+          accounts.reserveTokenAccount = splToken.getAssociatedTokenAddressSync(mint, reserve, true);
+        }
       }
     });
     return this.program.methods.bondClaim(solToLamports(amount)).accountsPartial(accounts).instruction();
@@ -7087,6 +7378,42 @@ var JBondClient = class _JBondClient {
     const ix = await this.getReleaseFundsIx(props);
     return this.provider.sendAndConfirm?.(new web3_js.Transaction().add(ix));
   }
+  /**
+   * Update epoch locks
+   */
+  async updateEpochLocks(props) {
+    const { bondType, bondName, voteAccount, payer } = props;
+    const ix = await this.getUpdateEpochLocksIx({ bondType, bondName, voteAccount, payer });
+    return this.provider.sendAndConfirm?.(new web3_js.Transaction().add(ix));
+  }
+  /**
+   * Build update epoch locks instruction
+   */
+  async getUpdateEpochLocksIx(props) {
+    const { bondType, bondName, voteAccount, payer } = props;
+    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.
+   * It allows direct manipulation of the validator bond's last epoch update.
+   * This should not be used in production environments.
+   */
+  async getTestSetLastUpdateEpochIx(props) {
+    const { bondType, bondName, voteAccount, payer, epoch } = props;
+    const [validatorBond, _] = this.pda.validatorBond(bondType, bondName, voteAccount);
+    return this.program.methods.testSetLastUpdateEpoch(new import_bn.BN(epoch)).accountsPartial({ validatorBond, payer }).instruction();
+  }
   /**
    * Build lock funds instruction
    */
@@ -7120,8 +7447,10 @@ var JBondClient = class _JBondClient {
    */
   async getReleaseFundsIx(props) {
     const { bondType, name, voteAccount, amount, withdrawAuthority } = props;
+    const [bondState] = this.pda.bondState(bondType, name);
     const [validatorBond] = this.pda.validatorBond(bondType, name, voteAccount);
     const accounts = {
+      bondState,
       validatorBond,
       payer: withdrawAuthority
     };
@@ -7132,7 +7461,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