@solana/web3.js 1.34.0 → 1.36.0

package/module.flow.js

@@ -1027,7 +1027,7 @@ declare module "@solana/web3.js" {
   declare export type SimulatedTransactionResponse = {
     err: TransactionError | string | null,
     logs: Array<string> | null,
-    accounts?: SimulatedTransactionAccountInfo[] | null,
+    accounts?: (SimulatedTransactionAccountInfo | null)[] | null,
     unitsConsumed?: number,
     ...
   };
@@ -2281,13 +2281,21 @@ account: AccountInfo<ParsedAccountData>,...
       commitment?: Commitment
     ): Promise<AccountInfo<Buffer> | null>;
 
+    /**
+     * Fetch all the account info for multiple accounts specified by an array of public keys, return with context
+     */
+    getMultipleAccountsInfoAndContext(
+      publicKeys: PublicKey[],
+      commitment?: Commitment
+    ): Promise<RpcResponseAndContext<(AccountInfo<Buffer> | null)[]>>;
+
     /**
      * Fetch all the account info for multiple accounts specified by an array of public keys
      */
     getMultipleAccountsInfo(
       publicKeys: PublicKey[],
-      configOrCommitment?: GetMultipleAccountsConfig | Commitment
-    ): Promise<(AccountInfo<Buffer | ParsedAccountData> | null)[]>;
+      commitment?: Commitment
+    ): Promise<(AccountInfo<Buffer> | null)[]>;
 
     /**
      * Returns epoch activation information for a stake account that has been delegated
@@ -3146,6 +3154,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 +3361,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.
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana/web3.js",
-  "version": "1.34.0",
+  "version": "1.36.0",
   "description": "Solana Javascript API",
   "keywords": [
     "api",
@@ -20,7 +20,7 @@
     "access": "public"
   },
   "browser": {
-    "./lib/index.cjs.js": "./lib/index.browser.esm.js",
+    "./lib/index.cjs.js": "./lib/index.browser.cjs.js",
     "./lib/index.esm.js": "./lib/index.browser.esm.js"
   },
   "main": "lib/index.cjs.js",

package/src/connection.ts

@@ -469,7 +469,7 @@ export type SimulatedTransactionAccountInfo = {
 export type SimulatedTransactionResponse = {
   err: TransactionError | string | null;
   logs: Array<string> | null;
-  accounts?: SimulatedTransactionAccountInfo[] | null;
+  accounts?: (SimulatedTransactionAccountInfo | null)[] | null;
   unitsConsumed?: number;
 };
 
@@ -480,13 +480,15 @@ const SimulatedTransactionResponseStruct = jsonRpcResultAndContext(
     accounts: optional(
       nullable(
         array(
-          pick({
-            executable: boolean(),
-            owner: string(),
-            lamports: number(),
-            data: array(string()),
-            rentEpoch: optional(number()),
-          }),
+          nullable(
+            pick({
+              executable: boolean(),
+              owner: string(),
+              lamports: number(),
+              data: array(string()),
+              rentEpoch: optional(number()),
+            }),
+          ),
         ),
       ),
     ),
@@ -2550,38 +2552,39 @@ export class Connection {
   }
 
   /**
-   * Fetch all the account info for multiple accounts specified by an array of public keys
+   * Fetch all the account info for multiple accounts specified by an array of public keys, return with context
    */
-  async getMultipleAccountsInfo(
+  async getMultipleAccountsInfoAndContext(
     publicKeys: PublicKey[],
-    configOrCommitment?: GetMultipleAccountsConfig | Commitment,
-  ): Promise<(AccountInfo<Buffer | ParsedAccountData> | null)[]> {
+    commitment?: Commitment,
+  ): Promise<RpcResponseAndContext<(AccountInfo<Buffer> | null)[]>> {
     const keys = publicKeys.map(key => key.toBase58());
-
-    let commitment;
-    let encoding: 'base64' | 'jsonParsed' = 'base64';
-    if (configOrCommitment) {
-      if (typeof configOrCommitment === 'string') {
-        commitment = configOrCommitment;
-        encoding = 'base64';
-      } else {
-        commitment = configOrCommitment.commitment;
-        encoding = configOrCommitment.encoding || 'base64';
-      }
-    }
-
-    const args = this._buildArgs([keys], commitment, encoding);
+    const args = this._buildArgs([keys], commitment, 'base64');
     const unsafeRes = await this._rpcRequest('getMultipleAccounts', args);
     const res = create(
       unsafeRes,
-      jsonRpcResultAndContext(array(nullable(ParsedAccountInfoResult))),
+      jsonRpcResultAndContext(array(nullable(AccountInfoResult))),
     );
     if ('error' in res) {
       throw new Error(
         'failed to get info for accounts ' + keys + ': ' + res.error.message,
       );
     }
-    return res.result.value;
+    return res.result;
+  }
+
+  /**
+   * Fetch all the account info for multiple accounts specified by an array of public keys
+   */
+  async getMultipleAccountsInfo(
+    publicKeys: PublicKey[],
+    commitment?: Commitment,
+  ): Promise<(AccountInfo<Buffer> | null)[]> {
+    const res = await this.getMultipleAccountsInfoAndContext(
+      publicKeys,
+      commitment,
+    );
+    return res.value;
   }
 
   /**

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.
    */