refactor(toolchain): general stabilization for stable rust

.cargo/config.toml

@@ -1,8 +1,16 @@
 [env]
+# Enables unstable features for specific crates to take advantage of useful
+# functionality not yet stabilized. Remove a crate from the list once all
+# required features are stabilized.
+#
+# - mm2_state_machine: Depends on `negative_impls` and `auto_traits`.
+# - mm2_err_handle: Depends on `negative_impls`, `auto_traits` and `allocator_api`.
+RUSTC_BOOTSTRAP = "mm2_state_machine,mm2_err_handle"
+
 JEMALLOC_SYS_WITH_MALLOC_CONF = "background_thread:true,narenas:1,tcache:false,dirty_decay_ms:0,muzzy_decay_ms:0,metadata_thp:auto"
 
 [target.'cfg(all())']
-rustflags = [ "-Zshare-generics=y", '--cfg=curve25519_dalek_backend="fiat"' ]
+rustflags = [ '--cfg=curve25519_dalek_backend="fiat"' ]
 
 # # Install lld using package manager
 # [target.x86_64-unknown-linux-gnu]

Cargo.toml

@@ -106,7 +106,7 @@ futures-timer = "3.0"
 futures-util = { version = "0.3", default-features = false, features = ["sink", "std"] }
 fnv = "1.0.6"
 group = "0.8.0"
-gstuff = { version = "0.7", features = ["nightly"] }
+gstuff = { version = "0.7" }
 hash256-std-hasher = "0.15.2"
 hash-db = "0.15.2"
 hex = "0.4.2"

mm2src/coins/Cargo.toml

@@ -25,7 +25,7 @@ doctest = false
 
 [dependencies]
 async-std = { workspace = true, features = ["unstable"] }
-async-trait.workspace = true 
+async-trait.workspace = true
 base64.workspace = true
 bip32.workspace = true
 bitcoin_hashes.workspace = true
@@ -56,7 +56,7 @@ futures-util.workspace = true
 futures-ticker.workspace = true
 futures = { workspace = true, features = ["compat", "async-await"] }
 group.workspace = true
-gstuff.workspace = true 
+gstuff.workspace = true
 hex.workspace = true
 http.workspace = true
 itertools = { workspace = true, features = ["use_std"] }
@@ -78,7 +78,7 @@ mm2_rpc = { path = "../mm2_rpc" }
 mm2_state_machine = { path = "../mm2_state_machine" }
 mocktopus = { workspace =  true, optional = true }
 num-traits.workspace = true
-parking_lot = { workspace = true, features = ["nightly"] }
+parking_lot = { workspace = true }
 primitives = { path = "../mm2_bitcoin/primitives" }
 prost.workspace = true
 protobuf.workspace = true
@@ -91,7 +91,7 @@ rmp-serde.workspace = true
 rpc = { path = "../mm2_bitcoin/rpc" }
 rpc_task = { path = "../rpc_task" }
 script = { path = "../mm2_bitcoin/script" }
-secp256k1.workspace = true 
+secp256k1.workspace = true
 ser_error = { path = "../derives/ser_error" }
 ser_error_derive = { path = "../derives/ser_error_derive" }
 serde.workspace = true
@@ -109,17 +109,17 @@ utxo_signer = { path = "utxo_signer" }
 tendermint-rpc.workspace = true
 tokio-tungstenite-wasm = { workspace = true, features = ["rustls-tls-native-roots"]}
 url.workspace = true
-uuid.workspace = true 
+uuid.workspace = true
 # One of web3 dependencies is the old `tokio-uds 0.1.7` which fails cross-compiling to ARM.
 # We don't need the default web3 features at all since we added our own web3 transport using shared HYPER instance.
 web3 = { workspace = true, default-features = false }
 zbase32.workspace = true
 zcash_client_backend.workspace = true
 zcash_extras.workspace = true
-zcash_primitives.workspace = true 
+zcash_primitives.workspace = true
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-blake2b_simd.workspace = true 
+blake2b_simd.workspace = true
 ff.workspace = true
 futures-util.workspace = true
 jubjub.workspace = true
@@ -154,7 +154,7 @@ tokio.workspace = true
 tokio-rustls.workspace = true
 tonic = { workspace = true, features = ["codegen", "prost", "gzip", "tls", "tls-webpki-roots"] }
 webpki-roots.workspace = true
-zcash_client_sqlite.workspace = true 
+zcash_client_sqlite.workspace = true
 zcash_proofs = { workspace = true, features = ["local-prover", "multicore"] }
 
 [target.'cfg(windows)'.dependencies]
@@ -169,7 +169,7 @@ jubjub.workspace = true
 reqwest.workspace = true
 
 [target.'cfg(target_arch = "wasm32")'.dev-dependencies]
-wagyu-zcash-parameters.workspace = true 
+wagyu-zcash-parameters.workspace = true
 
 [build-dependencies]
 prost-build.workspace = true

mm2src/coins/lp_coins.rs

@@ -29,9 +29,6 @@
     clippy::needless_lifetimes // mocktopus requires explicit lifetimes
 )]
 #![allow(uncommon_codepoints)]
-#![feature(hash_raw_entry)]
-#![feature(stmt_expr_attributes)]
-#![feature(result_flattening)]
 
 #[macro_use] extern crate common;
 #[macro_use] extern crate gstuff;

mm2src/coins_activation/Cargo.toml

@@ -26,7 +26,7 @@ mm2_err_handle = { path = "../mm2_err_handle" }
 mm2_event_stream = { path = "../mm2_event_stream" }
 mm2_metrics = { path = "../mm2_metrics" }
 mm2_number = { path = "../mm2_number" }
-parking_lot = { workspace = true, features = ["nightly"] }
+parking_lot = { workspace = true }
 rpc = { path = "../mm2_bitcoin/rpc" }
 rpc_task = { path = "../rpc_task" }
 secp256k1 = { version = "0.24" }

mm2src/common/Cargo.toml

@@ -34,8 +34,8 @@ http-body.workspace = true
 itertools.workspace = true
 lazy_static.workspace = true
 log.workspace = true
-parking_lot = { workspace = true, features = ["nightly"] }
-parking_lot_core.workspace = true 
+parking_lot = { workspace = true }
+parking_lot_core.workspace = true
 paste.workspace = true
 primitive-types.workspace = true
 rand = { workspace = true, features = ["std", "small_rng"] }

mm2src/common/common.rs

@@ -11,7 +11,6 @@
 //!                   binary
 
 #![allow(uncommon_codepoints)]
-#![feature(hash_raw_entry)]
 
 #[macro_use] extern crate arrayref;
 #[macro_use] extern crate gstuff;
@@ -175,6 +174,7 @@ use std::panic::{set_hook, PanicHookInfo};
 use std::path::{Path, PathBuf};
 use std::ptr::read_volatile;
 use std::sync::atomic::Ordering;
+use std::sync::OnceLock;
 use std::time::{Duration, SystemTime, SystemTimeError};
 use uuid::Uuid;
 
@@ -230,6 +230,15 @@ lazy_static! {
 /// Converts u64 satoshis to f64
 pub fn sat_to_f(sat: u64) -> f64 { sat as f64 / SATOSHIS as f64 }
 
+/// Marker type to indicate that a type is `!Send` in a stable way.
+pub struct NotSend(std::marker::PhantomData<*const ()>);
+
+impl Default for NotSend {
+    fn default() -> NotSend {
+        NotSend(std::marker::PhantomData)
+    }
+}
+
 #[allow(non_camel_case_types)]
 #[derive(Clone, Copy, Eq, Hash, PartialEq)]
 #[repr(transparent)]
@@ -331,13 +340,13 @@ pub fn black_box<T>(v: T) -> T {
 
 /// Using a static buffer in order to minimize the chance of heap and stack allocations in the signal handler.
 fn trace_buf() -> PaMutexGuard<'static, [u8; 256]> {
-    static TRACE_BUF: PaMutex<[u8; 256]> = PaMutex::new([0; 256]);
-    TRACE_BUF.lock()
+    static TRACE_BUF: OnceLock<PaMutex<[u8; 256]>> = OnceLock::new();
+    TRACE_BUF.get_or_init(|| PaMutex::new([0; 256])).lock()
 }
 
 fn trace_name_buf() -> PaMutexGuard<'static, [u8; 128]> {
-    static TRACE_NAME_BUF: PaMutex<[u8; 128]> = PaMutex::new([0; 128]);
-    TRACE_NAME_BUF.lock()
+    static TRACE_NAME_BUF: OnceLock<PaMutex<[u8; 128]>> = OnceLock::new();
+    TRACE_NAME_BUF.get_or_init(|| PaMutex::new([0; 128])).lock()
 }
 
 /// Shortcut to path->filename conversion.
@@ -529,7 +538,7 @@ pub fn set_panic_hook() {
     }))
 }
 
-/// RPC response, returned by the RPC handlers.  
+/// RPC response, returned by the RPC handlers.
 /// NB: By default the future is executed on the shared asynchronous reactor (`CORE`),
 /// the handler is responsible for spawning the future on another reactor if it doesn't fit the `CORE` well.
 pub type HyRes = Box<dyn Future<Item = Response<Vec<u8>>, Error = String> + Send>;
@@ -719,8 +728,8 @@ pub fn now_sec_i64() -> i64 {
 #[cfg(not(target_arch = "wasm32"))]
 pub fn temp_dir() -> PathBuf { env::temp_dir() }
 
-/// If the `MM_LOG` variable is present then tries to open that file.  
-/// Prints a warning to `stdout` if there's a problem opening the file.  
+/// If the `MM_LOG` variable is present then tries to open that file.
+/// Prints a warning to `stdout` if there's a problem opening the file.
 /// Returns `None` if `MM_LOG` variable is not present or if the specified path can't be opened.
 #[cfg(not(target_arch = "wasm32"))]
 pub(crate) fn open_log_file() -> Option<std::fs::File> {
@@ -1190,7 +1199,7 @@ pub fn http_uri_to_ws_address(uri: http::Uri) -> String {
 #[inline]
 pub fn u256_to_hex(value: U256) -> String { format!("0x{:x}", value) }
 
-/// If 0x prefix exists in an str strip it or return the str as-is  
+/// If 0x prefix exists in an str strip it or return the str as-is
 #[macro_export]
 macro_rules! str_strip_0x {
     ($s: expr) => {

mm2src/crypto/Cargo.toml

@@ -32,7 +32,7 @@ lazy_static.workspace = true
 mm2_core = { path = "../mm2_core" }
 mm2_err_handle = { path = "../mm2_err_handle" }
 num-traits.workspace = true
-parking_lot = { workspace = true, features = ["nightly"] }
+parking_lot = { workspace = true }
 primitives = { path = "../mm2_bitcoin/primitives" }
 rpc = { path = "../mm2_bitcoin/rpc" }
 rpc_task = { path = "../rpc_task" }

mm2src/kdf_walletconnect/Cargo.toml

@@ -19,7 +19,7 @@ hkdf.workspace = true
 mm2_db = { path = "../mm2_db" }
 mm2_core = { path = "../mm2_core" }
 mm2_err_handle = { path = "../mm2_err_handle" }
-parking_lot = { workspace = true, features = ["nightly"] }
+parking_lot = { workspace = true }
 pairing_api.workspace = true
 rand = "0.8"
 relay_client.workspace = true

mm2src/mm2_db/src/indexed_db/db_driver.rs

@@ -52,10 +52,9 @@ pub struct IdbDatabaseImpl {
     db: IdbDatabase,
     db_name: String,
     tables: HashSet<String>,
+    _not_send: common::NotSend
 }
 
-impl !Send for IdbDatabaseImpl {}
-
 impl fmt::Debug for IdbDatabaseImpl {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(

mm2src/mm2_db/src/indexed_db/drivers/builder.rs

@@ -105,6 +105,7 @@ impl IdbDatabaseBuilder {
                         db,
                         db_name: self.db_name,
                         tables: table_names,
+                        _not_send: common::NotSend::default(),
                     });
                 },
             }

mm2src/mm2_db/src/indexed_db/drivers/object_store.rs

@@ -13,10 +13,9 @@ use web_sys::{IdbIndex, IdbObjectStore, IdbRequest};
 pub struct IdbObjectStoreImpl {
     pub(crate) object_store: IdbObjectStore,
     pub(crate) aborted: Arc<AtomicBool>,
+    pub(crate) _not_send: common::NotSend
 }
 
-impl !Send for IdbObjectStoreImpl {}
-
 impl IdbObjectStoreImpl {
     pub(crate) fn aborted(&self) -> bool { self.aborted.load(Ordering::Relaxed) }
 

mm2src/mm2_db/src/indexed_db/drivers/transaction.rs

@@ -58,10 +58,9 @@ pub struct IdbTransactionImpl {
     /// It's not used directly, but we need to hold the closures in memory till `transaciton` exists.
     #[allow(dead_code)]
     onabort_closure: Closure<dyn FnMut(JsValue)>,
+    _not_send: common::NotSend
 }
 
-impl !Send for IdbTransactionImpl {}
-
 impl IdbTransactionImpl {
     pub(crate) fn aborted(&self) -> bool { self.aborted.load(Ordering::Relaxed) }
 
@@ -79,6 +78,7 @@ impl IdbTransactionImpl {
             Ok(object_store) => Ok(IdbObjectStoreImpl {
                 object_store,
                 aborted: self.aborted.clone(),
+                _not_send: common::NotSend::default(),
             }),
             Err(e) => MmError::err(DbTransactionError::ErrorOpeningTable {
                 table: table_name.to_owned(),
@@ -101,6 +101,7 @@ impl IdbTransactionImpl {
             tables,
             aborted,
             onabort_closure,
+            _not_send: common::NotSend::default()
         }
     }
 }

mm2src/mm2_db/src/lib.rs

@@ -1,5 +1,3 @@
-#![feature(negative_impls)]
-
 #[cfg(target_arch = "wasm32")]
 #[path = "indexed_db/indexed_db.rs"]
 pub mod indexed_db;

mm2src/mm2_main/Cargo.toml

@@ -81,7 +81,7 @@ mm2_state_machine = { path = "../mm2_state_machine" }
 trading_api = { path = "../trading_api" }
 num-traits.workspace = true
 parity-util-mem.workspace = true
-parking_lot = { workspace = true, features = ["nightly"] }
+parking_lot = { workspace = true }
 primitives = { path = "../mm2_bitcoin/primitives" }
 primitive-types.workspace = true
 prost.workspace = true

mm2src/mm2_main/tests/docker_tests_main.rs

@@ -3,7 +3,6 @@
 #![feature(custom_test_frameworks)]
 #![feature(test)]
 #![test_runner(docker_tests_runner)]
-#![feature(hash_raw_entry)]
 
 #[cfg(test)]
 #[macro_use]

mm2src/mm2_main/tests/docker_tests_sia_unique.rs

@@ -1,6 +1,5 @@
 #![feature(custom_test_frameworks)]
 #![feature(test)]
-#![feature(hash_raw_entry)]
 #![cfg(feature = "enable-sia")]
 #![cfg(not(target_arch = "wasm32"))]
 #![allow(unused_imports, dead_code)]

mm2src/mm2_metamask/Cargo.toml

@@ -10,11 +10,11 @@ derive_more.workspace = true
 futures = { workspace = true }
 itertools.workspace = true
 js-sys.workspace = true
-jsonrpc-core.workspace = true 
+jsonrpc-core.workspace = true
 lazy_static.workspace = true
 mm2_err_handle = { path = "../mm2_err_handle" }
 mm2_eth = { path = "../mm2_eth" }
-parking_lot = { workspace = true, features = ["nightly"] }
+parking_lot = { workspace = true }
 serde.workspace = true
 serde_json = { workspace = true, features = ["preserve_order", "raw_value"] }
 serde_derive.workspace = true

mm2src/mm2_net/src/ip_addr.rs

@@ -218,3 +218,23 @@ pub fn addr_to_ipv4_string(address: &str) -> Result<String, MmError<ParseAddress
         address: address.to_owned(),
     })
 }
+
+/// Stable port of `Ipv4Addr::is_global` which should be removed once
+/// stabilized on std.
+pub fn is_global_ipv4(ip: &Ipv4Addr) -> bool {
+    !(ip.octets()[0] == 0 // "This network"
+            || ip.is_private()
+            || ip.octets()[0] == 100 && (ip.octets()[1] & 0b1100_0000 == 0b0100_0000)
+            || ip.is_loopback()
+            || ip.is_link_local()
+            // addresses reserved for future protocols (`192.0.0.0/24`)
+            // .9 and .10 are documented as globally reachable so they're excluded
+            || (
+                ip.octets()[0] == 192 && ip.octets()[1] == 0 && ip.octets()[2] == 0
+                && ip.octets()[3] != 9 && ip.octets()[3] != 10
+            )
+            || ip.is_documentation()
+            || ip.octets()[0] == 198 && (ip.octets()[1] & 0xfe) == 18
+            || ip.octets()[0] & 240 == 240 && !ip.is_broadcast()
+            || ip.is_broadcast())
+}

mm2src/mm2_p2p/Cargo.toml

@@ -24,7 +24,7 @@ mm2_core = { path = "../mm2_core" }
 mm2_event_stream = { path = "../mm2_event_stream" }
 mm2_net = { path = "../mm2_net" }
 mm2_number = { path = "../mm2_number", optional = true }
-parking_lot = { workspace = true, features = ["nightly"] }
+parking_lot = { workspace = true }
 rand = { workspace = true, features = ["wasm-bindgen"] }
 regex.workspace = true
 rmp-serde.workspace = true
@@ -34,7 +34,7 @@ serde_bytes.workspace = true
 serde_json = { workspace = true, features = ["preserve_order", "raw_value"] }
 sha2.workspace = true
 smallvec.workspace = true
-void.workspace = true 
+void.workspace = true
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 futures-rustls.workspace = true

mm2src/mm2_p2p/src/behaviours/atomicdex.rs

@@ -18,6 +18,7 @@ use libp2p::swarm::{ConnectionDenied, ConnectionId, NetworkBehaviour, SwarmEvent
 use libp2p::{identity, noise, PeerId, Swarm};
 use libp2p::{Multiaddr, Transport};
 use log::{debug, error, info};
+use mm2_net::ip_addr::is_global_ipv4;
 use rand::seq::SliceRandom;
 use std::collections::hash_map::DefaultHasher;
 use std::collections::HashMap;
@@ -965,7 +966,7 @@ fn announce_my_addresses(swarm: &mut AtomicDexSwarm) {
         .filter(|listener| {
             for protocol in listener.iter() {
                 if let Protocol::Ip4(ip) = protocol {
-                    return ip.is_global();
+                    return is_global_ipv4(&ip);
                 }
             }
             false