Skip to content

Commit

Permalink
fix(op): activate node-api optimism feature (#6065)
Browse files Browse the repository at this point in the history
  • Loading branch information
mattsse authored Jan 14, 2024
1 parent 220a271 commit cb515d4
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 5 deletions.
1 change: 1 addition & 0 deletions bin/reth/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ optimism = [
"reth-payload-builder/optimism",
"reth-optimism-payload-builder/optimism",
"reth-ethereum-payload-builder/optimism",
"reth-node-api/optimism",
]

# no-op feature flag for switching between the `optimism` and default functionality in CI matrices
Expand Down
3 changes: 3 additions & 0 deletions crates/node-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ serde.workspace = true
[dev-dependencies]
# for examples
reth-payload-builder.workspace = true

[features]
optimism = []
1 change: 1 addition & 0 deletions crates/payload/basic/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,7 @@ where
// with this branch. remove this branch from the non-op code. remove
// `on_missing_payload` requirement from builder trait
if let Some(payload) = self.builder.on_missing_payload(args) {
debug!(target: "payload_builder", id=%self.config.payload_id(), "resolving fallback payload as best payload");
return (
ResolveBestPayload { best_payload: Some(payload), maybe_better, empty_payload },
KeepPayloadJobAlive::Yes,
Expand Down
8 changes: 4 additions & 4 deletions crates/payload/builder/src/optimism.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ impl PayloadBuilderAttributes for OptimismPayloadBuilderAttributes {
})
}

fn parent(&self) -> B256 {
self.payload_attributes.parent
}

fn payload_id(&self) -> PayloadId {
self.payload_attributes.id
}

fn parent(&self) -> B256 {
self.payload_attributes.parent
}

fn timestamp(&self) -> u64 {
self.payload_attributes.timestamp
}
Expand Down
7 changes: 6 additions & 1 deletion crates/payload/optimism/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@ mod builder {
Client: StateProviderFactory,
Pool: TransactionPool,
{
debug_assert!(
args.config.initialized_cfg.optimism,
"optimism payload builder called on non-optimism chain"
);

let BuildArguments { client, pool, mut cached_reads, config, cancel, best_payload } = args;

let state_provider = client.state_by_block_hash(config.parent_block.hash)?;
Expand Down Expand Up @@ -212,7 +217,7 @@ mod builder {
Err(err) => {
match err {
EVMError::Transaction(err) => {
trace!(target: "optimism_payload_builder", ?err, ?sequencer_tx, "Error in sequencer transaction, skipping.");
trace!(target: "payload_builder", ?err, ?sequencer_tx, "Error in sequencer transaction, skipping.");
continue
}
err => {
Expand Down

0 comments on commit cb515d4

Please sign in to comment.