Skip to content
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

fix: sp1 lib import #297

Merged
merged 2 commits into from
Dec 19, 2024
Merged

fix: sp1 lib import #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe6af75
fix: sp1 lib import
ratankaliani Dec 19, 2024
5e6a4c9
fix
ratankaliani Dec 19, 2024
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
27 changes: 10 additions & 17 deletions Cargo.lock
View file
Open in desktop

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

3 changes: 1 addition & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
49 changes: 49 additions & 0 deletions configs/2035/rollup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
Binary file modified elf/aggregation-elf
View file
Open in desktop
Binary file not shown.
Binary file modified elf/range-elf
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion programs/range/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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");

Expand All @@ -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");
Expand Down
Loading