Upgrade wasm-bindgen to 0.2.83

CHANGELOG.md

@@ -12,9 +12,11 @@ Post 1.0.0 release, the changelog format is based on [Keep a Changelog](https://
 ### Changed
 
 - validator-client: made `fee` argument optional for `execute` and `execute_multiple` ([#1541])
+- wasm-client: fixed build errors on MacOS and changed example JS code to use mainnet ([#1585])
 
 [#1541]: https://github.com/nymtech/nym/pull/1541
 [#1558]: https://github.com/nymtech/nym/pull/1558
+[#1585]: https://github.com/nymtech/nym/pull/1585
 
 
 ## [nym-binaries-1.0.2](https://github.com/nymtech/nym/tree/nym-binaries-1.0.2)

Cargo.lock

@@ -1128,7 +1128,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8"
 dependencies = [
- "sct",
+ "sct 0.6.1",
 ]
 
 [[package]]
@@ -1904,10 +1904,6 @@ name = "futures-timer"
 version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
-dependencies = [
- "gloo-timers",
- "send_wrapper",
-]
 
 [[package]]
 name = "futures-util"
@@ -1958,8 +1954,8 @@ dependencies = [
  "secp256k1",
  "thiserror",
  "tokio",
- "tokio-tungstenite",
- "tungstenite",
+ "tokio-tungstenite 0.17.2",
+ "tungstenite 0.17.3",
  "url",
  "validator-client",
  "wasm-bindgen",
@@ -1984,7 +1980,7 @@ dependencies = [
  "serde",
  "serde_json",
  "thiserror",
- "tungstenite",
+ "tungstenite 0.17.3",
 ]
 
 [[package]]
@@ -2092,18 +2088,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
 
-[[package]]
-name = "gloo-timers"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d12a7f4e95cfe710f1d624fb1210b7d961a5fb05c4fd942f4feab06e61f590e"
-dependencies = [
- "futures-channel",
- "futures-core",
- "js-sys",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "group"
 version = "0.10.0"
@@ -2396,7 +2380,7 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "tower-service",
- "webpki",
+ "webpki 0.21.4",
 ]
 
 [[package]]
@@ -2409,12 +2393,12 @@ dependencies = [
  "futures-util",
  "hyper",
  "log",
- "rustls",
+ "rustls 0.19.1",
  "rustls-native-certs",
  "tokio",
  "tokio-rustls",
- "webpki",
- "webpki-roots",
+ "webpki 0.21.4",
+ "webpki-roots 0.21.1",
 ]
 
 [[package]]
@@ -3089,7 +3073,7 @@ dependencies = [
  "serde_json",
  "sled",
  "tokio",
- "tokio-tungstenite",
+ "tokio-tungstenite 0.17.2",
  "topology",
  "url",
  "validator-client",
@@ -3136,7 +3120,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-stream",
- "tokio-tungstenite",
+ "tokio-tungstenite 0.17.2",
  "tokio-util 0.7.3",
  "url",
  "validator-api-requests",
@@ -3210,7 +3194,7 @@ dependencies = [
  "statistics-common",
  "thiserror",
  "tokio",
- "tokio-tungstenite",
+ "tokio-tungstenite 0.14.0",
  "websocket-requests",
 ]
 
@@ -3227,7 +3211,7 @@ dependencies = [
  "statistics-common",
  "thiserror",
  "tokio",
- "tokio-tungstenite",
+ "tokio-tungstenite 0.14.0",
 ]
 
 [[package]]
@@ -4730,8 +4714,20 @@ dependencies = [
  "base64",
  "log",
  "ring",
- "sct",
- "webpki",
+ "sct 0.6.1",
+ "webpki 0.21.4",
+]
+
+[[package]]
+name = "rustls"
+version = "0.20.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033"
+dependencies = [
+ "log",
+ "ring",
+ "sct 0.7.0",
+ "webpki 0.22.0",
 ]
 
 [[package]]
@@ -4741,7 +4737,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092"
 dependencies = [
  "openssl-probe",
- "rustls",
+ "rustls 0.19.1",
  "schannel",
  "security-framework",
 ]
@@ -4833,6 +4829,16 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "sct"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "sec1"
 version = "0.2.1"
@@ -4926,12 +4932,6 @@ dependencies = [
  "pest",
 ]
 
-[[package]]
-name = "send_wrapper"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0"
-
 [[package]]
 name = "serde"
 version = "1.0.136"
@@ -5330,7 +5330,7 @@ dependencies = [
  "once_cell",
  "paste",
  "percent-encoding",
- "rustls",
+ "rustls 0.19.1",
  "sha2 0.9.9",
  "smallvec 1.8.0",
  "sqlformat",
@@ -5339,8 +5339,8 @@ dependencies = [
  "thiserror",
  "tokio-stream",
  "url",
- "webpki",
- "webpki-roots",
+ "webpki 0.21.4",
+ "webpki-roots 0.21.1",
 ]
 
 [[package]]
@@ -5799,9 +5799,9 @@ version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
 dependencies = [
- "rustls",
+ "rustls 0.19.1",
  "tokio",
- "webpki",
+ "webpki 0.21.4",
 ]
 
 [[package]]
@@ -5838,7 +5838,19 @@ dependencies = [
  "log",
  "pin-project",
  "tokio",
- "tungstenite",
+ "tungstenite 0.13.0",
+]
+
+[[package]]
+name = "tokio-tungstenite"
+version = "0.17.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181"
+dependencies = [
+ "futures-util",
+ "log",
+ "tokio",
+ "tungstenite 0.17.3",
 ]
 
 [[package]]
@@ -6106,6 +6118,28 @@ dependencies = [
  "utf-8",
 ]
 
+[[package]]
+name = "tungstenite"
+version = "0.17.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0"
+dependencies = [
+ "base64",
+ "byteorder",
+ "bytes",
+ "http",
+ "httparse",
+ "log",
+ "rand 0.8.5",
+ "rustls 0.20.6",
+ "sha-1 0.10.0",
+ "thiserror",
+ "url",
+ "utf-8",
+ "webpki 0.22.0",
+ "webpki-roots 0.22.4",
+]
+
 [[package]]
 name = "typenum"
 version = "1.15.0"
@@ -6413,25 +6447,23 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.78"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
+checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
 dependencies = [
  "cfg-if 1.0.0",
- "serde",
- "serde_json",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.78"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
+checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
 dependencies = [
  "bumpalo",
- "lazy_static",
  "log",
+ "once_cell",
  "proc-macro2",
  "quote",
  "syn",
@@ -6452,9 +6484,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.78"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
+checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6462,9 +6494,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.78"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
+checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6475,9 +6507,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.78"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
+checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
 
 [[package]]
 name = "wasm-utils"
@@ -6485,7 +6517,7 @@ version = "0.1.0"
 dependencies = [
  "futures",
  "js-sys",
- "tungstenite",
+ "tungstenite 0.17.3",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -6515,15 +6547,12 @@ dependencies = [
  "ethereum-types",
  "futures",
  "futures-timer",
- "getrandom 0.2.6",
  "headers",
  "hex",
- "js-sys",
  "jsonrpc-core",
  "log",
  "parking_lot 0.11.2",
  "pin-project",
- "rand 0.8.5",
  "reqwest",
  "rlp",
  "secp256k1",
@@ -6535,8 +6564,6 @@ dependencies = [
  "tokio-stream",
  "tokio-util 0.6.9",
  "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
  "web3-async-native-tls",
 ]
 
@@ -6562,13 +6589,32 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "webpki"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "webpki-roots"
 version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940"
 dependencies = [
- "webpki",
+ "webpki 0.21.4",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1c760f0d366a6c24a02ed7816e23e691f5d92291f94d15e836006fd11b04daf"
+dependencies = [
+ "webpki 0.22.0",
 ]
 
 [[package]]

clients/native/Cargo.toml

@@ -28,7 +28,7 @@ rand = { version = "0.7.3", features = ["wasm-bindgen"] } # rng-related traits +
 serde = { version = "1.0.104", features = ["derive"] } # for config serialization/deserialization
 sled = "0.34" # for storage of replySURB decryption keys
 tokio = { version = "1.19.1", features = ["rt-multi-thread", "net", "signal"] } # async runtime
-tokio-tungstenite = "0.14" # websocket
+tokio-tungstenite = "0.17.2" # websocket
 
 ## internal
 client-core = { path = "../client-core" }

clients/webassembly/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "nym-client-wasm"
 authors = ["Dave Hrycyszyn <futurechimp@users.noreply.github.com>", "Jedrzej Stuczynski <andrew@nymtech.net>"]
-version = "1.0.1"
+version = "1.0.0"
 edition = "2021"
 keywords = ["nym", "sphinx", "wasm", "webassembly", "privacy", "client"]
 license = "Apache-2.0"
@@ -20,7 +20,8 @@ coconut = ["coconut-interface", "credentials", "gateway-client/coconut"]
 [dependencies]
 futures = "0.3"
 serde = { version = "1.0", features = ["derive"] }
-wasm-bindgen = { version = "=0.2.78", features = ["serde-serialize"]  }
+serde-wasm-bindgen = "0.4"
+wasm-bindgen = { version = "=0.2.83", features = ["serde-serialize"]  }
 wasm-bindgen-futures = "0.4"
 js-sys = "0.3"
 rand = { version = "0.7.3", features = ["wasm-bindgen"] }
@@ -32,7 +33,7 @@ credentials = { path = "../../common/credentials", optional = true }
 crypto = { path = "../../common/crypto" }
 nymsphinx = { path = "../../common/nymsphinx" }
 topology = { path = "../../common/topology" }
-gateway-client = { path = "../../common/client-libs/gateway-client", default-features = false, features = ["wasm"] }
+gateway-client = { path = "../../common/client-libs/gateway-client", default-features = false, features = ["wasm", "coconut"] }
 validator-client = { path = "../../common/client-libs/validator-client", default-features = false }
 wasm-utils = { path = "../../common/wasm-utils" }
 

clients/webassembly/js-example/index.js

@@ -25,7 +25,7 @@ async function main() {
     set_panic_hook();
 
     // validator server we will use to get topology from
-    const validator = "https://sandbox-validator.nymtech.net/api"; //"http://localhost:8081";
+    const validator = "https://validator.nymtech.net/api"; //"http://localhost:8081";
 
     client = new NymClient(validator);
 

clients/webassembly/src/client/mod.rs

@@ -211,7 +211,7 @@ impl NymClient {
         self
     }
 
-    pub(crate) fn choose_gateway(&self) -> &gateway::Node {
+    pub(crate) fn choose_gateway(&self) -> gateway::Node {
         let topology = self
             .topology
             .as_ref()
@@ -219,7 +219,21 @@ impl NymClient {
 
         // choose the first one available
         assert!(!topology.gateways().is_empty());
-        topology.gateways().first().unwrap()
+        topology.gateways().first().unwrap();
+
+        console_log!("picking nym gateway");
+
+        gateway::Node {
+            owner: "n1kymvkx6vsq7pvn6hfurkpg06h3j4gxj4em7tlg".to_string(),
+            stake: 100000000,
+            location: "PRIVACY HQ".to_string(),
+            host: "gateway1.nymtech.net".parse().unwrap(),
+            mix_host: "213.219.38.119:1789".parse().unwrap(),
+            clients_port: 443,
+            identity_key: identity::PublicKey::from_base58_string("E3mvZTHQCdBvhfr178Swx9g4QG3kkRUun7YnToLMcMbM").unwrap(),
+            sphinx_key: encryption::PublicKey::from_base58_string("CYcrjoJ8GT7Dp54zViUyyRUfegeRCyPifWQZHRgMZrfX").unwrap(),
+            version: "1.0.0-rc.2".to_string()
+        }
     }
 
     // Right now it's impossible to have async exported functions to take `&mut self` rather than mut self

clients/webassembly/src/client/received_processor.rs

@@ -167,7 +167,7 @@ impl ReceivedMessagesProcessor {
                 mix_msgs = fused_mixnet_messages_receiver.next() => {
                     for mix_msg in mix_msgs.unwrap() {
                         if let Some(processed) = self.process_received_fragment(mix_msg) {
-                            let arg1 = JsValue::from_serde(&processed).unwrap();
+                            let arg1 = serde_wasm_bindgen::to_value(&processed).unwrap();
                             on_message.call1(&this, &arg1).expect("on message failed!");
                         }
                     }

common/client-libs/gateway-client/Cargo.toml

@@ -15,8 +15,8 @@ log = "0.4"
 thiserror = "1.0"
 url = "2.2"
 rand = { version = "0.7.3", features = ["wasm-bindgen"] }
-secp256k1 = "0.20.3"
-web3 = { version = "0.17.0", default-features = false }
+secp256k1 = { version = "0.20.3", optional = true }
+web3 = { version = "0.17.0", default-features = false, optional = true }
 async-trait = { version = "0.1.51" }
 
 # internal
@@ -30,8 +30,8 @@ network-defaults = { path = "../../network-defaults" }
 validator-client = { path = "../validator-client", optional = true }
 
 [dependencies.tungstenite]
-version = "0.13"
-default-features = false
+version = "0.17.3"
+features = ["rustls-tls-webpki-roots"]
 
 # non-wasm-only dependencies
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio]
@@ -39,7 +39,7 @@ version = "1.19.1"
 features = ["macros", "rt", "net", "sync", "time"]
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.tokio-tungstenite]
-version = "0.14"
+version = "0.17.2"
 
 [target."cfg(not(target_arch = \"wasm32\"))".dependencies.credential-storage]
 path = "../../credential-storage"
@@ -73,5 +73,5 @@ features = ["js"]
 
 [features]
 coconut = ["gateway-requests/coconut", "coconut-interface", "validator-client", "credentials/coconut"]
-wasm = ["web3/wasm", "web3/http", "web3/signing"]
-default = ["web3/default"]
+wasm = []
+default = ["web3/default", "secp256k1"]

common/client-libs/gateway-client/src/bandwidth.rs

@@ -23,7 +23,7 @@ use {
     },
 };
 
-#[cfg(not(feature = "coconut"))]
+#[cfg(all(not(target_arch = "wasm32"), not(feature = "coconut")))]
 use {
     credentials::token::bandwidth::TokenCredential,
     crypto::asymmetric::identity,
@@ -45,7 +45,7 @@ use {
     },
 };
 
-#[cfg(not(feature = "coconut"))]
+#[cfg(all(not(target_arch = "wasm32"), not(feature = "coconut")))]
 pub fn eth_contract(web3: Web3<Http>) -> Contract<Http> {
     Contract::from_json(
         web3.eth(),
@@ -58,7 +58,7 @@ pub fn eth_contract(web3: Web3<Http>) -> Contract<Http> {
     .expect("Invalid json abi")
 }
 
-#[cfg(not(feature = "coconut"))]
+#[cfg(all(not(target_arch = "wasm32"), not(feature = "coconut")))]
 pub fn eth_erc20_contract(web3: Web3<Http>) -> Contract<Http> {
     Contract::from_json(
         web3.eth(),
@@ -76,11 +76,11 @@ pub struct BandwidthController<St: Storage> {
     storage: St,
     #[cfg(feature = "coconut")]
     validator_endpoints: Vec<url::Url>,
-    #[cfg(not(feature = "coconut"))]
+    #[cfg(all(not(target_arch = "wasm32"), not(feature = "coconut")))]
     contract: Contract<Http>,
-    #[cfg(not(feature = "coconut"))]
+    #[cfg(all(not(target_arch = "wasm32"), not(feature = "coconut")))]
     erc20_contract: Contract<Http>,
-    #[cfg(not(feature = "coconut"))]
+    #[cfg(all(not(target_arch = "wasm32"), not(feature = "coconut")))]
     eth_private_key: SecretKey,
 }
 
@@ -96,7 +96,7 @@ where
         }
     }
 
-    #[cfg(not(feature = "coconut"))]
+    #[cfg(all(not(target_arch = "wasm32"), not(feature = "coconut")))]
     pub fn new(
         storage: St,
         eth_endpoint: String,
@@ -120,7 +120,7 @@ where
         })
     }
 
-    #[cfg(not(feature = "coconut"))]
+    #[cfg(all(not(target_arch = "wasm32"), not(feature = "coconut")))]
     async fn backup_keypair(&self, keypair: &identity::KeyPair) -> Result<(), GatewayClientError> {
         self.storage
             .insert_erc20_credential(
@@ -132,7 +132,7 @@ where
         Ok(())
     }
 
-    #[cfg(not(feature = "coconut"))]
+    #[cfg(all(not(target_arch = "wasm32"), not(feature = "coconut")))]
     async fn restore_keypair(&self) -> Result<identity::KeyPair, GatewayClientError> {
         let data = self.storage.get_next_erc20_credential().await?;
         let public_key = identity::PublicKey::from_base58_string(data.public_key).unwrap();
@@ -141,7 +141,7 @@ where
         Ok(identity::KeyPair::from_keys(private_key, public_key))
     }
 
-    #[cfg(not(feature = "coconut"))]
+    #[cfg(all(not(target_arch = "wasm32"), not(feature = "coconut")))]
     async fn mark_keypair_as_spent(
         &self,
         keypair: &identity::KeyPair,
@@ -180,7 +180,7 @@ where
         )?)
     }
 
-    #[cfg(not(feature = "coconut"))]
+    #[cfg(all(not(target_arch = "wasm32"), not(feature = "coconut")))]
     pub async fn prepare_token_credential(
         &self,
         gateway_identity: identity::PublicKey,
@@ -219,7 +219,7 @@ where
         ))
     }
 
-    #[cfg(not(feature = "coconut"))]
+    #[cfg(all(not(target_arch = "wasm32"), not(feature = "coconut")))]
     pub async fn buy_token_credential(
         &self,
         verification_key: identity::PublicKey,
@@ -348,7 +348,7 @@ where
     }
 }
 
-#[cfg(not(feature = "coconut"))]
+#[cfg(all(not(target_arch = "wasm32"), not(feature = "coconut")))]
 #[cfg(test)]
 mod tests {
     use network_defaults::ETH_EVENT_NAME;

common/client-libs/gateway-client/src/client.rs

@@ -30,7 +30,7 @@ use rand::rngs::OsRng;
 use std::convert::TryFrom;
 use std::sync::Arc;
 use std::time::Duration;
-use tungstenite::protocol::Message;
+use tungstenite::Message;
 
 #[cfg(not(target_arch = "wasm32"))]
 use tokio_tungstenite::connect_async;
@@ -449,7 +449,7 @@ impl GatewayClient {
             .derive_destination_address();
         let encrypted_address = EncryptedAddressBytes::new(&self_address, shared_key, &iv);
 
-        let msg =
+        let msg: tungstenite::Message =
             ClientControlRequest::new_authenticate(self_address, encrypted_address, iv).into();
 
         match self.send_websocket_message(msg).await? {
@@ -733,6 +733,8 @@ impl GatewayClient {
     }
 
     pub async fn authenticate_and_start(&mut self) -> Result<Arc<SharedKeys>, GatewayClientError> {
+        println!("About to establish connection to {}", self.gateway_address);
+
         if !self.connection.is_established() {
             self.establish_connection().await?;
         }

common/topology/src/gateway.rs

@@ -89,7 +89,7 @@ impl Node {
     }
 
     pub fn clients_address(&self) -> String {
-        format!("ws://{}:{}", self.host, self.clients_port)
+        format!("wss://{}:{}", self.host, self.clients_port)
     }
 }
 

common/wasm-utils/Cargo.toml

@@ -9,12 +9,12 @@ edition = "2021"
 [dependencies]
 futures = "0.3"
 js-sys = "^0.3.51"
-wasm-bindgen = "=0.2.78"
+wasm-bindgen = "=0.2.83"
 wasm-bindgen-futures = "0.4"
 
 # we don't want entire tokio-tungstenite, tungstenite itself is just fine - we just want message and error enums
 [dependencies.tungstenite]
-version = "0.13"
+version = "0.17.3"
 default-features = false
 
 [dependencies.web-sys]

common/wasm-utils/src/websocket/mod.rs

@@ -85,6 +85,11 @@ pub struct JSWebsocket {
 
 impl JSWebsocket {
     pub fn new(url: &str) -> Result<Self, JsValue> {
+        console_log!(
+            "Attempting to establish wasm websocket connection to {}",
+            url
+        );
+
         let ws = WebSocket::new(url)?;
         // we don't want to ever have to deal with blobs
         ws.set_binary_type(web_sys::BinaryType::Arraybuffer);

gateway/Cargo.toml

@@ -33,7 +33,7 @@ subtle-encoding = { version = "0.5", features =  ["bech32-preview"]}
 thiserror = "1"
 tokio = { version = "1.19.1", features = [ "rt-multi-thread", "net", "signal", "fs" ] }
 tokio-stream = { version = "0.1.9", features = [ "fs" ] }
-tokio-tungstenite = "0.14"
+tokio-tungstenite = "0.17"
 tokio-util = { version = "0.7.3", features = [ "codec" ] }
 url = { version = "2.2", features = [ "serde" ] }
 web3 = "0.17.0"

gateway/gateway-requests/Cargo.toml

@@ -29,6 +29,6 @@ credentials = { path = "../../common/credentials" }
 coconut = ["coconut-interface", "credentials/coconut"]
 
 [dependencies.tungstenite]
-version = "0.13.0"
+version = "0.17.3"
 default-features = false
 

gateway/gateway-requests/src/registration/handshake/mod.rs

@@ -9,7 +9,8 @@ pub use self::shared_key::{SharedKeySize, SharedKeys};
 use crypto::asymmetric::identity;
 use futures::{Sink, Stream};
 use rand::{CryptoRng, RngCore};
-use tungstenite::{Error as WsError, Message as WsMessage};
+use tungstenite::error::Error as WsError;
+use tungstenite::protocol::Message as WsMessage;
 
 pub(crate) type WsItem = Result<WsMessage, WsError>;
 

gateway/gateway-requests/src/types.rs

@@ -18,7 +18,6 @@ use std::{
     convert::{TryFrom, TryInto},
     fmt::{self, Error, Formatter},
 };
-use tungstenite::protocol::Message;
 
 #[cfg(feature = "coconut")]
 use coconut_interface::Credential;
@@ -192,12 +191,12 @@ impl ClientControlRequest {
     }
 }
 
-impl From<ClientControlRequest> for Message {
+impl From<ClientControlRequest> for tungstenite::Message {
     fn from(req: ClientControlRequest) -> Self {
         // it should be safe to call `unwrap` here as the message is generated by the server
         // so if it fails (and consequently panics) it's a bug that should be resolved
         let str_req = serde_json::to_string(&req).unwrap();
-        Message::Text(str_req)
+        tungstenite::Message::Text(str_req)
     }
 }
 
@@ -258,12 +257,12 @@ impl ServerResponse {
     }
 }
 
-impl From<ServerResponse> for Message {
+impl From<ServerResponse> for tungstenite::Message {
     fn from(res: ServerResponse) -> Self {
         // it should be safe to call `unwrap` here as the message is generated by the server
         // so if it fails (and consequently panics) it's a bug that should be resolved
         let str_res = serde_json::to_string(&res).unwrap();
-        Message::Text(str_res)
+        tungstenite::Message::Text(str_res)
     }
 }
 
@@ -314,8 +313,8 @@ impl BinaryRequest {
         BinaryRequest::ForwardSphinx(mix_packet)
     }
 
-    pub fn into_ws_message(self, shared_key: &SharedKeys) -> Message {
-        Message::Binary(self.into_encrypted_tagged_bytes(shared_key))
+    pub fn into_ws_message(self, shared_key: &SharedKeys) -> tungstenite::Message {
+        tungstenite::Message::Binary(self.into_encrypted_tagged_bytes(shared_key))
     }
 }
 
@@ -367,8 +366,8 @@ impl BinaryResponse {
         BinaryResponse::PushedMixMessage(msg)
     }
 
-    pub fn into_ws_message(self, shared_key: &SharedKeys) -> Message {
-        Message::Binary(self.into_encrypted_tagged_bytes(shared_key))
+    pub fn into_ws_message(self, shared_key: &SharedKeys) -> tungstenite::Message {
+        tungstenite::Message::Binary(self.into_encrypted_tagged_bytes(shared_key))
     }
 }
 

nym-connect/Cargo.lock

@@ -1079,7 +1079,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8"
 dependencies = [
- "sct",
+ "sct 0.6.1",
 ]
 
 [[package]]
@@ -2570,7 +2570,7 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "tower-service",
- "webpki",
+ "webpki 0.21.4",
 ]
 
 [[package]]
@@ -2583,12 +2583,12 @@ dependencies = [
  "futures-util",
  "hyper",
  "log",
- "rustls",
+ "rustls 0.19.1",
  "rustls-native-certs",
  "tokio",
  "tokio-rustls",
- "webpki",
- "webpki-roots",
+ "webpki 0.21.4",
+ "webpki-roots 0.21.1",
 ]
 
 [[package]]
@@ -2745,15 +2745,6 @@ dependencies = [
  "generic-array 0.14.5",
 ]
 
-[[package]]
-name = "input_buffer"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f97967975f448f1a7ddb12b0bc41069d09ed6a1c161a92687e057325db35d413"
-dependencies = [
- "bytes",
-]
-
 [[package]]
 name = "instant"
 version = "0.1.12"
@@ -4709,8 +4700,20 @@ dependencies = [
  "base64",
  "log",
  "ring",
- "sct",
- "webpki",
+ "sct 0.6.1",
+ "webpki 0.21.4",
+]
+
+[[package]]
+name = "rustls"
+version = "0.20.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033"
+dependencies = [
+ "log",
+ "ring",
+ "sct 0.7.0",
+ "webpki 0.22.0",
 ]
 
 [[package]]
@@ -4720,7 +4723,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092"
 dependencies = [
  "openssl-probe",
- "rustls",
+ "rustls 0.19.1",
  "schannel",
  "security-framework",
 ]
@@ -4809,6 +4812,16 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "sct"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "sec1"
 version = "0.2.1"
@@ -5227,6 +5240,7 @@ version = "0.1.0"
 dependencies = [
  "nymsphinx-addressing",
  "ordered-buffer",
+ "thiserror",
 ]
 
 [[package]]
@@ -5373,7 +5387,7 @@ dependencies = [
  "once_cell",
  "paste",
  "percent-encoding",
- "rustls",
+ "rustls 0.19.1",
  "sha2 0.10.2",
  "smallvec 1.9.0",
  "sqlformat",
@@ -5382,8 +5396,8 @@ dependencies = [
  "thiserror",
  "tokio-stream",
  "url",
- "webpki",
- "webpki-roots",
+ "webpki 0.21.4",
+ "webpki-roots 0.21.1",
 ]
 
 [[package]]
@@ -6055,9 +6069,9 @@ version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6"
 dependencies = [
- "rustls",
+ "rustls 0.19.1",
  "tokio",
- "webpki",
+ "webpki 0.21.4",
 ]
 
 [[package]]
@@ -6073,13 +6087,12 @@ dependencies = [
 
 [[package]]
 name = "tokio-tungstenite"
-version = "0.14.0"
+version = "0.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e96bb520beab540ab664bd5a9cfeaa1fcd846fa68c830b42e2c8963071251d2"
+checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181"
 dependencies = [
  "futures-util",
  "log",
- "pin-project",
  "tokio",
  "tungstenite",
 ]
@@ -6245,22 +6258,24 @@ dependencies = [
 
 [[package]]
 name = "tungstenite"
-version = "0.13.0"
+version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fe8dada8c1a3aeca77d6b51a4f1314e0f4b8e438b7b1b71e3ddaca8080e4093"
+checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0"
 dependencies = [
  "base64",
  "byteorder",
  "bytes",
  "http",
  "httparse",
- "input_buffer",
  "log",
  "rand 0.8.5",
- "sha-1 0.9.8",
+ "rustls 0.20.6",
+ "sha-1 0.10.0",
  "thiserror",
  "url",
  "utf-8",
+ "webpki 0.22.0",
+ "webpki-roots 0.22.5",
 ]
 
 [[package]]
@@ -6592,9 +6607,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.78"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
+checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -6602,13 +6617,13 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.78"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
+checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
 dependencies = [
  "bumpalo",
- "lazy_static",
  "log",
+ "once_cell",
  "proc-macro2",
  "quote",
  "syn",
@@ -6629,9 +6644,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.78"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
+checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -6639,9 +6654,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.78"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
+checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6652,9 +6667,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.78"
+version = "0.2.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
+checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
 
 [[package]]
 name = "wasm-utils"
@@ -6781,13 +6796,32 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "webpki"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "webpki-roots"
 version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940"
 dependencies = [
- "webpki",
+ "webpki 0.21.4",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.22.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be"
+dependencies = [
+ "webpki 0.22.0",
 ]
 
 [[package]]