skip wallet worker for Namada

heliaxdev · Aug 7, 2023 · 1ca5ed8 · 1ca5ed8
1 parent 6c6bdfe
commit 1ca5ed8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git 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
@@ -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(),
         });