From 1ca5ed8da9607bff98469c3cac916ca226eef58e Mon Sep 17 00:00:00 2001
From: yito88 <yuji@phact-columba.com>
Date: Mon, 7 Aug 2023 17:10:22 +0200
Subject: [PATCH] skip wallet worker for Namada

---
 crates/relayer/src/chain/namada.rs     | 4 ++--
 crates/relayer/src/supervisor/spawn.rs | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/crates/relayer/src/chain/namada.rs b/crates/relayer/src/chain/namada.rs
index 1a535ea704..de6d45d8e5 100644
--- a/crates/relayer/src/chain/namada.rs
+++ b/crates/relayer/src/chain/namada.rs
@@ -370,7 +370,7 @@ impl ChainEndpoint for NamadaChain {
         let denom = denom.unwrap_or(tx::FEE_TOKEN);
         let token = match self.wallet.find_address(denom) {
             Some(addr) => addr.clone(),
-            None => Address::decode(&denom)
+            None => Address::decode(denom)
                 .map_err(|_| Error::namada_address_not_found(denom.to_string()))?,
         };
 
@@ -421,7 +421,7 @@ impl ChainEndpoint for NamadaChain {
                 if key_owner == owner {
                     let amount =
                         token::Amount::try_from_slice(&value[..]).map_err(Error::borsh_decode)?;
-                    let denom_key = token::denom_key(&token);
+                    let denom_key = token::denom_key(token);
                     let (value, _) =
                         self.query(denom_key, QueryHeight::Latest, IncludeProof::No)?;
                     let denominated_amount = if value.is_empty() {
diff --git a/crates/relayer/src/supervisor/spawn.rs b/crates/relayer/src/supervisor/spawn.rs
index 5b124e59f9..0339e65f5f 100644
--- a/crates/relayer/src/supervisor/spawn.rs
+++ b/crates/relayer/src/supervisor/spawn.rs
@@ -78,6 +78,15 @@ impl<'a, Chain: ChainHandle> SpawnContext<'a, Chain> {
     }
 
     pub fn spawn_wallet_worker(&mut self, chain: Chain) {
+        match chain.config() {
+            Ok(config) if config.r#type == ChainType::Namada => {
+                // skip spawning a Wallet worker for Namada
+                // because Namada uses its own wallet
+                return;
+            }
+            _ => {}
+        }
+
         let wallet_object = Object::Wallet(Wallet {
             chain_id: chain.id(),
         });