From 9b575f65c61d53ff6a994060e238f685935ebe49 Mon Sep 17 00:00:00 2001 From: lean-apple <78718413+lean-apple@users.noreply.github.com> Date: Thu, 12 Dec 2024 10:59:18 +0100 Subject: [PATCH] fix: fix merge conflicts --- Cargo.toml | 49 +------------------------------- crates/primitives/src/receipt.rs | 2 -- 2 files changed, 1 insertion(+), 50 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 655a2cba63bb..aec725de3d69 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,7 +40,6 @@ members = [ "crates/ethereum/node", "crates/ethereum/payload/", "crates/ethereum/primitives/", - "crates/ethereum/primitives/", "crates/etl/", "crates/evm/", "crates/evm/execution-errors", @@ -120,7 +119,6 @@ members = [ "crates/storage/provider/", "crates/storage/storage-api/", "crates/storage/zstd-compressors/", - "crates/storage/zstd-compressors/", "crates/tasks/", "crates/tokio-util/", "crates/tracing/", @@ -346,7 +344,6 @@ reth-ethereum-engine-primitives = { path = "crates/ethereum/engine-primitives" } reth-ethereum-forks = { path = "crates/ethereum-forks", default-features = false } reth-ethereum-payload-builder = { path = "crates/ethereum/payload" } reth-ethereum-primitives = { path = "crates/ethereum/primitives", default-features = false } -reth-ethereum-primitives = { path = "crates/ethereum/primitives", default-features = false } reth-etl = { path = "crates/etl" } reth-evm = { path = "crates/evm" } reth-evm-ethereum = { path = "crates/ethereum/evm" } @@ -427,15 +424,12 @@ reth-trie-db = { path = "crates/trie/db" } reth-trie-parallel = { path = "crates/trie/parallel" } reth-trie-sparse = { path = "crates/trie/sparse" } reth-zstd-compressors = { path = "crates/storage/zstd-compressors", default-features = false } -reth-zstd-compressors = { path = "crates/storage/zstd-compressors", default-features = false } # revm revm = { version = "18.0.0", features = ["std"], default-features = false } revm-inspectors = "0.13.0" -revm-inspectors = "0.13.0" revm-primitives = { version = "14.0.0", default-features = false } revm-interpreter = { version = "14.0.0", default-features = false } -revm-interpreter = { version = "14.0.0", default-features = false } # eth alloy-chains = { version = "0.1.32", default-features = false } @@ -445,23 +439,8 @@ alloy-primitives = { version = "0.8.15", default-features = false, features = [ ] } alloy-rlp = { version = "0.3.10", default-features = false } alloy-sol-types = "0.8.15" -alloy-dyn-abi = "0.8.15" -alloy-primitives = { version = "0.8.15", default-features = false, features = [ - "map-foldhash", -] } -alloy-rlp = { version = "0.3.10", default-features = false } -alloy-sol-types = "0.8.15" alloy-trie = { version = "0.7", default-features = false } -alloy-consensus = { version = "0.8.0", default-features = false } -alloy-contract = { version = "0.8.0", default-features = false } -alloy-eips = { version = "0.8.0", default-features = false } -alloy-genesis = { version = "0.8.0", default-features = false } -alloy-json-rpc = { version = "0.8.0", default-features = false } -alloy-network = { version = "0.8.0", default-features = false } -alloy-network-primitives = { version = "0.8.0", default-features = false } -alloy-node-bindings = { version = "0.8.0", default-features = false } -alloy-provider = { version = "0.8.0", features = [ alloy-consensus = { version = "0.8.0", default-features = false } alloy-contract = { version = "0.8.0", default-features = false } alloy-eips = { version = "0.8.0", default-features = false } @@ -475,9 +454,6 @@ alloy-provider = { version = "0.8.0", features = [ ], default-features = false } alloy-pubsub = { version = "0.8.0", default-features = false } alloy-rpc-client = { version = "0.8.0", default-features = false } -alloy-rpc-types = { version = "0.8.0", features = [ -alloy-pubsub = { version = "0.8.0", default-features = false } -alloy-rpc-client = { version = "0.8.0", default-features = false } alloy-rpc-types = { version = "0.8.0", features = [ "eth", ], default-features = false } @@ -494,27 +470,11 @@ alloy-serde = { version = "0.8.0", default-features = false } alloy-signer = { version = "0.8.0", default-features = false } alloy-signer-local = { version = "0.8.0", default-features = false } alloy-transport = { version = "0.8.0" } -alloy-transport-http = { version = "0.8.0", features = [ -alloy-rpc-types-admin = { version = "0.8.0", default-features = false } -alloy-rpc-types-anvil = { version = "0.8.0", default-features = false } -alloy-rpc-types-beacon = { version = "0.8.0", default-features = false } -alloy-rpc-types-debug = { version = "0.8.0", default-features = false } -alloy-rpc-types-engine = { version = "0.8.0", default-features = false } -alloy-rpc-types-eth = { version = "0.8.0", default-features = false } -alloy-rpc-types-mev = { version = "0.8.0", default-features = false } -alloy-rpc-types-trace = { version = "0.8.0", default-features = false } -alloy-rpc-types-txpool = { version = "0.8.0", default-features = false } -alloy-serde = { version = "0.8.0", default-features = false } -alloy-signer = { version = "0.8.0", default-features = false } -alloy-signer-local = { version = "0.8.0", default-features = false } -alloy-transport = { version = "0.8.0" } alloy-transport-http = { version = "0.8.0", features = [ "reqwest-rustls-tls", ], default-features = false } alloy-transport-ipc = { version = "0.8.0", default-features = false } alloy-transport-ws = { version = "0.8.0", default-features = false } -alloy-transport-ipc = { version = "0.8.0", default-features = false } -alloy-transport-ws = { version = "0.8.0", default-features = false } # op op-alloy-rpc-types = "0.8.0" @@ -522,11 +482,6 @@ op-alloy-rpc-types-engine = "0.8.0" op-alloy-rpc-jsonrpsee = "0.8.0" op-alloy-network = "0.8.0" op-alloy-consensus = "0.8.0" -op-alloy-rpc-types = "0.8.0" -op-alloy-rpc-types-engine = "0.8.0" -op-alloy-rpc-jsonrpsee = "0.8.0" -op-alloy-network = "0.8.0" -op-alloy-consensus = "0.8.0" # misc aquamarine = "0.6" @@ -544,7 +499,6 @@ clap = "4" const_format = { version = "0.2.32", features = ["rust_1_64"] } dashmap = "6.0" derive_more = { version = "1", default-features = false, features = ["full"] } -derive_more = { version = "1", default-features = false, features = ["full"] } dyn-clone = "1.0.17" eyre = "0.6" fdlimit = "0.3.0" @@ -579,7 +533,6 @@ thiserror = { version = "2.0.0", default-features = false } tracing = "0.1.0" tracing-appender = "0.2" url = { version = "2.3", default-features = false } -url = { version = "2.3", default-features = false } zstd = "0.13" byteorder = "1" @@ -695,4 +648,4 @@ tracy-client = "0.17.3" # op-alloy-consensus = { git = "https://github.com/alloy-rs/op-alloy", rev = "debfc29" } # op-alloy-network = { git = "https://github.com/alloy-rs/op-alloy", rev = "debfc29" } # op-alloy-rpc-types = { git = "https://github.com/alloy-rs/op-alloy", rev = "debfc29" } -# op-alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/op-alloy", rev = "debfc29" } +# op-alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/op-alloy", rev = "debfc29" } \ No newline at end of file diff --git a/crates/primitives/src/receipt.rs b/crates/primitives/src/receipt.rs index 037b31e023c4..b6e7949a3dc8 100644 --- a/crates/primitives/src/receipt.rs +++ b/crates/primitives/src/receipt.rs @@ -12,8 +12,6 @@ use derive_more::{DerefMut, From, IntoIterator}; use serde::{Deserialize, Serialize}; use crate::TxType; -#[cfg(feature = "reth-codec")] -use reth_zstd_compressors::{RECEIPT_COMPRESSOR, RECEIPT_DECOMPRESSOR}; /// Retrieves gas spent by transactions as a vector of tuples (transaction index, gas used). pub use reth_primitives_traits::receipt::gas_spent_by_transactions;