Merge pull request #63 from fpco/drop-once-cell

Drop once_cell dependency

Author: anakinzhed

Cargo.lock

@@ -17,7 +17,6 @@ prost = "0.13.3"
 prost-types = "0.13.3"
 bech32 = "0.11.0"
 bitcoin = "0.32.4"
-once_cell = "1.20.2"
 rand = "0.8.5"
 tracing = "0.1.40"
 fs-err = "3.0.0"

packages/cosmos/Cargo.toml

@@ -2,12 +2,11 @@ use std::{
     collections::HashSet,
     fmt::{Debug, Display},
     str::FromStr,
-    sync::Arc,
+    sync::{Arc, OnceLock},
 };
 
 use bech32::{Bech32, Hrp};
 use bitcoin::bip32::DerivationPath;
-use once_cell::sync::OnceCell;
 use parking_lot::RwLock;
 use serde::de::Visitor;
 
@@ -299,7 +298,7 @@ impl Display for AddressHrp {
 }
 
 type AddressHrpSet = RwLock<HashSet<&'static str>>;
-static ADDRESS_HRPS: OnceCell<AddressHrpSet> = OnceCell::new();
+static ADDRESS_HRPS: OnceLock<AddressHrpSet> = OnceLock::new();
 impl AddressHrp {
     fn get_set() -> &'static AddressHrpSet {
         ADDRESS_HRPS.get_or_init(|| RwLock::new(HashSet::new()))

packages/cosmos/src/address.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 use std::fmt::Display;
 use std::str::FromStr;
-use std::sync::Arc;
+use std::sync::{Arc, LazyLock, OnceLock};
 
 use bitcoin::bip32::{DerivationPath, Xpriv, Xpub};
 use bitcoin::hashes::{ripemd160, sha256, Hash};
@@ -10,7 +10,6 @@ use bitcoin::secp256k1::{All, Message, Secp256k1};
 use cosmos_sdk_proto::cosmos::bank::v1beta1::MsgSend;
 use cosmos_sdk_proto::cosmos::base::abci::v1beta1::TxResponse;
 use cosmos_sdk_proto::cosmos::base::v1beta1::Coin;
-use once_cell::sync::{Lazy, OnceCell};
 use parking_lot::Mutex;
 use rand::Rng;
 use tiny_keccak::{Hasher, Keccak};
@@ -238,8 +237,8 @@ impl DerivationPathConfig {
 
     pub fn as_derivation_path(&self) -> Arc<DerivationPath> {
         type DerivationPathMap = HashMap<DerivationPathConfig, Arc<DerivationPath>>;
-        static PATHS: Lazy<Arc<Mutex<DerivationPathMap>>> =
-            Lazy::new(|| Arc::new(Mutex::new(HashMap::new())));
+        static PATHS: LazyLock<Arc<Mutex<DerivationPathMap>>> =
+            LazyLock::new(|| Arc::new(Mutex::new(HashMap::new())));
         let mut guard = PATHS.lock();
         match guard.get(self) {
             Some(s) => s.clone(),
@@ -302,7 +301,7 @@ pub(crate) enum WalletPublicKey {
 }
 
 fn global_secp() -> &'static Secp256k1<All> {
-    static CELL: OnceCell<Secp256k1<All>> = OnceCell::new();
+    static CELL: OnceLock<Secp256k1<All>> = OnceLock::new();
     CELL.get_or_init(Secp256k1::new)
 }