Merge branch 'dev' into burn-dex-fee-for-non-kmd

* dev:
  fix(legacy-swap): check for confirmations on recover taker (#2242)
  fix(legacy-swap): remove the need for takers to confirm their payment (#2249)
  refactor(P2P): types and modules (#2256)
  fix(evm): correctly display eth addr in iguana v2 activation result (#2254)
  feat(utxo): prioritize electrum connections (#1966)
  refactor(SwapOps): make all methods async (#2251)
  refactor(SwapOps): make `send_maker_payment` async (#2250)
  remove old p2p implementation (#2248)

Cargo.toml

@@ -43,9 +43,6 @@ members = [
 
 exclude = [
     "mm2src/adex_cli",
-    "mm2src/floodsub",
-    "mm2src/gossipsub",
-    "mm2src/mm2_libp2p",
     "mm2src/mm2_test_helpers",
 ]
 

mm2src/adex_cli/Cargo.toml

@@ -7,32 +7,33 @@ description = "Provides a CLI interface and facilitates interoperating to komodo
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-anyhow = { version = "=1.0.42", features  = ["std"] }
-async-trait = "=0.1.52"
+anyhow = { version = "1.0", features  = ["std"] }
+async-trait = "0.1"
 clap = { version = "4.2", features = ["derive"] }
 common = { path = "../common" }
 derive_more = "0.99"
 directories = "5.0"
-env_logger = "0.7.1"
+env_logger = "0.9.3"
 http = "0.2"
 hyper = { version = "0.14.26", features = ["client", "http2", "tcp"] }
-hyper-rustls = "0.24.0"
-gstuff = { version = "=0.7.4" , features = [ "nightly" ]}
+hyper-rustls = "0.24"
+gstuff = { version = "0.7" , features = [ "nightly" ]}
 inquire = "0.6"
 itertools = "0.10"
 log = "0.4.21"
 mm2_net = { path = "../mm2_net" }
 mm2_number = { path = "../mm2_number" }
 mm2_rpc = { path = "../mm2_rpc"}
+mm2_core = { path = "../mm2_core" }
 passwords = "3.1"
 rpc = { path = "../mm2_bitcoin/rpc" }
 rustls = { version = "0.21", features = [ "dangerous_configuration" ] }
 serde = "1.0"
 serde_json = { version = "1", features = ["preserve_order", "raw_value"] }
 sysinfo = "0.28"
 tiny-bip39 = "0.8.0"
-tokio = { version = "=1.25.0", features = [ "macros" ] }
-uuid = { version = "=1.2.2", features = ["fast-rng", "serde", "v4"] }
+tokio = { version = "1.20.0", features = [ "macros" ] }
+uuid = { version = "1.2.2", features = ["fast-rng", "serde", "v4"] }
 
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3.3", features = ["processthreadsapi", "winnt"] }

mm2src/adex_cli/src/adex_proc/adex_proc_impl.rs

@@ -1,5 +1,5 @@
 use anyhow::{anyhow, bail, Result};
-use log::{error, info, warn};
+use log::{debug, error, info, warn};
 use mm2_rpc::data::legacy::{BalanceResponse, CoinInitResponse, GetEnabledResponse, Mm2RpcResult, MmVersionResponse,
                             OrderbookRequest, OrderbookResponse, SellBuyRequest, SellBuyResponse, Status};
 use serde_json::{json, Value as Json};
@@ -38,7 +38,7 @@ impl<T: Transport, P: ResponseHandler, C: AdexConfig + 'static> AdexProc<'_, '_,
 
         let activation_scheme = get_activation_scheme()?;
         let activation_method = activation_scheme.get_activation_method(asset)?;
-
+        debug!("Got activation scheme for the coin: {}, {:?}", asset, activation_method);
         let enable = Command::builder()
             .flatten_data(activation_method)
             .userpass(self.get_rpc_password()?)

mm2src/adex_cli/src/rpc_data.rs

@@ -40,6 +40,10 @@ pub(crate) struct ElectrumRequest {
     #[serde(skip_serializing_if = "Vec::is_empty")]
     pub(super) servers: Vec<Server>,
     #[serde(skip_serializing_if = "Option::is_none")]
+    min_connected: Option<usize>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    max_connected: Option<usize>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     mm2: Option<u8>,
     #[serde(default)]
     tx_history: bool,
@@ -62,4 +66,5 @@ pub(super) struct Server {
     protocol: ElectrumProtocol,
     #[serde(default)]
     disable_cert_verification: bool,
+    pub timeout_sec: Option<u64>,
 }

mm2src/coins/Cargo.toml

@@ -67,8 +67,9 @@ mm2_event_stream = { path = "../mm2_event_stream" }
 mm2_git = { path = "../mm2_git" }
 mm2_io = { path = "../mm2_io" }
 mm2_metrics = { path = "../mm2_metrics" }
-mm2_net = { path = "../mm2_net", features = ["p2p"] }
+mm2_net = { path = "../mm2_net" }
 mm2_number = { path = "../mm2_number"}
+mm2_p2p = { path = "../mm2_p2p" }
 mm2_rpc = { path = "../mm2_rpc" }
 mm2_state_machine = { path = "../mm2_state_machine" }
 mocktopus = { version = "0.8.0", optional = true }