Fix tests

EVMcrispr · Oct 12, 2024 · b56923a · b56923a
1 parent 705e807
commit b56923a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/packages/evmcrispr/src/modules/std/helpers/token.ts b/packages/evmcrispr/src/modules/std/helpers/token.ts
@@ -1,6 +1,6 @@
 import fetch from "isomorphic-fetch";
 
-import { isAddress, parseAbiItem } from "viem";
+import { getAddress, isAddress, parseAbiItem } from "viem";
 
 import { ErrorException } from "../../../errors";
 
@@ -60,7 +60,7 @@ export const _token = async (
     );
   }
 
-  return tokenAddress;
+  return getAddress(tokenAddress);
 };
 
 export const token: HelperFunction<Std> = async (

diff --git a/packages/evmcrispr/src/utils/web3.ts b/packages/evmcrispr/src/utils/web3.ts
@@ -6,6 +6,10 @@ import type { Address } from "../types";
 export const isFunctionSignature = (signature: string) => {
   try {
     parseAbiItem(`function ${signature} external`);
+    if (signature.includes(",)")) {
+      // Viem does not catch fn(a,) as invalid
+      return false;
+    }
     return true;
   } catch (error) {
     return false;

diff --git a/packages/evmcrispr/test/modules/aragonos/commands/act.test.ts b/packages/evmcrispr/test/modules/aragonos/commands/act.test.ts
@@ -147,6 +147,9 @@ describe("AragonOS > commands > act <agent> <targetAddress> <methodSignature> [.
       ["mint)", "right parenthesis"],
       ["mint(uint,)", "right comma"],
       ["mint(,uint)", "left comma"],
+      ["mint(uint,uint,())", "empty tuple"],
+      ["mint(uint,uint,(uint,))", "right comma in tuple"],
+      ["mint(uint,uint,(,uint))", "left comma in tuple"],
     ];
 
     await Promise.all(