@ledgerhq/hw-app-eth 6.38.2 → 7.0.0-next.0

package/tests/EIP712/noFilter-signMessage.unit.test.ts

@@ -14,7 +14,7 @@ const getFilePath = (type: "apdu" | "message", filename: string): string => {
 };
 
 // act like no message has filters
-jest.mock("@ledgerhq/cryptoassets/data/eip712", () => ({}));
+jest.mock("@ledgerhq/cryptoassets-evm-signatures/data/eip712", () => ({}));
 nock.disableNetConnect();
 
 describe("EIP712", () => {
@@ -24,7 +24,7 @@ describe("EIP712", () => {
   });
 
   describe("SignEIP712Message without filters", () => {
-    test("should sign correctly the 0.json sample message", async () => {
+    it("should sign correctly the 0.json sample message", async () => {
       const apdusBuffer = await fs.readFile(getFilePath("apdu", "0"), "utf-8");
       const message = await fs.readFile(getFilePath("message", "0"), "utf-8").then(JSON.parse);
       const transport = await openTransportReplayer(
@@ -41,7 +41,7 @@ describe("EIP712", () => {
       });
     });
 
-    test("should sign correctly the 1.json sample message", async () => {
+    it("should sign correctly the 1.json sample message", async () => {
       const apdusBuffer = await fs.readFile(getFilePath("apdu", "1"), "utf-8");
       const message = await fs.readFile(getFilePath("message", "1"), "utf-8").then(JSON.parse);
 
@@ -59,7 +59,7 @@ describe("EIP712", () => {
       });
     });
 
-    test("should sign correctly the 2.json sample message", async () => {
+    it("should sign correctly the 2.json sample message", async () => {
       const apdusBuffer = await fs.readFile(getFilePath("apdu", "2"), "utf-8");
       const message = await fs.readFile(getFilePath("message", "2"), "utf-8").then(JSON.parse);
 
@@ -77,7 +77,7 @@ describe("EIP712", () => {
       });
     });
 
-    test("should sign correctly the 3.json sample message", async () => {
+    it("should sign correctly the 3.json sample message", async () => {
       const apdusBuffer = await fs.readFile(getFilePath("apdu", "3"), "utf-8");
       const message = await fs.readFile(getFilePath("message", "3"), "utf-8").then(JSON.parse);
 
@@ -95,7 +95,7 @@ describe("EIP712", () => {
       });
     });
 
-    test("should sign correctly the 4.json sample message", async () => {
+    it("should sign correctly the 4.json sample message", async () => {
       const apdusBuffer = await fs.readFile(getFilePath("apdu", "4"), "utf-8");
       const message = await fs.readFile(getFilePath("message", "4"), "utf-8").then(JSON.parse);
 
@@ -113,7 +113,7 @@ describe("EIP712", () => {
       });
     });
 
-    test("should sign correctly the 5.json sample message", async () => {
+    it("should sign correctly the 5.json sample message", async () => {
       const apdusBuffer = await fs.readFile(getFilePath("apdu", "5"), "utf-8");
       const message = await fs.readFile(getFilePath("message", "5"), "utf-8").then(JSON.parse);
 
@@ -131,7 +131,7 @@ describe("EIP712", () => {
       });
     });
 
-    test("should sign correctly the 6.json sample message", async () => {
+    it("should sign correctly the 6.json sample message", async () => {
       const apdusBuffer = await fs.readFile(getFilePath("apdu", "6"), "utf-8");
       const message = await fs.readFile(getFilePath("message", "6"), "utf-8").then(JSON.parse);
 
@@ -149,7 +149,7 @@ describe("EIP712", () => {
       });
     });
 
-    test("should sign correctly the 7.json sample message", async () => {
+    it("should sign correctly the 7.json sample message", async () => {
       const apdusBuffer = await fs.readFile(getFilePath("apdu", "7"), "utf-8");
       const message = await fs.readFile(getFilePath("message", "7"), "utf-8").then(JSON.parse);
 
@@ -167,7 +167,7 @@ describe("EIP712", () => {
       });
     });
 
-    test("should sign correctly the 8.json sample message", async () => {
+    it("should sign correctly the 8.json sample message", async () => {
       const apdusBuffer = await fs.readFile(getFilePath("apdu", "8"), "utf-8");
       const message = await fs.readFile(getFilePath("message", "8"), "utf-8").then(JSON.parse);
 
@@ -185,7 +185,7 @@ describe("EIP712", () => {
       });
     });
 
-    test("should sign correctly the 9.json sample message", async () => {
+    it("should sign correctly the 9.json sample message", async () => {
       const apdusBuffer = await fs.readFile(getFilePath("apdu", "9"), "utf-8");
       const message = await fs.readFile(getFilePath("message", "9"), "utf-8").then(JSON.parse);
 
@@ -203,7 +203,7 @@ describe("EIP712", () => {
       });
     });
 
-    test("should sign correctly the 10.json sample message", async () => {
+    it("should sign correctly the 10.json sample message", async () => {
       const apdusBuffer = await fs.readFile(getFilePath("apdu", "10"), "utf-8");
       const message = await fs.readFile(getFilePath("message", "10"), "utf-8").then(JSON.parse);
 
@@ -221,7 +221,7 @@ describe("EIP712", () => {
       });
     });
 
-    test("should sign correctly the 11.json sample message", async () => {
+    it("should sign correctly the 11.json sample message", async () => {
       const apdusBuffer = await fs.readFile(getFilePath("apdu", "11"), "utf-8");
       const message = await fs.readFile(getFilePath("message", "11"), "utf-8").then(JSON.parse);
 
@@ -239,7 +239,7 @@ describe("EIP712", () => {
       });
     });
 
-    test("should sign correctly the 12.json sample message", async () => {
+    it("should sign correctly the 12.json sample message", async () => {
       const apdusBuffer = await fs.readFile(getFilePath("apdu", "12"), "utf-8");
       const message = await fs.readFile(getFilePath("message", "12"), "utf-8").then(JSON.parse);
 
@@ -257,7 +257,7 @@ describe("EIP712", () => {
       });
     });
 
-    test("should sign correctly the 13.json sample message", async () => {
+    it("should sign correctly the 13.json sample message", async () => {
       const apdusBuffer = await fs.readFile(getFilePath("apdu", "13"), "utf-8");
       const message = await fs.readFile(getFilePath("message", "13"), "utf-8").then(JSON.parse);
 
@@ -275,7 +275,7 @@ describe("EIP712", () => {
       });
     });
 
-    test("should sign correctly the 14.json sample message (shorthand byte string => 0x3 vs 0x03)", async () => {
+    it("should sign correctly the 14.json sample message (shorthand byte string => 0x3 vs 0x03)", async () => {
       const apdusBuffer = await fs.readFile(getFilePath("apdu", "14"), "utf-8");
       const messageShorthand = await fs
         .readFile(getFilePath("message", "14"), "utf-8")
@@ -303,7 +303,7 @@ describe("EIP712", () => {
       });
     });
 
-    test("should sign correctly the 15-permit.json sample message", async () => {
+    it("should sign correctly the 15-permit.json sample message", async () => {
       const apdusBuffer = await fs.readFile(getFilePath("apdu", "15"), "utf-8");
       const message = await fs
         .readFile(getFilePath("message", "15-permit"), "utf-8")
@@ -323,7 +323,7 @@ describe("EIP712", () => {
       });
     });
 
-    test("should sign correctly the 16-permit2.json sample message", async () => {
+    it("should sign correctly the 16-permit2.json sample message", async () => {
       const apdusBuffer = await fs.readFile(getFilePath("apdu", "16"), "utf-8");
       const message = await fs
         .readFile(getFilePath("message", "16-permit2"), "utf-8")
@@ -343,7 +343,7 @@ describe("EIP712", () => {
       });
     });
 
-    test("should sign correctly the 17-uniswapx.json sample message", async () => {
+    it("should sign correctly the 17-uniswapx.json sample message", async () => {
       const apdusBuffer = await fs.readFile(getFilePath("apdu", "17"), "utf-8");
       const message = await fs
         .readFile(getFilePath("message", "17-uniswapx"), "utf-8")
@@ -363,7 +363,7 @@ describe("EIP712", () => {
       });
     });
 
-    test("should sign correctly the 18-1inch-fusion.json sample message", async () => {
+    it("should sign correctly the 18-1inch-fusion.json sample message", async () => {
       const apdusBuffer = await fs.readFile(getFilePath("apdu", "18"), "utf-8");
       const message = await fs
         .readFile(getFilePath("message", "18-1inch-fusion"), "utf-8")

package/tests/ERC20/ERC20-CAL-KO.unit.test.ts

@@ -1,16 +1,26 @@
 import axios from "axios";
 import fs from "fs/promises";
 import path from "path";
-import evms from "@ledgerhq/cryptoassets/data/evm/index";
+import evms from "@ledgerhq/cryptoassets-evm-signatures/lib/data/evm/index";
 import { openTransportReplayer, RecordStore } from "@ledgerhq/hw-transport-mocker";
 import { EthAppPleaseEnableContractData } from "../../src/errors";
 import SignatureCALEth from "../fixtures/SignatureCALEth";
 import ledgerService from "../../src/services/ledger";
 import Eth from "../../src/Eth";
+import { ethers } from "ethers";
 
-const txHex =
-  "f86a0e8506a2bb7d008301512c94005d1123878fc55fbd56b54c73963b234a64af3c80b844a9059cbb00000000000000000000000082ec3523f8a722694ca217ebfd95efbcadad77ee000000000000000000000000000000000000000000000002b5e3af16b1880000018080";
-jest.mock("@ledgerhq/cryptoassets/data/evm/index", () => ({
+const transaction: ethers.Transaction = {
+  to: "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+  nonce: 14,
+  gasPrice: ethers.BigNumber.from("0x06a2bb7d00"),
+  gasLimit: ethers.BigNumber.from("0x01512c"),
+  value: ethers.BigNumber.from("0x00"),
+  data: "0xa9059cbb00000000000000000000000082ec3523f8a722694ca217ebfd95efbcadad77ee000000000000000000000000000000000000000000000002b5e3af16b1880000",
+  chainId: 1,
+};
+const txHex = ethers.utils.serializeTransaction(transaction).slice(2);
+
+jest.mock("@ledgerhq/cryptoassets-evm-signatures/data/evm/index", () => ({
   get signatures() {
     return {
       1: SignatureCALEth,

package/tests/ERC20/ERC20-CAL-OK.unit.test.ts

@@ -1,16 +1,27 @@
 import axios from "axios";
 import path from "path";
 import fs from "fs/promises";
+import { ethers } from "ethers";
 import { openTransportReplayer, RecordStore } from "@ledgerhq/hw-transport-mocker";
+import SignatureCALEth from "../fixtures/SignatureCALEth";
 import ledgerService from "../../src/services/ledger";
 import Eth from "../../src/Eth";
 
-const txHex =
-  "f86a0e8506a2bb7d008301512c94005d1123878fc55fbd56b54c73963b234a64af3c80b844a9059cbb00000000000000000000000082ec3523f8a722694ca217ebfd95efbcadad77ee000000000000000000000000000000000000000000000002b5e3af16b1880000018080";
+const transaction: ethers.Transaction = {
+  to: "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+  nonce: 14,
+  gasPrice: ethers.BigNumber.from("0x06a2bb7d00"),
+  gasLimit: ethers.BigNumber.from("0x01512c"),
+  value: ethers.BigNumber.from("0x00"),
+  data: "0xa9059cbb00000000000000000000000082ec3523f8a722694ca217ebfd95efbcadad77ee000000000000000000000000000000000000000000000002b5e3af16b1880000",
+  chainId: 1,
+};
+const txHex = ethers.utils.serializeTransaction(transaction).slice(2);
 
 describe("ERC20 dynamic cal", () => {
   describe("ERC20 is in local CAL", () => {
     it("should be successfully signin transaction from dynamic CAL", async () => {
+      jest.spyOn(axios, "get").mockImplementation(async () => ({ data: SignatureCALEth }));
       const apdusBuffer = await fs.readFile(
         path.resolve("./tests/fixtures/apdus/ERC20-OK.apdus"),
         "utf-8",
@@ -76,4 +87,4 @@ describe("ERC20 dynamic cal", () => {
       });
     });
   });
-});
+});

package/tests/Eth.unit.test.ts

@@ -595,11 +595,15 @@ describe("Eth app biding", () => {
       });
     });
 
+    /*
+     * if 1inch token is popular again
+    might need to put this back, starting at line 2
+      => e00a0000680531494e4348111111111117dc0aa78b770fa6a738034120c3020000001200000001304402204623e5f1375c54a446157ae8a739204284cf053634b7abd083dc5f5d2675c4e702206ff94b4c84ba9e93f44065c38d7c92506621fa69ba04f767aa58221de8afbf17
+      <= 9000
+    */
     const paraswapAPDUs =
       `=> e0120000670850617261737761701bd435f3c054b6e901b7b108a0ab7617c808677bcfc0afeb304402201c0cbe69aac517825b3a6eb5e7251e8fd57ff93a43bd3df52c7a841818eda81b022001a10cc326efaee2463fc96e7c29739c308fb8179bd2ac37303662bae4f7705c
   <= 9000
-  => e00a0000680531494e4348111111111117dc0aa78b770fa6a738034120c3020000001200000001304402204623e5f1375c54a446157ae8a739204284cf053634b7abd083dc5f5d2675c4e702206ff94b4c84ba9e93f44065c38d7c92506621fa69ba04f767aa58221de8afbf17
-  <= 9000
   => e004000096058000002c8000003c800000000000000000000000f903cd82043d8509c765240083042e73941bd435f3c054b6e901b7b108a0ab7617c808677b80b903a4cfc0afeb000000000000000000000000111111111117dc0aa78b770fa6a738034120c302000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee0000000000000000000000000000000000000000
   <= 9000
   => e0048000960000000af10f7eb24f506cfd00000000000000000000000000000000000000000000000002a5b905b3c9fa4c00000000000000000000000000000000000000000000000002baaee8d905020a000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000001c000000000000000000000