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

package/dist/index.js

@@ -4759,7 +4759,7 @@ function slotToEpoch(slot, cluster) {
 
 // src/idl/jbond.json
 var jbond_default = {
-  address: "BondQ7KqZreTcW2UbeTNDcLCJQ3aXAtLn2Fm6ftaJDU",
+  address: "Fo17edWRJewZNTRibgx9iTfjywCW6dzS81VwBLmPFVq1",
   metadata: {
     name: "jbond",
     version: "0.2.1",
@@ -6281,32 +6281,54 @@ var jbond_default = {
         fields: [
           {
             name: "state",
+            docs: [
+              "The bond state address"
+            ],
             type: "pubkey"
           },
           {
             name: "identity",
+            docs: [
+              "Validator identity pubkey"
+            ],
             type: "pubkey"
           },
           {
             name: "vote_account",
+            docs: [
+              "Validator vote account pubkey"
+            ],
             type: "pubkey"
           },
           {
             name: "creator",
+            docs: [
+              "The bond creator pubkey"
+            ],
             type: "pubkey"
           },
           {
             name: "withdrawal_authority",
+            docs: [
+              "Optional withdrawal authority pubkey (if set, can withdraw on behalf of the validator,",
+              "otherwise only identity can withdraw)"
+            ],
             type: {
               option: "pubkey"
             }
           },
           {
             name: "created_at",
+            docs: [
+              "Bond creation timestamp"
+            ],
             type: "i64"
           },
           {
             name: "bump",
+            docs: [
+              "Bump for the PDA"
+            ],
             type: "u8"
           }
         ]
@@ -6429,6 +6451,20 @@ var NodeWallet = class {
 // src/utils/web3.ts
 init_cjs_shims();
 var SOL_DECIMALS = Math.log10(web3_js.LAMPORTS_PER_SOL);
+function lamportsToSol(lamports) {
+  if (typeof lamports === "number") {
+    return Math.abs(lamports) / web3_js.LAMPORTS_PER_SOL;
+  }
+  let signMultiplier = 1;
+  if (lamports.isNeg()) {
+    signMultiplier = -1;
+  }
+  const absLamports = lamports.abs();
+  const lamportsString = absLamports.toString(10).padStart(10, "0");
+  const splitIndex = lamportsString.length - SOL_DECIMALS;
+  const solString = `${lamportsString.slice(0, splitIndex)}.${lamportsString.slice(splitIndex)}`;
+  return signMultiplier * Number.parseFloat(solString);
+}
 function solToLamports(amount) {
   if (Number.isNaN(amount)) {
     return new anchor.BN(0);
@@ -6449,12 +6485,12 @@ function getBondTypeSeed(type) {
 }
 
 // src/client.ts
-var BondClientEnv = /* @__PURE__ */ ((BondClientEnv2) => {
-  BondClientEnv2["DEV"] = "dev";
-  BondClientEnv2["STAGE"] = "stage";
-  BondClientEnv2["PROD"] = "prod";
-  return BondClientEnv2;
-})(BondClientEnv || {});
+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;
@@ -6466,6 +6502,12 @@ var JBondClient = class _JBondClient {
   get history() {
     return new HistoryManager(this);
   }
+  /**
+   * Creates a local instance of `JBondClient` for development and testing.
+   */
+  static local(options) {
+    return new _JBondClient(anchor.AnchorProvider.local(), options);
+  }
   /**
    * Creates an instance of `JBondClient` using a provided connection and wallet.
    */
@@ -6577,7 +6619,7 @@ var JBondClient = class _JBondClient {
     return this.provider.sendAndConfirm?.(new web3_js.Transaction().add(ix));
   }
   /**
-   * Claim compensation
+   * Claim compensation for a validator
    */
   async claimCompensation(props) {
     const ix = await this.getClaimIx(props);
@@ -6838,6 +6880,38 @@ var JBondClient = class _JBondClient {
     });
     return this.program.methods.bondClaim(solToLamports(amount)).accountsPartial(accounts).instruction();
   }
+  /**
+   * Build claim all compensations instructions
+   */
+  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()));
+      if (amountToClaim <= 0) {
+        console.log("No balance to claim for validator:", vb.voteAccount.toBase58());
+        continue;
+      }
+      console.log("Amount to claim:", amountToClaim);
+      const ix = await this.getClaimIx({
+        bondType: props.bondType,
+        name: props.name,
+        amount: amountToClaim,
+        collateralType: props.collateralType,
+        reserve: props.reserve,
+        authority: props.authority,
+        voteAccount: vb.voteAccount
+      });
+      ixs.push(ix);
+    }
+    return ixs;
+  }
   /**
    * Build set withdraw authority instruction
    */
@@ -6938,12 +7012,13 @@ var JBondClient = class _JBondClient {
       }
     });
   }
-  /**
-   * Get total collected collateral for a bond state
-   */
-  async getBondStateTotalCollected(bondType, bondName, votes) {
+  async getBondStateValidatorBondBalances(bondType, bondName) {
     const bondState = await this.getBondState(bondType, bondName);
     const collateralType = bondState.collateralType;
+    const validatorBonds = await this.getBondValidatorStates(bondType, bondName);
+    if (!validatorBonds.length) {
+      return [];
+    }
     const chunk = (arr, n = 100) => {
       const res = [];
       for (let i = 0; i < arr.length; i += n) {
@@ -6953,54 +7028,52 @@ var JBondClient = class _JBondClient {
     };
     return await matchVariant(collateralType, {
       native: async () => {
-        const addresses = votes.map((vote) => {
-          const [address] = this.pda.validatorBond(bondType, bondName, new web3_js.PublicKey(vote));
-          return address;
-        });
+        const addresses = validatorBonds.map((vb) => vb.publicKey);
         const accountInfos = await this.connection.getMultipleAccountsInfo(addresses);
-        const balances = await Promise.all(
-          accountInfos.map(async (accountInfo) => {
-            if (!accountInfo) {
-              return 0;
-            }
-            const { lamports } = accountInfo;
-            return lamports;
-          })
-        );
-        return balances.reduce((sum, v) => sum + v, 0);
+        return validatorBonds.map((vb, idx) => ({
+          voteAccount: vb.voteAccount,
+          balance: accountInfos[idx]?.lamports ?? 0
+        }));
       },
       token: async (mint) => {
-        const tokenAccounts = votes.map((vote) => {
-          const [validatorBondAddress] = this.pda.validatorBond(bondType, bondName, new web3_js.PublicKey(vote));
-          return splToken.getAssociatedTokenAddressSync(mint, validatorBondAddress, true);
-        });
-        if (tokenAccounts.length === 0) {
-          return 0;
-        }
-        let total = 0n;
-        for (const part of chunk(tokenAccounts, 100)) {
-          const infos = await this.connection.getMultipleAccountsInfo(part).catch(() => []);
-          for (let i = 0; i < infos.length; i++) {
+        const items = validatorBonds.map((vb) => ({
+          voteAccount: vb.voteAccount,
+          tokenAccount: splToken.getAssociatedTokenAddressSync(mint, vb.publicKey, true)
+        }));
+        const balances = [];
+        for (const part of chunk(items, 100)) {
+          const infos = await this.connection.getMultipleAccountsInfo(part.map((i) => i.tokenAccount)).catch(() => []);
+          for (let i = 0; i < part.length; i++) {
             const info = infos[i];
-            if (!info) {
-              continue;
-            }
-            if (info.data.length !== splToken.ACCOUNT_SIZE) {
+            const voteAccount = part[i].voteAccount;
+            if (!info || info.data.length !== splToken.ACCOUNT_SIZE) {
+              balances.push({ voteAccount, balance: 0 });
               continue;
             }
             try {
               const acc = splToken.AccountLayout.decode(info.data);
               const raw = BigInt(acc.amount.toString());
-              total += raw;
+              const asNumber = Number(raw);
+              balances.push({
+                voteAccount,
+                balance: Number.isFinite(asNumber) ? asNumber : Number.MAX_SAFE_INTEGER
+              });
             } catch {
+              balances.push({ voteAccount, balance: 0 });
             }
           }
         }
-        const asNumber = Number(total);
-        return Number.isFinite(asNumber) ? asNumber : Number.MAX_SAFE_INTEGER;
+        return balances;
       }
     });
   }
+  /**
+   * Get total collected collateral for a bond state
+   */
+  async getBondStateTotalCollected(bondType, bondName) {
+    const allBalances = await this.getBondStateValidatorBondBalances(bondType, bondName);
+    return allBalances.reduce((sum, vb) => sum + vb.balance, 0);
+  }
   /**
    * Get bond state stats
    * @param state
@@ -7008,17 +7081,21 @@ var JBondClient = class _JBondClient {
    */
   async getBondStateStats(state) {
     const bondType = anchorToBondType(state.bondType);
-    const validatorBonds = await this.getBondValidatorStates(bondType, state.name);
     const totalCollected = await this.getBondStateTotalCollected(
       bondType,
-      state.name,
-      validatorBonds.map((vb) => vb.voteAccount)
+      state.name
     );
     return {
       totalCollected,
       status: this.getBondStateSessionStatus(state)
     };
   }
+  /**
+   * Get validator bond rent exempt amount
+   */
+  validatorBondRentExempt = async () => {
+    return this.connection.getMinimumBalanceForRentExemption(this.program.account.validatorBond.size);
+  };
   /**
    * Get all validator bonds for a given bond state
    */
@@ -7066,13 +7143,13 @@ buffer/index.js:
 */
 
 exports.BOND_STATE_SEED = BOND_STATE_SEED;
-exports.BondClientEnv = BondClientEnv;
 exports.BondTransactionType = BondTransactionType;
 exports.BondType = BondType;
 exports.CROWDFUNDING_BOND_SEED = CROWDFUNDING_BOND_SEED;
 exports.ENV_PROGRAM_ID = ENV_PROGRAM_ID;
 exports.GLOBAL_STATE_SEED = GLOBAL_STATE_SEED;
 exports.JBondClient = JBondClient;
+exports.JBondClientEnv = JBondClientEnv;
 exports.NodeWallet = NodeWallet;
 exports.STANDARD_BOND_SEED = STANDARD_BOND_SEED;
 exports.SessionStatus = SessionStatus;