Skip to content

Commit 312d31b

Browse files
chengwenxichengwenxi
committed
prover update for morph203
1 parent e896ae5 commit 312d31b

File tree

14 files changed

+84505
-20
lines changed

14 files changed

+84505
-20
lines changed

‎contracts/src/deploy-config/holesky.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const config = {
1414
l2BaseFee: 0.1, // Gwei
1515

1616
// verify contract config
17-
programVkey: '0x0067523b285111b45b465b927d56449351e78d802252ccbf4bcf5eae588b7356',
17+
programVkey: '0x006c835a4c049b699a3675fefa51b182c7efe404a656151c0410245966724bc3',
1818
// rollup contract config
1919
// initialize config
2020
finalizationPeriodSeconds: 600,

‎contracts/src/deploy-config/l1.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const config = {
1717
l2BaseFee: 0.1, // Gwei
1818

1919
// verify contract config
20-
programVkey: '0x0067523b285111b45b465b927d56449351e78d802252ccbf4bcf5eae588b7356',
20+
programVkey: '0x006c835a4c049b699a3675fefa51b182c7efe404a656151c0410245966724bc3',
2121
// rollup contract config
2222
// initialize config
2323
finalizationPeriodSeconds: 10,

‎contracts/src/deploy-config/qanetl1.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const config = {
1616
l2BaseFee: 0.1, // Gwei
1717

1818
// verify contract config
19-
programVkey: '0x0067523b285111b45b465b927d56449351e78d802252ccbf4bcf5eae588b7356',
19+
programVkey: '0x006c835a4c049b699a3675fefa51b182c7efe404a656151c0410245966724bc3',
2020
// rollup contract config
2121
// initialize config
2222
finalizationPeriodSeconds: 600,

‎contracts/src/deploy-config/sepolia.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const config = {
1818
/**
1919
* ---to---legacy property
2020
*/
21-
programVkey: '0x0067523b285111b45b465b927d56449351e78d802252ccbf4bcf5eae588b7356',
21+
programVkey: '0x006c835a4c049b699a3675fefa51b182c7efe404a656151c0410245966724bc3',
2222
rollupMinDeposit: 0.0001,
2323
rollupProofWindow: 86400,
2424
rollupGenesisBlockNumber: 0,

‎contracts/src/deploy-config/testnetl1.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const config = {
1313
sequencerWindowSize: 200,
1414
channelTimeout: 120,
1515

16-
programVkey: '0x0067523b285111b45b465b927d56449351e78d802252ccbf4bcf5eae588b7356',
16+
programVkey: '0x006c835a4c049b699a3675fefa51b182c7efe404a656151c0410245966724bc3',
1717
rollupMinDeposit: 1,
1818
rollupProofWindow: 100,
1919
rollupGenesisBlockNumber: 0,

‎prover/Cargo.lock‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎prover/Cargo.toml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ license = "MIT OR Apache-2.0"
2424
homepage = "https://github.com/morph-l2/morph/tree/main/prover"
2525
repository = "https://github.com/morph-l2/morph/tree/main/prover"
2626

27-
28-
29-
30-
31-
3227
[workspace.dependencies]
3328
alloy ={ version ="0.3"}
3429
hex = "0.4"

‎prover/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ To build the program to risc-v bin:
2626
```sh
2727
cd bin/client
2828
cargo prove build
29-
29+
```
3030

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

‎prover/bin/client/elf/riscv32im-succinct-zkvm-elf‎

101 KB
Binary file not shown.

‎prover/crates/core/src/hardfork.rs‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,21 @@ pub const MORPH_TESTNET_CHAIN_ID: u64 = 2810;
1313
/// Morph mainnet chain id
1414
pub const MORPH_MAINNET_CHAIN_ID: u64 = 2818;
1515

16-
/// Hardfork heights for Scroll networks, grouped by chain id.
16+
/// Hardfork heights for Morph networks, grouped by chain id.
1717
static HARDFORK_HEIGHTS: Lazy<HashMap<u64, HashMap<SpecId, u64>>> = Lazy::new(|| {
1818
let mut map = HashMap::new();
19-
map.insert(MORPH_DEVNET_CHAIN_ID, HashMap::from([(SpecId::BERNOULLI, 0), (SpecId::CURIE, 0)]));
20-
map.insert(MORPH_TESTNET_CHAIN_ID, HashMap::from([(SpecId::BERNOULLI, 0), (SpecId::CURIE, 0)]));
21-
map.insert(MORPH_MAINNET_CHAIN_ID, HashMap::from([(SpecId::BERNOULLI, 0), (SpecId::CURIE, 0)]));
19+
map.insert(
20+
MORPH_DEVNET_CHAIN_ID,
21+
HashMap::from([(SpecId::BERNOULLI, 0), (SpecId::CURIE, 0), (SpecId::MORPH203, 0)]),
22+
);
23+
map.insert(
24+
MORPH_TESTNET_CHAIN_ID,
25+
HashMap::from([(SpecId::BERNOULLI, 0), (SpecId::CURIE, 0), (SpecId::MORPH203, 0)]),
26+
);
27+
map.insert(
28+
MORPH_MAINNET_CHAIN_ID,
29+
HashMap::from([(SpecId::BERNOULLI, 0), (SpecId::CURIE, 0), (SpecId::MORPH203, 0)]),
30+
);
2231

2332
map
2433
});
@@ -28,6 +37,7 @@ static HARDFORK_HEIGHTS: Lazy<HashMap<u64, HashMap<SpecId, u64>>> = Lazy::new(||
2837
pub struct HardforkConfig {
2938
bernoulli_block: u64,
3039
curie_block: u64,
40+
morph203_block: u64,
3141
}
3242

3343
impl HardforkConfig {
@@ -37,6 +47,7 @@ impl HardforkConfig {
3747
Self {
3848
bernoulli_block: heights.get(&SpecId::BERNOULLI).copied().unwrap_or(0),
3949
curie_block: heights.get(&SpecId::CURIE).copied().unwrap_or(0),
50+
morph203_block: heights.get(&SpecId::MORPH203).copied().unwrap_or(0),
4051
}
4152
} else {
4253
dev_warn!(
@@ -59,12 +70,19 @@ impl HardforkConfig {
5970
self
6071
}
6172

73+
/// Set the Morph203 block number.
74+
pub fn set_morph203_block(&mut self, morph203_block: u64) -> &mut Self {
75+
self.morph203_block = morph203_block;
76+
self
77+
}
78+
6279
/// Get the hardfork spec id for a block number.
6380
pub fn get_spec_id(&self, block_number: u64) -> SpecId {
6481
match block_number {
6582
n if n < self.bernoulli_block => SpecId::PRE_BERNOULLI,
6683
n if n < self.curie_block => SpecId::BERNOULLI,
67-
_ => SpecId::CURIE,
84+
n if n < self.morph203_block => SpecId::CURIE,
85+
_ => SpecId::MORPH203,
6886
}
6987
}
7088

0 commit comments

Comments
 (0)