diff --git a/Cargo.lock b/Cargo.lock index ce005a7c..2803df91 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -138,12 +138,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] -name = "ansi_term" -version = "0.12.1" +name = "anstream" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ - "winapi 0.3.9", + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", ] [[package]] @@ -152,6 +157,34 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2faccea4cc4ab4a667ce676a30e8ec13922a692c99bb8f5b11f1502c72e04220" +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + [[package]] name = "anyhow" version = "1.0.79" @@ -1089,38 +1122,6 @@ dependencies = [ "libloading 0.8.1", ] -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim 0.8.0", - "textwrap 0.11.0", - "unicode-width", - "vec_map", -] - -[[package]] -name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_derive", - "clap_lex 0.2.4", - "indexmap 1.9.3", - "once_cell", - "strsim 0.10.0", - "termcolor", - "textwrap 0.16.0", -] - [[package]] name = "clap" version = "4.4.18" @@ -1128,6 +1129,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" dependencies = [ "clap_builder", + "clap_derive", ] [[package]] @@ -1136,37 +1138,35 @@ version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" dependencies = [ + "anstream", "anstyle", - "clap_lex 0.6.0", + "clap_lex", + "strsim", ] [[package]] name = "clap_derive" -version = "3.2.25" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] -name = "clap_lex" -version = "0.6.0" +name = "colorchoice" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "combine" @@ -1310,7 +1310,7 @@ dependencies = [ "anes", "cast 0.3.0", "ciborium", - "clap 4.4.18", + "clap", "criterion-plot", "is-terminal", "itertools", @@ -1487,7 +1487,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", + "strsim", "syn 2.0.48", ] @@ -3224,7 +3224,7 @@ dependencies = [ name = "miraland-accounts-bench" version = "1.18.3" dependencies = [ - "clap 2.34.0", + "clap", "crossbeam-deque", "log", "miraland-accounts-db", @@ -3239,7 +3239,7 @@ dependencies = [ name = "miraland-accounts-cluster-bench" version = "1.18.3" dependencies = [ - "clap 2.34.0", + "clap", "log", "miraland-account-decoder", "miraland-accounts-db", @@ -3367,7 +3367,7 @@ dependencies = [ name = "miraland-banking-bench" version = "1.18.3" dependencies = [ - "clap 3.2.25", + "clap", "crossbeam-channel", "log", "miraland-client", @@ -3435,7 +3435,7 @@ dependencies = [ name = "miraland-bench-streamer" version = "1.18.3" dependencies = [ - "clap 3.2.25", + "clap", "crossbeam-channel", "miraland-net-utils", "miraland-streamer", @@ -3446,7 +3446,7 @@ dependencies = [ name = "miraland-bench-tps" version = "1.18.3" dependencies = [ - "clap 2.34.0", + "clap", "crossbeam-channel", "log", "miraland-clap-utils", @@ -3566,7 +3566,7 @@ dependencies = [ "assert_cmd", "bzip2", "cargo_metadata", - "clap 3.2.25", + "clap", "itertools", "log", "miraland-download-utils", @@ -3584,7 +3584,7 @@ dependencies = [ name = "miraland-cargo-registry" version = "1.18.3" dependencies = [ - "clap 2.34.0", + "clap", "flate2", "hex", "hyper", @@ -3618,7 +3618,7 @@ name = "miraland-cargo-test-sbf" version = "1.18.3" dependencies = [ "cargo_metadata", - "clap 3.2.25", + "clap", "itertools", "log", "miraland-logger", @@ -3630,7 +3630,7 @@ version = "1.18.3" dependencies = [ "assert_matches", "chrono", - "clap 2.34.0", + "clap", "miraland-remote-wallet", "miraland-sdk", "rpassword", @@ -3647,7 +3647,7 @@ version = "1.18.3" dependencies = [ "assert_matches", "chrono", - "clap 3.2.25", + "clap", "miraland-remote-wallet", "miraland-sdk", "miraland-zk-token-sdk", @@ -3666,7 +3666,7 @@ dependencies = [ "assert_matches", "bincode", "bs58", - "clap 2.34.0", + "clap", "console", "const_format", "criterion-stats", @@ -3735,7 +3735,7 @@ dependencies = [ "Inflector", "base64 0.21.7", "chrono", - "clap 2.34.0", + "clap", "console", "ed25519-dalek", "humantime", @@ -3975,7 +3975,7 @@ name = "miraland-dos" version = "1.18.3" dependencies = [ "bincode", - "clap 3.2.25", + "clap", "crossbeam-channel", "itertools", "log", @@ -4051,7 +4051,7 @@ version = "1.18.3" dependencies = [ "bincode", "byteorder", - "clap 2.34.0", + "clap", "crossbeam-channel", "log", "miraland-clap-utils", @@ -4108,7 +4108,7 @@ version = "1.18.3" dependencies = [ "base64 0.21.7", "bincode", - "clap 2.34.0", + "clap", "itertools", "miraland-accounts-db", "miraland-clap-utils", @@ -4217,7 +4217,7 @@ dependencies = [ "assert_matches", "bincode", "bv", - "clap 2.34.0", + "clap", "crossbeam-channel", "flate2", "indexmap 2.2.2", @@ -4269,7 +4269,7 @@ dependencies = [ "bincode", "bzip2", "chrono", - "clap 2.34.0", + "clap", "console", "crossbeam-channel", "ctrlc", @@ -4301,7 +4301,7 @@ name = "miraland-keygen" version = "1.18.3" dependencies = [ "bs58", - "clap 3.2.25", + "clap", "dirs-next", "miraland-clap-v3-utils", "miraland-cli-config", @@ -4390,7 +4390,7 @@ dependencies = [ "bs58", "bytecount", "chrono", - "clap 2.34.0", + "clap", "crossbeam-channel", "csv", "dashmap", @@ -4489,7 +4489,7 @@ name = "miraland-log-analyzer" version = "1.18.3" dependencies = [ "byte-unit", - "clap 3.2.25", + "clap", "miraland-logger", "miraland-version", "serde", @@ -4521,7 +4521,7 @@ version = "1.18.3" name = "miraland-merkle-root-bench" version = "1.18.3" dependencies = [ - "clap 2.34.0", + "clap", "log", "miraland-accounts-db", "miraland-logger", @@ -4559,7 +4559,7 @@ dependencies = [ name = "miraland-net-shaper" version = "1.18.3" dependencies = [ - "clap 3.2.25", + "clap", "miraland-logger", "rand 0.8.5", "serde", @@ -4571,7 +4571,7 @@ name = "miraland-net-utils" version = "1.18.3" dependencies = [ "bincode", - "clap 3.2.25", + "clap", "crossbeam-channel", "log", "miraland-logger", @@ -4659,7 +4659,7 @@ dependencies = [ name = "miraland-poh-bench" version = "1.18.3" dependencies = [ - "clap 3.2.25", + "clap", "log", "miraland-entry", "miraland-logger", @@ -4979,7 +4979,7 @@ name = "miraland-rpc-client-nonce-utils" version = "1.18.3" dependencies = [ "anyhow", - "clap 2.34.0", + "clap", "futures 0.3.30", "miraland-account-decoder", "miraland-clap-utils", @@ -5210,7 +5210,7 @@ dependencies = [ name = "miraland-stake-accounts" version = "1.18.3" dependencies = [ - "clap 2.34.0", + "clap", "miraland-clap-utils", "miraland-cli-config", "miraland-remote-wallet", @@ -5291,7 +5291,7 @@ dependencies = [ name = "miraland-store-tool" version = "1.18.3" dependencies = [ - "clap 2.34.0", + "clap", "log", "miraland-accounts-db", "miraland-logger", @@ -5394,7 +5394,7 @@ dependencies = [ "assert_matches", "bincode", "chrono", - "clap 2.34.0", + "clap", "console", "csv", "ctrlc", @@ -5447,7 +5447,7 @@ name = "miraland-transaction-dos" version = "1.18.3" dependencies = [ "bincode", - "clap 2.34.0", + "clap", "log", "miraland-clap-utils", "miraland-cli", @@ -5578,7 +5578,7 @@ name = "miraland-validator" version = "1.18.3" dependencies = [ "chrono", - "clap 2.34.0", + "clap", "console", "core_affinity", "crossbeam-channel", @@ -5697,7 +5697,7 @@ dependencies = [ name = "miraland-watchtower" version = "1.18.3" dependencies = [ - "clap 2.34.0", + "clap", "humantime", "log", "miraland-clap-utils", @@ -5739,7 +5739,7 @@ name = "miraland-zk-keygen" version = "1.18.3" dependencies = [ "bs58", - "clap 3.2.25", + "clap", "dirs-next", "miraland-clap-v3-utils", "miraland-cli-config", @@ -6182,12 +6182,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "os_str_bytes" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" - [[package]] name = "ouroboros" version = "0.15.6" @@ -8049,12 +8043,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - [[package]] name = "strsim" version = "0.10.0" @@ -8312,21 +8300,6 @@ dependencies = [ "test-case-core", ] -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "thiserror" version = "1.0.56" @@ -8978,6 +8951,12 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "valuable" version = "0.1.0" @@ -8990,12 +8969,6 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "version_check" version = "0.9.4" diff --git a/Cargo.toml b/Cargo.toml index 1a24e9ef..9604f624 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -176,7 +176,7 @@ cargo_metadata = "0.15.4" cc = "1.0.83" chrono = { version = "0.4.33", default-features = false } chrono-humanize = "0.2.3" -clap = "2.33.1" +clap = "4.4.18" console = "0.15.8" console_error_panic_hook = "0.1.7" console_log = "0.2.2" diff --git a/banking-bench/Cargo.toml b/banking-bench/Cargo.toml index 0fff7d6f..4e13289e 100644 --- a/banking-bench/Cargo.toml +++ b/banking-bench/Cargo.toml @@ -9,7 +9,7 @@ license = { workspace = true } edition = { workspace = true } [dependencies] -clap = { version = "3.1.8", features = ["derive"] } +clap = { version = "4.4.18", features = ["derive"] } crossbeam-channel = { workspace = true } log = { workspace = true } miraland-client = { workspace = true } diff --git a/bench-streamer/Cargo.toml b/bench-streamer/Cargo.toml index e3e88e4a..e594a109 100644 --- a/bench-streamer/Cargo.toml +++ b/bench-streamer/Cargo.toml @@ -9,7 +9,7 @@ license = { workspace = true } edition = { workspace = true } [dependencies] -clap = { version = "3.1.5", features = ["cargo"] } +clap = { version = "4.4.18", features = ["cargo"] } crossbeam-channel = { workspace = true } miraland-net-utils = { workspace = true } miraland-streamer = { workspace = true } diff --git a/clap-utils/Cargo.toml b/clap-utils/Cargo.toml index c46631e7..016e2486 100644 --- a/clap-utils/Cargo.toml +++ b/clap-utils/Cargo.toml @@ -11,7 +11,7 @@ edition = { workspace = true } [dependencies] chrono = { workspace = true, features = ["default"] } -clap = "2.33.0" +clap = "4.4.18" miraland-remote-wallet = { workspace = true } miraland-sdk = { workspace = true } rpassword = { workspace = true } diff --git a/clap-v3-utils/Cargo.toml b/clap-v3-utils/Cargo.toml index a36fd4f0..b3b1abb5 100644 --- a/clap-v3-utils/Cargo.toml +++ b/clap-v3-utils/Cargo.toml @@ -11,7 +11,7 @@ edition = { workspace = true } [dependencies] chrono = { workspace = true, features = ["default"] } -clap = { version = "3.2.23", features = ["cargo"] } +clap = { version = "4.4.18", features = ["cargo"] } miraland-remote-wallet = { workspace = true } miraland-sdk = { workspace = true } miraland-zk-token-sdk = { workspace = true } diff --git a/cli-output/Cargo.toml b/cli-output/Cargo.toml index 6576aeb1..64ae9f7e 100644 --- a/cli-output/Cargo.toml +++ b/cli-output/Cargo.toml @@ -13,7 +13,7 @@ edition = { workspace = true } Inflector = { workspace = true } base64 = { workspace = true } chrono = { workspace = true, features = ["default", "serde"] } -clap = "2.33.0" +clap = "4.4.18" console = { workspace = true } humantime = { workspace = true } indicatif = { workspace = true } diff --git a/dos/Cargo.toml b/dos/Cargo.toml index a846e829..7e0909e1 100644 --- a/dos/Cargo.toml +++ b/dos/Cargo.toml @@ -11,7 +11,7 @@ edition = { workspace = true } [dependencies] bincode = { workspace = true } -clap = { version = "3.1.5", features = ["derive", "cargo"] } +clap = { version = "4.4.18", features = ["derive", "cargo"] } crossbeam-channel = { workspace = true } itertools = { workspace = true } log = { workspace = true } diff --git a/keygen/Cargo.toml b/keygen/Cargo.toml index d6ba0fc5..f874282b 100644 --- a/keygen/Cargo.toml +++ b/keygen/Cargo.toml @@ -11,7 +11,7 @@ edition = { workspace = true } [dependencies] bs58 = { workspace = true } -clap = { version = "3.1.5", features = ["cargo"] } +clap = { version = "4.4.18", features = ["cargo"] } dirs-next = { workspace = true } miraland-clap-v3-utils = { workspace = true } miraland-cli-config = { workspace = true } diff --git a/log-analyzer/Cargo.toml b/log-analyzer/Cargo.toml index 733fa765..38a12bc4 100644 --- a/log-analyzer/Cargo.toml +++ b/log-analyzer/Cargo.toml @@ -11,7 +11,7 @@ edition = { workspace = true } [dependencies] byte-unit = { workspace = true } -clap = { version = "3.1.5", features = ["cargo"] } +clap = { version = "4.4.18", features = ["cargo"] } miraland-logger = { workspace = true } miraland-version = { workspace = true } serde = { workspace = true } diff --git a/net-shaper/Cargo.toml b/net-shaper/Cargo.toml index 3a929bd2..155a4d78 100644 --- a/net-shaper/Cargo.toml +++ b/net-shaper/Cargo.toml @@ -10,7 +10,7 @@ license = { workspace = true } edition = { workspace = true } [dependencies] -clap = { version = "3.1.5", features = ["cargo"] } +clap = { version = "4.4.18", features = ["cargo"] } miraland-logger = { workspace = true } rand = { workspace = true } serde = { workspace = true, features = ["derive"] } diff --git a/net-utils/Cargo.toml b/net-utils/Cargo.toml index 2417ffcf..1d82755c 100644 --- a/net-utils/Cargo.toml +++ b/net-utils/Cargo.toml @@ -11,7 +11,7 @@ edition = { workspace = true } [dependencies] bincode = { workspace = true } -clap = { version = "3.1.5", features = ["cargo"] } +clap = { version = "4.4.18", features = ["cargo"] } crossbeam-channel = { workspace = true } log = { workspace = true } miraland-logger = { workspace = true } diff --git a/poh-bench/Cargo.toml b/poh-bench/Cargo.toml index 8c2fd36d..dbd2305e 100644 --- a/poh-bench/Cargo.toml +++ b/poh-bench/Cargo.toml @@ -10,7 +10,7 @@ license = { workspace = true } edition = { workspace = true } [dependencies] -clap = { version = "3.1.5", features = ["cargo"] } +clap = { version = "4.4.18", features = ["cargo"] } log = { workspace = true } miraland-entry = { workspace = true } miraland-logger = { workspace = true } diff --git a/rpc-client-nonce-utils/Cargo.toml b/rpc-client-nonce-utils/Cargo.toml index 43bf4788..f835c19a 100644 --- a/rpc-client-nonce-utils/Cargo.toml +++ b/rpc-client-nonce-utils/Cargo.toml @@ -10,7 +10,7 @@ license = { workspace = true } edition = { workspace = true } [dependencies] -clap = "2.33.0" +clap = "4.4.18" miraland-clap-utils = { workspace = true } miraland-rpc-client = { workspace = true } miraland-sdk = { workspace = true } diff --git a/sdk/cargo-build-sbf/Cargo.toml b/sdk/cargo-build-sbf/Cargo.toml index 4cd83fba..dd2486b1 100644 --- a/sdk/cargo-build-sbf/Cargo.toml +++ b/sdk/cargo-build-sbf/Cargo.toml @@ -12,7 +12,7 @@ edition = { workspace = true } [dependencies] bzip2 = { workspace = true } cargo_metadata = { workspace = true } -clap = { version = "3.1.5", features = ["cargo", "env"] } +clap = { version = "4.4.18", features = ["cargo", "env"] } itertools = { workspace = true } log = { workspace = true, features = ["std"] } miraland-download-utils = { workspace = true } diff --git a/sdk/cargo-test-sbf/Cargo.toml b/sdk/cargo-test-sbf/Cargo.toml index f7054a81..d3fa6e44 100644 --- a/sdk/cargo-test-sbf/Cargo.toml +++ b/sdk/cargo-test-sbf/Cargo.toml @@ -11,7 +11,7 @@ edition = { workspace = true } [dependencies] cargo_metadata = { workspace = true } -clap = { version = "3.1.5", features = ["cargo"] } +clap = { version = "4.4.18", features = ["cargo"] } itertools = { workspace = true } log = { workspace = true, features = ["std"] } miraland-logger = { workspace = true } diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml index f3eb6326..a9fcaa67 100644 --- a/tokens/Cargo.toml +++ b/tokens/Cargo.toml @@ -11,7 +11,7 @@ edition = { workspace = true } [dependencies] chrono = { workspace = true, features = ["default", "serde"] } -clap = "2.33.0" +clap = "4.4.18" console = { workspace = true } csv = { workspace = true } ctrlc = { workspace = true, features = ["termination"] } diff --git a/zk-keygen/Cargo.toml b/zk-keygen/Cargo.toml index dd7a12d2..48de37f0 100644 --- a/zk-keygen/Cargo.toml +++ b/zk-keygen/Cargo.toml @@ -17,7 +17,7 @@ edition = { workspace = true } [dependencies] bs58 = { workspace = true } -clap = { version = "3.1.5", features = ["cargo", "derive"] } +clap = { version = "4.4.18", features = ["cargo", "derive"] } dirs-next = { workspace = true } miraland-clap-v3-utils = { workspace = true } miraland-cli-config = { workspace = true }