Merge pull request #1383 from o1-labs/dw/remove-algebra-fork

Remove forks of arkworks and use o1labs/proof-systems

Author: dannywillems

CHANGELOG.md

@@ -106,6 +106,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#1230](https://github.com/o1-labs/openmina/pull/1230))
 - bump itertools from 0.10.5 to 0.12.0 #1228
   ([#1228](https://github.com/o1-labs/openmina/pull/1228))
+- Remove OpenMina forks of arkworks and proof-systems
+  ([#1383](https://github.com/o1-labs/mina-rust/pull/1383))
 
 ### Other
 

Cargo.lock

@@ -46,31 +46,28 @@ arithmetic_side_effects = "warn"
 indexing_slicing = "warn"
 
 [workspace.dependencies]
-ledger = { path = "ledger", package = "mina-tree" }
-mina-p2p-messages = { path = "mina-p2p-messages" }
-poseidon = { path = "poseidon" }
-
-# UNCOMMENTED_IN_CI mina-curves = { git = "https://github.com/openmina/proof-systems", rev = "d1912bca54d2609296b9af9d09ad1ef78702e203", features = [ "32x9" ] }
-kimchi = { git = "https://github.com/openmina/proof-systems", rev = "d1912bca54d2609296b9af9d09ad1ef78702e203" }
-mina-curves = { git = "https://github.com/openmina/proof-systems", rev = "d1912bca54d2609296b9af9d09ad1ef78702e203" }
-mina-hasher = { git = "https://github.com/openmina/proof-systems", rev = "d1912bca54d2609296b9af9d09ad1ef78702e203" }
-mina-poseidon = { git = "https://github.com/openmina/proof-systems", rev = "d1912bca54d2609296b9af9d09ad1ef78702e203" }
-mina-signer = { git = "https://github.com/openmina/proof-systems", rev = "d1912bca54d2609296b9af9d09ad1ef78702e203" }
-o1-utils = { git = "https://github.com/openmina/proof-systems", rev = "d1912bca54d2609296b9af9d09ad1ef78702e203" }
-poly-commitment = { git = "https://github.com/openmina/proof-systems", rev = "d1912bca54d2609296b9af9d09ad1ef78702e203" }
-
-# kimchi.path = "../deps/proof-systems/kimchi"
-# mina-curves.path = "../deps/proof-systems/curves"
-# mina-hasher.path = "../deps/proof-systems/hasher"
-# mina-poseidon.path = "../deps/proof-systems/poseidon"
-# mina-signer.path = "../deps/proof-systems/signer"
-# o1-utils.path = "../deps/proof-systems/utils"
-# poly-commitment.path = "../deps/proof-systems/poly-commitment"
-
+ark-ec = { version = "0.5.0", features = ["std"] }
+ark-ff = { version = "0.5.0", features = ["parallel", "asm", "std"] }
+ark-poly = { version = "0.5.0" }
+ark-serialize = { version = "0.5.0", features = ["std"] }
+graphannis-malloc_size_of = { git = "https://github.com/openmina/graphannis-malloc_size_of.git", rev = "f7da9f6" }
+graphannis-malloc_size_of_derive = { git = "https://github.com/openmina/graphannis-malloc_size_of_derive.git" }
 juniper = { version = "0.16" }
+kimchi = { git = "https://github.com/o1-labs/proof-systems", rev = "0b0fd5fe73964d2a3628c788e40ead819a8a806d" }
+ledger = { path = "ledger", package = "mina-tree" }
 libp2p = { git = "https://github.com/openmina/rust-libp2p", rev = "5c44c7d9", default-features = false }
 linkme = "0.3.22"
+mina-curves = { git = "https://github.com/o1-labs/proof-systems", rev = "0b0fd5fe73964d2a3628c788e40ead819a8a806d" }
+mina-hasher = { git = "https://github.com/o1-labs/proof-systems", rev = "0b0fd5fe73964d2a3628c788e40ead819a8a806d" }
 mina-node-account = { path = "node/account" }
+mina-p2p-messages = { path = "mina-p2p-messages" }
+mina-poseidon = { git = "https://github.com/o1-labs/proof-systems", rev = "0b0fd5fe73964d2a3628c788e40ead819a8a806d" }
+mina-producer-dashboard = { path = "producer-dashboard" }
+mina-signer = { git = "https://github.com/o1-labs/proof-systems", rev = "0b0fd5fe73964d2a3628c788e40ead819a8a806d" }
+num-bigint = { git = "https://github.com/openmina/num-bigint", branch = "rebase-onstack" } # branch: rebase-onstack
+o1-utils = { git = "https://github.com/o1-labs/proof-systems", rev = "0b0fd5fe73964d2a3628c788e40ead819a8a806d" }
+poly-commitment = { git = "https://github.com/o1-labs/proof-systems", rev = "0b0fd5fe73964d2a3628c788e40ead819a8a806d" }
+poseidon = { path = "poseidon" }
 redux = { git = "https://github.com/o1-labs/redux-rs.git", rev = "06c8366", features = [
   "serde",
 ] }
@@ -80,29 +77,9 @@ serde_with = { version = "3.7.0", features = ["hex"] }
 static_assertions = "1.1.0"
 vrf = { path = "vrf" }
 
-
-ark-ec = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode", features = [
-  "std",
-] }
-ark-ff = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode", features = [
-  "parallel",
-  "asm",
-  "std",
-] }
-ark-poly = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode" }
-ark-serialize = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode", features = [
-  "std",
-] }
-
-num-bigint = { git = "https://github.com/openmina/num-bigint", branch = "rebase-onstack" } # branch: rebase-onstack
-
+# UNCOMMENTED_IN_CI mina-curves = { git = "https://github.com/o1-labs/proof-systems", rev = "d1912bca54d2609296b9af9d09ad1ef78702e203", features = [ "32x9" ] }
 # UNCOMMENTED_IN_CI ark-ff = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode", features = ["parallel", "asm", "std", "32x9" ] }
 
-graphannis-malloc_size_of = { git = "https://github.com/openmina/graphannis-malloc_size_of.git", rev = "f7da9f6" }
-graphannis-malloc_size_of_derive = { git = "https://github.com/openmina/graphannis-malloc_size_of_derive.git" }
-
-mina-producer-dashboard = { path = "producer-dashboard" }
-
 [profile.fuzz]
 inherits = "release"
 opt-level = 3
@@ -115,11 +92,6 @@ incremental = false
 codegen-units = 1
 
 [patch.crates-io]
-ark-ff = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode" }
-ark-ec = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode" }
-ark-poly = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode" }
-ark-serialize = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode" }
-
 num-bigint = { git = "https://github.com/openmina/num-bigint", branch = "rebase-onstack" }     # branch: rebase-onstack
 num-rational = { git = "https://github.com/openmina/num-rational", branch = "rebase-onstack" } # branch: rebase-onstack
 

Cargo.toml

@@ -1,5 +1,4 @@
-use ark_ff::fields::arithmetic::InvalidBigInt;
-use mina_p2p_messages::v2;
+use mina_p2p_messages::{bigint::InvalidBigInt, v2};
 use redux::Timestamp;
 use serde::{Deserialize, Serialize};
 

core/src/block/block_with_hash.rs

@@ -1,5 +1,7 @@
-use ark_ff::fields::arithmetic::InvalidBigInt;
-use mina_p2p_messages::v2::{self, StateHash};
+use mina_p2p_messages::{
+    bigint::InvalidBigInt,
+    v2::{self, StateHash},
+};
 
 use crate::constants::{constraint_constants, slots_per_window};
 

core/src/block/genesis.rs

@@ -121,14 +121,12 @@ impl TokenSymbol {
     }
 
     pub fn to_field<F: FieldWitness>(&self) -> F {
-        use ark_ff::FromBytes;
-
         let mut s = <[u8; 32]>::default();
         self.to_bytes(&mut s);
 
-        let value = FromBytes::read(&s[..]).expect("Shoudn't fail");
-        let bigint = BigInteger256::new(value);
-        F::from(bigint) // Never fail, `self` contain 6 bytes at most
+        // There is an assumption that a token symbol is on 6 bytes, therefore
+        // it will be smaller than the order
+        F::from_le_bytes_mod_order(&s)
     }
 }
 

ledger/src/account/account.rs

@@ -1,10 +1,10 @@
 #![allow(clippy::type_complexity)]
 
 use ark_ec::short_weierstrass::Affine;
-use ark_ff::{fields::arithmetic::InvalidBigInt, Field, PrimeField};
+use ark_ff::{Field, PrimeField};
 use mina_curves::pasta::Fp;
 use mina_p2p_messages::{
-    bigint::BigInt,
+    bigint::{BigInt, InvalidBigInt},
     binprot,
     pseq::PaddedSeq,
     v2::{

ledger/src/account/conv.rs

@@ -1,6 +1,8 @@
-use ark_ff::fields::arithmetic::InvalidBigInt;
 use mina_curves::pasta::{Fp, Vesta};
-use mina_p2p_messages::{bigint::BigInt, v2::PicklesProofProofsVerified2ReprStableV2};
+use mina_p2p_messages::{
+    bigint::{BigInt, InvalidBigInt},
+    v2::PicklesProofProofsVerified2ReprStableV2,
+};
 use poly_commitment::{commitment::CommitmentCurve, ipa::SRS};
 
 use super::{public_input::scalar_challenge::ScalarChallenge, urs_utils};

ledger/src/proofs/accumulator_check.rs

@@ -1,11 +1,10 @@
 use std::{rc::Rc, sync::Arc};
 
 use anyhow::Context;
-use ark_ff::fields::arithmetic::InvalidBigInt;
 use consensus::ConsensusState;
 use mina_core::constants::{constraint_constants, ForkConstants};
 use mina_curves::pasta::{Fp, Fq};
-use mina_p2p_messages::v2;
+use mina_p2p_messages::{bigint::InvalidBigInt, v2};
 use poseidon::hash::{
     params::{MINA_PROTO_STATE, MINA_PROTO_STATE_BODY},
     Inputs,

ledger/src/proofs/block.rs

@@ -5,7 +5,6 @@ use std::{
 };
 
 use ark_ec::{short_weierstrass::Affine, AffineRepr, CurveConfig};
-use ark_ff::fields::arithmetic::InvalidBigInt;
 use ark_poly::{univariate::DensePolynomial, Radix2EvaluationDomain};
 use kimchi::{
     alphas::Alphas,
@@ -21,7 +20,7 @@ use kimchi::{
     verifier_index::LookupVerifierIndex,
 };
 use mina_curves::pasta::Fq;
-use mina_p2p_messages::bigint::BigInt;
+use mina_p2p_messages::bigint::{BigInt, InvalidBigInt};
 use once_cell::sync::OnceCell;
 use poly_commitment::{
     commitment::CommitmentCurve, hash_map_cache::HashMapCache, ipa::SRS, PolyComm,