Rename TEE Batcher by jjeangal · Pull Request #395 · EspressoSystems/optimism-espresso-integration

jjeangal · 2026-04-03T19:12:50Z

This PR

Renames teeBatcher/activeIsTee → espressoBatcher/activeIsEspresso throughout BatchAuthenticator.sol and its interface, generated Go bindings, batcher logic, and tests — aligns naming with Espresso-specific semantics rather than implementation detail (TEE).
Renames the NON_TEE devnet Docker Compose profile to FALLBACK and updates all test references to use espresso/fallback variable naming instead of tee/nonTee.
Renames registerSigner parameters in BatchAuthenticator.sol from attestationTbs/signature to verificationData/data for a more generic interface.
Renames .env vars TEE_BATCHER_ADDRESS/TEE_BATCHER_PRIVATE_KEY → ESPRESSO_BATCHER_ADDRESS/ESPRESSO_BATCHER_PRIVATE_KEY.
Updates espresso/SECURITY_ANALYSIS.md to consistently say "Espresso batcher" and "fallback batcher" in place of "TEE batcher" and "non-TEE batcher".

Key Places to Review

packages/contracts-bedrock/src/L1/BatchAuthenticator.sol — core rename: storage var espressoBatcher, flag activeIsEspresso, setter setEspressoBatcher, event EspressoBatcherUpdated; also registerSigner param rename (see bullets 1 & 3)
packages/contracts-bedrock/interfaces/L1/IBatchAuthenticator.sol — interface kept in sync with contract; ensure ABI-level names match Go bindings
espresso/bindings/batch_authenticator.go — generated Go bindings regenerated to match new ABI; verify method names (EspressoBatcher, ActiveIsEspresso, SetEspressoBatcher) are consistent with call sites (see bullet 1)
op-batcher/batcher/espresso_active.go — isBatcherActive now calls ActiveIsEspresso; logic unchanged, only naming updated (see bullet 1)
espresso/devnet-tests/batcher_switching_test.go — NON_TEE → FALLBACK profile, activeIsTee → activeIsEspresso variable (see bullet 2)

How to Test This PR

Run the contract tests to verify the renamed ABI compiles and tests pass:

cd packages/contracts-bedrock
just build-dev
forge test --match-contract BatchAuthenticatorTest -vv

Run integration smoke tests:

just smoke-tests

Run the batcher switching devnet test (requires Docker):

just build-devnet
U_ID=$(id -u) GID=$(id -g) go test -timeout 30m -p 1 -count 1 -v -run '^TestBatcherSwitching$' ./espresso/devnet-tests/...

Asana tasks

claude · 2026-04-03T19:13:11Z

Claude finished @jjeangal's task in 3m 8s —— View job

Review: PR #395 — Rename TEE Batcher

Read existing review comments
Review the diff for renaming consistency and correctness
Check for missed renames (old names still referenced)
Review Solidity contract changes
Review Go binding and test changes
Post review feedback

Summary

Clean renaming PR that consistently replaces teeBatcher → espressoBatcher and nonTeeBatcher → fallbackBatcher across Solidity contracts, Go bindings, deployer code, and tests. The registerSigner parameter rename (attestationTbs/signature → verificationData/data) is also applied.

Issues Found

ABI/Storage Layout Snapshots Not Updated (Medium)

The snapshot files still contain the old names and were not updated in this PR:

packages/contracts-bedrock/snapshots/abi/BatchAuthenticator.json still references teeBatcher, setTeeBatcher, TeeBatcherUpdated, attestationTbs
packages/contracts-bedrock/snapshots/storageLayout/BatchAuthenticator.json still references teeBatcher

These snapshots need to be regenerated to reflect the contract changes. This could cause CI snapshot checks to fail or create confusion for anyone relying on the ABI snapshots.

Fix this →

SECURITY_ANALYSIS.md Not Updated (Low)

espresso/SECURITY_ANALYSIS.md still contains many references to the old naming (nonTeeBatcher, non-TEE batcher). While this file isn't code, it could cause confusion if someone reads it after this rename lands.

Minor Inconsistencies in Comments (Nit)

Two places use "non-Espresso batcher" instead of the preferred "fallback batcher" — see inline comments on batcher_switching_test.go:14 and batcher_active_publish_test.go:108.

What Looks Good

The core renaming across Solidity contracts, interfaces, Go code, deployer pipeline, and E2E tests is thorough and consistent
The Go bindings were properly regenerated to match the new contract ABI
The opsuccinct_fault_dispute_game.go binding update appears to be an unrelated regeneration (ABI changes) bundled with this PR — no issues there
The function selector in streamer_test.go was correctly updated to 0x030650d2 for the new espressoBatcher() getter
Test names were appropriately updated (e.g., test_setTeeBatcher_* → test_setEspressoBatcher_*)
Storage slot layout is preserved since espressoBatcher replaces teeBatcher at the same position — no migration needed

claude · 2026-04-03T19:15:33Z


 // TestBatcherSwitching tests that the batcher can be switched from the TEE-enabled
-// batcher to a fallback non-TEE batcher using the BatchAuthenticator contract.
+// batcher to a fallback non-Espresso batcher using the BatchAuthenticator contract.


Nit: The rest of the PR uses "fallback batcher" consistently, but this comment says "non-Espresso batcher". Consider updating for consistency:

Suggested change

// batcher to a fallback non-Espresso batcher using the BatchAuthenticator contract.

// batcher to a fallback batcher using the BatchAuthenticator contract.

claude · 2026-04-03T19:15:34Z

 		require.NoError(t, err)

-		t.Logf("TEE batcher published: %v, non-TEE batcher published: %v", teePublished, nonTeePublished)
+		t.Logf("Espresso batcher published: %v, non-Espresso batcher published: %v", espressoPublished, fallbackPublished)


Nit: Same inconsistency here — the log message says "non-Espresso batcher" while the variable is named fallbackPublished. Consider aligning:

Suggested change

t.Logf("Espresso batcher published: %v, non-Espresso batcher published: %v", espressoPublished, fallbackPublished)

t.Logf("Espresso batcher published: %v, fallback batcher published: %v", espressoPublished, fallbackPublished)

claude · 2026-04-03T19:16:07Z

    }

-    function registerSigner(bytes calldata attestationTbs, bytes calldata signature) external {
+    function registerSigner(bytes calldata verificationData, bytes calldata data) external {


The new parameter name data is quite generic. The underlying registerService in the TEE verifier mocks uses attestation for the first parameter. Consider whether verificationData and data are descriptive enough, or if something like attestation and proof (or attestationData and proofData) would better communicate the purpose of each parameter.

Not a blocker, but worth considering for developer clarity.

gemini-code-assist

Code Review

This pull request renames 'TEE' and 'non-TEE' batcher references to 'Espresso' and 'fallback' across the system's contracts, bindings, and tests. It also adds the 'rootClaimByChainId' function to the fault dispute game bindings. Feedback was provided to improve consistency by renaming the 'activeIsTee' variable and related event parameters in the 'BatchAuthenticator' contract to match the new naming convention, despite the potential for breaking changes in the ABI.

gemini-code-assist · 2026-04-03T19:19:15Z


    /// @notice Flag indicating which batcher is currently active.
-    /// @dev When true the TEE batcher is active; when false the non-TEE batcher is active.
+    /// @dev When true the Espresso batcher is active; when false the fallback batcher is active.


The comment has been updated to refer to the "Espresso batcher" and "fallback batcher", but the variable activeIsTee (on line 38) and the event BatcherSwitched (referenced in switchBatcher) still use the "Tee" terminology. For consistency with the PR's objective of renaming TEE and non-TEE batchers, consider renaming activeIsTee to activeIsEspresso and updating the associated event and functions. Note that this would be a breaking change for the contract ABI, similar to the renaming of teeBatcher to espressoBatcher.

…task

shenkeyao

Thank you for doing the renaming!

I realized that we should do a similar change in the tee-op-deploy repo as well, so I just created this ticket: https://app.asana.com/1/1208976916964769/project/1209392461754458/task/1213920204955146?focus=true. I can take on it next week.

…task

philippecamacho · 2026-04-06T19:44:03Z

just smoke-test fails on my machine. Attaching the logs.
logs.txt

Here is the error:

   service.go:632:             �[32mINFO �[0m[04-06|15:43:25.502] Stopping batcher                         �[32mrole�[0m=batcher
    service.go:692:             �[32mINFO �[0m[04-06|15:43:25.502] Batch Submitter stopped                  �[32mrole�[0m=batcher
    espresso_dev_node_test.go:24: failed to start dev environment with espresso dev node:
        have:
        	"failed to setup batch submitter: failed to init Espresso: invalid Espresso config: query service URLs are required when Espresso is enabled"
        want:
        	"<nil>"
    setup.go:521: CLOSING

philippecamacho · 2026-04-06T21:33:31Z

just smoke-test fails on my machine. Attaching the logs. logs.txt

Here is the error:

   service.go:632:             �[32mINFO �[0m[04-06|15:43:25.502] Stopping batcher                         �[32mrole�[0m=batcher
    service.go:692:             �[32mINFO �[0m[04-06|15:43:25.502] Batch Submitter stopped                  �[32mrole�[0m=batcher
    espresso_dev_node_test.go:24: failed to start dev environment with espresso dev node:
        have:
        	"failed to setup batch submitter: failed to init Espresso: invalid Espresso config: query service URLs are required when Espresso is enabled"
        want:
        	"<nil>"
    setup.go:521: CLOSING

Sorry it was a problem on my end. Test is passing now.

jjeangal · 2026-04-06T21:37:48Z

just smoke-test fails on my machine. Attaching the logs. logs.txt
Here is the error:

   service.go:632:             �[32mINFO �[0m[04-06|15:43:25.502] Stopping batcher                         �[32mrole�[0m=batcher
    service.go:692:             �[32mINFO �[0m[04-06|15:43:25.502] Batch Submitter stopped                  �[32mrole�[0m=batcher
    espresso_dev_node_test.go:24: failed to start dev environment with espresso dev node:
        have:
        	"failed to setup batch submitter: failed to init Espresso: invalid Espresso config: query service URLs are required when Espresso is enabled"
        want:
        	"<nil>"
    setup.go:521: CLOSING

Sorry it was a problem on my end. Test is passing now.

Maybe it was related to the code not using the updated espresso-streamers branch? Some CI failures are finicky. Re-running them!

philippecamacho · 2026-04-07T15:29:40Z

just smoke-test fails on my machine. Attaching the logs. logs.txt
Here is the error:
   service.go:632:             �[32mINFO �[0m[04-06|15:43:25.502] Stopping batcher                         �[32mrole�[0m=batcher
    service.go:692:             �[32mINFO �[0m[04-06|15:43:25.502] Batch Submitter stopped                  �[32mrole�[0m=batcher
    espresso_dev_node_test.go:24: failed to start dev environment with espresso dev node:
        have:
        	"failed to setup batch submitter: failed to init Espresso: invalid Espresso config: query service URLs are required when Espresso is enabled"
        want:
        	"<nil>"
    setup.go:521: CLOSING
Sorry it was a problem on my end. Test is passing now.
Maybe it was related to the code not using the updated espresso-streamers branch? Some CI failures are finicky. Re-running them!

No, I think it was an issue with some local docker configuration.

philippecamacho

LGTM

* Rename tee batcher * change name `activeIsTee` * update function selector for espresso batcher * update security analysis doc * delete unrelated script * espresso devnet tests use fallback & espresso terms * modify .env var names * (hopefully last references) * push new batch authenticator bindings * update espresso-streamers commit * pin to point to espresso-streamers last PR

Rename tee batcher

79e486c

claude Bot reviewed Apr 3, 2026

View reviewed changes

gemini-code-assist Bot reviewed Apr 3, 2026

View reviewed changes

jjeangal added 4 commits April 3, 2026 16:32

change name activeIsTee

075e328

update function selector for espresso batcher

363d6e6

update security analysis doc

e622dc3

Merge branch 'celo-integration-rebase-16.2' into jg/renaming-backlog-…

c440c44

…task

shenkeyao reviewed Apr 3, 2026

View reviewed changes

Comment thread espresso/devnet-tests/batcher_switching_test.go

Comment thread espresso/scripts/decode_batch_calldata.py Outdated

Comment thread espresso/streamer_test.go Outdated

jjeangal added 5 commits April 6, 2026 09:47

delete unrelated script

933cd66

espresso devnet tests use fallback & espresso terms

5be8db8

modify .env var names

cb9ea8c

(hopefully last references)

6a7b7c1

Merge branch 'celo-integration-rebase-16.2' into jg/renaming-backlog-…

4798465

…task

jjeangal added 2 commits April 6, 2026 16:38

push new batch authenticator bindings

b00d64e

update espresso-streamers commit

05293f3

pin to point to espresso-streamers last PR

2d44253

philippecamacho approved these changes Apr 7, 2026

View reviewed changes

jjeangal merged commit e7aaee6 into celo-integration-rebase-16.2 Apr 7, 2026
41 checks passed

jjeangal deleted the jg/renaming-backlog-task branch April 7, 2026 16:03

	// batcher to a fallback non-Espresso batcher using the BatchAuthenticator contract.
	// batcher to a fallback batcher using the BatchAuthenticator contract.

	t.Logf("Espresso batcher published: %v, non-Espresso batcher published: %v", espressoPublished, fallbackPublished)
	t.Logf("Espresso batcher published: %v, fallback batcher published: %v", espressoPublished, fallbackPublished)

Conversation

jjeangal commented Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

This PR

Key Places to Review

How to Test This PR

Asana tasks

Uh oh!

claude Bot commented Apr 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review: PR #395 — Rename TEE Batcher

Summary

Issues Found

What Looks Good

Uh oh!

claude Bot Apr 3, 2026

Choose a reason for hiding this comment

Uh oh!

claude Bot Apr 3, 2026

Choose a reason for hiding this comment

Uh oh!

claude Bot Apr 3, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist Bot Apr 3, 2026

Choose a reason for hiding this comment

Uh oh!

shenkeyao left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

philippecamacho commented Apr 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

philippecamacho commented Apr 6, 2026

Uh oh!

jjeangal commented Apr 6, 2026

Uh oh!

philippecamacho commented Apr 7, 2026

Uh oh!

philippecamacho left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

jjeangal commented Apr 3, 2026 •

edited

Loading

claude Bot commented Apr 3, 2026 •

edited

Loading

philippecamacho commented Apr 6, 2026 •

edited

Loading