From 7061aff157caf552f301f322219535358cc2eed0 Mon Sep 17 00:00:00 2001 From: Richard Bonichon Date: Wed, 27 Sep 2023 21:28:03 +0200 Subject: [PATCH] Update o1js submodule --- nix/rust.nix | 14 ++++++++------ src/lib/snarkyjs | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/nix/rust.nix b/nix/rust.nix index d686a2595573..c36d9e1c5e41 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; @@ -143,10 +144,10 @@ in version = deps.wasm-bindgen.version; src = final.fetchCrate { inherit pname version; - sha256 = "sha256-0rK+Yx4/Jy44Fw5VwJ3tG243ZsyOIBBehYU54XP/JGk="; + sha256 = "sha256-0u9bl+FkXEK2b54n7/l9JOCtKo+pb42GF9E1EnAUQa0="; }; - cargoSha256 = "sha256-vcpxcRlW1OKoD64owFF6mkxSqmNrvY+y3Ckn5UwEQ50="; + cargoSha256 = "sha256-AsZBtE2qHJqQtuCt/wCAgOoxYMfvDh8IzBPAOkYSYko="; nativeBuildInputs = [ final.pkg-config ]; buildInputs = with final; @@ -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=reference" ]; }; in rustPlatform.buildRustPackage { diff --git a/src/lib/snarkyjs b/src/lib/snarkyjs index 8314d7b3540e..4b6157bccf63 160000 --- a/src/lib/snarkyjs +++ b/src/lib/snarkyjs @@ -1 +1 @@ -Subproject commit 8314d7b3540e004ec51dc6ba77e1e6b1d0c76dc6 +Subproject commit 4b6157bccf63432d80c15f25f9876acc793ec784