Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: add token_address param to moralis erc20 API #2774

Merged
merged 2 commits into from
May 30, 2024
Merged

fix: add token_address param to moralis erc20 API #2774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
067e678
fix: add token_address param to moralis erc20 API to query balance fo…
May 30, 2024
0308d81
clippy fix
Traf333 May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions tee-worker/litentry/core/data-providers/src/moralis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,9 +275,10 @@ pub trait BalanceApiList {
) -> Result<Vec<GetSolanaTokenBalanceByWalletResponse>, Error>;

// https://docs.moralis.io/web3-data-api/evm/reference/wallet-api/get-token-balances-by-wallet
fn get_evm_tokens_balance_by_wallet(
fn get_evm_token_balance_by_wallet(
&mut self,
address: String,
token_address: String,
network: &Web3Network,
fast_fail: bool,
) -> Result<Vec<GetEvmTokenBalanceByWalletResponse>, Error>;
Expand Down Expand Up @@ -338,15 +339,19 @@ impl BalanceApiList for MoralisClient {
}
}

fn get_evm_tokens_balance_by_wallet(
fn get_evm_token_balance_by_wallet(
&mut self,
address: String,
token_address: String,
network: &Web3Network,
fast_fail: bool,
) -> Result<Vec<GetEvmTokenBalanceByWalletResponse>, Error> {
debug!("get_evm_tokens_balance_by_wallet, address: {}", address);
debug!("get_evm_token_balance_by_wallet, address: {}", address);

let query = Some(vec![("chain".to_string(), web3_network_to_chain(network))]);
let query = Some(vec![
("chain".to_string(), web3_network_to_chain(network)),
("token_addresses[0]".to_string(), token_address),
]);
let params = MoralisRequest { path: format!("{}/erc20", address), query };

match self.get::<Vec<GetEvmTokenBalanceByWalletResponse>>(
Expand All @@ -355,11 +360,11 @@ impl BalanceApiList for MoralisClient {
fast_fail,
) {
Ok(resp) => {
debug!("get_evm_tokens_balance_by_wallet, response: {:?}", resp);
debug!("get_evm_token_balance_by_wallet, response: {:?}", resp);
Ok(resp)
},
Err(e) => {
debug!("get_evm_tokens_balance_by_wallet, error: {:?}", e);
debug!("get_evm_token_balance_by_wallet, error: {:?}", e);
Err(e)
},
}
Expand Down
22 changes: 15 additions & 7 deletions tee-worker/litentry/core/service/src/web3_token/token_balance/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,25 +97,33 @@ pub fn get_balance(
let decimals = token_type.get_decimals(network);

let mut client = MoralisClient::new(data_provider_config);
let result =
client.get_evm_tokens_balance_by_wallet(address.1.clone(), &network, false);
let result = client.get_evm_token_balance_by_wallet(
address.1.clone(),
token_address.into(),
&network,
false,
);

match result {
Ok(items) =>
match items.iter().find(|&item| item.token_address == token_address) {
Some(item) => match item.balance.parse::<u128>() {
if !items.is_empty() {
match items[0].balance.parse::<u128>() {
Ok(balance) => {
total_balance +=
calculate_balance_with_decimals(balance, decimals);

Ok(LoopControls::Continue)
},
Err(err) => {
error!("Failed to parse {} to f64: {}", item.balance, err);
error!(
"Failed to parse {} to f64: {}",
items[0].balance, err
);
Err(Error::ParseError)
},
},
None => Ok(LoopControls::Continue),
}
} else {
Ok(LoopControls::Continue)
},
Err(err) => Err(err.into_error_detail()),
}
Expand Down
Loading