cairo-air: remove dependency on adapter, no_std wasm build

Author: m-kus

.github/workflows/cairo-ci.yaml

@@ -61,7 +61,7 @@ jobs:
         uses: Swatinem/rust-cache@v2
         with:
           workspaces: stwo_cairo_prover
-      - run: cargo nextest run --cargo-profile witness-opt-1 --features=slow-tests,std -j 1 -P ci
+      - run: cargo nextest run --cargo-profile witness-opt-1 --features=slow-tests -j 1 -P ci
         env:
           RUST_MIN_STACK: 4194304
           RUSTFLAGS: -C target-cpu=native
@@ -110,6 +110,21 @@ jobs:
       - name: Build stwo_cairo_prover for wasm64
         run: RUSTFLAGS='--cfg getrandom_backend="custom"' cargo check --target wasm64-unknown-unknown -Z build-std=std,panic_abort --package stwo_cairo_prover --release 
 
+  cairo-air-wasm:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./stwo_cairo_prover
+    steps:
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: nightly-2025-07-14
+          targets: wasm32-unknown-unknown
+      - uses: Swatinem/rust-cache@v2
+      - name: Build cairo-air for wasm32
+        run: cargo check --package cairo-air --no-default-features --target wasm32-unknown-unknown --release
+
   format:
     runs-on: ubuntu-latest
     defaults:

stwo_cairo_prover/Cargo.lock

@@ -5,22 +5,16 @@ use cairo_vm::stdlib::collections::HashMap;
 use cairo_vm::types::builtin_name::BuiltinName;
 use cairo_vm::types::relocatable::MaybeRelocatable;
 use serde::{Deserialize, Serialize};
+use stwo_cairo_common::builtins::{
+    ADD_MOD_MEMORY_CELLS, BITWISE_MEMORY_CELLS, ECDSA_MEMORY_CELLS, EC_OP_MEMORY_CELLS,
+    KECCAK_MEMORY_CELLS, MUL_MOD_MEMORY_CELLS, OUTPUT_MEMORY_CELLS, PEDERSEN_MEMORY_CELLS,
+    POSEIDON_MEMORY_CELLS, RANGE_CHECK_MEMORY_CELLS,
+};
 use stwo_cairo_common::prover_types::simd::N_LANES;
 use tracing::{info, span, Level};
 
 use super::memory::MemoryBuilder;
 
-pub const ADD_MOD_MEMORY_CELLS: usize = 7;
-pub const BITWISE_MEMORY_CELLS: usize = 5;
-pub const EC_OP_MEMORY_CELLS: usize = 7;
-pub const ECDSA_MEMORY_CELLS: usize = 2;
-pub const KECCAK_MEMORY_CELLS: usize = 16;
-pub const MUL_MOD_MEMORY_CELLS: usize = 7;
-pub const PEDERSEN_MEMORY_CELLS: usize = 3;
-pub const POSEIDON_MEMORY_CELLS: usize = 6;
-pub const RANGE_CHECK_MEMORY_CELLS: usize = 1;
-pub const OUTPUT_MEMORY_CELLS: usize = 1;
-
 // Minimal builtins instances per segment, chosen to fit SIMD requirements.
 pub const MIN_SEGMENT_SIZE: usize = N_LANES;
 

stwo_cairo_prover/crates/adapter/src/builtins.rs

@@ -5,7 +5,9 @@ use std::ops::{Deref, DerefMut};
 use bytemuck::{Pod, Zeroable};
 use dashmap::DashMap;
 use serde::{Deserialize, Serialize};
-use stwo_cairo_common::memory::{N_BITS_PER_FELT, N_M31_IN_SMALL_FELT252};
+use stwo_cairo_common::memory::{
+    LARGE_MEMORY_VALUE_ID_BASE, N_BITS_PER_FELT, N_M31_IN_SMALL_FELT252,
+};
 use tracing::{span, Level};
 
 /// P is 2^251 + 17 * 2^192 - 1.
@@ -235,8 +237,6 @@ impl DerefMut for MemoryBuilder {
     }
 }
 
-pub const LARGE_MEMORY_VALUE_ID_BASE: u32 = 0x4000_0000;
-
 /// Used to mark an unused address.
 /// Cannot be assigned as a valid ID, as [`DEFAULT_ID`] > 2**[`LOG_MEMORY_ADDRESS_BOUND`].
 pub const DEFAULT_ID: u32 = LARGE_MEMORY_VALUE_ID_BASE - 1;

stwo_cairo_prover/crates/adapter/src/memory.rs

@@ -4,8 +4,6 @@ version.workspace = true
 edition.workspace = true
 
 [features]
-default = ["std"]
-std = ["stwo/std", "stwo-constraint-framework/std"]
 slow-tests = []
 
 [dependencies]
@@ -18,7 +16,6 @@ num-traits.workspace = true
 paste.workspace = true
 # TODO(Ohad): Add parallel config.
 stwo-cairo-common.workspace = true
-stwo-cairo-adapter.workspace = true
 rayon.workspace = true
 serde.workspace = true
 starknet-ff.workspace = true

stwo_cairo_prover/crates/cairo-air/Cargo.toml

@@ -1,3 +1,5 @@
+use std::collections::HashMap;
+
 use itertools::{chain, Itertools};
 use num_traits::Zero;
 use serde::{Deserialize, Serialize};
@@ -11,7 +13,6 @@ use stwo::core::proof::StarkProof;
 use stwo::core::vcs::MerkleHasher;
 use stwo::prover::backend::simd::SimdBackend;
 use stwo::prover::ComponentProver;
-use stwo_cairo_adapter::HashMap;
 use stwo_cairo_common::prover_types::cpu::CasmState;
 use stwo_cairo_common::prover_types::felt::split_f252;
 use stwo_cairo_serialize::{CairoDeserialize, CairoSerialize};
@@ -945,7 +946,7 @@ impl std::fmt::Display for CairoComponents {
 
 #[cfg(test)]
 mod tests {
-    use stwo_cairo_adapter::HashMap;
+    use std::collections::HashMap;
 
     use crate::air::accumulate_relation_uses;
     use crate::verifier::RelationUse;

stwo_cairo_prover/crates/cairo-air/src/air.rs

@@ -5,8 +5,9 @@ use stwo::core::channel::Channel;
 use stwo::core::fields::m31::M31;
 use stwo::core::fields::qm31::{SecureField, SECURE_EXTENSION_DEGREE};
 use stwo::core::pcs::TreeVec;
-use stwo_cairo_adapter::memory::LARGE_MEMORY_VALUE_ID_BASE;
-use stwo_cairo_common::memory::{N_M31_IN_FELT252, N_M31_IN_SMALL_FELT252};
+use stwo_cairo_common::memory::{
+    LARGE_MEMORY_VALUE_ID_BASE, N_M31_IN_FELT252, N_M31_IN_SMALL_FELT252,
+};
 use stwo_cairo_common::preprocessed_columns::preprocessed_trace::{PreProcessedColumn, Seq};
 use stwo_cairo_serialize::{CairoDeserialize, CairoSerialize};
 use stwo_constraint_framework::{

stwo_cairo_prover/crates/cairo-air/src/components/memory_id_to_big.rs

@@ -1,3 +1,5 @@
+use std::collections::HashMap;
+
 use num_traits::{One, Zero};
 use paste::paste;
 use serde_json::to_string_pretty;
@@ -6,13 +8,11 @@ use stwo::core::fields::m31::BaseField;
 use stwo::core::fields::qm31::SecureField;
 use stwo::core::pcs::CommitmentSchemeVerifier;
 use stwo::core::verifier::{verify, VerificationError};
-use stwo_cairo_adapter::builtins::{
+use stwo_cairo_common::builtins::{
     ADD_MOD_MEMORY_CELLS, BITWISE_MEMORY_CELLS, MUL_MOD_MEMORY_CELLS, PEDERSEN_MEMORY_CELLS,
     POSEIDON_MEMORY_CELLS, RANGE_CHECK_MEMORY_CELLS,
 };
-use stwo_cairo_adapter::memory::LARGE_MEMORY_VALUE_ID_BASE;
-use stwo_cairo_adapter::HashMap;
-use stwo_cairo_common::memory::LOG_MEMORY_ADDRESS_BOUND;
+use stwo_cairo_common::memory::{LARGE_MEMORY_VALUE_ID_BASE, LOG_MEMORY_ADDRESS_BOUND};
 use stwo_cairo_common::prover_types::cpu::{CasmState, PRIME};
 use stwo_constraint_framework::PREPROCESSED_TRACE_IDX;
 use thiserror::Error;

stwo_cairo_prover/crates/cairo-air/src/verifier.rs

@@ -0,0 +1,10 @@
+pub const ADD_MOD_MEMORY_CELLS: usize = 7;
+pub const BITWISE_MEMORY_CELLS: usize = 5;
+pub const EC_OP_MEMORY_CELLS: usize = 7;
+pub const ECDSA_MEMORY_CELLS: usize = 2;
+pub const KECCAK_MEMORY_CELLS: usize = 16;
+pub const MUL_MOD_MEMORY_CELLS: usize = 7;
+pub const PEDERSEN_MEMORY_CELLS: usize = 3;
+pub const POSEIDON_MEMORY_CELLS: usize = 6;
+pub const RANGE_CHECK_MEMORY_CELLS: usize = 1;
+pub const OUTPUT_MEMORY_CELLS: usize = 1;

stwo_cairo_prover/crates/common/src/builtins.rs

@@ -1,4 +1,5 @@
 #![feature(portable_simd)]
+pub mod builtins;
 pub mod memory;
 pub mod preprocessed_columns;
 pub mod prover_types;