Skip to content

Rebase on reth with pending pool fix #593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: develop
Choose a base branch
from
+817 −587
Open

Rebase on reth with pending pool fix #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
274ccd2
Rebase on reth with pending pool fix
SozinM Apr 28, 2025
87d82f0
Update rollup-boost
SozinM Apr 28, 2025
98306f9
Add e2e test for pool
SozinM Apr 28, 2025
fbf0bd9
fmt + test fix
SozinM Apr 28, 2025
13db961
fmt + test fix
SozinM Apr 28, 2025
386b427
add changes to the flashblocks
SozinM Apr 28, 2025
a4cdf26
fix test
SozinM Apr 28, 2025
7a27444
test
SozinM Apr 28, 2025
444f904
repr example for the reth team
SozinM Apr 28, 2025
89a10ed
Test is working
SozinM Apr 29, 2025
6783e52
Bump reth version to fix bundle error
SozinM May 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,000 changes: 565 additions & 435 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

134 changes: 67 additions & 67 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[workspace.package]
version = "0.1.0"
edition = "2021"
rust-version = "1.85"
rust-version = "1.86"
license = "MIT OR Apache-2.0"
homepage = "https://github.com/flashbots/rbuilder"
repository = "https://github.com/flashbots/rbuilder"
Expand Down Expand Up @@ -48,58 +48,58 @@ codegen-units = 1
incremental = false

[workspace.dependencies]
reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-chain-state = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-trie-parallel = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-node-core = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12", features = [
reth = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-chain-state = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-cli-util = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-db-common = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-errors = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-node-api = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-trie = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-trie-parallel = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-node-core = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01", features = [
"test-utils",
] }
reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-metrics = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-execution-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-payload-builder-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-payload-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-rpc-layer = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-testing-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-exex = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-metrics = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-trie-db = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-execution-types = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-revm = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-payload-builder-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-payload-util = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-rpc-layer = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-testing-utils = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }

# reth optimism
reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-optimism-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-optimism-txpool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-optimism-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }
reth-optimism-txpool = { git = "https://github.com/paradigmxyz/reth", rev = "b93f4c6080e19d49af503fad15a19806647fde01" }

# compatible with reth "v1.3.12 dependencies
revm = { version = "22.0.1", features = [
"std",
"secp256k1",
"optional_balance_check",
], default-features = false }
revm-inspectors = { version = "0.19.0", default-features = false }
revm-inspectors = { version = "0.20.0", default-features = false }
op-revm = { version = "3.0.2", default-features = false }

ethereum_ssz_derive = "0.9.0"
Expand All @@ -108,34 +108,34 @@ ethereum_ssz = "0.9.0"
alloy-primitives = { version = "1.0.0", default-features = false }
alloy-rlp = "0.3.10"
alloy-chains = "0.2.0"
alloy-evm = { version = "0.5.0", default-features = false }
alloy-provider = { version = "0.14.0", features = ["ipc", "pubsub"] }
alloy-pubsub = { version = "0.14.0" }
alloy-eips = { version = "0.14.0" }
alloy-rpc-types = { version = "0.14.0" }
alloy-json-rpc = { version = "0.14.0" }
alloy-transport-http = { version = "0.14.0" }
alloy-network = { version = "0.14.0" }
alloy-network-primitives = { version = "0.14.0" }
alloy-transport = { version = "0.14.0" }
alloy-node-bindings = { version = "0.14.0" }
alloy-consensus = { version = "0.14.0", features = ["kzg"] }
alloy-serde = { version = "0.14.0" }
alloy-rpc-types-beacon = { version = "0.14.0", features = ["ssz"] }
alloy-rpc-types-engine = { version = "0.14.0", features = ["ssz"] }
alloy-rpc-types-eth = { version = "0.14.0" }
alloy-signer-local = { version = "0.14.0" }
alloy-rpc-client = { version = "0.14.0" }
alloy-genesis = { version = "0.14.0" }
alloy-evm = { version = "0.6.0", default-features = false }
alloy-provider = { version = "0.15.5", features = ["ipc", "pubsub"] }
alloy-pubsub = { version = "0.15.5" }
alloy-eips = { version = "0.15.5" }
alloy-rpc-types = { version = "0.15.5" }
alloy-json-rpc = { version = "0.15.5" }
alloy-transport-http = { version = "0.15.5" }
alloy-network = { version = "0.15.5" }
alloy-network-primitives = { version = "0.15.5" }
alloy-transport = { version = "0.15.5" }
alloy-node-bindings = { version = "0.15.5" }
alloy-consensus = { version = "0.15.5", features = ["kzg"] }
alloy-serde = { version = "0.15.5" }
alloy-rpc-types-beacon = { version = "0.15.5", features = ["ssz"] }
alloy-rpc-types-engine = { version = "0.15.5", features = ["ssz"] }
alloy-rpc-types-eth = { version = "0.15.5" }
alloy-signer-local = { version = "0.15.5" }
alloy-rpc-client = { version = "0.15.5" }
alloy-genesis = { version = "0.15.5" }
alloy-trie = { version = "0.8.1" }

# optimism
alloy-op-evm = { version = "0.5.0", default-features = false }
op-alloy-rpc-types = { version = "0.14.1", default-features = false }
op-alloy-rpc-types-engine = { version = "0.14.1", default-features = false }
op-alloy-rpc-jsonrpsee = { version = "0.14.1", default-features = false }
op-alloy-network = { version = "0.14.1", default-features = false }
op-alloy-consensus = { version = "0.14.1", default-features = false }
alloy-op-evm = { version = "0.6.0", default-features = false }
op-alloy-rpc-types = { version = "0.15.0", default-features = false }
op-alloy-rpc-types-engine = { version = "0.15.0", default-features = false }
op-alloy-rpc-jsonrpsee = { version = "0.15.0", default-features = false }
op-alloy-network = { version = "0.15.0", default-features = false }
op-alloy-consensus = { version = "0.15.0", default-features = false }

async-trait = { version = "0.1.83" }
clap = { version = "4.4.3", features = ["derive", "env"] }
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
ARG FEATURES
ARG RBUILDER_BIN="rbuilder"

FROM rust:1.85 AS base
FROM rust:1.86 AS base
ARG TARGETPLATFORM

RUN apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.op-rbuilder
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
ARG FEATURES
ARG RBUILDER_BIN="op-rbuilder"

FROM rust:1.85 AS base
FROM rust:1.86 AS base
ARG TARGETPLATFORM

RUN apt-get update \
Expand Down
6 changes: 4 additions & 2 deletions crates/op-rbuilder/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ rand = "0.9.0"
tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] }

# `flashblocks` branch
rollup-boost = { git = "http://github.com/flashbots/rollup-boost", rev = "60885346d4cf7f241de82790478195747433d472" }
rollup-boost = { git = "http://github.com/flashbots/rollup-boost", rev = "7a184c37f2a0ad1b3e24ab35687d57ead04d11ff" }

[target.'cfg(unix)'.dependencies]
tikv-jemallocator = { version = "0.6", optional = true }
Expand All @@ -115,7 +115,9 @@ min-info-logs = ["tracing/release_max_level_info"]
min-debug-logs = ["tracing/release_max_level_debug"]
min-trace-logs = ["tracing/release_max_level_trace"]

integration = []
integration = [
"alloy-provider/txpool-api"
]
flashblocks = []

[[bin]]
Expand Down
Loading
Loading