Skip to content

Commit ca100c7

Browse files
kien-risekien-rise
authored
refactor: clean up Cargo.toml files (#261)
1 parent b94690a commit ca100c7

File tree

5 files changed

+86
-99
lines changed

5 files changed

+86
-99
lines changed

‎Cargo.toml‎

Lines changed: 41 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
resolver = "2"
33
members = [
44
"bin/*",
5-
"crates/*",
6-
"example/preloader",
75
"canoe/bindings",
86
"canoe/provider",
9-
"canoe/steel/apps",
10-
"canoe/steel/methods",
11-
"canoe/steel/verifier",
12-
"canoe/sp1-cc/host",
137
"canoe/sp1-cc/client",
14-
"canoe/sp1-cc/vkey-bin",
8+
"canoe/sp1-cc/host",
159
"canoe/sp1-cc/verifier",
16-
"canoe/verifier",
10+
"canoe/sp1-cc/vkey-bin",
11+
"canoe/steel/apps",
12+
"canoe/steel/methods",
13+
"canoe/steel/verifier",
1714
"canoe/verifier-address-fetcher",
15+
"canoe/verifier",
16+
"crates/*",
17+
"example/preloader",
1818
]
1919

2020
[profile.dev-client]
@@ -55,91 +55,89 @@ hokulea-zkvm-verification = { path = "crates/zkvm-verification", version = "0.1.
5555
eigenda-cert = { path = "crates/eigenda-cert" }
5656

5757
# Alloy (Network)
58-
alloy-rlp = { version = "0.3.12", default-features = false }
59-
alloy-provider = { version = "1.0.38", default-features = false }
6058
alloy-consensus = { version = "1.0.38", default-features = false }
61-
alloy-rpc-types = { version = "1.0.38", default-features = false }
6259
alloy-genesis = { version = "1.0.38", default-features = false }
6360
alloy-primitives = { version = "1.3.1", default-features = false }
61+
alloy-provider = { version = "1.0.38", default-features = false }
62+
alloy-rlp = { version = "0.3.12", default-features = false }
63+
alloy-rpc-types = { version = "1.0.38", default-features = false }
6464
alloy-sol-types = { version = "1.3.1", default-features = false }
6565

6666
# Execution
6767
alloy-evm = { version = "0.22.6", default-features = false }
6868
alloy-op-evm = { version = "0.22.6", default-features = false }
69-
revm = { version = "30.2.0", default-features = false }
7069
op-revm = { version = "11.3.0", default-features = false }
70+
revm = { version = "30.2.0", default-features = false }
7171
revm-primitives = { version = "21.0.2", default-features = false }
7272

7373
# OP Alloy
7474
op-alloy-consensus = { version = "0.22.0", default-features = false }
7575

7676
# Reth
77-
reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.1", default-features = false }
7877
reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.1", default-features = false }
7978
reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.1", default-features = false }
79+
reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.1", default-features = false }
8080

8181
# General
82-
spin = "0.10.0"
83-
clap = "4.5.39"
84-
tokio = "1.45.1"
85-
cfg-if = "1.0.0"
86-
reqwest = "0.12.19"
8782
async-trait = "0.1.88"
83+
cfg-if = "1.0.0"
84+
clap = "4.5.39"
8885
num = "0.4"
86+
reqwest = "0.12.19"
87+
spin = "0.10.0"
88+
tokio = "1.45.1"
8989

9090
# General
91+
anyhow = { version = "1.0.98", default-features = false }
9192
sha2 = { version = "0.10.9", default-features = false }
9293
thiserror = { version = "2.0.12", default-features = false }
93-
anyhow = { version = "1.0.98", default-features = false }
9494

9595
rust-kzg-bn254-primitives = { version = "0.1.2", git = "https://github.com/Layr-Labs/rust-kzg-bn254.git", rev = "4d1d6a84910a3fc1e5e8927f694e4fc10ac5dd9d", default-features = false }
96-
rust-kzg-bn254-verifier = { version = "0.1.2", git = "https://github.com/Layr-Labs/rust-kzg-bn254.git", rev = "4d1d6a84910a3fc1e5e8927f694e4fc10ac5dd9d", default-features = false }
9796
rust-kzg-bn254-prover = { version = "0.1.1", git = "https://github.com/Layr-Labs/rust-kzg-bn254.git", rev = "4d1d6a84910a3fc1e5e8927f694e4fc10ac5dd9d", default-features = false }
97+
rust-kzg-bn254-verifier = { version = "0.1.2", git = "https://github.com/Layr-Labs/rust-kzg-bn254.git", rev = "4d1d6a84910a3fc1e5e8927f694e4fc10ac5dd9d", default-features = false }
9898

9999
ark-bn254 = { version = "0.5.0", default-features = false }
100100
ark-ff = { version = "0.5.0", default-features = false }
101101

102102
# Tracing
103-
tracing-subscriber = { version = "0.3.20", default-features = false }
104103
tracing = { version = "0.1.41", default-features = false }
105-
104+
tracing-subscriber = { version = "0.3.20", default-features = false }
106105

107106
# Serialization
108107
serde = { version = "1.0.219", default-features = false }
109108
serde_json = { version = "1.0.140", default-features = false }
110109

111-
112-
canoe-provider = { path = "./canoe/provider", default-features = false }
113-
canoe-bindings = { path = "./canoe/bindings", default-features = false }
114-
canoe-verifier = { path = "./canoe/verifier", default-features = false }
115-
canoe-verifier-address-fetcher = { path = "./canoe/verifier-address-fetcher", default-features = false }
110+
canoe-bindings = { path = "./canoe/bindings", default-features = false }
111+
canoe-provider = { path = "./canoe/provider", default-features = false }
112+
canoe-verifier = { path = "./canoe/verifier", default-features = false }
113+
canoe-verifier-address-fetcher = { path = "./canoe/verifier-address-fetcher", default-features = false }
116114

117115
# Steel
118-
canoe-steel-apps = { path = "./canoe/steel/apps", default-features = false }
119-
canoe-steel-methods = { path = "./canoe/steel/methods", default-features = false }
120-
canoe-steel-verifier = { path = "./canoe/steel/verifier", default-features = false }
116+
canoe-steel-apps = { path = "./canoe/steel/apps", default-features = false }
117+
canoe-steel-methods = { path = "./canoe/steel/methods", default-features = false }
118+
canoe-steel-verifier = { path = "./canoe/steel/verifier", default-features = false }
121119

122-
risc0-zkvm = { version = "3.0.3" }
123-
risc0-steel = { git = "https://github.com/boundless-xyz/steel.git", tag = "v2.4.0" }
124-
risc0-build-ethereum = { version = "3.0" }
125120
risc0-build = { version = "3.0", features = ["docker"] }
121+
risc0-build-ethereum = { version = "3.0" }
122+
risc0-steel = { git = "https://github.com/boundless-xyz/steel.git", tag = "v2.4.0" }
123+
risc0-zkvm = { version = "3.0.3" }
126124

127125
# Sp1-contract-call
128-
canoe-sp1-cc-host = { path = "./canoe/sp1-cc/host", default-features = false }
129-
canoe-sp1-cc-client = { path = "./canoe/sp1-cc/client", default-features = false }
130-
canoe-sp1-cc-verifier = { path = "./canoe/sp1-cc/verifier", default-features = false }
126+
canoe-sp1-cc-client = { path = "./canoe/sp1-cc/client", default-features = false }
127+
canoe-sp1-cc-host = { path = "./canoe/sp1-cc/host", default-features = false }
128+
canoe-sp1-cc-verifier = { path = "./canoe/sp1-cc/verifier", default-features = false }
131129

132-
sp1-sdk = "5.2.1"
130+
rsp-primitives = { git = "https://github.com/succinctlabs/rsp", tag = "reth-1.9.1b" }
133131
sp1-build = "5.2.1"
134-
sp1-zkvm = "5.2.1"
135-
sp1-lib = "5.2.1"
136-
sp1-core-executor = "5.2.1"
137-
sp1-prover = "5.2.1"
138132
sp1-cc-client-executor = { git = "https://github.com/succinctlabs/sp1-contract-call.git", tag = "reth-1.9.1b" }
139133
sp1-cc-host-executor = { git = "https://github.com/succinctlabs/sp1-contract-call.git", tag = "reth-1.9.1b" }
140-
rsp-primitives = { git = "https://github.com/succinctlabs/rsp", tag = "reth-1.9.1b" }
134+
sp1-core-executor = "5.2.1"
135+
sp1-lib = "5.2.1"
136+
sp1-prover = "5.2.1"
137+
sp1-sdk = "5.2.1"
138+
sp1-zkvm = "5.2.1"
141139

142140
# ZKVM deps
141+
bincode = "1.3.3"
143142
hex = "0.4"
144143
url = { version = "2.5.4" }
145-
bincode = "1.3.3"

‎canoe/sp1-cc/host/Cargo.toml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@ name = "canoe-sp1-cc-host"
44
edition = "2021"
55

66
[dependencies]
7-
sp1-cc-host-executor = { workspace = true }
8-
sp1-cc-client-executor = { workspace = true }
9-
rsp-primitives = { workspace = true }
7+
rsp-primitives.workspace = true
8+
sp1-cc-client-executor.workspace = true
9+
sp1-cc-host-executor.workspace = true
1010

1111
alloy-primitives.workspace = true
12-
alloy-sol-types = { workspace = true }
12+
alloy-sol-types.workspace = true
1313
bincode.workspace = true
1414

15-
anyhow = { workspace = true }
16-
async-trait = { workspace = true }
17-
canoe-provider.workspace = true
18-
canoe-bindings.workspace = true
1915
alloy-rpc-types.workspace = true
16+
anyhow.workspace = true
17+
async-trait.workspace = true
18+
canoe-bindings.workspace = true
19+
canoe-provider.workspace = true
2020

2121
# misc:
22-
url.workspace = true
2322
tracing.workspace = true
23+
url.workspace = true
2424

2525
# sp1
26-
sp1-sdk.workspace = true
2726
sp1-core-executor.workspace = true
28-
sp1-prover.workspace = true
27+
sp1-prover.workspace = true
28+
sp1-sdk.workspace = true

‎canoe/sp1-cc/host/src/lib.rs‎

Lines changed: 20 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ use anyhow::Result;
55
use async_trait::async_trait;
66
use canoe_bindings::{Journal, StatusCode};
77
use canoe_provider::{CanoeInput, CanoeProvider, CertVerifierCall};
8+
use rsp_primitives::genesis::genesis_from_json;
89
use sp1_cc_client_executor::ContractInput;
910
use sp1_cc_host_executor::{EvmSketch, Genesis};
1011
use sp1_sdk::{
1112
network::FulfillmentStrategy, Prover, ProverClient, SP1Proof, SP1ProofMode,
1213
SP1ProofWithPublicValues, SP1Stdin, SP1_CIRCUIT_VERSION,
1314
};
15+
use tracing::{debug, info, warn};
16+
use url::Url;
17+
1418
use std::{
1519
env,
1620
str::FromStr,
1721
time::{Duration, Instant},
1822
};
19-
use tracing::{debug, info, warn};
20-
use url::Url;
21-
22-
use rsp_primitives::genesis::genesis_from_json;
2323

2424
/// The ELF we want to execute inside the zkVM.
2525
pub const ELF: &[u8] = include_bytes!("../../elf/canoe-sp1-cc-client");
@@ -147,35 +147,24 @@ async fn get_sp1_cc_proof(
147147

148148
let rpc_url = Url::from_str(eth_rpc_url).unwrap();
149149

150-
let sketch = match Genesis::try_from(l1_chain_id) {
151-
Ok(genesis) => {
152-
EvmSketch::builder()
153-
.at_block(block_number)
154-
.with_genesis(genesis)
155-
.el_rpc_url(rpc_url)
156-
.build()
157-
.await?
158-
}
159-
// if genesis is not available in the sp1-cc library, the code uses custom genesis config
160-
Err(_) => {
161-
let chain_config = match l1_chain_id {
162-
17000 => genesis_from_json(HOLESKY_GENESIS).expect("genesis from json"),
163-
3151908 => genesis_from_json(KURTOSIS_DEVNET_GENESIS).expect("genesis from json"),
164-
_ => panic!("chain id {l1_chain_id} is not supported by canoe sp1 cc"),
165-
};
166-
167-
let genesis = Genesis::Custom(chain_config.config);
168-
169-
EvmSketch::builder()
170-
.at_block(block_number)
171-
.with_genesis(genesis)
172-
.el_rpc_url(rpc_url)
173-
.build()
174-
.await
175-
.expect("evm sketch builder")
176-
}
150+
let genesis = if let Ok(genesis) = Genesis::try_from(l1_chain_id) {
151+
genesis
152+
} else {
153+
let chain_config = match l1_chain_id {
154+
17000 => genesis_from_json(HOLESKY_GENESIS).expect("genesis from json"),
155+
3151908 => genesis_from_json(KURTOSIS_DEVNET_GENESIS).expect("genesis from json"),
156+
_ => panic!("chain id {l1_chain_id} is not supported by canoe sp1 cc"),
157+
};
158+
Genesis::Custom(chain_config.config)
177159
};
178160

161+
let sketch = EvmSketch::builder()
162+
.at_block(block_number)
163+
.with_genesis(genesis)
164+
.el_rpc_url(rpc_url)
165+
.build()
166+
.await?;
167+
179168
let derived_l1_header_hash = sketch.anchor.header().hash_slow();
180169
assert!(l1_head_block_hash == derived_l1_header_hash);
181170

‎canoe/sp1-cc/verifier/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pub const V_KEY: [u32; 8] = [
3838
172466936, 724562174, 1557159139, 1421788462, 501370159, 544998102, 524542311, 605749438,
3939
];
4040

41-
#[derive(Clone)]
41+
#[derive(Clone, Default)]
4242
pub struct CanoeSp1CCVerifier {}
4343

4444
impl CanoeVerifier for CanoeSp1CCVerifier {

‎example/preloader/Cargo.toml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,42 @@ edition = "2021"
55

66

77
[dependencies]
8-
hokulea-proof.workspace = true
8+
hokulea-client.workspace = true
9+
hokulea-compute-proof.workspace = true
910
hokulea-host-bin.workspace = true
11+
hokulea-proof.workspace = true
1012
hokulea-witgen.workspace = true
1113
hokulea-zkvm-verification.workspace = true
12-
hokulea-client.workspace = true
13-
hokulea-compute-proof.workspace = true
1414

1515
# General
1616
anyhow.workspace = true
17-
tokio = { workspace = true, features = ["full"] }
17+
cfg-if.workspace = true
1818
clap = { workspace = true, features = ["derive", "env"] }
19-
cfg-if = { workspace = true }
20-
tracing = { workspace = true }
2119
serde_json.workspace = true
20+
tokio = { workspace = true, features = ["full"] }
21+
tracing.workspace = true
2222

2323
kona-client.workspace = true
2424
kona-preimage.workspace = true
2525
kona-proof.workspace = true
2626

2727
# Execution
2828
alloy-evm.workspace = true
29-
op-revm.workspace = true
30-
op-alloy-consensus.workspace = true
3129
alloy-op-evm.workspace = true
30+
op-alloy-consensus.workspace = true
31+
op-revm.workspace = true
3232
revm.workspace = true
3333

34-
canoe-provider = { workspace = true }
35-
canoe-verifier = { workspace = true }
36-
canoe-verifier-address-fetcher = { workspace = true }
34+
canoe-provider.workspace = true
35+
canoe-sp1-cc-host = { workspace = true, optional = true }
3736
canoe-steel-apps = { workspace = true, optional = true }
3837
canoe-steel-verifier = { workspace = true, optional = true }
39-
canoe-sp1-cc-host = { workspace = true, optional = true }
38+
canoe-verifier-address-fetcher.workspace = true
39+
canoe-verifier.workspace = true
4040

4141
sp1-sdk = {workspace = true}
4242

4343
[features]
44-
steel = ["canoe-steel-apps", "canoe-steel-verifier"]
4544
sp1-cc = ["canoe-sp1-cc-host"]
45+
steel = ["canoe-steel-apps", "canoe-steel-verifier"]
4646

0 commit comments

Comments
 (0)