From 816db3a43e757d96aa2d7d26d00c3644331c957c Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Tue, 7 Jan 2025 09:08:05 +0100 Subject: [PATCH 1/2] chore: remove reth-primitives dep from op-primitives --- Cargo.lock | 1 - crates/optimism/primitives/Cargo.toml | 11 +++-------- crates/optimism/primitives/src/lib.rs | 4 ++-- crates/optimism/primitives/src/transaction/signed.rs | 4 ++-- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3e8798fd46b2..a39135f0aa5a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8499,7 +8499,6 @@ dependencies = [ "proptest-arbitrary-interop", "rand 0.8.5", "reth-codecs", - "reth-primitives", "reth-primitives-traits", "reth-zstd-compressors", "revm-primitives", diff --git a/crates/optimism/primitives/Cargo.toml b/crates/optimism/primitives/Cargo.toml index f0c35fb52e5e..5e1fd17311a8 100644 --- a/crates/optimism/primitives/Cargo.toml +++ b/crates/optimism/primitives/Cargo.toml @@ -13,7 +13,6 @@ workspace = true [dependencies] # reth -reth-primitives.workspace = true reth-primitives-traits = { workspace = true, features = ["op"] } reth-codecs = { workspace = true, optional = true, features = ["op"] } reth-zstd-compressors = { workspace = true, optional = true } @@ -48,13 +47,13 @@ proptest-arbitrary-interop.workspace = true reth-codecs = { workspace = true, features = ["test-utils", "op"] } rstest.workspace = true arbitrary.workspace = true +secp256k1 = { workspace = true, features = ["rand"] } proptest.workspace = true [features] -default = ["std", "serde"] +default = ["std"] std = [ "reth-primitives-traits/std", - "reth-primitives/std", "reth-codecs?/std", "alloy-consensus/std", "alloy-eips/std", @@ -74,10 +73,8 @@ reth-codec = [ "std", "dep:proptest", "dep:arbitrary", - "reth-primitives/reth-codec", "reth-primitives-traits/reth-codec", "reth-codecs?/op", - "reth-primitives/reth-codec", "dep:bytes", "dep:modular-bitfield", "dep:reth-zstd-compressors" @@ -99,14 +96,13 @@ serde-bincode-compat = [ "alloy-consensus/serde-bincode-compat", "alloy-eips/serde-bincode-compat", "op-alloy-consensus/serde-bincode-compat", - "reth-primitives/serde-bincode-compat", "reth-primitives-traits/serde-bincode-compat" ] arbitrary = [ "dep:arbitrary", "dep:secp256k1", + "secp256k1?/rand", "reth-primitives-traits/arbitrary", - "reth-primitives/arbitrary", "reth-codecs?/arbitrary", "op-alloy-consensus/arbitrary", "alloy-consensus/arbitrary", @@ -118,5 +114,4 @@ arbitrary = [ optimism = [ "dep:revm-primitives", "revm-primitives/optimism", - "reth-primitives/optimism" ] diff --git a/crates/optimism/primitives/src/lib.rs b/crates/optimism/primitives/src/lib.rs index f04ed59ff63b..a0c082e8b76d 100644 --- a/crates/optimism/primitives/src/lib.rs +++ b/crates/optimism/primitives/src/lib.rs @@ -21,7 +21,7 @@ mod receipt; pub use receipt::OpReceipt; /// Optimism-specific block type. -pub type OpBlock = reth_primitives::Block; +pub type OpBlock = alloy_consensus::Block; /// Optimism-specific block body type. pub type OpBlockBody = ::Body; @@ -31,7 +31,7 @@ pub type OpBlockBody = ::Body; pub struct OpPrimitives; #[cfg(feature = "optimism")] -impl reth_primitives::NodePrimitives for OpPrimitives { +impl reth_primitives_traits::NodePrimitives for OpPrimitives { type Block = OpBlock; type BlockHeader = alloy_consensus::Header; type BlockBody = OpBlockBody; diff --git a/crates/optimism/primitives/src/transaction/signed.rs b/crates/optimism/primitives/src/transaction/signed.rs index f5aefd9c8ff7..6600922617f5 100644 --- a/crates/optimism/primitives/src/transaction/signed.rs +++ b/crates/optimism/primitives/src/transaction/signed.rs @@ -26,7 +26,7 @@ use op_alloy_consensus::{OpPooledTransaction, OpTypedTransaction, TxDeposit}; #[cfg(any(test, feature = "reth-codec"))] use proptest as _; use reth_primitives_traits::{ - crypto::secp256k1::{recover_signer, recover_signer_unchecked, sign_message}, + crypto::secp256k1::{recover_signer, recover_signer_unchecked}, transaction::error::TransactionConversionError, InMemorySize, SignedTransaction, }; @@ -519,7 +519,7 @@ impl<'a> arbitrary::Arbitrary<'a> for OpTransactionSigned { let secp = secp256k1::Secp256k1::new(); let key_pair = secp256k1::Keypair::new(&secp, &mut rand::thread_rng()); - let signature = sign_message( + let signature = reth_primitives_traits::crypto::secp256k1::sign_message( B256::from_slice(&key_pair.secret_bytes()[..]), signature_hash(&transaction), ) From 69dad677f6f34bad305384cb855d4f23131fa8f8 Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Tue, 7 Jan 2025 09:19:01 +0100 Subject: [PATCH 2/2] features --- Cargo.lock | 1 - crates/e2e-test-utils/Cargo.toml | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a39135f0aa5a..38001ad62701 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7150,7 +7150,6 @@ dependencies = [ "reth-payload-builder", "reth-payload-builder-primitives", "reth-payload-primitives", - "reth-primitives", "reth-provider", "reth-rpc-api", "reth-rpc-eth-api", diff --git a/crates/e2e-test-utils/Cargo.toml b/crates/e2e-test-utils/Cargo.toml index 7cb8516816b8..50784ddd5756 100644 --- a/crates/e2e-test-utils/Cargo.toml +++ b/crates/e2e-test-utils/Cargo.toml @@ -22,7 +22,6 @@ reth-rpc-api = { workspace = true, features = ["client"] } reth-payload-builder = { workspace = true, features = ["test-utils"] } reth-payload-builder-primitives.workspace = true reth-payload-primitives.workspace = true -reth-primitives.workspace = true reth-provider.workspace = true reth-network.workspace = true reth-node-api.workspace = true @@ -35,7 +34,7 @@ reth-engine-local.workspace = true reth-tasks.workspace = true # currently need to enable this for workspace level -reth-optimism-primitives = { workspace = true, features = ["arbitrary"] } +reth-optimism-primitives = { workspace = true, features = ["arbitrary", "serde"] } # rpc jsonrpsee.workspace = true