viem 0.2.0-jxom-local-accounts.20230321T212822 → 0.2.0-main.20230323T084936

package/dist/{chunk-IVRML3IK.mjs → chunk-FOJL5WVL.mjs}

@@ -25,7 +25,7 @@ var package_default = {
     anvil: "source .env && anvil --fork-url $VITE_ANVIL_FORK_URL --fork-block-number $VITE_ANVIL_BLOCK_NUMBER --block-time $VITE_ANVIL_BLOCK_TIME",
     bench: "vitest bench --no-threads",
     "bench:ci": "CI=true vitest bench --no-threads",
-    build: "tsup && size-limit",
+    build: "tsup",
     changeset: "changeset",
     "changeset:release": "pnpm build && changeset publish",
     "changeset:version": "changeset version && pnpm install --lockfile-only",
@@ -53,7 +53,6 @@ var package_default = {
     entry: [
       "src/index.ts",
       "src/abi.ts",
-      "src/accounts/index.ts",
       "src/chains.ts",
       "src/contract.ts",
       "src/ens.ts",
@@ -67,7 +66,6 @@ var package_default = {
   },
   files: [
     "/abi",
-    "/accounts",
     "/dist",
     "/chains",
     "/contract",
@@ -90,11 +88,6 @@ var package_default = {
       module: "./dist/abi.mts",
       default: "./dist/abi.js"
     },
-    "./accounts": {
-      types: "./dist/accounts/index.d.ts",
-      module: "./dist/accounts/index.mts",
-      default: "./dist/accounts/index.js"
-    },
     "./chains": {
       types: "./dist/chains.d.ts",
       module: "./dist/chains.mts",
@@ -149,8 +142,6 @@ var package_default = {
   dependencies: {
     "@noble/hashes": "^1.1.2",
     "@noble/secp256k1": "^1.7.1",
-    "@scure/bip32": "^1.2.0",
-    "@scure/bip39": "^1.1.1",
     "@wagmi/chains": "~0.2.11",
     abitype: "~0.7.1",
     "idna-uts46-hx": "^4.1.2",
@@ -163,7 +154,6 @@ var package_default = {
     "@adraffy/ens-normalize": "^1.8.9",
     "@changesets/changelog-github": "^0.4.5",
     "@changesets/cli": "^2.23.2",
-    "@size-limit/preset-big-lib": "^8.2.4",
     "@types/dedent": "^0.7.0",
     "@types/fs-extra": "^9.0.13",
     "@types/node": "^17.0.45",
@@ -181,7 +171,6 @@ var package_default = {
     rimraf: "^4.1.2",
     rome: "^11.0.0",
     "simple-git-hooks": "^2.8.1",
-    "size-limit": "^8.2.4",
     tsup: "^6.6.0",
     typescript: "^4.9.4",
     vite: "^4.1.4",
@@ -200,17 +189,12 @@ var package_default = {
     "wallet",
     "web3"
   ],
-  "size-limit": [
-    {
-      path: "dist/index.js"
-    }
-  ],
   "simple-git-hooks": {
     "pre-commit": "pnpm format && pnpm lint:fix"
   },
   pnpm: {
     patchedDependencies: {
-      "vitepress@1.0.0-alpha.49": "patches/vitepress@1.0.0-alpha.49.patch"
+      "vitepress@1.0.0-alpha.61": "patches/vitepress@1.0.0-alpha.61.patch"
     },
     peerDependencyRules: {
       ignoreMissing: [
@@ -234,9 +218,7 @@ var BaseError = class extends Error {
       shortMessage || "An error occurred.",
       "",
       ...args.metaMessages ? [...args.metaMessages, ""] : [],
-      ...docsPath6 ? [
-        `Docs: https://viem.sh${docsPath6}.html${args.docsSlug ? `#${args.docsSlug}` : ""}`
-      ] : [],
+      ...docsPath6 ? [`Docs: https://viem.sh${docsPath6}.html`] : [],
       ...details ? [`Details: ${details}`] : [],
       `Version: ${getVersion()}`
     ].join("\n");
@@ -537,23 +519,6 @@ var UnsupportedPackedAbiType = class extends BaseError {
   }
 };
 
-// src/errors/account.ts
-var AccountNotFoundError = class extends BaseError {
-  constructor({ docsPath: docsPath6 } = {}) {
-    super(
-      [
-        "Could not find an Account to execute with this Action.",
-        "Please provide an Account with the `account` argument on the Action, or by supplying an `account` to the WalletClient."
-      ].join("\n"),
-      {
-        docsPath: docsPath6,
-        docsSlug: "account"
-      }
-    );
-    __publicField(this, "name", "AccountNotFoundError");
-  }
-};
-
 // src/errors/address.ts
 var InvalidAddressError = class extends BaseError {
   constructor({ address }) {
@@ -618,17 +583,6 @@ var ChainMismatchError = class extends BaseError {
     __publicField(this, "name", "ChainMismatchError");
   }
 };
-var ChainNotFoundError = class extends BaseError {
-  constructor() {
-    super(
-      [
-        "No chain was provided to the request.",
-        "Please provide a chain with the `chain` argument on the Action, or by supplying a `chain` to WalletClient."
-      ].join("\n")
-    );
-    __publicField(this, "name", "ChainNotFoundError");
-  }
-};
 
 // src/constants/abis.ts
 var multicall3Abi = [
@@ -759,7 +713,7 @@ var TransactionExecutionError = class extends BaseError {
   }) {
     const prettyArgs = prettyPrint({
       chain: chain && `${chain?.name} (id: ${chain?.id})`,
-      from: account?.address,
+      from: account.address,
       to,
       value: typeof value !== "undefined" && `${formatEther(value)} ${chain?.nativeCurrency.symbol || "ETH"}`,
       data,
@@ -824,7 +778,7 @@ var WaitForTransactionReceiptTimeoutError = class extends BaseError {
 // src/errors/contract.ts
 var CallExecutionError = class extends BaseError {
   constructor(cause, {
-    account: account_,
+    account,
     docsPath: docsPath6,
     chain,
     data,
@@ -836,7 +790,6 @@ var CallExecutionError = class extends BaseError {
     to,
     value
   }) {
-    const account = account_ ? parseAccount(account_) : void 0;
     const prettyArgs = prettyPrint({
       from: account?.address,
       to,
@@ -1079,7 +1032,7 @@ var EstimateGasExecutionError = class extends BaseError {
     value
   }) {
     const prettyArgs = prettyPrint({
-      from: account?.address,
+      from: account.address,
       to,
       value: typeof value !== "undefined" && `${formatEther(value)} ${chain?.nativeCurrency.symbol || "ETH"}`,
       data,
@@ -1858,7 +1811,7 @@ function parse2(value) {
 function format2(bytes, to) {
   if (Array.isArray(bytes))
     return bytes.map((b) => format2(b, to));
-  return to === "hex" ? trim(bytesToHex(bytes)) : bytes;
+  return to === "hex" ? bytesToHex(bytes) : bytes;
 }
 function rlpToBytes(bytes, offset = 0) {
   if (bytes.length === 0)
@@ -2875,11 +2828,19 @@ function formatAbiItemWithArgs({
   ).join(", ")})`;
 }
 
-// src/accounts/utils/parseAccount.ts
-function parseAccount(account) {
-  if (typeof account === "string")
+// src/utils/account.ts
+function getAccount(account) {
+  if (typeof account === "string") {
+    if (!isAddress(account))
+      throw new InvalidAddressError({ address: account });
     return { address: account, type: "json-rpc" };
-  return account;
+  }
+  if (!isAddress(account.address))
+    throw new InvalidAddressError({ address: account.address });
+  return {
+    ...account,
+    type: "local"
+  };
 }
 
 // src/utils/promise/withCache.ts
@@ -3546,224 +3507,15 @@ ${messageBytes.length}`
   return keccak256(concat([prefixBytes, messageBytes]), to_);
 }
 
-// src/utils/typedData.ts
-function validateTypedData({
-  domain,
-  message,
-  primaryType,
-  types: types_
-}) {
-  const types = types_;
-  const validateData = (struct, value_) => {
-    for (const param of struct) {
-      const { name, type: type_ } = param;
-      const type = type_;
-      const value = value_[name];
-      const integerMatch = type.match(integerRegex);
-      if (integerMatch && (typeof value === "number" || typeof value === "bigint")) {
-        const [_type, base, size_] = integerMatch;
-        numberToHex(value, {
-          signed: base === "int",
-          size: parseInt(size_) / 8
-        });
-      }
-      if (type === "address" && typeof value === "string" && !isAddress(value))
-        throw new InvalidAddressError({ address: value });
-      const bytesMatch = type.match(bytesRegex);
-      if (bytesMatch) {
-        const [_type, size_] = bytesMatch;
-        if (size_ && size(value) !== parseInt(size_))
-          throw new BytesSizeMismatchError({
-            expectedSize: parseInt(size_),
-            givenSize: size(value)
-          });
-      }
-      const struct2 = types[type];
-      if (struct2)
-        validateData(struct2, value);
-    }
-  };
-  if (types["EIP712Domain"] && domain)
-    validateData(types["EIP712Domain"], domain);
-  if (primaryType !== "EIP712Domain") {
-    const type = types[primaryType];
-    validateData(type, message);
-  }
-}
-
-// src/utils/signature/hashTypedData.ts
-function hashTypedData({
-  domain: domain_,
-  message,
-  primaryType,
-  types: types_
-}) {
-  const domain = typeof domain_ === "undefined" ? {} : domain_;
-  const types = {
-    EIP712Domain: [
-      domain?.name && { name: "name", type: "string" },
-      domain?.version && { name: "version", type: "string" },
-      domain?.chainId && { name: "chainId", type: "uint256" },
-      domain?.verifyingContract && {
-        name: "verifyingContract",
-        type: "address"
-      },
-      domain?.salt && { name: "salt", type: "bytes32" }
-    ].filter(Boolean),
-    ...types_
-  };
-  validateTypedData({
-    domain,
-    message,
-    primaryType,
-    types
-  });
-  let parts = ["0x1901"];
-  if (domain)
-    parts.push(
-      hashDomain({
-        domain,
-        types
-      })
-    );
-  if (primaryType !== "EIP712Domain") {
-    parts.push(
-      hashStruct({
-        data: message,
-        primaryType,
-        types
-      })
-    );
-  }
-  return keccak256(concat(parts));
-}
-function hashDomain({
-  domain,
-  types
-}) {
-  return hashStruct({
-    data: domain,
-    primaryType: "EIP712Domain",
-    types
-  });
-}
-function hashStruct({
-  data,
-  primaryType,
-  types
-}) {
-  const encoded = encodeData({
-    data,
-    primaryType,
-    types
-  });
-  return keccak256(encoded);
-}
-function encodeData({
-  data,
-  primaryType,
-  types
-}) {
-  let encodedTypes = [{ type: "bytes32" }];
-  const encodedValues = [hashType({ primaryType, types })];
-  for (const field of types[primaryType]) {
-    const [type, value] = encodeField({
-      types,
-      name: field.name,
-      type: field.type,
-      value: data[field.name]
-    });
-    encodedTypes.push(type);
-    encodedValues.push(value);
-  }
-  return encodeAbiParameters(encodedTypes, encodedValues);
-}
-function hashType({
-  primaryType,
-  types
-}) {
-  const encodedHashType = toHex(encodeType({ primaryType, types }));
-  return keccak256(encodedHashType);
-}
-function encodeType({
-  primaryType,
-  types
-}) {
-  let result = "";
-  const unsortedDeps = findTypeDependencies({ primaryType, types });
-  unsortedDeps.delete(primaryType);
-  const deps = [primaryType, ...Array.from(unsortedDeps).sort()];
-  for (const type of deps) {
-    result += `${type}(${types[type].map(({ name, type: t }) => `${t} ${name}`).join(",")})`;
-  }
-  return result;
-}
-function findTypeDependencies({
-  primaryType: primaryType_,
-  types
-}, results = /* @__PURE__ */ new Set()) {
-  const match = primaryType_.match(/^\w*/u);
-  const primaryType = match?.[0];
-  if (results.has(primaryType) || types[primaryType] === void 0) {
-    return results;
-  }
-  results.add(primaryType);
-  for (const field of types[primaryType]) {
-    findTypeDependencies({ primaryType: field.type, types }, results);
-  }
-  return results;
-}
-function encodeField({
-  types,
-  name,
-  type,
-  value
-}) {
-  if (types[type] !== void 0) {
-    return [
-      { type: "bytes32" },
-      keccak256(encodeData({ data: value, primaryType: type, types }))
-    ];
-  }
-  if (type === "bytes") {
-    const prepend = value.length % 2 ? "0" : "";
-    value = `0x${prepend + value.slice(2)}`;
-    return [{ type: "bytes32" }, keccak256(value)];
-  }
-  if (type === "string")
-    return [{ type: "bytes32" }, keccak256(toHex(value))];
-  if (type.lastIndexOf("]") === type.length - 1) {
-    const parsedType = type.slice(0, type.lastIndexOf("["));
-    const typeValuePairs = value.map(
-      (item) => encodeField({
-        name,
-        type: parsedType,
-        types,
-        value: item
-      })
-    );
-    return [
-      { type: "bytes32" },
-      keccak256(
-        encodeAbiParameters(
-          typeValuePairs.map(([t]) => t),
-          typeValuePairs.map(([, v]) => v)
-        )
-      )
-    ];
-  }
-  return [{ type }, value];
-}
-
 // src/utils/signature/recoverAddress.ts
-async function recoverAddress({
+import { recoverPublicKey } from "@noble/secp256k1";
+function recoverAddress({
   hash: hash2,
   signature
 }) {
   const signatureHex = isHex(signature) ? signature : toHex(signature);
   const hashHex = isHex(hash2) ? hash2 : toHex(hash2);
   const v = hexToNumber(`0x${signatureHex.slice(130)}`);
-  const { recoverPublicKey } = await import("@noble/secp256k1");
   const publicKey = toHex(
     recoverPublicKey(
       hashHex.substring(2),
@@ -3776,75 +3528,28 @@ async function recoverAddress({
 }
 
 // src/utils/signature/recoverMessageAddress.ts
-async function recoverMessageAddress({
+function recoverMessageAddress({
   message,
   signature
 }) {
   return recoverAddress({ hash: hashMessage(message), signature });
 }
 
-// src/utils/signature/recoverTypedDataAddress.ts
-async function recoverTypedDataAddress({
-  domain,
-  message,
-  primaryType,
-  signature,
-  types
-}) {
-  return recoverAddress({
-    hash: hashTypedData({
-      domain,
-      message,
-      primaryType,
-      types
-    }),
-    signature
-  });
-}
-
 // src/utils/signature/verifyMessage.ts
-async function verifyMessage({
+function verifyMessage({
   address,
   message,
   signature
 }) {
   return isAddressEqual(
     getAddress(address),
-    await recoverMessageAddress({ message, signature })
-  );
-}
-
-// src/utils/signature/verifyTypedData.ts
-async function verifyTypedData({
-  address,
-  domain,
-  message,
-  primaryType,
-  signature,
-  types
-}) {
-  return isAddressEqual(
-    getAddress(address),
-    await recoverTypedDataAddress({
-      domain,
-      message,
-      primaryType,
-      signature,
-      types
-    })
+    recoverMessageAddress({ message, signature })
   );
 }
 
 // src/utils/transaction/assertRequest.ts
 function assertRequest(args) {
-  const {
-    account: account_,
-    gasPrice,
-    maxFeePerGas,
-    maxPriorityFeePerGas,
-    to
-  } = args;
-  const account = account_ ? parseAccount(account_) : void 0;
+  const { account, gasPrice, maxFeePerGas, maxPriorityFeePerGas, to } = args;
   if (account && !isAddress(account.address))
     throw new InvalidAddressError({ address: account.address });
   if (to && !isAddress(to))
@@ -3860,7 +3565,7 @@ function assertRequest(args) {
 // src/actions/public/call.ts
 async function call(client, args) {
   const {
-    account: account_,
+    account,
     blockNumber,
     blockTag = "latest",
     accessList,
@@ -3874,7 +3579,6 @@ async function call(client, args) {
     value,
     ...rest
   } = args;
-  const account = account_ ? parseAccount(account_) : void 0;
   try {
     assertRequest(args);
     const blockNumberHex = blockNumber ? numberToHex(blockNumber) : void 0;
@@ -3908,7 +3612,6 @@ async function call(client, args) {
   } catch (err) {
     throw getCallError(err, {
       ...args,
-      account,
       chain: client.chain
     });
   }
@@ -3922,7 +3625,6 @@ async function simulateContract(client, {
   functionName,
   ...callRequest
 }) {
-  const account = callRequest.account ? parseAccount(callRequest.account) : void 0;
   const calldata = encodeFunctionData({
     abi,
     args,
@@ -3957,7 +3659,7 @@ async function simulateContract(client, {
       args,
       docsPath: "/docs/contract/simulateContract",
       functionName,
-      sender: account?.address
+      sender: callRequest.account?.address
     });
   }
 }
@@ -4049,13 +3751,9 @@ async function createContractEventFilter(client, {
 
 // src/actions/public/estimateGas.ts
 async function estimateGas(client, args) {
-  if (!args.account)
-    throw new AccountNotFoundError({
-      docsPath: "/docs/actions/public/estimateGas"
-    });
-  const account = parseAccount(args.account);
   try {
     const {
+      account,
       accessList,
       blockNumber,
       blockTag = "latest",
@@ -4068,7 +3766,7 @@ async function estimateGas(client, args) {
       to,
       value,
       ...rest
-    } = account.type === "local" ? await prepareRequest(client, args) : args;
+    } = args.account.type === "local" ? await prepareRequest(client, args) : args;
     const blockNumberHex = blockNumber ? numberToHex(blockNumber) : void 0;
     assertRequest(args);
     const formatter = client.chain?.formatters?.transactionRequest;
@@ -4099,7 +3797,6 @@ async function estimateGas(client, args) {
   } catch (err) {
     throw getEstimateGasError(err, {
       ...args,
-      account,
       chain: client.chain
     });
   }
@@ -4113,7 +3810,6 @@ async function estimateContractGas(client, {
   functionName,
   ...request
 }) {
-  const account = parseAccount(request.account);
   const data = encodeFunctionData({
     abi,
     args,
@@ -4133,7 +3829,7 @@ async function estimateContractGas(client, {
       args,
       docsPath: "/docs/contract/simulateContract",
       functionName,
-      sender: account?.address
+      sender: request.account?.address
     });
   }
 }
@@ -5284,12 +4980,7 @@ async function addChain(client, { chain }) {
 }
 
 // src/actions/wallet/deployContract.ts
-function deployContract(walletClient, {
-  abi,
-  args,
-  bytecode,
-  ...request
-}) {
+function deployContract(walletClient, { abi, args, bytecode, ...request }) {
   const calldata = encodeDeployData({
     abi,
     args,
@@ -5330,9 +5021,10 @@ async function requestPermissions(client, permissions) {
 // src/actions/wallet/sendTransaction.ts
 async function sendTransaction(client, args) {
   const {
-    account: account_ = client.account,
+    account,
     chain = client.chain,
     accessList,
+    assertChain = true,
     data,
     gas,
     gasPrice,
@@ -5343,20 +5035,13 @@ async function sendTransaction(client, args) {
     value,
     ...rest
   } = args;
-  if (!account_)
-    throw new AccountNotFoundError({
-      docsPath: "/docs/actions/wallet/sendTransaction"
-    });
-  const account = parseAccount(account_);
   try {
     assertRequest(args);
-    const chainId = await getChainId(client);
-    if (chain !== null && chainId !== chain?.id) {
-      if (!chain)
-        throw new ChainNotFoundError();
-      throw new ChainMismatchError({ chain, currentChainId: chainId });
-    }
+    const currentChainId = await getChainId(client);
+    if (assertChain && chain && currentChainId !== chain?.id)
+      throw new ChainMismatchError({ chain, currentChainId });
     if (account.type === "local") {
+      const chainId = chain?.id ?? currentChainId;
       const request2 = await prepareRequest(client, {
         account,
         accessList,
@@ -5405,28 +5090,15 @@ async function sendTransaction(client, args) {
       params: [request]
     });
   } catch (err) {
-    throw getTransactionError(err, {
-      ...args,
-      account,
-      chain: args.chain || void 0
-    });
+    throw getTransactionError(err, args);
   }
 }
 
 // src/actions/wallet/signMessage.ts
-async function signMessage(client, {
-  account: account_ = client.account,
-  data,
-  message
-}) {
-  if (!account_)
-    throw new AccountNotFoundError({
-      docsPath: "/docs/actions/wallet/signMessage"
-    });
-  const account = parseAccount(account_);
+async function signMessage(client, { account, data, message }) {
   const message_ = message || data;
   if (account.type === "local")
-    return account.signMessage({ message: message_ });
+    return account.signMessage(message_);
   return client.request({
     method: "personal_sign",
     params: [toHex(message_), account.address]
@@ -5435,17 +5107,12 @@ async function signMessage(client, {
 
 // src/actions/wallet/signTypedData.ts
 async function signTypedData(client, {
-  account: account_ = client.account,
+  account,
   domain,
   message,
   primaryType,
   types: types_
 }) {
-  if (!account_)
-    throw new AccountNotFoundError({
-      docsPath: "/docs/actions/wallet/signTypedData"
-    });
-  const account = parseAccount(account_);
   const types = {
     EIP712Domain: [
       domain?.name && { name: "name", type: "string" },
@@ -5481,6 +5148,47 @@ async function signTypedData(client, {
     params: [account.address, typedData]
   });
 }
+function validateTypedData({
+  domain,
+  message,
+  primaryType,
+  types: types_
+}) {
+  const types = types_;
+  const validateData = (struct, value_) => {
+    for (const param of struct) {
+      const { name, type: type_ } = param;
+      const type2 = type_;
+      const value = value_[name];
+      const integerMatch = type2.match(integerRegex);
+      if (integerMatch && (typeof value === "number" || typeof value === "bigint")) {
+        const [_type, base, size_] = integerMatch;
+        numberToHex(value, {
+          signed: base === "int",
+          size: parseInt(size_) / 8
+        });
+      }
+      if (type2 === "address" && typeof value === "string" && !isAddress(value))
+        throw new InvalidAddressError({ address: value });
+      const bytesMatch = type2.match(bytesRegex);
+      if (bytesMatch) {
+        const [_type, size_] = bytesMatch;
+        if (size_ && size(value) !== parseInt(size_))
+          throw new BytesSizeMismatchError({
+            expectedSize: parseInt(size_),
+            givenSize: size(value)
+          });
+      }
+      const struct2 = types[type2];
+      if (struct2)
+        validateData(struct2, value);
+    }
+  };
+  if (types["EIP712Domain"] && domain)
+    validateData(types["EIP712Domain"], domain);
+  const type = types[primaryType];
+  validateData(type, message);
+}
 
 // src/actions/wallet/switchChain.ts
 async function switchChain(client, { id: id2 }) {
@@ -5554,17 +5262,7 @@ function parseGwei(ether, unit = "wei") {
 // src/utils/transaction/prepareRequest.ts
 var defaultTip = parseGwei("1.5");
 async function prepareRequest(client, args) {
-  const {
-    account: account_,
-    gas,
-    gasPrice,
-    maxFeePerGas,
-    maxPriorityFeePerGas,
-    nonce
-  } = args;
-  if (!account_)
-    throw new AccountNotFoundError();
-  const account = parseAccount(account_);
+  const { account, gas, gasPrice, maxFeePerGas, maxPriorityFeePerGas, nonce } = args;
   const block = await getBlock(client, { blockTag: "latest" });
   const request = { ...args, from: account.address };
   if (typeof nonce === "undefined")
@@ -5756,7 +5454,6 @@ export {
   getEventSelector,
   getFunctionSelector,
   isAddress,
-  checksumAddress,
   getAddress,
   getContractAddress2 as getContractAddress,
   getCreateAddress,
@@ -5784,7 +5481,7 @@ export {
   parseAbiItem,
   parseAbiParameter,
   parseAbiParameters,
-  parseAccount,
+  getAccount,
   isDeterministicError,
   buildRequest,
   defineChain,
@@ -5810,13 +5507,9 @@ export {
   getSocket,
   rpc,
   hashMessage,
-  validateTypedData,
-  hashTypedData,
   recoverAddress,
   recoverMessageAddress,
-  recoverTypedDataAddress,
   verifyMessage,
-  verifyTypedData,
   assertRequest,
   call,
   simulateContract,
@@ -5900,4 +5593,4 @@ export {
   formatGwei,
   parseEther
 };
-//# sourceMappingURL=chunk-IVRML3IK.mjs.map
+//# sourceMappingURL=chunk-FOJL5WVL.mjs.map