Update stwo dependency to the latest version (#2264)

### PR: Update Powdr's `stwo` Dependency and Align Toolchain

This PR updates Powdr's `stwo` dependency to the latest version, which
now uses the `nightly-2024-12-17` Rust toolchain. To ensure
compatibility, Powdr's toolchain has also been aligned with this new
nightly version.

As part of this update:
- Several modifications were made to address stricter rules and lints
introduced by the newer version of Clippy.
- System dependencies, including `uuid-dev` and `libgrpc++-dev`, were
added to resolve build and runtime issues brought about by updated
dependencies and toolchain requirements.

.github/workflows/pr-tests.yml

@@ -44,9 +44,9 @@ jobs:
 
       ##### The block below is shared between cache build and PR build workflows #####
       - name: Install EStarkPolygon prover dependencies
-        run: sudo apt-get update && sudo apt-get install -y nlohmann-json3-dev libpqxx-dev nasm
-      - name: Install Rust toolchain nightly-2024-09-21 (with clippy and rustfmt)
-        run: rustup toolchain install nightly-2024-09-21-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain nightly-2024-09-21-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain nightly-2024-09-21-x86_64-unknown-linux-gnu
+        run: sudo apt-get update && sudo apt-get install -y nlohmann-json3-dev libpqxx-dev nasm libgrpc++-dev uuid-dev
+      - name: Install Rust toolchain nightly-2024-12-17 (with clippy and rustfmt)
+        run: rustup toolchain install nightly-2024-12-17-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain nightly-2024-12-17-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain nightly-2024-12-17-x86_64-unknown-linux-gnu
       - name: Install Rust toolchain 1.81 (stable)
         run: rustup toolchain install 1.81-x86_64-unknown-linux-gnu
       - name: Set cargo to perform shallow clones
@@ -99,8 +99,8 @@ jobs:
           path: |
             ~/pilcom/node_modules
           key: ${{ runner.os }}-pilcom-node-modules
-      - name: Install Rust toolchain nightly-2024-09-21 (with clippy and rustfmt)
-        run: rustup toolchain install nightly-2024-09-21-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain nightly-2024-09-21-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain nightly-2024-09-21-x86_64-unknown-linux-gnu
+      - name: Install Rust toolchain nightly-2024-12-17 (with clippy and rustfmt)
+        run: rustup toolchain install nightly-2024-12-17-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain nightly-2024-12-17-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain nightly-2024-12-17-x86_64-unknown-linux-gnu
       - name: Install nightly-2024-08-01
         run: rustup toolchain install nightly-2024-08-01-x86_64-unknown-linux-gnu
       - name: Install std source
@@ -136,8 +136,8 @@ jobs:
             target/
             Cargo.lock
           key: ${{ runner.os }}-cargo-pr-tests
-      - name: Install Rust toolchain nightly-2024-09-21 (with clippy and rustfmt)
-        run: rustup toolchain install nightly-2024-09-21-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain nightly-2024-09-21-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain nightly-2024-09-21-x86_64-unknown-linux-gnu
+      - name: Install Rust toolchain nightly-2024-12-17 (with clippy and rustfmt)
+        run: rustup toolchain install nightly-2024-12-17-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain nightly-2024-12-17-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain nightly-2024-12-17-x86_64-unknown-linux-gnu
       - name: Install nightly
         run: rustup toolchain install nightly-2024-08-01-x86_64-unknown-linux-gnu
       - name: Install std source
@@ -166,8 +166,8 @@ jobs:
           path: |
             ~/pilcom/node_modules
           key: ${{ runner.os }}-pilcom-node-modules
-      - name: Install Rust toolchain nightly-2024-09-21(with clippy and rustfmt)
-        run: rustup toolchain install nightly-2024-09-21-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain nightly-2024-09-21-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain nightly-2024-09-21-x86_64-unknown-linux-gnu
+      - name: Install Rust toolchain nightly-2024-12-17(with clippy and rustfmt)
+        run: rustup toolchain install nightly-2024-12-17-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain nightly-2024-12-17-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain nightly-2024-12-17-x86_64-unknown-linux-gnu
       - name: Install nightly-2024-08-01
         run: rustup toolchain install nightly-2024-08-01-x86_64-unknown-linux-gnu
       - name: Install std source
@@ -216,8 +216,8 @@ jobs:
           path: |
             ~/pilcom/node_modules
           key: ${{ runner.os }}-pilcom-node-modules
-      - name: Install Rust toolchain nightly-2024-09-21 (with clippy and rustfmt)
-        run: rustup toolchain install nightly-2024-09-21-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain nightly-2024-09-21-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain nightly-2024-09-21-x86_64-unknown-linux-gnu
+      - name: Install Rust toolchain nightly-2024-12-17 (with clippy and rustfmt)
+        run: rustup toolchain install nightly-2024-12-17-x86_64-unknown-linux-gnu && rustup component add clippy --toolchain nightly-2024-12-17-x86_64-unknown-linux-gnu && rustup component add rustfmt --toolchain nightly-2024-12-17-x86_64-unknown-linux-gnu
       - name: Install test dependencies
         run: sudo apt-get update && sudo apt-get install -y binutils-riscv64-unknown-elf lld
       - name: Install nightly-2024-08-01

ast/src/asm_analysis/display.rs

@@ -241,7 +241,7 @@ impl Display for InstructionDefinitionStatement {
     }
 }
 
-impl<'a> Display for CallableSymbolDefinitionRef<'a> {
+impl Display for CallableSymbolDefinitionRef<'_> {
     fn fmt(&self, f: &mut Formatter<'_>) -> Result {
         match &self.symbol {
             CallableSymbol::Function(s) => {

backend/Cargo.toml

@@ -62,8 +62,7 @@ p3-commit = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf2
 ], optional = true }
 p3-matrix = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0", optional = true }
 p3-uni-stark = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0", optional = true }
-# TODO: Change this to main branch when the `andrew/dev/update-toolchain` branch is merged,the main branch is using "nightly-2024-01-04", not compatiable with plonky3
-stwo-prover = { git = "https://github.com/ShuangWu121/stwo.git", optional = true, rev = "564a4ddcde376ba0ae78da4d86ea5ad7338ef6fe",features = ["parallel"] }
+stwo-prover = { git = "https://github.com/starkware-libs/stwo.git", optional = true, rev = "f24cde6f8de3f1db75d04f87807f052aa889b077",features = ["parallel"] }
 
 strum = { version = "0.24.1", features = ["derive"] }
 log = "0.4.17"

backend/src/estark/bin_exporter.rs

@@ -19,7 +19,7 @@ pub fn write_polys_file<F: FieldElement>(
 }
 
 fn ceil_div(num: usize, div: usize) -> usize {
-    (num + div - 1) / div
+    num.div_ceil(div)
 }
 
 fn write_polys_stream<T: FieldElement>(

backend/src/estark/mod.rs

@@ -140,10 +140,10 @@ fn write_json_file<T: ?Sized + Serialize>(path: &Path, data: &T) -> Result<(), E
     Ok(())
 }
 
-impl<'a, F: FieldElement> EStarkFilesCommon<F> {
+impl<F: FieldElement> EStarkFilesCommon<F> {
     #[allow(clippy::too_many_arguments)]
     fn create(
-        analyzed: &'a Analyzed<F>,
+        analyzed: &Analyzed<F>,
         fixed: Arc<Fixed<F>>,
         output_dir: Option<PathBuf>,
         setup: Option<&mut dyn std::io::Read>,

backend/src/halo2/circuit_builder.rs

@@ -151,7 +151,7 @@ impl<'a, T: FieldElement> PowdrCircuit<'a, T> {
     }
 }
 
-impl<'a, T: FieldElement, F: PrimeField<Repr = [u8; 32]>> Circuit<F> for PowdrCircuit<'a, T> {
+impl<T: FieldElement, F: PrimeField<Repr = [u8; 32]>> Circuit<F> for PowdrCircuit<'_, T> {
     type Config = PowdrCircuitConfig;
 
     type FloorPlanner = SimpleFloorPlanner;

backend/src/stwo/prover.rs

@@ -1,3 +1,4 @@
+use num_traits::Zero;
 use powdr_ast::analyzed::Analyzed;
 use powdr_backend_utils::machine_fixed_columns;
 use powdr_executor::constant_evaluator::VariablySizedColumn;
@@ -25,6 +26,7 @@ use stwo_prover::core::air::{Component, ComponentProver};
 use stwo_prover::core::backend::{Backend, BackendForChannel};
 use stwo_prover::core::channel::{Channel, MerkleChannel};
 use stwo_prover::core::fields::m31::{BaseField, M31};
+use stwo_prover::core::fields::qm31::SecureField;
 use stwo_prover::core::fri::FriConfig;
 use stwo_prover::core::pcs::{CommitmentSchemeProver, CommitmentSchemeVerifier, PcsConfig};
 use stwo_prover::core::poly::circle::{CanonicCoset, CircleDomain, CircleEvaluation};
@@ -289,12 +291,14 @@ where
         let component = PowdrComponent::new(
             &mut TraceLocationAllocator::default(),
             PowdrEval::new(self.analyzed.clone()),
+            // This parameter is used for the logup functionality. If logup is not required, this default value should be passed.
+            (SecureField::zero(), None),
         );
 
         let proof_result = stwo_prover::core::prover::prove::<B, MC>(
             &[&component],
             prover_channel,
-            &mut commitment_scheme,
+            commitment_scheme,
         );
 
         let proof = match proof_result {
@@ -323,6 +327,7 @@ where
         let component = PowdrComponent::new(
             &mut TraceLocationAllocator::default(),
             PowdrEval::new(self.analyzed.clone()),
+            (SecureField::zero(), None),
         );
 
         // Retrieve the expected column sizes in each commitment interaction, from the AIR.

executor/src/witgen/affine_expression.rs

@@ -153,9 +153,9 @@ where
     }
 }
 
-impl<'x, K, T> AffineExpression<K, T>
+impl<K, T> AffineExpression<K, T>
 where
-    K: Copy + Ord + Display + 'x,
+    K: Copy + Ord + Display,
     T: FieldElement,
 {
     /// If the affine expression has only a single variable (with nonzero coefficient),

executor/src/witgen/bus_accumulator/fp2.rs

@@ -7,7 +7,6 @@ use num_traits::{One, Zero};
 use powdr_number::FieldElement;
 
 /// An implementation of Fp2, analogous to `std/math/fp2.asm`.
-
 /// An Fp2 element. The tuple (a, b) represents the polynomial a + b * X.
 /// All computations are done modulo the irreducible polynomial X^2 - 11.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]

executor/src/witgen/data_structures/caller_data.rs

@@ -32,7 +32,7 @@ impl<'a, 'b, T: FieldElement> From<&'b OuterQuery<'a, '_, T>> for CallerData<'a,
     }
 }
 
-impl<'a, 'b, T: FieldElement> CallerData<'a, 'b, T> {
+impl<T: FieldElement> CallerData<'_, '_, T> {
     /// Returns the data as a list of `LookupCell`s, as expected by `Machine::process_lookup_direct`.
     pub fn as_lookup_cells(&mut self) -> Vec<LookupCell<'_, T>> {
         self.data

executor/src/witgen/data_structures/mutable_state.rs

@@ -62,7 +62,7 @@ impl<'a, T: FieldElement, Q: QueryCallback<T>> MutableState<'a, T, Q> {
         // has no responsible machine.
         self.responsible_machine(identity_id)
             .ok()
-            .map_or(false, |mut machine| {
+            .is_some_and(|mut machine| {
                 machine.can_process_call_fully(identity_id, known_inputs, range_constraints)
             })
     }

executor/src/witgen/evaluators/expression_evaluator.rs

@@ -55,7 +55,7 @@ impl<T> OwnedTraceValues<T> {
     }
 }
 
-impl<'a, F: FieldElement> TraceValues<F> for RowTraceValues<'a, F> {
+impl<F: FieldElement> TraceValues<F> for RowTraceValues<'_, F> {
     fn get(&self, column: &AlgebraicReference) -> F {
         match column.poly_id.ptype {
             PolynomialType::Committed | PolynomialType::Constant => {

executor/src/witgen/evaluators/fixed_evaluator.rs

@@ -19,7 +19,7 @@ impl<'a, T: FieldElement> FixedEvaluator<'a, T> {
     }
 }
 
-impl<'a, T: FieldElement> SymbolicVariables<T> for FixedEvaluator<'a, T> {
+impl<T: FieldElement> SymbolicVariables<T> for FixedEvaluator<'_, T> {
     fn value<'b>(&self, poly: AlgebraicVariable<'b>) -> AffineResult<AlgebraicVariable<'b>, T> {
         // TODO arrays
         match poly {

executor/src/witgen/evaluators/symbolic_witness_evaluator.rs

@@ -46,7 +46,7 @@ where
     }
 }
 
-impl<'a, T: FieldElement, WA> SymbolicVariables<T> for SymbolicWitnessEvaluator<'a, T, WA>
+impl<T: FieldElement, WA> SymbolicVariables<T> for SymbolicWitnessEvaluator<'_, T, WA>
 where
     WA: WitnessColumnEvaluator<T>,
 {

executor/src/witgen/global_constraints.rs

@@ -77,7 +77,7 @@ where
     }
 }
 
-impl<'a, R1, R2, K, T> RangeConstraintSet<K, T> for CombinedRangeConstraintSet<'a, R1, R2, K, T>
+impl<R1, R2, K, T> RangeConstraintSet<K, T> for CombinedRangeConstraintSet<'_, R1, R2, K, T>
 where
     T: FieldElement,
     K: Copy,

executor/src/witgen/jit/symbolic_expression.rs

@@ -61,15 +61,15 @@ impl<T: FieldElement, S> SymbolicExpression<T, S> {
     }
 
     pub fn is_known_zero(&self) -> bool {
-        self.try_to_number().map_or(false, |n| n.is_zero())
+        self.try_to_number().is_some_and(|n| n.is_zero())
     }
 
     pub fn is_known_one(&self) -> bool {
-        self.try_to_number().map_or(false, |n| n.is_one())
+        self.try_to_number().is_some_and(|n| n.is_one())
     }
 
     pub fn is_known_minus_one(&self) -> bool {
-        self.try_to_number().map_or(false, |n| n == -T::from(1))
+        self.try_to_number().is_some_and(|n| n == -T::from(1))
     }
 
     pub fn is_known_nonzero(&self) -> bool {

executor/src/witgen/jit/witgen_inference.rs

@@ -460,7 +460,7 @@ pub trait CanProcessCall<T: FieldElement> {
     ) -> bool;
 }
 
-impl<'a, T: FieldElement, Q: QueryCallback<T>> CanProcessCall<T> for &MutableState<'a, T, Q> {
+impl<T: FieldElement, Q: QueryCallback<T>> CanProcessCall<T> for &MutableState<'_, T, Q> {
     fn can_process_call_fully(
         &self,
         identity_id: u64,
@@ -492,7 +492,7 @@ mod test {
     use super::*;
 
     pub struct FixedEvaluatorForFixedData<'a, T: FieldElement>(pub &'a FixedData<'a, T>);
-    impl<'a, T: FieldElement> FixedEvaluator<T> for FixedEvaluatorForFixedData<'a, T> {
+    impl<T: FieldElement> FixedEvaluator<T> for FixedEvaluatorForFixedData<'_, T> {
         fn evaluate(&self, var: &AlgebraicReference, row_offset: i32) -> Option<T> {
             assert!(var.is_fixed());
             let values = self.0.fixed_cols[&var.poly_id].values_max_size();

executor/src/witgen/machines/block_machine.rs

@@ -37,7 +37,7 @@ impl<'a, T: FieldElement> ProcessResult<'a, T> {
     }
 }
 
-impl<'a, T: FieldElement> Display for BlockMachine<'a, T> {
+impl<T: FieldElement> Display for BlockMachine<'_, T> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(
             f,

executor/src/witgen/machines/double_sorted_witness_machine_16.rs

@@ -76,7 +76,6 @@ fn split_column_name(name: &str) -> (&str, &str) {
 }
 
 /// TODO make this generic
-
 pub struct DoubleSortedWitnesses16<'a, T: FieldElement> {
     degree_range: DegreeRange,
     degree: DegreeType,

executor/src/witgen/machines/double_sorted_witness_machine_32.rs

@@ -47,7 +47,6 @@ fn split_column_name(name: &str) -> (&str, &str) {
 }
 
 /// TODO make this generic
-
 pub struct DoubleSortedWitnesses32<'a, T: FieldElement> {
     degree_range: DegreeRange,
     degree: DegreeType,
@@ -210,7 +209,7 @@ impl<'a, T: FieldElement> Machine<'a, T> for DoubleSortedWitnesses32<'a, T> {
             true
         } else {
             // It is not known, so we can only process if we do not write.
-            range_constraints[0].as_ref().map_or(false, |rc| {
+            range_constraints[0].as_ref().is_some_and(|rc| {
                 !rc.allows_value(T::from(OPERATION_ID_BOOTLOADER_WRITE))
                     && !rc.allows_value(T::from(OPERATION_ID_WRITE))
             })
@@ -403,7 +402,7 @@ impl<'a, T: FieldElement> Machine<'a, T> for DoubleSortedWitnesses32<'a, T> {
     }
 }
 
-impl<'a, T: FieldElement> DoubleSortedWitnesses32<'a, T> {
+impl<T: FieldElement> DoubleSortedWitnesses32<'_, T> {
     fn process_plookup_internal(
         &mut self,
         identity_id: u64,

executor/src/witgen/machines/mod.rs

@@ -146,7 +146,7 @@ pub enum LookupCell<'a, T> {
     Output(&'a mut T),
 }
 
-impl<'a, T> LookupCell<'a, T> {
+impl<T> LookupCell<'_, T> {
     pub fn is_input(&self) -> bool {
         match self {
             LookupCell::Input(_) => true,
@@ -342,13 +342,13 @@ pub struct Connection<'a, T> {
     pub multiplicity_column: Option<PolyID>,
 }
 
-impl<'a, T: Display> Display for Connection<'a, T> {
+impl<T: Display> Display for Connection<'_, T> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "{} {} {}", self.left, self.kind, self.right)
     }
 }
 
-impl<'a, T> Connection<'a, T> {
+impl<T> Connection<'_, T> {
     fn is_permutation(&self) -> bool {
         self.kind == ConnectionKind::Permutation
     }

executor/src/witgen/processor.rs

@@ -674,9 +674,7 @@ impl ProcessedProverFunctions {
 
     pub fn has_run(&self, row_index: usize, function_index: usize) -> bool {
         let (el, bit) = self.index_for(row_index, function_index);
-        self.data
-            .get(el)
-            .map_or(false, |byte| byte & (1 << bit) != 0)
+        self.data.get(el).is_some_and(|byte| byte & (1 << bit) != 0)
     }
 
     pub fn mark_as_run(&mut self, row_index: usize, function_index: usize) {

executor/src/witgen/query_processor.rs

@@ -158,8 +158,8 @@ struct Symbols<'a, 'b, 'c, T: FieldElement, QueryCallback: Send + Sync> {
     query_callback: &'c QueryCallback,
 }
 
-impl<'a, 'b, 'c, T: FieldElement, QueryCallback: super::QueryCallback<T>> SymbolLookup<'a, T>
-    for Symbols<'a, 'b, 'c, T, QueryCallback>
+impl<'a, T: FieldElement, QueryCallback: super::QueryCallback<T>> SymbolLookup<'a, T>
+    for Symbols<'a, '_, '_, T, QueryCallback>
 {
     fn lookup(
         &mut self,
@@ -324,9 +324,7 @@ impl<'a, 'b, 'c, T: FieldElement, QueryCallback: super::QueryCallback<T>> Symbol
     }
 }
 
-impl<'a, 'b, 'c, T: FieldElement, QueryCallback: Send + Sync>
-    Symbols<'a, 'b, 'c, T, QueryCallback>
-{
+impl<'a, T: FieldElement, QueryCallback: Send + Sync> Symbols<'a, '_, '_, T, QueryCallback> {
     fn updates(self) -> Constraints<AlgebraicVariable<'a>, T> {
         self.updates
     }

importer/src/path_canonicalizer.rs

@@ -45,7 +45,7 @@ struct Canonicalizer<'a> {
     paths: &'a PathMap,
 }
 
-impl<'a> Folder for Canonicalizer<'a> {
+impl Folder for Canonicalizer<'_> {
     // once the paths are resolved, canonicalization cannot fail
     type Error = Infallible;
 

number/src/lib.rs

@@ -25,7 +25,6 @@ pub use traits::{FieldSize, KnownField};
 pub use ibig::{IBig as BigInt, UBig as BigUint};
 pub use traits::{FieldElement, LargeInt};
 /// An arbitrary precision big integer, to be used as a last recourse
-
 /// The type of polynomial degrees and indices into columns.
 pub type DegreeType = u64;
 

pil-analyzer/src/condenser.rs

@@ -656,7 +656,7 @@ impl<'a, T: FieldElement> SymbolLookup<'a, T> for Condenser<'a, T> {
     }
 }
 
-impl<'a, T: FieldElement> Condenser<'a, T> {
+impl<T: FieldElement> Condenser<'_, T> {
     fn find_unused_name(&self, name: &str) -> String {
         once(None)
             .chain((1..).map(Some))