@solana/web3.js 1.75.0 → 1.77.0

package/lib/index.browser.cjs.js

@@ -1,10 +1,7 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var buffer = require('buffer');
-var sha512 = require('@noble/hashes/sha512');
-var ed25519 = require('@noble/ed25519');
+var ed25519 = require('@noble/curves/ed25519');
 var BN = require('bn.js');
 var bs58 = require('bs58');
 var sha256 = require('@noble/hashes/sha256');
@@ -16,13 +13,12 @@ var RpcClient = require('jayson/lib/client/browser');
 var RpcWebSocketCommonClient = require('rpc-websockets/dist/lib/client');
 var createRpc = require('rpc-websockets/dist/lib/client/websocket.browser');
 var sha3 = require('@noble/hashes/sha3');
-var hmac = require('@noble/hashes/hmac');
-var secp256k1 = require('@noble/secp256k1');
+var secp256k1 = require('@noble/curves/secp256k1');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
-function _interopNamespace(e) {
-  if (e && e.__esModule) return e;
+function _interopNamespaceCompat(e) {
+  if (e && typeof e === 'object' && 'default' in e) return e;
   var n = Object.create(null);
   if (e) {
     Object.keys(e).forEach(function (k) {
@@ -35,18 +31,16 @@ function _interopNamespace(e) {
       }
     });
   }
-  n["default"] = e;
+  n.default = e;
   return Object.freeze(n);
 }
 
-var ed25519__namespace = /*#__PURE__*/_interopNamespace(ed25519);
-var BN__default = /*#__PURE__*/_interopDefaultLegacy(BN);
-var bs58__default = /*#__PURE__*/_interopDefaultLegacy(bs58);
-var BufferLayout__namespace = /*#__PURE__*/_interopNamespace(BufferLayout);
-var RpcClient__default = /*#__PURE__*/_interopDefaultLegacy(RpcClient);
-var RpcWebSocketCommonClient__default = /*#__PURE__*/_interopDefaultLegacy(RpcWebSocketCommonClient);
-var createRpc__default = /*#__PURE__*/_interopDefaultLegacy(createRpc);
-var secp256k1__namespace = /*#__PURE__*/_interopNamespace(secp256k1);
+var BN__default = /*#__PURE__*/_interopDefaultCompat(BN);
+var bs58__default = /*#__PURE__*/_interopDefaultCompat(bs58);
+var BufferLayout__namespace = /*#__PURE__*/_interopNamespaceCompat(BufferLayout);
+var RpcClient__default = /*#__PURE__*/_interopDefaultCompat(RpcClient);
+var RpcWebSocketCommonClient__default = /*#__PURE__*/_interopDefaultCompat(RpcWebSocketCommonClient);
+var createRpc__default = /*#__PURE__*/_interopDefaultCompat(createRpc);
 
 /**
  * A 64 byte secret key, the first 32 bytes of which is the
@@ -54,10 +48,9 @@ var secp256k1__namespace = /*#__PURE__*/_interopNamespace(secp256k1);
  * Read more: https://blog.mozilla.org/warner/2011/11/29/ed25519-keys/
  */
 
-ed25519__namespace.utils.sha512Sync = (...m) => sha512.sha512(ed25519__namespace.utils.concatBytes(...m));
-const generatePrivateKey = ed25519__namespace.utils.randomPrivateKey;
+const generatePrivateKey = ed25519.ed25519.utils.randomPrivateKey;
 const generateKeypair = () => {
-  const privateScalar = ed25519__namespace.utils.randomPrivateKey();
+  const privateScalar = ed25519.ed25519.utils.randomPrivateKey();
   const publicKey = getPublicKey(privateScalar);
   const secretKey = new Uint8Array(64);
   secretKey.set(privateScalar);
@@ -67,17 +60,17 @@ const generateKeypair = () => {
     secretKey
   };
 };
-const getPublicKey = ed25519__namespace.sync.getPublicKey;
+const getPublicKey = ed25519.ed25519.getPublicKey;
 function isOnCurve(publicKey) {
   try {
-    ed25519__namespace.Point.fromHex(publicKey, true /* strict */);
+    ed25519.ed25519.ExtendedPoint.fromHex(publicKey);
     return true;
   } catch {
     return false;
   }
 }
-const sign = (message, secretKey) => ed25519__namespace.sync.sign(message, secretKey.slice(0, 32));
-const verify = ed25519__namespace.sync.verify;
+const sign = (message, secretKey) => ed25519.ed25519.sign(message, secretKey.slice(0, 32));
+const verify = ed25519.ed25519.verify;
 
 const toBuffer = arr => {
   if (buffer.Buffer.isBuffer(arr)) {
@@ -163,13 +156,13 @@ class PublicKey extends Struct {
     } else {
       if (typeof value === 'string') {
         // assume base 58 encoding by default
-        const decoded = bs58__default["default"].decode(value);
+        const decoded = bs58__default.default.decode(value);
         if (decoded.length != PUBLIC_KEY_LENGTH) {
           throw new Error(`Invalid public key input`);
         }
-        this._bn = new BN__default["default"](decoded);
+        this._bn = new BN__default.default(decoded);
       } else {
-        this._bn = new BN__default["default"](value);
+        this._bn = new BN__default.default(value);
       }
       if (this._bn.byteLength() > PUBLIC_KEY_LENGTH) {
         throw new Error(`Invalid public key input`);
@@ -202,7 +195,7 @@ class PublicKey extends Struct {
    * Return the base-58 representation of the public key
    */
   toBase58() {
-    return bs58__default["default"].encode(this.toBytes());
+    return bs58__default.default.encode(this.toBytes());
   }
   toJSON() {
     return this.toBase58();
@@ -634,8 +627,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);
@@ -734,7 +727,7 @@ class Message {
     return this.instructions.map(ix => ({
       programIdIndex: ix.programIdIndex,
       accountKeyIndexes: ix.accounts,
-      data: bs58__default["default"].decode(ix.data)
+      data: bs58__default.default.decode(ix.data)
     }));
   }
   get addressTableLookups() {
@@ -750,7 +743,7 @@ class Message {
     const instructions = accountKeys.compileInstructions(args.instructions).map(ix => ({
       programIdIndex: ix.programIdIndex,
       accounts: ix.accountKeyIndexes,
-      data: bs58__default["default"].encode(ix.data)
+      data: bs58__default.default.encode(ix.data)
     }));
     return new Message({
       header,
@@ -792,7 +785,7 @@ class Message {
         accounts,
         programIdIndex
       } = instruction;
-      const data = Array.from(bs58__default["default"].decode(instruction.data));
+      const data = Array.from(bs58__default.default.decode(instruction.data));
       let keyIndicesCount = [];
       encodeLength(keyIndicesCount, accounts.length);
       let dataCount = [];
@@ -823,7 +816,7 @@ class Message {
       numReadonlyUnsignedAccounts: buffer.Buffer.from([this.header.numReadonlyUnsignedAccounts]),
       keyCount: buffer.Buffer.from(keyCount),
       keys: this.accountKeys.map(key => toBuffer(key.toBytes())),
-      recentBlockhash: bs58__default["default"].decode(this.recentBlockhash)
+      recentBlockhash: bs58__default.default.decode(this.recentBlockhash)
     };
     let signData = buffer.Buffer.alloc(2048);
     const length = signDataLayout.encode(transaction, signData);
@@ -861,7 +854,7 @@ class Message {
       byteArray = byteArray.slice(accountCount);
       const dataLength = decodeLength(byteArray);
       const dataSlice = byteArray.slice(0, dataLength);
-      const data = bs58__default["default"].encode(buffer.Buffer.from(dataSlice));
+      const data = bs58__default.default.encode(buffer.Buffer.from(dataSlice));
       byteArray = byteArray.slice(dataLength);
       instructions.push({
         programIdIndex,
@@ -875,7 +868,7 @@ class Message {
         numReadonlySignedAccounts,
         numReadonlyUnsignedAccounts
       },
-      recentBlockhash: bs58__default["default"].encode(buffer.Buffer.from(recentBlockhash)),
+      recentBlockhash: bs58__default.default.encode(buffer.Buffer.from(recentBlockhash)),
       accountKeys,
       instructions
     };
@@ -1019,7 +1012,7 @@ class MessageV0 {
       header: this.header,
       staticAccountKeysLength: new Uint8Array(encodedStaticAccountKeysLength),
       staticAccountKeys: this.staticAccountKeys.map(key => key.toBytes()),
-      recentBlockhash: bs58__default["default"].decode(this.recentBlockhash),
+      recentBlockhash: bs58__default.default.decode(this.recentBlockhash),
       instructionsLength: new Uint8Array(encodedInstructionsLength),
       serializedInstructions,
       addressTableLookupsLength: new Uint8Array(encodedAddressTableLookupsLength),
@@ -1082,7 +1075,7 @@ class MessageV0 {
     for (let i = 0; i < staticAccountKeysLength; i++) {
       staticAccountKeys.push(new PublicKey(byteArray.splice(0, PUBLIC_KEY_LENGTH)));
     }
-    const recentBlockhash = bs58__default["default"].encode(byteArray.splice(0, PUBLIC_KEY_LENGTH));
+    const recentBlockhash = bs58__default.default.encode(byteArray.splice(0, PUBLIC_KEY_LENGTH));
     const instructionCount = decodeLength(byteArray);
     const compiledInstructions = [];
     for (let i = 0; i < instructionCount; i++) {
@@ -1488,7 +1481,7 @@ class Transaction {
       return {
         programIdIndex: accountKeys.indexOf(programId.toString()),
         accounts: instruction.keys.map(meta => accountKeys.indexOf(meta.pubkey.toString())),
-        data: bs58__default["default"].encode(data)
+        data: bs58__default.default.encode(data)
       };
     });
     compiledInstructions.forEach(instruction => {
@@ -1781,7 +1774,7 @@ class Transaction {
     for (let i = 0; i < signatureCount; i++) {
       const signature = byteArray.slice(0, SIGNATURE_LENGTH_IN_BYTES);
       byteArray = byteArray.slice(SIGNATURE_LENGTH_IN_BYTES);
-      signatures.push(bs58__default["default"].encode(buffer.Buffer.from(signature)));
+      signatures.push(bs58__default.default.encode(buffer.Buffer.from(signature)));
     }
     return Transaction.populate(Message.from(byteArray), signatures);
   }
@@ -1797,7 +1790,7 @@ class Transaction {
     }
     signatures.forEach((signature, index) => {
       const sigPubkeyPair = {
-        signature: signature == bs58__default["default"].encode(DEFAULT_SIGNATURE) ? null : bs58__default["default"].decode(signature),
+        signature: signature == bs58__default.default.encode(DEFAULT_SIGNATURE) ? null : bs58__default.default.decode(signature),
         publicKey: message.accountKeys[index]
       };
       transaction.signatures.push(sigPubkeyPair);
@@ -1814,7 +1807,7 @@ class Transaction {
       transaction.instructions.push(new TransactionInstruction({
         keys,
         programId: message.accountKeys[instruction.programIdIndex],
-        data: bs58__default["default"].decode(instruction.data)
+        data: bs58__default.default.decode(instruction.data)
       }));
     });
     transaction._message = message;
@@ -1973,6 +1966,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');
@@ -2987,9 +3003,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
@@ -3239,10 +3283,10 @@ class SolanaJSONRPCError extends Error {
 
 var fetchImpl = globalThis.fetch;
 
-class RpcWebSocketClient extends RpcWebSocketCommonClient__default["default"] {
+class RpcWebSocketClient extends RpcWebSocketCommonClient__default.default {
   constructor(address, options, generate_request_id) {
     const webSocketFactory = url => {
-      const rpc = createRpc__default["default"](url, {
+      const rpc = createRpc__default.default(url, {
         autoconnect: true,
         max_reconnects: 5,
         reconnect: true,
@@ -3275,29 +3319,6 @@ class RpcWebSocketClient extends RpcWebSocketCommonClient__default["default"] {
   }
 }
 
-// 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
  */
@@ -3496,7 +3517,7 @@ function versionedMessageFromResponse(version, response) {
       compiledInstructions: response.instructions.map(ix => ({
         programIdIndex: ix.programIdIndex,
         accountKeyIndexes: ix.accounts,
-        data: bs58__default["default"].decode(ix.data)
+        data: bs58__default.default.decode(ix.data)
       })),
       addressTableLookups: response.addressTableLookups
     });
@@ -3657,7 +3678,7 @@ function createRpcClient(url, httpHeaders, customFetch, fetchMiddleware, disable
       return await fetch(...modifiedFetchArgs);
     };
   }
-  const clientBrowser = new RpcClient__default["default"](async (request, callback) => {
+  const clientBrowser = new RpcClient__default.default(async (request, callback) => {
     const options = {
       method: 'POST',
       body: request,
@@ -4729,7 +4750,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 {
@@ -4926,6 +4947,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,
@@ -4937,7 +4960,8 @@ class Connection {
     } = config || {};
     const args = this._buildArgs([programId.toBase58()], commitment, encoding || 'base64', configWithoutEncoding);
     const unsafeRes = await this._rpcRequest('getProgramAccounts', args);
-    const res = superstruct.create(unsafeRes, jsonRpcResult(superstruct.array(KeyedAccountInfoResult)));
+    const baseSchema = superstruct.array(KeyedAccountInfoResult);
+    const res = configWithoutEncoding.withContext === true ? superstruct.create(unsafeRes, jsonRpcResultAndContext(baseSchema)) : superstruct.create(unsafeRes, jsonRpcResult(baseSchema));
     if ('error' in res) {
       throw new SolanaJSONRPCError(res.error, `failed to get accounts owned by program ${programId.toBase58()}`);
     }
@@ -4976,7 +5000,7 @@ class Connection {
     }
     let decodedSignature;
     try {
-      decodedSignature = bs58__default["default"].decode(rawSignature);
+      decodedSignature = bs58__default.default.decode(rawSignature);
     } catch (err) {
       throw new Error('signature must be base58 encoded: ' + rawSignature);
     }
@@ -6669,12 +6693,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);
@@ -7902,19 +7925,12 @@ 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__namespace.utils.hmacSha256Sync = (key, ...msgs) => {
-  const h = hmac.hmac.create(sha256.sha256, key);
-  msgs.forEach(msg => h.update(msg));
-  return h.digest();
+const ecdsaSign = (msgHash, privKey) => {
+  const signature = secp256k1.secp256k1.sign(msgHash, privKey);
+  return [signature.toCompactRawBytes(), signature.recovery];
 };
-const ecdsaSign = (msgHash, privKey) => secp256k1__namespace.signSync(msgHash, privKey, {
-  der: false,
-  recovered: true
-});
-secp256k1__namespace.utils.isValidPrivateKey;
-const publicKeyCreate = secp256k1__namespace.getPublicKey;
+secp256k1.secp256k1.utils.isValidPrivateKey;
+const publicKeyCreate = secp256k1.secp256k1.getPublicKey;
 
 const PRIVATE_KEY_BYTES = 32;
 const ETHEREUM_ADDRESS_BYTES = 20;
@@ -9182,7 +9198,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');