merge queue: embarking main (4e5e338) and [#681 + #626] together

.github/workflows/main.yml

@@ -167,7 +167,7 @@ jobs:
     continue-on-error: true
     steps:
       - uses: actions/[email protected]
-      - uses: reviewdog/action-actionlint@v1.48.0
+      - uses: reviewdog/action-actionlint@v1.50.0
         with:
           level: warning
           fail_on_error: false

frost-core/CHANGELOG.md

@@ -20,6 +20,10 @@ Entries are listed in reverse chronological order.
 * Removed `batch::Item::into()` which created a batch Item from a triple of
   VerifyingKey, Signature and message. Use the new `batch::Item::new()` instead
   (which can return an error).
+* Removed the `MulAssign<Identifier<C>> for Scalar<C>` implementation since it
+  will result in a coherence error in future Rust versions (see #625). In the
+  unlikely case you're using this, you can replace e.g. `scalar *= identifier`
+  with `scalar = identifier * scalar`.
 
 ## 1.0.1
 

frost-core/src/identifier.rs

@@ -149,15 +149,6 @@ where
     }
 }
 
-impl<C> std::ops::MulAssign<Identifier<C>> for Scalar<C>
-where
-    C: Ciphersuite,
-{
-    fn mul_assign(&mut self, identifier: Identifier<C>) {
-        *self = *self * identifier.0
-    }
-}
-
 impl<C> std::ops::Sub for Identifier<C>
 where
     C: Ciphersuite,

frost-core/src/keys.rs

@@ -582,7 +582,7 @@ fn evaluate_polynomial<C: Ciphersuite>(
     let ell_scalar = identifier;
     for coeff in coefficients.iter().skip(1).rev() {
         value = value + *coeff;
-        value *= ell_scalar;
+        value = ell_scalar * value;
     }
     value = value
         + *coefficients

frost-core/src/lib.rs

@@ -306,12 +306,12 @@ fn compute_lagrange_coefficient<C: Ciphersuite>(
         }
 
         if let Some(x) = x {
-            num *= x - *x_j;
-            den *= x_i - *x_j;
+            num = (x - *x_j) * num;
+            den = (x_i - *x_j) * den;
         } else {
             // Both signs inverted just to avoid requiring Neg (-*xj)
-            num *= *x_j;
-            den *= *x_j - x_i;
+            num = *x_j * num;
+            den = (*x_j - x_i) * den;
         }
     }
     if !x_i_found {