Compare commits
1
Commits
next
..
acb2d00b5a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
acb2d00b5a |
@@ -418,10 +418,6 @@ Each group of these assertions records a coverage key and a final case demands
|
|||||||
the exact set, so a section that silently stopped running reddens the suite
|
the exact set, so a section that silently stopped running reddens the suite
|
||||||
instead of quietly shrinking it.
|
instead of quietly shrinking it.
|
||||||
|
|
||||||
It also covers the red banner on the Settings screen: switching the network
|
|
||||||
there to Sepolia must put up the `[TESTNET]` banner, and switching back to
|
|
||||||
mainnet must take it down, both while Settings is still on screen.
|
|
||||||
|
|
||||||
It also covers the confirmation screen, for both a native ETH send and an ERC-20
|
It also covers the confirmation screen, for both a native ETH send and an ERC-20
|
||||||
send: Send disabled while the fee estimate is in flight, enabled once it lands,
|
send: Send disabled while the fee estimate is in flight, enabled once it lands,
|
||||||
the fee block quoting the expected cost and the reserve separately, the distinct
|
the fee block quoting the expected cost and the reserve separately, the distinct
|
||||||
@@ -434,15 +430,6 @@ reserve while sitting on the same side of the estimate, so swapping the two in
|
|||||||
what [#154](https://git.eeqj.de/sneak/AutistMask/issues/154) was, and it was
|
what [#154](https://git.eeqj.de/sneak/AutistMask/issues/154) was, and it was
|
||||||
previously correct by reading only.
|
previously correct by reading only.
|
||||||
|
|
||||||
It also covers a send that Sign & Send refuses for its network fee: the stub
|
|
||||||
node quotes an ordinary fee while the confirmation screen is drawn and one over
|
|
||||||
the bound when Sign & Send asks again, and the refusal must broadcast nothing
|
|
||||||
and leave the password field and Sign & Send where they were. It checks the same
|
|
||||||
for a send refused because the selected wallet does not hold its From address:
|
|
||||||
with the confirmation screen showing a send from the HD wallet, the key wallet
|
|
||||||
is selected by writing it straight into extension storage, as another popup
|
|
||||||
selecting it would save it, and the popup is reopened onto that screen.
|
|
||||||
|
|
||||||
It also covers both ways the wait for a sent transaction's receipt ends on the
|
It also covers both ways the wait for a sent transaction's receipt ends on the
|
||||||
error screen: lookups that still find no receipt 60 seconds after the broadcast,
|
error screen: lookups that still find no receipt 60 seconds after the broadcast,
|
||||||
and six lookups in a row that fail. Each must show its own message, and Done
|
and six lookups in a row that fail. Each must show its own message, and Done
|
||||||
@@ -500,12 +487,9 @@ papered over:
|
|||||||
forced by clicking Reveal and the settings gear in one page task, which a
|
forced by clicking Reveal and the settings gear in one page task, which a
|
||||||
person cannot do; the case a person can hit, the first decrypt after the popup
|
person cannot do; the case a person can hit, the first decrypt after the popup
|
||||||
opens while libsodium is still loading, is not driven.
|
opens while libsodium is still loading, is not driven.
|
||||||
- Approval windows open at 1280x720 whatever size the extension asks for. The
|
- Approval windows open at 1280x720 whatever size the extension asks for, so
|
||||||
site-connection prompt and the transaction approval are checked for sideways
|
whether an approval screen fits its window is checked in the Firefox suite
|
||||||
scrolling at 396x600 by sizing the page itself for that measurement only, and
|
only.
|
||||||
the rest of each test runs at 1280x720. That leaves out the window's frame and
|
|
||||||
the page widening its window, so whether an approval screen fits its window is
|
|
||||||
checked in the Firefox suite only.
|
|
||||||
|
|
||||||
Any test that drives a failure path on purpose declares the `console.error` it
|
Any test that drives a failure path on purpose declares the `console.error` it
|
||||||
is about to provoke, via `errors.expect()`. That is not a mute: the declaration
|
is about to provoke, via `errors.expect()`. That is not a mute: the declaration
|
||||||
@@ -1029,12 +1013,10 @@ rendered differently on two screens.
|
|||||||
|
|
||||||
The native token's label is a network's `nativeCurrency` in
|
The native token's label is a network's `nativeCurrency` in
|
||||||
`src/shared/networks.js`: `ETH` on mainnet, `SepoliaETH` on Sepolia. The
|
`src/shared/networks.js`: `ETH` on mainnet, `SepoliaETH` on Sepolia. The
|
||||||
wallet's balances and the Send screen, which sends on the active network, use
|
wallet's balances and the Send and confirmation screens, which send on the
|
||||||
the active network's. The confirmation screen uses the one of the network its
|
active network, use the active network's. A transaction's figures use the one of
|
||||||
transaction was reviewed on, the network active when Send showed it, even after
|
the network its chain id names, whichever network is active: the value and fee
|
||||||
the network is switched in Settings. A transaction's figures use the one of the
|
on the approval screen, the amount on the wait, success and error screens, the
|
||||||
network its chain id names, whichever network is active: the value and fee on
|
|
||||||
the approval screen, the amount on the wait, success and error screens, the
|
|
||||||
transaction history and the transaction detail screen, and the refusal of a fee
|
transaction history and the transaction detail screen, and the refusal of a fee
|
||||||
above 1 ETH. A chain id that names no network reads `ETH`. Wherever this
|
above 1 ETH. A chain id that names no network reads `ETH`. Wherever this
|
||||||
document shows ETH as the label of a native balance, value or fee, in a "Native
|
document shows ETH as the label of a native balance, value or fee, in a "Native
|
||||||
@@ -1093,49 +1075,42 @@ The rule and its exception live in `src/shared/amountDisplay.js` as
|
|||||||
confirmation screens display goes through the floored one — the ERC-20 amount,
|
confirmation screens display goes through the floored one — the ERC-20 amount,
|
||||||
the ETH value and max fee (`src/popup/views/approval.js`), the swap's `Amount`
|
the ETH value and max fee (`src/popup/views/approval.js`), the swap's `Amount`
|
||||||
and `Min. received` lines (`src/shared/uniswap.js`), the Send screen's
|
and `Min. received` lines (`src/shared/uniswap.js`), the Send screen's
|
||||||
`Current balance` (`src/popup/views/send.js`), and the amount, balance and
|
`Current balance` (`src/popup/views/send.js`), and the balance and network fee
|
||||||
network fee on the confirmation screen for the wallet's own send
|
on the confirmation screen for the wallet's own send
|
||||||
(`src/popup/views/confirmTx.js`), which hands the wait, success and error
|
(`src/popup/views/confirmTx.js`). Both screens render a network fee through
|
||||||
screens the amount as it showed it. The transaction is still signed for the
|
`formatFee()` in `src/popup/views/helpers.js`, which prices the exact fee in USD
|
||||||
exact amount, and its USD value is priced from it. Both screens render a network
|
rather than its truncated figure, so the same fee reads the same on both, USD
|
||||||
fee through `formatFee()` in `src/popup/views/helpers.js`, which prices the
|
value included. Balances are stored exactly (`src/shared/balances.js`), whatever
|
||||||
exact fee in USD rather than its truncated figure, so the same fee reads the
|
decimals a token declares, so a balance below the floor reaches these screens as
|
||||||
same on both, USD value included. Balances are stored exactly
|
it is. The history list (`src/shared/transactions.js`) uses the unfloored one:
|
||||||
(`src/shared/balances.js`), whatever decimals a token declares, so a balance
|
the transaction detail view is the authoritative record and already shows exact
|
||||||
below the floor reaches these screens as it is. The history list
|
precision. The balance lists use neither: they round to four places with
|
||||||
(`src/shared/transactions.js`) uses the unfloored one: the transaction detail
|
`toFixed(4)` (`balanceLine()` in `src/popup/views/helpers.js`). The 4-decimal
|
||||||
view is the authoritative record and already shows exact precision. The balance
|
rule is unchanged everywhere else, including for amounts at or above the floor
|
||||||
lists use neither: they round to four places with `toFixed(4)` (`balanceLine()`
|
on the approval screens.
|
||||||
in `src/popup/views/helpers.js`). The 4-decimal rule is unchanged everywhere
|
|
||||||
else, including for amounts at or above the floor on the approval screens.
|
|
||||||
|
|
||||||
On the approval screen and the wait, success and error screens that carry its
|
The floor applies only where the token's scale is known. Where it is not, the
|
||||||
amount forward, the floor applies only where the token's scale is known. Where
|
approval screen states base units instead of a quantity — see Unknown token
|
||||||
it is not, they state base units instead of a quantity — see Unknown token scale
|
scale below — and no truncation happens at all.
|
||||||
below — and no truncation happens at all. On ConfirmTx and the wait, success and
|
|
||||||
error screens that follow it, the amount of a token whose scale is unknown,
|
|
||||||
which cannot be sent, is the text from Send's amount field cut to four decimals
|
|
||||||
with the same floor (`.5` reads `.5000`).
|
|
||||||
|
|
||||||
**Specific Exception — unknown token scale:** Calldata carries base units and no
|
**Specific Exception — unknown token scale:** Calldata carries base units and no
|
||||||
scale, so every amount on the dApp approval screen needs the token's `decimals`.
|
scale, so every amount on the dApp approval screen needs the token's `decimals`.
|
||||||
It is resolved from the bundled token list, then from the tokens the user tracks
|
It is resolved from the bundled token list, then from the tokens the user
|
||||||
on the network the transaction is for, then, when that is the active network,
|
tracks, then from what the block explorer reported for the contract
|
||||||
from what the block explorer reported for the contract in the wallet's balances,
|
(`resolveTokenDecimals()` in `src/shared/approvalAmount.js`). Where none of them
|
||||||
which are the active network's only (`resolveTokenDecimals()` in
|
answers, the amount is not formatted: the line reads
|
||||||
`src/shared/approvalAmount.js`). Where none of them answers, the amount is not
|
`5000000000 base units (decimals unknown)`. A guessed scale is not an
|
||||||
formatted: the line reads `5000000000 base units (decimals unknown)`. A guessed
|
approximation but a different number — 1,000 units of a 6-decimal token
|
||||||
scale is not an approximation but a different number — 1,000 units of a
|
formatted at 18 decimals reads `0.000000001` — on the screen whose only job is
|
||||||
6-decimal token formatted at 18 decimals reads `0.000000001` — on the screen
|
to state what is being authorized. Both amount paths of that screen take this
|
||||||
whose only job is to state what is being authorized. Both amount paths of that
|
rule: the ERC-20 `transfer`/`approve` line (`src/popup/views/approval.js`) and
|
||||||
screen take this rule: the ERC-20 `transfer`/`approve` line
|
the swap's `Amount` and `Min. received` lines (`src/shared/uniswap.js`). The
|
||||||
(`src/popup/views/approval.js`) and the swap's `Amount` and `Min. received`
|
token permission warning on the signature screen takes the same rule for its
|
||||||
lines (`src/shared/uniswap.js`). The token permission warning on the signature
|
amounts. An unbounded allowance or permit needs no scale to describe and is
|
||||||
screen takes the same rule for its amounts. An unbounded allowance or permit
|
still shown as `Unlimited`. A source's answer counts only if it is a whole
|
||||||
needs no scale to describe and is still shown as `Unlimited`. A source's answer
|
number from 0 to 80: `decimals()` returns a `uint8`, but `formatUnits()` cannot
|
||||||
counts only if it is a whole number from 0 to 80: `decimals()` returns a
|
format more than 80 decimal places, so a token that reports 81 to 255 is shown
|
||||||
`uint8`, but `formatUnits()` cannot format more than 80 decimal places, so a
|
as one whose scale nothing knows.
|
||||||
token that reports 81 to 255 is shown as one whose scale nothing knows.
|
|
||||||
|
|
||||||
The rule holds only if nothing invents a scale UPSTREAM of it. Those three
|
The rule holds only if nothing invents a scale UPSTREAM of it. Those three
|
||||||
sources are read as authoritative, so a value written into one of them cannot be
|
sources are read as authoritative, so a value written into one of them cannot be
|
||||||
@@ -1167,9 +1142,8 @@ fetched, without that cross-address check, and shows the row's figure.
|
|||||||
|
|
||||||
**Decoded amount lines on the transaction approval screen:** the `Amount` line
|
**Decoded amount lines on the transaction approval screen:** the `Amount` line
|
||||||
of a decoded ERC-20 call, and the `Amount` and `Min. received` lines of a
|
of a decoded ERC-20 call, and the `Amount` and `Min. received` lines of a
|
||||||
decoded swap (see TxApproval below; `Min. received` reads `Min. paid out` unless
|
decoded swap (see TxApproval below), do not always read as a number. They can
|
||||||
only the user is paid, see Transaction Decoding), do not always read as a
|
read:
|
||||||
number. They can read:
|
|
||||||
|
|
||||||
- A formatted quantity, e.g. `17.1900 USDT`, when the token's scale is known:
|
- A formatted quantity, e.g. `17.1900 USDT`, when the token's scale is known:
|
||||||
truncated to four decimals, with the floor and the zero cases described above.
|
truncated to four decimals, with the floor and the zero cases described above.
|
||||||
@@ -1179,22 +1153,28 @@ number. They can read:
|
|||||||
- `Unlimited`: on the ERC-20 `Amount` line, an `approve` of the `uint256`
|
- `Unlimited`: on the ERC-20 `Amount` line, an `approve` of the `uint256`
|
||||||
maximum, an unbounded allowance. On the swap's `Amount` line, any amount at or
|
maximum, an unbounded allowance. On the swap's `Amount` line, any amount at or
|
||||||
above the `uint160` maximum, whichever step set the line: a `PERMIT2_PERMIT`
|
above the `uint160` maximum, whichever step set the line: a `PERMIT2_PERMIT`
|
||||||
amount at that maximum, which is an unbounded permit, or a V2 or V3 exact-in
|
amount at that maximum, which is an unbounded permit, or a V2 or V3 exact-in,
|
||||||
or exact-out or `WRAP_ETH` amount that large, which is not an allowance. The
|
V2 exact-out or `WRAP_ETH` amount that large, which is not an allowance. The
|
||||||
router's whole-balance value, `CONTRACT_BALANCE` (`2^255`), is one such
|
router's whole-balance value, `CONTRACT_BALANCE` (`2^255`), is one such
|
||||||
amount.
|
amount.
|
||||||
- `Up to <amount>`: the swap's `Amount` line, when the transaction has a V2 or
|
- `Up to <amount>`: the swap's `Amount` line, when the transaction has a V2
|
||||||
V3 exact-out step, whichever step set the line, including the `WRAP_ETH` of a
|
exact-out step, whichever step set the line, including the `WRAP_ETH` of a
|
||||||
swap paid in ETH and a `PERMIT2_PERMIT`. The swap spends at most that figure,
|
swap paid in ETH and a `PERMIT2_PERMIT`. The swap spends at most that figure,
|
||||||
not necessarily all of it; the wait, success and error screens show it with
|
not necessarily all of it; the wait, success and error screens show it with
|
||||||
the same words. `Unlimited`, `All available (V4 open delta)` and
|
the same words. `Unlimited`, `All available (V4 open delta)` and
|
||||||
`Whatever an earlier step sent to the pair (V2 already paid)` keep their
|
`Whatever an earlier step sent to the pair (V2 already paid)` keep their
|
||||||
wording. When a V2 or V3 exact-out step sets `Min. received`, that line shows
|
wording. When a V2 exact-out step sets `Min. received`, that line shows its
|
||||||
its `amountOut`, the exact amount it buys.
|
`amountOut`, the exact amount it buys.
|
||||||
- `All available (V4 open delta)`: the swap's `Amount` line, when the amount it
|
- `All available (V4 open delta)`: the swap's `Amount` line, when the amount it
|
||||||
shows is a V4 exact-in `amountIn` of zero. V4 reads that zero as "use the
|
shows is a V4 exact-in `amountIn` of zero. V4 reads that zero as "use the
|
||||||
whole open delta", so the calldata states no quantity. Transaction Decoding
|
whole open delta", so the calldata states no quantity. The line shows the
|
||||||
below gives the steps whose amounts the line shows.
|
amount of the step that sets the input side: the last `PERMIT2_PERMIT` step if
|
||||||
|
there is one, otherwise the first V2 or V3 exact-in, V2 exact-out, `WRAP_ETH`
|
||||||
|
or V4 swap step that names an input token or amount. A V4 step with a swap
|
||||||
|
action sets the input side when no earlier step set it, even when it names
|
||||||
|
neither, as described below. A V2 exact-out step gives its `amountInMax`, and
|
||||||
|
a V4 swap step the `amountIn` of the swap action that spends its input
|
||||||
|
currency.
|
||||||
- `Whatever an earlier step sent to the pair (V2 already paid)`: the swap's
|
- `Whatever an earlier step sent to the pair (V2 already paid)`: the swap's
|
||||||
`Amount` line, when the amount it shows is a V2 exact-in `amountIn` of zero.
|
`Amount` line, when the amount it shows is a V2 exact-in `amountIn` of zero.
|
||||||
The router reads that zero as "the pair already holds the input tokens": the
|
The router reads that zero as "the pair already holds the input tokens": the
|
||||||
@@ -1210,13 +1190,7 @@ number. They can read:
|
|||||||
guarantees nothing: it sets `Token Out` and `Min. received` only when the
|
guarantees nothing: it sets `Token Out` and `Min. received` only when the
|
||||||
output side holds no minimum, not even a zero one, at the point the check is
|
output side holds no minimum, not even a zero one, at the point the check is
|
||||||
reached, and otherwise leaves the current token and figure in place. A nonzero
|
reached, and otherwise leaves the current token and figure in place. A nonzero
|
||||||
`minBalance` sets both lines, as a swap step does. Only a check of the
|
`minBalance` sets both lines, as a swap step does.
|
||||||
transaction's sender's own balance sets either line; a check of any other
|
|
||||||
address sets neither (see Transaction Decoding). A `BALANCE_CHECK_ERC20` step
|
|
||||||
that the router lets fail without reverting the transaction (see Transaction
|
|
||||||
Decoding) guarantees nothing either, whatever its `minBalance`, and is read as
|
|
||||||
one whose `minBalance` is zero. A minimum stated by a V4 swap step the router
|
|
||||||
lets fail is likewise read as zero.
|
|
||||||
|
|
||||||
The swap's `Token In` and `Token Out` lines name a currency, not an amount; each
|
The swap's `Token In` and `Token Out` lines name a currency, not an amount; each
|
||||||
reads `Unknown (not named in the calldata)` when the decoder found no token for
|
reads `Unknown (not named in the calldata)` when the decoder found no token for
|
||||||
@@ -1244,33 +1218,17 @@ only when no earlier step set it. It finds each side by three rules:
|
|||||||
`Amount` or `Min. received`. A side they did not name is unknown, and the
|
`Amount` or `Min. received`. A side they did not name is unknown, and the
|
||||||
step sets it as unknown with no figure.
|
step sets it as unknown with no figure.
|
||||||
|
|
||||||
Under each of these rules, when the user pays the step any of the input
|
|
||||||
currency, its `Amount` is instead what the user pays it of that currency when
|
|
||||||
the decoder knows that amount, and otherwise there is none (see Transaction
|
|
||||||
Decoding). So a step whose USDT-for-USDC swap action could not be read, with a
|
|
||||||
`SETTLE` of 400 USDT paid by the user, reads `Amount 400.0000 USDT`.
|
|
||||||
|
|
||||||
A V4 step with no swap action sets only the sides its `SETTLE`, `SETTLE_ALL`,
|
A V4 step with no swap action sets only the sides its `SETTLE`, `SETTLE_ALL`,
|
||||||
`TAKE` or `TAKE_ALL` names.
|
`TAKE` or `TAKE_ALL` names.
|
||||||
|
|
||||||
An `UNWRAP_WETH` step makes `Token Out` ETH only when no step set the output
|
An `UNWRAP_WETH` step makes `Token Out` ETH only when the output side is WETH,
|
||||||
side, or when the output side is WETH, on mainnet or Sepolia, that the step that
|
on mainnet or Sepolia, or when no step set the output side; a WETH
|
||||||
set it paid to the router and that the router still holds when the `UNWRAP_WETH`
|
`Min. received` figure then reads in ETH. Otherwise `Token Out` and
|
||||||
runs (Transaction Decoding below gives what the router holds). The router
|
`Min. received` keep the output side's own token and figure, whether the swap
|
||||||
unwraps only the WETH it holds, so WETH that step paid to the user, or to anyone
|
was paid in ETH or in a token: a V2 exact-out swap that buys USDC and then
|
||||||
else, stays WETH: a swap that pays the router WETH, then a swap that pays the
|
unwraps the WETH it did not spend shows USDC. The token permission warning on
|
||||||
user WETH, then an unwrap, shows WETH with the second swap's minimum. The
|
the signature screen has its own amount wording, including `Unknown`; the
|
||||||
minimum reads in ETH when that step paid all its WETH to the router. When it
|
SignApproval section below describes it.
|
||||||
paid only part of it to the router, as a V4 step does that `TAKE`s some of its
|
|
||||||
WETH to the user and the rest to the router, or paid the router WETH beside a
|
|
||||||
payout the decoder cannot read, the swap shows ETH with no minimum: the decoder
|
|
||||||
does not count how much of that step's minimum reaches the router, nor read the
|
|
||||||
`UNWRAP_WETH`'s own minimum. A later step that sets the output side sets it
|
|
||||||
anew. Otherwise `Token Out` and `Min. received` keep the output side's own token
|
|
||||||
and figure, whether the swap was paid in ETH or in a token: a V2 exact-out swap
|
|
||||||
that buys USDC and then unwraps the WETH it did not spend shows USDC. The token
|
|
||||||
permission warning on the signature screen has its own amount wording, including
|
|
||||||
`Unknown`; the SignApproval section below describes it.
|
|
||||||
|
|
||||||
The swap's `Deadline` line is the router's deadline as a UTC date and time, e.g.
|
The swap's `Deadline` line is the router's deadline as a UTC date and time, e.g.
|
||||||
`2026-02-27 08:25:51`. A JavaScript date reaches only to 275760-09-13 00:00:00
|
`2026-02-27 08:25:51`. A JavaScript date reaches only to 275760-09-13 00:00:00
|
||||||
@@ -1389,19 +1347,6 @@ carries a `schemaVersion` — `STATE_SCHEMA_VERSION` in
|
|||||||
`saveState()` and the background's `updateState()` both do, so whichever context
|
`saveState()` and the background's `updateState()` both do, so whichever context
|
||||||
wrote last, the record says which build's shape it is in.
|
wrote last, the record says which build's shape it is in.
|
||||||
|
|
||||||
Each write reads the record, changes it and writes it back, holding a lock from
|
|
||||||
the read to the write: the browser's own (`navigator.locks`), taken through
|
|
||||||
`withLock()` in `src/shared/browserApi.js`. Every page of the extension and its
|
|
||||||
background share it, except a page in a Firefox private window, which Firefox
|
|
||||||
gives locks of its own (see https://git.eeqj.de/sneak/AutistMask/issues/646).
|
|
||||||
The popup's `saveState()`, the background's `updateState()` and the
|
|
||||||
StateRecovery reset all take it, so among the pages and the background that
|
|
||||||
share it, no write lands between another write's read and its write, where it
|
|
||||||
would be lost. Chrome has it from version 69, older than any Chrome that runs a
|
|
||||||
Manifest V3 extension, in pages and in the service worker; Firefox from version
|
|
||||||
96, older than the 115 `manifest/firefox.json` declares. Where it is missing, a
|
|
||||||
write fails rather than going ahead without it.
|
|
||||||
|
|
||||||
Version 1 is the shape that shipped before versions existed, so a stored record
|
Version 1 is the shape that shipped before versions existed, so a stored record
|
||||||
with no `schemaVersion` is version 1 rather than a defect: it loads normally and
|
with no `schemaVersion` is version 1 rather than a defect: it loads normally and
|
||||||
is migrated in place by being stamped on the first write. An upgrade never shows
|
is migrated in place by being stamped on the first write. An upgrade never shows
|
||||||
@@ -1550,21 +1495,6 @@ such as an edit typed into Settings and not yet saved. Home is the one screen
|
|||||||
"Back" always re-renders, so the wallet list reflects anything that changed
|
"Back" always re-renders, so the wallet list reflects anything that changed
|
||||||
while the user was away from it.
|
while the user was away from it.
|
||||||
|
|
||||||
A network switch in Settings leaves every screen beneath Settings showing the
|
|
||||||
previous network, so after it "Back" behaves as in a reopened popup: every
|
|
||||||
screen on the stack counts as not yet rendered, and the stack is cut at the
|
|
||||||
first screen that cannot be rendered from saved state, such as Send or AddToken,
|
|
||||||
or at AddressToken for any token but the native one, because that token was
|
|
||||||
picked on the previous network. The cut stack is saved with the switch, so a
|
|
||||||
popup closed straight after it and reopened onto Settings lands in the same
|
|
||||||
place. "Back" then renders the screen it lands on for the new network, and
|
|
||||||
anything typed there and not saved, which belonged to the previous network, is
|
|
||||||
dropped. ConfirmTx, WaitTx, SuccessTx, ErrorTx and TransactionDetail are
|
|
||||||
rendered instead for the network of the transaction they show: the network it
|
|
||||||
was reviewed on for ConfirmTx, and the network it was sent on for the others.
|
|
||||||
Without a wallet the stack is not cut, because it starts at Welcome, which shows
|
|
||||||
nothing from a network.
|
|
||||||
|
|
||||||
Every screen that holds secret material in the page registers a cleanup with
|
Every screen that holds secret material in the page registers a cleanup with
|
||||||
`onViewLeave()` (`src/popup/views/helpers.js`), which `showView()` runs on every
|
`onViewLeave()` (`src/popup/views/helpers.js`), which `showView()` runs on every
|
||||||
exit from that screen rather than only on its "Back" button, so nothing secret
|
exit from that screen rather than only on its "Back" button, so nothing secret
|
||||||
@@ -1806,59 +1736,42 @@ view would leave a wallet one click from deletion.
|
|||||||
- Token contract: full address + etherscan link (ERC-20 only)
|
- Token contract: full address + etherscan link (ERC-20 only)
|
||||||
- From: blockie + color dot + full address + etherscan link + wallet title
|
- From: blockie + color dot + full address + etherscan link + wallet title
|
||||||
- To: blockie + color dot + full address + etherscan link + ENS name
|
- To: blockie + color dot + full address + etherscan link + ENS name
|
||||||
- Amount: value + symbol (USD in parentheses), the value to four decimal
|
- Amount: value + symbol (USD in parentheses). An ETH amount Send's "Max"
|
||||||
places with the nonzero floor, as on TxApproval (see Display Consistency),
|
filled in is worked out again from this screen's own fee estimate when it
|
||||||
however Send's amount field wrote it (`.5` and `0.5` both read `0.5000`).
|
arrives, as the balance minus the reserve, and the transaction is signed
|
||||||
For a token whose scale is unknown, which cannot be sent, the value is the
|
with that estimate's fee fields, so a fee fetched again at signing cannot
|
||||||
text from Send's amount field cut the same way (`.5` reads `.5000`). An
|
exceed what the amount leaves behind. The address keeps whatever part of
|
||||||
ETH amount Send's "Max" filled in is worked out again from this screen's
|
the reserve the transaction does not use. If the balance no longer covers
|
||||||
own fee estimate when it arrives, as the balance minus the reserve, and
|
the fee, the amount is left as it was and the amount-plus-fee error below
|
||||||
the transaction is signed with that estimate's fee fields, so a fee
|
blocks the send
|
||||||
fetched again at signing cannot exceed what the amount leaves behind. The
|
- Your balance: value + symbol (USD in parentheses), or `unknown (SYMBOL)`
|
||||||
address keeps whatever part of the reserve the transaction does not use.
|
for a token whose scale is unknown
|
||||||
If the balance could not be read or no longer covers the fee, the amount
|
|
||||||
is left as it was and one of the errors below blocks the send
|
|
||||||
- Your balance: the From address's balance on the network its transaction
|
|
||||||
was reviewed on, read from that network's RPC endpoint each time the
|
|
||||||
screen is shown, so a screen the popup reopens onto states and checks that
|
|
||||||
network's balance as it is then, whichever network is active. "Loading..."
|
|
||||||
until the read returns, then value + symbol (USD in parentheses), or
|
|
||||||
`unknown (SYMBOL)` for a token whose scale is unknown or when the read
|
|
||||||
failed. The amount check uses the same balances: the ETH balance, and for
|
|
||||||
a token transfer the token balance as well
|
|
||||||
- Network fee: "Estimating..." then two lines, or "Unable to estimate",
|
- Network fee: "Estimating..." then two lines, or "Unable to estimate",
|
||||||
fetched async once the balance is read. The first line is what the
|
fetched async. The first line is what the transfer is expected to cost,
|
||||||
transfer is expected to cost, `gasLimit * gasPrice` (USD in parentheses);
|
`gasLimit * gasPrice` (USD in parentheses); the second is the
|
||||||
the second is the `gasLimit * maxFeePerGas` reserve the node requires,
|
`gasLimit * maxFeePerGas` reserve the node requires, which is what the
|
||||||
which is what the balance check gates on. The second line is omitted on a
|
balance check gates on. The second line is omitted on a network with no
|
||||||
network with no type-2 pricing, where the two are the same number, but its
|
type-2 pricing, where the two are the same number, but its space is
|
||||||
space is reserved either way
|
reserved either way
|
||||||
- Warnings: inline warnings from the local checks (scam address, self-send)
|
- Warnings: inline warnings from the local checks (scam address, self-send)
|
||||||
plus four reserved warning boxes made visible by the async checks —
|
plus four reserved warning boxes made visible by the async checks —
|
||||||
recipient that has never sent a transaction and holds no ETH, recipient is
|
recipient that has never sent a transaction and holds no ETH, recipient is
|
||||||
a contract, burn address, and an Etherscan phishing/scam label. An address
|
a contract, burn address, and an Etherscan phishing/scam label. An address
|
||||||
that has received ETH but never sent a transaction still holds that ETH,
|
that has received ETH but never sent a transaction still holds that ETH,
|
||||||
so it gets no warning
|
so it gets no warning
|
||||||
- Errors (an invalid amount), plus five reserved error boxes, so the balance
|
- Errors (insufficient balance), plus three reserved error boxes — the
|
||||||
and the fee arriving later move nothing — the amount exceeds the balance
|
amount plus the fee exceeds the balance (ETH transfers), not enough ETH to
|
||||||
(for a token whose scale is unknown it says the token's balance is
|
pay the fee for the transfer (ERC-20 transfers), and the fee could not be
|
||||||
unknown), the balance could not be read (it asks the user to go back and
|
estimated. The first two are mutually exclusive per transfer type, so only
|
||||||
try again), the amount plus the fee exceeds the balance (ETH transfers),
|
the applicable one holds space. The last names its cause: for a token
|
||||||
not enough ETH to pay the fee for the transfer (ERC-20 transfers), and the
|
whose scale is unknown the fee can never be estimated, and it says the
|
||||||
fee could not be estimated. The third and fourth are mutually exclusive
|
wallet does not know how many decimal places the token uses and that the
|
||||||
per transfer type, so only the applicable one holds space. The last names
|
transaction cannot be sent; for any other failure it asks the user to go
|
||||||
its cause: for a token whose scale is unknown the fee can never be
|
back and try again
|
||||||
estimated, and it says the wallet does not know how many decimal places
|
|
||||||
the token uses and that the transaction cannot be sent; for any other
|
|
||||||
failure it asks the user to go back and try again
|
|
||||||
- Three more reserved error boxes, made visible when "Sign & Send" refuses a
|
|
||||||
send because the active network changed, because the selected wallet does
|
|
||||||
not hold the From address, or because of its gas limit or fee (see
|
|
||||||
Transitions), so the refusal moves nothing
|
|
||||||
- Password: an inline field on this screen, not a modal, with its own error
|
- Password: an inline field on this screen, not a modal, with its own error
|
||||||
line
|
line
|
||||||
- "Sign & Send" button (disabled if errors, while the balance is being read,
|
- "Sign & Send" button (disabled if errors, and while the network fee
|
||||||
and while the network fee estimate is pending or unavailable)
|
estimate is pending or unavailable)
|
||||||
- **Transitions**:
|
- **Transitions**:
|
||||||
- "Sign & Send" (correct password) → broadcast tx → **WaitTx**
|
- "Sign & Send" (correct password) → broadcast tx → **WaitTx**
|
||||||
- "Sign & Send" (correct password) → broadcast fails → **ErrorTx**
|
- "Sign & Send" (correct password) → broadcast fails → **ErrorTx**
|
||||||
@@ -1869,38 +1782,19 @@ view would leave a wallet one click from deletion.
|
|||||||
the contract's own answer is read at signing time only to be compared with
|
the contract's own answer is read at signing time only to be compared with
|
||||||
it, and a disagreement is a refusal rather than a preference for either
|
it, and a disagreement is a refusal rather than a preference for either
|
||||||
value (`src/shared/transferAmount.js`)
|
value (`src/shared/transferAmount.js`)
|
||||||
- "Sign & Send" after the active network was switched in Settings since this
|
- "Sign & Send" after the active network was switched in Settings while this
|
||||||
transaction was reviewed → nothing is signed; "The active network changed
|
screen was open → nothing is signed; "The active network changed after
|
||||||
after this transaction was reviewed, so it was not sent. Please go back
|
this transaction was reviewed, so it was not sent. Please go back and
|
||||||
and review it again." in its own box, no screen change. After a switch,
|
review it again." in the errors box, no screen change. The transaction
|
||||||
"Back" from Settings draws this screen again from the saved transaction,
|
carries the chain id of the network the screen was shown for, so it cannot
|
||||||
as a popup reopened onto it does; when Send is beneath it on the stack, as
|
be signed for another
|
||||||
when Send showed it in the same popup, "Back" lands below Send instead
|
|
||||||
(see the top of Screen Map). The transaction carries the chain id of the
|
|
||||||
network active when Send showed this screen, and keeps it when the screen
|
|
||||||
is drawn again from the saved transaction, so it cannot be signed for
|
|
||||||
another. The screen describes it on that network, whichever network is
|
|
||||||
active: its amounts are in that network's native currency, its USD values
|
|
||||||
are that network's, so a testnet transaction shows none, its From, To and
|
|
||||||
token contract links open that network's explorer, the balance read, the
|
|
||||||
fee estimate and the contract and never-sent recipient checks ask that
|
|
||||||
network's RPC endpoint, and the Etherscan label check asks that network's
|
|
||||||
explorer
|
|
||||||
- "Sign & Send" (correct password) when the gas limit, a fee per gas or the
|
|
||||||
total fee the RPC endpoint fills in at signing is over its bound in
|
|
||||||
`assertWithinCeilings()` (`src/shared/approvalVerify.js`) → nothing is
|
|
||||||
signed; "The gas limit or fee the RPC endpoint quoted for this transaction
|
|
||||||
is more than this wallet will sign for, so it was not sent. Please go back
|
|
||||||
and try again." in its own box, the same sentence for all three, no screen
|
|
||||||
change
|
|
||||||
- "Sign & Send" (wrong password) → "Wrong password." on the password error
|
- "Sign & Send" (wrong password) → "Wrong password." on the password error
|
||||||
line, no screen change
|
line, no screen change
|
||||||
- "Sign & Send" signs as the From address above, not as whichever address is
|
- "Sign & Send" signs as the From address above, not as whichever address is
|
||||||
selected: the two are saved separately, so the popup can reopen onto this
|
selected: the two are saved separately, so the popup can reopen onto this
|
||||||
screen with another address selected. When the selected wallet does not
|
screen with another address selected. When the selected wallet does not
|
||||||
hold the From address → nothing is signed; "The selected wallet does not
|
hold the From address → full-sentence error on the password error line,
|
||||||
hold the From address above, so nothing was sent. Please go back and send
|
nothing sent (no screen change)
|
||||||
again." in its own box, no screen change
|
|
||||||
- "Sign & Send" (correct password, but the From address's key is refused,
|
- "Sign & Send" (correct password, but the From address's key is refused,
|
||||||
see Data Model) → nothing is signed → **ErrorTx** saying why
|
see Data Model) → nothing is signed → **ErrorTx** saying why
|
||||||
- "Back" → **Send**
|
- "Back" → **Send**
|
||||||
@@ -1920,17 +1814,14 @@ view would leave a wallet one click from deletion.
|
|||||||
no recipient." instead
|
no recipient." instead
|
||||||
- Transaction hash: full hash (tap to copy) + etherscan link
|
- Transaction hash: full hash (tap to copy) + etherscan link
|
||||||
- Count-up timer: "Waiting for confirmation... Ns"
|
- Count-up timer: "Waiting for confirmation... Ns"
|
||||||
- **Behavior**: Polls `getTransactionReceipt` every 10 seconds. The screen
|
- **Behavior**: Polls `getTransactionReceipt` every 10 seconds. The wait is
|
||||||
describes the transaction on the network it was sent on, whichever network is
|
persisted: closing and reopening the popup resumes the poll, with the elapsed
|
||||||
active: the receipt is asked of that network's RPC endpoint, the one Settings
|
counter and the timeout deadline still measured from the original broadcast. A
|
||||||
has for it, and the To and hash links open that network's explorer. The wait
|
lookup that fails is retried on the next tick rather than counted as a missing
|
||||||
is persisted: closing and reopening the popup resumes the poll, with the
|
receipt, because a failed lookup says nothing about the transaction; but six
|
||||||
elapsed counter and the timeout deadline still measured from the original
|
failures in a row (60 seconds at the poll cadence) end the wait, so an RPC
|
||||||
broadcast. A lookup that fails is retried on the next tick rather than counted
|
that never answers cannot leave it running indefinitely. Any lookup that
|
||||||
as a missing receipt, because a failed lookup says nothing about the
|
answers resets that count.
|
||||||
transaction; but six failures in a row (60 seconds at the poll cadence) end
|
|
||||||
the wait, so an RPC that never answers cannot leave it running indefinitely.
|
|
||||||
Any lookup that answers resets that count.
|
|
||||||
- **Transitions**:
|
- **Transitions**:
|
||||||
- Receipt found → **SuccessTx**
|
- Receipt found → **SuccessTx**
|
||||||
- A lookup that answers "no receipt" 60 seconds or more after broadcast →
|
- A lookup that answers "no receipt" 60 seconds or more after broadcast →
|
||||||
@@ -1951,12 +1842,9 @@ view would leave a wallet one click from deletion.
|
|||||||
- Amount + symbol
|
- Amount + symbol
|
||||||
- To: color dot + full address + etherscan link, or for a contract creation
|
- To: color dot + full address + etherscan link, or for a contract creation
|
||||||
the same sentence as on WaitTx
|
the same sentence as on WaitTx
|
||||||
- Block number + etherscan link
|
- Block number
|
||||||
- Transaction hash: full hash (tap to copy) + etherscan link
|
- Transaction hash: full hash (tap to copy) + etherscan link
|
||||||
- "Done" button
|
- "Done" button
|
||||||
- **Behavior**: As on WaitTx, every etherscan link on the screen opens the
|
|
||||||
explorer of the network the transaction was sent on, whichever network is
|
|
||||||
active.
|
|
||||||
- **Transitions**:
|
- **Transitions**:
|
||||||
- "Done" in the approval popup → closes the popup window
|
- "Done" in the approval popup → closes the popup window
|
||||||
- "Done" otherwise → resets the navigation stack, then → **AddressToken**
|
- "Done" otherwise → resets the navigation stack, then → **AddressToken**
|
||||||
@@ -1976,9 +1864,6 @@ view would leave a wallet one click from deletion.
|
|||||||
- Transaction hash section (hidden if broadcast failed before getting hash):
|
- Transaction hash section (hidden if broadcast failed before getting hash):
|
||||||
full hash (tap to copy) + etherscan link
|
full hash (tap to copy) + etherscan link
|
||||||
- "Done" button
|
- "Done" button
|
||||||
- **Behavior**: As on WaitTx, every etherscan link on the screen opens the
|
|
||||||
explorer of the network the transaction was sent on, whichever network is
|
|
||||||
active.
|
|
||||||
- **Transitions**:
|
- **Transitions**:
|
||||||
- "Done" in the approval popup → closes the popup window
|
- "Done" in the approval popup → closes the popup window
|
||||||
- "Done" otherwise → resets the navigation stack, then → **AddressToken**
|
- "Done" otherwise → resets the navigation stack, then → **AddressToken**
|
||||||
@@ -2001,10 +1886,7 @@ view would leave a wallet one click from deletion.
|
|||||||
#### TransactionDetail (`transaction`)
|
#### TransactionDetail (`transaction`)
|
||||||
|
|
||||||
- **When**: User tapped a transaction row on Home, AddressDetail, or
|
- **When**: User tapped a transaction row on Home, AddressDetail, or
|
||||||
AddressToken. The screen describes the transaction on the network it was sent
|
AddressToken.
|
||||||
on, whichever network is active: its block, network details, decoded details
|
|
||||||
and raw data are read from that network's Blockscout, the one Settings has for
|
|
||||||
it, and its etherscan links open that network's explorer.
|
|
||||||
- **Elements** (grouped into logical blocks using light well containers; field
|
- **Elements** (grouped into logical blocks using light well containers; field
|
||||||
labels are self-explanatory so groups have no headings):
|
labels are self-explanatory so groups have no headings):
|
||||||
- "Transaction" heading, "Back" button
|
- "Transaction" heading, "Back" button
|
||||||
@@ -2012,11 +1894,7 @@ view would leave a wallet one click from deletion.
|
|||||||
- Type: transaction classification — one of: Native ETH Transfer, ERC-20
|
- Type: transaction classification — one of: Native ETH Transfer, ERC-20
|
||||||
Token Transfer, Swap, Token Approval, Contract Call, Contract Creation. A
|
Token Transfer, Swap, Token Approval, Contract Call, Contract Creation. A
|
||||||
transfer with a token contract is an ERC-20 Token Transfer whatever symbol
|
transfer with a token contract is an ERC-20 Token Transfer whatever symbol
|
||||||
the token reports. A call named `execute` or `multicall` is a Swap, here
|
the token reports.
|
||||||
and on its history row, only when it was sent to one of the Universal
|
|
||||||
Router addresses Uniswap publishes for the network it was sent on (see
|
|
||||||
Transaction Decoding); sent to any other contract, its history row shows
|
|
||||||
the method name and this line reads Contract Call.
|
|
||||||
- Status: "Success" or "Failed"
|
- Status: "Success" or "Failed"
|
||||||
- From: blockie + color dot + full address (tap to copy) + etherscan link;
|
- From: blockie + color dot + full address (tap to copy) + etherscan link;
|
||||||
ENS name if available
|
ENS name if available
|
||||||
@@ -2047,18 +1925,13 @@ view would leave a wallet one click from deletion.
|
|||||||
- Contract address input
|
- Contract address input
|
||||||
- Status line ("Looking up token...", cleared or replaced on failure)
|
- Status line ("Looking up token...", cleared or replaced on failure)
|
||||||
- Common token quick-pick buttons (top 25 by market cap), which fill the
|
- Common token quick-pick buttons (top 25 by market cap), which fill the
|
||||||
contract address input. Shown on Ethereum Mainnet only, because the
|
contract address input
|
||||||
bundled token list holds mainnet contracts
|
|
||||||
- "Add" button
|
- "Add" button
|
||||||
- **Transitions**:
|
- **Transitions**:
|
||||||
- "Add" (valid contract) → tracks the token, pops the stack, and re-renders
|
- "Add" (valid contract) → tracks the token, pops the stack, and re-renders
|
||||||
**AddressDetail**
|
**AddressDetail**
|
||||||
- "Add" with a token already tracked, a scam-listed address, or a failed
|
- "Add" with a token already tracked, a scam-listed address, or a failed
|
||||||
contract lookup → flash message, no screen change
|
contract lookup → flash message, no screen change
|
||||||
- "Add", then a network switch in Settings before the contract lookup
|
|
||||||
answers → nothing is tracked; "The active network changed before the
|
|
||||||
lookup finished, so the token was not added." flash message, no screen
|
|
||||||
change
|
|
||||||
- "Back" → previous screen (AddressDetail)
|
- "Back" → previous screen (AddressDetail)
|
||||||
|
|
||||||
#### Settings (`settings`)
|
#### Settings (`settings`)
|
||||||
@@ -2069,19 +1942,16 @@ view would leave a wallet one click from deletion.
|
|||||||
- Wallets: one row per wallet with its name (tap to rename inline), a
|
- Wallets: one row per wallet with its name (tap to rename inline), a
|
||||||
`[recovery phrase]` button on HD wallets only, and an `[x]` delete button,
|
`[recovery phrase]` button on HD wallets only, and an `[x]` delete button,
|
||||||
plus a "+ Add wallet" button
|
plus a "+ Add wallet" button
|
||||||
- Tracked Tokens: one row per token tracked on the active network with an
|
- Tracked Tokens: one row per tracked token with an `[x]` remove button,
|
||||||
`[x]` remove button, plus a "+ Add token" button
|
plus a "+ Add token" button
|
||||||
- Display: "Show tracked tokens with zero balance" checkbox, "UTC
|
- Display: "Show tracked tokens with zero balance" checkbox, "UTC
|
||||||
Timestamps" checkbox, and a Theme selector (System / Light / Dark)
|
Timestamps" checkbox, and a Theme selector (System / Light / Dark)
|
||||||
- Network: network selector (Ethereum Mainnet / Sepolia Testnet). The
|
- Network: network selector (Ethereum Mainnet / Sepolia Testnet). The
|
||||||
network changes only here, or when the user approves a site's request on
|
network changes only here, or when the user approves a site's request on
|
||||||
**NetworkApproval**; either way, switching restores the RPC and Blockscout
|
**NetworkApproval**; either way, switching restores the RPC and Blockscout
|
||||||
endpoints last used on that network, or that network's defaults if it has
|
endpoints last used on that network, or that network's defaults if it has
|
||||||
none, and the tokens tracked on that network, and sends `chainChanged`
|
none, and sends `chainChanged` with the new chain id to every open tab.
|
||||||
with the new chain id to every open tab. A token is tracked only on the
|
Choosing the network already active changes nothing and sends nothing
|
||||||
network it was added on, because a contract address names a token on one
|
|
||||||
network only. Choosing the network already active changes nothing and
|
|
||||||
sends nothing
|
|
||||||
- Ethereum RPC: endpoint URL input + "Save" button (validated against
|
- Ethereum RPC: endpoint URL input + "Save" button (validated against
|
||||||
`eth_chainId` before being saved)
|
`eth_chainId` before being saved)
|
||||||
- Blockscout API: endpoint URL input + "Save" button (validated against
|
- Blockscout API: endpoint URL input + "Save" button (validated against
|
||||||
@@ -2126,8 +1996,7 @@ view would leave a wallet one click from deletion.
|
|||||||
- `[x]` on a denied site → forgets the refusal, in place; it connects
|
- `[x]` on a denied site → forgets the refusal, in place; it connects
|
||||||
nothing and tells the background nothing
|
nothing and tells the background nothing
|
||||||
- Ten clicks on the version → reveals the Debug well (no screen change)
|
- Ten clicks on the version → reveals the Debug well (no screen change)
|
||||||
- "Back" (or Settings gear again) → previous screen (Home); after a network
|
- "Back" (or Settings gear again) → previous screen (Home)
|
||||||
switch, the stack is cut first (see the top of Screen Map)
|
|
||||||
|
|
||||||
#### ShowRecoveryPhrase (`show-phrase`)
|
#### ShowRecoveryPhrase (`show-phrase`)
|
||||||
|
|
||||||
@@ -2310,8 +2179,7 @@ view would leave a wallet one click from deletion.
|
|||||||
#### SettingsAddToken (`settings-addtoken`)
|
#### SettingsAddToken (`settings-addtoken`)
|
||||||
|
|
||||||
- **When**: User tapped "+ Add token" in Settings. Tokens added here are tracked
|
- **When**: User tapped "+ Add token" in Settings. Tokens added here are tracked
|
||||||
across every address on the active network, unlike AddToken which is reached
|
across every address, unlike AddToken which is reached from one address.
|
||||||
from one address.
|
|
||||||
- **Elements**:
|
- **Elements**:
|
||||||
- "Back" button, "Add Token" heading
|
- "Back" button, "Add Token" heading
|
||||||
- Instruction text
|
- Instruction text
|
||||||
@@ -2320,19 +2188,11 @@ view would leave a wallet one click from deletion.
|
|||||||
- "Or pick from top 100:" dropdown (already-tracked tokens are disabled) +
|
- "Or pick from top 100:" dropdown (already-tracked tokens are disabled) +
|
||||||
"Add selected" button
|
"Add selected" button
|
||||||
- "Or enter contract address:" input, a status line, and an "Add" button
|
- "Or enter contract address:" input, a status line, and an "Add" button
|
||||||
- The two lists from the bundled token list, "Top tokens:" and "Or pick from
|
|
||||||
top 100:", are shown on Ethereum Mainnet only, because that list holds
|
|
||||||
mainnet contracts. On any other network the contract address is the only
|
|
||||||
add path
|
|
||||||
- **Transitions**:
|
- **Transitions**:
|
||||||
- Any of the add paths shown, on success → adds the token and shows an
|
- Any of the three add paths, on success → adds the token and shows an
|
||||||
"Added SYMBOL" flash message (no screen change)
|
"Added SYMBOL" flash message (no screen change)
|
||||||
- A duplicate, a scam-listed address, or a failed contract lookup → flash
|
- A duplicate, a scam-listed address, or a failed contract lookup → flash
|
||||||
message, no screen change
|
message, no screen change
|
||||||
- "Add" by contract address, then a network switch in Settings before the
|
|
||||||
lookup answers → nothing is tracked; "The active network changed before
|
|
||||||
the lookup finished, so the token was not added." flash message, no screen
|
|
||||||
change
|
|
||||||
- "Back" → previous screen (Settings)
|
- "Back" → previous screen (Settings)
|
||||||
|
|
||||||
#### SiteApproval (`approve-site`)
|
#### SiteApproval (`approve-site`)
|
||||||
@@ -2409,28 +2269,17 @@ view would leave a wallet one click from deletion.
|
|||||||
- Site origin (bold, scheme and port included) + "wants to send a
|
- Site origin (bold, scheme and port included) + "wants to send a
|
||||||
transaction"
|
transaction"
|
||||||
- Decoded action (if calldata is recognized): action name, token details,
|
- Decoded action (if calldata is recognized): action name, token details,
|
||||||
amounts, what each swap step spends that the `Amount` line does not give,
|
amounts, steps, deadline (see Transaction Decoding)
|
||||||
what each `PERMIT2_TRANSFER_FROM` moves and where to, steps, deadline, and
|
|
||||||
unless a swap pays only the From address, a `Paid to` line for each other
|
|
||||||
address it pays, or saying that a token stays in the router or who it pays
|
|
||||||
is unknown (see Transaction Decoding)
|
|
||||||
- From: color dot + full address + etherscan link
|
- From: color dot + full address + etherscan link
|
||||||
- Contract: color dot + full address + etherscan link, token symbol label if
|
- Contract: color dot + full address + etherscan link, token symbol label if
|
||||||
known; for a contract creation, the same sentence as on WaitTx
|
known; for a contract creation, the same sentence as on WaitTx
|
||||||
- Value: amount in ETH (4 decimal places with the nonzero floor, USD in
|
- Value: amount in ETH (4 decimal places, USD in parentheses)
|
||||||
parentheses)
|
- Network fee (max): gas limit × fee per gas in ETH (4 decimal places, USD
|
||||||
- Network fee (max): gas limit × fee per gas in ETH (4 decimal places with
|
in parentheses), with the gas limit and the fee per gas in gwei below it
|
||||||
the nonzero floor, USD in parentheses), with the gas limit and the fee per
|
|
||||||
gas in gwei below it
|
|
||||||
- Network and nonce
|
- Network and nonce
|
||||||
- Raw data: full calldata displayed inline (shown if present)
|
- Raw data: full calldata displayed inline (shown if present)
|
||||||
- Password input and an error line
|
- Password input and an error line
|
||||||
- "Confirm" / "Reject" buttons
|
- "Confirm" / "Reject" buttons
|
||||||
- **Behavior**: Every etherscan link on the screen opens the explorer of the
|
|
||||||
network the transaction was populated on, whichever network is active. The
|
|
||||||
Value and Network fee lines each give the USD value of the exact amount at the
|
|
||||||
price on that network, as on ConfirmTx: none for a testnet transaction or one
|
|
||||||
on a chain id that names no network.
|
|
||||||
- **Transitions**:
|
- **Transitions**:
|
||||||
- "Confirm" (correct password) → decrypts and signs the transaction it was
|
- "Confirm" (correct password) → decrypts and signs the transaction it was
|
||||||
shown, exactly as shown, hands the signed transaction to the background to
|
shown, exactly as shown, hands the signed transaction to the background to
|
||||||
@@ -2558,9 +2407,8 @@ view would leave a wallet one click from deletion.
|
|||||||
- **Transitions**:
|
- **Transitions**:
|
||||||
- "Switch" → closes popup; the background switches the network as
|
- "Switch" → closes popup; the background switches the network as
|
||||||
**Settings** does, restoring the RPC and Blockscout endpoints last used on
|
**Settings** does, restoring the RPC and Blockscout endpoints last used on
|
||||||
that network (or that network's defaults if it has none) and the tokens
|
that network (or that network's defaults if it has none), sends
|
||||||
tracked on that network, sends `chainChanged` to every open tab, and
|
`chainChanged` to every open tab, and answers the site with success
|
||||||
answers the site with success
|
|
||||||
- "Reject" → closes popup; the site is answered with EIP-1193 code 4001 and
|
- "Reject" → closes popup; the site is answered with EIP-1193 code 4001 and
|
||||||
nothing changes
|
nothing changes
|
||||||
- Popup window closed without answering → the same as "Reject"
|
- Popup window closed without answering → the same as "Reject"
|
||||||
@@ -3039,234 +2887,24 @@ Currently supported:
|
|||||||
"Swap USDT → ETH"), token addresses, amounts, execution steps, and deadline.
|
"Swap USDT → ETH"), token addresses, amounts, execution steps, and deadline.
|
||||||
The swap summary is shown only for a transaction sent to one of the Universal
|
The swap summary is shown only for a transaction sent to one of the Universal
|
||||||
Router addresses Uniswap publishes for the network: on TxApproval the network
|
Router addresses Uniswap publishes for the network: on TxApproval the network
|
||||||
the transaction is for, on TransactionDetail the network it was sent on. The
|
the transaction is for, on TransactionDetail the active network. The same
|
||||||
same calldata sent to any other address is shown as raw data. Decodes Permit2,
|
calldata sent to any other address is shown as raw data. Decodes Permit2,
|
||||||
V2/V3/V4 swaps, wrap/unwrap, and balance checks. A V3 swap step's path is read
|
V2/V3/V4 swaps, wrap/unwrap, and balance checks. A V4 swap action is read only
|
||||||
as the router reads it: a `V3_SWAP_EXACT_IN` path runs from the token it
|
in the parameter shape deployed on mainnet and Sepolia, not in the newer one
|
||||||
spends to the token it buys, and a `V3_SWAP_EXACT_OUT` path from the token it
|
on `v4-periphery` `main`, which adds a `minHopPriceX36` field. An action in
|
||||||
buys to the token it spends, so that step's input token is its path's last
|
any other shape is not read, and its step is listed as
|
||||||
token and its output token the first. The router reads a path as one token
|
`V4 Swap (could not be decoded)`. Each step is named by its command type,
|
||||||
address followed by whole hops of a 3-byte fee and a token address, and
|
which the decoder reads from the command byte with the mask the router at that
|
||||||
ignores any bytes after the last hop, so the decoder does not read a path with
|
address uses: `0x1f` for `UniversalRouterV1`, `0x3f` for
|
||||||
such bytes. A V4 swap action is read only in the parameter shape deployed on
|
|
||||||
mainnet and Sepolia, not in the newer one on `v4-periphery` `main`, which adds
|
|
||||||
a `minHopPriceX36` field. An action in any other shape is not read, and its
|
|
||||||
step is listed as `V4 Swap (could not be decoded)`. Each step is named and
|
|
||||||
read as the command that the release of the router at that address runs for
|
|
||||||
its command type, as that release's `contracts/libraries/Commands.sol` names
|
|
||||||
it. The decoder reads the type from the command byte with the mask that router
|
|
||||||
uses: `0x1f` for `UniversalRouterV1`, `0x3f` for
|
|
||||||
`UniversalRouterV1_2_V2Support` and `UniversalRouterV2`, and `0x7f` for
|
`UniversalRouterV1_2_V2Support` and `UniversalRouterV2`, and `0x7f` for
|
||||||
`UniversalRouterV2_1_1` and `UniversalRouterV2_1_2`. The allow-revert flag
|
`UniversalRouterV2_1_1` and `UniversalRouterV2_1_2`. The allow-revert flag
|
||||||
(`0x80`) therefore does not change the command a step is read as. Releases run
|
(`0x80`) therefore does not change a step's name. The decoder does not read
|
||||||
different commands for some types: on `UniversalRouterV1` and
|
the commands inside an `EXECUTE_SUB_PLAN` (`0x21`) step, and wherever that
|
||||||
`UniversalRouterV1_2_V2Support`, `0x10` to `0x13` are NFT commands, where the
|
step stands they may spend the user's tokens or pay the user. That step is
|
||||||
later routers run `V4_SWAP`, `V3_POSITION_MANAGER_PERMIT`,
|
listed as `Execute Sub-Plan (its steps are not shown)`, and whatever the other
|
||||||
`V3_POSITION_MANAGER_CALL` and `V4_INITIALIZE_POOL`. The decoder does not read
|
steps state, the summary names no swap direction, `Token In` and `Token Out`
|
||||||
those routers' NFT commands, and lists each by its name there, for example
|
read `Unknown (could not be decoded)`, and there is no `Amount` or
|
||||||
`Seaport` for `SEAPORT` (`0x10` on `UniversalRouterV1`). A type a release
|
`Min. received` line.
|
||||||
names no command for is listed by its number, for example `Command 0x0e` on
|
|
||||||
`UniversalRouterV1`, which has no `BALANCE_CHECK_ERC20` and reverts on it. The
|
|
||||||
router reverts the whole transaction when a step fails, unless the step's
|
|
||||||
command byte has that flag set and its command is one the router lets fail, as
|
|
||||||
each release's `contracts/base/Dispatcher.sol` shows: on `UniversalRouterV2`,
|
|
||||||
`UniversalRouterV2_1_1` and `UniversalRouterV2_1_2`, `PERMIT2_PERMIT`,
|
|
||||||
`PERMIT2_PERMIT_BATCH`, `BALANCE_CHECK_ERC20`, `V3_POSITION_MANAGER_PERMIT`,
|
|
||||||
`V3_POSITION_MANAGER_CALL`, `V4_INITIALIZE_POOL`, `V4_POSITION_MANAGER_CALL`
|
|
||||||
and `EXECUTE_SUB_PLAN`; on `UniversalRouterV1_2_V2Support`,
|
|
||||||
`BALANCE_CHECK_ERC20`, `EXECUTE_SUB_PLAN` and its NFT market calls and NFT
|
|
||||||
owner checks; on `UniversalRouterV1`, its NFT market calls and NFT owner
|
|
||||||
checks. Such a step may then fail while the transaction goes on to the next
|
|
||||||
step, and it is listed with ` (allowed to fail)` after its name, for example
|
|
||||||
`Balance Check (allowed to fail)`. On every other command, among them each V2,
|
|
||||||
V3 and V4 swap and each payment of ETH or an ERC-20 token, the flag has no
|
|
||||||
effect: the step succeeds or the whole transaction reverts, so the step reads
|
|
||||||
as it does without the flag. A `BALANCE_CHECK_ERC20` the router lets fail
|
|
||||||
guarantees nothing, so it is read as one whose `minBalance` is zero. Only the
|
|
||||||
routers with the `0x7f` mask have `PAY_PORTION_FULL_PRECISION` (`0x07`),
|
|
||||||
listed as `Pay Portion (Full Precision)`, and `ACROSS_V4_DEPOSIT_V3` (`0x40`),
|
|
||||||
listed as `Across Bridge Deposit`; the other routers revert on `0x07`, and it
|
|
||||||
is listed there as `Command 0x07`. The decoder does not read the commands
|
|
||||||
inside an `EXECUTE_SUB_PLAN` (`0x21`) step, and wherever that step stands they
|
|
||||||
may spend the user's tokens or pay the user. That step is listed as
|
|
||||||
`Execute Sub-Plan (its steps are not shown)`, and whatever the other steps
|
|
||||||
state, the summary names no swap direction, `Token In` and `Token Out` read
|
|
||||||
`Unknown (could not be decoded)`, and there is no `Amount` or `Min. received`
|
|
||||||
line. Each swap step, `SWEEP`, `WRAP_ETH`, `UNWRAP_WETH`, `TRANSFER`,
|
|
||||||
`PAY_PORTION`, `PAY_PORTION_FULL_PRECISION`, `PERMIT2_TRANSFER_FROM` (which
|
|
||||||
moves the user's own tokens) and V4 `TAKE` and `TAKE_PORTION` names the
|
|
||||||
address it pays, and `TAKE_ALL` pays the transaction's sender. The router
|
|
||||||
reads `address(1)` as the transaction's sender, and `address(2)` as the router
|
|
||||||
itself, which holds what it is paid until a later step pays it out; a payment
|
|
||||||
to the router, as `address(2)` or by its own address, is not counted as paid
|
|
||||||
out. `UniversalRouterV1` alone pays a `PERMIT2_TRANSFER_FROM` to `address(1)`
|
|
||||||
or `address(2)` as those addresses, and the decoder names them. A
|
|
||||||
`PERMIT2_TRANSFER_FROM` into the router is named with the amount it moves,
|
|
||||||
because the decoder does not check that later steps spend all of it.
|
|
||||||
`ACROSS_V4_DEPOSIT_V3` pays the bridge, which pays the deposit's recipient on
|
|
||||||
another network and refunds a deposit nobody fills to its depositor; the
|
|
||||||
router passes both on as written, so `address(1)` and `address(2)` there are
|
|
||||||
addresses, and each that is not the transaction's sender is named. A
|
|
||||||
`BALANCE_CHECK_ERC20` pays nobody: the router checks that its owner holds at
|
|
||||||
least `minBalance` of its token, and reads the owner as written, so
|
|
||||||
`address(1)` and `address(2)` there are addresses too. A check of any address
|
|
||||||
but the transaction's sender's says nothing about what the user receives: it
|
|
||||||
sets neither `Token Out` nor the minimum, and it is listed as
|
|
||||||
`Balance Check (of another address)`. A check whose input does not decode,
|
|
||||||
such as one whose owner word has a nonzero top byte (the router reads the
|
|
||||||
owner from the word's last 20 bytes), likewise sets neither, and it is listed
|
|
||||||
as `Balance Check (could not be decoded)`. When a swap step, `TAKE` or
|
|
||||||
`TAKE_PORTION` pays the router any token, the swap's output or another, a
|
|
||||||
`WRAP_ETH` pays it WETH, or an `UNWRAP_WETH` into the router turns WETH a step
|
|
||||||
paid it into ETH, that token stays in the router unless a later step pays out
|
|
||||||
or spends all the router holds of it: a `SWEEP` of that token to anyone but
|
|
||||||
the router, an `UNWRAP_WETH` when it is WETH, a `WRAP_ETH` of
|
|
||||||
`CONTRACT_BALANCE` when it is ETH, a `TRANSFER` of `CONTRACT_BALANCE`, a
|
|
||||||
`PAY_PORTION` of 10,000 bips or a `PAY_PORTION_FULL_PRECISION` of 1e18 of that
|
|
||||||
token to anyone but the router, an `ACROSS_V4_DEPOSIT_V3` of
|
|
||||||
`CONTRACT_BALANCE` of that token, or of ETH when it sets `useNative`, or a V2
|
|
||||||
or V3 exact-in swap step or V4 `SETTLE` that pays `CONTRACT_BALANCE` of that
|
|
||||||
token from the router (`payerIsUser` false). V2 and V3 exact-in swap steps and
|
|
||||||
V4 `SETTLE`s that pay WETH from the router also spend all the WETH a
|
|
||||||
`WRAP_ETH` paid it once together they spend the amount the `WRAP_ETH` states,
|
|
||||||
as a swap paid in ETH does, but only when that amount is not
|
|
||||||
`CONTRACT_BALANCE` and the router held no WETH from an earlier step when the
|
|
||||||
`WRAP_ETH` ran: after two `WRAP_ETH`s of 0.5 ETH into the router, a swap of 1
|
|
||||||
WETH from it reads as leaving the WETH there. A V2 or V3 exact-out step paid
|
|
||||||
from the router spends an amount the calldata does not state, at most its
|
|
||||||
`amountInMax`, so the decoder counts it as spending nothing the router holds.
|
|
||||||
A `SETTLE` of `OPEN_DELTA` (zero), and a `SETTLE_ALL`, pay only what the step
|
|
||||||
still owes of their token when they run. The decoder takes that to be the
|
|
||||||
amounts the step's swap actions state they spend of that token only when every
|
|
||||||
action in the step could be read, every swap action names the token it spends
|
|
||||||
and the token it buys (a swap action with an empty path swaps nothing), the
|
|
||||||
`SETTLE` or `SETTLE_ALL` is the step's only `SETTLE` or `SETTLE_ALL` of that
|
|
||||||
token and comes after every swap action, no swap action buys that token, no
|
|
||||||
`TAKE`, `TAKE_ALL` or `TAKE_PORTION` in the step takes it (a `TAKE` of a
|
|
||||||
stated amount adds to what the step owes), and the swap actions that spend it
|
|
||||||
state a quantity together; otherwise it does not know the amount, and such a
|
|
||||||
`SETTLE` from the router counts as spending nothing. So the rest of a V4
|
|
||||||
`SETTLE` of more than its swap spends, taken to the router, the WETH of a
|
|
||||||
`WRAP_ETH`, and a token a swap pays the router on the way to the output, each
|
|
||||||
stays in the router when later steps do not spend all of it, where anyone can
|
|
||||||
take it in a later transaction. The router sends ETH as written, so a
|
|
||||||
`TRANSFER` of `CONTRACT_BALANCE` of ETH always reverts and pays out nothing. A
|
|
||||||
step paying a token to the V2 pair that the very next step spends, as a V2
|
|
||||||
exact-in of that token whose `amountIn` is `ALREADY_PAID` (zero) or
|
|
||||||
`CONTRACT_BALANCE`, is a hop, not a payout: Uniswap's mixed routes pay the
|
|
||||||
next V2 pair directly, and the router enforces that swap's own minimum. The
|
|
||||||
decoder checks that the address paid is that pair, deriving it from the V2
|
|
||||||
factory and pair init code hash the network's routers were deployed with and
|
|
||||||
the first two tokens of that step's path; a payment to any other address is
|
|
||||||
named. (Sepolia's `UniversalRouterV1_2_V2Support` was deployed with
|
|
||||||
placeholders for both values, so no V2 swap step can succeed on that router.)
|
|
||||||
Every other payment counts, in whichever step and of whatever token, a share
|
|
||||||
of the output included: an interface fee paid to another address by
|
|
||||||
`PAY_PORTION`, `TRANSFER` or `TAKE_PORTION` is named, and the minimum reads
|
|
||||||
`Min. paid out`, because the swap's minimum includes the fee. The minimum
|
|
||||||
reads `Min. received` only when some step pays the transaction's sender (the
|
|
||||||
From address on TxApproval, the sender the explorer reports on
|
|
||||||
TransactionDetail) and no `Paid to` line is shown. `Paid to` lines after
|
|
||||||
`Token Out` name each other address paid; one reads
|
|
||||||
`The bridge, which pays the deposit's recipient on another network` for a
|
|
||||||
bridge deposit; one reads, for example,
|
|
||||||
`The router, 2000.0000 USDT from the sender (later steps may not spend all of it)`
|
|
||||||
for each move into the router, followed by a `Token moved into the router`
|
|
||||||
line that gives the moved token's address as the `Token In` line does; one
|
|
||||||
reads `The router, where it stays (no later step pays it out)` for each token
|
|
||||||
that stays in the router, followed, for any token but the output, by a
|
|
||||||
`Token moved into the router` line giving that token in the same way (ETH by
|
|
||||||
name); and one more reads `Unknown (could not be decoded)` when a step that
|
|
||||||
may pay an address went unread. When no step pays anyone, a single line reads
|
|
||||||
`Unknown (not named in the calldata)`. Wherever there is a `Paid to` line, the
|
|
||||||
minimum reads `Min. paid out`. The `Amount` line gives the total the steps
|
|
||||||
take of `Token In`, from the step that sets the input side on: the first V2 or
|
|
||||||
V3 exact-in or exact-out, `WRAP_ETH` or V4 swap step that names an input token
|
|
||||||
or amount. A V4 step with a swap action sets the input side when no earlier
|
|
||||||
step set it, even when it names neither (see Display Consistency). That step
|
|
||||||
counts its own amount, whoever pays it: a V2 or V3 exact-out step its
|
|
||||||
`amountInMax`, and a V4 step what it takes of its input token from the user's
|
|
||||||
wallet, as below, or, when the user pays it none of that token, the `amountIn`
|
|
||||||
of the swap action that spends it. Each later V2 or V3 exact-in or exact-out
|
|
||||||
step whose `payerIsUser` is true takes its amount, found in the same way, from
|
|
||||||
the user's wallet. Every V4 step, with a swap action or without, takes from
|
|
||||||
the user's wallet what its `SETTLE`s paid by the user (`payerIsUser` true) and
|
|
||||||
its `SETTLE_ALL`s pay, for each token on its own; what the step that sets the
|
|
||||||
input side takes of any other token counts as a later step's take. A `SETTLE`
|
|
||||||
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. `Token In` is the token of the last `PERMIT2_PERMIT` the
|
|
||||||
decoder reads, when there is one. Its amount, `Unlimited` included, stands as
|
|
||||||
the `Amount` figure in place of the total only in the plain shape of Uniswap's
|
|
||||||
own routes: it is the only `PERMIT2_PERMIT`, its spender is the router, the
|
|
||||||
router may not let it fail, no step before it takes its token 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 the decoder does not read in full
|
|
||||||
may raise what Permit2 lets the router take, as a `PERMIT2_PERMIT_BATCH` can:
|
|
||||||
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.
|
|
||||||
In any other case the line gives the total, as with no permit. When the step
|
|
||||||
that sets the input side spends a token other than the permit's, or one the
|
|
||||||
decoder does not know, its amount gets lines of its own, unless it states no
|
|
||||||
amount and the user pays it none of its input token, and the total has no
|
|
||||||
figure to start from: unless the permit's amount stands there is no `Amount`
|
|
||||||
line, and each take of the permit's token gets lines of its own. 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 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, the step that
|
|
||||||
sets the input side first when it has them: `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. These lines change neither the
|
|
||||||
`Paid to` lines nor the minimum's label. 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_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
|
### Non-Goals Forever
|
||||||
|
|
||||||
|
|||||||
+2
-10
@@ -306,14 +306,7 @@ enter your password and click "Confirm" to authorize it. Message and typed-data
|
|||||||
signature requests work the same way, with a "Sign" button, and also require
|
signature requests work the same way, with a "Sign" button, and also require
|
||||||
your password.
|
your password.
|
||||||
|
|
||||||
A connected site can also ask to switch the wallet's network. A popup shows the
|
If the requesting site's domain is on the phishing blocklist, all three approval
|
||||||
site's origin, the current network and the requested network. Nothing changes
|
|
||||||
unless you click "Switch"; clicking "Reject" or closing the popup leaves
|
|
||||||
everything as it was. Switching works exactly as it does in Settings, and
|
|
||||||
changes the network for the whole wallet and for every site, not only for the
|
|
||||||
one that asked.
|
|
||||||
|
|
||||||
If the requesting site's domain is on the phishing blocklist, all four approval
|
|
||||||
screens show a red phishing warning before you decide.
|
screens show a red phishing warning before you decide.
|
||||||
|
|
||||||
You can manage site permissions in Settings. Allowed and denied sites can be
|
You can manage site permissions in Settings. Allowed and denied sites can be
|
||||||
@@ -385,8 +378,7 @@ Click the gear icon on the home screen to access settings:
|
|||||||
- **Display**: Toggle whether tracked tokens with zero balance are shown, switch
|
- **Display**: Toggle whether tracked tokens with zero balance are shown, switch
|
||||||
timestamps to UTC, and choose the theme (System, Light, or Dark).
|
timestamps to UTC, and choose the theme (System, Light, or Dark).
|
||||||
- **Network**: Switch between Ethereum Mainnet and Sepolia Testnet. Switching
|
- **Network**: Switch between Ethereum Mainnet and Sepolia Testnet. Switching
|
||||||
restores the RPC and Blockscout endpoints you last used on that network, or
|
resets the RPC and Blockscout endpoints to that network's defaults.
|
||||||
that network's defaults if you have not used it before.
|
|
||||||
- **Ethereum RPC**: Change the Ethereum node endpoint. Default is a public RPC.
|
- **Ethereum RPC**: Change the Ethereum node endpoint. Default is a public RPC.
|
||||||
You can use your own node for maximum privacy.
|
You can use your own node for maximum privacy.
|
||||||
- **Blockscout API**: Change the Blockscout instance used for token balances and
|
- **Blockscout API**: Change the Blockscout instance used for token balances and
|
||||||
|
|||||||
@@ -13,11 +13,6 @@
|
|||||||
"fmt": "prettier --write .",
|
"fmt": "prettier --write .",
|
||||||
"fmt-check": "prettier --check ."
|
"fmt-check": "prettier --check ."
|
||||||
},
|
},
|
||||||
"jest": {
|
|
||||||
"setupFiles": [
|
|
||||||
"<rootDir>/tests/support/navigatorLocks.js"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "10.0.1",
|
"@eslint/js": "10.0.1",
|
||||||
"@tailwindcss/cli": "4.3.1",
|
"@tailwindcss/cli": "4.3.1",
|
||||||
|
|||||||
+26
-19
@@ -16,20 +16,17 @@
|
|||||||
// across any number of awaits and no concurrent work can
|
// across any number of awaits and no concurrent work can
|
||||||
// move it.
|
// move it.
|
||||||
// updateState(fn) read fresh, apply fn to that fresh record, write it
|
// updateState(fn) read fresh, apply fn to that fresh record, write it
|
||||||
// back — all holding the lock every write of the stored
|
// back — all inside a queue, so two background writes
|
||||||
// record takes, so no other write lands in between, by
|
// never interleave, and the read is one storage round trip
|
||||||
// the background or by any page except a page in a
|
// ahead of the write rather than a page lifetime ahead of
|
||||||
// Firefox private window (README, "Stored state and its
|
// it (which is what made the popup's saveState() need a
|
||||||
// version"). The read is one storage round trip ahead of
|
|
||||||
// the write rather than a page lifetime ahead of it
|
|
||||||
// (which is what made the popup's saveState() need a
|
|
||||||
// per-field merge against a baseline at all).
|
// per-field merge against a baseline at all).
|
||||||
//
|
//
|
||||||
// A handler that must both read and write therefore does its network work
|
// A handler that must both read and write therefore does its network work
|
||||||
// against a snapshot it owns, and applies the RESULT inside updateState().
|
// against a snapshot it owns, and applies the RESULT inside updateState().
|
||||||
// It never publishes an object other in-flight work is holding.
|
// It never publishes an object other in-flight work is holding.
|
||||||
|
|
||||||
const { storageGet, storageSet, withLock } = require("../shared/browserApi");
|
const { storageGet, storageSet } = require("../shared/browserApi");
|
||||||
const { normalizePersisted } = require("../shared/persistedState");
|
const { normalizePersisted } = require("../shared/persistedState");
|
||||||
const {
|
const {
|
||||||
STATE_SCHEMA_VERSION,
|
STATE_SCHEMA_VERSION,
|
||||||
@@ -54,6 +51,11 @@ async function getState() {
|
|||||||
return normalizePersisted(result.autistmask);
|
return normalizePersisted(result.autistmask);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Serializes the read-modify-write turns below. Two of them interleaved would
|
||||||
|
// each read before the other wrote, and the second write would carry the first
|
||||||
|
// one's fields back to their pre-turn values.
|
||||||
|
let updateQueue = Promise.resolve();
|
||||||
|
|
||||||
async function updateStateOnce(mutate) {
|
async function updateStateOnce(mutate) {
|
||||||
const s = await getState();
|
const s = await getState();
|
||||||
await mutate(s);
|
await mutate(s);
|
||||||
@@ -68,22 +70,27 @@ async function updateStateOnce(mutate) {
|
|||||||
|
|
||||||
// Apply `mutate` to a record read fresh from storage and write the result
|
// Apply `mutate` to a record read fresh from storage and write the result
|
||||||
// back. `mutate` receives a detached, normalized profile and mutates it in
|
// back. `mutate` receives a detached, normalized profile and mutates it in
|
||||||
// place; it may be async, but it must not do anything slow. The write is the
|
// place; it may be async, but it must not do anything slow — the window
|
||||||
// WHOLE record, which is safe only because the lock (withLock() in
|
// between the read and the write is the window in which another context's
|
||||||
// src/shared/browserApi.js) is held from the read to the write: two
|
// write is lost, and keeping it to one storage round trip is what makes a
|
||||||
// background turns, or a turn and a page's save, never interleave
|
// whole-record write safe here. Concretely: the write is the WHOLE record, so
|
||||||
// (https://git.eeqj.de/sneak/AutistMask/issues/641). Every page's save waits
|
// a popup write that lands inside that window is reverted, in every field, by
|
||||||
// while it is held, except a page in a Firefox private window, which Firefox
|
// the record this turn read before it. That is accepted because the window is
|
||||||
// gives locks of its own (README, "Stored state and its version").
|
// one round trip long and the popup is not writing while the worker is;
|
||||||
|
// widening it is what would make it a real hazard.
|
||||||
//
|
//
|
||||||
// `mutate` must also not call updateState() itself, directly or through
|
// `mutate` must also not call updateState() itself, directly or through
|
||||||
// anything it awaits: the inner turn waits for the lock the outer one holds,
|
// anything it awaits: the queue is strictly serial, so the inner turn waits on
|
||||||
// and the outer one is waiting on the inner one. That deadlocks every write of
|
// the outer one, which is waiting on the inner one. That deadlocks the whole
|
||||||
// the stored record, not just the caller. Mutate the record you were handed.
|
// background, not just the caller. Mutate the record you were handed.
|
||||||
//
|
//
|
||||||
// Resolves with the record that was written.
|
// Resolves with the record that was written.
|
||||||
function updateState(mutate) {
|
function updateState(mutate) {
|
||||||
return withLock("autistmask", () => updateStateOnce(mutate));
|
const turn = updateQueue.then(() => updateStateOnce(mutate));
|
||||||
|
// The queue must advance even when a turn rejects, or every update after
|
||||||
|
// it queues behind a promise that never settles.
|
||||||
|
updateQueue = turn.catch(() => {});
|
||||||
|
return turn;
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = { getState, updateState };
|
module.exports = { getState, updateState };
|
||||||
|
|||||||
+30
-74
@@ -90,7 +90,7 @@
|
|||||||
<div id="add-wallet-section-mnemonic">
|
<div id="add-wallet-section-mnemonic">
|
||||||
<!-- The die button shares the instruction's row: on a row
|
<!-- The die button shares the instruction's row: on a row
|
||||||
of its own it pushes Import below the fold at
|
of its own it pushes Import below the fold at
|
||||||
396x600. -->
|
360x600. -->
|
||||||
<div class="mb-2 flex justify-between items-start gap-2">
|
<div class="mb-2 flex justify-between items-start gap-2">
|
||||||
<p>
|
<p>
|
||||||
Enter your 12 or 24 word recovery phrase below, or
|
Enter your 12 or 24 word recovery phrase below, or
|
||||||
@@ -212,7 +212,7 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<!-- The error line sits beside Import, not above it: at
|
<!-- The error line sits beside Import, not above it: at
|
||||||
396x600 the button already starts near the bottom of
|
360x600 the button already starts near the bottom of
|
||||||
the popup, and a line of its own would push it below
|
the popup, and a line of its own would push it below
|
||||||
the fold. The longest error fits on one line here. -->
|
the fold. The longest error fits on one line here. -->
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
@@ -664,20 +664,6 @@
|
|||||||
id="confirm-errors"
|
id="confirm-errors"
|
||||||
class="mb-2 border border-border border-dashed p-2 invisible min-h-[1.25rem]"
|
class="mb-2 border border-border border-dashed p-2 invisible min-h-[1.25rem]"
|
||||||
></div>
|
></div>
|
||||||
<!-- Its sentence names the token, or why the token's balance
|
|
||||||
is unknown, so show() in confirmTx.js sets it. -->
|
|
||||||
<div
|
|
||||||
id="confirm-balance-error"
|
|
||||||
class="mb-2 border border-border border-dashed p-2 text-xs invisible"
|
|
||||||
></div>
|
|
||||||
<div
|
|
||||||
id="confirm-balance-read-error"
|
|
||||||
class="mb-2 border border-border border-dashed p-2 text-xs invisible"
|
|
||||||
>
|
|
||||||
Your balance could not be read from the network, so this
|
|
||||||
transaction cannot be checked against it. Please go back and
|
|
||||||
try again.
|
|
||||||
</div>
|
|
||||||
<div
|
<div
|
||||||
id="confirm-amount-fee-error"
|
id="confirm-amount-fee-error"
|
||||||
class="mb-2 border border-border border-dashed p-2 text-xs invisible"
|
class="mb-2 border border-border border-dashed p-2 text-xs invisible"
|
||||||
@@ -697,33 +683,6 @@
|
|||||||
id="confirm-fee-unknown-error"
|
id="confirm-fee-unknown-error"
|
||||||
class="mb-2 border border-border border-dashed p-2 text-xs invisible"
|
class="mb-2 border border-border border-dashed p-2 text-xs invisible"
|
||||||
></div>
|
></div>
|
||||||
<!-- Shown when Sign & Send refuses a send for its network, for
|
|
||||||
a From address the selected wallet does not hold, or for its
|
|
||||||
gas limit or fee. Each holds its space from the first paint, so
|
|
||||||
the refusal moves nothing. -->
|
|
||||||
<div
|
|
||||||
id="confirm-network-changed-error"
|
|
||||||
class="mb-2 border border-border border-dashed p-2 text-xs invisible"
|
|
||||||
>
|
|
||||||
The active network changed after this transaction was
|
|
||||||
reviewed, so it was not sent. Please go back and review it
|
|
||||||
again.
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
id="confirm-from-address-error"
|
|
||||||
class="mb-2 border border-border border-dashed p-2 text-xs invisible"
|
|
||||||
>
|
|
||||||
The selected wallet does not hold the From address above, so
|
|
||||||
nothing was sent. Please go back and send again.
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
id="confirm-fee-bound-error"
|
|
||||||
class="mb-2 border border-border border-dashed p-2 text-xs invisible"
|
|
||||||
>
|
|
||||||
The gas limit or fee the RPC endpoint quoted for this
|
|
||||||
transaction is more than this wallet will sign for, so it
|
|
||||||
was not sent. Please go back and try again.
|
|
||||||
</div>
|
|
||||||
<div class="mb-2">
|
<div class="mb-2">
|
||||||
<label class="block mb-1 text-xs">Password</label>
|
<label class="block mb-1 text-xs">Password</label>
|
||||||
<input
|
<input
|
||||||
@@ -879,7 +838,7 @@
|
|||||||
id="add-token-info"
|
id="add-token-info"
|
||||||
class="text-xs text-muted mb-2 min-h-[1.25rem] invisible"
|
class="text-xs text-muted mb-2 min-h-[1.25rem] invisible"
|
||||||
></div>
|
></div>
|
||||||
<div id="add-token-common" class="mb-2">
|
<div class="mb-2">
|
||||||
<label class="block mb-1 text-xs text-muted"
|
<label class="block mb-1 text-xs text-muted"
|
||||||
>Or pick a common token:</label
|
>Or pick a common token:</label
|
||||||
>
|
>
|
||||||
@@ -1363,39 +1322,36 @@
|
|||||||
<h2 class="font-bold mb-2">Add Token</h2>
|
<h2 class="font-bold mb-2">Add Token</h2>
|
||||||
<p class="text-xs text-muted mb-3">
|
<p class="text-xs text-muted mb-3">
|
||||||
Pick a common token or enter a contract address manually.
|
Pick a common token or enter a contract address manually.
|
||||||
Common tokens are offered on Ethereum Mainnet only.
|
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<div id="settings-addtoken-common">
|
<!-- top 10 quick-pick buttons -->
|
||||||
<!-- top 10 quick-pick buttons -->
|
<div class="mb-3">
|
||||||
<div class="mb-3">
|
<label class="block mb-1 text-xs text-muted"
|
||||||
<label class="block mb-1 text-xs text-muted"
|
>Top tokens:</label
|
||||||
>Top tokens:</label
|
>
|
||||||
>
|
<div
|
||||||
<div
|
id="settings-addtoken-top10"
|
||||||
id="settings-addtoken-top10"
|
class="flex flex-wrap gap-1"
|
||||||
class="flex flex-wrap gap-1"
|
></div>
|
||||||
></div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- top 100 dropdown -->
|
<!-- top 100 dropdown -->
|
||||||
<div class="mb-3">
|
<div class="mb-3">
|
||||||
<label class="block mb-1 text-xs text-muted"
|
<label class="block mb-1 text-xs text-muted"
|
||||||
>Or pick from top 100:</label
|
>Or pick from top 100:</label
|
||||||
>
|
>
|
||||||
<select
|
<select
|
||||||
id="settings-addtoken-select"
|
id="settings-addtoken-select"
|
||||||
class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
|
class="border border-border p-1 w-full font-mono text-sm bg-bg text-fg"
|
||||||
>
|
>
|
||||||
<option value="">-- select --</option>
|
<option value="">-- select --</option>
|
||||||
</select>
|
</select>
|
||||||
<button
|
<button
|
||||||
id="btn-settings-addtoken-select"
|
id="btn-settings-addtoken-select"
|
||||||
class="border border-border px-2 py-1 mt-1 hover:bg-fg hover:text-bg cursor-pointer"
|
class="border border-border px-2 py-1 mt-1 hover:bg-fg hover:text-bg cursor-pointer"
|
||||||
>
|
>
|
||||||
Add selected
|
Add selected
|
||||||
</button>
|
</button>
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- manual contract address -->
|
<!-- manual contract address -->
|
||||||
|
|||||||
+1
-1
@@ -220,7 +220,7 @@ async function widenApprovalWindow() {
|
|||||||
async function init() {
|
async function init() {
|
||||||
// First, before anything can save: showView() saves on every navigation
|
// First, before anything can save: showView() saves on every navigation
|
||||||
// without awaiting, so a save that fails from here on has somewhere to be
|
// without awaiting, so a save that fails from here on has somewhere to be
|
||||||
// reported rather than reaching only the console
|
// reported rather than being swallowed by the save queue
|
||||||
// (https://git.eeqj.de/sneak/AutistMask/issues/362). Registered ahead of
|
// (https://git.eeqj.de/sneak/AutistMask/issues/362). Registered ahead of
|
||||||
// the approval-window branch below too, since that window saves as well.
|
// the approval-window branch below too, since that window saves as well.
|
||||||
//
|
//
|
||||||
|
|||||||
+9
-29
@@ -13,7 +13,6 @@
|
|||||||
// cannot be required outside a browser.
|
// cannot be required outside a browser.
|
||||||
|
|
||||||
const { RESTORABLE_VIEWS } = require("../shared/restorableViews");
|
const { RESTORABLE_VIEWS } = require("../shared/restorableViews");
|
||||||
const { SUPPORTED_CHAIN_IDS } = require("../shared/networks");
|
|
||||||
|
|
||||||
// The views this page load has rendered.
|
// The views this page load has rendered.
|
||||||
//
|
//
|
||||||
@@ -38,11 +37,9 @@ function markViewRendered(view) {
|
|||||||
if (view) renderedViews.add(view);
|
if (view) renderedViews.add(view);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Begin a fresh page-load scope. The popup gets one by being loaded, and
|
// Begin a fresh page-load scope. The popup gets one by being loaded; the
|
||||||
// asks for one when the user switches the network, because every screen
|
|
||||||
// then on the page shows the previous network (views/settings.js); the
|
|
||||||
// unit tests, which simulate several page loads against one module
|
// unit tests, which simulate several page loads against one module
|
||||||
// instance, ask for one too.
|
// instance, ask for one.
|
||||||
function resetRenderedViews() {
|
function resetRenderedViews() {
|
||||||
renderedViews.clear();
|
renderedViews.clear();
|
||||||
}
|
}
|
||||||
@@ -127,33 +124,25 @@ function isRenderableDecoded(value) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// The pending transaction confirmTx.show() renders: `token` reaches
|
// The pending transaction confirmTx.show() renders: `token` reaches
|
||||||
// renderAddressHtml() when it is not "ETH", `from`/`to` reach
|
// renderAddressHtml() when it is not "ETH", and `from`/`to` reach
|
||||||
// addressTitle(), makeBlockie() and getLocalWarnings(), and `amount` reaches
|
// addressTitle(), makeBlockie() and getLocalWarnings().
|
||||||
// truncateAmountNeverZero(), which splits it. `chainId`, which show() fills in
|
|
||||||
// when it is absent, picks the network whose explorer the address links open,
|
|
||||||
// so it has to name one.
|
|
||||||
function isRenderablePendingTx(value) {
|
function isRenderablePendingTx(value) {
|
||||||
return (
|
return (
|
||||||
isRecord(value) &&
|
isRecord(value) &&
|
||||||
isText(value.token) &&
|
isText(value.token) &&
|
||||||
isAddressText(value.from) &&
|
isAddressText(value.from) &&
|
||||||
isAddressText(value.to) &&
|
isAddressText(value.to)
|
||||||
isText(value.amount) &&
|
|
||||||
(!value.chainId || SUPPORTED_CHAIN_IDS.has(value.chainId))
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// The stored transaction transactionDetail.render() shows. contractAddress is
|
// The stored transaction transactionDetail.render() shows. contractAddress is
|
||||||
// optional on an ETH transfer, and reaches addressDotHtml() when it is there.
|
// optional on an ETH transfer, and reaches addressDotHtml() when it is there.
|
||||||
// `chainId` picks the network whose explorer the links open and whose
|
|
||||||
// Blockscout the transaction is read from, so it has to name one.
|
|
||||||
function isRenderableTx(value) {
|
function isRenderableTx(value) {
|
||||||
return (
|
return (
|
||||||
isRecord(value) &&
|
isRecord(value) &&
|
||||||
isAddressText(value.from) &&
|
isAddressText(value.from) &&
|
||||||
isAddressText(value.to) &&
|
isAddressText(value.to) &&
|
||||||
(!value.contractAddress || isAddressText(value.contractAddress)) &&
|
(!value.contractAddress || isAddressText(value.contractAddress))
|
||||||
SUPPORTED_CHAIN_IDS.has(value.chainId)
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -205,19 +194,11 @@ function renderView(view, state, views) {
|
|||||||
if (!data.hash) return false;
|
if (!data.hash) return false;
|
||||||
if (!isAddressText(data.to)) return false;
|
if (!isAddressText(data.to)) return false;
|
||||||
if (!isRenderableDecoded(data.decoded)) return false;
|
if (!isRenderableDecoded(data.decoded)) return false;
|
||||||
// `chainId` picks the network whose explorer the links open, so
|
|
||||||
// when it is there it has to name one. Likewise on error-tx.
|
|
||||||
if (data.chainId && !SUPPORTED_CHAIN_IDS.has(data.chainId)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
views.txStatus.renderSuccess();
|
views.txStatus.renderSuccess();
|
||||||
return true;
|
return true;
|
||||||
case "error-tx":
|
case "error-tx":
|
||||||
if (!data.message) return false;
|
if (!data.message) return false;
|
||||||
if (!isAddressText(data.to)) return false;
|
if (!isAddressText(data.to)) return false;
|
||||||
if (data.chainId && !SUPPORTED_CHAIN_IDS.has(data.chainId)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
views.txStatus.renderError();
|
views.txStatus.renderError();
|
||||||
return true;
|
return true;
|
||||||
default:
|
default:
|
||||||
@@ -232,10 +213,9 @@ function renderView(view, state, views) {
|
|||||||
// in the two cases where the view is known to be on the page already:
|
// in the two cases where the view is known to be on the page already:
|
||||||
//
|
//
|
||||||
// - It is not one the popup renders from persisted state. The restored
|
// - It is not one the popup renders from persisted state. The restored
|
||||||
// stack is filtered against RESTORABLE_VIEWS, and a network switch cuts
|
// stack is filtered against RESTORABLE_VIEWS, so such a view can only
|
||||||
// it the same way (views/settings.js), so such a view can only be on the
|
// be on the stack from this page load, where forward navigation
|
||||||
// stack from this page load, where forward navigation rendered it on the
|
// rendered it on the way in.
|
||||||
// way in.
|
|
||||||
// - This page load has rendered it. Re-rendering would re-fetch and
|
// - This page load has rendered it. Re-rendering would re-fetch and
|
||||||
// clobber what it holds; Home is rendered anyway, see above.
|
// clobber what it holds; Home is rendered anyway, see above.
|
||||||
//
|
//
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
const { $, showView, showFlash, escapeHtml, goBack } = require("./helpers");
|
const { $, showView, showFlash, escapeHtml, goBack } = require("./helpers");
|
||||||
const { getTopTokens } = require("../../shared/tokenList");
|
const { getTopTokens } = require("../../shared/tokenList");
|
||||||
const { state, saveState, currentNetwork } = require("../../shared/state");
|
const { state, saveState } = require("../../shared/state");
|
||||||
const { lookupTokenInfo } = require("../../shared/balances");
|
const { lookupTokenInfo } = require("../../shared/balances");
|
||||||
const { isScamAddress } = require("../../shared/scamlist");
|
const { isScamAddress } = require("../../shared/scamlist");
|
||||||
const { log } = require("../../shared/log");
|
const { log } = require("../../shared/log");
|
||||||
@@ -9,12 +9,6 @@ function show() {
|
|||||||
$("add-token-address").value = "";
|
$("add-token-address").value = "";
|
||||||
$("add-token-info").textContent = "";
|
$("add-token-info").textContent = "";
|
||||||
$("add-token-info").style.visibility = "hidden";
|
$("add-token-info").style.visibility = "hidden";
|
||||||
// The bundled list holds Ethereum Mainnet contracts, which name no token
|
|
||||||
// on any other network.
|
|
||||||
$("add-token-common").classList.toggle(
|
|
||||||
"hidden",
|
|
||||||
state.networkId !== "mainnet",
|
|
||||||
);
|
|
||||||
const list = $("common-token-list");
|
const list = $("common-token-list");
|
||||||
list.innerHTML = getTopTokens(25)
|
list.innerHTML = getTopTokens(25)
|
||||||
.map(
|
.map(
|
||||||
@@ -52,9 +46,6 @@ function init(ctx) {
|
|||||||
infoEl.textContent = "Looking up token...";
|
infoEl.textContent = "Looking up token...";
|
||||||
infoEl.style.visibility = "visible";
|
infoEl.style.visibility = "visible";
|
||||||
log.debugf("Looking up token contract", contractAddr);
|
log.debugf("Looking up token contract", contractAddr);
|
||||||
// The network the lookup asks, which Settings may switch away from
|
|
||||||
// before it answers, as for a transaction in confirmTx.js.
|
|
||||||
const chainId = currentNetwork().chainId;
|
|
||||||
try {
|
try {
|
||||||
const info = await lookupTokenInfo(
|
const info = await lookupTokenInfo(
|
||||||
contractAddr,
|
contractAddr,
|
||||||
@@ -62,15 +53,6 @@ function init(ctx) {
|
|||||||
state.networkId,
|
state.networkId,
|
||||||
ctx.pageClosed,
|
ctx.pageClosed,
|
||||||
);
|
);
|
||||||
// A contract address names a token on one network only, so an
|
|
||||||
// answer after a switch is not added to the new network's list.
|
|
||||||
if (currentNetwork().chainId !== chainId) {
|
|
||||||
showFlash(
|
|
||||||
"The active network changed before the lookup finished," +
|
|
||||||
" so the token was not added.",
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
log.infof("Adding token", info.symbol, contractAddr);
|
log.infof("Adding token", info.symbol, contractAddr);
|
||||||
state.trackedTokens.push({
|
state.trackedTokens.push({
|
||||||
address: contractAddr,
|
address: contractAddr,
|
||||||
|
|||||||
+29
-46
@@ -11,7 +11,6 @@ const {
|
|||||||
onViewLeave,
|
onViewLeave,
|
||||||
formatFee,
|
formatFee,
|
||||||
tokenLabel,
|
tokenLabel,
|
||||||
tokenSourcesByChainId,
|
|
||||||
} = require("./helpers");
|
} = require("./helpers");
|
||||||
const { state, saveState, currentNetwork } = require("../../shared/state");
|
const { state, saveState, currentNetwork } = require("../../shared/state");
|
||||||
const {
|
const {
|
||||||
@@ -58,15 +57,9 @@ const { notify, runtimeApi, sendMessage } = require("../../shared/browserApi");
|
|||||||
|
|
||||||
const erc20Iface = new Interface(ERC20_ABI);
|
const erc20Iface = new Interface(ERC20_ABI);
|
||||||
|
|
||||||
// The link opens the explorer of the network with `chainId`, or of the active
|
function approvalAddressHtml(address) {
|
||||||
// network when none is given. A chain id that names no network has no
|
|
||||||
// explorer, so the address is drawn without a link.
|
|
||||||
function approvalAddressHtml(address, chainId) {
|
|
||||||
const title = addressTitle(address, state.wallets);
|
const title = addressTitle(address, state.wallets);
|
||||||
if (chainId && !networkByChainId(chainId)) {
|
return renderAddressHtml(address, { title });
|
||||||
return renderAddressHtml(address, { title, noLink: true });
|
|
||||||
}
|
|
||||||
return renderAddressHtml(address, { title, chainId });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// The amount line for a decoded ERC-20 call. With a known scale it is the
|
// The amount line for a decoded ERC-20 call. With a known scale it is the
|
||||||
@@ -86,18 +79,19 @@ function tokenAmountText(rawAmount, decimals, symbol) {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// Try to decode calldata sent from `fromAddress` to `toAddress` on the network
|
// Try to decode calldata sent to `toAddress` on the network with chain id
|
||||||
// with chain id `chainId`, using known ABIs.
|
// `chainId`, using known ABIs.
|
||||||
// Returns { name, description, details } or null.
|
// Returns { name, description, details } or null.
|
||||||
function decodeCalldata(data, toAddress, chainId, fromAddress) {
|
function decodeCalldata(data, toAddress, chainId) {
|
||||||
if (!data || data === "0x" || data.length < 10) return null;
|
if (!data || data === "0x" || data.length < 10) return null;
|
||||||
|
|
||||||
// Where a token's name and scale are looked for, for every decoder below:
|
// Where a token's scale is looked for, for every decoder below: the ERC-20
|
||||||
// what the wallet knows of the tokens on the network with `chainId`, which
|
// amount line and the swap's Amount and Min. received lines resolve it the
|
||||||
// need not be the active one. The ERC-20 amount line and the swap's Amount
|
// same way, and refuse to format the same way when it is nowhere.
|
||||||
// and Min. received lines resolve the scale the same way, and refuse to
|
const decimalsSources = {
|
||||||
// format the same way when it is nowhere.
|
trackedTokens: state.trackedTokens,
|
||||||
const decimalsSources = tokenSourcesByChainId(chainId);
|
wallets: state.wallets,
|
||||||
|
};
|
||||||
|
|
||||||
// Try ERC-20 (approve / transfer)
|
// Try ERC-20 (approve / transfer)
|
||||||
try {
|
try {
|
||||||
@@ -197,7 +191,6 @@ function decodeCalldata(data, toAddress, chainId, fromAddress) {
|
|||||||
toAddress,
|
toAddress,
|
||||||
chainId,
|
chainId,
|
||||||
decimalsSources,
|
decimalsSources,
|
||||||
fromAddress,
|
|
||||||
);
|
);
|
||||||
if (routerResult) return routerResult;
|
if (routerResult) return routerResult;
|
||||||
|
|
||||||
@@ -231,11 +224,10 @@ function showTxFee(approvedTx) {
|
|||||||
const feePerGas = BigInt(approvedTx.maxFeePerGas || approvedTx.gasPrice);
|
const feePerGas = BigInt(approvedTx.maxFeePerGas || approvedTx.gasPrice);
|
||||||
// Through formatFee(), as the confirmation screen's fee is, so the same
|
// Through formatFee(), as the confirmation screen's fee is, so the same
|
||||||
// fee reads the same on both. In the native currency of the network shown
|
// fee reads the same on both. In the native currency of the network shown
|
||||||
// above, and at the price on it, as the value is.
|
// above, as the value is.
|
||||||
$("approve-tx-fee").textContent = formatFee(
|
$("approve-tx-fee").textContent = formatFee(
|
||||||
gasLimit * feePerGas,
|
gasLimit * feePerGas,
|
||||||
nativeCurrencyByChainId(approvedTx.chainId),
|
nativeCurrencyByChainId(approvedTx.chainId),
|
||||||
approvedTx.chainId,
|
|
||||||
);
|
);
|
||||||
|
|
||||||
let detail =
|
let detail =
|
||||||
@@ -268,7 +260,10 @@ function showTxApproval(details) {
|
|||||||
|
|
||||||
const toAddr = approvedTx.to;
|
const toAddr = approvedTx.to;
|
||||||
const ethValue = formatEther(approvedTx.value || "0");
|
const ethValue = formatEther(approvedTx.value || "0");
|
||||||
const sources = tokenSourcesByChainId(approvedTx.chainId);
|
const sources = {
|
||||||
|
trackedTokens: state.trackedTokens,
|
||||||
|
wallets: state.wallets,
|
||||||
|
};
|
||||||
|
|
||||||
// Build txInfo for status screens
|
// Build txInfo for status screens
|
||||||
pendingTxDetails = {
|
pendingTxDetails = {
|
||||||
@@ -282,12 +277,11 @@ function showTxApproval(details) {
|
|||||||
|
|
||||||
// If this is an ERC-20 call, try to extract the real recipient and amount.
|
// If this is an ERC-20 call, try to extract the real recipient and amount.
|
||||||
// Decoded for the network the transaction is for, which the Network line
|
// Decoded for the network the transaction is for, which the Network line
|
||||||
// names, and the address the From line names.
|
// names.
|
||||||
const decoded = decodeCalldata(
|
const decoded = decodeCalldata(
|
||||||
approvedTx.data,
|
approvedTx.data,
|
||||||
toAddr || "",
|
toAddr || "",
|
||||||
approvedTx.chainId,
|
approvedTx.chainId,
|
||||||
details.approvedFrom,
|
|
||||||
);
|
);
|
||||||
if (decoded && decoded.details) {
|
if (decoded && decoded.details) {
|
||||||
// The asset the status summary is counted in: an ERC-20 call's Token
|
// The asset the status summary is counted in: an ERC-20 call's Token
|
||||||
@@ -345,35 +339,27 @@ function showTxApproval(details) {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// Every address link on this screen opens the explorer of the network the
|
|
||||||
// transaction is for, which the Network line names, whichever network is
|
|
||||||
// active.
|
|
||||||
$("approve-tx-origin").textContent = details.origin;
|
$("approve-tx-origin").textContent = details.origin;
|
||||||
$("approve-tx-from").innerHTML = approvalAddressHtml(
|
$("approve-tx-from").innerHTML = approvalAddressHtml(details.approvedFrom);
|
||||||
details.approvedFrom,
|
|
||||||
approvedTx.chainId,
|
|
||||||
);
|
|
||||||
|
|
||||||
// Show token symbol next to contract address if known on the network the
|
// Show token symbol next to contract address if known
|
||||||
// transaction is for
|
const symbol = toAddr ? tokenLabel(toAddr) : null;
|
||||||
const symbol = toAddr ? tokenLabel(toAddr, approvedTx.chainId) : null;
|
|
||||||
if (toAddr) {
|
if (toAddr) {
|
||||||
let toHtml = "";
|
let toHtml = "";
|
||||||
if (symbol) {
|
if (symbol) {
|
||||||
toHtml += `<div class="font-bold mb-1">${escapeHtml(symbol)}</div>`;
|
toHtml += `<div class="font-bold mb-1">${escapeHtml(symbol)}</div>`;
|
||||||
}
|
}
|
||||||
toHtml += approvalAddressHtml(toAddr, approvedTx.chainId);
|
toHtml += approvalAddressHtml(toAddr);
|
||||||
$("approve-tx-to").innerHTML = toHtml;
|
$("approve-tx-to").innerHTML = toHtml;
|
||||||
} else {
|
} else {
|
||||||
$("approve-tx-to").innerHTML = escapeHtml(CONTRACT_CREATION_TEXT);
|
$("approve-tx-to").innerHTML = escapeHtml(CONTRACT_CREATION_TEXT);
|
||||||
}
|
}
|
||||||
|
|
||||||
const ethValueFormatted = formatTxValue(ethValue);
|
const ethValueFormatted = formatTxValue(
|
||||||
// Priced from the exact value, not the four-decimal figure, at the price
|
formatEther(approvedTx.value || "0"),
|
||||||
// on the network the transaction is for, as the confirmation screen prices
|
);
|
||||||
// its amount, so the same value reads the same on both.
|
const ethPrice = getPrice("ETH");
|
||||||
const ethPrice = getPrice("ETH", approvedTx.chainId);
|
const ethUsd = ethPrice ? parseFloat(ethValueFormatted) * ethPrice : null;
|
||||||
const ethUsd = ethPrice ? parseFloat(ethValue) * ethPrice : null;
|
|
||||||
const usdStr = formatUsd(ethUsd);
|
const usdStr = formatUsd(ethUsd);
|
||||||
// In the native currency of the network the transaction is for, which the
|
// In the native currency of the network the transaction is for, which the
|
||||||
// Network line names, not the active network's: the active network can
|
// Network line names, not the active network's: the active network can
|
||||||
@@ -400,12 +386,9 @@ function showTxApproval(details) {
|
|||||||
detailsHtml += `<div class="text-muted">${escapeHtml(d.label)}</div>`;
|
detailsHtml += `<div class="text-muted">${escapeHtml(d.label)}</div>`;
|
||||||
if (d.address) {
|
if (d.address) {
|
||||||
if (d.isToken) {
|
if (d.isToken) {
|
||||||
detailsHtml += `<div class="font-bold">${escapeHtml(tokenLabel(d.address, approvedTx.chainId) || "Unknown token")}</div>`;
|
detailsHtml += `<div class="font-bold">${escapeHtml(tokenLabel(d.address) || "Unknown token")}</div>`;
|
||||||
}
|
}
|
||||||
detailsHtml += approvalAddressHtml(
|
detailsHtml += approvalAddressHtml(d.address);
|
||||||
d.address,
|
|
||||||
approvedTx.chainId,
|
|
||||||
);
|
|
||||||
} else {
|
} else {
|
||||||
detailsHtml += `<div class="font-bold">${escapeHtml(d.value)}</div>`;
|
detailsHtml += `<div class="font-bold">${escapeHtml(d.value)}</div>`;
|
||||||
}
|
}
|
||||||
|
|||||||
+145
-241
@@ -2,13 +2,7 @@
|
|||||||
// Shows transaction details, warnings, errors. On Sign & Send,
|
// Shows transaction details, warnings, errors. On Sign & Send,
|
||||||
// reads inline password, decrypts secret, signs and broadcasts.
|
// reads inline password, decrypts secret, signs and broadcasts.
|
||||||
|
|
||||||
const {
|
const { parseEther, parseUnits, formatEther, Contract } = require("ethers");
|
||||||
parseEther,
|
|
||||||
parseUnits,
|
|
||||||
formatEther,
|
|
||||||
formatUnits,
|
|
||||||
Contract,
|
|
||||||
} = require("ethers");
|
|
||||||
const {
|
const {
|
||||||
$,
|
$,
|
||||||
showError,
|
showError,
|
||||||
@@ -17,16 +11,15 @@ const {
|
|||||||
addressTitle,
|
addressTitle,
|
||||||
escapeHtml,
|
escapeHtml,
|
||||||
displaySymbol,
|
displaySymbol,
|
||||||
|
nativeCurrency,
|
||||||
renderAddressHtml,
|
renderAddressHtml,
|
||||||
blockieHtml,
|
blockieHtml,
|
||||||
attachCopyHandlers,
|
attachCopyHandlers,
|
||||||
goBack,
|
goBack,
|
||||||
onViewLeave,
|
onViewLeave,
|
||||||
formatFee,
|
formatFee,
|
||||||
reviewedNetworkProvider,
|
|
||||||
} = require("./helpers");
|
} = require("./helpers");
|
||||||
const { state, currentNetwork } = require("../../shared/state");
|
const { state, currentNetwork } = require("../../shared/state");
|
||||||
const { nativeCurrencyByChainId } = require("../../shared/networks");
|
|
||||||
const { getSignerForAddress } = require("../../shared/wallet");
|
const { getSignerForAddress } = require("../../shared/wallet");
|
||||||
const { walletDefect } = require("../../shared/walletDefects");
|
const { walletDefect } = require("../../shared/walletDefects");
|
||||||
const { decryptWithPassword } = require("../../shared/vault");
|
const { decryptWithPassword } = require("../../shared/vault");
|
||||||
@@ -39,12 +32,11 @@ const {
|
|||||||
const { ERC20_ABI, isBurnAddress } = require("../../shared/constants");
|
const { ERC20_ABI, isBurnAddress } = require("../../shared/constants");
|
||||||
const {
|
const {
|
||||||
displayedDecimals,
|
displayedDecimals,
|
||||||
toDecimals,
|
|
||||||
transferAmountUnits,
|
transferAmountUnits,
|
||||||
} = require("../../shared/transferAmount");
|
} = require("../../shared/transferAmount");
|
||||||
const { assertWithinCeilings } = require("../../shared/approvalVerify");
|
const { assertWithinCeilings } = require("../../shared/approvalVerify");
|
||||||
// The amount, the balance line and the fee reserve go through it, as the
|
// The balance lines, the fee reserve and the insufficient-balance messages go
|
||||||
// approval screen's amounts do.
|
// through it, as the approval screen's amounts do.
|
||||||
const { truncateAmountNeverZero } = require("../../shared/amountDisplay");
|
const { truncateAmountNeverZero } = require("../../shared/amountDisplay");
|
||||||
const {
|
const {
|
||||||
CODES,
|
CODES,
|
||||||
@@ -68,13 +60,6 @@ let feeWei = null;
|
|||||||
// amount was derived from. Null for any other send, which ethers prices from
|
// amount was derived from. Null for any other send, which ethers prices from
|
||||||
// the node at signing time.
|
// the node at signing time.
|
||||||
let maxSendFees = null;
|
let maxSendFees = null;
|
||||||
// The From address's balances on the network this screen is drawn for, read
|
|
||||||
// from that network's node by readBalances() each time the screen is shown,
|
|
||||||
// so a screen the popup reopens onto states them as they are then, not as
|
|
||||||
// Send knew them. Null until the read returns; then `eth` and `token` are
|
|
||||||
// decimal strings, `token` null for an ETH send or a token whose scale is
|
|
||||||
// unknown, and both null if the read failed.
|
|
||||||
let balances = null;
|
|
||||||
|
|
||||||
function restore() {
|
function restore() {
|
||||||
const d = state.viewData;
|
const d = state.viewData;
|
||||||
@@ -83,11 +68,11 @@ function restore() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function confirmAddressHtml(address, ensName, title, chainId) {
|
function confirmAddressHtml(address, ensName, title) {
|
||||||
const blockie = blockieHtml(address);
|
const blockie = blockieHtml(address);
|
||||||
return (
|
return (
|
||||||
`<div class="mb-1">${blockie}</div>` +
|
`<div class="mb-1">${blockie}</div>` +
|
||||||
renderAddressHtml(address, { title, ensName, chainId })
|
renderAddressHtml(address, { title, ensName })
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -98,96 +83,34 @@ function valueWithUsd(text, usdAmount) {
|
|||||||
return text;
|
return text;
|
||||||
}
|
}
|
||||||
|
|
||||||
// The amount as this screen and the wait, success and error screens show it,
|
// The Amount line, with its USD value. A max ETH send's line is drawn again
|
||||||
// written as the approval screen writes a site's amount: the amount being
|
// once its amount is re-derived from the fee estimate.
|
||||||
// signed, parsed at the scale it is encoded with and written back as plain
|
|
||||||
// decimal text, then cut to four decimals with the nonzero floor. So `.5` and
|
|
||||||
// `00.5` read `0.5000`, as `0.5` does, except for a token whose scale is
|
|
||||||
// unknown, which cannot be sent: its amount is cut as typed, so `.5` reads
|
|
||||||
// `.5000`. txInfo.amount, which is what gets signed, is left as it is.
|
|
||||||
function shownAmount(txInfo) {
|
|
||||||
let exact = txInfo.amount;
|
|
||||||
try {
|
|
||||||
if (txInfo.token === "ETH") {
|
|
||||||
exact = formatEther(parseEther(txInfo.amount));
|
|
||||||
} else {
|
|
||||||
const decimals = displayedDecimals(txInfo.tokenDecimals);
|
|
||||||
exact = formatUnits(parseUnits(txInfo.amount, decimals), decimals);
|
|
||||||
}
|
|
||||||
} catch {
|
|
||||||
// A token whose scale is unknown, which is never signed, or an amount
|
|
||||||
// the amount check refuses: cut as Send's amount field held it.
|
|
||||||
}
|
|
||||||
return truncateAmountNeverZero(exact);
|
|
||||||
}
|
|
||||||
|
|
||||||
// The Amount line, with its USD value, which is priced from the exact amount.
|
|
||||||
// A max ETH send's line is drawn again once its amount is re-derived from the
|
|
||||||
// fee estimate.
|
|
||||||
function renderAmount(txInfo) {
|
function renderAmount(txInfo) {
|
||||||
const isErc20 = txInfo.token !== "ETH";
|
const isErc20 = txInfo.token !== "ETH";
|
||||||
const rawSymbol = isErc20
|
const rawSymbol = isErc20 ? txInfo.tokenSymbol || "?" : nativeCurrency();
|
||||||
? txInfo.tokenSymbol || "?"
|
const price = isErc20 ? getPrice(rawSymbol) : getPrice("ETH");
|
||||||
: nativeCurrencyByChainId(txInfo.chainId);
|
|
||||||
const price = getPrice(isErc20 ? rawSymbol : "ETH", txInfo.chainId);
|
|
||||||
const amountUsd = price ? parseFloat(txInfo.amount) * price : null;
|
const amountUsd = price ? parseFloat(txInfo.amount) * price : null;
|
||||||
$("confirm-amount").textContent = valueWithUsd(
|
$("confirm-amount").textContent = valueWithUsd(
|
||||||
shownAmount(txInfo) + " " + displaySymbol(rawSymbol),
|
txInfo.amount + " " + displaySymbol(rawSymbol),
|
||||||
amountUsd,
|
amountUsd,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// The balance line, with its USD value: "Loading..." until readBalances()
|
|
||||||
// returns, then the balance it read.
|
|
||||||
function renderBalance(txInfo) {
|
|
||||||
const isErc20 = txInfo.token !== "ETH";
|
|
||||||
const rawSymbol = isErc20
|
|
||||||
? txInfo.tokenSymbol || "?"
|
|
||||||
: nativeCurrencyByChainId(txInfo.chainId);
|
|
||||||
const symbol = displaySymbol(rawSymbol);
|
|
||||||
if (balances === null) {
|
|
||||||
$("confirm-balance").textContent = "Loading...";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
// A null balance is one nobody established, for a token whose scale is
|
|
||||||
// unknown or after a read that failed, and is stated as unknown, never as
|
|
||||||
// zero (https://git.eeqj.de/sneak/AutistMask/issues/349).
|
|
||||||
const bal = isErc20 ? balances.token : balances.eth;
|
|
||||||
if (bal === null) {
|
|
||||||
$("confirm-balance").textContent = "unknown (" + symbol + ")";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const price = getPrice(isErc20 ? rawSymbol : "ETH", txInfo.chainId);
|
|
||||||
const balUsd = price ? parseFloat(bal) * price : null;
|
|
||||||
$("confirm-balance").textContent = valueWithUsd(
|
|
||||||
truncateAmountNeverZero(bal) + " " + symbol,
|
|
||||||
balUsd,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function show(txInfo) {
|
function show(txInfo) {
|
||||||
pendingTx = txInfo;
|
pendingTx = txInfo;
|
||||||
feeStatus = FEE_PENDING;
|
feeStatus = FEE_PENDING;
|
||||||
feeWei = null;
|
feeWei = null;
|
||||||
maxSendFees = null;
|
maxSendFees = null;
|
||||||
balances = null;
|
// The network this screen is drawn for, and the only one it sends on:
|
||||||
// The network this screen is drawn for, and the only one it sends on: the
|
// Settings can switch the active network while the screen is open. The
|
||||||
// one active when Send handed the transaction over. Drawn again from the
|
// wait, success and error screens label the amount by it too.
|
||||||
// saved transaction, as when the popup reopens onto this screen, it keeps
|
txInfo.chainId = currentNetwork().chainId;
|
||||||
// that network, so Sign & Send refuses once Settings has switched to
|
|
||||||
// another. Everything this screen shows is that network's: native
|
|
||||||
// currency, USD values, explorer links, the balance, and the node and
|
|
||||||
// explorer its checks ask. The wait, success and error screens label
|
|
||||||
// amounts by it.
|
|
||||||
if (!txInfo.chainId) txInfo.chainId = currentNetwork().chainId;
|
|
||||||
|
|
||||||
const isErc20 = txInfo.token !== "ETH";
|
const isErc20 = txInfo.token !== "ETH";
|
||||||
// The raw symbol is the price-table key; the capped one is what the
|
// The raw symbol is the price-table key; the capped one is what the
|
||||||
// screen says. Truncating before the lookup would silently drop the
|
// screen says. Truncating before the lookup would silently drop the
|
||||||
// price of any token whose symbol is long enough to be capped.
|
// price of any token whose symbol is long enough to be capped.
|
||||||
const rawSymbol = isErc20
|
const rawSymbol = isErc20 ? txInfo.tokenSymbol || "?" : nativeCurrency();
|
||||||
? txInfo.tokenSymbol || "?"
|
|
||||||
: nativeCurrencyByChainId(txInfo.chainId);
|
|
||||||
const symbol = displaySymbol(rawSymbol);
|
const symbol = displaySymbol(rawSymbol);
|
||||||
|
|
||||||
// Transaction type
|
// Transaction type
|
||||||
@@ -203,7 +126,7 @@ function show(txInfo) {
|
|||||||
if (isErc20) {
|
if (isErc20) {
|
||||||
$("confirm-token-contract").innerHTML = renderAddressHtml(
|
$("confirm-token-contract").innerHTML = renderAddressHtml(
|
||||||
txInfo.token,
|
txInfo.token,
|
||||||
{ chainId: txInfo.chainId },
|
{},
|
||||||
);
|
);
|
||||||
tokenSection.classList.remove("hidden");
|
tokenSection.classList.remove("hidden");
|
||||||
attachCopyHandlers(tokenSection);
|
attachCopyHandlers(tokenSection);
|
||||||
@@ -217,7 +140,6 @@ function show(txInfo) {
|
|||||||
txInfo.from,
|
txInfo.from,
|
||||||
null,
|
null,
|
||||||
fromTitle,
|
fromTitle,
|
||||||
txInfo.chainId,
|
|
||||||
);
|
);
|
||||||
|
|
||||||
// To (with blockie)
|
// To (with blockie)
|
||||||
@@ -226,12 +148,37 @@ function show(txInfo) {
|
|||||||
txInfo.to,
|
txInfo.to,
|
||||||
txInfo.ensName,
|
txInfo.ensName,
|
||||||
toTitle,
|
toTitle,
|
||||||
txInfo.chainId,
|
|
||||||
);
|
);
|
||||||
$("confirm-to-ens").classList.add("hidden");
|
$("confirm-to-ens").classList.add("hidden");
|
||||||
|
|
||||||
renderAmount(txInfo);
|
renderAmount(txInfo);
|
||||||
renderBalance(txInfo);
|
|
||||||
|
// Balance (with inline USD)
|
||||||
|
const ethPrice = getPrice("ETH");
|
||||||
|
const tokenPrice = getPrice(rawSymbol);
|
||||||
|
if (isErc20) {
|
||||||
|
// null is a balance whose scale nothing knows, not a balance of zero
|
||||||
|
// (https://git.eeqj.de/sneak/AutistMask/issues/349). The send is
|
||||||
|
// refused at encode time for the same missing scale; what this line
|
||||||
|
// must not do is state a quantity nobody established.
|
||||||
|
const bal = txInfo.tokenBalance;
|
||||||
|
const balUsd =
|
||||||
|
tokenPrice && bal != null ? parseFloat(bal) * tokenPrice : null;
|
||||||
|
$("confirm-balance").textContent =
|
||||||
|
bal == null
|
||||||
|
? "unknown (" + symbol + ")"
|
||||||
|
: valueWithUsd(
|
||||||
|
truncateAmountNeverZero(bal) + " " + symbol,
|
||||||
|
balUsd,
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
const bal = txInfo.balance || "0";
|
||||||
|
const balUsd = ethPrice ? parseFloat(bal) * ethPrice : null;
|
||||||
|
$("confirm-balance").textContent = valueWithUsd(
|
||||||
|
truncateAmountNeverZero(bal) + " " + symbol,
|
||||||
|
balUsd,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
// Check for warnings (synchronous local checks)
|
// Check for warnings (synchronous local checks)
|
||||||
const localWarnings = getLocalWarnings(txInfo.to, {
|
const localWarnings = getLocalWarnings(txInfo.to, {
|
||||||
@@ -265,9 +212,9 @@ function show(txInfo) {
|
|||||||
$("confirm-gas-error").classList.toggle("hidden", !isErc20);
|
$("confirm-gas-error").classList.toggle("hidden", !isErc20);
|
||||||
$("confirm-gas-error").textContent =
|
$("confirm-gas-error").textContent =
|
||||||
"You do not have enough " +
|
"You do not have enough " +
|
||||||
nativeCurrencyByChainId(txInfo.chainId) +
|
nativeCurrency() +
|
||||||
" to pay the network fee for this transfer. Please add " +
|
" to pay the network fee for this transfer. Please add " +
|
||||||
nativeCurrencyByChainId(txInfo.chainId) +
|
nativeCurrency() +
|
||||||
" to this address and try again.";
|
" to this address and try again.";
|
||||||
|
|
||||||
// Both shown later, by checkRecipientHistory(). The first sentence says
|
// Both shown later, by checkRecipientHistory(). The first sentence says
|
||||||
@@ -275,12 +222,12 @@ function show(txInfo) {
|
|||||||
$("confirm-recipient-warning").textContent =
|
$("confirm-recipient-warning").textContent =
|
||||||
"WARNING: The recipient address has never sent a transaction and" +
|
"WARNING: The recipient address has never sent a transaction and" +
|
||||||
" holds no " +
|
" holds no " +
|
||||||
nativeCurrencyByChainId(txInfo.chainId) +
|
nativeCurrency() +
|
||||||
". This may indicate a fresh or unused address. Double-check the" +
|
". This may indicate a fresh or unused address. Double-check the" +
|
||||||
" address before sending.";
|
" address before sending.";
|
||||||
$("confirm-contract-warning").textContent =
|
$("confirm-contract-warning").textContent =
|
||||||
"WARNING: The recipient is a smart contract. Sending " +
|
"WARNING: The recipient is a smart contract. Sending " +
|
||||||
nativeCurrencyByChainId(txInfo.chainId) +
|
nativeCurrency() +
|
||||||
" or tokens directly to a contract may result in permanent loss of" +
|
" or tokens directly to a contract may result in permanent loss of" +
|
||||||
" funds.";
|
" funds.";
|
||||||
|
|
||||||
@@ -297,29 +244,11 @@ function show(txInfo) {
|
|||||||
" cannot be checked against your balance. Please go back and" +
|
" cannot be checked against your balance. Please go back and" +
|
||||||
" try again.";
|
" try again.";
|
||||||
|
|
||||||
// So does the message for an amount the balance does not cover. It is
|
|
||||||
// set here, before the first paint, so the balance read returning only
|
|
||||||
// makes it visible and moves nothing, which is why it quotes no balance.
|
|
||||||
// Without the token's scale readBalances() reads no token balance.
|
|
||||||
$("confirm-balance-error").textContent =
|
|
||||||
isErc20 && toDecimals(txInfo.tokenDecimals) === null
|
|
||||||
? "This token's balance is unknown, because nothing this wallet" +
|
|
||||||
" can consult reports how many decimal places it uses, so the" +
|
|
||||||
" amount you are trying to send cannot be checked against it."
|
|
||||||
: "Your " +
|
|
||||||
symbol +
|
|
||||||
" balance does not cover this amount. Please go back and send" +
|
|
||||||
" a smaller amount.";
|
|
||||||
|
|
||||||
renderValidation(txInfo);
|
renderValidation(txInfo);
|
||||||
|
|
||||||
// Reset password field and error, and any refusal of an earlier Sign &
|
// Reset password field and error
|
||||||
// Send.
|
|
||||||
$("confirm-tx-password").value = "";
|
$("confirm-tx-password").value = "";
|
||||||
hideError("confirm-tx-password-error");
|
hideError("confirm-tx-password-error");
|
||||||
setVisible("confirm-network-changed-error", false);
|
|
||||||
setVisible("confirm-from-address-error", false);
|
|
||||||
setVisible("confirm-fee-bound-error", false);
|
|
||||||
|
|
||||||
// Gas estimate — show placeholder then fetch async
|
// Gas estimate — show placeholder then fetch async
|
||||||
$("confirm-fee").style.visibility = "visible";
|
$("confirm-fee").style.visibility = "visible";
|
||||||
@@ -340,78 +269,69 @@ function show(txInfo) {
|
|||||||
$("confirm-burn-warning").style.visibility = "visible";
|
$("confirm-burn-warning").style.visibility = "visible";
|
||||||
}
|
}
|
||||||
|
|
||||||
// The fee is estimated once the balances are read, because a max ETH
|
estimateGas(txInfo);
|
||||||
// send's amount is the ETH balance minus the estimate's reserve.
|
|
||||||
readBalances(txInfo).then(() => estimateGas(txInfo));
|
|
||||||
checkRecipientHistory(txInfo);
|
checkRecipientHistory(txInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Read the From address's balances from the node of the network this
|
|
||||||
// transaction was reviewed for: ETH, and for a token send the token, at the
|
|
||||||
// scale the screen renders the amount with. A token whose scale is unknown has
|
|
||||||
// no balance to read. Never rejects.
|
|
||||||
async function readBalances(txInfo) {
|
|
||||||
let read;
|
|
||||||
try {
|
|
||||||
const provider = reviewedNetworkProvider(txInfo);
|
|
||||||
const decimals = toDecimals(txInfo.tokenDecimals);
|
|
||||||
const readToken = txInfo.token !== "ETH" && decimals !== null;
|
|
||||||
const [ethWei, tokenUnits] = await Promise.all([
|
|
||||||
provider.getBalance(txInfo.from),
|
|
||||||
readToken
|
|
||||||
? new Contract(txInfo.token, ERC20_ABI, provider).balanceOf(
|
|
||||||
txInfo.from,
|
|
||||||
)
|
|
||||||
: null,
|
|
||||||
]);
|
|
||||||
read = {
|
|
||||||
eth: formatEther(ethWei),
|
|
||||||
token: readToken ? formatUnits(tokenUnits, decimals) : null,
|
|
||||||
};
|
|
||||||
} catch (e) {
|
|
||||||
log.errorf("balance read failed:", e.shortMessage || e.message);
|
|
||||||
read = { eth: null, token: null };
|
|
||||||
}
|
|
||||||
// The user may have left this transaction while the read was in flight.
|
|
||||||
if (pendingTx !== txInfo) return;
|
|
||||||
balances = read;
|
|
||||||
renderBalance(txInfo);
|
|
||||||
renderValidation(txInfo);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Render the balance check for the transaction on screen. Called once during
|
// Render the balance check for the transaction on screen. Called once during
|
||||||
// show(), again when the balances are read, and again when the fee estimate
|
// show() and again when the fee estimate resolves or fails. Every element it
|
||||||
// resolves or fails. Every element it touches already occupies its space, so
|
// touches already occupies its space, so re-running it never moves anything.
|
||||||
// re-running it never moves anything.
|
|
||||||
function renderValidation(txInfo) {
|
function renderValidation(txInfo) {
|
||||||
const isErc20 = txInfo.token !== "ETH";
|
const isErc20 = txInfo.token !== "ETH";
|
||||||
|
const symbol = isErc20
|
||||||
// Null while the balances are being read and after a read that failed.
|
? displaySymbol(txInfo.tokenSymbol || "?")
|
||||||
// validateTransfer() takes a missing balance as nothing to spend from, so
|
: nativeCurrency();
|
||||||
// sending stays blocked either way, and the only message shown for it is
|
|
||||||
// the one saying the read failed.
|
|
||||||
const ethBalance = balances ? balances.eth : null;
|
|
||||||
const tokenBalance = balances ? balances.token : null;
|
|
||||||
const balanceRead = ethBalance !== null;
|
|
||||||
|
|
||||||
const { canSend, codes } = validateTransfer({
|
const { canSend, codes } = validateTransfer({
|
||||||
isErc20,
|
isErc20,
|
||||||
amount: txInfo.amount,
|
amount: txInfo.amount,
|
||||||
tokenDecimals: txInfo.tokenDecimals,
|
tokenDecimals: txInfo.tokenDecimals,
|
||||||
ethBalance,
|
ethBalance: txInfo.balance,
|
||||||
tokenBalance,
|
tokenBalance: txInfo.tokenBalance,
|
||||||
feeStatus,
|
feeStatus,
|
||||||
feeWei,
|
feeWei,
|
||||||
});
|
});
|
||||||
|
|
||||||
// An invalid amount is known before the first paint, so its message is
|
// Messages carrying the user's own numbers are built here; the fixed
|
||||||
// written here. Every message a later result brings has a reserved
|
// sentences live in the reserved elements in index.html, except the
|
||||||
// element, its sentence fixed in index.html or set by show(), and is only
|
// gas and fee-unknown ones, which show() sets.
|
||||||
// made visible below, so nothing moves when the result arrives.
|
|
||||||
const messages = [];
|
const messages = [];
|
||||||
if (codes.includes(CODES.AMOUNT_INVALID)) {
|
if (codes.includes(CODES.AMOUNT_INVALID)) {
|
||||||
messages.push("Please enter a valid amount to send.");
|
messages.push("Please enter a valid amount to send.");
|
||||||
}
|
}
|
||||||
|
if (codes.includes(CODES.INSUFFICIENT_TOKEN)) {
|
||||||
|
messages.push(
|
||||||
|
txInfo.tokenBalance == null
|
||||||
|
? "This token's balance is unknown, because nothing this" +
|
||||||
|
" wallet can consult reports how many decimal places it" +
|
||||||
|
" uses, so the amount you are trying to send cannot be" +
|
||||||
|
" checked against it."
|
||||||
|
: "Insufficient " +
|
||||||
|
symbol +
|
||||||
|
" balance. You have " +
|
||||||
|
truncateAmountNeverZero(txInfo.tokenBalance) +
|
||||||
|
" " +
|
||||||
|
symbol +
|
||||||
|
" but are trying to send " +
|
||||||
|
txInfo.amount +
|
||||||
|
" " +
|
||||||
|
symbol +
|
||||||
|
".",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (codes.includes(CODES.INSUFFICIENT_ETH)) {
|
||||||
|
messages.push(
|
||||||
|
"Insufficient balance. You have " +
|
||||||
|
truncateAmountNeverZero(txInfo.balance || "0") +
|
||||||
|
" " +
|
||||||
|
symbol +
|
||||||
|
" but are trying to send " +
|
||||||
|
txInfo.amount +
|
||||||
|
" " +
|
||||||
|
symbol +
|
||||||
|
".",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
const errorsEl = $("confirm-errors");
|
const errorsEl = $("confirm-errors");
|
||||||
if (messages.length > 0) {
|
if (messages.length > 0) {
|
||||||
@@ -424,20 +344,13 @@ function renderValidation(txInfo) {
|
|||||||
errorsEl.style.visibility = "hidden";
|
errorsEl.style.visibility = "hidden";
|
||||||
}
|
}
|
||||||
|
|
||||||
setVisible("confirm-balance-read-error", balances !== null && !balanceRead);
|
|
||||||
setVisible(
|
|
||||||
"confirm-balance-error",
|
|
||||||
balanceRead &&
|
|
||||||
(codes.includes(CODES.INSUFFICIENT_TOKEN) ||
|
|
||||||
codes.includes(CODES.INSUFFICIENT_ETH)),
|
|
||||||
);
|
|
||||||
setVisible(
|
setVisible(
|
||||||
"confirm-amount-fee-error",
|
"confirm-amount-fee-error",
|
||||||
balanceRead && codes.includes(CODES.INSUFFICIENT_ETH_WITH_FEE),
|
codes.includes(CODES.INSUFFICIENT_ETH_WITH_FEE),
|
||||||
);
|
);
|
||||||
setVisible(
|
setVisible(
|
||||||
"confirm-gas-error",
|
"confirm-gas-error",
|
||||||
balanceRead && codes.includes(CODES.INSUFFICIENT_ETH_FOR_FEE),
|
codes.includes(CODES.INSUFFICIENT_ETH_FOR_FEE),
|
||||||
);
|
);
|
||||||
setVisible(
|
setVisible(
|
||||||
"confirm-fee-unknown-error",
|
"confirm-fee-unknown-error",
|
||||||
@@ -458,7 +371,7 @@ function setVisible(id, visible) {
|
|||||||
|
|
||||||
async function estimateGas(txInfo) {
|
async function estimateGas(txInfo) {
|
||||||
try {
|
try {
|
||||||
const provider = reviewedNetworkProvider(txInfo);
|
const provider = getProvider(state.rpcUrl, state.networkId);
|
||||||
const feeData = await provider.getFeeData();
|
const feeData = await provider.getFeeData();
|
||||||
let gasLimit;
|
let gasLimit;
|
||||||
|
|
||||||
@@ -506,17 +419,12 @@ async function estimateGas(txInfo) {
|
|||||||
// does, so the same fee reads the same on both.
|
// does, so the same fee reads the same on both.
|
||||||
if (estimateWei !== null && estimateWei < gasCostWei) {
|
if (estimateWei !== null && estimateWei < gasCostWei) {
|
||||||
$("confirm-fee-amount").textContent =
|
$("confirm-fee-amount").textContent =
|
||||||
"~" +
|
"~" + formatFee(estimateWei, nativeCurrency());
|
||||||
formatFee(
|
|
||||||
estimateWei,
|
|
||||||
nativeCurrencyByChainId(txInfo.chainId),
|
|
||||||
txInfo.chainId,
|
|
||||||
);
|
|
||||||
$("confirm-fee-reserve").textContent =
|
$("confirm-fee-reserve").textContent =
|
||||||
"up to " +
|
"up to " +
|
||||||
truncateAmountNeverZero(formatEther(gasCostWei)) +
|
truncateAmountNeverZero(formatEther(gasCostWei)) +
|
||||||
" " +
|
" " +
|
||||||
nativeCurrencyByChainId(txInfo.chainId) +
|
nativeCurrency() +
|
||||||
" reserved";
|
" reserved";
|
||||||
setVisible("confirm-fee-reserve", true);
|
setVisible("confirm-fee-reserve", true);
|
||||||
} else {
|
} else {
|
||||||
@@ -525,21 +433,20 @@ async function estimateGas(txInfo) {
|
|||||||
// cost is not below the reserve. Show the reserve alone.
|
// cost is not below the reserve. Show the reserve alone.
|
||||||
$("confirm-fee-amount").textContent = formatFee(
|
$("confirm-fee-amount").textContent = formatFee(
|
||||||
gasCostWei,
|
gasCostWei,
|
||||||
nativeCurrencyByChainId(txInfo.chainId),
|
nativeCurrency(),
|
||||||
txInfo.chainId,
|
|
||||||
);
|
);
|
||||||
setVisible("confirm-fee-reserve", false);
|
setVisible("confirm-fee-reserve", false);
|
||||||
}
|
}
|
||||||
feeStatus = FEE_KNOWN;
|
feeStatus = FEE_KNOWN;
|
||||||
feeWei = gasCostWei;
|
feeWei = gasCostWei;
|
||||||
// A max ETH send is the balance readBalances() read minus this
|
// A max ETH send is the balance minus this estimate's reserve, not the
|
||||||
// estimate's reserve, not the Send screen's, and is signed with this
|
// Send screen's, and is signed with this estimate's fee fields: fees
|
||||||
// estimate's fee fields: fees fetched again at signing could exceed
|
// fetched again at signing could exceed the reserve it leaves, and the
|
||||||
// the reserve it leaves, and the node would refuse it for want of
|
// node would refuse it for want of funds. Where the balance no longer
|
||||||
// funds. Where the balance is unknown or no longer covers the fee, the
|
// covers the fee, the amount is left as it is and the balance check
|
||||||
// amount is left as it is and the balance check below says so.
|
// below says so.
|
||||||
if (txInfo.max && txInfo.token === "ETH") {
|
if (txInfo.max && txInfo.token === "ETH") {
|
||||||
const amount = maxEthAmount(balances?.eth, gasCostWei);
|
const amount = maxEthAmount(txInfo.balance, gasCostWei);
|
||||||
if (amount !== null) {
|
if (amount !== null) {
|
||||||
txInfo.amount = amount;
|
txInfo.amount = amount;
|
||||||
renderAmount(txInfo);
|
renderAmount(txInfo);
|
||||||
@@ -568,17 +475,16 @@ async function estimateGas(txInfo) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Populate the transaction this send describes, enforce the bounds against the
|
// Populate the transaction this send describes, enforce the fee bound against
|
||||||
// gas limit and fees that were actually filled in, then sign and broadcast it.
|
// the fees that were actually filled in, then sign and broadcast it. Apart
|
||||||
// Apart from a max ETH send, which passes its estimate's fee fields as `fees`,
|
// from a max ETH send, which passes its estimate's fee fields as `fees`, the
|
||||||
// the send pins no fee fields, so ethers fills maxFeePerGas and the gas limit
|
// send pins no fee fields, so ethers fills maxFeePerGas and the gas limit from
|
||||||
// from what the configured RPC node answers, with nothing otherwise bounding
|
// what the configured RPC node answers, with nothing otherwise bounding what a
|
||||||
// what a hostile node can set — the dApp path's ceilings never reached this
|
// hostile node can set — the dApp path's ceilings never reached this one.
|
||||||
// one. Populating before the check is what makes assertWithinCeilings() see
|
// Populating before the check is what makes assertWithinCeilings() see the
|
||||||
// the same numbers that would be signed; it throws an ApprovalMismatchError
|
// same numbers that would be signed; it throws an ApprovalMismatchError when
|
||||||
// when the gas limit, a fee per gas, or the product gasLimit × maxFeePerGas is
|
// the product gasLimit × maxFeePerGas is over the bound, which the caller
|
||||||
// over its bound, and the caller then shows the one refusal reserved for all
|
// shows in the reserved error area rather than sending.
|
||||||
// three rather than sending.
|
|
||||||
async function populateVerifyAndSend(connectedSigner, tx, fees = null) {
|
async function populateVerifyAndSend(connectedSigner, tx, fees = null) {
|
||||||
let request;
|
let request;
|
||||||
if (tx.token === "ETH") {
|
if (tx.token === "ETH") {
|
||||||
@@ -606,16 +512,21 @@ async function populateVerifyAndSend(connectedSigner, tx, fees = null) {
|
|||||||
return connectedSigner.sendTransaction(populated);
|
return connectedSigner.sendTransaction(populated);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Show a full-sentence send failure in the reserved errors box, the same
|
||||||
|
// element and markup renderValidation() uses for messages carrying the user's
|
||||||
|
// own numbers, so it never moves anything on the screen.
|
||||||
|
function showSendError(message) {
|
||||||
|
const el = $("confirm-errors");
|
||||||
|
el.innerHTML = `<div class="text-xs">${escapeHtml(message)}</div>`;
|
||||||
|
el.style.visibility = "visible";
|
||||||
|
}
|
||||||
|
|
||||||
async function checkRecipientHistory(txInfo) {
|
async function checkRecipientHistory(txInfo) {
|
||||||
try {
|
try {
|
||||||
const provider = reviewedNetworkProvider(txInfo);
|
const provider = getProvider(state.rpcUrl, state.networkId);
|
||||||
const asyncWarnings = await getFullWarnings(txInfo.to, provider, {
|
const asyncWarnings = await getFullWarnings(txInfo.to, provider, {
|
||||||
fromAddress: txInfo.from,
|
fromAddress: txInfo.from,
|
||||||
chainId: txInfo.chainId,
|
|
||||||
});
|
});
|
||||||
// The user may have left this transaction while the checks were in
|
|
||||||
// flight; its warnings must not reach another recipient's screen.
|
|
||||||
if (pendingTx !== txInfo) return;
|
|
||||||
for (const w of asyncWarnings) {
|
for (const w of asyncWarnings) {
|
||||||
if (w.type === "contract") {
|
if (w.type === "contract") {
|
||||||
$("confirm-contract-warning").style.visibility = "visible";
|
$("confirm-contract-warning").style.visibility = "visible";
|
||||||
@@ -644,11 +555,6 @@ function init(_ctx) {
|
|||||||
onViewLeave("confirm-tx", clearPassword);
|
onViewLeave("confirm-tx", clearPassword);
|
||||||
|
|
||||||
$("btn-confirm-send").addEventListener("click", async () => {
|
$("btn-confirm-send").addEventListener("click", async () => {
|
||||||
// A press shows only its own refusal, if any.
|
|
||||||
setVisible("confirm-network-changed-error", false);
|
|
||||||
setVisible("confirm-from-address-error", false);
|
|
||||||
setVisible("confirm-fee-bound-error", false);
|
|
||||||
|
|
||||||
const wallet = state.wallets[state.selectedWallet];
|
const wallet = state.wallets[state.selectedWallet];
|
||||||
// Every Send button refuses a defective wallet before this screen,
|
// Every Send button refuses a defective wallet before this screen,
|
||||||
// but the popup also reopens onto it from a saved view.
|
// but the popup also reopens onto it from a saved view.
|
||||||
@@ -658,12 +564,14 @@ function init(_ctx) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// The screen describes the network the transaction was reviewed for,
|
// Back from Settings only unhides this screen, still drawn for the
|
||||||
// which Settings may have switched away from since: "Back" from
|
// network that was active when it was shown.
|
||||||
// Settings after a switch draws this screen again from the saved
|
|
||||||
// transaction, as a popup reopened onto it does.
|
|
||||||
if (currentNetwork().chainId !== pendingTx.chainId) {
|
if (currentNetwork().chainId !== pendingTx.chainId) {
|
||||||
setVisible("confirm-network-changed-error", true);
|
showSendError(
|
||||||
|
"The active network changed after this transaction was" +
|
||||||
|
" reviewed, so it was not sent. Please go back and review" +
|
||||||
|
" it again.",
|
||||||
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -672,7 +580,11 @@ function init(_ctx) {
|
|||||||
// address selected.
|
// address selected.
|
||||||
const addr = wallet.addresses.find((a) => a.address === pendingTx.from);
|
const addr = wallet.addresses.find((a) => a.address === pendingTx.from);
|
||||||
if (!addr) {
|
if (!addr) {
|
||||||
setVisible("confirm-from-address-error", true);
|
showError(
|
||||||
|
"confirm-tx-password-error",
|
||||||
|
"The selected wallet does not hold the From address above, " +
|
||||||
|
"so nothing was sent. Please go back and send again.",
|
||||||
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -704,10 +616,6 @@ function init(_ctx) {
|
|||||||
$("btn-confirm-send").disabled = true;
|
$("btn-confirm-send").disabled = true;
|
||||||
$("btn-confirm-send").classList.add("text-muted");
|
$("btn-confirm-send").classList.add("text-muted");
|
||||||
|
|
||||||
// The wait, success and error screens show the amount as this screen
|
|
||||||
// does, so they are handed a copy carrying that text. pendingTx keeps
|
|
||||||
// the exact amount, which is the one signed.
|
|
||||||
const shownTx = { ...pendingTx, amount: shownAmount(pendingTx) };
|
|
||||||
let tx;
|
let tx;
|
||||||
try {
|
try {
|
||||||
const signer = getSignerForAddress(wallet, addr, decryptedSecret);
|
const signer = getSignerForAddress(wallet, addr, decryptedSecret);
|
||||||
@@ -724,23 +632,19 @@ function init(_ctx) {
|
|||||||
// Note: JS strings are immutable; this nulls the reference but
|
// Note: JS strings are immutable; this nulls the reference but
|
||||||
// the original string may persist in memory until GC.
|
// the original string may persist in memory until GC.
|
||||||
decryptedSecret = null;
|
decryptedSecret = null;
|
||||||
txStatus.showWait(shownTx, tx.hash);
|
txStatus.showWait(pendingTx, tx.hash);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
decryptedSecret = null;
|
decryptedSecret = null;
|
||||||
// A gas limit or fee over its bound is refused before anything is
|
// A fee over the bound is refused before anything is broadcast, so
|
||||||
// broadcast, so there is no transaction that may have reached the
|
// there is no transaction that may have reached the network to warn
|
||||||
// network to warn about: the refusal stays on the confirmation
|
// about: the message stays on the confirmation screen where the
|
||||||
// screen where the user can go back, rather than routing to the
|
// user can go back, rather than routing to the sent/failed screen.
|
||||||
// sent/failed screen. Its sentence is fixed in index.html, so that
|
|
||||||
// its box can hold its space from the first paint; the reason in
|
|
||||||
// full, naming the bound, is logged.
|
|
||||||
if (e && e.approvalMismatch) {
|
if (e && e.approvalMismatch) {
|
||||||
log.errorf("send refused:", e.message);
|
showSendError(e.message);
|
||||||
setVisible("confirm-fee-bound-error", true);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const hash = tx ? tx.hash : null;
|
const hash = tx ? tx.hash : null;
|
||||||
txStatus.showError(shownTx, hash, e.shortMessage || e.message);
|
txStatus.showError(pendingTx, hash, e.shortMessage || e.message);
|
||||||
} finally {
|
} finally {
|
||||||
$("btn-confirm-send").disabled = false;
|
$("btn-confirm-send").disabled = false;
|
||||||
$("btn-confirm-send").classList.remove("text-muted");
|
$("btn-confirm-send").classList.remove("text-muted");
|
||||||
|
|||||||
+31
-85
@@ -1,7 +1,4 @@
|
|||||||
// Helpers the views in this directory share: showing a view and going back,
|
// Shared DOM helpers used by all views.
|
||||||
// error and flash lines and the warning banners, formatting of amounts, fees,
|
|
||||||
// balances, addresses and dates, the RPC and Blockscout URLs, node and tokens
|
|
||||||
// of the network a chain id names, explorer links, and click-to-copy.
|
|
||||||
//
|
//
|
||||||
// Escaping rule for every view in this directory, since they all build
|
// Escaping rule for every view in this directory, since they all build
|
||||||
// markup by concatenation: any VALUE interpolated into an innerHTML string
|
// markup by concatenation: any VALUE interpolated into an innerHTML string
|
||||||
@@ -22,11 +19,9 @@ const {
|
|||||||
isBelowOneMillionth,
|
isBelowOneMillionth,
|
||||||
} = require("../../shared/amountDisplay");
|
} = require("../../shared/amountDisplay");
|
||||||
const { resolveTokenSymbol } = require("../../shared/approvalAmount");
|
const { resolveTokenSymbol } = require("../../shared/approvalAmount");
|
||||||
const { getProvider } = require("../../shared/balances");
|
|
||||||
const { DEBUG } = require("../../shared/constants");
|
const { DEBUG } = require("../../shared/constants");
|
||||||
const { escapeHtml } = require("../../shared/html");
|
const { escapeHtml } = require("../../shared/html");
|
||||||
const { isDebug } = require("../../shared/log");
|
const { isDebug } = require("../../shared/log");
|
||||||
const { networkByChainId } = require("../../shared/networks");
|
|
||||||
const { formatUsd, getPrice } = require("../../shared/prices");
|
const { formatUsd, getPrice } = require("../../shared/prices");
|
||||||
const { state, saveState, currentNetwork } = require("../../shared/state");
|
const { state, saveState, currentNetwork } = require("../../shared/state");
|
||||||
const { displaySymbol } = require("../../shared/symbolDisplay");
|
const { displaySymbol } = require("../../shared/symbolDisplay");
|
||||||
@@ -132,8 +127,7 @@ function showView(name) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Create or update the debug/insecure warning banner.
|
// Create or update the debug/insecure warning banner.
|
||||||
// Called on every view switch, after the settings debug toggle changes, and
|
// Called on every view switch and after the settings debug toggle changes.
|
||||||
// after a network switch in Settings.
|
|
||||||
// The banner is shown when the compile-time DEBUG constant is true OR when
|
// The banner is shown when the compile-time DEBUG constant is true OR when
|
||||||
// the user has enabled runtime debug mode via the settings easter egg, OR
|
// the user has enabled runtime debug mode via the settings easter egg, OR
|
||||||
// when the active network is a testnet.
|
// when the active network is a testnet.
|
||||||
@@ -290,51 +284,34 @@ function unknownableAmount(balance) {
|
|||||||
|
|
||||||
// The active network's native token symbol, `ETH` on mainnet and `SepoliaETH`
|
// The active network's native token symbol, `ETH` on mainnet and `SepoliaETH`
|
||||||
// on Sepolia, as src/shared/networks.js names it. The wallet's balances and
|
// on Sepolia, as src/shared/networks.js names it. The wallet's balances and
|
||||||
// the Send screen, which sends on the active network, label a native amount
|
// the Send and confirmation screens, which send on the active network, label a
|
||||||
// with this; the confirmation screen, and a transaction already made or
|
// native amount with this; a transaction already made or requested is labelled
|
||||||
// requested, label it by the transaction's own chain id, through
|
// by its own chain id, through nativeCurrencyByChainId() in networks.js. The
|
||||||
// nativeCurrencyByChainId() in networks.js. The "ETH" that state.selectedToken
|
// "ETH" that state.selectedToken and txInfo.token hold is the native token's
|
||||||
// and txInfo.token hold is the native token's id, not its label, and stays
|
// id, not its label, and stays "ETH" on every network.
|
||||||
// "ETH" on every network.
|
|
||||||
function nativeCurrency() {
|
function nativeCurrency() {
|
||||||
return currentNetwork().nativeCurrency;
|
return currentNetwork().nativeCurrency;
|
||||||
}
|
}
|
||||||
|
|
||||||
// What the wallet knows of the tokens on the network with this chain id, or
|
// The symbol shown for a token line, resolved from the bundled list, the
|
||||||
// on the active network when no chain id is given, as the `sources` that
|
// tokens the user tracks, and the explorer's report — the same chain the
|
||||||
// resolveTokenSymbol() and resolveTokenDecimals() take. A contract address
|
// amount line's scale comes from. Null when no source names one, so the token
|
||||||
// names a token on one network only, and every token balance held is the
|
// lines keep saying `Unknown token` for a token nothing knows.
|
||||||
// active network's, so another network gets the tokens tracked on it
|
function tokenLabel(address) {
|
||||||
// (state.networkTrackedTokens, see applyChainSwitchFields()) and no balances.
|
return resolveTokenSymbol(address, {
|
||||||
function tokenSourcesByChainId(chainId) {
|
trackedTokens: state.trackedTokens,
|
||||||
const net = chainId ? networkByChainId(chainId) : currentNetwork();
|
wallets: state.wallets,
|
||||||
if (net && net.id === state.networkId) {
|
});
|
||||||
return { trackedTokens: state.trackedTokens, wallets: state.wallets };
|
|
||||||
}
|
|
||||||
return {
|
|
||||||
trackedTokens: (net && state.networkTrackedTokens[net.id]) || [],
|
|
||||||
wallets: [],
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// The symbol shown for a token line on the network with `chainId`, or on the
|
|
||||||
// active network when none is given: from the bundled list, the tokens the
|
|
||||||
// user tracks, and the explorer's report, the sources the amount line's scale
|
|
||||||
// comes from. Null when no source names one, so the token lines keep saying
|
|
||||||
// `Unknown token` for a token nothing knows.
|
|
||||||
function tokenLabel(address, chainId) {
|
|
||||||
return resolveTokenSymbol(address, tokenSourcesByChainId(chainId));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// A network fee in wei as the confirmation and approval screens both show it:
|
// A network fee in wei as the confirmation and approval screens both show it:
|
||||||
// the ETH figure through truncateAmountNeverZero() and labelled `symbol`, the
|
// the ETH figure through truncateAmountNeverZero() and labelled `symbol`, the
|
||||||
// native currency of the network the fee is paid on, then its USD value when
|
// native currency of the network the fee is paid on, then its USD value when
|
||||||
// the ETH price is known on the network with `chainId`, or on the active
|
// the ETH price is known. The USD value is of the exact fee, not of the
|
||||||
// network when no chain id is given. The USD value is of the exact fee, not of
|
// truncated figure.
|
||||||
// the truncated figure.
|
function formatFee(wei, symbol) {
|
||||||
function formatFee(wei, symbol, chainId) {
|
|
||||||
const eth = formatEther(wei);
|
const eth = formatEther(wei);
|
||||||
const ethPrice = getPrice("ETH", chainId);
|
const ethPrice = getPrice("ETH");
|
||||||
const usd = ethPrice ? formatUsd(parseFloat(eth) * ethPrice) : "";
|
const usd = ethPrice ? formatUsd(parseFloat(eth) * ethPrice) : "";
|
||||||
return (
|
return (
|
||||||
truncateAmountNeverZero(eth) +
|
truncateAmountNeverZero(eth) +
|
||||||
@@ -626,44 +603,18 @@ const EXT_ICON =
|
|||||||
`<path d="M7 1.5h3.5V5M7 5.5L10.5 1.5"/>` +
|
`<path d="M7 1.5h3.5V5M7 5.5L10.5 1.5"/>` +
|
||||||
`</svg></span>`;
|
`</svg></span>`;
|
||||||
|
|
||||||
// The RPC and Blockscout URLs Settings has for the network with this chain id,
|
|
||||||
// which need not be the active one: ConfirmTx, WaitTx and TransactionDetail
|
|
||||||
// use the network their transaction's chain id names, and the popup can reopen
|
|
||||||
// onto them after Settings switched the network. The active network's are
|
|
||||||
// state.rpcUrl and state.blockscoutUrl, any other's the ones remembered for it,
|
|
||||||
// or its defaults (see applyChainSwitchFields()).
|
|
||||||
function endpointsByChainId(chainId) {
|
|
||||||
const net = networkByChainId(chainId);
|
|
||||||
if (net.id === state.networkId) {
|
|
||||||
return { rpcUrl: state.rpcUrl, blockscoutUrl: state.blockscoutUrl };
|
|
||||||
}
|
|
||||||
const remembered = state.networkEndpoints[net.id] || {};
|
|
||||||
return {
|
|
||||||
rpcUrl: remembered.rpcUrl || net.defaultRpcUrl,
|
|
||||||
blockscoutUrl: remembered.blockscoutUrl || net.defaultBlockscoutUrl,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// The node of the network a transaction was reviewed for.
|
|
||||||
function reviewedNetworkProvider(txInfo) {
|
|
||||||
const net = networkByChainId(txInfo.chainId);
|
|
||||||
return getProvider(endpointsByChainId(txInfo.chainId).rpcUrl, net.id);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Block-explorer URLs. The origin is a per-network constant from
|
// Block-explorer URLs. The origin is a per-network constant from
|
||||||
// src/shared/networks.js, the explorer of the network with `chainId`, or of
|
// src/shared/networks.js; only the path segment is data, and it comes out
|
||||||
// the active network when no chain id is given; only the path segment is
|
// of explorer JSON (a transaction's from/to, a token's address_hash), which
|
||||||
// data, and it comes out of explorer JSON (a transaction's from/to, a token's
|
// nothing upstream validates as hex. percent-encoding it keeps a segment
|
||||||
// address_hash), which nothing upstream validates as hex. percent-encoding it
|
// that contains a slash, a query or a fragment from re-pointing the link
|
||||||
// keeps a segment that contains a slash, a query or a fragment from
|
// somewhere else in the explorer.
|
||||||
// re-pointing the link somewhere else in the explorer.
|
function explorerUrl(kind, value) {
|
||||||
function explorerUrl(kind, value, chainId) {
|
return `${currentNetwork().explorerUrl}/${kind}/${encodeURIComponent(value)}`;
|
||||||
const network = chainId ? networkByChainId(chainId) : currentNetwork();
|
|
||||||
return `${network.explorerUrl}/${kind}/${encodeURIComponent(value)}`;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function etherscanAddressUrl(address, chainId) {
|
function etherscanAddressUrl(address) {
|
||||||
return explorerUrl("address", address, chainId);
|
return explorerUrl("address", address);
|
||||||
}
|
}
|
||||||
|
|
||||||
// The URL still has to be escaped on the way into href="...": encoding
|
// The URL still has to be escaped on the way into href="...": encoding
|
||||||
@@ -729,18 +680,16 @@ function attachCopyHandlers(container) {
|
|||||||
// with them, and the "at least 32 characters" guarantee has
|
// with them, and the "at least 32 characters" guarantee has
|
||||||
// to survive having no current callers to be a guarantee.
|
// to survive having no current callers to be a guarantee.
|
||||||
// noLink — if true, omit etherscan link
|
// noLink — if true, omit etherscan link
|
||||||
// chainId — the network whose explorer the link opens; the active
|
|
||||||
// network's when absent
|
|
||||||
//
|
//
|
||||||
// After inserting the returned HTML into the DOM, call
|
// After inserting the returned HTML into the DOM, call
|
||||||
// attachCopyHandlers() on the parent to wire up click-to-copy.
|
// attachCopyHandlers() on the parent to wire up click-to-copy.
|
||||||
function renderAddressHtml(address, opts) {
|
function renderAddressHtml(address, opts) {
|
||||||
const { title, ensName, maxLen, noLink, chainId } = opts || {};
|
const { title, ensName, maxLen, noLink } = opts || {};
|
||||||
const dot = addressDotHtml(address);
|
const dot = addressDotHtml(address);
|
||||||
const displayAddr = maxLen
|
const displayAddr = maxLen
|
||||||
? truncateMiddle(address, Math.max(ADDRESS_MIN_DISPLAY_LEN, maxLen))
|
? truncateMiddle(address, Math.max(ADDRESS_MIN_DISPLAY_LEN, maxLen))
|
||||||
: address;
|
: address;
|
||||||
const link = etherscanAddressUrl(address, chainId);
|
const link = etherscanAddressUrl(address);
|
||||||
const extLink = noLink ? "" : etherscanLinkHtml(link);
|
const extLink = noLink ? "" : etherscanLinkHtml(link);
|
||||||
|
|
||||||
let html = "";
|
let html = "";
|
||||||
@@ -790,7 +739,6 @@ module.exports = {
|
|||||||
keyMaterialName,
|
keyMaterialName,
|
||||||
unknownableAmount,
|
unknownableAmount,
|
||||||
nativeCurrency,
|
nativeCurrency,
|
||||||
tokenSourcesByChainId,
|
|
||||||
tokenLabel,
|
tokenLabel,
|
||||||
formatFee,
|
formatFee,
|
||||||
addressDotHtml,
|
addressDotHtml,
|
||||||
@@ -806,8 +754,6 @@ module.exports = {
|
|||||||
attachCopyHandlers,
|
attachCopyHandlers,
|
||||||
etherscanLinkHtml,
|
etherscanLinkHtml,
|
||||||
explorerUrl,
|
explorerUrl,
|
||||||
endpointsByChainId,
|
|
||||||
reviewedNetworkProvider,
|
|
||||||
EXT_ICON,
|
EXT_ICON,
|
||||||
truncateMiddle,
|
truncateMiddle,
|
||||||
isoDate,
|
isoDate,
|
||||||
|
|||||||
+16
-9
@@ -164,9 +164,8 @@ function renderSendTokenSelect(addr) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// The token balance the Send screen states, and the scale it hands the
|
// The token balance and scale the Send screen states and hands the
|
||||||
// confirmation screen, which reads the balance itself from the network it is
|
// confirmation screen, so the two screens describe the holding the same way.
|
||||||
// drawn for.
|
|
||||||
//
|
//
|
||||||
// The scale is resolved the same way balances.js resolved the scale it
|
// The scale is resolved the same way balances.js resolved the scale it
|
||||||
// DISPLAYED this token's balance at: bundled list, then the user's tracked
|
// DISPLAYED this token's balance at: bundled list, then the user's tracked
|
||||||
@@ -189,11 +188,13 @@ function renderSendTokenSelect(addr) {
|
|||||||
//
|
//
|
||||||
// The two resolutions can therefore differ, and where they do, the stored
|
// The two resolutions can therefore differ, and where they do, the stored
|
||||||
// `balance` is a quantity computed at a scale this screen has just declined to
|
// `balance` is a quantity computed at a scale this screen has just declined to
|
||||||
// stand behind, so it is withdrawn: unknown scale means unknown balance. It is
|
// stand behind. Stating it would leave validateTransfer() checking the amount
|
||||||
// null rather than "0": this screen states it as unknown, as the confirmation
|
// against a number the wallet does not vouch for, so it is withdrawn: unknown
|
||||||
// screen does, and Max fills nothing in for it. Only a stored quantity is
|
// scale means unknown balance. It is null rather than "0": both screens state
|
||||||
// withdrawn: the "0" for a token that has no row at all is an absence of
|
// an unknown balance as unknown, and validateTransfer() treats it as no balance
|
||||||
// holdings, which is true at every scale.
|
// to spend from, which is the fail-closed side of an amount nobody can check.
|
||||||
|
// Only a stored quantity is withdrawn: the "0" for a token that has no row at
|
||||||
|
// all is an absence of holdings, which is true at every scale.
|
||||||
function tokenBalanceAndDecimals(addr, token) {
|
function tokenBalanceAndDecimals(addr, token) {
|
||||||
const tb = (addr.tokenBalances || []).find(
|
const tb = (addr.tokenBalances || []).find(
|
||||||
(t) => t.address.toLowerCase() === token.toLowerCase(),
|
(t) => t.address.toLowerCase() === token.toLowerCase(),
|
||||||
@@ -377,6 +378,7 @@ function init(_ctx) {
|
|||||||
const addr = currentAddress();
|
const addr = currentAddress();
|
||||||
|
|
||||||
let tokenSymbol = null;
|
let tokenSymbol = null;
|
||||||
|
let tokenBalance = null;
|
||||||
let tokenDecimals = null;
|
let tokenDecimals = null;
|
||||||
if (token !== "ETH") {
|
if (token !== "ETH") {
|
||||||
tokenSymbol = resolveSymbol(
|
tokenSymbol = resolveSymbol(
|
||||||
@@ -384,7 +386,10 @@ function init(_ctx) {
|
|||||||
addr.tokenBalances,
|
addr.tokenBalances,
|
||||||
state.trackedTokens,
|
state.trackedTokens,
|
||||||
);
|
);
|
||||||
({ tokenDecimals } = tokenBalanceAndDecimals(addr, token));
|
({ tokenBalance, tokenDecimals } = tokenBalanceAndDecimals(
|
||||||
|
addr,
|
||||||
|
token,
|
||||||
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
// The confirmation screen's own amount check, so it is never shown
|
// The confirmation screen's own amount check, so it is never shown
|
||||||
@@ -419,7 +424,9 @@ function init(_ctx) {
|
|||||||
ensName: ensName,
|
ensName: ensName,
|
||||||
amount: amount,
|
amount: amount,
|
||||||
token: token,
|
token: token,
|
||||||
|
balance: addr.balance,
|
||||||
tokenSymbol: tokenSymbol,
|
tokenSymbol: tokenSymbol,
|
||||||
|
tokenBalance: tokenBalance,
|
||||||
tokenDecimals: tokenDecimals,
|
tokenDecimals: tokenDecimals,
|
||||||
max: amountIsMax,
|
max: amountIsMax,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -16,8 +16,6 @@ const {
|
|||||||
} = require("../dustThreshold");
|
} = require("../dustThreshold");
|
||||||
const { state, saveState, currentNetwork } = require("../../shared/state");
|
const { state, saveState, currentNetwork } = require("../../shared/state");
|
||||||
const { onChainSwitch } = require("../../shared/chainSwitch");
|
const { onChainSwitch } = require("../../shared/chainSwitch");
|
||||||
const { restorableStack } = require("../../shared/persistedState");
|
|
||||||
const { resetRenderedViews, markViewRendered } = require("../viewRouter");
|
|
||||||
const {
|
const {
|
||||||
log,
|
log,
|
||||||
debugFetch,
|
debugFetch,
|
||||||
@@ -321,35 +319,12 @@ function init(ctx) {
|
|||||||
networkSelect.addEventListener("change", async () => {
|
networkSelect.addEventListener("change", async () => {
|
||||||
const newId = networkSelect.value;
|
const newId = networkSelect.value;
|
||||||
if (newId === state.networkId) return;
|
if (newId === state.networkId) return;
|
||||||
// The screens beneath Settings show the previous network, so Back
|
|
||||||
// finds them as it does in a reopened popup: each is rendered again
|
|
||||||
// when Back lands on it, and the stack is cut at the first one that
|
|
||||||
// cannot be rendered from saved state, such as Send or AddToken. It
|
|
||||||
// is cut at AddressToken too, unless that shows the native token: any
|
|
||||||
// other token there was picked on the previous network. Without a
|
|
||||||
// wallet the stack starts at Welcome, which that cut would drop, and
|
|
||||||
// Welcome shows nothing from a network. The cut comes before the
|
|
||||||
// switch so that the switch's save keeps it for a popup closed
|
|
||||||
// straight after.
|
|
||||||
if (state.hasWallet) {
|
|
||||||
const tokenView = state.viewStack.indexOf("address-token");
|
|
||||||
if (tokenView !== -1 && state.selectedToken !== "ETH") {
|
|
||||||
state.viewStack = state.viewStack.slice(0, tokenView);
|
|
||||||
}
|
|
||||||
state.viewStack = restorableStack(state.viewStack, "settings");
|
|
||||||
}
|
|
||||||
const net = await onChainSwitch(newId);
|
const net = await onChainSwitch(newId);
|
||||||
// Open pages are told by the background, as after a site's approved
|
// Open pages are told by the background, as after a site's approved
|
||||||
// switch request.
|
// switch request.
|
||||||
notify({ type: "AUTISTMASK_NETWORK_CHANGED", chainId: net.chainId });
|
notify({ type: "AUTISTMASK_NETWORK_CHANGED", chainId: net.chainId });
|
||||||
resetRenderedViews();
|
|
||||||
// Settings itself, and the testnet banner above it, are brought up
|
|
||||||
// to date for the new network here.
|
|
||||||
markViewRendered("settings");
|
|
||||||
$("settings-rpc").value = state.rpcUrl;
|
$("settings-rpc").value = state.rpcUrl;
|
||||||
$("settings-blockscout").value = state.blockscoutUrl;
|
$("settings-blockscout").value = state.blockscoutUrl;
|
||||||
renderTrackedTokens();
|
|
||||||
updateDebugBanner(state.currentView);
|
|
||||||
showFlash("Switched to " + net.name + ".");
|
showFlash("Switched to " + net.name + ".");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
const { $, showView, showFlash, escapeHtml, goBack } = require("./helpers");
|
const { $, showView, showFlash, escapeHtml, goBack } = require("./helpers");
|
||||||
const { getTopTokens } = require("../../shared/tokenList");
|
const { getTopTokens } = require("../../shared/tokenList");
|
||||||
const { state, saveState, currentNetwork } = require("../../shared/state");
|
const { state, saveState } = require("../../shared/state");
|
||||||
const { lookupTokenInfo } = require("../../shared/balances");
|
const { lookupTokenInfo } = require("../../shared/balances");
|
||||||
const { isScamAddress } = require("../../shared/scamlist");
|
const { isScamAddress } = require("../../shared/scamlist");
|
||||||
const { log } = require("../../shared/log");
|
const { log } = require("../../shared/log");
|
||||||
@@ -75,12 +75,6 @@ function show() {
|
|||||||
$("settings-addtoken-address").value = "";
|
$("settings-addtoken-address").value = "";
|
||||||
$("settings-addtoken-info").textContent = "";
|
$("settings-addtoken-info").textContent = "";
|
||||||
$("settings-addtoken-info").style.visibility = "hidden";
|
$("settings-addtoken-info").style.visibility = "hidden";
|
||||||
// The bundled list holds Ethereum Mainnet contracts, which name no token
|
|
||||||
// on any other network.
|
|
||||||
$("settings-addtoken-common").classList.toggle(
|
|
||||||
"hidden",
|
|
||||||
state.networkId !== "mainnet",
|
|
||||||
);
|
|
||||||
renderTop10();
|
renderTop10();
|
||||||
renderDropdown();
|
renderDropdown();
|
||||||
showView("settings-addtoken");
|
showView("settings-addtoken");
|
||||||
@@ -136,9 +130,6 @@ function init(_ctx) {
|
|||||||
infoEl.textContent = "Looking up token...";
|
infoEl.textContent = "Looking up token...";
|
||||||
infoEl.style.visibility = "visible";
|
infoEl.style.visibility = "visible";
|
||||||
log.debugf("Looking up token contract", addr);
|
log.debugf("Looking up token contract", addr);
|
||||||
// The network the lookup asks, which Settings may switch away from
|
|
||||||
// before it answers, as for a transaction in confirmTx.js.
|
|
||||||
const chainId = currentNetwork().chainId;
|
|
||||||
try {
|
try {
|
||||||
const info = await lookupTokenInfo(
|
const info = await lookupTokenInfo(
|
||||||
addr,
|
addr,
|
||||||
@@ -146,15 +137,6 @@ function init(_ctx) {
|
|||||||
state.networkId,
|
state.networkId,
|
||||||
ctx.pageClosed,
|
ctx.pageClosed,
|
||||||
);
|
);
|
||||||
// A contract address names a token on one network only, so an
|
|
||||||
// answer after a switch is not added to the new network's list.
|
|
||||||
if (currentNetwork().chainId !== chainId) {
|
|
||||||
showFlash(
|
|
||||||
"The active network changed before the lookup finished," +
|
|
||||||
" so the token was not added.",
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
log.infof("Adding token", info.symbol, addr);
|
log.infof("Adding token", info.symbol, addr);
|
||||||
state.trackedTokens.push({
|
state.trackedTokens.push({
|
||||||
address: addr,
|
address: addr,
|
||||||
|
|||||||
@@ -24,11 +24,7 @@
|
|||||||
// than written again locally so that tests/popupElementIds.test.js sees these
|
// than written again locally so that tests/popupElementIds.test.js sees these
|
||||||
// lookups and holds every id below against the markup.
|
// lookups and holds every id below against the markup.
|
||||||
const { $, VIEWS } = require("./helpers");
|
const { $, VIEWS } = require("./helpers");
|
||||||
const {
|
const { storageGet, storageRemove } = require("../../shared/browserApi");
|
||||||
storageGet,
|
|
||||||
storageRemove,
|
|
||||||
withLock,
|
|
||||||
} = require("../../shared/browserApi");
|
|
||||||
const { log } = require("../../shared/log");
|
const { log } = require("../../shared/log");
|
||||||
|
|
||||||
// Typed in full before anything is erased, in the same spirit as the wallet
|
// Typed in full before anything is erased, in the same spirit as the wallet
|
||||||
@@ -141,11 +137,7 @@ async function resetProfile() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
// Under the lock every write of the stored record takes, so the erase
|
await storageRemove("autistmask");
|
||||||
// cannot land between another write's read and its write and be undone.
|
|
||||||
// A page in a Firefox private window is the exception: Firefox gives
|
|
||||||
// it locks of its own (README, "Stored state and its version").
|
|
||||||
await withLock("autistmask", () => storageRemove("autistmask"));
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
log.errorf("state recovery: reset failed:", e);
|
log.errorf("state recovery: reset failed:", e);
|
||||||
setFlash("The saved data could not be erased. Nothing was changed.");
|
setFlash("The saved data could not be erased. Nothing was changed.");
|
||||||
|
|||||||
@@ -18,11 +18,10 @@ const {
|
|||||||
copyableHtml,
|
copyableHtml,
|
||||||
etherscanLinkHtml,
|
etherscanLinkHtml,
|
||||||
explorerUrl,
|
explorerUrl,
|
||||||
endpointsByChainId,
|
|
||||||
displaySymbol,
|
displaySymbol,
|
||||||
goBack,
|
goBack,
|
||||||
} = require("./helpers");
|
} = require("./helpers");
|
||||||
const { state } = require("../../shared/state");
|
const { state, currentNetwork } = require("../../shared/state");
|
||||||
const { nativeCurrencyByChainId } = require("../../shared/networks");
|
const { nativeCurrencyByChainId } = require("../../shared/networks");
|
||||||
const { formatEther, formatUnits } = require("ethers");
|
const { formatEther, formatUnits } = require("ethers");
|
||||||
const { log, debugFetch } = require("../../shared/log");
|
const { log, debugFetch } = require("../../shared/log");
|
||||||
@@ -49,16 +48,16 @@ function getTransactionType(tx) {
|
|||||||
return "Native " + nativeCurrencyByChainId(tx.chainId) + " Transfer";
|
return "Native " + nativeCurrencyByChainId(tx.chainId) + " Transfer";
|
||||||
}
|
}
|
||||||
|
|
||||||
function txAddressHtml(address, ensName, title, chainId) {
|
function txAddressHtml(address, ensName, title) {
|
||||||
const blockie = blockieHtml(address);
|
const blockie = blockieHtml(address);
|
||||||
return (
|
return (
|
||||||
`<div class="mb-1">${blockie}</div>` +
|
`<div class="mb-1">${blockie}</div>` +
|
||||||
renderAddressHtml(address, { title, ensName, chainId })
|
renderAddressHtml(address, { title, ensName })
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
function txHashHtml(hash, chainId) {
|
function txHashHtml(hash) {
|
||||||
const link = explorerUrl("tx", hash, chainId);
|
const link = explorerUrl("tx", hash);
|
||||||
const extLink = etherscanLinkHtml(link);
|
const extLink = etherscanLinkHtml(link);
|
||||||
return copyableHtml(hash, "break-all") + extLink;
|
return copyableHtml(hash, "break-all") + extLink;
|
||||||
}
|
}
|
||||||
@@ -84,11 +83,10 @@ function show(tx) {
|
|||||||
method: tx.method || null,
|
method: tx.method || null,
|
||||||
contractAddress: tx.contractAddress || null,
|
contractAddress: tx.contractAddress || null,
|
||||||
// The network the history entry was read from. The type line and
|
// The network the history entry was read from. The type line and
|
||||||
// the fee are in its native currency, not the active network's,
|
// the fee are in its native currency, not the active network's:
|
||||||
// the links open its explorer, and the block, network details and
|
// the active network can change, in Settings or when the user
|
||||||
// calldata are read from its Blockscout: the active network can
|
// approves a site's request, before a later popup shows this
|
||||||
// change, in Settings or when the user approves a site's request,
|
// screen again.
|
||||||
// before a later popup shows this screen again.
|
|
||||||
chainId: tx.chainId,
|
chainId: tx.chainId,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -98,24 +96,18 @@ function show(tx) {
|
|||||||
function render() {
|
function render() {
|
||||||
const tx = state.viewData.tx;
|
const tx = state.viewData.tx;
|
||||||
if (!tx) return;
|
if (!tx) return;
|
||||||
$("tx-detail-hash").innerHTML = txHashHtml(tx.hash, tx.chainId);
|
$("tx-detail-hash").innerHTML = txHashHtml(tx.hash);
|
||||||
|
|
||||||
const fromTitle = addressTitle(tx.from, state.wallets);
|
const fromTitle = addressTitle(tx.from, state.wallets);
|
||||||
$("tx-detail-from").innerHTML = txAddressHtml(
|
$("tx-detail-from").innerHTML = txAddressHtml(
|
||||||
tx.from,
|
tx.from,
|
||||||
tx.fromEns,
|
tx.fromEns,
|
||||||
fromTitle,
|
fromTitle,
|
||||||
tx.chainId,
|
|
||||||
);
|
);
|
||||||
// A contract creation has no recipient: transactions.js gives it `to: ""`.
|
// A contract creation has no recipient: transactions.js gives it `to: ""`.
|
||||||
if (tx.to) {
|
if (tx.to) {
|
||||||
const toTitle = addressTitle(tx.to, state.wallets);
|
const toTitle = addressTitle(tx.to, state.wallets);
|
||||||
$("tx-detail-to").innerHTML = txAddressHtml(
|
$("tx-detail-to").innerHTML = txAddressHtml(tx.to, tx.toEns, toTitle);
|
||||||
tx.to,
|
|
||||||
tx.toEns,
|
|
||||||
toTitle,
|
|
||||||
tx.chainId,
|
|
||||||
);
|
|
||||||
} else {
|
} else {
|
||||||
$("tx-detail-to").innerHTML = escapeHtml(CONTRACT_CREATION_TEXT);
|
$("tx-detail-to").innerHTML = escapeHtml(CONTRACT_CREATION_TEXT);
|
||||||
}
|
}
|
||||||
@@ -154,7 +146,7 @@ function render() {
|
|||||||
if (tokenContractSection && tokenContractEl) {
|
if (tokenContractSection && tokenContractEl) {
|
||||||
if (tx.contractAddress) {
|
if (tx.contractAddress) {
|
||||||
const dot = addressDotHtml(tx.contractAddress);
|
const dot = addressDotHtml(tx.contractAddress);
|
||||||
const link = explorerUrl("token", tx.contractAddress, tx.chainId);
|
const link = explorerUrl("token", tx.contractAddress);
|
||||||
// Hand-rolled rather than renderAddressHtml() because the
|
// Hand-rolled rather than renderAddressHtml() because the
|
||||||
// link goes to the explorer's /token/ page, not /address/.
|
// link goes to the explorer's /token/ page, not /address/.
|
||||||
// Same two-row shape though: dot and link on the strip, the
|
// Same two-row shape though: dot and link on the strip, the
|
||||||
@@ -212,11 +204,7 @@ function showDetailField(sectionId, contentId, value) {
|
|||||||
function populateOnChainDetails(txData, chainId) {
|
function populateOnChainDetails(txData, chainId) {
|
||||||
// Block number
|
// Block number
|
||||||
if (txData.block_number != null) {
|
if (txData.block_number != null) {
|
||||||
const blockLink = explorerUrl(
|
const blockLink = explorerUrl("block", String(txData.block_number));
|
||||||
"block",
|
|
||||||
String(txData.block_number),
|
|
||||||
chainId,
|
|
||||||
);
|
|
||||||
const blockSection = $("tx-detail-block-section");
|
const blockSection = $("tx-detail-block-section");
|
||||||
const blockEl = $("tx-detail-block");
|
const blockEl = $("tx-detail-block");
|
||||||
if (blockSection && blockEl) {
|
if (blockSection && blockEl) {
|
||||||
@@ -313,9 +301,8 @@ async function loadFullTxDetails(txHash, chainId) {
|
|||||||
if (!section || !actionEl || !detailsEl) return;
|
if (!section || !actionEl || !detailsEl) return;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const { blockscoutUrl } = endpointsByChainId(chainId);
|
|
||||||
const resp = await debugFetch(
|
const resp = await debugFetch(
|
||||||
blockscoutUrl + "/transactions/" + txHash,
|
state.blockscoutUrl + "/transactions/" + txHash,
|
||||||
);
|
);
|
||||||
if (!resp.ok) return;
|
if (!resp.ok) return;
|
||||||
const txData = await resp.json();
|
const txData = await resp.json();
|
||||||
@@ -329,13 +316,11 @@ async function loadFullTxDetails(txHash, chainId) {
|
|||||||
// Decoded against the address the transaction was sent to, as the
|
// Decoded against the address the transaction was sent to, as the
|
||||||
// explorer reports it, not the history entry's `to`: for a token
|
// explorer reports it, not the history entry's `to`: for a token
|
||||||
// transfer that is the transfer's recipient, not the token contract.
|
// transfer that is the transfer's recipient, not the token contract.
|
||||||
// On the network the transaction was sent on, whose Blockscout was
|
// On the active network, the one whose explorer was just asked.
|
||||||
// just asked, and from the sender it reports.
|
|
||||||
const decoded = decodeCalldata(
|
const decoded = decodeCalldata(
|
||||||
inputData,
|
inputData,
|
||||||
txData.to?.hash || "",
|
txData.to?.hash || "",
|
||||||
chainId,
|
currentNetwork().chainId,
|
||||||
txData.from?.hash || "",
|
|
||||||
);
|
);
|
||||||
if (decoded) {
|
if (decoded) {
|
||||||
// Render decoded calldata matching approval view style
|
// Render decoded calldata matching approval view style
|
||||||
@@ -353,9 +338,9 @@ async function loadFullTxDetails(txHash, chainId) {
|
|||||||
if (tokenSymbol) {
|
if (tokenSymbol) {
|
||||||
detailsHtml += `<div class="font-bold">${escapeHtml(displaySymbol(tokenSymbol))}</div>`;
|
detailsHtml += `<div class="font-bold">${escapeHtml(displaySymbol(tokenSymbol))}</div>`;
|
||||||
}
|
}
|
||||||
detailsHtml += renderAddressHtml(d.address, { chainId });
|
detailsHtml += renderAddressHtml(d.address);
|
||||||
} else if (d.address) {
|
} else if (d.address) {
|
||||||
detailsHtml += renderAddressHtml(d.address, { chainId });
|
detailsHtml += renderAddressHtml(d.address);
|
||||||
} else {
|
} else {
|
||||||
detailsHtml += `<div class="font-bold">${escapeHtml(d.value)}</div>`;
|
detailsHtml += `<div class="font-bold">${escapeHtml(d.value)}</div>`;
|
||||||
}
|
}
|
||||||
|
|||||||
+29
-39
@@ -14,13 +14,10 @@ const {
|
|||||||
displaySymbol,
|
displaySymbol,
|
||||||
clearViewStack,
|
clearViewStack,
|
||||||
tokenLabel,
|
tokenLabel,
|
||||||
reviewedNetworkProvider,
|
|
||||||
} = require("./helpers");
|
} = require("./helpers");
|
||||||
const { state } = require("../../shared/state");
|
const { state } = require("../../shared/state");
|
||||||
const {
|
const { nativeCurrencyByChainId } = require("../../shared/networks");
|
||||||
SUPPORTED_CHAIN_IDS,
|
const { getProvider } = require("../../shared/balances");
|
||||||
nativeCurrencyByChainId,
|
|
||||||
} = require("../../shared/networks");
|
|
||||||
const { log } = require("../../shared/log");
|
const { log } = require("../../shared/log");
|
||||||
|
|
||||||
// Receipt poll cadence and the deadline after which the wait is reported as
|
// Receipt poll cadence and the deadline after which the wait is reported as
|
||||||
@@ -64,22 +61,21 @@ function endWait() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// A contract creation reaches these screens with `to` as "" (approval.js
|
// A contract creation reaches these screens with `to` as "" (approval.js
|
||||||
// writes `to: toAddr || ""`). The links below open the explorer of the network
|
// writes `to: toAddr || ""`).
|
||||||
// with `chainId`, or of the active network when none is given.
|
function toAddressHtml(address) {
|
||||||
function toAddressHtml(address, chainId) {
|
|
||||||
if (!address) return escapeHtml(CONTRACT_CREATION_TEXT);
|
if (!address) return escapeHtml(CONTRACT_CREATION_TEXT);
|
||||||
const title = addressTitle(address, state.wallets);
|
const title = addressTitle(address, state.wallets);
|
||||||
return renderAddressHtml(address, { title, chainId });
|
return renderAddressHtml(address, { title });
|
||||||
}
|
}
|
||||||
|
|
||||||
function txHashHtml(hash, chainId) {
|
function txHashHtml(hash) {
|
||||||
const link = explorerUrl("tx", hash, chainId);
|
const link = explorerUrl("tx", hash);
|
||||||
return copyableHtml(hash, "break-all") + etherscanLinkHtml(link);
|
return copyableHtml(hash, "break-all") + etherscanLinkHtml(link);
|
||||||
}
|
}
|
||||||
|
|
||||||
function blockNumberHtml(blockNumber, chainId) {
|
function blockNumberHtml(blockNumber) {
|
||||||
const num = String(blockNumber);
|
const num = String(blockNumber);
|
||||||
const link = explorerUrl("block", num, chainId);
|
const link = explorerUrl("block", num);
|
||||||
return copyableHtml(num) + etherscanLinkHtml(link);
|
return copyableHtml(num) + etherscanLinkHtml(link);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -95,11 +91,9 @@ function startWait(txInfo, txHash, broadcastTime, pollNow) {
|
|||||||
// native currency of txInfo.chainId, the network the transaction was sent
|
// native currency of txInfo.chainId, the network the transaction was sent
|
||||||
// on, not the active network's: the active network can change, in
|
// on, not the active network's: the active network can change, in
|
||||||
// Settings or when the user approves a site's request, while this screen
|
// Settings or when the user approves a site's request, while this screen
|
||||||
// is open or before a later popup resumes it. The links on all three
|
// is open or before a later popup resumes it. A null token is a swap whose
|
||||||
// screens open that network's explorer, and this screen's receipt is
|
// amount was not decoded (see showTxApproval() in approval.js): the amount
|
||||||
// asked of that network's node, for the same reason. A null token is a
|
// says so, and no symbol follows it.
|
||||||
// swap whose amount was not decoded (see showTxApproval() in
|
|
||||||
// approval.js): the amount says so, and no symbol follows it.
|
|
||||||
let symbol = "";
|
let symbol = "";
|
||||||
if (txInfo.token === "ETH") {
|
if (txInfo.token === "ETH") {
|
||||||
symbol = nativeCurrencyByChainId(txInfo.chainId);
|
symbol = nativeCurrencyByChainId(txInfo.chainId);
|
||||||
@@ -108,8 +102,8 @@ function startWait(txInfo, txHash, broadcastTime, pollNow) {
|
|||||||
}
|
}
|
||||||
$("wait-tx-summary").textContent =
|
$("wait-tx-summary").textContent =
|
||||||
txInfo.amount + (symbol ? " " + symbol : "");
|
txInfo.amount + (symbol ? " " + symbol : "");
|
||||||
$("wait-tx-to").innerHTML = toAddressHtml(txInfo.to, txInfo.chainId);
|
$("wait-tx-to").innerHTML = toAddressHtml(txInfo.to);
|
||||||
$("wait-tx-hash").innerHTML = txHashHtml(txHash, txInfo.chainId);
|
$("wait-tx-hash").innerHTML = txHashHtml(txHash);
|
||||||
attachCopyHandlers("view-wait-tx");
|
attachCopyHandlers("view-wait-tx");
|
||||||
|
|
||||||
// Persisted so closing and reopening the popup resumes this wait
|
// Persisted so closing and reopening the popup resumes this wait
|
||||||
@@ -134,7 +128,7 @@ function startWait(txInfo, txHash, broadcastTime, pollNow) {
|
|||||||
renderElapsed();
|
renderElapsed();
|
||||||
}, 1000);
|
}, 1000);
|
||||||
|
|
||||||
const provider = reviewedNetworkProvider(txInfo);
|
const provider = getProvider(state.rpcUrl, state.networkId);
|
||||||
let consecutiveFailures = 0;
|
let consecutiveFailures = 0;
|
||||||
|
|
||||||
async function poll() {
|
async function poll() {
|
||||||
@@ -213,11 +207,10 @@ function showWait(txInfo, txHash) {
|
|||||||
// an object merely missing one of them throws a TypeError out of
|
// an object merely missing one of them throws a TypeError out of
|
||||||
// restoreView() — which init() does not guard, skipping the rest of popup
|
// restoreView() — which init() does not guard, skipping the rest of popup
|
||||||
// init and leaving wait-tx on screen with no back control. A non-numeric
|
// init and leaving wait-tx on screen with no back control. A non-numeric
|
||||||
// broadcastTime leaves an unexitable wait counting "NaNs". txInfo.chainId picks
|
// broadcastTime leaves an unexitable wait counting "NaNs". txInfo.token,
|
||||||
// the node the receipt is asked of and the explorer the links open, so it has
|
// txInfo.tokenSymbol and txInfo.chainId are deliberately unchecked: they are
|
||||||
// to name a network. txInfo.token and txInfo.tokenSymbol are deliberately
|
// compared and coalesced rather than dereferenced, and tokenSymbol is null for
|
||||||
// unchecked: they are compared and coalesced rather than dereferenced, and
|
// ETH.
|
||||||
// tokenSymbol is null for ETH.
|
|
||||||
function restoreWait() {
|
function restoreWait() {
|
||||||
const d = state.viewData;
|
const d = state.viewData;
|
||||||
if (!d || !d.pendingWait) return false;
|
if (!d || !d.pendingWait) return false;
|
||||||
@@ -233,7 +226,6 @@ function restoreWait() {
|
|||||||
// path itself created.
|
// path itself created.
|
||||||
if (typeof info.to !== "string") return false;
|
if (typeof info.to !== "string") return false;
|
||||||
if (typeof info.amount !== "string") return false;
|
if (typeof info.amount !== "string") return false;
|
||||||
if (!SUPPORTED_CHAIN_IDS.has(info.chainId)) return false;
|
|
||||||
if (typeof w.broadcastTime !== "number" || !isFinite(w.broadcastTime)) {
|
if (typeof w.broadcastTime !== "number" || !isFinite(w.broadcastTime)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -258,13 +250,12 @@ function showSuccess(txInfo, txHash, blockNumber) {
|
|||||||
hash: txHash,
|
hash: txHash,
|
||||||
blockNumber: blockNumber,
|
blockNumber: blockNumber,
|
||||||
decoded: txInfo.decoded || null,
|
decoded: txInfo.decoded || null,
|
||||||
chainId: txInfo.chainId,
|
|
||||||
};
|
};
|
||||||
renderSuccess();
|
renderSuccess();
|
||||||
ctx.doRefreshAndRender();
|
ctx.doRefreshAndRender();
|
||||||
}
|
}
|
||||||
|
|
||||||
function decodedDetailsHtml(decoded, chainId) {
|
function decodedDetailsHtml(decoded) {
|
||||||
if (!decoded || !decoded.details) return "";
|
if (!decoded || !decoded.details) return "";
|
||||||
let html = `<div class="border border-border border-dashed p-2 mb-3">`;
|
let html = `<div class="border border-border border-dashed p-2 mb-3">`;
|
||||||
if (decoded.name) {
|
if (decoded.name) {
|
||||||
@@ -280,11 +271,11 @@ function decodedDetailsHtml(decoded, chainId) {
|
|||||||
html += `<div class="text-xs text-muted mb-1">${escapeHtml(d.label)}</div>`;
|
html += `<div class="text-xs text-muted mb-1">${escapeHtml(d.label)}</div>`;
|
||||||
if (d.address) {
|
if (d.address) {
|
||||||
if (d.isToken) {
|
if (d.isToken) {
|
||||||
const sym = tokenLabel(d.address, chainId) || "Unknown token";
|
const sym = tokenLabel(d.address) || "Unknown token";
|
||||||
html += `<div class="font-bold">${escapeHtml(sym)}</div>`;
|
html += `<div class="font-bold">${escapeHtml(sym)}</div>`;
|
||||||
html += toAddressHtml(d.address, chainId);
|
html += toAddressHtml(d.address);
|
||||||
} else {
|
} else {
|
||||||
html += toAddressHtml(d.address, chainId);
|
html += toAddressHtml(d.address);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
html += `<div class="font-bold">${escapeHtml(d.value)}</div>`;
|
html += `<div class="font-bold">${escapeHtml(d.value)}</div>`;
|
||||||
@@ -313,16 +304,16 @@ function renderSuccess() {
|
|||||||
toSection.classList.remove("hidden");
|
toSection.classList.remove("hidden");
|
||||||
$("success-tx-summary").textContent =
|
$("success-tx-summary").textContent =
|
||||||
d.amount + (d.symbol ? " " + d.symbol : "");
|
d.amount + (d.symbol ? " " + d.symbol : "");
|
||||||
$("success-tx-to").innerHTML = toAddressHtml(d.to, d.chainId);
|
$("success-tx-to").innerHTML = toAddressHtml(d.to);
|
||||||
}
|
}
|
||||||
|
|
||||||
$("success-tx-block").innerHTML = blockNumberHtml(d.blockNumber, d.chainId);
|
$("success-tx-block").innerHTML = blockNumberHtml(d.blockNumber);
|
||||||
$("success-tx-hash").innerHTML = txHashHtml(d.hash, d.chainId);
|
$("success-tx-hash").innerHTML = txHashHtml(d.hash);
|
||||||
|
|
||||||
// Show decoded calldata details if present
|
// Show decoded calldata details if present
|
||||||
const decodedEl = $("success-tx-decoded");
|
const decodedEl = $("success-tx-decoded");
|
||||||
if (decodedEl && hasDecoded) {
|
if (decodedEl && hasDecoded) {
|
||||||
decodedEl.innerHTML = decodedDetailsHtml(d.decoded, d.chainId);
|
decodedEl.innerHTML = decodedDetailsHtml(d.decoded);
|
||||||
decodedEl.classList.remove("hidden");
|
decodedEl.classList.remove("hidden");
|
||||||
} else if (decodedEl) {
|
} else if (decodedEl) {
|
||||||
decodedEl.classList.add("hidden");
|
decodedEl.classList.add("hidden");
|
||||||
@@ -348,7 +339,6 @@ function showError(txInfo, txHash, message) {
|
|||||||
to: txInfo.to,
|
to: txInfo.to,
|
||||||
hash: txHash || null,
|
hash: txHash || null,
|
||||||
message: message,
|
message: message,
|
||||||
chainId: txInfo.chainId,
|
|
||||||
};
|
};
|
||||||
renderError();
|
renderError();
|
||||||
}
|
}
|
||||||
@@ -358,11 +348,11 @@ function renderError() {
|
|||||||
if (!d || !d.message) return;
|
if (!d || !d.message) return;
|
||||||
$("error-tx-summary").textContent =
|
$("error-tx-summary").textContent =
|
||||||
d.amount + (d.symbol ? " " + d.symbol : "");
|
d.amount + (d.symbol ? " " + d.symbol : "");
|
||||||
$("error-tx-to").innerHTML = toAddressHtml(d.to, d.chainId);
|
$("error-tx-to").innerHTML = toAddressHtml(d.to);
|
||||||
$("error-tx-message").textContent = d.message;
|
$("error-tx-message").textContent = d.message;
|
||||||
|
|
||||||
if (d.hash) {
|
if (d.hash) {
|
||||||
$("error-tx-hash").innerHTML = txHashHtml(d.hash, d.chainId);
|
$("error-tx-hash").innerHTML = txHashHtml(d.hash);
|
||||||
$("error-tx-hash-section").classList.remove("hidden");
|
$("error-tx-hash-section").classList.remove("hidden");
|
||||||
attachCopyHandlers("view-error-tx");
|
attachCopyHandlers("view-error-tx");
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -58,8 +58,6 @@ function getLocalWarnings(address, options = {}) {
|
|||||||
* @param {object} provider - An ethers.js provider instance.
|
* @param {object} provider - An ethers.js provider instance.
|
||||||
* @param {object} [options] - Optional context.
|
* @param {object} [options] - Optional context.
|
||||||
* @param {string} [options.fromAddress] - Sender address (for self-send check).
|
* @param {string} [options.fromAddress] - Sender address (for self-send check).
|
||||||
* @param {string} [options.chainId] - Chain id of the network whose explorer
|
|
||||||
* the Etherscan label check asks; the active network's when omitted.
|
|
||||||
* @returns {Promise<Array<{type: string, message: string, severity: string}>>}
|
* @returns {Promise<Array<{type: string, message: string, severity: string}>>}
|
||||||
*/
|
*/
|
||||||
async function getFullWarnings(address, provider, options = {}) {
|
async function getFullWarnings(address, provider, options = {}) {
|
||||||
@@ -112,10 +110,7 @@ async function getFullWarnings(address, provider, options = {}) {
|
|||||||
// Runs for ALL addresses including contracts, since many dangerous
|
// Runs for ALL addresses including contracts, since many dangerous
|
||||||
// flagged addresses on Etherscan (drainers, phishing contracts) are contracts.
|
// flagged addresses on Etherscan (drainers, phishing contracts) are contracts.
|
||||||
try {
|
try {
|
||||||
const etherscanWarning = await checkEtherscanLabel(
|
const etherscanWarning = await checkEtherscanLabel(address);
|
||||||
address,
|
|
||||||
options.chainId,
|
|
||||||
);
|
|
||||||
if (etherscanWarning) {
|
if (etherscanWarning) {
|
||||||
warnings.push(etherscanWarning);
|
warnings.push(etherscanWarning);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,11 +31,6 @@
|
|||||||
// Everything is resolved on use rather than captured at module load. The MV3
|
// Everything is resolved on use rather than captured at module load. The MV3
|
||||||
// service worker is torn down and re-evaluated repeatedly, and the unit
|
// service worker is torn down and re-evaluated repeatedly, and the unit
|
||||||
// suite installs its stubs on `global.chrome` around a require().
|
// suite installs its stubs on `global.chrome` around a require().
|
||||||
//
|
|
||||||
// The module also holds withLock(), a wrapper around the browser's
|
|
||||||
// `navigator.locks`, which is in neither namespace. It sits beside
|
|
||||||
// storageGet() and storageSet() because every write of the stored record
|
|
||||||
// takes it.
|
|
||||||
|
|
||||||
// The extension API namespace, preferring `browser.*` where it exists.
|
// The extension API namespace, preferring `browser.*` where it exists.
|
||||||
//
|
//
|
||||||
@@ -224,33 +219,6 @@ function storageRemove(keys) {
|
|||||||
return Promise.resolve(storage.remove(keys));
|
return Promise.resolve(storage.remove(keys));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Run `fn` while holding the browser's lock called `name`
|
|
||||||
* (`navigator.locks`), and settle as `fn` settles. Every page of the extension
|
|
||||||
* and its background share these locks, except a page in a Firefox private
|
|
||||||
* window (README, "Stored state and its version"), so while one of them holds
|
|
||||||
* `name` another asking for it waits, in the order they asked. The lock is let
|
|
||||||
* go when `fn` settles, whether it resolved or rejected.
|
|
||||||
*
|
|
||||||
* Every write of the stored record holds the lock named after its key,
|
|
||||||
* "autistmask", from its read to its write: saveState() in
|
|
||||||
* src/shared/state.js, updateState() in src/background/state.js, and the
|
|
||||||
* reset in src/popup/views/stateRecovery.js.
|
|
||||||
*
|
|
||||||
* @param {string} name
|
|
||||||
* @param {function(): Promise<*>} fn
|
|
||||||
* @returns {Promise<*>} what `fn` resolved with.
|
|
||||||
* @throws rejects, without running `fn`, where `navigator.locks` is absent.
|
|
||||||
*/
|
|
||||||
function withLock(name, fn) {
|
|
||||||
if (typeof navigator === "undefined" || !navigator.locks) {
|
|
||||||
return Promise.reject(
|
|
||||||
new Error("navigator.locks is not available in this context"),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return navigator.locks.request(name, () => fn());
|
|
||||||
}
|
|
||||||
|
|
||||||
// `storage.session`, the browser's session storage: what is kept there lasts
|
// `storage.session`, the browser's session storage: what is kept there lasts
|
||||||
// until the browser closes. It survives the background worker being stopped
|
// until the browser closes. It survives the background worker being stopped
|
||||||
// and started again, which module-level variables do not (README, Background
|
// and started again, which module-level variables do not (README, Background
|
||||||
@@ -405,5 +373,4 @@ module.exports = {
|
|||||||
windowsGetLastFocused,
|
windowsGetLastFocused,
|
||||||
windowsRemove,
|
windowsRemove,
|
||||||
windowsUpdate,
|
windowsUpdate,
|
||||||
withLock,
|
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -38,16 +38,6 @@ function applyChainSwitchFields(s, newNetworkId) {
|
|||||||
blockscoutUrl: s.blockscoutUrl,
|
blockscoutUrl: s.blockscoutUrl,
|
||||||
};
|
};
|
||||||
const remembered = s.networkEndpoints[net.id] || {};
|
const remembered = s.networkEndpoints[net.id] || {};
|
||||||
|
|
||||||
// Tracked tokens are kept per network the same way, because a contract
|
|
||||||
// address names a token on one network only. s.trackedTokens stays the
|
|
||||||
// active network's list, so nothing that reads it changes: the outgoing
|
|
||||||
// list is put away under its network, and the incoming network's list, or
|
|
||||||
// an empty one, takes its place.
|
|
||||||
if (!s.networkTrackedTokens) s.networkTrackedTokens = {};
|
|
||||||
s.networkTrackedTokens[s.networkId] = s.trackedTokens;
|
|
||||||
s.trackedTokens = s.networkTrackedTokens[net.id] || [];
|
|
||||||
|
|
||||||
s.networkId = net.id;
|
s.networkId = net.id;
|
||||||
s.rpcUrl = remembered.rpcUrl || net.defaultRpcUrl;
|
s.rpcUrl = remembered.rpcUrl || net.defaultRpcUrl;
|
||||||
s.blockscoutUrl = remembered.blockscoutUrl || net.defaultBlockscoutUrl;
|
s.blockscoutUrl = remembered.blockscoutUrl || net.defaultBlockscoutUrl;
|
||||||
|
|||||||
@@ -2,8 +2,6 @@
|
|||||||
// Extension users make the requests directly to Etherscan — no proxy needed.
|
// Extension users make the requests directly to Etherscan — no proxy needed.
|
||||||
// This is a best-effort enrichment: network failures return null silently.
|
// This is a best-effort enrichment: network failures return null silently.
|
||||||
|
|
||||||
const { networkByChainId } = require("./networks");
|
|
||||||
|
|
||||||
// Patterns in the page title that indicate a flagged address.
|
// Patterns in the page title that indicate a flagged address.
|
||||||
// Title format: "Fake_Phishing184810 | Address: 0x... | Etherscan"
|
// Title format: "Fake_Phishing184810 | Address: 0x... | Etherscan"
|
||||||
const PHISHING_LABEL_PATTERNS = [/^Fake_Phishing/i, /^Phish:/i, /^Exploiter/i];
|
const PHISHING_LABEL_PATTERNS = [/^Fake_Phishing/i, /^Phish:/i, /^Exploiter/i];
|
||||||
@@ -74,21 +72,18 @@ function parseEtherscanPage(html) {
|
|||||||
* Returns a warning object if the address is flagged, or null.
|
* Returns a warning object if the address is flagged, or null.
|
||||||
* Network failures return null silently (best-effort check).
|
* Network failures return null silently (best-effort check).
|
||||||
*
|
*
|
||||||
* Uses the explorer of the network with `chainId`, or of the active network
|
* Uses the current network's explorer URL so the lookup works on both
|
||||||
* when it is omitted: etherscan.io on mainnet, sepolia.etherscan.io on
|
* mainnet (etherscan.io) and Sepolia (sepolia.etherscan.io).
|
||||||
* Sepolia.
|
|
||||||
*
|
*
|
||||||
* @param {string} address - Ethereum address to check.
|
* @param {string} address - Ethereum address to check.
|
||||||
* @param {string} [chainId] - Chain id of the network to look it up on.
|
|
||||||
* @returns {Promise<{type: string, message: string, severity: string}|null>}
|
* @returns {Promise<{type: string, message: string, severity: string}|null>}
|
||||||
*/
|
*/
|
||||||
async function checkEtherscanLabel(address, chainId) {
|
async function checkEtherscanLabel(address) {
|
||||||
try {
|
try {
|
||||||
// Lazy require to avoid pulling in chrome.storage at module scope
|
// Lazy require to avoid pulling in chrome.storage at module scope
|
||||||
// (which breaks unit tests that only exercise parseEtherscanPage).
|
// (which breaks unit tests that only exercise parseEtherscanPage).
|
||||||
const { currentNetwork } = require("./state");
|
const { currentNetwork } = require("./state");
|
||||||
const network = chainId ? networkByChainId(chainId) : currentNetwork();
|
const etherscanBase = currentNetwork().explorerUrl + "/address/";
|
||||||
const etherscanBase = network.explorerUrl + "/address/";
|
|
||||||
const resp = await fetch(etherscanBase + address, {
|
const resp = await fetch(etherscanBase + address, {
|
||||||
headers: { Accept: "text/html" },
|
headers: { Accept: "text/html" },
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -23,11 +23,6 @@ const DEFAULT_STATE = {
|
|||||||
hasWallet: false,
|
hasWallet: false,
|
||||||
wallets: [],
|
wallets: [],
|
||||||
trackedTokens: [],
|
trackedTokens: [],
|
||||||
// Tracked tokens remembered per network: { [networkId]: [token, ...] }.
|
|
||||||
// trackedTokens above is the active network's list; this is what the
|
|
||||||
// others are restored from when the active network changes. See
|
|
||||||
// applyChainSwitchFields().
|
|
||||||
networkTrackedTokens: {},
|
|
||||||
networkId: "mainnet",
|
networkId: "mainnet",
|
||||||
rpcUrl: DEFAULT_RPC_URL,
|
rpcUrl: DEFAULT_RPC_URL,
|
||||||
blockscoutUrl: DEFAULT_BLOCKSCOUT_URL,
|
blockscoutUrl: DEFAULT_BLOCKSCOUT_URL,
|
||||||
@@ -294,20 +289,6 @@ function normalizePersisted(saved) {
|
|||||||
// profile whose wallets are perfectly fine. An empty list is a legitimate
|
// profile whose wallets are perfectly fine. An empty list is a legitimate
|
||||||
// value and survives.
|
// value and survives.
|
||||||
out.trackedTokens = structuredClone(tokenRefs(saved.trackedTokens));
|
out.trackedTokens = structuredClone(tokenRefs(saved.trackedTokens));
|
||||||
// Each remembered list is floored like trackedTokens, because
|
|
||||||
// applyChainSwitchFields() puts it straight back onto trackedTokens when
|
|
||||||
// its network becomes the active one. A key that is not a network in
|
|
||||||
// networks.js is dropped, which also keeps an own "__proto__" key from
|
|
||||||
// reaching the plain assignment below.
|
|
||||||
out.networkTrackedTokens = {};
|
|
||||||
if (isRecord(saved.networkTrackedTokens)) {
|
|
||||||
for (const netId of Object.keys(saved.networkTrackedTokens)) {
|
|
||||||
if (!isKnownNetworkId(netId)) continue;
|
|
||||||
out.networkTrackedTokens[netId] = structuredClone(
|
|
||||||
tokenRefs(saved.networkTrackedTokens[netId]),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// The loud refusal for an unknown id is assertStateUsable(); this is the
|
// The loud refusal for an unknown id is assertStateUsable(); this is the
|
||||||
// floor under it. networkId is an object KEY into networkEndpoints below,
|
// floor under it. networkId is an object KEY into networkEndpoints below,
|
||||||
// so a value that is not a network in networks.js must never get that far
|
// so a value that is not a network in networks.js must never get that far
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
const { getTopTokenPrices } = require("./tokenList");
|
const { getTopTokenPrices } = require("./tokenList");
|
||||||
const { isBelowOneMillionth } = require("./amountDisplay");
|
const { isBelowOneMillionth } = require("./amountDisplay");
|
||||||
const { networkByChainId } = require("./networks");
|
|
||||||
|
|
||||||
const PRICE_CACHE_TTL = 300000; // 5 minutes
|
const PRICE_CACHE_TTL = 300000; // 5 minutes
|
||||||
|
|
||||||
@@ -37,13 +36,10 @@ function clearPrices() {
|
|||||||
lastFetchedAt = 0;
|
lastFetchedAt = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Return the USD price for a symbol on the network with `chainId`, or on the
|
// Return the USD price for a symbol, or null on testnet / unknown.
|
||||||
// active network when no chain id is given; null on testnet, on a chain id
|
function getPrice(symbol) {
|
||||||
// that names no network, or for a symbol with no price.
|
|
||||||
function getPrice(symbol, chainId) {
|
|
||||||
const { currentNetwork } = require("./state");
|
const { currentNetwork } = require("./state");
|
||||||
const network = chainId ? networkByChainId(chainId) : currentNetwork();
|
if (currentNetwork().isTestnet) return null;
|
||||||
if (!network || network.isTestnet) return null;
|
|
||||||
return prices[symbol] || null;
|
return prices[symbol] || null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+36
-35
@@ -35,18 +35,16 @@ const {
|
|||||||
migrationNeeded,
|
migrationNeeded,
|
||||||
} = require("./stateSchema");
|
} = require("./stateSchema");
|
||||||
|
|
||||||
const { storageGet, storageSet, withLock } = require("./browserApi");
|
const { storageGet, storageSet } = require("./browserApi");
|
||||||
const { log } = require("./log");
|
const { log } = require("./log");
|
||||||
|
|
||||||
// The live record the proxy below guards. Everything inside this module reads
|
// The live record the proxy below guards. Everything inside this module reads
|
||||||
// and writes THIS object, never the proxy: the guard is for callers.
|
// and writes THIS object, never the proxy: the guard is for callers.
|
||||||
const rawState = {
|
const rawState = {
|
||||||
...DEFAULT_STATE,
|
...DEFAULT_STATE,
|
||||||
// Their own objects, not the ones DEFAULT_STATE holds:
|
// Its own object, not the one DEFAULT_STATE holds: applyChainSwitchFields()
|
||||||
// applyChainSwitchFields() mutates these maps in place, and a spread copies
|
// mutates this map in place, and a spread copies the reference.
|
||||||
// the reference.
|
|
||||||
networkEndpoints: {},
|
networkEndpoints: {},
|
||||||
networkTrackedTokens: {},
|
|
||||||
currentView: null,
|
currentView: null,
|
||||||
selectedWallet: null,
|
selectedWallet: null,
|
||||||
selectedAddress: null,
|
selectedAddress: null,
|
||||||
@@ -440,14 +438,12 @@ function mergeNetworkEndpoints(base, ours, theirs) {
|
|||||||
//
|
//
|
||||||
// Every other persisted field stays a whole-field diff:
|
// Every other persisted field stays a whole-field diff:
|
||||||
// `trackedTokens`/`fraudContracts`/`viewStack` are arrays of scalars with no
|
// `trackedTokens`/`fraudContracts`/`viewStack` are arrays of scalars with no
|
||||||
// per-element identity to merge by; `networkTrackedTokens` is diffed whole like
|
// per-element identity to merge by; `tokenHolderCache` is a map shaped like
|
||||||
// `trackedTokens` and `networkId`, the two fields a network switch moves
|
// the ones above, but nothing in src/ ever writes an entry into it — it is
|
||||||
// together with it; `tokenHolderCache` is a map shaped like the ones above,
|
// only ever reset wholesale to `{}` (applyChainSwitchFields()) — so there is
|
||||||
// but nothing in src/ ever writes an entry into it — it is only ever reset
|
// no in-place mutation for a whole-field diff to collide with; `viewData` is
|
||||||
// wholesale to `{}` (applyChainSwitchFields()) — so there is no in-place
|
// this page's own UI scratch space, not data another page has any reason to
|
||||||
// mutation for a whole-field diff to collide with; `viewData` is this page's
|
// share membership of.
|
||||||
// own UI scratch space, not data another page has any reason to share
|
|
||||||
// membership of.
|
|
||||||
//
|
//
|
||||||
// This does not make two pages that both change the SAME leaf concurrently
|
// This does not make two pages that both change the SAME leaf concurrently
|
||||||
// safe: last write wins on that one leaf, same as before. What it removes
|
// safe: last write wins on that one leaf, same as before. What it removes
|
||||||
@@ -458,8 +454,8 @@ function mergeNetworkEndpoints(base, ours, theirs) {
|
|||||||
// This page's own live `state` is deliberately NOT rehydrated from a field
|
// This page's own live `state` is deliberately NOT rehydrated from a field
|
||||||
// another page changed — only the record written to storage is merged.
|
// another page changed — only the record written to storage is merged.
|
||||||
// showView() fires saveState() on every navigation without awaiting it,
|
// showView() fires saveState() on every navigation without awaiting it,
|
||||||
// which is why saves from one page wait for each other (see saveState()), and
|
// which is what makes the queue above necessary in the first place, and a
|
||||||
// a save that is slow to come back has no way to tell whether the field it
|
// save that is slow to come back has no way to tell whether the field it
|
||||||
// is about to hand back is still the current answer or has since been
|
// is about to hand back is still the current answer or has since been
|
||||||
// overtaken by something this very page did in the meantime; writing it
|
// overtaken by something this very page did in the meantime; writing it
|
||||||
// into `state` regardless reintroduced exactly the clobber this function
|
// into `state` regardless reintroduced exactly the clobber this function
|
||||||
@@ -529,21 +525,35 @@ async function saveStateOnce() {
|
|||||||
rawState.hasWallet = rawState.wallets.length > 0;
|
rawState.hasWallet = rawState.wallets.length > 0;
|
||||||
|
|
||||||
// What this save compared and wrote, not the page's state now: a change
|
// What this save compared and wrote, not the page's state now: a change
|
||||||
// made during the save must still differ from the baseline, or the next
|
// made during the save must still differ from the baseline, or the save
|
||||||
// save finds nothing to store
|
// queued after it finds nothing to store
|
||||||
// (https://git.eeqj.de/sneak/AutistMask/issues/448).
|
// (https://git.eeqj.de/sneak/AutistMask/issues/448).
|
||||||
baseline = current;
|
baseline = current;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// showView() calls saveState() on every navigation without awaiting it, so
|
||||||
|
// two saves from the SAME page can be in flight at once — e.g. a screen
|
||||||
|
// shown, then immediately replaced before the first save's storageGet()
|
||||||
|
// round trip has come back. Left concurrent, the first save's turn would
|
||||||
|
// finish after the second's live-state mutation and then re-hydrate `state`
|
||||||
|
// from what IT read, stomping the second, later change back to a stale
|
||||||
|
// value — the same clobber this function exists to prevent, just between
|
||||||
|
// two saves on one page instead of two pages. Queuing makes every save's
|
||||||
|
// snapshot-diff-write-rehydrate run start to finish before the next one
|
||||||
|
// begins, so each one only ever sees the true live state at its turn.
|
||||||
|
let saveQueue = Promise.resolve();
|
||||||
|
|
||||||
// Where a failed save is REPORTED, set once by the context that has a screen
|
// Where a failed save is REPORTED, set once by the context that has a screen
|
||||||
// to say it on (src/popup/index.js).
|
// to say it on (src/popup/index.js).
|
||||||
//
|
//
|
||||||
// A save that fails must not fail silently. showView() fires saveState() on
|
// A save that fails must not fail silently. showView() fires saveState() on
|
||||||
// every navigation without awaiting it, and `await saveState()` inside an
|
// every navigation without awaiting it, and the queue below has to attach a
|
||||||
// unguarded event handler is no better: either way, without this, a failure
|
// rejection handler to keep advancing — so a failing save was swallowed
|
||||||
// would reach only the console, where the user never looks, and the wallet
|
// entirely: no throw, no message, nothing on screen. The wallet kept running
|
||||||
// would keep running against storage that rejects every write. That is the
|
// against storage that was rejecting every write, which is the data-loss half
|
||||||
// data-loss half of https://git.eeqj.de/sneak/AutistMask/issues/362.
|
// of https://git.eeqj.de/sneak/AutistMask/issues/362. The awaited callers were
|
||||||
|
// no better off: `await saveState()` inside an unguarded event handler surfaces
|
||||||
|
// in the console and nowhere the user looks.
|
||||||
//
|
//
|
||||||
// This is the "tell the user" half; the other half is the floor in
|
// This is the "tell the user" half; the other half is the floor in
|
||||||
// normalizePersisted(), which stops the malformed-record cause from arising in
|
// normalizePersisted(), which stops the malformed-record cause from arising in
|
||||||
@@ -569,20 +579,11 @@ function reportSaveFailure(err) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Each save runs start to finish holding the lock every write of the stored
|
|
||||||
// record takes (withLock() in src/shared/browserApi.js), so no write by
|
|
||||||
// another page or the background lands between its read and its write and is
|
|
||||||
// lost (https://git.eeqj.de/sneak/AutistMask/issues/641). A page in a Firefox
|
|
||||||
// private window is the exception: Firefox gives it locks of its own (README,
|
|
||||||
// "Stored state and its version").
|
|
||||||
//
|
|
||||||
// The same lock orders this page's own saves. showView() calls saveState() on
|
|
||||||
// every navigation without awaiting it, so two saves from one page can be
|
|
||||||
// asked for at once; they take the lock in the order they were asked, and each
|
|
||||||
// compares the page's state as it stands when its turn begins against the
|
|
||||||
// baseline the save before it left.
|
|
||||||
function saveState() {
|
function saveState() {
|
||||||
const turn = withLock("autistmask", saveStateOnce);
|
const turn = saveQueue.then(saveStateOnce);
|
||||||
|
// The queue must advance even when a save rejects, or every save after
|
||||||
|
// it queues behind a promise that never settles.
|
||||||
|
saveQueue = turn.catch(() => {});
|
||||||
// Every failed save is reported, whether or not the caller awaited this
|
// Every failed save is reported, whether or not the caller awaited this
|
||||||
// one. The returned promise still rejects, so a caller that DOES await
|
// one. The returned promise still rejects, so a caller that DOES await
|
||||||
// keeps its own error handling.
|
// keeps its own error handling.
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ const { toDecimals } = require("./transferAmount");
|
|||||||
// truncation without the approval screens' nonzero floor: the transaction
|
// truncation without the approval screens' nonzero floor: the transaction
|
||||||
// detail view is the authoritative record and already shows exact precision.
|
// detail view is the authoritative record and already shows exact precision.
|
||||||
const { truncateAmount: formatTxValue } = require("./amountDisplay");
|
const { truncateAmount: formatTxValue } = require("./amountDisplay");
|
||||||
const { routerRelease } = require("./uniswap");
|
|
||||||
|
|
||||||
// Ethereum addresses are case-insensitive: EIP-55 mixed case is a checksum
|
// Ethereum addresses are case-insensitive: EIP-55 mixed case is a checksum
|
||||||
// over the address, not part of its identity. Every address comparison in
|
// over the address, not part of its identity. Every address comparison in
|
||||||
@@ -52,6 +51,7 @@ function parseTx(tx, addrLower, chainId) {
|
|||||||
}
|
}
|
||||||
// Map known DEX methods to "Swap" for cleaner display
|
// Map known DEX methods to "Swap" for cleaner display
|
||||||
const SWAP_METHODS = new Set([
|
const SWAP_METHODS = new Set([
|
||||||
|
"execute",
|
||||||
"swap",
|
"swap",
|
||||||
"swapExactTokensForTokens",
|
"swapExactTokensForTokens",
|
||||||
"swapTokensForExactTokens",
|
"swapTokensForExactTokens",
|
||||||
@@ -59,16 +59,9 @@ function parseTx(tx, addrLower, chainId) {
|
|||||||
"swapTokensForExactETH",
|
"swapTokensForExactETH",
|
||||||
"swapExactTokensForETH",
|
"swapExactTokensForETH",
|
||||||
"swapETHForExactTokens",
|
"swapETHForExactTokens",
|
||||||
|
"multicall",
|
||||||
]);
|
]);
|
||||||
// Multisigs, smart accounts and many other contracts also have an
|
const label = SWAP_METHODS.has(method)
|
||||||
// `execute` or `multicall` method, so either is a swap only when sent
|
|
||||||
// to a Universal Router on this transaction's network: the same
|
|
||||||
// addresses the approval screen decodes a swap for.
|
|
||||||
const isSwap =
|
|
||||||
SWAP_METHODS.has(method) ||
|
|
||||||
((method === "execute" || method === "multicall") &&
|
|
||||||
routerRelease(to, chainId) !== null);
|
|
||||||
const label = isSwap
|
|
||||||
? "Swap"
|
? "Swap"
|
||||||
: method.charAt(0).toUpperCase() + method.slice(1);
|
: method.charAt(0).toUpperCase() + method.slice(1);
|
||||||
direction = "contract";
|
direction = "contract";
|
||||||
|
|||||||
@@ -2,11 +2,11 @@
|
|||||||
// encoded with.
|
// encoded with.
|
||||||
//
|
//
|
||||||
// A token amount is a decimal string plus a scale, and the two come from
|
// A token amount is a decimal string plus a scale, and the two come from
|
||||||
// different places. The confirmation screen renders the amount, the symbol and
|
// different places. The confirmation screen renders the amount, the balance and
|
||||||
// the balance it reads from the node with the block explorer's cached metadata
|
// the symbol from the block explorer's cached metadata (see
|
||||||
// (see fetchTokenBalances() in balances.js); the transfer used to be encoded
|
// fetchTokenBalances() in balances.js); the transfer used to be encoded from
|
||||||
// from decimals() read off the contract at signing time, and nothing compared
|
// decimals() read off the contract at signing time, and nothing compared the
|
||||||
// the two. A token whose on-chain scale differs from the cached one — an
|
// two. A token whose on-chain scale differs from the cached one — an
|
||||||
// upgradeable or proxy token, a caller-dependent one, a stale or wrong explorer
|
// upgradeable or proxy token, a caller-dependent one, a stale or wrong explorer
|
||||||
// entry — therefore signed an amount that was never displayed, off by a power
|
// entry — therefore signed an amount that was never displayed, off by a power
|
||||||
// of ten for every decimal place of disagreement.
|
// of ten for every decimal place of disagreement.
|
||||||
|
|||||||
@@ -111,8 +111,8 @@ function isValidAmount(amount, tokenDecimals = null) {
|
|||||||
|
|
||||||
// The most ETH a send can carry: the exact balance minus the fee reserve from
|
// The most ETH a send can carry: the exact balance minus the fee reserve from
|
||||||
// feeReserveWei(), as a decimal string, so validateTransfer() passes it with
|
// feeReserveWei(), as a decimal string, so validateTransfer() passes it with
|
||||||
// exactly that reserve left behind. `ethBalance` is an exact decimal string as
|
// exactly that reserve left behind. `ethBalance` is the exact decimal string
|
||||||
// formatEther() writes it, never a rounded one. Null when the balance does not
|
// balances.js stores, never a rounded one. Null when the balance does not
|
||||||
// leave anything to send once the fee is paid, or when either input is
|
// leave anything to send once the fee is paid, or when either input is
|
||||||
// unusable.
|
// unusable.
|
||||||
function maxEthAmount(ethBalance, feeWei) {
|
function maxEthAmount(ethBalance, feeWei) {
|
||||||
|
|||||||
+165
-1427
File diff suppressed because it is too large
Load Diff
@@ -291,6 +291,7 @@ async function confirmSend(from, selected) {
|
|||||||
to: RECIPIENT,
|
to: RECIPIENT,
|
||||||
amount: "0.5",
|
amount: "0.5",
|
||||||
token: "ETH",
|
token: "ETH",
|
||||||
|
balance: "1.0",
|
||||||
});
|
});
|
||||||
await settle();
|
await settle();
|
||||||
node("confirm-tx-password").value = PASSWORD;
|
node("confirm-tx-password").value = PASSWORD;
|
||||||
@@ -442,25 +443,11 @@ describe("a confirmation screen whose From is not the selected address", () => {
|
|||||||
expect(Transaction.from(signed).from).toBe(derived(1).address);
|
expect(Transaction.from(signed).from).toBe(derived(1).address);
|
||||||
});
|
});
|
||||||
|
|
||||||
// The refusal's sentence is fixed in index.html, in a box of its own that
|
|
||||||
// holds its space from the first paint, so showing it moves nothing.
|
|
||||||
test("nothing is sent when the selected wallet does not hold it", async () => {
|
test("nothing is sent when the selected wallet does not hold it", async () => {
|
||||||
expect(await confirmSend(derived(5).address, 0)).toBeUndefined();
|
expect(await confirmSend(derived(5).address, 0)).toBeUndefined();
|
||||||
expect(node("confirm-from-address-error").style.visibility).toBe(
|
expect(node("confirm-tx-password-error").textContent).toBe(
|
||||||
"visible",
|
"The selected wallet does not hold the From address above, " +
|
||||||
);
|
"so nothing was sent. Please go back and send again.",
|
||||||
expect(node("confirm-tx-password-error").textContent).toBe("");
|
|
||||||
|
|
||||||
// Reviewing a send again draws the screen again, which hides it.
|
|
||||||
confirmTx.show({
|
|
||||||
from: derived(0).address,
|
|
||||||
to: RECIPIENT,
|
|
||||||
amount: "0.5",
|
|
||||||
token: "ETH",
|
|
||||||
});
|
|
||||||
await settle();
|
|
||||||
expect(node("confirm-from-address-error").style.visibility).toBe(
|
|
||||||
"hidden",
|
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -68,13 +68,10 @@ function swapData(amountIn, amountOutMin) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function swapDetail(amountIn, amountOutMin, label) {
|
function swapDetail(amountIn, amountOutMin, label) {
|
||||||
// Sent by the address the swap pays, so the output is the user's.
|
|
||||||
const decoded = uniswap.decode(
|
const decoded = uniswap.decode(
|
||||||
swapData(amountIn, amountOutMin),
|
swapData(amountIn, amountOutMin),
|
||||||
ROUTER,
|
ROUTER,
|
||||||
"0x1",
|
"0x1",
|
||||||
{},
|
|
||||||
RECIPIENT,
|
|
||||||
);
|
);
|
||||||
return decoded.details.find((d) => d.label === label);
|
return decoded.details.find((d) => d.label === label);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,270 +0,0 @@
|
|||||||
// The approval screen for a site's Sepolia token transfer while Ethereum
|
|
||||||
// Mainnet is active.
|
|
||||||
//
|
|
||||||
// The screen named the token, and scaled its amount, from the active network's
|
|
||||||
// tracked tokens and balances, so a token the wallet tracks on Sepolia read as
|
|
||||||
// an unknown token with its amount in base units, and the screens after it
|
|
||||||
// labelled the amount `?` (https://git.eeqj.de/sneak/AutistMask/issues/629).
|
|
||||||
// It now uses what the wallet knows of the tokens on the network the
|
|
||||||
// transaction is for.
|
|
||||||
//
|
|
||||||
// Its address links opened the active network's explorer
|
|
||||||
// (https://git.eeqj.de/sneak/AutistMask/issues/631). They now open the
|
|
||||||
// explorer of the network the transaction is for.
|
|
||||||
//
|
|
||||||
// Driven through the real approval screen, password and Confirm included,
|
|
||||||
// against a minimal DOM stub in the shape tests/swapStatusAmount.test.js uses.
|
|
||||||
// The vault is mocked so that no password has to be hashed.
|
|
||||||
|
|
||||||
jest.mock("../src/shared/vault", () => ({
|
|
||||||
decryptWithPassword: jest.fn(),
|
|
||||||
}));
|
|
||||||
|
|
||||||
globalThis.chrome = {
|
|
||||||
storage: { local: { get: async () => ({}), set: async () => {} } },
|
|
||||||
};
|
|
||||||
|
|
||||||
const { Interface } = require("ethers");
|
|
||||||
const { state } = require("../src/shared/state");
|
|
||||||
const { NETWORKS } = require("../src/shared/networks");
|
|
||||||
const { decryptWithPassword } = require("../src/shared/vault");
|
|
||||||
const approval = require("../src/popup/views/approval");
|
|
||||||
const txStatus = require("../src/popup/views/txStatus");
|
|
||||||
|
|
||||||
// A well-known test phrase, and its first address.
|
|
||||||
const PHRASE = "test test test test test test test test test test test junk";
|
|
||||||
const FROM = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266";
|
|
||||||
const RECIPIENT = "0x711e691962E5c054b78071C789A0C8CE657377aD";
|
|
||||||
// A token the bundled token list does not name.
|
|
||||||
const TOKEN = "0x74de5d4FCbf63E00296fd95d33236B9794016631";
|
|
||||||
|
|
||||||
// FROM sends 1234.5 of the 6-decimal token to RECIPIENT.
|
|
||||||
const TRANSFER_DATA = new Interface([
|
|
||||||
"function transfer(address to, uint256 amount)",
|
|
||||||
]).encodeFunctionData("transfer", [RECIPIENT, 1234500000n]);
|
|
||||||
|
|
||||||
function makeElement(id) {
|
|
||||||
const classes = new Set();
|
|
||||||
const el = {
|
|
||||||
id,
|
|
||||||
textContent: "",
|
|
||||||
value: "",
|
|
||||||
innerHTML: "",
|
|
||||||
disabled: false,
|
|
||||||
style: {},
|
|
||||||
dataset: {},
|
|
||||||
listeners: {},
|
|
||||||
classList: {
|
|
||||||
add: (...names) => names.forEach((n) => classes.add(n)),
|
|
||||||
remove: (...names) => names.forEach((n) => classes.delete(n)),
|
|
||||||
contains: (n) => classes.has(n),
|
|
||||||
toggle: (n, force) => {
|
|
||||||
const on = force === undefined ? !classes.has(n) : force;
|
|
||||||
if (on) classes.add(n);
|
|
||||||
else classes.delete(n);
|
|
||||||
return on;
|
|
||||||
},
|
|
||||||
},
|
|
||||||
addEventListener: (name, fn) => {
|
|
||||||
el.listeners[name] = el.listeners[name] || [];
|
|
||||||
el.listeners[name].push(fn);
|
|
||||||
},
|
|
||||||
querySelectorAll: () => [],
|
|
||||||
appendChild: () => {},
|
|
||||||
};
|
|
||||||
// Views reach for .parentElement to hide whole sections.
|
|
||||||
Object.defineProperty(el, "parentElement", {
|
|
||||||
get: () => node(id + "-parent"),
|
|
||||||
});
|
|
||||||
return el;
|
|
||||||
}
|
|
||||||
|
|
||||||
function makeDocument() {
|
|
||||||
const els = new Map();
|
|
||||||
return {
|
|
||||||
getElementById(id) {
|
|
||||||
// The debug banner is created on demand by helpers.js; absent
|
|
||||||
// is the state a non-debug, non-testnet popup is in.
|
|
||||||
if (id === "debug-banner") return null;
|
|
||||||
if (!els.has(id)) els.set(id, makeElement(id));
|
|
||||||
return els.get(id);
|
|
||||||
},
|
|
||||||
createElement: () => makeElement("created"),
|
|
||||||
body: { prepend: () => {} },
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function node(id) {
|
|
||||||
return globalThis.document.getElementById(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
function click(id) {
|
|
||||||
return Promise.all((node(id).listeners.click || []).map((fn) => fn()));
|
|
||||||
}
|
|
||||||
|
|
||||||
// One line of the decoded details: its label and what is drawn under it.
|
|
||||||
function decodedLine(label) {
|
|
||||||
return node("approve-tx-decoded-details")
|
|
||||||
.innerHTML.split('<div class="mb-2">')
|
|
||||||
.find((line) =>
|
|
||||||
line.startsWith(`<div class="text-muted">${label}</div>`),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Open the approval screen, with Ethereum Mainnet active and FROM holding
|
|
||||||
// `tokenBalances` there, for the site's transaction sending TRANSFER_DATA to
|
|
||||||
// the token, on Sepolia unless `chainId` names another chain. Confirm answers
|
|
||||||
// the signed transaction with a failure, which leads to the error screen.
|
|
||||||
async function showTokenTransfer(
|
|
||||||
tokenBalances = [],
|
|
||||||
chainId = NETWORKS.sepolia.chainId,
|
|
||||||
) {
|
|
||||||
globalThis.document = makeDocument();
|
|
||||||
globalThis.window = { location: { search: "" }, close: () => {} };
|
|
||||||
globalThis.chrome.runtime = {
|
|
||||||
connect: () => ({ postMessage: () => {} }),
|
|
||||||
sendMessage: (msg, reply) => {
|
|
||||||
if (!reply) return;
|
|
||||||
if (msg.type !== "AUTISTMASK_GET_APPROVAL") {
|
|
||||||
return reply({
|
|
||||||
error: "The transaction could not be sent.",
|
|
||||||
retryable: false,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
reply({
|
|
||||||
type: "tx",
|
|
||||||
origin: "https://dapp.example",
|
|
||||||
isPhishingDomain: false,
|
|
||||||
approvedFrom: FROM,
|
|
||||||
approvedTx: {
|
|
||||||
type: 2,
|
|
||||||
from: FROM,
|
|
||||||
chainId,
|
|
||||||
nonce: "0x7",
|
|
||||||
gasLimit: "0x30d40",
|
|
||||||
maxPriorityFeePerGas: "0x3b9aca00",
|
|
||||||
maxFeePerGas: "0x77359400",
|
|
||||||
to: TOKEN,
|
|
||||||
value: "0x0",
|
|
||||||
data: TRANSFER_DATA,
|
|
||||||
accessList: [],
|
|
||||||
},
|
|
||||||
});
|
|
||||||
},
|
|
||||||
};
|
|
||||||
state.networkId = "mainnet";
|
|
||||||
state.activeAddress = FROM;
|
|
||||||
state.wallets = [
|
|
||||||
{
|
|
||||||
type: "hd",
|
|
||||||
name: "Wallet 1",
|
|
||||||
xpub: "xpub-wallet-1",
|
|
||||||
encryptedSecret: "encrypted-secret-1",
|
|
||||||
nextIndex: 1,
|
|
||||||
addresses: [
|
|
||||||
{ address: FROM, index: 0, balance: "0", tokenBalances },
|
|
||||||
],
|
|
||||||
},
|
|
||||||
];
|
|
||||||
state.currentView = null;
|
|
||||||
txStatus.init({ doRefreshAndRender: () => {} });
|
|
||||||
approval.init({});
|
|
||||||
await approval.show(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function confirm() {
|
|
||||||
decryptWithPassword.mockResolvedValue(PHRASE);
|
|
||||||
node("approve-tx-password").value = "any password";
|
|
||||||
await click("btn-approve-tx");
|
|
||||||
}
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
state.trackedTokens = [];
|
|
||||||
state.networkTrackedTokens = {};
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("a token tracked on Sepolia only", () => {
|
|
||||||
beforeEach(() => {
|
|
||||||
state.networkTrackedTokens = {
|
|
||||||
sepolia: [{ address: TOKEN, symbol: "TDOL", decimals: 6 }],
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
test("is named on the Contract line and the decoded Token line, with its amount at its scale", async () => {
|
|
||||||
await showTokenTransfer();
|
|
||||||
expect(node("approve-tx-to").innerHTML).toContain(
|
|
||||||
'<div class="font-bold mb-1">TDOL</div>',
|
|
||||||
);
|
|
||||||
expect(decodedLine("Token")).toContain(
|
|
||||||
'<div class="font-bold">TDOL</div>',
|
|
||||||
);
|
|
||||||
expect(decodedLine("Amount")).toContain(
|
|
||||||
'<div class="font-bold">1234.5000 TDOL</div>',
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("labels the amount on the error screen that follows", async () => {
|
|
||||||
await showTokenTransfer();
|
|
||||||
await confirm();
|
|
||||||
expect(state.currentView).toBe("error-tx");
|
|
||||||
expect(node("error-tx-summary").textContent).toBe("1234.5000 TDOL");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
// The same contract address on mainnet is another token, so what the wallet
|
|
||||||
// tracks and holds there names nothing on Sepolia.
|
|
||||||
test("a token tracked and held on mainnet only is not named, and its amount is in base units", async () => {
|
|
||||||
state.trackedTokens = [{ address: TOKEN, symbol: "MDOL", decimals: 18 }];
|
|
||||||
await showTokenTransfer([
|
|
||||||
{ address: TOKEN, symbol: "MDOL", decimals: 18, balance: "1.0" },
|
|
||||||
]);
|
|
||||||
expect(node("approve-tx-to").innerHTML).not.toContain("MDOL");
|
|
||||||
expect(decodedLine("Token")).toContain(
|
|
||||||
'<div class="font-bold">Unknown token</div>',
|
|
||||||
);
|
|
||||||
expect(decodedLine("Amount")).toContain(
|
|
||||||
'<div class="font-bold">1234500000 base units (decimals unknown)</div>',
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
// The From and Contract lines, and the decoded Token and Recipient lines.
|
|
||||||
test("every address links to the Sepolia explorer", async () => {
|
|
||||||
await showTokenTransfer();
|
|
||||||
const sepolia = NETWORKS.sepolia.explorerUrl;
|
|
||||||
expect(node("approve-tx-from").innerHTML).toContain(
|
|
||||||
`href="${sepolia}/address/${FROM}"`,
|
|
||||||
);
|
|
||||||
expect(node("approve-tx-to").innerHTML).toContain(
|
|
||||||
`href="${sepolia}/address/${TOKEN}"`,
|
|
||||||
);
|
|
||||||
expect(decodedLine("Token")).toContain(
|
|
||||||
`href="${sepolia}/address/${TOKEN}"`,
|
|
||||||
);
|
|
||||||
expect(decodedLine("Recipient")).toContain(
|
|
||||||
`href="${sepolia}/address/${RECIPIENT}"`,
|
|
||||||
);
|
|
||||||
for (const id of [
|
|
||||||
"approve-tx-from",
|
|
||||||
"approve-tx-to",
|
|
||||||
"approve-tx-decoded-details",
|
|
||||||
]) {
|
|
||||||
expect(node(id).innerHTML).not.toContain(NETWORKS.mainnet.explorerUrl);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Chain id 1337 names no network here, so it has no explorer to link to.
|
|
||||||
test("a transaction on a chain id that names no network is shown with no address links", async () => {
|
|
||||||
await showTokenTransfer([], "0x539");
|
|
||||||
expect(state.currentView).toBe("approve-tx");
|
|
||||||
expect(node("approve-tx-network").textContent).toBe(
|
|
||||||
"Unknown network (chain id 1337)",
|
|
||||||
);
|
|
||||||
expect(node("approve-tx-from").innerHTML).toContain(FROM);
|
|
||||||
for (const id of [
|
|
||||||
"approve-tx-from",
|
|
||||||
"approve-tx-to",
|
|
||||||
"approve-tx-decoded-details",
|
|
||||||
]) {
|
|
||||||
expect(node(id).innerHTML).not.toContain("href=");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
@@ -1,192 +0,0 @@
|
|||||||
// The USD value on the approval screen's Value and Network fee lines, for a
|
|
||||||
// site's ETH send.
|
|
||||||
//
|
|
||||||
// It was worked out from the four-decimal figure the line shows, at the price
|
|
||||||
// on the active network, so the same value read a few cents different here than
|
|
||||||
// on the confirmation screen, which prices the exact amount at the price on the
|
|
||||||
// transaction's own network, and a transaction on another network than the
|
|
||||||
// active one was priced at the active one's rate, its fee too
|
|
||||||
// (https://git.eeqj.de/sneak/AutistMask/issues/614).
|
|
||||||
//
|
|
||||||
// Driven through the real approval screen, against a minimal DOM stub in the
|
|
||||||
// shape tests/approvalTokenNetwork.test.js uses.
|
|
||||||
|
|
||||||
globalThis.chrome = {
|
|
||||||
storage: { local: { get: async () => ({}), set: async () => {} } },
|
|
||||||
};
|
|
||||||
|
|
||||||
const { state } = require("../src/shared/state");
|
|
||||||
const { NETWORKS } = require("../src/shared/networks");
|
|
||||||
const { prices, clearPrices } = require("../src/shared/prices");
|
|
||||||
const approval = require("../src/popup/views/approval");
|
|
||||||
|
|
||||||
const FROM = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266";
|
|
||||||
const RECIPIENT = "0x711e691962E5c054b78071C789A0C8CE657377aD";
|
|
||||||
|
|
||||||
function makeElement(id) {
|
|
||||||
const classes = new Set();
|
|
||||||
const el = {
|
|
||||||
id,
|
|
||||||
textContent: "",
|
|
||||||
value: "",
|
|
||||||
innerHTML: "",
|
|
||||||
disabled: false,
|
|
||||||
style: {},
|
|
||||||
dataset: {},
|
|
||||||
listeners: {},
|
|
||||||
classList: {
|
|
||||||
add: (...names) => names.forEach((n) => classes.add(n)),
|
|
||||||
remove: (...names) => names.forEach((n) => classes.delete(n)),
|
|
||||||
contains: (n) => classes.has(n),
|
|
||||||
toggle: (n, force) => {
|
|
||||||
const on = force === undefined ? !classes.has(n) : force;
|
|
||||||
if (on) classes.add(n);
|
|
||||||
else classes.delete(n);
|
|
||||||
return on;
|
|
||||||
},
|
|
||||||
},
|
|
||||||
addEventListener: (name, fn) => {
|
|
||||||
el.listeners[name] = el.listeners[name] || [];
|
|
||||||
el.listeners[name].push(fn);
|
|
||||||
},
|
|
||||||
querySelectorAll: () => [],
|
|
||||||
appendChild: () => {},
|
|
||||||
};
|
|
||||||
// Views reach for .parentElement to hide whole sections.
|
|
||||||
Object.defineProperty(el, "parentElement", {
|
|
||||||
get: () => node(id + "-parent"),
|
|
||||||
});
|
|
||||||
return el;
|
|
||||||
}
|
|
||||||
|
|
||||||
function makeDocument() {
|
|
||||||
const els = new Map();
|
|
||||||
return {
|
|
||||||
getElementById(id) {
|
|
||||||
// The debug banner is created on demand by helpers.js; absent
|
|
||||||
// is the state a non-debug, non-testnet popup is in.
|
|
||||||
if (id === "debug-banner") return null;
|
|
||||||
if (!els.has(id)) els.set(id, makeElement(id));
|
|
||||||
return els.get(id);
|
|
||||||
},
|
|
||||||
createElement: () => makeElement("created"),
|
|
||||||
body: { prepend: () => {} },
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
function node(id) {
|
|
||||||
return globalThis.document.getElementById(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Open the approval screen, with the network `networkId` active, for the
|
|
||||||
// site's transaction sending 1.23414 ETH to RECIPIENT on the chain `chainId`.
|
|
||||||
async function showEthSend(chainId, networkId) {
|
|
||||||
globalThis.document = makeDocument();
|
|
||||||
globalThis.window = { location: { search: "" }, close: () => {} };
|
|
||||||
globalThis.chrome.runtime = {
|
|
||||||
connect: () => ({ postMessage: () => {} }),
|
|
||||||
sendMessage: (msg, reply) => {
|
|
||||||
if (!reply) return;
|
|
||||||
reply({
|
|
||||||
type: "tx",
|
|
||||||
origin: "https://dapp.example",
|
|
||||||
isPhishingDomain: false,
|
|
||||||
approvedFrom: FROM,
|
|
||||||
approvedTx: {
|
|
||||||
type: 2,
|
|
||||||
from: FROM,
|
|
||||||
chainId,
|
|
||||||
nonce: "0x7",
|
|
||||||
gasLimit: "0x5208",
|
|
||||||
maxPriorityFeePerGas: "0x3b9aca00",
|
|
||||||
maxFeePerGas: "0x77359400",
|
|
||||||
to: RECIPIENT,
|
|
||||||
value: "1234140000000000000",
|
|
||||||
data: "0x",
|
|
||||||
accessList: [],
|
|
||||||
},
|
|
||||||
});
|
|
||||||
},
|
|
||||||
};
|
|
||||||
state.networkId = networkId;
|
|
||||||
state.activeAddress = FROM;
|
|
||||||
state.wallets = [
|
|
||||||
{
|
|
||||||
type: "hd",
|
|
||||||
name: "Wallet 1",
|
|
||||||
xpub: "xpub-wallet-1",
|
|
||||||
encryptedSecret: "encrypted-secret-1",
|
|
||||||
nextIndex: 1,
|
|
||||||
addresses: [{ address: FROM, index: 0, balance: "0" }],
|
|
||||||
},
|
|
||||||
];
|
|
||||||
state.trackedTokens = [];
|
|
||||||
state.networkTrackedTokens = {};
|
|
||||||
state.currentView = null;
|
|
||||||
approval.init({});
|
|
||||||
await approval.show(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
prices.ETH = 2000;
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(() => {
|
|
||||||
clearPrices();
|
|
||||||
});
|
|
||||||
|
|
||||||
// 1.23414 ETH reads 1.2341 ETH. At $2,000 the exact value is $2,468.28, the
|
|
||||||
// figure the confirmation screen shows for it; the shown figure would be
|
|
||||||
// $2,468.20.
|
|
||||||
test.each([
|
|
||||||
[
|
|
||||||
"a mainnet transaction is priced from its exact value",
|
|
||||||
NETWORKS.mainnet.chainId,
|
|
||||||
"mainnet",
|
|
||||||
"1.2341 ETH ($2,468.28)",
|
|
||||||
],
|
|
||||||
[
|
|
||||||
"a mainnet transaction shown with Sepolia active is priced at the mainnet price",
|
|
||||||
NETWORKS.mainnet.chainId,
|
|
||||||
"sepolia",
|
|
||||||
"1.2341 ETH ($2,468.28)",
|
|
||||||
],
|
|
||||||
[
|
|
||||||
"a Sepolia transaction shown with mainnet active has no USD value",
|
|
||||||
NETWORKS.sepolia.chainId,
|
|
||||||
"mainnet",
|
|
||||||
"1.2341 SepoliaETH",
|
|
||||||
],
|
|
||||||
// Chain id 1337 names no network here, so nothing knows its price.
|
|
||||||
[
|
|
||||||
"a transaction on a chain id that names no network has no USD value",
|
|
||||||
"0x539",
|
|
||||||
"mainnet",
|
|
||||||
"1.2341 ETH",
|
|
||||||
],
|
|
||||||
])("%s", async (_label, chainId, networkId, expected) => {
|
|
||||||
await showEthSend(chainId, networkId);
|
|
||||||
expect(state.currentView).toBe("approve-tx");
|
|
||||||
expect(node("approve-tx-value").textContent).toBe(expected);
|
|
||||||
});
|
|
||||||
|
|
||||||
// The Network fee line is priced on the transaction's network too. 21000 gas at
|
|
||||||
// up to 2 gwei is 0.000042 ETH, $0.08 at $2,000.
|
|
||||||
test.each([
|
|
||||||
[
|
|
||||||
"the fee of a mainnet transaction shown with Sepolia active is priced at the mainnet price",
|
|
||||||
NETWORKS.mainnet.chainId,
|
|
||||||
"sepolia",
|
|
||||||
"0.00004 ETH ($0.08)",
|
|
||||||
],
|
|
||||||
[
|
|
||||||
"the fee of a Sepolia transaction shown with mainnet active has no USD value",
|
|
||||||
NETWORKS.sepolia.chainId,
|
|
||||||
"mainnet",
|
|
||||||
"0.00004 SepoliaETH",
|
|
||||||
],
|
|
||||||
])("%s", async (_label, chainId, networkId, expected) => {
|
|
||||||
await showEthSend(chainId, networkId);
|
|
||||||
expect(state.currentView).toBe("approve-tx");
|
|
||||||
expect(node("approve-tx-fee").textContent).toBe(expected);
|
|
||||||
});
|
|
||||||
@@ -154,14 +154,7 @@ describe("Back onto a view the reopened popup never rendered", () => {
|
|||||||
|
|
||||||
test("Back onto the transaction detail renders it", () => {
|
test("Back onto the transaction detail renders it", () => {
|
||||||
reopenedOn("settings", ["main", "transaction"], {
|
reopenedOn("settings", ["main", "transaction"], {
|
||||||
viewData: {
|
viewData: { tx: { hash: "0xdead", from: ADDRESS, to: ADDRESS } },
|
||||||
tx: {
|
|
||||||
hash: "0xdead",
|
|
||||||
from: ADDRESS,
|
|
||||||
to: ADDRESS,
|
|
||||||
chainId: "0x1",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
goBack();
|
goBack();
|
||||||
expect(calls).toEqual(["transactionDetail"]);
|
expect(calls).toEqual(["transactionDetail"]);
|
||||||
|
|||||||
@@ -204,21 +204,17 @@ describe("a chain switch on a worker that never loaded state", () => {
|
|||||||
expect(after.rpcUrl).toBe(SEPOLIA.defaultRpcUrl);
|
expect(after.rpcUrl).toBe(SEPOLIA.defaultRpcUrl);
|
||||||
|
|
||||||
// And it took nothing else with it. Without the load these come back
|
// And it took nothing else with it. Without the load these come back
|
||||||
// as [], {}, {} and "system" from DEFAULT_STATE — every wallet in the
|
// as [], {}, [] and "system" from DEFAULT_STATE — every wallet in the
|
||||||
// extension gone, encrypted secrets included.
|
// extension gone, encrypted secrets included.
|
||||||
expect(after.wallets).toEqual(walletFixture());
|
expect(after.wallets).toEqual(walletFixture());
|
||||||
expect(after.hasWallet).toBe(true);
|
expect(after.hasWallet).toBe(true);
|
||||||
expect(after.activeAddress).toBe(ADDRESS);
|
expect(after.activeAddress).toBe(ADDRESS);
|
||||||
expect(after.allowedSites).toEqual({ [ADDRESS]: [CONNECTED_ORIGIN] });
|
expect(after.allowedSites).toEqual({ [ADDRESS]: [CONNECTED_ORIGIN] });
|
||||||
expect(after.networkTrackedTokens).toEqual({
|
expect(after.trackedTokens).toEqual([
|
||||||
mainnet: [{ address: TOKEN, symbol: "DAI", decimals: 18 }],
|
{ address: TOKEN, symbol: "DAI", decimals: 18 },
|
||||||
});
|
]);
|
||||||
expect(after.theme).toBe("dark");
|
expect(after.theme).toBe("dark");
|
||||||
|
|
||||||
// The mainnet token is tracked on mainnet only: Sepolia starts with
|
|
||||||
// none of its own.
|
|
||||||
expect(after.trackedTokens).toEqual([]);
|
|
||||||
|
|
||||||
// The user's mainnet endpoint is remembered rather than replaced by
|
// The user's mainnet endpoint is remembered rather than replaced by
|
||||||
// the public default, so switching back returns it.
|
// the public default, so switching back returns it.
|
||||||
expect(after.networkEndpoints.mainnet).toEqual({
|
expect(after.networkEndpoints.mainnet).toEqual({
|
||||||
@@ -230,9 +226,6 @@ describe("a chain switch on a worker that never loaded state", () => {
|
|||||||
expect(bg.persisted().rpcUrl).toBe(CUSTOM_RPC);
|
expect(bg.persisted().rpcUrl).toBe(CUSTOM_RPC);
|
||||||
expect(bg.persisted().blockscoutUrl).toBe(CUSTOM_BLOCKSCOUT);
|
expect(bg.persisted().blockscoutUrl).toBe(CUSTOM_BLOCKSCOUT);
|
||||||
expect(bg.persisted().wallets).toEqual(walletFixture());
|
expect(bg.persisted().wallets).toEqual(walletFixture());
|
||||||
expect(bg.persisted().trackedTokens).toEqual([
|
|
||||||
{ address: TOKEN, symbol: "DAI", decimals: 18 },
|
|
||||||
]);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
test("compares the requested chain against the stored one, not the default", async () => {
|
test("compares the requested chain against the stored one, not the default", async () => {
|
||||||
|
|||||||
@@ -1,415 +0,0 @@
|
|||||||
// The amount of the wallet's own send on the confirmation, wait, success and
|
|
||||||
// error screens (https://git.eeqj.de/sneak/AutistMask/issues/522).
|
|
||||||
//
|
|
||||||
// These screens printed the text from Send's amount field as it was typed or
|
|
||||||
// filled in: `0.5 ETH`, or `1.234147890123456789 ETH` after Max, where the
|
|
||||||
// approval screen shows a site's send as `0.5000 ETH`. They now show it to four
|
|
||||||
// decimal places with the nonzero floor, as the approval screen does, and the
|
|
||||||
// transaction is still signed for the exact amount.
|
|
||||||
//
|
|
||||||
// Driven through the real Send screen, confirmation screen, Sign & Send and
|
|
||||||
// wait screen, with only the node, the explorer and the DOM stubbed.
|
|
||||||
|
|
||||||
"use strict";
|
|
||||||
|
|
||||||
// What the stub node answers, and the signed transactions it was handed. The
|
|
||||||
// token's own decimals() answers 6, as the explorer does.
|
|
||||||
const mockNode = {
|
|
||||||
balanceWei: 0n,
|
|
||||||
tokenUnits: 0n,
|
|
||||||
tokenDecimals: 6n,
|
|
||||||
broadcast: [],
|
|
||||||
broadcastError: null,
|
|
||||||
receipt: null,
|
|
||||||
};
|
|
||||||
|
|
||||||
// The token rows the stub explorer reports for the address.
|
|
||||||
const mockExplorer = { items: [] };
|
|
||||||
|
|
||||||
jest.mock("ethers", () => {
|
|
||||||
const actual = jest.requireActual("ethers");
|
|
||||||
// The selector of decimals(); every other contract call is balanceOf().
|
|
||||||
const DECIMALS = "0x313ce567";
|
|
||||||
class StubProvider {
|
|
||||||
async getBalance() {
|
|
||||||
return mockNode.balanceWei;
|
|
||||||
}
|
|
||||||
async call(tx) {
|
|
||||||
return actual.AbiCoder.defaultAbiCoder().encode(
|
|
||||||
["uint256"],
|
|
||||||
[
|
|
||||||
tx.data.startsWith(DECIMALS)
|
|
||||||
? mockNode.tokenDecimals
|
|
||||||
: mockNode.tokenUnits,
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
async lookupAddress() {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
// 20 gwei reserved per gas.
|
|
||||||
async getFeeData() {
|
|
||||||
return {
|
|
||||||
maxFeePerGas: 20000000000n,
|
|
||||||
maxPriorityFeePerGas: 1000000000n,
|
|
||||||
gasPrice: 10000000000n,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
async estimateGas() {
|
|
||||||
return 21000n;
|
|
||||||
}
|
|
||||||
async getCode() {
|
|
||||||
return "0x";
|
|
||||||
}
|
|
||||||
async getTransactionCount() {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
async getNetwork() {
|
|
||||||
return { chainId: 1n };
|
|
||||||
}
|
|
||||||
async broadcastTransaction(signed) {
|
|
||||||
if (mockNode.broadcastError) throw mockNode.broadcastError;
|
|
||||||
mockNode.broadcast.push(signed);
|
|
||||||
return { hash: "0x" + "ab".repeat(32) };
|
|
||||||
}
|
|
||||||
async getTransactionReceipt() {
|
|
||||||
return mockNode.receipt;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return {
|
|
||||||
...actual,
|
|
||||||
JsonRpcProvider: StubProvider,
|
|
||||||
Network: { from: () => ({}) },
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
jest.mock("../src/shared/log", () => ({
|
|
||||||
log: {
|
|
||||||
debugf: () => {},
|
|
||||||
infof: () => {},
|
|
||||||
warnf: () => {},
|
|
||||||
errorf: () => {},
|
|
||||||
},
|
|
||||||
// The explorer's token list, which refreshBalances() also fetches.
|
|
||||||
debugFetch: jest.fn(async () => ({
|
|
||||||
ok: true,
|
|
||||||
status: 200,
|
|
||||||
json: async () => mockExplorer.items,
|
|
||||||
})),
|
|
||||||
urlOrigin: () => "",
|
|
||||||
setRuntimeDebug: () => {},
|
|
||||||
isDebug: () => false,
|
|
||||||
}));
|
|
||||||
|
|
||||||
// The confirmation screen's Etherscan label lookup is the only fetch() these
|
|
||||||
// screens make; it fails, as it does offline.
|
|
||||||
global.fetch = jest.fn(() => {
|
|
||||||
throw new Error("tests must not perform network requests");
|
|
||||||
});
|
|
||||||
|
|
||||||
const { makeStorageStub } = require("./support/storageStub");
|
|
||||||
global.chrome = { storage: makeStorageStub(), runtime: { sendMessage() {} } };
|
|
||||||
|
|
||||||
// A stub DOM: every id resolves to a recording element.
|
|
||||||
const elements = new Map();
|
|
||||||
|
|
||||||
function makeEl(id) {
|
|
||||||
const handlers = new Map();
|
|
||||||
return {
|
|
||||||
id,
|
|
||||||
textContent: "",
|
|
||||||
innerHTML: "",
|
|
||||||
value: "",
|
|
||||||
disabled: false,
|
|
||||||
style: {},
|
|
||||||
dataset: {},
|
|
||||||
classList: {
|
|
||||||
add() {},
|
|
||||||
remove() {},
|
|
||||||
toggle() {},
|
|
||||||
contains: () => false,
|
|
||||||
},
|
|
||||||
handlers,
|
|
||||||
children: [],
|
|
||||||
addEventListener(name, fn) {
|
|
||||||
handlers.set(name, fn);
|
|
||||||
},
|
|
||||||
appendChild(child) {
|
|
||||||
this.children.push(child);
|
|
||||||
return child;
|
|
||||||
},
|
|
||||||
querySelectorAll: () => [],
|
|
||||||
querySelector: () => null,
|
|
||||||
remove() {},
|
|
||||||
focus() {},
|
|
||||||
// The success screen hides whole sections through .parentElement.
|
|
||||||
get parentElement() {
|
|
||||||
return global.document.getElementById(id + "-parent");
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
global.document = {
|
|
||||||
getElementById(id) {
|
|
||||||
if (!elements.has(id)) elements.set(id, makeEl(id));
|
|
||||||
return elements.get(id);
|
|
||||||
},
|
|
||||||
createElement: (tag) => makeEl(tag),
|
|
||||||
body: { prepend() {}, appendChild() {} },
|
|
||||||
addEventListener() {},
|
|
||||||
};
|
|
||||||
global.navigator.clipboard = { writeText() {} };
|
|
||||||
|
|
||||||
const {
|
|
||||||
Interface,
|
|
||||||
Transaction,
|
|
||||||
Wallet,
|
|
||||||
getAddress,
|
|
||||||
parseEther,
|
|
||||||
} = require("ethers");
|
|
||||||
const { refreshBalances } = require("../src/shared/balances");
|
|
||||||
const { encryptWithPassword } = require("../src/shared/vault");
|
|
||||||
const { state } = require("../src/shared/state");
|
|
||||||
const { clearPrices } = require("../src/shared/prices");
|
|
||||||
const send = require("../src/popup/views/send");
|
|
||||||
const confirmTx = require("../src/popup/views/confirmTx");
|
|
||||||
const txStatus = require("../src/popup/views/txStatus");
|
|
||||||
|
|
||||||
const PRIVATE_KEY = "0x" + "11".repeat(32);
|
|
||||||
const HOLDER = new Wallet(PRIVATE_KEY).address;
|
|
||||||
const RECIPIENT = "0xC0FfEE0000000000000000000000000000c0fFEe";
|
|
||||||
const PASSWORD = "correct horse battery staple";
|
|
||||||
|
|
||||||
const GWEI = 1000000000n;
|
|
||||||
// 1.234567890123456789 ETH.
|
|
||||||
const BALANCE_WEI = 1234567890123456789n;
|
|
||||||
|
|
||||||
// A token the bundled list does not know, with enough holders to be listed,
|
|
||||||
// at 6 decimal places.
|
|
||||||
const TOKEN = "0x" + "d".repeat(40);
|
|
||||||
|
|
||||||
const transferIface = new Interface([
|
|
||||||
"function transfer(address to, uint256 amount)",
|
|
||||||
]);
|
|
||||||
|
|
||||||
let encryptedSecret;
|
|
||||||
|
|
||||||
// The confirmation screen Review leads to, once shown.
|
|
||||||
let confirmed = null;
|
|
||||||
|
|
||||||
function el(id) {
|
|
||||||
return global.document.getElementById(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
function text(id) {
|
|
||||||
return el(id).textContent;
|
|
||||||
}
|
|
||||||
|
|
||||||
// show() reads the balance and then estimates the fee without awaiting
|
|
||||||
// either; this lets both settle.
|
|
||||||
async function settle() {
|
|
||||||
for (let i = 0; i < 10; i++) await new Promise((r) => setTimeout(r, 0));
|
|
||||||
}
|
|
||||||
|
|
||||||
// The address holds BALANCE_WEI and, when `tokenUnits` is given, that many
|
|
||||||
// base units of TOKEN, fetched and stored where the popup stores them. Send
|
|
||||||
// is then open for `token` ("ETH" or TOKEN) with the recipient entered.
|
|
||||||
async function openSend(token, tokenUnits = null) {
|
|
||||||
mockNode.balanceWei = BALANCE_WEI;
|
|
||||||
mockNode.tokenUnits = tokenUnits ?? 0n;
|
|
||||||
mockExplorer.items =
|
|
||||||
tokenUnits === null
|
|
||||||
? []
|
|
||||||
: [
|
|
||||||
{
|
|
||||||
value: String(tokenUnits),
|
|
||||||
token: {
|
|
||||||
type: "ERC-20",
|
|
||||||
address_hash: TOKEN,
|
|
||||||
symbol: "TOK",
|
|
||||||
name: "Token",
|
|
||||||
decimals: "6",
|
|
||||||
holders_count: "50000",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
];
|
|
||||||
state.wallets = [
|
|
||||||
{
|
|
||||||
type: "key",
|
|
||||||
name: "Wallet 1",
|
|
||||||
encryptedSecret,
|
|
||||||
addresses: [{ address: HOLDER }],
|
|
||||||
},
|
|
||||||
];
|
|
||||||
state.selectedWallet = 0;
|
|
||||||
state.selectedAddress = 0;
|
|
||||||
await refreshBalances(
|
|
||||||
state.wallets,
|
|
||||||
"https://rpc.example.invalid",
|
|
||||||
"https://blockscout.example/api/v2",
|
|
||||||
state.trackedTokens,
|
|
||||||
"mainnet",
|
|
||||||
);
|
|
||||||
send.init({
|
|
||||||
showConfirmTx: (info) => (confirmed = info),
|
|
||||||
pageClosed: new AbortController().signal,
|
|
||||||
});
|
|
||||||
confirmTx.init({});
|
|
||||||
send.resetSendValidation();
|
|
||||||
state.currentView = "send";
|
|
||||||
state.selectedToken = token;
|
|
||||||
el("send-to").value = RECIPIENT;
|
|
||||||
el("send-amount").value = "";
|
|
||||||
}
|
|
||||||
|
|
||||||
// Press Review and show the confirmation screen with its fee estimate settled.
|
|
||||||
async function review() {
|
|
||||||
await el("btn-send-review").handlers.get("click")();
|
|
||||||
confirmTx.show(confirmed);
|
|
||||||
await settle();
|
|
||||||
}
|
|
||||||
|
|
||||||
async function signAndSend() {
|
|
||||||
el("confirm-tx-password").value = PASSWORD;
|
|
||||||
await el("btn-confirm-send").handlers.get("click")();
|
|
||||||
}
|
|
||||||
|
|
||||||
// The one transaction the stub node was handed.
|
|
||||||
function broadcastTx() {
|
|
||||||
expect(mockNode.broadcast).toHaveLength(1);
|
|
||||||
return Transaction.from(mockNode.broadcast[0]);
|
|
||||||
}
|
|
||||||
|
|
||||||
beforeAll(async () => {
|
|
||||||
encryptedSecret = await encryptWithPassword(PRIVATE_KEY, PASSWORD);
|
|
||||||
});
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
elements.clear();
|
|
||||||
clearPrices();
|
|
||||||
confirmed = null;
|
|
||||||
state.selectedToken = null;
|
|
||||||
state.trackedTokens = [];
|
|
||||||
state.fraudContracts = [];
|
|
||||||
state.currentView = null;
|
|
||||||
mockNode.broadcast = [];
|
|
||||||
mockNode.broadcastError = null;
|
|
||||||
mockNode.receipt = null;
|
|
||||||
txStatus.init({
|
|
||||||
doRefreshAndRender() {},
|
|
||||||
pageClosed: new AbortController().signal,
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
afterEach(() => {
|
|
||||||
txStatus.endWait();
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("the wallet's own send shows its amount to four decimal places", () => {
|
|
||||||
test("for a short amount", async () => {
|
|
||||||
await openSend("ETH");
|
|
||||||
el("send-amount").value = "0.5";
|
|
||||||
await review();
|
|
||||||
expect(text("confirm-amount")).toBe("0.5000 ETH");
|
|
||||||
|
|
||||||
await signAndSend();
|
|
||||||
expect(text("wait-tx-summary")).toBe("0.5000 ETH");
|
|
||||||
expect(broadcastTx().value).toBe(parseEther("0.5"));
|
|
||||||
});
|
|
||||||
|
|
||||||
// Send accepts both. The approval screen writes the same value `0.5000`.
|
|
||||||
test.each([".5", "00.5"])("for an amount typed as %s", async (typed) => {
|
|
||||||
await openSend("ETH");
|
|
||||||
el("send-amount").value = typed;
|
|
||||||
await review();
|
|
||||||
expect(text("confirm-amount")).toBe("0.5000 ETH");
|
|
||||||
|
|
||||||
await signAndSend();
|
|
||||||
expect(text("wait-tx-summary")).toBe("0.5000 ETH");
|
|
||||||
expect(broadcastTx().value).toBe(parseEther("0.5"));
|
|
||||||
});
|
|
||||||
|
|
||||||
test("for a token amount typed as .5", async () => {
|
|
||||||
// 100 TOK.
|
|
||||||
await openSend(TOKEN, 100000000n);
|
|
||||||
el("send-amount").value = ".5";
|
|
||||||
await review();
|
|
||||||
expect(text("confirm-amount")).toBe("0.5000 TOK");
|
|
||||||
|
|
||||||
await signAndSend();
|
|
||||||
expect(text("wait-tx-summary")).toBe("0.5000 TOK");
|
|
||||||
const [, amount] = transferIface.decodeFunctionData(
|
|
||||||
"transfer",
|
|
||||||
broadcastTx().data,
|
|
||||||
);
|
|
||||||
expect(amount).toBe(500000n);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("for a Max amount with many decimals", async () => {
|
|
||||||
await openSend("ETH");
|
|
||||||
await el("btn-send-max").handlers.get("click")();
|
|
||||||
// The balance minus 21000 gas at 20 gwei.
|
|
||||||
expect(el("send-amount").value).toBe("1.234147890123456789");
|
|
||||||
await review();
|
|
||||||
expect(text("confirm-amount")).toBe("1.2341 ETH");
|
|
||||||
|
|
||||||
await signAndSend();
|
|
||||||
expect(text("wait-tx-summary")).toBe("1.2341 ETH");
|
|
||||||
expect(broadcastTx().value).toBe(BALANCE_WEI - 21000n * 20n * GWEI);
|
|
||||||
});
|
|
||||||
|
|
||||||
// Cut to four decimals it would read 0.0000, so it is shown to its first
|
|
||||||
// significant digit instead, and signed in full.
|
|
||||||
test("for a tiny nonzero amount", async () => {
|
|
||||||
await openSend("ETH");
|
|
||||||
el("send-amount").value = "0.000012345";
|
|
||||||
await review();
|
|
||||||
expect(text("confirm-amount")).toBe("0.00001 ETH");
|
|
||||||
|
|
||||||
await signAndSend();
|
|
||||||
expect(text("wait-tx-summary")).toBe("0.00001 ETH");
|
|
||||||
expect(broadcastTx().value).toBe(parseEther("0.000012345"));
|
|
||||||
});
|
|
||||||
|
|
||||||
test("for a token amount", async () => {
|
|
||||||
// 100 TOK.
|
|
||||||
await openSend(TOKEN, 100000000n);
|
|
||||||
el("send-amount").value = "12.345678";
|
|
||||||
await review();
|
|
||||||
expect(text("confirm-amount")).toBe("12.3456 TOK");
|
|
||||||
|
|
||||||
await signAndSend();
|
|
||||||
expect(text("wait-tx-summary")).toBe("12.3456 TOK");
|
|
||||||
const tx = broadcastTx();
|
|
||||||
expect(tx.to).toBe(getAddress(TOKEN));
|
|
||||||
const [to, amount] = transferIface.decodeFunctionData(
|
|
||||||
"transfer",
|
|
||||||
tx.data,
|
|
||||||
);
|
|
||||||
expect(to).toBe(RECIPIENT);
|
|
||||||
expect(amount).toBe(12345678n);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("on the success screen", async () => {
|
|
||||||
await openSend("ETH");
|
|
||||||
el("send-amount").value = "0.5";
|
|
||||||
await review();
|
|
||||||
await signAndSend();
|
|
||||||
// A popup opened later resumes the wait, and the receipt is there.
|
|
||||||
mockNode.receipt = { blockNumber: 21000000 };
|
|
||||||
txStatus.restoreWait();
|
|
||||||
await settle();
|
|
||||||
expect(state.currentView).toBe("success-tx");
|
|
||||||
expect(text("success-tx-summary")).toBe("0.5000 ETH");
|
|
||||||
});
|
|
||||||
|
|
||||||
test("on the error screen", async () => {
|
|
||||||
await openSend("ETH");
|
|
||||||
el("send-amount").value = "0.5";
|
|
||||||
await review();
|
|
||||||
mockNode.broadcastError = new Error("the node refused it");
|
|
||||||
await signAndSend();
|
|
||||||
expect(state.currentView).toBe("error-tx");
|
|
||||||
expect(text("error-tx-summary")).toBe("0.5000 ETH");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -11,115 +11,20 @@
|
|||||||
//
|
//
|
||||||
// The check is driven here with a fake connected signer rather than a real
|
// The check is driven here with a fake connected signer rather than a real
|
||||||
// one: populateTransaction() returns the fees the node would have produced,
|
// one: populateTransaction() returns the fees the node would have produced,
|
||||||
// and sendTransaction() records whether the send actually happened.
|
// and sendTransaction() records whether the send actually happened. The real
|
||||||
//
|
// DOM path around it — reading the fee error into the reserved errors box — is
|
||||||
// The last test drives the real confirmation screen instead, with only the
|
// covered by the Chrome e2e suite.
|
||||||
// node and the DOM stubbed: a gas limit over its own bound at an ordinary fee
|
|
||||||
// is refused in the same box as a fee over the bound
|
|
||||||
// (https://git.eeqj.de/sneak/AutistMask/issues/583). That the box moves
|
|
||||||
// nothing on the screen is checked by the Chrome e2e suite.
|
|
||||||
|
|
||||||
// What the stub node quotes for that test: a gas limit of 150,000,000 at a
|
globalThis.chrome = {
|
||||||
// maximum fee of 2 gwei per gas, 0.3 ETH in all. And the signed transactions
|
storage: { local: { get: async () => ({}), set: async () => {} } },
|
||||||
// it was handed.
|
|
||||||
const mockNode = {
|
|
||||||
gasLimit: 150000000n,
|
|
||||||
maxFeePerGas: 2000000000n,
|
|
||||||
broadcast: [],
|
|
||||||
};
|
};
|
||||||
|
|
||||||
jest.mock("ethers", () => {
|
|
||||||
const actual = jest.requireActual("ethers");
|
|
||||||
class StubProvider {
|
|
||||||
constructor(url, network) {
|
|
||||||
this.network = network;
|
|
||||||
}
|
|
||||||
async getNetwork() {
|
|
||||||
return this.network;
|
|
||||||
}
|
|
||||||
async getBalance() {
|
|
||||||
return actual.parseEther("5");
|
|
||||||
}
|
|
||||||
async getCode() {
|
|
||||||
return "0x";
|
|
||||||
}
|
|
||||||
async getTransactionCount() {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
async getFeeData() {
|
|
||||||
return {
|
|
||||||
maxFeePerGas: mockNode.maxFeePerGas,
|
|
||||||
maxPriorityFeePerGas: 1000000000n,
|
|
||||||
gasPrice: 1000000000n,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
async estimateGas() {
|
|
||||||
return mockNode.gasLimit;
|
|
||||||
}
|
|
||||||
async broadcastTransaction(signed) {
|
|
||||||
mockNode.broadcast.push(signed);
|
|
||||||
return { hash: "0x" + "ab".repeat(32) };
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return { ...actual, JsonRpcProvider: StubProvider };
|
|
||||||
});
|
|
||||||
|
|
||||||
// The screens a send that was not refused goes on to.
|
|
||||||
jest.mock("../src/popup/views/txStatus", () => ({
|
|
||||||
showWait: jest.fn(),
|
|
||||||
showError: jest.fn(),
|
|
||||||
}));
|
|
||||||
|
|
||||||
const { makeStorageStub } = require("./support/storageStub");
|
|
||||||
global.chrome = { storage: makeStorageStub(), runtime: { sendMessage() {} } };
|
|
||||||
|
|
||||||
global.fetch = jest.fn(() => {
|
global.fetch = jest.fn(() => {
|
||||||
throw new Error("tests must not perform network requests");
|
throw new Error("tests must not perform network requests");
|
||||||
});
|
});
|
||||||
|
|
||||||
// A stub DOM: every id resolves to a recording element.
|
const { populateVerifyAndSend } = require("../src/popup/views/confirmTx");
|
||||||
const elements = new Map();
|
|
||||||
|
|
||||||
function makeEl(id) {
|
|
||||||
const handlers = new Map();
|
|
||||||
return {
|
|
||||||
id,
|
|
||||||
textContent: "",
|
|
||||||
innerHTML: "",
|
|
||||||
value: "",
|
|
||||||
disabled: false,
|
|
||||||
style: {},
|
|
||||||
dataset: {},
|
|
||||||
classList: {
|
|
||||||
add() {},
|
|
||||||
remove() {},
|
|
||||||
toggle() {},
|
|
||||||
contains: () => false,
|
|
||||||
},
|
|
||||||
handlers,
|
|
||||||
addEventListener(name, fn) {
|
|
||||||
handlers.set(name, fn);
|
|
||||||
},
|
|
||||||
querySelectorAll: () => [],
|
|
||||||
remove() {},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
global.document = {
|
|
||||||
getElementById(id) {
|
|
||||||
if (!elements.has(id)) elements.set(id, makeEl(id));
|
|
||||||
return elements.get(id);
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
const { Wallet } = require("ethers");
|
|
||||||
const { encryptWithPassword } = require("../src/shared/vault");
|
|
||||||
const { state, loadState } = require("../src/shared/state");
|
|
||||||
const txStatus = require("../src/popup/views/txStatus");
|
|
||||||
const confirmTx = require("../src/popup/views/confirmTx");
|
|
||||||
const { populateVerifyAndSend } = confirmTx;
|
|
||||||
const {
|
const {
|
||||||
MAX_GAS_LIMIT,
|
|
||||||
MAX_FEE_PER_GAS,
|
MAX_FEE_PER_GAS,
|
||||||
MAX_TOTAL_FEE,
|
MAX_TOTAL_FEE,
|
||||||
} = require("../src/shared/approvalVerify");
|
} = require("../src/shared/approvalVerify");
|
||||||
@@ -193,69 +98,3 @@ describe("populateVerifyAndSend enforces the combined fee bound", () => {
|
|||||||
expect(signer.sent[0].gasLimit).toBe(under.gasLimit);
|
expect(signer.sent[0].gasLimit).toBe(under.gasLimit);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("Sign & Send on the confirmation screen", () => {
|
|
||||||
const PRIVATE_KEY = "0x" + "11".repeat(32);
|
|
||||||
const PASSWORD = "correct horse battery staple";
|
|
||||||
let encryptedSecret;
|
|
||||||
|
|
||||||
beforeAll(async () => {
|
|
||||||
await loadState();
|
|
||||||
encryptedSecret = await encryptWithPassword(PRIVATE_KEY, PASSWORD);
|
|
||||||
});
|
|
||||||
|
|
||||||
function el(id) {
|
|
||||||
return global.document.getElementById(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
function shown(id) {
|
|
||||||
return el(id).style.visibility === "visible";
|
|
||||||
}
|
|
||||||
|
|
||||||
// show() reads the balance and estimates the fee without awaiting
|
|
||||||
// either; this lets both finish.
|
|
||||||
async function settle() {
|
|
||||||
for (let i = 0; i < 10; i++) await new Promise((r) => setTimeout(r, 0));
|
|
||||||
}
|
|
||||||
|
|
||||||
test("refuses a gas limit over its bound at an ordinary fee in the box for a refused gas limit or fee, and sends nothing", async () => {
|
|
||||||
expect(mockNode.gasLimit).toBeGreaterThan(MAX_GAS_LIMIT);
|
|
||||||
expect(mockNode.gasLimit * mockNode.maxFeePerGas).toBeLessThan(
|
|
||||||
MAX_TOTAL_FEE,
|
|
||||||
);
|
|
||||||
|
|
||||||
const from = new Wallet(PRIVATE_KEY).address;
|
|
||||||
state.wallets = [
|
|
||||||
{
|
|
||||||
type: "key",
|
|
||||||
name: "Wallet 1",
|
|
||||||
encryptedSecret,
|
|
||||||
addresses: [{ address: from }],
|
|
||||||
},
|
|
||||||
];
|
|
||||||
state.selectedWallet = 0;
|
|
||||||
state.selectedAddress = 0;
|
|
||||||
confirmTx.init({});
|
|
||||||
confirmTx.show({
|
|
||||||
from,
|
|
||||||
to: RECIPIENT,
|
|
||||||
ensName: null,
|
|
||||||
amount: "1",
|
|
||||||
token: "ETH",
|
|
||||||
tokenSymbol: null,
|
|
||||||
tokenDecimals: null,
|
|
||||||
max: false,
|
|
||||||
});
|
|
||||||
await settle();
|
|
||||||
expect(el("btn-confirm-send").disabled).toBe(false);
|
|
||||||
expect(shown("confirm-fee-bound-error")).toBe(false);
|
|
||||||
|
|
||||||
el("confirm-tx-password").value = PASSWORD;
|
|
||||||
await el("btn-confirm-send").handlers.get("click")();
|
|
||||||
|
|
||||||
expect(shown("confirm-fee-bound-error")).toBe(true);
|
|
||||||
expect(mockNode.broadcast).toEqual([]);
|
|
||||||
expect(txStatus.showWait).not.toHaveBeenCalled();
|
|
||||||
expect(txStatus.showError).not.toHaveBeenCalled();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|||||||
@@ -1,221 +0,0 @@
|
|||||||
// A late answer for a confirmation screen the user has left changes nothing on
|
|
||||||
// the screen shown since (https://git.eeqj.de/sneak/AutistMask/issues/575).
|
|
||||||
//
|
|
||||||
// The confirmation screen asks the node and the explorer about its transaction
|
|
||||||
// without waiting for the answers: the recipient checks, which can show three
|
|
||||||
// warning boxes, the balance read and the fee estimate. Back, a new recipient
|
|
||||||
// and Review again show the screen for another transaction while those
|
|
||||||
// questions may still be open. The recipient checks showed their boxes
|
|
||||||
// whenever they answered, so a box about the first recipient could appear on
|
|
||||||
// the second recipient's screen.
|
|
||||||
//
|
|
||||||
// Driven through the real confirmation screen, with only the node, the
|
|
||||||
// explorer and the DOM stubbed. Each test holds back the first screen's answer
|
|
||||||
// to one question, and gives it once the screen it tests is shown.
|
|
||||||
|
|
||||||
"use strict";
|
|
||||||
|
|
||||||
// The From address of every transaction here. The jest.mock() factory below
|
|
||||||
// may only name outside variables whose names start with "mock".
|
|
||||||
const mockFrom = "0x66133E8ea0f5D1d612D2502a968757D1048c214a";
|
|
||||||
|
|
||||||
jest.mock("ethers", () => {
|
|
||||||
const actual = jest.requireActual("ethers");
|
|
||||||
// Every answer is a mock, so a test can hold one back. Every address has
|
|
||||||
// sent one transaction and has no code, and only the From address holds
|
|
||||||
// anything: 5 ETH.
|
|
||||||
class StubProvider {}
|
|
||||||
Object.assign(StubProvider.prototype, {
|
|
||||||
getBalance: jest.fn(async (address) =>
|
|
||||||
address === mockFrom ? actual.parseEther("5") : 0n,
|
|
||||||
),
|
|
||||||
getCode: jest.fn(async () => "0x"),
|
|
||||||
getTransactionCount: jest.fn(async () => 1),
|
|
||||||
// 10 gwei expected, 20 gwei reserved per gas.
|
|
||||||
getFeeData: jest.fn(async () => ({
|
|
||||||
maxFeePerGas: 20000000000n,
|
|
||||||
maxPriorityFeePerGas: 1000000000n,
|
|
||||||
gasPrice: 10000000000n,
|
|
||||||
})),
|
|
||||||
estimateGas: jest.fn(async () => 21000n),
|
|
||||||
});
|
|
||||||
return { ...actual, JsonRpcProvider: StubProvider };
|
|
||||||
});
|
|
||||||
|
|
||||||
// An explorer address page whose title is `title`.
|
|
||||||
function explorerPage(title) {
|
|
||||||
return { ok: true, text: async () => "<title>" + title + "</title>" };
|
|
||||||
}
|
|
||||||
|
|
||||||
// The explorer labels no address.
|
|
||||||
global.fetch = jest.fn(async () => explorerPage("Etherscan"));
|
|
||||||
|
|
||||||
const { makeStorageStub } = require("./support/storageStub");
|
|
||||||
global.chrome = { storage: makeStorageStub(), runtime: { sendMessage() {} } };
|
|
||||||
|
|
||||||
// A stub DOM: every id resolves to a recording element.
|
|
||||||
const elements = new Map();
|
|
||||||
|
|
||||||
function makeEl(id) {
|
|
||||||
return {
|
|
||||||
id,
|
|
||||||
textContent: "",
|
|
||||||
innerHTML: "",
|
|
||||||
value: "",
|
|
||||||
disabled: false,
|
|
||||||
style: {},
|
|
||||||
dataset: {},
|
|
||||||
classList: {
|
|
||||||
add() {},
|
|
||||||
remove() {},
|
|
||||||
toggle() {},
|
|
||||||
contains: () => false,
|
|
||||||
},
|
|
||||||
addEventListener() {},
|
|
||||||
querySelectorAll: () => [],
|
|
||||||
remove() {},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
global.document = {
|
|
||||||
getElementById(id) {
|
|
||||||
if (!elements.has(id)) elements.set(id, makeEl(id));
|
|
||||||
return elements.get(id);
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
const { JsonRpcProvider, parseEther } = require("ethers");
|
|
||||||
const { loadState } = require("../src/shared/state");
|
|
||||||
const confirmTx = require("../src/popup/views/confirmTx");
|
|
||||||
|
|
||||||
const node = JsonRpcProvider.prototype;
|
|
||||||
const FIRST = "0xC0FfEE0000000000000000000000000000c0fFEe";
|
|
||||||
const SECOND = "0xE2E0000000000000000000000000000000000E2e";
|
|
||||||
|
|
||||||
function el(id) {
|
|
||||||
return global.document.getElementById(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
function shown(id) {
|
|
||||||
return el(id).style.visibility === "visible";
|
|
||||||
}
|
|
||||||
|
|
||||||
// Show the confirmation screen for 1 ETH to `to` on mainnet, as Review on the
|
|
||||||
// Send screen does.
|
|
||||||
function review(to) {
|
|
||||||
confirmTx.show({
|
|
||||||
from: mockFrom,
|
|
||||||
to,
|
|
||||||
ensName: null,
|
|
||||||
amount: "1",
|
|
||||||
token: "ETH",
|
|
||||||
tokenSymbol: null,
|
|
||||||
tokenDecimals: null,
|
|
||||||
max: false,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// show() does not wait for its questions; this lets every answer not held
|
|
||||||
// back arrive.
|
|
||||||
async function settle() {
|
|
||||||
for (let i = 0; i < 10; i++) await new Promise((r) => setTimeout(r, 0));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Hold back the next answer `question` gives. Returns the function that gives
|
|
||||||
// it.
|
|
||||||
function holdNextAnswer(question) {
|
|
||||||
let give;
|
|
||||||
question.mockImplementationOnce(() => new Promise((r) => (give = r)));
|
|
||||||
return (answer) => give(answer);
|
|
||||||
}
|
|
||||||
|
|
||||||
beforeAll(async () => {
|
|
||||||
await loadState();
|
|
||||||
});
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
elements.clear();
|
|
||||||
});
|
|
||||||
|
|
||||||
// The three boxes the recipient checks show, each with the question whose
|
|
||||||
// answer shows it for FIRST, and that answer. FIRST holds no ETH, so the
|
|
||||||
// answer that it has sent no transaction is what shows the box saying so.
|
|
||||||
describe.each([
|
|
||||||
{
|
|
||||||
box: "confirm-contract-warning",
|
|
||||||
question: node.getCode,
|
|
||||||
answer: "0x6080604052",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
box: "confirm-recipient-warning",
|
|
||||||
question: node.getTransactionCount,
|
|
||||||
answer: 0,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
box: "confirm-etherscan-warning",
|
|
||||||
question: global.fetch,
|
|
||||||
answer: explorerPage(
|
|
||||||
"Fake_Phishing1 | Address: " + FIRST + " | Etherscan",
|
|
||||||
),
|
|
||||||
},
|
|
||||||
])("the $box box", ({ box, question, answer }) => {
|
|
||||||
test("is shown when the answer about the recipient arrives while its screen is shown", async () => {
|
|
||||||
const give = holdNextAnswer(question);
|
|
||||||
review(FIRST);
|
|
||||||
await settle();
|
|
||||||
expect(shown(box)).toBe(false);
|
|
||||||
|
|
||||||
give(answer);
|
|
||||||
await settle();
|
|
||||||
expect(shown(box)).toBe(true);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("is not shown on the next recipient's screen when the answer about the first arrives after that screen is shown", async () => {
|
|
||||||
const give = holdNextAnswer(question);
|
|
||||||
review(FIRST);
|
|
||||||
await settle();
|
|
||||||
review(SECOND);
|
|
||||||
await settle();
|
|
||||||
expect(shown(box)).toBe(false);
|
|
||||||
|
|
||||||
give(answer);
|
|
||||||
await settle();
|
|
||||||
expect(shown(box)).toBe(false);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
test("a balance read answered after the next screen is shown leaves that screen's balance and balance check as they are", async () => {
|
|
||||||
const give = holdNextAnswer(node.getBalance);
|
|
||||||
review(FIRST);
|
|
||||||
await settle();
|
|
||||||
review(SECOND);
|
|
||||||
await settle();
|
|
||||||
expect(el("confirm-balance").textContent).toBe("5.0000 ETH");
|
|
||||||
|
|
||||||
give(parseEther("0.5"));
|
|
||||||
await settle();
|
|
||||||
expect(el("confirm-balance").textContent).toBe("5.0000 ETH");
|
|
||||||
expect(shown("confirm-balance-error")).toBe(false);
|
|
||||||
expect(el("btn-confirm-send").disabled).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("a fee estimate answered after the next screen is shown leaves that screen's fee as it is", async () => {
|
|
||||||
const give = holdNextAnswer(node.getFeeData);
|
|
||||||
review(FIRST);
|
|
||||||
await settle();
|
|
||||||
review(SECOND);
|
|
||||||
await settle();
|
|
||||||
expect(el("confirm-fee-amount").textContent).toBe("~0.0002 ETH");
|
|
||||||
|
|
||||||
// 100 times the fee the second screen was quoted.
|
|
||||||
give({
|
|
||||||
maxFeePerGas: 2000000000000n,
|
|
||||||
maxPriorityFeePerGas: 100000000000n,
|
|
||||||
gasPrice: 1000000000000n,
|
|
||||||
});
|
|
||||||
await settle();
|
|
||||||
expect(el("confirm-fee-amount").textContent).toBe("~0.0002 ETH");
|
|
||||||
expect(el("confirm-fee-reserve").textContent).toBe(
|
|
||||||
"up to 0.0004 ETH reserved",
|
|
||||||
);
|
|
||||||
});
|
|
||||||
@@ -7,85 +7,25 @@
|
|||||||
// reviewed on Sepolia went out as 1 ETH on mainnet once mainnet was chosen in
|
// reviewed on Sepolia went out as 1 ETH on mainnet once mainnet was chosen in
|
||||||
// Settings in between.
|
// Settings in between.
|
||||||
//
|
//
|
||||||
// The same holds when the popup was closed after the switch and reopened, and
|
|
||||||
// Back drew the screen again from the transaction it saved
|
|
||||||
// (https://git.eeqj.de/sneak/AutistMask/issues/586): the screen was drawn for
|
|
||||||
// the new network, and Sign & Send sent the reviewed transfer there. Drawn
|
|
||||||
// again, the screen describes the transaction entirely on the network it was
|
|
||||||
// reviewed for, because choosing that network again in Settings and pressing
|
|
||||||
// Back only unhides it, and Sign & Send then sends from it.
|
|
||||||
//
|
|
||||||
// Its balance line and balance check are that network's balance, read from
|
|
||||||
// that network's node each time the screen is drawn
|
|
||||||
// (https://git.eeqj.de/sneak/AutistMask/issues/558), not the balance Send
|
|
||||||
// handed over. The fee estimate after the read stays on that network when
|
|
||||||
// the network is switched while the read runs.
|
|
||||||
//
|
|
||||||
// Driven through the real confirmation screen, signer and chain switch, with
|
// Driven through the real confirmation screen, signer and chain switch, with
|
||||||
// only the node, fetch and the DOM stubbed. The stub node is on the network
|
// only the node and the DOM stubbed. The stub node is on the network its
|
||||||
// its provider was built for, so a broadcast records the network it went to,
|
// provider was built for, so a broadcast records the network it went to.
|
||||||
// and a balance read answers with that network's balance.
|
|
||||||
|
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
// The questions the stub node was asked for the balance, the fee and the
|
// The signed transactions the stub node was handed, with its network's chain id.
|
||||||
// recipient checks, by method, network name and RPC URL, in order. The
|
const mockNode = { broadcast: [] };
|
||||||
// balances it reports on each network, by network name: ETH in wei and the
|
|
||||||
// token in its base units. The signed transactions it was handed, with its
|
|
||||||
// network's chain id and RPC URL. And whether it quotes fees as a network
|
|
||||||
// with no type-2 pricing does.
|
|
||||||
const mockNode = {
|
|
||||||
asked: [],
|
|
||||||
balanceWei: {},
|
|
||||||
tokenUnits: {},
|
|
||||||
broadcast: [],
|
|
||||||
legacyFees: false,
|
|
||||||
};
|
|
||||||
|
|
||||||
jest.mock("ethers", () => {
|
jest.mock("ethers", () => {
|
||||||
const actual = jest.requireActual("ethers");
|
const actual = jest.requireActual("ethers");
|
||||||
// The selector of balanceOf(address).
|
|
||||||
const BALANCE_OF = "0x70a08231";
|
|
||||||
class StubProvider {
|
class StubProvider {
|
||||||
constructor(url, network) {
|
constructor(url, network) {
|
||||||
this.url = url;
|
|
||||||
this.network = network;
|
this.network = network;
|
||||||
}
|
}
|
||||||
record(method) {
|
|
||||||
mockNode.asked.push({
|
|
||||||
method,
|
|
||||||
network: this.network.name,
|
|
||||||
url: this.url,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
async getNetwork() {
|
async getNetwork() {
|
||||||
return this.network;
|
return this.network;
|
||||||
}
|
}
|
||||||
async getBalance() {
|
|
||||||
this.record("getBalance");
|
|
||||||
return mockNode.balanceWei[this.network.name];
|
|
||||||
}
|
|
||||||
// balanceOf() is the one contract call the screen makes before Sign
|
|
||||||
// & Send.
|
|
||||||
async call(tx) {
|
|
||||||
if (!tx.data.startsWith(BALANCE_OF)) {
|
|
||||||
throw new Error("the stub node answers only balanceOf()");
|
|
||||||
}
|
|
||||||
this.record("balanceOf");
|
|
||||||
return actual.AbiCoder.defaultAbiCoder().encode(
|
|
||||||
["uint256"],
|
|
||||||
[mockNode.tokenUnits[this.network.name]],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
async getFeeData() {
|
async getFeeData() {
|
||||||
this.record("getFeeData");
|
|
||||||
if (mockNode.legacyFees) {
|
|
||||||
return {
|
|
||||||
maxFeePerGas: null,
|
|
||||||
maxPriorityFeePerGas: null,
|
|
||||||
gasPrice: 10000000000n,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
return {
|
return {
|
||||||
maxFeePerGas: 20000000000n,
|
maxFeePerGas: 20000000000n,
|
||||||
maxPriorityFeePerGas: 1000000000n,
|
maxPriorityFeePerGas: 1000000000n,
|
||||||
@@ -96,22 +36,16 @@ jest.mock("ethers", () => {
|
|||||||
return 21000n;
|
return 21000n;
|
||||||
}
|
}
|
||||||
async getCode() {
|
async getCode() {
|
||||||
this.record("getCode");
|
|
||||||
return "0x";
|
return "0x";
|
||||||
}
|
}
|
||||||
async getTransactionCount() {
|
async getTransactionCount() {
|
||||||
this.record("getTransactionCount");
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
async lookupAddress() {
|
async lookupAddress() {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
async broadcastTransaction(signed) {
|
async broadcastTransaction(signed) {
|
||||||
mockNode.broadcast.push({
|
mockNode.broadcast.push({ chainId: this.network.chainId, signed });
|
||||||
chainId: this.network.chainId,
|
|
||||||
url: this.url,
|
|
||||||
signed,
|
|
||||||
});
|
|
||||||
return { hash: "0x" + "ab".repeat(32) };
|
return { hash: "0x" + "ab".repeat(32) };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -141,8 +75,6 @@ jest.mock("../src/popup/views/txStatus", () => ({
|
|||||||
showError: jest.fn(),
|
showError: jest.fn(),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
// The Etherscan label check is its only caller here: the explorer pages it
|
|
||||||
// asks for are recorded, and nothing is fetched.
|
|
||||||
global.fetch = jest.fn(() => {
|
global.fetch = jest.fn(() => {
|
||||||
throw new Error("tests must not perform network requests");
|
throw new Error("tests must not perform network requests");
|
||||||
});
|
});
|
||||||
@@ -189,37 +121,19 @@ global.document = {
|
|||||||
body: { prepend() {}, appendChild() {} },
|
body: { prepend() {}, appendChild() {} },
|
||||||
addEventListener() {},
|
addEventListener() {},
|
||||||
};
|
};
|
||||||
global.navigator.clipboard = { writeText() {} };
|
global.navigator = { clipboard: { writeText() {} } };
|
||||||
|
|
||||||
const {
|
const { BaseWallet, Transaction, Wallet } = require("ethers");
|
||||||
BaseWallet,
|
|
||||||
JsonRpcProvider,
|
|
||||||
Transaction,
|
|
||||||
Wallet,
|
|
||||||
parseEther,
|
|
||||||
} = require("ethers");
|
|
||||||
const { encryptWithPassword } = require("../src/shared/vault");
|
const { encryptWithPassword } = require("../src/shared/vault");
|
||||||
const { state, loadState, saveState } = require("../src/shared/state");
|
const { state, loadState } = require("../src/shared/state");
|
||||||
const { onChainSwitch } = require("../src/shared/chainSwitch");
|
const { onChainSwitch } = require("../src/shared/chainSwitch");
|
||||||
const { NETWORKS } = require("../src/shared/networks");
|
const { NETWORKS } = require("../src/shared/networks");
|
||||||
const { prices } = require("../src/shared/prices");
|
|
||||||
const {
|
|
||||||
goBack,
|
|
||||||
pushCurrentView,
|
|
||||||
setBackRenderer,
|
|
||||||
showView,
|
|
||||||
} = require("../src/popup/views/helpers");
|
|
||||||
const {
|
|
||||||
makeBackRenderer,
|
|
||||||
resetRenderedViews,
|
|
||||||
} = require("../src/popup/viewRouter");
|
|
||||||
const txStatus = require("../src/popup/views/txStatus");
|
const txStatus = require("../src/popup/views/txStatus");
|
||||||
const confirmTx = require("../src/popup/views/confirmTx");
|
const confirmTx = require("../src/popup/views/confirmTx");
|
||||||
|
|
||||||
const PRIVATE_KEY = "0x" + "11".repeat(32);
|
const PRIVATE_KEY = "0x" + "11".repeat(32);
|
||||||
const HOLDER = new Wallet(PRIVATE_KEY).address;
|
const HOLDER = new Wallet(PRIVATE_KEY).address;
|
||||||
const RECIPIENT = "0xC0FfEE0000000000000000000000000000c0fFEe";
|
const RECIPIENT = "0xC0FfEE0000000000000000000000000000c0fFEe";
|
||||||
const TOKEN = "0x7070707070707070707070707070707070707070";
|
|
||||||
const PASSWORD = "correct horse battery staple";
|
const PASSWORD = "correct horse battery staple";
|
||||||
|
|
||||||
function el(id) {
|
function el(id) {
|
||||||
@@ -236,15 +150,7 @@ beforeAll(async () => {
|
|||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
elements.clear();
|
elements.clear();
|
||||||
mockNode.asked = [];
|
|
||||||
mockNode.balanceWei = {
|
|
||||||
mainnet: parseEther("5"),
|
|
||||||
sepolia: parseEther("5"),
|
|
||||||
};
|
|
||||||
mockNode.tokenUnits = { mainnet: 0n, sepolia: 0n };
|
|
||||||
mockNode.broadcast = [];
|
mockNode.broadcast = [];
|
||||||
mockNode.legacyFees = false;
|
|
||||||
global.fetch.mockClear();
|
|
||||||
txStatus.showWait.mockClear();
|
txStatus.showWait.mockClear();
|
||||||
txStatus.showError.mockClear();
|
txStatus.showError.mockClear();
|
||||||
signTransaction = jest.spyOn(BaseWallet.prototype, "signTransaction");
|
signTransaction = jest.spyOn(BaseWallet.prototype, "signTransaction");
|
||||||
@@ -254,22 +160,16 @@ afterEach(() => {
|
|||||||
signTransaction.mockRestore();
|
signTransaction.mockRestore();
|
||||||
});
|
});
|
||||||
|
|
||||||
// Show the confirmation screen for 1 of the native token on `networkId`, or
|
// Show the confirmation screen for 1 of the native token on `networkId`, as
|
||||||
// for the transfer `changes` makes of it, as Review on the Send screen does,
|
// Review on the Send screen does, with its fee estimate settled.
|
||||||
// with its balance read and its fee estimate settled.
|
async function review(networkId) {
|
||||||
async function review(networkId, changes = {}) {
|
|
||||||
await onChainSwitch(networkId);
|
await onChainSwitch(networkId);
|
||||||
await reviewOnActiveNetwork(changes);
|
|
||||||
}
|
|
||||||
|
|
||||||
// review() on the network already active, without switching to it again.
|
|
||||||
async function reviewOnActiveNetwork(changes = {}) {
|
|
||||||
state.wallets = [
|
state.wallets = [
|
||||||
{
|
{
|
||||||
type: "key",
|
type: "key",
|
||||||
name: "Wallet 1",
|
name: "Wallet 1",
|
||||||
encryptedSecret,
|
encryptedSecret,
|
||||||
addresses: [{ address: HOLDER }],
|
addresses: [{ address: HOLDER, balance: "5.0" }],
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
state.selectedWallet = 0;
|
state.selectedWallet = 0;
|
||||||
@@ -281,108 +181,15 @@ async function reviewOnActiveNetwork(changes = {}) {
|
|||||||
ensName: null,
|
ensName: null,
|
||||||
amount: "1",
|
amount: "1",
|
||||||
token: "ETH",
|
token: "ETH",
|
||||||
|
balance: "5.0",
|
||||||
tokenSymbol: null,
|
tokenSymbol: null,
|
||||||
|
tokenBalance: null,
|
||||||
tokenDecimals: null,
|
tokenDecimals: null,
|
||||||
max: false,
|
max: false,
|
||||||
...changes,
|
|
||||||
});
|
});
|
||||||
await settle();
|
|
||||||
}
|
|
||||||
|
|
||||||
// The user's own node for a network, set in Settings.
|
|
||||||
function ownNode(networkId) {
|
|
||||||
return "https://" + networkId + ".node.example.invalid";
|
|
||||||
}
|
|
||||||
|
|
||||||
// After review() on `reviewedOn`: the user's own node set for it, the Settings
|
|
||||||
// gear, `switchedTo` chosen there, the popup closed and reopened onto
|
|
||||||
// Settings, and Back, which draws the confirmation screen again from the
|
|
||||||
// transaction it saved. The reopened page holds an ETH price of $2,000 and a
|
|
||||||
// USDC price of $1 whichever network is active, so each USD value shows which
|
|
||||||
// network it was priced for.
|
|
||||||
async function switchReopenAndGoBack(reviewedOn, switchedTo) {
|
|
||||||
state.rpcUrl = ownNode(reviewedOn);
|
|
||||||
pushCurrentView();
|
|
||||||
showView("settings");
|
|
||||||
await onChainSwitch(switchedTo);
|
|
||||||
|
|
||||||
await loadState();
|
|
||||||
elements.clear();
|
|
||||||
resetRenderedViews();
|
|
||||||
setBackRenderer(makeBackRenderer(state, { confirmTx }));
|
|
||||||
confirmTx.init({});
|
|
||||||
prices.ETH = 2000;
|
|
||||||
prices.USDC = 1;
|
|
||||||
mockNode.asked = [];
|
|
||||||
global.fetch.mockClear();
|
|
||||||
goBack();
|
|
||||||
await settle();
|
|
||||||
}
|
|
||||||
|
|
||||||
// The USD value `text` as the screen appends it for `networkId`: nothing on a
|
|
||||||
// testnet, which has no USD values.
|
|
||||||
function usdOn(networkId, text) {
|
|
||||||
return NETWORKS[networkId].isTestnet ? "" : " (" + text + ")";
|
|
||||||
}
|
|
||||||
|
|
||||||
// The screen for the transfer review() shows by default, described on
|
|
||||||
// `networkId`: in its native currency, priced by it, linking to its explorer.
|
|
||||||
function expectNativeTransferOn(networkId) {
|
|
||||||
const { nativeCurrency: symbol, explorerUrl } = NETWORKS[networkId];
|
|
||||||
expect(el("confirm-type").textContent).toBe(
|
|
||||||
"Native " + symbol + " transfer",
|
|
||||||
);
|
|
||||||
expect(el("confirm-amount").textContent).toBe(
|
|
||||||
"1.0000 " + symbol + usdOn(networkId, "$2,000.00"),
|
|
||||||
);
|
|
||||||
expect(el("confirm-balance").textContent).toBe(
|
|
||||||
"5.0000 " + symbol + usdOn(networkId, "$10,000.00"),
|
|
||||||
);
|
|
||||||
expect(el("confirm-fee-amount").textContent).toBe(
|
|
||||||
"~0.0002 " + symbol + usdOn(networkId, "$0.42"),
|
|
||||||
);
|
|
||||||
expect(el("confirm-fee-reserve").textContent).toBe(
|
|
||||||
"up to 0.0004 " + symbol + " reserved",
|
|
||||||
);
|
|
||||||
expect(el("confirm-gas-error").textContent).toBe(
|
|
||||||
"You do not have enough " +
|
|
||||||
symbol +
|
|
||||||
" to pay the network fee for this transfer. Please add " +
|
|
||||||
symbol +
|
|
||||||
" to this address and try again.",
|
|
||||||
);
|
|
||||||
expect(el("confirm-recipient-warning").textContent).toContain(
|
|
||||||
" holds no " + symbol + ". ",
|
|
||||||
);
|
|
||||||
expect(el("confirm-contract-warning").textContent).toContain(
|
|
||||||
" Sending " + symbol + " or tokens ",
|
|
||||||
);
|
|
||||||
expect(el("confirm-from").innerHTML).toContain(
|
|
||||||
`href="${explorerUrl}/address/${HOLDER}"`,
|
|
||||||
);
|
|
||||||
expect(el("confirm-to").innerHTML).toContain(
|
|
||||||
`href="${explorerUrl}/address/${RECIPIENT}"`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// show() reads the balance and then estimates the fee, and checks the
|
|
||||||
// recipient, without awaiting any of them; this lets all of them finish.
|
|
||||||
async function settle() {
|
|
||||||
for (let i = 0; i < 10; i++) await new Promise((r) => setTimeout(r, 0));
|
for (let i = 0; i < 10; i++) await new Promise((r) => setTimeout(r, 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
function errors() {
|
|
||||||
return el("confirm-errors").innerHTML;
|
|
||||||
}
|
|
||||||
|
|
||||||
function shown(id) {
|
|
||||||
return el(id).style.visibility === "visible";
|
|
||||||
}
|
|
||||||
|
|
||||||
function sendDisabled() {
|
|
||||||
return el("btn-confirm-send").disabled;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function signAndSend() {
|
async function signAndSend() {
|
||||||
el("confirm-tx-password").value = PASSWORD;
|
el("confirm-tx-password").value = PASSWORD;
|
||||||
await el("btn-confirm-send").handlers.get("click")();
|
await el("btn-confirm-send").handlers.get("click")();
|
||||||
@@ -401,25 +208,6 @@ test("a transfer reviewed on Sepolia and sent goes out on Sepolia", async () =>
|
|||||||
expect(txStatus.showWait).toHaveBeenCalledTimes(1);
|
expect(txStatus.showWait).toHaveBeenCalledTimes(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Saving an RPC endpoint in Settings (src/popup/views/settings.js) sets only
|
|
||||||
// state.rpcUrl: the endpoint remembered for the active network keeps its old
|
|
||||||
// value until the next switch away from it.
|
|
||||||
test("a transfer reviewed after the active network's RPC endpoint was changed in Settings asks the new endpoint", async () => {
|
|
||||||
const newNode = "https://new.node.example.invalid";
|
|
||||||
await onChainSwitch("sepolia");
|
|
||||||
state.rpcUrl = newNode;
|
|
||||||
await saveState();
|
|
||||||
|
|
||||||
await reviewOnActiveNetwork();
|
|
||||||
|
|
||||||
expect(mockNode.asked).toEqual([
|
|
||||||
{ method: "getBalance", network: "sepolia", url: newNode },
|
|
||||||
{ method: "getCode", network: "sepolia", url: newNode },
|
|
||||||
{ method: "getTransactionCount", network: "sepolia", url: newNode },
|
|
||||||
{ method: "getFeeData", network: "sepolia", url: newNode },
|
|
||||||
]);
|
|
||||||
});
|
|
||||||
|
|
||||||
describe.each([
|
describe.each([
|
||||||
["sepolia", "mainnet", "SepoliaETH"],
|
["sepolia", "mainnet", "SepoliaETH"],
|
||||||
["mainnet", "sepolia", "ETH"],
|
["mainnet", "sepolia", "ETH"],
|
||||||
@@ -440,219 +228,11 @@ describe.each([
|
|||||||
expect(mockNode.broadcast).toEqual([]);
|
expect(mockNode.broadcast).toEqual([]);
|
||||||
expect(txStatus.showWait).not.toHaveBeenCalled();
|
expect(txStatus.showWait).not.toHaveBeenCalled();
|
||||||
expect(txStatus.showError).not.toHaveBeenCalled();
|
expect(txStatus.showError).not.toHaveBeenCalled();
|
||||||
expect(shown("confirm-network-changed-error")).toBe(true);
|
expect(el("confirm-errors").style.visibility).toBe("visible");
|
||||||
expect(shown("confirm-fee-bound-error")).toBe(false);
|
expect(el("confirm-errors").innerHTML).toContain(
|
||||||
});
|
"The active network changed after this transaction was" +
|
||||||
},
|
" reviewed, so it was not sent. Please go back and review" +
|
||||||
);
|
" it again.",
|
||||||
|
|
||||||
describe.each([
|
|
||||||
["sepolia", "mainnet"],
|
|
||||||
["mainnet", "sepolia"],
|
|
||||||
])(
|
|
||||||
"a transfer reviewed on %s, with %s chosen in Settings, the popup reopened and Back pressed",
|
|
||||||
(reviewedOn, switchedTo) => {
|
|
||||||
const { nativeCurrency: symbol, explorerUrl } = NETWORKS[reviewedOn];
|
|
||||||
|
|
||||||
test("is described on the network it was reviewed for, and neither signed nor sent", async () => {
|
|
||||||
await review(reviewedOn);
|
|
||||||
await switchReopenAndGoBack(reviewedOn, switchedTo);
|
|
||||||
|
|
||||||
expect(state.currentView).toBe("confirm-tx");
|
|
||||||
expectNativeTransferOn(reviewedOn);
|
|
||||||
expect(mockNode.asked).toEqual([
|
|
||||||
{
|
|
||||||
method: "getBalance",
|
|
||||||
network: reviewedOn,
|
|
||||||
url: ownNode(reviewedOn),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
method: "getCode",
|
|
||||||
network: reviewedOn,
|
|
||||||
url: ownNode(reviewedOn),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
method: "getTransactionCount",
|
|
||||||
network: reviewedOn,
|
|
||||||
url: ownNode(reviewedOn),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
method: "getFeeData",
|
|
||||||
network: reviewedOn,
|
|
||||||
url: ownNode(reviewedOn),
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
expect(global.fetch.mock.calls.map(([url]) => url)).toEqual([
|
|
||||||
explorerUrl + "/address/" + RECIPIENT,
|
|
||||||
]);
|
|
||||||
expect(el("btn-confirm-send").disabled).toBe(false);
|
|
||||||
|
|
||||||
await signAndSend();
|
|
||||||
|
|
||||||
expect(signTransaction).not.toHaveBeenCalled();
|
|
||||||
expect(mockNode.broadcast).toEqual([]);
|
|
||||||
expect(txStatus.showWait).not.toHaveBeenCalled();
|
|
||||||
expect(txStatus.showError).not.toHaveBeenCalled();
|
|
||||||
expect(shown("confirm-network-changed-error")).toBe(true);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("is sent on that network, as described, once it is chosen in Settings again and Back pressed", async () => {
|
|
||||||
await review(reviewedOn);
|
|
||||||
await switchReopenAndGoBack(reviewedOn, switchedTo);
|
|
||||||
// The Settings gear, the reviewed network chosen, and Back, which
|
|
||||||
// only unhides the screen as it was drawn.
|
|
||||||
pushCurrentView();
|
|
||||||
showView("settings");
|
|
||||||
await onChainSwitch(reviewedOn);
|
|
||||||
goBack();
|
|
||||||
|
|
||||||
expect(state.currentView).toBe("confirm-tx");
|
|
||||||
expectNativeTransferOn(reviewedOn);
|
|
||||||
|
|
||||||
await signAndSend();
|
|
||||||
|
|
||||||
const chainId = BigInt(NETWORKS[reviewedOn].chainId);
|
|
||||||
expect(mockNode.broadcast).toHaveLength(1);
|
|
||||||
expect(mockNode.broadcast[0].chainId).toBe(chainId);
|
|
||||||
expect(mockNode.broadcast[0].url).toBe(ownNode(reviewedOn));
|
|
||||||
expect(Transaction.from(mockNode.broadcast[0].signed).chainId).toBe(
|
|
||||||
chainId,
|
|
||||||
);
|
|
||||||
expect(txStatus.showWait).toHaveBeenCalledTimes(1);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("for more than the balance, says so in that network's native currency", async () => {
|
|
||||||
await review(reviewedOn, { amount: "10" });
|
|
||||||
await switchReopenAndGoBack(reviewedOn, switchedTo);
|
|
||||||
|
|
||||||
expect(shown("confirm-balance-error")).toBe(true);
|
|
||||||
expect(el("confirm-balance-error").textContent).toBe(
|
|
||||||
"Your " +
|
|
||||||
symbol +
|
|
||||||
" balance does not cover this amount. Please go back and" +
|
|
||||||
" send a smaller amount.",
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("states and checks that network's balance as it is then, which no longer covers the send", async () => {
|
|
||||||
await review(reviewedOn);
|
|
||||||
expect(sendDisabled()).toBe(false);
|
|
||||||
mockNode.balanceWei = {
|
|
||||||
[reviewedOn]: parseEther("0.5"),
|
|
||||||
[switchedTo]: parseEther("5"),
|
|
||||||
};
|
|
||||||
await switchReopenAndGoBack(reviewedOn, switchedTo);
|
|
||||||
|
|
||||||
expect(el("confirm-balance").textContent).toBe(
|
|
||||||
"0.5000 " + symbol + usdOn(reviewedOn, "$1,000.00"),
|
|
||||||
);
|
|
||||||
expect(shown("confirm-balance-error")).toBe(true);
|
|
||||||
expect(sendDisabled()).toBe(true);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("states and checks that network's balance as it is then, which now covers the send, and refuses to send it", async () => {
|
|
||||||
mockNode.balanceWei[reviewedOn] = parseEther("0.5");
|
|
||||||
await review(reviewedOn);
|
|
||||||
expect(sendDisabled()).toBe(true);
|
|
||||||
mockNode.balanceWei = {
|
|
||||||
[reviewedOn]: parseEther("5"),
|
|
||||||
[switchedTo]: parseEther("0.5"),
|
|
||||||
};
|
|
||||||
await switchReopenAndGoBack(reviewedOn, switchedTo);
|
|
||||||
|
|
||||||
expect(el("confirm-balance").textContent).toBe(
|
|
||||||
"5.0000 " + symbol + usdOn(reviewedOn, "$10,000.00"),
|
|
||||||
);
|
|
||||||
expect(errors()).toBe("");
|
|
||||||
expect(shown("confirm-balance-error")).toBe(false);
|
|
||||||
expect(shown("confirm-amount-fee-error")).toBe(false);
|
|
||||||
expect(sendDisabled()).toBe(false);
|
|
||||||
|
|
||||||
await signAndSend();
|
|
||||||
|
|
||||||
expect(signTransaction).not.toHaveBeenCalled();
|
|
||||||
expect(mockNode.broadcast).toEqual([]);
|
|
||||||
expect(shown("confirm-network-changed-error")).toBe(true);
|
|
||||||
});
|
|
||||||
|
|
||||||
const tokenSend = {
|
|
||||||
token: TOKEN,
|
|
||||||
tokenSymbol: "TOK",
|
|
||||||
tokenDecimals: 6,
|
|
||||||
};
|
|
||||||
|
|
||||||
test("of a token, states and checks that network's token balance as it is then, which no longer covers the send", async () => {
|
|
||||||
mockNode.tokenUnits[reviewedOn] = 10000000n;
|
|
||||||
await review(reviewedOn, tokenSend);
|
|
||||||
expect(sendDisabled()).toBe(false);
|
|
||||||
mockNode.tokenUnits = {
|
|
||||||
[reviewedOn]: 500000n,
|
|
||||||
[switchedTo]: 10000000n,
|
|
||||||
};
|
|
||||||
await switchReopenAndGoBack(reviewedOn, switchedTo);
|
|
||||||
|
|
||||||
expect(el("confirm-balance").textContent).toBe("0.5000 TOK");
|
|
||||||
expect(shown("confirm-balance-error")).toBe(true);
|
|
||||||
expect(el("confirm-balance-error").textContent).toBe(
|
|
||||||
"Your TOK balance does not cover this amount. Please go back" +
|
|
||||||
" and send a smaller amount.",
|
|
||||||
);
|
|
||||||
expect(sendDisabled()).toBe(true);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("of a token, states and checks that network's token balance as it is then, which now covers the send, and refuses to send it", async () => {
|
|
||||||
await review(reviewedOn, tokenSend);
|
|
||||||
expect(sendDisabled()).toBe(true);
|
|
||||||
mockNode.tokenUnits = {
|
|
||||||
[reviewedOn]: 10000000n,
|
|
||||||
[switchedTo]: 0n,
|
|
||||||
};
|
|
||||||
await switchReopenAndGoBack(reviewedOn, switchedTo);
|
|
||||||
|
|
||||||
expect(el("confirm-balance").textContent).toBe("10.0000 TOK");
|
|
||||||
expect(errors()).toBe("");
|
|
||||||
expect(shown("confirm-balance-error")).toBe(false);
|
|
||||||
expect(shown("confirm-gas-error")).toBe(false);
|
|
||||||
expect(sendDisabled()).toBe(false);
|
|
||||||
|
|
||||||
await signAndSend();
|
|
||||||
|
|
||||||
expect(signTransaction).not.toHaveBeenCalled();
|
|
||||||
expect(mockNode.broadcast).toEqual([]);
|
|
||||||
expect(shown("confirm-network-changed-error")).toBe(true);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("with a fee quoted by a node with no type-2 pricing, shows the fee in that network's native currency and price", async () => {
|
|
||||||
await review(reviewedOn);
|
|
||||||
mockNode.legacyFees = true;
|
|
||||||
await switchReopenAndGoBack(reviewedOn, switchedTo);
|
|
||||||
|
|
||||||
expect(el("confirm-fee-amount").textContent).toBe(
|
|
||||||
"0.0002 " + symbol + usdOn(reviewedOn, "$0.42"),
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
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,
|
|
||||||
tokenSymbol: "USDC",
|
|
||||||
tokenDecimals: 6,
|
|
||||||
amount: "10",
|
|
||||||
});
|
|
||||||
await switchReopenAndGoBack(reviewedOn, switchedTo);
|
|
||||||
|
|
||||||
expect(el("confirm-type").textContent).toBe(
|
|
||||||
"ERC-20 token transfer (USDC)",
|
|
||||||
);
|
|
||||||
expect(el("confirm-token-contract").innerHTML).toContain(
|
|
||||||
`href="${explorerUrl}/address/${TOKEN}"`,
|
|
||||||
);
|
|
||||||
expect(el("confirm-amount").textContent).toBe(
|
|
||||||
"10.0000 USDC" + usdOn(reviewedOn, "$10.00"),
|
|
||||||
);
|
|
||||||
expect(el("confirm-balance").textContent).toBe(
|
|
||||||
"50.0000 USDC" + usdOn(reviewedOn, "$50.00"),
|
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@@ -677,101 +257,3 @@ test("the send is refused by a signer on another network's node", async () => {
|
|||||||
expect(signTransaction).not.toHaveBeenCalled();
|
expect(signTransaction).not.toHaveBeenCalled();
|
||||||
expect(mockNode.broadcast).toEqual([]);
|
expect(mockNode.broadcast).toEqual([]);
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("the balance read", () => {
|
|
||||||
test("leaves the balance line Loading... and Sign & Send disabled until it returns", async () => {
|
|
||||||
let answer;
|
|
||||||
const getBalance = jest
|
|
||||||
.spyOn(JsonRpcProvider.prototype, "getBalance")
|
|
||||||
.mockImplementationOnce(() => new Promise((r) => (answer = r)));
|
|
||||||
try {
|
|
||||||
await review("sepolia");
|
|
||||||
} finally {
|
|
||||||
getBalance.mockRestore();
|
|
||||||
}
|
|
||||||
expect(el("confirm-balance").textContent).toBe("Loading...");
|
|
||||||
expect(el("confirm-fee-amount").textContent).toBe("Estimating...");
|
|
||||||
expect(el("confirm-errors").style.visibility).toBe("hidden");
|
|
||||||
expect(shown("confirm-balance-error")).toBe(false);
|
|
||||||
expect(shown("confirm-balance-read-error")).toBe(false);
|
|
||||||
expect(sendDisabled()).toBe(true);
|
|
||||||
|
|
||||||
answer(parseEther("5"));
|
|
||||||
await settle();
|
|
||||||
expect(el("confirm-balance").textContent).toBe("5.0000 SepoliaETH");
|
|
||||||
expect(sendDisabled()).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
// The Chrome suite measures that nothing moves; this checks the message
|
|
||||||
// is already written, only hidden, before the read returns.
|
|
||||||
test("that finds the amount not covered only makes a message written before it visible", async () => {
|
|
||||||
let answer;
|
|
||||||
const getBalance = jest
|
|
||||||
.spyOn(JsonRpcProvider.prototype, "getBalance")
|
|
||||||
.mockImplementationOnce(() => new Promise((r) => (answer = r)));
|
|
||||||
try {
|
|
||||||
await review("sepolia");
|
|
||||||
} finally {
|
|
||||||
getBalance.mockRestore();
|
|
||||||
}
|
|
||||||
const message =
|
|
||||||
"Your SepoliaETH balance does not cover this amount. Please go" +
|
|
||||||
" back and send a smaller amount.";
|
|
||||||
expect(el("confirm-balance-error").textContent).toBe(message);
|
|
||||||
expect(shown("confirm-balance-error")).toBe(false);
|
|
||||||
|
|
||||||
answer(parseEther("0.5"));
|
|
||||||
await settle();
|
|
||||||
expect(el("confirm-balance-error").textContent).toBe(message);
|
|
||||||
expect(shown("confirm-balance-error")).toBe(true);
|
|
||||||
expect(errors()).toBe("");
|
|
||||||
expect(sendDisabled()).toBe(true);
|
|
||||||
});
|
|
||||||
|
|
||||||
// The fee is estimated once the read returns, after the switch, and still
|
|
||||||
// asks the node of the network the screen was drawn for.
|
|
||||||
test("still in flight when Sepolia is chosen in Settings leaves the balance and the fee on mainnet", async () => {
|
|
||||||
let answer;
|
|
||||||
const getBalance = jest
|
|
||||||
.spyOn(JsonRpcProvider.prototype, "getBalance")
|
|
||||||
.mockImplementationOnce(() => new Promise((r) => (answer = r)));
|
|
||||||
try {
|
|
||||||
await review("mainnet");
|
|
||||||
} finally {
|
|
||||||
getBalance.mockRestore();
|
|
||||||
}
|
|
||||||
const feeAskedOn = () =>
|
|
||||||
mockNode.asked
|
|
||||||
.filter((q) => q.method === "getFeeData")
|
|
||||||
.map((q) => q.network);
|
|
||||||
expect(feeAskedOn()).toEqual([]);
|
|
||||||
|
|
||||||
await onChainSwitch("sepolia");
|
|
||||||
answer(parseEther("5"));
|
|
||||||
await settle();
|
|
||||||
|
|
||||||
expect(feeAskedOn()).toEqual(["mainnet"]);
|
|
||||||
expect(el("confirm-balance").textContent).toBe("5.0000 ETH");
|
|
||||||
// 21000 gas at 10 gwei expected, at 20 gwei reserved.
|
|
||||||
expect(el("confirm-fee-amount").textContent).toBe("~0.0002 ETH");
|
|
||||||
expect(el("confirm-fee-reserve").textContent).toBe(
|
|
||||||
"up to 0.0004 ETH reserved",
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("that fails states the balance as unknown, not zero, and blocks sending", async () => {
|
|
||||||
const getBalance = jest
|
|
||||||
.spyOn(JsonRpcProvider.prototype, "getBalance")
|
|
||||||
.mockRejectedValueOnce(new Error("the node did not answer"));
|
|
||||||
try {
|
|
||||||
await review("sepolia");
|
|
||||||
} finally {
|
|
||||||
getBalance.mockRestore();
|
|
||||||
}
|
|
||||||
expect(el("confirm-balance").textContent).toBe("unknown (SepoliaETH)");
|
|
||||||
expect(shown("confirm-balance-read-error")).toBe(true);
|
|
||||||
expect(shown("confirm-balance-error")).toBe(false);
|
|
||||||
expect(errors()).toBe("");
|
|
||||||
expect(sendDisabled()).toBe(true);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|||||||
@@ -192,7 +192,6 @@ describe("the wait, success and error screens", () => {
|
|||||||
amount: "0.0000",
|
amount: "0.0000",
|
||||||
token: "ETH",
|
token: "ETH",
|
||||||
tokenSymbol: null,
|
tokenSymbol: null,
|
||||||
chainId: "0x1",
|
|
||||||
};
|
};
|
||||||
const transfer = { ...creation, to: RECIPIENT };
|
const transfer = { ...creation, to: RECIPIENT };
|
||||||
|
|
||||||
|
|||||||
@@ -101,7 +101,7 @@ describe("the flash line the message is shown in", () => {
|
|||||||
//
|
//
|
||||||
// The line cuts a message too long for it with an ellipsis (see
|
// The line cuts a message too long for it with an ellipsis (see
|
||||||
// showFlash() in src/popup/views/helpers.js). The assertions that
|
// showFlash() in src/popup/views/helpers.js). The assertions that
|
||||||
// measure that, in a real browser at the documented 396x600 popup, are
|
// measure that, in a real browser at the documented 360x600 popup, are
|
||||||
// "a rejected dust threshold shifts no layout (#233)" and "an over-long
|
// "a rejected dust threshold shifts no layout (#233)" and "an over-long
|
||||||
// flash message keeps to one line (#252)" in tests/e2e/run.js, run by
|
// flash message keeps to one line (#252)" in tests/e2e/run.js, run by
|
||||||
// make test-e2e. They are not in make check because REPO_POLICIES.md
|
// make test-e2e. They are not in make check because REPO_POLICIES.md
|
||||||
|
|||||||
+13
-30
@@ -226,9 +226,8 @@ const RPC_RESULTS = {
|
|||||||
// The "latest" block, which ethers' getFeeData() reads baseFeePerGas from
|
// The "latest" block, which ethers' getFeeData() reads baseFeePerGas from
|
||||||
// to derive maxFeePerGas. Without it every fee is a legacy gasPrice, the
|
// to derive maxFeePerGas. Without it every fee is a legacy gasPrice, the
|
||||||
// reserve and the estimate collapse to the same number, and the gate tests
|
// reserve and the estimate collapse to the same number, and the gate tests
|
||||||
// stop being able to distinguish them. opts.baseFeeWei replaces its base fee,
|
// stop being able to distinguish them.
|
||||||
// read at request time like every other fixture switch.
|
function latestBlock() {
|
||||||
function latestBlock(opts) {
|
|
||||||
return {
|
return {
|
||||||
hash: "0x" + "11".repeat(32),
|
hash: "0x" + "11".repeat(32),
|
||||||
parentHash: "0x" + "22".repeat(32),
|
parentHash: "0x" + "22".repeat(32),
|
||||||
@@ -240,26 +239,21 @@ function latestBlock(opts) {
|
|||||||
gasUsed: "0xf4240",
|
gasUsed: "0xf4240",
|
||||||
miner: STUB_COUNTERPARTY,
|
miner: STUB_COUNTERPARTY,
|
||||||
extraData: "0x",
|
extraData: "0x",
|
||||||
baseFeePerGas: opts.baseFeeWei || hex(BASE_FEE_WEI),
|
baseFeePerGas: hex(BASE_FEE_WEI),
|
||||||
transactions: [],
|
transactions: [],
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// keccak("decimals()")[0:4], and the same for symbol(), name() and
|
// keccak("decimals()")[0:4], and the same for symbol() and name().
|
||||||
// balanceOf(address).
|
|
||||||
const SELECTOR_DECIMALS = "0x313ce567";
|
const SELECTOR_DECIMALS = "0x313ce567";
|
||||||
const SELECTOR_SYMBOL = "0x95d89b41";
|
const SELECTOR_SYMBOL = "0x95d89b41";
|
||||||
const SELECTOR_NAME = "0x06fdde03";
|
const SELECTOR_NAME = "0x06fdde03";
|
||||||
const SELECTOR_BALANCE_OF = "0x70a08231";
|
|
||||||
|
|
||||||
// Every eth_call still answers with a zero word except decimals(), symbol(),
|
// Every eth_call still answers with a zero word except decimals(), symbol()
|
||||||
// name() and balanceOf() on the stub token. The wallet reads decimals() back
|
// and name() on the stub token. The wallet reads decimals() back at signing
|
||||||
// at signing time to compare with the scale the confirmation screen rendered
|
// time to compare with the scale the confirmation screen rendered (issue
|
||||||
// (issue #305). Adding the token by its contract address reads the first three
|
// #305). Adding the token by its contract address reads all three (issue
|
||||||
// (issue #295); symbol() and name() answer what the explorer reports for it.
|
// #295); symbol() and name() answer what the explorer reports for it.
|
||||||
// The confirmation screen reads balanceOf()
|
|
||||||
// (https://git.eeqj.de/sneak/AutistMask/issues/558), which answers the holding
|
|
||||||
// the explorer reports, or zero when no holding is seeded.
|
|
||||||
//
|
//
|
||||||
// opts.tokenDecimalsOverride is the lying contract: set it and decimals()
|
// opts.tokenDecimalsOverride is the lying contract: set it and decimals()
|
||||||
// answers something other than the value this same fixture reports through
|
// answers something other than the value this same fixture reports through
|
||||||
@@ -284,9 +278,6 @@ function ethCallResult(req, opts) {
|
|||||||
if (data.startsWith(SELECTOR_NAME)) {
|
if (data.startsWith(SELECTOR_NAME)) {
|
||||||
return abi.encode(["string"], [tokenObject(opts).name]);
|
return abi.encode(["string"], [tokenObject(opts).name]);
|
||||||
}
|
}
|
||||||
if (data.startsWith(SELECTOR_BALANCE_OF) && opts.seedTokenBalance) {
|
|
||||||
return word(tokenBalanceItems(opts)[0].value);
|
|
||||||
}
|
|
||||||
return ZERO_WORD;
|
return ZERO_WORD;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -429,10 +420,9 @@ const HOLD_MAX_MS = 30000;
|
|||||||
|
|
||||||
// Hold a reply open for as long as the test asks: until opts[name] is false.
|
// Hold a reply open for as long as the test asks: until opts[name] is false.
|
||||||
//
|
//
|
||||||
// The switch (holdBalance, holdGasEstimate, holdTransactionCount or
|
// The switch (holdGasEstimate, holdTransactionCount or holdBlockscout) is read
|
||||||
// holdBlockscout) is read here rather than captured, so a test flips it on the
|
// here rather than captured, so a test flips it on the same options object the
|
||||||
// same options object the route was registered with — the same pattern as
|
// route was registered with — the same pattern as seedTokenTransfer. This is
|
||||||
// seedTokenTransfer. This is
|
|
||||||
// the only way to observe a screen while its request is genuinely in flight;
|
// the only way to observe a screen while its request is genuinely in flight;
|
||||||
// sampling the screen and hoping to win a race against the network would
|
// sampling the screen and hoping to win a race against the network would
|
||||||
// assert nothing on a slow machine.
|
// assert nothing on a slow machine.
|
||||||
@@ -482,7 +472,7 @@ function rpcReply(req, opts, report) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
if (req.method === "eth_getBlockByNumber") {
|
if (req.method === "eth_getBlockByNumber") {
|
||||||
return Object.assign(envelope, { result: latestBlock(opts) });
|
return Object.assign(envelope, { result: latestBlock() });
|
||||||
}
|
}
|
||||||
// The end of the dApp transaction round trip: the raw signed transaction
|
// The end of the dApp transaction round trip: the raw signed transaction
|
||||||
// the background hands to the node. It is recorded verbatim so a test can
|
// the background hands to the node. It is recorded verbatim so a test can
|
||||||
@@ -567,9 +557,6 @@ async function handleRpc(route, postData, opts, report) {
|
|||||||
report("unstubbed request: POST " + route.request().url());
|
report("unstubbed request: POST " + route.request().url());
|
||||||
return route.abort();
|
return route.abort();
|
||||||
}
|
}
|
||||||
if (batch.some((req) => req.method === "eth_getBalance")) {
|
|
||||||
await awaitRelease(opts, "holdBalance", report);
|
|
||||||
}
|
|
||||||
if (batch.some((req) => req.method === "eth_estimateGas")) {
|
if (batch.some((req) => req.method === "eth_estimateGas")) {
|
||||||
await awaitRelease(opts, "holdGasEstimate", report);
|
await awaitRelease(opts, "holdGasEstimate", report);
|
||||||
}
|
}
|
||||||
@@ -626,12 +613,8 @@ function traceEnabled(raw) {
|
|||||||
* @param {string} [opts.ethBalanceWei] hex wei answered to eth_getBalance;
|
* @param {string} [opts.ethBalanceWei] hex wei answered to eth_getBalance;
|
||||||
* defaults to zero, which is what every test that predates the funded
|
* defaults to zero, which is what every test that predates the funded
|
||||||
* fixture expects.
|
* fixture expects.
|
||||||
* @param {string} [opts.baseFeeWei] hex wei answered as the latest block's
|
|
||||||
* baseFeePerGas; defaults to BASE_FEE_WEI. Read at request time.
|
|
||||||
* @param {boolean} [opts.failGasEstimate] answer eth_estimateGas with a
|
* @param {boolean} [opts.failGasEstimate] answer eth_estimateGas with a
|
||||||
* node-side refusal.
|
* node-side refusal.
|
||||||
* @param {boolean} [opts.holdBalance] hold every batch containing an
|
|
||||||
* eth_getBalance until this is cleared again.
|
|
||||||
* @param {boolean} [opts.holdGasEstimate] hold every batch containing an
|
* @param {boolean} [opts.holdGasEstimate] hold every batch containing an
|
||||||
* eth_estimateGas until this is cleared again.
|
* eth_estimateGas until this is cleared again.
|
||||||
* @param {boolean} [opts.holdTransactionCount] hold every batch containing an
|
* @param {boolean} [opts.holdTransactionCount] hold every batch containing an
|
||||||
|
|||||||
+44
-396
@@ -60,14 +60,6 @@ const TEST_TIMEOUT_MS = 120000;
|
|||||||
// trailing drain in main().
|
// trailing drain in main().
|
||||||
const TRAILING_WATCH_MS = 1500;
|
const TRAILING_WATCH_MS = 1500;
|
||||||
|
|
||||||
// The popup's size, as README gives it: `body` in src/popup/styles/main.css
|
|
||||||
// is 396px wide, and src/background/index.js opens an approval window at
|
|
||||||
// the same 396x600. Pages in this context otherwise get Playwright's
|
|
||||||
// 1280x720 default, where the page never scrolls sideways and a button
|
|
||||||
// below the popup's fold is still on screen, so a layout measured there
|
|
||||||
// passes whatever the page does.
|
|
||||||
const POPUP_VIEWPORT = { width: 396, height: 600 };
|
|
||||||
|
|
||||||
const tests = [];
|
const tests = [];
|
||||||
|
|
||||||
function test(name, fn) {
|
function test(name, fn) {
|
||||||
@@ -367,14 +359,11 @@ async function leaveTransactionDetail(page) {
|
|||||||
await openAddressDetail(page);
|
await openAddressDetail(page);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Back out to Home from wherever the previous test finished, and wait for the
|
// Back out to Home from wherever the previous test finished.
|
||||||
// save that navigation makes, so a test reading the stored stack next reads
|
|
||||||
// the one Home left.
|
|
||||||
async function goHome(page) {
|
async function goHome(page) {
|
||||||
await leaveTransactionDetail(page);
|
await leaveTransactionDetail(page);
|
||||||
await page.click("#btn-address-back");
|
await page.click("#btn-address-back");
|
||||||
await visible(page, "#view-main");
|
await visible(page, "#view-main");
|
||||||
await waitForPersisted(page, "currentView", "main", "back on Home");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// One field of the popup's state as it was actually persisted, read out of
|
// One field of the popup's state as it was actually persisted, read out of
|
||||||
@@ -1835,67 +1824,14 @@ test("the Settings assertions above all ran (#229)", async (env) => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
// ------------------------------------------------ testnet banner (#511)
|
|
||||||
|
|
||||||
// This suite runs a release build, so the red banner at the top reads
|
|
||||||
// "[TESTNET]" on Sepolia and is absent on mainnet. A network switch in
|
|
||||||
// Settings must change it while Settings is still on screen; it used to
|
|
||||||
// change only when the next screen came up
|
|
||||||
// (https://git.eeqj.de/sneak/AutistMask/issues/511).
|
|
||||||
|
|
||||||
// The banner's text, or null when there is none, once the switch to `net`
|
|
||||||
// has finished. The switch's flash is the last thing its handler does, and
|
|
||||||
// showView() clears the flash, so the banner read while that flash is up is
|
|
||||||
// the one the switch left on the screen it was made from.
|
|
||||||
async function bannerAfterSwitch(page, net) {
|
|
||||||
await page.waitForFunction(
|
|
||||||
(text) => document.getElementById("flash-msg").textContent === text,
|
|
||||||
"Switched to " + net.name + ".",
|
|
||||||
);
|
|
||||||
return page.evaluate(() => {
|
|
||||||
const banner = document.getElementById("debug-banner");
|
|
||||||
return {
|
|
||||||
text: banner === null ? null : banner.textContent,
|
|
||||||
onSettings: !document
|
|
||||||
.getElementById("view-settings")
|
|
||||||
.classList.contains("hidden"),
|
|
||||||
};
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
test("a network switch in Settings shows and removes the testnet banner at once (#511)", async (env) => {
|
|
||||||
const { mainnet, sepolia } = NETWORKS;
|
|
||||||
await openSettings(env.page);
|
|
||||||
assert(
|
|
||||||
(await env.page.locator("#debug-banner").count()) === 0,
|
|
||||||
"a banner is up on mainnet before the switch",
|
|
||||||
);
|
|
||||||
|
|
||||||
await env.page.selectOption("#settings-network", "sepolia");
|
|
||||||
let after = await bannerAfterSwitch(env.page, sepolia);
|
|
||||||
assert(after.onSettings, "Settings left the screen on the switch");
|
|
||||||
assert(
|
|
||||||
after.text === "[TESTNET]",
|
|
||||||
"after the switch to Sepolia, Settings shows the banner " +
|
|
||||||
JSON.stringify(after.text) +
|
|
||||||
', expected "[TESTNET]"',
|
|
||||||
);
|
|
||||||
|
|
||||||
await env.page.selectOption("#settings-network", "mainnet");
|
|
||||||
after = await bannerAfterSwitch(env.page, mainnet);
|
|
||||||
assert(after.onSettings, "Settings left the screen on the switch back");
|
|
||||||
assert(
|
|
||||||
after.text === null,
|
|
||||||
"after the switch back to mainnet, Settings still shows the banner " +
|
|
||||||
JSON.stringify(after.text),
|
|
||||||
);
|
|
||||||
|
|
||||||
await env.page.click("#btn-settings-back");
|
|
||||||
await visible(env.page, "#view-main");
|
|
||||||
});
|
|
||||||
|
|
||||||
// ------------------------------------------------ dust threshold (#233)
|
// ------------------------------------------------ dust threshold (#233)
|
||||||
|
|
||||||
|
// The popup size README documents the UI as designed for. Pages in this
|
||||||
|
// context otherwise get Playwright's 1280x720 default, at which the flash
|
||||||
|
// line has room for any plausible message and never wraps — measuring
|
||||||
|
// there would pass for every string and prove nothing.
|
||||||
|
const POPUP_VIEWPORT = { width: 360, height: 600 };
|
||||||
|
|
||||||
// Everything below the flash line that must not move when it fills, plus
|
// Everything below the flash line that must not move when it fills, plus
|
||||||
// the height of the line itself. Runs in the page.
|
// the height of the line itself. Runs in the page.
|
||||||
//
|
//
|
||||||
@@ -2144,7 +2080,7 @@ test("a password error moves nothing on any screen (#297)", async (env) => {
|
|||||||
|
|
||||||
// ------------------------------------------ add wallet Import button (#493)
|
// ------------------------------------------ add wallet Import button (#493)
|
||||||
|
|
||||||
// At 396x600 the add wallet screen's Import button already starts near the
|
// At 360x600 the add wallet screen's Import button already starts near the
|
||||||
// bottom of the popup, so its password error line sits beside the button
|
// bottom of the popup, so its password error line sits beside the button
|
||||||
// rather than above it. Measures the button and the line empty and again
|
// rather than above it. Measures the button and the line empty and again
|
||||||
// filled with the longest error addWallet.js puts there. Runs in the page.
|
// filled with the longest error addWallet.js puts there. Runs in the page.
|
||||||
@@ -2296,8 +2232,7 @@ function feeEth(wei) {
|
|||||||
|
|
||||||
// What the confirmation screen is showing right now, read out of the DOM in
|
// What the confirmation screen is showing right now, read out of the DOM in
|
||||||
// one pass: whether sending is allowed, which reason it is giving, what the
|
// one pass: whether sending is allowed, which reason it is giving, what the
|
||||||
// fee block says, how tall the whole view is, and where the password field and
|
// fee block says, and how tall the whole view is.
|
||||||
// Sign & Send sit in it.
|
|
||||||
async function confirmState(page) {
|
async function confirmState(page) {
|
||||||
return page.evaluate(() => {
|
return page.evaluate(() => {
|
||||||
const el = (id) => document.getElementById(id);
|
const el = (id) => document.getElementById(id);
|
||||||
@@ -2310,12 +2245,6 @@ async function confirmState(page) {
|
|||||||
};
|
};
|
||||||
return {
|
return {
|
||||||
height: el("view-confirm-tx").getBoundingClientRect().height,
|
height: el("view-confirm-tx").getBoundingClientRect().height,
|
||||||
passwordTop:
|
|
||||||
el("confirm-tx-password").getBoundingClientRect().top -
|
|
||||||
el("view-confirm-tx").getBoundingClientRect().top,
|
|
||||||
sendTop:
|
|
||||||
el("btn-confirm-send").getBoundingClientRect().top -
|
|
||||||
el("view-confirm-tx").getBoundingClientRect().top,
|
|
||||||
type: el("confirm-type").textContent.trim(),
|
type: el("confirm-type").textContent.trim(),
|
||||||
balance: el("confirm-balance").textContent.trim(),
|
balance: el("confirm-balance").textContent.trim(),
|
||||||
fee: el("confirm-fee-amount").textContent.trim(),
|
fee: el("confirm-fee-amount").textContent.trim(),
|
||||||
@@ -2324,18 +2253,9 @@ async function confirmState(page) {
|
|||||||
errors: shown("confirm-errors")
|
errors: shown("confirm-errors")
|
||||||
? el("confirm-errors").textContent.trim()
|
? el("confirm-errors").textContent.trim()
|
||||||
: "",
|
: "",
|
||||||
balanceError: shown("confirm-balance-error")
|
|
||||||
? el("confirm-balance-error").textContent.trim()
|
|
||||||
: "",
|
|
||||||
amountFeeError: shown("confirm-amount-fee-error"),
|
amountFeeError: shown("confirm-amount-fee-error"),
|
||||||
gasError: shown("confirm-gas-error"),
|
gasError: shown("confirm-gas-error"),
|
||||||
feeUnknownError: shown("confirm-fee-unknown-error"),
|
feeUnknownError: shown("confirm-fee-unknown-error"),
|
||||||
// Its sentence is wrapped across lines in index.html.
|
|
||||||
feeBoundError: shown("confirm-fee-bound-error")
|
|
||||||
? el("confirm-fee-bound-error")
|
|
||||||
.textContent.replace(/\s+/g, " ")
|
|
||||||
.trim()
|
|
||||||
: "",
|
|
||||||
sendDisabled: el("btn-confirm-send").disabled,
|
sendDisabled: el("btn-confirm-send").disabled,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
@@ -2351,16 +2271,6 @@ async function waitForEstimate(page) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function waitForBalance(page) {
|
|
||||||
await page.waitForFunction(
|
|
||||||
() =>
|
|
||||||
document.getElementById("confirm-balance").textContent.trim() !==
|
|
||||||
"Loading...",
|
|
||||||
null,
|
|
||||||
{ timeout: 60000 },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function backToAddress(page) {
|
async function backToAddress(page) {
|
||||||
if (await page.isVisible("#view-confirm-tx")) {
|
if (await page.isVisible("#view-confirm-tx")) {
|
||||||
await page.click("#btn-confirm-back");
|
await page.click("#btn-confirm-back");
|
||||||
@@ -2372,14 +2282,13 @@ async function backToAddress(page) {
|
|||||||
await openAddressDetail(page);
|
await openAddressDetail(page);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Drive the popup to the confirmation screen for one send, and return as soon
|
// Drive the popup to the confirmation screen for one send.
|
||||||
// as the screen is shown, its balance read still in flight.
|
|
||||||
//
|
//
|
||||||
// It waits for the send screen to be showing `balance`, the fixture's balance
|
// It waits for the send screen to be showing `balance`, the fixture's balance
|
||||||
// as that screen displays it, before filling anything in. Waiting for it —
|
// as that screen displays it, before filling anything in. Waiting for it —
|
||||||
// rather than for a refresh to have probably landed — is what keeps every
|
// rather than for a refresh to have probably landed — is what keeps every
|
||||||
// assertion below deterministic after a fixture change.
|
// assertion below deterministic after a fixture change.
|
||||||
async function openConfirm(page, { token, balance, amount }) {
|
async function goToConfirm(page, { token, balance, amount }) {
|
||||||
await backToAddress(page);
|
await backToAddress(page);
|
||||||
await page.click("#btn-send");
|
await page.click("#btn-send");
|
||||||
await visible(page, "#view-send");
|
await visible(page, "#view-send");
|
||||||
@@ -2394,14 +2303,6 @@ async function openConfirm(page, { token, balance, amount }) {
|
|||||||
await page.fill("#send-amount", amount);
|
await page.fill("#send-amount", amount);
|
||||||
await page.click("#btn-send-review");
|
await page.click("#btn-send-review");
|
||||||
await visible(page, "#view-confirm-tx");
|
await visible(page, "#view-confirm-tx");
|
||||||
}
|
|
||||||
|
|
||||||
// The same, returning once the screen has read the balance. It reads it
|
|
||||||
// before it estimates the fee, so every state below is read with the balance
|
|
||||||
// in place, the pending fee included.
|
|
||||||
async function goToConfirm(page, send) {
|
|
||||||
await openConfirm(page, send);
|
|
||||||
await waitForBalance(page);
|
|
||||||
await assertAddressesFit(page, "the confirmation screen");
|
await assertAddressesFit(page, "the confirmation screen");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2477,10 +2378,7 @@ test("ConfirmTx blocks sending while the fee estimate is pending (#238)", async
|
|||||||
"the estimate-failed message is shown for an estimate that is merely pending",
|
"the estimate-failed message is shown for an estimate that is merely pending",
|
||||||
);
|
);
|
||||||
assert(
|
assert(
|
||||||
!st.amountFeeError &&
|
!st.amountFeeError && !st.gasError && st.errors === "",
|
||||||
!st.gasError &&
|
|
||||||
st.errors === "" &&
|
|
||||||
st.balanceError === "",
|
|
||||||
"a balance message is shown before the fee is known",
|
"a balance message is shown before the fee is known",
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
@@ -2511,7 +2409,6 @@ test("ConfirmTx enables Send once the estimate lands, quoting both numbers (#238
|
|||||||
);
|
);
|
||||||
assert(
|
assert(
|
||||||
st.errors === "" &&
|
st.errors === "" &&
|
||||||
st.balanceError === "" &&
|
|
||||||
!st.amountFeeError &&
|
!st.amountFeeError &&
|
||||||
!st.gasError &&
|
!st.gasError &&
|
||||||
!st.feeUnknownError,
|
!st.feeUnknownError,
|
||||||
@@ -2578,54 +2475,30 @@ test("ConfirmTx gates on the fee RESERVE, not the displayed estimate (#238)", as
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
// The screen is first measured with its balance read held, so the message the
|
test("ConfirmTx refuses a send that exceeds the balance outright (#238)", async (env) => {
|
||||||
// read brings must already hold its space when the read returns (#558).
|
await goToConfirm(env.page, {
|
||||||
test("ConfirmTx refuses a send that exceeds the balance outright, and nothing moves when the balance arrives (#238)", async (env) => {
|
token: "ETH",
|
||||||
env.routeOpts.holdBalance = true;
|
balance: FUNDED_ETH_TEXT + " ETH",
|
||||||
let reading;
|
amount: OVER_BALANCE_AMOUNT,
|
||||||
try {
|
});
|
||||||
await openConfirm(env.page, {
|
|
||||||
token: "ETH",
|
|
||||||
balance: FUNDED_ETH_TEXT + " ETH",
|
|
||||||
amount: OVER_BALANCE_AMOUNT,
|
|
||||||
});
|
|
||||||
reading = await confirmState(env.page);
|
|
||||||
} finally {
|
|
||||||
env.routeOpts.holdBalance = false;
|
|
||||||
}
|
|
||||||
assert(
|
|
||||||
reading.balance === "Loading...",
|
|
||||||
"the balance read was not held: " + JSON.stringify(reading.balance),
|
|
||||||
);
|
|
||||||
await waitForBalance(env.page);
|
|
||||||
await waitForEstimate(env.page);
|
await waitForEstimate(env.page);
|
||||||
|
|
||||||
const st = await confirmState(env.page);
|
const st = await confirmState(env.page);
|
||||||
assert(
|
|
||||||
st.balance === FUNDED_ETH_TEXT + " ETH",
|
|
||||||
"the confirmation screen shows the wrong balance: " +
|
|
||||||
JSON.stringify(st.balance),
|
|
||||||
);
|
|
||||||
const want =
|
const want =
|
||||||
"Your ETH balance does not cover this amount. Please go back and" +
|
"Insufficient balance. You have " +
|
||||||
" send a smaller amount.";
|
FUNDED_ETH_TEXT +
|
||||||
|
" ETH but are trying to send " +
|
||||||
|
OVER_BALANCE_AMOUNT +
|
||||||
|
" ETH.";
|
||||||
assert(
|
assert(
|
||||||
st.balanceError === want,
|
st.errors === want,
|
||||||
"wrong over-balance message: " + JSON.stringify(st.balanceError),
|
"wrong over-balance message: " + JSON.stringify(st.errors),
|
||||||
);
|
);
|
||||||
assert(st.sendDisabled, "Send is enabled for a send that exceeds balance");
|
assert(st.sendDisabled, "Send is enabled for a send that exceeds balance");
|
||||||
assert(
|
assert(
|
||||||
!st.amountFeeError,
|
!st.amountFeeError,
|
||||||
"the amount-plus-fee message is shown for an amount that alone exceeds the balance",
|
"the amount-plus-fee message is shown for an amount that alone exceeds the balance",
|
||||||
);
|
);
|
||||||
assert(
|
|
||||||
st.sendTop === reading.sendTop,
|
|
||||||
"Sign & Send moved when the balance read returned: " +
|
|
||||||
reading.sendTop +
|
|
||||||
"px -> " +
|
|
||||||
st.sendTop +
|
|
||||||
"px",
|
|
||||||
);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
test("ConfirmTx refuses to send when the fee estimate fails, with its own message (#238)", async (env) => {
|
test("ConfirmTx refuses to send when the fee estimate fails, with its own message (#238)", async (env) => {
|
||||||
@@ -2669,10 +2542,7 @@ test("ConfirmTx refuses to send when the fee estimate fails, with its own messag
|
|||||||
"the estimate-failed message is not shown after a failed estimate",
|
"the estimate-failed message is not shown after a failed estimate",
|
||||||
);
|
);
|
||||||
assert(
|
assert(
|
||||||
!st.amountFeeError &&
|
!st.amountFeeError && !st.gasError && st.errors === "",
|
||||||
!st.gasError &&
|
|
||||||
st.errors === "" &&
|
|
||||||
st.balanceError === "",
|
|
||||||
"a balance message is shown for an estimate that simply failed",
|
"a balance message is shown for an estimate that simply failed",
|
||||||
);
|
);
|
||||||
assert(
|
assert(
|
||||||
@@ -2763,19 +2633,21 @@ test("ConfirmTx refuses an ERC-20 send that exceeds the token balance (#238)", a
|
|||||||
await waitForEstimate(env.page);
|
await waitForEstimate(env.page);
|
||||||
|
|
||||||
const st = await confirmState(env.page);
|
const st = await confirmState(env.page);
|
||||||
assert(
|
|
||||||
st.balance === TOKEN_BALANCE_TEXT + " " + STUB_TOKEN.symbol,
|
|
||||||
"the confirmation screen shows the wrong token balance: " +
|
|
||||||
JSON.stringify(st.balance),
|
|
||||||
);
|
|
||||||
const want =
|
const want =
|
||||||
"Your " +
|
"Insufficient " +
|
||||||
STUB_TOKEN.symbol +
|
STUB_TOKEN.symbol +
|
||||||
" balance does not cover this amount. Please go back and send a" +
|
" balance. You have " +
|
||||||
" smaller amount.";
|
TOKEN_BALANCE_TEXT +
|
||||||
|
" " +
|
||||||
|
STUB_TOKEN.symbol +
|
||||||
|
" but are trying to send " +
|
||||||
|
OVER_TOKEN_AMOUNT +
|
||||||
|
" " +
|
||||||
|
STUB_TOKEN.symbol +
|
||||||
|
".";
|
||||||
assert(
|
assert(
|
||||||
st.balanceError === want,
|
st.errors === want,
|
||||||
"wrong over-token-balance message: " + JSON.stringify(st.balanceError),
|
"wrong over-token-balance message: " + JSON.stringify(st.errors),
|
||||||
);
|
);
|
||||||
assert(
|
assert(
|
||||||
st.sendDisabled,
|
st.sendDisabled,
|
||||||
@@ -2831,9 +2703,9 @@ test("ConfirmTx gates the ERC-20 fee on the RESERVE, with the ERC-20 message (#2
|
|||||||
"the native-ETH over-budget message is shown on an ERC-20 transfer",
|
"the native-ETH over-budget message is shown on an ERC-20 transfer",
|
||||||
);
|
);
|
||||||
assert(
|
assert(
|
||||||
st.errors === "" && st.balanceError === "",
|
st.errors === "",
|
||||||
"a token-balance message is shown for a transfer the token balance covers: " +
|
"a token-balance message is shown for a transfer the token balance covers: " +
|
||||||
JSON.stringify(st.errors + st.balanceError),
|
JSON.stringify(st.errors),
|
||||||
);
|
);
|
||||||
assert(
|
assert(
|
||||||
st.height === env.erc20PendingHeight,
|
st.height === env.erc20PendingHeight,
|
||||||
@@ -2979,10 +2851,9 @@ async function goToTokenConfirm(env) {
|
|||||||
amount: TOKEN_AMOUNT,
|
amount: TOKEN_AMOUNT,
|
||||||
});
|
});
|
||||||
await waitForEstimate(env.page);
|
await waitForEstimate(env.page);
|
||||||
// TOKEN_AMOUNT to four decimal places (README.md, Display Consistency).
|
|
||||||
const shown = await shownAmount(env.page);
|
const shown = await shownAmount(env.page);
|
||||||
assert(
|
assert(
|
||||||
shown === "0.2500 " + STUB_TOKEN.symbol,
|
shown === TOKEN_AMOUNT + " " + STUB_TOKEN.symbol,
|
||||||
"the confirmation screen is not showing the amount that was entered: " +
|
"the confirmation screen is not showing the amount that was entered: " +
|
||||||
JSON.stringify(shown),
|
JSON.stringify(shown),
|
||||||
);
|
);
|
||||||
@@ -3132,210 +3003,6 @@ test("a token that lies about decimals() at signing time broadcasts nothing (#30
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// ------------------------- a send Sign & Send refuses moves nothing (#583)
|
|
||||||
//
|
|
||||||
// README, No Layout Shift. Sign & Send refuses a send on the confirmation
|
|
||||||
// screen when the active network changed since review and when its gas limit
|
|
||||||
// or fee is over its bound, and each refusal's sentence sits in a box that held
|
|
||||||
// its space from the first paint. This drives the total fee refusal, the longer
|
|
||||||
// of the two sentences.
|
|
||||||
|
|
||||||
// The base fee the stub node quotes once Sign & Send is pressed. ethers asks
|
|
||||||
// twice it plus the 1 gwei priority fee per gas, 50,001 gwei, so the 21,000-gas
|
|
||||||
// send would allow a fee of about 1.05 ETH, over the 1 ETH this wallet signs
|
|
||||||
// for (MAX_TOTAL_FEE in src/shared/approvalVerify.js).
|
|
||||||
const OVER_BOUND_BASE_FEE_WEI = 25000n * 10n ** 9n;
|
|
||||||
|
|
||||||
test("a send refused for its fee leaves the password field and Sign & Send where they were (#583)", async (env) => {
|
|
||||||
env.errors.expect("confirmTx logging the refused send", /send refused/);
|
|
||||||
try {
|
|
||||||
await goToConfirm(env.page, {
|
|
||||||
token: "ETH",
|
|
||||||
balance: FUNDED_ETH_TEXT + " ETH",
|
|
||||||
amount: COMFORTABLE_AMOUNT,
|
|
||||||
});
|
|
||||||
await waitForEstimate(env.page);
|
|
||||||
const before = await confirmState(env.page);
|
|
||||||
assert(
|
|
||||||
!before.sendDisabled && before.feeBoundError === "",
|
|
||||||
"the screen is not ready to send: " + JSON.stringify(before),
|
|
||||||
);
|
|
||||||
|
|
||||||
// Only now, with the screen drawn and its fee estimated, does the
|
|
||||||
// node quote a fee over the bound.
|
|
||||||
env.routeOpts.baseFeeWei = toHexWei(OVER_BOUND_BASE_FEE_WEI);
|
|
||||||
const sent = env.routeOpts.broadcastTransactions.length;
|
|
||||||
await fillPasswordAndSend(env.page);
|
|
||||||
await env.page.waitForFunction(
|
|
||||||
() =>
|
|
||||||
getComputedStyle(
|
|
||||||
document.getElementById("confirm-fee-bound-error"),
|
|
||||||
).visibility === "visible",
|
|
||||||
null,
|
|
||||||
{ timeout: 60000 },
|
|
||||||
);
|
|
||||||
const after = await confirmState(env.page);
|
|
||||||
|
|
||||||
// Printed pass or fail, as the dust threshold test does.
|
|
||||||
console.log(
|
|
||||||
"# refused send: password field top " +
|
|
||||||
before.passwordTop +
|
|
||||||
" -> " +
|
|
||||||
after.passwordTop +
|
|
||||||
"px, Sign & Send top " +
|
|
||||||
before.sendTop +
|
|
||||||
" -> " +
|
|
||||||
after.sendTop +
|
|
||||||
"px",
|
|
||||||
);
|
|
||||||
assert(
|
|
||||||
env.routeOpts.broadcastTransactions.length === sent,
|
|
||||||
"a send over the fee bound reached the RPC",
|
|
||||||
);
|
|
||||||
assert(
|
|
||||||
after.feeBoundError ===
|
|
||||||
"The gas limit or fee the RPC endpoint quoted for this" +
|
|
||||||
" transaction is more than this wallet will sign for, so" +
|
|
||||||
" it was not sent. Please go back and try again.",
|
|
||||||
"wrong fee refusal: " + JSON.stringify(after.feeBoundError),
|
|
||||||
);
|
|
||||||
assert(
|
|
||||||
after.passwordTop === before.passwordTop,
|
|
||||||
"the password field moved " +
|
|
||||||
(after.passwordTop - before.passwordTop) +
|
|
||||||
"px when the send was refused",
|
|
||||||
);
|
|
||||||
assert(
|
|
||||||
after.sendTop === before.sendTop,
|
|
||||||
"Sign & Send moved " +
|
|
||||||
(after.sendTop - before.sendTop) +
|
|
||||||
"px when the send was refused",
|
|
||||||
);
|
|
||||||
} finally {
|
|
||||||
env.routeOpts.baseFeeWei = undefined;
|
|
||||||
await backToAddress(env.page);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// --------- a send from an address the selected wallet does not hold (#609)
|
|
||||||
//
|
|
||||||
// The selection is saved apart from the confirmation screen, so the popup can
|
|
||||||
// reopen onto the screen with a wallet selected that does not hold its From
|
|
||||||
// address, and Sign & Send then refuses the send. Another popup selecting the
|
|
||||||
// key wallet would save that selection; here it is written into storage, and
|
|
||||||
// the popup reopened.
|
|
||||||
|
|
||||||
test("a send from an address the selected wallet does not hold leaves the password field and Sign & Send where they were (#609)", async (env) => {
|
|
||||||
try {
|
|
||||||
// From the HD wallet's address.
|
|
||||||
await goToConfirm(env.page, {
|
|
||||||
token: "ETH",
|
|
||||||
balance: FUNDED_ETH_TEXT + " ETH",
|
|
||||||
amount: COMFORTABLE_AMOUNT,
|
|
||||||
});
|
|
||||||
// The screen's own save lands first, so it cannot write over the
|
|
||||||
// selection below.
|
|
||||||
await waitForPersisted(
|
|
||||||
env.page,
|
|
||||||
"currentView",
|
|
||||||
"confirm-tx",
|
|
||||||
"before selecting the key wallet",
|
|
||||||
);
|
|
||||||
await env.page.evaluate(
|
|
||||||
() =>
|
|
||||||
new Promise((resolve) => {
|
|
||||||
chrome.storage.local.get("autistmask", (r) => {
|
|
||||||
const record = {
|
|
||||||
...r.autistmask,
|
|
||||||
selectedWallet: 1,
|
|
||||||
selectedAddress: 0,
|
|
||||||
};
|
|
||||||
chrome.storage.local.set(
|
|
||||||
{ autistmask: record },
|
|
||||||
resolve,
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
await reopenPopup(env, "confirm-tx");
|
|
||||||
await waitForEstimate(env.page);
|
|
||||||
// The refusal shown anywhere on the screen, not only in its own box:
|
|
||||||
// shown on the password error line instead, the test fails on the
|
|
||||||
// moves checked below rather than on the wait for it.
|
|
||||||
const refusal = env.page
|
|
||||||
.locator("#view-confirm-tx")
|
|
||||||
.getByText("does not hold the From address above")
|
|
||||||
.filter({ visible: true });
|
|
||||||
const before = await confirmState(env.page);
|
|
||||||
assert(
|
|
||||||
!before.sendDisabled && (await refusal.count()) === 0,
|
|
||||||
"the screen is not ready to send: " + JSON.stringify(before),
|
|
||||||
);
|
|
||||||
|
|
||||||
const sent = env.routeOpts.broadcastTransactions.length;
|
|
||||||
await fillPasswordAndSend(env.page);
|
|
||||||
await refusal.waitFor({ timeout: 60000 });
|
|
||||||
const after = await confirmState(env.page);
|
|
||||||
|
|
||||||
// Printed pass or fail, as the dust threshold test does.
|
|
||||||
console.log(
|
|
||||||
"# refused From address: password field top " +
|
|
||||||
before.passwordTop +
|
|
||||||
" -> " +
|
|
||||||
after.passwordTop +
|
|
||||||
"px, Sign & Send top " +
|
|
||||||
before.sendTop +
|
|
||||||
" -> " +
|
|
||||||
after.sendTop +
|
|
||||||
"px",
|
|
||||||
);
|
|
||||||
assert(
|
|
||||||
env.routeOpts.broadcastTransactions.length === sent,
|
|
||||||
"a send from an address the selected wallet does not hold" +
|
|
||||||
" reached the RPC",
|
|
||||||
);
|
|
||||||
assert(
|
|
||||||
after.passwordTop === before.passwordTop,
|
|
||||||
"the password field moved " +
|
|
||||||
(after.passwordTop - before.passwordTop) +
|
|
||||||
"px when the send was refused",
|
|
||||||
);
|
|
||||||
assert(
|
|
||||||
after.sendTop === before.sendTop,
|
|
||||||
"Sign & Send moved " +
|
|
||||||
(after.sendTop - before.sendTop) +
|
|
||||||
"px when the send was refused",
|
|
||||||
);
|
|
||||||
// Only now, where the refusal is shown. Its sentence is wrapped across
|
|
||||||
// lines in index.html.
|
|
||||||
const shownIn = await refusal.evaluate((el) => ({
|
|
||||||
id: el.id,
|
|
||||||
text: el.textContent.replace(/\s+/g, " ").trim(),
|
|
||||||
}));
|
|
||||||
assert(
|
|
||||||
shownIn.id === "confirm-from-address-error" &&
|
|
||||||
shownIn.text ===
|
|
||||||
"The selected wallet does not hold the From address above," +
|
|
||||||
" so nothing was sent. Please go back and send again.",
|
|
||||||
"wrong From address refusal: " + JSON.stringify(shownIn),
|
|
||||||
);
|
|
||||||
} finally {
|
|
||||||
// A reopened popup restores no Send screen beneath this one, so Back
|
|
||||||
// lands on the selected address. Then Home, and the HD wallet's
|
|
||||||
// address, which the later tests send from.
|
|
||||||
if (await env.page.isVisible("#view-confirm-tx")) {
|
|
||||||
await env.page.click("#btn-confirm-back");
|
|
||||||
}
|
|
||||||
if (await env.page.isVisible("#view-send")) {
|
|
||||||
await env.page.click("#btn-send-back");
|
|
||||||
}
|
|
||||||
await visible(env.page, "#view-address");
|
|
||||||
await env.page.click("#btn-address-back");
|
|
||||||
await visible(env.page, "#view-main");
|
|
||||||
await openAddressDetail(env.page);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// ------------------------------ the wait for a receipt ending in error (#315)
|
// ------------------------------ the wait for a receipt ending in error (#315)
|
||||||
//
|
//
|
||||||
// README.md (WaitTx) documents two ways the wait ends on the error screen: a
|
// README.md (WaitTx) documents two ways the wait ends on the error screen: a
|
||||||
@@ -3436,14 +3103,10 @@ test("six failed receipt lookups in a row end on the unreachable-network message
|
|||||||
// timeout ("<iframe id=\"pwn\"> intercepts pointer events") rather than as
|
// timeout ("<iframe id=\"pwn\"> intercepts pointer events") rather than as
|
||||||
// anything that names the defect.
|
// anything that names the defect.
|
||||||
|
|
||||||
// The issue's reproduction, with the frame sized to the popup.
|
// Verbatim from the issue's reproduction.
|
||||||
const HOSTILE_SYMBOL =
|
const HOSTILE_SYMBOL =
|
||||||
'<iframe id="pwn" src="https://dapp.e2e.test/" ' +
|
'<iframe id="pwn" src="https://dapp.e2e.test/" ' +
|
||||||
'style="position:fixed;left:0;top:0;width:' +
|
'style="position:fixed;left:0;top:0;width:360px;height:600px;z-index:99999"></iframe>';
|
||||||
POPUP_VIEWPORT.width +
|
|
||||||
"px;height:" +
|
|
||||||
POPUP_VIEWPORT.height +
|
|
||||||
'px;z-index:99999"></iframe>';
|
|
||||||
|
|
||||||
// What a correctly escaped and capped render of it reads as: the first
|
// What a correctly escaped and capped render of it reads as: the first
|
||||||
// MAX_SYMBOL_LENGTH-1 characters and an ellipsis. Spelled out rather than
|
// MAX_SYMBOL_LENGTH-1 characters and an ellipsis. Spelled out rather than
|
||||||
@@ -5035,20 +4698,8 @@ function addressRowReport(page) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Measured at the popup's 396x600 (POPUP_VIEWPORT). Every page in this
|
|
||||||
// context, approval windows included, is otherwise 1280x720 whatever size
|
|
||||||
// the extension asks for, and a page that wide never scrolls sideways. The
|
|
||||||
// page is then put back to the size it had, so the size a later step runs at
|
|
||||||
// does not depend on whether this one ran.
|
|
||||||
async function assertAddressesFit(page, where) {
|
async function assertAddressesFit(page, where) {
|
||||||
const sizeBefore = page.viewportSize();
|
const report = await addressRowReport(page);
|
||||||
await page.setViewportSize(POPUP_VIEWPORT);
|
|
||||||
let report;
|
|
||||||
try {
|
|
||||||
report = await addressRowReport(page);
|
|
||||||
} finally {
|
|
||||||
await page.setViewportSize(sizeBefore);
|
|
||||||
}
|
|
||||||
assert(
|
assert(
|
||||||
report.rows.length > 0,
|
report.rows.length > 0,
|
||||||
where + ": no address rows were rendered, so nothing was measured",
|
where + ": no address rows were rendered, so nothing was measured",
|
||||||
@@ -5208,9 +4859,6 @@ async function main() {
|
|||||||
seedTokenBalance: false,
|
seedTokenBalance: false,
|
||||||
ethBalanceWei: null,
|
ethBalanceWei: null,
|
||||||
failGasEstimate: false,
|
failGasEstimate: false,
|
||||||
// Whether a JSON-RPC batch asking for a balance is held unanswered:
|
|
||||||
// the confirmation screen's own balance read (#558).
|
|
||||||
holdBalance: false,
|
|
||||||
holdGasEstimate: false,
|
holdGasEstimate: false,
|
||||||
// Whether a JSON-RPC batch asking for a transaction count is held
|
// Whether a JSON-RPC batch asking for a transaction count is held
|
||||||
// unanswered: the address scan after creating a wallet (#475).
|
// unanswered: the address scan after creating a wallet (#475).
|
||||||
|
|||||||
@@ -80,7 +80,6 @@ describe.each([
|
|||||||
jest.doMock("../src/shared/state", () => ({
|
jest.doMock("../src/shared/state", () => ({
|
||||||
state: { trackedTokens: [] },
|
state: { trackedTokens: [] },
|
||||||
saveState,
|
saveState,
|
||||||
currentNetwork: () => ({ chainId: 1 }),
|
|
||||||
}));
|
}));
|
||||||
jest.doMock("../src/popup/views/helpers", () => ({
|
jest.doMock("../src/popup/views/helpers", () => ({
|
||||||
$: element,
|
$: element,
|
||||||
|
|||||||
@@ -17,10 +17,6 @@ jest.mock("ethers", () => {
|
|||||||
async lookupAddress() {
|
async lookupAddress() {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
// The 1.5 of the native token the address holds on either network.
|
|
||||||
async getBalance() {
|
|
||||||
return 1500000000000000000n;
|
|
||||||
}
|
|
||||||
// 10 gwei expected, 20 gwei reserved per gas.
|
// 10 gwei expected, 20 gwei reserved per gas.
|
||||||
async getFeeData() {
|
async getFeeData() {
|
||||||
return { maxFeePerGas: 20000000000n, gasPrice: 10000000000n };
|
return { maxFeePerGas: 20000000000n, gasPrice: 10000000000n };
|
||||||
@@ -151,7 +147,7 @@ global.document = {
|
|||||||
body: { prepend() {}, appendChild() {} },
|
body: { prepend() {}, appendChild() {} },
|
||||||
addEventListener() {},
|
addEventListener() {},
|
||||||
};
|
};
|
||||||
global.navigator.clipboard = { writeText() {} };
|
global.navigator = { clipboard: { writeText() {} } };
|
||||||
|
|
||||||
const { state } = require("../src/shared/state");
|
const { state } = require("../src/shared/state");
|
||||||
const { NETWORKS } = require("../src/shared/networks");
|
const { NETWORKS } = require("../src/shared/networks");
|
||||||
@@ -245,7 +241,7 @@ describe.each([
|
|||||||
test("the value", async () => {
|
test("the value", async () => {
|
||||||
await confirmSend("0.1");
|
await confirmSend("0.1");
|
||||||
expect(text("confirm-type")).toBe("Native " + symbol + " transfer");
|
expect(text("confirm-type")).toBe("Native " + symbol + " transfer");
|
||||||
expect(text("confirm-amount")).toBe("0.1000 " + symbol);
|
expect(text("confirm-amount")).toBe("0.1 " + symbol);
|
||||||
await approveTx(NETWORKS[networkId].chainId);
|
await approveTx(NETWORKS[networkId].chainId);
|
||||||
expect(text("approve-tx-value")).toBe("0.0100 " + symbol);
|
expect(text("approve-tx-value")).toBe("0.0100 " + symbol);
|
||||||
});
|
});
|
||||||
@@ -343,11 +339,14 @@ describe.each([
|
|||||||
|
|
||||||
test("the insufficient-balance error", async () => {
|
test("the insufficient-balance error", async () => {
|
||||||
await confirmSend("2");
|
await confirmSend("2");
|
||||||
expect(text("confirm-balance-error")).toBe(
|
expect(
|
||||||
"Your " +
|
global.document.getElementById("confirm-errors").innerHTML,
|
||||||
|
).toContain(
|
||||||
|
"You have 1.5000 " +
|
||||||
symbol +
|
symbol +
|
||||||
" balance does not cover this amount. Please go back and send" +
|
" but are trying to send 2 " +
|
||||||
" a smaller amount.",
|
symbol +
|
||||||
|
".",
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -429,10 +428,10 @@ describe.each([
|
|||||||
await global.document
|
await global.document
|
||||||
.getElementById("btn-confirm-send")
|
.getElementById("btn-confirm-send")
|
||||||
.handlers.get("click")();
|
.handlers.get("click")();
|
||||||
expect(text("wait-tx-summary")).toBe("0.1000 " + symbol);
|
expect(text("wait-tx-summary")).toBe("0.1 " + symbol);
|
||||||
state.networkId = activeNetworkId;
|
state.networkId = activeNetworkId;
|
||||||
txStatus.restoreWait();
|
txStatus.restoreWait();
|
||||||
expect(text("wait-tx-summary")).toBe("0.1000 " + symbol);
|
expect(text("wait-tx-summary")).toBe("0.1 " + symbol);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("the transaction detail screen's type line and fee", async () => {
|
test("the transaction detail screen's type line and fee", async () => {
|
||||||
|
|||||||
@@ -364,7 +364,7 @@ describe("a save that fails", () => {
|
|||||||
return storage;
|
return storage;
|
||||||
}
|
}
|
||||||
|
|
||||||
test("is reported when the caller does not await it", async () => {
|
test("is reported, not swallowed by the save queue", async () => {
|
||||||
const storage = failingStorage(unversionedValidProfile());
|
const storage = failingStorage(unversionedValidProfile());
|
||||||
const { state, loadState, saveState, onSaveFailure } =
|
const { state, loadState, saveState, onSaveFailure } =
|
||||||
loadStateModule(storage);
|
loadStateModule(storage);
|
||||||
|
|||||||
@@ -97,7 +97,6 @@ const {
|
|||||||
normalizePersisted,
|
normalizePersisted,
|
||||||
} = require("../src/shared/persistedState");
|
} = require("../src/shared/persistedState");
|
||||||
const { stateProblem } = require("../src/shared/stateSchema");
|
const { stateProblem } = require("../src/shared/stateSchema");
|
||||||
const { isKnownNetworkId } = require("../src/shared/networks");
|
|
||||||
const { RESTORABLE_VIEWS } = require("../src/shared/restorableViews");
|
const { RESTORABLE_VIEWS } = require("../src/shared/restorableViews");
|
||||||
const {
|
const {
|
||||||
bootPopup,
|
bootPopup,
|
||||||
@@ -194,29 +193,6 @@ const CONTRACT = [
|
|||||||
floorOnly: [[1, 2], [null], [{}], [[TOKEN_ADDRESS]]],
|
floorOnly: [[1, 2], [null], [{}], [[TOKEN_ADDRESS]]],
|
||||||
holds: (v) => everyEntry(v, (t) => isRecord(t) && isText(t.address)),
|
holds: (v) => everyEntry(v, (t) => isRecord(t) && isText(t.address)),
|
||||||
},
|
},
|
||||||
{
|
|
||||||
field: "networkTrackedTokens",
|
|
||||||
kind: KIND.ENTRIES,
|
|
||||||
hostile: [42, "notarecord", { sepolia: "notalist" }],
|
|
||||||
floorOnly: [
|
|
||||||
[1, 2],
|
|
||||||
{ sepolia: [1, 2] },
|
|
||||||
{ mainnet: [null, {}, [TOKEN_ADDRESS]] },
|
|
||||||
{ notanetwork: [{ address: TOKEN_ADDRESS }] },
|
|
||||||
JSON.parse('{"__proto__":[{"address":"0xabc"}]}'),
|
|
||||||
],
|
|
||||||
// Each list is put straight back onto trackedTokens by
|
|
||||||
// applyChainSwitchFields() when its network becomes the active one, so
|
|
||||||
// it is floored the same way; a key that names no network is dropped.
|
|
||||||
holds: (v) =>
|
|
||||||
isRecord(v) &&
|
|
||||||
Object.getPrototypeOf(v) === Object.prototype &&
|
|
||||||
Object.keys(v).every(
|
|
||||||
(id) =>
|
|
||||||
isKnownNetworkId(id) &&
|
|
||||||
everyEntry(v[id], (t) => isRecord(t) && isText(t.address)),
|
|
||||||
),
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
field: "allowedSites",
|
field: "allowedSites",
|
||||||
kind: KIND.ENTRIES,
|
kind: KIND.ENTRIES,
|
||||||
@@ -441,17 +417,6 @@ const CONTRACT = [
|
|||||||
views: ["error-tx"],
|
views: ["error-tx"],
|
||||||
restored: false,
|
restored: false,
|
||||||
},
|
},
|
||||||
// A chain id naming no network has no explorer to link to.
|
|
||||||
{
|
|
||||||
value: { hash: "0x1", to: ADDRESS, chainId: "0x5" },
|
|
||||||
views: ["success-tx"],
|
|
||||||
restored: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: { message: "boom", to: ADDRESS, chainId: "0x5" },
|
|
||||||
views: ["error-tx"],
|
|
||||||
restored: false,
|
|
||||||
},
|
|
||||||
// transaction passes on `data.tx`.
|
// transaction passes on `data.tx`.
|
||||||
{
|
{
|
||||||
value: { tx: { hash: "0x1" } },
|
value: { tx: { hash: "0x1" } },
|
||||||
@@ -465,26 +430,6 @@ const CONTRACT = [
|
|||||||
from: ADDRESS,
|
from: ADDRESS,
|
||||||
to: ADDRESS,
|
to: ADDRESS,
|
||||||
contractAddress: 42,
|
contractAddress: 42,
|
||||||
chainId: "0x1",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
views: ["transaction"],
|
|
||||||
restored: false,
|
|
||||||
},
|
|
||||||
// A transaction whose chain id is missing or names no network has
|
|
||||||
// no explorer to link to and no Blockscout to be read from.
|
|
||||||
{
|
|
||||||
value: { tx: { hash: "0x1", from: ADDRESS, to: ADDRESS } },
|
|
||||||
views: ["transaction"],
|
|
||||||
restored: false,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: {
|
|
||||||
tx: {
|
|
||||||
hash: "0x1",
|
|
||||||
from: ADDRESS,
|
|
||||||
to: ADDRESS,
|
|
||||||
chainId: "0x5",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
views: ["transaction"],
|
views: ["transaction"],
|
||||||
@@ -508,33 +453,6 @@ const CONTRACT = [
|
|||||||
views: ["confirm-tx"],
|
views: ["confirm-tx"],
|
||||||
restored: false,
|
restored: false,
|
||||||
},
|
},
|
||||||
// The amount line splits the amount to cut it to four decimals.
|
|
||||||
{
|
|
||||||
value: {
|
|
||||||
pendingTx: {
|
|
||||||
token: "ETH",
|
|
||||||
from: ADDRESS,
|
|
||||||
to: ADDRESS,
|
|
||||||
amount: 42,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
views: ["confirm-tx"],
|
|
||||||
restored: false,
|
|
||||||
},
|
|
||||||
// A chain id naming no network has no explorer to link to.
|
|
||||||
{
|
|
||||||
value: {
|
|
||||||
pendingTx: {
|
|
||||||
token: "ETH",
|
|
||||||
from: ADDRESS,
|
|
||||||
to: ADDRESS,
|
|
||||||
amount: "1",
|
|
||||||
chainId: "0x5",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
views: ["confirm-tx"],
|
|
||||||
restored: false,
|
|
||||||
},
|
|
||||||
// wait-tx passes on `pendingWait.hash`; restoreWait() has checked
|
// wait-tx passes on `pendingWait.hash`; restoreWait() has checked
|
||||||
// the fields below it since it was written, and this is the
|
// the fields below it since it was written, and this is the
|
||||||
// regression guard.
|
// regression guard.
|
||||||
@@ -843,22 +761,17 @@ const WELL_FORMED_DATA = {
|
|||||||
message: "boom",
|
message: "boom",
|
||||||
to: ADDRESS,
|
to: ADDRESS,
|
||||||
decoded: { details: [{ address: TOKEN_ADDRESS }] },
|
decoded: { details: [{ address: TOKEN_ADDRESS }] },
|
||||||
tx: {
|
tx: { hash: "0x1", from: ADDRESS, to: ADDRESS, contractAddress: null },
|
||||||
hash: "0x1",
|
|
||||||
from: ADDRESS,
|
|
||||||
to: ADDRESS,
|
|
||||||
contractAddress: null,
|
|
||||||
chainId: "0x1",
|
|
||||||
},
|
|
||||||
pendingTx: {
|
pendingTx: {
|
||||||
token: "ETH",
|
token: "ETH",
|
||||||
from: ADDRESS,
|
from: ADDRESS,
|
||||||
to: ADDRESS,
|
to: ADDRESS,
|
||||||
amount: "1",
|
amount: "1",
|
||||||
|
balance: "2",
|
||||||
},
|
},
|
||||||
pendingWait: {
|
pendingWait: {
|
||||||
hash: "0x1",
|
hash: "0x1",
|
||||||
txInfo: { to: ADDRESS, amount: "1", chainId: "0x1" },
|
txInfo: { to: ADDRESS, amount: "1" },
|
||||||
broadcastTime: BROADCAST_TIME,
|
broadcastTime: BROADCAST_TIME,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ const {
|
|||||||
bootPopup,
|
bootPopup,
|
||||||
cleanupPopup,
|
cleanupPopup,
|
||||||
unversionedValidProfile,
|
unversionedValidProfile,
|
||||||
ADDRESS,
|
|
||||||
} = require("./support/popupBoot");
|
} = require("./support/popupBoot");
|
||||||
|
|
||||||
const FLASH_MS = 10;
|
const FLASH_MS = 10;
|
||||||
@@ -41,47 +40,3 @@ test("a flash message's timer does not fire after cleanupPopup()", async () => {
|
|||||||
|
|
||||||
await wait(FLASH_MS * 5);
|
await wait(FLASH_MS * 5);
|
||||||
});
|
});
|
||||||
|
|
||||||
// A boot onto a screen that sends a request no mocked module answers: that
|
|
||||||
// request reaches the boot's fetch() stub, never the internet
|
|
||||||
// (https://git.eeqj.de/sneak/AutistMask/issues/559).
|
|
||||||
function restoringOnto(view, viewData) {
|
|
||||||
return unversionedValidProfile({
|
|
||||||
currentView: view,
|
|
||||||
selectedWallet: 0,
|
|
||||||
selectedAddress: 0,
|
|
||||||
viewStack: ["main"],
|
|
||||||
viewData,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
test("the transaction screen's Blockscout request reaches the stub", async () => {
|
|
||||||
const page = await bootPopup(
|
|
||||||
restoringOnto("transaction", {
|
|
||||||
tx: { hash: "0x1", from: ADDRESS, to: ADDRESS, chainId: "0x1" },
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
|
|
||||||
expect(page.visibleViews()).toEqual(["transaction"]);
|
|
||||||
expect(globalThis.fetch.mock.calls.map((call) => call[0])).toEqual([
|
|
||||||
"https://eth.blockscout.com/api/v2/transactions/0x1",
|
|
||||||
]);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("the confirmation screen's Etherscan lookup reaches the stub", async () => {
|
|
||||||
const page = await bootPopup(
|
|
||||||
restoringOnto("confirm-tx", {
|
|
||||||
pendingTx: {
|
|
||||||
token: "ETH",
|
|
||||||
from: ADDRESS,
|
|
||||||
to: ADDRESS,
|
|
||||||
amount: "1",
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
|
|
||||||
expect(page.visibleViews()).toEqual(["confirm-tx"]);
|
|
||||||
expect(globalThis.fetch.mock.calls.map((call) => call[0])).toEqual([
|
|
||||||
"https://etherscan.io/address/" + ADDRESS,
|
|
||||||
]);
|
|
||||||
});
|
|
||||||
|
|||||||
@@ -23,10 +23,7 @@ jest.mock("../src/shared/log", () => ({
|
|||||||
isDebug: () => false,
|
isDebug: () => false,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
const { AbiCoder } = require("ethers");
|
// What the confirmation screen asks the node for.
|
||||||
|
|
||||||
// What the confirmation screen asks the node for. The address holds the 1 ETH
|
|
||||||
// and 250 TOK the wallet below records.
|
|
||||||
const mockProvider = {
|
const mockProvider = {
|
||||||
getFeeData: async () => ({
|
getFeeData: async () => ({
|
||||||
maxFeePerGas: 2000000000n,
|
maxFeePerGas: 2000000000n,
|
||||||
@@ -35,11 +32,7 @@ const mockProvider = {
|
|||||||
estimateGas: async () => 21000n,
|
estimateGas: async () => 21000n,
|
||||||
getCode: async () => "0x",
|
getCode: async () => "0x",
|
||||||
getTransactionCount: async () => 1,
|
getTransactionCount: async () => 1,
|
||||||
getBalance: async () => 1000000000000000000n,
|
getBalance: async () => 0n,
|
||||||
// The one contract call the screen makes, balanceOf(), answered at the
|
|
||||||
// token's 6 decimal places.
|
|
||||||
call: async () =>
|
|
||||||
AbiCoder.defaultAbiCoder().encode(["uint256"], [250000000n]),
|
|
||||||
};
|
};
|
||||||
|
|
||||||
jest.mock("../src/shared/balances", () => {
|
jest.mock("../src/shared/balances", () => {
|
||||||
@@ -97,7 +90,7 @@ global.document = {
|
|||||||
body: { prepend() {}, appendChild() {} },
|
body: { prepend() {}, appendChild() {} },
|
||||||
addEventListener() {},
|
addEventListener() {},
|
||||||
};
|
};
|
||||||
global.navigator.clipboard = { writeText() {} };
|
global.navigator = { clipboard: { writeText() {} } };
|
||||||
|
|
||||||
const { state } = require("../src/shared/state");
|
const { state } = require("../src/shared/state");
|
||||||
const send = require("../src/popup/views/send");
|
const send = require("../src/popup/views/send");
|
||||||
|
|||||||
@@ -18,7 +18,6 @@
|
|||||||
// What the stub node answers. Each test sets what it needs.
|
// What the stub node answers. Each test sets what it needs.
|
||||||
const mockNode = {
|
const mockNode = {
|
||||||
balanceWei: 0n,
|
balanceWei: 0n,
|
||||||
tokenUnits: 0n,
|
|
||||||
feeData: { maxFeePerGas: 1n, gasPrice: 1n },
|
feeData: { maxFeePerGas: 1n, gasPrice: 1n },
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -31,13 +30,6 @@ jest.mock("ethers", () => {
|
|||||||
async getBalance() {
|
async getBalance() {
|
||||||
return mockNode.balanceWei;
|
return mockNode.balanceWei;
|
||||||
}
|
}
|
||||||
// balanceOf(), the one contract call these screens make.
|
|
||||||
async call() {
|
|
||||||
return actual.AbiCoder.defaultAbiCoder().encode(
|
|
||||||
["uint256"],
|
|
||||||
[mockNode.tokenUnits],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
async lookupAddress() {
|
async lookupAddress() {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -151,7 +143,7 @@ global.document = {
|
|||||||
body: { prepend() {}, appendChild() {} },
|
body: { prepend() {}, appendChild() {} },
|
||||||
addEventListener() {},
|
addEventListener() {},
|
||||||
};
|
};
|
||||||
global.navigator.clipboard = { writeText() {} };
|
global.navigator = { clipboard: { writeText() {} } };
|
||||||
|
|
||||||
const { refreshBalances } = require("../src/shared/balances");
|
const { refreshBalances } = require("../src/shared/balances");
|
||||||
const { state } = require("../src/shared/state");
|
const { state } = require("../src/shared/state");
|
||||||
@@ -203,19 +195,10 @@ function errors() {
|
|||||||
return global.document.getElementById("confirm-errors").innerHTML;
|
return global.document.getElementById("confirm-errors").innerHTML;
|
||||||
}
|
}
|
||||||
|
|
||||||
// The message for an amount the balance does not cover, while it is shown.
|
|
||||||
function balanceError() {
|
|
||||||
const box = global.document.getElementById("confirm-balance-error");
|
|
||||||
return box.style.visibility === "visible" ? box.textContent : "";
|
|
||||||
}
|
|
||||||
|
|
||||||
// The ETH balance the node reports and the token rows the explorer reports,
|
// The ETH balance the node reports and the token rows the explorer reports,
|
||||||
// fetched and stored exactly where the popup stores them. The node reports the
|
// fetched and stored exactly where the popup stores them.
|
||||||
// token holding the explorer does.
|
|
||||||
async function refreshWith(balanceWei, tokenItems = []) {
|
async function refreshWith(balanceWei, tokenItems = []) {
|
||||||
mockNode.balanceWei = balanceWei;
|
mockNode.balanceWei = balanceWei;
|
||||||
mockNode.tokenUnits =
|
|
||||||
tokenItems.length > 0 ? BigInt(tokenItems[0].value) : 0n;
|
|
||||||
mockExplorer.items = tokenItems;
|
mockExplorer.items = tokenItems;
|
||||||
state.wallets = [{ name: "Wallet 1", addresses: [{ address: HOLDER }] }];
|
state.wallets = [{ name: "Wallet 1", addresses: [{ address: HOLDER }] }];
|
||||||
state.selectedWallet = 0;
|
state.selectedWallet = 0;
|
||||||
@@ -317,10 +300,9 @@ describe("a tracked token holding below 0.000001 never renders as zero", () => {
|
|||||||
await confirmSend("0.0000005", TOKEN);
|
await confirmSend("0.0000005", TOKEN);
|
||||||
expect(text("confirm-balance")).toBe("0.0000005 TOK");
|
expect(text("confirm-balance")).toBe("0.0000005 TOK");
|
||||||
expect(errors()).toBe("");
|
expect(errors()).toBe("");
|
||||||
expect(balanceError()).toBe("");
|
|
||||||
await confirmSend("0.0000006", TOKEN);
|
await confirmSend("0.0000006", TOKEN);
|
||||||
expect(balanceError()).toContain(
|
expect(errors()).toContain(
|
||||||
"Your TOK balance does not cover this amount.",
|
"You have 0.0000005 TOK but are trying to send 0.0000006 TOK.",
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -334,7 +316,6 @@ describe("a tracked token holding below 0.000001 never renders as zero", () => {
|
|||||||
await confirmSend("1.5", TOKEN);
|
await confirmSend("1.5", TOKEN);
|
||||||
expect(text("confirm-balance")).toBe("1.5000 TOK");
|
expect(text("confirm-balance")).toBe("1.5000 TOK");
|
||||||
expect(errors()).toBe("");
|
expect(errors()).toBe("");
|
||||||
expect(balanceError()).toBe("");
|
|
||||||
});
|
});
|
||||||
|
|
||||||
test("with more than 18 decimals and a holding below 10^-18", async () => {
|
test("with more than 18 decimals and a holding below 10^-18", async () => {
|
||||||
@@ -348,8 +329,9 @@ describe("a tracked token holding below 0.000001 never renders as zero", () => {
|
|||||||
);
|
);
|
||||||
await confirmSend("0.000000000000000001", TOKEN);
|
await confirmSend("0.000000000000000001", TOKEN);
|
||||||
expect(text("confirm-balance")).toBe("0.000000000000000000000001 TOK");
|
expect(text("confirm-balance")).toBe("0.000000000000000000000001 TOK");
|
||||||
expect(balanceError()).toContain(
|
expect(errors()).toContain(
|
||||||
"Your TOK balance does not cover this amount.",
|
"You have 0.000000000000000000000001 TOK but are trying to send" +
|
||||||
|
" 0.000000000000000001 TOK.",
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -374,10 +356,9 @@ describe("an untracked token holding below 0.000001 never renders as zero", () =
|
|||||||
await confirmSend("0.0000005", TOKEN);
|
await confirmSend("0.0000005", TOKEN);
|
||||||
expect(text("confirm-balance")).toBe("0.0000005 TOK");
|
expect(text("confirm-balance")).toBe("0.0000005 TOK");
|
||||||
expect(errors()).toBe("");
|
expect(errors()).toBe("");
|
||||||
expect(balanceError()).toBe("");
|
|
||||||
await confirmSend("0.0000006", TOKEN);
|
await confirmSend("0.0000006", TOKEN);
|
||||||
expect(balanceError()).toContain(
|
expect(errors()).toContain(
|
||||||
"Your TOK balance does not cover this amount.",
|
"You have 0.0000005 TOK but are trying to send 0.0000006 TOK.",
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
+8
-26
@@ -17,7 +17,6 @@
|
|||||||
// What the stub node answers, and the signed transactions it was handed.
|
// What the stub node answers, and the signed transactions it was handed.
|
||||||
const mockNode = {
|
const mockNode = {
|
||||||
balanceWei: 0n,
|
balanceWei: 0n,
|
||||||
tokenUnits: 0n,
|
|
||||||
feeData: null,
|
feeData: null,
|
||||||
broadcast: [],
|
broadcast: [],
|
||||||
};
|
};
|
||||||
@@ -31,14 +30,6 @@ jest.mock("ethers", () => {
|
|||||||
async getBalance() {
|
async getBalance() {
|
||||||
return mockNode.balanceWei;
|
return mockNode.balanceWei;
|
||||||
}
|
}
|
||||||
// balanceOf(), the one contract call these screens make before Sign
|
|
||||||
// & Send.
|
|
||||||
async call() {
|
|
||||||
return actual.AbiCoder.defaultAbiCoder().encode(
|
|
||||||
["uint256"],
|
|
||||||
[mockNode.tokenUnits],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
async lookupAddress() {
|
async lookupAddress() {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -146,7 +137,7 @@ global.document = {
|
|||||||
body: { prepend() {}, appendChild() {} },
|
body: { prepend() {}, appendChild() {} },
|
||||||
addEventListener() {},
|
addEventListener() {},
|
||||||
};
|
};
|
||||||
global.navigator.clipboard = { writeText() {} };
|
global.navigator = { clipboard: { writeText() {} } };
|
||||||
|
|
||||||
const { Transaction, Wallet, formatEther } = require("ethers");
|
const { Transaction, Wallet, formatEther } = require("ethers");
|
||||||
const { refreshBalances } = require("../src/shared/balances");
|
const { refreshBalances } = require("../src/shared/balances");
|
||||||
@@ -196,12 +187,9 @@ function text(id) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// The ETH balance the node reports and the token rows the explorer reports,
|
// The ETH balance the node reports and the token rows the explorer reports,
|
||||||
// fetched and stored exactly where the popup stores them. The node reports the
|
// fetched and stored exactly where the popup stores them.
|
||||||
// token holding the explorer does.
|
|
||||||
async function refreshWith(balanceWei, tokenItems = []) {
|
async function refreshWith(balanceWei, tokenItems = []) {
|
||||||
mockNode.balanceWei = balanceWei;
|
mockNode.balanceWei = balanceWei;
|
||||||
mockNode.tokenUnits =
|
|
||||||
tokenItems.length > 0 ? BigInt(tokenItems[0].value) : 0n;
|
|
||||||
mockExplorer.items = tokenItems;
|
mockExplorer.items = tokenItems;
|
||||||
state.wallets = [
|
state.wallets = [
|
||||||
{
|
{
|
||||||
@@ -306,8 +294,7 @@ describe("Max on an ETH send", () => {
|
|||||||
openSend();
|
openSend();
|
||||||
await pressMax();
|
await pressMax();
|
||||||
await review();
|
await review();
|
||||||
expect(confirmed.amount).toBe(maxAfter(20n * GWEI));
|
expect(text("confirm-amount")).toBe(maxAfter(20n * GWEI) + " ETH");
|
||||||
expect(text("confirm-amount")).toBe("1.2341 ETH");
|
|
||||||
expect(el("confirm-errors").innerHTML).toBe("");
|
expect(el("confirm-errors").innerHTML).toBe("");
|
||||||
expect(el("confirm-amount-fee-error").style.visibility).toBe("hidden");
|
expect(el("confirm-amount-fee-error").style.visibility).toBe("hidden");
|
||||||
expect(canSend()).toBe(true);
|
expect(canSend()).toBe(true);
|
||||||
@@ -323,16 +310,14 @@ describe("Max on an ETH send", () => {
|
|||||||
// Kept, the Send screen's amount would be refused for want of funds.
|
// Kept, the Send screen's amount would be refused for want of funds.
|
||||||
mockNode.feeData = fees(30n * GWEI);
|
mockNode.feeData = fees(30n * GWEI);
|
||||||
await review();
|
await review();
|
||||||
expect(confirmed.amount).toBe(maxAfter(30n * GWEI));
|
expect(text("confirm-amount")).toBe(maxAfter(30n * GWEI) + " ETH");
|
||||||
expect(text("confirm-amount")).toBe("1.2339 ETH");
|
|
||||||
expect(canSend()).toBe(true);
|
expect(canSend()).toBe(true);
|
||||||
|
|
||||||
// And falls when the screen is shown again, as on reopening the popup.
|
// And falls when the screen is shown again, as on reopening the popup.
|
||||||
mockNode.feeData = fees(10n * GWEI);
|
mockNode.feeData = fees(10n * GWEI);
|
||||||
confirmTx.restore();
|
confirmTx.restore();
|
||||||
await settle();
|
await settle();
|
||||||
expect(confirmed.amount).toBe(maxAfter(10n * GWEI));
|
expect(text("confirm-amount")).toBe(maxAfter(10n * GWEI) + " ETH");
|
||||||
expect(text("confirm-amount")).toBe("1.2343 ETH");
|
|
||||||
expect(canSend()).toBe(true);
|
expect(canSend()).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -529,8 +514,7 @@ describe("Max on an ETH send", () => {
|
|||||||
el("send-amount").handlers.get("input")();
|
el("send-amount").handlers.get("input")();
|
||||||
mockNode.feeData = fees(30n * GWEI);
|
mockNode.feeData = fees(30n * GWEI);
|
||||||
await review();
|
await review();
|
||||||
expect(confirmed.amount).toBe("0.5");
|
expect(text("confirm-amount")).toBe("0.5 ETH");
|
||||||
expect(text("confirm-amount")).toBe("0.5000 ETH");
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -544,8 +528,7 @@ describe("Max on a token send", () => {
|
|||||||
await pressMax();
|
await pressMax();
|
||||||
expect(el("send-amount").value).toBe("1234.567890123456789012");
|
expect(el("send-amount").value).toBe("1234.567890123456789012");
|
||||||
await review();
|
await review();
|
||||||
expect(confirmed.amount).toBe("1234.567890123456789012");
|
expect(text("confirm-amount")).toBe("1234.567890123456789012 TOK");
|
||||||
expect(text("confirm-amount")).toBe("1234.5678 TOK");
|
|
||||||
expect(canSend()).toBe(true);
|
expect(canSend()).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -558,8 +541,7 @@ describe("Max on a token send", () => {
|
|||||||
await pressMax();
|
await pressMax();
|
||||||
expect(el("send-amount").value).toBe("1234.567890123456789012");
|
expect(el("send-amount").value).toBe("1234.567890123456789012");
|
||||||
await review();
|
await review();
|
||||||
expect(confirmed.amount).toBe("1234.567890123456789012");
|
expect(text("confirm-amount")).toBe("1234.567890123456789012 TOK");
|
||||||
expect(text("confirm-amount")).toBe("1234.5678 TOK");
|
|
||||||
expect(canSend()).toBe(true);
|
expect(canSend()).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -160,7 +160,7 @@ describe("the approval-window reproduction", () => {
|
|||||||
await approvalWindow.state.loadState();
|
await approvalWindow.state.loadState();
|
||||||
approvalWindow.helpers.showView("approve-tx");
|
approvalWindow.helpers.showView("approve-tx");
|
||||||
// showView() does not await its own saveState(); an extra save
|
// showView() does not await its own saveState(); an extra save
|
||||||
// waits for the lock behind that one and so resolves only after it,
|
// joins the same queue and only resolves once that one has too,
|
||||||
// which is the black-box way to know it landed.
|
// which is the black-box way to know it landed.
|
||||||
await approvalWindow.state.saveState();
|
await approvalWindow.state.saveState();
|
||||||
|
|
||||||
|
|||||||
@@ -225,12 +225,7 @@ describe("a popup already open when the stored profile becomes unreadable", () =
|
|||||||
viewData: {
|
viewData: {
|
||||||
pendingWait: {
|
pendingWait: {
|
||||||
hash: "0x1",
|
hash: "0x1",
|
||||||
txInfo: {
|
txInfo: { to: ADDRESS, amount: "1", token: "ETH" },
|
||||||
to: ADDRESS,
|
|
||||||
amount: "1",
|
|
||||||
token: "ETH",
|
|
||||||
chainId: "0x1",
|
|
||||||
},
|
|
||||||
broadcastTime: Date.now(),
|
broadcastTime: Date.now(),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,96 +0,0 @@
|
|||||||
// A popup save reads the stored record, merges this page's changes into it
|
|
||||||
// and writes it back. The background's write of a network the user approved
|
|
||||||
// used to be able to land between that read and that write, and the popup's
|
|
||||||
// write then put the old network back
|
|
||||||
// (https://git.eeqj.de/sneak/AutistMask/issues/641). Every write of the record
|
|
||||||
// now holds a lock from its read to its write.
|
|
||||||
//
|
|
||||||
// The popup and the background run here as the real modules over one shared
|
|
||||||
// storage stub, and share the lock the way the background and a page outside
|
|
||||||
// a Firefox private window share the browser's
|
|
||||||
// (tests/support/navigatorLocks.js).
|
|
||||||
|
|
||||||
const { makeStorageStub } = require("./support/storageStub");
|
|
||||||
|
|
||||||
function loadContexts(storage) {
|
|
||||||
jest.resetModules();
|
|
||||||
globalThis.chrome = { storage: { local: storage.local } };
|
|
||||||
return {
|
|
||||||
popup: require("../src/shared/state"),
|
|
||||||
background: require("../src/background/state"),
|
|
||||||
applyChainSwitchFields: require("../src/shared/chainSwitchFields")
|
|
||||||
.applyChainSwitchFields,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// Lets every pending promise callback run, and then some.
|
|
||||||
function nextMacrotask() {
|
|
||||||
return new Promise((resolve) => setImmediate(resolve));
|
|
||||||
}
|
|
||||||
|
|
||||||
afterEach(() => {
|
|
||||||
delete globalThis.chrome;
|
|
||||||
jest.restoreAllMocks();
|
|
||||||
});
|
|
||||||
|
|
||||||
test("a network the background switches to during a popup save stays stored", async () => {
|
|
||||||
const storage = makeStorageStub({ autistmask: { networkId: "sepolia" } });
|
|
||||||
const { popup, background, applyChainSwitchFields } = loadContexts(storage);
|
|
||||||
await popup.loadState();
|
|
||||||
|
|
||||||
// The popup navigates, so its save has a change of its own to write.
|
|
||||||
popup.state.currentView = "settings";
|
|
||||||
|
|
||||||
// The popup's save has read the record and is about to write it back when
|
|
||||||
// the user's approval of a site's switch to mainnet reaches the
|
|
||||||
// background. Without the lock the background's whole update runs before
|
|
||||||
// the next macrotask; with it, the update waits for the popup's write.
|
|
||||||
let backgroundSwitch;
|
|
||||||
const realSet = storage.local.set.getMockImplementation();
|
|
||||||
storage.local.set.mockImplementationOnce(async (items) => {
|
|
||||||
backgroundSwitch = background.updateState((fresh) =>
|
|
||||||
applyChainSwitchFields(fresh, "mainnet"),
|
|
||||||
);
|
|
||||||
await nextMacrotask();
|
|
||||||
return realSet(items);
|
|
||||||
});
|
|
||||||
|
|
||||||
await popup.saveState();
|
|
||||||
await backgroundSwitch;
|
|
||||||
|
|
||||||
const stored = storage.read("autistmask");
|
|
||||||
expect(stored.networkId).toBe("mainnet");
|
|
||||||
expect(stored.currentView).toBe("settings");
|
|
||||||
});
|
|
||||||
|
|
||||||
test("after a save that failed, the next save still keeps a network the background switches to during it", async () => {
|
|
||||||
jest.spyOn(console, "error").mockImplementation(() => {});
|
|
||||||
const storage = makeStorageStub({ autistmask: { networkId: "sepolia" } });
|
|
||||||
const { popup, background, applyChainSwitchFields } = loadContexts(storage);
|
|
||||||
await popup.loadState();
|
|
||||||
popup.state.currentView = "settings";
|
|
||||||
|
|
||||||
// The first save's write is refused, so it gives the lock back having
|
|
||||||
// failed.
|
|
||||||
storage.local.set.mockRejectedValueOnce(new Error("quota exceeded"));
|
|
||||||
await expect(popup.saveState()).rejects.toThrow("quota exceeded");
|
|
||||||
|
|
||||||
// The next save is between its read and its write when the background
|
|
||||||
// switches to mainnet, as in the test above.
|
|
||||||
let backgroundSwitch;
|
|
||||||
const realSet = storage.local.set.getMockImplementation();
|
|
||||||
storage.local.set.mockImplementationOnce(async (items) => {
|
|
||||||
backgroundSwitch = background.updateState((fresh) =>
|
|
||||||
applyChainSwitchFields(fresh, "mainnet"),
|
|
||||||
);
|
|
||||||
await nextMacrotask();
|
|
||||||
return realSet(items);
|
|
||||||
});
|
|
||||||
|
|
||||||
await popup.saveState();
|
|
||||||
await backgroundSwitch;
|
|
||||||
|
|
||||||
const stored = storage.read("autistmask");
|
|
||||||
expect(stored.networkId).toBe("mainnet");
|
|
||||||
expect(stored.currentView).toBe("settings");
|
|
||||||
});
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
// `navigator.locks` for the unit tests, which run on node, where there is none.
|
|
||||||
//
|
|
||||||
// One lock per name: granted in the order it was asked for, and let go when
|
|
||||||
// the callback settles, whether it resolved or rejected. That is what the
|
|
||||||
// browser's own does for the one call the extension makes,
|
|
||||||
// `navigator.locks.request(name, callback)`. Every module a test file loads
|
|
||||||
// shares it, as the extension's background and its pages share the browser's,
|
|
||||||
// except a page in a Firefox private window (README, "Stored state and its
|
|
||||||
// version").
|
|
||||||
//
|
|
||||||
// Run before each test file by `setupFiles` in package.json.
|
|
||||||
|
|
||||||
// For each name, a promise that settles once the last request for it has
|
|
||||||
// let the lock go.
|
|
||||||
const released = new Map();
|
|
||||||
|
|
||||||
function request(name, callback) {
|
|
||||||
const previous = released.get(name) || Promise.resolve();
|
|
||||||
const result = previous.then(() => callback({ name, mode: "exclusive" }));
|
|
||||||
released.set(
|
|
||||||
name,
|
|
||||||
result.catch(() => {}),
|
|
||||||
);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
globalThis.navigator = { locks: { request } };
|
|
||||||
@@ -45,7 +45,6 @@ const realSetInterval = globalThis.setInterval;
|
|||||||
const realClearInterval = globalThis.clearInterval;
|
const realClearInterval = globalThis.clearInterval;
|
||||||
const realSetTimeout = globalThis.setTimeout;
|
const realSetTimeout = globalThis.setTimeout;
|
||||||
const realClearTimeout = globalThis.clearTimeout;
|
const realClearTimeout = globalThis.clearTimeout;
|
||||||
const realFetch = globalThis.fetch;
|
|
||||||
|
|
||||||
// Every timeout set since the last cleanupPopup() that has neither fired nor
|
// Every timeout set since the last cleanupPopup() that has neither fired nor
|
||||||
// been cleared. cleanupPopup() clears them all.
|
// been cleared. cleanupPopup() clears them all.
|
||||||
@@ -261,14 +260,8 @@ async function settle() {
|
|||||||
async function bootPopup(stored, options) {
|
async function bootPopup(stored, options) {
|
||||||
jest.resetModules();
|
jest.resetModules();
|
||||||
|
|
||||||
// The RPC requests made through src/shared/balances.js go through Node's
|
// The three modules that reach the network. None is on the path under
|
||||||
// own http and https modules, not fetch(), so the fetch() stub below would
|
// test; all would make the suite hit the internet.
|
||||||
// not stop them, which is why that module stays mocked.
|
|
||||||
// src/shared/prices.js and src/shared/transactions.js send their requests
|
|
||||||
// through fetch(), and their mocks answer with no prices and no
|
|
||||||
// transactions. Every request the page still sends, such as the
|
|
||||||
// transaction screen's Blockscout lookup and the Etherscan lookup in
|
|
||||||
// src/shared/etherscanLabels.js, meets the fetch() stub.
|
|
||||||
jest.doMock("../../src/shared/prices", () => ({
|
jest.doMock("../../src/shared/prices", () => ({
|
||||||
prices: {},
|
prices: {},
|
||||||
refreshPrices: jest.fn(async () => {}),
|
refreshPrices: jest.fn(async () => {}),
|
||||||
@@ -341,12 +334,6 @@ async function bootPopup(stored, options) {
|
|||||||
windowListeners[name].push(fn);
|
windowListeners[name].push(fn);
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
// Every fetch() the page makes fails, as it does elsewhere in the suite,
|
|
||||||
// instead of reaching the internet. A new stub per boot, so the calls it
|
|
||||||
// records start with that boot. Put back by cleanupPopup().
|
|
||||||
globalThis.fetch = jest.fn(() => {
|
|
||||||
throw new Error("tests must not perform network requests");
|
|
||||||
});
|
|
||||||
// The ten-second refresh init() starts, and a transaction wait's timers,
|
// The ten-second refresh init() starts, and a transaction wait's timers,
|
||||||
// would outlive the test. So every interval is recorded rather than
|
// would outlive the test. So every interval is recorded rather than
|
||||||
// started, clearInterval() removes it as a browser would, and tick() below
|
// started, clearInterval() removes it as a browser would, and tick() below
|
||||||
@@ -448,7 +435,6 @@ function cleanupPopup() {
|
|||||||
pendingTimeouts.clear();
|
pendingTimeouts.clear();
|
||||||
globalThis.setTimeout = realSetTimeout;
|
globalThis.setTimeout = realSetTimeout;
|
||||||
globalThis.clearTimeout = realClearTimeout;
|
globalThis.clearTimeout = realClearTimeout;
|
||||||
globalThis.fetch = realFetch;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
|
|||||||
@@ -8,14 +8,6 @@
|
|||||||
// tracks. It decodes against the address the explorer reports the transaction
|
// tracks. It decodes against the address the explorer reports the transaction
|
||||||
// was sent to.
|
// was sent to.
|
||||||
//
|
//
|
||||||
// Its links open the explorer of the network the transaction was sent on,
|
|
||||||
// whichever network is active
|
|
||||||
// (https://git.eeqj.de/sneak/AutistMask/issues/584), and the transaction is
|
|
||||||
// read from that network's Blockscout, the one Settings has for it
|
|
||||||
// (https://git.eeqj.de/sneak/AutistMask/issues/623). Its decoded details name
|
|
||||||
// the token, and scale its amount, from what the wallet knows of that
|
|
||||||
// network's tokens (https://git.eeqj.de/sneak/AutistMask/issues/629).
|
|
||||||
//
|
|
||||||
// The row is the one the real history parser makes from the explorer's answer,
|
// The row is the one the real history parser makes from the explorer's answer,
|
||||||
// opened through transactionDetail.show(), which is what a click on the row
|
// opened through transactionDetail.show(), which is what a click on the row
|
||||||
// calls. Driven against a minimal DOM stub in the shape
|
// calls. Driven against a minimal DOM stub in the shape
|
||||||
@@ -30,10 +22,10 @@ jest.mock("../src/shared/log", () => ({
|
|||||||
warnf: () => {},
|
warnf: () => {},
|
||||||
errorf: () => {},
|
errorf: () => {},
|
||||||
},
|
},
|
||||||
debugFetch: async (url) => {
|
debugFetch: async (url) => ({
|
||||||
mockAsked.push(url);
|
ok: true,
|
||||||
return { ok: true, json: async () => mockExplorerAnswer(url) };
|
json: async () => mockExplorerAnswer(url),
|
||||||
},
|
}),
|
||||||
setRuntimeDebug: () => {},
|
setRuntimeDebug: () => {},
|
||||||
isDebug: () => false,
|
isDebug: () => false,
|
||||||
}));
|
}));
|
||||||
@@ -43,13 +35,10 @@ globalThis.chrome = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const { state } = require("../src/shared/state");
|
const { state } = require("../src/shared/state");
|
||||||
const { NETWORKS } = require("../src/shared/networks");
|
|
||||||
const { fetchRecentTransactions } = require("../src/shared/transactions");
|
const { fetchRecentTransactions } = require("../src/shared/transactions");
|
||||||
const transactionDetail = require("../src/popup/views/transactionDetail");
|
const transactionDetail = require("../src/popup/views/transactionDetail");
|
||||||
|
|
||||||
const EXPLORER = "https://explorer.example/api/v2";
|
const EXPLORER = "https://explorer.example/api/v2";
|
||||||
// A Blockscout that knows nothing of the transaction.
|
|
||||||
const OTHER_EXPLORER = "https://other-explorer.example/api/v2";
|
|
||||||
const HOLDER = "0x0000000000000000000000000000000000000a11";
|
const HOLDER = "0x0000000000000000000000000000000000000a11";
|
||||||
const RECIPIENT = "0x711e691962E5c054b78071C789A0C8CE657377aD";
|
const RECIPIENT = "0x711e691962E5c054b78071C789A0C8CE657377aD";
|
||||||
// A token the wallet tracks and the bundled token list does not name.
|
// A token the wallet tracks and the bundled token list does not name.
|
||||||
@@ -62,9 +51,6 @@ const TRANSFER_DATA = new Interface([
|
|||||||
"function transfer(address to, uint256 amount)",
|
"function transfer(address to, uint256 amount)",
|
||||||
]).encodeFunctionData("transfer", [RECIPIENT, 1234500000n]);
|
]).encodeFunctionData("transfer", [RECIPIENT, 1234500000n]);
|
||||||
|
|
||||||
// Every URL asked of a Blockscout, in order.
|
|
||||||
const mockAsked = [];
|
|
||||||
|
|
||||||
// The explorer's answers: the transfer in HOLDER's token transfers, and the
|
// The explorer's answers: the transfer in HOLDER's token transfers, and the
|
||||||
// transaction itself, sent to the token contract.
|
// transaction itself, sent to the token contract.
|
||||||
function mockExplorerAnswer(url) {
|
function mockExplorerAnswer(url) {
|
||||||
@@ -91,11 +77,7 @@ function mockExplorerAnswer(url) {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
if (url === EXPLORER + "/transactions/" + TX_HASH) {
|
if (url === EXPLORER + "/transactions/" + TX_HASH) {
|
||||||
return {
|
return { to: { hash: TOKEN }, raw_input: TRANSFER_DATA };
|
||||||
to: { hash: TOKEN },
|
|
||||||
raw_input: TRANSFER_DATA,
|
|
||||||
block_number: 100,
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
return { items: [] };
|
return { items: [] };
|
||||||
}
|
}
|
||||||
@@ -158,7 +140,6 @@ beforeEach(() => {
|
|||||||
globalThis.document = makeDocument();
|
globalThis.document = makeDocument();
|
||||||
globalThis.window = { location: { search: "" } };
|
globalThis.window = { location: { search: "" } };
|
||||||
state.blockscoutUrl = EXPLORER;
|
state.blockscoutUrl = EXPLORER;
|
||||||
state.networkEndpoints = {};
|
|
||||||
state.wallets = [
|
state.wallets = [
|
||||||
{
|
{
|
||||||
name: "Main",
|
name: "Main",
|
||||||
@@ -167,18 +148,13 @@ beforeEach(() => {
|
|||||||
},
|
},
|
||||||
];
|
];
|
||||||
state.trackedTokens = [{ address: TOKEN, symbol: "TDOL", decimals: 6 }];
|
state.trackedTokens = [{ address: TOKEN, symbol: "TDOL", decimals: 6 }];
|
||||||
state.networkTrackedTokens = {};
|
|
||||||
state.viewData = {};
|
state.viewData = {};
|
||||||
state.viewStack = [];
|
state.viewStack = [];
|
||||||
state.currentView = null;
|
state.currentView = null;
|
||||||
});
|
});
|
||||||
|
|
||||||
test("a token transfer's decoded details name the token contract and the amount at its scale", async () => {
|
test("a token transfer's decoded details name the token contract and the amount at its scale", async () => {
|
||||||
const [row] = await fetchRecentTransactions(
|
const [row] = await fetchRecentTransactions(HOLDER, EXPLORER, 1);
|
||||||
HOLDER,
|
|
||||||
EXPLORER,
|
|
||||||
NETWORKS.mainnet.chainId,
|
|
||||||
);
|
|
||||||
expect(row.to).toBe(RECIPIENT);
|
expect(row.to).toBe(RECIPIENT);
|
||||||
expect(row.contractAddress).toBe(TOKEN.toLowerCase());
|
expect(row.contractAddress).toBe(TOKEN.toLowerCase());
|
||||||
|
|
||||||
@@ -198,96 +174,3 @@ test("a token transfer's decoded details name the token contract and the amount
|
|||||||
'<div class="font-bold">1234.5000 TDOL</div>',
|
'<div class="font-bold">1234.5000 TDOL</div>',
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Mainnet is active, and its Blockscout knows nothing of the transaction. The
|
|
||||||
// row was read from the Blockscout Settings remembers for Sepolia, and the
|
|
||||||
// screen reads the transaction from there too, so every link on it is drawn.
|
|
||||||
test("with mainnet active, a Sepolia transaction is read from Sepolia's Blockscout and its links open the Sepolia explorer", async () => {
|
|
||||||
state.networkId = "mainnet";
|
|
||||||
state.blockscoutUrl = OTHER_EXPLORER;
|
|
||||||
state.networkEndpoints = { sepolia: { blockscoutUrl: EXPLORER } };
|
|
||||||
const [row] = await fetchRecentTransactions(
|
|
||||||
HOLDER,
|
|
||||||
EXPLORER,
|
|
||||||
NETWORKS.sepolia.chainId,
|
|
||||||
);
|
|
||||||
|
|
||||||
transactionDetail.show(row);
|
|
||||||
for (let i = 0; i < 10; i++) await new Promise((r) => setTimeout(r, 0));
|
|
||||||
|
|
||||||
const sepolia = "https://sepolia.etherscan.io";
|
|
||||||
const links = (id) =>
|
|
||||||
[...node(id).innerHTML.matchAll(/href="([^"]*)"/g)].map((m) => m[1]);
|
|
||||||
expect(links("tx-detail-hash")).toEqual([`${sepolia}/tx/${TX_HASH}`]);
|
|
||||||
expect(links("tx-detail-from")).toEqual([`${sepolia}/address/${HOLDER}`]);
|
|
||||||
expect(links("tx-detail-to")).toEqual([`${sepolia}/address/${RECIPIENT}`]);
|
|
||||||
expect(links("tx-detail-token-contract")).toEqual([
|
|
||||||
`${sepolia}/token/${TOKEN.toLowerCase()}`,
|
|
||||||
]);
|
|
||||||
expect(links("tx-detail-block")).toEqual([`${sepolia}/block/100`]);
|
|
||||||
expect(links("tx-detail-calldata-details")).toEqual([
|
|
||||||
`${sepolia}/address/${TOKEN}`,
|
|
||||||
`${sepolia}/address/${RECIPIENT}`,
|
|
||||||
]);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("with mainnet active and no Blockscout remembered for Sepolia, a Sepolia transaction is asked of Sepolia's default Blockscout", async () => {
|
|
||||||
state.networkId = "mainnet";
|
|
||||||
state.blockscoutUrl = OTHER_EXPLORER;
|
|
||||||
const [row] = await fetchRecentTransactions(
|
|
||||||
HOLDER,
|
|
||||||
EXPLORER,
|
|
||||||
NETWORKS.sepolia.chainId,
|
|
||||||
);
|
|
||||||
mockAsked.length = 0;
|
|
||||||
|
|
||||||
transactionDetail.show(row);
|
|
||||||
for (let i = 0; i < 10; i++) await new Promise((r) => setTimeout(r, 0));
|
|
||||||
|
|
||||||
expect(mockAsked).toEqual([
|
|
||||||
NETWORKS.sepolia.defaultBlockscoutUrl + "/transactions/" + TX_HASH,
|
|
||||||
]);
|
|
||||||
});
|
|
||||||
|
|
||||||
// Open the Sepolia transfer's detail screen with mainnet active, and wait for
|
|
||||||
// its decoded details.
|
|
||||||
async function showSepoliaTransferWithMainnetActive() {
|
|
||||||
state.networkId = "mainnet";
|
|
||||||
state.blockscoutUrl = OTHER_EXPLORER;
|
|
||||||
state.networkEndpoints = { sepolia: { blockscoutUrl: EXPLORER } };
|
|
||||||
const [row] = await fetchRecentTransactions(
|
|
||||||
HOLDER,
|
|
||||||
EXPLORER,
|
|
||||||
NETWORKS.sepolia.chainId,
|
|
||||||
);
|
|
||||||
transactionDetail.show(row);
|
|
||||||
for (let i = 0; i < 10; i++) await new Promise((r) => setTimeout(r, 0));
|
|
||||||
}
|
|
||||||
|
|
||||||
test("with mainnet active, a Sepolia token transfer's decoded details name the token tracked on Sepolia and its amount at its scale", async () => {
|
|
||||||
state.trackedTokens = [];
|
|
||||||
state.networkTrackedTokens = {
|
|
||||||
sepolia: [{ address: TOKEN, symbol: "TDOL", decimals: 6 }],
|
|
||||||
};
|
|
||||||
await showSepoliaTransferWithMainnetActive();
|
|
||||||
|
|
||||||
expect(decodedLine("Token")).toContain('<div class="font-bold">TDOL</div>');
|
|
||||||
expect(decodedLine("Amount")).toContain(
|
|
||||||
'<div class="font-bold">1234.5000 TDOL</div>',
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
// The same contract address on mainnet is another token, so what the wallet
|
|
||||||
// tracks and holds there names nothing on Sepolia.
|
|
||||||
test("with mainnet active, a Sepolia token transfer's decoded details take nothing from mainnet's tracked tokens or balances", async () => {
|
|
||||||
state.trackedTokens = [{ address: TOKEN, symbol: "MDOL", decimals: 18 }];
|
|
||||||
state.wallets[0].addresses[0].tokenBalances = [
|
|
||||||
{ address: TOKEN, symbol: "MDOL", decimals: 18, balance: "1.0" },
|
|
||||||
];
|
|
||||||
await showSepoliaTransferWithMainnetActive();
|
|
||||||
|
|
||||||
expect(decodedLine("Token")).not.toContain("MDOL");
|
|
||||||
expect(decodedLine("Amount")).toContain(
|
|
||||||
'<div class="font-bold">1234500000 base units (decimals unknown)</div>',
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|||||||
@@ -1,372 +0,0 @@
|
|||||||
// Tracked tokens are kept per network, and the two add-token screens offer the
|
|
||||||
// bundled token list, which holds Ethereum Mainnet contracts, on Ethereum
|
|
||||||
// Mainnet only (https://git.eeqj.de/sneak/AutistMask/issues/523), including on
|
|
||||||
// the screen "Back" lands on after a switch made from the Settings gear and for
|
|
||||||
// a contract lookup that answers after one. Driven through the real popup over
|
|
||||||
// a stored profile; the same switch made by the background is in
|
|
||||||
// tests/coldWorkerChainSwitch.test.js.
|
|
||||||
|
|
||||||
const {
|
|
||||||
bootPopup,
|
|
||||||
cleanupPopup,
|
|
||||||
unversionedValidProfile,
|
|
||||||
ADDRESS,
|
|
||||||
TOKEN_ADDRESS,
|
|
||||||
} = require("./support/popupBoot");
|
|
||||||
const { NETWORKS } = require("../src/shared/networks");
|
|
||||||
|
|
||||||
const SEPOLIA_TOKEN = {
|
|
||||||
address: TOKEN_ADDRESS,
|
|
||||||
symbol: "TST",
|
|
||||||
decimals: 18,
|
|
||||||
name: "Test Token",
|
|
||||||
};
|
|
||||||
const MAINNET_TOKEN = {
|
|
||||||
address: "0x6B175474E89094C44Da98b954EedeAC495271d0F",
|
|
||||||
symbol: "DAI",
|
|
||||||
decimals: 18,
|
|
||||||
name: "Dai Stablecoin",
|
|
||||||
};
|
|
||||||
// Tracked on neither network.
|
|
||||||
const NEW_TOKEN_ADDRESS = "0xBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB";
|
|
||||||
const NETWORK_CHANGED_FLASH =
|
|
||||||
"The active network changed before the lookup finished, so the token was" +
|
|
||||||
" not added.";
|
|
||||||
|
|
||||||
afterEach(() => {
|
|
||||||
cleanupPopup();
|
|
||||||
});
|
|
||||||
|
|
||||||
// The popup reopened onto SettingsAddToken, on `networkId`.
|
|
||||||
function bootOnAddToken(networkId, extra) {
|
|
||||||
return bootPopup(
|
|
||||||
unversionedValidProfile({
|
|
||||||
networkId,
|
|
||||||
currentView: "settings-addtoken",
|
|
||||||
...extra,
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// The popup reopened onto AddressDetail on Ethereum Mainnet, with DAI tracked
|
|
||||||
// there and TST tracked on Sepolia.
|
|
||||||
function bootOnAddress() {
|
|
||||||
return bootPopup(
|
|
||||||
unversionedValidProfile({
|
|
||||||
currentView: "address",
|
|
||||||
selectedWallet: 0,
|
|
||||||
selectedAddress: 0,
|
|
||||||
trackedTokens: [MAINNET_TOKEN],
|
|
||||||
networkTrackedTokens: { sepolia: [SEPOLIA_TOKEN] },
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// The popup reopened onto AddressToken for `token`, with AddressDetail beneath
|
|
||||||
// it, over the same tracked tokens as bootOnAddress().
|
|
||||||
function bootOnToken(token) {
|
|
||||||
return bootPopup(
|
|
||||||
unversionedValidProfile({
|
|
||||||
currentView: "address-token",
|
|
||||||
viewStack: ["main", "address"],
|
|
||||||
selectedWallet: 0,
|
|
||||||
selectedAddress: 0,
|
|
||||||
selectedToken: token,
|
|
||||||
trackedTokens: [MAINNET_TOKEN],
|
|
||||||
networkTrackedTokens: { sepolia: [SEPOLIA_TOKEN] },
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// AddressToken for `token` opened from AddressDetail, as tapping the token's
|
|
||||||
// row there does.
|
|
||||||
async function openToken(boot, token) {
|
|
||||||
const { state } = require("../src/shared/state");
|
|
||||||
state.selectedToken = token;
|
|
||||||
require("../src/popup/views/helpers").pushCurrentView();
|
|
||||||
require("../src/popup/views/addressToken").show();
|
|
||||||
await boot.settle();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Presses `addButton` with a contract lookup that answers only after the
|
|
||||||
// Settings gear and a switch to `networkId`.
|
|
||||||
async function addAcrossSwitch(boot, addButton, networkId) {
|
|
||||||
const { lookupTokenInfo } = require("../src/shared/balances");
|
|
||||||
let answer;
|
|
||||||
lookupTokenInfo.mockImplementationOnce(
|
|
||||||
() =>
|
|
||||||
new Promise((resolve) => {
|
|
||||||
answer = resolve;
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
const adding = boot.click(addButton);
|
|
||||||
await boot.click("btn-settings");
|
|
||||||
await chooseNetwork(boot, networkId);
|
|
||||||
answer({ symbol: "NEW", decimals: 18, name: "New Token" });
|
|
||||||
await adding;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Picks `networkId` in the Settings network selector, as the user does.
|
|
||||||
async function chooseNetwork(boot, networkId) {
|
|
||||||
const select = boot.node("settings-network");
|
|
||||||
select.value = networkId;
|
|
||||||
for (const fn of select.listeners.change) await fn();
|
|
||||||
await boot.settle();
|
|
||||||
}
|
|
||||||
|
|
||||||
// The Settings gear, a switch to Sepolia, and Back.
|
|
||||||
async function gearSwitchBack(boot) {
|
|
||||||
await boot.click("btn-settings");
|
|
||||||
expect(boot.visibleViews()).toEqual(["settings"]);
|
|
||||||
await chooseNetwork(boot, "sepolia");
|
|
||||||
await boot.click("btn-settings-back");
|
|
||||||
}
|
|
||||||
|
|
||||||
describe.each([
|
|
||||||
["mainnet", false],
|
|
||||||
["sepolia", true],
|
|
||||||
])("on %s", (networkId, hidden) => {
|
|
||||||
test(`the common tokens are hidden: ${hidden}`, async () => {
|
|
||||||
const boot = await bootOnAddToken(networkId);
|
|
||||||
expect(boot.pageErrors).toEqual([]);
|
|
||||||
expect(boot.visibleViews()).toEqual(["settings-addtoken"]);
|
|
||||||
expect(boot.hidden("settings-addtoken-common")).toBe(hidden);
|
|
||||||
|
|
||||||
require("../src/popup/views/addToken").show();
|
|
||||||
expect(boot.visibleViews()).toEqual(["add-token"]);
|
|
||||||
expect(boot.hidden("add-token-common")).toBe(hidden);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
test("a token added by contract address on Sepolia is tracked on Sepolia only", async () => {
|
|
||||||
const boot = await bootOnAddToken("sepolia", {
|
|
||||||
networkTrackedTokens: { mainnet: [MAINNET_TOKEN] },
|
|
||||||
});
|
|
||||||
const stored = () => boot.storage.read("autistmask");
|
|
||||||
const { lookupTokenInfo } = require("../src/shared/balances");
|
|
||||||
lookupTokenInfo.mockResolvedValueOnce({
|
|
||||||
symbol: SEPOLIA_TOKEN.symbol,
|
|
||||||
decimals: SEPOLIA_TOKEN.decimals,
|
|
||||||
name: SEPOLIA_TOKEN.name,
|
|
||||||
});
|
|
||||||
|
|
||||||
boot.node("settings-addtoken-address").value = TOKEN_ADDRESS;
|
|
||||||
await boot.click("btn-settings-addtoken-manual");
|
|
||||||
|
|
||||||
expect(lookupTokenInfo).toHaveBeenCalledWith(
|
|
||||||
TOKEN_ADDRESS,
|
|
||||||
expect.any(String),
|
|
||||||
"sepolia",
|
|
||||||
expect.anything(),
|
|
||||||
);
|
|
||||||
expect(stored().trackedTokens).toEqual([SEPOLIA_TOKEN]);
|
|
||||||
|
|
||||||
await chooseNetwork(boot, "mainnet");
|
|
||||||
expect(stored().networkId).toBe("mainnet");
|
|
||||||
expect(stored().trackedTokens).toEqual([MAINNET_TOKEN]);
|
|
||||||
const onMainnet = boot.node("settings-tracked-tokens").innerHTML;
|
|
||||||
expect(onMainnet).toContain("DAI");
|
|
||||||
expect(onMainnet).not.toContain("TST");
|
|
||||||
|
|
||||||
await chooseNetwork(boot, "sepolia");
|
|
||||||
expect(stored().networkId).toBe("sepolia");
|
|
||||||
expect(stored().trackedTokens).toEqual([SEPOLIA_TOKEN]);
|
|
||||||
const onSepolia = boot.node("settings-tracked-tokens").innerHTML;
|
|
||||||
expect(onSepolia).toContain("TST");
|
|
||||||
expect(onSepolia).not.toContain("DAI");
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("Back after a switch from the Settings gear", () => {
|
|
||||||
test("SettingsAddToken no longer offers the common tokens", async () => {
|
|
||||||
const boot = await bootOnAddToken("mainnet");
|
|
||||||
expect(boot.hidden("settings-addtoken-common")).toBe(false);
|
|
||||||
|
|
||||||
await gearSwitchBack(boot);
|
|
||||||
expect(boot.visibleViews()).toEqual(["settings-addtoken"]);
|
|
||||||
expect(boot.hidden("settings-addtoken-common")).toBe(true);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("AddressDetail lists the new network's tracked tokens", async () => {
|
|
||||||
const boot = await bootOnAddress();
|
|
||||||
expect(boot.node("address-balances").innerHTML).toContain("DAI");
|
|
||||||
|
|
||||||
await gearSwitchBack(boot);
|
|
||||||
expect(boot.visibleViews()).toEqual(["address"]);
|
|
||||||
const balances = boot.node("address-balances").innerHTML;
|
|
||||||
expect(balances).toContain("TST");
|
|
||||||
expect(balances).not.toContain("DAI");
|
|
||||||
});
|
|
||||||
|
|
||||||
// Neither can be rendered from saved state, so neither is landed on.
|
|
||||||
test.each([
|
|
||||||
["btn-add-token", "add-token"],
|
|
||||||
["btn-send", "send"],
|
|
||||||
])("from over %s, it lands on AddressDetail", async (button, view) => {
|
|
||||||
const boot = await bootOnAddress();
|
|
||||||
await boot.click(button);
|
|
||||||
expect(boot.visibleViews()).toEqual([view]);
|
|
||||||
|
|
||||||
await gearSwitchBack(boot);
|
|
||||||
expect(boot.visibleViews()).toEqual(["address"]);
|
|
||||||
expect(boot.node("address-balances").innerHTML).not.toContain("DAI");
|
|
||||||
});
|
|
||||||
|
|
||||||
// DAI was picked on Ethereum Mainnet, where alone it is tracked.
|
|
||||||
test.each([
|
|
||||||
[
|
|
||||||
"opened from AddressDetail",
|
|
||||||
async () => {
|
|
||||||
const boot = await bootOnAddress();
|
|
||||||
await openToken(boot, MAINNET_TOKEN.address);
|
|
||||||
return boot;
|
|
||||||
},
|
|
||||||
],
|
|
||||||
["in a reopened popup", () => bootOnToken(MAINNET_TOKEN.address)],
|
|
||||||
])(
|
|
||||||
"from AddressToken for DAI %s, it lands on AddressDetail",
|
|
||||||
async (_how, open) => {
|
|
||||||
const boot = await open();
|
|
||||||
expect(boot.visibleViews()).toEqual(["address-token"]);
|
|
||||||
expect(boot.text("address-token-title")).toContain("DAI");
|
|
||||||
|
|
||||||
await gearSwitchBack(boot);
|
|
||||||
expect(boot.visibleViews()).toEqual(["address"]);
|
|
||||||
const balances = boot.node("address-balances").innerHTML;
|
|
||||||
expect(balances).toContain("TST");
|
|
||||||
expect(balances).not.toContain("DAI");
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
// The stack is saved cut with the switch, so a popup closed straight after
|
|
||||||
// it and reopened onto Settings lands where this one would. Loading a
|
|
||||||
// saved stack cuts it at AddToken and Send as well, but not at
|
|
||||||
// AddressToken.
|
|
||||||
test.each([
|
|
||||||
[
|
|
||||||
"AddressToken for DAI",
|
|
||||||
(boot) => openToken(boot, MAINNET_TOKEN.address),
|
|
||||||
],
|
|
||||||
["AddToken", (boot) => boot.click("btn-add-token")],
|
|
||||||
["Send", (boot) => boot.click("btn-send")],
|
|
||||||
])(
|
|
||||||
"from %s, a popup reopened after the switch lands on AddressDetail",
|
|
||||||
async (_view, open) => {
|
|
||||||
const boot = await bootOnAddress();
|
|
||||||
await open(boot);
|
|
||||||
await boot.click("btn-settings");
|
|
||||||
await chooseNetwork(boot, "sepolia");
|
|
||||||
|
|
||||||
const reopened = await bootPopup(boot.storage.read("autistmask"));
|
|
||||||
expect(reopened.visibleViews()).toEqual(["settings"]);
|
|
||||||
await reopened.click("btn-settings-back");
|
|
||||||
expect(reopened.visibleViews()).toEqual(["address"]);
|
|
||||||
const balances = reopened.node("address-balances").innerHTML;
|
|
||||||
expect(balances).toContain("TST");
|
|
||||||
expect(balances).not.toContain("DAI");
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
test("AddressToken for the native token is drawn again for the new network", async () => {
|
|
||||||
const boot = await bootOnToken("ETH");
|
|
||||||
expect(boot.visibleViews()).toEqual(["address-token"]);
|
|
||||||
|
|
||||||
await gearSwitchBack(boot);
|
|
||||||
expect(boot.visibleViews()).toEqual(["address-token"]);
|
|
||||||
expect(boot.text("address-token-title")).toContain("SepoliaETH");
|
|
||||||
});
|
|
||||||
|
|
||||||
// A popup reopened onto ConfirmTx has no Send beneath it, so "Back" draws
|
|
||||||
// ConfirmTx again from the saved transaction. It is drawn for the network
|
|
||||||
// the transaction was reviewed on, and Sign & Send refuses it on the new
|
|
||||||
// one.
|
|
||||||
test("ConfirmTx reviewed on Sepolia is not sent on Ethereum Mainnet", async () => {
|
|
||||||
const boot = await bootPopup(
|
|
||||||
unversionedValidProfile({
|
|
||||||
networkId: "sepolia",
|
|
||||||
currentView: "confirm-tx",
|
|
||||||
selectedWallet: 0,
|
|
||||||
selectedAddress: 0,
|
|
||||||
viewData: {
|
|
||||||
pendingTx: {
|
|
||||||
token: "ETH",
|
|
||||||
from: ADDRESS,
|
|
||||||
to: ADDRESS,
|
|
||||||
amount: "1",
|
|
||||||
chainId: NETWORKS.sepolia.chainId,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
expect(boot.visibleViews()).toEqual(["confirm-tx"]);
|
|
||||||
|
|
||||||
await boot.click("btn-settings");
|
|
||||||
await chooseNetwork(boot, "mainnet");
|
|
||||||
globalThis.fetch.mockClear();
|
|
||||||
await boot.click("btn-settings-back");
|
|
||||||
expect(boot.visibleViews()).toEqual(["confirm-tx"]);
|
|
||||||
// Drawn again: its Etherscan label check asks Sepolia's explorer.
|
|
||||||
expect(globalThis.fetch.mock.calls.map((call) => call[0])).toEqual([
|
|
||||||
NETWORKS.sepolia.explorerUrl + "/address/" + ADDRESS,
|
|
||||||
]);
|
|
||||||
expect(boot.text("confirm-type")).toBe("Native SepoliaETH transfer");
|
|
||||||
|
|
||||||
boot.node("confirm-tx-password").value = "any password";
|
|
||||||
await boot.click("btn-confirm-send");
|
|
||||||
expect(boot.visibleViews()).toEqual(["confirm-tx"]);
|
|
||||||
expect(
|
|
||||||
boot.node("confirm-network-changed-error").style.visibility,
|
|
||||||
).toBe("visible");
|
|
||||||
// Refused before the password is even tried.
|
|
||||||
expect(boot.text("confirm-tx-password-error")).toBe("");
|
|
||||||
});
|
|
||||||
|
|
||||||
test("without a wallet, it lands on Welcome", async () => {
|
|
||||||
const boot = await bootPopup(undefined);
|
|
||||||
expect(boot.visibleViews()).toEqual(["welcome"]);
|
|
||||||
|
|
||||||
await gearSwitchBack(boot);
|
|
||||||
expect(boot.visibleViews()).toEqual(["welcome"]);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("a later Back onto Settings keeps what was typed there", async () => {
|
|
||||||
const boot = await bootOnAddress();
|
|
||||||
await boot.click("btn-settings");
|
|
||||||
await chooseNetwork(boot, "sepolia");
|
|
||||||
boot.node("settings-rpc").value = "https://typed.example";
|
|
||||||
|
|
||||||
await boot.click("btn-settings-add-token");
|
|
||||||
expect(boot.visibleViews()).toEqual(["settings-addtoken"]);
|
|
||||||
await boot.click("btn-settings-addtoken-back");
|
|
||||||
expect(boot.visibleViews()).toEqual(["settings"]);
|
|
||||||
expect(boot.value("settings-rpc")).toBe("https://typed.example");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("a contract lookup that answers after a switch adds nothing", () => {
|
|
||||||
test("from SettingsAddToken", async () => {
|
|
||||||
const boot = await bootOnAddToken("sepolia", {
|
|
||||||
networkTrackedTokens: { mainnet: [MAINNET_TOKEN] },
|
|
||||||
});
|
|
||||||
const stored = () => boot.storage.read("autistmask");
|
|
||||||
boot.node("settings-addtoken-address").value = NEW_TOKEN_ADDRESS;
|
|
||||||
|
|
||||||
await addAcrossSwitch(boot, "btn-settings-addtoken-manual", "mainnet");
|
|
||||||
expect(boot.visibleViews()).toEqual(["settings"]);
|
|
||||||
expect(boot.text("flash-msg")).toBe(NETWORK_CHANGED_FLASH);
|
|
||||||
expect(stored().trackedTokens).toEqual([MAINNET_TOKEN]);
|
|
||||||
expect(stored().networkTrackedTokens.sepolia).toEqual([]);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("from AddToken", async () => {
|
|
||||||
const boot = await bootOnAddress();
|
|
||||||
const stored = () => boot.storage.read("autistmask");
|
|
||||||
await boot.click("btn-add-token");
|
|
||||||
boot.node("add-token-address").value = NEW_TOKEN_ADDRESS;
|
|
||||||
|
|
||||||
await addAcrossSwitch(boot, "btn-add-token-confirm", "sepolia");
|
|
||||||
expect(boot.visibleViews()).toEqual(["settings"]);
|
|
||||||
expect(boot.text("flash-msg")).toBe(NETWORK_CHANGED_FLASH);
|
|
||||||
expect(stored().trackedTokens).toEqual([SEPOLIA_TOKEN]);
|
|
||||||
expect(stored().networkTrackedTokens.mainnet).toEqual([MAINNET_TOKEN]);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
+3
-176
@@ -29,13 +29,8 @@ jest.mock("../src/shared/log", () => ({
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
const mockReceiptLookup = jest.fn();
|
const mockReceiptLookup = jest.fn();
|
||||||
// The RPC URL and network of every node a wait was given.
|
|
||||||
const mockNodes = [];
|
|
||||||
jest.mock("../src/shared/balances", () => ({
|
jest.mock("../src/shared/balances", () => ({
|
||||||
getProvider: (rpcUrl, networkId) => {
|
getProvider: () => ({ getTransactionReceipt: mockReceiptLookup }),
|
||||||
mockNodes.push({ rpcUrl, networkId });
|
|
||||||
return { getTransactionReceipt: mockReceiptLookup };
|
|
||||||
},
|
|
||||||
refreshBalances: jest.fn(),
|
refreshBalances: jest.fn(),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
@@ -112,7 +107,6 @@ global.chrome = { storage };
|
|||||||
|
|
||||||
const txStatus = require("../src/popup/views/txStatus");
|
const txStatus = require("../src/popup/views/txStatus");
|
||||||
const { state } = require("../src/shared/state");
|
const { state } = require("../src/shared/state");
|
||||||
const { NETWORKS } = require("../src/shared/networks");
|
|
||||||
const { RESTORABLE_VIEWS } = require("../src/shared/restorableViews");
|
const { RESTORABLE_VIEWS } = require("../src/shared/restorableViews");
|
||||||
const { log } = require("../src/shared/log");
|
const { log } = require("../src/shared/log");
|
||||||
|
|
||||||
@@ -124,7 +118,6 @@ const TX_INFO = {
|
|||||||
amount: "0.0050",
|
amount: "0.0050",
|
||||||
token: "ETH",
|
token: "ETH",
|
||||||
tokenSymbol: null,
|
tokenSymbol: null,
|
||||||
chainId: NETWORKS.mainnet.chainId,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// True when a view element is not hidden.
|
// True when a view element is not hidden.
|
||||||
@@ -144,14 +137,8 @@ beforeEach(() => {
|
|||||||
jest.setSystemTime(new Date("2026-08-11T12:00:00Z"));
|
jest.setSystemTime(new Date("2026-08-11T12:00:00Z"));
|
||||||
elements.clear();
|
elements.clear();
|
||||||
mockReceiptLookup.mockReset();
|
mockReceiptLookup.mockReset();
|
||||||
mockNodes.length = 0;
|
|
||||||
log.errorf.mockClear();
|
log.errorf.mockClear();
|
||||||
state.networkId = "mainnet";
|
|
||||||
state.rpcUrl = NETWORKS.mainnet.defaultRpcUrl;
|
|
||||||
state.networkEndpoints = {};
|
|
||||||
state.wallets = [];
|
state.wallets = [];
|
||||||
state.trackedTokens = [];
|
|
||||||
state.networkTrackedTokens = {};
|
|
||||||
state.viewData = {};
|
state.viewData = {};
|
||||||
state.viewStack = [];
|
state.viewStack = [];
|
||||||
state.currentView = null;
|
state.currentView = null;
|
||||||
@@ -362,14 +349,14 @@ describe("WaitTx persistence across popup close", () => {
|
|||||||
// out of restoreView().
|
// out of restoreView().
|
||||||
{
|
{
|
||||||
hash: TX_HASH,
|
hash: TX_HASH,
|
||||||
txInfo: { ...TX_INFO, to: 42 },
|
txInfo: { to: 42, amount: "0.0050" },
|
||||||
broadcastTime: Date.now(),
|
broadcastTime: Date.now(),
|
||||||
},
|
},
|
||||||
// Otherwise complete but an array: only Array.isArray() rejects
|
// Otherwise complete but an array: only Array.isArray() rejects
|
||||||
// it, since typeof [] is "object" and the fields are present.
|
// it, since typeof [] is "object" and the fields are present.
|
||||||
{
|
{
|
||||||
hash: TX_HASH,
|
hash: TX_HASH,
|
||||||
txInfo: Object.assign([], TX_INFO),
|
txInfo: Object.assign([], { to: RECIPIENT, amount: "0.0050" }),
|
||||||
broadcastTime: Date.now(),
|
broadcastTime: Date.now(),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -377,18 +364,6 @@ describe("WaitTx persistence across popup close", () => {
|
|||||||
txInfo: { to: RECIPIENT },
|
txInfo: { to: RECIPIENT },
|
||||||
broadcastTime: Date.now(),
|
broadcastTime: Date.now(),
|
||||||
},
|
},
|
||||||
// Otherwise complete but for a chain id naming no network: there
|
|
||||||
// is no node to ask for the receipt, and no explorer to link to.
|
|
||||||
{
|
|
||||||
hash: TX_HASH,
|
|
||||||
txInfo: { ...TX_INFO, chainId: undefined },
|
|
||||||
broadcastTime: Date.now(),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
hash: TX_HASH,
|
|
||||||
txInfo: { ...TX_INFO, chainId: "0x5" },
|
|
||||||
broadcastTime: Date.now(),
|
|
||||||
},
|
|
||||||
]) {
|
]) {
|
||||||
state.viewData = { pendingWait: bad };
|
state.viewData = { pendingWait: bad };
|
||||||
expect(txStatus.restoreWait()).toBe(false);
|
expect(txStatus.restoreWait()).toBe(false);
|
||||||
@@ -524,154 +499,6 @@ describe("WaitTx when the popup closes", () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// The popup can reopen onto WaitTx after Settings switched the network. The
|
|
||||||
// wait asked the active network's node for the receipt, never found it, and
|
|
||||||
// reported a timeout, and its links went to the active network's explorer
|
|
||||||
// (https://git.eeqj.de/sneak/AutistMask/issues/584).
|
|
||||||
describe("WaitTx for a Sepolia transaction with mainnet active", () => {
|
|
||||||
const SEPOLIA_NODE = "https://sepolia.node.example.invalid";
|
|
||||||
const sepoliaTx = { ...TX_INFO, chainId: NETWORKS.sepolia.chainId };
|
|
||||||
|
|
||||||
beforeEach(() => {
|
|
||||||
state.rpcUrl = "https://mainnet.node.example.invalid";
|
|
||||||
state.networkEndpoints = { sepolia: { rpcUrl: SEPOLIA_NODE } };
|
|
||||||
});
|
|
||||||
|
|
||||||
test("the receipt is asked of the Sepolia node Settings has", async () => {
|
|
||||||
mockReceiptLookup.mockResolvedValue({ blockNumber: 21000000 });
|
|
||||||
state.viewData = {
|
|
||||||
pendingWait: {
|
|
||||||
txInfo: sepoliaTx,
|
|
||||||
hash: TX_HASH,
|
|
||||||
broadcastTime: Date.now(),
|
|
||||||
},
|
|
||||||
};
|
|
||||||
expect(txStatus.restoreWait()).toBe(true);
|
|
||||||
await jest.advanceTimersByTimeAsync(0);
|
|
||||||
|
|
||||||
expect(mockNodes).toEqual([
|
|
||||||
{ rpcUrl: SEPOLIA_NODE, networkId: "sepolia" },
|
|
||||||
]);
|
|
||||||
expect(state.currentView).toBe("success-tx");
|
|
||||||
});
|
|
||||||
|
|
||||||
test("the recipient and hash link to the Sepolia explorer", () => {
|
|
||||||
mockReceiptLookup.mockResolvedValue(null);
|
|
||||||
txStatus.showWait(sepoliaTx, TX_HASH);
|
|
||||||
|
|
||||||
expect(getElement("wait-tx-to").innerHTML).toContain(
|
|
||||||
`href="https://sepolia.etherscan.io/address/${RECIPIENT}"`,
|
|
||||||
);
|
|
||||||
expect(getElement("wait-tx-hash").innerHTML).toContain(
|
|
||||||
`href="https://sepolia.etherscan.io/tx/${TX_HASH}"`,
|
|
||||||
);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
// SuccessTx and ErrorTx follow WaitTx and describe the same transaction, but
|
|
||||||
// their links went to the active network's explorer
|
|
||||||
// (https://git.eeqj.de/sneak/AutistMask/issues/622). Each test checks the
|
|
||||||
// screen again after rendering it from its stored view data alone, as a
|
|
||||||
// reopened popup does.
|
|
||||||
describe("SuccessTx and ErrorTx for a Sepolia transaction with mainnet active", () => {
|
|
||||||
const SEPOLIA_EXPLORER = "https://sepolia.etherscan.io";
|
|
||||||
const TOKEN = "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238";
|
|
||||||
const sepoliaTx = { ...TX_INFO, chainId: NETWORKS.sepolia.chainId };
|
|
||||||
|
|
||||||
test("the recipient, block and hash on SuccessTx link to the Sepolia explorer", async () => {
|
|
||||||
function expectSepoliaLinks() {
|
|
||||||
expect(getElement("success-tx-to").innerHTML).toContain(
|
|
||||||
`href="${SEPOLIA_EXPLORER}/address/${RECIPIENT}"`,
|
|
||||||
);
|
|
||||||
expect(getElement("success-tx-block").innerHTML).toContain(
|
|
||||||
`href="${SEPOLIA_EXPLORER}/block/21000000"`,
|
|
||||||
);
|
|
||||||
expect(getElement("success-tx-hash").innerHTML).toContain(
|
|
||||||
`href="${SEPOLIA_EXPLORER}/tx/${TX_HASH}"`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
mockReceiptLookup.mockResolvedValue({ blockNumber: 21000000 });
|
|
||||||
txStatus.showWait(sepoliaTx, TX_HASH);
|
|
||||||
await jest.advanceTimersByTimeAsync(10000);
|
|
||||||
expect(state.currentView).toBe("success-tx");
|
|
||||||
expectSepoliaLinks();
|
|
||||||
|
|
||||||
elements.clear();
|
|
||||||
txStatus.renderSuccess();
|
|
||||||
expectSepoliaLinks();
|
|
||||||
});
|
|
||||||
|
|
||||||
test("the addresses in SuccessTx's decoded action link to the Sepolia explorer", async () => {
|
|
||||||
function expectSepoliaLinks() {
|
|
||||||
const html = getElement("success-tx-decoded").innerHTML;
|
|
||||||
expect(html).toContain(
|
|
||||||
`href="${SEPOLIA_EXPLORER}/address/${TOKEN}"`,
|
|
||||||
);
|
|
||||||
expect(html).toContain(
|
|
||||||
`href="${SEPOLIA_EXPLORER}/address/${RECIPIENT}"`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
const decoded = {
|
|
||||||
name: "Transfer",
|
|
||||||
details: [
|
|
||||||
{ label: "Token", address: TOKEN, isToken: true },
|
|
||||||
{ label: "Recipient", address: RECIPIENT },
|
|
||||||
],
|
|
||||||
};
|
|
||||||
mockReceiptLookup.mockResolvedValue({ blockNumber: 21000000 });
|
|
||||||
txStatus.showWait({ ...sepoliaTx, decoded }, TX_HASH);
|
|
||||||
await jest.advanceTimersByTimeAsync(10000);
|
|
||||||
expect(state.currentView).toBe("success-tx");
|
|
||||||
expectSepoliaLinks();
|
|
||||||
|
|
||||||
elements.clear();
|
|
||||||
txStatus.renderSuccess();
|
|
||||||
expectSepoliaLinks();
|
|
||||||
});
|
|
||||||
|
|
||||||
// https://git.eeqj.de/sneak/AutistMask/issues/629
|
|
||||||
test("SuccessTx's decoded action names the token from the tokens tracked on Sepolia", async () => {
|
|
||||||
function expectTokenNamed() {
|
|
||||||
expect(getElement("success-tx-decoded").innerHTML).toContain(
|
|
||||||
'<div class="font-bold">TDOL</div>',
|
|
||||||
);
|
|
||||||
}
|
|
||||||
state.networkTrackedTokens = {
|
|
||||||
sepolia: [{ address: TOKEN, symbol: "TDOL", decimals: 6 }],
|
|
||||||
};
|
|
||||||
const decoded = {
|
|
||||||
name: "Transfer",
|
|
||||||
details: [{ label: "Token", address: TOKEN, isToken: true }],
|
|
||||||
};
|
|
||||||
mockReceiptLookup.mockResolvedValue({ blockNumber: 21000000 });
|
|
||||||
txStatus.showWait({ ...sepoliaTx, decoded }, TX_HASH);
|
|
||||||
await jest.advanceTimersByTimeAsync(10000);
|
|
||||||
expect(state.currentView).toBe("success-tx");
|
|
||||||
expectTokenNamed();
|
|
||||||
|
|
||||||
elements.clear();
|
|
||||||
txStatus.renderSuccess();
|
|
||||||
expectTokenNamed();
|
|
||||||
});
|
|
||||||
|
|
||||||
test("the recipient and hash on ErrorTx link to the Sepolia explorer", () => {
|
|
||||||
function expectSepoliaLinks() {
|
|
||||||
expect(getElement("error-tx-to").innerHTML).toContain(
|
|
||||||
`href="${SEPOLIA_EXPLORER}/address/${RECIPIENT}"`,
|
|
||||||
);
|
|
||||||
expect(getElement("error-tx-hash").innerHTML).toContain(
|
|
||||||
`href="${SEPOLIA_EXPLORER}/tx/${TX_HASH}"`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
txStatus.showError(sepoliaTx, TX_HASH, "The transaction failed.");
|
|
||||||
expectSepoliaLinks();
|
|
||||||
|
|
||||||
elements.clear();
|
|
||||||
txStatus.renderError();
|
|
||||||
expectSepoliaLinks();
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
describe("wait-tx is a view the popup may reopen onto", () => {
|
describe("wait-tx is a view the popup may reopen onto", () => {
|
||||||
// The resume feature is wired through RESTORABLE_VIEWS: restoreView()
|
// The resume feature is wired through RESTORABLE_VIEWS: restoreView()
|
||||||
// refuses any view not in the set, so dropping "wait-tx" from it kills
|
// refuses any view not in the set, so dropping "wait-tx" from it kills
|
||||||
|
|||||||
+80
-1522
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -7,12 +7,6 @@
|
|||||||
// only when the transaction is sent to a Universal Router deployment on the
|
// only when the transaction is sent to a Universal Router deployment on the
|
||||||
// network it is for; anywhere else it is left to the raw data.
|
// network it is for; anywhere else it is left to the raw data.
|
||||||
//
|
//
|
||||||
// The transaction history labelled any call named `execute` or `multicall` a
|
|
||||||
// Swap, whatever address it went to
|
|
||||||
// (https://git.eeqj.de/sneak/AutistMask/issues/580). It now does so only for
|
|
||||||
// such a call sent to a Universal Router deployment on the network the
|
|
||||||
// transaction is on; any other is labelled by its method name.
|
|
||||||
//
|
|
||||||
// The transaction detail screen and the approval screen are driven against a
|
// The transaction detail screen and the approval screen are driven against a
|
||||||
// minimal DOM stub in the shape tests/tokenTransferDetail.test.js uses, the
|
// minimal DOM stub in the shape tests/tokenTransferDetail.test.js uses, the
|
||||||
// approval screen opened the way tests/swapStatusAmount.test.js opens it.
|
// approval screen opened the way tests/swapStatusAmount.test.js opens it.
|
||||||
@@ -39,7 +33,6 @@ globalThis.chrome = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const { state } = require("../src/shared/state");
|
const { state } = require("../src/shared/state");
|
||||||
const { fetchRecentTransactions } = require("../src/shared/transactions");
|
|
||||||
const approval = require("../src/popup/views/approval");
|
const approval = require("../src/popup/views/approval");
|
||||||
const { decodeCalldata } = approval;
|
const { decodeCalldata } = approval;
|
||||||
const transactionDetail = require("../src/popup/views/transactionDetail");
|
const transactionDetail = require("../src/popup/views/transactionDetail");
|
||||||
@@ -54,8 +47,6 @@ const SEPOLIA_ROUTER = "0x3a9d48ab9751398bbfa63ad67599bb04e4bdf98b";
|
|||||||
const ROUTER_ON_BOTH = "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD";
|
const ROUTER_ON_BOTH = "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD";
|
||||||
// The address with no code from the issue.
|
// The address with no code from the issue.
|
||||||
const ORDINARY = "0x0b0050Da68435b3EcBC236c40F16dB2070bCD79A";
|
const ORDINARY = "0x0b0050Da68435b3EcBC236c40F16dB2070bCD79A";
|
||||||
// A contract that is not a router, such as a multisig.
|
|
||||||
const OTHER_CONTRACT = "0x5afe000000000000000000000000000000005afe";
|
|
||||||
|
|
||||||
const RECIPIENT = "0xC0FfEE0000000000000000000000000000c0fFEe";
|
const RECIPIENT = "0xC0FfEE0000000000000000000000000000c0fFEe";
|
||||||
const SEPOLIA_WETH = "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14";
|
const SEPOLIA_WETH = "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14";
|
||||||
@@ -138,13 +129,8 @@ describe("execute() calldata on the approval screen's decoder", () => {
|
|||||||
// The transaction the explorer reports: SWAP_DATA, sent to `mockSentTo`.
|
// The transaction the explorer reports: SWAP_DATA, sent to `mockSentTo`.
|
||||||
const TX_HASH = "0x" + "5".repeat(64);
|
const TX_HASH = "0x" + "5".repeat(64);
|
||||||
let mockSentTo = null;
|
let mockSentTo = null;
|
||||||
// The transactions the explorer reports for RECIPIENT's history.
|
|
||||||
let mockHistory = [];
|
|
||||||
|
|
||||||
function mockExplorerAnswer(url) {
|
function mockExplorerAnswer(url) {
|
||||||
if (url.endsWith("/addresses/" + RECIPIENT + "/transactions")) {
|
|
||||||
return { items: mockHistory };
|
|
||||||
}
|
|
||||||
if (url.endsWith("/transactions/" + TX_HASH)) {
|
if (url.endsWith("/transactions/" + TX_HASH)) {
|
||||||
return {
|
return {
|
||||||
to: { hash: mockSentTo },
|
to: { hash: mockSentTo },
|
||||||
@@ -200,126 +186,57 @@ function node(id) {
|
|||||||
return globalThis.document.getElementById(id);
|
return globalThis.document.getElementById(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Open the transaction detail screen with `activeNetworkId` active, for the
|
// Open the transaction detail screen with Sepolia active, for the
|
||||||
// history row `row`, and wait for its decoded details.
|
// transaction the explorer reports sent to `sentTo`, and wait for its
|
||||||
async function showDetail(row, activeNetworkId) {
|
// decoded details.
|
||||||
mockSentTo = row.to;
|
async function showDetailSentTo(sentTo) {
|
||||||
|
mockSentTo = sentTo;
|
||||||
globalThis.document = makeDocument();
|
globalThis.document = makeDocument();
|
||||||
globalThis.window = { location: { search: "" } };
|
globalThis.window = { location: { search: "" } };
|
||||||
state.networkId = activeNetworkId;
|
state.networkId = "sepolia";
|
||||||
state.blockscoutUrl = "https://explorer.example/api/v2";
|
state.blockscoutUrl = "https://explorer.example/api/v2";
|
||||||
state.viewData = {};
|
state.viewData = {};
|
||||||
state.viewStack = [];
|
state.viewStack = [];
|
||||||
state.currentView = null;
|
state.currentView = null;
|
||||||
transactionDetail.show(row);
|
transactionDetail.show({
|
||||||
|
hash: TX_HASH,
|
||||||
|
from: RECIPIENT,
|
||||||
|
to: sentTo,
|
||||||
|
value: "",
|
||||||
|
symbol: "SepoliaETH",
|
||||||
|
timestamp: 1790000000,
|
||||||
|
isError: false,
|
||||||
|
direction: "contract",
|
||||||
|
directionLabel: "Swap",
|
||||||
|
method: "execute",
|
||||||
|
chainId: SEPOLIA,
|
||||||
|
});
|
||||||
for (let i = 0; i < 10; i++) await new Promise((r) => setTimeout(r, 0));
|
for (let i = 0; i < 10; i++) await new Promise((r) => setTimeout(r, 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Open the transaction detail screen with `activeNetworkId` active, for the
|
|
||||||
// Sepolia transaction the explorer reports sent to `sentTo`, and wait for its
|
|
||||||
// decoded details.
|
|
||||||
async function showDetailSentTo(sentTo, activeNetworkId) {
|
|
||||||
await showDetail(
|
|
||||||
{
|
|
||||||
hash: TX_HASH,
|
|
||||||
from: RECIPIENT,
|
|
||||||
to: sentTo,
|
|
||||||
value: "",
|
|
||||||
symbol: "SepoliaETH",
|
|
||||||
timestamp: 1790000000,
|
|
||||||
isError: false,
|
|
||||||
direction: "contract",
|
|
||||||
directionLabel: "Swap",
|
|
||||||
method: "execute",
|
|
||||||
chainId: SEPOLIA,
|
|
||||||
},
|
|
||||||
activeNetworkId,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
describe("execute() calldata on the transaction detail screen", () => {
|
describe("execute() calldata on the transaction detail screen", () => {
|
||||||
test("sent to a router on the active network, it is a swap", async () => {
|
test("sent to a router on the active network, it is a swap", async () => {
|
||||||
await showDetailSentTo(SEPOLIA_ROUTER, "sepolia");
|
await showDetailSentTo(SEPOLIA_ROUTER);
|
||||||
expect(node("tx-detail-calldata-details").innerHTML).toContain(
|
|
||||||
"Swap via Uniswap Universal Router",
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
// https://git.eeqj.de/sneak/AutistMask/issues/623
|
|
||||||
test("sent to a router on its network, with the other network active, it is a swap", async () => {
|
|
||||||
await showDetailSentTo(SEPOLIA_ROUTER, "mainnet");
|
|
||||||
expect(node("tx-detail-calldata-details").innerHTML).toContain(
|
expect(node("tx-detail-calldata-details").innerHTML).toContain(
|
||||||
"Swap via Uniswap Universal Router",
|
"Swap via Uniswap Universal Router",
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("sent to an ordinary address, it is not decoded", async () => {
|
test("sent to an ordinary address, it is not decoded", async () => {
|
||||||
await showDetailSentTo(ORDINARY, "sepolia");
|
await showDetailSentTo(ORDINARY);
|
||||||
expect(node("tx-detail-calldata-action").textContent).toBe("execute");
|
expect(node("tx-detail-calldata-action").textContent).toBe("execute");
|
||||||
expect(node("tx-detail-calldata-details").innerHTML).toBe("");
|
expect(node("tx-detail-calldata-details").innerHTML).toBe("");
|
||||||
expect(node("tx-detail-rawdata").innerHTML).toContain(SWAP_DATA);
|
expect(node("tx-detail-rawdata").innerHTML).toContain(SWAP_DATA);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("sent to a router of the other network only, it is not decoded", async () => {
|
test("sent to a router of the other network only, it is not decoded", async () => {
|
||||||
await showDetailSentTo(MAINNET_ROUTER, "sepolia");
|
await showDetailSentTo(MAINNET_ROUTER);
|
||||||
expect(node("tx-detail-calldata-action").textContent).toBe("execute");
|
expect(node("tx-detail-calldata-action").textContent).toBe("execute");
|
||||||
expect(node("tx-detail-calldata-details").innerHTML).toBe("");
|
expect(node("tx-detail-calldata-details").innerHTML).toBe("");
|
||||||
expect(node("tx-detail-rawdata").innerHTML).toContain(SWAP_DATA);
|
expect(node("tx-detail-rawdata").innerHTML).toContain(SWAP_DATA);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
// The history row made from the explorer's answer for RECIPIENT's `method`
|
|
||||||
// call sent to the contract `sentTo` on the network with `chainId`. The
|
|
||||||
// explorer gives the address in checksummed form.
|
|
||||||
async function historyRow(method, sentTo, chainId) {
|
|
||||||
mockHistory = [
|
|
||||||
{
|
|
||||||
hash: TX_HASH,
|
|
||||||
block_number: 7000000,
|
|
||||||
timestamp: "2026-09-01T00:00:00Z",
|
|
||||||
from: { hash: RECIPIENT },
|
|
||||||
to: { hash: getAddress(sentTo), is_contract: true },
|
|
||||||
value: "0",
|
|
||||||
method,
|
|
||||||
status: "ok",
|
|
||||||
},
|
|
||||||
];
|
|
||||||
const rows = await fetchRecentTransactions(
|
|
||||||
RECIPIENT,
|
|
||||||
"https://explorer.example/api/v2",
|
|
||||||
chainId,
|
|
||||||
);
|
|
||||||
return rows[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
// The history row's label and TransactionDetail's Type line, for a Sepolia
|
|
||||||
// transaction. The active network does not decide either.
|
|
||||||
describe.each([
|
|
||||||
["execute", "Execute"],
|
|
||||||
["multicall", "Multicall"],
|
|
||||||
])("a %s() call in the history", (method, methodLabel) => {
|
|
||||||
test("sent to a router on its network, it is a Swap", async () => {
|
|
||||||
const row = await historyRow(method, SEPOLIA_ROUTER, SEPOLIA);
|
|
||||||
expect(row.directionLabel).toBe("Swap");
|
|
||||||
await showDetail(row, "mainnet");
|
|
||||||
expect(node("tx-detail-type").textContent).toBe("Swap");
|
|
||||||
});
|
|
||||||
|
|
||||||
test("sent to another contract, it is labelled by its method name", async () => {
|
|
||||||
const row = await historyRow(method, OTHER_CONTRACT, SEPOLIA);
|
|
||||||
expect(row.directionLabel).toBe(methodLabel);
|
|
||||||
await showDetail(row, "sepolia");
|
|
||||||
expect(node("tx-detail-type").textContent).toBe("Contract Call");
|
|
||||||
});
|
|
||||||
|
|
||||||
test("sent to a router of the other network only, it is labelled by its method name", async () => {
|
|
||||||
const row = await historyRow(method, MAINNET_ROUTER, SEPOLIA);
|
|
||||||
expect(row.directionLabel).toBe(methodLabel);
|
|
||||||
await showDetail(row, "mainnet");
|
|
||||||
expect(node("tx-detail-type").textContent).toBe("Contract Call");
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
// Open the approval screen with Ethereum Mainnet active, for a site's Sepolia
|
// Open the approval screen with Ethereum Mainnet active, for a site's Sepolia
|
||||||
// transaction that sends SWAP_DATA to `sentTo`.
|
// transaction that sends SWAP_DATA to `sentTo`.
|
||||||
async function showApprovalSentTo(sentTo) {
|
async function showApprovalSentTo(sentTo) {
|
||||||
|
|||||||
@@ -53,14 +53,7 @@ function unwrapData() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function detail(data, label, sources) {
|
function detail(data, label, sources) {
|
||||||
// Sent by the address the swap pays, so the output is the user's.
|
const decoded = uniswap.decode(data, ROUTER, "0x1", sources || {});
|
||||||
const decoded = uniswap.decode(
|
|
||||||
data,
|
|
||||||
ROUTER,
|
|
||||||
"0x1",
|
|
||||||
sources || {},
|
|
||||||
RECIPIENT,
|
|
||||||
);
|
|
||||||
return decoded.details.find((d) => d.label === label);
|
return decoded.details.find((d) => d.label === label);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -71,8 +71,6 @@ function exactInParams(currencyIn, path, amountIn, amountOutMin) {
|
|||||||
|
|
||||||
// BALANCE_CHECK_ERC20 (command 0x0e): (address owner, address token,
|
// BALANCE_CHECK_ERC20 (command 0x0e): (address owner, address token,
|
||||||
// uint256 minBalance). It names the output token and nothing about the input.
|
// uint256 minBalance). It names the output token and nothing about the input.
|
||||||
// Its owner is USER, the transaction's sender: a check of any other address
|
|
||||||
// names no output token.
|
|
||||||
function balanceCheck(token, minBalance) {
|
function balanceCheck(token, minBalance) {
|
||||||
return coder.encode(
|
return coder.encode(
|
||||||
["address", "address", "uint256"],
|
["address", "address", "uint256"],
|
||||||
@@ -80,13 +78,8 @@ function balanceCheck(token, minBalance) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// A transaction from USER.
|
|
||||||
function decode(data) {
|
|
||||||
return uniswap.decode(data, ROUTER, "0x1", {}, USER);
|
|
||||||
}
|
|
||||||
|
|
||||||
function detail(data, label) {
|
function detail(data, label) {
|
||||||
const decoded = decode(data);
|
const decoded = uniswap.decode(data, ROUTER, "0x1", {});
|
||||||
expect(decoded).not.toBeNull();
|
expect(decoded).not.toBeNull();
|
||||||
return decoded.details.find((d) => d.label === label);
|
return decoded.details.find((d) => d.label === label);
|
||||||
}
|
}
|
||||||
@@ -94,7 +87,7 @@ function detail(data, label) {
|
|||||||
describe("an execute() whose input currency never decoded", () => {
|
describe("an execute() whose input currency never decoded", () => {
|
||||||
// A V4_SWAP whose sub-action params do not decode — an action encoding
|
// A V4_SWAP whose sub-action params do not decode — an action encoding
|
||||||
// this decoder does not know — leaves every V4 token null. The
|
// this decoder does not know — leaves every V4 token null. The
|
||||||
// BALANCE_CHECK still names the output, so the screen has a minimum
|
// BALANCE_CHECK still names the output, so the screen has a Min. received
|
||||||
// figure and a Token Out, and previously claimed the user was paying ETH
|
// figure and a Token Out, and previously claimed the user was paying ETH
|
||||||
// for them.
|
// for them.
|
||||||
const data = () =>
|
const data = () =>
|
||||||
@@ -120,7 +113,9 @@ describe("an execute() whose input currency never decoded", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test("does not name ETH in the swap title either", () => {
|
test("does not name ETH in the swap title either", () => {
|
||||||
expect(decode(data()).name).toBe("Uniswap Swap");
|
expect(uniswap.decode(data(), ROUTER, "0x1", {}).name).toBe(
|
||||||
|
"Uniswap Swap",
|
||||||
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -130,13 +125,14 @@ describe("an execute() that names only an output token", () => {
|
|||||||
|
|
||||||
test("refuses the input rather than defaulting it to ETH", () => {
|
test("refuses the input rather than defaulting it to ETH", () => {
|
||||||
expect(detail(data(), "Token In").value).toBe(REFUSAL);
|
expect(detail(data(), "Token In").value).toBe(REFUSAL);
|
||||||
expect(decode(data()).name).toBe("Uniswap Swap");
|
expect(uniswap.decode(data(), ROUTER, "0x1", {}).name).toBe(
|
||||||
|
"Uniswap Swap",
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("still states the output it did establish", () => {
|
test("still states the output it did establish", () => {
|
||||||
expect(detail(data(), "Token Out").value).toContain("USDT");
|
expect(detail(data(), "Token Out").value).toContain("USDT");
|
||||||
// No step pays anyone, so the minimum is not said to be received.
|
expect(detail(data(), "Min. received").value).toBe("2.0000 USDT");
|
||||||
expect(detail(data(), "Min. paid out").value).toBe("2.0000 USDT");
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -178,7 +174,9 @@ describe("native ETH in, which V4 spells as the zero address", () => {
|
|||||||
|
|
||||||
expect(detail(data, "Token In").value).toBe("ETH (native)");
|
expect(detail(data, "Token In").value).toBe("ETH (native)");
|
||||||
expect(detail(data, "Amount").value).toBe("1.0000 ETH");
|
expect(detail(data, "Amount").value).toBe("1.0000 ETH");
|
||||||
expect(decode(data).name).toBe("Swap ETH → USDT");
|
expect(uniswap.decode(data, ROUTER, "0x1", {}).name).toBe(
|
||||||
|
"Swap ETH → USDT",
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("WRAP_ETH is still ETH at 18 decimals", () => {
|
test("WRAP_ETH is still ETH at 18 decimals", () => {
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ function v3ExactIn(tokenIn, tokenOut, amountIn, amountOutMin) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function detail(data, label) {
|
function detail(data, label) {
|
||||||
const decoded = uniswap.decode(data, ROUTER, "0x1", {}, USER);
|
const decoded = uniswap.decode(data, ROUTER, "0x1", {});
|
||||||
expect(decoded).not.toBeNull();
|
expect(decoded).not.toBeNull();
|
||||||
return decoded.details.find((d) => d.label === label);
|
return decoded.details.find((d) => d.label === label);
|
||||||
}
|
}
|
||||||
@@ -134,9 +134,7 @@ describe("a V4 step that states a Min. received but no output currency", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test("refuses to scale Min. received rather than assuming 18", () => {
|
test("refuses to scale Min. received rather than assuming 18", () => {
|
||||||
// With no TAKE, no step pays the user either, so the line is not
|
expect(detail(data(), "Min. received").value).toBe(
|
||||||
// labelled received.
|
|
||||||
expect(detail(data(), "Min. paid out").value).toBe(
|
|
||||||
unknownDecimalsAmount(MIN_OUT),
|
unknownDecimalsAmount(MIN_OUT),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -82,8 +82,7 @@ function walletsHolding(token, decimals) {
|
|||||||
// decodeCalldata() rather than uniswap.decode() directly, because the scale
|
// decodeCalldata() rather than uniswap.decode() directly, because the scale
|
||||||
// sources the screen supplies are part of what is under test.
|
// sources the screen supplies are part of what is under test.
|
||||||
function swapDetail(data, label) {
|
function swapDetail(data, label) {
|
||||||
// Sent by the address the swap pays, so the output is the user's.
|
const decoded = decodeCalldata(data, ROUTER, "0x1");
|
||||||
const decoded = decodeCalldata(data, ROUTER, "0x1", RECIPIENT);
|
|
||||||
return decoded.details.find((d) => d.label === label);
|
return decoded.details.find((d) => d.label === label);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -39,8 +39,7 @@ jest.mock("../src/shared/log", () => ({
|
|||||||
|
|
||||||
// Everything the confirmation screen would reach the network for. The gas
|
// Everything the confirmation screen would reach the network for. The gas
|
||||||
// estimate is the point: with a usable scale it must succeed, so that a failure
|
// estimate is the point: with a usable scale it must succeed, so that a failure
|
||||||
// in these tests is a failure of the scale and not of the stub. The address
|
// in these tests is a failure of the scale and not of the stub.
|
||||||
// holds the 1 ETH the wallets below record, and `tokenUnits` of the token.
|
|
||||||
const mockProvider = {
|
const mockProvider = {
|
||||||
getFeeData: async () => ({
|
getFeeData: async () => ({
|
||||||
maxFeePerGas: 2000000000n,
|
maxFeePerGas: 2000000000n,
|
||||||
@@ -49,14 +48,7 @@ const mockProvider = {
|
|||||||
estimateGas: async () => 21000n,
|
estimateGas: async () => 21000n,
|
||||||
getCode: async () => "0x",
|
getCode: async () => "0x",
|
||||||
getTransactionCount: async () => 1,
|
getTransactionCount: async () => 1,
|
||||||
getBalance: async () => 1000000000000000000n,
|
getBalance: async () => 0n,
|
||||||
tokenUnits: 0n,
|
|
||||||
// The one contract call the screen makes, balanceOf().
|
|
||||||
call: async () =>
|
|
||||||
AbiCoder.defaultAbiCoder().encode(
|
|
||||||
["uint256"],
|
|
||||||
[mockProvider.tokenUnits],
|
|
||||||
),
|
|
||||||
};
|
};
|
||||||
|
|
||||||
jest.mock("../src/shared/balances", () => {
|
jest.mock("../src/shared/balances", () => {
|
||||||
@@ -120,9 +112,9 @@ global.document = {
|
|||||||
body: { prepend() {}, appendChild() {} },
|
body: { prepend() {}, appendChild() {} },
|
||||||
addEventListener() {},
|
addEventListener() {},
|
||||||
};
|
};
|
||||||
global.navigator.clipboard = { writeText() {} };
|
global.navigator = { clipboard: { writeText() {} } };
|
||||||
|
|
||||||
const { AbiCoder, parseUnits } = require("ethers");
|
const { parseUnits } = require("ethers");
|
||||||
const { fetchTokenBalances } = require("../src/shared/balances");
|
const { fetchTokenBalances } = require("../src/shared/balances");
|
||||||
const { debugFetch } = require("../src/shared/log");
|
const { debugFetch } = require("../src/shared/log");
|
||||||
const { state } = require("../src/shared/state");
|
const { state } = require("../src/shared/state");
|
||||||
@@ -163,9 +155,8 @@ function row(token = {}, value = FIVE_WETH) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Fetch the explorer's rows through the real fetcher and put them exactly where
|
// Fetch the explorer's rows through the real fetcher and put them exactly where
|
||||||
// refreshBalances() puts them. The node reports the holding the explorer does.
|
// refreshBalances() puts them.
|
||||||
async function fetchOnto(items) {
|
async function fetchOnto(items) {
|
||||||
mockProvider.tokenUnits = BigInt(items[0].value);
|
|
||||||
debugFetch.mockImplementation(async () => ({
|
debugFetch.mockImplementation(async () => ({
|
||||||
ok: true,
|
ok: true,
|
||||||
status: 200,
|
status: 200,
|
||||||
@@ -190,7 +181,6 @@ async function fetchOnto(items) {
|
|||||||
// is from the first. Two addresses is what it takes to reach
|
// is from the first. Two addresses is what it takes to reach
|
||||||
// explorerDecimals()'s disagreement check, which is only reachable across rows.
|
// explorerDecimals()'s disagreement check, which is only reachable across rows.
|
||||||
async function fetchOntoBoth(itemsA, itemsB) {
|
async function fetchOntoBoth(itemsA, itemsB) {
|
||||||
mockProvider.tokenUnits = BigInt(itemsA[0].value);
|
|
||||||
debugFetch.mockImplementation(async () => ({
|
debugFetch.mockImplementation(async () => ({
|
||||||
ok: true,
|
ok: true,
|
||||||
status: 200,
|
status: 200,
|
||||||
@@ -249,12 +239,6 @@ function errors() {
|
|||||||
return el("confirm-errors").innerHTML;
|
return el("confirm-errors").innerHTML;
|
||||||
}
|
}
|
||||||
|
|
||||||
// The message for an amount the balance does not cover, while it is shown.
|
|
||||||
function balanceError() {
|
|
||||||
const box = el("confirm-balance-error");
|
|
||||||
return box.style.visibility === "visible" ? box.textContent : "";
|
|
||||||
}
|
|
||||||
|
|
||||||
function sendDisabled() {
|
function sendDisabled() {
|
||||||
return el("btn-confirm-send").disabled;
|
return el("btn-confirm-send").disabled;
|
||||||
}
|
}
|
||||||
@@ -286,6 +270,7 @@ describe("the Send screen resolves the scale rather than reading the stored one"
|
|||||||
const txInfo = await reviewSend(WETH, "1.5");
|
const txInfo = await reviewSend(WETH, "1.5");
|
||||||
expect(txInfo.tokenDecimals).toBe(18);
|
expect(txInfo.tokenDecimals).toBe(18);
|
||||||
expect(txInfo.tokenDecimals).not.toBe(balances[0].decimals);
|
expect(txInfo.tokenDecimals).not.toBe(balances[0].decimals);
|
||||||
|
expect(txInfo.tokenBalance).toBe("5.0");
|
||||||
});
|
});
|
||||||
|
|
||||||
test("that scale estimates a fee and leaves Send enabled", async () => {
|
test("that scale estimates a fee and leaves Send enabled", async () => {
|
||||||
@@ -322,10 +307,11 @@ describe("the Send screen resolves the scale rather than reading the stored one"
|
|||||||
// No fallback was introduced: resolution answers null here, and the
|
// No fallback was introduced: resolution answers null here, and the
|
||||||
// null is what goes forward.
|
// null is what goes forward.
|
||||||
expect(txInfo.tokenDecimals).toBeNull();
|
expect(txInfo.tokenDecimals).toBeNull();
|
||||||
|
expect(txInfo.tokenBalance).toBeNull();
|
||||||
confirmTx.show(txInfo);
|
confirmTx.show(txInfo);
|
||||||
await settle();
|
await settle();
|
||||||
expect(text("confirm-balance")).toBe("unknown (NOVEL)");
|
expect(text("confirm-balance")).toBe("unknown (NOVEL)");
|
||||||
expect(balanceError()).toContain("This token's balance is unknown");
|
expect(errors()).toContain("This token's balance is unknown");
|
||||||
expect(sendDisabled()).toBe(true);
|
expect(sendDisabled()).toBe(true);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -369,8 +355,7 @@ describe("a scale the explorer's own rows disagree about", () => {
|
|||||||
const txInfo = await reviewSend(NOVEL, "1.5");
|
const txInfo = await reviewSend(NOVEL, "1.5");
|
||||||
expect(txInfo.tokenDecimals).toBeNull();
|
expect(txInfo.tokenDecimals).toBeNull();
|
||||||
// The regression this closes: null scale alongside a non-null balance.
|
// The regression this closes: null scale alongside a non-null balance.
|
||||||
send.updateSendBalance();
|
expect(txInfo.tokenBalance).toBeNull();
|
||||||
expect(text("send-balance")).toBe("Current balance: unknown (NOVEL)");
|
|
||||||
});
|
});
|
||||||
|
|
||||||
test("so the user is told the balance is unknown, not only that the fee failed", async () => {
|
test("so the user is told the balance is unknown, not only that the fee failed", async () => {
|
||||||
@@ -382,7 +367,8 @@ describe("a scale the explorer's own rows disagree about", () => {
|
|||||||
// confirm-fee-unknown-error — "the network fee could not be
|
// confirm-fee-unknown-error — "the network fee could not be
|
||||||
// estimated... please go back and try again" — as the only explanation
|
// estimated... please go back and try again" — as the only explanation
|
||||||
// for a screen that can never proceed.
|
// for a screen that can never proceed.
|
||||||
expect(balanceError()).toContain("This token's balance is unknown");
|
expect(errors()).not.toBe("");
|
||||||
|
expect(errors()).toContain("This token's balance is unknown");
|
||||||
expect(text("confirm-balance")).toBe("unknown (NOVEL)");
|
expect(text("confirm-balance")).toBe("unknown (NOVEL)");
|
||||||
expect(sendDisabled()).toBe(true);
|
expect(sendDisabled()).toBe(true);
|
||||||
// The fee line still reports the estimate as unavailable, because it
|
// The fee line still reports the estimate as unavailable, because it
|
||||||
@@ -448,20 +434,31 @@ describe("a scale the explorer's own rows disagree about", () => {
|
|||||||
expect(text("send-balance")).toBe("Current balance: 5.0000 NOVEL");
|
expect(text("send-balance")).toBe("Current balance: 5.0000 NOVEL");
|
||||||
const txInfo = await reviewSend(NOVEL, "1.5");
|
const txInfo = await reviewSend(NOVEL, "1.5");
|
||||||
expect(txInfo.tokenDecimals).toBe(6);
|
expect(txInfo.tokenDecimals).toBe(6);
|
||||||
|
expect(txInfo.tokenBalance).toBe("5.0");
|
||||||
confirmTx.show(txInfo);
|
confirmTx.show(txInfo);
|
||||||
await settle();
|
await settle();
|
||||||
expect(text("confirm-balance")).toBe("5.0000 NOVEL");
|
expect(text("confirm-balance")).toBe("5.0000 NOVEL");
|
||||||
expect(errors()).toBe("");
|
expect(errors()).toBe("");
|
||||||
expect(balanceError()).toBe("");
|
|
||||||
expect(sendDisabled()).toBe(false);
|
expect(sendDisabled()).toBe(false);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("the confirmation screen tells an unknown balance from a zero one", () => {
|
describe("the confirmation screen tells an unknown balance from a zero one", () => {
|
||||||
// A send of 1.5 NOVEL from an address the node reports none of, with the
|
function txInfo(tokenBalance) {
|
||||||
// token's scale `tokenDecimals`, or null for a scale nobody knows.
|
return {
|
||||||
async function render(tokenDecimals) {
|
from: HOLDER,
|
||||||
mockProvider.tokenUnits = 0n;
|
to: RECIPIENT,
|
||||||
|
ensName: null,
|
||||||
|
amount: "1.5",
|
||||||
|
token: NOVEL,
|
||||||
|
balance: "1.0",
|
||||||
|
tokenSymbol: "NOVEL",
|
||||||
|
tokenBalance,
|
||||||
|
tokenDecimals: tokenBalance === null ? null : 18,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async function render(tokenBalance) {
|
||||||
state.wallets = [
|
state.wallets = [
|
||||||
{
|
{
|
||||||
name: "Wallet 1",
|
name: "Wallet 1",
|
||||||
@@ -472,40 +469,30 @@ describe("the confirmation screen tells an unknown balance from a zero one", ()
|
|||||||
];
|
];
|
||||||
state.selectedWallet = 0;
|
state.selectedWallet = 0;
|
||||||
state.selectedAddress = 0;
|
state.selectedAddress = 0;
|
||||||
confirmTx.show({
|
confirmTx.show(txInfo(tokenBalance));
|
||||||
from: HOLDER,
|
|
||||||
to: RECIPIENT,
|
|
||||||
ensName: null,
|
|
||||||
amount: "1.5",
|
|
||||||
token: NOVEL,
|
|
||||||
tokenSymbol: "NOVEL",
|
|
||||||
tokenDecimals,
|
|
||||||
});
|
|
||||||
await settle();
|
await settle();
|
||||||
return { balance: text("confirm-balance"), message: balanceError() };
|
return { balance: text("confirm-balance"), errors: errors() };
|
||||||
}
|
}
|
||||||
|
|
||||||
test("the balance line states unknown rather than a quantity of zero", async () => {
|
test("the balance line states unknown rather than a quantity of zero", async () => {
|
||||||
const unknown = await render(null);
|
const unknown = await render(null);
|
||||||
const zero = await render(18);
|
const zero = await render("0.0");
|
||||||
expect(unknown.balance).not.toBe(zero.balance);
|
expect(unknown.balance).not.toBe(zero.balance);
|
||||||
expect(unknown.balance).toBe("unknown (NOVEL)");
|
expect(unknown.balance).toBe("unknown (NOVEL)");
|
||||||
expect(zero.balance).toBe("0.0000 NOVEL");
|
expect(zero.balance).toBe("0.0000 NOVEL");
|
||||||
});
|
});
|
||||||
|
|
||||||
// Both hit INSUFFICIENT_TOKEN — an unknown balance is treated as nothing to
|
// Both hit INSUFFICIENT_TOKEN — an unknown balance is treated as nothing to
|
||||||
// spend from, which is the fail-closed side — but "your balance does not
|
// spend from, which is the fail-closed side — but "you have 0.0" is a claim
|
||||||
// cover this amount" is a claim about the holding, and this one has no
|
// about the holding, and this one has no established quantity to claim.
|
||||||
// established quantity to claim.
|
test("the insufficient-balance message names the reason, not a figure", async () => {
|
||||||
test("the insufficient-balance message names the reason, not a shortfall", async () => {
|
|
||||||
const unknown = await render(null);
|
const unknown = await render(null);
|
||||||
const zero = await render(18);
|
const zero = await render("0.0");
|
||||||
expect(unknown.message).toContain("This token's balance is unknown");
|
expect(unknown.errors).not.toBe(zero.errors);
|
||||||
expect(unknown.message).not.toContain("does not cover");
|
expect(unknown.errors).toContain("This token's balance is unknown");
|
||||||
expect(zero.message).toBe(
|
expect(unknown.errors).not.toContain("You have");
|
||||||
"Your NOVEL balance does not cover this amount. Please go back and" +
|
expect(zero.errors).toContain("You have 0.0000 NOVEL");
|
||||||
" send a smaller amount.",
|
expect(zero.errors).not.toContain("balance is unknown");
|
||||||
);
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -475,7 +475,7 @@ describe("every way to a signature or the private key refuses a defective wallet
|
|||||||
to: RECIPIENT,
|
to: RECIPIENT,
|
||||||
value: "0x0",
|
value: "0x0",
|
||||||
data: "0x",
|
data: "0x",
|
||||||
chainId: "0x1",
|
chainId: 1,
|
||||||
nonce: 0,
|
nonce: 0,
|
||||||
gasLimit: "21000",
|
gasLimit: "21000",
|
||||||
maxFeePerGas: "1000000000",
|
maxFeePerGas: "1000000000",
|
||||||
|
|||||||
Reference in New Issue
Block a user