Skip to content
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
48 changes: 24 additions & 24 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -113,39 +113,39 @@ parking_lot = "0.12"
metrics = "0.24.0"

# Alloy dependencies
alloy-origin = { version = "1.0.37", package = "alloy", features = [
alloy-origin = { version = "1.0.41", package = "alloy", features = [
"k256",
"rpc-types-mev",
] }
alloy-evm = "0.21.2"
alloy-serde = "1.0.37"
alloy-evm = "0.23.0"
alloy-serde = "1.0.41"

# Reth dependencies
reth-origin = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2", package = "reth" }
reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
reth-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
reth-rpc-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
reth-ethereum-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
reth-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2", features = [
reth-origin = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.2", package = "reth" }
reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.2" }
reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.2" }
reth-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.2" }
reth-rpc-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.2" }
reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.2" }
reth-ethereum-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.2" }
reth-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.2", features = [
"node",
"evm",
] }
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
reth-node-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2" }
reth-ipc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2", optional = true }
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.2" }
reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.2" }
reth-node-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.2" }
reth-ipc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.2", optional = true }

# Reth-optimism dependencies (optional)
op-alloy = { version = "0.20.0", features = ["full"], optional = true }
reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2", optional = true }
reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2", optional = true }
reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2", optional = true }
reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2", optional = true }
reth-payload-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2", optional = true }
reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2", optional = true }
reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.8.2", optional = true }
op-alloy = { version = "0.22.0", features = ["full"], optional = true }
reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.2", optional = true }
reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.2", optional = true }
reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.2", optional = true }
reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.2", optional = true }
reth-payload-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.2", optional = true }
reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.2", optional = true }
reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.9.2", optional = true }

# test-utils
rblib-tests-macros = { path = "src/test_utils/macros", optional = true }
Expand All @@ -154,7 +154,7 @@ nanoid = { version = "0.4", optional = true }
alloy-genesis = { version = "1.0", default-features = false, optional = true }
rand = { version = "0.9", optional = true }
ctor = { version = "0.5", optional = true }
tracing-subscriber = { version = "0.3", features = [
tracing-subscriber = { version = "0.3.20", features = [
"env-filter",
"json",
], optional = true }
Expand Down
12 changes: 6 additions & 6 deletions src/platform/ethereum/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,8 @@ where
.map_err(PayloadBuilderError::other)?;

let mut cumulative_gas_used = 0;
let block_gas_limit: u64 = builder.evm_mut().block().gas_limit;
let base_fee = builder.evm_mut().block().basefee;
let block_gas_limit: u64 = builder.evm_mut().block().gas_limit();
let base_fee = builder.evm_mut().block().basefee();

let mut best_txs = best_txs(BestTransactionsAttributes::new(
base_fee,
Expand Down Expand Up @@ -272,10 +272,10 @@ where
if is_osaka && estimated_block_size_with_tx > MAX_RLP_BLOCK_SIZE {
best_txs.mark_invalid(
&pool_tx,
InvalidPoolTransactionError::OversizedData(
estimated_block_size_with_tx,
MAX_RLP_BLOCK_SIZE,
),
InvalidPoolTransactionError::OversizedData {
size: estimated_block_size_with_tx,
limit: MAX_RLP_BLOCK_SIZE,
},
);
continue;
}
Expand Down
14 changes: 12 additions & 2 deletions src/platform/optimism/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,14 @@ use {
chainspec::EthChainSpec,
optimism::{
forks::OpHardforks,
node::{payload::builder::*, txpool::OpPooledTransaction, *},
node::{
payload::{
builder::*,
config::{OpBuilderConfig, OpGasLimitConfig},
},
txpool::OpPooledTransaction,
*,
},
},
payload::{builder::*, util::PayloadTransactionsFixed},
primitives::Recovered,
Expand Down Expand Up @@ -102,7 +109,10 @@ impl Platform for Optimism {

let context = OpPayloadBuilderCtx {
evm_config: block.evm_config(),
da_config: OpDAConfig::default(),
builder_config: OpBuilderConfig::new(
OpDAConfig::default(),
OpGasLimitConfig::default(),
),
chain_spec: block.chainspec().clone(),
config: PayloadConfig::<types::PayloadBuilderAttributes<P>, _>::new(
block.parent().clone().into(),
Expand Down
Loading