Fix contract tests

.github/workflows/contracts-l1-tests.yaml

@@ -21,7 +21,12 @@ jobs:
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
         with:
-          version: nightly-654c8f01721e43dbc8a53c7a3b022548cb82b2f9
+          # Pinned to stable 1.2.3 rather than the nightly used elsewhere.
+          # The nightly (654c8f01) added strict vm.getCode artifact matching that errors
+          # when two contracts share the same name (e.g. src/universal/Proxy.sol and
+          # OZ v5's proxy/Proxy.sol). Fixing every upstream call-site would touch many
+          # Celo/OP-stack files.
+          version: "1.2.3"
 
       - name: Install Just
         uses: extractions/setup-just@v2
@@ -44,6 +49,8 @@ jobs:
         run: forge fmt --check
 
       - name: Run L1 contracts tests
+        timeout-minutes: 20
         working-directory: packages/contracts-bedrock
+        env:
+          FOUNDRY_PROFILE: lite
         run: forge test --match-path "test/L1/*.t.sol" -vv
-

espresso/environment/espresso_dev_net_launcher.go

@@ -22,6 +22,10 @@ type E2eDevnetLauncherContext struct {
 	// The launching Context
 	Ctx context.Context
 
+	// The testing.T for the current test, used to fail with a clear error message on
+	// launch failures (e.g. Docker container failing to start).
+	T *testing.T
+
 	// Any Current Error
 	Error error
 

espresso/environment/optitmism_espresso_test_helpers.go

@@ -381,6 +381,7 @@ func expandLauncherOptionsToSystemOptions(launchContext *E2eDevnetLauncherContex
 func (l *EspressoDevNodeLauncherDocker) StartE2eDevnet(ctx context.Context, t *testing.T, options ...E2eDevnetLauncherOption) (*e2esys.System, EspressoDevNode, error) {
 	launchContext := E2eDevnetLauncherContext{
 		Ctx:       ctx,
+		T:         t,
 		SystemCfg: nil,
 	}
 
@@ -812,16 +813,12 @@ func launchEspressoDevNodeStartOption(ct *E2eDevnetLauncherContext) e2esys.Start
 	return e2esys.StartOption{
 		Role: "launch-espresso-dev-node",
 		BatcherMod: func(c *batcher.CLIConfig, sys *e2esys.System) {
-			// On error, disable Espresso in the batcher so sysConfig.Start() does not fail with a
-			// misleading "query service URLs are required" error. The test will still fail; this
-			// is only so the failure message is the actual cause, to help with debugging.
-			defer func() {
-				if ct.Error != nil {
-					c.Espresso.Enabled = false
-				}
-			}()
-
+			// Fail early if there was a prior setup failure. Launching the Espresso container
+			// requires the L1 RPC URL, which is only available after the L1 geth node has started
+			// inside sysConfig.Start(), so this is the earliest place where we can catch the
+			// issue.
 			if ct.Error != nil {
+				ct.T.Fatalf("devnet setup failed before espresso dev node could start: %v", ct.Error)
 				return
 			}
 

flake.nix

@@ -91,6 +91,47 @@
           doCheck = false;
         };
 
+        # Pinned to stable 1.2.3 rather than the nightly used elsewhere.
+        # The nightly (654c8f01) added strict vm.getCode artifact matching that errors
+        # when two contracts share the same name (e.g. src/universal/Proxy.sol and
+        # OZ v5's proxy/Proxy.sol). Fixing every upstream call-site would touch many
+        # Celo/OP-stack files.
+        foundry-bin-1_2_3 =
+          let
+            version = "1.2.3";
+            srcs = {
+              "x86_64-linux" = pkgs.fetchurl {
+                url = "https://github.com/foundry-rs/foundry/releases/download/v${version}/foundry_v${version}_linux_amd64.tar.gz";
+                sha256 = "sha256-ggLzjxY1wnk7LRpP5EOub3MVGQ3G7tIZ15aaQKt4ooY=";
+              };
+              "aarch64-linux" = pkgs.fetchurl {
+                url = "https://github.com/foundry-rs/foundry/releases/download/v${version}/foundry_v${version}_linux_arm64.tar.gz";
+                sha256 = "sha256-cGEv0dqd86izVIQhTk8rN7odbEEVCElJBkLXoFPDHqo=";
+              };
+              "x86_64-darwin" = pkgs.fetchurl {
+                url = "https://github.com/foundry-rs/foundry/releases/download/v${version}/foundry_v${version}_darwin_amd64.tar.gz";
+                sha256 = "sha256-4+K0JcfhuMhT7UVCdrIP9QD6gtZcyVrK0iW0twY63Uo=";
+              };
+              "aarch64-darwin" = pkgs.fetchurl {
+                url = "https://github.com/foundry-rs/foundry/releases/download/v${version}/foundry_v${version}_darwin_arm64.tar.gz";
+                sha256 = "sha256-o/PxQXp6AqFpQun8hkGNASHC2QTBE/6xsmydadxvKH0=";
+              };
+            };
+          in
+          pkgs.stdenv.mkDerivation {
+            pname = "foundry-bin";
+            inherit version;
+            src = srcs.${system};
+            nativeBuildInputs = pkgs.lib.optionals pkgs.stdenv.isLinux [ pkgs.autoPatchelfHook ];
+            buildInputs = pkgs.lib.optionals pkgs.stdenv.isLinux [ pkgs.stdenv.cc.cc.lib ];
+            dontUnpack = true;
+            installPhase = ''
+              mkdir -p $out/bin
+              tar -xzf $src -C $out/bin forge cast anvil chisel
+              chmod +x $out/bin/forge $out/bin/cast $out/bin/anvil $out/bin/chisel
+            '';
+          };
+
         enclaver = pkgs.rustPlatform.buildRustPackage rec {
           pname = "enclaver";
           version = "0.5.0";
@@ -128,7 +169,7 @@
               pkgs.awscli2
               pkgs.cargo
               pkgs.dasel
-              pkgs.foundry-bin
+              foundry-bin-1_2_3
               pkgs.go-ethereum
               pkgs.jq
               pkgs.just

op-batcher/batcher/driver.go

@@ -177,13 +177,19 @@ func NewBatchSubmitter(setup DriverSetup) *BatchSubmitter {
 	}
 
 	l1Adapter := &batcherL1Adapter{L1Client: batchSubmitter.L1Client}
+	// Convert typed nil pointer to untyped nil interface to avoid typed-nil interface panic
+	// in confirmEspressoBlockHeight when EspressoLightClient is not configured.
+	var lightClientIface espresso.LightClientCallerInterface
+	if batchSubmitter.EspressoLightClient != nil {
+		lightClientIface = batchSubmitter.EspressoLightClient
+	}
 	batchSubmitter.espressoStreamer = espresso.NewBufferedEspressoStreamer(
 		espresso.NewEspressoStreamer(
 			batchSubmitter.RollupConfig.L2ChainID.Uint64(),
 			l1Adapter,
 			l1Adapter,
 			batchSubmitter.Espresso,
-			batchSubmitter.EspressoLightClient,
+			lightClientIface,
 			batchSubmitter.Log,
 			func(data []byte) (*derive.EspressoBatch, error) {
 				return derive.UnmarshalEspressoTransaction(data, batchSubmitter.SequencerAddress)

op-batcher/batcher/espresso.go

@@ -1096,6 +1096,8 @@ func (l *BatchSubmitter) sendTxWithEspresso(txdata txData, isCancel bool, candid
 		}
 		return
 	}
+	// OpenZeppelin ECDSA.recover requires v = 27 or 28, but crypto.Sign produces v = 0 or 1.
+	signature[64] += 27
 	l.Log.Debug("Signed transaction", "txRef", transactionReference, "commitment", hexutil.Encode(commitment[:]), "sig", hexutil.Encode(signature))
 
 	batchAuthenticatorAbi, err := bindings.BatchAuthenticatorMetaData.GetAbi()

packages/contracts-bedrock/foundry.toml

@@ -16,6 +16,11 @@ use_literal_content = true
 optimizer = true
 optimizer_runs = 999999
 
+# IMPORTANT:
+# When adding any new compiler profiles or compilation restrictions, you must
+# also update the restrictions in the "LITE" profile to match. This guarantees
+# that builds will fully overwrite one another without needing to clean the
+# entire build directory.
 additional_compiler_profiles = [
   { name = "dispute", optimizer_runs = 5000 },
   { name = "via-ir", via_ir = true },
@@ -36,9 +41,8 @@ compilation_restrictions = [
   { paths = "src/L1/opcm/OPContractsManagerUtilsCaller.sol", optimizer_runs = 5000 },
   { paths = "src/L1/OptimismPortal2.sol", optimizer_runs = 5000 },
   { paths = "src/L1/ProtocolVersions.sol", optimizer_runs = 5000 },
-  { paths = "src/universal/StorageSetter.sol", optimizer_runs = 5000 },
-  { paths = "lib/espresso-tee-contracts/lib/nitro-validator/**", via_ir = false },
-  { paths = "lib/espresso-tee-contracts/lib/automata-dcap-attestation/**", via_ir = true },
+  { paths = "src/L1/StandardValidator.sol", optimizer_runs = 5000 },
+  { paths = "src/universal/StorageSetter.sol", optimizer_runs = 5000 }
 ]
 
 extra_output = ['devdoc', 'userdoc', 'metadata', 'storageLayout']
@@ -60,6 +64,7 @@ remappings = [
   '@openzeppelin/contracts-v5/=lib/openzeppelin-contracts-v5/contracts',
   '@rari-capital/solmate/=lib/solmate',
   '@lib-keccak/=lib/lib-keccak/contracts/lib',
+  'solady/=lib/solady/',
   '@solady/=lib/solady/src',
   '@solady-v0.0.245/=lib/solady-v0.0.245/src',
   'forge-std/=lib/forge-std/src',
@@ -70,22 +75,23 @@ remappings = [
 ]
 
 fs_permissions = [
-  { access = 'read-write', path = './.resource-metering.csv' },
-  { access = 'read-write', path = './snapshots/' },
-  { access = 'read-write', path = './deployments/' },
-  { access = 'read', path = './deploy-config/' },
-  { access = 'read', path = './deploy-config-periphery/' },
-  { access = 'read', path = './broadcast/' },
-  { access = 'read', path = './forge-artifacts/' },
-  { access = 'read-write', path = './.testdata/' },
-  { access = 'read', path = './kout-deployment' },
-  { access = 'read', path = './test/fixtures' },
-  { access = 'read', path = './lib/superchain-registry/superchain/configs/' },
+  { access='read-write', path='./.resource-metering.csv' },
+  { access='read-write', path='./snapshots/' },
+  { access='read-write', path='./deployments/' },
+  { access='read', path='./deploy-config/' },
+  { access='read', path='./deploy-config-periphery/' },
+  { access='read', path='./broadcast/' },
+  { access='read', path = './forge-artifacts/' },
+  { access='read-write', path='./.testdata/' },
+  { access='read', path='./kout-deployment' },
+  { access='read', path='./test/fixtures' },
+  { access='read', path='./lib/superchain-registry/superchain/configs/' },
+  { access='read', path='./lib/superchain-registry/validation/standard/' },
   { access = 'read-write', path = '../../op-chain-ops/cmd/celo-migrate/testdata/' },
 ]
 
-# 5159 error code is selfdestruct error code
-ignored_error_codes = ["transient-storage", "code-size", "init-code-size", "too-many-warnings", 5159]
+# 5159 = selfdestruct; 6321 = unnamed return variable; 5667 = unused param (lib/espresso-tee-contracts mocks)
+ignored_error_codes = ["transient-storage", "code-size", "init-code-size", "too-many-warnings", 5159, 6321, 5667]
 deny_warnings = true
 ffi = true
 
@@ -101,10 +107,10 @@ runs = 64
 failure_persist_file = "~/Desktop/failures.txt"
 
 [fmt]
-line_length = 120
-multiline_func_header = 'all'
-bracket_spacing = true
-wrap_comments = true
+line_length=120
+multiline_func_header='all'
+bracket_spacing=true
+wrap_comments=true
 
 ################################################################
 #                         PROFILE: CI                          #
@@ -151,7 +157,7 @@ timeout = 300
 
 [profile.lite]
 optimizer = false
-optimizer_runs = 0
+optimizer_runs = 200
 use_literal_content = false
 
 [profile.lite.fuzz]
@@ -161,33 +167,6 @@ runs = 8
 runs = 8
 depth = 8
 
-# IMPORTANT:
-# See the info in the "DEFAULT" profile to understand this section.
-additional_compiler_profiles = [
-  { name = "dispute", optimizer_runs = 0 },
-  { name = "via-ir", via_ir = true },
-]
-compilation_restrictions = [
-  { paths = "src/dispute/FaultDisputeGame.sol", optimizer_runs = 0 },
-  { paths = "src/dispute/v2/FaultDisputeGameV2.sol", optimizer_runs = 0 },
-  { paths = "src/dispute/PermissionedDisputeGame.sol", optimizer_runs = 0 },
-  { paths = "src/dispute/v2/PermissionedDisputeGameV2.sol", optimizer_runs = 0 },
-  { paths = "src/dispute/SuperFaultDisputeGame.sol", optimizer_runs = 0 },
-  { paths = "src/dispute/SuperPermissionedDisputeGame.sol", optimizer_runs = 0 },
-  { paths = "src/L1/OPContractsManager.sol", optimizer_runs = 0 },
-  { paths = "src/L1/OPContractsManagerStandardValidator.sol", optimizer_runs = 0 },
-  { paths = "src/L1/opcm/OPContractsManagerV2.sol", optimizer_runs = 0 },
-  { paths = "src/L1/opcm/OPContractsManagerContainer.sol", optimizer_runs = 0 },
-  { paths = "src/L1/opcm/OPContractsManagerMigrator.sol", optimizer_runs = 0 },
-  { paths = "src/L1/opcm/OPContractsManagerUtils.sol", optimizer_runs = 0 },
-  { paths = "src/L1/opcm/OPContractsManagerUtilsCaller.sol", optimizer_runs = 0 },
-  { paths = "src/L1/OptimismPortal2.sol", optimizer_runs = 0 },
-  { paths = "src/L1/ProtocolVersions.sol", optimizer_runs = 0 },
-  { paths = "src/universal/StorageSetter.sol", optimizer_runs = 0 },
-  { paths = "src/L1/StandardValidator.sol", optimizer_runs = 5000 },
-]
-
-
 ################################################################
 #                         PROFILE: KONTROL                     #
 ################################################################

packages/contracts-bedrock/interfaces/L1/IBatchAuthenticator.sol

@@ -8,7 +8,7 @@ interface IBatchAuthenticator {
     error InvalidAddress(address contract_);
 
     /// @notice Emitted when a batch info is authenticated.
-    event BatchInfoAuthenticated(bytes32 indexed commitment, address indexed signer);
+    event BatchInfoAuthenticated(bytes32 indexed commitment);
 
     /// @notice Emitted when a signer registration is initiated through this contract.
     event SignerRegistrationInitiated(address indexed caller);
@@ -22,10 +22,7 @@ interface IBatchAuthenticator {
     /// @notice Emitted when the active batcher is switched.
     event BatcherSwitched(bool indexed activeIsTee);
 
-    function authenticateBatchInfo(
-        bytes32 commitment,
-        bytes memory _signature
-    ) external;
+    function authenticateBatchInfo(bytes32 commitment, bytes memory _signature) external;
 
     function espressoTEEVerifier() external view returns (IEspressoTEEVerifier);
 
@@ -37,10 +34,7 @@ interface IBatchAuthenticator {
 
     function nonTeeBatcher() external view returns (address);
 
-    function registerSigner(
-        bytes memory attestationTbs,
-        bytes memory signature
-    ) external;
+    function registerSigner(bytes memory attestationTbs, bytes memory signature) external;
 
     function validBatchInfo(bytes32) external view returns (bool);
 

packages/contracts-bedrock/scripts/checks/check-semver-diff.sh

@@ -17,6 +17,7 @@ SEMVER_LOCK="snapshots/semver-lock.json"
 
 # Define excluded contracts.
 EXCLUDED_CONTRACTS=(
+    "src/vendor/asterisc/RISCV.sol"
 )
 
 # Helper function to check if a contract is excluded.