Merge pull request #1918 from vae520283995/master

Update StructuredDataEncoder.java

Author: gtebrean

crypto/src/main/java/org/web3j/crypto/StructuredDataEncoder.java

@@ -260,9 +260,9 @@ private byte[] convertToEncodedItem(String baseType, Object data) {
                             rawValue.length);
                 }
             } else if (baseType.equals("string")) {
-                hashBytes = ((String) data).getBytes();
+                hashBytes = Numeric.hexStringToByteArray(sha3String((String) data));
             } else if (baseType.equals("bytes")) {
-                hashBytes = Numeric.hexStringToByteArray((String) data);
+                hashBytes = sha3(Numeric.hexStringToByteArray((String) data));
             } else {
                 byte[] b = convertArgToBytes((String) data);
                 BigInteger bi = new BigInteger(1, b);

crypto/src/test/java/org/web3j/crypto/StructuredDataTest.java

@@ -308,12 +308,12 @@ public void testValidStructureWithArrays() throws IOException {
                         (HashMap<String, Object>) dataEncoder.jsonMessageObject.getMessage());
 
         String expectedMessageStructHash =
-                "0xc1c7d7b7dab9a65b30a6e951923b2d54536778329712e2239ed8a3f2f5f2329f";
+                "0x14f510c172a64b76f1105338b2e0b09dccfa4aef922131716d58d7fd94e097e8";
 
         assertEquals(expectedMessageStructHash, Numeric.toHexString(dataHash));
 
         assertEquals(
-                "0x935426a6009a3798ee87cd16ebeb9cea26b29d2d3762ac0951166d032f55d522",
+                "0xa31e6ec120743db6e47cf44cd6b116cc4383ff4875cf823308938f8ba4566cc0",
                 Numeric.toHexString(dataEncoder.hashStructuredData()));
     }
 

crypto/src/test/resources/structured_data_json_files/ValidStructuredArrayData.json

@@ -18,8 +18,8 @@
         -25
       ],
       "ids": [
-        1,
-        2
+        "23ee3e3",
+        "3e2e23"
       ]
     },
     "to": [
@@ -36,9 +36,9 @@
           -300
         ],
         "ids": [
-          0,
-          3,
-          7
+          "2ed2d2",
+          "21ew2e",
+          "ewewe2"
         ]
       }
     ]
@@ -92,7 +92,7 @@
       },
       {
         "name": "ids",
-        "type": "uint16[]"
+        "type": "string[]"
       }
     ]
   }