Revert "Disable default features for reth-storage-api in workspace manifest" (#14471)

Cargo.lock

@@ -9445,7 +9445,6 @@ dependencies = [
  "reth-trie",
  "reth-trie-db",
  "revm",
- "tokio",
 ]
 
 [[package]]

Cargo.toml

@@ -413,7 +413,7 @@ reth-stages-api = { path = "crates/stages/api" }
 reth-stages-types = { path = "crates/stages/types", default-features = false }
 reth-static-file = { path = "crates/static-file/static-file" }
 reth-static-file-types = { path = "crates/static-file/types", default-features = false }
-reth-storage-api = { path = "crates/storage/storage-api", default-features = false }
+reth-storage-api = { path = "crates/storage/storage-api" }
 reth-storage-errors = { path = "crates/storage/errors", default-features = false }
 reth-tasks = { path = "crates/tasks" }
 reth-testing-utils = { path = "testing/testing-utils" }

crates/chain-state/Cargo.toml

@@ -19,7 +19,7 @@ reth-execution-types.workspace = true
 reth-metrics.workspace = true
 reth-primitives.workspace = true
 reth-primitives-traits.workspace = true
-reth-storage-api = { workspace = true, features = ["std"] }
+reth-storage-api.workspace = true
 reth-trie.workspace = true
 
 # ethereum

crates/ethereum/payload/Cargo.toml

@@ -18,7 +18,7 @@ reth-primitives-traits.workspace = true
 reth-revm.workspace = true
 reth-transaction-pool.workspace = true
 reth-payload-builder.workspace = true
-reth-storage-api = { workspace = true, features = ["std"] }
+reth-storage-api.workspace = true
 reth-payload-builder-primitives.workspace = true
 reth-payload-primitives.workspace = true
 reth-execution-types.workspace = true

crates/ethereum/reth/Cargo.toml

@@ -44,7 +44,6 @@ std = [
     "reth-chainspec/std",
     "reth-ethereum-primitives/std",
     "reth-primitives-traits/std",
-    "reth-storage-api/std",
     "reth-consensus?/std",
     "reth-consensus-common?/std",
     "alloy-rpc-types-eth?/std",

crates/net/downloaders/Cargo.toml

@@ -19,7 +19,7 @@ reth-network-p2p.workspace = true
 reth-network-peers.workspace = true
 reth-primitives.workspace = true
 reth-primitives-traits.workspace = true
-reth-storage-api = { workspace = true, features = ["std"] }
+reth-storage-api.workspace = true
 reth-tasks.workspace = true
 
 # optional deps for the test-utils feature

crates/net/network/Cargo.toml

@@ -29,7 +29,7 @@ reth-eth-wire-types.workspace = true
 reth-ecies.workspace = true
 reth-tasks.workspace = true
 reth-transaction-pool.workspace = true
-reth-storage-api = { workspace = true, features = ["std"] }
+reth-storage-api.workspace = true
 reth-tokio-util.workspace = true
 reth-consensus.workspace = true
 reth-network-peers = { workspace = true, features = ["net"] }

crates/node/core/Cargo.toml

@@ -19,7 +19,7 @@ reth-primitives-traits = { workspace = true, features = ["rayon"] }
 reth-cli-util.workspace = true
 reth-db = { workspace = true, features = ["mdbx"] }
 reth-storage-errors.workspace = true
-reth-storage-api = { workspace = true, features = ["std"] }
+reth-storage-api.workspace = true
 reth-network = { workspace = true, features = ["serde"] }
 reth-network-p2p.workspace = true
 reth-rpc-eth-types.workspace = true

crates/node/events/Cargo.toml

@@ -12,7 +12,7 @@ workspace = true
 
 [dependencies]
 # reth
-reth-storage-api = { workspace = true, features = ["std"] }
+reth-storage-api.workspace = true
 reth-network-api.workspace = true
 reth-stages.workspace = true
 reth-prune-types.workspace = true

crates/optimism/reth/Cargo.toml

@@ -43,7 +43,6 @@ std = [
     "reth-primitives-traits/std",
     "reth-consensus?/std",
     "reth-consensus-common?/std",
-    "reth-storage-api?/std",
 ]
 arbitrary = [
     "std",

crates/optimism/txpool/Cargo.toml

@@ -21,7 +21,7 @@ alloy-rpc-types-eth.workspace = true
 # reth
 reth-chainspec.workspace = true
 reth-primitives-traits.workspace = true
-reth-storage-api = { workspace = true, features = ["std"] }
+reth-storage-api.workspace = true
 reth-transaction-pool.workspace = true
 
 # revm

crates/revm/Cargo.toml

@@ -39,7 +39,6 @@ std = [
     "alloy-consensus/std",
     "reth-ethereum-forks/std",
     "reth-storage-errors/std",
-    "reth-storage-api/std",
 ]
 witness = ["dep:reth-trie"]
 test-utils = [

crates/rpc/rpc-engine-api/Cargo.toml

@@ -15,7 +15,7 @@ workspace = true
 # reth
 reth-chainspec.workspace = true
 reth-rpc-api.workspace = true
-reth-storage-api = { workspace = true, features = ["std"] }
+reth-storage-api.workspace = true
 reth-payload-builder.workspace = true
 reth-payload-builder-primitives.workspace = true
 reth-payload-primitives.workspace = true

crates/rpc/rpc-eth-types/Cargo.toml

@@ -20,7 +20,7 @@ reth-execution-types.workspace = true
 reth-metrics.workspace = true
 reth-primitives = { workspace = true, features = ["secp256k1"] }
 reth-primitives-traits.workspace = true
-reth-storage-api = { workspace = true, features = ["std"] }
+reth-storage-api.workspace = true
 reth-revm.workspace = true
 reth-rpc-server-types.workspace = true
 reth-rpc-types-compat.workspace = true

crates/storage/provider/Cargo.toml

@@ -20,7 +20,7 @@ reth-primitives-traits = { workspace = true, features = ["reth-codec"] }
 reth-fs-util.workspace = true
 reth-errors.workspace = true
 reth-storage-errors.workspace = true
-reth-storage-api = { workspace = true, features = ["std"] }
+reth-storage-api.workspace = true
 reth-network-p2p.workspace = true
 reth-db = { workspace = true, features = ["mdbx"] }
 reth-db-api.workspace = true

crates/storage/storage-api/Cargo.toml

@@ -33,13 +33,8 @@ alloy-primitives.workspace = true
 alloy-consensus.workspace = true
 alloy-rpc-types-engine.workspace = true
 
-# misc
-
 auto_impl.workspace = true
 
-# `no_std`
-tokio = { workspace = true, features = ["time"] }
-
 [features]
 default = ["std"]
 std = [

crates/storage/storage-api/src/chain_info.rs

@@ -1,12 +1,5 @@
 use alloy_rpc_types_engine::ForkchoiceState;
 use reth_primitives_traits::SealedHeader;
-#[cfg(feature = "std")]
-use std::time::Instant;
-#[cfg_attr(feature = "std", allow(unused_imports))]
-#[cfg(feature = "std")]
-use tokio::time as _;
-#[cfg(not(feature = "std"))]
-use tokio::time::Instant;
 
 /// A type that can track updates related to fork choice updates.
 pub trait CanonChainTracker: Send + Sync {
@@ -18,14 +11,16 @@ pub trait CanonChainTracker: Send + Sync {
 
     /// Returns the last time a fork choice update was received from the CL
     /// ([`CanonChainTracker::on_forkchoice_update_received`])
-    fn last_received_update_timestamp(&self) -> Option<Instant>;
+    #[cfg(feature = "std")]
+    fn last_received_update_timestamp(&self) -> Option<std::time::Instant>;
 
     /// Notify the tracker about a transition configuration exchange.
     fn on_transition_configuration_exchanged(&self);
 
     /// Returns the last time a transition configuration was exchanged with the CL
     /// ([`CanonChainTracker::on_transition_configuration_exchanged`])
-    fn last_exchanged_transition_configuration_timestamp(&self) -> Option<Instant>;
+    #[cfg(feature = "std")]
+    fn last_exchanged_transition_configuration_timestamp(&self) -> Option<std::time::Instant>;
 
     /// Sets the canonical head of the chain.
     fn set_canonical_head(&self, header: SealedHeader<Self::Header>);

crates/transaction-pool/Cargo.toml

@@ -20,7 +20,7 @@ reth-primitives = { workspace = true, features = ["c-kzg", "secp256k1"] }
 reth-primitives-traits.workspace = true
 reth-execution-types.workspace = true
 reth-fs-util.workspace = true
-reth-storage-api = { workspace = true, features = ["std"] }
+reth-storage-api.workspace = true
 reth-tasks.workspace = true
 revm-primitives.workspace = true
 revm-interpreter.workspace = true

crates/trie/sparse/Cargo.toml

@@ -29,7 +29,7 @@ thiserror.workspace = true
 [dev-dependencies]
 reth-primitives-traits = { workspace = true, features = ["arbitrary"] }
 reth-provider = { workspace = true, features = ["test-utils"] }
-reth-storage-api = { workspace = true, features = ["std"] }
+reth-storage-api.workspace = true
 reth-testing-utils.workspace = true
 reth-trie = { workspace = true, features = ["test-utils"] }
 reth-trie-common = { workspace = true, features = ["test-utils", "arbitrary"] }