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.

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

refactor: use alloy instead of ethers and primitive_types #22

Closed
wants to merge 18 commits into from
Closed
2,762 changes: 2,031 additions & 731 deletions Cargo.lock

Large diffs are not rendered by default.

11 changes: 10 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,16 @@ resolver = "2"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[workspace.dependencies]
ethers = "2.0.7"
alloy = { git = "https://github.com/alloy-rs/alloy", features = [
"rpc-types-eth",
"rpc-types-trace",
"providers",
"transports",
"transport-http",
"rpc-client",
"consensus",
"rlp",
] }
tokio = { version = "1", features = ["full"] }
anyhow = "1.0.71"
plonky2 = "0.2.2"
Expand Down
36 changes: 17 additions & 19 deletions leader/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,32 @@ version = "0.1.0"
license = "MIT or Apache-2.0"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
tokio = { workspace = true }
plonky2 = { workspace = true }
evm_arithmetization = { workspace = true }
clap = { workspace = true }
trace_decoder = { workspace = true }
proof_gen = { workspace = true }
__ethers_for_compat = { version = "2.0.14", package = "ethers" }
__primitive_types_for_compat = { package = "primitive-types", version = "0.12.2" }
alloy.workspace = true
anyhow = { workspace = true }
serde = { workspace = true }
serde_path_to_error = "0.1.14"
paladin-core = { workspace = true }
clap = { workspace = true }
dotenvy = { workspace = true }
tracing = { workspace = true }
tracing-subscriber = { workspace = true }
ethers = { workspace = true }
evm_arithmetization = { workspace = true }
futures = "0.3.30"
hex = "0.4.3"
itertools = "0.11.0"
mpt_trie = { git = "https://github.com/0xPolygonZero/zk_evm.git", branch = "develop" }
paladin-core = { workspace = true }
plonky2 = { workspace = true }
proof_gen = { workspace = true }
reqwest = { version = "0.12.2", default-features = false, features = [
"json",
"rustls-tls",
] }


itertools = "0.11.0"
mpt_trie = { git = "https://github.com/0xPolygonZero/zk_evm.git", branch = "develop" }
hex = "0.4.3"
serde = { workspace = true }
serde_json = "1.0.108"
serde_path_to_error = "0.1.14"
tokio = { workspace = true }
trace_decoder = { workspace = true }
tracing = { workspace = true }
tracing-subscriber = { workspace = true }

# Local dependencies
ops = { path = "../ops" }
Expand Down
4 changes: 2 additions & 2 deletions leader/src/cli.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use std::path::PathBuf;

use alloy::primitives::TxHash;
use clap::{Parser, Subcommand, ValueHint};
use common::prover_state::cli::CliProverStateConfig;
use ethers::types::TxHash;

#[derive(Parser)]
pub struct Cli {
Expand All @@ -16,7 +16,7 @@ pub enum Command {
Rpc {
/// The RPC URL.
#[arg(long, short = 'u', value_hint = ValueHint::Url, env = "RPC_URL")]
rpc_url: String,
rpc_url: reqwest::Url,
/// The transaction hash from which to generate the witness.
#[arg(long, short)]
transaction_hash: TxHash,
Expand Down
Loading