feat(CHAIN-3293) Migrate Multiproof Contracts to base/contracts by jjtny1 · Pull Request #196 · base/contracts

jjtny1 · 2026-02-28T03:18:46Z

This PR migrates the contracts from https://github.com/base/multiproof-dispute-game to base contracts.

Multiproofs depend on a modified version of the DisputeGameFactory that takes arguments in the initialize constructor. This is done through a git patch found in multiproof_tests/optimism.patch. Because this patch is needed for the tests to pass, we keep all multiproof tests in the the multiproof_tests folder and use a foundry profile to trigger it. This is abstracted into a make command: make test-multiproof

…andling into a single function, improving code clarity and maintainability. Update tests accordingly to reflect the new verification structure.

…onventions for clarity in Nullify tests.

…ild game in AggregateVerifier. Implement corresponding test case to verify this behavior.

…d rollup configuration. Update verification methods to use a journal hash instead of root claims. Modify MockVerifier and tests accordingly.

…tion

…date validation check to use this constant

…ifier

…ier, updating documentation and logic to clarify its purpose as the L2 sequence number.

…rnal to public, enhancing accessibility for contract interactions.

…fier to emit event upon credit transfer

…er for consistency with internal function naming conventions.

…nsolidating the return statement for the first dispute game scenario.

…figgloabal initialize

* Replace onchain Nitro cert verification with Automata ZK verifier, add ISemver to multiproof contracts, wire SystemConfigGlobal into standard deploy pipeline * Integrate multiproof config into standard DeployConfig, fix TEEVerifier proof format to match AggregateVerifier's l1head change * Fix fmt * Replace aws-nitro-enclave-attestation submodule with no-git dependency in Makefile * Consolidate deploy configs: migrate dev scripts to standard DeployConfig, add multiproof fields to sepolia.json and hardhat.json, remove separate nitro config files * Regenerate snapshots for updated and new multiproof contracts * Fix Initializable test: guard ETHLockbox entries for non-interop deploys, exclude AggregateVerifier (uses custom bool instead of OZ _initialized) * Add test-multiproof recipe to Justfile for CI * Address PR feedback: extract GameType local var, stricter pubKey check, iterate PCRs, add nitroEnclaveVerifier to Input, revert sepolia.json owner, remove redundant CI recipe * Resolve merge conflicts and regenerate semver-lock snapshots * Regenerate semver-lock with CI profile for correct bytecode hashes * Regenerate semver-lock with all compiler profiles including dispute * Regenerate semver-lock.json to remove stale dispute profile entries * Fix misleading TEEVerifier comment, require nitroEnclaveVerifier in deploy config, and parameterize hardcoded l2ChainID/block intervals in DeployImplementations * Reset semvar versioning in SystemConfigGlobal * Regenerate semver-lock.json for SystemConfigGlobal and TEEVerifier changes * correct SystemConfigGlobal.t.sol testInitialization() test cases to check correct version() number * use a proof threshold and allow ZK proofs after TEE nullification (#199) * use a proof threshold and allow ZK proofs after TEE nullification * pr feedback * update deployment scripts and tests * allow tee nullfiication when a zk proof exists. extend timestamp in this case to allow for zk nullification * Fix stack-too-deep in DeployImplementations and regenerate semver-lock * add multiproofProofThreshold to DeployConfig.s.sol to fix CI failures * Correct semver comment * Regenerate semver-lock following fix --------- Co-authored-by: roger-bai-coinbase <roger.bai@coinbase.com>

cb-heimdall · 2026-03-05T22:42:40Z

Review Error for leopoldjoy @ 2026-03-05 22:42:40 UTC
User cannot review their own commit

jackchuma · 2026-03-05T22:50:53Z

scripts/autogen/generate-semver-lock/main.go

 		sourceFilePath = path
 		contractName = name
 		contractKey = sourceFilePath + ":" + name
+		if strings.HasSuffix(file, ".dispute.json") {


Do we need this?

Yes, the reason is because forge build produces an artifact per compiler profile (code) for some contracts.

This results in a non-deterministic generation of the semver.json file. When searching through forge-artifacts sometimes the default compiler profile is picked up and sometimes it's the dispute profile optimization. The contract key doesn't differentiate between these profiles so on different runs it produces different hashes.

This causes the CI tests to be non-deterministic.

This fixes the issue by checking if we are using the dispute optimized code and adds that to the contract key stored in the json

snapshots/abi/MockSystemConfig.json

snapshots/abi/MockVerifier.json

snapshots/abi/DevSystemConfigGlobal.json

snapshots/storageLayout/DevSystemConfigGlobal.json

snapshots/storageLayout/MockSystemConfig.json

snapshots/storageLayout/MockVerifier.json

jackchuma · 2026-03-05T22:57:36Z

src/dispute/zk/OPSuccinctFaultDisputeGame.sol

            GameType.unwrap(ANCHOR_STATE_REGISTRY.respectedGameType()) == GameType.unwrap(GAME_TYPE);
    }

+    function initializeWithInitData(bytes calldata) external payable { }


Why is this here if it's empty?

It needs to be implemented since this contract inherits IDisputeGame and we added this function for the AggregateVerifier

jackchuma · 2026-03-05T23:02:15Z

foundry.toml

@@ -21,6 +21,7 @@ additional_compiler_profiles = [
  { name = "dispute", optimizer_runs = 5000 },
 ]
 compilation_restrictions = [


Why are a bunch of compilation restrictions changed for contracts that are not relevant to multi proofs?

Yeah this was the tricky part with getting CI to pass.

Our multiproof contracts, directly import (or indirectly) import these contracts. This causes the forge compiler to produce 2 artifacts (one per compiler profile).

Having more than 1 artifact causes the following error:

semver is non-deterministic (see comment above)

vm.getCode (or vm.getDeploymentCode) cheatcodes cause tests to fail because they pick up different artifacts. An example of this is the VerifyOPCM tests. When the OP contracts are deployed, they are deployed with the code from default profile. When the tests are run, the call to vm.GetCode picks up the dispute optimized profile. This results in 2 different bytecodes so the bytecode comparison check fails.

The fundamental issue here is that the disputecompiler profile causes forge to compile multiple artifacts for a single contract (one optimized the other not). From what I can tell, the reason this error shows up now is because our multiproof contracts somehow trigger different compilations per profile so more than one artifact is created.

Im not sure if there is a way for us to tell forge "only use the default compiler profile or optimized one". By adding these contracts, we force these contracts to only use the optimized version

jackchuma · 2026-03-05T23:02:39Z

foundry.toml

@@ -153,6 +163,7 @@ additional_compiler_profiles = [
  { name = "dispute", optimizer_runs = 0 },
 ]
 compilation_restrictions = [


same here regarding compilation restriction changes

see comment above

roger-bai-coinbase added 30 commits December 4, 2025 16:23

initial commit

5041935

Refactor tests and simplify verifier

bd550fd

Refactor proof verification methods to consolidate TEE and ZK proof h…

e1a7654

…andling into a single function, improving code clarity and maintainability. Update tests accordingly to reflect the new verification structure.

refactor tests and errors

2ea6dff

Prevent proofs from extending resolution time

70864f8

ZK proof allows game creator to immediately reclaim bond

2ef75e4

Additional tests

7e70a75

Refactor test cases to standardize warp duration and improve naming c…

ab2e400

…onventions for clarity in Nullify tests.

Add validation to ensure parent game has a proof before creating a ch…

aa2518d

…ild game in AggregateVerifier. Implement corresponding test case to verify this behavior.

Use calldata and remove unused variable

1613646

Make internal verify functions consistent

5ba6ed7

fix: can claim bond after nullifying a challenge

ab2d01b

prevent challenges if parent or game itself is invalid

8e38be6

Enhance AggregateVerifier to include hashes for TEE and ZK images, an…

3a2b31c

…d rollup configuration. Update verification methods to use a journal hash instead of root claims. Modify MockVerifier and tests accordingly.

Add ReentrancyGuard to AggregateVerifier and protect claimCredit func…

0a053f1

…tion

Add constant for initialize calldata size in AggregateVerifier and up…

308f591

…date validation check to use this constant

Add test to validate failure on invalid calldata size in AggregateVer…

9585f67

…ifier

Refactor l2BlockNumber function to l2SequenceNumber in AggregateVerif…

45c47f6

…ier, updating documentation and logic to clarify its purpose as the L2 sequence number.

Refactor visibility of state variables in AggregateVerifier from inte…

5cfe30b

…rnal to public, enhancing accessibility for contract interactions.

Moved wasRespectedGameTypeWhenCreated for storage optimization

b2dd1ff

Remove underscores from constructor variables

f0d3f54

IDIsputeGame compliance

5fcecd5

Remove implicit returns

ba44e13

Add CreditClaimed event and update claimCredit logic in AggregateVeri…

54c4192

…fier to emit event upon credit transfer

Rename getParentGameStatus to _getParentGameStatus in AggregateVerifi…

49e2eea

…er for consistency with internal function naming conventions.

Refactor return logic in getParentGameStatus to improve clarity by co…

2b3238d

…nsolidating the return statement for the first dispute game scenario.

solidity style guide

8d47e48

forge fmt

abe2710

Fix tests

c200cb7

remove unused imports

3fbec56

jjtny1 added 3 commits March 1, 2026 23:58

support AggregateVerifier in initalizer test

babc5ad

fix import path

7b90711

semver

76335ba

jjtny1 force-pushed the joby.thundil/CHAIN-3293-migrate-multiproof-contracts-to-basecontracts branch from 0f84ac7 to 76335ba Compare March 2, 2026 05:45

jjtny1 added 5 commits March 2, 2026 01:27

semver

1e6412c

semver

5d90e6e

deterministic semverlock

4fd964b

add comment

928cfe0

refactor multiproof patch changes. fix typo

ee8c3b9

jjtny1 force-pushed the joby.thundil/CHAIN-3293-migrate-multiproof-contracts-to-basecontracts branch from 9efb20a to ee8c3b9 Compare March 2, 2026 16:37

jjtny1 added 14 commits March 2, 2026 11:55

semver

3c6111b

fmt

e7abb04

semver

14ed45f

fix tests

9323dfd

fix tests where bytecodes size was different

3a65398

fmt

b1dc695

semver

11a0d84

semver

3953c94

semver

13610a9

make aggregateverifies excluded like faultdispute game. fix systemcon…

c956def

…figgloabal initialize

fmt

a0f0b14

fix tests

6b31f9d

semver

5cdba94

rm just test-multiproof

8e00905

jjtny1 requested a review from jackchuma March 3, 2026 03:12

leopoldjoy approved these changes Mar 5, 2026

View reviewed changes

jackchuma reviewed Mar 5, 2026

View reviewed changes

pr feedback: delete unecessary snapshots

320d989

Conversation

jjtny1 commented Feb 28, 2026

Uh oh!

cb-heimdall commented Mar 5, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants