Use viem function to check function signatures

EVMcrispr · Sep 24, 2024 · d7fc41e · d7fc41e
1 parent 55bf1cf
commit d7fc41e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/packages/evmcrispr/src/modules/aragonos/commands/act.ts b/packages/evmcrispr/src/modules/aragonos/commands/act.ts
@@ -7,14 +7,14 @@ import { batchForwarderActions } from "../utils/forwarders";
 import { ErrorException } from "../../../errors";
 import {
   ComparisonType,
-  SIGNATURE_REGEX,
   addressesEqual,
   beforeOrEqualNode,
   checkArgsLength,
   encodeAction,
   fetchAbi,
   insideNodeLine,
   interpretNodeSync,
+  isFunctionSignature,
   tryAndCacheNotFound,
 } from "../../../utils";
 import type { AragonOS } from "../AragonOS";
@@ -50,7 +50,7 @@ export const act: ICommand<AragonOS> = {
       );
     }
 
-    if (!SIGNATURE_REGEX.test(signature)) {
+    if (!isFunctionSignature(signature)) {
       throw new ErrorException(
         `expected a valid signature, but got ${signature}`,
       );

diff --git a/packages/evmcrispr/src/modules/std/commands/exec.ts b/packages/evmcrispr/src/modules/std/commands/exec.ts
@@ -6,7 +6,6 @@ import type { Abi, AbiBinding, Address, ICommand } from "../../../types";
 
 import {
   ComparisonType,
-  SIGNATURE_REGEX,
   addressesEqual,
   beforeOrEqualNode,
   checkArgsLength,
@@ -16,6 +15,7 @@ import {
   getOptValue,
   insideNodeLine,
   interpretNodeSync,
+  isFunctionSignature,
   isNumberish,
   tryAndCacheNotFound,
 } from "../../../utils";
@@ -58,7 +58,7 @@ export const exec: ICommand<Std> = {
       );
     }
 
-    if (!SIGNATURE_REGEX.test(signature)) {
+    if (!isFunctionSignature(signature)) {
       if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(signature)) {
         throw new ErrorException(`invalid signature "${signature}"`);
       }

diff --git a/packages/evmcrispr/src/modules/std/helpers/get.ts b/packages/evmcrispr/src/modules/std/helpers/get.ts
@@ -4,8 +4,8 @@ import { ErrorException } from "../../../errors";
 import type { HelperFunction } from "../../../types";
 import {
   ComparisonType,
-  SIGNATURE_REGEX,
   checkArgsLength,
+  isFunctionSignature,
 } from "../../../utils";
 import type { Std } from "../Std";
 
@@ -31,7 +31,7 @@ export const get: HelperFunction<Std> = async (
 
   const [body, returns, index] = abi.split(":");
 
-  if (!SIGNATURE_REGEX.test(body)) {
+  if (!isFunctionSignature(body)) {
     throw new ErrorException(
       `expected a valid function signature, but got "${abi}"`,
     );

diff --git a/packages/evmcrispr/src/utils/web3.ts b/packages/evmcrispr/src/utils/web3.ts
@@ -1,11 +1,16 @@
 import type { AbiItem } from "viem";
-import { isAddressEqual } from "viem";
+import { isAddressEqual, parseAbiItem } from "viem";
 
 import type { Address } from "../types";
 
-// JS regex do not support balancing groups, so we do not check parentheses are balanced
-export const SIGNATURE_REGEX =
-  /^\w+\(((\(?\w+(\[\d*\])*\)?)+(,\(?\w+(\[\d*\])*\)?)*)?\)$/;
+export const isFunctionSignature = (signature: string) => {
+  try {
+    parseAbiItem(`function ${signature} external`);
+    return true;
+  } catch (error) {
+    return false;
+  }
+};
 
 export const toDecimals = (amount: number | string, decimals = 18): bigint => {
   const [integer, decimal] = String(amount).split(".");