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

package/dist/index.d.mts

@@ -3,6 +3,8 @@ import { PublicKey, Connection, Keypair, TransactionInstruction } from '@solana/
 
 type Config = {
     rpcUrl: string;
+    programId: PublicKey;
+    reserveAddress: PublicKey;
 };
 type ValidatorBondAccount = {
     identity: PublicKey;
@@ -16,7 +18,6 @@ type ValidatorBondAccount = {
 };
 type InitializeProps = {
     authority: PublicKey;
-    reserveAddress: PublicKey;
 };
 type RegisterValidatorProps = {
     creator: PublicKey;
@@ -859,37 +860,20 @@ type Jbond = {
     ];
 };
 
-declare enum BondClientEnv {
-    DEV = "dev",
-    PROD = "prod"
-}
 declare class JBondClient {
     connection: Connection;
     program: Program<Jbond>;
     provider: AnchorProvider;
     config: Config;
-    readonly options: ClientOptions;
-    constructor(config: Config, wallet?: Wallet, options?: ClientOptions);
+    constructor(config: Config, wallet?: Wallet);
     /**
      * Creates an instance of `JBondClient` using a provided connection and wallet.
      */
-    static fromWallet(config: Config, wallet?: Wallet, options?: ClientOptions): JBondClient;
+    static fromWallet(config: Config, wallet?: Wallet): JBondClient;
     /**
      * Creates an instance of `JBondClient` using the provided connection and keypair.
      */
-    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;
+    static fromKeypair(config: Config, keypair: Keypair): JBondClient;
     getGlobalStatePDA(): [PublicKey, number];
     getValidatorBondPDA(voteAccount: PublicKey): [PublicKey, number];
     buildInitializeInstruction(props: InitializeProps): Promise<TransactionInstruction>;
@@ -916,10 +900,9 @@ declare class JBondClient {
         authority: string;
         totalValidators: number;
         totalWithdrawn: number;
-        reserveAddress: string;
     } | null>;
     getCurrentEpoch(): Promise<number>;
-    initialize(reserveAddress: PublicKey, authority?: PublicKey): Promise<string>;
+    initialize(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>;
@@ -940,12 +923,11 @@ 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: PublicKey;
-declare const DEV_PROGRAM_ID: PublicKey;
+declare const PROGRAM_ID = "8vrqsFHnDdjMYMwahytRzmmYgRqCMmka8X6DJUXGQzWr";
+declare const RESERVE_ADDRESS = "61mS9nEir6jx6cvte6NzQpyrFk3Fj4krMNLuHhi4tjJz";
+
+declare function loadConfig(): Config;
+declare function loadKeypair(keypairPath: string): Keypair;
 
-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 };
+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 };

package/dist/index.d.ts

@@ -3,6 +3,8 @@ import { PublicKey, Connection, Keypair, TransactionInstruction } from '@solana/
 
 type Config = {
     rpcUrl: string;
+    programId: PublicKey;
+    reserveAddress: PublicKey;
 };
 type ValidatorBondAccount = {
     identity: PublicKey;
@@ -16,7 +18,6 @@ type ValidatorBondAccount = {
 };
 type InitializeProps = {
     authority: PublicKey;
-    reserveAddress: PublicKey;
 };
 type RegisterValidatorProps = {
     creator: PublicKey;
@@ -859,37 +860,20 @@ type Jbond = {
     ];
 };
 
-declare enum BondClientEnv {
-    DEV = "dev",
-    PROD = "prod"
-}
 declare class JBondClient {
     connection: Connection;
     program: Program<Jbond>;
     provider: AnchorProvider;
     config: Config;
-    readonly options: ClientOptions;
-    constructor(config: Config, wallet?: Wallet, options?: ClientOptions);
+    constructor(config: Config, wallet?: Wallet);
     /**
      * Creates an instance of `JBondClient` using a provided connection and wallet.
      */
-    static fromWallet(config: Config, wallet?: Wallet, options?: ClientOptions): JBondClient;
+    static fromWallet(config: Config, wallet?: Wallet): JBondClient;
     /**
      * Creates an instance of `JBondClient` using the provided connection and keypair.
      */
-    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;
+    static fromKeypair(config: Config, keypair: Keypair): JBondClient;
     getGlobalStatePDA(): [PublicKey, number];
     getValidatorBondPDA(voteAccount: PublicKey): [PublicKey, number];
     buildInitializeInstruction(props: InitializeProps): Promise<TransactionInstruction>;
@@ -916,10 +900,9 @@ declare class JBondClient {
         authority: string;
         totalValidators: number;
         totalWithdrawn: number;
-        reserveAddress: string;
     } | null>;
     getCurrentEpoch(): Promise<number>;
-    initialize(reserveAddress: PublicKey, authority?: PublicKey): Promise<string>;
+    initialize(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>;
@@ -940,12 +923,11 @@ 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: PublicKey;
-declare const DEV_PROGRAM_ID: PublicKey;
+declare const PROGRAM_ID = "8vrqsFHnDdjMYMwahytRzmmYgRqCMmka8X6DJUXGQzWr";
+declare const RESERVE_ADDRESS = "61mS9nEir6jx6cvte6NzQpyrFk3Fj4krMNLuHhi4tjJz";
+
+declare function loadConfig(): Config;
+declare function loadKeypair(keypairPath: string): Keypair;
 
-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 };
+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 };

package/dist/index.js

@@ -3,14 +3,13 @@
 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;
@@ -832,21 +831,14 @@ 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;
-  options;
-  constructor(config, wallet, options) {
+  constructor(config, wallet) {
     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
@@ -858,42 +850,20 @@ var JBondClient = class _JBondClient {
   /**
    * Creates an instance of `JBondClient` using a provided connection and wallet.
    */
-  static fromWallet(config, wallet, options) {
-    return new this(config, wallet, options);
+  static fromWallet(config, wallet) {
+    return new this(config, wallet);
   }
   /**
    * Creates an instance of `JBondClient` using the provided connection and 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;
+  static fromKeypair(config, keypair) {
+    return _JBondClient.fromWallet(config, new NodeWallet(keypair));
   }
   // Get PDA for global state
   getGlobalStatePDA() {
     return web3_js.PublicKey.findProgramAddressSync(
       [Buffer.from("global_state")],
-      this.options.programId ?? this.program.programId
+      this.program.programId
     );
   }
   // Get PDA for validator bond account
@@ -903,17 +873,16 @@ var JBondClient = class _JBondClient {
         Buffer.from("validator_bond"),
         voteAccount.toBuffer()
       ],
-      this.options.programId ?? this.program.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,
-      reserve: reserveAddress,
+      authority: props.authority,
+      reserve: this.config.reserveAddress,
       systemProgram: web3_js.SystemProgram.programId
     }).instruction();
   }
@@ -960,19 +929,15 @@ var JBondClient = class _JBondClient {
     }).instruction();
   }
   // Build withdraw compensation instruction
-  async buildWithdrawCompensationInstruction(props) {
+  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: reserveAddress,
+      reserve: this.config.reserveAddress,
       authority,
       systemProgram: web3_js.SystemProgram.programId
     }).instruction();
@@ -1039,8 +1004,7 @@ var JBondClient = class _JBondClient {
       return {
         authority: account.authority.toString(),
         totalValidators: account.totalValidators,
-        totalWithdrawn: account.totalWithdrawn.toNumber() / web3_js.LAMPORTS_PER_SOL,
-        reserveAddress: account.reserve.toString()
+        totalWithdrawn: account.totalWithdrawn.toNumber() / web3_js.LAMPORTS_PER_SOL
       };
     } catch {
       return null;
@@ -1052,9 +1016,9 @@ var JBondClient = class _JBondClient {
     return epochInfo.epoch;
   }
   // Helper methods for backward compatibility (can be removed if not needed)
-  async initialize(reserveAddress, authority) {
+  async initialize(authority) {
     const authorityPubkey = authority || this.provider.wallet.publicKey;
-    const ix = await this.buildInitializeInstruction({ authority: authorityPubkey, reserveAddress });
+    const ix = await this.buildInitializeInstruction({ authority: authorityPubkey });
     const tx = await this.provider.sendAndConfirm(
       new web3_js.Transaction().add(ix),
       []
@@ -1179,7 +1143,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.options.programId ?? this.program.programId)) {
+          if ("programId" in instruction && instruction.programId.equals(this.program.programId)) {
             const ixData = instruction;
             if ("parsed" in ixData && ixData.parsed) {
               continue;
@@ -1274,10 +1238,38 @@ var JBondClient = class _JBondClient {
   }
 };
 
-exports.BondClientEnv = BondClientEnv;
+// src/common.ts
+var PROGRAM_ID = "8vrqsFHnDdjMYMwahytRzmmYgRqCMmka8X6DJUXGQzWr";
+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.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