fix generated Event JSON omits field "anonymous"

esaulpaugh · Dec 16, 2022 · 819ccd3 · 819ccd3
1 parent fca189a
commit 819ccd3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/src/main/java/com/esaulpaugh/headlong/abi/ABIJSON.java b/src/main/java/com/esaulpaugh/headlong/abi/ABIJSON.java
@@ -257,9 +257,11 @@ static String toJson(ABIObject o, boolean pretty) {
                 }
                 stateMutability(out, f.getStateMutability());
             } else if (o.isEvent()) {
+                final Event e = o.asEvent();
                 type(out, EVENT);
                 name(out, o.getName());
-                tupleType(out, INPUTS, o.getInputs(), o.asEvent().getIndexManifest());
+                tupleType(out, INPUTS, o.getInputs(), e.getIndexManifest());
+                out.name(ANONYMOUS).value(e.isAnonymous());
             } else {
                 type(out, ERROR);
                 name(out, o.getName());

diff --git a/src/test/java/com/esaulpaugh/headlong/abi/ABIJSONTest.java b/src/test/java/com/esaulpaugh/headlong/abi/ABIJSONTest.java
@@ -137,7 +137,8 @@ public class ABIJSONTest {
             "        \"type\": \"uint256\",\n" +
             "        \"indexed\": false\n" +
             "      }\n" +
-            "    ]\n" +
+            "    ],\n" +
+            "    \"anonymous\": true\n" +
             "  },\n" +
             "  {\n" +
             "    \"type\": \"function\",\n" +
@@ -418,6 +419,22 @@ public void testAnonymousEvent() {
         assertEquals(a, c);
         assertEquals(a.hashCode(), b.hashCode());
         assertEquals(a.hashCode(), c.hashCode());
+
+        assertEquals(a, Event.fromJson(a.toJson(true)));
+        assertEquals(a, Event.fromJson(a.toJson(false)));
+        assertEquals(a, Event.fromJson(a.toString()));
+
+        assertEquals(a, Event.fromJson(b.toJson(true)));
+        assertEquals(a, Event.fromJson(b.toJson(false)));
+        assertEquals(a, Event.fromJson(b.toString()));
+
+        assertEquals(b, Event.fromJson(a.toJson(true)));
+        assertEquals(b, Event.fromJson(a.toJson(false)));
+        assertEquals(b, Event.fromJson(a.toString()));
+
+        assertEquals(b, Event.fromJson(b.toJson(true)));
+        assertEquals(b, Event.fromJson(b.toJson(false)));
+        assertEquals(b, Event.fromJson(b.toString()));
     }
 
     @Test
@@ -507,7 +524,8 @@ public void testGetEvents() {
                 "      \"type\": \"uint256\",\n" +
                 "      \"indexed\": false\n" +
                 "    }\n" +
-                "  ]\n" +
+                "  ],\n" +
+                "  \"anonymous\": true\n" +
                 "}";
 
         assertEquals(eventJson, event.toJson(true));