chore: main merged

Author: Mohiiit

.github/actions/setup-rust/action.yml

@@ -50,10 +50,35 @@ runs:
     - name: Install dependencies
       shell: bash
       run: |
-        sudo apt-get update -y && sudo apt-get install -y \
-          clang llvm libudev-dev protobuf-compiler gcc g++ build-essential libssl-dev pkg-config curl wget git libgmp3-dev netcat-openbsd
+        # Install LLVM 19 using Makefile target
+        make install-llvm19 SUDO=sudo CODENAME=jammy
+
+        # Set LLVM environment variables for Cairo Native
+        echo "MLIR_SYS_190_PREFIX=/usr/lib/llvm-19" >> $GITHUB_ENV
+        echo "LLVM_SYS_191_PREFIX=/usr/lib/llvm-19" >> $GITHUB_ENV
+        echo "TABLEGEN_190_PREFIX=/usr/lib/llvm-19" >> $GITHUB_ENV
+
+        # Configure linker search paths for Cairo Native runtime compilation
+        echo "LIBRARY_PATH=/usr/lib/x86_64-linux-gnu:/usr/lib:/lib/x86_64-linux-gnu:/lib" >> $GITHUB_ENV
+        echo "LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu:/usr/lib:/lib/x86_64-linux-gnu:/lib" >> $GITHUB_ENV
+
+        # Set up clang-19 as default clang for Cairo Native
+        sudo update-alternatives --install /usr/bin/clang clang /usr/lib/llvm-19/bin/clang-19 100
+        sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/lib/llvm-19/bin/clang++ 100
+
+        # Also set explicit compiler environment variables for Cairo Native runtime
+        # Note: clang-19 handles both C and C++ compilation
+        echo "CC=clang-19" >> $GITHUB_ENV
+        echo "CXX=clang-19" >> $GITHUB_ENV
+
+        # Configure linker for clang - use lld-19 for Cairo Native runtime compilation
+        # These flags are passed to clang when it invokes the linker
+        echo "LDFLAGS=-fuse-ld=lld-19" >> $GITHUB_ENV
+
+        # Add LLVM 19 binaries to PATH
+        echo "/usr/lib/llvm-19/bin" >> $GITHUB_PATH
 
     - name: Setup mold
       uses: rui314/setup-mold@v1
       with:
-        make-default: true
+        make-default: false # Don't make mold the default - Cairo Native runtime compilation needs lld-19

.github/workflows/task-test-madara.yml

@@ -94,6 +94,8 @@ jobs:
           PROPTEST_CASES: ${{ inputs.proptest-cases }}
           LLVM_PROFILE_FILE: "madara-%p-%m.profraw"
           ANVIL_URL: ${{ env.ANVIL_DEFAULT_URL }}
+          # Cairo Native runtime compilation: use lld instead of mold
+          LDFLAGS: "-fuse-ld=lld-19"
         run: |
           export COVERAGE_BIN=$(realpath target/release/madara)
           rm -f target/madara-* lcov.info

.gitignore

@@ -27,6 +27,9 @@ artifacts.tar.gz
 **/target/
 # These are backup files generated by rustfmt
 **/*.rs.bk
+# Cargo build cache files
+**/.rustc_info.json
+**/.future-incompat-report.json
 
 # generated contracts for rpc-tests
 counter*/

Makefile

@@ -80,6 +80,7 @@ Targets:
   Runs various code quality checks including formatting and linting.
 
   - check              Run code quality checks (fmt, clippy)
+                       Use NO_CAIRO_SETUP=1 to skip Cairo setup (e.g., make check NO_CAIRO_SETUP=1)
   - fmt                Format code using taplo and cargo fmt
   - pre-push         Run formatting and checks before committing / Pushing
 
@@ -97,6 +98,7 @@ Targets:
   - help               Show this help message
   - git-hook           Setup git hooks path to .githooks
   - run-mock-atlantic-server  Run the mock Atlantic server (options: PORT=4002 FAILURE_RATE=0.1 MAX_CONCURRENT_JOBS=5 BIND_ADDR=0.0.0.0)
+  - install-llvm19     Install LLVM 19 for Cairo Native (Usage: make install-llvm19 [SUDO=sudo] [CODENAME=jammy|bookworm])
 
 endef
 export HELP
@@ -244,7 +246,10 @@ build-orchestrator: setup-cairo
 	@echo -e "$(PASS)✅ Build complete!$(RESET)"
 
 .PHONY: check
-check: setup-cairo
+check:
+	@if [ -z "$(NO_CAIRO_SETUP)" ]; then \
+		$(MAKE) --silent setup-cairo; \
+	fi
 	@echo -e "$(DIM)Running code quality checks...$(RESET)"
 	@echo -e "$(INFO)Running prettier check...$(RESET)"
 	@npm install
@@ -552,3 +557,43 @@ setup-bootstrapper:
 	@cp -r ./build-artifacts/bootstrapper/solidity/out/ ./bootstrapper-v2/contracts/ethereum/out/
 	@cp -r ./build-artifacts/bootstrapper/cairo/target/ ./bootstrapper-v2/contracts/madara/target/
 	@echo -e "$(PASS)Bootstrapper setup complete!$(RESET)"
+
+# ============================================================================ #
+#                          LLVM 19 SETUP FOR CAIRO NATIVE                       #
+# ============================================================================ #
+
+# Install LLVM 19 for Cairo Native
+# Usage: make install-llvm19 [SUDO=sudo] [CODENAME=jammy|bookworm]
+#   SUDO=sudo - Use sudo for commands (default: empty, assumes root in Docker)
+#   CODENAME=jammy|bookworm - Override OS detection (optional)
+.PHONY: install-llvm19
+install-llvm19:
+	@echo "Installing LLVM 19 for Cairo Native..."
+	@# Detect codename if not provided
+	@if [ -z "$(CODENAME)" ]; then \
+		if [ -f /etc/os-release ]; then \
+			. /etc/os-release && CODENAME=$$VERSION_CODENAME; \
+		elif grep -q "bookworm" /etc/debian_version 2>/dev/null || (grep -q "bookworm" /etc/os-release 2>/dev/null); then \
+			CODENAME=bookworm; \
+		elif grep -q "jammy" /etc/os-release 2>/dev/null; then \
+			CODENAME=jammy; \
+		else \
+			CODENAME=jammy; \
+		fi; \
+	else \
+		CODENAME=$(CODENAME); \
+	fi; \
+	echo "Using LLVM repository codename: $$CODENAME"; \
+	$(if $(SUDO),sudo,) wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | $(if $(SUDO),sudo,) tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc > /dev/null; \
+	$(if $(SUDO),sudo,) add-apt-repository -y "deb http://apt.llvm.org/$$CODENAME/ llvm-toolchain-$$CODENAME-19 main"; \
+	$(if $(SUDO),sudo,) apt-get update -y; \
+	$(if $(SUDO),sudo,) apt-get install -y \
+		clang-19 llvm-19 llvm-19-dev llvm-19-runtime \
+		libmlir-19-dev mlir-19-tools \
+		libpolly-19-dev \
+		liblld-19-dev \
+		libc6-dev \
+		$$(if [ "$$CODENAME" = "bookworm" ]; then echo "libstdc++-12-dev"; else echo "libstdc++-11-dev gcc-11 g++-11"; fi) \
+		libudev-dev protobuf-compiler build-essential \
+		libssl-dev pkg-config curl wget git libgmp3-dev netcat-openbsd; \
+	echo "✅ LLVM 19 installed successfully"

build-artifacts/src/lib.rs

@@ -132,7 +132,10 @@ fn get_artifacts(root: &RootDir, artifacts: &VersionFileArtifacts) -> Result<(),
     let version = get_version(artifacts)?;
     let image = format!("ghcr.io/madara-alliance/artifacts:{version}");
     println!("cargo::warning=fetching artifacts from image: {}", image);
-    let container_name = format!("madara-artifacts-extractor-v{}", version);
+
+    // Use a unique container name to avoid conflicts in CI environments
+    let timestamp = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_secs();
+    let container_name = format!("madara-artifacts-extractor-v{}-{}", version, timestamp);
 
     let root = &root.0;
 
@@ -145,9 +148,24 @@ fn get_artifacts(root: &RootDir, artifacts: &VersionFileArtifacts) -> Result<(),
         .then_some(())
         .ok_or_else(|| err_handl(cmd, "Failed to download artifacts"))?;
 
-    // Remove any existing container with the same name
+    // Clean up old artifact extractor containers to prevent accumulation
+    // Match containers with pattern: madara-artifacts-extractor-v{version} or madara-artifacts-extractor-v{version}-{timestamp}
     let mut docker = std::process::Command::new("docker");
-    docker.args(["rm", "-f", &container_name]).status().ok();
+    docker.args(["ps", "-a", "--format", "{{.Names}}"]);
+    if let Ok(output) = docker.output() {
+        if output.status.success() {
+            let containers = String::from_utf8_lossy(&output.stdout);
+            let prefix = format!("madara-artifacts-extractor-v{}", version);
+            for container in containers.lines() {
+                let container = container.trim();
+                // Match containers that start with the prefix (handles both with and without timestamp)
+                if !container.is_empty() && container.starts_with(&prefix) {
+                    let mut rm_docker = std::process::Command::new("docker");
+                    rm_docker.args(["rm", "-f", container]).status().ok();
+                }
+            }
+        }
+    }
 
     // Create extraction container with consistent name
     let mut docker = std::process::Command::new("docker");

configs/args/config.json

@@ -112,5 +112,16 @@
   },
   "chain_config_override": {
     "overrides": []
+  },
+  "cairo_native_params": {
+    "enable_native_execution": false,
+    "native_max_memory_cache_size": 1000,
+    "native_max_concurrent_compilations": 4,
+    "native_compilation_timeout_secs": 300,
+    "native_memory_cache_timeout_ms": 100,
+    "native_disk_cache_load_timeout_secs": 2,
+    "native_compilation_mode": "async",
+    "native_enable_retry": true,
+    "native_max_failed_compilations": 10000
   }
 }

madara/Cargo.lock

@@ -1,6 +1,7 @@
 [workspace]
 members = [
   "node",
+  "crates/client/cairo_native",
   "crates/client/db",
   "crates/client/exec",
   "crates/client/sync",
@@ -96,6 +97,7 @@ mp-oracle = { path = "crates/primitives/oracle", default-features = false }
 
 # Madara client
 mc-analytics = { path = "crates/client/analytics" }
+mc-class-exec = { path = "crates/client/cairo_native" }
 mc-telemetry = { path = "crates/client/telemetry" }
 mc-db = { path = "crates/client/db" }
 mc-exec = { path = "crates/client/exec" }
@@ -127,11 +129,9 @@ starknet = "0.17.0"
 starknet-types-core = { version = "0.2.1", default-features = false, features = [
   "hash",
 ] }
-#
-#blockifier = { version = "=0.16.0-rc.0", features = ["node_api"] }
-#starknet_api = "=0.16.0-rc.0"
 blockifier = { git = "https://github.com/karnotxyz/sequencer", rev = "ff514ad8f39ac04302d0b176cef673a6a3820914", features = [
   "node_api",
+  "cairo_native",
 ] }
 starknet_api = { git = "https://github.com/karnotxyz/sequencer", rev = "ff514ad8f39ac04302d0b176cef673a6a3820914" }
 cairo-lang-starknet-classes = "2.12.3"

madara/Cargo.toml

@@ -19,7 +19,28 @@ ENV RUSTC_WRAPPER=/bin/sccache
 
 ENV WGET="-O- --timeout=10 --waitretry=3 --retry-connrefused --progress=dot:mega"
 
-RUN apt-get update -y && apt-get install -y wget clang
+# Copy Makefile for LLVM installation
+COPY Makefile /tmp/Makefile
+
+# Install LLVM 19 for Cairo Native support using Makefile target
+RUN apt-get update -y && apt-get install -y wget gnupg software-properties-common make && \
+    cd /tmp && make -f Makefile install-llvm19 CODENAME=bookworm && \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# Set LLVM environment variables for Cairo Native
+ENV MLIR_SYS_190_PREFIX=/usr/lib/llvm-19
+ENV LLVM_SYS_191_PREFIX=/usr/lib/llvm-19
+ENV TABLEGEN_190_PREFIX=/usr/lib/llvm-19
+ENV PATH="/usr/lib/llvm-19/bin:${PATH}"
+
+# Set explicit compilers for Cairo Native runtime compilation
+# Note: clang-19 handles both C and C++ compilation
+ENV CC=clang-19
+ENV CXX=clang-19
+
+# Configure linker search paths for Cairo Native runtime compilation
+ENV LIBRARY_PATH=/usr/lib/x86_64-linux-gnu:/usr/lib:/lib/x86_64-linux-gnu:/lib
+ENV LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu:/usr/lib:/lib/x86_64-linux-gnu:/lib
 
 # Install Python 3.9
 RUN wget https://www.python.org/ftp/python/3.9.16/Python-3.9.16.tgz \