GH-509: actix upgrade

dns_utility/Cargo.toml

@@ -8,18 +8,17 @@ description = "Command-line utility to turn DNS subversion on and off"
 edition = "2021"
 
 [dependencies]
-regex = "1.3.7"
-libc = "0.2.69"
+regex = "1.5.4"
+libc = "0.2.107"
 masq_lib = { path = "../masq_lib" }
 
-
 [target.'cfg(target_os = "macos")'.dependencies]
-system-configuration = "0.3.0"
-core-foundation = "0.6.4"
+system-configuration = "0.4.0"
+core-foundation = "0.7.0"
 
 [target.'cfg(target_os = "windows")'.dependencies]
-winreg = "0.7.0"
-ipconfig = "0.2.1"
+winreg = "0.10.1"
+ipconfig = "0.2.2"
 
 [dev-dependencies]
 

masq/Cargo.toml

@@ -11,17 +11,17 @@ workspace = "../node"
 # See more keys and their definitions at  https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = "2.33.1"
-crossbeam-channel = "0.5.0"
+clap = "2.33.3"
+crossbeam-channel = "0.5.1"
 lazy_static = "1.4.0"
 linefeed = "0.6.0"
 masq_lib = { path = "../masq_lib" }
-regex = "1.0.5"
-websocket = {version = "0.26.0", default-features = false, features = ["sync"]}
-ctrlc = "3.1.9"
+regex = "1.5.4"
+websocket = {version = "0.26.2", default-features = false, features = ["sync"]}
+ctrlc = "3.2.1"
 
 [target.'cfg(not(target_os = "windows"))'.dependencies]
-nix = "0.20.0"
+nix = "0.23.0"
 
 [lib]
 name = "masq_cli_lib"

masq_lib/Cargo.toml

@@ -9,26 +9,26 @@ edition = "2021"
 workspace = "../node"
 
 [dependencies]
-actix = "0.7.9"
+actix = "0.12.0"
 clap = "2.33.3"
 const_format = "0.2.22"
-crossbeam-channel = "0.5.0"
-itertools = "0.8.0"
+crossbeam-channel = "0.5.1"
+itertools = "0.10.1"
 lazy_static = "1.4.0"
-regex = "1.0.5"
-serde = "1.0.99"
-serde_derive = "1.0.99"
-serde_json = "1.0.40"
-tiny-hderive = "0.2.1"
-toml = "0.5.3"
+regex = "1.5.4"
+serde = "1.0.130"
+serde_derive = "1.0.130"
+serde_json = "1.0.69"
+tiny-hderive = "0.3.0"
+toml = "0.5.8"
 web3 = {version = "0.8.0", default-features = false}
-websocket = {version = "0.26.0", default-features = false, features = ["sync"]}
+websocket = {version = "0.26.2", default-features = false, features = ["sync"]}
 
 [features]
 no_test_share = []
 
 [target.'cfg(not(target_os = "windows"))'.dependencies]
-nix = "0.20.0"
+nix = "0.23.0"
 
 [lib]
 name = "masq_lib"

masq_lib/src/messages.rs

@@ -6,9 +6,9 @@ use crate::shared_schema::ConfiguratorError;
 use crate::ui_gateway::MessagePath::{Conversation, FireAndForget};
 use crate::ui_gateway::{MessageBody, MessagePath};
 use itertools::Itertools;
+use serde::__private::fmt::Error;
+use serde::__private::Formatter;
 use serde::de::DeserializeOwned;
-use serde::export::fmt::Error;
-use serde::export::Formatter;
 use serde_derive::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::fmt;

masq_lib/src/multi_config.rs

@@ -6,7 +6,7 @@ use crate::utils::WrapResult;
 use clap::{value_t, values_t};
 use clap::{App, ArgMatches};
 use regex::Regex;
-use serde::export::Formatter;
+use serde::__private::Formatter;
 use std::collections::HashSet;
 use std::fmt::{Debug, Display};
 use std::fs::File;

masq_lib/src/ui_gateway.rs

@@ -24,12 +24,14 @@ pub struct MessageBody {
 }
 
 #[derive(Message, PartialEq, Clone, Debug)]
+#[rtype(result = "")]
 pub struct NodeFromUiMessage {
     pub client_id: u64,
     pub body: MessageBody,
 }
 
 #[derive(Message, PartialEq, Clone, Debug)]
+#[rtype(result = "")]
 pub struct NodeToUiMessage {
     pub target: MessageTarget,
     pub body: MessageBody,

multinode_integration_tests/Cargo.toml

@@ -9,27 +9,27 @@ edition = "2021"
 workspace = "../node"
 
 [dependencies]
-base64 = "0.10.1"
-crossbeam-channel = "0.5.0"
+base64 = "0.13.0"
+crossbeam-channel = "0.5.1"
 ethereum-types = "0.6.0"
-ethsign-crypto = "0.1.0"
-futures = "0.1.28"
-itertools = "0.8.0"
+ethsign-crypto = "0.2.1"
+futures = "0.1.31"
+itertools = "0.10.1"
 masq_lib = { path = "../masq_lib" }
-pretty-hex = "0.1.0"
+pretty-hex = "0.2.1"
 primitive-types = {version = "0.5.0", default-features = false, features = ["default", "rlp", "serde"] }
-regex = "1.2.1"
-rusqlite = {version = "0.20.0", features = ["bundled"]}
-rustc-hex = "2.0.1"
-serde = "1.0.99"
-serde_derive = "1.0.99"
-serde_cbor = "0.10.1"
+regex = "1.5.4"
+rusqlite = {version = "0.26.1", features = ["bundled"]}
+rustc-hex = "2.1.0"
+serde = "1.0.130"
+serde_derive = "1.0.130"
+serde_cbor = "0.11.2"
 sha1 = "0.6.0"
-tiny-bip39 = "0.6.2"
-tiny-hderive = "0.2.1"
-native-tls = "0.2.3"
+tiny-bip39 = "0.8.2"
+tiny-hderive = "0.3.0"
+native-tls = "0.2.8"
 node = { path = "../node", features = [ "expose_test_privates" ] }
-uint = "0.8.1"
+uint = "0.9.1"
 web3 = {version = "0.8.0", default-features = false, features = ["http", "tls"]}
 
 [lib]
@@ -41,4 +41,4 @@ name = "mock_node"
 path = "src/main.rs"
 
 [dev-dependencies]
-reqwest = "0.9.19"
+reqwest = "0.11.6"

multinode_integration_tests/src/masq_real_node.rs

@@ -348,7 +348,7 @@ impl NodeStartupConfig {
             }
             ConsumingWalletInfo::DerivationPath(phrase, derivation_path) => {
                 let mnemonic =
-                    Mnemonic::from_phrase(phrase.to_string(), Language::English).unwrap();
+                    Mnemonic::from_phrase(&phrase.to_string(), Language::English).unwrap();
                 let keypair = Bip32ECKeyPair::from_raw(
                     Seed::new(&mnemonic, "passphrase").as_ref(),
                     derivation_path,

multinode_integration_tests/tests/verify_bill_payment.rs

@@ -20,7 +20,6 @@ use node_lib::blockchain::raw_transaction::RawTransaction;
 use node_lib::database::db_initializer::{DbInitializer, DbInitializerReal};
 use node_lib::sub_lib::wallet::Wallet;
 use node_lib::test_utils;
-use rusqlite::NO_PARAMS;
 use rustc_hex::{FromHex, ToHex};
 use std::convert::TryFrom;
 use std::path::{Path, PathBuf};
@@ -390,12 +389,12 @@ fn expire_payables(path: PathBuf, chain: Chain) {
             "update payable set last_paid_timestamp = 0 where pending_payment_transaction is null",
         )
         .unwrap();
-    statement.execute(NO_PARAMS).unwrap();
+    statement.execute([]).unwrap();
 
     let mut config_stmt = conn
         .prepare("update config set value = '0' where name = 'start_block'")
         .unwrap();
-    config_stmt.execute(NO_PARAMS).unwrap();
+    config_stmt.execute([]).unwrap();
 }
 
 fn expire_receivables(path: PathBuf, chain: Chain) {
@@ -405,12 +404,12 @@ fn expire_receivables(path: PathBuf, chain: Chain) {
     let mut statement = conn
         .prepare("update receivable set last_received_timestamp = 0")
         .unwrap();
-    statement.execute(NO_PARAMS).unwrap();
+    statement.execute([]).unwrap();
 
     let mut config_stmt = conn
         .prepare("update config set value = '0' where name = 'start_block'")
         .unwrap();
-    config_stmt.execute(NO_PARAMS).unwrap();
+    config_stmt.execute([]).unwrap();
 }
 
 fn open_all_file_permissions(dir: PathBuf) {