Rust 1.74

.gitmodules

@@ -3,7 +3,4 @@
 	url = https://github.com/o1-labs/snarky
 [submodule "src/lib/crypto/proof-systems"]
 	path = src/lib/crypto/proof-systems
-	url = https://github.com/o1-labs/proof-systems.git
-[submodule "src/lib/crypto/kimchi_bindings/stubs/kimchi-stubs-vendors"]
-	path = src/lib/crypto/kimchi_bindings/stubs/kimchi-stubs-vendors
-	url = https://github.com/MinaProtocol/kimchi-stubs-vendors.git
+	url = https://github.com/o1-labs/proof-systems.git

buildkite/src/Constants/ContainerImages.dhall

@@ -4,11 +4,11 @@
 -- NOTE: minaToolchainBookworm is also used for building Ubuntu Jammy packages in CI
 { toolchainBase = "codaprotocol/ci-toolchain-base:v3"
 , minaToolchainBullseye =
-    "gcr.io/o1labs-192920/mina-toolchain@sha256:fee11e64a54fd8f026c4632fed7b7b9835b8262a037cdb156deb61d3d0aac8b2"
+    "gcr.io/o1labs-192920/mina-toolchain@sha256:8dc3a721b2be119db98a45970c21249f7ed9a95a75f2b330d7c0f37cdafcc99a"
 , minaToolchainBookworm =
-    "gcr.io/o1labs-192920/mina-toolchain@sha256:fee11e64a54fd8f026c4632fed7b7b9835b8262a037cdb156deb61d3d0aac8b2"
+    "gcr.io/o1labs-192920/mina-toolchain@sha256:8dc3a721b2be119db98a45970c21249f7ed9a95a75f2b330d7c0f37cdafcc99a"
 , minaToolchain =
-    "gcr.io/o1labs-192920/mina-toolchain@sha256:fee11e64a54fd8f026c4632fed7b7b9835b8262a037cdb156deb61d3d0aac8b2"
+    "gcr.io/o1labs-192920/mina-toolchain@sha256:8dc3a721b2be119db98a45970c21249f7ed9a95a75f2b330d7c0f37cdafcc99a"
 , elixirToolchain = "elixir:1.10-alpine"
 , nodeToolchain = "node:14.13.1-stretch-slim"
 , ubuntu2004 = "ubuntu:20.04"

dockerfiles/stages/1-build-deps

@@ -23,10 +23,7 @@ ARG GO_CAPNP_VERSION=v3.0.0-alpha.5
 # This should stay in line with:
 # - src/lib/crypto/kimchi_bindings/stubs/rust-toolchain.toml
 # - src/lib/crypto/proof-systems/rust-toolchain.toml
-ARG RUST_VERSION=1.72
-# Nightly Rust Version used for WebAssembly builds
-# - src/lib/crypto/kimchi_bindings/wasm/rust-toolchain.toml
-ARG RUST_NIGHTLY=2023-09-01
+ARG RUST_VERSION=1.74
 # wasm-pack version
 ARG WASM_PACK_VERSION=v0.12.1
 
@@ -97,7 +94,6 @@ RUN curl -sL \
 RUN curl -s "https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz" | tar -xz -C /usr/lib/
 
 # --- Rust install via rustup-init to a given RUST_VERSION
-# --- Additionally, install RUST_NIGHTLY via rustup
 # For more about rustup-init see: https://github.com/rust-lang/rustup/blob/master/README.md
 # As opposed to introducing another shell script here (that mostly just determines the platform)
 # we just download the binary for the only platform we care about in this docker environment
@@ -106,7 +102,6 @@ RUN curl --proto '=https' --tlsv1.2 -sSf -o /tmp/rustup-init \
   https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init \
   && chmod +x /tmp/rustup-init \
   && /tmp/rustup-init -y --default-toolchain "${RUST_VERSION}" --profile minimal --component rust-src --target wasm32-unknown-unknown \
-  && $HOME/.cargo/bin/rustup toolchain install "nightly-${RUST_NIGHTLY}" --profile minimal --component rust-src --target wasm32-unknown-unknown --no-self-update \
   && rm /tmp/rustup-init
 USER root
 

nix/rust.nix

@@ -8,9 +8,7 @@ let
       # override stdenv.targetPlatform here, if neccesary
     };
   toolchainHashes = {
-    "1.72" = "sha256-dxE7lmCFWlq0nl/wKcmYvpP9zqQbBitAQgZ1zx9Ooik=";
-    "nightly-2023-09-01" =
-      "sha256-zek9JAnRaoX8V0U2Y5ssXVe9tvoQ0ERGXfUCUGYdrMA=";
+    "1.74" = "sha256-PjvuouwTsYfNKW5Vi5Ye7y+lL7SsWGBxCtBOOm2z14c=";
     # copy the placeholder line with the correct toolchain name when adding a new toolchain
     # That is,
     # 1. Put the correct version name;
@@ -19,7 +17,7 @@ let
     #    error: hash mismatch in fixed-output derivation '/nix/store/XXXXX'
     #          specified: sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
     #             got:    sha256-Q9UgzzvxLi4x9aWUJTn+/5EXekC98ODRU1TwhUs9RnY=
-    "placeholder" = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
+    # "placeholder" = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
   };
   # rust-toolchain.toml -> { rustc, cargo, rust-analyzer, ... }
   rustChannelFromToolchainFileOf = file:

src/lib/crypto/kimchi_bindings/js/node_js/build.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 if [[ -z "${PLONK_WASM_NODEJS-}" ]]; then
     export RUSTFLAGS="-C target-feature=+atomics,+bulk-memory,+mutable-globals -C link-arg=--no-check-features -C link-arg=--max-memory=4294967296"
     # The version should stay in line with the one in kimchi_bindings/wasm/rust-toolchain.toml
-    rustup run nightly-2023-09-01 wasm-pack build --target nodejs --out-dir ../js/node_js ../../wasm -- -Z build-std=panic_abort,std --features nodejs
+    rustup run 1.74 wasm-pack build --target nodejs --out-dir ../js/node_js ../../wasm -- -Z build-std=panic_abort,std --features nodejs
 else
     cp "$PLONK_WASM_NODEJS"/* -R .
 fi

src/lib/crypto/kimchi_bindings/js/web/build.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 if [[ -z "${PLONK_WASM_WEB-}" ]]; then
     export RUSTFLAGS="-C target-feature=+atomics,+bulk-memory,+mutable-globals -C link-arg=--no-check-features -C link-arg=--max-memory=4294967296"
     # The version should stay in line with the one in kimchi_bindings/wasm/rust-toolchain.toml
-    rustup run nightly-2023-09-01 wasm-pack build --target web --out-dir ../js/web ../../wasm -- -Z build-std=panic_abort,std
+    rustup run 1.74 wasm-pack build --target web --out-dir ../js/web ../../wasm -- -Z build-std=panic_abort,std
 else
     cp "$PLONK_WASM_WEB"/* -R .
 fi

src/lib/crypto/kimchi_bindings/stubs/.cargo/config

@@ -1,8 +1,2 @@
 [build]
-rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup"]
-
-[source.crates-io]
-replace-with = "vendored-sources"
-
-[source.vendored-sources]
-directory = "kimchi-stubs-vendors"
+rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup"]

src/lib/crypto/kimchi_bindings/stubs/Cargo.toml

@@ -13,31 +13,31 @@ crate-type = ["lib", "staticlib"]
 
 [dependencies]
 array-init = "2.0.0"
-rmp-serde = "1.1.2"
 libc = "0.2.62"
 num-bigint = { version = "0.4.4", features = [ "rand", "serde" ] }
+# ocaml-specific
+ocaml = { version = "0.22.2", features = ["no-caml-startup"] }
+ocaml-gen = "0.1.5"
+once_cell = "1.10.0"
 paste = "1.0.5"
 rand = "0.8.5"
 rayon = "1.5.0"
+rmp-serde = "1.1.2"
 serde = "1.0.130"
 serde_json = "1.0.103"
 sprs = { version = "0.11.0", features = ["multi_thread"] }
-once_cell = "1.10.0"
 
 # arkworks
-ark-ff = { version = "0.4.2", features = ["parallel", "asm"] }
-ark-serialize = "0.4.2"
 ark-ec = { version = "0.4.2", features = ["parallel"] }
+ark-ff = { version = "0.4.2", features = ["parallel", "asm"] }
 ark-poly = { version = "0.4.2", features = ["parallel"] }
+ark-serialize = "0.4.2"
 
 # proof-systems
-poly-commitment = { path = "../../proof-systems/poly-commitment", features = ["ocaml_types"] }
 groupmap = { path = "../../proof-systems/groupmap" }
+kimchi = { path = "../../proof-systems/kimchi", features = ["ocaml_types"] }
 mina-curves = { path = "../../proof-systems/curves" }
-o1-utils = { path = "../../proof-systems/utils" }
 mina-poseidon = { path = "../../proof-systems/poseidon" }
-kimchi = { path = "../../proof-systems/kimchi", features = ["ocaml_types"] }
+o1-utils = { path = "../../proof-systems/utils" }
+poly-commitment = { path = "../../proof-systems/poly-commitment", features = ["ocaml_types"] }
 
-# ocaml-specific
-ocaml = { version = "0.22.2", features = ["no-caml-startup"] }
-ocaml-gen = "0.1.5"

src/lib/crypto/kimchi_bindings/stubs/dune

@@ -59,7 +59,7 @@
     (setenv
      RUSTFLAGS
      %{read:rustflags.sexp}
-     (run cargo build --release --offline)))
+     (run cargo build --release)))
    (run
     cp
     %{read:../dune-build-root}/cargo_kimchi_stubs/release/libwires_15_stubs.a
@@ -161,7 +161,7 @@
    (setenv
     CARGO_TARGET_DIR
     "%{read:../dune-build-root}/cargo_kimchi_bindgen"
-    (run cargo run %{targets} --offline))
+    (run cargo run %{targets}))
    (run ocamlformat -i %{targets}))))
 
 ;; this is used by nix

src/lib/crypto/kimchi_bindings/stubs/rust-toolchain.toml

@@ -11,4 +11,4 @@
 # 4. figure out the hashes of the (now obsolete) docker images used in CI rules that are failing, grep for these hashes and replace them with the new hashes
 
 [toolchain]
-channel = "1.72"
+channel = "1.74"

src/lib/crypto/kimchi_bindings/stubs/src/arkworks/pasta_fp.rs

@@ -2,8 +2,11 @@ use crate::arkworks::CamlBigInteger256;
 use crate::caml::caml_bytes_string::CamlBytesString;
 use ark_ff::{FftField, Field, One, PrimeField, UniformRand, Zero};
 use ark_poly::{EvaluationDomain, Radix2EvaluationDomain as Domain};
-use ark_serialize::{CanonicalSerialize, CanonicalDeserialize};
-use mina_curves::pasta::fields::{fp::{Fp, FpParameters as Fp_params}, fft::FpParameters};
+use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
+use mina_curves::pasta::fields::{
+    fft::FpParameters,
+    fp::{Fp, FpParameters as Fp_params},
+};
 use num_bigint::BigUint;
 use rand::rngs::StdRng;
 use std::{

src/lib/crypto/kimchi_bindings/stubs/src/arkworks/pasta_fq.rs

@@ -2,8 +2,11 @@ use crate::arkworks::CamlBigInteger256;
 use crate::caml::caml_bytes_string::CamlBytesString;
 use ark_ff::{FftField, Field, One, PrimeField, UniformRand, Zero};
 use ark_poly::{EvaluationDomain, Radix2EvaluationDomain as Domain};
-use ark_serialize::{CanonicalSerialize, CanonicalDeserialize};
-use mina_curves::pasta::{fields::{fq::FqParameters as Fq_params, fft::FpParameters}, Fq};
+use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
+use mina_curves::pasta::{
+    fields::{fft::FpParameters, fq::FqParameters as Fq_params},
+    Fq,
+};
 use num_bigint::BigUint;
 use rand::rngs::StdRng;
 use std::{

src/lib/crypto/kimchi_bindings/stubs/src/caml/caml_pointer.rs

@@ -1,7 +1,7 @@
 macro_rules! impl_caml_pointer {
     ($name: ident => $typ: ty) => {
         #[derive(std::fmt::Debug, Clone, ::ocaml_gen::CustomType)]
-        pub struct $name(pub ::std::rc::Rc<$typ>);
+        pub struct $name(pub ::std::rc::Rc<std::cell::UnsafeCell<$typ>>);
 
         impl $name {
             extern "C" fn caml_pointer_finalize(v: ocaml::Raw) {
@@ -12,8 +12,8 @@ macro_rules! impl_caml_pointer {
             }
 
             extern "C" fn caml_pointer_compare(_: ocaml::Raw, _: ocaml::Raw) -> i32 {
-                // Always return equal. We can use this for sanity checks, and anything else using this
-                // would be broken anyway.
+                // Always return equal. We can use this for sanity checks, and
+                // anything else using this would be broken anyway.
                 0
             }
         }
@@ -32,15 +32,17 @@ macro_rules! impl_caml_pointer {
 
         impl $name {
             pub fn create(x: $typ) -> $name {
-                $name(::std::rc::Rc::new(x))
+                $name(::std::rc::Rc::new(std::cell::UnsafeCell::new(x)))
             }
         }
 
         impl ::std::ops::Deref for $name {
             type Target = $typ;
 
             fn deref(&self) -> &Self::Target {
-                &*self.0
+                unsafe {
+                  &*self.0.get()
+                }
             }
         }
 
@@ -49,14 +51,15 @@ macro_rules! impl_caml_pointer {
                 unsafe {
                     // Wholely unsafe, Batman!
                     // We would use [`get_mut_unchecked`] here, but it is nightly-only.
-                    // Instead, we get coerce our constant pointer to a mutable pointer, in the knowledge
-                    // that
-                    // * all of our mutations called from OCaml are blocking, so we won't have multiple
-                    // live mutable references live simultaneously, and
-                    // * the underlying pointer is in the correct state to be mutable, since we can call
-                    //   [`get_mut_unchecked`] in nightly, or can call [`get_mut`] and unwrap if this is
+                    // Instead, we use UnsafeCell in the knowledge that
+                    // * all of our mutations called from OCaml are blocking, so
+                    // we won't have multiple live mutable references
+                    // simultaneously, and
+                    // * the underlying pointer is in the correct state to be
+                    //   mutable, since we can call [`get_mut_unchecked`] in
+                    //   nightly, or can call [`get_mut`] and unwrap if this is
                     //   the only live reference.
-                    &mut *(((&*self.0) as *const Self::Target) as *mut Self::Target)
+                      &mut *self.0.get()
                 }
             }
         }

src/lib/crypto/kimchi_bindings/stubs/src/field_vector.rs

@@ -1,4 +1,5 @@
-//! We implement a custom type for field vectors in order to quickly build field vectors from the OCaml side and avoid large vector clones.
+//! We implement a custom type for field vectors in order to quickly build field
+//! vectors from the OCaml side and avoid large vector clones.
 
 use paste::paste;