From c0f48f1528d754adf7c41e62c44fdc10120e481b Mon Sep 17 00:00:00 2001 From: Yeastplume Date: Mon, 13 May 2024 13:19:27 +0100 Subject: [PATCH 1/6] Update grin_secp to 0.7.14 (#3788) --- Cargo.lock | 24 +++++++----------------- util/Cargo.toml | 2 +- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 644f9f9e7..6b1f5d7d0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -80,22 +80,18 @@ checksum = "dabe5a181f83789739c194cbe5a897dde195078fac08568d09221fd6137a7ba8" [[package]] name = "arrayvec" -version = "0.3.25" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06f59fe10306bb78facd90d28c2038ad23ffaaefa85bac43c8a434cde383334f" +checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" dependencies = [ "nodrop", - "odds", ] [[package]] name = "arrayvec" -version = "0.4.12" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" -dependencies = [ - "nodrop", -] +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "atty" @@ -1056,11 +1052,11 @@ dependencies = [ [[package]] name = "grin_secp256k1zkp" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447e2e66d2f6cc14d49afdad59a5b26f47654c845483dbb3f3403ace0dbb94b4" +checksum = "06832645c3d28079245827908045946db48e5d62b4c54b40701c7e21327e2571" dependencies = [ - "arrayvec 0.3.25", + "arrayvec 0.7.4", "cc", "libc", "rand 0.5.6", @@ -1832,12 +1828,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "odds" -version = "0.2.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eae0151b9dacf24fcc170d9995e511669a082856a91f958a2fe380bfab3fb22" - [[package]] name = "once_cell" version = "1.19.0" diff --git a/util/Cargo.toml b/util/Cargo.toml index 404ad6891..eec31843f 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -28,5 +28,5 @@ zeroize = { version = "1.1", features =["zeroize_derive"] } #git = "https://github.com/mimblewimble/rust-secp256k1-zkp" #tag = "grin_integration_29" #path = "../../rust-secp256k1-zkp" -version = "0.7.13" +version = "0.7.14" features = ["bullet-proof-sizing"] From fe1da7664c243baaa6e596ce2cb0ea4531168003 Mon Sep 17 00:00:00 2001 From: Yeastplume Date: Mon, 20 May 2024 09:20:45 +0100 Subject: [PATCH 2/6] Update versioning on master to 5.4.0-alpha.0 --- Cargo.lock | 22 +++++++++++----------- Cargo.toml | 22 +++++++++++----------- api/Cargo.toml | 14 +++++++------- chain/Cargo.toml | 10 +++++----- config/Cargo.toml | 10 +++++----- core/Cargo.toml | 6 +++--- keychain/Cargo.toml | 4 ++-- p2p/Cargo.toml | 12 ++++++------ pool/Cargo.toml | 10 +++++----- servers/Cargo.toml | 18 +++++++++--------- store/Cargo.toml | 6 +++--- util/Cargo.toml | 2 +- 12 files changed, 68 insertions(+), 68 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 644f9f9e7..b4a303363 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -871,7 +871,7 @@ dependencies = [ [[package]] name = "grin" -version = "5.3.0" +version = "5.4.0-alpha.0" dependencies = [ "blake2-rfc", "built", @@ -899,7 +899,7 @@ dependencies = [ [[package]] name = "grin_api" -version = "5.3.0" +version = "5.4.0-alpha.0" dependencies = [ "bytes 0.5.6", "easy-jsonrpc-mw", @@ -930,7 +930,7 @@ dependencies = [ [[package]] name = "grin_chain" -version = "5.3.0" +version = "5.4.0-alpha.0" dependencies = [ "bit-vec", "bitflags 1.3.2", @@ -954,7 +954,7 @@ dependencies = [ [[package]] name = "grin_config" -version = "5.3.0" +version = "5.4.0-alpha.0" dependencies = [ "dirs", "grin_core", @@ -970,7 +970,7 @@ dependencies = [ [[package]] name = "grin_core" -version = "5.3.0" +version = "5.4.0-alpha.0" dependencies = [ "blake2-rfc", "byteorder", @@ -996,7 +996,7 @@ dependencies = [ [[package]] name = "grin_keychain" -version = "5.3.0" +version = "5.4.0-alpha.0" dependencies = [ "blake2-rfc", "byteorder", @@ -1017,7 +1017,7 @@ dependencies = [ [[package]] name = "grin_p2p" -version = "5.3.0" +version = "5.4.0-alpha.0" dependencies = [ "bitflags 1.3.2", "bytes 0.5.6", @@ -1039,7 +1039,7 @@ dependencies = [ [[package]] name = "grin_pool" -version = "5.3.0" +version = "5.4.0-alpha.0" dependencies = [ "blake2-rfc", "chrono", @@ -1071,7 +1071,7 @@ dependencies = [ [[package]] name = "grin_servers" -version = "5.3.0" +version = "5.4.0-alpha.0" dependencies = [ "chrono", "fs2", @@ -1100,7 +1100,7 @@ dependencies = [ [[package]] name = "grin_store" -version = "5.3.0" +version = "5.4.0-alpha.0" dependencies = [ "byteorder", "chrono", @@ -1122,7 +1122,7 @@ dependencies = [ [[package]] name = "grin_util" -version = "5.3.0" +version = "5.4.0-alpha.0" dependencies = [ "backtrace", "base64 0.12.3", diff --git a/Cargo.toml b/Cargo.toml index 74a68cb57..b3e51cb44 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin" -version = "5.3.0" +version = "5.4.0-alpha.0" authors = ["Grin Developers "] description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format." license = "Apache-2.0" @@ -32,14 +32,14 @@ serde_json = "1" log = "0.4" term = "0.6" -grin_api = { path = "./api", version = "5.3.0" } -grin_config = { path = "./config", version = "5.3.0" } -grin_chain = { path = "./chain", version = "5.3.0" } -grin_core = { path = "./core", version = "5.3.0" } -grin_keychain = { path = "./keychain", version = "5.3.0" } -grin_p2p = { path = "./p2p", version = "5.3.0" } -grin_servers = { path = "./servers", version = "5.3.0" } -grin_util = { path = "./util", version = "5.3.0" } +grin_api = { path = "./api", version = "5.4.0-alpha.0" } +grin_config = { path = "./config", version = "5.4.0-alpha.0" } +grin_chain = { path = "./chain", version = "5.4.0-alpha.0" } +grin_core = { path = "./core", version = "5.4.0-alpha.0" } +grin_keychain = { path = "./keychain", version = "5.4.0-alpha.0" } +grin_p2p = { path = "./p2p", version = "5.4.0-alpha.0" } +grin_servers = { path = "./servers", version = "5.4.0-alpha.0" } +grin_util = { path = "./util", version = "5.4.0-alpha.0" } [dependencies.cursive] version = "0.20" @@ -50,5 +50,5 @@ features = ["pancurses-backend"] built = { version = "0.4", features = ["git2"]} [dev-dependencies] -grin_chain = { path = "./chain", version = "5.3.0" } -grin_store = { path = "./store", version = "5.3.0" } +grin_chain = { path = "./chain", version = "5.4.0-alpha.0" } +grin_store = { path = "./store", version = "5.4.0-alpha.0" } diff --git a/api/Cargo.toml b/api/Cargo.toml index 6bc38911b..ae6b02006 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_api" -version = "5.3.0" +version = "5.4.0-alpha.0" authors = ["Grin Developers "] description = "APIs for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format." license = "Apache-2.0" @@ -30,9 +30,9 @@ rustls = "0.17" url = "2.1" bytes = "0.5" -grin_core = { path = "../core", version = "5.3.0" } -grin_chain = { path = "../chain", version = "5.3.0" } -grin_p2p = { path = "../p2p", version = "5.3.0" } -grin_pool = { path = "../pool", version = "5.3.0" } -grin_store = { path = "../store", version = "5.3.0" } -grin_util = { path = "../util", version = "5.3.0" } +grin_core = { path = "../core", version = "5.4.0-alpha.0" } +grin_chain = { path = "../chain", version = "5.4.0-alpha.0" } +grin_p2p = { path = "../p2p", version = "5.4.0-alpha.0" } +grin_pool = { path = "../pool", version = "5.4.0-alpha.0" } +grin_store = { path = "../store", version = "5.4.0-alpha.0" } +grin_util = { path = "../util", version = "5.4.0-alpha.0" } diff --git a/chain/Cargo.toml b/chain/Cargo.toml index b2ff0fa56..5a91e0d79 100644 --- a/chain/Cargo.toml +++ b/chain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_chain" -version = "5.3.0" +version = "5.4.0-alpha.0" authors = ["Grin Developers "] description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format." license = "Apache-2.0" @@ -23,10 +23,10 @@ chrono = "0.4.11" lru-cache = "0.1" lazy_static = "1" -grin_core = { path = "../core", version = "5.3.0" } -grin_keychain = { path = "../keychain", version = "5.3.0" } -grin_store = { path = "../store", version = "5.3.0" } -grin_util = { path = "../util", version = "5.3.0" } +grin_core = { path = "../core", version = "5.4.0-alpha.0" } +grin_keychain = { path = "../keychain", version = "5.4.0-alpha.0" } +grin_store = { path = "../store", version = "5.4.0-alpha.0" } +grin_util = { path = "../util", version = "5.4.0-alpha.0" } [dev-dependencies] env_logger = "0.7" diff --git a/config/Cargo.toml b/config/Cargo.toml index 8aa3c3498..c9d73cade 100644 --- a/config/Cargo.toml +++ b/config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_config" -version = "5.3.0" +version = "5.4.0-alpha.0" authors = ["Grin Developers "] description = "Configuration for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format." license = "Apache-2.0" @@ -16,10 +16,10 @@ serde_derive = "1" toml = "0.5" dirs = "2.0" -grin_core = { path = "../core", version = "5.3.0" } -grin_servers = { path = "../servers", version = "5.3.0" } -grin_p2p = { path = "../p2p", version = "5.3.0" } -grin_util = { path = "../util", version = "5.3.0" } +grin_core = { path = "../core", version = "5.4.0-alpha.0" } +grin_servers = { path = "../servers", version = "5.4.0-alpha.0" } +grin_p2p = { path = "../p2p", version = "5.4.0-alpha.0" } +grin_util = { path = "../util", version = "5.4.0-alpha.0" } [dev-dependencies] pretty_assertions = "0.6.1" diff --git a/core/Cargo.toml b/core/Cargo.toml index 66613f4e0..1d48c2087 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_core" -version = "5.3.0" +version = "5.4.0-alpha.0" authors = ["Grin Developers "] description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format." license = "Apache-2.0" @@ -28,8 +28,8 @@ chrono = { version = "0.4.11", features = ["serde"] } zeroize = { version = "1.1", features =["zeroize_derive"] } bytes = "0.5" -keychain = { package = "grin_keychain", path = "../keychain", version = "5.3.0" } -util = { package = "grin_util", path = "../util", version = "5.3.0" } +keychain = { package = "grin_keychain", path = "../keychain", version = "5.4.0-alpha.0" } +util = { package = "grin_util", path = "../util", version = "5.4.0-alpha.0" } [dev-dependencies] serde_json = "1" diff --git a/keychain/Cargo.toml b/keychain/Cargo.toml index cdfbd61ed..9a5ec8d24 100644 --- a/keychain/Cargo.toml +++ b/keychain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_keychain" -version = "5.3.0" +version = "5.4.0-alpha.0" authors = ["Grin Developers "] description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format." license = "Apache-2.0" @@ -26,4 +26,4 @@ ripemd160 = "0.9" sha2 = "0.9" pbkdf2 = "0.8" -grin_util = { path = "../util", version = "5.3.0" } +grin_util = { path = "../util", version = "5.4.0-alpha.0" } diff --git a/p2p/Cargo.toml b/p2p/Cargo.toml index 1410bf37d..66d106853 100644 --- a/p2p/Cargo.toml +++ b/p2p/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_p2p" -version = "5.3.0" +version = "5.4.0-alpha.0" authors = ["Grin Developers "] description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format." license = "Apache-2.0" @@ -22,10 +22,10 @@ log = "0.4" chrono = { version = "0.4.11", features = ["serde"] } bytes = "0.5" -grin_core = { path = "../core", version = "5.3.0" } -grin_store = { path = "../store", version = "5.3.0" } -grin_util = { path = "../util", version = "5.3.0" } -grin_chain = { path = "../chain", version = "5.3.0" } +grin_core = { path = "../core", version = "5.4.0-alpha.0" } +grin_store = { path = "../store", version = "5.4.0-alpha.0" } +grin_util = { path = "../util", version = "5.4.0-alpha.0" } +grin_chain = { path = "../chain", version = "5.4.0-alpha.0" } [dev-dependencies] -grin_pool = { path = "../pool", version = "5.3.0" } +grin_pool = { path = "../pool", version = "5.4.0-alpha.0" } diff --git a/pool/Cargo.toml b/pool/Cargo.toml index baa760776..7311d1947 100644 --- a/pool/Cargo.toml +++ b/pool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_pool" -version = "5.3.0" +version = "5.4.0-alpha.0" authors = ["Grin Developers "] description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format." license = "Apache-2.0" @@ -18,9 +18,9 @@ thiserror = "1" log = "0.4" chrono = "0.4.11" -grin_core = { path = "../core", version = "5.3.0" } -grin_keychain = { path = "../keychain", version = "5.3.0" } -grin_util = { path = "../util", version = "5.3.0" } +grin_core = { path = "../core", version = "5.4.0-alpha.0" } +grin_keychain = { path = "../keychain", version = "5.4.0-alpha.0" } +grin_util = { path = "../util", version = "5.4.0-alpha.0" } [dev-dependencies] -grin_chain = { path = "../chain", version = "5.3.0" } +grin_chain = { path = "../chain", version = "5.4.0-alpha.0" } diff --git a/servers/Cargo.toml b/servers/Cargo.toml index 00188bae1..8890077ab 100644 --- a/servers/Cargo.toml +++ b/servers/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_servers" -version = "5.3.0" +version = "5.4.0-alpha.0" authors = ["Grin Developers "] description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format." license = "Apache-2.0" @@ -26,11 +26,11 @@ tokio = {version = "0.2", features = ["full"] } tokio-util = { version = "0.2", features = ["codec"] } walkdir = "2.3.1" -grin_api = { path = "../api", version = "5.3.0" } -grin_chain = { path = "../chain", version = "5.3.0" } -grin_core = { path = "../core", version = "5.3.0" } -grin_keychain = { path = "../keychain", version = "5.3.0" } -grin_p2p = { path = "../p2p", version = "5.3.0" } -grin_pool = { path = "../pool", version = "5.3.0" } -grin_store = { path = "../store", version = "5.3.0" } -grin_util = { path = "../util", version = "5.3.0" } +grin_api = { path = "../api", version = "5.4.0-alpha.0" } +grin_chain = { path = "../chain", version = "5.4.0-alpha.0" } +grin_core = { path = "../core", version = "5.4.0-alpha.0" } +grin_keychain = { path = "../keychain", version = "5.4.0-alpha.0" } +grin_p2p = { path = "../p2p", version = "5.4.0-alpha.0" } +grin_pool = { path = "../pool", version = "5.4.0-alpha.0" } +grin_store = { path = "../store", version = "5.4.0-alpha.0" } +grin_util = { path = "../util", version = "5.4.0-alpha.0" } diff --git a/store/Cargo.toml b/store/Cargo.toml index a0bae6cdc..c84fe392a 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_store" -version = "5.3.0" +version = "5.4.0-alpha.0" authors = ["Grin Developers "] description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format." license = "Apache-2.0" @@ -21,8 +21,8 @@ serde_derive = "1" thiserror = "1" log = "0.4" -grin_core = { path = "../core", version = "5.3.0" } -grin_util = { path = "../util", version = "5.3.0" } +grin_core = { path = "../core", version = "5.4.0-alpha.0" } +grin_util = { path = "../util", version = "5.4.0-alpha.0" } [dev-dependencies] chrono = "0.4.11" diff --git a/util/Cargo.toml b/util/Cargo.toml index 404ad6891..8e454374e 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_util" -version = "5.3.0" +version = "5.4.0-alpha.0" authors = ["Grin Developers "] description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format." license = "Apache-2.0" From 503527c2e7702b0de747ccdbb090cadb7d0a1d64 Mon Sep 17 00:00:00 2001 From: Yeastplume Date: Mon, 20 May 2024 09:30:00 +0100 Subject: [PATCH 3/6] Update versioning on master to 5.4.0-alpha.0 (#3789) --- Cargo.lock | 22 +++++++++++----------- Cargo.toml | 22 +++++++++++----------- api/Cargo.toml | 14 +++++++------- chain/Cargo.toml | 10 +++++----- config/Cargo.toml | 10 +++++----- core/Cargo.toml | 6 +++--- keychain/Cargo.toml | 4 ++-- p2p/Cargo.toml | 12 ++++++------ pool/Cargo.toml | 10 +++++----- servers/Cargo.toml | 18 +++++++++--------- store/Cargo.toml | 6 +++--- util/Cargo.toml | 2 +- 12 files changed, 68 insertions(+), 68 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6b1f5d7d0..06bfec32f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -867,7 +867,7 @@ dependencies = [ [[package]] name = "grin" -version = "5.3.0" +version = "5.4.0-alpha.0" dependencies = [ "blake2-rfc", "built", @@ -895,7 +895,7 @@ dependencies = [ [[package]] name = "grin_api" -version = "5.3.0" +version = "5.4.0-alpha.0" dependencies = [ "bytes 0.5.6", "easy-jsonrpc-mw", @@ -926,7 +926,7 @@ dependencies = [ [[package]] name = "grin_chain" -version = "5.3.0" +version = "5.4.0-alpha.0" dependencies = [ "bit-vec", "bitflags 1.3.2", @@ -950,7 +950,7 @@ dependencies = [ [[package]] name = "grin_config" -version = "5.3.0" +version = "5.4.0-alpha.0" dependencies = [ "dirs", "grin_core", @@ -966,7 +966,7 @@ dependencies = [ [[package]] name = "grin_core" -version = "5.3.0" +version = "5.4.0-alpha.0" dependencies = [ "blake2-rfc", "byteorder", @@ -992,7 +992,7 @@ dependencies = [ [[package]] name = "grin_keychain" -version = "5.3.0" +version = "5.4.0-alpha.0" dependencies = [ "blake2-rfc", "byteorder", @@ -1013,7 +1013,7 @@ dependencies = [ [[package]] name = "grin_p2p" -version = "5.3.0" +version = "5.4.0-alpha.0" dependencies = [ "bitflags 1.3.2", "bytes 0.5.6", @@ -1035,7 +1035,7 @@ dependencies = [ [[package]] name = "grin_pool" -version = "5.3.0" +version = "5.4.0-alpha.0" dependencies = [ "blake2-rfc", "chrono", @@ -1067,7 +1067,7 @@ dependencies = [ [[package]] name = "grin_servers" -version = "5.3.0" +version = "5.4.0-alpha.0" dependencies = [ "chrono", "fs2", @@ -1096,7 +1096,7 @@ dependencies = [ [[package]] name = "grin_store" -version = "5.3.0" +version = "5.4.0-alpha.0" dependencies = [ "byteorder", "chrono", @@ -1118,7 +1118,7 @@ dependencies = [ [[package]] name = "grin_util" -version = "5.3.0" +version = "5.4.0-alpha.0" dependencies = [ "backtrace", "base64 0.12.3", diff --git a/Cargo.toml b/Cargo.toml index 74a68cb57..b3e51cb44 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin" -version = "5.3.0" +version = "5.4.0-alpha.0" authors = ["Grin Developers "] description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format." license = "Apache-2.0" @@ -32,14 +32,14 @@ serde_json = "1" log = "0.4" term = "0.6" -grin_api = { path = "./api", version = "5.3.0" } -grin_config = { path = "./config", version = "5.3.0" } -grin_chain = { path = "./chain", version = "5.3.0" } -grin_core = { path = "./core", version = "5.3.0" } -grin_keychain = { path = "./keychain", version = "5.3.0" } -grin_p2p = { path = "./p2p", version = "5.3.0" } -grin_servers = { path = "./servers", version = "5.3.0" } -grin_util = { path = "./util", version = "5.3.0" } +grin_api = { path = "./api", version = "5.4.0-alpha.0" } +grin_config = { path = "./config", version = "5.4.0-alpha.0" } +grin_chain = { path = "./chain", version = "5.4.0-alpha.0" } +grin_core = { path = "./core", version = "5.4.0-alpha.0" } +grin_keychain = { path = "./keychain", version = "5.4.0-alpha.0" } +grin_p2p = { path = "./p2p", version = "5.4.0-alpha.0" } +grin_servers = { path = "./servers", version = "5.4.0-alpha.0" } +grin_util = { path = "./util", version = "5.4.0-alpha.0" } [dependencies.cursive] version = "0.20" @@ -50,5 +50,5 @@ features = ["pancurses-backend"] built = { version = "0.4", features = ["git2"]} [dev-dependencies] -grin_chain = { path = "./chain", version = "5.3.0" } -grin_store = { path = "./store", version = "5.3.0" } +grin_chain = { path = "./chain", version = "5.4.0-alpha.0" } +grin_store = { path = "./store", version = "5.4.0-alpha.0" } diff --git a/api/Cargo.toml b/api/Cargo.toml index 6bc38911b..ae6b02006 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_api" -version = "5.3.0" +version = "5.4.0-alpha.0" authors = ["Grin Developers "] description = "APIs for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format." license = "Apache-2.0" @@ -30,9 +30,9 @@ rustls = "0.17" url = "2.1" bytes = "0.5" -grin_core = { path = "../core", version = "5.3.0" } -grin_chain = { path = "../chain", version = "5.3.0" } -grin_p2p = { path = "../p2p", version = "5.3.0" } -grin_pool = { path = "../pool", version = "5.3.0" } -grin_store = { path = "../store", version = "5.3.0" } -grin_util = { path = "../util", version = "5.3.0" } +grin_core = { path = "../core", version = "5.4.0-alpha.0" } +grin_chain = { path = "../chain", version = "5.4.0-alpha.0" } +grin_p2p = { path = "../p2p", version = "5.4.0-alpha.0" } +grin_pool = { path = "../pool", version = "5.4.0-alpha.0" } +grin_store = { path = "../store", version = "5.4.0-alpha.0" } +grin_util = { path = "../util", version = "5.4.0-alpha.0" } diff --git a/chain/Cargo.toml b/chain/Cargo.toml index b2ff0fa56..5a91e0d79 100644 --- a/chain/Cargo.toml +++ b/chain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_chain" -version = "5.3.0" +version = "5.4.0-alpha.0" authors = ["Grin Developers "] description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format." license = "Apache-2.0" @@ -23,10 +23,10 @@ chrono = "0.4.11" lru-cache = "0.1" lazy_static = "1" -grin_core = { path = "../core", version = "5.3.0" } -grin_keychain = { path = "../keychain", version = "5.3.0" } -grin_store = { path = "../store", version = "5.3.0" } -grin_util = { path = "../util", version = "5.3.0" } +grin_core = { path = "../core", version = "5.4.0-alpha.0" } +grin_keychain = { path = "../keychain", version = "5.4.0-alpha.0" } +grin_store = { path = "../store", version = "5.4.0-alpha.0" } +grin_util = { path = "../util", version = "5.4.0-alpha.0" } [dev-dependencies] env_logger = "0.7" diff --git a/config/Cargo.toml b/config/Cargo.toml index 8aa3c3498..c9d73cade 100644 --- a/config/Cargo.toml +++ b/config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_config" -version = "5.3.0" +version = "5.4.0-alpha.0" authors = ["Grin Developers "] description = "Configuration for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format." license = "Apache-2.0" @@ -16,10 +16,10 @@ serde_derive = "1" toml = "0.5" dirs = "2.0" -grin_core = { path = "../core", version = "5.3.0" } -grin_servers = { path = "../servers", version = "5.3.0" } -grin_p2p = { path = "../p2p", version = "5.3.0" } -grin_util = { path = "../util", version = "5.3.0" } +grin_core = { path = "../core", version = "5.4.0-alpha.0" } +grin_servers = { path = "../servers", version = "5.4.0-alpha.0" } +grin_p2p = { path = "../p2p", version = "5.4.0-alpha.0" } +grin_util = { path = "../util", version = "5.4.0-alpha.0" } [dev-dependencies] pretty_assertions = "0.6.1" diff --git a/core/Cargo.toml b/core/Cargo.toml index 66613f4e0..1d48c2087 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_core" -version = "5.3.0" +version = "5.4.0-alpha.0" authors = ["Grin Developers "] description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format." license = "Apache-2.0" @@ -28,8 +28,8 @@ chrono = { version = "0.4.11", features = ["serde"] } zeroize = { version = "1.1", features =["zeroize_derive"] } bytes = "0.5" -keychain = { package = "grin_keychain", path = "../keychain", version = "5.3.0" } -util = { package = "grin_util", path = "../util", version = "5.3.0" } +keychain = { package = "grin_keychain", path = "../keychain", version = "5.4.0-alpha.0" } +util = { package = "grin_util", path = "../util", version = "5.4.0-alpha.0" } [dev-dependencies] serde_json = "1" diff --git a/keychain/Cargo.toml b/keychain/Cargo.toml index cdfbd61ed..9a5ec8d24 100644 --- a/keychain/Cargo.toml +++ b/keychain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_keychain" -version = "5.3.0" +version = "5.4.0-alpha.0" authors = ["Grin Developers "] description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format." license = "Apache-2.0" @@ -26,4 +26,4 @@ ripemd160 = "0.9" sha2 = "0.9" pbkdf2 = "0.8" -grin_util = { path = "../util", version = "5.3.0" } +grin_util = { path = "../util", version = "5.4.0-alpha.0" } diff --git a/p2p/Cargo.toml b/p2p/Cargo.toml index 1410bf37d..66d106853 100644 --- a/p2p/Cargo.toml +++ b/p2p/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_p2p" -version = "5.3.0" +version = "5.4.0-alpha.0" authors = ["Grin Developers "] description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format." license = "Apache-2.0" @@ -22,10 +22,10 @@ log = "0.4" chrono = { version = "0.4.11", features = ["serde"] } bytes = "0.5" -grin_core = { path = "../core", version = "5.3.0" } -grin_store = { path = "../store", version = "5.3.0" } -grin_util = { path = "../util", version = "5.3.0" } -grin_chain = { path = "../chain", version = "5.3.0" } +grin_core = { path = "../core", version = "5.4.0-alpha.0" } +grin_store = { path = "../store", version = "5.4.0-alpha.0" } +grin_util = { path = "../util", version = "5.4.0-alpha.0" } +grin_chain = { path = "../chain", version = "5.4.0-alpha.0" } [dev-dependencies] -grin_pool = { path = "../pool", version = "5.3.0" } +grin_pool = { path = "../pool", version = "5.4.0-alpha.0" } diff --git a/pool/Cargo.toml b/pool/Cargo.toml index baa760776..7311d1947 100644 --- a/pool/Cargo.toml +++ b/pool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_pool" -version = "5.3.0" +version = "5.4.0-alpha.0" authors = ["Grin Developers "] description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format." license = "Apache-2.0" @@ -18,9 +18,9 @@ thiserror = "1" log = "0.4" chrono = "0.4.11" -grin_core = { path = "../core", version = "5.3.0" } -grin_keychain = { path = "../keychain", version = "5.3.0" } -grin_util = { path = "../util", version = "5.3.0" } +grin_core = { path = "../core", version = "5.4.0-alpha.0" } +grin_keychain = { path = "../keychain", version = "5.4.0-alpha.0" } +grin_util = { path = "../util", version = "5.4.0-alpha.0" } [dev-dependencies] -grin_chain = { path = "../chain", version = "5.3.0" } +grin_chain = { path = "../chain", version = "5.4.0-alpha.0" } diff --git a/servers/Cargo.toml b/servers/Cargo.toml index 00188bae1..8890077ab 100644 --- a/servers/Cargo.toml +++ b/servers/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_servers" -version = "5.3.0" +version = "5.4.0-alpha.0" authors = ["Grin Developers "] description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format." license = "Apache-2.0" @@ -26,11 +26,11 @@ tokio = {version = "0.2", features = ["full"] } tokio-util = { version = "0.2", features = ["codec"] } walkdir = "2.3.1" -grin_api = { path = "../api", version = "5.3.0" } -grin_chain = { path = "../chain", version = "5.3.0" } -grin_core = { path = "../core", version = "5.3.0" } -grin_keychain = { path = "../keychain", version = "5.3.0" } -grin_p2p = { path = "../p2p", version = "5.3.0" } -grin_pool = { path = "../pool", version = "5.3.0" } -grin_store = { path = "../store", version = "5.3.0" } -grin_util = { path = "../util", version = "5.3.0" } +grin_api = { path = "../api", version = "5.4.0-alpha.0" } +grin_chain = { path = "../chain", version = "5.4.0-alpha.0" } +grin_core = { path = "../core", version = "5.4.0-alpha.0" } +grin_keychain = { path = "../keychain", version = "5.4.0-alpha.0" } +grin_p2p = { path = "../p2p", version = "5.4.0-alpha.0" } +grin_pool = { path = "../pool", version = "5.4.0-alpha.0" } +grin_store = { path = "../store", version = "5.4.0-alpha.0" } +grin_util = { path = "../util", version = "5.4.0-alpha.0" } diff --git a/store/Cargo.toml b/store/Cargo.toml index a0bae6cdc..c84fe392a 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_store" -version = "5.3.0" +version = "5.4.0-alpha.0" authors = ["Grin Developers "] description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format." license = "Apache-2.0" @@ -21,8 +21,8 @@ serde_derive = "1" thiserror = "1" log = "0.4" -grin_core = { path = "../core", version = "5.3.0" } -grin_util = { path = "../util", version = "5.3.0" } +grin_core = { path = "../core", version = "5.4.0-alpha.0" } +grin_util = { path = "../util", version = "5.4.0-alpha.0" } [dev-dependencies] chrono = "0.4.11" diff --git a/util/Cargo.toml b/util/Cargo.toml index eec31843f..9a56bf8e2 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_util" -version = "5.3.0" +version = "5.4.0-alpha.0" authors = ["Grin Developers "] description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format." license = "Apache-2.0" From 845c41de13e9bdeb0f0b4667fbc7ef8be921a2f4 Mon Sep 17 00:00:00 2001 From: Yeastplume Date: Tue, 18 Jun 2024 11:44:17 +0100 Subject: [PATCH 4/6] Remove Merkle Proof Generation from Foreign API `get_outputs` (#3792) * Update versioning on master to 5.4.0-alpha.0 * Remove merkle proof generation from foreign API --- api/src/foreign.rs | 8 +++++--- api/src/foreign_rpc.rs | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/api/src/foreign.rs b/api/src/foreign.rs index 88d147192..cddfe7831 100644 --- a/api/src/foreign.rs +++ b/api/src/foreign.rs @@ -236,7 +236,9 @@ where /// * `start_height` - start height to start the lookup. /// * `end_height` - end height to stop the lookup. /// * `include_proof` - whether or not to include the range proof in the response. - /// * `include_merkle_proof` - whether or not to include the merkle proof in the response. + /// * `include_merkle_proof` (currently ignored) - whether or not to include the merkle proof in the response. + /// removed as it is not used and expensive to generate for historical blocks. See comments below to + /// re-enable this feature at compile-time. /// /// # Returns /// * Result Containing: @@ -250,7 +252,7 @@ where start_height: Option, end_height: Option, include_proof: Option, - include_merkle_proof: Option, + _include_merkle_proof: Option, ) -> Result, Error> { let output_handler = OutputHandler { chain: self.chain.clone(), @@ -260,7 +262,7 @@ where start_height, end_height, include_proof, - include_merkle_proof, + Some(false), // To re-enable merkle proof generation, change to _include_merkle_proof ) } diff --git a/api/src/foreign_rpc.rs b/api/src/foreign_rpc.rs index 7415e3541..431d8e51d 100644 --- a/api/src/foreign_rpc.rs +++ b/api/src/foreign_rpc.rs @@ -646,7 +646,7 @@ pub trait ForeignRpc: Sync + Send { { "block_height": 376151, "commit": "08ecd94ae293863286e99d37f4685f07369bc084ba74d5c59c7f15359a75c84c03", - "merkle_proof": "6b2abbd334c9d75409461fba9c1acd4a8d7bc2ab0bc43143f42388b2a3a87b881505ccf8ffc8737fa6fd4fe412a082d974911bd223eae612d0d1d7ddcc09b5e6079c40b011405b2ccb49ce32473c93aea6d843488d5765fea114d3368d34cd05fcb8c2de3903fbaf39b1f064c809f9f1c0d47959d81a508957040eda55c6dce6dd8c43a79c72faffacfabe1d73055790b6249de2f7c603f186cb109eee58fb1426ea48cb781f88df9acd8996d235fe6bfe60e02aae6e3bfe38ed2599baca1430b3b637072d9bdcdc7644f873728e3cd38eff7124ea848cfad67f8e114cf8595c89a3686a4271cfb2b5098597c315c01d04270ca8f70262af967a947f49adacfa4aad8b6fd196dd0ef4e5cefa132c38c7e5f43db12b3d74f0a8d83c3404e73c6b25a12bff70a8ef4526c89b1558810bb744ede53f8c4cc8cc2555e953637722adb41ea5752281cf1f75599f7e59b17f11f5f9ce4f6b2da4141a3398f51d8b834cdc8b00f61915a41d200572a10bb2102cbae7e94aa7ced3c388dcd58282932c99a8fa66f6fc511ff3e8c60d442bbdb49cca1166328ca8c9bbc97d024570b4cc1ca6c7dba3db223e9e27fd9345b94d3cf10e2b54915b87c57e32965bc2db1b1f956d1962812738ca9b2c93fd7825adf4dffddc97aa85ca0f3f412f02d30678a816d2efbfb6778305fd5e610b6e8af30030bc059880c337bfde326b392d5dcd7c36cb0076fbccc7099b94f1f03bdb525d6e3818b6d50b93ced802957a4b03892c71b6679052bd35e92ceea71a96b22b2ed2c129755f0c74fa172f43da2790f3132a7e57e408d2fc5f1126b088cd0398e6dedcb237242e6720e12e8d7a5a1e196eda6241cfee1cc85e9d20af67f3f9bdf91160516ebcd0b8da6bb7b12229e1112b22c9f1aaef1d75441465cfee2ac1c47b5255514316ed4637e192b00ff28491168f2f2b00", + "merkle_proof": null, "mmr_index": 4107711, "output_type": "Coinbase", "proof": "7083884b5f64e4e61fb910d2c3c603f7c94490716d95e7144b4c927d0ca6ccc0e069cc285e25f38ee90c402ef26005cad2b4073eeba17f0ae3ea2b87095106ef00634f321d8a49c2feaad485bc9ee552564a6a883c99886d0d3a85af3490d718f5a5cbc70f9dcc9bf5d987fb6072132a4c247d4bbd4af927532a887b1e4250b7277771f6b82f43f4fb5a48089ed58e7d3190a19197e07acfed650f8b2cd5f103e994fb3d3735c5727f06f302bd1f182586297dd57a7951ff296bdf6106704abedc39db77f1293effaa7496a77d19420a6208bc1c589b33dad9540cb6180cccf5e085006b01309419f931e54531d770e5fe00eca584072692a7e4883fd65ed4a7c460665608ab96bf0c7d564fe96a341f14066db413a6fddc359eb11f6f962aca70ca1414c35d7941ce06b77d0a0606081b78d5e64a4501f8e8eba9f0e0889042bc54b4cbfd71087a95af63e0306dba214084d4860b0ce66dc80af44224e5a6fef55800650b05cf1639f81bfdc30950f3634d1fd4375d50c22c7f13f3dfb690e5f155a535aff041b7f800bfe74c60f606e8ab47df60754a0e08221c2a50abe643bb086433afd040a7e6290d1d00b3fe657be3bb05c67f90eb183c2acb53c81e1ca15cd8d35fe9d7d52d8f455398e905bdc77ffb211697d477af25704cf9896e8ce797f4fed03e2ba1615e3ad5646eecaa698470f99437d01d5193f041201502763e8bde51e6dc830b5c676d05c8f7f87c4972c578b8d9d5922ba29f6e4a89a123311d02b5ac44a7d5307f7ed5e4e66aaf749afc76c6fc1114445d6fafeea816a0f985eeacdbe9e6d32a8514ca4aaf7faad4e9d43cde55327ac84bac4d70a9319840e136e713aa31d639e43302f3c71a79f08f4e5c9a19a48d4b46403734cd8f3cc9b67bc26ea8e2a01e63a6f5be6e044e8ed5db5f26d15d25de75f672a79315c5e2407e", @@ -656,7 +656,7 @@ pub trait ForeignRpc: Sync + Send { { "block_height": 376154, "commit": "095c12db5e57e4a1ead0870219bda4ebfb1419f6ab1501386b9dd8dc9811a8c5ff", - "merkle_proof": "00000000003eadc6000000000000000e13c509a17cbb0d81634215cd2482ab6d9eb58b332fcbe6b2c4fa458a63d3cb0dfe3614ebe6e52657870df225d132179fa1ea0fdc2105f0e51d03bc3765a9cd059c60d434a7cae0a3d669b37588c25410f57405c841312cfa50cf514678877a3f4ce8bd3e57723ba75a2b7d61027b2088fbabebdb7336b97ea88b00a7e809a6245def980eba18d987601f4cbd6c3cc9f12a5684fe7a1bc2565a9f8ab63c2db1afa8304f5e23d4754cd97f29c8b06dcb3de4f6d3a83079676b6e9941afe5553a7195384b564ecd6d37522cb5e452cc930d2b549af22698a8fd9bf6cad05a06b09e3f6e672b94e82c0255394b5c187ab76fda653a2491378997ba3d49f9d9c34ca93bc627fe5d98b327c03d429b5473f62672e9d73c4eafd9cb8f62e5158a1ec7eb56653696b10fb9ec205f5e4d1c7a1f3e2dd2994b12eeed93e84776d8dcd8a5d78aecd4f96ae95c0b090d104adf2aa84f0a1fbd8d319fea5476d1a306b2800716e60b00115a5cca678617361c5a89660b4536c56254bc8dd7035d96f05de62b042d16acaeff57c111fdf243b859984063e3fcfdf40c4c4a52889706857a7c3e90e264f30f40cc87bd20e74689f14284bc5ea0a540950dfcc8d33c503477eb1c60", + "merkle_proof": null, "mmr_index": 4107717, "output_type": "Coinbase", "proof": "073593bc475478f1e4b648ab261df3b0a6e5a58a617176dd0c8f5e0e1d58b012b40eb9b341d16ee22baf3645ea37705895e731dee5c220b58b0f780d781806a10dfa33e870d0494fba18aaa8a7a709bfb3ddf9eb3e4e75a525b382df68dc6f710275cdffb623373c47c1310ae63479826f435ca4520fdc13bb0d995b7d9a10a7587d61bd4a51c9e32c87f3eb6b0f862cdff19a9ac6cb04d6f7fafb8e94508a851dcf5dc6acea4271bb40117a45319da5522b966091b089698f4f940842458b5b49e212d846be35e0c2b98a00ac3d0b7ceaf081272dbed8abd84fe8f26d57bac1340e8184602436ed8c4470ef9dc214df3405de0e71703abec4456b15e122a94706852bb476213ceadf00529d00d8d3b16dc57f4e4a9a86dacfa719e00366728de42f3f830e73f6113f1e391fab07eba1b40f6466203b0ce14701230e934f6138c575660a03dbb0e59d7295df3115a4fc0909a5520d74657b319fc83481079ad6c13400175e39fa2b86071ba563ce8836320713ef8f55d4e90bee3f57df96c7aef0f2e896f57192fae9675471cd9751bcaf2b15e5a65a9733a6f7f9b8147b8f6e8dac51d056018d411fd252225cf88e56f143143f49e8a0d2e43c10de0442dbc84966817532b1256b6769db987526790a389c371a1fe7a36eacffef82877b4db7a9b5e58722ffbd0fc4fdbd7624365ee326bb8b1e60b999f513715b30f37ef6116eabf53b3524b46c33a1fac49205b39e24aa388d823269c1fc43c3599a06b69433a0a47a03bd871321afb7846a6dbfd5891bd84f89c556231745c929d08445f66f332857bfda1c4f86ae58a01007b7303f870ac24e0ba72d84c0ef4903ac2ff777e2c2dcb4d8e303c74e0c8a559686b4d4c25024ee97601787d4e5a97224af41e5d35d91744292f5a41f64d4e1cae77bebebd77a473f3b54e86f7221aac230942f0468", @@ -666,7 +666,7 @@ pub trait ForeignRpc: Sync + Send { { "block_height": 376153, "commit": "0948cb346b7affe004a6f84fa4b5b44995830f1c332b03537df4c258d51d1afb50", - "merkle_proof": "00000000003eadc4000000000000000dfe3614ebe6e52657870df225d132179fa1ea0fdc2105f0e51d03bc3765a9cd059c60d434a7cae0a3d669b37588c25410f57405c841312cfa50cf514678877a3f4ce8bd3e57723ba75a2b7d61027b2088fbabebdb7336b97ea88b00a7e809a6245def980eba18d987601f4cbd6c3cc9f12a5684fe7a1bc2565a9f8ab63c2db1afa8304f5e23d4754cd97f29c8b06dcb3de4f6d3a83079676b6e9941afe5553a7195384b564ecd6d37522cb5e452cc930d2b549af22698a8fd9bf6cad05a06b09e3f6e672b94e82c0255394b5c187ab76fda653a2491378997ba3d49f9d9c34ca93bc627fe5d98b327c03d429b5473f62672e9d73c4eafd9cb8f62e5158a1ec7eb56653696b10fb9ec205f5e4d1c7a1f3e2dd2994b12eeed93e84776d8dcd8a5d78aecd4f96ae95c0b090d104adf2aa84f0a1fbd8d319fea5476d1a306b2800716e60b00115a5cca678617361c5a89660b4536c56254bc8dd7035d96f05de62b042d16acaeff57c111fdf243b859984063e3fcfdf40c4c4a52889706857a7c3e90e264f30f40cc87bd20e74689f14284bc5ea0a540950dfcc8d33c503477eb1c60", + "merkle_proof": null, "mmr_index": 4107716, "output_type": "Coinbase", "proof": "72950da23ad7f0d0381e2f788bf0ac6b6bcb17aaccf0373534122a95714d2d0dbf6a24822b4aab0711a595c80bc36122957111c39292f2a36a973252fb88cbda0b1d61ea8ea84f5171a61f751cac97332637b7cf74cc73144b912ba700dedaa60895f06e947f1e42a8c79d70f924f45fdcb6df5d30289f36ff77d0ae368df5775a739b7a25cbfb63f0cdbdc167b046067c2a021fe0950c7b67515b185b9e4a00ce63b795d49ae184fe5cc726d72fc05d717c4fb55dd5f65967dc282d3c47cb6f8a92cb696e5a1d8cca21214bc766e3de6271791cebf646cda97ae77035da16606f3397f71e103137358c97b9943c3e15403184f61230bd0e3954c7681a0891aa7a0cc32e82d830fb7d8759a04d1da7058630a853508df095142f22158c28bd5e3f2477ad6c8990e63d0377a0fa3d588b6584453778eb38cbaec8a33c1d3772c97a826d4a2f6953c35342993b04567e9fea6fc64fb714653f934faa1a8f635d39eb2903de4bed960a3df07dce7c2e3ff517bbc15f467d0190a579bc07b0f1a910b23269d794835bbb34e8318dcc4fd4159f8f03faa77842d445cf61af9e33caf46aa5fae0812a6476a09c0757e929271a96a245701ab14c1fdd836b92b7e763afa623017f68f1bc4eb716ce735820a1311b743dd8d5c6bb275a2e4e7d2eff8f45417b60cc937086c3e7fd3b612ae064d7237eb6a7bd1a39d8575fac312068fa060bc1ceac4df0754601edaf04ecb1b89c0661ea01a593c3763e456bebbd8487edc0ff3bc6f203965cd92b1706070c59a3795f9dee23087cea0aaec015f1b7bfe4df81818d7a37af781ca7b757ace2fa489f85215ecb85976b1c74c7f1df6d834a8bc63e887407ef6e233c55ea040bc5f2471e99ebc92f2283ff592ff751d9226bd105e68e187c91ecb236c9fa4fb060ae4d706c571ac2123da1debd12737d98be118578", From 9a23cfe4836e3e136ccab284383a2b5758f7d1cb Mon Sep 17 00:00:00 2001 From: Yeastplume Date: Thu, 12 Sep 2024 20:59:40 +0100 Subject: [PATCH 5/6] Rust 1.80+ fixes & accumulated warning cleanup (#3796) * Update versioning on master to 5.4.0-alpha.0 * updates for 1.80 and other accumulated warnings * further warning cleanups * move dead code tag to function defn rather than module --- .cargo/{config => config.toml} | 0 Cargo.lock | 993 ++++++++++++++++++------------- Cargo.toml | 6 +- chain/tests/chain_test_helper.rs | 2 + core/src/core/block.rs | 14 +- core/src/genesis.rs | 4 - core/src/pow.rs | 4 +- core/src/pow/common.rs | 2 - core/tests/pmmr.rs | 4 +- keychain/src/extkey_bip32.rs | 33 - servers/src/mining/mine_block.rs | 6 +- src/bin/cmd/client.rs | 6 +- src/bin/tui/mining.rs | 12 +- src/build/build.rs | 5 +- store/tests/test_bitmap.rs | 12 +- util/Cargo.toml | 3 +- util/src/logger.rs | 3 +- 17 files changed, 616 insertions(+), 493 deletions(-) rename .cargo/{config => config.toml} (100%) diff --git a/.cargo/config b/.cargo/config.toml similarity index 100% rename from .cargo/config rename to .cargo/config.toml diff --git a/Cargo.lock b/Cargo.lock index 06bfec32f..773aa76c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -17,11 +17,17 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "ahash" -version = "0.8.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if 1.0.0", "getrandom", @@ -32,9 +38,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -72,11 +78,17 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + [[package]] name = "arc-swap" -version = "0.4.8" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dabe5a181f83789739c194cbe5a897dde195078fac08568d09221fd6137a7ba8" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayvec" @@ -89,9 +101,9 @@ dependencies = [ [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "atty" @@ -110,26 +122,26 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", "cfg-if 1.0.0", "libc", - "miniz_oxide", + "miniz_oxide 0.7.4", "object", "rustc-demangle", ] @@ -172,9 +184,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "blake2-rfc" @@ -197,19 +209,18 @@ dependencies = [ [[package]] name = "built" -version = "0.4.4" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8f1b029cb3929cb0c99780b0c10fe512f60be5438adf5f757e4afa1bc75a984" +checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4" dependencies = [ - "cargo-lock", "git2", ] [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" @@ -225,30 +236,28 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" [[package]] name = "bytes" -version = "1.5.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" [[package]] -name = "cargo-lock" -version = "4.0.1" +name = "castaway" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8504b63dd1249fd1745b7b4ef9b6f7b107ddeb3c95370043c7dbcc38653a2679" +checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5" dependencies = [ - "semver", - "serde", - "toml", - "url", + "rustversion", ] [[package]] name = "cc" -version = "1.0.83" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" dependencies = [ "jobserver", "libc", + "shlex", ] [[package]] @@ -263,16 +272,22 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chrono" -version = "0.4.33" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", - "num-traits 0.2.17", + "num-traits 0.2.19", "serde", "wasm-bindgen", "windows-targets", @@ -291,7 +306,7 @@ dependencies = [ "textwrap", "unicode-width", "vec_map", - "yaml-rust 0.3.5", + "yaml-rust", ] [[package]] @@ -303,6 +318,20 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "compact_str" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6050c3a16ddab2e412160b31f2c871015704239bca62f72f6e5f0be631d3f644" +dependencies = [ + "castaway", + "cfg-if 1.0.0", + "itoa 1.0.11", + "rustversion", + "ryu", + "static_assertions", +] + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -327,33 +356,33 @@ checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "croaring" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7266f0a7275b00ce4c4f4753e8c31afdefe93828101ece83a06e2ddab1dd1010" +checksum = "611eaefca84c93e431ad82dfb848f6e05a99e25148384f45a3852b0fbe1c8086" dependencies = [ "byteorder", "croaring-sys", @@ -361,27 +390,27 @@ dependencies = [ [[package]] name = "croaring-sys" -version = "1.1.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e47112498c394a7067949ebc07ef429b7384a413cf0efcf675846a47bcd307fb" +checksum = "3e5fed89265a702f0085844237a7ebbadf8a7c42de6304fddca30a5013f9aecb" dependencies = [ "cc", ] [[package]] name = "crossbeam-channel" -version = "0.5.11" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crypto-mac" @@ -408,25 +437,25 @@ version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ - "quote 1.0.35", + "quote 1.0.36", "syn 1.0.109", ] [[package]] name = "ctrlc" -version = "3.4.2" +version = "3.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b467862cc8610ca6fc9a1532d7777cee0804e678ab45410897b9396495994a0b" +checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" dependencies = [ "nix", - "windows-sys", + "windows-sys 0.59.0", ] [[package]] name = "cursive" -version = "0.20.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5438eb16bdd8af51b31e74764fef5d0a9260227a5ec82ba75c9d11ce46595839" +checksum = "386d5a36020bb856e9a34ecb8a4e6c9bd6b0262d1857bae4db7bc7e2fdaa532e" dependencies = [ "ahash", "cfg-if 1.0.0", @@ -438,25 +467,36 @@ dependencies = [ "maplit", "pancurses", "signal-hook", - "term_size", "unicode-segmentation", "unicode-width", ] +[[package]] +name = "cursive-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac7ac0eb0cede3dfdfebf4d5f22354e05a730b79c25fd03481fc69fcfba0a73e" +dependencies = [ + "proc-macro2 1.0.86", +] + [[package]] name = "cursive_core" -version = "0.3.7" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4db3b58161228d0dcb45c7968c5e74c3f03ad39e8983e58ad7d57061aa2cd94d" +checksum = "321ec774d27fafc66e812034d0025f8858bd7d9095304ff8fc200e0b9f9cc257" dependencies = [ "ahash", + "compact_str", "crossbeam-channel", + "cursive-macros", "enum-map", "enumset", "lazy_static", "log", - "num 0.4.1", - "owning_ref", + "num 0.4.3", + "parking_lot 0.12.3", + "serde_json", "time", "unicode-segmentation", "unicode-width", @@ -465,18 +505,18 @@ dependencies = [ [[package]] name = "cursive_table_view" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8935dd87d19c54b7506b245bc988a7b4e65b1058e1d0d64c0ad9b3188e48060" +checksum = "86a6cca21da26bb588502349d09b68574a3e55689ddeaeeb086af373e0ef6766" dependencies = [ "cursive_core", ] [[package]] name = "darling" -version = "0.20.4" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da01daa5f6d41c91358398e8db4dde38e292378da1f28300b59ef4732b879454" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ "darling_core", "darling_macro", @@ -484,26 +524,26 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.4" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f44f6238b948a3c6c3073cdf53bb0c2d5e024ee27e0f35bfe9d556a12395808a" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.75", ] [[package]] name = "darling_macro" -version = "0.20.4" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d2d88bd93979b1feb760a6b5c531ac5ba06bd63e74894c377af02faee07b9cd" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", - "quote 1.0.35", - "syn 2.0.48", + "quote 1.0.36", + "syn 2.0.75", ] [[package]] @@ -515,6 +555,23 @@ dependencies = [ "powerfmt", ] +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 1.0.109", +] + +[[package]] +name = "destructure_traitobject" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7" + [[package]] name = "difference" version = "2.0.0" @@ -591,9 +648,9 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.75", ] [[package]] @@ -607,23 +664,23 @@ dependencies = [ [[package]] name = "enumset" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d" +checksum = "d07a4b049558765cef5f0c1a273c3fc57084d768b44d2f98127aef4cceb17293" dependencies = [ "enumset_derive", ] [[package]] name = "enumset_derive" -version = "0.8.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" +checksum = "59c3b24c345d8c314966bdc1832f6c2635bfcce8e7cf363bd115987bba2ee242" dependencies = [ "darling", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.75", ] [[package]] @@ -633,48 +690,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" dependencies = [ "atty", - "humantime", + "humantime 1.3.0", "log", "regex", "termcolor", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "bf401df4a4e3872c4fe8151134cf483738e74b67fc934d6532c882b3d24a4550" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.4.1", - "windows-sys", + "libredox", + "windows-sys 0.59.0", ] [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "9c0596c1eac1f9e04ed902702e9878208b336edc9d6fddc8a48387349bab3666" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -784,9 +847,9 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.75", ] [[package]] @@ -814,7 +877,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", "pin-utils", "slab", ] @@ -837,9 +900,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if 1.0.0", "libc", @@ -848,17 +911,17 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "git2" -version = "0.13.25" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29229cc1b24c0e6062f6e742aa3e256492a5323365e5ed3413599f8a5eff7d6" +checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "libc", "libgit2-sys", "log", @@ -1056,7 +1119,7 @@ version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06832645c3d28079245827908045946db48e5d62b4c54b40701c7e21327e2571" dependencies = [ - "arrayvec 0.7.4", + "arrayvec 0.7.6", "cc", "libc", "rand 0.5.6", @@ -1120,6 +1183,7 @@ dependencies = [ name = "grin_util" version = "5.4.0-alpha.0" dependencies = [ + "anyhow", "backtrace", "base64 0.12.3", "byteorder", @@ -1127,7 +1191,7 @@ dependencies = [ "lazy_static", "log", "log4rs", - "parking_lot", + "parking_lot 0.10.2", "rand 0.6.5", "serde", "serde_derive", @@ -1148,7 +1212,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util 0.3.1", @@ -1162,6 +1226,12 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + [[package]] name = "heck" version = "0.3.3" @@ -1182,9 +1252,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.4" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hmac" @@ -1198,13 +1268,13 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ - "bytes 1.5.0", + "bytes 1.7.1", "fnv", - "itoa 1.0.10", + "itoa 1.0.11", ] [[package]] @@ -1219,9 +1289,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1244,6 +1314,12 @@ dependencies = [ "quick-error", ] +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + [[package]] name = "hyper" version = "0.13.10" @@ -1300,12 +1376,12 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.59" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", - "core-foundation-sys 0.8.6", + "core-foundation-sys 0.8.7", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", @@ -1343,8 +1419,18 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "autocfg 1.1.0", - "hashbrown", + "autocfg 1.3.0", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +dependencies = [ + "equivalent", + "hashbrown 0.14.5", ] [[package]] @@ -1364,24 +1450,24 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -1411,21 +1497,21 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.152" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libgit2-sys" -version = "0.12.26+1.3.0" +version = "0.17.0+1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e1c899248e606fbfe68dcb31d8b0176ebab833b103824af31bddf4b7457494" +checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" dependencies = [ "cc", "libc", @@ -1445,20 +1531,20 @@ dependencies = [ [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.3", ] [[package]] name = "libz-sys" -version = "1.1.15" +version = "1.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6" +checksum = "fdc53a7799a7496ebc9fd29f31f7df80e83c9bda5299768af5f9e59eeea74647" dependencies = [ "cc", "libc", @@ -1474,9 +1560,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lmdb-zero" @@ -1499,11 +1585,21 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg 1.3.0", + "scopeguard", +] + [[package]] name = "log" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" dependencies = [ "serde", ] @@ -1516,26 +1612,30 @@ checksum = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7" [[package]] name = "log4rs" -version = "0.12.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4d8e6e1d5f89acca713132acc6034f30bad09b961d1338161bdb71c08f6e4fa" +checksum = "0816135ae15bd0391cf284eab37e6e3ee0a6ee63d2ceeb659862bd8d0a984ca6" dependencies = [ + "anyhow", "arc-swap", "chrono", + "derivative", "flate2", "fnv", - "humantime", + "humantime 2.1.0", "libc", "log", "log-mdc", - "parking_lot", + "once_cell", + "parking_lot 0.12.3", + "rand 0.8.5", "serde", "serde-value", - "serde_derive", "serde_json", "serde_yaml", + "thiserror", "thread-id", - "typemap", + "typemap-ors", "winapi 0.3.9", ] @@ -1556,9 +1656,9 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap" @@ -1572,13 +1672,22 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] +[[package]] +name = "miniz_oxide" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +dependencies = [ + "adler2", +] + [[package]] name = "mio" version = "0.6.23" @@ -1666,12 +1775,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.27.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if 1.0.0", + "cfg_aliases", "libc", ] @@ -1692,20 +1802,20 @@ dependencies = [ "num-integer", "num-iter", "num-rational 0.2.4", - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] name = "num" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ - "num-complex 0.4.4", + "num-complex 0.4.6", "num-integer", "num-iter", - "num-rational 0.4.1", - "num-traits 0.2.17", + "num-rational 0.4.2", + "num-traits 0.2.19", ] [[package]] @@ -1714,9 +1824,9 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "num-integer", - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] @@ -1725,38 +1835,43 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" dependencies = [ - "autocfg 1.1.0", - "num-traits 0.2.17", + "autocfg 1.3.0", + "num-traits 0.2.19", ] [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ - "num-traits 0.2.17", + "num-traits 0.2.19", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg 1.1.0", - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "num-integer", - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] @@ -1765,21 +1880,20 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "num-bigint", "num-integer", - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] name = "num-rational" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "autocfg 1.1.0", "num-integer", - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] @@ -1788,16 +1902,16 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] @@ -1806,24 +1920,24 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.4", + "hermit-abi 0.3.9", "libc", ] [[package]] name = "num_threads" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" dependencies = [ "libc", ] [[package]] name = "object" -version = "0.32.2" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" dependencies = [ "memchr", ] @@ -1836,9 +1950,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl-probe" @@ -1848,11 +1962,11 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "ordered-float" -version = "1.1.1" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3305af35278dd29f46fcdd139e0b1fbfae2153f0e5928b39b035542dd31e37b7" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" dependencies = [ - "num-traits 0.2.17", + "num-traits 0.2.19", ] [[package]] @@ -1864,15 +1978,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "owning_ref" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce" -dependencies = [ - "stable_deref_trait", -] - [[package]] name = "pancurses" version = "0.17.0" @@ -1892,8 +1997,18 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e" dependencies = [ - "lock_api", - "parking_lot_core", + "lock_api 0.3.4", + "parking_lot_core 0.7.3", +] + +[[package]] +name = "parking_lot" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +dependencies = [ + "lock_api 0.4.12", + "parking_lot_core 0.9.10", ] [[package]] @@ -1910,6 +2025,19 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.5.3", + "smallvec", + "windows-targets", +] + [[package]] name = "password-hash" version = "0.2.3" @@ -1952,22 +2080,22 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.75", ] [[package]] @@ -1978,9 +2106,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -1990,9 +2118,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "powerfmt" @@ -2000,6 +2128,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" +[[package]] +name = "ppv-lite86" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] + [[package]] name = "pretty_assertions" version = "0.6.1" @@ -2023,9 +2160,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -2047,11 +2184,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ - "proc-macro2 1.0.78", + "proc-macro2 1.0.86", ] [[package]] @@ -2075,7 +2212,7 @@ checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" dependencies = [ "autocfg 0.1.8", "libc", - "rand_chacha", + "rand_chacha 0.1.1", "rand_core 0.4.2", "rand_hc", "rand_isaac", @@ -2086,6 +2223,17 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + [[package]] name = "rand_chacha" version = "0.1.1" @@ -2096,6 +2244,16 @@ dependencies = [ "rand_core 0.3.1", ] +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + [[package]] name = "rand_core" version = "0.3.1" @@ -2116,6 +2274,9 @@ name = "rand_core" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] [[package]] name = "rand_hc" @@ -2196,18 +2357,18 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -2216,9 +2377,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -2228,9 +2389,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -2239,9 +2400,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "ring" @@ -2271,21 +2432,21 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustix" -version = "0.38.30" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -2313,11 +2474,17 @@ dependencies = [ "security-framework", ] +[[package]] +name = "rustversion" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" + [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "same-file" @@ -2334,7 +2501,7 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -2376,36 +2543,20 @@ dependencies = [ "libc", ] -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", - "serde", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - [[package]] name = "serde" -version = "1.0.196" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" dependencies = [ "serde_derive", ] [[package]] name = "serde-value" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a65a7291a8a568adcae4c10a677ebcedbc6c9cec91c054dee2ce40b0e3290eb" +checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" dependencies = [ "ordered-float", "serde", @@ -2413,36 +2564,38 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.196" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.75", ] [[package]] name = "serde_json" -version = "1.0.113" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" +checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" dependencies = [ - "itoa 1.0.10", + "itoa 1.0.11", + "memchr", "ryu", "serde", ] [[package]] name = "serde_yaml" -version = "0.8.26" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap", + "indexmap 2.4.0", + "itoa 1.0.11", "ryu", "serde", - "yaml-rust 0.4.5", + "unsafe-libyaml", ] [[package]] @@ -2458,6 +2611,12 @@ dependencies = [ "opaque-debug", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook" version = "0.3.17" @@ -2470,9 +2629,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" dependencies = [ "libc", ] @@ -2489,14 +2648,14 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" @@ -2516,10 +2675,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] -name = "stable_deref_trait" -version = "1.2.0" +name = "static_assertions" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strsim" @@ -2556,33 +2715,33 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2 1.0.86", + "quote 1.0.36", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.48" +version = "2.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2 1.0.86", + "quote 1.0.36", "unicode-ident", ] [[package]] name = "tempfile" -version = "3.9.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if 1.0.0", "fastrand", - "redox_syscall 0.4.1", + "once_cell", "rustix", - "windows-sys", + "windows-sys 0.59.0", ] [[package]] @@ -2595,16 +2754,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "term_size" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" -dependencies = [ - "libc", - "winapi 0.3.9", -] - [[package]] name = "termcolor" version = "1.4.1" @@ -2625,44 +2774,44 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.75", ] [[package]] name = "thread-id" -version = "3.3.0" +version = "4.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1" +checksum = "cfe8f25bbdd100db7e1d34acf7fd2dc59c4bf8f7483f505eaa7d4f12f76cc0ea" dependencies = [ "libc", - "redox_syscall 0.1.57", "winapi 0.3.9", ] [[package]] name = "time" -version = "0.3.31" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", - "itoa 1.0.10", + "itoa 1.0.11", "libc", + "num-conv", "num_threads", "powerfmt", "serde", @@ -2678,18 +2827,19 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -2740,8 +2890,8 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", + "proc-macro2 1.0.86", + "quote 1.0.36", "syn 1.0.109", ] @@ -2796,9 +2946,9 @@ dependencies = [ [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -2807,7 +2957,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "log", - "pin-project-lite 0.2.13", + "pin-project-lite 0.2.14", "tracing-core", ] @@ -2830,12 +2980,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "traitobject" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" - [[package]] name = "try-lock" version = "0.2.5" @@ -2843,12 +2987,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] -name = "typemap" -version = "0.3.3" +name = "typemap-ors" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" +checksum = "a68c24b707f02dd18f1e4ccceb9d49f2058c2fb86384ef9972592904d7a28867" dependencies = [ - "unsafe-any", + "unsafe-any-ors", ] [[package]] @@ -2871,24 +3015,24 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" @@ -2897,14 +3041,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" [[package]] -name = "unsafe-any" -version = "0.4.2" +name = "unsafe-any-ors" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" +checksum = "e0a303d30665362d9680d7d91d78b23f5f899504d4f08b3c4cf08d055d87c0ad" dependencies = [ - "traitobject", + "destructure_traitobject", ] +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + [[package]] name = "untrusted" version = "0.7.1" @@ -2913,9 +3063,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -2936,15 +3086,15 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -2967,63 +3117,64 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.90" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if 1.0.0", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.90" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.75", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.90" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ - "quote 1.0.35", + "quote 1.0.36", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.90" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.75", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.90" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "web-sys" -version = "0.3.67" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -3069,11 +3220,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "winapi 0.3.9", + "windows-sys 0.59.0", ] [[package]] @@ -3100,15 +3251,25 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", + "windows_i686_gnullvm", "windows_i686_msvc", "windows_x86_64_gnu", "windows_x86_64_gnullvm", @@ -3117,45 +3278,51 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winreg" @@ -3188,40 +3355,32 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992" -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.75", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -3232,9 +3391,9 @@ version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "proc-macro2 1.0.78", - "quote 1.0.35", - "syn 2.0.48", + "proc-macro2 1.0.86", + "quote 1.0.36", + "syn 2.0.75", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index b3e51cb44..3ae72b9ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ blake2-rfc = "0.2" chrono = "0.4.11" clap = { version = "2.33", features = ["yaml"] } ctrlc = { version = "3.1", features = ["termination"] } -cursive_table_view = "0.14.0" +cursive_table_view = "0.15.0" humansize = "1.1.0" serde = "1" futures = "0.3.19" @@ -42,12 +42,12 @@ grin_servers = { path = "./servers", version = "5.4.0-alpha.0" } grin_util = { path = "./util", version = "5.4.0-alpha.0" } [dependencies.cursive] -version = "0.20" +version = "0.21" default-features = false features = ["pancurses-backend"] [build-dependencies] -built = { version = "0.4", features = ["git2"]} +built = { version = "0.7", features = ["git2"]} [dev-dependencies] grin_chain = { path = "./chain", version = "5.4.0-alpha.0" } diff --git a/chain/tests/chain_test_helper.rs b/chain/tests/chain_test_helper.rs index 06425a18e..2776414f6 100644 --- a/chain/tests/chain_test_helper.rs +++ b/chain/tests/chain_test_helper.rs @@ -29,6 +29,8 @@ use grin_keychain as keychain; use std::fs; use std::sync::Arc; +#[allow(dead_code)] +#[cfg(test)] pub fn clean_output_dir(dir_name: &str) { let _ = fs::remove_dir_all(dir_name); } diff --git a/core/src/core/block.rs b/core/src/core/block.rs index 01e32e380..7198e1e04 100644 --- a/core/src/core/block.rs +++ b/core/src/core/block.rs @@ -27,7 +27,7 @@ use crate::pow::{verify_size, Difficulty, Proof, ProofOfWork}; use crate::ser::{ self, deserialize_default, serialize_default, PMMRable, Readable, Reader, Writeable, Writer, }; -use chrono::prelude::{DateTime, NaiveDateTime, Utc}; +use chrono::prelude::{DateTime, Utc}; use chrono::Duration; use keychain::{self, BlindingFactor}; use std::convert::TryInto; @@ -232,7 +232,7 @@ impl Default for BlockHeader { version: HeaderVersion(1), height: 0, timestamp: DateTime::from_naive_utc_and_offset( - NaiveDateTime::from_timestamp_opt(0, 0).unwrap(), + DateTime::::from_timestamp(0, 0).unwrap().naive_utc(), Utc, ), prev_hash: ZERO_HASH, @@ -295,17 +295,19 @@ fn read_block_header(reader: &mut R) -> Result chrono::NaiveDate::MAX .and_hms_opt(0, 0, 0) .unwrap() + .and_utc() .timestamp() || timestamp < chrono::NaiveDate::MIN .and_hms_opt(0, 0, 0) .unwrap() + .and_utc() .timestamp() { return Err(ser::Error::CorruptedData); } - let ts = NaiveDateTime::from_timestamp_opt(timestamp, 0); + let ts = DateTime::::from_timestamp(timestamp, 0); if ts.is_none() { return Err(ser::Error::CorruptedData); } @@ -313,7 +315,7 @@ fn read_block_header(reader: &mut R) -> Result::from_timestamp(now, 0); if ts.is_none() { return Err(Error::Other("Converting Utc::now() into timestamp".into())); } - let timestamp = DateTime::from_naive_utc_and_offset(ts.unwrap(), Utc); + let timestamp = DateTime::from_naive_utc_and_offset(ts.unwrap().naive_utc(), Utc); // Now build the block with all the above information. // Note: We have not validated the block here. // Caller must validate the block as necessary. diff --git a/core/src/genesis.rs b/core/src/genesis.rs index 30a1934bc..1a788c94e 100644 --- a/core/src/genesis.rs +++ b/core/src/genesis.rs @@ -17,8 +17,6 @@ // required for genesis replacement //! #![allow(unused_imports)] -#![cfg_attr(feature = "cargo-clippy", allow(clippy::unreadable_literal))] - use crate::core; use crate::core::hash::Hash; use crate::pow::{Difficulty, Proof, ProofOfWork}; @@ -44,7 +42,6 @@ pub fn genesis_dev() -> core::Block { } /// Testnet genesis block -#[allow(clippy::inconsistent_digit_grouping)] pub fn genesis_test() -> core::Block { let gen = core::Block::with_header(core::BlockHeader { height: 0, @@ -157,7 +154,6 @@ pub fn genesis_test() -> core::Block { } /// Mainnet genesis block -#[allow(clippy::inconsistent_digit_grouping)] pub fn genesis_main() -> core::Block { let gen = core::Block::with_header(core::BlockHeader { height: 0, diff --git a/core/src/pow.rs b/core/src/pow.rs index a9d1c5347..baffd6c74 100644 --- a/core/src/pow.rs +++ b/core/src/pow.rs @@ -53,7 +53,7 @@ pub use crate::pow::cuckaroom::{new_cuckaroom_ctx, CuckaroomContext}; pub use crate::pow::cuckarooz::{new_cuckarooz_ctx, CuckaroozContext}; pub use crate::pow::cuckatoo::{new_cuckatoo_ctx, CuckatooContext}; pub use crate::pow::error::Error; -use chrono::prelude::{DateTime, NaiveDateTime, Utc}; +use chrono::prelude::{DateTime, Utc}; const MAX_SOLS: u32 = 10; @@ -116,7 +116,7 @@ pub fn pow_size( // well) if bh.pow.nonce == start_nonce { bh.timestamp = DateTime::from_naive_utc_and_offset( - NaiveDateTime::from_timestamp_opt(0, 0).unwrap(), + DateTime::::from_timestamp(0, 0).unwrap().naive_utc(), Utc, ); } diff --git a/core/src/pow/common.rs b/core/src/pow/common.rs index 4d0bee03d..106c1cb3f 100644 --- a/core/src/pow/common.rs +++ b/core/src/pow/common.rs @@ -82,7 +82,6 @@ pub fn create_siphash_keys(header: &[u8]) -> Result<[u64; 4], Error> { /// Utility struct to calculate commonly used Cuckoo parameters calculated /// from header, nonce, edge_bits, etc. pub struct CuckooParams { - pub edge_bits: u8, pub proof_size: usize, pub num_edges: u64, pub siphash_keys: [u64; 4], @@ -98,7 +97,6 @@ impl CuckooParams { let num_nodes = 1u64 << node_bits; let node_mask = num_nodes - 1; Ok(CuckooParams { - edge_bits, proof_size, num_edges, siphash_keys: [0; 4], diff --git a/core/tests/pmmr.rs b/core/tests/pmmr.rs index 7229b40eb..e515bf990 100644 --- a/core/tests/pmmr.rs +++ b/core/tests/pmmr.rs @@ -43,11 +43,11 @@ fn bench_peak_map() { let increments = vec![1_000_000u64, 10_000_000u64, 100_000_000u64]; for v in increments { - let start = Utc::now().timestamp_nanos(); + let start = Utc::now().timestamp_nanos_opt().unwrap(); for i in 0..v { let _ = pmmr::peak_map_height(i); } - let fin = Utc::now().timestamp_nanos(); + let fin = Utc::now().timestamp_nanos_opt().unwrap(); let dur_ms = (fin - start) as f64 * nano_to_millis; println!("{:9?} peak_map_height() in {:9.3?}ms", v, dur_ms); } diff --git a/keychain/src/extkey_bip32.rs b/keychain/src/extkey_bip32.rs index 7b78337bd..022d99462 100644 --- a/keychain/src/extkey_bip32.rs +++ b/keychain/src/extkey_bip32.rs @@ -30,8 +30,6 @@ //! Modified from above to integrate into grin and allow for different //! hashing algorithms if desired -#[cfg(feature = "serde")] -use serde; use std::default::Default; use std::io::Cursor; use std::str::FromStr; @@ -276,26 +274,6 @@ impl fmt::Display for ChildNumber { } } -#[cfg(feature = "serde")] -impl<'de> serde::Deserialize<'de> for ChildNumber { - fn deserialize(deserializer: D) -> Result - where - D: serde::Deserializer<'de>, - { - u32::deserialize(deserializer).map(ChildNumber::from) - } -} - -#[cfg(feature = "serde")] -impl serde::Serialize for ChildNumber { - fn serialize(&self, serializer: S) -> Result - where - S: serde::Serializer, - { - u32::from(*self).serialize(serializer) - } -} - /// A BIP32 error #[derive(Clone, PartialEq, Eq, Debug, Serialize, Deserialize)] pub enum Error { @@ -875,15 +853,4 @@ mod tests { "xprv9uPDJpEQgRQfDcW7BkF7eTya6RPxXeJCqCJGHuCJ4GiRVLzkTXBAJMu2qaMWPrS7AANYqdq6vcBcBUdJCVVFceUvJFjaPdGZ2y9WACViL4L", "xpub68NZiKmJWnxxS6aaHmn81bvJeTESw724CRDs6HbuccFQN9Ku14VQrADWgqbhhTHBaohPX4CjNLf9fq9MYo6oDaPPLPxSb7gwQN3ih19Zm4Y"); } - - #[test] - #[cfg(all(feature = "serde", feature = "strason"))] - pub fn encode_decode_childnumber() { - serde_round_trip!(ChildNumber::from_normal_idx(0)); - serde_round_trip!(ChildNumber::from_normal_idx(1)); - serde_round_trip!(ChildNumber::from_normal_idx((1 << 31) - 1)); - serde_round_trip!(ChildNumber::from_hardened_idx(0)); - serde_round_trip!(ChildNumber::from_hardened_idx(1)); - serde_round_trip!(ChildNumber::from_hardened_idx((1 << 31) - 1)); - } } diff --git a/servers/src/mining/mine_block.rs b/servers/src/mining/mine_block.rs index bdfdb98d2..16c2bc181 100644 --- a/servers/src/mining/mine_block.rs +++ b/servers/src/mining/mine_block.rs @@ -15,7 +15,7 @@ //! Build a block to mine: gathers transactions from the pool, assembles //! them into a block and returns it. -use chrono::prelude::{DateTime, NaiveDateTime, Utc}; +use chrono::prelude::{DateTime, Utc}; use rand::{thread_rng, Rng}; use serde_json::{json, Value}; use std::sync::Arc; @@ -168,11 +168,11 @@ fn build_block( b.header.pow.nonce = thread_rng().gen(); b.header.pow.secondary_scaling = difficulty.secondary_scaling; - let ts = NaiveDateTime::from_timestamp_opt(now_sec, 0); + let ts = DateTime::::from_timestamp(now_sec, 0); if ts.is_none() { return Err(Error::General("Utc::now into timestamp".into())); } - b.header.timestamp = DateTime::from_naive_utc_and_offset(ts.unwrap(), Utc); + b.header.timestamp = DateTime::from_naive_utc_and_offset(ts.unwrap().naive_utc(), Utc); debug!( "Built new block with {} inputs and {} outputs, block difficulty: {}, cumulative difficulty {}", diff --git a/src/bin/cmd/client.rs b/src/bin/cmd/client.rs index b403a3dfe..e3c6165b6 100644 --- a/src/bin/cmd/client.rs +++ b/src/bin/cmd/client.rs @@ -63,7 +63,7 @@ impl HTTPNodeClient { Err(e) => { let report = format!("Error calling {}: {}", method, e); error!("{}", report); - Err(Error::RPCError(report)) + Err(Error::RPCError) } Ok(inner) => match inner.clone().into_result() { Ok(r) => Ok(r), @@ -71,7 +71,7 @@ impl HTTPNodeClient { error!("{:?}", inner); let report = format!("Unable to parse response for {}: {}", method, e); error!("{}", report); - Err(Error::RPCError(report)) + Err(Error::RPCError) } }, } @@ -251,5 +251,5 @@ pub fn client_command(client_args: &ArgMatches<'_>, global_config: GlobalConfig) #[derive(Debug)] enum Error { /// RPC Error - RPCError(String), + RPCError, } diff --git a/src/bin/tui/mining.rs b/src/bin/tui/mining.rs index 53adf7354..d9ee15519 100644 --- a/src/bin/tui/mining.rs +++ b/src/bin/tui/mining.rs @@ -16,7 +16,7 @@ use std::cmp::Ordering; -use chrono::prelude::{DateTime, NaiveDateTime, Utc}; +use chrono::prelude::{DateTime, Utc}; use cursive::direction::Orientation; use cursive::event::Key; use cursive::traits::{Nameable, Resizable}; @@ -64,14 +64,15 @@ impl StratumWorkerColumn { impl TableViewItem for WorkerStats { fn to_column(&self, column: StratumWorkerColumn) -> String { - let naive_datetime = NaiveDateTime::from_timestamp_opt( + let naive_datetime = DateTime::::from_timestamp( self.last_seen .duration_since(time::UNIX_EPOCH) .unwrap() .as_secs() as i64, 0, ) - .unwrap_or_default(); + .unwrap_or_default() + .naive_utc(); let datetime: DateTime = DateTime::from_naive_utc_and_offset(naive_datetime, Utc); match column { @@ -127,8 +128,9 @@ impl DiffColumn { impl TableViewItem for DiffBlock { fn to_column(&self, column: DiffColumn) -> String { - let naive_datetime = - NaiveDateTime::from_timestamp_opt(self.time as i64, 0).unwrap_or_default(); + let naive_datetime = DateTime::::from_timestamp(self.time as i64, 0) + .unwrap_or_default() + .naive_utc(); let datetime: DateTime = DateTime::from_naive_utc_and_offset(naive_datetime, Utc); match column { diff --git a/src/build/build.rs b/src/build/build.rs index e65905c4b..0485fb859 100644 --- a/src/build/build.rs +++ b/src/build/build.rs @@ -38,13 +38,10 @@ fn main() { } // build and versioning information - let mut opts = built::Options::default(); - opts.set_dependencies(true); let out_dir_path = format!("{}{}", env::var("OUT_DIR").unwrap(), "/built.rs"); // don't fail the build if something's missing, may just be cargo release let _ = built::write_built_file_with_opts( - &opts, - Path::new(env!("CARGO_MANIFEST_DIR")), + Some(Path::new(env!("CARGO_MANIFEST_DIR"))), Path::new(&out_dir_path), ); } diff --git a/store/tests/test_bitmap.rs b/store/tests/test_bitmap.rs index e3d9d43b9..0ee89cfca 100644 --- a/store/tests/test_bitmap.rs +++ b/store/tests/test_bitmap.rs @@ -122,11 +122,11 @@ fn bench_fast_or() { let mut bitmaps = init_bitmaps(); let mut bitmap = Bitmap::new(); - let start = Utc::now().timestamp_nanos(); + let start = Utc::now().timestamp_nanos_opt().unwrap(); for _ in 0..bitmaps_number { bitmap.or_inplace(&bitmaps.pop().unwrap()); } - let fin = Utc::now().timestamp_nanos(); + let fin = Utc::now().timestamp_nanos_opt().unwrap(); let dur_ms = (fin - start) as f64 * nano_to_millis; println!( " or_inplace(): {:9.3?}ms. bitmap cardinality: {}", @@ -135,9 +135,9 @@ fn bench_fast_or() { ); let bitmaps = init_bitmaps(); - let start = Utc::now().timestamp_nanos(); + let start = Utc::now().timestamp_nanos_opt().unwrap(); let bitmap = Bitmap::fast_or(&bitmaps.iter().map(|x| x).collect::>()); - let fin = Utc::now().timestamp_nanos(); + let fin = Utc::now().timestamp_nanos_opt().unwrap(); let dur_ms = (fin - start) as f64 * nano_to_millis; println!( " fast_or(): {:9.3?}ms. bitmap cardinality: {}", @@ -146,9 +146,9 @@ fn bench_fast_or() { ); let bitmaps = init_bitmaps(); - let start = Utc::now().timestamp_nanos(); + let start = Utc::now().timestamp_nanos_opt().unwrap(); let bitmap = Bitmap::fast_or_heap(&bitmaps.iter().map(|x| x).collect::>()); - let fin = Utc::now().timestamp_nanos(); + let fin = Utc::now().timestamp_nanos_opt().unwrap(); let dur_ms = (fin - start) as f64 * nano_to_millis; println!( "fast_or_heap(): {:9.3?}ms. bitmap cardinality: {}", diff --git a/util/Cargo.toml b/util/Cargo.toml index 9a56bf8e2..fdd4a8e2d 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -10,6 +10,7 @@ workspace = ".." edition = "2018" [dependencies] +anyhow = "1.0" backtrace = "0.3" base64 = "0.12" byteorder = "1" @@ -17,7 +18,7 @@ lazy_static = "1" rand = "0.6" serde = "1" serde_derive = "1" -log4rs = { version = "0.12", features = ["rolling_file_appender", "compound_policy", "size_trigger", "fixed_window_roller"] } +log4rs = { version = "1.3", features = ["rolling_file_appender", "compound_policy", "size_trigger", "fixed_window_roller", "gzip"] } log = "0.4" walkdir = "2" zip = { version = "0.5.11", default-features = false } diff --git a/util/src/logger.rs b/util/src/logger.rs index ecdbf0ffd..dc1bf78aa 100644 --- a/util/src/logger.rs +++ b/util/src/logger.rs @@ -32,7 +32,6 @@ use log4rs::encode::pattern::PatternEncoder; use log4rs::encode::writer::simple::SimpleWriter; use log4rs::encode::Encode; use log4rs::filter::{threshold::ThresholdFilter, Filter, Response}; -use std::error::Error; use std::sync::mpsc; use std::sync::mpsc::SyncSender; @@ -123,7 +122,7 @@ struct ChannelAppender { } impl Append for ChannelAppender { - fn append(&self, record: &Record) -> Result<(), Box> { + fn append(&self, record: &Record) -> Result<(), anyhow::Error> { let mut writer = SimpleWriter(Vec::new()); self.encoder.encode(&mut writer, record)?; From 01b25650e2c9d6c0536d2839dc27e7e2ee3c98d2 Mon Sep 17 00:00:00 2001 From: aglkm <39521015+aglkm@users.noreply.github.com> Date: Thu, 12 Sep 2024 23:03:51 +0300 Subject: [PATCH 6/6] Chain type field (#3790) * Adding chain type field into get_status rpc * formatting --- api/src/owner_rpc.rs | 1 + api/src/types.rs | 5 ++++- src/bin/cmd/client.rs | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/api/src/owner_rpc.rs b/api/src/owner_rpc.rs index 537a4fb2e..6884b509e 100644 --- a/api/src/owner_rpc.rs +++ b/api/src/owner_rpc.rs @@ -49,6 +49,7 @@ pub trait OwnerRpc: Sync + Send { "jsonrpc": "2.0", "result": { "Ok": { + "chain": "main", "protocol_version": "2", "user_agent": "MW/Grin 2.x.x", "connections": "8", diff --git a/api/src/types.rs b/api/src/types.rs index 6b0ee0e55..4d3194056 100644 --- a/api/src/types.rs +++ b/api/src/types.rs @@ -16,7 +16,7 @@ use crate::chain; use crate::core::core::hash::Hashed; use crate::core::core::merkle_proof::MerkleProof; use crate::core::core::{FeeFields, KernelFeatures, TxKernel}; -use crate::core::{core, ser}; +use crate::core::{core, global, ser}; use crate::p2p; use crate::util::secp::pedersen; use crate::util::{self, ToHex}; @@ -68,6 +68,8 @@ impl Tip { /// Status page containing different server information #[derive(Serialize, Deserialize, Debug, Clone)] pub struct Status { + // The chain type + pub chain: String, // The protocol version pub protocol_version: u32, // The user user agent @@ -91,6 +93,7 @@ impl Status { sync_info: Option, ) -> Status { Status { + chain: global::get_chain_type().shortname(), protocol_version: ser::ProtocolVersion::local().into(), user_agent: p2p::msg::USER_AGENT.to_string(), connections: connections, diff --git a/src/bin/cmd/client.rs b/src/bin/cmd/client.rs index e3c6165b6..04bbdeb32 100644 --- a/src/bin/cmd/client.rs +++ b/src/bin/cmd/client.rs @@ -92,6 +92,7 @@ impl HTTPNodeClient { t.reset().unwrap(); match self.send_json_request::("get_status", &serde_json::Value::Null) { Ok(status) => { + writeln!(e, "Chain type: {}", status.chain).unwrap(); writeln!(e, "Protocol version: {:?}", status.protocol_version).unwrap(); writeln!(e, "User agent: {}", status.user_agent).unwrap(); writeln!(e, "Connections: {}", status.connections).unwrap();