Merge branch 'main' into improve-logs

Author: heemankv

.gitignore

@@ -105,4 +105,5 @@ s3
 # python virtual env
 .venv
 
-sequencer_venv/
+sequencer_venv/
+sequencer_requirements.txt

Makefile

@@ -14,6 +14,7 @@ Targets:
 
   [ SETUP ]
 
+  - setup-cairo             Setup Cairo 0 environment for building
   - setup-l2                Setup orchestrator with L2 layer
   - setup-l2-localstack     Setup orchestrator with L2 layer and Localstack
   - setup-l3                Setup orchestrator with L3 layer
@@ -69,6 +70,11 @@ Targets:
   - clean-db           Perform clean and remove local database
   - fclean             Perform clean-db and remove local images
 
+  [ BUILDING ]
+
+  - build-madara                  Build Madara with Cairo 0 environment setup
+  - build-orchestrator            Build Orchestrator with Cairo 0 environment setup
+
   [ CODE QUALITY ]
 
   Runs various code quality checks including formatting and linting.
@@ -103,6 +109,8 @@ DOCKER_TAG     := madara:latest
 DOCKER_IMAGE   := ghcr.io/madara-alliance/$(DOCKER_TAG)
 DOCKER_GZ      := image.tar.gz
 ARTIFACTS      := ./build-artifacts
+VENV           := sequencer_venv
+VENV_ACTIVATE  := . $(VENV)/bin/activate
 
 # Configuration for E2E bridge tests
 CARGO_TARGET_DIR ?= target
@@ -195,9 +203,48 @@ artifacts:
 	@git submodule update --init --recursive
 	./scripts/artifacts.sh
 
+.PHONY: setup-cairo
+setup-cairo:
+	@echo -e "$(DIM)Setting up Cairo 0 environment...$(RESET)"
+	@if [ ! -d "$(VENV)" ]; then \
+		echo -e "$(INFO)Creating Python virtual environment...$(RESET)"; \
+		python3 -m venv $(VENV); \
+	else \
+		echo -e "$(PASS)✅ Virtual environment already exists$(RESET)"; \
+	fi
+	@echo -e "$(INFO)Installing Cairo 0 dependencies...$(RESET)"
+	@if [ ! -f sequencer_requirements.txt ]; then \
+		CARGO_HOME=$${CARGO_HOME:-$$HOME/.cargo}; \
+		GIT_CHECKOUTS=$$(readlink -f "$$CARGO_HOME/git" 2>/dev/null || echo "$$CARGO_HOME/git"); \
+		SEQUENCER_REV=$$(grep -A 2 'name = "blockifier"' Cargo.lock | grep 'sequencer?rev=' | sed -E 's/.*rev=([a-f0-9]+).*/\1/' | cut -c1-7); \
+		REQUIREMENTS_PATH=$$(find "$$GIT_CHECKOUTS/checkouts" -type f -path "*/sequencer*/$$SEQUENCER_REV*/scripts/requirements.txt" 2>/dev/null | head -n 1); \
+		if [ -n "$$REQUIREMENTS_PATH" ]; then \
+			sed 's/numpy==2.0.2/numpy<2.0/' "$$REQUIREMENTS_PATH" > sequencer_requirements.txt; \
+			echo -e "$(INFO)Found requirements.txt at: $$REQUIREMENTS_PATH$(RESET)"; \
+		else \
+			echo -e "$(WARN)⚠️  WARNING: Could not find requirements.txt from sequencer checkout$(RESET)"; \
+			echo -e "$(INFO)Creating basic requirements with cairo-lang...$(RESET)"; \
+			echo "cairo-lang==0.14.0.1" > sequencer_requirements.txt; \
+			echo "numpy<2.0" >> sequencer_requirements.txt; \
+		fi; \
+	fi
+	@$(VENV_ACTIVATE) && pip install --upgrade pip > /dev/null 2>&1 && pip install -r sequencer_requirements.txt > /dev/null 2>&1
+	@$(VENV_ACTIVATE) && cairo-compile --version > /dev/null 2>&1 && echo -e "$(PASS)✅ Cairo 0 environment ready (cairo-compile $$($(VENV_ACTIVATE) && cairo-compile --version 2>&1))$(RESET)" || (echo -e "$(WARN)❌ Cairo setup failed$(RESET)" && exit 1)
+
+.PHONY: build-madara
+build-madara:
+	@echo -e "$(DIM)Building Madara with Cairo 0 environment...$(RESET)"
+	@$(VENV_ACTIVATE) && cargo build --manifest-path madara/Cargo.toml  --bin madara --release
+	@echo -e "$(PASS)✅ Build complete!$(RESET)"
+
+.PHONY: build-orchestrator
+build-orchestrator: setup-cairo
+	@echo -e "$(DIM)Building Orchestrator with Cairo 0 environment...$(RESET)"
+	@$(VENV_ACTIVATE) && cargo build --bin orchestrator --release
+	@echo -e "$(PASS)✅ Build complete!$(RESET)"
 
 .PHONY: check
-check:
+check: setup-cairo
 	@echo -e "$(DIM)Running code quality checks...$(RESET)"
 	@echo -e "$(INFO)Running prettier check...$(RESET)"
 	@npm install
@@ -206,20 +253,23 @@ check:
 	@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)"
 
 .PHONY: fmt
-fmt:
+fmt: setup-cairo
 	@echo -e "$(DIM)Running code formatters...$(RESET)"
 	@echo -e "$(INFO)Running taplo formatter...$(RESET)"
 	@npm install
@@ -421,10 +471,10 @@ test: test-e2e test-orchestrator
 	@echo -e "$(PASS)All tests completed!$(RESET)"
 
 .PHONY: pre-push
-pre-push:
+pre-push: setup-cairo
 	@echo -e "$(DIM)Running pre-push checks...$(RESET)"
 	@echo -e "$(INFO)Running code quality checks...$(RESET)"
-	@$(MAKE) --silent check
+	@$(VENV_ACTIVATE) && $(MAKE) --silent check
 	@echo -e "$(PASS)Pre-push checks completed successfully!$(RESET)"
 
 .PHONY: git-hook

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(());
                 }