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

package/dist/index.d.mts

@@ -3,8 +3,6 @@ import { PublicKey, Connection, Keypair, TransactionInstruction } from '@solana/
 
 type Config = {
     rpcUrl: string;
-    programId: PublicKey;
-    reserveAddress: PublicKey;
 };
 type ValidatorBondAccount = {
     identity: PublicKey;
@@ -18,6 +16,7 @@ type ValidatorBondAccount = {
 };
 type InitializeProps = {
     authority: PublicKey;
+    reserveAddress: PublicKey;
 };
 type RegisterValidatorProps = {
     creator: PublicKey;
@@ -90,7 +89,7 @@ declare enum BondTransactionType {
  * IDL can be found at `target/idl/jbond.json`.
  */
 type Jbond = {
-    address: '4a3YovKEfm4jWhczCzJciHXL1xVkXWfGQjRCaMft7M4G';
+    address: '8vrqsFHnDdjMYMwahytRzmmYgRqCMmka8X6DJUXGQzWr';
     metadata: {
         name: 'jbond';
         version: '0.1.0';
@@ -321,6 +320,10 @@ type Jbond = {
                     name: 'destination';
                     writable: true;
                 },
+                {
+                    name: 'epochSchedule';
+                    address: 'SysvarEpochSchedu1e111111111111111111111111';
+                },
                 {
                     name: 'systemProgram';
                     address: '11111111111111111111111111111111';
@@ -667,6 +670,11 @@ type Jbond = {
             code: 6008;
             name: 'unauthorized';
             msg: 'unauthorized';
+        },
+        {
+            code: 6009;
+            name: 'withdrawalLockedNearEpochEnd';
+            msg: 'Withdrawals are locked near the end of the epoch.';
         }
     ];
     types: [
@@ -851,20 +859,37 @@ type Jbond = {
     ];
 };
 
+declare enum BondClientEnv {
+    DEV = "dev",
+    PROD = "prod"
+}
 declare class JBondClient {
     connection: Connection;
     program: Program<Jbond>;
     provider: AnchorProvider;
     config: Config;
-    constructor(config: Config, wallet?: Wallet);
+    readonly options: ClientOptions;
+    constructor(config: Config, wallet?: Wallet, options?: ClientOptions);
     /**
      * Creates an instance of `JBondClient` using a provided connection and wallet.
      */
-    static fromWallet(config: Config, wallet?: Wallet): JBondClient;
+    static fromWallet(config: Config, wallet?: Wallet, options?: ClientOptions): JBondClient;
     /**
      * Creates an instance of `JBondClient` using the provided connection and keypair.
      */
-    static fromKeypair(config: Config, keypair: Keypair): JBondClient;
+    static fromKeypair(config: Config, keypair: Keypair, options?: ClientOptions): JBondClient;
+    /**
+     * Get the current program ID.
+     */
+    get programId(): PublicKey;
+    /**
+     * Set the environment.
+     */
+    env(env: BondClientEnv): this;
+    /**
+     * Configure a specific option.
+     */
+    configure<K extends keyof ClientOptions>(key: K, val: ClientOptions[K]): this;
     getGlobalStatePDA(): [PublicKey, number];
     getValidatorBondPDA(voteAccount: PublicKey): [PublicKey, number];
     buildInitializeInstruction(props: InitializeProps): Promise<TransactionInstruction>;
@@ -891,9 +916,10 @@ declare class JBondClient {
         authority: string;
         totalValidators: number;
         totalWithdrawn: number;
+        reserveAddress: string;
     } | null>;
     getCurrentEpoch(): Promise<number>;
-    initialize(authority?: PublicKey): Promise<string>;
+    initialize(reserveAddress: PublicKey, authority?: PublicKey): Promise<string>;
     registerValidator(voteAccount: PublicKey, initialCollateral: number, withdrawalAuthority?: PublicKey, identity?: PublicKey): Promise<string>;
     topUpCollateral(voteAccount: PublicKey, amount: number, validator?: PublicKey): Promise<string>;
     withdrawCollateral(voteAccount: PublicKey, destination: PublicKey, amount: number, withdrawalAuthority?: PublicKey): Promise<string>;
@@ -914,11 +940,12 @@ declare class JBondClient {
     getFullHistory(voteAccount: PublicKey, pageSize?: number): Promise<TransactionHistoryItem[]>;
     private getInstructionDiscriminator;
 }
+type ClientOptions = {
+    programId?: PublicKey;
+    debug?: boolean;
+} & Record<string, any>;
 
-declare const PROGRAM_ID = "4a3YovKEfm4jWhczCzJciHXL1xVkXWfGQjRCaMft7M4G";
-declare const RESERVE_ADDRESS = "61mS9nEir6jx6cvte6NzQpyrFk3Fj4krMNLuHhi4tjJz";
-
-declare function loadConfig(): Config;
-declare function loadKeypair(keypairPath: string): Keypair;
+declare const PROGRAM_ID: PublicKey;
+declare const DEV_PROGRAM_ID: PublicKey;
 
-export { BondTransactionType, type Config, type EpochHistoryItem, type GetHistoryGroupedProps, type GetHistoryProps, type GlobalState, type InitializeProps, JBondClient, type Jbond, PROGRAM_ID, RESERVE_ADDRESS, type RegisterValidatorProps, type TopUpCollateralProps, type TransactionHistoryItem, type ValidatorBondAccount, type WithdrawCollateralProps, type WithdrawCompensationProps, loadConfig, loadKeypair };
+export { BondClientEnv, BondTransactionType, type ClientOptions, type Config, DEV_PROGRAM_ID, type EpochHistoryItem, type GetHistoryGroupedProps, type GetHistoryProps, type GlobalState, type InitializeProps, JBondClient, type Jbond, PROGRAM_ID, type RegisterValidatorProps, type TopUpCollateralProps, type TransactionHistoryItem, type ValidatorBondAccount, type WithdrawCollateralProps, type WithdrawCompensationProps };

package/dist/index.d.ts

@@ -3,8 +3,6 @@ import { PublicKey, Connection, Keypair, TransactionInstruction } from '@solana/
 
 type Config = {
     rpcUrl: string;
-    programId: PublicKey;
-    reserveAddress: PublicKey;
 };
 type ValidatorBondAccount = {
     identity: PublicKey;
@@ -18,6 +16,7 @@ type ValidatorBondAccount = {
 };
 type InitializeProps = {
     authority: PublicKey;
+    reserveAddress: PublicKey;
 };
 type RegisterValidatorProps = {
     creator: PublicKey;
@@ -90,7 +89,7 @@ declare enum BondTransactionType {
  * IDL can be found at `target/idl/jbond.json`.
  */
 type Jbond = {
-    address: '4a3YovKEfm4jWhczCzJciHXL1xVkXWfGQjRCaMft7M4G';
+    address: '8vrqsFHnDdjMYMwahytRzmmYgRqCMmka8X6DJUXGQzWr';
     metadata: {
         name: 'jbond';
         version: '0.1.0';
@@ -321,6 +320,10 @@ type Jbond = {
                     name: 'destination';
                     writable: true;
                 },
+                {
+                    name: 'epochSchedule';
+                    address: 'SysvarEpochSchedu1e111111111111111111111111';
+                },
                 {
                     name: 'systemProgram';
                     address: '11111111111111111111111111111111';
@@ -667,6 +670,11 @@ type Jbond = {
             code: 6008;
             name: 'unauthorized';
             msg: 'unauthorized';
+        },
+        {
+            code: 6009;
+            name: 'withdrawalLockedNearEpochEnd';
+            msg: 'Withdrawals are locked near the end of the epoch.';
         }
     ];
     types: [
@@ -851,20 +859,37 @@ type Jbond = {
     ];
 };
 
+declare enum BondClientEnv {
+    DEV = "dev",
+    PROD = "prod"
+}
 declare class JBondClient {
     connection: Connection;
     program: Program<Jbond>;
     provider: AnchorProvider;
     config: Config;
-    constructor(config: Config, wallet?: Wallet);
+    readonly options: ClientOptions;
+    constructor(config: Config, wallet?: Wallet, options?: ClientOptions);
     /**
      * Creates an instance of `JBondClient` using a provided connection and wallet.
      */
-    static fromWallet(config: Config, wallet?: Wallet): JBondClient;
+    static fromWallet(config: Config, wallet?: Wallet, options?: ClientOptions): JBondClient;
     /**
      * Creates an instance of `JBondClient` using the provided connection and keypair.
      */
-    static fromKeypair(config: Config, keypair: Keypair): JBondClient;
+    static fromKeypair(config: Config, keypair: Keypair, options?: ClientOptions): JBondClient;
+    /**
+     * Get the current program ID.
+     */
+    get programId(): PublicKey;
+    /**
+     * Set the environment.
+     */
+    env(env: BondClientEnv): this;
+    /**
+     * Configure a specific option.
+     */
+    configure<K extends keyof ClientOptions>(key: K, val: ClientOptions[K]): this;
     getGlobalStatePDA(): [PublicKey, number];
     getValidatorBondPDA(voteAccount: PublicKey): [PublicKey, number];
     buildInitializeInstruction(props: InitializeProps): Promise<TransactionInstruction>;
@@ -891,9 +916,10 @@ declare class JBondClient {
         authority: string;
         totalValidators: number;
         totalWithdrawn: number;
+        reserveAddress: string;
     } | null>;
     getCurrentEpoch(): Promise<number>;
-    initialize(authority?: PublicKey): Promise<string>;
+    initialize(reserveAddress: PublicKey, authority?: PublicKey): Promise<string>;
     registerValidator(voteAccount: PublicKey, initialCollateral: number, withdrawalAuthority?: PublicKey, identity?: PublicKey): Promise<string>;
     topUpCollateral(voteAccount: PublicKey, amount: number, validator?: PublicKey): Promise<string>;
     withdrawCollateral(voteAccount: PublicKey, destination: PublicKey, amount: number, withdrawalAuthority?: PublicKey): Promise<string>;
@@ -914,11 +940,12 @@ declare class JBondClient {
     getFullHistory(voteAccount: PublicKey, pageSize?: number): Promise<TransactionHistoryItem[]>;
     private getInstructionDiscriminator;
 }
+type ClientOptions = {
+    programId?: PublicKey;
+    debug?: boolean;
+} & Record<string, any>;
 
-declare const PROGRAM_ID = "4a3YovKEfm4jWhczCzJciHXL1xVkXWfGQjRCaMft7M4G";
-declare const RESERVE_ADDRESS = "61mS9nEir6jx6cvte6NzQpyrFk3Fj4krMNLuHhi4tjJz";
-
-declare function loadConfig(): Config;
-declare function loadKeypair(keypairPath: string): Keypair;
+declare const PROGRAM_ID: PublicKey;
+declare const DEV_PROGRAM_ID: PublicKey;
 
-export { BondTransactionType, type Config, type EpochHistoryItem, type GetHistoryGroupedProps, type GetHistoryProps, type GlobalState, type InitializeProps, JBondClient, type Jbond, PROGRAM_ID, RESERVE_ADDRESS, type RegisterValidatorProps, type TopUpCollateralProps, type TransactionHistoryItem, type ValidatorBondAccount, type WithdrawCollateralProps, type WithdrawCompensationProps, loadConfig, loadKeypair };
+export { BondClientEnv, BondTransactionType, type ClientOptions, type Config, DEV_PROGRAM_ID, type EpochHistoryItem, type GetHistoryGroupedProps, type GetHistoryProps, type GlobalState, type InitializeProps, JBondClient, type Jbond, PROGRAM_ID, type RegisterValidatorProps, type TopUpCollateralProps, type TransactionHistoryItem, type ValidatorBondAccount, type WithdrawCollateralProps, type WithdrawCompensationProps };

package/dist/index.js

@@ -3,13 +3,14 @@
 var anchor = require('@coral-xyz/anchor');
 var web3_js = require('@solana/web3.js');
 var bs58 = require('bs58');
-var fs = require('fs');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var bs58__default = /*#__PURE__*/_interopDefault(bs58);
 
 // src/client.ts
+var PROGRAM_ID = new web3_js.PublicKey("8vrqsFHnDdjMYMwahytRzmmYgRqCMmka8X6DJUXGQzWr");
+var DEV_PROGRAM_ID = new web3_js.PublicKey("8vrqsFHnDdjMYMwahytRzmmYgRqCMmka8X6DJUXGQzWr");
 
 // src/helpers.ts
 var SLOTS_PER_EPOCH_MAINNET = 432e3;
@@ -21,7 +22,7 @@ function slotToEpoch(slot, cluster) {
 
 // src/idl/jbond.json
 var jbond_default = {
-  address: "4a3YovKEfm4jWhczCzJciHXL1xVkXWfGQjRCaMft7M4G",
+  address: "8vrqsFHnDdjMYMwahytRzmmYgRqCMmka8X6DJUXGQzWr",
   metadata: {
     name: "jbond",
     version: "0.1.0",
@@ -252,6 +253,10 @@ var jbond_default = {
           name: "destination",
           writable: true
         },
+        {
+          name: "epoch_schedule",
+          address: "SysvarEpochSchedu1e111111111111111111111111"
+        },
         {
           name: "system_program",
           address: "11111111111111111111111111111111"
@@ -598,6 +603,11 @@ var jbond_default = {
       code: 6008,
       name: "Unauthorized",
       msg: "Unauthorized"
+    },
+    {
+      code: 6009,
+      name: "WithdrawalLockedNearEpochEnd",
+      msg: "Withdrawals are locked near the end of the epoch."
     }
   ],
   types: [
@@ -822,14 +832,21 @@ var NodeWallet = class {
 };
 
 // src/client.ts
+var BondClientEnv = /* @__PURE__ */ ((BondClientEnv2) => {
+  BondClientEnv2["DEV"] = "dev";
+  BondClientEnv2["PROD"] = "prod";
+  return BondClientEnv2;
+})(BondClientEnv || {});
 var JBondClient = class _JBondClient {
   connection;
   program;
   provider;
   config;
-  constructor(config, wallet) {
+  options;
+  constructor(config, wallet, options) {
     this.config = config;
     this.connection = new web3_js.Connection(config.rpcUrl, "confirmed");
+    this.options = options ?? {};
     this.provider = new anchor.AnchorProvider(
       this.connection,
       // @ts-expect-error support anonymous
@@ -841,20 +858,42 @@ var JBondClient = class _JBondClient {
   /**
    * Creates an instance of `JBondClient` using a provided connection and wallet.
    */
-  static fromWallet(config, wallet) {
-    return new this(config, wallet);
+  static fromWallet(config, wallet, options) {
+    return new this(config, wallet, options);
   }
   /**
    * Creates an instance of `JBondClient` using the provided connection and keypair.
    */
-  static fromKeypair(config, keypair) {
-    return _JBondClient.fromWallet(config, new NodeWallet(keypair));
+  static fromKeypair(config, keypair, options) {
+    return _JBondClient.fromWallet(config, new NodeWallet(keypair), options);
+  }
+  /**
+   * Get the current program ID.
+   */
+  get programId() {
+    return this.options.programId ?? PROGRAM_ID;
+  }
+  /**
+   * Set the environment.
+   */
+  env(env) {
+    if (env === "prod" /* PROD */) {
+      return this.configure("programId", PROGRAM_ID);
+    }
+    return this.configure("programId", DEV_PROGRAM_ID);
+  }
+  /**
+   * Configure a specific option.
+   */
+  configure(key, val) {
+    this.options[key] = val;
+    return this;
   }
   // Get PDA for global state
   getGlobalStatePDA() {
     return web3_js.PublicKey.findProgramAddressSync(
       [Buffer.from("global_state")],
-      this.program.programId
+      this.options.programId ?? this.program.programId
     );
   }
   // Get PDA for validator bond account
@@ -864,16 +903,17 @@ var JBondClient = class _JBondClient {
         Buffer.from("validator_bond"),
         voteAccount.toBuffer()
       ],
-      this.program.programId
+      this.options.programId ?? this.program.programId
     );
   }
   // Build initialize instruction
   async buildInitializeInstruction(props) {
     const [globalState] = this.getGlobalStatePDA();
+    const { authority, reserveAddress } = props;
     return this.program.methods.initialize().accountsStrict({
       globalState,
-      authority: props.authority,
-      reserve: this.config.reserveAddress,
+      authority,
+      reserve: reserveAddress,
       systemProgram: web3_js.SystemProgram.programId
     }).instruction();
   }
@@ -915,19 +955,24 @@ var JBondClient = class _JBondClient {
       validatorBondAccount: validatorBondAccountAddress,
       withdrawalAuthority: user,
       destination,
+      epochSchedule: web3_js.SYSVAR_EPOCH_SCHEDULE_PUBKEY,
       systemProgram: web3_js.SystemProgram.programId
     }).instruction();
   }
   // Build withdraw compensation instruction
-  buildWithdrawCompensationInstruction(props) {
+  async buildWithdrawCompensationInstruction(props) {
     const { authority, voteAccount, amount } = props;
     const [globalState] = this.getGlobalStatePDA();
     const [validatorBondAccountAddress] = this.getValidatorBondPDA(voteAccount);
     const amountLamports = new anchor.BN(amount * web3_js.LAMPORTS_PER_SOL);
+    const reserveAddress = (await this.getGlobalState())?.reserveAddress;
+    if (!reserveAddress) {
+      throw new Error("Reserve address is not set in the global state. The program might not be initialized yet.");
+    }
     return this.program.methods.withdrawCompensation(amountLamports).accountsStrict({
       globalState,
       validatorBondAccount: validatorBondAccountAddress,
-      reserve: this.config.reserveAddress,
+      reserve: reserveAddress,
       authority,
       systemProgram: web3_js.SystemProgram.programId
     }).instruction();
@@ -994,7 +1039,8 @@ var JBondClient = class _JBondClient {
       return {
         authority: account.authority.toString(),
         totalValidators: account.totalValidators,
-        totalWithdrawn: account.totalWithdrawn.toNumber() / web3_js.LAMPORTS_PER_SOL
+        totalWithdrawn: account.totalWithdrawn.toNumber() / web3_js.LAMPORTS_PER_SOL,
+        reserveAddress: account.reserve.toString()
       };
     } catch {
       return null;
@@ -1006,9 +1052,9 @@ var JBondClient = class _JBondClient {
     return epochInfo.epoch;
   }
   // Helper methods for backward compatibility (can be removed if not needed)
-  async initialize(authority) {
+  async initialize(reserveAddress, authority) {
     const authorityPubkey = authority || this.provider.wallet.publicKey;
-    const ix = await this.buildInitializeInstruction({ authority: authorityPubkey });
+    const ix = await this.buildInitializeInstruction({ authority: authorityPubkey, reserveAddress });
     const tx = await this.provider.sendAndConfirm(
       new web3_js.Transaction().add(ix),
       []
@@ -1133,7 +1179,7 @@ var JBondClient = class _JBondClient {
         const slot = tx.slot || 0;
         const instructions = tx.transaction.message.instructions;
         for (const instruction of instructions) {
-          if ("programId" in instruction && instruction.programId.equals(this.program.programId)) {
+          if ("programId" in instruction && instruction.programId.equals(this.options.programId ?? this.program.programId)) {
             const ixData = instruction;
             if ("parsed" in ixData && ixData.parsed) {
               continue;
@@ -1228,38 +1274,10 @@ var JBondClient = class _JBondClient {
   }
 };
 
-// src/common.ts
-var PROGRAM_ID = "4a3YovKEfm4jWhczCzJciHXL1xVkXWfGQjRCaMft7M4G";
-var RESERVE_ADDRESS = "61mS9nEir6jx6cvte6NzQpyrFk3Fj4krMNLuHhi4tjJz";
-function loadConfig() {
-  const rpcUrl = process.env.SOLANA_RPC_URL || "https://api.devnet.solana.com";
-  const programId = new web3_js.PublicKey(
-    PROGRAM_ID
-  );
-  const reserveAddress = new web3_js.PublicKey(
-    RESERVE_ADDRESS
-  );
-  return {
-    rpcUrl,
-    programId,
-    reserveAddress
-  };
-}
-function loadKeypair(keypairPath) {
-  try {
-    const keypairString = fs.readFileSync(keypairPath, "utf8");
-    const keypairData = JSON.parse(keypairString);
-    return web3_js.Keypair.fromSecretKey(new Uint8Array(keypairData));
-  } catch (error) {
-    throw new Error(`Failed to load keypair from ${keypairPath}: ${error}`);
-  }
-}
-
+exports.BondClientEnv = BondClientEnv;
 exports.BondTransactionType = BondTransactionType;
+exports.DEV_PROGRAM_ID = DEV_PROGRAM_ID;
 exports.JBondClient = JBondClient;
 exports.PROGRAM_ID = PROGRAM_ID;
-exports.RESERVE_ADDRESS = RESERVE_ADDRESS;
-exports.loadConfig = loadConfig;
-exports.loadKeypair = loadKeypair;
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map