From ca001970099e9e803d1be2f3c8fab0e221ad7351 Mon Sep 17 00:00:00 2001
From: Greg Fitzgerald <greg@solana.com>
Date: Thu, 29 Oct 2020 19:21:18 -0600
Subject: [PATCH] Upgrade tarpc and tokio (#13293)

---
 Cargo.lock                       | 371 +++++++++++++++++++++----------
 banks-client/Cargo.toml          |   4 +-
 banks-client/src/lib.rs          |   4 +-
 banks-interface/Cargo.toml       |   2 +-
 banks-server/Cargo.toml          |   4 +-
 banks-server/src/banks_server.rs |   4 +-
 core/Cargo.toml                  |   2 +-
 tokens/Cargo.toml                |   2 +-
 tokens/src/commands.rs           |   4 +-
 tokens/src/main.rs               |   2 +-
 10 files changed, 269 insertions(+), 130 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b66083f0e7..c68e936d2d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -117,9 +117,9 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25f9db3b38af870bf7e5cc649167533b493928e50744e2c30ae350230b414670"
 dependencies = [
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -128,9 +128,9 @@ version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a265e3abeffdce30b2e26b7a11b222fe37c6067404001b434101457d0385eb92"
 dependencies = [
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -164,7 +164,7 @@ checksum = "721c249ab59cbc483ad4294c9ee2671835c1e43e9ffc277e6b4ecfef733cfdc5"
 dependencies = [
  "futures-core",
  "instant",
- "pin-project",
+ "pin-project 0.4.23",
  "rand 0.7.3",
  "tokio 0.2.22",
 ]
@@ -258,7 +258,7 @@ dependencies = [
  "lazycell",
  "log 0.4.8",
  "peeking_take_while",
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
  "regex",
  "rustc-hash",
@@ -413,6 +413,12 @@ version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1"
 
+[[package]]
+name = "bytes"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0dcbc35f504eb6fc275a6d20e4ebcda18cf50d40ba6fabff8c711fa16cb3b16"
+
 [[package]]
 name = "bytesize"
 version = "1.0.1"
@@ -532,6 +538,15 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "cloudabi"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467"
+dependencies = [
+ "bitflags",
+]
+
 [[package]]
 name = "combine"
 version = "2.5.2"
@@ -794,9 +809,9 @@ version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb582b60359da160a9477ee80f15c8d784c477e69c217ef2cdd4169c24ea380f"
 dependencies = [
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -966,9 +981,9 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e94aa31f7c0dc764f57896dc615ddd76fc13b0d5dca7eb6cc5e018a5a09ec06"
 dependencies = [
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -1000,9 +1015,9 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
 dependencies = [
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
  "synstructure",
 ]
 
@@ -1171,9 +1186,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39"
 dependencies = [
  "proc-macro-hack",
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -1204,7 +1219,7 @@ dependencies = [
  "futures-sink",
  "futures-task",
  "memchr 2.3.3",
- "pin-project",
+ "pin-project 0.4.23",
  "pin-utils",
  "proc-macro-hack",
  "proc-macro-nested",
@@ -1350,7 +1365,7 @@ dependencies = [
  "log 0.4.8",
  "slab",
  "tokio 0.2.22",
- "tokio-util",
+ "tokio-util 0.3.1",
 ]
 
 [[package]]
@@ -1562,7 +1577,7 @@ dependencies = [
  "itoa",
  "log 0.4.8",
  "net2",
- "pin-project",
+ "pin-project 0.4.23",
  "time 0.1.43",
  "tokio 0.2.22",
  "tower-service",
@@ -1806,9 +1821,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99a847f9ec7bb52149b2786a17c9cb260d6effc6b8eeb8c16b343a487a7563a3"
 dependencies = [
  "proc-macro-crate",
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -1974,6 +1989,15 @@ dependencies = [
  "scopeguard",
 ]
 
+[[package]]
+name = "lock_api"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28247cc5a5be2f05fbcd76dd0cf2c7d3b5400cb978a28042abcd4fa0b3f8261c"
+dependencies = [
+ "scopeguard",
+]
+
 [[package]]
 name = "log"
 version = "0.3.9"
@@ -2100,6 +2124,19 @@ dependencies = [
  "winapi 0.2.8",
 ]
 
+[[package]]
+name = "mio"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8f1c83949125de4a582aa2da15ae6324d91cf6a58a70ea407643941ff98f558"
+dependencies = [
+ "libc",
+ "log 0.4.8",
+ "miow 0.3.5",
+ "ntapi",
+ "winapi 0.3.8",
+]
+
 [[package]]
 name = "mio-extras"
 version = "2.0.6"
@@ -2108,7 +2145,7 @@ checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
 dependencies = [
  "lazycell",
  "log 0.4.8",
- "mio",
+ "mio 0.6.22",
  "slab",
 ]
 
@@ -2119,7 +2156,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656"
 dependencies = [
  "log 0.4.8",
- "mio",
+ "mio 0.6.22",
  "miow 0.3.5",
  "winapi 0.3.8",
 ]
@@ -2132,7 +2169,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0"
 dependencies = [
  "iovec",
  "libc",
- "mio",
+ "mio 0.6.22",
 ]
 
 [[package]]
@@ -2218,15 +2255,24 @@ dependencies = [
  "version_check 0.9.2",
 ]
 
+[[package]]
+name = "ntapi"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a31937dea023539c72ddae0e3571deadc1414b300483fa7aaec176168cfa9d2"
+dependencies = [
+ "winapi 0.3.8",
+]
+
 [[package]]
 name = "num-derive"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f09b9841adb6b5e1f89ef7087ea636e0fd94b2851f887c1e3eb5d5f8228fab3"
 dependencies = [
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -2275,9 +2321,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c0fd9eba1d5db0994a239e09c1be402d35622277e35468ba891aa5e3188ce7e"
 dependencies = [
  "proc-macro-crate",
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -2363,9 +2409,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85165ba45bb44e86ddb86e33ad92640522d572229c5c326eb7eb81ef31b06ce7"
 dependencies = [
  "Inflector",
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -2378,7 +2424,7 @@ dependencies = [
  "bytes 0.4.12",
  "httparse",
  "log 0.4.8",
- "mio",
+ "mio 0.6.22",
  "mio-extras",
  "rand 0.7.3",
  "sha-1",
@@ -2392,7 +2438,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
 dependencies = [
- "lock_api",
+ "lock_api 0.3.4",
  "parking_lot_core 0.6.2",
  "rustc_version",
 ]
@@ -2403,10 +2449,21 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e"
 dependencies = [
- "lock_api",
+ "lock_api 0.3.4",
  "parking_lot_core 0.7.2",
 ]
 
+[[package]]
+name = "parking_lot"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733"
+dependencies = [
+ "instant",
+ "lock_api 0.4.1",
+ "parking_lot_core 0.8.0",
+]
+
 [[package]]
 name = "parking_lot_core"
 version = "0.6.2"
@@ -2414,7 +2471,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b"
 dependencies = [
  "cfg-if",
- "cloudabi",
+ "cloudabi 0.0.3",
  "libc",
  "redox_syscall",
  "rustc_version",
@@ -2429,7 +2486,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
 dependencies = [
  "cfg-if",
- "cloudabi",
+ "cloudabi 0.0.3",
+ "libc",
+ "redox_syscall",
+ "smallvec 1.4.2",
+ "winapi 0.3.8",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b"
+dependencies = [
+ "cfg-if",
+ "cloudabi 0.1.0",
+ "instant",
  "libc",
  "redox_syscall",
  "smallvec 1.4.2",
@@ -2453,9 +2525,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84f328a6a63192b333fce5fbb4be79db6758a4d518dfac6d54412f1492f72d32"
 dependencies = [
  "proc-macro-hack",
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -2514,7 +2586,16 @@ version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa"
 dependencies = [
- "pin-project-internal",
+ "pin-project-internal 0.4.23",
+]
+
+[[package]]
+name = "pin-project"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee41d838744f60d959d7074e3afb6b35c7456d0f61cad38a24e35e6553f73841"
+dependencies = [
+ "pin-project-internal 1.0.1",
 ]
 
 [[package]]
@@ -2523,9 +2604,20 @@ version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f"
 dependencies = [
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81a4ffa594b66bff340084d4081df649a7dc049ac8d7fc458d8e628bfbbb2f86"
+dependencies = [
+ "proc-macro2 1.0.24",
+ "quote 1.0.6",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -2622,9 +2714,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.19"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12"
+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
 dependencies = [
  "unicode-xid 0.2.0",
 ]
@@ -2647,9 +2739,9 @@ checksum = "537aa19b95acde10a12fec4301466386f757403de4cd4e5b4fa78fb5ecb18f72"
 dependencies = [
  "anyhow",
  "itertools 0.8.2",
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -2683,7 +2775,7 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "54a21852a652ad6f610c9510194f398ff6f8692e334fd1145fed931f7fbe44ea"
 dependencies = [
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
 ]
 
 [[package]]
@@ -2820,7 +2912,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071"
 dependencies = [
- "cloudabi",
+ "cloudabi 0.0.3",
  "fuchsia-cprng",
  "libc",
  "rand_core 0.4.2",
@@ -3090,9 +3182,9 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9bdc5e856e51e685846fb6c13a1f5e5432946c2c90501bdc76a1319f19e29da"
 dependencies = [
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -3147,9 +3239,9 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e367622f934864ffa1c704ba2b82280aab856e3d8213c84c5720257eb34b15b9"
 dependencies = [
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -3253,9 +3345,9 @@ version = "1.0.112"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf0343ce212ac0d3d6afd9391ac8e9c9efe06b533c8d33f660f6390cc4093f57"
 dependencies = [
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -3310,9 +3402,9 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d08338d8024b227c62bd68a12c7c9883f5c66780abaef15c550dc56f46ee6515"
 dependencies = [
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -3514,7 +3606,7 @@ dependencies = [
  "solana-runtime",
  "solana-sdk 1.5.0",
  "tarpc",
- "tokio 0.2.22",
+ "tokio 0.3.2",
  "tokio-serde",
 ]
 
@@ -3539,7 +3631,7 @@ dependencies = [
  "solana-runtime",
  "solana-sdk 1.5.0",
  "tarpc",
- "tokio 0.2.22",
+ "tokio 0.3.2",
  "tokio-serde",
 ]
 
@@ -3886,7 +3978,7 @@ dependencies = [
  "reqwest",
  "serde",
  "syn 0.15.44",
- "syn 1.0.27",
+ "syn 1.0.48",
  "tokio 0.1.22",
  "winapi 0.3.8",
 ]
@@ -3908,7 +4000,7 @@ dependencies = [
  "reqwest",
  "serde",
  "syn 0.15.44",
- "syn 1.0.27",
+ "syn 1.0.48",
  "tokio 0.1.22",
  "winapi 0.3.8",
 ]
@@ -4015,10 +4107,10 @@ name = "solana-frozen-abi-macro"
 version = "1.5.0"
 dependencies = [
  "lazy_static",
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
  "rustc_version",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -4619,10 +4711,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77033e18acf3e9e580e25a999a45279f73dc2e8440250b2a7959f74c8ee94a4a"
 dependencies = [
  "bs58",
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
  "rustversion",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -4630,10 +4722,10 @@ name = "solana-sdk-macro"
 version = "1.5.0"
 dependencies = [
  "bs58",
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
  "rustversion",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -4643,10 +4735,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef03519deb55e8cb33aa7be941a13e59de0e437f3a5ce9118c71d96556e5293f"
 dependencies = [
  "lazy_static",
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
  "rustc_version",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -4835,7 +4927,7 @@ dependencies = [
  "solana-stake-program",
  "tempfile",
  "thiserror",
- "tokio 0.2.22",
+ "tokio 0.3.2",
  "url 2.1.1",
 ]
 
@@ -5073,11 +5165,11 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
 dependencies = [
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
  "serde",
  "serde_derive",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -5087,13 +5179,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
 dependencies = [
  "base-x",
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
  "serde",
  "serde_derive",
  "serde_json",
  "sha1",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -5148,11 +5240,11 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.27"
+version = "1.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef781e621ee763a2a40721a8861ec519cb76966aee03bb5d00adb6a31dc1c1de"
+checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"
 dependencies = [
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
  "unicode-xid 0.2.0",
 ]
@@ -5163,9 +5255,9 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545"
 dependencies = [
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
  "unicode-xid 0.2.0",
 ]
 
@@ -5211,23 +5303,23 @@ dependencies = [
 
 [[package]]
 name = "tarpc"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1503e47bfae912674d6f4226c09cb8d2f0271a57eef7e799b6f98a545f89c7a3"
+checksum = "a9fc49715ecefc8e56b6d8bdc6fe4fd41664b437b2a285e0f36a28bc9252310f"
 dependencies = [
  "anyhow",
  "fnv",
  "futures 0.3.5",
- "humantime 1.3.0",
+ "humantime 2.0.1",
  "log 0.4.8",
- "pin-project",
+ "pin-project 1.0.1",
  "rand 0.7.3",
  "serde",
  "static_assertions",
  "tarpc-plugins",
- "tokio 0.2.22",
+ "tokio 0.3.2",
  "tokio-serde",
- "tokio-util",
+ "tokio-util 0.4.0",
 ]
 
 [[package]]
@@ -5236,9 +5328,9 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "edbaf92ceea0a2ab555bea18a47a891e46ba2d6f930ec9506771662f4ab82bb7"
 dependencies = [
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -5307,9 +5399,9 @@ version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cae2447b6282786c3493999f40a9be2a6ad20cb8bd268b0a0dbf5a065535c0ab"
 dependencies = [
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -5369,10 +5461,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa"
 dependencies = [
  "proc-macro-hack",
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
  "standback",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -5399,7 +5491,7 @@ checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
 dependencies = [
  "bytes 0.4.12",
  "futures 0.1.29",
- "mio",
+ "mio 0.6.22",
  "num_cpus",
  "tokio-codec",
  "tokio-current-thread",
@@ -5428,14 +5520,36 @@ dependencies = [
  "lazy_static",
  "libc",
  "memchr 2.3.3",
- "mio",
+ "mio 0.6.22",
  "mio-named-pipes",
  "mio-uds",
  "num_cpus",
  "pin-project-lite",
  "signal-hook-registry",
  "slab",
- "tokio-macros",
+ "tokio-macros 0.2.5",
+ "winapi 0.3.8",
+]
+
+[[package]]
+name = "tokio"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71f1b20504fd0aa9dab3ae17e8c4dd9431e5e08fd6921689f9745a4004883a17"
+dependencies = [
+ "bytes 0.6.0",
+ "fnv",
+ "futures-core",
+ "lazy_static",
+ "libc",
+ "memchr 2.3.3",
+ "mio 0.7.4",
+ "num_cpus",
+ "parking_lot 0.11.0",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "slab",
+ "tokio-macros 0.3.1",
  "winapi 0.3.8",
 ]
 
@@ -5509,9 +5623,20 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389"
 dependencies = [
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21d30fdbb5dc2d8f91049691aa1a9d4d4ae422a21c334ce8936e5886d30c5c45"
+dependencies = [
+ "proc-macro2 1.0.24",
+ "quote 1.0.6",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -5524,7 +5649,7 @@ dependencies = [
  "futures 0.1.29",
  "lazy_static",
  "log 0.4.8",
- "mio",
+ "mio 0.6.22",
  "num_cpus",
  "parking_lot 0.9.0",
  "slab",
@@ -5555,7 +5680,7 @@ dependencies = [
  "bytes 0.5.4",
  "derivative",
  "futures 0.3.5",
- "pin-project",
+ "pin-project 0.4.23",
  "serde",
 ]
 
@@ -5578,7 +5703,7 @@ dependencies = [
  "bytes 0.4.12",
  "futures 0.1.29",
  "iovec",
- "mio",
+ "mio 0.6.22",
  "tokio-io",
  "tokio-reactor",
 ]
@@ -5642,7 +5767,7 @@ dependencies = [
  "bytes 0.4.12",
  "futures 0.1.29",
  "log 0.4.8",
- "mio",
+ "mio 0.6.22",
  "tokio-codec",
  "tokio-io",
  "tokio-reactor",
@@ -5659,7 +5784,7 @@ dependencies = [
  "iovec",
  "libc",
  "log 0.4.8",
- "mio",
+ "mio 0.6.22",
  "mio-uds",
  "tokio-codec",
  "tokio-io",
@@ -5680,6 +5805,20 @@ dependencies = [
  "tokio 0.2.22",
 ]
 
+[[package]]
+name = "tokio-util"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24793699f4665ba0416ed287dc794fe6b11a4aa5e4e95b58624f45f6c46b97d4"
+dependencies = [
+ "bytes 0.5.4",
+ "futures-core",
+ "futures-sink",
+ "log 0.4.8",
+ "pin-project-lite",
+ "tokio 0.3.2",
+]
+
 [[package]]
 name = "toml"
 version = "0.5.6"
@@ -5705,12 +5844,12 @@ dependencies = [
  "http-body 0.3.1",
  "hyper 0.13.5",
  "percent-encoding 2.1.0",
- "pin-project",
+ "pin-project 0.4.23",
  "prost",
  "prost-derive",
  "tokio 0.2.22",
  "tokio-rustls",
- "tokio-util",
+ "tokio-util 0.3.1",
  "tower",
  "tower-balance",
  "tower-load",
@@ -5747,7 +5886,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "indexmap",
- "pin-project",
+ "pin-project 0.4.23",
  "rand 0.7.3",
  "slab",
  "tokio 0.2.22",
@@ -5767,7 +5906,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4887dc2a65d464c8b9b66e0e4d51c2fd6cf5b3373afc72805b0a60bce00446a"
 dependencies = [
  "futures-core",
- "pin-project",
+ "pin-project 0.4.23",
  "tokio 0.2.22",
  "tower-layer",
  "tower-service",
@@ -5781,7 +5920,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f6b5000c3c54d269cc695dff28136bb33d08cbf1df2c48129e143ab65bf3c2a"
 dependencies = [
  "futures-core",
- "pin-project",
+ "pin-project 0.4.23",
  "tower-service",
 ]
 
@@ -5798,7 +5937,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92c3040c5dbed68abffaa0d4517ac1a454cd741044f33ab0eefab6b8d1361404"
 dependencies = [
  "futures-core",
- "pin-project",
+ "pin-project 0.4.23",
  "tokio 0.2.22",
  "tower-layer",
  "tower-load",
@@ -5813,7 +5952,7 @@ checksum = "8cc79fc3afd07492b7966d7efa7c6c50f8ed58d768a6075dd7ae6591c5d2017b"
 dependencies = [
  "futures-core",
  "log 0.4.8",
- "pin-project",
+ "pin-project 0.4.23",
  "tokio 0.2.22",
  "tower-discover",
  "tower-service",
@@ -5826,7 +5965,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f021e23900173dc315feb4b6922510dae3e79c689b74c089112066c11f0ae4e"
 dependencies = [
  "futures-core",
- "pin-project",
+ "pin-project 0.4.23",
  "tower-layer",
  "tower-service",
 ]
@@ -5862,7 +6001,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6727956aaa2f8957d4d9232b308fe8e4e65d99db30f42b225646e86c9b6a952"
 dependencies = [
  "futures-core",
- "pin-project",
+ "pin-project 0.4.23",
  "tokio 0.2.22",
  "tower-layer",
  "tower-service",
@@ -5880,7 +6019,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "127b8924b357be938823eaaec0608c482d40add25609481027b96198b2e4b31e"
 dependencies = [
- "pin-project",
+ "pin-project 0.4.23",
  "tokio 0.2.22",
  "tower-layer",
  "tower-service",
@@ -5894,7 +6033,7 @@ checksum = "d1093c19826d33807c72511e68f73b4a0469a3f22c2bd5f7d5212178b4b89674"
 dependencies = [
  "futures-core",
  "futures-util",
- "pin-project",
+ "pin-project 0.4.23",
  "tower-service",
 ]
 
@@ -5916,9 +6055,9 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0693bf8d6f2bf22c690fc61a9d21ac69efdbb894a17ed596b9af0f01e64b84b"
 dependencies = [
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
 ]
 
 [[package]]
@@ -5936,7 +6075,7 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c"
 dependencies = [
- "pin-project",
+ "pin-project 0.4.23",
  "tracing",
 ]
 
@@ -6216,9 +6355,9 @@ dependencies = [
  "bumpalo",
  "lazy_static",
  "log 0.4.8",
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
  "wasm-bindgen-shared",
 ]
 
@@ -6250,9 +6389,9 @@ version = "0.2.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3156052d8ec77142051a533cdd686cba889537b213f948cd1d20869926e68e92"
 dependencies = [
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6437,9 +6576,9 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de251eec69fc7c1bc3923403d18ececb929380e016afe103da75f396704f8ca2"
 dependencies = [
- "proc-macro2 1.0.19",
+ "proc-macro2 1.0.24",
  "quote 1.0.6",
- "syn 1.0.27",
+ "syn 1.0.48",
  "synstructure",
 ]
 
diff --git a/banks-client/Cargo.toml b/banks-client/Cargo.toml
index d96a4935bd..d779a71866 100644
--- a/banks-client/Cargo.toml
+++ b/banks-client/Cargo.toml
@@ -14,8 +14,8 @@ bincode = "1.3.1"
 futures = "0.3"
 solana-banks-interface = { path = "../banks-interface", version = "1.5.0" }
 solana-sdk = { path = "../sdk", version = "1.5.0" }
-tarpc = { version = "0.22.0", features = ["full"] }
-tokio = "0.2"
+tarpc = { version = "0.23.0", features = ["full"] }
+tokio = { version = "0.3", features = ["full"] }
 tokio-serde = { version = "0.6", features = ["bincode"] }
 
 [dev-dependencies]
diff --git a/banks-client/src/lib.rs b/banks-client/src/lib.rs
index 9bb74b37b5..1aba8bcbdf 100644
--- a/banks-client/src/lib.rs
+++ b/banks-client/src/lib.rs
@@ -216,7 +216,7 @@ mod tests {
     use solana_sdk::{message::Message, signature::Signer, system_instruction};
     use std::sync::{Arc, RwLock};
     use tarpc::transport;
-    use tokio::{runtime::Runtime, time::delay_for};
+    use tokio::{runtime::Runtime, time::sleep};
 
     #[test]
     fn test_banks_client_new() {
@@ -285,7 +285,7 @@ mod tests {
                 if root_slot > last_valid_slot {
                     break;
                 }
-                delay_for(Duration::from_millis(100)).await;
+                sleep(Duration::from_millis(100)).await;
                 status = banks_client.get_transaction_status(signature).await?;
             }
             assert!(status.unwrap().err.is_none());
diff --git a/banks-interface/Cargo.toml b/banks-interface/Cargo.toml
index f0271c1b6c..9ca906a219 100644
--- a/banks-interface/Cargo.toml
+++ b/banks-interface/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.112", features = ["derive"] }
 solana-sdk = { path = "../sdk", version = "1.5.0" }
-tarpc = { version = "0.22.0", features = ["full"] }
+tarpc = { version = "0.23.0", features = ["full"] }
 
 [lib]
 crate-type = ["lib"]
diff --git a/banks-server/Cargo.toml b/banks-server/Cargo.toml
index 900ae18b78..26f68b6eb8 100644
--- a/banks-server/Cargo.toml
+++ b/banks-server/Cargo.toml
@@ -16,8 +16,8 @@ solana-banks-interface = { path = "../banks-interface", version = "1.5.0" }
 solana-runtime = { path = "../runtime", version = "1.5.0" }
 solana-sdk = { path = "../sdk", version = "1.5.0" }
 solana-metrics = { path = "../metrics", version = "1.5.0" }
-tarpc = { version = "0.22.0", features = ["full"] }
-tokio = "0.2"
+tarpc = { version = "0.23.0", features = ["full"] }
+tokio = { version = "0.3", features = ["full"] }
 tokio-serde = { version = "0.6", features = ["bincode"] }
 
 [lib]
diff --git a/banks-server/src/banks_server.rs b/banks-server/src/banks_server.rs
index 5e44070776..9d08308fc8 100644
--- a/banks-server/src/banks_server.rs
+++ b/banks-server/src/banks_server.rs
@@ -38,7 +38,7 @@ use tarpc::{
     server::{self, Channel, Handler},
     transport,
 };
-use tokio::time::delay_for;
+use tokio::time::sleep;
 use tokio_serde::formats::Bincode;
 
 #[derive(Clone)]
@@ -118,7 +118,7 @@ impl BanksServer {
             .bank(commitment)
             .get_signature_status_with_blockhash(signature, blockhash);
         while status.is_none() {
-            delay_for(Duration::from_millis(200)).await;
+            sleep(Duration::from_millis(200)).await;
             let bank = self.bank(commitment);
             if bank.slot() > last_valid_slot {
                 break;
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 7767804ecc..238b97d5d1 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -72,7 +72,7 @@ solana-vote-signer = { path = "../vote-signer", version = "1.5.0" }
 spl-token-v2-0 = { package = "spl-token", version = "=2.0.8" }
 tempfile = "3.1.0"
 thiserror = "1.0"
-tokio = { version = "0.2.22", features = ["full"] }
+tokio = { version = "0.2", features = ["full"] }
 tokio_01 = { version = "0.1", package = "tokio" }
 tokio_fs_01 = { version = "0.1", package = "tokio-fs" }
 tokio_io_01 = { version = "0.1", package = "tokio-io" }
diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml
index a6fe84e6dc..4b971e24b7 100644
--- a/tokens/Cargo.toml
+++ b/tokens/Cargo.toml
@@ -28,7 +28,7 @@ solana-sdk = { path = "../sdk", version = "1.5.0" }
 solana-stake-program = { path = "../programs/stake", version = "1.5.0" }
 tempfile = "3.1.0"
 thiserror = "1.0"
-tokio = "0.2"
+tokio = { version = "0.3", features = ["full"] }
 url = "2.1"
 
 [dev-dependencies]
diff --git a/tokens/src/commands.rs b/tokens/src/commands.rs
index 8fff5acf82..efb7d36df6 100644
--- a/tokens/src/commands.rs
+++ b/tokens/src/commands.rs
@@ -27,7 +27,7 @@ use std::{
     io,
     time::Duration,
 };
-use tokio::time::delay_for;
+use tokio::time::sleep;
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
 struct Allocation {
@@ -417,7 +417,7 @@ async fn finalize_transactions(
         }
 
         // Sleep for about 1 slot
-        delay_for(Duration::from_millis(500)).await;
+        sleep(Duration::from_millis(500)).await;
         let opt_conf = update_finalized_transactions(client, db).await?;
         opt_confirmations = opt_conf;
     }
diff --git a/tokens/src/main.rs b/tokens/src/main.rs
index 5e6c30ae73..f677772bf8 100644
--- a/tokens/src/main.rs
+++ b/tokens/src/main.rs
@@ -22,7 +22,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     let url = Url::parse(&rpc_banks_url)?;
     let host_port = (url.host_str().unwrap(), url.port().unwrap());
 
-    let mut runtime = Runtime::new().unwrap();
+    let runtime = Runtime::new().unwrap();
     let mut banks_client = runtime.block_on(start_tcp_client(&host_port))?;
 
     match command_args.command {