From e0eca8b3d83d8ab63d46ebbb8faf9016d8175803 Mon Sep 17 00:00:00 2001 From: Danny Willems Date: Wed, 27 Sep 2023 17:29:29 +0200 Subject: [PATCH 01/13] Update proof-systems with 1.72 --- src/lib/crypto/proof-systems | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/crypto/proof-systems b/src/lib/crypto/proof-systems index caddeeb6549..e54a121ad7e 160000 --- a/src/lib/crypto/proof-systems +++ b/src/lib/crypto/proof-systems @@ -1 +1 @@ -Subproject commit caddeeb65499fed5a1035664c5001a1e88ca27ae +Subproject commit e54a121ad7eff0c510d38cde99425e3649cddc89 From ad24cb3b227d0ec0bd6d9fde46d05fb548eab780 Mon Sep 17 00:00:00 2001 From: Danny Willems Date: Wed, 27 Sep 2023 17:31:33 +0200 Subject: [PATCH 02/13] Kimchi_bindings/stubs: use Rust 1.72 and make clippy happy --- src/lib/crypto/kimchi_bindings/stubs/rust-toolchain.toml | 2 +- .../crypto/kimchi_bindings/stubs/src/arkworks/bigint_256.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/crypto/kimchi_bindings/stubs/rust-toolchain.toml b/src/lib/crypto/kimchi_bindings/stubs/rust-toolchain.toml index 8ecda82d680..5a82cfe5ab4 100644 --- a/src/lib/crypto/kimchi_bindings/stubs/rust-toolchain.toml +++ b/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.67.0" +channel = "1.72" diff --git a/src/lib/crypto/kimchi_bindings/stubs/src/arkworks/bigint_256.rs b/src/lib/crypto/kimchi_bindings/stubs/src/arkworks/bigint_256.rs index 90570304d3c..e9f54f65219 100644 --- a/src/lib/crypto/kimchi_bindings/stubs/src/arkworks/bigint_256.rs +++ b/src/lib/crypto/kimchi_bindings/stubs/src/arkworks/bigint_256.rs @@ -239,12 +239,12 @@ mod tests { #[test] fn biguint() { let x = 10000.to_biguint().unwrap(); - println!("biguint.to_string: {}", x.to_string()); + println!("biguint.to_string: {}", x); let y = CamlBigInteger256::try_from(x.clone()).unwrap(); println!("camlbigint.to_string: {}", y.to_string()); //assert!(&y.to_string() == "10000"); let x2: BigUint = y.into(); assert!(x2 == x); - println!("biguint.to_string: {}", x2.to_string()); + println!("biguint.to_string: {}", x2); } } From bf5308c9569ae1306dba55f0f380f9c788c1f4ee Mon Sep 17 00:00:00 2001 From: Richard Bonichon Date: Wed, 27 Sep 2023 17:09:47 +0200 Subject: [PATCH 03/13] Nix: update rust versions --- nix/rust.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/nix/rust.nix b/nix/rust.nix index 51726d84501..d686a259557 100644 --- a/nix/rust.nix +++ b/nix/rust.nix @@ -8,10 +8,18 @@ let # override stdenv.targetPlatform here, if neccesary }; toolchainHashes = { - "1.67.0" = "sha256-riZUc+R9V35c/9e8KJUE+8pzpXyl0lRXt3ZkKlxoY0g="; - "nightly-2023-02-05" = - "sha256-MM8fdvveBEWzpwjH7u6C0F7qSWGPIMpfZWLgVxSqtxY="; - # copy this line with the correct toolchain name + "1.71" = "sha256-R0F0Risbr74xg9mEYydyebx/z0Wu6HI0/KWwrV30vZo="; + "1.72" = "sha256-dxE7lmCFWlq0nl/wKcmYvpP9zqQbBitAQgZ1zx9Ooik="; + "nightly-2023-08-24" = "sha256-nfYc8EgbYl75yIIHmEEmpux4ZpwaIyuC+g6Hf4y1Hyk="; + + # copy the placeholder line with the correct toolchain name when adding a new toolchain + # That is, + # 1. Put the correct version name; + # + # 2. Put the hash you get in line "got" from the error you obtain, which looks like + # error: hash mismatch in fixed-output derivation '/nix/store/XXXXX' + # specified: sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + # got: sha256-Q9UgzzvxLi4x9aWUJTn+/5EXekC98ODRU1TwhUs9RnY= "placeholder" = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; }; # rust-toolchain.toml -> { rustc, cargo, rust-analyzer, ... } @@ -200,4 +208,3 @@ in cargoLock.lockFile = ../src/app/trace-tool/Cargo.lock; }; } - From 74de6da15684c637d5604627abd3a14d0d44f87f Mon Sep 17 00:00:00 2001 From: Richard Bonichon Date: Wed, 27 Sep 2023 21:28:03 +0200 Subject: [PATCH 04/13] Update o1js submodule --- nix/rust.nix | 10 ++++++---- src/lib/snarkyjs | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/nix/rust.nix b/nix/rust.nix index d686a259557..87d0e77c897 100644 --- a/nix/rust.nix +++ b/nix/rust.nix @@ -10,8 +10,9 @@ let toolchainHashes = { "1.71" = "sha256-R0F0Risbr74xg9mEYydyebx/z0Wu6HI0/KWwrV30vZo="; "1.72" = "sha256-dxE7lmCFWlq0nl/wKcmYvpP9zqQbBitAQgZ1zx9Ooik="; - "nightly-2023-08-24" = "sha256-nfYc8EgbYl75yIIHmEEmpux4ZpwaIyuC+g6Hf4y1Hyk="; - + "nightly-2023-08-25" = "sha256-nfYc8EgbYl75yIIHmEEmpux4ZpwaIyuC+g6Hf4y1Hyk="; + "nightly-2023-09-01" = "sha256-nfYc8EgbYl75yIIHmEEmpux4ZpwaIyuC+g6Hf4y1Hyk="; + "nightly-2023-06-01" = "sha256-+LaR+muOMguIl6Cz3UdLspvwgyG8s5t1lcNnQyyJOgA="; # copy the placeholder line with the correct toolchain name when adding a new toolchain # That is, # 1. Put the correct version name; @@ -158,8 +159,9 @@ in checkInputs = [ final.nodejs ]; - # other tests require it to be ran in the wasm-bindgen monorepo - cargoTestFlags = [ "--test=interface-types" ]; + # other tests, like --test=wasm-bindgen, require it to be ran in the + # wasm-bindgen monorepo + cargoTestFlags = [ "--test=interface-types --test=reference" ]; }; in rustPlatform.buildRustPackage { diff --git a/src/lib/snarkyjs b/src/lib/snarkyjs index 8314d7b3540..4b6157bccf6 160000 --- a/src/lib/snarkyjs +++ b/src/lib/snarkyjs @@ -1 +1 @@ -Subproject commit 8314d7b3540e004ec51dc6ba77e1e6b1d0c76dc6 +Subproject commit 4b6157bccf63432d80c15f25f9876acc793ec784 From c335176c0f3e02adf710349595cfb66576c2560c Mon Sep 17 00:00:00 2001 From: Danny Willems Date: Tue, 3 Oct 2023 15:23:23 +0200 Subject: [PATCH 05/13] Update snarkyjs after artefacts generation --- src/lib/snarkyjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/snarkyjs b/src/lib/snarkyjs index 4b6157bccf6..675e113cc7b 160000 --- a/src/lib/snarkyjs +++ b/src/lib/snarkyjs @@ -1 +1 @@ -Subproject commit 4b6157bccf63432d80c15f25f9876acc793ec784 +Subproject commit 675e113cc7b2561ff031f571a2f500de0f3744ff From 725dd977dedeb6b249d84d456698ca7efe102586 Mon Sep 17 00:00:00 2001 From: Danny Willems Date: Tue, 3 Oct 2023 15:32:20 +0200 Subject: [PATCH 06/13] Update Rust versions in dockerfiles --- dockerfiles/stages/1-build-deps | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dockerfiles/stages/1-build-deps b/dockerfiles/stages/1-build-deps index 8cef1afb96f..1eb78a99926 100644 --- a/dockerfiles/stages/1-build-deps +++ b/dockerfiles/stages/1-build-deps @@ -20,9 +20,13 @@ ARG GO_VERSION=1.19.11 ARG GO_CAPNP_VERSION=v3.0.0-alpha.5 # Rust Version passed into rustup-init, can also be "stable", "nightly" or similar -ARG RUST_VERSION=1.63.0 +# 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 -ARG RUST_NIGHTLY=2022-09-12 +# - src/lib/snarkyjs/src/bindings/kimchi/wasm/rust-toolchain.toml +ARG RUST_NIGHTLY=2023-09-01 # wasm-pack version ARG WASM_PACK_VERSION=v0.10.3 From b0d1bf1add8b9a98dedddd36a1e04860e320cc13 Mon Sep 17 00:00:00 2001 From: Danny Willems Date: Tue, 3 Oct 2023 17:22:54 +0200 Subject: [PATCH 07/13] Bump up Docker images --- buildkite/src/Constants/ContainerImages.dhall | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/buildkite/src/Constants/ContainerImages.dhall b/buildkite/src/Constants/ContainerImages.dhall index f687849ca59..01111b5e4ad 100644 --- a/buildkite/src/Constants/ContainerImages.dhall +++ b/buildkite/src/Constants/ContainerImages.dhall @@ -4,10 +4,10 @@ -- NOTE: minaToolchainBookworm is also used for building Ubuntu Jammy packages in CI { toolchainBase = "codaprotocol/ci-toolchain-base:v3", - minaToolchainBuster = "gcr.io/o1labs-192920/mina-toolchain@sha256:563fd7adda282fb3b6765c1811a3566e0fa0560f5d1c5270003483030d82d394", - minaToolchainBullseye = "gcr.io/o1labs-192920/mina-toolchain@sha256:49891eb46089f937f054afa464ce9868529981b92b30740cce32ef60957a1098", - minaToolchainBookworm = "gcr.io/o1labs-192920/mina-toolchain@sha256:49891eb46089f937f054afa464ce9868529981b92b30740cce32ef60957a1098", - minaToolchain = "gcr.io/o1labs-192920/mina-toolchain@sha256:49891eb46089f937f054afa464ce9868529981b92b30740cce32ef60957a1098", + minaToolchainBuster = "gcr.io/o1labs-192920/mina-toolchain@sha256:2064dcca5f36c3f99627b8033416c52534ef174b64ec83c32273cb0df365b237", + minaToolchainBullseye = "gcr.io/o1labs-192920/mina-toolchain@sha256:4c59147acc16d45bffae04f310ed15fd770ce96bcf9c43eeefb6e607a2e3199e", + minaToolchainBookworm = "gcr.io/o1labs-192920/mina-toolchain@sha256:4c59147acc16d45bffae04f310ed15fd770ce96bcf9c43eeefb6e607a2e3199e", + minaToolchain = "gcr.io/o1labs-192920/mina-toolchain@sha256:4c59147acc16d45bffae04f310ed15fd770ce96bcf9c43eeefb6e607a2e3199e", delegationBackendToolchain = "gcr.io/o1labs-192920/delegation-backend-production@sha256:12ffd0a9016819c720687f440c7a46b8815f8d3ad06d306d342ee5f8dd4375f5", elixirToolchain = "elixir:1.10-alpine", nodeToolchain = "node:14.13.1-stretch-slim", From 112e39e44381d3d96e1232e53d7b186e1609b05d Mon Sep 17 00:00:00 2001 From: Danny Willems Date: Tue, 3 Oct 2023 17:59:32 +0200 Subject: [PATCH 08/13] Updating wasm-pack to v0.12.1 --- dockerfiles/stages/1-build-deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/stages/1-build-deps b/dockerfiles/stages/1-build-deps index 1eb78a99926..5202a830a59 100644 --- a/dockerfiles/stages/1-build-deps +++ b/dockerfiles/stages/1-build-deps @@ -28,7 +28,7 @@ ARG RUST_VERSION=1.72 # - src/lib/snarkyjs/src/bindings/kimchi/wasm/rust-toolchain.toml ARG RUST_NIGHTLY=2023-09-01 # wasm-pack version -ARG WASM_PACK_VERSION=v0.10.3 +ARG WASM_PACK_VERSION=v0.12.1 # Rocksdb commit tag/branch to clone ARG ROCKSDB_VERSION=v5.18.4 From f73ce2e30adf8682348e1ee9584ba9d28132cd08 Mon Sep 17 00:00:00 2001 From: Danny Willems Date: Tue, 3 Oct 2023 18:05:26 +0200 Subject: [PATCH 09/13] Updating snarkyjs after updating to wasm-pack 0.12.1 --- src/lib/snarkyjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/snarkyjs b/src/lib/snarkyjs index 675e113cc7b..d5b4a4b0a0e 160000 --- a/src/lib/snarkyjs +++ b/src/lib/snarkyjs @@ -1 +1 @@ -Subproject commit 675e113cc7b2561ff031f571a2f500de0f3744ff +Subproject commit d5b4a4b0a0e8784df2bcffb1b22de18f2db91a01 From 6c7c81144750961c32d5e028d6d36b4b7828908d Mon Sep 17 00:00:00 2001 From: Danny Willems Date: Tue, 3 Oct 2023 20:24:18 +0200 Subject: [PATCH 10/13] Bump up snarkyjs --- src/lib/snarkyjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/snarkyjs b/src/lib/snarkyjs index d5b4a4b0a0e..2185825ec64 160000 --- a/src/lib/snarkyjs +++ b/src/lib/snarkyjs @@ -1 +1 @@ -Subproject commit d5b4a4b0a0e8784df2bcffb1b22de18f2db91a01 +Subproject commit 2185825ec648037ed7ff9244e83fdaea06cc8ae7 From 681bdb33cea6e7fe990ccd18e342b802a368207b Mon Sep 17 00:00:00 2001 From: Danny Willems Date: Tue, 3 Oct 2023 20:34:10 +0200 Subject: [PATCH 11/13] Nix: remove useless versions --- nix/rust.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nix/rust.nix b/nix/rust.nix index 87d0e77c897..4e8f9e24fad 100644 --- a/nix/rust.nix +++ b/nix/rust.nix @@ -8,11 +8,8 @@ let # override stdenv.targetPlatform here, if neccesary }; toolchainHashes = { - "1.71" = "sha256-R0F0Risbr74xg9mEYydyebx/z0Wu6HI0/KWwrV30vZo="; "1.72" = "sha256-dxE7lmCFWlq0nl/wKcmYvpP9zqQbBitAQgZ1zx9Ooik="; - "nightly-2023-08-25" = "sha256-nfYc8EgbYl75yIIHmEEmpux4ZpwaIyuC+g6Hf4y1Hyk="; "nightly-2023-09-01" = "sha256-nfYc8EgbYl75yIIHmEEmpux4ZpwaIyuC+g6Hf4y1Hyk="; - "nightly-2023-06-01" = "sha256-+LaR+muOMguIl6Cz3UdLspvwgyG8s5t1lcNnQyyJOgA="; # copy the placeholder line with the correct toolchain name when adding a new toolchain # That is, # 1. Put the correct version name; From 665c79033ba333f9a80be652746e0086fbcdd4e6 Mon Sep 17 00:00:00 2001 From: Danny Willems Date: Tue, 3 Oct 2023 21:03:23 +0200 Subject: [PATCH 12/13] Bump up snarkyjs after squashing in snarkyjs-bindings --- src/lib/snarkyjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/snarkyjs b/src/lib/snarkyjs index 2185825ec64..409959d9075 160000 --- a/src/lib/snarkyjs +++ b/src/lib/snarkyjs @@ -1 +1 @@ -Subproject commit 2185825ec648037ed7ff9244e83fdaea06cc8ae7 +Subproject commit 409959d9075e592dddc09a1980caf03cd3cbf2ad From 33652eb2ff83ac163dfba1b5b8c755a0cb335c97 Mon Sep 17 00:00:00 2001 From: Danny Willems Date: Tue, 3 Oct 2023 21:08:20 +0200 Subject: [PATCH 13/13] CI: bumping images to get wasm-pack 0.12.1 --- buildkite/src/Constants/ContainerImages.dhall | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/buildkite/src/Constants/ContainerImages.dhall b/buildkite/src/Constants/ContainerImages.dhall index 01111b5e4ad..9c06bf956f3 100644 --- a/buildkite/src/Constants/ContainerImages.dhall +++ b/buildkite/src/Constants/ContainerImages.dhall @@ -4,10 +4,10 @@ -- NOTE: minaToolchainBookworm is also used for building Ubuntu Jammy packages in CI { toolchainBase = "codaprotocol/ci-toolchain-base:v3", - minaToolchainBuster = "gcr.io/o1labs-192920/mina-toolchain@sha256:2064dcca5f36c3f99627b8033416c52534ef174b64ec83c32273cb0df365b237", - minaToolchainBullseye = "gcr.io/o1labs-192920/mina-toolchain@sha256:4c59147acc16d45bffae04f310ed15fd770ce96bcf9c43eeefb6e607a2e3199e", - minaToolchainBookworm = "gcr.io/o1labs-192920/mina-toolchain@sha256:4c59147acc16d45bffae04f310ed15fd770ce96bcf9c43eeefb6e607a2e3199e", - minaToolchain = "gcr.io/o1labs-192920/mina-toolchain@sha256:4c59147acc16d45bffae04f310ed15fd770ce96bcf9c43eeefb6e607a2e3199e", + minaToolchainBuster = "gcr.io/o1labs-192920/mina-toolchain@sha256:71173ebccf6af3e24d27262a5071f3dd0bd2c40b9de1c258422fdb9419507d3c", + minaToolchainBullseye = "gcr.io/o1labs-192920/mina-toolchain@sha256:9c4062e76fcd910ad60d3f1f58e2395f6a5e70f16fbef422442aedb70112ac73", + minaToolchainBookworm = "gcr.io/o1labs-192920/mina-toolchain@sha256:9c4062e76fcd910ad60d3f1f58e2395f6a5e70f16fbef422442aedb70112ac73", + minaToolchain = "gcr.io/o1labs-192920/mina-toolchain@sha256:9c4062e76fcd910ad60d3f1f58e2395f6a5e70f16fbef422442aedb70112ac73", delegationBackendToolchain = "gcr.io/o1labs-192920/delegation-backend-production@sha256:12ffd0a9016819c720687f440c7a46b8815f8d3ad06d306d342ee5f8dd4375f5", elixirToolchain = "elixir:1.10-alpine", nodeToolchain = "node:14.13.1-stretch-slim",