CI updates

Author: 0xMimir

.github/actions/setup-build-deps/action.yml

@@ -14,9 +14,9 @@ runs:
       run: |
         sudo apt update || true
         if [ "${{ inputs.include-sqlite }}" = "true" ]; then
-          sudo apt install -y protobuf-compiler sqlite3 || true
+          sudo apt install -y protobuf-compiler sqlite3 ocaml || true
         else
-          sudo apt install -y protobuf-compiler || true
+          sudo apt install -y protobuf-compiler ocaml || true
         fi
 
     - name: Setup build dependencies (macOS)

.github/workflows/lint.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup build dependencies
         run: |
           sudo apt update || true
-          sudo apt install -y protobuf-compiler sqlite3 || true
+          sudo apt install -y protobuf-compiler sqlite3 ocaml || true
       - name: Setup SQLite database for SQLx
         run: |
           sqlite3 /tmp/heartbeats.db < tools/heartbeats-processor/schema.sql
@@ -47,7 +47,7 @@ jobs:
       - name: Setup build dependencies
         run: |
           sudo apt update || true
-          sudo apt install -y protobuf-compiler || true
+          sudo apt install -y protobuf-compiler ocaml || true
       - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: ${{ matrix.toolchain }}

Dockerfile

@@ -1,7 +1,7 @@
 FROM rust:bullseye AS build
 # hadolint ignore=DL3008
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends protobuf-compiler && \
+    apt-get install -y --no-install-recommends protobuf-compiler ocaml && \
     apt-get clean
 
 WORKDIR /openmina

tools/fuzzing/src/transaction_fuzzer/generator.rs

@@ -1,4 +1,4 @@
-use ark_ec::{AffineCurve, ProjectiveCurve};
+use ark_ec::{AffineRepr, CurveGroup};
 use ark_ff::{Field, UniformRand};
 use ledger::{
     generators::zkapp_command_builder::get_transaction_commitments,
@@ -69,7 +69,11 @@ use mina_signer::{
     CompressedPubKey, CurvePoint, Keypair, NetworkId, ScalarField, SecKey, Signature, Signer,
 };
 use rand::{seq::SliceRandom, Rng};
-use std::{array, iter, ops::RangeInclusive, sync::Arc};
+use std::{
+    array, iter,
+    ops::{Mul, RangeInclusive},
+    sync::Arc,
+};
 use tuple_map::TupleMap2;
 
 use super::context::{FuzzerCtx, PermissionModel};
@@ -155,9 +159,7 @@ impl Generator<Keypair> for FuzzerCtx {
     fn gen(&mut self) -> Keypair {
         let sec_key: SecKey = self.gen();
         let scalar = sec_key.into_scalar();
-        let public: CurvePoint = CurvePoint::prime_subgroup_generator()
-            .mul(scalar)
-            .into_affine();
+        let public: CurvePoint = CurvePoint::generator().mul(scalar).into_affine();
 
         let keypair = Keypair::from_parts_unsafe(scalar, public);
 
@@ -223,10 +225,14 @@ impl<F: Field + From<i32>> Generator<CurvePointGenerator<F>> for FuzzerCtx {
 impl Generator<(Fp, Fp)> for FuzzerCtx {
     #[coverage(off)]
     fn gen(&mut self) -> (Fp, Fp) {
+        use std::ops::Mul;
         if let Some((x, y)) = self.state.cache_curve_point_fp {
-            let p = GroupAffine::<Fp>::new(x, y, false);
-            let rand_scalar: u64 = self.gen.rng.gen();
-            let new_p: GroupAffine<Fp> = p.mul(rand_scalar).into();
+            let p = GroupAffine::<Fp>::new(x, y);
+            let rand_scalar: u64 = self.r#gen.rng.gen();
+            let scalar_field_elem =
+                <Fp as ledger::proofs::field::FieldWitness>::Scalar::from(rand_scalar);
+
+            let new_p: GroupAffine<Fp> = p.mul(scalar_field_elem).into();
             (new_p.x, new_p.y)
         } else {
             let p: CurvePointGenerator<Fp> = self.gen();
@@ -240,9 +246,11 @@ impl Generator<(Fq, Fq)> for FuzzerCtx {
     #[coverage(off)]
     fn gen(&mut self) -> (Fq, Fq) {
         if let Some((x, y)) = self.state.cache_curve_point_fq {
-            let p = GroupAffine::<Fq>::new(x, y, false);
+            let p = GroupAffine::<Fq>::new(x, y);
             let rand_scalar: u64 = self.gen.rng.gen();
-            let new_p: GroupAffine<Fq> = p.mul(rand_scalar).into();
+            let scalar_field_elem =
+                <Fq as ledger::proofs::field::FieldWitness>::Scalar::from(rand_scalar);
+            let new_p: GroupAffine<Fq> = p.mul(scalar_field_elem).into();
             (new_p.x, new_p.y)
         } else {
             let p: CurvePointGenerator<Fq> = self.gen();