fix: the swap summary is shown only for a transaction sent to a Universal Router (closes #520)

The Universal Router decoder recognised execute() by its selector alone, so
the same calldata sent to any address was described as a swap through the
router. It now keeps the router deployments Uniswap publishes for Ethereum
Mainnet and Sepolia, and decodes only a transaction sent to one of them on
its network, ignoring address case. TxApproval passes the transaction's
chain id, TransactionDetail the active network's.

Model: opus-5-5

src/popup/views/approval.js

@@ -79,9 +79,10 @@ function tokenAmountText(rawAmount, decimals, symbol) {
     };
 }
 
-// Try to decode calldata using known ABIs.
+// Try to decode calldata sent to `toAddress` on the network with chain id
+// `chainId`, using known ABIs.
 // Returns { name, description, details } or null.
-function decodeCalldata(data, toAddress) {
+function decodeCalldata(data, toAddress, chainId) {
     if (!data || data === "0x" || data.length < 10) return null;
 
     // Where a token's scale is looked for, for every decoder below: the ERC-20
@@ -185,7 +186,12 @@ function decodeCalldata(data, toAddress) {
     }
 
     // Try Uniswap Universal Router
-    const routerResult = uniswap.decode(data, toAddress, decimalsSources);
+    const routerResult = uniswap.decode(
+        data,
+        toAddress,
+        chainId,
+        decimalsSources,
+    );
     if (routerResult) return routerResult;
 
     return null;
@@ -269,8 +275,14 @@ function showTxApproval(details) {
         chainId: approvedTx.chainId,
     };
 
-    // If this is an ERC-20 call, try to extract the real recipient and amount
-    const decoded = decodeCalldata(approvedTx.data, toAddr || "");
+    // If this is an ERC-20 call, try to extract the real recipient and amount.
+    // Decoded for the network the transaction is for, which the Network line
+    // names.
+    const decoded = decodeCalldata(
+        approvedTx.data,
+        toAddr || "",
+        approvedTx.chainId,
+    );
     if (decoded && decoded.details) {
         // The asset the status summary is counted in: an ERC-20 call's Token
         // contract, or a swap's input token. Its symbol is resolved from the

src/popup/views/transactionDetail.js

@@ -21,7 +21,7 @@ const {
     displaySymbol,
     goBack,
 } = require("./helpers");
-const { state } = require("../../shared/state");
+const { state, currentNetwork } = require("../../shared/state");
 const { nativeCurrencyByChainId } = require("../../shared/networks");
 const { formatEther, formatUnits } = require("ethers");
 const { log, debugFetch } = require("../../shared/log");
@@ -316,7 +316,12 @@ async function loadFullTxDetails(txHash, chainId) {
         // Decoded against the address the transaction was sent to, as the
         // explorer reports it, not the history entry's `to`: for a token
         // transfer that is the transfer's recipient, not the token contract.
-        const decoded = decodeCalldata(inputData, txData.to?.hash || "");
+        // On the active network, the one whose explorer was just asked.
+        const decoded = decodeCalldata(
+            inputData,
+            txData.to?.hash || "",
+            currentNetwork().chainId,
+        );
         if (decoded) {
             // Render decoded calldata matching approval view style
             actionEl.textContent = decoded.name;

src/shared/uniswap.js

@@ -8,6 +8,7 @@ const {
     resolveTokenSymbol,
     unknownDecimalsAmount,
 } = require("./approvalAmount");
+const { NETWORKS } = require("./networks");
 
 const coder = AbiCoder.defaultAbiCoder();
 
@@ -15,6 +16,41 @@ const ROUTER_IFACE = new Interface([
     "function execute(bytes commands, bytes[] inputs, uint256 deadline)",
 ]);
 
+// The Universal Router deployments on each network, by chain id, copied from
+// the deployment files Uniswap publishes, each address named by its key there.
+// The files also list `UnsupportedProtocol`, which is not a router.
+const ROUTER_ADDRESSES = new Map([
+    [
+        NETWORKS.mainnet.chainId,
+        // https://github.com/Uniswap/universal-router/blob/543e1a19d6e21e31ced2512eec5792b50f13a0ba/deploy-addresses/mainnet.json
+        [
+            "0xEf1c6E67703c7BD7107eed8303Fbe6EC2554BF6B", // UniversalRouterV1
+            "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD", // UniversalRouterV1_2_V2Support
+            "0x66a9893cc07d91d95644aedd05d03f95e1dba8af", // UniversalRouterV2
+            "0x4C82D1fBFe28C977cBB58D8C7FF8FCF9F70a2cCA", // UniversalRouterV2_1_1
+            "0x23617e59A5925b2A4Bf75d73ff6711cD0b29De85", // UniversalRouterV2_1_2
+        ],
+    ],
+    [
+        NETWORKS.sepolia.chainId,
+        // https://github.com/Uniswap/universal-router/blob/543e1a19d6e21e31ced2512eec5792b50f13a0ba/deploy-addresses/sepolia.json
+        [
+            "0x3fC91A3afd70395Cd496C647d5a6CC9D4B2b7FAD", // UniversalRouterV1_2_V2Support
+            "0x3a9d48ab9751398bbfa63ad67599bb04e4bdf98b", // UniversalRouterV2
+            "0x7DfD4F31be6814D2906BDE155c3e1B146EAc1468", // UniversalRouterV2_1_1
+            "0x7E4f6c5e954Da5c61B3423D81E2277431Ac043f3", // UniversalRouterV2_1_2
+        ],
+    ],
+]);
+
+// Whether `address` is a Universal Router deployment on the network with this
+// chain id. Address case is ignored.
+function isRouterAddress(address, chainId) {
+    const routers = ROUTER_ADDRESSES.get(chainId) || [];
+    const wanted = (address || "").toLowerCase();
+    return routers.some((router) => router.toLowerCase() === wanted);
+}
+
 // Universal Router command IDs (lower 5 bits of each command byte)
 const COMMAND_NAMES = {
     0x00: "V3 Swap (Exact In)",
@@ -120,7 +156,7 @@ const NO_MINIMUM = "None (no minimum guaranteed)";
 const MAX_UINT160 = BigInt("0xffffffffffffffffffffffffffffffffffffffff");
 
 // WETH, the token UNWRAP_WETH turns into ETH: on mainnet, then on Sepolia.
-// decode() is not told the network, so it takes either.
+// Either one counts on either network.
 const WETH_ADDRESSES = [
     "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
     "0xfff9976782d46cc05630d1f6ebab18b2324d6b14",
@@ -559,10 +595,15 @@ function decodeV4Swap(input) {
     }
 }
 
-// Try to decode a Universal Router execute() call.
+// Try to decode a Universal Router execute() call sent to `toAddress` on the
+// network with chain id `chainId`.
 // Returns { name, description, details } matching the format used by
-// the approval UI, or null if the calldata is not a recognised execute().
-function decode(data, toAddress, sources) {
+// the approval UI, or null if the calldata is not a recognised execute() or
+// `toAddress` is not a Universal Router on that network: the same calldata
+// sent to any other contract is not a swap through the router, whatever that
+// contract does with it.
+function decode(data, toAddress, chainId, sources) {
+    if (!isRouterAddress(toAddress, chainId)) return null;
     try {
         const parsed = ROUTER_IFACE.parseTransaction({ data });
         if (!parsed) return null;