github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-04-28 03:00:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

util: Add explicit check if token.len is 44.

Browse Source 
This should allow base58 Solana mint addresses.
This commit is contained in:
parazyd
2021-09-29 13:07:51 +02:00
parent 259050da13
commit ab73708346
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/util.rs
View File

@@ -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)
}
},