jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

renamed OptimismPayloadBuilderError to OpPayloadBuilderError (#12364)

Browse Source
This commit is contained in:
Steven
2024-11-07 02:56:16 -06:00
committed by GitHub
parent 2d945292ac
commit 8e8a1a827d
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/optimism/payload/src/builder.rs
View File

@ -35,7 +35,7 @@ use revm::{
use tracing::{debug, trace, warn}; use tracing::{debug, trace, warn};
use crate::{ use crate::{
error::OptimismPayloadBuilderError, error::OpPayloadBuilderError,
payload::{OpBuiltPayload, OpPayloadBuilderAttributes}, payload::{OpBuiltPayload, OpPayloadBuilderAttributes},
}; };
use op_alloy_consensus::DepositTransaction; use op_alloy_consensus::DepositTransaction;
@ -589,7 +589,7 @@ impl<EvmConfig> OpPayloadBuilderCtx<EvmConfig> {
) )
.map_err(|err| { .map_err(|err| {
warn!(target: "payload_builder", %err, "missing create2 deployer, skipping block."); warn!(target: "payload_builder", %err, "missing create2 deployer, skipping block.");
PayloadBuilderError::other(OptimismPayloadBuilderError::ForceCreate2DeployerFail) PayloadBuilderError::other(OpPayloadBuilderError::ForceCreate2DeployerFail)
}) })
} }
} }
@ -640,7 +640,7 @@ where
// A sequencer's block should never contain blob transactions. // A sequencer's block should never contain blob transactions.
if sequencer_tx.value().is_eip4844() { if sequencer_tx.value().is_eip4844() {
return Err(PayloadBuilderError::other( return Err(PayloadBuilderError::other(
OptimismPayloadBuilderError::BlobTransactionRejected, OpPayloadBuilderError::BlobTransactionRejected,
)) ))
} }
@ -650,9 +650,7 @@ where
// will just pull in its `from` address. // will just pull in its `from` address.
let sequencer_tx = let sequencer_tx =
sequencer_tx.value().clone().try_into_ecrecovered().map_err(|_| { sequencer_tx.value().clone().try_into_ecrecovered().map_err(|_| {
PayloadBuilderError::other( PayloadBuilderError::other(OpPayloadBuilderError::TransactionEcRecoverFailed)
OptimismPayloadBuilderError::TransactionEcRecoverFailed,
)
})?; })?;
// Cache the depositor account prior to the state transition for the deposit nonce. // Cache the depositor account prior to the state transition for the deposit nonce.
@ -667,7 +665,7 @@ where
}) })
.transpose() .transpose()
.map_err(|_| { .map_err(|_| {
PayloadBuilderError::other(OptimismPayloadBuilderError::AccountLoadFailed( PayloadBuilderError::other(OpPayloadBuilderError::AccountLoadFailed(
sequencer_tx.signer(), sequencer_tx.signer(),
)) ))
})?; })?;

2
crates/optimism/payload/src/error.rs
View File

@ -2,7 +2,7 @@
/// Optimism specific payload building errors. /// Optimism specific payload building errors.
#[derive(Debug, thiserror::Error)] #[derive(Debug, thiserror::Error)]
pub enum OptimismPayloadBuilderError { pub enum OpPayloadBuilderError {
/// Thrown when a transaction fails to convert to a /// Thrown when a transaction fails to convert to a
/// [`reth_primitives::TransactionSignedEcRecovered`]. /// [`reth_primitives::TransactionSignedEcRecovered`].
#[error("failed to convert deposit transaction to TransactionSignedEcRecovered")] #[error("failed to convert deposit transaction to TransactionSignedEcRecovered")]