@solana/web3.js 1.32.1 → 1.35.0

package/module.flow.js

@@ -3146,6 +3146,19 @@ lastValidBlockHeight: number,...
     ...
   };
 
+  /**
+   * Split with seed transaction params
+   */
+  declare export type SplitStakeWithSeedParams = {
+    stakePubkey: PublicKey,
+    authorizedPubkey: PublicKey,
+    splitStakePubkey: PublicKey,
+    basePubkey: PublicKey,
+    seed: string,
+    lamports: number,
+    ...
+  };
+
   /**
    * Withdraw stake instruction params
    */
@@ -3340,6 +3353,12 @@ lastValidBlockHeight: number,...
      */
     static split(params: SplitStakeParams): Transaction;
 
+    /**
+     * Generate a Transaction that splits Stake tokens into another account
+     * derived from a base public key and seed
+     */
+    static splitWithSeed(params: SplitStakeWithSeedParams): Transaction;
+
     /**
      * Generate a Transaction that merges Stake accounts.
      */
@@ -4082,6 +4101,177 @@ lastValidBlockHeight: number,...
       buffer: Buffer | Uint8Array | Array<number>
     ): VoteAccount;
   }
+
+  /**
+   * Vote account info
+   */
+  declare export class VoteInit {
+    nodePubkey: PublicKey;
+    authorizedVoter: PublicKey;
+    authorizedWithdrawer: PublicKey;
+    commission: number;
+    constructor(
+      nodePubkey: PublicKey,
+      authorizedVoter: PublicKey,
+      authorizedWithdrawer: PublicKey,
+      commission: number
+    ): this;
+  }
+
+  /**
+   * Create vote account transaction params
+   */
+  declare export type CreateVoteAccountParams = {
+    fromPubkey: PublicKey,
+    votePubkey: PublicKey,
+    voteInit: VoteInit,
+    lamports: number,
+    ...
+  };
+
+  /**
+   * InitializeAccount instruction params
+   */
+  declare export type InitializeAccountParams = {
+    votePubkey: PublicKey,
+    nodePubkey: PublicKey,
+    voteInit: VoteInit,
+    ...
+  };
+
+  /**
+   * Authorize instruction params
+   */
+  declare export type AuthorizeVoteParams = {
+    votePubkey: PublicKey,
+
+    /**
+     * Current vote or withdraw authority, depending on `voteAuthorizationType`
+     */
+    authorizedPubkey: PublicKey,
+    newAuthorizedPubkey: PublicKey,
+    voteAuthorizationType: VoteAuthorizationType,
+    ...
+  };
+
+  /**
+   * Withdraw from vote account transaction params
+   */
+  declare export type WithdrawFromVoteAccountParams = {
+    votePubkey: PublicKey,
+    authorizedWithdrawerPubkey: PublicKey,
+    lamports: number,
+    toPubkey: PublicKey,
+    ...
+  };
+
+  /**
+   * Vote Instruction class
+   */
+  declare export class VoteInstruction {
+    /**
+     * Decode a vote instruction and retrieve the instruction type.
+     */
+    static decodeInstructionType(
+      instruction: TransactionInstruction
+    ): VoteInstructionType;
+
+    /**
+     * Decode an initialize vote instruction and retrieve the instruction params.
+     */
+    static decodeInitializeAccount(
+      instruction: TransactionInstruction
+    ): InitializeAccountParams;
+
+    /**
+     * Decode an authorize instruction and retrieve the instruction params.
+     */
+    static decodeAuthorize(
+      instruction: TransactionInstruction
+    ): AuthorizeVoteParams;
+
+    /**
+     * Decode a withdraw instruction and retrieve the instruction params.
+     */
+    static decodeWithdraw(
+      instruction: TransactionInstruction
+    ): WithdrawFromVoteAccountParams;
+  }
+
+  /**
+   * An enumeration of valid VoteInstructionType's
+   */
+  declare export type VoteInstructionType =
+    | "Authorize"
+    | "InitializeAccount"
+    | "Withdraw";
+
+  /**
+   * VoteAuthorize type
+   */
+  declare export type VoteAuthorizationType = {
+    /**
+     * The VoteAuthorize index (from solana-vote-program)
+     */
+    index: number,
+    ...
+  };
+
+  /**
+   * An enumeration of valid VoteAuthorization layouts.
+   */
+  declare export var VoteAuthorizationLayout: $ReadOnly<{
+    Voter: {
+      index: number,
+      ...
+    },
+    Withdrawer: {
+      index: number,
+      ...
+    },
+    ...
+  }>;
+
+  /**
+   * Factory class for transactions to interact with the Vote program
+   */
+  declare export class VoteProgram {
+    /**
+     * Public key that identifies the Vote program
+     */
+    static programId: PublicKey;
+
+    /**
+     * Max space of a Vote account
+     *
+     * This is generated from the solana-vote-program VoteState struct as
+     * `VoteState::size_of()`:
+     * https://docs.rs/solana-vote-program/1.9.5/solana_vote_program/vote_state/struct.VoteState.html#method.size_of
+     */
+    static space: number;
+
+    /**
+     * Generate an Initialize instruction.
+     */
+    static initializeAccount(
+      params: InitializeAccountParams
+    ): TransactionInstruction;
+
+    /**
+     * Generate a transaction that creates a new Vote account.
+     */
+    static createAccount(params: CreateVoteAccountParams): Transaction;
+
+    /**
+     * Generate a transaction that authorizes a new Voter or Withdrawer on the Vote account.
+     */
+    static authorize(params: AuthorizeVoteParams): Transaction;
+
+    /**
+     * Generate a transaction to withdraw from a Vote account.
+     */
+    static withdraw(params: WithdrawFromVoteAccountParams): Transaction;
+  }
   declare export var SYSVAR_CLOCK_PUBKEY: PublicKey;
   declare export var SYSVAR_EPOCH_SCHEDULE_PUBKEY: PublicKey;
   declare export var SYSVAR_INSTRUCTIONS_PUBKEY: PublicKey;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana/web3.js",
-  "version": "1.32.1",
+  "version": "1.35.0",
   "description": "Solana Javascript API",
   "keywords": [
     "api",

package/src/connection.ts

@@ -4110,7 +4110,16 @@ export class Connection {
         this._rpcWebSocketConnected = false;
         this._rpcWebSocketIdleTimeout = setTimeout(() => {
           this._rpcWebSocketIdleTimeout = null;
-          this._rpcWebSocket.close();
+          try {
+            this._rpcWebSocket.close();
+          } catch (err) {
+            // swallow error if socket has already been closed.
+            if (err instanceof Error) {
+              console.log(
+                `Error when closing socket connection: ${err.message}`,
+              );
+            }
+          }
         }, 500);
       }
       return;

package/src/index.ts

@@ -17,6 +17,7 @@ export * from './secp256k1-program';
 export * from './transaction';
 export * from './validator-info';
 export * from './vote-account';
+export * from './vote-program';
 export * from './sysvar';
 export * from './errors';
 export * from './util/borsh-schema';

package/src/layout.ts

@@ -79,6 +79,21 @@ export const lockup = (property: string = 'lockup') => {
   );
 };
 
+/**
+ *  Layout for a VoteInit object
+ */
+export const voteInit = (property: string = 'voteInit') => {
+  return BufferLayout.struct(
+    [
+      publicKey('nodePubkey'),
+      publicKey('authorizedVoter'),
+      publicKey('authorizedWithdrawer'),
+      BufferLayout.u8('commission'),
+    ],
+    property,
+  );
+};
+
 export function getAlloc(type: any, fields: any): number {
   let alloc = 0;
   type.layout.fields.forEach((item: any) => {

package/src/stake-program.ts

@@ -147,6 +147,18 @@ export type SplitStakeParams = {
   lamports: number;
 };
 
+/**
+ * Split with seed transaction params
+ */
+export type SplitStakeWithSeedParams = {
+  stakePubkey: PublicKey;
+  authorizedPubkey: PublicKey;
+  splitStakePubkey: PublicKey;
+  basePubkey: PublicKey;
+  seed: string;
+  lamports: number;
+};
+
 /**
  * Withdraw stake instruction params
  */
@@ -706,25 +718,13 @@ export class StakeProgram {
   }
 
   /**
-   * Generate a Transaction that splits Stake tokens into another stake account
+   * @internal
    */
-  static split(params: SplitStakeParams): Transaction {
+  static splitInstruction(params: SplitStakeParams): TransactionInstruction {
     const {stakePubkey, authorizedPubkey, splitStakePubkey, lamports} = params;
-
-    const transaction = new Transaction();
-    transaction.add(
-      SystemProgram.createAccount({
-        fromPubkey: authorizedPubkey,
-        newAccountPubkey: splitStakePubkey,
-        lamports: 0,
-        space: this.space,
-        programId: this.programId,
-      }),
-    );
     const type = STAKE_INSTRUCTION_LAYOUTS.Split;
     const data = encodeData(type, {lamports});
-
-    return transaction.add({
+    return new TransactionInstruction({
       keys: [
         {pubkey: stakePubkey, isSigner: false, isWritable: true},
         {pubkey: splitStakePubkey, isSigner: false, isWritable: true},
@@ -735,6 +735,56 @@ export class StakeProgram {
     });
   }
 
+  /**
+   * Generate a Transaction that splits Stake tokens into another stake account
+   */
+  static split(params: SplitStakeParams): Transaction {
+    const transaction = new Transaction();
+    transaction.add(
+      SystemProgram.createAccount({
+        fromPubkey: params.authorizedPubkey,
+        newAccountPubkey: params.splitStakePubkey,
+        lamports: 0,
+        space: this.space,
+        programId: this.programId,
+      }),
+    );
+    return transaction.add(this.splitInstruction(params));
+  }
+
+  /**
+   * Generate a Transaction that splits Stake tokens into another account
+   * derived from a base public key and seed
+   */
+  static splitWithSeed(params: SplitStakeWithSeedParams): Transaction {
+    const {
+      stakePubkey,
+      authorizedPubkey,
+      splitStakePubkey,
+      basePubkey,
+      seed,
+      lamports,
+    } = params;
+    const transaction = new Transaction();
+    transaction.add(
+      SystemProgram.allocate({
+        accountPubkey: splitStakePubkey,
+        basePubkey,
+        seed,
+        space: this.space,
+        programId: this.programId,
+      }),
+    );
+    return transaction.add(
+      this.splitInstruction({
+        stakePubkey,
+        authorizedPubkey,
+        splitStakePubkey,
+        lamports,
+      }),
+    );
+  }
+
   /**
    * Generate a Transaction that merges Stake accounts.
    */