Merge branch 'master' into roinput_serde

Author: scaraven

.github/actions/toolchain-shared/action.yml

@@ -21,7 +21,10 @@ runs:
     - shell: bash
       run: |
         # overwriting default rust-toolchain
-        echo ${{ inputs.rust_toolchain_version }} > rust-toolchain
+        cat > rust-toolchain.toml << EOF
+        [toolchain]
+        channel = "${{ inputs.rust_toolchain_version }}"
+        EOF
     - uses: dtolnay/rust-toolchain@master
       id: toolchain
       with:

.github/workflows/ci.yml

@@ -132,7 +132,7 @@ jobs:
 
       - name: Check that up-to-date specification is checked in
         run: |
-          git diff --exit-code ":(exclude)rust-toolchain"
+          git diff --exit-code ":(exclude)rust-toolchain.toml"
 
       - name: Doc tests
         run: |

arrabbiata/src/interpreter.rs

@@ -906,7 +906,7 @@ pub fn run_ivc<E: InterpreterEnv>(env: &mut E, instr: Instruction) {
             } else {
                 env.read_position(scalar_col)
             };
-            // FIXME: we do add the blinder. We must substract it at the end.
+            // FIXME: we do add the blinder. We must subtract it at the end.
             // Perform the following algorithm (double-and-add):
             // res = O <-- blinder
             // tmp = P
@@ -1206,7 +1206,7 @@ pub fn fetch_next_instruction(current_instruction: Instruction) -> Instruction {
             Instruction::PoseidonFullRound(0)
         }
         Instruction::EllipticCurveScaling(i_comm, bit) => {
-            // TODO: we still need to substract (or not?) the blinder.
+            // TODO: we still need to subtract (or not?) the blinder.
             // Maybe we can avoid this by aggregating them.
             // TODO: we also need to aggregate the cross-terms.
             // Therefore i_comm must also take into the account the number

arrabbiata/src/witness.rs

@@ -698,7 +698,7 @@ where
                             }
                             // As it is the first iteration, we must use the point at infinity.
                             // However, to avoid handling the case equal to zero, we will
-                            // use a blinder, that we will substract at the end.
+                            // use a blinder, that we will subtract at the end.
                             // As we suppose the probability to get a folding combiner
                             // equals to zero is negligible, we know we have a negligible
                             // probability to request to compute `0 * P`.
@@ -724,7 +724,7 @@ where
                             }
                             // As it is the first iteration, we must use the point at infinity.
                             // However, to avoid handling the case equal to zero, we will
-                            // use a blinder, that we will substract at the end.
+                            // use a blinder, that we will subtract at the end.
                             // As we suppose the probability to get a folding combiner
                             // equals to zero is negligible, we know we have a negligible
                             // probability to request to compute `0 * P`.

folding/src/instance_witness.rs

@@ -374,7 +374,7 @@ impl<G: CommitmentCurve, W: Witness<G>> RelaxedWitness<G, W> {
         // Computing E1 + c^3 E2
         let mut res = Self::combine(a, b, challenge);
 
-        // Now substracting the cross terms
+        // Now subtracting the cross terms
         let [e0, e1] = cross_terms;
 
         for (res, (e0, e1)) in res

msm/src/serialization/interpreter.rs

@@ -218,7 +218,7 @@ pub fn deserialize_field_element<
                 + shl_88_var.clone() * shl_88_var.clone() * limb2_vars[0].clone()
         };
 
-        // Substracting 15 bits values
+        // Subtracting 15 bits values
         let (constraint, _) = (0..=11).fold(
             (constraint, Env::constant(F::one())),
             |(acc, shl_var), i| {

o1vm/src/interpreters/mips/tests.rs

@@ -339,7 +339,7 @@ fn test_regression_selectors_for_instructions() {
     let mips_con_env = constraints::Env::<Fp>::default();
     let constraints = mips_con_env.get_selector_constraints();
     assert_eq!(
-        // We substract 1 as we have one boolean check per sel
+        // We subtract 1 as we have one boolean check per sel
         // and 1 constraint to check that one and only one
         // sel is activated
         constraints.len() - 1,

o1vm/src/interpreters/mips/witness.rs

@@ -37,7 +37,7 @@ use std::{
 };
 
 // TODO: do we want to be more restrictive and refer to the number of accesses
-//       to the SAME register/memory addrss?
+//       to the SAME register/memory address?
 
 /// Maximum number of register accesses per instruction (based on demo)
 pub const MAX_NB_REG_ACC: u64 = 7;

o1vm/src/interpreters/riscv32im/tests.rs

@@ -20,7 +20,7 @@ fn test_regression_selectors_for_instructions() {
     let mips_con_env = constraints::Env::<Fp>::default();
     let constraints = mips_con_env.get_selector_constraints();
     assert_eq!(
-        // We substract 1 as we have one boolean check per sel
+        // We subtract 1 as we have one boolean check per sel
         // and 1 constraint to check that one and only one
         // sel is activated
         constraints.len() - 1,

o1vm/src/interpreters/riscv32im/witness.rs

@@ -1,5 +1,5 @@
 // TODO: do we want to be more restrictive and refer to the number of accesses
-//       to the SAME register/memory addrss?
+//       to the SAME register/memory address?
 use super::{
     column::Column,
     interpreter::{