@jpool/bond-sdk 0.9.0-next.12 → 0.9.0-next.13

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { Program, AnchorProvider, BN } from '@coral-xyz/anchor';
 import { getStakePoolAccount, STAKE_POOL_PROGRAM_ID, StakePoolInstruction } from '@solana/spl-stake-pool';
 import { TOKEN_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync } from '@solana/spl-token';
-import { PublicKey, Transaction, SystemProgram, LAMPORTS_PER_SOL, StakeProgram } from '@solana/web3.js';
+import { PublicKey, Transaction, SystemProgram, LAMPORTS_PER_SOL } from '@solana/web3.js';
 import bs58 from 'bs58';
 
 var __create = Object.create;
@@ -6653,8 +6653,6 @@ var JBondClient = class _JBondClient {
       token: (mint) => {
         accounts.reserveTokenAccount = getAssociatedTokenAddressSync(mint, props.reserve);
         accounts.mint = mint;
-      },
-      stakeAccount: () => {
       }
     });
     return this.program.methods.bondInitialize({
@@ -6703,9 +6701,6 @@ var JBondClient = class _JBondClient {
       token: (mint) => {
         accounts.bondTokenAccount = getAssociatedTokenAddressSync(mint, validatorBond, true);
         Object.assign(accounts, { mint, bondTokenAccount: accounts.bondTokenAccount });
-      },
-      stakeAccount: () => {
-        throw new Error("Stake account collateral type is not currently supported");
       }
     });
     return this.program.methods.bondRegister(bondType, name).accountsPartial(accounts).instruction();
@@ -6751,13 +6746,6 @@ var JBondClient = class _JBondClient {
         accounts.bondTokenAccount = getAssociatedTokenAddressSync(mint, validatorBond, true);
         accounts.tokenProgram = TOKEN_PROGRAM_ID;
         accounts.associatedTokenProgram = ASSOCIATED_TOKEN_PROGRAM_ID;
-      },
-      stakeAccount: () => {
-        if (!collateral.stakeAccount) {
-          throw new Error("Missing stakeAccount for stake collateral");
-        }
-        accounts.stakeAccount = collateral.stakeAccount;
-        accounts.stakeProgram = StakeProgram.programId;
       }
     });
     instructions.push(
@@ -6794,19 +6782,12 @@ var JBondClient = class _JBondClient {
         accounts.destinationTokenAccount = getAssociatedTokenAddressSync(mint, destination, true);
         accounts.bondTokenAccount = getAssociatedTokenAddressSync(mint, validatorBond, true);
         accounts.tokenProgram = TOKEN_PROGRAM_ID;
-      },
-      stakeAccount: () => {
-        if (!withdraw.stakeAccount) {
-          throw new Error("Missing stakeAccount for stake collateral");
-        }
-        accounts.stakeAccount = withdraw.stakeAccount;
-        accounts.stakeProgram = StakeProgram.programId;
       }
     });
     return this.program.methods.bondWithdraw(this.lamports(withdraw.amount)).accountsPartial(accounts).instruction();
   }
   async buildClaimIx(props) {
-    const { claim, bondType, name } = props;
+    const { bondType, name } = props;
     const [bondState] = this.pda.bondState(bondType, name);
     const [validatorBond] = this.pda.validatorBond(bondType, name, props.voteAccount);
     const reserve = props.reserve ?? (await this.getBondState(bondType, name)).reserve;
@@ -6835,13 +6816,6 @@ var JBondClient = class _JBondClient {
         accounts.bondTokenAccount = getAssociatedTokenAddressSync(mint, validatorBond, true);
         accounts.reserveTokenAccount = getAssociatedTokenAddressSync(mint, reserve, true);
         accounts.tokenProgram = TOKEN_PROGRAM_ID;
-      },
-      stakeAccount: () => {
-        if (!claim.stakeAccount) {
-          throw new Error("Missing stakeAccount for stake collateral");
-        }
-        accounts.stakeAccount = claim.stakeAccount;
-        accounts.stakeProgram = StakeProgram.programId;
       }
     });
     return this.program.methods.bondClaim(this.lamports(props.claim.amount)).accountsPartial(
@@ -6905,16 +6879,7 @@ var JBondClient = class _JBondClient {
       if (!sameVariant(state.bondType, bondType)) {
         continue;
       }
-      const validatorBonds = await this.getValidatorBondsByState(state.bondType, state.name);
-      const balances = await Promise.all(
-        validatorBonds.map(
-          (vb) => this.getValidatorBondBalance(state.bondType, state.name, vb.voteAccount).then((v) => v ?? 0)
-        )
-      );
-      const bondStateStats = {
-        totalCollected: balances.reduce((sum, v) => sum + v, 0),
-        status: await this.getBondStateSessionStatus(state)
-      };
+      const bondStateStats = await this.getBondStateStats(state.bondType, state.name);
       bondStates.push([state, bondStateStats]);
     }
     return bondStates;
@@ -6997,18 +6962,68 @@ var JBondClient = class _JBondClient {
         } catch {
           return 0;
         }
+      }
+    });
+  }
+  // Get total collected collateral for a bond state
+  async getBondStateTotalCollected(bondType, bondName, votes) {
+    const bondStateData = await this.getBondState(bondType, bondName);
+    const bondStateCollateralType = bondStateData.collateralType;
+    return await matchVariant(bondStateCollateralType, {
+      native: async () => {
+        const addresses = votes.map((vote) => {
+          const [address] = this.pda.validatorBond(bondType, bondName, new PublicKey(vote));
+          return address;
+        });
+        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);
       },
-      stakeAccount: async () => {
-        const accountInfo = await this.connection.getAccountInfo(address).catch(() => null);
-        if (!accountInfo) {
-          return 0;
-        }
-        const { data, lamports } = accountInfo;
-        const rentExempt = await this.connection.getMinimumBalanceForRentExemption(data.length);
-        return Math.max(0, lamports - rentExempt);
+      token: async (mint) => {
+        const tokenAccounts = votes.map((vote) => {
+          const [validatorBondAddress] = this.pda.validatorBond(bondType, bondName, new PublicKey(vote));
+          return getAssociatedTokenAddressSync(mint, validatorBondAddress, true);
+        });
+        const accountInfos = await this.connection.getMultipleAccountsInfo(tokenAccounts);
+        const balances = await Promise.all(
+          accountInfos.map(async (accountInfo) => {
+            if (!accountInfo) {
+              return 0;
+            }
+            try {
+              const balance = await this.connection.getTokenAccountBalance(tokenAccounts[accountInfos.indexOf(accountInfo)]);
+              return Number(balance.value.uiAmount ?? 0) * LAMPORTS_PER_SOL;
+            } catch {
+              return 0;
+            }
+          })
+        );
+        return balances.reduce((sum, v) => sum + v, 0);
       }
     });
   }
+  async getBondStateStats(bondType, bondName) {
+    const bondState = await this.getBondState(bondType, bondName);
+    const validatorBonds = await this.getValidatorBondsByState(bondState.bondType, bondState.name);
+    const totalCollected = await this.getBondStateTotalCollected(
+      bondType,
+      bondName,
+      validatorBonds.map((vb) => vb.voteAccount)
+    );
+    const bondStateStats = {
+      totalCollected,
+      status: await this.getBondStateSessionStatus(bondState)
+    };
+    return bondStateStats;
+  }
   /**
    * Load stake pool account and cache it if not already cached
    * @private