Skip to content

fix: guard wallet RPC calls against undefined result and retry transients #899

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

Merged
eskp merged 4 commits into from
Apr 21, 2026
+722 −167
Merged

fix: guard wallet RPC calls against undefined result and retry transients #899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5a3fef
fix: guard wallet RPC calls against undefined result and retry transi…
joelorzet Apr 20, 2026
6f77e7a
refactor: extract wallet RPC client with jitter, breadcrumbs, and add…
joelorzet Apr 20, 2026
cc0f88e
feat: fail over wallet balance fetches to secondary RPC when primary …
joelorzet Apr 20, 2026
f35ac72
chore: move wallet rpc test to tests/unit to match project convention
joelorzet Apr 20, 2026
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
242 changes: 75 additions & 167 deletions lib/wallet/fetch-balances.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
*/

import { ErrorCategory, logUserError } from "@/lib/logging";
import {
encodeBalanceOfCallData,
hexWeiToBigInt,
rpcCallWithFailover,
} from "./rpc";
import type {
ChainBalance,
ChainData,
Expand Down Expand Up @@ -87,6 +92,16 @@ function buildExplorerAddressUrl(
return `${chain.explorerUrl}${path.replace("{address}", address)}`;
}

/**
* Collect the ordered list of RPC URLs to attempt for a chain: primary
* first, fallback second when configured.
*/
function getChainRpcUrls(chain: ChainData): string[] {
return chain.defaultFallbackRpc
? [chain.defaultPrimaryRpc, chain.defaultFallbackRpc]
: [chain.defaultPrimaryRpc];
}

/**
* Fetch native token balance for a single chain
*/
Expand All @@ -95,23 +110,14 @@ export async function fetchNativeBalance(
chain: ChainData
): Promise<ChainBalance> {
try {
const response = await fetch(chain.defaultPrimaryRpc, {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({
jsonrpc: "2.0",
method: "eth_getBalance",
params: [address, "latest"],
id: 1,
}),
const resultHex = await rpcCallWithFailover(getChainRpcUrls(chain), {
jsonrpc: "2.0",
method: "eth_getBalance",
params: [address, "latest"],
id: 1,
});

const result = await response.json();
if (result.error) {
throw new Error(result.error.message);
}

const balanceWei = BigInt(result.result);
const balanceWei = hexWeiToBigInt(resultHex);

return {
chainId: chain.chainId,
Expand Down Expand Up @@ -154,49 +160,17 @@ export async function fetchTokenBalance(
chain: ChainData
): Promise<TokenBalance> {
try {
// ERC20 balanceOf function signature
const balanceOfSelector = "0x70a08231";

// Encode the balanceOf call data
const addressWithoutPrefix = address.startsWith("0x")
? address.slice(2)
: address;
const paddedAddress = addressWithoutPrefix.toLowerCase().padStart(64, "0");
const callData = `${balanceOfSelector}${paddedAddress}`;

const response = await fetch(chain.defaultPrimaryRpc, {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({
jsonrpc: "2.0",
method: "eth_call",
params: [{ to: token.tokenAddress, data: callData }, "latest"],
id: 1,
}),
const resultHex = await rpcCallWithFailover(getChainRpcUrls(chain), {
jsonrpc: "2.0",
method: "eth_call",
params: [
{ to: token.tokenAddress, data: encodeBalanceOfCallData(address) },
"latest",
],
id: 1,
});

if (!response.ok) {
throw new Error(`HTTP ${response.status}: ${response.statusText}`);
}

const result = await response.json();
if (result.error) {
throw new Error(result.error.message || "RPC error");
}

if (!result.result || result.result === "0x") {
return {
tokenId: token.id,
chainId: token.chainId,
tokenAddress: token.tokenAddress,
symbol: token.symbol,
name: token.name,
balance: "0.000000",
loading: false,
};
}

const balanceWei = BigInt(result.result);
const balanceWei = hexWeiToBigInt(resultHex);

return {
tokenId: token.id,
Expand Down Expand Up @@ -272,123 +246,57 @@ export function fetchAllTokenBalances(
/**
* Fetch balance for a single supported token with retry logic
*/
export function fetchSupportedTokenBalance(
export async function fetchSupportedTokenBalance(
address: string,
token: SupportedToken,
chain: ChainData,
retries = 3
chain: ChainData
): Promise<SupportedTokenBalance> {
const makeRequest = async (
attempt: number
// biome-ignore lint/complexity/noExcessiveCognitiveComplexity: Retry logic with exponential backoff requires this complexity
): Promise<SupportedTokenBalance> => {
try {
// ERC20 balanceOf function signature
const balanceOfSelector = "0x70a08231";

// Encode the balanceOf call data
const addressWithoutPrefix = address.startsWith("0x")
? address.slice(2)
: address;
const paddedAddress = addressWithoutPrefix
.toLowerCase()
.padStart(64, "0");
const callData = `${balanceOfSelector}${paddedAddress}`;

const response = await fetch(chain.defaultPrimaryRpc, {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({
jsonrpc: "2.0",
method: "eth_call",
params: [{ to: token.tokenAddress, data: callData }, "latest"],
id: 1,
}),
});

// Handle rate limiting with retry
if (response.status === 429 && attempt < retries) {
const backoffMs = Math.min(1000 * 2 ** attempt, 5000);
await new Promise((resolve) => setTimeout(resolve, backoffMs));
return makeRequest(attempt + 1);
}

if (!response.ok) {
throw new Error(`HTTP ${response.status}: ${response.statusText}`);
}

const result = await response.json();
if (result.error) {
throw new Error(result.error.message || "RPC error");
}

const tokenExplorerUrl = buildExplorerAddressUrl(
chain,
token.tokenAddress
);

if (!result.result || result.result === "0x") {
return {
chainId: token.chainId,
tokenAddress: token.tokenAddress,
symbol: token.symbol,
name: token.name,
logoUrl: token.logoUrl,
balance: "0.000000",
loading: false,
explorerUrl: tokenExplorerUrl,
};
}
try {
const resultHex = await rpcCallWithFailover(getChainRpcUrls(chain), {
jsonrpc: "2.0",
method: "eth_call",
params: [
{ to: token.tokenAddress, data: encodeBalanceOfCallData(address) },
"latest",
],
id: 1,
});

const balanceWei = BigInt(result.result);
const balanceWei = hexWeiToBigInt(resultHex);

return {
chainId: token.chainId,
tokenAddress: token.tokenAddress,
symbol: token.symbol,
name: token.name,
logoUrl: token.logoUrl,
balance: formatWeiToBalance(balanceWei, token.decimals),
loading: false,
explorerUrl: tokenExplorerUrl,
};
} catch (error) {
// Retry on network errors
if (
attempt < retries &&
error instanceof Error &&
!error.message.includes("HTTP 4")
) {
const backoffMs = Math.min(500 * 2 ** attempt, 3000);
await new Promise((resolve) => setTimeout(resolve, backoffMs));
return makeRequest(attempt + 1);
return {
chainId: token.chainId,
tokenAddress: token.tokenAddress,
symbol: token.symbol,
name: token.name,
logoUrl: token.logoUrl,
balance: formatWeiToBalance(balanceWei, token.decimals),
loading: false,
explorerUrl: buildExplorerAddressUrl(chain, token.tokenAddress),
};
} catch (error) {
logUserError(
ErrorCategory.NETWORK_RPC,
`Failed to fetch balance for ${token.symbol}:`,
error,
{
chain_id: token.chainId.toString(),
token_symbol: token.symbol,
token_address: token.tokenAddress,
}

logUserError(
ErrorCategory.NETWORK_RPC,
`Failed to fetch balance for ${token.symbol}:`,
error,
{
chain_id: token.chainId.toString(),
token_symbol: token.symbol,
token_address: token.tokenAddress,
}
);
return {
chainId: token.chainId,
tokenAddress: token.tokenAddress,
symbol: token.symbol,
name: token.name,
logoUrl: token.logoUrl,
balance: "0",
loading: false,
error: error instanceof Error ? error.message : "Failed to fetch",
explorerUrl: buildExplorerAddressUrl(chain, token.tokenAddress),
};
}
};

return makeRequest(0);
);
return {
chainId: token.chainId,
tokenAddress: token.tokenAddress,
symbol: token.symbol,
name: token.name,
logoUrl: token.logoUrl,
balance: "0",
loading: false,
error: error instanceof Error ? error.message : "Failed to fetch",
explorerUrl: buildExplorerAddressUrl(chain, token.tokenAddress),
};
}
}

/**
Expand Down
Loading
Loading