diff --git a/Cargo.lock b/Cargo.lock index 95ec2f5783..368d4e796d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -36,16 +36,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "aead" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" -dependencies = [ - "crypto-common", - "generic-array", -] - [[package]] name = "aes" version = "0.8.3" @@ -57,20 +47,6 @@ dependencies = [ "cpufeatures", ] -[[package]] -name = "aes-gcm" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", - "subtle", -] - [[package]] name = "ahash" version = "0.8.7" @@ -257,17 +233,6 @@ dependencies = [ "wait-timeout", ] -[[package]] -name = "async-recursion" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" -dependencies = [ - "proc-macro2", - "quote 1.0.35", - "syn 2.0.48", -] - [[package]] name = "async-trait" version = "0.1.77" @@ -285,92 +250,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "axum" -version = "0.6.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" -dependencies = [ - "async-trait", - "axum-core", - "bitflags 1.3.2", - "bytes", - "futures-util", - "headers", - "http 0.2.11", - "http-body", - "hyper", - "itoa", - "matchit", - "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", -] - -[[package]] -name = "axum-core" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http 0.2.11", - "http-body", - "mime", - "rustversion", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-extra" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ab90e7b70bea63a153137162affb6a0bce26b584c24a4c7885509783e2cf30b" -dependencies = [ - "axum", - "axum-core", - "bytes", - "futures-util", - "http 0.2.11", - "http-body", - "mime", - "pin-project-lite", - "serde", - "serde_json", - "tokio", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "backoff" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" -dependencies = [ - "futures-core", - "getrandom", - "instant", - "pin-project-lite", - "rand", - "tokio", -] - [[package]] name = "backtrace" version = "0.3.69" @@ -413,27 +292,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bindgen" -version = "0.65.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "peeking_take_while", - "prettyplease", - "proc-macro2", - "quote 1.0.35", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.48", -] - [[package]] name = "bitflags" version = "1.3.2" @@ -491,7 +349,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" dependencies = [ "memchr", - "regex-automata 0.4.3", + "regex-automata", "serde", ] @@ -534,12 +392,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "cassowary" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" - [[package]] name = "cast" version = "0.3.0" @@ -556,45 +408,12 @@ dependencies = [ "libc", ] -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom", -] - [[package]] name = "cfg-if" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "chacha20" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "chacha20poly1305" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" -dependencies = [ - "aead", - "chacha20", - "cipher", - "poly1305", - "zeroize", -] - [[package]] name = "ci_info" version = "0.10.2" @@ -639,18 +458,6 @@ checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ "crypto-common", "inout", - "zeroize", -] - -[[package]] -name = "clang-sys" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" -dependencies = [ - "glob", - "libc", - "libloading", ] [[package]] @@ -851,47 +658,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "crossterm" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" -dependencies = [ - "bitflags 1.3.2", - "crossterm_winapi", - "libc", - "mio", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" -dependencies = [ - "bitflags 2.4.1", - "crossterm_winapi", - "libc", - "mio", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" -dependencies = [ - "winapi", -] - [[package]] name = "crunchy" version = "0.2.2" @@ -905,19 +671,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core", "typenum", ] -[[package]] -name = "ctr" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" -dependencies = [ - "cipher", -] - [[package]] name = "curl" version = "0.4.44" @@ -1294,7 +1050,6 @@ dependencies = [ "futures-core", "futures-task", "futures-util", - "num_cpus", ] [[package]] @@ -1303,17 +1058,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" -[[package]] -name = "futures-macro" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" -dependencies = [ - "proc-macro2", - "quote 1.0.35", - "syn 2.0.48", -] - [[package]] name = "futures-sink" version = "0.3.30" @@ -1335,7 +1079,6 @@ dependencies = [ "futures-channel", "futures-core", "futures-io", - "futures-macro", "futures-sink", "futures-task", "memchr", @@ -1379,20 +1122,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi", - "wasm-bindgen", -] - -[[package]] -name = "ghash" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" -dependencies = [ - "opaque-debug", - "polyval", ] [[package]] @@ -1401,12 +1132,6 @@ version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - [[package]] name = "h2" version = "0.3.22" @@ -1418,7 +1143,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http 0.2.11", + "http", "indexmap 2.1.0", "slab", "tokio", @@ -1438,15 +1163,6 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -[[package]] -name = "hashbrown" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038" -dependencies = [ - "ahash", -] - [[package]] name = "hashbrown" version = "0.14.3" @@ -1457,30 +1173,6 @@ dependencies = [ "allocator-api2", ] -[[package]] -name = "headers" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" -dependencies = [ - "base64", - "bytes", - "headers-core", - "http 0.2.11", - "httpdate", - "mime", - "sha1", -] - -[[package]] -name = "headers-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" -dependencies = [ - "http 0.2.11", -] - [[package]] name = "heck" version = "0.4.1" @@ -1519,17 +1211,6 @@ dependencies = [ "itoa", ] -[[package]] -name = "http" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - [[package]] name = "http-body" version = "0.4.6" @@ -1537,16 +1218,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.11", + "http", "pin-project-lite", ] -[[package]] -name = "http-range-header" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" - [[package]] name = "httparse" version = "1.8.0" @@ -1570,7 +1245,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http 0.2.11", + "http", "http-body", "httparse", "httpdate", @@ -1728,33 +1403,12 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "jsonwebtoken" -version = "9.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7ea04a7c5c055c175f189b6dc6ba036fd62306b58c66c9f6389036c503a3f4" -dependencies = [ - "base64", - "js-sys", - "pem", - "ring", - "serde", - "serde_json", - "simple_asn1", -] - [[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - [[package]] name = "leo-abnf" version = "1.10.0" @@ -1847,7 +1501,6 @@ dependencies = [ "serde", "serde_json", "serial_test", - "snarkos-cli", "snarkvm", "sys-info", "test_dir", @@ -1870,7 +1523,6 @@ dependencies = [ "retriever", "serde", "serial_test", - "snarkos-cli", "snarkvm", "toml 0.8.8", "tracing", @@ -1945,16 +1597,6 @@ version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" -[[package]] -name = "libloading" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "libredox" version = "0.0.1" @@ -1966,21 +1608,6 @@ dependencies = [ "redox_syscall", ] -[[package]] -name = "librocksdb-sys" -version = "0.11.0+8.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e" -dependencies = [ - "bindgen", - "bzip2-sys", - "cc", - "glob", - "libc", - "libz-sys", - "lz4-sys", -] - [[package]] name = "libz-sys" version = "1.1.12" @@ -2021,119 +1648,12 @@ version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" -[[package]] -name = "lru" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" -dependencies = [ - "hashbrown 0.14.3", -] - -[[package]] -name = "lz4-sys" -version = "1.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "mach2" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" -dependencies = [ - "libc", -] - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "matchit" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" - [[package]] name = "memchr" version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "metrics" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde3af1a009ed76a778cb84fdef9e7dbbdf5775ae3e4cc1f434a6a307f6f76c5" -dependencies = [ - "ahash", - "metrics-macros", - "portable-atomic", -] - -[[package]] -name = "metrics-exporter-prometheus" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d4fa7ce7c4862db464a37b0b31d89bca874562f034bd7993895572783d02950" -dependencies = [ - "base64", - "hyper", - "indexmap 1.9.3", - "ipnet", - "metrics", - "metrics-util", - "quanta", - "thiserror", - "tokio", - "tracing", -] - -[[package]] -name = "metrics-macros" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b4faf00617defe497754acde3024865bc143d44a86799b24e191ecff91354f" -dependencies = [ - "proc-macro2", - "quote 1.0.35", - "syn 2.0.48", -] - -[[package]] -name = "metrics-util" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4de2ed6e491ed114b40b732e4d1659a9d53992ebd87490c44a6ffe23739d973e" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", - "hashbrown 0.13.1", - "metrics", - "num_cpus", - "quanta", - "sketches-ddsketch", -] - [[package]] name = "mime" version = "0.3.17" @@ -2172,7 +1692,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", - "log", "wasi", "windows-sys 0.48.0", ] @@ -2201,19 +1720,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab250442c86f1850815b5d268639dff018c0627022bc1940eb2d642ca1ce12f0" -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset", - "pin-utils", -] - [[package]] name = "nom" version = "7.1.3" @@ -2315,9 +1821,6 @@ name = "once_cell" version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -dependencies = [ - "parking_lot_core", -] [[package]] name = "oorandom" @@ -2325,12 +1828,6 @@ version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - [[package]] name = "openssl" version = "0.10.62" @@ -2439,48 +1936,12 @@ dependencies = [ "sha2", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - -[[package]] -name = "pem" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" -dependencies = [ - "base64", - "serde", -] - [[package]] name = "percent-encoding" version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "pin-project" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" -dependencies = [ - "proc-macro2", - "quote 1.0.35", - "syn 2.0.48", -] - [[package]] name = "pin-project-lite" version = "0.2.13" @@ -2543,29 +2004,6 @@ dependencies = [ "plotters-backend", ] -[[package]] -name = "poly1305" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" -dependencies = [ - "cpufeatures", - "opaque-debug", - "universal-hash", -] - -[[package]] -name = "polyval" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" -dependencies = [ - "cfg-if", - "cpufeatures", - "opaque-debug", - "universal-hash", -] - [[package]] name = "portable-atomic" version = "1.6.0" @@ -2612,16 +2050,6 @@ dependencies = [ "termtree", ] -[[package]] -name = "prettyplease" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" -dependencies = [ - "proc-macro2", - "syn 2.0.48", -] - [[package]] name = "proc-macro2" version = "1.0.75" @@ -2631,22 +2059,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "quanta" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab" -dependencies = [ - "crossbeam-utils", - "libc", - "mach2", - "once_cell", - "raw-cpuid", - "wasi", - "web-sys", - "winapi", -] - [[package]] name = "quick-xml" version = "0.23.1" @@ -2710,15 +2122,6 @@ dependencies = [ "rand_core", ] -[[package]] -name = "raw-cpuid" -version = "10.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "rayon" version = "1.8.0" @@ -2767,17 +2170,8 @@ checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", + "regex-automata", + "regex-syntax", ] [[package]] @@ -2788,15 +2182,9 @@ checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax", ] -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - [[package]] name = "regex-syntax" version = "0.8.2" @@ -2815,7 +2203,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http 0.2.11", + "http", "http-body", "hyper", "hyper-tls", @@ -2876,28 +2264,12 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "rocksdb" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe" -dependencies = [ - "libc", - "librocksdb-sys", -] - [[package]] name = "rustc-demangle" version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustc_version" version = "0.4.0" @@ -2942,12 +2314,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - [[package]] name = "rusty-hook" version = "0.11.2" @@ -3118,16 +2484,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_path_to_error" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd154a240de39fdebcf5775d2675c204d7c13cf39a4c697be6493c8e734337c" -dependencies = [ - "itoa", - "serde", -] - [[package]] name = "serde_spanned" version = "0.6.5" @@ -3217,42 +2573,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shlex" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" - -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-mio" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -dependencies = [ - "libc", - "mio", - "signal-hook", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - [[package]] name = "signature" version = "2.2.0" @@ -3263,24 +2583,6 @@ dependencies = [ "rand_core", ] -[[package]] -name = "simple_asn1" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" -dependencies = [ - "num-bigint", - "num-traits", - "thiserror", - "time", -] - -[[package]] -name = "sketches-ddsketch" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a406c1882ed7f29cd5e248c9848a80e7cb6ae0fea82346d2746f2f941c07e1" - [[package]] name = "slab" version = "0.4.9" @@ -3308,376 +2610,6 @@ dependencies = [ "serde", ] -[[package]] -name = "snarkos-account" -version = "2.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0057351d17108cfe3e0a1d79a3daeec69656e549a98d3837b2a600b0fef0251" -dependencies = [ - "anyhow", - "colored", - "rand", - "snarkvm", -] - -[[package]] -name = "snarkos-cli" -version = "2.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f3b0864a6b4add97c35bbb9141f5ec95ac0adb9e149aecdd2376ade8e25819" -dependencies = [ - "aleo-std", - "anstyle", - "anyhow", - "bincode", - "clap", - "colored", - "crossterm 0.27.0", - "indexmap 2.1.0", - "nix", - "num_cpus", - "parking_lot", - "rand", - "rand_chacha", - "rayon", - "self_update 0.39.0", - "serde", - "serde_json", - "snarkos-account", - "snarkos-display", - "snarkos-node", - "snarkos-node-cdn", - "snarkos-node-metrics", - "snarkos-node-rest", - "snarkvm", - "sys-info", - "thiserror", - "tokio", - "tracing-subscriber", - "ureq", -] - -[[package]] -name = "snarkos-display" -version = "2.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58591ca2c2ecb9b87b81fa7801f28670a818214b42070c8256fa6de4ed999b34" -dependencies = [ - "anyhow", - "crossterm 0.27.0", - "snarkos-node", - "snarkvm", - "tokio", - "tui", -] - -[[package]] -name = "snarkos-node" -version = "2.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7571262ed633a61d85dfe77ee7e56536662a29e4e4c86242ff2c79977e086f0b" -dependencies = [ - "aleo-std", - "anyhow", - "async-trait", - "colored", - "futures-util", - "indexmap 2.1.0", - "num_cpus", - "once_cell", - "parking_lot", - "rand", - "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", - "snarkos-node-tcp", - "snarkvm", - "time", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "snarkos-node-bft" -version = "2.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a255ef99e9a686b2dfd752f7818adb41307f921add20e37c7ab1cf9b0ccfed2c" -dependencies = [ - "anyhow", - "async-recursion", - "async-trait", - "bytes", - "colored", - "futures", - "indexmap 2.1.0", - "parking_lot", - "rand", - "rayon", - "serde", - "sha2", - "snarkos-account", - "snarkos-node-bft-events", - "snarkos-node-bft-ledger-service", - "snarkos-node-bft-storage-service", - "snarkos-node-metrics", - "snarkos-node-sync", - "snarkos-node-tcp", - "snarkvm", - "snow", - "time", - "tokio", - "tokio-stream", - "tokio-util", - "tracing", -] - -[[package]] -name = "snarkos-node-bft-events" -version = "2.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cedb2347053a728c4f8a902f5e7fb823d8450d18ccabae33aee1c2c9c7bc1a" -dependencies = [ - "anyhow", - "bytes", - "indexmap 2.1.0", - "rayon", - "serde", - "snarkos-node-metrics", - "snarkos-node-sync-locators", - "snarkvm", - "snow", - "tokio-util", - "tracing", -] - -[[package]] -name = "snarkos-node-bft-ledger-service" -version = "2.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622519cc68ba7b5857a84148b6b23794089229fdb39c1d41c56c1314b77132c2" -dependencies = [ - "async-trait", - "indexmap 2.1.0", - "rand", - "snarkvm", - "tokio", - "tracing", -] - -[[package]] -name = "snarkos-node-bft-storage-service" -version = "2.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be8e3687de55a8fc52ee1a07cdd95a5c9946562ac05a06f2df7d0af4951fda6" -dependencies = [ - "indexmap 2.1.0", - "parking_lot", - "snarkvm", - "tracing", -] - -[[package]] -name = "snarkos-node-cdn" -version = "2.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d98073a0477176388926c20ee1fe7ffe1f5677630448fbf95ea8e16fd8132a" -dependencies = [ - "anyhow", - "backoff", - "bincode", - "colored", - "futures", - "parking_lot", - "rayon", - "reqwest", - "serde", - "serde_json", - "snarkvm", - "tokio", - "tracing", -] - -[[package]] -name = "snarkos-node-consensus" -version = "2.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5731dbd576f3cb110b6a75b3452fa8298197730d1a788da728a01b176c7b90d" -dependencies = [ - "anyhow", - "colored", - "indexmap 2.1.0", - "lru", - "parking_lot", - "rand", - "snarkos-account", - "snarkos-node-bft", - "snarkos-node-bft-ledger-service", - "snarkos-node-bft-storage-service", - "snarkos-node-metrics", - "snarkvm", - "tokio", - "tracing", -] - -[[package]] -name = "snarkos-node-metrics" -version = "2.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f8dfc02b2dea898c796a729122bc8f5b12e34c5ad1681e71370f470d4686111" -dependencies = [ - "metrics", - "metrics-exporter-prometheus", - "snarkvm", - "tokio", -] - -[[package]] -name = "snarkos-node-rest" -version = "2.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb6d13284aa70ff244932af67d74aeab1eca9635e0723b6b9ede4cc71857f7fc" -dependencies = [ - "anyhow", - "axum", - "axum-extra", - "http 1.0.0", - "indexmap 2.1.0", - "jsonwebtoken", - "once_cell", - "parking_lot", - "rand", - "rayon", - "serde", - "serde_json", - "snarkos-node-consensus", - "snarkos-node-router", - "snarkvm", - "time", - "tokio", - "tower-http", - "tracing", -] - -[[package]] -name = "snarkos-node-router" -version = "2.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2649b18700e034d6e1ae085c6e0f797a7117995f78452f096c22d9a43e407c1" -dependencies = [ - "anyhow", - "async-trait", - "bincode", - "bytes", - "colored", - "futures", - "indexmap 2.1.0", - "linked-hash-map", - "parking_lot", - "rand", - "reqwest", - "serde", - "snarkos-account", - "snarkos-node-metrics", - "snarkos-node-router-messages", - "snarkos-node-sync-locators", - "snarkos-node-tcp", - "snarkvm", - "time", - "tokio", - "tokio-stream", - "tokio-util", - "tracing", -] - -[[package]] -name = "snarkos-node-router-messages" -version = "2.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4d944e2183d71d5bf9b68c5eb8a9141abf9710996556859fa5b23932ab4d628" -dependencies = [ - "anyhow", - "bytes", - "indexmap 2.1.0", - "rayon", - "serde", - "snarkos-node-bft-events", - "snarkos-node-sync-locators", - "snarkvm", - "snow", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "snarkos-node-sync" -version = "2.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d7c347a5e1f90619f3b608d0d6a02174ac2e690474aaef4127335f48bc0795" -dependencies = [ - "anyhow", - "indexmap 2.1.0", - "itertools 0.12.0", - "once_cell", - "parking_lot", - "rand", - "serde", - "snarkos-node-bft-ledger-service", - "snarkos-node-sync-communication-service", - "snarkos-node-sync-locators", - "snarkvm", - "tokio", - "tracing", -] - -[[package]] -name = "snarkos-node-sync-communication-service" -version = "2.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb9c67ce191470fc34660b011db15584fce6f57d6de60c26d22ad7c562a5c55" -dependencies = [ - "async-trait", - "tokio", -] - -[[package]] -name = "snarkos-node-sync-locators" -version = "2.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c0120cc26d081132a64fac21e79c52b0fdad64c349702f78411f486bbeb743a" -dependencies = [ - "anyhow", - "indexmap 2.1.0", - "serde", - "snarkvm", - "tracing", -] - -[[package]] -name = "snarkos-node-tcp" -version = "2.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c27e06f7691728de00228bced9b1eb69d92799df65b5a4740c4f9b452b970e" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "once_cell", - "parking_lot", - "snarkos-node-metrics", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "snarkvm" version = "0.16.15" @@ -3700,7 +2632,6 @@ dependencies = [ "snarkvm-circuit", "snarkvm-console", "snarkvm-ledger", - "snarkvm-metrics", "snarkvm-parameters", "snarkvm-synthesizer", "snarkvm-utilities", @@ -4278,7 +3209,6 @@ dependencies = [ "indexmap 2.1.0", "serde_json", "snarkvm-console", - "snarkvm-metrics", ] [[package]] @@ -4392,14 +3322,11 @@ version = "0.16.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56a3aac4e1dc3fd253b71ea018b0159364c501cc8f576924e491f50664d13c7c" dependencies = [ - "aleo-std", "anyhow", "bincode", "indexmap 2.1.0", - "once_cell", "parking_lot", "rayon", - "rocksdb", "serde", "snarkvm-console", "snarkvm-ledger-authority", @@ -4409,17 +3336,6 @@ dependencies = [ "snarkvm-ledger-narwhal-batch-certificate", "snarkvm-synthesizer-program", "snarkvm-synthesizer-snark", - "tracing", -] - -[[package]] -name = "snarkvm-metrics" -version = "0.16.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a89c911acab53cd3e0b76f5ea7289f71c84dceab4511af0e523113ce4aeb719e" -dependencies = [ - "metrics", - "metrics-exporter-prometheus", ] [[package]] @@ -4560,22 +3476,6 @@ dependencies = [ "syn 2.0.48", ] -[[package]] -name = "snow" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58021967fd0a5eeeb23b08df6cc244a4d4a5b4aec1d27c9e02fad1a58b4cd74e" -dependencies = [ - "aes-gcm", - "blake2", - "chacha20poly1305", - "curve25519-dalek", - "rand_core", - "rustc_version", - "sha2", - "subtle", -] - [[package]] name = "socket2" version = "0.4.10" @@ -4657,12 +3557,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 = "synom" version = "0.11.3" @@ -4777,11 +3671,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" dependencies = [ "deranged", - "itoa", "powerfmt", "serde", "time-core", - "time-macros", ] [[package]] @@ -4790,15 +3682,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" -[[package]] -name = "time-macros" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" -dependencies = [ - "time-core", -] - [[package]] name = "tiny-keccak" version = "2.0.2" @@ -4844,25 +3727,11 @@ dependencies = [ "libc", "mio", "num_cpus", - "parking_lot", "pin-project-lite", - "signal-hook-registry", "socket2 0.5.5", - "tokio-macros", "windows-sys 0.48.0", ] -[[package]] -name = "tokio-macros" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" -dependencies = [ - "proc-macro2", - "quote 1.0.35", - "syn 2.0.48", -] - [[package]] name = "tokio-native-tls" version = "0.3.1" @@ -4873,17 +3742,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-stream" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-util" version = "0.7.10" @@ -4941,47 +3799,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" -dependencies = [ - "bitflags 2.4.1", - "bytes", - "futures-core", - "futures-util", - "http 0.2.11", - "http-body", - "http-range-header", - "pin-project-lite", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - [[package]] name = "tower-service" version = "0.3.2" @@ -4994,7 +3811,6 @@ version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -5038,14 +3854,10 @@ version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ - "matchers", "nu-ansi-term", - "once_cell", - "regex", "sharded-slab", "smallvec", "thread_local", - "tracing", "tracing-core", "tracing-log", ] @@ -5056,19 +3868,6 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" -[[package]] -name = "tui" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1" -dependencies = [ - "bitflags 1.3.2", - "cassowary", - "crossterm 0.25.0", - "unicode-segmentation", - "unicode-width", -] - [[package]] name = "typenum" version = "1.17.0" @@ -5105,12 +3904,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - [[package]] name = "unicode-width" version = "0.1.11" @@ -5123,16 +3916,6 @@ version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" -[[package]] -name = "universal-hash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" -dependencies = [ - "crypto-common", - "subtle", -] - [[package]] name = "untrusted" version = "0.9.0" diff --git a/Cargo.toml b/Cargo.toml index 8df5e35276..f8fd3732c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -150,8 +150,8 @@ version = "1.0" [dependencies.serial_test] version = "2.0.0" -[dependencies.snarkos-cli] -version = "2.2.4" +#[dependencies.snarkos-cli] +#version = "2.2.4" [dependencies.snarkvm] workspace = true diff --git a/errors/src/errors/package/package_errors.rs b/errors/src/errors/package/package_errors.rs index 637aad11cb..d98776635d 100644 --- a/errors/src/errors/package/package_errors.rs +++ b/errors/src/errors/package/package_errors.rs @@ -363,4 +363,11 @@ create_messages!( help: Some("Delete the lock file and rebuild the project".to_string()), } + @backtraced + unimplemented_command { + args: (command: impl Display), + msg: format!("The `{command}` command is not implemented."), + help: None, + } + ); diff --git a/leo/cli/commands/deploy.rs b/leo/cli/commands/deploy.rs index 175f2f301b..a002363d4a 100644 --- a/leo/cli/commands/deploy.rs +++ b/leo/cli/commands/deploy.rs @@ -15,9 +15,7 @@ // along with the Leo library. If not, see . use super::*; -use snarkos_cli::commands::{Deploy as SnarkOSDeploy, Developer}; -use snarkvm::cli::helpers::dotenv_private_key; -use std::path::PathBuf; +//use snarkos_cli::commands::{Deploy as SnarkOSDeploy, Developer}; /// Deploys an Aleo program. #[derive(Parser, Debug)] @@ -53,55 +51,55 @@ impl Command for Deploy { Ok(()) } - fn apply(self, context: Context, _: Self::Input) -> Result { - // Get the program name - let project_name = context.open_manifest()?.program_id().to_string(); + fn apply(self, _context: Context, _: Self::Input) -> Result { + // // Get the program name + // let project_name = context.open_manifest()?.program_id().to_string(); + // + // // Get the private key + // let mut private_key = self.private_key; + // if private_key.is_none() { + // private_key = + // Some(dotenv_private_key().map_err(CliError::failed_to_read_environment_private_key)?.to_string()); + // } + // + // let mut all_paths: Vec<(String, PathBuf)> = Vec::new(); + // + // // Extract post-ordered list of local dependencies' paths from `leo.lock` + // if !self.non_recursive { + // all_paths = context.local_dependency_paths()?; + // } + // + // // Add the parent program to be deployed last + // all_paths.push((project_name, context.dir()?.join("build"))); + // + // for (index, (name, path)) in all_paths.iter().enumerate() { + // // Set deploy arguments + // let deploy = SnarkOSDeploy::try_parse_from([ + // "snarkos", + // "--private-key", + // private_key.as_ref().unwrap(), + // "--query", + // self.endpoint.as_str(), + // "--priority-fee", + // self.priority_fee.as_str(), + // "--path", + // path.to_str().unwrap(), + // "--broadcast", + // format!("{}/{}/transaction/broadcast", self.endpoint, self.network).as_str(), + // &name, + // ]) + // .unwrap(); + // + // // Deploy program + // Developer::Deploy(deploy).parse().map_err(CliError::failed_to_execute_deploy)?; + // + // // Sleep for `wait_gap` seconds. + // // This helps avoid parents from being serialized before children. + // if index < all_paths.len() - 1 { + // std::thread::sleep(std::time::Duration::from_secs(self.wait_gap)); + // } + // } - // Get the private key - let mut private_key = self.private_key; - if private_key.is_none() { - private_key = - Some(dotenv_private_key().map_err(CliError::failed_to_read_environment_private_key)?.to_string()); - } - - let mut all_paths: Vec<(String, PathBuf)> = Vec::new(); - - // Extract post-ordered list of local dependencies' paths from `leo.lock` - if !self.non_recursive { - all_paths = context.local_dependency_paths()?; - } - - // Add the parent program to be deployed last - all_paths.push((project_name, context.dir()?.join("build"))); - - for (index, (name, path)) in all_paths.iter().enumerate() { - // Set deploy arguments - let deploy = SnarkOSDeploy::try_parse_from([ - "snarkos", - "--private-key", - private_key.as_ref().unwrap(), - "--query", - self.endpoint.as_str(), - "--priority-fee", - self.priority_fee.as_str(), - "--path", - path.to_str().unwrap(), - "--broadcast", - format!("{}/{}/transaction/broadcast", self.endpoint, self.network).as_str(), - &name, - ]) - .unwrap(); - - // Deploy program - Developer::Deploy(deploy).parse().map_err(CliError::failed_to_execute_deploy)?; - - // Sleep for `wait_gap` seconds. - // This helps avoid parents from being serialized before children. - if index < all_paths.len() - 1 { - std::thread::sleep(std::time::Duration::from_secs(self.wait_gap)); - } - } - - Ok(()) + Err(PackageError::unimplemented_command("leo deploy").into()) } } diff --git a/leo/cli/commands/execute.rs b/leo/cli/commands/execute.rs index 58bca065cf..62e77ac14b 100644 --- a/leo/cli/commands/execute.rs +++ b/leo/cli/commands/execute.rs @@ -15,8 +15,8 @@ // along with the Leo library. If not, see . use super::*; -use snarkos_cli::commands::{Developer, Execute as SnarkOSExecute}; -use snarkvm::cli::{dotenv_private_key, Execute as SnarkVMExecute}; +//use snarkos_cli::commands::{Developer, Execute as SnarkOSExecute}; +use snarkvm::cli::Execute as SnarkVMExecute; /// Build, Prove and Run Leo program with inputs #[derive(Parser, Debug)] @@ -52,44 +52,44 @@ impl Command for Execute { fn apply(self, context: Context, input: Self::Input) -> Result { // If the `broadcast` flag is set, then broadcast the transaction. if self.broadcast { - // Get the program name - let project_name = context.open_manifest()?.program_id().to_string(); + // // Get the program name + // let project_name = context.open_manifest()?.program_id().to_string(); + // + // // Get the private key + // let mut private_key = self.private_key; + // if private_key.is_none() { + // private_key = + // Some(dotenv_private_key().map_err(CliError::failed_to_read_environment_private_key)?.to_string()); + // } + // + // // Execute program + // Developer::Execute( + // SnarkOSExecute::try_parse_from( + // [ + // vec![ + // "snarkos", + // "--private-key", + // private_key.as_ref().unwrap(), + // "--query", + // self.compiler_options.endpoint.as_str(), + // "--priority-fee", + // self.priority_fee.as_str(), + // "--broadcast", + // format!("{}/{}/transaction/broadcast", self.compiler_options.endpoint, self.network) + // .as_str(), + // project_name.as_str(), + // &self.name, + // ], + // self.inputs.iter().map(|input| input.as_str()).collect(), + // ] + // .concat(), + // ) + // .unwrap(), + // ) + // .parse() + // .map_err(CliError::failed_to_execute_deploy)?; - // Get the private key - let mut private_key = self.private_key; - if private_key.is_none() { - private_key = - Some(dotenv_private_key().map_err(CliError::failed_to_read_environment_private_key)?.to_string()); - } - - // Execute program - Developer::Execute( - SnarkOSExecute::try_parse_from( - [ - vec![ - "snarkos", - "--private-key", - private_key.as_ref().unwrap(), - "--query", - self.compiler_options.endpoint.as_str(), - "--priority-fee", - self.priority_fee.as_str(), - "--broadcast", - format!("{}/{}/transaction/broadcast", self.compiler_options.endpoint, self.network) - .as_str(), - project_name.as_str(), - &self.name, - ], - self.inputs.iter().map(|input| input.as_str()).collect(), - ] - .concat(), - ) - .unwrap(), - ) - .parse() - .map_err(CliError::failed_to_execute_deploy)?; - - return Ok(()); + return Err(PackageError::unimplemented_command("leo execute --broadcast").into()); } // If input values are provided, then run the program with those inputs. diff --git a/leo/package/Cargo.toml b/leo/package/Cargo.toml index 0276ac2933..3a6ca3dd48 100644 --- a/leo/package/Cargo.toml +++ b/leo/package/Cargo.toml @@ -25,8 +25,8 @@ default-features = false [dependencies.snarkvm] workspace = true -[dependencies.snarkos-cli] -version = "2.2.4" +#[dependencies.snarkos-cli] +#version = "2.2.4" [dependencies.leo-errors] path = "../../errors"