@solana/web3.js 2.0.0-experimental.63c7492 → 2.0.0-experimental.6466d76

package/dist/index.development.js

@@ -122,7 +122,10 @@ this.globalThis.solanaWeb3 = (function (exports) {
   // src/index.ts
   init_env_shim();
 
-  // ../addresses/dist/index.browser.js
+  // ../accounts/dist/index.browser.js
+  init_env_shim();
+
+  // ../codecs-strings/dist/index.browser.js
   init_env_shim();
 
   // ../codecs-core/dist/index.browser.js
@@ -168,11 +171,6 @@ this.globalThis.solanaWeb3 = (function (exports) {
   function isFixedSize(codec) {
     return "fixedSize" in codec && typeof codec.fixedSize === "number";
   }
-  function assertIsFixedSize(codec, message) {
-    if (!isFixedSize(codec)) {
-      throw new Error(message != null ? message : "Expected a fixed-size codec, got a variable-size one.");
-    }
-  }
   function isVariableSize(codec) {
     return !isFixedSize(codec);
   }
@@ -242,9 +240,6 @@ this.globalThis.solanaWeb3 = (function (exports) {
     });
   }
 
-  // ../codecs-strings/dist/index.browser.js
-  init_env_shim();
-
   // ../codecs-numbers/dist/index.browser.js
   init_env_shim();
   function assertNumberIsBetweenForCodec(codecDescription, min, max, value) {
@@ -535,6 +530,98 @@ this.globalThis.solanaWeb3 = (function (exports) {
     });
   }
 
+  // ../accounts/dist/index.browser.js
+  var BASE_ACCOUNT_SIZE = 128;
+  function decodeAccount(encodedAccount, decoder) {
+    try {
+      if ("exists" in encodedAccount && !encodedAccount.exists) {
+        return encodedAccount;
+      }
+      return Object.freeze({ ...encodedAccount, data: decoder.decode(encodedAccount.data) });
+    } catch (error) {
+      const newError = new Error(`Failed to decode account [${encodedAccount.address}].`);
+      newError.cause = error;
+      throw newError;
+    }
+  }
+  function accountExists(account) {
+    return !("exists" in account) || "exists" in account && account.exists;
+  }
+  function assertAccountDecoded(account) {
+    if (accountExists(account) && account.data instanceof Uint8Array) {
+      throw new Error(`Expected account [${account.address}] to be decoded.`);
+    }
+  }
+  function assertAccountsDecoded(accounts) {
+    const encoded = accounts.filter((a) => accountExists(a) && a.data instanceof Uint8Array);
+    if (encoded.length > 0) {
+      const encodedAddresses = encoded.map((a) => a.address).join(", ");
+      throw new Error(`Expected accounts [${encodedAddresses}] to be decoded.`);
+    }
+  }
+  function parseBase64RpcAccount(address2, rpcAccount) {
+    if (!rpcAccount)
+      return Object.freeze({ address: address2, exists: false });
+    const data = getBase64Encoder().encode(rpcAccount.data[0]);
+    return Object.freeze({ ...parseBaseAccount(rpcAccount), address: address2, data, exists: true });
+  }
+  function parseBase58RpcAccount(address2, rpcAccount) {
+    if (!rpcAccount)
+      return Object.freeze({ address: address2, exists: false });
+    const data = getBase58Encoder().encode(typeof rpcAccount.data === "string" ? rpcAccount.data : rpcAccount.data[0]);
+    return Object.freeze({ ...parseBaseAccount(rpcAccount), address: address2, data, exists: true });
+  }
+  function parseJsonRpcAccount(address2, rpcAccount) {
+    if (!rpcAccount)
+      return Object.freeze({ address: address2, exists: false });
+    const data = rpcAccount.data.parsed.info;
+    return Object.freeze({ ...parseBaseAccount(rpcAccount), address: address2, data, exists: true });
+  }
+  function parseBaseAccount(rpcAccount) {
+    return Object.freeze({
+      executable: rpcAccount.executable,
+      lamports: rpcAccount.lamports,
+      programAddress: rpcAccount.owner
+    });
+  }
+  async function fetchEncodedAccount(rpc, address2, config = {}) {
+    const { abortSignal, ...rpcConfig } = config;
+    const response = await rpc.getAccountInfo(address2, { ...rpcConfig, encoding: "base64" }).send({ abortSignal });
+    return parseBase64RpcAccount(address2, response.value);
+  }
+  async function fetchJsonParsedAccount(rpc, address2, config = {}) {
+    const { abortSignal, ...rpcConfig } = config;
+    const { value: account } = await rpc.getAccountInfo(address2, { ...rpcConfig, encoding: "jsonParsed" }).send({ abortSignal });
+    return !!account && typeof account === "object" && "parsed" in account.data ? parseJsonRpcAccount(address2, account) : parseBase64RpcAccount(address2, account);
+  }
+  async function fetchEncodedAccounts(rpc, addresses, config = {}) {
+    const { abortSignal, ...rpcConfig } = config;
+    const response = await rpc.getMultipleAccounts(addresses, { ...rpcConfig, encoding: "base64" }).send({ abortSignal });
+    return response.value.map((account, index) => parseBase64RpcAccount(addresses[index], account));
+  }
+  async function fetchJsonParsedAccounts(rpc, addresses, config = {}) {
+    const { abortSignal, ...rpcConfig } = config;
+    const response = await rpc.getMultipleAccounts(addresses, { ...rpcConfig, encoding: "jsonParsed" }).send({ abortSignal });
+    return response.value.map((account, index) => {
+      return !!account && typeof account === "object" && "parsed" in account.data ? parseJsonRpcAccount(addresses[index], account) : parseBase64RpcAccount(addresses[index], account);
+    });
+  }
+  function assertAccountExists(account) {
+    if (!account.exists) {
+      throw new Error(`Expected account [${account.address}] to exist.`);
+    }
+  }
+  function assertAccountsExist(accounts) {
+    const missingAccounts = accounts.filter((a) => !a.exists);
+    if (missingAccounts.length > 0) {
+      const missingAddresses = missingAccounts.map((a) => a.address);
+      throw new Error(`Expected accounts [${missingAddresses.join(", ")}] to exist.`);
+    }
+  }
+
+  // ../addresses/dist/index.browser.js
+  init_env_shim();
+
   // ../assertions/dist/index.browser.js
   init_env_shim();
   function assertIsSecureContext() {
@@ -886,6 +973,12 @@ this.globalThis.solanaWeb3 = (function (exports) {
     return getAddressDecoder().decode(new Uint8Array(publicKeyBytes));
   }
 
+  // ../functional/dist/index.browser.js
+  init_env_shim();
+  function pipe(init, ...fns) {
+    return fns.reduce((acc, fn) => fn(acc), init);
+  }
+
   // ../instructions/dist/index.browser.js
   init_env_shim();
   var AccountRole = /* @__PURE__ */ ((AccountRole22) => {
@@ -1162,9 +1255,6 @@ this.globalThis.solanaWeb3 = (function (exports) {
   function getArrayEncoder(item, config = {}) {
     var _a, _b;
     const size = (_a = config.size) != null ? _a : getU32Encoder();
-    if (size === "remainder") {
-      assertIsFixedSize(item, 'Codecs of "remainder" size must have fixed-size items.');
-    }
     const fixedSize = computeArrayLikeCodecSize(size, getFixedSize(item));
     const maxSize = (_b = computeArrayLikeCodecSize(size, getMaxSize(item))) != null ? _b : void 0;
     return createEncoder({
@@ -1192,9 +1282,6 @@ this.globalThis.solanaWeb3 = (function (exports) {
   function getArrayDecoder(item, config = {}) {
     var _a, _b;
     const size = (_a = config.size) != null ? _a : getU32Decoder();
-    if (size === "remainder") {
-      assertIsFixedSize(item, 'Codecs of "remainder" size must have fixed-size items.');
-    }
     const itemSize = getFixedSize(item);
     const fixedSize = computeArrayLikeCodecSize(size, itemSize);
     const maxSize = (_b = computeArrayLikeCodecSize(size, getMaxSize(item))) != null ? _b : void 0;
@@ -1205,7 +1292,15 @@ this.globalThis.solanaWeb3 = (function (exports) {
         if (typeof size === "object" && bytes.slice(offset).length === 0) {
           return [array, offset];
         }
-        const [resolvedSize, newOffset] = readArrayLikeCodecSize(size, itemSize, bytes, offset);
+        if (size === "remainder") {
+          while (offset < bytes.length) {
+            const [value, newOffset2] = item.read(bytes, offset);
+            offset = newOffset2;
+            array.push(value);
+          }
+          return [array, offset];
+        }
+        const [resolvedSize, newOffset] = typeof size === "number" ? [size, offset] : size.read(bytes, offset);
         offset = newOffset;
         for (let i = 0; i < resolvedSize; i += 1) {
           const [value, newOffset2] = item.read(bytes, offset);
@@ -1216,27 +1311,6 @@ this.globalThis.solanaWeb3 = (function (exports) {
       }
     });
   }
-  function readArrayLikeCodecSize(size, itemSize, bytes, offset) {
-    if (typeof size === "number") {
-      return [size, offset];
-    }
-    if (typeof size === "object") {
-      return size.read(bytes, offset);
-    }
-    if (size === "remainder") {
-      if (itemSize === null) {
-        throw new Error('Codecs of "remainder" size must have fixed-size items.');
-      }
-      const remainder = Math.max(0, bytes.length - offset);
-      if (remainder % itemSize !== 0) {
-        throw new Error(
-          `The remainder of the byte array (${remainder} bytes) cannot be split into chunks of ${itemSize} bytes. Codecs of "remainder" size must have a remainder that is a multiple of its item size. In other words, ${remainder} modulo ${itemSize} should be equal to zero.`
-        );
-      }
-      return [remainder / itemSize, offset];
-    }
-    throw new Error(`Unrecognized array-like codec size: ${JSON.stringify(size)}`);
-  }
   function computeArrayLikeCodecSize(size, itemSize) {
     if (typeof size !== "number")
       return null;
@@ -1334,12 +1408,6 @@ this.globalThis.solanaWeb3 = (function (exports) {
     });
   }
 
-  // ../functional/dist/index.browser.js
-  init_env_shim();
-  function pipe(init, ...fns) {
-    return fns.reduce((acc, fn) => fn(acc), init);
-  }
-
   // ../transactions/dist/index.browser.js
   function getUnsignedTransaction(transaction) {
     if ("signatures" in transaction) {
@@ -2058,6 +2126,40 @@ this.globalThis.solanaWeb3 = (function (exports) {
     }
     return accountMetas;
   }
+  function getAddressLookupMetas(compiledAddressTableLookups, addressesByLookupTableAddress) {
+    const compiledAddressTableLookupAddresses = compiledAddressTableLookups.map((l) => l.lookupTableAddress);
+    const missing = compiledAddressTableLookupAddresses.filter((a) => addressesByLookupTableAddress[a] === void 0);
+    if (missing.length > 0) {
+      const missingAddresses = missing.join(", ");
+      throw new Error(`Addresses not provided for lookup tables: [${missingAddresses}]`);
+    }
+    const readOnlyMetas = [];
+    const writableMetas = [];
+    for (const lookup of compiledAddressTableLookups) {
+      const addresses = addressesByLookupTableAddress[lookup.lookupTableAddress];
+      const highestIndex = Math.max(...lookup.readableIndices, ...lookup.writableIndices);
+      if (highestIndex >= addresses.length) {
+        throw new Error(
+          `Cannot look up index ${highestIndex} in lookup table [${lookup.lookupTableAddress}]. The lookup table may have been extended since the addresses provided were retrieved.`
+        );
+      }
+      const readOnlyForLookup = lookup.readableIndices.map((r) => ({
+        address: addresses[r],
+        addressIndex: r,
+        lookupTableAddress: lookup.lookupTableAddress,
+        role: AccountRole2.READONLY
+      }));
+      readOnlyMetas.push(...readOnlyForLookup);
+      const writableForLookup = lookup.writableIndices.map((w) => ({
+        address: addresses[w],
+        addressIndex: w,
+        lookupTableAddress: lookup.lookupTableAddress,
+        role: AccountRole2.WRITABLE
+      }));
+      writableMetas.push(...writableForLookup);
+    }
+    return [...writableMetas, ...readOnlyMetas];
+  }
   function convertInstruction(instruction, accountMetas) {
     var _a, _b;
     const programAddress = (_a = accountMetas[instruction.programAddressIndex]) == null ? void 0 : _a.address;
@@ -2104,23 +2206,23 @@ this.globalThis.solanaWeb3 = (function (exports) {
       return { ...acc, [address2]: sig };
     }, {});
   }
-  function decompileTransaction(compiledTransaction, lastValidBlockHeight) {
+  function decompileTransaction(compiledTransaction, config) {
+    var _a;
     const { compiledMessage } = compiledTransaction;
-    if ("addressTableLookups" in compiledMessage && compiledMessage.addressTableLookups.length > 0) {
-      throw new Error("Cannot convert transaction with addressTableLookups");
-    }
     const feePayer = compiledMessage.staticAccounts[0];
     if (!feePayer)
       throw new Error("No fee payer set in CompiledTransaction");
     const accountMetas = getAccountMetas(compiledMessage);
+    const accountLookupMetas = "addressTableLookups" in compiledMessage && compiledMessage.addressTableLookups !== void 0 && compiledMessage.addressTableLookups.length > 0 ? getAddressLookupMetas(compiledMessage.addressTableLookups, (_a = config == null ? void 0 : config.addressesByLookupTableAddress) != null ? _a : {}) : [];
+    const transactionMetas = [...accountMetas, ...accountLookupMetas];
     const instructions = compiledMessage.instructions.map(
-      (compiledInstruction) => convertInstruction(compiledInstruction, accountMetas)
+      (compiledInstruction) => convertInstruction(compiledInstruction, transactionMetas)
     );
     const firstInstruction = instructions[0];
     const lifetimeConstraint = getLifetimeConstraint(
       compiledMessage.lifetimeToken,
       firstInstruction,
-      lastValidBlockHeight
+      config == null ? void 0 : config.lastValidBlockHeight
     );
     const signatures = convertSignatures(compiledTransaction);
     return pipe(
@@ -2153,14 +2255,14 @@ this.globalThis.solanaWeb3 = (function (exports) {
   function getTransactionEncoder() {
     return mapEncoder(getCompiledTransactionEncoder(), getCompiledTransaction);
   }
-  function getTransactionDecoder(lastValidBlockHeight) {
+  function getTransactionDecoder(config) {
     return mapDecoder(
       getCompiledTransactionDecoder(),
-      (compiledTransaction) => decompileTransaction(compiledTransaction, lastValidBlockHeight)
+      (compiledTransaction) => decompileTransaction(compiledTransaction, config)
     );
   }
-  function getTransactionCodec(lastValidBlockHeight) {
-    return combineCodec(getTransactionEncoder(), getTransactionDecoder(lastValidBlockHeight));
+  function getTransactionCodec(config) {
+    return combineCodec(getTransactionEncoder(), getTransactionDecoder(config));
   }
   var base58Decoder;
   function getSignatureFromTransaction(transaction) {
@@ -2206,11 +2308,15 @@ this.globalThis.solanaWeb3 = (function (exports) {
       return (_b = (_a = i.accounts) == null ? void 0 : _a.filter((a) => isSignerRole2(a.role))) != null ? _b : [];
     }).map((a) => a.address);
     const requiredSigners = /* @__PURE__ */ new Set([transaction.feePayer, ...signerAddressesFromInstructions]);
+    const missingSigs = [];
     requiredSigners.forEach((address2) => {
       if (!transaction.signatures[address2]) {
-        throw new Error(`Transaction is missing signature for address \`${address2}\``);
+        missingSigs.push(address2);
       }
     });
+    if (missingSigs.length > 0) {
+      throw new Error("Transaction is missing signatures for addresses: " + missingSigs.join(", "));
+    }
   }
   function getBase64EncodedWireTransaction(transaction) {
     const wireTransactionBytes = getTransactionEncoder().encode(transaction);
@@ -2388,32 +2494,224 @@ this.globalThis.solanaWeb3 = (function (exports) {
 
   // ../rpc-core/dist/index.browser.js
   init_env_shim();
-  function visitNode(value, keyPath, onIntegerOverflow) {
-    if (Array.isArray(value)) {
-      return value.map(
-        (element, ii) => visitNode(element, [...keyPath, ii], onIntegerOverflow)
-      );
-    } else if (typeof value === "object" && value !== null) {
-      const out = {};
-      for (const propName in value) {
-        if (Object.prototype.hasOwnProperty.call(value, propName)) {
-          out[propName] = visitNode(value[propName], [...keyPath, propName], onIntegerOverflow);
+  function createJsonRpcApi(config) {
+    return new Proxy({}, {
+      defineProperty() {
+        return false;
+      },
+      deleteProperty() {
+        return false;
+      },
+      get(...args) {
+        const [_, p] = args;
+        const methodName = p.toString();
+        return function(...rawParams) {
+          const params = (config == null ? void 0 : config.parametersTransformer) ? config == null ? void 0 : config.parametersTransformer(rawParams, methodName) : rawParams;
+          const responseTransformer = (config == null ? void 0 : config.responseTransformer) ? config == null ? void 0 : config.responseTransformer : (rawResponse) => rawResponse;
+          return {
+            methodName,
+            params,
+            responseTransformer
+          };
+        };
+      }
+    });
+  }
+  function createJsonRpcSubscriptionsApi(config) {
+    return new Proxy({}, {
+      defineProperty() {
+        return false;
+      },
+      deleteProperty() {
+        return false;
+      },
+      get(...args) {
+        const [_, p] = args;
+        const notificationName = p.toString();
+        return function(...rawParams) {
+          const params = (config == null ? void 0 : config.parametersTransformer) ? config == null ? void 0 : config.parametersTransformer(rawParams, notificationName) : rawParams;
+          const responseTransformer = (config == null ? void 0 : config.responseTransformer) ? config == null ? void 0 : config.responseTransformer : (rawResponse) => rawResponse;
+          const subscribeMethodName = (config == null ? void 0 : config.subscribeNotificationNameTransformer) ? config == null ? void 0 : config.subscribeNotificationNameTransformer(notificationName) : notificationName;
+          const unsubscribeMethodName = (config == null ? void 0 : config.unsubscribeNotificationNameTransformer) ? config == null ? void 0 : config.unsubscribeNotificationNameTransformer(notificationName) : notificationName;
+          return {
+            params,
+            responseTransformer,
+            subscribeMethodName,
+            unsubscribeMethodName
+          };
+        };
+      }
+    });
+  }
+  function applyDefaultCommitment({
+    commitmentPropertyName,
+    params,
+    optionsObjectPositionInParams,
+    overrideCommitment
+  }) {
+    const paramInTargetPosition = params[optionsObjectPositionInParams];
+    if (
+      // There's no config.
+      paramInTargetPosition === void 0 || // There is a config object.
+      paramInTargetPosition && typeof paramInTargetPosition === "object" && !Array.isArray(paramInTargetPosition)
+    ) {
+      if (
+        // The config object already has a commitment set.
+        paramInTargetPosition && commitmentPropertyName in paramInTargetPosition
+      ) {
+        if (!paramInTargetPosition[commitmentPropertyName] || paramInTargetPosition[commitmentPropertyName] === "finalized") {
+          const nextParams = [...params];
+          const {
+            [commitmentPropertyName]: _,
+            // eslint-disable-line @typescript-eslint/no-unused-vars
+            ...rest
+          } = paramInTargetPosition;
+          if (Object.keys(rest).length > 0) {
+            nextParams[optionsObjectPositionInParams] = rest;
+          } else {
+            if (optionsObjectPositionInParams === nextParams.length - 1) {
+              nextParams.length--;
+            } else {
+              nextParams[optionsObjectPositionInParams] = void 0;
+            }
+          }
+          return nextParams;
         }
+      } else if (overrideCommitment !== "finalized") {
+        const nextParams = [...params];
+        nextParams[optionsObjectPositionInParams] = {
+          ...paramInTargetPosition,
+          [commitmentPropertyName]: overrideCommitment
+        };
+        return nextParams;
       }
-      return out;
-    } else if (typeof value === "bigint") {
-      if (onIntegerOverflow && (value > Number.MAX_SAFE_INTEGER || value < -Number.MAX_SAFE_INTEGER)) {
-        onIntegerOverflow(keyPath, value);
+    }
+    return params;
+  }
+  function downcastNodeToNumberIfBigint(value) {
+    return typeof value === "bigint" ? (
+      // FIXME(solana-labs/solana/issues/30341) Create a data type to represent u64 in the Solana
+      // JSON RPC implementation so that we can throw away this entire patcher instead of unsafely
+      // downcasting `bigints` to `numbers`.
+      Number(value)
+    ) : value;
+  }
+  function getIntegerOverflowNodeVisitor(onIntegerOverflow) {
+    return (value, { keyPath }) => {
+      if (typeof value === "bigint") {
+        if (onIntegerOverflow && (value > Number.MAX_SAFE_INTEGER || value < -Number.MAX_SAFE_INTEGER)) {
+          onIntegerOverflow(keyPath, value);
+        }
       }
-      return Number(value);
-    } else {
       return value;
-    }
-  }
-  function patchParamsForSolanaLabsRpc(params, onIntegerOverflow) {
-    return visitNode(params, [], onIntegerOverflow);
+    };
   }
+  var OPTIONS_OBJECT_POSITION_BY_METHOD = {
+    accountNotifications: 1,
+    blockNotifications: 1,
+    getAccountInfo: 1,
+    getBalance: 1,
+    getBlock: 1,
+    getBlockHeight: 0,
+    getBlockProduction: 0,
+    getBlocks: 2,
+    getBlocksWithLimit: 2,
+    getConfirmedBlock: 1,
+    getConfirmedBlocks: 1,
+    getConfirmedBlocksWithLimit: 2,
+    getConfirmedSignaturesForAddress2: 1,
+    getConfirmedTransaction: 1,
+    getEpochInfo: 0,
+    getFeeCalculatorForBlockhash: 1,
+    getFeeForMessage: 1,
+    getFees: 1,
+    getInflationGovernor: 0,
+    getInflationReward: 1,
+    getLargestAccounts: 0,
+    getLatestBlockhash: 0,
+    getLeaderSchedule: 1,
+    getMinimumBalanceForRentExemption: 1,
+    getMultipleAccounts: 1,
+    getProgramAccounts: 1,
+    getRecentBlockhash: 1,
+    getSignaturesForAddress: 1,
+    getSlot: 0,
+    getSlotLeader: 0,
+    getStakeActivation: 1,
+    getStakeMinimumDelegation: 0,
+    getSupply: 0,
+    getTokenAccountBalance: 1,
+    getTokenAccountsByDelegate: 2,
+    getTokenAccountsByOwner: 2,
+    getTokenLargestAccounts: 1,
+    getTokenSupply: 1,
+    getTransaction: 1,
+    getTransactionCount: 0,
+    getVoteAccounts: 0,
+    isBlockhashValid: 1,
+    logsNotifications: 1,
+    programNotifications: 1,
+    requestAirdrop: 2,
+    sendTransaction: 1,
+    signatureNotifications: 1,
+    simulateTransaction: 1
+  };
   var KEYPATH_WILDCARD = {};
+  function getTreeWalker(visitors) {
+    return function traverse(node, state) {
+      if (Array.isArray(node)) {
+        return node.map((element, ii) => {
+          const nextState = {
+            ...state,
+            keyPath: [...state.keyPath, ii]
+          };
+          return traverse(element, nextState);
+        });
+      } else if (typeof node === "object" && node !== null) {
+        const out = {};
+        for (const propName in node) {
+          if (!Object.prototype.hasOwnProperty.call(node, propName)) {
+            continue;
+          }
+          const nextState = {
+            ...state,
+            keyPath: [...state.keyPath, propName]
+          };
+          out[propName] = traverse(node[propName], nextState);
+        }
+        return out;
+      } else {
+        return visitors.reduce((acc, visitNode) => visitNode(acc, state), node);
+      }
+    };
+  }
+  function getParamsPatcherForSolanaLabsRpc(config) {
+    const defaultCommitment = config == null ? void 0 : config.defaultCommitment;
+    const handleIntegerOverflow = config == null ? void 0 : config.onIntegerOverflow;
+    return (rawParams, methodName) => {
+      const traverse = getTreeWalker([
+        ...handleIntegerOverflow ? [getIntegerOverflowNodeVisitor((...args) => handleIntegerOverflow(methodName, ...args))] : [],
+        downcastNodeToNumberIfBigint
+      ]);
+      const initialState = {
+        keyPath: []
+      };
+      const patchedParams = traverse(rawParams, initialState);
+      if (!Array.isArray(patchedParams)) {
+        return patchedParams;
+      }
+      const optionsObjectPositionInParams = OPTIONS_OBJECT_POSITION_BY_METHOD[methodName];
+      if (optionsObjectPositionInParams == null) {
+        return patchedParams;
+      }
+      return applyDefaultCommitment({
+        commitmentPropertyName: methodName === "sendTransaction" ? "preflightCommitment" : "commitment",
+        optionsObjectPositionInParams,
+        overrideCommitment: defaultCommitment,
+        params: patchedParams
+      });
+    };
+  }
   var jsonParsedTokenAccountsConfigs = [
     // parsed Token/Token22 token account
     ["data", "parsed", "info", "tokenAmount", "decimals"],
@@ -2801,94 +3099,65 @@ this.globalThis.solanaWeb3 = (function (exports) {
     }
     return memoizedResponseKeypaths;
   }
-  function getNextAllowedKeypaths(keyPaths, property) {
-    return keyPaths.filter((keyPath) => keyPath[0] === KEYPATH_WILDCARD && typeof property === "number" || keyPath[0] === property).map((keyPath) => keyPath.slice(1));
+  function keyPathIsAllowedToBeNumeric(keyPath, allowedNumericKeyPaths) {
+    return allowedNumericKeyPaths.some((prohibitedKeyPath) => {
+      if (prohibitedKeyPath.length !== keyPath.length) {
+        return false;
+      }
+      for (let ii = keyPath.length - 1; ii >= 0; ii--) {
+        const keyPathPart = keyPath[ii];
+        const prohibitedKeyPathPart = prohibitedKeyPath[ii];
+        if (prohibitedKeyPathPart !== keyPathPart && (prohibitedKeyPathPart !== KEYPATH_WILDCARD || typeof keyPathPart !== "number")) {
+          return false;
+        }
+      }
+      return true;
+    });
   }
-  function visitNode2(value, allowedKeypaths) {
-    if (Array.isArray(value)) {
-      return value.map((element, ii) => {
-        const nextAllowedKeypaths = getNextAllowedKeypaths(allowedKeypaths, ii);
-        return visitNode2(element, nextAllowedKeypaths);
-      });
-    } else if (typeof value === "object" && value !== null) {
-      const out = {};
-      for (const [propName, innerValue] of Object.entries(value)) {
-        const nextAllowedKeypaths = getNextAllowedKeypaths(allowedKeypaths, propName);
-        out[propName] = visitNode2(innerValue, nextAllowedKeypaths);
+  function getBigIntUpcastVisitor(allowedNumericKeyPaths) {
+    return function upcastNodeToBigIntIfNumber(value, { keyPath }) {
+      if (typeof value === "number" && Number.isInteger(value) && !keyPathIsAllowedToBeNumeric(keyPath, allowedNumericKeyPaths)) {
+        return BigInt(value);
+      } else {
+        return value;
       }
-      return out;
-    } else if (typeof value === "number" && // The presence of an allowed keypath on the route to this value implies it's allowlisted;
-    // Upcast the value to `bigint` unless an allowed keypath is present.
-    allowedKeypaths.length === 0 && // Only try to upcast an Integer to `bigint`
-    Number.isInteger(value)) {
-      return BigInt(value);
-    } else {
-      return value;
-    }
+    };
   }
   function patchResponseForSolanaLabsRpc(rawResponse, methodName) {
-    const allowedKeypaths = methodName ? getAllowedNumericKeypathsForResponse()[methodName] : void 0;
-    return visitNode2(rawResponse, allowedKeypaths != null ? allowedKeypaths : []);
+    const allowedNumericKeyPaths = methodName ? getAllowedNumericKeypathsForResponse()[methodName] : void 0;
+    const traverse = getTreeWalker([getBigIntUpcastVisitor(allowedNumericKeyPaths != null ? allowedNumericKeyPaths : [])]);
+    const initialState = {
+      keyPath: []
+    };
+    return traverse(rawResponse, initialState);
   }
-  function patchResponseForSolanaLabsRpcSubscriptions(rawResponse, methodName) {
-    const allowedKeypaths = methodName ? getAllowedNumericKeypathsForNotification()[methodName] : void 0;
-    return visitNode2(rawResponse, allowedKeypaths != null ? allowedKeypaths : []);
+  function patchResponseForSolanaLabsRpcSubscriptions(rawResponse, notificationName) {
+    const allowedNumericKeyPaths = notificationName ? getAllowedNumericKeypathsForNotification()[notificationName] : void 0;
+    const traverse = getTreeWalker([getBigIntUpcastVisitor(allowedNumericKeyPaths != null ? allowedNumericKeyPaths : [])]);
+    const initialState = {
+      keyPath: []
+    };
+    return traverse(rawResponse, initialState);
   }
   function createSolanaRpcApi(config) {
-    return new Proxy({}, {
-      defineProperty() {
-        return false;
-      },
-      deleteProperty() {
-        return false;
-      },
-      get(...args) {
-        const [_, p] = args;
-        const methodName = p.toString();
-        return function(...rawParams) {
-          const handleIntegerOverflow = config == null ? void 0 : config.onIntegerOverflow;
-          const params = patchParamsForSolanaLabsRpc(
-            rawParams,
-            handleIntegerOverflow ? (keyPath, value) => handleIntegerOverflow(methodName, keyPath, value) : void 0
-          );
-          return {
-            methodName,
-            params,
-            responseProcessor: (rawResponse) => patchResponseForSolanaLabsRpc(rawResponse, methodName)
-          };
-        };
-      }
+    return createJsonRpcApi({
+      parametersTransformer: getParamsPatcherForSolanaLabsRpc(config),
+      responseTransformer: patchResponseForSolanaLabsRpc
     });
   }
-  function createSolanaRpcSubscriptionsApi(config) {
-    return new Proxy({}, {
-      defineProperty() {
-        return false;
-      },
-      deleteProperty() {
-        return false;
-      },
-      get(...args) {
-        const [_, p] = args;
-        const notificationName = p.toString();
-        return function(...rawParams) {
-          const handleIntegerOverflow = config == null ? void 0 : config.onIntegerOverflow;
-          const params = patchParamsForSolanaLabsRpc(
-            rawParams,
-            handleIntegerOverflow ? (keyPath, value) => handleIntegerOverflow(notificationName, keyPath, value) : void 0
-          );
-          return {
-            params,
-            responseProcessor: (rawResponse) => patchResponseForSolanaLabsRpcSubscriptions(rawResponse, notificationName),
-            subscribeMethodName: notificationName.replace(/Notifications$/, "Subscribe"),
-            unsubscribeMethodName: notificationName.replace(/Notifications$/, "Unsubscribe")
-          };
-        };
-      }
+  function createSolanaRpcSubscriptionsApi_INTERNAL(config) {
+    return createJsonRpcSubscriptionsApi({
+      parametersTransformer: getParamsPatcherForSolanaLabsRpc(config),
+      responseTransformer: patchResponseForSolanaLabsRpcSubscriptions,
+      subscribeNotificationNameTransformer: (notificationName) => notificationName.replace(/Notifications$/, "Subscribe"),
+      unsubscribeNotificationNameTransformer: (notificationName) => notificationName.replace(/Notifications$/, "Unsubscribe")
     });
   }
+  function createSolanaRpcSubscriptionsApi(config) {
+    return createSolanaRpcSubscriptionsApi_INTERNAL(config);
+  }
   function createSolanaRpcSubscriptionsApi_UNSTABLE(config) {
-    return createSolanaRpcSubscriptionsApi(config);
+    return createSolanaRpcSubscriptionsApi_INTERNAL(config);
   }
 
   // ../rpc-transport/dist/index.browser.js
@@ -2923,7 +3192,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
   function createPendingRpcRequest(rpcConfig, pendingRequest) {
     return {
       async send(options) {
-        const { methodName, params, responseProcessor } = pendingRequest;
+        const { methodName, params, responseTransformer } = pendingRequest;
         const payload = createJsonRpcMessage(methodName, params);
         const response = await rpcConfig.transport({
           payload,
@@ -2932,7 +3201,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
         if ("error" in response) {
           throw new SolanaJsonRpcError(response.error);
         } else {
-          return responseProcessor ? responseProcessor(response.result) : response.result;
+          return responseTransformer ? responseTransformer(response.result, methodName) : response.result;
         }
       }
     };
@@ -2969,7 +3238,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
       }
     })();
   }
-  function createPendingRpcSubscription(rpcConfig, { params, subscribeMethodName, unsubscribeMethodName, responseProcessor }) {
+  function createPendingRpcSubscription(rpcConfig, { params, subscribeMethodName, unsubscribeMethodName, responseTransformer }) {
     return {
       async subscribe({ abortSignal }) {
         abortSignal.throwIfAborted();
@@ -3015,7 +3284,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
                 continue;
               }
               const notification = message.params.result;
-              yield responseProcessor ? responseProcessor(notification) : notification;
+              yield responseTransformer ? responseTransformer(notification, subscribeMethodName) : notification;
             }
           }
         };
@@ -3321,22 +3590,26 @@ this.globalThis.solanaWeb3 = (function (exports) {
   init_env_shim();
   var SolanaJsonRpcIntegerOverflowError = class extends Error {
     constructor(methodName, keyPath, value) {
-      const argPosition = (typeof keyPath[0] === "number" ? keyPath[0] : parseInt(keyPath[0], 10)) + 1;
-      let ordinal = "";
-      const lastDigit = argPosition % 10;
-      const lastTwoDigits = argPosition % 100;
-      if (lastDigit == 1 && lastTwoDigits != 11) {
-        ordinal = argPosition + "st";
-      } else if (lastDigit == 2 && lastTwoDigits != 12) {
-        ordinal = argPosition + "nd";
-      } else if (lastDigit == 3 && lastTwoDigits != 13) {
-        ordinal = argPosition + "rd";
+      let argumentLabel = "";
+      if (typeof keyPath[0] === "number") {
+        const argPosition = keyPath[0] + 1;
+        const lastDigit = argPosition % 10;
+        const lastTwoDigits = argPosition % 100;
+        if (lastDigit == 1 && lastTwoDigits != 11) {
+          argumentLabel = argPosition + "st";
+        } else if (lastDigit == 2 && lastTwoDigits != 12) {
+          argumentLabel = argPosition + "nd";
+        } else if (lastDigit == 3 && lastTwoDigits != 13) {
+          argumentLabel = argPosition + "rd";
+        } else {
+          argumentLabel = argPosition + "th";
+        }
       } else {
-        ordinal = argPosition + "th";
+        argumentLabel = `\`${keyPath[0].toString()}\``;
       }
       const path = keyPath.length > 1 ? keyPath.slice(1).map((pathPart) => typeof pathPart === "number" ? `[${pathPart}]` : pathPart).join(".") : null;
       super(
-        `The ${ordinal} argument to the \`${methodName}\` RPC method${path ? ` at path \`${path}\`` : ""} was \`${value}\`. This number is unsafe for use with the Solana JSON-RPC because it exceeds \`Number.MAX_SAFE_INTEGER\`.`
+        `The ${argumentLabel} argument to the \`${methodName}\` RPC method${path ? ` at path \`${path}\`` : ""} was \`${value}\`. This number is unsafe for use with the Solana JSON-RPC because it exceeds \`Number.MAX_SAFE_INTEGER\`.`
       );
       __publicField(this, "methodName");
       __publicField(this, "keyPath");
@@ -3352,6 +3625,7 @@ this.globalThis.solanaWeb3 = (function (exports) {
 
   // src/rpc-default-config.ts
   var DEFAULT_RPC_CONFIG = {
+    defaultCommitment: "confirmed",
     onIntegerOverflow(methodName, keyPath, value) {
       throw new SolanaJsonRpcIntegerOverflowError(methodName, keyPath, value);
     }
@@ -3786,22 +4060,52 @@ this.globalThis.solanaWeb3 = (function (exports) {
 
   // src/transaction-confirmation-strategy-blockheight.ts
   init_env_shim();
-  function createBlockHeightExceedencePromiseFactory(rpcSubscriptions) {
-    return async function getBlockHeightExceedencePromise({ abortSignal: callerAbortSignal, lastValidBlockHeight }) {
+  function createBlockHeightExceedencePromiseFactory({
+    rpc,
+    rpcSubscriptions
+  }) {
+    return async function getBlockHeightExceedencePromise({
+      abortSignal: callerAbortSignal,
+      commitment,
+      lastValidBlockHeight
+    }) {
       const abortController = new AbortController();
-      function handleAbort() {
+      const handleAbort = () => {
         abortController.abort();
-      }
+      };
       callerAbortSignal.addEventListener("abort", handleAbort, { signal: abortController.signal });
-      const slotNotifications = await rpcSubscriptions.slotNotifications().subscribe({ abortSignal: abortController.signal });
+      async function getBlockHeightAndDifferenceBetweenSlotHeightAndBlockHeight() {
+        const { absoluteSlot, blockHeight } = await rpc.getEpochInfo({ commitment }).send({ abortSignal: abortController.signal });
+        return {
+          blockHeight,
+          differenceBetweenSlotHeightAndBlockHeight: absoluteSlot - blockHeight
+        };
+      }
       try {
-        for await (const slotNotification of slotNotifications) {
-          if (slotNotification.slot > lastValidBlockHeight) {
-            throw new Error(
-              "The network has progressed past the last block for which this transaction could have committed."
-            );
+        const [slotNotifications, { blockHeight, differenceBetweenSlotHeightAndBlockHeight }] = await Promise.all([
+          rpcSubscriptions.slotNotifications().subscribe({ abortSignal: abortController.signal }),
+          getBlockHeightAndDifferenceBetweenSlotHeightAndBlockHeight()
+        ]);
+        if (blockHeight <= lastValidBlockHeight) {
+          let lastKnownDifferenceBetweenSlotHeightAndBlockHeight = differenceBetweenSlotHeightAndBlockHeight;
+          for await (const slotNotification of slotNotifications) {
+            const { slot } = slotNotification;
+            if (slot - lastKnownDifferenceBetweenSlotHeightAndBlockHeight > lastValidBlockHeight) {
+              const {
+                blockHeight: currentBlockHeight,
+                differenceBetweenSlotHeightAndBlockHeight: currentDifferenceBetweenSlotHeightAndBlockHeight
+              } = await getBlockHeightAndDifferenceBetweenSlotHeightAndBlockHeight();
+              if (currentBlockHeight > lastValidBlockHeight) {
+                break;
+              } else {
+                lastKnownDifferenceBetweenSlotHeightAndBlockHeight = currentDifferenceBetweenSlotHeightAndBlockHeight;
+              }
+            }
           }
         }
+        throw new Error(
+          "The network has progressed past the last block for which this transaction could have been committed."
+        );
       } finally {
         abortController.abort();
       }
@@ -3896,7 +4200,10 @@ this.globalThis.solanaWeb3 = (function (exports) {
     rpc,
     rpcSubscriptions
   }) {
-    const getBlockHeightExceedencePromise = createBlockHeightExceedencePromiseFactory(rpcSubscriptions);
+    const getBlockHeightExceedencePromise = createBlockHeightExceedencePromiseFactory({
+      rpc,
+      rpcSubscriptions
+    });
     const getRecentSignatureConfirmationPromise = createRecentSignatureConfirmationPromiseFactory(
       rpc,
       rpcSubscriptions
@@ -3929,10 +4236,16 @@ this.globalThis.solanaWeb3 = (function (exports) {
     await raceStrategies(
       getSignatureFromTransaction(config.transaction),
       config,
-      function getSpecificStrategiesForRace({ abortSignal, getBlockHeightExceedencePromise, transaction }) {
+      function getSpecificStrategiesForRace({
+        abortSignal,
+        commitment,
+        getBlockHeightExceedencePromise,
+        transaction
+      }) {
         return [
           getBlockHeightExceedencePromise({
             abortSignal,
+            commitment,
             lastValidBlockHeight: transaction.lifetimeConstraint.lastValidBlockHeight
           })
         ];
@@ -4055,8 +4368,13 @@ this.globalThis.solanaWeb3 = (function (exports) {
   }
 
   exports.AccountRole = AccountRole;
+  exports.BASE_ACCOUNT_SIZE = BASE_ACCOUNT_SIZE;
   exports.address = address;
   exports.appendTransactionInstruction = appendTransactionInstruction;
+  exports.assertAccountDecoded = assertAccountDecoded;
+  exports.assertAccountExists = assertAccountExists;
+  exports.assertAccountsDecoded = assertAccountsDecoded;
+  exports.assertAccountsExist = assertAccountsExist;
   exports.assertIsAddress = assertIsAddress;
   exports.assertIsBlockhash = assertIsBlockhash;
   exports.assertIsDurableNonceTransaction = assertIsDurableNonceTransaction;
@@ -4086,8 +4404,13 @@ this.globalThis.solanaWeb3 = (function (exports) {
   exports.createSolanaRpcSubscriptions = createSolanaRpcSubscriptions;
   exports.createSolanaRpcSubscriptions_UNSTABLE = createSolanaRpcSubscriptions_UNSTABLE;
   exports.createTransaction = createTransaction;
+  exports.decodeAccount = decodeAccount;
   exports.downgradeRoleToNonSigner = downgradeRoleToNonSigner;
   exports.downgradeRoleToReadonly = downgradeRoleToReadonly;
+  exports.fetchEncodedAccount = fetchEncodedAccount;
+  exports.fetchEncodedAccounts = fetchEncodedAccounts;
+  exports.fetchJsonParsedAccount = fetchJsonParsedAccount;
+  exports.fetchJsonParsedAccounts = fetchJsonParsedAccounts;
   exports.generateKeyPair = generateKeyPair;
   exports.getAddressCodec = getAddressCodec;
   exports.getAddressComparator = getAddressComparator;
@@ -4115,7 +4438,11 @@ this.globalThis.solanaWeb3 = (function (exports) {
   exports.isWritableRole = isWritableRole;
   exports.lamports = lamports;
   exports.mergeRoles = mergeRoles;
+  exports.parseBase58RpcAccount = parseBase58RpcAccount;
+  exports.parseBase64RpcAccount = parseBase64RpcAccount;
+  exports.parseJsonRpcAccount = parseJsonRpcAccount;
   exports.partiallySignTransaction = partiallySignTransaction;
+  exports.pipe = pipe;
   exports.prependTransactionInstruction = prependTransactionInstruction;
   exports.requestAndConfirmAirdrop = requestAndConfirmAirdrop;
   exports.sendAndConfirmDurableNonceTransaction = sendAndConfirmDurableNonceTransaction;