refactor(contracts)!: encode inputs with strict mode

BREAKING CHANGE: changed the encoding of inputs added by input relays
cartesi · Aug 16, 2023 · 799c86f · 799c86f
1 parent f94eeb0
commit 799c86f
Showing 1 changed file with 18 additions and 43 deletions.
diff --git a/onchain/rollups/contracts/common/InputEncoding.sol b/onchain/rollups/contracts/common/InputEncoding.sol
@@ -22,12 +22,7 @@ library InputEncoding {
         uint256 value,
         bytes calldata execLayerData
     ) internal pure returns (bytes memory) {
-        return
-            abi.encodePacked(
-                sender, //              20B
-                value, //               32B
-                execLayerData //        arbitrary size
-            );
+        return abi.encode(sender, value, execLayerData);
     }
 
     /// @notice Encode an ERC-20 token deposit.
@@ -44,14 +39,7 @@ library InputEncoding {
         uint256 amount,
         bytes calldata execLayerData
     ) internal pure returns (bytes memory) {
-        return
-            abi.encodePacked(
-                ret, //                 1B
-                token, //               20B
-                sender, //              20B
-                amount, //              32B
-                execLayerData //        arbitrary size
-            );
+        return abi.encode(ret, token, sender, amount, execLayerData);
     }
 
     /// @notice Encode an ERC-721 token deposit.
@@ -69,14 +57,7 @@ library InputEncoding {
         bytes calldata baseLayerData,
         bytes calldata execLayerData
     ) internal pure returns (bytes memory) {
-        bytes memory data = abi.encode(baseLayerData, execLayerData);
-        return
-            abi.encodePacked(
-                token, //               20B
-                sender, //              20B
-                tokenId, //             32B
-                data //                 arbitrary size
-            );
+        return abi.encode(token, sender, tokenId, baseLayerData, execLayerData);
     }
 
     /// @notice Encode an ERC-1155 single token deposit.
@@ -96,14 +77,14 @@ library InputEncoding {
         bytes calldata baseLayerData,
         bytes calldata execLayerData
     ) internal pure returns (bytes memory) {
-        bytes memory data = abi.encode(baseLayerData, execLayerData);
         return
-            abi.encodePacked(
-                token, //               20B
-                sender, //              20B
-                tokenId, //             32B
-                value, //               32B
-                data //                 arbitrary size
+            abi.encode(
+                token,
+                sender,
+                tokenId,
+                value,
+                baseLayerData,
+                execLayerData
             );
     }
 
@@ -124,17 +105,14 @@ library InputEncoding {
         bytes calldata baseLayerData,
         bytes calldata execLayerData
     ) internal pure returns (bytes memory) {
-        bytes memory data = abi.encode(
-            tokenIds,
-            values,
-            baseLayerData,
-            execLayerData
-        );
         return
-            abi.encodePacked(
-                token, //                   20B
-                sender, //                  20B
-                data //                     arbitrary size
+            abi.encode(
+                token,
+                sender,
+                tokenIds,
+                values,
+                baseLayerData,
+                execLayerData
             );
     }
 
@@ -144,9 +122,6 @@ library InputEncoding {
     function encodeDAppAddressRelay(
         address dapp
     ) internal pure returns (bytes memory) {
-        return
-            abi.encodePacked(
-                dapp //                     20B
-            );
+        return abi.encode(dapp);
     }
 }