viem 0.0.0-tsc-and-nodenext-20230405154910 → 0.0.0-w-20230711200108

package/dist/cjs/utils/rpc.js

@@ -1,11 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rpc = exports.getSocket = void 0;
-const isomorphic_ws_1 = __importDefault(require("isomorphic-ws"));
-const index_js_1 = require("../errors/index.js");
+const request_js_1 = require("../errors/request.js");
+const createBatchScheduler_js_1 = require("./promise/createBatchScheduler.js");
 const withTimeout_js_1 = require("./promise/withTimeout.js");
 const stringify_js_1 = require("./stringify.js");
 let id = 0;
@@ -15,7 +12,13 @@ async function http(url, { body, fetchOptions = {}, timeout = 10000 }) {
         const response = await (0, withTimeout_js_1.withTimeout)(async ({ signal }) => {
             const response = await fetch(url, {
                 ...fetchOptions,
-                body: (0, stringify_js_1.stringify)({ jsonrpc: '2.0', id: id++, ...body }),
+                body: Array.isArray(body)
+                    ? (0, stringify_js_1.stringify)(body.map((body) => ({
+                        jsonrpc: '2.0',
+                        id: id++,
+                        ...body,
+                    })))
+                    : (0, stringify_js_1.stringify)({ jsonrpc: '2.0', id: id++, ...body }),
                 headers: {
                     ...headers,
                     'Content-Type': 'application/json',
@@ -25,7 +28,7 @@ async function http(url, { body, fetchOptions = {}, timeout = 10000 }) {
             });
             return response;
         }, {
-            errorInstance: new index_js_1.TimeoutError({ body, url }),
+            errorInstance: new request_js_1.TimeoutError({ body, url }),
             timeout,
             signal: true,
         });
@@ -37,7 +40,7 @@ async function http(url, { body, fetchOptions = {}, timeout = 10000 }) {
             data = await response.text();
         }
         if (!response.ok) {
-            throw new index_js_1.HttpRequestError({
+            throw new request_js_1.HttpRequestError({
                 body,
                 details: (0, stringify_js_1.stringify)(data.error) || response.statusText,
                 headers: response.headers,
@@ -45,19 +48,14 @@ async function http(url, { body, fetchOptions = {}, timeout = 10000 }) {
                 url,
             });
         }
-        if (data.error) {
-            throw new index_js_1.RpcError({ body, error: data.error, url });
-        }
         return data;
     }
     catch (err) {
-        if (err instanceof index_js_1.HttpRequestError)
+        if (err instanceof request_js_1.HttpRequestError)
             throw err;
-        if (err instanceof index_js_1.RpcError)
+        if (err instanceof request_js_1.TimeoutError)
             throw err;
-        if (err instanceof index_js_1.TimeoutError)
-            throw err;
-        throw new index_js_1.HttpRequestError({
+        throw new request_js_1.HttpRequestError({
             body,
             details: err.message,
             url,
@@ -69,55 +67,63 @@ async function getSocket(url_) {
     const url = new URL(url_);
     const urlKey = url.toString();
     let socket = sockets.get(urlKey);
-    // If the socket already exists, return it.
     if (socket)
         return socket;
-    const webSocket = new isomorphic_ws_1.default(url);
-    // Set up a cache for incoming "synchronous" requests.
-    const requests = new Map();
-    // Set up a cache for subscriptions (eth_subscribe).
-    const subscriptions = new Map();
-    const onMessage = ({ data }) => {
-        const message = JSON.parse(data);
-        const isSubscription = message.method === 'eth_subscription';
-        const id = isSubscription ? message.params.subscription : message.id;
-        const cache = isSubscription ? subscriptions : requests;
-        const callback = cache.get(id);
-        if (callback)
-            callback({ data });
-        if (!isSubscription)
-            cache.delete(id);
-    };
-    const onClose = () => {
-        sockets.delete(urlKey);
-        webSocket.removeEventListener('close', onClose);
-        webSocket.removeEventListener('message', onMessage);
-    };
-    // Setup event listeners for RPC & subscription responses.
-    webSocket.addEventListener('close', onClose);
-    webSocket.addEventListener('message', onMessage);
-    // Wait for the socket to open.
-    if (webSocket.readyState === isomorphic_ws_1.default.CONNECTING) {
-        await new Promise((resolve, reject) => {
-            if (!webSocket)
-                return;
-            webSocket.onopen = resolve;
-            webSocket.onerror = reject;
-        });
-    }
-    // Create a new socket instance.
-    socket = Object.assign(webSocket, {
-        requests,
-        subscriptions,
+    const { schedule } = (0, createBatchScheduler_js_1.createBatchScheduler)({
+        id: urlKey,
+        fn: async () => {
+            let WebSocket = await import('isomorphic-ws');
+            if (WebSocket.default
+                ?.constructor)
+                WebSocket = WebSocket
+                    .default;
+            else
+                WebSocket = WebSocket.WebSocket;
+            const webSocket = new WebSocket(url);
+            const requests = new Map();
+            const subscriptions = new Map();
+            const onMessage = ({ data }) => {
+                const message = JSON.parse(data);
+                const isSubscription = message.method === 'eth_subscription';
+                const id = isSubscription ? message.params.subscription : message.id;
+                const cache = isSubscription ? subscriptions : requests;
+                const callback = cache.get(id);
+                if (callback)
+                    callback({ data });
+                if (!isSubscription)
+                    cache.delete(id);
+            };
+            const onClose = () => {
+                sockets.delete(urlKey);
+                webSocket.removeEventListener('close', onClose);
+                webSocket.removeEventListener('message', onMessage);
+            };
+            webSocket.addEventListener('close', onClose);
+            webSocket.addEventListener('message', onMessage);
+            if (webSocket.readyState === WebSocket.CONNECTING) {
+                await new Promise((resolve, reject) => {
+                    if (!webSocket)
+                        return;
+                    webSocket.onopen = resolve;
+                    webSocket.onerror = reject;
+                });
+            }
+            socket = Object.assign(webSocket, {
+                requests,
+                subscriptions,
+            });
+            sockets.set(urlKey, socket);
+            return [socket];
+        },
     });
-    sockets.set(urlKey, socket);
-    return socket;
+    const [_, [socket_]] = await schedule();
+    return socket_;
 }
 exports.getSocket = getSocket;
-function webSocket(socket, { body, onData, onError, }) {
+function webSocket(socket, { body, onResponse }) {
     if (socket.readyState === socket.CLOSED ||
         socket.readyState === socket.CLOSING)
-        throw new index_js_1.WebSocketRequestError({
+        throw new request_js_1.WebSocketRequestError({
             body,
             url: socket.url,
             details: 'Socket is closed.',
@@ -127,18 +133,10 @@ function webSocket(socket, { body, onData, onError, }) {
         const message = JSON.parse(data);
         if (typeof message.id === 'number' && id_ !== message.id)
             return;
-        if (message.error) {
-            onError?.(new index_js_1.RpcError({ body, error: message.error, url: socket.url }));
-        }
-        else {
-            onData?.(message);
-        }
-        // If we are subscribing to a topic, we want to set up a listener for incoming
-        // messages.
+        onResponse?.(message);
         if (body.method === 'eth_subscribe' && typeof message.result === 'string') {
             socket.subscriptions.set(message.result, callback);
         }
-        // If we are unsubscribing from a topic, we want to remove the listener.
         if (body.method === 'eth_unsubscribe') {
             socket.subscriptions.delete(body.params?.[0]);
         }
@@ -147,17 +145,15 @@ function webSocket(socket, { body, onData, onError, }) {
     socket.send(JSON.stringify({ jsonrpc: '2.0', ...body, id: id_ }));
     return socket;
 }
-async function webSocketAsync(socket, { body, timeout = 10000, }) {
-    return (0, withTimeout_js_1.withTimeout)(() => new Promise((onData, onError) => exports.rpc.webSocket(socket, {
+async function webSocketAsync(socket, { body, timeout = 10000 }) {
+    return (0, withTimeout_js_1.withTimeout)(() => new Promise((onResponse) => exports.rpc.webSocket(socket, {
         body,
-        onData,
-        onError,
+        onResponse,
     })), {
-        errorInstance: new index_js_1.TimeoutError({ body, url: socket.url }),
+        errorInstance: new request_js_1.TimeoutError({ body, url: socket.url }),
         timeout,
     });
 }
-///////////////////////////////////////////////////
 exports.rpc = {
     http,
     webSocket,

package/dist/cjs/utils/rpc.js.map

@@ -1 +1 @@
-{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../../src/utils/rpc.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../../src/utils/rpc.ts"],"names":[],"mappings":"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"}

package/dist/cjs/utils/signature/hashMessage.js

@@ -1,13 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hashMessage = void 0;
-const index_js_1 = require("../data/index.js");
-const index_js_2 = require("../encoding/index.js");
+const concat_js_1 = require("../data/concat.js");
+const toBytes_js_1 = require("../encoding/toBytes.js");
 const keccak256_js_1 = require("../hash/keccak256.js");
 function hashMessage(message, to_) {
-    const messageBytes = (0, index_js_2.toBytes)(message);
-    const prefixBytes = (0, index_js_2.toBytes)(`\x19Ethereum Signed Message:\n${messageBytes.length}`);
-    return (0, keccak256_js_1.keccak256)((0, index_js_1.concat)([prefixBytes, messageBytes]), to_);
+    const messageBytes = (() => {
+        if (typeof message === 'string')
+            return (0, toBytes_js_1.stringToBytes)(message);
+        if (message.raw instanceof Uint8Array)
+            return message.raw;
+        return (0, toBytes_js_1.toBytes)(message.raw);
+    })();
+    const prefixBytes = (0, toBytes_js_1.stringToBytes)(`\x19Ethereum Signed Message:\n${messageBytes.length}`);
+    return (0, keccak256_js_1.keccak256)((0, concat_js_1.concat)([prefixBytes, messageBytes]), to_);
 }
 exports.hashMessage = hashMessage;
 //# sourceMappingURL=hashMessage.js.map

package/dist/cjs/utils/signature/hashMessage.js.map

@@ -1 +1 @@
-{"version":3,"file":"hashMessage.js","sourceRoot":"","sources":["../../../../src/utils/signature/hashMessage.ts"],"names":[],"mappings":";;;AACA,+CAAyC;AACzC,mDAA8C;AAC9C,uDAAgD;AAQhD,SAAgB,WAAW,CACzB,OAAe,EACf,GAAS;IAET,MAAM,YAAY,GAAG,IAAA,kBAAO,EAAC,OAAO,CAAC,CAAA;IACrC,MAAM,WAAW,GAAG,IAAA,kBAAO,EACzB,iCAAiC,YAAY,CAAC,MAAM,EAAE,CACvD,CAAA;IACD,OAAO,IAAA,wBAAS,EAAC,IAAA,iBAAM,EAAC,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;AAC5D,CAAC;AATD,kCASC"}
+{"version":3,"file":"hashMessage.js","sourceRoot":"","sources":["../../../../src/utils/signature/hashMessage.ts"],"names":[],"mappings":";;;AACA,iDAA0C;AAC1C,uDAA+D;AAC/D,uDAAgD;AAQhD,SAAgB,WAAW,CACzB,OAAwB,EACxB,GAAS;IAET,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE;QACzB,IAAI,OAAO,OAAO,KAAK,QAAQ;YAAE,OAAO,IAAA,0BAAa,EAAC,OAAO,CAAC,CAAA;QAC9D,IAAI,OAAO,CAAC,GAAG,YAAY,UAAU;YAAE,OAAO,OAAO,CAAC,GAAG,CAAA;QACzD,OAAO,IAAA,oBAAO,EAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IAC7B,CAAC,CAAC,EAAE,CAAA;IACJ,MAAM,WAAW,GAAG,IAAA,0BAAa,EAC/B,iCAAiC,YAAY,CAAC,MAAM,EAAE,CACvD,CAAA;IACD,OAAO,IAAA,wBAAS,EAAC,IAAA,kBAAM,EAAC,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,EAAE,GAAG,CAAC,CAAA;AAC5D,CAAC;AAbD,kCAaC"}

package/dist/cjs/utils/signature/hashTypedData.js

@@ -1,19 +1,21 @@
 "use strict";
-// Implementation forked and adapted from https://github.com/MetaMask/eth-sig-util/blob/main/src/sign-typed-data.ts
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hashTypedData = void 0;
-const index_js_1 = require("../abi/index.js");
-const index_js_2 = require("../data/index.js");
-const index_js_3 = require("../encoding/index.js");
-const index_js_4 = require("../hash/index.js");
+const encodeAbiParameters_js_1 = require("../abi/encodeAbiParameters.js");
+const concat_js_1 = require("../data/concat.js");
+const toHex_js_1 = require("../encoding/toHex.js");
+const keccak256_js_1 = require("../hash/keccak256.js");
 const typedData_js_1 = require("../typedData.js");
 function hashTypedData({ domain: domain_, message, primaryType, types: types_, }) {
     const domain = typeof domain_ === 'undefined' ? {} : domain_;
     const types = {
         EIP712Domain: [
-            domain?.name && { name: 'name', type: 'string' },
+            typeof domain?.name === 'string' && { name: 'name', type: 'string' },
             domain?.version && { name: 'version', type: 'string' },
-            domain?.chainId && { name: 'chainId', type: 'uint256' },
+            typeof domain?.chainId === 'number' && {
+                name: 'chainId',
+                type: 'uint256',
+            },
             domain?.verifyingContract && {
                 name: 'verifyingContract',
                 type: 'address',
@@ -22,8 +24,6 @@ function hashTypedData({ domain: domain_, message, primaryType, types: types_, }
         ].filter(Boolean),
         ...types_,
     };
-    // Need to do a runtime validation check on addresses, byte ranges, integer ranges, etc
-    // as we can't statically check this with TypeScript.
     (0, typedData_js_1.validateTypedData)({
         domain,
         message,
@@ -43,7 +43,7 @@ function hashTypedData({ domain: domain_, message, primaryType, types: types_, }
             types: types,
         }));
     }
-    return (0, index_js_4.keccak256)((0, index_js_2.concat)(parts));
+    return (0, keccak256_js_1.keccak256)((0, concat_js_1.concat)(parts));
 }
 exports.hashTypedData = hashTypedData;
 function hashDomain({ domain, types, }) {
@@ -59,7 +59,7 @@ function hashStruct({ data, primaryType, types, }) {
         primaryType,
         types,
     });
-    return (0, index_js_4.keccak256)(encoded);
+    return (0, keccak256_js_1.keccak256)(encoded);
 }
 function encodeData({ data, primaryType, types, }) {
     const encodedTypes = [{ type: 'bytes32' }];
@@ -74,11 +74,11 @@ function encodeData({ data, primaryType, types, }) {
         encodedTypes.push(type);
         encodedValues.push(value);
     }
-    return (0, index_js_1.encodeAbiParameters)(encodedTypes, encodedValues);
+    return (0, encodeAbiParameters_js_1.encodeAbiParameters)(encodedTypes, encodedValues);
 }
 function hashType({ primaryType, types, }) {
-    const encodedHashType = (0, index_js_3.toHex)(encodeType({ primaryType, types }));
-    return (0, index_js_4.keccak256)(encodedHashType);
+    const encodedHashType = (0, toHex_js_1.toHex)(encodeType({ primaryType, types }));
+    return (0, keccak256_js_1.keccak256)(encodedHashType);
 }
 function encodeType({ primaryType, types, }) {
     let result = '';
@@ -108,16 +108,16 @@ function encodeField({ types, name, type, value, }) {
     if (types[type] !== undefined) {
         return [
             { type: 'bytes32' },
-            (0, index_js_4.keccak256)(encodeData({ data: value, primaryType: type, types })),
+            (0, keccak256_js_1.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' }, (0, index_js_4.keccak256)(value)];
+        return [{ type: 'bytes32' }, (0, keccak256_js_1.keccak256)(value)];
     }
     if (type === 'string')
-        return [{ type: 'bytes32' }, (0, index_js_4.keccak256)((0, index_js_3.toHex)(value))];
+        return [{ type: 'bytes32' }, (0, keccak256_js_1.keccak256)((0, toHex_js_1.toHex)(value))];
     if (type.lastIndexOf(']') === type.length - 1) {
         const parsedType = type.slice(0, type.lastIndexOf('['));
         const typeValuePairs = value.map((item) => encodeField({
@@ -128,7 +128,7 @@ function encodeField({ types, name, type, value, }) {
         }));
         return [
             { type: 'bytes32' },
-            (0, index_js_4.keccak256)((0, index_js_1.encodeAbiParameters)(typeValuePairs.map(([t]) => t), typeValuePairs.map(([, v]) => v))),
+            (0, keccak256_js_1.keccak256)((0, encodeAbiParameters_js_1.encodeAbiParameters)(typeValuePairs.map(([t]) => t), typeValuePairs.map(([, v]) => v))),
         ];
     }
     return [{ type }, value];

package/dist/cjs/utils/signature/hashTypedData.js.map

@@ -1 +1 @@
-{"version":3,"file":"hashTypedData.js","sourceRoot":"","sources":["../../../../src/utils/signature/hashTypedData.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hashTypedData.js","sourceRoot":"","sources":["../../../../src/utils/signature/hashTypedData.ts"],"names":[],"mappings":"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"}

package/dist/cjs/utils/signature/recoverAddress.js

@@ -1,21 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.recoverAddress = void 0;
-const accounts_js_1 = require("../accounts.js");
-const index_js_1 = require("../data/index.js");
-const index_js_2 = require("../encoding/index.js");
+const publicKeyToAddress_js_1 = require("../../accounts/utils/publicKeyToAddress.js");
+const recoverPublicKey_js_1 = require("./recoverPublicKey.js");
 async function recoverAddress({ hash, signature, }) {
-    const signatureHex = (0, index_js_1.isHex)(signature) ? signature : (0, index_js_2.toHex)(signature);
-    const hashHex = (0, index_js_1.isHex)(hash) ? hash : (0, index_js_2.toHex)(hash);
-    // Derive v = recoveryId + 27 from end of the signature (27 is added when signing the message)
-    // The recoveryId represents the y-coordinate on the secp256k1 elliptic curve and can have a value [0, 1].
-    const v = (0, index_js_2.hexToNumber)(`0x${signatureHex.slice(130)}`);
-    const { secp256k1 } = await import('@noble/curves/secp256k1');
-    const publicKey = secp256k1.Signature.fromCompact(signatureHex.substring(2, 130))
-        .addRecoveryBit(v - 27)
-        .recoverPublicKey(hashHex.substring(2))
-        .toHex(false);
-    return (0, accounts_js_1.publicKeyToAddress)(`0x${publicKey}`);
+    return (0, publicKeyToAddress_js_1.publicKeyToAddress)(await (0, recoverPublicKey_js_1.recoverPublicKey)({ hash: hash, signature }));
 }
 exports.recoverAddress = recoverAddress;
 //# sourceMappingURL=recoverAddress.js.map

package/dist/cjs/utils/signature/recoverAddress.js.map

@@ -1 +1 @@
-{"version":3,"file":"recoverAddress.js","sourceRoot":"","sources":["../../../../src/utils/signature/recoverAddress.ts"],"names":[],"mappings":";;;AACA,gDAAmD;AACnD,+CAAwC;AACxC,mDAAyD;AAQlD,KAAK,UAAU,cAAc,CAAC,EACnC,IAAI,EACJ,SAAS,GACgB;IACzB,MAAM,YAAY,GAAG,IAAA,gBAAK,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,gBAAK,EAAC,SAAS,CAAC,CAAA;IACpE,MAAM,OAAO,GAAG,IAAA,gBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,gBAAK,EAAC,IAAI,CAAC,CAAA;IAEhD,8FAA8F;IAC9F,0GAA0G;IAC1G,MAAM,CAAC,GAAG,IAAA,sBAAW,EAAC,KAAK,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAErD,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAA;IAC7D,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,WAAW,CAC/C,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAC/B;SACE,cAAc,CAAC,CAAC,GAAG,EAAE,CAAC;SACtB,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;SACtC,KAAK,CAAC,KAAK,CAAC,CAAA;IACf,OAAO,IAAA,gCAAkB,EAAC,KAAK,SAAS,EAAE,CAAC,CAAA;AAC7C,CAAC;AAnBD,wCAmBC"}
+{"version":3,"file":"recoverAddress.js","sourceRoot":"","sources":["../../../../src/utils/signature/recoverAddress.ts"],"names":[],"mappings":";;;AAEA,sFAA+E;AAG/E,+DAAwD;AAQjD,KAAK,UAAU,cAAc,CAAC,EACnC,IAAI,EACJ,SAAS,GACgB;IACzB,OAAO,IAAA,0CAAkB,EAAC,MAAM,IAAA,sCAAgB,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;AAC9E,CAAC;AALD,wCAKC"}

package/dist/cjs/utils/signature/recoverMessageAddress.js.map

@@ -1 +1 @@
-{"version":3,"file":"recoverMessageAddress.js","sourceRoot":"","sources":["../../../../src/utils/signature/recoverMessageAddress.ts"],"names":[],"mappings":";;;AACA,qDAA8C;AAC9C,2DAAoD;AAQ7C,KAAK,UAAU,qBAAqB,CAAC,EAC1C,OAAO,EACP,SAAS,GACuB;IAChC,OAAO,IAAA,kCAAc,EAAC,EAAE,IAAI,EAAE,IAAA,4BAAW,EAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,CAAA;AAClE,CAAC;AALD,sDAKC"}
+{"version":3,"file":"recoverMessageAddress.js","sourceRoot":"","sources":["../../../../src/utils/signature/recoverMessageAddress.ts"],"names":[],"mappings":";;;AAIA,qDAA8C;AAC9C,2DAAoD;AAQ7C,KAAK,UAAU,qBAAqB,CAAC,EAC1C,OAAO,EACP,SAAS,GACuB;IAChC,OAAO,IAAA,kCAAc,EAAC,EAAE,IAAI,EAAE,IAAA,4BAAW,EAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,CAAA;AAClE,CAAC;AALD,sDAKC"}

package/dist/cjs/utils/signature/recoverPublicKey.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.recoverPublicKey = void 0;
+const isHex_js_1 = require("../data/isHex.js");
+const fromHex_js_1 = require("../encoding/fromHex.js");
+const toHex_js_1 = require("../encoding/toHex.js");
+async function recoverPublicKey({ hash, signature, }) {
+    const signatureHex = (0, isHex_js_1.isHex)(signature) ? signature : (0, toHex_js_1.toHex)(signature);
+    const hashHex = (0, isHex_js_1.isHex)(hash) ? hash : (0, toHex_js_1.toHex)(hash);
+    let v = (0, fromHex_js_1.hexToNumber)(`0x${signatureHex.slice(130)}`);
+    if (v === 0 || v === 1)
+        v += 27;
+    const { secp256k1 } = await import('@noble/curves/secp256k1');
+    const publicKey = secp256k1.Signature.fromCompact(signatureHex.substring(2, 130))
+        .addRecoveryBit(v - 27)
+        .recoverPublicKey(hashHex.substring(2))
+        .toHex(false);
+    return `0x${publicKey}`;
+}
+exports.recoverPublicKey = recoverPublicKey;
+//# sourceMappingURL=recoverPublicKey.js.map

package/dist/cjs/utils/signature/recoverPublicKey.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"recoverPublicKey.js","sourceRoot":"","sources":["../../../../src/utils/signature/recoverPublicKey.ts"],"names":[],"mappings":";;;AACA,+CAAwC;AACxC,uDAAoD;AACpD,mDAA4C;AAQrC,KAAK,UAAU,gBAAgB,CAAC,EACrC,IAAI,EACJ,SAAS,GACkB;IAC3B,MAAM,YAAY,GAAG,IAAA,gBAAK,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,gBAAK,EAAC,SAAS,CAAC,CAAA;IACpE,MAAM,OAAO,GAAG,IAAA,gBAAK,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,gBAAK,EAAC,IAAI,CAAC,CAAA;IAIhD,IAAI,CAAC,GAAG,IAAA,wBAAW,EAAC,KAAK,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACnD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,CAAC,IAAI,EAAE,CAAA;IAE/B,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAA;IAC7D,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC,WAAW,CAC/C,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAC/B;SACE,cAAc,CAAC,CAAC,GAAG,EAAE,CAAC;SACtB,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;SACtC,KAAK,CAAC,KAAK,CAAC,CAAA;IACf,OAAO,KAAK,SAAS,EAAE,CAAA;AACzB,CAAC;AApBD,4CAoBC"}

package/dist/cjs/utils/signature/recoverTypedDataAddress.js.map

@@ -1 +1 @@
-{"version":3,"file":"recoverTypedDataAddress.js","sourceRoot":"","sources":["../../../../src/utils/signature/recoverTypedDataAddress.ts"],"names":[],"mappings":";;;AAOA,yDAAkD;AAClD,2DAAoD;AAU7C,KAAK,UAAU,uBAAuB,CAG3C,EACA,MAAM,EACN,OAAO,EACP,WAAW,EACX,SAAS,EACT,KAAK,GAIN;IACC,OAAO,IAAA,kCAAc,EAAC;QACpB,IAAI,EAAE,IAAA,gCAAa,EAAC;YAClB,MAAM;YACN,OAAO;YACP,WAAW;YACX,KAAK;SAC+B,CAAC;QACvC,SAAS;KACV,CAAC,CAAA;AACJ,CAAC;AAtBD,0DAsBC"}
+{"version":3,"file":"recoverTypedDataAddress.js","sourceRoot":"","sources":["../../../../src/utils/signature/recoverTypedDataAddress.ts"],"names":[],"mappings":";;;AAKA,yDAAkD;AAClD,2DAAoD;AAU7C,KAAK,UAAU,uBAAuB,CAG3C,EACA,MAAM,EACN,OAAO,EACP,WAAW,EACX,SAAS,EACT,KAAK,GAIN;IACC,OAAO,IAAA,kCAAc,EAAC;QACpB,IAAI,EAAE,IAAA,gCAAa,EAAC;YAClB,MAAM;YACN,OAAO;YACP,WAAW;YACX,KAAK;SAC0C,CAAC;QAClD,SAAS;KACV,CAAC,CAAA;AACJ,CAAC;AAtBD,0DAsBC"}

package/dist/cjs/utils/signature/verifyMessage.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verifyMessage = void 0;
-const index_js_1 = require("../index.js");
+const getAddress_js_1 = require("../address/getAddress.js");
+const isAddressEqual_js_1 = require("../address/isAddressEqual.js");
+const recoverMessageAddress_js_1 = require("./recoverMessageAddress.js");
 async function verifyMessage({ address, message, signature, }) {
-    return (0, index_js_1.isAddressEqual)((0, index_js_1.getAddress)(address), await (0, index_js_1.recoverMessageAddress)({ message, signature }));
+    return (0, isAddressEqual_js_1.isAddressEqual)((0, getAddress_js_1.getAddress)(address), await (0, recoverMessageAddress_js_1.recoverMessageAddress)({ message, signature }));
 }
 exports.verifyMessage = verifyMessage;
 //# sourceMappingURL=verifyMessage.js.map

package/dist/cjs/utils/signature/verifyMessage.js.map

@@ -1 +1 @@
-{"version":3,"file":"verifyMessage.js","sourceRoot":"","sources":["../../../../src/utils/signature/verifyMessage.ts"],"names":[],"mappings":";;;AAEA,0CAA+E;AAUxE,KAAK,UAAU,aAAa,CAAC,EAClC,OAAO,EACP,OAAO,EACP,SAAS,GACe;IACxB,OAAO,IAAA,yBAAc,EACnB,IAAA,qBAAU,EAAC,OAAO,CAAC,EACnB,MAAM,IAAA,gCAAqB,EAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CACpD,CAAA;AACH,CAAC;AATD,sCASC"}
+{"version":3,"file":"verifyMessage.js","sourceRoot":"","sources":["../../../../src/utils/signature/verifyMessage.ts"],"names":[],"mappings":";;;AAGA,4DAAqD;AACrD,oEAA6D;AAE7D,yEAAkE;AAyB3D,KAAK,UAAU,aAAa,CAAC,EAClC,OAAO,EACP,OAAO,EACP,SAAS,GACe;IACxB,OAAO,IAAA,kCAAc,EACnB,IAAA,0BAAU,EAAC,OAAO,CAAC,EACnB,MAAM,IAAA,gDAAqB,EAAC,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CACpD,CAAA;AACH,CAAC;AATD,sCASC"}

package/dist/cjs/utils/signature/verifyTypedData.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verifyTypedData = void 0;
-const index_js_1 = require("../index.js");
+const getAddress_js_1 = require("../address/getAddress.js");
+const isAddressEqual_js_1 = require("../address/isAddressEqual.js");
 const recoverTypedDataAddress_js_1 = require("./recoverTypedDataAddress.js");
 async function verifyTypedData({ address, domain, message, primaryType, signature, types, }) {
-    return (0, index_js_1.isAddressEqual)((0, index_js_1.getAddress)(address), await (0, recoverTypedDataAddress_js_1.recoverTypedDataAddress)({
+    return (0, isAddressEqual_js_1.isAddressEqual)((0, getAddress_js_1.getAddress)(address), await (0, recoverTypedDataAddress_js_1.recoverTypedDataAddress)({
         domain,
         message,
         primaryType,

package/dist/cjs/utils/signature/verifyTypedData.js.map

@@ -1 +1 @@
-{"version":3,"file":"verifyTypedData.js","sourceRoot":"","sources":["../../../../src/utils/signature/verifyTypedData.ts"],"names":[],"mappings":";;;AAEA,0CAAwD;AACxD,6EAAsE;AAa/D,KAAK,UAAU,eAAe,CAGnC,EACA,OAAO,EACP,MAAM,EACN,OAAO,EACP,WAAW,EACX,SAAS,EACT,KAAK,GAIN;IACC,OAAO,IAAA,yBAAc,EACnB,IAAA,qBAAU,EAAC,OAAO,CAAC,EACnB,MAAM,IAAA,oDAAuB,EAAC;QAC5B,MAAM;QACN,OAAO;QACP,WAAW;QACX,SAAS;QACT,KAAK;KAC+B,CAAC,CACxC,CAAA;AACH,CAAC;AAxBD,0CAwBC"}
+{"version":3,"file":"verifyTypedData.js","sourceRoot":"","sources":["../../../../src/utils/signature/verifyTypedData.ts"],"names":[],"mappings":";;;AAIA,4DAAqD;AACrD,oEAA6D;AAE7D,6EAGqC;AA0B9B,KAAK,UAAU,eAAe,CAGnC,EACA,OAAO,EACP,MAAM,EACN,OAAO,EACP,WAAW,EACX,SAAS,EACT,KAAK,GAIN;IACC,OAAO,IAAA,kCAAc,EACnB,IAAA,0BAAU,EAAC,OAAO,CAAC,EACnB,MAAM,IAAA,oDAAuB,EAAC;QAC5B,MAAM;QACN,OAAO;QACP,WAAW;QACX,SAAS;QACT,KAAK;KAC+B,CAAC,CACxC,CAAA;AACH,CAAC;AAxBD,0CAwBC"}

package/dist/cjs/utils/transaction/assertRequest.js

@@ -1,27 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertRequest = void 0;
-const index_js_1 = require("../../errors/index.js");
+const parseAccount_js_1 = require("../../accounts/utils/parseAccount.js");
+const address_js_1 = require("../../errors/address.js");
+const node_js_1 = require("../../errors/node.js");
 const transaction_js_1 = require("../../errors/transaction.js");
-const accounts_js_1 = require("../accounts.js");
-const index_js_2 = require("../address/index.js");
+const isAddress_js_1 = require("../address/isAddress.js");
 function assertRequest(args) {
     const { account: account_, gasPrice, maxFeePerGas, maxPriorityFeePerGas, to, } = args;
-    const account = account_ ? (0, accounts_js_1.parseAccount)(account_) : undefined;
-    if (account && !(0, index_js_2.isAddress)(account.address))
-        throw new index_js_1.InvalidAddressError({ address: account.address });
-    if (to && !(0, index_js_2.isAddress)(to))
-        throw new index_js_1.InvalidAddressError({ address: to });
+    const account = account_ ? (0, parseAccount_js_1.parseAccount)(account_) : undefined;
+    if (account && !(0, isAddress_js_1.isAddress)(account.address))
+        throw new address_js_1.InvalidAddressError({ address: account.address });
+    if (to && !(0, isAddress_js_1.isAddress)(to))
+        throw new address_js_1.InvalidAddressError({ address: to });
     if (typeof gasPrice !== 'undefined' &&
         (typeof maxFeePerGas !== 'undefined' ||
             typeof maxPriorityFeePerGas !== 'undefined'))
         throw new transaction_js_1.FeeConflictError();
     if (maxFeePerGas && maxFeePerGas > 2n ** 256n - 1n)
-        throw new index_js_1.FeeCapTooHighError({ maxFeePerGas });
+        throw new node_js_1.FeeCapTooHighError({ maxFeePerGas });
     if (maxPriorityFeePerGas &&
         maxFeePerGas &&
         maxPriorityFeePerGas > maxFeePerGas)
-        throw new index_js_1.TipAboveFeeCapError({ maxFeePerGas, maxPriorityFeePerGas });
+        throw new node_js_1.TipAboveFeeCapError({ maxFeePerGas, maxPriorityFeePerGas });
 }
 exports.assertRequest = assertRequest;
 //# sourceMappingURL=assertRequest.js.map

package/dist/cjs/utils/transaction/assertRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"assertRequest.js","sourceRoot":"","sources":["../../../../src/utils/transaction/assertRequest.ts"],"names":[],"mappings":";;;AACA,oDAI8B;AAC9B,gEAA8D;AAE9D,gDAA6C;AAC7C,kDAA+C;AAE/C,SAAgB,aAAa,CAAC,IAA+C;IAC3E,MAAM,EACJ,OAAO,EAAE,QAAQ,EACjB,QAAQ,EACR,YAAY,EACZ,oBAAoB,EACpB,EAAE,GACH,GAAG,IAAI,CAAA;IACR,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,0BAAY,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC7D,IAAI,OAAO,IAAI,CAAC,IAAA,oBAAS,EAAC,OAAO,CAAC,OAAO,CAAC;QACxC,MAAM,IAAI,8BAAmB,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;IAC7D,IAAI,EAAE,IAAI,CAAC,IAAA,oBAAS,EAAC,EAAE,CAAC;QAAE,MAAM,IAAI,8BAAmB,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAA;IACxE,IACE,OAAO,QAAQ,KAAK,WAAW;QAC/B,CAAC,OAAO,YAAY,KAAK,WAAW;YAClC,OAAO,oBAAoB,KAAK,WAAW,CAAC;QAE9C,MAAM,IAAI,iCAAgB,EAAE,CAAA;IAE9B,IAAI,YAAY,IAAI,YAAY,GAAG,EAAE,IAAI,IAAI,GAAG,EAAE;QAChD,MAAM,IAAI,6BAAkB,CAAC,EAAE,YAAY,EAAE,CAAC,CAAA;IAChD,IACE,oBAAoB;QACpB,YAAY;QACZ,oBAAoB,GAAG,YAAY;QAEnC,MAAM,IAAI,8BAAmB,CAAC,EAAE,YAAY,EAAE,oBAAoB,EAAE,CAAC,CAAA;AACzE,CAAC;AA3BD,sCA2BC"}
+{"version":3,"file":"assertRequest.js","sourceRoot":"","sources":["../../../../src/utils/transaction/assertRequest.ts"],"names":[],"mappings":";;;AAAA,0EAAmE;AAEnE,wDAA6D;AAC7D,kDAA8E;AAC9E,gEAA8D;AAE9D,0DAAmD;AAInD,SAAgB,aAAa,CAAC,IAA6B;IACzD,MAAM,EACJ,OAAO,EAAE,QAAQ,EACjB,QAAQ,EACR,YAAY,EACZ,oBAAoB,EACpB,EAAE,GACH,GAAG,IAAI,CAAA;IACR,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,8BAAY,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAC7D,IAAI,OAAO,IAAI,CAAC,IAAA,wBAAS,EAAC,OAAO,CAAC,OAAO,CAAC;QACxC,MAAM,IAAI,gCAAmB,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;IAC7D,IAAI,EAAE,IAAI,CAAC,IAAA,wBAAS,EAAC,EAAE,CAAC;QAAE,MAAM,IAAI,gCAAmB,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAA;IACxE,IACE,OAAO,QAAQ,KAAK,WAAW;QAC/B,CAAC,OAAO,YAAY,KAAK,WAAW;YAClC,OAAO,oBAAoB,KAAK,WAAW,CAAC;QAE9C,MAAM,IAAI,iCAAgB,EAAE,CAAA;IAE9B,IAAI,YAAY,IAAI,YAAY,GAAG,EAAE,IAAI,IAAI,GAAG,EAAE;QAChD,MAAM,IAAI,4BAAkB,CAAC,EAAE,YAAY,EAAE,CAAC,CAAA;IAChD,IACE,oBAAoB;QACpB,YAAY;QACZ,oBAAoB,GAAG,YAAY;QAEnC,MAAM,IAAI,6BAAmB,CAAC,EAAE,YAAY,EAAE,oBAAoB,EAAE,CAAC,CAAA;AACzE,CAAC;AA3BD,sCA2BC"}