fix: the address screen shows a token just added at its fetched balance, not 0.0000 (closes #516)

A balance refresh that returns now draws the balances on AddressDetail or
AddressToken again when that screen is up, not only the wallet list; their
transaction lists are left alone. Every add path on AddToken and
SettingsAddToken tracks a token through one step, trackToken(), which also
marks it not yet fetched: its line reads `quantity unknown` instead of 0.0000
until a refresh that started with it tracked has fetched every address's
token balances. To tell an address whose token balances the explorer did not
return, the refresh takes them off its copy of the wallets before fetching.

Model: opus-5-5

README.md

@@ -12,27 +12,16 @@ intercepts tx status links to their own site instead of going to Etherscan, etc.
 None of the common alternatives work on Firefox.
 
 Hence, a minimally viable ERC20 browser wallet/signer that works cross-platform.
-Everything you need, nothing you don't. We import as few libraries as possible
+Everything you need, nothing you don't. We import as few libraries as possible,
-and don't implement any crypto. By default the wallet sends user-specific data
+don't implement any crypto, and don't send user-specific data anywhere but a
-only to the Ethereum RPC endpoint. The user can change that endpoint in
+(user-configurable) Ethereum RPC endpoint (which defaults to a public node). The
-Settings. It defaults to a public node.
+extension contacts three user-configurable services: the configured RPC node for
-
+blockchain interactions, a public CoinDesk API (no API key) for realtime price
-Out of the box the extension contacts two services:
+information, and a Blockscout block-explorer API for transaction history and
-
+token balances. It also performs best-effort Etherscan address label lookups
-- the configured RPC node, for blockchain interactions
+during transaction confirmation. A community-maintained phishing domain
-- a public CoinDesk API (no API key), for realtime prices. It is sent token
+blocklist is built into the extension at build time and checked locally; nothing
-  symbols and nothing else.
+is fetched for it at runtime.
-
-Two more services are sent none of the user's data until the user turns them on.
-Each has a checkbox on the Welcome screen and in Settings:
-
-- "Use Blockscout": a Blockscout block-explorer API, for transaction history,
-  the tokens the user has not tracked, and transaction details
-- "Check recipients on Etherscan": a best-effort Etherscan label lookup of the
-  recipient during transaction confirmation
-
-A community-maintained phishing domain blocklist is built into the extension at
-build time and checked locally. Nothing is fetched for it at runtime.
 
 In the extension is a hardcoded list of the top ERC20 contract addresses. You
 can add any ERC20 contract by contract address if you wish, but the hardcoded
@@ -433,35 +422,6 @@ It also covers the red banner on the Settings screen: switching the network
 there to Sepolia must put up the `[TESTNET]` banner, and switching back to
 mainnet must take it down, both while Settings is still on screen.
 
-It also covers what a new install sends to Blockscout and Etherscan
-([#668](https://git.eeqj.de/sneak/AutistMask/issues/668)). The harness installs
-a route handler before the first popup page opens. From then on, the handler
-records every request the extension makes, from its pages and from its
-background worker. A request the background worker makes while it starts up
-comes earlier and is not recorded. The tests take these steps in order:
-
-- Welcome must offer "Use Blockscout" and "Check recipients on Etherscan"
-  unticked.
-- With neither ticked, Home, AddressDetail, AddressToken and ConfirmTx must each
-  show the line saying what is off.
-- The popup is then closed until the background has run a balance refresh of its
-  own. No recorded request may have gone to Blockscout or Etherscan.
-- "Use Blockscout" is ticked from AddressDetail's gear. On "Back", AddressDetail
-  must ask Blockscout for its history and no longer say the setting is off.
-  Blockscout must then be asked for the token balances.
-- The stub Blockscout then reports a token the user has not tracked. Home lists
-  it. "Use Blockscout" is unticked from AddressDetail's gear. On "Back", the
-  token must be gone from AddressDetail, from Send's token dropdown and from
-  Home. Those three screens must each show the line saying the setting is off.
-  The setting is then ticked again.
-- "Check recipients on Etherscan" is ticked from ConfirmTx's gear. On "Back",
-  ConfirmTx must ask Etherscan about the recipient and show the label the stub
-  page gives it.
-
-Both settings stay on for the rest of the run. TransactionDetail with "Use
-Blockscout" off is not driven here, because no history row leads to it then. The
-unit tests cover it.
-
 It also covers the confirmation screen, for both a native ETH send and an ERC-20
 send: Send disabled while the fee estimate is in flight, enabled once it lands,
 the fee block quoting the expected cost and the reserve separately, the distinct
@@ -885,8 +845,7 @@ src/
     views/            — one JS module per screen (home, send, approval, etc.)
   shared/             — modules used by both popup and background
     alarms.js         — recurring background jobs (extension alarms API)
-    balances.js       — ETH and tracked token balances via RPC, others via
+    balances.js       — ETH + ERC-20 balance fetching via RPC + Blockscout
-                        Blockscout while "Use Blockscout" is on
     constants.js      — chain IDs, default RPC endpoint, ERC-20 ABI
     ens.js            — ENS forward/reverse resolution (popup only)
     holders.js        — holder-count parsing and the low-holder rule
@@ -1214,8 +1173,8 @@ fetched, without that cross-address check, and shows the row's figure.
 **Decoded amount lines on the transaction approval screen:** the `Amount` line
 of a decoded ERC-20 call, and the `Amount` and `Min. received` lines of a
 decoded swap (see TxApproval below; `Min. received` reads `Min. paid out` unless
-only the user is paid and no allowance goes to a spender other than the router,
+only the user is paid, see Transaction Decoding), do not always read as a
-see Transaction Decoding), do not always read as a number. They can read:
+number. They can read:
 
 - A formatted quantity, e.g. `17.1900 USDT`, when the token's scale is known:
   truncated to four decimals, with the floor and the zero cases described above.
@@ -1284,11 +1243,7 @@ only when no earlier step set it. It finds each side by three rules:
    is their sum; in any other case the step gives no `Amount`. The decoder reads
    no amount from an exact-out action, and an open delta is not a stated amount.
    Its `Min. received` is found the same way, from the `amountOutMin` of the
-   actions that buy the output currency, except that the step gives none when a
+   actions that buy the output currency.
-   swap action in it also spends the output currency, because the step then does
-   not pay out all that those actions buy. A step that buys at least 0.5 WETH
-   with USDT and swaps 0.3 WETH of it for USDC, with WETH as its output side,
-   gives no `Min. received`.
 3. If any swap action in the step could not be read, only `SETTLE`,
    `SETTLE_ALL`, `TAKE` and `TAKE_ALL` name its sides, and the step gives no
    `Amount` or `Min. received`. A side they did not name is unknown, and the
@@ -1420,50 +1375,30 @@ The core hierarchy is **Wallets → Addresses**:
 - The user can have multiple wallets, each with multiple addresses (HD) or a
   single address (key).
 
-Which tokens an address shows is decided on every refresh by `refreshBalances()`
+Which tokens an address shows is decided by `fetchTokenBalances()` in
-in `src/shared/balances.js`. The balance of each token tracked on the active
+`src/shared/balances.js`, from the Blockscout `token-balances` response, so
-network is read with `balanceOf` through the RPC endpoint, for every address.
+tokens do appear without the user adding them. An ERC-20 is shown when its
-Its holder count and `decimals` are those of Blockscout's entry for it in the
+balance is nonzero and it is in the bundled known-token list, is tracked by the
-same refresh, kept from before while Blockscout fails. A read that fails keeps
+user, or has 1,000 or more holders; a token claiming a symbol from the bundled
-that token's previous entry, as a failed ETH balance keeps its figure, or takes
+list from any other contract address is always dropped, and so is any token
-Blockscout's entry from the same refresh when there is none. Every other token
+claiming a symbol that belongs to the native asset and therefore has no
-comes from the Blockscout `token-balances` response (`fetchTokenBalances()`), so
+legitimate contract at all (`"ETH"`, and every network's `nativeCurrency`, such
-tokens do appear without the user adding them, and they keep their previous
+as `"SepoliaETH"`, on every network). That filter is unconditional — the "Hide
-figures while Blockscout fails.
-
-The refresh asks Blockscout only while the user has "Use Blockscout" on. The
-setting is off until the user turns it on. While it is off:
-
-- Only tracked tokens are listed. Turning the setting off drops every other
-  token from every address at once.
-- A tracked token's entry has no holder count and no `decimals` from Blockscout.
-- A tracked token's balance uses the decimals from the bundled list, or else the
-  decimals saved when the token was tracked.
-
-Each refresh, in the popup or the background, reads the stored setting when it
-starts. If the setting is off when the refresh saves, the save drops every token
-the user has not tracked.
-
-A tracked token is shown when its balance is nonzero, and any other ERC-20 when
-its balance is nonzero and it is in the bundled known-token list or has 1,000 or
-more holders. A token claiming a symbol from the bundled list from any other
-contract address is always dropped, tracked or not, and so is any token claiming
-a symbol that belongs to the native asset and therefore has no legitimate
-contract at all (`"ETH"`, and every network's `nativeCurrency`, such as
-`"SepoliaETH"`, on every network). That filter is unconditional — the "Hide
 tokens with fewer than 1,000 holders" setting governs the transaction history
 and the send-screen token selector, not this list. A token's holder count is
 unknown when the explorer reports none, or reports anything other than a whole
 number written in digits alone, such as `1,000` or `1e3` (`parseHoldersCount()`
 in `src/shared/holders.js`). This list does not take an unknown count as 1,000
 or more, so such a token is shown only when it is on the bundled list or
-tracked. Every nonzero holding of a token shown is stored exactly, however
+tracked. `fetchTokenBalances()` stores every nonzero holding of a token it
-small, but a holding below 0.000001 is left out of the balance lists, the
+admits, however small, but a holding below 0.000001 is left out of the balance
-send-screen token selector, the address total and the remove-address warning
+lists, the send-screen token selector, the address total and the remove-address
-(`isBelowOneMillionth()` in `src/shared/amountDisplay.js`). The Send and
+warning (`isBelowOneMillionth()` in `src/shared/amountDisplay.js`). The Send and
 confirmation screens show it when its token is the one being sent. Tracked
 tokens with a zero balance are listed as well while "Show tracked tokens with
-zero balance" is on.
+zero balance" is on; a token just added on AddToken or SettingsAddToken whose
+balance no refresh has fetched yet is listed there as `quantity unknown` (see
+AddToken).
 
 #### Stored state and its version
 
@@ -1634,16 +1569,12 @@ such as an edit typed into Settings and not yet saved. Home is the one screen
 "Back" always re-renders, so the wallet list reflects anything that changed
 while the user was away from it.
 
-Changing "Use Blockscout" or "Check recipients on Etherscan" in Settings makes
+The popup refreshes balances every ten seconds while it is open
-every screen but Settings count as not yet rendered. "Back" then renders again
+(`doRefreshAndRender()` in `src/popup/index.js`). Each refresh that returns
-any screen a reopened popup can render. A change to "Use Blockscout" also cuts
+draws the wallet list again and, when AddressDetail or AddressToken is up, that
-the stack, as a network switch does (below). The cut drops Send, whose token
+screen's USD total and balance lines; its transaction list is left alone. No
-dropdown was filled under the old setting. "Back" cannot render Send again. A
+other screen is drawn again by a refresh, since the rest show no balances or
-change to "Check recipients on Etherscan" leaves the stack as it is.
+hold what the user typed.
-
-Any other popup open meanwhile takes either change from the stored record, as it
-takes a network switch (below). It then draws its screen on top again under the
-new setting.
 
 A network switch leaves every screen on the page showing the previous network.
 The user makes it in Settings, or approves a site's request and the background
@@ -1686,15 +1617,8 @@ view would leave a wallet one click from deletion.
   screen in that case.
 - **Elements**:
     - "Welcome! To get started, add a wallet." text
-    - A well with a line saying that the wallet sends the user's data only to
-      the Ethereum RPC endpoint unless one of the two checkboxes below is ticked
-    - In the well, the "Use Blockscout" and "Check recipients on Etherscan"
-      checkboxes, the same two as in Settings. Each has a sentence saying what
-      it sends and where. Both are unticked until the user ticks them
     - "Add wallet" button
 - **Transitions**:
-    - Ticking or unticking either checkbox → stores the setting, as Settings
-      does (no screen change)
     - "Add wallet" → **AddWallet**
 
 #### Home (`main`)
@@ -1715,8 +1639,6 @@ view would leave a wallet one click from deletion.
       holding more than one address); the ENS name, if resolved, is below it;
       then the full address on a row of its own, followed by the address USD
       total and a balance line for ETH and for each token shown for that address
-    - While "Use Blockscout" is off, a line under the wallet list: "Only tracked
-      tokens are listed, because "Use Blockscout" is off in Settings."
     - "Recent Transactions": up to 25 transactions merged across every address
       of every wallet, deduplicated by hash and filtered. Each row is three
       lines: age and direction, then the counterparty's colour dot (with our own
@@ -1724,11 +1646,7 @@ view would leave a wallet one click from deletion.
       counterparty's full address on a row of its own. A contract creation has
       no counterparty: its second line is the amount alone and its third line
       says "This transaction creates a new contract. It has no recipient." The
-      transaction lists on AddressDetail and AddressToken draw the same rows.
+      transaction lists on AddressDetail and AddressToken draw the same rows
-      The history comes from Blockscout. While "Use Blockscout" is off,
-      Blockscout is not asked. This list then shows only the line "No
-      transaction history is shown, because "Use Blockscout" is off in
-      Settings."
     - "Add additional wallet..." link at bottom
 - **Transitions**:
     - Tap address row → sets the active address and broadcasts
@@ -1797,13 +1715,9 @@ view would leave a wallet one click from deletion.
     - USD total for address (see [Partial USD totals](#partial-usd-totals))
     - Balance list: ETH + the ERC-20 tokens shown for this address (4 decimal
       places, USD inline). Each balance row is clickable → **AddressToken**
-    - While "Use Blockscout" is off, a line under the balance list: "Only
-      tracked tokens are listed, because "Use Blockscout" is off in Settings."
     - Send / Receive / + Token buttons and a "···" menu button
     - "···" dropdown containing a single "Export Private Key" entry
-    - Transaction list (with ENS resolution for counterparties). While "Use
+    - Transaction list (with ENS resolution for counterparties)
-      Blockscout" is off, it shows only the line "No transaction history is
-      shown, because "Use Blockscout" is off in Settings."
 - **Transitions**:
     - Tap balance row → **AddressToken** (for that token)
     - "Send" → **Send** (refuses with a flash message on a zero balance)
@@ -1871,13 +1785,9 @@ view would leave a wallet one click from deletion.
     - Token contract well (ERC-20 only): full contract address (tap to copy,
       etherscan link) plus name, symbol, decimals, holder count and project
       website where known. The "Holders:" row is left out, not shown as 0, when
-      the token's balance-list entry has no holder count. That happens when:
+      the token's balance-list entry has no holder count: the explorer did not
-        - the explorer did not report a readable one
+      report a readable one, or the token is not in the balance list
-        - "Use Blockscout" is off
+    - Token-filtered transaction list (only this token's transfers)
-        - the token is not in the balance list
-    - Token-filtered transaction list (only this token's transfers). While "Use
-      Blockscout" is off, it shows only the line "No transaction history is
-      shown, because "Use Blockscout" is off in Settings."
 - **Transitions**:
     - "Send" → **Send** (token locked: the dropdown is replaced by a static
       symbol and contract address)
@@ -1894,9 +1804,6 @@ view would leave a wallet one click from deletion.
     - From: address with color dot + etherscan link
     - What to send: token dropdown (or static display with contract address when
       locked from AddressToken)
-    - While "Use Blockscout" is off, a line under the token dropdown: "Only
-      tracked tokens are listed, because "Use Blockscout" is off in Settings."
-      The line is hidden with the dropdown when Send is opened from AddressToken
     - To: address or ENS name input, with an inline validation message
     - Amount input with current balance display, which reads
       `Current balance: unknown (SYMBOL)` for a token whose scale is unknown, as
@@ -1966,12 +1873,7 @@ view would leave a wallet one click from deletion.
       recipient that has never sent a transaction and holds no ETH, recipient is
       a contract, burn address, and an Etherscan phishing/scam label. An address
       that has received ETH but never sent a transaction still holds that ETH,
-      so it gets no warning. The Etherscan label check is made only while "Check
+      so it gets no warning
-      recipients on Etherscan" is on. While it is off, the Etherscan box is left
-      out. A line in its place says "This address was not checked on Etherscan,
-      because "Check recipients on Etherscan" is off in Settings." The box or
-      the line is chosen when the screen is drawn, so neither moves anything
-      later
     - Errors (an invalid amount), plus five reserved error boxes, so the balance
       and the fee arriving later move nothing — the amount exceeds the balance
       (for a token whose scale is unknown it says the token's balance is
@@ -2137,11 +2039,7 @@ view would leave a wallet one click from deletion.
   AddressToken. The screen describes the transaction on the network it was sent
   on, whichever network is active: its block, network details, decoded details
   and raw data are read from that network's Blockscout, the one Settings has for
-  it, and its etherscan links open that network's explorer. The block, network
+  it, and its etherscan links open that network's explorer.
-  details, decoded details and raw data are read only while "Use Blockscout" is
-  on. While it is off, a line in their place says "No block, decoded details,
-  network details or raw data are shown, because "Use Blockscout" is off in
-  Settings."
 - **Elements** (grouped into logical blocks using light well containers; field
   labels are self-explanatory so groups have no headings):
     - "Transaction" heading, "Back" button
@@ -2189,7 +2087,13 @@ view would leave a wallet one click from deletion.
     - "Add" button
 - **Transitions**:
     - "Add" (valid contract) → tracks the token, pops the stack, and re-renders
-      **AddressDetail**
+      **AddressDetail**. The token's balance is not known until a balance
+      refresh that started with it tracked has fetched every address's token
+      balances; until then its balance line reads `quantity unknown`, never
+      `0.0000`, unless the explorer had already listed a holding of it. A
+      refresh that returns draws AddressDetail's balances again (see
+      Navigation), so the fetched balance shows without the screen being
+      reopened
     - "Add" with a token already tracked, a scam-listed address, or a failed
       contract lookup → flash message, no screen change
     - "Add", then a network switch in Settings before the contract lookup
@@ -2224,21 +2128,8 @@ view would leave a wallet one click from deletion.
       already active changes nothing and sends nothing
     - Ethereum RPC: endpoint URL input + "Save" button (validated against
       `eth_chainId` before being saved)
-    - Blockscout API:
+    - Blockscout API: endpoint URL input + "Save" button (validated against
-        - "Use Blockscout" checkbox, unticked until the user ticks it
+      `/stats` before being saved)
-        - A sentence saying what it shows and what it sends. It sends the
-          Blockscout API the user's addresses and the hash of each transaction
-          opened
-        - Endpoint URL input + "Save" button. "Save" checks the URL by asking it
-          for `/stats` before saving it. That request carries no user data. It
-          is made whether or not "Use Blockscout" is ticked.
-    - Etherscan:
-        - "Check recipients on Etherscan" checkbox, unticked until the user
-          ticks it
-        - A sentence saying it sends each recipient's address to Etherscan to
-          check it for a phishing or scam label
-    - Each of the two settings applies to every network. Welcome offers the same
-      two checkboxes
     - Token Spam Protection:
         - "Hide fake tokens impersonating a known symbol" checkbox
         - "Hide tokens with fewer than 1,000 holders" checkbox
@@ -2262,10 +2153,6 @@ view would leave a wallet one click from deletion.
     - Debug: hidden until revealed, then an "Enable debug mode" checkbox that
       turns on the red banner and verbose logging
 - **Transitions**:
-    - Ticking or unticking "Use Blockscout" or "Check recipients on Etherscan" →
-      stores the setting (no screen change). The next balance refresh and every
-      screen drawn after that follow it. Unticking "Use Blockscout" also drops
-      every token the user has not tracked from every address
     - "+ Add wallet" → **AddWallet**
     - "+ Add token" → **SettingsAddToken**
     - `[recovery phrase]` on an HD wallet → **ShowRecoveryPhrase**
@@ -2284,8 +2171,7 @@ view would leave a wallet one click from deletion.
       nothing and tells the background nothing
     - Ten clicks on the version → reveals the Debug well (no screen change)
     - "Back" (or Settings gear again) → previous screen (Home); after a network
-      switch or a change to "Use Blockscout", the stack is cut first (see the
+      switch, the stack is cut first (see the top of Screen Map)
-      top of Screen Map)
 
 #### ShowRecoveryPhrase (`show-phrase`)
 
@@ -2442,8 +2328,6 @@ view would leave a wallet one click from deletion.
       money. The predicate is `addressHoldsFunds()` in
       `src/popup/views/helpers.js`, unrounded and token-aware. A balance is a
       warning, never a refusal.
-    - While "Use Blockscout" is off, a line under the warning: "Only tracked
-      tokens are listed, because "Use Blockscout" is off in Settings."
     - The rule that a wallet always keeps at least one address, and that
       removing the last one means deleting the wallet from Settings
     - Error line
@@ -2486,7 +2370,9 @@ view would leave a wallet one click from deletion.
       add path
 - **Transitions**:
     - Any of the add paths shown, on success → adds the token and shows an
-      "Added SYMBOL" flash message (no screen change)
+      "Added SYMBOL" flash message (no screen change). Until its balance is
+      fetched, its balance line reads `quantity unknown`, as after "Add" on
+      AddToken
     - A duplicate, a scam-listed address, or a failed contract lookup → flash
       message, no screen change
     - "Add" by contract address, then a network switch in Settings before the
@@ -2785,31 +2671,16 @@ view would leave a wallet one click from deletion.
 
 ### External Services
 
-AutistMask is not a fully self-contained offline tool. By default it sends the
+AutistMask is not a fully self-contained offline tool. It necessarily
-user's data only to the Ethereum RPC endpoint. It also asks the CoinDesk price
+communicates with three external services to function as a wallet:
-API for prices, sending token symbols and nothing else.
-
-Two more services are sent none of the user's data until the user turns on their
-settings:
-
-- Blockscout, with "Use Blockscout"
-- Etherscan, with "Check recipients on Etherscan"
-
-Both settings are on the Welcome screen and in Settings. Both are off in a new
-install. Each setting applies to every network.
-
-Contacted by default:
 
 - **Ethereum JSON-RPC endpoint**: The extension needs an Ethereum node to query
-  balances (`eth_getBalance`), read ERC-20 token contracts (`eth_call`), among
+  balances (`eth_getBalance`), read ERC-20 token contracts (`eth_call`),
-  them the balance of every tracked token at every address (`balanceOf`),
   estimate gas (`eth_estimateGas`), fetch nonces (`eth_getTransactionCount`),
   broadcast transactions (`eth_sendRawTransaction`), and check transaction
-  receipts. Every ENS lookup is made through it alone. A name whose resolver
+  receipts. The default endpoint is a public RPC (configurable by the user to
-  says it is resolved off-chain therefore does not resolve. The default endpoint
+  any endpoint they prefer, including a local node). By default the extension
-  is a public RPC (configurable by the user to any endpoint they prefer,
+  talks to `https://ethereum-rpc.publicnode.com`.
-  including a local node). By default the extension talks to
-  `https://ethereum-rpc.publicnode.com`.
     - **Data sent**: Ethereum addresses, transaction data, contract call
       parameters. The RPC endpoint can see all on-chain queries and submitted
       transactions.
@@ -2821,38 +2692,13 @@ Contacted by default:
     - **Data sent**: Token symbol strings only (e.g. "ETH", "USDC"). No
       addresses or user-specific data.
 
-Sent the user's data only while the user has turned the setting on:
+- **Blockscout block-explorer API**: Used to fetch transaction history (normal
-
+  transactions and ERC-20 token transfers), ERC-20 token balances, and token
-- **Blockscout block-explorer API** ("Use Blockscout"): The default endpoint is
+  holder counts (for spam filtering). The default endpoint is
   `https://eth.blockscout.com/api/v2` (configurable by the user in Settings).
-    - **Used for**:
+    - **Data sent**: Ethereum addresses. Blockscout receives the user's
-        - transaction history (normal transactions and ERC-20 token transfers),
+      addresses to query their transaction history and token balances. No
-          for Home, AddressDetail and AddressToken
+      private keys, passwords, or signing operations are sent.
-        - the balances of the ERC-20 tokens the user has not tracked, for Home,
-          AddressDetail, Send and DeleteAddress
-        - token holder counts, for spam filtering
-        - a transaction's block, network details and calldata, for
-          TransactionDetail
-    - **While the setting is off**: each of those screens shows a line saying
-      what it leaves out and that "Use Blockscout" is off. Only tracked tokens
-      are listed.
-    - **Saving the URL**: pressing "Save" beside the URL in Settings asks that
-      URL for `/stats`. This request carries no user data. It is made whether or
-      not the setting is on.
-    - **Data sent**: Ethereum addresses, and the hash of each transaction the
-      user opens. Blockscout receives the user's addresses to query their
-      transaction history and token balances. No private keys, passwords, or
-      signing operations are sent.
-
-- **Etherscan address labels** ("Check recipients on Etherscan"): When
-  confirming a transaction, the extension performs a best-effort lookup of the
-  recipient address on Etherscan to check for phishing/scam labels. This is a
-  direct page fetch with no API key; the user's browser makes the request. While
-  the setting is off, ConfirmTx says that no Etherscan check was made.
-    - **Data sent**: the recipient's address and nothing else.
-
-The etherscan links on the screens open a page in the browser when the user
-clicks one. They are not requests the wallet makes.
 
 What the extension does NOT do:
 
@@ -2861,9 +2707,16 @@ What the extension does NOT do:
 - No Infura/Alchemy dependency (any JSON-RPC endpoint works)
 - No backend servers operated by the developer
 
-Users who want maximum privacy can point the RPC URL at their own node. With
+In addition to the three user-configurable services above (RPC endpoint,
-"Use Blockscout" on, they can point the Blockscout URL at their own instance
+CoinDesk price API, and Blockscout API), AutistMask also contacts:
-too.
+
+- **Etherscan address labels**: When confirming a transaction, the extension
+  performs a best-effort lookup of the recipient address on Etherscan to check
+  for phishing/scam labels. This is a direct page fetch with no API key; the
+  user's browser makes the request.
+
+Users who want maximum privacy can point the RPC and Blockscout URLs at their
+own self-hosted instances (price fetching can be disabled in a future version).
 
 ### Dependencies
 
@@ -3045,11 +2898,8 @@ logged.
 - Add multiple addresses within an HD wallet
 - Manage multiple wallets simultaneously
 - View ETH balance per address
-- View ERC-20 token balances:
+- View ERC-20 token balances (tokens on the bundled known-token list, tokens
-    - tokens the user adds by contract address
+  with 1,000 or more holders, and tokens the user adds by contract address)
-    - while "Use Blockscout" is on, tokens on the bundled known-token list and
-      tokens with 1,000 or more holders
-- View transaction history and transaction details, while "Use Blockscout" is on
 - Send ETH to an address
 - Send ERC-20 tokens to an address
 - Receive ETH/tokens (display address, copy to clipboard, QR code)
@@ -3364,9 +3214,8 @@ Currently supported:
   `Min. paid out`, because the swap's minimum includes the fee. The minimum
   reads `Min. received` only when some step pays the transaction's sender (the
   From address on TxApproval, the sender the explorer reports on
-  TransactionDetail), no `Paid to` line is shown, and no permit or batch grants
+  TransactionDetail) and no `Paid to` line is shown. `Paid to` lines after
-  an allowance to a spender other than the router (see below). `Paid to` lines
+  `Token Out` name each other address paid; one reads
-  after `Token Out` name each other address paid; one reads
   `The bridge, which pays the deposit's recipient on another network` for a
   bridge deposit; one reads, for example,
   `The router, 2000.0000 USDT from the sender (later steps may not spend all of it)`
@@ -3420,8 +3269,7 @@ Currently supported:
   (listed at the end of this section), a step whose input it cannot read, in
   whole or in part, and a step it fails on. Every other `PERMIT2_PERMIT`, before
   the step that sets the input side or after it, leaves `Token In` and the
-  `Amount` line as they read with no permit, unless it lets a spender other than
+  `Amount` line as they read with no permit: a permit of 5,000 DAI to another
-  the router take `Token In` (see below): a permit of 5,000 DAI to another
   address and then a V3 exact-in of 600 USDT read `Swap USDT → USDC` with
   `Amount 600.0000 USDT`, and so do that exact-in and then a permit of 5,000 DAI
   to the router. When a permit's amount stands and the step that sets the input
@@ -3488,26 +3336,19 @@ Currently supported:
   `PERMIT2_PERMIT` or `PERMIT2_PERMIT_BATCH` whose input the decoder cannot
   read, such as one whose token or spender word has a nonzero top byte, may let
   any spender take any amount of any token: it gives one `Permit2 allowance`
-  line alone, reading `Unknown (could not be decoded)`. These lines change no
+  line alone, reading `Unknown (could not be decoded)`, and leaves no `Amount`
-  `Paid to` line: a permit or batch pays nobody. But code that a step runs, such
+  line, whose figure might be too low. These lines change neither the `Paid to`
-  as a V4 pool's hook or a token's own code, can call a spender other than the
+  lines nor the minimum's label: a permit or batch pays nobody. A step goes
-  router, which can then take up to its allowance from the user's wallet before
+  unread when its recipient does not decode as an address, when it is a V3 swap
-  the transaction ends. So an allowance to any spender but the router, or a
+  step whose path is shorter than one token address or has bytes after its last
-  permit or batch the decoder cannot read, makes the minimum read
+  hop, or when it is a command the decoder does not read: every command other
-  `Min. paid out`, and when its token is `Token In`, or the decoder does not
+  than `PERMIT2_PERMIT`, `PERMIT2_PERMIT_BATCH`, `PERMIT2_TRANSFER_FROM`,
-  know its token or `Token In`, it leaves no `Amount` line, whose figure might
+  `V2_SWAP_EXACT_IN`, `V2_SWAP_EXACT_OUT`, `V3_SWAP_EXACT_IN`,
-  be too low: a permit of 5,000 USDT to another address and then a V3 exact-in
+  `V3_SWAP_EXACT_OUT`, `V4_SWAP`, `SWEEP`, `TRANSFER`, `PAY_PORTION`,
-  of 600 USDT read with no `Amount` line, and the 600 USDT gets lines of its
+  `PAY_PORTION_FULL_PRECISION`, `ACROSS_V4_DEPOSIT_V3`, `WRAP_ETH`,
-  own. A step goes unread when its recipient does not decode as an address, when
+  `UNWRAP_WETH` and `BALANCE_CHECK_ERC20` (`PERMIT2_TRANSFER_FROM_BATCH`,
-  it is a V3 swap step whose path is shorter than one token address or has bytes
+  `EXECUTE_SUB_PLAN` and the NFT commands among them), or a type its release
-  after its last hop, or when it is a command the decoder does not read: every
+  names no command for.
-  command other than `PERMIT2_PERMIT`, `PERMIT2_PERMIT_BATCH`,
-  `PERMIT2_TRANSFER_FROM`, `V2_SWAP_EXACT_IN`, `V2_SWAP_EXACT_OUT`,
-  `V3_SWAP_EXACT_IN`, `V3_SWAP_EXACT_OUT`, `V4_SWAP`, `SWEEP`, `TRANSFER`,
-  `PAY_PORTION`, `PAY_PORTION_FULL_PRECISION`, `ACROSS_V4_DEPOSIT_V3`,
-  `WRAP_ETH`, `UNWRAP_WETH` and `BALANCE_CHECK_ERC20`
-  (`PERMIT2_TRANSFER_FROM_BATCH`, `EXECUTE_SUB_PLAN` and the NFT commands among
-  them), or a type its release names no command for.
 
 ### Non-Goals Forever
 

docs/README.md

@@ -57,12 +57,11 @@ analytics, use a portfolio tracker. The wallet is not the place for any of that.
 
 - **No NFT galleries or portfolio views.** This is a wallet, not a dashboard.
 
-- **No third-party token list APIs.** The balances of the tokens you track are
+- **No third-party token list APIs.** Token balances come from the same block
-  read from your RPC endpoint. While "Use Blockscout" is on, the other tokens
+  explorer you configure for transaction history, and the extension ships its
-  come from the same block explorer you configure for transaction history. The
+  own hardcoded list of top ERC-20 contract addresses for symbol-spoofing
-  extension ships its own hardcoded list of top ERC-20 contract addresses for
+  detection. Any token you want tracked across all your addresses, you add
-  symbol-spoofing detection. Any token you want tracked across all your
+  yourself by contract address.
-  addresses, you add yourself by contract address.
 
 - **No backend servers operated by the developer.** Nothing is sent to any
   server run by AutistMask. Every network destination is listed below.
@@ -70,13 +69,8 @@ analytics, use a portfolio tracker. The wallet is not the place for any of that.
 ## How It Works
 
 AutistMask is a browser extension that runs entirely in your browser. It does
-not have a backend server. Out of the box it sends your data only to the
+not have a backend server. It communicates with five external destinations:
-Ethereum RPC endpoint. It also asks the CoinDesk price API for prices, sending
+three you configure yourself, and two fixed ones used for scam detection.
-token symbols and nothing else.
-
-Blockscout and Etherscan are sent none of your data until you turn them on.
-Their settings are "Use Blockscout" and "Check recipients on Etherscan". Both
-are on the Welcome screen and in Settings. Both are off in a new install.
 
 ### External Services
 
@@ -102,31 +96,16 @@ addresses are necessarily visible to the RPC provider when querying balances.
 **Blockscout API** (default: `eth.blockscout.com/api/v2`;
 `eth-sepolia.blockscout.com/api/v2` on Sepolia)
 
-Blockscout is an open-source blockchain explorer. AutistMask uses it only while
+Used to fetch token balances and transaction history. Blockscout is an
-"Use Blockscout" is on. It then asks Blockscout for:
+open-source blockchain explorer. AutistMask queries it for your ERC-20 token
+balances (including the holder counts used for spam filtering) and your recent
+transactions and token transfers. You can change this in Settings to a
+self-hosted Blockscout instance.
 
-- your recent transactions and token transfers
+When it is contacted: on every balance refresh, and whenever a screen showing
-- the balances of the tokens you have not tracked, with the holder counts used
+transaction history is opened.
-  for spam filtering
-- the block, fees and calldata of a transaction you open
 
-You can change this in Settings to a self-hosted Blockscout instance. While the
+What gets sent: your Ethereum addresses (to look up balances and transactions).
-setting is off, each screen that would show Blockscout's data says so instead.
-Only the tokens you track are listed. When you turn the setting off, every other
-token leaves the lists at once.
-
-When it is contacted, while "Use Blockscout" is on:
-
-- on every balance refresh
-- whenever a screen showing transaction history is opened
-- when you open a transaction
-
-Pressing "Save" beside the Blockscout URL in Settings also contacts it, even
-with the setting off. That request checks the URL by asking it for `/stats`. It
-sends none of your data.
-
-What gets sent: your Ethereum addresses (to look up balances and transactions)
-and the hash of each transaction you open.
 
 **CoinDesk CADLI price API** (`data-api.coindesk.com`)
 
@@ -144,19 +123,15 @@ address.
 **Etherscan address labels** (`etherscan.io`; `sepolia.etherscan.io` on Sepolia)
 
 When you review a send, AutistMask fetches the recipient's public Etherscan
-address page. It looks for a "Fake_Phishing"/"Phish/Hack" label or a scam
+address page and looks for a "Fake_Phishing"/"Phish/Hack" label or a scam
 warning, and shows a red warning if it finds one. This is a plain page fetch
 with no API key, made by your browser. It is best-effort: if it fails, it is
 silently ignored. This endpoint is not user-configurable.
 
-The check is off until you turn on "Check recipients on Etherscan". While the
+When it is contacted: each time you reach the send confirmation screen.
-setting is off, the confirmation screen says that no Etherscan check was made.
 
-When it is contacted: only while "Check recipients on Etherscan" is on, each
+What gets sent: the recipient address you are about to send to, and your IP
-time you reach the send confirmation screen.
+address. Your own addresses are not sent.
-
-What gets sent: the recipient's address and nothing else. As with any request,
-Etherscan sees your IP address.
 
 Etherscan links shown elsewhere in the UI (on addresses, transactions, and token
 contracts) are ordinary links. They contact nothing until you click them.
@@ -210,9 +185,6 @@ password.
 
 1. Click the AutistMask icon in your browser toolbar.
 2. Click "Add wallet" (on first use), or open Settings and click "+ Add wallet".
-   On first use, the screen with "Add wallet" also offers "Use Blockscout" and
-   "Check recipients on Etherscan", both off. Tick either if you want what it
-   does (see External Services). You can change both later in Settings.
 3. On the "From Phrase" tab, click the die button to generate a random 12-word
    recovery phrase.
 4. **Write down the recovery phrase and store it safely.** Anyone with these
@@ -248,14 +220,10 @@ always produce the same sequence of addresses.
 
 ### Adding ERC-20 Tokens
 
-Tokens you hold show up automatically only while "Use Blockscout" is on. Even
+Tokens you hold show up automatically only if they are in the extension's
-then, a token shows up only if it is in the extension's bundled list of
+bundled list of well-known tokens or have at least 1,000 holders; everything
-well-known tokens or has at least 1,000 holders. Everything else is treated as
+else is treated as spam and hidden. To track a token explicitly (which also
-spam and hidden.
+shows it at zero balance), add it by contract address:
-
-A token you track is shown whether or not "Use Blockscout" is on. By default it
-is shown at zero balance too (see Display in Settings). To track a token, add it
-by contract address:
 
 1. Go to an address detail view (click `[info]` on any address).
 2. Click "+ Token".
@@ -421,9 +389,8 @@ Click the gear icon on the home screen to access settings:
   that network's defaults if you have not used it before.
 - **Ethereum RPC**: Change the Ethereum node endpoint. Default is a public RPC.
   You can use your own node for maximum privacy.
-- **Blockscout API**: the "Use Blockscout" checkbox, off until you tick it, and
+- **Blockscout API**: Change the Blockscout instance used for token balances and
-  the URL of the Blockscout instance. You can use a self-hosted instance.
+  transaction history. You can use a self-hosted instance.
-- **Etherscan**: "Check recipients on Etherscan", off until you tick it.
 - **Token Spam Protection**: Toggle individual scam filters and set the dust
   transaction threshold.
 - **Allowed Sites / Denied Sites**: View and manage web3 site permissions.

src/background/index.js

@@ -17,11 +17,7 @@ const { applyChainSwitchFields } = require("../shared/chainSwitchFields");
 // the same prohibition reported early, not the guarantee.
 const { getState, updateState } = require("./state");
 const { StateUnusableError } = require("../shared/stateSchema");
-const {
+const { refreshBalances, getProvider } = require("../shared/balances");
-    refreshBalances,
-    dropUntrackedTokens,
-    getProvider,
-} = require("../shared/balances");
 const { debugFetch, log } = require("../shared/log");
 const {
     verifySignedTx,
@@ -1390,10 +1386,6 @@ const RECENT_BALANCE_REFRESH_MS = Math.floor(BALANCE_REFRESH_PERIOD_MS / 2);
 // back over them (https://git.eeqj.de/sneak/AutistMask/issues/577).
 // lastBalanceRefresh is left as the switch set it, so the next tick refreshes
 // the new network.
-//
-// The refresh asks Blockscout only if "Use Blockscout" is on when it starts.
-// The user may turn it off while the refresh runs. So when "Use Blockscout"
-// stored NOW is off, the save drops every token the user has not tracked.
 async function backgroundRefresh() {
     const s = await getState();
     const now = Date.now();
@@ -1405,7 +1397,6 @@ async function backgroundRefresh() {
         wallets,
         s.rpcUrl,
         s.blockscoutUrl,
-        s.useBlockscout,
         s.trackedTokens,
         s.networkId,
     );
@@ -1432,9 +1423,6 @@ async function backgroundRefresh() {
                 }
             }
         }
-        if (!fresh.useBlockscout) {
-            dropUntrackedTokens(fresh.wallets, fresh.trackedTokens);
-        }
         fresh.lastBalanceRefresh = now;
     });
 }

src/popup/index.html

@@ -43,38 +43,6 @@
             <!-- ============ WELCOME / FIRST USE ============ -->
             <div id="view-welcome" class="view hidden">
                 <p class="mb-3">Welcome! To get started, add a wallet.</p>
-                <div class="bg-well p-3 mx-1 mb-3">
-                    <p class="text-xs mb-2">
-                        This wallet sends your data only to the Ethereum RPC
-                        endpoint, unless you turn on one of these. You can
-                        change them later in Settings.
-                    </p>
-                    <label
-                        class="text-xs flex items-center gap-1 cursor-pointer mb-1"
-                    >
-                        <input type="checkbox" id="welcome-use-blockscout" />
-                        Use Blockscout
-                    </label>
-                    <p class="text-xs text-muted mb-2">
-                        Shows transaction history, tokens you have not tracked
-                        and transaction details. Sends your addresses, and the
-                        hash of each transaction you open, to the Blockscout
-                        API.
-                    </p>
-                    <label
-                        class="text-xs flex items-center gap-1 cursor-pointer mb-1"
-                    >
-                        <input
-                            type="checkbox"
-                            id="welcome-check-recipients-on-etherscan"
-                        />
-                        Check recipients on Etherscan
-                    </label>
-                    <p class="text-xs text-muted">
-                        Sends each recipient's address to Etherscan to check it
-                        for a phishing or scam label.
-                    </p>
-                </div>
                 <button
                     id="btn-welcome-add"
                     class="border border-border px-2 py-1 hover:bg-fg hover:text-bg cursor-pointer"
@@ -304,10 +272,6 @@
 
                 <!-- wallet list -->
                 <div id="wallet-list"></div>
-                <p id="home-tokens-note" class="text-xs text-muted py-1 hidden">
-                    Only tracked tokens are listed, because "Use Blockscout" is
-                    off in Settings.
-                </p>
 
                 <!-- recent transactions across all addresses -->
                 <div>
@@ -372,13 +336,6 @@
                     <div id="address-balances" class="min-h-[1.25rem]">
                         &nbsp;
                     </div>
-                    <p
-                        id="address-tokens-note"
-                        class="text-xs text-muted hidden"
-                    >
-                        Only tracked tokens are listed, because "Use Blockscout"
-                        is off in Settings.
-                    </p>
                 </div>
 
                 <!-- actions -->
@@ -569,23 +526,12 @@
                 </div>
                 <div class="mb-2">
                     <label class="block mb-1">What to send</label>
-                    <!-- The token dropdown and the line under it. Both are
+                    <select
-                    hidden when AddressToken opens Send for its own token. -->
+                        id="send-token"
-                    <div id="send-token-dropdown">
+                        class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
-                        <select
+                    >
-                            id="send-token"
+                        <option value="ETH">ETH</option>
-                            class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
+                    </select>
-                        >
-                            <option value="ETH">ETH</option>
-                        </select>
-                        <p
-                            id="send-tokens-note"
-                            class="text-xs text-muted hidden"
-                        >
-                            Only tracked tokens are listed, because "Use
-                            Blockscout" is off in Settings.
-                        </p>
-                    </div>
                     <div id="send-token-static" class="text-sm hidden"></div>
                 </div>
                 <div class="mb-2">
@@ -714,13 +660,6 @@
                         phishing/scam. Do not send funds to this address.
                     </div>
                 </div>
-                <p
-                    id="confirm-etherscan-note"
-                    class="mb-2 text-xs text-muted hidden"
-                >
-                    This address was not checked on Etherscan, because "Check
-                    recipients on Etherscan" is off in Settings.
-                </p>
                 <div
                     id="confirm-errors"
                     class="mb-2 border border-border border-dashed p-2 invisible min-h-[1.25rem]"
@@ -1063,19 +1002,8 @@
 
                 <div class="bg-well p-3 mx-1 mb-3">
                     <h3 class="font-bold mb-1">Blockscout API</h3>
-                    <label
-                        class="text-xs flex items-center gap-1 cursor-pointer mb-1"
-                    >
-                        <input type="checkbox" id="settings-use-blockscout" />
-                        Use Blockscout
-                    </label>
-                    <p class="text-xs text-muted mb-2">
-                        Shows transaction history, tokens you have not tracked
-                        and transaction details. Sends your addresses, and the
-                        hash of each transaction you open, to the Blockscout API
-                        below.
-                    </p>
                     <p class="text-xs text-muted mb-1">
+                        Used to fetch token balances and transaction history.
                         Change this if you run your own Blockscout instance.
                     </p>
                     <input
@@ -1091,23 +1019,6 @@
                     </button>
                 </div>
 
-                <div class="bg-well p-3 mx-1 mb-3">
-                    <h3 class="font-bold mb-1">Etherscan</h3>
-                    <label
-                        class="text-xs flex items-center gap-1 cursor-pointer mb-1"
-                    >
-                        <input
-                            type="checkbox"
-                            id="settings-check-recipients-on-etherscan"
-                        />
-                        Check recipients on Etherscan
-                    </label>
-                    <p class="text-xs text-muted">
-                        Sends each recipient's address to Etherscan to check it
-                        for a phishing or scam label.
-                    </p>
-                </div>
-
                 <div class="bg-well p-3 mx-1 mb-3">
                     <h3 class="font-bold mb-1">Token Spam Protection</h3>
                     <p class="text-xs text-muted mb-2">
@@ -1380,13 +1291,6 @@
                 >
                     &nbsp;
                 </div>
-                <p
-                    id="delete-address-tokens-note"
-                    class="text-xs text-muted mb-2 hidden"
-                >
-                    Only tracked tokens are listed, because "Use Blockscout" is
-                    off in Settings.
-                </p>
                 <p class="text-xs text-muted mb-3">
                     A wallet always keeps at least one address. To remove the
                     last one, delete the whole wallet from Settings instead.
@@ -1600,16 +1504,6 @@
                     </div>
                 </div>
 
-                <!-- Shown in place of the block, decoded details, network
-                details and raw data, which only Blockscout gives. -->
-                <p
-                    id="tx-detail-blockscout-note"
-                    class="text-xs text-muted mx-1 mb-3 hidden"
-                >
-                    No block, decoded details, network details or raw data are
-                    shown, because "Use Blockscout" is off in Settings.
-                </p>
-
                 <!-- ── Decoded details ── -->
                 <div id="tx-detail-calldata-section" class="hidden">
                     <div class="bg-well p-3 mx-1 mb-3">

src/popup/index.js

@@ -11,7 +11,7 @@ const {
 const { StateUnusableError } = require("../shared/stateSchema");
 const { log, setRuntimeDebug } = require("../shared/log");
 const { refreshPrices } = require("../shared/prices");
-const { refreshBalances, dropUntrackedTokens } = require("../shared/balances");
+const { refreshBalances } = require("../shared/balances");
 const { clearPopupCaches } = require("../shared/chainSwitch");
 const {
     $,
@@ -21,6 +21,7 @@ const {
     showSaveFailureBanner,
     pushCurrentView,
     goBack,
+    tokensNotFetched,
 } = require("./views/helpers");
 const { applyTheme } = require("./theme");
 const {
@@ -71,45 +72,57 @@ let refreshInFlight = false;
 // the recovery screen: there is no profile left to refresh.
 let refreshTimer = null;
 
-// The refresh first takes any change to the network or to "Use Blockscout"
-// saved elsewhere (followStoredSettings() below). So it asks Blockscout only if
-// the stored setting is on when it starts.
-//
 // The refresh writes into a copy of the wallets. Inside the save, under the
 // lock, its results are copied onto the address records in `state` only if the
 // network it ran on is still the active one, on this page and in the stored
 // record; the background's switch, after the user approves a site's request,
-// reaches this page only after the stored record (followStoredSettings()).
+// reaches this page only after the stored record (followNetworkSwitch() below).
 // A switch while the refresh ran cleared every address's balances
 // (applyChainSwitchFields() in src/shared/chainSwitchFields.js), and the
 // previous network's must not come back over them
 // (https://git.eeqj.de/sneak/AutistMask/issues/577). A dropped refresh is not
 // recorded as done. Results are copied by address, so an address added or
-// removed meanwhile is left as it is. If the stored "Use Blockscout" is off
+// removed meanwhile is left as it is.
-// when the refresh saves, the save drops every token the user has not tracked.
+//
+// Once the save is done, the wallet list is drawn again, and so are the
+// balances on AddressDetail or AddressToken when that is the screen up. No
+// other screen is drawn again, since the rest show no balances or hold what the
+// user typed.
 async function doRefreshAndRender() {
     if (refreshInFlight) return;
     refreshInFlight = true;
     try {
-        await followStoredSettings();
         const networkId = state.networkId;
+        // The tracked tokens this refresh asks the explorer about. A token
+        // added on AddToken after this point is not among them, so this
+        // refresh does not count as having fetched it.
+        const tokens = state.trackedTokens.map((t) => t.address.toLowerCase());
         const wallets = structuredClone(state.wallets);
+        // Taken off the copy, so that an address whose token balances the
+        // explorer did not return comes back without any and keeps its
+        // stored ones.
+        for (const wallet of wallets) {
+            for (const addr of wallet.addresses) delete addr.tokenBalances;
+        }
         await Promise.all([
             refreshPrices(),
             refreshBalances(
                 wallets,
                 state.rpcUrl,
                 state.blockscoutUrl,
-                state.useBlockscout,
                 state.trackedTokens,
                 networkId,
                 pageClosed.signal,
             ),
         ]);
         const refreshed = new Map();
+        let allTokenBalancesFetched = true;
         for (const wallet of wallets) {
             for (const addr of wallet.addresses) {
                 refreshed.set(addr.address, addr);
+                if (addr.tokenBalances === undefined) {
+                    allTokenBalancesFetched = false;
+                }
             }
         }
         await saveState((stored) => {
@@ -124,13 +137,17 @@ async function doRefreshAndRender() {
                     }
                 }
             }
-            if (!stored.useBlockscout) {
+            // Each token this refresh asked about is now fetched for every
-                dropUntrackedTokens(state.wallets, stored.trackedTokens);
+            // address.
+            if (allTokenBalancesFetched) {
+                for (const token of tokens) tokensNotFetched.delete(token);
             }
             state.lastBalanceRefresh = Date.now();
             return true;
         });
         renderWalletList();
+        if (state.currentView === "address") addressDetail.renderBalances();
+        if (state.currentView === "address-token") addressToken.renderBalance();
     } catch (e) {
         // Every call site fires this and walks away — the boot below, the ten
         // second interval, and eight views through ctx — so it must never
@@ -238,36 +255,17 @@ function fallbackView() {
 // src/shared/chainSwitch.js), so a record naming a network other than this
 // page's always holds a switch saved elsewhere, and a switch the user picks
 // here while this waits for the lock is made after it.
-//
+async function followNetworkSwitch() {
-// Another page may change "Use Blockscout" or "Check recipients on Etherscan".
+    let switched = false;
-// This page takes either change the same way and draws its screens again. Its
-// own changes to them are made under the lock too (views/settings.js,
-// views/welcome.js).
-async function followStoredSettings() {
-    let changed = false;
     // A failed save is reported by saveState() itself: see onSaveFailure().
     await saveState((stored) => {
-        if (stored.networkId !== state.networkId) {
+        if (stored.networkId === state.networkId) return false;
-            settings.cutViewStack();
+        settings.cutViewStack();
-            takeStoredNetwork(stored);
+        takeStoredNetwork(stored);
-            clearPopupCaches();
+        clearPopupCaches();
-            changed = true;
+        switched = true;
-        }
-        if (stored.useBlockscout !== state.useBlockscout) {
-            settings.setUseBlockscout(stored.useBlockscout);
-            changed = true;
-        }
-        if (
-            stored.checkRecipientsOnEtherscan !==
-            state.checkRecipientsOnEtherscan
-        ) {
-            state.checkRecipientsOnEtherscan =
-                stored.checkRecipientsOnEtherscan;
-            changed = true;
-        }
-        if (!changed) return false;
     }).catch(() => {});
-    if (changed) settings.showNewSettings();
+    if (switched) settings.showNewNetwork();
 }
 
 // The background opens the approval window as wide as the page, but the
@@ -414,27 +412,19 @@ async function init() {
     settingsAddToken.init(ctx);
     deleteAddress.init(ctx);
 
-    // Only a record whose network, "Use Blockscout" or "Check recipients on
+    // Only a record naming a network other than this page's is followed: the
-    // Etherscan" differs from this page's is followed. A record this page's
+    // one this page's own switch in Settings saves names the network it
-    // own save wrote matches this page. A record naming no network is no
+    // already has, and a record naming none is no switch.
-    // switch.
     onStorageChanged((changes) => {
         const written = changes.autistmask && changes.autistmask.newValue;
         if (!written || !written.networkId) return;
-        if (
+        if (written.networkId !== state.networkId) followNetworkSwitch();
-            written.networkId !== state.networkId ||
-            written.useBlockscout !== state.useBlockscout ||
-            written.checkRecipientsOnEtherscan !==
-                state.checkRecipientsOnEtherscan
-        ) {
-            followStoredSettings();
-        }
     });
-    // A change saved since loadState() above, before there was a listener.
+    // A switch saved since loadState() above, before there was a listener.
-    followStoredSettings();
+    followNetworkSwitch();
 
     if (!state.hasWallet) {
-        welcome.show();
+        showView("welcome");
     } else {
         renderWalletList();
         restoreView();

src/popup/viewRouter.js

@@ -38,15 +38,10 @@ function markViewRendered(view) {
     if (view) renderedViews.add(view);
 }
 
-// Begin a fresh page-load scope. The popup gets one by being loaded. It also
+// Begin a fresh page-load scope. The popup gets one by being loaded, and
-// asks for one when every screen on the page is out of date:
+// asks for one after a network switch, because every screen then on the page
-//
+// shows the previous network (showNewNetwork() in views/settings.js); the
-//   - after a network switch, since those screens show the previous network
+// unit tests, which simulate several page loads against one module
-//     (showNewSettings() in views/settings.js)
-//   - after "Use Blockscout" or "Check recipients on Etherscan" changes, here
-//     or on another page, since those screens were drawn under the old setting
-//
-// The unit tests, which simulate several page loads against one module
 // instance, ask for one too.
 function resetRenderedViews() {
     renderedViews.clear();

src/popup/views/addToken.js

@@ -1,4 +1,11 @@
-const { $, showView, showFlash, escapeHtml, goBack } = require("./helpers");
+const {
+    $,
+    showView,
+    showFlash,
+    escapeHtml,
+    goBack,
+    trackToken,
+} = require("./helpers");
 const { getTopTokens } = require("../../shared/tokenList");
 const { state, saveState, currentNetwork } = require("../../shared/state");
 const { lookupTokenInfo } = require("../../shared/balances");
@@ -72,7 +79,7 @@ function init(ctx) {
                 return;
             }
             log.infof("Adding token", info.symbol, contractAddr);
-            state.trackedTokens.push({
+            trackToken({
                 address: contractAddr,
                 symbol: info.symbol,
                 decimals: info.decimals,

src/popup/views/addressDetail.js

@@ -4,7 +4,6 @@ const {
     showFlash,
     balanceLinesForAddress,
     txCounterpartyHtml,
-    HISTORY_OFF_TEXT,
     addressTitle,
     escapeHtml,
     displaySymbol,
@@ -66,11 +65,25 @@ function show() {
     });
     $("address-line").dataset.full = addr.address;
     attachCopyHandlers($("address-line"));
-    const usdTotal = formatAddressTotal(getAddressValue(addr));
-    $("address-usd-total").innerHTML = escapeHtml(usdTotal) || " ";
     const ensEl = $("address-ens");
     // ENS is now shown inside renderAddressHtml, hide the separate element
     ensEl.classList.add("hidden");
+    renderBalances();
+    renderSendTokenSelect(addr);
+    $("tx-list").innerHTML =
+        '<div class="text-muted text-xs py-1">Loading...</div>';
+    showView("address");
+    loadTransactions(addr.address);
+}
+
+// The USD total and the balance list. Drawn again by each balance refresh
+// that returns while this screen is up (doRefreshAndRender() in
+// src/popup/index.js), which leaves the rest of the screen as it is.
+function renderBalances() {
+    const addr =
+        state.wallets[state.selectedWallet].addresses[state.selectedAddress];
+    const usdTotal = formatAddressTotal(getAddressValue(addr));
+    $("address-usd-total").innerHTML = escapeHtml(usdTotal) || "&nbsp;";
     $("address-balances").innerHTML = balanceLinesForAddress(
         addr,
         state.trackedTokens,
@@ -84,13 +97,6 @@ function show() {
                 ctx.showAddressToken();
             });
         });
-    // Tokens the user has not tracked are Blockscout's to report.
-    $("address-tokens-note").classList.toggle("hidden", !!state.useBlockscout);
-    renderSendTokenSelect(addr);
-    $("tx-list").innerHTML =
-        '<div class="text-muted text-xs py-1">Loading...</div>';
-    showView("address");
-    loadTransactions(addr.address);
 }
 
 let loadedTxs = [];
@@ -102,7 +108,6 @@ async function loadTransactions(address) {
         const rawTxs = await fetchRecentTransactions(
             address,
             state.blockscoutUrl,
-            state.useBlockscout,
             currentNetwork().chainId,
         );
         const result = filterTransactions(rawTxs, {
@@ -159,10 +164,6 @@ async function loadTransactions(address) {
 
 function renderTransactions(txs) {
     const list = $("tx-list");
-    if (!state.useBlockscout) {
-        list.innerHTML = `<div class="text-muted text-xs py-1">${escapeHtml(HISTORY_OFF_TEXT)}</div>`;
-        return;
-    }
     if (txs.length === 0) {
         list.innerHTML =
             '<div class="text-muted text-xs py-1">No transactions found.</div>';
@@ -237,7 +238,7 @@ function init(_ctx) {
         }
         $("send-to").value = "";
         $("send-amount").value = "";
-        $("send-token-dropdown").classList.remove("hidden");
+        $("send-token").classList.remove("hidden");
         $("send-token-static").classList.add("hidden");
         updateSendBalance();
         resetSendValidation();
@@ -288,4 +289,4 @@ function init(_ctx) {
     exportPrivkey.init();
 }
 
-module.exports = { init, show };
+module.exports = { init, show, renderBalances };

src/popup/views/addressToken.js

@@ -7,13 +7,13 @@ const {
     showFlash,
     flashCopyFeedback,
     txCounterpartyHtml,
-    HISTORY_OFF_TEXT,
     addressTitle,
     escapeHtml,
     displaySymbol,
     nativeCurrency,
     balanceLine,
     unknownableAmount,
+    tokensNotFetched,
     renderAddressHtml,
     attachCopyHandlers,
     goBack,
@@ -49,37 +49,18 @@ function show() {
     const addr = wallet.addresses[state.selectedAddress];
     const ai = state.selectedAddress;
     const tokenId = state.selectedToken;
-
-    // Determine token symbol and balance
-    let symbol, amount, price;
     const knownToken = TOKEN_BY_ADDRESS.get(tokenId.toLowerCase());
-    if (tokenId === "ETH") {
+    currentSymbol =
-        symbol = nativeCurrency();
+        tokenId === "ETH"
-        amount = parseFloat(addr.balance || "0");
+            ? nativeCurrency()
-        price = getPrice("ETH");
+            : resolveSymbol(tokenId, addr.tokenBalances, state.trackedTokens);
-    } else {
-        const tb = (addr.tokenBalances || []).find(
-            (t) => t.address.toLowerCase() === tokenId.toLowerCase(),
-        );
-        symbol = resolveSymbol(
-            tokenId,
-            addr.tokenBalances,
-            state.trackedTokens,
-        );
-        // null when the scale is unknown: no quantity to show, and none to
-        // price. balanceLine() states that rather than printing 0.0000.
-        amount = tb ? unknownableAmount(tb.balance) : 0;
-        price = getPrice(symbol);
-    }
-
-    currentSymbol = symbol;
 
     $("address-token-title").textContent =
         wallet.name +
         " \u2014 Address " +
         (ai + 1) +
         " \u2014 " +
-        displaySymbol(symbol);
+        displaySymbol(currentSymbol);
 
     // Blockie
     const blockieEl = $("address-token-jazzicon");
@@ -101,13 +82,7 @@ function show() {
     $("address-token-line").dataset.full = addr.address;
     attachCopyHandlers($("address-token-line"));
 
-    // USD total for this token only
+    renderBalance();
-    const usdVal = price && amount !== null ? amount * price : null;
-    const usdStr = formatUsd(usdVal);
-    $("address-token-usd-total").innerHTML = escapeHtml(usdStr) || " ";
-
-    // Single token balance line (no tokenId — not clickable here)
-    $("address-token-balance").innerHTML = balanceLine(symbol, amount, price);
 
     // Token contract details (ERC-20 only)
     const contractInfo = $("address-token-contract-info");
@@ -169,12 +144,49 @@ function show() {
     loadTransactions(addr.address, tokenId);
 }
 
+// The USD total and the balance line of the selected token. Drawn again by
+// each balance refresh that returns while this screen is up
+// (doRefreshAndRender() in src/popup/index.js), which leaves the rest of the
+// screen as it is.
+function renderBalance() {
+    const addr =
+        state.wallets[state.selectedWallet].addresses[state.selectedAddress];
+    const tokenId = state.selectedToken;
+    let amount, price;
+    if (tokenId === "ETH") {
+        amount = parseFloat(addr.balance || "0");
+        price = getPrice("ETH");
+    } else {
+        const id = tokenId.toLowerCase();
+        const tb = (addr.tokenBalances || []).find(
+            (t) => t.address.toLowerCase() === id,
+        );
+        // null when the scale is unknown, or when no refresh has fetched a
+        // token just added: no quantity to show, and none to price.
+        // balanceLine() states that rather than printing 0.0000.
+        if (tb) amount = unknownableAmount(tb.balance);
+        else amount = tokensNotFetched.has(id) ? null : 0;
+        price = getPrice(currentSymbol);
+    }
+
+    // USD total for this token only
+    const usdVal = price && amount !== null ? amount * price : null;
+    const usdStr = formatUsd(usdVal);
+    $("address-token-usd-total").innerHTML = escapeHtml(usdStr) || " ";
+
+    // Single token balance line (no tokenId — not clickable here)
+    $("address-token-balance").innerHTML = balanceLine(
+        currentSymbol,
+        amount,
+        price,
+    );
+}
+
 async function loadTransactions(address, tokenId) {
     try {
         const rawTxs = await fetchRecentTransactions(
             address,
             state.blockscoutUrl,
-            state.useBlockscout,
             currentNetwork().chainId,
         );
         const result = filterTransactions(rawTxs, {
@@ -241,10 +253,6 @@ async function loadTransactions(address, tokenId) {
 
 function renderTransactions(txs) {
     const list = $("address-token-tx-list");
-    if (!state.useBlockscout) {
-        list.innerHTML = `<div class="text-muted text-xs py-1">${escapeHtml(HISTORY_OFF_TEXT)}</div>`;
-        return;
-    }
     if (txs.length === 0) {
         list.innerHTML =
             '<div class="text-muted text-xs py-1">No transactions found.</div>';
@@ -330,7 +338,7 @@ function init(_ctx) {
             $("send-token").value = tokenId;
         }
         // Hide dropdown, show static token display
-        $("send-token-dropdown").classList.add("hidden");
+        $("send-token").classList.add("hidden");
         let staticHtml = `<div class="font-bold">${escapeHtml(displaySymbol(currentSymbol))}</div>`;
         if (tokenId !== "ETH") {
             staticHtml += `<div class="text-xs">${renderAddressHtml(tokenId)}</div>`;
@@ -349,4 +357,4 @@ function init(_ctx) {
     });
 }
 
-module.exports = { init, show };
+module.exports = { init, show, renderBalance };

src/popup/views/confirmTx.js

@@ -334,11 +334,6 @@ function show(txInfo) {
     $("confirm-contract-warning").style.visibility = "hidden";
     $("confirm-burn-warning").style.visibility = "hidden";
     $("confirm-etherscan-warning").style.visibility = "hidden";
-    // While "Check recipients on Etherscan" is off, there is no Etherscan
-    // warning to reserve space for. A line in its place says so.
-    const etherscanOn = !!state.checkRecipientsOnEtherscan;
-    $("confirm-etherscan-warning").classList.toggle("hidden", !etherscanOn);
-    $("confirm-etherscan-note").classList.toggle("hidden", etherscanOn);
 
     // Show burn warning via reserved element (in addition to inline warning)
     if (isBurnAddress(txInfo.to)) {

src/popup/views/deleteAddress.js

@@ -119,11 +119,6 @@ function show(walletIdx, addrIdx) {
 
     $("delete-address-recovery").textContent = recoveryPathText(wallet);
     $("delete-address-balance").innerHTML = balanceWarningHtml(addr);
-    // Tokens the user has not tracked are Blockscout's to report.
-    $("delete-address-tokens-note").classList.toggle(
-        "hidden",
-        !!state.useBlockscout,
-    );
 
     setFlash("");
     showView("delete-address-confirm");

src/popup/views/deleteWallet.js

@@ -16,7 +16,6 @@ const {
     broadcastActiveChanged,
 } = require("../../shared/walletDelete");
 const { INVISIBLE_CHARACTERS } = require("../../shared/symbolSpoof");
-const welcome = require("./welcome");
 
 let deleteWalletIndex = null;
 let lostPasswordIndex = null;
@@ -136,7 +135,7 @@ async function finishDelete(walletIdx) {
         // Save before broadcasting: the background reads the active
         // address back out of storage to build accountsChanged.
         if (activeAddressChanged) broadcastActiveChanged();
-        welcome.show();
+        showView("welcome");
         return;
     }
 

src/popup/views/helpers.js

@@ -380,6 +380,22 @@ function balanceLine(symbol, amount, price, tokenId) {
     );
 }
 
+// Contract addresses, lowercased, of the tokens the user added that no balance
+// refresh has fetched yet. An address with no balance row for one of them has
+// no known balance of it, so its line says the quantity is unknown rather than
+// 0.0000. trackToken() adds a token here, and doRefreshAndRender() in
+// src/popup/index.js takes it off once a refresh that started with it tracked
+// has fetched every address's token balances
+// (https://git.eeqj.de/sneak/AutistMask/issues/516).
+const tokensNotFetched = new Set();
+
+// Tracks `token` on the active network, as every add path on AddToken and
+// SettingsAddToken does. No refresh has fetched its balance yet.
+function trackToken(token) {
+    state.trackedTokens.push(token);
+    tokensNotFetched.add(token.address.toLowerCase());
+}
+
 function balanceLinesForAddress(addr, trackedTokens, showZero) {
     let html = balanceLine(
         nativeCurrency(),
@@ -409,12 +425,13 @@ function balanceLinesForAddress(addr, trackedTokens, showZero) {
     }
     if (showZero && trackedTokens) {
         for (const t of trackedTokens) {
-            if (seen.has(t.address.toLowerCase())) continue;
+            const id = t.address.toLowerCase();
+            if (seen.has(id)) continue;
             html += balanceLine(
                 t.symbol,
-                0,
+                tokensNotFetched.has(id) ? null : 0,
                 getPrice(t.symbol),
-                t.address.toLowerCase(),
+                id,
             );
         }
     }
@@ -534,11 +551,6 @@ function addressTitle(address, wallets) {
 const CONTRACT_CREATION_TEXT =
     "This transaction creates a new contract. It has no recipient.";
 
-// What the transaction lists on Home, AddressDetail and AddressToken say while
-// the user has "Use Blockscout" off. Their history comes from Blockscout alone.
-const HISTORY_OFF_TEXT =
-    'No transaction history is shown, because "Use Blockscout" is off in Settings.';
-
 // The last two lines of a transaction history row: the counterparty's colour
 // dot and name beside the amount, then its full address. A contract creation
 // the user sent has no counterparty (its `to` is ""), so its row has the
@@ -791,6 +803,8 @@ module.exports = {
     flashCopyFeedback,
     balanceLine,
     balanceLinesForAddress,
+    tokensNotFetched,
+    trackToken,
     addressHoldsFunds,
     keyMaterialName,
     unknownableAmount,
@@ -804,7 +818,6 @@ module.exports = {
     displaySymbol,
     addressTitle,
     CONTRACT_CREATION_TEXT,
-    HISTORY_OFF_TEXT,
     txCounterpartyHtml,
     formatAddressHtml,
     renderAddressHtml,

src/popup/views/home.js

@@ -7,7 +7,6 @@ const {
     timeAgo,
     addressDotHtml,
     txCounterpartyHtml,
-    HISTORY_OFF_TEXT,
     addressTitle,
     escapeHtml,
     displaySymbol,
@@ -101,10 +100,6 @@ let homeTxs = [];
 function renderHomeTxList(ctx) {
     const list = $("home-tx-list");
     if (!list) return;
-    if (!state.useBlockscout) {
-        list.innerHTML = `<div class="text-muted text-xs py-1">${escapeHtml(HISTORY_OFF_TEXT)}</div>`;
-        return;
-    }
     if (homeTxs.length === 0) {
         list.innerHTML =
             '<div class="text-muted text-xs py-1">No transactions found.</div>';
@@ -197,7 +192,6 @@ async function loadHomeTxs(ctx) {
             fetchRecentTransactions(
                 addr,
                 state.blockscoutUrl,
-                state.useBlockscout,
                 currentNetwork().chainId,
             ),
         );
@@ -306,8 +300,6 @@ function walletListHtml() {
 
 function render(ctx) {
     const container = $("wallet-list");
-    // Tokens the user has not tracked are Blockscout's to report.
-    $("home-tokens-note").classList.toggle("hidden", !!state.useBlockscout);
     if (state.wallets.length === 0) {
         container.innerHTML =
             '<p class="text-muted py-2">No wallets yet. Add one to get started.</p>';
@@ -455,7 +447,7 @@ function init(ctx) {
         }
         $("send-to").value = "";
         $("send-amount").value = "";
-        $("send-token-dropdown").classList.remove("hidden");
+        $("send-token").classList.remove("hidden");
         $("send-token-static").classList.add("hidden");
         renderSendTokenSelect(addr);
         updateSendBalance();

src/popup/views/send.js

@@ -141,8 +141,6 @@ function updateToValidation() {
 }
 
 function renderSendTokenSelect(addr) {
-    // Tokens the user has not tracked are Blockscout's to report.
-    $("send-tokens-note").classList.toggle("hidden", !!state.useBlockscout);
     const sel = $("send-token");
     sel.innerHTML = `<option value="ETH">${escapeHtml(nativeCurrency())}</option>`;
     const fraudSet = new Set(
@@ -428,7 +426,7 @@ function init(_ctx) {
     });
 
     $("btn-send-back").addEventListener("click", () => {
-        $("send-token-dropdown").classList.remove("hidden");
+        $("send-token").classList.remove("hidden");
         $("send-token-static").classList.add("hidden");
         goBack();
     });

src/popup/views/settings.js

@@ -17,7 +17,6 @@ const {
 const { state, saveState, currentNetwork } = require("../../shared/state");
 const { onChainSwitch } = require("../../shared/chainSwitch");
 const { restorableStack } = require("../../shared/persistedState");
-const { dropUntrackedTokens } = require("../../shared/balances");
 const { resetRenderedViews, markViewRendered } = require("../viewRouter");
 const {
     log,
@@ -202,10 +201,6 @@ function show() {
     $("settings-rpc").value = state.rpcUrl;
     $("settings-blockscout").value = state.blockscoutUrl;
     $("settings-network").value = state.networkId;
-    // Set on every show, not only at init: Welcome can change these two.
-    $("settings-use-blockscout").checked = state.useBlockscout;
-    $("settings-check-recipients-on-etherscan").checked =
-        state.checkRecipientsOnEtherscan;
     renderTrackedTokens();
     renderSiteLists();
     renderWalletListSettings();
@@ -262,8 +257,6 @@ async function renderSiteLists() {
 // native token: any other token there was picked on the previous network, so
 // it is no longer selected either. Without a wallet the stack starts at
 // Welcome, which that cut would drop, and Welcome shows nothing from a network.
-// A change to "Use Blockscout" cuts the stack the same way (setUseBlockscout()
-// below).
 function cutViewStack() {
     if (!state.hasWallet) return;
     if (state.selectedToken !== "ETH") {
@@ -276,39 +269,18 @@ function cutViewStack() {
     state.viewStack = restorableStack(state.viewStack, state.currentView);
 }
 
-// Sets "Use Blockscout" to `on` on this page. It is called inside a save,
+// Every screen counts as not yet rendered, so "Back" renders the one it lands
-// holding the lock, for the user's change here or another page's
+// on for the new network. Settings on top is brought up to date in place;
-// (followStoredSettings() in src/popup/index.js).
+// any other screen is drawn again as a reopened popup draws it, which is Home
-//
+// for one that cannot be rendered from saved state. Without a wallet any other
-// Send's token dropdown was filled under the old setting, and Back cannot draw
+// screen is Welcome or AddWallet, which show nothing from a network.
-// Send again. So the stack is cut, as for a network switch. Turning the setting
+function showNewNetwork() {
-// off also drops every token the user has not tracked.
-function setUseBlockscout(on) {
-    state.useBlockscout = on;
-    cutViewStack();
-    if (!on) dropUntrackedTokens(state.wallets, state.trackedTokens);
-}
-
-// Draws the page again after a network switch, or after another page changed
-// "Use Blockscout" or "Check recipients on Etherscan". Every screen counts as
-// not yet rendered, so "Back" renders the one it lands on under the new
-// settings. Settings on top is brought up to date in place; any other screen is
-// drawn again as a reopened popup draws it, which is Home for one that cannot
-// be rendered from saved state. Without a wallet any other screen is Welcome or
-// AddWallet. Back only unhides Welcome, so its two checkboxes are set here.
-function showNewSettings() {
     resetRenderedViews();
-    $("welcome-use-blockscout").checked = state.useBlockscout;
-    $("welcome-check-recipients-on-etherscan").checked =
-        state.checkRecipientsOnEtherscan;
     if (state.currentView === "settings") {
         markViewRendered("settings");
         $("settings-network").value = state.networkId;
         $("settings-rpc").value = state.rpcUrl;
         $("settings-blockscout").value = state.blockscoutUrl;
-        $("settings-use-blockscout").checked = state.useBlockscout;
-        $("settings-check-recipients-on-etherscan").checked =
-            state.checkRecipientsOnEtherscan;
         renderTrackedTokens();
     } else if (state.hasWallet) {
         ctx.restoreView();
@@ -391,35 +363,6 @@ function init(_ctx) {
         showFlash("Saved.");
     });
 
-    // Each change is made inside the save, holding the lock. Then
-    // followStoredSettings() in src/popup/index.js never takes this page's
-    // unsaved change for another page's.
-    //
-    // The screens under Settings were drawn under the old setting. So each
-    // change makes every screen but Settings count as not yet drawn, as a
-    // network switch does. Back then draws again any screen a reopened popup
-    // can draw. Back only unhides Welcome, so its boxes are set here too.
-    $("settings-use-blockscout").addEventListener("change", async () => {
-        const on = $("settings-use-blockscout").checked;
-        await saveState(() => setUseBlockscout(on));
-        $("welcome-use-blockscout").checked = on;
-        resetRenderedViews();
-        markViewRendered("settings");
-    });
-
-    $("settings-check-recipients-on-etherscan").addEventListener(
-        "change",
-        async () => {
-            const on = $("settings-check-recipients-on-etherscan").checked;
-            await saveState(() => {
-                state.checkRecipientsOnEtherscan = on;
-            });
-            $("welcome-check-recipients-on-etherscan").checked = on;
-            resetRenderedViews();
-            markViewRendered("settings");
-        },
-    );
-
     const networkSelect = $("settings-network");
     networkSelect.addEventListener("change", async () => {
         // Whether `state` already has the network picked is asked only once
@@ -433,7 +376,7 @@ function init(_ctx) {
         // Open pages are told by the background, as after a site's approved
         // switch request.
         notify({ type: "AUTISTMASK_NETWORK_CHANGED", chainId: net.chainId });
-        showNewSettings();
+        showNewNetwork();
         showFlash("Switched to " + net.name + ".");
     });
 
@@ -573,6 +516,5 @@ module.exports = {
     show,
     renderSiteLists,
     cutViewStack,
-    setUseBlockscout,
+    showNewNetwork,
-    showNewSettings,
 };

src/popup/views/settingsAddToken.js

@@ -1,4 +1,11 @@
-const { $, showView, showFlash, escapeHtml, goBack } = require("./helpers");
+const {
+    $,
+    showView,
+    showFlash,
+    escapeHtml,
+    goBack,
+    trackToken,
+} = require("./helpers");
 const { getTopTokens } = require("../../shared/tokenList");
 const { state, saveState, currentNetwork } = require("../../shared/state");
 const { lookupTokenInfo } = require("../../shared/balances");
@@ -43,7 +50,7 @@ function renderTop10() {
                     decimals: parseInt(btn.dataset.decimals, 10),
                     name: btn.dataset.name || btn.dataset.symbol,
                 };
-                state.trackedTokens.push(token);
+                trackToken(token);
                 await saveState();
                 showFlash("Added " + token.symbol);
                 renderTop10();
@@ -110,7 +117,7 @@ function init(_ctx) {
             decimals: parseInt(opt.dataset.decimals, 10),
             name: opt.dataset.name || opt.dataset.symbol,
         };
-        state.trackedTokens.push(token);
+        trackToken(token);
         await saveState();
         showFlash("Added " + token.symbol);
         renderTop10();
@@ -156,7 +163,7 @@ function init(_ctx) {
                 return;
             }
             log.infof("Adding token", info.symbol, addr);
-            state.trackedTokens.push({
+            trackToken({
                 address: addr,
                 symbol: info.symbol,
                 decimals: info.decimals,

src/popup/views/transactionDetail.js

@@ -191,11 +191,6 @@ function render() {
         if (el) el.classList.add("hidden");
     }
 
-    // Those details are Blockscout's; this line says why there are none.
-    $("tx-detail-blockscout-note").classList.toggle(
-        "hidden",
-        !!state.useBlockscout,
-    );
     loadFullTxDetails(tx.hash, tx.chainId);
 
     const isoStr = isoDate(tx.timestamp);
@@ -308,11 +303,7 @@ function populateOnChainDetails(txData, chainId) {
     }
 }
 
-// Reads the block, network details and calldata from Blockscout, and decodes
-// the calldata. While "Use Blockscout" is off, Blockscout is not asked and none
-// of them is shown.
 async function loadFullTxDetails(txHash, chainId) {
-    if (!state.useBlockscout) return;
     const section = $("tx-detail-calldata-section");
     const actionEl = $("tx-detail-calldata-action");
     const detailsEl = $("tx-detail-calldata-details");

src/popup/views/welcome.js

@@ -1,37 +1,7 @@
-// The first screen, shown while there is no wallet. It offers "Use Blockscout"
+const { $ } = require("./helpers");
-// and "Check recipients on Etherscan", which Settings offers too. Both are off
-// until the user ticks them.
 
-const { $, showView } = require("./helpers");
-const { state, saveState } = require("../../shared/state");
-
-function show() {
-    $("welcome-use-blockscout").checked = state.useBlockscout;
-    $("welcome-check-recipients-on-etherscan").checked =
-        state.checkRecipientsOnEtherscan;
-    showView("welcome");
-}
-
-// Each change is made inside the save, holding the lock, as Settings makes it.
 function init(ctx) {
     $("btn-welcome-add").addEventListener("click", ctx.showAddWalletView);
-
-    $("welcome-use-blockscout").addEventListener("change", async () => {
-        const on = $("welcome-use-blockscout").checked;
-        await saveState(() => {
-            state.useBlockscout = on;
-        });
-    });
-
-    $("welcome-check-recipients-on-etherscan").addEventListener(
-        "change",
-        async () => {
-            const on = $("welcome-check-recipients-on-etherscan").checked;
-            await saveState(() => {
-                state.checkRecipientsOnEtherscan = on;
-            });
-        },
-    );
 }
 
-module.exports = { init, show };
+module.exports = { init };

src/shared/balances.js

@@ -1,10 +1,5 @@
-// Balance fetching:
+// Balance fetching: ETH balances via RPC, ERC-20 token balances via
-//
+// Blockscout, ENS reverse lookup via RPC.
-//   - 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
-//     it is off.
-//   - ENS reverse lookup via RPC
 
 const {
     JsonRpcProvider,
@@ -41,18 +36,9 @@ 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, that is the
-// user's own name (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);
-    const provider = new JsonRpcProvider(rpcUrl, net, { staticNetwork: net });
+    return new JsonRpcProvider(rpcUrl, net, { staticNetwork: net });
-    provider.disableCcipRead = true;
-    return provider;
 }
 
 function requireNetworkId(networkId) {
@@ -94,15 +80,8 @@ function rawUnits(value) {
 
 // Fetch token balances for a single address from Blockscout.
 // Returns [{ address, name, symbol, decimals, balance, holders }].
-//
-// `useBlockscout` is the user's "Use Blockscout" setting. While it is off,
-// Blockscout is not asked and the answer is an empty list. So no token the user
-// has not tracked is 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
+// explicitly tracked by the user, or have >= 1000 holders.
-// balance is read through the RPC endpoint instead, and its row here gives that
-// entry its holder count and `decimals` (fetchTrackedTokenBalances()).
 //
 // `decimals` and `balance` are each null when the answer is unknown, the same
 // way `holders` already is. Absence is never filled in here: this is the
@@ -114,11 +93,9 @@ function rawUnits(value) {
 async function fetchTokenBalances(
     address,
     blockscoutUrl,
-    useBlockscout,
     trackedTokens,
     signal,
 ) {
-    if (!useBlockscout) return [];
     try {
         const resp = await debugFetch(
             blockscoutUrl + "/addresses/" + address + "/token-balances",
@@ -228,109 +205,18 @@ async function fetchTokenBalances(
     }
 }
 
-// The entries at `address` of the tokens the user tracks, shaped as
-// fetchTokenBalances() returns them, for the tokens the address holds.
-//
-// The balance is read with balanceOf through the RPC endpoint. The name and
-// symbol are the tracked token's. `decimals` and `holders` are those of
-// Blockscout's entry for the token in `explorerRequest`, this refresh's
-// fetchTokenBalances() for the address; while Blockscout fails they are kept
-// from the token's entry in `previous`, the address's entries before this
-// refresh. The balance is stated at the scale the screens read the token at
-// (resolveTokenDecimals()): the bundled list's, then the one the tracked token
-// records, then Blockscout's, as in fetchTokenBalances().
-//
-// A token whose balanceOf fails keeps its entry in `previous`, as a failed ETH
-// balance keeps its figure, or takes Blockscout's entry from this refresh when
-// it has none. The failure is logged. A balance of zero gets no entry, as a
-// zero Blockscout reports gets none: the balance lists take a tracked token's
-// zero from the tracked list. A token whose symbol the spoof rule refuses gets
-// no entry either, as in fetchTokenBalances().
-//
-// `signal` is as for fetchTokenBalances().
-async function fetchTrackedTokenBalances(
-    provider,
-    address,
-    trackedTokens,
-    previous,
-    explorerRequest,
-    signal,
-) {
-    const listed = trackedTokens.filter(
-        (token) => !isSpoofedSymbol(token.symbol, token.address),
-    );
-    // Each token's balanceOf answer, or null where it failed.
-    const balances = await Promise.all(
-        listed.map(async (token) => {
-            try {
-                const contract = new Contract(
-                    token.address,
-                    ERC20_ABI,
-                    provider,
-                );
-                return await contract.balanceOf(address);
-            } catch (e) {
-                if (!signal?.aborted) {
-                    log.errorf(
-                        "token balance failed",
-                        address,
-                        token.address,
-                        e.shortMessage || e.message,
-                    );
-                }
-                return null;
-            }
-        }),
-    );
-    const explorerRows = await explorerRequest;
-    const reported = explorerRows ?? previous;
-
-    const rows = [];
-    listed.forEach((token, i) => {
-        const lower = token.address.toLowerCase();
-        const entryIn = (list) =>
-            list.find((row) => String(row.address).toLowerCase() === lower);
-        const raw = balances[i];
-        if (raw === null) {
-            const kept = entryIn(previous) || entryIn(explorerRows || []);
-            if (kept) rows.push(kept);
-            return;
-        }
-        if (raw === 0n) return;
-        const entry = entryIn(reported);
-        const decimals = entry ? entry.decimals : null;
-        const known = resolveTokenDecimals(lower, { trackedTokens });
-        const scale = known !== null ? known : decimals;
-        rows.push({
-            address: token.address,
-            name: token.name || "",
-            symbol: token.symbol || "???",
-            decimals: decimals,
-            // null when nothing knows the scale: a holding whose amount
-            // cannot be stated, never a zero.
-            balance: scale === null ? null : formatTokenBalance(raw, scale),
-            holders: entry ? entry.holders : null,
-        });
-    });
-    return rows;
-}
-
 // Fetch ETH balances, ENS names, and ERC-20 token balances for all addresses.
-// `trackedTokens` are the tokens tracked on the active network.
+// `signal` is as for fetchTokenBalances().
-// `useBlockscout` and `signal` are as for fetchTokenBalances().
 async function refreshBalances(
     wallets,
     rpcUrl,
     blockscoutUrl,
-    useBlockscout,
     trackedTokens,
     networkId,
     signal,
 ) {
     log.debugf("refreshBalances start, rpc:", urlOrigin(rpcUrl));
     const provider = getProvider(rpcUrl, networkId);
-    const tracked = trackedTokens || [];
-    const trackedSet = new Set(tracked.map((t) => t.address.toLowerCase()));
     const updates = [];
 
     for (const wallet of wallets) {
@@ -380,44 +266,23 @@ async function refreshBalances(
                     }),
             );
 
-            // ERC-20 token balances: the tracked tokens' through the RPC
+            // ERC-20 token balances via Blockscout
-            // endpoint, and from Blockscout the tokens the user has not
-            // tracked. When Blockscout fails, the untracked rows from before
-            // 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 || [];
-            const explorerRequest = fetchTokenBalances(
-                addr.address,
-                blockscoutUrl,
-                useBlockscout,
-                tracked,
-                signal,
-            );
             updates.push(
-                Promise.all([
+                fetchTokenBalances(
-                    fetchTrackedTokenBalances(
+                    addr.address,
-                        provider,
+                    blockscoutUrl,
-                        addr.address,
+                    trackedTokens,
-                        tracked,
+                    signal,
-                        previous,
+                ).then((balances) => {
-                        explorerRequest,
+                    if (balances !== null) {
-                        signal,
+                        addr.tokenBalances = balances;
-                    ),
+                        log.debugf(
-                    explorerRequest,
+                            "Token balances",
-                ]).then(([trackedRows, explorerRows]) => {
+                            addr.address,
-                    const untrackedRows = (explorerRows ?? previous).filter(
+                            balances.length,
-                        (row) =>
+                            "tokens",
-                            !trackedSet.has(String(row.address).toLowerCase()),
+                        );
-                    );
+                    }
-                    addr.tokenBalances = trackedRows.concat(untrackedRows);
-                    log.debugf(
-                        "Token balances",
-                        addr.address,
-                        addr.tokenBalances.length,
-                        "tokens",
-                    );
                 }),
             );
         }
@@ -427,20 +292,6 @@ 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().
@@ -559,7 +410,6 @@ async function scanForAddresses(xpub, rpcUrl, networkId, signal, gapLimit = 5) {
 module.exports = {
     fetchTokenBalances,
     refreshBalances,
-    dropUntrackedTokens,
     lookupTokenInfo,
     getProvider,
     scanForAddresses,

src/shared/chainSwitch.js

@@ -4,7 +4,7 @@
 //
 // - onChainSwitch() below makes the switch the user picks in Settings, with
 //   applyChainSwitchFields() (chainSwitchFields.js).
-// - followStoredSettings() in src/popup/index.js takes a switch the background
+// - followNetworkSwitch() in src/popup/index.js takes a switch the background
 //   or another popup page saved, from the stored record, with
 //   takeStoredNetwork() (state.js), which copies it with
 //   copyChainSwitchFields() (chainSwitchFields.js).
@@ -45,7 +45,7 @@ function clearPopupCaches() {
 //
 // `state` is switched inside the save that stores the switch, holding the
 // lock, so it is never switched while a follow of a switch saved elsewhere
-// waits for the lock (followStoredSettings() in src/popup/index.js): that
+// waits for the lock (followNetworkSwitch() in src/popup/index.js): that
 // follow runs first, and this switch is made after it.
 async function onChainSwitch(newNetworkId) {
     const { state, saveState } = require("./state");

src/shared/etherscanLabels.js

@@ -3,7 +3,6 @@
 // This is a best-effort enrichment: network failures return null silently.
 
 const { networkByChainId } = require("./networks");
-const { storageGet } = require("./browserApi");
 
 // Patterns in the page title that indicate a flagged address.
 // Title format: "Fake_Phishing184810 | Address: 0x... | Etherscan"
@@ -79,18 +78,12 @@ function parseEtherscanPage(html) {
  * when it is omitted: etherscan.io on mainnet, sepolia.etherscan.io on
  * Sepolia.
  *
- * Etherscan is asked only while "Check recipients on Etherscan" is on in the
- * stored profile. The page's own copy of the setting is not used, because
- * another page may have just changed it. While it is off, the answer is null.
- *
  * @param {string} address - Ethereum address to check.
  * @param {string} [chainId] - Chain id of the network to look it up on.
  * @returns {Promise<{type: string, message: string, severity: string}|null>}
  */
 async function checkEtherscanLabel(address, chainId) {
     try {
-        const { autistmask } = await storageGet("autistmask");
-        if (!autistmask || !autistmask.checkRecipientsOnEtherscan) return null;
         // Lazy require to avoid pulling in chrome.storage at module scope
         // (which breaks unit tests that only exercise parseEtherscanPage).
         const { currentNetwork } = require("./state");
@@ -112,7 +105,6 @@ async function checkEtherscanLabel(address, chainId) {
         return null;
     } catch {
         // Network errors are expected — Etherscan may rate-limit or block.
-        // A failed storage read lands here too, before Etherscan is asked.
         return null;
     }
 }

src/shared/persistedState.js

@@ -48,14 +48,6 @@ const DEFAULT_STATE = {
     hideDustTransactions: true,
     dustThresholdGwei: 100000,
     utcTimestamps: false,
-    // "Use Blockscout" and "Check recipients on Etherscan" in Settings. Each
-    // setting applies to every network. Both are off until the user turns them
-    // on. With "Use Blockscout" on, Blockscout is sent the user's addresses and
-    // the hash of each transaction opened. With "Check recipients on
-    // Etherscan" on, Etherscan is sent the recipient's address and nothing
-    // else.
-    useBlockscout: false,
-    checkRecipientsOnEtherscan: false,
     fraudContracts: [],
     tokenHolderCache: {},
     theme: "system",
@@ -414,10 +406,6 @@ function normalizePersisted(saved) {
             : 100000;
     out.utcTimestamps =
         saved.utcTimestamps !== undefined ? saved.utcTimestamps : false;
-    // Anything but true is off: each setting lets a request reach another
-    // service.
-    out.useBlockscout = saved.useBlockscout === true;
-    out.checkRecipientsOnEtherscan = saved.checkRecipientsOnEtherscan === true;
     // A list of contract addresses, floored the same way: send.js builds its
     // fraud set as `(state.fraudContracts || []).map((a) => a.toLowerCase())`
     // and filterTransactions() maps the same list through normalizeAddress(),

src/shared/state.js

@@ -470,9 +470,8 @@ function mergeNetworkEndpoints(base, ours, theirs) {
 // (caught by tests/txStatus.test.js). A page's live picture of a field it
 // does not own goes on being whatever its last loadState() saw, same as
 // before this fix; only the persisted record is guaranteed current. The
-// network, "Use Blockscout" and "Check recipients on Etherscan" are the
+// network is the exception: the popup takes a switch another context saved
-// exceptions: the popup takes a change another context saved through
+// through `beforeWrite` (followNetworkSwitch() in src/popup/index.js).
-// `beforeWrite` (followStoredSettings() in src/popup/index.js).
 async function saveStateOnce(beforeWrite) {
     const result = await storageGet("autistmask");
     // The record in storage right now is about to be merged into and written
@@ -604,7 +603,7 @@ function saveState(beforeWrite) {
 }
 
 // Give this page the network switch held by `stored`, a record a save of this
-// page has just read (followStoredSettings() in src/popup/index.js calls this
+// page has just read (followNetworkSwitch() in src/popup/index.js calls this
 // from `beforeWrite`), in `state` and in `baseline` alike, as loadState() does
 // with a whole record. The switch is then not this page's own change, even when
 // that save fails to write: a later switch back to the previous network still

src/shared/transactions.js

@@ -235,17 +235,12 @@ function mergeTransactions(txs, tokenTransfers) {
 // `chainId` is the chain id of the network `blockscoutUrl` serves. Every entry
 // carries it, and a native entry is labelled with that network's
 // `nativeCurrency` from networks.js (`ETH`, `SepoliaETH`).
-//
-// `useBlockscout` is the user's "Use Blockscout" setting. While it is off,
-// Blockscout is not asked and the answer is an empty list.
 async function fetchRecentTransactions(
     address,
     blockscoutUrl,
-    useBlockscout,
     chainId,
     count = 25,
 ) {
-    if (!useBlockscout) return [];
     log.debugf("fetchRecentTransactions", address);
     const addrLower = normalizeAddress(address);
 

src/shared/uniswap.js

@@ -953,9 +953,7 @@ function totalAmount(amounts) {
 // 2. Amount is the amountIn of the swap action that spends Token In. If
 //    several exact-in actions spend it, each with a stated amount, it is
 //    their sum; in any other case there is none. Min. received is the same
-//    for amountOutMin and the actions that buy Token Out, except that there
+//    for amountOutMin and the actions that buy Token Out.
-//    is none when a swap action in the step also spends Token Out: the step
-//    then does not pay out all that those actions buy.
 // 3. If any swap action in the step cannot be read, only SETTLE, SETTLE_ALL,
 //    TAKE and TAKE_ALL name the sides, and there is no Amount or Min.
 //    received.
@@ -1189,13 +1187,11 @@ function decodeV4Swap(input) {
         const boughtOnly = currenciesNotIn(bought, spent);
         if (present(takeToken) || boughtOnly.length === 1) {
             tokenOut = present(takeToken) ? takeToken : boughtOnly[0];
-            if (!spent.includes(tokenOut)) {
+            amountOutMin = totalAmount(
-                amountOutMin = totalAmount(
+                swaps
-                    swaps
+                    .filter((s) => s.tokenOut === tokenOut)
-                        .filter((s) => s.tokenOut === tokenOut)
+                    .map((s) => s.amountOutMin),
-                        .map((s) => s.amountOutMin),
+            );
-                );
-            }
         }
 
         return {
@@ -1359,9 +1355,8 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
         };
         // A PERMIT2_PERMIT or PERMIT2_PERMIT_BATCH at `step` whose input this
         // decoder cannot read may let any spender take any amount of any
-        // token: one line says so, there is no Amount line, whose figure may
+        // token: one line says so, and there is no Amount line, whose figure
-        // then be too low, and the minimum reads Min. paid out (see
+        // may then be too low.
-        // toAnotherSpender).
         const permitUnread = (step) => {
             permits.push({ token: null, amount: null, spender: null, step });
             stepsUnread.push(step);
@@ -2034,9 +2029,8 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
         // Every other PERMIT2_PERMIT leaves Token In and the Amount line as
         // they read with no permit, and gets lines of its own below. A step
         // that may take from the sender what this decoder did not read leaves
-        // no figure, permit or not (see spentUnread()), and so do a permit
+        // no figure, permit or not (see spentUnread()), and so does a permit
-        // or batch whose input it cannot read (see permitUnread()) and an
+        // or batch whose input it cannot read (see permitUnread()). An
-        // allowance of Token In to another spender (see toAnotherSpender). An
         // EXECUTE_SUB_PLAN step leaves both sides unknown (below).
         const stepCommands = Array.from(
             commandsBytes,
@@ -2222,30 +2216,16 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
             return amountText(amount, info);
         };
 
-        // Each allowance to a spender other than the router. Code that a step
-        // runs, such as a V4 pool's hook or a token's own code, can call that
-        // spender, which can then take up to the allowance from the sender
-        // before the transaction ends. A permit or batch this decoder could
-        // not read may be to any spender, of any token.
-        const toAnotherSpender = permits.filter(
-            (p) => !sameAddress(p.spender, toAddress),
-        );
-
         // A null token in `spentFromSender`, a step this decoder did not read
-        // or a token it does not know, and an allowance to another spender
+        // or a token it does not know, and one in `permits`, a permit or
-        // that may be of Token In, leave no Amount figure, which may then be
+        // batch it could not read, leave no Amount figure, which may then be
         // too low. With no Amount line, each take the total adds up gets
         // lines of its own, first, so that every amount this decoder read is
         // shown.
         if (
             present(inputAmount) &&
             spentFromSender.every((s) => present(s.token)) &&
-            toAnotherSpender.every(
+            permits.every((p) => present(p.token))
-                (p) =>
-                    present(p.token) &&
-                    present(inputToken) &&
-                    !sameAddress(p.token, inputToken),
-            )
         ) {
             const amount = spentText(inputAmount, inInfo);
             details.push({
@@ -2366,10 +2346,9 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
         // step pays the bridge, when one moves the sender's tokens into the
         // router, when a token stays in the router, and when a payout could
         // not be read. The output is received by the sender only when some
-        // step pays the sender, there is no such line, and no allowance goes
+        // step pays the sender and there is no such line. When no step names
-        // to another spender (see toAnotherSpender). When no step names anyone
+        // anyone paid, one line says so. `paidTo` holds these lines and the
-        // paid, one line says so. `paidTo` holds these lines and the token
+        // token line after each line about a token in the router.
-        // line after each line about a token in the router.
         const outputHeld =
             present(outputToken) && heldByRouter.has(outputToken.toLowerCase());
         const paidTo = paidElsewhere.map((address) => ({
@@ -2416,10 +2395,7 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
         if (payeeUnread) {
             paidTo.push({ label: "Paid to", value: UNDECODED_CURRENCY });
         }
-        const received =
+        const received = paidToSender && paidTo.length === 0;
-            paidToSender &&
-            paidTo.length === 0 &&
-            toAnotherSpender.length === 0;
         if (!paidToSender && paidTo.length === 0) {
             paidTo.push({ label: "Paid to", value: UNNAMED_CURRENCY });
         }

tests/addedTokenBalance.test.js

@@ -0,0 +1,249 @@
+// After "Add" on AddToken, AddressDetail lists the new token, and its line reads
+// `quantity unknown`, not 0.0000, until a balance refresh that asked the
+// explorer about the token has returned for every address; so does a token
+// added on SettingsAddToken, wherever it is listed. A refresh that
+// returns draws the balances on AddressDetail or AddressToken again, so the
+// fetched balance shows without the screen being reopened
+// (https://git.eeqj.de/sneak/AutistMask/issues/516). Driven through the real
+// popup over a stored profile on Ethereum Mainnet, with "Show tracked tokens
+// with zero balance" on, as it is by default.
+
+const {
+    bootPopup,
+    cleanupPopup,
+    unversionedValidProfile,
+} = require("./support/popupBoot");
+
+// Tracked by nobody until a test adds it.
+const NEW_TOKEN = "0xBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB";
+
+// The explorer's row for a holding of a million NEW_TOKEN, in the shape
+// fetchTokenBalances() stores it.
+const MILLION = {
+    address: NEW_TOKEN,
+    name: "New Token",
+    symbol: "NEW",
+    decimals: 18,
+    balance: "1000000.0",
+    holders: 3,
+};
+
+afterEach(() => {
+    cleanupPopup();
+});
+
+// The popup reopened onto AddressDetail for the one address.
+function bootOnAddress() {
+    return bootPopup(
+        unversionedValidProfile({
+            currentView: "address",
+            selectedWallet: 0,
+            selectedAddress: 0,
+        }),
+    );
+}
+
+// Holds the next balance refresh open. The returned function lets it finish
+// with the address's ETH balance at 2 and `tokenBalances` as the explorer's
+// rows for it, or with no token balances at all when given null: an explorer
+// that did not answer, which the real refreshBalances() leaves unwritten.
+function holdNextRefresh(page) {
+    const { refreshBalances } = require("../src/shared/balances");
+    let release;
+    refreshBalances.mockImplementationOnce(async (wallets) => {
+        const tokenBalances = await new Promise((resolve) => {
+            release = resolve;
+        });
+        wallets[0].addresses[0].balance = "2.0";
+        if (tokenBalances !== null) {
+            wallets[0].addresses[0].tokenBalances = tokenBalances;
+        }
+    });
+    return async (tokenBalances) => {
+        release(tokenBalances);
+        await page.settle();
+    };
+}
+
+// "+ Token", NEW_TOKEN typed in, and "Add", with the contract lookup
+// answering at once.
+async function addNewToken(page) {
+    const { lookupTokenInfo } = require("../src/shared/balances");
+    lookupTokenInfo.mockResolvedValueOnce({
+        symbol: "NEW",
+        decimals: 18,
+        name: "New Token",
+    });
+    await page.click("btn-add-token");
+    page.node("add-token-address").value = NEW_TOKEN;
+    await page.click("btn-add-token-confirm");
+}
+
+// NEW_TOKEN's row in the balance list in element `id`, AddressDetail's unless
+// another is named, as markup.
+function newTokenRow(page, id = "address-balances") {
+    return page
+        .node(id)
+        .innerHTML.split("<div ")
+        .find((row) =>
+            row.includes('data-token="' + NEW_TOKEN.toLowerCase() + '"'),
+        );
+}
+
+// AddressDetail for the one address opened from Home, as its `[info]` button
+// does.
+async function openAddress(page) {
+    const { state } = require("../src/shared/state");
+    state.selectedWallet = 0;
+    state.selectedAddress = 0;
+    require("../src/popup/views/helpers").pushCurrentView();
+    require("../src/popup/views/addressDetail").show();
+    await page.settle();
+}
+
+// AddressToken for `token` opened from AddressDetail, as tapping the token's
+// row there does.
+async function openToken(page, token) {
+    const { state } = require("../src/shared/state");
+    state.selectedToken = token;
+    require("../src/popup/views/helpers").pushCurrentView();
+    require("../src/popup/views/addressToken").show();
+    await page.settle();
+}
+
+test("until the refresh Add started returns, the new token's line reads quantity unknown", async () => {
+    const page = await bootOnAddress();
+    expect(page.pageErrors).toEqual([]);
+    const finish = holdNextRefresh(page);
+
+    await addNewToken(page);
+
+    expect(page.visibleViews()).toEqual(["address"]);
+    const row = newTokenRow(page);
+    expect(row).toContain("quantity unknown");
+    expect(row).not.toContain("0.0000");
+    await finish([MILLION]);
+});
+
+test("once that refresh returns, AddressDetail shows the fetched balance without being reopened", async () => {
+    const page = await bootOnAddress();
+    const finish = holdNextRefresh(page);
+    await addNewToken(page);
+    // Stands for the transactions on the screen, which only show() replaces.
+    page.node("tx-list").innerHTML = "transactions on the screen";
+
+    await finish([MILLION]);
+
+    expect(page.visibleViews()).toEqual(["address"]);
+    expect(newTokenRow(page)).toContain("1000000.0000");
+    // Only the balances are drawn again, not the transaction list.
+    expect(page.node("tx-list").innerHTML).toBe("transactions on the screen");
+});
+
+test("a refresh already running when the token is added does not count as fetching it", async () => {
+    const page = await bootOnAddress();
+    const finishRunning = holdNextRefresh(page);
+    const ticking = page.tick();
+    await page.settle();
+
+    await addNewToken(page);
+    await finishRunning([]);
+    await ticking;
+
+    expect(newTokenRow(page)).toContain("quantity unknown");
+
+    // The next one asks the explorer about the token, which lists no holding
+    // of it: a fetched zero.
+    const finishNext = holdNextRefresh(page);
+    const next = page.tick();
+    await page.settle();
+    await finishNext([]);
+    await next;
+
+    expect(newTokenRow(page)).toContain("0.0000");
+});
+
+test("a refresh in which the explorer did not answer leaves the new token's line quantity unknown", async () => {
+    const page = await bootOnAddress();
+    const finish = holdNextRefresh(page);
+    await addNewToken(page);
+
+    await finish(null);
+
+    // Drawn again: the ETH balance it fetched is shown.
+    expect(page.node("address-balances").innerHTML).toContain("2.0000");
+    expect(newTokenRow(page)).toContain("quantity unknown");
+});
+
+test("AddressToken for the new token reads quantity unknown until the refresh returns, then the fetched balance", async () => {
+    const page = await bootOnAddress();
+    const finish = holdNextRefresh(page);
+    await addNewToken(page);
+
+    await openToken(page, NEW_TOKEN.toLowerCase());
+
+    expect(page.visibleViews()).toEqual(["address-token"]);
+    const before = page.node("address-token-balance").innerHTML;
+    expect(before).toContain("quantity unknown");
+    expect(before).not.toContain("0.0000");
+
+    await finish([MILLION]);
+
+    expect(page.node("address-token-balance").innerHTML).toContain(
+        "1000000.0000",
+    );
+});
+
+test("a token added by contract address on SettingsAddToken reads quantity unknown until the refresh returns", async () => {
+    const page = await bootPopup(unversionedValidProfile());
+    expect(page.visibleViews()).toEqual(["main"]);
+    const finish = holdNextRefresh(page);
+    const { lookupTokenInfo } = require("../src/shared/balances");
+    lookupTokenInfo.mockResolvedValueOnce({
+        symbol: "NEW",
+        decimals: 18,
+        name: "New Token",
+    });
+
+    await page.click("btn-settings");
+    await page.click("btn-settings-add-token");
+    page.node("settings-addtoken-address").value = NEW_TOKEN;
+    await page.click("btn-settings-addtoken-manual");
+    await page.click("btn-settings-addtoken-back");
+    await page.click("btn-settings-back");
+    expect(page.visibleViews()).toEqual(["main"]);
+    const onHome = newTokenRow(page, "wallet-list");
+    expect(onHome).toContain("quantity unknown");
+    expect(onHome).not.toContain("0.0000");
+
+    await openAddress(page);
+    const onAddress = newTokenRow(page);
+    expect(onAddress).toContain("quantity unknown");
+    expect(onAddress).not.toContain("0.0000");
+
+    await finish([MILLION]);
+
+    expect(newTokenRow(page)).toContain("1000000.0000");
+});
+
+test("a refresh that returns while AddressToken is up draws its balance again", async () => {
+    const page = await bootPopup(
+        unversionedValidProfile({
+            currentView: "address-token",
+            viewStack: ["main", "address"],
+            selectedWallet: 0,
+            selectedAddress: 0,
+            selectedToken: "ETH",
+        }),
+    );
+    expect(page.visibleViews()).toEqual(["address-token"]);
+    expect(page.node("address-token-balance").innerHTML).toContain("1.5000");
+    const finish = holdNextRefresh(page);
+    const ticking = page.tick();
+    await page.settle();
+
+    await finish(null);
+    await ticking;
+
+    expect(page.node("address-token-balance").innerHTML).toContain("2.0000");
+});

tests/alarms.test.js

@@ -41,8 +41,6 @@ jest.mock("../src/shared/balances", () => ({
     refreshBalances: jest.fn(async () => {
         mockBalanceRefreshAt.push(Date.now());
     }),
-    dropUntrackedTokens: jest.requireActual("../src/shared/balances")
-        .dropUntrackedTokens,
     getProvider: jest.fn(() => ({})),
 }));
 

tests/backgroundStateIsolation.test.js

@@ -142,8 +142,6 @@ function loadWorker(networkId, opts) {
         },
         refreshBalances:
             options.refreshBalances || jest.fn(async () => undefined),
-        dropUntrackedTokens: jest.requireActual("../src/shared/balances")
-            .dropUntrackedTokens,
     }));
     jest.doMock("../src/shared/phishingDomains", () => ({
         isPhishingDomain: () => false,
@@ -412,14 +410,7 @@ describe("a balance refresh under a network switch", () => {
         const ranOn = [];
 
         const bg = loadWorker("sepolia", {
-            refreshBalances: async (
+            refreshBalances: async (wallets, rpcUrl, explorer, tokens, id) => {
-                wallets,
-                rpcUrl,
-                explorer,
-                useBlockscout,
-                tokens,
-                id,
-            ) => {
                 ranOn.push(id);
                 reachedNetwork.resolve();
                 await roundTrip.promise;
@@ -452,61 +443,3 @@ describe("a balance refresh under a network switch", () => {
         );
     });
 });
-
-describe("a balance refresh under a change of Use Blockscout", () => {
-    // Turning "Use Blockscout" off drops the tokens the user has not tracked
-    // (src/popup/views/settings.js). A refresh that started while it was on
-    // still saves its balances when it returns, but not those tokens. The same
-    // refresh in the popup is in tests/blockscoutEtherscanSettings.test.js.
-    test("a refresh that returns after Use Blockscout was turned off saves its balances without the untracked token", async () => {
-        const roundTrip = deferred();
-        const started = deferred();
-        const handed = [];
-
-        const bg = loadWorker("mainnet", {
-            refreshBalances: async (
-                wallets,
-                rpcUrl,
-                explorer,
-                useBlockscout,
-            ) => {
-                handed.push(useBlockscout);
-                started.resolve();
-                await roundTrip.promise;
-                wallets[0].addresses[0].balance = "7.0";
-                wallets[0].addresses[0].tokenBalances = [
-                    {
-                        address: "0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                        name: "Test Token",
-                        symbol: "TST",
-                        decimals: 18,
-                        balance: "5.0",
-                        holders: 50000,
-                    },
-                ];
-            },
-        });
-        global.chrome.storage.write("autistmask", {
-            ...bg.persisted(),
-            useBlockscout: true,
-        });
-
-        const refresh = bg.fireBalanceAlarm();
-        await started.promise;
-
-        // The user unticks "Use Blockscout" in Settings while the round trip
-        // is out.
-        global.chrome.storage.write("autistmask", {
-            ...bg.persisted(),
-            useBlockscout: false,
-        });
-
-        roundTrip.resolve();
-        await refresh;
-
-        expect(handed).toEqual([true]);
-        const after = bg.persisted();
-        expect(after.wallets[0].addresses[0].balance).toBe("7.0");
-        expect(after.wallets[0].addresses[0].tokenBalances).toEqual([]);
-    });
-});

tests/balanceRefreshCancelled.test.js

@@ -18,11 +18,6 @@ const {
 const RPC_URL = "https://rpc.example.invalid";
 const EXPLORER_URL = "https://explorer.example.invalid/api/v2";
 const ADDRESS = "0x1111111111111111111111111111111111111111";
-const TRACKED = {
-    address: "0x7777777777777777777777777777777777777777",
-    symbol: "TRK",
-    decimals: 6,
-};
 
 const realFetch = globalThis.fetch;
 let logged;
@@ -35,9 +30,9 @@ beforeEach(() => {
     const failedToFetch = async () => {
         throw new TypeError("Failed to fetch");
     };
-    // The RPC calls (ETH balance, ENS name, the tracked token's balance, and
+    // The RPC calls (ETH balance, ENS name, and the scan's balance and
-    // the scan's balance and transaction count) and the explorer request (the
+    // transaction count) and the explorer request (token balances) all fail
-    // other token balances) all fail the same way.
+    // the same way.
     FetchRequest.registerGetUrl(failedToFetch);
     globalThis.fetch = jest.fn(failedToFetch);
 });
@@ -54,8 +49,7 @@ function refresh(signal) {
         wallets,
         RPC_URL,
         EXPLORER_URL,
-        true,
+        [],
-        [TRACKED],
         "mainnet",
         signal,
     );
@@ -66,7 +60,6 @@ test("a failure while the popup is open is reported", async () => {
     for (const label of [
         "ETH balance failed",
         "ENS reverse failed",
-        "token balance failed",
         "fetchTokenBalances failed: Failed to fetch",
     ]) {
         expect(logged.some((line) => line.includes(label))).toBe(true);

tests/balanceRefreshNetworkSwitch.test.js

@@ -91,7 +91,7 @@ test("a refresh that returns after a switch in Settings writes nothing, and the
 
     await page.tick();
 
-    expect(refreshBalances.mock.lastCall[5]).toBe("sepolia");
+    expect(refreshBalances.mock.lastCall[4]).toBe("sepolia");
     expect(page.storage.read("autistmask").lastBalanceRefresh).toBeGreaterThan(
         0,
     );

tests/blockscoutEtherscanSettings.test.js

@@ -1,783 +0,0 @@
-// Blockscout and Etherscan are sent none of the user's data until the user
-// turns them on (https://git.eeqj.de/sneak/AutistMask/issues/668). A new
-// profile has "Use Blockscout" and "Check recipients on Etherscan" both off.
-// While a setting is off, the code that would ask its service asks nothing.
-//
-// The one request made with the setting off is the check behind "Save" beside
-// the Blockscout URL in Settings. It asks that URL only for `/stats` and sends
-// none of the user's data.
-//
-// The balance refresh and the Etherscan check follow the stored setting, not
-// the page's copy of it. So a change another page saved applies to them at
-// once. An open page also takes such a change and draws its screens again.
-//
-// Only Blockscout reports the tokens the user has not tracked. While "Use
-// Blockscout" is off, no address keeps them and no screen lists them.
-//
-// The functions that make the requests are driven directly, against a fetch()
-// that records every URL it is asked for. The screens are driven through the
-// real popup over a stored profile (tests/support/popupBoot.js). Its fetch()
-// stub records the same way.
-
-"use strict";
-
-const { FetchRequest } = require("ethers");
-const {
-    bootPopup,
-    cleanupPopup,
-    unversionedValidProfile,
-    ADDRESS,
-    TOKEN_ADDRESS,
-} = require("./support/popupBoot");
-const { makeStorageStub } = require("./support/storageStub");
-const {
-    DEFAULT_STATE,
-    normalizePersisted,
-} = require("../src/shared/persistedState");
-const {
-    fetchTokenBalances,
-    refreshBalances,
-} = require("../src/shared/balances");
-const { fetchRecentTransactions } = require("../src/shared/transactions");
-const { getFullWarnings } = require("../src/shared/addressWarnings");
-const { HISTORY_OFF_TEXT, escapeHtml } = require("../src/popup/views/helpers");
-
-const RPC_URL = "https://rpc.example.invalid";
-const BLOCKSCOUT = "https://eth.blockscout.com/api/v2";
-const RECIPIENT = "0x2222222222222222222222222222222222222222";
-const TX_HASH = "0x" + "ab".repeat(32);
-const ZERO_WORD = "0x" + "0".repeat(64);
-
-// USDC, from the bundled list, as Blockscout reports a holding of it.
-const USDC_ROW = {
-    value: "5000000",
-    token: {
-        type: "ERC-20",
-        address_hash: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
-        symbol: "USDC",
-        name: "USD Coin",
-        decimals: "6",
-        holders_count: "50000",
-    },
-};
-
-const realFetch = globalThis.fetch;
-
-afterEach(() => {
-    cleanupPopup();
-    jest.restoreAllMocks();
-});
-
-describe("a new profile", () => {
-    test("has both settings off", () => {
-        expect(DEFAULT_STATE.useBlockscout).toBe(false);
-        expect(DEFAULT_STATE.checkRecipientsOnEtherscan).toBe(false);
-        const loaded = normalizePersisted(undefined);
-        expect(loaded.useBlockscout).toBe(false);
-        expect(loaded.checkRecipientsOnEtherscan).toBe(false);
-    });
-
-    test("keeps either setting the user turned on", () => {
-        const loaded = normalizePersisted({
-            useBlockscout: true,
-            checkRecipientsOnEtherscan: true,
-        });
-        expect(loaded.useBlockscout).toBe(true);
-        expect(loaded.checkRecipientsOnEtherscan).toBe(true);
-    });
-});
-
-describe("where each request is made", () => {
-    // Every URL fetch() was asked for, in order.
-    let asked;
-
-    beforeEach(() => {
-        asked = [];
-        globalThis.fetch = jest.fn(async (url) => {
-            asked.push(String(url));
-            return {
-                ok: true,
-                status: 200,
-                json: async () =>
-                    String(url).endsWith("/token-balances")
-                        ? [USDC_ROW]
-                        : { items: [] },
-                text: async () => "<html><body></body></html>",
-            };
-        });
-    });
-
-    afterEach(() => {
-        globalThis.fetch = realFetch;
-    });
-
-    test("Blockscout's token balances are asked for only while Use Blockscout is on", async () => {
-        expect(
-            await fetchTokenBalances(ADDRESS, BLOCKSCOUT, false, []),
-        ).toEqual([]);
-        expect(asked).toEqual([]);
-
-        const rows = await fetchTokenBalances(ADDRESS, BLOCKSCOUT, true, []);
-        expect(rows.map((row) => row.symbol)).toEqual(["USDC"]);
-        expect(asked).toEqual([
-            BLOCKSCOUT + "/addresses/" + ADDRESS + "/token-balances",
-        ]);
-    });
-
-    test("the transaction history is asked for only while Use Blockscout is on", async () => {
-        expect(
-            await fetchRecentTransactions(ADDRESS, BLOCKSCOUT, false, "0x1"),
-        ).toEqual([]);
-        expect(asked).toEqual([]);
-
-        await fetchRecentTransactions(ADDRESS, BLOCKSCOUT, true, "0x1");
-        expect(asked.sort()).toEqual([
-            BLOCKSCOUT +
-                "/addresses/" +
-                ADDRESS +
-                "/token-transfers?type=ERC-20",
-            BLOCKSCOUT + "/addresses/" + ADDRESS + "/transactions",
-        ]);
-    });
-
-    test("the Etherscan label check is made only while the stored profile has Check recipients on Etherscan on", async () => {
-        const provider = {
-            getCode: async () => "0x",
-            getTransactionCount: async () => 1,
-            getBalance: async () => 0n,
-        };
-        const checkWith = async (stored) => {
-            globalThis.chrome = { storage: makeStorageStub(stored) };
-            try {
-                await getFullWarnings(RECIPIENT, provider, { chainId: "0x1" });
-            } finally {
-                delete globalThis.chrome;
-            }
-        };
-
-        await checkWith({});
-        await checkWith({ autistmask: { checkRecipientsOnEtherscan: false } });
-        expect(asked).toEqual([]);
-
-        await checkWith({ autistmask: { checkRecipientsOnEtherscan: true } });
-        expect(asked).toEqual(["https://etherscan.io/address/" + RECIPIENT]);
-    });
-
-    describe("a balance refresh", () => {
-        // The RPC endpoint answers every balance with zero, and every other
-        // call, the ENS reverse lookup's, with no resolver.
-        beforeEach(() => {
-            FetchRequest.registerGetUrl(async (req) => {
-                const body = JSON.parse(Buffer.from(req.body).toString("utf8"));
-                const reply = (r) => ({
-                    jsonrpc: "2.0",
-                    id: r.id,
-                    result: r.method === "eth_getBalance" ? "0x0" : ZERO_WORD,
-                });
-                const answer = Array.isArray(body)
-                    ? body.map(reply)
-                    : reply(body);
-                return {
-                    statusCode: 200,
-                    statusMessage: "OK",
-                    headers: { "content-type": "application/json" },
-                    body: Buffer.from(JSON.stringify(answer)),
-                };
-            });
-        });
-
-        afterEach(() => {
-            FetchRequest.registerGetUrl(FetchRequest.createGetUrlFunc());
-        });
-
-        // An address that was refreshed while Use Blockscout was on, and holds
-        // the USDC Blockscout reported then.
-        function addressWithUsdc() {
-            return {
-                address: ADDRESS,
-                tokenBalances: [
-                    {
-                        address: USDC_ROW.token.address_hash,
-                        name: "USD Coin",
-                        symbol: "USDC",
-                        decimals: 6,
-                        balance: "5.0",
-                        holders: 50000,
-                    },
-                ],
-            };
-        }
-
-        async function refresh(addr, useBlockscout) {
-            await refreshBalances(
-                [{ addresses: [addr] }],
-                RPC_URL,
-                BLOCKSCOUT,
-                useBlockscout,
-                [],
-                "mainnet",
-            );
-        }
-
-        test("asks Blockscout nothing while Use Blockscout is off, and then lists no token the user has not tracked", async () => {
-            const addr = addressWithUsdc();
-            await refresh(addr, false);
-            expect(asked).toEqual([]);
-            expect(addr.tokenBalances).toEqual([]);
-        });
-
-        test("asks Blockscout for the token balances while Use Blockscout is on", async () => {
-            const addr = addressWithUsdc();
-            await refresh(addr, true);
-            expect(asked).toEqual([
-                BLOCKSCOUT + "/addresses/" + ADDRESS + "/token-balances",
-            ]);
-            expect(addr.tokenBalances.map((row) => row.symbol)).toEqual([
-                "USDC",
-            ]);
-        });
-    });
-});
-
-describe("the popup", () => {
-    // Every URL the booted page handed to fetch().
-    function fetched() {
-        return globalThis.fetch.mock.calls.map((call) => String(call[0]));
-    }
-
-    function blockscoutOrEtherscan(url) {
-        return url.includes("blockscout") || url.includes("etherscan");
-    }
-
-    beforeEach(() => {
-        // The screens below log their failed RPC reads; the stub node in
-        // popupBoot.js answers none.
-        jest.spyOn(console, "error").mockImplementation(() => {});
-    });
-
-    test("hands its balance refresh and Home's history the stored Use Blockscout setting", async () => {
-        await bootPopup(unversionedValidProfile());
-        const {
-            refreshBalances: popupRefresh,
-        } = require("../src/shared/balances");
-        const {
-            fetchRecentTransactions: popupHistory,
-        } = require("../src/shared/transactions");
-        expect(popupRefresh.mock.calls[0][3]).toBe(false);
-        expect(popupHistory.mock.calls[0][2]).toBe(false);
-        cleanupPopup();
-
-        await bootPopup(unversionedValidProfile({ useBlockscout: true }));
-        const {
-            refreshBalances: onRefresh,
-        } = require("../src/shared/balances");
-        const {
-            fetchRecentTransactions: onHistory,
-        } = require("../src/shared/transactions");
-        expect(onRefresh.mock.calls[0][3]).toBe(true);
-        expect(onHistory.mock.calls[0][2]).toBe(true);
-    });
-
-    test("Home says why there is no history and only tracked tokens while Use Blockscout is off", async () => {
-        const page = await bootPopup(unversionedValidProfile());
-        expect(page.node("home-tx-list").innerHTML).toContain(
-            escapeHtml(HISTORY_OFF_TEXT),
-        );
-        expect(page.hidden("home-tokens-note")).toBe(false);
-        cleanupPopup();
-
-        const on = await bootPopup(
-            unversionedValidProfile({ useBlockscout: true }),
-        );
-        expect(on.node("home-tx-list").innerHTML).toContain(
-            "No transactions found.",
-        );
-        expect(on.hidden("home-tokens-note")).toBe(true);
-    });
-
-    // The transaction screen, as a reopened popup draws it.
-    function onTransactionScreen(extra) {
-        return unversionedValidProfile({
-            currentView: "transaction",
-            viewStack: ["main"],
-            selectedWallet: 0,
-            selectedAddress: 0,
-            viewData: {
-                tx: {
-                    hash: TX_HASH,
-                    from: ADDRESS,
-                    to: RECIPIENT,
-                    value: "1.0000",
-                    exactValue: "1.0",
-                    symbol: "ETH",
-                    timestamp: 1790000000,
-                    isError: false,
-                    direction: "sent",
-                    directionLabel: "Sent",
-                    contractAddress: null,
-                    chainId: "0x1",
-                },
-            },
-            ...extra,
-        });
-    }
-
-    test("TransactionDetail asks Blockscout for the transaction only while Use Blockscout is on", async () => {
-        const page = await bootPopup(onTransactionScreen());
-        expect(page.visibleViews()).toEqual(["transaction"]);
-        expect(fetched().filter(blockscoutOrEtherscan)).toEqual([]);
-        expect(page.hidden("tx-detail-blockscout-note")).toBe(false);
-        cleanupPopup();
-
-        const on = await bootPopup(
-            onTransactionScreen({ useBlockscout: true }),
-        );
-        expect(fetched().filter(blockscoutOrEtherscan)).toEqual([
-            BLOCKSCOUT + "/transactions/" + TX_HASH,
-        ]);
-        expect(on.hidden("tx-detail-blockscout-note")).toBe(true);
-    });
-
-    // The confirmation screen for a send of 0.1 ETH to RECIPIENT, as a
-    // reopened popup draws it.
-    function onConfirmScreen(extra) {
-        return unversionedValidProfile({
-            currentView: "confirm-tx",
-            viewStack: ["main"],
-            selectedWallet: 0,
-            selectedAddress: 0,
-            viewData: {
-                pendingTx: {
-                    token: "ETH",
-                    from: ADDRESS,
-                    to: RECIPIENT,
-                    amount: "0.1",
-                    chainId: "0x1",
-                },
-            },
-            ...extra,
-        });
-    }
-
-    test("ConfirmTx asks Etherscan about the recipient only while Check recipients on Etherscan is on", async () => {
-        const page = await bootPopup(onConfirmScreen());
-        expect(page.visibleViews()).toEqual(["confirm-tx"]);
-        expect(fetched().filter(blockscoutOrEtherscan)).toEqual([]);
-        expect(page.hidden("confirm-etherscan-note")).toBe(false);
-        expect(page.hidden("confirm-etherscan-warning")).toBe(true);
-        cleanupPopup();
-
-        const on = await bootPopup(
-            onConfirmScreen({ checkRecipientsOnEtherscan: true }),
-        );
-        expect(fetched().filter(blockscoutOrEtherscan)).toEqual([
-            "https://etherscan.io/address/" + RECIPIENT,
-        ]);
-        expect(on.hidden("confirm-etherscan-note")).toBe(true);
-        expect(on.hidden("confirm-etherscan-warning")).toBe(false);
-    });
-
-    // Ticks or unticks a checkbox on the page, as the user does.
-    async function setBox(page, id, checked) {
-        const box = page.node(id);
-        box.checked = checked;
-        for (const fn of box.listeners.change) await fn();
-        await page.settle();
-    }
-
-    test("Welcome offers both settings unticked, and ticking one there stores it", async () => {
-        const page = await bootPopup(undefined);
-        expect(page.visibleViews()).toEqual(["welcome"]);
-        expect(page.node("welcome-use-blockscout").checked).toBe(false);
-        expect(page.node("welcome-check-recipients-on-etherscan").checked).toBe(
-            false,
-        );
-
-        await setBox(page, "welcome-use-blockscout", true);
-        expect(page.storage.read("autistmask").useBlockscout).toBe(true);
-        await setBox(page, "welcome-check-recipients-on-etherscan", true);
-        expect(page.storage.read("autistmask").checkRecipientsOnEtherscan).toBe(
-            true,
-        );
-    });
-
-    test("Settings shows both settings unticked, and ticking one there stores it", async () => {
-        const page = await bootPopup(unversionedValidProfile());
-        await page.click("btn-settings");
-        expect(page.node("settings-use-blockscout").checked).toBe(false);
-        expect(
-            page.node("settings-check-recipients-on-etherscan").checked,
-        ).toBe(false);
-
-        await setBox(page, "settings-use-blockscout", true);
-        expect(page.storage.read("autistmask").useBlockscout).toBe(true);
-        await setBox(page, "settings-check-recipients-on-etherscan", true);
-        expect(page.storage.read("autistmask").checkRecipientsOnEtherscan).toBe(
-            true,
-        );
-    });
-
-    // A token the user tracks, and one Blockscout reported that the user has
-    // not tracked. Both are written in lower case, as the balance rows' and
-    // the dropdown's token ids are compared below.
-    const TRACKED = "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
-    const UNTRACKED = TOKEN_ADDRESS.toLowerCase();
-    const SECOND_ADDRESS = "0x3333333333333333333333333333333333333333";
-
-    function tokenRow(address, symbol) {
-        return {
-            address,
-            name: symbol,
-            symbol,
-            decimals: 18,
-            balance: "5.0",
-            holders: 50000,
-        };
-    }
-
-    // AddressDetail of the first of two addresses, as a reopened popup draws
-    // it. Both addresses hold the tracked token. While "Use Blockscout" is on,
-    // both hold the untracked one too.
-    function onAddressDetail(useBlockscout) {
-        const profile = unversionedValidProfile({
-            useBlockscout,
-            currentView: "address",
-            viewStack: ["main"],
-            selectedWallet: 0,
-            selectedAddress: 0,
-            trackedTokens: [
-                { address: TRACKED, name: "TRK", symbol: "TRK", decimals: 18 },
-            ],
-        });
-        const wallet = profile.wallets[0];
-        wallet.nextIndex = 2;
-        wallet.addresses.push({ address: SECOND_ADDRESS, balance: "0.0" });
-        for (const addr of wallet.addresses) {
-            addr.tokenBalances = useBlockscout
-                ? [tokenRow(TRACKED, "TRK"), tokenRow(UNTRACKED, "TST")]
-                : [tokenRow(TRACKED, "TRK")];
-        }
-        return profile;
-    }
-
-    // The token ids of the options created after the first `from` elements.
-    // The page stub keeps no children, so this is where the options Send's
-    // dropdown was filled with are read.
-    function optionsSince(page, from) {
-        return page.document.created
-            .slice(from)
-            .filter((el) => el.tagName === "OPTION")
-            .map((el) => el.value.toLowerCase());
-    }
-
-    test("unticking Use Blockscout from AddressDetail's gear takes the untracked token off AddressDetail, Send's dropdown and Home on Back", async () => {
-        const page = await bootPopup(onAddressDetail(true));
-        expect(page.visibleViews()).toEqual(["address"]);
-        expect(page.node("address-balances").innerHTML).toContain(UNTRACKED);
-
-        await page.click("btn-settings");
-        await setBox(page, "settings-use-blockscout", false);
-        const from = page.document.created.length;
-        await page.click("btn-settings-back");
-
-        expect(page.visibleViews()).toEqual(["address"]);
-        const balances = page.node("address-balances").innerHTML;
-        expect(balances).toContain(TRACKED);
-        expect(balances).not.toContain(UNTRACKED);
-        expect(page.hidden("address-tokens-note")).toBe(false);
-        expect(optionsSince(page, from)).toEqual([TRACKED]);
-
-        await page.click("btn-send");
-        expect(page.visibleViews()).toEqual(["send"]);
-        expect(page.hidden("send-token-dropdown")).toBe(false);
-        expect(page.hidden("send-tokens-note")).toBe(false);
-
-        await page.click("btn-send-back");
-        await page.click("btn-address-back");
-        expect(page.visibleViews()).toEqual(["main"]);
-        const home = page.node("wallet-list").innerHTML;
-        expect(home).toContain(TRACKED);
-        expect(home).not.toContain(UNTRACKED);
-
-        const stored = page.storage.read("autistmask");
-        for (const addr of stored.wallets[0].addresses) {
-            expect(
-                addr.tokenBalances.map((row) => row.address.toLowerCase()),
-            ).toEqual([TRACKED]);
-        }
-    });
-
-    // Send's dropdown was filled under the old setting, and Back cannot draw
-    // Send again. So Back lands on the screen under it.
-    test.each([
-        ["unticking", true],
-        ["ticking", false],
-    ])(
-        "%s Use Blockscout from Send's gear lands Back on AddressDetail",
-        async (_how, before) => {
-            const page = await bootPopup(onAddressDetail(before));
-            await page.click("btn-send");
-            expect(page.visibleViews()).toEqual(["send"]);
-
-            await page.click("btn-settings");
-            await setBox(page, "settings-use-blockscout", !before);
-            await page.click("btn-settings-back");
-            expect(page.visibleViews()).toEqual(["address"]);
-            expect(page.hidden("address-tokens-note")).toBe(!before);
-        },
-    );
-
-    test("Send says under its token dropdown that only tracked tokens are listed while Use Blockscout is off", async () => {
-        const off = await bootPopup(onAddressDetail(false));
-        await off.click("btn-send");
-        expect(off.hidden("send-token-dropdown")).toBe(false);
-        expect(off.hidden("send-tokens-note")).toBe(false);
-        cleanupPopup();
-
-        const on = await bootPopup(onAddressDetail(true));
-        await on.click("btn-send");
-        expect(on.hidden("send-token-dropdown")).toBe(false);
-        expect(on.hidden("send-tokens-note")).toBe(true);
-    });
-
-    test("Send opened from AddressToken shows neither the dropdown nor its line", async () => {
-        const page = await bootPopup({
-            ...onAddressDetail(false),
-            currentView: "address-token",
-            viewStack: ["main", "address"],
-            selectedToken: "ETH",
-        });
-        expect(page.visibleViews()).toEqual(["address-token"]);
-        await page.click("btn-address-token-send");
-        expect(page.visibleViews()).toEqual(["send"]);
-        expect(page.hidden("send-token-dropdown")).toBe(true);
-        expect(page.hidden("send-token-static")).toBe(false);
-    });
-
-    test("DeleteAddress says only tracked tokens are listed while Use Blockscout is off", async () => {
-        for (const useBlockscout of [false, true]) {
-            const page = await bootPopup(onAddressDetail(useBlockscout));
-            require("../src/popup/views/deleteAddress").show(0, 1);
-            expect(page.visibleViews()).toEqual(["delete-address-confirm"]);
-            expect(page.hidden("delete-address-tokens-note")).toBe(
-                useBlockscout,
-            );
-            cleanupPopup();
-        }
-    });
-
-    // The token ids of the first address's balances in the stored profile.
-    function storedTokens(page) {
-        return page.storage
-            .read("autistmask")
-            .wallets[0].addresses[0].tokenBalances.map((row) =>
-                row.address.toLowerCase(),
-            );
-    }
-
-    // Turning the setting off dropped the untracked token. A refresh that
-    // started while it was on still saves its balances when it returns, but
-    // not that token. The same refresh in the background is in
-    // tests/backgroundStateIsolation.test.js.
-    test("a refresh that returns after Use Blockscout was turned off saves its balances without the untracked token", async () => {
-        const page = await bootPopup(onAddressDetail(true));
-        const { refreshBalances: held } = require("../src/shared/balances");
-        let answer;
-        held.mockImplementationOnce(async (wallets) => {
-            await new Promise((resolve) => {
-                answer = resolve;
-            });
-            wallets[0].addresses[0].balance = "7.0";
-            wallets[0].addresses[0].tokenBalances = [
-                tokenRow(TRACKED, "TRK"),
-                tokenRow(UNTRACKED, "TST"),
-            ];
-        });
-        const ticking = page.tick();
-        await page.settle();
-
-        await page.click("btn-settings");
-        await setBox(page, "settings-use-blockscout", false);
-        answer();
-        await ticking;
-
-        expect(
-            page.storage.read("autistmask").wallets[0].addresses[0].balance,
-        ).toBe("7.0");
-        expect(storedTokens(page)).toEqual([TRACKED]);
-        await page.click("btn-settings-back");
-        expect(page.node("address-balances").innerHTML).not.toContain(
-            UNTRACKED,
-        );
-    });
-
-    // Another page saves `change` over the stored profile. The browser is not
-    // made to tell this page, so this page sees the change only by reading the
-    // stored profile.
-    function anotherPageSaves(page, change) {
-        page.storage.write("autistmask", {
-            ...page.storage.read("autistmask"),
-            ...change,
-        });
-    }
-
-    test.each([
-        ["off", true, false],
-        ["on", false, true],
-    ])(
-        "after another page turns Use Blockscout %s, this page's next refresh follows the stored setting and is saved",
-        async (_how, before, after) => {
-            const page = await bootPopup(onAddressDetail(before));
-            const { refreshBalances: held } = require("../src/shared/balances");
-            held.mockImplementationOnce(
-                async (wallets, rpcUrl, blockscoutUrl, useBlockscout) => {
-                    const addr = wallets[0].addresses[0];
-                    addr.balance = "7.0";
-                    addr.tokenBalances = useBlockscout
-                        ? [tokenRow(TRACKED, "TRK"), tokenRow(UNTRACKED, "TST")]
-                        : [tokenRow(TRACKED, "TRK")];
-                },
-            );
-
-            anotherPageSaves(page, { useBlockscout: after });
-            await page.tick();
-
-            expect(held.mock.calls.at(-1)[3]).toBe(after);
-            expect(
-                page.storage.read("autistmask").wallets[0].addresses[0].balance,
-            ).toBe("7.0");
-            expect(storedTokens(page)).toEqual(
-                after ? [TRACKED, UNTRACKED] : [TRACKED],
-            );
-            expect(page.hidden("address-tokens-note")).toBe(after);
-        },
-    );
-
-    test.each([
-        ["off", true, false],
-        ["on", false, true],
-    ])(
-        "after another page turns Check recipients on Etherscan %s, this page's next Etherscan check follows the stored setting",
-        async (_how, before, after) => {
-            const page = await bootPopup(
-                onConfirmScreen({ checkRecipientsOnEtherscan: before }),
-            );
-            anotherPageSaves(page, { checkRecipientsOnEtherscan: after });
-            const from = fetched().length;
-            require("../src/popup/views/confirmTx").show({
-                token: "ETH",
-                from: ADDRESS,
-                to: RECIPIENT,
-                amount: "0.1",
-                chainId: "0x1",
-            });
-            await page.settle();
-
-            // The page also takes the change and draws ConfirmTx again, which
-            // checks once more. So each URL asked for is counted once.
-            const asked = new Set(
-                fetched().slice(from).filter(blockscoutOrEtherscan),
-            );
-            expect([...asked]).toEqual(
-                after ? ["https://etherscan.io/address/" + RECIPIENT] : [],
-            );
-        },
-    );
-
-    // Another page's save of the whole profile with `change`, which the
-    // browser announces to this page as it announces any write.
-    async function anotherPageAnnounces(page, change) {
-        await page.storage.local.set({
-            autistmask: { ...page.storage.read("autistmask"), ...change },
-        });
-        await page.settle();
-    }
-
-    test("a page open on AddressDetail draws it again when another page turns Use Blockscout off", async () => {
-        const page = await bootPopup(onAddressDetail(true));
-        expect(page.hidden("address-tokens-note")).toBe(true);
-
-        await anotherPageAnnounces(page, { useBlockscout: false });
-
-        expect(page.visibleViews()).toEqual(["address"]);
-        expect(page.hidden("address-tokens-note")).toBe(false);
-        expect(page.node("address-balances").innerHTML).not.toContain(
-            UNTRACKED,
-        );
-        expect(storedTokens(page)).toEqual([TRACKED]);
-    });
-
-    test("a page open on ConfirmTx draws it again when another page turns Check recipients on Etherscan off", async () => {
-        const page = await bootPopup(
-            onConfirmScreen({ checkRecipientsOnEtherscan: true }),
-        );
-        expect(page.hidden("confirm-etherscan-note")).toBe(true);
-
-        await anotherPageAnnounces(page, { checkRecipientsOnEtherscan: false });
-
-        expect(page.visibleViews()).toEqual(["confirm-tx"]);
-        expect(page.hidden("confirm-etherscan-note")).toBe(false);
-    });
-});
-
-describe("the background", () => {
-    afterEach(() => {
-        delete globalThis.chrome;
-        jest.dontMock("../src/shared/balances");
-    });
-
-    // Starts the background over `profile`, fires its balance alarm, and
-    // answers with the Use Blockscout setting its refresh was handed.
-    async function settingTheRefreshIsHanded(profile) {
-        jest.resetModules();
-        let handed;
-        const called = new Promise((resolve) => {
-            handed = resolve;
-        });
-        jest.doMock("../src/shared/balances", () => ({
-            getProvider: () => ({}),
-            refreshBalances: async (...args) => handed(args[3]),
-            dropUntrackedTokens: () => {},
-        }));
-        let onAlarm = null;
-        globalThis.chrome = {
-            storage: makeStorageStub({ autistmask: profile }),
-            alarms: {
-                create: () => {},
-                get: async () => undefined,
-                clear: async () => false,
-                onAlarm: {
-                    addListener: (fn) => {
-                        onAlarm = fn;
-                    },
-                },
-            },
-            runtime: {
-                onMessage: { addListener: () => {} },
-                onConnect: { addListener: () => {} },
-                onInstalled: { addListener: () => {} },
-                onStartup: { addListener: () => {} },
-                getURL: (p) => "chrome-extension://test/" + p,
-                lastError: null,
-            },
-            windows: { onRemoved: { addListener: () => {} } },
-            tabs: { query: () => {}, sendMessage: () => {} },
-            action: { setPopup: () => {} },
-        };
-        require("../src/background/index");
-        const { BALANCE_REFRESH_ALARM } = require("../src/shared/alarms");
-        onAlarm({ name: BALANCE_REFRESH_ALARM });
-        return called;
-    }
-
-    test("hands its balance refresh the stored Use Blockscout setting", async () => {
-        const profile = { ...unversionedValidProfile(), lastBalanceRefresh: 0 };
-        expect(await settingTheRefreshIsHanded(profile)).toBe(false);
-        expect(
-            await settingTheRefreshIsHanded({
-                ...profile,
-                useBlockscout: true,
-            }),
-        ).toBe(true);
-    });
-});

tests/coldWorkerChainId.test.js

@@ -73,8 +73,6 @@ function loadColdWorker(networkId, opts) {
     jest.doMock("../src/shared/balances", () => ({
         getProvider: () => ({}),
         refreshBalances: options.refreshBalances || jest.fn(async () => {}),
-        dropUntrackedTokens: jest.requireActual("../src/shared/balances")
-            .dropUntrackedTokens,
     }));
     jest.doMock("../src/shared/phishingDomains", () => ({
         isPhishingDomain: () => false,

tests/confirmTxAmount.test.js

@@ -247,7 +247,6 @@ async function openSend(token, tokenUnits = null) {
         state.wallets,
         "https://rpc.example.invalid",
         "https://blockscout.example/api/v2",
-        true,
         state.trackedTokens,
         "mainnet",
     );

tests/confirmTxLateResult.test.js

@@ -50,14 +50,8 @@ function explorerPage(title) {
 // The explorer labels no address.
 global.fetch = jest.fn(async () => explorerPage("Etherscan"));
 
-// The Etherscan label check is made, so its box can be shown.
 const { makeStorageStub } = require("./support/storageStub");
-global.chrome = {
+global.chrome = { storage: makeStorageStub(), runtime: { sendMessage() {} } };
-    storage: makeStorageStub({
-        autistmask: { checkRecipientsOnEtherscan: true },
-    }),
-    runtime: { sendMessage() {} },
-};
 
 // A stub DOM: every id resolves to a recording element.
 const elements = new Map();

tests/confirmTxNetworkSwitch.test.js

@@ -142,19 +142,13 @@ jest.mock("../src/popup/views/txStatus", () => ({
 }));
 
 // The Etherscan label check is its only caller here: the explorer pages it
-// asks for are recorded, and nothing is fetched. The stored profile has the
+// asks for are recorded, and nothing is fetched.
-// check turned on.
 global.fetch = jest.fn(() => {
     throw new Error("tests must not perform network requests");
 });
 
 const { makeStorageStub } = require("./support/storageStub");
-global.chrome = {
+global.chrome = { storage: makeStorageStub(), runtime: { sendMessage() {} } };
-    storage: makeStorageStub({
-        autistmask: { checkRecipientsOnEtherscan: true },
-    }),
-    runtime: { sendMessage() {} },
-};
 
 // A stub DOM: every id resolves to a recording element.
 const elements = new Map();

tests/contractCreation.test.js

@@ -297,8 +297,6 @@ describe.each([
         state.selectedWallet = 0;
         state.selectedAddress = 0;
         state.selectedToken = "ETH";
-        // The history is Blockscout's.
-        state.useBlockscout = true;
     });
 
     test("a contract creation's row says so, with no colour dot and no address line", async () => {

tests/e2e/network.js

@@ -653,12 +653,6 @@ function traceEnabled(raw) {
  *   confirmed receipt instead of null, so a wait screen resolves.
  * @param {boolean} [opts.failReceiptLookup]  answer eth_getTransactionReceipt
  *   with an error, so every receipt lookup fails; read at request time.
- * @param {string} [opts.etherscanLabel]  the label Etherscan's page gives the
- *   address asked about, such as "Fake_Phishing1"; none when unset. Read at
- *   request time.
- * @param {object[]} [opts.requests]  every request this handler sees, from the
- *   popup's pages and the background worker alike, appended in order as
- *   { method, url, fromWorker }.
  * @returns {Promise<{waitForServiceWorkerTraffic: (ms: number) =>
  *   Promise<string|null>}>}
  */
@@ -697,13 +691,6 @@ async function installNetworkStubs(ctx, opts) {
             const origin = fromWorker ? "[sw] " : "[page] ";
             console.log("# routed " + origin + req.method() + " " + req.url());
         }
-        if (Array.isArray(opts.requests)) {
-            opts.requests.push({
-                method: req.method(),
-                url: req.url(),
-                fromWorker,
-            });
-        }
 
         // JSON-RPC endpoint (any host): a POST with a JSON-RPC body.
         if (req.method() === "POST") {
@@ -775,20 +762,12 @@ async function installNetworkStubs(ctx, opts) {
             return route.fulfill({ status: 204, body: "" });
         }
 
-        // Best-effort Etherscan address labels: served as an empty page, or
+        // Best-effort Etherscan address labels: served as an empty page.
-        // as a page labelling the address with opts.etherscanLabel.
         if (url.hostname.endsWith("etherscan.io")) {
-            const title = opts.etherscanLabel
-                ? "<title>" +
-                  opts.etherscanLabel +
-                  " | Address: " +
-                  p.split("/").pop() +
-                  " | Etherscan</title>"
-                : "";
             return route.fulfill({
                 status: 200,
                 contentType: "text/html",
-                body: "<html><head>" + title + "</head><body></body></html>",
+                body: "<html><body></body></html>",
             });
         }
 

tests/e2e/run.js

@@ -269,65 +269,6 @@ test("the exact confirmation phrase erases the record and reloads into Welcome (
     }
 });
 
-// ------------------ Blockscout and Etherscan are sent no user data (#668)
-//
-// A fresh install sends Blockscout and Etherscan none of the user's data until
-// the user turns on "Use Blockscout" or "Check recipients on Etherscan". One
-// request is made with the setting off: pressing "Save" beside the Blockscout
-// URL asks that URL for `/stats`. It carries no user data.
-//
-// The route handler in tests/e2e/network.js records every request the
-// extension makes in env.routeOpts.requests, from its pages and its background
-// worker. Recording starts when launch() in tests/e2e/harness.js installs that
-// handler, before the first popup page opens. A request the background worker
-// makes while it starts up comes earlier and is not recorded.
-//
-// Before either setting is changed, these tests drive Home, AddressDetail,
-// AddressToken and ConfirmTx, and the background's own balance refresh. Then
-// they turn each setting on and watch its requests start. "Use Blockscout" is
-// also turned off once and on again, to see a token the user has not tracked
-// leave every list. TransactionDetail, which also asks Blockscout, is left to
-// the unit tests in tests/blockscoutEtherscanSettings.test.js.
-
-// What the three transaction lists say while Use Blockscout is off. Written
-// out here rather than imported, so the assertion does not compare the popup
-// with itself.
-const HISTORY_OFF =
-    'No transaction history is shown, because "Use Blockscout" is off in Settings.';
-
-// The requests made so far to Blockscout or Etherscan.
-function explorerRequests(env) {
-    return env.routeOpts.requests.filter(({ url }) => {
-        const host = new URL(url).hostname;
-        return host.endsWith("blockscout.com") || host.endsWith("etherscan.io");
-    });
-}
-
-// Waits until the list `listId` shows the line saying "Use Blockscout" is off.
-async function waitForHistoryOff(page, listId) {
-    await page.waitForFunction(
-        ([id, want]) => document.getElementById(id).textContent.trim() === want,
-        [listId, HISTORY_OFF],
-        { timeout: 15000 },
-    );
-}
-
-test("Welcome offers Use Blockscout and Check recipients on Etherscan, both unticked (#668)", async (env) => {
-    await visible(env.page, "#view-welcome");
-    for (const id of [
-        "welcome-use-blockscout",
-        "welcome-check-recipients-on-etherscan",
-    ]) {
-        const st = await controlState(env.page, id);
-        assert(st !== null, "Welcome has no #" + id);
-        assert(
-            st.tag === "input" && st.type === "checkbox",
-            "#" + id + " is a <" + st.tag + " type=" + st.type + ">",
-        );
-        assert(st.checked === false, "#" + id + " is ticked on a new install");
-    }
-});
-
 // The address scan that follows creating the wallet is held, so the popup
 // reloads while it is in flight. As for the reloads mid-refresh further down,
 // the assertion for that is the harness's own: a console.error from the page
@@ -355,261 +296,6 @@ test("wallet creation through the UI reaches the main view, and reloading mid-sc
     assert(addrCount > 0, "no addresses rendered in the wallet list");
 });
 
-test("with neither setting changed, Home, AddressDetail, AddressToken and ConfirmTx say what is off (#668)", async (env) => {
-    // Funded, so Send leads to the confirmation screen.
-    env.routeOpts.ethBalanceWei = toHexWei(FUNDED_ETH_WEI);
-    try {
-        await visible(env.page, "#view-main");
-        await waitForHistoryOff(env.page, "home-tx-list");
-        await visible(env.page, "#home-tokens-note");
-        await env.page.waitForFunction(
-            (want) =>
-                document
-                    .getElementById("wallet-list")
-                    .textContent.includes(want),
-            quantity(FUNDED_ETH_WEI),
-            { timeout: 60000 },
-        );
-
-        await openAddressDetail(env.page);
-        await waitForHistoryOff(env.page, "tx-list");
-        await visible(env.page, "#address-tokens-note");
-
-        await env.page.locator('#address-balances [data-token="ETH"]').click();
-        await visible(env.page, "#view-address-token");
-        await waitForHistoryOff(env.page, "address-token-tx-list");
-        await env.page.click("#btn-address-token-back");
-        await visible(env.page, "#view-address");
-
-        await goToConfirm(env.page, {
-            token: "ETH",
-            balance: FUNDED_ETH_TEXT + " ETH",
-            amount: COMFORTABLE_AMOUNT,
-        });
-        await waitForEstimate(env.page);
-        await visible(env.page, "#confirm-etherscan-note");
-        assert(
-            !(await env.page.isVisible("#confirm-etherscan-warning")),
-            "ConfirmTx keeps the Etherscan warning's place while no Etherscan check is made",
-        );
-        await backToAddress(env.page);
-    } finally {
-        env.routeOpts.ethBalanceWei = null;
-    }
-});
-
-// The background refreshes balances on its alarm, once a minute. It skips a
-// refresh when the stored record says one ran in the last 30 seconds, and the
-// open popup's own refresh runs every 10. So the popup is closed first. The
-// background worker then writes that record back to say no refresh has run, as
-// another extension page saving it would.
-test("with neither setting changed, nothing has reached Blockscout or Etherscan, the background's refresh included (#668)", async (env) => {
-    await waitForPersisted(
-        env.page,
-        "currentView",
-        "address",
-        "before the popup is closed",
-    );
-    await env.page.close();
-    const [worker] = env.ctx.serviceWorkers();
-    await worker.evaluate(
-        () =>
-            new Promise((resolve) => {
-                chrome.storage.local.get("autistmask", (r) => {
-                    const record = r.autistmask;
-                    record.lastBalanceRefresh = 0;
-                    chrome.storage.local.set({ autistmask: record }, resolve);
-                });
-            }),
-    );
-    const before = env.routeOpts.requests.length;
-    const deadline = Date.now() + 75000;
-    while (
-        !env.routeOpts.requests
-            .slice(before)
-            .some((r) => r.fromWorker && r.method === "POST")
-    ) {
-        assert(
-            Date.now() < deadline,
-            "the background's balance refresh never asked the RPC endpoint",
-        );
-        await sleep(250);
-    }
-    // Its RPC reads and any Blockscout request start together.
-    await sleep(3000);
-
-    const seen = explorerRequests(env);
-    assert(
-        seen.length === 0,
-        "a fresh install asked Blockscout or Etherscan: " +
-            JSON.stringify(seen),
-    );
-    // The watch saw the popup's own traffic as well as the worker's.
-    assert(
-        env.routeOpts.requests.some((r) => !r.fromWorker),
-        "no request from the popup was recorded",
-    );
-    // It reopens on the address screen the test above left it on.
-    env.page = await openPopup(env.ctx, env.popupUrl);
-    await visible(env.page, "#view-address");
-});
-
-// Ticked from AddressDetail's gear, so Back lands on the screen that said the
-// setting is off.
-test("turning on Use Blockscout from AddressDetail's gear asks Blockscout for that screen's history on Back, then for the tokens (#668)", async (env) => {
-    await openAddressDetail(env.page);
-    await waitForHistoryOff(env.page, "tx-list");
-    await openSettings(env.page);
-    await env.page.check("#settings-use-blockscout");
-    await waitForPersisted(env.page, "useBlockscout", true, "once ticked");
-    const historyAsked = env.page.waitForRequest(
-        (r) =>
-            r.url().includes("blockscout.com") &&
-            r.url().endsWith("/transactions"),
-    );
-    const tokensAsked = env.page.waitForRequest(
-        (r) => r.url().endsWith("/token-balances"),
-        { timeout: 30000 },
-    );
-    await env.page.click("#btn-settings-back");
-    await visible(env.page, "#view-address");
-    await historyAsked;
-    await env.page.waitForFunction(
-        () =>
-            document
-                .getElementById("tx-list")
-                .textContent.includes("No transactions found."),
-        null,
-        { timeout: 15000 },
-    );
-    assert(
-        !(await env.page.isVisible("#address-tokens-note")),
-        "AddressDetail still says only tracked tokens are listed",
-    );
-
-    await goHome(env.page);
-    await tokensAsked;
-    await env.page.waitForFunction(
-        () =>
-            document
-                .getElementById("home-tx-list")
-                .textContent.includes("No transactions found."),
-        null,
-        { timeout: 15000 },
-    );
-    assert(
-        !(await env.page.isVisible("#home-tokens-note")),
-        "Home still says only tracked tokens are listed",
-    );
-});
-
-// Unticked from AddressDetail's gear while the address holds the stub token,
-// which the user has not tracked and only Blockscout reports. Ticked again at
-// the end, so the rest of the run has Blockscout as before.
-test("turning off Use Blockscout from AddressDetail's gear takes an untracked token off AddressDetail, Send and Home on Back (#668)", async (env) => {
-    env.routeOpts.ethBalanceWei = toHexWei(FUNDED_ETH_WEI);
-    env.routeOpts.seedTokenBalance = true;
-    const tokenRow = '[data-token="' + STUB_TOKEN.address + '"]';
-    try {
-        await settleOnMain(env, { ethWei: FUNDED_ETH_WEI, expectToken: true });
-        await openAddressDetail(env.page);
-        await visible(env.page, "#address-balances " + tokenRow);
-
-        await openSettings(env.page);
-        await env.page.uncheck("#settings-use-blockscout");
-        await waitForPersisted(
-            env.page,
-            "useBlockscout",
-            false,
-            "once unticked",
-        );
-        await env.page.click("#btn-settings-back");
-        await visible(env.page, "#view-address");
-        await visible(env.page, "#address-tokens-note");
-        assert(
-            (await env.page
-                .locator("#address-balances " + tokenRow)
-                .count()) === 0,
-            "AddressDetail still lists the untracked token",
-        );
-
-        await env.page.click("#btn-send");
-        await visible(env.page, "#view-send");
-        await visible(env.page, "#send-tokens-note");
-        const offered = await env.page.$$eval("#send-token option", (opts) =>
-            opts.map((opt) => opt.value.toLowerCase()),
-        );
-        assert(
-            !offered.includes(STUB_TOKEN.address),
-            "Send's dropdown still offers the untracked token",
-        );
-        await env.page.click("#btn-send-back");
-        await visible(env.page, "#view-address");
-
-        await goHome(env.page);
-        await visible(env.page, "#home-tokens-note");
-        assert(
-            (await env.page.locator("#wallet-list " + tokenRow).count()) === 0,
-            "Home still lists the untracked token",
-        );
-    } finally {
-        await openSettings(env.page);
-        await env.page.check("#settings-use-blockscout");
-        await waitForPersisted(env.page, "useBlockscout", true, "ticked again");
-        await env.page.click("#btn-settings-back");
-        env.routeOpts.ethBalanceWei = null;
-        env.routeOpts.seedTokenBalance = false;
-    }
-});
-
-// Ticked from ConfirmTx's gear, so Back lands on the screen that said no
-// Etherscan check was made. Left on for the rest of the run, so the later
-// confirmation screens are driven with the check made.
-test("turning on Check recipients on Etherscan from ConfirmTx's gear has ConfirmTx ask Etherscan on Back and show its label (#668)", async (env) => {
-    env.routeOpts.ethBalanceWei = toHexWei(FUNDED_ETH_WEI);
-    env.routeOpts.etherscanLabel = "Fake_Phishing668";
-    try {
-        await settleOnMain(env, { ethWei: FUNDED_ETH_WEI });
-        await goToConfirm(env.page, {
-            token: "ETH",
-            balance: FUNDED_ETH_TEXT + " ETH",
-            amount: COMFORTABLE_AMOUNT,
-        });
-        await visible(env.page, "#confirm-etherscan-note");
-
-        await openSettings(env.page);
-        await env.page.check("#settings-check-recipients-on-etherscan");
-        await waitForPersisted(
-            env.page,
-            "checkRecipientsOnEtherscan",
-            true,
-            "once ticked",
-        );
-        const before = env.routeOpts.requests.length;
-        await env.page.click("#btn-settings-back");
-        await visible(env.page, "#view-confirm-tx");
-        await visible(env.page, "#confirm-etherscan-warning", 30000);
-        assert(
-            !(await env.page.isVisible("#confirm-etherscan-note")),
-            "ConfirmTx says no Etherscan check was made, with the check on",
-        );
-        const asked = env.routeOpts.requests
-            .slice(before)
-            .map((r) => r.url.toLowerCase())
-            .filter((url) => url.includes("etherscan.io"));
-        assert(
-            asked.length === 1 &&
-                asked[0] ===
-                    "https://etherscan.io/address/" + STUB_COUNTERPARTY,
-            "ConfirmTx asked Etherscan for " + JSON.stringify(asked),
-        );
-        await backToAddress(env.page);
-    } finally {
-        env.routeOpts.ethBalanceWei = null;
-        env.routeOpts.etherscanLabel = null;
-    }
-});
-
 test("add token screen opens from address detail (#150)", async (env) => {
     await openAddressDetail(env.page);
     await env.page.click("#btn-add-token");
@@ -965,7 +651,8 @@ test("a token added by its contract address is listed on the address screen (#15
     await visible(env.page, "#view-address");
 
     // No wait: the confirm renders the balance list before it shows the
-    // screen, and nothing renders the list again while the screen is up.
+    // screen. The refresh it starts draws the list again, with the row still
+    // in it.
     const row = env.page.locator(
         '#address-balances [data-token="' + STUB_TOKEN.address + '"]',
         { hasText: STUB_TOKEN.symbol },
@@ -3794,24 +3481,6 @@ function hostileSymbolState(page, tokenAddress) {
 }
 
 test("a token whose symbol() returns markup renders as text (#307)", async (env) => {
-    // The stub token is no longer tracked from here on, so the explorer is
-    // what lists it, as it lists a token airdropped to the victim. A tracked
-    // token is listed from the RPC endpoint under the symbol it was added
-    // with, which the hostile symbol below never reaches
-    // (https://git.eeqj.de/sneak/AutistMask/issues/669).
-    await env.page.click("#btn-settings");
-    await visible(env.page, "#view-settings");
-    await env.page.click("#settings-tracked-tokens .btn-remove-token");
-    // The list is drawn again once the removal is saved.
-    await env.page.waitForFunction(
-        () =>
-            document
-                .getElementById("settings-tracked-tokens")
-                .innerText.trim() === "None",
-    );
-    await env.page.click("#btn-settings-back");
-    await visible(env.page, "#view-address");
-
     env.routeOpts.ethBalanceWei = toHexWei(FUNDED_ETH_WEI);
     env.routeOpts.seedTokenBalance = true;
     env.routeOpts.tokenSymbolOverride = HOSTILE_SYMBOL;
@@ -5572,17 +5241,10 @@ async function main() {
         seedReceipt: false,
         // Whether eth_getTransactionReceipt fails instead of answering (#315).
         failReceiptLookup: false,
-        // The label Etherscan's page gives an address, when it gives one
-        // (#668).
-        etherscanLabel: null,
         // Every raw signed transaction handed to eth_sendRawTransaction, in
         // order. The dApp transaction round trip asserts against these bytes
         // rather than against anything the extension reported about them.
         broadcastTransactions: [],
-        // Every request the extension makes, in order, from when launch()
-        // installs the route handler, before the first popup page opens
-        // (#668).
-        requests: [],
     };
 
     let session;

tests/ensOffchainLookup.test.js

@@ -1,113 +0,0 @@
-// ENS lookups ask nothing but the RPC endpoint. A resolver can answer that a
-// name is resolved off-chain, naming a web address to fetch the answer from.
-// ethers fetches it unless the provider has `disableCcipRead` set. That request
-// would carry the name to a server other than the RPC endpoint
-// (https://git.eeqj.de/sneak/AutistMask/issues/668). With the flag set, such a
-// name does not resolve.
-//
-// The provider getProvider() builds runs against a fake JSON-RPC node. Its
-// answers go through ethers' own request hook, which also records the address
-// of every request ethers makes, the off-chain fetch included.
-
-const { FetchRequest, Interface } = require("ethers");
-const { getProvider } = require("../src/shared/balances");
-
-const RPC_URL = "https://rpc.example.invalid";
-const RESOLVER = "0x5555555555555555555555555555555555555555";
-const USER = "0x1111111111111111111111111111111111111111";
-const NAME = "offchain.eth";
-
-// The ENS registry's resolver(), and the resolver's functions ethers calls:
-//
-//   - the registry names RESOLVER for every name
-//   - the resolver says it resolves names through resolve()
-//   - it gives NAME as the reverse record of any address
-//   - it answers resolve() with the OffchainLookup error, which says the name
-//     is resolved off-chain
-const ens = new Interface([
-    "function resolver(bytes32) view returns (address)",
-    "function supportsInterface(bytes4) view returns (bool)",
-    "function name(bytes32) view returns (string)",
-    "function resolve(bytes, bytes) view returns (bytes)",
-    "error OffchainLookup(address sender, string[] urls, bytes callData, bytes4 callbackFunction, bytes extraData)",
-]);
-
-let asked;
-
-// One JSON-RPC answer. Anything but a call to one of the functions above is
-// refused.
-function reply(req) {
-    const envelope = { jsonrpc: "2.0", id: req.id };
-    const call =
-        req.method === "eth_call" ? ens.parseTransaction(req.params[0]) : null;
-    if (call === null) {
-        return {
-            ...envelope,
-            error: { code: -32601, message: "method not found" },
-        };
-    }
-    if (call.name === "resolve") {
-        const offchain = ens.encodeErrorResult("OffchainLookup", [
-            RESOLVER,
-            ["https://gateway.example.invalid/{sender}/{data}.json"],
-            "0x1234",
-            "0x12345678",
-            "0x",
-        ]);
-        return {
-            ...envelope,
-            error: { code: 3, message: "execution reverted", data: offchain },
-        };
-    }
-    const answers = {
-        resolver: [RESOLVER],
-        supportsInterface: [true],
-        name: [NAME],
-    };
-    return {
-        ...envelope,
-        result: ens.encodeFunctionResult(call.name, answers[call.name]),
-    };
-}
-
-beforeEach(() => {
-    asked = [];
-    FetchRequest.registerGetUrl(async (req) => {
-        asked.push(req.url);
-        // Any other address is the off-chain fetch, answered as not found.
-        if (req.url !== RPC_URL) {
-            return {
-                statusCode: 404,
-                statusMessage: "Not Found",
-                headers: {},
-                body: null,
-            };
-        }
-        const body = JSON.parse(Buffer.from(req.body).toString("utf8"));
-        const answer = Array.isArray(body) ? body.map(reply) : reply(body);
-        return {
-            statusCode: 200,
-            statusMessage: "OK",
-            headers: { "content-type": "application/json" },
-            body: Buffer.from(JSON.stringify(answer)),
-        };
-    });
-});
-
-afterEach(() => {
-    FetchRequest.registerGetUrl(FetchRequest.createGetUrlFunc());
-});
-
-test("a name typed into Send that is resolved off-chain does not resolve, and only the RPC endpoint is asked", async () => {
-    const provider = getProvider(RPC_URL, "mainnet");
-    const [outcome] = await Promise.allSettled([provider.resolveName(NAME)]);
-    expect(asked.filter((url) => url !== RPC_URL)).toEqual([]);
-    expect(outcome).toEqual({ status: "fulfilled", value: null });
-});
-
-test("the reverse lookup of a user's address whose name is resolved off-chain finds no name, and only the RPC endpoint is asked", async () => {
-    const provider = getProvider(RPC_URL, "mainnet");
-    const [outcome] = await Promise.allSettled([provider.lookupAddress(USER)]);
-    expect(asked.filter((url) => url !== RPC_URL)).toEqual([]);
-    expect(outcome).toEqual({ status: "fulfilled", value: null });
-});

tests/fabricatedDecimals.test.js

@@ -114,7 +114,6 @@ async function fetchOnto(items, trackedTokens = []) {
     const balances = await fetchTokenBalances(
         HOLDER,
         BLOCKSCOUT,
-        true,
         trackedTokens,
     );
     state.trackedTokens = trackedTokens;

tests/flashLine.test.js

@@ -88,6 +88,7 @@ describe.each([
             showFlash: (msg) => flashes.push(msg),
             escapeHtml: (s) => s,
             goBack: () => {},
+            trackToken: () => {},
         }));
 
         require("../src/popup/views/" + view).init({

tests/holders.test.js

@@ -150,23 +150,19 @@ describe("the balance-list spam gate", () => {
 
     test("a token with plenty of reported holders is listed", async () => {
         respondWith([item()]);
-        const balances = await fetchTokenBalances(HOLDER, BLOCKSCOUT, true, []);
+        const balances = await fetchTokenBalances(HOLDER, BLOCKSCOUT, []);
         expect(balances).toHaveLength(1);
         expect(balances[0].holders).toBe(50000);
     });
 
     test("a token reporting zero holders is still excluded", async () => {
         respondWith([item({ token: { holders_count: "0" } })]);
-        expect(await fetchTokenBalances(HOLDER, BLOCKSCOUT, true, [])).toEqual(
+        expect(await fetchTokenBalances(HOLDER, BLOCKSCOUT, [])).toEqual([]);
-            [],
-        );
     });
 
     test("an unknown holder count does not admit an unvouched token", async () => {
         respondWith([item({ token: { holders_count: null } })]);
-        expect(await fetchTokenBalances(HOLDER, BLOCKSCOUT, true, [])).toEqual(
+        expect(await fetchTokenBalances(HOLDER, BLOCKSCOUT, [])).toEqual([]);
-            [],
-        );
     });
 
     // The path that reaches the send selector and the history filter: a token
@@ -175,7 +171,7 @@ describe("the balance-list spam gate", () => {
     // zero that would then hide it downstream.
     test("a tracked token with an unknown count is listed with holders null", async () => {
         respondWith([item({ token: { holders_count: undefined } })]);
-        const balances = await fetchTokenBalances(HOLDER, BLOCKSCOUT, true, [
+        const balances = await fetchTokenBalances(HOLDER, BLOCKSCOUT, [
             { address: NOVEL_TOKEN.toUpperCase() },
         ]);
         expect(balances).toHaveLength(1);
@@ -192,7 +188,7 @@ describe("the balance-list spam gate", () => {
                 },
             }),
         ]);
-        const balances = await fetchTokenBalances(HOLDER, BLOCKSCOUT, true, []);
+        const balances = await fetchTokenBalances(HOLDER, BLOCKSCOUT, []);
         expect(balances).toHaveLength(1);
         expect(balances[0].holders).toBeNull();
     });

tests/nativeCurrency.test.js

@@ -436,8 +436,6 @@ describe.each([
         });
 
         test("the transaction detail screen's type line and fee", async () => {
-            // The fee is Blockscout's.
-            state.useBlockscout = true;
             debugFetch.mockImplementationOnce(async () => ({
                 ok: true,
                 status: 200,

tests/persistedEntryFloors.test.js

@@ -286,12 +286,8 @@ describe("a malformed fraudContracts", () => {
     function stubSendDocument() {
         const select = { innerHTML: "", children: [] };
         select.appendChild = (child) => select.children.push(child);
-        const elements = {
-            "send-token": select,
-            "send-tokens-note": { classList: { toggle: () => {} } },
-        };
         globalThis.document = {
-            getElementById: (id) => elements[id] || null,
+            getElementById: (id) => (id === "send-token" ? select : null),
             createElement: () => ({ value: "", textContent: "" }),
         };
         return select;

tests/persistedFieldContract.test.js

@@ -629,14 +629,6 @@ const CONTRACT = [
         // the falsy answer is also the DEFAULT_STATE default.
         falsy: [0],
     })),
-    // Each lets a request reach another service, so anything but true is off.
-    ...["useBlockscout", "checkRecipientsOnEtherscan"].map((field) => ({
-        field,
-        kind: KIND.SCALAR,
-        hostile: [42, "notabool", { a: 1 }],
-        floorOnly: [0, null, "true"],
-        holds: (v) => v === false,
-    })),
 ];
 
 function siteMapHolds(v) {

tests/popupBoot.test.js

@@ -44,9 +44,7 @@ test("a flash message's timer does not fire after cleanupPopup()", async () => {
 
 // A boot onto a screen that sends a request no mocked module answers: that
 // request reaches the boot's fetch() stub, never the internet
-// (https://git.eeqj.de/sneak/AutistMask/issues/559). TransactionDetail asks
+// (https://git.eeqj.de/sneak/AutistMask/issues/559).
-// Blockscout only while "Use Blockscout" is on. ConfirmTx asks Etherscan only
-// while "Check recipients on Etherscan" is on. So the profile turns both on.
 function restoringOnto(view, viewData) {
     return unversionedValidProfile({
         currentView: view,
@@ -54,8 +52,6 @@ function restoringOnto(view, viewData) {
         selectedAddress: 0,
         viewStack: ["main"],
         viewData,
-        useBlockscout: true,
-        checkRecipientsOnEtherscan: true,
     });
 }
 

tests/popupFollowsNetworkSwitch.test.js

@@ -87,7 +87,7 @@ test("the popup open on AddressDetail shows the new network and its balances", a
     // Its next refresh runs on Sepolia, and what it fetched is stored.
     await page.tick();
     const { refreshBalances } = require("../src/shared/balances");
-    expect(refreshBalances.mock.lastCall[5]).toBe("sepolia");
+    expect(refreshBalances.mock.lastCall[4]).toBe("sepolia");
     const stored = page.storage.read("autistmask");
     expect(stored.networkId).toBe("sepolia");
     expect(stored.lastBalanceRefresh).toBeGreaterThan(0);

tests/rpcErrorLog.test.js

@@ -88,7 +88,6 @@ test("the balance refresh", async () => {
         wallets,
         RPC_URL,
         "https://explorer.example.invalid/api/v2",
-        true,
         [],
         "mainnet",
     );

tests/sendDisplayFloor.test.js

@@ -224,7 +224,6 @@ async function refreshWith(balanceWei, tokenItems = []) {
         state.wallets,
         "https://rpc.example.invalid",
         "https://blockscout.example/api/v2",
-        true,
         state.trackedTokens,
         "mainnet",
     );

tests/sendMax.test.js

@@ -217,7 +217,6 @@ async function refreshWith(balanceWei, tokenItems = []) {
         state.wallets,
         "https://rpc.example.invalid",
         "https://blockscout.example/api/v2",
-        true,
         state.trackedTokens,
         "mainnet",
     );

tests/sendTokenSelect.test.js

@@ -27,12 +27,8 @@ let select;
 function installStubDocument() {
     select = { innerHTML: "", children: [] };
     select.appendChild = (child) => select.children.push(child);
-    const elements = {
-        "send-token": select,
-        "send-tokens-note": { classList: { toggle: () => {} } },
-    };
     globalThis.document = {
-        getElementById: (id) => elements[id] || null,
+        getElementById: (id) => (id === "send-token" ? select : null),
         createElement: () => ({ value: "", textContent: "" }),
     };
 }

tests/stateRecovery.test.js

@@ -523,15 +523,13 @@ describe("a garbage value in a field the gate does not check", () => {
     });
 
     test("a malformed tokenBalances entry is dropped, and the wallet and its address survive", async () => {
-        // "Use Blockscout" is on, or the boot's balance refresh drops the
+        const env = await bootPopup(
-        // well-formed entry too: the user has not tracked its token.
+            profileWithTokenBalances([
-        const profile = profileWithTokenBalances([
+                null,
-            null,
+                42,
-            42,
+                { address: TOKEN_ADDRESS, symbol: "AAA", balance: "2.0" },
-            { address: TOKEN_ADDRESS, symbol: "AAA", balance: "2.0" },
+            ]),
-        ]);
+        );
-        profile.useBlockscout = true;
-        const env = await bootPopup(profile);
 
         const stored = env.storage.read("autistmask");
         expect(stored.wallets[0].encryptedSecret).toBe("encrypted-secret-1");

tests/support/popupBoot.js

@@ -283,8 +283,6 @@ async function bootPopup(stored, options) {
     jest.doMock("../../src/shared/balances", () => ({
         fetchTokenBalances: jest.fn(async () => []),
         refreshBalances: jest.fn(async () => {}),
-        dropUntrackedTokens: jest.requireActual("../../src/shared/balances")
-            .dropUntrackedTokens,
         lookupTokenInfo: jest.fn(async () => null),
         getProvider: () => ({}),
         scanForAddresses: jest.fn(async () => ({

tests/symbolSpoof.test.js

@@ -485,12 +485,8 @@ describe("surface 2: the Send token selector", () => {
     function render(tokenBalances) {
         select = { innerHTML: "", children: [] };
         select.appendChild = (child) => select.children.push(child);
-        const elements = {
-            "send-token": select,
-            "send-tokens-note": { classList: { toggle: () => {} } },
-        };
         globalThis.document = {
-            getElementById: (id) => elements[id] || null,
+            getElementById: (id) => (id === "send-token" ? select : null),
             createElement: () => ({ value: "", textContent: "" }),
         };
         renderSendTokenSelect({
@@ -586,14 +582,12 @@ describe("surface 3: the balance list", () => {
     // 1,000-holder floor and was listed as a holding named ETH.
     test("a fake ETH token clearing the holder floor is filtered", async () => {
         respondWith([fakeEthItem()]);
-        expect(await fetchTokenBalances(HOLDER, BLOCKSCOUT, true, [])).toEqual(
+        expect(await fetchTokenBalances(HOLDER, BLOCKSCOUT, [])).toEqual([]);
-            [],
-        );
     });
 
     test("tracking the fake token manually does not admit it either", async () => {
         respondWith([fakeEthItem({ holders_count: "0" })]);
-        const balances = await fetchTokenBalances(HOLDER, BLOCKSCOUT, true, [
+        const balances = await fetchTokenBalances(HOLDER, BLOCKSCOUT, [
             { address: FAKE_ETH_CONTRACT },
         ]);
         expect(balances).toEqual([]);
@@ -603,16 +597,12 @@ describe("surface 3: the balance list", () => {
     // their belief about what they own, and it renders the symbol into HTML.
     test("a padded fake ETH token is filtered too", async () => {
         respondWith([fakeEthItem({ symbol: " ETH " })]);
-        expect(await fetchTokenBalances(HOLDER, BLOCKSCOUT, true, [])).toEqual(
+        expect(await fetchTokenBalances(HOLDER, BLOCKSCOUT, [])).toEqual([]);
-            [],
-        );
     });
 
     test("a fake ETH token padded with a no-break space is filtered", async () => {
         respondWith([fakeEthItem({ symbol: NBSP + "ETH" + NBSP })]);
-        expect(await fetchTokenBalances(HOLDER, BLOCKSCOUT, true, [])).toEqual(
+        expect(await fetchTokenBalances(HOLDER, BLOCKSCOUT, [])).toEqual([]);
-            [],
-        );
     });
 
     // The false-positive direction on the surface that matters most: a real
@@ -627,7 +617,7 @@ describe("surface 3: the balance list", () => {
                 decimals: "6",
             }),
         ]);
-        const balances = await fetchTokenBalances(HOLDER, BLOCKSCOUT, true, []);
+        const balances = await fetchTokenBalances(HOLDER, BLOCKSCOUT, []);
         expect(balances).toHaveLength(1);
         expect(balances[0].symbol).toBe(" USDC ");
     });
@@ -641,7 +631,7 @@ describe("surface 3: the balance list", () => {
                 decimals: "6",
             }),
         ]);
-        const balances = await fetchTokenBalances(HOLDER, BLOCKSCOUT, true, []);
+        const balances = await fetchTokenBalances(HOLDER, BLOCKSCOUT, []);
         expect(balances).toHaveLength(1);
         expect(balances[0].symbol).toBe("USDC");
     });
@@ -652,9 +642,7 @@ describe("surface 3: the balance list", () => {
     // before the symbol rule is consulted.
     test("a non-ERC-20 row claiming ETH never reaches the symbol rule", async () => {
         respondWith([fakeEthItem({ type: "ERC-721" })]);
-        expect(await fetchTokenBalances(HOLDER, BLOCKSCOUT, true, [])).toEqual(
+        expect(await fetchTokenBalances(HOLDER, BLOCKSCOUT, [])).toEqual([]);
-            [],
-        );
     });
 
     // The adjacent finding from the same review as issue #260: the type gate
@@ -672,20 +660,16 @@ describe("surface 3: the balance list", () => {
                 decimals: "6",
             }),
         ]);
-        const balances = await fetchTokenBalances(HOLDER, BLOCKSCOUT, true, []);
+        const balances = await fetchTokenBalances(HOLDER, BLOCKSCOUT, []);
         expect(balances).toHaveLength(1);
         expect(balances[0].symbol).toBe("USDC");
     });
 
     test("case insensitivity does not admit another token type", async () => {
         respondWith([fakeEthItem({ type: "erc-721" })]);
-        expect(await fetchTokenBalances(HOLDER, BLOCKSCOUT, true, [])).toEqual(
+        expect(await fetchTokenBalances(HOLDER, BLOCKSCOUT, [])).toEqual([]);
-            [],
-        );
         respondWith([fakeEthItem({ type: "ERC-20-EXTRA" })]);
-        expect(await fetchTokenBalances(HOLDER, BLOCKSCOUT, true, [])).toEqual(
+        expect(await fetchTokenBalances(HOLDER, BLOCKSCOUT, [])).toEqual([]);
-            [],
-        );
     });
 
     // The money test: the user holds real ETH and has been airdropped a fake
@@ -698,7 +682,6 @@ describe("surface 3: the balance list", () => {
             [{ addresses: [addr] }],
             "https://rpc.example.invalid",
             BLOCKSCOUT,
-            true,
             [],
             "mainnet",
         );

tests/timestampDisplay.test.js

@@ -134,8 +134,6 @@ beforeEach(() => {
     state.selectedWallet = 0;
     state.selectedAddress = 0;
     state.selectedToken = "ETH";
-    // The history is Blockscout's.
-    state.useBlockscout = true;
 });
 
 describe.each([

tests/tokenTransferDetail.test.js

@@ -158,7 +158,6 @@ beforeEach(() => {
     globalThis.document = makeDocument();
     globalThis.window = { location: { search: "" } };
     state.blockscoutUrl = EXPLORER;
-    state.useBlockscout = true;
     state.networkEndpoints = {};
     state.wallets = [
         {
@@ -178,7 +177,6 @@ test("a token transfer's decoded details name the token contract and the amount
     const [row] = await fetchRecentTransactions(
         HOLDER,
         EXPLORER,
-        true,
         NETWORKS.mainnet.chainId,
     );
     expect(row.to).toBe(RECIPIENT);
@@ -211,7 +209,6 @@ test("with mainnet active, a Sepolia transaction is read from Sepolia's Blocksco
     const [row] = await fetchRecentTransactions(
         HOLDER,
         EXPLORER,
-        true,
         NETWORKS.sepolia.chainId,
     );
 
@@ -240,7 +237,6 @@ test("with mainnet active and no Blockscout remembered for Sepolia, a Sepolia tr
     const [row] = await fetchRecentTransactions(
         HOLDER,
         EXPLORER,
-        true,
         NETWORKS.sepolia.chainId,
     );
     mockAsked.length = 0;
@@ -262,7 +258,6 @@ async function showSepoliaTransferWithMainnetActive() {
     const [row] = await fetchRecentTransactions(
         HOLDER,
         EXPLORER,
-        true,
         NETWORKS.sepolia.chainId,
     );
     transactionDetail.show(row);

tests/trackedTokenBalances.test.js

@@ -1,304 +0,0 @@
-// The balance of each token the user tracks is read with balanceOf through the
-// RPC endpoint, for every address. Blockscout's answer gives a tracked token its
-// holder count and decimals, and adds the tokens the user has not tracked
-// (https://git.eeqj.de/sneak/AutistMask/issues/669).
-//
-// The real refreshBalances() runs against a fake JSON-RPC node, answered
-// through ethers' own request hook, and a fake Blockscout, answered through
-// fetch().
-
-const { AbiCoder, FetchRequest } = require("ethers");
-const { refreshBalances } = require("../src/shared/balances");
-
-const RPC_URL = "https://rpc.example.invalid";
-const EXPLORER_URL = "https://explorer.example.invalid/api/v2";
-const FIRST = "0x1111111111111111111111111111111111111111";
-const SECOND = "0x2222222222222222222222222222222222222222";
-
-// A token the user tracks, outside the bundled list, at 6 decimals.
-const TOKEN = "0x7777777777777777777777777777777777777777";
-const TRACKED = {
-    address: TOKEN,
-    symbol: "TRK",
-    name: "Tracked Token",
-    decimals: 6,
-};
-
-// USDC, from the bundled list, which the user does not track.
-const USDC = "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48";
-// Neither on the bundled list nor tracked.
-const OTHER = "0x8888888888888888888888888888888888888888";
-
-const ZERO_WORD = "0x" + "0".repeat(64);
-const BALANCE_OF = "0x70a08231";
-
-// What balanceOf answers, by token contract and then by holder. A pair that is
-// not here makes balanceOf fail.
-let holdings;
-// What Blockscout answers for every address; null makes the request fail.
-let explorerRows;
-let logged;
-
-// One JSON-RPC answer. A call that is not balanceOf is the ENS reverse lookup,
-// answered with no resolver, so no name.
-function reply(req) {
-    const envelope = { jsonrpc: "2.0", id: req.id };
-    if (req.method === "eth_getBalance") {
-        return { ...envelope, result: "0x0" };
-    }
-    if (req.method !== "eth_call") {
-        return {
-            ...envelope,
-            error: { code: -32601, message: "method not found" },
-        };
-    }
-    const { to, data } = req.params[0];
-    if (!data.startsWith(BALANCE_OF)) return { ...envelope, result: ZERO_WORD };
-    const holder = "0x" + data.slice(-40);
-    const amount = (holdings[to.toLowerCase()] || {})[holder];
-    if (amount === undefined) {
-        return {
-            ...envelope,
-            error: { code: -32000, message: "fixture: balanceOf failed" },
-        };
-    }
-    return {
-        ...envelope,
-        result: AbiCoder.defaultAbiCoder().encode(["uint256"], [amount]),
-    };
-}
-
-const realFetch = globalThis.fetch;
-
-beforeEach(() => {
-    holdings = {};
-    explorerRows = null;
-    logged = [];
-    jest.spyOn(console, "error").mockImplementation((...args) => {
-        logged.push(args.map(String).join(" "));
-    });
-    FetchRequest.registerGetUrl(async (req) => {
-        const body = JSON.parse(Buffer.from(req.body).toString("utf8"));
-        const answer = Array.isArray(body) ? body.map(reply) : reply(body);
-        return {
-            statusCode: 200,
-            statusMessage: "OK",
-            headers: { "content-type": "application/json" },
-            body: Buffer.from(JSON.stringify(answer)),
-        };
-    });
-    globalThis.fetch = jest.fn(async () => {
-        if (explorerRows === null) throw new TypeError("Failed to fetch");
-        return { ok: true, status: 200, json: async () => explorerRows };
-    });
-});
-
-afterEach(() => {
-    FetchRequest.registerGetUrl(FetchRequest.createGetUrlFunc());
-    globalThis.fetch = realFetch;
-    jest.restoreAllMocks();
-});
-
-// One Blockscout token-balances row.
-function explorerRow(address, symbol, value, holders = "50000") {
-    return {
-        value: String(value),
-        token: {
-            type: "ERC-20",
-            address_hash: address,
-            symbol: symbol,
-            name: symbol,
-            decimals: "6",
-            holders_count: holders,
-        },
-    };
-}
-
-// The row refreshBalances() writes for TOKEN from a balanceOf answer, with the
-// decimals and holder count Blockscout reported for it, if any.
-function trackedRow(balance, decimals = null, holders = null) {
-    return {
-        address: TOKEN,
-        name: "Tracked Token",
-        symbol: "TRK",
-        decimals: decimals,
-        balance: balance,
-        holders: holders,
-    };
-}
-
-async function refresh(addresses, trackedTokens) {
-    await refreshBalances(
-        [{ addresses }],
-        RPC_URL,
-        EXPLORER_URL,
-        true,
-        trackedTokens,
-        "mainnet",
-        new AbortController().signal,
-    );
-    return addresses;
-}
-
-test("with Blockscout failing, a tracked token's balance is read through the RPC endpoint for every address", async () => {
-    holdings[TOKEN] = { [FIRST]: 1234500000n, [SECOND]: 1n };
-    const [first, second] = await refresh(
-        [
-            { address: FIRST, tokenBalances: [] },
-            { address: SECOND, tokenBalances: [] },
-        ],
-        [TRACKED],
-    );
-    expect(first.tokenBalances).toEqual([trackedRow("1234.5")]);
-    // Exact, never cut: one base unit is not zero.
-    expect(second.tokenBalances).toEqual([trackedRow("0.000001")]);
-});
-
-test("with Blockscout failing, the untracked rows from before stay", async () => {
-    holdings[TOKEN] = { [FIRST]: 2000000n };
-    const usdc = {
-        address: USDC,
-        name: "USD Coin",
-        symbol: "USDC",
-        decimals: 6,
-        balance: "5.0",
-        holders: 50000,
-    };
-    const [first] = await refresh(
-        [{ address: FIRST, tokenBalances: [usdc] }],
-        [TRACKED],
-    );
-    expect(first.tokenBalances).toEqual([trackedRow("2.0"), usdc]);
-});
-
-test("a tracked token Blockscout also reports shows the RPC figure, and an untracked one is admitted as before", async () => {
-    holdings[TOKEN] = { [FIRST]: 2000000n };
-    explorerRows = [
-        explorerRow(TOKEN, "TRK", 9000000),
-        explorerRow(USDC, "USDC", 5000000),
-        // Too few holders, and neither on the bundled list nor tracked.
-        explorerRow(OTHER, "SPAM", 5000000, "10"),
-        // A known symbol from a contract it does not belong to.
-        explorerRow(OTHER, "USDC", 5000000),
-    ];
-    const [first] = await refresh(
-        [{ address: FIRST, tokenBalances: [] }],
-        [TRACKED],
-    );
-    expect(first.tokenBalances).toEqual([
-        trackedRow("2.0", 6, 50000),
-        {
-            address: USDC,
-            name: "USDC",
-            symbol: "USDC",
-            decimals: 6,
-            balance: "5.0",
-            holders: 50000,
-        },
-    ]);
-});
-
-test("a tracked token's entry carries the holder count and decimals Blockscout reports for it", async () => {
-    holdings[TOKEN] = { [FIRST]: 2000000n };
-    // Fewer holders than "Hide tokens with fewer than 1,000 holders" lets
-    // through to Send's token list.
-    explorerRows = [explorerRow(TOKEN, "TRK", 9000000, "10")];
-    const [first] = await refresh(
-        [{ address: FIRST, tokenBalances: [] }],
-        [TRACKED],
-    );
-    expect(first.tokenBalances).toEqual([trackedRow("2.0", 6, 10)]);
-});
-
-test("while Blockscout fails, a tracked token keeps the holder count and decimals of its entry from before", async () => {
-    holdings[TOKEN] = { [FIRST]: 2000000n };
-    const [first] = await refresh(
-        [{ address: FIRST, tokenBalances: [trackedRow("7.0", 6, 10)] }],
-        [TRACKED],
-    );
-    expect(first.tokenBalances).toEqual([trackedRow("2.0", 6, 10)]);
-});
-
-test("a failed balanceOf keeps the token's entry from before, and is logged", async () => {
-    explorerRows = [explorerRow(TOKEN, "TRK", 9000000)];
-    const before = trackedRow("7.0", 6, 50000);
-    const [first] = await refresh(
-        [{ address: FIRST, tokenBalances: [before] }],
-        [TRACKED],
-    );
-    expect(first.tokenBalances).toEqual([before]);
-    expect(logged.some((line) => line.includes("token balance failed"))).toBe(
-        true,
-    );
-});
-
-test("a failed balanceOf with no entry from before takes Blockscout's entry from this refresh", async () => {
-    // balanceOf fails at FIRST and answers at SECOND.
-    holdings[TOKEN] = { [SECOND]: 2000000n };
-    explorerRows = [explorerRow(TOKEN, "TRK", 9000000)];
-    const [first, second] = await refresh(
-        [
-            { address: FIRST, tokenBalances: [] },
-            { address: SECOND, tokenBalances: [] },
-        ],
-        [TRACKED],
-    );
-    expect(first.tokenBalances).toEqual([
-        {
-            address: TOKEN,
-            name: "TRK",
-            symbol: "TRK",
-            decimals: 6,
-            balance: "9.0",
-            holders: 50000,
-        },
-    ]);
-    // Where balanceOf answers, its figure stands.
-    expect(second.tokenBalances).toEqual([trackedRow("2.0", 6, 50000)]);
-});
-
-test("a balance of zero read through the RPC endpoint replaces the previous figure", async () => {
-    holdings[TOKEN] = { [FIRST]: 0n };
-    const [first] = await refresh(
-        [{ address: FIRST, tokenBalances: [trackedRow("7.0")] }],
-        [TRACKED],
-    );
-    expect(first.tokenBalances).toEqual([]);
-});
-
-test("a tracked token whose scale nothing knows gets no quantity, not a zero", async () => {
-    holdings[TOKEN] = { [FIRST]: 5n };
-    const [first] = await refresh(
-        [{ address: FIRST, tokenBalances: [] }],
-        [{ ...TRACKED, decimals: null }],
-    );
-    expect(first.tokenBalances).toEqual([trackedRow(null)]);
-});
-
-test("a tracked token whose scale only Blockscout reports is stated at that scale", async () => {
-    holdings[TOKEN] = { [FIRST]: 2000000n };
-    explorerRows = [explorerRow(TOKEN, "TRK", 9000000)];
-    const [first] = await refresh(
-        [{ address: FIRST, tokenBalances: [] }],
-        [{ ...TRACKED, decimals: null }],
-    );
-    expect(first.tokenBalances).toEqual([trackedRow("2.0", 6, 50000)]);
-});
-
-test("a tracked token wearing a known symbol from another contract is not listed", async () => {
-    holdings[OTHER] = { [FIRST]: 5000000n };
-    // Its entry from before goes too, although Blockscout fails.
-    const before = {
-        address: OTHER,
-        name: "Fake",
-        symbol: "USDC",
-        decimals: 6,
-        balance: "5.0",
-        holders: 50000,
-    };
-    const [first] = await refresh(
-        [{ address: FIRST, tokenBalances: [before] }],
-        [{ address: OTHER, symbol: "USDC", name: "Fake", decimals: 6 }],
-    );
-    expect(first.tokenBalances).toEqual([]);
-});

tests/trackedTokensPerNetwork.test.js

@@ -287,7 +287,6 @@ describe("Back after a switch from the Settings gear", () => {
                 currentView: "confirm-tx",
                 selectedWallet: 0,
                 selectedAddress: 0,
-                checkRecipientsOnEtherscan: true,
                 viewData: {
                     pendingTx: {
                         token: "ETH",

tests/transactionListCancelled.test.js

@@ -125,8 +125,6 @@ beforeEach(() => {
     state.selectedWallet = 0;
     state.selectedAddress = 0;
     state.selectedToken = "ETH";
-    // The history is Blockscout's.
-    state.useBlockscout = true;
 });
 
 afterEach(() => {

tests/transactions.test.js

@@ -1219,7 +1219,7 @@ describe("fetchRecentTransactions merge and dedup", () => {
 
     test("queries only the two Blockscout endpoints for the address", async () => {
         respondWith([], []);
-        await fetchRecentTransactions(VICTIM, BLOCKSCOUT, true, "0x1");
+        await fetchRecentTransactions(VICTIM, BLOCKSCOUT, "0x1");
         expect(debugFetch).toHaveBeenCalledTimes(2);
         const urls = debugFetch.mock.calls.map((c) => c[0]);
         expect(urls).toContain(
@@ -1283,12 +1283,7 @@ describe("fetchRecentTransactions merge and dedup", () => {
             ],
         );
 
-        const txs = await fetchRecentTransactions(
+        const txs = await fetchRecentTransactions(VICTIM, BLOCKSCOUT, "0x1");
-            VICTIM,
-            BLOCKSCOUT,
-            true,
-            "0x1",
-        );
         expect(txs).toHaveLength(1);
         const merged = txs[0];
         // The received leg (the swap output) supplies the display amount.
@@ -1325,12 +1320,7 @@ describe("fetchRecentTransactions merge and dedup", () => {
             ],
         );
 
-        const txs = await fetchRecentTransactions(
+        const txs = await fetchRecentTransactions(VICTIM, BLOCKSCOUT, "0x1");
-            VICTIM,
-            BLOCKSCOUT,
-            true,
-            "0x1",
-        );
         expect(txs).toHaveLength(1);
         expect(txs[0].symbol).toBe("USDC");
         expect(txs[0].value).toBe("1500.5000");
@@ -1356,12 +1346,7 @@ describe("fetchRecentTransactions merge and dedup", () => {
         });
         respondWith([], [leg("1000000"), leg("2000000")]);
 
-        const txs = await fetchRecentTransactions(
+        const txs = await fetchRecentTransactions(VICTIM, BLOCKSCOUT, "0x1");
-            VICTIM,
-            BLOCKSCOUT,
-            true,
-            "0x1",
-        );
         expect(txs).toHaveLength(1);
         // Keyed by hash plus contract, so the later leg wins.
         expect(txs[0].exactValue).toBe("2.0");
@@ -1401,12 +1386,7 @@ describe("fetchRecentTransactions merge and dedup", () => {
             ],
         );
 
-        const txs = await fetchRecentTransactions(
+        const txs = await fetchRecentTransactions(VICTIM, BLOCKSCOUT, "0x1");
-            VICTIM,
-            BLOCKSCOUT,
-            true,
-            "0x1",
-        );
         expect(txs.map((t) => t.symbol).sort()).toEqual(["USDC", "WETH"]);
     });
 
@@ -1447,12 +1427,7 @@ describe("fetchRecentTransactions merge and dedup", () => {
             ],
         );
 
-        const txs = await fetchRecentTransactions(
+        const txs = await fetchRecentTransactions(VICTIM, BLOCKSCOUT, "0x1");
-            VICTIM,
-            BLOCKSCOUT,
-            true,
-            "0x1",
-        );
         expect(txs).toHaveLength(1);
         expect(txs[0].symbol).toBe("USDC");
         expect(txs[0].exactValue).toBe("1.0");
@@ -1478,13 +1453,7 @@ describe("fetchRecentTransactions merge and dedup", () => {
         });
         respondWith([item(6), item(8), item(7)], []);
 
-        const txs = await fetchRecentTransactions(
+        const txs = await fetchRecentTransactions(VICTIM, BLOCKSCOUT, "0x1", 2);
-            VICTIM,
-            BLOCKSCOUT,
-            true,
-            "0x1",
-            2,
-        );
         expect(txs.map((t) => t.blockNumber)).toEqual([21000008, 21000007]);
     });
 
@@ -1510,7 +1479,6 @@ describe("fetchRecentTransactions merge and dedup", () => {
         const sepolia = await fetchRecentTransactions(
             VICTIM,
             BLOCKSCOUT,
-            true,
             "0xaa36a7",
         );
         expect(sepolia[0].symbol).toBe("SepoliaETH");
@@ -1519,7 +1487,6 @@ describe("fetchRecentTransactions merge and dedup", () => {
         const mainnet = await fetchRecentTransactions(
             VICTIM,
             BLOCKSCOUT,
-            true,
             "0x1",
         );
         expect(mainnet[0].symbol).toBe("ETH");
@@ -1546,12 +1513,7 @@ describe("fetchRecentTransactions merge and dedup", () => {
             ],
         );
 
-        const txs = await fetchRecentTransactions(
+        const txs = await fetchRecentTransactions(VICTIM, BLOCKSCOUT, "0x1");
-            VICTIM,
-            BLOCKSCOUT,
-            true,
-            "0x1",
-        );
         expect(txs).toHaveLength(1);
         expect(txs[0].contractAddress).toBe(FAKE_ETH_CONTRACT);
         expect(txs[0].holders).toBe(0);
@@ -1593,7 +1555,6 @@ describe("fetchRecentTransactions merge and dedup", () => {
             const txs = await fetchRecentTransactions(
                 VICTIM,
                 BLOCKSCOUT,
-                true,
                 "0x1",
             );
             expect(txs[0].holders).toBeNull();
@@ -1604,7 +1565,6 @@ describe("fetchRecentTransactions merge and dedup", () => {
             const txs = await fetchRecentTransactions(
                 VICTIM,
                 BLOCKSCOUT,
-                true,
                 "0x1",
             );
             expect(txs[0].holders).toBeNull();
@@ -1615,7 +1575,6 @@ describe("fetchRecentTransactions merge and dedup", () => {
             const txs = await fetchRecentTransactions(
                 VICTIM,
                 BLOCKSCOUT,
-                true,
                 "0x1",
             );
             expect(filterTransactions(txs, filters()).transactions).toEqual(
@@ -1632,7 +1591,6 @@ describe("fetchRecentTransactions merge and dedup", () => {
             const txs = await fetchRecentTransactions(
                 VICTIM,
                 BLOCKSCOUT,
-                true,
                 "0x1",
             );
             expect(txs[0].holders).toBe(0);
@@ -1650,7 +1608,7 @@ describe("fetchRecentTransactions merge and dedup", () => {
             },
         }));
         await expect(
-            fetchRecentTransactions(VICTIM, BLOCKSCOUT, true, "0x1"),
+            fetchRecentTransactions(VICTIM, BLOCKSCOUT, "0x1"),
         ).resolves.toEqual([]);
     });
 

tests/uniswap.test.js

@@ -2108,6 +2108,12 @@ describe("uniswap decoder", () => {
         const ONE_USDT_LINES = (spender) =>
             permitLines("1.0000 USDT", USDT_ADDR, "USDT", spender);
         test.each([
+            {
+                kind: "to another spender",
+                commands: [0x0a],
+                permits: [ONE_USDT_PERMIT(OTHER_ADDR)],
+                lines: ONE_USDT_LINES(OTHER_ADDR),
+            },
             {
                 kind: "that the router lets fail",
                 commands: [0x8a],
@@ -2544,6 +2550,20 @@ describe("uniswap decoder", () => {
                     ],
                     lines: USDT_600_LINES,
                 },
+                {
+                    kind: "a PERMIT2_PERMIT of 5,000 USDT to another spender, then a V3 exact-in of 600 USDT,",
+                    commands: [0x0a, 0x00],
+                    inputs: [
+                        encodePermit2(USDT_ADDR, USDT_5000, OTHER_ADDR),
+                        V3_600,
+                    ],
+                    lines: permitLines(
+                        "5000.0000 USDT",
+                        USDT_ADDR,
+                        "USDT",
+                        OTHER_ADDR,
+                    ),
+                },
                 {
                     kind: "a PERMIT2_PERMIT of 5,000 USDT to the router that the router may let fail, then a V3 exact-in of 600 USDT,",
                     commands: [0x8a, 0x00],
@@ -2657,41 +2677,45 @@ describe("uniswap decoder", () => {
             const DAI_5000 = 5000000000000000000000n;
             const MAX_UINT160 = 2n ** 160n - 1n;
 
-            // A batch names one spender for all its allowances. One to
+            // A batch names one spender for all its allowances.
-            // another spender is under "an allowance to a spender other than
+            test.each([
-            // the router" below.
+                { kind: "the router", spender: ROUTER_ADDR },
-            test("a PERMIT2_PERMIT_BATCH of 5,000 USDT and unlimited DAI to the router, then a V3 exact-in of 600 USDT, shows each allowance", () => {
+                { kind: "another spender", spender: OTHER_ADDR },
-                const result = decodeSteps(
+            ])(
-                    [0x03, 0x00],
+                "a PERMIT2_PERMIT_BATCH of 5,000 USDT and unlimited DAI to $kind, then a V3 exact-in of 600 USDT, shows each allowance",
-                    [
+                ({ spender }) => {
-                        encodePermit2Batch(
+                    const result = decodeSteps(
-                            [
+                        [0x03, 0x00],
-                                [USDT_ADDR, USDT_5000],
+                        [
-                                [DAI_ADDR, MAX_UINT160],
+                            encodePermit2Batch(
-                            ],
+                                [
-                            ROUTER_ADDR,
+                                    [USDT_ADDR, USDT_5000],
+                                    [DAI_ADDR, MAX_UINT160],
+                                ],
+                                spender,
+                            ),
+                            V3_600,
+                        ],
+                    );
+                    expect(result.name).toBe("Swap USDT → USDC");
+                    expect(linesBetweenTokens(result)).toEqual([
+                        ["Amount", "600.0000 USDT"],
+                        ...permitLines(
+                            "5000.0000 USDT",
+                            USDT_ADDR,
+                            "USDT",
+                            spender,
                         ),
-                        V3_600,
+                        ...permitLines("Unlimited", DAI_ADDR, "DAI", spender),
-                    ],
+                    ]);
-                );
+                    // A batch pays nobody, so the swap's minimum is what the
-                expect(result.name).toBe("Swap USDT → USDC");
+                    // sender receives.
-                expect(linesBetweenTokens(result)).toEqual([
+                    expect(detail(result, "Paid to")).toBeUndefined();
-                    ["Amount", "600.0000 USDT"],
+                    expect(detail(result, "Min. received").value).toBe(
-                    ...permitLines(
+                        "590.0000 USDC",
-                        "5000.0000 USDT",
+                    );
-                        USDT_ADDR,
+                },
-                        "USDT",
+            );
-                        ROUTER_ADDR,
-                    ),
-                    ...permitLines("Unlimited", DAI_ADDR, "DAI", ROUTER_ADDR),
-                ]);
-                // A batch pays nobody, so the swap's minimum is what the
-                // sender receives.
-                expect(detail(result, "Paid to")).toBeUndefined();
-                expect(detail(result, "Min. received").value).toBe(
-                    "590.0000 USDC",
-                );
-            });
 
             // A batch keeps a PERMIT2_PERMIT's amount from standing as the
             // Amount figure, before the permit as after it.
@@ -2744,7 +2768,7 @@ describe("uniswap decoder", () => {
                     ),
                 },
             ])(
-                "$kind that cannot be read, then a V3 exact-in of 600 USDT, says its allowances could not be decoded and shows no Amount figure and no Min. received",
+                "$kind that cannot be read, then a V3 exact-in of 600 USDT, says its allowances could not be decoded and shows no Amount figure",
                 ({ command, input }) => {
                     const result = decodeSteps(
                         [command, 0x00],
@@ -2754,14 +2778,6 @@ describe("uniswap decoder", () => {
                         ...USDT_600_GROUP,
                         ["Permit2 allowance", UNDECODED],
                     ]);
-                    // Its spender may be any address, as with an allowance
-                    // to a spender other than the router (below).
-                    // https://git.eeqj.de/sneak/AutistMask/issues/658 — on
-                    // next at e296546 this read Min. received.
-                    expect(detail(result, "Min. received")).toBeUndefined();
-                    expect(detail(result, "Min. paid out").value).toBe(
-                        "590.0000 USDC",
-                    );
                 },
             );
 
@@ -2790,125 +2806,6 @@ describe("uniswap decoder", () => {
             });
         });
 
-        // https://git.eeqj.de/sneak/AutistMask/issues/658 — code that a step
-        // runs can call a spender other than the router, which can then take
-        // up to its allowance from the sender before the transaction ends.
-        // On next at e296546 the Amount figure and Min. received took no
-        // account of it. An allowance of Token In to another spender now
-        // leaves no Amount figure, the swap steps' own takes get lines of
-        // their own, and any allowance to another spender leaves no Min.
-        // received.
-        describe("an allowance to a spender other than the router", () => {
-            const USDT_5000 = 5000000000n;
-            const DAI_5000 = 5000000000000000000000n;
-            const MAX_UINT160 = 2n ** 160n - 1n;
-            const USDT_5000_LINES = permitLines(
-                "5000.0000 USDT",
-                USDT_ADDR,
-                "USDT",
-                OTHER_ADDR,
-            );
-
-            test.each([
-                {
-                    kind: "a PERMIT2_PERMIT of 5,000 USDT to another spender, then a V3 exact-in of 600 USDT,",
-                    commands: [0x0a, 0x00],
-                    inputs: [
-                        encodePermit2(USDT_ADDR, USDT_5000, OTHER_ADDR),
-                        V3_600,
-                    ],
-                    lines: [...USDT_600_GROUP, ...USDT_5000_LINES],
-                    minimum: "590.0000 USDC",
-                },
-                {
-                    kind: "a V3 exact-in of 600 USDT, then a PERMIT2_PERMIT of 5,000 USDT to another spender,",
-                    commands: [0x00, 0x0a],
-                    inputs: [
-                        V3_600,
-                        encodePermit2(USDT_ADDR, USDT_5000, OTHER_ADDR),
-                    ],
-                    lines: [...USDT_600_GROUP, ...USDT_5000_LINES],
-                    minimum: "590.0000 USDC",
-                },
-                {
-                    kind: "a PERMIT2_PERMIT_BATCH of 5,000 USDT and unlimited DAI to another spender, then a V3 exact-in of 600 USDT,",
-                    commands: [0x03, 0x00],
-                    inputs: [
-                        encodePermit2Batch(
-                            [
-                                [USDT_ADDR, USDT_5000],
-                                [DAI_ADDR, MAX_UINT160],
-                            ],
-                            OTHER_ADDR,
-                        ),
-                        V3_600,
-                    ],
-                    lines: [
-                        ...USDT_600_GROUP,
-                        ...USDT_5000_LINES,
-                        ...permitLines(
-                            "Unlimited",
-                            DAI_ADDR,
-                            "DAI",
-                            OTHER_ADDR,
-                        ),
-                    ],
-                    minimum: "590.0000 USDC",
-                },
-                {
-                    kind: "a PERMIT2_PERMIT of 1 USDT to another spender, then a V3 exact-in of 600 USDT and a V2 exact-in of 400 USDT, both paid by the user,",
-                    commands: [0x0a, 0x00, 0x08],
-                    inputs: [
-                        ONE_USDT_PERMIT(OTHER_ADDR),
-                        V3_600,
-                        encodeV2SwapExactIn(USER_ADDR, USDT_400, 390000000n, [
-                            USDT_ADDR,
-                            USDC_ADDR,
-                        ]),
-                    ],
-                    lines: [
-                        ...USDT_600_GROUP,
-                        ...USDT_400_GROUP,
-                        ...ONE_USDT_LINES(OTHER_ADDR),
-                    ],
-                    // The last swap step's minimum.
-                    minimum: "390.0000 USDC",
-                },
-            ])(
-                "$kind shows each take's own lines and the allowances, and no Amount figure or Min. received",
-                ({ commands, inputs, lines, minimum }) => {
-                    const result = decodeSteps(commands, inputs);
-                    expect(result.name).toBe("Swap USDT → USDC");
-                    expect(linesBetweenTokens(result)).toEqual(lines);
-                    expect(detail(result, "Paid to")).toBeUndefined();
-                    expect(detail(result, "Min. received")).toBeUndefined();
-                    expect(detail(result, "Min. paid out").value).toBe(minimum);
-                },
-            );
-
-            // An allowance of another token leaves the Amount figure for
-            // Token In.
-            test("a PERMIT2_PERMIT of 5,000 DAI to another spender, then a V3 exact-in of 600 USDT, shows the swap's 600 USDT and no Min. received", () => {
-                const result = decodeSteps(
-                    [0x0a, 0x00],
-                    [encodePermit2(DAI_ADDR, DAI_5000, OTHER_ADDR), V3_600],
-                );
-                expect(linesBetweenTokens(result)).toEqual([
-                    ["Amount", "600.0000 USDT"],
-                    ...permitLines(
-                        "5000.0000 DAI",
-                        DAI_ADDR,
-                        "DAI",
-                        OTHER_ADDR,
-                    ),
-                ]);
-                expect(detail(result, "Min. received")).toBeUndefined();
-                expect(detail(result, "Min. paid out").value).toBe(
-                    "590.0000 USDC",
-                );
-            });
-        });
-
         // A V3_SWAP_EXACT_OUT whose path is shorter than one token cannot be
         // read. It may pay any address and take from the sender, so it
         // leaves no Amount figure.
@@ -3730,88 +3627,6 @@ describe("uniswap decoder", () => {
         },
     );
 
-    // https://git.eeqj.de/sneak/AutistMask/issues/574 — a V4 step that buys
-    // at least 0.5 WETH with 1,000 USDT, spends some of it on USDC, and takes
-    // the USDC and then the WETH, so its output side is WETH. Only what is
-    // left of the 0.5 WETH is sure to reach the user, and the screen read
-    // Min. received 0.5000 WETH.
-    test.each([
-        {
-            spend: "0.3 WETH for at least 594 USDC",
-            swap: {
-                id: V4_SWAP_EXACT_IN_SINGLE_ID,
-                param: encodeV4ExactInSingle(
-                    WETH_ADDR,
-                    USDC_ADDR,
-                    300000000000000000n,
-                    594000000n,
-                ),
-            },
-        },
-        {
-            spend: "0.3 WETH through DAI for at least 594 USDC",
-            swap: {
-                id: V4_SWAP_EXACT_IN,
-                param: encodeV4ExactIn(
-                    WETH_ADDR,
-                    [DAI_ADDR, USDC_ADDR],
-                    300000000000000000n,
-                    594000000n,
-                ),
-            },
-        },
-        {
-            spend: "at most 0.3 WETH for exactly 594 USDC",
-            swap: {
-                id: V4_SWAP_EXACT_OUT_SINGLE_ID,
-                param: encodeV4ExactOutSingle(
-                    WETH_ADDR,
-                    USDC_ADDR,
-                    594000000n,
-                    300000000000000000n,
-                ),
-            },
-        },
-    ])(
-        "a V4 step that buys WETH and spends $spend, with WETH as its output side, shows no Min. received",
-        ({ swap }) => {
-            const data = buildExecute(
-                "0x10",
-                [
-                    encodeV4Swap(
-                        new Uint8Array([
-                            USDT_FOR_WETH_IN.id,
-                            swap.id,
-                            V4_SETTLE_ALL_ID,
-                            V4_TAKE_ID,
-                            V4_TAKE_ID,
-                        ]),
-                        [
-                            USDT_FOR_WETH_IN.param,
-                            swap.param,
-                            encodeV4SettleAll(USDT_ADDR, 1000000000n),
-                            encodeV4Take(USDC_ADDR),
-                            encodeV4Take(WETH_ADDR),
-                        ],
-                    ),
-                ],
-                9999999999n,
-            );
-
-            const result = uniswap.decode(
-                data,
-                ROUTER_ADDR,
-                "0x1",
-                {},
-                USER_ADDR,
-            );
-            expect(result.name).toBe("Swap USDT → WETH");
-            expect(detail(result, "Amount").value).toBe("1000.0000 USDT");
-            expect(detail(result, "Token Out").address).toBe(WETH_ADDR);
-            expect(detail(result, "Min. received")).toBeUndefined();
-        },
-    );
-
     // A V4 step that spends WETH on USDC and on DAI. Its swap actions buy two
     // currencies that none of them spends, and CLOSE_CURRENCY, which the
     // decoder does not read, names no side, so its output side is unknown.

tests/uniswapRecipient.test.js

@@ -1332,10 +1332,6 @@ describe("any token left in the router is not received", () => {
                 ),
             ),
             left: tokenLine(WETH, "WETH"),
-            // The second swap action spends 1 USDC of what the first buys,
-            // so the step states no minimum
-            // (https://git.eeqj.de/sneak/AutistMask/issues/574).
-            noMin: true,
         },
         {
             kind: "a WRAP_ETH of 1 ETH into the router, then a V4 SETTLE of OPEN_DELTA from the router before the swap, which the user settles",
@@ -1436,7 +1432,7 @@ describe("any token left in the router is not received", () => {
             ),
             left: { label: "Token moved into the router", value: "ETH" },
         },
-    ])("$kind", ({ data, left, spent, unread, noMin }) => {
+    ])("$kind", ({ data, left, spent, unread }) => {
         const result = decode(data);
         expect(labels(result)).toEqual([
             "Protocol",
@@ -1462,7 +1458,7 @@ describe("any token left in the router is not received", () => {
             "Token Out",
             "Paid to",
             "Token moved into the router",
-            ...(noMin ? [] : ["Min. paid out"]),
+            "Min. paid out",
             "Steps",
             "Deadline",
         ]);
@@ -1478,9 +1474,7 @@ describe("any token left in the router is not received", () => {
         }
         expect(paidTo(result)).toEqual([STAYS_IN_ROUTER]);
         expect(detail(result, "Token moved into the router")).toEqual(left);
-        expect(detail(result, "Min. paid out")?.value).toBe(
+        expect(detail(result, "Min. paid out").value).toBe("1990.0000 USDC");
-            noMin ? undefined : "1990.0000 USDC",
-        );
     });
 
     // Uniswap's own routes: a swap paid in ETH wraps into the router what its
@@ -2808,37 +2802,26 @@ describe("the allow-revert flag", () => {
     });
 
     // Only the routers from UniversalRouterV2 on let a PERMIT2_PERMIT fail.
-    // The permit's spender is the router at ROUTER, which on every other
-    // router is an allowance to another spender, so the minimum reads
-    // Min. paid out there.
     test.each([
-        {
+        { router: "UniversalRouterV1", address: ROUTER_V1, mark: "" },
-            router: "UniversalRouterV1",
-            address: ROUTER_V1,
-            mark: "",
-            minimum: "Min. paid out",
-        },
         {
             router: "UniversalRouterV1_2_V2Support",
             address: ROUTER_V1_2,
             mark: "",
-            minimum: "Min. paid out",
         },
         {
             router: "UniversalRouterV2",
             address: ROUTER,
             mark: " (allowed to fail)",
-            minimum: "Min. received",
         },
         {
             router: "UniversalRouterV2_1_2",
             address: ROUTER_V2_1_2,
             mark: " (allowed to fail)",
-            minimum: "Min. paid out",
         },
     ])(
         "on $router, a PERMIT2_PERMIT with the flag is listed as 'Permit2 Permit$mark', and the swap's lines read as without the flag",
-        ({ address, mark, minimum }) => {
+        ({ address, mark }) => {
             const steps = [
                 permit2Permit(USDT, USDT_2000),
                 swapToWeth(MSG_SENDER),
@@ -2870,7 +2853,7 @@ describe("the allow-revert flag", () => {
             expect(
                 labels(withFlag).filter((l) => permitLines.includes(l)),
             ).toEqual(permitLines);
-            expect(detail(withFlag, minimum).value).toBe("1.0000 WETH");
+            expect(detail(withFlag, "Min. received").value).toBe("1.0000 WETH");
         },
     );
 
@@ -3456,7 +3439,6 @@ async function showDetail(data) {
     globalThis.window = { location: { search: "" } };
     state.networkId = "mainnet";
     state.blockscoutUrl = "https://explorer.example/api/v2";
-    state.useBlockscout = true;
     state.viewData = {};
     state.viewStack = [];
     state.currentView = null;

tests/uniswapRouterAddress.test.js

@@ -208,7 +208,6 @@ async function showDetail(row, activeNetworkId) {
     globalThis.window = { location: { search: "" } };
     state.networkId = activeNetworkId;
     state.blockscoutUrl = "https://explorer.example/api/v2";
-    state.useBlockscout = true;
     state.viewData = {};
     state.viewStack = [];
     state.currentView = null;
@@ -288,7 +287,6 @@ async function historyRow(method, sentTo, chainId) {
     const rows = await fetchRecentTransactions(
         RECIPIENT,
         "https://explorer.example/api/v2",
-        true,
         chainId,
     );
     return rows[0];

tests/unknownScaleSend.test.js

@@ -172,7 +172,7 @@ async function fetchOnto(items) {
         statusText: "OK",
         json: async () => items,
     }));
-    const balances = await fetchTokenBalances(HOLDER, BLOCKSCOUT, true, []);
+    const balances = await fetchTokenBalances(HOLDER, BLOCKSCOUT, []);
     state.wallets = [
         {
             name: "Wallet 1",
@@ -197,14 +197,14 @@ async function fetchOntoBoth(itemsA, itemsB) {
         statusText: "OK",
         json: async () => itemsA,
     }));
-    const a = await fetchTokenBalances(HOLDER, BLOCKSCOUT, true, []);
+    const a = await fetchTokenBalances(HOLDER, BLOCKSCOUT, []);
     debugFetch.mockImplementation(async () => ({
         ok: true,
         status: 200,
         statusText: "OK",
         json: async () => itemsB,
     }));
-    const b = await fetchTokenBalances(SECOND_HOLDER, BLOCKSCOUT, true, []);
+    const b = await fetchTokenBalances(SECOND_HOLDER, BLOCKSCOUT, []);
     state.wallets = [
         {
             name: "Wallet 1",