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:
+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