Add permit flashtestations tx calls from builder #285
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -2,7 +2,7 @@ use alloy_consensus::TxEip1559; | |||||||
| use alloy_eips::Encodable2718; | ||||||||
| use alloy_evm::{Database, Evm}; | ||||||||
| use alloy_op_evm::OpEvm; | ||||||||
| use alloy_primitives::{Address, TxKind}; | ||||||||
| use alloy_sol_types::{Error, SolCall, SolEvent, SolInterface, sol}; | ||||||||
| use core::fmt::Debug; | ||||||||
| use op_alloy_consensus::OpTypedTransaction; | ||||||||
|
|
@@ -11,8 +11,9 @@ use reth_evm::{ConfigureEvm, precompiles::PrecompilesMap}; | |||||||
| use reth_optimism_primitives::OpTransactionSigned; | ||||||||
| use reth_primitives::Recovered; | ||||||||
| use reth_provider::StateProvider; | ||||||||
| use reth_revm::State; | ||||||||
| use revm::{ | ||||||||
| DatabaseRef, | ||||||||
| context::result::{ExecutionResult, ResultAndState}, | ||||||||
| inspector::NoOpInspector, | ||||||||
| }; | ||||||||
|
|
@@ -21,9 +22,10 @@ use tracing::warn; | |||||||
| use crate::{ | ||||||||
| builders::{ | ||||||||
| BuilderTransactionCtx, BuilderTransactionError, BuilderTransactions, | ||||||||
| InvalidContractDataError, | ||||||||
| builder_tx::{BuilderTxBase, get_nonce}, | ||||||||
| context::OpPayloadBuilderCtx, | ||||||||
| flashblocks::payload::{FlashblocksExecutionInfo, FlashblocksExtraCtx}, | ||||||||
| }, | ||||||||
| flashtestations::builder_tx::FlashtestationsBuilderTx, | ||||||||
| primitives::reth::ExecutionInfo, | ||||||||
|
|
@@ -53,8 +55,6 @@ sol!( | |||||||
| pub(super) enum FlashblockNumberError { | ||||||||
| #[error("flashblocks number contract tx reverted: {0:?}")] | ||||||||
| Revert(IFlashblockNumber::IFlashblockNumberErrors), | ||||||||
| #[error("unknown revert: {0} err: {1}")] | ||||||||
| Unknown(String, Error), | ||||||||
| #[error("halt: {0:?}")] | ||||||||
|
|
@@ -64,14 +64,17 @@ pub(super) enum FlashblockNumberError { | |||||||
| // This will be the end of block transaction of a regular block | ||||||||
| #[derive(Debug, Clone)] | ||||||||
| pub(super) struct FlashblocksBuilderTx { | ||||||||
| pub base_builder_tx: BuilderTxBase<FlashblocksExtraCtx>, | ||||||||
| pub flashtestations_builder_tx: | ||||||||
| Option<FlashtestationsBuilderTx<FlashblocksExtraCtx, FlashblocksExecutionInfo>>, | ||||||||
| } | ||||||||
|
|
||||||||
| impl FlashblocksBuilderTx { | ||||||||
| pub(super) fn new( | ||||||||
| signer: Option<Signer>, | ||||||||
| flashtestations_builder_tx: Option< | ||||||||
| FlashtestationsBuilderTx<FlashblocksExtraCtx, FlashblocksExecutionInfo>, | ||||||||
| >, | ||||||||
| ) -> Self { | ||||||||
| let base_builder_tx = BuilderTxBase::new(signer); | ||||||||
| Self { | ||||||||
|
|
@@ -81,40 +84,46 @@ impl FlashblocksBuilderTx { | |||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| impl BuilderTransactions<FlashblocksExtraCtx, FlashblocksExecutionInfo> for FlashblocksBuilderTx { | ||||||||
| fn simulate_builder_txs( | ||||||||
| &self, | ||||||||
| state_provider: impl StateProvider + Clone, | ||||||||
| info: &mut ExecutionInfo<FlashblocksExecutionInfo>, | ||||||||
| ctx: &OpPayloadBuilderCtx<FlashblocksExtraCtx>, | ||||||||
| db: &mut State<impl Database + DatabaseRef>, | ||||||||
| top_of_block: bool, | ||||||||
| ) -> Result<Vec<BuilderTransactionCtx>, BuilderTransactionError> { | ||||||||
| let mut builder_txs = Vec::<BuilderTransactionCtx>::new(); | ||||||||
|
|
||||||||
| if ctx.is_first_flashblock() { | ||||||||
| let flashblocks_builder_tx = self.base_builder_tx.simulate_builder_tx(ctx, &mut *db)?; | ||||||||
| builder_txs.extend(flashblocks_builder_tx.clone()); | ||||||||
| } | ||||||||
|
|
||||||||
| if ctx.is_last_flashblock() { | ||||||||
| let base_tx = self.base_builder_tx.simulate_builder_tx(ctx, &mut *db)?; | ||||||||
| builder_txs.extend(base_tx.clone()); | ||||||||
|
|
||||||||
| if let Some(flashtestations_builder_tx) = &self.flashtestations_builder_tx { | ||||||||
| // Commit state that is included to get the correct nonce | ||||||||
| if let Some(builder_tx) = base_tx { | ||||||||
| self.commit_txs(vec![builder_tx.signed_tx], ctx, db)?; | ||||||||
| } | ||||||||
| // We only include flashtestations txs in the last flashblock | ||||||||
| match flashtestations_builder_tx.simulate_builder_txs( | ||||||||
| state_provider, | ||||||||
| info, | ||||||||
| ctx, | ||||||||
| db, | ||||||||
| top_of_block, | ||||||||
| ) { | ||||||||
| Ok(flashtestations_builder_txs) => { | ||||||||
| builder_txs.extend(flashtestations_builder_txs) | ||||||||
| } | ||||||||
| Err(e) => { | ||||||||
| warn!(target: "flashtestations", error = ?e, "failed to add flashtestations builder tx") | ||||||||
| } | ||||||||
| } | ||||||||
| } | ||||||||
| } | ||||||||
| Ok(builder_txs) | ||||||||
|
|
@@ -126,15 +135,18 @@ impl BuilderTransactions<FlashblocksExtraCtx> for FlashblocksBuilderTx { | |||||||
| pub(super) struct FlashblocksNumberBuilderTx { | ||||||||
| pub signer: Option<Signer>, | ||||||||
| pub flashblock_number_address: Address, | ||||||||
| pub base_builder_tx: BuilderTxBase<FlashblocksExtraCtx>, | ||||||||
| pub flashtestations_builder_tx: | ||||||||
| Option<FlashtestationsBuilderTx<FlashblocksExtraCtx, FlashblocksExecutionInfo>>, | ||||||||
| } | ||||||||
|
|
||||||||
| impl FlashblocksNumberBuilderTx { | ||||||||
| pub(super) fn new( | ||||||||
| signer: Option<Signer>, | ||||||||
| flashblock_number_address: Address, | ||||||||
| flashtestations_builder_tx: Option< | ||||||||
| FlashtestationsBuilderTx<FlashblocksExtraCtx, FlashblocksExecutionInfo>, | ||||||||
| >, | ||||||||
| ) -> Self { | ||||||||
| let base_builder_tx = BuilderTxBase::new(signer); | ||||||||
| Self { | ||||||||
|
|
@@ -145,14 +157,11 @@ impl FlashblocksNumberBuilderTx { | |||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| // TODO: remove and clean up in favour of simulate_call() | ||||||||
|
There was a problem hiding this comment. The TODO suggests removing this function in favor of
Suggested change
|
||||||||
| fn estimate_flashblock_number_tx_gas( | ||||||||
| &self, | ||||||||
| ctx: &OpPayloadBuilderCtx<FlashblocksExtraCtx>, | ||||||||
| evm: &mut OpEvm<impl Database, NoOpInspector, PrecompilesMap>, | ||||||||
| signer: &Signer, | ||||||||
| nonce: u64, | ||||||||
| ) -> Result<u64, BuilderTransactionError> { | ||||||||
|
|
@@ -166,15 +175,17 @@ impl FlashblocksNumberBuilderTx { | |||||||
|
|
||||||||
| match result { | ||||||||
| ExecutionResult::Success { gas_used, logs, .. } => { | ||||||||
| if logs.iter().any(|log| { | ||||||||
| log.topics().first() | ||||||||
| == Some(&IFlashblockNumber::FlashblockIncremented::SIGNATURE_HASH) | ||||||||
| }) { | ||||||||
| Ok(gas_used) | ||||||||
| } else { | ||||||||
| Err(BuilderTransactionError::InvalidContract( | ||||||||
| self.flashblock_number_address, | ||||||||
| InvalidContractDataError::InvalidLogs( | ||||||||
| vec![IFlashblockNumber::FlashblockIncremented::SIGNATURE_HASH], | ||||||||
| vec![], | ||||||||
|
There was a problem hiding this comment. Do we want to put actual logs in there? There was a problem hiding this comment. no planning to deprecate this soon after permit changes are tested and merged |
||||||||
| ), | ||||||||
| )) | ||||||||
| } | ||||||||
|
|
@@ -213,33 +224,29 @@ impl FlashblocksNumberBuilderTx { | |||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| impl BuilderTransactions<FlashblocksExtraCtx, FlashblocksExecutionInfo> | ||||||||
| for FlashblocksNumberBuilderTx | ||||||||
| { | ||||||||
| fn simulate_builder_txs( | ||||||||
| &self, | ||||||||
| state_provider: impl StateProvider + Clone, | ||||||||
| info: &mut ExecutionInfo<FlashblocksExecutionInfo>, | ||||||||
| ctx: &OpPayloadBuilderCtx<FlashblocksExtraCtx>, | ||||||||
| db: &mut State<impl Database + DatabaseRef>, | ||||||||
| top_of_block: bool, | ||||||||
| ) -> Result<Vec<BuilderTransactionCtx>, BuilderTransactionError> { | ||||||||
| let mut builder_txs = Vec::<BuilderTransactionCtx>::new(); | ||||||||
|
|
||||||||
| if ctx.is_first_flashblock() { | ||||||||
| // fallback block builder tx | ||||||||
| builder_txs.extend(self.base_builder_tx.simulate_builder_tx(ctx, &mut *db)?); | ||||||||
| } else { | ||||||||
| // we increment the flashblock number for the next flashblock so we don't increment in the last flashblock | ||||||||
| if let Some(signer) = &self.signer { | ||||||||
| let mut evm = ctx.evm_config.evm_with_env(&mut *db, ctx.evm_env.clone()); | ||||||||
| evm.modify_cfg(|cfg| { | ||||||||
| cfg.disable_balance_check = true; | ||||||||
| cfg.disable_block_gas_limit = true; | ||||||||
| }); | ||||||||
|
|
||||||||
| let nonce = get_nonce(evm.db_mut(), signer.address)?; | ||||||||
|
|
@@ -268,7 +275,7 @@ impl BuilderTransactions<FlashblocksExtraCtx> for FlashblocksNumberBuilderTx { | |||||||
| Err(e) => { | ||||||||
| warn!(target: "builder_tx", error = ?e, "Flashblocks number contract tx simulation failed, defaulting to fallback builder tx"); | ||||||||
| self.base_builder_tx | ||||||||
| .simulate_builder_tx(ctx, &mut *db)? | ||||||||
| .map(|tx| tx.set_top_of_block()) | ||||||||
| } | ||||||||
| }; | ||||||||
|
|
@@ -279,21 +286,29 @@ impl BuilderTransactions<FlashblocksExtraCtx> for FlashblocksNumberBuilderTx { | |||||||
|
|
||||||||
| if ctx.is_last_flashblock() { | ||||||||
| if let Some(flashtestations_builder_tx) = &self.flashtestations_builder_tx { | ||||||||
| // Commit state that should be included to compute the correct nonce | ||||||||
| let flashblocks_builder_txs = builder_txs | ||||||||
| .iter() | ||||||||
| .filter(|tx| tx.is_top_of_block == top_of_block) | ||||||||
| .map(|tx| tx.signed_tx.clone()) | ||||||||
| .collect(); | ||||||||
| self.commit_txs(flashblocks_builder_txs, ctx, &mut *db)?; | ||||||||
|
|
||||||||
| // We only include flashtestations txs in the last flashblock | ||||||||
| match flashtestations_builder_tx.simulate_builder_txs( | ||||||||
| state_provider, | ||||||||
| info, | ||||||||
| ctx, | ||||||||
| db, | ||||||||
| top_of_block, | ||||||||
| ) { | ||||||||
| Ok(flashtestations_builder_txs) => { | ||||||||
| builder_txs.extend(flashtestations_builder_txs) | ||||||||
| } | ||||||||
| Err(e) => { | ||||||||
| warn!(target: "flashtestations", error = ?e, "failed to add flashtestations builder tx") | ||||||||
| } | ||||||||
| } | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
|
|
||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can you just pass db?