Rust 1.80

Preserves the fn accessors within the Monero crates so that we can use statics in some cfgs yet not all (in order to provide support for more low-memory devices) with the exception of `H` (which truly should be cached).
2025-12-09 12:49:23 +00:00 · 2024-07-26 19:20:04 -04:00
parent 6f34c2ff77
commit 880565cb81
38 changed files with 147 additions and 195 deletions
--- a/networks/monero/wallet/Cargo.toml
+++ b/networks/monero/wallet/Cargo.toml
@@ -6,7 +6,7 @@ license = "MIT"
 repository = "https://github.com/serai-dex/serai/tree/develop/networks/monero/wallet"
 authors = ["Luke Parker <lukeparker5132@gmail.com>"]
 edition = "2021"
-rust-version = "1.79"
+rust-version = "1.80"

 [package.metadata.docs.rs]
 all-features = true
--- a/networks/monero/wallet/address/Cargo.toml
+++ b/networks/monero/wallet/address/Cargo.toml
@@ -6,7 +6,7 @@ license = "MIT"
 repository = "https://github.com/serai-dex/serai/tree/develop/networks/monero/wallet/address"
 authors = ["Luke Parker <lukeparker5132@gmail.com>"]
 edition = "2021"
-rust-version = "1.79"
+rust-version = "1.80"

 [package.metadata.docs.rs]
 all-features = true
--- a/networks/monero/wallet/polyseed/Cargo.toml
+++ b/networks/monero/wallet/polyseed/Cargo.toml
@@ -6,7 +6,7 @@ license = "MIT"
 repository = "https://github.com/serai-dex/serai/tree/develop/networks/monero/wallet/polyseed"
 authors = ["Luke Parker <lukeparker5132@gmail.com>"]
 edition = "2021"
-rust-version = "1.79"
+rust-version = "1.80"

 [package.metadata.docs.rs]
 all-features = true
--- a/networks/monero/wallet/polyseed/src/lib.rs
+++ b/networks/monero/wallet/polyseed/src/lib.rs
@@ -4,7 +4,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]

 use core::fmt;
-use std_shims::{sync::OnceLock, string::String, collections::HashMap};
+use std_shims::{sync::LazyLock, string::String, collections::HashMap};
 #[cfg(feature = "std")]
 use std::time::{SystemTime, UNIX_EPOCH};

@@ -163,30 +163,26 @@ impl WordList {
  }
 }

-static LANGUAGES_CELL: OnceLock<HashMap<Language, WordList>> = OnceLock::new();
-#[allow(non_snake_case)]
-fn LANGUAGES() -> &'static HashMap<Language, WordList> {
-  LANGUAGES_CELL.get_or_init(|| {
-    HashMap::from([
-      (Language::Czech, WordList::new(include!("./words/cs.rs"), true, false)),
-      (Language::French, WordList::new(include!("./words/fr.rs"), true, true)),
-      (Language::Korean, WordList::new(include!("./words/ko.rs"), false, false)),
-      (Language::English, WordList::new(include!("./words/en.rs"), true, false)),
-      (Language::Italian, WordList::new(include!("./words/it.rs"), true, false)),
-      (Language::Spanish, WordList::new(include!("./words/es.rs"), true, true)),
-      (Language::Japanese, WordList::new(include!("./words/ja.rs"), false, false)),
-      (Language::Portuguese, WordList::new(include!("./words/pt.rs"), true, false)),
-      (
-        Language::ChineseSimplified,
-        WordList::new(include!("./words/zh_simplified.rs"), false, false),
-      ),
-      (
-        Language::ChineseTraditional,
-        WordList::new(include!("./words/zh_traditional.rs"), false, false),
-      ),
-    ])
-  })
-}
+static LANGUAGES: LazyLock<HashMap<Language, WordList>> = LazyLock::new(|| {
+  HashMap::from([
+    (Language::Czech, WordList::new(include!("./words/cs.rs"), true, false)),
+    (Language::French, WordList::new(include!("./words/fr.rs"), true, true)),
+    (Language::Korean, WordList::new(include!("./words/ko.rs"), false, false)),
+    (Language::English, WordList::new(include!("./words/en.rs"), true, false)),
+    (Language::Italian, WordList::new(include!("./words/it.rs"), true, false)),
+    (Language::Spanish, WordList::new(include!("./words/es.rs"), true, true)),
+    (Language::Japanese, WordList::new(include!("./words/ja.rs"), false, false)),
+    (Language::Portuguese, WordList::new(include!("./words/pt.rs"), true, false)),
+    (
+      Language::ChineseSimplified,
+      WordList::new(include!("./words/zh_simplified.rs"), false, false),
+    ),
+    (
+      Language::ChineseTraditional,
+      WordList::new(include!("./words/zh_traditional.rs"), false, false),
+    ),
+  ])
+});

 /// A Polyseed.
 #[derive(Clone, PartialEq, Eq, Zeroize, ZeroizeOnDrop)]
@@ -317,7 +313,7 @@ impl Polyseed {
    let mut poly = [0; POLYSEED_LENGTH];

    // Validate words are in the lang word list
-    let lang_word_list: &WordList = &LANGUAGES()[&lang];
+    let lang_word_list: &WordList = &LANGUAGES[&lang];
    for (i, word) in seed.split_whitespace().enumerate() {
      // Find the word's index
      fn check_if_matches<S: AsRef<str>, I: Iterator<Item = S>>(
@@ -464,7 +460,7 @@ impl Polyseed {

    // Output words
    let mut seed = Zeroizing::new(String::new());
-    let words = &LANGUAGES()[&self.language].words;
+    let words = &LANGUAGES[&self.language].words;
    for i in 0 .. poly.len() {
      seed.push_str(words[usize::from(poly[i])]);
      if i < poly.len() - 1 {
--- a/networks/monero/wallet/seed/Cargo.toml
+++ b/networks/monero/wallet/seed/Cargo.toml
@@ -6,7 +6,7 @@ license = "MIT"
 repository = "https://github.com/serai-dex/serai/tree/develop/networks/monero/wallet/seed"
 authors = ["Luke Parker <lukeparker5132@gmail.com>"]
 edition = "2021"
-rust-version = "1.79"
+rust-version = "1.80"

 [package.metadata.docs.rs]
 all-features = true
--- a/networks/monero/wallet/seed/src/lib.rs
+++ b/networks/monero/wallet/seed/src/lib.rs
@@ -5,7 +5,7 @@

 use core::{ops::Deref, fmt};
 use std_shims::{
-  sync::OnceLock,
+  sync::LazyLock,
  vec,
  vec::Vec,
  string::{String, ToString},
@@ -102,27 +102,23 @@ impl WordList {
  }
 }

-static LANGUAGES_CELL: OnceLock<HashMap<Language, WordList>> = OnceLock::new();
-#[allow(non_snake_case)]
-fn LANGUAGES() -> &'static HashMap<Language, WordList> {
-  LANGUAGES_CELL.get_or_init(|| {
-    HashMap::from([
-      (Language::Chinese, WordList::new(include!("./words/zh.rs"), 1)),
-      (Language::English, WordList::new(include!("./words/en.rs"), 3)),
-      (Language::Dutch, WordList::new(include!("./words/nl.rs"), 4)),
-      (Language::French, WordList::new(include!("./words/fr.rs"), 4)),
-      (Language::Spanish, WordList::new(include!("./words/es.rs"), 4)),
-      (Language::German, WordList::new(include!("./words/de.rs"), 4)),
-      (Language::Italian, WordList::new(include!("./words/it.rs"), 4)),
-      (Language::Portuguese, WordList::new(include!("./words/pt.rs"), 4)),
-      (Language::Japanese, WordList::new(include!("./words/ja.rs"), 3)),
-      (Language::Russian, WordList::new(include!("./words/ru.rs"), 4)),
-      (Language::Esperanto, WordList::new(include!("./words/eo.rs"), 4)),
-      (Language::Lojban, WordList::new(include!("./words/jbo.rs"), 4)),
-      (Language::DeprecatedEnglish, WordList::new(include!("./words/ang.rs"), 4)),
-    ])
-  })
-}
+static LANGUAGES: LazyLock<HashMap<Language, WordList>> = LazyLock::new(|| {
+  HashMap::from([
+    (Language::Chinese, WordList::new(include!("./words/zh.rs"), 1)),
+    (Language::English, WordList::new(include!("./words/en.rs"), 3)),
+    (Language::Dutch, WordList::new(include!("./words/nl.rs"), 4)),
+    (Language::French, WordList::new(include!("./words/fr.rs"), 4)),
+    (Language::Spanish, WordList::new(include!("./words/es.rs"), 4)),
+    (Language::German, WordList::new(include!("./words/de.rs"), 4)),
+    (Language::Italian, WordList::new(include!("./words/it.rs"), 4)),
+    (Language::Portuguese, WordList::new(include!("./words/pt.rs"), 4)),
+    (Language::Japanese, WordList::new(include!("./words/ja.rs"), 3)),
+    (Language::Russian, WordList::new(include!("./words/ru.rs"), 4)),
+    (Language::Esperanto, WordList::new(include!("./words/eo.rs"), 4)),
+    (Language::Lojban, WordList::new(include!("./words/jbo.rs"), 4)),
+    (Language::DeprecatedEnglish, WordList::new(include!("./words/ang.rs"), 4)),
+  ])
+});

 fn checksum_index(words: &[Zeroizing<String>], lang: &WordList) -> usize {
  let mut trimmed_words = Zeroizing::new(String::new());
@@ -170,7 +166,7 @@ fn key_to_seed(lang: Language, key: Zeroizing<Scalar>) -> Seed {
  let bytes = Zeroizing::new(key.to_bytes());

  // get the language words
-  let words = &LANGUAGES()[&lang].word_list;
+  let words = &LANGUAGES[&lang].word_list;
  let list_len = u64::try_from(words.len()).unwrap();

  // To store the found words & add the checksum word later.
@@ -204,7 +200,7 @@ fn key_to_seed(lang: Language, key: Zeroizing<Scalar>) -> Seed {

  // create a checksum word for all languages except old english
  if lang != Language::DeprecatedEnglish {
-    let checksum = seed[checksum_index(&seed, &LANGUAGES()[&lang])].clone();
+    let checksum = seed[checksum_index(&seed, &LANGUAGES[&lang])].clone();
    seed.push(checksum);
  }

@@ -232,7 +228,7 @@ fn seed_to_bytes(lang: Language, words: &str) -> Result<Zeroizing<[u8; 32]>, See
  }

  // Validate words are in the language word list
-  let lang_word_list: &WordList = &LANGUAGES()[&lang];
+  let lang_word_list: &WordList = &LANGUAGES[&lang];
  let matched_indices = (|| {
    let has_checksum = words.len() == SEED_LENGTH_WITH_CHECKSUM;
    let mut matched_indices = Zeroizing::new(vec![]);
--- a/networks/monero/wallet/seed/src/tests.rs
+++ b/networks/monero/wallet/seed/src/tests.rs
@@ -183,7 +183,7 @@ fn test_original_seed() {
  for vector in vectors {
    fn trim_by_lang(word: &str, lang: Language) -> String {
      if lang != Language::DeprecatedEnglish {
-        word.chars().take(LANGUAGES()[&lang].unique_prefix_length).collect()
+        word.chars().take(LANGUAGES[&lang].unique_prefix_length).collect()
      } else {
        word.to_string()
      }
--- a/networks/monero/wallet/tests/runner/mod.rs
+++ b/networks/monero/wallet/tests/runner/mod.rs
@@ -1,5 +1,5 @@
 use core::ops::Deref;
-use std_shims::sync::OnceLock;
+use std_shims::sync::LazyLock;

 use zeroize::Zeroizing;
 use rand_core::OsRng;
@@ -145,7 +145,7 @@ pub async fn rpc() -> SimpleRequestRpc {
  rpc
 }

-pub static SEQUENTIAL: OnceLock<Mutex<()>> = OnceLock::new();
+pub(crate) static SEQUENTIAL: LazyLock<Mutex<()>> = LazyLock::new(|| Mutex::new(()));

 #[macro_export]
 macro_rules! async_sequential {
@@ -153,7 +153,7 @@ macro_rules! async_sequential {
    $(
      #[tokio::test]
      async fn $name() {
-        let guard = runner::SEQUENTIAL.get_or_init(|| tokio::sync::Mutex::new(())).lock().await;
+        let guard = runner::SEQUENTIAL.lock().await;
        let local = tokio::task::LocalSet::new();
        local.run_until(async move {
          if let Err(err) = tokio::task::spawn_local(async move { $body }).await {
--- a/networks/monero/wallet/util/Cargo.toml
+++ b/networks/monero/wallet/util/Cargo.toml
@@ -6,7 +6,7 @@ license = "MIT"
 repository = "https://github.com/serai-dex/serai/tree/develop/networks/monero/wallet/util"
 authors = ["Luke Parker <lukeparker5132@gmail.com>"]
 edition = "2021"
-rust-version = "1.79"
+rust-version = "1.80"

 [package.metadata.docs.rs]
 all-features = true