From 7e63d25dae7879dc41b66e384ae9c43cdcf8c395 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Apr 2022 09:33:15 +0000 Subject: [PATCH] chore: bump tokio-util from 0.6.9 to 0.7.1 (#213) * chore: bump clap from 2.33.3 to 3.1.8 (#206) Bumps [clap](https://github.com/clap-rs/clap) from 2.33.3 to 3.1.8. - [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/compare/v2.33.3...v3.1.8) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: bump rand from 0.7.3 to 0.8.5 (#205) Bumps [rand](https://github.com/rust-random/rand) from 0.7.3 to 0.8.5. - [Release notes](https://github.com/rust-random/rand/releases) - [Changelog](https://github.com/rust-random/rand/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-random/rand/compare/0.7.3...0.8.5) --- updated-dependencies: - dependency-name: rand dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: bump eslint-plugin-import from 2.25.3 to 2.26.0 in /web3.js (#209) Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.25.3 to 2.26.0. - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.25.3...v2.26.0) --- updated-dependencies: - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: bump tokio-util from 0.6.9 to 0.7.1 Bumps [tokio-util](https://github.com/tokio-rs/tokio) from 0.6.9 to 0.7.1. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-util-0.6.9...tokio-util-0.7.1) --- updated-dependencies: - dependency-name: tokio-util dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 0d773bd13afe90032222f68be73cfe90a278da23) # Conflicts: # Cargo.lock # accounts-bench/Cargo.toml # accounts-cluster-bench/Cargo.toml # banking-bench/Cargo.toml # bench-tps/Cargo.toml # bloom/Cargo.toml # clap-utils/Cargo.toml # cli/Cargo.toml # client/Cargo.toml # core/Cargo.toml # dos/Cargo.toml # entry/Cargo.toml # faucet/Cargo.toml # genesis/Cargo.toml # gossip/Cargo.toml # ledger-tool/Cargo.toml # local-cluster/Cargo.toml # merkle-root-bench/Cargo.toml # metrics/Cargo.toml # net-shaper/Cargo.toml # net-utils/Cargo.toml # perf/Cargo.toml # poh-bench/Cargo.toml # poh/Cargo.toml # programs/bpf_loader/Cargo.toml # programs/ed25519-tests/Cargo.toml # rbpf-cli/Cargo.toml # runtime/store-tool/Cargo.toml # sdk/cargo-build-bpf/Cargo.toml # sdk/cargo-test-bpf/Cargo.toml # stake-accounts/Cargo.toml # sys-tuner/Cargo.toml # transaction-dos/Cargo.toml # validator/Cargo.toml # watchtower/Cargo.toml --- Cargo.lock | 132 +++++++++++++++++++++++++++++- accounts-bench/Cargo.toml | 4 + accounts-cluster-bench/Cargo.toml | 3 + banking-bench/Cargo.toml | 3 + bench-tps/Cargo.toml | 3 + bloom/Cargo.toml | 3 + clap-utils/Cargo.toml | 3 + cli/Cargo.toml | 4 + client/Cargo.toml | 3 + core/Cargo.toml | 5 ++ dos/Cargo.toml | 5 ++ entry/Cargo.toml | 3 + faucet/Cargo.toml | 3 + genesis/Cargo.toml | 3 + gossip/Cargo.toml | 3 + ledger-tool/Cargo.toml | 3 + local-cluster/Cargo.toml | 3 + merkle-root-bench/Cargo.toml | 4 + metrics/Cargo.toml | 3 + net-shaper/Cargo.toml | 4 + net-utils/Cargo.toml | 6 ++ perf/Cargo.toml | 3 + poh-bench/Cargo.toml | 5 ++ poh/Cargo.toml | 3 + programs/bpf_loader/Cargo.toml | 3 + programs/ed25519-tests/Cargo.toml | 3 + rbpf-cli/Cargo.toml | 3 + rpc/Cargo.toml | 2 +- runtime/store-tool/Cargo.toml | 4 + sdk/cargo-build-bpf/Cargo.toml | 3 + sdk/cargo-test-bpf/Cargo.toml | 3 + stake-accounts/Cargo.toml | 3 + sys-tuner/Cargo.toml | 3 + transaction-dos/Cargo.toml | 3 + validator/Cargo.toml | 3 + watchtower/Cargo.toml | 3 + web3.js/package-lock.json | 34 ++++---- web3.js/package.json | 2 +- web3.js/yarn.lock | 30 +++---- 39 files changed, 280 insertions(+), 36 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3b59d9de2eff4e..62ffb26f9ac352 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -712,6 +712,7 @@ dependencies = [ [[package]] name = "clap" <<<<<<< HEAD +<<<<<<< HEAD version = "2.33.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" @@ -729,6 +730,8 @@ dependencies = [ name = "clap" version = "3.0.0-beta.5" ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) version = "3.1.8" >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) source = "registry+https://github.com/rust-lang/crates.io-index" @@ -742,12 +745,16 @@ dependencies = [ "os_str_bytes", "strsim", "termcolor", +<<<<<<< HEAD <<<<<<< HEAD "textwrap 0.14.2", "unicase 2.6.0", ======= "textwrap", >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) +======= + "textwrap", +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) ] [[package]] @@ -3740,11 +3747,15 @@ dependencies = [ name = "rbpf-cli" version = "1.9.17" dependencies = [ +<<<<<<< HEAD <<<<<<< HEAD "clap 3.0.0-beta.5", ======= "clap", >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) +======= + "clap", +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "serde", "serde_json", "solana-bpf-loader-program", @@ -4466,10 +4477,13 @@ dependencies = [ name = "solana-accounts-bench" version = "1.9.17" dependencies = [ +<<<<<<< HEAD <<<<<<< HEAD "clap 2.33.3", "log 0.4.14", ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "clap", "log", >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) @@ -4485,6 +4499,7 @@ dependencies = [ name = "solana-accounts-cluster-bench" version = "1.9.17" dependencies = [ +<<<<<<< HEAD <<<<<<< HEAD "clap 2.33.3", "log 0.4.14", @@ -4497,6 +4512,11 @@ dependencies = [ ======= "rand 0.8.5", >>>>>>> 318544455 (chore: bump rand from 0.7.3 to 0.8.5 (#205)) +======= + "clap", + "log", + "rand 0.8.5", +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "rayon", "solana-account-decoder", "solana-clap-utils", @@ -4550,6 +4570,7 @@ dependencies = [ name = "solana-banking-bench" version = "1.9.17" dependencies = [ +<<<<<<< HEAD <<<<<<< HEAD "clap 2.33.3", ======= @@ -4563,6 +4584,12 @@ dependencies = [ "log", "rand 0.8.5", >>>>>>> 318544455 (chore: bump rand from 0.7.3 to 0.8.5 (#205)) +======= + "clap", + "crossbeam-channel", + "log", + "rand 0.8.5", +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "rayon", "solana-core", "solana-gossip", @@ -4623,11 +4650,14 @@ dependencies = [ name = "solana-bench-streamer" version = "1.9.17" dependencies = [ +<<<<<<< HEAD <<<<<<< HEAD "clap 2.33.3", "solana-clap-utils", "solana-logger 1.9.17", ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "clap", "crossbeam-channel", >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) @@ -4640,10 +4670,13 @@ dependencies = [ name = "solana-bench-tps" version = "1.9.17" dependencies = [ +<<<<<<< HEAD <<<<<<< HEAD "clap 2.33.3", "log 0.4.14", ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "clap", "crossbeam-channel", "log", @@ -4674,6 +4707,7 @@ version = "1.9.17" dependencies = [ "bv", "fnv", +<<<<<<< HEAD <<<<<<< HEAD "log 0.4.14", "rand 0.7.3", @@ -4681,6 +4715,10 @@ dependencies = [ "log", "rand 0.8.5", >>>>>>> 318544455 (chore: bump rand from 0.7.3 to 0.8.5 (#205)) +======= + "log", + "rand 0.8.5", +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "rayon", "rustc_version 0.4.0", "serde", @@ -4704,7 +4742,10 @@ dependencies = [ "libsecp256k1", "log", "rand 0.8.5", +<<<<<<< HEAD >>>>>>> 318544455 (chore: bump rand from 0.7.3 to 0.8.5 (#205)) +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "solana-measure", "solana-metrics", "solana-program-runtime", @@ -4728,7 +4769,10 @@ dependencies = [ "memmap2", "modular-bitfield", "rand 0.8.5", +<<<<<<< HEAD >>>>>>> 318544455 (chore: bump rand from 0.7.3 to 0.8.5 (#205)) +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "rayon", "solana-logger 1.9.17", "solana-measure", @@ -4742,11 +4786,15 @@ version = "1.9.17" dependencies = [ "bzip2", "cargo_metadata", +<<<<<<< HEAD <<<<<<< HEAD "clap 2.33.3", ======= "clap", >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) +======= + "clap", +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "regex", "serial_test", "solana-download-utils", @@ -4759,11 +4807,15 @@ name = "solana-cargo-test-bpf" version = "1.9.17" dependencies = [ "cargo_metadata", +<<<<<<< HEAD <<<<<<< HEAD "clap 2.33.3", ======= "clap", >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) +======= + "clap", +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) ] [[package]] @@ -4809,6 +4861,7 @@ name = "solana-cli" version = "1.9.17" dependencies = [ "bincode", +<<<<<<< HEAD <<<<<<< HEAD "bs58 0.4.0", "clap 2.33.3", @@ -4816,6 +4869,10 @@ dependencies = [ "bs58", "clap", >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) +======= + "bs58", + "clap", +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "console", "const_format", "criterion-stats", @@ -5061,6 +5118,7 @@ name = "solana-dos" version = "1.9.17" dependencies = [ "bincode", +<<<<<<< HEAD <<<<<<< HEAD "clap 2.33.3", "log 0.4.14", @@ -5071,6 +5129,10 @@ dependencies = [ >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) "rand 0.7.3", ======= +======= + "clap", + "log", +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "rand 0.8.5", "serde", >>>>>>> 318544455 (chore: bump rand from 0.7.3 to 0.8.5 (#205)) @@ -5135,10 +5197,13 @@ version = "1.9.17" dependencies = [ "bincode", "byteorder", +<<<<<<< HEAD <<<<<<< HEAD "clap 2.33.3", "log 0.4.14", ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "clap", "crossbeam-channel", "log", @@ -5220,6 +5285,7 @@ dependencies = [ name = "solana-genesis" version = "1.9.17" dependencies = [ +<<<<<<< HEAD <<<<<<< HEAD "base64 0.12.3", "clap 2.33.3", @@ -5227,6 +5293,10 @@ dependencies = [ "base64 0.13.0", "clap", >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) +======= + "base64 0.13.0", + "clap", +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "serde", "serde_json", "serde_yaml", @@ -5290,9 +5360,12 @@ version = "1.9.17" dependencies = [ "bincode", "bv", +<<<<<<< HEAD <<<<<<< HEAD "clap 2.33.3", ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "clap", "crossbeam-channel", >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) @@ -5369,6 +5442,7 @@ dependencies = [ name = "solana-keygen" version = "1.9.17" dependencies = [ +<<<<<<< HEAD <<<<<<< HEAD "bs58 0.4.0", "clap 2.33.3", @@ -5376,6 +5450,10 @@ dependencies = [ "bs58", "clap", >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) +======= + "bs58", + "clap", +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "dirs-next", "num_cpus", "solana-clap-utils", @@ -5447,9 +5525,12 @@ dependencies = [ "assert_cmd", "bs58 0.4.0", "bytecount", +<<<<<<< HEAD <<<<<<< HEAD "clap 2.33.3", ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "clap", "crossbeam-channel", >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) @@ -5497,7 +5578,10 @@ dependencies = [ "itertools", "log", "rand 0.8.5", +<<<<<<< HEAD >>>>>>> 318544455 (chore: bump rand from 0.7.3 to 0.8.5 (#205)) +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "rayon", "serial_test", "solana-client", @@ -5521,11 +5605,15 @@ name = "solana-log-analyzer" version = "1.9.17" dependencies = [ "byte-unit", +<<<<<<< HEAD <<<<<<< HEAD "clap 2.33.3", ======= "clap", >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) +======= + "clap", +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "serde", "serde_json", "solana-logger 1.9.17", @@ -5564,11 +5652,14 @@ dependencies = [ name = "solana-merkle-root-bench" version = "1.9.17" dependencies = [ +<<<<<<< HEAD <<<<<<< HEAD "clap 2.33.3", "log 0.4.14", "solana-logger 1.9.17", ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "clap", "log", "solana-logger 1.11.0", @@ -5596,6 +5687,7 @@ dependencies = [ "env_logger 0.9.0", "gethostname", "lazy_static", +<<<<<<< HEAD <<<<<<< HEAD "log 0.4.14", "rand 0.7.3", @@ -5603,6 +5695,10 @@ dependencies = [ "log", "rand 0.8.5", >>>>>>> 318544455 (chore: bump rand from 0.7.3 to 0.8.5 (#205)) +======= + "log", + "rand 0.8.5", +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "reqwest", "serial_test", "solana-sdk", @@ -5612,6 +5708,7 @@ dependencies = [ name = "solana-net-shaper" version = "1.9.17" dependencies = [ +<<<<<<< HEAD <<<<<<< HEAD "clap 2.33.3", ======= @@ -5622,6 +5719,10 @@ dependencies = [ ======= "rand 0.8.5", >>>>>>> 318544455 (chore: bump rand from 0.7.3 to 0.8.5 (#205)) +======= + "clap", + "rand 0.8.5", +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "serde", "serde_json", "solana-clap-utils", @@ -5633,10 +5734,13 @@ name = "solana-net-utils" version = "1.9.17" dependencies = [ "bincode", +<<<<<<< HEAD <<<<<<< HEAD "clap 2.33.3", "log 0.4.14", ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "clap", "crossbeam-channel", "log", @@ -5716,6 +5820,7 @@ dependencies = [ name = "solana-poh-bench" version = "1.9.17" dependencies = [ +<<<<<<< HEAD <<<<<<< HEAD "clap 2.33.3", "log 0.4.14", @@ -5728,6 +5833,11 @@ dependencies = [ ======= "rand 0.8.5", >>>>>>> 318544455 (chore: bump rand from 0.7.3 to 0.8.5 (#205)) +======= + "clap", + "log", + "rand 0.8.5", +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "rayon", "solana-entry", "solana-logger 1.9.17", @@ -5988,7 +6098,7 @@ dependencies = [ "symlink", "thiserror", "tokio", - "tokio-util 0.6.9", + "tokio-util 0.7.1", ] [[package]] @@ -6240,11 +6350,14 @@ dependencies = [ name = "solana-store-tool" version = "1.9.17" dependencies = [ +<<<<<<< HEAD <<<<<<< HEAD "clap 2.33.3", "log 0.4.14", "solana-logger 1.9.17", ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "clap", "log", "solana-logger 1.11.0", @@ -6351,6 +6464,7 @@ name = "solana-transaction-dos" version = "1.9.17" dependencies = [ "bincode", +<<<<<<< HEAD <<<<<<< HEAD "clap 2.33.3", "log 0.4.14", @@ -6363,6 +6477,11 @@ dependencies = [ ======= "rand 0.8.5", >>>>>>> 318544455 (chore: bump rand from 0.7.3 to 0.8.5 (#205)) +======= + "clap", + "log", + "rand 0.8.5", +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "rayon", "solana-clap-utils", "solana-cli", @@ -6432,9 +6551,12 @@ dependencies = [ "libc", "log 0.4.14", "num_cpus", +<<<<<<< HEAD <<<<<<< HEAD "rand 0.7.3", ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) "rand 0.8.5", "serde", "serde_json", @@ -6938,6 +7060,7 @@ checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16" [[package]] name = "textwrap" <<<<<<< HEAD +<<<<<<< HEAD version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" @@ -6949,6 +7072,8 @@ dependencies = [ name = "textwrap" version = "0.14.2" ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) version = "0.15.0" >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7298,7 +7423,6 @@ checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" dependencies = [ "bytes 1.1.0", "futures-core", - "futures-io", "futures-sink", "log 0.4.14", "pin-project-lite", @@ -7314,6 +7438,7 @@ checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" dependencies = [ "bytes 1.1.0", "futures-core", + "futures-io", "futures-sink", "pin-project-lite", "tokio", @@ -7694,12 +7819,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] +<<<<<<< HEAD name = "version_check" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" [[package]] +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) name = "version_check" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/accounts-bench/Cargo.toml b/accounts-bench/Cargo.toml index af3aa274554e3f..0d55ff91605032 100644 --- a/accounts-bench/Cargo.toml +++ b/accounts-bench/Cargo.toml @@ -10,9 +10,13 @@ publish = false [dependencies] <<<<<<< HEAD +<<<<<<< HEAD ======= clap = "3.1.8" >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) +======= +clap = "3.1.8" +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) log = "0.4.14" rayon = "1.5.1" solana-logger = { path = "../logger", version = "=1.9.17" } diff --git a/accounts-cluster-bench/Cargo.toml b/accounts-cluster-bench/Cargo.toml index 4048a204a2601d..8b49d8caed63d1 100644 --- a/accounts-cluster-bench/Cargo.toml +++ b/accounts-cluster-bench/Cargo.toml @@ -12,6 +12,7 @@ publish = false clap = "3.1.8" log = "0.4.14" <<<<<<< HEAD +<<<<<<< HEAD rand = "0.7.0" rayon = "1.5.1" solana-account-decoder = { path = "../account-decoder", version = "=1.9.17" } @@ -30,6 +31,8 @@ solana-test-validator = { path = "../test-validator", version = "=1.9.17" } solana-transaction-status = { path = "../transaction-status", version = "=1.9.17" } solana-version = { path = "../version", version = "=1.9.17" } ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) rand = "0.8.5" rayon = "1.5.2" solana-account-decoder = { path = "../account-decoder", version = "=1.11.0" } diff --git a/banking-bench/Cargo.toml b/banking-bench/Cargo.toml index e27d52b0fdf021..c27113baf13341 100644 --- a/banking-bench/Cargo.toml +++ b/banking-bench/Cargo.toml @@ -13,6 +13,7 @@ clap = "2.33.1" crossbeam-channel = "0.5" log = "0.4.14" <<<<<<< HEAD +<<<<<<< HEAD rand = "0.7.0" rayon = "1.5.1" solana-core = { path = "../core", version = "=1.9.17" } @@ -27,6 +28,8 @@ solana-streamer = { path = "../streamer", version = "=1.9.17" } solana-sdk = { path = "../sdk", version = "=1.9.17" } solana-version = { path = "../version", version = "=1.9.17" } ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) rand = "0.8.5" rayon = "1.5.2" solana-core = { path = "../core", version = "=1.11.0" } diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml index 580bf7fcdd09e2..10e30367f57cef 100644 --- a/bench-tps/Cargo.toml +++ b/bench-tps/Cargo.toml @@ -10,8 +10,11 @@ publish = false [dependencies] <<<<<<< HEAD +<<<<<<< HEAD clap = "2.33.1" ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) clap = "3.1.8" crossbeam-channel = "0.5" >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) diff --git a/bloom/Cargo.toml b/bloom/Cargo.toml index 14f06542a47973..f44ec8a2981759 100644 --- a/bloom/Cargo.toml +++ b/bloom/Cargo.toml @@ -13,10 +13,13 @@ edition = "2021" bv = { version = "0.11.1", features = ["serde"] } fnv = "1.0.7" <<<<<<< HEAD +<<<<<<< HEAD rand = "0.7.0" serde = { version = "1.0.133", features = ["rc"] } rayon = "1.5.1" ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) log = "0.4.14" rand = "0.8.5" rayon = "1.5.2" diff --git a/clap-utils/Cargo.toml b/clap-utils/Cargo.toml index b05f31de05c722..67851f2aed7cd8 100644 --- a/clap-utils/Cargo.toml +++ b/clap-utils/Cargo.toml @@ -11,12 +11,15 @@ edition = "2021" [dependencies] <<<<<<< HEAD +<<<<<<< HEAD clap = "2.33.0" rpassword = "5.0" solana-perf = { path = "../perf", version = "=1.9.17" } solana-remote-wallet = { path = "../remote-wallet", version = "=1.9.17" } solana-sdk = { path = "../sdk", version = "=1.9.17" } ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) chrono = "0.4" clap = "3.1.8" rpassword = "6.0" diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 8d2c4859a6f34b..bc75a436fd71b0 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -13,12 +13,16 @@ documentation = "https://docs.rs/solana-cli" bincode = "1.3.3" bs58 = "0.4.0" <<<<<<< HEAD +<<<<<<< HEAD clap = "2.33.1" criterion-stats = "0.3.0" ctrlc = { version = "3.2.1", features = ["termination"] } ======= clap = "3.1.8" >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) +======= +clap = "3.1.8" +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) console = "0.15.0" const_format = "0.2.22" log = "0.4.14" diff --git a/client/Cargo.toml b/client/Cargo.toml index 091b595968bc9b..210dae4bf76acc 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -14,8 +14,11 @@ base64 = "0.13.0" bincode = "1.3.3" bs58 = "0.4.0" <<<<<<< HEAD +<<<<<<< HEAD clap = "2.33.0" ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) bytes = "1.1.0" clap = "3.1.8" crossbeam-channel = "0.5" diff --git a/core/Cargo.toml b/core/Cargo.toml index 3254b07f8e4a0e..ff6465c94c868a 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -27,12 +27,17 @@ histogram = "0.6.9" itertools = "0.10.1" log = "0.4.14" <<<<<<< HEAD +<<<<<<< HEAD lru = "0.7.1" rand = "0.7.0" ======= lru = "0.7.5" rand = "0.8.5" >>>>>>> 318544455 (chore: bump rand from 0.7.3 to 0.8.5 (#205)) +======= +lru = "0.7.5" +rand = "0.8.5" +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) rand_chacha = "0.2.2" raptorq = "1.6.4" rayon = "1.5.1" diff --git a/dos/Cargo.toml b/dos/Cargo.toml index 4a0045b1252e5f..4acc630e8e257d 100644 --- a/dos/Cargo.toml +++ b/dos/Cargo.toml @@ -11,6 +11,7 @@ publish = false [dependencies] bincode = "1.3.3" <<<<<<< HEAD +<<<<<<< HEAD clap = "2.33.1" ======= clap = {version = "3.1.8", features = ["derive", "cargo"]} @@ -28,6 +29,10 @@ solana-streamer = { path = "../streamer", version = "=1.9.17" } solana-version = { path = "../version", version = "=1.9.17" } solana-client = { path = "../client", version = "=1.9.17" } ======= +======= +clap = {version = "3.1.8", features = ["derive", "cargo"]} +log = "0.4.14" +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) rand = "0.8.5" serde = "1.0.136" solana-client = { path = "../client", version = "=1.11.0" } diff --git a/entry/Cargo.toml b/entry/Cargo.toml index 18a9b9cc6c2395..0e3d3f4a62769a 100644 --- a/entry/Cargo.toml +++ b/entry/Cargo.toml @@ -14,6 +14,7 @@ dlopen = "0.1.8" dlopen_derive = "0.1.4" log = "0.4.11" <<<<<<< HEAD +<<<<<<< HEAD rand = "0.7.0" rayon = "1.5.1" serde = "1.0.130" @@ -25,6 +26,8 @@ solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.9.17" solana-sdk = { path = "../sdk", version = "=1.9.17" } bincode = "1.3.3" ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) rand = "0.8.5" rayon = "1.5.2" serde = "1.0.136" diff --git a/faucet/Cargo.toml b/faucet/Cargo.toml index 6273373c7f8dce..3422be7995a545 100644 --- a/faucet/Cargo.toml +++ b/faucet/Cargo.toml @@ -13,8 +13,11 @@ edition = "2021" bincode = "1.3.3" byteorder = "1.4.3" <<<<<<< HEAD +<<<<<<< HEAD clap = "2.33" ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) clap = "3.1" crossbeam-channel = "0.5" >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) diff --git a/genesis/Cargo.toml b/genesis/Cargo.toml index c7080059942712..3d89a5ae6a37bb 100644 --- a/genesis/Cargo.toml +++ b/genesis/Cargo.toml @@ -11,6 +11,7 @@ documentation = "https://docs.rs/solana-genesis" [dependencies] <<<<<<< HEAD +<<<<<<< HEAD base64 = "0.12.3" clap = "2.33.1" serde = "1.0.130" @@ -28,6 +29,8 @@ solana-version = { path = "../version", version = "=1.9.17" } solana-vote-program = { path = "../programs/vote", version = "=1.9.17" } tempfile = "3.2.0" ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) base64 = "0.13.0" clap = "3.1.8" serde = "1.0.136" diff --git a/gossip/Cargo.toml b/gossip/Cargo.toml index 01fc528f9b65a3..a37ed6127c85d0 100644 --- a/gossip/Cargo.toml +++ b/gossip/Cargo.toml @@ -13,8 +13,11 @@ documentation = "https://docs.rs/solana-gossip" bincode = "1.3.3" bv = { version = "0.11.1", features = ["serde"] } <<<<<<< HEAD +<<<<<<< HEAD clap = "2.33.1" ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) clap = "3.1.8" crossbeam-channel = "0.5" >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) diff --git a/ledger-tool/Cargo.toml b/ledger-tool/Cargo.toml index 866fcda8b60b25..bfccc61c925b92 100644 --- a/ledger-tool/Cargo.toml +++ b/ledger-tool/Cargo.toml @@ -12,9 +12,12 @@ documentation = "https://docs.rs/solana-ledger-tool" [dependencies] bs58 = "0.4.0" <<<<<<< HEAD +<<<<<<< HEAD bytecount = "0.6.2" clap = "2.33.1" ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) clap = "3.1.8" crossbeam-channel = "0.5" >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) diff --git a/local-cluster/Cargo.toml b/local-cluster/Cargo.toml index f87ff21f1bd9e8..12279ecc287d63 100644 --- a/local-cluster/Cargo.toml +++ b/local-cluster/Cargo.toml @@ -16,6 +16,7 @@ gag = "1.0.0" fs_extra = "1.2.0" log = "0.4.14" <<<<<<< HEAD +<<<<<<< HEAD rand = "0.7.0" rayon = "1.5.1" solana-config-program = { path = "../programs/config", version = "=1.9.17" } @@ -33,6 +34,8 @@ solana-streamer = { path = "../streamer", version = "=1.9.17" } solana-vote-program = { path = "../programs/vote", version = "=1.9.17" } tempfile = "3.2.0" ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) rand = "0.8.5" rayon = "1.5.2" solana-client = { path = "../client", version = "=1.11.0" } diff --git a/merkle-root-bench/Cargo.toml b/merkle-root-bench/Cargo.toml index 9c21bf485810a6..7e2393b8d17b15 100644 --- a/merkle-root-bench/Cargo.toml +++ b/merkle-root-bench/Cargo.toml @@ -10,9 +10,13 @@ publish = false [dependencies] <<<<<<< HEAD +<<<<<<< HEAD ======= clap = "3.1.8" >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) +======= +clap = "3.1.8" +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) log = "0.4.14" solana-logger = { path = "../logger", version = "=1.9.17" } solana-runtime = { path = "../runtime", version = "=1.9.17" } diff --git a/metrics/Cargo.toml b/metrics/Cargo.toml index 0be53750d6619a..1d9ce6b354a185 100644 --- a/metrics/Cargo.toml +++ b/metrics/Cargo.toml @@ -19,9 +19,12 @@ solana-sdk = { path = "../sdk", version = "=1.9.17" } [dev-dependencies] <<<<<<< HEAD +<<<<<<< HEAD rand = "0.7.0" serial_test = "0.5.1" ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) env_logger = "0.9.0" rand = "0.8.5" serial_test = "0.6.0" diff --git a/net-shaper/Cargo.toml b/net-shaper/Cargo.toml index c044164ed68c99..8a6b8f1a69aa19 100644 --- a/net-shaper/Cargo.toml +++ b/net-shaper/Cargo.toml @@ -11,6 +11,7 @@ publish = false [dependencies] <<<<<<< HEAD +<<<<<<< HEAD clap = "2.33.1" serde = "1.0.130" serde_json = "1.0.72" @@ -22,6 +23,9 @@ rand = "0.7.0" ======= rand = "0.8.5" >>>>>>> 318544455 (chore: bump rand from 0.7.3 to 0.8.5 (#205)) +======= +rand = "0.8.5" +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) clap = { version = "3.1.8", features = ["cargo"] } serde = { version = "1.0.136", features = ["derive"] } serde_json = "1.0.79" diff --git a/net-utils/Cargo.toml b/net-utils/Cargo.toml index fd98754b36595e..de24de20bf4987 100644 --- a/net-utils/Cargo.toml +++ b/net-utils/Cargo.toml @@ -12,17 +12,23 @@ edition = "2021" [dependencies] bincode = "1.3.3" <<<<<<< HEAD +<<<<<<< HEAD clap = "2.33.1" ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) clap = { version = "3.1.8", features = ["cargo"] } crossbeam-channel = "0.5" >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) log = "0.4.14" <<<<<<< HEAD +<<<<<<< HEAD nix = "0.23.0" rand = "0.7.0" serde = "1.0.130" ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) nix = "0.23.1" rand = "0.8.5" serde = "1.0.136" diff --git a/perf/Cargo.toml b/perf/Cargo.toml index 57c2248fc318bc..c4734167b23415 100644 --- a/perf/Cargo.toml +++ b/perf/Cargo.toml @@ -20,6 +20,7 @@ bv = { version = "0.11.1", features = ["serde"] } fnv = "1.0.7" log = "0.4.14" <<<<<<< HEAD +<<<<<<< HEAD rand = "0.7.0" rayon = "1.5.1" serde = "1.0.130" @@ -30,6 +31,8 @@ solana-sdk = { path = "../sdk", version = "=1.9.17" } solana-vote-program = { path = "../programs/vote", version = "=1.9.17" } solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "=1.9.17" } ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) rand = "0.8.5" rayon = "1.5.2" serde = "1.0.136" diff --git a/poh-bench/Cargo.toml b/poh-bench/Cargo.toml index 6699406dff865d..d59a7604d40ece 100644 --- a/poh-bench/Cargo.toml +++ b/poh-bench/Cargo.toml @@ -11,6 +11,7 @@ publish = false [dependencies] <<<<<<< HEAD +<<<<<<< HEAD clap = "2.33.1" ======= clap = { version = "3.1.8", features = ["cargo"] } @@ -26,6 +27,10 @@ solana-measure = { path = "../measure", version = "=1.9.17" } solana-version = { path = "../version", version = "=1.9.17" } solana-perf = { path = "../perf", version = "=1.9.17" } ======= +======= +clap = { version = "3.1.8", features = ["cargo"] } +log = "0.4.14" +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) rand = "0.8.5" rayon = "1.5.2" solana-entry = { path = "../entry", version = "=1.11.0" } diff --git a/poh/Cargo.toml b/poh/Cargo.toml index f64cedf93d4e46..cf844ee8395c16 100644 --- a/poh/Cargo.toml +++ b/poh/Cargo.toml @@ -26,10 +26,13 @@ thiserror = "1.0" bincode = "1.3.3" matches = "0.1.9" <<<<<<< HEAD +<<<<<<< HEAD rand = "0.7.0" solana-logger = { path = "../logger", version = "=1.9.17" } solana-perf = { path = "../perf", version = "=1.9.17" } ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) rand = "0.8.5" solana-logger = { path = "../logger", version = "=1.11.0" } solana-perf = { path = "../perf", version = "=1.11.0" } diff --git a/programs/bpf_loader/Cargo.toml b/programs/bpf_loader/Cargo.toml index e829db9ff0b1d0..d9e419f2f56d30 100644 --- a/programs/bpf_loader/Cargo.toml +++ b/programs/bpf_loader/Cargo.toml @@ -23,9 +23,12 @@ thiserror = "1.0" [dev-dependencies] <<<<<<< HEAD +<<<<<<< HEAD rand = "0.7.3" solana-runtime = { path = "../../runtime", version = "=1.9.17" } ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) rand = "0.8.5" solana-runtime = { path = "../../runtime", version = "=1.11.0" } >>>>>>> 318544455 (chore: bump rand from 0.7.3 to 0.8.5 (#205)) diff --git a/programs/ed25519-tests/Cargo.toml b/programs/ed25519-tests/Cargo.toml index 7936e5148d83d4..85243e51d784f8 100644 --- a/programs/ed25519-tests/Cargo.toml +++ b/programs/ed25519-tests/Cargo.toml @@ -12,10 +12,13 @@ publish = false assert_matches = "1.5.0" ed25519-dalek = "=1.0.1" <<<<<<< HEAD +<<<<<<< HEAD rand = "0.7.0" solana-program-test = { path = "../../program-test", version = "=1.9.17" } solana-sdk = { path = "../../sdk", version = "=1.9.17" } ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) rand = "0.8.5" solana-program-test = { path = "../../program-test", version = "=1.11.0" } solana-sdk = { path = "../../sdk", version = "=1.11.0" } diff --git a/rbpf-cli/Cargo.toml b/rbpf-cli/Cargo.toml index 1bee5ee929d30a..d127a28c1223c7 100644 --- a/rbpf-cli/Cargo.toml +++ b/rbpf-cli/Cargo.toml @@ -11,6 +11,7 @@ publish = false [dependencies] <<<<<<< HEAD +<<<<<<< HEAD clap = "3.0.0-beta.2" serde = "1.0.130" serde_json = "1.0.72" @@ -21,6 +22,8 @@ solana-sdk = { path = "../sdk", version = "=1.9.17" } solana_rbpf = "=0.2.24" time = "0.3.5" ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) clap = { version = "3.1.8", features = ["cargo"] } serde = "1.0.136" serde_json = "1.0.79" diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml index b80789a28aa168..a525525aff95e7 100644 --- a/rpc/Cargo.toml +++ b/rpc/Cargo.toml @@ -53,7 +53,7 @@ spl-token = { version = "=3.2.0", features = ["no-entrypoint"] } stream-cancel = "0.8.1" thiserror = "1.0" tokio = { version = "1", features = ["full"] } -tokio-util = { version = "0.6", features = ["codec", "compat"] } +tokio-util = { version = "0.7", features = ["codec", "compat"] } [dev-dependencies] serial_test = "0.5.1" diff --git a/runtime/store-tool/Cargo.toml b/runtime/store-tool/Cargo.toml index 89a3419eb2e600..e421632073300f 100644 --- a/runtime/store-tool/Cargo.toml +++ b/runtime/store-tool/Cargo.toml @@ -11,9 +11,13 @@ publish = false [dependencies] <<<<<<< HEAD +<<<<<<< HEAD ======= clap = "3.1.8" >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) +======= +clap = "3.1.8" +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) log = { version = "0.4.14" } solana-logger = { path = "../../logger", version = "=1.9.17" } solana-version = { path = "../../version", version = "=1.9.17" } diff --git a/sdk/cargo-build-bpf/Cargo.toml b/sdk/cargo-build-bpf/Cargo.toml index e9ef2af306addb..052fcb5e8d5d02 100644 --- a/sdk/cargo-build-bpf/Cargo.toml +++ b/sdk/cargo-build-bpf/Cargo.toml @@ -16,7 +16,10 @@ clap = "2.33.3" ======= cargo_metadata = "0.14.2" clap = { version = "3.1.8", features = ["cargo", "env"] } +<<<<<<< HEAD >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) regex = "1.5.4" cargo_metadata = "0.14.1" solana-sdk = { path = "..", version = "=1.9.17" } diff --git a/sdk/cargo-test-bpf/Cargo.toml b/sdk/cargo-test-bpf/Cargo.toml index b2a6e1cc5c3336..b3045d13514fb0 100644 --- a/sdk/cargo-test-bpf/Cargo.toml +++ b/sdk/cargo-test-bpf/Cargo.toml @@ -16,7 +16,10 @@ cargo_metadata = "0.14.1" ======= cargo_metadata = "0.14.2" clap = { version = "3.1.8", features = ["cargo"] } +<<<<<<< HEAD >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) [[bin]] name = "cargo-test-bpf" diff --git a/stake-accounts/Cargo.toml b/stake-accounts/Cargo.toml index d971a99a522aec..0968133f4a59ce 100644 --- a/stake-accounts/Cargo.toml +++ b/stake-accounts/Cargo.toml @@ -11,6 +11,7 @@ documentation = "https://docs.rs/solana-stake-accounts" [dependencies] <<<<<<< HEAD +<<<<<<< HEAD clap = "2.33.1" solana-clap-utils = { path = "../clap-utils", version = "=1.9.17" } solana-cli-config = { path = "../cli-config", version = "=1.9.17" } @@ -19,6 +20,8 @@ solana-remote-wallet = { path = "../remote-wallet", version = "=1.9.17" } solana-sdk = { path = "../sdk", version = "=1.9.17" } solana-stake-program = { path = "../programs/stake", version = "=1.9.17" } ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) clap = "3.1.8" solana-clap-utils = { path = "../clap-utils", version = "=1.11.0" } solana-cli-config = { path = "../cli-config", version = "=1.11.0" } diff --git a/sys-tuner/Cargo.toml b/sys-tuner/Cargo.toml index 4f68a829dfc65f..9cef6143274ab8 100644 --- a/sys-tuner/Cargo.toml +++ b/sys-tuner/Cargo.toml @@ -12,8 +12,11 @@ publish = true [dependencies] <<<<<<< HEAD +<<<<<<< HEAD clap = "2.33.1" ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) clap = "3.1.8" libc = "0.2.120" >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) diff --git a/transaction-dos/Cargo.toml b/transaction-dos/Cargo.toml index e4ce61cac2e5f5..60ecd902c89bdf 100644 --- a/transaction-dos/Cargo.toml +++ b/transaction-dos/Cargo.toml @@ -13,6 +13,7 @@ bincode = "1.3.3" clap = "3.1.8" log = "0.4.14" <<<<<<< HEAD +<<<<<<< HEAD rand = "0.7.0" rayon = "1.5.1" solana-cli = { path = "../cli", version = "=1.9.17" } @@ -30,6 +31,8 @@ solana-streamer = { path = "../streamer", version = "=1.9.17" } solana-transaction-status = { path = "../transaction-status", version = "=1.9.17" } solana-version = { path = "../version", version = "=1.9.17" } ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) rand = "0.8.5" rayon = "1.5.2" solana-clap-utils = { path = "../clap-utils", version = "=1.11.0" } diff --git a/validator/Cargo.toml b/validator/Cargo.toml index a758a854e894bf..9462efb18a1e14 100644 --- a/validator/Cargo.toml +++ b/validator/Cargo.toml @@ -24,6 +24,7 @@ jsonrpc-ipc-server = "18.0.0" jsonrpc-server-utils= "18.0.0" log = "0.4.14" <<<<<<< HEAD +<<<<<<< HEAD num_cpus = "1.13.0" rand = "0.7.0" solana-clap-utils = { path = "../clap-utils", version = "=1.9.17" } @@ -51,6 +52,8 @@ solana-test-validator = { path = "../test-validator", version = "=1.9.17" } solana-version = { path = "../version", version = "=1.9.17" } solana-vote-program = { path = "../programs/vote", version = "=1.9.17" } ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) num_cpus = "1.13.1" rand = "0.8.5" serde = "1.0.136" diff --git a/watchtower/Cargo.toml b/watchtower/Cargo.toml index 5b3822318dab1a..c3e6e419b63010 100644 --- a/watchtower/Cargo.toml +++ b/watchtower/Cargo.toml @@ -11,8 +11,11 @@ documentation = "https://docs.rs/solana-watchtower" [dependencies] <<<<<<< HEAD +<<<<<<< HEAD clap = "2.33.1" ======= +======= +>>>>>>> 0d773bd13 (chore: bump tokio-util from 0.6.9 to 0.7.1 (#213)) clap = "3.1.8" humantime = "2.0.1" >>>>>>> 9db7104e4 (chore: bump clap from 2.33.3 to 3.1.8 (#206)) diff --git a/web3.js/package-lock.json b/web3.js/package-lock.json index f0aed4b3aeed77..e75aa59183c080 100644 --- a/web3.js/package-lock.json +++ b/web3.js/package-lock.json @@ -59,7 +59,7 @@ "cross-env": "7.0.3", "eslint": "^7.19.0", "eslint-config-prettier": "^8.0.0", - "eslint-plugin-import": "2.25.3", + "eslint-plugin-import": "2.26.0", "eslint-plugin-mocha": "^9.0.0", "eslint-plugin-prettier": "^4.0.0", "esm": "^3.2.25", @@ -6794,9 +6794,9 @@ "dev": true }, "node_modules/eslint-plugin-import": { - "version": "2.25.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.3.tgz", - "integrity": "sha512-RzAVbby+72IB3iOEL8clzPLzL3wpDrlwjsTBAQXgyp5SeTqqY+0bFubwuo+y/HLhNZcXV4XqTBO4LGsfyHIDXg==", + "version": "2.26.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz", + "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==", "dev": true, "dependencies": { "array-includes": "^3.1.4", @@ -6804,14 +6804,14 @@ "debug": "^2.6.9", "doctrine": "^2.1.0", "eslint-import-resolver-node": "^0.3.6", - "eslint-module-utils": "^2.7.1", + "eslint-module-utils": "^2.7.3", "has": "^1.0.3", - "is-core-module": "^2.8.0", + "is-core-module": "^2.8.1", "is-glob": "^4.0.3", - "minimatch": "^3.0.4", + "minimatch": "^3.1.2", "object.values": "^1.1.5", - "resolve": "^1.20.0", - "tsconfig-paths": "^3.11.0" + "resolve": "^1.22.0", + "tsconfig-paths": "^3.14.1" }, "engines": { "node": ">=4" @@ -23258,9 +23258,9 @@ } }, "eslint-plugin-import": { - "version": "2.25.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.3.tgz", - "integrity": "sha512-RzAVbby+72IB3iOEL8clzPLzL3wpDrlwjsTBAQXgyp5SeTqqY+0bFubwuo+y/HLhNZcXV4XqTBO4LGsfyHIDXg==", + "version": "2.26.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz", + "integrity": "sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==", "dev": true, "requires": { "array-includes": "^3.1.4", @@ -23268,14 +23268,14 @@ "debug": "^2.6.9", "doctrine": "^2.1.0", "eslint-import-resolver-node": "^0.3.6", - "eslint-module-utils": "^2.7.1", + "eslint-module-utils": "^2.7.3", "has": "^1.0.3", - "is-core-module": "^2.8.0", + "is-core-module": "^2.8.1", "is-glob": "^4.0.3", - "minimatch": "^3.0.4", + "minimatch": "^3.1.2", "object.values": "^1.1.5", - "resolve": "^1.20.0", - "tsconfig-paths": "^3.11.0" + "resolve": "^1.22.0", + "tsconfig-paths": "^3.14.1" }, "dependencies": { "doctrine": { diff --git a/web3.js/package.json b/web3.js/package.json index c85498ca67d703..86d5ca3c301f13 100644 --- a/web3.js/package.json +++ b/web3.js/package.json @@ -108,7 +108,7 @@ "cross-env": "7.0.3", "eslint": "^7.19.0", "eslint-config-prettier": "^8.0.0", - "eslint-plugin-import": "2.25.3", + "eslint-plugin-import": "2.26.0", "eslint-plugin-mocha": "^9.0.0", "eslint-plugin-prettier": "^4.0.0", "esm": "^3.2.25", diff --git a/web3.js/yarn.lock b/web3.js/yarn.lock index d6d721593ab306..5db5555923e3b7 100644 --- a/web3.js/yarn.lock +++ b/web3.js/yarn.lock @@ -3158,30 +3158,30 @@ eslint-import-resolver-node@^0.3.6: debug "^3.2.7" resolve "^1.20.0" -eslint-module-utils@^2.7.1: +eslint-module-utils@^2.7.3: version "2.7.3" - resolved "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee" dependencies: debug "^3.2.7" find-up "^2.1.0" -eslint-plugin-import@2.25.3: - version "2.25.3" - resolved "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.25.3.tgz" +eslint-plugin-import@2.26.0: + version "2.26.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b" dependencies: array-includes "^3.1.4" array.prototype.flat "^1.2.5" debug "^2.6.9" doctrine "^2.1.0" eslint-import-resolver-node "^0.3.6" - eslint-module-utils "^2.7.1" + eslint-module-utils "^2.7.3" has "^1.0.3" - is-core-module "^2.8.0" + is-core-module "^2.8.1" is-glob "^4.0.3" - minimatch "^3.0.4" + minimatch "^3.1.2" object.values "^1.1.5" - resolve "^1.20.0" - tsconfig-paths "^3.11.0" + resolve "^1.22.0" + tsconfig-paths "^3.14.1" eslint-plugin-mocha@^9.0.0: version "9.0.0" @@ -4179,7 +4179,7 @@ is-cidr@*: dependencies: cidr-regex "^3.1.1" -is-core-module@^2.5.0, is-core-module@^2.8.0, is-core-module@^2.8.1: +is-core-module@^2.5.0, is-core-module@^2.8.1: version "2.8.1" resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz" dependencies: @@ -4967,7 +4967,7 @@ minimatch@3.0.4: dependencies: brace-expansion "^1.1.7" -minimatch@^3.0.4: +minimatch@^3.0.4, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz" dependencies: @@ -6258,7 +6258,7 @@ resolve-global@1.0.0, resolve-global@^1.0.0: dependencies: global-dirs "^0.1.1" -resolve@^1.10.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0: +resolve@^1.10.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0: version "1.22.0" resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz" dependencies: @@ -7045,9 +7045,9 @@ ts-node@^10.0.0, ts-node@^10.7.0: v8-compile-cache-lib "^3.0.0" yn "3.1.1" -tsconfig-paths@^3.11.0: +tsconfig-paths@^3.14.1: version "3.14.1" - resolved "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a" dependencies: "@types/json5" "^0.0.29" json5 "^1.0.1"