fix(contracts): input size limit check

cartesi · Jun 26, 2023 · 0308f24 · 0308f24
1 parent 495a12c
commit 0308f24
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/onchain/rollups/contracts/common/CanonicalMachine.sol b/onchain/rollups/contracts/common/CanonicalMachine.sol
@@ -29,8 +29,9 @@ library CanonicalMachine {
     /// @notice Keccak-256 output size (32 bytes).
     Log2Size constant KECCAK_LOG2_SIZE = Log2Size.wrap(5);
 
-    /// @notice Maximum input size (32 megabytes).
-    Log2Size constant INPUT_MAX_LOG2_SIZE = Log2Size.wrap(25);
+    /// @notice Maximum input size (~2 megabytes).
+    /// @dev The offset and size fields use up the extra 64 bytes.
+    uint256 constant INPUT_MAX_SIZE = (1 << 21) - 64;
 
     /// @notice Maximum voucher metadata memory range (2 megabytes).
     Log2Size constant VOUCHER_METADATA_LOG2_SIZE = Log2Size.wrap(21);

diff --git a/onchain/rollups/contracts/library/LibInput.sol b/onchain/rollups/contracts/library/LibInput.sol
@@ -35,12 +35,7 @@ library LibInput {
         bytes calldata input,
         uint256 inboxInputIndex
     ) internal pure returns (bytes32) {
-        // Currently sending an input larger than driveSize surpasses the block gas limit
-        // But we keep the following check in case this changes in the future
-        if (
-            input.length >
-            (1 << CanonicalMachine.INPUT_MAX_LOG2_SIZE.uint64OfSize())
-        ) {
+        if (input.length > CanonicalMachine.INPUT_MAX_SIZE) {
             revert InputSizeExceedsLimit();
         }
 

diff --git a/onchain/rollups/test/foundry/inputs/InputBox.t.sol b/onchain/rollups/test/foundry/inputs/InputBox.t.sol
@@ -175,10 +175,7 @@ contract InputBoxTest is Test {
 
         // assume #bytes for each input is within bounds
         for (uint256 i; i < numInputs; ++i) {
-            vm.assume(
-                _inputs[i].length <=
-                    (1 << CanonicalMachine.INPUT_MAX_LOG2_SIZE.uint64OfSize())
-            );
+            vm.assume(_inputs[i].length <= CanonicalMachine.INPUT_MAX_SIZE);
         }
 
         // adding inputs