Skip to content

chore(rpc): optimize wallet_getAssets balance fetching #1504

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

Open
mablr wants to merge 5 commits into
base: main
Choose a base branch
from
Open

chore(rpc): optimize wallet_getAssets balance fetching #1504

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aaac046
chore(rpc): optimize `wallet_getAssets` balance fetching
mablr Oct 27, 2025
084ebf9
refactor(rpc): reintroduce futures in `wallet_getAssets`
mablr Oct 29, 2025
2026c33
Merge branch 'main' into chore/improve_wallet_get_assets
mablr Oct 29, 2025
ecb0940
chore: optimization of iterators + style
mablr Oct 29, 2025
ff6479c
use extend method on multicall builder
mablr Oct 29, 2025
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
117 changes: 76 additions & 41 deletions src/rpc/relay.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2736,56 +2736,91 @@ impl RelayApiServer for Relay {
let chain_details = request.asset_filter.into_iter().map(async |(chain, assets)| {
let chain_provider = self.provider(chain)?;

let txs =
assets.iter().filter(|asset| !asset.asset_type.is_erc721()).map(async |asset| {
// get price if this is a fee token
let price = self.get_token_price(chain, asset).await;

if asset.asset_type.is_native() {
let symbol = NamedChain::try_from(chain)
.ok()
.and_then(|c| c.native_currency_symbol())
.map(ToString::to_string);

return Ok::<_, RelayError>(Asset7811 {
address: AddressOrNative::Native,
balance: chain_provider.get_balance(request.account).await?,
asset_type: asset.asset_type,
metadata: Some(AssetMetadataWithPrice {
name: None,
symbol,
// use a constant 18 for native assets
decimals: Some(18),
uri: None,
fiat: price,
}),
});
}
let non_erc721_assets = assets
.into_iter()
.filter(|asset| !asset.asset_type.is_erc721())
.collect::<Vec<_>>();

let erc20 = IERC20::new(asset.address.address(), &chain_provider);
let erc20_addresses = non_erc721_assets
.iter()
.filter(|asset| asset.asset_type.is_erc20())
.map(|asset| Asset::Token(asset.address.address()))
.collect::<Vec<_>>();

let (balance, decimals, name, symbol) = chain_provider
.multicall()
.add(erc20.balanceOf(request.account))
.add(erc20.decimals())
.add(erc20.name())
.add(erc20.symbol())
.aggregate()
.await?;
let assets_metadata = if !erc20_addresses.is_empty() {
self.inner
.asset_info
.get_asset_info_list(&chain_provider, erc20_addresses.clone())
.await?
} else {
HashMap::default()
};

Ok(Asset7811 {
address: asset.address,
balance,
let erc20_balances = if !erc20_addresses.is_empty() {
let mut multicall = chain_provider.multicall().dynamic();
for address in &erc20_addresses {
let erc20 = IERC20::new(address.address(), &chain_provider);
multicall = multicall.add_dynamic(erc20.balanceOf(request.account));
}
Copy link
Member

@mattsse mattsse Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is basically

chain_provider.multicall().dynamic().extend(...);

then we can shorten this entire section a bit

Copy link
Contributor Author

@mablr mablr Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just applied the change.

This is more idiomatic, but not significantly shorter.😅

let balances = multicall.aggregate().await?;
erc20_addresses.iter().zip(balances).collect::<HashMap<_, _>>()
} else {
HashMap::default()
};

let txs = non_erc721_assets.iter().map(async |asset| {
// get price if this is a fee token
let price = self.get_token_price(chain, asset).await;

if asset.asset_type.is_native() {
let symbol = NamedChain::try_from(chain)
.ok()
.and_then(|c| c.native_currency_symbol())
.map(ToString::to_string);

Ok::<_, RelayError>(Asset7811 {
address: AddressOrNative::Native,
balance: chain_provider.get_balance(request.account).await?,
asset_type: asset.asset_type,
metadata: Some(AssetMetadataWithPrice {
name: Some(name),
symbol: Some(symbol),
decimals: Some(decimals),
name: None,
symbol,
// use a constant 18 for native assets
decimals: Some(18),
uri: None,
fiat: price,
}),
})
});
} else {
let (name, symbol, decimals, uri) = assets_metadata
.get(&Asset::Token(asset.address.address()))
.map(|info| {
(
info.metadata.name.clone(),
info.metadata.symbol.clone(),
info.metadata.decimals,
info.metadata.uri.clone(),
)
})
.unwrap_or_default();
let balance = erc20_balances
.get(&Asset::Token(asset.address.address()))
.unwrap_or(&U256::ZERO);

Ok::<_, RelayError>(Asset7811 {
address: asset.address,
balance: *balance,
asset_type: asset.asset_type,
metadata: Some(AssetMetadataWithPrice {
name,
symbol,
decimals,
uri,
fiat: self.get_token_price(chain, asset).await,
}),
})
}
});

let assets: Vec<_> = join_all(txs)
.await
Expand Down
Loading