viem 1.18.8 → 1.18.9

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # viem
 
+## 1.18.9
+
+### Patch Changes
+
+- [#1464](https://github.com/wagmi-dev/viem/pull/1464) [`32098af0`](https://github.com/wagmi-dev/viem/commit/32098af0378c47a4032155f8947f88f9990cd25d) Thanks [@jxom](https://github.com/jxom)! - Fixed issue where `getFunctionSignature`/`getFunctionSelector` would not parse nested tuples in string-based signatures.
+
 ## 1.18.8
 
 ### Patch Changes

package/_cjs/utils/contract/extractFunctionParts.js.map

@@ -1 +1 @@
-{"version":3,"file":"extractFunctionParts.js","sourceRoot":"","sources":["../../../utils/contract/extractFunctionParts.ts"],"names":[],"mappings":";;;AAEA,MAAM,WAAW,GAAG,qCAAqC,CAAA;AAIzD,SAAgB,oBAAoB,CAAC,GAAW;IAC9C,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;IACpC,MAAM,IAAI,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,SAAS,CAAA;IACpC,MAAM,IAAI,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,CAAA;IACvB,MAAM,MAAM,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,SAAS,CAAA;IACtC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAA;AAC/B,CAAC;AAND,oDAMC;AAID,SAAgB,mBAAmB,CAAC,GAAW;IAC7C,OAAO,oBAAoB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AACvC,CAAC;AAFD,kDAEC;AAID,SAAgB,qBAAqB,CAAC,GAAW;IAC/C,MAAM,MAAM,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,MAAM,CAAA;IAC/C,MAAM,WAAW,GAAG,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;IACtE,OAAO,WAAW,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAClC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;QACd,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAClD,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACrD,CAAC,CAAC,CAAA;AACL,CAAC;AARD,sDAQC;AAID,SAAgB,mBAAmB,CAAC,GAAW;IAC7C,OAAO,oBAAoB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AACvC,CAAC;AAFD,kDAEC"}
+{"version":3,"file":"extractFunctionParts.js","sourceRoot":"","sources":["../../../utils/contract/extractFunctionParts.ts"],"names":[],"mappings":";;;AAEA,MAAM,WAAW,GAAG,qCAAqC,CAAA;AAKzD,SAAgB,oBAAoB,CAAC,GAAW;IAC9C,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;IACpC,MAAM,IAAI,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,SAAS,CAAA;IACpC,MAAM,IAAI,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,CAAA;IACvB,MAAM,MAAM,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,SAAS,CAAA;IACtC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAA;AAC/B,CAAC;AAND,oDAMC;AAKD,SAAgB,mBAAmB,CAAC,GAAW;IAC7C,OAAO,oBAAoB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AACvC,CAAC;AAFD,kDAEC;AAKD,SAAgB,qBAAqB,CAAC,GAAW;IAC/C,MAAM,MAAM,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,MAAM,CAAA;IAC/C,MAAM,WAAW,GAAG,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;IACtE,OAAO,WAAW,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAClC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;QACd,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAClD,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACrD,CAAC,CAAC,CAAA;AACL,CAAC;AARD,sDAQC;AAKD,SAAgB,mBAAmB,CAAC,GAAW;IAC7C,OAAO,oBAAoB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AACvC,CAAC;AAFD,kDAEC"}

package/_cjs/utils/hash/getFunctionSignature.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFunctionSignature = void 0;
-const formatAbiItem_js_1 = require("../abi/formatAbiItem.js");
-const extractFunctionParts_js_1 = require("../contract/extractFunctionParts.js");
-const getFunctionSignature = (fn) => {
-    if (typeof fn === 'string') {
-        const name = (0, extractFunctionParts_js_1.extractFunctionName)(fn);
-        const params = (0, extractFunctionParts_js_1.extractFunctionParams)(fn) || [];
-        return `${name}(${params.map(({ type }) => type).join(',')})`;
-    }
-    return (0, formatAbiItem_js_1.formatAbiItem)(fn);
+const abitype_1 = require("abitype");
+const normalizeSignature_js_1 = require("./normalizeSignature.js");
+const getFunctionSignature = (fn_) => {
+    const fn = (() => {
+        if (typeof fn_ === 'string')
+            return fn_;
+        return (0, abitype_1.formatAbiItem)(fn_);
+    })();
+    return (0, normalizeSignature_js_1.normalizeSignature)(fn);
 };
 exports.getFunctionSignature = getFunctionSignature;
 //# sourceMappingURL=getFunctionSignature.js.map

package/_cjs/utils/hash/getFunctionSignature.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFunctionSignature.js","sourceRoot":"","sources":["../../../utils/hash/getFunctionSignature.ts"],"names":[],"mappings":";;;AAGA,8DAGgC;AAChC,iFAK4C;AAQrC,MAAM,oBAAoB,GAAG,CAAC,EAAwB,EAAE,EAAE;IAC/D,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE;QAC1B,MAAM,IAAI,GAAG,IAAA,6CAAmB,EAAC,EAAE,CAAC,CAAA;QACpC,MAAM,MAAM,GAAG,IAAA,+CAAqB,EAAC,EAAE,CAAC,IAAI,EAAE,CAAA;QAC9C,OAAO,GAAG,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAA;KAC9D;IAED,OAAO,IAAA,gCAAa,EAAC,EAAE,CAAC,CAAA;AAC1B,CAAC,CAAA;AARY,QAAA,oBAAoB,wBAQhC"}
+{"version":3,"file":"getFunctionSignature.js","sourceRoot":"","sources":["../../../utils/hash/getFunctionSignature.ts"],"names":[],"mappings":";;;AAAA,qCAAyD;AAGzD,mEAGgC;AAMzB,MAAM,oBAAoB,GAAG,CAAC,GAAyB,EAAE,EAAE;IAChE,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE;QACf,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO,GAAG,CAAA;QACvC,OAAO,IAAA,uBAAa,EAAC,GAAG,CAAC,CAAA;IAC3B,CAAC,CAAC,EAAE,CAAA;IACJ,OAAO,IAAA,0CAAkB,EAAC,EAAE,CAAC,CAAA;AAC/B,CAAC,CAAA;AANY,QAAA,oBAAoB,wBAMhC"}

package/_cjs/utils/hash/normalizeSignature.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeSignature = void 0;
+const base_js_1 = require("../../errors/base.js");
+function normalizeSignature(signature) {
+    let active = true;
+    let current = '';
+    let level = 0;
+    let result = '';
+    let valid = false;
+    for (let i = 0; i < signature.length; i++) {
+        const char = signature[i];
+        if (['(', ')', ','].includes(char))
+            active = true;
+        if (char === '(')
+            level++;
+        if (char === ')')
+            level--;
+        if (!active)
+            continue;
+        if (level === 0) {
+            if (char === ' ' && ['event', 'function', ''].includes(result))
+                result = '';
+            else {
+                result += char;
+                if (char === ')') {
+                    valid = true;
+                    break;
+                }
+            }
+            continue;
+        }
+        if (char === ' ') {
+            if (signature[i - 1] !== ',' && current !== ',' && current !== ',(') {
+                current = '';
+                active = false;
+            }
+            continue;
+        }
+        result += char;
+        current += char;
+    }
+    if (!valid)
+        throw new base_js_1.BaseError('Unable to normalize signature.');
+    return result;
+}
+exports.normalizeSignature = normalizeSignature;
+//# sourceMappingURL=normalizeSignature.js.map

package/_cjs/utils/hash/normalizeSignature.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalizeSignature.js","sourceRoot":"","sources":["../../../utils/hash/normalizeSignature.ts"],"names":[],"mappings":";;;AAAA,kDAAgD;AAOhD,SAAgB,kBAAkB,CAChC,SAAuC;IAEvC,IAAI,MAAM,GAAG,IAAI,CAAA;IACjB,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,IAAI,KAAK,GAAG,CAAC,CAAA;IACb,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,IAAI,KAAK,GAAG,KAAK,CAAA;IAEjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACzC,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;QAGzB,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,MAAM,GAAG,IAAI,CAAA;QAGjD,IAAI,IAAI,KAAK,GAAG;YAAE,KAAK,EAAE,CAAA;QACzB,IAAI,IAAI,KAAK,GAAG;YAAE,KAAK,EAAE,CAAA;QAGzB,IAAI,CAAC,MAAM;YAAE,SAAQ;QAGrB,IAAI,KAAK,KAAK,CAAC,EAAE;YACf,IAAI,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC5D,MAAM,GAAG,EAAE,CAAA;iBACR;gBACH,MAAM,IAAI,IAAI,CAAA;gBAGd,IAAI,IAAI,KAAK,GAAG,EAAE;oBAChB,KAAK,GAAG,IAAI,CAAA;oBACZ,MAAK;iBACN;aACF;YAED,SAAQ;SACT;QAGD,IAAI,IAAI,KAAK,GAAG,EAAE;YAEhB,IAAI,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG,IAAI,OAAO,KAAK,GAAG,IAAI,OAAO,KAAK,IAAI,EAAE;gBACnE,OAAO,GAAG,EAAE,CAAA;gBACZ,MAAM,GAAG,KAAK,CAAA;aACf;YACD,SAAQ;SACT;QAED,MAAM,IAAI,IAAI,CAAA;QACd,OAAO,IAAI,IAAI,CAAA;KAChB;IAED,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,mBAAS,CAAC,gCAAgC,CAAC,CAAA;IAEjE,OAAO,MAAM,CAAA;AACf,CAAC;AAxDD,gDAwDC"}

package/_esm/utils/contract/extractFunctionParts.js

@@ -1,4 +1,5 @@
 const paramsRegex = /((function|event)\s)?(.*)(\((.*)\))/;
+/** @deprecated – use `parseAbiItem` from `abitype`. */
 export function extractFunctionParts(def) {
     const parts = def.match(paramsRegex);
     const type = parts?.[2] || undefined;
@@ -6,9 +7,11 @@ export function extractFunctionParts(def) {
     const params = parts?.[5] || undefined;
     return { type, name, params };
 }
+/** @deprecated – use `parseAbiItem` from `abitype`. */
 export function extractFunctionName(def) {
     return extractFunctionParts(def).name;
 }
+/** @deprecated – use `parseAbiItem` from `abitype`. */
 export function extractFunctionParams(def) {
     const params = extractFunctionParts(def).params;
     const splitParams = params?.split(',').map((x) => x.trim().split(' '));
@@ -18,6 +21,7 @@ export function extractFunctionParams(def) {
         ...(param[1] === 'indexed' ? { indexed: true } : {}),
     }));
 }
+/** @deprecated – use `parseAbiItem` from `abitype`. */
 export function extractFunctionType(def) {
     return extractFunctionParts(def).type;
 }

package/_esm/utils/contract/extractFunctionParts.js.map

@@ -1 +1 @@
-{"version":3,"file":"extractFunctionParts.js","sourceRoot":"","sources":["../../../utils/contract/extractFunctionParts.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,GAAG,qCAAqC,CAAA;AAIzD,MAAM,UAAU,oBAAoB,CAAC,GAAW;IAC9C,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;IACpC,MAAM,IAAI,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,SAAS,CAAA;IACpC,MAAM,IAAI,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,CAAA;IACvB,MAAM,MAAM,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,SAAS,CAAA;IACtC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAA;AAC/B,CAAC;AAID,MAAM,UAAU,mBAAmB,CAAC,GAAW;IAC7C,OAAO,oBAAoB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AACvC,CAAC;AAID,MAAM,UAAU,qBAAqB,CAAC,GAAW;IAC/C,MAAM,MAAM,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,MAAM,CAAA;IAC/C,MAAM,WAAW,GAAG,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;IACtE,OAAO,WAAW,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAClC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;QACd,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAClD,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACrD,CAAC,CAAC,CAAA;AACL,CAAC;AAID,MAAM,UAAU,mBAAmB,CAAC,GAAW;IAC7C,OAAO,oBAAoB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AACvC,CAAC"}
+{"version":3,"file":"extractFunctionParts.js","sourceRoot":"","sources":["../../../utils/contract/extractFunctionParts.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,GAAG,qCAAqC,CAAA;AAIzD,uDAAuD;AACvD,MAAM,UAAU,oBAAoB,CAAC,GAAW;IAC9C,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;IACpC,MAAM,IAAI,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,SAAS,CAAA;IACpC,MAAM,IAAI,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,CAAA;IACvB,MAAM,MAAM,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,SAAS,CAAA;IACtC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAA;AAC/B,CAAC;AAID,uDAAuD;AACvD,MAAM,UAAU,mBAAmB,CAAC,GAAW;IAC7C,OAAO,oBAAoB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AACvC,CAAC;AAID,uDAAuD;AACvD,MAAM,UAAU,qBAAqB,CAAC,GAAW;IAC/C,MAAM,MAAM,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,MAAM,CAAA;IAC/C,MAAM,WAAW,GAAG,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;IACtE,OAAO,WAAW,EAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAClC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;QACd,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAClD,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACrD,CAAC,CAAC,CAAA;AACL,CAAC;AAID,uDAAuD;AACvD,MAAM,UAAU,mBAAmB,CAAC,GAAW;IAC7C,OAAO,oBAAoB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAA;AACvC,CAAC"}

package/_esm/utils/hash/getFunctionSignature.js

@@ -1,11 +1,11 @@
-import { formatAbiItem, } from '../abi/formatAbiItem.js';
-import { extractFunctionName, extractFunctionParams, } from '../contract/extractFunctionParts.js';
-export const getFunctionSignature = (fn) => {
-    if (typeof fn === 'string') {
-        const name = extractFunctionName(fn);
-        const params = extractFunctionParams(fn) || [];
-        return `${name}(${params.map(({ type }) => type).join(',')})`;
-    }
-    return formatAbiItem(fn);
+import { formatAbiItem } from 'abitype';
+import { normalizeSignature, } from './normalizeSignature.js';
+export const getFunctionSignature = (fn_) => {
+    const fn = (() => {
+        if (typeof fn_ === 'string')
+            return fn_;
+        return formatAbiItem(fn_);
+    })();
+    return normalizeSignature(fn);
 };
 //# sourceMappingURL=getFunctionSignature.js.map

package/_esm/utils/hash/getFunctionSignature.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFunctionSignature.js","sourceRoot":"","sources":["../../../utils/hash/getFunctionSignature.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,aAAa,GACd,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAGL,mBAAmB,EACnB,qBAAqB,GACtB,MAAM,qCAAqC,CAAA;AAQ5C,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,EAAwB,EAAE,EAAE;IAC/D,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE;QAC1B,MAAM,IAAI,GAAG,mBAAmB,CAAC,EAAE,CAAC,CAAA;QACpC,MAAM,MAAM,GAAG,qBAAqB,CAAC,EAAE,CAAC,IAAI,EAAE,CAAA;QAC9C,OAAO,GAAG,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAA;KAC9D;IAED,OAAO,aAAa,CAAC,EAAE,CAAC,CAAA;AAC1B,CAAC,CAAA"}
+{"version":3,"file":"getFunctionSignature.js","sourceRoot":"","sources":["../../../utils/hash/getFunctionSignature.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,aAAa,EAAE,MAAM,SAAS,CAAA;AAGzD,OAAO,EAEL,kBAAkB,GACnB,MAAM,yBAAyB,CAAA;AAMhC,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,GAAyB,EAAE,EAAE;IAChE,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE;QACf,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO,GAAG,CAAA;QACvC,OAAO,aAAa,CAAC,GAAG,CAAC,CAAA;IAC3B,CAAC,CAAC,EAAE,CAAA;IACJ,OAAO,kBAAkB,CAAC,EAAE,CAAC,CAAA;AAC/B,CAAC,CAAA"}

package/_esm/utils/hash/normalizeSignature.js

@@ -0,0 +1,51 @@
+import { BaseError } from '../../errors/base.js';
+export function normalizeSignature(signature) {
+    let active = true;
+    let current = '';
+    let level = 0;
+    let result = '';
+    let valid = false;
+    for (let i = 0; i < signature.length; i++) {
+        const char = signature[i];
+        // If the character is a separator, we want to reactivate.
+        if (['(', ')', ','].includes(char))
+            active = true;
+        // If the character is a "level" token, we want to increment/decrement.
+        if (char === '(')
+            level++;
+        if (char === ')')
+            level--;
+        // If we aren't active, we don't want to mutate the result.
+        if (!active)
+            continue;
+        // If level === 0, we are at the definition level.
+        if (level === 0) {
+            if (char === ' ' && ['event', 'function', ''].includes(result))
+                result = '';
+            else {
+                result += char;
+                // If we are at the end of the definition, we must be finished.
+                if (char === ')') {
+                    valid = true;
+                    break;
+                }
+            }
+            continue;
+        }
+        // Ignore spaces
+        if (char === ' ') {
+            // If the previous character is a separator, and the current section isn't empty, we want to deactivate.
+            if (signature[i - 1] !== ',' && current !== ',' && current !== ',(') {
+                current = '';
+                active = false;
+            }
+            continue;
+        }
+        result += char;
+        current += char;
+    }
+    if (!valid)
+        throw new BaseError('Unable to normalize signature.');
+    return result;
+}
+//# sourceMappingURL=normalizeSignature.js.map

package/_esm/utils/hash/normalizeSignature.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalizeSignature.js","sourceRoot":"","sources":["../../../utils/hash/normalizeSignature.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAOhD,MAAM,UAAU,kBAAkB,CAChC,SAAuC;IAEvC,IAAI,MAAM,GAAG,IAAI,CAAA;IACjB,IAAI,OAAO,GAAG,EAAE,CAAA;IAChB,IAAI,KAAK,GAAG,CAAC,CAAA;IACb,IAAI,MAAM,GAAG,EAAE,CAAA;IACf,IAAI,KAAK,GAAG,KAAK,CAAA;IAEjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACzC,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;QAEzB,0DAA0D;QAC1D,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,MAAM,GAAG,IAAI,CAAA;QAEjD,uEAAuE;QACvE,IAAI,IAAI,KAAK,GAAG;YAAE,KAAK,EAAE,CAAA;QACzB,IAAI,IAAI,KAAK,GAAG;YAAE,KAAK,EAAE,CAAA;QAEzB,2DAA2D;QAC3D,IAAI,CAAC,MAAM;YAAE,SAAQ;QAErB,kDAAkD;QAClD,IAAI,KAAK,KAAK,CAAC,EAAE;YACf,IAAI,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;gBAC5D,MAAM,GAAG,EAAE,CAAA;iBACR;gBACH,MAAM,IAAI,IAAI,CAAA;gBAEd,+DAA+D;gBAC/D,IAAI,IAAI,KAAK,GAAG,EAAE;oBAChB,KAAK,GAAG,IAAI,CAAA;oBACZ,MAAK;iBACN;aACF;YAED,SAAQ;SACT;QAED,gBAAgB;QAChB,IAAI,IAAI,KAAK,GAAG,EAAE;YAChB,wGAAwG;YACxG,IAAI,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG,IAAI,OAAO,KAAK,GAAG,IAAI,OAAO,KAAK,IAAI,EAAE;gBACnE,OAAO,GAAG,EAAE,CAAA;gBACZ,MAAM,GAAG,KAAK,CAAA;aACf;YACD,SAAQ;SACT;QAED,MAAM,IAAI,IAAI,CAAA;QACd,OAAO,IAAI,IAAI,CAAA;KAChB;IAED,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,SAAS,CAAC,gCAAgC,CAAC,CAAA;IAEjE,OAAO,MAAM,CAAA;AACf,CAAC"}

package/_types/utils/contract/extractFunctionParts.d.ts

@@ -1,18 +1,22 @@
 import type { ErrorType } from '../../errors/utils.js';
 export type ExtractFunctionPartsErrorType = ErrorType;
+/** @deprecated – use `parseAbiItem` from `abitype`. */
 export declare function extractFunctionParts(def: string): {
     type: string | undefined;
     name: string | undefined;
     params: string | undefined;
 };
 export type ExtractFunctionNameErrorType = ErrorType;
+/** @deprecated – use `parseAbiItem` from `abitype`. */
 export declare function extractFunctionName(def: string): string | undefined;
 export type ExtractFunctionParamsErrorType = ErrorType;
+/** @deprecated – use `parseAbiItem` from `abitype`. */
 export declare function extractFunctionParams(def: string): {
     indexed?: boolean | undefined;
     type: string;
     name: string;
 }[] | undefined;
 export type ExtractFunctionTypeErrorType = ErrorType;
+/** @deprecated – use `parseAbiItem` from `abitype`. */
 export declare function extractFunctionType(def: string): string | undefined;
 //# sourceMappingURL=extractFunctionParts.d.ts.map

package/_types/utils/contract/extractFunctionParts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extractFunctionParts.d.ts","sourceRoot":"","sources":["../../../utils/contract/extractFunctionParts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAItD,MAAM,MAAM,6BAA6B,GAAG,SAAS,CAAA;AAErD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM;;;;EAM/C;AAED,MAAM,MAAM,4BAA4B,GAAG,SAAS,CAAA;AAEpD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,sBAE9C;AAED,MAAM,MAAM,8BAA8B,GAAG,SAAS,CAAA;AAEtD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM;;;;gBAQhD;AAED,MAAM,MAAM,4BAA4B,GAAG,SAAS,CAAA;AAEpD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,sBAE9C"}
+{"version":3,"file":"extractFunctionParts.d.ts","sourceRoot":"","sources":["../../../utils/contract/extractFunctionParts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAItD,MAAM,MAAM,6BAA6B,GAAG,SAAS,CAAA;AAErD,uDAAuD;AACvD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM;;;;EAM/C;AAED,MAAM,MAAM,4BAA4B,GAAG,SAAS,CAAA;AAEpD,uDAAuD;AACvD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,sBAE9C;AAED,MAAM,MAAM,8BAA8B,GAAG,SAAS,CAAA;AAEtD,uDAAuD;AACvD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM;;;;gBAQhD;AAED,MAAM,MAAM,4BAA4B,GAAG,SAAS,CAAA;AAEpD,uDAAuD;AACvD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,sBAE9C"}

package/_types/utils/hash/getFunctionSignature.d.ts

@@ -1,7 +1,6 @@
-import type { AbiFunction } from 'abitype';
+import { type AbiFunction } from 'abitype';
 import type { ErrorType } from '../../errors/utils.js';
-import { type FormatAbiItemErrorType } from '../abi/formatAbiItem.js';
-import { type ExtractFunctionNameErrorType, type ExtractFunctionParamsErrorType } from '../contract/extractFunctionParts.js';
-export type GetFunctionSignatureErrorType = ExtractFunctionNameErrorType | ExtractFunctionParamsErrorType | FormatAbiItemErrorType | ErrorType;
-export declare const getFunctionSignature: (fn: string | AbiFunction) => string;
+import { type NormalizeSignatureErrorType } from './normalizeSignature.js';
+export type GetFunctionSignatureErrorType = NormalizeSignatureErrorType | ErrorType;
+export declare const getFunctionSignature: (fn_: string | AbiFunction) => string;
 //# sourceMappingURL=getFunctionSignature.d.ts.map

package/_types/utils/hash/getFunctionSignature.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFunctionSignature.d.ts","sourceRoot":"","sources":["../../../utils/hash/getFunctionSignature.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAE1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EACL,KAAK,sBAAsB,EAE5B,MAAM,yBAAyB,CAAA;AAChC,OAAO,EACL,KAAK,4BAA4B,EACjC,KAAK,8BAA8B,EAGpC,MAAM,qCAAqC,CAAA;AAE5C,MAAM,MAAM,6BAA6B,GACrC,4BAA4B,GAC5B,8BAA8B,GAC9B,sBAAsB,GACtB,SAAS,CAAA;AAEb,eAAO,MAAM,oBAAoB,OAAQ,MAAM,GAAG,WAAW,WAQ5D,CAAA"}
+{"version":3,"file":"getFunctionSignature.d.ts","sourceRoot":"","sources":["../../../utils/hash/getFunctionSignature.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAiB,MAAM,SAAS,CAAA;AAEzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EACL,KAAK,2BAA2B,EAEjC,MAAM,yBAAyB,CAAA;AAEhC,MAAM,MAAM,6BAA6B,GACrC,2BAA2B,GAC3B,SAAS,CAAA;AAEb,eAAO,MAAM,oBAAoB,QAAS,MAAM,GAAG,WAAW,WAM7D,CAAA"}

package/_types/utils/hash/normalizeSignature.d.ts

@@ -0,0 +1,6 @@
+import type { ErrorType } from '../../errors/utils.js';
+export type NormalizeSignatureParameters = string;
+export type NormalizeSignatureReturnType = string;
+export type NormalizeSignatureErrorType = ErrorType;
+export declare function normalizeSignature(signature: NormalizeSignatureParameters): NormalizeSignatureReturnType;
+//# sourceMappingURL=normalizeSignature.d.ts.map

package/_types/utils/hash/normalizeSignature.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalizeSignature.d.ts","sourceRoot":"","sources":["../../../utils/hash/normalizeSignature.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AAEtD,MAAM,MAAM,4BAA4B,GAAG,MAAM,CAAA;AACjD,MAAM,MAAM,4BAA4B,GAAG,MAAM,CAAA;AACjD,MAAM,MAAM,2BAA2B,GAAG,SAAS,CAAA;AAEnD,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,4BAA4B,GACtC,4BAA4B,CAsD9B"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "viem",
   "description": "TypeScript Interface for Ethereum",
-  "version": "1.18.8",
+  "version": "1.18.9",
   "main": "./_cjs/index.js",
   "module": "./_esm/index.js",
   "types": "./_types/index.d.ts",

package/utils/contract/extractFunctionParts.ts

@@ -4,6 +4,7 @@ const paramsRegex = /((function|event)\s)?(.*)(\((.*)\))/
 
 export type ExtractFunctionPartsErrorType = ErrorType
 
+/** @deprecated – use `parseAbiItem` from `abitype`. */
 export function extractFunctionParts(def: string) {
   const parts = def.match(paramsRegex)
   const type = parts?.[2] || undefined
@@ -14,12 +15,14 @@ export function extractFunctionParts(def: string) {
 
 export type ExtractFunctionNameErrorType = ErrorType
 
+/** @deprecated – use `parseAbiItem` from `abitype`. */
 export function extractFunctionName(def: string) {
   return extractFunctionParts(def).name
 }
 
 export type ExtractFunctionParamsErrorType = ErrorType
 
+/** @deprecated – use `parseAbiItem` from `abitype`. */
 export function extractFunctionParams(def: string) {
   const params = extractFunctionParts(def).params
   const splitParams = params?.split(',').map((x) => x.trim().split(' '))
@@ -32,6 +35,7 @@ export function extractFunctionParams(def: string) {
 
 export type ExtractFunctionTypeErrorType = ErrorType
 
+/** @deprecated – use `parseAbiItem` from `abitype`. */
 export function extractFunctionType(def: string) {
   return extractFunctionParts(def).type
 }

package/utils/hash/getFunctionSignature.ts

@@ -1,29 +1,19 @@
-import type { AbiFunction } from 'abitype'
+import { type AbiFunction, formatAbiItem } from 'abitype'
 
 import type { ErrorType } from '../../errors/utils.js'
 import {
-  type FormatAbiItemErrorType,
-  formatAbiItem,
-} from '../abi/formatAbiItem.js'
-import {
-  type ExtractFunctionNameErrorType,
-  type ExtractFunctionParamsErrorType,
-  extractFunctionName,
-  extractFunctionParams,
-} from '../contract/extractFunctionParts.js'
+  type NormalizeSignatureErrorType,
+  normalizeSignature,
+} from './normalizeSignature.js'
 
 export type GetFunctionSignatureErrorType =
-  | ExtractFunctionNameErrorType
-  | ExtractFunctionParamsErrorType
-  | FormatAbiItemErrorType
+  | NormalizeSignatureErrorType
   | ErrorType
 
-export const getFunctionSignature = (fn: string | AbiFunction) => {
-  if (typeof fn === 'string') {
-    const name = extractFunctionName(fn)
-    const params = extractFunctionParams(fn) || []
-    return `${name}(${params.map(({ type }) => type).join(',')})`
-  }
-
-  return formatAbiItem(fn)
+export const getFunctionSignature = (fn_: string | AbiFunction) => {
+  const fn = (() => {
+    if (typeof fn_ === 'string') return fn_
+    return formatAbiItem(fn_)
+  })()
+  return normalizeSignature(fn)
 }

package/utils/hash/normalizeSignature.ts

@@ -0,0 +1,64 @@
+import { BaseError } from '../../errors/base.js'
+import type { ErrorType } from '../../errors/utils.js'
+
+export type NormalizeSignatureParameters = string
+export type NormalizeSignatureReturnType = string
+export type NormalizeSignatureErrorType = ErrorType
+
+export function normalizeSignature(
+  signature: NormalizeSignatureParameters,
+): NormalizeSignatureReturnType {
+  let active = true
+  let current = ''
+  let level = 0
+  let result = ''
+  let valid = false
+
+  for (let i = 0; i < signature.length; i++) {
+    const char = signature[i]
+
+    // If the character is a separator, we want to reactivate.
+    if (['(', ')', ','].includes(char)) active = true
+
+    // If the character is a "level" token, we want to increment/decrement.
+    if (char === '(') level++
+    if (char === ')') level--
+
+    // If we aren't active, we don't want to mutate the result.
+    if (!active) continue
+
+    // If level === 0, we are at the definition level.
+    if (level === 0) {
+      if (char === ' ' && ['event', 'function', ''].includes(result))
+        result = ''
+      else {
+        result += char
+
+        // If we are at the end of the definition, we must be finished.
+        if (char === ')') {
+          valid = true
+          break
+        }
+      }
+
+      continue
+    }
+
+    // Ignore spaces
+    if (char === ' ') {
+      // If the previous character is a separator, and the current section isn't empty, we want to deactivate.
+      if (signature[i - 1] !== ',' && current !== ',' && current !== ',(') {
+        current = ''
+        active = false
+      }
+      continue
+    }
+
+    result += char
+    current += char
+  }
+
+  if (!valid) throw new BaseError('Unable to normalize signature.')
+
+  return result
+}