@jpool/bond-sdk 0.9.0-next.5 → 0.9.0-next.7

package/dist/index.d.mts

@@ -1,5 +1,4 @@
 import { Fee } from '@solana/spl-stake-pool/src/layouts';
-import * as _solana_web3_js from '@solana/web3.js';
 import { PublicKey, TransactionInstruction, Connection, PublicKeyInitData, Transaction, VersionedTransaction, Keypair } from '@solana/web3.js';
 import BN from 'bn.js';
 import { IdlTypes, IdlAccounts, Program, Provider } from '@coral-xyz/anchor';
@@ -1533,6 +1532,10 @@ type BondState = IdlAccounts<Jbond>['bondState'];
 type ValidatorBond = IdlAccounts<Jbond>['validatorBond'];
 type BondType = IdlTypes<Jbond>['bondType'];
 type CollateralType = IdlTypes<Jbond>['collateralType'];
+type BondStateStats = {
+    totalCollected: number;
+    totalMembers: number;
+};
 declare const bondTypeToSeed: {
     performance: Seeds;
     crowdfunding: Seeds;
@@ -1561,6 +1564,7 @@ type RegisterValidatorProps = {
 type TopUpCollateralProps = {
     bondType: BondType;
     name: string;
+    identity: PublicKey;
     voteAccount: PublicKey;
     collateral: BondCollateral;
     payer?: PublicKey;
@@ -1719,7 +1723,6 @@ declare class JBondClient {
      * Configure a specific option.
      */
     configureEnv<K extends keyof ClientOptions>(key: K, val: ClientOptions[K]): this;
-    private getAdapter;
     private getBondTypeSeed;
     /**
      * Program Derived Addresses (PDAs)
@@ -1788,55 +1791,40 @@ declare class JBondClient {
         bondType: BondType;
         name: string;
     }): Promise<string | undefined>;
-    buildBondGlobalStateInitializeInstruction(props: GlobalInitializeProps): Promise<_solana_web3_js.TransactionInstruction>;
+    buildBondGlobalStateInitializeIx(props: GlobalInitializeProps): Promise<TransactionInstruction>;
     /**
      * Build configure instruction
      */
-    buildGlobalConfigureInstruction(props: GlobalConfigureProps): Promise<_solana_web3_js.TransactionInstruction>;
+    buildGlobalConfigureInstruction(props: GlobalConfigureProps): Promise<TransactionInstruction>;
     /**
      * Build initialize instruction
      */
-    buildBondInitializeInstruction(props: BondInitializeProps): Promise<_solana_web3_js.TransactionInstruction>;
-    /**
-     * Build register validator instruction
-     */
-    buildRegisterValidatorInstruction(props: RegisterValidatorProps): Promise<_solana_web3_js.TransactionInstruction>;
-    /**
-     * Build top up collateral instruction
-     */
-    buildTopUpCollateralInstruction(props: TopUpCollateralProps): Promise<_solana_web3_js.TransactionInstruction>;
-    /**
-     * Build withdraw collateral instruction
-     */
-    buildWithdrawCollateralInstruction(props: WithdrawCollateralProps): Promise<_solana_web3_js.TransactionInstruction>;
-    /**
-     * Build claim compensation instruction
-     */
-    buildBondClaimInstruction(props: ClaimProps): Promise<_solana_web3_js.TransactionInstruction>;
-    /**
-     * Build configure instruction
-     */
-    buildConfigureInstruction(props: BondConfigureProps): Promise<_solana_web3_js.TransactionInstruction>;
-    /**
-     * Build set withdraw authority instruction
-     */
-    buildSetWithdrawAuthorityInstruction(props: SetWithdrawAuthorityProps): Promise<_solana_web3_js.TransactionInstruction>;
-    buildBondStartInstruction(props: {
+    buildBondInitializeIx(props: BondInitializeProps): Promise<TransactionInstruction>;
+    buildConfigureIx(props: BondConfigureProps): Promise<TransactionInstruction>;
+    buildRegisterIx(props: RegisterValidatorProps): Promise<TransactionInstruction>;
+    buildTopUpIXs(props: TopUpCollateralProps): Promise<TransactionInstruction[]>;
+    buildWithdrawIx(props: WithdrawCollateralProps): Promise<TransactionInstruction>;
+    buildClaimIx(props: ClaimProps): Promise<TransactionInstruction>;
+    buildSetWithdrawAuthorityIx(props: SetWithdrawAuthorityProps): Promise<TransactionInstruction>;
+    buildBondFinishIx(_props: {
         bondType: BondType;
         name: string;
-        duration_secs: number;
-    }): Promise<_solana_web3_js.TransactionInstruction>;
-    buildBondFinishInstruction(props: {
+    }): Promise<TransactionInstruction>;
+    buildBondStartIx(props: {
         bondType: BondType;
         name: string;
-    }): Promise<_solana_web3_js.TransactionInstruction>;
+        duration_secs: number;
+    }): Promise<TransactionInstruction>;
     /**
      * Fetch global state or throw if not found
      */
     getGlobalState(): Promise<GlobalState>;
     getBondState(bondType: BondType, bondName: string): Promise<BondState>;
-    getAllBondStates(_bondType: BondType): Promise<BondState[]>;
-    getBondStateSessionStatus(bondType: BondType, bondName: string): Promise<SessionStatus>;
+    /**
+     * Get all bond states with total collected collateral
+     */
+    getAllBondStates(_bondType: BondType): Promise<Array<[BondState, number]>>;
+    private getValidatorBondsByState;
     /**
      * Fetch validator bond data or null if not found
      * @param bondType
@@ -1873,6 +1861,7 @@ declare class JBondClient {
      * Throws an error if no user is available.
      */
     private ensureUser;
+    private lamports;
 }
 
-export { BondClientEnv, type BondCollateral, type BondConfigureProps, type BondInitializeProps, type BondState, BondTransactionType, type BondType, BondTypeVariant, type ClaimProps, type ClientOptions, type CollateralType, ENV_PROGRAM_ID, type EpochHistoryItem, type GetHistoryGroupedProps, type GetHistoryProps, type GlobalConfigureProps, type GlobalInitializeProps, type GlobalState, JBondClient, JPOOL_STAKE_POOL, type Jbond, NodeWallet, type RegisterValidatorProps, Seeds, SessionStatus, type SetWithdrawAuthorityProps, type TopUpCollateralProps, type TransactionHistoryItem, type ValidatorBond, type WithdrawCollateralProps, bondTypeToSeed };
+export { BondClientEnv, type BondCollateral, type BondConfigureProps, type BondInitializeProps, type BondState, type BondStateStats, BondTransactionType, type BondType, BondTypeVariant, type ClaimProps, type ClientOptions, type CollateralType, ENV_PROGRAM_ID, type EpochHistoryItem, type GetHistoryGroupedProps, type GetHistoryProps, type GlobalConfigureProps, type GlobalInitializeProps, type GlobalState, JBondClient, JPOOL_STAKE_POOL, type Jbond, NodeWallet, type RegisterValidatorProps, Seeds, SessionStatus, type SetWithdrawAuthorityProps, type TopUpCollateralProps, type TransactionHistoryItem, type ValidatorBond, type WithdrawCollateralProps, bondTypeToSeed };

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 import { Fee } from '@solana/spl-stake-pool/src/layouts';
-import * as _solana_web3_js from '@solana/web3.js';
 import { PublicKey, TransactionInstruction, Connection, PublicKeyInitData, Transaction, VersionedTransaction, Keypair } from '@solana/web3.js';
 import BN from 'bn.js';
 import { IdlTypes, IdlAccounts, Program, Provider } from '@coral-xyz/anchor';
@@ -1533,6 +1532,10 @@ type BondState = IdlAccounts<Jbond>['bondState'];
 type ValidatorBond = IdlAccounts<Jbond>['validatorBond'];
 type BondType = IdlTypes<Jbond>['bondType'];
 type CollateralType = IdlTypes<Jbond>['collateralType'];
+type BondStateStats = {
+    totalCollected: number;
+    totalMembers: number;
+};
 declare const bondTypeToSeed: {
     performance: Seeds;
     crowdfunding: Seeds;
@@ -1561,6 +1564,7 @@ type RegisterValidatorProps = {
 type TopUpCollateralProps = {
     bondType: BondType;
     name: string;
+    identity: PublicKey;
     voteAccount: PublicKey;
     collateral: BondCollateral;
     payer?: PublicKey;
@@ -1719,7 +1723,6 @@ declare class JBondClient {
      * Configure a specific option.
      */
     configureEnv<K extends keyof ClientOptions>(key: K, val: ClientOptions[K]): this;
-    private getAdapter;
     private getBondTypeSeed;
     /**
      * Program Derived Addresses (PDAs)
@@ -1788,55 +1791,40 @@ declare class JBondClient {
         bondType: BondType;
         name: string;
     }): Promise<string | undefined>;
-    buildBondGlobalStateInitializeInstruction(props: GlobalInitializeProps): Promise<_solana_web3_js.TransactionInstruction>;
+    buildBondGlobalStateInitializeIx(props: GlobalInitializeProps): Promise<TransactionInstruction>;
     /**
      * Build configure instruction
      */
-    buildGlobalConfigureInstruction(props: GlobalConfigureProps): Promise<_solana_web3_js.TransactionInstruction>;
+    buildGlobalConfigureInstruction(props: GlobalConfigureProps): Promise<TransactionInstruction>;
     /**
      * Build initialize instruction
      */
-    buildBondInitializeInstruction(props: BondInitializeProps): Promise<_solana_web3_js.TransactionInstruction>;
-    /**
-     * Build register validator instruction
-     */
-    buildRegisterValidatorInstruction(props: RegisterValidatorProps): Promise<_solana_web3_js.TransactionInstruction>;
-    /**
-     * Build top up collateral instruction
-     */
-    buildTopUpCollateralInstruction(props: TopUpCollateralProps): Promise<_solana_web3_js.TransactionInstruction>;
-    /**
-     * Build withdraw collateral instruction
-     */
-    buildWithdrawCollateralInstruction(props: WithdrawCollateralProps): Promise<_solana_web3_js.TransactionInstruction>;
-    /**
-     * Build claim compensation instruction
-     */
-    buildBondClaimInstruction(props: ClaimProps): Promise<_solana_web3_js.TransactionInstruction>;
-    /**
-     * Build configure instruction
-     */
-    buildConfigureInstruction(props: BondConfigureProps): Promise<_solana_web3_js.TransactionInstruction>;
-    /**
-     * Build set withdraw authority instruction
-     */
-    buildSetWithdrawAuthorityInstruction(props: SetWithdrawAuthorityProps): Promise<_solana_web3_js.TransactionInstruction>;
-    buildBondStartInstruction(props: {
+    buildBondInitializeIx(props: BondInitializeProps): Promise<TransactionInstruction>;
+    buildConfigureIx(props: BondConfigureProps): Promise<TransactionInstruction>;
+    buildRegisterIx(props: RegisterValidatorProps): Promise<TransactionInstruction>;
+    buildTopUpIXs(props: TopUpCollateralProps): Promise<TransactionInstruction[]>;
+    buildWithdrawIx(props: WithdrawCollateralProps): Promise<TransactionInstruction>;
+    buildClaimIx(props: ClaimProps): Promise<TransactionInstruction>;
+    buildSetWithdrawAuthorityIx(props: SetWithdrawAuthorityProps): Promise<TransactionInstruction>;
+    buildBondFinishIx(_props: {
         bondType: BondType;
         name: string;
-        duration_secs: number;
-    }): Promise<_solana_web3_js.TransactionInstruction>;
-    buildBondFinishInstruction(props: {
+    }): Promise<TransactionInstruction>;
+    buildBondStartIx(props: {
         bondType: BondType;
         name: string;
-    }): Promise<_solana_web3_js.TransactionInstruction>;
+        duration_secs: number;
+    }): Promise<TransactionInstruction>;
     /**
      * Fetch global state or throw if not found
      */
     getGlobalState(): Promise<GlobalState>;
     getBondState(bondType: BondType, bondName: string): Promise<BondState>;
-    getAllBondStates(_bondType: BondType): Promise<BondState[]>;
-    getBondStateSessionStatus(bondType: BondType, bondName: string): Promise<SessionStatus>;
+    /**
+     * Get all bond states with total collected collateral
+     */
+    getAllBondStates(_bondType: BondType): Promise<Array<[BondState, number]>>;
+    private getValidatorBondsByState;
     /**
      * Fetch validator bond data or null if not found
      * @param bondType
@@ -1873,6 +1861,7 @@ declare class JBondClient {
      * Throws an error if no user is available.
      */
     private ensureUser;
+    private lamports;
 }
 
-export { BondClientEnv, type BondCollateral, type BondConfigureProps, type BondInitializeProps, type BondState, BondTransactionType, type BondType, BondTypeVariant, type ClaimProps, type ClientOptions, type CollateralType, ENV_PROGRAM_ID, type EpochHistoryItem, type GetHistoryGroupedProps, type GetHistoryProps, type GlobalConfigureProps, type GlobalInitializeProps, type GlobalState, JBondClient, JPOOL_STAKE_POOL, type Jbond, NodeWallet, type RegisterValidatorProps, Seeds, SessionStatus, type SetWithdrawAuthorityProps, type TopUpCollateralProps, type TransactionHistoryItem, type ValidatorBond, type WithdrawCollateralProps, bondTypeToSeed };
+export { BondClientEnv, type BondCollateral, type BondConfigureProps, type BondInitializeProps, type BondState, type BondStateStats, BondTransactionType, type BondType, BondTypeVariant, type ClaimProps, type ClientOptions, type CollateralType, ENV_PROGRAM_ID, type EpochHistoryItem, type GetHistoryGroupedProps, type GetHistoryProps, type GlobalConfigureProps, type GlobalInitializeProps, type GlobalState, JBondClient, JPOOL_STAKE_POOL, type Jbond, NodeWallet, type RegisterValidatorProps, Seeds, SessionStatus, type SetWithdrawAuthorityProps, type TopUpCollateralProps, type TransactionHistoryItem, type ValidatorBond, type WithdrawCollateralProps, bondTypeToSeed };