Fallback Inbox contract changes

.circleci/config.yml

@@ -1800,12 +1800,14 @@ workflows:
             - circleci-repo-readonly-authenticated-github-token
             - discord
       - contracts-bedrock-tests:
+          filters: "false"
           # Test everything except PreimageOracle.t.sol since it's slow.
           name: contracts-bedrock-tests
           test_list: find test -name "*.t.sol" -not -name "PreimageOracle.t.sol"
           context:
             - circleci-repo-readonly-authenticated-github-token
       - contracts-bedrock-tests:
+          filters: "false"
           # PreimageOracle test is slow, run it separately to unblock CI.
           name: contracts-bedrock-tests-preimage-oracle
           test_list: find test -name "PreimageOracle.t.sol"
@@ -1831,6 +1833,7 @@ workflows:
           context:
             - circleci-repo-readonly-authenticated-github-token
       - contracts-bedrock-checks:
+          filters: "false"
           requires:
             - contracts-bedrock-build
           context:
@@ -1878,6 +1881,7 @@ workflows:
           context:
             - circleci-repo-readonly-authenticated-github-token
       - go-tests:
+          filters: "false"
           name: go-tests-short
           no_output_timeout: 19m
           test_timeout: 20m
@@ -2279,6 +2283,7 @@ workflows:
       - op-acceptance-tests:
           # Acceptance Testing params
           name: kurtosis-simple
+          filters: "false"
           devnet: simple
           gate: base
           # CircleCI params
@@ -2290,6 +2295,7 @@ workflows:
       - op-acceptance-tests:
           # Acceptance Testing params
           name: kurtosis-isthmus
+          filters: "false"
           devnet: isthmus
           gate: isthmus
           # CircleCI params
@@ -2301,6 +2307,7 @@ workflows:
       - op-acceptance-tests:
           # Acceptance Testing params
           name: kurtosis-interop
+          filters: "false"
           devnet: interop
           gate: interop
           # CircleCI params
@@ -2324,6 +2331,7 @@ workflows:
       # KURTOSIS (Simple)
       - op-acceptance-tests:
           # Acceptance Testing params
+          filters: "false"
           name: kurtosis-simple
           devnet: simple
           gate: base
@@ -2336,6 +2344,7 @@ workflows:
       - op-acceptance-tests:
           # Acceptance Testing params
           name: kurtosis-isthmus
+          filters: "false"
           devnet: isthmus
           gate: isthmus
           # CircleCI params

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

@@ -0,0 +1,49 @@
+name: L1 Contracts Tests
+
+on:
+  pull_request:
+  push:
+    branches:
+      - "celo-integration*"
+      - "main"
+      - "develop"
+  workflow_dispatch:
+
+jobs:
+  contracts-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly-654c8f01721e43dbc8a53c7a3b022548cb82b2f9
+
+      - name: Install Just
+        uses: extractions/setup-just@v2
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.23'
+
+      - name: Install dependencies
+        working-directory: packages/contracts-bedrock
+        run: just install
+
+      - name: Build go-ffi
+        working-directory: packages/contracts-bedrock
+        run: just build-go-ffi
+
+      - name: Check formatting
+        working-directory: packages/contracts-bedrock
+        run: forge fmt --check
+
+      - name: Run L1 contracts tests
+        working-directory: packages/contracts-bedrock
+        run: forge test --match-path "test/L1/*.t.sol" -vv
+

.github/workflows/espresso-devnet-tests.yaml

@@ -60,9 +60,6 @@ jobs:
       - name: Run Batcher Restart test
         run: go test -timeout 30m -p 1 -count 1 -run 'TestBatcherRestart' -v  ./espresso/devnet-tests/...
 
-      - name: Run Key Rotation test
-        run: go test -timeout 30m -p 1 -count 1 -run 'TestKeyRotation' -v  ./espresso/devnet-tests/...
-
       - name: Run Change Batch Inbox Owner test
         run: go test -timeout 30m -p 1 -count 1 -run 'TestChangeBatchInboxOwner' -v  ./espresso/devnet-tests/...
 

espresso/.env

@@ -50,6 +50,9 @@ BATCH_AUTHENTICATOR_OWNER_PRIVATE_KEY=0x7c852118294e51e653712a81e05800f419141751
 # cast wallet address --mnemonic "test test ... junk" --hd-path "m/44'/60'/0'/0/1"
 PROPOSER_ADDRESS=0x70997970C51812dc3A010C7d01b50e0d17dc79C8
 
+# cast wallet address --mnemonic "test test ... junk" --hd-path "m/44'/60'/0'/0/5"
+NON_TEE_BATCHER_ADDRESS=0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc
+
 L1_CHAIN_ID=11155111
 L2_CHAIN_ID=22266222
 

espresso/devnet-tests/key_rotation_test.go

@@ -8,54 +8,11 @@ import (
 
 	"github.com/ethereum-optimism/optimism/op-batcher/bindings"
 	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/wait"
-	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/stretchr/testify/require"
 )
 
-func TestRotateBatcherKey(t *testing.T) {
-
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	d := NewDevnet(ctx, t)
-
-	// We're going to change batcher key to Bob's, verify that it won't be a no-op
-	require.NotEqual(t, d.secrets.Batcher, d.secrets.Bob)
-
-	require.NoError(t, d.Up(NON_TEE))
-	defer func() {
-		require.NoError(t, d.Down())
-	}()
-
-	// Send a transaction just to check that everything has started up ok.
-	require.NoError(t, d.RunSimpleL2Burn())
-
-	// Shut down the batcher
-	require.NoError(t, d.ServiceDown("op-batcher"))
-	d.SleepOutageDuration()
-
-	// Change the batch sender key to Bob
-	contract, owner, err := d.SystemConfig(ctx)
-	require.NoError(t, err)
-
-	tx, err := contract.SetBatcherHash(owner, eth.AddressAsLeftPaddedHash(d.secrets.Addresses().Bob))
-	require.NoError(t, err)
-
-	_, err = d.SendL1Tx(ctx, tx)
-	require.NoError(t, err)
-
-	d.secrets.Batcher = d.secrets.Bob
-
-	// Restart the batcher
-	require.NoError(t, d.ServiceUp("op-batcher"))
-	d.SleepOutageDuration()
-
-	// Send a transaction to check the L2 still runs
-	require.NoError(t, d.RunSimpleL2Burn())
-}
-
 func TestChangeBatchInboxOwner(t *testing.T) {
 	// Load environment variables from .env file
 	err := LoadDevnetEnv()

espresso/scripts/prepare-allocs.sh

@@ -73,7 +73,11 @@ op-deployer init --l1-chain-id "${L1_CHAIN_ID}" \
                  --outdir ${DEPLOYER_DIR}
 
 dasel put -f "${DEPLOYER_DIR}/intent.toml" -s .chains.[0].espressoEnabled -t bool -v true
-dasel put -f "${DEPLOYER_DIR}/intent.toml" -s .chains.[0].preApprovedBatcherKey -v "${OPERATOR_ADDRESS}"
+
+# Configure Espresso batchers for devnet. We reuse the operator address for both
+# the non-TEE and TEE batchers to ensure they are non-zero and consistent.
+dasel put -f "${DEPLOYER_DIR}/intent.toml" -s .chains.[0].nonTeeBatcher -v "${OPERATOR_ADDRESS}"
+dasel put -f "${DEPLOYER_DIR}/intent.toml" -s .chains.[0].teeBatcher -v "${OPERATOR_ADDRESS}"
 dasel put -f "${DEPLOYER_DIR}/intent.toml" -s .l1ContractsLocator -v "${ARTIFACTS_DIR}"
 dasel put -f "${DEPLOYER_DIR}/intent.toml" -s .l2ContractsLocator -v "${ARTIFACTS_DIR}"
 dasel put -f "${DEPLOYER_DIR}/intent.toml" -s .opcmAddress -v `jq -r .opcmAddress < ${DEPLOYER_DIR}/bootstrap_implementations.json`

justfile

@@ -30,6 +30,9 @@ golint:
 compile-contracts:
  (cd packages/contracts-bedrock && just build-dev)
 
+run-l1-espresso-contracts-tests: compile-contracts
+ (cd packages/contracts-bedrock && forge test --match-path "/**/test/L1/Batch*.t.sol")
+
 compile-contracts-fast:
  (cd packages/contracts-bedrock && forge build --offline --skip "/**/test/**")