From c951316bcf192bd0cf89a4cf0d75c704bb19f085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Cauderlier?= Date: Mon, 20 Jan 2025 16:41:49 +0100 Subject: [PATCH 1/2] Etherlink/Kernel: remove unused __at_most_one_block flag --- etherlink/kernel_evm/kernel/src/block.rs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/etherlink/kernel_evm/kernel/src/block.rs b/etherlink/kernel_evm/kernel/src/block.rs index e03f78ab87e4..dc6f5d131268 100644 --- a/etherlink/kernel_evm/kernel/src/block.rs +++ b/etherlink/kernel_evm/kernel/src/block.rs @@ -33,7 +33,7 @@ use tezos_evm_logging::{log, Level::*, Verbosity}; use tezos_evm_runtime::runtime::Runtime; use tezos_evm_runtime::safe_storage::SafeStorage; use tezos_smart_rollup::outbox::OutboxQueue; -use tezos_smart_rollup_host::path::{Path, RefPath}; +use tezos_smart_rollup_host::path::Path; use tick_model::estimate_remaining_ticks_for_transaction_execution; use tezos_ethereum::block::BlockConstants; @@ -427,8 +427,6 @@ fn promote_block( Ok(()) } -const AT_MOST_ONE_BLOCK: RefPath = RefPath::assert_from(b"/__at_most_one_block"); - pub fn produce( host: &mut Host, chain_id: U256, @@ -463,8 +461,6 @@ pub fn produce( init_account_storage().context("Failed to initialize EVM account storage")?; let mut tick_counter = TickCounter::new(0u64); - let at_most_one_block = host.store_has(&AT_MOST_ONE_BLOCK)?.is_some(); - let mut safe_host = SafeStorage { host }; let outbox_queue = OutboxQueue::new(&WITHDRAWAL_OUTBOX_QUEUE, u32::MAX)?; let precompiles = @@ -545,11 +541,7 @@ pub fn produce( config, included_delayed_transactions, )?; - if at_most_one_block { - Ok(ComputationResult::Finished) - } else { - Ok(ComputationResult::RebootNeeded) - } + Ok(ComputationResult::RebootNeeded) } Ok(BlockComputationResult::RebootNeeded) => { // The computation will resume at next reboot, we leave the -- GitLab From 78d033d251b39fd00ffc5fe2919e76cec0d19bae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Cauderlier?= Date: Mon, 20 Jan 2025 16:45:55 +0100 Subject: [PATCH 2/2] Etherlink/Kernel/Changelog: mention !16302 --- etherlink/CHANGES_KERNEL.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/etherlink/CHANGES_KERNEL.md b/etherlink/CHANGES_KERNEL.md index 85aa175a06e2..3ea8896ee4b5 100644 --- a/etherlink/CHANGES_KERNEL.md +++ b/etherlink/CHANGES_KERNEL.md @@ -39,6 +39,9 @@ triggering a flush of the delayed inbox. (!16425) - An optional chain_id field has been added to the blueprints chunks sent by the sequencer. (!16366) +- The option to limit the block production to at most one block per + Tezos level, which was added in version + ec7c3b349624896b269e179384d0a45cf39e1145, has been removed. (!16302) ### Bug fixes -- GitLab