merge main take #2

HARDFORK-CHECKLIST.md

@@ -0,0 +1,21 @@
+# Non-exhaustive checklist for integrating new changes for an upcoming hard fork/devnet
+
+## Introducing new EIP types or changes to primitive types 
+
+- Make required changes to primitive data structures on [alloy](https://github.com/alloy-rs/alloy)
+- All new EIP data structures/constants/helpers etc. go into the `alloy-eips` crate at first.
+- New transaction types go into `alloy-consensus`
+- If there are changes to existing data structures, such as `Header` or `Block`, apply them to the types in `alloy-consensus` (e.g. new `request_hashes` field in Prague)
+
+## Engine API
+
+- If there are changes to the engine API (e.g. a new `engine_newPayloadVx` and `engine_getPayloadVx` pair) add the new types to the `alloy-rpc-types-engine` crate.
+- If there are new parameters to the `engine_newPayloadVx` endpoint, add them to the `ExecutionPayloadSidecar` container type. This types contains all additional parameters that are required to convert an `ExecutionPayload` to an EL block.
+
+## Reth changes
+
+### Updates to the engine API
+
+- Add new endpoints to the `EngineApi` trait and implement endpoints.
+- Update the `ExceuctionPayload` + `ExecutionPayloadSidecar` to `Block` conversion if there are any additional parameters.
+- Update version specific validation checks in the `EngineValidator` trait.

bin/reth/Cargo.toml

@@ -96,7 +96,6 @@ backon.workspace = true
 similar-asserts.workspace = true
 
 [dev-dependencies]
-reth-discv4.workspace = true
 tempfile.workspace = true
 
 [features]

book/sources/exex/remote/Cargo.toml

@@ -6,9 +6,11 @@ edition = "2021"
 [dependencies]
 # reth
 reth = { git = "https://github.com/paradigmxyz/reth.git" }
-reth-exex = { git = "https://github.com/paradigmxyz/reth.git", features = ["serde"] }
-reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth.git"}
-reth-node-api = { git = "https://github.com/paradigmxyz/reth.git"}
+reth-exex = { git = "https://github.com/paradigmxyz/reth.git", features = [
+    "serde",
+] }
+reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth.git" }
+reth-node-api = { git = "https://github.com/paradigmxyz/reth.git" }
 reth-tracing = { git = "https://github.com/paradigmxyz/reth.git" }
 
 # async
@@ -49,4 +51,4 @@ path = "src/exex.rs"
 
 [[bin]]
 name = "consumer"
-path = "src/consumer.rs"
+path = "src/consumer.rs"