fixed compile

matter-labs · Jun 24, 2024 · d68a03a · d68a03a
1 parent b9d2abe
commit d68a03a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/l1-contracts/contracts/state-transition/data-availability/CalldataDA.sol b/l1-contracts/contracts/state-transition/data-availability/CalldataDA.sol
@@ -4,10 +4,10 @@ pragma solidity 0.8.24;
 
 // solhint-disable gas-custom-errors, reason-string
 
-// TODO: maybe move it here
-import {BLOB_SIZE_BYTES} from "../chain-interfaces/IExecutor.sol";
-
-uint256 constant BLOBS_SUPPORTED = 6;
+/// @dev Total number of bytes in a blob. Blob = 4096 field elements * 31 bytes per field element
+/// @dev EIP-4844 defines it as 131_072 but we use 4096 * 31 within our circuits to always fit within a field element
+/// @dev Our circuits will prove that a EIP-4844 blob and our internal blob are the same.
+uint256 constant BLOB_SIZE_BYTES = 126_976;
 
 /// @notice Contract that contains the functionality for process the calldata DA.
 /// @dev The expected l2DAValidator that should be used with it `RollupL2DAValidator`.

diff --git a/l1-contracts/contracts/state-transition/data-availability/RelayedSLDAValidator.sol b/l1-contracts/contracts/state-transition/data-availability/RelayedSLDAValidator.sol
@@ -4,14 +4,11 @@ pragma solidity 0.8.24;
 
 // solhint-disable gas-custom-errors, reason-string
 
-import {IL1DAValidator, L1DAValidatorOutput} from "../chain-interfaces/IL1DAValidator.sol";
+import {IL1DAValidator, L1DAValidatorOutput, PubdataSource} from "../chain-interfaces/IL1DAValidator.sol";
 import {IL1Messenger} from "../../common/interfaces/IL1Messenger.sol";
 
 import {CalldataDA} from "./CalldataDA.sol";
 
-// TODO: maybe move it here
-import {PubdataSource} from "../chain-interfaces/IExecutor.sol";
-
 import {L2_TO_L1_MESSENGER_SYSTEM_CONTRACT_ADDR} from "../../common/L2ContractAddresses.sol";
 
 uint256 constant BLOBS_SUPPORTED = 6;
@@ -80,4 +77,8 @@ contract RelayedSLDAValidator is IL1DAValidator, CalldataDA {
             );
         }
     }
+
+    function supportsInterface(bytes4 interfaceId) override external view returns (bool) {
+        return interfaceId == type(IL1DAValidator).interfaceId;
+    }
 }
diff --git a/l1-contracts/contracts/state-transition/data-availability/RollupL1DAValidator.sol b/l1-contracts/contracts/state-transition/data-availability/RollupL1DAValidator.sol
@@ -22,11 +22,6 @@ uint256 constant BLOB_DA_INPUT_SIZE = PUBDATA_COMMITMENT_SIZE + 32;
 /// point evaluation precompile
 uint256 constant BLS_MODULUS = 52435875175126190479447740508185965837690552500527637822603658699938581184513;
 
-/// @dev Total number of bytes in a blob. Blob = 4096 field elements * 31 bytes per field element
-/// @dev EIP-4844 defines it as 131_072 but we use 4096 * 31 within our circuits to always fit within a field element
-/// @dev Our circuits will prove that a EIP-4844 blob and our internal blob are the same.
-uint256 constant BLOB_SIZE_BYTES = 126_976;
-
 /// @dev Offset in pubdata commitment of blobs for claimed value
 uint256 constant PUBDATA_COMMITMENT_CLAIMED_VALUE_OFFSET = 16;