Switch GRPC to tonic

cli/Cargo.toml

@@ -10,7 +10,7 @@ log = "0.4"
 log4rs = "0.8.3"
 shellwords = "1.0.0"
 json = "0.12.0"
-http = "0.1"
+http = "0.2"
 byteorder = "1"
 tiny-bip39 = "0.6.2"
 

cli/src/main.rs

@@ -44,7 +44,7 @@ pub fn main() {
     let server = LightClientConfig::get_server_or_default(maybe_server);
 
     // Test to make sure the server has all of scheme, host and port
-    if server.scheme_str().is_none() || server.host().is_none() || server.port_part().is_none() {
+    if server.scheme_str().is_none() || server.host().is_none() || server.port().is_none() {
         eprintln!("Please provide the --server parameter as [scheme]://[host]:[port].\nYou provided: {}", server);
         return;
     }

lib/Cargo.toml

@@ -4,18 +4,11 @@ version = "0.1.0"
 edition = "2018"
 
 [dependencies]
-tower-grpc = "0.1.1"
-futures = "0.1"
-bytes = "0.4"
 base58 = "0.1.0"
 log = "0.4"
 log4rs = "0.8.3"
 dirs = "2.0.2"
-http = "0.1"
-prost = "0.5"
-tokio = "0.1"
-tower-request-modifier = "0.1.0"
-tower-util = "0.1"
+http = "0.2"
 hex = "0.3"
 protobuf = "2"
 byteorder = "1"
@@ -24,17 +17,20 @@ tiny-bip39 = "0.6.2"
 secp256k1 = "=0.15.0"
 sha2 = "0.8.0"
 ripemd160 = "0.8.0"
-ring = "0.14.0"
 lazy_static = "1.2.0"
-tower-service = "0.2"
-tokio-rustls = "0.10.0-alpha.3"
-rustls = { version = "0.15.2", features = ["dangerous_configuration"] }
-webpki = "0.19.1"
-webpki-roots = "0.16.0"
-tower-h2 = { git = "https://github.com/tower-rs/tower-h2", rev="0865040d699697bbaf1c3b77b3f256b72f98cdf4" } 
 rust-embed = { version = "5.1.0", features = ["debug-embed"] }
 rand = "0.7.2"
 sodiumoxide = "0.2.5"
+ring = "0.16.9"
+
+tonic = { version = "0.1.1", features = ["tls", "tls-roots"] }
+bytes = "0.4"
+prost = "0.6"
+prost-types = "0.6"
+tokio = { version = "0.2", features = ["rt-threaded", "time", "stream", "fs", "macros", "uds", "full"] }
+tokio-rustls = { version = "0.12.1", features = ["dangerous_configuration"] }
+webpki = "0.21.0"
+webpki-roots = "0.18.0"
 
 [dependencies.bellman]
 git = "https://github.com/adityapk00/librustzcash.git"
@@ -68,7 +64,7 @@ rev = "188537ea025fcb7fbdfc11266f307a084a5451e4"
 features = ["ff_derive"]
 
 [build-dependencies]
-tower-grpc-build = { git = "https://github.com/tower-rs/tower-grpc",  features = ["tower-hyper"]  }
+tonic-build = "0.1.1"
 
 [dev-dependencies]
 tempdir = "0.3.7"

lib/build.rs

@@ -1,12 +1,11 @@
-fn main() {
-    // Build proto files
-    tower_grpc_build::Config::new()
-        .enable_server(false)
-        .enable_client(true)
-        .build(
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    tonic_build::configure()
+         .build_server(false)
+         .compile(
             &["proto/service.proto", "proto/compact_formats.proto"],
             &["proto"],
-        )
-        .unwrap_or_else(|e| panic!("protobuf compilation failed: {}", e));
+         )?;
     println!("cargo:rerun-if-changed=proto/service.proto");
-}
+    Ok(())
+ }
+

lib/res/lightwalletd-zecwallet-co-chain.pem

@@ -0,0 +1,9 @@
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----