@solana/web3.js 1.75.0 → 1.77.0

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

@@ -1,6 +1,5 @@
 import { Buffer } from 'buffer';
-import { sha512 } from '@noble/hashes/sha512';
-import * as ed25519 from '@noble/ed25519';
+import { ed25519 } from '@noble/curves/ed25519';
 import BN from 'bn.js';
 import bs58 from 'bs58';
 import { sha256 } from '@noble/hashes/sha256';
@@ -20,8 +19,7 @@ import * as nodeFetch from 'node-fetch';
 import RpcWebSocketCommonClient from 'rpc-websockets/dist/lib/client';
 import WebsocketFactory from 'rpc-websockets/dist/lib/client/websocket';
 import { keccak_256 } from '@noble/hashes/sha3';
-import { hmac } from '@noble/hashes/hmac';
-import * as secp256k1 from '@noble/secp256k1';
+import { secp256k1 } from '@noble/curves/secp256k1';
 
 /**
  * A 64 byte secret key, the first 32 bytes of which is the
@@ -29,7 +27,6 @@ import * as secp256k1 from '@noble/secp256k1';
  * Read more: https://blog.mozilla.org/warner/2011/11/29/ed25519-keys/
  */
 
-ed25519.utils.sha512Sync = (...m) => sha512(ed25519.utils.concatBytes(...m));
 const generatePrivateKey = ed25519.utils.randomPrivateKey;
 const generateKeypair = () => {
   const privateScalar = ed25519.utils.randomPrivateKey();
@@ -42,17 +39,17 @@ const generateKeypair = () => {
     secretKey
   };
 };
-const getPublicKey = ed25519.sync.getPublicKey;
+const getPublicKey = ed25519.getPublicKey;
 function isOnCurve(publicKey) {
   try {
-    ed25519.Point.fromHex(publicKey, true /* strict */);
+    ed25519.ExtendedPoint.fromHex(publicKey);
     return true;
   } catch {
     return false;
   }
 }
-const sign = (message, secretKey) => ed25519.sync.sign(message, secretKey.slice(0, 32));
-const verify = ed25519.sync.verify;
+const sign = (message, secretKey) => ed25519.sign(message, secretKey.slice(0, 32));
+const verify = ed25519.verify;
 
 const toBuffer = arr => {
   if (Buffer.isBuffer(arr)) {
@@ -609,8 +606,8 @@ class CompiledKeys {
       getOrInsertDefault(ix.programId).isInvoked = true;
       for (const accountMeta of ix.keys) {
         const keyMeta = getOrInsertDefault(accountMeta.pubkey);
-        keyMeta.isSigner || (keyMeta.isSigner = accountMeta.isSigner);
-        keyMeta.isWritable || (keyMeta.isWritable = accountMeta.isWritable);
+        keyMeta.isSigner ||= accountMeta.isSigner;
+        keyMeta.isWritable ||= accountMeta.isWritable;
       }
     }
     return new CompiledKeys(payer, keyMetaMap);
@@ -1948,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');
@@ -2962,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
@@ -5737,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
  */
@@ -7214,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 {
@@ -7411,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,
@@ -7422,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()}`);
     }
@@ -9154,12 +9182,11 @@ class Connection {
    * @internal
    */
   _onSubscriptionStateChange(clientSubscriptionId, callback) {
-    var _this$_subscriptionSt;
     const hash = this._subscriptionHashByClientSubscriptionId[clientSubscriptionId];
     if (hash == null) {
       return () => {};
     }
-    const stateChangeCallbacks = (_this$_subscriptionSt = this._subscriptionStateChangeCallbacksByHash)[hash] || (_this$_subscriptionSt[hash] = new Set());
+    const stateChangeCallbacks = this._subscriptionStateChangeCallbacksByHash[hash] ||= new Set();
     stateChangeCallbacks.add(callback);
     return () => {
       stateChangeCallbacks.delete(callback);
@@ -10387,17 +10414,10 @@ class Ed25519Program {
 }
 Ed25519Program.programId = new PublicKey('Ed25519SigVerify111111111111111111111111111');
 
-// Supply a synchronous hashing algorithm to make this
-// library interoperable with the synchronous APIs in web3.js.
-secp256k1.utils.hmacSha256Sync = (key, ...msgs) => {
-  const h = hmac.create(sha256, key);
-  msgs.forEach(msg => h.update(msg));
-  return h.digest();
+const ecdsaSign = (msgHash, privKey) => {
+  const signature = secp256k1.sign(msgHash, privKey);
+  return [signature.toCompactRawBytes(), signature.recovery];
 };
-const ecdsaSign = (msgHash, privKey) => secp256k1.signSync(msgHash, privKey, {
-  der: false,
-  recovered: true
-});
 secp256k1.utils.isValidPrivateKey;
 const publicKeyCreate = secp256k1.getPublicKey;
 
@@ -11667,7 +11687,7 @@ class VoteProgram {
   }
 }
 VoteProgram.programId = new PublicKey('Vote111111111111111111111111111111111111111');
-VoteProgram.space = 3731;
+VoteProgram.space = process.env.TEST_LIVE ? 3762 : 3731;
 
 const VALIDATOR_INFO_KEY = new PublicKey('Va1idator1nfo111111111111111111111111111111');