From 5d6a2498562e85fd490098ee0a6f1b948474728e Mon Sep 17 00:00:00 2001 From: ljedrz Date: Tue, 10 Feb 2026 08:58:52 +0100 Subject: [PATCH 1/4] feat: enhanced historical mapping retrieval Signed-off-by: ljedrz --- node/rest/src/routes.rs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/node/rest/src/routes.rs b/node/rest/src/routes.rs index f979ebdcc8..01bc76954f 100644 --- a/node/rest/src/routes.rs +++ b/node/rest/src/routes.rs @@ -35,6 +35,9 @@ use rayon::prelude::*; use version::VersionInfo; +#[cfg(feature = "history")] +type HistoricalMappingKey = (ProgramID, Identifier, Plaintext, u32); + /// Deserialize a CSV string into a vector of strings. fn de_csv<'de, D>(de: D) -> std::result::Result, D::Error> where @@ -905,19 +908,19 @@ impl, R: Routing> Rest { Ok(ErasedJson::pretty(())) } - /// GET /{network}/block/{blockHeight}/history/{mapping} + /// GET /{network}/program/{id}/mapping/{name}/{key}/history/{height} #[cfg(feature = "history")] pub(crate) async fn get_history( State(rest): State, - Path((height, mapping)): Path<(u32, snarkvm::synthesizer::MappingName)>, + Path((program_id, mapping_name, mapping_key, height)): Path>, ) -> Result { // Retrieve the history for the given block height and variant. - let history = snarkvm::synthesizer::History::new(N::ID, rest.ledger.vm().finalize_store().storage_mode()); - let result = history.load_mapping(height, mapping).map_err(|err| { - RestError::not_found(err.context(format!("Could not load mapping '{mapping}' from block '{height}'"))) - })?; + let value = rest.ledger.vm().finalize_store().get_historical_mapping_value(program_id, mapping_name, mapping_key.clone(), height) + .map_err(|err| { + RestError::not_found(err.context(format!("Could not load mapping '{mapping_name}/{mapping_key}' for program '{program_id}' from block '{height}'"))) + })?; - Ok((StatusCode::OK, [(CONTENT_TYPE, "application/json")], result)) + Ok((StatusCode::OK, ErasedJson::pretty(value))) } /// GET /{network}/validators/participation From 13ff27cb30772c4c53f4c568a5b29833388e485c Mon Sep 17 00:00:00 2001 From: ljedrz Date: Thu, 12 Feb 2026 16:28:46 +0100 Subject: [PATCH 2/4] chore: update snarkVM Signed-off-by: ljedrz --- Cargo.lock | 471 +++++++++++++++++++++++++++++++++++------------------ Cargo.toml | 2 +- 2 files changed, 315 insertions(+), 158 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c512474a33..41e514afca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -209,7 +209,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -231,7 +231,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -242,7 +242,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -278,9 +278,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.37.0" +version = "0.37.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c34dda4df7017c8db52132f0f8a2e0f8161649d15723ed63fc00c82d0f2081a" +checksum = "b092fe214090261288111db7a2b2c2118e5a7f30dc2569f1732c4069a6840549" dependencies = [ "cc", "cmake", @@ -484,7 +484,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -704,9 +704,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.57" +version = "4.5.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6899ea499e3fb9305a65d5ebf6e3d2248c5fab291f300ad0a704fbe142eae31a" +checksum = "63be97961acde393029492ce0be7a1af7e323e6bae9511ebfac33751be5e6806" dependencies = [ "clap_builder", "clap_derive", @@ -714,9 +714,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.57" +version = "4.5.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b12c8b680195a62a8364d16b8447b01b6c2c8f9aaf68bee653be34d4245e238" +checksum = "7f13174bda5dfd69d7e947827e5af4b0f2f94a4a3ee92912fba07a66150f21e2" dependencies = [ "anstream", "anstyle", @@ -733,14 +733,14 @@ dependencies = [ "heck", "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] name = "clap_lex" -version = "0.7.7" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32" +checksum = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831" [[package]] name = "cmake" @@ -1099,7 +1099,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -1133,7 +1133,7 @@ dependencies = [ "proc-macro2", "quote 1.0.44", "strsim", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -1146,7 +1146,7 @@ dependencies = [ "proc-macro2", "quote 1.0.44", "strsim", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -1157,7 +1157,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81" dependencies = [ "darling_core 0.21.3", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -1168,7 +1168,7 @@ checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d" dependencies = [ "darling_core 0.23.0", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -1212,9 +1212,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" +checksum = "cc3dc5ad92c2e2d1c193bbbbdf2ea477cb81331de4f3103f267ca18368b988c4" dependencies = [ "powerfmt", "serde_core", @@ -1229,7 +1229,7 @@ dependencies = [ "proc-macro2", "quote 1.0.44", "structmeta 0.3.0", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -1240,7 +1240,7 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -1262,7 +1262,7 @@ dependencies = [ "proc-macro2", "quote 1.0.44", "rustc_version", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -1305,7 +1305,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -1435,7 +1435,7 @@ checksum = "685adfa4d6f3d765a26bc5dbc936577de9abf756c1feeb3089b01dd395034842" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -1456,9 +1456,9 @@ dependencies = [ [[package]] name = "env_filter" -version = "0.1.4" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2" +checksum = "7a1c3cc8e57274ec99de65301228b537f1e4eedc1b8e0f9411c6caac8ae7308f" dependencies = [ "log", ] @@ -1471,9 +1471,9 @@ checksum = "c7f84e12ccf0a7ddc17a6c41c93326024c42920d7ee630d04950e6926645c0fe" [[package]] name = "env_logger" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" +checksum = "b2daee4ea451f429a58296525ddf28b45a3b64f1acf6587e2067437bb11e218d" dependencies = [ "anstream", "anstyle", @@ -1714,7 +1714,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -1809,6 +1809,19 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "getrandom" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "139ef39800118c7683f2fd3c98c1b23c09ae076556b435f8e9064ae108aaeeec" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasip2", + "wasip3", +] + [[package]] name = "gimli" version = "0.32.3" @@ -2311,6 +2324,12 @@ dependencies = [ "zerovec", ] +[[package]] +name = "id-arena" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" + [[package]] name = "ident_case" version = "1.0.1" @@ -2394,7 +2413,7 @@ dependencies = [ "indoc", "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -2551,11 +2570,17 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" +[[package]] +name = "leb128fmt" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" + [[package]] name = "libc" -version = "0.2.180" +version = "0.2.181" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" +checksum = "459427e2af2b9c839b132acb702a1c654d95e10f8c326bfc2ad11310e458b1c5" [[package]] name = "libgit2-sys" @@ -2876,14 +2901,14 @@ dependencies = [ "cfg-if", "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] name = "native-tls" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" +checksum = "6cdede44f9a69cab2899a2049e2c3bd49bf911a157f6a3353d4a91c61abbce44" dependencies = [ "libc", "log", @@ -2989,7 +3014,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -3094,7 +3119,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -3243,7 +3268,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -3296,7 +3321,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -3325,7 +3350,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -3388,9 +3413,9 @@ dependencies = [ [[package]] name = "predicates" -version = "3.1.3" +version = "3.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573" +checksum = "ada8f2932f28a27ee7b70dd6c1c39ea0675c55a36879ab92f3a715eaa1e63cfe" dependencies = [ "anstyle", "predicates-core", @@ -3398,15 +3423,15 @@ dependencies = [ [[package]] name = "predicates-core" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa" +checksum = "cad38746f3166b4031b1a0d39ad9f954dd291e7854fcc0eed52ee41a0b50d144" [[package]] name = "predicates-tree" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c" +checksum = "d0de1b847b39c8131db0467e9df1ff60e6d0562ab8e9a16e568ad0fdb372e2f2" dependencies = [ "predicates-core", "termtree", @@ -3419,7 +3444,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -3471,7 +3496,7 @@ dependencies = [ "itertools", "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -3819,7 +3844,7 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -4341,7 +4366,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -4418,7 +4443,7 @@ dependencies = [ "darling 0.21.3", "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -4507,9 +4532,9 @@ checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" [[package]] name = "simple_asn1" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb" +checksum = "0d585997b0ac10be3c5ee635f1bab02d512760d14b7c468801ac8a01d9ae5f1d" dependencies = [ "num-bigint", "num-traits", @@ -4580,7 +4605,7 @@ dependencies = [ "snarkos-node-tcp", "snarkvm", "tikv-jemallocator", - "toml 0.9.11+spec-1.1.0", + "toml 0.9.12+spec-1.1.0", "tracing", "walkdir", ] @@ -4733,7 +4758,7 @@ dependencies = [ "snarkos-utilities", "snarkvm", "test-log", - "test-strategy 0.4.4", + "test-strategy 0.4.5", "time", "tokio", "tokio-stream", @@ -4756,7 +4781,7 @@ dependencies = [ "snarkos-node-sync-locators", "snarkos-node-tcp", "snarkvm", - "test-strategy 0.4.4", + "test-strategy 0.4.5", "time", "tokio-util", "tracing", @@ -4950,7 +4975,7 @@ dependencies = [ "snarkos-node-sync-locators", "snarkos-node-tcp", "snarkvm", - "test-strategy 0.4.4", + "test-strategy 0.4.5", "tokio-util", "tracing", ] @@ -5031,7 +5056,7 @@ dependencies = [ [[package]] name = "snarkvm" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "anyhow", "dotenvy", @@ -5054,7 +5079,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "aleo-std", "anyhow", @@ -5082,7 +5107,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms-cuda" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "blst", "cc", @@ -5093,7 +5118,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -5107,7 +5132,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-circuit-network", "snarkvm-circuit-types", @@ -5117,7 +5142,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -5127,7 +5152,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -5137,7 +5162,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "indexmap 2.13.0", "itertools", @@ -5156,12 +5181,12 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" [[package]] name = "snarkvm-circuit-network" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -5172,7 +5197,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -5186,7 +5211,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -5201,7 +5226,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -5214,7 +5239,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -5223,7 +5248,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -5233,7 +5258,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -5245,7 +5270,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -5257,7 +5282,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -5268,7 +5293,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -5280,7 +5305,7 @@ dependencies = [ [[package]] name = "snarkvm-console" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -5293,7 +5318,7 @@ dependencies = [ [[package]] name = "snarkvm-console-account" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "bs58", "snarkvm-console-network", @@ -5304,7 +5329,7 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "blake2s_simd", "hex", @@ -5320,7 +5345,7 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "aleo-std", "rayon", @@ -5332,7 +5357,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "anyhow", "enum-iterator", @@ -5352,7 +5377,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "anyhow", "bech32", @@ -5370,7 +5395,7 @@ dependencies = [ [[package]] name = "snarkvm-console-program" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "enum-iterator", "enum_index", @@ -5391,7 +5416,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -5406,7 +5431,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -5417,7 +5442,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-console-network-environment", ] @@ -5425,7 +5450,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-field" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -5435,7 +5460,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -5446,7 +5471,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -5457,7 +5482,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -5468,7 +5493,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -5479,7 +5504,7 @@ dependencies = [ [[package]] name = "snarkvm-curves" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "rand 0.8.5", "rustc_version", @@ -5492,7 +5517,7 @@ dependencies = [ [[package]] name = "snarkvm-fields" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "aleo-std", "anyhow", @@ -5509,7 +5534,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "aleo-std", "anyhow", @@ -5541,7 +5566,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "anyhow", "rand 0.8.5", @@ -5553,7 +5578,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "anyhow", "indexmap 2.13.0", @@ -5575,7 +5600,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "anyhow", "indexmap 2.13.0", @@ -5594,7 +5619,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -5607,7 +5632,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "indexmap 2.13.0", "rayon", @@ -5620,7 +5645,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "indexmap 2.13.0", "rayon", @@ -5633,7 +5658,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "bytes", "serde_json", @@ -5644,7 +5669,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "indexmap 2.13.0", "rayon", @@ -5659,7 +5684,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "bytes", "serde_json", @@ -5672,7 +5697,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "snarkvm-console", "snarkvm-ledger-puzzle", @@ -5681,7 +5706,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "aleo-std", "anyhow", @@ -5701,7 +5726,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle-epoch" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "aleo-std", "anyhow", @@ -5724,7 +5749,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "anyhow", "async-trait", @@ -5741,7 +5766,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "aleo-std-storage", "anyhow", @@ -5769,7 +5794,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-test-helpers" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "aleo-std", "anyhow", @@ -5787,7 +5812,7 @@ dependencies = [ [[package]] name = "snarkvm-metrics" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "metrics", ] @@ -5795,7 +5820,7 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "aleo-std", "anyhow", @@ -5818,7 +5843,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "aleo-std", "anyhow", @@ -5853,7 +5878,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-error" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "anyhow", "snarkvm-circuit-environment", @@ -5864,7 +5889,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "aleo-std", "colored 3.1.1", @@ -5890,7 +5915,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "enum-iterator", "indexmap 2.13.0", @@ -5899,6 +5924,7 @@ dependencies = [ "rand_chacha 0.3.1", "rayon", "serde_json", + "snarkvm-algorithms", "snarkvm-circuit", "snarkvm-console", "snarkvm-synthesizer-error", @@ -5910,7 +5936,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "bincode", "serde_json", @@ -5923,7 +5949,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "aleo-std", "anyhow", @@ -5946,11 +5972,11 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=9acfa311b3#9acfa311b35e98cfb9c9a2eb6cad7e0e33410b5d" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -6029,7 +6055,7 @@ dependencies = [ "proc-macro2", "quote 1.0.44", "structmeta-derive 0.2.0", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -6041,7 +6067,7 @@ dependencies = [ "proc-macro2", "quote 1.0.44", "structmeta-derive 0.3.0", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -6052,7 +6078,7 @@ checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -6063,7 +6089,7 @@ checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -6084,7 +6110,7 @@ dependencies = [ "heck", "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -6101,7 +6127,7 @@ checksum = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" dependencies = [ "quote 0.3.15", "synom", - "unicode-xid", + "unicode-xid 0.0.4", ] [[package]] @@ -6117,9 +6143,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.114" +version = "2.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" +checksum = "6e614ed320ac28113fa64972c4262d5dbc89deacdfd00c34a3e4cea073243c12" dependencies = [ "proc-macro2", "quote 1.0.44", @@ -6141,7 +6167,7 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" dependencies = [ - "unicode-xid", + "unicode-xid 0.0.4", ] [[package]] @@ -6152,7 +6178,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -6188,12 +6214,12 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.24.0" +version = "3.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c" +checksum = "0136791f7c95b1f6dd99f9cc786b91bb81c3800b639b3478e561ddb7be95e5f1" dependencies = [ "fastrand", - "getrandom 0.3.4", + "getrandom 0.4.1", "once_cell", "rustix 1.1.3", "windows-sys 0.61.2", @@ -6287,7 +6313,7 @@ checksum = "be35209fd0781c5401458ab66e4f98accf63553e8fae7425503e92fdd319783b" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -6299,20 +6325,20 @@ dependencies = [ "proc-macro2", "quote 1.0.44", "structmeta 0.2.0", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] name = "test-strategy" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c572af0dd6da9b0b5c1c2393c0be69f8e3b96302b20e4444c3fcf627efc31067" +checksum = "8f7fd1eb9efb36942b85a290c4201d317980fe09bc88d34dd48aaaae03075c6a" dependencies = [ "derive-ex", "proc-macro2", "quote 1.0.44", "structmeta 0.3.0", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -6341,7 +6367,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -6352,7 +6378,7 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -6486,7 +6512,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -6555,9 +6581,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.9.11+spec-1.1.0" +version = "0.9.12+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46" +checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863" dependencies = [ "indexmap 2.13.0", "serde_core", @@ -6579,9 +6605,9 @@ dependencies = [ [[package]] name = "toml_parser" -version = "1.0.6+spec-1.1.0" +version = "1.0.8+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" +checksum = "0742ff5ff03ea7e67c8ae6c93cac239e0d9784833362da3f9a9c1da8dfefcbdc" dependencies = [ "winnow", ] @@ -6734,7 +6760,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -6794,7 +6820,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad06847b7afb65c7866a36664b75c40b895e318cea4f71299f013fb22965329d" dependencies = [ "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -6872,6 +6898,12 @@ version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "untrusted" version = "0.9.0" @@ -7028,6 +7060,15 @@ dependencies = [ "wit-bindgen", ] +[[package]] +name = "wasip3" +version = "0.4.0+wasi-0.3.0-rc-2026-01-06" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" +dependencies = [ + "wit-bindgen", +] + [[package]] name = "wasm-bindgen" version = "0.2.108" @@ -7074,7 +7115,7 @@ dependencies = [ "bumpalo", "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", "wasm-bindgen-shared", ] @@ -7087,6 +7128,40 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "wasm-encoder" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" +dependencies = [ + "leb128fmt", + "wasmparser", +] + +[[package]] +name = "wasm-metadata" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" +dependencies = [ + "anyhow", + "indexmap 2.13.0", + "wasm-encoder", + "wasmparser", +] + +[[package]] +name = "wasmparser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" +dependencies = [ + "bitflags 2.10.0", + "hashbrown 0.15.5", + "indexmap 2.13.0", + "semver", +] + [[package]] name = "web-sys" version = "0.3.85" @@ -7272,7 +7347,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -7283,7 +7358,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -7569,6 +7644,88 @@ name = "wit-bindgen" version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" +dependencies = [ + "wit-bindgen-rust-macro", +] + +[[package]] +name = "wit-bindgen-core" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" +dependencies = [ + "anyhow", + "heck", + "wit-parser", +] + +[[package]] +name = "wit-bindgen-rust" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" +dependencies = [ + "anyhow", + "heck", + "indexmap 2.13.0", + "prettyplease", + "syn 2.0.115", + "wasm-metadata", + "wit-bindgen-core", + "wit-component", +] + +[[package]] +name = "wit-bindgen-rust-macro" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" +dependencies = [ + "anyhow", + "prettyplease", + "proc-macro2", + "quote 1.0.44", + "syn 2.0.115", + "wit-bindgen-core", + "wit-bindgen-rust", +] + +[[package]] +name = "wit-component" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" +dependencies = [ + "anyhow", + "bitflags 2.10.0", + "indexmap 2.13.0", + "log", + "serde", + "serde_derive", + "serde_json", + "wasm-encoder", + "wasm-metadata", + "wasmparser", + "wit-parser", +] + +[[package]] +name = "wit-parser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" +dependencies = [ + "anyhow", + "id-arena", + "indexmap 2.13.0", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid 0.2.6", + "wasmparser", +] [[package]] name = "writeable" @@ -7595,7 +7752,7 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", "synstructure", ] @@ -7616,7 +7773,7 @@ checksum = "4122cd3169e94605190e77839c9a40d40ed048d305bfdc146e7df40ab0f3e517" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -7636,7 +7793,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", "synstructure", ] @@ -7657,7 +7814,7 @@ checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -7690,7 +7847,7 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote 1.0.44", - "syn 2.0.114", + "syn 2.0.115", ] [[package]] @@ -7723,9 +7880,9 @@ dependencies = [ [[package]] name = "zmij" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4de98dfa5d5b7fef4ee834d0073d560c9ca7b6c46a71d058c48db7960f8cfaf7" +checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" [[package]] name = "zopfli" diff --git a/Cargo.toml b/Cargo.toml index 7a98baea3f..dabbbaa0d6 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 = "9acfa311b3" +rev = "b45b3864" #version = "=4.4.0" default-features = false From 79f63f1e858576186827e424a937193f48af8879 Mon Sep 17 00:00:00 2001 From: Kai Mast Date: Mon, 9 Feb 2026 09:54:15 -0800 Subject: [PATCH 3/4] ci: enable chaotic devnet test for this branch --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7017f57fec..6ef15f920b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -788,7 +788,7 @@ workflows: filters: branches: only: - - ci/updated_network_delay_test + - fix/atomic_prepare_next_block - canary - testnet - mainnet From f5c19837874c3f97f0f1b241ea1a209c51902083 Mon Sep 17 00:00:00 2001 From: Kai Mast Date: Tue, 3 Feb 2026 21:16:34 -0800 Subject: [PATCH 4/4] chore: update snarkVM rev --- Cargo.lock | 122 ++++++++++----------- Cargo.toml | 3 +- node/bft/ledger-service/src/ledger.rs | 2 +- node/bft/ledger-service/src/mock.rs | 2 +- node/bft/ledger-service/src/prover.rs | 4 +- node/bft/ledger-service/src/traits.rs | 2 +- node/bft/ledger-service/src/translucent.rs | 2 +- node/bft/src/sync/mod.rs | 16 ++- node/bft/src/worker.rs | 2 +- 9 files changed, 83 insertions(+), 72 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 41e514afca..336256ad1e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5056,7 +5056,7 @@ dependencies = [ [[package]] name = "snarkvm" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "anyhow", "dotenvy", @@ -5079,7 +5079,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "aleo-std", "anyhow", @@ -5107,7 +5107,7 @@ dependencies = [ [[package]] name = "snarkvm-algorithms-cuda" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "blst", "cc", @@ -5118,7 +5118,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -5132,7 +5132,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-circuit-network", "snarkvm-circuit-types", @@ -5142,7 +5142,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -5152,7 +5152,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -5162,7 +5162,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "indexmap 2.13.0", "itertools", @@ -5181,12 +5181,12 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" [[package]] name = "snarkvm-circuit-network" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -5197,7 +5197,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -5211,7 +5211,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -5226,7 +5226,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -5239,7 +5239,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -5248,7 +5248,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -5258,7 +5258,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -5270,7 +5270,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -5282,7 +5282,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -5293,7 +5293,7 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -5305,7 +5305,7 @@ dependencies = [ [[package]] name = "snarkvm-console" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -5318,7 +5318,7 @@ dependencies = [ [[package]] name = "snarkvm-console-account" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "bs58", "snarkvm-console-network", @@ -5329,7 +5329,7 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "blake2s_simd", "hex", @@ -5345,7 +5345,7 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "aleo-std", "rayon", @@ -5357,7 +5357,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "anyhow", "enum-iterator", @@ -5377,7 +5377,7 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "anyhow", "bech32", @@ -5395,7 +5395,7 @@ dependencies = [ [[package]] name = "snarkvm-console-program" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "enum-iterator", "enum_index", @@ -5416,7 +5416,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -5431,7 +5431,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -5442,7 +5442,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-console-network-environment", ] @@ -5450,7 +5450,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-field" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -5460,7 +5460,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -5471,7 +5471,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -5482,7 +5482,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -5493,7 +5493,7 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -5504,7 +5504,7 @@ dependencies = [ [[package]] name = "snarkvm-curves" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "rand 0.8.5", "rustc_version", @@ -5517,7 +5517,7 @@ dependencies = [ [[package]] name = "snarkvm-fields" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "aleo-std", "anyhow", @@ -5534,7 +5534,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "aleo-std", "anyhow", @@ -5566,7 +5566,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "anyhow", "rand 0.8.5", @@ -5578,7 +5578,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "anyhow", "indexmap 2.13.0", @@ -5600,7 +5600,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "anyhow", "indexmap 2.13.0", @@ -5619,7 +5619,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -5632,7 +5632,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "indexmap 2.13.0", "rayon", @@ -5645,7 +5645,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "indexmap 2.13.0", "rayon", @@ -5658,7 +5658,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "bytes", "serde_json", @@ -5669,7 +5669,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "indexmap 2.13.0", "rayon", @@ -5684,7 +5684,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "bytes", "serde_json", @@ -5697,7 +5697,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "snarkvm-console", "snarkvm-ledger-puzzle", @@ -5706,7 +5706,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "aleo-std", "anyhow", @@ -5726,7 +5726,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle-epoch" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "aleo-std", "anyhow", @@ -5749,7 +5749,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "anyhow", "async-trait", @@ -5766,7 +5766,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "aleo-std-storage", "anyhow", @@ -5794,7 +5794,7 @@ dependencies = [ [[package]] name = "snarkvm-ledger-test-helpers" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "aleo-std", "anyhow", @@ -5812,7 +5812,7 @@ dependencies = [ [[package]] name = "snarkvm-metrics" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "metrics", ] @@ -5820,7 +5820,7 @@ dependencies = [ [[package]] name = "snarkvm-parameters" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "aleo-std", "anyhow", @@ -5843,7 +5843,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "aleo-std", "anyhow", @@ -5878,7 +5878,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-error" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "anyhow", "snarkvm-circuit-environment", @@ -5889,7 +5889,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "aleo-std", "colored 3.1.1", @@ -5915,7 +5915,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "enum-iterator", "indexmap 2.13.0", @@ -5936,7 +5936,7 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "bincode", "serde_json", @@ -5949,7 +5949,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "aleo-std", "anyhow", @@ -5972,7 +5972,7 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" version = "4.4.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=b45b3864#b45b3864e9471eb1e8b9ec95521ecc6702f4663c" +source = "git+https://github.com/ProvableHQ/snarkVM.git?branch=fix%2Fatomic_prepare_next_block#9ba0df7d86303ffe92cfd5682acef8a60575d74c" dependencies = [ "proc-macro2", "quote 1.0.44", diff --git a/Cargo.toml b/Cargo.toml index dabbbaa0d6..c99c822da7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,7 +48,8 @@ default-features = false [workspace.dependencies.snarkvm] #path = "../snarkVM" git = "https://github.com/ProvableHQ/snarkVM.git" -rev = "b45b3864" +#rev = "b45b3864" +branch = "fix/atomic_prepare_next_block" #version = "=4.4.0" default-features = false diff --git a/node/bft/ledger-service/src/ledger.rs b/node/bft/ledger-service/src/ledger.rs index 9bc6314938..42c20d1b12 100644 --- a/node/bft/ledger-service/src/ledger.rs +++ b/node/bft/ledger-service/src/ledger.rs @@ -364,7 +364,7 @@ impl> LedgerService for CoreLedgerService< &self, subdag: Subdag, transmissions: IndexMap, Transmission>, - ) -> Result> { + ) -> Result, CheckBlockError> { self.ledger.prepare_advance_to_next_quorum_block(subdag, transmissions, &mut rand::thread_rng()) } diff --git a/node/bft/ledger-service/src/mock.rs b/node/bft/ledger-service/src/mock.rs index 269dfe55a1..d94233610b 100644 --- a/node/bft/ledger-service/src/mock.rs +++ b/node/bft/ledger-service/src/mock.rs @@ -237,7 +237,7 @@ impl LedgerService for MockLedgerService { &self, _subdag: Subdag, _transmissions: IndexMap, Transmission>, - ) -> Result> { + ) -> Result, CheckBlockError> { unreachable!("MockLedgerService does not support prepare_advance_to_next_quorum_block") } diff --git a/node/bft/ledger-service/src/prover.rs b/node/bft/ledger-service/src/prover.rs index 5751e2ae55..4822fdbed7 100644 --- a/node/bft/ledger-service/src/prover.rs +++ b/node/bft/ledger-service/src/prover.rs @@ -195,8 +195,8 @@ impl LedgerService for ProverLedgerService { &self, _subdag: Subdag, _transmissions: IndexMap, Transmission>, - ) -> Result> { - bail!("Cannot prepare advance to next quorum block in prover") + ) -> Result, CheckBlockError> { + Err(anyhow::anyhow!("Cannot prepare advance to next quorum block in prover").into()) } /// Adds the given block as the next block in the ledger. diff --git a/node/bft/ledger-service/src/traits.rs b/node/bft/ledger-service/src/traits.rs index b35b7f2829..9aea47c924 100644 --- a/node/bft/ledger-service/src/traits.rs +++ b/node/bft/ledger-service/src/traits.rs @@ -128,7 +128,7 @@ pub trait LedgerService: Debug + Send + Sync { &self, subdag: Subdag, transmissions: IndexMap, Transmission>, - ) -> Result>; + ) -> Result, CheckBlockError>; /// Adds the given block as the next block in the ledger. #[cfg(feature = "ledger-write")] diff --git a/node/bft/ledger-service/src/translucent.rs b/node/bft/ledger-service/src/translucent.rs index a9497abce3..2b073ca1a3 100644 --- a/node/bft/ledger-service/src/translucent.rs +++ b/node/bft/ledger-service/src/translucent.rs @@ -202,7 +202,7 @@ impl> LedgerService for TranslucentLedgerS &self, subdag: Subdag, transmissions: IndexMap, Transmission>, - ) -> Result> { + ) -> Result, CheckBlockError> { self.inner.prepare_advance_to_next_quorum_block(subdag, transmissions) } diff --git a/node/bft/src/sync/mod.rs b/node/bft/src/sync/mod.rs index d350fe825c..de4fbc323b 100644 --- a/node/bft/src/sync/mod.rs +++ b/node/bft/src/sync/mod.rs @@ -1426,7 +1426,9 @@ mod tests { subdag_map.insert(commit_round - 1, previous_cert_map.clone()); let subdag = Subdag::from(subdag_map.clone())?; let ledger = core_ledger.clone(); - spawn_blocking!(ledger.prepare_advance_to_next_quorum_block(subdag, Default::default()))? + + tokio::task::spawn_blocking(move || ledger.prepare_advance_to_next_quorum_block(subdag, Default::default())) + .await?? }; // Insert block 1. let ledger = core_ledger.clone(); @@ -1449,7 +1451,11 @@ mod tests { subdag_map_2.insert(leader_round_2 - 1, previous_cert_map_2.clone()); let subdag_2 = Subdag::from(subdag_map_2.clone())?; let ledger = core_ledger.clone(); - spawn_blocking!(ledger.prepare_advance_to_next_quorum_block(subdag_2, Default::default()))? + + tokio::task::spawn_blocking(move || { + ledger.prepare_advance_to_next_quorum_block(subdag_2, Default::default()) + }) + .await?? }; // Insert block 2. let ledger = core_ledger.clone(); @@ -1472,7 +1478,11 @@ mod tests { subdag_map_3.insert(leader_round_3 - 1, previous_cert_map_3.clone()); let subdag_3 = Subdag::from(subdag_map_3.clone())?; let ledger = core_ledger.clone(); - spawn_blocking!(ledger.prepare_advance_to_next_quorum_block(subdag_3, Default::default()))? + + tokio::task::spawn_blocking(move || { + ledger.prepare_advance_to_next_quorum_block(subdag_3, Default::default()) + }) + .await?? }; // Insert block 3. let ledger = core_ledger.clone(); diff --git a/node/bft/src/worker.rs b/node/bft/src/worker.rs index 3427acb89d..f43acce94b 100644 --- a/node/bft/src/worker.rs +++ b/node/bft/src/worker.rs @@ -655,7 +655,7 @@ mod tests { &self, subdag: Subdag, transmissions: IndexMap, Transmission>, - ) -> Result>; + ) -> Result, CheckBlockError>; fn advance_to_next_block(&self, block: &Block) -> Result<()>; fn transaction_spend_in_microcredits(&self, transaction: &Transaction, consensus_version: ConsensusVersion) -> Result; }