@solana/web3.js 1.76.0 → 1.77.1

package/lib/index.browser.esm.js

@@ -1938,6 +1938,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');
@@ -2952,9 +2975,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
@@ -3240,29 +3291,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
  */
@@ -4694,7 +4722,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 {
@@ -4891,6 +4919,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,
@@ -4902,7 +4932,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()}`);
     }