@jpool/bond-sdk 0.7.0 → 0.8.0-next.1

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import * as _solana_web3_js from '@solana/web3.js';
-import { PublicKey, Connection, Keypair, PublicKeyInitData, Transaction, VersionedTransaction } from '@solana/web3.js';
-import { BN, AnchorProvider, Program, Wallet as Wallet$1 } from '@coral-xyz/anchor';
+import { PublicKey, Transaction, VersionedTransaction, Keypair, Connection, PublicKeyInitData } from '@solana/web3.js';
+import { BN, AnchorProvider, Program } from '@coral-xyz/anchor';
 
 /**
  * Program IDL in camelCase format in order to be used in JS/TS.
@@ -286,12 +286,6 @@ type Jbond = {
                 {
                     "name": "initialCollateral";
                     "type": "u64";
-                },
-                {
-                    "name": "withdrawalAuthority";
-                    "type": {
-                        "option": "pubkey";
-                    };
                 }
             ];
         },
@@ -356,6 +350,72 @@ type Jbond = {
             ];
             "args": [];
         },
+        {
+            "name": "setWithdrawAuthority";
+            "docs": [
+                "Sets a new withdrawal authority for a validator's bond account.",
+                "Allows changing who can withdraw collateral in the future.",
+                "",
+                "# Arguments",
+                "* `new_withdraw_authority` - Optional new withdrawal authority key (None to restrict to identity).",
+                "",
+                "# Errors",
+                "Fails if the signer is not authorized to change the withdrawal authority."
+            ];
+            "discriminator": [
+                199,
+                146,
+                140,
+                67,
+                1,
+                90,
+                8,
+                222
+            ];
+            "accounts": [
+                {
+                    "name": "validatorBond";
+                    "writable": true;
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const";
+                                "value": [
+                                    118,
+                                    97,
+                                    108,
+                                    105,
+                                    100,
+                                    97,
+                                    116,
+                                    111,
+                                    114,
+                                    95,
+                                    98,
+                                    111,
+                                    110,
+                                    100
+                                ];
+                            },
+                            {
+                                "kind": "account";
+                                "path": "validator_bond.vote_account";
+                                "account": "validatorBond";
+                            }
+                        ];
+                    };
+                },
+                {
+                    "name": "identity";
+                    "signer": true;
+                },
+                {
+                    "name": "newWithdrawAuthority";
+                    "optional": true;
+                }
+            ];
+            "args": [];
+        },
         {
             "name": "topUp";
             "docs": [
@@ -628,7 +688,7 @@ type Jbond = {
         {
             "code": 6006;
             "name": "validatorNotActive";
-            "msg": "Validator boost account is not active";
+            "msg": "Validator bond account is not active";
         },
         {
             "code": 6007;
@@ -891,7 +951,6 @@ type RegisterValidatorProps = {
     identity: PublicKey;
     voteAccount: PublicKey;
     initialCollateral: number;
-    withdrawalAuthority?: PublicKey;
     creator?: PublicKey;
 };
 type TopUpCollateralProps = {
@@ -927,6 +986,11 @@ type SetAuthorityProps = {
     newAuthority: PublicKey;
     authority?: PublicKey;
 };
+type SetWithdrawAuthorityProps = {
+    voteAccount: PublicKey;
+    newWithdrawAuthority?: PublicKey | null;
+    identity?: PublicKey;
+};
 type GlobalState = {
     authority: PublicKey;
     totalValidators: number;
@@ -956,6 +1020,20 @@ declare enum BondTransactionType {
     Compensation = "compensation"
 }
 
+type Wallet = {
+    publicKey: PublicKey;
+    signMessage?: (message: Uint8Array) => Promise<Uint8Array>;
+    signTransaction: <T extends Transaction | VersionedTransaction>(tx: T) => Promise<T>;
+    signAllTransactions: <T extends Transaction | VersionedTransaction>(txs: T[]) => Promise<T[]>;
+};
+declare class NodeWallet implements Wallet {
+    readonly payer: Keypair;
+    constructor(payer: Keypair);
+    signTransaction<T extends Transaction | VersionedTransaction>(tx: T): Promise<T>;
+    signAllTransactions<T extends Transaction | VersionedTransaction>(txs: T[]): Promise<T[]>;
+    get publicKey(): PublicKey;
+}
+
 /**
  * Enum for different client environments.
  */
@@ -979,7 +1057,7 @@ declare class JBondClient {
     /**
      * Creates an instance of `JBondClient` using a provided connection and wallet.
      */
-    static fromWallet(connection: Connection, wallet?: Wallet$1, options?: ClientOptions): JBondClient;
+    static fromWallet(connection: Connection, wallet?: Wallet, options?: ClientOptions): JBondClient;
     /**
      * Creates an instance of `JBondClient` using the provided connection and keypair.
      */
@@ -1041,6 +1119,13 @@ declare class JBondClient {
      * @return Transaction signature
      */
     setAuthority(props: SetAuthorityProps): Promise<string>;
+    /**
+     * Set withdrawal authority for validator bond
+     * Only the validator identity can call this
+     * Default identity is the provider's wallet
+     * @return Transaction signature
+     */
+    setWithdrawAuthority(props: SetWithdrawAuthorityProps): Promise<string>;
     /**
      * Build initialize instruction
      */
@@ -1065,6 +1150,10 @@ declare class JBondClient {
      * Build set authority instruction
      */
     buildSetAuthorityInstruction(props: SetAuthorityProps): Promise<_solana_web3_js.TransactionInstruction>;
+    /**
+     * Build set withdraw authority instruction
+     */
+    buildSetWithdrawAuthorityInstruction(props: SetWithdrawAuthorityProps): Promise<_solana_web3_js.TransactionInstruction>;
     /**
      * Fetch global state or throw if not found
      */
@@ -1132,18 +1221,4 @@ declare class JBondClient {
  */
 declare const ENV_PROGRAM_ID: Record<string, PublicKey>;
 
-type Wallet = {
-    publicKey: PublicKey;
-    signMessage?: (message: Uint8Array) => Promise<Uint8Array>;
-    signTransaction: <T extends Transaction | VersionedTransaction>(tx: T) => Promise<T>;
-    signAllTransactions: <T extends Transaction | VersionedTransaction>(txs: T[]) => Promise<T[]>;
-};
-declare class NodeWallet implements Wallet {
-    readonly payer: Keypair;
-    constructor(payer: Keypair);
-    signTransaction<T extends Transaction | VersionedTransaction>(tx: T): Promise<T>;
-    signAllTransactions<T extends Transaction | VersionedTransaction>(txs: T[]): Promise<T[]>;
-    get publicKey(): PublicKey;
-}
-
-export { BondClientEnv, BondTransactionType, type ClaimProps, type ClientOptions, ENV_PROGRAM_ID, type EpochHistoryItem, type GetHistoryGroupedProps, type GetHistoryProps, type GlobalState, type InitializeProps, JBondClient, type Jbond, NodeWallet, type RegisterValidatorProps, type SetAuthorityProps, type TopUpCollateralProps, type TransactionHistoryItem, type ValidatorBond, type WithdrawCollateralProps };
+export { BondClientEnv, BondTransactionType, type ClaimProps, type ClientOptions, ENV_PROGRAM_ID, type EpochHistoryItem, type GetHistoryGroupedProps, type GetHistoryProps, type GlobalState, type InitializeProps, JBondClient, type Jbond, NodeWallet, type RegisterValidatorProps, type SetAuthorityProps, type SetWithdrawAuthorityProps, type TopUpCollateralProps, type TransactionHistoryItem, type ValidatorBond, type WithdrawCollateralProps };

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as _solana_web3_js from '@solana/web3.js';
-import { PublicKey, Connection, Keypair, PublicKeyInitData, Transaction, VersionedTransaction } from '@solana/web3.js';
-import { BN, AnchorProvider, Program, Wallet as Wallet$1 } from '@coral-xyz/anchor';
+import { PublicKey, Transaction, VersionedTransaction, Keypair, Connection, PublicKeyInitData } from '@solana/web3.js';
+import { BN, AnchorProvider, Program } from '@coral-xyz/anchor';
 
 /**
  * Program IDL in camelCase format in order to be used in JS/TS.
@@ -286,12 +286,6 @@ type Jbond = {
                 {
                     "name": "initialCollateral";
                     "type": "u64";
-                },
-                {
-                    "name": "withdrawalAuthority";
-                    "type": {
-                        "option": "pubkey";
-                    };
                 }
             ];
         },
@@ -356,6 +350,72 @@ type Jbond = {
             ];
             "args": [];
         },
+        {
+            "name": "setWithdrawAuthority";
+            "docs": [
+                "Sets a new withdrawal authority for a validator's bond account.",
+                "Allows changing who can withdraw collateral in the future.",
+                "",
+                "# Arguments",
+                "* `new_withdraw_authority` - Optional new withdrawal authority key (None to restrict to identity).",
+                "",
+                "# Errors",
+                "Fails if the signer is not authorized to change the withdrawal authority."
+            ];
+            "discriminator": [
+                199,
+                146,
+                140,
+                67,
+                1,
+                90,
+                8,
+                222
+            ];
+            "accounts": [
+                {
+                    "name": "validatorBond";
+                    "writable": true;
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const";
+                                "value": [
+                                    118,
+                                    97,
+                                    108,
+                                    105,
+                                    100,
+                                    97,
+                                    116,
+                                    111,
+                                    114,
+                                    95,
+                                    98,
+                                    111,
+                                    110,
+                                    100
+                                ];
+                            },
+                            {
+                                "kind": "account";
+                                "path": "validator_bond.vote_account";
+                                "account": "validatorBond";
+                            }
+                        ];
+                    };
+                },
+                {
+                    "name": "identity";
+                    "signer": true;
+                },
+                {
+                    "name": "newWithdrawAuthority";
+                    "optional": true;
+                }
+            ];
+            "args": [];
+        },
         {
             "name": "topUp";
             "docs": [
@@ -628,7 +688,7 @@ type Jbond = {
         {
             "code": 6006;
             "name": "validatorNotActive";
-            "msg": "Validator boost account is not active";
+            "msg": "Validator bond account is not active";
         },
         {
             "code": 6007;
@@ -891,7 +951,6 @@ type RegisterValidatorProps = {
     identity: PublicKey;
     voteAccount: PublicKey;
     initialCollateral: number;
-    withdrawalAuthority?: PublicKey;
     creator?: PublicKey;
 };
 type TopUpCollateralProps = {
@@ -927,6 +986,11 @@ type SetAuthorityProps = {
     newAuthority: PublicKey;
     authority?: PublicKey;
 };
+type SetWithdrawAuthorityProps = {
+    voteAccount: PublicKey;
+    newWithdrawAuthority?: PublicKey | null;
+    identity?: PublicKey;
+};
 type GlobalState = {
     authority: PublicKey;
     totalValidators: number;
@@ -956,6 +1020,20 @@ declare enum BondTransactionType {
     Compensation = "compensation"
 }
 
+type Wallet = {
+    publicKey: PublicKey;
+    signMessage?: (message: Uint8Array) => Promise<Uint8Array>;
+    signTransaction: <T extends Transaction | VersionedTransaction>(tx: T) => Promise<T>;
+    signAllTransactions: <T extends Transaction | VersionedTransaction>(txs: T[]) => Promise<T[]>;
+};
+declare class NodeWallet implements Wallet {
+    readonly payer: Keypair;
+    constructor(payer: Keypair);
+    signTransaction<T extends Transaction | VersionedTransaction>(tx: T): Promise<T>;
+    signAllTransactions<T extends Transaction | VersionedTransaction>(txs: T[]): Promise<T[]>;
+    get publicKey(): PublicKey;
+}
+
 /**
  * Enum for different client environments.
  */
@@ -979,7 +1057,7 @@ declare class JBondClient {
     /**
      * Creates an instance of `JBondClient` using a provided connection and wallet.
      */
-    static fromWallet(connection: Connection, wallet?: Wallet$1, options?: ClientOptions): JBondClient;
+    static fromWallet(connection: Connection, wallet?: Wallet, options?: ClientOptions): JBondClient;
     /**
      * Creates an instance of `JBondClient` using the provided connection and keypair.
      */
@@ -1041,6 +1119,13 @@ declare class JBondClient {
      * @return Transaction signature
      */
     setAuthority(props: SetAuthorityProps): Promise<string>;
+    /**
+     * Set withdrawal authority for validator bond
+     * Only the validator identity can call this
+     * Default identity is the provider's wallet
+     * @return Transaction signature
+     */
+    setWithdrawAuthority(props: SetWithdrawAuthorityProps): Promise<string>;
     /**
      * Build initialize instruction
      */
@@ -1065,6 +1150,10 @@ declare class JBondClient {
      * Build set authority instruction
      */
     buildSetAuthorityInstruction(props: SetAuthorityProps): Promise<_solana_web3_js.TransactionInstruction>;
+    /**
+     * Build set withdraw authority instruction
+     */
+    buildSetWithdrawAuthorityInstruction(props: SetWithdrawAuthorityProps): Promise<_solana_web3_js.TransactionInstruction>;
     /**
      * Fetch global state or throw if not found
      */
@@ -1132,18 +1221,4 @@ declare class JBondClient {
  */
 declare const ENV_PROGRAM_ID: Record<string, PublicKey>;
 
-type Wallet = {
-    publicKey: PublicKey;
-    signMessage?: (message: Uint8Array) => Promise<Uint8Array>;
-    signTransaction: <T extends Transaction | VersionedTransaction>(tx: T) => Promise<T>;
-    signAllTransactions: <T extends Transaction | VersionedTransaction>(txs: T[]) => Promise<T[]>;
-};
-declare class NodeWallet implements Wallet {
-    readonly payer: Keypair;
-    constructor(payer: Keypair);
-    signTransaction<T extends Transaction | VersionedTransaction>(tx: T): Promise<T>;
-    signAllTransactions<T extends Transaction | VersionedTransaction>(txs: T[]): Promise<T[]>;
-    get publicKey(): PublicKey;
-}
-
-export { BondClientEnv, BondTransactionType, type ClaimProps, type ClientOptions, ENV_PROGRAM_ID, type EpochHistoryItem, type GetHistoryGroupedProps, type GetHistoryProps, type GlobalState, type InitializeProps, JBondClient, type Jbond, NodeWallet, type RegisterValidatorProps, type SetAuthorityProps, type TopUpCollateralProps, type TransactionHistoryItem, type ValidatorBond, type WithdrawCollateralProps };
+export { BondClientEnv, BondTransactionType, type ClaimProps, type ClientOptions, ENV_PROGRAM_ID, type EpochHistoryItem, type GetHistoryGroupedProps, type GetHistoryProps, type GlobalState, type InitializeProps, JBondClient, type Jbond, NodeWallet, type RegisterValidatorProps, type SetAuthorityProps, type SetWithdrawAuthorityProps, type TopUpCollateralProps, type TransactionHistoryItem, type ValidatorBond, type WithdrawCollateralProps };

package/dist/index.js

@@ -294,12 +294,6 @@ var jbond_default = {
         {
           name: "initial_collateral",
           type: "u64"
-        },
-        {
-          name: "withdrawal_authority",
-          type: {
-            option: "pubkey"
-          }
         }
       ]
     },
@@ -364,6 +358,72 @@ var jbond_default = {
       ],
       args: []
     },
+    {
+      name: "set_withdraw_authority",
+      docs: [
+        "Sets a new withdrawal authority for a validator's bond account.",
+        "Allows changing who can withdraw collateral in the future.",
+        "",
+        "# Arguments",
+        "* `new_withdraw_authority` - Optional new withdrawal authority key (None to restrict to identity).",
+        "",
+        "# Errors",
+        "Fails if the signer is not authorized to change the withdrawal authority."
+      ],
+      discriminator: [
+        199,
+        146,
+        140,
+        67,
+        1,
+        90,
+        8,
+        222
+      ],
+      accounts: [
+        {
+          name: "validator_bond",
+          writable: true,
+          pda: {
+            seeds: [
+              {
+                kind: "const",
+                value: [
+                  118,
+                  97,
+                  108,
+                  105,
+                  100,
+                  97,
+                  116,
+                  111,
+                  114,
+                  95,
+                  98,
+                  111,
+                  110,
+                  100
+                ]
+              },
+              {
+                kind: "account",
+                path: "validator_bond.vote_account",
+                account: "ValidatorBond"
+              }
+            ]
+          }
+        },
+        {
+          name: "identity",
+          signer: true
+        },
+        {
+          name: "new_withdraw_authority",
+          optional: true
+        }
+      ],
+      args: []
+    },
     {
       name: "top_up",
       docs: [
@@ -636,7 +696,7 @@ var jbond_default = {
     {
       code: 6006,
       name: "ValidatorNotActive",
-      msg: "Validator boost account is not active"
+      msg: "Validator bond account is not active"
     },
     {
       code: 6007,
@@ -1059,6 +1119,16 @@ var JBondClient = class _JBondClient {
     const ix = await this.buildSetAuthorityInstruction(props);
     return await this.provider.sendAndConfirm(new web3_js.Transaction().add(ix));
   }
+  /**
+   * Set withdrawal authority for validator bond
+   * Only the validator identity can call this
+   * Default identity is the provider's wallet
+   * @return Transaction signature
+   */
+  async setWithdrawAuthority(props) {
+    const ix = await this.buildSetWithdrawAuthorityInstruction(props);
+    return await this.provider.sendAndConfirm(new web3_js.Transaction().add(ix));
+  }
   /**
    * Build initialize instruction
    */
@@ -1076,12 +1146,12 @@ var JBondClient = class _JBondClient {
    * Build register validator instruction
    */
   async buildRegisterValidatorInstruction(props) {
-    const { identity, voteAccount, initialCollateral, withdrawalAuthority } = props;
+    const { identity, voteAccount, initialCollateral } = props;
     const [globalState] = this.pda.globalState();
     const [validatorBond] = this.pda.validatorBond(voteAccount);
     const lamports = new anchor.BN(initialCollateral * web3_js.LAMPORTS_PER_SOL);
     const creator = props.creator ?? this.provider.wallet.publicKey;
-    return this.program.methods.register(lamports, withdrawalAuthority ?? null).accountsPartial({
+    return this.program.methods.register(lamports).accountsPartial({
       creator,
       globalState,
       validatorBond,
@@ -1153,6 +1223,19 @@ var JBondClient = class _JBondClient {
       newAuthority: props.newAuthority
     }).instruction();
   }
+  /**
+   * Build set withdraw authority instruction
+   */
+  async buildSetWithdrawAuthorityInstruction(props) {
+    const { voteAccount, newWithdrawAuthority } = props;
+    const [validatorBond] = this.pda.validatorBond(voteAccount);
+    const identity = props.identity ?? this.provider.wallet.publicKey;
+    return this.program.methods.setWithdrawAuthority().accountsPartial({
+      validatorBond,
+      identity,
+      newWithdrawAuthority: newWithdrawAuthority ?? null
+    }).instruction();
+  }
   /**
    * Fetch global state or throw if not found
    */
@@ -1227,14 +1310,14 @@ var JBondClient = class _JBondClient {
    */
   async getHistory(vote, options) {
     const [ValidatorBondAccount] = this.pda.validatorBond(new web3_js.PublicKey(vote));
-    const signatures = await this.connection.getSignaturesForAddress(
+    const signatures = (await this.connection.getSignaturesForAddress(
       ValidatorBondAccount,
       {
         limit: options?.limit || 1e3,
         before: options?.before,
         until: options?.until
       }
-    );
+    )).filter((sig) => !sig.err);
     const signatureStrings = signatures.map((sig) => sig.signature);
     const BATCH_SIZE = 100;
     const allTransactions = [];
@@ -1252,7 +1335,7 @@ var JBondClient = class _JBondClient {
     const history = [];
     for (const [idx, tx] of allTransactions.entries()) {
       const sigInfo = signatures[idx];
-      if (!tx || !tx.meta) {
+      if (!tx || !tx.meta || tx.meta.err !== null) {
         continue;
       }
       try {