Compare commits
2
Commits
caa134b704
...
89e5ccfbb2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
89e5ccfbb2 | ||
|
|
5615b08760 |
@@ -2281,6 +2281,8 @@ view would leave a wallet one click from deletion.
|
|||||||
- Endpoint URL input + "Save" button. "Save" asks the URL for `/stats`
|
- Endpoint URL input + "Save" button. "Save" asks the URL for `/stats`
|
||||||
and saves the URL only if that request succeeds. The request carries
|
and saves the URL only if that request succeeds. The request carries
|
||||||
no user data and is made whether or not "Use Blockscout" is ticked.
|
no user data and is made whether or not "Use Blockscout" is ticked.
|
||||||
|
- If the network changes before either "Save" stores its URL, the URL is not
|
||||||
|
saved and a flash message says so
|
||||||
- Etherscan:
|
- Etherscan:
|
||||||
- "Check recipients on Etherscan" checkbox, unticked until the user
|
- "Check recipients on Etherscan" checkbox, unticked until the user
|
||||||
ticks it
|
ticks it
|
||||||
@@ -3564,10 +3566,14 @@ Currently supported:
|
|||||||
on every router but `UniversalRouterV1`, and otherwise gives the address. A
|
on every router but `UniversalRouterV1`, and otherwise gives the address. A
|
||||||
move into the router needs none of them, because its `Paid to` line and
|
move into the router needs none of them, because its `Paid to` line and
|
||||||
`Token moved into the router` line already give the amount, the token and
|
`Token moved into the router` line already give the amount, the token and
|
||||||
where it goes, and so its amount is shown once. Every `PERMIT2_PERMIT` whose
|
where it goes, and so its amount is shown once. For a move of the zero
|
||||||
amount does not stand as the `Amount` figure, before the step that sets the
|
address, `Moved from the sender` gives the amount in base units and
|
||||||
input side or after it, gives three lines, in step order, after those for each
|
`Token moved` gives the zero address. For such a move into the router, the
|
||||||
`PERMIT2_TRANSFER_FROM`: `Permit2 allowance`, its amount, for example
|
`Paid to` line gives the amount in base units and
|
||||||
|
`Token moved into the router` gives the zero address. Every `PERMIT2_PERMIT`
|
||||||
|
whose amount does not stand as the `Amount` figure, before the step that sets
|
||||||
|
the input side or after it, gives three lines, in step order, after those for
|
||||||
|
each `PERMIT2_TRANSFER_FROM`: `Permit2 allowance`, its amount, for example
|
||||||
`5000.0000 DAI`, or `Unlimited` for Permit2's maximum; `Allowance token`,
|
`5000.0000 DAI`, or `Unlimited` for Permit2's maximum; `Allowance token`,
|
||||||
giving the token's address as the `Token In` line does; and
|
giving the token's address as the `Token In` line does; and
|
||||||
`Allowance spender`, the address it lets take the token. Only a permit whose
|
`Allowance spender`, the address it lets take the token. Only a permit whose
|
||||||
|
|||||||
@@ -44,6 +44,12 @@ let ctx;
|
|||||||
let versionClickCount = 0;
|
let versionClickCount = 0;
|
||||||
let versionClickTimer = null;
|
let versionClickTimer = null;
|
||||||
|
|
||||||
|
// The network that Settings was last drawn for. A follow of a switch saved
|
||||||
|
// elsewhere sets `state` to the new network first. Settings is drawn again only
|
||||||
|
// once the follow's write returns. So both "Save" buttons take this network,
|
||||||
|
// not the one in `state`.
|
||||||
|
let shownNetwork = null;
|
||||||
|
|
||||||
// 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) {
|
||||||
@@ -199,6 +205,7 @@ function renderWalletListSettings() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function show() {
|
function show() {
|
||||||
|
shownNetwork = currentNetwork();
|
||||||
$("settings-rpc").value = state.rpcUrl;
|
$("settings-rpc").value = state.rpcUrl;
|
||||||
$("settings-blockscout").value = state.blockscoutUrl;
|
$("settings-blockscout").value = state.blockscoutUrl;
|
||||||
$("settings-network").value = state.networkId;
|
$("settings-network").value = state.networkId;
|
||||||
@@ -306,6 +313,7 @@ function showNewSettings() {
|
|||||||
state.checkRecipientsOnEtherscan;
|
state.checkRecipientsOnEtherscan;
|
||||||
if (state.currentView === "settings") {
|
if (state.currentView === "settings") {
|
||||||
markViewRendered("settings");
|
markViewRendered("settings");
|
||||||
|
shownNetwork = currentNetwork();
|
||||||
$("settings-network").value = state.networkId;
|
$("settings-network").value = state.networkId;
|
||||||
$("settings-rpc").value = state.rpcUrl;
|
$("settings-rpc").value = state.rpcUrl;
|
||||||
$("settings-blockscout").value = state.blockscoutUrl;
|
$("settings-blockscout").value = state.blockscoutUrl;
|
||||||
@@ -319,6 +327,28 @@ function showNewSettings() {
|
|||||||
updateDebugBanner(state.currentView);
|
updateDebugBanner(state.currentView);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Saves `url` as `field` ("rpcUrl" or "blockscoutUrl") of the network
|
||||||
|
// `networkId`, the one that Settings showed when the user tapped "Save". The
|
||||||
|
// URL is set in `state` inside the save, holding the lock. So the page cannot
|
||||||
|
// follow a switch saved elsewhere (followStoredSettings() in
|
||||||
|
// src/popup/index.js) between setting the URL and writing it. If the active
|
||||||
|
// network is no longer `networkId`, on this page or in the stored record,
|
||||||
|
// nothing is saved. The flash message then says that the network changed.
|
||||||
|
async function saveEndpoint(field, url, networkId) {
|
||||||
|
let refused = false;
|
||||||
|
await saveState((stored) => {
|
||||||
|
refused =
|
||||||
|
state.networkId !== networkId || stored.networkId !== networkId;
|
||||||
|
if (refused) return false;
|
||||||
|
state[field] = url;
|
||||||
|
});
|
||||||
|
if (refused) {
|
||||||
|
showFlash("The URL was not saved because the network changed.");
|
||||||
|
} else {
|
||||||
|
showFlash("Saved.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function init(_ctx) {
|
function init(_ctx) {
|
||||||
ctx = _ctx;
|
ctx = _ctx;
|
||||||
deleteWallet.init(ctx);
|
deleteWallet.init(ctx);
|
||||||
@@ -330,6 +360,8 @@ function init(_ctx) {
|
|||||||
showFlash("Please enter an RPC URL.");
|
showFlash("Please enter an RPC URL.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
// The URL is for the network that Settings shows when "Save" is tapped.
|
||||||
|
const net = shownNetwork;
|
||||||
showFlash("Testing endpoint...");
|
showFlash("Testing endpoint...");
|
||||||
try {
|
try {
|
||||||
const resp = await debugFetch(url, {
|
const resp = await debugFetch(url, {
|
||||||
@@ -348,7 +380,6 @@ function init(_ctx) {
|
|||||||
showFlash("Endpoint returned an error.");
|
showFlash("Endpoint returned an error.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const net = currentNetwork();
|
|
||||||
if (json.result !== net.chainId) {
|
if (json.result !== net.chainId) {
|
||||||
showFlash("Wrong network: expected " + net.name + ".");
|
showFlash("Wrong network: expected " + net.name + ".");
|
||||||
return;
|
return;
|
||||||
@@ -364,9 +395,7 @@ function init(_ctx) {
|
|||||||
showFlash("Could not reach endpoint.");
|
showFlash("Could not reach endpoint.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
state.rpcUrl = url;
|
await saveEndpoint("rpcUrl", url, net.id);
|
||||||
await saveState();
|
|
||||||
showFlash("Saved.");
|
|
||||||
});
|
});
|
||||||
|
|
||||||
$("btn-save-blockscout").addEventListener("click", async () => {
|
$("btn-save-blockscout").addEventListener("click", async () => {
|
||||||
@@ -375,6 +404,7 @@ function init(_ctx) {
|
|||||||
showFlash("Please enter a Blockscout API URL.");
|
showFlash("Please enter a Blockscout API URL.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
const net = shownNetwork;
|
||||||
showFlash("Testing endpoint...");
|
showFlash("Testing endpoint...");
|
||||||
try {
|
try {
|
||||||
const resp = await debugFetch(url + "/stats");
|
const resp = await debugFetch(url + "/stats");
|
||||||
@@ -389,9 +419,7 @@ function init(_ctx) {
|
|||||||
showFlash("Could not reach endpoint.");
|
showFlash("Could not reach endpoint.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
state.blockscoutUrl = url;
|
await saveEndpoint("blockscoutUrl", url, net.id);
|
||||||
await saveState();
|
|
||||||
showFlash("Saved.");
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// Each change is made inside the save, holding the lock. So
|
// Each change is made inside the save, holding the lock. So
|
||||||
|
|||||||
+36
-45
@@ -479,6 +479,17 @@ function tokenInfo(address, sources) {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The token of a Permit2 allowance or of a PERMIT2_TRANSFER_FROM, in the
|
||||||
|
// shape tokenInfo() gives. Permit2 has no allowance of ETH and moves no ETH.
|
||||||
|
// The zero address there reads as a token nothing knows: its amount in base
|
||||||
|
// units, and the zero address as its token.
|
||||||
|
function permit2TokenInfo(address, sources) {
|
||||||
|
if (address === "0x0000000000000000000000000000000000000000") {
|
||||||
|
return { symbol: null, decimals: null, address };
|
||||||
|
}
|
||||||
|
return tokenInfo(address, sources);
|
||||||
|
}
|
||||||
|
|
||||||
// A swap amount line. With a scale it is the token quantity; with none it is
|
// A swap amount line. With a scale it is the token quantity; with none it is
|
||||||
// the base-unit integer with the unknown scale stated, the same refusal the
|
// the base-unit integer with the unknown scale stated, the same refusal the
|
||||||
// ERC-20 amount line makes, so the screen has one way of saying it. `display`
|
// ERC-20 amount line makes, so the screen has one way of saying it. `display`
|
||||||
@@ -497,16 +508,18 @@ function amountText(raw, info) {
|
|||||||
|
|
||||||
// The line giving a moved token, or the token of a permit, under `label`, in
|
// The line giving a moved token, or the token of a permit, under `label`, in
|
||||||
// the shape of the Token In line, so the screens show it as they show that
|
// the shape of the Token In line, so the screens show it as they show that
|
||||||
// one. ETH has no address.
|
// one. `info` is what tokenInfo() or permit2TokenInfo() gives for the token.
|
||||||
function tokenMovedLine(label, token, sources) {
|
// ETH has no address.
|
||||||
const info = tokenInfo(token, sources);
|
function tokenMovedLine(label, info) {
|
||||||
if (!present(info.address)) {
|
if (!present(info.address)) {
|
||||||
return { label, value: info.symbol };
|
return { label, value: info.symbol };
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
label,
|
label,
|
||||||
value: info.symbol ? info.symbol + " (" + token + ")" : token,
|
value: info.symbol
|
||||||
address: token,
|
? info.symbol + " (" + info.address + ")"
|
||||||
|
: info.address,
|
||||||
|
address: info.address,
|
||||||
isToken: true,
|
isToken: true,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -2329,7 +2342,9 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
|
|||||||
: UNDECODED_CURRENCY,
|
: UNDECODED_CURRENCY,
|
||||||
});
|
});
|
||||||
if (present(s.token)) {
|
if (present(s.token)) {
|
||||||
details.push(tokenMovedLine("Token moved", s.token, sources));
|
details.push(
|
||||||
|
tokenMovedLine("Token moved", tokenInfo(s.token, sources)),
|
||||||
|
);
|
||||||
details.push({
|
details.push({
|
||||||
label: "Moved to",
|
label: "Moved to",
|
||||||
value: "The swap step that spends it",
|
value: "The swap step that spends it",
|
||||||
@@ -2340,12 +2355,12 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
|
|||||||
// What each PERMIT2_TRANSFER_FROM moves: its amount, its token and
|
// What each PERMIT2_TRANSFER_FROM moves: its amount, its token and
|
||||||
// where it goes, an address on a line of its own.
|
// where it goes, an address on a line of its own.
|
||||||
for (const m of movedFromSender) {
|
for (const m of movedFromSender) {
|
||||||
|
const info = permit2TokenInfo(m.token, sources);
|
||||||
details.push({
|
details.push({
|
||||||
label: "Moved from the sender",
|
label: "Moved from the sender",
|
||||||
value: amountText(m.amount, tokenInfo(m.token, sources))
|
value: amountText(m.amount, info).display,
|
||||||
.display,
|
|
||||||
});
|
});
|
||||||
details.push(tokenMovedLine("Token moved", m.token, sources));
|
details.push(tokenMovedLine("Token moved", info));
|
||||||
details.push(
|
details.push(
|
||||||
present(m.to)
|
present(m.to)
|
||||||
? { label: "Moved to", value: m.to }
|
? { label: "Moved to", value: m.to }
|
||||||
@@ -2375,36 +2390,15 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
|
|||||||
});
|
});
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
// Permit2 has no allowance of ETH. An allowance of the zero
|
const info = permit2TokenInfo(p.token, sources);
|
||||||
// address reads as one of a token nothing knows: its amount in
|
details.push({
|
||||||
// base units, and the zero address as its token.
|
label: "Permit2 allowance",
|
||||||
if (p.token === "0x0000000000000000000000000000000000000000") {
|
value:
|
||||||
details.push({
|
p.amount >= MAX_UINT160
|
||||||
label: "Permit2 allowance",
|
? "Unlimited"
|
||||||
value:
|
: amountText(p.amount, info).display,
|
||||||
p.amount >= MAX_UINT160
|
});
|
||||||
? "Unlimited"
|
details.push(tokenMovedLine("Allowance token", info));
|
||||||
: unknownDecimalsAmount(p.amount),
|
|
||||||
});
|
|
||||||
details.push({
|
|
||||||
label: "Allowance token",
|
|
||||||
value: p.token,
|
|
||||||
address: p.token,
|
|
||||||
isToken: true,
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
details.push({
|
|
||||||
label: "Permit2 allowance",
|
|
||||||
value:
|
|
||||||
p.amount >= MAX_UINT160
|
|
||||||
? "Unlimited"
|
|
||||||
: amountText(p.amount, tokenInfo(p.token, sources))
|
|
||||||
.display,
|
|
||||||
});
|
|
||||||
details.push(
|
|
||||||
tokenMovedLine("Allowance token", p.token, sources),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
details.push({
|
details.push({
|
||||||
label: "Allowance spender",
|
label: "Allowance spender",
|
||||||
value: p.spender,
|
value: p.spender,
|
||||||
@@ -2462,7 +2456,7 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
|
|||||||
paidTo.push({ label: "Paid to", value: PAID_TO_BRIDGE });
|
paidTo.push({ label: "Paid to", value: PAID_TO_BRIDGE });
|
||||||
}
|
}
|
||||||
for (const m of movedIntoRouter) {
|
for (const m of movedIntoRouter) {
|
||||||
const info = tokenInfo(m.token, sources);
|
const info = permit2TokenInfo(m.token, sources);
|
||||||
paidTo.push({
|
paidTo.push({
|
||||||
label: "Paid to",
|
label: "Paid to",
|
||||||
value:
|
value:
|
||||||
@@ -2470,9 +2464,7 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
|
|||||||
amountText(m.amount, info).display +
|
amountText(m.amount, info).display +
|
||||||
" from the sender (later steps may not spend all of it)",
|
" from the sender (later steps may not spend all of it)",
|
||||||
});
|
});
|
||||||
paidTo.push(
|
paidTo.push(tokenMovedLine("Token moved into the router", info));
|
||||||
tokenMovedLine("Token moved into the router", m.token, sources),
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
if (outputHeld) {
|
if (outputHeld) {
|
||||||
paidTo.push({ label: "Paid to", value: STAYS_IN_ROUTER });
|
paidTo.push({ label: "Paid to", value: STAYS_IN_ROUTER });
|
||||||
@@ -2489,8 +2481,7 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
|
|||||||
paidTo.push(
|
paidTo.push(
|
||||||
tokenMovedLine(
|
tokenMovedLine(
|
||||||
"Token moved into the router",
|
"Token moved into the router",
|
||||||
getAddress(token),
|
tokenInfo(getAddress(token), sources),
|
||||||
sources,
|
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -253,6 +253,271 @@ test("a switch back in Settings after a follow whose write failed is stored", as
|
|||||||
expect(told.at(-1).chainId).toBe(NETWORKS.mainnet.chainId);
|
expect(told.at(-1).chainId).toBe(NETWORKS.mainnet.chainId);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// The user saves an endpoint URL in Settings on Ethereum Mainnet. Before the
|
||||||
|
// URL is stored, the background saves a switch to Sepolia. Another write holds
|
||||||
|
// the lock, so the popup's follow of that switch and the URL's save both wait
|
||||||
|
// for the lock. Either may take it first. The URL is stored for neither
|
||||||
|
// network. The flash message says that the network changed.
|
||||||
|
test.each([
|
||||||
|
{ button: "btn-save-rpc", field: "settings-rpc", first: "follow" },
|
||||||
|
{ button: "btn-save-rpc", field: "settings-rpc", first: "save" },
|
||||||
|
{
|
||||||
|
button: "btn-save-blockscout",
|
||||||
|
field: "settings-blockscout",
|
||||||
|
first: "follow",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
button: "btn-save-blockscout",
|
||||||
|
field: "settings-blockscout",
|
||||||
|
first: "save",
|
||||||
|
},
|
||||||
|
])(
|
||||||
|
"$button saves nothing when the network changes before the URL is stored ($first first)",
|
||||||
|
async ({ button, field, first }) => {
|
||||||
|
const page = await bootOnAddress();
|
||||||
|
await page.click("btn-settings");
|
||||||
|
// This answer passes both endpoint checks. The RPC check reads
|
||||||
|
// Ethereum Mainnet's chain id from it. The Blockscout check reads `ok`.
|
||||||
|
globalThis.fetch.mockResolvedValue({
|
||||||
|
ok: true,
|
||||||
|
json: async () => ({ result: NETWORKS.mainnet.chainId }),
|
||||||
|
});
|
||||||
|
const url = "https://own-node.example.invalid";
|
||||||
|
|
||||||
|
let releaseLock;
|
||||||
|
const lockHeld = navigator.locks.request(
|
||||||
|
"autistmask",
|
||||||
|
() =>
|
||||||
|
new Promise((resolve) => {
|
||||||
|
releaseLock = resolve;
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
// The click handler runs until its save waits for the lock.
|
||||||
|
const tapSave = async () => {
|
||||||
|
page.node(field).value = url;
|
||||||
|
const saving = page.node(button).listeners.click.map((fn) => fn());
|
||||||
|
await page.settle();
|
||||||
|
return saving;
|
||||||
|
};
|
||||||
|
let saving;
|
||||||
|
if (first === "save") saving = await tapSave();
|
||||||
|
await backgroundSwitch(page, "sepolia");
|
||||||
|
if (first === "follow") saving = await tapSave();
|
||||||
|
releaseLock();
|
||||||
|
await lockHeld;
|
||||||
|
await Promise.all(saving);
|
||||||
|
await page.settle();
|
||||||
|
|
||||||
|
const { state } = require("../src/shared/state");
|
||||||
|
expect(state.networkId).toBe("sepolia");
|
||||||
|
expect(JSON.stringify(page.storage.read("autistmask"))).not.toContain(
|
||||||
|
url,
|
||||||
|
);
|
||||||
|
expect(page.text("flash-msg")).toBe(
|
||||||
|
"The URL was not saved because the network changed.",
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
// The popup's follow of the background's switch to Sepolia has set `state` to
|
||||||
|
// Sepolia. The follow's write has not returned yet, so Settings still shows
|
||||||
|
// Ethereum Mainnet. The user taps "Save" there. The URL is for Ethereum
|
||||||
|
// Mainnet, so the save stores the URL for neither network.
|
||||||
|
test.each([
|
||||||
|
{ button: "btn-save-rpc", field: "settings-rpc" },
|
||||||
|
{ button: "btn-save-blockscout", field: "settings-blockscout" },
|
||||||
|
])(
|
||||||
|
"$button saves nothing when tapped while the follow's write waits",
|
||||||
|
async ({ button, field }) => {
|
||||||
|
const page = await bootOnAddress();
|
||||||
|
await page.click("btn-settings");
|
||||||
|
// This answer passes both endpoint checks on Ethereum Mainnet.
|
||||||
|
globalThis.fetch.mockResolvedValue({
|
||||||
|
ok: true,
|
||||||
|
json: async () => ({ result: NETWORKS.mainnet.chainId }),
|
||||||
|
});
|
||||||
|
const url = "https://own-node.example.invalid";
|
||||||
|
|
||||||
|
const { set } = page.storage.local;
|
||||||
|
const write = set.getMockImplementation();
|
||||||
|
let releaseWrite;
|
||||||
|
const writeHeld = new Promise((resolve) => {
|
||||||
|
releaseWrite = resolve;
|
||||||
|
});
|
||||||
|
// The background's write lands; the next, the follow's, waits.
|
||||||
|
set.mockImplementationOnce(write).mockImplementationOnce(
|
||||||
|
async (items) => {
|
||||||
|
await writeHeld;
|
||||||
|
await write(items);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
await backgroundSwitch(page, "sepolia");
|
||||||
|
const { state } = require("../src/shared/state");
|
||||||
|
expect(state.networkId).toBe("sepolia");
|
||||||
|
expect(page.value("settings-network")).toBe("mainnet");
|
||||||
|
|
||||||
|
page.node(field).value = url;
|
||||||
|
const saving = page.node(button).listeners.click.map((fn) => fn());
|
||||||
|
await page.settle();
|
||||||
|
releaseWrite();
|
||||||
|
await Promise.all(saving);
|
||||||
|
await page.settle();
|
||||||
|
|
||||||
|
expect(JSON.stringify(page.storage.read("autistmask"))).not.toContain(
|
||||||
|
url,
|
||||||
|
);
|
||||||
|
expect(page.text("flash-msg")).toBe(
|
||||||
|
"The URL was not saved because the network changed.",
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
// The user taps the RPC "Save" on Ethereum Mainnet. While the check waits for
|
||||||
|
// the node's answer, the popup follows the background's switch to Sepolia. The
|
||||||
|
// node answers with Sepolia's chain id. So the check refuses the node for
|
||||||
|
// Ethereum Mainnet, and nothing is stored.
|
||||||
|
test("the RPC check compares the answer with the network at the tap", async () => {
|
||||||
|
const page = await bootOnAddress();
|
||||||
|
await page.click("btn-settings");
|
||||||
|
let answer;
|
||||||
|
globalThis.fetch.mockReturnValue(
|
||||||
|
new Promise((resolve) => {
|
||||||
|
answer = resolve;
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
const url = "https://sepolia-node.example.invalid";
|
||||||
|
|
||||||
|
page.node("settings-rpc").value = url;
|
||||||
|
const saving = page.node("btn-save-rpc").listeners.click.map((fn) => fn());
|
||||||
|
await page.settle();
|
||||||
|
await backgroundSwitch(page, "sepolia");
|
||||||
|
const { state } = require("../src/shared/state");
|
||||||
|
expect(state.networkId).toBe("sepolia");
|
||||||
|
answer({ json: async () => ({ result: NETWORKS.sepolia.chainId }) });
|
||||||
|
await Promise.all(saving);
|
||||||
|
await page.settle();
|
||||||
|
|
||||||
|
expect(JSON.stringify(page.storage.read("autistmask"))).not.toContain(url);
|
||||||
|
expect(page.text("flash-msg")).toBe(
|
||||||
|
"Wrong network: expected Ethereum Mainnet.",
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
// The user taps the Blockscout "Save" on Ethereum Mainnet. While the check
|
||||||
|
// waits for Blockscout's answer, the popup follows the background's switch to
|
||||||
|
// Sepolia. The URL is for Ethereum Mainnet, so nothing is stored.
|
||||||
|
test("the Blockscout save is for the network at the tap", async () => {
|
||||||
|
const page = await bootOnAddress();
|
||||||
|
await page.click("btn-settings");
|
||||||
|
let answer;
|
||||||
|
globalThis.fetch.mockReturnValue(
|
||||||
|
new Promise((resolve) => {
|
||||||
|
answer = resolve;
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
const url = "https://own-explorer.example.invalid/api/v2";
|
||||||
|
|
||||||
|
page.node("settings-blockscout").value = url;
|
||||||
|
const saving = page
|
||||||
|
.node("btn-save-blockscout")
|
||||||
|
.listeners.click.map((fn) => fn());
|
||||||
|
await page.settle();
|
||||||
|
await backgroundSwitch(page, "sepolia");
|
||||||
|
expect(page.value("settings-network")).toBe("sepolia");
|
||||||
|
answer({ ok: true });
|
||||||
|
await Promise.all(saving);
|
||||||
|
await page.settle();
|
||||||
|
|
||||||
|
expect(JSON.stringify(page.storage.read("autistmask"))).not.toContain(url);
|
||||||
|
expect(page.text("flash-msg")).toBe(
|
||||||
|
"The URL was not saved because the network changed.",
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Settings is open when the network changes to Sepolia. The popup follows the
|
||||||
|
// background's switch, or the user picks Sepolia in the network selector. Each
|
||||||
|
// "Save" after the switch stores its URL for Sepolia.
|
||||||
|
test.each([
|
||||||
|
["a follow", (page) => backgroundSwitch(page, "sepolia")],
|
||||||
|
[
|
||||||
|
"the network selector",
|
||||||
|
async (page) => {
|
||||||
|
const select = page.node("settings-network");
|
||||||
|
select.value = "sepolia";
|
||||||
|
for (const fn of select.listeners.change) await fn();
|
||||||
|
await page.settle();
|
||||||
|
},
|
||||||
|
],
|
||||||
|
])(
|
||||||
|
"after a switch to Sepolia by %s, Settings saves each URL for Sepolia",
|
||||||
|
async (_how, switchToSepolia) => {
|
||||||
|
const page = await bootOnAddress();
|
||||||
|
await page.click("btn-settings");
|
||||||
|
await switchToSepolia(page);
|
||||||
|
// This answer passes both endpoint checks on Sepolia. The RPC check
|
||||||
|
// reads Sepolia's chain id from it. The Blockscout check reads `ok`.
|
||||||
|
globalThis.fetch.mockResolvedValue({
|
||||||
|
ok: true,
|
||||||
|
json: async () => ({ result: NETWORKS.sepolia.chainId }),
|
||||||
|
});
|
||||||
|
const rpcUrl = "https://own-node.example.invalid";
|
||||||
|
const blockscoutUrl = "https://own-explorer.example.invalid/api/v2";
|
||||||
|
|
||||||
|
page.node("settings-rpc").value = rpcUrl;
|
||||||
|
await page.click("btn-save-rpc");
|
||||||
|
expect(page.text("flash-msg")).toBe("Saved.");
|
||||||
|
page.node("settings-blockscout").value = blockscoutUrl;
|
||||||
|
await page.click("btn-save-blockscout");
|
||||||
|
expect(page.text("flash-msg")).toBe("Saved.");
|
||||||
|
|
||||||
|
const stored = page.storage.read("autistmask");
|
||||||
|
expect(stored.networkId).toBe("sepolia");
|
||||||
|
expect(stored.rpcUrl).toBe(rpcUrl);
|
||||||
|
expect(stored.blockscoutUrl).toBe(blockscoutUrl);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
// The user picks Sepolia in Settings, but the switch's write fails. The page is
|
||||||
|
// then on Sepolia, while Settings was last drawn for Ethereum Mainnet. A "Save"
|
||||||
|
// after the failed switch stores nothing for either network.
|
||||||
|
test.each([
|
||||||
|
{ button: "btn-save-rpc", field: "settings-rpc" },
|
||||||
|
{ button: "btn-save-blockscout", field: "settings-blockscout" },
|
||||||
|
])(
|
||||||
|
"$button saves nothing after a switch in Settings whose write failed",
|
||||||
|
async ({ button, field }) => {
|
||||||
|
const page = await bootOnAddress();
|
||||||
|
await page.click("btn-settings");
|
||||||
|
page.storage.local.set.mockRejectedValueOnce(
|
||||||
|
new Error("quota exceeded"),
|
||||||
|
);
|
||||||
|
const select = page.node("settings-network");
|
||||||
|
select.value = "sepolia";
|
||||||
|
for (const fn of select.listeners.change) {
|
||||||
|
await expect(fn()).rejects.toThrow("quota exceeded");
|
||||||
|
}
|
||||||
|
await page.settle();
|
||||||
|
const { state } = require("../src/shared/state");
|
||||||
|
expect(state.networkId).toBe("sepolia");
|
||||||
|
// This answer passes both endpoint checks on Ethereum Mainnet.
|
||||||
|
globalThis.fetch.mockResolvedValue({
|
||||||
|
ok: true,
|
||||||
|
json: async () => ({ result: NETWORKS.mainnet.chainId }),
|
||||||
|
});
|
||||||
|
const url = "https://own-node.example.invalid";
|
||||||
|
|
||||||
|
page.node(field).value = url;
|
||||||
|
await page.click(button);
|
||||||
|
|
||||||
|
expect(JSON.stringify(page.storage.read("autistmask"))).not.toContain(
|
||||||
|
url,
|
||||||
|
);
|
||||||
|
expect(page.text("flash-msg")).toBe(
|
||||||
|
"The URL was not saved because the network changed.",
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
// Such as one a newer build wrote, which this build cannot read. Nothing reads
|
// Such as one a newer build wrote, which this build cannot read. Nothing reads
|
||||||
// or writes the stored record for it: the popup's next save finds it, as
|
// or writes the stored record for it: the popup's next save finds it, as
|
||||||
// before.
|
// before.
|
||||||
|
|||||||
@@ -3440,6 +3440,82 @@ describe("uniswap decoder", () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// https://git.eeqj.de/sneak/AutistMask/issues/685 — Permit2 moves no
|
||||||
|
// ETH, so a PERMIT2_TRANSFER_FROM of the zero address reads as a move
|
||||||
|
// of a token nothing knows. On next at ec6b6b5 its lines read ETH,
|
||||||
|
// with an ETH figure.
|
||||||
|
describe("a PERMIT2_TRANSFER_FROM of the zero address", () => {
|
||||||
|
const MOVED_AMOUNT =
|
||||||
|
"1000000000000000000 base units (decimals unknown)";
|
||||||
|
|
||||||
|
test("to another address names the address", () => {
|
||||||
|
const result = decodeSteps(
|
||||||
|
[0x00, 0x02],
|
||||||
|
[V3_600, transfer(ZERO_ADDR, OTHER_ADDR, ONE_WETH)],
|
||||||
|
);
|
||||||
|
expect(linesBetweenTokens(result)).toEqual([
|
||||||
|
["Amount", "600.0000 USDT"],
|
||||||
|
["Moved from the sender", MOVED_AMOUNT],
|
||||||
|
["Token moved", ZERO_ADDR],
|
||||||
|
["Moved to", OTHER_ADDR],
|
||||||
|
]);
|
||||||
|
expect(detail(result, "Token moved").address).toBe(ZERO_ADDR);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("into the router names the address", () => {
|
||||||
|
const result = decodeSteps(
|
||||||
|
[0x02, 0x00],
|
||||||
|
[transfer(ZERO_ADDR, ROUTER_ADDR, ONE_WETH), V3_600],
|
||||||
|
);
|
||||||
|
expect(detail(result, "Paid to").value).toBe(
|
||||||
|
"The router, " +
|
||||||
|
MOVED_AMOUNT +
|
||||||
|
" from the sender (later steps may not spend all of it)",
|
||||||
|
);
|
||||||
|
expect(detail(result, "Token moved into the router")).toEqual({
|
||||||
|
label: "Token moved into the router",
|
||||||
|
value: ZERO_ADDR,
|
||||||
|
address: ZERO_ADDR,
|
||||||
|
isToken: true,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// The V4 step's SETTLE names the user as payer and states no
|
||||||
|
// amount. The step's lines say that the ETH amount is not known.
|
||||||
|
test("after a V4 exact-out step of ETH, also shows that the ETH amount is not known", () => {
|
||||||
|
const v4EthExactOut = encodeV4Swap(
|
||||||
|
new Uint8Array([
|
||||||
|
V4_SWAP_EXACT_OUT_SINGLE_ID,
|
||||||
|
V4_SETTLE_ID,
|
||||||
|
V4_TAKE_ALL_ID,
|
||||||
|
]),
|
||||||
|
[
|
||||||
|
encodeV4ExactOutSingle(
|
||||||
|
ZERO_ADDR,
|
||||||
|
USDC_ADDR,
|
||||||
|
590000000n,
|
||||||
|
ONE_WETH,
|
||||||
|
),
|
||||||
|
encodeV4Settle(ZERO_ADDR),
|
||||||
|
encodeV4TakeAll(USDC_ADDR, 0n),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
const result = decodeSteps(
|
||||||
|
[0x10, 0x02],
|
||||||
|
[v4EthExactOut, transfer(ZERO_ADDR, OTHER_ADDR, ONE_WETH)],
|
||||||
|
);
|
||||||
|
expect(detail(result, "Token In").value).toBe("ETH (native)");
|
||||||
|
expect(linesBetweenTokens(result)).toEqual([
|
||||||
|
["Moved from the sender", UNDECODED],
|
||||||
|
["Token moved", "ETH"],
|
||||||
|
["Moved to", "The swap step that spends it"],
|
||||||
|
["Moved from the sender", MOVED_AMOUNT],
|
||||||
|
["Token moved", ZERO_ADDR],
|
||||||
|
["Moved to", OTHER_ADDR],
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
// https://git.eeqj.de/sneak/AutistMask/issues/682 — V4 pays a SETTLE
|
// https://git.eeqj.de/sneak/AutistMask/issues/682 — V4 pays a SETTLE
|
||||||
// of ETH from the router's own ETH, whichever payer the SETTLE names,
|
// of ETH from the router's own ETH, whichever payer the SETTLE names,
|
||||||
// and the router holds the transaction's value. On next at 36b2002 a
|
// and the router holds the transaction's value. On next at 36b2002 a
|
||||||
|
|||||||
Reference in New Issue
Block a user