From 70b078ca1d15e263d726b46b24ebcbfbb0c34a98 Mon Sep 17 00:00:00 2001 From: Meshiest Date: Tue, 8 Jul 2025 10:47:59 -0400 Subject: [PATCH 01/10] chore(aot): upgrade for snarkOS v4.0.0 --- Cargo.lock | 1185 ++++++++++++++----------------- Cargo.toml | 21 +- crates/aot/src/auth/execute.rs | 36 +- crates/aot/src/cli.rs | 8 +- crates/aot/src/genesis.rs | 49 +- crates/aot/src/ledger/util.rs | 4 +- crates/checkpoint/src/ledger.rs | 14 +- 7 files changed, 612 insertions(+), 705 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 13c3614d..0157cdcf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -259,7 +259,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.4.5", "axum-macros", "base64 0.22.1", "bytes", @@ -270,7 +270,7 @@ dependencies = [ "hyper 1.6.0", "hyper-util", "itoa", - "matchit", + "matchit 0.7.3", "memchr", "mime", "percent-encoding", @@ -281,10 +281,43 @@ dependencies = [ "serde_path_to_error", "serde_urlencoded", "sha1", - "sync_wrapper 1.0.2", + "sync_wrapper", "tokio", "tokio-tungstenite", - "tower 0.5.2", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "021e862c184ae977658b36c4500f7feac3221ca5da43e3f25bd04ab6c79a29b5" +dependencies = [ + "axum-core 0.5.2", + "bytes", + "form_urlencoded", + "futures-util", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "hyper 1.6.0", + "hyper-util", + "itoa", + "matchit 0.8.4", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tower", "tower-layer", "tower-service", "tracing", @@ -305,7 +338,26 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper 1.0.2", + "sync_wrapper", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6" +dependencies = [ + "bytes", + "futures-core", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper", "tower-layer", "tower-service", "tracing", @@ -313,25 +365,24 @@ dependencies = [ [[package]] name = "axum-extra" -version = "0.9.6" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c794b30c904f0a1c2fb7740f7df7f7972dfaa14ef6f57cb6178dc63e5dca2f04" +checksum = "45bf463831f5131b7d3c756525b305d40f1185b688565648a92e1392ca35713d" dependencies = [ - "axum", - "axum-core", + "axum 0.8.4", + "axum-core 0.5.2", "bytes", - "fastrand", "futures-util", "headers", "http 1.3.1", "http-body 1.0.1", "http-body-util", "mime", - "multer", "pin-project-lite", + "rustversion", "serde", "serde_json", - "tower 0.5.2", + "tower", "tower-layer", "tower-service", "typed-json", @@ -421,7 +472,7 @@ dependencies = [ "proc-macro2", "quote 1.0.40", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", "syn 2.0.100", ] @@ -443,7 +494,7 @@ dependencies = [ "proc-macro2", "quote 1.0.40", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", "syn 2.0.100", "which", @@ -720,23 +771,39 @@ dependencies = [ ] [[package]] -name = "console" -version = "0.15.11" +name = "constant_time_eq" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" + +[[package]] +name = "cookie" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8" +checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" dependencies = [ - "encode_unicode", - "libc", - "once_cell", - "unicode-width 0.2.0", - "windows-sys 0.59.0", + "percent-encoding", + "time", + "version_check", ] [[package]] -name = "constant_time_eq" -version = "0.3.1" +name = "cookie_store" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" +checksum = "2eac901828f88a5241ee0600950ab981148a18f2f756900ffba1b125ca6a3ef9" +dependencies = [ + "cookie", + "document-features", + "idna", + "indexmap 2.8.0", + "log", + "serde", + "serde_derive", + "serde_json", + "time", + "url", +] [[package]] name = "core-foundation" @@ -874,16 +941,38 @@ dependencies = [ ] [[package]] -name = "dashmap" -version = "5.5.3" +name = "darling" +version = "0.20.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" dependencies = [ - "cfg-if", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core 0.9.10", + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote 1.0.40", + "strsim", + "syn 2.0.100", +] + +[[package]] +name = "darling_macro" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" +dependencies = [ + "darling_core", + "quote 1.0.40", + "syn 2.0.100", ] [[package]] @@ -960,10 +1049,13 @@ dependencies = [ ] [[package]] -name = "dotenvy" -version = "0.15.7" +name = "document-features" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" +checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d" +dependencies = [ + "litrs", +] [[package]] name = "dunce" @@ -972,16 +1064,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] -name = "either" -version = "1.15.0" +name = "dyn-clone" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005" [[package]] -name = "encode_unicode" -version = "1.0.0" +name = "either" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "encoding_rs" @@ -1080,16 +1172,6 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" -[[package]] -name = "flate2" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - [[package]] name = "fnv" version = "1.0.7" @@ -1273,7 +1355,7 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" dependencies = [ - "unicode-width 0.1.14", + "unicode-width", ] [[package]] @@ -1296,9 +1378,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0" dependencies = [ "cfg-if", + "js-sys", "libc", "r-efi", "wasi 0.14.2+wasi-0.2.4", + "wasm-bindgen", ] [[package]] @@ -1315,41 +1399,25 @@ checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" [[package]] name = "governor" -version = "0.6.3" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" +checksum = "be93b4ec2e4710b04d9264c0c7350cdd62a8c20e5e4ac732552ebb8f0debe8eb" dependencies = [ "cfg-if", - "dashmap 5.5.3", - "futures", + "dashmap", + "futures-sink", "futures-timer", + "futures-util", + "getrandom 0.3.2", "no-std-compat", "nonzero_ext", "parking_lot 0.12.3", "portable-atomic", "quanta", - "rand 0.8.5", + "rand 0.9.0", "smallvec", "spinning_top", -] - -[[package]] -name = "h2" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.12", - "indexmap 2.8.0", - "slab", - "tokio", - "tokio-util", - "tracing", + "web-time", ] [[package]] @@ -1548,7 +1616,6 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "httparse", @@ -1571,7 +1638,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.8", + "h2", "http 1.3.1", "http-body 1.0.1", "httparse", @@ -1583,20 +1650,6 @@ dependencies = [ "want", ] -[[package]] -name = "hyper-rustls" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" -dependencies = [ - "futures-util", - "http 0.2.12", - "hyper 0.14.32", - "rustls 0.21.12", - "tokio", - "tokio-rustls 0.24.1", -] - [[package]] name = "hyper-rustls" version = "0.27.5" @@ -1607,11 +1660,12 @@ dependencies = [ "http 1.3.1", "hyper 1.6.0", "hyper-util", - "rustls 0.23.25", + "rustls", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.2", + "tokio-rustls", "tower-service", + "webpki-roots", ] [[package]] @@ -1805,6 +1859,12 @@ dependencies = [ "syn 2.0.100", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "1.0.3" @@ -1834,6 +1894,7 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", + "serde", ] [[package]] @@ -1848,19 +1909,6 @@ dependencies = [ "serde", ] -[[package]] -name = "indicatif" -version = "0.17.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235" -dependencies = [ - "console", - "number_prefix", - "portable-atomic", - "unicode-width 0.2.0", - "web-time", -] - [[package]] name = "instant" version = "0.1.13" @@ -1971,7 +2019,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e14eda50a3494b3bf7b9ce51c52434a761e383d7238ce1dd5dcec2fbc13e9fb" dependencies = [ - "dashmap 6.1.0", + "dashmap", "hashbrown 0.14.5", ] @@ -2081,6 +2129,12 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856" +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + [[package]] name = "local-ip-address" version = "0.6.3" @@ -2182,6 +2236,12 @@ dependencies = [ "hashbrown 0.15.2", ] +[[package]] +name = "lru-slab" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" + [[package]] name = "lz4-sys" version = "1.11.1+lz4-1.10.0" @@ -2207,6 +2267,12 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +[[package]] +name = "matchit" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" + [[package]] name = "memchr" version = "2.7.4" @@ -2299,23 +2365,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "multer" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83e87776546dc87511aa5ee218730c92b666d7264ab6ed41f9d215af9cd5224b" -dependencies = [ - "bytes", - "encoding_rs", - "futures-util", - "http 1.3.1", - "httparse", - "memchr", - "mime", - "spin", - "version_check", -] - [[package]] name = "native-tls" version = "0.2.14" @@ -2482,12 +2531,6 @@ dependencies = [ "libc", ] -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - [[package]] name = "object" version = "0.36.7" @@ -2771,7 +2814,7 @@ checksum = "0fcebfa99f03ae51220778316b37d24981e36322c82c24848f48c5bd0f64cbdb" dependencies = [ "enum-as-inner", "mime", - "reqwest 0.12.15", + "reqwest", "serde", "time", "url", @@ -2839,12 +2882,58 @@ dependencies = [ ] [[package]] -name = "quick-xml" -version = "0.23.1" +name = "quinn" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" +checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8" dependencies = [ - "memchr", + "bytes", + "cfg_aliases", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 2.1.1", + "rustls", + "socket2", + "thiserror 2.0.12", + "tokio", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-proto" +version = "0.11.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e" +dependencies = [ + "bytes", + "getrandom 0.3.2", + "lru-slab", + "rand 0.9.0", + "ring", + "rustc-hash 2.1.1", + "rustls", + "rustls-pki-types", + "slab", + "thiserror 2.0.12", + "tinyvec", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-udp" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcebb1209ee276352ef14ff8732e24cc2b02bbac986cd74a4c81bcb2f9881970" +dependencies = [ + "cfg_aliases", + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.52.0", ] [[package]] @@ -2995,6 +3084,26 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "ref-cast" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a0ae411dbe946a674d89546582cea4ba2bb8defac896622d6496f14c23ba5cf" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7" +dependencies = [ + "proc-macro2", + "quote 1.0.40", + "syn 2.0.100", +] + [[package]] name = "regex" version = "1.11.1" @@ -3041,21 +3150,24 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.11.27" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "bytes", "encoding_rs", + "futures-channel", "futures-core", "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.32", - "hyper-rustls 0.24.2", - "hyper-tls 0.5.0", + "h2", + "http 1.3.1", + "http-body 1.0.1", + "http-body-util", + "hyper 1.6.0", + "hyper-rustls", + "hyper-tls 0.6.0", + "hyper-util", "ipnet", "js-sys", "log", @@ -3064,67 +3176,27 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", + "quinn", + "rustls", + "rustls-pemfile", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 0.1.2", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls 0.24.1", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots 0.25.4", - "winreg", -] - -[[package]] -name = "reqwest" -version = "0.12.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb" -dependencies = [ - "base64 0.22.1", - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.4.8", - "http 1.3.1", - "http-body 1.0.1", - "http-body-util", - "hyper 1.6.0", - "hyper-rustls 0.27.5", - "hyper-tls 0.6.0", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls-pemfile 2.2.0", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 1.0.2", - "tokio", - "tokio-native-tls", - "tokio-util", - "tower 0.5.2", + "tokio-rustls", + "tokio-util", + "tower", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "wasm-streams", "web-sys", + "webpki-roots", "windows-registry", ] @@ -3170,6 +3242,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" + [[package]] name = "rustc_version" version = "0.4.1" @@ -3205,18 +3283,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "rustls" -version = "0.21.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" -dependencies = [ - "log", - "ring", - "rustls-webpki 0.101.7", - "sct", -] - [[package]] name = "rustls" version = "0.23.25" @@ -3228,7 +3294,7 @@ dependencies = [ "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.103.1", + "rustls-webpki", "subtle", "zeroize", ] @@ -3245,15 +3311,6 @@ dependencies = [ "security-framework 3.2.0", ] -[[package]] -name = "rustls-pemfile" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" -dependencies = [ - "base64 0.21.7", -] - [[package]] name = "rustls-pemfile" version = "2.2.0" @@ -3268,15 +3325,8 @@ name = "rustls-pki-types" version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" - -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring", - "untrusted", + "web-time", ] [[package]] @@ -3322,21 +3372,35 @@ dependencies = [ ] [[package]] -name = "scopeguard" -version = "1.2.0" +name = "schemars" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] [[package]] -name = "sct" -version = "0.7.1" +name = "schemars" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0" dependencies = [ - "ring", - "untrusted", + "dyn-clone", + "ref-cast", + "serde", + "serde_json", ] +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + [[package]] name = "security-framework" version = "2.11.1" @@ -3373,36 +3437,6 @@ dependencies = [ "libc", ] -[[package]] -name = "self-replace" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03ec815b5eab420ab893f63393878d89c90fdd94c0bcc44c07abb8ad95552fb7" -dependencies = [ - "fastrand", - "tempfile", - "windows-sys 0.52.0", -] - -[[package]] -name = "self_update" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b3c585a1ced6b97ac13bd5e56f66559e5a75f477da5913f70df98e114518446" -dependencies = [ - "hyper 0.14.32", - "indicatif", - "log", - "quick-xml", - "regex", - "reqwest 0.11.27", - "self-replace", - "semver", - "serde_json", - "tempfile", - "urlencoding", -] - [[package]] name = "semver" version = "1.0.26" @@ -3467,6 +3501,38 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_with" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2c45cd61fefa9db6f254525d46e392b852e0e61d9a1fd36e5bd183450a556d5" +dependencies = [ + "base64 0.22.1", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.8.0", + "schemars 0.9.0", + "schemars 1.0.4", + "serde", + "serde_derive", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f" +dependencies = [ + "darling", + "proc-macro2", + "quote 1.0.40", + "syn 2.0.100", +] + [[package]] name = "serde_yml" version = "0.0.12" @@ -3603,12 +3669,10 @@ checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "snarkos-account" -version = "3.6.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=c7390bd#c7390bd1450b06fa0223dfe1f46a31da356a824a" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" dependencies = [ - "anyhow", "colored", - "rand 0.8.5", "snarkvm", ] @@ -3618,7 +3682,7 @@ version = "0.1.1" dependencies = [ "aleo-std", "anyhow", - "axum", + "axum 0.7.9", "bech32", "bincode", "clap", @@ -3634,7 +3698,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rayon", - "reqwest 0.12.15", + "reqwest", "rocksdb", "serde", "serde_json", @@ -3657,27 +3721,24 @@ dependencies = [ [[package]] name = "snarkos-node" -version = "3.6.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=c7390bd#c7390bd1450b06fa0223dfe1f46a31da356a824a" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" dependencies = [ "aleo-std", "anyhow", "async-trait", "colored", "futures-util", - "indexmap 2.8.0", "lru", "num_cpus", "once_cell", "parking_lot 0.12.3", "rand 0.8.5", - "rayon", "serde_json", "snarkos-account", "snarkos-node-bft", "snarkos-node-cdn", "snarkos-node-consensus", - "snarkos-node-metrics", "snarkos-node-rest", "snarkos-node-router", "snarkos-node-sync", @@ -3691,8 +3752,8 @@ dependencies = [ [[package]] name = "snarkos-node-bft" -version = "3.6.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=c7390bd#c7390bd1450b06fa0223dfe1f46a31da356a824a" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" dependencies = [ "aleo-std", "anyhow", @@ -3706,7 +3767,6 @@ dependencies = [ "parking_lot 0.12.3", "rand 0.8.5", "rayon", - "serde", "sha2", "snarkos-account", "snarkos-node-bft-events", @@ -3725,15 +3785,13 @@ dependencies = [ [[package]] name = "snarkos-node-bft-events" -version = "3.6.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=c7390bd#c7390bd1450b06fa0223dfe1f46a31da356a824a" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" dependencies = [ "anyhow", "bytes", "indexmap 2.8.0", - "rayon", "serde", - "snarkos-node-metrics", "snarkos-node-sync-locators", "snarkvm", "tokio-util", @@ -3742,8 +3800,8 @@ dependencies = [ [[package]] name = "snarkos-node-bft-ledger-service" -version = "3.6.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=c7390bd#c7390bd1450b06fa0223dfe1f46a31da356a824a" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" dependencies = [ "anyhow", "async-trait", @@ -3759,8 +3817,8 @@ dependencies = [ [[package]] name = "snarkos-node-bft-storage-service" -version = "3.6.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=c7390bd#c7390bd1450b06fa0223dfe1f46a31da356a824a" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" dependencies = [ "aleo-std", "anyhow", @@ -3773,16 +3831,15 @@ dependencies = [ [[package]] name = "snarkos-node-cdn" -version = "3.6.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=c7390bd#c7390bd1450b06fa0223dfe1f46a31da356a824a" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" dependencies = [ "anyhow", "bincode", "colored", - "futures", "parking_lot 0.12.3", "rayon", - "reqwest 0.11.27", + "reqwest", "serde", "serde_json", "snarkvm", @@ -3792,8 +3849,8 @@ dependencies = [ [[package]] name = "snarkos-node-consensus" -version = "3.6.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=c7390bd#c7390bd1450b06fa0223dfe1f46a31da356a824a" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" dependencies = [ "aleo-std", "anyhow", @@ -3801,7 +3858,6 @@ dependencies = [ "indexmap 2.8.0", "lru", "parking_lot 0.12.3", - "rand 0.8.5", "snarkos-account", "snarkos-node-bft", "snarkos-node-bft-ledger-service", @@ -3815,24 +3871,23 @@ dependencies = [ [[package]] name = "snarkos-node-metrics" -version = "3.6.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=c7390bd#c7390bd1450b06fa0223dfe1f46a31da356a824a" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" dependencies = [ "metrics-exporter-prometheus", "parking_lot 0.12.3", "rayon", "snarkvm", "time", - "tokio", ] [[package]] name = "snarkos-node-rest" -version = "3.6.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=c7390bd#c7390bd1450b06fa0223dfe1f46a31da356a824a" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" dependencies = [ "anyhow", - "axum", + "axum 0.8.4", "axum-extra", "http 1.3.1", "indexmap 2.8.0", @@ -3843,35 +3898,31 @@ dependencies = [ "rayon", "serde", "serde_json", + "serde_with", + "snarkos-node-cdn", "snarkos-node-consensus", "snarkos-node-router", "snarkvm", "time", "tokio", - "tower 0.4.13", - "tower-http 0.5.2", + "tower-http", "tower_governor", "tracing", ] [[package]] name = "snarkos-node-router" -version = "3.6.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=c7390bd#c7390bd1450b06fa0223dfe1f46a31da356a824a" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" dependencies = [ "anyhow", "async-trait", - "bincode", - "bytes", "colored", "futures", - "indexmap 2.8.0", "linked-hash-map", "parking_lot 0.12.3", "rand 0.8.5", "rayon", - "reqwest 0.11.27", - "serde", "snarkos-account", "snarkos-node-bft-ledger-service", "snarkos-node-metrics", @@ -3888,39 +3939,33 @@ dependencies = [ [[package]] name = "snarkos-node-router-messages" -version = "3.6.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=c7390bd#c7390bd1450b06fa0223dfe1f46a31da356a824a" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" dependencies = [ - "anyhow", "bytes", - "indexmap 2.8.0", - "rayon", "serde", "snarkos-node-bft-events", "snarkos-node-sync-locators", "snarkvm", - "tokio", "tokio-util", "tracing", ] [[package]] name = "snarkos-node-sync" -version = "3.6.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=c7390bd#c7390bd1450b06fa0223dfe1f46a31da356a824a" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" dependencies = [ "anyhow", + "futures", "indexmap 2.8.0", - "itertools 0.12.1", - "once_cell", + "itertools 0.14.0", "parking_lot 0.12.3", "rand 0.8.5", - "serde", "snarkos-node-bft-ledger-service", "snarkos-node-router", "snarkos-node-sync-communication-service", "snarkos-node-sync-locators", - "snarkos-node-tcp", "snarkvm", "tokio", "tracing", @@ -3928,8 +3973,8 @@ dependencies = [ [[package]] name = "snarkos-node-sync-communication-service" -version = "3.6.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=c7390bd#c7390bd1450b06fa0223dfe1f46a31da356a824a" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" dependencies = [ "async-trait", "tokio", @@ -3937,8 +3982,8 @@ dependencies = [ [[package]] name = "snarkos-node-sync-locators" -version = "3.6.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=c7390bd#c7390bd1450b06fa0223dfe1f46a31da356a824a" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" dependencies = [ "anyhow", "indexmap 2.8.0", @@ -3949,8 +3994,8 @@ dependencies = [ [[package]] name = "snarkos-node-tcp" -version = "3.6.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=c7390bd#c7390bd1450b06fa0223dfe1f46a31da356a824a" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" dependencies = [ "async-trait", "bytes", @@ -3958,6 +4003,7 @@ dependencies = [ "once_cell", "parking_lot 0.12.3", "snarkos-node-metrics", + "thiserror 2.0.12", "tokio", "tokio-util", "tracing", @@ -3965,53 +4011,39 @@ dependencies = [ [[package]] name = "snarkvm" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "anstyle", "anyhow", - "clap", - "colored", - "dotenvy", - "indexmap 2.8.0", "num-format", - "once_cell", - "parking_lot 0.12.3", "rand 0.8.5", - "rayon", - "self_update", - "serde_json", "snarkvm-algorithms", "snarkvm-circuit", "snarkvm-console", "snarkvm-ledger", "snarkvm-metrics", - "snarkvm-parameters", "snarkvm-synthesizer", "snarkvm-utilities", - "thiserror 2.0.12", - "ureq", "walkdir", ] [[package]] name = "snarkvm-algorithms" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "aleo-std", "anyhow", "blake2", "cfg-if", "fxhash", - "hashbrown 0.14.5", + "hashbrown 0.15.2", "hex", "indexmap 2.8.0", "itertools 0.11.0", "num-traits", - "parking_lot 0.12.3", "rand 0.8.5", - "rand_chacha 0.3.1", "rand_core 0.6.4", "rayon", "serde", @@ -4027,8 +4059,8 @@ dependencies = [ [[package]] name = "snarkvm-algorithms-cuda" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "blst", "cc", @@ -4038,8 +4070,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -4052,10 +4084,9 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ - "snarkvm-circuit-algorithms", "snarkvm-circuit-network", "snarkvm-circuit-types", "snarkvm-console-account", @@ -4063,8 +4094,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -4073,8 +4104,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -4083,8 +4114,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "indexmap 2.8.0", "itertools 0.11.0", @@ -4102,13 +4133,13 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" [[package]] name = "snarkvm-circuit-network" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -4118,10 +4149,9 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ - "paste", "snarkvm-circuit-account", "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -4133,8 +4163,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -4148,8 +4178,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4161,8 +4191,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -4170,8 +4200,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4180,8 +4210,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4192,8 +4222,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4204,8 +4234,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4215,8 +4245,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4227,8 +4257,8 @@ dependencies = [ [[package]] name = "snarkvm-console" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -4240,8 +4270,8 @@ dependencies = [ [[package]] name = "snarkvm-console-account" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "bs58", "snarkvm-console-network", @@ -4251,8 +4281,8 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "blake2s_simd", "smallvec", @@ -4264,8 +4294,8 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "aleo-std", "rayon", @@ -4275,12 +4305,11 @@ dependencies = [ [[package]] name = "snarkvm-console-network" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "anyhow", "indexmap 2.8.0", - "itertools 0.11.0", "lazy_static", "once_cell", "paste", @@ -4291,15 +4320,13 @@ dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types", "snarkvm-curves", - "snarkvm-fields", "snarkvm-parameters", - "snarkvm-utilities", ] [[package]] name = "snarkvm-console-network-environment" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "anyhow", "bech32", @@ -4316,8 +4343,8 @@ dependencies = [ [[package]] name = "snarkvm-console-program" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "enum-iterator", "enum_index", @@ -4326,7 +4353,6 @@ dependencies = [ "num-derive", "num-traits", "once_cell", - "paste", "serde_json", "snarkvm-console-account", "snarkvm-console-algorithms", @@ -4338,8 +4364,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -4353,8 +4379,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4364,16 +4390,16 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "snarkvm-console-network-environment", ] [[package]] name = "snarkvm-console-types-field" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4382,8 +4408,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4393,8 +4419,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4404,8 +4430,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4415,8 +4441,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4426,8 +4452,8 @@ dependencies = [ [[package]] name = "snarkvm-curves" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "rand 0.8.5", "rayon", @@ -4440,8 +4466,8 @@ dependencies = [ [[package]] name = "snarkvm-fields" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "aleo-std", "anyhow", @@ -4457,8 +4483,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "aleo-std", "anyhow", @@ -4482,8 +4508,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "anyhow", "rand 0.8.5", @@ -4494,8 +4520,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4514,8 +4540,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4527,8 +4553,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -4540,8 +4566,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4553,8 +4579,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4565,8 +4591,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "bytes", "serde_json", @@ -4576,8 +4602,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4591,8 +4617,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "bytes", "serde_json", @@ -4604,8 +4630,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "snarkvm-console", "snarkvm-ledger-puzzle", @@ -4613,15 +4639,14 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "aleo-std", "anyhow", "bincode", "indexmap 2.8.0", "lru", - "once_cell", "parking_lot 0.12.3", "rand 0.8.5", "rand_chacha 0.3.1", @@ -4633,8 +4658,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle-epoch" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "aleo-std", "anyhow", @@ -4650,15 +4675,17 @@ dependencies = [ "snarkvm-ledger-puzzle", "snarkvm-synthesizer-process", "snarkvm-synthesizer-program", + "snarkvm-utilities", ] [[package]] name = "snarkvm-ledger-query" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "async-trait", - "reqwest 0.11.27", + "http 1.3.1", + "reqwest", "snarkvm-console", "snarkvm-ledger-store", "snarkvm-synthesizer-program", @@ -4667,8 +4694,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "aleo-std-storage", "anyhow", @@ -4694,27 +4721,23 @@ dependencies = [ [[package]] name = "snarkvm-metrics" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "metrics", - "metrics-exporter-prometheus", ] [[package]] name = "snarkvm-parameters" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "aleo-std", "anyhow", - "bincode", "cfg-if", "colored", "curl", "hex", - "indexmap 2.8.0", - "itertools 0.11.0", "lazy_static", "parking_lot 0.12.3", "paste", @@ -4728,8 +4751,8 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "aleo-std", "anyhow", @@ -4759,8 +4782,8 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "aleo-std", "colored", @@ -4784,23 +4807,25 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "indexmap 2.8.0", "paste", "rand 0.8.5", "rand_chacha 0.3.1", + "rayon", "serde_json", "snarkvm-circuit", "snarkvm-console", "snarkvm-synthesizer-snark", + "snarkvm-utilities", ] [[package]] name = "snarkvm-synthesizer-snark" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "bincode", "once_cell", @@ -4812,8 +4837,8 @@ dependencies = [ [[package]] name = "snarkvm-utilities" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "aleo-std", "anyhow", @@ -4833,8 +4858,8 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" -version = "1.6.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=629cccc#629cccc116194fe1c02566f2cad54de6a5647f1d" +version = "3.8.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" dependencies = [ "proc-macro2", "quote 1.0.40", @@ -4845,11 +4870,11 @@ dependencies = [ name = "snops" version = "0.2.0" dependencies = [ - "axum", + "axum 0.7.9", "bimap", "chrono", "clap", - "dashmap 6.1.0", + "dashmap", "fixedbitset", "futures-util", "hmac", @@ -4863,7 +4888,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rayon", - "reqwest 0.12.15", + "reqwest", "semver", "serde", "serde_json", @@ -4876,8 +4901,8 @@ dependencies = [ "tarpc", "thiserror 2.0.12", "tokio", - "tower 0.5.2", - "tower-http 0.6.2", + "tower", + "tower-http", "tracing", "tracing-appender", "tracing-subscriber", @@ -4890,10 +4915,10 @@ name = "snops-agent" version = "0.2.0" dependencies = [ "anyhow", - "axum", + "axum 0.7.9", "chrono", "clap", - "dashmap 6.1.0", + "dashmap", "futures", "futures-util", "http 1.3.1", @@ -4901,8 +4926,8 @@ dependencies = [ "indexmap 2.8.0", "local-ip-address", "nix", - "reqwest 0.12.15", - "rustls 0.23.25", + "reqwest", + "rustls", "serde_json", "sha2", "simple_moving_average", @@ -4945,8 +4970,8 @@ dependencies = [ "clap_complete", "futures-util", "http 1.3.1", - "reqwest 0.12.15", - "rustls 0.23.25", + "reqwest", + "rustls", "serde", "serde_json", "snops-common", @@ -5009,12 +5034,6 @@ dependencies = [ "vob", ] -[[package]] -name = "spin" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" - [[package]] name = "spinning_top" version = "0.3.0" @@ -5104,12 +5123,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - [[package]] name = "sync_wrapper" version = "1.0.2" @@ -5141,20 +5154,20 @@ dependencies = [ [[package]] name = "system-configuration" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.9.0", "core-foundation 0.9.4", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" dependencies = [ "core-foundation-sys", "libc", @@ -5392,23 +5405,13 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls 0.21.12", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b" dependencies = [ - "rustls 0.23.25", + "rustls", "tokio", ] @@ -5431,13 +5434,13 @@ checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" dependencies = [ "futures-util", "log", - "rustls 0.23.25", + "rustls", "rustls-native-certs", "rustls-pki-types", "tokio", - "tokio-rustls 0.26.2", + "tokio-rustls", "tungstenite", - "webpki-roots 0.26.8", + "webpki-roots", ] [[package]] @@ -5454,17 +5457,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tower" version = "0.5.2" @@ -5474,30 +5466,13 @@ dependencies = [ "futures-core", "futures-util", "pin-project-lite", - "sync_wrapper 1.0.2", + "sync_wrapper", "tokio", "tower-layer", "tower-service", "tracing", ] -[[package]] -name = "tower-http" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" -dependencies = [ - "bitflags 2.9.0", - "bytes", - "http 1.3.1", - "http-body 1.0.1", - "http-body-util", - "pin-project-lite", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tower-http" version = "0.6.2" @@ -5537,17 +5512,17 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tower_governor" -version = "0.3.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3790eac6ad3fb8d9d96c2b040ae06e2517aa24b067545d1078b96ae72f7bb9a7" +checksum = "84e6672c7510df74859726427edea641674dad1aeeb30057b87335b1ba23b843" dependencies = [ - "axum", + "axum 0.8.4", "forwarded-header-value", "governor", "http 1.3.1", "pin-project", - "thiserror 1.0.69", - "tower 0.4.13", + "thiserror 2.0.12", + "tower", "tracing", ] @@ -5625,7 +5600,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3beec919fbdf99d719de8eda6adae3281f8a5b71ae40431f44dc7423053d34" dependencies = [ "loki-api", - "reqwest 0.12.15", + "reqwest", "serde", "serde_json", "snap", @@ -5699,7 +5674,7 @@ dependencies = [ "httparse", "log", "rand 0.8.5", - "rustls 0.23.25", + "rustls", "rustls-pki-types", "sha1", "thiserror 1.0.69", @@ -5740,12 +5715,6 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" -[[package]] -name = "unicode-width" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" - [[package]] name = "unicode-xid" version = "0.0.4" @@ -5760,20 +5729,30 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.12.1" +version = "3.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d" +checksum = "9f0fde9bc91026e381155f8c67cb354bcd35260b2f4a29bcc84639f762760c39" dependencies = [ "base64 0.22.1", - "flate2", + "cookie_store", "log", - "once_cell", - "rustls 0.23.25", - "rustls-pki-types", + "percent-encoding", "serde", "serde_json", - "url", - "webpki-roots 0.26.8", + "ureq-proto", + "utf-8", +] + +[[package]] +name = "ureq-proto" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59db78ad1923f2b1be62b6da81fe80b173605ca0d57f85da2e005382adf693f7" +dependencies = [ + "base64 0.22.1", + "http 1.3.1", + "httparse", + "log", ] [[package]] @@ -6005,12 +5984,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki-roots" -version = "0.25.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" - [[package]] name = "webpki-roots" version = "0.26.8" @@ -6148,15 +6121,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows-sys" version = "0.52.0" @@ -6175,21 +6139,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - [[package]] name = "windows-targets" version = "0.52.6" @@ -6222,12 +6171,6 @@ dependencies = [ "windows_x86_64_msvc 0.53.0", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" @@ -6240,12 +6183,6 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764" -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" @@ -6258,12 +6195,6 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c" -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -6288,12 +6219,6 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11" -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - [[package]] name = "windows_i686_msvc" version = "0.52.6" @@ -6306,12 +6231,6 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d" -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" @@ -6324,12 +6243,6 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" @@ -6342,12 +6255,6 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57" -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -6360,16 +6267,6 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "wit-bindgen-rt" version = "0.39.0" diff --git a/Cargo.toml b/Cargo.toml index 53dc891a..11790471 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,7 +43,12 @@ opt-level = 1 [workspace.dependencies] aleo-std = "1.0.1" -axum = { version = "0.7", default-features = false } +axum = { version = "0.7", features = [ + "json", + "query", + "tokio", + "http1", +], default-features = false } # uncomment to enable #[debug_handler] for axum :^) # axum = { version = "0.7", features = ["macros"], default-features = false } anyhow = { version = "1", features = ["backtrace"] } @@ -144,16 +149,18 @@ snops-common = { path = "./crates/common" } ## Comment to use version-pinned or local dependencies -snarkos-account = { git = "https://github.com/ProvableHQ/snarkOS", rev = "c7390bd" } -snarkos-node = { git = "https://github.com/ProvableHQ/snarkOS", rev = "c7390bd" } -snarkos-node-metrics = { git = "https://github.com/ProvableHQ/snarkOS", rev = "c7390bd" } +snarkos-account = { git = "https://github.com/ProvableHQ/snarkOS", rev = "3385629" } +snarkos-node = { git = "https://github.com/ProvableHQ/snarkOS", rev = "3385629" } +snarkos-node-metrics = { git = "https://github.com/ProvableHQ/snarkOS", rev = "3385629" } [workspace.dependencies.snarkvm] ## The following anchors are used by the `update_snarkos_dep.sh` script. ## Everything in-between the anchors is copied from the snarkos Cargo.toml ## CODEGEN_START #path = "../snarkVM" git = "https://github.com/ProvableHQ/snarkVM.git" -rev = "629cccc" -version = "=1.6.0" +rev = "668b72b" +#version = "=3.8.0" +default-features = false +#features = [ "circuit", "console", "rocks" ] ## CODEGEN_END -features = ["rocks"] +features = ["circuit", "rocks", "algorithms"] diff --git a/crates/aot/src/auth/execute.rs b/crates/aot/src/auth/execute.rs index 713638fd..65886fcf 100644 --- a/crates/aot/src/auth/execute.rs +++ b/crates/aot/src/auth/execute.rs @@ -3,8 +3,11 @@ use anyhow::{Result, anyhow, bail}; use clap::{Args, ValueEnum}; use rand::{CryptoRng, Rng}; use snarkvm::ledger::{ - query::Query, - store::{ConsensusStore, helpers::memory::ConsensusMemory}, + query::{Query, QueryTrait}, + store::{ + ConsensusStore, + helpers::memory::{BlockMemory, ConsensusMemory}, + }, }; use tracing::error; @@ -68,16 +71,23 @@ pub fn execute_local( query_raw: Option, rng: &mut R, ) -> Result> { + let query = match query_raw.as_ref() { + Some(query) => { + let q = Query::>::from(query); + Some(Box::new(q) as Box>) + } + None => None, + }; + // Execute the transaction. if let Some(ledger) = ledger { - let query = query_raw.map(Query::REST); - match auth { - AuthBlob::Program { auth, fee_auth } => { - ledger - .vm() - .execute_authorization(auth.into(), fee_auth.map(Into::into), query, rng) - } + AuthBlob::Program { auth, fee_auth } => ledger.vm().execute_authorization( + auth.into(), + fee_auth.map(Into::into), + query.as_deref(), + rng, + ), AuthBlob::Deploy { deployment, owner, @@ -87,15 +97,13 @@ pub fn execute_local( fee_auth .map(Into::into) .ok_or(anyhow!("expected fee for deployment"))?, - query, + query.as_deref(), rng, )?; Ok(Transaction::from_deployment(owner, *deployment, fee)?) } } } else { - let query = query_raw.clone().map(Query::REST); - let store = ConsensusStore::>::open(StorageMode::Production)?; let vm = MemVM::from(store)?; @@ -113,7 +121,7 @@ pub fn execute_local( } } - vm.execute_authorization(auth, fee_auth, query, rng) + vm.execute_authorization(auth, fee_auth, query.as_deref(), rng) } AuthBlob::Deploy { deployment, @@ -124,7 +132,7 @@ pub fn execute_local( let fee = vm.execute_fee_authorization( fee_auth.ok_or(anyhow!("expected fee for deployment"))?, - query, + query.as_deref(), rng, )?; Ok(Transaction::from_deployment(owner, *deployment, fee)?) diff --git a/crates/aot/src/cli.rs b/crates/aot/src/cli.rs index ca664f16..7ee09e9d 100644 --- a/crates/aot/src/cli.rs +++ b/crates/aot/src/cli.rs @@ -27,7 +27,7 @@ pub struct Cli { #[arg(long)] pub log: Option, /// The verbosity level of the logs. - #[arg(long, default_value_t = 4)] + #[arg(long, default_value_t = 0)] pub verbosity: u8, #[cfg(feature = "node")] /// The optional loki url to send logs to. @@ -111,8 +111,12 @@ pub fn make_env_filter(verbosity: u8) -> EnvFilter { filter .add_directive("snarkos_node_bft=trace".parse().unwrap()) .add_directive("snarkos_node_bft::gateway=debug".parse().unwrap()) - } else { + } else if verbosity >= 1 { filter.add_directive("snarkos_node_bft=debug".parse().unwrap()) + } else { + filter + .add_directive("snarkos_node_bft=info".parse().unwrap()) + .add_directive("snarkos_node_bft::gateway=info".parse().unwrap()) }; let filter = if verbosity >= 4 { diff --git a/crates/aot/src/genesis.rs b/crates/aot/src/genesis.rs index 3e70c541..d2005c9b 100644 --- a/crates/aot/src/genesis.rs +++ b/crates/aot/src/genesis.rs @@ -19,8 +19,8 @@ use snarkvm::{ }; use crate::{ - Address, Block, CTRecord, Committee, DbLedger, MemVM, Network, NetworkId, PTRecord, PrivateKey, - Transaction, ViewKey, ledger::util::public_transaction, + Address, Block, Committee, DbLedger, MemVM, Network, NetworkId, PTRecord, PrivateKey, + Transaction, ledger::util::public_transaction, }; #[derive(Clone, Debug, PartialEq, Eq, Serialize)] @@ -68,11 +68,6 @@ pub struct Genesis { )] pub additional_accounts_balance: u64, - /// If --additional-accounts is passed you can additionally add an amount to - /// give them in a record. - #[clap(long)] - pub additional_accounts_record_balance: Option, - /// A place to write out the additionally generated accounts by /// --additional-accounts. #[clap(long)] @@ -294,7 +289,7 @@ impl Genesis { // Add additional accounts to the public balances type Accounts = IndexMap, (PrivateKey, u64, Option>)>; - let mut accounts: Accounts = (0..self.additional_accounts) + let accounts: Accounts = (0..self.additional_accounts) .map(|_| { // Repeatedly regenerate key/addresses, ensuring they are not in // `bonded_balances`. @@ -306,8 +301,7 @@ impl Genesis { } }; - let balance = self.additional_accounts_balance - + self.additional_accounts_record_balance.unwrap_or(0); + let balance = self.additional_accounts_balance; public_balances.insert(addr, balance); Ok((addr, (key, balance, None))) @@ -350,30 +344,17 @@ impl Genesis { )?)?; // region: Genesis Records - let mut txs = Vec::with_capacity(accounts.len()); - if let Some(record_balance) = self.additional_accounts_record_balance { - accounts = accounts - .into_iter() - .map(|(addr, (key, balance, _))| { - let record_tx: Transaction = - public_transaction::, N::Circuit>( - "transfer_public_to_private", - &vm, - addr, - record_balance, - key, - None, - )?; - // Cannot fail because transfer_public_to_private always emits a - // record. - let record_enc: CTRecord = record_tx.records().next().unwrap().1.clone(); - // Decrypt the record. - let record = record_enc.decrypt(&ViewKey::try_from(key)?)?; - - txs.push(record_tx); - Ok((addr, (key, balance, Some(record)))) - }) - .collect::>()?; + let mut txs = Vec::with_capacity(4); + for _ in 0..4 { + let record_tx: Transaction = public_transaction::, N::Circuit>( + "transfer_public", + &vm, + Address::try_from(&genesis_key)?, + 0, + genesis_key, + None, + )?; + txs.push(record_tx); } // endregion: Genesis Records diff --git a/crates/aot/src/ledger/util.rs b/crates/aot/src/ledger/util.rs index 927c058c..276b752e 100644 --- a/crates/aot/src/ledger/util.rs +++ b/crates/aot/src/ledger/util.rs @@ -43,7 +43,7 @@ pub fn prove_credits, A: Aleo>( // assemble the proof let (_, mut trace) = vm.process().read().execute::(auth, rng)?; - trace.prepare(Query::from(vm.block_store()).clone())?; + trace.prepare(&Query::from(vm.block_store()).clone())?; trace.prove_execution::(&format!("credits.aleo/{locator}"), VarunaVersion::V1, rng) } @@ -60,7 +60,7 @@ pub fn prove_fee, A: Aleo>( // assemble the proof let (_, mut trace) = vm.process().read().execute::(auth, rng)?; - trace.prepare(Query::from(vm.block_store()).clone())?; + trace.prepare(&Query::from(vm.block_store()).clone())?; trace.prove_fee::(VarunaVersion::V1, rng) } diff --git a/crates/checkpoint/src/ledger.rs b/crates/checkpoint/src/ledger.rs index f53cb66d..8a0ed348 100644 --- a/crates/checkpoint/src/ledger.rs +++ b/crates/checkpoint/src/ledger.rs @@ -213,7 +213,7 @@ impl Stores { None => bail!("Failed to get the program ID for transaction '{transaction_id}'"), }; // Retrieve the edition. - let edition = match db.get_edition(&program_id)? { + let edition = match db.get_edition_for_transaction(&transaction_id)? { Some(edition) => edition, None => bail!("Failed to locate the edition for program '{program_id}'"), }; @@ -227,8 +227,18 @@ impl Stores { // Remove the program ID. db.id_map().remove(transaction_id)?; + // Remove the edition. - db.edition_map().remove(&program_id)?; + db.id_edition_map().remove(transaction_id)?; + match edition == 0 { + // If the removed edition is 0, then remove the program ID from the latest edition map. + true => db.edition_map().remove(&program_id)?, + // Otherwise, decrement the edition. + // Note: This is safe because the VM enforces that the edition is always incremented. + false => db + .edition_map() + .insert(program_id, edition.saturating_sub(1))?, + } // Remove the reverse program ID. db.reverse_id_map().remove(&(program_id, edition))?; From 9f29551d9aa027441f9f9d5d3b03f9953cd71eef Mon Sep 17 00:00:00 2001 From: Meshiest Date: Tue, 8 Jul 2025 10:58:33 -0400 Subject: [PATCH 02/10] fix(aot): fix genesis generator not making private records --- crates/aot/src/genesis.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/aot/src/genesis.rs b/crates/aot/src/genesis.rs index d2005c9b..d71e6301 100644 --- a/crates/aot/src/genesis.rs +++ b/crates/aot/src/genesis.rs @@ -347,7 +347,7 @@ impl Genesis { let mut txs = Vec::with_capacity(4); for _ in 0..4 { let record_tx: Transaction = public_transaction::, N::Circuit>( - "transfer_public", + "transfer_public_to_private", &vm, Address::try_from(&genesis_key)?, 0, From ca131c536b09a7f9e164c67ff776e19ba35eca9d Mon Sep 17 00:00:00 2001 From: Meshiest Date: Tue, 8 Jul 2025 11:05:47 -0400 Subject: [PATCH 03/10] fix(scripts): fix deps script copying extra dependencies from snarkos --- scripts/dep_utils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/dep_utils.sh b/scripts/dep_utils.sh index f9a97934..3fc40b27 100755 --- a/scripts/dep_utils.sh +++ b/scripts/dep_utils.sh @@ -39,6 +39,6 @@ function get_snarkos_rev() { # Read the lines '[workspace.dependencies.snarkvm]' to ^features greedily # Excluding the first line '[workspace.dependencies.snarkvm]' and the last line '^features' - SNARKVM_CARGO_DATA="$(echo "$SNARKOS_CARGO_TOML_DATA" | sed -nE '/\[workspace\.dependencies\.snarkvm\]/,/^features/ { /^features/!p }' | sed '1d')" + SNARKVM_CARGO_DATA="$(echo "$SNARKOS_CARGO_TOML_DATA" | sed -nE '/\[workspace\.dependencies\.snarkvm\]/,/^\x23?features/ { /^features/!p }' | sed '1d')" } From 1ca4cb7b18961c263982a8233ffc533a6e98c0f9 Mon Sep 17 00:00:00 2001 From: Meshiest Date: Fri, 25 Jul 2025 13:58:11 -0400 Subject: [PATCH 04/10] deps: update snarkos/snarkvm to canary-4.1.0, fixes for breaking changes --- Cargo.lock | 348 +++++++++++++++++--------------- Cargo.toml | 8 +- crates/aot/src/auth/auth_fee.rs | 4 +- crates/aot/src/auth/auth_id.rs | 4 +- crates/aot/src/auth/mod.rs | 11 +- crates/aot/src/program/cost.rs | 2 +- crates/aot/src/runner/mod.rs | 17 +- crates/checkpoint/src/aleo.rs | 2 +- crates/checkpoint/src/ledger.rs | 26 +-- 9 files changed, 229 insertions(+), 193 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0157cdcf..1af7c5d6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -562,6 +562,15 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "built" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4ad8f11f288f48ca24471bbd51ac257aaeaaa07adae295591266b792902ae64" +dependencies = [ + "git2", +] + [[package]] name = "bumpalo" version = "3.17.0" @@ -1391,6 +1400,19 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +[[package]] +name = "git2" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2deb07a133b1520dc1a5690e9bd08950108873d7ed5de38dcc74d3b5ebffa110" +dependencies = [ + "bitflags 2.9.0", + "libc", + "libgit2-sys", + "log", + "url", +] + [[package]] name = "glob" version = "0.3.2" @@ -2047,6 +2069,18 @@ version = "0.2.171" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" +[[package]] +name = "libgit2-sys" +version = "0.18.2+1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c42fe03df2bd3c53a3a9c7317ad91d80c81cd1fb0caec8d7cc4cd2bfa10c222" +dependencies = [ + "cc", + "libc", + "libz-sys", + "pkg-config", +] + [[package]] name = "libloading" version = "0.8.6" @@ -3669,8 +3703,8 @@ checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "snarkos-account" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" +version = "4.0.1" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" dependencies = [ "colored", "snarkvm", @@ -3721,14 +3755,15 @@ dependencies = [ [[package]] name = "snarkos-node" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" +version = "4.0.1" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" dependencies = [ "aleo-std", "anyhow", "async-trait", "colored", "futures-util", + "indexmap 2.8.0", "lru", "num_cpus", "once_cell", @@ -3752,8 +3787,8 @@ dependencies = [ [[package]] name = "snarkos-node-bft" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" +version = "4.0.1" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" dependencies = [ "aleo-std", "anyhow", @@ -3785,8 +3820,8 @@ dependencies = [ [[package]] name = "snarkos-node-bft-events" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" +version = "4.0.1" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" dependencies = [ "anyhow", "bytes", @@ -3800,8 +3835,8 @@ dependencies = [ [[package]] name = "snarkos-node-bft-ledger-service" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" +version = "4.0.1" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" dependencies = [ "anyhow", "async-trait", @@ -3817,8 +3852,8 @@ dependencies = [ [[package]] name = "snarkos-node-bft-storage-service" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" +version = "4.0.1" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" dependencies = [ "aleo-std", "anyhow", @@ -3831,8 +3866,8 @@ dependencies = [ [[package]] name = "snarkos-node-cdn" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" +version = "4.0.1" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" dependencies = [ "anyhow", "bincode", @@ -3849,8 +3884,8 @@ dependencies = [ [[package]] name = "snarkos-node-consensus" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" +version = "4.0.1" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" dependencies = [ "aleo-std", "anyhow", @@ -3871,8 +3906,8 @@ dependencies = [ [[package]] name = "snarkos-node-metrics" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" +version = "4.0.1" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" dependencies = [ "metrics-exporter-prometheus", "parking_lot 0.12.3", @@ -3883,12 +3918,13 @@ dependencies = [ [[package]] name = "snarkos-node-rest" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" +version = "4.0.1" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" dependencies = [ "anyhow", "axum 0.8.4", "axum-extra", + "built", "http 1.3.1", "indexmap 2.8.0", "jsonwebtoken", @@ -3902,6 +3938,7 @@ dependencies = [ "snarkos-node-cdn", "snarkos-node-consensus", "snarkos-node-router", + "snarkos-node-sync", "snarkvm", "time", "tokio", @@ -3912,8 +3949,8 @@ dependencies = [ [[package]] name = "snarkos-node-router" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" +version = "4.0.1" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" dependencies = [ "anyhow", "async-trait", @@ -3939,8 +3976,8 @@ dependencies = [ [[package]] name = "snarkos-node-router-messages" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" +version = "4.0.1" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" dependencies = [ "bytes", "serde", @@ -3953,8 +3990,8 @@ dependencies = [ [[package]] name = "snarkos-node-sync" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" +version = "4.0.1" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" dependencies = [ "anyhow", "futures", @@ -3962,6 +3999,7 @@ dependencies = [ "itertools 0.14.0", "parking_lot 0.12.3", "rand 0.8.5", + "serde", "snarkos-node-bft-ledger-service", "snarkos-node-router", "snarkos-node-sync-communication-service", @@ -3973,8 +4011,8 @@ dependencies = [ [[package]] name = "snarkos-node-sync-communication-service" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" +version = "4.0.1" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" dependencies = [ "async-trait", "tokio", @@ -3982,8 +4020,8 @@ dependencies = [ [[package]] name = "snarkos-node-sync-locators" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" +version = "4.0.1" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" dependencies = [ "anyhow", "indexmap 2.8.0", @@ -3994,8 +4032,8 @@ dependencies = [ [[package]] name = "snarkos-node-tcp" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=3385629#3385629286926f039e669c7907ae41faf52deb7d" +version = "4.0.1" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" dependencies = [ "async-trait", "bytes", @@ -4011,8 +4049,8 @@ dependencies = [ [[package]] name = "snarkvm" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "anstyle", "anyhow", @@ -4030,8 +4068,8 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "aleo-std", "anyhow", @@ -4044,7 +4082,6 @@ dependencies = [ "itertools 0.11.0", "num-traits", "rand 0.8.5", - "rand_core 0.6.4", "rayon", "serde", "sha2", @@ -4059,8 +4096,8 @@ dependencies = [ [[package]] name = "snarkvm-algorithms-cuda" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "blst", "cc", @@ -4070,8 +4107,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -4084,8 +4121,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-circuit-network", "snarkvm-circuit-types", @@ -4094,8 +4131,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -4104,8 +4141,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -4114,14 +4151,13 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "indexmap 2.8.0", "itertools 0.11.0", "nom", "num-traits", - "once_cell", "smallvec", "snarkvm-algorithms", "snarkvm-circuit-environment-witness", @@ -4133,13 +4169,13 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" [[package]] name = "snarkvm-circuit-network" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -4149,8 +4185,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -4163,8 +4199,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -4178,8 +4214,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4191,8 +4227,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -4200,8 +4236,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4210,8 +4246,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4222,8 +4258,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4234,8 +4270,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4245,8 +4281,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4257,8 +4293,8 @@ dependencies = [ [[package]] name = "snarkvm-console" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -4270,8 +4306,8 @@ dependencies = [ [[package]] name = "snarkvm-console-account" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "bs58", "snarkvm-console-network", @@ -4281,8 +4317,8 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "blake2s_simd", "smallvec", @@ -4294,8 +4330,8 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "aleo-std", "rayon", @@ -4305,13 +4341,13 @@ dependencies = [ [[package]] name = "snarkvm-console-network" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "anyhow", + "enum-iterator", "indexmap 2.8.0", "lazy_static", - "once_cell", "paste", "serde", "snarkvm-algorithms", @@ -4325,8 +4361,8 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "anyhow", "bech32", @@ -4343,8 +4379,8 @@ dependencies = [ [[package]] name = "snarkvm-console-program" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "enum-iterator", "enum_index", @@ -4352,7 +4388,6 @@ dependencies = [ "indexmap 2.8.0", "num-derive", "num-traits", - "once_cell", "serde_json", "snarkvm-console-account", "snarkvm-console-algorithms", @@ -4364,8 +4399,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -4379,8 +4414,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4390,16 +4425,16 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-console-network-environment", ] [[package]] name = "snarkvm-console-types-field" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4408,8 +4443,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4419,8 +4454,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4430,8 +4465,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4441,8 +4476,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4452,8 +4487,8 @@ dependencies = [ [[package]] name = "snarkvm-curves" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "rand 0.8.5", "rayon", @@ -4466,8 +4501,8 @@ dependencies = [ [[package]] name = "snarkvm-fields" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "aleo-std", "anyhow", @@ -4483,8 +4518,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "aleo-std", "anyhow", @@ -4508,8 +4543,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "anyhow", "rand 0.8.5", @@ -4520,8 +4555,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4540,8 +4575,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4553,8 +4588,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -4566,8 +4601,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4579,8 +4614,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4591,8 +4626,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "bytes", "serde_json", @@ -4602,8 +4637,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4617,8 +4652,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "bytes", "serde_json", @@ -4630,8 +4665,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "snarkvm-console", "snarkvm-ledger-puzzle", @@ -4639,8 +4674,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "aleo-std", "anyhow", @@ -4658,8 +4693,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle-epoch" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "aleo-std", "anyhow", @@ -4680,11 +4715,10 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "async-trait", - "http 1.3.1", "reqwest", "snarkvm-console", "snarkvm-ledger-store", @@ -4694,14 +4728,13 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "aleo-std-storage", "anyhow", "bincode", "indexmap 2.8.0", - "once_cell", "parking_lot 0.12.3", "rayon", "rocksdb", @@ -4721,16 +4754,16 @@ dependencies = [ [[package]] name = "snarkvm-metrics" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "metrics", ] [[package]] name = "snarkvm-parameters" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "aleo-std", "anyhow", @@ -4751,8 +4784,8 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "aleo-std", "anyhow", @@ -4782,13 +4815,12 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "aleo-std", "colored", "indexmap 2.8.0", - "once_cell", "parking_lot 0.12.3", "rand 0.8.5", "rand_chacha 0.3.1", @@ -4807,8 +4839,8 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "indexmap 2.8.0", "paste", @@ -4820,15 +4852,15 @@ dependencies = [ "snarkvm-console", "snarkvm-synthesizer-snark", "snarkvm-utilities", + "tiny-keccak", ] [[package]] name = "snarkvm-synthesizer-snark" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "bincode", - "once_cell", "serde_json", "snarkvm-algorithms", "snarkvm-circuit", @@ -4837,8 +4869,8 @@ dependencies = [ [[package]] name = "snarkvm-utilities" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "aleo-std", "anyhow", @@ -4858,8 +4890,8 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" -version = "3.8.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=668b72b#668b72bbd267fc6459e3cb7c492d4ac56e615887" +version = "4.0.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" dependencies = [ "proc-macro2", "quote 1.0.40", diff --git a/Cargo.toml b/Cargo.toml index 11790471..c998f2a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -149,16 +149,16 @@ snops-common = { path = "./crates/common" } ## Comment to use version-pinned or local dependencies -snarkos-account = { git = "https://github.com/ProvableHQ/snarkOS", rev = "3385629" } -snarkos-node = { git = "https://github.com/ProvableHQ/snarkOS", rev = "3385629" } -snarkos-node-metrics = { git = "https://github.com/ProvableHQ/snarkOS", rev = "3385629" } +snarkos-account = { git = "https://github.com/ProvableHQ/snarkOS", rev = "fa3cad2" } +snarkos-node = { git = "https://github.com/ProvableHQ/snarkOS", rev = "fa3cad2" } +snarkos-node-metrics = { git = "https://github.com/ProvableHQ/snarkOS", rev = "fa3cad2" } [workspace.dependencies.snarkvm] ## The following anchors are used by the `update_snarkos_dep.sh` script. ## Everything in-between the anchors is copied from the snarkos Cargo.toml ## CODEGEN_START #path = "../snarkVM" git = "https://github.com/ProvableHQ/snarkVM.git" -rev = "668b72b" +rev = "6c148bf13" #version = "=3.8.0" default-features = false #features = [ "circuit", "console", "rocks" ] diff --git a/crates/aot/src/auth/auth_fee.rs b/crates/aot/src/auth/auth_fee.rs index 55d2184d..690a2e39 100644 --- a/crates/aot/src/auth/auth_fee.rs +++ b/crates/aot/src/auth/auth_fee.rs @@ -59,10 +59,10 @@ pub struct AuthorizeFee { impl AuthorizeFee { pub fn parse(self) -> Result>> { + let mut process = Process::load()?; let (id, base_fee) = match (self.auth, self.deployment, self.id, self.cost) { (Some(auth), None, None, None) => { let auth = auth.into_inner(); - let mut process = Process::load()?; if let Some(query) = self.query.as_deref() { let programs = query::get_programs_from_auth(&auth); query::add_many_programs_to_process(&mut process, programs, query)?; @@ -77,7 +77,7 @@ impl AuthorizeFee { let deployment = deployment.into_inner(); ( deployment.to_deployment_id()?, - deployment_cost(&deployment)?.0, + deployment_cost(&process, &deployment)?.0, ) } (None, None, Some(id), Some(cost)) => (id, cost), diff --git a/crates/aot/src/auth/auth_id.rs b/crates/aot/src/auth/auth_id.rs index 0ce65523..792ecc9f 100644 --- a/crates/aot/src/auth/auth_id.rs +++ b/crates/aot/src/auth/auth_id.rs @@ -24,7 +24,7 @@ pub fn auth_tx_id( let fee = fee_auth.map(fee_from_auth).transpose()?; let tree = match fee { - Some(fee) => Transaction::transaction_tree(execute_tree, auth.len(), &fee)?, + Some(fee) => Transaction::transaction_tree(execute_tree, Some(&fee))?, None => execute_tree, }; @@ -41,7 +41,7 @@ pub fn deploy_tx_id( let fee = fee_auth.map(fee_from_auth).transpose()?; let tree = match fee { - Some(fee) => Transaction::transaction_tree(deployment_tree, deployment.len(), &fee)?, + Some(fee) => Transaction::transaction_tree(deployment_tree, Some(&fee))?, None => deployment_tree, }; diff --git a/crates/aot/src/auth/mod.rs b/crates/aot/src/auth/mod.rs index 0b7fd0e7..929a9bc6 100644 --- a/crates/aot/src/auth/mod.rs +++ b/crates/aot/src/auth/mod.rs @@ -132,6 +132,7 @@ impl AuthCommand { auth, cost_v1, }) => { + let mut process = Process::load()?; let cost = match auth.pick()? { AuthBlob::Program { auth, .. } => { let auth = auth.into(); @@ -139,7 +140,6 @@ impl AuthCommand { // load the programs the auth references into the process // as cost estimation measures the size of values from within the auth's // transitions - let mut process = Process::load()?; if let Some(query) = query.as_deref() { let programs = query::get_programs_from_auth(&auth); query::add_many_programs_to_process(&mut process, programs, query)?; @@ -147,7 +147,10 @@ impl AuthCommand { estimate_cost(&process, &auth, !cost_v1)? } - AuthBlob::Deploy { deployment, .. } => deployment_cost(&deployment)?.0, + AuthBlob::Deploy { deployment, .. } => { + // TODO: not sure if this program needs to have its prereqs loaded + deployment_cost(&process, &deployment)?.0 + } }; println!("{cost}"); Ok(()) @@ -234,6 +237,8 @@ impl AuthCommand { return Ok(()); }; + let process = Process::load()?; + // authorize the fee using the deployment's ID and estimated cost let fee_auth = auth_fee::AuthorizeFee { key: fee_key.as_key().unwrap_or(key), @@ -242,7 +247,7 @@ impl AuthCommand { deployment: None, query: None, id: Some(deployment.to_deployment_id()?), - cost: Some(deployment_cost(&deployment)?.0), + cost: Some(deployment_cost(&process, &deployment)?.0), seed, cost_v1, } diff --git a/crates/aot/src/program/cost.rs b/crates/aot/src/program/cost.rs index d8510494..7022694c 100644 --- a/crates/aot/src/program/cost.rs +++ b/crates/aot/src/program/cost.rs @@ -64,7 +64,7 @@ impl CostCommand { estimate_cost(&process, &auth, !cost_v1) } else { let deployment = process.deploy::(&program, &mut rand::thread_rng())?; - Ok(deployment_cost(&deployment)?.0) + Ok(deployment_cost(&process, &deployment)?.0) } } } diff --git a/crates/aot/src/runner/mod.rs b/crates/aot/src/runner/mod.rs index 610f7efb..03db2be5 100644 --- a/crates/aot/src/runner/mod.rs +++ b/crates/aot/src/runner/mod.rs @@ -195,21 +195,17 @@ impl Runner { storage_mode.clone(), false, false, + None, shutdown, ) .await .map_err(|e| e.context("create validator"))? } - NodeType::Prover => Node::new_prover( - node_ip, - account, - &self.peers, - genesis, - storage_mode.clone(), - shutdown, - ) - .await - .map_err(|e| e.context("create prover"))?, + NodeType::Prover => { + Node::new_prover(node_ip, account, &self.peers, genesis, None, shutdown) + .await + .map_err(|e| e.context("create prover"))? + } NodeType::Client => Node::new_client( node_ip, Some(rest_ip), @@ -220,6 +216,7 @@ impl Runner { None, storage_mode.clone(), false, + None, shutdown, ) .await diff --git a/crates/checkpoint/src/aleo.rs b/crates/checkpoint/src/aleo.rs index 82c2e70d..e29e6178 100644 --- a/crates/checkpoint/src/aleo.rs +++ b/crates/checkpoint/src/aleo.rs @@ -13,7 +13,7 @@ pub use snarkvm::{ store::{ self, BlockStorage, CommitteeStorage, DeploymentStorage, ExecutionStorage, FeeStorage, FinalizeStorage, InputStorage, OutputStorage, TransactionStorage, TransactionType, - TransitionStorage, cow_to_cloned, cow_to_copied, + TransitionStorage, helpers::{Map, MapRead}, }, }, diff --git a/crates/checkpoint/src/ledger.rs b/crates/checkpoint/src/ledger.rs index 8a0ed348..b076b4c3 100644 --- a/crates/checkpoint/src/ledger.rs +++ b/crates/checkpoint/src/ledger.rs @@ -53,7 +53,7 @@ impl Stores { // Retrieve the state root. let state_root = match db.state_root_map().get_confirmed(&block_height)? { - Some(state_root) => cow_to_copied!(state_root), + Some(state_root) => state_root, None => { bail!( "Failed to remove block: missing state root for block height '{block_height}'" @@ -69,7 +69,7 @@ impl Stores { }; // Retrieve the solutions. let solutions = match db.solutions_map().get_confirmed(&block_hash)? { - Some(solutions) => cow_to_cloned!(solutions), + Some(solutions) => solutions, None => { bail!( "Failed to remove block: missing solutions for block '{block_height}' ('{block_hash}')" @@ -186,14 +186,14 @@ impl Stores { // Retrieve the transaction type. let transaction_type = match db.id_map().get_confirmed(transaction_id)? { - Some(transaction_type) => cow_to_copied!(transaction_type), + Some(transaction_type) => transaction_type, None => bail!("Failed to get the type for transaction '{transaction_id}'"), }; // Remove the transaction type. db.id_map().remove(transaction_id)?; // Remove the transaction. - match transaction_type { + match transaction_type.as_ref() { // Remove the deployment transaction. TransactionType::Deploy => self.fast_deployment_remove(transaction_id)?, // Remove the execution transaction. @@ -219,7 +219,7 @@ impl Stores { }; // Retrieve the program. let program = match db.program_map().get_confirmed(&(program_id, edition))? { - Some(program) => cow_to_cloned!(program), + Some(program) => program, None => { bail!("Failed to locate program '{program_id}' for transaction '{transaction_id}'") } @@ -267,8 +267,9 @@ impl Stores { let db = &self.executions; // Retrieve the transition IDs and fee boolean. - let (transition_ids, has_fee) = match db.id_map().get_confirmed(transaction_id)? { - Some(ids) => cow_to_cloned!(ids), + let confirmed = db.id_map().get_confirmed(transaction_id)?; + let (transition_ids, has_fee) = match confirmed.as_deref() { + Some(ids) => ids, None => { bail!("Failed to get the transition IDs for the transaction '{transaction_id}'") } @@ -289,7 +290,7 @@ impl Stores { db.inclusion_map().remove(transaction_id)?; // Remove the fee. - if has_fee { + if *has_fee { // Remove the fee. self.fast_fee_remove(transaction_id)?; } @@ -301,8 +302,9 @@ impl Stores { let db = &self.fees; // Retrieve the fee transition ID. - let (transition_id, _, _) = match db.fee_map().get_confirmed(transaction_id)? { - Some(fee_id) => cow_to_cloned!(fee_id), + let confirmed = db.fee_map().get_confirmed(transaction_id)?; + let (transition_id, _, _) = match confirmed.as_deref() { + Some(fee_id) => fee_id, None => { bail!("Failed to locate the fee transition ID for transaction '{transaction_id}'") } @@ -323,12 +325,12 @@ impl Stores { // Retrieve the `tpk`. let tpk = match db.tpk_map().get_confirmed(transition_id)? { - Some(tpk) => cow_to_copied!(tpk), + Some(tpk) => tpk, None => return Ok(()), }; // Retrieve the `tcm`. let tcm = match db.tcm_map().get_confirmed(transition_id)? { - Some(tcm) => cow_to_copied!(tcm), + Some(tcm) => tcm, None => return Ok(()), }; From 72bf3f659a55e7b85af18805dbd1bc0d1c988897 Mon Sep 17 00:00:00 2001 From: Meshiest Date: Tue, 26 Aug 2025 11:29:12 -0400 Subject: [PATCH 05/10] deps: update snarkos/snarkvm for canary-4.2.0, fix breaking changes --- Cargo.lock | 403 ++++++++++-------- Cargo.toml | 10 +- README.md | 6 +- crates/aot/src/auth/auth_fee.rs | 44 +- crates/aot/src/auth/auth_program.rs | 13 +- crates/aot/src/auth/execute.rs | 11 +- crates/aot/src/auth/mod.rs | 43 +- crates/aot/src/program/cost.rs | 24 +- crates/common/src/aot_cmds/mod.rs | 20 +- .../controlplane/src/server/actions/deploy.rs | 7 +- .../src/server/actions/execute.rs | 7 +- 11 files changed, 336 insertions(+), 252 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1af7c5d6..9d39333c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -497,7 +497,7 @@ dependencies = [ "rustc-hash 1.1.0", "shlex", "syn 2.0.100", - "which", + "which 4.4.2", ] [[package]] @@ -779,6 +779,15 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "colored" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fde0e0ec90c9dfb3b4b1a0891a7dcd0e2bffde2f7efed5fe7c9bb00e5bfb915e" +dependencies = [ + "windows-sys 0.52.0", +] + [[package]] name = "constant_time_eq" version = "0.3.1" @@ -1141,6 +1150,12 @@ dependencies = [ "syn 0.11.11", ] +[[package]] +name = "env_home" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7f84e12ccf0a7ddc17a6c41c93326024c42920d7ee630d04950e6926645c0fe" + [[package]] name = "equivalent" version = "1.0.2" @@ -1181,6 +1196,16 @@ version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" +[[package]] +name = "flate2" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + [[package]] name = "fnv" version = "1.0.7" @@ -1952,15 +1977,6 @@ version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.12.1" @@ -2263,9 +2279,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.5" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" +checksum = "86ea4e65087ff52f3862caff188d489f1fab49a0cb09e01b2e3f1a617b10aaed" dependencies = [ "hashbrown 0.15.2", ] @@ -3703,10 +3719,10 @@ checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "snarkos-account" -version = "4.0.1" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" dependencies = [ - "colored", + "colored 2.2.0", "snarkvm", ] @@ -3721,7 +3737,7 @@ dependencies = [ "bincode", "clap", "clap-stdin", - "colored", + "colored 2.2.0", "crossterm", "futures-util", "http 1.3.1", @@ -3755,14 +3771,15 @@ dependencies = [ [[package]] name = "snarkos-node" -version = "4.0.1" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" dependencies = [ "aleo-std", "anyhow", "async-trait", - "colored", + "colored 3.0.0", "futures-util", + "http 1.3.1", "indexmap 2.8.0", "lru", "num_cpus", @@ -3787,15 +3804,15 @@ dependencies = [ [[package]] name = "snarkos-node-bft" -version = "4.0.1" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" dependencies = [ "aleo-std", "anyhow", "async-recursion", "async-trait", "bytes", - "colored", + "colored 3.0.0", "futures", "indexmap 2.8.0", "lru", @@ -3820,8 +3837,8 @@ dependencies = [ [[package]] name = "snarkos-node-bft-events" -version = "4.0.1" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" dependencies = [ "anyhow", "bytes", @@ -3835,8 +3852,8 @@ dependencies = [ [[package]] name = "snarkos-node-bft-ledger-service" -version = "4.0.1" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" dependencies = [ "anyhow", "async-trait", @@ -3852,8 +3869,8 @@ dependencies = [ [[package]] name = "snarkos-node-bft-storage-service" -version = "4.0.1" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" dependencies = [ "aleo-std", "anyhow", @@ -3866,12 +3883,13 @@ dependencies = [ [[package]] name = "snarkos-node-cdn" -version = "4.0.1" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" dependencies = [ "anyhow", "bincode", - "colored", + "colored 3.0.0", + "http 1.3.1", "parking_lot 0.12.3", "rayon", "reqwest", @@ -3884,12 +3902,12 @@ dependencies = [ [[package]] name = "snarkos-node-consensus" -version = "4.0.1" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" dependencies = [ "aleo-std", "anyhow", - "colored", + "colored 3.0.0", "indexmap 2.8.0", "lru", "parking_lot 0.12.3", @@ -3906,8 +3924,8 @@ dependencies = [ [[package]] name = "snarkos-node-metrics" -version = "4.0.1" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" dependencies = [ "metrics-exporter-prometheus", "parking_lot 0.12.3", @@ -3918,8 +3936,8 @@ dependencies = [ [[package]] name = "snarkos-node-rest" -version = "4.0.1" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" dependencies = [ "anyhow", "axum 0.8.4", @@ -3949,12 +3967,12 @@ dependencies = [ [[package]] name = "snarkos-node-router" -version = "4.0.1" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" dependencies = [ "anyhow", "async-trait", - "colored", + "colored 3.0.0", "futures", "linked-hash-map", "parking_lot 0.12.3", @@ -3976,8 +3994,8 @@ dependencies = [ [[package]] name = "snarkos-node-router-messages" -version = "4.0.1" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" dependencies = [ "bytes", "serde", @@ -3990,8 +4008,8 @@ dependencies = [ [[package]] name = "snarkos-node-sync" -version = "4.0.1" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" dependencies = [ "anyhow", "futures", @@ -4011,8 +4029,8 @@ dependencies = [ [[package]] name = "snarkos-node-sync-communication-service" -version = "4.0.1" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" dependencies = [ "async-trait", "tokio", @@ -4020,8 +4038,8 @@ dependencies = [ [[package]] name = "snarkos-node-sync-locators" -version = "4.0.1" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" dependencies = [ "anyhow", "indexmap 2.8.0", @@ -4032,8 +4050,8 @@ dependencies = [ [[package]] name = "snarkos-node-tcp" -version = "4.0.1" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=fa3cad2#fa3cad24cff6f5a92529278af4e48958439c0fe5" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" dependencies = [ "async-trait", "bytes", @@ -4049,8 +4067,8 @@ dependencies = [ [[package]] name = "snarkvm" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "anstyle", "anyhow", @@ -4068,8 +4086,8 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "aleo-std", "anyhow", @@ -4079,7 +4097,7 @@ dependencies = [ "hashbrown 0.15.2", "hex", "indexmap 2.8.0", - "itertools 0.11.0", + "itertools 0.14.0", "num-traits", "rand 0.8.5", "rayon", @@ -4096,19 +4114,19 @@ dependencies = [ [[package]] name = "snarkvm-algorithms-cuda" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "blst", "cc", "sppark", - "which", + "which 8.0.0", ] [[package]] name = "snarkvm-circuit" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -4121,8 +4139,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-circuit-network", "snarkvm-circuit-types", @@ -4131,8 +4149,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -4141,8 +4159,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -4151,11 +4169,11 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "indexmap 2.8.0", - "itertools 0.11.0", + "itertools 0.14.0", "nom", "num-traits", "smallvec", @@ -4169,13 +4187,13 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" [[package]] name = "snarkvm-circuit-network" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -4185,8 +4203,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -4199,8 +4217,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -4214,8 +4232,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4227,8 +4245,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -4236,8 +4254,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4246,8 +4264,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4258,8 +4276,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4270,8 +4288,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4281,8 +4299,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4293,8 +4311,8 @@ dependencies = [ [[package]] name = "snarkvm-console" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -4306,8 +4324,8 @@ dependencies = [ [[package]] name = "snarkvm-console-account" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "bs58", "snarkvm-console-network", @@ -4317,8 +4335,8 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "blake2s_simd", "smallvec", @@ -4330,8 +4348,8 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "aleo-std", "rayon", @@ -4341,8 +4359,8 @@ dependencies = [ [[package]] name = "snarkvm-console-network" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "anyhow", "enum-iterator", @@ -4361,12 +4379,12 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "anyhow", "bech32", - "itertools 0.11.0", + "itertools 0.14.0", "nom", "num-traits", "rand 0.8.5", @@ -4379,8 +4397,8 @@ dependencies = [ [[package]] name = "snarkvm-console-program" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "enum-iterator", "enum_index", @@ -4399,8 +4417,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -4414,8 +4432,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4425,16 +4443,16 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-console-network-environment", ] [[package]] name = "snarkvm-console-types-field" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4443,8 +4461,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4454,8 +4472,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4465,8 +4483,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4476,8 +4494,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4487,8 +4505,8 @@ dependencies = [ [[package]] name = "snarkvm-curves" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "rand 0.8.5", "rayon", @@ -4501,12 +4519,12 @@ dependencies = [ [[package]] name = "snarkvm-fields" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "aleo-std", "anyhow", - "itertools 0.11.0", + "itertools 0.14.0", "num-traits", "rand 0.8.5", "rayon", @@ -4518,8 +4536,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "aleo-std", "anyhow", @@ -4543,8 +4561,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "anyhow", "rand 0.8.5", @@ -4555,8 +4573,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4575,8 +4593,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-committee" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4588,8 +4606,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -4601,8 +4619,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4614,8 +4632,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4626,8 +4644,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "bytes", "serde_json", @@ -4637,8 +4655,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4652,8 +4670,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "bytes", "serde_json", @@ -4665,8 +4683,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "snarkvm-console", "snarkvm-ledger-puzzle", @@ -4674,8 +4692,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "aleo-std", "anyhow", @@ -4693,12 +4711,12 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle-epoch" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "aleo-std", "anyhow", - "colored", + "colored 3.0.0", "indexmap 2.8.0", "lru", "parking_lot 0.12.3", @@ -4715,12 +4733,16 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ + "anyhow", "async-trait", "reqwest", + "serde", + "serde_json", "snarkvm-console", + "snarkvm-ledger-block", "snarkvm-ledger-store", "snarkvm-synthesizer-program", "ureq", @@ -4728,8 +4750,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "aleo-std-storage", "anyhow", @@ -4754,21 +4776,21 @@ dependencies = [ [[package]] name = "snarkvm-metrics" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "metrics", ] [[package]] name = "snarkvm-parameters" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "aleo-std", "anyhow", "cfg-if", - "colored", + "colored 3.0.0", "curl", "hex", "lazy_static", @@ -4784,13 +4806,13 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "aleo-std", "anyhow", "indexmap 2.8.0", - "itertools 0.11.0", + "itertools 0.14.0", "lru", "parking_lot 0.12.3", "rand 0.8.5", @@ -4815,11 +4837,11 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "aleo-std", - "colored", + "colored 3.0.0", "indexmap 2.8.0", "parking_lot 0.12.3", "rand 0.8.5", @@ -4839,8 +4861,8 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "indexmap 2.8.0", "paste", @@ -4857,20 +4879,21 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "bincode", "serde_json", "snarkvm-algorithms", "snarkvm-circuit", "snarkvm-console", + "snarkvm-utilities", ] [[package]] name = "snarkvm-utilities" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "aleo-std", "anyhow", @@ -4890,8 +4913,8 @@ dependencies = [ [[package]] name = "snarkvm-utilities-derives" -version = "4.0.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=6c148bf13#6c148bf13a76572bb86ce285c0e6ecd76277ab7e" +version = "4.1.0" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" dependencies = [ "proc-macro2", "quote 1.0.40", @@ -5082,7 +5105,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16bf457036c0a778140ce4c3bcf9ff30c5c70a9d9c0bb04fe513af025b647b2c" dependencies = [ "cc", - "which", + "which 4.4.2", ] [[package]] @@ -5767,12 +5790,17 @@ checksum = "9f0fde9bc91026e381155f8c67cb354bcd35260b2f4a29bcc84639f762760c39" dependencies = [ "base64 0.22.1", "cookie_store", + "flate2", "log", "percent-encoding", + "rustls", + "rustls-pemfile", + "rustls-pki-types", "serde", "serde_json", "ureq-proto", "utf-8", + "webpki-roots", ] [[package]] @@ -6037,6 +6065,17 @@ dependencies = [ "rustix 0.38.44", ] +[[package]] +name = "which" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fabb953106c3c8eea8306e4393700d7657561cb43122571b172bbfb7c7ba1d" +dependencies = [ + "env_home", + "rustix 1.0.5", + "winsafe", +] + [[package]] name = "wildmatch" version = "2.4.0" @@ -6299,6 +6338,12 @@ version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" +[[package]] +name = "winsafe" +version = "0.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" + [[package]] name = "wit-bindgen-rt" version = "0.39.0" diff --git a/Cargo.toml b/Cargo.toml index c998f2a9..a9e31473 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -149,17 +149,17 @@ snops-common = { path = "./crates/common" } ## Comment to use version-pinned or local dependencies -snarkos-account = { git = "https://github.com/ProvableHQ/snarkOS", rev = "fa3cad2" } -snarkos-node = { git = "https://github.com/ProvableHQ/snarkOS", rev = "fa3cad2" } -snarkos-node-metrics = { git = "https://github.com/ProvableHQ/snarkOS", rev = "fa3cad2" } +snarkos-account = { git = "https://github.com/ProvableHQ/snarkOS", rev = "9032343" } +snarkos-node = { git = "https://github.com/ProvableHQ/snarkOS", rev = "9032343" } +snarkos-node-metrics = { git = "https://github.com/ProvableHQ/snarkOS", rev = "9032343" } [workspace.dependencies.snarkvm] ## The following anchors are used by the `update_snarkos_dep.sh` script. ## Everything in-between the anchors is copied from the snarkos Cargo.toml ## CODEGEN_START #path = "../snarkVM" git = "https://github.com/ProvableHQ/snarkVM.git" -rev = "6c148bf13" -#version = "=3.8.0" +rev = "fb8349c4f" +#version = "=4.0.1" default-features = false #features = [ "circuit", "console", "rocks" ] ## CODEGEN_END diff --git a/README.md b/README.md index d2619a8b..be42344a 100644 --- a/README.md +++ b/README.md @@ -226,9 +226,9 @@ $ snarkos-aot program cost ./example.aleo $ snarkos-aot program cost ./credits.aleo transfer_public example.aleo 1u64 34060 -# Calculate the cost of executing a function in a program for devnets below the cost-v2 height -# Programs that call other programs will be much more expensive with cost-v1 -$ snarkos-aot program cost --cost-v1 ./credits.aleo transfer_public example.aleo 1u64 +# Calculate the cost of executing a function in a program for devnets below the specific consensus versions +# Programs that call other programs will be much more expensive with consensus v1 costs +$ snarkos-aot program cost --height 100 ./credits.aleo transfer_public example.aleo 1u64 51060 # Get a list of imports for a program (output in a json format with --json) diff --git a/crates/aot/src/auth/auth_fee.rs b/crates/aot/src/auth/auth_fee.rs index 690a2e39..7df24d7b 100644 --- a/crates/aot/src/auth/auth_fee.rs +++ b/crates/aot/src/auth/auth_fee.rs @@ -4,7 +4,7 @@ use clap_stdin::MaybeStdin; use rand::{CryptoRng, Rng}; use snarkvm::{ ledger::Deployment, - prelude::{Field, cost_in_microcredits_v1}, + prelude::{ConsensusVersion, Field, cost_in_microcredits_v1, cost_in_microcredits_v3}, synthesizer::{ Process, process::{cost_in_microcredits_v2, deployment_cost}, @@ -14,7 +14,9 @@ use snarkvm::{ use super::query; // use tracing::error; -use crate::{Authorization, Key, Network, PTRecord, PrivateKey}; +use crate::{ + Authorization, Key, Network, PTRecord, PrivateKey, program::cost::consensus_from_height, +}; /// The authorization arguments for a fee. #[derive(Debug, Args)] @@ -52,14 +54,16 @@ pub struct AuthorizeFee { /// The seed to use for the authorization generation #[clap(long)] pub seed: Option, - /// Enable cost v1 for the transaction cost estimation (v2 by default) - #[clap(long, default_value_t = false)] - pub cost_v1: bool, + /// Allow dynamically determining the consensus version based on the + /// current block height + #[clap(long)] + pub height: Option, } impl AuthorizeFee { pub fn parse(self) -> Result>> { let mut process = Process::load()?; + let consensus_version = consensus_from_height::(self.height); let (id, base_fee) = match (self.auth, self.deployment, self.id, self.cost) { (Some(auth), None, None, None) => { let auth = auth.into_inner(); @@ -70,14 +74,14 @@ impl AuthorizeFee { ( auth.to_execution_id()?, - estimate_cost(&process, &auth, !self.cost_v1)?, + estimate_cost(&process, &auth, consensus_version)?, ) } (None, Some(deployment), None, None) => { let deployment = deployment.into_inner(); ( deployment.to_deployment_id()?, - deployment_cost(&process, &deployment)?.0, + deployment_cost(&process, &deployment, consensus_version)?.0, ) } (None, None, Some(id), Some(cost)) => (id, cost), @@ -136,7 +140,7 @@ pub fn fee_auth( pub fn estimate_cost( process: &Process, func: &Authorization, - use_cost_v2: bool, + consensus_version: ConsensusVersion, ) -> Result { let transitions = func.transitions(); @@ -181,17 +185,8 @@ pub fn estimate_cost( cost }; - //execution.size_in_bytes().map_err(|e| e.to_string())?; - let finalize_cost = if use_cost_v2 { - // cost v2 uses the finalize cost of the first transition - let transition = transitions - .values() - .next() - .ok_or(anyhow!("No transitions"))?; - let stack = process.get_stack(transition.program_id())?; - cost_in_microcredits_v2(&stack, transition.function_name())? - } else { + let finalize_cost = if consensus_version == ConsensusVersion::V1 { // Compute the finalize cost in microcredits. let mut finalize_cost = 0u64; @@ -211,6 +206,19 @@ pub fn estimate_cost( } finalize_cost + } else { + // cost v2 uses the finalize cost of the first transition + let transition = transitions + .values() + .next() + .ok_or(anyhow!("No transitions"))?; + let stack = process.get_stack(transition.program_id())?; + + if consensus_version >= ConsensusVersion::V10 { + cost_in_microcredits_v3(&stack, transition.function_name())? + } else { + cost_in_microcredits_v2(&stack, transition.function_name())? + } }; Ok(storage_cost + finalize_cost) diff --git a/crates/aot/src/auth/auth_program.rs b/crates/aot/src/auth/auth_program.rs index d883a295..7291516e 100644 --- a/crates/aot/src/auth/auth_program.rs +++ b/crates/aot/src/auth/auth_program.rs @@ -3,7 +3,7 @@ use clap::Args; use snarkvm::{console::program::Locator, synthesizer::Process}; use super::{auth_fee::estimate_cost, query}; -use crate::{Authorization, Key, Network, Value}; +use crate::{Authorization, Key, Network, Value, program::cost::consensus_from_height}; #[derive(Debug, Args)] pub struct AuthProgramOptions { @@ -26,9 +26,10 @@ pub struct AuthorizeProgram { /// The seed to use for the authorization generation #[clap(long)] pub seed: Option, - /// Enable cost v1 for the transaction cost estimation (v2 by default) - #[clap(long, default_value_t = false)] - pub cost_v1: bool, + /// Allow dynamically determining the consensus version based on the + /// current block height + #[clap(long)] + pub height: Option, } impl AuthorizeProgram { @@ -53,8 +54,8 @@ impl AuthorizeProgram { self.options.inputs.iter(), &mut super::rng_from_seed(self.seed), )?; - - let cost = estimate_cost(&process, &auth, !self.cost_v1)?; + let consensus_version = consensus_from_height::(self.height); + let cost = estimate_cost(&process, &auth, consensus_version)?; Ok((auth, cost)) } diff --git a/crates/aot/src/auth/execute.rs b/crates/aot/src/auth/execute.rs index 65886fcf..300b2d42 100644 --- a/crates/aot/src/auth/execute.rs +++ b/crates/aot/src/auth/execute.rs @@ -73,7 +73,10 @@ pub fn execute_local( ) -> Result> { let query = match query_raw.as_ref() { Some(query) => { - let q = Query::>::from(query); + let q = Query::>::try_from(format!( + "{query}{slash}", + slash = if query.ends_with('/') { "" } else { "/" } + ))?; Some(Box::new(q) as Box>) } None => None, @@ -165,7 +168,11 @@ impl Execute { tracing::info!("broadcasting transaction..."); println!("{}", serde_json::to_string(&tx)?); let response = reqwest::blocking::Client::new() - .post(format!("{}/{network}/transaction/broadcast", self.query)) + .post(format!( + "{query}{slash}{network}/transaction/broadcast", + query = self.query, + slash = if self.query.ends_with('/') { "" } else { "/" } + )) .header("Content-Type", "application/json") .json(&tx) .send()?; diff --git a/crates/aot/src/auth/mod.rs b/crates/aot/src/auth/mod.rs index 929a9bc6..bd28e646 100644 --- a/crates/aot/src/auth/mod.rs +++ b/crates/aot/src/auth/mod.rs @@ -6,7 +6,7 @@ use rand::SeedableRng; use rand_chacha::ChaChaRng; use snarkvm::synthesizer::{Process, process::deployment_cost}; -use crate::{Key, Network}; +use crate::{Key, Network, program::cost::consensus_from_height}; pub mod args; pub mod auth_deploy; @@ -46,9 +46,10 @@ pub struct CostCommand { query: Option, #[clap(flatten)] auth: AuthArgs, - /// Enable cost v1 for the transaction cost estimation (v2 by default) - #[clap(long, default_value_t = false)] - pub cost_v1: bool, + /// Allow dynamically determining the consensus version based on the + /// current block height + #[clap(long)] + pub height: Option, } /// Authorize a program execution. @@ -68,9 +69,10 @@ pub struct AuthProgramCommand { /// The seed to use for the authorization generation #[clap(long)] pub seed: Option, - /// Enable cost v1 for the transaction cost estimation (v2 by default) - #[clap(long, default_value_t = false)] - pub cost_v1: bool, + /// Allow dynamically determining the consensus version based on the + /// current block height + #[clap(long)] + pub height: Option, } /// Deploy a program to the network. @@ -90,9 +92,10 @@ pub struct AuthDeployCommand { /// The seed to use for the authorization generation #[clap(long)] pub seed: Option, - /// Enable cost v1 for the transaction cost estimation (v2 by default) - #[clap(long, default_value_t = false)] - pub cost_v1: bool, + /// Allow dynamically determining the consensus version based on the + /// current block height + #[clap(long)] + pub height: Option, } impl AuthCommand { @@ -130,9 +133,10 @@ impl AuthCommand { AuthCommand::Cost(CostCommand { query, auth, - cost_v1, + height, }) => { let mut process = Process::load()?; + let consensus_version = consensus_from_height::(height); let cost = match auth.pick()? { AuthBlob::Program { auth, .. } => { let auth = auth.into(); @@ -145,11 +149,11 @@ impl AuthCommand { query::add_many_programs_to_process(&mut process, programs, query)?; } - estimate_cost(&process, &auth, !cost_v1)? + estimate_cost(&process, &auth, consensus_version)? } AuthBlob::Deploy { deployment, .. } => { // TODO: not sure if this program needs to have its prereqs loaded - deployment_cost(&process, &deployment)?.0 + deployment_cost(&process, &deployment, consensus_version)?.0 } }; println!("{cost}"); @@ -162,7 +166,7 @@ impl AuthCommand { program_opts, fee_opts, seed, - cost_v1, + height, }) => { let query = program_opts.query.clone(); @@ -171,7 +175,7 @@ impl AuthCommand { key: key.clone(), options: program_opts, seed, - cost_v1, + height, } .parse()?; @@ -190,7 +194,7 @@ impl AuthCommand { id: Some(auth.to_execution_id()?), cost: Some(cost), seed, - cost_v1, + height, } .parse()?; @@ -210,7 +214,7 @@ impl AuthCommand { deploy_opts, fee_opts, seed, - cost_v1, + height, }) => { // authorize the deployment without a fee let AuthBlob::Deploy { @@ -238,6 +242,7 @@ impl AuthCommand { }; let process = Process::load()?; + let consensus_version = consensus_from_height::(height); // authorize the fee using the deployment's ID and estimated cost let fee_auth = auth_fee::AuthorizeFee { @@ -247,9 +252,9 @@ impl AuthCommand { deployment: None, query: None, id: Some(deployment.to_deployment_id()?), - cost: Some(deployment_cost(&process, &deployment)?.0), + cost: Some(deployment_cost(&process, &deployment, consensus_version)?.0), seed, - cost_v1, + height, } .parse()? .map(Into::into); diff --git a/crates/aot/src/program/cost.rs b/crates/aot/src/program/cost.rs index 7022694c..4c08f897 100644 --- a/crates/aot/src/program/cost.rs +++ b/crates/aot/src/program/cost.rs @@ -2,7 +2,7 @@ use anyhow::{Result, ensure}; use clap::Args; use clap_stdin::FileOrStdin; use snarkvm::{ - prelude::{Identifier, Value}, + prelude::{ConsensusVersion, Identifier, Value}, synthesizer::{Process, Program, process::deployment_cost}, }; @@ -25,9 +25,18 @@ pub struct CostCommand { /// Program inputs (eg. 1u64 5field) #[clap(num_args = 1, value_delimiter = ' ')] inputs: Vec>, - /// Enable cost v1 for the transaction cost estimation (v2 by default) - #[clap(long, default_value_t = false)] - pub cost_v1: bool, + /// Enable dynamic block height for the transaction cost estimation (latest + /// by default) + #[clap(long)] + pub height: Option, +} + +pub fn consensus_from_height(height: Option) -> ConsensusVersion { + if let Some(height) = height { + N::CONSENSUS_VERSION(height).unwrap_or(ConsensusVersion::V1) + } else { + ConsensusVersion::latest() + } } impl CostCommand { @@ -37,12 +46,13 @@ impl CostCommand { program, function, inputs, - cost_v1, + height, } = self; let program = program.contents()?; let mut process = Process::load()?; query::get_process_imports(&mut process, &program, query.as_deref())?; + let v = consensus_from_height::(height); if let Some(function) = function { process.add_program(&program)?; @@ -61,10 +71,10 @@ impl CostCommand { &mut rand::thread_rng(), )?; - estimate_cost(&process, &auth, !cost_v1) + estimate_cost(&process, &auth, v) } else { let deployment = process.deploy::(&program, &mut rand::thread_rng())?; - Ok(deployment_cost(&process, &deployment)?.0) + Ok(deployment_cost(&process, &deployment, v)?.0) } } } diff --git a/crates/common/src/aot_cmds/mod.rs b/crates/common/src/aot_cmds/mod.rs index d12dfcb7..5efeae1a 100644 --- a/crates/common/src/aot_cmds/mod.rs +++ b/crates/common/src/aot_cmds/mod.rs @@ -7,6 +7,7 @@ use tokio::{ pub mod error; pub use error::AotCmdError; +use tracing::trace; use self::error::CommandError; use crate::{ @@ -72,7 +73,7 @@ impl AotCmd { query: Option<&String>, priority_fee: Option, fee_record: Option<&String>, - cost_v1: bool, + height: Option, ) -> Result { let mut command = Command::new(&self.bin); command @@ -100,8 +101,8 @@ impl AotCmd { command.arg("--record").arg(fee_record); } - if cost_v1 { - command.arg("--cost-v1"); + if let Some(height) = height { + command.arg("--height").arg(height.to_string()); } command @@ -125,7 +126,7 @@ impl AotCmd { query: Option<&String>, priority_fee: Option, fee_record: Option<&String>, - cost_v1: bool, + height: Option, ) -> Result { let mut command = Command::new(&self.bin); command @@ -154,8 +155,8 @@ impl AotCmd { command.arg("--record").arg(fee_record); } - if cost_v1 { - command.arg("--cost-v1"); + if let Some(height) = height { + command.arg("--height").arg(height.to_string()); } command.arg("-"); @@ -212,7 +213,7 @@ impl AotCmd { authorization: &str, priority_fee: Option, fee_record: Option<&String>, - cost_v1: bool, + height: Option, ) -> Result { let mut command = Command::new(&self.bin); command @@ -232,8 +233,8 @@ impl AotCmd { command.arg("--record").arg(fee_record); } - if cost_v1 { - command.arg("--cost-v1"); + if let Some(height) = height { + command.arg("--height").arg(height.to_string()); } Self::handle_output( @@ -253,6 +254,7 @@ impl AotCmd { .arg("--broadcast") .arg("--query") .arg(query); + trace!("Executing transaction with aot: {:?}", command); match auth { Authorization::Program { auth, fee_auth } => { diff --git a/crates/controlplane/src/server/actions/deploy.rs b/crates/controlplane/src/server/actions/deploy.rs index 39b935e8..343269d9 100644 --- a/crates/controlplane/src/server/actions/deploy.rs +++ b/crates/controlplane/src/server/actions/deploy.rs @@ -104,8 +104,11 @@ pub async fn deploy_inner( query.as_ref(), priority_fee, fee_record.as_ref(), - // use cost_v1 when we are not using the native genesis - !env.storage.native_genesis, + if env.storage.native_genesis { + None + } else { + Some(cannon.proxy_latest_height().await?) + }, ) .await?; diff --git a/crates/controlplane/src/server/actions/execute.rs b/crates/controlplane/src/server/actions/execute.rs index 199bb302..c4a68086 100644 --- a/crates/controlplane/src/server/actions/execute.rs +++ b/crates/controlplane/src/server/actions/execute.rs @@ -181,8 +181,11 @@ pub async fn execute_inner( query.as_ref(), priority_fee, fee_record.as_ref(), - // use cost_v1 when we are not using the native genesis - !env.storage.native_genesis, + if env.storage.native_genesis { + None + } else { + Some(cannon.proxy_latest_height().await?) + }, ) .await?; From dd30cbe22e50327e4e91df01d8850ff957f3fcd4 Mon Sep 17 00:00:00 2001 From: Meshiest Date: Fri, 24 Oct 2025 21:16:48 -0400 Subject: [PATCH 06/10] deps: update snarkos/snarkvm for canary-4.3.3, fix breaking changes --- Cargo.lock | 467 ++++++++++++++++++++----------- Cargo.toml | 15 +- crates/aot/src/runner/metrics.rs | 5 +- crates/aot/src/runner/mod.rs | 16 +- scripts/dep_utils.sh | 6 +- 5 files changed, 328 insertions(+), 181 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9d39333c..d0ec6215 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -414,6 +414,12 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "base16ct" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" + [[package]] name = "base64" version = "0.13.1" @@ -788,6 +794,12 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + [[package]] name = "constant_time_eq" version = "0.3.1" @@ -918,6 +930,18 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" +[[package]] +name = "crypto-bigint" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "generic-array", + "rand_core 0.6.4", + "subtle", + "zeroize", +] + [[package]] name = "crypto-common" version = "0.1.6" @@ -1014,6 +1038,16 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010" +[[package]] +name = "der" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" +dependencies = [ + "const-oid", + "zeroize", +] + [[package]] name = "deranged" version = "0.4.1" @@ -1031,6 +1065,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", + "const-oid", "crypto-common", "subtle", ] @@ -1087,12 +1122,43 @@ version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005" +[[package]] +name = "ecdsa" +version = "0.16.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" +dependencies = [ + "der", + "digest", + "elliptic-curve", + "rfc6979", + "signature", +] + [[package]] name = "either" version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +[[package]] +name = "elliptic-curve" +version = "0.13.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" +dependencies = [ + "base16ct", + "crypto-bigint", + "digest", + "ff", + "generic-array", + "group", + "rand_core 0.6.4", + "sec1", + "subtle", + "zeroize", +] + [[package]] name = "encoding_rs" version = "0.8.35" @@ -1178,6 +1244,16 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +[[package]] +name = "ff" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "filetime" version = "0.2.25" @@ -1381,6 +1457,7 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", + "zeroize", ] [[package]] @@ -1467,6 +1544,17 @@ dependencies = [ "web-time", ] +[[package]] +name = "group" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +dependencies = [ + "ff", + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "h2" version = "0.4.8" @@ -2051,6 +2139,18 @@ dependencies = [ "sha2", ] +[[package]] +name = "k256" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" +dependencies = [ + "cfg-if", + "ecdsa", + "elliptic-curve", + "sha2", +] + [[package]] name = "lasso" version = "0.7.3" @@ -2534,16 +2634,6 @@ dependencies = [ "syn 2.0.100", ] -[[package]] -name = "num-format" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" -dependencies = [ - "arrayvec", - "itoa", -] - [[package]] name = "num-integer" version = "0.1.46" @@ -3250,6 +3340,16 @@ dependencies = [ "windows-registry", ] +[[package]] +name = "rfc6979" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" +dependencies = [ + "hmac", + "subtle", +] + [[package]] name = "ring" version = "0.17.14" @@ -3451,6 +3551,19 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "sec1" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" +dependencies = [ + "base16ct", + "der", + "generic-array", + "subtle", + "zeroize", +] + [[package]] name = "security-framework" version = "2.11.1" @@ -3496,6 +3609,12 @@ dependencies = [ "serde", ] +[[package]] +name = "seq-macro" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc" + [[package]] name = "serde" version = "1.0.219" @@ -3644,6 +3763,16 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core 0.6.4", +] + [[package]] name = "simple_asn1" version = "0.6.3" @@ -3719,10 +3848,10 @@ checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "snarkos-account" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" +version = "4.2.2" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=01b5f9c#01b5f9c9bc434d1517533bb2a3d6055fd56eb5e3" dependencies = [ - "colored 2.2.0", + "colored 3.0.0", "snarkvm", ] @@ -3771,12 +3900,13 @@ dependencies = [ [[package]] name = "snarkos-node" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" +version = "4.2.2" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=01b5f9c#01b5f9c9bc434d1517533bb2a3d6055fd56eb5e3" dependencies = [ "aleo-std", "anyhow", "async-trait", + "bytes", "colored 3.0.0", "futures-util", "http 1.3.1", @@ -3786,6 +3916,7 @@ dependencies = [ "once_cell", "parking_lot 0.12.3", "rand 0.8.5", + "reqwest", "serde_json", "snarkos-account", "snarkos-node-bft", @@ -3798,14 +3929,15 @@ dependencies = [ "snarkvm", "time", "tokio", + "tokio-stream", "tokio-util", "tracing", ] [[package]] name = "snarkos-node-bft" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" +version = "4.2.2" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=01b5f9c#01b5f9c9bc434d1517533bb2a3d6055fd56eb5e3" dependencies = [ "aleo-std", "anyhow", @@ -3825,6 +3957,7 @@ dependencies = [ "snarkos-node-bft-ledger-service", "snarkos-node-bft-storage-service", "snarkos-node-metrics", + "snarkos-node-router", "snarkos-node-sync", "snarkos-node-tcp", "snarkvm", @@ -3837,8 +3970,8 @@ dependencies = [ [[package]] name = "snarkos-node-bft-events" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" +version = "4.2.2" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=01b5f9c#01b5f9c9bc434d1517533bb2a3d6055fd56eb5e3" dependencies = [ "anyhow", "bytes", @@ -3852,8 +3985,8 @@ dependencies = [ [[package]] name = "snarkos-node-bft-ledger-service" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" +version = "4.2.2" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=01b5f9c#01b5f9c9bc434d1517533bb2a3d6055fd56eb5e3" dependencies = [ "anyhow", "async-trait", @@ -3869,8 +4002,8 @@ dependencies = [ [[package]] name = "snarkos-node-bft-storage-service" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" +version = "4.2.2" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=01b5f9c#01b5f9c9bc434d1517533bb2a3d6055fd56eb5e3" dependencies = [ "aleo-std", "anyhow", @@ -3883,8 +4016,8 @@ dependencies = [ [[package]] name = "snarkos-node-cdn" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" +version = "4.2.2" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=01b5f9c#01b5f9c9bc434d1517533bb2a3d6055fd56eb5e3" dependencies = [ "anyhow", "bincode", @@ -3902,8 +4035,8 @@ dependencies = [ [[package]] name = "snarkos-node-consensus" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" +version = "4.2.2" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=01b5f9c#01b5f9c9bc434d1517533bb2a3d6055fd56eb5e3" dependencies = [ "aleo-std", "anyhow", @@ -3924,8 +4057,8 @@ dependencies = [ [[package]] name = "snarkos-node-metrics" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" +version = "4.2.2" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=01b5f9c#01b5f9c9bc434d1517533bb2a3d6055fd56eb5e3" dependencies = [ "metrics-exporter-prometheus", "parking_lot 0.12.3", @@ -3936,8 +4069,8 @@ dependencies = [ [[package]] name = "snarkos-node-rest" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" +version = "4.2.2" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=01b5f9c#01b5f9c9bc434d1517533bb2a3d6055fd56eb5e3" dependencies = [ "anyhow", "axum 0.8.4", @@ -3967,9 +4100,10 @@ dependencies = [ [[package]] name = "snarkos-node-router" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" +version = "4.2.2" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=01b5f9c#01b5f9c9bc434d1517533bb2a3d6055fd56eb5e3" dependencies = [ + "aleo-std", "anyhow", "async-trait", "colored 3.0.0", @@ -3982,6 +4116,7 @@ dependencies = [ "snarkos-node-bft-ledger-service", "snarkos-node-metrics", "snarkos-node-router-messages", + "snarkos-node-sync-communication-service", "snarkos-node-sync-locators", "snarkos-node-tcp", "snarkvm", @@ -3994,8 +4129,8 @@ dependencies = [ [[package]] name = "snarkos-node-router-messages" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" +version = "4.2.2" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=01b5f9c#01b5f9c9bc434d1517533bb2a3d6055fd56eb5e3" dependencies = [ "bytes", "serde", @@ -4008,8 +4143,8 @@ dependencies = [ [[package]] name = "snarkos-node-sync" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" +version = "4.2.2" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=01b5f9c#01b5f9c9bc434d1517533bb2a3d6055fd56eb5e3" dependencies = [ "anyhow", "futures", @@ -4029,8 +4164,8 @@ dependencies = [ [[package]] name = "snarkos-node-sync-communication-service" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" +version = "4.2.2" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=01b5f9c#01b5f9c9bc434d1517533bb2a3d6055fd56eb5e3" dependencies = [ "async-trait", "tokio", @@ -4038,8 +4173,8 @@ dependencies = [ [[package]] name = "snarkos-node-sync-locators" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" +version = "4.2.2" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=01b5f9c#01b5f9c9bc434d1517533bb2a3d6055fd56eb5e3" dependencies = [ "anyhow", "indexmap 2.8.0", @@ -4050,8 +4185,8 @@ dependencies = [ [[package]] name = "snarkos-node-tcp" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkOS?rev=9032343#903234363c8bc1f05332d440a5767ce018a41783" +version = "4.2.2" +source = "git+https://github.com/ProvableHQ/snarkOS?rev=01b5f9c#01b5f9c9bc434d1517533bb2a3d6055fd56eb5e3" dependencies = [ "async-trait", "bytes", @@ -4067,12 +4202,10 @@ dependencies = [ [[package]] name = "snarkvm" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ - "anstyle", "anyhow", - "num-format", "rand 0.8.5", "snarkvm-algorithms", "snarkvm-circuit", @@ -4086,8 +4219,8 @@ dependencies = [ [[package]] name = "snarkvm-algorithms" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "aleo-std", "anyhow", @@ -4114,8 +4247,8 @@ dependencies = [ [[package]] name = "snarkvm-algorithms-cuda" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "blst", "cc", @@ -4125,8 +4258,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -4139,8 +4272,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-account" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-circuit-network", "snarkvm-circuit-types", @@ -4149,8 +4282,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-algorithms" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-circuit-types", "snarkvm-console-algorithms", @@ -4159,8 +4292,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-collections" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-types", @@ -4169,8 +4302,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "indexmap 2.8.0", "itertools 0.14.0", @@ -4187,13 +4320,13 @@ dependencies = [ [[package]] name = "snarkvm-circuit-environment-witness" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" [[package]] name = "snarkvm-circuit-network" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-circuit-algorithms", "snarkvm-circuit-collections", @@ -4203,8 +4336,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-program" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-circuit-account", "snarkvm-circuit-algorithms", @@ -4217,8 +4350,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-address", @@ -4232,8 +4365,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-address" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4245,8 +4378,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-boolean" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-circuit-environment", "snarkvm-console-types-boolean", @@ -4254,8 +4387,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-field" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4264,8 +4397,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-group" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4276,8 +4409,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-integers" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4288,8 +4421,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-scalar" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4299,8 +4432,8 @@ dependencies = [ [[package]] name = "snarkvm-circuit-types-string" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-circuit-environment", "snarkvm-circuit-types-boolean", @@ -4311,8 +4444,8 @@ dependencies = [ [[package]] name = "snarkvm-console" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-console-account", "snarkvm-console-algorithms", @@ -4324,8 +4457,8 @@ dependencies = [ [[package]] name = "snarkvm-console-account" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "bs58", "snarkvm-console-network", @@ -4335,10 +4468,12 @@ dependencies = [ [[package]] name = "snarkvm-console-algorithms" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "blake2s_simd", + "hex", + "k256", "smallvec", "snarkvm-console-types", "snarkvm-fields", @@ -4348,8 +4483,8 @@ dependencies = [ [[package]] name = "snarkvm-console-collections" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "aleo-std", "rayon", @@ -4359,8 +4494,8 @@ dependencies = [ [[package]] name = "snarkvm-console-network" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "anyhow", "enum-iterator", @@ -4379,8 +4514,8 @@ dependencies = [ [[package]] name = "snarkvm-console-network-environment" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "anyhow", "bech32", @@ -4397,8 +4532,8 @@ dependencies = [ [[package]] name = "snarkvm-console-program" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "enum-iterator", "enum_index", @@ -4406,6 +4541,7 @@ dependencies = [ "indexmap 2.8.0", "num-derive", "num-traits", + "seq-macro", "serde_json", "snarkvm-console-account", "snarkvm-console-algorithms", @@ -4417,8 +4553,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-address", @@ -4432,8 +4568,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-address" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4443,16 +4579,16 @@ dependencies = [ [[package]] name = "snarkvm-console-types-boolean" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-console-network-environment", ] [[package]] name = "snarkvm-console-types-field" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4461,8 +4597,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-group" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4472,8 +4608,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-integers" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4483,8 +4619,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-scalar" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4494,8 +4630,8 @@ dependencies = [ [[package]] name = "snarkvm-console-types-string" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-console-network-environment", "snarkvm-console-types-boolean", @@ -4505,8 +4641,8 @@ dependencies = [ [[package]] name = "snarkvm-curves" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "rand 0.8.5", "rayon", @@ -4519,8 +4655,8 @@ dependencies = [ [[package]] name = "snarkvm-fields" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "aleo-std", "anyhow", @@ -4536,8 +4672,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "aleo-std", "anyhow", @@ -4561,8 +4697,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-authority" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "anyhow", "rand 0.8.5", @@ -4573,9 +4709,10 @@ dependencies = [ [[package]] name = "snarkvm-ledger-block" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ + "anyhow", "indexmap 2.8.0", "rayon", "serde_json", @@ -4589,12 +4726,13 @@ dependencies = [ "snarkvm-ledger-puzzle", "snarkvm-synthesizer-program", "snarkvm-synthesizer-snark", + "snarkvm-utilities", ] [[package]] name = "snarkvm-ledger-committee" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4606,8 +4744,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-ledger-narwhal-batch-header", @@ -4619,8 +4757,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-certificate" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4632,8 +4770,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-batch-header" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4644,8 +4782,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-data" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "bytes", "serde_json", @@ -4655,8 +4793,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-subdag" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "indexmap 2.8.0", "rayon", @@ -4670,8 +4808,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "bytes", "serde_json", @@ -4683,8 +4821,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-narwhal-transmission-id" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "snarkvm-console", "snarkvm-ledger-puzzle", @@ -4692,8 +4830,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "aleo-std", "anyhow", @@ -4711,8 +4849,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-puzzle-epoch" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "aleo-std", "anyhow", @@ -4733,8 +4871,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-query" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "anyhow", "async-trait", @@ -4750,8 +4888,8 @@ dependencies = [ [[package]] name = "snarkvm-ledger-store" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "aleo-std-storage", "anyhow", @@ -4771,21 +4909,22 @@ dependencies = [ "snarkvm-ledger-puzzle", "snarkvm-synthesizer-program", "snarkvm-synthesizer-snark", + "snarkvm-utilities", "tracing", ] [[package]] name = "snarkvm-metrics" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "metrics", ] [[package]] name = "snarkvm-parameters" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "aleo-std", "anyhow", @@ -4806,8 +4945,8 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "aleo-std", "anyhow", @@ -4837,8 +4976,8 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-process" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "aleo-std", "colored 3.0.0", @@ -4861,9 +5000,10 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-program" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ + "enum-iterator", "indexmap 2.8.0", "paste", "rand 0.8.5", @@ -4879,8 +5019,8 @@ dependencies = [ [[package]] name = "snarkvm-synthesizer-snark" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "bincode", "serde_json", @@ -4892,8 +5032,8 @@ dependencies = [ [[package]] name = "snarkvm-utilities" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "aleo-std", "anyhow", @@ -4908,13 +5048,14 @@ dependencies = [ "smol_str", "snarkvm-utilities-derives", "thiserror 2.0.12", + "tracing", "zeroize", ] [[package]] name = "snarkvm-utilities-derives" -version = "4.1.0" -source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=fb8349c4f#fb8349c4fdbab3862915f6f44517319e5b43d981" +version = "4.2.1" +source = "git+https://github.com/ProvableHQ/snarkVM.git?rev=78a69b703#78a69b70387d917ed1c16a09741a5b6d16862f17" dependencies = [ "proc-macro2", "quote 1.0.40", diff --git a/Cargo.toml b/Cargo.toml index a9e31473..efe91ab4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -137,7 +137,7 @@ snops-common = { path = "./crates/common" } # snarkos-account = { path = "../snarkos/account" } # snarkos-node = { path = "../snarkos/node" } -# snarkvm = { path = "../snarkvm", features = ["rocks"] } +# snarkvm = { path = "../snarkvm", features = ["rocks", "circuit", "console"] } # snarkos-node-metrics = { path = "../snarkos/node/metrics" } ## Uncomment to use version-pinned dependencies @@ -149,18 +149,17 @@ snops-common = { path = "./crates/common" } ## Comment to use version-pinned or local dependencies -snarkos-account = { git = "https://github.com/ProvableHQ/snarkOS", rev = "9032343" } -snarkos-node = { git = "https://github.com/ProvableHQ/snarkOS", rev = "9032343" } -snarkos-node-metrics = { git = "https://github.com/ProvableHQ/snarkOS", rev = "9032343" } +snarkos-account = { git = "https://github.com/ProvableHQ/snarkOS", rev = "01b5f9c" } +snarkos-node = { git = "https://github.com/ProvableHQ/snarkOS", rev = "01b5f9c" } +snarkos-node-metrics = { git = "https://github.com/ProvableHQ/snarkOS", rev = "01b5f9c" } [workspace.dependencies.snarkvm] ## The following anchors are used by the `update_snarkos_dep.sh` script. ## Everything in-between the anchors is copied from the snarkos Cargo.toml ## CODEGEN_START #path = "../snarkVM" git = "https://github.com/ProvableHQ/snarkVM.git" -rev = "fb8349c4f" -#version = "=4.0.1" -default-features = false -#features = [ "circuit", "console", "rocks" ] +rev = "78a69b703" +#version = "=4.2.1" ## CODEGEN_END +default-features = false features = ["circuit", "rocks", "algorithms"] diff --git a/crates/aot/src/runner/metrics.rs b/crates/aot/src/runner/metrics.rs index f990fc61..14681349 100644 --- a/crates/aot/src/runner/metrics.rs +++ b/crates/aot/src/runner/metrics.rs @@ -3,9 +3,10 @@ use snarkos_node_metrics::{bft, blocks, consensus, router, tcp}; -pub const COUNTER_NAMES: [&str; 2] = [ +pub const COUNTER_NAMES: [&str; 3] = [ bft::LEADERS_ELECTED, - consensus::STALE_UNCONFIRMED_TRANSMISSIONS, + consensus::STALE_UNCONFIRMED_TRANSACTIONS, + consensus::STALE_UNCONFIRMED_SOLUTIONS, ]; pub const GAUGE_NAMES: [&str; 26] = [ diff --git a/crates/aot/src/runner/mod.rs b/crates/aot/src/runner/mod.rs index 03db2be5..0559cdda 100644 --- a/crates/aot/src/runner/mod.rs +++ b/crates/aot/src/runner/mod.rs @@ -201,11 +201,17 @@ impl Runner { .await .map_err(|e| e.context("create validator"))? } - NodeType::Prover => { - Node::new_prover(node_ip, account, &self.peers, genesis, None, shutdown) - .await - .map_err(|e| e.context("create prover"))? - } + NodeType::Prover => Node::new_prover( + node_ip, + account, + &self.peers, + genesis, + storage_mode.clone(), + None, + shutdown, + ) + .await + .map_err(|e| e.context("create prover"))?, NodeType::Client => Node::new_client( node_ip, Some(rest_ip), diff --git a/scripts/dep_utils.sh b/scripts/dep_utils.sh index 3fc40b27..1147a714 100755 --- a/scripts/dep_utils.sh +++ b/scripts/dep_utils.sh @@ -37,8 +37,8 @@ function get_snarkos_rev() { exit 1 fi - # Read the lines '[workspace.dependencies.snarkvm]' to ^features greedily - # Excluding the first line '[workspace.dependencies.snarkvm]' and the last line '^features' - SNARKVM_CARGO_DATA="$(echo "$SNARKOS_CARGO_TOML_DATA" | sed -nE '/\[workspace\.dependencies\.snarkvm\]/,/^\x23?features/ { /^features/!p }' | sed '1d')" + # Read the lines '[workspace.dependencies.snarkvm]' to '^default-features' greedily + # Excluding the first line '[workspace.dependencies.snarkvm]' and default-features + SNARKVM_CARGO_DATA="$(echo "$SNARKOS_CARGO_TOML_DATA" | sed -nE '/\[workspace\.dependencies\.snarkvm\]/,/^\default-features/ { /^default-features/!p }' | sed '1d')" } From 9afb24deb878f87cb3bcb22bebb289d59d1f7e08 Mon Sep 17 00:00:00 2001 From: Meshiest Date: Sun, 26 Oct 2025 22:20:19 -0400 Subject: [PATCH 07/10] ci(deps): update rust --- .github/workflows/pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index b01ab1f8..75e2d6d0 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -5,8 +5,8 @@ on: env: CARGO_TERM_COLOR: always RUST_BACKTRACE: 1 - # https://releases.rs/docs/1.83.0/ release date - NIGHTLY_TOOLCHAIN: nightly-2025-02-20 + # https://releases.rs/docs/1.88.0/ release date + NIGHTLY_TOOLCHAIN: nightly-2025-06-23 # Cancel in progress workflows on pull_requests. # https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value From 7b18094e86488e9c40993ba35959a2f45c1d2896 Mon Sep 17 00:00:00 2001 From: Meshiest Date: Sun, 26 Oct 2025 22:59:23 -0400 Subject: [PATCH 08/10] lint: fix checkpoint fmt lint --- crates/checkpoint/src/retention.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/checkpoint/src/retention.rs b/crates/checkpoint/src/retention.rs index 279a4b8f..2c7da191 100644 --- a/crates/checkpoint/src/retention.rs +++ b/crates/checkpoint/src/retention.rs @@ -331,12 +331,12 @@ impl std::fmt::Display for RetentionSpan { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { match self { RetentionSpan::Unlimited => write!(f, "U"), - RetentionSpan::Minute(value) => write!(f, "{}m", value), - RetentionSpan::Hour(value) => write!(f, "{}h", value), - RetentionSpan::Day(value) => write!(f, "{}D", value), - RetentionSpan::Week(value) => write!(f, "{}W", value), - RetentionSpan::Month(value) => write!(f, "{}M", value), - RetentionSpan::Year(value) => write!(f, "{}Y", value), + RetentionSpan::Minute(value) => write!(f, "{value}m"), + RetentionSpan::Hour(value) => write!(f, "{value}h"), + RetentionSpan::Day(value) => write!(f, "{value}D"), + RetentionSpan::Week(value) => write!(f, "{value}W"), + RetentionSpan::Month(value) => write!(f, "{value}M"), + RetentionSpan::Year(value) => write!(f, "{value}Y"), } } } From 652227e5f62e4db5e13aa847e2343ff3b4a4af24 Mon Sep 17 00:00:00 2001 From: Meshiest Date: Sun, 26 Oct 2025 23:08:54 -0400 Subject: [PATCH 09/10] chore: cargo clippy fix --- crates/agent/src/reconcile/address.rs | 2 +- crates/aot/src/ledger/query.rs | 4 ++-- crates/checkpoint/src/ledger.rs | 10 +++++----- crates/cli/src/commands/env/action/mod.rs | 4 ++-- crates/common/src/binaries.rs | 2 +- crates/common/src/events/filter.rs | 2 +- crates/common/src/events/models.rs | 2 +- crates/common/src/format/impl_strings.rs | 3 +-- crates/common/src/key_source.rs | 4 ++-- crates/common/src/node_targets.rs | 2 +- crates/common/src/state/height_request.rs | 2 +- crates/common/src/state/id.rs | 2 +- crates/controlplane/src/schema/storage/binaries.rs | 4 ++-- crates/controlplane/src/schema/storage/mod.rs | 2 +- 14 files changed, 22 insertions(+), 23 deletions(-) diff --git a/crates/agent/src/reconcile/address.rs b/crates/agent/src/reconcile/address.rs index 694b39b1..4d5df7b9 100644 --- a/crates/agent/src/reconcile/address.rs +++ b/crates/agent/src/reconcile/address.rs @@ -79,7 +79,7 @@ impl Reconcile<(), ReconcileError> for AddressResolveReconciler { "Resolved new addrs: {}", new_addrs .iter() - .map(|(id, addr)| format!("{}: {}", id, addr)) + .map(|(id, addr)| format!("{id}: {addr}")) .collect::>() .join(", ") ); diff --git a/crates/aot/src/ledger/query.rs b/crates/aot/src/ledger/query.rs index 4e3794f0..071c1571 100644 --- a/crates/aot/src/ledger/query.rs +++ b/crates/aot/src/ledger/query.rs @@ -141,12 +141,12 @@ impl LedgerQuery { }; match state.appender.clone() { - Some(mut a) => match write!(a, "{}", tx_json) { + Some(mut a) => match write!(a, "{tx_json}") { Ok(_) => StatusCode::OK, Err(_) => StatusCode::INTERNAL_SERVER_ERROR, }, _ => { - println!("{}", tx_json); + println!("{tx_json}"); StatusCode::OK } } diff --git a/crates/checkpoint/src/ledger.rs b/crates/checkpoint/src/ledger.rs index b076b4c3..95ba7a57 100644 --- a/crates/checkpoint/src/ledger.rs +++ b/crates/checkpoint/src/ledger.rs @@ -213,7 +213,7 @@ impl Stores { None => bail!("Failed to get the program ID for transaction '{transaction_id}'"), }; // Retrieve the edition. - let edition = match db.get_edition_for_transaction(&transaction_id)? { + let edition = match db.get_edition_for_transaction(transaction_id)? { Some(edition) => edition, None => bail!("Failed to locate the edition for program '{program_id}'"), }; @@ -281,9 +281,9 @@ impl Stores { // Remove the execution. for transition_id in transition_ids { // Remove the transition ID. - db.reverse_id_map().remove(&transition_id)?; + db.reverse_id_map().remove(transition_id)?; // Remove the transition. - self.fast_transition_remove(&transition_id)?; + self.fast_transition_remove(transition_id)?; } // Remove the global state root and proof. @@ -312,10 +312,10 @@ impl Stores { // Remove the fee. db.fee_map().remove(transaction_id)?; - db.reverse_fee_map().remove(&transition_id)?; + db.reverse_fee_map().remove(transition_id)?; // Remove the fee transition. - self.fast_transition_remove(&transition_id)?; + self.fast_transition_remove(transition_id)?; Ok(()) } diff --git a/crates/cli/src/commands/env/action/mod.rs b/crates/cli/src/commands/env/action/mod.rs index 59cda42f..0c3ed83a 100644 --- a/crates/cli/src/commands/env/action/mod.rs +++ b/crates/cli/src/commands/env/action/mod.rs @@ -240,7 +240,7 @@ impl Action { inputs, async_mode, } => { - let ep = format!("{url}/api/v1/env/{}/action/execute", env_id); + let ep = format!("{url}/api/v1/env/{env_id}/action/execute"); let (program, function) = locator .split_once('/') @@ -289,7 +289,7 @@ impl Action { async_mode, program, } => { - let ep = format!("{url}/api/v1/env/{}/action/deploy", env_id); + let ep = format!("{url}/api/v1/env/{env_id}/action/deploy"); let mut json = json!({ "program": program.contents()?, diff --git a/crates/common/src/binaries.rs b/crates/common/src/binaries.rs index c019aef9..fdc2fc0c 100644 --- a/crates/common/src/binaries.rs +++ b/crates/common/src/binaries.rs @@ -110,7 +110,7 @@ pub enum BinarySource { impl Display for BinarySource { fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { match self { - BinarySource::Url(url) => write!(f, "{}", url), + BinarySource::Url(url) => write!(f, "{url}"), BinarySource::Path(path) => write!(f, "{}", path.display()), } } diff --git a/crates/common/src/events/filter.rs b/crates/common/src/events/filter.rs index ba506cad..d7d8d606 100644 --- a/crates/common/src/events/filter.rs +++ b/crates/common/src/events/filter.rs @@ -91,7 +91,7 @@ impl Display for EventFilter { EventFilter::AllOf(vec) => write!(f, "all-of({})", event_filter_vec(vec)), EventFilter::AnyOf(vec) => write!(f, "any-of({})", event_filter_vec(vec)), EventFilter::OneOf(vec) => write!(f, "one-of({})", event_filter_vec(vec)), - EventFilter::Not(event_filter) => write!(f, "not({})", event_filter), + EventFilter::Not(event_filter) => write!(f, "not({event_filter})"), EventFilter::AgentIs(id) => write!(f, "agent-is({id})"), EventFilter::HasAgent => write!(f, "has-agent"), EventFilter::EnvIs(id) => write!(f, "env-is({id})"), diff --git a/crates/common/src/events/models.rs b/crates/common/src/events/models.rs index b030a6b5..918ab21f 100644 --- a/crates/common/src/events/models.rs +++ b/crates/common/src/events/models.rs @@ -208,7 +208,7 @@ impl Display for EventKindFilter { TransactionConfirmed => "transaction-confirmed", }; - write!(f, "{}", s) + write!(f, "{s}") } } diff --git a/crates/common/src/format/impl_strings.rs b/crates/common/src/format/impl_strings.rs index 6934b33c..c8a1ea88 100644 --- a/crates/common/src/format/impl_strings.rs +++ b/crates/common/src/format/impl_strings.rs @@ -20,8 +20,7 @@ impl DataFormat for String { let read_len = reader.take(len as u64).read_to_string(&mut buf)?; if read_len != len { return Err(DataReadError::Custom(format!( - "string expected to read {} bytes, but read {}", - len, read_len + "string expected to read {len} bytes, but read {read_len}" ))); } Ok(buf) diff --git a/crates/common/src/key_source.rs b/crates/common/src/key_source.rs index 9f39d4e8..d95d753c 100644 --- a/crates/common/src/key_source.rs +++ b/crates/common/src/key_source.rs @@ -144,11 +144,11 @@ impl fmt::Display for KeySource { KeySource::PublicKeyLiteral(key) => key.to_owned(), KeySource::Committee(None) => "committee.$".to_owned(), KeySource::Committee(Some(idx)) => { - format!("committee.{}", idx) + format!("committee.{idx}") } KeySource::Named(name, None) => format!("{}.{}", name, "$"), KeySource::Named(name, Some(idx)) => { - format!("{}.{}", name, idx) + format!("{name}.{idx}") } } ) diff --git a/crates/common/src/node_targets.rs b/crates/common/src/node_targets.rs index 298eb073..e2fd7b7e 100644 --- a/crates/common/src/node_targets.rs +++ b/crates/common/src/node_targets.rs @@ -239,7 +239,7 @@ impl fmt::Display for NodeTarget { match &self.ns { NodeTargetNamespace::All => "@any".to_owned(), NodeTargetNamespace::Local => "".to_owned(), - NodeTargetNamespace::Literal(ns) => format!("@{}", ns), + NodeTargetNamespace::Literal(ns) => format!("@{ns}"), } ) } diff --git a/crates/common/src/state/height_request.rs b/crates/common/src/state/height_request.rs index 162b1c9e..80ecdc3a 100644 --- a/crates/common/src/state/height_request.rs +++ b/crates/common/src/state/height_request.rs @@ -16,7 +16,7 @@ impl FromStr for HeightRequest { } else if let Ok(span) = s.parse() { Ok(HeightRequest::Checkpoint(span)) } else { - Err(format!("invalid HeightRequest: {}", s)) + Err(format!("invalid HeightRequest: {s}")) } } } diff --git a/crates/common/src/state/id.rs b/crates/common/src/state/id.rs index 99b630eb..4eed124f 100644 --- a/crates/common/src/state/id.rs +++ b/crates/common/src/state/id.rs @@ -12,7 +12,7 @@ pub struct InternedId(lasso::Spur); impl InternedId { pub fn rand() -> Self { let id = rand::thread_rng().next_u32(); - Self(INTERN.get_or_intern(format!("unknown-{}", id))) + Self(INTERN.get_or_intern(format!("unknown-{id}"))) } pub fn into_inner(self) -> u32 { diff --git a/crates/controlplane/src/schema/storage/binaries.rs b/crates/controlplane/src/schema/storage/binaries.rs index 8b9ec320..cc15e987 100644 --- a/crates/controlplane/src/schema/storage/binaries.rs +++ b/crates/controlplane/src/schema/storage/binaries.rs @@ -44,7 +44,7 @@ fn env_or_bin(name: &str, env: &str) -> BinaryEntry { source: source.clone(), }; - if let Ok(size) = std::env::var(format!("{}_SIZE", env)) { + if let Ok(size) = std::env::var(format!("{env}_SIZE")) { entry.size = if size == "auto" { match &source { @@ -65,7 +65,7 @@ fn env_or_bin(name: &str, env: &str) -> BinaryEntry { })) }; } - if let Ok(sha256) = std::env::var(format!("{}_SHA256", env)) { + if let Ok(sha256) = std::env::var(format!("{env}_SHA256")) { if sha256 == "auto" { match &source { BinarySource::Url(_) => { diff --git a/crates/controlplane/src/schema/storage/mod.rs b/crates/controlplane/src/schema/storage/mod.rs index eb06cdd0..534aebae 100644 --- a/crates/controlplane/src/schema/storage/mod.rs +++ b/crates/controlplane/src/schema/storage/mod.rs @@ -377,7 +377,7 @@ impl Document { if let Some(generation) = &self.generate { for (name, account) in &generation.accounts { - let path = base.join(format!("{}.json", name)); + let path = base.join(format!("{name}.json")); if !path.exists() { info!("generating accounts for {name}"); From 8cbaba747d6d7e1d24d125ea378a5ad8423d6687 Mon Sep 17 00:00:00 2001 From: Meshiest Date: Sun, 26 Oct 2025 23:14:33 -0400 Subject: [PATCH 10/10] lint: fix partial comp --- crates/common/src/state/id.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/common/src/state/id.rs b/crates/common/src/state/id.rs index 4eed124f..0547de4d 100644 --- a/crates/common/src/state/id.rs +++ b/crates/common/src/state/id.rs @@ -36,7 +36,7 @@ impl Default for InternedId { impl std::cmp::PartialOrd for InternedId { fn partial_cmp(&self, other: &Self) -> Option { - Some(std::convert::AsRef::::as_ref(self).cmp(other.as_ref())) + Some(self.cmp(other)) } }