Feat: Upgrade Prover to SP1 v5, Integrate Morph-Reth as STF, and Replace zkTrie with MPT by anylots · Pull Request #886 · morph-l2/morph

anylots · 2026-02-26T03:41:06Z

This PR introduces the following key updates to enhance system performance and scalability:

Upgrade Prover to SP1 v5: Leverages the latest version of the SP1 Prover to improve proof generation performance and compatibility.
Integrate Morph-Reth as the STF: Replaces the previous state transition function implementation with Morph-Reth for increased efficiency and maintainability.
Replace zkTrie with MPT: Swaps the existing zkTrie structure with a Merkle Patricia Trie (MPT) to improve data storage flexibility and enhance Ethereum compatibility.

coderabbitai · 2026-02-26T03:41:15Z

Important

Review skipped

Too many files!

This PR contains 181 files, which is 31 over the limit of 150.

📥 Commits

Reviewing files that changed from the base of the PR and between 3a6022f and 8e7c620.

⛔ Files ignored due to path filters (4)

prover/Cargo.lock is excluded by !**/*.lock
prover/bin/shadow-prove/Cargo.lock is excluded by !**/*.lock
prover/crates/primitives/src/data/v1_l1_oracle_bytecode.bin is excluded by !**/*.bin
prover/crates/primitives/src/data/v2_l1_oracle_bytecode.bin is excluded by !**/*.bin

📒 Files selected for processing (181)

contracts/contracts/libraries/verifier/ISP1Verifier.sol
contracts/contracts/libraries/verifier/PlonkVerifier.sol
contracts/contracts/libraries/verifier/SP1VerifierPlonk.sol
contracts/contracts/test/ZkEvmVerifierV1.t.sol
contracts/contracts/test/testdata/plonk-fixture.json
contracts/src/deploy-config/holesky.ts
contracts/src/deploy-config/hoodi.ts
contracts/src/deploy-config/l1.ts
contracts/src/deploy-config/qanetl1.ts
contracts/src/deploy-config/sepolia.ts
contracts/src/deploy-config/testnetl1.ts
prover/Cargo.toml
prover/Dockerfile.sp1-compiler
prover/Dockerfile.sp1-plonk
prover/Makefile
prover/README.md
prover/bin/client/Cargo.toml
prover/bin/client/elf/riscv32im-succinct-zkvm-elf
prover/bin/client/elf/verifier-client
prover/bin/client/src/main.rs
prover/bin/host/Cargo.toml
prover/bin/host/src/evm.rs
prover/bin/host/src/execute.rs
prover/bin/host/src/lib.rs
prover/bin/host/src/main.rs
prover/bin/host/src/utils.rs
prover/bin/host/src/vkey.rs
prover/bin/server/Cargo.toml
prover/bin/server/src/execute.rs
prover/bin/server/src/lib.rs
prover/bin/server/src/main.rs
prover/bin/server/src/queue.rs
prover/bin/server/src/server.rs
prover/bin/shadow-prove/.gitignore
prover/bin/shadow-prove/Cargo.toml
prover/bin/shadow-prove/contracts/README.md
prover/bin/shadow-prove/contracts/src/libs/ISP1Verifier.sol
prover/bin/shadow-prove/contracts/src/libs/PlonkVerifier.sol
prover/bin/shadow-prove/contracts/src/libs/SP1VerifierPlonk.sol
prover/bin/shadow-prove/rust-toolchain
prover/bin/shadow-prove/rustfmt.toml
prover/bin/shadow-prove/src/abi.rs
prover/bin/shadow-prove/src/batch.json
prover/bin/shadow-prove/src/execute.rs
prover/bin/shadow-prove/src/lib.rs
prover/bin/shadow-prove/src/main.rs
prover/bin/shadow-prove/src/shadow_prove.rs
prover/bin/shadow-prove/src/shadow_rollup.rs
prover/bin/shadow-prove/src/util.rs
prover/bin/shadow-prove/start.sh
prover/configs/4844_trusted_setup.txt
prover/contracts/README.md
prover/contracts/src/ISP1Verifier.sol
prover/contracts/src/PlonkVerifier.sol
prover/contracts/src/SP1VerifierPlonk.sol
prover/contracts/src/fixtures/plonk-fixture.json
prover/crates/core/Cargo.toml
prover/crates/core/src/batch.rs
prover/crates/core/src/database.rs
prover/crates/core/src/executor/builder.rs
prover/crates/core/src/executor/hooks.rs
prover/crates/core/src/executor/mod.rs
prover/crates/core/src/hardfork.rs
prover/crates/core/src/lib.rs
prover/crates/executor/client/Cargo.toml
prover/crates/executor/client/src/lib.rs
prover/crates/executor/client/src/types/batch.rs
prover/crates/executor/client/src/types/blob.rs
prover/crates/executor/client/src/types/error.rs
prover/crates/executor/client/src/types/input.rs
prover/crates/executor/client/src/types/mod.rs
prover/crates/executor/client/src/verifier/blob_verifier.rs
prover/crates/executor/client/src/verifier/evm_verifier.rs
prover/crates/executor/client/src/verifier/mod.rs
prover/crates/executor/core/Cargo.toml
prover/crates/executor/core/src/error.rs
prover/crates/executor/core/src/executor.rs
prover/crates/executor/core/src/lib.rs
prover/crates/executor/host/Cargo.toml
prover/crates/executor/host/src/blob.rs
prover/crates/executor/host/src/execute.rs
prover/crates/executor/host/src/lib.rs
prover/crates/executor/host/src/trace.rs
prover/crates/executor/host/src/utils.rs
prover/crates/executor/host/src/zstd_util.rs
prover/crates/morph-executor/client/Cargo.toml
prover/crates/morph-executor/client/src/lib.rs
prover/crates/morph-executor/client/src/types/input.rs
prover/crates/morph-executor/client/src/types/mod.rs
prover/crates/morph-executor/client/src/verifier/evm_verifier.rs
prover/crates/morph-executor/host/Cargo.toml
prover/crates/morph-executor/host/src/lib.rs
prover/crates/morph-executor/utils/Cargo.toml
prover/crates/morph-executor/utils/src/lib.rs
prover/crates/mpt/Cargo.toml
prover/crates/mpt/src/execution_witness.rs
prover/crates/mpt/src/lib.rs
prover/crates/mpt/src/mpt.rs
prover/crates/primitives/Cargo.toml
prover/crates/primitives/src/data/v1_l1_oracle_bytecode.txt
prover/crates/primitives/src/data/v2_l1_oracle_bytecode.txt
prover/crates/primitives/src/lib.rs
prover/crates/primitives/src/predeployed.rs
prover/crates/primitives/src/types/authorization_list.rs
prover/crates/primitives/src/types/blob.rs
prover/crates/primitives/src/types/block.rs
prover/crates/primitives/src/types/mod.rs
prover/crates/primitives/src/types/tx.rs
prover/crates/primitives/src/types/tx_alt_fee.rs
prover/crates/sbv/Cargo.toml
prover/crates/sbv/src/lib.rs
prover/crates/storage/rpc-db/Cargo.toml
prover/crates/storage/rpc-db/src/account_proof.rs
prover/crates/storage/rpc-db/src/basic_rpc_db.rs
prover/crates/storage/rpc-db/src/error.rs
prover/crates/storage/rpc-db/src/lib.rs
prover/crates/storage/witness-db/Cargo.toml
prover/crates/storage/witness-db/src/lib.rs
prover/crates/utils/Cargo.toml
prover/crates/utils/src/lib.rs
prover/crates/utils/src/macros.rs
prover/crates/utils/src/metrics/mod.rs
prover/crates/utils/src/metrics/registry.rs
prover/crates/utils/src/provider.rs
prover/crates/utils/src/utils/debug.rs
prover/crates/utils/src/utils/mod.rs
prover/docker-compose-app.yml
prover/rust-toolchain
prover/script/execute.sh
prover/script/prover_server.sh
prover/script/sp1up.sh
prover/script/stop.sh
prover/stop.sh
prover/testdata/altfeetx/block_traces_329475_329475.json
prover/testdata/altfeetx/block_traces_329791_329791.json
prover/testdata/altfeetx/block_traces_341111_341111.json
prover/testdata/altfeetx/trace_call.json
prover/testdata/altfeetx/trace_create.json
prover/testdata/altfeetx/trace_failed.json
prover/testdata/altfeetx/trace_slot.json
prover/testdata/altfeetx/trace_slot_another.json
prover/testdata/blob/mainnet_47561.data
prover/testdata/dev.json
prover/testdata/dev_block_traces.json
prover/testdata/dev_tx.json
prover/testdata/dev_tx_s.json
prover/testdata/devnet_batch_traces.json
prover/testdata/mainnet_batch_traces.json
prover/testdata/mainnet_batch_traces_l1.json
prover/testdata/mainnet_batch_traces_test.json
prover/testdata/morph203/morph203_0_traces.json
prover/testdata/morph203/morph203_1_traces.json
prover/testdata/morph203/morph203_2_traces.json
prover/testdata/morph203/morph203_3_traces.json
prover/testdata/mpt/executor_input_19720290.data
prover/testdata/mpt/hostexecutoroutput
prover/testdata/mpt/local_transfer_eth.json
prover/testdata/mpt/mainnet_1430.json
prover/testdata/mpt/mainnet_16283373.data
prover/testdata/mpt/mainnet_165256.data
prover/testdata/mpt/mainnet_18762206.json
prover/testdata/mpt/mainnet_19137902.json
prover/testdata/mpt/mainnet_19137909.json
prover/testdata/mpt/mainnet_19266117.json
prover/testdata/mpt/mainnet_19720219.json
prover/testdata/mpt/mainnet_19720290.data
prover/testdata/mpt/mainnet_209.json
prover/testdata/mpt/mainnet_25215.json
prover/testdata/mpt/mainnet_809.json
prover/testdata/mpt/mainnet_898.json
prover/testdata/qanet_traces.json
prover/testdata/viridian/eip7702_traces.json
prover/tests/algebra/host/Cargo.toml
prover/tests/algebra/host/src/main.rs
prover/tests/bls12381/host/Cargo.toml
prover/tests/bls12381/host/src/main.rs
prover/tests/keccak256/client/Cargo.toml
prover/tests/keccak256/host/Cargo.toml
prover/tests/keccak256/host/src/main.rs
prover/tests/zstd/host/Cargo.toml
prover/tests/zstd/host/src/main.rs

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests
Post copyable unit tests in a comment
Commit unit tests in branch prover-morph-reth

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

prover/crates/storage/witness-db/src/lib.rs

chengwenxi · 2026-02-26T08:19:29Z

prover/bin/host/src/lib.rs

+    #[cfg(feature = "network")]
+    let client = ProverClient::builder()
+        .network_for(NetworkMode::Mainnet)
+        .rpc_url("https://rpc.mainnet.succinct.xyz")


set it as a const?

Improved. There is indeed some overhead in constructing a ProverClient for each proof generation, so it has been moved into the BatchProver struct for reuse.

panos-xyz · 2026-02-26T11:50:45Z

Code review

Found 1 issue:

Mainnet fix for error handling lost in code_by_hash_ref (regression from PR Sync Prover mainnet fix #821)

The new code_by_hash_ref implementation uses .unwrap() which will panic if the code hash is not found:

fn code_by_hash_ref(&self, hash: B256) -> Result<Bytecode, Self::Error> {
    Ok(self.bytecode_by_hash.get(&hash).map(|code| (*code).clone()).unwrap())
}

Commit e75a2de8 ("Sync Prover mainnet fix #821") specifically changed this from a panic to graceful recovery because code lookup failures were occurring in production. The new implementation reverts this safety improvement and will crash the prover when bytecode is not pre-loaded.

morph/prover/crates/storage/witness-db/src/lib.rs

Lines 76 to 79 in e3fa8a0

    
               /// Get account code by its hash. 
        
               fn code_by_hash_ref(&self, hash: B256) -> Result<Bytecode, Self::Error> { 
        
                   Ok(self.bytecode_by_hash.get(&hash).map(|code| (*code).clone()).unwrap()) 
        
               }

Recommended fix: Replace .unwrap() with .unwrap_or_else(|| Bytecode::default()) or propagate the error properly through the Result type.

Additionally, basic_rpc_db.rs has unimplemented!() for the same method:

morph/prover/crates/storage/rpc-db/src/basic_rpc_db.rs

Lines 181 to 184 in e3fa8a0

    
               /// Get account code by its hash. 
        
               fn code_by_hash_ref(&self, _code_hash: B256) -> Result<Bytecode, Self::Error> { 
        
                   unimplemented!() 
        
               }

🤖 Generated with Claude Code

_{- If this code review was useful, please react with 👍. Otherwise, react with 👎.}

anylots · 2026-02-26T15:45:14Z

Code review

Found 1 issue:

Mainnet fix for error handling lost in code_by_hash_ref (regression from PR Sync Prover mainnet fix #821)

The new code_by_hash_ref implementation uses .unwrap() which will panic if the code hash is not found:
fn code_by_hash_ref(&self, hash: B256) -> Result<Bytecode, Self::Error> {
    Ok(self.bytecode_by_hash.get(&hash).map(|code| (*code).clone()).unwrap())
}
Commit e75a2de8 ("Sync Prover mainnet fix #821") specifically changed this from a panic to graceful recovery because code lookup failures were occurring in production. The new implementation reverts this safety improvement and will crash the prover when bytecode is not pre-loaded.

morph/prover/crates/storage/witness-db/src/lib.rs

Lines 76 to 79 in e3fa8a0

/// Get account code by its hash.

fn code_by_hash_ref(&self, hash: B256) -> Result<Bytecode, Self::Error> {

Ok(self.bytecode_by_hash.get(&hash).map(|code| (*code).clone()).unwrap())

}

Recommended fix: Replace .unwrap() with .unwrap_or_else(|| Bytecode::default()) or propagate the error properly through the Result type.

Additionally, basic_rpc_db.rs has unimplemented!() for the same method:

morph/prover/crates/storage/rpc-db/src/basic_rpc_db.rs

Lines 181 to 184 in e3fa8a0

/// Get account code by its hash.

fn code_by_hash_ref(&self, _code_hash: B256) -> Result<Bytecode, Self::Error> {

unimplemented!()

}

🤖 Generated with Claude Code

If this code review was useful, please react with 👍. Otherwise, react with 👎.

A TrieDBError has been added for the return value in witness-db.
Use basic_ref in basic_rpc_db to fetch the account info, which includes the code, Code comments have been added.

anylots added 30 commits December 30, 2025 14:11

use morph-revm

5dc93af

add morph reth

6d42eb3

use rpc db for native exec

83c6093

MorphTxEnvelope

5e8d64b

evm execute

f33134d

add test traces

32208cc

update traces

dbaf440

host executor

7fd6d96

tx decode

af2a9aa

evm exec

de39681

execute blocks

440caee

shadow execute

2fbfc5a

impl blob encode

2dfcde3

Code shrinking

69efd71

exec altFeetx

75d83dc

add test traces

c0a18f8

add test traces

131e647

setCode tx for empty eoa

7b82bac

convert empty account of rpc_db

5b3b60f

add test traces

cbc3123

disable_eip7623

39bad78

riscv exec

5aba4dc

update evm

508799d

add test trace

944d032

update evm exec

a99d20a

cacl l1msg num

06afbd7

Use block_gas_limit as tx_gas_limit

af82f73

access to prove network

93fe661

Different networks use different hardforks

6de16cb

add test traces

7e4dfbf

anylots added 10 commits February 3, 2026 14:02

update programKey

fe46b29

shadow exec

93ab613

update verifier&programKey

5b6cb31

reproducible compilation

1dae3df

add local prover-server

38432ec

dev

07c290c

update verifier

4aaf30b

shadow-proving

fe01aa9

organize logs

e944779

Merge remote-tracking branch 'origin/main' into prover-morph-reth

89190df

anylots requested a review from a team as a code owner February 26, 2026 03:41

anylots linked an issue Feb 26, 2026 that may be closed by this pull request

ZK proof for mpt block #876

Closed

anylots requested review from panos-xyz and removed request for a team February 26, 2026 03:41

github-advanced-security bot found potential problems Feb 26, 2026

View reviewed changes

prover/crates/storage/witness-db/src/lib.rs Dismissed Show dismissed Hide dismissed

anylots requested a review from chengwenxi February 26, 2026 04:01

anylots added 4 commits February 26, 2026 12:01

fix cargo fmt

e1e5a76

fix zkEvmVerifierTest

4e97aa8

bump Verifier sol compiler to 0.8.24

464eadb

delete sequencer test script

e3fa8a0

chengwenxi reviewed Feb 26, 2026

View reviewed changes

anylots added 3 commits February 26, 2026 23:04

fix pr

b232130

fix cargo fmt

8251273

compile feature

8e7c620

panos-xyz approved these changes Feb 27, 2026

View reviewed changes

anylots merged commit 8c00f42 into main Feb 27, 2026
11 checks passed

anylots deleted the prover-morph-reth branch February 27, 2026 02:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat: Upgrade Prover to SP1 v5, Integrate Morph-Reth as STF, and Replace zkTrie with MPT#886

Feat: Upgrade Prover to SP1 v5, Integrate Morph-Reth as STF, and Replace zkTrie with MPT#886
anylots merged 63 commits intomainfrom
prover-morph-reth

anylots commented Feb 26, 2026 •

edited

Loading

Uh oh!

coderabbitai bot commented Feb 26, 2026 •

edited

Loading

Review skipped

Uh oh!

Uh oh!

chengwenxi Feb 26, 2026

Uh oh!

anylots Feb 26, 2026

Uh oh!

panos-xyz commented Feb 26, 2026

Uh oh!

anylots commented Feb 26, 2026

Code review

Code review

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

anylots commented Feb 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coderabbitai bot commented Feb 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

Uh oh!

chengwenxi Feb 26, 2026

Choose a reason for hiding this comment

Uh oh!

anylots Feb 26, 2026

Choose a reason for hiding this comment

Uh oh!

panos-xyz commented Feb 26, 2026

Code review

Uh oh!

anylots commented Feb 26, 2026

Code review

Code review

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

anylots commented Feb 26, 2026 •

edited

Loading

coderabbitai bot commented Feb 26, 2026 •

edited

Loading