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

Jump to bottom

Remove ethers -> alloy #726

Merged
merged 19 commits into from
Jun 25, 2024
Merged

Remove ethers -> alloy #726

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
111c9da
Remove TestContract::as_any
kpp Jun 12, 2024
b036851
Remove TestContract::default_
kpp Jun 12, 2024
5e787d7
Get rid of TestContract::base_contract. Use sol! to create calls to t…
kpp Jun 12, 2024
e0bb8a2
Fix HiveContract
kpp Jun 12, 2024
9260e96
Load test contract bytecode with include_str!
kpp Jun 12, 2024
1a58723
Get rid of test_data_path() & make_contract_from_abi()
kpp Jun 12, 2024
16ad630
Store test contract bytecode as Vec<u8>
kpp Jun 12, 2024
fcf8ef7
Test contract calls return Vec<u8>
kpp Jun 12, 2024
62e8595
Remove redundant cast to/from ethers::Bytes in tests
kpp Jun 12, 2024
c6f8c9b
Use alloy instead of ethers.
kpp Jun 13, 2024
9a22ddf
Update Cargo.toml
kpp Jun 14, 2024
6217fb4
Fix dead_code + dead comments
kpp Jun 14, 2024
ba3fea7
Merge branch 'nightly' into kpp/ethers_alloy
kpp Jun 24, 2024
c6ba8ce
Merge branch 'nightly' into kpp/ethers_alloy
kpp Jun 24, 2024
351c4df
Revert sys tx abi encode
kpp Jun 24, 2024
abbc90e
Fix some tests
kpp Jun 24, 2024
561fff2
fmt
kpp Jun 24, 2024
e68a5af
Revert BitcoinLightClient abi calls
kpp Jun 24, 2024
a8920a7
Merge branch 'nightly' into kpp/ethers_alloy
eyusufatik Jun 24, 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
1,190 changes: 247 additions & 943 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

17 changes: 4 additions & 13 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,6 @@ risc0-build = "0.21"
bonsai-sdk = "0.7.0"

# EVM dependencies
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-signers = { 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 +144,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 }
kpp marked this conversation as resolved.
Show resolved Hide resolved
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 +172,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
Open in desktop
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
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 bin/citrea/provers/risc0/guest-bitcoin/Cargo.toml
View file
Open in desktop
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 }
kpp marked this conversation as resolved.
Show resolved Hide resolved
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
Loading