@jpool/bond-sdk 0.9.0-next.23 → 0.9.0-next.25

package/dist/index.d.mts

@@ -32,7 +32,7 @@ declare const ENV_PROGRAM_ID: Record<string, PublicKey>;
  * IDL can be found at `target/idl/jbond.json`.
  */
 type Jbond = {
-    "address": "Fo17edWRJewZNTRibgx9iTfjywCW6dzS81VwBLmPFVq1";
+    "address": "BondQ7KqZreTcW2UbeTNDcLCJQ3aXAtLn2Fm6ftaJDU";
     "metadata": {
         "name": "jbond";
         "version": "0.2.1";
@@ -1231,7 +1231,7 @@ type Jbond = {
         {
             "name": "bondInitializeData";
             "docs": [
-                "Data required to initialize a standard bond"
+                "Data required to initialize a performance bond"
             ];
             "type": {
                 "kind": "struct";
@@ -1728,8 +1728,6 @@ type TransactionHistoryItem = {
     epoch: number;
     type: BondTransactionType;
     amount: number;
-    beforeBalance?: number;
-    afterBalance?: number;
 };
 declare enum BondTransactionType {
     Deposit = "deposit",
@@ -1942,7 +1940,8 @@ declare class JBondClient {
     /**
      * Get all bond states with total collected collateral
      */
-    getAllBondStates(bondType: BondType, session_status?: SessionStatus): Promise<{
+    getAllBondStates(bondType: BondType, sessionStatus?: SessionStatus): Promise<{
+        publicKey: PublicKey;
         bondState: {
             name: string;
             bondType: ({
@@ -2023,6 +2022,29 @@ declare class JBondClient {
      * Get total collected collateral for a bond state
      */
     getBondStateTotalCollected(bondType: BondType, bondName: string, votes: PublicKeyInitData[]): Promise<number>;
+    /**
+     * Get transaction history for a specific validator bond account
+     */
+    getHistory(bondType: BondType, bondName: string, vote: PublicKey, options?: {
+        cluster?: 'mainnet-beta' | 'testnet' | 'devnet';
+        limit?: number;
+        before?: string;
+        until?: string;
+    }): Promise<TransactionHistoryItem[]>;
+    /**
+     * Get full transaction history by paginating through results
+     * @param bondType
+     * @param bondName
+     * @param voteAccount
+     * @param pageSize
+     */
+    getFullHistory(bondType: BondType, bondName: string, voteAccount: PublicKey, pageSize?: number): Promise<TransactionHistoryItem[]>;
+    /**
+     * Get instruction discriminator from IDL
+     * @param instructionName
+     * @private
+     */
+    private getInstructionDiscriminator;
     /**
      * Get bond state stats
      * @param state

package/dist/index.d.ts

@@ -32,7 +32,7 @@ declare const ENV_PROGRAM_ID: Record<string, PublicKey>;
  * IDL can be found at `target/idl/jbond.json`.
  */
 type Jbond = {
-    "address": "Fo17edWRJewZNTRibgx9iTfjywCW6dzS81VwBLmPFVq1";
+    "address": "BondQ7KqZreTcW2UbeTNDcLCJQ3aXAtLn2Fm6ftaJDU";
     "metadata": {
         "name": "jbond";
         "version": "0.2.1";
@@ -1231,7 +1231,7 @@ type Jbond = {
         {
             "name": "bondInitializeData";
             "docs": [
-                "Data required to initialize a standard bond"
+                "Data required to initialize a performance bond"
             ];
             "type": {
                 "kind": "struct";
@@ -1728,8 +1728,6 @@ type TransactionHistoryItem = {
     epoch: number;
     type: BondTransactionType;
     amount: number;
-    beforeBalance?: number;
-    afterBalance?: number;
 };
 declare enum BondTransactionType {
     Deposit = "deposit",
@@ -1942,7 +1940,8 @@ declare class JBondClient {
     /**
      * Get all bond states with total collected collateral
      */
-    getAllBondStates(bondType: BondType, session_status?: SessionStatus): Promise<{
+    getAllBondStates(bondType: BondType, sessionStatus?: SessionStatus): Promise<{
+        publicKey: PublicKey;
         bondState: {
             name: string;
             bondType: ({
@@ -2023,6 +2022,29 @@ declare class JBondClient {
      * Get total collected collateral for a bond state
      */
     getBondStateTotalCollected(bondType: BondType, bondName: string, votes: PublicKeyInitData[]): Promise<number>;
+    /**
+     * Get transaction history for a specific validator bond account
+     */
+    getHistory(bondType: BondType, bondName: string, vote: PublicKey, options?: {
+        cluster?: 'mainnet-beta' | 'testnet' | 'devnet';
+        limit?: number;
+        before?: string;
+        until?: string;
+    }): Promise<TransactionHistoryItem[]>;
+    /**
+     * Get full transaction history by paginating through results
+     * @param bondType
+     * @param bondName
+     * @param voteAccount
+     * @param pageSize
+     */
+    getFullHistory(bondType: BondType, bondName: string, voteAccount: PublicKey, pageSize?: number): Promise<TransactionHistoryItem[]>;
+    /**
+     * Get instruction discriminator from IDL
+     * @param instructionName
+     * @private
+     */
+    private getInstructionDiscriminator;
     /**
      * Get bond state stats
      * @param state

package/dist/index.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var anchor = require('@coral-xyz/anchor');
+var bytes = require('@coral-xyz/anchor/dist/cjs/utils/bytes');
 var splStakePool = require('@solana/spl-stake-pool');
 var splToken = require('@solana/spl-token');
 var web3_js = require('@solana/web3.js');
@@ -4751,23 +4752,12 @@ var HistoryManager = class {
         if (!type || amount <= 0) {
           continue;
         }
-        let beforeBalance;
-        let afterBalance;
-        const accIdx = tx.transaction.message.accountKeys.findIndex(
-          (k) => k.pubkey.equals(validatorBondAccount)
-        );
-        if (accIdx !== -1 && tx.meta.preBalances && tx.meta.postBalances) {
-          beforeBalance = Number(tx.meta.preBalances[accIdx] ?? 0) / web3_js.LAMPORTS_PER_SOL;
-          afterBalance = Number(tx.meta.postBalances[accIdx] ?? 0) / web3_js.LAMPORTS_PER_SOL;
-        }
         history.push({
           signature: sig,
           slot,
           epoch: slotToEpoch(slot, cluster),
           type,
-          amount,
-          beforeBalance,
-          afterBalance
+          amount
         });
       }
     }
@@ -4842,7 +4832,7 @@ var HistoryManager = class {
 
 // src/idl/jbond.json
 var jbond_default = {
-  address: "Fo17edWRJewZNTRibgx9iTfjywCW6dzS81VwBLmPFVq1",
+  address: "BondQ7KqZreTcW2UbeTNDcLCJQ3aXAtLn2Fm6ftaJDU",
   metadata: {
     name: "jbond",
     version: "0.2.1",
@@ -6041,7 +6031,7 @@ var jbond_default = {
     {
       name: "BondInitializeData",
       docs: [
-        "Data required to initialize a standard bond"
+        "Data required to initialize a performance bond"
       ],
       type: {
         kind: "struct",
@@ -6941,19 +6931,20 @@ var JBondClient = class _JBondClient {
   /**
    * Get all bond states with total collected collateral
    */
-  async getAllBondStates(bondType, session_status) {
+  async getAllBondStates(bondType, sessionStatus) {
     const bondStates = [];
     const bondStateAccounts = await this.program.account.bondState.all();
-    for (const { account: state } of bondStateAccounts) {
+    for (const { publicKey, account: state } of bondStateAccounts) {
       if (!sameVariant(state.bondType, bondType)) {
         continue;
       }
-      if (session_status !== void 0 && this.getBondStateSessionStatus(state) !== session_status) {
+      if (sessionStatus !== void 0 && this.getBondStateSessionStatus(state) !== sessionStatus) {
         continue;
       }
       const bondStateStats = await this.getBondStateStats(state);
       bondStates.push(
         {
+          publicKey,
           bondState: state,
           stateStats: bondStateStats
         }
@@ -7104,6 +7095,186 @@ var JBondClient = class _JBondClient {
       }
     });
   }
+  /**
+   * Get transaction history for a specific validator bond account
+   */
+  async getHistory(bondType, bondName, vote, options) {
+    const [legacyValidatorBondAccount] = web3_js.PublicKey.findProgramAddressSync(
+      [
+        Buffer.from("validator_bond" /* ValidatorBond */),
+        new web3_js.PublicKey(vote).toBuffer()
+      ],
+      this.programId
+    );
+    const validatorBond = this.pda.validatorBond(bondType, bondName, vote);
+    console.log("Derived legacy validator bond account:", legacyValidatorBondAccount.toBase58());
+    console.log("Derived new validator bond account:", validatorBond[0].toBase58());
+    console.log("Fetching history for legacy validator bond account:", legacyValidatorBondAccount.toBase58());
+    console.log("Fetching history for new validator bond account:", validatorBond[0].toBase58());
+    const legacySignatures = (await this.connection.getSignaturesForAddress(
+      legacyValidatorBondAccount,
+      {
+        limit: options?.limit || 1e3,
+        before: options?.before,
+        until: options?.until
+      },
+      "confirmed"
+    )).filter((sig) => !sig.err);
+    const newSignatures = (await this.connection.getSignaturesForAddress(
+      validatorBond[0],
+      {
+        limit: options?.limit || 1e3,
+        before: options?.before,
+        until: options?.until
+      },
+      "confirmed"
+    )).filter((sig) => !sig.err);
+    const signatureStrings = legacySignatures.map((sig) => sig.signature);
+    signatureStrings.push(...newSignatures.map((sig) => sig.signature));
+    const signatures = [...legacySignatures, ...newSignatures];
+    const BATCH_SIZE = 100;
+    const allTransactions = [];
+    for (let i = 0; i < signatureStrings.length; i += BATCH_SIZE) {
+      const batch = signatureStrings.slice(i, i + BATCH_SIZE);
+      const transactions = await this.connection.getParsedTransactions(
+        batch,
+        {
+          maxSupportedTransactionVersion: 0,
+          commitment: "confirmed"
+        }
+      );
+      allTransactions.push(...transactions);
+    }
+    const cluster = options?.cluster || "mainnet-beta";
+    const history = [];
+    for (const [idx, tx] of allTransactions.entries()) {
+      const sigInfo = signatures[idx];
+      if (!tx || !tx.meta || tx.meta.err !== null) {
+        continue;
+      }
+      try {
+        const slot = tx.slot || 0;
+        const instructions = tx.transaction.message.instructions;
+        for (const instruction of instructions) {
+          if ("programId" in instruction && instruction.programId.equals(this.options.programId ?? this.program.programId)) {
+            const ixData = instruction;
+            if ("parsed" in ixData && ixData.parsed) {
+              continue;
+            }
+            const data = ixData.data;
+            if (!data) {
+              continue;
+            }
+            let type = null;
+            let amount = 0;
+            try {
+              const dataBuffer = bytes.bs58.decode(data);
+              if (dataBuffer.length >= 8) {
+                const discriminator = dataBuffer.subarray(0, 8);
+                const legacyRegisterDiscriminator = this.getInstructionDiscriminator("register");
+                const legacyTopUpDiscriminator = this.getInstructionDiscriminator("topUp");
+                const legacyClaimDiscriminator = this.getInstructionDiscriminator("claim");
+                const legacyWithdrawDiscriminator = this.getInstructionDiscriminator("withdraw");
+                const bondRegisterDiscriminator = this.getInstructionDiscriminator("bondRegister");
+                const bondTopUpDiscriminator = this.getInstructionDiscriminator("bondTopUp");
+                const bondClaimDiscriminator = this.getInstructionDiscriminator("bondClaim");
+                const bondWithdrawDiscriminator = this.getInstructionDiscriminator("bondWithdraw");
+                console.log("Discriminator:", Buffer.from(discriminator).toString("hex"));
+                if (Buffer.from(discriminator).equals(Buffer.from(legacyRegisterDiscriminator)) || Buffer.from(discriminator).equals(Buffer.from(bondRegisterDiscriminator))) {
+                  type = "deposit" /* Deposit */;
+                  if (dataBuffer.length >= 16 && Buffer.from(discriminator).equals(Buffer.from(legacyRegisterDiscriminator))) {
+                    const amountBytes = dataBuffer.subarray(8, 16);
+                    const amountBN = new import_bn2.BN(amountBytes, "le");
+                    amount = amountBN.toNumber() / web3_js.LAMPORTS_PER_SOL;
+                  } else {
+                    amount = 0;
+                  }
+                } else if (dataBuffer.length >= 16) {
+                  const amountBytes = dataBuffer.subarray(8, 16);
+                  const amountBN = new import_bn2.BN(amountBytes, "le");
+                  amount = amountBN.toNumber() / web3_js.LAMPORTS_PER_SOL;
+                  if (Buffer.from(discriminator).equals(Buffer.from(legacyTopUpDiscriminator)) || Buffer.from(discriminator).equals(Buffer.from(bondTopUpDiscriminator))) {
+                    type = "deposit" /* Deposit */;
+                  } else if (Buffer.from(discriminator).equals(Buffer.from(legacyClaimDiscriminator)) || Buffer.from(discriminator).equals(Buffer.from(bondClaimDiscriminator))) {
+                    type = "compensation" /* Compensation */;
+                  } else if (Buffer.from(discriminator).equals(Buffer.from(legacyWithdrawDiscriminator)) || Buffer.from(discriminator).equals(Buffer.from(bondWithdrawDiscriminator))) {
+                    type = "withdrawal" /* Withdrawal */;
+                  }
+                }
+              }
+            } catch (e) {
+              console.warn("Failed to decode instruction data:", e);
+            }
+            if (type && (amount > 0 || type === "deposit" /* Deposit */)) {
+              history.push({
+                signature: sigInfo.signature,
+                slot,
+                epoch: slotToEpoch(slot, cluster),
+                type,
+                amount
+              });
+            }
+          }
+        }
+      } catch (error) {
+        console.error(`Error processing transaction ${sigInfo.signature}:`, error);
+      }
+    }
+    return history.toSorted((a, b) => b.slot - a.slot);
+  }
+  /**
+   * Get full transaction history by paginating through results
+   * @param bondType
+   * @param bondName
+   * @param voteAccount
+   * @param pageSize
+   */
+  async getFullHistory(bondType, bondName, voteAccount, pageSize = 100) {
+    const allHistory = [];
+    let before;
+    while (true) {
+      const batch = await this.getHistory(bondType, bondName, voteAccount, {
+        limit: pageSize,
+        before
+      });
+      if (batch.length === 0) {
+        break;
+      }
+      allHistory.push(...batch);
+      before = batch.at(-1)?.signature;
+      if (batch.length < pageSize) {
+        break;
+      }
+    }
+    return allHistory;
+  }
+  /**
+   * Get instruction discriminator from IDL
+   * @param instructionName
+   * @private
+   */
+  getInstructionDiscriminator(instructionName) {
+    const legacyDiscriminators = {
+      register: [211, 124, 67, 15, 211, 194, 178, 240],
+      topUp: [181, 157, 89, 67, 143, 182, 52, 72],
+      claim: [62, 198, 214, 193, 213, 159, 108, 210],
+      withdraw: [183, 18, 70, 156, 148, 109, 161, 34]
+    };
+    if (legacyDiscriminators[instructionName]) {
+      return new Uint8Array(legacyDiscriminators[instructionName]);
+    }
+    if (instructionName.startsWith("bond")) {
+      const instruction = this.program.idl.instructions.find((ix) => ix.name === instructionName);
+      if (!instruction) {
+        throw new Error(`Instruction ${instructionName} not found in IDL`);
+      }
+      if (!instruction.discriminator || !Array.isArray(instruction.discriminator)) {
+        throw new Error(`Discriminator not found for instruction ${instructionName}`);
+      }
+      return new Uint8Array(instruction.discriminator);
+    }
+    throw new Error(`Unknown instruction: ${instructionName}`);
+  }
   /**
    * Get bond state stats
    * @param state