diff --git a/Cargo.lock b/Cargo.lock index 369b26bf..c00638e4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -39,7 +39,7 @@ dependencies = [ "op-succinct-client-utils", "serde_cbor", "sha2", - "sp1-lib 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp1-lib", "sp1-zkvm", ] @@ -2147,7 +2147,7 @@ dependencies = [ "hex-literal", "rfc6979", "signature", - "sp1-lib 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp1-lib", "spki", ] @@ -6252,19 +6252,11 @@ dependencies = [ "serde", ] -[[package]] -name = "sp1-lib" -version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=16431e6b979a617fa08994ccdaf866b22ba4b7a1#16431e6b979a617fa08994ccdaf866b22ba4b7a1" -dependencies = [ - "bincode", - "serde", -] - [[package]] name = "sp1-primitives" version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=16431e6b979a617fa08994ccdaf866b22ba4b7a1#16431e6b979a617fa08994ccdaf866b22ba4b7a1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d10c2078a5dfc5c3a632da1bc59b57a19dadc9c03968047d8ffb06c0f83b476" dependencies = [ "bincode", "hex", @@ -6543,7 +6535,8 @@ dependencies = [ [[package]] name = "sp1-zkvm" version = "3.4.0" -source = "git+https://github.com/succinctlabs/sp1.git?rev=16431e6b979a617fa08994ccdaf866b22ba4b7a1#16431e6b979a617fa08994ccdaf866b22ba4b7a1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea02449a9dcaab67219f7b3442ab51b45ae40e7b04f205382295936087fe1d5" dependencies = [ "cfg-if", "getrandom", @@ -6553,8 +6546,8 @@ dependencies = [ "p3-field", "rand", "sha2", - "sp1-lib 3.4.0 (git+https://github.com/succinctlabs/sp1.git?rev=16431e6b979a617fa08994ccdaf866b22ba4b7a1)", - "sp1-primitives 3.4.0 (git+https://github.com/succinctlabs/sp1.git?rev=16431e6b979a617fa08994ccdaf866b22ba4b7a1)", + "sp1-lib", + "sp1-primitives 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -6567,7 +6560,7 @@ dependencies = [ "group 0.13.0", "pairing 0.23.0", "rand_core", - "sp1-lib 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp1-lib", "subtle", ] @@ -6652,7 +6645,7 @@ dependencies = [ "num-bigint 0.4.6", "rand", "rustc-hex", - "sp1-lib 3.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sp1-lib", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 5f6feb53..a1bf8145 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -94,8 +94,7 @@ sp1-lib = { version = "3.4.0", features = ["verify"] } sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", rev = "f0b61cf262388c1be7edfcf984c8e070064e980f", features = [ "network-v2", ] } -# From branch ratan/alloc. Adds support for a custom allocator. -sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", rev = "16431e6b979a617fa08994ccdaf866b22ba4b7a1", features = ["verify"] } +sp1-zkvm = { version = "3.4.0", features = ["verify"] } sp1-build = { version = "3.4.0" } [profile.release-client-lto] diff --git a/configs/2035/rollup.json b/configs/2035/rollup.json new file mode 100644 index 00000000..850c810e --- /dev/null +++ b/configs/2035/rollup.json @@ -0,0 +1,49 @@ +{ + "genesis": { + "l1": { + "number": 21418000, + "hash": "0x17384505bc6561b73e3160c66ff565badca4eaf958699533dcd77939361de78f" + }, + "l2": { + "number": 0, + "hash": "0xe74e84027b25c4d3980210159066b8c314f0a7ab4d309029732bbecd06a45b7c" + }, + "l2_time": 1734387239, + "system_config": { + "batcherAddr": "0x9fb23129982c993743eb9bb156af8cc8fa2ac761", + "overhead": "0xbc", + "scalar": "0xa6fe0", + "gasLimit": 30000000, + "baseFeeScalar": null, + "blobBaseFeeScalar": null, + "eip1559Denominator": null, + "eip1559Elasticity": null + } + }, + "block_time": 10, + "max_sequencer_drift": 600, + "seq_window_size": 3600, + "channel_timeout": 300, + "granite_channel_timeout": 50, + "l1_chain_id": 1, + "l2_chain_id": 2035, + "base_fee_params": { + "max_change_denominator": "0x32", + "elasticity_multiplier": "0x6" + }, + "canyon_base_fee_params": { + "max_change_denominator": "0xfa", + "elasticity_multiplier": "0x6" + }, + "regolith_time": 0, + "canyon_time": 0, + "delta_time": 0, + "ecotone_time": 0, + "fjord_time": 0, + "granite_time": 1736272801, + "holocene_time": 1736445601, + "batch_inbox_address": "0x5a2a0698355d06cd5c4e3872d2bc6b9f6a89d39b", + "deposit_contract_address": "0x96b124841eff4ab1b3c1f654d60402a1405ff51a", + "l1_system_config_address": "0xebf5859b7646ca9cf8a981613569bf28394f2571", + "protocol_versions_address": "0x0000000000000000000000000000000000000000" +} \ No newline at end of file diff --git a/elf/aggregation-elf b/elf/aggregation-elf index 9cedf7d8..696f9685 100755 Binary files a/elf/aggregation-elf and b/elf/aggregation-elf differ diff --git a/elf/range-elf b/elf/range-elf index 77a58690..79deee35 100755 Binary files a/elf/range-elf and b/elf/range-elf differ diff --git a/programs/range/src/main.rs b/programs/range/src/main.rs index b66b41a7..c5e79065 100644 --- a/programs/range/src/main.rs +++ b/programs/range/src/main.rs @@ -270,6 +270,7 @@ where println!("cycle-tracker-report-start: block-execution"); let mut block_executor = executor.new_executor(cursor.l2_safe_head_header().clone()); + println!("cycle-tracker-report-end: block-execution"); println!("cycle-tracker-report-start: block-execution"); let res = block_executor.execute_payload(attributes.clone()); @@ -280,7 +281,6 @@ where error!(target: "client", "Failed to execute L2 block: {}", e); if cfg.is_holocene_active(attributes.payload_attributes.timestamp) { - println!("cycle-tracker-report-start: block-execution"); // Retry with a deposit-only block. warn!(target: "client", "Flushing current channel and retrying deposit only block"); @@ -298,6 +298,7 @@ where }); // Retry the execution. + println!("cycle-tracker-report-start: block-execution"); block_executor = executor.new_executor(cursor.l2_safe_head_header().clone()); let res = block_executor.execute_payload(attributes.clone()); println!("cycle-tracker-report-end: block-execution");