@jpool/bond-sdk 0.11.0-next.3 → 0.11.0-next.6

package/dist/index.js

@@ -5008,6 +5008,50 @@ var jbond_default = {
         }
       ]
     },
+    {
+      name: "bond_lock_funds",
+      docs: [
+        "Locks funds for the upcoming epoch.",
+        "Moves collateral from available to locked state which cannot be withdrawn.",
+        "# Errors",
+        "Fails if the validator is not active, or if there are insufficient available funds."
+      ],
+      discriminator: [
+        117,
+        166,
+        195,
+        99,
+        103,
+        45,
+        195,
+        2
+      ],
+      accounts: [
+        {
+          name: "bond_state",
+          writable: true
+        },
+        {
+          name: "validator_bond",
+          writable: true
+        },
+        {
+          name: "bond_token_account",
+          optional: true
+        },
+        {
+          name: "payer",
+          writable: true,
+          signer: true
+        }
+      ],
+      args: [
+        {
+          name: "amount",
+          type: "u64"
+        }
+      ]
+    },
     {
       name: "bond_register",
       docs: [
@@ -5120,6 +5164,42 @@ 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.",
+        "# Errors",
+        "Fails if the validator is not active, or if there are insufficient locked funds."
+      ],
+      discriminator: [
+        184,
+        224,
+        14,
+        24,
+        76,
+        14,
+        226,
+        190
+      ],
+      accounts: [
+        {
+          name: "validator_bond",
+          writable: true
+        },
+        {
+          name: "payer",
+          writable: true,
+          signer: true
+        }
+      ],
+      args: [
+        {
+          name: "amount",
+          type: "u64"
+        }
+      ]
+    },
     {
       name: "bond_set_withdraw_authority",
       docs: [
@@ -5299,6 +5379,31 @@ var jbond_default = {
         }
       ]
     },
+    {
+      name: "bond_update",
+      discriminator: [
+        237,
+        102,
+        183,
+        192,
+        94,
+        83,
+        52,
+        82
+      ],
+      accounts: [
+        {
+          name: "validator_bond",
+          writable: true
+        },
+        {
+          name: "payer",
+          writable: true,
+          signer: true
+        }
+      ],
+      args: []
+    },
     {
       name: "bond_withdraw",
       docs: [
@@ -5899,6 +6004,11 @@ var jbond_default = {
       code: 6023,
       name: "BondNotEnabled",
       msg: "Bond is not enabled"
+    },
+    {
+      code: 6024,
+      name: "InvalidEpoch",
+      msg: "Invalid epoch for this operation"
     }
   ],
   types: [
@@ -6330,6 +6440,27 @@ var jbond_default = {
               "Bump for the PDA"
             ],
             type: "u8"
+          },
+          {
+            name: "next_epoch_locked",
+            docs: [
+              "Amount of collateral locked for the next epoch"
+            ],
+            type: "u64"
+          },
+          {
+            name: "current_epoch_locked",
+            docs: [
+              "Amount of collateral locked for the current epoch"
+            ],
+            type: "u64"
+          },
+          {
+            name: "last_update_epoch",
+            docs: [
+              "The last epoch when the bond was updated"
+            ],
+            type: "u64"
           }
         ]
       }
@@ -6885,20 +7016,17 @@ var JBondClient = class _JBondClient {
    */
   async getClaimAllCompensationsIxs(props) {
     const ixs = [];
-    const validatorBonds = await this.getBondValidatorStates(props.bondType, props.name);
     const validatorBondBalances = await this.getBondStateValidatorBondBalances(
       props.bondType,
       props.name
     );
-    for (const vb of validatorBonds) {
-      console.log("Processing claim for validator:", vb.voteAccount.toBase58());
-      const validatorBondBalance = lamportsToSol(validatorBondBalances.find((vbb) => vbb.voteAccount.equals(vb.voteAccount))?.balance || 0);
-      const amountToClaim = validatorBondBalance - (props.collateralType ? 0 : lamportsToSol(await this.validatorBondRentExempt()));
+    for (const bond_balance of validatorBondBalances) {
+      const amountToClaim = lamportsToSol(bond_balance.balance);
       if (amountToClaim <= 0) {
-        console.log("No balance to claim for validator:", vb.voteAccount.toBase58());
+        this.debug("No balance to claim for validator:", bond_balance.voteAccount.toBase58());
         continue;
       }
-      console.log("Amount to claim:", amountToClaim);
+      this.debug("Amount to claim:", amountToClaim);
       const ix = await this.getClaimIx({
         bondType: props.bondType,
         name: props.name,
@@ -6906,7 +7034,7 @@ var JBondClient = class _JBondClient {
         collateralType: props.collateralType,
         reserve: props.reserve,
         authority: props.authority,
-        voteAccount: vb.voteAccount
+        voteAccount: bond_balance.voteAccount
       });
       ixs.push(ix);
     }
@@ -6940,6 +7068,48 @@ var JBondClient = class _JBondClient {
     const authority = this.provider.wallet?.publicKey;
     return this.program.methods.sessionStart(new import_bn.BN(props.duration)).accountsPartial({ bondState, authority }).instruction();
   }
+  /**
+   * Build lock funds instruction
+   */
+  async getLockFundsIx(props) {
+    const { bondType, name, voteAccount, amount } = props;
+    const [bondState] = this.pda.bondState(bondType, name);
+    let collateralType = props.collateralType;
+    if (!collateralType) {
+      const bondState2 = await this.getBondState(bondType, name);
+      collateralType = bondState2.collateralType;
+    }
+    const [validatorBond] = this.pda.validatorBond(bondType, name, voteAccount);
+    const authority = this.provider.wallet?.publicKey;
+    const accounts = {
+      bondState,
+      validatorBond,
+      payer: authority,
+      bondTokenAccount: null
+    };
+    matchVariant(collateralType, {
+      native: () => {
+      },
+      token: (mint) => {
+        const bondTokenAccount = splToken.getAssociatedTokenAddressSync(mint, validatorBond, true);
+        accounts.bondTokenAccount = bondTokenAccount;
+      }
+    });
+    return this.program.methods.bondLockFunds(solToLamports(amount)).accountsPartial(accounts).instruction();
+  }
+  /**
+   * Build release funds instruction
+   */
+  async getReleaseFundsIx(props) {
+    const { bondType, name, voteAccount, amount } = props;
+    const [validatorBond] = this.pda.validatorBond(bondType, name, voteAccount);
+    const authority = this.provider.wallet?.publicKey;
+    const accounts = {
+      validatorBond,
+      payer: authority
+    };
+    return this.program.methods.bondReleaseFunds(solToLamports(amount)).accountsPartial(accounts).instruction();
+  }
   /**
    * Get all bond states with total collected collateral
    */
@@ -6997,8 +7167,8 @@ var JBondClient = class _JBondClient {
         if (!accountInfo) {
           return 0;
         }
-        const { data, lamports } = accountInfo;
-        const rentExempt = await this.connection.getMinimumBalanceForRentExemption(data.length);
+        const { lamports } = accountInfo;
+        const rentExempt = await this.validatorBondRentExempt();
         return Math.max(0, lamports - rentExempt);
       },
       token: async (mint) => {
@@ -7015,7 +7185,7 @@ var JBondClient = class _JBondClient {
   async getBondStateValidatorBondBalances(bondType, bondName) {
     const bondState = await this.getBondState(bondType, bondName);
     const collateralType = bondState.collateralType;
-    const validatorBonds = await this.getBondValidatorStates(bondType, bondName);
+    const validatorBonds = await this.getValidatorBondsForState(bondType, bondName);
     if (!validatorBonds.length) {
       return [];
     }
@@ -7030,9 +7200,10 @@ var JBondClient = class _JBondClient {
       native: async () => {
         const addresses = validatorBonds.map((vb) => vb.publicKey);
         const accountInfos = await this.connection.getMultipleAccountsInfo(addresses);
+        const rentExempt = await this.validatorBondRentExempt();
         return validatorBonds.map((vb, idx) => ({
           voteAccount: vb.voteAccount,
-          balance: accountInfos[idx]?.lamports ?? 0
+          balance: Math.max(0, (accountInfos[idx]?.lamports ?? 0) - rentExempt)
         }));
       },
       token: async (mint) => {
@@ -7099,7 +7270,7 @@ var JBondClient = class _JBondClient {
   /**
    * Get all validator bonds for a given bond state
    */
-  async getBondValidatorStates(bondType, bondName) {
+  async getValidatorBondsForState(bondType, bondName) {
     const [bondState] = this.pda.bondState(bondType, bondName);
     const accounts = await this.program.account.validatorBond.all([
       {