Merge branch 'main' into use_alloy_signature_type

Cargo.toml

@@ -74,6 +74,7 @@ members = [
     "crates/optimism/cli",
     "crates/optimism/consensus",
     "crates/optimism/evm/",
+    "crates/optimism/hardforks/",
     "crates/optimism/node/",
     "crates/optimism/payload/",
     "crates/optimism/primitives/",
@@ -363,6 +364,7 @@ reth-node-types = { path = "crates/node/types" }
 reth-optimism-chainspec = { path = "crates/optimism/chainspec" }
 reth-optimism-cli = { path = "crates/optimism/cli" }
 reth-optimism-consensus = { path = "crates/optimism/consensus" }
+reth-optimism-forks = { path = "crates/optimism/hardforks" }
 reth-optimism-payload-builder = { path = "crates/optimism/payload" }
 reth-optimism-primitives = { path = "crates/optimism/primitives" }
 reth-optimism-rpc = { path = "crates/optimism/rpc" }

book/run/sync-op-mainnet.md

@@ -32,7 +32,7 @@ Importing OP mainnet Bedrock datadir requires exported data:
 
 ### Manual Export Steps
 
-The `op-geth` Bedrock datadir can be downloaded from <https://datadirs.optimism.io/mainnet-bedrock.tar.zst>.
+The `op-geth` Bedrock datadir can be downloaded from <https://datadirs.optimism.io>.
 
 To export the OVM chain from `op-geth`, clone the `testinprod-io/op-geth` repo and checkout
 <https://github.com/testinprod-io/op-geth/pull/1>. Commands to export blocks, receipts and state dump can be

crates/chainspec/Cargo.toml

@@ -17,6 +17,9 @@ reth-network-peers.workspace = true
 reth-trie-common.workspace = true
 reth-primitives-traits.workspace = true
 
+# op-reth
+reth-optimism-forks = { workspace = true, optional = true }
+
 # ethereum
 alloy-chains = { workspace = true, features = ["serde", "rlp"] }
 alloy-eips = { workspace = true, features = ["serde"] }
@@ -47,9 +50,9 @@ op-alloy-rpc-types.workspace = true
 [features]
 default = ["std"]
 optimism = [
-    "reth-ethereum-forks/optimism",
     "serde",
     "dep:op-alloy-rpc-types",
+    "reth-optimism-forks",
 ]
 std = []
 arbitrary = [