From d68cf6c2a96f4d54e1b95a2351b77a2c423d4e22 Mon Sep 17 00:00:00 2001 From: raphaelDkhn <113879115+raphaelDkhn@users.noreply.github.com> Date: Tue, 12 Aug 2025 17:53:06 +0300 Subject: [PATCH 1/2] udate stwo rev --- Cargo.toml | 6 +++--- crates/air/Cargo.toml | 2 +- crates/air/src/components/add/component.rs | 2 +- crates/air/src/components/add/table.rs | 2 +- crates/air/src/components/add/witness.rs | 2 +- crates/air/src/components/contiguous/component.rs | 2 +- crates/air/src/components/contiguous/table.rs | 2 +- crates/air/src/components/contiguous/witness.rs | 2 +- crates/air/src/components/exp2/component.rs | 2 +- crates/air/src/components/exp2/table.rs | 2 +- crates/air/src/components/exp2/witness.rs | 2 +- crates/air/src/components/inputs/components.rs | 2 +- crates/air/src/components/inputs/table.rs | 2 +- crates/air/src/components/inputs/witness.rs | 2 +- crates/air/src/components/less_than/component.rs | 2 +- crates/air/src/components/less_than/table.rs | 2 +- crates/air/src/components/less_than/witness.rs | 2 +- crates/air/src/components/log2/component.rs | 2 +- crates/air/src/components/log2/table.rs | 2 +- crates/air/src/components/log2/witness.rs | 2 +- crates/air/src/components/lookups/exp2/component.rs | 2 +- crates/air/src/components/lookups/exp2/mod.rs | 2 +- crates/air/src/components/lookups/exp2/table.rs | 2 +- crates/air/src/components/lookups/exp2/witness.rs | 2 +- crates/air/src/components/lookups/log2/component.rs | 2 +- crates/air/src/components/lookups/log2/mod.rs | 2 +- crates/air/src/components/lookups/log2/table.rs | 2 +- crates/air/src/components/lookups/log2/witness.rs | 2 +- crates/air/src/components/lookups/mod.rs | 2 +- crates/air/src/components/lookups/range_check/component.rs | 2 +- crates/air/src/components/lookups/range_check/mod.rs | 2 +- crates/air/src/components/lookups/range_check/table.rs | 2 +- crates/air/src/components/lookups/range_check/witness.rs | 2 +- crates/air/src/components/lookups/sin/component.rs | 2 +- crates/air/src/components/lookups/sin/mod.rs | 2 +- crates/air/src/components/lookups/sin/table.rs | 2 +- crates/air/src/components/lookups/sin/witness.rs | 2 +- crates/air/src/components/max_reduce/component.rs | 2 +- crates/air/src/components/max_reduce/table.rs | 2 +- crates/air/src/components/max_reduce/witness.rs | 2 +- crates/air/src/components/mod.rs | 2 +- crates/air/src/components/mul/component.rs | 2 +- crates/air/src/components/mul/table.rs | 2 +- crates/air/src/components/mul/witness.rs | 2 +- crates/air/src/components/recip/component.rs | 2 +- crates/air/src/components/recip/table.rs | 2 +- crates/air/src/components/recip/witness.rs | 2 +- crates/air/src/components/rem/component.rs | 2 +- crates/air/src/components/rem/table.rs | 2 +- crates/air/src/components/rem/witness.rs | 2 +- crates/air/src/components/sin/component.rs | 2 +- crates/air/src/components/sin/table.rs | 2 +- crates/air/src/components/sin/witness.rs | 2 +- crates/air/src/components/sqrt/component.rs | 2 +- crates/air/src/components/sqrt/table.rs | 2 +- crates/air/src/components/sqrt/witness.rs | 2 +- crates/air/src/components/sum_reduce/component.rs | 2 +- crates/air/src/components/sum_reduce/table.rs | 2 +- crates/air/src/components/sum_reduce/witness.rs | 2 +- crates/air/src/lib.rs | 2 +- crates/air/src/preprocessed.rs | 2 +- crates/air/src/utils.rs | 2 +- crates/graph/Cargo.toml | 2 +- crates/graph/src/op/prim.rs | 2 +- crates/prover/Cargo.toml | 2 +- crates/prover/src/lib.rs | 4 ++-- crates/prover/src/prover.rs | 2 +- crates/utils/Cargo.toml | 2 +- crates/utils/src/lib.rs | 2 +- crates/verifiers/rust/Cargo.toml | 2 +- crates/verifiers/rust/src/verifier.rs | 2 +- crates/verifiers/wasm/Cargo.toml | 2 +- crates/verifiers/wasm/src/verifier.rs | 2 +- examples/risk-assessment/Cargo.toml | 2 +- examples/simple/Cargo.toml | 2 +- rust-toolchain.toml | 3 +-- 76 files changed, 79 insertions(+), 80 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5d339a1a..51f6dc17 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,11 +18,11 @@ repository = "https://github.com/raphaelDkhn/Luminair" license = "MIT" [workspace.dependencies] -stwo-prover = { git = "https://github.com/starkware-libs/stwo", rev = "045963c", features = [ +stwo = { git = "https://github.com/starkware-libs/stwo", rev = "0790eba", features = [ "parallel", ], default-features = false } -stwo-air-utils-derive = { git = "https://github.com/starkware-libs/stwo", rev = "045963c" } -stwo-air-utils = { git = "https://github.com/starkware-libs/stwo", rev = "045963c" } +stwo-air-utils-derive = { git = "https://github.com/starkware-libs/stwo", rev = "0790eba" } +stwo-air-utils = { git = "https://github.com/starkware-libs/stwo", rev = "0790eba" } luminal = { git = "https://github.com/raphaelDkhn/luminal.git", rev = "80ae0fd" } numerair = { git = "https://github.com/gizatechxyz/NumerAir.git", rev = "bb75385" } rayon = "1.10.0" diff --git a/crates/air/Cargo.toml b/crates/air/Cargo.toml index 3d12737c..0e3616de 100644 --- a/crates/air/Cargo.toml +++ b/crates/air/Cargo.toml @@ -6,7 +6,7 @@ repository.workspace = true license.workspace = true [dependencies] -stwo-prover.workspace = true +stwo.workspace = true stwo-air-utils-derive.workspace = true stwo-air-utils.workspace = true luminal.workspace = true diff --git a/crates/air/src/components/add/component.rs b/crates/air/src/components/add/component.rs index 7ae4235b..df9404fa 100644 --- a/crates/air/src/components/add/component.rs +++ b/crates/air/src/components/add/component.rs @@ -1,7 +1,7 @@ use crate::components::{AddClaim, NodeElements}; use num_traits::One; use numerair::eval::EvalFixedPoint; -use stwo_prover::constraint_framework::{ +use stwo::constraint_framework::{ EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/add/table.rs b/crates/air/src/components/add/table.rs index d1da1dfa..30b7b22f 100644 --- a/crates/air/src/components/add/table.rs +++ b/crates/air/src/components/add/table.rs @@ -1,6 +1,6 @@ use num_traits::{One, Zero}; use serde::{Deserialize, Serialize}; -use stwo_prover::core::{ +use stwo::core::{ backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, diff --git a/crates/air/src/components/add/witness.rs b/crates/air/src/components/add/witness.rs index c6e9fc3d..2d845273 100644 --- a/crates/air/src/components/add/witness.rs +++ b/crates/air/src/components/add/witness.rs @@ -2,7 +2,7 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo_prover::{ +use stwo::{ constraint_framework::{logup::LogupTraceGenerator, Relation}, core::backend::simd::{ m31::{PackedM31, LOG_N_LANES, N_LANES}, diff --git a/crates/air/src/components/contiguous/component.rs b/crates/air/src/components/contiguous/component.rs index 86751f5c..d4011f43 100644 --- a/crates/air/src/components/contiguous/component.rs +++ b/crates/air/src/components/contiguous/component.rs @@ -1,6 +1,6 @@ use crate::components::{ContiguousClaim, NodeElements}; use num_traits::One; -use stwo_prover::constraint_framework::{ +use stwo::constraint_framework::{ EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/contiguous/table.rs b/crates/air/src/components/contiguous/table.rs index d09c6f73..16b26b27 100644 --- a/crates/air/src/components/contiguous/table.rs +++ b/crates/air/src/components/contiguous/table.rs @@ -1,6 +1,6 @@ use num_traits::{One, Zero}; use serde::{Deserialize, Serialize}; -use stwo_prover::core::{ +use stwo::core::{ backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, diff --git a/crates/air/src/components/contiguous/witness.rs b/crates/air/src/components/contiguous/witness.rs index a3d6f10c..2379fb91 100644 --- a/crates/air/src/components/contiguous/witness.rs +++ b/crates/air/src/components/contiguous/witness.rs @@ -2,7 +2,7 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo_prover::{ +use stwo::{ constraint_framework::{logup::LogupTraceGenerator, Relation}, core::backend::simd::{ m31::{PackedM31, LOG_N_LANES, N_LANES}, diff --git a/crates/air/src/components/exp2/component.rs b/crates/air/src/components/exp2/component.rs index e6961896..20bfa143 100644 --- a/crates/air/src/components/exp2/component.rs +++ b/crates/air/src/components/exp2/component.rs @@ -1,6 +1,6 @@ use crate::components::{lookups::exp2::Exp2LookupElements, Exp2Claim, NodeElements}; use num_traits::One; -use stwo_prover::constraint_framework::{ +use stwo::constraint_framework::{ EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/exp2/table.rs b/crates/air/src/components/exp2/table.rs index c95a0745..fcaf02cc 100644 --- a/crates/air/src/components/exp2/table.rs +++ b/crates/air/src/components/exp2/table.rs @@ -1,6 +1,6 @@ use num_traits::{One, Zero}; use serde::{Deserialize, Serialize}; -use stwo_prover::core::{ +use stwo::core::{ backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, diff --git a/crates/air/src/components/exp2/witness.rs b/crates/air/src/components/exp2/witness.rs index 61b2b9c3..cd677a1a 100644 --- a/crates/air/src/components/exp2/witness.rs +++ b/crates/air/src/components/exp2/witness.rs @@ -2,7 +2,7 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo_prover::{ +use stwo::{ constraint_framework::{logup::LogupTraceGenerator, Relation}, core::backend::simd::{ m31::{PackedM31, LOG_N_LANES, N_LANES}, diff --git a/crates/air/src/components/inputs/components.rs b/crates/air/src/components/inputs/components.rs index ac37900e..e3bcc681 100644 --- a/crates/air/src/components/inputs/components.rs +++ b/crates/air/src/components/inputs/components.rs @@ -1,6 +1,6 @@ use crate::components::{InputsClaim, NodeElements}; use num_traits::One; -use stwo_prover::constraint_framework::{ +use stwo::constraint_framework::{ EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/inputs/table.rs b/crates/air/src/components/inputs/table.rs index 40ab96f5..ae0a6c1a 100644 --- a/crates/air/src/components/inputs/table.rs +++ b/crates/air/src/components/inputs/table.rs @@ -1,6 +1,6 @@ use num_traits::{One, Zero}; use serde::{Deserialize, Serialize}; -use stwo_prover::core::{ +use stwo::core::{ backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, diff --git a/crates/air/src/components/inputs/witness.rs b/crates/air/src/components/inputs/witness.rs index 1580b77f..669f4ce1 100644 --- a/crates/air/src/components/inputs/witness.rs +++ b/crates/air/src/components/inputs/witness.rs @@ -2,7 +2,7 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo_prover::{ +use stwo::{ constraint_framework::{logup::LogupTraceGenerator, Relation}, core::backend::simd::{ m31::{PackedM31, LOG_N_LANES, N_LANES}, diff --git a/crates/air/src/components/less_than/component.rs b/crates/air/src/components/less_than/component.rs index 6d67d857..5ff1af14 100644 --- a/crates/air/src/components/less_than/component.rs +++ b/crates/air/src/components/less_than/component.rs @@ -1,5 +1,5 @@ use num_traits::One; -use stwo_prover::{ +use stwo::{ constraint_framework::{EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry}, core::fields::m31::M31, }; diff --git a/crates/air/src/components/less_than/table.rs b/crates/air/src/components/less_than/table.rs index 13c53618..d2d6f487 100644 --- a/crates/air/src/components/less_than/table.rs +++ b/crates/air/src/components/less_than/table.rs @@ -1,6 +1,6 @@ use num_traits::{One, Zero}; use serde::{Deserialize, Serialize}; -use stwo_prover::core::{ +use stwo::core::{ backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, diff --git a/crates/air/src/components/less_than/witness.rs b/crates/air/src/components/less_than/witness.rs index 0b27091e..d4c70fd5 100644 --- a/crates/air/src/components/less_than/witness.rs +++ b/crates/air/src/components/less_than/witness.rs @@ -2,7 +2,7 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo_prover::{ +use stwo::{ constraint_framework::{logup::LogupTraceGenerator, Relation}, core::backend::simd::{ m31::{PackedM31, LOG_N_LANES, N_LANES}, diff --git a/crates/air/src/components/log2/component.rs b/crates/air/src/components/log2/component.rs index 64fd0774..03a77b39 100644 --- a/crates/air/src/components/log2/component.rs +++ b/crates/air/src/components/log2/component.rs @@ -1,6 +1,6 @@ use crate::components::{lookups::log2::Log2LookupElements, Log2Claim, NodeElements}; use num_traits::One; -use stwo_prover::constraint_framework::{ +use stwo::constraint_framework::{ EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/log2/table.rs b/crates/air/src/components/log2/table.rs index 7c153dfc..d2553dff 100644 --- a/crates/air/src/components/log2/table.rs +++ b/crates/air/src/components/log2/table.rs @@ -1,6 +1,6 @@ use num_traits::{One, Zero}; use serde::{Deserialize, Serialize}; -use stwo_prover::core::{ +use stwo::core::{ backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, diff --git a/crates/air/src/components/log2/witness.rs b/crates/air/src/components/log2/witness.rs index fcfbbbcc..9d176e95 100644 --- a/crates/air/src/components/log2/witness.rs +++ b/crates/air/src/components/log2/witness.rs @@ -2,7 +2,7 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo_prover::{ +use stwo::{ constraint_framework::{logup::LogupTraceGenerator, Relation}, core::backend::simd::{ m31::{PackedM31, LOG_N_LANES, N_LANES}, diff --git a/crates/air/src/components/lookups/exp2/component.rs b/crates/air/src/components/lookups/exp2/component.rs index 29bb068c..c8e66207 100644 --- a/crates/air/src/components/lookups/exp2/component.rs +++ b/crates/air/src/components/lookups/exp2/component.rs @@ -1,4 +1,4 @@ -use stwo_prover::constraint_framework::{ +use stwo::constraint_framework::{ preprocessed_columns::PreProcessedColumnId, EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/lookups/exp2/mod.rs b/crates/air/src/components/lookups/exp2/mod.rs index 3ee05193..8e50f1dc 100644 --- a/crates/air/src/components/lookups/exp2/mod.rs +++ b/crates/air/src/components/lookups/exp2/mod.rs @@ -1,7 +1,7 @@ use std::sync::atomic::Ordering; use serde::{Deserialize, Serialize}; -use stwo_prover::{core::fields::m31::BaseField, relation}; +use stwo::{core::fields::m31::BaseField, relation}; use crate::{ components::lookups::exp2::table::{Exp2LookupTraceTable, Exp2LookupTraceTableRow}, diff --git a/crates/air/src/components/lookups/exp2/table.rs b/crates/air/src/components/lookups/exp2/table.rs index ac781f93..9777b721 100644 --- a/crates/air/src/components/lookups/exp2/table.rs +++ b/crates/air/src/components/lookups/exp2/table.rs @@ -1,6 +1,6 @@ use num_traits::Zero; use serde::{Deserialize, Serialize}; -use stwo_prover::core::{ +use stwo::core::{ backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, diff --git a/crates/air/src/components/lookups/exp2/witness.rs b/crates/air/src/components/lookups/exp2/witness.rs index 2d6152c2..52a326dc 100644 --- a/crates/air/src/components/lookups/exp2/witness.rs +++ b/crates/air/src/components/lookups/exp2/witness.rs @@ -3,7 +3,7 @@ use num_traits::One; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo_prover::{ +use stwo::{ constraint_framework::{logup::LogupTraceGenerator, Relation}, core::backend::simd::{ m31::{PackedM31, LOG_N_LANES, N_LANES}, diff --git a/crates/air/src/components/lookups/log2/component.rs b/crates/air/src/components/lookups/log2/component.rs index 84c27faf..a08d1ef5 100644 --- a/crates/air/src/components/lookups/log2/component.rs +++ b/crates/air/src/components/lookups/log2/component.rs @@ -1,4 +1,4 @@ -use stwo_prover::constraint_framework::{ +use stwo::constraint_framework::{ preprocessed_columns::PreProcessedColumnId, EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/lookups/log2/mod.rs b/crates/air/src/components/lookups/log2/mod.rs index 6973231c..d2497bec 100644 --- a/crates/air/src/components/lookups/log2/mod.rs +++ b/crates/air/src/components/lookups/log2/mod.rs @@ -1,7 +1,7 @@ use std::sync::atomic::Ordering; use serde::{Deserialize, Serialize}; -use stwo_prover::{core::fields::m31::BaseField, relation}; +use stwo::{core::fields::m31::BaseField, relation}; use crate::{ components::lookups::log2::table::{Log2LookupTraceTable, Log2LookupTraceTableRow}, diff --git a/crates/air/src/components/lookups/log2/table.rs b/crates/air/src/components/lookups/log2/table.rs index f11f686d..5dba9ea4 100644 --- a/crates/air/src/components/lookups/log2/table.rs +++ b/crates/air/src/components/lookups/log2/table.rs @@ -1,6 +1,6 @@ use num_traits::Zero; use serde::{Deserialize, Serialize}; -use stwo_prover::core::{ +use stwo::core::{ backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, diff --git a/crates/air/src/components/lookups/log2/witness.rs b/crates/air/src/components/lookups/log2/witness.rs index 86b1c3e8..f1dfaef4 100644 --- a/crates/air/src/components/lookups/log2/witness.rs +++ b/crates/air/src/components/lookups/log2/witness.rs @@ -3,7 +3,7 @@ use num_traits::One; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo_prover::{ +use stwo::{ constraint_framework::{logup::LogupTraceGenerator, Relation}, core::backend::simd::{ m31::{PackedM31, LOG_N_LANES, N_LANES}, diff --git a/crates/air/src/components/lookups/mod.rs b/crates/air/src/components/lookups/mod.rs index cf6e3c2b..248f1a8a 100644 --- a/crates/air/src/components/lookups/mod.rs +++ b/crates/air/src/components/lookups/mod.rs @@ -1,6 +1,6 @@ use serde::{Deserialize, Serialize}; use sin::{SinLookup, SinLookupElements}; -use stwo_prover::core::channel::Channel; +use stwo::core::channel::Channel; use crate::components::lookups::{ exp2::{Exp2Lookup, Exp2LookupElements}, diff --git a/crates/air/src/components/lookups/range_check/component.rs b/crates/air/src/components/lookups/range_check/component.rs index eaf66107..20cafa11 100644 --- a/crates/air/src/components/lookups/range_check/component.rs +++ b/crates/air/src/components/lookups/range_check/component.rs @@ -1,4 +1,4 @@ -use stwo_prover::constraint_framework::{ +use stwo::constraint_framework::{ preprocessed_columns::PreProcessedColumnId, EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/lookups/range_check/mod.rs b/crates/air/src/components/lookups/range_check/mod.rs index 69bee3a3..1aacc325 100644 --- a/crates/air/src/components/lookups/range_check/mod.rs +++ b/crates/air/src/components/lookups/range_check/mod.rs @@ -2,7 +2,7 @@ use std::sync::atomic::Ordering; use serde::{Deserialize, Serialize}; use serde_with::serde_as; -use stwo_prover::{core::fields::m31::BaseField, relation}; +use stwo::{core::fields::m31::BaseField, relation}; use crate::{ components::lookups::range_check::table::{ diff --git a/crates/air/src/components/lookups/range_check/table.rs b/crates/air/src/components/lookups/range_check/table.rs index f2d843f4..2dd00c14 100644 --- a/crates/air/src/components/lookups/range_check/table.rs +++ b/crates/air/src/components/lookups/range_check/table.rs @@ -1,6 +1,6 @@ use num_traits::Zero; use serde::{Deserialize, Serialize}; -use stwo_prover::core::{ +use stwo::core::{ backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, diff --git a/crates/air/src/components/lookups/range_check/witness.rs b/crates/air/src/components/lookups/range_check/witness.rs index fcca7741..c280b2bd 100644 --- a/crates/air/src/components/lookups/range_check/witness.rs +++ b/crates/air/src/components/lookups/range_check/witness.rs @@ -3,7 +3,7 @@ use num_traits::One; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo_prover::{ +use stwo::{ constraint_framework::{logup::LogupTraceGenerator, Relation}, core::backend::simd::{ m31::{PackedM31, LOG_N_LANES, N_LANES}, diff --git a/crates/air/src/components/lookups/sin/component.rs b/crates/air/src/components/lookups/sin/component.rs index a5891145..4f6b4298 100644 --- a/crates/air/src/components/lookups/sin/component.rs +++ b/crates/air/src/components/lookups/sin/component.rs @@ -1,4 +1,4 @@ -use stwo_prover::constraint_framework::{ +use stwo::constraint_framework::{ preprocessed_columns::PreProcessedColumnId, EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/lookups/sin/mod.rs b/crates/air/src/components/lookups/sin/mod.rs index 99d2bf01..fb95a92a 100644 --- a/crates/air/src/components/lookups/sin/mod.rs +++ b/crates/air/src/components/lookups/sin/mod.rs @@ -2,7 +2,7 @@ use std::{collections::BTreeSet, sync::atomic::Ordering}; use numerair::Fixed; use serde::{Deserialize, Serialize}; -use stwo_prover::{core::fields::m31::BaseField, relation}; +use stwo::{core::fields::m31::BaseField, relation}; use table::{SinLookupTraceTable, SinLookupTraceTableRow}; use crate::{preprocessed::LookupLayout, utils::AtomicMultiplicityColumn, DEFAULT_FP_SCALE}; diff --git a/crates/air/src/components/lookups/sin/table.rs b/crates/air/src/components/lookups/sin/table.rs index 0499df4c..98dcf50e 100644 --- a/crates/air/src/components/lookups/sin/table.rs +++ b/crates/air/src/components/lookups/sin/table.rs @@ -1,6 +1,6 @@ use num_traits::Zero; use serde::{Deserialize, Serialize}; -use stwo_prover::core::{ +use stwo::core::{ backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, diff --git a/crates/air/src/components/lookups/sin/witness.rs b/crates/air/src/components/lookups/sin/witness.rs index daae09ce..2ab12f2c 100644 --- a/crates/air/src/components/lookups/sin/witness.rs +++ b/crates/air/src/components/lookups/sin/witness.rs @@ -3,7 +3,7 @@ use num_traits::One; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo_prover::{ +use stwo::{ constraint_framework::{logup::LogupTraceGenerator, Relation}, core::backend::simd::{ m31::{PackedM31, LOG_N_LANES, N_LANES}, diff --git a/crates/air/src/components/max_reduce/component.rs b/crates/air/src/components/max_reduce/component.rs index 792ad305..6f1e8642 100644 --- a/crates/air/src/components/max_reduce/component.rs +++ b/crates/air/src/components/max_reduce/component.rs @@ -1,6 +1,6 @@ use crate::components::{MaxReduceClaim, NodeElements}; use num_traits::One; -use stwo_prover::constraint_framework::{ +use stwo::constraint_framework::{ EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/max_reduce/table.rs b/crates/air/src/components/max_reduce/table.rs index d92bc509..4fa1135d 100644 --- a/crates/air/src/components/max_reduce/table.rs +++ b/crates/air/src/components/max_reduce/table.rs @@ -1,5 +1,5 @@ use num_traits::{One, Zero}; -use stwo_prover::core::{ +use stwo::core::{ backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, diff --git a/crates/air/src/components/max_reduce/witness.rs b/crates/air/src/components/max_reduce/witness.rs index 386b0fee..18383885 100644 --- a/crates/air/src/components/max_reduce/witness.rs +++ b/crates/air/src/components/max_reduce/witness.rs @@ -2,7 +2,7 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo_prover::{ +use stwo::{ constraint_framework::{logup::LogupTraceGenerator, Relation}, core::backend::simd::{ m31::{PackedM31, LOG_N_LANES, N_LANES}, diff --git a/crates/air/src/components/mod.rs b/crates/air/src/components/mod.rs index e0dd4084..5012b76c 100644 --- a/crates/air/src/components/mod.rs +++ b/crates/air/src/components/mod.rs @@ -32,7 +32,7 @@ use sqrt::{ component::{SqrtComponent, SqrtEval}, table::SqrtColumn, }; -use stwo_prover::{ +use stwo::{ constraint_framework::TraceLocationAllocator, core::{ air::{Component, ComponentProver}, diff --git a/crates/air/src/components/mul/component.rs b/crates/air/src/components/mul/component.rs index ade9dab6..3de790f1 100644 --- a/crates/air/src/components/mul/component.rs +++ b/crates/air/src/components/mul/component.rs @@ -4,7 +4,7 @@ use crate::{ }; use num_traits::One; use numerair::eval::EvalFixedPoint; -use stwo_prover::{ +use stwo::{ constraint_framework::{EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry}, core::fields::m31::M31, }; diff --git a/crates/air/src/components/mul/table.rs b/crates/air/src/components/mul/table.rs index 7194689d..c52526bb 100644 --- a/crates/air/src/components/mul/table.rs +++ b/crates/air/src/components/mul/table.rs @@ -1,6 +1,6 @@ use num_traits::{One, Zero}; use serde::{Deserialize, Serialize}; -use stwo_prover::core::{ +use stwo::core::{ backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, diff --git a/crates/air/src/components/mul/witness.rs b/crates/air/src/components/mul/witness.rs index fb3c2748..5f968b32 100644 --- a/crates/air/src/components/mul/witness.rs +++ b/crates/air/src/components/mul/witness.rs @@ -6,7 +6,7 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo_prover::{ +use stwo::{ constraint_framework::{logup::LogupTraceGenerator, Relation}, core::backend::simd::{ m31::{PackedM31, LOG_N_LANES, N_LANES}, diff --git a/crates/air/src/components/recip/component.rs b/crates/air/src/components/recip/component.rs index f9aef57f..183606e8 100644 --- a/crates/air/src/components/recip/component.rs +++ b/crates/air/src/components/recip/component.rs @@ -1,7 +1,7 @@ use crate::components::{NodeElements, RecipClaim}; use num_traits::One; use numerair::eval::EvalFixedPoint; -use stwo_prover::constraint_framework::{ +use stwo::constraint_framework::{ EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/recip/table.rs b/crates/air/src/components/recip/table.rs index 23767ac4..08669383 100644 --- a/crates/air/src/components/recip/table.rs +++ b/crates/air/src/components/recip/table.rs @@ -1,6 +1,6 @@ use num_traits::{One, Zero}; use serde::{Deserialize, Serialize}; -use stwo_prover::core::{ +use stwo::core::{ backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, diff --git a/crates/air/src/components/recip/witness.rs b/crates/air/src/components/recip/witness.rs index 9fe1d163..dbad8850 100644 --- a/crates/air/src/components/recip/witness.rs +++ b/crates/air/src/components/recip/witness.rs @@ -6,7 +6,7 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo_prover::{ +use stwo::{ constraint_framework::{logup::LogupTraceGenerator, Relation}, core::backend::simd::{ m31::{PackedM31, LOG_N_LANES, N_LANES}, diff --git a/crates/air/src/components/rem/component.rs b/crates/air/src/components/rem/component.rs index 060f70c6..cdfc0bb2 100644 --- a/crates/air/src/components/rem/component.rs +++ b/crates/air/src/components/rem/component.rs @@ -1,7 +1,7 @@ use crate::components::{NodeElements, RemClaim}; use num_traits::One; use numerair::eval::EvalFixedPoint; -use stwo_prover::constraint_framework::{ +use stwo::constraint_framework::{ EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/rem/table.rs b/crates/air/src/components/rem/table.rs index 06e529c4..9e9e1086 100644 --- a/crates/air/src/components/rem/table.rs +++ b/crates/air/src/components/rem/table.rs @@ -1,6 +1,6 @@ use num_traits::{One, Zero}; use serde::{Serialize, Deserialize}; -use stwo_prover::core::{ +use stwo::core::{ backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, diff --git a/crates/air/src/components/rem/witness.rs b/crates/air/src/components/rem/witness.rs index 61dc9857..e575f9c8 100644 --- a/crates/air/src/components/rem/witness.rs +++ b/crates/air/src/components/rem/witness.rs @@ -6,7 +6,7 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils:: trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo_prover::{ +use stwo::{ constraint_framework::{logup::LogupTraceGenerator, Relation}, core::backend::simd::{ m31::{PackedM31, LOG_N_LANES, N_LANES}, diff --git a/crates/air/src/components/sin/component.rs b/crates/air/src/components/sin/component.rs index ae3f8fe7..934382b8 100644 --- a/crates/air/src/components/sin/component.rs +++ b/crates/air/src/components/sin/component.rs @@ -5,7 +5,7 @@ use crate::components::{ SinClaim, }; use num_traits::One; -use stwo_prover::constraint_framework::{ +use stwo::constraint_framework::{ EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/sin/table.rs b/crates/air/src/components/sin/table.rs index 64ffc7ca..0c1d1b8e 100644 --- a/crates/air/src/components/sin/table.rs +++ b/crates/air/src/components/sin/table.rs @@ -1,6 +1,6 @@ use num_traits::{One, Zero}; use serde::{Deserialize, Serialize}; -use stwo_prover::core::{ +use stwo::core::{ backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, diff --git a/crates/air/src/components/sin/witness.rs b/crates/air/src/components/sin/witness.rs index e8194a70..529c0672 100644 --- a/crates/air/src/components/sin/witness.rs +++ b/crates/air/src/components/sin/witness.rs @@ -8,7 +8,7 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo_prover::{ +use stwo::{ constraint_framework::{logup::LogupTraceGenerator, Relation}, core::backend::simd::{ m31::{PackedM31, LOG_N_LANES, N_LANES}, diff --git a/crates/air/src/components/sqrt/component.rs b/crates/air/src/components/sqrt/component.rs index f31d1af8..ea68e9e7 100644 --- a/crates/air/src/components/sqrt/component.rs +++ b/crates/air/src/components/sqrt/component.rs @@ -1,7 +1,7 @@ use crate::components::{NodeElements, SqrtClaim}; use num_traits::One; use numerair::eval::EvalFixedPoint; -use stwo_prover::constraint_framework::{ +use stwo::constraint_framework::{ EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/sqrt/table.rs b/crates/air/src/components/sqrt/table.rs index 7d6ed862..950ea364 100644 --- a/crates/air/src/components/sqrt/table.rs +++ b/crates/air/src/components/sqrt/table.rs @@ -1,6 +1,6 @@ use num_traits::{One, Zero}; use serde::{Deserialize, Serialize}; -use stwo_prover::core::{ +use stwo::core::{ backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, diff --git a/crates/air/src/components/sqrt/witness.rs b/crates/air/src/components/sqrt/witness.rs index ea2c846c..d98213f6 100644 --- a/crates/air/src/components/sqrt/witness.rs +++ b/crates/air/src/components/sqrt/witness.rs @@ -2,7 +2,7 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo_prover::{ +use stwo::{ constraint_framework::{logup::LogupTraceGenerator, Relation}, core::backend::simd::{ m31::{PackedM31, LOG_N_LANES, N_LANES}, diff --git a/crates/air/src/components/sum_reduce/component.rs b/crates/air/src/components/sum_reduce/component.rs index 3a55ad07..5784fa3e 100644 --- a/crates/air/src/components/sum_reduce/component.rs +++ b/crates/air/src/components/sum_reduce/component.rs @@ -1,6 +1,6 @@ use crate::components::{NodeElements, SumReduceClaim}; use num_traits::One; -use stwo_prover::constraint_framework::{ +use stwo::constraint_framework::{ EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/sum_reduce/table.rs b/crates/air/src/components/sum_reduce/table.rs index 0f07a4e8..d7ab4200 100644 --- a/crates/air/src/components/sum_reduce/table.rs +++ b/crates/air/src/components/sum_reduce/table.rs @@ -1,6 +1,6 @@ use num_traits::{One, Zero}; use serde::{Deserialize, Serialize}; -use stwo_prover::core::{ +use stwo::core::{ backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, diff --git a/crates/air/src/components/sum_reduce/witness.rs b/crates/air/src/components/sum_reduce/witness.rs index 62cf079e..1bf45f70 100644 --- a/crates/air/src/components/sum_reduce/witness.rs +++ b/crates/air/src/components/sum_reduce/witness.rs @@ -2,7 +2,7 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo_prover::{ +use stwo::{ constraint_framework::{logup::LogupTraceGenerator, Relation}, core::backend::simd::{ m31::{PackedM31, LOG_N_LANES, N_LANES}, diff --git a/crates/air/src/lib.rs b/crates/air/src/lib.rs index 7f548bfb..8b825815 100644 --- a/crates/air/src/lib.rs +++ b/crates/air/src/lib.rs @@ -6,7 +6,7 @@ use components::{ InteractionClaim, MaxReduceClaim, MulClaim, RecipClaim, RemClaim, SinClaim, SinLookupClaim, SqrtClaim, SumReduceClaim, }; -use stwo_prover::core::{channel::Channel, pcs::TreeVec}; +use stwo::core::{channel::Channel, pcs::TreeVec}; use crate::components::{ contiguous, inputs, less_than, ContiguousClaim, Exp2Claim, Exp2LookupClaim, InputsClaim, diff --git a/crates/air/src/preprocessed.rs b/crates/air/src/preprocessed.rs index d0edb9c4..bb0719dc 100644 --- a/crates/air/src/preprocessed.rs +++ b/crates/air/src/preprocessed.rs @@ -12,7 +12,7 @@ use crate::{ use itertools::Itertools; use numerair::Fixed; use serde::{Deserialize, Serialize}; -use stwo_prover::{ +use stwo::{ constraint_framework::preprocessed_columns::PreProcessedColumnId, core::{ backend::{ diff --git a/crates/air/src/utils.rs b/crates/air/src/utils.rs index 31112478..88223be6 100644 --- a/crates/air/src/utils.rs +++ b/crates/air/src/utils.rs @@ -1,7 +1,7 @@ use std::sync::atomic::{AtomicU32, Ordering}; use num_traits::Zero; -use stwo_prover::core::{ +use stwo::core::{ backend::{ simd::{ conversion::Pack, diff --git a/crates/graph/Cargo.toml b/crates/graph/Cargo.toml index 03b1069f..0510d8ce 100644 --- a/crates/graph/Cargo.toml +++ b/crates/graph/Cargo.toml @@ -7,7 +7,7 @@ license.workspace = true [dependencies] tracing.workspace = true -stwo-prover.workspace = true +stwo.workspace = true luminal.workspace = true rayon.workspace = true numerair.workspace = true diff --git a/crates/graph/src/op/prim.rs b/crates/graph/src/op/prim.rs index ee5125f0..41b5c790 100644 --- a/crates/graph/src/op/prim.rs +++ b/crates/graph/src/op/prim.rs @@ -26,7 +26,7 @@ use luminal::{ use num_traits::{identities::Zero, One}; use numerair::Fixed; use std::{ops::Deref, sync::Arc}; -use stwo_prover::core::fields::m31::{BaseField, M31}; +use stwo::core::fields::m31::{BaseField, M31}; use crate::{ data::StwoData, diff --git a/crates/prover/Cargo.toml b/crates/prover/Cargo.toml index 2ef4a427..84391c5a 100644 --- a/crates/prover/Cargo.toml +++ b/crates/prover/Cargo.toml @@ -7,7 +7,7 @@ license.workspace = true [dependencies] luminair_air = { path = "../air" } -stwo-prover.workspace = true +stwo.workspace = true luminair_utils = { path = "../utils" } tracing.workspace = true serde.workspace = true diff --git a/crates/prover/src/lib.rs b/crates/prover/src/lib.rs index 8353fa57..b637b303 100644 --- a/crates/prover/src/lib.rs +++ b/crates/prover/src/lib.rs @@ -6,8 +6,8 @@ use std::{ io::{BufReader, BufWriter, Write}, path::Path, }; -use stwo_prover::core::vcs::blake2_merkle::Blake2sMerkleHasher; -use stwo_prover::core::{prover::StarkProof, vcs::ops::MerkleHasher}; +use stwo::core::vcs::blake2_merkle::Blake2sMerkleHasher; +use stwo::core::{prover::StarkProof, vcs::ops::MerkleHasher}; pub mod prover; diff --git a/crates/prover/src/prover.rs b/crates/prover/src/prover.rs index 4347a153..91e40b9f 100644 --- a/crates/prover/src/prover.rs +++ b/crates/prover/src/prover.rs @@ -12,7 +12,7 @@ use luminair_air::{ LuminairClaim, LuminairInteractionClaim, LuminairInteractionClaimGenerator, }; use luminair_utils::LuminairError; -use stwo_prover::core::{ +use stwo::core::{ backend::simd::SimdBackend, channel::Blake2sChannel, pcs::{CommitmentSchemeProver, PcsConfig}, diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml index c763573d..843cc78d 100644 --- a/crates/utils/Cargo.toml +++ b/crates/utils/Cargo.toml @@ -7,4 +7,4 @@ license.workspace = true [dependencies] thiserror.workspace = true -stwo-prover.workspace = true +stwo.workspace = true diff --git a/crates/utils/src/lib.rs b/crates/utils/src/lib.rs index ae553f37..10775b2e 100644 --- a/crates/utils/src/lib.rs +++ b/crates/utils/src/lib.rs @@ -1,4 +1,4 @@ -use stwo_prover::core::prover::{ProvingError, VerificationError}; +use stwo::core::prover::{ProvingError, VerificationError}; use thiserror::Error; /// Main error type for LuminAIR operations diff --git a/crates/verifiers/rust/Cargo.toml b/crates/verifiers/rust/Cargo.toml index ff87cf79..4eb35736 100644 --- a/crates/verifiers/rust/Cargo.toml +++ b/crates/verifiers/rust/Cargo.toml @@ -7,7 +7,7 @@ license.workspace = true [dependencies] luminair_air = { path = "../../air" } -stwo-prover.workspace = true +stwo.workspace = true luminair_utils = { path = "../../utils" } luminair_prover = { path = "../../prover" } tracing.workspace = true diff --git a/crates/verifiers/rust/src/verifier.rs b/crates/verifiers/rust/src/verifier.rs index 2285489c..a5a2ee10 100644 --- a/crates/verifiers/rust/src/verifier.rs +++ b/crates/verifiers/rust/src/verifier.rs @@ -8,7 +8,7 @@ use luminair_prover::LuminairProof; use luminair_utils::LuminairError; use tracing::{info, span, Level}; -use stwo_prover::{ +use stwo::{ constraint_framework::{INTERACTION_TRACE_IDX, ORIGINAL_TRACE_IDX, PREPROCESSED_TRACE_IDX}, core::{ channel::Blake2sChannel, diff --git a/crates/verifiers/wasm/Cargo.toml b/crates/verifiers/wasm/Cargo.toml index 7dfca8af..b1a28c75 100644 --- a/crates/verifiers/wasm/Cargo.toml +++ b/crates/verifiers/wasm/Cargo.toml @@ -10,7 +10,7 @@ crate-type = ["cdylib"] [dependencies] luminair_air = { path = "../../air" } -stwo-prover.workspace = true +stwo.workspace = true luminair_prover = { path = "../../prover" } luminair_verifier = { path = "../rust" } wasm-bindgen = "0.2" diff --git a/crates/verifiers/wasm/src/verifier.rs b/crates/verifiers/wasm/src/verifier.rs index ca24217d..11a1947e 100644 --- a/crates/verifiers/wasm/src/verifier.rs +++ b/crates/verifiers/wasm/src/verifier.rs @@ -1,7 +1,7 @@ use luminair_air::settings::CircuitSettings; use luminair_prover::LuminairProof; use luminair_verifier::verifier::verify as verify_rust; -use stwo_prover::core::vcs::blake2_merkle::Blake2sMerkleHasher; +use stwo::core::vcs::blake2_merkle::Blake2sMerkleHasher; use wasm_bindgen::prelude::*; use tracing::{info, span, Level}; diff --git a/examples/risk-assessment/Cargo.toml b/examples/risk-assessment/Cargo.toml index 1d24a594..d6c99f75 100644 --- a/examples/risk-assessment/Cargo.toml +++ b/examples/risk-assessment/Cargo.toml @@ -6,6 +6,6 @@ repository.workspace = true license.workspace = true [dependencies] -stwo-prover.workspace = true +stwo.workspace = true luminal.workspace = true luminair = { path = "../../crates/prelude" } diff --git a/examples/simple/Cargo.toml b/examples/simple/Cargo.toml index 1503e9e8..812341dc 100644 --- a/examples/simple/Cargo.toml +++ b/examples/simple/Cargo.toml @@ -6,6 +6,6 @@ repository.workspace = true license.workspace = true [dependencies] -stwo-prover.workspace = true +stwo.workspace = true luminal.workspace = true luminair = {path = "../../crates/prelude"} \ No newline at end of file diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 776151d3..9aa89983 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,2 @@ [toolchain] -channel = "nightly-2025-04-06" -# profile = "default" \ No newline at end of file +channel = "nightly-2025-04-06" \ No newline at end of file From 2362a718481e24658d5dcf02be5f3e82087267a5 Mon Sep 17 00:00:00 2001 From: raphaelDkhn <113879115+raphaelDkhn@users.noreply.github.com> Date: Tue, 12 Aug 2025 19:12:20 +0300 Subject: [PATCH 2/2] fix compilation errors --- Cargo.lock | 359 ++++++++++-------- Cargo.toml | 7 +- crates/air/Cargo.toml | 3 +- crates/air/src/components/add/component.rs | 2 +- crates/air/src/components/add/table.rs | 6 +- crates/air/src/components/add/witness.rs | 14 +- .../src/components/contiguous/component.rs | 2 +- crates/air/src/components/contiguous/table.rs | 6 +- .../air/src/components/contiguous/witness.rs | 12 +- crates/air/src/components/exp2/component.rs | 2 +- crates/air/src/components/exp2/table.rs | 6 +- crates/air/src/components/exp2/witness.rs | 12 +- .../air/src/components/inputs/components.rs | 2 +- crates/air/src/components/inputs/table.rs | 6 +- crates/air/src/components/inputs/witness.rs | 12 +- .../air/src/components/less_than/component.rs | 6 +- crates/air/src/components/less_than/table.rs | 6 +- .../air/src/components/less_than/witness.rs | 12 +- crates/air/src/components/log2/component.rs | 2 +- crates/air/src/components/log2/table.rs | 6 +- crates/air/src/components/log2/witness.rs | 12 +- .../src/components/lookups/exp2/component.rs | 2 +- crates/air/src/components/lookups/exp2/mod.rs | 3 +- .../air/src/components/lookups/exp2/table.rs | 6 +- .../src/components/lookups/exp2/witness.rs | 12 +- .../src/components/lookups/log2/component.rs | 2 +- crates/air/src/components/lookups/log2/mod.rs | 5 +- .../air/src/components/lookups/log2/table.rs | 6 +- .../src/components/lookups/log2/witness.rs | 12 +- .../lookups/range_check/component.rs | 2 +- .../src/components/lookups/range_check/mod.rs | 3 +- .../components/lookups/range_check/table.rs | 6 +- .../components/lookups/range_check/witness.rs | 12 +- .../src/components/lookups/sin/component.rs | 2 +- crates/air/src/components/lookups/sin/mod.rs | 3 +- .../air/src/components/lookups/sin/table.rs | 6 +- .../air/src/components/lookups/sin/witness.rs | 12 +- .../src/components/max_reduce/component.rs | 2 +- crates/air/src/components/max_reduce/table.rs | 6 +- .../air/src/components/max_reduce/witness.rs | 12 +- crates/air/src/components/mod.rs | 19 +- crates/air/src/components/mul/component.rs | 6 +- crates/air/src/components/mul/table.rs | 6 +- crates/air/src/components/mul/witness.rs | 12 +- crates/air/src/components/recip/component.rs | 2 +- crates/air/src/components/recip/table.rs | 6 +- crates/air/src/components/recip/witness.rs | 12 +- crates/air/src/components/rem/component.rs | 2 +- crates/air/src/components/rem/table.rs | 6 +- crates/air/src/components/rem/witness.rs | 33 +- crates/air/src/components/sin/component.rs | 2 +- crates/air/src/components/sin/table.rs | 6 +- crates/air/src/components/sin/witness.rs | 12 +- crates/air/src/components/sqrt/component.rs | 2 +- crates/air/src/components/sqrt/table.rs | 6 +- crates/air/src/components/sqrt/witness.rs | 12 +- .../src/components/sum_reduce/component.rs | 2 +- crates/air/src/components/sum_reduce/table.rs | 6 +- .../air/src/components/sum_reduce/witness.rs | 12 +- crates/air/src/preprocessed.rs | 59 ++- crates/air/src/utils.rs | 24 +- crates/prover/src/lib.rs | 2 +- crates/prover/src/prover.rs | 13 +- crates/utils/src/lib.rs | 2 +- crates/verifiers/rust/Cargo.toml | 1 + crates/verifiers/rust/src/verifier.rs | 46 ++- 66 files changed, 467 insertions(+), 453 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bc613bad..3fad20aa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -22,6 +22,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" + [[package]] name = "android-tzdata" version = "0.1.1" @@ -45,9 +51,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstyle" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" +checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" [[package]] name = "ark-ff" @@ -133,9 +139,9 @@ checksum = "b0f477b951e452a0b6b4a10b53ccd569042d1d01729b519e02074a9c0958a063" [[package]] name = "autocfg" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "base64" @@ -188,7 +194,7 @@ dependencies = [ "arrayref", "arrayvec", "cc", - "cfg-if 1.0.0", + "cfg-if 1.0.1", "constant_time_eq", ] @@ -203,28 +209,28 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.17.0" +version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "bytemuck" -version = "1.23.0" +version = "1.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c" +checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.9.3" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ecc273b49b3205b83d648f0690daa588925572cc5063745bfe547fe7ec8e1a1" +checksum = "4f154e572231cb6ba2bd1176980827e3d5dc04cc183a75dea38109fbdd672d29" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.104", ] [[package]] @@ -247,9 +253,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.2.23" +version = "1.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766" +checksum = "2352e5597e9c544d5e6d9c95190d5d27738ade584fa8db0a16e130e5c2b5296e" dependencies = [ "shlex", ] @@ -268,9 +274,9 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" [[package]] name = "chrono" @@ -314,18 +320,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.38" +version = "4.5.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed93b9805f8ba930df42c2590f05453d5ec36cbb85d018868a5b24d31f6ac000" +checksum = "1c1f056bae57e3e54c3375c41ff79619ddd13460a17d7438712bd0d83fda4ff8" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.38" +version = "4.5.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "379026ff283facf611b0ea629334361c4211d1b12ee01024eec1591133b04120" +checksum = "b3e7f4214277f3c7aa526a59dd3fbe306a370daee1f8b7b8c987069cd8e888a8" dependencies = [ "anstyle", "clap_lex", @@ -333,9 +339,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" +checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" [[package]] name = "colored" @@ -363,7 +369,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 1.0.1", "wasm-bindgen", ] @@ -375,9 +381,9 @@ checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "core-foundation" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" dependencies = [ "core-foundation-sys", "libc", @@ -461,9 +467,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" +checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] name = "crypto-bigint" @@ -493,7 +499,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501" dependencies = [ "quote", - "syn 2.0.101", + "syn 2.0.104", ] [[package]] @@ -517,7 +523,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.101", + "syn 2.0.104", ] [[package]] @@ -528,7 +534,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" dependencies = [ "darling_core", "quote", - "syn 2.0.101", + "syn 2.0.104", ] [[package]] @@ -571,14 +577,14 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.104", ] [[package]] name = "dyn-clone" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005" +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "educe" @@ -589,7 +595,7 @@ dependencies = [ "enum-ordinalize", "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.104", ] [[package]] @@ -633,7 +639,7 @@ checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.104", ] [[package]] @@ -673,6 +679,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -716,10 +728,10 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 1.0.1", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi 0.11.1+wasi-snapshot-preview1", "wasm-bindgen", ] @@ -729,7 +741,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 1.0.1", "libc", "r-efi", "wasi 0.14.2+wasi-0.2.4", @@ -741,7 +753,7 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 1.0.1", "crunchy", ] @@ -756,15 +768,20 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.3" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] [[package]] name = "hermit-abi" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08" +checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" [[package]] name = "hex" @@ -781,15 +798,6 @@ dependencies = [ "digest", ] -[[package]] -name = "home" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" -dependencies = [ - "windows-sys 0.59.0", -] - [[package]] name = "iana-time-zone" version = "0.1.63" @@ -940,12 +948,13 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" dependencies = [ "equivalent", - "hashbrown 0.15.3", + "hashbrown 0.15.5", + "rayon", "serde", ] @@ -955,7 +964,7 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 1.0.1", ] [[package]] @@ -1036,7 +1045,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" dependencies = [ "cesu8", - "cfg-if 1.0.0", + "cfg-if 1.0.1", "combine", "jni-sys", "log", @@ -1069,9 +1078,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.172" +version = "0.2.175" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" +checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" [[package]] name = "litemap" @@ -1081,9 +1090,9 @@ checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" [[package]] name = "lock_api" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" dependencies = [ "autocfg", "scopeguard", @@ -1121,7 +1130,7 @@ dependencies = [ "luminair_verifier", "serde", "serde-wasm-bindgen", - "stwo-prover", + "stwo", "tracing", "tracing-wasm", "uuid", @@ -1144,10 +1153,11 @@ dependencies = [ "serde", "serde_json", "serde_with", + "stwo", "stwo-air-utils", "stwo-air-utils-derive", - "stwo-prover", - "thiserror 2.0.12", + "stwo-constraint-framework", + "thiserror 2.0.14", "tracing", "typetag", ] @@ -1175,8 +1185,8 @@ dependencies = [ "regex", "rustc-hash 2.1.1", "serde", - "stwo-prover", - "thiserror 2.0.12", + "stwo", + "thiserror 2.0.14", "tracing", "typetag", ] @@ -1190,7 +1200,7 @@ dependencies = [ "luminair_utils", "serde", "serde_json", - "stwo-prover", + "stwo", "tracing", ] @@ -1198,8 +1208,8 @@ dependencies = [ name = "luminair_utils" version = "0.0.1" dependencies = [ - "stwo-prover", - "thiserror 2.0.12", + "stwo", + "thiserror 2.0.14", ] [[package]] @@ -1209,7 +1219,8 @@ dependencies = [ "luminair_air", "luminair_prover", "luminair_utils", - "stwo-prover", + "stwo", + "stwo-constraint-framework", "tracing", ] @@ -1274,9 +1285,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.4" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" [[package]] name = "memory_units" @@ -1327,7 +1338,7 @@ dependencies = [ [[package]] name = "numerair" version = "0.1.0" -source = "git+https://github.com/gizatechxyz/NumerAir.git?rev=bb75385#bb75385b2ab64baab9a7ad5e855f763ee197734d" +source = "git+https://github.com/gizatechxyz/NumerAir.git?rev=11d1d26#11d1d263de70bcf267421c23d88bac3356473743" dependencies = [ "bytemuck", "lazy_static", @@ -1335,7 +1346,8 @@ dependencies = [ "once_cell", "rayon", "serde", - "stwo-prover", + "stwo", + "stwo-constraint-framework", ] [[package]] @@ -1377,9 +1389,9 @@ checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e" [[package]] name = "parking_lot" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" dependencies = [ "lock_api", "parking_lot_core", @@ -1387,11 +1399,11 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.10" +version = "0.9.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 1.0.1", "libc", "redox_syscall", "smallvec", @@ -1417,7 +1429,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.9.0", + "indexmap 2.10.0", ] [[package]] @@ -1480,9 +1492,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.95" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +checksum = "d61789d7719defeb74ea5fe81f2fdfdbd28a803847077cecce2ff14e1472f6f1" dependencies = [ "unicode-ident", ] @@ -1498,9 +1510,9 @@ dependencies = [ [[package]] name = "r-efi" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" [[package]] name = "rand" @@ -1560,9 +1572,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.12" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af" +checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77" dependencies = [ "bitflags", ] @@ -1584,7 +1596,7 @@ checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.104", ] [[package]] @@ -1632,7 +1644,7 @@ version = "0.0.1" dependencies = [ "luminair", "luminal", - "stwo-prover", + "stwo", ] [[package]] @@ -1658,9 +1670,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ryu" @@ -1691,9 +1703,9 @@ dependencies = [ [[package]] name = "schemars" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1375ba8ef45a6f15d83fa8748f1079428295d403d6ea991d09ab100155fbc06d" +checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0" dependencies = [ "dyn-clone", "ref-cast", @@ -1741,14 +1753,14 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.104", ] [[package]] name = "serde_json" -version = "1.0.140" +version = "1.0.142" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7" dependencies = [ "itoa", "memchr", @@ -1766,9 +1778,9 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.9.0", + "indexmap 2.10.0", "schemars 0.9.0", - "schemars 1.0.3", + "schemars 1.0.4", "serde", "serde_derive", "serde_json", @@ -1785,7 +1797,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.104", ] [[package]] @@ -1794,7 +1806,7 @@ version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 1.0.1", "cpufeatures", "digest", ] @@ -1820,14 +1832,14 @@ version = "0.0.1" dependencies = [ "luminair", "luminal", - "stwo-prover", + "stwo", ] [[package]] name = "smallvec" -version = "1.15.0" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "stable_deref_trait" @@ -1863,7 +1875,7 @@ checksum = "bbc159a1934c7be9761c237333a57febe060ace2bc9e3b337a59a37af206d19f" dependencies = [ "starknet-curve", "starknet-ff", - "syn 2.0.101", + "syn 2.0.104", ] [[package]] @@ -1889,54 +1901,79 @@ dependencies = [ "serde", ] +[[package]] +name = "std-shims" +version = "0.1.0" +source = "git+https://github.com/starkware-libs/stwo?rev=0790eba#0790eba46b8af5697083d84fb75bd34b08a0b31f" + [[package]] name = "strsim" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" +[[package]] +name = "stwo" +version = "0.1.1" +source = "git+https://github.com/starkware-libs/stwo?rev=0790eba#0790eba46b8af5697083d84fb75bd34b08a0b31f" +dependencies = [ + "blake2", + "blake3", + "bytemuck", + "cfg-if 1.0.1", + "educe", + "fnv", + "hashbrown 0.15.5", + "hex", + "indexmap 2.10.0", + "itertools 0.12.1", + "num-traits", + "rand", + "rayon", + "serde", + "starknet-crypto", + "starknet-ff", + "std-shims", + "thiserror 2.0.14", + "tracing", + "tracing-subscriber", +] + [[package]] name = "stwo-air-utils" version = "0.1.1" -source = "git+https://github.com/starkware-libs/stwo?rev=045963c#045963c3814e605e18d3edafadc79f52de8f21bb" +source = "git+https://github.com/starkware-libs/stwo?rev=0790eba#0790eba46b8af5697083d84fb75bd34b08a0b31f" dependencies = [ "bytemuck", "itertools 0.12.1", "rayon", + "stwo", "stwo-air-utils-derive", - "stwo-prover", ] [[package]] name = "stwo-air-utils-derive" version = "0.1.0" -source = "git+https://github.com/starkware-libs/stwo?rev=045963c#045963c3814e605e18d3edafadc79f52de8f21bb" +source = "git+https://github.com/starkware-libs/stwo?rev=0790eba#0790eba46b8af5697083d84fb75bd34b08a0b31f" dependencies = [ "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.104", ] [[package]] -name = "stwo-prover" +name = "stwo-constraint-framework" version = "0.1.1" -source = "git+https://github.com/starkware-libs/stwo?rev=045963c#045963c3814e605e18d3edafadc79f52de8f21bb" +source = "git+https://github.com/starkware-libs/stwo?rev=0790eba#0790eba46b8af5697083d84fb75bd34b08a0b31f" dependencies = [ - "blake2", - "blake3", - "bytemuck", - "cfg-if 1.0.0", - "educe", - "hex", + "hashbrown 0.15.5", "itertools 0.12.1", "num-traits", "rand", "rayon", - "serde", - "starknet-crypto", - "starknet-ff", - "thiserror 1.0.69", + "std-shims", + "stwo", "tracing", ] @@ -1975,9 +2012,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.101" +version = "2.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" +checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" dependencies = [ "proc-macro2", "quote", @@ -1992,7 +2029,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.104", ] [[package]] @@ -2016,11 +2053,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.12" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +checksum = "0b0949c3a6c842cbde3f1686d6eea5a010516deb7085f79db747562d4102f41e" dependencies = [ - "thiserror-impl 2.0.12", + "thiserror-impl 2.0.14", ] [[package]] @@ -2031,28 +2068,27 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.104", ] [[package]] name = "thiserror-impl" -version = "2.0.12" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +checksum = "cc5b44b4ab9c2fdd0e0512e6bece8388e214c0749f5862b114cc5b7a25daf227" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.104", ] [[package]] name = "thread_local" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" dependencies = [ - "cfg-if 1.0.0", - "once_cell", + "cfg-if 1.0.1", ] [[package]] @@ -2128,20 +2164,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.28" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" +checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.104", ] [[package]] name = "tracing-core" -version = "0.1.33" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" +checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" dependencies = [ "once_cell", ] @@ -2201,7 +2237,7 @@ checksum = "35f5380909ffc31b4de4f4bdf96b877175a016aa2ca98cee39fcfd8c4d53d952" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.104", ] [[package]] @@ -2235,9 +2271,9 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "uuid" -version = "1.16.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" +checksum = "f33196643e165781c20a5ead5582283a7dacbb87855d867fbc2df3f81eddc1be" dependencies = [ "getrandom 0.3.3", "js-sys", @@ -2262,9 +2298,9 @@ dependencies = [ [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasi" @@ -2281,7 +2317,7 @@ version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 1.0.1", "once_cell", "rustversion", "wasm-bindgen-macro", @@ -2297,7 +2333,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.104", "wasm-bindgen-shared", ] @@ -2319,7 +2355,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.104", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2345,12 +2381,11 @@ dependencies = [ [[package]] name = "webbrowser" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5df295f8451142f1856b1bd86a606dfe9587d439bc036e319c827700dbd555e" +checksum = "aaf4f3c0ba838e82b4e5ccc4157003fb8c324ee24c058470ffb82820becbde98" dependencies = [ "core-foundation", - "home", "jni", "log", "ndk-context", @@ -2424,7 +2459,7 @@ checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.104", ] [[package]] @@ -2435,7 +2470,7 @@ checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.104", ] [[package]] @@ -2636,28 +2671,28 @@ checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.104", "synstructure", ] [[package]] name = "zerocopy" -version = "0.8.25" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" +checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.25" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef" +checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.104", ] [[package]] @@ -2677,7 +2712,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.104", "synstructure", ] @@ -2698,7 +2733,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.104", ] [[package]] @@ -2714,9 +2749,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.2" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" +checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b" dependencies = [ "yoke", "zerofrom", @@ -2731,5 +2766,5 @@ checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.101", + "syn 2.0.104", ] diff --git a/Cargo.toml b/Cargo.toml index 51f6dc17..8dc69b1c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,10 +21,13 @@ license = "MIT" stwo = { git = "https://github.com/starkware-libs/stwo", rev = "0790eba", features = [ "parallel", ], default-features = false } +stwo-constraint-framework = { git = "https://github.com/starkware-libs/stwo", rev = "0790eba", features = [ + "parallel", "prover", "std" +], default-features = false } stwo-air-utils-derive = { git = "https://github.com/starkware-libs/stwo", rev = "0790eba" } stwo-air-utils = { git = "https://github.com/starkware-libs/stwo", rev = "0790eba" } luminal = { git = "https://github.com/raphaelDkhn/luminal.git", rev = "80ae0fd" } -numerair = { git = "https://github.com/gizatechxyz/NumerAir.git", rev = "bb75385" } +numerair = { git = "https://github.com/gizatechxyz/NumerAir.git", rev = "11d1d26" } rayon = "1.10.0" tracing = "0.1" tracing-subscriber = "0.3" @@ -43,4 +46,4 @@ debug = false lto = true [profile.test] -inherits = "release" \ No newline at end of file +inherits = "release" diff --git a/crates/air/Cargo.toml b/crates/air/Cargo.toml index 0e3616de..79c8f123 100644 --- a/crates/air/Cargo.toml +++ b/crates/air/Cargo.toml @@ -7,6 +7,7 @@ license.workspace = true [dependencies] stwo.workspace = true +stwo-constraint-framework.workspace=true stwo-air-utils-derive.workspace = true stwo-air-utils.workspace = true luminal.workspace = true @@ -21,4 +22,4 @@ rayon.workspace = true bincode.workspace = true luminair_utils = { path = "../utils" } itertools = "0.12.0" -serde_with = "3.14.0" +serde_with = { version = "3.14.0", features = ["indexmap_2"] } diff --git a/crates/air/src/components/add/component.rs b/crates/air/src/components/add/component.rs index df9404fa..168bc3e2 100644 --- a/crates/air/src/components/add/component.rs +++ b/crates/air/src/components/add/component.rs @@ -1,7 +1,7 @@ use crate::components::{AddClaim, NodeElements}; use num_traits::One; use numerair::eval::EvalFixedPoint; -use stwo::constraint_framework::{ +use stwo_constraint_framework::{ EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/add/table.rs b/crates/air/src/components/add/table.rs index 30b7b22f..1513cf55 100644 --- a/crates/air/src/components/add/table.rs +++ b/crates/air/src/components/add/table.rs @@ -1,11 +1,11 @@ use num_traits::{One, Zero}; use serde::{Deserialize, Serialize}; -use stwo::core::{ - backend::simd::{ +use stwo::{ + core::fields::m31::M31, + prover::backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, }, - fields::m31::M31, }; use crate::components::TraceColumn; diff --git a/crates/air/src/components/add/witness.rs b/crates/air/src/components/add/witness.rs index 2d845273..fee77c6f 100644 --- a/crates/air/src/components/add/witness.rs +++ b/crates/air/src/components/add/witness.rs @@ -1,15 +1,13 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; +use stwo::prover::backend::simd::{ + m31::{PackedM31, LOG_N_LANES, N_LANES}, + qm31::PackedQM31, + SimdBackend, +}; +use stwo_constraint_framework::{LogupTraceGenerator, Relation}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo::{ - constraint_framework::{logup::LogupTraceGenerator, Relation}, - core::backend::simd::{ - m31::{PackedM31, LOG_N_LANES, N_LANES}, - qm31::PackedQM31, - SimdBackend, - }, -}; use crate::{ components::{ diff --git a/crates/air/src/components/contiguous/component.rs b/crates/air/src/components/contiguous/component.rs index d4011f43..b278cdf6 100644 --- a/crates/air/src/components/contiguous/component.rs +++ b/crates/air/src/components/contiguous/component.rs @@ -1,6 +1,6 @@ use crate::components::{ContiguousClaim, NodeElements}; use num_traits::One; -use stwo::constraint_framework::{ +use stwo_constraint_framework::{ EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/contiguous/table.rs b/crates/air/src/components/contiguous/table.rs index 16b26b27..6fe95b73 100644 --- a/crates/air/src/components/contiguous/table.rs +++ b/crates/air/src/components/contiguous/table.rs @@ -1,11 +1,11 @@ use num_traits::{One, Zero}; use serde::{Deserialize, Serialize}; -use stwo::core::{ - backend::simd::{ +use stwo::{ + core::fields::m31::M31, + prover::backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, }, - fields::m31::M31, }; use crate::components::TraceColumn; diff --git a/crates/air/src/components/contiguous/witness.rs b/crates/air/src/components/contiguous/witness.rs index 2379fb91..cdc0c8ab 100644 --- a/crates/air/src/components/contiguous/witness.rs +++ b/crates/air/src/components/contiguous/witness.rs @@ -2,14 +2,12 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo::{ - constraint_framework::{logup::LogupTraceGenerator, Relation}, - core::backend::simd::{ - m31::{PackedM31, LOG_N_LANES, N_LANES}, - qm31::PackedQM31, - SimdBackend, - }, +use stwo::prover::backend::simd::{ + m31::{PackedM31, LOG_N_LANES, N_LANES}, + qm31::PackedQM31, + SimdBackend, }; +use stwo_constraint_framework::{LogupTraceGenerator, Relation}; use crate::{ components::{ContiguousClaim, InteractionClaim, NodeElements}, diff --git a/crates/air/src/components/exp2/component.rs b/crates/air/src/components/exp2/component.rs index 20bfa143..6f10e957 100644 --- a/crates/air/src/components/exp2/component.rs +++ b/crates/air/src/components/exp2/component.rs @@ -1,6 +1,6 @@ use crate::components::{lookups::exp2::Exp2LookupElements, Exp2Claim, NodeElements}; use num_traits::One; -use stwo::constraint_framework::{ +use stwo_constraint_framework::{ EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/exp2/table.rs b/crates/air/src/components/exp2/table.rs index fcaf02cc..65caec5b 100644 --- a/crates/air/src/components/exp2/table.rs +++ b/crates/air/src/components/exp2/table.rs @@ -1,11 +1,11 @@ use num_traits::{One, Zero}; use serde::{Deserialize, Serialize}; -use stwo::core::{ - backend::simd::{ +use stwo::{ + core::fields::m31::M31, + prover::backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, }, - fields::m31::M31, }; use super::witness::N_TRACE_COLUMNS; diff --git a/crates/air/src/components/exp2/witness.rs b/crates/air/src/components/exp2/witness.rs index cd677a1a..c9683325 100644 --- a/crates/air/src/components/exp2/witness.rs +++ b/crates/air/src/components/exp2/witness.rs @@ -2,14 +2,12 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo::{ - constraint_framework::{logup::LogupTraceGenerator, Relation}, - core::backend::simd::{ - m31::{PackedM31, LOG_N_LANES, N_LANES}, - qm31::PackedQM31, - SimdBackend, - }, +use stwo::prover::backend::simd::{ + m31::{PackedM31, LOG_N_LANES, N_LANES}, + qm31::PackedQM31, + SimdBackend, }; +use stwo_constraint_framework::{LogupTraceGenerator, Relation}; use crate::{ components::{ diff --git a/crates/air/src/components/inputs/components.rs b/crates/air/src/components/inputs/components.rs index e3bcc681..a704a1f3 100644 --- a/crates/air/src/components/inputs/components.rs +++ b/crates/air/src/components/inputs/components.rs @@ -1,6 +1,6 @@ use crate::components::{InputsClaim, NodeElements}; use num_traits::One; -use stwo::constraint_framework::{ +use stwo_constraint_framework::{ EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/inputs/table.rs b/crates/air/src/components/inputs/table.rs index ae0a6c1a..52c65ccc 100644 --- a/crates/air/src/components/inputs/table.rs +++ b/crates/air/src/components/inputs/table.rs @@ -1,11 +1,11 @@ use num_traits::{One, Zero}; use serde::{Deserialize, Serialize}; -use stwo::core::{ - backend::simd::{ +use stwo::{ + core::fields::m31::M31, + prover::backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, }, - fields::m31::M31, }; use crate::components::TraceColumn; diff --git a/crates/air/src/components/inputs/witness.rs b/crates/air/src/components/inputs/witness.rs index 669f4ce1..0201ed66 100644 --- a/crates/air/src/components/inputs/witness.rs +++ b/crates/air/src/components/inputs/witness.rs @@ -2,14 +2,12 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo::{ - constraint_framework::{logup::LogupTraceGenerator, Relation}, - core::backend::simd::{ - m31::{PackedM31, LOG_N_LANES, N_LANES}, - qm31::PackedQM31, - SimdBackend, - }, +use stwo::prover::backend::simd::{ + m31::{PackedM31, LOG_N_LANES, N_LANES}, + qm31::PackedQM31, + SimdBackend, }; +use stwo_constraint_framework::{LogupTraceGenerator, Relation}; use crate::{ components::{ diff --git a/crates/air/src/components/less_than/component.rs b/crates/air/src/components/less_than/component.rs index 5ff1af14..e9a67235 100644 --- a/crates/air/src/components/less_than/component.rs +++ b/crates/air/src/components/less_than/component.rs @@ -1,8 +1,6 @@ use num_traits::One; -use stwo::{ - constraint_framework::{EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry}, - core::fields::m31::M31, -}; +use stwo::core::fields::m31::M31; +use stwo_constraint_framework::{EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry}; use crate::{ components::{lookups::range_check::RangeCheckLookupElements, LessThanClaim, NodeElements}, diff --git a/crates/air/src/components/less_than/table.rs b/crates/air/src/components/less_than/table.rs index d2d6f487..89752eec 100644 --- a/crates/air/src/components/less_than/table.rs +++ b/crates/air/src/components/less_than/table.rs @@ -1,11 +1,11 @@ use num_traits::{One, Zero}; use serde::{Deserialize, Serialize}; -use stwo::core::{ - backend::simd::{ +use stwo::{ + core::fields::m31::M31, + prover::backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, }, - fields::m31::M31, }; use super::witness::N_TRACE_COLUMNS; diff --git a/crates/air/src/components/less_than/witness.rs b/crates/air/src/components/less_than/witness.rs index d4c70fd5..72ecb741 100644 --- a/crates/air/src/components/less_than/witness.rs +++ b/crates/air/src/components/less_than/witness.rs @@ -2,14 +2,12 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo::{ - constraint_framework::{logup::LogupTraceGenerator, Relation}, - core::backend::simd::{ - m31::{PackedM31, LOG_N_LANES, N_LANES}, - qm31::PackedQM31, - SimdBackend, - }, +use stwo::prover::backend::simd::{ + m31::{PackedM31, LOG_N_LANES, N_LANES}, + qm31::PackedQM31, + SimdBackend, }; +use stwo_constraint_framework::{LogupTraceGenerator, Relation}; use crate::{ components::{ diff --git a/crates/air/src/components/log2/component.rs b/crates/air/src/components/log2/component.rs index 03a77b39..878bbbde 100644 --- a/crates/air/src/components/log2/component.rs +++ b/crates/air/src/components/log2/component.rs @@ -1,6 +1,6 @@ use crate::components::{lookups::log2::Log2LookupElements, Log2Claim, NodeElements}; use num_traits::One; -use stwo::constraint_framework::{ +use stwo_constraint_framework::{ EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/log2/table.rs b/crates/air/src/components/log2/table.rs index d2553dff..a391b837 100644 --- a/crates/air/src/components/log2/table.rs +++ b/crates/air/src/components/log2/table.rs @@ -1,11 +1,11 @@ use num_traits::{One, Zero}; use serde::{Deserialize, Serialize}; -use stwo::core::{ - backend::simd::{ +use stwo::{ + core::fields::m31::M31, + prover::backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, }, - fields::m31::M31, }; use super::witness::N_TRACE_COLUMNS; diff --git a/crates/air/src/components/log2/witness.rs b/crates/air/src/components/log2/witness.rs index 9d176e95..e7e22d34 100644 --- a/crates/air/src/components/log2/witness.rs +++ b/crates/air/src/components/log2/witness.rs @@ -2,14 +2,12 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo::{ - constraint_framework::{logup::LogupTraceGenerator, Relation}, - core::backend::simd::{ - m31::{PackedM31, LOG_N_LANES, N_LANES}, - qm31::PackedQM31, - SimdBackend, - }, +use stwo::prover::backend::simd::{ + m31::{PackedM31, LOG_N_LANES, N_LANES}, + qm31::PackedQM31, + SimdBackend, }; +use stwo_constraint_framework::{LogupTraceGenerator, Relation}; use crate::{ components::{ diff --git a/crates/air/src/components/lookups/exp2/component.rs b/crates/air/src/components/lookups/exp2/component.rs index c8e66207..7edec1eb 100644 --- a/crates/air/src/components/lookups/exp2/component.rs +++ b/crates/air/src/components/lookups/exp2/component.rs @@ -1,4 +1,4 @@ -use stwo::constraint_framework::{ +use stwo_constraint_framework::{ preprocessed_columns::PreProcessedColumnId, EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/lookups/exp2/mod.rs b/crates/air/src/components/lookups/exp2/mod.rs index 8e50f1dc..879fc14d 100644 --- a/crates/air/src/components/lookups/exp2/mod.rs +++ b/crates/air/src/components/lookups/exp2/mod.rs @@ -1,7 +1,8 @@ use std::sync::atomic::Ordering; use serde::{Deserialize, Serialize}; -use stwo::{core::fields::m31::BaseField, relation}; +use stwo::core::fields::m31::BaseField; +use stwo_constraint_framework::relation; use crate::{ components::lookups::exp2::table::{Exp2LookupTraceTable, Exp2LookupTraceTableRow}, diff --git a/crates/air/src/components/lookups/exp2/table.rs b/crates/air/src/components/lookups/exp2/table.rs index 9777b721..ecac587b 100644 --- a/crates/air/src/components/lookups/exp2/table.rs +++ b/crates/air/src/components/lookups/exp2/table.rs @@ -1,11 +1,11 @@ use num_traits::Zero; use serde::{Deserialize, Serialize}; -use stwo::core::{ - backend::simd::{ +use stwo::{ + core::fields::m31::M31, + prover::backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, }, - fields::m31::M31, }; use crate::components::TraceColumn; diff --git a/crates/air/src/components/lookups/exp2/witness.rs b/crates/air/src/components/lookups/exp2/witness.rs index 52a326dc..79425202 100644 --- a/crates/air/src/components/lookups/exp2/witness.rs +++ b/crates/air/src/components/lookups/exp2/witness.rs @@ -3,14 +3,12 @@ use num_traits::One; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo::{ - constraint_framework::{logup::LogupTraceGenerator, Relation}, - core::backend::simd::{ - m31::{PackedM31, LOG_N_LANES, N_LANES}, - qm31::PackedQM31, - SimdBackend, - }, +use stwo::prover::backend::simd::{ + m31::{PackedM31, LOG_N_LANES, N_LANES}, + qm31::PackedQM31, + SimdBackend, }; +use stwo_constraint_framework::{LogupTraceGenerator, Relation}; use crate::{ components::{ diff --git a/crates/air/src/components/lookups/log2/component.rs b/crates/air/src/components/lookups/log2/component.rs index a08d1ef5..a73fc369 100644 --- a/crates/air/src/components/lookups/log2/component.rs +++ b/crates/air/src/components/lookups/log2/component.rs @@ -1,4 +1,4 @@ -use stwo::constraint_framework::{ +use stwo_constraint_framework::{ preprocessed_columns::PreProcessedColumnId, EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/lookups/log2/mod.rs b/crates/air/src/components/lookups/log2/mod.rs index d2497bec..eb5aa839 100644 --- a/crates/air/src/components/lookups/log2/mod.rs +++ b/crates/air/src/components/lookups/log2/mod.rs @@ -1,7 +1,8 @@ use std::sync::atomic::Ordering; use serde::{Deserialize, Serialize}; -use stwo::{core::fields::m31::BaseField, relation}; +use stwo::core::fields::m31::BaseField; +use stwo_constraint_framework::relation; use crate::{ components::lookups::log2::table::{Log2LookupTraceTable, Log2LookupTraceTableRow}, @@ -42,4 +43,4 @@ impl Log2Lookup { }); } } -} \ No newline at end of file +} diff --git a/crates/air/src/components/lookups/log2/table.rs b/crates/air/src/components/lookups/log2/table.rs index 5dba9ea4..7fd7bfa6 100644 --- a/crates/air/src/components/lookups/log2/table.rs +++ b/crates/air/src/components/lookups/log2/table.rs @@ -1,11 +1,11 @@ use num_traits::Zero; use serde::{Deserialize, Serialize}; -use stwo::core::{ - backend::simd::{ +use stwo::{ + core::fields::m31::M31, + prover::backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, }, - fields::m31::M31, }; use crate::components::TraceColumn; diff --git a/crates/air/src/components/lookups/log2/witness.rs b/crates/air/src/components/lookups/log2/witness.rs index f1dfaef4..89f7443d 100644 --- a/crates/air/src/components/lookups/log2/witness.rs +++ b/crates/air/src/components/lookups/log2/witness.rs @@ -3,14 +3,12 @@ use num_traits::One; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo::{ - constraint_framework::{logup::LogupTraceGenerator, Relation}, - core::backend::simd::{ - m31::{PackedM31, LOG_N_LANES, N_LANES}, - qm31::PackedQM31, - SimdBackend, - }, +use stwo::prover::backend::simd::{ + m31::{PackedM31, LOG_N_LANES, N_LANES}, + qm31::PackedQM31, + SimdBackend, }; +use stwo_constraint_framework::{LogupTraceGenerator, Relation}; use crate::{ components::{ diff --git a/crates/air/src/components/lookups/range_check/component.rs b/crates/air/src/components/lookups/range_check/component.rs index 20cafa11..92a66711 100644 --- a/crates/air/src/components/lookups/range_check/component.rs +++ b/crates/air/src/components/lookups/range_check/component.rs @@ -1,4 +1,4 @@ -use stwo::constraint_framework::{ +use stwo_constraint_framework::{ preprocessed_columns::PreProcessedColumnId, EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/lookups/range_check/mod.rs b/crates/air/src/components/lookups/range_check/mod.rs index 1aacc325..0a4fd2d4 100644 --- a/crates/air/src/components/lookups/range_check/mod.rs +++ b/crates/air/src/components/lookups/range_check/mod.rs @@ -2,7 +2,8 @@ use std::sync::atomic::Ordering; use serde::{Deserialize, Serialize}; use serde_with::serde_as; -use stwo::{core::fields::m31::BaseField, relation}; +use stwo::core::fields::m31::BaseField; +use stwo_constraint_framework::relation; use crate::{ components::lookups::range_check::table::{ diff --git a/crates/air/src/components/lookups/range_check/table.rs b/crates/air/src/components/lookups/range_check/table.rs index 2dd00c14..ffcaf70b 100644 --- a/crates/air/src/components/lookups/range_check/table.rs +++ b/crates/air/src/components/lookups/range_check/table.rs @@ -1,11 +1,11 @@ use num_traits::Zero; use serde::{Deserialize, Serialize}; -use stwo::core::{ - backend::simd::{ +use stwo::{ + core::fields::m31::M31, + prover::backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, }, - fields::m31::M31, }; use crate::components::{lookups::range_check::witness::N_TRACE_COLUMNS, TraceColumn}; diff --git a/crates/air/src/components/lookups/range_check/witness.rs b/crates/air/src/components/lookups/range_check/witness.rs index c280b2bd..ca3aa522 100644 --- a/crates/air/src/components/lookups/range_check/witness.rs +++ b/crates/air/src/components/lookups/range_check/witness.rs @@ -3,14 +3,12 @@ use num_traits::One; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo::{ - constraint_framework::{logup::LogupTraceGenerator, Relation}, - core::backend::simd::{ - m31::{PackedM31, LOG_N_LANES, N_LANES}, - qm31::PackedQM31, - SimdBackend, - }, +use stwo::prover::backend::simd::{ + m31::{PackedM31, LOG_N_LANES, N_LANES}, + qm31::PackedQM31, + SimdBackend, }; +use stwo_constraint_framework::{LogupTraceGenerator, Relation}; use crate::{ components::{ diff --git a/crates/air/src/components/lookups/sin/component.rs b/crates/air/src/components/lookups/sin/component.rs index 4f6b4298..b3d76e1d 100644 --- a/crates/air/src/components/lookups/sin/component.rs +++ b/crates/air/src/components/lookups/sin/component.rs @@ -1,4 +1,4 @@ -use stwo::constraint_framework::{ +use stwo_constraint_framework::{ preprocessed_columns::PreProcessedColumnId, EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/lookups/sin/mod.rs b/crates/air/src/components/lookups/sin/mod.rs index fb95a92a..0ca41dd3 100644 --- a/crates/air/src/components/lookups/sin/mod.rs +++ b/crates/air/src/components/lookups/sin/mod.rs @@ -2,7 +2,8 @@ use std::{collections::BTreeSet, sync::atomic::Ordering}; use numerair::Fixed; use serde::{Deserialize, Serialize}; -use stwo::{core::fields::m31::BaseField, relation}; +use stwo::core::fields::m31::BaseField; +use stwo_constraint_framework::relation; use table::{SinLookupTraceTable, SinLookupTraceTableRow}; use crate::{preprocessed::LookupLayout, utils::AtomicMultiplicityColumn, DEFAULT_FP_SCALE}; diff --git a/crates/air/src/components/lookups/sin/table.rs b/crates/air/src/components/lookups/sin/table.rs index 98dcf50e..28c9421b 100644 --- a/crates/air/src/components/lookups/sin/table.rs +++ b/crates/air/src/components/lookups/sin/table.rs @@ -1,11 +1,11 @@ use num_traits::Zero; use serde::{Deserialize, Serialize}; -use stwo::core::{ - backend::simd::{ +use stwo::{ + core::fields::m31::M31, + prover::backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, }, - fields::m31::M31, }; use crate::components::TraceColumn; diff --git a/crates/air/src/components/lookups/sin/witness.rs b/crates/air/src/components/lookups/sin/witness.rs index 2ab12f2c..d4ca1427 100644 --- a/crates/air/src/components/lookups/sin/witness.rs +++ b/crates/air/src/components/lookups/sin/witness.rs @@ -3,14 +3,12 @@ use num_traits::One; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo::{ - constraint_framework::{logup::LogupTraceGenerator, Relation}, - core::backend::simd::{ - m31::{PackedM31, LOG_N_LANES, N_LANES}, - qm31::PackedQM31, - SimdBackend, - }, +use stwo::prover::backend::simd::{ + m31::{PackedM31, LOG_N_LANES, N_LANES}, + qm31::PackedQM31, + SimdBackend, }; +use stwo_constraint_framework::{LogupTraceGenerator, Relation}; use crate::{ components::{InteractionClaim, SinLookupClaim}, diff --git a/crates/air/src/components/max_reduce/component.rs b/crates/air/src/components/max_reduce/component.rs index 6f1e8642..c65bd366 100644 --- a/crates/air/src/components/max_reduce/component.rs +++ b/crates/air/src/components/max_reduce/component.rs @@ -1,6 +1,6 @@ use crate::components::{MaxReduceClaim, NodeElements}; use num_traits::One; -use stwo::constraint_framework::{ +use stwo_constraint_framework::{ EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/max_reduce/table.rs b/crates/air/src/components/max_reduce/table.rs index 4fa1135d..bc5c7f2c 100644 --- a/crates/air/src/components/max_reduce/table.rs +++ b/crates/air/src/components/max_reduce/table.rs @@ -1,10 +1,10 @@ use num_traits::{One, Zero}; -use stwo::core::{ - backend::simd::{ +use stwo::{ + core::fields::m31::M31, + prover::backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, }, - fields::m31::M31, }; use crate::components::TraceColumn; diff --git a/crates/air/src/components/max_reduce/witness.rs b/crates/air/src/components/max_reduce/witness.rs index 18383885..f26f4fcc 100644 --- a/crates/air/src/components/max_reduce/witness.rs +++ b/crates/air/src/components/max_reduce/witness.rs @@ -2,14 +2,12 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo::{ - constraint_framework::{logup::LogupTraceGenerator, Relation}, - core::backend::simd::{ - m31::{PackedM31, LOG_N_LANES, N_LANES}, - qm31::PackedQM31, - SimdBackend, - }, +use stwo::prover::backend::simd::{ + m31::{PackedM31, LOG_N_LANES, N_LANES}, + qm31::PackedQM31, + SimdBackend, }; +use stwo_constraint_framework::{LogupTraceGenerator, Relation}; use crate::{ components::{InteractionClaim, MaxReduceClaim, NodeElements}, diff --git a/crates/air/src/components/mod.rs b/crates/air/src/components/mod.rs index 5012b76c..6abec860 100644 --- a/crates/air/src/components/mod.rs +++ b/crates/air/src/components/mod.rs @@ -33,18 +33,25 @@ use sqrt::{ table::SqrtColumn, }; use stwo::{ - constraint_framework::TraceLocationAllocator, core::{ - air::{Component, ComponentProver}, - backend::simd::SimdBackend, + air::Component, channel::Channel, - fields::{m31::BaseField, qm31::SecureField, secure_column::SECURE_EXTENSION_DEGREE}, + fields::{ + m31::BaseField, + qm31::{SecureField, SECURE_EXTENSION_DEGREE}, + }, pcs::TreeVec, - poly::{circle::CircleEvaluation, BitReversedOrder}, ColumnVec, }, - relation, + prover::{ + backend::simd::SimdBackend, + poly::{circle::CircleEvaluation, BitReversedOrder}, + ComponentProver, + }, }; +use stwo_constraint_framework::relation; + +use stwo_constraint_framework::TraceLocationAllocator; use sum_reduce::{ component::{SumReduceComponent, SumReduceEval}, diff --git a/crates/air/src/components/mul/component.rs b/crates/air/src/components/mul/component.rs index 3de790f1..9ff2f4ec 100644 --- a/crates/air/src/components/mul/component.rs +++ b/crates/air/src/components/mul/component.rs @@ -4,10 +4,8 @@ use crate::{ }; use num_traits::One; use numerair::eval::EvalFixedPoint; -use stwo::{ - constraint_framework::{EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry}, - core::fields::m31::M31, -}; +use stwo::core::fields::m31::M31; +use stwo_constraint_framework::{EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry}; pub type MulComponent = FrameworkComponent; diff --git a/crates/air/src/components/mul/table.rs b/crates/air/src/components/mul/table.rs index c52526bb..bd303788 100644 --- a/crates/air/src/components/mul/table.rs +++ b/crates/air/src/components/mul/table.rs @@ -1,11 +1,11 @@ use num_traits::{One, Zero}; use serde::{Deserialize, Serialize}; -use stwo::core::{ - backend::simd::{ +use stwo::{ + core::fields::m31::M31, + prover::backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, }, - fields::m31::M31, }; use crate::components::TraceColumn; diff --git a/crates/air/src/components/mul/witness.rs b/crates/air/src/components/mul/witness.rs index 5f968b32..6480b83c 100644 --- a/crates/air/src/components/mul/witness.rs +++ b/crates/air/src/components/mul/witness.rs @@ -6,14 +6,12 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo::{ - constraint_framework::{logup::LogupTraceGenerator, Relation}, - core::backend::simd::{ - m31::{PackedM31, LOG_N_LANES, N_LANES}, - qm31::PackedQM31, - SimdBackend, - }, +use stwo::prover::backend::simd::{ + m31::{PackedM31, LOG_N_LANES, N_LANES}, + qm31::PackedQM31, + SimdBackend, }; +use stwo_constraint_framework::{LogupTraceGenerator, Relation}; use super::table::{MulColumn, MulTraceTable, MulTraceTableRow, PackedMulTraceTableRow}; diff --git a/crates/air/src/components/recip/component.rs b/crates/air/src/components/recip/component.rs index 183606e8..6efce888 100644 --- a/crates/air/src/components/recip/component.rs +++ b/crates/air/src/components/recip/component.rs @@ -1,7 +1,7 @@ use crate::components::{NodeElements, RecipClaim}; use num_traits::One; use numerair::eval::EvalFixedPoint; -use stwo::constraint_framework::{ +use stwo_constraint_framework::{ EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/recip/table.rs b/crates/air/src/components/recip/table.rs index 08669383..5da53877 100644 --- a/crates/air/src/components/recip/table.rs +++ b/crates/air/src/components/recip/table.rs @@ -1,11 +1,11 @@ use num_traits::{One, Zero}; use serde::{Deserialize, Serialize}; -use stwo::core::{ - backend::simd::{ +use stwo::{ + core::fields::m31::M31, + prover::backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, }, - fields::m31::M31, }; use crate::components::TraceColumn; diff --git a/crates/air/src/components/recip/witness.rs b/crates/air/src/components/recip/witness.rs index dbad8850..559064fb 100644 --- a/crates/air/src/components/recip/witness.rs +++ b/crates/air/src/components/recip/witness.rs @@ -6,14 +6,12 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo::{ - constraint_framework::{logup::LogupTraceGenerator, Relation}, - core::backend::simd::{ - m31::{PackedM31, LOG_N_LANES, N_LANES}, - qm31::PackedQM31, - SimdBackend, - }, +use stwo::prover::backend::simd::{ + m31::{PackedM31, LOG_N_LANES, N_LANES}, + qm31::PackedQM31, + SimdBackend, }; +use stwo_constraint_framework::{LogupTraceGenerator, Relation}; use super::table::{PackedRecipTraceTableRow, RecipColumn, RecipTraceTable, RecipTraceTableRow}; diff --git a/crates/air/src/components/rem/component.rs b/crates/air/src/components/rem/component.rs index cdfc0bb2..38cd7f34 100644 --- a/crates/air/src/components/rem/component.rs +++ b/crates/air/src/components/rem/component.rs @@ -1,7 +1,7 @@ use crate::components::{NodeElements, RemClaim}; use num_traits::One; use numerair::eval::EvalFixedPoint; -use stwo::constraint_framework::{ +use stwo_constraint_framework::{ EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/rem/table.rs b/crates/air/src/components/rem/table.rs index 9e9e1086..9a8f58a6 100644 --- a/crates/air/src/components/rem/table.rs +++ b/crates/air/src/components/rem/table.rs @@ -1,11 +1,11 @@ use num_traits::{One, Zero}; use serde::{Serialize, Deserialize}; -use stwo::core::{ - backend::simd::{ +use stwo::{ + core::fields::m31::M31, + prover::backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, }, - fields::m31::M31, }; use crate::components::TraceColumn; diff --git a/crates/air/src/components/rem/witness.rs b/crates/air/src/components/rem/witness.rs index e575f9c8..976a8694 100644 --- a/crates/air/src/components/rem/witness.rs +++ b/crates/air/src/components/rem/witness.rs @@ -4,18 +4,16 @@ use crate::{ }; use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; -use stwo_air_utils:: trace::component_trace::ComponentTrace; -use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo::{ - constraint_framework::{logup::LogupTraceGenerator, Relation}, - core::backend::simd::{ - m31::{PackedM31, LOG_N_LANES, N_LANES}, - qm31::PackedQM31, - SimdBackend, - } +use stwo::prover::backend::simd::{ + m31::{PackedM31, LOG_N_LANES, N_LANES}, + qm31::PackedQM31, + SimdBackend, }; +use stwo_air_utils::trace::component_trace::ComponentTrace; +use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; +use stwo_constraint_framework::{LogupTraceGenerator, Relation}; -use super::table::{RemColumn, RemTraceTable, RemTraceTableRow, PackedRemTraceTableRow}; +use super::table::{PackedRemTraceTableRow, RemColumn, RemTraceTable, RemTraceTableRow}; pub(crate) const N_TRACE_COLUMNS: usize = 16; @@ -32,10 +30,10 @@ impl ClaimGenerator { mut self, tree_builder: &mut impl TreeBuilder, ) -> Result<(RemClaim, InteractionClaimGenerator), TraceError> { - let n_rows = self.inputs.table.len(); + let n_rows = self.inputs.table.len(); if n_rows == 0 { - return Err(TraceError::EmptyTrace); + return Err(TraceError::EmptyTrace); } let size = std::cmp::max(n_rows.next_power_of_two(), N_LANES); @@ -77,7 +75,7 @@ fn write_trace_simd( inputs.into_par_iter(), ) .into_par_iter() - .for_each(|(mut row, lookup_data, input)|{ + .for_each(|(mut row, lookup_data, input)| { *row[RemColumn::NodeId.index()] = input.node_id; *row[RemColumn::LhsId.index()] = input.lhs_id; *row[RemColumn::RhsId.index()] = input.rhs_id; @@ -102,9 +100,8 @@ fn write_trace_simd( *lookup_data.out = [input.rem, input.node_id]; *lookup_data.out_mult = input.out_mult; }); - - (trace, lookup_data) + (trace, lookup_data) } #[derive(Uninitialized, IterMut, ParIterMut)] @@ -124,7 +121,7 @@ pub struct InteractionClaimGenerator { impl InteractionClaimGenerator { pub fn write_interaction_trace( - self, + self, tree_builder: &mut impl TreeBuilder, node_elements: &NodeElements, ) -> InteractionClaim { @@ -160,9 +157,9 @@ impl InteractionClaimGenerator { } col_gen.finalize_col(); - let (trace, claimed_sum) = logup_gen.finalize_last(); + let (trace, claimed_sum) = logup_gen.finalize_last(); tree_builder.extend_evals(trace); InteractionClaim { claimed_sum } } -} \ No newline at end of file +} diff --git a/crates/air/src/components/sin/component.rs b/crates/air/src/components/sin/component.rs index 934382b8..b78519ff 100644 --- a/crates/air/src/components/sin/component.rs +++ b/crates/air/src/components/sin/component.rs @@ -5,7 +5,7 @@ use crate::components::{ SinClaim, }; use num_traits::One; -use stwo::constraint_framework::{ +use stwo_constraint_framework::{ EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/sin/table.rs b/crates/air/src/components/sin/table.rs index 0c1d1b8e..4fe9bf3a 100644 --- a/crates/air/src/components/sin/table.rs +++ b/crates/air/src/components/sin/table.rs @@ -1,11 +1,11 @@ use num_traits::{One, Zero}; use serde::{Deserialize, Serialize}; -use stwo::core::{ - backend::simd::{ +use stwo::{ + core::fields::m31::M31, + prover::backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, }, - fields::m31::M31, }; use crate::components::TraceColumn; diff --git a/crates/air/src/components/sin/witness.rs b/crates/air/src/components/sin/witness.rs index 529c0672..f12c7ddd 100644 --- a/crates/air/src/components/sin/witness.rs +++ b/crates/air/src/components/sin/witness.rs @@ -8,14 +8,12 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo::{ - constraint_framework::{logup::LogupTraceGenerator, Relation}, - core::backend::simd::{ - m31::{PackedM31, LOG_N_LANES, N_LANES}, - qm31::PackedQM31, - SimdBackend, - }, +use stwo::prover::backend::simd::{ + m31::{PackedM31, LOG_N_LANES, N_LANES}, + qm31::PackedQM31, + SimdBackend, }; +use stwo_constraint_framework::{LogupTraceGenerator, Relation}; use super::table::{PackedSinTraceTableRow, SinColumn, SinTraceTable, SinTraceTableRow}; diff --git a/crates/air/src/components/sqrt/component.rs b/crates/air/src/components/sqrt/component.rs index ea68e9e7..31822470 100644 --- a/crates/air/src/components/sqrt/component.rs +++ b/crates/air/src/components/sqrt/component.rs @@ -1,7 +1,7 @@ use crate::components::{NodeElements, SqrtClaim}; use num_traits::One; use numerair::eval::EvalFixedPoint; -use stwo::constraint_framework::{ +use stwo_constraint_framework::{ EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/sqrt/table.rs b/crates/air/src/components/sqrt/table.rs index 950ea364..785548bb 100644 --- a/crates/air/src/components/sqrt/table.rs +++ b/crates/air/src/components/sqrt/table.rs @@ -1,11 +1,11 @@ use num_traits::{One, Zero}; use serde::{Deserialize, Serialize}; -use stwo::core::{ - backend::simd::{ +use stwo::{ + core::fields::m31::M31, + prover::backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, }, - fields::m31::M31, }; use crate::components::TraceColumn; diff --git a/crates/air/src/components/sqrt/witness.rs b/crates/air/src/components/sqrt/witness.rs index d98213f6..598e6bec 100644 --- a/crates/air/src/components/sqrt/witness.rs +++ b/crates/air/src/components/sqrt/witness.rs @@ -2,14 +2,12 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo::{ - constraint_framework::{logup::LogupTraceGenerator, Relation}, - core::backend::simd::{ - m31::{PackedM31, LOG_N_LANES, N_LANES}, - qm31::PackedQM31, - SimdBackend, - }, +use stwo::prover::backend::simd::{ + m31::{PackedM31, LOG_N_LANES, N_LANES}, + qm31::PackedQM31, + SimdBackend, }; +use stwo_constraint_framework::{LogupTraceGenerator, Relation}; use crate::{ components::{InteractionClaim, NodeElements, SqrtClaim}, diff --git a/crates/air/src/components/sum_reduce/component.rs b/crates/air/src/components/sum_reduce/component.rs index 5784fa3e..6c8c6272 100644 --- a/crates/air/src/components/sum_reduce/component.rs +++ b/crates/air/src/components/sum_reduce/component.rs @@ -1,6 +1,6 @@ use crate::components::{NodeElements, SumReduceClaim}; use num_traits::One; -use stwo::constraint_framework::{ +use stwo_constraint_framework::{ EvalAtRow, FrameworkComponent, FrameworkEval, RelationEntry, }; diff --git a/crates/air/src/components/sum_reduce/table.rs b/crates/air/src/components/sum_reduce/table.rs index d7ab4200..86602d4f 100644 --- a/crates/air/src/components/sum_reduce/table.rs +++ b/crates/air/src/components/sum_reduce/table.rs @@ -1,11 +1,11 @@ use num_traits::{One, Zero}; use serde::{Deserialize, Serialize}; -use stwo::core::{ - backend::simd::{ +use stwo::{ + core::fields::m31::M31, + prover::backend::simd::{ conversion::{Pack, Unpack}, m31::{PackedM31, N_LANES}, }, - fields::m31::M31, }; use crate::components::TraceColumn; diff --git a/crates/air/src/components/sum_reduce/witness.rs b/crates/air/src/components/sum_reduce/witness.rs index 1bf45f70..a31c07d9 100644 --- a/crates/air/src/components/sum_reduce/witness.rs +++ b/crates/air/src/components/sum_reduce/witness.rs @@ -2,14 +2,12 @@ use luminair_utils::TraceError; use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, ParallelIterator}; use stwo_air_utils::trace::component_trace::ComponentTrace; use stwo_air_utils_derive::{IterMut, ParIterMut, Uninitialized}; -use stwo::{ - constraint_framework::{logup::LogupTraceGenerator, Relation}, - core::backend::simd::{ - m31::{PackedM31, LOG_N_LANES, N_LANES}, - qm31::PackedQM31, - SimdBackend, - }, +use stwo::prover::backend::simd::{ + m31::{PackedM31, LOG_N_LANES, N_LANES}, + qm31::PackedQM31, + SimdBackend, }; +use stwo_constraint_framework::{LogupTraceGenerator, Relation}; use crate::{ components::{InteractionClaim, NodeElements, SumReduceClaim}, diff --git a/crates/air/src/preprocessed.rs b/crates/air/src/preprocessed.rs index bb0719dc..2caf9f8e 100644 --- a/crates/air/src/preprocessed.rs +++ b/crates/air/src/preprocessed.rs @@ -13,32 +13,29 @@ use itertools::Itertools; use numerair::Fixed; use serde::{Deserialize, Serialize}; use stwo::{ - constraint_framework::preprocessed_columns::PreProcessedColumnId, core::{ - backend::{ - simd::{ - column::BaseColumn, - m31::{PackedM31, LOG_N_LANES, N_LANES}, - SimdBackend, - }, - Column, - }, fields::m31::{BaseField, MODULUS_BITS}, - poly::{ - circle::{CanonicCoset, CircleEvaluation}, - BitReversedOrder, - }, + poly::circle::CanonicCoset, + }, + prover::{ + backend::{simd::{ + column::BaseColumn, + m31::{PackedM31, LOG_N_LANES, N_LANES}, + SimdBackend, + }, Column}, + poly::{circle::CircleEvaluation, BitReversedOrder}, }, }; +use stwo_constraint_framework::preprocessed_columns::PreProcessedColumnId; /// Represents a range of fixed-point values for lookup table generation -/// +/// /// Contains minimum and maximum values (inclusive) for a range of inputs #[derive(Serialize, Deserialize, Clone, Debug)] pub struct Range(pub Fixed, pub Fixed); /// Layout configuration for lookup tables -/// +/// /// Defines the ranges of values and the logarithmic size for lookup table generation #[derive(Serialize, Deserialize, Clone, Debug, Default)] pub struct LookupLayout { @@ -50,7 +47,7 @@ pub struct LookupLayout { impl LookupLayout { /// Creates a new LookupLayout with the specified ranges - /// + /// /// Automatically calculates the required log_size based on the total number of values pub fn new(ranges: Vec) -> Self { let log_size = calculate_log_size(value_count(&ranges) as usize); @@ -58,7 +55,7 @@ impl LookupLayout { } /// Finds the index of a target value in the lookup table - /// + /// /// Returns Some(index) if the value is within any of the ranges, None otherwise pub fn find_index(&self, target: i64) -> Option { // Binary search to find the range containing the target @@ -123,7 +120,7 @@ fn value_count(ranges: &Vec) -> u32 { } /// Trait for preprocessed columns used in STARK proving -/// +/// /// Defines the interface for generating preprocessed lookup table columns /// that are used during the proving process pub trait PreProcessedColumn: Any { @@ -140,7 +137,7 @@ pub trait PreProcessedColumn: Any { } /// Collection of preprocessed columns for STARK proving -/// +/// /// Manages a sorted collection of preprocessed lookup table columns /// that will be used during the proving process pub struct PreProcessedTrace { @@ -150,7 +147,7 @@ pub struct PreProcessedTrace { impl PreProcessedTrace { /// Creates a new PreProcessedTrace with columns sorted by log_size - /// + /// /// Columns are automatically sorted in descending order by their log_size pub fn new(mut columns: Vec>) -> Self { columns.sort_by_key(|c| Reverse(c.log_size())); @@ -178,7 +175,7 @@ impl PreProcessedTrace { } /// Converts lookup table configurations to preprocessed columns -/// +/// /// Creates the appropriate preprocessed column types for each lookup table /// that is present in the lookups configuration pub fn lookups_to_preprocessed_column(lookups: &Lookups) -> Vec> { @@ -214,7 +211,7 @@ pub const SIMD_ENUMERATION_0: Simd = Simd::from_array([0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]); /// Partitions a SIMD value into N bit segments according to specified bit counts -/// +/// /// Splits a 32-bit SIMD value into N segments, each with the specified number of bits pub fn partition_into_bit_segments( mut value: Simd, @@ -230,7 +227,7 @@ pub fn partition_into_bit_segments( } /// Generates partitioned enumeration values for range checking -/// +/// /// Creates N vectors of PackedM31 values, each representing a bit segment /// for efficient range checking in STARK proofs pub fn generate_partitioned_enumeration( @@ -251,7 +248,7 @@ pub fn generate_partitioned_enumeration( } /// Preprocessed column for range checking operations -/// +/// /// Generates lookup table columns for efficient range checking in STARK proofs #[derive(Serialize, Deserialize, Clone, Debug)] pub struct RangeCheckPreProcessed { @@ -263,7 +260,7 @@ pub struct RangeCheckPreProcessed { impl RangeCheckPreProcessed { /// Creates a new RangeCheckPreProcessed with the specified layout and column index - /// + /// /// Asserts that all ranges are positive and the column index is valid pub fn new(layout: RangeCheckLayout, col_index: usize) -> Self { assert!(layout.ranges.iter().all(|&r| r > 0)); @@ -310,7 +307,7 @@ impl PreProcessedColumn for RangeCheckPreProcessed { // ================== SIN ================== /// Preprocessed column for sine lookup table operations -/// +/// /// Generates lookup table columns for efficient sine computation in STARK proofs #[derive(Serialize, Deserialize, Clone, Debug)] pub struct SinPreProcessed { @@ -322,7 +319,7 @@ pub struct SinPreProcessed { impl SinPreProcessed { /// Creates a new SinPreProcessed with the specified layout and column index - /// + /// /// Asserts that the column index is less than 2 (sine LUT has 2 columns) pub fn new(layout: LookupLayout, col_index: usize) -> Self { assert!(col_index < 2, "Sin LUT must have 2 columns"); @@ -393,7 +390,7 @@ impl PreProcessedColumn for SinPreProcessed { // ================== EXP2 ================== /// Preprocessed column for exponential base-2 lookup table operations -/// +/// /// Generates lookup table columns for efficient exponential computation in STARK proofs #[derive(Serialize, Deserialize, Clone, Debug)] pub struct Exp2PreProcessed { @@ -405,7 +402,7 @@ pub struct Exp2PreProcessed { impl Exp2PreProcessed { /// Creates a new Exp2PreProcessed with the specified layout and column index - /// + /// /// Asserts that the column index is less than 2 (exp2 LUT has 2 columns) pub fn new(layout: LookupLayout, col_index: usize) -> Self { assert!(col_index < 2, "Exp2 LUT must have 2 columns"); @@ -476,7 +473,7 @@ impl PreProcessedColumn for Exp2PreProcessed { // ================== LOG2 ================== /// Preprocessed column for logarithm base-2 lookup table operations -/// +/// /// Generates lookup table columns for efficient logarithm computation in STARK proofs #[derive(Serialize, Deserialize, Clone, Debug)] pub struct Log2PreProcessed { @@ -488,7 +485,7 @@ pub struct Log2PreProcessed { impl Log2PreProcessed { /// Creates a new Log2PreProcessed with the specified layout and column index - /// + /// /// Asserts that the column index is less than 2 (log2 LUT has 2 columns) pub fn new(layout: LookupLayout, col_index: usize) -> Self { assert!(col_index < 2, "Log2 LUT must have 2 columns"); diff --git a/crates/air/src/utils.rs b/crates/air/src/utils.rs index 88223be6..fa3669c9 100644 --- a/crates/air/src/utils.rs +++ b/crates/air/src/utils.rs @@ -1,19 +1,19 @@ use std::sync::atomic::{AtomicU32, Ordering}; use num_traits::Zero; -use stwo::core::{ - backend::{ - simd::{ - conversion::Pack, - m31::{LOG_N_LANES, N_LANES}, - qm31::PackedSecureField, +use stwo::{ + core::{channel::MerkleChannel, fields::m31::M31, pcs::TreeSubspan}, + prover::{ + backend::{ + simd::{ + conversion::Pack, + m31::{LOG_N_LANES, N_LANES}, + qm31::PackedSecureField, + }, + Backend, BackendForChannel, }, - Backend, BackendForChannel, + poly::{circle::CircleEvaluation, BitReversedOrder}, }, - channel::MerkleChannel, - fields::m31::M31, - pcs::TreeSubspan, - poly::{circle::CircleEvaluation, BitReversedOrder}, }; use crate::LuminairInteractionClaim; @@ -117,7 +117,7 @@ pub trait TreeBuilder { } impl, MC: MerkleChannel> TreeBuilder - for stwo_prover::core::pcs::TreeBuilder<'_, '_, B, MC> + for stwo::prover::TreeBuilder<'_, '_, B, MC> { fn extend_evals( &mut self, diff --git a/crates/prover/src/lib.rs b/crates/prover/src/lib.rs index b637b303..47e9e1ac 100644 --- a/crates/prover/src/lib.rs +++ b/crates/prover/src/lib.rs @@ -7,7 +7,7 @@ use std::{ path::Path, }; use stwo::core::vcs::blake2_merkle::Blake2sMerkleHasher; -use stwo::core::{prover::StarkProof, vcs::ops::MerkleHasher}; +use stwo::core::{proof::StarkProof, vcs::MerkleHasher}; pub mod prover; diff --git a/crates/prover/src/prover.rs b/crates/prover/src/prover.rs index 91e40b9f..93c0aaba 100644 --- a/crates/prover/src/prover.rs +++ b/crates/prover/src/prover.rs @@ -1,7 +1,7 @@ use luminair_air::{ components::{ - add, contiguous, exp2, inputs, less_than, log2, lookups, max_reduce, mul, recip, sin, sqrt, - sum_reduce, rem, LuminairComponents, LuminairInteractionElements, + add, contiguous, exp2, inputs, less_than, log2, lookups, max_reduce, mul, recip, rem, sin, + sqrt, sum_reduce, LuminairComponents, LuminairInteractionElements, }, pie::{LuminairPie, TraceTable}, preprocessed::{ @@ -13,13 +13,14 @@ use luminair_air::{ }; use luminair_utils::LuminairError; use stwo::core::{ - backend::simd::SimdBackend, channel::Blake2sChannel, - pcs::{CommitmentSchemeProver, PcsConfig}, - poly::circle::{CanonicCoset, PolyOps}, - prover, + pcs::PcsConfig, + poly::circle::CanonicCoset, vcs::blake2_merkle::{Blake2sMerkleChannel, Blake2sMerkleHasher}, }; +use stwo::prover::{ + self, backend::simd::SimdBackend, poly::circle::PolyOps, CommitmentSchemeProver, +}; use crate::LuminairProof; diff --git a/crates/utils/src/lib.rs b/crates/utils/src/lib.rs index 10775b2e..5f0317f4 100644 --- a/crates/utils/src/lib.rs +++ b/crates/utils/src/lib.rs @@ -1,4 +1,4 @@ -use stwo::core::prover::{ProvingError, VerificationError}; +use stwo::{core::verifier::VerificationError, prover::ProvingError}; use thiserror::Error; /// Main error type for LuminAIR operations diff --git a/crates/verifiers/rust/Cargo.toml b/crates/verifiers/rust/Cargo.toml index 4eb35736..ca55f18b 100644 --- a/crates/verifiers/rust/Cargo.toml +++ b/crates/verifiers/rust/Cargo.toml @@ -8,6 +8,7 @@ license.workspace = true [dependencies] luminair_air = { path = "../../air" } stwo.workspace = true +stwo-constraint-framework.workspace=true luminair_utils = { path = "../../utils" } luminair_prover = { path = "../../prover" } tracing.workspace = true diff --git a/crates/verifiers/rust/src/verifier.rs b/crates/verifiers/rust/src/verifier.rs index a5a2ee10..d52f4667 100644 --- a/crates/verifiers/rust/src/verifier.rs +++ b/crates/verifiers/rust/src/verifier.rs @@ -8,14 +8,13 @@ use luminair_prover::LuminairProof; use luminair_utils::LuminairError; use tracing::{info, span, Level}; -use stwo::{ - constraint_framework::{INTERACTION_TRACE_IDX, ORIGINAL_TRACE_IDX, PREPROCESSED_TRACE_IDX}, - core::{ - channel::Blake2sChannel, - pcs::{CommitmentSchemeVerifier, PcsConfig}, - prover, - vcs::blake2_merkle::{Blake2sMerkleChannel, Blake2sMerkleHasher}, - }, +use stwo::core::{ + channel::Blake2sChannel, + pcs::{CommitmentSchemeVerifier, PcsConfig}, + vcs::blake2_merkle::{Blake2sMerkleChannel, Blake2sMerkleHasher}, +}; +use stwo_constraint_framework::{ + INTERACTION_TRACE_IDX, ORIGINAL_TRACE_IDX, PREPROCESSED_TRACE_IDX, }; /// Verifies a LuminAIR proof using the given circuit settings @@ -40,7 +39,7 @@ pub fn verify( { let _span = span!(Level::INFO, "protocol_setup").entered(); info!("⚙️ Protocol Setup: Initializing verifier components"); - + let config = PcsConfig::default(); let channel = &mut Blake2sChannel::default(); let commitment_scheme_verifier = @@ -49,7 +48,7 @@ pub fn verify( // Prepare log sizes for each phase let mut log_sizes = claim.log_sizes(); log_sizes[PREPROCESSED_TRACE_IDX] = preprocessed_trace.log_sizes(); - + info!("✅ Protocol Setup: Configuration complete"); // ┌───────────────────────────────────────────────┐ @@ -58,13 +57,13 @@ pub fn verify( { let _span = span!(Level::INFO, "interaction_phase_0").entered(); info!("🔄 Interaction Phase 0: Processing preprocessed trace"); - + commitment_scheme_verifier.commit( proof.commitments[PREPROCESSED_TRACE_IDX], &log_sizes[PREPROCESSED_TRACE_IDX], channel, ); - + info!("✅ Interaction Phase 0: Preprocessed trace committed"); } @@ -74,14 +73,14 @@ pub fn verify( { let _span = span!(Level::INFO, "interaction_phase_1").entered(); info!("🔄 Interaction Phase 1: Processing main trace"); - + claim.mix_into(channel); commitment_scheme_verifier.commit( proof.commitments[ORIGINAL_TRACE_IDX], &log_sizes[ORIGINAL_TRACE_IDX], channel, ); - + info!("✅ Interaction Phase 1: Main trace committed"); } @@ -91,7 +90,7 @@ pub fn verify( { let _span = span!(Level::INFO, "interaction_phase_2").entered(); info!("🔄 Interaction Phase 2: Processing interaction trace"); - + let interaction_elements = LuminairInteractionElements::draw(channel); // Validate LogUp sum @@ -105,7 +104,7 @@ pub fn verify( &log_sizes[INTERACTION_TRACE_IDX], channel, ); - + info!("✅ Interaction Phase 2: Interaction trace committed"); // ┌──────────────────────────┐ @@ -114,7 +113,7 @@ pub fn verify( { let _span = span!(Level::INFO, "proof_verification").entered(); info!("🔍 Proof Verification: Verifying STARK proof"); - + let component_builder = LuminairComponents::new( &claim, &interaction_elements, @@ -124,14 +123,19 @@ pub fn verify( ); let components = component_builder.components(); - let result = prover::verify(&components, channel, commitment_scheme_verifier, proof) - .map_err(LuminairError::StwoVerifierError); - + let result = stwo::core::verifier::verify( + &components, + channel, + commitment_scheme_verifier, + proof, + ) + .map_err(LuminairError::StwoVerifierError); + match &result { Ok(()) => info!("✅ Proof Verification: STARK proof is valid"), Err(e) => info!("❌ Proof Verification: STARK proof is invalid - {}", e), } - + result } }