fix: restart madara 0x2 and bouncer weight issue (#849)

Author: Mohiiit

Makefile

@@ -253,14 +253,17 @@ check: setup-cairo
 	@cargo fmt -- --check
 	@echo -e "$(INFO)Running taplo fmt check...$(RESET)"
 	@taplo fmt --config=./taplo/taplo.toml --check
-	@echo -e "$(INFO)Running cargo clippy workspace checks...$(RESET)"
+	@echo "Running cargo clippy..."
 	@cargo clippy --workspace --no-deps -- -D warnings
-	@echo -e "$(INFO)Running cargo clippy workspace tests...$(RESET)"
 	@cargo clippy --workspace --tests --no-deps -- -D warnings
-	@echo -e "$(INFO)Running cargo clippy with testing features...$(RESET)"
-	@cargo clippy --workspace --exclude madara --features testing --no-deps -- -D warnings
-	@echo -e "$(INFO)Running cargo clippy with testing features and tests...$(RESET)"
-	@cargo clippy --workspace --exclude madara --features testing --tests --no-deps -- -D warnings
+	@# TODO(mehul 14/11/2025, hotfix): This is a temporary fix to ensure that the madara is linted.
+	@# Madara does not belong to the toplevel workspace, so we need to lint it separately.
+	@# Remove this once we add madara back to toplevel workspace.
+	@echo "Running cargo clippy for madara..."
+	@cd madara && \
+	cargo clippy --workspace --no-deps -- -D warnings && \
+	cargo clippy --workspace --tests --no-deps -- -D warnings && \
+	cd ..
 	@echo -e "$(INFO)Running markdownlint check...$(RESET)"
 	@npx markdownlint -c .markdownlint.json -q -p .markdownlintignore .
 	@echo -e "$(PASS)All code quality checks passed!$(RESET)"

configs/args/config.json

@@ -107,7 +107,6 @@
   },
   "block_production_params": {
     "block_production_disabled": false,
-    "close_preconfirmed_block_upon_restart": false,
     "devnet_contracts": 10
   },
   "chain_config_override": {

madara/crates/client/block_production/src/executor/thread.rs

@@ -2,10 +2,10 @@
 
 use crate::util::{create_execution_context, BatchToExecute, BlockExecutionContext, ExecutionStats};
 use anyhow::Context;
-use blockifier::{blockifier::transaction_executor::TransactionExecutor, state::state_api::State};
+use blockifier::blockifier::transaction_executor::TransactionExecutor;
 use futures::future::OptionFuture;
 use mc_db::MadaraBackend;
-use mc_exec::{execution::TxInfo, LayeredStateAdapter, MadaraBackendExecutionExt};
+use mc_exec::{execution::TxInfo, LayeredStateAdapter};
 use mp_convert::{Felt, ToFelt};
 use starknet_api::contract_class::ContractClass;
 use starknet_api::core::ClassHash;
@@ -220,29 +220,14 @@ impl ExecutorThread {
             previous_l2_gas_used,
         )?;
 
-        // Create the TransactionExecution, but reuse the layered_state_adapter.
-        let mut executor =
-            self.backend.new_executor_for_block_production(state.state_adaptor, exec_ctx.to_blockifier()?)?;
-
-        // Prepare the block_n-10 state diff entry on the 0x1 contract.
-        if let Some((block_n_min_10, block_hash_n_min_10)) =
-            self.wait_for_hash_of_block_min_10(exec_ctx.block_number)?
-        {
-            let contract_address = 1u64.into();
-            let key = block_n_min_10.into();
-            executor
-                .block_state
-                .as_mut()
-                .expect("Blockifier block context has been taken")
-                .set_storage_at(contract_address, key, block_hash_n_min_10)
-                .context("Cannot set storage value in cache")?;
+        // Create the TransactionExecutor with block_n-10 handling, reusing the layered_state_adapter.
+        let executor = crate::util::create_executor_with_block_n_min_10(
+            &self.backend,
+            &exec_ctx,
+            state.state_adaptor,
+            |block_n| self.wait_for_hash_of_block_min_10(block_n),
+        )?;
 
-            tracing::debug!(
-                "State diff inserted {:#x} {:#x} => {block_hash_n_min_10:#x}",
-                contract_address.to_felt(),
-                key.to_felt()
-            );
-        }
         Ok(ExecutorStateExecuting {
             exec_ctx,
             executor,
@@ -433,7 +418,11 @@ impl ExecutorThread {
                 );
                 let block_exec_summary = execution_state.executor.finalize()?;
 
-                if self.replies_sender.blocking_send(super::ExecutorMessage::EndBlock(Box::new(block_exec_summary))).is_err() {
+                if self
+                    .replies_sender
+                    .blocking_send(super::ExecutorMessage::EndBlock(Box::new(block_exec_summary)))
+                    .is_err()
+                {
                     // Receiver closed
                     break Ok(());
                 }