Compare commits
2
Commits
| 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
|
- 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
|
the endpoint answers. Otherwise a flash message says that the URL was not
|
||||||
saved
|
saved
|
||||||
|
- If the user taps the same "Save" again before the endpoint answers, the
|
||||||
|
earlier tap stores nothing and shows no flash message
|
||||||
- Etherscan:
|
- Etherscan:
|
||||||
- "Check recipients on Etherscan" checkbox, unticked until the user
|
- "Check recipients on Etherscan" checkbox, unticked until the user
|
||||||
ticks it
|
ticks it
|
||||||
|
|||||||
@@ -50,6 +50,11 @@ let versionClickTimer = null;
|
|||||||
// not the one in `state`.
|
// not the one in `state`.
|
||||||
let shownNetwork = null;
|
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
|
// One row per site origin, however many addresses it appears under, each with
|
||||||
// an [x] that hands it to onRemove.
|
// an [x] that hands it to onRemove.
|
||||||
function renderSiteList(containerId, origins, 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
|
// 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
|
// 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`.
|
// `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 refused = false;
|
||||||
let inputChanged = false;
|
let inputChanged = false;
|
||||||
await saveState((stored) => {
|
await saveState((stored) => {
|
||||||
|
if (saveTaps[field] !== tap) return false;
|
||||||
refused =
|
refused =
|
||||||
state.networkId !== networkId || stored.networkId !== networkId;
|
state.networkId !== networkId || stored.networkId !== networkId;
|
||||||
inputChanged = $(input).value.trim() !== url;
|
inputChanged = $(input).value.trim() !== url;
|
||||||
@@ -358,6 +369,7 @@ async function saveEndpoint(field, input, url, networkId) {
|
|||||||
state[field] = url;
|
state[field] = url;
|
||||||
stored[field] = url;
|
stored[field] = url;
|
||||||
});
|
});
|
||||||
|
if (saveTaps[field] !== tap) return;
|
||||||
if (refused) {
|
if (refused) {
|
||||||
showFlash("The URL was not saved because the network changed.");
|
showFlash("The URL was not saved because the network changed.");
|
||||||
} else if (inputChanged) {
|
} else if (inputChanged) {
|
||||||
@@ -375,6 +387,8 @@ function init(_ctx) {
|
|||||||
showPhrase.init();
|
showPhrase.init();
|
||||||
|
|
||||||
$("btn-save-rpc").addEventListener("click", async () => {
|
$("btn-save-rpc").addEventListener("click", async () => {
|
||||||
|
saveTaps.rpcUrl++;
|
||||||
|
const tap = saveTaps.rpcUrl;
|
||||||
const url = $("settings-rpc").value.trim();
|
const url = $("settings-rpc").value.trim();
|
||||||
if (!url) {
|
if (!url) {
|
||||||
showFlash("Please enter an RPC URL.");
|
showFlash("Please enter an RPC URL.");
|
||||||
@@ -395,6 +409,8 @@ function init(_ctx) {
|
|||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
const json = await resp.json();
|
const json = await resp.json();
|
||||||
|
// The user has tapped this "Save" again since the check began.
|
||||||
|
if (tap !== saveTaps.rpcUrl) return;
|
||||||
if (json.error) {
|
if (json.error) {
|
||||||
log.errorf("RPC validation error:", json.error);
|
log.errorf("RPC validation error:", json.error);
|
||||||
showFlash("Endpoint returned an error.");
|
showFlash("Endpoint returned an error.");
|
||||||
@@ -408,6 +424,7 @@ function init(_ctx) {
|
|||||||
// Cancelled by the popup closing, not failed: see pageClosed in
|
// Cancelled by the popup closing, not failed: see pageClosed in
|
||||||
// src/popup/index.js.
|
// src/popup/index.js.
|
||||||
if (ctx.pageClosed.aborted) return;
|
if (ctx.pageClosed.aborted) return;
|
||||||
|
if (tap !== saveTaps.rpcUrl) return;
|
||||||
// Not the error's message: fetch puts the whole URL, password and
|
// 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
|
// key included, in the message of the error it throws for a URL
|
||||||
// with a user name and password or one it cannot parse.
|
// with a user name and password or one it cannot parse.
|
||||||
@@ -415,10 +432,12 @@ function init(_ctx) {
|
|||||||
showFlash("Could not reach endpoint.");
|
showFlash("Could not reach endpoint.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
await saveEndpoint("rpcUrl", "settings-rpc", url, net.id);
|
await saveEndpoint("rpcUrl", "settings-rpc", url, net.id, tap);
|
||||||
});
|
});
|
||||||
|
|
||||||
$("btn-save-blockscout").addEventListener("click", async () => {
|
$("btn-save-blockscout").addEventListener("click", async () => {
|
||||||
|
saveTaps.blockscoutUrl++;
|
||||||
|
const tap = saveTaps.blockscoutUrl;
|
||||||
const url = $("settings-blockscout").value.trim();
|
const url = $("settings-blockscout").value.trim();
|
||||||
if (!url) {
|
if (!url) {
|
||||||
showFlash("Please enter a Blockscout API URL.");
|
showFlash("Please enter a Blockscout API URL.");
|
||||||
@@ -428,18 +447,26 @@ function init(_ctx) {
|
|||||||
showFlash("Testing endpoint...");
|
showFlash("Testing endpoint...");
|
||||||
try {
|
try {
|
||||||
const resp = await debugFetch(url + "/stats");
|
const resp = await debugFetch(url + "/stats");
|
||||||
|
if (tap !== saveTaps.blockscoutUrl) return;
|
||||||
if (!resp.ok) {
|
if (!resp.ok) {
|
||||||
showFlash("Endpoint returned HTTP " + resp.status + ".");
|
showFlash("Endpoint returned HTTP " + resp.status + ".");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {
|
||||||
if (ctx.pageClosed.aborted) return;
|
if (ctx.pageClosed.aborted) return;
|
||||||
|
if (tap !== saveTaps.blockscoutUrl) return;
|
||||||
// Not the error's message, as for the RPC check above.
|
// Not the error's message, as for the RPC check above.
|
||||||
log.errorf("Blockscout validation failed:", urlOrigin(url));
|
log.errorf("Blockscout validation failed:", urlOrigin(url));
|
||||||
showFlash("Could not reach endpoint.");
|
showFlash("Could not reach endpoint.");
|
||||||
return;
|
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
|
// Each change is made inside the save, holding the lock. So
|
||||||
|
|||||||
@@ -70,6 +70,10 @@ function clearPopupCaches() {
|
|||||||
// already on `newNetworkId`, the switch made from there only resets the
|
// already on `newNetworkId`, the switch made from there only resets the
|
||||||
// balances and caches.
|
// 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
|
// Before the switch, `state` takes the tracked tokens that another page stored
|
||||||
// since this page's last save (takeStoredTrackedTokens() in state.js). The
|
// since this page's last save (takeStoredTrackedTokens() in state.js). The
|
||||||
// switch then puts them away under the previous network, the network they were
|
// switch then puts them away under the previous network, the network they were
|
||||||
@@ -80,11 +84,16 @@ async function onChainSwitch(newNetworkId) {
|
|||||||
saveState,
|
saveState,
|
||||||
takeStoredNetwork,
|
takeStoredNetwork,
|
||||||
takeStoredTrackedTokens,
|
takeStoredTrackedTokens,
|
||||||
|
takeStoredNetworkTrackedTokens,
|
||||||
} = require("./state");
|
} = require("./state");
|
||||||
let net = null;
|
let net = null;
|
||||||
await saveState((stored) => {
|
await saveState((stored) => {
|
||||||
if (state.networkId === newNetworkId) return false;
|
if (state.networkId === newNetworkId) return false;
|
||||||
if (stored.networkId !== state.networkId) takeStoredNetwork(stored);
|
if (stored.networkId !== state.networkId) {
|
||||||
|
takeStoredNetwork(stored);
|
||||||
|
} else {
|
||||||
|
takeStoredNetworkTrackedTokens(stored);
|
||||||
|
}
|
||||||
takeStoredTrackedTokens(stored);
|
takeStoredTrackedTokens(stored);
|
||||||
net = applyChainSwitchFields(state, newNetworkId);
|
net = applyChainSwitchFields(state, newNetworkId);
|
||||||
stored.lastBalanceRefresh = 0;
|
stored.lastBalanceRefresh = 0;
|
||||||
|
|||||||
+18
-4
@@ -127,10 +127,10 @@ function currentNetwork() {
|
|||||||
|
|
||||||
// `baseline` holds the persisted fields as this page held them when its last
|
// `baseline` holds the persisted fields as this page held them when its last
|
||||||
// loadState() finished, or when its last successful saveState() began.
|
// loadState() finished, or when its last successful saveState() began.
|
||||||
// takeStoredNetwork() and takeStoredTrackedTokens() also write into it what
|
// takeStoredNetwork(), takeStoredTrackedTokens() and
|
||||||
// this page has taken from the stored record since then. saveState() diffs the
|
// takeStoredNetworkTrackedTokens() also write into it what this page has taken
|
||||||
// live state against `baseline` to find only the fields THIS page changed
|
// from the stored record since then. saveState() diffs the live state against
|
||||||
// since.
|
// `baseline` to find only the fields THIS page changed since.
|
||||||
//
|
//
|
||||||
// Deep-cloned, not a reference: callers mutate persisted objects and arrays
|
// Deep-cloned, not a reference: callers mutate persisted objects and arrays
|
||||||
// in place (state.wallets.push(...)), and a reference baseline would mutate
|
// in place (state.wallets.push(...)), and a reference baseline would mutate
|
||||||
@@ -688,6 +688,19 @@ function takeStoredTrackedTokens(stored) {
|
|||||||
baseline.trackedTokens = structuredClone(stored.trackedTokens);
|
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
|
// 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
|
// sense of. Nothing is assigned and `loaded` stays false in that case, so a
|
||||||
// caller that ignores the rejection gets StateNotLoadedError on the first
|
// caller that ignores the rejection gets StateNotLoadedError on the first
|
||||||
@@ -735,6 +748,7 @@ module.exports = {
|
|||||||
onSaveFailure,
|
onSaveFailure,
|
||||||
takeStoredNetwork,
|
takeStoredNetwork,
|
||||||
takeStoredTrackedTokens,
|
takeStoredTrackedTokens,
|
||||||
|
takeStoredNetworkTrackedTokens,
|
||||||
loadState,
|
loadState,
|
||||||
currentAddress,
|
currentAddress,
|
||||||
currentNetwork,
|
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.");
|
||||||
|
},
|
||||||
|
);
|
||||||
@@ -401,6 +401,56 @@ test("a token another page tracked before its own switch stays tracked on Ethere
|
|||||||
expect(stored.networkTrackedTokens.mainnet).toEqual([MAINNET_TOKEN]);
|
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
|
// 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
|
// page's last save. The switch to Sepolia drops that fraud contract, as the
|
||||||
// switch drops this page's own.
|
// switch drops this page's own.
|
||||||
|
|||||||
Reference in new issue
Block a user