Sync to integration

.github/workflows/test.yml

@@ -27,6 +27,7 @@ jobs:
 
   test-contract-size:
     name: Test Contract Size
+    if: false
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -43,6 +44,7 @@ jobs:
   test-gas-check:
     name: Test Gas Check
     runs-on: ubuntu-latest
+    if: false
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -57,6 +59,7 @@ jobs:
 
   test-sigs:
     name: Test Signatures
+    if: false
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -72,6 +75,7 @@ jobs:
 
   test-storage:
     name: Test Storage
+    if: false
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -81,6 +85,6 @@ jobs:
         uses: foundry-rs/foundry-toolchain@v1
         with:
           version: nightly
-        
+
       - run: yarn minimal-install
       - run: yarn test:storage

.gitmodules

@@ -1,9 +1,10 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
+[submodule "lib/nitro-contracts"]
+	path = lib/nitro-contracts
+  url = https://github.com/EspressoSystems/nitro-contracts
+  branch = develop
 [submodule "lib/arbitrum-sdk"]
 	path = lib/arbitrum-sdk
 	url = https://github.com/OffchainLabs/arbitrum-sdk
-[submodule "lib/nitro-contracts"]
-	path = lib/nitro-contracts
-	url = https://github.com/EspressoSystems/nitro-contracts

contracts/parent-chain/espresso-migration/DeployAndInitEspressoSequencerInbox.s.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: MIT 
+// SPDX-License-Identifier: MIT
 pragma solidity ^0.8.9;
 
 import "forge-std/Script.sol";
@@ -19,15 +19,15 @@ contract DeployAndInitEspressoSequencerInbox is Script {
         uint256 maxDataSize = vm.envUint("MAX_DATA_SIZE");
         // Grab booleans we need from env
         bool isUsingFeeToken = vm.envBool("IS_USING_FEE_TOKEN");
-        // Trick the Vm into seeing that this opcode exsists and 
+        // Trick the Vm into seeing that this opcode exsists and
         bytes memory code = vm.getDeployedCode("ArbSysMock.sol:ArbSysMock");
         vm.etch(0x0000000000000000000000000000000000000064, code);
         // initialize interfaces needed
         IReader4844 reader = IReader4844(reader4844Addr);
         // Start broadcast to deploy the SequencerInbox
         vm.startBroadcast(deployerPrivateKey);
         SequencerInbox sequencerInbox = new SequencerInbox(maxDataSize, reader, isUsingFeeToken);
-        
+
         // Setting batch posters and batch poster manager
         vm.stopBroadcast();
     }

contracts/parent-chain/espresso-migration/DeployEspressoSequencerMigrationAction.s.sol

@@ -19,10 +19,18 @@ contract DeployEspressoSequencerMigrationAction is Script {
         address oldBatchPosterAddr = vm.envAddress("OLD_BATCH_POSTER_ADDRESS");
         address newBatchPosterAddr = vm.envAddress("NEW_BATCH_POSTER_ADDRESS");
         address batchPosterManagerAddr = vm.envAddress("BATCH_POSTER_MANAGER_ADDRESS");
-
+        bool isRevert = vm.envBool("IS_REVERT");
         vm.startBroadcast(deployerPrivateKey);
-        EspressoSequencerInboxMigrationAction migrationAction =
-            new EspressoSequencerInboxMigrationAction(newSequencerInboxImplAddr, rollupAddr, proxyAdminAddr, espressoTeeVerifierAddr, oldBatchPosterAddr, newBatchPosterAddr, batchPosterManagerAddr);
+        EspressoSequencerInboxMigrationAction migrationAction = new EspressoSequencerInboxMigrationAction(
+            newSequencerInboxImplAddr,
+            rollupAddr,
+            proxyAdminAddr,
+            espressoTeeVerifierAddr,
+            oldBatchPosterAddr,
+            newBatchPosterAddr,
+            batchPosterManagerAddr,
+            isRevert
+        );
         vm.stopBroadcast();
     }
 }

contracts/parent-chain/espresso-migration/EspressoSequencerInboxMigrationAction.sol

@@ -27,20 +27,30 @@ contract EspressoSequencerInboxMigrationAction {
     address public immutable oldBatchPosterAddr;
     address public immutable newBatchPosterAddr;
     address public immutable batchPosterManager;
+    bool public immutable isRevert;
 
     error AddressIsNotContract(address incorrectAddr);
 
     error OldBatchPosterMustNotBeZeroAddr();
 
     error NewBatchPosterMustNotBeZeroAddr();
-    
+
     error MaxTimeVariationNotSet();
 
     error SequencerInboxNotUpgraded(address oldSequencerInboxAddr);
-    
+
     error espressoTEEVerifierNotSet();
 
-    constructor(address _newSequencerInboxImpl, address _rollup, address _proxyAdminAddr, address _espressoTEEVerifier, address _oldBatchPosterAddr, address _newBatchPosterAddr, address _batchPosterManager) {
+    constructor(
+        address _newSequencerInboxImpl,
+        address _rollup,
+        address _proxyAdminAddr,
+        address _espressoTEEVerifier,
+        address _oldBatchPosterAddr,
+        address _newBatchPosterAddr,
+        address _batchPosterManager,
+        bool _isRevert
+    ) {
         // If the new impl addresses are contracts, we need to revert
         if (!Address.isContract(_newSequencerInboxImpl)) {
             revert AddressIsNotContract(_newSequencerInboxImpl);
@@ -54,15 +64,15 @@ contract EspressoSequencerInboxMigrationAction {
             revert AddressIsNotContract(_proxyAdminAddr);
         }
 
-        if (!Address.isContract(_espressoTEEVerifier)){
+        if (!Address.isContract(_espressoTEEVerifier)) {
             revert AddressIsNotContract(_espressoTEEVerifier);
         }
 
-        if (_oldBatchPosterAddr == address(0x0)){
+        if (_oldBatchPosterAddr == address(0x0)) {
             revert OldBatchPosterMustNotBeZeroAddr();
         }
-        
-        if (_newBatchPosterAddr == address(0x0)){
+
+        if (_newBatchPosterAddr == address(0x0)) {
             revert NewBatchPosterMustNotBeZeroAddr();
         }
 
@@ -79,7 +89,8 @@ contract EspressoSequencerInboxMigrationAction {
         newBatchPosterAddr = _newBatchPosterAddr;
 
         batchPosterManager = _batchPosterManager;
-
+
+        isRevert = _isRevert;
     }
 
     function perform() public {
@@ -89,7 +100,7 @@ contract EspressoSequencerInboxMigrationAction {
 
         TransparentUpgradeableProxy sequencerInbox =
             TransparentUpgradeableProxy(payable(address(rollupCore.sequencerInbox())));
-        
+
         // migrate the rollup to the new sequencer inbox
         proxyAdmin.upgrade(sequencerInbox, newSequencerInboxImpl);
 
@@ -98,22 +109,24 @@ contract EspressoSequencerInboxMigrationAction {
         if (proxyImpl != newSequencerInboxImpl) {
             revert SequencerInboxNotUpgraded(proxyImpl);
         }
-       
+
         SequencerInbox proxyInbox = SequencerInbox(address(rollupCore.sequencerInbox()));
         // Set the TEE verifier address
-        proxyInbox.setEspressoTEEVerifier(espressoTEEVerifier);
+        if (!isRevert) {
+            proxyInbox.setEspressoTEEVerifier(espressoTEEVerifier);
+        }
         // Remove the permissions for the old batch poster addresses
         proxyInbox.setIsBatchPoster(oldBatchPosterAddr, false);
-        // Whitelist the new batch posters address to enable it to post batches 
+        // Whitelist the new batch posters address to enable it to post batches
         proxyInbox.setIsBatchPoster(newBatchPosterAddr, true);
         // Set the batch poster manager.
-        if (batchPosterManager != address(0x0)){
-          proxyInbox.setBatchPosterManager(batchPosterManager);
+        if (batchPosterManager != address(0x0)) {
+            proxyInbox.setBatchPosterManager(batchPosterManager);
         }
 
         address proxyTEEVerifierAddr = address(proxyInbox.espressoTEEVerifier());
-        if (proxyTEEVerifierAddr != espressoTEEVerifier) {
-            revert espressoTEEVerifierNotSet(); 
+        if (!isRevert && (proxyTEEVerifierAddr != espressoTEEVerifier)) {
+            revert espressoTEEVerifierNotSet();
         }
     }
 }

contracts/tests/EspressoMigrationAction.t.sol

@@ -170,20 +170,30 @@ contract MigrationTest is Test {
     function test_migrateToEspresso() public {
         //begin by seting pre-requisites in the vm so the test can get the data it needs.
         IRollupCore rollup = IRollupCore(rollupAddress);
-        
+
         address upgradeExecutorExpectedAddress = computeCreateAddress(address(rollupCreator), 4);
         //ensure we have the correct address for the proxy admin
         ProxyAdmin admin = ProxyAdmin(_getProxyAdmin(address(rollup.sequencerInbox())));
         address adminAddr = _getProxyAdmin(address(rollup.sequencerInbox()));
-       
+
         assertEq(admin.owner(), upgradeExecutorExpectedAddress, "Invalid proxyAdmin's owner");
 
         IUpgradeExecutor _upgradeExecutor = IUpgradeExecutor(upgradeExecutorExpectedAddress);
 
-        bytes memory data =
-            abi.encodeWithSelector(EspressoSequencerInboxMigrationAction.perform.selector);
-
-        address migration = address(new EspressoSequencerInboxMigrationAction(newSequencerImplAddress, rollupAddress, adminAddr, mockTEEVerifier, oldBatchPosterAddr, newBatchPosterAddr, batchPosterManagerAddr));
+        bytes memory data = abi.encodeWithSelector(EspressoSequencerInboxMigrationAction.perform.selector);
+
+        address migration = address(
+            new EspressoSequencerInboxMigrationAction(
+                newSequencerImplAddress,
+                rollupAddress,
+                adminAddr,
+                mockTEEVerifier,
+                oldBatchPosterAddr,
+                newBatchPosterAddr,
+                batchPosterManagerAddr,
+                false
+            )
+        );
 
         vm.prank(rollupOwner);
         _upgradeExecutor.execute(migration, data);
@@ -196,8 +206,6 @@ contract MigrationTest is Test {
             "Sequencer Inbox has not been updated"
         );
         SequencerInbox proxyInbox = SequencerInbox(address(rollup.sequencerInbox()));
-        assertEq(
-          mockTEEVerifier, address(proxyInbox.espressoTEEVerifier())
-        );
+        assertEq(mockTEEVerifier, address(proxyInbox.espressoTEEVerifier()));
     }
 }

hardhat.config.ts

@@ -12,6 +12,7 @@ const config: HardhatUserConfig = {
   solidity: getSolidityConfigFromFoundryToml(
     process.env.FOUNDRY_PROFILE || 'default'
   ),
+
   networks: {
     fork: {
       url: process.env.FORK_URL || 'http://localhost:8545',
@@ -46,11 +47,11 @@ function getSolidityConfigFromFoundryToml(profile: string): SolidityUserConfig {
   const solidity = {
     version: profileConfig?.solc_version || defaultConfig.solc_version,
     settings: {
+      viaIR: true,
       optimizer: {
         enabled: true,
         runs: profileConfig?.optimizer_runs || defaultConfig.optimizer_runs,
       },
-      viaIR: true,
     },
   }