@solana/web3.js 1.76.0 → 1.77.1

package/lib/index.d.ts

@@ -1326,6 +1326,8 @@ 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;
     /**
@@ -2827,7 +2829,14 @@ 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;
 };
+type GetProgramAccountsResponse = readonly Readonly<{
+    account: AccountInfo<Buffer>;
+    /** the account Pubkey as base-58 encoded string */
+    pubkey: PublicKey;
+}>[];
 /**
  * Configuration object for getParsedProgramAccounts
  */
@@ -3128,12 +3137,9 @@ 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>}
      */
-    getTokenAccountsByOwner(ownerAddress: PublicKey, filter: TokenAccountsFilter, commitmentOrConfig?: Commitment | GetTokenAccountsByOwnerConfig): Promise<RpcResponseAndContext<Array<{
-        pubkey: PublicKey;
-        account: AccountInfo<Buffer>;
-    }>>>;
+    getTokenAccountsByOwner(ownerAddress: PublicKey, filter: TokenAccountsFilter, commitmentOrConfig?: Commitment | GetTokenAccountsByOwnerConfig): Promise<RpcResponseAndContext<GetProgramAccountsResponse>>;
     /**
      * Fetch parsed token accounts owned by the specified account
      *
@@ -3185,10 +3191,10 @@ export class Connection {
      *
      * @return {Promise<Array<{pubkey: PublicKey, account: AccountInfo<Buffer>}>>}
      */
-    getProgramAccounts(programId: PublicKey, configOrCommitment?: GetProgramAccountsConfig | Commitment): Promise<Array<{
-        pubkey: PublicKey;
-        account: AccountInfo<Buffer>;
-    }>>;
+    getProgramAccounts(programId: PublicKey, configOrCommitment?: GetProgramAccountsConfig & Readonly<{
+        withContext: true;
+    }>): Promise<RpcResponseAndContext<GetProgramAccountsResponse>>;
+    getProgramAccounts(programId: PublicKey, configOrCommitment?: GetProgramAccountsConfig | Commitment): Promise<GetProgramAccountsResponse>;
     /**
      * Fetch and parse all the accounts owned by the specified program id
      *

package/lib/index.esm.js

@@ -1945,6 +1945,29 @@ class VersionedTransaction {
   }
 }
 
+// TODO: These constants should be removed in favor of reading them out of a
+// Syscall account
+
+/**
+ * @internal
+ */
+const NUM_TICKS_PER_SECOND = 160;
+
+/**
+ * @internal
+ */
+const DEFAULT_TICKS_PER_SLOT = 64;
+
+/**
+ * @internal
+ */
+const NUM_SLOTS_PER_SECOND = NUM_TICKS_PER_SECOND / DEFAULT_TICKS_PER_SLOT;
+
+/**
+ * @internal
+ */
+const MS_PER_SLOT = 1000 / NUM_SLOTS_PER_SECOND;
+
 const SYSVAR_CLOCK_PUBKEY = new PublicKey('SysvarC1ock11111111111111111111111111111111');
 const SYSVAR_EPOCH_SCHEDULE_PUBKEY = new PublicKey('SysvarEpochSchedu1e111111111111111111111111');
 const SYSVAR_INSTRUCTIONS_PUBKEY = new PublicKey('Sysvar1nstructions1111111111111111111111111');
@@ -2959,9 +2982,37 @@ class Loader {
         programId,
         data
       });
-      await sendAndConfirmTransaction(connection, transaction, [payer, program], {
-        commitment: 'confirmed'
+      const deployCommitment = 'processed';
+      const finalizeSignature = await connection.sendTransaction(transaction, [payer, program], {
+        preflightCommitment: deployCommitment
       });
+      const {
+        context,
+        value
+      } = await connection.confirmTransaction({
+        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
@@ -5734,29 +5785,6 @@ class RpcWebSocketClient extends RpcWebSocketCommonClient {
   }
 }
 
-// TODO: These constants should be removed in favor of reading them out of a
-// Syscall account
-
-/**
- * @internal
- */
-const NUM_TICKS_PER_SECOND = 160;
-
-/**
- * @internal
- */
-const DEFAULT_TICKS_PER_SLOT = 64;
-
-/**
- * @internal
- */
-const NUM_SLOTS_PER_SECOND = NUM_TICKS_PER_SECOND / DEFAULT_TICKS_PER_SLOT;
-
-/**
- * @internal
- */
-const MS_PER_SLOT = 1000 / NUM_SLOTS_PER_SECOND;
-
 /**
  * @internal
  */
@@ -7211,7 +7239,7 @@ 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, filter, commitmentOrConfig) {
     const {
@@ -7408,6 +7436,8 @@ class Connection {
    *
    * @return {Promise<Array<{pubkey: PublicKey, account: AccountInfo<Buffer>}>>}
    */
+
+  // eslint-disable-next-line no-dupe-class-members
   async getProgramAccounts(programId, configOrCommitment) {
     const {
       commitment,
@@ -7419,7 +7449,8 @@ class Connection {
     } = config || {};
     const args = this._buildArgs([programId.toBase58()], commitment, encoding || 'base64', 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, `failed to get accounts owned by program ${programId.toBase58()}`);
     }