Compare commits
1
Commits
next
..
4fd55f0f38
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4fd55f0f38 |
@@ -35,10 +35,10 @@ on: [push]
|
||||
jobs:
|
||||
e2e-chrome:
|
||||
runs-on: ubuntu-latest
|
||||
# Bounds the image build, a cold cache included, and the three Chrome
|
||||
# Bounds the image build, a cold cache included, and both Chrome
|
||||
# programs, so a hung browser frees the shared runner. README.md
|
||||
# "In CI" has the measured times.
|
||||
timeout-minutes: 40
|
||||
timeout-minutes: 20
|
||||
steps:
|
||||
# actions/checkout v4.2.2, 2026-02-22
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
.PHONY: bootstrap setup install test test-e2e test-e2e-firefox lint fmt fmt-check check check-censored docker hooks build build-debug package vendor-blocklist icons enrich-tokens apply-enrichment clean dev
|
||||
.PHONY: bootstrap setup install test test-e2e test-e2e-firefox lint fmt fmt-check check check-censored docker hooks build build-debug package vendor-blocklist icons clean dev
|
||||
|
||||
# Standard targets are thin shims; the implementations live in script/
|
||||
# per the scripts-to-rule-them-all pattern (see the Entrypoints section
|
||||
@@ -111,20 +111,6 @@ vendor-blocklist:
|
||||
icons:
|
||||
@node script/lib/icons.js
|
||||
|
||||
# Fetch a name and a website for every token in src/shared/tokenList.js into
|
||||
# script/lib/token-enrichment.json. Run deliberately, land the diff: the names
|
||||
# come from live data, so a later run can return different ones.
|
||||
enrich-tokens:
|
||||
@node script/lib/enrich-tokens.js
|
||||
|
||||
# Write the names and websites in script/lib/token-enrichment.json into
|
||||
# src/shared/tokenList.js. Commit the result with the data file:
|
||||
# tests/applyEnrichment.test.js fails while the list differs from what this
|
||||
# writes, or while an address in the data or in the script's table of websites
|
||||
# matches no entry in the list.
|
||||
apply-enrichment:
|
||||
@node script/lib/apply-enrichment.js
|
||||
|
||||
clean:
|
||||
@rm -rf dist/ release/
|
||||
|
||||
|
||||
+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
|
||||
your password.
|
||||
|
||||
A connected site can also ask to switch the wallet's network. A popup shows the
|
||||
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
|
||||
If the requesting site's domain is on the phishing blocklist, all three approval
|
||||
screens show a red phishing warning before you decide.
|
||||
|
||||
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
|
||||
timestamps to UTC, and choose the theme (System, Light, or Dark).
|
||||
- **Network**: Switch between Ethereum Mainnet and Sepolia Testnet. Switching
|
||||
restores the RPC and Blockscout endpoints you last used on that network, or
|
||||
that network's defaults if you have not used it before.
|
||||
resets the RPC and Blockscout endpoints to that network's defaults.
|
||||
- **Ethereum RPC**: Change the Ethereum node endpoint. Default is a public RPC.
|
||||
You can use your own node for maximum privacy.
|
||||
- **Blockscout API**: Change the Blockscout instance used for token balances and
|
||||
|
||||
@@ -27,8 +27,7 @@
|
||||
"web_accessible_resources": ["src/content/inpage.js"],
|
||||
"browser_specific_settings": {
|
||||
"gecko": {
|
||||
"id": "autistmask@sneak.berlin",
|
||||
"strict_min_version": "115.0"
|
||||
"id": "autistmask@sneak.berlin"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,8 +18,6 @@
|
||||
# (src/shared/balances.js), and this contract's on-chain name is that
|
||||
# string, so censoring the repo cannot stop the wallet displaying it.
|
||||
# Dropping the entry instead would cost the user MUSD spoof detection.
|
||||
# script/lib/token-enrichment.json, the fetched data tokenList.js's names
|
||||
# are written from, carries the same name for the same reason.
|
||||
#
|
||||
# Everything else fails, in the working tree and under dist/. The last two are
|
||||
# literals rather than whole files, so they are enforced by counting, and each
|
||||
@@ -104,8 +102,8 @@ allowed_literals_for() {
|
||||
src/content/inpage.js | dist/*/src/content/inpage.js)
|
||||
printf 'is%s\n_%s\n' "$NAME" "$NAME" >"$ALLOWED_LITERALS_FILE"
|
||||
;;
|
||||
src/shared/tokenList.js | script/lib/token-enrichment.json | \
|
||||
dist/*/src/background/index.js | dist/*/src/popup/index.js)
|
||||
src/shared/tokenList.js | dist/*/src/background/index.js | \
|
||||
dist/*/src/popup/index.js)
|
||||
printf '%s USD\n' "$NAME" >"$ALLOWED_LITERALS_FILE"
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -25,13 +25,6 @@ run_yarn() {
|
||||
|
||||
main() {
|
||||
cd "$ROOT"
|
||||
# Without the repo's own prettier, yarn runs whatever prettier is on
|
||||
# the PATH, which may be a version that formats files differently.
|
||||
if [ ! -x node_modules/.bin/prettier ]; then
|
||||
echo "fmt: this repo's prettier is not installed in node_modules/," \
|
||||
"so run script/bootstrap first." >&2
|
||||
exit 1
|
||||
fi
|
||||
echo "Formatting..."
|
||||
run_yarn run fmt
|
||||
}
|
||||
|
||||
@@ -26,13 +26,6 @@ run_yarn() {
|
||||
|
||||
main() {
|
||||
cd "$ROOT"
|
||||
# Without the repo's own prettier, yarn runs whatever prettier is on
|
||||
# the PATH, which may be a version that formats files differently.
|
||||
if [ ! -x node_modules/.bin/prettier ]; then
|
||||
echo "fmt-check: this repo's prettier is not installed in" \
|
||||
"node_modules/, so run script/bootstrap first." >&2
|
||||
exit 1
|
||||
fi
|
||||
echo "Checking formatting..."
|
||||
run_yarn run fmt-check
|
||||
}
|
||||
|
||||
@@ -1,159 +0,0 @@
|
||||
// Writes the names and URLs in script/lib/token-enrichment.json, which
|
||||
// script/lib/enrich-tokens.js fetches, into the matching entries of
|
||||
// src/shared/tokenList.js: the name and url an entry already has are replaced,
|
||||
// and an entry without them gets them after its decimals. Where the fetched
|
||||
// data has no URL for a token, EXTRA_URLS below supplies one. An entry the data
|
||||
// does not mention is left as it is. An address in the data or in EXTRA_URLS
|
||||
// that matches no entry in tokenList.js, capitals included, is an error naming
|
||||
// that address. Run by
|
||||
// `make apply-enrichment`; no build runs it. tests/applyEnrichment.test.js
|
||||
// checks that the committed tokenList.js is exactly what this writes from the
|
||||
// committed data.
|
||||
|
||||
"use strict";
|
||||
|
||||
const fs = require("fs");
|
||||
const path = require("path");
|
||||
|
||||
const TOKEN_LIST = path.join(__dirname, "..", "..", "src/shared/tokenList.js");
|
||||
|
||||
// Project websites by token address, each spelled as tokenList.js spells it. A
|
||||
// token gets its URL here only where the fetched data has none, so an address
|
||||
// the data has a URL for is never used.
|
||||
const EXTRA_URLS = {
|
||||
"0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2": "https://weth.io",
|
||||
"0xdAC17F958D2ee523a2206206994597C13D831ec7": "https://tether.to",
|
||||
"0xB8c77482e45F1F44dE1745F52C74426C631bDD52": "https://www.bnbchain.org",
|
||||
"0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48": "https://www.circle.com/usdc",
|
||||
"0xdC035D45d973E3EC169d2276DDab16f1e407384F": "https://sky.money",
|
||||
"0x2AF5D2aD76741191D15Dfe7bF6aC92d4Bd912Ca3": "https://www.bitfinex.com",
|
||||
"0x514910771AF9Ca656af840dff83E8264EcF986CA": "https://chain.link",
|
||||
"0x4c9EDD5852cd905f086C759E8383e09bff1E68B3": "https://ethena.fi",
|
||||
"0x8d0D000Ee44948FC98c9B98A4FA4921476f08B0d":
|
||||
"https://www.worldlibertyfinancial.com",
|
||||
"0x6B175474E89094C44Da98b954EedeAC495271d0F": "https://makerdao.com",
|
||||
"0x6c3ea9036406852006290770BEdFcAbA0e23A0e8":
|
||||
"https://www.paypal.com/us/digital-wallet/manage-money/crypto/pyusd",
|
||||
"0x95aD61b0a150d79219dCF64E1E6Cc01f0B64C4cE": "https://shibatoken.com",
|
||||
"0xdA5e1988097297dCdc1f90D4dFE7909e847CBeF6":
|
||||
"https://www.worldlibertyfinancial.com",
|
||||
"0xA0b73E1Ff0B80914AB6fe0444E65848C4C34450b": "https://crypto.com",
|
||||
"0x582d872A1B094FC48F5DE31D3B73F2D9bE47def1": "https://ton.org",
|
||||
"0x68749665FF8D2d112Fa859AA293F07A622782F38": "https://gold.tether.to",
|
||||
"0x196C20DA81Fbc324EcdF55501e95Ce9f0bD84d14": "https://polkadot.network",
|
||||
"0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984": "https://uniswap.org",
|
||||
"0x45804880De22913dAFE09f4980848ECE6EcbAf78":
|
||||
"https://www.paxos.com/paxgold",
|
||||
"0x3c3a81e81dc49A522A592e7622A7E711c06bf354": "https://www.mantle.xyz",
|
||||
"0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9": "https://aave.com",
|
||||
"0x75231F58b43240C9718Dd58B4967c5114342a86c": "https://www.okx.com",
|
||||
"0x6982508145454Ce325dDbE47a25d4ec3d2311933": "https://www.pepe.vip",
|
||||
"0x5A98FcBEA516Cf06857215779Fd812CA3beF1B32": "https://lido.fi",
|
||||
"0xC18360217D8F7Ab5e7c516566761Ea12Ce7F9D72": "https://ens.domains",
|
||||
"0xD533a949740bb3306d119CC777fa900bA034cd52": "https://curve.fi",
|
||||
"0x111111111117dC0aa78b770fA6A738034120C302": "https://1inch.io",
|
||||
"0x163f8C2467924be0ae7B5347228CABF260318753": "https://worldcoin.org",
|
||||
"0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F": "https://synthetix.io",
|
||||
"0xBBbbCA6A901c926F240b89EacB641d8Aec7AEafD": "https://loopring.org",
|
||||
"0xC669928185DbCE49d2230CC9B0979BE6DC797957": "https://bitstable.finance",
|
||||
"0xfAbA6f8e4a5E8Ab82F62fe7C39859FA577269BE3": "https://ondo.finance",
|
||||
"0x6De037ef9aD2725EB40118Bb1702EBb27e4Aeb24": "https://www.render.com",
|
||||
"0x4a220E6096B25EADb88358cb44068A3248254675": "https://www.quant.network",
|
||||
"0xba5BDe662c17e2aDFF1075610382B9B691296350": "https://superrare.com",
|
||||
"0xc00e94Cb662C3520282E6f5717214004A7f26888": "https://compound.finance",
|
||||
"0xE41d2489571d322189246DaFA5ebDe1F4699F498": "https://0x.org",
|
||||
"0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e": "https://yearn.fi",
|
||||
"0x6fB3e0A217407EFFf7Ca062D46c26E5d60a14d69": "https://iotex.io",
|
||||
"0xF57e7e7C23978C3cAEC3C3548E3D615c346e79fF": "https://immutable.com",
|
||||
"0x0F5D2fB29fb7d3CFeE444a200298f468908cC942": "https://decentraland.org",
|
||||
"0x3845badAde8e6dFF049820680d1F14bD3903a5d0": "https://www.sandbox.game",
|
||||
"0x6810e776880C02933D47DB1b9fc05908e5386b96": "https://gnosis.io",
|
||||
"0x5f98805A4E8be255a32880FDeC7F6728C6568bA0": "https://www.liquity.org",
|
||||
"0x0D8775F648430679A709E98d2b0Cb6250d2887EF":
|
||||
"https://basicattentiontoken.org",
|
||||
"0xc944E90C64B2c07662A292be6244BDf05Cda44a7": "https://thegraph.com",
|
||||
"0x853d955aCEf822Db058eb8505911ED77F175b99e": "https://frax.finance",
|
||||
"0x0000000000085d4780B73119b644AE5ecd22b376": "https://www.trueusd.com",
|
||||
"0x3432B6A60D23Ca0dFCa7761B7ab56459D9C964D0": "https://frax.finance",
|
||||
"0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E": "https://curve.fi",
|
||||
"0x808507121B80c02388fAd14726482e061B8da827": "https://pendle.finance",
|
||||
"0xCa14007Eff0dB1f8135f4C25B34De49AB0d42766": "https://starknet.io",
|
||||
"0x8457CA5040ad67fdebbCC8EdCE889A335Bc0fbFB": "https://alt.layer",
|
||||
"0xB50721BCf8d664c30412Cfbc6cf7a15145234ad1": "https://arbitrum.io",
|
||||
"0x6985884C4392D348587B19cb9eAAf157F13271cd": "https://layerzero.network",
|
||||
"0xFe0c30065B384F05761f15d0CC899D4F9F9Cc0eB": "https://ethfi.org",
|
||||
"0x5283D291DBCF85356A21bA090E6db59121208b44": "https://blur.io",
|
||||
"0x43Dfc4159D86F3A37A5A4B3D4580b888ad7d4DDd": "https://dydx.exchange",
|
||||
"0xcf0C122c6b73ff809C693DB761e7BaeBe62b6a2E": "https://floki.com",
|
||||
"0xe53EC727dbDEB9E2d5456c3be40cFF031AB40A55": "https://superfarm.com",
|
||||
"0x32353A6C91143bfd6C7d363B546e62a9A2489A20": "https://www.agora.finance",
|
||||
"0x1aBaEA1f7C830bD89Acc67eC4af516284b1bC33c": "https://www.euro-coin.com",
|
||||
"0xA35923162C49cF95e6BF26623385eb431ad920D3": "https://www.turbo-eth.com",
|
||||
"0x1151CB3d861920e07a38e03eEAd12C32178567F6": "https://bonk.com",
|
||||
"0x090185f2135308BaD17527004364eBcC2D37e5F6": "https://spell.club",
|
||||
"0xAf5191B0De278C7286d6C7CC6ab6BB8A73bA2Cd6": "https://stargate.finance",
|
||||
};
|
||||
|
||||
// Returns tokenList, the text of tokenList.js, with the name and url of each
|
||||
// token in enrichment, the parsed data file, written into its entry.
|
||||
function applyEnrichment(tokenList, enrichment) {
|
||||
for (const addr of Object.keys(EXTRA_URLS)) {
|
||||
if (!tokenList.includes(`address: "${addr}"`)) {
|
||||
throw new Error(
|
||||
`No entry in src/shared/tokenList.js has the address ${addr} from EXTRA_URLS.`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
let result = tokenList;
|
||||
|
||||
for (const [addr, data] of Object.entries(enrichment)) {
|
||||
// Escape special regex characters in the address
|
||||
const escaped = addr.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
||||
|
||||
// Match the token block: { address: "...", symbol: "...", decimals: N, }
|
||||
// and the name: "...", url: "..." after decimals when it has them.
|
||||
// The closing }, may have trailing whitespace
|
||||
const blockRe = new RegExp(
|
||||
`(\\{\\s*address:\\s*"${escaped}",\\s*symbol:\\s*"[^"]+",\\s*decimals:\\s*\\d+)` +
|
||||
`(?:,\\s*name:\\s*"(?:[^"\\\\]|\\\\.)*",\\s*url:\\s*"(?:[^"\\\\]|\\\\.)*")?` +
|
||||
`,?(\\s*\\})`,
|
||||
);
|
||||
|
||||
const match = result.match(blockRe);
|
||||
if (!match) {
|
||||
throw new Error(
|
||||
`No entry in src/shared/tokenList.js matches the address ${addr} from script/lib/token-enrichment.json.`,
|
||||
);
|
||||
}
|
||||
|
||||
// A URL from EXTRA_URLS only where the fetched data has none.
|
||||
const url = data.url || EXTRA_URLS[addr] || "";
|
||||
|
||||
// Build replacement: original fields + name + url
|
||||
const nameEscaped = data.name
|
||||
.replace(/\\/g, "\\\\")
|
||||
.replace(/"/g, '\\"');
|
||||
const urlEscaped = url.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
|
||||
const replacement =
|
||||
match[1] +
|
||||
`,\n name: "${nameEscaped}",` +
|
||||
`\n url: "${urlEscaped}",` +
|
||||
match[2];
|
||||
|
||||
// A function, so a "$" in a name is not read as a replacement pattern.
|
||||
result = result.replace(blockRe, () => replacement);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
if (require.main === module) {
|
||||
const enrichment = JSON.parse(
|
||||
fs.readFileSync(path.join(__dirname, "token-enrichment.json"), "utf8"),
|
||||
);
|
||||
const original = fs.readFileSync(TOKEN_LIST, "utf8");
|
||||
fs.writeFileSync(TOKEN_LIST, applyEnrichment(original, enrichment));
|
||||
}
|
||||
|
||||
module.exports = { applyEnrichment };
|
||||
@@ -1,115 +0,0 @@
|
||||
// Fetches a name and a website for every token in src/shared/tokenList.js and
|
||||
// writes them, keyed by address, to script/lib/token-enrichment.json, which
|
||||
// script/lib/apply-enrichment.js then writes into tokenList.js. Run by
|
||||
// `make enrich-tokens`; no build runs it and nothing here is shipped.
|
||||
//
|
||||
// Names come from CoinGecko's coin list, fetched whole in one request, matched
|
||||
// on the token's Ethereum contract address. A token CoinGecko does not list
|
||||
// gets its symbol as its name. The list is live data with no fixed version, so
|
||||
// a later run can return different names.
|
||||
//
|
||||
// Websites come from the ethereum-lists/tokens repository, one file per token,
|
||||
// read at a pinned commit. Most tokens have no file there and get an empty URL.
|
||||
// A file that is missing is not an error; any other failed request stops the
|
||||
// run, so a network fault cannot quietly empty a URL.
|
||||
|
||||
"use strict";
|
||||
|
||||
const fs = require("fs");
|
||||
const path = require("path");
|
||||
|
||||
const TOKEN_LIST = path.join(__dirname, "..", "..", "src/shared/tokenList.js");
|
||||
const OUTPUT = path.join(__dirname, "token-enrichment.json");
|
||||
|
||||
const COINGECKO_LIST =
|
||||
"https://api.coingecko.com/api/v3/coins/list?include_platform=true";
|
||||
// ethereum-lists/tokens at its master of 2026-02-27, when the committed
|
||||
// token-enrichment.json was made.
|
||||
const ETHEREUM_LISTS =
|
||||
"https://raw.githubusercontent.com/ethereum-lists/tokens/c3560d499a380a38e94caa7c4968d59aeffde59a/tokens/eth";
|
||||
|
||||
const CONCURRENT = 10;
|
||||
|
||||
const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
|
||||
|
||||
async function main() {
|
||||
const src = fs.readFileSync(TOKEN_LIST, "utf8");
|
||||
|
||||
const tokens = [];
|
||||
const re =
|
||||
/\{\s*address:\s*"(0x[a-fA-F0-9]{40})",\s*symbol:\s*"([^"]+)",\s*decimals:\s*(\d+)/g;
|
||||
let m;
|
||||
while ((m = re.exec(src)) !== null) {
|
||||
tokens.push({ address: m[1], symbol: m[2], decimals: parseInt(m[3]) });
|
||||
}
|
||||
console.error(`Parsed ${tokens.length} tokens`);
|
||||
|
||||
// --- Names from CoinGecko ---
|
||||
console.error("Fetching CoinGecko coins list...");
|
||||
const listResp = await fetch(COINGECKO_LIST);
|
||||
if (!listResp.ok) throw new Error(`CoinGecko list HTTP ${listResp.status}`);
|
||||
const coins = await listResp.json();
|
||||
|
||||
const addrMap = new Map();
|
||||
for (const coin of coins) {
|
||||
const eth = (coin.platforms?.ethereum || "").toLowerCase().trim();
|
||||
if (eth && eth.startsWith("0x")) {
|
||||
addrMap.set(eth, { name: coin.name, id: coin.id });
|
||||
}
|
||||
}
|
||||
console.error(`CoinGecko map: ${addrMap.size} Ethereum tokens`);
|
||||
|
||||
const enriched = new Map();
|
||||
let namesMatched = 0;
|
||||
for (const t of tokens) {
|
||||
const info = addrMap.get(t.address.toLowerCase());
|
||||
if (info) namesMatched++;
|
||||
enriched.set(t.address, { name: info?.name || t.symbol, url: "" });
|
||||
}
|
||||
console.error(`Matched ${namesMatched}/${tokens.length} names`);
|
||||
|
||||
// --- Websites from ethereum-lists ---
|
||||
console.error("Fetching URLs from ethereum-lists GitHub...");
|
||||
let urlsFound = 0;
|
||||
|
||||
for (let i = 0; i < tokens.length; i += CONCURRENT) {
|
||||
const batch = tokens.slice(i, i + CONCURRENT);
|
||||
await Promise.all(
|
||||
batch.map(async (t) => {
|
||||
const r = await fetch(`${ETHEREUM_LISTS}/${t.address}.json`);
|
||||
if (r.status === 404) return;
|
||||
if (!r.ok) {
|
||||
throw new Error(
|
||||
`ethereum-lists HTTP ${r.status} for ${t.address}`,
|
||||
);
|
||||
}
|
||||
const data = await r.json();
|
||||
const website = (data.website || "").trim();
|
||||
if (website && website !== "https://") {
|
||||
enriched.get(t.address).url = website;
|
||||
urlsFound++;
|
||||
}
|
||||
}),
|
||||
);
|
||||
if (i % 100 === 0) {
|
||||
console.error(
|
||||
` GitHub: ${Math.min(i + CONCURRENT, tokens.length)}/${tokens.length}, ${urlsFound} URLs`,
|
||||
);
|
||||
}
|
||||
await sleep(200);
|
||||
}
|
||||
console.error(`Found ${urlsFound} URLs in ethereum-lists`);
|
||||
|
||||
// --- Output, in the layout prettier gives it ---
|
||||
const output = {};
|
||||
for (const [addr, e] of enriched) {
|
||||
output[addr] = { name: e.name, url: e.url };
|
||||
}
|
||||
fs.writeFileSync(OUTPUT, JSON.stringify(output, null, 4) + "\n");
|
||||
console.error(`Done! ${tokens.length} names, ${urlsFound} URLs.`);
|
||||
}
|
||||
|
||||
main().catch((err) => {
|
||||
console.error(`enrich-tokens: ${err.message}`);
|
||||
process.exit(1);
|
||||
});
|
||||
File diff suppressed because it is too large
Load Diff
+16
-41
@@ -22,29 +22,13 @@ set -eu
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
|
||||
ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
|
||||
|
||||
# Each run builds, runs and then removes an image under a tag of its own.
|
||||
# Under one tag shared by every run, a second clone's build moves the tag
|
||||
# off this run's image, and the image store can then delete that untagged
|
||||
# image before or while this run uses it. The tag is random rather than
|
||||
# $$ because CI jobs share one docker daemon, but each job's container
|
||||
# numbers its processes from scratch.
|
||||
SUFFIX="$(od -An -N6 -tx1 /dev/urandom | tr -d ' \n')"
|
||||
NAME="$("$SCRIPT_DIR/projectname")-e2e-chrome"
|
||||
IMAGE="$NAME:$SUFFIX"
|
||||
# Each docker run below uses this container name: docker run --rm returns
|
||||
# only once its container is removed, so no run meets the one before it.
|
||||
CONTAINER="$NAME-$SUFFIX"
|
||||
IMAGE="$("$SCRIPT_DIR/projectname")-e2e-chrome"
|
||||
|
||||
IIDFILE=""
|
||||
|
||||
cleanup() {
|
||||
# After a third Ctrl-C docker's client exits whether or not the
|
||||
# container has stopped, and a container still running keeps the image
|
||||
# in use.
|
||||
if docker container inspect "$CONTAINER" >/dev/null 2>&1; then
|
||||
docker container rm -f "$CONTAINER" >/dev/null
|
||||
fi
|
||||
# No image to remove when the build failed or was interrupted.
|
||||
if docker image inspect "$IMAGE" >/dev/null 2>&1; then
|
||||
docker image rm "$IMAGE" >/dev/null
|
||||
if [ -n "$IIDFILE" ]; then
|
||||
rm -f "$IIDFILE"
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -56,16 +40,22 @@ main() {
|
||||
exit 1
|
||||
fi
|
||||
|
||||
IIDFILE="$(mktemp)"
|
||||
trap cleanup EXIT
|
||||
# HUP: the terminal or SSH session running the suite closed.
|
||||
trap 'cleanup; exit 130' HUP INT TERM
|
||||
trap 'cleanup; exit 130' INT TERM
|
||||
|
||||
echo "Building the Chrome e2e image (extension included)..."
|
||||
# --no-cache: the image build runs make build and its checks, and a
|
||||
# cached layer is a check that did not run.
|
||||
docker build --no-cache -t "$IMAGE" -f tests/e2e/Dockerfile .
|
||||
docker build --no-cache --iidfile "$IIDFILE" -t "$IMAGE" \
|
||||
-f tests/e2e/Dockerfile .
|
||||
|
||||
echo "Running e2e suite in the pinned Playwright container..."
|
||||
# The image is run by ID, not by tag: where two clones of this repo run
|
||||
# the suite at once, the other build can move the tag between this
|
||||
# build and this run, and the suite would then silently test the other
|
||||
# checkout.
|
||||
#
|
||||
# --ipc=host: Chromium's shared-memory needs more than the default
|
||||
# 64MB /dev/shm or renderers crash.
|
||||
# HOME=/tmp: the image's root home is not a reliable place for the
|
||||
@@ -85,12 +75,11 @@ main() {
|
||||
# probe. The image is pinned by digest, so this can only ever bite
|
||||
# on a deliberate bump.
|
||||
docker run --rm \
|
||||
--name "$CONTAINER" \
|
||||
--ipc=host \
|
||||
-e HOME=/tmp \
|
||||
-e PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS=1 \
|
||||
-e "E2E_TRACE_NETWORK=${E2E_TRACE_NETWORK:-0}" \
|
||||
"$IMAGE" \
|
||||
"$(cat "$IIDFILE")" \
|
||||
node tests/e2e/run.js
|
||||
|
||||
# Where chrome.storage.local lives, and what moves it: two unpacked loads
|
||||
@@ -104,24 +93,10 @@ main() {
|
||||
# --host-resolver-rules=MAP * ~NOTFOUND so nothing it does can leave.
|
||||
echo "Running the extension-id and storage-partition observations..."
|
||||
docker run --rm \
|
||||
--name "$CONTAINER" \
|
||||
--ipc=host \
|
||||
-e HOME=/tmp \
|
||||
"$IMAGE" \
|
||||
"$(cat "$IIDFILE")" \
|
||||
node tests/e2e/storagePartition.js
|
||||
|
||||
# Approvals left open for seven minutes in minimized windows, past the
|
||||
# point where Chrome stopped the background worker when nothing kept it
|
||||
# running. Its own program, without Playwright: Playwright keeps DevTools
|
||||
# attached to the worker, and Chrome never stops a worker DevTools is
|
||||
# attached to. It reaches nothing but its own loopback server.
|
||||
echo "Running the approvals left open for seven minutes..."
|
||||
docker run --rm \
|
||||
--name "$CONTAINER" \
|
||||
--ipc=host \
|
||||
-e HOME=/tmp \
|
||||
"$IMAGE" \
|
||||
node tests/e2e/slowApproval.js
|
||||
}
|
||||
|
||||
main "$@"
|
||||
|
||||
+16
-22
@@ -21,23 +21,13 @@ set -eu
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
|
||||
ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
|
||||
|
||||
# A tag and a container name of this run's own, as in script/test-e2e,
|
||||
# which says why.
|
||||
SUFFIX="$(od -An -N6 -tx1 /dev/urandom | tr -d ' \n')"
|
||||
NAME="$("$SCRIPT_DIR/projectname")-e2e-firefox"
|
||||
IMAGE="$NAME:$SUFFIX"
|
||||
CONTAINER="$NAME-$SUFFIX"
|
||||
IMAGE="$("$SCRIPT_DIR/projectname")-e2e-firefox"
|
||||
|
||||
IIDFILE=""
|
||||
|
||||
cleanup() {
|
||||
# After a third Ctrl-C docker's client exits whether or not the
|
||||
# container has stopped, and a container still running keeps the image
|
||||
# in use.
|
||||
if docker container inspect "$CONTAINER" >/dev/null 2>&1; then
|
||||
docker container rm -f "$CONTAINER" >/dev/null
|
||||
fi
|
||||
# No image to remove when the build failed or was interrupted.
|
||||
if docker image inspect "$IMAGE" >/dev/null 2>&1; then
|
||||
docker image rm "$IMAGE" >/dev/null
|
||||
if [ -n "$IIDFILE" ]; then
|
||||
rm -f "$IIDFILE"
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -49,16 +39,22 @@ main() {
|
||||
exit 1
|
||||
fi
|
||||
|
||||
IIDFILE="$(mktemp)"
|
||||
trap cleanup EXIT
|
||||
# HUP: the terminal or SSH session running the suite closed.
|
||||
trap 'cleanup; exit 130' HUP INT TERM
|
||||
trap 'cleanup; exit 130' INT TERM
|
||||
|
||||
echo "Building the pinned Firefox e2e image (extension included)..."
|
||||
# --no-cache: the image build runs make build and its checks, and a
|
||||
# cached layer is a check that did not run.
|
||||
docker build --no-cache -t "$IMAGE" -f tests/e2e/firefox/Dockerfile .
|
||||
docker build --no-cache --iidfile "$IIDFILE" -t "$IMAGE" \
|
||||
-f tests/e2e/firefox/Dockerfile .
|
||||
|
||||
echo "Running the Firefox e2e suite..."
|
||||
# The image is run by ID, not by tag: where two clones of this repo run
|
||||
# the suite at once, the other build can move the tag between this
|
||||
# build and this run, and the suite would then silently test the other
|
||||
# checkout.
|
||||
#
|
||||
# --shm-size=1g: Firefox needs more than the default 64MB /dev/shm.
|
||||
# --network none: the suite stubs nothing, so this is what keeps the
|
||||
# run offline and deterministic. The extension swallows its own
|
||||
@@ -73,11 +69,10 @@ main() {
|
||||
# "CanCreateUserNamespace() clone() failure: EPERM" on startup here;
|
||||
# it is cosmetic and headless Firefox runs fine without it.
|
||||
docker run --rm \
|
||||
--name "$CONTAINER" \
|
||||
--shm-size=1g \
|
||||
--network none \
|
||||
-e HOME=/tmp \
|
||||
"$IMAGE" \
|
||||
"$(cat "$IIDFILE")" \
|
||||
node tests/e2e/firefox/run.js dist/firefox
|
||||
|
||||
# The install/uninstall/re-install property, against the packaged XPI
|
||||
@@ -87,11 +82,10 @@ main() {
|
||||
# and the suite above shares one session throughout.
|
||||
echo "Running the Firefox re-install suite against the packaged XPI..."
|
||||
docker run --rm \
|
||||
--name "$CONTAINER" \
|
||||
--shm-size=1g \
|
||||
--network none \
|
||||
-e HOME=/tmp \
|
||||
"$IMAGE" \
|
||||
"$(cat "$IIDFILE")" \
|
||||
node tests/e2e/firefox/reinstall.js
|
||||
}
|
||||
|
||||
|
||||
+71
-215
@@ -22,11 +22,7 @@ const { debugFetch, log } = require("../shared/log");
|
||||
const {
|
||||
verifySignedTx,
|
||||
verifySignature,
|
||||
signedPrimaryType,
|
||||
typedDataMessageRefusal,
|
||||
typedDataChainRefusal,
|
||||
failureIsRetryable,
|
||||
nodeError,
|
||||
describeTxFailure,
|
||||
sameAddress,
|
||||
ApprovalMismatchError,
|
||||
@@ -47,11 +43,7 @@ const {
|
||||
|
||||
const {
|
||||
actionApi,
|
||||
getPlatformInfo,
|
||||
runtimeApi,
|
||||
sessionStorageGet,
|
||||
sessionStorageRemove,
|
||||
sessionStorageSet,
|
||||
tabsQuery,
|
||||
tabsSendMessage,
|
||||
windowsApi,
|
||||
@@ -64,62 +56,16 @@ const runtime = runtimeApi();
|
||||
const windowsNs = windowsApi();
|
||||
const actionNs = actionApi();
|
||||
|
||||
// Connections the user allowed without "Remember my choice for this site".
|
||||
// Each is one item in the browser's session storage, key
|
||||
// origin + ":" + address and value true, and session storage holds nothing
|
||||
// else. Session storage outlives this worker being stopped when idle and
|
||||
// started again, so such a connection lasts until it is ended below or the
|
||||
// browser closes. One item per connection means that making one is a single
|
||||
// write, and two never overwrite each other.
|
||||
// Connected sites (in-memory, non-persisted): { "origin:address": true }
|
||||
//
|
||||
// A site is its full origin (scheme://host[:port]), here and in the
|
||||
// remembered allowedSites/deniedSites lists alike: a grant to
|
||||
// https://dapp.example says nothing about http://dapp.example or another port.
|
||||
// An origin can carry a port, so the address is what follows the key's last
|
||||
// colon and the origin is what precedes it.
|
||||
async function isConnected(origin, address) {
|
||||
const key = origin + ":" + address;
|
||||
const items = await sessionStorageGet(key);
|
||||
return items[key] === true;
|
||||
}
|
||||
|
||||
// End every connection allowed without "Remember" whose key `ends` returns
|
||||
// true for.
|
||||
async function endConnections(ends) {
|
||||
const keys = Object.keys(await sessionStorageGet(null)).filter(ends);
|
||||
if (keys.length > 0) await sessionStorageRemove(keys);
|
||||
}
|
||||
const connectedSites = {};
|
||||
|
||||
// Pending approval requests: { id: { origin, resolve } }
|
||||
const pendingApprovals = {};
|
||||
|
||||
// An approval, and the site's request waiting on it, exist only in this
|
||||
// worker's memory. Left alone, Chrome stopped the worker about six minutes
|
||||
// after the site's request while the user was still deciding, and the approval
|
||||
// was lost with it. Chrome counts an extension call as activity, so while any
|
||||
// approval is pending this worker makes one every 20 seconds, inside Chrome's
|
||||
// 30-second idle limit. It is the worker's own timer, so it runs whether or not
|
||||
// the approval window is visible, and it stops itself once nothing is pending.
|
||||
let keepRunningTimer = null;
|
||||
|
||||
// Add an approval waiting for the user, and start the timer above if it is not
|
||||
// running. This is the ONLY place an approval is added, as settleApproval() is
|
||||
// the only place one is removed, so every kind of approval keeps the worker
|
||||
// running while it waits.
|
||||
function addPendingApproval(approval) {
|
||||
pendingApprovals[approval.id] = approval;
|
||||
if (keepRunningTimer) return;
|
||||
keepRunningTimer = setInterval(() => {
|
||||
if (Object.keys(pendingApprovals).length === 0) {
|
||||
clearInterval(keepRunningTimer);
|
||||
keepRunningTimer = null;
|
||||
return;
|
||||
}
|
||||
// Only the call matters; its answer is not used.
|
||||
getPlatformInfo().catch(() => {});
|
||||
}, 20000);
|
||||
}
|
||||
|
||||
// One transaction approval at a time, wallet-wide.
|
||||
//
|
||||
// The transaction a site asks for is populated before its approval window
|
||||
@@ -295,21 +241,6 @@ function failureError(err) {
|
||||
return { code: INTERNAL_ERROR_CODE, message: INTERNAL_ERROR_MESSAGE };
|
||||
}
|
||||
|
||||
// The EIP-1193 error for a request that failed, with `message` as the
|
||||
// sentence the page is shown. `rpcError` holds the JSON-RPC code and data the
|
||||
// failure carries, if any: the node's own when the node refused the request,
|
||||
// passed on unchanged so a site can tell a revert from any other failure and
|
||||
// decode its revert data. A failure with no numeric code is the wallet's own,
|
||||
// and is answered with the internal error code above.
|
||||
function requestError(message, rpcError) {
|
||||
if (rpcError && typeof rpcError.code === "number") {
|
||||
const error = { code: rpcError.code, message };
|
||||
if (rpcError.data !== undefined) error.data = rpcError.data;
|
||||
return error;
|
||||
}
|
||||
return { code: INTERNAL_ERROR_CODE, message };
|
||||
}
|
||||
|
||||
// The active address of a profile snapshot. Pure, and taking the snapshot as
|
||||
// an argument rather than reading storage itself: a handler that has already
|
||||
// read state must not answer "which account is this" from a SECOND, later read
|
||||
@@ -355,8 +286,7 @@ function extractHostname(origin) {
|
||||
}
|
||||
}
|
||||
|
||||
// Proxy an RPC call to the Ethereum node. An error the node answers with is
|
||||
// thrown with the node's own JSON-RPC `code` and `data` on it, for the page.
|
||||
// Proxy an RPC call to the Ethereum node
|
||||
async function proxyRpc(method, params) {
|
||||
const rpcUrl = await getRpcUrl();
|
||||
const resp = await debugFetch(rpcUrl, {
|
||||
@@ -371,10 +301,7 @@ async function proxyRpc(method, params) {
|
||||
});
|
||||
const json = await resp.json();
|
||||
if (json.error) {
|
||||
const err = new Error(json.error.message || "RPC error");
|
||||
err.code = json.error.code;
|
||||
err.data = json.error.data;
|
||||
throw err;
|
||||
throw new Error(json.error.message || "RPC error");
|
||||
}
|
||||
return json.result;
|
||||
}
|
||||
@@ -495,10 +422,7 @@ function releaseApproval(approval) {
|
||||
// the result on the floor, so a rejection here would be unhandled.
|
||||
async function openApprovalWindow(id) {
|
||||
const popupUrl = runtime.getURL("src/popup/index.html?approval=" + id);
|
||||
// As wide as the page: body in src/popup/styles/main.css. The browser
|
||||
// counts the window's frame in this width; the page itself adds back
|
||||
// whatever the frame takes (src/popup/index.js).
|
||||
const popupWidth = 396;
|
||||
const popupWidth = 360;
|
||||
const popupHeight = 600;
|
||||
|
||||
let currentWin = null;
|
||||
@@ -518,7 +442,7 @@ async function openApprovalWindow(id) {
|
||||
// Centred on a browser window only. The last focused window can be
|
||||
// another approval window still open, and centring on one can give a
|
||||
// position the browser refuses ("Bounds must be at least 50% within
|
||||
// visible screen space"): headless Chrome reports this 396x600 popup as
|
||||
// visible screen space"): headless Chrome reports this 360x600 popup as
|
||||
// 1280x720. The request then failed with no window at all. Over a popup,
|
||||
// the browser picks the position.
|
||||
if (currentWin && currentWin.type === "normal") {
|
||||
@@ -589,7 +513,7 @@ async function openApprovalWindow(id) {
|
||||
function requestApproval(origin) {
|
||||
return new Promise((resolve) => {
|
||||
const id = crypto.randomUUID();
|
||||
addPendingApproval({ id, origin, resolve, type: "site" });
|
||||
pendingApprovals[id] = { id, origin, resolve, type: "site" };
|
||||
|
||||
if (actionNs && typeof actionNs.openPopup === "function") {
|
||||
showInToolbarPopup(id);
|
||||
@@ -632,14 +556,14 @@ function showInToolbarPopup(id) {
|
||||
function requestTxApproval(origin, approvedTx, approvedFrom, slot) {
|
||||
return new Promise((resolve) => {
|
||||
const id = crypto.randomUUID();
|
||||
addPendingApproval({
|
||||
pendingApprovals[id] = {
|
||||
id,
|
||||
origin,
|
||||
approvedTx,
|
||||
approvedFrom,
|
||||
resolve,
|
||||
type: "tx",
|
||||
});
|
||||
};
|
||||
if (slot) slot.approvalId = id;
|
||||
|
||||
openApprovalWindow(id);
|
||||
@@ -653,14 +577,14 @@ function requestTxApproval(origin, approvedTx, approvedFrom, slot) {
|
||||
function requestSignApproval(origin, signParams, approvedFrom) {
|
||||
return new Promise((resolve) => {
|
||||
const id = crypto.randomUUID();
|
||||
addPendingApproval({
|
||||
pendingApprovals[id] = {
|
||||
id,
|
||||
origin,
|
||||
signParams,
|
||||
approvedFrom,
|
||||
resolve,
|
||||
type: "sign",
|
||||
});
|
||||
};
|
||||
|
||||
openApprovalWindow(id);
|
||||
});
|
||||
@@ -673,14 +597,14 @@ function requestSignApproval(origin, signParams, approvedFrom) {
|
||||
function requestNetworkApproval(origin, currentNetworkId, requestedNetworkId) {
|
||||
return new Promise((resolve) => {
|
||||
const id = crypto.randomUUID();
|
||||
addPendingApproval({
|
||||
pendingApprovals[id] = {
|
||||
id,
|
||||
origin,
|
||||
currentNetworkId,
|
||||
requestedNetworkId,
|
||||
resolve,
|
||||
type: "network",
|
||||
});
|
||||
};
|
||||
|
||||
openApprovalWindow(id);
|
||||
});
|
||||
@@ -708,9 +632,8 @@ function isExtensionSender(sender) {
|
||||
// had refused.
|
||||
//
|
||||
// TX and sign approvals do not decide here. They stay pending across a
|
||||
// disconnect. When their window closes, the windows.onRemoved listener below
|
||||
// rejects them, unless an approved attempt is still running, in which case
|
||||
// that attempt answers the page.
|
||||
// disconnect — the user can reopen the toolbar popup — and are rejected by the
|
||||
// windows.onRemoved listener below.
|
||||
runtime.onConnect.addListener((port) => {
|
||||
if (port.name.startsWith("approval:")) {
|
||||
const id = port.name.split(":")[1];
|
||||
@@ -738,9 +661,7 @@ runtime.onConnect.addListener((port) => {
|
||||
const approval = pendingApprovals[id];
|
||||
if (approval) {
|
||||
if (approval.type === "tx" || approval.type === "sign") {
|
||||
// When its window closes, windows.onRemoved rejects it,
|
||||
// unless an approved attempt is still running, in which
|
||||
// case that attempt answers the page.
|
||||
// Keep pending — user can reopen the toolbar popup
|
||||
return;
|
||||
}
|
||||
settleApproval(id, { approved: false, remember: false });
|
||||
@@ -770,7 +691,7 @@ async function handleConnectionRequest(origin) {
|
||||
const s = await getState();
|
||||
const activeAddress = activeAddressOf(s);
|
||||
if (!activeAddress) {
|
||||
return { error: { code: 4100, message: "No accounts available" } };
|
||||
return { error: { message: "No accounts available" } };
|
||||
}
|
||||
|
||||
const allowed = s.allowedSites[activeAddress] || [];
|
||||
@@ -786,10 +707,10 @@ async function handleConnectionRequest(origin) {
|
||||
};
|
||||
}
|
||||
|
||||
// Check allowed list or a connection allowed without "Remember"
|
||||
// Check allowed list or in-memory connected
|
||||
if (
|
||||
allowed.includes(origin) ||
|
||||
(await isConnected(origin, activeAddress))
|
||||
connectedSites[origin + ":" + activeAddress]
|
||||
) {
|
||||
return { result: [activeAddress] };
|
||||
}
|
||||
@@ -826,7 +747,7 @@ async function handleConnectionRequest(origin) {
|
||||
if (decision.remember) {
|
||||
await rememberSiteChoice("allowedSites", activeAddress, origin);
|
||||
} else {
|
||||
await sessionStorageSet({ [origin + ":" + activeAddress]: true });
|
||||
connectedSites[origin + ":" + activeAddress] = true;
|
||||
}
|
||||
return { result: [activeAddress] };
|
||||
} else {
|
||||
@@ -880,7 +801,7 @@ async function handleRpc(method, params, origin) {
|
||||
const allowed = s.allowedSites[activeAddress] || [];
|
||||
if (
|
||||
allowed.includes(origin) ||
|
||||
(await isConnected(origin, activeAddress))
|
||||
connectedSites[origin + ":" + activeAddress]
|
||||
) {
|
||||
return { result: [activeAddress] };
|
||||
}
|
||||
@@ -916,7 +837,7 @@ async function handleRpc(method, params, origin) {
|
||||
const allowed = s.allowedSites[activeAddress] || [];
|
||||
if (
|
||||
!allowed.includes(origin) &&
|
||||
!(await isConnected(origin, activeAddress))
|
||||
!connectedSites[origin + ":" + activeAddress]
|
||||
) {
|
||||
return { error: { code: 4100, message: "Unauthorized" } };
|
||||
}
|
||||
@@ -1009,10 +930,10 @@ async function handleRpc(method, params, origin) {
|
||||
const s = await getState();
|
||||
const activeAddress = activeAddressOf(s);
|
||||
const allowed = s.allowedSites[activeAddress] || [];
|
||||
const hasPermission =
|
||||
const isConnected =
|
||||
allowed.includes(origin) ||
|
||||
(await isConnected(origin, activeAddress));
|
||||
if (!hasPermission || !activeAddress) {
|
||||
connectedSites[origin + ":" + activeAddress];
|
||||
if (!isConnected || !activeAddress) {
|
||||
return { result: [] };
|
||||
}
|
||||
return {
|
||||
@@ -1034,12 +955,12 @@ async function handleRpc(method, params, origin) {
|
||||
const s = await getState();
|
||||
const activeAddress = activeAddressOf(s);
|
||||
if (!activeAddress)
|
||||
return { error: { code: 4100, message: "No accounts available" } };
|
||||
return { error: { message: "No accounts available" } };
|
||||
|
||||
const allowed = s.allowedSites[activeAddress] || [];
|
||||
if (
|
||||
!allowed.includes(origin) &&
|
||||
!(await isConnected(origin, activeAddress))
|
||||
!connectedSites[origin + ":" + activeAddress]
|
||||
) {
|
||||
return { error: { code: 4100, message: "Unauthorized" } };
|
||||
}
|
||||
@@ -1088,12 +1009,12 @@ async function handleRpc(method, params, origin) {
|
||||
const s = await getState();
|
||||
const activeAddress = activeAddressOf(s);
|
||||
if (!activeAddress)
|
||||
return { error: { code: 4100, message: "No accounts available" } };
|
||||
return { error: { message: "No accounts available" } };
|
||||
|
||||
const allowed = s.allowedSites[activeAddress] || [];
|
||||
if (
|
||||
!allowed.includes(origin) &&
|
||||
!(await isConnected(origin, activeAddress))
|
||||
!connectedSites[origin + ":" + activeAddress]
|
||||
) {
|
||||
return { error: { code: 4100, message: "Unauthorized" } };
|
||||
}
|
||||
@@ -1135,13 +1056,12 @@ async function handleRpc(method, params, origin) {
|
||||
const result = await proxyRpc(method, params);
|
||||
return { result };
|
||||
} catch (e) {
|
||||
// A node that answered with an error is reported as itself, with
|
||||
// its own code and data. The wallet being unable to read its own
|
||||
// profile is not that, and it must not be answered as an ordinary
|
||||
// failure: it goes back to the dispatcher, which has the one
|
||||
// answer for it.
|
||||
// A node that answered with an error is reported as itself. The
|
||||
// wallet being unable to read its own profile is not that, and it
|
||||
// must not be flattened into a message with no code: it goes back
|
||||
// to the dispatcher, which has the one answer for it.
|
||||
if (e instanceof StateUnusableError) throw e;
|
||||
return { error: requestError(e.message, e) };
|
||||
return { error: { message: e.message } };
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1157,14 +1077,12 @@ async function handleRpc(method, params, origin) {
|
||||
async function handleSendTransaction(params, origin) {
|
||||
const s = await getState();
|
||||
const activeAddress = activeAddressOf(s);
|
||||
if (!activeAddress) {
|
||||
return { error: { code: 4100, message: "No accounts available" } };
|
||||
}
|
||||
if (!activeAddress) return { error: { message: "No accounts available" } };
|
||||
|
||||
const allowed = s.allowedSites[activeAddress] || [];
|
||||
if (
|
||||
!allowed.includes(origin) &&
|
||||
!(await isConnected(origin, activeAddress))
|
||||
!connectedSites[origin + ":" + activeAddress]
|
||||
) {
|
||||
return { error: { code: 4100, message: "Unauthorized" } };
|
||||
}
|
||||
@@ -1218,7 +1136,7 @@ async function handleSendTransaction(params, origin) {
|
||||
txParams,
|
||||
);
|
||||
} catch (e) {
|
||||
return { error: requestError(e.message, e) };
|
||||
return { error: { message: e.message } };
|
||||
}
|
||||
|
||||
// Population is a network round trip, and the user can switch address
|
||||
@@ -1228,9 +1146,10 @@ async function handleSendTransaction(params, origin) {
|
||||
// while the page is still waiting and nothing has been displayed.
|
||||
if (!sameAddress(await getActiveAddress(), activeAddress)) {
|
||||
return {
|
||||
error: requestError(
|
||||
error: {
|
||||
message:
|
||||
"The active address changed while this transaction was being prepared, so it was not sent.",
|
||||
),
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1276,6 +1195,10 @@ async function broadcastChainChanged(chainId) {
|
||||
|
||||
// Broadcast accountsChanged to all tabs, respecting per-address permissions
|
||||
async function broadcastAccountsChanged() {
|
||||
// Clear non-remembered approvals on address switch
|
||||
for (const key of Object.keys(connectedSites)) {
|
||||
delete connectedSites[key];
|
||||
}
|
||||
// Reject and close any pending approval popups so they don't hang. An
|
||||
// approval an attempt has already claimed is left alone entirely: it is
|
||||
// being signed and broadcast right now, and neither rejecting it to the
|
||||
@@ -1294,10 +1217,6 @@ async function broadcastAccountsChanged() {
|
||||
}
|
||||
}
|
||||
resetPopupUrl();
|
||||
// An address switch ends every connection allowed without "Remember". This
|
||||
// waits on storage, so it comes after the pending approvals above, which
|
||||
// are still rejected the moment the switch arrives.
|
||||
await endConnections(() => true);
|
||||
const s = await getState();
|
||||
const activeAddress = activeAddressOf(s);
|
||||
const allowed = activeAddress ? s.allowedSites[activeAddress] || [] : [];
|
||||
@@ -1308,24 +1227,17 @@ async function broadcastAccountsChanged() {
|
||||
return;
|
||||
}
|
||||
for (const tab of tabs) {
|
||||
// The tab's URL is all the background knows of the page in it, and a
|
||||
// page at a site's URL may have another origin: a page its server
|
||||
// sandboxes with a Content-Security-Policy has the origin "null". So
|
||||
// the event names the origin it was judged by, and the content script
|
||||
// passes the address on only to a page whose own origin is that one
|
||||
// (src/content/index.js).
|
||||
const origin = tab.url ? new URL(tab.url).origin : "";
|
||||
const hasPermission =
|
||||
activeAddress &&
|
||||
(allowed.includes(origin) ||
|
||||
(await isConnected(origin, activeAddress)));
|
||||
connectedSites[origin + ":" + activeAddress]);
|
||||
// Same as chainChanged above: a tab without our content script
|
||||
// rejects, and that is expected rather than a fault.
|
||||
tabsSendMessage(tab.id, {
|
||||
type: "AUTISTMASK_EVENT",
|
||||
eventName: "accountsChanged",
|
||||
data: hasPermission ? [activeAddress] : [],
|
||||
origin,
|
||||
}).catch(() => {});
|
||||
}
|
||||
}
|
||||
@@ -1511,14 +1423,7 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
|
||||
// the message carries. Firefox before 126 gives no sender.origin, so
|
||||
// the origin of sender.url is used: the frame that sent the message,
|
||||
// not the tab's page, which may be another site embedding that
|
||||
// frame.
|
||||
//
|
||||
// A site is scheme://host[:port], so a request is refused when its
|
||||
// origin has no host, as when it has no origin at all, rather than
|
||||
// credited to the site its URL names. The browser reports "null" for
|
||||
// a page with an opaque origin, such as one its server sandboxes with
|
||||
// a Content-Security-Policy, and Chrome reports "file://" for a local
|
||||
// file.
|
||||
// frame. With neither, the request is refused.
|
||||
let trustedOrigin = sender.origin;
|
||||
if (!trustedOrigin && sender.url) {
|
||||
try {
|
||||
@@ -1527,13 +1432,7 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
|
||||
// an unparseable URL leaves the origin unknown
|
||||
}
|
||||
}
|
||||
let host = "";
|
||||
try {
|
||||
host = new URL(trustedOrigin).host;
|
||||
} catch {
|
||||
// no origin, or "null", is not a URL and so has no host
|
||||
}
|
||||
if (!host) {
|
||||
if (!trustedOrigin) {
|
||||
sendResponse({
|
||||
error: {
|
||||
code: 4100,
|
||||
@@ -1730,7 +1629,7 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
|
||||
if (outcome.spendApproval) {
|
||||
settleApproval(
|
||||
msg.id,
|
||||
{ error: requestError(outcome.error) },
|
||||
{ error: { message: outcome.error } },
|
||||
{ holdsClaim: true },
|
||||
);
|
||||
} else {
|
||||
@@ -1757,7 +1656,7 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
|
||||
const outcome = describeTxFailure(TX_STAGE_NONCE, null);
|
||||
settleApproval(
|
||||
msg.id,
|
||||
{ error: requestError(outcome.error) },
|
||||
{ error: { message: outcome.error } },
|
||||
{ holdsClaim: true },
|
||||
);
|
||||
sendResponse({
|
||||
@@ -1790,13 +1689,10 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
|
||||
// that says plainly it did not take the transaction:
|
||||
// describeTxFailure() reclassifies that, and the stage it
|
||||
// returns is the one reported.
|
||||
//
|
||||
// A node that refused the transaction gives the page its own
|
||||
// code and data, whatever sentence the page is shown.
|
||||
const outcome = describeTxFailure(TX_STAGE_BROADCAST, e);
|
||||
settleApproval(
|
||||
msg.id,
|
||||
{ error: requestError(outcome.error, nodeError(e)) },
|
||||
{ error: { message: outcome.error } },
|
||||
{ holdsClaim: true },
|
||||
);
|
||||
sendResponse({
|
||||
@@ -1867,8 +1763,7 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
|
||||
|
||||
(async () => {
|
||||
try {
|
||||
const s = await getState();
|
||||
const activeAddress = activeAddressOf(s);
|
||||
const activeAddress = await getActiveAddress();
|
||||
// Same as the transaction path: the address the approval named
|
||||
// is the one that must have signed, and a switch since then is
|
||||
// a refusal rather than a signature from another account.
|
||||
@@ -1887,29 +1782,6 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
|
||||
signature,
|
||||
approval.approvedFrom,
|
||||
);
|
||||
// The sign screen refuses typed data whose message ethers
|
||||
// would sign differently from how it is shown, or whose
|
||||
// domain names another chain. A signature for it that arrives
|
||||
// anyway is refused here, against the network active now.
|
||||
const sp = approval.signParams;
|
||||
if (
|
||||
sp.method === "eth_signTypedData_v4" ||
|
||||
sp.method === "eth_signTypedData"
|
||||
) {
|
||||
const data = JSON.parse(sp.typedData);
|
||||
const refusal =
|
||||
typedDataMessageRefusal(
|
||||
data.types,
|
||||
signedPrimaryType(data.types),
|
||||
data.message,
|
||||
"",
|
||||
) ||
|
||||
typedDataChainRefusal(
|
||||
data.domain,
|
||||
networkById(s.networkId),
|
||||
);
|
||||
if (refusal) throw new ApprovalMismatchError(refusal);
|
||||
}
|
||||
settleApproval(msg.id, { signature }, { holdsClaim: true });
|
||||
sendResponse({ signature });
|
||||
} catch (e) {
|
||||
@@ -1918,7 +1790,7 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
|
||||
if (!retryable) {
|
||||
settleApproval(
|
||||
msg.id,
|
||||
{ error: requestError(errMsg) },
|
||||
{ error: { message: errMsg } },
|
||||
{ holdsClaim: true },
|
||||
);
|
||||
} else {
|
||||
@@ -1946,57 +1818,41 @@ runtime.onMessage.addListener((msg, sender, sendResponse) => {
|
||||
}
|
||||
|
||||
// The popup removed these addresses, so no site stays connected to them.
|
||||
// A connectedSites key is origin + ":" + address, and an origin can carry
|
||||
// a port, so the address is what follows the last colon.
|
||||
if (msg.type === "AUTISTMASK_ADDRESSES_REMOVED") {
|
||||
const removed = Array.isArray(msg.addresses) ? msg.addresses : [];
|
||||
endConnections((key) => {
|
||||
for (const key of Object.keys(connectedSites)) {
|
||||
const address = key.slice(key.lastIndexOf(":") + 1);
|
||||
return removed.some((a) => sameAddress(a, address));
|
||||
}).catch((err) => {
|
||||
log.errorf(
|
||||
"ending the removed addresses' connections failed:",
|
||||
err,
|
||||
);
|
||||
});
|
||||
if (removed.some((a) => sameAddress(a, address))) {
|
||||
delete connectedSites[key];
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// Settings lists the sites connected without "Remember", which only
|
||||
// session storage holds.
|
||||
// Settings lists the sites connected without "Remember", which only this
|
||||
// worker knows. The origin is what precedes the key's last colon.
|
||||
if (msg.type === "AUTISTMASK_GET_CONNECTED_SITES") {
|
||||
sessionStorageGet(null)
|
||||
.then((items) =>
|
||||
Object.keys(items).map((key) =>
|
||||
sendResponse(
|
||||
Object.keys(connectedSites).map((key) =>
|
||||
key.slice(0, key.lastIndexOf(":")),
|
||||
),
|
||||
)
|
||||
.catch((err) => {
|
||||
log.errorf("listing the connected sites failed:", err);
|
||||
return [];
|
||||
})
|
||||
.then(sendResponse);
|
||||
return true;
|
||||
);
|
||||
return false;
|
||||
}
|
||||
|
||||
// Settings removed this site (msg.origin) and has already dropped its
|
||||
// remembered entries. Its connections approved without "Remember" end
|
||||
// here, under every address, and its open tabs are told it has no account.
|
||||
// The answer goes back once they have ended, and Settings waits for it
|
||||
// before it lists the connected sites again.
|
||||
if (msg.type === "AUTISTMASK_REMOVE_SITE") {
|
||||
endConnections(
|
||||
(key) => key.slice(0, key.lastIndexOf(":")) === msg.origin,
|
||||
)
|
||||
.catch((err) => {
|
||||
log.errorf(
|
||||
"ending the removed site's connections failed:",
|
||||
err,
|
||||
);
|
||||
})
|
||||
.then(() => {
|
||||
for (const key of Object.keys(connectedSites)) {
|
||||
if (key.slice(0, key.lastIndexOf(":")) === msg.origin) {
|
||||
delete connectedSites[key];
|
||||
}
|
||||
}
|
||||
broadcastSiteRemoved(msg.origin);
|
||||
sendResponse(null);
|
||||
});
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
// Settings switched the network and has saved it. Open tabs are told the
|
||||
|
||||
+3
-12
@@ -49,23 +49,14 @@ window.addEventListener("message", (event) => {
|
||||
|
||||
// Listen for events pushed from the background (e.g. accountsChanged)
|
||||
runtimeApi().onMessage.addListener((msg) => {
|
||||
if (msg.type !== "AUTISTMASK_EVENT") return;
|
||||
// The background chooses the addresses in accountsChanged for the site
|
||||
// at the origin the event names, which is the origin of the tab's URL.
|
||||
// This page hears them only when its own origin is that one. A page whose
|
||||
// origin has no host is not a site: one its server sandboxes with a
|
||||
// Content-Security-Policy has the origin "null" whatever its URL, and is
|
||||
// told no address, as its requests are refused.
|
||||
let data = msg.data;
|
||||
if (msg.eventName === "accountsChanged" && msg.origin !== window.origin) {
|
||||
data = [];
|
||||
}
|
||||
if (msg.type === "AUTISTMASK_EVENT") {
|
||||
window.postMessage(
|
||||
{
|
||||
type: "AUTISTMASK_EVENT",
|
||||
eventName: msg.eventName,
|
||||
data,
|
||||
data: msg.data,
|
||||
},
|
||||
"*",
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
+25
-54
@@ -634,12 +634,17 @@
|
||||
</div>
|
||||
</div>
|
||||
<div id="confirm-warnings" class="mb-2 invisible"></div>
|
||||
<!-- These two sentences name the network's native token, so
|
||||
show() in confirmTx.js sets them. -->
|
||||
<div id="confirm-recipient-warning" class="mb-2 invisible">
|
||||
<div
|
||||
id="confirm-recipient-warning"
|
||||
class="mb-2 border border-red-500 border-dashed p-2 text-xs font-bold text-red-500 invisible"
|
||||
></div>
|
||||
class="border border-red-500 border-dashed p-2 text-xs font-bold text-red-500"
|
||||
>
|
||||
WARNING: The recipient address has ZERO transaction
|
||||
history. This may indicate a fresh or unused address.
|
||||
Double-check the address before sending.
|
||||
</div>
|
||||
</div>
|
||||
<!-- Its sentence names the network's native token, so show()
|
||||
in confirmTx.js sets it. -->
|
||||
<div
|
||||
id="confirm-contract-warning"
|
||||
class="mb-2 border border-red-500 border-dashed p-2 text-xs font-bold text-red-500 invisible"
|
||||
@@ -664,20 +669,6 @@
|
||||
id="confirm-errors"
|
||||
class="mb-2 border border-border border-dashed p-2 invisible min-h-[1.25rem]"
|
||||
></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
|
||||
id="confirm-amount-fee-error"
|
||||
class="mb-2 border border-border border-dashed p-2 text-xs invisible"
|
||||
@@ -697,25 +688,6 @@
|
||||
id="confirm-fee-unknown-error"
|
||||
class="mb-2 border border-border border-dashed p-2 text-xs invisible"
|
||||
></div>
|
||||
<!-- Shown when Sign & Send refuses a send for its network, 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-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">
|
||||
<label class="block mb-1 text-xs">Password</label>
|
||||
<input
|
||||
@@ -871,7 +843,7 @@
|
||||
id="add-token-info"
|
||||
class="text-xs text-muted mb-2 min-h-[1.25rem] invisible"
|
||||
></div>
|
||||
<div id="add-token-common" class="mb-2">
|
||||
<div class="mb-2">
|
||||
<label class="block mb-1 text-xs text-muted"
|
||||
>Or pick a common token:</label
|
||||
>
|
||||
@@ -957,9 +929,9 @@
|
||||
<div class="bg-well p-3 mx-1 mb-3">
|
||||
<h3 class="font-bold mb-1">Network</h3>
|
||||
<p class="text-xs text-muted mb-1">
|
||||
Select the Ethereum network. Switching restores the RPC
|
||||
and Blockscout endpoints last used on that network, or
|
||||
that network's defaults if it has none.
|
||||
Select the Ethereum network. Switching networks will
|
||||
update the RPC and Blockscout endpoints to their
|
||||
defaults.
|
||||
</p>
|
||||
<div class="text-xs flex items-center gap-1">
|
||||
<select
|
||||
@@ -1156,8 +1128,7 @@
|
||||
<p class="text-xs mb-3">
|
||||
Deleting
|
||||
<strong id="delete-wallet-name"></strong> is permanent. Any
|
||||
funds will be unrecoverable without your
|
||||
<span id="delete-wallet-key-material"></span>.
|
||||
funds will be unrecoverable without your recovery phrase.
|
||||
</p>
|
||||
<div class="mb-2">
|
||||
<label class="block mb-1">Password</label>
|
||||
@@ -1208,13 +1179,13 @@
|
||||
money at its addresses is not moved or destroyed.
|
||||
</p>
|
||||
<p class="text-xs mb-2">
|
||||
If you have kept a copy of this wallet's
|
||||
<span id="delete-wallet-lost-key-material"></span>, add the
|
||||
wallet again afterwards with a new password and you will
|
||||
have it back.
|
||||
If you have the recovery phrase for this wallet written
|
||||
down, add the wallet again afterwards with a new password
|
||||
and you will have it back.
|
||||
<strong
|
||||
>If you have not, deleting this wallet means losing
|
||||
everything it holds, forever.</strong
|
||||
>If you do not have it written down, deleting this
|
||||
wallet means losing everything it holds,
|
||||
forever.</strong
|
||||
>
|
||||
</p>
|
||||
<p class="text-xs mb-3">Your other wallets are not touched.</p>
|
||||
@@ -1355,10 +1326,8 @@
|
||||
<h2 class="font-bold mb-2">Add Token</h2>
|
||||
<p class="text-xs text-muted mb-3">
|
||||
Pick a common token or enter a contract address manually.
|
||||
Common tokens are offered on Ethereum Mainnet only.
|
||||
</p>
|
||||
|
||||
<div id="settings-addtoken-common">
|
||||
<!-- top 10 quick-pick buttons -->
|
||||
<div class="mb-3">
|
||||
<label class="block mb-1 text-xs text-muted"
|
||||
@@ -1388,7 +1357,6 @@
|
||||
Add selected
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- manual contract address -->
|
||||
<div class="mb-3">
|
||||
@@ -1748,7 +1716,10 @@
|
||||
<div class="text-xs text-muted mb-1">
|
||||
Address that will be shared:
|
||||
</div>
|
||||
<div id="approve-address" class="text-xs mb-2"></div>
|
||||
<div
|
||||
id="approve-address"
|
||||
class="text-xs flex items-center mb-2"
|
||||
></div>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label
|
||||
|
||||
+6
-59
@@ -21,12 +21,6 @@ const {
|
||||
goBack,
|
||||
} = require("./views/helpers");
|
||||
const { applyTheme } = require("./theme");
|
||||
const {
|
||||
tabsGetCurrent,
|
||||
tabsGetZoom,
|
||||
windowsGetCurrent,
|
||||
windowsUpdate,
|
||||
} = require("../shared/browserApi");
|
||||
// Renders a view the popup lands on without having navigated to it forward:
|
||||
// on restore here, and on Back. Only the views that can be fully re-rendered
|
||||
// from persisted state (RESTORABLE_VIEWS, src/shared/restorableViews.js) go
|
||||
@@ -64,8 +58,8 @@ window.addEventListener("pagehide", () => pageClosed.abort());
|
||||
|
||||
let refreshInFlight = false;
|
||||
|
||||
// The ten-second refresh startRefresh() starts, stopped when the popup moves to
|
||||
// the recovery screen: there is no profile left to refresh.
|
||||
// The ten-second refresh init() starts, stopped when the popup moves to the
|
||||
// recovery screen: there is no profile left to refresh.
|
||||
let refreshTimer = null;
|
||||
|
||||
async function doRefreshAndRender() {
|
||||
@@ -99,23 +93,9 @@ async function doRefreshAndRender() {
|
||||
}
|
||||
}
|
||||
|
||||
// Refreshes now and every ten seconds from then on. Called once a wallet
|
||||
// exists: by init() when the popup opens with one, and by AddWallet when it
|
||||
// adds one, which in a popup that opened on Welcome is the first
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/530). With the refresh already
|
||||
// running it starts no second one, and on the recovery screen it does nothing.
|
||||
function startRefresh() {
|
||||
if (!$("view-state-recovery").classList.contains("hidden")) return;
|
||||
doRefreshAndRender();
|
||||
if (refreshTimer === null) {
|
||||
refreshTimer = setInterval(doRefreshAndRender, 10000);
|
||||
}
|
||||
}
|
||||
|
||||
const ctx = {
|
||||
renderWalletList,
|
||||
doRefreshAndRender,
|
||||
startRefresh,
|
||||
pageClosed: pageClosed.signal,
|
||||
showAddWalletView: () => {
|
||||
pushCurrentView();
|
||||
@@ -183,40 +163,6 @@ function fallbackView() {
|
||||
showView("main");
|
||||
}
|
||||
|
||||
// The background opens the approval window as wide as the page, but the
|
||||
// browser counts the window's frame in that width, and a screen taller than
|
||||
// the window takes a vertical scrollbar out of it too. So once the screen is
|
||||
// up, the window is widened by however far the page would scroll sideways.
|
||||
// That distance is in page pixels and the window's width in screen pixels:
|
||||
// at 150% zoom one page pixel is 1.5 screen pixels. The zoom is read for this
|
||||
// page's own tab, because asked without a tab id Firefox answers for the
|
||||
// window focused last. Firefox draws some zoom steps a little larger than the
|
||||
// zoom it reports, 170% among them, so once the page has its new width (its
|
||||
// resize event) it is measured again, and the window widened again while the
|
||||
// page still falls short, three times at most. A window that cannot grow sends
|
||||
// no resize event, and the page stops there. The connection prompt can also
|
||||
// show in the toolbar popup, whose window is the user's browser window; that
|
||||
// one is left alone.
|
||||
async function widenApprovalWindow() {
|
||||
const page = document.documentElement;
|
||||
if (page.scrollWidth <= page.clientWidth) return;
|
||||
const win = await windowsGetCurrent();
|
||||
if (win.type !== "popup") return;
|
||||
const tab = await tabsGetCurrent();
|
||||
const zoom = await tabsGetZoom(tab.id);
|
||||
let width = win.width;
|
||||
for (let tries = 0; tries < 3; tries++) {
|
||||
const sideways = page.scrollWidth - page.clientWidth;
|
||||
if (sideways <= 0) return;
|
||||
width += Math.ceil(sideways * zoom);
|
||||
const resized = new Promise((resolve) =>
|
||||
window.addEventListener("resize", resolve, { once: true }),
|
||||
);
|
||||
await windowsUpdate(win.id, { width });
|
||||
await resized;
|
||||
}
|
||||
}
|
||||
|
||||
async function init() {
|
||||
// First, before anything can save: showView() saves on every navigation
|
||||
// without awaiting, so a save that fails from here on has somewhere to be
|
||||
@@ -293,8 +239,8 @@ async function init() {
|
||||
// the run on both harnesses (Playwright `pageerror`, and the Firefox
|
||||
// driver's console-service drain), so nothing is lost by leaving it
|
||||
// on that path. show() puts the approval's own screen up once the
|
||||
// background has described it; the window is widened to fit it then.
|
||||
approval.show(approvalId).then(widenApprovalWindow);
|
||||
// background has described it.
|
||||
approval.show(approvalId);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -332,7 +278,8 @@ async function init() {
|
||||
} else {
|
||||
renderWalletList();
|
||||
restoreView();
|
||||
startRefresh();
|
||||
doRefreshAndRender();
|
||||
refreshTimer = setInterval(doRefreshAndRender, 10000);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+8
-17
@@ -13,7 +13,6 @@
|
||||
// cannot be required outside a browser.
|
||||
|
||||
const { RESTORABLE_VIEWS } = require("../shared/restorableViews");
|
||||
const { SUPPORTED_CHAIN_IDS } = require("../shared/networks");
|
||||
|
||||
// The views this page load has rendered.
|
||||
//
|
||||
@@ -38,11 +37,9 @@ function markViewRendered(view) {
|
||||
if (view) renderedViews.add(view);
|
||||
}
|
||||
|
||||
// Begin a fresh page-load scope. The popup gets one by being loaded, and
|
||||
// asks for one when the user switches the network, because every screen
|
||||
// then on the page shows the previous network (views/settings.js); the
|
||||
// Begin a fresh page-load scope. The popup gets one by being loaded; the
|
||||
// unit tests, which simulate several page loads against one module
|
||||
// instance, ask for one too.
|
||||
// instance, ask for one.
|
||||
function resetRenderedViews() {
|
||||
renderedViews.clear();
|
||||
}
|
||||
@@ -127,19 +124,14 @@ function isRenderableDecoded(value) {
|
||||
}
|
||||
|
||||
// The pending transaction confirmTx.show() renders: `token` reaches
|
||||
// renderAddressHtml() when it is not "ETH", `from`/`to` reach
|
||||
// addressTitle(), makeBlockie() and getLocalWarnings(), and `amount` reaches
|
||||
// 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.
|
||||
// renderAddressHtml() when it is not "ETH", and `from`/`to` reach
|
||||
// addressTitle(), makeBlockie() and getLocalWarnings().
|
||||
function isRenderablePendingTx(value) {
|
||||
return (
|
||||
isRecord(value) &&
|
||||
isText(value.token) &&
|
||||
isAddressText(value.from) &&
|
||||
isAddressText(value.to) &&
|
||||
isText(value.amount) &&
|
||||
(!value.chainId || SUPPORTED_CHAIN_IDS.has(value.chainId))
|
||||
isAddressText(value.to)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -221,10 +213,9 @@ function renderView(view, state, views) {
|
||||
// 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
|
||||
// stack is filtered against RESTORABLE_VIEWS, and a network switch cuts
|
||||
// it the same way (views/settings.js), so such a view can only be on the
|
||||
// stack from this page load, where forward navigation rendered it on the
|
||||
// way in.
|
||||
// stack is filtered against RESTORABLE_VIEWS, so such a view can only
|
||||
// be on the stack from this page load, where forward navigation
|
||||
// rendered it on the way in.
|
||||
// - This page load has rendered it. Re-rendering would re-fetch and
|
||||
// clobber what it holds; Home is rendered anyway, see above.
|
||||
//
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
const { $, showView, showFlash, escapeHtml, goBack } = require("./helpers");
|
||||
const { getTopTokens } = require("../../shared/tokenList");
|
||||
const { state, saveState, currentNetwork } = require("../../shared/state");
|
||||
const { state, saveState } = require("../../shared/state");
|
||||
const { lookupTokenInfo } = require("../../shared/balances");
|
||||
const { isScamAddress } = require("../../shared/scamlist");
|
||||
const { log } = require("../../shared/log");
|
||||
@@ -9,12 +9,6 @@ function show() {
|
||||
$("add-token-address").value = "";
|
||||
$("add-token-info").textContent = "";
|
||||
$("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");
|
||||
list.innerHTML = getTopTokens(25)
|
||||
.map(
|
||||
@@ -52,9 +46,6 @@ function init(ctx) {
|
||||
infoEl.textContent = "Looking up token...";
|
||||
infoEl.style.visibility = "visible";
|
||||
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 {
|
||||
const info = await lookupTokenInfo(
|
||||
contractAddr,
|
||||
@@ -62,15 +53,6 @@ function init(ctx) {
|
||||
state.networkId,
|
||||
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);
|
||||
state.trackedTokens.push({
|
||||
address: contractAddr,
|
||||
|
||||
@@ -20,7 +20,6 @@ const {
|
||||
const { encryptWithPassword } = require("../../shared/vault");
|
||||
const { state, saveState } = require("../../shared/state");
|
||||
const { scanForAddresses } = require("../../shared/balances");
|
||||
const { notify } = require("../../shared/browserApi");
|
||||
|
||||
/**
|
||||
* Check if an address already exists in ANY wallet (hd, xprv, or key).
|
||||
@@ -185,19 +184,11 @@ async function importMnemonic(ctx) {
|
||||
encryptedSecret: encrypted,
|
||||
nextIndex: 1,
|
||||
addresses: [
|
||||
{
|
||||
address: firstAddress,
|
||||
index: 0,
|
||||
balance: "0.0000",
|
||||
tokenBalances: [],
|
||||
},
|
||||
{ address: firstAddress, balance: "0.0000", tokenBalances: [] },
|
||||
],
|
||||
};
|
||||
state.wallets.push(wallet);
|
||||
state.hasWallet = true;
|
||||
if (state.activeAddress === null) {
|
||||
state.activeAddress = firstAddress;
|
||||
}
|
||||
await saveState();
|
||||
clearViewStack();
|
||||
ctx.renderWalletList();
|
||||
@@ -214,27 +205,18 @@ async function importMnemonic(ctx) {
|
||||
if (scan.addresses.length > 1) {
|
||||
wallet.addresses = scan.addresses.map((a) => ({
|
||||
address: a.address,
|
||||
index: a.index,
|
||||
balance: "0.0000",
|
||||
tokenBalances: [],
|
||||
}));
|
||||
wallet.nextIndex = scan.nextIndex;
|
||||
// The new list leaves out the first address when the scan found it
|
||||
// unused. If it was the active one, the new list's first takes over,
|
||||
// and the background is told as when the user picks one on Home.
|
||||
const activeMoved =
|
||||
state.activeAddress === firstAddress &&
|
||||
wallet.addresses[0].address !== firstAddress;
|
||||
if (activeMoved) state.activeAddress = wallet.addresses[0].address;
|
||||
await saveState();
|
||||
ctx.renderWalletList();
|
||||
if (activeMoved) notify({ type: "AUTISTMASK_ACTIVE_CHANGED" });
|
||||
showFlash("Found " + scan.addresses.length + " addresses.");
|
||||
} else {
|
||||
showFlash("Ready.", 1000);
|
||||
}
|
||||
|
||||
ctx.startRefresh();
|
||||
ctx.doRefreshAndRender();
|
||||
}
|
||||
|
||||
async function importPrivateKey(ctx) {
|
||||
@@ -266,15 +248,12 @@ async function importPrivateKey(ctx) {
|
||||
addresses: [{ address: addr, balance: "0.0000", tokenBalances: [] }],
|
||||
});
|
||||
state.hasWallet = true;
|
||||
if (state.activeAddress === null) {
|
||||
state.activeAddress = addr;
|
||||
}
|
||||
await saveState();
|
||||
clearViewStack();
|
||||
ctx.renderWalletList();
|
||||
showView("main");
|
||||
|
||||
ctx.startRefresh();
|
||||
ctx.doRefreshAndRender();
|
||||
}
|
||||
|
||||
async function importXprvKey(ctx) {
|
||||
@@ -320,19 +299,11 @@ async function importXprvKey(ctx) {
|
||||
encryptedSecret: encrypted,
|
||||
nextIndex: 1,
|
||||
addresses: [
|
||||
{
|
||||
address: firstAddress,
|
||||
index: 0,
|
||||
balance: "0.0000",
|
||||
tokenBalances: [],
|
||||
},
|
||||
{ address: firstAddress, balance: "0.0000", tokenBalances: [] },
|
||||
],
|
||||
};
|
||||
state.wallets.push(wallet);
|
||||
state.hasWallet = true;
|
||||
if (state.activeAddress === null) {
|
||||
state.activeAddress = firstAddress;
|
||||
}
|
||||
await saveState();
|
||||
clearViewStack();
|
||||
ctx.renderWalletList();
|
||||
@@ -349,26 +320,18 @@ async function importXprvKey(ctx) {
|
||||
if (scan.addresses.length > 1) {
|
||||
wallet.addresses = scan.addresses.map((a) => ({
|
||||
address: a.address,
|
||||
index: a.index,
|
||||
balance: "0.0000",
|
||||
tokenBalances: [],
|
||||
}));
|
||||
wallet.nextIndex = scan.nextIndex;
|
||||
// As for a recovery phrase: an active first address the scan left
|
||||
// out gives way to the new list's first.
|
||||
const activeMoved =
|
||||
state.activeAddress === firstAddress &&
|
||||
wallet.addresses[0].address !== firstAddress;
|
||||
if (activeMoved) state.activeAddress = wallet.addresses[0].address;
|
||||
await saveState();
|
||||
ctx.renderWalletList();
|
||||
if (activeMoved) notify({ type: "AUTISTMASK_ACTIVE_CHANGED" });
|
||||
showFlash("Found " + scan.addresses.length + " addresses.");
|
||||
} else {
|
||||
showFlash("Ready.", 1000);
|
||||
}
|
||||
|
||||
ctx.startRefresh();
|
||||
ctx.doRefreshAndRender();
|
||||
}
|
||||
|
||||
function init(ctx) {
|
||||
|
||||
@@ -266,7 +266,7 @@ function init(_ctx) {
|
||||
// This address's private key can be derived from the stored key,
|
||||
// but export goes through getSignerForAddress, which refuses a key
|
||||
// that is not a master key. Without this the export screen would
|
||||
// take a password and then refuse.
|
||||
// take a password and then report that refusal as a wrong password.
|
||||
const defect = selectedWalletDefect();
|
||||
if (defect) {
|
||||
showFlash(defect.shortMessage);
|
||||
|
||||
+32
-107
@@ -12,7 +12,7 @@ const {
|
||||
formatFee,
|
||||
tokenLabel,
|
||||
} = require("./helpers");
|
||||
const { state, saveState, currentNetwork } = require("../../shared/state");
|
||||
const { state, saveState } = require("../../shared/state");
|
||||
const {
|
||||
networkById,
|
||||
networkByChainId,
|
||||
@@ -27,6 +27,7 @@ const {
|
||||
Interface,
|
||||
MaxUint256,
|
||||
toUtf8String,
|
||||
TypedDataEncoder,
|
||||
} = require("ethers");
|
||||
const { getPrice, formatUsd } = require("../../shared/prices");
|
||||
const { ERC20_ABI } = require("../../shared/constants");
|
||||
@@ -45,12 +46,7 @@ const {
|
||||
const { decryptWithPassword } = require("../../shared/vault");
|
||||
const { getSignerForAddress } = require("../../shared/wallet");
|
||||
const { walletDefect } = require("../../shared/walletDefects");
|
||||
const {
|
||||
describeSigningFailure,
|
||||
signedPrimaryType,
|
||||
typedDataMessageRefusal,
|
||||
typedDataChainRefusal,
|
||||
} = require("../../shared/approvalVerify");
|
||||
const { describeSigningFailure } = require("../../shared/approvalVerify");
|
||||
const txStatus = require("./txStatus");
|
||||
const uniswap = require("../../shared/uniswap");
|
||||
const { notify, runtimeApi, sendMessage } = require("../../shared/browserApi");
|
||||
@@ -79,10 +75,9 @@ function tokenAmountText(rawAmount, decimals, symbol) {
|
||||
};
|
||||
}
|
||||
|
||||
// Try to decode calldata sent from `fromAddress` to `toAddress` on the network
|
||||
// with chain id `chainId`, using known ABIs.
|
||||
// Try to decode calldata using known ABIs.
|
||||
// Returns { name, description, details } or null.
|
||||
function decodeCalldata(data, toAddress, chainId, fromAddress) {
|
||||
function decodeCalldata(data, toAddress) {
|
||||
if (!data || data === "0x" || data.length < 10) return null;
|
||||
|
||||
// Where a token's scale is looked for, for every decoder below: the ERC-20
|
||||
@@ -186,13 +181,7 @@ function decodeCalldata(data, toAddress, chainId, fromAddress) {
|
||||
}
|
||||
|
||||
// Try Uniswap Universal Router
|
||||
const routerResult = uniswap.decode(
|
||||
data,
|
||||
toAddress,
|
||||
chainId,
|
||||
decimalsSources,
|
||||
fromAddress,
|
||||
);
|
||||
const routerResult = uniswap.decode(data, toAddress, decimalsSources);
|
||||
if (routerResult) return routerResult;
|
||||
|
||||
return null;
|
||||
@@ -276,15 +265,8 @@ function showTxApproval(details) {
|
||||
chainId: approvedTx.chainId,
|
||||
};
|
||||
|
||||
// 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
|
||||
// names, and the address the From line names.
|
||||
const decoded = decodeCalldata(
|
||||
approvedTx.data,
|
||||
toAddr || "",
|
||||
approvedTx.chainId,
|
||||
details.approvedFrom,
|
||||
);
|
||||
// If this is an ERC-20 call, try to extract the real recipient and amount
|
||||
const decoded = decodeCalldata(approvedTx.data, toAddr || "");
|
||||
if (decoded && decoded.details) {
|
||||
// The asset the status summary is counted in: an ERC-20 call's Token
|
||||
// contract, or a swap's input token. Its symbol is resolved from the
|
||||
@@ -313,23 +295,6 @@ function showTxApproval(details) {
|
||||
sources,
|
||||
);
|
||||
}
|
||||
// A swap the decoder read no amount for, such as one whose V4 swap
|
||||
// action could not be read or a V4 exact-out swap. The wait and error
|
||||
// screens say the amount could not be decoded, with no currency after
|
||||
// it, rather than show the transaction's ETH value as the amount. A
|
||||
// swap paid in native ETH keeps that value: it is the ETH the swap
|
||||
// pays (for an exact-out swap, the most it pays), not a figure that
|
||||
// had to be read from the calldata.
|
||||
const tokenIn = decoded.details.find((d) => d.label === "Token In");
|
||||
if (
|
||||
tokenIn &&
|
||||
tokenIn.value !== "ETH (native)" &&
|
||||
!decoded.details.some((d) => d.label === "Amount")
|
||||
) {
|
||||
pendingTxDetails.amount = "Unknown (could not be decoded)";
|
||||
pendingTxDetails.token = null;
|
||||
pendingTxDetails.tokenSymbol = null;
|
||||
}
|
||||
}
|
||||
|
||||
// Carry decoded calldata info through to success/error views
|
||||
@@ -464,12 +429,21 @@ function markInvisibleCharacters(text) {
|
||||
);
|
||||
}
|
||||
|
||||
// The type ethers will sign typed data as. ethers does not read the page's
|
||||
// `primaryType`: it takes the one struct in `types` that no other struct
|
||||
// refers to. Throws when the types name no such single struct, which ethers
|
||||
// would refuse to sign as well.
|
||||
function signedPrimaryType(types) {
|
||||
const structs = { ...types };
|
||||
// ethers derives EIP712Domain itself and rejects it as an input.
|
||||
delete structs.EIP712Domain;
|
||||
return TypedDataEncoder.getPrimaryType(structs);
|
||||
}
|
||||
|
||||
// Why a signature request cannot be signed, as a sentence for the error line,
|
||||
// or null when it can. Only typed data is refused: the `primaryType` the page
|
||||
// states has to be the type ethers will sign, or this screen would name one
|
||||
// message while another is signed. Its message has to hold every declared
|
||||
// field, with each `bool` true or false, and its domain may name no chain but
|
||||
// the active network's.
|
||||
// message while another is signed.
|
||||
function typedDataRefusal(sp) {
|
||||
if (sp.method === "personal_sign" || sp.method === "eth_sign") return null;
|
||||
let data;
|
||||
@@ -492,10 +466,7 @@ function typedDataRefusal(sp) {
|
||||
", so it cannot be signed."
|
||||
);
|
||||
}
|
||||
return (
|
||||
typedDataMessageRefusal(data.types, signed, data.message, "") ||
|
||||
typedDataChainRefusal(data.domain, currentNetwork())
|
||||
);
|
||||
return null;
|
||||
}
|
||||
|
||||
// The largest amount a Permit2 allowance can hold, a uint160. Permit2 treats
|
||||
@@ -651,38 +622,10 @@ function permitWarningHtml(types, primaryType, domain, message) {
|
||||
return html;
|
||||
}
|
||||
|
||||
// What ethers signs of a message value of type `type`: a struct keeps only
|
||||
// the fields its type declares, in the type's order, and a list is read item
|
||||
// by item. ethers drops every other key, so each one is added to `notSigned`
|
||||
// with its place in the message and its value, for the screen to list apart.
|
||||
function signedValue(types, type, value, path, notSigned) {
|
||||
const itemType = type.replace(/\[\d*\]$/, "");
|
||||
if (itemType !== type) {
|
||||
if (!Array.isArray(value)) return value;
|
||||
return value.map((item, i) =>
|
||||
signedValue(types, itemType, item, `${path}[${i}]`, notSigned),
|
||||
);
|
||||
}
|
||||
const fields = types[type];
|
||||
if (!fields || !value || typeof value !== "object") return value;
|
||||
const at = (name) => (path ? `${path}.${name}` : name);
|
||||
for (const [key, val] of Object.entries(value)) {
|
||||
if (!fields.some((f) => f.name === key)) notSigned.push([at(key), val]);
|
||||
}
|
||||
return Object.fromEntries(
|
||||
fields.map((f) => [
|
||||
f.name,
|
||||
signedValue(types, f.type, value[f.name], at(f.name), notSigned),
|
||||
]),
|
||||
);
|
||||
}
|
||||
|
||||
// The typed data as the screen shows it. The primary type shown is the one
|
||||
// ethers signs, never the page's word for it; typedDataRefusal() keeps the two
|
||||
// from differing on anything that can be signed. The Message section shows
|
||||
// only what is signed, and any other key the page sent is listed after it as
|
||||
// not part of the signature. Only typed data that cannot be read at all is
|
||||
// shown as raw text, and typedDataRefusal() refuses it.
|
||||
// from differing on anything that can be signed. Only typed data that cannot
|
||||
// be read at all is shown as raw text, and typedDataRefusal() refuses it.
|
||||
function formatTypedDataHtml(jsonStr) {
|
||||
let data;
|
||||
let primaryType;
|
||||
@@ -716,30 +659,12 @@ function formatTypedDataHtml(jsonStr) {
|
||||
html += `<div class="mb-2"><div class="text-muted">Primary type</div>`;
|
||||
html += `<div class="font-bold">${escapeHtml(primaryType)}</div></div>`;
|
||||
|
||||
const lineHtml = (key, val) =>
|
||||
`<div><span class="text-muted">${escapeHtml(key)}:</span> <span class="break-all">${escapeHtml(display(val))}</span></div>`;
|
||||
|
||||
if (data.message) {
|
||||
const notSigned = [];
|
||||
const message = signedValue(
|
||||
data.types,
|
||||
primaryType,
|
||||
data.message,
|
||||
"",
|
||||
notSigned,
|
||||
);
|
||||
html += `<div class="mb-2"><div class="text-muted">Message</div>`;
|
||||
for (const [key, val] of Object.entries(message)) {
|
||||
html += lineHtml(key, val);
|
||||
for (const [key, val] of Object.entries(data.message)) {
|
||||
html += `<div><span class="text-muted">${escapeHtml(key)}:</span> <span class="break-all">${escapeHtml(display(val))}</span></div>`;
|
||||
}
|
||||
html += `</div>`;
|
||||
if (notSigned.length > 0) {
|
||||
html += `<div class="mb-2"><div class="text-muted">Not part of the signature</div>`;
|
||||
for (const [key, val] of notSigned) {
|
||||
html += lineHtml(key, val);
|
||||
}
|
||||
html += `</div>`;
|
||||
}
|
||||
}
|
||||
|
||||
return html;
|
||||
@@ -938,15 +863,15 @@ function gateOnWalletDefect(errorId, buttonId, address) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Locate the wallet and the stored address record owning an address. Returns
|
||||
// null when no wallet holds it. Approvals look up the address they were raised
|
||||
// for, not whichever address is active now: the approval named one account,
|
||||
// and signing with another is what verification refuses.
|
||||
// Locate the wallet and the address index owning an address. Returns null when
|
||||
// no wallet holds it. Approvals look up the address they were raised for, not
|
||||
// whichever address is active now: the approval named one account, and signing
|
||||
// with another is what verification refuses.
|
||||
function findWalletFor(address) {
|
||||
for (const wallet of state.wallets) {
|
||||
for (let i = 0; i < wallet.addresses.length; i++) {
|
||||
if (wallet.addresses[i].address === address) {
|
||||
return { wallet, addr: wallet.addresses[i] };
|
||||
return { wallet, addrIndex: i };
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1073,7 +998,7 @@ function init(_ctx) {
|
||||
try {
|
||||
const signer = getSignerForAddress(
|
||||
active.wallet,
|
||||
active.addr,
|
||||
active.addrIndex,
|
||||
decryptedSecret,
|
||||
);
|
||||
// Sign the approved transaction exactly as it was displayed. The
|
||||
@@ -1201,7 +1126,7 @@ function init(_ctx) {
|
||||
try {
|
||||
const signer = getSignerForAddress(
|
||||
active.wallet,
|
||||
active.addr,
|
||||
active.addrIndex,
|
||||
decryptedSecret,
|
||||
);
|
||||
const sp = pendingSignParams;
|
||||
|
||||
+139
-286
@@ -2,13 +2,7 @@
|
||||
// Shows transaction details, warnings, errors. On Sign & Send,
|
||||
// reads inline password, decrypts secret, signs and broadcasts.
|
||||
|
||||
const {
|
||||
parseEther,
|
||||
parseUnits,
|
||||
formatEther,
|
||||
formatUnits,
|
||||
Contract,
|
||||
} = require("ethers");
|
||||
const { parseEther, parseUnits, formatEther, Contract } = require("ethers");
|
||||
const {
|
||||
$,
|
||||
showError,
|
||||
@@ -17,6 +11,7 @@ const {
|
||||
addressTitle,
|
||||
escapeHtml,
|
||||
displaySymbol,
|
||||
nativeCurrency,
|
||||
renderAddressHtml,
|
||||
blockieHtml,
|
||||
attachCopyHandlers,
|
||||
@@ -25,10 +20,6 @@ const {
|
||||
formatFee,
|
||||
} = require("./helpers");
|
||||
const { state, currentNetwork } = require("../../shared/state");
|
||||
const {
|
||||
networkByChainId,
|
||||
nativeCurrencyByChainId,
|
||||
} = require("../../shared/networks");
|
||||
const { getSignerForAddress } = require("../../shared/wallet");
|
||||
const { walletDefect } = require("../../shared/walletDefects");
|
||||
const { decryptWithPassword } = require("../../shared/vault");
|
||||
@@ -41,12 +32,11 @@ const {
|
||||
const { ERC20_ABI, isBurnAddress } = require("../../shared/constants");
|
||||
const {
|
||||
displayedDecimals,
|
||||
toDecimals,
|
||||
transferAmountUnits,
|
||||
} = require("../../shared/transferAmount");
|
||||
const { assertWithinCeilings } = require("../../shared/approvalVerify");
|
||||
// The amount, the balance line and the fee reserve go through it, as the
|
||||
// approval screen's amounts do.
|
||||
// The balance lines, the fee reserve and the insufficient-balance messages go
|
||||
// through it, as the approval screen's amounts do.
|
||||
const { truncateAmountNeverZero } = require("../../shared/amountDisplay");
|
||||
const {
|
||||
CODES,
|
||||
@@ -70,13 +60,6 @@ let feeWei = null;
|
||||
// amount was derived from. Null for any other send, which ethers prices from
|
||||
// the node at signing time.
|
||||
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() {
|
||||
const d = state.viewData;
|
||||
@@ -85,11 +68,11 @@ function restore() {
|
||||
}
|
||||
}
|
||||
|
||||
function confirmAddressHtml(address, ensName, title, chainId) {
|
||||
function confirmAddressHtml(address, ensName, title) {
|
||||
const blockie = blockieHtml(address);
|
||||
return (
|
||||
`<div class="mb-1">${blockie}</div>` +
|
||||
renderAddressHtml(address, { title, ensName, chainId })
|
||||
renderAddressHtml(address, { title, ensName })
|
||||
);
|
||||
}
|
||||
|
||||
@@ -100,96 +83,30 @@ function valueWithUsd(text, usdAmount) {
|
||||
return text;
|
||||
}
|
||||
|
||||
// The amount as this screen and the wait, success and error screens show it,
|
||||
// written as the approval screen writes a site's amount: the amount being
|
||||
// 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.
|
||||
// The Amount line, with its USD value. A max ETH send's line is drawn again
|
||||
// once its amount is re-derived from the fee estimate.
|
||||
function renderAmount(txInfo) {
|
||||
const isErc20 = txInfo.token !== "ETH";
|
||||
const rawSymbol = isErc20
|
||||
? txInfo.tokenSymbol || "?"
|
||||
: nativeCurrencyByChainId(txInfo.chainId);
|
||||
const price = getPrice(isErc20 ? rawSymbol : "ETH", txInfo.chainId);
|
||||
const rawSymbol = isErc20 ? txInfo.tokenSymbol || "?" : nativeCurrency();
|
||||
const price = isErc20 ? getPrice(rawSymbol) : getPrice("ETH");
|
||||
const amountUsd = price ? parseFloat(txInfo.amount) * price : null;
|
||||
$("confirm-amount").textContent = valueWithUsd(
|
||||
shownAmount(txInfo) + " " + displaySymbol(rawSymbol),
|
||||
txInfo.amount + " " + displaySymbol(rawSymbol),
|
||||
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) {
|
||||
pendingTx = txInfo;
|
||||
feeStatus = FEE_PENDING;
|
||||
feeWei = null;
|
||||
maxSendFees = null;
|
||||
balances = null;
|
||||
// The network this screen is drawn for, and the only one it sends on: the
|
||||
// one active when Send handed the transaction over. Drawn again from the
|
||||
// saved transaction, as when the popup reopens onto this screen, it keeps
|
||||
// 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";
|
||||
// The raw symbol is the price-table key; the capped one is what the
|
||||
// screen says. Truncating before the lookup would silently drop the
|
||||
// price of any token whose symbol is long enough to be capped.
|
||||
const rawSymbol = isErc20
|
||||
? txInfo.tokenSymbol || "?"
|
||||
: nativeCurrencyByChainId(txInfo.chainId);
|
||||
const rawSymbol = isErc20 ? txInfo.tokenSymbol || "?" : nativeCurrency();
|
||||
const symbol = displaySymbol(rawSymbol);
|
||||
|
||||
// Transaction type
|
||||
@@ -205,7 +122,7 @@ function show(txInfo) {
|
||||
if (isErc20) {
|
||||
$("confirm-token-contract").innerHTML = renderAddressHtml(
|
||||
txInfo.token,
|
||||
{ chainId: txInfo.chainId },
|
||||
{},
|
||||
);
|
||||
tokenSection.classList.remove("hidden");
|
||||
attachCopyHandlers(tokenSection);
|
||||
@@ -219,7 +136,6 @@ function show(txInfo) {
|
||||
txInfo.from,
|
||||
null,
|
||||
fromTitle,
|
||||
txInfo.chainId,
|
||||
);
|
||||
|
||||
// To (with blockie)
|
||||
@@ -228,12 +144,37 @@ function show(txInfo) {
|
||||
txInfo.to,
|
||||
txInfo.ensName,
|
||||
toTitle,
|
||||
txInfo.chainId,
|
||||
);
|
||||
$("confirm-to-ens").classList.add("hidden");
|
||||
|
||||
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)
|
||||
const localWarnings = getLocalWarnings(txInfo.to, {
|
||||
@@ -267,22 +208,15 @@ function show(txInfo) {
|
||||
$("confirm-gas-error").classList.toggle("hidden", !isErc20);
|
||||
$("confirm-gas-error").textContent =
|
||||
"You do not have enough " +
|
||||
nativeCurrencyByChainId(txInfo.chainId) +
|
||||
nativeCurrency() +
|
||||
" to pay the network fee for this transfer. Please add " +
|
||||
nativeCurrencyByChainId(txInfo.chainId) +
|
||||
nativeCurrency() +
|
||||
" to this address and try again.";
|
||||
|
||||
// Both shown later, by checkRecipientHistory(). The first sentence says
|
||||
// exactly what getFullWarnings() checks.
|
||||
$("confirm-recipient-warning").textContent =
|
||||
"WARNING: The recipient address has never sent a transaction and" +
|
||||
" holds no " +
|
||||
nativeCurrencyByChainId(txInfo.chainId) +
|
||||
". This may indicate a fresh or unused address. Double-check the" +
|
||||
" address before sending.";
|
||||
// Shown later, once checkRecipientHistory() finds a contract.
|
||||
$("confirm-contract-warning").textContent =
|
||||
"WARNING: The recipient is a smart contract. Sending " +
|
||||
nativeCurrencyByChainId(txInfo.chainId) +
|
||||
nativeCurrency() +
|
||||
" or tokens directly to a contract may result in permanent loss of" +
|
||||
" funds.";
|
||||
|
||||
@@ -299,28 +233,11 @@ function show(txInfo) {
|
||||
" cannot be checked against your balance. Please go back and" +
|
||||
" 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);
|
||||
|
||||
// Reset password field and error, and any refusal of an earlier Sign &
|
||||
// Send.
|
||||
// Reset password field and error
|
||||
$("confirm-tx-password").value = "";
|
||||
hideError("confirm-tx-password-error");
|
||||
setVisible("confirm-network-changed-error", false);
|
||||
setVisible("confirm-fee-bound-error", false);
|
||||
|
||||
// Gas estimate — show placeholder then fetch async
|
||||
$("confirm-fee").style.visibility = "visible";
|
||||
@@ -341,78 +258,68 @@ function show(txInfo) {
|
||||
$("confirm-burn-warning").style.visibility = "visible";
|
||||
}
|
||||
|
||||
// The fee is estimated once the balances are read, because a max ETH
|
||||
// send's amount is the ETH balance minus the estimate's reserve.
|
||||
readBalances(txInfo).then(() => estimateGas(txInfo));
|
||||
estimateGas(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
|
||||
// show(), again when the balances are read, and again when the fee estimate
|
||||
// resolves or fails. Every element it touches already occupies its space, so
|
||||
// re-running it never moves anything.
|
||||
// show() and again when the fee estimate resolves or fails. Every element it
|
||||
// touches already occupies its space, so re-running it never moves anything.
|
||||
function renderValidation(txInfo) {
|
||||
const isErc20 = txInfo.token !== "ETH";
|
||||
|
||||
// Null while the balances are being read and after a read that failed.
|
||||
// validateTransfer() takes a missing balance as nothing to spend from, so
|
||||
// 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 symbol = isErc20
|
||||
? displaySymbol(txInfo.tokenSymbol || "?")
|
||||
: nativeCurrency();
|
||||
|
||||
const { canSend, codes } = validateTransfer({
|
||||
isErc20,
|
||||
amount: txInfo.amount,
|
||||
tokenDecimals: txInfo.tokenDecimals,
|
||||
ethBalance,
|
||||
tokenBalance,
|
||||
ethBalance: txInfo.balance,
|
||||
tokenBalance: txInfo.tokenBalance,
|
||||
feeStatus,
|
||||
feeWei,
|
||||
});
|
||||
|
||||
// An invalid amount is known before the first paint, so its message is
|
||||
// written here. Every message a later result brings has a reserved
|
||||
// element, its sentence fixed in index.html or set by show(), and is only
|
||||
// made visible below, so nothing moves when the result arrives.
|
||||
// Messages carrying the user's own numbers are built here; the fixed
|
||||
// sentences live in the reserved elements in index.html, except the
|
||||
// gas and fee-unknown ones, which show() sets.
|
||||
const messages = [];
|
||||
if (codes.includes(CODES.AMOUNT_INVALID)) {
|
||||
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");
|
||||
if (messages.length > 0) {
|
||||
@@ -425,20 +332,13 @@ function renderValidation(txInfo) {
|
||||
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(
|
||||
"confirm-amount-fee-error",
|
||||
balanceRead && codes.includes(CODES.INSUFFICIENT_ETH_WITH_FEE),
|
||||
codes.includes(CODES.INSUFFICIENT_ETH_WITH_FEE),
|
||||
);
|
||||
setVisible(
|
||||
"confirm-gas-error",
|
||||
balanceRead && codes.includes(CODES.INSUFFICIENT_ETH_FOR_FEE),
|
||||
codes.includes(CODES.INSUFFICIENT_ETH_FOR_FEE),
|
||||
);
|
||||
setVisible(
|
||||
"confirm-fee-unknown-error",
|
||||
@@ -457,23 +357,9 @@ function setVisible(id, visible) {
|
||||
$(id).style.visibility = visible ? "visible" : "hidden";
|
||||
}
|
||||
|
||||
// The node of the network this transaction was reviewed for, which need not be
|
||||
// the active one: the popup can reopen onto this screen after Settings switched
|
||||
// the network. Its RPC URL is the one Settings has for that network: the
|
||||
// active network's is state.rpcUrl, any other's the one remembered for it (see
|
||||
// applyChainSwitchFields()).
|
||||
function reviewedNetworkProvider(txInfo) {
|
||||
const net = networkByChainId(txInfo.chainId);
|
||||
if (net.id === state.networkId) {
|
||||
return getProvider(state.rpcUrl, net.id);
|
||||
}
|
||||
const remembered = state.networkEndpoints[net.id] || {};
|
||||
return getProvider(remembered.rpcUrl || net.defaultRpcUrl, net.id);
|
||||
}
|
||||
|
||||
async function estimateGas(txInfo) {
|
||||
try {
|
||||
const provider = reviewedNetworkProvider(txInfo);
|
||||
const provider = getProvider(state.rpcUrl, state.networkId);
|
||||
const feeData = await provider.getFeeData();
|
||||
let gasLimit;
|
||||
|
||||
@@ -521,17 +407,12 @@ async function estimateGas(txInfo) {
|
||||
// does, so the same fee reads the same on both.
|
||||
if (estimateWei !== null && estimateWei < gasCostWei) {
|
||||
$("confirm-fee-amount").textContent =
|
||||
"~" +
|
||||
formatFee(
|
||||
estimateWei,
|
||||
nativeCurrencyByChainId(txInfo.chainId),
|
||||
txInfo.chainId,
|
||||
);
|
||||
"~" + formatFee(estimateWei, nativeCurrency());
|
||||
$("confirm-fee-reserve").textContent =
|
||||
"up to " +
|
||||
truncateAmountNeverZero(formatEther(gasCostWei)) +
|
||||
" " +
|
||||
nativeCurrencyByChainId(txInfo.chainId) +
|
||||
nativeCurrency() +
|
||||
" reserved";
|
||||
setVisible("confirm-fee-reserve", true);
|
||||
} else {
|
||||
@@ -540,21 +421,20 @@ async function estimateGas(txInfo) {
|
||||
// cost is not below the reserve. Show the reserve alone.
|
||||
$("confirm-fee-amount").textContent = formatFee(
|
||||
gasCostWei,
|
||||
nativeCurrencyByChainId(txInfo.chainId),
|
||||
txInfo.chainId,
|
||||
nativeCurrency(),
|
||||
);
|
||||
setVisible("confirm-fee-reserve", false);
|
||||
}
|
||||
feeStatus = FEE_KNOWN;
|
||||
feeWei = gasCostWei;
|
||||
// A max ETH send is the balance readBalances() read minus this
|
||||
// estimate's reserve, not the Send screen's, and is signed with this
|
||||
// estimate's fee fields: fees fetched again at signing could exceed
|
||||
// the reserve it leaves, and the node would refuse it for want of
|
||||
// funds. Where the balance is unknown or no longer covers the fee, the
|
||||
// amount is left as it is and the balance check below says so.
|
||||
// A max ETH send is the balance minus this estimate's reserve, not the
|
||||
// Send screen's, and is signed with this estimate's fee fields: fees
|
||||
// fetched again at signing could exceed the reserve it leaves, and the
|
||||
// node would refuse it for want of funds. Where the balance no longer
|
||||
// covers the fee, the amount is left as it is and the balance check
|
||||
// below says so.
|
||||
if (txInfo.max && txInfo.token === "ETH") {
|
||||
const amount = maxEthAmount(balances?.eth, gasCostWei);
|
||||
const amount = maxEthAmount(txInfo.balance, gasCostWei);
|
||||
if (amount !== null) {
|
||||
txInfo.amount = amount;
|
||||
renderAmount(txInfo);
|
||||
@@ -583,17 +463,16 @@ async function estimateGas(txInfo) {
|
||||
}
|
||||
}
|
||||
|
||||
// Populate the transaction this send describes, enforce the bounds against the
|
||||
// gas limit and fees that were actually filled in, then sign and broadcast it.
|
||||
// Apart from a max ETH send, which passes its estimate's fee fields as `fees`,
|
||||
// the send pins no fee fields, so ethers fills maxFeePerGas and the gas limit
|
||||
// from what the configured RPC node answers, with nothing otherwise bounding
|
||||
// what a hostile node can set — the dApp path's ceilings never reached this
|
||||
// one. Populating before the check is what makes assertWithinCeilings() see
|
||||
// the same numbers that would be signed; it throws an ApprovalMismatchError
|
||||
// when the gas limit, a fee per gas, or the product gasLimit × maxFeePerGas is
|
||||
// over its bound, and the caller then shows the one refusal reserved for all
|
||||
// three rather than sending.
|
||||
// Populate the transaction this send describes, enforce the fee bound against
|
||||
// the fees that were actually filled in, then sign and broadcast it. Apart
|
||||
// from a max ETH send, which passes its estimate's fee fields as `fees`, the
|
||||
// send pins no fee fields, so ethers fills maxFeePerGas and the gas limit from
|
||||
// what the configured RPC node answers, with nothing otherwise bounding what a
|
||||
// hostile node can set — the dApp path's ceilings never reached this one.
|
||||
// Populating before the check is what makes assertWithinCeilings() see the
|
||||
// same numbers that would be signed; it throws an ApprovalMismatchError when
|
||||
// the product gasLimit × maxFeePerGas is over the bound, which the caller
|
||||
// shows in the reserved error area rather than sending.
|
||||
async function populateVerifyAndSend(connectedSigner, tx, fees = null) {
|
||||
let request;
|
||||
if (tx.token === "ETH") {
|
||||
@@ -611,26 +490,26 @@ async function populateVerifyAndSend(connectedSigner, tx, fees = null) {
|
||||
);
|
||||
request = await contract.transfer.populateTransaction(tx.to, amount);
|
||||
}
|
||||
// The chain id of the network the screen was drawn for: ethers refuses to
|
||||
// populate it for a provider on any other network.
|
||||
const populated = await connectedSigner.populateTransaction({
|
||||
...request,
|
||||
chainId: tx.chainId,
|
||||
});
|
||||
const populated = await connectedSigner.populateTransaction(request);
|
||||
assertWithinCeilings(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) {
|
||||
try {
|
||||
const provider = reviewedNetworkProvider(txInfo);
|
||||
const provider = getProvider(state.rpcUrl, state.networkId);
|
||||
const asyncWarnings = await getFullWarnings(txInfo.to, provider, {
|
||||
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) {
|
||||
if (w.type === "contract") {
|
||||
$("confirm-contract-warning").style.visibility = "visible";
|
||||
@@ -659,10 +538,6 @@ function init(_ctx) {
|
||||
onViewLeave("confirm-tx", clearPassword);
|
||||
|
||||
$("btn-confirm-send").addEventListener("click", async () => {
|
||||
// A press shows only its own refusal, if any.
|
||||
setVisible("confirm-network-changed-error", false);
|
||||
setVisible("confirm-fee-bound-error", false);
|
||||
|
||||
const wallet = state.wallets[state.selectedWallet];
|
||||
// Every Send button refuses a defective wallet before this screen,
|
||||
// but the popup also reopens onto it from a saved view.
|
||||
@@ -672,28 +547,6 @@ function init(_ctx) {
|
||||
return;
|
||||
}
|
||||
|
||||
// The screen describes the network the transaction was reviewed for,
|
||||
// which Settings may have switched away from since: "Back" from
|
||||
// Settings after a switch draws this screen again from the saved
|
||||
// transaction, as a popup reopened onto it does.
|
||||
if (currentNetwork().chainId !== pendingTx.chainId) {
|
||||
setVisible("confirm-network-changed-error", true);
|
||||
return;
|
||||
}
|
||||
|
||||
// Sign as the From address this screen shows. The selection is saved
|
||||
// apart from this screen, so the popup can reopen onto it with another
|
||||
// address selected.
|
||||
const addr = wallet.addresses.find((a) => a.address === pendingTx.from);
|
||||
if (!addr) {
|
||||
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;
|
||||
}
|
||||
|
||||
const password = $("confirm-tx-password").value;
|
||||
if (!password) {
|
||||
showError(
|
||||
@@ -722,13 +575,17 @@ function init(_ctx) {
|
||||
$("btn-confirm-send").disabled = true;
|
||||
$("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) };
|
||||
// The network it is sent on. The wait, success and error screens
|
||||
// label its amount by this, not by the network active when they draw.
|
||||
pendingTx.chainId = currentNetwork().chainId;
|
||||
|
||||
let tx;
|
||||
try {
|
||||
const signer = getSignerForAddress(wallet, addr, decryptedSecret);
|
||||
const signer = getSignerForAddress(
|
||||
wallet,
|
||||
state.selectedAddress,
|
||||
decryptedSecret,
|
||||
);
|
||||
const provider = getProvider(state.rpcUrl, state.networkId);
|
||||
const connectedSigner = signer.connect(provider);
|
||||
|
||||
@@ -742,23 +599,19 @@ function init(_ctx) {
|
||||
// Note: JS strings are immutable; this nulls the reference but
|
||||
// the original string may persist in memory until GC.
|
||||
decryptedSecret = null;
|
||||
txStatus.showWait(shownTx, tx.hash);
|
||||
txStatus.showWait(pendingTx, tx.hash);
|
||||
} catch (e) {
|
||||
decryptedSecret = null;
|
||||
// A gas limit or fee over its bound is refused before anything is
|
||||
// broadcast, so there is no transaction that may have reached the
|
||||
// network to warn about: the refusal stays on the confirmation
|
||||
// screen where the user can go back, rather than routing to the
|
||||
// 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.
|
||||
// A fee over the bound is refused before anything is broadcast, so
|
||||
// there is no transaction that may have reached the network to warn
|
||||
// about: the message stays on the confirmation screen where the
|
||||
// user can go back, rather than routing to the sent/failed screen.
|
||||
if (e && e.approvalMismatch) {
|
||||
log.errorf("send refused:", e.message);
|
||||
setVisible("confirm-fee-bound-error", true);
|
||||
showSendError(e.message);
|
||||
return;
|
||||
}
|
||||
const hash = tx ? tx.hash : null;
|
||||
txStatus.showError(shownTx, hash, e.shortMessage || e.message);
|
||||
txStatus.showError(pendingTx, hash, e.shortMessage || e.message);
|
||||
} finally {
|
||||
$("btn-confirm-send").disabled = false;
|
||||
$("btn-confirm-send").classList.remove("text-muted");
|
||||
|
||||
@@ -17,9 +17,9 @@ const {
|
||||
attachCopyHandlers,
|
||||
addressHoldsFunds,
|
||||
balanceLinesForAddress,
|
||||
keyMaterialName,
|
||||
} = require("./helpers");
|
||||
const { formatAddressTotal, getAddressValue } = require("../../shared/prices");
|
||||
const { walletHasRecoveryPhrase } = require("../../shared/wallet");
|
||||
const { state, saveState } = require("../../shared/state");
|
||||
const {
|
||||
canRemoveAddress,
|
||||
@@ -54,7 +54,9 @@ function setFlash(msg) {
|
||||
// The noun follows the wallet: an xprv wallet holds no recovery phrase, and
|
||||
// this screen is offered on xprv wallets too.
|
||||
function recoveryPathText(wallet) {
|
||||
const secret = keyMaterialName(wallet);
|
||||
const secret = walletHasRecoveryPhrase(wallet)
|
||||
? "recovery phrase"
|
||||
: "extended private key";
|
||||
return (
|
||||
"Getting the address back into this list is not easy, so be sure. " +
|
||||
"Adding an address derives the next unused one, not this one, and " +
|
||||
|
||||
@@ -7,7 +7,6 @@ const {
|
||||
goBack,
|
||||
clearViewStack,
|
||||
onViewLeave,
|
||||
keyMaterialName,
|
||||
} = require("./helpers");
|
||||
const { state, saveState } = require("../../shared/state");
|
||||
const { decryptWithPassword } = require("../../shared/vault");
|
||||
@@ -76,9 +75,6 @@ function show(walletIdx) {
|
||||
clear();
|
||||
deleteWalletIndex = walletIdx;
|
||||
$("delete-wallet-name").textContent = displayName(walletIdx);
|
||||
$("delete-wallet-key-material").textContent = keyMaterialName(
|
||||
state.wallets[walletIdx],
|
||||
);
|
||||
showView("delete-wallet-confirm");
|
||||
}
|
||||
|
||||
@@ -98,9 +94,6 @@ function showLostPassword() {
|
||||
clearLostPassword();
|
||||
$("delete-wallet-lost-name").textContent = name;
|
||||
$("delete-wallet-lost-name-echo").textContent = name;
|
||||
$("delete-wallet-lost-key-material").textContent = keyMaterialName(
|
||||
state.wallets[walletIdx],
|
||||
);
|
||||
// showView() runs the leave hook of delete-wallet-confirm, which nulls
|
||||
// deleteWalletIndex, so this screen's own selection is recorded after
|
||||
// it and not before.
|
||||
|
||||
@@ -135,18 +135,7 @@ async function reveal() {
|
||||
// decrypt ran, the wipe has already happened, so the key is not
|
||||
// even derived, let alone written.
|
||||
if (!isCurrentReveal(generation)) return;
|
||||
let signer;
|
||||
try {
|
||||
signer = getSignerForAddress(
|
||||
wallet,
|
||||
wallet.addresses[addressIndex],
|
||||
secret,
|
||||
);
|
||||
} catch (e) {
|
||||
// The password was right; it is the key that was refused.
|
||||
showError("export-privkey-password-error", e.message);
|
||||
return;
|
||||
}
|
||||
const signer = getSignerForAddress(wallet, addressIndex, secret);
|
||||
$("export-privkey-password").value = "";
|
||||
$("export-privkey-password-section").classList.add("hidden");
|
||||
$("export-privkey-value").textContent = signer.privateKey;
|
||||
|
||||
+20
-39
@@ -22,11 +22,9 @@ const { resolveTokenSymbol } = require("../../shared/approvalAmount");
|
||||
const { DEBUG } = require("../../shared/constants");
|
||||
const { escapeHtml } = require("../../shared/html");
|
||||
const { isDebug } = require("../../shared/log");
|
||||
const { networkByChainId } = require("../../shared/networks");
|
||||
const { formatUsd, getPrice } = require("../../shared/prices");
|
||||
const { state, saveState, currentNetwork } = require("../../shared/state");
|
||||
const { displaySymbol } = require("../../shared/symbolDisplay");
|
||||
const { walletHasRecoveryPhrase } = require("../../shared/wallet");
|
||||
const { markViewRendered } = require("../viewRouter");
|
||||
|
||||
// When views are added, removed, or transitions between them change,
|
||||
@@ -285,12 +283,11 @@ function unknownableAmount(balance) {
|
||||
|
||||
// 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
|
||||
// the Send screen, which sends on the active network, label a native amount
|
||||
// with this; the confirmation screen, and a transaction already made or
|
||||
// requested, label it by the transaction's own chain id, through
|
||||
// nativeCurrencyByChainId() in networks.js. The "ETH" that state.selectedToken
|
||||
// and txInfo.token hold is the native token's id, not its label, and stays
|
||||
// "ETH" on every network.
|
||||
// the Send and confirmation screens, which send on the active network, label a
|
||||
// native amount with this; a transaction already made or requested is labelled
|
||||
// by its own chain id, through nativeCurrencyByChainId() in networks.js. The
|
||||
// "ETH" that state.selectedToken and txInfo.token hold is the native token's
|
||||
// id, not its label, and stays "ETH" on every network.
|
||||
function nativeCurrency() {
|
||||
return currentNetwork().nativeCurrency;
|
||||
}
|
||||
@@ -309,12 +306,11 @@ function tokenLabel(address) {
|
||||
// A network fee in wei as the confirmation and approval screens both show it:
|
||||
// the ETH figure through truncateAmountNeverZero() and labelled `symbol`, the
|
||||
// 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
|
||||
// network when no chain id is given. The USD value is of the exact fee, not of
|
||||
// the truncated figure.
|
||||
function formatFee(wei, symbol, chainId) {
|
||||
// the ETH price is known. The USD value is of the exact fee, not of the
|
||||
// truncated figure.
|
||||
function formatFee(wei, symbol) {
|
||||
const eth = formatEther(wei);
|
||||
const ethPrice = getPrice("ETH", chainId);
|
||||
const ethPrice = getPrice("ETH");
|
||||
const usd = ethPrice ? formatUsd(parseFloat(eth) * ethPrice) : "";
|
||||
return (
|
||||
truncateAmountNeverZero(eth) +
|
||||
@@ -422,16 +418,6 @@ function addressHoldsFunds(addr) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// The name of a wallet's key material, which is also its only backup: the
|
||||
// recovery phrase of an HD wallet, the private key of a key wallet, the
|
||||
// extended private key of an xprv wallet. DeleteWallet,
|
||||
// DeleteWalletLostPassword and DeleteAddress name the backup with it.
|
||||
function keyMaterialName(wallet) {
|
||||
if (walletHasRecoveryPhrase(wallet)) return "recovery phrase";
|
||||
if (wallet.type === "key") return "private key";
|
||||
return "extended private key";
|
||||
}
|
||||
|
||||
// The fewest characters of an address any caller may ask to display. The
|
||||
// 10-character cap inside truncateMiddle() is the other half of the same
|
||||
// guarantee; this is the half that used to be spelled out at each call
|
||||
@@ -607,19 +593,17 @@ const EXT_ICON =
|
||||
`</svg></span>`;
|
||||
|
||||
// Block-explorer URLs. The origin is a per-network constant from
|
||||
// src/shared/networks.js, the explorer of the network with `chainId`, or of
|
||||
// the active network when no chain id is given; only the path segment is
|
||||
// data, and it comes out of explorer JSON (a transaction's from/to, a token's
|
||||
// address_hash), which nothing upstream validates as hex. percent-encoding it
|
||||
// keeps a segment that contains a slash, a query or a fragment from
|
||||
// re-pointing the link somewhere else in the explorer.
|
||||
function explorerUrl(kind, value, chainId) {
|
||||
const network = chainId ? networkByChainId(chainId) : currentNetwork();
|
||||
return `${network.explorerUrl}/${kind}/${encodeURIComponent(value)}`;
|
||||
// src/shared/networks.js; only the path segment is data, and it comes out
|
||||
// of explorer JSON (a transaction's from/to, a token's address_hash), which
|
||||
// nothing upstream validates as hex. percent-encoding it keeps a segment
|
||||
// that contains a slash, a query or a fragment from re-pointing the link
|
||||
// somewhere else in the explorer.
|
||||
function explorerUrl(kind, value) {
|
||||
return `${currentNetwork().explorerUrl}/${kind}/${encodeURIComponent(value)}`;
|
||||
}
|
||||
|
||||
function etherscanAddressUrl(address, chainId) {
|
||||
return explorerUrl("address", address, chainId);
|
||||
function etherscanAddressUrl(address) {
|
||||
return explorerUrl("address", address);
|
||||
}
|
||||
|
||||
// The URL still has to be escaped on the way into href="...": encoding
|
||||
@@ -685,18 +669,16 @@ function attachCopyHandlers(container) {
|
||||
// with them, and the "at least 32 characters" guarantee has
|
||||
// to survive having no current callers to be a guarantee.
|
||||
// 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
|
||||
// attachCopyHandlers() on the parent to wire up click-to-copy.
|
||||
function renderAddressHtml(address, opts) {
|
||||
const { title, ensName, maxLen, noLink, chainId } = opts || {};
|
||||
const { title, ensName, maxLen, noLink } = opts || {};
|
||||
const dot = addressDotHtml(address);
|
||||
const displayAddr = maxLen
|
||||
? truncateMiddle(address, Math.max(ADDRESS_MIN_DISPLAY_LEN, maxLen))
|
||||
: address;
|
||||
const link = etherscanAddressUrl(address, chainId);
|
||||
const link = etherscanAddressUrl(address);
|
||||
const extLink = noLink ? "" : etherscanLinkHtml(link);
|
||||
|
||||
let html = "";
|
||||
@@ -743,7 +725,6 @@ module.exports = {
|
||||
balanceLine,
|
||||
balanceLinesForAddress,
|
||||
addressHoldsFunds,
|
||||
keyMaterialName,
|
||||
unknownableAmount,
|
||||
nativeCurrency,
|
||||
tokenLabel,
|
||||
|
||||
@@ -354,7 +354,6 @@ function render(ctx) {
|
||||
);
|
||||
wallet.addresses.push({
|
||||
address: newAddr,
|
||||
index: wallet.nextIndex,
|
||||
balance: "0.0000",
|
||||
tokenBalances: [],
|
||||
});
|
||||
|
||||
+32
-34
@@ -24,7 +24,6 @@ const {
|
||||
} = require("../../shared/amountDisplay");
|
||||
const {
|
||||
feeReserveWei,
|
||||
isValidAmount,
|
||||
maxEthAmount,
|
||||
maxTokenAmount,
|
||||
} = require("../../shared/txValidation");
|
||||
@@ -164,9 +163,8 @@ function renderSendTokenSelect(addr) {
|
||||
}
|
||||
}
|
||||
|
||||
// The token balance the Send screen states, and the scale it hands the
|
||||
// confirmation screen, which reads the balance itself from the network it is
|
||||
// drawn for.
|
||||
// The token balance and scale the Send screen states and hands the
|
||||
// confirmation screen, so the two screens describe the holding the same way.
|
||||
//
|
||||
// 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
|
||||
@@ -189,11 +187,13 @@ function renderSendTokenSelect(addr) {
|
||||
//
|
||||
// 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
|
||||
// stand behind, so it is withdrawn: unknown scale means unknown balance. It is
|
||||
// null rather than "0": this screen states it as unknown, as the confirmation
|
||||
// screen does, and Max fills nothing in for it. 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.
|
||||
// stand behind. Stating it would leave validateTransfer() checking the amount
|
||||
// against a number the wallet does not vouch for, so it is withdrawn: unknown
|
||||
// scale means unknown balance. It is null rather than "0": both screens state
|
||||
// an unknown balance as unknown, and validateTransfer() treats it as no balance
|
||||
// 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) {
|
||||
const tb = (addr.tokenBalances || []).find(
|
||||
(t) => t.address.toLowerCase() === token.toLowerCase(),
|
||||
@@ -255,18 +255,13 @@ async function fillMaxAmount() {
|
||||
const token = state.selectedToken || $("send-token").value;
|
||||
|
||||
if (token !== "ETH") {
|
||||
const { tokenBalance: bal, tokenDecimals } = tokenBalanceAndDecimals(
|
||||
addr,
|
||||
token,
|
||||
);
|
||||
const bal = tokenBalanceAndDecimals(addr, token).tokenBalance;
|
||||
if (bal == null) {
|
||||
showFlash("This token's balance is unknown.");
|
||||
return;
|
||||
}
|
||||
const amount = maxTokenAmount(bal);
|
||||
// The balance is stored at the token's own decimal places and cut to
|
||||
// 18 above, so the only balance this refuses is zero.
|
||||
if (!isValidAmount(amount, tokenDecimals)) {
|
||||
if (!(parseFloat(amount) > 0)) {
|
||||
showFlash("This token's balance is zero.");
|
||||
return;
|
||||
}
|
||||
@@ -372,24 +367,7 @@ function init(_ctx) {
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
const token = state.selectedToken || $("send-token").value;
|
||||
const addr = currentAddress();
|
||||
|
||||
let tokenSymbol = null;
|
||||
let tokenDecimals = null;
|
||||
if (token !== "ETH") {
|
||||
tokenSymbol = resolveSymbol(
|
||||
token,
|
||||
addr.tokenBalances,
|
||||
state.trackedTokens,
|
||||
);
|
||||
({ tokenDecimals } = tokenBalanceAndDecimals(addr, token));
|
||||
}
|
||||
|
||||
// The confirmation screen's own amount check, so it is never shown
|
||||
// an amount it would refuse.
|
||||
if (!isValidAmount(amount, tokenDecimals)) {
|
||||
if (!amount || isNaN(parseFloat(amount)) || parseFloat(amount) <= 0) {
|
||||
showFlash("Please enter a valid amount.");
|
||||
return;
|
||||
}
|
||||
@@ -413,13 +391,33 @@ function init(_ctx) {
|
||||
}
|
||||
}
|
||||
|
||||
const token = state.selectedToken || $("send-token").value;
|
||||
const addr = currentAddress();
|
||||
|
||||
let tokenSymbol = null;
|
||||
let tokenBalance = null;
|
||||
let tokenDecimals = null;
|
||||
if (token !== "ETH") {
|
||||
tokenSymbol = resolveSymbol(
|
||||
token,
|
||||
addr.tokenBalances,
|
||||
state.trackedTokens,
|
||||
);
|
||||
({ tokenBalance, tokenDecimals } = tokenBalanceAndDecimals(
|
||||
addr,
|
||||
token,
|
||||
));
|
||||
}
|
||||
|
||||
ctx.showConfirmTx({
|
||||
from: addr.address,
|
||||
to: resolvedTo,
|
||||
ensName: ensName,
|
||||
amount: amount,
|
||||
token: token,
|
||||
balance: addr.balance,
|
||||
tokenSymbol: tokenSymbol,
|
||||
tokenBalance: tokenBalance,
|
||||
tokenDecimals: tokenDecimals,
|
||||
max: amountIsMax,
|
||||
});
|
||||
|
||||
@@ -16,8 +16,6 @@ const {
|
||||
} = require("../dustThreshold");
|
||||
const { state, saveState, currentNetwork } = require("../../shared/state");
|
||||
const { onChainSwitch } = require("../../shared/chainSwitch");
|
||||
const { restorableStack } = require("../../shared/persistedState");
|
||||
const { resetRenderedViews, markViewRendered } = require("../viewRouter");
|
||||
const {
|
||||
log,
|
||||
debugFetch,
|
||||
@@ -78,13 +76,11 @@ function forgetOrigin(siteMap, origin) {
|
||||
|
||||
// Removing a site from Allowed Sites or Connected Sites disconnects it: it is
|
||||
// no longer allowed under any address, and the background ends its
|
||||
// connections approved without "Remember" and tells its open tabs. The
|
||||
// background answers once those have ended, so the lists drawn after it no
|
||||
// longer show the site.
|
||||
// connections approved without "Remember" and tells its open tabs.
|
||||
async function removeAllowedSite(origin) {
|
||||
forgetOrigin(state.allowedSites, origin);
|
||||
await saveState();
|
||||
await sendMessage({ type: "AUTISTMASK_REMOVE_SITE", origin });
|
||||
notify({ type: "AUTISTMASK_REMOVE_SITE", origin });
|
||||
await renderSiteLists();
|
||||
}
|
||||
|
||||
@@ -234,8 +230,8 @@ async function renderSiteLists() {
|
||||
Object.values(state.deniedSites).flat(),
|
||||
removeDeniedSite,
|
||||
);
|
||||
// Sites allowed without "Remember" are held only in session storage, which
|
||||
// the background keeps, so it is asked for them.
|
||||
// Sites allowed without "Remember" are held only by the background, in
|
||||
// memory, so it is asked for them.
|
||||
renderSiteList(
|
||||
"settings-connected-sites",
|
||||
await sendMessage({ type: "AUTISTMASK_GET_CONNECTED_SITES" }),
|
||||
@@ -321,33 +317,12 @@ function init(ctx) {
|
||||
networkSelect.addEventListener("change", async () => {
|
||||
const newId = networkSelect.value;
|
||||
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);
|
||||
// Open pages are told by the background, as after a site's approved
|
||||
// switch request.
|
||||
notify({ type: "AUTISTMASK_NETWORK_CHANGED", chainId: net.chainId });
|
||||
resetRenderedViews();
|
||||
// Settings itself is brought up to date for the new network here.
|
||||
markViewRendered("settings");
|
||||
$("settings-rpc").value = state.rpcUrl;
|
||||
$("settings-blockscout").value = state.blockscoutUrl;
|
||||
renderTrackedTokens();
|
||||
showFlash("Switched to " + net.name + ".");
|
||||
});
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
const { $, showView, showFlash, escapeHtml, goBack } = require("./helpers");
|
||||
const { getTopTokens } = require("../../shared/tokenList");
|
||||
const { state, saveState, currentNetwork } = require("../../shared/state");
|
||||
const { state, saveState } = require("../../shared/state");
|
||||
const { lookupTokenInfo } = require("../../shared/balances");
|
||||
const { isScamAddress } = require("../../shared/scamlist");
|
||||
const { log } = require("../../shared/log");
|
||||
@@ -75,12 +75,6 @@ function show() {
|
||||
$("settings-addtoken-address").value = "";
|
||||
$("settings-addtoken-info").textContent = "";
|
||||
$("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();
|
||||
renderDropdown();
|
||||
showView("settings-addtoken");
|
||||
@@ -136,9 +130,6 @@ function init(_ctx) {
|
||||
infoEl.textContent = "Looking up token...";
|
||||
infoEl.style.visibility = "visible";
|
||||
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 {
|
||||
const info = await lookupTokenInfo(
|
||||
addr,
|
||||
@@ -146,15 +137,6 @@ function init(_ctx) {
|
||||
state.networkId,
|
||||
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);
|
||||
state.trackedTokens.push({
|
||||
address: addr,
|
||||
|
||||
@@ -21,7 +21,7 @@ const {
|
||||
displaySymbol,
|
||||
goBack,
|
||||
} = require("./helpers");
|
||||
const { state, currentNetwork } = require("../../shared/state");
|
||||
const { state } = require("../../shared/state");
|
||||
const { nativeCurrencyByChainId } = require("../../shared/networks");
|
||||
const { formatEther, formatUnits } = require("ethers");
|
||||
const { log, debugFetch } = require("../../shared/log");
|
||||
@@ -183,7 +183,7 @@ function render() {
|
||||
if (el) el.classList.add("hidden");
|
||||
}
|
||||
|
||||
loadFullTxDetails(tx.hash, tx.chainId);
|
||||
loadFullTxDetails(tx.hash, tx.to, tx.chainId);
|
||||
|
||||
const isoStr = isoDate(tx.timestamp);
|
||||
$("tx-detail-time").innerHTML =
|
||||
@@ -291,7 +291,7 @@ function populateOnChainDetails(txData, chainId) {
|
||||
}
|
||||
}
|
||||
|
||||
async function loadFullTxDetails(txHash, chainId) {
|
||||
async function loadFullTxDetails(txHash, toAddress, chainId) {
|
||||
const section = $("tx-detail-calldata-section");
|
||||
const actionEl = $("tx-detail-calldata-action");
|
||||
const detailsEl = $("tx-detail-calldata-details");
|
||||
@@ -313,17 +313,7 @@ async function loadFullTxDetails(txHash, chainId) {
|
||||
const inputData = txData.raw_input || txData.input || null;
|
||||
if (!inputData || inputData === "0x") return;
|
||||
|
||||
// Decoded against the address the transaction was sent to, as the
|
||||
// explorer reports it, not the history entry's `to`: for a token
|
||||
// transfer that is the transfer's recipient, not the token contract.
|
||||
// On the active network, the one whose explorer was just asked, and
|
||||
// from the sender it reports.
|
||||
const decoded = decodeCalldata(
|
||||
inputData,
|
||||
txData.to?.hash || "",
|
||||
currentNetwork().chainId,
|
||||
txData.from?.hash || "",
|
||||
);
|
||||
const decoded = decodeCalldata(inputData, toAddress || "");
|
||||
if (decoded) {
|
||||
// Render decoded calldata matching approval view style
|
||||
actionEl.textContent = decoded.name;
|
||||
|
||||
+16
-29
@@ -91,17 +91,12 @@ function startWait(txInfo, txHash, broadcastTime, pollNow) {
|
||||
// native currency of txInfo.chainId, the network the transaction was sent
|
||||
// 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
|
||||
// is open or before a later popup resumes it. A null token is a swap whose
|
||||
// amount was not decoded (see showTxApproval() in approval.js): the amount
|
||||
// says so, and no symbol follows it.
|
||||
let symbol = "";
|
||||
if (txInfo.token === "ETH") {
|
||||
symbol = nativeCurrencyByChainId(txInfo.chainId);
|
||||
} else if (txInfo.token !== null) {
|
||||
symbol = displaySymbol(txInfo.tokenSymbol || "?");
|
||||
}
|
||||
$("wait-tx-summary").textContent =
|
||||
txInfo.amount + (symbol ? " " + symbol : "");
|
||||
// is open or before a later popup resumes it.
|
||||
const symbol =
|
||||
txInfo.token === "ETH"
|
||||
? nativeCurrencyByChainId(txInfo.chainId)
|
||||
: displaySymbol(txInfo.tokenSymbol || "?");
|
||||
$("wait-tx-summary").textContent = txInfo.amount + " " + symbol;
|
||||
$("wait-tx-to").innerHTML = toAddressHtml(txInfo.to);
|
||||
$("wait-tx-hash").innerHTML = txHashHtml(txHash);
|
||||
attachCopyHandlers("view-wait-tx");
|
||||
@@ -236,13 +231,10 @@ function restoreWait() {
|
||||
function showSuccess(txInfo, txHash, blockNumber) {
|
||||
endWait();
|
||||
|
||||
// As on the wait screen, a null token has no symbol.
|
||||
let symbol = "";
|
||||
if (txInfo.token === "ETH") {
|
||||
symbol = nativeCurrencyByChainId(txInfo.chainId);
|
||||
} else if (txInfo.token !== null) {
|
||||
symbol = displaySymbol(txInfo.tokenSymbol || "?");
|
||||
}
|
||||
const symbol =
|
||||
txInfo.token === "ETH"
|
||||
? nativeCurrencyByChainId(txInfo.chainId)
|
||||
: displaySymbol(txInfo.tokenSymbol || "?");
|
||||
state.viewData = {
|
||||
amount: txInfo.amount,
|
||||
symbol: symbol,
|
||||
@@ -302,8 +294,7 @@ function renderSuccess() {
|
||||
} else {
|
||||
summarySection.classList.remove("hidden");
|
||||
toSection.classList.remove("hidden");
|
||||
$("success-tx-summary").textContent =
|
||||
d.amount + (d.symbol ? " " + d.symbol : "");
|
||||
$("success-tx-summary").textContent = d.amount + " " + d.symbol;
|
||||
$("success-tx-to").innerHTML = toAddressHtml(d.to);
|
||||
}
|
||||
|
||||
@@ -326,13 +317,10 @@ function renderSuccess() {
|
||||
function showError(txInfo, txHash, message) {
|
||||
endWait();
|
||||
|
||||
// As on the wait screen, a null token has no symbol.
|
||||
let symbol = "";
|
||||
if (txInfo.token === "ETH") {
|
||||
symbol = nativeCurrencyByChainId(txInfo.chainId);
|
||||
} else if (txInfo.token !== null) {
|
||||
symbol = displaySymbol(txInfo.tokenSymbol || "?");
|
||||
}
|
||||
const symbol =
|
||||
txInfo.token === "ETH"
|
||||
? nativeCurrencyByChainId(txInfo.chainId)
|
||||
: displaySymbol(txInfo.tokenSymbol || "?");
|
||||
state.viewData = {
|
||||
amount: txInfo.amount,
|
||||
symbol: symbol,
|
||||
@@ -346,8 +334,7 @@ function showError(txInfo, txHash, message) {
|
||||
function renderError() {
|
||||
const d = state.viewData;
|
||||
if (!d || !d.message) return;
|
||||
$("error-tx-summary").textContent =
|
||||
d.amount + (d.symbol ? " " + d.symbol : "");
|
||||
$("error-tx-summary").textContent = d.amount + " " + d.symbol;
|
||||
$("error-tx-to").innerHTML = toAddressHtml(d.to);
|
||||
$("error-tx-message").textContent = d.message;
|
||||
|
||||
|
||||
@@ -51,15 +51,12 @@ function getLocalWarnings(address, options = {}) {
|
||||
|
||||
/**
|
||||
* Check an address against local lists AND via RPC queries.
|
||||
* Async — performs network calls to check contract status, tx count and
|
||||
* balance.
|
||||
* Async — performs network calls to check contract status and tx history.
|
||||
*
|
||||
* @param {string} address - The target address to check.
|
||||
* @param {object} provider - An ethers.js provider instance.
|
||||
* @param {object} [options] - Optional context.
|
||||
* @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}>>}
|
||||
*/
|
||||
async function getFullWarnings(address, provider, options = {}) {
|
||||
@@ -81,30 +78,21 @@ async function getFullWarnings(address, provider, options = {}) {
|
||||
log.errorf("contract check failed:", e.shortMessage || e.message);
|
||||
}
|
||||
|
||||
// The transaction count is the number of transactions the address has
|
||||
// sent, so an address that has only ever received has a count of zero.
|
||||
// Native token it received stays in its balance until it sends a
|
||||
// transaction, so the warning also needs a zero balance. A contract is
|
||||
// skipped: it has its own warning above.
|
||||
// Skip tx count check for contracts — they may legitimately have
|
||||
// zero inbound EOA transactions.
|
||||
if (!isContract) {
|
||||
try {
|
||||
const txCount = await provider.getTransactionCount(address);
|
||||
if (txCount === 0) {
|
||||
const balance = await provider.getBalance(address);
|
||||
if (balance === 0n) {
|
||||
warnings.push({
|
||||
type: "new-address",
|
||||
message:
|
||||
"This address has never sent a transaction and holds none of the network's native token. Double-check it is correct.",
|
||||
"This address has never sent a transaction. Double-check it is correct.",
|
||||
severity: "info",
|
||||
});
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
log.errorf(
|
||||
"tx count or balance check failed:",
|
||||
e.shortMessage || e.message,
|
||||
);
|
||||
log.errorf("tx count check failed:", e.shortMessage || e.message);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -112,10 +100,7 @@ async function getFullWarnings(address, provider, options = {}) {
|
||||
// Runs for ALL addresses including contracts, since many dangerous
|
||||
// flagged addresses on Etherscan (drainers, phishing contracts) are contracts.
|
||||
try {
|
||||
const etherscanWarning = await checkEtherscanLabel(
|
||||
address,
|
||||
options.chainId,
|
||||
);
|
||||
const etherscanWarning = await checkEtherscanLabel(address);
|
||||
if (etherscanWarning) {
|
||||
warnings.push(etherscanWarning);
|
||||
}
|
||||
|
||||
+18
-76
@@ -1,14 +1,13 @@
|
||||
// Preparation of the transaction an approval screen displays.
|
||||
//
|
||||
// A dApp's eth_sendTransaction normally fixes `to`, `value` and `data`, and
|
||||
// sometimes the gas limit. The nonce, the fees, and the gas limit when the
|
||||
// site gives none have to be filled in from the network before anything can
|
||||
// be signed, and whoever fills them in decides what the user is shown. That
|
||||
// work used to happen in the popup, after the user had already approved: the
|
||||
// numbers on the approval screen came from the popup and were compared against
|
||||
// nothing, so a compromised popup could display one fee and sign another, and
|
||||
// the ceilings in approvalVerify.js were all that stood between the user and a
|
||||
// fee that hands the validator the balance.
|
||||
// A dApp's eth_sendTransaction normally fixes only `to`, `value` and `data`.
|
||||
// The nonce, the gas limit and the fees have to be filled in from the network
|
||||
// before anything can be signed, and whoever fills them in decides what the
|
||||
// user is shown. That work used to happen in the popup, after the user had
|
||||
// already approved: the numbers on the approval screen came from the popup and
|
||||
// were compared against nothing, so a compromised popup could display one fee
|
||||
// and sign another, and the ceilings in approvalVerify.js were all that stood
|
||||
// between the user and a fee that hands the validator the balance.
|
||||
//
|
||||
// So it happens here instead, in the background, before the approval window is
|
||||
// opened. The background populates the transaction, shows that object, and
|
||||
@@ -32,7 +31,6 @@ const {
|
||||
VoidSigner,
|
||||
accessListify,
|
||||
getAddress,
|
||||
getBigInt,
|
||||
getBytes,
|
||||
hexlify,
|
||||
toQuantity,
|
||||
@@ -41,7 +39,6 @@ const {
|
||||
ALLOWED_TX_TYPES,
|
||||
SERIALIZED_FIELDS,
|
||||
assertWithinCeilings,
|
||||
nodeError,
|
||||
} = require("./approvalVerify");
|
||||
|
||||
// How long the population may take before the request is failed back to the
|
||||
@@ -50,11 +47,10 @@ const {
|
||||
// minutes long, which is not a wait anyone will sit through.
|
||||
const POPULATE_TIMEOUT_MS = 20000;
|
||||
|
||||
// The request fields taken from the page, plus `gas`, which requestFrom()
|
||||
// takes as the gas limit. Anything else is dropped rather than passed to
|
||||
// ethers: the object is page-controlled, and a future ethers that learns to
|
||||
// carry a new transaction field must not start picking one up out of it
|
||||
// without this module knowing.
|
||||
// The request fields taken from the page. Anything else is dropped rather than
|
||||
// passed to ethers: the object is page-controlled, and a future ethers that
|
||||
// learns to carry a new transaction field must not start picking one up out of
|
||||
// it without this module knowing.
|
||||
//
|
||||
// The nonce is not taken from the page; it is always the account's next nonce
|
||||
// from the network. A page that chose it could replace one of the user's
|
||||
@@ -73,43 +69,21 @@ const REQUEST_FIELDS = [
|
||||
"type",
|
||||
];
|
||||
|
||||
// EIP-1474's code for invalid parameters: what the page is given when the
|
||||
// site asked for a transaction this wallet refuses as it was asked for.
|
||||
const INVALID_PARAMS_CODE = -32602;
|
||||
|
||||
// Why no approval can be raised. The message is the sentence the page is
|
||||
// shown. `code` and `data` are the JSON-RPC ones it is given with it: the
|
||||
// node's own, unchanged, when the node refused the transaction, so a site can
|
||||
// decode a revert; INVALID_PARAMS_CODE when the site's request is refused;
|
||||
// none when the failure is the wallet's own, which the background answers as
|
||||
// an internal error.
|
||||
class ApprovalPrepareError extends Error {
|
||||
constructor(message, code, data) {
|
||||
constructor(message) {
|
||||
super(message);
|
||||
this.name = "ApprovalPrepareError";
|
||||
if (code !== undefined) this.code = code;
|
||||
if (data !== undefined) this.data = data;
|
||||
}
|
||||
}
|
||||
|
||||
function fail(message, code, data) {
|
||||
return new ApprovalPrepareError(message, code, data);
|
||||
function fail(message) {
|
||||
return new ApprovalPrepareError(message);
|
||||
}
|
||||
|
||||
function present(v) {
|
||||
return v !== null && v !== undefined && v !== "";
|
||||
}
|
||||
|
||||
// Whether two quantities from the page are the same number. One that is not a
|
||||
// number matches nothing.
|
||||
function sameQuantity(a, b) {
|
||||
try {
|
||||
return getBigInt(a) === getBigInt(b);
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// These strings reach the user through the requesting page, so they are full
|
||||
// sentences even when the tail of one came from ethers or from the node.
|
||||
function sentence(text) {
|
||||
@@ -137,28 +111,12 @@ function requestFrom(txParams, from) {
|
||||
for (const key of REQUEST_FIELDS) {
|
||||
if (present(txParams[key])) request[key] = txParams[key];
|
||||
}
|
||||
// JSON-RPC calls the gas limit `gas`, and that is the name sites send.
|
||||
// ethers only reads `gasLimit`: left as `gas` it would be dropped and an
|
||||
// estimate signed in its place.
|
||||
if (present(txParams.gas)) {
|
||||
if (
|
||||
present(request.gasLimit) &&
|
||||
!sameQuantity(request.gasLimit, txParams.gas)
|
||||
) {
|
||||
throw fail(
|
||||
"The site asked for two different gas limits for this transaction.",
|
||||
INVALID_PARAMS_CODE,
|
||||
);
|
||||
}
|
||||
request.gasLimit = txParams.gas;
|
||||
}
|
||||
if (
|
||||
present(request.type) &&
|
||||
!ALLOWED_TX_TYPES.includes(Number(request.type))
|
||||
) {
|
||||
throw fail(
|
||||
"The site asked for a transaction of a type this wallet does not sign.",
|
||||
INVALID_PARAMS_CODE,
|
||||
);
|
||||
}
|
||||
return request;
|
||||
@@ -216,7 +174,6 @@ async function prepareApprovalTx(provider, from, txParams) {
|
||||
throw fail("There is no active address to send this transaction from.");
|
||||
}
|
||||
const request = requestFrom(txParams || {}, from);
|
||||
const signer = new VoidSigner(getAddress(from), provider);
|
||||
|
||||
let populated;
|
||||
try {
|
||||
@@ -224,28 +181,15 @@ async function prepareApprovalTx(provider, from, txParams) {
|
||||
// nonce, gas, fee and chain id are populated exactly as they were when
|
||||
// the popup did this. VoidSigner cannot sign, which is the point: the
|
||||
// background prepares, the popup signs.
|
||||
//
|
||||
// ethers asks the node for a gas estimate only when the request has
|
||||
// no gas limit, and that estimate is the only check that the
|
||||
// transaction does not revert. So a request carrying the site's gas
|
||||
// limit is estimated first, with that limit: one that reverts, or
|
||||
// needs more gas than the site gave it, fails here as well. The
|
||||
// site's gas limit is still the one populated.
|
||||
populated = await withTimeout(
|
||||
(async () => {
|
||||
if (present(request.gasLimit)) {
|
||||
await signer.estimateGas(request);
|
||||
}
|
||||
return signer.populateTransaction(request);
|
||||
})(),
|
||||
new VoidSigner(getAddress(from), provider).populateTransaction(
|
||||
request,
|
||||
),
|
||||
POPULATE_TIMEOUT_MS,
|
||||
"The transaction could not be prepared: the network did not answer in time.",
|
||||
);
|
||||
} catch (e) {
|
||||
if (e instanceof ApprovalPrepareError) throw e;
|
||||
// A refusal from the node, such as a reverting gas estimate, keeps
|
||||
// the node's code and revert data.
|
||||
const fromNode = nodeError(e);
|
||||
throw fail(
|
||||
sentence(
|
||||
"The transaction could not be prepared: " +
|
||||
@@ -253,8 +197,6 @@ async function prepareApprovalTx(provider, from, txParams) {
|
||||
e.message ||
|
||||
"the network did not answer"),
|
||||
),
|
||||
fromNode?.code,
|
||||
fromNode?.data,
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -53,10 +53,8 @@ const {
|
||||
accessListify,
|
||||
formatEther,
|
||||
getAddress,
|
||||
getBigInt,
|
||||
getBytes,
|
||||
toQuantity,
|
||||
TypedDataEncoder,
|
||||
verifyMessage,
|
||||
verifyTypedData,
|
||||
} = require("ethers");
|
||||
@@ -637,90 +635,6 @@ function verifySignature(signParams, signature, expectedFrom) {
|
||||
return recovered;
|
||||
}
|
||||
|
||||
// The type ethers will sign typed data as. ethers does not read the page's
|
||||
// `primaryType`: it takes the one struct in `types` that no other struct
|
||||
// refers to. Throws when the types name no such single struct, which ethers
|
||||
// would refuse to sign as well.
|
||||
function signedPrimaryType(types) {
|
||||
const structs = { ...types };
|
||||
// ethers derives EIP712Domain itself and rejects it as an input.
|
||||
delete structs.EIP712Domain;
|
||||
return TypedDataEncoder.getPrimaryType(structs);
|
||||
}
|
||||
|
||||
// Why a typed data message cannot be signed as the screen shows it, as a
|
||||
// sentence, or null when it can. ethers signs a `bool` field by whether its
|
||||
// value is truthy, so the string "false" is signed as true and a field left
|
||||
// out as false. Each field that `type` declares, at every level of nesting,
|
||||
// must be one of the value's own keys, and each `bool` must be true or false.
|
||||
// Called with the type ethers signs, the message, and a `path` of "".
|
||||
function typedDataMessageRefusal(types, type, value, path) {
|
||||
const itemType = type.replace(/\[\d*\]$/, "");
|
||||
if (itemType !== type) {
|
||||
// ethers refuses to sign a list field that is not a list.
|
||||
if (!Array.isArray(value)) return null;
|
||||
for (let i = 0; i < value.length; i++) {
|
||||
const refusal = typedDataMessageRefusal(
|
||||
types,
|
||||
itemType,
|
||||
value[i],
|
||||
`${path}[${i}]`,
|
||||
);
|
||||
if (refusal) return refusal;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
if (type === "bool" && value !== true && value !== false) {
|
||||
return `The field "${path}" is not true or false, so this typed data cannot be signed.`;
|
||||
}
|
||||
for (const field of types[type] || []) {
|
||||
const at = path ? `${path}.${field.name}` : field.name;
|
||||
// An own key only: a plain lookup of `constructor` finds a function.
|
||||
const present =
|
||||
value !== null &&
|
||||
typeof value === "object" &&
|
||||
Object.prototype.hasOwnProperty.call(value, field.name);
|
||||
if (!present) {
|
||||
return `The field "${at}" is missing from the message, so this typed data cannot be signed.`;
|
||||
}
|
||||
const refusal = typedDataMessageRefusal(
|
||||
types,
|
||||
field.type,
|
||||
value[field.name],
|
||||
at,
|
||||
);
|
||||
if (refusal) return refusal;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
// Why typed data cannot be signed while `network` is the active network, as a
|
||||
// sentence, or null when it can. EIP-712 has a wallet refuse typed data whose
|
||||
// domain names another chain, because the signature is valid on that chain.
|
||||
// ethers signs no chain id when the domain's is null or absent, and reads any
|
||||
// other with getBigInt(), so 1, "1" and "0x1" are the same chain here too.
|
||||
function typedDataChainRefusal(domain, network) {
|
||||
const chainId = domain?.chainId;
|
||||
if (chainId === undefined || chainId === null) return null;
|
||||
let named;
|
||||
try {
|
||||
named = getBigInt(chainId);
|
||||
} catch {
|
||||
return "This typed data cannot be read, so it cannot be signed.";
|
||||
}
|
||||
const active = getBigInt(network.chainId);
|
||||
if (named === active) return null;
|
||||
return (
|
||||
"This typed data is for chain id " +
|
||||
named +
|
||||
", but the active network is " +
|
||||
network.name +
|
||||
" (chain id " +
|
||||
active +
|
||||
"), so it cannot be signed."
|
||||
);
|
||||
}
|
||||
|
||||
// The stage a transaction approval failed at. Which stage it is decides
|
||||
// whether the approval survives the failure.
|
||||
const TX_STAGE_SIGN = "sign";
|
||||
@@ -746,15 +660,6 @@ function errorText(err) {
|
||||
return "The transaction could not be sent.";
|
||||
}
|
||||
|
||||
// The JSON-RPC error object the node answered with, `{ code, message, data }`,
|
||||
// out of the error ethers threw for that answer. ethers keeps it under
|
||||
// `info.error`, or under `error` when it could not classify it. Null when
|
||||
// there is none, as for a node that could not be reached.
|
||||
function nodeError(err) {
|
||||
if (!err || typeof err !== "object") return null;
|
||||
return err.error || (err.info && err.info.error) || null;
|
||||
}
|
||||
|
||||
// Every string a failure might carry its reason in. ethers reports the node's
|
||||
// own words in `shortMessage`, but a JSON-RPC error it could not classify is
|
||||
// nested under `error` or `info.error` with the node's message intact, and the
|
||||
@@ -766,7 +671,7 @@ function failureTexts(err) {
|
||||
for (const text of [err.shortMessage, err.message, err.reason]) {
|
||||
if (text) texts.push(String(text));
|
||||
}
|
||||
const nested = nodeError(err);
|
||||
const nested = err.error || (err.info && err.info.error);
|
||||
if (nested && nested.message) texts.push(String(nested.message));
|
||||
return texts;
|
||||
}
|
||||
@@ -891,16 +796,12 @@ function describeSigningFailure(response, fallbackMessage) {
|
||||
module.exports = {
|
||||
verifySignedTx,
|
||||
verifySignature,
|
||||
signedPrimaryType,
|
||||
typedDataMessageRefusal,
|
||||
typedDataChainRefusal,
|
||||
assertNoForbiddenFields,
|
||||
assertNothingUnchecked,
|
||||
assertCanonicalBytes,
|
||||
assertWithinCeilings,
|
||||
sameAddress,
|
||||
failureIsRetryable,
|
||||
nodeError,
|
||||
isNonceCollision,
|
||||
describeTxFailure,
|
||||
describeSigningFailure,
|
||||
|
||||
+5
-101
@@ -145,14 +145,6 @@ function sendMessage(message) {
|
||||
return invoke(runtimeApi(), "sendMessage", message);
|
||||
}
|
||||
|
||||
/**
|
||||
* @returns {Promise<Object>} the operating system and processor the browser
|
||||
* runs on.
|
||||
*/
|
||||
function getPlatformInfo() {
|
||||
return invoke(runtimeApi(), "getPlatformInfo");
|
||||
}
|
||||
|
||||
/**
|
||||
* Send a message nobody is expected to answer, and swallow the fact that
|
||||
* nobody did.
|
||||
@@ -174,9 +166,9 @@ function notify(message) {
|
||||
// default: resolving {} would make an existing wallet read back as no wallet,
|
||||
// and resolving a no-op write would discard the user's state with nothing
|
||||
// logged. A caller that wants to degrade takes storageLocal() directly.
|
||||
function storageUnavailable(area, method) {
|
||||
function storageUnavailable(method) {
|
||||
return Promise.reject(
|
||||
new Error("extension storage." + area + " is not available: " + method),
|
||||
new Error("extension storage.local is not available: " + method),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -187,7 +179,7 @@ function storageUnavailable(area, method) {
|
||||
*/
|
||||
function storageGet(keys) {
|
||||
const storage = storageLocal();
|
||||
if (!storage) return storageUnavailable("local", "get");
|
||||
if (!storage) return storageUnavailable("get");
|
||||
return Promise.resolve(storage.get(keys));
|
||||
}
|
||||
|
||||
@@ -198,7 +190,7 @@ function storageGet(keys) {
|
||||
*/
|
||||
function storageSet(items) {
|
||||
const storage = storageLocal();
|
||||
if (!storage) return storageUnavailable("local", "set");
|
||||
if (!storage) return storageUnavailable("set");
|
||||
return Promise.resolve(storage.set(items));
|
||||
}
|
||||
|
||||
@@ -215,55 +207,7 @@ function storageSet(items) {
|
||||
*/
|
||||
function storageRemove(keys) {
|
||||
const storage = storageLocal();
|
||||
if (!storage) return storageUnavailable("local", "remove");
|
||||
return Promise.resolve(storage.remove(keys));
|
||||
}
|
||||
|
||||
// `storage.session`, the browser's session storage: what is kept there lasts
|
||||
// until the browser closes. It survives the background worker being stopped
|
||||
// and started again, which module-level variables do not (README, Background
|
||||
// scheduling). The background keeps the connections allowed without
|
||||
// "Remember" there; see src/background/index.js. Firefox has it from version
|
||||
// 115, the minimum manifest/firefox.json declares.
|
||||
//
|
||||
// The three below reject where it is absent, as the three above do where
|
||||
// `storage.local` is: a write that silently did nothing would tell a site it
|
||||
// is connected and then refuse its next request.
|
||||
function storageSession() {
|
||||
const storage = namespaceMember("storage");
|
||||
return (storage && storage.session) || null;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {string|string[]|null} keys null for every item.
|
||||
* @returns {Promise<Object>} the stored items.
|
||||
* @throws rejects where `storage.session` is absent.
|
||||
*/
|
||||
function sessionStorageGet(keys) {
|
||||
const storage = storageSession();
|
||||
if (!storage) return storageUnavailable("session", "get");
|
||||
return Promise.resolve(storage.get(keys));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {Object} items
|
||||
* @returns {Promise<void>}
|
||||
* @throws rejects where `storage.session` is absent.
|
||||
*/
|
||||
function sessionStorageSet(items) {
|
||||
const storage = storageSession();
|
||||
if (!storage) return storageUnavailable("session", "set");
|
||||
return Promise.resolve(storage.set(items));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {string|string[]} keys
|
||||
* @returns {Promise<void>}
|
||||
* @throws rejects where `storage.session` is absent.
|
||||
*/
|
||||
function sessionStorageRemove(keys) {
|
||||
const storage = storageSession();
|
||||
if (!storage) return storageUnavailable("session", "remove");
|
||||
if (!storage) return storageUnavailable("remove");
|
||||
return Promise.resolve(storage.remove(keys));
|
||||
}
|
||||
|
||||
@@ -291,22 +235,6 @@ function tabsSendMessage(tabId, message) {
|
||||
return invoke(tabsApi(), "sendMessage", tabId, message);
|
||||
}
|
||||
|
||||
/**
|
||||
* @returns {Promise<Object|undefined>} the tab the calling page is in, or
|
||||
* undefined for a page not in a tab, such as the toolbar popup.
|
||||
*/
|
||||
function tabsGetCurrent() {
|
||||
return invoke(tabsApi(), "getCurrent");
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {number} tabId
|
||||
* @returns {Promise<number>} that tab's zoom: 1.5 at 150%.
|
||||
*/
|
||||
function tabsGetZoom(tabId) {
|
||||
return invoke(tabsApi(), "getZoom", tabId);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {Object} createData
|
||||
* @returns {Promise<Object>} the created window.
|
||||
@@ -322,22 +250,6 @@ function windowsGetLastFocused() {
|
||||
return invoke(windowsApi(), "getLastFocused");
|
||||
}
|
||||
|
||||
/**
|
||||
* @returns {Promise<Object>} the window the calling page is in.
|
||||
*/
|
||||
function windowsGetCurrent() {
|
||||
return invoke(windowsApi(), "getCurrent");
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {number} windowId
|
||||
* @param {Object} updateInfo
|
||||
* @returns {Promise<Object>} the updated window.
|
||||
*/
|
||||
function windowsUpdate(windowId, updateInfo) {
|
||||
return invoke(windowsApi(), "update", windowId, updateInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param {number} windowId
|
||||
* @returns {Promise<void>}
|
||||
@@ -350,27 +262,19 @@ module.exports = {
|
||||
actionApi,
|
||||
alarmsApi,
|
||||
extensionApi,
|
||||
getPlatformInfo,
|
||||
hasBrowserNamespace,
|
||||
notify,
|
||||
runtimeApi,
|
||||
sendMessage,
|
||||
sessionStorageGet,
|
||||
sessionStorageRemove,
|
||||
sessionStorageSet,
|
||||
storageGet,
|
||||
storageLocal,
|
||||
storageRemove,
|
||||
storageSet,
|
||||
tabsApi,
|
||||
tabsGetCurrent,
|
||||
tabsGetZoom,
|
||||
tabsQuery,
|
||||
tabsSendMessage,
|
||||
windowsApi,
|
||||
windowsCreate,
|
||||
windowsGetCurrent,
|
||||
windowsGetLastFocused,
|
||||
windowsRemove,
|
||||
windowsUpdate,
|
||||
};
|
||||
|
||||
@@ -38,16 +38,6 @@ function applyChainSwitchFields(s, newNetworkId) {
|
||||
blockscoutUrl: s.blockscoutUrl,
|
||||
};
|
||||
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.rpcUrl = remembered.rpcUrl || net.defaultRpcUrl;
|
||||
s.blockscoutUrl = remembered.blockscoutUrl || net.defaultBlockscoutUrl;
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
// Extension users make the requests directly to Etherscan — no proxy needed.
|
||||
// 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.
|
||||
// Title format: "Fake_Phishing184810 | Address: 0x... | Etherscan"
|
||||
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.
|
||||
* Network failures return null silently (best-effort check).
|
||||
*
|
||||
* Uses the explorer of the network with `chainId`, or of the active network
|
||||
* when it is omitted: etherscan.io on mainnet, sepolia.etherscan.io on
|
||||
* Sepolia.
|
||||
* Uses the current network's explorer URL so the lookup works on both
|
||||
* mainnet (etherscan.io) and Sepolia (sepolia.etherscan.io).
|
||||
*
|
||||
* @param {string} address - Ethereum address to check.
|
||||
* @param {string} [chainId] - Chain id of the network to look it up on.
|
||||
* @returns {Promise<{type: string, message: string, severity: string}|null>}
|
||||
*/
|
||||
async function checkEtherscanLabel(address, chainId) {
|
||||
async function checkEtherscanLabel(address) {
|
||||
try {
|
||||
// Lazy require to avoid pulling in chrome.storage at module scope
|
||||
// (which breaks unit tests that only exercise parseEtherscanPage).
|
||||
const { currentNetwork } = require("./state");
|
||||
const network = chainId ? networkByChainId(chainId) : currentNetwork();
|
||||
const etherscanBase = network.explorerUrl + "/address/";
|
||||
const etherscanBase = currentNetwork().explorerUrl + "/address/";
|
||||
const resp = await fetch(etherscanBase + address, {
|
||||
headers: { Accept: "text/html" },
|
||||
});
|
||||
|
||||
@@ -23,11 +23,6 @@ const DEFAULT_STATE = {
|
||||
hasWallet: false,
|
||||
wallets: [],
|
||||
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",
|
||||
rpcUrl: DEFAULT_RPC_URL,
|
||||
blockscoutUrl: DEFAULT_BLOCKSCOUT_URL,
|
||||
@@ -294,20 +289,6 @@ function normalizePersisted(saved) {
|
||||
// profile whose wallets are perfectly fine. An empty list is a legitimate
|
||||
// value and survives.
|
||||
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
|
||||
// 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
|
||||
|
||||
@@ -110,14 +110,11 @@ function hashListed(hash) {
|
||||
* Generate hostname variants for subdomain matching.
|
||||
* "sub.evil.com" yields ["sub.evil.com", "evil.com"].
|
||||
*
|
||||
* A trailing dot is dropped: "evil.com." is the fully qualified spelling of
|
||||
* "evil.com", and the browser loads the same site from either.
|
||||
*
|
||||
* @param {string} hostname
|
||||
* @returns {string[]}
|
||||
*/
|
||||
function hostnameVariants(hostname) {
|
||||
const h = hostname.toLowerCase().replace(/\.$/, "");
|
||||
const h = hostname.toLowerCase();
|
||||
const variants = [h];
|
||||
const parts = h.split(".");
|
||||
// Parent domains: a.b.c.d -> b.c.d, c.d
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
const { getTopTokenPrices } = require("./tokenList");
|
||||
const { isBelowOneMillionth } = require("./amountDisplay");
|
||||
const { networkByChainId } = require("./networks");
|
||||
|
||||
const PRICE_CACHE_TTL = 300000; // 5 minutes
|
||||
|
||||
@@ -37,12 +36,10 @@ function clearPrices() {
|
||||
lastFetchedAt = 0;
|
||||
}
|
||||
|
||||
// Return the USD price for a symbol on the network with `chainId`, or on the
|
||||
// active network when no chain id is given; null on testnet / unknown.
|
||||
function getPrice(symbol, chainId) {
|
||||
// Return the USD price for a symbol, or null on testnet / unknown.
|
||||
function getPrice(symbol) {
|
||||
const { currentNetwork } = require("./state");
|
||||
const network = chainId ? networkByChainId(chainId) : currentNetwork();
|
||||
if (network.isTestnet) return null;
|
||||
if (currentNetwork().isTestnet) return null;
|
||||
return prices[symbol] || null;
|
||||
}
|
||||
|
||||
|
||||
+8
-12
@@ -42,11 +42,9 @@ const { log } = require("./log");
|
||||
// and writes THIS object, never the proxy: the guard is for callers.
|
||||
const rawState = {
|
||||
...DEFAULT_STATE,
|
||||
// Their own objects, not the ones DEFAULT_STATE holds:
|
||||
// applyChainSwitchFields() mutates these maps in place, and a spread copies
|
||||
// the reference.
|
||||
// Its own object, not the one DEFAULT_STATE holds: applyChainSwitchFields()
|
||||
// mutates this map in place, and a spread copies the reference.
|
||||
networkEndpoints: {},
|
||||
networkTrackedTokens: {},
|
||||
currentView: null,
|
||||
selectedWallet: null,
|
||||
selectedAddress: null,
|
||||
@@ -440,14 +438,12 @@ function mergeNetworkEndpoints(base, ours, theirs) {
|
||||
//
|
||||
// Every other persisted field stays a whole-field diff:
|
||||
// `trackedTokens`/`fraudContracts`/`viewStack` are arrays of scalars with no
|
||||
// per-element identity to merge by; `networkTrackedTokens` is diffed whole like
|
||||
// `trackedTokens` and `networkId`, the two fields a network switch moves
|
||||
// together with it; `tokenHolderCache` is a map shaped like the ones above,
|
||||
// but nothing in src/ ever writes an entry into it — it is only ever reset
|
||||
// wholesale to `{}` (applyChainSwitchFields()) — so there is no in-place
|
||||
// mutation for a whole-field diff to collide with; `viewData` is this page's
|
||||
// own UI scratch space, not data another page has any reason to share
|
||||
// membership of.
|
||||
// per-element identity to merge by; `tokenHolderCache` is a map shaped like
|
||||
// the ones above, but nothing in src/ ever writes an entry into it — it is
|
||||
// only ever reset wholesale to `{}` (applyChainSwitchFields()) — so there is
|
||||
// no in-place mutation for a whole-field diff to collide with; `viewData` is
|
||||
// this page's 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
|
||||
// safe: last write wins on that one leaf, same as before. What it removes
|
||||
|
||||
@@ -576,7 +576,7 @@ const TOKENS = [
|
||||
symbol: "FLOKI",
|
||||
decimals: 9,
|
||||
name: "FLOKI",
|
||||
url: "https://floki.com",
|
||||
url: "",
|
||||
},
|
||||
{
|
||||
address: "0x7420B4b9a0110cdC71fB720908340C03F9Bc03EC",
|
||||
@@ -1290,7 +1290,7 @@ const TOKENS = [
|
||||
symbol: "TURBO",
|
||||
decimals: 18,
|
||||
name: "Turbo",
|
||||
url: "https://www.turbo-eth.com",
|
||||
url: "",
|
||||
},
|
||||
{
|
||||
address: "0xA27EC0006e59f245217Ff08CD52A7E8b169E62D2",
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
// encoded with.
|
||||
//
|
||||
// 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
|
||||
// the balance it reads from the node with the block explorer's cached metadata
|
||||
// (see fetchTokenBalances() in balances.js); the transfer used to be encoded
|
||||
// from decimals() read off the contract at signing time, and nothing compared
|
||||
// the two. A token whose on-chain scale differs from the cached one — an
|
||||
// different places. The confirmation screen renders the amount, the balance and
|
||||
// the symbol from the block explorer's cached metadata (see
|
||||
// fetchTokenBalances() in balances.js); the transfer used to be encoded from
|
||||
// decimals() read off the contract at signing time, and nothing compared the
|
||||
// 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
|
||||
// entry — therefore signed an amount that was never displayed, off by a power
|
||||
// of ten for every decimal place of disagreement.
|
||||
|
||||
+13
-39
@@ -1,5 +1,4 @@
|
||||
// The amount check and balance arithmetic for the Send and transaction
|
||||
// confirmation screens.
|
||||
// Balance arithmetic for the Send and transaction confirmation screens.
|
||||
//
|
||||
// Pure: no DOM, no network, no state. Everything is exact integer math on
|
||||
// 18-decimal fixed point (wei for ETH), so it can be unit tested directly
|
||||
@@ -21,7 +20,7 @@ const FEE_KNOWN = "known";
|
||||
const FEE_UNAVAILABLE = "unavailable";
|
||||
|
||||
const CODES = {
|
||||
// The amount is one isValidAmount() refuses.
|
||||
// The amount is not a non-negative number we can do exact arithmetic on.
|
||||
AMOUNT_INVALID: "amount-invalid",
|
||||
// ERC-20: the token amount exceeds the token balance.
|
||||
INSUFFICIENT_TOKEN: "insufficient-token",
|
||||
@@ -88,31 +87,10 @@ function toFixedPoint(value) {
|
||||
}
|
||||
}
|
||||
|
||||
// Whether `amount` can be sent: a number above zero, written as digits with
|
||||
// at most one decimal point ("0.5", "12", ".5"), with nothing but zeros after
|
||||
// the token's last decimal place, `tokenDecimals`, and nothing but zeros after
|
||||
// the 18th, the places the arithmetic here works in, which are ETH's. ETH, and
|
||||
// a token whose decimal places are unknown, pass null and are held to the 18
|
||||
// (the confirmation screen refuses to send such a token anyway). Zeros past
|
||||
// those places are accepted because parseUnits() drops them here and again
|
||||
// when the transfer is encoded, so "1.0000000" of a 6-place token is exactly
|
||||
// 1 everywhere. Refuses "1e-3", "1abc", "0" and "-1". The Send screen checks
|
||||
// it before the confirmation screen opens, and validateTransfer() checks it
|
||||
// again there.
|
||||
function isValidAmount(amount, tokenDecimals = null) {
|
||||
if (typeof amount !== "string") return false;
|
||||
const places = Math.min(tokenDecimals ?? SCALE_DECIMALS, SCALE_DECIMALS);
|
||||
try {
|
||||
return parseUnits(amount.trim(), places) > 0n;
|
||||
} catch {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// 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
|
||||
// exactly that reserve left behind. `ethBalance` is an exact decimal string as
|
||||
// formatEther() writes it, never a rounded one. Null when the balance does not
|
||||
// exactly that reserve left behind. `ethBalance` is the exact decimal string
|
||||
// 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
|
||||
// unusable.
|
||||
function maxEthAmount(ethBalance, feeWei) {
|
||||
@@ -134,11 +112,9 @@ function maxTokenAmount(tokenBalance) {
|
||||
// Validate a pending transfer against the balances that must cover it.
|
||||
//
|
||||
// isErc20 — token transfer rather than a native ETH transfer
|
||||
// amount — human decimal string being sent. One isValidAmount()
|
||||
// refuses, a negative value included, is an unusable amount
|
||||
// amount — human decimal string being sent, non-negative. Anything
|
||||
// else, a negative value included, is an unusable amount
|
||||
// rather than an amount that passes every comparison.
|
||||
// tokenDecimals — ERC-20: the token's decimal places, or null when they
|
||||
// are unknown. Passed to isValidAmount().
|
||||
// ethBalance — human decimal string, the sender's ETH balance
|
||||
// tokenBalance — human decimal string, the sender's token balance
|
||||
// feeStatus — FEE_PENDING, FEE_KNOWN or FEE_UNAVAILABLE. Anything else
|
||||
@@ -152,7 +128,6 @@ function maxTokenAmount(tokenBalance) {
|
||||
function validateTransfer({
|
||||
isErc20 = false,
|
||||
amount,
|
||||
tokenDecimals = null,
|
||||
ethBalance,
|
||||
tokenBalance,
|
||||
feeStatus = FEE_PENDING,
|
||||
@@ -160,17 +135,17 @@ function validateTransfer({
|
||||
} = {}) {
|
||||
const codes = [];
|
||||
|
||||
// An amount refused here never reaches the comparisons below: a negative
|
||||
// one would pass every one of them, then die at encode time in
|
||||
// parseEther().
|
||||
if (!isValidAmount(amount, isErc20 ? tokenDecimals : null)) {
|
||||
const amountFp = toFixedPoint(amount);
|
||||
const ethFp = toFixedPoint(ethBalance) ?? 0n;
|
||||
|
||||
// A negative amount parses to a valid bigint, so every comparison below
|
||||
// is trivially false and the send clears the screen — then dies at encode
|
||||
// time in parseEther(). Unusable, on the same footing as a malformed fee.
|
||||
if (amountFp === null || amountFp < 0n) {
|
||||
codes.push(CODES.AMOUNT_INVALID);
|
||||
return { canSend: false, codes };
|
||||
}
|
||||
|
||||
const amountFp = toFixedPoint(amount);
|
||||
const ethFp = toFixedPoint(ethBalance) ?? 0n;
|
||||
|
||||
// Fail closed. Anything that is not a usable fee under a recognised
|
||||
// status — a malformed feeWei, or a status this module does not know —
|
||||
// is an unavailable estimate, never a fee of zero. Every such input errs
|
||||
@@ -220,7 +195,6 @@ module.exports = {
|
||||
SCALE_DECIMALS,
|
||||
feeReserveWei,
|
||||
feeEstimateWei,
|
||||
isValidAmount,
|
||||
maxEthAmount,
|
||||
maxTokenAmount,
|
||||
toFixedPoint,
|
||||
|
||||
+182
-1092
File diff suppressed because it is too large
Load Diff
+6
-32
@@ -110,33 +110,16 @@ function addressFromPrivateKey(key) {
|
||||
return w.address;
|
||||
}
|
||||
|
||||
// The signer for `addr`, one of the wallet's stored address records. An HD or
|
||||
// xprv address is derived at its own `index`, never at its position in the
|
||||
// wallet's list: the two differ once an import scan passes over an unused
|
||||
// index, or once an address that is not the last is removed. An HD or xprv
|
||||
// record without a valid `index` is refused before anything is derived.
|
||||
// Whatever the wallet type, the key is refused unless it is the key of
|
||||
// `addr.address`.
|
||||
function getSignerForAddress(walletData, addr, decryptedSecret) {
|
||||
if (
|
||||
(walletData.type === "hd" || walletData.type === "xprv") &&
|
||||
!(Number.isInteger(addr.index) && addr.index >= 0)
|
||||
) {
|
||||
throw new Error(
|
||||
"No derivation index is stored for " +
|
||||
addr.address +
|
||||
", so its key cannot be derived.",
|
||||
);
|
||||
}
|
||||
let signer;
|
||||
function getSignerForAddress(walletData, addrIndex, decryptedSecret) {
|
||||
if (walletData.type === "hd") {
|
||||
const node = HDNodeWallet.fromPhrase(
|
||||
decryptedSecret,
|
||||
"",
|
||||
BIP44_ETH_PATH,
|
||||
);
|
||||
signer = node.deriveChild(addr.index);
|
||||
} else if (walletData.type === "xprv") {
|
||||
return node.deriveChild(addrIndex);
|
||||
}
|
||||
if (walletData.type === "xprv") {
|
||||
// Checked here rather than through masterXprvOrThrow so the message
|
||||
// fits the situation: nobody is importing anything at signing time,
|
||||
// and this wallet is already in storage. src/shared/walletDefects.js
|
||||
@@ -154,18 +137,9 @@ function getSignerForAddress(walletData, addr, decryptedSecret) {
|
||||
"is not a master key, so it cannot sign.",
|
||||
);
|
||||
}
|
||||
signer = node.derivePath(BIP44_ETH_PATH).deriveChild(addr.index);
|
||||
} else {
|
||||
signer = new Wallet(decryptedSecret);
|
||||
return node.derivePath(BIP44_ETH_PATH).deriveChild(addrIndex);
|
||||
}
|
||||
if (signer.address.toLowerCase() !== addr.address.toLowerCase()) {
|
||||
throw new Error(
|
||||
"The key this wallet holds for " +
|
||||
addr.address +
|
||||
" belongs to a different address, so it was not used.",
|
||||
);
|
||||
}
|
||||
return signer;
|
||||
return new Wallet(decryptedSecret);
|
||||
}
|
||||
|
||||
function isValidMnemonic(mnemonic) {
|
||||
|
||||
@@ -36,13 +36,11 @@ const DEFECTS = {
|
||||
"derivation path beneath that key instead of from a master " +
|
||||
"key, so the addresses listed here are not the ones that key " +
|
||||
"produces under the standard path.",
|
||||
"Signing, sending and private key export are disabled for this " +
|
||||
"wallet. Anything these addresses hold can be reached outside " +
|
||||
"this wallet with the extended private key you imported, if " +
|
||||
"you kept a copy of it, or with the master extended private " +
|
||||
"key or recovery phrase it came from, in software that " +
|
||||
"repeats the same non-standard derivation. Check the " +
|
||||
"addresses in a block explorer before deciding what to do.",
|
||||
"Signing and sending are disabled for this wallet. The addresses " +
|
||||
"do descend from the extended private key you imported, so " +
|
||||
"anything they hold is still reachable by software that " +
|
||||
"repeats the same non-standard derivation. Check them in a " +
|
||||
"block explorer before deciding what to do.",
|
||||
"To see the addresses this key produces under the standard path, " +
|
||||
"import the master extended private key, or the recovery " +
|
||||
"phrase it came from, as a new wallet. Nothing here has been " +
|
||||
|
||||
@@ -14,7 +14,7 @@ function sameAddress(a, b) {
|
||||
|
||||
// Forget every site permission held against the given addresses: the
|
||||
// remembered ones in `state`, and the connections approved without
|
||||
// "Remember", which only the background holds, in session storage.
|
||||
// "Remember", which only the background holds, in memory.
|
||||
function dropSitePermissions(state, addresses) {
|
||||
for (const addr of addresses) {
|
||||
delete state.allowedSites[addr];
|
||||
|
||||
@@ -1,167 +0,0 @@
|
||||
// A page whose origin has no host is never told an address by accountsChanged
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/564).
|
||||
//
|
||||
// When the user switches address, the background tells each open tab the new
|
||||
// active address if the site at the tab's URL is connected. A page at a
|
||||
// connected site's URL can still have another origin: one its server
|
||||
// sandboxes with a Content-Security-Policy has the origin "null", and every
|
||||
// request it makes is refused. Each test here switches the address in the real
|
||||
// background, takes the event it sent to a tab at the site's URL, and hands
|
||||
// that event to the real content script in a page of the given origin.
|
||||
|
||||
const { networkById } = require("../src/shared/networks");
|
||||
const { makeStorageStub } = require("./support/storageStub");
|
||||
|
||||
const ADDRESS = "0x66133E8ea0f5D1d612D2502a968757D1048c214a";
|
||||
const SITE = "https://dapp.example";
|
||||
|
||||
const EXT_URL = "chrome-extension://autistmask/";
|
||||
const FROM_POPUP = { url: EXT_URL + "src/popup/index.html" };
|
||||
|
||||
// One address, with SITE remembered as allowed for it.
|
||||
function storedProfile() {
|
||||
const mainnet = networkById("mainnet");
|
||||
return {
|
||||
hasWallet: true,
|
||||
wallets: [
|
||||
{
|
||||
name: "Wallet 1",
|
||||
type: "hd",
|
||||
addresses: [
|
||||
{ address: ADDRESS, balance: "0", tokenBalances: [] },
|
||||
],
|
||||
},
|
||||
],
|
||||
activeAddress: ADDRESS,
|
||||
networkId: "mainnet",
|
||||
rpcUrl: mainnet.defaultRpcUrl,
|
||||
blockscoutUrl: mainnet.defaultBlockscoutUrl,
|
||||
allowedSites: { [ADDRESS]: [SITE] },
|
||||
deniedSites: {},
|
||||
trackedTokens: [],
|
||||
};
|
||||
}
|
||||
|
||||
async function settle() {
|
||||
for (let i = 0; i < 50; i++) await Promise.resolve();
|
||||
}
|
||||
|
||||
afterEach(() => {
|
||||
delete global.chrome;
|
||||
delete global.window;
|
||||
jest.resetModules();
|
||||
});
|
||||
|
||||
// The popup tells the background the active address changed, and the one
|
||||
// open tab, at SITE's URL, is sent an event. That event is returned.
|
||||
async function eventSentToSiteTab() {
|
||||
jest.resetModules();
|
||||
jest.doMock("../src/shared/balances", () => ({
|
||||
getProvider: () => ({}),
|
||||
refreshBalances: jest.fn(async () => {}),
|
||||
}));
|
||||
jest.doMock("../src/shared/phishingDomains", () => ({
|
||||
isPhishingDomain: () => false,
|
||||
}));
|
||||
jest.doMock("../src/shared/alarms", () => ({
|
||||
BALANCE_REFRESH_ALARM: "balance",
|
||||
BALANCE_REFRESH_PERIOD_MINUTES: 1,
|
||||
ensureRecurringAlarms: jest.fn(async () => {}),
|
||||
registerAlarmHandlers: jest.fn(),
|
||||
}));
|
||||
|
||||
let messageListener = null;
|
||||
const sentToTabs = [];
|
||||
global.chrome = {
|
||||
storage: makeStorageStub({ autistmask: storedProfile() }),
|
||||
runtime: {
|
||||
getURL: (path) => EXT_URL + path,
|
||||
onMessage: {
|
||||
addListener: (fn) => {
|
||||
messageListener = fn;
|
||||
},
|
||||
},
|
||||
onConnect: { addListener: () => {} },
|
||||
getPlatformInfo: (cb) => cb({ os: "linux" }),
|
||||
lastError: null,
|
||||
},
|
||||
windows: {
|
||||
remove: (id, cb) => {
|
||||
if (cb) cb();
|
||||
},
|
||||
onRemoved: { addListener: () => {} },
|
||||
},
|
||||
tabs: {
|
||||
query: (q, cb) => cb([{ id: 1, url: SITE + "/app" }]),
|
||||
sendMessage: (tabId, msg, cb) => {
|
||||
sentToTabs.push(msg);
|
||||
if (cb) cb();
|
||||
},
|
||||
},
|
||||
action: { setPopup: () => {} },
|
||||
};
|
||||
|
||||
require("../src/background/index");
|
||||
messageListener(
|
||||
{ type: "AUTISTMASK_ACTIVE_CHANGED" },
|
||||
FROM_POPUP,
|
||||
() => {},
|
||||
);
|
||||
await settle();
|
||||
|
||||
expect(sentToTabs).toHaveLength(1);
|
||||
return sentToTabs[0];
|
||||
}
|
||||
|
||||
// The content script in a page whose origin is `pageOrigin` is handed `event`
|
||||
// from the background. What it posts to the page is returned.
|
||||
function postedToPage(event, pageOrigin) {
|
||||
jest.resetModules();
|
||||
let eventListener = null;
|
||||
const posted = [];
|
||||
global.chrome = {
|
||||
runtime: {
|
||||
onMessage: {
|
||||
addListener: (fn) => {
|
||||
eventListener = fn;
|
||||
},
|
||||
},
|
||||
},
|
||||
};
|
||||
global.window = {
|
||||
origin: pageOrigin,
|
||||
addEventListener: () => {},
|
||||
postMessage: (data) => posted.push(data),
|
||||
};
|
||||
|
||||
require("../src/content/index");
|
||||
eventListener(event);
|
||||
|
||||
return posted;
|
||||
}
|
||||
|
||||
describe("accountsChanged after an address switch, at a connected site's URL", () => {
|
||||
test("the site's own page is told the active address", async () => {
|
||||
const event = await eventSentToSiteTab();
|
||||
|
||||
expect(postedToPage(event, SITE)).toEqual([
|
||||
{
|
||||
type: "AUTISTMASK_EVENT",
|
||||
eventName: "accountsChanged",
|
||||
data: [ADDRESS],
|
||||
},
|
||||
]);
|
||||
});
|
||||
|
||||
test("a page whose origin has no host is told no address", async () => {
|
||||
const event = await eventSentToSiteTab();
|
||||
|
||||
expect(postedToPage(event, "null")).toEqual([
|
||||
{
|
||||
type: "AUTISTMASK_EVENT",
|
||||
eventName: "accountsChanged",
|
||||
data: [],
|
||||
},
|
||||
]);
|
||||
});
|
||||
});
|
||||
@@ -1,489 +0,0 @@
|
||||
// Sending, a site's transaction and signature requests and private key export
|
||||
// each use the key of the address they name: the key at the index that address
|
||||
// was derived at, not the one at its position in the wallet's list. The two
|
||||
// differ after an import whose scan passed over an unused index, and after an
|
||||
// address that is not the last is removed
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/510). A send is signed by the
|
||||
// From address its confirmation screen shows, whichever address is selected.
|
||||
//
|
||||
// Driven through the real import, "+" button, address removal, confirmation
|
||||
// screen, transaction and signature approval screens and export screen, with
|
||||
// the node, the vault and the DOM stubbed.
|
||||
|
||||
"use strict";
|
||||
|
||||
// The addresses the stub node reports a balance for, and the signed
|
||||
// transactions it was handed.
|
||||
const mockNode = { funded: new Set(), broadcast: [] };
|
||||
|
||||
jest.mock("ethers", () => {
|
||||
const actual = jest.requireActual("ethers");
|
||||
class StubProvider {
|
||||
async getBalance(address) {
|
||||
return mockNode.funded.has(address) ? 1n : 0n;
|
||||
}
|
||||
async getTransactionCount() {
|
||||
return 0;
|
||||
}
|
||||
async estimateGas() {
|
||||
return 21000n;
|
||||
}
|
||||
async getFeeData() {
|
||||
return {
|
||||
maxFeePerGas: 20000000000n,
|
||||
maxPriorityFeePerGas: 1000000000n,
|
||||
gasPrice: 10000000000n,
|
||||
};
|
||||
}
|
||||
async getNetwork() {
|
||||
return { chainId: 1n };
|
||||
}
|
||||
async getCode() {
|
||||
return "0x";
|
||||
}
|
||||
async lookupAddress() {
|
||||
return null;
|
||||
}
|
||||
async broadcastTransaction(signed) {
|
||||
mockNode.broadcast.push(signed);
|
||||
return { hash: "0x" + "ab".repeat(32) };
|
||||
}
|
||||
}
|
||||
return { ...actual, JsonRpcProvider: StubProvider };
|
||||
});
|
||||
|
||||
// No password is hashed: what the wallet stores is the phrase itself.
|
||||
jest.mock("../src/shared/vault", () => ({
|
||||
encryptWithPassword: async (secret) => secret,
|
||||
decryptWithPassword: async (secret) => secret,
|
||||
}));
|
||||
|
||||
// The wait screen polls for a receipt; these tests stop at the broadcast.
|
||||
jest.mock("../src/popup/views/txStatus", () => ({
|
||||
showWait: jest.fn(),
|
||||
showError: jest.fn(),
|
||||
}));
|
||||
|
||||
jest.mock("ethereum-blockies-base64", () => () => "data:image/png;base64,x");
|
||||
|
||||
global.fetch = jest.fn(() => {
|
||||
throw new Error("tests must not perform network requests");
|
||||
});
|
||||
|
||||
const {
|
||||
HDNodeWallet,
|
||||
Mnemonic,
|
||||
Transaction,
|
||||
getBytes,
|
||||
verifyMessage,
|
||||
} = require("ethers");
|
||||
|
||||
// Publicly known development phrase; never fund it.
|
||||
const PHRASE = "test test test test test test test test test test test junk";
|
||||
// PHRASE's master extended private key, as the xprv import takes it.
|
||||
const XPRV = HDNodeWallet.fromSeed(
|
||||
Mnemonic.fromPhrase(PHRASE).computeSeed(),
|
||||
).extendedKey;
|
||||
const PASSWORD = "correct horse battery staple";
|
||||
const RECIPIENT = "0xC0FfEE0000000000000000000000000000c0fFEe";
|
||||
// "Hello", as the hex a page sends.
|
||||
const MESSAGE = "0x48656c6c6f";
|
||||
|
||||
// The address and key at derivation index `index` of PHRASE, worked out with
|
||||
// ethers directly rather than through the wallet's own code.
|
||||
function derived(index) {
|
||||
return HDNodeWallet.fromPhrase(PHRASE, "", "m/44'/60'/0'/0/" + index);
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------ DOM stub
|
||||
|
||||
function makeElement(id) {
|
||||
const classes = new Set();
|
||||
const el = {
|
||||
id,
|
||||
textContent: "",
|
||||
title: "",
|
||||
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"),
|
||||
addEventListener: () => {},
|
||||
body: { prepend: () => {} },
|
||||
};
|
||||
}
|
||||
|
||||
function node(id) {
|
||||
return globalThis.document.getElementById(id);
|
||||
}
|
||||
|
||||
function click(element) {
|
||||
const event = { stopPropagation: () => {} };
|
||||
return Promise.all((element.listeners.click || []).map((fn) => fn(event)));
|
||||
}
|
||||
|
||||
// show() starts the fee estimate without awaiting it; this lets it settle.
|
||||
async function settle() {
|
||||
for (let i = 0; i < 10; i++) await new Promise((r) => setTimeout(r, 0));
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------ harness
|
||||
|
||||
globalThis.chrome = {
|
||||
storage: { local: { get: async () => ({}), set: async () => {} } },
|
||||
};
|
||||
|
||||
const { state } = require("../src/shared/state");
|
||||
const { removeAddressFromState } = require("../src/shared/walletDelete");
|
||||
const addWallet = require("../src/popup/views/addWallet");
|
||||
const home = require("../src/popup/views/home");
|
||||
const confirmTx = require("../src/popup/views/confirmTx");
|
||||
const approval = require("../src/popup/views/approval");
|
||||
const exportPrivkey = require("../src/popup/views/exportPrivkey");
|
||||
const txStatus = require("../src/popup/views/txStatus");
|
||||
|
||||
// What the background answers when the approval window asks which approval it
|
||||
// was opened for, and every message the popup sent it.
|
||||
let approvalDetails;
|
||||
let sent;
|
||||
|
||||
// The "+" button of the wallet list's last render. Each render attaches the
|
||||
// handler to the buttons it drew, as the browser's fresh list would have.
|
||||
let plusButton;
|
||||
|
||||
beforeEach(() => {
|
||||
approvalDetails = null;
|
||||
sent = [];
|
||||
mockNode.broadcast = [];
|
||||
globalThis.document = makeDocument();
|
||||
globalThis.window = { close: () => {} };
|
||||
globalThis.chrome = {
|
||||
storage: { local: { get: async () => ({}), set: async () => {} } },
|
||||
runtime: {
|
||||
connect: () => ({ postMessage: () => {} }),
|
||||
sendMessage: (msg, reply) => {
|
||||
sent.push(msg);
|
||||
if (!reply) return;
|
||||
reply(
|
||||
msg.type === "AUTISTMASK_GET_APPROVAL"
|
||||
? approvalDetails
|
||||
: null,
|
||||
);
|
||||
},
|
||||
},
|
||||
};
|
||||
node("wallet-list").querySelectorAll = (selector) => {
|
||||
if (selector !== ".btn-add-address") return [];
|
||||
plusButton = makeElement("btn-add-address");
|
||||
plusButton.dataset.wallet = "0";
|
||||
return [plusButton];
|
||||
};
|
||||
// The explorer and price lookups these screens start fail offline, and
|
||||
// say so; that is not under test.
|
||||
for (const method of ["log", "warn", "error"]) {
|
||||
jest.spyOn(console, method).mockImplementation(() => {});
|
||||
}
|
||||
txStatus.showError.mockClear();
|
||||
|
||||
state.wallets = [];
|
||||
state.rpcUrl = "https://rpc.example.invalid";
|
||||
state.networkId = "mainnet";
|
||||
state.viewStack = [];
|
||||
state.currentView = "main";
|
||||
|
||||
addWallet.init({
|
||||
renderWalletList: () => {},
|
||||
startRefresh: () => {},
|
||||
pageClosed: new AbortController().signal,
|
||||
});
|
||||
confirmTx.init({});
|
||||
approval.init({});
|
||||
exportPrivkey.init();
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
jest.restoreAllMocks();
|
||||
});
|
||||
|
||||
// Import PHRASE on the add-wallet screen, with the stub node reporting a
|
||||
// balance at each of `fundedIndices`, and wait for the address scan.
|
||||
async function importPhrase(fundedIndices) {
|
||||
mockNode.funded = new Set(fundedIndices.map((i) => derived(i).address));
|
||||
await click(node("tab-mnemonic"));
|
||||
node("wallet-mnemonic").value = PHRASE;
|
||||
node("add-wallet-password").value = PASSWORD;
|
||||
node("add-wallet-password-confirm").value = PASSWORD;
|
||||
await click(node("btn-add-wallet-confirm"));
|
||||
}
|
||||
|
||||
// The same, importing XPRV on the add-wallet screen's xprv tab.
|
||||
async function importXprv(fundedIndices) {
|
||||
mockNode.funded = new Set(fundedIndices.map((i) => derived(i).address));
|
||||
await click(node("tab-xprv"));
|
||||
node("import-xprv-key").value = XPRV;
|
||||
node("add-wallet-password").value = PASSWORD;
|
||||
node("add-wallet-password-confirm").value = PASSWORD;
|
||||
await click(node("btn-add-wallet-confirm"));
|
||||
}
|
||||
|
||||
// Press the wallet's "+" button on Home.
|
||||
async function addAddress() {
|
||||
home.render({
|
||||
doRefreshAndRender: () => {},
|
||||
pageClosed: new AbortController().signal,
|
||||
});
|
||||
await click(plusButton);
|
||||
}
|
||||
|
||||
// The key the export screen reveals for the address at `position`.
|
||||
async function exportedKey(position) {
|
||||
exportPrivkey.show(0, position);
|
||||
node("export-privkey-password").value = PASSWORD;
|
||||
await click(node("btn-export-privkey-confirm"));
|
||||
return node("export-privkey-value").textContent;
|
||||
}
|
||||
|
||||
// Confirm a send whose From line shows `from`, with the address at position
|
||||
// `selected` selected; resolves to the signed transaction the node was handed,
|
||||
// or undefined when none was.
|
||||
async function confirmSend(from, selected) {
|
||||
state.selectedWallet = 0;
|
||||
state.selectedAddress = selected;
|
||||
confirmTx.show({
|
||||
from,
|
||||
to: RECIPIENT,
|
||||
amount: "0.5",
|
||||
token: "ETH",
|
||||
});
|
||||
await settle();
|
||||
node("confirm-tx-password").value = PASSWORD;
|
||||
await click(node("btn-confirm-send"));
|
||||
return mockNode.broadcast.pop();
|
||||
}
|
||||
|
||||
// Send from the address at `position`, with that address selected, as the Send
|
||||
// button leaves it.
|
||||
function sendFrom(position) {
|
||||
return confirmSend(state.wallets[0].addresses[position].address, position);
|
||||
}
|
||||
|
||||
// A site asks the address at `position` to sign MESSAGE; resolves to the
|
||||
// response the approval window sent the background.
|
||||
async function signFor(position) {
|
||||
const address = state.wallets[0].addresses[position].address;
|
||||
approvalDetails = {
|
||||
type: "sign",
|
||||
origin: "https://dapp.example",
|
||||
isPhishingDomain: false,
|
||||
approvedFrom: address,
|
||||
signParams: {
|
||||
method: "personal_sign",
|
||||
message: MESSAGE,
|
||||
from: address,
|
||||
},
|
||||
};
|
||||
await approval.show(1);
|
||||
node("approve-sign-password").value = PASSWORD;
|
||||
await click(node("btn-approve-sign"));
|
||||
return sent.find((msg) => msg.type === "AUTISTMASK_SIGN_RESPONSE");
|
||||
}
|
||||
|
||||
// A site asks the address at `position` to send RECIPIENT a transaction of no
|
||||
// value; resolves to the response the approval window sent the background.
|
||||
async function transactFor(position) {
|
||||
const address = state.wallets[0].addresses[position].address;
|
||||
approvalDetails = {
|
||||
type: "tx",
|
||||
origin: "https://dapp.example",
|
||||
isPhishingDomain: false,
|
||||
approvedFrom: address,
|
||||
approvedTx: {
|
||||
type: 2,
|
||||
from: address,
|
||||
chainId: "0x1",
|
||||
nonce: "0x0",
|
||||
gasLimit: "0x5208",
|
||||
maxPriorityFeePerGas: "0x3b9aca00",
|
||||
maxFeePerGas: "0x77359400",
|
||||
to: RECIPIENT,
|
||||
value: "0x0",
|
||||
data: "0x",
|
||||
accessList: [],
|
||||
},
|
||||
};
|
||||
await approval.show(1);
|
||||
node("approve-tx-password").value = PASSWORD;
|
||||
await click(node("btn-approve-tx"));
|
||||
return sent.find((msg) => msg.type === "AUTISTMASK_TX_RESPONSE");
|
||||
}
|
||||
|
||||
describe.each([
|
||||
[
|
||||
"a recovery phrase import whose scan found only the first address",
|
||||
async () => {
|
||||
await importPhrase([0]);
|
||||
},
|
||||
// The address the import stores before its scan.
|
||||
{ position: 0, index: 0 },
|
||||
],
|
||||
[
|
||||
"an xprv import whose scan found only the first address",
|
||||
async () => {
|
||||
await importXprv([0]);
|
||||
},
|
||||
{ position: 0, index: 0 },
|
||||
],
|
||||
[
|
||||
"an import whose scan passed over index 3",
|
||||
async () => {
|
||||
await importPhrase([0, 1, 2, 4]);
|
||||
},
|
||||
// Address 4 on Home, derived at index 4.
|
||||
{ position: 3, index: 4 },
|
||||
],
|
||||
[
|
||||
"an xprv import whose scan passed over index 3",
|
||||
async () => {
|
||||
await importXprv([0, 1, 2, 4]);
|
||||
},
|
||||
{ position: 3, index: 4 },
|
||||
],
|
||||
[
|
||||
"removing the middle one of three addresses",
|
||||
async () => {
|
||||
await importPhrase([0]);
|
||||
await addAddress();
|
||||
await addAddress();
|
||||
removeAddressFromState(state, 0, 1);
|
||||
},
|
||||
// Address 2 on Home after the removal, derived at index 2.
|
||||
{ position: 1, index: 2 },
|
||||
],
|
||||
])("after %s", (_name, setUp, { position, index }) => {
|
||||
beforeEach(setUp);
|
||||
|
||||
test("the wallet lists the address derived at that index there", () => {
|
||||
expect(state.wallets[0].addresses[position].address).toBe(
|
||||
derived(index).address,
|
||||
);
|
||||
});
|
||||
|
||||
test("export reveals that address's key", async () => {
|
||||
expect(await exportedKey(position)).toBe(derived(index).privateKey);
|
||||
});
|
||||
|
||||
test("a send is signed by that address", async () => {
|
||||
const signed = await sendFrom(position);
|
||||
expect(Transaction.from(signed).from).toBe(derived(index).address);
|
||||
});
|
||||
|
||||
test("a site's signature is made by that address", async () => {
|
||||
const response = await signFor(position);
|
||||
expect(verifyMessage(getBytes(MESSAGE), response.signature)).toBe(
|
||||
derived(index).address,
|
||||
);
|
||||
});
|
||||
|
||||
test("a site's transaction is signed by that address", async () => {
|
||||
const response = await transactFor(position);
|
||||
expect(Transaction.from(response.rawSignedTx).from).toBe(
|
||||
derived(index).address,
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
// The selection and the confirmation screen are saved apart, so the popup can
|
||||
// reopen onto the screen with another address selected than its From line
|
||||
// shows.
|
||||
describe("a confirmation screen whose From is not the selected address", () => {
|
||||
beforeEach(async () => {
|
||||
await importPhrase([0, 1]);
|
||||
});
|
||||
|
||||
test("the send is signed by the From address shown", async () => {
|
||||
const signed = await confirmSend(derived(1).address, 0);
|
||||
expect(Transaction.from(signed).from).toBe(derived(1).address);
|
||||
});
|
||||
|
||||
test("nothing is sent when the selected wallet does not hold it", async () => {
|
||||
expect(await confirmSend(derived(5).address, 0)).toBeUndefined();
|
||||
expect(node("confirm-tx-password-error").textContent).toBe(
|
||||
"The selected wallet does not hold the From address above, " +
|
||||
"so nothing was sent. Please go back and send again.",
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe("an address whose stored index derives a different address", () => {
|
||||
function refusal() {
|
||||
return (
|
||||
"The key this wallet holds for " +
|
||||
derived(0).address +
|
||||
" belongs to a different address, so it was not used."
|
||||
);
|
||||
}
|
||||
|
||||
beforeEach(async () => {
|
||||
await importPhrase([0]);
|
||||
state.wallets[0].addresses[0].index = 1;
|
||||
});
|
||||
|
||||
test("export reveals nothing and says why", async () => {
|
||||
expect(await exportedKey(0)).toBe("");
|
||||
expect(node("export-privkey-password-error").textContent).toBe(
|
||||
refusal(),
|
||||
);
|
||||
});
|
||||
|
||||
test("nothing is sent", async () => {
|
||||
expect(await sendFrom(0)).toBeUndefined();
|
||||
expect(txStatus.showError).toHaveBeenCalledWith(
|
||||
expect.anything(),
|
||||
null,
|
||||
refusal(),
|
||||
);
|
||||
});
|
||||
|
||||
test("nothing is signed", async () => {
|
||||
const response = await signFor(0);
|
||||
expect(response.signature).toBeUndefined();
|
||||
expect(response.error).toBe(refusal());
|
||||
});
|
||||
});
|
||||
@@ -94,7 +94,7 @@ describe.each([
|
||||
async function create(pageClosed) {
|
||||
addWallet.init({
|
||||
renderWalletList: () => {},
|
||||
startRefresh: () => {},
|
||||
doRefreshAndRender: () => {},
|
||||
pageClosed,
|
||||
});
|
||||
element("tab-" + mode).listeners.click();
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
// The confirmation screen's warning for a recipient that has never sent a
|
||||
// transaction (https://git.eeqj.de/sneak/AutistMask/issues/528).
|
||||
//
|
||||
// The node's transaction count for an address is the number of transactions
|
||||
// it has sent, so an address that only ever receives, such as a savings
|
||||
// address or an exchange deposit address, has a count of zero. The warning
|
||||
// used to fire on that count alone. It now also needs a zero balance: ETH an
|
||||
// address received stays in its balance until it sends a transaction.
|
||||
|
||||
"use strict";
|
||||
|
||||
const { getFullWarnings } = require("../src/shared/addressWarnings");
|
||||
|
||||
global.fetch = jest.fn(async () => {
|
||||
throw new Error("tests must not perform network requests");
|
||||
});
|
||||
|
||||
const RECIPIENT = "0x" + "b".repeat(40);
|
||||
|
||||
// The warning types getFullWarnings() returns for RECIPIENT when the node
|
||||
// reports it as a regular address with `txCount` sent transactions and a
|
||||
// balance of `balance` wei.
|
||||
async function warningTypes(txCount, balance) {
|
||||
const provider = {
|
||||
getCode: async () => "0x",
|
||||
getTransactionCount: async () => txCount,
|
||||
getBalance: async () => balance,
|
||||
};
|
||||
const warnings = await getFullWarnings(RECIPIENT, provider);
|
||||
return warnings.map((w) => w.type);
|
||||
}
|
||||
|
||||
test("a recipient that has received 0.5 ETH and never sent a transaction gets no warning", async () => {
|
||||
expect(await warningTypes(0, 500000000000000000n)).toEqual([]);
|
||||
});
|
||||
|
||||
test("a recipient that has never sent a transaction and holds no ETH gets the warning", async () => {
|
||||
expect(await warningTypes(0, 0n)).toEqual(["new-address"]);
|
||||
});
|
||||
@@ -1,19 +0,0 @@
|
||||
// The token names and URLs in src/shared/tokenList.js are written from
|
||||
// script/lib/token-enrichment.json by script/lib/apply-enrichment.js
|
||||
// (`make apply-enrichment`). This fails when the committed list differs from
|
||||
// what the script writes from the committed data, and when the data or the
|
||||
// script's table of websites has an address that no entry in the list matches.
|
||||
|
||||
const fs = require("fs");
|
||||
const path = require("path");
|
||||
|
||||
const enrichment = require("../script/lib/token-enrichment.json");
|
||||
const { applyEnrichment } = require("../script/lib/apply-enrichment");
|
||||
|
||||
test("src/shared/tokenList.js is what make apply-enrichment writes from the committed data", () => {
|
||||
const committed = fs.readFileSync(
|
||||
path.join(__dirname, "..", "src/shared/tokenList.js"),
|
||||
"utf8",
|
||||
);
|
||||
expect(applyEnrichment(committed, enrichment)).toBe(committed);
|
||||
});
|
||||
@@ -68,14 +68,7 @@ function swapData(amountIn, amountOutMin) {
|
||||
}
|
||||
|
||||
function swapDetail(amountIn, amountOutMin, label) {
|
||||
// Sent by the address the swap pays, so the output is the user's.
|
||||
const decoded = uniswap.decode(
|
||||
swapData(amountIn, amountOutMin),
|
||||
ROUTER,
|
||||
"0x1",
|
||||
{},
|
||||
RECIPIENT,
|
||||
);
|
||||
const decoded = uniswap.decode(swapData(amountIn, amountOutMin), ROUTER);
|
||||
return decoded.details.find((d) => d.label === label);
|
||||
}
|
||||
|
||||
|
||||
@@ -136,9 +136,7 @@ async function openTxApproval(approvedTx) {
|
||||
xpub: "xpub-wallet-1",
|
||||
encryptedSecret: "encrypted-secret-1",
|
||||
nextIndex: 1,
|
||||
addresses: [
|
||||
{ address: FROM, index: 0, balance: "0", tokenBalances: [] },
|
||||
],
|
||||
addresses: [{ address: FROM, balance: "0", tokenBalances: [] }],
|
||||
},
|
||||
];
|
||||
approval.init({});
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
// requesting page or the RPC node can say turns it into an approval that
|
||||
// should never have been raised.
|
||||
|
||||
const { Network, Transaction, Wallet, toQuantity } = require("ethers");
|
||||
const { Network, Wallet } = require("ethers");
|
||||
const {
|
||||
prepareApprovalTx,
|
||||
serializeApprovedTx,
|
||||
@@ -138,49 +138,6 @@ describe("prepareApprovalTx", () => {
|
||||
expect(approved.maxFeePerGas).toBe("0x12a05f200");
|
||||
});
|
||||
|
||||
// `gas` is the JSON-RPC name for the gas limit and the one sites send.
|
||||
// The node is still asked for its estimate, with the site's gas limit,
|
||||
// because the estimate is the check that the transaction does not revert.
|
||||
// It estimates 21000; the site's 200000 is what is shown and what is
|
||||
// signed.
|
||||
test("uses the gas limit a site sends as gas", async () => {
|
||||
const estimateGas = jest.fn(async () => 21000n);
|
||||
const approved = await prepareApprovalTx(
|
||||
providerWith({ estimateGas }),
|
||||
signer.address,
|
||||
{ ...TX_PARAMS, gas: "0x30d40" },
|
||||
);
|
||||
expect(estimateGas).toHaveBeenCalledWith(
|
||||
expect.objectContaining({ gasLimit: 200000n }),
|
||||
);
|
||||
expect(approved.gasLimit).toBe("0x30d40");
|
||||
const signed = Transaction.from(
|
||||
await signer.signTransaction({ ...approved }),
|
||||
);
|
||||
expect(signed.gasLimit).toBe(200000n);
|
||||
});
|
||||
|
||||
test("accepts gas and gasLimit that name the same number", async () => {
|
||||
const approved = await prepareApprovalTx(
|
||||
providerWith(),
|
||||
signer.address,
|
||||
{ ...TX_PARAMS, gas: "0x30d40", gasLimit: 200000 },
|
||||
);
|
||||
expect(approved.gasLimit).toBe("0x30d40");
|
||||
});
|
||||
|
||||
test("refuses gas and gasLimit that disagree", async () => {
|
||||
await expect(
|
||||
prepareApprovalTx(providerWith(), signer.address, {
|
||||
...TX_PARAMS,
|
||||
gas: "0x30d40",
|
||||
gasLimit: "0x5208",
|
||||
}),
|
||||
).rejects.toThrow(
|
||||
"The site asked for two different gas limits for this transaction.",
|
||||
);
|
||||
});
|
||||
|
||||
test("carries an access list the request asked for", async () => {
|
||||
const approved = await prepareApprovalTx(
|
||||
providerWith(),
|
||||
@@ -255,15 +212,6 @@ describe("prepareApprovalTx", () => {
|
||||
).rejects.toThrow(/gas limit no network this wallet supports/);
|
||||
});
|
||||
|
||||
test("refuses a gas limit the site sent above the ceiling", async () => {
|
||||
await expect(
|
||||
prepareApprovalTx(providerWith(), signer.address, {
|
||||
...TX_PARAMS,
|
||||
gas: toQuantity(MAX_GAS_LIMIT + 1n),
|
||||
}),
|
||||
).rejects.toThrow(/gas limit no network this wallet supports/);
|
||||
});
|
||||
|
||||
// The combined bound at population: a gas limit and a fee that are each
|
||||
// under their own ceiling but multiply to thousands of ETH is refused
|
||||
// before the approval window opens, so the user is never shown a
|
||||
@@ -303,22 +251,6 @@ describe("prepareApprovalTx", () => {
|
||||
expect(thrown.message).toMatch(/^[A-Z].*\.$/);
|
||||
});
|
||||
|
||||
test("fails back a reverting request that sends its own gas limit", async () => {
|
||||
const reverting = providerWith({
|
||||
estimateGas: async () => {
|
||||
throw new Error("execution reverted: ERC20: transfer amount");
|
||||
},
|
||||
});
|
||||
await expect(
|
||||
prepareApprovalTx(reverting, signer.address, {
|
||||
...TX_PARAMS,
|
||||
gas: "0x30d40",
|
||||
}),
|
||||
).rejects.toThrow(
|
||||
/^The transaction could not be prepared: execution reverted/,
|
||||
);
|
||||
});
|
||||
|
||||
// Without a bound, an unreachable node leaves the page's promise pending
|
||||
// with nothing on screen to explain it.
|
||||
test("gives up on a node that never answers", async () => {
|
||||
@@ -341,28 +273,6 @@ describe("prepareApprovalTx", () => {
|
||||
jest.useRealTimers();
|
||||
}
|
||||
});
|
||||
|
||||
// The estimate of a request carrying the site's gas limit is a call of its
|
||||
// own, made before populating, and is bounded the same way.
|
||||
test("gives up on a node that never answers the estimate of a request that sends its own gas limit", async () => {
|
||||
jest.useFakeTimers();
|
||||
try {
|
||||
const hanging = providerWith({
|
||||
estimateGas: () => new Promise(() => {}),
|
||||
});
|
||||
const pending = prepareApprovalTx(hanging, signer.address, {
|
||||
...TX_PARAMS,
|
||||
gas: "0x30d40",
|
||||
});
|
||||
const settled = expect(pending).rejects.toThrow(
|
||||
/did not answer in time/,
|
||||
);
|
||||
await jest.advanceTimersByTimeAsync(POPULATE_TIMEOUT_MS + 1);
|
||||
await settled;
|
||||
} finally {
|
||||
jest.useRealTimers();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
describe("serializeApprovedTx", () => {
|
||||
|
||||
@@ -58,6 +58,7 @@ const TX_PARAMS = {
|
||||
to: RECIPIENT,
|
||||
value: "0x2386f26fc10000",
|
||||
data: "0xdeadbeef",
|
||||
gas: "0x5208",
|
||||
};
|
||||
|
||||
// The values populateTransaction() fills in when the dApp fixed none of them.
|
||||
@@ -1454,11 +1455,7 @@ describe("background population to popup signing to verification", () => {
|
||||
|
||||
// What the popup does with it: signs it as given, populating nothing.
|
||||
async function popupSigns(approvedTx) {
|
||||
const localSigner = getSignerForAddress(
|
||||
walletData,
|
||||
{ address: signer.address },
|
||||
SIGNER_KEY,
|
||||
);
|
||||
const localSigner = getSignerForAddress(walletData, 0, SIGNER_KEY);
|
||||
return localSigner.signTransaction({ ...approvedTx });
|
||||
}
|
||||
|
||||
@@ -1553,11 +1550,7 @@ describe("background population to popup signing to verification", () => {
|
||||
// address the user has switched to.
|
||||
test("the approved from stops the popup signing with another key", async () => {
|
||||
const approvedTx = await backgroundPrepares(TX_PARAMS);
|
||||
const otherSigner = getSignerForAddress(
|
||||
walletData,
|
||||
{ address: other.address },
|
||||
OTHER_KEY,
|
||||
);
|
||||
const otherSigner = getSignerForAddress(walletData, 0, OTHER_KEY);
|
||||
await expect(
|
||||
otherSigner.signTransaction({ ...approvedTx }),
|
||||
).rejects.toThrow(/from address mismatch/);
|
||||
|
||||
@@ -45,132 +45,3 @@ test("the approval window shows no screen until the background describes the app
|
||||
expect(env.visibleViews()).toEqual(["approve-network"]);
|
||||
expect(env.pageErrors).toEqual([]);
|
||||
});
|
||||
|
||||
// The background opens the approval window as wide as the page, but the
|
||||
// browser counts the window's frame in that width, and a screen taller than
|
||||
// the window takes a vertical scrollbar out of it too
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/518). The browser suites run
|
||||
// without frames, and only the Firefox suite's sign prompt at a zoom other
|
||||
// than 100%, so the widening is checked here too.
|
||||
//
|
||||
// A window 396 screen pixels wide whose page is drawn at `drawn` screen pixels
|
||||
// to the page pixel. Widening it gives the page its new width, less the 15
|
||||
// screen pixels of the scrollbar the approval screen has, and then calls the
|
||||
// page's resize listeners, each of which asked to be called once.
|
||||
function windowsStub(type, drawn) {
|
||||
const updates = [];
|
||||
return {
|
||||
updates,
|
||||
getCurrent: (done) => done({ id: 7, type, width: 396 }),
|
||||
update: (id, info, done) => {
|
||||
updates.push({ id, info });
|
||||
done({});
|
||||
globalThis.document.documentElement.clientWidth = Math.floor(
|
||||
(info.width - 15) / drawn,
|
||||
);
|
||||
const resized = globalThis.window.listeners.resize || [];
|
||||
globalThis.window.listeners.resize = [];
|
||||
for (const fn of resized) fn();
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
// The approval page's own tab is at `zoom`. Asked without a tab id, Firefox
|
||||
// answers for the window focused last, here a site's tab at 100%.
|
||||
function tabsStub(zoom) {
|
||||
return {
|
||||
getCurrent: (done) => done({ id: 11 }),
|
||||
getZoom: (...args) => {
|
||||
const done = args.pop();
|
||||
done(args[0] === 11 ? zoom : 1);
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
// An approval window at `zoom`, `clientWidth` page pixels wide before its
|
||||
// screen is up, whose background holds its answer until the test gives it.
|
||||
async function bootZoomedApprovalWindow(windows, zoom, clientWidth) {
|
||||
let answer = null;
|
||||
const env = await bootPopup(unversionedValidProfile(), {
|
||||
search: "?approval=approval-1",
|
||||
runtime: {
|
||||
connect: () => ({ postMessage: () => {} }),
|
||||
sendMessage: (msg, reply) => {
|
||||
if (msg.type === "AUTISTMASK_GET_APPROVAL") answer = reply;
|
||||
},
|
||||
},
|
||||
windows,
|
||||
tabs: tabsStub(zoom),
|
||||
documentElement: { scrollWidth: 396, clientWidth },
|
||||
});
|
||||
return { env, answer };
|
||||
}
|
||||
|
||||
test("at 150% zoom the approval window widens by what its screen lacks, scrollbar included", async () => {
|
||||
const windows = windowsStub("popup", 1.5);
|
||||
// At 150% a window 396 screen pixels wide shows 264 page pixels.
|
||||
const { env, answer } = await bootZoomedApprovalWindow(windows, 1.5, 264);
|
||||
|
||||
// Not before there is a screen to fit.
|
||||
expect(windows.updates).toEqual([]);
|
||||
|
||||
// The screen is taller than the window, so once it is up a vertical
|
||||
// scrollbar takes 15 screen pixels, 10 page pixels at 150%.
|
||||
env.document.documentElement.clientWidth = 254;
|
||||
answer({
|
||||
type: "network",
|
||||
origin: "https://dapp.example",
|
||||
currentNetworkId: "mainnet",
|
||||
requestedNetworkId: "sepolia",
|
||||
isPhishingDomain: false,
|
||||
});
|
||||
await settle();
|
||||
|
||||
// 396 - 254 = 142 page pixels short, which at 150% is 213 screen pixels.
|
||||
// At the 100% of the site's tab it would be 142, and the screen would
|
||||
// still not fit.
|
||||
expect(env.visibleViews()).toEqual(["approve-network"]);
|
||||
expect(windows.updates).toEqual([{ id: 7, info: { width: 609 } }]);
|
||||
expect(env.document.documentElement.clientWidth).toBe(396);
|
||||
expect(env.pageErrors).toEqual([]);
|
||||
});
|
||||
|
||||
test("at 170% the approval window is widened again while its screen still falls short", async () => {
|
||||
// Firefox reports 170% as 1.7 but draws a page pixel about 1.714 screen
|
||||
// pixels wide, so a window 396 wide shows 231 page pixels.
|
||||
const windows = windowsStub("popup", 1.714);
|
||||
const { env, answer } = await bootZoomedApprovalWindow(windows, 1.7, 231);
|
||||
|
||||
// Less the scrollbar once the screen is up.
|
||||
env.document.documentElement.clientWidth = 222;
|
||||
answer({
|
||||
type: "network",
|
||||
origin: "https://dapp.example",
|
||||
currentNetworkId: "mainnet",
|
||||
requestedNetworkId: "sepolia",
|
||||
isPhishingDomain: false,
|
||||
});
|
||||
await settle();
|
||||
|
||||
// 174 page pixels short, so 296 screen pixels wider at 1.7. That shows 394
|
||||
// page pixels, still 2 short, so 4 screen pixels wider again.
|
||||
expect(windows.updates).toEqual([
|
||||
{ id: 7, info: { width: 692 } },
|
||||
{ id: 7, info: { width: 696 } },
|
||||
]);
|
||||
const page = env.document.documentElement;
|
||||
expect(page.scrollWidth).toBeLessThanOrEqual(page.clientWidth);
|
||||
expect(env.pageErrors).toEqual([]);
|
||||
});
|
||||
|
||||
test("a connection prompt in the toolbar popup leaves the browser window alone", async () => {
|
||||
const windows = windowsStub("normal", 1.5);
|
||||
const { env, answer } = await bootZoomedApprovalWindow(windows, 1.5, 264);
|
||||
|
||||
answer({ origin: "https://dapp.example", isPhishingDomain: false });
|
||||
await settle();
|
||||
|
||||
expect(env.visibleViews()).toEqual(["approve-site"]);
|
||||
expect(windows.updates).toEqual([]);
|
||||
expect(env.pageErrors).toEqual([]);
|
||||
});
|
||||
|
||||
@@ -264,7 +264,6 @@ function loadBackground(options) {
|
||||
connectListener = fn;
|
||||
},
|
||||
},
|
||||
getPlatformInfo: jest.fn((cb) => cb({ os: "linux" })),
|
||||
lastError: null,
|
||||
},
|
||||
windows: {
|
||||
@@ -321,10 +320,9 @@ function loadBackground(options) {
|
||||
require("../src/background/index");
|
||||
|
||||
// Send a message the way the browser would, and hand back whatever the
|
||||
// handler passed to sendResponse. `onResponse`, when given, receives the
|
||||
// answer when the handler sends it, as the sender's callback does.
|
||||
function send(msg, sender, onResponse) {
|
||||
const sendResponse = jest.fn(onResponse);
|
||||
// handler passed to sendResponse.
|
||||
function send(msg, sender) {
|
||||
const sendResponse = jest.fn();
|
||||
const kept = messageListener(msg, sender || {}, sendResponse);
|
||||
return { sendResponse, kept };
|
||||
}
|
||||
@@ -386,26 +384,20 @@ function loadBackground(options) {
|
||||
|
||||
// The same through eth_signTypedData_v4, whose params name the address
|
||||
// first and the typed data second.
|
||||
function requestTypedData(typedData = TYPED_DATA) {
|
||||
function requestTypedData() {
|
||||
let rpcResult = null;
|
||||
messageListener(
|
||||
{
|
||||
type: "AUTISTMASK_RPC",
|
||||
method: "eth_signTypedData_v4",
|
||||
params: [signer.address, typedData],
|
||||
params: [signer.address, TYPED_DATA],
|
||||
},
|
||||
{ origin: ORIGIN },
|
||||
(r) => {
|
||||
rpcResult = r;
|
||||
},
|
||||
);
|
||||
return {
|
||||
id: () =>
|
||||
new URL(created[created.length - 1].url).searchParams.get(
|
||||
"approval",
|
||||
),
|
||||
result: () => rpcResult,
|
||||
};
|
||||
return { result: () => rpcResult };
|
||||
}
|
||||
|
||||
// A dApp asking to connect. The origin defaults to one the persisted
|
||||
@@ -880,45 +872,6 @@ describe("one transaction approval at a time", () => {
|
||||
});
|
||||
});
|
||||
|
||||
// Chrome stops an idle worker, and the approvals in it go with it
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/540). tests/e2e/slowApproval.js
|
||||
// shows the worker kept running in Chrome; this shows the calls stop once the
|
||||
// approval is answered, so the worker can stop again. Every kind of approval is
|
||||
// added through addPendingApproval(), which starts the calls, so a transaction
|
||||
// approval stands for all of them.
|
||||
describe("the worker keeps running while an approval is pending", () => {
|
||||
test("an extension call every 20 seconds until the approval is answered", async () => {
|
||||
const startTimer = jest
|
||||
.spyOn(global, "setInterval")
|
||||
.mockImplementation(() => 1);
|
||||
const stopTimer = jest
|
||||
.spyOn(global, "clearInterval")
|
||||
.mockImplementation(() => {});
|
||||
try {
|
||||
const bg = loadBackground();
|
||||
const calls = global.chrome.runtime.getPlatformInfo;
|
||||
bg.requestTx();
|
||||
await settle();
|
||||
expect(startTimer).toHaveBeenCalledTimes(1);
|
||||
expect(startTimer.mock.calls[0][1]).toBe(20000);
|
||||
const tick = startTimer.mock.calls[0][0];
|
||||
|
||||
tick();
|
||||
expect(calls).toHaveBeenCalledTimes(1);
|
||||
|
||||
// The user closes the approval window, which rejects it.
|
||||
bg.closeWindow(1);
|
||||
await settle();
|
||||
tick();
|
||||
expect(calls).toHaveBeenCalledTimes(1);
|
||||
expect(stopTimer).toHaveBeenCalledWith(1);
|
||||
} finally {
|
||||
startTimer.mockRestore();
|
||||
stopTimer.mockRestore();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
// A page that asks again before the user has answered its last connection or
|
||||
// signature request is refused, instead of opening one more window per call.
|
||||
describe("one connection and one signature approval per site at a time", () => {
|
||||
@@ -1162,12 +1115,9 @@ describe("a nonce collision is reported as a transaction that did not go out", (
|
||||
const pending = bg.requestTx();
|
||||
await settle();
|
||||
|
||||
// As ethers throws it: its own classification, and the node's
|
||||
// JSON-RPC error under info.error.
|
||||
bg.broadcastTransaction.mockRejectedValue(
|
||||
Object.assign(new Error("nonce too low"), {
|
||||
code: "NONCE_EXPIRED",
|
||||
info: { error: { code: -32000, message: "nonce too low" } },
|
||||
}),
|
||||
);
|
||||
const answer = bg.send(
|
||||
@@ -1186,10 +1136,8 @@ describe("a nonce collision is reported as a transaction that did not go out", (
|
||||
retryable: false,
|
||||
stage: "nonce",
|
||||
});
|
||||
// The wallet's sentence, with the node's own code.
|
||||
expect(pending.result()).toEqual({
|
||||
error: {
|
||||
code: -32000,
|
||||
message: expect.stringMatching(
|
||||
/transaction was not sent, because its nonce/,
|
||||
),
|
||||
@@ -1239,7 +1187,6 @@ describe("a nonce collision is reported as a transaction that did not go out", (
|
||||
});
|
||||
expect(second.result()).toEqual({
|
||||
error: {
|
||||
code: -32603,
|
||||
message: expect.stringMatching(/nonce had already been used/),
|
||||
},
|
||||
});
|
||||
@@ -1330,7 +1277,6 @@ describe("what the approval is verified against", () => {
|
||||
);
|
||||
expect(pending.result()).toEqual({
|
||||
error: {
|
||||
code: -32603,
|
||||
message: expect.stringMatching(/approved maximum fee per gas/),
|
||||
},
|
||||
});
|
||||
@@ -1390,10 +1336,7 @@ describe("what the approval is verified against", () => {
|
||||
expect.objectContaining({ retryable: false, stage: "verify" }),
|
||||
);
|
||||
expect(pending.result()).toEqual({
|
||||
error: {
|
||||
code: -32603,
|
||||
message: expect.stringMatching(/active address changed/),
|
||||
},
|
||||
error: { message: expect.stringMatching(/active address changed/) },
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1537,102 +1480,10 @@ describe("what the approval is verified against", () => {
|
||||
}),
|
||||
);
|
||||
expect(pending.result()).toEqual({
|
||||
error: {
|
||||
code: -32603,
|
||||
message: expect.stringMatching(/active address changed/),
|
||||
},
|
||||
error: { message: expect.stringMatching(/active address changed/) },
|
||||
});
|
||||
});
|
||||
|
||||
// Typed data whose domain names another chain is refused on the sign
|
||||
// screen; a signature for it that reaches the background anyway is not
|
||||
// handed to the page (https://git.eeqj.de/sneak/AutistMask/issues/519).
|
||||
// TYPED_DATA names mainnet.
|
||||
async function answerTypedData(bg, pending, typedData = TYPED_DATA) {
|
||||
const { domain, types, message } = JSON.parse(typedData);
|
||||
delete types.EIP712Domain;
|
||||
const signature = await signer.signTypedData(domain, types, message);
|
||||
const answer = bg.send(
|
||||
{
|
||||
type: "AUTISTMASK_SIGN_RESPONSE",
|
||||
id: pending.id(),
|
||||
approved: true,
|
||||
signature,
|
||||
},
|
||||
{ url: bg.fromPopup.url },
|
||||
);
|
||||
await settle();
|
||||
return { answer, signature };
|
||||
}
|
||||
|
||||
test("typed data for the active chain is handed back signed", async () => {
|
||||
const bg = loadBackground();
|
||||
const pending = bg.requestTypedData();
|
||||
await settle();
|
||||
|
||||
const { answer, signature } = await answerTypedData(bg, pending);
|
||||
|
||||
expect(answer.sendResponse).toHaveBeenCalledWith({ signature });
|
||||
expect(pending.result()).toEqual({ result: signature });
|
||||
});
|
||||
|
||||
test("typed data for another chain is refused, not handed back", async () => {
|
||||
const bg = loadBackground();
|
||||
bg.setNetwork(SEPOLIA);
|
||||
const pending = bg.requestTypedData();
|
||||
await settle();
|
||||
|
||||
const { answer } = await answerTypedData(bg, pending);
|
||||
|
||||
const refusal =
|
||||
"This typed data is for chain id 1, but the active network is Sepolia Testnet (chain id 11155111), so it cannot be signed.";
|
||||
expect(answer.sendResponse).toHaveBeenCalledWith({
|
||||
error: refusal,
|
||||
retryable: false,
|
||||
});
|
||||
expect(pending.result()).toEqual({
|
||||
error: { code: -32603, message: refusal },
|
||||
});
|
||||
});
|
||||
|
||||
// ethers signs a `bool` field sent as the string "false" as true, and one
|
||||
// left out as false. The sign screen refuses both; a signature for either
|
||||
// that reaches the background anyway is not handed to the page
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/552).
|
||||
test.each([
|
||||
[
|
||||
'"false"',
|
||||
"false",
|
||||
'The field "approved" is not true or false, so this typed data cannot be signed.',
|
||||
],
|
||||
[
|
||||
"left out",
|
||||
undefined,
|
||||
'The field "approved" is missing from the message, so this typed data cannot be signed.',
|
||||
],
|
||||
])(
|
||||
"typed data with a bool %s is refused, not handed back",
|
||||
async (_, approved, refusal) => {
|
||||
const data = JSON.parse(TYPED_DATA);
|
||||
data.types.Note.push({ name: "approved", type: "bool" });
|
||||
data.message.approved = approved;
|
||||
const typedData = JSON.stringify(data);
|
||||
const bg = loadBackground();
|
||||
const pending = bg.requestTypedData(typedData);
|
||||
await settle();
|
||||
|
||||
const { answer } = await answerTypedData(bg, pending, typedData);
|
||||
|
||||
expect(answer.sendResponse).toHaveBeenCalledWith({
|
||||
error: refusal,
|
||||
retryable: false,
|
||||
});
|
||||
expect(pending.result()).toEqual({
|
||||
error: { code: -32603, message: refusal },
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
test("a sign request from another address raises no approval at all", async () => {
|
||||
const bg = loadBackground();
|
||||
const pending = bg.requestSign(other.address);
|
||||
@@ -1667,7 +1518,6 @@ describe("what the approval is verified against", () => {
|
||||
|
||||
expect(pending.result()).toEqual({
|
||||
error: {
|
||||
code: -32603,
|
||||
message: expect.stringMatching(
|
||||
/active address changed while this transaction was being prepared/,
|
||||
),
|
||||
@@ -1690,11 +1540,8 @@ describe("what the approval is verified against", () => {
|
||||
const pending = bg.requestTx();
|
||||
await settle();
|
||||
|
||||
// A failure with no node error in it is answered as the wallet's own;
|
||||
// tests/rpcErrorCodes.test.js has the node's own revert.
|
||||
expect(pending.result()).toEqual({
|
||||
error: {
|
||||
code: -32603,
|
||||
message: expect.stringMatching(
|
||||
/could not be prepared.*execution reverted/,
|
||||
),
|
||||
@@ -1708,9 +1555,7 @@ describe("what the approval is verified against", () => {
|
||||
// personal_sign, and is answered as the JSON-RPC specification defines it:
|
||||
// with an EIP-191 personal message signature over the data, the same
|
||||
// signature personal_sign returns
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/409). The signature below is
|
||||
// made by the test; that the sign screen makes the same one is tested in
|
||||
// tests/ethSign.test.js.
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/409).
|
||||
describe("eth_sign", () => {
|
||||
test("is read address first, and returns a personal message signature over the data", async () => {
|
||||
const bg = loadBackground();
|
||||
@@ -2616,9 +2461,9 @@ async function siteAccounts(bg, origin) {
|
||||
return sendResponse.mock.calls[0][0];
|
||||
}
|
||||
|
||||
// A site connected without "Remember" is held only in the background's session
|
||||
// storage, keyed to the address it was connected to. Removing that address, or
|
||||
// the wallet holding it, must end the connection as part of the removal itself.
|
||||
// A site connected without "Remember" is held only in the background's memory,
|
||||
// keyed to the address it was connected to. Removing that address, or the
|
||||
// wallet holding it, must end the connection as part of the removal itself.
|
||||
// The accountsChanged broadcast the views send afterwards also clears it, but
|
||||
// only when the active address moved, and nothing waits for it to arrive.
|
||||
//
|
||||
@@ -2797,7 +2642,8 @@ describe("removing a site in Settings disconnects it", () => {
|
||||
const element = (id) => (lists[id] ||= fakeSiteList());
|
||||
global.document = { getElementById: element };
|
||||
global.chrome.runtime.sendMessage = (msg, callback) => {
|
||||
bg.send(msg, bg.fromPopup, callback);
|
||||
const { sendResponse } = bg.send(msg, bg.fromPopup);
|
||||
if (callback) callback(sendResponse.mock.calls[0]?.[0]);
|
||||
};
|
||||
await require("../src/shared/state").loadState();
|
||||
await require("../src/popup/views/settings").renderSiteLists();
|
||||
@@ -2951,7 +2797,7 @@ describe("where an approval window opens", () => {
|
||||
await settle();
|
||||
|
||||
expect(bg.created).toHaveLength(1);
|
||||
expect(bg.created[0]).toMatchObject({ left: 442, top: 60 });
|
||||
expect(bg.created[0]).toMatchObject({ left: 460, top: 60 });
|
||||
});
|
||||
|
||||
test("not centred on an approval window the user was last in", async () => {
|
||||
@@ -2968,7 +2814,7 @@ describe("where an approval window opens", () => {
|
||||
bg.requestSign();
|
||||
await settle();
|
||||
|
||||
// Centred, it would be at left 882, the position the browser refused.
|
||||
// Centred, it would be at left 900, the position the browser refused.
|
||||
expect(bg.created).toHaveLength(1);
|
||||
expect(bg.created[0].left).toBeUndefined();
|
||||
expect(bg.created[0].top).toBeUndefined();
|
||||
@@ -2990,7 +2836,7 @@ describe("where an approval window opens", () => {
|
||||
await settle();
|
||||
|
||||
expect(bg.created).toHaveLength(2);
|
||||
expect(bg.created[0]).toMatchObject({ left: 1502, top: 750 });
|
||||
expect(bg.created[0]).toMatchObject({ left: 1520, top: 750 });
|
||||
expect(bg.created[1].left).toBeUndefined();
|
||||
expect(bg.created[1].top).toBeUndefined();
|
||||
|
||||
|
||||
@@ -204,21 +204,17 @@ describe("a chain switch on a worker that never loaded state", () => {
|
||||
expect(after.rpcUrl).toBe(SEPOLIA.defaultRpcUrl);
|
||||
|
||||
// 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.
|
||||
expect(after.wallets).toEqual(walletFixture());
|
||||
expect(after.hasWallet).toBe(true);
|
||||
expect(after.activeAddress).toBe(ADDRESS);
|
||||
expect(after.allowedSites).toEqual({ [ADDRESS]: [CONNECTED_ORIGIN] });
|
||||
expect(after.networkTrackedTokens).toEqual({
|
||||
mainnet: [{ address: TOKEN, symbol: "DAI", decimals: 18 }],
|
||||
});
|
||||
expect(after.trackedTokens).toEqual([
|
||||
{ address: TOKEN, symbol: "DAI", decimals: 18 },
|
||||
]);
|
||||
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 public default, so switching back returns it.
|
||||
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().blockscoutUrl).toBe(CUSTOM_BLOCKSCOUT);
|
||||
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 () => {
|
||||
|
||||
@@ -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
|
||||
// one: populateTransaction() returns the fees the node would have produced,
|
||||
// and sendTransaction() records whether the send actually happened.
|
||||
//
|
||||
// The last test drives the real confirmation screen instead, with only the
|
||||
// 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.
|
||||
// and sendTransaction() records whether the send actually happened. The real
|
||||
// DOM path around it — reading the fee error into the reserved errors box — is
|
||||
// covered by the Chrome e2e suite.
|
||||
|
||||
// What the stub node quotes for that test: a gas limit of 150,000,000 at a
|
||||
// maximum fee of 2 gwei per gas, 0.3 ETH in all. And the signed transactions
|
||||
// it was handed.
|
||||
const mockNode = {
|
||||
gasLimit: 150000000n,
|
||||
maxFeePerGas: 2000000000n,
|
||||
broadcast: [],
|
||||
globalThis.chrome = {
|
||||
storage: { local: { get: async () => ({}), set: async () => {} } },
|
||||
};
|
||||
|
||||
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(() => {
|
||||
throw new Error("tests must not perform network requests");
|
||||
});
|
||||
|
||||
// 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,
|
||||
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 { populateVerifyAndSend } = require("../src/popup/views/confirmTx");
|
||||
const {
|
||||
MAX_GAS_LIMIT,
|
||||
MAX_FEE_PER_GAS,
|
||||
MAX_TOTAL_FEE,
|
||||
} = require("../src/shared/approvalVerify");
|
||||
@@ -193,69 +98,3 @@ describe("populateVerifyAndSend enforces the combined fee bound", () => {
|
||||
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",
|
||||
);
|
||||
});
|
||||
@@ -1,777 +0,0 @@
|
||||
// A transfer is sent only on the network its confirmation screen was drawn for
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/524).
|
||||
//
|
||||
// Settings is reachable from the confirmation screen, and Back from it only
|
||||
// unhides the screen, still labelled for the network it was drawn for. Sign &
|
||||
// Send used to take the network at the moment of the click, so 1 SepoliaETH
|
||||
// reviewed on Sepolia went out as 1 ETH on mainnet once mainnet was chosen in
|
||||
// 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
|
||||
// only the node, fetch and the DOM stubbed. The stub node is on the network
|
||||
// its 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";
|
||||
|
||||
// The questions the stub node was asked for the balance, the fee and the
|
||||
// recipient checks, by method, network name and RPC URL, in order. The
|
||||
// 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", () => {
|
||||
const actual = jest.requireActual("ethers");
|
||||
// The selector of balanceOf(address).
|
||||
const BALANCE_OF = "0x70a08231";
|
||||
class StubProvider {
|
||||
constructor(url, network) {
|
||||
this.url = url;
|
||||
this.network = network;
|
||||
}
|
||||
record(method) {
|
||||
mockNode.asked.push({
|
||||
method,
|
||||
network: this.network.name,
|
||||
url: this.url,
|
||||
});
|
||||
}
|
||||
async getNetwork() {
|
||||
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() {
|
||||
this.record("getFeeData");
|
||||
if (mockNode.legacyFees) {
|
||||
return {
|
||||
maxFeePerGas: null,
|
||||
maxPriorityFeePerGas: null,
|
||||
gasPrice: 10000000000n,
|
||||
};
|
||||
}
|
||||
return {
|
||||
maxFeePerGas: 20000000000n,
|
||||
maxPriorityFeePerGas: 1000000000n,
|
||||
gasPrice: 10000000000n,
|
||||
};
|
||||
}
|
||||
async estimateGas() {
|
||||
return 21000n;
|
||||
}
|
||||
async getCode() {
|
||||
this.record("getCode");
|
||||
return "0x";
|
||||
}
|
||||
async getTransactionCount() {
|
||||
this.record("getTransactionCount");
|
||||
return 1;
|
||||
}
|
||||
async lookupAddress() {
|
||||
return null;
|
||||
}
|
||||
async broadcastTransaction(signed) {
|
||||
mockNode.broadcast.push({
|
||||
chainId: this.network.chainId,
|
||||
url: this.url,
|
||||
signed,
|
||||
});
|
||||
return { hash: "0x" + "ab".repeat(32) };
|
||||
}
|
||||
}
|
||||
return { ...actual, JsonRpcProvider: StubProvider };
|
||||
});
|
||||
|
||||
jest.mock("../src/shared/log", () => ({
|
||||
log: {
|
||||
debugf: () => {},
|
||||
infof: () => {},
|
||||
warnf: () => {},
|
||||
errorf: () => {},
|
||||
},
|
||||
debugFetch: jest.fn(async () => ({
|
||||
ok: true,
|
||||
status: 200,
|
||||
json: async () => ({ items: [] }),
|
||||
})),
|
||||
urlOrigin: () => "",
|
||||
setRuntimeDebug: () => {},
|
||||
isDebug: () => false,
|
||||
}));
|
||||
|
||||
// The wait screen polls for a receipt; these tests stop at the broadcast.
|
||||
jest.mock("../src/popup/views/txStatus", () => ({
|
||||
showWait: 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(() => {
|
||||
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,
|
||||
addEventListener(name, fn) {
|
||||
handlers.set(name, fn);
|
||||
},
|
||||
querySelectorAll: () => [],
|
||||
querySelector: () => null,
|
||||
remove() {},
|
||||
focus() {},
|
||||
};
|
||||
}
|
||||
|
||||
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 {
|
||||
BaseWallet,
|
||||
JsonRpcProvider,
|
||||
Transaction,
|
||||
Wallet,
|
||||
parseEther,
|
||||
} = require("ethers");
|
||||
const { encryptWithPassword } = require("../src/shared/vault");
|
||||
const { state, loadState, saveState } = require("../src/shared/state");
|
||||
const { onChainSwitch } = require("../src/shared/chainSwitch");
|
||||
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 confirmTx = require("../src/popup/views/confirmTx");
|
||||
|
||||
const PRIVATE_KEY = "0x" + "11".repeat(32);
|
||||
const HOLDER = new Wallet(PRIVATE_KEY).address;
|
||||
const RECIPIENT = "0xC0FfEE0000000000000000000000000000c0fFEe";
|
||||
const TOKEN = "0x7070707070707070707070707070707070707070";
|
||||
const PASSWORD = "correct horse battery staple";
|
||||
|
||||
function el(id) {
|
||||
return global.document.getElementById(id);
|
||||
}
|
||||
|
||||
let encryptedSecret;
|
||||
let signTransaction;
|
||||
|
||||
beforeAll(async () => {
|
||||
await loadState();
|
||||
encryptedSecret = await encryptWithPassword(PRIVATE_KEY, PASSWORD);
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
elements.clear();
|
||||
mockNode.asked = [];
|
||||
mockNode.balanceWei = {
|
||||
mainnet: parseEther("5"),
|
||||
sepolia: parseEther("5"),
|
||||
};
|
||||
mockNode.tokenUnits = { mainnet: 0n, sepolia: 0n };
|
||||
mockNode.broadcast = [];
|
||||
mockNode.legacyFees = false;
|
||||
global.fetch.mockClear();
|
||||
txStatus.showWait.mockClear();
|
||||
txStatus.showError.mockClear();
|
||||
signTransaction = jest.spyOn(BaseWallet.prototype, "signTransaction");
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
signTransaction.mockRestore();
|
||||
});
|
||||
|
||||
// Show the confirmation screen for 1 of the native token on `networkId`, or
|
||||
// for the transfer `changes` makes of it, as Review on the Send screen does,
|
||||
// with its balance read and its fee estimate settled.
|
||||
async function review(networkId, changes = {}) {
|
||||
await onChainSwitch(networkId);
|
||||
await reviewOnActiveNetwork(changes);
|
||||
}
|
||||
|
||||
// review() on the network already active, without switching to it again.
|
||||
async function reviewOnActiveNetwork(changes = {}) {
|
||||
state.wallets = [
|
||||
{
|
||||
type: "key",
|
||||
name: "Wallet 1",
|
||||
encryptedSecret,
|
||||
addresses: [{ address: HOLDER }],
|
||||
},
|
||||
];
|
||||
state.selectedWallet = 0;
|
||||
state.selectedAddress = 0;
|
||||
confirmTx.init({});
|
||||
confirmTx.show({
|
||||
from: HOLDER,
|
||||
to: RECIPIENT,
|
||||
ensName: null,
|
||||
amount: "1",
|
||||
token: "ETH",
|
||||
tokenSymbol: null,
|
||||
tokenDecimals: null,
|
||||
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));
|
||||
}
|
||||
|
||||
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() {
|
||||
el("confirm-tx-password").value = PASSWORD;
|
||||
await el("btn-confirm-send").handlers.get("click")();
|
||||
}
|
||||
|
||||
test("a transfer reviewed on Sepolia and sent goes out on Sepolia", async () => {
|
||||
await review("sepolia");
|
||||
expect(el("confirm-type").textContent).toBe("Native SepoliaETH transfer");
|
||||
expect(el("btn-confirm-send").disabled).toBe(false);
|
||||
await signAndSend();
|
||||
expect(mockNode.broadcast).toHaveLength(1);
|
||||
expect(mockNode.broadcast[0].chainId).toBe(11155111n);
|
||||
expect(Transaction.from(mockNode.broadcast[0].signed).chainId).toBe(
|
||||
11155111n,
|
||||
);
|
||||
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([
|
||||
["sepolia", "mainnet", "SepoliaETH"],
|
||||
["mainnet", "sepolia", "ETH"],
|
||||
])(
|
||||
"a transfer reviewed on %s, with %s chosen in Settings before Sign & Send",
|
||||
(reviewedOn, switchedTo, symbol) => {
|
||||
test("is neither signed nor sent, and the screen says why", async () => {
|
||||
await review(reviewedOn);
|
||||
expect(el("confirm-type").textContent).toBe(
|
||||
"Native " + symbol + " transfer",
|
||||
);
|
||||
// Settings' network select, then Back, which only unhides the
|
||||
// screen as it was drawn.
|
||||
await onChainSwitch(switchedTo);
|
||||
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);
|
||||
expect(shown("confirm-fee-bound-error")).toBe(false);
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
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"),
|
||||
);
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
// The check in the click handler tells the user; the send itself carries the
|
||||
// chain id the screen was drawn for, so a signer on another network's node
|
||||
// cannot sign it even if the network changes after that check.
|
||||
test("the send is refused by a signer on another network's node", async () => {
|
||||
const { getProvider } = require("../src/shared/balances");
|
||||
const signer = new Wallet(PRIVATE_KEY).connect(
|
||||
getProvider("https://rpc.example.invalid", "mainnet"),
|
||||
);
|
||||
await expect(
|
||||
confirmTx.populateVerifyAndSend(signer, {
|
||||
token: "ETH",
|
||||
to: RECIPIENT,
|
||||
amount: "1",
|
||||
chainId: NETWORKS.sepolia.chainId,
|
||||
}),
|
||||
).rejects.toThrow("transaction chainId mismatch");
|
||||
expect(signTransaction).not.toHaveBeenCalled();
|
||||
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);
|
||||
});
|
||||
});
|
||||
@@ -1,354 +0,0 @@
|
||||
// A site allowed without "Remember my choice for this site" stays connected
|
||||
// when the background worker is stopped and started again
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/526).
|
||||
//
|
||||
// Chrome stops the worker after about 30 seconds idle and evaluates the
|
||||
// module afresh on the next event, so nothing held at module scope survives
|
||||
// it. Such a connection used to be held exactly there, and so lasted until the
|
||||
// first idle spell. Each test here makes the connection in one load of the
|
||||
// background, loads the module afresh over the same storage, as the browser
|
||||
// does, and asks the new one. The paths that end a connection are driven after
|
||||
// that restart, so each is shown to end what the earlier worker stored.
|
||||
|
||||
const { networkById } = require("../src/shared/networks");
|
||||
const { makeStorageStub } = require("./support/storageStub");
|
||||
const {
|
||||
removeAddressFromState,
|
||||
removeWalletFromState,
|
||||
} = require("../src/shared/walletDelete");
|
||||
|
||||
const ADDRESS = "0x66133E8ea0f5D1d612D2502a968757D1048c214a";
|
||||
const OTHER_ADDRESS = "0x70997970C51812dc3A010C7d01b50e0d17dc79C8";
|
||||
|
||||
const SITE = "https://dapp.example";
|
||||
const OTHER_SITE = "https://other.example";
|
||||
|
||||
const EXT_URL = "chrome-extension://autistmask/";
|
||||
const FROM_POPUP = { url: EXT_URL + "src/popup/index.html" };
|
||||
|
||||
// One wallet with two addresses, so that one of them can be removed, and no
|
||||
// remembered sites, so that every connection here is one made without
|
||||
// "Remember".
|
||||
function storedProfile() {
|
||||
const mainnet = networkById("mainnet");
|
||||
return {
|
||||
hasWallet: true,
|
||||
wallets: [
|
||||
{
|
||||
name: "Wallet 1",
|
||||
type: "hd",
|
||||
addresses: [
|
||||
{ address: ADDRESS, balance: "0", tokenBalances: [] },
|
||||
{ address: OTHER_ADDRESS, balance: "0", tokenBalances: [] },
|
||||
],
|
||||
},
|
||||
],
|
||||
activeAddress: ADDRESS,
|
||||
networkId: "mainnet",
|
||||
rpcUrl: mainnet.defaultRpcUrl,
|
||||
blockscoutUrl: mainnet.defaultBlockscoutUrl,
|
||||
allowedSites: {},
|
||||
deniedSites: {},
|
||||
trackedTokens: [],
|
||||
};
|
||||
}
|
||||
|
||||
async function settle() {
|
||||
for (let i = 0; i < 50; i++) await Promise.resolve();
|
||||
}
|
||||
|
||||
afterEach(() => {
|
||||
delete global.chrome;
|
||||
jest.resetModules();
|
||||
});
|
||||
|
||||
// Load the background module afresh, as the browser does when it starts the
|
||||
// worker, over `storage`. The storage stub stands in for the browser's own
|
||||
// storage, local and session, so it outlives each load.
|
||||
function startWorker(storage) {
|
||||
jest.resetModules();
|
||||
jest.doMock("../src/shared/balances", () => ({
|
||||
getProvider: () => ({}),
|
||||
refreshBalances: jest.fn(async () => {}),
|
||||
}));
|
||||
jest.doMock("../src/shared/phishingDomains", () => ({
|
||||
isPhishingDomain: () => false,
|
||||
}));
|
||||
jest.doMock("../src/shared/alarms", () => ({
|
||||
BALANCE_REFRESH_ALARM: "balance",
|
||||
BALANCE_REFRESH_PERIOD_MINUTES: 1,
|
||||
ensureRecurringAlarms: jest.fn(async () => {}),
|
||||
registerAlarmHandlers: jest.fn(),
|
||||
}));
|
||||
|
||||
let messageListener = null;
|
||||
let connectListener = null;
|
||||
// Every URL the toolbar popup was set to open: a site's connection prompt
|
||||
// is shown there, so this is where its approval id appears.
|
||||
const toolbarPopups = [];
|
||||
const windowsCreated = [];
|
||||
const sentToTabs = [];
|
||||
|
||||
global.chrome = {
|
||||
storage,
|
||||
runtime: {
|
||||
getURL: (path) => EXT_URL + path,
|
||||
onMessage: {
|
||||
addListener: (fn) => {
|
||||
messageListener = fn;
|
||||
},
|
||||
},
|
||||
onConnect: {
|
||||
addListener: (fn) => {
|
||||
connectListener = fn;
|
||||
},
|
||||
},
|
||||
getPlatformInfo: (cb) => cb({ os: "linux" }),
|
||||
// What the popup sends reaches the worker from the extension's own
|
||||
// page.
|
||||
sendMessage: (msg, callback) => {
|
||||
messageListener(msg, FROM_POPUP, callback || (() => {}));
|
||||
},
|
||||
lastError: null,
|
||||
},
|
||||
windows: {
|
||||
getLastFocused: (cb) => cb(null),
|
||||
create: (options, cb) => {
|
||||
windowsCreated.push(options);
|
||||
cb({ id: windowsCreated.length });
|
||||
},
|
||||
remove: (id, cb) => {
|
||||
if (cb) cb();
|
||||
},
|
||||
onRemoved: { addListener: () => {} },
|
||||
},
|
||||
tabs: {
|
||||
query: (q, cb) => cb([{ id: 1, url: SITE + "/app" }]),
|
||||
sendMessage: (tabId, msg, cb) => {
|
||||
sentToTabs.push(msg);
|
||||
if (cb) cb();
|
||||
},
|
||||
},
|
||||
action: {
|
||||
setPopup: (o) => {
|
||||
toolbarPopups.push(o.popup);
|
||||
},
|
||||
openPopup: () => Promise.resolve(),
|
||||
},
|
||||
};
|
||||
|
||||
require("../src/background/index");
|
||||
|
||||
// A request from a site, answered once the worker has had time to answer.
|
||||
async function rpc(method, origin, params) {
|
||||
let response = null;
|
||||
messageListener(
|
||||
{ type: "AUTISTMASK_RPC", method, params: params || [] },
|
||||
{ origin },
|
||||
(r) => {
|
||||
response = r;
|
||||
},
|
||||
);
|
||||
await settle();
|
||||
return response;
|
||||
}
|
||||
|
||||
// A message from the popup, and the worker's answer to it.
|
||||
async function fromPopup(msg) {
|
||||
let response;
|
||||
messageListener(msg, FROM_POPUP, (r) => {
|
||||
response = r;
|
||||
});
|
||||
await settle();
|
||||
return response;
|
||||
}
|
||||
|
||||
// The site asks to connect, and the user allows it in the prompt with
|
||||
// "Remember my choice for this site" left unchecked.
|
||||
async function connectWithoutRemember(origin) {
|
||||
let response = null;
|
||||
messageListener(
|
||||
{ type: "AUTISTMASK_RPC", method: "eth_requestAccounts" },
|
||||
{ origin },
|
||||
(r) => {
|
||||
response = r;
|
||||
},
|
||||
);
|
||||
await settle();
|
||||
const id = new URL(toolbarPopups.at(-1), EXT_URL).searchParams.get(
|
||||
"approval",
|
||||
);
|
||||
const decisionListeners = [];
|
||||
const port = {
|
||||
name: "approval:" + id,
|
||||
sender: { url: EXT_URL + "src/popup/index.html?approval=" + id },
|
||||
onMessage: { addListener: (fn) => decisionListeners.push(fn) },
|
||||
onDisconnect: { addListener: () => {} },
|
||||
};
|
||||
connectListener(port);
|
||||
for (const fn of decisionListeners) {
|
||||
fn(
|
||||
{
|
||||
type: "AUTISTMASK_APPROVAL_DECISION",
|
||||
approved: true,
|
||||
remember: false,
|
||||
},
|
||||
port,
|
||||
);
|
||||
}
|
||||
await settle();
|
||||
return response;
|
||||
}
|
||||
|
||||
return {
|
||||
rpc,
|
||||
fromPopup,
|
||||
connectWithoutRemember,
|
||||
windowsCreated,
|
||||
sentToTabs,
|
||||
};
|
||||
}
|
||||
|
||||
// A site connected without "Remember" in one worker, and the worker started
|
||||
// again over the same storage, where the site is still connected.
|
||||
async function connectedThenRestarted() {
|
||||
const storage = makeStorageStub({ autistmask: storedProfile() });
|
||||
const first = startWorker(storage);
|
||||
expect(await first.connectWithoutRemember(SITE)).toEqual({
|
||||
result: [ADDRESS],
|
||||
});
|
||||
const worker = startWorker(storage);
|
||||
expect(await worker.rpc("eth_accounts", SITE)).toEqual({
|
||||
result: [ADDRESS],
|
||||
});
|
||||
return { storage, worker };
|
||||
}
|
||||
|
||||
describe("a site allowed without Remember, after the worker restarts", () => {
|
||||
test("is still told the address, and is not asked again", async () => {
|
||||
const { worker } = await connectedThenRestarted();
|
||||
|
||||
expect(await worker.rpc("eth_accounts", SITE)).toEqual({
|
||||
result: [ADDRESS],
|
||||
});
|
||||
expect(await worker.rpc("eth_requestAccounts", SITE)).toEqual({
|
||||
result: [ADDRESS],
|
||||
});
|
||||
});
|
||||
|
||||
test("is still listed under Connected Sites in Settings", async () => {
|
||||
const { worker } = await connectedThenRestarted();
|
||||
|
||||
expect(
|
||||
await worker.fromPopup({ type: "AUTISTMASK_GET_CONNECTED_SITES" }),
|
||||
).toEqual([SITE]);
|
||||
});
|
||||
|
||||
test("may still ask for a signature", async () => {
|
||||
// Refused with 4100 before the fix. Allowed, it raises the signing
|
||||
// prompt and waits on the user.
|
||||
const { worker } = await connectedThenRestarted();
|
||||
|
||||
const response = await worker.rpc("personal_sign", SITE, [
|
||||
"0x48656c6c6f",
|
||||
ADDRESS,
|
||||
]);
|
||||
|
||||
expect(response).toBeNull();
|
||||
expect(worker.windowsCreated).toHaveLength(1);
|
||||
});
|
||||
|
||||
test("is not connected after the browser restarts", async () => {
|
||||
// The browser empties session storage when it closes; the wallet's
|
||||
// own storage keeps nothing of the connection.
|
||||
const { storage } = await connectedThenRestarted();
|
||||
const afterBrowserRestart = startWorker(
|
||||
makeStorageStub({ autistmask: storage.read("autistmask") }),
|
||||
);
|
||||
|
||||
expect(await afterBrowserRestart.rpc("eth_accounts", SITE)).toEqual({
|
||||
result: [],
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("each way a connection allowed without Remember ends, after the worker restarts", () => {
|
||||
test("removing the site in Settings", async () => {
|
||||
const { worker } = await connectedThenRestarted();
|
||||
expect(await worker.connectWithoutRemember(OTHER_SITE)).toEqual({
|
||||
result: [ADDRESS],
|
||||
});
|
||||
|
||||
await worker.fromPopup({
|
||||
type: "AUTISTMASK_REMOVE_SITE",
|
||||
origin: SITE,
|
||||
});
|
||||
|
||||
expect(await worker.rpc("eth_accounts", SITE)).toEqual({ result: [] });
|
||||
expect(worker.sentToTabs).toEqual([
|
||||
{
|
||||
type: "AUTISTMASK_EVENT",
|
||||
eventName: "accountsChanged",
|
||||
data: [],
|
||||
},
|
||||
]);
|
||||
expect(
|
||||
await worker.fromPopup({ type: "AUTISTMASK_GET_CONNECTED_SITES" }),
|
||||
).toEqual([OTHER_SITE]);
|
||||
expect(await worker.rpc("eth_accounts", OTHER_SITE)).toEqual({
|
||||
result: [ADDRESS],
|
||||
});
|
||||
});
|
||||
|
||||
test("switching to another address", async () => {
|
||||
// Switched away and back again, so the answer turns on the connection
|
||||
// having ended rather than on which address is active.
|
||||
const { storage, worker } = await connectedThenRestarted();
|
||||
const switched = { ...storage.read("autistmask") };
|
||||
|
||||
switched.activeAddress = OTHER_ADDRESS;
|
||||
storage.write("autistmask", switched);
|
||||
await worker.fromPopup({ type: "AUTISTMASK_ACTIVE_CHANGED" });
|
||||
switched.activeAddress = ADDRESS;
|
||||
storage.write("autistmask", switched);
|
||||
|
||||
expect(await worker.rpc("eth_accounts", SITE)).toEqual({ result: [] });
|
||||
expect(
|
||||
await worker.fromPopup({ type: "AUTISTMASK_GET_CONNECTED_SITES" }),
|
||||
).toEqual([]);
|
||||
});
|
||||
|
||||
// The two below ask while storage still names the removed address as
|
||||
// active, because the popup has not saved yet, so the answer turns on the
|
||||
// connection alone.
|
||||
test("removing the connected address", async () => {
|
||||
const { storage, worker } = await connectedThenRestarted();
|
||||
|
||||
const popupState = storage.read("autistmask");
|
||||
expect(removeAddressFromState(popupState, 0, 0).removed).toBe(true);
|
||||
await settle();
|
||||
|
||||
expect(await worker.rpc("eth_accounts", SITE)).toEqual({ result: [] });
|
||||
});
|
||||
|
||||
test("removing the wallet holding the connected address", async () => {
|
||||
const { storage, worker } = await connectedThenRestarted();
|
||||
|
||||
removeWalletFromState(storage.read("autistmask"), 0);
|
||||
await settle();
|
||||
|
||||
expect(await worker.rpc("eth_accounts", SITE)).toEqual({ result: [] });
|
||||
});
|
||||
|
||||
test("removing a different address leaves it connected", async () => {
|
||||
const { storage, worker } = await connectedThenRestarted();
|
||||
|
||||
const popupState = storage.read("autistmask");
|
||||
expect(removeAddressFromState(popupState, 0, 1).removed).toBe(true);
|
||||
await settle();
|
||||
|
||||
expect(await worker.rpc("eth_accounts", SITE)).toEqual({
|
||||
result: [ADDRESS],
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -259,36 +259,6 @@ describe("reaching the screen", () => {
|
||||
});
|
||||
});
|
||||
|
||||
// Both screens tell the user what they need to get the wallet back, and a
|
||||
// key or xprv wallet has no recovery phrase: telling its owner to rely on
|
||||
// one sends them looking for words that do not exist
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/529).
|
||||
describe("what the screens say the wallet's backup is", () => {
|
||||
test.each([
|
||||
["hd", "recovery phrase"],
|
||||
["key", "private key"],
|
||||
["xprv", "extended private key"],
|
||||
])(
|
||||
"a wallet of type %s is told about its %s",
|
||||
async (type, keyMaterial) => {
|
||||
const { deleteWallet, state } = load();
|
||||
state.wallets[1].type = type;
|
||||
|
||||
deleteWallet.show(1);
|
||||
expect(state.currentView).toBe("delete-wallet-confirm");
|
||||
expect(node("delete-wallet-key-material").textContent).toBe(
|
||||
keyMaterial,
|
||||
);
|
||||
|
||||
await click("btn-delete-wallet-lost-password");
|
||||
expect(state.currentView).toBe(VIEW);
|
||||
expect(node("delete-wallet-lost-key-material").textContent).toBe(
|
||||
keyMaterial,
|
||||
);
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
describe("the typed confirmation", () => {
|
||||
test("a name that is not the wallet's deletes nothing", async () => {
|
||||
const { deleteWallet, state, storage } = load();
|
||||
|
||||
@@ -1,29 +1,25 @@
|
||||
// A loopback dApp origin and stub Ethereum node, used by the two browser
|
||||
// programs that have no Playwright to answer the browser's requests for them:
|
||||
// the Firefox suite (tests/e2e/firefox/run.js) and the Chrome program that
|
||||
// leaves approvals open for seven minutes (tests/e2e/slowApproval.js). The
|
||||
// Chrome suite in run.js answers its requests through network.js instead.
|
||||
// A loopback dApp origin and stub Ethereum node for the Firefox suite.
|
||||
//
|
||||
// The Firefox container runs with --network none, and the harness note in
|
||||
// firefox/driver.js records the consequence: with no http:// origin in reach,
|
||||
// no content script was ever injected, so content-script behaviour was
|
||||
// driver.js records the consequence: with no http:// origin in reach, no
|
||||
// content script was ever injected, so content-script behaviour was
|
||||
// UNVERIFIED and the dApp flows could not be driven at all.
|
||||
//
|
||||
// --network none removes every interface except loopback, and loopback is
|
||||
// enough. This serves the page and the JSON-RPC endpoint from 127.0.0.1
|
||||
// inside the same container the browser runs in, so the dApp round trips
|
||||
// execute against a real http:// origin and the run stays as offline as it
|
||||
// was: the only reachable peer is this process.
|
||||
// inside the same container Firefox runs in, so the dApp round trips execute
|
||||
// against a real http:// origin and the run stays as offline as it was: the
|
||||
// only reachable peer is this process.
|
||||
//
|
||||
// The page itself is not written twice. DAPP_HTML comes from the Chrome
|
||||
// suite's fixture, so every browser program drives the same __dapp API and
|
||||
// the same message log.
|
||||
// suite's fixture, so both harnesses drive the same __dapp API and the same
|
||||
// message log.
|
||||
//
|
||||
// Unlike firefox/driver.js this file does use ethers, and it has to: the node
|
||||
// has to answer eth_sendRawTransaction with the hash ethers computes for the
|
||||
// Unlike driver.js this file does use ethers, and it has to: the node has to
|
||||
// answer eth_sendRawTransaction with the hash ethers computes for the
|
||||
// artifact it was handed, or provider.broadcastTransaction() refuses the
|
||||
// answer, and both programs recover signatures themselves rather than
|
||||
// believing the extension's own verdict.
|
||||
// answer, and the suite recovers signatures itself rather than believing the
|
||||
// extension's own verdict.
|
||||
|
||||
"use strict";
|
||||
|
||||
@@ -31,7 +27,7 @@ const http = require("http");
|
||||
|
||||
const { Transaction } = require("ethers");
|
||||
|
||||
const { DAPP_HTML } = require("./network");
|
||||
const { DAPP_HTML } = require("../network");
|
||||
|
||||
// The same fee shape the Chrome suite uses, for the same reason: it has to
|
||||
// pass the ceilings in src/shared/approvalVerify.js and it has to leave the
|
||||
@@ -174,11 +170,11 @@ async function startDappServer() {
|
||||
const payload = JSON.stringify(handleRpcBody(body, state));
|
||||
res.writeHead(200, {
|
||||
"Content-Type": "application/json",
|
||||
// In Firefox the extension fetches this from its
|
||||
// background page, whose origin is moz-extension://.
|
||||
// Without CORS the fetch fails and every transaction
|
||||
// assertion fails for a reason that has nothing to do
|
||||
// with the wallet.
|
||||
// The extension fetches this from its background
|
||||
// page, whose origin is moz-extension://. Without CORS
|
||||
// the fetch fails and every transaction assertion
|
||||
// fails for a reason that has nothing to do with the
|
||||
// wallet.
|
||||
"Access-Control-Allow-Origin": "*",
|
||||
});
|
||||
res.end(payload);
|
||||
@@ -197,8 +193,8 @@ async function startDappServer() {
|
||||
}
|
||||
|
||||
// An empty favicon rather than a 404: a 404 is a page error in
|
||||
// Firefox's console under some settings, and the Firefox suite fails
|
||||
// the run on those.
|
||||
// Firefox's console under some settings, and the suite fails the run
|
||||
// on those.
|
||||
if (url.pathname === "/favicon.ico") {
|
||||
res.writeHead(200, { "Content-Type": "image/x-icon" });
|
||||
res.end("");
|
||||
@@ -467,7 +467,7 @@ class Driver {
|
||||
// src/background/index.js, which kills the background page outright, fails
|
||||
// the run.
|
||||
//
|
||||
// Content scripts ARE now exercised: tests/e2e/dapp.js serves a page
|
||||
// Content scripts ARE now exercised: tests/e2e/firefox/dapp.js serves a page
|
||||
// from loopback, which survives --network none, and the suite drives the
|
||||
// EIP-1193 round trips through the content script injected into it. What is
|
||||
// still unproven is the CAPTURE, not the execution — no probe has forced a
|
||||
|
||||
@@ -17,13 +17,13 @@
|
||||
// note in driver.js), so the two backends have no common substrate to
|
||||
// abstract over. Duplicated steps do not pay for a shim; revisit if this
|
||||
// suite grows to where they do. What IS shared is the dApp page fixture
|
||||
// itself — DAPP_HTML, served here from loopback by tests/e2e/dapp.js — so an
|
||||
// assertion about the __dapp API means the same thing on both browsers.
|
||||
// itself — DAPP_HTML, served here from loopback by dapp.js — so an assertion
|
||||
// about the __dapp API means the same thing on both browsers.
|
||||
//
|
||||
// The dApp steps need an http:// origin, which --network none was thought to
|
||||
// rule out. It does not: loopback survives it, so the page and the stub node
|
||||
// are served from 127.0.0.1 inside the container and the run reaches nothing
|
||||
// but this process. See tests/e2e/dapp.js.
|
||||
// but this process. See tests/e2e/firefox/dapp.js.
|
||||
//
|
||||
// LIMITATION, and the difference from the Chrome suite worth knowing: error
|
||||
// capture here is POLL-BASED, not event-streamed. The console service is
|
||||
@@ -61,7 +61,7 @@ const {
|
||||
} = require("ethers");
|
||||
|
||||
const { ConsoleErrors, EXTENSION_ORIGIN, start, sleep } = require("./driver");
|
||||
const { startDappServer } = require("../dapp");
|
||||
const { startDappServer } = require("./dapp");
|
||||
const { STUB_COUNTERPARTY } = require("../network");
|
||||
const { NETWORKS } = require("../../../src/shared/networks");
|
||||
const {
|
||||
@@ -394,26 +394,6 @@ async function waitForApprovalWindow(d, timeout = 30000) {
|
||||
}
|
||||
}
|
||||
|
||||
// Firefox keeps one zoom per site, so a zoom set on the popup's tab holds for
|
||||
// every page of the extension, the approval windows included.
|
||||
async function setExtensionZoom(env, zoom) {
|
||||
const d = env.driver;
|
||||
await d.switchToWindow(env.popupWindow);
|
||||
const outcome = await d.executeAsync(
|
||||
`const done = arguments[arguments.length - 1];
|
||||
const zoom = arguments[0];
|
||||
browser.tabs
|
||||
.getCurrent()
|
||||
.then((tab) => browser.tabs.setZoom(tab.id, zoom))
|
||||
.then(() => done({}), (e) => done({ error: String(e) }));`,
|
||||
[zoom],
|
||||
);
|
||||
assert(
|
||||
outcome && !outcome.error,
|
||||
"could not set the extension's zoom: " + (outcome && outcome.error),
|
||||
);
|
||||
}
|
||||
|
||||
function startRequest(d, key, method, params) {
|
||||
return d.execute(
|
||||
"window.__dapp.start(arguments[0], arguments[1], arguments[2]);" +
|
||||
@@ -653,14 +633,6 @@ step(
|
||||
"personal_sign returns a signature that recovers to the address",
|
||||
async (env) => {
|
||||
const d = env.driver;
|
||||
// The window is opened as wide as the page, and widened once the
|
||||
// screen is up if it still scrolls sideways
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/518). This suite is
|
||||
// where that is checked: the Chrome suite's approval windows open at
|
||||
// 1280x720 whatever width the extension asks for. At 170%, one of
|
||||
// Firefox's zoom steps, the page is drawn a little larger than the
|
||||
// 1.7 Firefox reports, so a single widening leaves it a pixel short.
|
||||
await setExtensionZoom(env, 1.7);
|
||||
await d.switchToWindow(env.dappWindow);
|
||||
await startRequest(d, "sign", "personal_sign", [SIGN_HEX, env.address]);
|
||||
|
||||
@@ -668,12 +640,6 @@ step(
|
||||
await d.switchToWindow(popup);
|
||||
await d.waitVisible("#view-approve-sign");
|
||||
|
||||
await d.waitFor(
|
||||
"the sign prompt to fit its window without scrolling sideways",
|
||||
"return document.documentElement.scrollWidth <=" +
|
||||
" document.documentElement.clientWidth;",
|
||||
);
|
||||
|
||||
const screen = await d.execute(
|
||||
`return {
|
||||
origin: document.getElementById("approve-sign-origin").textContent,
|
||||
@@ -708,7 +674,6 @@ step(
|
||||
|
||||
await d.switchToWindow(env.dappWindow);
|
||||
const outcome = await settleRequest(d, "sign");
|
||||
await setExtensionZoom(env, 1);
|
||||
assert(
|
||||
outcome.settled === "resolved",
|
||||
"personal_sign did not resolve: " + JSON.stringify(outcome),
|
||||
|
||||
+14
-31
@@ -94,7 +94,7 @@ function word(value) {
|
||||
// is the real inpage provider and not a copy the harness wired up.
|
||||
//
|
||||
// DAPP_HTML below is exported and served verbatim by the Firefox suite too
|
||||
// (tests/e2e/dapp.js), from a loopback origin rather than through a
|
||||
// (tests/e2e/firefox/dapp.js), from a loopback origin rather than through a
|
||||
// route handler. The two suites drive different browsers over different
|
||||
// protocols, but the page they drive — the __dapp API, the message log — is
|
||||
// one fixture, so an assertion written against it means the same thing on
|
||||
@@ -226,9 +226,8 @@ const RPC_RESULTS = {
|
||||
// The "latest" block, which ethers' getFeeData() reads baseFeePerGas from
|
||||
// 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
|
||||
// stop being able to distinguish them. opts.baseFeeWei replaces its base fee,
|
||||
// read at request time like every other fixture switch.
|
||||
function latestBlock(opts) {
|
||||
// stop being able to distinguish them.
|
||||
function latestBlock() {
|
||||
return {
|
||||
hash: "0x" + "11".repeat(32),
|
||||
parentHash: "0x" + "22".repeat(32),
|
||||
@@ -240,26 +239,21 @@ function latestBlock(opts) {
|
||||
gasUsed: "0xf4240",
|
||||
miner: STUB_COUNTERPARTY,
|
||||
extraData: "0x",
|
||||
baseFeePerGas: opts.baseFeeWei || hex(BASE_FEE_WEI),
|
||||
baseFeePerGas: hex(BASE_FEE_WEI),
|
||||
transactions: [],
|
||||
};
|
||||
}
|
||||
|
||||
// keccak("decimals()")[0:4], and the same for symbol(), name() and
|
||||
// balanceOf(address).
|
||||
// keccak("decimals()")[0:4], and the same for symbol() and name().
|
||||
const SELECTOR_DECIMALS = "0x313ce567";
|
||||
const SELECTOR_SYMBOL = "0x95d89b41";
|
||||
const SELECTOR_NAME = "0x06fdde03";
|
||||
const SELECTOR_BALANCE_OF = "0x70a08231";
|
||||
|
||||
// Every eth_call still answers with a zero word except decimals(), symbol(),
|
||||
// name() and balanceOf() on the stub token. The wallet reads decimals() back
|
||||
// at signing time to compare with the scale the confirmation screen rendered
|
||||
// (issue #305). Adding the token by its contract address reads the first three
|
||||
// (issue #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.
|
||||
// Every eth_call still answers with a zero word except decimals(), symbol()
|
||||
// and name() on the stub token. The wallet reads decimals() back at signing
|
||||
// time to compare with the scale the confirmation screen rendered (issue
|
||||
// #305). Adding the token by its contract address reads all three (issue
|
||||
// #295); symbol() and name() answer what the explorer reports for it.
|
||||
//
|
||||
// opts.tokenDecimalsOverride is the lying contract: set it and decimals()
|
||||
// answers something other than the value this same fixture reports through
|
||||
@@ -284,9 +278,6 @@ function ethCallResult(req, opts) {
|
||||
if (data.startsWith(SELECTOR_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;
|
||||
}
|
||||
|
||||
@@ -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.
|
||||
//
|
||||
// The switch (holdBalance, holdGasEstimate, holdTransactionCount or
|
||||
// holdBlockscout) is read here rather than captured, so a test flips it on the
|
||||
// same options object the route was registered with — the same pattern as
|
||||
// seedTokenTransfer. This is
|
||||
// The switch (holdGasEstimate, holdTransactionCount or holdBlockscout) is read
|
||||
// here rather than captured, so a test flips it on the same options object the
|
||||
// route was registered with — the same pattern as seedTokenTransfer. This is
|
||||
// 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
|
||||
// assert nothing on a slow machine.
|
||||
@@ -482,7 +472,7 @@ function rpcReply(req, opts, report) {
|
||||
});
|
||||
}
|
||||
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 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());
|
||||
return route.abort();
|
||||
}
|
||||
if (batch.some((req) => req.method === "eth_getBalance")) {
|
||||
await awaitRelease(opts, "holdBalance", report);
|
||||
}
|
||||
if (batch.some((req) => req.method === "eth_estimateGas")) {
|
||||
await awaitRelease(opts, "holdGasEstimate", report);
|
||||
}
|
||||
@@ -626,12 +613,8 @@ function traceEnabled(raw) {
|
||||
* @param {string} [opts.ethBalanceWei] hex wei answered to eth_getBalance;
|
||||
* defaults to zero, which is what every test that predates the funded
|
||||
* 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
|
||||
* 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
|
||||
* eth_estimateGas until this is cleared again.
|
||||
* @param {boolean} [opts.holdTransactionCount] hold every batch containing an
|
||||
|
||||
+33
-187
@@ -2232,8 +2232,7 @@ function feeEth(wei) {
|
||||
|
||||
// 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
|
||||
// fee block says, how tall the whole view is, and where the password field and
|
||||
// Sign & Send sit in it.
|
||||
// fee block says, and how tall the whole view is.
|
||||
async function confirmState(page) {
|
||||
return page.evaluate(() => {
|
||||
const el = (id) => document.getElementById(id);
|
||||
@@ -2246,12 +2245,6 @@ async function confirmState(page) {
|
||||
};
|
||||
return {
|
||||
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(),
|
||||
balance: el("confirm-balance").textContent.trim(),
|
||||
fee: el("confirm-fee-amount").textContent.trim(),
|
||||
@@ -2260,18 +2253,9 @@ async function confirmState(page) {
|
||||
errors: shown("confirm-errors")
|
||||
? el("confirm-errors").textContent.trim()
|
||||
: "",
|
||||
balanceError: shown("confirm-balance-error")
|
||||
? el("confirm-balance-error").textContent.trim()
|
||||
: "",
|
||||
amountFeeError: shown("confirm-amount-fee-error"),
|
||||
gasError: shown("confirm-gas-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,
|
||||
};
|
||||
});
|
||||
@@ -2287,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) {
|
||||
if (await page.isVisible("#view-confirm-tx")) {
|
||||
await page.click("#btn-confirm-back");
|
||||
@@ -2308,14 +2282,13 @@ async function backToAddress(page) {
|
||||
await openAddressDetail(page);
|
||||
}
|
||||
|
||||
// Drive the popup to the confirmation screen for one send, and return as soon
|
||||
// as the screen is shown, its balance read still in flight.
|
||||
// Drive the popup to the confirmation screen for one send.
|
||||
//
|
||||
// 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 —
|
||||
// rather than for a refresh to have probably landed — is what keeps every
|
||||
// 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 page.click("#btn-send");
|
||||
await visible(page, "#view-send");
|
||||
@@ -2330,14 +2303,6 @@ async function openConfirm(page, { token, balance, amount }) {
|
||||
await page.fill("#send-amount", amount);
|
||||
await page.click("#btn-send-review");
|
||||
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");
|
||||
}
|
||||
|
||||
@@ -2413,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",
|
||||
);
|
||||
assert(
|
||||
!st.amountFeeError &&
|
||||
!st.gasError &&
|
||||
st.errors === "" &&
|
||||
st.balanceError === "",
|
||||
!st.amountFeeError && !st.gasError && st.errors === "",
|
||||
"a balance message is shown before the fee is known",
|
||||
);
|
||||
});
|
||||
@@ -2447,7 +2409,6 @@ test("ConfirmTx enables Send once the estimate lands, quoting both numbers (#238
|
||||
);
|
||||
assert(
|
||||
st.errors === "" &&
|
||||
st.balanceError === "" &&
|
||||
!st.amountFeeError &&
|
||||
!st.gasError &&
|
||||
!st.feeUnknownError,
|
||||
@@ -2514,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
|
||||
// read brings must already hold its space when the read returns (#558).
|
||||
test("ConfirmTx refuses a send that exceeds the balance outright, and nothing moves when the balance arrives (#238)", async (env) => {
|
||||
env.routeOpts.holdBalance = true;
|
||||
let reading;
|
||||
try {
|
||||
await openConfirm(env.page, {
|
||||
test("ConfirmTx refuses a send that exceeds the balance outright (#238)", async (env) => {
|
||||
await goToConfirm(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);
|
||||
|
||||
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 =
|
||||
"Your ETH balance does not cover this amount. Please go back and" +
|
||||
" send a smaller amount.";
|
||||
"Insufficient balance. You have " +
|
||||
FUNDED_ETH_TEXT +
|
||||
" ETH but are trying to send " +
|
||||
OVER_BALANCE_AMOUNT +
|
||||
" ETH.";
|
||||
assert(
|
||||
st.balanceError === want,
|
||||
"wrong over-balance message: " + JSON.stringify(st.balanceError),
|
||||
st.errors === want,
|
||||
"wrong over-balance message: " + JSON.stringify(st.errors),
|
||||
);
|
||||
assert(st.sendDisabled, "Send is enabled for a send that exceeds balance");
|
||||
assert(
|
||||
!st.amountFeeError,
|
||||
"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) => {
|
||||
@@ -2605,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",
|
||||
);
|
||||
assert(
|
||||
!st.amountFeeError &&
|
||||
!st.gasError &&
|
||||
st.errors === "" &&
|
||||
st.balanceError === "",
|
||||
!st.amountFeeError && !st.gasError && st.errors === "",
|
||||
"a balance message is shown for an estimate that simply failed",
|
||||
);
|
||||
assert(
|
||||
@@ -2699,19 +2633,21 @@ test("ConfirmTx refuses an ERC-20 send that exceeds the token balance (#238)", a
|
||||
await waitForEstimate(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 =
|
||||
"Your " +
|
||||
"Insufficient " +
|
||||
STUB_TOKEN.symbol +
|
||||
" balance does not cover this amount. Please go back and send a" +
|
||||
" smaller amount.";
|
||||
" balance. You have " +
|
||||
TOKEN_BALANCE_TEXT +
|
||||
" " +
|
||||
STUB_TOKEN.symbol +
|
||||
" but are trying to send " +
|
||||
OVER_TOKEN_AMOUNT +
|
||||
" " +
|
||||
STUB_TOKEN.symbol +
|
||||
".";
|
||||
assert(
|
||||
st.balanceError === want,
|
||||
"wrong over-token-balance message: " + JSON.stringify(st.balanceError),
|
||||
st.errors === want,
|
||||
"wrong over-token-balance message: " + JSON.stringify(st.errors),
|
||||
);
|
||||
assert(
|
||||
st.sendDisabled,
|
||||
@@ -2767,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",
|
||||
);
|
||||
assert(
|
||||
st.errors === "" && st.balanceError === "",
|
||||
st.errors === "",
|
||||
"a token-balance message is shown for a transfer the token balance covers: " +
|
||||
JSON.stringify(st.errors + st.balanceError),
|
||||
JSON.stringify(st.errors),
|
||||
);
|
||||
assert(
|
||||
st.height === env.erc20PendingHeight,
|
||||
@@ -2915,10 +2851,9 @@ async function goToTokenConfirm(env) {
|
||||
amount: TOKEN_AMOUNT,
|
||||
});
|
||||
await waitForEstimate(env.page);
|
||||
// TOKEN_AMOUNT to four decimal places (README.md, Display Consistency).
|
||||
const shown = await shownAmount(env.page);
|
||||
assert(
|
||||
shown === "0.2500 " + STUB_TOKEN.symbol,
|
||||
shown === TOKEN_AMOUNT + " " + STUB_TOKEN.symbol,
|
||||
"the confirmation screen is not showing the amount that was entered: " +
|
||||
JSON.stringify(shown),
|
||||
);
|
||||
@@ -3068,91 +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);
|
||||
}
|
||||
});
|
||||
|
||||
// ------------------------------ the wait for a receipt ending in error (#315)
|
||||
//
|
||||
// README.md (WaitTx) documents two ways the wait ends on the error screen: a
|
||||
@@ -4007,12 +3857,11 @@ test("eth_requestAccounts approved returns the selected address (#183)", async (
|
||||
shown.toLowerCase().includes(env.expectedAddress.toLowerCase()),
|
||||
"the site prompt shows the wrong address: " + JSON.stringify(shown),
|
||||
);
|
||||
// The text above is there even when the row is too narrow to show it
|
||||
// all; this measures that the whole address is visible (#517).
|
||||
await assertAddressesFit(popup, "the connection prompt");
|
||||
|
||||
// Remembered, because the sign and transaction tests below all
|
||||
// require the origin to still be authorized.
|
||||
// Remembered, so the connection survives a background worker that MV3
|
||||
// terminates after 30 seconds idle. The in-memory connectedSites map
|
||||
// does not, and the sign and transaction tests below all require the
|
||||
// origin to still be authorized.
|
||||
await popup.check("#approve-remember");
|
||||
await clickAndClose(popup, "#btn-approve");
|
||||
|
||||
@@ -5009,9 +4858,6 @@ async function main() {
|
||||
seedTokenBalance: false,
|
||||
ethBalanceWei: null,
|
||||
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,
|
||||
// Whether a JSON-RPC batch asking for a transaction count is held
|
||||
// unanswered: the address scan after creating a wallet (#475).
|
||||
|
||||
@@ -1,549 +0,0 @@
|
||||
// A transaction approval and a signature approval the user leaves open for
|
||||
// seven minutes, their windows minimized, are still answered, and the site
|
||||
// receives both results (https://git.eeqj.de/sneak/AutistMask/issues/540).
|
||||
//
|
||||
// Both approvals, and the site's requests waiting on them, live only in the
|
||||
// background worker's memory. With nothing else going on, Chrome stopped that
|
||||
// worker about six minutes after the site's request, while the window was
|
||||
// still open, and the user's answer then reached nobody. While an approval is
|
||||
// pending, the worker now makes an extension call every 20 seconds, which
|
||||
// keeps it running (addPendingApproval() in src/background/index.js). The
|
||||
// windows are minimized for the wait because
|
||||
// Chrome slows a hidden page's timers to once a minute after a few minutes,
|
||||
// so anything the window itself did to keep the worker running would fail
|
||||
// here.
|
||||
//
|
||||
// A separate program from run.js, and not driven by Playwright: Playwright
|
||||
// keeps DevTools attached to the background worker, and Chrome never stops a
|
||||
// worker DevTools is attached to, so in run.js the worker outlives any wait
|
||||
// and a wait there proves nothing. This program starts Chromium itself and
|
||||
// speaks the DevTools protocol over the pipe Chromium opens for it
|
||||
// (--remote-debugging-pipe), attaching to pages only, never to the worker.
|
||||
// Before the approvals are raised it watches the worker stop on its own, so a
|
||||
// run in which something else keeps the worker running cannot pass.
|
||||
//
|
||||
// The site is connected without "Remember", and once the worker has stopped
|
||||
// the program requires the site still to be told the address: such a
|
||||
// connection used to be held in the worker's memory and ended with it
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/526).
|
||||
//
|
||||
// The dApp page and the stub node are the loopback ones the Firefox suite also
|
||||
// uses (tests/e2e/dapp.js). The site is connected and the node chosen
|
||||
// through the extension's own screens, so nothing is written to its storage
|
||||
// from outside.
|
||||
//
|
||||
// Run through script/test-e2e, which builds the extension and the pinned
|
||||
// container.
|
||||
//
|
||||
// node tests/e2e/slowApproval.js
|
||||
|
||||
"use strict";
|
||||
|
||||
const fs = require("fs");
|
||||
const os = require("os");
|
||||
const path = require("path");
|
||||
const { spawn } = require("child_process");
|
||||
|
||||
const { chromium } = require("playwright-core");
|
||||
const {
|
||||
Transaction,
|
||||
getAddress,
|
||||
getBytes,
|
||||
hexlify,
|
||||
parseEther,
|
||||
toQuantity,
|
||||
toUtf8Bytes,
|
||||
verifyMessage,
|
||||
} = require("ethers");
|
||||
|
||||
const { PASSWORD } = require("./harness");
|
||||
const { STUB_COUNTERPARTY } = require("./network");
|
||||
const { startDappServer } = require("./dapp");
|
||||
|
||||
const DIST_CHROME = path.resolve(__dirname, "..", "..", "dist", "chrome");
|
||||
|
||||
// Chrome stopped the worker six minutes after the site's request when nothing
|
||||
// kept it running, so the approvals are left open for longer than that.
|
||||
const APPROVAL_WAIT_MS = 7 * 60 * 1000;
|
||||
|
||||
// With nothing pending, Chrome stops the worker 30 seconds after its last
|
||||
// event; this is how long the program waits to see that.
|
||||
const IDLE_STOP_TIMEOUT_MS = 90000;
|
||||
|
||||
const SIGN_HEX = hexlify(toUtf8Bytes("AutistMask e2e: a slow signature"));
|
||||
|
||||
const checks = [];
|
||||
let failed = 0;
|
||||
|
||||
function check(name, cond, detail) {
|
||||
checks.push(name);
|
||||
if (cond) {
|
||||
console.log("ok " + checks.length + " - " + name);
|
||||
} else {
|
||||
failed += 1;
|
||||
console.log("not ok " + checks.length + " - " + name);
|
||||
if (detail) console.log(" " + detail);
|
||||
}
|
||||
}
|
||||
|
||||
function sleep(ms) {
|
||||
return new Promise((resolve) => setTimeout(resolve, ms));
|
||||
}
|
||||
|
||||
// Poll `probe` until it returns something truthy, and return that.
|
||||
async function until(what, probe, timeout = 30000) {
|
||||
const deadline = Date.now() + timeout;
|
||||
for (;;) {
|
||||
const value = await probe().catch(() => null);
|
||||
if (value) return value;
|
||||
if (Date.now() > deadline) {
|
||||
throw new Error(
|
||||
"gave up after " + timeout + "ms waiting for " + what,
|
||||
);
|
||||
}
|
||||
await sleep(250);
|
||||
}
|
||||
}
|
||||
|
||||
// The DevTools protocol over Chromium's pipe: commands go to its fd 3, and
|
||||
// replies and events come back on its fd 4, each one JSON message ended by a
|
||||
// NUL byte. Events are not used and are dropped. Returns send(method, params,
|
||||
// sessionId), which resolves with the command's result.
|
||||
function devtools(browser) {
|
||||
const waiting = new Map();
|
||||
let nextId = 1;
|
||||
let pending = "";
|
||||
const replies = browser.stdio[4];
|
||||
replies.setEncoding("utf8");
|
||||
replies.on("data", (chunk) => {
|
||||
pending += chunk;
|
||||
let end;
|
||||
while ((end = pending.indexOf("\0")) !== -1) {
|
||||
const message = JSON.parse(pending.slice(0, end));
|
||||
pending = pending.slice(end + 1);
|
||||
const caller = waiting.get(message.id);
|
||||
if (!caller) continue;
|
||||
waiting.delete(message.id);
|
||||
if (message.error) {
|
||||
caller.reject(
|
||||
new Error(caller.method + ": " + message.error.message),
|
||||
);
|
||||
} else {
|
||||
caller.resolve(message.result);
|
||||
}
|
||||
}
|
||||
});
|
||||
replies.on("close", () => {
|
||||
for (const caller of waiting.values()) {
|
||||
caller.reject(new Error("the browser exited"));
|
||||
}
|
||||
waiting.clear();
|
||||
});
|
||||
return (method, params = {}, sessionId) =>
|
||||
new Promise((resolve, reject) => {
|
||||
const id = nextId++;
|
||||
waiting.set(id, { method, resolve, reject });
|
||||
browser.stdio[3].write(
|
||||
JSON.stringify({ id, method, params, sessionId }) + "\0",
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
// Attach to a page and return a function that evaluates an expression in it,
|
||||
// awaiting a promise it returns, and resolves with the value.
|
||||
async function attach(send, targetId) {
|
||||
const { sessionId } = await send("Target.attachToTarget", {
|
||||
targetId,
|
||||
flatten: true,
|
||||
});
|
||||
return async (expression) => {
|
||||
const r = await send(
|
||||
"Runtime.evaluate",
|
||||
{ expression, awaitPromise: true, returnByValue: true },
|
||||
sessionId,
|
||||
);
|
||||
if (r.exceptionDetails) {
|
||||
throw new Error(
|
||||
"evaluating " +
|
||||
expression.slice(0, 80) +
|
||||
" threw: " +
|
||||
JSON.stringify(r.exceptionDetails.exception || {}),
|
||||
);
|
||||
}
|
||||
return r.result.value;
|
||||
};
|
||||
}
|
||||
|
||||
// Whether the page has loaded and shows the element with this id: the
|
||||
// `hidden` class showView() keeps on every other view is on neither it nor
|
||||
// anything around it.
|
||||
function shows(id) {
|
||||
return (
|
||||
"document.readyState === 'complete' &&" +
|
||||
" !!document.getElementById(" +
|
||||
JSON.stringify(id) +
|
||||
") && !document.getElementById(" +
|
||||
JSON.stringify(id) +
|
||||
").closest('.hidden')"
|
||||
);
|
||||
}
|
||||
|
||||
// Set an input's value and fire the input event typing would fire.
|
||||
function typeInto(id, value) {
|
||||
return (
|
||||
"(() => { const el = document.getElementById(" +
|
||||
JSON.stringify(id) +
|
||||
"); el.value = " +
|
||||
JSON.stringify(value) +
|
||||
"; el.dispatchEvent(new Event('input', { bubbles: true })); })()"
|
||||
);
|
||||
}
|
||||
|
||||
function click(id) {
|
||||
return "document.getElementById(" + JSON.stringify(id) + ").click()";
|
||||
}
|
||||
|
||||
// The outcome of a request the dApp page started with __dapp.start(), or
|
||||
// {settled: "pending"} if it has not settled within `timeout`.
|
||||
function settled(key, timeout = 30000) {
|
||||
return (
|
||||
"Promise.race([window.__dapp.settle(" +
|
||||
JSON.stringify(key) +
|
||||
"), new Promise((r) => setTimeout(() => r({ settled: 'pending' }), " +
|
||||
timeout +
|
||||
"))])"
|
||||
);
|
||||
}
|
||||
|
||||
async function main() {
|
||||
if (!fs.existsSync(path.join(DIST_CHROME, "manifest.json"))) {
|
||||
console.error(
|
||||
"slowApproval: no unpacked build at " +
|
||||
DIST_CHROME +
|
||||
" — run make build first",
|
||||
);
|
||||
process.exitCode = 1;
|
||||
return;
|
||||
}
|
||||
|
||||
const node = await startDappServer();
|
||||
const profile = fs.mkdtempSync(
|
||||
path.join(os.tmpdir(), "autistmask-slow-approval-"),
|
||||
);
|
||||
const browser = spawn(
|
||||
chromium.executablePath(),
|
||||
[
|
||||
"--headless",
|
||||
// The container runs unprivileged, as in harness.js.
|
||||
"--no-sandbox",
|
||||
"--remote-debugging-pipe",
|
||||
"--user-data-dir=" + profile,
|
||||
"--disable-extensions-except=" + DIST_CHROME,
|
||||
"--load-extension=" + DIST_CHROME,
|
||||
// Nothing but the loopback dApp page and stub node can be reached.
|
||||
"--host-resolver-rules=MAP * ~NOTFOUND, EXCLUDE 127.0.0.1",
|
||||
"about:blank",
|
||||
],
|
||||
{ stdio: ["ignore", "ignore", "ignore", "pipe", "pipe"] },
|
||||
);
|
||||
|
||||
try {
|
||||
const send = devtools(browser);
|
||||
const targets = async () =>
|
||||
(await send("Target.getTargets")).targetInfos;
|
||||
|
||||
const worker = await until("the background worker", async () =>
|
||||
(await targets()).find(
|
||||
(t) =>
|
||||
t.type === "service_worker" &&
|
||||
t.url.startsWith("chrome-extension://"),
|
||||
),
|
||||
);
|
||||
// The extension id is the host of the worker's URL, as in harness.js.
|
||||
const popupUrl =
|
||||
"chrome-extension://" +
|
||||
new URL(worker.url).host +
|
||||
"/src/popup/index.html";
|
||||
const workerRunning = async () =>
|
||||
(await targets()).some((t) => t.url === worker.url);
|
||||
const openPage = async (url) => {
|
||||
const { targetId } = await send("Target.createTarget", { url });
|
||||
return { targetId, evaluate: await attach(send, targetId) };
|
||||
};
|
||||
const approvalPages = async () =>
|
||||
(await targets()).filter(
|
||||
(t) => t.type === "page" && t.url.includes("?approval="),
|
||||
);
|
||||
|
||||
// A wallet, through the popup's own screens, and the stub node as its
|
||||
// RPC endpoint, through Settings.
|
||||
const popup = await openPage(popupUrl);
|
||||
await until("the welcome screen", () =>
|
||||
popup.evaluate(shows("view-welcome")),
|
||||
);
|
||||
await popup.evaluate(click("btn-welcome-add"));
|
||||
await until("the add wallet screen", () =>
|
||||
popup.evaluate(shows("view-add-wallet")),
|
||||
);
|
||||
await popup.evaluate(click("btn-generate-phrase"));
|
||||
await until("a generated recovery phrase", () =>
|
||||
popup.evaluate(
|
||||
"document.getElementById('wallet-mnemonic').value.trim()" +
|
||||
".split(/\\s+/).length >= 12",
|
||||
),
|
||||
);
|
||||
await popup.evaluate(typeInto("add-wallet-password", PASSWORD));
|
||||
await popup.evaluate(typeInto("add-wallet-password-confirm", PASSWORD));
|
||||
await popup.evaluate(click("btn-add-wallet-confirm"));
|
||||
await until(
|
||||
"the main screen",
|
||||
() => popup.evaluate(shows("view-main")),
|
||||
60000,
|
||||
);
|
||||
await popup.evaluate(click("btn-settings"));
|
||||
await until("the settings screen", () =>
|
||||
popup.evaluate(shows("view-settings")),
|
||||
);
|
||||
await popup.evaluate(typeInto("settings-rpc", node.rpcUrl));
|
||||
await popup.evaluate(click("btn-save-rpc"));
|
||||
await until("the stub node saved as the RPC endpoint", () =>
|
||||
popup.evaluate(
|
||||
"new Promise((resolve) => chrome.storage.local.get(" +
|
||||
"'autistmask', (r) => resolve(r.autistmask.rpcUrl === " +
|
||||
JSON.stringify(node.rpcUrl) +
|
||||
")))",
|
||||
),
|
||||
);
|
||||
await send("Target.closeTarget", { targetId: popup.targetId });
|
||||
|
||||
// The site, connected through the real prompt without "Remember", so
|
||||
// the connection is one that has to outlive the worker stopping below.
|
||||
const dapp = await openPage(node.url);
|
||||
await until("the injected provider", () =>
|
||||
dapp.evaluate("!!window.ethereum && !!window.__dapp"),
|
||||
);
|
||||
await dapp.evaluate(
|
||||
"window.__dapp.start('accounts', 'eth_requestAccounts', [])",
|
||||
);
|
||||
const prompt = await until(
|
||||
"the connection prompt",
|
||||
async () => (await approvalPages())[0],
|
||||
);
|
||||
const inPrompt = await attach(send, prompt.targetId);
|
||||
await until("the connection prompt's screen", () =>
|
||||
inPrompt(shows("view-approve-site")),
|
||||
);
|
||||
await inPrompt(
|
||||
"document.getElementById('approve-remember').checked = false",
|
||||
);
|
||||
// The prompt closes itself on the click.
|
||||
await inPrompt(click("btn-approve")).catch(() => {});
|
||||
const accounts = await dapp.evaluate(settled("accounts"));
|
||||
if (accounts.settled !== "resolved") {
|
||||
throw new Error(
|
||||
"the site could not be connected: " + JSON.stringify(accounts),
|
||||
);
|
||||
}
|
||||
const address = getAddress(accounts.result[0]);
|
||||
console.log("# address " + address + ", site " + node.origin);
|
||||
|
||||
// The control: with nothing pending, the worker stops on its own.
|
||||
// Were something else keeping it running, the wait below would
|
||||
// prove nothing.
|
||||
const idleStart = Date.now();
|
||||
const stoppedWhenIdle = await until(
|
||||
"the idle worker to stop",
|
||||
async () => !(await workerRunning()),
|
||||
IDLE_STOP_TIMEOUT_MS,
|
||||
).catch(() => false);
|
||||
check(
|
||||
"with nothing pending, Chrome stops the background worker on its own",
|
||||
stoppedWhenIdle,
|
||||
"the worker was still running " +
|
||||
IDLE_STOP_TIMEOUT_MS / 1000 +
|
||||
"s after its last event, so something other than the " +
|
||||
"approval windows is keeping it running",
|
||||
);
|
||||
console.log(
|
||||
"# idle worker stopped after " +
|
||||
Math.round((Date.now() - idleStart) / 1000) +
|
||||
"s",
|
||||
);
|
||||
|
||||
// The site's request starts the worker again, and the new worker still
|
||||
// has the connection allowed without "Remember"
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/526).
|
||||
const stillConnected = await dapp.evaluate(
|
||||
"window.ethereum.request({ method: 'eth_accounts' })",
|
||||
);
|
||||
check(
|
||||
"a site allowed without Remember is still connected after the worker stopped",
|
||||
Array.isArray(stillConnected) &&
|
||||
stillConnected.length === 1 &&
|
||||
getAddress(stillConnected[0]) === address,
|
||||
"eth_accounts answered " + JSON.stringify(stillConnected),
|
||||
);
|
||||
|
||||
// A transaction approval and a signature approval, both open at once.
|
||||
await dapp.evaluate(
|
||||
"window.__dapp.start('tx', 'eth_sendTransaction', [" +
|
||||
JSON.stringify({
|
||||
from: address,
|
||||
to: STUB_COUNTERPARTY,
|
||||
value: toQuantity(parseEther("0.01")),
|
||||
}) +
|
||||
"])",
|
||||
);
|
||||
await until("the transaction approval window", async () =>
|
||||
(await approvalPages()).length === 1 ? true : null,
|
||||
);
|
||||
await dapp.evaluate(
|
||||
"window.__dapp.start('sign', 'personal_sign', [" +
|
||||
JSON.stringify(SIGN_HEX) +
|
||||
", " +
|
||||
JSON.stringify(address) +
|
||||
"])",
|
||||
);
|
||||
const windows = await until("both approval windows", async () => {
|
||||
const pages = await approvalPages();
|
||||
return pages.length === 2 ? pages : null;
|
||||
});
|
||||
let txWindow = null;
|
||||
let signWindow = null;
|
||||
const windowIds = [];
|
||||
for (const page of windows) {
|
||||
const evaluate = await attach(send, page.targetId);
|
||||
const view = await until("an approval screen", () =>
|
||||
evaluate(
|
||||
"(" +
|
||||
shows("view-approve-tx") +
|
||||
") ? 'tx' : (" +
|
||||
shows("view-approve-sign") +
|
||||
") ? 'sign' : null",
|
||||
),
|
||||
);
|
||||
if (view === "tx") txWindow = evaluate;
|
||||
if (view === "sign") signWindow = evaluate;
|
||||
const { windowId } = await send("Browser.getWindowForTarget", {
|
||||
targetId: page.targetId,
|
||||
});
|
||||
windowIds.push(windowId);
|
||||
}
|
||||
if (!txWindow || !signWindow) {
|
||||
throw new Error("the two windows are not one of each kind");
|
||||
}
|
||||
const setWindowState = (windowState) =>
|
||||
Promise.all(
|
||||
windowIds.map((windowId) =>
|
||||
send("Browser.setWindowBounds", {
|
||||
windowId,
|
||||
bounds: { windowState },
|
||||
}),
|
||||
),
|
||||
);
|
||||
|
||||
// The user minimizes both windows while deciding.
|
||||
await setWindowState("minimized");
|
||||
const bothHidden = await until(
|
||||
"both approval pages hidden",
|
||||
async () =>
|
||||
(await txWindow("document.visibilityState")) === "hidden" &&
|
||||
(await signWindow("document.visibilityState")) === "hidden",
|
||||
).catch(() => false);
|
||||
check(
|
||||
"both approval windows are minimized, and their pages are hidden",
|
||||
bothHidden,
|
||||
"a page still reports itself visible, so the wait below would " +
|
||||
"not show what happens to a minimized approval",
|
||||
);
|
||||
|
||||
// The user takes seven minutes. The worker is checked every two
|
||||
// seconds, and the wait ends early if Chrome stops it.
|
||||
const opened = Date.now();
|
||||
let stoppedAfter = null;
|
||||
while (Date.now() - opened < APPROVAL_WAIT_MS) {
|
||||
if (!(await workerRunning())) {
|
||||
stoppedAfter = Math.round((Date.now() - opened) / 1000);
|
||||
break;
|
||||
}
|
||||
await sleep(2000);
|
||||
}
|
||||
check(
|
||||
"the background worker keeps running while both approvals wait in minimized windows",
|
||||
stoppedAfter === null,
|
||||
"Chrome stopped the worker " +
|
||||
stoppedAfter +
|
||||
"s after the approvals opened",
|
||||
);
|
||||
|
||||
// Back on screen to be answered.
|
||||
await setWindowState("normal");
|
||||
await txWindow(typeInto("approve-tx-password", PASSWORD));
|
||||
await txWindow(click("btn-approve-tx"));
|
||||
await signWindow(typeInto("approve-sign-password", PASSWORD));
|
||||
// The window closes itself once the signature is handed over.
|
||||
await signWindow(click("btn-approve-sign")).catch(() => {});
|
||||
|
||||
const tx = await dapp.evaluate(settled("tx"));
|
||||
const broadcast = node.broadcast.map((raw) => Transaction.from(raw));
|
||||
check(
|
||||
"the transaction approved after seven minutes reaches the site",
|
||||
tx.settled === "resolved" &&
|
||||
broadcast.length === 1 &&
|
||||
tx.result === broadcast[0].hash &&
|
||||
getAddress(broadcast[0].from) === address,
|
||||
"the page got " +
|
||||
JSON.stringify(tx) +
|
||||
" and the node received " +
|
||||
broadcast.length +
|
||||
" transaction(s)",
|
||||
);
|
||||
|
||||
const sign = await dapp.evaluate(settled("sign"));
|
||||
check(
|
||||
"the signature approved after seven minutes reaches the site",
|
||||
sign.settled === "resolved" &&
|
||||
getAddress(verifyMessage(getBytes(SIGN_HEX), sign.result)) ===
|
||||
address,
|
||||
"the page got " + JSON.stringify(sign),
|
||||
);
|
||||
} catch (e) {
|
||||
failed += 1;
|
||||
console.log("# ERROR: " + (e && e.stack ? e.stack : e));
|
||||
} finally {
|
||||
if (browser.exitCode === null && browser.signalCode === null) {
|
||||
const exited = new Promise((resolve) =>
|
||||
browser.once("exit", resolve),
|
||||
);
|
||||
browser.kill();
|
||||
await exited;
|
||||
}
|
||||
await node.close();
|
||||
// Chromium's helper processes can still be writing to the profile
|
||||
// for a moment after the browser process itself has exited.
|
||||
fs.rmSync(profile, { recursive: true, force: true, maxRetries: 5 });
|
||||
}
|
||||
|
||||
console.log("1.." + checks.length);
|
||||
if (checks.length === 0) {
|
||||
console.log("# FAILED: this program asserted nothing");
|
||||
process.exitCode = 1;
|
||||
return;
|
||||
}
|
||||
console.log(
|
||||
"# " +
|
||||
(checks.length - failed) +
|
||||
"/" +
|
||||
checks.length +
|
||||
" checks passed",
|
||||
);
|
||||
if (failed > 0) {
|
||||
console.log("# FAILED");
|
||||
process.exitCode = 1;
|
||||
}
|
||||
}
|
||||
|
||||
main().catch((e) => {
|
||||
console.error("slowApproval: " + (e && e.stack ? e.stack : e));
|
||||
process.exitCode = 1;
|
||||
});
|
||||
@@ -1,102 +0,0 @@
|
||||
// The sign screen signs an eth_sign request the way it signs personal_sign: as
|
||||
// an EIP-191 personal message over the bytes of the data
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/409). Booted through the real
|
||||
// popup entry point as the approval window. The background's half, which reads
|
||||
// the address first and the data second and checks the signature, is tested in
|
||||
// tests/backgroundApproval.test.js.
|
||||
|
||||
// Mocked so that no password has to be hashed: the stored secret decrypts to
|
||||
// the test key below.
|
||||
jest.mock("../src/shared/vault", () => ({
|
||||
decryptWithPassword: jest.fn(),
|
||||
encryptWithPassword: jest.fn(),
|
||||
}));
|
||||
|
||||
const { Wallet, getBytes } = require("ethers");
|
||||
const {
|
||||
bootPopup,
|
||||
cleanupPopup,
|
||||
unversionedValidProfile,
|
||||
} = require("./support/popupBoot");
|
||||
|
||||
// A published test key, never used for real funds.
|
||||
const SIGNER_KEY =
|
||||
"0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d";
|
||||
const signer = new Wallet(SIGNER_KEY);
|
||||
// "Hello AutistMask", as the hex a page sends.
|
||||
const MESSAGE = "0x48656c6c6f204175746973744d61736b";
|
||||
const ORIGIN = "https://dapp.example";
|
||||
|
||||
afterEach(cleanupPopup);
|
||||
|
||||
test("the sign screen answers eth_sign with a personal message signature over the data", async () => {
|
||||
const sent = [];
|
||||
const page = await bootPopup(
|
||||
unversionedValidProfile({
|
||||
wallets: [
|
||||
{
|
||||
type: "key",
|
||||
name: "Wallet 1",
|
||||
encryptedSecret: "encrypted-key",
|
||||
addresses: [
|
||||
{
|
||||
address: signer.address,
|
||||
balance: "0.0000",
|
||||
tokenBalances: [],
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
activeAddress: signer.address,
|
||||
allowedSites: { [signer.address]: [ORIGIN] },
|
||||
}),
|
||||
{
|
||||
search: "?approval=approval-1",
|
||||
runtime: {
|
||||
connect: () => ({ postMessage: () => {} }),
|
||||
// Answered as the background answers: with the eth_sign
|
||||
// approval this window was opened for, and by handing back
|
||||
// the signature the popup sends.
|
||||
sendMessage: (msg, reply) => {
|
||||
sent.push(msg);
|
||||
if (msg.type === "AUTISTMASK_GET_APPROVAL") {
|
||||
reply({
|
||||
type: "sign",
|
||||
origin: ORIGIN,
|
||||
isPhishingDomain: false,
|
||||
approvedFrom: signer.address,
|
||||
signParams: {
|
||||
method: "eth_sign",
|
||||
message: MESSAGE,
|
||||
from: signer.address,
|
||||
},
|
||||
});
|
||||
} else if (msg.type === "AUTISTMASK_SIGN_RESPONSE") {
|
||||
reply({ signature: msg.signature });
|
||||
} else {
|
||||
reply(undefined);
|
||||
}
|
||||
},
|
||||
},
|
||||
},
|
||||
);
|
||||
globalThis.window.close = jest.fn();
|
||||
const { decryptWithPassword } = require("../src/shared/vault");
|
||||
decryptWithPassword.mockResolvedValue(SIGNER_KEY);
|
||||
|
||||
expect(page.visibleViews()).toEqual(["approve-sign"]);
|
||||
page.node("approve-sign-password").value = "any password";
|
||||
await page.click("btn-approve-sign");
|
||||
|
||||
expect(
|
||||
sent.filter((msg) => msg.type === "AUTISTMASK_SIGN_RESPONSE"),
|
||||
).toEqual([
|
||||
{
|
||||
type: "AUTISTMASK_SIGN_RESPONSE",
|
||||
id: "approval-1",
|
||||
approved: true,
|
||||
signature: await signer.signMessage(getBytes(MESSAGE)),
|
||||
},
|
||||
]);
|
||||
expect(globalThis.window.close).toHaveBeenCalled();
|
||||
});
|
||||
@@ -136,7 +136,7 @@ function erc20AmountLine(data, tokenAddress) {
|
||||
}
|
||||
|
||||
function swapAmountLine(data) {
|
||||
return decodeCalldata(data, ROUTER, "0x1").details.find(
|
||||
return decodeCalldata(data, ROUTER).details.find(
|
||||
(d) => d.label === "Amount",
|
||||
).value;
|
||||
}
|
||||
|
||||
@@ -1,141 +0,0 @@
|
||||
// Adding the first wallet left no address active until the popup was reopened,
|
||||
// so Send and Receive on Home only said "No active address selected."
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/512). Each test adds a wallet
|
||||
// through one of the three import tabs and checks which address is active by
|
||||
// opening Receive from Home in the same popup.
|
||||
|
||||
const { HDNodeWallet, Mnemonic, Wallet } = require("ethers");
|
||||
|
||||
const {
|
||||
bootPopup,
|
||||
cleanupPopup,
|
||||
unversionedValidProfile,
|
||||
ADDRESS,
|
||||
} = require("./support/popupBoot");
|
||||
|
||||
const PHRASE =
|
||||
"abandon abandon abandon abandon abandon abandon " +
|
||||
"abandon abandon abandon abandon abandon about";
|
||||
const PRIVATE_KEY = "0x" + "11".repeat(32);
|
||||
// The master key of PHRASE, so its first address is the phrase's.
|
||||
const XPRV = HDNodeWallet.fromSeed(
|
||||
Mnemonic.fromPhrase(PHRASE).computeSeed(),
|
||||
).extendedKey;
|
||||
const PASSWORD = "correct horse battery staple";
|
||||
|
||||
const PHRASE_ADDRESS = HDNodeWallet.fromPhrase(PHRASE).address;
|
||||
|
||||
// Addresses 1 and 2 of PHRASE used, address 0 not: a scan that answers these
|
||||
// replaces the wallet's list with one that leaves out its first address.
|
||||
const account = HDNodeWallet.fromPhrase(PHRASE, "", "m/44'/60'/0'/0");
|
||||
const used = [1, 2].map((index) => ({
|
||||
address: account.deriveChild(index).address,
|
||||
index,
|
||||
}));
|
||||
|
||||
const TABS = [
|
||||
{
|
||||
tab: "tab-mnemonic",
|
||||
field: "wallet-mnemonic",
|
||||
secret: PHRASE,
|
||||
address: PHRASE_ADDRESS,
|
||||
},
|
||||
{
|
||||
tab: "tab-privkey",
|
||||
field: "import-private-key",
|
||||
secret: PRIVATE_KEY,
|
||||
address: new Wallet(PRIVATE_KEY).address,
|
||||
},
|
||||
{
|
||||
tab: "tab-xprv",
|
||||
field: "import-xprv-key",
|
||||
secret: XPRV,
|
||||
address: PHRASE_ADDRESS,
|
||||
},
|
||||
];
|
||||
|
||||
// Fills in the open AddWallet screen and presses "Import".
|
||||
async function importOn(page, { tab, field, secret }) {
|
||||
await page.click(tab);
|
||||
page.node(field).value = secret;
|
||||
page.node("add-wallet-password").value = PASSWORD;
|
||||
page.node("add-wallet-password-confirm").value = PASSWORD;
|
||||
await page.click("btn-add-wallet-confirm");
|
||||
}
|
||||
|
||||
afterEach(() => {
|
||||
cleanupPopup();
|
||||
});
|
||||
|
||||
describe("the first wallet's first address is active right away", () => {
|
||||
test.each(TABS)("added from $tab, Receive opens on it", async (entry) => {
|
||||
const page = await bootPopup(undefined);
|
||||
expect(page.pageErrors).toEqual([]);
|
||||
await page.click("btn-welcome-add");
|
||||
await importOn(page, entry);
|
||||
expect(page.visibleViews()).toEqual(["main"]);
|
||||
|
||||
await page.click("btn-main-receive");
|
||||
expect(page.visibleViews()).toEqual(["receive"]);
|
||||
expect(page.node("receive-address-block").dataset.full).toBe(
|
||||
entry.address,
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe("a scan that leaves out the first address", () => {
|
||||
// The key tab runs no scan.
|
||||
test.each(TABS.filter((t) => t.tab !== "tab-privkey"))(
|
||||
"added from $tab, the scan's first address is active",
|
||||
async (entry) => {
|
||||
const page = await bootPopup(undefined);
|
||||
const { scanForAddresses } = require("../src/shared/balances");
|
||||
scanForAddresses.mockResolvedValueOnce({
|
||||
addresses: used,
|
||||
nextIndex: 3,
|
||||
});
|
||||
await page.click("btn-welcome-add");
|
||||
await importOn(page, entry);
|
||||
|
||||
expect(page.storage.read("autistmask").activeAddress).toBe(
|
||||
used[0].address,
|
||||
);
|
||||
expect(globalThis.chrome.runtime.sendMessage).toHaveBeenCalledWith({
|
||||
type: "AUTISTMASK_ACTIVE_CHANGED",
|
||||
});
|
||||
await page.click("btn-main-receive");
|
||||
expect(page.node("receive-address-block").dataset.full).toBe(
|
||||
used[0].address,
|
||||
);
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
describe("adding a wallet while an address is active", () => {
|
||||
test.each(TABS)(
|
||||
"added from $tab, the active address is unchanged",
|
||||
async (entry) => {
|
||||
const page = await bootPopup(unversionedValidProfile());
|
||||
expect(page.pageErrors).toEqual([]);
|
||||
// The phrase and xprv scans leave out the new wallet's first
|
||||
// address, which was never active here. The key tab runs no scan.
|
||||
const { scanForAddresses } = require("../src/shared/balances");
|
||||
scanForAddresses.mockResolvedValueOnce({
|
||||
addresses: used,
|
||||
nextIndex: 3,
|
||||
});
|
||||
await page.click("btn-add-wallet-bottom");
|
||||
await importOn(page, entry);
|
||||
expect(page.visibleViews()).toEqual(["main"]);
|
||||
|
||||
expect(page.storage.read("autistmask").activeAddress).toBe(ADDRESS);
|
||||
expect(
|
||||
globalThis.chrome.runtime.sendMessage,
|
||||
).not.toHaveBeenCalledWith({ type: "AUTISTMASK_ACTIVE_CHANGED" });
|
||||
await page.click("btn-main-receive");
|
||||
expect(page.node("receive-address-block").dataset.full).toBe(
|
||||
ADDRESS,
|
||||
);
|
||||
},
|
||||
);
|
||||
});
|
||||
@@ -1,135 +0,0 @@
|
||||
// A popup that opened with no wallet never started the ten-second refresh, so
|
||||
// after the first wallet was added Home went on showing the balance it had then
|
||||
// until the popup was reopened
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/530). Each test boots the real
|
||||
// popup, adds wallets through AddWallet, and runs the intervals the popup set
|
||||
// with tick(). The balance stand-in writes what the chain holds onto every
|
||||
// address, as the real refreshBalances() does.
|
||||
|
||||
const { HDNodeWallet, Mnemonic } = require("ethers");
|
||||
|
||||
const {
|
||||
bootPopup,
|
||||
cleanupPopup,
|
||||
unversionedValidProfile,
|
||||
ADDRESS,
|
||||
} = require("./support/popupBoot");
|
||||
|
||||
const PHRASE =
|
||||
"abandon abandon abandon abandon abandon abandon " +
|
||||
"abandon abandon abandon abandon abandon about";
|
||||
const PRIVATE_KEY = "0x" + "11".repeat(32);
|
||||
const XPRV = HDNodeWallet.fromSeed(
|
||||
Mnemonic.fromPhrase(PHRASE).computeSeed(),
|
||||
).extendedKey;
|
||||
const PASSWORD = "correct horse battery staple";
|
||||
|
||||
const TABS = [
|
||||
{ tab: "tab-mnemonic", field: "wallet-mnemonic", secret: PHRASE },
|
||||
{ tab: "tab-privkey", field: "import-private-key", secret: PRIVATE_KEY },
|
||||
{ tab: "tab-xprv", field: "import-xprv-key", secret: XPRV },
|
||||
];
|
||||
|
||||
// A record this build cannot read: its wallets are a string.
|
||||
const UNREADABLE = {
|
||||
hasWallet: true,
|
||||
wallets: ADDRESS,
|
||||
activeAddress: ADDRESS,
|
||||
};
|
||||
|
||||
// The ETH balance the chain holds for every address, in ether.
|
||||
let chainBalance = "0.0";
|
||||
|
||||
// Boots the popup over `stored`, with the balance stand-in reading the chain.
|
||||
async function boot(stored) {
|
||||
const page = await bootPopup(stored);
|
||||
const { refreshBalances } = require("../src/shared/balances");
|
||||
refreshBalances.mockImplementation(async (wallets) => {
|
||||
for (const wallet of wallets) {
|
||||
for (const addr of wallet.addresses) addr.balance = chainBalance;
|
||||
}
|
||||
});
|
||||
return { page, refreshBalances };
|
||||
}
|
||||
|
||||
// Fills in the open AddWallet screen and presses "Import".
|
||||
async function importOn(page, { tab, field, secret }) {
|
||||
await page.click(tab);
|
||||
page.node(field).value = secret;
|
||||
page.node("add-wallet-password").value = PASSWORD;
|
||||
page.node("add-wallet-password-confirm").value = PASSWORD;
|
||||
await page.click("btn-add-wallet-confirm");
|
||||
}
|
||||
|
||||
beforeEach(() => {
|
||||
chainBalance = "0.0";
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
cleanupPopup();
|
||||
});
|
||||
|
||||
describe("a popup that opened on Welcome", () => {
|
||||
test.each(TABS)(
|
||||
"after the first wallet is added from $tab, funds that arrive show on Home",
|
||||
async (entry) => {
|
||||
const { page } = await boot(undefined);
|
||||
expect(page.pageErrors).toEqual([]);
|
||||
await page.click("btn-welcome-add");
|
||||
await importOn(page, entry);
|
||||
expect(page.visibleViews()).toEqual(["main"]);
|
||||
expect(page.text("total-value")).toBe("0.0000 ETH");
|
||||
|
||||
chainBalance = "2.0";
|
||||
await page.tick();
|
||||
|
||||
expect(page.text("total-value")).toBe("2.0000 ETH");
|
||||
},
|
||||
);
|
||||
|
||||
test("a second wallet starts no second refresh", async () => {
|
||||
const { page, refreshBalances } = await boot(undefined);
|
||||
await page.click("btn-welcome-add");
|
||||
await importOn(page, TABS[1]);
|
||||
await page.click("btn-add-wallet-bottom");
|
||||
await importOn(page, TABS[0]);
|
||||
const calls = refreshBalances.mock.calls.length;
|
||||
|
||||
await page.tick();
|
||||
|
||||
expect(refreshBalances).toHaveBeenCalledTimes(calls + 1);
|
||||
});
|
||||
|
||||
test("a wallet added as the recovery screen goes up starts no refresh", async () => {
|
||||
const { page, refreshBalances } = await boot(undefined);
|
||||
// The stored record becomes unreadable during the address scan that
|
||||
// follows the import, and a save finds it.
|
||||
const { scanForAddresses } = require("../src/shared/balances");
|
||||
const { saveState } = require("../src/shared/state");
|
||||
scanForAddresses.mockImplementationOnce(async () => {
|
||||
page.storage.write("autistmask", UNREADABLE);
|
||||
await saveState().catch(() => {});
|
||||
return { addresses: [], nextIndex: 1 };
|
||||
});
|
||||
await page.click("btn-welcome-add");
|
||||
await importOn(page, TABS[0]);
|
||||
expect(page.visibleViews()).toEqual(["state-recovery"]);
|
||||
|
||||
await page.tick();
|
||||
|
||||
expect(refreshBalances).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
describe("a popup that opened with a wallet", () => {
|
||||
test("adding a wallet starts no second refresh", async () => {
|
||||
const { page, refreshBalances } = await boot(unversionedValidProfile());
|
||||
await page.click("btn-add-wallet-bottom");
|
||||
await importOn(page, TABS[1]);
|
||||
const calls = refreshBalances.mock.calls.length;
|
||||
|
||||
await page.tick();
|
||||
|
||||
expect(refreshBalances).toHaveBeenCalledTimes(calls + 1);
|
||||
});
|
||||
});
|
||||
@@ -80,7 +80,6 @@ describe.each([
|
||||
jest.doMock("../src/shared/state", () => ({
|
||||
state: { trackedTokens: [] },
|
||||
saveState,
|
||||
currentNetwork: () => ({ chainId: 1 }),
|
||||
}));
|
||||
jest.doMock("../src/popup/views/helpers", () => ({
|
||||
$: element,
|
||||
|
||||
@@ -17,10 +17,6 @@ jest.mock("ethers", () => {
|
||||
async lookupAddress() {
|
||||
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.
|
||||
async getFeeData() {
|
||||
return { maxFeePerGas: 20000000000n, gasPrice: 10000000000n };
|
||||
@@ -245,7 +241,7 @@ describe.each([
|
||||
test("the value", async () => {
|
||||
await confirmSend("0.1");
|
||||
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);
|
||||
expect(text("approve-tx-value")).toBe("0.0100 " + symbol);
|
||||
});
|
||||
@@ -271,13 +267,6 @@ describe.each([
|
||||
);
|
||||
});
|
||||
|
||||
test("the warning for a recipient that has never sent a transaction", async () => {
|
||||
await confirmSend("0.1");
|
||||
expect(text("confirm-recipient-warning")).toContain(
|
||||
"has never sent a transaction and holds no " + symbol + ".",
|
||||
);
|
||||
});
|
||||
|
||||
// A token reports whatever symbol it likes. One reporting the label the
|
||||
// wallet shows its native token under, on this network or any other, is
|
||||
// a fake, exactly as one reporting `ETH` always was.
|
||||
@@ -343,11 +332,14 @@ describe.each([
|
||||
|
||||
test("the insufficient-balance error", async () => {
|
||||
await confirmSend("2");
|
||||
expect(text("confirm-balance-error")).toBe(
|
||||
"Your " +
|
||||
expect(
|
||||
global.document.getElementById("confirm-errors").innerHTML,
|
||||
).toContain(
|
||||
"You have 1.5000 " +
|
||||
symbol +
|
||||
" balance does not cover this amount. Please go back and send" +
|
||||
" a smaller amount.",
|
||||
" but are trying to send 2 " +
|
||||
symbol +
|
||||
".",
|
||||
);
|
||||
});
|
||||
});
|
||||
@@ -429,10 +421,10 @@ describe.each([
|
||||
await global.document
|
||||
.getElementById("btn-confirm-send")
|
||||
.handlers.get("click")();
|
||||
expect(text("wait-tx-summary")).toBe("0.1000 " + symbol);
|
||||
expect(text("wait-tx-summary")).toBe("0.1 " + symbol);
|
||||
state.networkId = activeNetworkId;
|
||||
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 () => {
|
||||
|
||||
@@ -97,7 +97,6 @@ const {
|
||||
normalizePersisted,
|
||||
} = require("../src/shared/persistedState");
|
||||
const { stateProblem } = require("../src/shared/stateSchema");
|
||||
const { isKnownNetworkId } = require("../src/shared/networks");
|
||||
const { RESTORABLE_VIEWS } = require("../src/shared/restorableViews");
|
||||
const {
|
||||
bootPopup,
|
||||
@@ -194,29 +193,6 @@ const CONTRACT = [
|
||||
floorOnly: [[1, 2], [null], [{}], [[TOKEN_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",
|
||||
kind: KIND.ENTRIES,
|
||||
@@ -477,33 +453,6 @@ const CONTRACT = [
|
||||
views: ["confirm-tx"],
|
||||
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
|
||||
// the fields below it since it was written, and this is the
|
||||
// regression guard.
|
||||
@@ -818,6 +767,7 @@ const WELL_FORMED_DATA = {
|
||||
from: ADDRESS,
|
||||
to: ADDRESS,
|
||||
amount: "1",
|
||||
balance: "2",
|
||||
},
|
||||
pendingWait: {
|
||||
hash: "0x1",
|
||||
|
||||
@@ -89,12 +89,6 @@ describe("vendored blocklist", () => {
|
||||
expect(isPhishingDomain(LISTED[0].toUpperCase())).toBe(true);
|
||||
});
|
||||
|
||||
test("a hostname ending in a dot is the same host", () => {
|
||||
expect(isPhishingDomain(LISTED[1] + ".")).toBe(true);
|
||||
expect(isPhishingDomain("wallet." + LISTED[1] + ".")).toBe(true);
|
||||
expect(isPhishingDomain(CLEAN[0] + ".")).toBe(false);
|
||||
});
|
||||
|
||||
test("returns false for an empty or missing hostname", () => {
|
||||
expect(isPhishingDomain("")).toBe(false);
|
||||
expect(isPhishingDomain(null)).toBe(false);
|
||||
@@ -139,13 +133,6 @@ describe("hostnameVariants", () => {
|
||||
test("lowercases hostnames", () => {
|
||||
expect(hostnameVariants("Evil.COM")).toEqual(["evil.com"]);
|
||||
});
|
||||
|
||||
test("drops the trailing dot of a fully qualified hostname", () => {
|
||||
expect(hostnameVariants("sub.evil.com.")).toEqual([
|
||||
"sub.evil.com",
|
||||
"evil.com",
|
||||
]);
|
||||
});
|
||||
});
|
||||
|
||||
describe("domain hashing", () => {
|
||||
|
||||
@@ -1,87 +0,0 @@
|
||||
// A timer the popup started and that fires after cleanupPopup() has removed
|
||||
// the page throws "document is not defined", and the throw fails whatever test
|
||||
// the jest worker is running by then, in this file or another
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/578). The flash message's
|
||||
// timer is the one that did it. A throw from a timer during a test fails that
|
||||
// test, so each test here passes only if nothing throws.
|
||||
|
||||
const {
|
||||
bootPopup,
|
||||
cleanupPopup,
|
||||
unversionedValidProfile,
|
||||
ADDRESS,
|
||||
} = require("./support/popupBoot");
|
||||
|
||||
const FLASH_MS = 10;
|
||||
|
||||
function wait(ms) {
|
||||
return new Promise((resolve) => setTimeout(resolve, ms));
|
||||
}
|
||||
|
||||
afterEach(() => {
|
||||
cleanupPopup();
|
||||
});
|
||||
|
||||
test("a flash message clears while the page is up", async () => {
|
||||
const page = await bootPopup(unversionedValidProfile());
|
||||
const { showFlash } = require("../src/popup/views/helpers");
|
||||
showFlash("Copied.", FLASH_MS);
|
||||
expect(page.text("flash-msg")).toBe("Copied.");
|
||||
|
||||
await wait(FLASH_MS * 5);
|
||||
|
||||
expect(page.text("flash-msg")).toBe("");
|
||||
});
|
||||
|
||||
test("a flash message's timer does not fire after cleanupPopup()", async () => {
|
||||
await bootPopup(unversionedValidProfile());
|
||||
const { showFlash } = require("../src/popup/views/helpers");
|
||||
showFlash("Copied.", FLASH_MS);
|
||||
cleanupPopup();
|
||||
|
||||
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 },
|
||||
}),
|
||||
);
|
||||
|
||||
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,
|
||||
]);
|
||||
});
|
||||
@@ -1,282 +0,0 @@
|
||||
// What a page is told when a request fails
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/533).
|
||||
//
|
||||
// EIP-1193 gives every rejected request a numeric `code`, and lets it carry
|
||||
// `data`. A node's error used to reach the page as its message alone: a
|
||||
// reverting eth_call lost code 3 and the revert data a site needs to decode
|
||||
// the revert, and a site could not tell that failure from any other.
|
||||
//
|
||||
// Each request here goes from a page through the real background to a fake
|
||||
// node, and what is checked is the answer the background gives the page. The
|
||||
// content script relays that answer as it is, and src/content/inpage.js turns
|
||||
// its code and data into the error the page catches (tests/inpageErrors.test.js).
|
||||
//
|
||||
// The background reaches a node two ways, and the fake node answers both:
|
||||
// fetch(), which the read-only methods are proxied through, and ethers' own
|
||||
// HTTP transport, which a transaction is prepared through.
|
||||
|
||||
const { AbiCoder } = require("ethers");
|
||||
const { networkById } = require("../src/shared/networks");
|
||||
const { makeStorageStub } = require("./support/storageStub");
|
||||
|
||||
const ORIGIN = "https://dapp.example";
|
||||
const ADDRESS = "0x66133E8ea0f5D1d612D2502a968757D1048c214a";
|
||||
const TOKEN = "0x1111111111111111111111111111111111111111";
|
||||
const SEPOLIA = networkById("sepolia");
|
||||
|
||||
// Error("bal"), which a token whose transfer() does require(..., "bal")
|
||||
// reverts with when the balance is too low.
|
||||
const REVERT_DATA =
|
||||
"0x08c379a0" +
|
||||
AbiCoder.defaultAbiCoder().encode(["string"], ["bal"]).slice(2);
|
||||
|
||||
// What a node answers for a call that reverts, and for an address that is not
|
||||
// one.
|
||||
const REVERTED = {
|
||||
code: 3,
|
||||
message: "execution reverted: bal",
|
||||
data: REVERT_DATA,
|
||||
};
|
||||
const INVALID_ADDRESS = { code: -32602, message: "invalid string length" };
|
||||
|
||||
const WITH_ADDRESS = {
|
||||
hasWallet: true,
|
||||
wallets: [
|
||||
{
|
||||
name: "Wallet 1",
|
||||
type: "hd",
|
||||
xpub: "xpub-1",
|
||||
addresses: [
|
||||
{ address: ADDRESS, balance: "0.0", tokenBalances: [] },
|
||||
],
|
||||
},
|
||||
],
|
||||
activeAddress: ADDRESS,
|
||||
networkId: "sepolia",
|
||||
rpcUrl: SEPOLIA.defaultRpcUrl,
|
||||
blockscoutUrl: SEPOLIA.defaultBlockscoutUrl,
|
||||
allowedSites: { [ADDRESS]: [ORIGIN] },
|
||||
deniedSites: {},
|
||||
trackedTokens: [],
|
||||
};
|
||||
|
||||
const NO_ADDRESS = {
|
||||
...WITH_ADDRESS,
|
||||
hasWallet: false,
|
||||
wallets: [],
|
||||
activeAddress: null,
|
||||
allowedSites: {},
|
||||
};
|
||||
|
||||
const realFetch = globalThis.fetch;
|
||||
|
||||
afterEach(() => {
|
||||
delete global.chrome;
|
||||
globalThis.fetch = realFetch;
|
||||
});
|
||||
|
||||
// The background, over a stored profile, with a node that answers each
|
||||
// JSON-RPC method from `node`: a method's entry is the result, or
|
||||
// `{ error }` for the error the node answers with. A method not in `node`
|
||||
// is answered "method not found", so a test that reaches one fails on it.
|
||||
// `node` null is a node that cannot be reached at all.
|
||||
function loadBackground(profile, node) {
|
||||
jest.resetModules();
|
||||
|
||||
jest.doMock("../src/shared/phishingDomains", () => ({
|
||||
isPhishingDomain: () => false,
|
||||
}));
|
||||
jest.doMock("../src/shared/alarms", () => ({
|
||||
BALANCE_REFRESH_ALARM: "balance",
|
||||
BALANCE_REFRESH_PERIOD_MINUTES: 1,
|
||||
ensureRecurringAlarms: jest.fn(async () => {}),
|
||||
registerAlarmHandlers: jest.fn(),
|
||||
}));
|
||||
|
||||
function reply({ id, method }) {
|
||||
const entry = node[method];
|
||||
if (entry === undefined) {
|
||||
return {
|
||||
jsonrpc: "2.0",
|
||||
id,
|
||||
error: { code: -32601, message: "method not found: " + method },
|
||||
};
|
||||
}
|
||||
if (entry && entry.error)
|
||||
return { jsonrpc: "2.0", id, error: entry.error };
|
||||
return { jsonrpc: "2.0", id, result: entry };
|
||||
}
|
||||
|
||||
globalThis.fetch = jest.fn(async (url, opts) => {
|
||||
if (!node) throw new TypeError("fetch failed");
|
||||
return { status: 200, json: async () => reply(JSON.parse(opts.body)) };
|
||||
});
|
||||
|
||||
// The ethers the background is about to load: jest.resetModules() above
|
||||
// means it is a fresh copy, not the one this file required at the top.
|
||||
require("ethers").FetchRequest.registerGetUrl(async (req) => {
|
||||
if (!node) throw new Error("connect ECONNREFUSED");
|
||||
const body = JSON.parse(Buffer.from(req.body).toString("utf8"));
|
||||
const answer = Array.isArray(body) ? body.map(reply) : reply(body);
|
||||
return {
|
||||
statusCode: 200,
|
||||
statusMessage: "OK",
|
||||
headers: { "content-type": "application/json" },
|
||||
body: Buffer.from(JSON.stringify(answer)),
|
||||
};
|
||||
});
|
||||
|
||||
let messageListener = null;
|
||||
global.chrome = {
|
||||
storage: makeStorageStub({ autistmask: profile }),
|
||||
runtime: {
|
||||
getURL: (path) => "chrome-extension://autistmask/" + path,
|
||||
onMessage: {
|
||||
addListener: (fn) => {
|
||||
messageListener = fn;
|
||||
},
|
||||
},
|
||||
onConnect: { addListener: () => {} },
|
||||
lastError: null,
|
||||
},
|
||||
windows: { onRemoved: { addListener: () => {} } },
|
||||
action: { setPopup: () => {} },
|
||||
};
|
||||
|
||||
require("../src/background/index");
|
||||
|
||||
// The answer the page gets to one request.
|
||||
return function request(method, params) {
|
||||
return new Promise((resolve) => {
|
||||
messageListener(
|
||||
{ type: "AUTISTMASK_RPC", method, params },
|
||||
{ origin: ORIGIN },
|
||||
resolve,
|
||||
);
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
const TRANSFER = {
|
||||
from: ADDRESS,
|
||||
to: TOKEN,
|
||||
// transfer(ADDRESS, 1)
|
||||
data:
|
||||
"0xa9059cbb" +
|
||||
AbiCoder.defaultAbiCoder()
|
||||
.encode(["address", "uint256"], [ADDRESS, 1])
|
||||
.slice(2),
|
||||
};
|
||||
|
||||
describe("a node's error reaches the page with the node's code and data", () => {
|
||||
test("a reverting eth_call", async () => {
|
||||
const request = loadBackground(WITH_ADDRESS, {
|
||||
eth_call: { error: REVERTED },
|
||||
});
|
||||
|
||||
const answer = await request("eth_call", [TRANSFER, "latest"]);
|
||||
|
||||
expect(answer).toEqual({ error: REVERTED });
|
||||
});
|
||||
|
||||
test("an eth_getBalance for an address that is not one", async () => {
|
||||
const request = loadBackground(WITH_ADDRESS, {
|
||||
eth_getBalance: { error: INVALID_ADDRESS },
|
||||
});
|
||||
|
||||
const answer = await request("eth_getBalance", ["0x1234", "latest"]);
|
||||
|
||||
expect(answer).toEqual({ error: INVALID_ADDRESS });
|
||||
});
|
||||
|
||||
// The wallet's own sentence, with the node's code and revert data, so the
|
||||
// site can decode why its transaction would revert.
|
||||
test("an eth_sendTransaction whose gas estimate reverts", async () => {
|
||||
const request = loadBackground(WITH_ADDRESS, {
|
||||
eth_getTransactionCount: "0x7",
|
||||
eth_estimateGas: { error: REVERTED },
|
||||
});
|
||||
|
||||
const answer = await request("eth_sendTransaction", [TRANSFER]);
|
||||
|
||||
expect(answer).toEqual({
|
||||
error: {
|
||||
code: REVERTED.code,
|
||||
message: expect.stringMatching(
|
||||
/^The transaction could not be prepared: execution reverted/,
|
||||
),
|
||||
data: REVERT_DATA,
|
||||
},
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
// One request for each way a request is refused without the node's code: by
|
||||
// the wallet itself, or because the node could not be reached.
|
||||
describe("no rejected request reaches the page without a numeric code", () => {
|
||||
test.each([
|
||||
[
|
||||
"eth_requestAccounts with no address",
|
||||
NO_ADDRESS,
|
||||
{},
|
||||
"eth_requestAccounts",
|
||||
[],
|
||||
4100,
|
||||
],
|
||||
[
|
||||
"personal_sign with no address",
|
||||
NO_ADDRESS,
|
||||
{},
|
||||
"personal_sign",
|
||||
["0x00", ADDRESS],
|
||||
4100,
|
||||
],
|
||||
[
|
||||
"eth_signTypedData_v4 with no address",
|
||||
NO_ADDRESS,
|
||||
{},
|
||||
"eth_signTypedData_v4",
|
||||
[ADDRESS, "{}"],
|
||||
4100,
|
||||
],
|
||||
[
|
||||
"eth_sendTransaction with no address",
|
||||
NO_ADDRESS,
|
||||
{},
|
||||
"eth_sendTransaction",
|
||||
[TRANSFER],
|
||||
4100,
|
||||
],
|
||||
[
|
||||
"eth_sendTransaction with two different gas limits",
|
||||
WITH_ADDRESS,
|
||||
{},
|
||||
"eth_sendTransaction",
|
||||
[{ ...TRANSFER, gas: "0x5208", gasLimit: "0x5209" }],
|
||||
-32602,
|
||||
],
|
||||
[
|
||||
"eth_call to a node that cannot be reached",
|
||||
WITH_ADDRESS,
|
||||
null,
|
||||
"eth_call",
|
||||
[TRANSFER, "latest"],
|
||||
-32603,
|
||||
],
|
||||
[
|
||||
"eth_sendTransaction to a node that cannot be reached",
|
||||
WITH_ADDRESS,
|
||||
null,
|
||||
"eth_sendTransaction",
|
||||
[TRANSFER],
|
||||
-32603,
|
||||
],
|
||||
])("%s", async (_name, profile, node, method, params, code) => {
|
||||
const request = loadBackground(profile, node);
|
||||
|
||||
const answer = await request(method, params);
|
||||
|
||||
expect(answer.error.code).toBe(code);
|
||||
expect(answer.error.message).toEqual(expect.any(String));
|
||||
});
|
||||
});
|
||||
@@ -74,7 +74,7 @@ test("ethers puts the URL in the error message, not in the short message", async
|
||||
test("the recipient checks before a send", async () => {
|
||||
await getFullWarnings(ADDRESS, getProvider(RPC_URL, "mainnet"));
|
||||
expectFailureLoggedWithoutKey("contract check failed");
|
||||
expectFailureLoggedWithoutKey("tx count or balance check failed");
|
||||
expectFailureLoggedWithoutKey("tx count check failed");
|
||||
});
|
||||
|
||||
test("the ENS reverse lookup", async () => {
|
||||
|
||||
+2
-47
@@ -8,15 +8,8 @@
|
||||
// and a request the browser said nothing about was credited to whatever the
|
||||
// page wrote (https://git.eeqj.de/sneak/AutistMask/issues/407).
|
||||
//
|
||||
// An origin with no host names no site, so its request is refused
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/527). The browser reports
|
||||
// "null" for a page with an opaque origin, such as one its server sandboxes
|
||||
// with a Content-Security-Policy, and Chrome reports "file://" for a local
|
||||
// file.
|
||||
//
|
||||
// Every other sender here lacks sender.origin, as on old Firefox. The
|
||||
// connection check on eth_accounts is what shows which site a request was
|
||||
// credited to.
|
||||
// Every sender here lacks sender.origin, as on old Firefox. The connection
|
||||
// check on eth_accounts is what shows which site a request was credited to.
|
||||
|
||||
const { makeStorageStub } = require("./support/storageStub");
|
||||
|
||||
@@ -151,41 +144,3 @@ describe("a request the browser does not say the sender of", () => {
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("a request whose origin has no host", () => {
|
||||
test("from a page with an opaque origin is refused, whatever its URL says", async () => {
|
||||
const accounts = loadBackground();
|
||||
|
||||
const result = await accounts({
|
||||
origin: "null",
|
||||
url: CONNECTED_ORIGIN + "/sandboxed.html",
|
||||
tab: { url: CONNECTED_ORIGIN + "/sandboxed.html" },
|
||||
});
|
||||
|
||||
expect(result).toEqual({
|
||||
error: {
|
||||
code: 4100,
|
||||
message:
|
||||
"The wallet could not tell which site sent this request.",
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
test("from a local file is refused", async () => {
|
||||
const accounts = loadBackground();
|
||||
|
||||
const result = await accounts({
|
||||
origin: "file://",
|
||||
url: "file:///home/user/page.html",
|
||||
tab: { url: "file:///home/user/page.html" },
|
||||
});
|
||||
|
||||
expect(result).toEqual({
|
||||
error: {
|
||||
code: 4100,
|
||||
message:
|
||||
"The wallet could not tell which site sent this request.",
|
||||
},
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,220 +0,0 @@
|
||||
// The Send screen refuses every amount the confirmation screen would refuse,
|
||||
// by the same check (https://git.eeqj.de/sneak/AutistMask/issues/532).
|
||||
//
|
||||
// Send used to accept anything parseFloat() read as above zero, so "1e-3",
|
||||
// "1abc" and an amount with more decimal places than the token has went on to
|
||||
// a confirmation screen that then refused them. Both screens now call
|
||||
// isValidAmount() in src/shared/txValidation.js.
|
||||
//
|
||||
// Driven through the real Send review handler and the real confirmation
|
||||
// screen, with only the node and the DOM stubbed.
|
||||
|
||||
"use strict";
|
||||
|
||||
jest.mock("../src/shared/log", () => ({
|
||||
log: {
|
||||
debugf: () => {},
|
||||
infof: () => {},
|
||||
warnf: () => {},
|
||||
errorf: () => {},
|
||||
},
|
||||
debugFetch: jest.fn(),
|
||||
setRuntimeDebug: () => {},
|
||||
isDebug: () => false,
|
||||
}));
|
||||
|
||||
const { AbiCoder } = require("ethers");
|
||||
|
||||
// What the confirmation screen asks the node for. The address holds the 1 ETH
|
||||
// and 250 TOK the wallet below records.
|
||||
const mockProvider = {
|
||||
getFeeData: async () => ({
|
||||
maxFeePerGas: 2000000000n,
|
||||
gasPrice: 1000000000n,
|
||||
}),
|
||||
estimateGas: async () => 21000n,
|
||||
getCode: async () => "0x",
|
||||
getTransactionCount: async () => 1,
|
||||
getBalance: async () => 1000000000000000000n,
|
||||
// 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", () => {
|
||||
const actual = jest.requireActual("../src/shared/balances");
|
||||
return { ...actual, getProvider: () => mockProvider };
|
||||
});
|
||||
|
||||
// The confirmation screen's Etherscan label lookup 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,
|
||||
addEventListener(name, fn) {
|
||||
handlers.set(name, fn);
|
||||
},
|
||||
appendChild(child) {
|
||||
return child;
|
||||
},
|
||||
querySelectorAll: () => [],
|
||||
querySelector: () => null,
|
||||
remove() {},
|
||||
focus() {},
|
||||
};
|
||||
}
|
||||
|
||||
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 { state } = require("../src/shared/state");
|
||||
const send = require("../src/popup/views/send");
|
||||
const confirmTx = require("../src/popup/views/confirmTx");
|
||||
|
||||
const HOLDER = "0x" + "a".repeat(40);
|
||||
const RECIPIENT = "0xC0FfEE0000000000000000000000000000c0fFEe";
|
||||
// A token with 6 decimal places, as USDC has.
|
||||
const TOKEN = "0x" + "d".repeat(40);
|
||||
const TOKEN_BY_SYMBOL = { ETH: "ETH", TOK: TOKEN };
|
||||
|
||||
function el(id) {
|
||||
return global.document.getElementById(id);
|
||||
}
|
||||
|
||||
// Press Review on the Send screen with `amount` entered, for a send of `token`
|
||||
// ("ETH" or TOKEN), and return what it handed the confirmation screen, or null
|
||||
// when it handed nothing over.
|
||||
async function review(amount, token) {
|
||||
let handed = null;
|
||||
send.init({ showConfirmTx: (info) => (handed = info) });
|
||||
state.selectedToken = token;
|
||||
el("send-to").value = RECIPIENT;
|
||||
el("send-amount").value = amount;
|
||||
await el("btn-send-review").handlers.get("click")();
|
||||
return handed;
|
||||
}
|
||||
|
||||
// Show the confirmation screen for the send Review hands over for 0.5, with
|
||||
// `amount` in its place, and let its fee estimate settle.
|
||||
async function confirm(amount, token) {
|
||||
const txInfo = await review("0.5", token);
|
||||
confirmTx.show({ ...txInfo, amount });
|
||||
for (let i = 0; i < 10; i++) await new Promise((r) => setTimeout(r, 0));
|
||||
}
|
||||
|
||||
beforeEach(() => {
|
||||
elements.clear();
|
||||
state.wallets = [
|
||||
{
|
||||
name: "Wallet 1",
|
||||
addresses: [
|
||||
{
|
||||
address: HOLDER,
|
||||
balance: "1.0",
|
||||
tokenBalances: [
|
||||
{
|
||||
address: TOKEN,
|
||||
name: "Token",
|
||||
symbol: "TOK",
|
||||
decimals: 6,
|
||||
balance: "250.0",
|
||||
holders: 50000,
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
];
|
||||
state.selectedWallet = 0;
|
||||
state.selectedAddress = 0;
|
||||
state.trackedTokens = [
|
||||
{ address: TOKEN, symbol: "TOK", name: "Token", decimals: 6 },
|
||||
];
|
||||
state.fraudContracts = [];
|
||||
state.selectedToken = null;
|
||||
state.currentView = null;
|
||||
});
|
||||
|
||||
describe.each([
|
||||
["1e-3", "ETH"],
|
||||
["1e-3", "TOK"],
|
||||
["1abc", "ETH"],
|
||||
// 19 decimal places; ETH has 18.
|
||||
["0.0000000000000000001", "ETH"],
|
||||
// 7 decimal places; the token has 6.
|
||||
["0.0000001", "TOK"],
|
||||
["0", "ETH"],
|
||||
["-1", "ETH"],
|
||||
])("%s %s", (amount, symbol) => {
|
||||
const token = TOKEN_BY_SYMBOL[symbol];
|
||||
|
||||
test("Send refuses it with a flash message and opens nothing", async () => {
|
||||
expect(await review(amount, token)).toBe(null);
|
||||
expect(el("flash-msg").textContent).toBe(
|
||||
"Please enter a valid amount.",
|
||||
);
|
||||
});
|
||||
|
||||
test("the confirmation screen refuses it too", async () => {
|
||||
await confirm(amount, token);
|
||||
expect(el("confirm-errors").innerHTML).toContain(
|
||||
"Please enter a valid amount to send.",
|
||||
);
|
||||
expect(el("btn-confirm-send").disabled).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
describe.each([
|
||||
["0.5", "ETH"],
|
||||
["0.5", "TOK"],
|
||||
// Exactly the 6 decimal places the token has.
|
||||
["0.000001", "TOK"],
|
||||
// Only zeros past the token's 6 places, and past ETH's 18.
|
||||
["1.0000000", "TOK"],
|
||||
["0.5000000000000000000", "ETH"],
|
||||
])("%s %s", (amount, symbol) => {
|
||||
const token = TOKEN_BY_SYMBOL[symbol];
|
||||
|
||||
test("Send hands it to the confirmation screen", async () => {
|
||||
expect((await review(amount, token)).amount).toBe(amount);
|
||||
expect(el("flash-msg").textContent).toBe("");
|
||||
});
|
||||
|
||||
test("the confirmation screen lets it be sent", async () => {
|
||||
await confirm(amount, token);
|
||||
expect(el("confirm-errors").innerHTML).toBe("");
|
||||
expect(el("btn-confirm-send").disabled).toBe(false);
|
||||
});
|
||||
});
|
||||
@@ -18,7 +18,6 @@
|
||||
// What the stub node answers. Each test sets what it needs.
|
||||
const mockNode = {
|
||||
balanceWei: 0n,
|
||||
tokenUnits: 0n,
|
||||
feeData: { maxFeePerGas: 1n, gasPrice: 1n },
|
||||
};
|
||||
|
||||
@@ -31,13 +30,6 @@ jest.mock("ethers", () => {
|
||||
async getBalance() {
|
||||
return mockNode.balanceWei;
|
||||
}
|
||||
// balanceOf(), the one contract call these screens make.
|
||||
async call() {
|
||||
return actual.AbiCoder.defaultAbiCoder().encode(
|
||||
["uint256"],
|
||||
[mockNode.tokenUnits],
|
||||
);
|
||||
}
|
||||
async lookupAddress() {
|
||||
return null;
|
||||
}
|
||||
@@ -203,19 +195,10 @@ function errors() {
|
||||
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,
|
||||
// fetched and stored exactly where the popup stores them. The node reports the
|
||||
// token holding the explorer does.
|
||||
// fetched and stored exactly where the popup stores them.
|
||||
async function refreshWith(balanceWei, tokenItems = []) {
|
||||
mockNode.balanceWei = balanceWei;
|
||||
mockNode.tokenUnits =
|
||||
tokenItems.length > 0 ? BigInt(tokenItems[0].value) : 0n;
|
||||
mockExplorer.items = tokenItems;
|
||||
state.wallets = [{ name: "Wallet 1", addresses: [{ address: HOLDER }] }];
|
||||
state.selectedWallet = 0;
|
||||
@@ -317,10 +300,9 @@ describe("a tracked token holding below 0.000001 never renders as zero", () => {
|
||||
await confirmSend("0.0000005", TOKEN);
|
||||
expect(text("confirm-balance")).toBe("0.0000005 TOK");
|
||||
expect(errors()).toBe("");
|
||||
expect(balanceError()).toBe("");
|
||||
await confirmSend("0.0000006", TOKEN);
|
||||
expect(balanceError()).toContain(
|
||||
"Your TOK balance does not cover this amount.",
|
||||
expect(errors()).toContain(
|
||||
"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);
|
||||
expect(text("confirm-balance")).toBe("1.5000 TOK");
|
||||
expect(errors()).toBe("");
|
||||
expect(balanceError()).toBe("");
|
||||
});
|
||||
|
||||
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);
|
||||
expect(text("confirm-balance")).toBe("0.000000000000000000000001 TOK");
|
||||
expect(balanceError()).toContain(
|
||||
"Your TOK balance does not cover this amount.",
|
||||
expect(errors()).toContain(
|
||||
"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);
|
||||
expect(text("confirm-balance")).toBe("0.0000005 TOK");
|
||||
expect(errors()).toBe("");
|
||||
expect(balanceError()).toBe("");
|
||||
await confirmSend("0.0000006", TOKEN);
|
||||
expect(balanceError()).toContain(
|
||||
"Your TOK balance does not cover this amount.",
|
||||
expect(errors()).toContain(
|
||||
"You have 0.0000005 TOK but are trying to send 0.0000006 TOK.",
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
+7
-25
@@ -17,7 +17,6 @@
|
||||
// What the stub node answers, and the signed transactions it was handed.
|
||||
const mockNode = {
|
||||
balanceWei: 0n,
|
||||
tokenUnits: 0n,
|
||||
feeData: null,
|
||||
broadcast: [],
|
||||
};
|
||||
@@ -31,14 +30,6 @@ jest.mock("ethers", () => {
|
||||
async getBalance() {
|
||||
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() {
|
||||
return null;
|
||||
}
|
||||
@@ -196,12 +187,9 @@ function text(id) {
|
||||
}
|
||||
|
||||
// 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
|
||||
// token holding the explorer does.
|
||||
// fetched and stored exactly where the popup stores them.
|
||||
async function refreshWith(balanceWei, tokenItems = []) {
|
||||
mockNode.balanceWei = balanceWei;
|
||||
mockNode.tokenUnits =
|
||||
tokenItems.length > 0 ? BigInt(tokenItems[0].value) : 0n;
|
||||
mockExplorer.items = tokenItems;
|
||||
state.wallets = [
|
||||
{
|
||||
@@ -306,8 +294,7 @@ describe("Max on an ETH send", () => {
|
||||
openSend();
|
||||
await pressMax();
|
||||
await review();
|
||||
expect(confirmed.amount).toBe(maxAfter(20n * GWEI));
|
||||
expect(text("confirm-amount")).toBe("1.2341 ETH");
|
||||
expect(text("confirm-amount")).toBe(maxAfter(20n * GWEI) + " ETH");
|
||||
expect(el("confirm-errors").innerHTML).toBe("");
|
||||
expect(el("confirm-amount-fee-error").style.visibility).toBe("hidden");
|
||||
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.
|
||||
mockNode.feeData = fees(30n * GWEI);
|
||||
await review();
|
||||
expect(confirmed.amount).toBe(maxAfter(30n * GWEI));
|
||||
expect(text("confirm-amount")).toBe("1.2339 ETH");
|
||||
expect(text("confirm-amount")).toBe(maxAfter(30n * GWEI) + " ETH");
|
||||
expect(canSend()).toBe(true);
|
||||
|
||||
// And falls when the screen is shown again, as on reopening the popup.
|
||||
mockNode.feeData = fees(10n * GWEI);
|
||||
confirmTx.restore();
|
||||
await settle();
|
||||
expect(confirmed.amount).toBe(maxAfter(10n * GWEI));
|
||||
expect(text("confirm-amount")).toBe("1.2343 ETH");
|
||||
expect(text("confirm-amount")).toBe(maxAfter(10n * GWEI) + " ETH");
|
||||
expect(canSend()).toBe(true);
|
||||
});
|
||||
|
||||
@@ -529,8 +514,7 @@ describe("Max on an ETH send", () => {
|
||||
el("send-amount").handlers.get("input")();
|
||||
mockNode.feeData = fees(30n * GWEI);
|
||||
await review();
|
||||
expect(confirmed.amount).toBe("0.5");
|
||||
expect(text("confirm-amount")).toBe("0.5000 ETH");
|
||||
expect(text("confirm-amount")).toBe("0.5 ETH");
|
||||
});
|
||||
});
|
||||
|
||||
@@ -544,8 +528,7 @@ describe("Max on a token send", () => {
|
||||
await pressMax();
|
||||
expect(el("send-amount").value).toBe("1234.567890123456789012");
|
||||
await review();
|
||||
expect(confirmed.amount).toBe("1234.567890123456789012");
|
||||
expect(text("confirm-amount")).toBe("1234.5678 TOK");
|
||||
expect(text("confirm-amount")).toBe("1234.567890123456789012 TOK");
|
||||
expect(canSend()).toBe(true);
|
||||
});
|
||||
|
||||
@@ -558,8 +541,7 @@ describe("Max on a token send", () => {
|
||||
await pressMax();
|
||||
expect(el("send-amount").value).toBe("1234.567890123456789012");
|
||||
await review();
|
||||
expect(confirmed.amount).toBe("1234.567890123456789012");
|
||||
expect(text("confirm-amount")).toBe("1234.5678 TOK");
|
||||
expect(text("confirm-amount")).toBe("1234.567890123456789012 TOK");
|
||||
expect(canSend()).toBe(true);
|
||||
});
|
||||
|
||||
|
||||
@@ -43,13 +43,6 @@ jest.doMock("ethereum-blockies-base64", () => makeBlockie);
|
||||
// Taken before any boot replaces them; see bootPopup().
|
||||
const realSetInterval = globalThis.setInterval;
|
||||
const realClearInterval = globalThis.clearInterval;
|
||||
const realSetTimeout = globalThis.setTimeout;
|
||||
const realClearTimeout = globalThis.clearTimeout;
|
||||
const realFetch = globalThis.fetch;
|
||||
|
||||
// Every timeout set since the last cleanupPopup() that has neither fired nor
|
||||
// been cleared. cleanupPopup() clears them all.
|
||||
const pendingTimeouts = new Set();
|
||||
|
||||
const POPUP_HTML = fs.readFileSync(
|
||||
path.join(__dirname, "..", "..", "src", "popup", "index.html"),
|
||||
@@ -249,26 +242,13 @@ async function settle() {
|
||||
* "?approval=" and an id for the popup opened as an approval window.
|
||||
* @param {object} [options.runtime] members of chrome.runtime that replace the
|
||||
* stub's own, for a test that has to answer the background's messages.
|
||||
* @param {object} [options.windows] chrome.windows, for a test of the approval
|
||||
* window resizing itself.
|
||||
* @param {object} [options.tabs] chrome.tabs, for the same test: the page's
|
||||
* tab and its zoom.
|
||||
* @param {object} [options.documentElement] members of document.documentElement
|
||||
* that replace the stub's own: scrollWidth and clientWidth, which are equal
|
||||
* unless a test says otherwise, so the page does not scroll sideways.
|
||||
* @returns {Promise<object>} handles onto the booted page.
|
||||
*/
|
||||
async function bootPopup(stored, options) {
|
||||
jest.resetModules();
|
||||
|
||||
// The RPC requests made through src/shared/balances.js go through Node's
|
||||
// own http and https modules, not fetch(), so the fetch() stub below would
|
||||
// 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.
|
||||
// The three modules that reach the network. None is on the path under
|
||||
// test; all would make the suite hit the internet.
|
||||
jest.doMock("../../src/shared/prices", () => ({
|
||||
prices: {},
|
||||
refreshPrices: jest.fn(async () => {}),
|
||||
@@ -278,17 +258,12 @@ async function bootPopup(stored, options) {
|
||||
formatAddressTotal: () => "",
|
||||
getAddressValue: () => ({ usd: null, partial: false }),
|
||||
}));
|
||||
// scanForAddresses() answers in the real one's shape, a scan that found
|
||||
// no used address: AddWallet reads `addresses` from it.
|
||||
jest.doMock("../../src/shared/balances", () => ({
|
||||
fetchTokenBalances: jest.fn(async () => []),
|
||||
refreshBalances: jest.fn(async () => {}),
|
||||
lookupTokenInfo: jest.fn(async () => null),
|
||||
getProvider: () => ({}),
|
||||
scanForAddresses: jest.fn(async () => ({
|
||||
addresses: [],
|
||||
nextIndex: 1,
|
||||
})),
|
||||
scanForAddresses: jest.fn(async () => []),
|
||||
}));
|
||||
// filterTransactions() answers in the real one's shape: Home,
|
||||
// AddressDetail and AddressToken read both fields, and a bare list makes
|
||||
@@ -302,13 +277,7 @@ async function bootPopup(stored, options) {
|
||||
(options && options.storage) ||
|
||||
makeStorageStub(stored === undefined ? {} : { autistmask: stored });
|
||||
const document = makeDocument(POPUP_HTML);
|
||||
Object.assign(
|
||||
document.documentElement,
|
||||
{ scrollWidth: 396, clientWidth: 396 },
|
||||
options && options.documentElement,
|
||||
);
|
||||
const reloads = [];
|
||||
const windowListeners = {};
|
||||
|
||||
globalThis.chrome = {
|
||||
storage: { local: storage.local },
|
||||
@@ -318,8 +287,6 @@ async function bootPopup(stored, options) {
|
||||
onMessage: { addListener: () => {} },
|
||||
...(options && options.runtime),
|
||||
},
|
||||
windows: options && options.windows,
|
||||
tabs: options && options.tabs,
|
||||
};
|
||||
globalThis.document = document;
|
||||
globalThis.window = {
|
||||
@@ -333,20 +300,8 @@ async function bootPopup(stored, options) {
|
||||
addEventListener: () => {},
|
||||
removeEventListener: () => {},
|
||||
}),
|
||||
// Recorded, as the document's are, so a test that widens the approval
|
||||
// window can call the page's resize listeners.
|
||||
listeners: windowListeners,
|
||||
addEventListener: (name, fn) => {
|
||||
windowListeners[name] = windowListeners[name] || [];
|
||||
windowListeners[name].push(fn);
|
||||
},
|
||||
addEventListener: () => {},
|
||||
};
|
||||
// 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,
|
||||
// would outlive the test. So every interval is recorded rather than
|
||||
// started, clearInterval() removes it as a browser would, and tick() below
|
||||
@@ -361,24 +316,6 @@ async function bootPopup(stored, options) {
|
||||
globalThis.clearInterval = (id) => {
|
||||
intervals.delete(id);
|
||||
};
|
||||
// Timeouts, such as the one that clears a flash message, run for real, but
|
||||
// each is recorded until it fires or is cleared, so cleanupPopup() can
|
||||
// clear the ones still pending. One that fired after the page was removed
|
||||
// would throw "document is not defined" into whatever test the worker runs
|
||||
// by then. jest.useFakeTimers() in a test does not reach them. Put back by
|
||||
// cleanupPopup().
|
||||
globalThis.setTimeout = (fn, ms, ...args) => {
|
||||
const timer = realSetTimeout(() => {
|
||||
pendingTimeouts.delete(timer);
|
||||
fn(...args);
|
||||
}, ms);
|
||||
pendingTimeouts.add(timer);
|
||||
return timer;
|
||||
};
|
||||
globalThis.clearTimeout = (timer) => {
|
||||
pendingTimeouts.delete(timer);
|
||||
realClearTimeout(timer);
|
||||
};
|
||||
|
||||
require("../../src/popup/index");
|
||||
|
||||
@@ -444,11 +381,6 @@ function cleanupPopup() {
|
||||
delete globalThis.window;
|
||||
globalThis.setInterval = realSetInterval;
|
||||
globalThis.clearInterval = realClearInterval;
|
||||
for (const timer of pendingTimeouts) realClearTimeout(timer);
|
||||
pendingTimeouts.clear();
|
||||
globalThis.setTimeout = realSetTimeout;
|
||||
globalThis.clearTimeout = realClearTimeout;
|
||||
globalThis.fetch = realFetch;
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// A chrome.storage stub that behaves like the real one.
|
||||
// A chrome.storage.local stub that behaves like the real one.
|
||||
//
|
||||
// The real extension storage API is a serialization boundary: `set` writes a
|
||||
// structured clone of what it is given, and `get` hands back a structured
|
||||
@@ -17,8 +17,13 @@
|
||||
// So every test that drives real persistence uses this, and nothing rebuilds
|
||||
// a storage stub by hand.
|
||||
|
||||
// One storage area: get, set and remove over its own store, cloning both ways.
|
||||
function makeArea(store, tick) {
|
||||
// `initial` is the starting contents, keyed as storage is: { autistmask: {...} }.
|
||||
// `onOp` runs before each operation, for a test that needs to advance a clock
|
||||
// or count round trips.
|
||||
function makeStorageStub(initial, onOp) {
|
||||
const store = initial ? structuredClone(initial) : {};
|
||||
const tick = onOp || (() => {});
|
||||
|
||||
const get = jest.fn(async (key) => {
|
||||
tick();
|
||||
if (key === undefined || key === null) return structuredClone(store);
|
||||
@@ -44,28 +49,15 @@ function makeArea(store, tick) {
|
||||
for (const k of Array.isArray(key) ? key : [key]) delete store[k];
|
||||
});
|
||||
|
||||
return { get, set, remove };
|
||||
}
|
||||
|
||||
// `initial` is the starting contents of `storage.local`, keyed as storage is:
|
||||
// { autistmask: {...} }. `storage.session` starts empty.
|
||||
// `onOp` runs before each operation on either area, for a test that needs to
|
||||
// advance a clock or count round trips.
|
||||
function makeStorageStub(initial, onOp) {
|
||||
const store = initial ? structuredClone(initial) : {};
|
||||
const tick = onOp || (() => {});
|
||||
const local = makeArea(store, tick);
|
||||
|
||||
return {
|
||||
// Drop this straight in as chrome.storage.
|
||||
local,
|
||||
session: makeArea({}, tick),
|
||||
get: local.get,
|
||||
set: local.set,
|
||||
remove: local.remove,
|
||||
// What is stored in `storage.local`, cloned on the way out: a test can
|
||||
// neither observe a later write through an object it read nor reach
|
||||
// into the store by mutating one.
|
||||
local: { get, set, remove },
|
||||
get,
|
||||
set,
|
||||
remove,
|
||||
// What is stored, cloned on the way out: a test can neither observe a
|
||||
// later write through an object it read nor reach into the store by
|
||||
// mutating one.
|
||||
read: (key) =>
|
||||
key === undefined
|
||||
? structuredClone(store)
|
||||
|
||||
@@ -1,342 +0,0 @@
|
||||
// The amount the wait and error screens show for a swap whose amount the
|
||||
// decoder did not read (https://git.eeqj.de/sneak/AutistMask/issues/358).
|
||||
//
|
||||
// A V4 swap action not in the deployed shape is not read, and a V4 exact-out
|
||||
// action is read for its currencies only, so the approval screen has no
|
||||
// Amount line for either. The wait and error screens then showed the
|
||||
// transaction's ETH value as the amount, in the swap's input token when the
|
||||
// calldata named one ("0.0000 WETH" for a swap of 1 WETH) and in ETH when it
|
||||
// did not ("0.0000 ETH"). They now say the amount could not be decoded. A swap
|
||||
// paid in native ETH still shows the transaction's ETH value there: that value
|
||||
// is the ETH the swap pays.
|
||||
//
|
||||
// Driven through the real approval screen, password and Confirm included,
|
||||
// against a minimal DOM stub in the shape tests/approvalNonce.test.js uses.
|
||||
// The vault is mocked so that no password has to be hashed.
|
||||
|
||||
jest.mock("../src/shared/vault", () => ({
|
||||
decryptWithPassword: jest.fn(),
|
||||
}));
|
||||
|
||||
// The wait screen polls for a receipt, which is there once mockReceipt is set.
|
||||
let mockReceipt = null;
|
||||
jest.mock("../src/shared/balances", () => ({
|
||||
getProvider: () => ({ getTransactionReceipt: async () => mockReceipt }),
|
||||
refreshBalances: () => {},
|
||||
}));
|
||||
|
||||
globalThis.chrome = {
|
||||
storage: { local: { get: async () => ({}), set: async () => {} } },
|
||||
};
|
||||
|
||||
const { AbiCoder, Interface } = require("ethers");
|
||||
const { state } = require("../src/shared/state");
|
||||
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 TX_HASH = "0x" + "4".repeat(64);
|
||||
|
||||
const ROUTER = "0x66a9893cc07d91d95644aedd05d03f95e1dba8af";
|
||||
const ZERO = "0x0000000000000000000000000000000000000000";
|
||||
// Both in the bundled list: WETH at 18 decimals, USDC at 6.
|
||||
const WETH = "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2";
|
||||
const USDC = "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48";
|
||||
const ONE_WETH = 1000000000000000000n;
|
||||
|
||||
const coder = AbiCoder.defaultAbiCoder();
|
||||
const routerIface = new Interface([
|
||||
"function execute(bytes commands, bytes[] inputs, uint256 deadline)",
|
||||
]);
|
||||
|
||||
// V4 action ids and their parameters, each swapping WETH for USDC.
|
||||
const POOL_KEY = "tuple(address,address,uint24,int24,address)";
|
||||
const WETH_USDC_POOL = [WETH, USDC, 100, 1, ZERO];
|
||||
const SWAP_EXACT_IN_SINGLE = 0x06;
|
||||
const SWAP_EXACT_OUT_SINGLE = 0x08;
|
||||
const SETTLE = 0x0b;
|
||||
const SETTLE_ALL = 0x0c;
|
||||
const TAKE = 0x0e;
|
||||
const TAKE_ALL = 0x0f;
|
||||
|
||||
// The struct V4Router has deployed on mainnet and Sepolia.
|
||||
const exactInSingle = coder.encode(
|
||||
[`tuple(${POOL_KEY},bool,uint128,uint128,bytes)`],
|
||||
[[WETH_USDC_POOL, true, ONE_WETH, 990000n, "0x"]],
|
||||
);
|
||||
// The one v4-periphery `main` has moved to, with a `minHopPriceX36` field.
|
||||
const newerExactInSingle = coder.encode(
|
||||
[`tuple(${POOL_KEY},bool,uint128,uint128,uint256,bytes)`],
|
||||
[[WETH_USDC_POOL, true, ONE_WETH, 990000n, 0n, "0x"]],
|
||||
);
|
||||
// Deployed shape: buys 990000 base units of USDC for at most 1 WETH.
|
||||
const exactOutSingle = coder.encode(
|
||||
[`tuple(${POOL_KEY},bool,uint128,uint128,bytes)`],
|
||||
[[WETH_USDC_POOL, true, 990000n, ONE_WETH, "0x"]],
|
||||
);
|
||||
const settleWeth = coder.encode(
|
||||
["address", "uint256", "bool"],
|
||||
[WETH, 0n, true],
|
||||
);
|
||||
const takeUsdc = coder.encode(
|
||||
["address", "address", "uint256"],
|
||||
[USDC, FROM, 0n],
|
||||
);
|
||||
const settleAllWeth = coder.encode(["address", "uint256"], [WETH, ONE_WETH]);
|
||||
const takeAllUsdc = coder.encode(["address", "uint256"], [USDC, 990000n]);
|
||||
|
||||
// The same swaps paid in native ETH, which V4 names as the zero address.
|
||||
const ETH_USDC_POOL = [ZERO, USDC, 500, 10, ZERO];
|
||||
const ONE_ETH = 1000000000000000000n;
|
||||
const ethExactOutSingle = coder.encode(
|
||||
[`tuple(${POOL_KEY},bool,uint128,uint128,bytes)`],
|
||||
[[ETH_USDC_POOL, true, 990000n, ONE_ETH, "0x"]],
|
||||
);
|
||||
const newerEthExactInSingle = coder.encode(
|
||||
[`tuple(${POOL_KEY},bool,uint128,uint128,uint256,bytes)`],
|
||||
[[ETH_USDC_POOL, true, ONE_ETH, 990000n, 0n, "0x"]],
|
||||
);
|
||||
// The router pays it from the ETH the transaction sends.
|
||||
const settleEth = coder.encode(
|
||||
["address", "uint256", "bool"],
|
||||
[ZERO, 0n, false],
|
||||
);
|
||||
|
||||
// execute() with one V4_SWAP step of these actions, given as [id, params].
|
||||
function v4SwapData(actions) {
|
||||
const input = coder.encode(
|
||||
["bytes", "bytes[]"],
|
||||
[new Uint8Array(actions.map((a) => a[0])), actions.map((a) => a[1])],
|
||||
);
|
||||
return routerIface.encodeFunctionData("execute", [
|
||||
"0x10",
|
||||
[input],
|
||||
9999999999n,
|
||||
]);
|
||||
}
|
||||
|
||||
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()));
|
||||
}
|
||||
|
||||
// Open the approval screen for this calldata, sent to the router with `value`
|
||||
// wei (no ETH unless given), and confirm it. The background answers the signed
|
||||
// transaction with `response`.
|
||||
async function approveSwap(data, response, value = 0n) {
|
||||
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(response);
|
||||
reply({
|
||||
type: "tx",
|
||||
origin: "https://dapp.example",
|
||||
isPhishingDomain: false,
|
||||
approvedFrom: FROM,
|
||||
approvedTx: {
|
||||
type: 2,
|
||||
from: FROM,
|
||||
chainId: "0x1",
|
||||
nonce: "0x7",
|
||||
gasLimit: "0x30d40",
|
||||
maxPriorityFeePerGas: "0x3b9aca00",
|
||||
maxFeePerGas: "0x77359400",
|
||||
to: ROUTER,
|
||||
value: "0x" + value.toString(16),
|
||||
data,
|
||||
accessList: [],
|
||||
},
|
||||
});
|
||||
},
|
||||
};
|
||||
state.activeAddress = FROM;
|
||||
state.trackedTokens = [];
|
||||
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: [] },
|
||||
],
|
||||
},
|
||||
];
|
||||
txStatus.init({ doRefreshAndRender: () => {} });
|
||||
approval.init({});
|
||||
await approval.show(1);
|
||||
decryptWithPassword.mockResolvedValue(PHRASE);
|
||||
node("approve-tx-password").value = "any password";
|
||||
await click("btn-approve-tx");
|
||||
}
|
||||
|
||||
afterEach(() => {
|
||||
txStatus.endWait();
|
||||
mockReceipt = null;
|
||||
});
|
||||
|
||||
describe.each([
|
||||
[
|
||||
"a swap action in the deployed shape",
|
||||
[
|
||||
[SWAP_EXACT_IN_SINGLE, exactInSingle],
|
||||
[SETTLE, settleWeth],
|
||||
[TAKE, takeUsdc],
|
||||
],
|
||||
"1.0000 WETH",
|
||||
],
|
||||
[
|
||||
"a swap action in the newer shape, with SETTLE naming WETH",
|
||||
[
|
||||
[SWAP_EXACT_IN_SINGLE, newerExactInSingle],
|
||||
[SETTLE, settleWeth],
|
||||
[TAKE, takeUsdc],
|
||||
],
|
||||
"Unknown (could not be decoded)",
|
||||
],
|
||||
[
|
||||
"a swap action in the newer shape, with SETTLE_ALL and TAKE_ALL",
|
||||
[
|
||||
[SWAP_EXACT_IN_SINGLE, newerExactInSingle],
|
||||
[SETTLE_ALL, settleAllWeth],
|
||||
[TAKE_ALL, takeAllUsdc],
|
||||
],
|
||||
"Unknown (could not be decoded)",
|
||||
],
|
||||
[
|
||||
"an exact-out swap action, which is read for its currencies only",
|
||||
[
|
||||
[SWAP_EXACT_OUT_SINGLE, exactOutSingle],
|
||||
[SETTLE, settleWeth],
|
||||
[TAKE, takeUsdc],
|
||||
],
|
||||
"Unknown (could not be decoded)",
|
||||
],
|
||||
])("%s", (_name, actions, expected) => {
|
||||
test("the wait screen's amount", async () => {
|
||||
await approveSwap(v4SwapData(actions), { txHash: TX_HASH });
|
||||
expect(node("wait-tx-summary").textContent).toBe(expected);
|
||||
});
|
||||
|
||||
test("the error screen's amount", async () => {
|
||||
await approveSwap(v4SwapData(actions), {
|
||||
error: "The transaction could not be sent.",
|
||||
retryable: false,
|
||||
});
|
||||
expect(node("error-tx-summary").textContent).toBe(expected);
|
||||
});
|
||||
|
||||
// The success screen shows the approval screen's decoded lines in place
|
||||
// of the amount, so the ETH value is not on it either.
|
||||
test("the success screen has no amount line of its own", async () => {
|
||||
await approveSwap(v4SwapData(actions), { txHash: TX_HASH });
|
||||
mockReceipt = { blockNumber: 1 };
|
||||
// A later popup resumes the wait, and the receipt is there.
|
||||
txStatus.restoreWait();
|
||||
for (let i = 0; i < 10; i++) {
|
||||
await new Promise((r) => setTimeout(r, 0));
|
||||
}
|
||||
const summary = node("success-tx-summary").parentElement;
|
||||
expect(summary.classList.contains("hidden")).toBe(true);
|
||||
expect(node("success-tx-decoded").innerHTML).not.toContain("0.0000");
|
||||
});
|
||||
});
|
||||
|
||||
// A swap paid in native ETH has a Token In of "ETH (native)" and no Amount
|
||||
// line, and sends 1 ETH.
|
||||
describe.each([
|
||||
[
|
||||
"an exact-out swap action paid in ETH, in the deployed shape",
|
||||
[
|
||||
[SWAP_EXACT_OUT_SINGLE, ethExactOutSingle],
|
||||
[SETTLE, settleEth],
|
||||
[TAKE, takeUsdc],
|
||||
],
|
||||
],
|
||||
[
|
||||
"a swap action in the newer shape paid in ETH, with SETTLE naming ETH",
|
||||
[
|
||||
[SWAP_EXACT_IN_SINGLE, newerEthExactInSingle],
|
||||
[SETTLE, settleEth],
|
||||
[TAKE, takeUsdc],
|
||||
],
|
||||
],
|
||||
])("%s", (_name, actions) => {
|
||||
test("the wait screen shows the ETH the transaction sends", async () => {
|
||||
await approveSwap(v4SwapData(actions), { txHash: TX_HASH }, ONE_ETH);
|
||||
expect(node("wait-tx-summary").textContent).toBe("1.0000 ETH");
|
||||
});
|
||||
|
||||
test("the error screen shows the ETH the transaction sends", async () => {
|
||||
await approveSwap(
|
||||
v4SwapData(actions),
|
||||
{
|
||||
error: "The transaction could not be sent.",
|
||||
retryable: false,
|
||||
},
|
||||
ONE_ETH,
|
||||
);
|
||||
expect(node("error-tx-summary").textContent).toBe("1.0000 ETH");
|
||||
});
|
||||
});
|
||||
@@ -1,176 +0,0 @@
|
||||
// The decoded details on the transaction detail screen of a token transfer
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/515).
|
||||
//
|
||||
// A history row for a token transfer holds the transfer's recipient as its
|
||||
// `to`, not the contract the transaction was sent to. The screen used to decode
|
||||
// the transaction's data against that `to`, so its Token line named the
|
||||
// recipient, and the amount read "decimals unknown" for a token the wallet
|
||||
// tracks. It decodes against the address the explorer reports the transaction
|
||||
// was sent to.
|
||||
//
|
||||
// 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
|
||||
// calls. Driven against a minimal DOM stub in the shape
|
||||
// tests/contractCreation.test.js uses.
|
||||
|
||||
const { Interface } = require("ethers");
|
||||
|
||||
jest.mock("../src/shared/log", () => ({
|
||||
log: {
|
||||
debugf: () => {},
|
||||
infof: () => {},
|
||||
warnf: () => {},
|
||||
errorf: () => {},
|
||||
},
|
||||
debugFetch: async (url) => ({
|
||||
ok: true,
|
||||
json: async () => mockExplorerAnswer(url),
|
||||
}),
|
||||
setRuntimeDebug: () => {},
|
||||
isDebug: () => false,
|
||||
}));
|
||||
|
||||
globalThis.chrome = {
|
||||
storage: { local: { get: async () => ({}), set: async () => {} } },
|
||||
};
|
||||
|
||||
const { state } = require("../src/shared/state");
|
||||
const { fetchRecentTransactions } = require("../src/shared/transactions");
|
||||
const transactionDetail = require("../src/popup/views/transactionDetail");
|
||||
|
||||
const EXPLORER = "https://explorer.example/api/v2";
|
||||
const HOLDER = "0x0000000000000000000000000000000000000a11";
|
||||
const RECIPIENT = "0x711e691962E5c054b78071C789A0C8CE657377aD";
|
||||
// A token the wallet tracks and the bundled token list does not name.
|
||||
const TOKEN = "0x74de5d4FCbf63E00296fd95d33236B9794016631";
|
||||
const TX_HASH =
|
||||
"0x85215772ed26ea8b39c2b3b18779030487efbe0b5fd7e882592b2f62b837be84";
|
||||
|
||||
// HOLDER 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]);
|
||||
|
||||
// The explorer's answers: the transfer in HOLDER's token transfers, and the
|
||||
// transaction itself, sent to the token contract.
|
||||
function mockExplorerAnswer(url) {
|
||||
if (
|
||||
url ===
|
||||
EXPLORER + "/addresses/" + HOLDER + "/token-transfers?type=ERC-20"
|
||||
) {
|
||||
return {
|
||||
items: [
|
||||
{
|
||||
transaction_hash: TX_HASH,
|
||||
block_number: 100,
|
||||
timestamp: "2026-10-01T00:00:00Z",
|
||||
from: { hash: HOLDER },
|
||||
to: { hash: RECIPIENT },
|
||||
total: { value: "1234500000", decimals: "6" },
|
||||
token: {
|
||||
address_hash: TOKEN,
|
||||
symbol: "TDOL",
|
||||
holders_count: "5000",
|
||||
},
|
||||
},
|
||||
],
|
||||
};
|
||||
}
|
||||
if (url === EXPLORER + "/transactions/" + TX_HASH) {
|
||||
return { to: { hash: TOKEN }, raw_input: TRANSFER_DATA };
|
||||
}
|
||||
return { items: [] };
|
||||
}
|
||||
|
||||
function makeElement(id) {
|
||||
const classes = new Set();
|
||||
const el = {
|
||||
id,
|
||||
textContent: "",
|
||||
value: "",
|
||||
innerHTML: "",
|
||||
style: {},
|
||||
dataset: {},
|
||||
classList: {
|
||||
add: (...names) => names.forEach((n) => classes.add(n)),
|
||||
remove: (...names) => names.forEach((n) => classes.delete(n)),
|
||||
contains: (n) => classes.has(n),
|
||||
toggle: () => false,
|
||||
},
|
||||
addEventListener: () => {},
|
||||
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);
|
||||
}
|
||||
|
||||
// One line of the decoded details: its label and what is drawn under it.
|
||||
function decodedLine(label) {
|
||||
return node("tx-detail-calldata-details")
|
||||
.innerHTML.split('<div class="mb-2">')
|
||||
.find((line) =>
|
||||
line.startsWith(`<div class="text-muted">${label}</div>`),
|
||||
);
|
||||
}
|
||||
|
||||
beforeEach(() => {
|
||||
globalThis.document = makeDocument();
|
||||
globalThis.window = { location: { search: "" } };
|
||||
state.blockscoutUrl = EXPLORER;
|
||||
state.wallets = [
|
||||
{
|
||||
name: "Main",
|
||||
type: "key",
|
||||
addresses: [{ address: HOLDER, balance: "0.0000" }],
|
||||
},
|
||||
];
|
||||
state.trackedTokens = [{ address: TOKEN, symbol: "TDOL", decimals: 6 }];
|
||||
state.viewData = {};
|
||||
state.viewStack = [];
|
||||
state.currentView = null;
|
||||
});
|
||||
|
||||
test("a token transfer's decoded details name the token contract and the amount at its scale", async () => {
|
||||
const [row] = await fetchRecentTransactions(HOLDER, EXPLORER, 1);
|
||||
expect(row.to).toBe(RECIPIENT);
|
||||
expect(row.contractAddress).toBe(TOKEN.toLowerCase());
|
||||
|
||||
transactionDetail.show(row);
|
||||
// The decoded details are drawn once the explorer has answered.
|
||||
for (let i = 0; i < 10; i++) await new Promise((r) => setTimeout(r, 0));
|
||||
|
||||
expect(node("tx-detail-calldata-action").textContent).toBe(
|
||||
"Token Transfer",
|
||||
);
|
||||
const token = decodedLine("Token");
|
||||
expect(token).toContain('<div class="font-bold">TDOL</div>');
|
||||
expect(token).toContain(TOKEN);
|
||||
expect(token).not.toContain(RECIPIENT);
|
||||
expect(decodedLine("Recipient")).toContain(RECIPIENT);
|
||||
expect(decodedLine("Amount")).toContain(
|
||||
'<div class="font-bold">1234.5000 TDOL</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]);
|
||||
});
|
||||
});
|
||||
@@ -116,12 +116,6 @@ describe("transferAmountUnits", () => {
|
||||
expect(() => transferAmountUnits("0.0000001", 6, 6n)).toThrow();
|
||||
});
|
||||
|
||||
test("encodes zeros past the token's scale as the amount typed", () => {
|
||||
// The Send screen accepts "1.0000000" for a 6-place token, so the
|
||||
// transfer must move exactly 1 of it.
|
||||
expect(transferAmountUnits("1.0000000", 6, 6n)).toBe(1000000n);
|
||||
});
|
||||
|
||||
test("every refusal is a full sentence", () => {
|
||||
const messages = [];
|
||||
for (const args of [
|
||||
|
||||
@@ -6,7 +6,6 @@ const {
|
||||
FEE_UNAVAILABLE,
|
||||
feeReserveWei,
|
||||
feeEstimateWei,
|
||||
isValidAmount,
|
||||
maxEthAmount,
|
||||
maxTokenAmount,
|
||||
toFixedPoint,
|
||||
@@ -34,49 +33,6 @@ describe("toFixedPoint", () => {
|
||||
});
|
||||
});
|
||||
|
||||
// The one amount check the Send screen and the confirmation screen share.
|
||||
// The screens themselves are driven in tests/sendAmountRule.test.js.
|
||||
describe("isValidAmount", () => {
|
||||
test("accepts a number above zero written as digits and a decimal point", () => {
|
||||
expect(isValidAmount("0.5")).toBe(true);
|
||||
expect(isValidAmount("12")).toBe(true);
|
||||
expect(isValidAmount(".5")).toBe(true);
|
||||
expect(isValidAmount("0.000000000000000001")).toBe(true);
|
||||
});
|
||||
|
||||
test("refuses an exponent, trailing text, zero and a negative amount", () => {
|
||||
expect(isValidAmount("1e-3")).toBe(false);
|
||||
expect(isValidAmount("1abc")).toBe(false);
|
||||
expect(isValidAmount("0")).toBe(false);
|
||||
expect(isValidAmount("0.0")).toBe(false);
|
||||
expect(isValidAmount("-1")).toBe(false);
|
||||
expect(isValidAmount("")).toBe(false);
|
||||
expect(isValidAmount(undefined)).toBe(false);
|
||||
});
|
||||
|
||||
test("refuses a digit other than 0 past the token's places", () => {
|
||||
expect(isValidAmount("0.000001", 6)).toBe(true);
|
||||
expect(isValidAmount("0.0000001", 6)).toBe(false);
|
||||
expect(isValidAmount("5", 0)).toBe(true);
|
||||
expect(isValidAmount("0.5", 0)).toBe(false);
|
||||
});
|
||||
|
||||
test("accepts zeros past the token's places, which leave the amount unchanged", () => {
|
||||
expect(isValidAmount("1.0000000", 6)).toBe(true);
|
||||
expect(isValidAmount("5.0", 0)).toBe(true);
|
||||
expect(isValidAmount("1.0000000000000000000")).toBe(true);
|
||||
expect(isValidAmount("0.0000000", 6)).toBe(false);
|
||||
});
|
||||
|
||||
test("holds ETH, a token of unknown places, and any token to 18 places", () => {
|
||||
const nineteen = "0.0000000000000000001";
|
||||
expect(isValidAmount(nineteen)).toBe(false);
|
||||
expect(isValidAmount(nineteen, null)).toBe(false);
|
||||
expect(isValidAmount(nineteen, 24)).toBe(false);
|
||||
expect(isValidAmount("0.000000000000000001", 24)).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
describe("validateTransfer, native ETH", () => {
|
||||
const eth = (over) => ({
|
||||
isErc20: false,
|
||||
@@ -178,17 +134,6 @@ describe("validateTransfer, native ETH", () => {
|
||||
).toEqual({ canSend: false, codes: [CODES.AMOUNT_INVALID] });
|
||||
});
|
||||
|
||||
test("rejects a zero amount and an exponent", () => {
|
||||
expect(validateTransfer(eth({ amount: "0" }))).toEqual({
|
||||
canSend: false,
|
||||
codes: [CODES.AMOUNT_INVALID],
|
||||
});
|
||||
expect(validateTransfer(eth({ amount: "1e-3" }))).toEqual({
|
||||
canSend: false,
|
||||
codes: [CODES.AMOUNT_INVALID],
|
||||
});
|
||||
});
|
||||
|
||||
test("treats a missing balance as zero, not as unlimited", () => {
|
||||
const r = validateTransfer(eth({ ethBalance: undefined }));
|
||||
expect(r.codes).toEqual([CODES.INSUFFICIENT_ETH]);
|
||||
@@ -260,16 +205,6 @@ describe("validateTransfer, ERC-20", () => {
|
||||
expect(r).toEqual({ canSend: false, codes: [CODES.AMOUNT_INVALID] });
|
||||
});
|
||||
|
||||
test("rejects more decimal places than the token has", () => {
|
||||
const r = validateTransfer(
|
||||
erc20({ amount: "0.0000001", tokenDecimals: 6 }),
|
||||
);
|
||||
expect(r).toEqual({ canSend: false, codes: [CODES.AMOUNT_INVALID] });
|
||||
expect(
|
||||
validateTransfer(erc20({ amount: "0.000001", tokenDecimals: 6 })),
|
||||
).toEqual({ canSend: true, codes: [] });
|
||||
});
|
||||
|
||||
test("treats a missing token balance as zero", () => {
|
||||
const r = validateTransfer(erc20({ tokenBalance: undefined }));
|
||||
expect(r.codes).toEqual([CODES.INSUFFICIENT_TOKEN]);
|
||||
|
||||
@@ -28,7 +28,7 @@ globalThis.chrome = {
|
||||
storage: { local: { get: async () => ({}), set: async () => {} } },
|
||||
};
|
||||
|
||||
const { getAddress, MaxUint256, TypedDataEncoder } = require("ethers");
|
||||
const { getAddress, MaxUint256 } = require("ethers");
|
||||
const { state } = require("../src/shared/state");
|
||||
const { decryptWithPassword } = require("../src/shared/vault");
|
||||
const approval = require("../src/popup/views/approval");
|
||||
@@ -233,26 +233,6 @@ function warningOf(data) {
|
||||
return html.slice(0, html.indexOf(">Domain<"));
|
||||
}
|
||||
|
||||
const NOT_SIGNED = ">Not part of the signature<";
|
||||
|
||||
// The Message section alone, without the keys listed after it as not part of
|
||||
// the signature.
|
||||
function messageOf(data) {
|
||||
const html = formatTypedDataHtml(JSON.stringify(data));
|
||||
const end = html.indexOf(NOT_SIGNED);
|
||||
return html.slice(
|
||||
html.indexOf(">Message<"),
|
||||
end === -1 ? html.length : end,
|
||||
);
|
||||
}
|
||||
|
||||
// The keys listed as not part of the signature, or "" when there are none.
|
||||
function notSignedOf(data) {
|
||||
const html = formatTypedDataHtml(JSON.stringify(data));
|
||||
const start = html.indexOf(NOT_SIGNED);
|
||||
return start === -1 ? "" : html.slice(start);
|
||||
}
|
||||
|
||||
function request(data) {
|
||||
return { method: "eth_signTypedData_v4", typedData: JSON.stringify(data) };
|
||||
}
|
||||
@@ -260,7 +240,6 @@ function request(data) {
|
||||
beforeEach(() => {
|
||||
state.trackedTokens = [];
|
||||
state.wallets = [];
|
||||
state.networkId = "mainnet";
|
||||
});
|
||||
|
||||
describe("a token permission is warned about, naming spender and amount", () => {
|
||||
@@ -332,8 +311,7 @@ describe("the warning reads only the fields the signed type declares", () => {
|
||||
});
|
||||
|
||||
// A Permit whose type names its spender `operator`; the page adds a
|
||||
// `spender` key the type does not declare. The Message section names
|
||||
// only the operator, and the added key is listed apart as not signed.
|
||||
// `spender` key the type does not declare.
|
||||
test("an added key is not named as the spender", () => {
|
||||
const data = {
|
||||
...PERMIT,
|
||||
@@ -352,10 +330,6 @@ describe("the warning reads only the fields the signed type declares", () => {
|
||||
const warning = warningOf(data);
|
||||
expect(warning).toContain(WARNING);
|
||||
expect(warning).not.toContain(DECOY);
|
||||
expect(messageOf(data)).toContain(SPENDER);
|
||||
expect(messageOf(data)).not.toContain(DECOY);
|
||||
expect(notSignedOf(data)).toContain("spender:");
|
||||
expect(notSignedOf(data)).toContain(DECOY);
|
||||
});
|
||||
|
||||
// The permit for a Uniswap v3 position NFT: a `Permit` with no amount
|
||||
@@ -396,47 +370,6 @@ describe("the warning reads only the fields the signed type declares", () => {
|
||||
});
|
||||
});
|
||||
|
||||
// ethers signs only the declared fields at every level of nesting, so an
|
||||
// added key inside a struct is not signed either. Such typed data is not
|
||||
// refused; the added key is listed apart, with where it sits in the message.
|
||||
describe("the Message section shows only the fields that are signed", () => {
|
||||
const NOTE = "This signature only signs you in";
|
||||
|
||||
test("an added key inside a nested struct is listed as not signed", () => {
|
||||
const data = {
|
||||
...PERMIT_SINGLE,
|
||||
message: {
|
||||
...PERMIT_SINGLE.message,
|
||||
details: { ...PERMIT_SINGLE.message.details, note: NOTE },
|
||||
},
|
||||
};
|
||||
expect(messageOf(data)).toContain("expiration");
|
||||
expect(messageOf(data)).not.toContain(NOTE);
|
||||
expect(notSignedOf(data)).toContain("details.note:");
|
||||
expect(notSignedOf(data)).toContain(NOTE);
|
||||
expect(typedDataRefusal(request(data))).toBeNull();
|
||||
});
|
||||
|
||||
test("an added key inside a list item is listed with its index", () => {
|
||||
const [first, second] = PERMIT_BATCH.message.details;
|
||||
const data = {
|
||||
...PERMIT_BATCH,
|
||||
message: {
|
||||
...PERMIT_BATCH.message,
|
||||
details: [first, { ...second, note: NOTE }],
|
||||
},
|
||||
};
|
||||
expect(messageOf(data)).not.toContain(NOTE);
|
||||
expect(notSignedOf(data)).toContain("details[1].note:");
|
||||
expect(notSignedOf(data)).toContain(NOTE);
|
||||
});
|
||||
|
||||
test("nothing is listed apart when every key is declared", () => {
|
||||
expect(notSignedOf(PERMIT_SINGLE)).toBe("");
|
||||
expect(notSignedOf(LOGIN)).toBe("");
|
||||
});
|
||||
});
|
||||
|
||||
describe("the primary type shown is the one ethers signs", () => {
|
||||
// A drain stated as a sign-in: the page says Login, the types say
|
||||
// PermitSingle, and ethers would sign PermitSingle.
|
||||
@@ -599,170 +532,3 @@ describe("the sign screen refuses a mismatched primary type", () => {
|
||||
expect(node("btn-approve-sign").disabled).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
// EIP-712: a wallet refuses typed data whose domain names a chain other than
|
||||
// the active one, because the signature is valid on the chain it names
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/519). The wallet is on Sepolia
|
||||
// and the site asks for a mainnet USDC Permit.
|
||||
describe("the sign screen refuses typed data for another chain", () => {
|
||||
const REFUSAL =
|
||||
"This typed data is for chain id 1, but the active network is Sepolia Testnet (chain id 11155111), so it cannot be signed.";
|
||||
|
||||
function withChainId(chainId) {
|
||||
return { ...PERMIT, domain: { ...PERMIT.domain, chainId } };
|
||||
}
|
||||
|
||||
beforeEach(() => {
|
||||
decryptWithPassword.mockClear();
|
||||
state.networkId = "sepolia";
|
||||
});
|
||||
|
||||
test("another chain shows the error, with Sign disabled", async () => {
|
||||
await openSignScreen(PERMIT);
|
||||
expect(node("approve-sign-error").textContent).toBe(REFUSAL);
|
||||
expect(node("btn-approve-sign").disabled).toBe(true);
|
||||
});
|
||||
|
||||
test("Sign clicked anyway decrypts and signs nothing", async () => {
|
||||
const sent = await openSignScreen(PERMIT);
|
||||
node("approve-sign-password").value = "any password";
|
||||
await click("btn-approve-sign");
|
||||
|
||||
expect(decryptWithPassword).not.toHaveBeenCalled();
|
||||
expect(sent.map((msg) => msg.type)).not.toContain(
|
||||
"AUTISTMASK_SIGN_RESPONSE",
|
||||
);
|
||||
expect(node("approve-sign-error").textContent).toBe(REFUSAL);
|
||||
});
|
||||
|
||||
// ethers signs 1, "1" and "0x1" as the same chain id.
|
||||
test("the chain id is refused in each form ethers signs", () => {
|
||||
for (const chainId of [1, "1", "0x1"]) {
|
||||
expect(typedDataRefusal(request(withChainId(chainId)))).toBe(
|
||||
REFUSAL,
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
test("a chain id that is not a number is refused", () => {
|
||||
expect(typedDataRefusal(request(withChainId("mainnet")))).toBe(
|
||||
"This typed data cannot be read, so it cannot be signed.",
|
||||
);
|
||||
});
|
||||
|
||||
test("the active chain leaves Sign enabled", async () => {
|
||||
await openSignScreen(withChainId("0xaa36a7"));
|
||||
expect(node("approve-sign-error").textContent).toBe("");
|
||||
expect(node("btn-approve-sign").disabled).toBe(false);
|
||||
});
|
||||
|
||||
test("no chain id leaves Sign enabled", async () => {
|
||||
await openSignScreen(withChainId(undefined));
|
||||
expect(node("approve-sign-error").textContent).toBe("");
|
||||
expect(node("btn-approve-sign").disabled).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
// ethers signs a `bool` field by whether its value is truthy in JavaScript:
|
||||
// the string "false" is signed as true, and a field left out as false. The
|
||||
// screen would show one value while another is signed, so such typed data is
|
||||
// refused, and so is any declared field left out of the message
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/552). DAI's older permit
|
||||
// declares the `bool` field `allowed`.
|
||||
describe("the sign screen refuses a message ethers would sign differently", () => {
|
||||
const NOT_A_BOOL =
|
||||
'The field "allowed" is not true or false, so this typed data cannot be signed.';
|
||||
const MISSING =
|
||||
'The field "allowed" is missing from the message, so this typed data cannot be signed.';
|
||||
|
||||
function daiPermit(allowed) {
|
||||
return { ...DAI_PERMIT, message: { ...DAI_PERMIT.message, allowed } };
|
||||
}
|
||||
|
||||
const withoutAllowed = {
|
||||
...DAI_PERMIT,
|
||||
message: { ...DAI_PERMIT.message },
|
||||
};
|
||||
delete withoutAllowed.message.allowed;
|
||||
|
||||
beforeEach(() => {
|
||||
decryptWithPassword.mockClear();
|
||||
});
|
||||
|
||||
test('ethers signs "false" as true, and a bool left out as false', () => {
|
||||
const hash = (data) =>
|
||||
TypedDataEncoder.hash(
|
||||
data.domain,
|
||||
{ Permit: data.types.Permit },
|
||||
data.message,
|
||||
);
|
||||
expect(hash(daiPermit("false"))).toBe(hash(daiPermit(true)));
|
||||
expect(hash(withoutAllowed)).toBe(hash(daiPermit(false)));
|
||||
});
|
||||
|
||||
test('a bool sent as the string "false" shows the error, with Sign disabled', async () => {
|
||||
await openSignScreen(daiPermit("false"));
|
||||
expect(node("approve-sign-error").textContent).toBe(NOT_A_BOOL);
|
||||
expect(node("btn-approve-sign").disabled).toBe(true);
|
||||
});
|
||||
|
||||
test("a bool left out shows the error, with Sign disabled", async () => {
|
||||
await openSignScreen(withoutAllowed);
|
||||
expect(node("approve-sign-error").textContent).toBe(MISSING);
|
||||
expect(node("btn-approve-sign").disabled).toBe(true);
|
||||
});
|
||||
|
||||
test("Sign clicked anyway decrypts and signs nothing", async () => {
|
||||
const sent = await openSignScreen(daiPermit("false"));
|
||||
node("approve-sign-password").value = "any password";
|
||||
await click("btn-approve-sign");
|
||||
|
||||
expect(decryptWithPassword).not.toHaveBeenCalled();
|
||||
expect(sent.map((msg) => msg.type)).not.toContain(
|
||||
"AUTISTMASK_SIGN_RESPONSE",
|
||||
);
|
||||
expect(node("approve-sign-error").textContent).toBe(NOT_A_BOOL);
|
||||
});
|
||||
|
||||
test("a well-formed message leaves Sign enabled", async () => {
|
||||
for (const allowed of [true, false]) {
|
||||
await openSignScreen(daiPermit(allowed));
|
||||
expect(node("approve-sign-error").textContent).toBe("");
|
||||
expect(node("btn-approve-sign").disabled).toBe(false);
|
||||
}
|
||||
});
|
||||
|
||||
test("a field left out inside a list item is named by its place", () => {
|
||||
const [first, second] = PERMIT_BATCH.message.details;
|
||||
const withoutNonce = { ...second };
|
||||
delete withoutNonce.nonce;
|
||||
const data = {
|
||||
...PERMIT_BATCH,
|
||||
message: {
|
||||
...PERMIT_BATCH.message,
|
||||
details: [first, withoutNonce],
|
||||
},
|
||||
};
|
||||
expect(typedDataRefusal(request(data))).toBe(
|
||||
'The field "details[1].nonce" is missing from the message, so this typed data cannot be signed.',
|
||||
);
|
||||
});
|
||||
|
||||
// A plain lookup of a field named after a built-in object property reads
|
||||
// back a function, which ethers would sign as true.
|
||||
test("a field named after a built-in object property is missing when left out", () => {
|
||||
const data = {
|
||||
...LOGIN,
|
||||
types: {
|
||||
...LOGIN.types,
|
||||
Login: [
|
||||
...LOGIN.types.Login,
|
||||
{ name: "constructor", type: "bool" },
|
||||
],
|
||||
},
|
||||
};
|
||||
expect(typedDataRefusal(request(data))).toBe(
|
||||
'The field "constructor" is missing from the message, so this typed data cannot be signed.',
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
+53
-1063
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,298 +0,0 @@
|
||||
// Which transactions are shown as a swap through the Uniswap Universal Router
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/520).
|
||||
//
|
||||
// The decoder used to recognise the router's execute() call by its selector
|
||||
// alone, so the same calldata sent to an ordinary address was shown as a swap
|
||||
// through the router, with that address as its Protocol. It is now decoded
|
||||
// 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.
|
||||
//
|
||||
// The transaction detail screen and the approval screen are driven against a
|
||||
// minimal DOM stub in the shape tests/tokenTransferDetail.test.js uses, the
|
||||
// approval screen opened the way tests/swapStatusAmount.test.js opens it.
|
||||
|
||||
const { AbiCoder, Interface, getAddress, solidityPacked } = require("ethers");
|
||||
|
||||
jest.mock("../src/shared/log", () => ({
|
||||
log: {
|
||||
debugf: () => {},
|
||||
infof: () => {},
|
||||
warnf: () => {},
|
||||
errorf: () => {},
|
||||
},
|
||||
debugFetch: async (url) => ({
|
||||
ok: true,
|
||||
json: async () => mockExplorerAnswer(url),
|
||||
}),
|
||||
setRuntimeDebug: () => {},
|
||||
isDebug: () => false,
|
||||
}));
|
||||
|
||||
globalThis.chrome = {
|
||||
storage: { local: { get: async () => ({}), set: async () => {} } },
|
||||
};
|
||||
|
||||
const { state } = require("../src/shared/state");
|
||||
const approval = require("../src/popup/views/approval");
|
||||
const { decodeCalldata } = approval;
|
||||
const transactionDetail = require("../src/popup/views/transactionDetail");
|
||||
|
||||
const MAINNET = "0x1";
|
||||
const SEPOLIA = "0xaa36a7";
|
||||
|
||||
// From Uniswap's deployment files: one router on Ethereum Mainnet only, one on
|
||||
// Sepolia only, and one at the same address on both.
|
||||
const MAINNET_ROUTER = "0x66a9893cc07d91d95644aedd05d03f95e1dba8af";
|
||||
const SEPOLIA_ROUTER = "0x3a9d48ab9751398bbfa63ad67599bb04e4bdf98b";
|
||||
const ROUTER_ON_BOTH = "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD";
|
||||
// The address with no code from the issue.
|
||||
const ORDINARY = "0x0b0050Da68435b3EcBC236c40F16dB2070bCD79A";
|
||||
|
||||
const RECIPIENT = "0xC0FfEE0000000000000000000000000000c0fFEe";
|
||||
const SEPOLIA_WETH = "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14";
|
||||
const TOKEN = "0xE2E0000000000000000000000000000000000E2e";
|
||||
const HUNDREDTH_ETH = 10000000000000000n;
|
||||
|
||||
const coder = AbiCoder.defaultAbiCoder();
|
||||
const routerIface = new Interface([
|
||||
"function execute(bytes commands, bytes[] inputs, uint256 deadline)",
|
||||
]);
|
||||
|
||||
// The calldata from the issue: wrap 0.01 ETH, then a V3 swap of it into a
|
||||
// token.
|
||||
const SWAP_DATA = routerIface.encodeFunctionData("execute", [
|
||||
solidityPacked(["uint8", "uint8"], [0x0b, 0x00]),
|
||||
[
|
||||
coder.encode(["address", "uint256"], [RECIPIENT, HUNDREDTH_ETH]),
|
||||
coder.encode(
|
||||
["address", "uint256", "uint256", "bytes", "bool"],
|
||||
[
|
||||
RECIPIENT,
|
||||
HUNDREDTH_ETH,
|
||||
1n,
|
||||
solidityPacked(
|
||||
["address", "uint24", "address"],
|
||||
[SEPOLIA_WETH, 3000, TOKEN],
|
||||
),
|
||||
false,
|
||||
],
|
||||
),
|
||||
],
|
||||
9999999999n,
|
||||
]);
|
||||
|
||||
beforeEach(() => {
|
||||
state.trackedTokens = [];
|
||||
state.wallets = [];
|
||||
});
|
||||
|
||||
describe("execute() calldata on the approval screen's decoder", () => {
|
||||
test("sent to a router on the transaction's network, it is a swap", () => {
|
||||
const onMainnet = decodeCalldata(SWAP_DATA, MAINNET_ROUTER, MAINNET);
|
||||
expect(onMainnet.description).toBe("Swap via Uniswap Universal Router");
|
||||
expect(onMainnet.details[0]).toMatchObject({
|
||||
label: "Protocol",
|
||||
address: MAINNET_ROUTER,
|
||||
});
|
||||
expect(
|
||||
decodeCalldata(SWAP_DATA, SEPOLIA_ROUTER, SEPOLIA).description,
|
||||
).toBe("Swap via Uniswap Universal Router");
|
||||
});
|
||||
|
||||
test("sent to an ordinary address, it is not decoded", () => {
|
||||
expect(decodeCalldata(SWAP_DATA, ORDINARY, MAINNET)).toBeNull();
|
||||
expect(decodeCalldata(SWAP_DATA, ORDINARY, SEPOLIA)).toBeNull();
|
||||
});
|
||||
|
||||
test("sent to a router of the other network only, it is not decoded", () => {
|
||||
expect(decodeCalldata(SWAP_DATA, SEPOLIA_ROUTER, MAINNET)).toBeNull();
|
||||
expect(decodeCalldata(SWAP_DATA, MAINNET_ROUTER, SEPOLIA)).toBeNull();
|
||||
});
|
||||
|
||||
test("a router deployed at the same address on both networks is one on each", () => {
|
||||
expect(
|
||||
decodeCalldata(SWAP_DATA, ROUTER_ON_BOTH, MAINNET),
|
||||
).not.toBeNull();
|
||||
expect(
|
||||
decodeCalldata(SWAP_DATA, ROUTER_ON_BOTH, SEPOLIA),
|
||||
).not.toBeNull();
|
||||
});
|
||||
|
||||
test("the router address matches in any letter case", () => {
|
||||
const upper = "0x" + MAINNET_ROUTER.slice(2).toUpperCase();
|
||||
for (const address of [getAddress(MAINNET_ROUTER), upper]) {
|
||||
expect(decodeCalldata(SWAP_DATA, address, MAINNET)).not.toBeNull();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
// The transaction the explorer reports: SWAP_DATA, sent to `mockSentTo`.
|
||||
const TX_HASH = "0x" + "5".repeat(64);
|
||||
let mockSentTo = null;
|
||||
|
||||
function mockExplorerAnswer(url) {
|
||||
if (url.endsWith("/transactions/" + TX_HASH)) {
|
||||
return {
|
||||
to: { hash: mockSentTo },
|
||||
raw_input: SWAP_DATA,
|
||||
method: "execute",
|
||||
};
|
||||
}
|
||||
return {};
|
||||
}
|
||||
|
||||
function makeElement(id) {
|
||||
const classes = new Set();
|
||||
const el = {
|
||||
id,
|
||||
textContent: "",
|
||||
value: "",
|
||||
innerHTML: "",
|
||||
style: {},
|
||||
dataset: {},
|
||||
classList: {
|
||||
add: (...names) => names.forEach((n) => classes.add(n)),
|
||||
remove: (...names) => names.forEach((n) => classes.delete(n)),
|
||||
contains: (n) => classes.has(n),
|
||||
toggle: () => false,
|
||||
},
|
||||
addEventListener: () => {},
|
||||
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 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 transaction detail screen with Sepolia active, for the
|
||||
// transaction the explorer reports sent to `sentTo`, and wait for its
|
||||
// decoded details.
|
||||
async function showDetailSentTo(sentTo) {
|
||||
mockSentTo = sentTo;
|
||||
globalThis.document = makeDocument();
|
||||
globalThis.window = { location: { search: "" } };
|
||||
state.networkId = "sepolia";
|
||||
state.blockscoutUrl = "https://explorer.example/api/v2";
|
||||
state.viewData = {};
|
||||
state.viewStack = [];
|
||||
state.currentView = null;
|
||||
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));
|
||||
}
|
||||
|
||||
describe("execute() calldata on the transaction detail screen", () => {
|
||||
test("sent to a router on the active network, it is a swap", async () => {
|
||||
await showDetailSentTo(SEPOLIA_ROUTER);
|
||||
expect(node("tx-detail-calldata-details").innerHTML).toContain(
|
||||
"Swap via Uniswap Universal Router",
|
||||
);
|
||||
});
|
||||
|
||||
test("sent to an ordinary address, it is not decoded", async () => {
|
||||
await showDetailSentTo(ORDINARY);
|
||||
expect(node("tx-detail-calldata-action").textContent).toBe("execute");
|
||||
expect(node("tx-detail-calldata-details").innerHTML).toBe("");
|
||||
expect(node("tx-detail-rawdata").innerHTML).toContain(SWAP_DATA);
|
||||
});
|
||||
|
||||
test("sent to a router of the other network only, it is not decoded", async () => {
|
||||
await showDetailSentTo(MAINNET_ROUTER);
|
||||
expect(node("tx-detail-calldata-action").textContent).toBe("execute");
|
||||
expect(node("tx-detail-calldata-details").innerHTML).toBe("");
|
||||
expect(node("tx-detail-rawdata").innerHTML).toContain(SWAP_DATA);
|
||||
});
|
||||
});
|
||||
|
||||
// Open the approval screen with Ethereum Mainnet active, for a site's Sepolia
|
||||
// transaction that sends SWAP_DATA to `sentTo`.
|
||||
async function showApprovalSentTo(sentTo) {
|
||||
globalThis.document = makeDocument();
|
||||
globalThis.window = { location: { search: "" }, close: () => {} };
|
||||
globalThis.chrome.runtime = {
|
||||
connect: () => ({ postMessage: () => {} }),
|
||||
sendMessage: (_msg, reply) =>
|
||||
reply({
|
||||
type: "tx",
|
||||
origin: "https://dapp.example",
|
||||
isPhishingDomain: false,
|
||||
approvedFrom: RECIPIENT,
|
||||
approvedTx: {
|
||||
type: 2,
|
||||
from: RECIPIENT,
|
||||
chainId: SEPOLIA,
|
||||
nonce: "0x7",
|
||||
gasLimit: "0x30d40",
|
||||
maxPriorityFeePerGas: "0x3b9aca00",
|
||||
maxFeePerGas: "0x77359400",
|
||||
to: sentTo,
|
||||
value: "0x" + HUNDREDTH_ETH.toString(16),
|
||||
data: SWAP_DATA,
|
||||
accessList: [],
|
||||
},
|
||||
}),
|
||||
};
|
||||
state.networkId = "mainnet";
|
||||
state.currentView = null;
|
||||
await approval.show(1);
|
||||
}
|
||||
|
||||
// The router is on Sepolia's list only, so the swap is shown only if the
|
||||
// screen decodes for the transaction's network: on Ethereum Mainnet, the
|
||||
// active network, that address is not a router.
|
||||
describe("execute() calldata on the approval screen, for a Sepolia transaction while Ethereum Mainnet is active", () => {
|
||||
test("sent to a router on Sepolia, it is a swap", async () => {
|
||||
await showApprovalSentTo(SEPOLIA_ROUTER);
|
||||
expect(node("approve-tx-decoded").classList.contains("hidden")).toBe(
|
||||
false,
|
||||
);
|
||||
expect(node("approve-tx-decoded-details").innerHTML).toContain(
|
||||
"Swap via Uniswap Universal Router",
|
||||
);
|
||||
});
|
||||
|
||||
test("sent to an ordinary address, it is shown as raw data", async () => {
|
||||
await showApprovalSentTo(ORDINARY);
|
||||
expect(node("approve-tx-decoded").classList.contains("hidden")).toBe(
|
||||
true,
|
||||
);
|
||||
expect(node("approve-tx-decoded-details").innerHTML).toBe("");
|
||||
expect(node("approve-tx-data").textContent).toBe(SWAP_DATA);
|
||||
expect(
|
||||
node("approve-tx-data-section").classList.contains("hidden"),
|
||||
).toBe(false);
|
||||
});
|
||||
});
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user