GLEECBTC · shamardy · Jul 31, 2025 · Jun 14, 2025 · Jun 14, 2025 · Jun 14, 2025
diff --git a/mm2src/coins/eth/v2_activation.rs b/mm2src/coins/eth/v2_activation.rs
@@ -881,7 +881,7 @@ pub(crate) async fn build_address_and_priv_key_policy(
         },
         EthPrivKeyBuildPolicy::WalletConnect { session_topic } => {
             let wc = WalletConnectCtx::from_ctx(ctx).map_err(|e| {
-                EthActivationV2Error::WalletConnectError(format!("Failed to get WalletConnect context: {}", e))
+                EthActivationV2Error::WalletConnectError(format!("Failed to get WalletConnect context: {e}"))
             })?;
             let chain_spec = chain_spec.ok_or(EthActivationV2Error::ChainIdNotSet)?;
             let chain_id = chain_spec.chain_id().ok_or(EthActivationV2Error::UnsupportedChain {

diff --git a/mm2src/coins/hd_wallet/pubkey.rs b/mm2src/coins/hd_wallet/pubkey.rs
@@ -136,7 +136,7 @@ where
             .or_mm_err(|| HDExtractPubkeyError::HwContextNotInitialized)?;
 
         let trezor_message_type = match coin_protocol {
-            CoinProtocol::UTXO => TrezorMessageType::Bitcoin,
+            CoinProtocol::UTXO { .. } => TrezorMessageType::Bitcoin,
             CoinProtocol::QTUM => TrezorMessageType::Bitcoin,
             CoinProtocol::ETH { .. } | CoinProtocol::ERC20 { .. } => TrezorMessageType::Ethereum,
             _ => return Err(MmError::new(HDExtractPubkeyError::CoinDoesntSupportTrezor)),

diff --git a/mm2src/coins/lp_coins.rs b/mm2src/coins/lp_coins.rs
@@ -4687,11 +4687,21 @@ pub trait IguanaBalanceOps {
     async fn iguana_balances(&self) -> BalanceResult<Self::BalanceObject>;
 }
 
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
+/// Information about the UTXO protocol used by a coin.
+pub struct UtxoProtocolInfo {
+    /// A CAIP-2 compliant chain ID. Starts with `b122:`
+    /// This is used to identify the blockchain when using WalletConnect.
+    /// https://github.com/ChainAgnostic/CAIPs/blob/main/CAIPs/caip-4.md
+    chain_id: String,
+}
+
 #[allow(clippy::upper_case_acronyms)]
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(tag = "type", content = "protocol_data")]
 pub enum CoinProtocol {
-    UTXO,
+    // TODO: Nest this option deep into the innert struct fields when more fields are added to the UTXO protocol info.
+    UTXO(Option<UtxoProtocolInfo>),
     QTUM,
     QRC20 {
         platform: String,
@@ -4768,7 +4778,7 @@ impl CoinProtocol {
             CoinProtocol::TENDERMINTTOKEN(info) => Some(&info.platform),
             #[cfg(not(target_arch = "wasm32"))]
             CoinProtocol::LIGHTNING { platform, .. } => Some(platform),
-            CoinProtocol::UTXO
+            CoinProtocol::UTXO { .. }
             | CoinProtocol::QTUM
             | CoinProtocol::ETH { .. }
             | CoinProtocol::TRX { .. }
@@ -4787,7 +4797,7 @@ impl CoinProtocol {
                 Some(contract_address)
             },
             CoinProtocol::SLPTOKEN { .. }
-            | CoinProtocol::UTXO
+            | CoinProtocol::UTXO { .. }
             | CoinProtocol::QTUM
             | CoinProtocol::ETH { .. }
             | CoinProtocol::TRX { .. }
@@ -5079,7 +5089,7 @@ pub async fn lp_coininit(ctx: &MmArc, ticker: &str, req: &Json) -> Result<MmCoin
     let protocol: CoinProtocol = try_s!(json::from_value(coins_en["protocol"].clone()));
 
     let coin: MmCoinEnum = match &protocol {
-        CoinProtocol::UTXO => {
+        CoinProtocol::UTXO { .. } => {
             let params = try_s!(UtxoActivationParams::from_legacy_req(req));
             try_s!(utxo_standard_coin_with_policy(ctx, ticker, &coins_en, &params, priv_key_policy).await).into()
         },
@@ -5752,7 +5762,7 @@ pub fn address_by_coin_conf_and_pubkey_str(
         },
         // Todo: implement TRX address generation
         CoinProtocol::TRX { .. } => ERR!("TRX address generation is not implemented yet"),
-        CoinProtocol::UTXO | CoinProtocol::QTUM | CoinProtocol::QRC20 { .. } | CoinProtocol::BCH { .. } => {
+        CoinProtocol::UTXO { .. } | CoinProtocol::QTUM | CoinProtocol::QRC20 { .. } | CoinProtocol::BCH { .. } => {
             utxo::address_by_conf_and_pubkey_str(coin, conf, pubkey, addr_format)
         },
         CoinProtocol::SLPTOKEN { platform, .. } => {

diff --git a/mm2src/coins/rpc_command/init_create_account.rs b/mm2src/coins/rpc_command/init_create_account.rs
@@ -310,7 +310,8 @@ impl RpcTask for InitCreateAccountTask {
                     self.task_state.clone(),
                     task_handle,
                     utxo.is_trezor(),
-                    CoinProtocol::UTXO,
+                    // Note that the actual UtxoProtocolInfo isn't needed by trezor XPUB extractor.
+                    CoinProtocol::UTXO(Default::default()),
                 )
                 .await?,
             )),

diff --git a/mm2src/coins/rpc_command/offline_keys.rs b/mm2src/coins/rpc_command/offline_keys.rs
@@ -141,7 +141,7 @@ fn extract_prefix_values(
 
     match protocol {
         CoinProtocol::ETH { .. } | CoinProtocol::ERC20 { .. } | CoinProtocol::NFT { .. } => Ok(None),
-        CoinProtocol::UTXO | CoinProtocol::QTUM | CoinProtocol::QRC20 { .. } | CoinProtocol::BCH { .. } => {
+        CoinProtocol::UTXO { .. } | CoinProtocol::QTUM | CoinProtocol::QRC20 { .. } | CoinProtocol::BCH { .. } => {
             let wif_type = coin_conf["wiftype"]
                 .as_u64()
                 .ok_or_else(|| OfflineKeysError::MissingPrefixValue {

diff --git a/mm2src/coins/utxo/utxo_builder/utxo_coin_builder.rs b/mm2src/coins/utxo/utxo_builder/utxo_coin_builder.rs
@@ -14,8 +14,9 @@ use crate::utxo::{
     UtxoRpcMode, UtxoSyncStatus, UtxoSyncStatusLoopHandle, UTXO_DUST_AMOUNT,
 };
 use crate::{
-    BlockchainNetwork, CoinTransportMetrics, DerivationMethod, HistorySyncState, IguanaPrivKey, PrivKeyBuildPolicy,
-    PrivKeyPolicy, PrivKeyPolicyNotAllowed, RpcClientType, SharableRpcTransportEventHandler, UtxoActivationParams,
+    BlockchainNetwork, CoinProtocol, CoinTransportMetrics, DerivationMethod, HistorySyncState, IguanaPrivKey,
+    PrivKeyBuildPolicy, PrivKeyPolicy, PrivKeyPolicyNotAllowed, RpcClientType, SharableRpcTransportEventHandler,
+    UtxoActivationParams,
 };
 use async_trait::async_trait;
 use chain::TxHashAlgo;
@@ -312,7 +313,7 @@ where
 
     // Construct the PrivKeyPolicy (of WalletConnect type).
     let pubkey = PublicKey::from_str(&pubkey).map_err(|e| {
-        WalletConnectError::ClientError(format!("Received a bad pubkey={} from WalletConnect: {}", pubkey, e))
+        WalletConnectError::ClientError(format!("Received a bad pubkey={pubkey} from WalletConnect: {e}"))
     })?;
     let public_key = pubkey.serialize().into();
     let public_key_uncompressed = pubkey.serialize_uncompressed().into();
@@ -339,12 +340,11 @@ where
     // corresponds to the public key we have. Otherwise, the wallet (or our address builder) is messed up.
     let my_address_serialized = my_address
         .display_address()
-        .map_err(|e| UtxoCoinBuildError::Internal(format!("Failed to serialize address: {}", e)))?;
+        .map_err(|e| UtxoCoinBuildError::Internal(format!("Failed to serialize address: {e}")))?;
     if my_address_serialized != address {
         return MmError::err(
             WalletConnectError::ClientError(format!(
-            "Received address={} from WalletConnect doesn't match the expected address={} derived via the public key",
-            my_address_serialized, address
+            "Received address={my_address_serialized} from WalletConnect doesn't match the expected address={address} derived via the public key"
         ))
             .into(),
         );
@@ -585,14 +585,26 @@ pub trait UtxoCoinBuilderCommonOps {
 
     /// Returns WcChainId for this coin. Parsed from the coin config.
     fn wallet_connect_chain_id(&self) -> UtxoCoinBuildResult<WcChainId> {
-        let chain_id = self.conf()["chain_id"].as_str().ok_or_else(|| {
-            WalletConnectError::InvalidChainId(format!(
-            "coin={} doesn't have chain_id (bip122 standard) set in coin config which is required for WalletConnect",
-            self.ticker()
-        ))
+        let protocol: CoinProtocol = json::from_value(self.conf()["protocol"].clone()).map_to_mm(|e| {
+            UtxoCoinBuildError::ConfError(UtxoConfError::InvalidProtocolData(format!(
+                "Couldn't parse protocol info: {e}"
+            )))
         })?;
-        let chain_id = WcChainId::try_from_str(chain_id).map_mm_err()?;
-        Ok(chain_id)
+
+        if let CoinProtocol::UTXO(utxo_info) = protocol {
+            let utxo_info = utxo_info.ok_or_else(|| {
+                WalletConnectError::InvalidChainId(format!(
+                    "coin={} doesn't have chain_id (bip122 standard) set in coin config which is required for WalletConnect",
+                    self.ticker()
+                ))
+            })?;
+            let chain_id = WcChainId::try_from_str(&utxo_info.chain_id).map_mm_err()?;
+            Ok(chain_id)
+        } else {
+            MmError::err(UtxoCoinBuildError::ConfError(UtxoConfError::InvalidProtocolData(
+                format!("Expected UTXO protocol, got: {protocol:?}"),
+            )))
+        }
     }
 
     /// Constructs the full HD derivation path from the coin config and the activation params partial paths.
@@ -607,7 +619,7 @@ pub trait UtxoCoinBuilderCommonOps {
         let full_derivation_path = path_account_to_address
             .to_derivation_path(&path_purpose_to_coin)
             .map_err(|e| {
-                UtxoCoinBuildError::InvalidPathToAddress(format!("Failed to construct full derivation path: {}", e))
+                UtxoCoinBuildError::InvalidPathToAddress(format!("Failed to construct full derivation path: {e}"))
             })?;
         let full_derivation_path = StandardHDPath::try_from(full_derivation_path).map_err(|e| {
             UtxoCoinBuildError::InvalidPathToAddress(format!("Failed to parse full derivation path: {e:?}"))

diff --git a/mm2src/coins/utxo/utxo_builder/utxo_conf_builder.rs b/mm2src/coins/utxo/utxo_builder/utxo_conf_builder.rs
@@ -35,6 +35,7 @@ pub enum UtxoConfError {
     InvalidVersionGroupId(String),
     InvalidAddressFormat(String),
     InvalidDecimals(String),
+    InvalidProtocolData(String),
 }
 
 impl From<Bip32Error> for UtxoConfError {

diff --git a/mm2src/coins/utxo/wallet_connect.rs b/mm2src/coins/utxo/wallet_connect.rs
@@ -67,8 +67,7 @@ pub async fn get_walletconnect_address(
             } else {
                 // Otherwise, the response includes a derivation path, which means we didn't find the one that the user was interested in.
                 MmError::err(WalletConnectError::NoAccountFound(format!(
-                    "No address found for derivation path: {}",
-                    derivation_path
+                    "No address found for derivation path: {derivation_path}"
                 )))
             }
         },
@@ -136,8 +135,7 @@ pub async fn get_pubkey_via_wallatconnect_signature(
     let message_hash = sign_message_hash(sign_message_prefix, AUTH_MSG);
     let pubkey = Public::recover_compact(&H256::from(message_hash), &signature).map_err(|e| {
         WalletConnectError::InternalError(format!(
-            "Failed to recover public key from walletconnect signature={:?}: {:?}",
-            signature, e
+            "Failed to recover public key from walletconnect signature={signature:?}: {e:?}"
         ))
     })?;
 

diff --git a/mm2src/coins/z_coin/storage/z_locked_notes/sqlite.rs b/mm2src/coins/z_coin/storage/z_locked_notes/sqlite.rs
@@ -34,7 +34,7 @@ async fn create_table(conn: Arc<Mutex<AsyncConnection>>) -> Result<(), AsyncConn
 impl LockedNotesStorage {
     #[cfg(not(any(test, feature = "run-docker-tests")))]
     pub(crate) async fn new(ctx: &MmArc, address: String) -> MmResult<Self, LockedNotesStorageError> {
-        let path = ctx.wallet_dir().join(format!("{}_locked_notes_cache.db", address));
+        let path = ctx.wallet_dir().join(format!("{address}_locked_notes_cache.db"));
         let db = AsyncConnection::open(path)
             .await
             .map_to_mm(|err| LockedNotesStorageError::SqliteError(err.to_string()))?;

diff --git a/mm2src/coins_activation/src/utxo_activation/common_impl.rs b/mm2src/coins_activation/src/utxo_activation/common_impl.rs
@@ -49,7 +49,8 @@ where
                 ctx,
                 task_handle.clone(),
                 xpub_extractor_rpc_statuses(),
-                coins::CoinProtocol::UTXO,
+                // Note that the actual UtxoProtocolInfo isn't needed by trezor XPUB extractor.
+                coins::CoinProtocol::UTXO(Default::default()),
             )
             .mm_err(|_| InitUtxoStandardError::HwError(HwRpcError::NotInitialized))?,
         )

diff --git a/mm2src/coins_activation/src/utxo_activation/init_utxo_standard_activation.rs b/mm2src/coins_activation/src/utxo_activation/init_utxo_standard_activation.rs
@@ -38,7 +38,7 @@ impl TryFromCoinProtocol for UtxoStandardProtocolInfo {
         Self: Sized,
     {
         match proto {
-            CoinProtocol::UTXO => Ok(UtxoStandardProtocolInfo),
+            CoinProtocol::UTXO { .. } => Ok(UtxoStandardProtocolInfo),
             protocol => MmError::err(protocol),
         }
     }

diff --git a/mm2src/kdf_walletconnect/src/lib.rs b/mm2src/kdf_walletconnect/src/lib.rs
@@ -59,9 +59,7 @@ const CONNECTION_TIMEOUT_S: f64 = 30.;
 /// established pairing by KDF (via [`WalletConnectCtxImpl::new_connection`]).
 pub struct NewConnection {
     pub url: String,
-    // TODO: Convert this to a `Topic` instead (after the merger of
-    // https://github.com/KomodoPlatform/komodo-defi-framework/pull/2499, which pub-uses/exposes `Topic` to other dependent crates)
-    pub pairing_topic: String,
+    pub pairing_topic: Topic,
 }
 
 /// Broadcast by the lifecycle task so every RPC can cheaply await connectivity.
@@ -328,7 +326,7 @@ impl WalletConnectCtxImpl {
 
         Ok(NewConnection {
             url,
-            pairing_topic: topic.to_string(),
+            pairing_topic: topic,
         })
     }
 

diff --git a/mm2src/mm2_main/src/lp_ordermatch.rs b/mm2src/mm2_main/src/lp_ordermatch.rs
@@ -6342,7 +6342,7 @@ fn orderbook_address(
         },
         // Todo: implement TRX address generation
         CoinProtocol::TRX { .. } => MmError::err(OrderbookAddrErr::CoinIsNotSupported(coin.to_owned())),
-        CoinProtocol::UTXO | CoinProtocol::QTUM | CoinProtocol::QRC20 { .. } | CoinProtocol::BCH { .. } => {
+        CoinProtocol::UTXO { .. } | CoinProtocol::QTUM | CoinProtocol::QRC20 { .. } | CoinProtocol::BCH { .. } => {
             coins::utxo::address_by_conf_and_pubkey_str(coin, conf, pubkey, addr_format)
                 .map(OrderbookAddress::Transparent)
                 .map_to_mm(OrderbookAddrErr::AddrFromPubkeyError)

diff --git a/mm2src/mm2_main/src/rpc/wc_commands/new_connection.rs b/mm2src/mm2_main/src/rpc/wc_commands/new_connection.rs
@@ -1,4 +1,4 @@
-use kdf_walletconnect::{NewConnection, WalletConnectCtx};
+use kdf_walletconnect::{NewConnection, WalletConnectCtx, WcTopic};
 use mm2_core::mm_ctx::MmArc;
 use mm2_err_handle::prelude::*;
 use serde::{Deserialize, Serialize};
@@ -8,7 +8,7 @@ use super::WalletConnectRpcError;
 #[derive(Debug, PartialEq, Serialize)]
 pub struct CreateConnectionResponse {
     pub url: String,
-    pub pairing_topic: String,
+    pub pairing_topic: WcTopic,
 }
 
 #[derive(Deserialize)]