Skip to content

Custom engine API to share FCU between other builders #65

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.

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 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
773 changes: 391 additions & 382 deletions Cargo.lock

Large diffs are not rendered by default.

146 changes: 73 additions & 73 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,65 +40,67 @@ codegen-units = 1
incremental = false

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

# reth optimism
reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" }
reth-optimism-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" }
reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" }
reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" }
reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" }
reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" }
reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" }
reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" }
reth-optimism-txpool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1" }
reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.1", features = [
"client",
] }
reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
reth-optimism-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" , features = ["client"]}
reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }
reth-optimism-txpool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.3" }

# compatible with reth "v1.4.1 dependencies
# compatible with reth "v1.4.3 dependencies
revm = { version = "23.1.0", features = [
"std",
"secp256k1",
"optional_balance_check",
], default-features = false }
revm-inspectors = { version = "0.22.0", default-features = false }
revm-inspectors = { version = "0.22.3", default-features = false }
op-revm = { version = "4.0.2", default-features = false }

ethereum_ssz_derive = "0.9.0"
Expand All @@ -107,33 +109,29 @@ ethereum_ssz = "0.9.0"
alloy-primitives = { version = "1.1.0", default-features = false }
alloy-rlp = "0.3.10"
alloy-chains = "0.2.0"
alloy-evm = { version = "0.8.0", default-features = false }
alloy-provider = { version = "1.0.3", features = [
"ipc",
"pubsub",
"txpool-api",
] }
alloy-pubsub = { version = "1.0.3" }
alloy-eips = { version = "1.0.3" }
alloy-rpc-types = { version = "1.0.3" }
alloy-json-rpc = { version = "1.0.3" }
alloy-transport-http = { version = "1.0.3" }
alloy-network = { version = "1.0.3" }
alloy-network-primitives = { version = "1.0.3" }
alloy-transport = { version = "1.0.3" }
alloy-node-bindings = { version = "1.0.3" }
alloy-consensus = { version = "1.0.3", features = ["kzg"] }
alloy-serde = { version = "1.0.3" }
alloy-rpc-types-beacon = { version = "1.0.3", features = ["ssz"] }
alloy-rpc-types-engine = { version = "1.0.3", features = ["ssz"] }
alloy-rpc-types-eth = { version = "1.0.3" }
alloy-signer-local = { version = "1.0.3" }
alloy-rpc-client = { version = "1.0.3" }
alloy-genesis = { version = "1.0.3" }
alloy-evm = { version = "0.8.1", default-features = false }
alloy-provider = { version = "1.0.5", features = ["ipc", "pubsub", "txpool-api", "engine-api"] }
alloy-pubsub = { version = "1.0.5" }
alloy-eips = { version = "1.0.5" }
alloy-rpc-types = { version = "1.0.5" }
alloy-json-rpc = { version = "1.0.5" }
alloy-transport-http = { version = "1.0.5" }
alloy-network = { version = "1.0.5" }
alloy-network-primitives = { version = "1.0.5" }
alloy-transport = { version = "1.0.5" }
alloy-node-bindings = { version = "1.0.5" }
alloy-consensus = { version = "1.0.5", features = ["kzg"] }
alloy-serde = { version = "1.0.5" }
alloy-rpc-types-beacon = { version = "1.0.5", features = ["ssz"] }
alloy-rpc-types-engine = { version = "1.0.5", features = ["ssz"] }
alloy-rpc-types-eth = { version = "1.0.5" }
alloy-signer-local = { version = "1.0.5" }
alloy-rpc-client = { version = "1.0.5" }
alloy-genesis = { version = "1.0.5" }
alloy-trie = { version = "0.8.1" }

# optimism
alloy-op-evm = { version = "0.8.0", default-features = false }
alloy-op-evm = { version = "0.8.1", default-features = false }
op-alloy-rpc-types = { version = "0.16.0", default-features = false }
op-alloy-rpc-types-engine = { version = "0.16.0", default-features = false }
op-alloy-rpc-jsonrpsee = { version = "0.16.0", default-features = false }
Expand All @@ -148,13 +146,15 @@ thiserror = { version = "1.0.64" }
eyre = { version = "0.6.12" }
jsonrpsee = { version = "0.25.1" }
jsonrpsee-types = { version = "0.25.1" }
jsonrpsee-core = { version = "0.25.1" }
parking_lot = { version = "0.12.3" }
tokio = { version = "1.40.0" }
auto_impl = { version = "1.2.0" }
reqwest = { version = "0.12.8" }
serde = { version = "1.0.210" }
serde_json = { version = "1.0.128" }
serde_with = { version = "3.8.1" }
toml = { version = "0.8" }
secp256k1 = { version = "0.30" }
derive_more = { version = "2" }
tokio-stream = "0.1.16"
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ lt: lint test ## Run "lint" and "test"
.PHONY: fmt
fmt: ## Format the code
cargo +nightly fmt
cargo +nightly fix --allow-staged
cargo +nightly clippy --features "$(FEATURES)" --fix --allow-staged
cargo +nightly clippy -p op-rbuilder --features "$(FEATURES)" --fix --allow-staged
cargo +nightly clippy --features "$(FEATURES)" --fix --allow-staged --allow-dirty
cargo +nightly clippy -p op-rbuilder --features "$(FEATURES)" --fix --allow-staged --allow-dirty
cargo +nightly fix --allow-staged --allow-dirty

.PHONY: bench
bench: ## Run benchmarks
Expand Down
13 changes: 11 additions & 2 deletions crates/op-rbuilder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ repository.workspace = true
reth.workspace = true
reth-optimism-node.workspace = true
reth-optimism-cli.workspace = true
reth-optimism-rpc.workspace = true
reth-optimism-chainspec.workspace = true
reth-optimism-payload-builder.workspace = true
reth-optimism-evm.workspace = true
Expand All @@ -26,6 +27,8 @@ reth-chainspec.workspace = true
reth-primitives.workspace = true
reth-primitives-traits.workspace = true
reth-node-api.workspace = true
reth-rpc-engine-api.workspace = true
reth-node-core.workspace = true
reth-basic-payload-builder.workspace = true
reth-payload-builder.workspace = true
reth-node-ethereum.workspace = true
Expand All @@ -43,8 +46,10 @@ reth-network-peers.workspace = true
reth-testing-utils.workspace = true
reth-optimism-forks.workspace = true
reth-node-builder.workspace = true
reth-storage-api.workspace = true
reth-rpc-api.workspace = true
reth-rpc-eth-types.workspace = true
reth-optimism-rpc.workspace = true
reth-tasks.workspace = true

alloy-primitives.workspace = true
alloy-consensus.workspace = true
Expand Down Expand Up @@ -75,10 +80,12 @@ tracing.workspace = true
eyre.workspace = true
serde_with.workspace = true
serde.workspace = true
toml.workspace = true
secp256k1.workspace = true
tokio.workspace = true
jsonrpsee = { workspace = true }
jsonrpsee-types.workspace = true
jsonrpsee-core = { workspace = true }
jsonrpsee-types = { workspace = true }
async-trait = { workspace = true }
clap_builder = { workspace = true }
clap.workspace = true
Expand All @@ -89,6 +96,7 @@ tokio-util.workspace = true
thiserror.workspace = true
parking_lot.workspace = true
url.workspace = true
anyhow = "1"

tower = "0.5"
futures = "0.3"
Expand Down Expand Up @@ -117,6 +125,7 @@ vergen-git2.workspace = true
alloy-provider = { workspace = true, default-features = true, features = [
"txpool-api",
] }
tempfile = "3.8"

[features]
default = ["jemalloc"]
Expand Down
Loading
Loading