From e35613f4842b7832d07a00523256bc5007eeb807 Mon Sep 17 00:00:00 2001
From: Alex Stokes <r.alex.stokes@gmail.com>
Date: Tue, 30 Apr 2024 16:02:22 -0600
Subject: [PATCH 1/3] update to latest reth (with alloy indirect dep)

---
 Cargo.lock | 158 ++++++++++++++++++++++++++---------------------------
 Cargo.toml |  14 ++---
 2 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 93edcb9f..855b9598 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -143,7 +143,7 @@ dependencies = [
 [[package]]
 name = "alloy-consensus"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=4e22b9e#4e22b9e1de80f1b1cc5dfdcd9461d44b27cf27ca"
+source = "git+https://github.com/alloy-rs/alloy?rev=ca54552#ca54552075da02339f678e5b591877ff6c2939db"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -175,7 +175,7 @@ dependencies = [
 [[package]]
 name = "alloy-eips"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=4e22b9e#4e22b9e1de80f1b1cc5dfdcd9461d44b27cf27ca"
+source = "git+https://github.com/alloy-rs/alloy?rev=ca54552#ca54552075da02339f678e5b591877ff6c2939db"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -191,7 +191,7 @@ dependencies = [
 [[package]]
 name = "alloy-genesis"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=4e22b9e#4e22b9e1de80f1b1cc5dfdcd9461d44b27cf27ca"
+source = "git+https://github.com/alloy-rs/alloy?rev=ca54552#ca54552075da02339f678e5b591877ff6c2939db"
 dependencies = [
  "alloy-primitives",
  "alloy-serde",
@@ -214,7 +214,7 @@ dependencies = [
 [[package]]
 name = "alloy-json-rpc"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=4e22b9e#4e22b9e1de80f1b1cc5dfdcd9461d44b27cf27ca"
+source = "git+https://github.com/alloy-rs/alloy?rev=ca54552#ca54552075da02339f678e5b591877ff6c2939db"
 dependencies = [
  "alloy-primitives",
  "serde",
@@ -226,7 +226,7 @@ dependencies = [
 [[package]]
 name = "alloy-network"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=4e22b9e#4e22b9e1de80f1b1cc5dfdcd9461d44b27cf27ca"
+source = "git+https://github.com/alloy-rs/alloy?rev=ca54552#ca54552075da02339f678e5b591877ff6c2939db"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -292,7 +292,7 @@ dependencies = [
 [[package]]
 name = "alloy-rpc-types"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=4e22b9e#4e22b9e1de80f1b1cc5dfdcd9461d44b27cf27ca"
+source = "git+https://github.com/alloy-rs/alloy?rev=ca54552#ca54552075da02339f678e5b591877ff6c2939db"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -314,7 +314,7 @@ dependencies = [
 [[package]]
 name = "alloy-rpc-types-anvil"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=4e22b9e#4e22b9e1de80f1b1cc5dfdcd9461d44b27cf27ca"
+source = "git+https://github.com/alloy-rs/alloy?rev=ca54552#ca54552075da02339f678e5b591877ff6c2939db"
 dependencies = [
  "alloy-primitives",
  "alloy-serde",
@@ -324,7 +324,7 @@ dependencies = [
 [[package]]
 name = "alloy-rpc-types-engine"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=4e22b9e#4e22b9e1de80f1b1cc5dfdcd9461d44b27cf27ca"
+source = "git+https://github.com/alloy-rs/alloy?rev=ca54552#ca54552075da02339f678e5b591877ff6c2939db"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -342,7 +342,7 @@ dependencies = [
 [[package]]
 name = "alloy-rpc-types-trace"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=4e22b9e#4e22b9e1de80f1b1cc5dfdcd9461d44b27cf27ca"
+source = "git+https://github.com/alloy-rs/alloy?rev=ca54552#ca54552075da02339f678e5b591877ff6c2939db"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types",
@@ -354,7 +354,7 @@ dependencies = [
 [[package]]
 name = "alloy-serde"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=4e22b9e#4e22b9e1de80f1b1cc5dfdcd9461d44b27cf27ca"
+source = "git+https://github.com/alloy-rs/alloy?rev=ca54552#ca54552075da02339f678e5b591877ff6c2939db"
 dependencies = [
  "alloy-primitives",
  "serde",
@@ -364,7 +364,7 @@ dependencies = [
 [[package]]
 name = "alloy-signer"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=4e22b9e#4e22b9e1de80f1b1cc5dfdcd9461d44b27cf27ca"
+source = "git+https://github.com/alloy-rs/alloy?rev=ca54552#ca54552075da02339f678e5b591877ff6c2939db"
 dependencies = [
  "alloy-primitives",
  "async-trait",
@@ -377,7 +377,7 @@ dependencies = [
 [[package]]
 name = "alloy-signer-wallet"
 version = "0.1.0"
-source = "git+https://github.com/alloy-rs/alloy?rev=4e22b9e#4e22b9e1de80f1b1cc5dfdcd9461d44b27cf27ca"
+source = "git+https://github.com/alloy-rs/alloy?rev=ca54552#ca54552075da02339f678e5b591877ff6c2939db"
 dependencies = [
  "alloy-consensus",
  "alloy-network",
@@ -6386,7 +6386,7 @@ dependencies = [
 [[package]]
 name = "reth"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "ahash",
  "alloy-rlp",
@@ -6460,7 +6460,7 @@ dependencies = [
 [[package]]
 name = "reth-auto-seal-consensus"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "futures-util",
  "reth-beacon-consensus",
@@ -6483,7 +6483,7 @@ dependencies = [
 [[package]]
 name = "reth-basic-payload-builder"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "alloy-rlp",
  "futures-core",
@@ -6506,7 +6506,7 @@ dependencies = [
 [[package]]
 name = "reth-beacon-consensus"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "futures",
  "metrics",
@@ -6535,7 +6535,7 @@ dependencies = [
 [[package]]
 name = "reth-beacon-consensus-core"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "reth-consensus",
  "reth-consensus-common",
@@ -6545,7 +6545,7 @@ dependencies = [
 [[package]]
 name = "reth-blockchain-tree"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "aquamarine",
  "linked_hash_set",
@@ -6568,7 +6568,7 @@ dependencies = [
 [[package]]
 name = "reth-cli-runner"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "futures",
  "reth-tasks",
@@ -6579,7 +6579,7 @@ dependencies = [
 [[package]]
 name = "reth-codecs"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -6592,7 +6592,7 @@ dependencies = [
 [[package]]
 name = "reth-codecs-derive"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "convert_case 0.6.0",
  "proc-macro2",
@@ -6603,7 +6603,7 @@ dependencies = [
 [[package]]
 name = "reth-config"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "humantime-serde",
  "reth-discv4",
@@ -6617,7 +6617,7 @@ dependencies = [
 [[package]]
 name = "reth-consensus"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "auto_impl",
  "reth-primitives",
@@ -6627,7 +6627,7 @@ dependencies = [
 [[package]]
 name = "reth-consensus-common"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "reth-consensus",
  "reth-interfaces",
@@ -6638,7 +6638,7 @@ dependencies = [
 [[package]]
 name = "reth-db"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "arbitrary",
  "bytes",
@@ -6669,7 +6669,7 @@ dependencies = [
 [[package]]
 name = "reth-discv4"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "alloy-rlp",
  "discv5",
@@ -6691,7 +6691,7 @@ dependencies = [
 [[package]]
 name = "reth-discv5"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "alloy-rlp",
  "derive_more",
@@ -6715,7 +6715,7 @@ dependencies = [
 [[package]]
 name = "reth-dns-discovery"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "data-encoding",
  "enr 0.12.0",
@@ -6738,7 +6738,7 @@ dependencies = [
 [[package]]
 name = "reth-downloaders"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "alloy-rlp",
  "futures",
@@ -6765,7 +6765,7 @@ dependencies = [
 [[package]]
 name = "reth-ecies"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "aes 0.8.4",
  "alloy-rlp",
@@ -6798,7 +6798,7 @@ dependencies = [
 [[package]]
 name = "reth-engine-primitives"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "reth-primitives",
  "reth-rpc-types",
@@ -6809,7 +6809,7 @@ dependencies = [
 [[package]]
 name = "reth-eth-wire"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "alloy-rlp",
  "bytes",
@@ -6836,7 +6836,7 @@ dependencies = [
 [[package]]
 name = "reth-eth-wire-types"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "alloy-rlp",
  "bytes",
@@ -6850,7 +6850,7 @@ dependencies = [
 [[package]]
 name = "reth-ethereum-engine-primitives"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "alloy-rlp",
  "reth-engine-primitives",
@@ -6865,7 +6865,7 @@ dependencies = [
 [[package]]
 name = "reth-ethereum-forks"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "alloy-chains",
  "alloy-primitives",
@@ -6881,7 +6881,7 @@ dependencies = [
 [[package]]
 name = "reth-ethereum-payload-builder"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "reth-basic-payload-builder",
  "reth-payload-builder",
@@ -6896,7 +6896,7 @@ dependencies = [
 [[package]]
 name = "reth-etl"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "rayon",
  "reth-db",
@@ -6906,7 +6906,7 @@ dependencies = [
 [[package]]
 name = "reth-evm"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "reth-interfaces",
  "reth-primitives",
@@ -6917,7 +6917,7 @@ dependencies = [
 [[package]]
 name = "reth-evm-ethereum"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "reth-evm",
  "reth-interfaces",
@@ -6931,7 +6931,7 @@ dependencies = [
 [[package]]
 name = "reth-exex"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "eyre",
  "metrics",
@@ -6950,7 +6950,7 @@ dependencies = [
 [[package]]
 name = "reth-interfaces"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "auto_impl",
  "clap",
@@ -6968,7 +6968,7 @@ dependencies = [
 [[package]]
 name = "reth-ipc"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "async-trait",
  "bytes",
@@ -6989,7 +6989,7 @@ dependencies = [
 [[package]]
 name = "reth-libmdbx"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "bitflags 2.5.0",
  "byteorder",
@@ -7007,7 +7007,7 @@ dependencies = [
 [[package]]
 name = "reth-mdbx-sys"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "bindgen",
  "cc",
@@ -7017,7 +7017,7 @@ dependencies = [
 [[package]]
 name = "reth-metrics"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "futures",
  "metrics",
@@ -7029,7 +7029,7 @@ dependencies = [
 [[package]]
 name = "reth-metrics-derive"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "once_cell",
  "proc-macro2",
@@ -7041,7 +7041,7 @@ dependencies = [
 [[package]]
 name = "reth-net-common"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "pin-project",
  "reth-network-types",
@@ -7051,7 +7051,7 @@ dependencies = [
 [[package]]
 name = "reth-net-nat"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "igd-next",
  "pin-project-lite",
@@ -7065,7 +7065,7 @@ dependencies = [
 [[package]]
 name = "reth-network"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "alloy-rlp",
  "aquamarine",
@@ -7115,7 +7115,7 @@ dependencies = [
 [[package]]
 name = "reth-network-api"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "enr 0.12.0",
  "reth-discv4",
@@ -7131,7 +7131,7 @@ dependencies = [
 [[package]]
 name = "reth-network-types"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "enr 0.12.0",
  "reth-primitives",
@@ -7143,7 +7143,7 @@ dependencies = [
 [[package]]
 name = "reth-nippy-jar"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "anyhow",
  "bincode",
@@ -7163,7 +7163,7 @@ dependencies = [
 [[package]]
 name = "reth-node-api"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "reth-db",
  "reth-engine-primitives",
@@ -7178,7 +7178,7 @@ dependencies = [
 [[package]]
 name = "reth-node-builder"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "aquamarine",
  "confy",
@@ -7217,7 +7217,7 @@ dependencies = [
 [[package]]
 name = "reth-node-core"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "clap",
  "const-str",
@@ -7273,7 +7273,7 @@ dependencies = [
 [[package]]
 name = "reth-node-ethereum"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "eyre",
  "reth-basic-payload-builder",
@@ -7291,7 +7291,7 @@ dependencies = [
 [[package]]
 name = "reth-node-events"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "futures",
  "humantime",
@@ -7313,7 +7313,7 @@ dependencies = [
 [[package]]
 name = "reth-payload-builder"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "futures-util",
  "metrics",
@@ -7334,7 +7334,7 @@ dependencies = [
 [[package]]
 name = "reth-payload-validator"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "reth-primitives",
  "reth-rpc-types",
@@ -7344,7 +7344,7 @@ dependencies = [
 [[package]]
 name = "reth-primitives"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "alloy-chains",
  "alloy-eips",
@@ -7384,7 +7384,7 @@ dependencies = [
 [[package]]
 name = "reth-provider"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "alloy-rlp",
  "auto_impl",
@@ -7413,7 +7413,7 @@ dependencies = [
 [[package]]
 name = "reth-prune"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "itertools 0.12.1",
  "metrics",
@@ -7434,7 +7434,7 @@ dependencies = [
 [[package]]
 name = "reth-revm"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "reth-consensus-common",
  "reth-evm",
@@ -7449,7 +7449,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "alloy-dyn-abi",
  "alloy-primitives",
@@ -7501,7 +7501,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-api"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "jsonrpsee",
  "reth-engine-primitives",
@@ -7515,7 +7515,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-builder"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "hyper",
  "jsonrpsee",
@@ -7542,7 +7542,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-engine-api"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "async-trait",
  "jsonrpsee-core",
@@ -7567,7 +7567,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-types"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "alloy-genesis",
  "alloy-primitives",
@@ -7592,7 +7592,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-types-compat"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "alloy-rlp",
  "alloy-rpc-types",
@@ -7603,7 +7603,7 @@ dependencies = [
 [[package]]
 name = "reth-stages"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "futures-util",
  "itertools 0.12.1",
@@ -7628,7 +7628,7 @@ dependencies = [
 [[package]]
 name = "reth-stages-api"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "aquamarine",
  "auto_impl",
@@ -7651,7 +7651,7 @@ dependencies = [
 [[package]]
 name = "reth-static-file"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "parking_lot 0.12.2",
  "rayon",
@@ -7668,7 +7668,7 @@ dependencies = [
 [[package]]
 name = "reth-tasks"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "dyn-clone",
  "futures-util",
@@ -7685,7 +7685,7 @@ dependencies = [
 [[package]]
 name = "reth-tokio-util"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "tokio",
  "tokio-stream",
@@ -7694,7 +7694,7 @@ dependencies = [
 [[package]]
 name = "reth-tracing"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "clap",
  "eyre",
@@ -7709,7 +7709,7 @@ dependencies = [
 [[package]]
 name = "reth-transaction-pool"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "alloy-rlp",
  "aquamarine",
@@ -7741,7 +7741,7 @@ dependencies = [
 [[package]]
 name = "reth-trie"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "alloy-rlp",
  "auto_impl",
@@ -7759,7 +7759,7 @@ dependencies = [
 [[package]]
 name = "reth-trie-parallel"
 version = "0.2.0-beta.6"
-source = "git+https://github.com/paradigmxyz/reth?rev=6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe#6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe"
+source = "git+https://github.com/paradigmxyz/reth?rev=8e65cb3#8e65cb3aa52ef1d621b390d0b1f834f77db9ac60"
 dependencies = [
  "alloy-rlp",
  "derive_more",
@@ -7796,7 +7796,7 @@ dependencies = [
 [[package]]
 name = "revm-inspectors"
 version = "0.1.0"
-source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=848d568#848d5688d0c499c538b9a78b423a7061525aa580"
+source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=3d2077e#3d2077ee665046c256448a8bd90d8e93ea85de56"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types",
diff --git a/Cargo.toml b/Cargo.toml
index 2470550a..73cde199 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,13 +17,13 @@ version = "0.3.0"
 ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "0919f02435e1b64e27c53931cac8e08edaad5f8b" }
 beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "0919f02435e1b64e27c53931cac8e08edaad5f8b" }
 
-reth = { git = "https://github.com/paradigmxyz/reth", rev = "6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe" }
-reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe" }
-reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe" }
-reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe" }
-reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "6d7cd53ad25f0b79c89fd60a4db2a0f2fe097efe" }
-alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "4e22b9e" }
-alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "4e22b9e" }
+reth = { git = "https://github.com/paradigmxyz/reth", rev = "8e65cb3" }
+reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "8e65cb3" }
+reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "8e65cb3" }
+reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "8e65cb3" }
+reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "8e65cb3" }
+alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "ca54552" }
+alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "ca54552" }
 
 eyre = "0.6.8"
 futures-util = "0.3.30"

From eef89e04dff71077455991578c0dae5491177c45 Mon Sep 17 00:00:00 2001
From: Alex Stokes <r.alex.stokes@gmail.com>
Date: Tue, 30 Apr 2024 16:02:44 -0600
Subject: [PATCH 2/3] use upstream `PayloadTaskGuard` type

---
 mev-build-rs/src/payload/job.rs           | 17 ++--
 mev-build-rs/src/payload/job_generator.rs | 11 +--
 mev-build-rs/src/utils/compat.rs          | 91 ----------------------
 mev-build-rs/src/utils/mod.rs             | 95 ++++++++++++++++++++++-
 mev-build-rs/src/utils/payload_job.rs     | 11 ---
 5 files changed, 104 insertions(+), 121 deletions(-)
 delete mode 100644 mev-build-rs/src/utils/compat.rs
 delete mode 100644 mev-build-rs/src/utils/payload_job.rs

diff --git a/mev-build-rs/src/payload/job.rs b/mev-build-rs/src/payload/job.rs
index a16a6a8e..2f68a9c6 100644
--- a/mev-build-rs/src/payload/job.rs
+++ b/mev-build-rs/src/payload/job.rs
@@ -1,10 +1,7 @@
-use crate::{
-    payload::{
-        attributes::BuilderPayloadBuilderAttributes,
-        builder::PayloadBuilder,
-        resolve::{PayloadFinalizer, PayloadFinalizerConfig, ResolveBuilderPayload},
-    },
-    utils::payload_job::PayloadTaskGuard,
+use crate::payload::{
+    attributes::BuilderPayloadBuilderAttributes,
+    builder::PayloadBuilder,
+    resolve::{PayloadFinalizer, PayloadFinalizerConfig, ResolveBuilderPayload},
 };
 use futures_util::{Future, FutureExt};
 use reth::{
@@ -18,8 +15,8 @@ use reth::{
     transaction_pool::TransactionPool,
 };
 use reth_basic_payload_builder::{
-    BuildArguments, BuildOutcome, Cancelled, PayloadBuilder as _, PayloadConfig, PendingPayload,
-    ResolveBestPayload,
+    BuildArguments, BuildOutcome, Cancelled, PayloadBuilder as _, PayloadConfig, PayloadTaskGuard,
+    PendingPayload, ResolveBestPayload,
 };
 use std::{
     pin::Pin,
@@ -173,7 +170,7 @@ where
                 let builder = this.builder.clone();
                 this.executor.spawn_blocking(Box::pin(async move {
                     // acquire the permit for executing the task
-                    let _permit = guard.0.acquire().await;
+                    let _permit = guard.acquire().await;
                     let args = BuildArguments {
                         client,
                         pool,
diff --git a/mev-build-rs/src/payload/job_generator.rs b/mev-build-rs/src/payload/job_generator.rs
index 84884c15..af9b8d0b 100644
--- a/mev-build-rs/src/payload/job_generator.rs
+++ b/mev-build-rs/src/payload/job_generator.rs
@@ -1,9 +1,6 @@
-use crate::{
-    payload::{
-        builder::{PayloadBuilder, BASE_TX_GAS_LIMIT},
-        job::PayloadJob,
-    },
-    utils::payload_job::PayloadTaskGuard,
+use crate::payload::{
+    builder::{PayloadBuilder, BASE_TX_GAS_LIMIT},
+    job::PayloadJob,
 };
 use ethereum_consensus::clock::duration_until;
 use mev_rs::compute_preferred_gas_limit;
@@ -15,7 +12,7 @@ use reth::{
     tasks::TaskSpawner,
     transaction_pool::TransactionPool,
 };
-use reth_basic_payload_builder::{PayloadConfig, PrecachedState};
+use reth_basic_payload_builder::{PayloadConfig, PayloadTaskGuard, PrecachedState};
 use std::{sync::Arc, time::Duration};
 
 fn apply_gas_limit<P>(config: &mut PayloadConfig<P>, gas_limit: u64) {
diff --git a/mev-build-rs/src/utils/compat.rs b/mev-build-rs/src/utils/compat.rs
deleted file mode 100644
index 388b9579..00000000
--- a/mev-build-rs/src/utils/compat.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-use ethereum_consensus::{
-    deneb::{
-        mainnet as spec,
-        polynomial_commitments::{KzgCommitment, KzgProof},
-        Blob,
-    },
-    primitives::{Bytes32, ExecutionAddress},
-    ssz::prelude::{self as ssz_rs, ByteList, ByteVector, List},
-};
-use mev_rs::types::{BlobsBundle, ExecutionPayload};
-use reth::primitives::{Address, BlobTransactionSidecar, Bloom, SealedBlock, B256};
-
-pub fn to_bytes32(value: B256) -> Bytes32 {
-    Bytes32::try_from(value.as_ref()).unwrap()
-}
-
-pub fn to_bytes20(value: Address) -> ExecutionAddress {
-    ExecutionAddress::try_from(value.as_ref()).unwrap()
-}
-
-fn to_byte_vector(value: Bloom) -> ByteVector<256> {
-    ByteVector::<256>::try_from(value.as_ref()).unwrap()
-}
-
-// TODO: support multiple forks
-pub fn to_execution_payload(value: &SealedBlock) -> ExecutionPayload {
-    let hash = value.hash();
-    let header = &value.header;
-    let transactions = &value.body;
-    let withdrawals = &value.withdrawals;
-    let transactions = transactions
-        .iter()
-        .map(|t| spec::Transaction::try_from(t.envelope_encoded().as_ref()).unwrap())
-        .collect::<Vec<_>>();
-    let withdrawals = withdrawals
-        .as_ref()
-        .unwrap()
-        .iter()
-        .map(|w| spec::Withdrawal {
-            index: w.index as usize,
-            validator_index: w.validator_index as usize,
-            address: to_bytes20(w.address),
-            amount: w.amount,
-        })
-        .collect::<Vec<_>>();
-
-    let payload = spec::ExecutionPayload {
-        parent_hash: to_bytes32(header.parent_hash),
-        fee_recipient: to_bytes20(header.beneficiary),
-        state_root: to_bytes32(header.state_root),
-        receipts_root: to_bytes32(header.receipts_root),
-        logs_bloom: to_byte_vector(header.logs_bloom),
-        prev_randao: to_bytes32(header.mix_hash),
-        block_number: header.number,
-        gas_limit: header.gas_limit,
-        gas_used: header.gas_used,
-        timestamp: header.timestamp,
-        extra_data: ByteList::try_from(header.extra_data.as_ref()).unwrap(),
-        base_fee_per_gas: ssz_rs::U256::from(header.base_fee_per_gas.unwrap_or_default()),
-        block_hash: to_bytes32(hash),
-        transactions: TryFrom::try_from(transactions).unwrap(),
-        withdrawals: TryFrom::try_from(withdrawals).unwrap(),
-        blob_gas_used: header.blob_gas_used.unwrap(),
-        excess_blob_gas: header.excess_blob_gas.unwrap(),
-    };
-    ExecutionPayload::Deneb(payload)
-}
-
-pub fn to_blobs_bundle(sidecars: &[BlobTransactionSidecar]) -> BlobsBundle {
-    let mut commitments = List::default();
-    let mut proofs = List::default();
-    let mut blobs = List::default();
-
-    // TODO: perform length checks to avoid panic on `push`
-    for sidecar in sidecars {
-        for commitment in &sidecar.commitments {
-            let commitment = KzgCommitment::try_from(commitment.as_slice()).unwrap();
-            commitments.push(commitment);
-        }
-        for proof in &sidecar.proofs {
-            let proof = KzgProof::try_from(proof.as_slice()).unwrap();
-            proofs.push(proof);
-        }
-        for blob in &sidecar.blobs {
-            let blob = Blob::try_from(blob.as_ref()).unwrap();
-            blobs.push(blob);
-        }
-    }
-
-    BlobsBundle { commitments, proofs, blobs }
-}
diff --git a/mev-build-rs/src/utils/mod.rs b/mev-build-rs/src/utils/mod.rs
index de52a7f0..f7d7c8a8 100644
--- a/mev-build-rs/src/utils/mod.rs
+++ b/mev-build-rs/src/utils/mod.rs
@@ -1,2 +1,93 @@
-pub mod compat;
-pub mod payload_job;
+pub mod compat {
+    use ethereum_consensus::{
+        deneb::{
+            mainnet as spec,
+            polynomial_commitments::{KzgCommitment, KzgProof},
+            Blob,
+        },
+        primitives::{Bytes32, ExecutionAddress},
+        ssz::prelude::{ByteList, ByteVector, List, U256},
+    };
+    use mev_rs::types::{BlobsBundle, ExecutionPayload};
+    use reth::primitives::{Address, BlobTransactionSidecar, Bloom, SealedBlock, B256};
+
+    pub fn to_bytes32(value: B256) -> Bytes32 {
+        Bytes32::try_from(value.as_ref()).unwrap()
+    }
+
+    pub fn to_bytes20(value: Address) -> ExecutionAddress {
+        ExecutionAddress::try_from(value.as_ref()).unwrap()
+    }
+
+    fn to_byte_vector(value: Bloom) -> ByteVector<256> {
+        ByteVector::<256>::try_from(value.as_ref()).unwrap()
+    }
+
+    // TODO: support multiple forks
+    pub fn to_execution_payload(value: &SealedBlock) -> ExecutionPayload {
+        let hash = value.hash();
+        let header = &value.header;
+        let transactions = &value.body;
+        let withdrawals = &value.withdrawals;
+        let transactions = transactions
+            .iter()
+            .map(|t| spec::Transaction::try_from(t.envelope_encoded().as_ref()).unwrap())
+            .collect::<Vec<_>>();
+        let withdrawals = withdrawals
+            .as_ref()
+            .unwrap()
+            .iter()
+            .map(|w| spec::Withdrawal {
+                index: w.index as usize,
+                validator_index: w.validator_index as usize,
+                address: to_bytes20(w.address),
+                amount: w.amount,
+            })
+            .collect::<Vec<_>>();
+
+        let payload = spec::ExecutionPayload {
+            parent_hash: to_bytes32(header.parent_hash),
+            fee_recipient: to_bytes20(header.beneficiary),
+            state_root: to_bytes32(header.state_root),
+            receipts_root: to_bytes32(header.receipts_root),
+            logs_bloom: to_byte_vector(header.logs_bloom),
+            prev_randao: to_bytes32(header.mix_hash),
+            block_number: header.number,
+            gas_limit: header.gas_limit,
+            gas_used: header.gas_used,
+            timestamp: header.timestamp,
+            extra_data: ByteList::try_from(header.extra_data.as_ref()).unwrap(),
+            base_fee_per_gas: U256::from(header.base_fee_per_gas.unwrap_or_default()),
+            block_hash: to_bytes32(hash),
+            transactions: TryFrom::try_from(transactions).unwrap(),
+            withdrawals: TryFrom::try_from(withdrawals).unwrap(),
+            blob_gas_used: header.blob_gas_used.unwrap(),
+            excess_blob_gas: header.excess_blob_gas.unwrap(),
+        };
+        ExecutionPayload::Deneb(payload)
+    }
+
+    pub fn to_blobs_bundle(sidecars: &[BlobTransactionSidecar]) -> BlobsBundle {
+        let mut commitments = List::default();
+        let mut proofs = List::default();
+        let mut blobs = List::default();
+
+        // TODO: perform length checks to avoid panic on `push`
+        for sidecar in sidecars {
+            for commitment in &sidecar.commitments {
+                let commitment = KzgCommitment::try_from(commitment.as_slice()).unwrap();
+                commitments.push(commitment);
+            }
+            for proof in &sidecar.proofs {
+                let proof = KzgProof::try_from(proof.as_slice()).unwrap();
+                proofs.push(proof);
+            }
+            for blob in &sidecar.blobs {
+                let blob = Blob::try_from(blob.as_ref()).unwrap();
+                blobs.push(blob);
+            }
+        }
+
+        BlobsBundle { commitments, proofs, blobs }
+    }
+}
diff --git a/mev-build-rs/src/utils/payload_job.rs b/mev-build-rs/src/utils/payload_job.rs
deleted file mode 100644
index d96a112b..00000000
--- a/mev-build-rs/src/utils/payload_job.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-use std::sync::Arc;
-use tokio::sync::Semaphore;
-
-#[derive(Debug, Clone)]
-pub struct PayloadTaskGuard(pub Arc<Semaphore>);
-
-impl PayloadTaskGuard {
-    pub fn new(max_payload_tasks: usize) -> Self {
-        Self(Arc::new(Semaphore::new(max_payload_tasks)))
-    }
-}

From 7369e211ab05779bf6e087e467198a7429b8c5b0 Mon Sep 17 00:00:00 2001
From: Alex Stokes <r.alex.stokes@gmail.com>
Date: Tue, 30 Apr 2024 16:13:46 -0600
Subject: [PATCH 3/3] update to latest reth interfaces

---
 Cargo.lock                  |  1 -
 Cargo.toml                  |  1 -
 mev-build-rs/Cargo.toml     |  1 -
 mev-build-rs/src/node.rs    | 19 +++++++++++--------
 mev-build-rs/src/service.rs |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 855b9598..c78a969c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4970,7 +4970,6 @@ dependencies = [
  "reth",
  "reth-basic-payload-builder",
  "reth-db",
- "reth-evm-ethereum",
  "reth-node-ethereum",
  "serde",
  "sha2 0.10.8",
diff --git a/Cargo.toml b/Cargo.toml
index 73cde199..97051daa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,6 @@ beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus",
 reth = { git = "https://github.com/paradigmxyz/reth", rev = "8e65cb3" }
 reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "8e65cb3" }
 reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "8e65cb3" }
-reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "8e65cb3" }
 reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "8e65cb3" }
 alloy-signer = { git = "https://github.com/alloy-rs/alloy", rev = "ca54552" }
 alloy-signer-wallet = { git = "https://github.com/alloy-rs/alloy", rev = "ca54552" }
diff --git a/mev-build-rs/Cargo.toml b/mev-build-rs/Cargo.toml
index 688cdf10..167c4ccb 100644
--- a/mev-build-rs/Cargo.toml
+++ b/mev-build-rs/Cargo.toml
@@ -25,7 +25,6 @@ mev-rs = { path = "../mev-rs" }
 reth = { workspace = true }
 reth-db = { workspace = true }
 reth-node-ethereum = { workspace = true }
-reth-evm-ethereum = { workspace = true }
 reth-basic-payload-builder = { workspace = true }
 alloy-signer = { workspace = true }
 alloy-signer-wallet = { workspace = true, features = ["mnemonic"] }
diff --git a/mev-build-rs/src/node.rs b/mev-build-rs/src/node.rs
index a6e101a6..3703ae13 100644
--- a/mev-build-rs/src/node.rs
+++ b/mev-build-rs/src/node.rs
@@ -19,8 +19,9 @@ use reth::{
         ExecutionPayloadV1,
     },
 };
-use reth_evm_ethereum::EthEvmConfig;
-use reth_node_ethereum::node::{EthereumNetworkBuilder, EthereumPoolBuilder};
+use reth_node_ethereum::node::{
+    EthereumExecutorBuilder, EthereumNetworkBuilder, EthereumPoolBuilder,
+};
 
 #[derive(Debug, Default, Clone, Copy)]
 pub struct BuilderNode;
@@ -29,7 +30,13 @@ impl BuilderNode {
     /// Returns a [ComponentsBuilder] configured for a regular Ethereum node.
     pub fn components_with<Node>(
         payload_service_builder: PayloadServiceBuilder,
-    ) -> ComponentsBuilder<Node, EthereumPoolBuilder, PayloadServiceBuilder, EthereumNetworkBuilder>
+    ) -> ComponentsBuilder<
+        Node,
+        EthereumPoolBuilder,
+        PayloadServiceBuilder,
+        EthereumNetworkBuilder,
+        EthereumExecutorBuilder,
+    >
     where
         Node: FullNodeTypes<Engine = BuilderEngineTypes>,
     {
@@ -38,17 +45,13 @@ impl BuilderNode {
             .pool(EthereumPoolBuilder::default())
             .payload(payload_service_builder)
             .network(EthereumNetworkBuilder::default())
+            .executor(EthereumExecutorBuilder::default())
     }
 }
 
 impl NodeTypes for BuilderNode {
     type Primitives = ();
     type Engine = BuilderEngineTypes;
-    type Evm = EthEvmConfig;
-
-    fn evm_config(&self) -> Self::Evm {
-        EthEvmConfig::default()
-    }
 }
 
 #[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
diff --git a/mev-build-rs/src/service.rs b/mev-build-rs/src/service.rs
index 59efe976..b5611099 100644
--- a/mev-build-rs/src/service.rs
+++ b/mev-build-rs/src/service.rs
@@ -114,7 +114,7 @@ pub async fn launch(
     let payload_builder = PayloadServiceBuilder::try_from(&config.builder)?;
 
     let handle = node_builder
-        .with_types(BuilderNode)
+        .with_types::<BuilderNode>()
         .with_components(BuilderNode::components_with(payload_builder))
         .launch()
         .await?;