Merge pull request #62 from 1Hive/fix-tuples

Allow the use of tuples in method signatures in exec and act commands

.changeset/real-apples-lie.md

@@ -0,0 +1,5 @@
+---
+'@1hive/evmcrispr': patch
+---
+
+Fix exec and act commands to allow the use of tuples in the function signatures.

packages/evmcrispr-terminal/package.json

@@ -3,7 +3,7 @@
   "version": "0.3.0",
   "private": true,
   "dependencies": {
-    "@1hive/evmcrispr": "0.10.1",
+    "@1hive/evmcrispr": "0.10.2",
     "@chakra-ui/anatomy": "^2.1.0",
     "@chakra-ui/icons": "^2.0.14",
     "@chakra-ui/merge-utils": "^2.0.5",

packages/evmcrispr/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1hive/evmcrispr",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "codename": "collective wisdom",
   "license": "GPL-3.0",
   "description": "A library that encapsulates actions in EVM scripts for DAOs",

packages/evmcrispr/src/utils/web3.ts

@@ -3,7 +3,9 @@ import { BigNumber, Wallet, utils } from 'ethers';
 
 import type { Address } from '../types';
 
-export const SIGNATURE_REGEX = /\w+\(((\w+(\[\d*\])*)+(,\w+(\[\d*\])*)*)?\)/;
+// 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 async function buildNonceForAddress(
   address: Address,

packages/evmcrispr/test/modules/aragonos/commands/act.test.ts

@@ -31,13 +31,13 @@ describe('AragonOS > commands > act <agent> <targetAddress> <methodSignature> [.
 
   it('should return a correct act action', async () => {
     const interpreter = createAragonScriptInterpreter([
-      `act agent:1 agent:2 "deposit(uint256,uint256[][])" 1 [[2,3],[4,5]]`,
+      `act agent:1 agent:2 "deposit((uint256,int256),uint256[][])" [1,-2] [[2,3],[4,5]]`,
     ]);
 
     const actActions = await interpreter.interpret();
 
     const fnABI = new utils.Interface([
-      'function deposit(uint256,uint256[][])',
+      'function deposit((uint256,int256),uint256[][])',
     ]);
 
     const expectedActActions = [
@@ -46,7 +46,7 @@ describe('AragonOS > commands > act <agent> <targetAddress> <methodSignature> [.
           {
             to: DAO['agent:2'],
             data: fnABI.encodeFunctionData('deposit', [
-              1,
+              [1, -2],
               [
                 [2, 3],
                 [4, 5],