fix: Blockscout and Etherscan lookups are off until the user turns them on (closes #668)
Out of the box the wallet sent the user's addresses to Blockscout and each recipient to Etherscan. Two settings, "Use Blockscout" and "Check recipients on Etherscan", now gate those requests. Both are off in a new install and offered unticked on Welcome and in Settings. While one is off, the screens that relied on it say so in a plain line. Each gated request reads its setting from storage before it asks and when the answer lands, and drops a late answer. An open popup takes another page's change and draws its screens again. While "Use Blockscout" is off, no address keeps an untracked token, and no screen names a token from Blockscout's report. ENS lookups ask only the RPC endpoint. Model: opus-5-5 (implementation); fable-5-1 (prose)
This commit is contained in:
+43
-5
@@ -1,6 +1,10 @@
|
||||
// Balance fetching: ETH balances and the balances of the tokens the user
|
||||
// tracks via RPC, the other ERC-20 token balances and the holder counts via
|
||||
// Blockscout, ENS reverse lookup via RPC.
|
||||
// Balance fetching:
|
||||
//
|
||||
// - ETH balances, and the balances of the tokens the user tracks, via RPC
|
||||
// - the other ERC-20 token balances and the holder counts via Blockscout,
|
||||
// while the user has "Use Blockscout" on. Those balances are dropped when
|
||||
// the setting is off.
|
||||
// - ENS reverse lookup via RPC
|
||||
|
||||
const {
|
||||
JsonRpcProvider,
|
||||
@@ -18,6 +22,7 @@ const { LOW_HOLDER_THRESHOLD, parseHoldersCount } = require("./holders");
|
||||
const { isSpoofedSymbol } = require("./symbolSpoof");
|
||||
const { toDecimals } = require("./transferAmount");
|
||||
const { resolveTokenDecimals } = require("./approvalAmount");
|
||||
const { storedSettingIsOn } = require("./storedSettings");
|
||||
|
||||
// Use a static network to skip auto-detection (which can fail and cause
|
||||
// "could not coalesce error" on some RPC endpoints like Cloudflare).
|
||||
@@ -37,9 +42,18 @@ const { resolveTokenDecimals } = require("./approvalAmount");
|
||||
// ethers knows chains this wallet does not, so an id that is not one of ours
|
||||
// is a caller bug and must not resolve to a working provider for some other
|
||||
// chain.
|
||||
//
|
||||
// `disableCcipRead` keeps every ENS lookup on the RPC endpoint. A resolver can
|
||||
// say a name is resolved off-chain and give a web address for it. By default
|
||||
// ethers then fetches that address straight from the browser, sending the name
|
||||
// being looked up. For the reverse lookup of the user's addresses, the name sent
|
||||
// is the user's own (https://git.eeqj.de/sneak/AutistMask/issues/668). With the
|
||||
// flag set, such a name does not resolve.
|
||||
function getProvider(rpcUrl, networkId) {
|
||||
const net = Network.from(requireNetworkId(networkId).id);
|
||||
return new JsonRpcProvider(rpcUrl, net, { staticNetwork: net });
|
||||
const provider = new JsonRpcProvider(rpcUrl, net, { staticNetwork: net });
|
||||
provider.disableCcipRead = true;
|
||||
return provider;
|
||||
}
|
||||
|
||||
function requireNetworkId(networkId) {
|
||||
@@ -81,6 +95,12 @@ function rawUnits(value) {
|
||||
|
||||
// Fetch token balances for a single address from Blockscout.
|
||||
// Returns [{ address, name, symbol, decimals, balance, holders }].
|
||||
//
|
||||
// While the stored "Use Blockscout" is off, Blockscout is not asked. An answer
|
||||
// that lands after the setting went off is dropped
|
||||
// (src/shared/storedSettings.js). Either way this returns an empty list, so
|
||||
// only tracked tokens are listed.
|
||||
//
|
||||
// Filters out spam: only shows tokens that are in the known token list,
|
||||
// explicitly tracked by the user, or have >= 1000 holders. A tracked token's
|
||||
// balance is read through the RPC endpoint instead, and its row here gives that
|
||||
@@ -99,6 +119,7 @@ async function fetchTokenBalances(
|
||||
trackedTokens,
|
||||
signal,
|
||||
) {
|
||||
if (!(await storedSettingIsOn("useBlockscout"))) return [];
|
||||
try {
|
||||
const resp = await debugFetch(
|
||||
blockscoutUrl + "/addresses/" + address + "/token-balances",
|
||||
@@ -108,6 +129,7 @@ async function fetchTokenBalances(
|
||||
return null;
|
||||
}
|
||||
const items = await resp.json();
|
||||
if (!(await storedSettingIsOn("useBlockscout"))) return [];
|
||||
if (!Array.isArray(items)) return null;
|
||||
|
||||
const trackedSet = new Set(
|
||||
@@ -362,7 +384,8 @@ async function refreshBalances(
|
||||
// ERC-20 token balances: the tracked tokens' through the RPC
|
||||
// endpoint, and from Blockscout the tokens the user has not
|
||||
// tracked. When Blockscout fails, the untracked rows from before
|
||||
// this refresh stay. The Blockscout request is started first and
|
||||
// this refresh stay. While "Use Blockscout" is off, there are no
|
||||
// untracked rows. The Blockscout request is started first and
|
||||
// handed to fetchTrackedTokenBalances() too, which waits for it
|
||||
// after sending its balanceOf reads, so the two run side by side.
|
||||
const previous = addr.tokenBalances || [];
|
||||
@@ -404,6 +427,20 @@ async function refreshBalances(
|
||||
log.debugf("refreshBalances done");
|
||||
}
|
||||
|
||||
// Drops the balance of each token not in `trackedTokens` from every address.
|
||||
// Callers run it while "Use Blockscout" is off, since only Blockscout reports
|
||||
// those tokens.
|
||||
function dropUntrackedTokens(wallets, trackedTokens) {
|
||||
const tracked = new Set(trackedTokens.map((t) => t.address.toLowerCase()));
|
||||
for (const wallet of wallets) {
|
||||
for (const addr of wallet.addresses || []) {
|
||||
addr.tokenBalances = (addr.tokenBalances || []).filter((row) =>
|
||||
tracked.has(String(row.address).toLowerCase()),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Look up token metadata from its contract.
|
||||
// Calls symbol() and decimals() to verify it implements ERC-20.
|
||||
// `signal` is as for fetchTokenBalances().
|
||||
@@ -522,6 +559,7 @@ async function scanForAddresses(xpub, rpcUrl, networkId, signal, gapLimit = 5) {
|
||||
module.exports = {
|
||||
fetchTokenBalances,
|
||||
refreshBalances,
|
||||
dropUntrackedTokens,
|
||||
lookupTokenInfo,
|
||||
getProvider,
|
||||
scanForAddresses,
|
||||
|
||||
Reference in New Issue
Block a user