chore: dynamic array support

myBraavos · Oct 22, 2023 · 231ae86 · 231ae86
1 parent 4bd99ac
commit 231ae86
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 28 deletions.
diff --git a/repository/errors-default.json b/repository/errors-default.json
@@ -20,16 +20,7 @@
             ]
         },
         {
-            "matcher": "/Execution was reverted; failure reason: \\[(.*)\\].\\n?/",
-            "message": "Execution was reverted; failure reason: {{0}}",
-            "extractors": [
-                {
-                    "matcher": "/Execution was reverted; failure reason: \\[(.*)\\].\\n?/"
-                }
-            ]
-        },
-        {
-            "matcher": "/Execution was reverted; failure reason: (.+).\\n?/",
+            "matcher": "/Execution was reverted; failure reason: .+.\\n?/",
             "message": "Execution was reverted; failure reason: {{0}}",
             "extractors": [
                 {
@@ -38,16 +29,7 @@
             ]
         },
         {
-            "matcher": "/Execution failed. Failure reason: \\[(.*)\\].\\n?/",
-            "message": "Execution failed. Failure reason: {{0}}",
-            "extractors": [
-                {
-                    "matcher": "/Execution failed. Failure reason: \\[(.*)\\].\\n?/"
-                }
-            ]
-        },
-        {
-            "matcher": "/Execution failed. Failure reason: (.+).\\n?/",
+            "matcher": "/Execution failed. Failure reason: .+.\\n?/",
             "message": "Execution failed. Failure reason: {{0}}",
             "extractors": [
                 {

diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -40,6 +40,23 @@ export const formatByType = (
         default:
             if (result) {
                 try {
+                    if (/^\[0x[0-9a-fA-F]+(, 0x[0-9a-fA-F]+)*\]$/.test(value)) {
+                        // do not parse via JSON.parse to avoid js precision/roundness issues
+                        const asList = value
+                            // remove brackets
+                            .slice(1, -1)
+                            .split(",")
+                            .map(s => s.trim());
+                        const isAsciiList = asList.every(s =>
+                            shortString.isASCII(s)
+                        );
+                        if (isAsciiList) {
+                            return asList
+                                .map(s => shortString.decodeShortString(s))
+                                .join(" ");
+                        }
+                    }
+
                     result = shortString.decodeShortString(value);
                 } catch {
                     // ignore, just return original value

diff --git a/tests/utils.test.ts b/tests/utils.test.ts
@@ -163,7 +163,7 @@ describe("getErrorMessageFromMatcher", () => {
 
     it("should return the formatted error message when the matcher matches and extractors are provided - reverted", () => {
         const errorMatcher = {
-            matcher: "/Execution was reverted; failure reason: (.+).\\n?/",
+            matcher: "/Execution was reverted; failure reason: .+.\\n?/",
             message: "Execution was reverted; failure reason: {{0}}",
             extractors: [
                 {
@@ -185,13 +185,12 @@ describe("getErrorMessageFromMatcher", () => {
 
     it("should return the formatted error message when the matcher matches and extractors are provided - reverted + ascii", () => {
         const errorMatcher = {
-            matcher:
-                "/Execution was reverted; failure reason: \\[(.*)\\].\\n?/",
+            matcher: "/Execution was reverted; failure reason: .+.\\n?/",
             message: "Execution was reverted; failure reason: {{0}}",
             extractors: [
                 {
                     matcher:
-                        "/Execution was reverted; failure reason: \\[(.*)\\].\\n?/",
+                        "/Execution was reverted; failure reason: (.+).\\n?/",
                 },
             ],
         };
@@ -206,9 +205,31 @@ describe("getErrorMessageFromMatcher", () => {
         );
     });
 
+    it("should return the formatted error message when the matcher matches and extractors are provided - reverted + ascii list", () => {
+        const errorMatcher = {
+            matcher: "/Execution was reverted; failure reason: .+.\\n?/",
+            message: "Execution was reverted; failure reason: {{0}}",
+            extractors: [
+                {
+                    matcher:
+                        "/Execution was reverted; failure reason: (.+).\\n?/",
+                },
+            ],
+        };
+        const rawMessage =
+            "Error in the called contract (0xfff107e2403123c7df78d91728a7ee5cfd557aec0fa2d2bdc5891c286bbfff): Execution was reverted; failure reason: [0x616d6f756e743020736c697070616765, 0x616d6f756e743020736c697070616765, 0x616d6f756e743020736c697070616765].";
+        const errorMessage = getErrorMessageFromMatcher(
+            errorMatcher,
+            rawMessage
+        );
+        expect(errorMessage).toBe(
+            "Execution was reverted; failure reason: amount0 slippage amount0 slippage amount0 slippage"
+        );
+    });
+
     it("should return the formatted error message when the matcher matches and extractors are provided - blockfier reverted", () => {
         const errorMatcher = {
-            matcher: "/Execution failed. Failure reason: (.+).\\n?/",
+            matcher: "/Execution failed. Failure reason: .+.\\n?/",
             message: "Execution failed. Failure reason: {{0}}",
             extractors: [
                 {
@@ -229,12 +250,11 @@ describe("getErrorMessageFromMatcher", () => {
 
     it("should return the formatted error message when the matcher matches and extractors are provided - blockfier reverted + ascii", () => {
         const errorMatcher = {
-            matcher: "/Execution failed. Failure reason: \\[(.*)\\].\\n?/",
+            matcher: "/Execution failed. Failure reason: .+.\\n?/",
             message: "Execution failed. Failure reason: {{0}}",
             extractors: [
                 {
-                    matcher:
-                        "/Execution failed. Failure reason: \\[(.*)\\].\\n?/",
+                    matcher: "/Execution failed. Failure reason: (.+).\\n?/",
                 },
             ],
         };