fix: a Permit2 transfer of the zero address never reads as ETH (closes #685)

Permit2 moves no ETH, but the swap decoder read the zero address in a
PERMIT2_TRANSFER_FROM as ETH, with an ETH figure. Such a move now names
the zero address as its token and gives its amount in base units, on its
Moved from the sender line or, into the router, on its Paid to line.

The zero-address check the permit lines already made is now one function,
permit2TokenInfo(), which the move lines share. tokenMovedLine() takes
the token's info instead of its address.

A V4 step of ETH that states no amount still gets its own lines beside
such a move. A test covers that case.

Model: opus-5-5

README.md

@@ -17,11 +17,11 @@ and don't implement any crypto. By default the wallet sends user-specific data
 only to the Ethereum RPC endpoint. The user can change that endpoint in
 Settings. The endpoint defaults to a public node.
 
-Out of the box the extension contacts two services:
+Out of the box the extension contacts one service, the configured RPC node. The
+wallet uses the node for:
 
-- the configured RPC node, for blockchain interactions
-- a public CoinDesk API (no API key), for realtime prices. The API receives
-  token symbols and nothing else.
+- blockchain interactions
+- USD prices on mainnet, read from Chainlink price feed contracts
 
 Two more services are sent none of the user's data until the user ticks a
 checkbox for each. Welcome and Settings both offer the two checkboxes:
@@ -902,13 +902,14 @@ src/
     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
-    prices.js         — ETH/USD and token/USD via CoinDesk API
+    prices.js         — ETH/USD and token/USD from Chainlink price feeds
     scamlist.js       — known fraud contract addresses
     state.js          — persisted state (extension storage)
     storedSettings.js — "Use Blockscout" and "Check recipients on Etherscan",
                         read from storage for the requests those settings gate
     symbolSpoof.js    — the known-symbol spoof rule, shared by all surfaces
-    tokenList.js      — top ERC-20 tokens by market cap (hardcoded)
+    tokenList.js      — top ERC-20 tokens by market cap, and their Chainlink
+                        price feeds (hardcoded)
     transactions.js   — tx history fetching + anti-poisoning filters
     uniswap.js        — Uniswap Universal Router calldata decoder
     vault.js          — password-based encryption via libsodium
@@ -1371,10 +1372,10 @@ whole swap undecoded.
 
 #### Partial USD totals
 
-Prices are fetched for the top 25 tokens only, so an address can hold assets the
-extension has no price for. Worth zero and worth an unknown amount are different
-facts and are never collapsed into one number. `getAddressValue()` in
-`src/shared/prices.js` returns `{ usd, partial }` — the value of the priced
+Only a token with a Chainlink price feed has a price, so an address can hold
+assets the extension has no price for. Worth zero and worth an unknown amount
+are different facts and are never collapsed into one number. `getAddressValue()`
+in `src/shared/prices.js` returns `{ usd, partial }` — the value of the priced
 holdings, and whether an unpriced holding was left out of it — and every screen
 renders it through `formatAddressTotal()`, so the wording cannot drift:
 
@@ -1493,9 +1494,7 @@ send-screen token selector, the address total and the remove-address 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. While that setting is on, a token just added reads
-`quantity unknown` at an address with no entry for it, until a refresh has read
-its balance at every address (see AddToken).
+zero balance" is on.
 
 #### Stored state and its version
 
@@ -1679,13 +1678,6 @@ network switch (below). That popup then redraws its top screen as a reopened
 popup would. A screen that a reopened popup cannot render, such as Send, is
 replaced by Home.
 
-The popup refreshes balances every ten seconds while it is open
-(`doRefreshAndRender()` in `src/popup/index.js`). Each refresh that returns
-draws the wallet list again. When AddressDetail or AddressToken is up, the
-refresh also draws that screen's USD total and balance lines again, but not its
-transaction list. A refresh draws no other screen again, DeleteAddress and its
-balance lines included.
-
 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
 saves it. Any other popup open meanwhile takes the switch from the stored
@@ -2242,15 +2234,7 @@ 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**. Until a balance refresh on the token's network has read
-      the token's balance at every address, its line never reads `0.0000`. The
-      line reads `quantity unknown` instead, or is left out while "Show tracked
-      tokens with zero balance" is off. Where Blockscout already listed a
-      holding of the token, the line shows that holding. Until that refresh, the
-      tracked token's record carries `balanceNotFetched`, so the line still
-      reads `quantity unknown` after the popup closes and opens again. A refresh
-      that returns draws AddressDetail's balances again (see Navigation), so the
-      fetched balance shows without the screen being reopened
+      **AddressDetail**
     - "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
@@ -2551,9 +2535,7 @@ 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). Until a refresh has read
-      the token's balance at every address, its lines read as after "Add" on
-      AddToken
+      "Added SYMBOL" flash message (no screen change)
     - 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
@@ -2839,6 +2821,9 @@ view would leave a wallet one click from deletion.
     - "Export Saved Data" button, and the read-only text box it fills
     - What erasing does and does not do, in bold: every wallet stored in this
       browser is deleted; nothing on chain changes and no money is moved
+    - What a wallet can be added again from: a kept copy of its recovery phrase,
+      private key or extended private key. Without that copy or the exported
+      copy, everything the wallet holds is gone forever.
     - A text input asking for `ERASE MY WALLET` to be typed back
     - Error line
     - "Erase Saved Data" button
@@ -2870,9 +2855,9 @@ 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
-user's data only to the Ethereum RPC endpoint. It also asks the CoinDesk price
-API for prices, sending token symbols and nothing else.
+AutistMask is not a fully self-contained offline tool. By default it contacts
+only the Ethereum RPC endpoint. USD prices are read from Chainlink price feed
+contracts through that endpoint.
 
 Two more services are sent none of the user's data until the user turns on a
 setting for each:
@@ -2896,21 +2881,18 @@ Contacted by default:
   estimate gas (`eth_estimateGas`), fetch nonces (`eth_getTransactionCount`),
   broadcast transactions (`eth_sendRawTransaction`), and check transaction
   receipts. Every ENS lookup is made through the RPC endpoint alone. So a name
-  does not resolve when its resolver says the name is resolved off-chain. The
-  default endpoint is a public RPC (configurable by the user to any endpoint
-  they prefer, including a local node). By default the extension talks to
+  does not resolve when its resolver says the name is resolved off-chain. On
+  mainnet the extension also reads USD prices from Chainlink price feed
+  contracts (`latestRoundData`). The prices of ETH and of each held or tracked
+  token with a feed are read as one batched request. That request is sent at
+  most every 5 minutes while the popup is open. The default endpoint is a public
+  RPC (configurable by the user to any endpoint they prefer, 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.
 
-- **CoinDesk CADLI price API**: Used to fetch ETH/USD and token/USD prices for
-  displaying fiat values. The price is cached for 5 minutes to avoid excessive
-  requests. No API key required. No user data is sent — only a list of token
-  symbols. Note that CoinDesk will receive your client IP.
-    - **Data sent**: Token symbol strings only (e.g. "ETH", "USDC"). No
-      addresses or user-specific data.
-
 Sent the user's data only while its setting is on:
 
 - **Blockscout block-explorer API** ("Use Blockscout"): The default endpoint is
@@ -3086,14 +3068,13 @@ hardcoded test phrase.
 
 At the raised log level the console also shows the wallet's addresses with their
 balances and ENS names, the token contracts looked up, and a line for each
-request made through `debugFetch` in `src/shared/log.js` (the explorer, the
-price feed, the RPC calls a site makes, and the endpoint checks in settings) and
-for its response. A request is logged by its HTTP method, the origin of its URL
-(scheme, host and port) and, for a JSON-RPC call, the method name; the balance
-refresh, the token lookup and a failed endpoint check in settings name the
-endpoint by its origin too. The URL's path and query string, where RPC providers
-put API keys, any user name and password in it, and the request body are never
-logged.
+request made through `debugFetch` in `src/shared/log.js` (the explorer, the RPC
+calls a site makes, and the endpoint checks in settings) and for its response. A
+request is logged by its HTTP method, the origin of its URL (scheme, host and
+port) and, for a JSON-RPC call, the method name; the balance refresh, the token
+lookup and a failed endpoint check in settings name the endpoint by its origin
+too. The URL's path and query string, where RPC providers put API keys, any user
+name and password in it, and the request body are never logged.
 
 ### Key Decisions
 
@@ -3496,119 +3477,133 @@ Currently supported:
   of any amount but `OPEN_DELTA` pays that amount, and a `SETTLE` of
   `OPEN_DELTA` or a `SETTLE_ALL` pays what the step owes, as above. So a V4 step
   that swaps 400 USDT, with a `SETTLE` of 5,000 USDT paid by the user and the
-  rest taken to another address, reads `5000.0000 USDT`. A later step paid from
-  the router spends what the router holds and takes nothing, and so does a V2
-  exact-in whose `amountIn` is `ALREADY_PAID`. A later take of `Token In` is
-  added to the total while both are quantities: a V3 exact-in of 600 USDT and a
-  V2 exact-in of 400 USDT, both paid by the user, read `1000.0000 USDT`. When
-  the decoder does not know a take's amount, the total is not known and there is
-  no `Amount` line. A `PERMIT2_PERMIT` names `Token In` only when its amount,
-  `Unlimited` included, stands as the `Amount` figure in place of the total,
-  which it does only in the plain shape of Uniswap's own routes: it comes before
-  the step that sets the input side, it is the only `PERMIT2_PERMIT` in the
-  transaction and there is no `PERMIT2_PERMIT_BATCH`, its spender is the router,
-  the router may not let it fail, no step before it takes its token, a
-  `PERMIT2_TRANSFER_FROM` of it included, or a token the decoder does not know,
-  and the decoder reads every step after it in full. Permit2 then lets the
-  router take no more of the token than that amount, so the permit covers every
-  take of it. A step before the permit takes under whatever allowance the router
-  already had, so it may take more than the permit's amount, which would then
-  read lower than what leaves the user's wallet: a `PERMIT2_TRANSFER_FROM` of
-  2,000 USDT into the router, then a permit of 600 USDT to the router and a V3
-  exact-in of 2,000 USDT paid from the router, read `Amount 2000.0000 USDT`. A
-  later permit or batch may raise what Permit2 lets the router take, and so may
-  a step the decoder does not read in full: a command the decoder does not read
-  (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
-  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
-  side spends a token other than the permit's, or one the decoder does not know,
-  that step's amount gets lines of its own, unless it states no amount and the
-  user pays it none of its input token. Each take the total does not count gives
-  three lines after the `Amount` line (after `Token In` when there is none): one
-  of a token other than `Token In`; one of `Token In` after an amount that is
-  not a quantity (a V4 open delta, `ALREADY_PAID`, which keep their wording on
-  the `Amount` line, or no stated amount, as of a V4 exact-out step); and one
-  whose amount the decoder does not know. When there is no `Amount` line, each
-  take the total counts gets them too, so that every amount the decoder reads is
-  shown: the amount the step that sets the input side states, when it is a
-  quantity and the user pays that step (a V2 or V3 step whose `payerIsUser` is
-  true, a V4 step the user pays some of its input token, or a `WRAP_ETH`, whose
-  ETH comes from the transaction's value), and each later take of `Token In`
-  added to it. A step that sets the input side and is paid from the router takes
-  nothing from the user's wallet and gets none. A `PERMIT2_PERMIT` the decoder
-  cannot read, then V3 exact-ins of 600 USDT and 400 DAI paid by the user, give
-  lines for both amounts. When the step that sets the input side states no
-  amount, the user pays it some of its input token, and there is no `Amount`
-  line, that step gets them too whenever another take's lines give a figure, or
-  a `PERMIT2_TRANSFER_FROM` of its token gives one, on the lines below or, into
-  the router, on its `Paid to` line, so that figure cannot read as all that
-  leaves. When it states no amount and the user pays it none of its input token,
-  as when the router pays it, that step takes none of that token from the user's
-  wallet and never gets them, with a permit or without. They come in step order,
-  except that the step that sets the input side comes first when it has them,
-  followed, when there is no `Amount` line, by the other takes the total counts:
-  `Moved from the sender`, its amount, worded as the `Amount` line words one, or
-  `Unknown (could not be decoded)` when the decoder does not know it;
-  `Token moved`, giving the token's address as the `Token In` line does; and
-  `Moved to`, which reads `The swap step that spends it`. A token the decoder
-  does not know gives the `Moved from the sender` line alone. A step may also
-  take from the user's wallet what the decoder did not read: a V4 step whose
-  input or one of whose `SETTLE`s or `SETTLE_ALL`s it cannot read, which the
-  router still runs; a V2 or V3 exact-in or exact-out step or a
-  `PERMIT2_TRANSFER_FROM` whose input it cannot read, such as a V3 step whose
-  path is shorter than one token address or has bytes after its last hop; every
-  `PERMIT2_TRANSFER_FROM_BATCH`; every `EXECUTE_SUB_PLAN`, wherever it stands;
-  and every step it fails on. Each such step gives one `Moved from the sender`
-  line among those, reading `Unknown (could not be decoded)`. That line, or any
-  line for a token the decoder does not know, leaves no `Amount` line, whose
-  figure might be too low, and such a step before a `PERMIT2_PERMIT` keeps the
-  permit's amount from standing. Then each `PERMIT2_TRANSFER_FROM` but one into
-  the router, in step order, gives three lines: `Moved from the sender`, the
-  amount it moves, for example `1000000.0000 USDT`; `Token moved`, giving the
-  token's address as the `Token In` line does; and `Moved to`, which reads
+  rest taken to another address, reads `5000.0000 USDT`. A later step that pays
+  an ERC-20 token from the router takes none of that token from the user's
+  wallet. A V2 exact-in whose `amountIn` is `ALREADY_PAID` takes nothing either.
+  A V4 `SETTLE` of ETH paid from the router still takes from the user's wallet,
+  since the router holds the transaction's value. When the decoder does not know
+  the amount of such a `SETTLE`, as for `CONTRACT_BALANCE`, that `SETTLE` counts
+  as a later step's take. When an earlier step left ETH in the router, that ETH
+  may pay part of a `SETTLE` of ETH paid from the router. That `SETTLE` then
+  gets lines of its own, with `Up to` before its amount. A later take of
+  `Token In` that only the user's wallet pays is added to the total while both
+  are quantities: a V3 exact-in of 600 USDT and a V2 exact-in of 400 USDT, both
+  paid by the user, read `1000.0000 USDT`. When the decoder does not know a
+  take's amount, the total is not known and there is no `Amount` line. A
+  `PERMIT2_PERMIT` names `Token In` only when its amount, `Unlimited` included,
+  stands as the `Amount` figure in place of the total, which it does only in the
+  plain shape of Uniswap's own routes: it comes before the step that sets the
+  input side, it is the only `PERMIT2_PERMIT` in the transaction and there is no
+  `PERMIT2_PERMIT_BATCH`, its spender is the router, the router may not let it
+  fail, no step before it takes its token, a `PERMIT2_TRANSFER_FROM` of it
+  included, or a token the decoder does not know, and the decoder reads every
+  step after it in full. Permit2 then lets the router take no more of the token
+  than that amount, so the permit covers every take of it. A step before the
+  permit takes under whatever allowance the router already had, so it may take
+  more than the permit's amount, which would then read lower than what leaves
+  the user's wallet: a `PERMIT2_TRANSFER_FROM` of 2,000 USDT into the router,
+  then a permit of 600 USDT to the router and a V3 exact-in of 2,000 USDT paid
+  from the router, read `Amount 2000.0000 USDT`. A later permit or batch may
+  raise what Permit2 lets the router take, and so may a step the decoder does
+  not read in full: a command the decoder does not read (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 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. A permit on the
+  zero address never stands as the `Amount` figure, because Permit2 has no
+  allowance of ETH. When a permit's amount stands and the step that sets the
+  input side spends a token other than the permit's, or one the decoder does not
+  know, that step's amount gets lines of its own, unless it states no amount and
+  the user pays it none of its input token. Each take the total does not count
+  gives three lines after the `Amount` line (after `Token In` when there is
+  none): one of a token other than `Token In`; one of `Token In` after an amount
+  that is not a quantity (a V4 open delta, `ALREADY_PAID`, which keep their
+  wording on the `Amount` line, or no stated amount, as of a V4 exact-out step);
+  an ETH take whose line reads `Up to` (see above); and one whose amount the
+  decoder does not know. When there is no `Amount` line, each take the total
+  counts gets them too, so that every amount the decoder reads is shown: the
+  amount the step that sets the input side states, when it is a quantity and the
+  user pays that step (a V2 or V3 step whose `payerIsUser` is true, a V4 step
+  the user pays some of its input token, or a `WRAP_ETH`, whose ETH comes from
+  the transaction's value), and each later take of `Token In` added to it. A
+  step that sets the input side gets none when the user pays it none of its
+  input token. A `PERMIT2_PERMIT` the decoder cannot read, then V3 exact-ins of
+  600 USDT and 400 DAI paid by the user, give lines for both amounts. When the
+  step that sets the input side states no amount, the user pays it some of its
+  input token, and there is no `Amount` line, that step gets them too whenever
+  another take's lines give a figure, or a `PERMIT2_TRANSFER_FROM` of its token
+  gives one, on the lines below or, into the router, on its `Paid to` line, so
+  that figure cannot read as all that leaves. When it states no amount and the
+  user pays it none of its input token, that step never gets them, with a permit
+  or without. They come in step order, except that the step that sets the input
+  side comes first when it has them, followed, when there is no `Amount` line,
+  by the other takes the total counts: `Moved from the sender`, its amount,
+  worded as the `Amount` line words one, or `Unknown (could not be decoded)`
+  when the decoder does not know it; `Token moved`, giving the token's address
+  as the `Token In` line does; and `Moved to`, which reads
+  `The swap step that spends it`. A token the decoder does not know gives the
+  `Moved from the sender` line alone. A step may also take from the user's
+  wallet what the decoder did not read: a V4 step whose input or one of whose
+  `SETTLE`s or `SETTLE_ALL`s it cannot read, which the router still runs; a V2
+  or V3 exact-in or exact-out step or a `PERMIT2_TRANSFER_FROM` whose input it
+  cannot read, such as a V3 step whose path is shorter than one token address or
+  has bytes after its last hop; every `PERMIT2_TRANSFER_FROM_BATCH`; every
+  `EXECUTE_SUB_PLAN`, wherever it stands; and every step it fails on. Each such
+  step gives one `Moved from the sender` line among those, reading
+  `Unknown (could not be decoded)`. That line, or any line for a token the
+  decoder does not know, leaves no `Amount` line, whose figure might be too low,
+  and such a step before a `PERMIT2_PERMIT` keeps the permit's amount from
+  standing. Then each `PERMIT2_TRANSFER_FROM` but one into the router, in step
+  order, gives three lines: `Moved from the sender`, the amount it moves, for
+  example `1000000.0000 USDT`; `Token moved`, giving the token's address as the
+  `Token In` line does; and `Moved to`, which reads
   `The V2 pair the next swap spends` for a hop and `The sender` for `address(1)`
   on every router but `UniversalRouterV1`, and otherwise gives the address. A
   move into the router needs none of them, because its `Paid to` line and
   `Token moved into the router` line already give the amount, the token and
-  where it goes, and so its amount is shown once. Every `PERMIT2_PERMIT` whose
-  amount does not stand as the `Amount` figure, before the step that sets the
-  input side or after it, gives three lines, in step order, after those for each
-  `PERMIT2_TRANSFER_FROM`: `Permit2 allowance`, its amount, for example
+  where it goes, and so its amount is shown once. For a move of the zero
+  address, `Moved from the sender` gives the amount in base units and
+  `Token moved` gives the zero address. For such a move into the router, the
+  `Paid to` line gives the amount in base units and
+  `Token moved into the router` gives the zero address. Every `PERMIT2_PERMIT`
+  whose amount does not stand as the `Amount` figure, before the step that sets
+  the input side or after it, gives three lines, in step order, after those for
+  each `PERMIT2_TRANSFER_FROM`: `Permit2 allowance`, its amount, for example
   `5000.0000 DAI`, or `Unlimited` for Permit2's maximum; `Allowance token`,
   giving the token's address as the `Token In` line does; and
   `Allowance spender`, the address it lets take the token. Only a permit whose
   amount stands gives none: the `Amount` line gives its amount, `Token In` its
   token, and its spender is the router. Each allowance a `PERMIT2_PERMIT_BATCH`
   grants, one for each token it names, all for its one spender, gives the same
-  three lines, in step order with those of each `PERMIT2_PERMIT`. A
-  `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
-  `Paid to` line: a permit or batch pays nobody. But code that a step runs, such
-  as a V4 pool's hook or a token's own code, can call a spender other than the
-  router, which can then take up to its allowance from the user's wallet before
-  the transaction ends. So an allowance to any spender but the router, or a
-  permit or batch the decoder cannot read, makes the minimum read
-  `Min. paid out`, and when its token is `Token In`, or the decoder does not
-  know its token or `Token In`, it leaves no `Amount` line, whose figure might
-  be too low: a permit of 5,000 USDT to another address and then a V3 exact-in
-  of 600 USDT read with no `Amount` line, and the 600 USDT gets lines of its
-  own. A step goes unread when its recipient does not decode as an address, when
-  it is a V3 swap step whose path is shorter than one token address or has bytes
-  after its last hop, or when it is a command the decoder does not read: every
-  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.
+  three lines, in step order with those of each `PERMIT2_PERMIT`. For an
+  allowance of the zero address, `Permit2 allowance` gives the amount in base
+  units and `Allowance token` gives the zero address. A `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 `Paid to` line: a
+  permit or batch pays nobody. But code that a step runs, such as a V4 pool's
+  hook or a token's own code, can call a spender other than the router, which
+  can then take up to its allowance from the user's wallet before the
+  transaction ends. So an allowance to any spender but the router, or a permit
+  or batch the decoder cannot read, makes the minimum read `Min. paid out`, and
+  when its token is `Token In`, or the decoder does not know its token or
+  `Token In`, it leaves no `Amount` line, whose figure might be too low: a
+  permit of 5,000 USDT to another address and then a V3 exact-in of 600 USDT
+  read with no `Amount` line, and the 600 USDT gets lines of its own. A step
+  goes unread when its recipient does not decode as an address, when it is a V3
+  swap step whose path is shorter than one token address or has bytes after its
+  last hop, or when it is a command the decoder does not read: every 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

@@ -70,9 +70,9 @@ 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
-Ethereum RPC endpoint. It also asks the CoinDesk price API for prices, sending
-token symbols and nothing else.
+not have a backend server. Out of the box it contacts only the Ethereum RPC
+endpoint. USD prices are read from Chainlink price feed contracts through that
+endpoint.
 
 Blockscout and Etherscan are sent none of your data until you turn on a setting
 for each. The settings are "Use Blockscout" and "Check recipients on Etherscan".
@@ -89,10 +89,16 @@ verify confirmations. The default is a free public RPC endpoint. You can change
 this in Settings to any Ethereum JSON-RPC endpoint, including your own local
 node.
 
+On mainnet, AutistMask also reads USD prices through this endpoint. The prices
+come from Chainlink's price feed contracts. A token with no Chainlink feed shows
+no USD value.
+
 When it is contacted:
 
 - on every balance refresh (every 10 seconds while the popup is open, every 60
   seconds in the background)
+- on mainnet, to read USD prices, at most every 5 minutes while the popup is
+  open
 - when you review a send to an ENS name
 - when a send is prepared and broadcast
 - while a pending transaction is polled for its receipt
@@ -131,19 +137,6 @@ 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`)
-
-Used to fetch current USD prices for ETH and the top 25 tokens. Prices are
-cached for 5 minutes. No API key is required. This endpoint is not
-user-configurable, and it is not contacted at all while you are on a testnet,
-where no USD values are shown.
-
-When it is contacted: while the popup is open, at most once every 5 minutes.
-
-What gets sent: token symbol names (e.g. "ETH", "USDC"). No addresses, no
-balances, no identifying information. As with any request, CoinDesk sees your IP
-address.
-
 **Etherscan address labels** (`etherscan.io`; `sepolia.etherscan.io` on Sepolia)
 
 While "Check recipients on Etherscan" is on, AutistMask fetches the recipient's

src/popup/index.html

@@ -1994,10 +1994,11 @@
                         >Erasing the saved data deletes every wallet stored in
                         this browser.</strong
                     >
-                    Nothing on the blockchain changes and no money is moved, but
-                    without the exported copy above, or the recovery phrase for
-                    each wallet written down, everything they hold is gone
-                    forever.
+                    Nothing on the blockchain changes and no money is moved. If
+                    you kept a copy of a wallet's recovery phrase, private key
+                    or extended private key, you can add that wallet again.
+                    Without that copy or the exported copy above, everything the
+                    wallet holds is gone forever.
                 </p>
                 <p class="text-xs mb-1">
                     To confirm, type

src/popup/index.js

@@ -6,7 +6,6 @@ const {
     saveState,
     onSaveFailure,
     takeStoredNetwork,
-    clearBalanceNotFetched,
     loadState,
 } = require("../shared/state");
 const { StateUnusableError } = require("../shared/stateSchema");
@@ -89,17 +88,6 @@ let refreshTimer = null;
 // removed meanwhile is left as it is. Blockscout may have answered before the
 // user turned "Use Blockscout" off. So the save drops every token the user has
 // not tracked if the stored setting is off by then.
-//
-// The save also deletes `balanceNotFetched` from each tracked token whose
-// balance this refresh read at every address. trackToken() in
-// src/popup/views/helpers.js sets that field. The save takes the field off the
-// matching tokens of the stored record (clearBalanceNotFetched() in
-// src/shared/state.js). The rest of the stored tracked token list stays as it
-// is.
-//
-// Once the save is done, the wallet list is drawn again. So are the balances
-// on AddressDetail or AddressToken when that screen is up. No other screen is
-// drawn again, DeleteAddress and its balance lines included.
 async function doRefreshAndRender() {
     if (refreshInFlight) return;
     refreshInFlight = true;
@@ -107,8 +95,8 @@ async function doRefreshAndRender() {
         await followStoredSettings();
         const networkId = state.networkId;
         const wallets = structuredClone(state.wallets);
-        const [, readTokens] = await Promise.all([
-            refreshPrices(),
+        await Promise.all([
+            refreshPrices(pageClosed.signal),
             refreshBalances(
                 wallets,
                 state.rpcUrl,
@@ -139,13 +127,10 @@ async function doRefreshAndRender() {
             if (!stored.useBlockscout) {
                 dropUntrackedTokens(state.wallets, stored.trackedTokens);
             }
-            clearBalanceNotFetched(stored, readTokens);
             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

src/popup/views/addToken.js

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

src/popup/views/addressDetail.js

@@ -66,27 +66,11 @@ 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();
-    // Only Blockscout reports the tokens the user has not tracked.
-    $("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);
-}
-
-// 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,
@@ -100,6 +84,13 @@ function renderBalances() {
                 ctx.showAddressToken();
             });
         });
+    // Only Blockscout reports the tokens the user has not tracked.
+    $("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 = [];
@@ -296,4 +287,4 @@ function init(_ctx) {
     exportPrivkey.init();
 }
 
-module.exports = { init, show, renderBalances };
+module.exports = { init, show };

src/popup/views/addressToken.js

@@ -49,18 +49,37 @@ 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());
-    currentSymbol =
-        tokenId === "ETH"
-            ? nativeCurrency()
-            : resolveSymbol(tokenId, addr.tokenBalances, state.trackedTokens);
+    if (tokenId === "ETH") {
+        symbol = nativeCurrency();
+        amount = parseFloat(addr.balance || "0");
+        price = getPrice("ETH");
+    } 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(tokenId);
+    }
+
+    currentSymbol = symbol;
 
     $("address-token-title").textContent =
         wallet.name +
         " \u2014 Address " +
         (ai + 1) +
         " \u2014 " +
-        displaySymbol(currentSymbol);
+        displaySymbol(symbol);
 
     // Blockie
     const blockieEl = $("address-token-jazzicon");
@@ -82,7 +101,13 @@ function show() {
     $("address-token-line").dataset.full = addr.address;
     attachCopyHandlers($("address-token-line"));
 
-    renderBalance();
+    // 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(symbol, amount, price);
 
     // Token contract details (ERC-20 only)
     const contractInfo = $("address-token-contract-info");
@@ -144,47 +169,6 @@ 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,
-        );
-        const tracked = state.trackedTokens.find(
-            (t) => t.address.toLowerCase() === id,
-        );
-        // null when the scale is unknown, or when no refresh has read the
-        // balance of 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 = tracked && tracked.balanceNotFetched ? 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(
@@ -364,4 +348,4 @@ function init(_ctx) {
     });
 }
 
-module.exports = { init, show, renderBalance };
+module.exports = { init, show };

src/popup/views/confirmTx.js

@@ -129,7 +129,7 @@ function renderAmount(txInfo) {
     const rawSymbol = isErc20
         ? txInfo.tokenSymbol || "?"
         : nativeCurrencyByChainId(txInfo.chainId);
-    const price = getPrice(isErc20 ? rawSymbol : "ETH", txInfo.chainId);
+    const price = getPrice(txInfo.token, txInfo.chainId);
     const amountUsd = price ? parseFloat(txInfo.amount) * price : null;
     $("confirm-amount").textContent = valueWithUsd(
         shownAmount(txInfo) + " " + displaySymbol(rawSymbol),
@@ -157,7 +157,7 @@ function renderBalance(txInfo) {
         $("confirm-balance").textContent = "unknown (" + symbol + ")";
         return;
     }
-    const price = getPrice(isErc20 ? rawSymbol : "ETH", txInfo.chainId);
+    const price = getPrice(txInfo.token, txInfo.chainId);
     const balUsd = price ? parseFloat(bal) * price : null;
     $("confirm-balance").textContent = valueWithUsd(
         truncateAmountNeverZero(bal) + " " + symbol,

src/popup/views/helpers.js

@@ -417,15 +417,6 @@ function balanceLine(symbol, amount, price, tokenId) {
     );
 }
 
-// Tracks `token` on the active network, as every add path on AddToken and
-// SettingsAddToken does. The tracked record carries `balanceNotFetched: true`
-// until a balance refresh has read the token's balance at every address
-// (doRefreshAndRender() in src/popup/index.js). Until then, an address with no
-// balance row for the token shows `quantity unknown` for it, not 0.0000.
-function trackToken(token) {
-    state.trackedTokens.push({ ...token, balanceNotFetched: true });
-}
-
 function balanceLinesForAddress(addr, trackedTokens, showZero) {
     let html = balanceLine(
         nativeCurrency(),
@@ -448,7 +439,7 @@ function balanceLinesForAddress(addr, trackedTokens, showZero) {
         html += balanceLine(
             t.symbol,
             bal,
-            getPrice(t.symbol),
+            getPrice(t.address),
             t.address.toLowerCase(),
         );
         seen.add(t.address.toLowerCase());
@@ -458,8 +449,8 @@ function balanceLinesForAddress(addr, trackedTokens, showZero) {
             if (seen.has(t.address.toLowerCase())) continue;
             html += balanceLine(
                 t.symbol,
-                t.balanceNotFetched ? null : 0,
-                getPrice(t.symbol),
+                0,
+                getPrice(t.address),
                 t.address.toLowerCase(),
             );
         }
@@ -838,7 +829,6 @@ module.exports = {
     flashCopyFeedback,
     balanceLine,
     balanceLinesForAddress,
-    trackToken,
     addressHoldsFunds,
     keyMaterialName,
     unknownableAmount,

src/popup/views/settingsAddToken.js

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

src/shared/balances.js

@@ -247,11 +247,7 @@ async function fetchTokenBalances(
 // 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(), and its balance is not read.
-//
-// Resolves with `rows`, the entries, and `unread`, the tracked tokens whose
-// balance was not read, as lowercased contract addresses. A token is unread
-// when the spoof rule refuses it or its balanceOf fails.
+// no entry either, as in fetchTokenBalances().
 //
 // `signal` is as for fetchTokenBalances().
 async function fetchTrackedTokenBalances(
@@ -292,16 +288,12 @@ async function fetchTrackedTokenBalances(
     const reported = explorerRows ?? previous;
 
     const rows = [];
-    const unread = trackedTokens
-        .filter((token) => !listed.includes(token))
-        .map((token) => token.address.toLowerCase());
     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) {
-            unread.push(lower);
             const kept = entryIn(previous) || entryIn(explorerRows || []);
             if (kept) rows.push(kept);
             return;
@@ -322,15 +314,12 @@ async function fetchTrackedTokenBalances(
             holders: entry ? entry.holders : null,
         });
     });
-    return { rows, unread };
+    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().
-//
-// Resolves with the lowercased contract addresses of the tracked tokens whose
-// balance it read at every address.
 async function refreshBalances(
     wallets,
     rpcUrl,
@@ -343,8 +332,6 @@ async function refreshBalances(
     const provider = getProvider(rpcUrl, networkId);
     const tracked = trackedTokens || [];
     const trackedSet = new Set(tracked.map((t) => t.address.toLowerCase()));
-    // The tracked tokens whose balance was not read at some address.
-    const unread = new Set();
     const updates = [];
 
     for (const wallet of wallets) {
@@ -419,14 +406,12 @@ async function refreshBalances(
                         signal,
                     ),
                     explorerRequest,
-                ]).then(([trackedResult, explorerRows]) => {
-                    for (const lower of trackedResult.unread) unread.add(lower);
+                ]).then(([trackedRows, explorerRows]) => {
                     const untrackedRows = (explorerRows ?? previous).filter(
                         (row) =>
                             !trackedSet.has(String(row.address).toLowerCase()),
                     );
-                    addr.tokenBalances =
-                        trackedResult.rows.concat(untrackedRows);
+                    addr.tokenBalances = trackedRows.concat(untrackedRows);
                     log.debugf(
                         "Token balances",
                         addr.address,
@@ -440,7 +425,6 @@ async function refreshBalances(
 
     await Promise.all(updates);
     log.debugf("refreshBalances done");
-    return [...trackedSet].filter((lower) => !unread.has(lower));
 }
 
 // Drops the balance of each token not in `trackedTokens` from every address.

src/shared/prices.js

@@ -1,31 +1,105 @@
-// Price fetching with 5-minute cache, USD formatting, value aggregation.
+// USD prices, read from Chainlink price feeds on Ethereum mainnet, with USD
+// formatting and value aggregation. The feeds are in src/shared/tokenList.js.
 
-const { getTopTokenPrices } = require("./tokenList");
+const { Contract } = require("ethers");
+const { ETH_USD_FEED, PRICE_FEED_BY_ADDRESS } = require("./tokenList");
+const { getProvider } = require("./balances");
 const { isBelowOneMillionth } = require("./amountDisplay");
 const { networkByChainId } = require("./networks");
+const { log } = require("./log");
 
 const PRICE_CACHE_TTL = 300000; // 5 minutes
 
+// A reading older than its feed's heartbeat plus this many seconds is no price.
+const STALE_MARGIN = 1800; // 30 minutes
+
+const FEED_ABI = [
+    "function latestRoundData() view returns (uint80 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint80 answeredInRound)",
+];
+
+// USD prices: ether's under "ETH", each token's under its lowercased contract
+// address.
 const prices = {};
 let lastFetchedAt = 0;
 
-async function refreshPrices() {
-    // Testnet tokens have no real market value — skip price fetching
-    // and clear any stale mainnet prices so the UI shows no USD values.
-    const { currentNetwork } = require("./state");
-    if (currentNetwork().isTestnet) {
+// Reads the price of ether and of each token any address holds or the user
+// tracks, when that token has a feed. Mainnet only. The reads go to the RPC
+// endpoint as one batched request, at most every 5 minutes. A failed read is
+// logged, and that token then has no price.
+//
+// `signal`, passed by the popup, is aborted when the popup closes. A read that
+// fails once `signal` is aborted is not logged, because closing the popup
+// cancelled it.
+async function refreshPrices(signal) {
+    const { state, currentNetwork } = require("./state");
+    if (currentNetwork().id !== "mainnet") {
         clearPrices();
         return;
     }
     const now = Date.now();
     if (now - lastFetchedAt < PRICE_CACHE_TTL) return;
-    try {
-        const fetched = await getTopTokenPrices(25);
-        Object.assign(prices, fetched);
-        lastFetchedAt = now;
-    } catch {
-        // prices stay stale on error
+    const feeds = new Map([["ETH", ETH_USD_FEED]]);
+    for (const address of heldOrTrackedTokens(state)) {
+        const feed = PRICE_FEED_BY_ADDRESS.get(address);
+        if (feed) feeds.set(address, feed);
     }
+    // ethers sends calls made together on one provider as one batch.
+    const provider = getProvider(state.rpcUrl, state.networkId);
+    const read = {};
+    await Promise.all(
+        [...feeds].map(async ([key, feed]) => {
+            try {
+                const contract = new Contract(feed.address, FEED_ABI, provider);
+                const round = await contract.latestRoundData();
+                const price = priceFromRound(round, feed, now);
+                if (price === null) {
+                    log.warnf(
+                        "price feed reading is stale or not positive",
+                        key,
+                    );
+                    return;
+                }
+                read[key] = price;
+            } catch (e) {
+                if (signal?.aborted) return;
+                log.errorf(
+                    "price feed read failed",
+                    key,
+                    e.shortMessage || e.message,
+                );
+            }
+        }),
+    );
+    clearPrices();
+    Object.assign(prices, read);
+    lastFetchedAt = now;
+}
+
+// The lowercased contract address of each token that any address holds or
+// that the user tracks.
+function heldOrTrackedTokens(state) {
+    const addresses = new Set();
+    for (const wallet of state.wallets) {
+        for (const addr of wallet.addresses) {
+            for (const token of addr.tokenBalances || []) {
+                addresses.add(token.address.toLowerCase());
+            }
+        }
+    }
+    for (const token of state.trackedTokens || []) {
+        addresses.add(token.address.toLowerCase());
+    }
+    return addresses;
+}
+
+// The USD price in a feed's latestRoundData() result, or null when the answer
+// is not positive or was written longer ago than the feed's heartbeat plus
+// STALE_MARGIN. `now` is in milliseconds.
+function priceFromRound(round, feed, now) {
+    const ageSeconds = now / 1000 - Number(round.updatedAt);
+    if (ageSeconds > feed.heartbeat + STALE_MARGIN) return null;
+    if (round.answer <= 0n) return null;
+    return Number(round.answer) / 10 ** feed.decimals;
 }
 
 // Clear all cached prices and reset the fetch timestamp so the
@@ -37,14 +111,15 @@ function clearPrices() {
     lastFetchedAt = 0;
 }
 
-// Return the USD price for a symbol on the network with `chainId`, or on the
-// active network when no chain id is given; null on testnet, on a chain id
-// that names no network, or for a symbol with no price.
-function getPrice(symbol, chainId) {
+// Return the USD price of the token at the contract address `token`, or of
+// ether when `token` is "ETH". The price is for the network with `chainId`, or
+// for the active network when no chain id is given. Returns null on testnet,
+// on a chain id that names no network, and for a token with no price.
+function getPrice(token, chainId) {
     const { currentNetwork } = require("./state");
     const network = chainId ? networkByChainId(chainId) : currentNetwork();
     if (!network || network.isTestnet) return null;
-    return prices[symbol] || null;
+    return prices[token === "ETH" ? "ETH" : token.toLowerCase()] || null;
 }
 
 function formatUsd(amount) {
@@ -62,7 +137,7 @@ function formatUsd(amount) {
 
 // What an address is worth, as { usd, partial }.
 //
-// Prices are fetched for the top 25 tokens only, so an address can hold real
+// Only a token with a price feed has a price, so an address can hold real
 // assets this code has no price for. Adding up the priced ones and calling the
 // result the total states a number the holdings do not support: an address
 // holding nothing but unpriced tokens comes out at $0.00, which tells the user
@@ -99,8 +174,9 @@ function getAddressValue(addr) {
         // nor make it incomplete. Anything that is not a number at all is not
         // a holding this can price either, and is left to the same rule.
         if (!(tokenBal > 0)) continue;
-        if (prices[token.symbol]) {
-            usd += tokenBal * prices[token.symbol];
+        const price = prices[token.address.toLowerCase()];
+        if (price) {
+            usd += tokenBal * price;
         } else {
             partial = true;
         }

src/shared/state.js

@@ -128,9 +128,8 @@ function currentNetwork() {
 // The persisted fields as this page held them when its last loadState()
 // finished, or when its last successful saveState() began, with any network
 // switch saved elsewhere that this page has taken since (takeStoredNetwork()).
-// `baseline` also lacks any `balanceNotFetched` field that a balance refresh has
-// deleted since (clearBalanceNotFetched()). saveState() diffs the live state
-// against this to find only the fields THIS page changed since.
+// saveState() diffs the live state against this to find only the fields THIS
+// page changed since.
 //
 // Deep-cloned, not a reference: callers mutate persisted objects and arrays
 // in place (state.wallets.push(...)), and a reference baseline would mutate
@@ -614,27 +613,6 @@ function takeStoredNetwork(stored) {
     copyChainSwitchFields(baseline, structuredClone(stored));
 }
 
-// Deletes `balanceNotFetched` from each tracked token whose lowercased
-// contract address is in `addresses`. The field goes from `stored`, from
-// `state` and from `baseline` alike. `stored` is the record a save of this
-// page has just read (doRefreshAndRender() in src/popup/index.js calls this
-// from `beforeWrite`). So the deletion is not a change this page made to its
-// tracked tokens. Unless this page has changed its tracked tokens itself, the
-// save then writes the stored list with only the field gone.
-function clearBalanceNotFetched(stored, addresses) {
-    for (const list of [
-        stored.trackedTokens,
-        rawState.trackedTokens,
-        baseline.trackedTokens,
-    ]) {
-        for (const token of list) {
-            if (addresses.includes(token.address.toLowerCase())) {
-                delete token.balanceNotFetched;
-            }
-        }
-    }
-}
-
 // Rejects with StateUnusableError for a stored record this build cannot make
 // sense of. Nothing is assigned and `loaded` stays false in that case, so a
 // caller that ignores the rejection gets StateNotLoadedError on the first
@@ -681,7 +659,6 @@ module.exports = {
     saveState,
     onSaveFailure,
     takeStoredNetwork,
-    clearBalanceNotFetched,
     loadState,
     currentAddress,
     currentNetwork,

src/shared/tokenList.js

@@ -4,12 +4,12 @@
 // Addresses are EIP-55 checksummed.
 //
 // 511 tokens.
+//
+// Below the list, USD_PRICE_FEEDS gives the Chainlink USD price feed of each
+// token that has one.
 
-const { debugFetch } = require("./log");
 const { NETWORKS } = require("./networks");
 
-const COINDESK_API = "https://data-api.coindesk.com/index/cc/v1/latest/tick";
-
 const TOKENS = [
     {
         address: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
@@ -3597,6 +3597,351 @@ const TOKENS = [
     },
 ];
 
+// Chainlink price feeds on Ethereum mainnet. Each feed is a contract whose
+// latestRoundData() returns a USD price and the time the price was written.
+// The fields of a feed:
+//
+//   - address: the feed's contract
+//   - heartbeat: the most seconds the feed goes without a new price
+//   - decimals: the number of decimal places in the price
+//
+// Each feed's address and heartbeat come from Chainlink's published list of
+// mainnet feeds. Each feed was checked on mainnet by reading its description()
+// and decimals().
+
+// The ETH/USD feed, which prices ether and WETH.
+const ETH_USD_FEED = {
+    address: "0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419",
+    heartbeat: 3600,
+    decimals: 8,
+};
+
+// The USD feed of each token in TOKENS that has one, keyed by the token's
+// contract address as TOKENS spells it. A token is paired with its feed by its
+// address alone, so a token that copies a listed token's symbol gets no feed.
+const USD_PRICE_FEEDS = {
+    // WETH
+    "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2": ETH_USD_FEED,
+    // USDT
+    "0xdAC17F958D2ee523a2206206994597C13D831ec7": {
+        address: "0x3E7d1eAB13ad0104d2750B8863b489D65364e32D",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // BNB
+    "0xB8c77482e45F1F44dE1745F52C74426C631bDD52": {
+        address: "0x14e613AC84a31f709eadbdF89C6CC390fDc9540A",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // USDC
+    "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48": {
+        address: "0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6",
+        heartbeat: 82800,
+        decimals: 8,
+    },
+    // USDS
+    "0xdC035D45d973E3EC169d2276DDab16f1e407384F": {
+        address: "0xfF30586cD0F29eD462364C7e81375FC0C71219b1",
+        heartbeat: 82800,
+        decimals: 8,
+    },
+    // LINK
+    "0x514910771AF9Ca656af840dff83E8264EcF986CA": {
+        address: "0x2c1d072e956AFFC0D435Cb7AC38EF18d24d9127c",
+        heartbeat: 3600,
+        decimals: 8,
+    },
+    // USDE
+    "0x4c9EDD5852cd905f086C759E8383e09bff1E68B3": {
+        address: "0xa569d910839Ae8865Da8F8e70FfFb0cBA869F961",
+        heartbeat: 82800,
+        decimals: 8,
+    },
+    // USD1
+    "0x8d0D000Ee44948FC98c9B98A4FA4921476f08B0d": {
+        address: "0xF0d9bb015Cd7BfAb877B7156146dc09Bf461370d",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // DAI
+    "0x6B175474E89094C44Da98b954EedeAC495271d0F": {
+        address: "0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9",
+        heartbeat: 3600,
+        decimals: 8,
+    },
+    // PYUSD
+    "0x6c3ea9036406852006290770BEdFcAbA0e23A0e8": {
+        address: "0x8f1dF6D7F2db73eECE86a18b4381F4707b918FB1",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // WLFI
+    "0xdA5e1988097297dCdc1f90D4dFE7909e847CBeF6": {
+        address: "0x14E5FC91Ddb3f97C33013Cc9fA74F54062Ad1Aa1",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // UNI
+    "0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984": {
+        address: "0x553303d460EE0afB37EdFf9bE42922D8FF63220e",
+        heartbeat: 3600,
+        decimals: 8,
+    },
+    // PAXG
+    "0x45804880De22913dAFE09f4980848ECE6EcbAf78": {
+        address: "0x9944D86CEB9160aF5C5feB251FD671923323f8C3",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // AAVE
+    "0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9": {
+        address: "0x547a514d5e3769680Ce22B2361c10Ea13619e8a9",
+        heartbeat: 3600,
+        decimals: 8,
+    },
+    // USDF
+    "0xFa2B947eEc368f42195f24F36d2aF29f7c24CeC2": {
+        address: "0xb177857a1799aA5F7fEb5799Fdf12CbE8fdF78B1",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // USDG
+    "0xe343167631d89B6Ffc58B88d6b7fB0228795491D": {
+        address: "0x14f0737d6b705259e521EA6E9E3506AC78dBd311",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // SKY
+    "0x56072C95FAA701256059aa122697B133aDEd9279": {
+        address: "0xee10fE5E7aa92dd7b136597449c3d5813cFC5F18",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // RLUSD
+    "0x8292Bb45bf1Ee4d140127049757C2E0fF06317eD": {
+        address: "0x26C46B7aD0012cA71F2298ada567dC9Af14E7f2A",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // USDTB
+    "0xC139190F447e929f090Edeb554D95AbB8b18aC1C": {
+        address: "0x66704DAD467A7cA508B3be15865D9B9F3E186c90",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // ARB
+    "0xB50721BCf8d664c30412Cfbc6cf7a15145234ad1": {
+        address: "0x31697852a68433DbCc2Ff612c516d69E3D9bd08F",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // USD0
+    "0x73A15FeD60Bf67631dC6cd7Bc5B6e8da8190aCF5": {
+        address: "0x7e891DEbD8FA0A4Cf6BE58Ddff5a8ca174FebDCB",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // GHO
+    "0x40D16FC0246aD3160Ccc09B8D0D3A2cD28aE6C2f": {
+        address: "0x3f12643D3f6f874d39C2a4c9f2Cd6f2DbAC877FC",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // TUSD
+    "0x0000000000085d4780B73119b644AE5ecd22b376": {
+        address: "0xec746eCF986E2927Abd291a2A1716c940100f8Ba",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // EURC
+    "0x1aBaEA1f7C830bD89Acc67eC4af516284b1bC33c": {
+        address: "0x04F84020Fdf10d9ee64D1dcC2986EDF2F556DA11",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // FDUSD
+    "0xc5f0f7b66764F6ec8C8Dff7BA683102295E16409": {
+        address: "0xfAA9147190c2C2cc5B8387B4f49016bDB3380572",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // CRV
+    "0xD533a949740bb3306d119CC777fa900bA034cd52": {
+        address: "0xCd627aA160A6fA45Eb793D19Ef54f5062F20f33f",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // GRT
+    "0xc944E90C64B2c07662A292be6244BDf05Cda44a7": {
+        address: "0x86cF33a451dE9dc61a2862FD94FF4ad4Bd65A5d2",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // CRVUSD
+    "0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E": {
+        address: "0xEEf0C605546958c1f899b6fB336C20671f9cD49F",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // FRAX, the Legacy Frax Dollar, priced by Chainlink's FRAX / USD feed
+    "0x853d955aCEf822Db058eb8505911ED77F175b99e": {
+        address: "0xB9E1E3A9feFf48998E45Fa90847ed4D467E8BcfD",
+        heartbeat: 3600,
+        decimals: 8,
+    },
+    // ENS
+    "0xC18360217D8F7Ab5e7c516566761Ea12Ce7F9D72": {
+        address: "0x5C00128d4d1c2F4f652C267d7bcdD7aC99C16E16",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // SAND
+    "0x3845badAde8e6dFF049820680d1F14bD3903a5d0": {
+        address: "0x35E3f7E558C04cE7eEE1629258EcbbA03B36Ec56",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // AUSD
+    "0x00000000eFE302BEAA2b3e6e1b18d08D69a9012a": {
+        address: "0xB00341502DfEA6Ced8A5786b4059d29dA5E4D1FD",
+        heartbeat: 86400,
+        decimals: 18,
+    },
+    // COMP
+    "0xc00e94Cb662C3520282E6f5717214004A7f26888": {
+        address: "0xdbd020CAeF83eFd542f4De03e3cF0C28A4428bd5",
+        heartbeat: 3600,
+        decimals: 8,
+    },
+    // XCN
+    "0xA2cd3D43c775978A96BdBf12d733D5A1ED94fb18": {
+        address: "0xeb988B77b94C186053282BfcD8B7ED55142D3cAB",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // CVX
+    "0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B": {
+        address: "0xd962fC30A72A84cE50161031391756Bf2876Af5D",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // IMX
+    "0xF57e7e7C23978C3cAEC3C3548E3D615c346e79fF": {
+        address: "0xBAEbEFc1D023c0feCcc047Bff42E75F15Ff213E6",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // 1INCH
+    "0x111111111117dC0aa78b770fA6A738034120C302": {
+        address: "0xc929ad75B72593967DE83E7F7Cda0493458261D9",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // SNX
+    "0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F": {
+        address: "0xDC3EA94CD0AC27d9A86C180091e7f78C683d3699",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // DOLA
+    "0x865377367054516e17014CcdED1e7d814EDC9ce4": {
+        address: "0xE33592594f72Cc7ec8a05788be8E8455746C3a32",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // FRXUSD
+    "0xCAcd6fd266aF91b8AeD52aCCc382b4e165586E29": {
+        address: "0x9B4a96210bc8D9D55b1908B465D8B0de68B7fF83",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // YFI
+    "0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e": {
+        address: "0xA027702dbb89fbd58938e4324ac03B58d812b0E1",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // RSR
+    "0x320623b8E4fF03373931769A31Fc52A4E78B5d70": {
+        address: "0x759bBC1be8F90eE6457C44abc7d443842a976d02",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // ZRX
+    "0xE41d2489571d322189246DaFA5ebDe1F4699F498": {
+        address: "0x2885d15b8Af22648b98B122b22FDF4D2a56c6023",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // FRAX, formerly FXS, priced by Chainlink's FXS / USD feed
+    "0x3432B6A60D23Ca0dFCa7761B7ab56459D9C964D0": {
+        address: "0x6Ebc52C8C1089be9eB3945C4350B68B8E4C2233f",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // SXT
+    "0xE6Bfd33F52d82Ccb5b37E16D3dD81f9FFDAbB195": {
+        address: "0x2D27d9e1b74936D8E83c4BA118F09A4c4a897f62",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // SUSHI
+    "0x6B3595068778DD592e39A122f4f5a5cF09C90fE2": {
+        address: "0xCc70F09A6CC17553b2E31954cD36E4A2d89501f7",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // RPL
+    "0xD33526068D116cE69F19A9ee46F0bd304F21A51f": {
+        address: "0x4E155eD98aFE9034b7A5962f6C84c86d869daA9d",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // USDP
+    "0x8E870D67F660D95d5be530380D0eC0bd388289E1": {
+        address: "0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // SPELL
+    "0x090185f2135308BaD17527004364eBcC2D37e5F6": {
+        address: "0x8c110B94C5f1d347fAcF5E1E938AB2db60E3c9a8",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // LUSD
+    "0x5f98805A4E8be255a32880FDeC7F6728C6568bA0": {
+        address: "0x3D7aE7E594f2f2091Ad8798313450130d0Aba3a0",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // STG
+    "0xAf5191B0De278C7286d6C7CC6ab6BB8A73bA2Cd6": {
+        address: "0x7A9f34a0Aa917D438e9b6E630067062B7F8f6f3d",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // KNC
+    "0xdeFA4e8a7bcBA345F687a2f1456F5Edd9CE97202": {
+        address: "0xf8fF43E991A81e6eC886a3D281A2C6cC19aE70Fc",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+    // MUSD (the other MUSD in TOKENS has no feed)
+    "0xacA92E438df0B2401fF60dA7E4337B687a2435DA": {
+        address: "0xc90E3460424fb8ea79775089E9053113FEE34Ed0",
+        heartbeat: 86400,
+        decimals: 8,
+    },
+};
+
+// Build a map of token address (lowercased) -> its USD price feed.
+const PRICE_FEED_BY_ADDRESS = new Map();
+for (const [address, feed] of Object.entries(USD_PRICE_FEEDS)) {
+    PRICE_FEED_BY_ADDRESS.set(address.toLowerCase(), feed);
+}
+
 // Return the top N tokens from the list.
 function getTopTokens(n) {
     return TOKENS.slice(0, n);
@@ -3643,33 +3988,6 @@ for (const t of TOKENS) {
     }
 }
 
-// Fetch USD prices for the top N tokens from CoinDesk.
-// Also always includes ETH. Returns { ETH: 1234.56, LINK: 8.60, ... }.
-// n must be <= 30 (API and sanity limit).
-async function getTopTokenPrices(n) {
-    if (n > 30) {
-        throw new Error("getTopTokenPrices: n must be <= 30, got " + n);
-    }
-    const symbols = ["ETH", ...TOKENS.slice(0, n).map((t) => t.symbol)];
-    const unique = [...new Set(symbols)];
-    const instruments = unique.map((s) => s + "-USD").join(",");
-    const url =
-        COINDESK_API +
-        "?market=cadli&instruments=" +
-        instruments +
-        "&apply_mapping=true";
-    const resp = await debugFetch(url);
-    const json = await resp.json();
-    const prices = {};
-    for (const [instrument, data] of Object.entries(json.Data || {})) {
-        const symbol = instrument.split("-")[0];
-        if (data.VALUE !== undefined) {
-            prices[symbol] = data.VALUE;
-        }
-    }
-    return prices;
-}
-
 // Resolve a token symbol from multiple sources, never returning "?".
 function resolveSymbol(tokenAddress, tokenBalances, trackedTokens) {
     const lower = (tokenAddress || "").toLowerCase();
@@ -3690,7 +4008,9 @@ module.exports = {
     TOKENS,
     TOKEN_BY_ADDRESS,
     KNOWN_SYMBOLS,
+    ETH_USD_FEED,
+    USD_PRICE_FEEDS,
+    PRICE_FEED_BY_ADDRESS,
     getTopTokens,
-    getTopTokenPrices,
     resolveSymbol,
 };

src/shared/uniswap.js

@@ -479,6 +479,17 @@ function tokenInfo(address, sources) {
     };
 }
 
+// The token of a Permit2 allowance or of a PERMIT2_TRANSFER_FROM, in the
+// shape tokenInfo() gives. Permit2 has no allowance of ETH and moves no ETH.
+// The zero address there reads as a token nothing knows: its amount in base
+// units, and the zero address as its token.
+function permit2TokenInfo(address, sources) {
+    if (address === "0x0000000000000000000000000000000000000000") {
+        return { symbol: null, decimals: null, address };
+    }
+    return tokenInfo(address, sources);
+}
+
 // A swap amount line. With a scale it is the token quantity; with none it is
 // the base-unit integer with the unknown scale stated, the same refusal the
 // ERC-20 amount line makes, so the screen has one way of saying it. `display`
@@ -497,16 +508,18 @@ function amountText(raw, info) {
 
 // The line giving a moved token, or the token of a permit, under `label`, in
 // the shape of the Token In line, so the screens show it as they show that
-// one. ETH has no address.
-function tokenMovedLine(label, token, sources) {
-    const info = tokenInfo(token, sources);
+// one. `info` is what tokenInfo() or permit2TokenInfo() gives for the token.
+// ETH has no address.
+function tokenMovedLine(label, info) {
     if (!present(info.address)) {
         return { label, value: info.symbol };
     }
     return {
         label,
-        value: info.symbol ? info.symbol + " (" + token + ")" : token,
-        address: token,
+        value: info.symbol
+            ? info.symbol + " (" + info.address + ")"
+            : info.address,
+        address: info.address,
         isToken: true,
     };
 }
@@ -1240,9 +1253,10 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
         let inputEstablished = false;
         // Whether the user pays the step that set the input side: a V2 or V3
         // swap step with `payerIsUser` true, a V4 step the user pays some of
-        // its input currency (see decodeV4Swap()), or a WRAP_ETH, whose ETH
-        // comes from the transaction's value. A step paid from the router
-        // takes nothing from the sender.
+        // its input currency (see paidByUser in the loop), or a WRAP_ETH,
+        // whose ETH comes from the transaction's value. A step that pays an
+        // ERC-20 token from the router takes none of that token from the
+        // sender.
         let inputPaidByUser = false;
         // The last PERMIT2_PERMIT this decoder read before a step set the
         // input side, or null (see permitStands after the loop).
@@ -1338,7 +1352,9 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
         // What the steps take from the sender beyond the amount of the step
         // that sets the input side, as { token, amount }, in step order.
         // After the loop each joins the Amount line or gets lines of its own
-        // (see permitStands).
+        // (see permitStands). A take with `atMost` set may take less than
+        // `amount`: it never joins the Amount line, and its line reads
+        // "Up to" and the amount.
         const userPaid = [];
         // A swap step the user pays for (`payerIsUser` true) takes `amount`
         // of `token` from the sender. A V2 exact-in of ALREADY_PAID takes
@@ -1815,6 +1831,41 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
                 } else if (command === "V4_SWAP") {
                     const v4 = decodeV4Swap(inputs[i]);
                     const inputSetBefore = inputEstablished;
+                    // V4Router pays a SETTLE of ETH from the router's own
+                    // ETH, whichever payer the SETTLE names. The router holds
+                    // the transaction's value, and any ETH an earlier step
+                    // left it (see heldByRouter). So the user also pays a
+                    // SETTLE of ETH that names the router as payer. The user
+                    // pays all of its amount when the router holds no other
+                    // ETH, and up to its amount otherwise. CONTRACT_BALANCE
+                    // pays all the router holds, an amount the calldata does
+                    // not state.
+                    const routerHeldEth = heldByRouter.has(
+                        "0x0000000000000000000000000000000000000000",
+                    );
+                    const ethFromRouter = (v4?.settledFromRouter ?? [])
+                        .filter(
+                            (s) =>
+                                s.currency ===
+                                "0x0000000000000000000000000000000000000000",
+                        )
+                        .map((s) => ({
+                            currency: s.currency,
+                            amount:
+                                s.amount === CONTRACT_BALANCE ? null : s.amount,
+                        }));
+                    // What the user pays the step: what decodeV4Swap() says,
+                    // and the ETH of each SETTLE from the router of a known
+                    // amount when the router holds no other ETH.
+                    const paidByUser = v4
+                        ? v4.paidByUser.concat(
+                              routerHeldEth
+                                  ? []
+                                  : ethFromRouter.filter((s) =>
+                                        present(s.amount),
+                                    ),
+                          )
+                        : [];
                     if (v4) {
                         // Each SETTLE paid from the router spends the amount
                         // decodeV4Swap() says it pays.
@@ -1845,10 +1896,10 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
                         commandNames[i] += " (could not be decoded)";
                     }
                     // The step's amount, if it sets the input side: what the
-                    // user pays it of its input currency (see
-                    // decodeV4Swap()), or, when the user pays none of it,
-                    // what its swap actions spend of it, whoever pays that.
-                    const paidIn = v4?.paidByUser.find(
+                    // user pays it of its input currency, or, when the user
+                    // pays none of it, what its swap actions spend of it,
+                    // whoever pays that.
+                    const paidIn = paidByUser.find(
                         (p) => p.currency === v4.tokenIn,
                     );
                     const amountIn = paidIn ? paidIn.amount : v4?.amountIn;
@@ -1902,10 +1953,24 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
                     // router still runs it.
                     const setInputHere = inputEstablished && !inputSetBefore;
                     if (setInputHere) inputPaidByUser = paidIn !== undefined;
-                    if (v4) {
-                        for (const p of v4.paidByUser) {
-                            if (setInputHere && p === paidIn) continue;
-                            addUserPaid(p.currency, p.amount);
+                    for (const p of paidByUser) {
+                        if (setInputHere && p === paidIn) continue;
+                        addUserPaid(p.currency, p.amount);
+                    }
+                    // A SETTLE of ETH from the router that `paidByUser` leaves
+                    // out is a take of its own, even on the step that sets
+                    // the input side. Either this decoder does not know its
+                    // amount, or ETH an earlier step left in the router may
+                    // pay part of that amount (see userPaid).
+                    for (const p of ethFromRouter) {
+                        if (!present(p.amount)) {
+                            addUserPaid(p.currency, null);
+                        } else if (routerHeldEth) {
+                            userPaid.push({
+                                token: p.currency,
+                                amount: p.amount,
+                                atMost: true,
+                            });
                         }
                     }
                     if (!v4 || v4.settleUnread) {
@@ -2013,10 +2078,10 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
         // The total is what the steps take of Token In: the amount of the
         // step that set the input side, with each later take of that token
         // added to it while both are quantities. A take that cannot be added,
-        // being of another token or coming after an amount that is not a
-        // quantity (a V4 open delta, ALREADY_PAID, or none stated), gets
-        // lines of its own. One whose amount is not known also leaves the
-        // total unknown, with no figure.
+        // being of another token, coming after an amount that is not a
+        // quantity (a V4 open delta, ALREADY_PAID, or none stated), or having
+        // `atMost` set, gets lines of its own. One whose amount is not known
+        // also leaves the total unknown, with no figure.
         //
         // A PERMIT2_PERMIT names Token In only when its amount stands as the
         // Amount figure in place of the total, which it does only in the
@@ -2032,12 +2097,14 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
         // it may take more. A later permit or batch, or a later step this
         // decoder did not read, may raise what Permit2 lets the router take.
         // 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
-        // or batch whose input it cannot read (see permitUnread()) and an
-        // allowance of Token In to another spender (see toAnotherSpender). An
-        // EXECUTE_SUB_PLAN step leaves both sides unknown (below).
+        // they read with no permit, and gets lines of its own below. A permit
+        // on the zero address never stands as the Amount figure, because
+        // Permit2 has no allowance of ETH. 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 or batch whose input it
+        // cannot read (see permitUnread()) and 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,
             (b) => commands[b & commandTypeMask],
@@ -2047,6 +2114,7 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
             stepCommands.filter((c) => c === "PERMIT2_PERMIT").length === 1 &&
             !stepCommands.includes("PERMIT2_PERMIT_BATCH") &&
             sameAddress(permit.spender, toAddress) &&
+            permit.token !== "0x0000000000000000000000000000000000000000" &&
             !permit.allowedToFail &&
             permit.beforeEveryTake &&
             !stepsUnread.some((step) => step > permit.step);
@@ -2057,14 +2125,14 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
         let total = null;
         // The takes from the sender that `total` adds up, each a quantity, as
         // { token, amount }. When there is no Amount line, each gets lines of
-        // its own (see below). The amount of a step that set the input side
-        // and is paid from the router counts in `total` but is not among them.
+        // its own (see below). The amount of the step that set the input side
+        // counts in `total` whoever pays that step. That amount is among them
+        // only when the user pays the step (see inputPaidByUser).
         const inTotal = [];
         // Whether the step that set the input side counts as a take from the
         // sender, which may get lines of its own. The amount it stated counts
         // whoever pays it. Stating none, it counts only when the user pays it
-        // some of its input token: paid from the router, it takes nothing
-        // from the sender.
+        // some of its input token.
         const hasFirstTake =
             inputEstablished && (present(inputAmount) || inputPaidByUser);
         // The take of the step that set the input side, when the total
@@ -2090,7 +2158,8 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
             if (
                 ofTokenIn &&
                 typeof total === "bigint" &&
-                typeof t.amount === "bigint"
+                typeof t.amount === "bigint" &&
+                !t.atMost
             ) {
                 total += t.amount;
                 inTotal.push(t);
@@ -2193,8 +2262,9 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
         // V2's already-paid zero, neither of which is a quantity at all (see
         // OPEN_DELTA and ALREADY_PAID), and an unbounded permit. Those two
         // tests come first — the sentinels are not bigints and cannot be
-        // compared with one.
-        const spentText = (amount, info) => {
+        // compared with one. `atMost` marks an amount that is only the most a
+        // take may be (see userPaid).
+        const spentText = (amount, info, atMost) => {
             if (amount === OPEN_DELTA) {
                 return { raw: OPEN_DELTA_AMOUNT, display: OPEN_DELTA_AMOUNT };
             }
@@ -2207,7 +2277,7 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
             if (amount >= MAX_UINT160) {
                 return { raw: "Unlimited", display: "Unlimited" };
             }
-            if (hasV2OrV3ExactOut) {
+            if (hasV2OrV3ExactOut || atMost) {
                 // A V2 or V3 exact-out swap spends at most this figure,
                 // whichever steps gave it (an amountInMax, the WRAP_ETH of a
                 // swap paid in ETH, a permit, or several steps' total), so it
@@ -2234,17 +2304,19 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
         // 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
         // that may be of Token In, 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.
+        // too low. An allowance of the zero address is never one of Token In,
+        // because Permit2 has no allowance of ETH. 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(
                 (p) =>
-                    present(p.token) &&
-                    present(inputToken) &&
-                    !sameAddress(p.token, inputToken),
+                    p.token === "0x0000000000000000000000000000000000000000" ||
+                    (present(p.token) &&
+                        present(inputToken) &&
+                        !sameAddress(p.token, inputToken)),
             )
         ) {
             const amount = spentText(inputAmount, inInfo);
@@ -2265,11 +2337,14 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
             details.push({
                 label: "Moved from the sender",
                 value: present(s.amount)
-                    ? spentText(s.amount, tokenInfo(s.token, sources)).display
+                    ? spentText(s.amount, tokenInfo(s.token, sources), s.atMost)
+                          .display
                     : UNDECODED_CURRENCY,
             });
             if (present(s.token)) {
-                details.push(tokenMovedLine("Token moved", s.token, sources));
+                details.push(
+                    tokenMovedLine("Token moved", tokenInfo(s.token, sources)),
+                );
                 details.push({
                     label: "Moved to",
                     value: "The swap step that spends it",
@@ -2280,12 +2355,12 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
         // What each PERMIT2_TRANSFER_FROM moves: its amount, its token and
         // where it goes, an address on a line of its own.
         for (const m of movedFromSender) {
+            const info = permit2TokenInfo(m.token, sources);
             details.push({
                 label: "Moved from the sender",
-                value: amountText(m.amount, tokenInfo(m.token, sources))
-                    .display,
+                value: amountText(m.amount, info).display,
             });
-            details.push(tokenMovedLine("Token moved", m.token, sources));
+            details.push(tokenMovedLine("Token moved", info));
             details.push(
                 present(m.to)
                     ? { label: "Moved to", value: m.to }
@@ -2315,15 +2390,15 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
                 });
                 continue;
             }
+            const info = permit2TokenInfo(p.token, sources);
             details.push({
                 label: "Permit2 allowance",
                 value:
                     p.amount >= MAX_UINT160
                         ? "Unlimited"
-                        : amountText(p.amount, tokenInfo(p.token, sources))
-                              .display,
+                        : amountText(p.amount, info).display,
             });
-            details.push(tokenMovedLine("Allowance token", p.token, sources));
+            details.push(tokenMovedLine("Allowance token", info));
             details.push({
                 label: "Allowance spender",
                 value: p.spender,
@@ -2381,7 +2456,7 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
             paidTo.push({ label: "Paid to", value: PAID_TO_BRIDGE });
         }
         for (const m of movedIntoRouter) {
-            const info = tokenInfo(m.token, sources);
+            const info = permit2TokenInfo(m.token, sources);
             paidTo.push({
                 label: "Paid to",
                 value:
@@ -2389,9 +2464,7 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
                     amountText(m.amount, info).display +
                     " from the sender (later steps may not spend all of it)",
             });
-            paidTo.push(
-                tokenMovedLine("Token moved into the router", m.token, sources),
-            );
+            paidTo.push(tokenMovedLine("Token moved into the router", info));
         }
         if (outputHeld) {
             paidTo.push({ label: "Paid to", value: STAYS_IN_ROUTER });
@@ -2408,8 +2481,7 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
             paidTo.push(
                 tokenMovedLine(
                     "Token moved into the router",
-                    getAddress(token),
-                    sources,
+                    tokenInfo(getAddress(token), sources),
                 ),
             );
         }

tests/addedTokenBalance.test.js

@@ -1,441 +0,0 @@
-// After "Add" on AddToken, AddressDetail lists the new token. Its line reads
-// `quantity unknown`, not 0.0000, until a balance refresh has read the token's
-// balance at every address, even if the popup closes and opens again
-// meanwhile. A token added on SettingsAddToken reads the same 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).
-//
-// The tracked token's record carries `balanceNotFetched` until a refresh has
-// read the token's balance. Removing the token removes that record. A network
-// switch keeps each network's records apart. A refresh takes the field off the
-// stored record's tokens and keeps another page's changes to the stored list.
-//
-// 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";
-
-// A holding of a million NEW_TOKEN, as refreshBalances() stores it.
-const MILLION = {
-    address: NEW_TOKEN,
-    name: "New Token",
-    symbol: "NEW",
-    decimals: 18,
-    balance: "1000000.0",
-    holders: 3,
-};
-
-// NEW_TOKEN as "Add" on AddToken tracks it, once a refresh has read its
-// balance.
-const NEW_TRACKED = {
-    address: NEW_TOKEN,
-    symbol: "NEW",
-    name: "New Token",
-    decimals: 18,
-};
-
-// A token that another popup page tracks.
-const OTHER_TOKEN = {
-    address: "0xCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC",
-    symbol: "OTH",
-    name: "Other Token",
-    decimals: 18,
-};
-
-afterEach(() => {
-    cleanupPopup();
-});
-
-// The popup reopened onto AddressDetail for the one address.
-function bootOnAddress(extra) {
-    return bootPopup(
-        unversionedValidProfile({
-            currentView: "address",
-            selectedWallet: 0,
-            selectedAddress: 0,
-            ...extra,
-        }),
-    );
-}
-
-// Holds the next balance refresh open. The returned function lets it finish
-// with the address's ETH balance at 2 and `tokenBalances` as its token
-// entries, having read the balance of every token tracked when it started.
-// Given null, it finishes having read no token's balance, as when every
-// balanceOf fails, and leaves the token entries as they were.
-function holdNextRefresh(page) {
-    const { refreshBalances } = require("../src/shared/balances");
-    let release;
-    refreshBalances.mockImplementationOnce(
-        async (wallets, rpcUrl, explorerUrl, trackedTokens) => {
-            const read = trackedTokens.map((t) => t.address.toLowerCase());
-            const tokenBalances = await new Promise((resolve) => {
-                release = resolve;
-            });
-            wallets[0].addresses[0].balance = "2.0";
-            if (tokenBalances === null) return [];
-            wallets[0].addresses[0].tokenBalances = tokenBalances;
-            return read;
-        },
-    );
-    return async (tokenBalances) => {
-        release(tokenBalances);
-        await page.settle();
-    };
-}
-
-// Runs the ten-second refresh to the end, finishing it as holdNextRefresh()
-// does with `tokenBalances`.
-async function refreshOnce(page, tokenBalances) {
-    const finish = holdNextRefresh(page);
-    const ticking = page.tick();
-    await page.settle();
-    await finish(tokenBalances);
-    await ticking;
-}
-
-// "+ 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");
-}
-
-// Settings' "+ Add token", NEW_TOKEN typed in, and "Add", with the contract
-// lookup answering at once. It ends on SettingsAddToken.
-async function addOnSettingsAddToken(page) {
-    const { lookupTokenInfo } = require("../src/shared/balances");
-    lookupTokenInfo.mockResolvedValueOnce({
-        symbol: "NEW",
-        decimals: 18,
-        name: "New Token",
-    });
-    await page.click("btn-settings-add-token");
-    page.node("settings-addtoken-address").value = NEW_TOKEN;
-    await page.click("btn-settings-addtoken-manual");
-}
-
-// The "[x]" button Settings draws beside the first tracked token. The page
-// stub does not turn the markup Settings draws into elements. So the list
-// hands Settings a stand-in for that button each time it is drawn, and
-// `press()` presses the last one drawn. Call it before Settings opens.
-function firstRemoveButton(page) {
-    const button = { press: null };
-    page.node("settings-tracked-tokens").querySelectorAll = () => [
-        {
-            dataset: { idx: "0" },
-            addEventListener: (name, fn) => {
-                button.press = fn;
-            },
-        },
-    ];
-    return button;
-}
-
-// Picks `networkId` in the Settings network selector, as the user does.
-async function chooseNetwork(page, networkId) {
-    const select = page.node("settings-network");
-    select.value = networkId;
-    for (const fn of select.listeners.change) await fn();
-    await page.settle();
-}
-
-// Another popup page saves `trackedTokens` as the tracked token list. This
-// page is not told of the write.
-function anotherPageTracks(page, trackedTokens) {
-    page.storage.write("autistmask", {
-        ...page.storage.read("autistmask"),
-        trackedTokens,
-    });
-}
-
-// 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 reading its balance", 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 reads the token's balance, which is zero.
-    await refreshOnce(page, []);
-
-    expect(newTokenRow(page)).toContain("0.0000");
-});
-
-test("closed and opened again before any refresh has read its balance, the new token's line still reads quantity unknown", async () => {
-    const closed = await bootOnAddress();
-    holdNextRefresh(closed);
-    await addNewToken(closed);
-    cleanupPopup();
-
-    // The refresh this boot starts reads no token's balance: the boot's stub
-    // of refreshBalances() reads none.
-    const page = await bootPopup(undefined, { storage: closed.storage });
-    expect(page.visibleViews()).toEqual(["address"]);
-    const row = newTokenRow(page);
-    expect(row).toContain("quantity unknown");
-    expect(row).not.toContain("0.0000");
-
-    await refreshOnce(page, [MILLION]);
-
-    expect(newTokenRow(page)).toContain("1000000.0000");
-});
-
-test("a refresh that could not read the new token's balance leaves its 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);
-
-    await page.click("btn-settings");
-    await addOnSettingsAddToken(page);
-    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");
-
-    await refreshOnce(page, null);
-
-    expect(page.node("address-token-balance").innerHTML).toContain("2.0000");
-});
-
-test("a token removed before any refresh has read its balance leaves nothing stored, and adding it again tracks it once", async () => {
-    const page = await bootPopup(unversionedValidProfile());
-    const removeButton = firstRemoveButton(page);
-    const stored = () => page.storage.read("autistmask");
-
-    await page.click("btn-settings");
-    await addOnSettingsAddToken(page);
-    // Settings opened again from Home draws its list with the token in it.
-    await page.click("btn-settings-addtoken-back");
-    await page.click("btn-settings-back");
-    await page.click("btn-settings");
-    await removeButton.press();
-    await page.settle();
-
-    expect(stored().trackedTokens).toEqual([]);
-    // Nothing in the stored record names the token any more.
-    expect(JSON.stringify(stored()).toLowerCase()).not.toContain(
-        NEW_TOKEN.toLowerCase(),
-    );
-
-    await addOnSettingsAddToken(page);
-    // A second add of the same token is refused.
-    page.node("settings-addtoken-address").value = NEW_TOKEN;
-    await page.click("btn-settings-addtoken-manual");
-
-    const added = { address: NEW_TOKEN, symbol: "NEW", decimals: 18 };
-    expect(stored().trackedTokens).toEqual([
-        { ...added, name: "New Token", balanceNotFetched: true },
-    ]);
-
-    await refreshOnce(page, []);
-
-    expect(stored().trackedTokens).toEqual([{ ...added, name: "New Token" }]);
-});
-
-test("a refresh on another network leaves the new token reading quantity unknown on its own", async () => {
-    // Sepolia tracks a token at the same contract address, also just added.
-    const sepoliaToken = {
-        address: NEW_TOKEN,
-        symbol: "SEP",
-        name: "Sepolia Token",
-        decimals: 18,
-    };
-    const page = await bootOnAddress({
-        networkTrackedTokens: {
-            sepolia: [{ ...sepoliaToken, balanceNotFetched: true }],
-        },
-    });
-    const finishMainnet = holdNextRefresh(page);
-    await addNewToken(page);
-
-    await page.click("btn-settings");
-    await chooseNetwork(page, "sepolia");
-    // The refresh Add started returns after the switch and writes nothing.
-    await finishMainnet([MILLION]);
-    // Sepolia's refresh reads the balance of its own token.
-    await refreshOnce(page, []);
-
-    const stored = page.storage.read("autistmask");
-    expect(stored.trackedTokens).toEqual([sepoliaToken]);
-    expect(stored.networkTrackedTokens.mainnet[0].balanceNotFetched).toBe(true);
-
-    await chooseNetwork(page, "mainnet");
-    await page.click("btn-settings-back");
-
-    expect(page.visibleViews()).toEqual(["address"]);
-    expect(newTokenRow(page)).toContain("quantity unknown");
-
-    await refreshOnce(page, [MILLION]);
-
-    expect(newTokenRow(page)).toContain("1000000.0000");
-});
-
-test("a refresh keeps a token that another page added after this page loaded", async () => {
-    const page = await bootOnAddress();
-    const finish = holdNextRefresh(page);
-    await addNewToken(page);
-    const otherAdded = { ...OTHER_TOKEN, balanceNotFetched: true };
-    anotherPageTracks(page, [
-        { ...NEW_TRACKED, balanceNotFetched: true },
-        otherAdded,
-    ]);
-
-    await finish([MILLION]);
-
-    expect(page.storage.read("autistmask").trackedTokens).toEqual([
-        NEW_TRACKED,
-        otherAdded,
-    ]);
-    expect(newTokenRow(page)).toContain("1000000.0000");
-});
-
-test("a refresh does not bring back a token that another page removed after this page loaded", async () => {
-    const page = await bootOnAddress({ trackedTokens: [OTHER_TOKEN] });
-    const finish = holdNextRefresh(page);
-    await addNewToken(page);
-    anotherPageTracks(page, [{ ...NEW_TRACKED, balanceNotFetched: true }]);
-
-    await finish([MILLION]);
-
-    expect(page.storage.read("autistmask").trackedTokens).toEqual([
-        NEW_TRACKED,
-    ]);
-});

tests/addressValue.test.js

@@ -1,9 +1,9 @@
 // The USD total of an address that holds something this build cannot price
 // (issue #261).
 //
-// Prices exist for the top 25 tokens only, so an address can hold real assets
-// with no price attached. Summing what is priced and printing the result as
-// the total says "$0.00" for an address holding nothing but unpriced tokens —
+// Only a token with a price feed has a price, so an address can hold real
+// assets with no price attached. Summing what is priced and printing the result
+// as the total says "$0.00" for an address holding nothing but unpriced tokens —
 // worth-nothing and worth-an-unknown-amount collapsed into one number, in the
 // direction that matters. The two are separate facts here, the same way an
 // absent holders_count is not a count of zero.
@@ -63,7 +63,7 @@ const PARTLY_PRICED = {
 beforeEach(() => {
     clearPrices();
     prices.ETH = 2000;
-    prices.USDC = 1;
+    prices[USDC] = 1;
     state.wallets = [];
     state.trackedTokens = [];
     state.showZeroBalanceTokens = false;

tests/balanceRefreshNetworkSwitch.test.js

@@ -41,7 +41,6 @@ async function holdRefresh(page) {
                 holders: null,
             },
         ];
-        return [];
     });
     const ticking = page.tick();
     await page.settle();

tests/blockscoutEtherscanSettings.test.js

@@ -720,7 +720,6 @@ describe("the popup", () => {
                 tokenRow(TRACKED, "TRK"),
                 tokenRow(UNTRACKED, "TST"),
             ];
-            return [];
         });
         const ticking = page.tick();
         await page.settle();
@@ -765,7 +764,6 @@ describe("the popup", () => {
                 addr.tokenBalances = after
                     ? [tokenRow(TRACKED, "TRK"), tokenRow(UNTRACKED, "TST")]
                     : [tokenRow(TRACKED, "TRK")];
-                return [];
             });
 
             anotherPageSaves(page, { useBlockscout: after });

tests/confirmTxNetworkSwitch.test.js

@@ -226,6 +226,7 @@ const PRIVATE_KEY = "0x" + "11".repeat(32);
 const HOLDER = new Wallet(PRIVATE_KEY).address;
 const RECIPIENT = "0xC0FfEE0000000000000000000000000000c0fFEe";
 const TOKEN = "0x7070707070707070707070707070707070707070";
+const USDC = "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48";
 const PASSWORD = "correct horse battery staple";
 
 function el(id) {
@@ -318,7 +319,7 @@ async function switchReopenAndGoBack(reviewedOn, switchedTo) {
     setBackRenderer(makeBackRenderer(state, { confirmTx }));
     confirmTx.init({});
     prices.ETH = 2000;
-    prices.USDC = 1;
+    prices[USDC] = 1;
     mockNode.asked = [];
     global.fetch.mockClear();
     goBack();
@@ -641,7 +642,7 @@ describe.each([
         test("of an ERC-20 token, links the token contract to that network's explorer and prices the token by that network", async () => {
             mockNode.tokenUnits[reviewedOn] = 50000000n;
             await review(reviewedOn, {
-                token: TOKEN,
+                token: USDC,
                 tokenSymbol: "USDC",
                 tokenDecimals: 6,
                 amount: "10",
@@ -652,7 +653,7 @@ describe.each([
                 "ERC-20 token transfer (USDC)",
             );
             expect(el("confirm-token-contract").innerHTML).toContain(
-                `href="${explorerUrl}/address/${TOKEN}"`,
+                `href="${explorerUrl}/address/${USDC}"`,
             );
             expect(el("confirm-amount").textContent).toBe(
                 "10.0000 USDC" + usdOn(reviewedOn, "$10.00"),

tests/deleteAddress.test.js

@@ -153,7 +153,7 @@ describe("the balance warning on the removal confirmation", () => {
 
     test("the USD total is shown when prices are known", () => {
         prices.ETH = 2000;
-        prices.USDC = 1;
+        prices[USDC] = 1;
         expect(balanceWarningHtml(TOKEN_ONLY)).toContain("Total: $2,500.00");
         expect(balanceWarningHtml(ETH_ONLY)).toContain("Total: $3,000.00");
     });

tests/e2e/dapp.js

@@ -43,12 +43,15 @@ const GAS_PRICE_WEI = BASE_FEE_WEI + PRIORITY_FEE_WEI;
 
 const STUB_BLOCK_NUMBER = 21000000;
 
-// A 32-byte zero word, returned for every eth_call. It is what makes ethers'
+// A 32-byte zero word, returned for every eth_call but a price feed's
+// latestRoundData() (see rpcResult() below). It is what makes ethers'
 // ENS reverse lookup resolve to "no resolver set" instead of throwing, and a
 // throw there reaches the console through src/shared/log.js, which fails the
 // run on its own.
 const ZERO_WORD = "0x" + "0".repeat(64);
 
+const SELECTOR_LATEST_ROUND_DATA = "0xfeaf968c";
+
 // One ETH, so the popup's balance lines render something and the wallet does
 // not look empty on the approval screen.
 const STUB_BALANCE_WEI = 10n ** 18n;
@@ -111,6 +114,15 @@ function rpcResult(req, state) {
         return latestBlock();
     }
 
+    // A price feed's latestRoundData() gets five zero words, as in network.js:
+    // a price of zero, which the wallet counts as no price.
+    const data = String(
+        (req.params && req.params[0] && req.params[0].data) || "",
+    );
+    if (method === "eth_call" && data.startsWith(SELECTOR_LATEST_ROUND_DATA)) {
+        return "0x" + "0".repeat(64 * 5);
+    }
+
     if (Object.prototype.hasOwnProperty.call(RPC_RESULTS, method)) {
         return RPC_RESULTS[method];
     }

tests/e2e/network.js

@@ -251,8 +251,13 @@ const SELECTOR_DECIMALS = "0x313ce567";
 const SELECTOR_SYMBOL = "0x95d89b41";
 const SELECTOR_NAME = "0x06fdde03";
 const SELECTOR_BALANCE_OF = "0x70a08231";
+const SELECTOR_LATEST_ROUND_DATA = "0xfeaf968c";
 
-// Every eth_call still answers with a zero word except decimals(), symbol(),
+// On any contract, a latestRoundData() call is answered with five zero words.
+// That is a round with a price of zero, which the wallet counts as no
+// price. So no screen shows a USD value beside the amounts the tests compare.
+//
+// Every other eth_call answers with a zero word except decimals(), symbol(),
 // name() and balanceOf() on the stub token. The wallet reads decimals() back
 // at signing time to compare with the scale the confirmation screen rendered
 // (issue #305). Adding the token by its contract address reads the first three
@@ -273,6 +278,9 @@ function ethCallResult(req, opts) {
     if (!call || typeof call !== "object") return ZERO_WORD;
     const data = String(call.data || call.input || "").toLowerCase();
     const to = String(call.to || "").toLowerCase();
+    if (data.startsWith(SELECTOR_LATEST_ROUND_DATA)) {
+        return "0x" + "0".repeat(64 * 5);
+    }
     if (to !== STUB_TOKEN.address) return ZERO_WORD;
     if (data.startsWith(SELECTOR_DECIMALS)) {
         return word(opts.tokenDecimalsOverride ?? STUB_TOKEN.decimals);
@@ -764,11 +772,6 @@ async function installNetworkStubs(ctx, opts) {
             }
         }
 
-        // CoinDesk price tick
-        if (url.hostname.endsWith("coindesk.com")) {
-            return jsonResponse(route, { Data: {} });
-        }
-
         // The interception canary's own request. Answered with nothing: what
         // is being observed is that it arrived here at all.
         if (url.href === WORKER_PROBE_URL) {

tests/e2e/run.js

@@ -969,8 +969,7 @@ 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. The refresh it starts draws the list again, with the row still
-    // in it.
+    // screen, and nothing renders the list again while the screen is up.
     const row = env.page.locator(
         '#address-balances [data-token="' + STUB_TOKEN.address + '"]',
         { hasText: STUB_TOKEN.symbol },

tests/firstWalletRefresh.test.js

@@ -48,7 +48,6 @@ async function boot(stored) {
         for (const wallet of wallets) {
             for (const addr of wallet.addresses) addr.balance = chainBalance;
         }
-        return [];
     });
     return { page, refreshBalances };
 }

tests/flashLine.test.js

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

tests/priceFeeds.test.js

@@ -0,0 +1,272 @@
+// USD prices are read from Chainlink price feeds on mainnet, through the RPC
+// endpoint (https://git.eeqj.de/sneak/AutistMask/issues/525).
+//
+// The real refreshPrices() runs against a fake JSON-RPC node, answered through
+// ethers' own request hook. The hook also records the body of every HTTP
+// request, so a test can count them.
+
+// prices.js pulls in state.js, which reads chrome.storage.local at load.
+globalThis.chrome = {
+    storage: { local: { get: async () => ({}), set: async () => {} } },
+};
+
+const { AbiCoder, FetchRequest } = require("ethers");
+const {
+    prices,
+    refreshPrices,
+    clearPrices,
+    getPrice,
+    getAddressValue,
+} = require("../src/shared/prices");
+const { state } = require("../src/shared/state");
+const {
+    TOKENS,
+    ETH_USD_FEED,
+    USD_PRICE_FEEDS,
+    PRICE_FEED_BY_ADDRESS,
+} = require("../src/shared/tokenList");
+
+const RPC_URL = "https://rpc.example.invalid";
+const NOW = Date.UTC(2026, 9, 27, 12, 0, 0);
+const NOW_SECONDS = NOW / 1000;
+
+const USDC = "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48";
+const LINK = "0x514910771af9ca656af840dff83e8264ecf986ca";
+const DAI = "0x6b175474e89094c44da98b954eedeac495271d0f";
+// A token at an address of its own that calls itself USDC.
+const FAKE_USDC = "0x9999999999999999999999999999999999999999";
+
+const ETH_FEED = ETH_USD_FEED.address.toLowerCase();
+const USDC_FEED = PRICE_FEED_BY_ADDRESS.get(USDC).address.toLowerCase();
+const LINK_FEED = PRICE_FEED_BY_ADDRESS.get(LINK).address.toLowerCase();
+const DAI_FEED = PRICE_FEED_BY_ADDRESS.get(DAI).address.toLowerCase();
+
+// What each feed answers, by its lowercased address: the price in the feed's
+// own units and the time it was written. A feed that is not here makes the
+// call fail.
+let rounds;
+// The parsed body of every HTTP request the node received.
+let requests;
+let logged;
+
+function round(answer, updatedAt = NOW_SECONDS) {
+    return { answer, updatedAt };
+}
+
+// One JSON-RPC answer, to a latestRoundData() call.
+function reply(req) {
+    const envelope = { jsonrpc: "2.0", id: req.id };
+    const answer = rounds[req.params[0].to.toLowerCase()];
+    if (!answer) {
+        return {
+            ...envelope,
+            error: { code: -32000, message: "fixture: read failed" },
+        };
+    }
+    return {
+        ...envelope,
+        result: AbiCoder.defaultAbiCoder().encode(
+            ["uint80", "int256", "uint256", "uint256", "uint80"],
+            [1, answer.answer, answer.updatedAt, answer.updatedAt, 1],
+        ),
+    };
+}
+
+// The feed addresses one HTTP request read, sorted.
+function feedsRead(body) {
+    return [body]
+        .flat()
+        .map((req) => req.params[0].to.toLowerCase())
+        .sort();
+}
+
+// One address that holds `held`, a list of [contract address, symbol].
+function holdTokens(held) {
+    state.wallets = [
+        {
+            addresses: [
+                {
+                    address: "0x" + "a".repeat(40),
+                    balance: "1.0",
+                    tokenBalances: held.map(([address, symbol]) => ({
+                        address,
+                        symbol,
+                        balance: "10.0",
+                    })),
+                },
+            ],
+        },
+    ];
+}
+
+beforeEach(() => {
+    clearPrices();
+    state.networkId = "mainnet";
+    state.rpcUrl = RPC_URL;
+    state.wallets = [];
+    state.trackedTokens = [];
+    rounds = { [ETH_FEED]: round(2000n * 10n ** 8n) };
+    requests = [];
+    logged = [];
+    jest.spyOn(Date, "now").mockReturnValue(NOW);
+    for (const level of ["error", "warn"]) {
+        jest.spyOn(console, level).mockImplementation((...args) => {
+            logged.push(args.map(String).join(" "));
+        });
+    }
+    FetchRequest.registerGetUrl(async (req) => {
+        const body = JSON.parse(Buffer.from(req.body).toString("utf8"));
+        requests.push(body);
+        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());
+    jest.restoreAllMocks();
+    clearPrices();
+});
+
+describe("refreshPrices", () => {
+    test("reads ETH and each held or tracked token that has a feed in one HTTP request", async () => {
+        holdTokens([
+            [USDC, "USDC"],
+            [LINK, "LINK"],
+        ]);
+        state.trackedTokens = [{ address: DAI, symbol: "DAI", decimals: 18 }];
+        rounds[USDC_FEED] = round(10n ** 8n);
+        rounds[LINK_FEED] = round(1150000000n);
+        rounds[DAI_FEED] = round(99990000n);
+
+        await refreshPrices();
+
+        expect(requests).toHaveLength(1);
+        expect(feedsRead(requests[0])).toEqual(
+            [ETH_FEED, USDC_FEED, LINK_FEED, DAI_FEED].sort(),
+        );
+        expect(getPrice("ETH")).toBe(2000);
+        expect(getPrice(USDC)).toBe(1);
+        expect(getPrice(LINK)).toBe(11.5);
+        expect(getPrice(DAI)).toBe(0.9999);
+    });
+
+    test("reads again only once 5 minutes have passed", async () => {
+        await refreshPrices();
+        Date.now.mockReturnValue(NOW + 299999);
+        await refreshPrices();
+        expect(requests).toHaveLength(1);
+
+        Date.now.mockReturnValue(NOW + 300000);
+        rounds[ETH_FEED] = round(2100n * 10n ** 8n, NOW_SECONDS + 300);
+        await refreshPrices();
+        expect(requests).toHaveLength(2);
+        expect(getPrice("ETH")).toBe(2100);
+    });
+
+    test("on Sepolia, reads nothing and keeps no price", async () => {
+        await refreshPrices();
+        expect(getPrice("ETH")).toBe(2000);
+
+        state.networkId = "sepolia";
+        await refreshPrices();
+        expect(requests).toHaveLength(1);
+        expect(Object.keys(prices)).toEqual([]);
+    });
+});
+
+describe("pairing by contract address", () => {
+    test("a token that copies a bundled token's symbol gets no price", async () => {
+        holdTokens([
+            [USDC, "USDC"],
+            [FAKE_USDC, "USDC"],
+        ]);
+        rounds[USDC_FEED] = round(10n ** 8n);
+
+        await refreshPrices();
+
+        expect(feedsRead(requests[0])).toEqual([ETH_FEED, USDC_FEED].sort());
+        expect(getPrice(USDC)).toBe(1);
+        expect(getPrice(FAKE_USDC)).toBeNull();
+        // 1 ETH and 10 real USDC are priced; the 10 look-alikes are not.
+        expect(getAddressValue(state.wallets[0].addresses[0])).toEqual({
+            usd: 2010,
+            partial: true,
+        });
+    });
+});
+
+describe("freshness", () => {
+    test("a reading older than its feed's heartbeat plus 30 minutes is no price", async () => {
+        const heartbeatAgo =
+            NOW_SECONDS - PRICE_FEED_BY_ADDRESS.get(USDC).heartbeat;
+        holdTokens([[USDC, "USDC"]]);
+
+        rounds[USDC_FEED] = round(10n ** 8n, heartbeatAgo - 1800 - 1);
+        await refreshPrices();
+        expect(getPrice(USDC)).toBeNull();
+
+        clearPrices();
+        rounds[USDC_FEED] = round(10n ** 8n, heartbeatAgo - 1800);
+        await refreshPrices();
+        expect(getPrice(USDC)).toBe(1);
+    });
+
+    test.each([0n, -1n])("an answer of %s is no price", async (answer) => {
+        rounds[ETH_FEED] = round(answer);
+        await refreshPrices();
+        expect(getPrice("ETH")).toBeNull();
+    });
+});
+
+describe("a failed read", () => {
+    test("leaves the token with no price and is logged with its error", async () => {
+        holdTokens([[USDC, "USDC"]]);
+        rounds[USDC_FEED] = round(10n ** 8n);
+        await refreshPrices();
+        expect(getPrice(USDC)).toBe(1);
+
+        Date.now.mockReturnValue(NOW + 300000);
+        delete rounds[USDC_FEED];
+        await refreshPrices();
+
+        expect(getPrice(USDC)).toBeNull();
+        expect(getPrice("ETH")).toBe(2000);
+        expect(
+            logged.some(
+                (line) =>
+                    line.includes("price feed read failed") &&
+                    line.includes(USDC),
+            ),
+        ).toBe(true);
+    });
+
+    test("an HTTP error is logged with its status", async () => {
+        FetchRequest.registerGetUrl(async () => ({
+            statusCode: 401,
+            statusMessage: "Unauthorized",
+            headers: { "content-type": "text/plain" },
+            body: Buffer.from("API key required"),
+        }));
+
+        await refreshPrices();
+
+        expect(getPrice("ETH")).toBeNull();
+        expect(logged.some((line) => line.includes("401"))).toBe(true);
+    });
+});
+
+describe("the feed table", () => {
+    test("names each token by its address as the bundled list spells it", () => {
+        const listed = new Set(TOKENS.map((t) => t.address));
+        const unlisted = Object.keys(USD_PRICE_FEEDS).filter(
+            (address) => !listed.has(address),
+        );
+        expect(unlisted).toEqual([]);
+    });
+});

tests/stateRecovery.test.js

@@ -23,6 +23,9 @@
 // version field, and showing those users a wipe prompt would be a worse defect
 // than the one being fixed. It is migrated in place and keeps working.
 
+const fs = require("fs");
+const path = require("path");
+
 const {
     bootPopup,
     cleanupPopup,
@@ -148,6 +151,29 @@ describe("the destructive reset on the recovery screen", () => {
     });
 });
 
+// A key or xprv wallet has no recovery phrase, so the erase warning names all
+// three backups (https://git.eeqj.de/sneak/AutistMask/issues/593). The boot
+// harness holds no static text, so this reads the markup itself.
+describe("the erase warning on the recovery screen", () => {
+    test("names the recovery phrase, the private key and the extended private key", () => {
+        const html = fs.readFileSync(
+            path.join(__dirname, "..", "src", "popup", "index.html"),
+            "utf8",
+        );
+        const start = html.indexOf('id="view-state-recovery"');
+        const end = html.indexOf('id="btn-state-recovery-reset"', start);
+        const screenText = html
+            .slice(start, end)
+            .replace(/<[^>]*>/g, " ")
+            .replace(/\s+/g, " ");
+
+        expect(screenText).toContain(
+            "If you kept a copy of a wallet's recovery phrase, private key or " +
+                "extended private key, you can add that wallet again.",
+        );
+    });
+});
+
 describe("a popup already open when the stored profile becomes unreadable", () => {
     // https://git.eeqj.de/sneak/AutistMask/issues/373. The popup used to stay
     // on the wallet list with the last good balances, and only a reopen

tests/support/popupBoot.js

@@ -279,11 +279,10 @@ async function bootPopup(stored, options) {
         getAddressValue: () => ({ usd: null, partial: false }),
     }));
     // scanForAddresses() answers in the real one's shape, a scan that found
-    // no used address: AddWallet reads `addresses` from it. refreshBalances()
-    // answers as a refresh that read no tracked token's balance.
+    // no used address: AddWallet reads `addresses` from it.
     jest.doMock("../../src/shared/balances", () => ({
         fetchTokenBalances: jest.fn(async () => []),
-        refreshBalances: jest.fn(async () => []),
+        refreshBalances: jest.fn(async () => {}),
         dropUntrackedTokens: jest.requireActual("../../src/shared/balances")
             .dropUntrackedTokens,
         lookupTokenInfo: jest.fn(async () => null),

tests/trackedTokenBalances.test.js

@@ -307,31 +307,3 @@ test("a tracked token wearing a known symbol from another contract is not listed
     );
     expect(first.tokenBalances).toEqual([]);
 });
-
-test("the refresh resolves with each tracked token whose balance it read at every address", async () => {
-    const flaky = "0x9999999999999999999999999999999999999999";
-    holdings[TOKEN] = { [FIRST]: 2000000n, [SECOND]: 0n };
-    // balanceOf answers at FIRST and fails at SECOND.
-    holdings[flaky] = { [FIRST]: 2000000n };
-    const read = await refreshBalances(
-        [
-            {
-                addresses: [
-                    { address: FIRST, tokenBalances: [] },
-                    { address: SECOND, tokenBalances: [] },
-                ],
-            },
-        ],
-        RPC_URL,
-        EXPLORER_URL,
-        [
-            TRACKED,
-            { address: flaky, symbol: "FLK", name: "Flaky", decimals: 6 },
-            // A known symbol from another contract: its balance is not read.
-            { address: OTHER, symbol: "USDC", name: "Fake", decimals: 6 },
-        ],
-        "mainnet",
-        new AbortController().signal,
-    );
-    expect(read).toEqual([TOKEN]);
-});

tests/trackedTokensPerNetwork.test.js

@@ -159,9 +159,7 @@ test("a token added by contract address on Sepolia is tracked on Sepolia only",
         "sepolia",
         expect.anything(),
     );
-    // No refresh has read the new token's balance yet.
-    const added = { ...SEPOLIA_TOKEN, balanceNotFetched: true };
-    expect(stored().trackedTokens).toEqual([added]);
+    expect(stored().trackedTokens).toEqual([SEPOLIA_TOKEN]);
 
     await boot.click("btn-settings");
     await chooseNetwork(boot, "mainnet");
@@ -173,7 +171,7 @@ test("a token added by contract address on Sepolia is tracked on Sepolia only",
 
     await chooseNetwork(boot, "sepolia");
     expect(stored().networkId).toBe("sepolia");
-    expect(stored().trackedTokens).toEqual([added]);
+    expect(stored().trackedTokens).toEqual([SEPOLIA_TOKEN]);
     const onSepolia = boot.node("settings-tracked-tokens").innerHTML;
     expect(onSepolia).toContain("TST");
     expect(onSepolia).not.toContain("DAI");

tests/uniswap.test.js

@@ -3310,6 +3310,334 @@ describe("uniswap decoder", () => {
 
             expect(detail(result, "Amount").value).toBe("Up to 1000.0000 USDT");
         });
+
+        // https://git.eeqj.de/sneak/AutistMask/issues/660 — Permit2 has no
+        // allowance of ETH, so a permit on the zero address reads as one on a
+        // token nothing knows. On next at 53551c6 such a permit's Allowance
+        // token line read ETH. A permit of 1 wei of the zero address before a
+        // V4 step of 5 ETH made the Amount line read 0.000000000000000001 ETH.
+        // With that permit to another spender and a SETTLE the router pays, no
+        // line gave the 5 ETH.
+        describe("a permit on the zero address", () => {
+            const FIVE_ETH = 5000000000000000000n;
+            // The lines of a permit of `amount` base units of the zero
+            // address for `spender`.
+            const zeroAddressLines = (amount, spender) => [
+                [
+                    "Permit2 allowance",
+                    amount + " base units (decimals unknown)",
+                ],
+                ["Allowance token", ZERO_ADDR],
+                ["Allowance spender", getAddress(spender)],
+            ];
+            // A V4 swap of 5 ETH for USDC. The user pays its SETTLE when
+            // `payerIsUser` is true; otherwise the router pays it from the
+            // transaction's value.
+            const v4FiveEth = (payerIsUser) =>
+                encodeV4Swap(
+                    new Uint8Array([
+                        V4_SWAP_EXACT_IN_SINGLE_ID,
+                        V4_SETTLE_ID,
+                        V4_TAKE_ALL_ID,
+                    ]),
+                    [
+                        encodeV4ExactInSingle(
+                            ZERO_ADDR,
+                            USDC_ADDR,
+                            FIVE_ETH,
+                            1n,
+                        ),
+                        settle(ZERO_ADDR, FIVE_ETH, payerIsUser),
+                        encodeV4TakeAll(USDC_ADDR, 1n),
+                    ],
+                );
+
+            test("a PERMIT2_PERMIT on the zero address names the address", () => {
+                const result = decodeSteps(
+                    [0x00, 0x0a],
+                    [
+                        V3_600,
+                        encodePermit2(
+                            ZERO_ADDR,
+                            1000000000000000000n,
+                            ROUTER_ADDR,
+                        ),
+                    ],
+                );
+                expect(linesBetweenTokens(result)).toEqual([
+                    ["Amount", "600.0000 USDT"],
+                    ...zeroAddressLines("1000000000000000000", ROUTER_ADDR),
+                ]);
+                expect(detail(result, "Allowance token").address).toBe(
+                    ZERO_ADDR,
+                );
+            });
+
+            test("a PERMIT2_PERMIT_BATCH entry on the zero address names the address", () => {
+                const result = decodeSteps(
+                    [0x03, 0x00],
+                    [
+                        encodePermit2Batch(
+                            [
+                                [USDT_ADDR, USDT_600],
+                                [ZERO_ADDR, 1000000000000000000n],
+                            ],
+                            ROUTER_ADDR,
+                        ),
+                        V3_600,
+                    ],
+                );
+                expect(linesBetweenTokens(result)).toEqual([
+                    ["Amount", "600.0000 USDT"],
+                    ...USDT_600_LINES,
+                    ...zeroAddressLines("1000000000000000000", ROUTER_ADDR),
+                ]);
+            });
+
+            test("a PERMIT2_PERMIT of 1 wei of the zero address, then a V4 step of 5 ETH the user settles, shows the 5 ETH", () => {
+                const result = decodeSteps(
+                    [0x0a, 0x10],
+                    [
+                        encodePermit2(ZERO_ADDR, 1n, ROUTER_ADDR),
+                        v4FiveEth(true),
+                    ],
+                );
+                expect(detail(result, "Token In").value).toBe("ETH (native)");
+                expect(linesBetweenTokens(result)).toEqual([
+                    ["Amount", "5.0000 ETH"],
+                    ...zeroAddressLines("1", ROUTER_ADDR),
+                ]);
+            });
+
+            test("a PERMIT2_PERMIT of 1 wei of the zero address to another spender, then a V4 step of 5 ETH the router settles, shows the 5 ETH", () => {
+                const result = decodeSteps(
+                    [0x0a, 0x10],
+                    [
+                        encodePermit2(ZERO_ADDR, 1n, OTHER_ADDR),
+                        v4FiveEth(false),
+                    ],
+                );
+                expect(detail(result, "Token In").value).toBe("ETH (native)");
+                expect(linesBetweenTokens(result)).toEqual([
+                    ["Amount", "5.0000 ETH"],
+                    ...zeroAddressLines("1", OTHER_ADDR),
+                ]);
+            });
+
+            test("a PERMIT2_PERMIT_BATCH entry of 1 wei of the zero address to another spender, then a V4 step of 5 ETH the router settles, shows the 5 ETH", () => {
+                const result = decodeSteps(
+                    [0x03, 0x10],
+                    [
+                        encodePermit2Batch([[ZERO_ADDR, 1n]], OTHER_ADDR),
+                        v4FiveEth(false),
+                    ],
+                );
+                expect(detail(result, "Token In").value).toBe("ETH (native)");
+                expect(linesBetweenTokens(result)).toEqual([
+                    ["Amount", "5.0000 ETH"],
+                    ...zeroAddressLines("1", OTHER_ADDR),
+                ]);
+            });
+        });
+
+        // https://git.eeqj.de/sneak/AutistMask/issues/685 — Permit2 moves no
+        // ETH, so a PERMIT2_TRANSFER_FROM of the zero address reads as a move
+        // of a token nothing knows. On next at ec6b6b5 its lines read ETH,
+        // with an ETH figure.
+        describe("a PERMIT2_TRANSFER_FROM of the zero address", () => {
+            const MOVED_AMOUNT =
+                "1000000000000000000 base units (decimals unknown)";
+
+            test("to another address names the address", () => {
+                const result = decodeSteps(
+                    [0x00, 0x02],
+                    [V3_600, transfer(ZERO_ADDR, OTHER_ADDR, ONE_WETH)],
+                );
+                expect(linesBetweenTokens(result)).toEqual([
+                    ["Amount", "600.0000 USDT"],
+                    ["Moved from the sender", MOVED_AMOUNT],
+                    ["Token moved", ZERO_ADDR],
+                    ["Moved to", OTHER_ADDR],
+                ]);
+                expect(detail(result, "Token moved").address).toBe(ZERO_ADDR);
+            });
+
+            test("into the router names the address", () => {
+                const result = decodeSteps(
+                    [0x02, 0x00],
+                    [transfer(ZERO_ADDR, ROUTER_ADDR, ONE_WETH), V3_600],
+                );
+                expect(detail(result, "Paid to").value).toBe(
+                    "The router, " +
+                        MOVED_AMOUNT +
+                        " from the sender (later steps may not spend all of it)",
+                );
+                expect(detail(result, "Token moved into the router")).toEqual({
+                    label: "Token moved into the router",
+                    value: ZERO_ADDR,
+                    address: ZERO_ADDR,
+                    isToken: true,
+                });
+            });
+
+            // A V4 exact-out step of ETH whose SETTLE the user pays states no
+            // amount. The step's lines say that the ETH amount is not known.
+            test("after a V4 exact-out step of ETH, also shows that the ETH amount is not known", () => {
+                const v4EthExactOut = encodeV4Swap(
+                    new Uint8Array([
+                        V4_SWAP_EXACT_OUT_SINGLE_ID,
+                        V4_SETTLE_ID,
+                        V4_TAKE_ALL_ID,
+                    ]),
+                    [
+                        encodeV4ExactOutSingle(
+                            ZERO_ADDR,
+                            USDC_ADDR,
+                            590000000n,
+                            ONE_WETH,
+                        ),
+                        encodeV4Settle(ZERO_ADDR),
+                        encodeV4TakeAll(USDC_ADDR, 0n),
+                    ],
+                );
+                const result = decodeSteps(
+                    [0x10, 0x02],
+                    [v4EthExactOut, transfer(ZERO_ADDR, OTHER_ADDR, ONE_WETH)],
+                );
+                expect(detail(result, "Token In").value).toBe("ETH (native)");
+                expect(linesBetweenTokens(result)).toEqual([
+                    ["Moved from the sender", UNDECODED],
+                    ["Token moved", "ETH"],
+                    ["Moved to", "The swap step that spends it"],
+                    ["Moved from the sender", MOVED_AMOUNT],
+                    ["Token moved", ZERO_ADDR],
+                    ["Moved to", OTHER_ADDR],
+                ]);
+            });
+        });
+
+        // https://git.eeqj.de/sneak/AutistMask/issues/682 — V4 pays a SETTLE
+        // of ETH from the router's own ETH, whichever payer the SETTLE names,
+        // and the router holds the transaction's value. On next at 36b2002 a
+        // SETTLE of 1 ETH that names the router as payer gave no ETH line.
+        describe("a V4 SETTLE of ETH that names the router as payer", () => {
+            const ONE_ETH = 1000000000000000000n;
+            // A V4 swap of `amount` of ETH for USDC. The SETTLE names the
+            // router as payer.
+            const v4EthFromRouter = (amount) =>
+                encodeV4Swap(
+                    new Uint8Array([
+                        V4_SWAP_EXACT_IN_SINGLE_ID,
+                        V4_SETTLE_ID,
+                        V4_TAKE_ALL_ID,
+                    ]),
+                    [
+                        encodeV4ExactInSingle(ZERO_ADDR, USDC_ADDR, amount, 1n),
+                        settle(ZERO_ADDR, amount, false),
+                        encodeV4TakeAll(USDC_ADDR, 1n),
+                    ],
+                );
+
+            test("after a V3 exact-in of 600 USDT, shows the 1 ETH moved from the sender", () => {
+                const result = decodeSteps(
+                    [0x00, 0x10],
+                    [V3_600, v4EthFromRouter(ONE_ETH)],
+                );
+                expect(linesBetweenTokens(result)).toEqual([
+                    ["Amount", "600.0000 USDT"],
+                    ["Moved from the sender", "1.0000 ETH"],
+                    ["Token moved", "ETH"],
+                    ["Moved to", "The swap step that spends it"],
+                ]);
+            });
+
+            // The UNWRAP_WETH leaves ETH in the router. The SETTLE may spend
+            // that ETH before the transaction's value.
+            test("after an UNWRAP_WETH into the router, shows at most 1 ETH moved from the sender", () => {
+                const result = decodeSteps(
+                    [0x00, 0x0c, 0x10],
+                    [
+                        encodeV3SwapExactIn(ROUTER_ADDR, USDT_600, 1n, [
+                            USDT_ADDR,
+                            WETH_ADDR,
+                        ]),
+                        encodeWrapEth(ROUTER_ADDR, 0n), // UNWRAP_WETH, same encoding
+                        v4EthFromRouter(ONE_ETH),
+                    ],
+                );
+                expect(linesBetweenTokens(result)).toEqual([
+                    ["Amount", "600.0000 USDT"],
+                    ["Moved from the sender", "Up to 1.0000 ETH"],
+                    ["Token moved", "ETH"],
+                    ["Moved to", "The swap step that spends it"],
+                ]);
+            });
+
+            test("after a WRAP_ETH of 0.5 ETH, adds the SETTLE's 0.5 ETH to the Amount line", () => {
+                const result = decodeSteps(
+                    [0x0b, 0x10],
+                    [
+                        encodeWrapEth(ROUTER_ADDR, ONE_ETH / 2n),
+                        v4EthFromRouter(ONE_ETH / 2n),
+                    ],
+                );
+                expect(linesBetweenTokens(result)).toEqual([
+                    ["Amount", "1.0000 ETH"],
+                ]);
+            });
+
+            // The WRAP_ETH sets Token In to ETH, and the UNWRAP_WETH leaves
+            // ETH in the router. The SETTLE may spend that ETH before the
+            // transaction's value, so its 1 ETH never joins the Amount line.
+            test("after a WRAP_ETH and an UNWRAP_WETH into the router, keeps the Amount line and shows at most 1 ETH moved from the sender", () => {
+                const result = decodeSteps(
+                    [0x0b, 0x0c, 0x10],
+                    [
+                        encodeWrapEth(ROUTER_ADDR, ONE_ETH / 2n),
+                        encodeWrapEth(ROUTER_ADDR, 0n), // UNWRAP_WETH, same encoding
+                        v4EthFromRouter(ONE_ETH),
+                    ],
+                );
+                expect(linesBetweenTokens(result)).toEqual([
+                    ["Amount", "0.5000 ETH"],
+                    ["Moved from the sender", "Up to 1.0000 ETH"],
+                    ["Token moved", "ETH"],
+                    ["Moved to", "The swap step that spends it"],
+                ]);
+            });
+
+            // A SETTLE of CONTRACT_BALANCE pays all the router holds, an
+            // amount the calldata does not state.
+            test("of CONTRACT_BALANCE, on the step that sets the input side, shows an unknown amount moved from the sender", () => {
+                const result = decodeSteps(
+                    [0x10],
+                    [
+                        encodeV4Swap(
+                            new Uint8Array([
+                                V4_SWAP_EXACT_IN_SINGLE_ID,
+                                V4_SETTLE_ID,
+                                V4_TAKE_ALL_ID,
+                            ]),
+                            [
+                                encodeV4ExactInSingle(
+                                    ZERO_ADDR,
+                                    USDC_ADDR,
+                                    ONE_ETH,
+                                    1n,
+                                ),
+                                settle(ZERO_ADDR, 2n ** 255n, false), // CONTRACT_BALANCE
+                                encodeV4TakeAll(USDC_ADDR, 1n),
+                            ],
+                        ),
+                    ],
+                );
+                expect(linesBetweenTokens(result)).toEqual([
+                    ["Moved from the sender", UNDECODED],
+                    ["Token moved", "ETH"],
+                    ["Moved to", "The swap step that spends it"],
+                ]);
+            });
+        });
     });
 
     // https://git.eeqj.de/sneak/AutistMask/issues/359 — the output half, in

tests/uniswapRecipient.test.js

@@ -1661,9 +1661,18 @@ describe("any token left in the router is not received", () => {
             ),
             min: "1990.0000 USDC",
         },
-        {
-            kind: "a swap paying WETH to the router, an UNWRAP_WETH into the router, then a V4 swap settling all the ETH from the router",
-            data: execute(
+    ])("$kind reads as a swap paid to the user", ({ data, min }) => {
+        const result = decode(data);
+        expect(labels(result)).toEqual(PAID_TO_USER);
+        expect(detail(result, "Min. received").value).toBe(min);
+    });
+
+    // https://git.eeqj.de/sneak/AutistMask/issues/682 — the SETTLE spends all
+    // the router's ETH, the transaction's value included, so the sender pays
+    // an amount the calldata does not state.
+    test("a swap paying WETH to the router, an UNWRAP_WETH into the router, then a V4 swap settling all the ETH from the router reads as a swap paid to the user", () => {
+        const result = decode(
+            execute(
                 swapToWeth(ADDRESS_THIS),
                 unwrapWeth(ADDRESS_THIS),
                 v4Swap(
@@ -1672,12 +1681,23 @@ describe("any token left in the router is not received", () => {
                     takeAll(USDC),
                 ),
             ),
-            min: "1990.0000 USDC",
-        },
-    ])("$kind reads as a swap paid to the user", ({ data, min }) => {
-        const result = decode(data);
-        expect(labels(result)).toEqual(PAID_TO_USER);
-        expect(detail(result, "Min. received").value).toBe(min);
+        );
+        expect(labels(result)).toEqual([
+            "Protocol",
+            "Token In",
+            "Amount",
+            "Moved from the sender",
+            "Token moved",
+            "Moved to",
+            "Token Out",
+            "Min. received",
+            "Steps",
+            "Deadline",
+        ]);
+        expect(detail(result, "Moved from the sender").value).toBe(
+            "Unknown (could not be decoded)",
+        );
+        expect(detail(result, "Min. received").value).toBe("1990.0000 USDC");
     });
 });
 

tests/unknownScaleDisplay.test.js

@@ -103,7 +103,7 @@ describe("balanceLine", () => {
     });
 
     test("an unknown quantity produces no fiat figure, a zero one does", () => {
-        prices.NOVEL = 3;
+        prices[NOVEL] = 3;
         const unknown = balanceLine("NOVEL", null, 3, NOVEL);
         const zero = balanceLine("NOVEL", 0, 3, NOVEL);
         // A price times an unknown quantity is not $0.00: that is the same
@@ -162,7 +162,7 @@ describe("getAddressValue", () => {
     // make it incomplete.
     test("an unknown balance makes the total partial, a zero balance does not", () => {
         prices.ETH = 2000;
-        prices.NOVEL = 3;
+        prices[NOVEL] = 3;
         const unknown = getAddressValue(address(null));
         const zero = getAddressValue(address("0.0"));
         expect(unknown).not.toEqual(zero);
@@ -172,7 +172,7 @@ describe("getAddressValue", () => {
 
     test("an unknown balance is not priced as zero of the token", () => {
         prices.ETH = 2000;
-        prices.NOVEL = 3;
+        prices[NOVEL] = 3;
         // The same row with a real quantity of 10 is worth $30. Neither that
         // figure nor a confident $0.00 may be stated for the unknown one.
         expect(getAddressValue(address("10.0"))).toEqual({