Skip to content

Prover update for morph203 #736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chengwenxi merged 1 commit into from
Mar 26, 2025
Merged

Prover update for morph203 #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contracts/src/deploy-config/holesky.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const config = {
l2BaseFee: 0.1, // Gwei

// verify contract config
programVkey: '0x0067523b285111b45b465b927d56449351e78d802252ccbf4bcf5eae588b7356',
programVkey: '0x006c835a4c049b699a3675fefa51b182c7efe404a656151c0410245966724bc3',
// rollup contract config
// initialize config
finalizationPeriodSeconds: 600,
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/deploy-config/l1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const config = {
l2BaseFee: 0.1, // Gwei

// verify contract config
programVkey: '0x0067523b285111b45b465b927d56449351e78d802252ccbf4bcf5eae588b7356',
programVkey: '0x006c835a4c049b699a3675fefa51b182c7efe404a656151c0410245966724bc3',
// rollup contract config
// initialize config
finalizationPeriodSeconds: 10,
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/deploy-config/qanetl1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const config = {
l2BaseFee: 0.1, // Gwei

// verify contract config
programVkey: '0x0067523b285111b45b465b927d56449351e78d802252ccbf4bcf5eae588b7356',
programVkey: '0x006c835a4c049b699a3675fefa51b182c7efe404a656151c0410245966724bc3',
// rollup contract config
// initialize config
finalizationPeriodSeconds: 600,
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/deploy-config/sepolia.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const config = {
/**
* ---to---legacy property
*/
programVkey: '0x0067523b285111b45b465b927d56449351e78d802252ccbf4bcf5eae588b7356',
programVkey: '0x006c835a4c049b699a3675fefa51b182c7efe404a656151c0410245966724bc3',
rollupMinDeposit: 0.0001,
rollupProofWindow: 86400,
rollupGenesisBlockNumber: 0,
Expand Down
2 changes: 1 addition & 1 deletion contracts/src/deploy-config/testnetl1.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const config = {
sequencerWindowSize: 200,
channelTimeout: 120,

programVkey: '0x0067523b285111b45b465b927d56449351e78d802252ccbf4bcf5eae588b7356',
programVkey: '0x006c835a4c049b699a3675fefa51b182c7efe404a656151c0410245966724bc3',
rollupMinDeposit: 1,
rollupProofWindow: 100,
rollupGenesisBlockNumber: 0,
Expand Down
8 changes: 4 additions & 4 deletions prover/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions prover/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@ license = "MIT OR Apache-2.0"
homepage = "https://github.com/morph-l2/morph/tree/main/prover"
repository = "https://github.com/morph-l2/morph/tree/main/prover"






[workspace.dependencies]
alloy ={ version ="0.3"}
hex = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion prover/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ To build the program to risc-v bin:
```sh
cd bin/client
cargo prove build

```

This will output the compiled ELF to the file program/elf/riscv32im-succinct-zkvm-elf.

Expand Down
Binary file modified prover/bin/client/elf/riscv32im-succinct-zkvm-elf
View file
Open in desktop
Binary file not shown.
28 changes: 23 additions & 5 deletions prover/crates/core/src/hardfork.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,21 @@ pub const MORPH_TESTNET_CHAIN_ID: u64 = 2810;
/// Morph mainnet chain id
pub const MORPH_MAINNET_CHAIN_ID: u64 = 2818;

/// Hardfork heights for Scroll networks, grouped by chain id.
/// Hardfork heights for Morph networks, grouped by chain id.
static HARDFORK_HEIGHTS: Lazy<HashMap<u64, HashMap<SpecId, u64>>> = Lazy::new(|| {
let mut map = HashMap::new();
map.insert(MORPH_DEVNET_CHAIN_ID, HashMap::from([(SpecId::BERNOULLI, 0), (SpecId::CURIE, 0)]));
map.insert(MORPH_TESTNET_CHAIN_ID, HashMap::from([(SpecId::BERNOULLI, 0), (SpecId::CURIE, 0)]));
map.insert(MORPH_MAINNET_CHAIN_ID, HashMap::from([(SpecId::BERNOULLI, 0), (SpecId::CURIE, 0)]));
map.insert(
MORPH_DEVNET_CHAIN_ID,
HashMap::from([(SpecId::BERNOULLI, 0), (SpecId::CURIE, 0), (SpecId::MORPH203, 0)]),
);
map.insert(
MORPH_TESTNET_CHAIN_ID,
HashMap::from([(SpecId::BERNOULLI, 0), (SpecId::CURIE, 0), (SpecId::MORPH203, 0)]),
);
map.insert(
MORPH_MAINNET_CHAIN_ID,
HashMap::from([(SpecId::BERNOULLI, 0), (SpecId::CURIE, 0), (SpecId::MORPH203, 0)]),
);

map
});
Expand All @@ -28,6 +37,7 @@ static HARDFORK_HEIGHTS: Lazy<HashMap<u64, HashMap<SpecId, u64>>> = Lazy::new(||
pub struct HardforkConfig {
bernoulli_block: u64,
curie_block: u64,
morph203_block: u64,
}

impl HardforkConfig {
Expand All @@ -37,6 +47,7 @@ impl HardforkConfig {
Self {
bernoulli_block: heights.get(&SpecId::BERNOULLI).copied().unwrap_or(0),
curie_block: heights.get(&SpecId::CURIE).copied().unwrap_or(0),
morph203_block: heights.get(&SpecId::MORPH203).copied().unwrap_or(0),
}
} else {
dev_warn!(
Expand All @@ -59,12 +70,19 @@ impl HardforkConfig {
self
}

/// Set the Morph203 block number.
pub fn set_morph203_block(&mut self, morph203_block: u64) -> &mut Self {
self.morph203_block = morph203_block;
self
}

/// Get the hardfork spec id for a block number.
pub fn get_spec_id(&self, block_number: u64) -> SpecId {
match block_number {
n if n < self.bernoulli_block => SpecId::PRE_BERNOULLI,
n if n < self.curie_block => SpecId::BERNOULLI,
_ => SpecId::CURIE,
n if n < self.morph203_block => SpecId::CURIE,
_ => SpecId::MORPH203,
}
}

Expand Down
Loading