fix: WaitTx and TransactionDetail use the network the transaction was sent on (closes #584)
WaitTx asked the active network's node for the receipt, so after a network switch a transaction sent on the other network was never found and was reported as timed out. It now asks the node of the network its chain id names, through reviewedNetworkProvider(), moved from ConfirmTx into the shared view helpers so both screens use one function. WaitTx and TransactionDetail build their explorer links for that network too. A stored wait or transaction whose chain id names no network is refused on restore, as a stored ConfirmTx transaction already is. Model: opus-5-5
This commit was merged in pull request #621.
This commit is contained in:
@@ -192,6 +192,7 @@ describe("the wait, success and error screens", () => {
|
||||
amount: "0.0000",
|
||||
token: "ETH",
|
||||
tokenSymbol: null,
|
||||
chainId: "0x1",
|
||||
};
|
||||
const transfer = { ...creation, to: RECIPIENT };
|
||||
|
||||
|
||||
@@ -459,6 +459,19 @@ const CONTRACT = [
|
||||
views: ["transaction"],
|
||||
restored: false,
|
||||
},
|
||||
// A chain id naming no network has no explorer to link to.
|
||||
{
|
||||
value: {
|
||||
tx: {
|
||||
hash: "0x1",
|
||||
from: ADDRESS,
|
||||
to: ADDRESS,
|
||||
chainId: "0x5",
|
||||
},
|
||||
},
|
||||
views: ["transaction"],
|
||||
restored: false,
|
||||
},
|
||||
// confirm-tx passes on `data.pendingTx`.
|
||||
{
|
||||
value: { pendingTx: { amount: "1" } },
|
||||
@@ -821,7 +834,7 @@ const WELL_FORMED_DATA = {
|
||||
},
|
||||
pendingWait: {
|
||||
hash: "0x1",
|
||||
txInfo: { to: ADDRESS, amount: "1" },
|
||||
txInfo: { to: ADDRESS, amount: "1", chainId: "0x1" },
|
||||
broadcastTime: BROADCAST_TIME,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -225,7 +225,12 @@ describe("a popup already open when the stored profile becomes unreadable", () =
|
||||
viewData: {
|
||||
pendingWait: {
|
||||
hash: "0x1",
|
||||
txInfo: { to: ADDRESS, amount: "1", token: "ETH" },
|
||||
txInfo: {
|
||||
to: ADDRESS,
|
||||
amount: "1",
|
||||
token: "ETH",
|
||||
chainId: "0x1",
|
||||
},
|
||||
broadcastTime: Date.now(),
|
||||
},
|
||||
},
|
||||
|
||||
@@ -8,6 +8,10 @@
|
||||
// tracks. It decodes against the address the explorer reports the transaction
|
||||
// was sent to.
|
||||
//
|
||||
// Its links open the explorer of the network the transaction was sent on,
|
||||
// whichever network is active
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/584).
|
||||
//
|
||||
// The row is the one the real history parser makes from the explorer's answer,
|
||||
// opened through transactionDetail.show(), which is what a click on the row
|
||||
// calls. Driven against a minimal DOM stub in the shape
|
||||
@@ -35,6 +39,7 @@ globalThis.chrome = {
|
||||
};
|
||||
|
||||
const { state } = require("../src/shared/state");
|
||||
const { NETWORKS } = require("../src/shared/networks");
|
||||
const { fetchRecentTransactions } = require("../src/shared/transactions");
|
||||
const transactionDetail = require("../src/popup/views/transactionDetail");
|
||||
|
||||
@@ -77,7 +82,11 @@ function mockExplorerAnswer(url) {
|
||||
};
|
||||
}
|
||||
if (url === EXPLORER + "/transactions/" + TX_HASH) {
|
||||
return { to: { hash: TOKEN }, raw_input: TRANSFER_DATA };
|
||||
return {
|
||||
to: { hash: TOKEN },
|
||||
raw_input: TRANSFER_DATA,
|
||||
block_number: 100,
|
||||
};
|
||||
}
|
||||
return { items: [] };
|
||||
}
|
||||
@@ -154,7 +163,11 @@ beforeEach(() => {
|
||||
});
|
||||
|
||||
test("a token transfer's decoded details name the token contract and the amount at its scale", async () => {
|
||||
const [row] = await fetchRecentTransactions(HOLDER, EXPLORER, 1);
|
||||
const [row] = await fetchRecentTransactions(
|
||||
HOLDER,
|
||||
EXPLORER,
|
||||
NETWORKS.mainnet.chainId,
|
||||
);
|
||||
expect(row.to).toBe(RECIPIENT);
|
||||
expect(row.contractAddress).toBe(TOKEN.toLowerCase());
|
||||
|
||||
@@ -174,3 +187,33 @@ test("a token transfer's decoded details name the token contract and the amount
|
||||
'<div class="font-bold">1234.5000 TDOL</div>',
|
||||
);
|
||||
});
|
||||
|
||||
// Mainnet is active and the row was read from Sepolia's explorer. The stub
|
||||
// explorer answers whichever network asks, so every link on the screen is
|
||||
// drawn.
|
||||
test("with mainnet active, a Sepolia transaction's links open the Sepolia explorer", async () => {
|
||||
state.networkId = "mainnet";
|
||||
const [row] = await fetchRecentTransactions(
|
||||
HOLDER,
|
||||
EXPLORER,
|
||||
NETWORKS.sepolia.chainId,
|
||||
);
|
||||
|
||||
transactionDetail.show(row);
|
||||
for (let i = 0; i < 10; i++) await new Promise((r) => setTimeout(r, 0));
|
||||
|
||||
const sepolia = "https://sepolia.etherscan.io";
|
||||
const links = (id) =>
|
||||
[...node(id).innerHTML.matchAll(/href="([^"]*)"/g)].map((m) => m[1]);
|
||||
expect(links("tx-detail-hash")).toEqual([`${sepolia}/tx/${TX_HASH}`]);
|
||||
expect(links("tx-detail-from")).toEqual([`${sepolia}/address/${HOLDER}`]);
|
||||
expect(links("tx-detail-to")).toEqual([`${sepolia}/address/${RECIPIENT}`]);
|
||||
expect(links("tx-detail-token-contract")).toEqual([
|
||||
`${sepolia}/token/${TOKEN.toLowerCase()}`,
|
||||
]);
|
||||
expect(links("tx-detail-block")).toEqual([`${sepolia}/block/100`]);
|
||||
expect(links("tx-detail-calldata-details")).toEqual([
|
||||
`${sepolia}/address/${TOKEN}`,
|
||||
`${sepolia}/address/${RECIPIENT}`,
|
||||
]);
|
||||
});
|
||||
|
||||
+70
-3
@@ -29,8 +29,13 @@ jest.mock("../src/shared/log", () => ({
|
||||
}));
|
||||
|
||||
const mockReceiptLookup = jest.fn();
|
||||
// The RPC URL and network of every node a wait was given.
|
||||
const mockNodes = [];
|
||||
jest.mock("../src/shared/balances", () => ({
|
||||
getProvider: () => ({ getTransactionReceipt: mockReceiptLookup }),
|
||||
getProvider: (rpcUrl, networkId) => {
|
||||
mockNodes.push({ rpcUrl, networkId });
|
||||
return { getTransactionReceipt: mockReceiptLookup };
|
||||
},
|
||||
refreshBalances: jest.fn(),
|
||||
}));
|
||||
|
||||
@@ -107,6 +112,7 @@ global.chrome = { storage };
|
||||
|
||||
const txStatus = require("../src/popup/views/txStatus");
|
||||
const { state } = require("../src/shared/state");
|
||||
const { NETWORKS } = require("../src/shared/networks");
|
||||
const { RESTORABLE_VIEWS } = require("../src/shared/restorableViews");
|
||||
const { log } = require("../src/shared/log");
|
||||
|
||||
@@ -118,6 +124,7 @@ const TX_INFO = {
|
||||
amount: "0.0050",
|
||||
token: "ETH",
|
||||
tokenSymbol: null,
|
||||
chainId: NETWORKS.mainnet.chainId,
|
||||
};
|
||||
|
||||
// True when a view element is not hidden.
|
||||
@@ -137,7 +144,11 @@ beforeEach(() => {
|
||||
jest.setSystemTime(new Date("2026-08-11T12:00:00Z"));
|
||||
elements.clear();
|
||||
mockReceiptLookup.mockReset();
|
||||
mockNodes.length = 0;
|
||||
log.errorf.mockClear();
|
||||
state.networkId = "mainnet";
|
||||
state.rpcUrl = NETWORKS.mainnet.defaultRpcUrl;
|
||||
state.networkEndpoints = {};
|
||||
state.wallets = [];
|
||||
state.viewData = {};
|
||||
state.viewStack = [];
|
||||
@@ -349,14 +360,14 @@ describe("WaitTx persistence across popup close", () => {
|
||||
// out of restoreView().
|
||||
{
|
||||
hash: TX_HASH,
|
||||
txInfo: { to: 42, amount: "0.0050" },
|
||||
txInfo: { ...TX_INFO, to: 42 },
|
||||
broadcastTime: Date.now(),
|
||||
},
|
||||
// Otherwise complete but an array: only Array.isArray() rejects
|
||||
// it, since typeof [] is "object" and the fields are present.
|
||||
{
|
||||
hash: TX_HASH,
|
||||
txInfo: Object.assign([], { to: RECIPIENT, amount: "0.0050" }),
|
||||
txInfo: Object.assign([], TX_INFO),
|
||||
broadcastTime: Date.now(),
|
||||
},
|
||||
{
|
||||
@@ -364,6 +375,18 @@ describe("WaitTx persistence across popup close", () => {
|
||||
txInfo: { to: RECIPIENT },
|
||||
broadcastTime: Date.now(),
|
||||
},
|
||||
// Otherwise complete but for a chain id naming no network: there
|
||||
// is no node to ask for the receipt, and no explorer to link to.
|
||||
{
|
||||
hash: TX_HASH,
|
||||
txInfo: { ...TX_INFO, chainId: undefined },
|
||||
broadcastTime: Date.now(),
|
||||
},
|
||||
{
|
||||
hash: TX_HASH,
|
||||
txInfo: { ...TX_INFO, chainId: "0x5" },
|
||||
broadcastTime: Date.now(),
|
||||
},
|
||||
]) {
|
||||
state.viewData = { pendingWait: bad };
|
||||
expect(txStatus.restoreWait()).toBe(false);
|
||||
@@ -499,6 +522,50 @@ describe("WaitTx when the popup closes", () => {
|
||||
});
|
||||
});
|
||||
|
||||
// The popup can reopen onto WaitTx after Settings switched the network. The
|
||||
// wait asked the active network's node for the receipt, never found it, and
|
||||
// reported a timeout, and its links went to the active network's explorer
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/584).
|
||||
describe("WaitTx for a Sepolia transaction with mainnet active", () => {
|
||||
const SEPOLIA_NODE = "https://sepolia.node.example.invalid";
|
||||
const sepoliaTx = { ...TX_INFO, chainId: NETWORKS.sepolia.chainId };
|
||||
|
||||
beforeEach(() => {
|
||||
state.rpcUrl = "https://mainnet.node.example.invalid";
|
||||
state.networkEndpoints = { sepolia: { rpcUrl: SEPOLIA_NODE } };
|
||||
});
|
||||
|
||||
test("the receipt is asked of the Sepolia node Settings has", async () => {
|
||||
mockReceiptLookup.mockResolvedValue({ blockNumber: 21000000 });
|
||||
state.viewData = {
|
||||
pendingWait: {
|
||||
txInfo: sepoliaTx,
|
||||
hash: TX_HASH,
|
||||
broadcastTime: Date.now(),
|
||||
},
|
||||
};
|
||||
expect(txStatus.restoreWait()).toBe(true);
|
||||
await jest.advanceTimersByTimeAsync(0);
|
||||
|
||||
expect(mockNodes).toEqual([
|
||||
{ rpcUrl: SEPOLIA_NODE, networkId: "sepolia" },
|
||||
]);
|
||||
expect(state.currentView).toBe("success-tx");
|
||||
});
|
||||
|
||||
test("the recipient and hash link to the Sepolia explorer", () => {
|
||||
mockReceiptLookup.mockResolvedValue(null);
|
||||
txStatus.showWait(sepoliaTx, TX_HASH);
|
||||
|
||||
expect(getElement("wait-tx-to").innerHTML).toContain(
|
||||
`href="https://sepolia.etherscan.io/address/${RECIPIENT}"`,
|
||||
);
|
||||
expect(getElement("wait-tx-hash").innerHTML).toContain(
|
||||
`href="https://sepolia.etherscan.io/tx/${TX_HASH}"`,
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe("wait-tx is a view the popup may reopen onto", () => {
|
||||
// The resume feature is wired through RESTORABLE_VIEWS: restoreView()
|
||||
// refuses any view not in the set, so dropping "wait-tx" from it kills
|
||||
|
||||
Reference in New Issue
Block a user