Optimize FRI quotient constants (Work In Progress)

stwo_cairo_verifier/.tool-versions

@@ -1,2 +1,2 @@
-scarb nightly-2024-11-09
-starknet-foundry 0.32.0
+scarb nightly-2024-11-19
+starknet-foundry 0.33.0

stwo_cairo_verifier/README.md

@@ -26,9 +26,9 @@ Modify [`Scarb.toml`](./Scarb.toml) to use [Starknet Foundary](https://github.co
 
 ```diff
 [dev-dependencies]
-- cairo_test = "2.8.0"
-+ snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.32.0" }
-+ assert_macros = "2.8.0"
+- cairo_test = "2.8.5"
++ snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.33.0" }
++ assert_macros = "2.8.5"
 +
 + [scripts]
 + test = "snforge test --max-n-steps 100000000"

stwo_cairo_verifier/Scarb.toml

@@ -3,17 +3,14 @@ name = "stwo_cairo_verifier"
 version = "0.1.0"
 edition = "2024_07"
 
+# [cairo]
+# enable-gas = false
+
 [lib]
 casm = true
 
-[cairo]
-# TODO(andrew): Remove once inlining bug fixed as increases step counts by about 3x.
-inlining-strategy = "avoid"
-
 [tool.fmt]
 sort-module-level-items = true
 
 [dependencies]
-
-[dev-dependencies]
-cairo_test = "2.8.4"
+cairo_test = "2.8.5"

stwo_cairo_verifier/src/channel.cairo

@@ -1,9 +1,9 @@
 use core::array::SpanTrait;
 use core::num::traits::{WrappingMul, WrappingSub};
-use core::poseidon::{hades_permutation, poseidon_hash_span};
+use core::poseidon::hades_permutation;
 use core::traits::DivRem;
 use crate::fields::qm31::QM31Trait;
-use crate::utils::pack4;
+use crate::utils::{pack4, poseidon_hash_span};
 use crate::{BaseField, SecureField};
 
 /// Equals `2^31`.
@@ -61,14 +61,8 @@ pub impl ChannelImpl of ChannelTrait {
     fn draw_base_felts(ref self: Channel) -> [BaseField; FELTS_PER_HASH] {
         let mut cur = self.draw_felt252().into();
         [
-            extract_m31(ref cur),
-            extract_m31(ref cur),
-            extract_m31(ref cur),
-            extract_m31(ref cur),
-            extract_m31(ref cur),
-            extract_m31(ref cur),
-            extract_m31(ref cur),
-            extract_m31(ref cur),
+            extract_m31(ref cur), extract_m31(ref cur), extract_m31(ref cur), extract_m31(ref cur),
+            extract_m31(ref cur), extract_m31(ref cur), extract_m31(ref cur), extract_m31(ref cur),
         ]
     }
 

stwo_cairo_verifier/src/fields/qm31.cairo

@@ -162,6 +162,7 @@ pub impl QM31Mul of core::traits::Mul<QM31> {
     #[inline]
     fn mul(lhs: QM31, rhs: QM31) -> QM31 {
         // (a + bu) * (c + du) = (ac + rbd) + (ad + bc)u.
+        // QM31Impl::fma(lhs, rhs, qm31(0, 0, 0, 0))
         QM31 { a: lhs.a * rhs.a + R * lhs.b * rhs.b, b: lhs.a * rhs.b + lhs.b * rhs.a }
     }
 }