fix: history calls an execute or multicall a Swap only when sent to a router (closes #580)
The history labelled any call named execute or multicall a Swap, whatever contract it went to, so a multisig or smart account call showed as a Swap in the list and on TransactionDetail's Type line. Such a call is now a Swap only when sent to a Universal Router address listed for the network the transaction is on, the list the approval screen uses (routerRelease(), now exported from uniswap.js). Any other is labelled by its method name and its Type line reads Contract Call. The named router swap methods keep their label. Model: opus-5-5
This commit was merged in pull request #643.
This commit is contained in:
@@ -7,6 +7,12 @@
|
||||
// only when the transaction is sent to a Universal Router deployment on the
|
||||
// network it is for; anywhere else it is left to the raw data.
|
||||
//
|
||||
// The transaction history labelled any call named `execute` or `multicall` a
|
||||
// Swap, whatever address it went to
|
||||
// (https://git.eeqj.de/sneak/AutistMask/issues/580). It now does so only for
|
||||
// such a call sent to a Universal Router deployment on the network the
|
||||
// transaction is on; any other is labelled by its method name.
|
||||
//
|
||||
// The transaction detail screen and the approval screen are driven against a
|
||||
// minimal DOM stub in the shape tests/tokenTransferDetail.test.js uses, the
|
||||
// approval screen opened the way tests/swapStatusAmount.test.js opens it.
|
||||
@@ -33,6 +39,7 @@ globalThis.chrome = {
|
||||
};
|
||||
|
||||
const { state } = require("../src/shared/state");
|
||||
const { fetchRecentTransactions } = require("../src/shared/transactions");
|
||||
const approval = require("../src/popup/views/approval");
|
||||
const { decodeCalldata } = approval;
|
||||
const transactionDetail = require("../src/popup/views/transactionDetail");
|
||||
@@ -47,6 +54,8 @@ const SEPOLIA_ROUTER = "0x3a9d48ab9751398bbfa63ad67599bb04e4bdf98b";
|
||||
const ROUTER_ON_BOTH = "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD";
|
||||
// The address with no code from the issue.
|
||||
const ORDINARY = "0x0b0050Da68435b3EcBC236c40F16dB2070bCD79A";
|
||||
// A contract that is not a router, such as a multisig.
|
||||
const OTHER_CONTRACT = "0x5afe000000000000000000000000000000005afe";
|
||||
|
||||
const RECIPIENT = "0xC0FfEE0000000000000000000000000000c0fFEe";
|
||||
const SEPOLIA_WETH = "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14";
|
||||
@@ -129,8 +138,13 @@ describe("execute() calldata on the approval screen's decoder", () => {
|
||||
// The transaction the explorer reports: SWAP_DATA, sent to `mockSentTo`.
|
||||
const TX_HASH = "0x" + "5".repeat(64);
|
||||
let mockSentTo = null;
|
||||
// The transactions the explorer reports for RECIPIENT's history.
|
||||
let mockHistory = [];
|
||||
|
||||
function mockExplorerAnswer(url) {
|
||||
if (url.endsWith("/addresses/" + RECIPIENT + "/transactions")) {
|
||||
return { items: mockHistory };
|
||||
}
|
||||
if (url.endsWith("/transactions/" + TX_HASH)) {
|
||||
return {
|
||||
to: { hash: mockSentTo },
|
||||
@@ -187,10 +201,9 @@ function node(id) {
|
||||
}
|
||||
|
||||
// Open the transaction detail screen with `activeNetworkId` active, for the
|
||||
// Sepolia transaction the explorer reports sent to `sentTo`, and wait for its
|
||||
// decoded details.
|
||||
async function showDetailSentTo(sentTo, activeNetworkId) {
|
||||
mockSentTo = sentTo;
|
||||
// history row `row`, and wait for its decoded details.
|
||||
async function showDetail(row, activeNetworkId) {
|
||||
mockSentTo = row.to;
|
||||
globalThis.document = makeDocument();
|
||||
globalThis.window = { location: { search: "" } };
|
||||
state.networkId = activeNetworkId;
|
||||
@@ -198,22 +211,32 @@ async function showDetailSentTo(sentTo, activeNetworkId) {
|
||||
state.viewData = {};
|
||||
state.viewStack = [];
|
||||
state.currentView = null;
|
||||
transactionDetail.show({
|
||||
hash: TX_HASH,
|
||||
from: RECIPIENT,
|
||||
to: sentTo,
|
||||
value: "",
|
||||
symbol: "SepoliaETH",
|
||||
timestamp: 1790000000,
|
||||
isError: false,
|
||||
direction: "contract",
|
||||
directionLabel: "Swap",
|
||||
method: "execute",
|
||||
chainId: SEPOLIA,
|
||||
});
|
||||
transactionDetail.show(row);
|
||||
for (let i = 0; i < 10; i++) await new Promise((r) => setTimeout(r, 0));
|
||||
}
|
||||
|
||||
// Open the transaction detail screen with `activeNetworkId` active, for the
|
||||
// Sepolia transaction the explorer reports sent to `sentTo`, and wait for its
|
||||
// decoded details.
|
||||
async function showDetailSentTo(sentTo, activeNetworkId) {
|
||||
await showDetail(
|
||||
{
|
||||
hash: TX_HASH,
|
||||
from: RECIPIENT,
|
||||
to: sentTo,
|
||||
value: "",
|
||||
symbol: "SepoliaETH",
|
||||
timestamp: 1790000000,
|
||||
isError: false,
|
||||
direction: "contract",
|
||||
directionLabel: "Swap",
|
||||
method: "execute",
|
||||
chainId: SEPOLIA,
|
||||
},
|
||||
activeNetworkId,
|
||||
);
|
||||
}
|
||||
|
||||
describe("execute() calldata on the transaction detail screen", () => {
|
||||
test("sent to a router on the active network, it is a swap", async () => {
|
||||
await showDetailSentTo(SEPOLIA_ROUTER, "sepolia");
|
||||
@@ -245,6 +268,58 @@ describe("execute() calldata on the transaction detail screen", () => {
|
||||
});
|
||||
});
|
||||
|
||||
// The history row made from the explorer's answer for RECIPIENT's `method`
|
||||
// call sent to the contract `sentTo` on the network with `chainId`. The
|
||||
// explorer gives the address in checksummed form.
|
||||
async function historyRow(method, sentTo, chainId) {
|
||||
mockHistory = [
|
||||
{
|
||||
hash: TX_HASH,
|
||||
block_number: 7000000,
|
||||
timestamp: "2026-09-01T00:00:00Z",
|
||||
from: { hash: RECIPIENT },
|
||||
to: { hash: getAddress(sentTo), is_contract: true },
|
||||
value: "0",
|
||||
method,
|
||||
status: "ok",
|
||||
},
|
||||
];
|
||||
const rows = await fetchRecentTransactions(
|
||||
RECIPIENT,
|
||||
"https://explorer.example/api/v2",
|
||||
chainId,
|
||||
);
|
||||
return rows[0];
|
||||
}
|
||||
|
||||
// The history row's label and TransactionDetail's Type line, for a Sepolia
|
||||
// transaction. The active network does not decide either.
|
||||
describe.each([
|
||||
["execute", "Execute"],
|
||||
["multicall", "Multicall"],
|
||||
])("a %s() call in the history", (method, methodLabel) => {
|
||||
test("sent to a router on its network, it is a Swap", async () => {
|
||||
const row = await historyRow(method, SEPOLIA_ROUTER, SEPOLIA);
|
||||
expect(row.directionLabel).toBe("Swap");
|
||||
await showDetail(row, "mainnet");
|
||||
expect(node("tx-detail-type").textContent).toBe("Swap");
|
||||
});
|
||||
|
||||
test("sent to another contract, it is labelled by its method name", async () => {
|
||||
const row = await historyRow(method, OTHER_CONTRACT, SEPOLIA);
|
||||
expect(row.directionLabel).toBe(methodLabel);
|
||||
await showDetail(row, "sepolia");
|
||||
expect(node("tx-detail-type").textContent).toBe("Contract Call");
|
||||
});
|
||||
|
||||
test("sent to a router of the other network only, it is labelled by its method name", async () => {
|
||||
const row = await historyRow(method, MAINNET_ROUTER, SEPOLIA);
|
||||
expect(row.directionLabel).toBe(methodLabel);
|
||||
await showDetail(row, "mainnet");
|
||||
expect(node("tx-detail-type").textContent).toBe("Contract Call");
|
||||
});
|
||||
});
|
||||
|
||||
// Open the approval screen with Ethereum Mainnet active, for a site's Sepolia
|
||||
// transaction that sends SWAP_DATA to `sentTo`.
|
||||
async function showApprovalSentTo(sentTo) {
|
||||
|
||||
Reference in New Issue
Block a user