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

package/dist/index.mjs

@@ -6853,20 +6853,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,
@@ -6874,7 +6871,7 @@ var JBondClient = class _JBondClient {
         collateralType: props.collateralType,
         reserve: props.reserve,
         authority: props.authority,
-        voteAccount: vb.voteAccount
+        voteAccount: bond_balance.voteAccount
       });
       ixs.push(ix);
     }
@@ -6965,8 +6962,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) => {
@@ -6983,7 +6980,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 [];
     }
@@ -6998,9 +6995,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) => {
@@ -7067,7 +7065,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([
       {