Merge branch 'develop' into dependabot/cargo/aes-0.8.4

Author: dannywillems

.github/workflows/ci.yaml

@@ -518,7 +518,7 @@ jobs:
           ./${{ matrix.test }} --test-threads=1
 
   bootstrap-test:
-    timeout-minutes: 4
+    timeout-minutes: 10
     needs: [build, build-tests]
     runs-on: ubuntu-24.04
     env:

.github/workflows/docs.yaml

@@ -26,7 +26,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: 'npm'
@@ -85,7 +85,7 @@ jobs:
         uses: actions/configure-pages@v5
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: 'npm'
@@ -134,7 +134,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: 'npm'

.github/workflows/markdown-format.yaml

@@ -14,7 +14,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: '20'
           cache: 'npm'

CHANGELOG.md

@@ -62,6 +62,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   [#1340](https://github.com/o1-labs/mina-rust/pull/1340),
   [#2981ecf](https://github.com/o1-labs/mina-rust/commit/2981ecf9519517f69947838407a09ea96f7ff293),
   [#1e9f33f](https://github.com/o1-labs/mina-rust/commit/1e9f33f125dcaab36d9dd2dc17759e3476bc36e8))
+- **Documentation**: add release communication checklist
+  ([#1390](https://github.com/o1-labs/mina-rust/pull/1390))
 
 ### Changed
 
@@ -108,6 +110,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#1228](https://github.com/o1-labs/openmina/pull/1228))
 - bump aes from 0.8.3 to 0.8.4
   ([#1272](https://github.com/o1-labs/openmina/pull/1272))
+- Remove OpenMina forks of arkworks and proof-systems
+  ([#1383](https://github.com/o1-labs/mina-rust/pull/1383))
+- Bump mio from 1.0.3 to 1.0.4
+  ([#1384](https://github.com/o1-labs/mina-rust/pull/1384))
 
 ### 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};