From e048143844ed5f3c297637345a259b7108c3548b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Oct 2021 08:31:35 +0000
Subject: [PATCH] chore: bump clap from 3.0.0-beta.2 to 3.0.0-beta.5

Bumps [clap](https://github.com/clap-rs/clap) from 3.0.0-beta.2 to 3.0.0-beta.5.
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/commits)

---
updated-dependencies:
- dependency-name: clap
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock                        | 317 +++++++++++++-----------------
 accounts-bench/Cargo.toml         |   2 +-
 accounts-cluster-bench/Cargo.toml |   2 +-
 banking-bench/Cargo.toml          |   2 +-
 bench-streamer/Cargo.toml         |   2 +-
 bench-tps/Cargo.toml              |   2 +-
 clap-utils/Cargo.toml             |   2 +-
 cli-output/Cargo.toml             |   2 +-
 cli/Cargo.toml                    |   2 +-
 client/Cargo.toml                 |   2 +-
 dos/Cargo.toml                    |   2 +-
 faucet/Cargo.toml                 |   2 +-
 genesis/Cargo.toml                |   2 +-
 gossip/Cargo.toml                 |   2 +-
 install/Cargo.toml                |   2 +-
 keygen/Cargo.toml                 |   2 +-
 ledger-tool/Cargo.toml            |   2 +-
 log-analyzer/Cargo.toml           |   2 +-
 merkle-root-bench/Cargo.toml      |   2 +-
 net-shaper/Cargo.toml             |   2 +-
 net-utils/Cargo.toml              |   2 +-
 poh-bench/Cargo.toml              |   2 +-
 rbpf-cli/Cargo.toml               |   2 +-
 replica-node/Cargo.toml           |   2 +-
 runtime/store-tool/Cargo.toml     |   2 +-
 sdk/cargo-build-bpf/Cargo.toml    |   2 +-
 sdk/cargo-test-bpf/Cargo.toml     |   2 +-
 stake-accounts/Cargo.toml         |   2 +-
 sys-tuner/Cargo.toml              |   2 +-
 tokens/Cargo.toml                 |   2 +-
 validator/Cargo.toml              |   2 +-
 watchtower/Cargo.toml             |   2 +-
 32 files changed, 168 insertions(+), 211 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4fe44d24fc57dd..fa3a3cf51e4a7f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -59,15 +59,6 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
 
-[[package]]
-name = "ansi_term"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-dependencies = [
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "anyhow"
 version = "1.0.38"
@@ -146,9 +137,9 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3548b8efc9f8e8a5a0a2808c5bd8451a9031b9e5b879a79590304ae928b0a70"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -157,9 +148,9 @@ version = "0.1.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -283,7 +274,7 @@ dependencies = [
  "lazy_static",
  "lazycell",
  "peeking_take_while",
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
  "regex",
  "rustc-hash",
@@ -420,8 +411,8 @@ dependencies = [
  "borsh-derive-internal",
  "borsh-schema-derive-internal",
  "proc-macro-crate",
- "proc-macro2 1.0.24",
- "syn 1.0.67",
+ "proc-macro2 1.0.30",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -430,9 +421,9 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2102f62f8b6d3edeab871830782285b64cc1830168094db05c8e458f209bc5c3"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -441,9 +432,9 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "196c978c4c9b0b142d446ef3240690bf5a8a33497074a113ff9a337ccb750483"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -522,9 +513,9 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e215f8c2f9f79cb53c8335e687ffd07d5bfcb6fe5fc80723762d0be46e7cc54"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -683,24 +674,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "2.33.3"
+version = "3.0.0-beta.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
-dependencies = [
- "ansi_term",
- "atty",
- "bitflags",
- "strsim 0.8.0",
- "textwrap 0.11.0",
- "unicode-width",
- "vec_map",
-]
-
-[[package]]
-name = "clap"
-version = "3.0.0-beta.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bd1061998a501ee7d4b6d449020df3266ca3124b941ec56cf2005c3779ca142"
+checksum = "feff3878564edb93745d58cf63e17b63f24142506e7a20c87a5521ed7bfb1d63"
 dependencies = [
  "atty",
  "bitflags",
@@ -708,24 +684,23 @@ dependencies = [
  "indexmap",
  "lazy_static",
  "os_str_bytes",
- "strsim 0.10.0",
+ "strsim",
  "termcolor",
- "textwrap 0.12.1",
- "unicode-width",
- "vec_map",
+ "textwrap",
+ "unicase 2.6.0",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "3.0.0-beta.2"
+version = "3.0.0-beta.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "370f715b81112975b1b69db93e0b56ea4cd4e5002ac43b2da8474106a54096a1"
+checksum = "8b15c6b4f786ffb6192ffe65a36855bc1fc2444bcd0945ae16748dcd6ed7d0d3"
 dependencies = [
  "heck",
  "proc-macro-error",
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -795,7 +770,7 @@ version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98b53b21a34874c03f4ee8fe5a5dbd977fbe09cfa43b7e2362d94f33e42d56af"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
  "unicode-xid 0.2.0",
 ]
@@ -1059,9 +1034,9 @@ version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb582b60359da160a9477ee80f15c8d784c477e69c217ef2cdd4169c24ea380f"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -1070,9 +1045,9 @@ version = "0.99.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -1227,9 +1202,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f86b50932a01e7ec5c06160492ab660fb19b6bb2a7878030dd6cd68d21df9d4d"
 dependencies = [
  "enum-ordinalize",
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -1268,9 +1243,9 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -1281,9 +1256,9 @@ checksum = "0b166c9e378360dd5a6666a9604bb4f54ae0cac39023ffbac425e917a2a04fef"
 dependencies = [
  "num-bigint",
  "num-traits",
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -1343,9 +1318,9 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
  "synstructure",
 ]
 
@@ -1550,9 +1525,9 @@ checksum = "18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb"
 dependencies = [
  "autocfg 1.0.0",
  "proc-macro-hack",
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -2139,9 +2114,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b939a78fa820cdfcb7ee7484466746a7377760970f6f9c6fe19f9edcc8a38d2"
 dependencies = [
  "proc-macro-crate",
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -2640,9 +2615,9 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -2691,9 +2666,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c0fd9eba1d5db0994a239e09c1be402d35622277e35468ba891aa5e3188ce7e"
 dependencies = [
  "proc-macro-crate",
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -2780,9 +2755,12 @@ dependencies = [
 
 [[package]]
 name = "os_str_bytes"
-version = "2.4.0"
+version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afb2e1c3ee07430c2cf76151675e583e0f19985fa6efae47d6848a3e2c824f85"
+checksum = "addaa943333a514159c80c97ff4a93306530d965d27e139188283cd13e06a799"
+dependencies = [
+ "memchr",
+]
 
 [[package]]
 name = "ouroboros"
@@ -2803,9 +2781,9 @@ checksum = "f463857a6eb96c0136b1d56e56c718350cef30412ec065b48294799a088bca68"
 dependencies = [
  "Inflector",
  "proc-macro-error",
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -2985,9 +2963,9 @@ version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -2996,9 +2974,9 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -3080,9 +3058,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr",
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
  "version_check 0.9.2",
 ]
 
@@ -3092,7 +3070,7 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
  "version_check 0.9.2",
 ]
@@ -3120,9 +3098,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.24"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+checksum = "edc3358ebc67bc8b7fa0c007f945b0b18226f78437d61bec735a9eb96b61ee70"
 dependencies = [
  "unicode-xid 0.2.0",
 ]
@@ -3183,9 +3161,9 @@ checksum = "600d2f334aa05acb02a755e217ef1ab6dea4d51b58b7846588b747edec04efba"
 dependencies = [
  "anyhow",
  "itertools 0.10.1",
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -3234,7 +3212,7 @@ version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
 ]
 
 [[package]]
@@ -3497,7 +3475,7 @@ dependencies = [
 name = "rbpf-cli"
 version = "1.8.0"
 dependencies = [
- "clap 3.0.0-beta.2",
+ "clap",
  "serde",
  "serde_json",
  "solana-bpf-loader-program",
@@ -3793,9 +3771,9 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e367622f934864ffa1c704ba2b82280aab856e3d8213c84c5720257eb34b15b9"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -3889,9 +3867,9 @@ version = "1.0.130"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -3946,9 +3924,9 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2acd6defeddb41eb60bb468f8825d0cfd0c2a76bc03bfd235b6a1dc4f6a1ad5"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -4138,7 +4116,7 @@ dependencies = [
 name = "solana-accounts-bench"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log 0.4.14",
  "rayon",
  "solana-logger 1.8.0",
@@ -4152,7 +4130,7 @@ dependencies = [
 name = "solana-accounts-cluster-bench"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log 0.4.14",
  "rand 0.7.3",
  "rayon",
@@ -4178,7 +4156,7 @@ dependencies = [
 name = "solana-banking-bench"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "log 0.4.14",
  "rand 0.7.3",
@@ -4241,7 +4219,7 @@ dependencies = [
 name = "solana-bench-streamer"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "solana-clap-utils",
  "solana-logger 1.8.0",
  "solana-net-utils",
@@ -4253,7 +4231,7 @@ dependencies = [
 name = "solana-bench-tps"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log 0.4.14",
  "rayon",
  "serde_json",
@@ -4299,7 +4277,7 @@ version = "1.8.0"
 dependencies = [
  "bzip2",
  "cargo_metadata",
- "clap 2.33.3",
+ "clap",
  "regex",
  "serial_test",
  "solana-download-utils",
@@ -4312,7 +4290,7 @@ name = "solana-cargo-test-bpf"
 version = "1.8.0"
 dependencies = [
  "cargo_metadata",
- "clap 2.33.3",
+ "clap",
 ]
 
 [[package]]
@@ -4320,7 +4298,7 @@ name = "solana-clap-utils"
 version = "1.8.0"
 dependencies = [
  "chrono",
- "clap 2.33.3",
+ "clap",
  "rpassword",
  "solana-remote-wallet",
  "solana-sdk",
@@ -4337,7 +4315,7 @@ version = "1.8.0"
 dependencies = [
  "bincode",
  "bs58 0.4.0",
- "clap 2.33.3",
+ "clap",
  "console",
  "const_format",
  "criterion-stats",
@@ -4392,7 +4370,7 @@ dependencies = [
  "Inflector",
  "base64 0.13.0",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "humantime",
  "indicatif",
@@ -4415,7 +4393,7 @@ dependencies = [
  "base64 0.13.0",
  "bincode",
  "bs58 0.4.0",
- "clap 2.33.3",
+ "clap",
  "indicatif",
  "jsonrpc-core",
  "jsonrpc-http-server",
@@ -4542,7 +4520,7 @@ dependencies = [
  "ring",
  "serde",
  "syn 0.15.44",
- "syn 1.0.67",
+ "syn 1.0.80",
  "winapi 0.3.9",
 ]
 
@@ -4551,7 +4529,7 @@ name = "solana-dos"
 version = "1.8.0"
 dependencies = [
  "bincode",
- "clap 2.33.3",
+ "clap",
  "log 0.4.14",
  "rand 0.7.3",
  "solana-client",
@@ -4620,7 +4598,7 @@ version = "1.8.0"
 dependencies = [
  "bincode",
  "byteorder",
- "clap 2.33.3",
+ "clap",
  "log 0.4.14",
  "serde",
  "serde_derive",
@@ -4679,20 +4657,20 @@ version = "1.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ceac6e8ad1a784c92ff5f3d6ad68a8d664d389b08055b674c38b2b9abb69e6d4"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
  "rustc_version 0.2.3",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
 name = "solana-frozen-abi-macro"
 version = "1.8.0"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
  "rustc_version 0.4.0",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -4700,7 +4678,7 @@ name = "solana-genesis"
 version = "1.8.0"
 dependencies = [
  "base64 0.12.3",
- "clap 2.33.3",
+ "clap",
  "serde",
  "serde_json",
  "serde_yaml",
@@ -4732,7 +4710,7 @@ version = "1.8.0"
 dependencies = [
  "bincode",
  "bv",
- "clap 2.33.3",
+ "clap",
  "flate2",
  "indexmap",
  "itertools 0.10.1",
@@ -4777,7 +4755,7 @@ dependencies = [
  "bincode",
  "bzip2",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "ctrlc",
  "dirs-next",
@@ -4806,7 +4784,7 @@ name = "solana-keygen"
 version = "1.8.0"
 dependencies = [
  "bs58 0.4.0",
- "clap 2.33.3",
+ "clap",
  "dirs-next",
  "num_cpus",
  "solana-clap-utils",
@@ -4875,7 +4853,7 @@ dependencies = [
  "assert_cmd",
  "bs58 0.4.0",
  "bytecount",
- "clap 2.33.3",
+ "clap",
  "csv",
  "histogram",
  "itertools 0.10.1",
@@ -4935,7 +4913,7 @@ name = "solana-log-analyzer"
 version = "1.8.0"
 dependencies = [
  "byte-unit",
- "clap 2.33.3",
+ "clap",
  "serde",
  "serde_json",
  "solana-logger 1.8.0",
@@ -4974,7 +4952,7 @@ dependencies = [
 name = "solana-merkle-root-bench"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log 0.4.14",
  "solana-logger 1.8.0",
  "solana-measure",
@@ -5011,7 +4989,7 @@ dependencies = [
 name = "solana-net-shaper"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "rand 0.7.3",
  "serde",
  "serde_json",
@@ -5024,7 +5002,7 @@ name = "solana-net-utils"
 version = "1.8.0"
 dependencies = [
  "bincode",
- "clap 2.33.3",
+ "clap",
  "log 0.4.14",
  "nix",
  "rand 0.7.3",
@@ -5114,7 +5092,7 @@ dependencies = [
 name = "solana-poh-bench"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log 0.4.14",
  "rand 0.7.3",
  "rayon",
@@ -5285,7 +5263,7 @@ dependencies = [
 name = "solana-replica-node"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "crossbeam-channel",
  "log 0.4.14",
  "rand 0.7.3",
@@ -5472,10 +5450,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84710ce45a21cccd9f2b09d8e9aad529080bb2540f27b1253874b6e732b465b9"
 dependencies = [
  "bs58 0.3.1",
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
  "rustversion",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -5483,10 +5461,10 @@ name = "solana-sdk-macro"
 version = "1.8.0"
 dependencies = [
  "bs58 0.4.0",
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
  "rustversion",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -5515,7 +5493,7 @@ dependencies = [
 name = "solana-stake-accounts"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "solana-clap-utils",
  "solana-cli-config",
  "solana-client",
@@ -5589,7 +5567,7 @@ dependencies = [
 name = "solana-store-tool"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "log 0.4.14",
  "solana-logger 1.8.0",
  "solana-runtime",
@@ -5615,7 +5593,7 @@ dependencies = [
 name = "solana-sys-tuner"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "libc",
  "log 0.4.14",
  "nix",
@@ -5632,7 +5610,7 @@ version = "1.8.0"
 dependencies = [
  "bincode",
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "csv",
  "ctrlc",
@@ -5692,7 +5670,7 @@ name = "solana-validator"
 version = "1.8.0"
 dependencies = [
  "chrono",
- "clap 2.33.3",
+ "clap",
  "console",
  "core_affinity",
  "fd-lock",
@@ -5768,7 +5746,7 @@ dependencies = [
 name = "solana-watchtower"
 version = "1.8.0"
 dependencies = [
- "clap 2.33.3",
+ "clap",
  "humantime",
  "log 0.4.14",
  "solana-clap-utils",
@@ -5881,11 +5859,11 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
  "serde",
  "serde_derive",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -5895,13 +5873,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
 dependencies = [
  "base-x",
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
  "serde",
  "serde_derive",
  "serde_json",
  "sha1",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -5910,12 +5888,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
 
-[[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"
@@ -5953,11 +5925,11 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.67"
+version = "1.0.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702"
+checksum = "d010a1623fbd906d51d650a9916aaefc05ffa0e4053ff7fe601167f3e715d194"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
  "unicode-xid 0.2.0",
 ]
@@ -5968,9 +5940,9 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
  "unicode-xid 0.2.0",
 ]
 
@@ -6049,9 +6021,9 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea80818e6c75f81d961d7426c1b938cbea6b3a51533b5ee71b61f82166b7ef3d"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -6089,18 +6061,9 @@ dependencies = [
 
 [[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.12.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "203008d98caf094106cfaba70acfed15e18ed3ddb7d94e49baec153a2b462789"
+checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"
 dependencies = [
  "unicode-width",
 ]
@@ -6120,9 +6083,9 @@ version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -6191,10 +6154,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa"
 dependencies = [
  "proc-macro-hack",
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
  "standback",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -6314,9 +6277,9 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c49e3df43841dafb86046472506755d8501c5615673955f6aa17181125d13c37"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -6482,10 +6445,10 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12b52d07035516c2b74337d2ac7746075e7dcae7643816c1b12c5ff8a7484c08"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "prost-build",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -6539,9 +6502,9 @@ version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
 ]
 
 [[package]]
@@ -6786,12 +6749,6 @@ version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168"
 
-[[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.1.5"
@@ -6867,9 +6824,9 @@ dependencies = [
  "bumpalo",
  "lazy_static",
  "log 0.4.14",
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
  "wasm-bindgen-shared",
 ]
 
@@ -6901,9 +6858,9 @@ version = "0.2.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4133b5e7f2a531fa413b3a1695e925038a05a71cf67e87dafa295cb645a01385"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -7104,9 +7061,9 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2"
 dependencies = [
- "proc-macro2 1.0.24",
+ "proc-macro2 1.0.30",
  "quote 1.0.9",
- "syn 1.0.67",
+ "syn 1.0.80",
  "synstructure",
 ]
 
diff --git a/accounts-bench/Cargo.toml b/accounts-bench/Cargo.toml
index d7dc82cb43a09e..6a953802419da5 100644
--- a/accounts-bench/Cargo.toml
+++ b/accounts-bench/Cargo.toml
@@ -16,7 +16,7 @@ solana-runtime = { path = "../runtime", version = "=1.8.0" }
 solana-measure = { path = "../measure", version = "=1.8.0" }
 solana-sdk = { path = "../sdk", version = "=1.8.0" }
 solana-version = { path = "../version", version = "=1.8.0" }
-clap = "2.33.1"
+clap = "3.0.0-beta"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/accounts-cluster-bench/Cargo.toml b/accounts-cluster-bench/Cargo.toml
index 06f4ea12540afb..ba46cbedf1a8a0 100644
--- a/accounts-cluster-bench/Cargo.toml
+++ b/accounts-cluster-bench/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
 publish = false
 
 [dependencies]
-clap = "2.33.1"
+clap = "3.0.0-beta"
 log = "0.4.14"
 rand = "0.7.0"
 rayon = "1.5.1"
diff --git a/banking-bench/Cargo.toml b/banking-bench/Cargo.toml
index 034944e6d140e0..ddc98fc8199680 100644
--- a/banking-bench/Cargo.toml
+++ b/banking-bench/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
 publish = false
 
 [dependencies]
-clap = "2.33.1"
+clap = "3.0.0-beta"
 crossbeam-channel = "0.5"
 log = "0.4.14"
 rand = "0.7.0"
diff --git a/bench-streamer/Cargo.toml b/bench-streamer/Cargo.toml
index 9f55c8262ebb56..d013f367aaed1c 100644
--- a/bench-streamer/Cargo.toml
+++ b/bench-streamer/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
 publish = false
 
 [dependencies]
-clap = "2.33.1"
+clap = "3.0.0-beta"
 solana-clap-utils = { path = "../clap-utils", version = "=1.8.0" }
 solana-streamer = { path = "../streamer", version = "=1.8.0" }
 solana-logger = { path = "../logger", version = "=1.8.0" }
diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml
index df054c20513724..b0019ddd10299a 100644
--- a/bench-tps/Cargo.toml
+++ b/bench-tps/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
 publish = false
 
 [dependencies]
-clap = "2.33.1"
+clap = "3.0.0-beta"
 log = "0.4.14"
 rayon = "1.5.1"
 serde_json = "1.0.67"
diff --git a/clap-utils/Cargo.toml b/clap-utils/Cargo.toml
index dbc72bad73a288..78f12bcd4c3e90 100644
--- a/clap-utils/Cargo.toml
+++ b/clap-utils/Cargo.toml
@@ -10,7 +10,7 @@ documentation = "https://docs.rs/solana-clap-utils"
 edition = "2018"
 
 [dependencies]
-clap = "2.33.0"
+clap = "3.0.0-beta"
 rpassword = "5.0"
 solana-remote-wallet = { path = "../remote-wallet", version = "=1.8.0" }
 solana-sdk = { path = "../sdk", version = "=1.8.0" }
diff --git a/cli-output/Cargo.toml b/cli-output/Cargo.toml
index e1588d31a79f7b..0a630b7bde4c15 100644
--- a/cli-output/Cargo.toml
+++ b/cli-output/Cargo.toml
@@ -12,7 +12,7 @@ documentation = "https://docs.rs/solana-cli-output"
 [dependencies]
 base64 = "0.13.0"
 chrono = { version = "0.4.11", features = ["serde"] }
-clap = "2.33.0"
+clap = "3.0.0-beta"
 console = "0.14.1"
 humantime = "2.0.1"
 Inflector = "0.11.4"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index dbf17631f1db65..13ea4dad7526c2 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -12,7 +12,7 @@ documentation = "https://docs.rs/solana-cli"
 [dependencies]
 bincode = "1.3.3"
 bs58 = "0.4.0"
-clap = "2.33.1"
+clap = "3.0.0-beta"
 criterion-stats = "0.3.0"
 ctrlc = { version = "3.1.9", features = ["termination"] }
 console = "0.14.1"
diff --git a/client/Cargo.toml b/client/Cargo.toml
index 46b1e949e71189..ca4e9d4a958ce1 100644
--- a/client/Cargo.toml
+++ b/client/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 base64 = "0.13.0"
 bincode = "1.3.3"
 bs58 = "0.4.0"
-clap = "2.33.0"
+clap = "3.0.0-beta"
 indicatif = "0.16.2"
 jsonrpc-core = "18.0.0"
 log = "0.4.14"
diff --git a/dos/Cargo.toml b/dos/Cargo.toml
index 94702f36da5d8f..b9a47fedbf5d3d 100644
--- a/dos/Cargo.toml
+++ b/dos/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 
 [dependencies]
 bincode = "1.3.3"
-clap = "2.33.1"
+clap = "3.0.0-beta"
 log = "0.4.14"
 rand = "0.7.0"
 solana-core = { path = "../core", version = "=1.8.0" }
diff --git a/faucet/Cargo.toml b/faucet/Cargo.toml
index 49b5f160a51d12..cc089bf2bde628 100644
--- a/faucet/Cargo.toml
+++ b/faucet/Cargo.toml
@@ -12,7 +12,7 @@ edition = "2018"
 [dependencies]
 bincode = "1.3.3"
 byteorder = "1.4.3"
-clap = "2.33"
+clap = "3.0"
 log = "0.4.14"
 serde = "1.0.130"
 serde_derive = "1.0.103"
diff --git a/genesis/Cargo.toml b/genesis/Cargo.toml
index 9a1df387f3626f..ff73f39c733b32 100644
--- a/genesis/Cargo.toml
+++ b/genesis/Cargo.toml
@@ -11,7 +11,7 @@ documentation = "https://docs.rs/solana-genesis"
 
 [dependencies]
 base64 = "0.12.3"
-clap = "2.33.1"
+clap = "3.0.0-beta"
 serde = "1.0.130"
 serde_json = "1.0.67"
 serde_yaml = "0.8.21"
diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml
index 80a7219ab75a1a..59f76a5880d658 100644
--- a/gossip/Cargo.toml
+++ b/gossip/Cargo.toml
@@ -12,7 +12,7 @@ documentation = "https://docs.rs/solana-gossip"
 [dependencies]
 bincode = "1.3.3"
 bv = { version = "0.11.1", features = ["serde"] }
-clap = "2.33.1"
+clap = "3.0.0-beta"
 flate2 = "1.0"
 indexmap = { version = "1.7", features = ["rayon"] }
 itertools = "0.10.1"
diff --git a/install/Cargo.toml b/install/Cargo.toml
index 848b6b5ff23b18..08c655610a522b 100644
--- a/install/Cargo.toml
+++ b/install/Cargo.toml
@@ -14,7 +14,7 @@ atty = "0.2.11"
 bincode = "1.3.3"
 bzip2 = "0.4.3"
 chrono = { version = "0.4.11", features = ["serde"] }
-clap = { version = "2.33.1" }
+clap = { version = "3.0.0-beta" }
 console = "0.14.1"
 ctrlc = { version = "3.1.9", features = ["termination"] }
 dirs-next = "2.0.0"
diff --git a/keygen/Cargo.toml b/keygen/Cargo.toml
index d3d7f4dd7b2f8c..71cff46a42c912 100644
--- a/keygen/Cargo.toml
+++ b/keygen/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 
 [dependencies]
 bs58 = "0.4.0"
-clap = "2.33"
+clap = "3.0"
 dirs-next = "2.0.0"
 num_cpus = "1.13.0"
 solana-clap-utils = { path = "../clap-utils", version = "=1.8.0" }
diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml
index 50c784a7936085..8bfe1841f06757 100644
--- a/ledger-tool/Cargo.toml
+++ b/ledger-tool/Cargo.toml
@@ -12,7 +12,7 @@ documentation = "https://docs.rs/solana-ledger-tool"
 [dependencies]
 bs58 = "0.4.0"
 bytecount = "0.6.2"
-clap = "2.33.1"
+clap = "3.0.0-beta"
 csv = "1.1.6"
 histogram = "*"
 itertools = "0.10.1"
diff --git a/log-analyzer/Cargo.toml b/log-analyzer/Cargo.toml
index 013ccf0376ca91..24031cabc96350 100644
--- a/log-analyzer/Cargo.toml
+++ b/log-analyzer/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 
 [dependencies]
 byte-unit = "4.0.12"
-clap = "2.33.1"
+clap = "3.0.0-beta"
 serde = "1.0.130"
 serde_json = "1.0.67"
 solana-logger = { path = "../logger", version = "=1.8.0" }
diff --git a/merkle-root-bench/Cargo.toml b/merkle-root-bench/Cargo.toml
index beab0f0b414665..158df3963ff034 100644
--- a/merkle-root-bench/Cargo.toml
+++ b/merkle-root-bench/Cargo.toml
@@ -15,7 +15,7 @@ solana-runtime = { path = "../runtime", version = "=1.8.0" }
 solana-measure = { path = "../measure", version = "=1.8.0" }
 solana-sdk = { path = "../sdk", version = "=1.8.0" }
 solana-version = { path = "../version", version = "=1.8.0" }
-clap = "2.33.1"
+clap = "3.0.0-beta"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/net-shaper/Cargo.toml b/net-shaper/Cargo.toml
index 9203bc14b72139..439e090c3040e5 100644
--- a/net-shaper/Cargo.toml
+++ b/net-shaper/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://solana.com/"
 publish = false
 
 [dependencies]
-clap = "2.33.1"
+clap = "3.0.0-beta"
 serde = "1.0.130"
 serde_json = "1.0.67"
 solana-clap-utils = { path = "../clap-utils", version = "=1.8.0" }
diff --git a/net-utils/Cargo.toml b/net-utils/Cargo.toml
index dd50e5dd8595ff..4b2144de1755c8 100644
--- a/net-utils/Cargo.toml
+++ b/net-utils/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 
 [dependencies]
 bincode = "1.3.3"
-clap = "2.33.1"
+clap = "3.0.0-beta"
 log = "0.4.14"
 nix = "0.20.0"
 rand = "0.7.0"
diff --git a/poh-bench/Cargo.toml b/poh-bench/Cargo.toml
index b03e226b13b3f5..0d897dffb59e19 100644
--- a/poh-bench/Cargo.toml
+++ b/poh-bench/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-poh-bench"
 
 [dependencies]
-clap = "2.33.1"
+clap = "3.0.0-beta"
 log = "0.4.14"
 rand = "0.7.0"
 rayon = "1.5.1"
diff --git a/rbpf-cli/Cargo.toml b/rbpf-cli/Cargo.toml
index 9f8c19de9d1388..c80d24e8c3fca5 100644
--- a/rbpf-cli/Cargo.toml
+++ b/rbpf-cli/Cargo.toml
@@ -9,7 +9,7 @@ keywords = ["BPF", "eBPF", "interpreter", "JIT"]
 edition = "2018"
 
 [dependencies]
-clap = "3.0.0-beta.2"
+clap = "3.0.0-beta.5"
 serde = "1.0.130"
 serde_json = "1.0.67"
 solana-bpf-loader-program = { path = "../programs/bpf_loader", version = "=1.8.0" }
diff --git a/replica-node/Cargo.toml b/replica-node/Cargo.toml
index e69202922b05ae..6731dbb853ca62 100644
--- a/replica-node/Cargo.toml
+++ b/replica-node/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-validator"
 
 [dependencies]
-clap = "2.33.1"
+clap = "3.0.0-beta"
 crossbeam-channel = "0.5"
 log = "0.4.14"
 rand = "0.7.0"
diff --git a/runtime/store-tool/Cargo.toml b/runtime/store-tool/Cargo.toml
index c6141bcf600feb..73c3ee1d0b24c1 100644
--- a/runtime/store-tool/Cargo.toml
+++ b/runtime/store-tool/Cargo.toml
@@ -14,7 +14,7 @@ log = { version = "0.4.14" }
 solana-logger = { path = "../../logger", version = "=1.8.0" }
 solana-version = { path = "../../version", version = "=1.8.0" }
 solana-runtime = { path = "..", version = "=1.8.0" }
-clap = "2.33.1"
+clap = "3.0.0-beta"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
diff --git a/sdk/cargo-build-bpf/Cargo.toml b/sdk/cargo-build-bpf/Cargo.toml
index 77ca163982e83f..cafd5825f56de4 100644
--- a/sdk/cargo-build-bpf/Cargo.toml
+++ b/sdk/cargo-build-bpf/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 
 [dependencies]
 bzip2 = "0.4.3"
-clap = "2.33.3"
+clap = "3.0.0-beta"
 regex = "1.5.4"
 cargo_metadata = "0.14.0"
 solana-sdk = { path = "..", version = "=1.8.0" }
diff --git a/sdk/cargo-test-bpf/Cargo.toml b/sdk/cargo-test-bpf/Cargo.toml
index 8a6dbcb72e371c..3ff6498a5578e7 100644
--- a/sdk/cargo-test-bpf/Cargo.toml
+++ b/sdk/cargo-test-bpf/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 publish = false
 
 [dependencies]
-clap = "2.33.3"
+clap = "3.0.0-beta"
 cargo_metadata = "0.14.0"
 
 [[bin]]
diff --git a/stake-accounts/Cargo.toml b/stake-accounts/Cargo.toml
index e8b4c12ddaef9a..a0b3b5f6c06ed4 100644
--- a/stake-accounts/Cargo.toml
+++ b/stake-accounts/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-stake-accounts"
 
 [dependencies]
-clap = "2.33.1"
+clap = "3.0.0-beta"
 solana-clap-utils = { path = "../clap-utils", version = "=1.8.0" }
 solana-cli-config = { path = "../cli-config", version = "=1.8.0" }
 solana-client = { path = "../client", version = "=1.8.0" }
diff --git a/sys-tuner/Cargo.toml b/sys-tuner/Cargo.toml
index 83c70dd1219a1a..d125a7eff7184f 100644
--- a/sys-tuner/Cargo.toml
+++ b/sys-tuner/Cargo.toml
@@ -11,7 +11,7 @@ documentation = "https://docs.rs/solana-sys-tuner"
 publish = true
 
 [dependencies]
-clap = "2.33.1"
+clap = "3.0.0-beta"
 log = "0.4.14"
 libc = "0.2.101"
 solana-logger = { path = "../logger", version = "=1.8.0" }
diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml
index da31cf02533777..78ffa9d747ce4e 100644
--- a/tokens/Cargo.toml
+++ b/tokens/Cargo.toml
@@ -11,7 +11,7 @@ documentation = "https://docs.rs/solana-tokens"
 
 [dependencies]
 chrono = { version = "0.4", features = ["serde"] }
-clap = "2.33.0"
+clap = "3.0.0-beta"
 console = "0.14.1"
 csv = "1.1.6"
 ctrlc = { version = "3.1.9", features = ["termination"] }
diff --git a/validator/Cargo.toml b/validator/Cargo.toml
index 361befdc0f8f6e..bdb52d34ae3416 100644
--- a/validator/Cargo.toml
+++ b/validator/Cargo.toml
@@ -12,7 +12,7 @@ default-run = "solana-validator"
 
 [dependencies]
 chrono = { version = "0.4.11", features = ["serde"] }
-clap = "2.33.1"
+clap = "3.0.0-beta"
 console = "0.14.1"
 core_affinity = "0.5.10"
 fd-lock = "3.0.0"
diff --git a/watchtower/Cargo.toml b/watchtower/Cargo.toml
index f9061450ae9e48..cc37f624c6b239 100644
--- a/watchtower/Cargo.toml
+++ b/watchtower/Cargo.toml
@@ -10,7 +10,7 @@ homepage = "https://solana.com/"
 documentation = "https://docs.rs/solana-watchtower"
 
 [dependencies]
-clap = "2.33.1"
+clap = "3.0.0-beta"
 log = "0.4.14"
 humantime = "2.0.1"
 solana-clap-utils = { path = "../clap-utils", version = "=1.8.0" }