From ab737083462ad09b2ef56adaeae6696dc687a9d1 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Wed, 29 Sep 2021 13:07:51 +0200
Subject: [PATCH] util: Add explicit check if token.len is 44.

This should allow base58 Solana mint addresses.
---
 src/util.rs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/util.rs b/src/util.rs
index 106905181..95ae8843f 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -127,7 +127,13 @@ pub fn parse_wrapped_token(token: &str) -> Result<jubjub::Fr> {
         }
         "btc" => Err(Error::TokenParseError),
         tkn => {
-            let id = symbol_to_id(tkn)?;
+            // (== 44) can represent a Solana base58 token mint address
+            let id = if token.len() == 44 {
+                token.to_string()
+            } else {
+                symbol_to_id(tkn)?
+            };
+
             let token_id = generate_id(&id)?;
             Ok(token_id)
         }
@@ -142,7 +148,12 @@ pub fn parse_network(network: &str, token: &str) -> Result<String> {
                 Ok(token_id.to_string())
             }
             tkn => {
-                let id = symbol_to_id(tkn)?;
+                // (== 44) can represent a Solana base58 token mint address
+                let id = if token.len() == 44 {
+                    token.to_string()
+                } else {
+                    symbol_to_id(tkn)?
+                };
                 Ok(id)
             }
         },