Merge pull request #2042 from xutruth/main

fix encodePacked DynamicBytes
hyperledger · Apr 25, 2024 · 6847173 · 6847173
2 parents 84c9fe9 + b1ad81b
commit 6847173
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 * Fix Sign method [#2033](https://github.com/hyperledger/web3j/pull/2033)
 * Revert 2031 and 2033 [#2034](https://github.com/hyperledger/web3j/pull/2034)
 * Web3j release fix [2037](https://github.com/hyperledger/web3j/pull/2037)
+* Fix encodePacked DynamicBytes [2042](https://github.com/hyperledger/web3j/pull/2042)
 
 ### Features
 

diff --git a/abi/src/main/java/org/web3j/abi/TypeEncoder.java b/abi/src/main/java/org/web3j/abi/TypeEncoder.java
@@ -101,9 +101,11 @@ public static String encode(Type parameter) {
      */
     public static String encodePacked(Type parameter) {
         if (parameter instanceof Utf8String) {
-            return removePadding(encode(parameter), parameter);
+            //removePadding can also be used, but is not necessary
+            return Numeric.toHexStringNoPrefix(((Utf8String) parameter).getValue().getBytes(StandardCharsets.UTF_8));
         } else if (parameter instanceof DynamicBytes) {
-            return encode(parameter).substring(64);
+            //removePadding can also be used, but is not necessary
+            return Numeric.toHexStringNoPrefix(((DynamicBytes) parameter).getValue());
         } else if (parameter instanceof DynamicArray) {
             return arrayEncodePacked((DynamicArray) parameter);
         } else if (parameter instanceof StaticArray) {
@@ -140,6 +142,9 @@ static String removePadding(String encodedValue, Type parameter) {
             int length =
                     ((Utf8String) parameter).getValue().getBytes(StandardCharsets.UTF_8).length;
             return encodedValue.substring(64, 64 + length * 2);
+        }
+        if (parameter instanceof DynamicBytes) {
+            return encodedValue.substring(64, 64 + ((DynamicBytes) parameter).getValue().length * 2);
         } else {
             throw new UnsupportedOperationException(
                     "Type cannot be encoded: " + parameter.getClass());

diff --git a/abi/src/test/java/org/web3j/abi/DefaultFunctionEncoderTest.java b/abi/src/test/java/org/web3j/abi/DefaultFunctionEncoderTest.java
@@ -33,6 +33,7 @@
 import org.web3j.abi.datatypes.generated.Bytes10;
 import org.web3j.abi.datatypes.generated.Uint256;
 import org.web3j.abi.datatypes.generated.Uint32;
+import org.web3j.utils.Numeric;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -151,6 +152,19 @@ public void testEncodeConstructorPacked_multipleParameters() {
                                 new Address("0x663e27AdC18d862dA9A82f060310621D379e469a"),
                                 new Uint256(BigInteger.TEN),
                                 new Bytes10("1234567890".getBytes()))));
+        assertEquals(
+                "0000004501000102030405",
+                FunctionEncoder.encodeConstructorPacked(
+                        Arrays.asList(
+                                new Uint32(BigInteger.valueOf(69)),
+                                new Bool(true),
+                                new DynamicBytes((new byte[]{0, 1, 2, 3, 4, 5})))));
+        assertEquals(
+                "12000102030405",
+                FunctionEncoder.encodeConstructorPacked(
+                        Arrays.asList(
+                                new DynamicBytes(Numeric.hexStringToByteArray("0x12")),
+                                new DynamicBytes((new byte[]{0, 1, 2, 3, 4, 5})))));
     }
 
     @Test

diff --git a/abi/src/test/java/org/web3j/abi/TypeEncoderPackedTest.java b/abi/src/test/java/org/web3j/abi/TypeEncoderPackedTest.java
@@ -905,17 +905,22 @@ public void testStaticArrayEncodePacked() {
     public void testDynamicBytesEncodePacked() {
         DynamicBytes dynamicBytes = new DynamicBytes(new byte[] {0, 1, 2, 3, 4, 5});
         assertEquals(
-                "0001020304050000000000000000000000000000000000000000000000000000",
+                "000102030405",
                 TypeEncoder.encodePacked(dynamicBytes));
 
-        DynamicBytes empty = new DynamicBytes(new byte[] {0});
+        DynamicBytes zero = new DynamicBytes(new byte[] {0});
         assertEquals(
-                "0000000000000000000000000000000000000000000000000000000000000000",
+                "00",
+                TypeEncoder.encodePacked(zero));
+
+        DynamicBytes empty = new DynamicBytes(new byte[] {});
+        assertEquals(
+                "",
                 TypeEncoder.encodePacked(empty));
 
         DynamicBytes dave = new DynamicBytes("dave".getBytes());
         assertEquals(
-                "6461766500000000000000000000000000000000000000000000000000000000",
+                "64617665",
                 TypeEncoder.encodePacked(dave));
 
         DynamicBytes loremIpsum =
@@ -942,7 +947,7 @@ public void testDynamicBytesEncodePacked() {
                         + "756c6c612070617269617475722e204578636570746575722073696e74206f63"
                         + "63616563617420637570696461746174206e6f6e2070726f6964656e742c2073"
                         + "756e7420696e2063756c706120717569206f666669636961206465736572756e"
-                        + "74206d6f6c6c697420616e696d20696420657374206c61626f72756d2e000000"),
+                        + "74206d6f6c6c697420616e696d20696420657374206c61626f72756d2e"),
                 TypeEncoder.encodePacked(loremIpsum));
     }