Compare commits
2
Commits
012ecec2e1
...
131e1efcf9
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
131e1efcf9 | ||
|
|
016acbcda5 |
No files matched your search
@@ -2291,6 +2291,8 @@ view would leave a wallet one click from deletion.
|
||||
- Either "Save" stores its URL only if the input still shows that URL when
|
||||
the endpoint answers. Otherwise a flash message says that the URL was not
|
||||
saved
|
||||
- If the user taps the same "Save" again before the endpoint answers, the
|
||||
earlier tap stores nothing and shows no flash message
|
||||
- Etherscan:
|
||||
- "Check recipients on Etherscan" checkbox, unticked until the user
|
||||
ticks it
|
||||
|
||||
@@ -50,6 +50,11 @@ let versionClickTimer = null;
|
||||
// not the one in `state`.
|
||||
let shownNetwork = null;
|
||||
|
||||
// Each endpoint "Save" counts its taps here, under the field that it stores.
|
||||
// Once the user taps the same "Save" again, the earlier tap shows no flash
|
||||
// message. The earlier tap stores its URL only if its write had already begun.
|
||||
const saveTaps = { rpcUrl: 0, blockscoutUrl: 0 };
|
||||
|
||||
// One row per site origin, however many addresses it appears under, each with
|
||||
// an [x] that hands it to onRemove.
|
||||
function renderSiteList(containerId, origins, onRemove) {
|
||||
@@ -347,10 +352,16 @@ function showNewSettings() {
|
||||
// shows `url`, nothing is saved. The flash message then says that the URL was
|
||||
// changed during the check. The save compares the input and sets `url` in
|
||||
// `state` in one step. So a redraw after the comparison shows `url`.
|
||||
async function saveEndpoint(field, input, url, networkId) {
|
||||
//
|
||||
// `tap` is the number of the "Save" tap that checked `url`. If the user taps
|
||||
// the same "Save" again before this save holds the lock, nothing is stored. If
|
||||
// the user taps the same "Save" again before the write ends, no flash message
|
||||
// is shown.
|
||||
async function saveEndpoint(field, input, url, networkId, tap) {
|
||||
let refused = false;
|
||||
let inputChanged = false;
|
||||
await saveState((stored) => {
|
||||
if (saveTaps[field] !== tap) return false;
|
||||
refused =
|
||||
state.networkId !== networkId || stored.networkId !== networkId;
|
||||
inputChanged = $(input).value.trim() !== url;
|
||||
@@ -358,6 +369,7 @@ async function saveEndpoint(field, input, url, networkId) {
|
||||
state[field] = url;
|
||||
stored[field] = url;
|
||||
});
|
||||
if (saveTaps[field] !== tap) return;
|
||||
if (refused) {
|
||||
showFlash("The URL was not saved because the network changed.");
|
||||
} else if (inputChanged) {
|
||||
@@ -375,6 +387,8 @@ function init(_ctx) {
|
||||
showPhrase.init();
|
||||
|
||||
$("btn-save-rpc").addEventListener("click", async () => {
|
||||
saveTaps.rpcUrl++;
|
||||
const tap = saveTaps.rpcUrl;
|
||||
const url = $("settings-rpc").value.trim();
|
||||
if (!url) {
|
||||
showFlash("Please enter an RPC URL.");
|
||||
@@ -395,6 +409,8 @@ function init(_ctx) {
|
||||
}),
|
||||
});
|
||||
const json = await resp.json();
|
||||
// The user has tapped this "Save" again since the check began.
|
||||
if (tap !== saveTaps.rpcUrl) return;
|
||||
if (json.error) {
|
||||
log.errorf("RPC validation error:", json.error);
|
||||
showFlash("Endpoint returned an error.");
|
||||
@@ -408,6 +424,7 @@ function init(_ctx) {
|
||||
// Cancelled by the popup closing, not failed: see pageClosed in
|
||||
// src/popup/index.js.
|
||||
if (ctx.pageClosed.aborted) return;
|
||||
if (tap !== saveTaps.rpcUrl) return;
|
||||
// Not the error's message: fetch puts the whole URL, password and
|
||||
// key included, in the message of the error it throws for a URL
|
||||
// with a user name and password or one it cannot parse.
|
||||
@@ -415,10 +432,12 @@ function init(_ctx) {
|
||||
showFlash("Could not reach endpoint.");
|
||||
return;
|
||||
}
|
||||
await saveEndpoint("rpcUrl", "settings-rpc", url, net.id);
|
||||
await saveEndpoint("rpcUrl", "settings-rpc", url, net.id, tap);
|
||||
});
|
||||
|
||||
$("btn-save-blockscout").addEventListener("click", async () => {
|
||||
saveTaps.blockscoutUrl++;
|
||||
const tap = saveTaps.blockscoutUrl;
|
||||
const url = $("settings-blockscout").value.trim();
|
||||
if (!url) {
|
||||
showFlash("Please enter a Blockscout API URL.");
|
||||
@@ -428,18 +447,26 @@ function init(_ctx) {
|
||||
showFlash("Testing endpoint...");
|
||||
try {
|
||||
const resp = await debugFetch(url + "/stats");
|
||||
if (tap !== saveTaps.blockscoutUrl) return;
|
||||
if (!resp.ok) {
|
||||
showFlash("Endpoint returned HTTP " + resp.status + ".");
|
||||
return;
|
||||
}
|
||||
} catch {
|
||||
if (ctx.pageClosed.aborted) return;
|
||||
if (tap !== saveTaps.blockscoutUrl) return;
|
||||
// Not the error's message, as for the RPC check above.
|
||||
log.errorf("Blockscout validation failed:", urlOrigin(url));
|
||||
showFlash("Could not reach endpoint.");
|
||||
return;
|
||||
}
|
||||
await saveEndpoint("blockscoutUrl", "settings-blockscout", url, net.id);
|
||||
await saveEndpoint(
|
||||
"blockscoutUrl",
|
||||
"settings-blockscout",
|
||||
url,
|
||||
net.id,
|
||||
tap,
|
||||
);
|
||||
});
|
||||
|
||||
// Each change is made inside the save, holding the lock. So
|
||||
|
||||
@@ -61,20 +61,40 @@ function clearPopupCaches() {
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/653,
|
||||
// https://git.eeqj.de/sneak/AutistMask/issues/692).
|
||||
//
|
||||
// When the stored record is on another network, a switch saved elsewhere has
|
||||
// not reached this page yet. This page first takes that switch with
|
||||
// takeStoredNetwork() (state.js), as followStoredSettings() does. The switch to
|
||||
// `newNetworkId` is then made from the stored record's network. So every
|
||||
// network's list of tracked tokens in the stored record is kept
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/701). When the stored record is
|
||||
// already on `newNetworkId`, the switch made from there only resets the
|
||||
// balances and caches.
|
||||
//
|
||||
// When the stored record is on this page's network, this page first takes the
|
||||
// stored `networkTrackedTokens` (takeStoredNetworkTrackedTokens() in state.js),
|
||||
// because another page's save may have changed a list this page holds.
|
||||
//
|
||||
// Before the switch, `state` takes the tracked tokens that another page stored
|
||||
// since this page's last save (takeStoredTrackedTokens() in state.js). The
|
||||
// switch then puts them away under the previous network, the network they were
|
||||
// added on. When the stored record is on another network, a switch saved
|
||||
// elsewhere has not reached this page yet. The stored record's tokens are then
|
||||
// that network's, and none are taken.
|
||||
// added on.
|
||||
async function onChainSwitch(newNetworkId) {
|
||||
const { state, saveState, takeStoredTrackedTokens } = require("./state");
|
||||
const {
|
||||
state,
|
||||
saveState,
|
||||
takeStoredNetwork,
|
||||
takeStoredTrackedTokens,
|
||||
takeStoredNetworkTrackedTokens,
|
||||
} = require("./state");
|
||||
let net = null;
|
||||
await saveState((stored) => {
|
||||
if (state.networkId === newNetworkId) return false;
|
||||
if (stored.networkId === state.networkId) {
|
||||
takeStoredTrackedTokens(stored);
|
||||
if (stored.networkId !== state.networkId) {
|
||||
takeStoredNetwork(stored);
|
||||
} else {
|
||||
takeStoredNetworkTrackedTokens(stored);
|
||||
}
|
||||
takeStoredTrackedTokens(stored);
|
||||
net = applyChainSwitchFields(state, newNetworkId);
|
||||
stored.lastBalanceRefresh = 0;
|
||||
stored.fraudContracts = [];
|
||||
|
||||
+70
-8
@@ -127,10 +127,10 @@ function currentNetwork() {
|
||||
|
||||
// `baseline` holds the persisted fields as this page held them when its last
|
||||
// loadState() finished, or when its last successful saveState() began.
|
||||
// takeStoredNetwork() and takeStoredTrackedTokens() also write into it what
|
||||
// this page has taken from the stored record since then. saveState() diffs the
|
||||
// live state against `baseline` to find only the fields THIS page changed
|
||||
// since.
|
||||
// takeStoredNetwork(), takeStoredTrackedTokens() and
|
||||
// takeStoredNetworkTrackedTokens() also write into it what this page has taken
|
||||
// from the stored record since then. saveState() diffs the live state against
|
||||
// `baseline` to find only the fields THIS page changed since.
|
||||
//
|
||||
// Deep-cloned, not a reference: callers mutate persisted objects and arrays
|
||||
// in place (state.wallets.push(...)), and a reference baseline would mutate
|
||||
@@ -402,6 +402,23 @@ function mergeNetworkEndpoints(base, ours, theirs) {
|
||||
return mergeMapByKey(base, ours, theirs, mergeEndpointEntry);
|
||||
}
|
||||
|
||||
// Returns a copy of `stored.networkTrackedTokens` for when this page has not yet
|
||||
// taken the switch in `stored`. `page` is this page's state. A token that this
|
||||
// page tracked or removed since its last save is tracked or removed in the list
|
||||
// of `page.networkId`, by contract address.
|
||||
function networkTrackedTokensWithChange(stored, page) {
|
||||
return {
|
||||
...stored.networkTrackedTokens,
|
||||
[page.networkId]: mergeListByIdentity(
|
||||
baseline.trackedTokens,
|
||||
page.trackedTokens,
|
||||
stored.networkTrackedTokens[page.networkId],
|
||||
(token) => token.address.toLowerCase(),
|
||||
(base, ours) => ours,
|
||||
),
|
||||
};
|
||||
}
|
||||
|
||||
// Read-modify-write, merged per field, rather than one full-blob write.
|
||||
//
|
||||
// Every extension page (the toolbar popup, a dApp approval window) holds its
|
||||
@@ -455,6 +472,11 @@ function mergeNetworkEndpoints(base, ours, theirs) {
|
||||
// own UI scratch space, not data another page has any reason to share
|
||||
// membership of.
|
||||
//
|
||||
// One exception: when the stored record is on another network than this
|
||||
// page's, a save keeps the stored `trackedTokens`. It merges this page's change
|
||||
// into the list in `networkTrackedTokens` for this page's network, by contract
|
||||
// address.
|
||||
//
|
||||
// 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
|
||||
// is the cross-field (and now cross-membership-vs-leaf) clobber — a page
|
||||
@@ -527,6 +549,20 @@ async function saveStateOnce(beforeWrite) {
|
||||
merged[key] = current[key];
|
||||
}
|
||||
}
|
||||
// When the merged record names a network other than this page's, this page
|
||||
// has not yet taken a switch saved elsewhere. This page's `trackedTokens`
|
||||
// is then the list of this page's network. The stored record keeps the
|
||||
// list of this page's network in `networkTrackedTokens`. So a token that
|
||||
// this page added or removed since its last save is added to or removed
|
||||
// from that stored list. The merged record keeps the stored `trackedTokens`
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/701).
|
||||
if (merged.networkId !== current.networkId) {
|
||||
merged.trackedTokens = fresh.trackedTokens;
|
||||
merged.networkTrackedTokens = networkTrackedTokensWithChange(
|
||||
fresh,
|
||||
current,
|
||||
);
|
||||
}
|
||||
merged.hasWallet = Boolean(merged.wallets && merged.wallets.length > 0);
|
||||
// Stamped on every write, never merged or diffed: the record that goes to
|
||||
// storage is in THIS build's shape whatever shape it was read in, which is
|
||||
@@ -607,15 +643,27 @@ function saveState(beforeWrite) {
|
||||
return turn;
|
||||
}
|
||||
|
||||
// Give this page the network switch held by `stored`, a record a save of this
|
||||
// page has just read (followStoredSettings() in src/popup/index.js calls this
|
||||
// from `beforeWrite`), in `state` and in `baseline` alike, as loadState() does
|
||||
// with a whole record. The switch is then not this page's own change, even when
|
||||
// Give this page the network switch held by `stored`, in `state` and in
|
||||
// `baseline` alike, as loadState() does with a whole record. `stored` is the
|
||||
// record that a save of this page has just read. followStoredSettings() in
|
||||
// src/popup/index.js and onChainSwitch() in src/shared/chainSwitch.js call this
|
||||
// from `beforeWrite`. The switch is then not this page's own change, even when
|
||||
// that save fails to write: a later switch back to the previous network still
|
||||
// differs from `baseline`, and is stored.
|
||||
//
|
||||
// A token that this page tracked or removed since its last save was tracked or
|
||||
// removed on this page's network before the switch. `state` keeps that change
|
||||
// in the list in `networkTrackedTokens` for that network, merged with the
|
||||
// stored list by contract address. `baseline` takes the stored list, so the
|
||||
// save stores the change (https://git.eeqj.de/sneak/AutistMask/issues/706).
|
||||
function takeStoredNetwork(stored) {
|
||||
const networkTrackedTokens = networkTrackedTokensWithChange(
|
||||
stored,
|
||||
rawState,
|
||||
);
|
||||
copyChainSwitchFields(rawState, stored);
|
||||
copyChainSwitchFields(baseline, structuredClone(stored));
|
||||
rawState.networkTrackedTokens = networkTrackedTokens;
|
||||
}
|
||||
|
||||
// Give this page the tracked tokens of `stored`, a record on this page's
|
||||
@@ -640,6 +688,19 @@ function takeStoredTrackedTokens(stored) {
|
||||
baseline.trackedTokens = structuredClone(stored.trackedTokens);
|
||||
}
|
||||
|
||||
// Give `state` and `baseline` each their own copy of the stored
|
||||
// `networkTrackedTokens`. `stored` is a record on this page's network that a
|
||||
// save of this page has just read. onChainSwitch() in
|
||||
// src/shared/chainSwitch.js calls this from `beforeWrite`.
|
||||
function takeStoredNetworkTrackedTokens(stored) {
|
||||
rawState.networkTrackedTokens = structuredClone(
|
||||
stored.networkTrackedTokens,
|
||||
);
|
||||
baseline.networkTrackedTokens = structuredClone(
|
||||
stored.networkTrackedTokens,
|
||||
);
|
||||
}
|
||||
|
||||
// Rejects with StateUnusableError for a stored record this build cannot make
|
||||
// sense of. Nothing is assigned and `loaded` stays false in that case, so a
|
||||
// caller that ignores the rejection gets StateNotLoadedError on the first
|
||||
@@ -687,6 +748,7 @@ module.exports = {
|
||||
onSaveFailure,
|
||||
takeStoredNetwork,
|
||||
takeStoredTrackedTokens,
|
||||
takeStoredNetworkTrackedTokens,
|
||||
loadState,
|
||||
currentAddress,
|
||||
currentNetwork,
|
||||
|
||||
@@ -167,3 +167,272 @@ test.each([
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
// This answer passes both endpoint checks on Ethereum Mainnet.
|
||||
const PASSING_ANSWER = {
|
||||
ok: true,
|
||||
json: async () => ({ result: NETWORKS.mainnet.chainId }),
|
||||
};
|
||||
|
||||
// Both endpoint checks read this answer as an error. The RPC check reads the
|
||||
// answer's `error`. The Blockscout check reads the answer's `ok`.
|
||||
const ERROR_ANSWER = {
|
||||
ok: false,
|
||||
status: 500,
|
||||
json: async () => ({ error: { code: -32603, message: "Internal error" } }),
|
||||
};
|
||||
|
||||
// The user types a URL in Settings and taps "Save". Before the endpoint answers,
|
||||
// the user types a second URL and taps "Save" again. The second check passes
|
||||
// first. The second URL is stored, and the flash message reads "Saved.". The
|
||||
// first check then ends in one of three ways:
|
||||
//
|
||||
// - It passes.
|
||||
// - It fails, because fetch cannot reach the endpoint.
|
||||
// - It gets an answer that holds an error.
|
||||
//
|
||||
// None of the three changes the stored URL or the flash message
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/698).
|
||||
test.each([
|
||||
{
|
||||
button: "btn-save-rpc",
|
||||
input: "settings-rpc",
|
||||
field: "rpcUrl",
|
||||
first: "passes",
|
||||
},
|
||||
{
|
||||
button: "btn-save-rpc",
|
||||
input: "settings-rpc",
|
||||
field: "rpcUrl",
|
||||
first: "fails",
|
||||
},
|
||||
{
|
||||
button: "btn-save-rpc",
|
||||
input: "settings-rpc",
|
||||
field: "rpcUrl",
|
||||
first: "answers with an error",
|
||||
},
|
||||
{
|
||||
button: "btn-save-blockscout",
|
||||
input: "settings-blockscout",
|
||||
field: "blockscoutUrl",
|
||||
first: "passes",
|
||||
},
|
||||
{
|
||||
button: "btn-save-blockscout",
|
||||
input: "settings-blockscout",
|
||||
field: "blockscoutUrl",
|
||||
first: "fails",
|
||||
},
|
||||
{
|
||||
button: "btn-save-blockscout",
|
||||
input: "settings-blockscout",
|
||||
field: "blockscoutUrl",
|
||||
first: "answers with an error",
|
||||
},
|
||||
])(
|
||||
"$button keeps the second tap's result when the first check $first last",
|
||||
async ({ button, input, field, first }) => {
|
||||
const page = await bootPopup(unversionedValidProfile());
|
||||
await page.click("btn-settings");
|
||||
const checks = [];
|
||||
globalThis.fetch.mockImplementation(
|
||||
() =>
|
||||
new Promise((resolve, reject) => {
|
||||
checks.push({ resolve, reject });
|
||||
}),
|
||||
);
|
||||
const secondUrl = "https://second.example.invalid";
|
||||
|
||||
page.node(input).value = "https://first.example.invalid";
|
||||
const firstTap = page.node(button).listeners.click.map((fn) => fn());
|
||||
await page.settle();
|
||||
page.node(input).value = secondUrl;
|
||||
const secondTap = page.node(button).listeners.click.map((fn) => fn());
|
||||
await page.settle();
|
||||
checks[1].resolve(PASSING_ANSWER);
|
||||
await Promise.all(secondTap);
|
||||
await page.settle();
|
||||
expect(page.text("flash-msg")).toBe("Saved.");
|
||||
if (first === "passes") {
|
||||
checks[0].resolve(PASSING_ANSWER);
|
||||
} else if (first === "answers with an error") {
|
||||
checks[0].resolve(ERROR_ANSWER);
|
||||
} else {
|
||||
// fetch rejects when it cannot reach the endpoint.
|
||||
checks[0].reject(new TypeError("Failed to fetch"));
|
||||
}
|
||||
await Promise.all(firstTap);
|
||||
await page.settle();
|
||||
|
||||
expect(checks).toHaveLength(2);
|
||||
expect(page.storage.read("autistmask")[field]).toBe(secondUrl);
|
||||
expect(page.text("flash-msg")).toBe("Saved.");
|
||||
},
|
||||
);
|
||||
|
||||
// The user types a URL in Settings and taps "Save". Before the endpoint answers,
|
||||
// the user empties the input and taps "Save" again. The flash message asks for
|
||||
// a URL. The first check then passes. The flash message still asks for a URL,
|
||||
// and the stored URL is unchanged.
|
||||
test.each([
|
||||
{
|
||||
button: "btn-save-rpc",
|
||||
input: "settings-rpc",
|
||||
field: "rpcUrl",
|
||||
message: "Please enter an RPC URL.",
|
||||
},
|
||||
{
|
||||
button: "btn-save-blockscout",
|
||||
input: "settings-blockscout",
|
||||
field: "blockscoutUrl",
|
||||
message: "Please enter a Blockscout API URL.",
|
||||
},
|
||||
])(
|
||||
"$button keeps the empty-input message when the first check passes last",
|
||||
async ({ button, input, field, message }) => {
|
||||
const page = await bootPopup(unversionedValidProfile());
|
||||
await page.click("btn-settings");
|
||||
const storedUrl = page.value(input);
|
||||
let answer;
|
||||
globalThis.fetch.mockReturnValue(
|
||||
new Promise((resolve) => {
|
||||
answer = resolve;
|
||||
}),
|
||||
);
|
||||
|
||||
page.node(input).value = "https://typed.example.invalid";
|
||||
const firstTap = page.node(button).listeners.click.map((fn) => fn());
|
||||
await page.settle();
|
||||
page.node(input).value = "";
|
||||
await page.click(button);
|
||||
expect(page.text("flash-msg")).toBe(message);
|
||||
answer(PASSING_ANSWER);
|
||||
await Promise.all(firstTap);
|
||||
await page.settle();
|
||||
|
||||
expect(page.storage.read("autistmask")[field]).toBe(storedUrl);
|
||||
expect(page.text("flash-msg")).toBe(message);
|
||||
},
|
||||
);
|
||||
|
||||
// The user types a URL in Settings and taps "Save". Another write holds the
|
||||
// lock. So the save waits for the lock once the check passes. The user then
|
||||
// taps "Save" again on the same URL. When the lock is free, the first save
|
||||
// stores nothing and shows no flash message. The second check then passes, and
|
||||
// the second save stores the URL.
|
||||
test.each([
|
||||
{ button: "btn-save-rpc", input: "settings-rpc", field: "rpcUrl" },
|
||||
{
|
||||
button: "btn-save-blockscout",
|
||||
input: "settings-blockscout",
|
||||
field: "blockscoutUrl",
|
||||
},
|
||||
])(
|
||||
"$button stores nothing for an earlier tap still waiting for the lock",
|
||||
async ({ button, input, field }) => {
|
||||
const page = await bootPopup(unversionedValidProfile());
|
||||
await page.click("btn-settings");
|
||||
const storedUrl = page.value(input);
|
||||
const checks = [];
|
||||
globalThis.fetch.mockImplementation(
|
||||
() =>
|
||||
new Promise((resolve) => {
|
||||
checks.push(resolve);
|
||||
}),
|
||||
);
|
||||
const typedUrl = "https://typed.example.invalid";
|
||||
|
||||
page.node(input).value = typedUrl;
|
||||
const firstTap = page.node(button).listeners.click.map((fn) => fn());
|
||||
await page.settle();
|
||||
let releaseLock;
|
||||
const lockHeld = navigator.locks.request(
|
||||
"autistmask",
|
||||
() =>
|
||||
new Promise((resolve) => {
|
||||
releaseLock = resolve;
|
||||
}),
|
||||
);
|
||||
checks[0](PASSING_ANSWER);
|
||||
await page.settle();
|
||||
const secondTap = page.node(button).listeners.click.map((fn) => fn());
|
||||
await page.settle();
|
||||
releaseLock();
|
||||
await lockHeld;
|
||||
await Promise.all(firstTap);
|
||||
await page.settle();
|
||||
|
||||
expect(page.storage.read("autistmask")[field]).toBe(storedUrl);
|
||||
expect(page.text("flash-msg")).toBe("Testing endpoint...");
|
||||
|
||||
checks[1](PASSING_ANSWER);
|
||||
await Promise.all(secondTap);
|
||||
await page.settle();
|
||||
|
||||
expect(checks).toHaveLength(2);
|
||||
expect(page.storage.read("autistmask")[field]).toBe(typedUrl);
|
||||
expect(page.text("flash-msg")).toBe("Saved.");
|
||||
},
|
||||
);
|
||||
|
||||
// The user taps "Save", and the check passes. The save then begins its storage
|
||||
// write, and this test keeps the write waiting. The user taps "Save" again, and
|
||||
// the second check cannot reach the endpoint. When the write ends, the flash
|
||||
// message still reads "Could not reach endpoint.". The write stores the URL
|
||||
// anyway, because the write began before the second tap.
|
||||
test.each([
|
||||
{ button: "btn-save-rpc", input: "settings-rpc", field: "rpcUrl" },
|
||||
{
|
||||
button: "btn-save-blockscout",
|
||||
input: "settings-blockscout",
|
||||
field: "blockscoutUrl",
|
||||
},
|
||||
])(
|
||||
"$button keeps the second tap's message when tapped again during the write",
|
||||
async ({ button, input, field }) => {
|
||||
const page = await bootPopup(unversionedValidProfile());
|
||||
await page.click("btn-settings");
|
||||
const checks = [];
|
||||
globalThis.fetch.mockImplementation(
|
||||
() =>
|
||||
new Promise((resolve, reject) => {
|
||||
checks.push({ resolve, reject });
|
||||
}),
|
||||
);
|
||||
const typedUrl = "https://typed.example.invalid";
|
||||
|
||||
page.node(input).value = typedUrl;
|
||||
const firstTap = page.node(button).listeners.click.map((fn) => fn());
|
||||
await page.settle();
|
||||
const { set } = page.storage.local;
|
||||
const write = set.getMockImplementation();
|
||||
let writeBegan = false;
|
||||
let releaseWrite;
|
||||
const writeHeld = new Promise((resolve) => {
|
||||
releaseWrite = resolve;
|
||||
});
|
||||
set.mockImplementationOnce(async (items) => {
|
||||
writeBegan = true;
|
||||
await writeHeld;
|
||||
await write(items);
|
||||
});
|
||||
checks[0].resolve(PASSING_ANSWER);
|
||||
await page.settle();
|
||||
expect(writeBegan).toBe(true);
|
||||
const secondTap = page.node(button).listeners.click.map((fn) => fn());
|
||||
await page.settle();
|
||||
// fetch rejects when it cannot reach the endpoint.
|
||||
checks[1].reject(new TypeError("Failed to fetch"));
|
||||
await Promise.all(secondTap);
|
||||
await page.settle();
|
||||
expect(page.text("flash-msg")).toBe("Could not reach endpoint.");
|
||||
releaseWrite();
|
||||
await Promise.all(firstTap);
|
||||
await page.settle();
|
||||
|
||||
expect(checks).toHaveLength(2);
|
||||
expect(page.storage.read("autistmask")[field]).toBe(typedUrl);
|
||||
expect(page.text("flash-msg")).toBe("Could not reach endpoint.");
|
||||
},
|
||||
);
|
||||
@@ -267,6 +267,190 @@ test("a token tracked on Sepolia when another page switched there is not tracked
|
||||
expect(stored.networkTrackedTokens.mainnet).toEqual([]);
|
||||
});
|
||||
|
||||
// Another popup page saves a switch to Sepolia, where TST is tracked. Before
|
||||
// taking that switch, this page adds a token on Ethereum Mainnet. The add's
|
||||
// save adds the token to Ethereum Mainnet's list and leaves Sepolia's list as
|
||||
// it was.
|
||||
test("a token added before this page takes another page's switch is tracked on Ethereum Mainnet", async () => {
|
||||
const boot = await bootOnAddToken("mainnet", {
|
||||
trackedTokens: [MAINNET_TOKEN],
|
||||
networkTrackedTokens: { sepolia: [SEPOLIA_TOKEN] },
|
||||
});
|
||||
expect(boot.pageErrors).toEqual([]);
|
||||
boot.storage.write("autistmask", {
|
||||
...boot.storage.read("autistmask"),
|
||||
networkId: "sepolia",
|
||||
trackedTokens: [SEPOLIA_TOKEN],
|
||||
networkTrackedTokens: {
|
||||
mainnet: [MAINNET_TOKEN],
|
||||
sepolia: [SEPOLIA_TOKEN],
|
||||
},
|
||||
});
|
||||
const { lookupTokenInfo } = require("../src/shared/balances");
|
||||
lookupTokenInfo.mockResolvedValueOnce({
|
||||
symbol: "NEW",
|
||||
decimals: 18,
|
||||
name: "New Token",
|
||||
});
|
||||
|
||||
boot.node("settings-addtoken-address").value = NEW_TOKEN_ADDRESS;
|
||||
await boot.click("btn-settings-addtoken-manual");
|
||||
|
||||
const stored = boot.storage.read("autistmask");
|
||||
expect(stored.networkId).toBe("sepolia");
|
||||
expect(stored.trackedTokens).toEqual([SEPOLIA_TOKEN]);
|
||||
expect(stored.networkTrackedTokens.mainnet).toEqual([
|
||||
MAINNET_TOKEN,
|
||||
{
|
||||
address: NEW_TOKEN_ADDRESS,
|
||||
symbol: "NEW",
|
||||
decimals: 18,
|
||||
name: "New Token",
|
||||
},
|
||||
]);
|
||||
});
|
||||
|
||||
// Another popup page tracks DAI on Ethereum Mainnet and then saves a switch to
|
||||
// Sepolia. This page does not track DAI. Before taking that switch, this page
|
||||
// adds a token on Ethereum Mainnet. The add's save puts both DAI and the new
|
||||
// token on Ethereum Mainnet's list.
|
||||
test("a token added before this page takes another page's switch joins that page's tokens on Ethereum Mainnet", async () => {
|
||||
const boot = await bootOnAddToken("mainnet");
|
||||
expect(boot.pageErrors).toEqual([]);
|
||||
boot.storage.write("autistmask", {
|
||||
...boot.storage.read("autistmask"),
|
||||
networkId: "sepolia",
|
||||
trackedTokens: [],
|
||||
networkTrackedTokens: { mainnet: [MAINNET_TOKEN] },
|
||||
});
|
||||
const { lookupTokenInfo } = require("../src/shared/balances");
|
||||
lookupTokenInfo.mockResolvedValueOnce({
|
||||
symbol: "NEW",
|
||||
decimals: 18,
|
||||
name: "New Token",
|
||||
});
|
||||
|
||||
boot.node("settings-addtoken-address").value = NEW_TOKEN_ADDRESS;
|
||||
await boot.click("btn-settings-addtoken-manual");
|
||||
|
||||
const stored = boot.storage.read("autistmask");
|
||||
expect(stored.networkId).toBe("sepolia");
|
||||
expect(stored.trackedTokens).toEqual([]);
|
||||
expect(stored.networkTrackedTokens.mainnet).toEqual([
|
||||
MAINNET_TOKEN,
|
||||
{
|
||||
address: NEW_TOKEN_ADDRESS,
|
||||
symbol: "NEW",
|
||||
decimals: 18,
|
||||
name: "New Token",
|
||||
},
|
||||
]);
|
||||
});
|
||||
|
||||
// Another popup page saves a switch to Sepolia, where TST is tracked. Before
|
||||
// taking that switch, this page removes DAI on Ethereum Mainnet, as the `[x]`
|
||||
// on a tracked token in Settings does. The removal's save drops DAI from
|
||||
// Ethereum Mainnet's list and leaves Sepolia's list as it was.
|
||||
test("a token removed before this page takes another page's switch is gone from Ethereum Mainnet", async () => {
|
||||
const boot = await bootPopup(
|
||||
unversionedValidProfile({
|
||||
trackedTokens: [MAINNET_TOKEN],
|
||||
networkTrackedTokens: { sepolia: [SEPOLIA_TOKEN] },
|
||||
}),
|
||||
);
|
||||
expect(boot.pageErrors).toEqual([]);
|
||||
boot.storage.write("autistmask", {
|
||||
...boot.storage.read("autistmask"),
|
||||
networkId: "sepolia",
|
||||
trackedTokens: [SEPOLIA_TOKEN],
|
||||
networkTrackedTokens: {
|
||||
mainnet: [MAINNET_TOKEN],
|
||||
sepolia: [SEPOLIA_TOKEN],
|
||||
},
|
||||
});
|
||||
|
||||
const { state, saveState } = require("../src/shared/state");
|
||||
state.trackedTokens.splice(0, 1);
|
||||
await saveState();
|
||||
|
||||
const stored = boot.storage.read("autistmask");
|
||||
expect(stored.networkId).toBe("sepolia");
|
||||
expect(stored.trackedTokens).toEqual([SEPOLIA_TOKEN]);
|
||||
expect(stored.networkTrackedTokens.mainnet).toEqual([]);
|
||||
});
|
||||
|
||||
// Another popup page tracks DAI on Ethereum Mainnet and then saves a switch to
|
||||
// Sepolia. That switch puts DAI away under Ethereum Mainnet. This page has not
|
||||
// taken the switch yet. A switch to Sepolia in this page's Settings keeps DAI
|
||||
// on Ethereum Mainnet's list.
|
||||
test("a token another page tracked before its own switch stays tracked on Ethereum Mainnet", async () => {
|
||||
const boot = await bootPopup(unversionedValidProfile());
|
||||
expect(boot.pageErrors).toEqual([]);
|
||||
await boot.click("btn-settings");
|
||||
boot.storage.write("autistmask", {
|
||||
...boot.storage.read("autistmask"),
|
||||
networkId: "sepolia",
|
||||
trackedTokens: [],
|
||||
networkTrackedTokens: { mainnet: [MAINNET_TOKEN] },
|
||||
});
|
||||
|
||||
await chooseNetwork(boot, "sepolia");
|
||||
|
||||
const stored = boot.storage.read("autistmask");
|
||||
expect(stored.networkId).toBe("sepolia");
|
||||
expect(stored.networkTrackedTokens.mainnet).toEqual([MAINNET_TOKEN]);
|
||||
});
|
||||
|
||||
// This page switches to Sepolia. Another popup page has not taken that switch,
|
||||
// and its save adds a token to Ethereum Mainnet's list. This page switches back
|
||||
// and tracks that token.
|
||||
test("a token another page added on Ethereum Mainnet is tracked when this page switches back there", async () => {
|
||||
const boot = await bootPopup(
|
||||
unversionedValidProfile({ trackedTokens: [MAINNET_TOKEN] }),
|
||||
);
|
||||
expect(boot.pageErrors).toEqual([]);
|
||||
await boot.click("btn-settings");
|
||||
await chooseNetwork(boot, "sepolia");
|
||||
const newToken = {
|
||||
address: NEW_TOKEN_ADDRESS,
|
||||
symbol: "NEW",
|
||||
decimals: 18,
|
||||
name: "New Token",
|
||||
};
|
||||
boot.storage.write("autistmask", {
|
||||
...boot.storage.read("autistmask"),
|
||||
networkTrackedTokens: { mainnet: [MAINNET_TOKEN, newToken] },
|
||||
});
|
||||
|
||||
await chooseNetwork(boot, "mainnet");
|
||||
|
||||
const stored = boot.storage.read("autistmask");
|
||||
expect(stored.networkId).toBe("mainnet");
|
||||
expect(stored.trackedTokens).toEqual([MAINNET_TOKEN, newToken]);
|
||||
});
|
||||
|
||||
// This page tracks DAI on Ethereum Mainnet and switches to Sepolia. Another
|
||||
// popup page has not taken that switch, and its save removes DAI from Ethereum
|
||||
// Mainnet's list. This page switches back and does not track DAI again.
|
||||
test("a token another page removed on Ethereum Mainnet stays removed when this page switches back there", async () => {
|
||||
const boot = await bootPopup(
|
||||
unversionedValidProfile({ trackedTokens: [MAINNET_TOKEN] }),
|
||||
);
|
||||
expect(boot.pageErrors).toEqual([]);
|
||||
await boot.click("btn-settings");
|
||||
await chooseNetwork(boot, "sepolia");
|
||||
boot.storage.write("autistmask", {
|
||||
...boot.storage.read("autistmask"),
|
||||
networkTrackedTokens: { mainnet: [] },
|
||||
});
|
||||
|
||||
await chooseNetwork(boot, "mainnet");
|
||||
|
||||
const stored = boot.storage.read("autistmask");
|
||||
expect(stored.networkId).toBe("mainnet");
|
||||
expect(stored.trackedTokens).toEqual([]);
|
||||
});
|
||||
|
||||
// Another popup page records a fraud contract on Ethereum Mainnet after this
|
||||
// page's last save. The switch to Sepolia drops that fraud contract, as the
|
||||
// switch drops this page's own.
|
||||
@@ -338,6 +522,162 @@ test("a token added while a switch in Settings waits for the lock stays tracked
|
||||
]);
|
||||
});
|
||||
|
||||
// The contract lookup on SettingsAddToken answers on Ethereum Mainnet while
|
||||
// this page's switch to Sepolia waits for the lock. Another popup page holds
|
||||
// the lock and stores its own switch to Sepolia, with DAI tracked on Ethereum
|
||||
// Mainnet. This page's switch keeps DAI and the new token on Ethereum Mainnet's
|
||||
// list.
|
||||
test("a token added while a switch in Settings waits for another page's switch stays tracked on Ethereum Mainnet", async () => {
|
||||
const boot = await bootOnAddToken("mainnet");
|
||||
expect(boot.pageErrors).toEqual([]);
|
||||
const { lookupTokenInfo } = require("../src/shared/balances");
|
||||
let answer;
|
||||
lookupTokenInfo.mockImplementationOnce(
|
||||
() =>
|
||||
new Promise((resolve) => {
|
||||
answer = resolve;
|
||||
}),
|
||||
);
|
||||
boot.node("settings-addtoken-address").value = NEW_TOKEN_ADDRESS;
|
||||
const adding = boot.click("btn-settings-addtoken-manual");
|
||||
await boot.click("btn-settings");
|
||||
|
||||
let releaseLock;
|
||||
const lockHeld = navigator.locks.request(
|
||||
"autistmask",
|
||||
() =>
|
||||
new Promise((resolve) => {
|
||||
releaseLock = resolve;
|
||||
}),
|
||||
);
|
||||
const select = boot.node("settings-network");
|
||||
select.value = "sepolia";
|
||||
const switching = Promise.all(select.listeners.change.map((fn) => fn()));
|
||||
await boot.settle();
|
||||
boot.storage.write("autistmask", {
|
||||
...boot.storage.read("autistmask"),
|
||||
networkId: "sepolia",
|
||||
trackedTokens: [],
|
||||
networkTrackedTokens: { mainnet: [MAINNET_TOKEN] },
|
||||
});
|
||||
|
||||
answer({ symbol: "NEW", decimals: 18, name: "New Token" });
|
||||
await boot.settle();
|
||||
releaseLock();
|
||||
await lockHeld;
|
||||
await switching;
|
||||
await adding;
|
||||
|
||||
const stored = boot.storage.read("autistmask");
|
||||
expect(stored.networkId).toBe("sepolia");
|
||||
expect(stored.trackedTokens).toEqual([]);
|
||||
expect(stored.networkTrackedTokens.mainnet).toEqual([
|
||||
MAINNET_TOKEN,
|
||||
{
|
||||
address: NEW_TOKEN_ADDRESS,
|
||||
symbol: "NEW",
|
||||
decimals: 18,
|
||||
name: "New Token",
|
||||
},
|
||||
]);
|
||||
});
|
||||
|
||||
// Another popup page holds the lock and stores its switch to Sepolia, with DAI
|
||||
// tracked on Ethereum Mainnet. This page waits for the lock to take that
|
||||
// switch. Meanwhile, the contract lookup on SettingsAddToken answers on
|
||||
// Ethereum Mainnet. When this page takes that switch, DAI and the new token
|
||||
// stay on Ethereum Mainnet's list.
|
||||
test("a token added while this page waits to take another page's switch stays tracked on Ethereum Mainnet", async () => {
|
||||
const boot = await bootOnAddToken("mainnet");
|
||||
expect(boot.pageErrors).toEqual([]);
|
||||
let releaseLock;
|
||||
const lockHeld = navigator.locks.request(
|
||||
"autistmask",
|
||||
() =>
|
||||
new Promise((resolve) => {
|
||||
releaseLock = resolve;
|
||||
}),
|
||||
);
|
||||
await boot.storage.local.set({
|
||||
autistmask: {
|
||||
...boot.storage.read("autistmask"),
|
||||
networkId: "sepolia",
|
||||
trackedTokens: [],
|
||||
networkTrackedTokens: { mainnet: [MAINNET_TOKEN] },
|
||||
},
|
||||
});
|
||||
await boot.settle();
|
||||
const { lookupTokenInfo } = require("../src/shared/balances");
|
||||
lookupTokenInfo.mockResolvedValueOnce({
|
||||
symbol: "NEW",
|
||||
decimals: 18,
|
||||
name: "New Token",
|
||||
});
|
||||
|
||||
boot.node("settings-addtoken-address").value = NEW_TOKEN_ADDRESS;
|
||||
const adding = boot.click("btn-settings-addtoken-manual");
|
||||
await boot.settle();
|
||||
releaseLock();
|
||||
await lockHeld;
|
||||
await adding;
|
||||
await boot.settle();
|
||||
|
||||
const stored = boot.storage.read("autistmask");
|
||||
expect(stored.networkId).toBe("sepolia");
|
||||
expect(stored.trackedTokens).toEqual([]);
|
||||
expect(stored.networkTrackedTokens.mainnet).toEqual([
|
||||
MAINNET_TOKEN,
|
||||
{
|
||||
address: NEW_TOKEN_ADDRESS,
|
||||
symbol: "NEW",
|
||||
decimals: 18,
|
||||
name: "New Token",
|
||||
},
|
||||
]);
|
||||
});
|
||||
|
||||
// This page tracks DAI on Ethereum Mainnet. Another popup page holds the lock
|
||||
// and stores its switch to Sepolia, with DAI on Ethereum Mainnet's list. This
|
||||
// page waits for the lock to take that switch. Meanwhile, the user removes DAI,
|
||||
// as the `[x]` on a tracked token in Settings does. When this page takes that
|
||||
// switch, DAI is gone from Ethereum Mainnet's list.
|
||||
test("a token removed while this page waits to take another page's switch is gone from Ethereum Mainnet", async () => {
|
||||
const boot = await bootPopup(
|
||||
unversionedValidProfile({ trackedTokens: [MAINNET_TOKEN] }),
|
||||
);
|
||||
expect(boot.pageErrors).toEqual([]);
|
||||
let releaseLock;
|
||||
const lockHeld = navigator.locks.request(
|
||||
"autistmask",
|
||||
() =>
|
||||
new Promise((resolve) => {
|
||||
releaseLock = resolve;
|
||||
}),
|
||||
);
|
||||
await boot.storage.local.set({
|
||||
autistmask: {
|
||||
...boot.storage.read("autistmask"),
|
||||
networkId: "sepolia",
|
||||
trackedTokens: [],
|
||||
networkTrackedTokens: { mainnet: [MAINNET_TOKEN] },
|
||||
},
|
||||
});
|
||||
await boot.settle();
|
||||
|
||||
const { state, saveState } = require("../src/shared/state");
|
||||
state.trackedTokens.splice(0, 1);
|
||||
const removing = saveState();
|
||||
releaseLock();
|
||||
await lockHeld;
|
||||
await removing;
|
||||
await boot.settle();
|
||||
|
||||
const stored = boot.storage.read("autistmask");
|
||||
expect(stored.networkId).toBe("sepolia");
|
||||
expect(stored.trackedTokens).toEqual([]);
|
||||
expect(stored.networkTrackedTokens.mainnet).toEqual([]);
|
||||
});
|
||||
|
||||
describe("Back after a switch from the Settings gear", () => {
|
||||
test("SettingsAddToken no longer offers the common tokens", async () => {
|
||||
const boot = await bootOnAddToken("mainnet");
|
||||
|
||||
Reference in new issue
Block a user