From d0a84bedf5d3d72d1809743df5de3a6cb4c5b7e8 Mon Sep 17 00:00:00 2001 From: Kai Mast Date: Thu, 16 Apr 2026 21:49:19 -0700 Subject: [PATCH 1/3] chore: update snarkVM rev --- Cargo.lock | 224 +++++++++++++++++------------------------ Cargo.toml | 11 +- node/bft/Cargo.toml | 2 +- node/src/prover/mod.rs | 9 +- 4 files changed, 114 insertions(+), 132 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5a80667559..62f3554453 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -381,9 +381,9 @@ checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" [[package]] name = "bech32" -version = "0.9.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" +checksum = "32637268377fc7b10a8c6d51de3e7fba1ce5dd371a96e342b34e6078db558e7f" [[package]] name = "bincode" @@ -1047,36 +1047,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "curl" -version = "0.4.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79fc3b6dd0b87ba36e565715bf9a2ced221311db47bd18011676f24a6066edbc" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe 0.1.6", - "openssl-sys", - "schannel", - "socket2 0.6.3", - "windows-sys 0.59.0", -] - -[[package]] -name = "curl-sys" -version = "0.4.88+curl-8.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644816de6547255eff4e491a1dda1c19b7237f00b62a61e6e64859ce4f2906d0" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "windows-sys 0.61.2", -] - [[package]] name = "curve25519-dalek" version = "4.1.3" @@ -1332,9 +1302,9 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "ecdsa" -version = "0.17.0-rc.18" +version = "0.17.0-rc.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54fb064faabbee66e1fc8e5c5a9458d4269dc2d8b638fe86a425adb2510d1a96" +checksum = "91bbdd377139884fafcad8dc43a760a3e1e681aa26db910257fa6535b70e1829" dependencies = [ "der 0.8.0", "digest 0.11.3", @@ -1377,9 +1347,9 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "elliptic-curve" -version = "0.14.0-rc.32" +version = "0.14.0-rc.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda94f31325c4275e9706adecbb6f0650dee2f904c915a98e3d81adaaaa757aa" +checksum = "e84043d573efd4ac9d2d125817979a379204bf7e328b25a4a30487e8d100e618" dependencies = [ "base16ct", "crypto-bigint", @@ -2504,9 +2474,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.97" +version = "0.3.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1840c94c045fbcf8ba2812c95db44499f7c64910a912551aaaa541decebcacf" +checksum = "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08" dependencies = [ "cfg-if", "futures-util", @@ -2531,9 +2501,9 @@ dependencies = [ [[package]] name = "k256" -version = "0.14.0-rc.9" +version = "0.14.0-rc.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b382cbfd43caf55991a93850ce538aa1aa67bb264af367d22dfe7937c4e997d" +checksum = "f7d2c6c227649d5ec80eaae541f1736232641a0bcdb3062a52b34edb42054158" dependencies = [ "cpubits", "ecdsa", @@ -2906,7 +2876,7 @@ dependencies = [ "libc", "log", "openssl", - "openssl-probe 0.2.1", + "openssl-probe", "openssl-sys", "schannel", "security-framework", @@ -3108,12 +3078,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "openssl-probe" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" - [[package]] name = "openssl-probe" version = "0.2.1" @@ -4105,7 +4069,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63" dependencies = [ - "openssl-probe 0.2.1", + "openssl-probe", "rustls-pki-types", "schannel", "security-framework", @@ -4625,6 +4589,7 @@ version = "4.6.0" dependencies = [ "built", "clap", + "elliptic-curve", "locktick", "rusty-hook", "snarkos-account", @@ -4780,7 +4745,7 @@ dependencies = [ "rand_chacha 0.10.0", "rand_distr", "rayon", - "sha2 0.10.9", + "sha2 0.11.0", "smol_str 0.3.2", "snarkos-account", "snarkos-node-bft", @@ -5104,7 +5069,7 @@ dependencies = [ [[package]] name = "snarkvm" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "anyhow", "dotenvy", @@ -5127,7 +5092,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "aleo-std", "anyhow", @@ -5142,7 +5107,7 @@ dependencies = [ "rand 0.10.1", "rayon", "serde", - "sha2 0.10.9", + "sha2 0.11.0", "smallvec", "snarkvm-algorithms-cuda", "snarkvm-curves", @@ -5155,7 +5120,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms-cuda" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "blst", "cc", @@ -5166,7 +5131,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -5180,7 +5145,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-circuit-network", "snarkvm-circuit-types", @@ -5190,7 +5155,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -5200,7 +5165,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -5210,7 +5175,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "anyhow", "indexmap 2.14.0", @@ -5230,12 +5195,12 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" [[package]] name = "snarkvm-circuit-network" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -5246,7 +5211,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -5260,7 +5225,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -5275,7 +5240,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -5288,7 +5253,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -5297,7 +5262,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -5307,7 +5272,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -5319,7 +5284,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -5331,7 +5296,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -5342,7 +5307,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -5354,7 +5319,7 @@ dependencies = [ [[package]] name = "snarkvm-console" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -5367,7 +5332,7 @@ dependencies = [ [[package]] name = "snarkvm-console-account" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "bs58", "snarkvm-console-network", @@ -5378,7 +5343,7 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "blake2s_simd", "hex", @@ -5394,7 +5359,7 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "aleo-std", "locktick", @@ -5408,7 +5373,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "anyhow", "enum-iterator", @@ -5428,7 +5393,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "anyhow", "bech32", @@ -5446,7 +5411,7 @@ dependencies = [ [[package]] name = "snarkvm-console-program" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "enum-iterator", "enum_index", @@ -5467,7 +5432,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -5482,7 +5447,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -5493,7 +5458,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-console-network-environment", ] @@ -5501,7 +5466,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-field" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -5511,7 +5476,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -5522,7 +5487,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -5533,7 +5498,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -5544,7 +5509,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -5555,7 +5520,7 @@ dependencies = [ [[package]] name = "snarkvm-curves" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "rand 0.10.1", "rustc_version", @@ -5568,7 +5533,7 @@ dependencies = [ [[package]] name = "snarkvm-fields" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "aleo-std", "anyhow", @@ -5585,7 +5550,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "aleo-std", "anyhow", @@ -5617,7 +5582,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "anyhow", "rand 0.10.1", @@ -5629,7 +5594,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "anyhow", "indexmap 2.14.0", @@ -5652,7 +5617,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "anyhow", "indexmap 2.14.0", @@ -5671,7 +5636,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -5684,7 +5649,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "indexmap 2.14.0", "rayon", @@ -5697,7 +5662,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "indexmap 2.14.0", "rayon", @@ -5710,7 +5675,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "bytes", "serde_json", @@ -5721,7 +5686,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "indexmap 2.14.0", "rayon", @@ -5736,7 +5701,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "bytes", "serde_json", @@ -5749,7 +5714,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "snarkvm-console", "snarkvm-ledger-puzzle", @@ -5758,7 +5723,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "aleo-std", "anyhow", @@ -5773,12 +5738,13 @@ dependencies = [ "serde_json", "snarkvm-algorithms", "snarkvm-console", + "snarkvm-utilities", ] [[package]] name = "snarkvm-ledger-puzzle-epoch" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "aleo-std", "anyhow", @@ -5801,7 +5767,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "anyhow", "async-trait", @@ -5818,7 +5784,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "aleo-std-storage", "anyhow", @@ -5846,7 +5812,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-test-helpers" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "aleo-std", "anyhow", @@ -5864,7 +5830,7 @@ dependencies = [ [[package]] name = "snarkvm-metrics" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "metrics", ] @@ -5872,13 +5838,12 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "aleo-std", "anyhow", "cfg-if", "colored 3.1.1", - "curl", "hex", "lazy_static", "locktick", @@ -5886,16 +5851,17 @@ dependencies = [ "paste", "rand 0.10.1", "serde_json", - "sha2 0.10.9", + "sha2 0.11.0", "snarkvm-curves", "snarkvm-utilities", "thiserror 2.0.18", + "ureq", ] [[package]] name = "snarkvm-synthesizer" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "aleo-std", "anyhow", @@ -5930,7 +5896,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-error" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "anyhow", "snarkvm-circuit-environment", @@ -5941,7 +5907,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "aleo-std", "colored 3.1.1", @@ -5968,7 +5934,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "enum-iterator", "indexmap 2.14.0", @@ -5989,7 +5955,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "bincode", "serde_json", @@ -6002,7 +5968,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "aleo-std", "anyhow", @@ -6025,7 +5991,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "4.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=8c5ef1f5849cf12e2e00b2b4ca5cea152db48402#8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=5f6b502578cc#5f6b502578ccc14661bfd768207e6d7376ddd7fc" dependencies = [ "proc-macro2", "quote 1.0.45", @@ -6694,9 +6660,9 @@ checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db" [[package]] name = "tonic" -version = "0.14.5" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec7c61a0695dc1887c1b53952990f3ad2e3a31453e1f49f10e75424943a93ec" +checksum = "ac2a5518c70fa84342385732db33fb3f44bc4cc748936eb5833d2df34d6445ef" dependencies = [ "async-trait", "axum", @@ -6723,9 +6689,9 @@ dependencies = [ [[package]] name = "tonic-prost" -version = "0.14.5" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55376a0bbaa4975a3f10d009ad763d8f4108f067c7c2e74f3001fb49778d309" +checksum = "50849f68853be452acf590cde0b146665b8d507b3b8af17261df47e02c209ea0" dependencies = [ "bytes", "prost", @@ -7149,9 +7115,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.120" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df52b6d9b87e0c74c9edfa1eb2d9bf85e5d63515474513aa50fa181b3c4f5db1" +checksum = "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790" dependencies = [ "cfg-if", "once_cell", @@ -7162,9 +7128,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.70" +version = "0.4.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af934872acec734c2d80e6617bbb5ff4f12b052dd8e6332b0817bce889516084" +checksum = "96492d0d3ffba25305a7dc88720d250b1401d7edca02cc3bcd50633b424673b8" dependencies = [ "js-sys", "wasm-bindgen", @@ -7172,9 +7138,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.120" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b1041f495fb322e64aca85f5756b2172e35cd459376e67f2a6c9dffcedb103" +checksum = "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578" dependencies = [ "quote 1.0.45", "wasm-bindgen-macro-support", @@ -7182,9 +7148,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.120" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dcd0ff20416988a18ac686d4d4d0f6aae9ebf08a389ff5d29012b05af2a1b41" +checksum = "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2" dependencies = [ "bumpalo", "proc-macro2", @@ -7195,9 +7161,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.120" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49757b3c82ebf16c57d69365a142940b384176c24df52a087fb748e2085359ea" +checksum = "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441" dependencies = [ "unicode-ident", ] @@ -7238,9 +7204,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.97" +version = "0.3.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eadbac71025cd7b0834f20d1fe8472e8495821b4e9801eb0a60bd1f19827602" +checksum = "4b572dff8bcf38bad0fa19729c89bb5748b2b9b1d8be70cf90df697e3a8f32aa" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/Cargo.toml b/Cargo.toml index 6069891aaa..0a0b497cc4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,7 +48,7 @@ default-features = false [workspace.dependencies.snarkvm] #path = "../snarkVM" git = "https://github.com/ProvableHQ/snarkVM.git" -rev = "8c5ef1f5849cf12e2e00b2b4ca5cea152db48402" +rev = "5f6b502578cc" #version = "=4.6.0" default-features = false @@ -359,6 +359,14 @@ tikv-jemallocator = "0.6" [dependencies.tracing] workspace = true +# Pinned to =0.14.0-rc.29 because k256 v0.14.0-rc.8 does not implement the +# MulVartime/MulByGeneratorVartime traits added in elliptic-curve v0.14.0-rc.31. +# Adding this as a direct dependency forces cargo to resolve the exact version +# and prevents automatic upgrades to incompatible RC releases. +[dependencies.elliptic-curve] +version = "=0.14.0-rc.29" +default-features = false + [dev-dependencies.rusty-hook] version = "0.11.2" @@ -406,6 +414,7 @@ debug-assertions = true [package.metadata.cargo-machete] ignored = [ + "elliptic-curve", # Needed to pin the crate to a specific version "snarkos-account", # Needed for cuda feature "snarkos-node", # Needed for metrics feature "snarkos-node-bft", # Needed for cuda and locktick features diff --git a/node/bft/Cargo.toml b/node/bft/Cargo.toml index 6458d8dbb9..35f312198e 100644 --- a/node/bft/Cargo.toml +++ b/node/bft/Cargo.toml @@ -100,7 +100,7 @@ workspace = true workspace = true [dependencies.sha2] -version = "0.10" +version = "0.11" default-features = false [dependencies.smol_str] diff --git a/node/src/prover/mod.rs b/node/src/prover/mod.rs index 85d43faa55..1bb34cd734 100644 --- a/node/src/prover/mod.rs +++ b/node/src/prover/mod.rs @@ -38,6 +38,7 @@ use snarkos_node_tcp::{ use snarkos_utilities::{NodeDataDir, SignalHandler, Stoppable}; use snarkvm::{ + console::network::consensus_config_value, ledger::narwhal::Data, prelude::{ Network, @@ -200,7 +201,13 @@ impl> Prover { // If the node is not connected to any peers, then skip this iteration. if self.router.number_of_connected_peers() == 0 { debug!("Skipping an iteration of the puzzle (no connected peers)"); - tokio::time::sleep(Duration::from_secs(N::ANCHOR_TIME as u64)).await; + let anchor_time = self + .latest_block_header + .read() + .as_ref() + .and_then(|header| consensus_config_value!(N, ANCHOR_TIMES, header.height())) + .unwrap_or_else(|| N::ANCHOR_TIMES.last().unwrap().1); + tokio::time::sleep(Duration::from_secs(anchor_time as u64)).await; continue; } From d5577d2edf29c0dc080dcdd2500f176dd66c09f2 Mon Sep 17 00:00:00 2001 From: Kai Mast Date: Mon, 4 May 2026 15:39:12 -0700 Subject: [PATCH 2/3] test(node/bft): use test_log in primary.rs --- node/bft/src/primary.rs | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/node/bft/src/primary.rs b/node/bft/src/primary.rs index 1eaf90f35b..af287e1aa6 100644 --- a/node/bft/src/primary.rs +++ b/node/bft/src/primary.rs @@ -2377,7 +2377,7 @@ mod tests { } } - #[tokio::test] + #[test_log::test(tokio::test)] async fn test_propose_batch() { let mut rng = TestRng::default(); let (primary, _) = primary_without_handlers(&mut rng); @@ -2398,7 +2398,7 @@ mod tests { assert!(primary.proposed_batch.read().is_some()); } - #[tokio::test] + #[test_log::test(tokio::test)] async fn test_propose_batch_with_no_transmissions() { let mut rng = TestRng::default(); let (primary, _) = primary_without_handlers(&mut rng); @@ -2411,7 +2411,7 @@ mod tests { assert!(primary.proposed_batch.read().is_some()); } - #[tokio::test] + #[test_log::test(tokio::test)] async fn test_propose_batch_in_round() { let round = 3; let mut rng = TestRng::default(); @@ -2436,7 +2436,7 @@ mod tests { assert!(primary.proposed_batch.read().is_some()); } - #[tokio::test] + #[test_log::test(tokio::test)] async fn test_propose_batch_skip_transmissions_from_previous_certificates() { let round = 3; let prev_round = round - 1; @@ -2508,7 +2508,7 @@ mod tests { ); } - #[tokio::test] + #[test_log::test(tokio::test)] async fn test_propose_batch_over_spend_limit() { let mut rng = TestRng::default(); @@ -2544,7 +2544,7 @@ mod tests { assert_eq!(primary.workers().iter().map(|worker| worker.transmissions().len()).sum::(), 3); } - #[tokio::test] + #[test_log::test(tokio::test)] async fn test_batch_propose_from_peer() { let mut rng = TestRng::default(); let (primary, accounts) = primary_without_handlers(&mut rng); @@ -2583,7 +2583,7 @@ mod tests { ); } - #[tokio::test] + #[test_log::test(tokio::test)] async fn test_batch_propose_from_peer_when_not_synced() { let mut rng = TestRng::default(); let (primary, accounts) = primary_without_handlers(&mut rng); @@ -2620,7 +2620,7 @@ mod tests { ); } - #[tokio::test] + #[test_log::test(tokio::test)] async fn test_batch_propose_from_peer_in_round() { let round = 2; let mut rng = TestRng::default(); @@ -2660,7 +2660,7 @@ mod tests { primary.process_batch_propose_from_peer(peer_ip, (*proposal.batch_header()).clone().into()).await.unwrap(); } - #[tokio::test] + #[test_log::test(tokio::test)] async fn test_batch_propose_from_peer_wrong_round() { let mut rng = TestRng::default(); let (primary, accounts) = primary_without_handlers(&mut rng); @@ -2703,7 +2703,7 @@ mod tests { ); } - #[tokio::test] + #[test_log::test(tokio::test)] async fn test_batch_propose_from_peer_in_round_wrong_round() { let round = 4; let mut rng = TestRng::default(); @@ -2750,7 +2750,7 @@ mod tests { } /// Tests that the minimum batch delay is enforced as expected, i.e., that proposals with timestamps that are too close to the previous proposal are rejected. - #[tokio::test] + #[test_log::test(tokio::test)] async fn test_batch_propose_from_peer_with_past_timestamp() { let round = 2; let mut rng = TestRng::default(); @@ -2801,7 +2801,7 @@ mod tests { } /// Check that proposals rejected that have timestamps older than the previous proposal. - #[tokio::test] + #[test_log::test(tokio::test)] async fn test_batch_propose_from_peer_over_spend_limit() { let mut rng = TestRng::default(); @@ -2864,7 +2864,7 @@ mod tests { ); } - #[tokio::test] + #[test_log::test(tokio::test)] async fn test_propose_batch_with_storage_round_behind_proposal_lock() { let round = 3; let mut rng = TestRng::default(); @@ -2903,7 +2903,7 @@ mod tests { assert!(primary.proposed_batch.read().is_some()); } - #[tokio::test] + #[test_log::test(tokio::test)] async fn test_propose_batch_with_storage_round_behind_proposal() { let round = 5; let mut rng = TestRng::default(); @@ -2933,7 +2933,7 @@ mod tests { assert!(primary.proposed_batch.read().as_ref().unwrap().round() > primary.current_round()); } - #[tokio::test(flavor = "multi_thread")] + #[test_log::test(tokio::test(flavor = "multi_thread"))] async fn test_batch_signature_from_peer() { let mut rng = TestRng::default(); let (primary, accounts) = primary_without_handlers(&mut rng); @@ -2971,7 +2971,7 @@ mod tests { assert_eq!(primary.current_round(), round + 1); } - #[tokio::test(flavor = "multi_thread")] + #[test_log::test(tokio::test(flavor = "multi_thread"))] async fn test_batch_signature_from_peer_in_round() { let round = 5; let mut rng = TestRng::default(); @@ -3012,7 +3012,7 @@ mod tests { assert_eq!(primary.current_round(), round + 1); } - #[tokio::test] + #[test_log::test(tokio::test)] async fn test_batch_signature_from_peer_no_quorum() { let mut rng = TestRng::default(); let (primary, accounts) = primary_without_handlers(&mut rng); @@ -3047,7 +3047,7 @@ mod tests { assert_eq!(primary.current_round(), round); } - #[tokio::test] + #[test_log::test(tokio::test)] async fn test_batch_signature_from_peer_in_round_no_quorum() { let round = 7; let mut rng = TestRng::default(); @@ -3085,7 +3085,7 @@ mod tests { assert_eq!(primary.current_round(), round); } - #[tokio::test] + #[test_log::test(tokio::test)] async fn test_insert_certificate_with_aborted_transmissions() { let round = 3; let prev_round = round - 1; From 8a4d8d064c627347abe082b74dcf8d52e4ba445c Mon Sep 17 00:00:00 2001 From: Kai Mast Date: Mon, 4 May 2026 15:39:41 -0700 Subject: [PATCH 3/3] chore: use new snarkVM Process API --- cli/src/commands/developer/execute.rs | 6 +++--- node/bft/ledger-service/src/ledger.rs | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/cli/src/commands/developer/execute.rs b/cli/src/commands/developer/execute.rs index 2cd38bcc8b..b9c9ec073f 100644 --- a/cli/src/commands/developer/execute.rs +++ b/cli/src/commands/developer/execute.rs @@ -26,7 +26,7 @@ use snarkvm::{ Address, Identifier, Locator, - Process, + ProcessExclusiveGuard, ProgramID, VM, Value, @@ -162,7 +162,7 @@ impl Execute { debug!("At block height {height} and consensus {version:?}"); // Load the program and it's imports into the process. - load_program(&query, &mut vm.process().write(), &program_id, &endpoint)?; + load_program(&query, &vm.process().lock(), &program_id, &endpoint)?; } // Prepare the fee. @@ -240,7 +240,7 @@ impl Execute { /// A helper function to recursively load the program and all of its imports into the process. fn load_program( query: &Query>, - process: &mut Process, + process: &ProcessExclusiveGuard, program_id: &ProgramID, endpoint: &Uri, ) -> Result<()> { diff --git a/node/bft/ledger-service/src/ledger.rs b/node/bft/ledger-service/src/ledger.rs index a2baa63931..5081eb40fc 100644 --- a/node/bft/ledger-service/src/ledger.rs +++ b/node/bft/ledger-service/src/ledger.rs @@ -447,8 +447,7 @@ impl> LedgerService for CoreLedgerService< let id = transaction.id(); match transaction { Transaction::Deploy(_, _, _, deployment, _) => { - let (_, cost_details) = - deployment_cost(&self.ledger.vm().process().read(), deployment, consensus_version)?; + let (_, cost_details) = deployment_cost(self.ledger.vm().process(), deployment, consensus_version)?; let compute_spend = deploy_compute_cost_in_microcredits(cost_details, consensus_version)?; ensure!( compute_spend <= transaction_spend_limit, @@ -457,8 +456,7 @@ impl> LedgerService for CoreLedgerService< Ok(compute_spend) } Transaction::Execute(_, _, execution, _) => { - let (_, cost_details) = - execution_cost(&self.ledger.vm().process().read(), execution, consensus_version)?; + let (_, cost_details) = execution_cost(self.ledger.vm().process(), execution, consensus_version)?; let compute_spend = execute_compute_cost_in_microcredits(cost_details, consensus_version)?; if consensus_version >= ConsensusVersion::V11 { // From V11, add this check for consistency with our deployment checks.