From 4696684ee7e3627b9812d6f8976c96a6630ce774 Mon Sep 17 00:00:00 2001 From: Emilia Hane Date: Thu, 16 Oct 2025 13:32:06 +0200 Subject: [PATCH 1/2] Add serde-bincode-compat feature to reth-trie --- crates/optimism/exex/Cargo.toml | 9 ++++----- crates/optimism/trie/Cargo.toml | 6 ++++++ crates/trie/trie/Cargo.toml | 7 +++++++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/crates/optimism/exex/Cargo.toml b/crates/optimism/exex/Cargo.toml index bbcefba8953..a6875f2b01e 100644 --- a/crates/optimism/exex/Cargo.toml +++ b/crates/optimism/exex/Cargo.toml @@ -19,15 +19,14 @@ reth-node-api.workspace = true reth-provider.workspace = true reth-chainspec.workspace = true -# for ethereum types, `serde-bincode-compat` is added by `reth-storage-api`, however this does not work with `op` until -# `reth-storage-api` is updated to support `op`, so we add it here. -reth-optimism-primitives = { workspace = true, features = ["reth-codec", "serde-bincode-compat", "serde"] } - # ethereum alloy-primitives.workspace = true # op-reth -reth-optimism-trie.workspace = true +# serde-bincode-compat is needed since exex is a dep of stages and stages uses bincode dep +reth-optimism-primitives = { workspace = true, features = ["reth-codec", "serde-bincode-compat"] } +# proofs exex handles `TrieUpdates` in notifications +reth-optimism-trie = { workspace = true, features = ["serde-bincode-compat"] } # misc eyre.workspace = true diff --git a/crates/optimism/trie/Cargo.toml b/crates/optimism/trie/Cargo.toml index ef6067d7da7..ce5869a75e8 100644 --- a/crates/optimism/trie/Cargo.toml +++ b/crates/optimism/trie/Cargo.toml @@ -47,3 +47,9 @@ test-case.workspace = true reth-db = { workspace = true, features = ["test-utils"] } reth-db-api = { workspace = true, features = ["test-utils"] } reth-trie = { workspace = true, features = ["test-utils"] } + +[features] +serde-bincode-compat = [ + "reth-primitives-traits/serde-bincode-compat", + "reth-trie/serde-bincode-compat" +] diff --git a/crates/trie/trie/Cargo.toml b/crates/trie/trie/Cargo.toml index 403d187e46a..e413f774721 100644 --- a/crates/trie/trie/Cargo.toml +++ b/crates/trie/trie/Cargo.toml @@ -92,6 +92,13 @@ test-utils = [ "reth-trie-sparse/test-utils", "reth-stages-types/test-utils", ] +serde-bincode-compat = [ + "alloy-consensus/serde-bincode-compat", + "alloy-eips/serde-bincode-compat", + "reth-ethereum-primitives/serde-bincode-compat", + "reth-primitives-traits/serde-bincode-compat", + "reth-trie-common/serde-bincode-compat" +] [[bench]] name = "hash_post_state" From 8c9b16777f0313f952f8a7d7367386d708aba0e9 Mon Sep 17 00:00:00 2001 From: Emilia Hane Date: Thu, 16 Oct 2025 13:45:04 +0200 Subject: [PATCH 2/2] Fix lint --- crates/optimism/trie/Cargo.toml | 4 ++-- crates/trie/trie/Cargo.toml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/crates/optimism/trie/Cargo.toml b/crates/optimism/trie/Cargo.toml index ce5869a75e8..b569a3e88de 100644 --- a/crates/optimism/trie/Cargo.toml +++ b/crates/optimism/trie/Cargo.toml @@ -50,6 +50,6 @@ reth-trie = { workspace = true, features = ["test-utils"] } [features] serde-bincode-compat = [ - "reth-primitives-traits/serde-bincode-compat", - "reth-trie/serde-bincode-compat" + "reth-primitives-traits/serde-bincode-compat", + "reth-trie/serde-bincode-compat", ] diff --git a/crates/trie/trie/Cargo.toml b/crates/trie/trie/Cargo.toml index e413f774721..9ec87912c62 100644 --- a/crates/trie/trie/Cargo.toml +++ b/crates/trie/trie/Cargo.toml @@ -93,11 +93,11 @@ test-utils = [ "reth-stages-types/test-utils", ] serde-bincode-compat = [ - "alloy-consensus/serde-bincode-compat", - "alloy-eips/serde-bincode-compat", - "reth-ethereum-primitives/serde-bincode-compat", - "reth-primitives-traits/serde-bincode-compat", - "reth-trie-common/serde-bincode-compat" + "alloy-consensus/serde-bincode-compat", + "alloy-eips/serde-bincode-compat", + "reth-ethereum-primitives/serde-bincode-compat", + "reth-primitives-traits/serde-bincode-compat", + "reth-trie-common/serde-bincode-compat", ] [[bench]]