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.

…onfigs-and-scripts

Simplify storage and refactor

…kInterval to WithNitro script

Split deploy configs and scripts for no-nitro and with-nitro environments

Co-authored-by: Leopold Joy <leo@leopoldjoy.com>

use l1head for proofs after initialization

…ontracts-to-basecontracts

linear · 2026-02-28T03:18:49Z

CHAIN-3293 Migrate Multiproof Contracts to base/contracts

cb-heimdall · 2026-02-28T03:18:49Z

🟡 Heimdall Review Status

Requirement Status More Info

Reviews

🟡 0/1

Denominator calculation

Show calculation

1 if user is bot 0

1 if user is external 0

2 if repo is sensitive 0

From .codeflow.yml 1

Additional review requirements

Show calculation

Max	0

0

From CODEOWNERS 0

Global minimum 0

Max 1

1

1 if commit is unverified 0

Sum 1

jjtny1 · 2026-02-28T04:41:38Z

.github/workflows/test.yml


      - name: Run Forge tests
-        run: just test
+        run: just test && just test-multiproof


Temporary and should be removed once disputegame changes are made

jackchuma · 2026-02-28T12:06:34Z

multiproof_tests/multiproof/AggregateVerifier.t.sol

Could this be a multiproof directory inside of the existing test/ directory?

I originally had it like that but I couldnt figure out a way to tell forge test to skip the multiproof directory. The multiproof tests need the optimism.patch applied or else they fail and the other tests fail when that patch is applied so i separated them

jackchuma · 2026-02-28T12:07:40Z

deploy-config/sepolia-no-nitro.json

Not blocking for this PR, but these deploy config formats do not match the existing deploy configs in this repo

jackchuma · 2026-02-28T12:08:44Z

multiproof_tests/optimism.patch

We no longer need patch files - can just update the contracts. This can be a follow up PR though

Oh i wasnt sure if we could update the contracts directly. ill make this change and that solves the testing issue as well

jackchuma · 2026-02-28T12:10:13Z

src/multiproof/tee/DevSystemConfigGlobal.sol

Nit: this should be moved to a mocks folder somewhere (can be done in follow up PR)

Ill move it 👍

jackchuma · 2026-02-28T12:10:45Z

src/multiproof/tee/SystemConfigGlobal.sol

+/// @dev Signers are registered by providing a valid AWS Nitro attestation document.
+///      Each signer is associated with the PCR0 (enclave image hash) from their attestation,
+///      which allows TEEVerifier to validate that a signer was registered with a specific image.
+contract SystemConfigGlobal is OwnableManagedUpgradeable, NitroValidator {


Lets add the ISemver interface in a follow up PR

Yes. Also, note that this file will be significantly overhauled by my ZK verifier rework PR which I'll open shortly. (It switches to ZK verifying via the Automata SDK instead of the existing op-enclave-style onchain certificate attestation approach which is currently used here.)

jackchuma · 2026-02-28T12:14:40Z

Makefile

 	abigen --abi out/FeeDisburser.sol/FeeDisburser.abi.json --pkg bindings --type FeeDisburser --out bindings/fee_disburser.go
 	cd bindings && go mod tidy
+
+.PHONY: checkout-op-commit


Remove this

jackchuma · 2026-02-28T12:15:20Z

Makefile

 test:
 	forge test --ffi -vvv

+.PHONY: test-multiproof


Remove this if possible. We don't need it in both the makefile and justfile anyways

jackchuma · 2026-02-28T12:15:44Z

.gitignore

 test/kontrol/logs
 out
 lib
+multiproof-out


We shouldn't need this

jackchuma · 2026-02-28T12:16:15Z

test/vendor/Initializable.t.sol

        // Contract is not deployed as part of the standard deployment script.
        excludes[j++] = "src/revenue-share/BalanceTracker.sol";

+        // Exclude Multiproof contracts as they are not part of standard deployment script.


They should be added to the standard deployment script

jackchuma · 2026-02-28T12:16:51Z

test/libraries/SemverComp.t.sol


 // Libraries
-import { JSONParserLib } from "solady/src/utils/JSONParserLib.sol";
+import { JSONParserLib } from "@solady/utils/JSONParserLib.sol";


Was this change necessary? The import worked before

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

roger-bai-coinbase and others added 20 commits February 20, 2026 16:49

verify proof earlier during initialize

6119424

revert last commit

db1268c

refactor initialize

0633e55

Merge branch 'main' into feat/split-deploy-configs-and-scripts

d3a3bc3

refactor

50c088c

Merge branch 'simplify-storage-and-refactor' into feat/split-deploy-c…

f59abd6

…onfigs-and-scripts

Merge pull request #5 from base/simplify-storage-and-refactor

cf84877

Simplify storage and refactor

fix: register TEE proposer during deployment and add intermediateBloc…

ccac6c3

…kInterval to WithNitro script

Merge pull request #4 from base/feat/split-deploy-configs-and-scripts

d0c40f0

Split deploy configs and scripts for no-nitro and with-nitro environments

use l1head for proofs after initialization

6164a13

forge fmt

fd779bc

Fix comments from PR feedback

780715d

Co-authored-by: Leopold Joy <leo@leopoldjoy.com>

Merge pull request #6 from base/use-l1head-after-init

2daabba

use l1head for proofs after initialization

Merge branch 'main' into joby.thundil/CHAIN-3293-migrate-multiproof-c…

c2e9154

…ontracts-to-basecontracts

step 1 fix dependencies and op commit

935b7eb

Merge branch 'main' into joby.thundil/CHAIN-3293-migrate-multiproof-c…

b0726ae

…ontracts-to-basecontracts

make multiproof compatible with base contracts

920d6e4

fix imports in scripts

351a9ba

fix mocks

48c06f9

format and seperate out multiproof tests

e986e12

jjtny1 added 2 commits February 27, 2026 22:45

add tests to just and gen semver

c0ee7ac

fix tests

7d94460

jjtny1 requested review from jackchuma, leopoldjoy and roger-bai-coinbase February 28, 2026 04:41

jjtny1 commented Feb 28, 2026

View reviewed changes

rm unecessary op commit

d416a43

jackchuma reviewed Feb 28, 2026

View reviewed changes

Conversation

jjtny1 commented Feb 28, 2026

Uh oh!

linear bot commented Feb 28, 2026

Uh oh!

cb-heimdall commented Feb 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🟡 Heimdall Review Status

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!

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!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

cb-heimdall commented Feb 28, 2026 •

edited

Loading