Merge pull request #1968 from Supertuba12/supertuba12/WEB3-1967

Correctly encode structs without members
hyperledger-web3j · Oct 4, 2023 · 2944092 · 2944092
2 parents 6435c35 + d349a79
commit 2944092
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/crypto/src/main/java/org/web3j/crypto/StructuredDataEncoder.java b/crypto/src/main/java/org/web3j/crypto/StructuredDataEncoder.java
@@ -24,6 +24,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.StringJoiner;
 import java.util.TreeSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -120,14 +121,10 @@ public Set<String> getDependencies(String primaryType) {
     public String encodeStruct(String structName) {
         HashMap<String, List<StructuredData.Entry>> types = jsonMessageObject.getTypes();
 
-        StringBuilder structRepresentation = new StringBuilder(structName + "(");
+        StringJoiner structRepresentation = new StringJoiner(",", structName + "(", ")");
         for (StructuredData.Entry entry : types.get(structName)) {
-            structRepresentation.append(String.format("%s %s,", entry.getType(), entry.getName()));
+            structRepresentation.add(String.format("%s %s", entry.getType(), entry.getName()));
         }
-        structRepresentation =
-                new StringBuilder(
-                        structRepresentation.substring(0, structRepresentation.length() - 1));
-        structRepresentation.append(")");
 
         return structRepresentation.toString();
     }

diff --git a/crypto/src/test/java/org/web3j/crypto/StructuredDataTest.java b/crypto/src/test/java/org/web3j/crypto/StructuredDataTest.java
@@ -113,6 +113,20 @@ public void testEncodeType() throws IOException, RuntimeException {
                 expectedTypeEncoding);
     }
 
+    @Test
+    public void testMinimalEncodeType() throws IOException, RuntimeException {
+        String validMinimalStructuredDataJSONFilePath =
+                "build/resources/test/"
+                        + "structured_data_json_files/ValidMinimalStructuredData.json";
+        StructuredDataEncoder dataEncoder =
+                new StructuredDataEncoder(getResource(validMinimalStructuredDataJSONFilePath));
+        String expectedTypeEncoding = "EIP712Domain()";
+
+        assertEquals(
+                dataEncoder.encodeType(dataEncoder.jsonMessageObject.getPrimaryType()),
+                expectedTypeEncoding);
+    }
+
     @Test
     public void testTypeHash() throws IOException, RuntimeException {
         StructuredDataEncoder dataEncoder = new StructuredDataEncoder(jsonMessageString);

diff --git a/crypto/src/test/resources/structured_data_json_files/ValidMinimalStructuredData.json b/crypto/src/test/resources/structured_data_json_files/ValidMinimalStructuredData.json
@@ -0,0 +1,8 @@
+{
+  "types": {
+    "EIP712Domain": []
+  },
+  "primaryType": "EIP712Domain",
+  "domain": {},
+  "message": {}
+}