@solana/web3.js 1.76.0 → 1.77.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solana/web3.js",
-  "version": "1.76.0",
+  "version": "1.77.1",
   "description": "Solana Javascript API",
   "keywords": [
     "api",
@@ -108,11 +108,11 @@
     "eslint-plugin-prettier": "^4.2.1",
     "esm": "^3.2.25",
     "mocha": "^10.1.0",
-    "mockttp": "^3.6.2",
+    "mockttp": "^3.7.5",
     "mz": "^2.7.0",
     "node-abort-controller": "^3.0.1",
     "prettier": "^2.3.0",
-    "rimraf": "4.1.2",
+    "rimraf": "5.0.1",
     "rollup": "^3.20.2",
     "rollup-plugin-dts": "^5.3.0",
     "rollup-plugin-node-polyfills": "^0.2.1",

package/src/connection.ts

@@ -2685,8 +2685,16 @@ export type GetProgramAccountsConfig = {
   filters?: GetProgramAccountsFilter[];
   /** The minimum slot that the request can be evaluated at */
   minContextSlot?: number;
+  /** wrap the result in an RpcResponse JSON object */
+  withContext?: boolean;
 };
 
+export type GetProgramAccountsResponse = readonly Readonly<{
+  account: AccountInfo<Buffer>;
+  /** the account Pubkey as base-58 encoded string */
+  pubkey: PublicKey;
+}>[];
+
 /**
  * Configuration object for getParsedProgramAccounts
  */
@@ -3336,17 +3344,13 @@ export class Connection {
   /**
    * Fetch all the token accounts owned by the specified account
    *
-   * @return {Promise<RpcResponseAndContext<Array<{pubkey: PublicKey, account: AccountInfo<Buffer>}>>>}
+   * @return {Promise<RpcResponseAndContext<GetProgramAccountsResponse>}
    */
   async getTokenAccountsByOwner(
     ownerAddress: PublicKey,
     filter: TokenAccountsFilter,
     commitmentOrConfig?: Commitment | GetTokenAccountsByOwnerConfig,
-  ): Promise<
-    RpcResponseAndContext<
-      Array<{pubkey: PublicKey; account: AccountInfo<Buffer>}>
-    >
-  > {
+  ): Promise<RpcResponseAndContext<GetProgramAccountsResponse>> {
     const {commitment, config} =
       extractCommitmentFromConfig(commitmentOrConfig);
     let _args: any[] = [ownerAddress.toBase58()];
@@ -3621,10 +3625,24 @@ export class Connection {
    *
    * @return {Promise<Array<{pubkey: PublicKey, account: AccountInfo<Buffer>}>>}
    */
+  async getProgramAccounts(
+    programId: PublicKey,
+    configOrCommitment?: GetProgramAccountsConfig &
+      Readonly<{withContext: true}>,
+  ): Promise<RpcResponseAndContext<GetProgramAccountsResponse>>;
+  // eslint-disable-next-line no-dupe-class-members
   async getProgramAccounts(
     programId: PublicKey,
     configOrCommitment?: GetProgramAccountsConfig | Commitment,
-  ): Promise<Array<{pubkey: PublicKey; account: AccountInfo<Buffer>}>> {
+  ): Promise<GetProgramAccountsResponse>;
+  // eslint-disable-next-line no-dupe-class-members
+  async getProgramAccounts(
+    programId: PublicKey,
+    configOrCommitment?: GetProgramAccountsConfig | Commitment,
+  ): Promise<
+    | GetProgramAccountsResponse
+    | RpcResponseAndContext<GetProgramAccountsResponse>
+  > {
     const {commitment, config} =
       extractCommitmentFromConfig(configOrCommitment);
     const {encoding, ...configWithoutEncoding} = config || {};
@@ -3635,7 +3653,11 @@ export class Connection {
       configWithoutEncoding,
     );
     const unsafeRes = await this._rpcRequest('getProgramAccounts', args);
-    const res = create(unsafeRes, jsonRpcResult(array(KeyedAccountInfoResult)));
+    const baseSchema = array(KeyedAccountInfoResult);
+    const res =
+      configWithoutEncoding.withContext === true
+        ? create(unsafeRes, jsonRpcResultAndContext(baseSchema))
+        : create(unsafeRes, jsonRpcResult(baseSchema));
     if ('error' in res) {
       throw new SolanaJSONRPCError(
         res.error,

package/src/loader.ts

@@ -3,6 +3,7 @@ import * as BufferLayout from '@solana/buffer-layout';
 
 import {PublicKey} from './publickey';
 import {Transaction, PACKET_DATA_SIZE} from './transaction';
+import {MS_PER_SLOT} from './timing';
 import {SYSVAR_RENT_PUBKEY} from './sysvar';
 import {sendAndConfirmTransaction} from './utils/send-and-confirm-transaction';
 import {sleep} from './utils/sleep';
@@ -220,14 +221,44 @@ export class Loader {
         programId,
         data,
       });
-      await sendAndConfirmTransaction(
-        connection,
+      const deployCommitment = 'processed';
+      const finalizeSignature = await connection.sendTransaction(
         transaction,
         [payer, program],
+        {preflightCommitment: deployCommitment},
+      );
+      const {context, value} = await connection.confirmTransaction(
         {
-          commitment: 'confirmed',
+          signature: finalizeSignature,
+          lastValidBlockHeight: transaction.lastValidBlockHeight!,
+          blockhash: transaction.recentBlockhash!,
         },
+        deployCommitment,
       );
+      if (value.err) {
+        throw new Error(
+          `Transaction ${finalizeSignature} failed (${JSON.stringify(value)})`,
+        );
+      }
+      // We prevent programs from being usable until the slot after their deployment.
+      // See https://github.com/solana-labs/solana/pull/29654
+      while (
+        true // eslint-disable-line no-constant-condition
+      ) {
+        try {
+          const currentSlot = await connection.getSlot({
+            commitment: deployCommitment,
+          });
+          if (currentSlot > context.slot) {
+            break;
+          }
+        } catch {
+          /* empty */
+        }
+        await new Promise(resolve =>
+          setTimeout(resolve, Math.round(MS_PER_SLOT / 2)),
+        );
+      }
     }
 
     // success

package/src/programs/vote.ts

@@ -366,8 +366,10 @@ export class VoteProgram {
    * 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
+   *
+   * KEEP IN SYNC WITH `VoteState::size_of()` in https://github.com/solana-labs/solana/blob/a474cb24b9238f5edcc982f65c0b37d4a1046f7e/sdk/program/src/vote/state/mod.rs#L340-L342
    */
-  static space: number = 3731;
+  static space: number = process.env.TEST_LIVE ? 3762 : 3731;
 
   /**
    * Generate an Initialize instruction.