@ledgerhq/hw-app-eth 7.0.0-nightly.2 → 7.0.0-nightly.20251121023744

package/lib-es/utils.js

@@ -1,26 +1,29 @@
 import { BigNumber } from "bignumber.js";
-import { ERC20_CLEAR_SIGNED_SELECTORS, ERC721_CLEAR_SIGNED_SELECTORS, ERC1155_CLEAR_SIGNED_SELECTORS, } from "@ledgerhq/evm-tools/selectors/index";
-import { encode, decode } from "@ethersproject/rlp";
-export { ERC20_CLEAR_SIGNED_SELECTORS, ERC721_CLEAR_SIGNED_SELECTORS, ERC1155_CLEAR_SIGNED_SELECTORS, };
+import * as rlp from "@ethersproject/rlp";
+import { ERC20_CLEAR_SIGNED_SELECTORS, ERC721_CLEAR_SIGNED_SELECTORS, ERC1155_CLEAR_SIGNED_SELECTORS, DAPP_SELECTORS, } from "@ledgerhq/evm-tools/selectors/index";
+export { ERC20_CLEAR_SIGNED_SELECTORS, ERC721_CLEAR_SIGNED_SELECTORS, ERC1155_CLEAR_SIGNED_SELECTORS, DAPP_SELECTORS, };
 export const padHexString = (str) => {
     return str.length % 2 ? "0" + str : str;
 };
 export function splitPath(path) {
-    const result = [];
-    const components = path.split("/");
-    components.forEach(element => {
-        let number = parseInt(element, 10);
-        if (isNaN(number)) {
+    const splittedPath = [];
+    const paths = path.split("/");
+    paths.forEach(path => {
+        let value = parseInt(path, 10);
+        if (isNaN(value)) {
             return; // FIXME shouldn't it throws instead?
         }
-        if (element.length > 1 && element[element.length - 1] === "'") {
-            number += 0x80000000;
+        // Detect hardened paths
+        if (path.length > 1 && path[path.length - 1] === "'") {
+            value += 0x80000000;
         }
-        result.push(number);
+        splittedPath.push(value);
     });
-    return result;
+    return splittedPath;
 }
 export function hexBuffer(str) {
+    if (!str)
+        return Buffer.alloc(0);
     const strWithoutPrefix = str.startsWith("0x") ? str.slice(2) : str;
     return Buffer.from(padHexString(strWithoutPrefix), "hex");
 }
@@ -29,75 +32,6 @@ export function maybeHexBuffer(str) {
         return null;
     return hexBuffer(str);
 }
-export const decodeTxInfo = (rawTx) => {
-    const VALID_TYPES = [1, 2];
-    const txType = VALID_TYPES.includes(rawTx[0]) ? rawTx[0] : null;
-    const rlpData = txType === null ? rawTx : rawTx.slice(1);
-    const rlpTx = decode(rlpData).map(hex => Buffer.from(hex.slice(2), "hex"));
-    let chainIdTruncated = 0;
-    const rlpDecoded = decode(rlpData);
-    let decodedTx;
-    if (txType === 2) {
-        // EIP1559
-        decodedTx = {
-            data: rlpDecoded[7],
-            to: rlpDecoded[5],
-            chainId: rlpTx[0],
-        };
-    }
-    else if (txType === 1) {
-        // EIP2930
-        decodedTx = {
-            data: rlpDecoded[6],
-            to: rlpDecoded[4],
-            chainId: rlpTx[0],
-        };
-    }
-    else {
-        // Legacy tx
-        decodedTx = {
-            data: rlpDecoded[5],
-            to: rlpDecoded[3],
-            // Default to 1 for non EIP 155 txs
-            chainId: rlpTx.length > 6 ? rlpTx[6] : Buffer.from("01", "hex"),
-        };
-    }
-    const chainIdSrc = decodedTx.chainId;
-    let chainId = new BigNumber(0);
-    if (chainIdSrc) {
-        // Using BigNumber because chainID could be any uint256.
-        chainId = new BigNumber(chainIdSrc.toString("hex"), 16);
-        const chainIdTruncatedBuf = Buffer.alloc(4);
-        if (chainIdSrc.length > 4) {
-            chainIdSrc.copy(chainIdTruncatedBuf);
-        }
-        else {
-            chainIdSrc.copy(chainIdTruncatedBuf, 4 - chainIdSrc.length);
-        }
-        chainIdTruncated = chainIdTruncatedBuf.readUInt32BE(0);
-    }
-    let vrsOffset = 0;
-    if (txType === null && rlpTx.length > 6) {
-        const rlpVrs = Buffer.from(encode(rlpTx.slice(-3)).slice(2), "hex");
-        vrsOffset = rawTx.length - (rlpVrs.length - 1);
-        // First byte > 0xf7 means the length of the list length doesn't fit in a single byte.
-        if (rlpVrs[0] > 0xf7) {
-            // Increment vrsOffset to account for that extra byte.
-            vrsOffset++;
-            // Compute size of the list length.
-            const sizeOfListLen = rlpVrs[0] - 0xf7;
-            // Increase rlpOffset by the size of the list length.
-            vrsOffset += sizeOfListLen - 1;
-        }
-    }
-    return {
-        decodedTx,
-        txType,
-        chainId,
-        chainIdTruncated,
-        vrsOffset,
-    };
-};
 /**
  * @ignore for the README
  *
@@ -129,4 +63,137 @@ export const mergeResolutions = (resolutionsArray) => {
     }
     return mergedResolutions;
 };
+/**
+ * @ignore for the README
+ *
+ * Ledger devices are returning v with potentially EIP-155 already applied when using legacy transactions.
+ * Because that v value is only represented as a single byte, we need to replicate what would be the
+ * overflow happening on the device while applying EIP-155 and recover the original parity.
+ *
+ * @param vFromDevice
+ * @param chainIdUint32
+ * @returns
+ */
+export const getParity = (vFromDevice, chainId, transactionType) => {
+    if (transactionType)
+        return vFromDevice;
+    // The device use a 4 bytes integer to represent the chainId and keeps the highest bytes
+    const chainIdUint32 = getChainIdAsUint32(chainId);
+    // Then applies EIP-155 to this chainId
+    const chainIdWithEIP155 = chainIdUint32 * 2 + 35;
+    // Since it's a single byte, we need to apply the overflow after reaching the max 0xff value and starting again to 0x00
+    // for both possible values, the chainId with EIP155 and a 0 or 1 parity included
+    const chainIdWithOverflowZero = chainIdWithEIP155 % 256;
+    const chainIdWithOverflowOne = (chainIdWithEIP155 + 1) % 256;
+    if (chainIdWithOverflowZero === vFromDevice) {
+        return 0;
+    }
+    else if (chainIdWithOverflowOne === vFromDevice) {
+        return 1;
+    }
+    throw new Error("Invalid v value");
+};
+/**
+ * @ignore for the README
+ *
+ * Helper to convert a chainId from a BigNumber to a 4 bytes integer.
+ * ChainIds are uint256, but the device limits them to 4 bytes
+ *
+ * @param {Number|BigNumber} chainId
+ * @returns {Number}
+ */
+export const getChainIdAsUint32 = (chainId) => {
+    const chainIdBuff = Buffer.from(padHexString(new BigNumber(chainId).toString(16)), "hex");
+    const chainIdUint32 = chainIdBuff.subarray(0, 4);
+    return parseInt(chainIdUint32.toString("hex"), 16);
+};
+/**
+ * @ignore for the README
+ *
+ * Depending on the transaction type you're trying to sign with the device, the v value will be different.
+ * For legacy transactions, the v value is used to store the chainId, and that chainId can be a uint256,
+ * and some math operation should be applied to it in order to comply with EIP-155 for replay attacks.
+ *
+ * In order to prevent breaking changes at the time, the `v` value has been kept as a single byte
+ * which forces us to replicate an overflow happening on the device to get the correct `v` value
+ *
+ * @param {number} vFromDevice
+ * @param {BigNumber} chainId
+ * @param {Transaction["type"]} transactionType
+ * @returns {string} hexa string of the v value
+ */
+export const getV = (vFromDevice, chainId, transactionType) => {
+    if (chainId.isZero())
+        return vFromDevice.toString(16);
+    const parity = getParity(vFromDevice, chainId, transactionType);
+    return !transactionType
+        ? // Legacy transactions (type 0) should apply EIP-155
+            // EIP-155: rlp[(nonce, gasprice, startgas, to, value, data, chainid, 0, 0)]
+            padHexString(chainId.times(2).plus(35).plus(parity).toString(16))
+        : // Transactions after type 1 should only use partity (00/01) as their v value
+            // EIP-2930: 0x01 || rlp([chainId, nonce, gasPrice, gasLimit, to, value, data, accessList, *signatureYParity*, signatureR, signatureS])
+            // EIP-1559: 0x02 || rlp([chain_id, nonce, max_priority_fee_per_gas, max_fee_per_gas, gas_limit, destination, amount, data, access_list, *signature_y_parity*, signature_r, signature_s])
+            // EIP-4844: 0x03 || rlp([chain_id, nonce, max_priority_fee_per_gas, max_fee_per_gas, gas_limit, to, value, data, access_list, max_fee_per_blob_gas, blob_versioned_hashes, *y_parity*, r, s])
+            // EIP-7702: 0x05 || rlp([chain_id, nonce, max_priority_fee_per_gas, max_fee_per_gas, gas_limit, destination, value, data, access_list, authorization_list, *signature_y_parity*, signature_r, signature_s])
+            padHexString(parity.toString(16));
+};
+/**
+ * @ignore for the README
+ *
+ * In order to prevent the device from considering a transaction RLP as complete before it actually is
+ * we need to split the RLP into chunks which could not be mistaken for a complete transaction.
+ * This is true for legacy transaction, where the `v` value is used to store the chainId
+ *
+ * @param {Buffer} transactionRlp
+ * @param {Buffer }derivationPath
+ * @param {Transaction["type"]} transactionType
+ *
+ * @returns {Buffer[]}
+ */
+export const safeChunkTransaction = (transactionRlp, derivationPath, transactionType) => {
+    const maxChunkSize = 255;
+    // The full payload is the derivation path + the complete RLP of the transaction
+    const payload = Buffer.concat([derivationPath, transactionRlp]);
+    if (payload.length <= maxChunkSize)
+        return [payload];
+    if (transactionType) {
+        const chunks = Math.ceil(payload.length / maxChunkSize);
+        return new Array(chunks)
+            .fill(null)
+            .map((_, i) => payload.subarray(i * maxChunkSize, (i + 1) * maxChunkSize));
+    }
+    // Decode the RLP of the full transaction and keep only the last 3 elements (v, r, s)
+    const decodedVrs = rlp.decode(transactionRlp).slice(-3);
+    // Encode those values back to RLP in order to get the length of this serialized list
+    // Result should be something like [0xc0 + list payload length, list.map(rlp)]
+    // since only v can be used to store the chainId in legacy transactions
+    const encodedVrs = rlp.encode(decodedVrs);
+    // Since chainIds are uint256, the list payload length can be 1B (v rlp description) + 32B (v) + 1B (r) + 1B (s) = 35B max (< 55B)
+    // Therefore, the RLP of this vrs list should be prefixed by a value between [0xc1, 0xe3] (0xc0 + 35B = 0xe3 max)
+    // @see https://ethereum.org/en/developers/docs/data-structures-and-encoding/rlp/
+    // `encodedVrs` is then everything but the first byte of this serialization
+    const encodedVrsBuff = hexBuffer(encodedVrs).subarray(1);
+    // Since we want to avoid chunking just before the v,r,s values,
+    // we just check the size of that payload and detect
+    // if it would fit perfectly in 255B chunks
+    // if it does, we chunk smaller parts
+    let chunkSize = 0;
+    const lastChunkSize = payload.length % maxChunkSize;
+    if (lastChunkSize === 0 || lastChunkSize > encodedVrsBuff.length) {
+        chunkSize = maxChunkSize;
+    }
+    else {
+        for (let i = 1; i <= maxChunkSize; i++) {
+            const lastChunkSize = payload.length % (maxChunkSize - i);
+            if (lastChunkSize === 0 || lastChunkSize > encodedVrsBuff.length) {
+                chunkSize = maxChunkSize - i;
+                break;
+            }
+        }
+    }
+    const chunks = Math.ceil(payload.length / chunkSize);
+    return new Array(chunks)
+        .fill(null)
+        .map((_, i) => payload.subarray(i * chunkSize, (i + 1) * chunkSize));
+};
 //# sourceMappingURL=utils.js.map

package/lib-es/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/hw-app-eth",
-  "version": "7.0.0-nightly.2",
+  "version": "7.0.0-nightly.20251121023744",
   "description": "Ledger Hardware Wallet Ethereum Application API",
   "keywords": [
     "Ledger",
@@ -26,26 +26,28 @@
   "types": "lib/Eth.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@ethersproject/abi": "^5.5.0",
-    "@ethersproject/rlp": "^5.5.0",
-    "axios": "1.7.7",
+    "@ethersproject/abi": "^5.7.0",
+    "@ethersproject/rlp": "^5.7.0",
+    "@ethersproject/transactions": "^5.7.0",
+    "axios": "1.12.2",
     "bignumber.js": "^9.1.2",
     "semver": "^7.3.5",
-    "@ledgerhq/cryptoassets-evm-signatures": "^14.0.0-nightly.1",
-    "@ledgerhq/domain-service": "^1.2.6-nightly.2",
-    "@ledgerhq/errors": "^6.19.1",
-    "@ledgerhq/evm-tools": "^1.2.3-nightly.1",
-    "@ledgerhq/hw-transport": "^6.31.4",
-    "@ledgerhq/hw-transport-mocker": "^6.29.4",
-    "@ledgerhq/logs": "^6.12.0",
-    "@ledgerhq/types-live": "^6.52.0-nightly.2"
+    "@ledgerhq/domain-service": "^1.4.1-nightly.20251121023744",
+    "@ledgerhq/errors": "^6.27.0",
+    "@ledgerhq/evm-tools": "^1.8.1-nightly.20251121023744",
+    "@ledgerhq/hw-transport": "6.31.13",
+    "@ledgerhq/hw-transport-mocker": "^6.29.13",
+    "@ledgerhq/logs": "^6.13.0",
+    "@ledgerhq/types-live": "^6.89.0-nightly.20251121023744"
   },
   "gitHead": "dd0dea64b58e5a9125c8a422dcffd29e5ef6abec",
   "devDependencies": {
+    "@ethersproject/bignumber": "^5.7.0",
+    "@ethersproject/constants": "^5.7.0",
+    "@ethersproject/units": "^5.7.0",
     "@types/jest": "^29.5.10",
-    "@types/node": "^20.8.10",
+    "@types/node": "^22.10.10",
     "documentation": "14.0.2",
-    "ethers": "5.7.2",
     "jest": "^29.7.0",
     "nock": "^13.0.5",
     "rimraf": "^4.4.1",
@@ -60,9 +62,11 @@
   },
   "scripts": {
     "clean": "rimraf lib lib-es",
-    "build": "tsc && tsc -m ES6 --outDir lib-es",
+    "build": "tsc && tsc -m esnext --moduleResolution bundler --outDir lib-es",
+    "coverage": "jest --coverage --passWithNoTests",
     "prewatch": "pnpm build",
     "watch": "tsc --watch",
+    "watch:es": "tsc --watch -m esnext --moduleResolution bundler --outDir lib-es",
     "doc": "documentation readme src/** --section=API --pe ts --re ts --re d.ts",
     "lint": "eslint ./src --no-error-on-unmatched-pattern --ext .ts,.tsx --cache",
     "lint:fix": "pnpm lint --fix",

package/src/Eth.ts

@@ -1,39 +1,28 @@
-/********************************************************************************
- *   Ledger Node JS API
- *   (c) 2016-2017 Ledger
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- ********************************************************************************/
-/* eslint @typescript-eslint/no-duplicate-enum-values: 1 */
-// FIXME drop:
-import type Transport from "@ledgerhq/hw-transport";
+/* eslint-disable @typescript-eslint/no-duplicate-enum-values */
+
+import { log } from "@ledgerhq/logs";
 import { BigNumber } from "bignumber.js";
-// NB: these are temporary import for the deprecated fallback mechanism
+import type Transport from "@ledgerhq/hw-transport";
+import { EIP712Message } from "@ledgerhq/types-live";
+import { parse as parseTransaction } from "@ethersproject/transactions";
 import { LedgerEthTransactionResolution, LoadConfig, ResolutionConfig } from "./services/types";
-import { log } from "@ledgerhq/logs";
 import {
-  decodeTxInfo,
+  EthAppNftNotSupported,
+  EthAppPleaseEnableContractData,
+  CeloAppPleaseEnableContractData,
+} from "./errors";
+import { signEIP712HashedMessage, signEIP712Message } from "./modules/EIP712";
+import { domainResolutionFlow } from "./modules/Domains";
+import ledgerService from "./services/ledger";
+import {
+  safeChunkTransaction,
+  getV,
   hexBuffer,
   intAsHexBytes,
   maybeHexBuffer,
   padHexString,
   splitPath,
 } from "./utils";
-import { domainResolutionFlow } from "./modules/Domains";
-import ledgerService from "./services/ledger";
-import { EthAppNftNotSupported, EthAppPleaseEnableContractData } from "./errors";
-import { signEIP712HashedMessage, signEIP712Message } from "./modules/EIP712";
-import { EIP712Message } from "@ledgerhq/types-live";
 
 export { ledgerService };
 export * from "./utils";
@@ -47,8 +36,12 @@ const starkQuantizationTypeMap = {
   erc721mintable: 5,
 };
 
-const remapTransactionRelatedErrors = e => {
+const remapTransactionRelatedErrors = (e: any, chainId: BigNumber) => {
   if (e && e.statusCode === 0x6a80) {
+    if (chainId.toNumber() === 42220) {
+      return new CeloAppPleaseEnableContractData();
+    }
+
     return new EthAppPleaseEnableContractData(
       "Please enable Blind signing or Contract data in the Ethereum app Settings",
     );
@@ -193,6 +186,14 @@ export default class Eth {
     v: string;
     r: string;
   }> {
+    enum APDU_FIELDS {
+      CLA = 0xe0,
+      INS = 0x04,
+      P1_FIRST_CHUNK = 0x00,
+      P1_FOLLOWING_CHUNK = 0x80,
+      P2 = 0x00,
+    }
+
     if (resolution === undefined) {
       console.warn(
         "hw-app-eth: signTransaction(path, rawTxHex, resolution): " +
@@ -247,68 +248,36 @@ export default class Eth {
     }
 
     const rawTx = Buffer.from(rawTxHex, "hex");
-    const { vrsOffset, txType, chainId, chainIdTruncated } = decodeTxInfo(rawTx);
+    const parsedTransaction = parseTransaction(`0x${rawTx.toString("hex")}`);
+    const chainId = new BigNumber(parsedTransaction.chainId);
 
     const paths = splitPath(path);
-    let response;
-    let offset = 0;
-    while (offset !== rawTx.length) {
-      const first = offset === 0;
-      const maxChunkSize = first ? 150 - 1 - paths.length * 4 : 150;
-      let chunkSize = offset + maxChunkSize > rawTx.length ? rawTx.length - offset : maxChunkSize;
-
-      if (vrsOffset != 0 && offset + chunkSize >= vrsOffset) {
-        // Make sure that the chunk doesn't end right on the EIP 155 marker if set
-        chunkSize = rawTx.length - offset;
-      }
-
-      const buffer = Buffer.alloc(first ? 1 + paths.length * 4 + chunkSize : chunkSize);
-
-      if (first) {
-        buffer[0] = paths.length;
-        paths.forEach((element, index) => {
-          buffer.writeUInt32BE(element, 1 + 4 * index);
-        });
-        rawTx.copy(buffer, 1 + 4 * paths.length, offset, offset + chunkSize);
-      } else {
-        rawTx.copy(buffer, 0, offset, offset + chunkSize);
-      }
+    const derivationPathBuff = Buffer.alloc(1 + paths.length * 4);
+    derivationPathBuff[0] = paths.length;
+    paths.forEach((element, index) => {
+      derivationPathBuff.writeUInt32BE(element, 1 + 4 * index);
+    });
 
+    const payloadChunks = safeChunkTransaction(rawTx, derivationPathBuff, parsedTransaction.type);
+    let response;
+    for (const chunk of payloadChunks) {
+      const isFirstChunk = chunk === payloadChunks[0];
       response = await this.transport
-        .send(0xe0, 0x04, first ? 0x00 : 0x80, 0x00, buffer)
+        .send(
+          APDU_FIELDS.CLA,
+          APDU_FIELDS.INS,
+          isFirstChunk ? APDU_FIELDS.P1_FIRST_CHUNK : APDU_FIELDS.P1_FOLLOWING_CHUNK,
+          APDU_FIELDS.P2,
+          chunk,
+        )
         .catch(e => {
-          throw remapTransactionRelatedErrors(e);
+          throw remapTransactionRelatedErrors(e, chainId);
         });
-
-      offset += chunkSize;
-    }
-
-    const response_byte: number = response[0];
-    let v = "";
-
-    if (chainId.times(2).plus(35).plus(1).isGreaterThan(255)) {
-      const oneByteChainId = (chainIdTruncated * 2 + 35) % 256;
-
-      const ecc_parity = Math.abs(response_byte - oneByteChainId);
-
-      if (txType != null) {
-        // For EIP2930 and EIP1559 tx, v is simply the parity.
-        v = ecc_parity % 2 == 1 ? "00" : "01";
-      } else {
-        // Legacy type transaction with a big chain ID
-        v = chainId.times(2).plus(35).plus(ecc_parity).toString(16);
-      }
-    } else {
-      v = response_byte.toString(16);
-    }
-
-    // Make sure v has is prefixed with a 0 if its length is odd ("1" -> "01").
-    if (v.length % 2 == 1) {
-      v = "0" + v;
     }
 
-    const r = response.slice(1, 1 + 32).toString("hex");
-    const s = response.slice(1 + 32, 1 + 32 + 32).toString("hex");
+    const v = getV(response[0], chainId, parsedTransaction.type);
+    const r = response.subarray(1, 1 + 32).toString("hex");
+    const s = response.subarray(1 + 32, 1 + 32 + 32).toString("hex");
     return { v, r, s };
   }
 

package/src/errors.ts

@@ -4,3 +4,6 @@ export const EthAppPleaseEnableContractData = createCustomErrorClass(
   "EthAppPleaseEnableContractData",
 );
 export const EthAppNftNotSupported = createCustomErrorClass("EthAppNftNotSupported");
+export const CeloAppPleaseEnableContractData = createCustomErrorClass(
+  "CeloAppPleaseEnableContractData",
+);

package/src/modules/EIP712/index.ts

@@ -120,7 +120,8 @@ const makeRecursiveFieldStructImplem = ({
         await recursiveFieldStructImplem([typeDescription, restSizes], entry, entryPath);
       }
     } else if (isCustomType) {
-      for (const [fieldName, fieldValue] of Object.entries(data as EIP712Message["message"])) {
+      for (const fieldName of Object.keys(typesMap[typeDescription?.name || ""])) {
+        const fieldValue = data[fieldName];
         const fieldType = typesMap[typeDescription?.name || ""]?.[fieldName];
 
         if (fieldType) {
@@ -389,7 +390,12 @@ async function sendFilteringInfo(
       if (isTokenAddress && coinRef !== undefined) {
         const { token, deviceTokenIndex } = coinRefsTokensMap[coinRef];
         if (deviceTokenIndex === undefined) {
-          const payload = await byContractAddressAndChainId(token, chainId, erc20SignaturesBlob);
+          const payload = await byContractAddressAndChainId(
+            token,
+            chainId,
+            erc20SignaturesBlob,
+            loadConfig,
+          );
           if (payload) {
             enum PROVIDE_TOKEN_INFOS_APDU_FIELDS {
               CLA = 0xe0,
@@ -521,14 +527,21 @@ export const signEIP712Message = async (
     P2_full = 0x01,
   }
   const { primaryType, types: unsortedTypes, domain, message } = typedMessage;
-  const { calServiceURL } = getLoadConfig(loadConfig);
+  const { calServiceURL, staticEIP712SignaturesV1, staticEIP712SignaturesV2 } =
+    getLoadConfig(loadConfig);
   // Types are sorted by alphabetical order in order to get the same schema hash no matter the JSON format
   const types = sortObjectAlphabetically(unsortedTypes) as EIP712MessageTypes;
 
   const { version } = await getAppAndVersion(transport);
   const shouldUseV1Filters = !semver.gte(version, "1.11.1-0", { includePrerelease: true });
   const shouldUseDiscardedFields = semver.gte(version, "1.12.0-0", { includePrerelease: true });
-  const filters = await getFiltersForMessage(typedMessage, shouldUseV1Filters, calServiceURL);
+  const filters = await getFiltersForMessage(
+    typedMessage,
+    shouldUseV1Filters,
+    calServiceURL,
+    staticEIP712SignaturesV1,
+    staticEIP712SignaturesV2,
+  );
   const coinRefsTokensMap = getCoinRefTokensMap(filters, shouldUseV1Filters, typedMessage);
 
   const typeEntries = Object.entries(types) as [

package/src/modules/Uniswap/constants.ts

@@ -50,6 +50,7 @@ export const UNISWAP_COMMANDS: Record<`0x${string}`, UniswapSupportedCommand> =
   "0x02": "PERMIT2_PERMIT_BATCH",
   "0x03": "PERMIT2_TRANSFER_FROM_BATCH",
   "0x06": "PAY_PORTION",
+  "0x04": "SWEEP",
 };
 
 export const SWAP_COMMANDS: Partial<UniswapSupportedCommand>[] = [

package/src/modules/Uniswap/decoders.ts

@@ -1,9 +1,9 @@
-import { utils } from "ethers";
+import { defaultAbiCoder } from "@ethersproject/abi";
 import { WETH_PER_CHAIN_ID } from "./constants";
 import { UniswapSupportedCommand } from "./types";
 
 const swapV2Decoder = (input: `0x${string}`): `0x${string}`[] => {
-  const [, , , addresses] = utils.defaultAbiCoder.decode(
+  const [, , , addresses] = defaultAbiCoder.decode(
     ["address", "uint256", "uint256", "address[]", "bool"],
     input,
   );
@@ -12,7 +12,7 @@ const swapV2Decoder = (input: `0x${string}`): `0x${string}`[] => {
 };
 
 const swapV3Decoder = (input: `0x${string}`): `0x${string}`[] => {
-  const [, , , path] = utils.defaultAbiCoder.decode(
+  const [, , , path] = defaultAbiCoder.decode(
     ["address", "uint256", "uint256", "bytes", "bool"],
     input,
   );
@@ -42,6 +42,12 @@ const wrapEthDecoder = (input: `0x${string}`, chainId: number | string): `0x${st
   return contract instanceof Error ? [] : [contract.toLowerCase()];
 };
 
+const sweepDecoder = (input: `0x${string}`): `0x${string}`[] => {
+  const [token] = defaultAbiCoder.decode(["address", "address", "uint256"], input);
+
+  return [token.toLowerCase()];
+};
+
 const noDecoder = () => [];
 
 export const UniswapDecoders: Record<
@@ -59,4 +65,5 @@ export const UniswapDecoders: Record<
   PERMIT2_PERMIT_BATCH: noDecoder,
   PERMIT2_TRANSFER_FROM_BATCH: noDecoder,
   PAY_PORTION: noDecoder,
+  SWEEP: sweepDecoder,
 };