Updated proof system and algebra version

Author: 0xMimir

Cargo.lock

@@ -50,14 +50,24 @@ ledger = { path = "ledger", package = "mina-tree" }
 mina-p2p-messages = { path = "mina-p2p-messages" }
 poseidon = { path = "poseidon" }
 
-mina-curves = { git = "https://github.com/openmina/proof-systems", rev = "f461b4b" }
-mina-hasher = { git = "https://github.com/openmina/proof-systems", rev = "f461b4b" }
-mina-signer = { git = "https://github.com/openmina/proof-systems", rev = "f461b4b" }
-# UNCOMMENTED_IN_CI mina-curves = { git = "https://github.com/openmina/proof-systems", rev = "f461b4b", features = [ "32x9" ] }
-kimchi = { git = "https://github.com/openmina/proof-systems", rev = "f461b4b" }
-mina-poseidon = { git = "https://github.com/openmina/proof-systems", rev = "f461b4b" }
-o1-utils = { git = "https://github.com/openmina/proof-systems", rev = "f461b4b" }
-poly-commitment = { git = "https://github.com/openmina/proof-systems", rev = "f461b4b" }
+# UNCOMMENTED_IN_CI mina-curves = { git = "https://github.com/openmina/proof-systems", branch = "rebase-openmina", features = [ "32x9" ] }
+mina-curves = { git = "https://github.com/openmina/proof-systems", branch = "rebase-openmina" }
+mina-hasher = { git = "https://github.com/openmina/proof-systems", branch = "rebase-openmina" }
+mina-signer = { git = "https://github.com/openmina/proof-systems", branch = "rebase-openmina" }
+kimchi = { git = "https://github.com/openmina/proof-systems", branch = "rebase-openmina" }
+kimchi-stubs = { git = "https://github.com/openmina/proof-systems", branch = "rebase-openmina" }
+mina-poseidon = { git = "https://github.com/openmina/proof-systems", branch = "rebase-openmina" }
+o1-utils = { git = "https://github.com/openmina/proof-systems", branch = "rebase-openmina" }
+poly-commitment = { git = "https://github.com/openmina/proof-systems", branch = "rebase-openmina" }
+
+# kimchi.path = "../deps/proof-systems/kimchi"
+# kimchi-stubs.path = "../deps/proof-systems/kimchi-stubs"
+# 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"
 
 juniper = { version = "0.16" }
 libp2p = { git = "https://github.com/openmina/rust-libp2p", rev = "5c44c7d9", default-features = false }
@@ -72,8 +82,29 @@ serde_with = { version = "3.7.0", features = ["hex"] }
 static_assertions = "1.1.0"
 vrf = { path = "vrf" }
 
-ark-ff = { version = "0.3.0", features = ["parallel", "asm", "std"] }
-# UNCOMMENTED_IN_CI ark-ff = { version = "0.3.0", features = [ "parallel", "asm", "std", "32x9" ] }
+
+ark-ec = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode", features = [
+  "std",
+] } # branch: fix-openmina-webnode
+ark-ff = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode", features = [
+  "parallel",
+  "asm",
+  "std",
+] } # branch: fix-openmina-webnode
+ark-poly = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode" } # branch: fix-openmina-webnode
+ark-serialize = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode", features = [
+  "std",
+] } # branch: fix-openmina-webnode
+# Local
+# ark-ec = { path = "../deps/algebra/ec", features = ["std"] }
+# ark-ff = { path = "../deps/algebra/ff", features = ["parallel", "asm", "std"] }
+# ark-poly = { path = "../deps/algebra/poly", features = ["std"] }
+# ark-serialize = { path = "../deps/algebra/serialize" }
+
+num-bigint = { git = "https://github.com/openmina/num-bigint", branch = "rebase-onstack" } # branch: rebase-onstack
+# num-bigint.path = "../deps/num-bigint"
+
+# 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" }
@@ -92,13 +123,19 @@ incremental = false
 codegen-units = 1
 
 [patch.crates-io]
-ark-ff = { git = "https://github.com/openmina/algebra", rev = "150ab8d" }        # branch: fix-openmina-webnode
-ark-ec = { git = "https://github.com/openmina/algebra", rev = "150ab8d" }        # branch: fix-openmina-webnode
-ark-poly = { git = "https://github.com/openmina/algebra", rev = "150ab8d" }      # branch: fix-openmina-webnode
-ark-serialize = { git = "https://github.com/openmina/algebra", rev = "150ab8d" } # branch: fix-openmina-webnode
-
-num-bigint = { git = "https://github.com/openmina/num-bigint", rev = "8bb5ee4" }     # branch: on-stack
-num-rational = { git = "https://github.com/openmina/num-rational", rev = "336f11d" } # branch: on-stack
+ark-ff = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode" }        # branch: fix-openmina-webnode
+ark-ec = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode" }        # branch: fix-openmina-webnode
+ark-poly = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode" }      # branch: fix-openmina-webnode
+ark-serialize = { git = "https://github.com/openmina/algebra", branch = "rebase-fix-openmina-webnode" } # branch: fix-openmina-webnode
+# ark-ff.path = "../deps/algebra/ff"               # branch: fix-openmina-webnode
+# ark-ec.path = "../deps/algebra/ec"               # branch: fix-openmina-webnode
+# ark-poly.path = "../deps/algebra/poly"           # branch: fix-openmina-webnode
+# ark-serialize.path = "../deps/algebra/serialize" # branch: fix-openmina-webnode
+
+num-bigint = { git = "https://github.com/openmina/num-bigint", branch = "rebase-onstack" } # branch: rebase-onstack
+# num-bigint.path = "../deps/num-bigint"     # branch: on-stack
+num-rational = { git = "https://github.com/openmina/num-rational", branch = "rebase-onstack" } # branch: rebase-onstack
+# num-rational.path = "../deps/num-rational" # branch: on-stack
 
 [profile.test.package."*"]
 opt-level = 3

Cargo.toml

@@ -151,8 +151,7 @@ pub mod devnet {
         // ourselves right now, we cannot react to changes in this value,
         // so it will be hardcoded for now.
         fork: Some(ForkConstants {
-            state_hash: ark_ff::field_new!(
-                Fp,
+            state_hash: ark_ff::MontFp!(
                 "7908066420535064797069631664846455037440232590837253108938061943122344055350"
             ),
             blockchain_length: 296371,
@@ -231,8 +230,7 @@ pub mod mainnet {
         // ourselves right now, we cannot react to changes in this value,
         // so it will be hardcoded for now.
         fork: Some(ForkConstants {
-            state_hash: ark_ff::field_new!(
-                Fp,
+            state_hash: ark_ff::MontFp!(
                 "24465973112608446515163575794792913472627621028836869800891179577915755065526"
             ),
             blockchain_length: 359604,

core/src/network.rs

@@ -33,6 +33,7 @@ strum = "0.26.2"
 strum_macros = "0.26.4"
 
 bs58 = "0.4.0"
+kimchi-stubs = { workspace = true }
 mina-p2p-messages = { workspace = true }
 
 base64 = "0.13"
@@ -46,16 +47,16 @@ sha2 = "0.10"
 
 itertools = "0.12"
 
-ark-ec = { version = "0.3.0", features = ["std"] }
-ark-ff = { workspace = true }
-ark-poly = { version = "0.3.0", features = ["std"] }
-ark-serialize = { version = "0.3.0", features = ["std"] }
+ark-ec.workspace = true
+ark-ff.workspace = true
+ark-poly.workspace = true
+ark-serialize.workspace = true
 
 rayon = "1.5"
 
 bitvec = "1.0.0"
 hex = "0.4.3"
-num-bigint = "0.4"
+num-bigint.workspace = true
 
 once_cell = "1"
 rand = { version = "0.8", features = ["small_rng"] }

ledger/Cargo.toml

@@ -126,7 +126,8 @@ impl TokenSymbol {
         let mut s = <[u8; 32]>::default();
         self.to_bytes(&mut s);
 
-        let bigint = BigInteger256::read(&s[..]).unwrap();
+        let value = FromBytes::read(&s[..]).expect("Shoudn't fail");
+        let bigint = BigInteger256::new(value);
         F::try_from(bigint).unwrap() // Never fail, `self` contain 6 bytes at most
     }
 }

ledger/src/account/account.rs

@@ -1,6 +1,6 @@
 #![allow(clippy::type_complexity)]
 
-use ark_ec::short_weierstrass_jacobian::GroupAffine;
+use ark_ec::short_weierstrass::Affine;
 use ark_ff::{fields::arithmetic::InvalidBigInt, Field, PrimeField};
 use mina_curves::pasta::Fp;
 use mina_p2p_messages::{
@@ -82,7 +82,7 @@ where
     F: Field + Into<BigInt>,
 {
     fn from(fps: InnerCurve<F>) -> Self {
-        let GroupAffine { x, y, .. } = fps.to_affine();
+        let Affine { x, y, .. } = fps.to_affine();
         (x.into(), y.into())
     }
 }
@@ -106,7 +106,7 @@ where
     F: Field + Into<BigInt>,
 {
     fn from(fps: &InnerCurve<F>) -> Self {
-        let GroupAffine { x, y, .. } = fps.to_affine();
+        let Affine { x, y, .. } = fps.to_affine();
         (x.into(), y.into())
     }
 }
@@ -667,7 +667,7 @@ impl From<AccountIndex> for MinaBaseAccountIndexStableV1 {
 
 impl From<ReceiptChainHash> for mina_p2p_messages::v2::ReceiptChainHash {
     fn from(value: ReceiptChainHash) -> Self {
-        MinaBaseReceiptChainHashStableV1(value.0.into_repr().into()).into()
+        MinaBaseReceiptChainHashStableV1(value.0.into_bigint().into()).into()
     }
 }
 

ledger/src/account/conv.rs

@@ -68,9 +68,9 @@ macro_rules! cache_one {
 
 #[cfg(test)]
 mod tests {
-    use crate::proofs::field::FieldWitness;
-    use ark_ec::short_weierstrass_jacobian::GroupAffine;
-    use poly_commitment::srs::endos;
+    use crate::proofs::{self, field::FieldWitness};
+    use ark_ec::short_weierstrass::Affine;
+    use poly_commitment::ipa::endos;
     use std::sync::atomic::{AtomicUsize, Ordering::Relaxed};
 
     #[cfg(target_family = "wasm")]
@@ -82,10 +82,10 @@ mod tests {
 
         static COUNTER: AtomicUsize = AtomicUsize::new(0);
 
-        fn my_test<F: FieldWitness>() -> (F, F::Scalar) {
-            cache!((F, F::Scalar), {
+        fn my_test<F: FieldWitness>() -> (F, <F as proofs::field::FieldWitness>::Scalar) {
+            cache!((F, <F as proofs::field::FieldWitness>::Scalar), {
                 COUNTER.fetch_add(1, Relaxed);
-                endos::<GroupAffine<F::Parameters>>()
+                endos::<Affine<F::Parameters>>()
             })
         }
 

ledger/src/cache.rs

@@ -91,7 +91,7 @@ fn hash_field(f: &Fp) -> u32 {
     let mut acc = 0;
 
     let bigint: BigInteger256 = (*f).into();
-    let bigint = bigint.to_64x4();
+    let bigint = bigint.0;
     let nignore: usize = bigint.iter().rev().take_while(|&b| *b == 0).count();
 
     for bigint in bigint.iter().take(BigInteger256::NUM_LIMBS - nignore) {

ledger/src/port_ocaml/hash.rs

@@ -562,7 +562,7 @@ mod tests {
             let mina_fp = mina_curves::pasta::Fp::from_str(s).unwrap();
             assert_eq!(fp.0, mina_fp.0 .0);
 
-            assert_eq!(fp.into_repr(), mina_fp.into_repr().0)
+            assert_eq!(fp.into_bigint(), mina_fp.into_bigint().0)
         }
 
         for chunk in CONSTANTS.chunks(2) {

ledger/src/poseidon/fp.rs

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