Merge branch 'eigenda-v2.1.0' of github.com:Layr-Labs/nitro-contracts…

… into epociask--fix-EDAA-04

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eigenda/nitro-contracts",
-  "version": "2.1.0-rc",
+  "version": "2.1.0-pr-1",
   "description": "Layer 2 precompiles and rollup for Arbitrum Nitro x EigenDA",
   "author": "Offchain Labs, Inc.",
   "license": "BUSL-1.1",

src/bridge/SequencerInbox.sol

@@ -95,11 +95,6 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
 
     mapping(bytes32 => DasKeySetInfo) public dasKeySetInfo;
 
-    /// @inheritdoc ISequencerInbox
-    bytes1 public constant EIGENDA_MESSAGE_HEADER_FLAG = 0xed;
-
-    IRollupManager public eigenDARollupManager;
-
     modifier onlyRollupOwner() {
         if (msg.sender != rollup.owner()) revert NotOwner(msg.sender, rollup.owner());
         _;
@@ -132,6 +127,11 @@ contract SequencerInbox is DelegateCallAware, GasRefundEnabled, ISequencerInbox
     // True if the chain this SequencerInbox is deployed on uses custom fee token
     bool public immutable isUsingFeeToken;
 
+    /// @inheritdoc ISequencerInbox
+    bytes1 public constant EIGENDA_MESSAGE_HEADER_FLAG = 0xed;
+
+    IRollupManager public eigenDARollupManager;
+
     constructor(
         uint256 _maxDataSize,
         IReader4844 reader4844_,

src/mocks/SequencerInboxStub.sol

@@ -5,9 +5,13 @@
 pragma solidity ^0.8.0;
 
 import "../bridge/SequencerInbox.sol";
+import "../bridge/EigenDABlobVerifierL2.sol";
+
 import "../bridge/IEthBridge.sol";
 import {INITIALIZATION_MSG_TYPE} from "../libraries/MessageTypes.sol";
 
+import "../bridge/IRollupManager.sol";
+
 contract SequencerInboxStub is SequencerInbox {
     constructor(
         IBridge bridge_,
@@ -24,6 +28,10 @@ contract SequencerInboxStub is SequencerInbox {
         delaySeconds = uint64(maxTimeVariation_.delaySeconds);
         futureSeconds = uint64(maxTimeVariation_.futureSeconds);
         isBatchPoster[sequencer_] = true;
+
+        // inject dummy rollup manager dependency for testing
+        IRollupManager bv = new EigenDABlobVerifierL2();
+        eigenDARollupManager = bv;
     }
 
     function addInitMessage(uint256 chainId) external {
@@ -58,4 +66,4 @@ contract SequencerInboxStub is SequencerInbox {
         this; // silence warning about function not being view
         return bounds;
     }
-}
+}