V2.0.0

.github/workflows/contract-tests.yml

@@ -12,7 +12,7 @@ on:
 jobs:
   test-unit:
     name: Test unit
-    runs-on: ubuntu-latest
+    runs-on: linux-2xl
     steps:
       - uses: actions/checkout@v3
         with:
@@ -34,10 +34,10 @@ jobs:
         run: yarn
 
       - name: Build
-        run: forge test
+        run: forge test --fork-url https://rpc.holesky.ethpandaops.io/
   tests:
     name: Contract tests
-    runs-on: ubuntu-8
+    runs-on: linux-2xl
     defaults:
       run:
         shell: bash
@@ -106,7 +106,7 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
   test-4844:
     name: 4844 tests
-    runs-on: ubuntu-latest
+    runs-on: linux-2xl
     steps:
       - uses: actions/checkout@v3
         with:

.gitmodules

@@ -3,4 +3,4 @@
 	url = https://github.com/foundry-rs/forge-std
 [submodule "lib/eigenda"]
 	path = lib/eigenda
-	url = https://github.com/Layr-Labs/eigenda
+	url = https://github.com/Layr-Labs/eigenda

deploy/EigenDARollupManagerStubCreator.js

@@ -0,0 +1,11 @@
+module.exports = async hre => {
+    const { deployments, getNamedAccounts, ethers } = hre
+    const { deploy } = deployments
+    const { deployer } = await getNamedAccounts()
+
+    await deploy('EigenDADummyManager', { from: deployer, args: [] })
+  }
+
+  module.exports.tags = ['EigenDADummyManager']
+  module.exports.dependencies = []
+

deploy/EigenDAServiceManagerStubCreator.js

@@ -0,0 +1,10 @@
+module.exports = async hre => {
+  const { deployments, getNamedAccounts, ethers } = hre
+  const { deploy } = deployments
+  const { deployer } = await getNamedAccounts()
+
+  await deploy('EigenDAServiceManagerStub', { from: deployer, args: [] })
+}
+
+module.exports.tags = ['EigenDAServiceManagerStub', 'test']
+module.exports.dependencies = []

deploy/SequencerInbox.js

@@ -6,8 +6,12 @@ module.exports = async hre => {
   const blobBasefeeReader = await ethers.getContract('BlobBasefeeReader')
   const dataHashReader = await ethers.getContract('DataHashReader')
 
-  await deploy('SequencerInbox', { from: deployer, args: [117964] })
+  const EigenDARollupUtils = await ethers.getContract('EigenDARollupUtils')
+
+
+
+  await deploy('SequencerInbox', { from: deployer, args: [117964], libraries: { EigenDARollupUtils: EigenDARollupUtils.address } })
 }
 
 module.exports.tags = ['SequencerInbox']
-module.exports.dependencies = []
+module.exports.dependencies = ['EigenDARollupUtils']

deploy/SequencerInboxStubCreator.js

@@ -15,6 +15,7 @@ module.exports = async hre => {
     delaySeconds: 10000,
     futureSeconds: 10000,
   }
+
   await deploy('SequencerInboxStub', {
     from: deployer,
     args: [

package.json

@@ -47,9 +47,13 @@
     "deploy-cachemanager-testnode": "hardhat run scripts/local-deployment/deployCacheManager.ts"
   },
   "dependencies": {
+    "@eigenda/eigenda-utils": "2.0.0",
+    "@grpc/grpc-js": "^1.8.22",
+    "@grpc/proto-loader": "^0.7.13",
     "@offchainlabs/upgrade-executor": "1.1.0-beta.0",
-    "@openzeppelin/contracts": "4.5.0",
-    "@openzeppelin/contracts-upgradeable": "4.5.2",
+    "@openzeppelin/contracts": "4.7.0",
+    "@openzeppelin-upgrades/contracts": "npm:@openzeppelin/contracts-upgradeable@4.7",
+    "@openzeppelin/contracts-upgradeable": "4.7.2",
     "patch-package": "^6.4.7",
     "solady": "0.0.182"
   },
@@ -64,6 +68,7 @@
     "@typechain/ethers-v5": "^10.0.0",
     "@typechain/hardhat": "^6.0.0",
     "@types/chai": "^4.3.0",
+    "@types/google-protobuf": "^3.15.12",
     "@types/mocha": "^9.0.0",
     "@types/node": "^17.0.5",
     "@typescript-eslint/eslint-plugin": "^5.14.0",

scripts/deploymentUtils.ts

@@ -63,6 +63,7 @@ export async function deployContract(
   verify: boolean = true,
   overrides?: Overrides
 ): Promise<Contract> {
+  console.log("Deploying contract EigenDA x Arbitrum", contractName)
   const factory: ContractFactory = await ethers.getContractFactory(contractName)
   const connectedFactory: ContractFactory = factory.connect(signer)
 
@@ -100,6 +101,8 @@ export async function deployAllContracts(
 ): Promise<Record<string, Contract>> {
   const isOnArb = await _isRunningOnArbitrum(signer)
 
+  const eigenDARollupManager = await deployContract('EigenDADummyManager', signer, [], verify)
+
   const ethBridge = await deployContract('Bridge', signer, [], verify)
   const reader4844 = isOnArb
     ? ethers.constants.AddressZero
@@ -227,6 +230,7 @@ export async function deployAllContracts(
   )
   const deployHelper = await deployContract('DeployHelper', signer, [], verify)
   return {
+    ethSequencerInbox,
     bridgeCreator,
     prover0,
     proverMem,
@@ -241,6 +245,7 @@ export async function deployAllContracts(
     validatorWalletCreator,
     rollupCreator,
     deployHelper,
+    eigenDARollupManager,
   }
 }
 

scripts/local-deployment/deployCreatorAndCreateRollup.ts

@@ -74,7 +74,8 @@ async function main() {
     deployerWallet,
     true,
     contracts.rollupCreator.address,
-    feeToken
+    feeToken,
+    contracts.eigenDARollupManager.address,
   )
 
   if (!result) {

scripts/rollupCreation.ts

@@ -61,7 +61,8 @@ export async function createRollup(
   signer: Signer,
   isDevDeployment: boolean,
   rollupCreatorAddress: string,
-  feeToken: string
+  feeToken: string,
+  eigenDARollupManager: string,
 ): Promise<{
   rollupCreationResult: RollupCreationResult
   chainInfo: ChainInfo
@@ -101,7 +102,7 @@ export async function createRollup(
     // Call the createRollup function
     console.log('Calling createRollup to generate a new rollup ...')
     const deployParams = isDevDeployment
-      ? await _getDevRollupConfig(feeToken, validatorWalletCreator)
+      ? await _getDevRollupConfig(eigenDARollupManager, feeToken, validatorWalletCreator)
       : {
           config: config.rollupConfig,
           validators: config.validators,
@@ -111,6 +112,7 @@ export async function createRollup(
           maxFeePerGasForRetryables: MAX_FER_PER_GAS,
           batchPosters: config.batchPosters,
           batchPosterManager: config.batchPosterManager,
+          eigenDARollupManager: eigenDARollupManager
         }
 
     const createRollupTx = await rollupCreator.createRollup(deployParams, {
@@ -229,6 +231,7 @@ export async function createRollup(
 }
 
 async function _getDevRollupConfig(
+  rollupManager: string,
   feeToken: string,
   validatorWalletCreator: string
 ) {
@@ -329,6 +332,7 @@ async function _getDevRollupConfig(
     maxFeePerGasForRetryables: MAX_FER_PER_GAS,
     batchPosters: batchPosters,
     batchPosterManager: batchPosterManager,
+    eigenDARollupManager: rollupManager
   }
 
   function _createValidatorAddress(

src/bridge/IBridge.sol

@@ -20,7 +20,9 @@ interface IBridge {
         /// @notice This batch contains no data
         NoData,
         /// @notice The data can be found in the 4844 data blobs on this transaction
-        Blob
+        Blob,
+        /// @notice The data can be found in the EigenDA blob associated with this batch
+        EigenDA
     }
 
     struct TimeBounds {
@@ -42,10 +44,7 @@ interface IBridge {
     );
 
     event BridgeCallTriggered(
-        address indexed outbox,
-        address indexed to,
-        uint256 value,
-        bytes data
+        address indexed outbox, address indexed to, uint256 value, bytes data
     );
 
     event InboxToggle(address indexed inbox, bool enabled);
@@ -78,11 +77,9 @@ interface IBridge {
 
     function sequencerReportedSubMessageCount() external view returns (uint256);
 
-    function executeCall(
-        address to,
-        uint256 value,
-        bytes calldata data
-    ) external returns (bool success, bytes memory returnData);
+    function executeCall(address to, uint256 value, bytes calldata data)
+        external
+        returns (bool success, bytes memory returnData);
 
     function delayedMessageCount() external view returns (uint256);
 
@@ -97,12 +94,7 @@ interface IBridge {
         uint256 newMessageCount
     )
         external
-        returns (
-            uint256 seqMessageIndex,
-            bytes32 beforeAcc,
-            bytes32 delayedAcc,
-            bytes32 acc
-        );
+        returns (uint256 seqMessageIndex, bytes32 beforeAcc, bytes32 delayedAcc, bytes32 acc);
 
     /**
      * @dev Allows the sequencer inbox to submit a delayed message of the batchPostingReport type

src/bridge/ISequencerInbox.sol

@@ -10,6 +10,9 @@ import "../libraries/IGasRefunder.sol";
 import "./IDelayedMessageProvider.sol";
 import "./IBridge.sol";
 
+import {EigenDARollupUtils} from "@eigenda/eigenda-utils/libraries/EigenDARollupUtils.sol";
+import {IEigenDAServiceManager} from "@eigenda/eigenda-utils/interfaces/IEigenDAServiceManager.sol";
+
 interface ISequencerInbox is IDelayedMessageProvider {
     struct MaxTimeVariation {
         uint256 delayBlocks;
@@ -83,6 +86,12 @@ interface ISequencerInbox is IDelayedMessageProvider {
     // solhint-disable-next-line func-name-mixedcase
     function ZERO_HEAVY_MESSAGE_HEADER_FLAG() external view returns (bytes1);
 
+    /// @dev If the first data byte after the header has this bit set,
+    ///      then the batch data is an eigenDA message
+    ///      See: https://github.com/Layr-Labs/nitro/blob/2ad088cb5943ec50ed8b521c4681561817a602c5/das/eigenda/eigenda.go
+    // solhint-disable-next-line func-name-mixedcase
+    function EIGENDA_MESSAGE_HEADER_FLAG() external view returns (bytes1);
+
     function rollup() external view returns (IOwnable);
 
     function isBatchPoster(address) external view returns (bool);
@@ -179,8 +188,29 @@ interface ISequencerInbox is IDelayedMessageProvider {
         uint256 newMessageCount
     ) external;
 
+    function addSequencerL2BatchFromEigenDA(
+        uint256 sequenceNumber,
+        EigenDARollupUtils.BlobVerificationProof calldata blobVerificationProof,
+        IEigenDAServiceManager.BlobHeader calldata blobHeader,
+        uint256 afterDelayedMessagesRead,
+        uint256 prevMessageCount,
+        uint256 newMessageCount
+    ) external;
+
     // ---------- onlyRollupOrOwner functions ----------
 
+    /**
+     * @notice Set the rollup manager contract address
+     * @param newRollupManager the new rollup manager contract address
+     */
+    function setEigenDARollupManager(address newRollupManager) external;
+
+    /**
+     * @notice Set the new rollup contract address
+     */
+    function setRollupAddress() external;
+
+
     /**
      * @notice Set max delay for sequencer inbox
      * @param maxTimeVariation_ the maximum time variation parameters
@@ -223,6 +253,7 @@ interface ISequencerInbox is IDelayedMessageProvider {
     /// @notice Allows the rollup owner to sync the rollup address
     function updateRollupAddress() external;
 
+
     // ---------- initializer ----------
 
     function initialize(IBridge bridge_, MaxTimeVariation calldata maxTimeVariation_) external;

src/bridge/RollupManager.sol

@@ -0,0 +1,84 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.9;
+
+import {Merkle} from "@eigenda/eigenda-utils/libraries/Merkle.sol";
+import {BN254} from "@eigenda/eigenda-utils/libraries/BN254.sol";
+import {EigenDAHasher} from "@eigenda/eigenda-utils/libraries/EigenDAHasher.sol";
+import {IEigenDAServiceManager} from "@eigenda/eigenda-utils/interfaces/IEigenDAServiceManager.sol";
+import {BitmapUtils} from "@eigenda/eigenda-utils/libraries/BitmapUtils.sol";
+import {EigenDARollupUtils} from "@eigenda/eigenda-utils/libraries/EigenDARollupUtils.sol";
+import {IBLSSignatureChecker} from "@eigenda/eigenda-utils/interfaces/IBLSSignatureChecker.sol";
+import {IPaymentCoordinator} from "@eigenda/eigenda-utils/interfaces/IPaymentCoordinator.sol";
+import {ISignatureUtils} from "@eigenda/eigenda-utils/interfaces/ISignatureUtils.sol";
+
+import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
+
+interface IRollupManager {
+
+      function verifyBlob(
+        IEigenDAServiceManager.BlobHeader calldata blobHeader,
+        EigenDARollupUtils.BlobVerificationProof calldata blobVerificationProof
+    ) external view;
+
+    function openCommitment(
+        uint256 point, 
+        uint256 evaluation,
+        BN254.G1Point memory tau, 
+        BN254.G1Point memory commitment, 
+        BN254.G2Point memory proof 
+    ) external view returns(bool);
+
+}
+
+// EigenDADummyManager is a dummy implementation of IRollupManager
+// and is used in nitro-testnode to avoid the overhead of deploying core EigenDA contracts
+// to simplify the testing process.
+contract EigenDADummyManager {
+
+    function verifyBlob(
+        IEigenDAServiceManager.BlobHeader calldata,
+        EigenDARollupUtils.BlobVerificationProof calldata
+    ) external view {
+       return ;
+    }
+
+    function openCommitment(
+        uint256 point, 
+        uint256 evaluation,
+        BN254.G1Point memory tau, 
+        BN254.G1Point memory commitment, 
+        BN254.G2Point memory proof 
+    ) internal view returns(bool) {
+
+        return EigenDARollupUtils.openCommitment(point, evaluation, tau, commitment, proof);
+    }
+}
+
+contract EigenDARollupManager is Ownable, IRollupManager {
+    using BN254 for BN254.G1Point;
+
+    address public eigenDAServiceManager;
+
+    function verifyBlob(
+        IEigenDAServiceManager.BlobHeader calldata blobHeader,
+        EigenDARollupUtils.BlobVerificationProof calldata blobVerificationProof
+    ) external view {
+       return EigenDARollupUtils.verifyBlob(blobHeader, IEigenDAServiceManager(eigenDAServiceManager), blobVerificationProof);
+    }
+
+    function openCommitment(
+        uint256 point, 
+        uint256 evaluation,
+        BN254.G1Point memory tau, 
+        BN254.G1Point memory commitment, 
+        BN254.G2Point memory proof 
+    ) external view returns(bool) {
+
+        return EigenDARollupUtils.openCommitment(point, evaluation, tau, commitment, proof);
+    }
+
+    function setEigenDAServiceManager(address _eigenDAServiceManager) external onlyOwner {
+        eigenDAServiceManager = _eigenDAServiceManager;
+    }
+}