Bump tonic, prost, tarpc, tokio (#15013)

* Update tonic & prost, and regenerate proto * Reignore doc code * Revert pull #14367, but pin tokio to v0.2 for jsonrpc * Bump backoff and goauth -> and therefore tokio * Bump tokio in faucet, net-utils * Bump remaining tokio, plus tarpc
2021-02-05 00:21:53 -07:00
parent 863f08f8d3
commit d1563f0ccd
33 changed files with 927 additions and 689 deletions
--- a/storage-proto/Cargo.toml
+++ b/storage-proto/Cargo.toml
@ -11,7 +11,7 @@ edition = "2018"
 [dependencies]
 bincode = "1.2.1"
 bs58 = "0.3.1"
-prost = "0.6.1"
+prost = "0.7.0"
 serde = "1.0.118"
 serde_derive = "1.0.103"
 solana-account-decoder = { path = "../account-decoder", version = "1.6.0" }
--- a/storage-proto/build-proto/Cargo.lock
+++ b/storage-proto/build-proto/Cargo.lock
@ -14,9 +14,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"

 [[package]]
 name = "bytes"
-version = "0.5.6"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
+checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040"

 [[package]]
 name = "cfg-if"
@ -74,9 +74,9 @@ dependencies = [

 [[package]]
 name = "itertools"
-version = "0.8.2"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484"
+checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
 dependencies = [
 "either",
 ]
@ -129,9 +129,9 @@ dependencies = [

 [[package]]
 name = "prost"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce49aefe0a6144a45de32927c77bd2859a5f7677b55f220ae5b744e87389c212"
+checksum = "9e6984d2f1a23009bd270b8bb56d0926810a3d483f59c987d77969e9d8e840b2"
 dependencies = [
 "bytes",
 "prost-derive",
@ -139,9 +139,9 @@ dependencies = [

 [[package]]
 name = "prost-build"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b10678c913ecbd69350e8535c3aef91a8676c0773fc1d7b95cdd196d7f2f26"
+checksum = "32d3ebd75ac2679c2af3a92246639f9fcc8a442ee420719cc4fe195b98dd5fa3"
 dependencies = [
 "bytes",
 "heck",
@ -157,9 +157,9 @@ dependencies = [

 [[package]]
 name = "prost-derive"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "537aa19b95acde10a12fec4301466386f757403de4cd4e5b4fa78fb5ecb18f72"
+checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4"
 dependencies = [
 "anyhow",
 "itertools",
@ -170,9 +170,9 @@ dependencies = [

 [[package]]
 name = "prost-types"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1834f67c0697c001304b75be76f67add9c89742eda3a085ad8ee0bb38c3417aa"
+checksum = "b518d7cdd93dab1d1122cf07fa9a60771836c668dde9d9e2a139f957f0d9f1bb"
 dependencies = [
 "bytes",
 "prost",
@ -252,9 +252,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "1.0.44"
+version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e03e57e4fcbfe7749842d53e24ccb9aa12b7252dbe5e91d2acad31834c8b8fdd"
+checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
 dependencies = [
 "proc-macro2",
 "quote",
@ -276,10 +276,30 @@ dependencies = [
 ]

 [[package]]
-name = "tonic-build"
-version = "0.2.0"
+name = "thiserror"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71d8d21cb568e802d77055ab7fcd43f0992206de5028de95c8d3a41118d32e8e"
+checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tonic-build"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1e8546fd40d56d28089835c0a81bb396848103b00f888aea42d46eb5974df07"
 dependencies = [
 "proc-macro2",
 "prost-build",
@ -307,11 +327,12 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"

 [[package]]
 name = "which"
-version = "3.1.1"
+version = "4.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724"
+checksum = "87c14ef7e1b8b8ecfc75d5eca37949410046e66f15d185c01d70824f1f8111ef"
 dependencies = [
 "libc",
+ "thiserror",
 ]

 [[package]]
--- a/storage-proto/build-proto/Cargo.toml
+++ b/storage-proto/build-proto/Cargo.toml
@ -12,4 +12,4 @@ version = "1.6.0"
 [workspace]

 [dependencies]
-tonic-build = "0.2.0"
+tonic-build = "0.4.0"
--- a/storage-proto/proto/solana.storage.confirmed_block.rs
+++ b/storage-proto/proto/solana.storage.confirmed_block.rs
@ -1,42 +1,42 @@
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ConfirmedBlock {
    #[prost(string, tag = "1")]
-    pub previous_blockhash: std::string::String,
+    pub previous_blockhash: ::prost::alloc::string::String,
    #[prost(string, tag = "2")]
-    pub blockhash: std::string::String,
+    pub blockhash: ::prost::alloc::string::String,
    #[prost(uint64, tag = "3")]
    pub parent_slot: u64,
    #[prost(message, repeated, tag = "4")]
-    pub transactions: ::std::vec::Vec<ConfirmedTransaction>,
+    pub transactions: ::prost::alloc::vec::Vec<ConfirmedTransaction>,
    #[prost(message, repeated, tag = "5")]
-    pub rewards: ::std::vec::Vec<Reward>,
+    pub rewards: ::prost::alloc::vec::Vec<Reward>,
    #[prost(message, optional, tag = "6")]
-    pub block_time: ::std::option::Option<UnixTimestamp>,
+    pub block_time: ::core::option::Option<UnixTimestamp>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ConfirmedTransaction {
    #[prost(message, optional, tag = "1")]
-    pub transaction: ::std::option::Option<Transaction>,
+    pub transaction: ::core::option::Option<Transaction>,
    #[prost(message, optional, tag = "2")]
-    pub meta: ::std::option::Option<TransactionStatusMeta>,
+    pub meta: ::core::option::Option<TransactionStatusMeta>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Transaction {
-    #[prost(bytes, repeated, tag = "1")]
-    pub signatures: ::std::vec::Vec<std::vec::Vec<u8>>,
+    #[prost(bytes = "vec", repeated, tag = "1")]
+    pub signatures: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
    #[prost(message, optional, tag = "2")]
-    pub message: ::std::option::Option<Message>,
+    pub message: ::core::option::Option<Message>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Message {
    #[prost(message, optional, tag = "1")]
-    pub header: ::std::option::Option<MessageHeader>,
-    #[prost(bytes, repeated, tag = "2")]
-    pub account_keys: ::std::vec::Vec<std::vec::Vec<u8>>,
-    #[prost(bytes, tag = "3")]
-    pub recent_blockhash: std::vec::Vec<u8>,
+    pub header: ::core::option::Option<MessageHeader>,
+    #[prost(bytes = "vec", repeated, tag = "2")]
+    pub account_keys: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec<u8>>,
+    #[prost(bytes = "vec", tag = "3")]
+    pub recent_blockhash: ::prost::alloc::vec::Vec<u8>,
    #[prost(message, repeated, tag = "4")]
-    pub instructions: ::std::vec::Vec<CompiledInstruction>,
+    pub instructions: ::prost::alloc::vec::Vec<CompiledInstruction>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct MessageHeader {
@ -50,51 +50,51 @@ pub struct MessageHeader {
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TransactionStatusMeta {
    #[prost(message, optional, tag = "1")]
-    pub err: ::std::option::Option<TransactionError>,
+    pub err: ::core::option::Option<TransactionError>,
    #[prost(uint64, tag = "2")]
    pub fee: u64,
    #[prost(uint64, repeated, tag = "3")]
-    pub pre_balances: ::std::vec::Vec<u64>,
+    pub pre_balances: ::prost::alloc::vec::Vec<u64>,
    #[prost(uint64, repeated, tag = "4")]
-    pub post_balances: ::std::vec::Vec<u64>,
+    pub post_balances: ::prost::alloc::vec::Vec<u64>,
    #[prost(message, repeated, tag = "5")]
-    pub inner_instructions: ::std::vec::Vec<InnerInstructions>,
+    pub inner_instructions: ::prost::alloc::vec::Vec<InnerInstructions>,
    #[prost(string, repeated, tag = "6")]
-    pub log_messages: ::std::vec::Vec<std::string::String>,
+    pub log_messages: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
    #[prost(message, repeated, tag = "7")]
-    pub pre_token_balances: ::std::vec::Vec<TokenBalance>,
+    pub pre_token_balances: ::prost::alloc::vec::Vec<TokenBalance>,
    #[prost(message, repeated, tag = "8")]
-    pub post_token_balances: ::std::vec::Vec<TokenBalance>,
+    pub post_token_balances: ::prost::alloc::vec::Vec<TokenBalance>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TransactionError {
-    #[prost(bytes, tag = "1")]
-    pub err: std::vec::Vec<u8>,
+    #[prost(bytes = "vec", tag = "1")]
+    pub err: ::prost::alloc::vec::Vec<u8>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct InnerInstructions {
    #[prost(uint32, tag = "1")]
    pub index: u32,
    #[prost(message, repeated, tag = "2")]
-    pub instructions: ::std::vec::Vec<CompiledInstruction>,
+    pub instructions: ::prost::alloc::vec::Vec<CompiledInstruction>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct CompiledInstruction {
    #[prost(uint32, tag = "1")]
    pub program_id_index: u32,
-    #[prost(bytes, tag = "2")]
-    pub accounts: std::vec::Vec<u8>,
-    #[prost(bytes, tag = "3")]
-    pub data: std::vec::Vec<u8>,
+    #[prost(bytes = "vec", tag = "2")]
+    pub accounts: ::prost::alloc::vec::Vec<u8>,
+    #[prost(bytes = "vec", tag = "3")]
+    pub data: ::prost::alloc::vec::Vec<u8>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TokenBalance {
    #[prost(uint32, tag = "1")]
    pub account_index: u32,
    #[prost(string, tag = "2")]
-    pub mint: std::string::String,
+    pub mint: ::prost::alloc::string::String,
    #[prost(message, optional, tag = "3")]
-    pub ui_token_amount: ::std::option::Option<UiTokenAmount>,
+    pub ui_token_amount: ::core::option::Option<UiTokenAmount>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct UiTokenAmount {
@ -103,12 +103,12 @@ pub struct UiTokenAmount {
    #[prost(uint32, tag = "2")]
    pub decimals: u32,
    #[prost(string, tag = "3")]
-    pub amount: std::string::String,
+    pub amount: ::prost::alloc::string::String,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Reward {
    #[prost(string, tag = "1")]
-    pub pubkey: std::string::String,
+    pub pubkey: ::prost::alloc::string::String,
    #[prost(int64, tag = "2")]
    pub lamports: i64,
    #[prost(uint64, tag = "3")]
@ -119,7 +119,7 @@ pub struct Reward {
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Rewards {
    #[prost(message, repeated, tag = "1")]
-    pub rewards: ::std::vec::Vec<Reward>,
+    pub rewards: ::prost::alloc::vec::Vec<Reward>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct UnixTimestamp {
--- a/storage-proto/proto/solana.storage.transaction_by_addr.rs
+++ b/storage-proto/proto/solana.storage.transaction_by_addr.rs
@ -1,32 +1,32 @@
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TransactionByAddr {
    #[prost(message, repeated, tag = "1")]
-    pub tx_by_addrs: ::std::vec::Vec<TransactionByAddrInfo>,
+    pub tx_by_addrs: ::prost::alloc::vec::Vec<TransactionByAddrInfo>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TransactionByAddrInfo {
-    #[prost(bytes, tag = "1")]
-    pub signature: std::vec::Vec<u8>,
+    #[prost(bytes = "vec", tag = "1")]
+    pub signature: ::prost::alloc::vec::Vec<u8>,
    #[prost(message, optional, tag = "2")]
-    pub err: ::std::option::Option<TransactionError>,
+    pub err: ::core::option::Option<TransactionError>,
    #[prost(uint32, tag = "3")]
    pub index: u32,
    #[prost(message, optional, tag = "4")]
-    pub memo: ::std::option::Option<Memo>,
+    pub memo: ::core::option::Option<Memo>,
    #[prost(message, optional, tag = "5")]
-    pub block_time: ::std::option::Option<UnixTimestamp>,
+    pub block_time: ::core::option::Option<UnixTimestamp>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Memo {
    #[prost(string, tag = "1")]
-    pub memo: std::string::String,
+    pub memo: ::prost::alloc::string::String,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct TransactionError {
    #[prost(enumeration = "TransactionErrorType", tag = "1")]
    pub transaction_error: i32,
    #[prost(message, optional, tag = "2")]
-    pub instruction_error: ::std::option::Option<InstructionError>,
+    pub instruction_error: ::core::option::Option<InstructionError>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct InstructionError {
@ -35,7 +35,7 @@ pub struct InstructionError {
    #[prost(enumeration = "InstructionErrorType", tag = "2")]
    pub error: i32,
    #[prost(message, optional, tag = "3")]
-    pub custom: ::std::option::Option<CustomError>,
+    pub custom: ::core::option::Option<CustomError>,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct UnixTimestamp {