Skip to content

Commit

Permalink
Update Cargo.toml
Browse files Browse the repository at this point in the history
  • Loading branch information
@kpp
kpp committed Jun 14, 2024
1 parent c6f8c9b commit 9a22ddf
Show file tree
Hide file tree
Showing 12 changed files with 578 additions and 1,010 deletions.
1,190 changes: 247 additions & 943 deletions Cargo.lock
View file

Large diffs are not rendered by default.

18 changes: 8 additions & 10 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,13 @@ risc0-build = "0.21"
bonsai-sdk = "0.7.0"

# EVM dependencies
ethereum-types = "0.14.1"
# ethereum-types = "0.14.1"
ethers = "2.0"
ethers-core = { version = "2.0", default-features = false }
ethers-contract = "2.0"
ethers-providers = { version = "2.0", default-features = false }
# ethers-contract = "2.0"
# ethers-providers = { version = "2.0", default-features = false }
ethers-signers = { version = "2.0", default-features = false }
ethers-middleware = { version = "2.0", default-features = false }
# ethers-middleware = { version = "2.0", default-features = false }

revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "7168ac5", default-features = false }
reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.7", default-features = false }
Expand All @@ -151,11 +151,11 @@ reth-stages = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.
revm = { version = "8", features = ["serde"], default-features = false }
# forcing cargo for this version or else chooses 3.1.1 and there is some dependency conflicts
revm-primitives = { version = "3.1", default-features = false }
# forcing cargo for this version or else chooses 0.3.1 and there is some dependency conflicts
alloy-trie = { version = "=0.3.0", default-features = false }
alloy-trie = { version = "0.3", default-features = false }
alloy-rlp = { version = "0.3", default-features = false }
alloy-primitives = { version = "0.7.4", default-features = false }
alloy-sol-types = { version = "0.7.4", default-features = false }
alloy-primitives = { version = "0.7.6", default-features = false }
alloy-sol-types = { version = "0.7.6", default-features = false, features = ["json"] }
alloy = { git = "https://github.com/alloy-rs/alloy", rev = "77c1240", default-features = false }

ed25519-dalek = { version = "2", default-features = false, features = ["serde"] }
secp256k1 = { version = "0.28.2", default-features = false, features = ["global-context", "recovery"] }
Expand All @@ -179,5 +179,3 @@ sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.8
# crypto-bigint = { git = "https://github.com/risc0/RustCrypto-crypto-bigint", tag = "v0.5.2-risc0" }
secp256k1_v028 = { package = "secp256k1", version = "0.28", git = "https://github.com/Sovereign-Labs/rust-secp256k1.git", branch = "risc0-compatible-0-28-2" }
k256 = { package = "k256", version = "0.13.3", git = "https://github.com/risc0/RustCrypto-elliptic-curves", tag = "k256/v0.13.3-risczero.0" }
# tmp fix until alloy/core release a new version
alloy-primitives = { git = "https://github.com/alloy-rs/core.git", rev = "7f17fe3" }
11 changes: 4 additions & 7 deletions bin/citrea/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ sov-state = { path = "../../crates/sovereign-sdk/module-system/sov-state", featu
sov-stf-runner = { path = "../../crates/sovereign-sdk/full-node/sov-stf-runner", features = ["native"] }

# 3rd-party deps
alloy-primitives = { workspace = true }
alloy-sol-types = { workspace = true }
anyhow = { workspace = true }
async-trait = { workspace = true }
borsh = { workspace = true, features = ["bytes"] }
Expand All @@ -62,6 +64,8 @@ sov-mock-da = { path = "../../crates/sovereign-sdk/adapters/mock-da", default-fe
sov-prover-storage-manager = { path = "../../crates/sovereign-sdk/full-node/sov-prover-storage-manager", features = ["test-utils"] }
sov-rollup-interface = { path = "../../crates/sovereign-sdk/rollup-interface", features = ["fuzzing"] }

alloy = { workspace = true, features = ["hyper", "rpc-types-eth", "provider-http", "signer-wallet", "signers"] }
alloy-rlp = { workspace = true }
bincode = { workspace = true }
borsh = { workspace = true }
hex = { workspace = true }
Expand All @@ -74,13 +78,6 @@ sha2 = { workspace = true }
tempfile = { workspace = true }
tokio = { workspace = true }

ethereum-types = { workspace = true }
ethers = { workspace = true }
ethers-contract = { workspace = true }
ethers-core = { workspace = true }
ethers-middleware = { workspace = true }
ethers-providers = { workspace = true }
ethers-signers = { workspace = true }
revm = { workspace = true }

log = "0.4"
Expand Down
155 changes: 147 additions & 8 deletions bin/citrea/provers/risc0/guest-bitcoin/Cargo.lock
View file

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

3 changes: 1 addition & 2 deletions bin/citrea/provers/risc0/guest-bitcoin/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ resolver = "2"

[dependencies]
# forcing cargo for this version
alloy-primitives = { version = "0.7.6", default-features = false }
alloy-trie = { version = "=0.3.1", default-features = false }
# forcing cargo for this version
reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v0.2.0-beta.7", default-features = false }
Expand All @@ -30,8 +31,6 @@ ed25519-dalek = { git = "https://github.com/risc0/curve25519-dalek", tag = "curv
crypto-bigint = { git = "https://github.com/risc0/RustCrypto-crypto-bigint", tag = "v0.5.2-risc0" }
secp256k1_v028 = { package = "secp256k1", version = "0.28", git = "https://github.com/Sovereign-Labs/rust-secp256k1.git", branch = "risc0-compatible-0-28-2" }
k256 = { package = "k256", version = "0.13.3", git = "https://github.com/risc0/RustCrypto-elliptic-curves", tag = "k256/v0.13.3-risczero.0" }
# tmp fix
alloy-primitives = { git = "https://github.com/alloy-rs/core.git", rev = "7f17fe3" }

[profile.dev]
opt-level = 3
Expand Down
Loading

0 comments on commit 9a22ddf

Please sign in to comment.