@ledgerhq/live-common 27.1.0 → 27.2.0-nightly.0

package/src/currencies/__snapshots__/sortByMarketcap.test.ts.snap

@@ -694,7 +694,6 @@ Array [
   "ethereum/erc20/mark",
   "ethereum/erc20/flip_token",
   "ethereum/erc20/team",
-  "polygon/erc20/ig_orb_(pos)",
   "ethereum/erc20/syncfab_manufacturing",
   "ethereum/erc20/niobium",
   "ethereum/erc20/bob_s_repair",
@@ -728,7 +727,7 @@ Array [
   "ethereum/erc20/coinus",
   "ethereum/erc20/rating",
   "ethereum/erc20/uptrennd",
-  "stacks",
+  "ethereum/erc20/stoxtoken",
   "ethereum/erc20/smartshare_token",
   "ethereum/erc20/fti",
   "ethereum/erc20/neurochain_clausius",
@@ -1579,7 +1578,6 @@ Array [
   "ethereum/erc20/ape_stax",
   "ethereum/erc20/apebullinu",
   "ethereum/erc20/apecoin",
-  "ethereum/erc20/apecoin_dev",
   "ethereum/erc20/apehaven",
   "ethereum/erc20/apenft",
   "ethereum/erc20/apenftio",
@@ -1831,7 +1829,6 @@ Array [
   "ethereum/erc20/bitboost",
   "ethereum/erc20/bitcar_token",
   "ethereum/erc20/bitcashpay",
-  "ethereum/erc20/bitcci_cash",
   "ethereum/erc20/bitcloud_token",
   "ethereum/erc20/bitcoin_boutique",
   "ethereum/erc20/bitcoin_zero",
@@ -2045,7 +2042,6 @@ Array [
   "ethereum/erc20/capital_finance",
   "ethereum/erc20/capitalsharetoken",
   "ethereum/erc20/capsule_coin",
-  "ethereum/erc20/captain_inu",
   "ethereum/erc20/car_coin",
   "ethereum/erc20/car_sharing_community",
   "ethereum/erc20/carbcoin",
@@ -2070,7 +2066,6 @@ Array [
   "ethereum/erc20/cat__blockcat_",
   "ethereum/erc20/cat_trade",
   "ethereum/erc20/catcoin",
-  "ethereum/erc20/catecoin",
   "ethereum/erc20/cavapoo",
   "ethereum/erc20/cavo",
   "ethereum/erc20/cbdao",
@@ -2109,7 +2104,6 @@ Array [
   "ethereum/erc20/cherry_token",
   "ethereum/erc20/chi_gastoken_by_1inch",
   "ethereum/erc20/chicken",
-  "ethereum/erc20/chihiro_inu",
   "ethereum/erc20/chihua_token",
   "ethereum/erc20/chihuahua",
   "ethereum/erc20/chipz",
@@ -2261,7 +2255,6 @@ Array [
   "ethereum/erc20/creedtoken",
   "ethereum/erc20/cremit",
   "ethereum/erc20/crespo",
-  "ethereum/erc20/creverse",
   "ethereum/erc20/criptoro_coin",
   "ethereum/erc20/cro",
   "ethereum/erc20/crossfi",
@@ -2688,7 +2681,6 @@ Array [
   "ethereum/erc20/enkronostoken",
   "ethereum/erc20/enreachdao",
   "ethereum/erc20/entanmo",
-  "ethereum/erc20/enter_governance_token",
   "ethereum/erc20/entone",
   "ethereum/erc20/entropy",
   "ethereum/erc20/envicoin",
@@ -3027,7 +3019,6 @@ Array [
   "ethereum/erc20/gera",
   "ethereum/erc20/gerowallet",
   "ethereum/erc20/geyser",
-  "ethereum/erc20/gg_token",
   "ethereum/erc20/ggcoin",
   "ethereum/erc20/ggtoken",
   "ethereum/erc20/ghoul",
@@ -3110,7 +3101,6 @@ Array [
   "ethereum/erc20/grearn's_token",
   "ethereum/erc20/green",
   "ethereum/erc20/green_light_erc20",
-  "ethereum/erc20/green_metaverse_token",
   "ethereum/erc20/green_token",
   "ethereum/erc20/greenmed",
   "ethereum/erc20/grey_token",
@@ -3194,7 +3184,6 @@ Array [
   "ethereum/erc20/hiz_finance",
   "ethereum/erc20/hkg",
   "ethereum/erc20/hlandtoken",
-  "ethereum/erc20/hmmm",
   "ethereum/erc20/hoard_token",
   "ethereum/erc20/hobonickels",
   "ethereum/erc20/hodlcoin",
@@ -3512,7 +3501,6 @@ Array [
   "ethereum/erc20/libartysharetoken",
   "ethereum/erc20/libera",
   "ethereum/erc20/libereum",
-  "ethereum/erc20/libero_financial_freedom",
   "ethereum/erc20/libertas",
   "ethereum/erc20/libfx",
   "ethereum/erc20/libratoken",
@@ -3678,7 +3666,6 @@ Array [
   "ethereum/erc20/meta_network",
   "ethereum/erc20/metafabric",
   "ethereum/erc20/metafactory",
-  "ethereum/erc20/metafluence",
   "ethereum/erc20/metaverse_index",
   "ethereum/erc20/metaverse_nft_index",
   "ethereum/erc20/metawhale_btc",
@@ -4263,7 +4250,6 @@ Array [
   "ethereum/erc20/quannabu",
   "ethereum/erc20/quantfury_data_token",
   "ethereum/erc20/quantfury_token",
-  "ethereum/erc20/quarashi",
   "ethereum/erc20/quickmining_token",
   "ethereum/erc20/quickswap",
   "ethereum/erc20/quiverx",
@@ -4318,7 +4304,6 @@ Array [
   "ethereum/erc20/reditoken",
   "ethereum/erc20/reef_finance",
   "ethereum/erc20/reeth_token",
-  "ethereum/erc20/refi",
   "ethereum/erc20/refine_medium_token",
   "ethereum/erc20/reflect_finance",
   "ethereum/erc20/reflector_finance",
@@ -4451,7 +4436,6 @@ Array [
   "ethereum/erc20/savetoken",
   "ethereum/erc20/savix",
   "ethereum/erc20/scaleswaptoken",
-  "ethereum/erc20/scallop",
   "ethereum/erc20/scandiweb_coin",
   "ethereum/erc20/scardust",
   "ethereum/erc20/scatter_cx",
@@ -4461,14 +4445,12 @@ Array [
   "ethereum/erc20/scifitoken",
   "ethereum/erc20/scoobi-doge",
   "ethereum/erc20/scott",
-  "ethereum/erc20/scratchtoken",
   "ethereum/erc20/scrl",
   "ethereum/erc20/sdog",
   "ethereum/erc20/sea_cucumber_chain",
   "ethereum/erc20/sealblock_token",
   "ethereum/erc20/sechain",
   "ethereum/erc20/secret_finance",
-  "ethereum/erc20/sector",
   "ethereum/erc20/secure_pad",
   "ethereum/erc20/securypto",
   "ethereum/erc20/seed",
@@ -4859,7 +4841,6 @@ Array [
   "ethereum/erc20/taklimakan_network",
   "ethereum/erc20/talao",
   "ethereum/erc20/talent_coin",
-  "ethereum/erc20/talkado",
   "ethereum/erc20/tama_egg_niftygotchi",
   "ethereum/erc20/tamadoge",
   "ethereum/erc20/tamy_token",
@@ -4953,7 +4934,6 @@ Array [
   "ethereum/erc20/tingles",
   "ethereum/erc20/tinku",
   "ethereum/erc20/tio",
-  "ethereum/erc20/titano",
   "ethereum/erc20/titanswap",
   "ethereum/erc20/tixl_token",
   "ethereum/erc20/tknt",
@@ -5768,7 +5748,6 @@ Array [
   "polygon/erc20/ground_coin",
   "polygon/erc20/grumpy_cat",
   "polygon/erc20/guaranteed_entrance_token",
-  "polygon/erc20/guppy_treat_token",
   "polygon/erc20/hashgard",
   "polygon/erc20/hex",
   "polygon/erc20/holotoken",
@@ -5784,10 +5763,6 @@ Array [
   "polygon/erc20/instadapp_(pos)",
   "polygon/erc20/internxt",
   "polygon/erc20/inverse",
-  "polygon/erc20/invictus_bitcoin_alpha",
-  "polygon/erc20/invictus_crypto10_hedged",
-  "polygon/erc20/invictus_crypto20",
-  "polygon/erc20/invictus_stable_growth",
   "polygon/erc20/iron_finance_ice_token",
   "polygon/erc20/iron_stablecoin",
   "polygon/erc20/iron_titanium_token",
@@ -5830,7 +5805,6 @@ Array [
   "polygon/erc20/musd",
   "polygon/erc20/museum_of_crypto_art",
   "polygon/erc20/mysterium_(pos)",
-  "polygon/erc20/nakamoto.games",
   "polygon/erc20/napoleonx",
   "polygon/erc20/neighbourhoods_token",
   "polygon/erc20/neos_credits_(pos)",
@@ -5895,7 +5869,6 @@ Array [
   "polygon/erc20/sand",
   "polygon/erc20/sand_old",
   "polygon/erc20/sapien_network",
-  "polygon/erc20/sekuritance_(pos)",
   "polygon/erc20/sentinel",
   "polygon/erc20/serum",
   "polygon/erc20/shiba_inu_(pos)",
@@ -6136,7 +6109,6 @@ Array [
   "bsc/bep20/cartesi_token",
   "bsc/bep20/catcoin",
   "bsc/bep20/catecoin",
-  "bsc/bep20/catecoin_old",
   "bsc/bep20/ceek",
   "bsc/bep20/cellframe_token",
   "bsc/bep20/cerby_token",
@@ -6244,14 +6216,12 @@ Array [
   "bsc/bep20/gamyfi",
   "bsc/bep20/genta",
   "bsc/bep20/gforce",
-  "bsc/bep20/gg_token",
   "bsc/bep20/gomining_token",
   "bsc/bep20/goose_coin",
   "bsc/bep20/goose_golden_egg",
   "bsc/bep20/gorilladiamond",
   "bsc/bep20/goswapp",
   "bsc/bep20/gourmetgalaxy",
-  "bsc/bep20/green_metaverse_token",
   "bsc/bep20/gummy_bull_token",
   "bsc/bep20/hachiro_inu",
   "bsc/bep20/hacken_token",
@@ -6366,7 +6336,6 @@ Array [
   "bsc/bep20/orbital_lps",
   "bsc/bep20/orbs",
   "bsc/bep20/oreo",
-  "bsc/bep20/orica",
   "bsc/bep20/ovr",
   "bsc/bep20/paid_network",
   "bsc/bep20/pancakeswap_token",
@@ -6402,7 +6371,6 @@ Array [
   "bsc/bep20/puli_inu",
   "bsc/bep20/qian_governance_token",
   "bsc/bep20/qian_second_generation_dollar",
-  "bsc/bep20/quarashi",
   "bsc/bep20/quarkchain_token",
   "bsc/bep20/qusd_stablecoin",
   "bsc/bep20/rabbit_coin",
@@ -6473,7 +6441,6 @@ Array [
   "bsc/bep20/swipe",
   "bsc/bep20/switcheo_token",
   "bsc/bep20/taco",
-  "bsc/bep20/talkado",
   "bsc/bep20/tbitcoin",
   "bsc/bep20/tdogecoin",
   "bsc/bep20/tenet",
@@ -6536,7 +6503,6 @@ Array [
   "bsc/bep20/venus_xrp",
   "bsc/bep20/venus_xvs",
   "bsc/bep20/vfox",
-  "bsc/bep20/volt_inu",
   "bsc/bep20/vswap.fi",
   "bsc/bep20/wall_street_games",
   "bsc/bep20/wanaka_farm",

package/src/families/bitcoin/hw-signMessage.ts

@@ -1,7 +1,7 @@
 import Btc from "@ledgerhq/hw-app-btc";
-import type { Resolver } from "../../hw/signMessage/types";
+import type { SignMessage } from "../../hw/signMessage/types";
 
-const resolver: Resolver = async (transport, { path, message }) => {
+const signMessage: SignMessage = async (transport, { path, message }) => {
   const btc = new Btc(transport);
   const hexMessage = Buffer.from(message).toString("hex");
   const result = await btc.signMessageNew(path, hexMessage);
@@ -16,4 +16,4 @@ const resolver: Resolver = async (transport, { path, message }) => {
   };
 };
 
-export default resolver;
+export default { signMessage };

package/src/families/cosmos/specs.ts

@@ -26,7 +26,7 @@ import {
 import { DeviceModelId } from "@ledgerhq/devices";
 import { acceptTransaction } from "./speculos-deviceActions";
 
-const minAmount = new BigNumber(20000);
+const minAmount = new BigNumber(10000);
 const maxAccounts = 32;
 
 // amounts of delegation are not exact so we are applying an approximation
@@ -158,13 +158,13 @@ const cosmos: AppSpec<Transaction> = {
           "already enough delegations"
         );
         const data = getCurrentCosmosPreloadData();
-        const count = 1 + Math.floor(2 * Math.random());
+        const count = 1 + Math.round(2 * Math.random() * Math.random());
         let remaining = getMaxDelegationAvailable(
           account as CosmosAccount,
           count
         )
           .minus(minAmount.times(2))
-          .times(0.25 * Math.random());
+          .times(0.1 * Math.random());
         invariant(remaining.gt(0), "not enough funds in account for delegate");
         const all = data.validators.filter(
           (v) =>
@@ -222,7 +222,7 @@ const cosmos: AppSpec<Transaction> = {
     },
     {
       name: "undelegate",
-      maxRun: 3,
+      maxRun: 5,
       transaction: ({ account, bridge }) => {
         invariant(canUndelegate(account as CosmosAccount), "can undelegate");
         const { cosmosResources } = account as CosmosAccount;
@@ -246,8 +246,8 @@ const cosmos: AppSpec<Transaction> = {
         );
         invariant(undelegateCandidate, "already pending");
 
-        const amount = (undelegateCandidate as CosmosDelegation).amount // most of the time, undelegate all
-          .times(Math.random() > 0.3 ? 1 : Math.random())
+        const amount = (undelegateCandidate as CosmosDelegation).amount
+          .times(Math.random() > 0.2 ? 1 : Math.random()) // most of the time, undelegate all
           .integerValue();
         invariant(amount.gt(0), "random amount to be positive");
 
@@ -406,10 +406,14 @@ const cosmos: AppSpec<Transaction> = {
           const d = (cosmosResources as CosmosResources).delegations.find(
             (d) => d.validatorAddress === v.address
           );
-          invariant(d, "delegation %s must be found in account", v.address);
-          invariant(
-            !canClaimRewards(account as CosmosAccount, d as CosmosDelegation),
-            "reward no longer be claimable"
+          botTest("delegation exists in account", () =>
+            invariant(d, "delegation %s must be found in account", v.address)
+          );
+          botTest("reward is no longer claimable after claim", () =>
+            invariant(
+              !canClaimRewards(account as CosmosAccount, d as CosmosDelegation),
+              "reward no longer be claimable"
+            )
           );
         });
       },

package/src/families/ethereum/hw-signMessage.test.ts

@@ -1,8 +1,10 @@
 import "../../__tests__/test-helpers/setup";
 
-import EIP712Message from "@ledgerhq/hw-app-eth/tests/sample-messages/0.json";
-import hwSignMessage from "./hw-signMessage";
+import { EIP712Message } from "@ledgerhq/hw-app-eth/lib/modules/EIP712";
+import testEIP712Message from "@ledgerhq/hw-app-eth/tests/sample-messages/0.json";
+import ethSign from "./hw-signMessage";
 import { setEnv } from "../../env";
+import { createFixtureCryptoCurrency } from "../../mock/fixtures/cryptoCurrencies";
 
 const signPersonalMessage = jest.fn(() =>
   Promise.resolve({
@@ -25,14 +27,81 @@ const signEIP712Message = jest.fn(() =>
     v: 28,
   })
 );
+// We only need to mock the defaut class returned
 jest.mock("@ledgerhq/hw-app-eth", () => {
-  return class {
-    signPersonalMessage = signPersonalMessage;
-    signEIP712HashedMessage = signEIP712HashedMessage;
-    signEIP712Message = signEIP712Message;
+  const originalModule = jest.requireActual("@ledgerhq/hw-app-eth");
+  return {
+    ...originalModule,
+    default: class {
+      signPersonalMessage = signPersonalMessage;
+      signEIP712HashedMessage = signEIP712HashedMessage;
+      signEIP712Message = signEIP712Message;
+    },
   };
 });
 
+describe("prepareMessageToSign", () => {
+  it("returns a MessageData object when message to sign is a simple string", () => {
+    // Given
+    const currency = createFixtureCryptoCurrency("ethereum");
+    const path = "44'/60'/0'/0/0";
+    const derivationMode = "ethM";
+    const message = "4d6573736167652064652074657374";
+    const expectedRawMessage = "0x4d6573736167652064652074657374";
+
+    // When
+    const result = ethSign.prepareMessageToSign(
+      currency,
+      path,
+      derivationMode,
+      message
+    );
+
+    // Then
+    expect(result).toEqual({
+      currency,
+      path: "44'/60'/0'/0/0",
+      derivationMode: "ethM",
+      message: "Message de test",
+      rawMessage: expectedRawMessage,
+    });
+  });
+
+  it("returns a TypedMessageData object when message to sign is an EIP712Message", () => {
+    // Given
+    const currency = createFixtureCryptoCurrency("ethereum");
+    const path = "44'/60'/0'/0/0";
+    const derivationMode = "ethM";
+    // testEIP712MessageHex
+    const message =
+      "7b0d0a2020202022646f6d61696e223a207b0d0a202020202020202022636861696e4964223a20352c0d0a2020202020202020226e616d65223a20224574686572204d61696c222c0d0a202020202020202022766572696679696e67436f6e7472616374223a2022307843634343636363634343434363434343434343634363436363436343434363436363636363636343222c0d0a20202020202020202276657273696f6e223a202231220d0a202020207d2c0d0a20202020226d657373616765223a207b0d0a202020202020202022636f6e74656e7473223a202248656c6c6f2c20426f6221222c0d0a20202020202020202266726f6d223a207b0d0a202020202020202020202020226e616d65223a2022436f77222c0d0a2020202020202020202020202277616c6c657473223a205b0d0a2020202020202020202020202020202022307843443261336439463933384531334344393437456330354162433746453733344466384444383236222c0d0a2020202020202020202020202020202022307844656144626565666445416462656566644561646245454664656164626545466445614462656546220d0a2020202020202020202020205d0d0a20202020202020207d2c0d0a202020202020202022746f223a207b0d0a202020202020202020202020226e616d65223a2022426f62222c0d0a2020202020202020202020202277616c6c657473223a205b0d0a2020202020202020202020202020202022307862426242424242626242424262626242626242626262624242624262626262426242626242426242222c0d0a2020202020202020202020202020202022307842304264614265613537423042444142654135376230626441424541353762304244616245613537222c0d0a2020202020202020202020202020202022307842304230623062306230623042303030303030303030303030303030303030303030303030303030220d0a2020202020202020202020205d0d0a20202020202020207d0d0a202020207d2c0d0a20202020227072696d61727954797065223a20224d61696c222c0d0a20202020227479706573223a207b0d0a202020202020202022454950373132446f6d61696e223a205b0d0a2020202020202020202020207b20226e616d65223a20226e616d65222c202274797065223a2022737472696e6722207d2c0d0a2020202020202020202020207b20226e616d65223a202276657273696f6e222c202274797065223a2022737472696e6722207d2c0d0a2020202020202020202020207b20226e616d65223a2022636861696e4964222c202274797065223a202275696e7432353622207d2c0d0a2020202020202020202020207b20226e616d65223a2022766572696679696e67436f6e7472616374222c202274797065223a20226164647265737322207d0d0a20202020202020205d2c0d0a2020202020202020224d61696c223a205b0d0a2020202020202020202020207b20226e616d65223a202266726f6d222c202274797065223a2022506572736f6e22207d2c0d0a2020202020202020202020207b20226e616d65223a2022746f222c202274797065223a2022506572736f6e22207d2c0d0a2020202020202020202020207b20226e616d65223a2022636f6e74656e7473222c202274797065223a2022737472696e6722207d0d0a20202020202020205d2c0d0a202020202020202022506572736f6e223a205b0d0a2020202020202020202020207b20226e616d65223a20226e616d65222c202274797065223a2022737472696e6722207d2c0d0a2020202020202020202020207b20226e616d65223a202277616c6c657473222c202274797065223a2022616464726573735b5d22207d0d0a20202020202020205d0d0a202020207d0d0a7d0d0a";
+
+    // When
+    const result = ethSign.prepareMessageToSign(
+      currency,
+      path,
+      derivationMode,
+      message
+    );
+
+    // Then
+    expect(result).toEqual({
+      currency,
+      path,
+      derivationMode,
+      message: testEIP712Message,
+      rawMessage: "0x" + message,
+      hashes: {
+        stringHash: "",
+        domainHash:
+          "0x6137beb405d9ff777172aa879e33edb34a1460e701802746c5ef96e741710e59",
+        messageHash:
+          "0x5476346eb09179b1f7d245c11a27ae6c498a419d7fad4d984d5b1e0ad081662a",
+      },
+    });
+  });
+});
+
 describe("Eth hw-signMessage", () => {
   beforeEach(() => {
     jest.clearAllMocks();
@@ -40,7 +109,7 @@ describe("Eth hw-signMessage", () => {
 
   describe("parsing", () => {
     it("should be using the signPersonalMessage method with string message", async () => {
-      await hwSignMessage({} as any, {
+      await ethSign.signMessage({} as any, {
         path: "",
         message: "test",
         rawMessage: "0xtest",
@@ -50,32 +119,47 @@ describe("Eth hw-signMessage", () => {
     });
 
     it("should be using the signEIP712HashedMessage method with stringified message", async () => {
-      await hwSignMessage({} as any, {
+      await ethSign.signMessage({} as any, {
         path: "",
-        message: JSON.stringify(EIP712Message),
+        message: JSON.stringify(testEIP712Message),
         rawMessage: "0xtest",
       });
 
       expect(signEIP712HashedMessage).toHaveBeenCalledTimes(1);
     });
 
-    it("should be using the signEIP712Message method with stringified message", async () => {
-      setEnv("EXPERIMENTAL_EIP712", true);
-
-      await hwSignMessage({} as any, {
+    it("should be using the signEIP712HashedMessage method with EIP712Message message", async () => {
+      await ethSign.signMessage({} as any, {
         path: "",
-        message: EIP712Message,
+        message: testEIP712Message as EIP712Message,
         rawMessage: "0xtest",
       });
 
-      expect(signEIP712Message).toHaveBeenCalledTimes(1);
-      setEnv("EXPERIMENTAL_EIP712", false);
+      expect(signEIP712HashedMessage).toHaveBeenCalledTimes(1);
+    });
+
+    describe("when EXPERIMENTAL_EIP712 env variable is set to true", () => {
+      beforeAll(() => {
+        setEnv("EXPERIMENTAL_EIP712", true);
+      });
+
+      afterAll(() => {
+        setEnv("EXPERIMENTAL_EIP712", false);
+      });
+
+      it("should be using the signEIP712Message method with EIP712Message message", async () => {
+        await ethSign.signMessage({} as any, {
+          path: "",
+          message: testEIP712Message as EIP712Message,
+          rawMessage: "0xtest",
+        });
+      });
     });
   });
 
   describe("value of v", () => {
     it("should returning parity for signPersonalMessage", async () => {
-      const { rsv } = await hwSignMessage({} as any, {
+      const { rsv } = await ethSign.signMessage({} as any, {
         path: "",
         message: "test",
         rawMessage: "0xtest",
@@ -85,9 +169,9 @@ describe("Eth hw-signMessage", () => {
     });
 
     it("should not be returning parity for signEIP712HashedMessage", async () => {
-      const { rsv } = await hwSignMessage({} as any, {
+      const { rsv } = await ethSign.signMessage({} as any, {
         path: "",
-        message: JSON.stringify(EIP712Message),
+        message: JSON.stringify(testEIP712Message),
         rawMessage: "0xtest",
       });
 
@@ -97,9 +181,9 @@ describe("Eth hw-signMessage", () => {
     it("should not be returning parity for signEIP712Message", async () => {
       setEnv("EXPERIMENTAL_EIP712", true);
 
-      const { rsv } = await hwSignMessage({} as any, {
+      const { rsv } = await ethSign.signMessage({} as any, {
         path: "",
-        message: EIP712Message,
+        message: testEIP712Message,
         rawMessage: "0xtest",
       });
 

package/src/families/ethereum/hw-signMessage.ts

@@ -1,15 +1,20 @@
+import Eth, { isEIP712Message } from "@ledgerhq/hw-app-eth";
 import { EIP712Message } from "@ledgerhq/hw-app-eth/lib/modules/EIP712/EIP712.types";
-import Eth from "@ledgerhq/hw-app-eth";
 import Transport from "@ledgerhq/hw-transport";
 import { TypedDataUtils } from "eth-sig-util";
 import { bufferToHex } from "ethereumjs-util";
 import { getEnv } from "../../env";
 import type { MessageData, Result } from "../../hw/signMessage/types";
 import type { TypedMessageData } from "./types";
-type EthResolver = (
-  arg0: Transport,
-  arg1: Pick<MessageData | TypedMessageData, "path" | "message"> &
-    Partial<Pick<MessageData, "rawMessage">>
+import { DerivationMode } from "../../derivation";
+import { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
+
+type EthSignMessage = (
+  transport: Transport,
+  message: Pick<
+    MessageData | TypedMessageData,
+    "path" | "message" | "rawMessage"
+  >
 ) => Promise<Result>;
 
 export const domainHash = (message: EIP712Message): Buffer => {
@@ -29,18 +34,65 @@ export const messageHash = (message: EIP712Message): Buffer => {
   );
 };
 
-const resolver: EthResolver = async (
-  transport,
-  { path, message, rawMessage }
+function tryConvertToJSON(message: string): string | EIP712Message {
+  try {
+    const parsedMessage = JSON.parse(message);
+    if (isEIP712Message(parsedMessage)) {
+      return parsedMessage as EIP712Message;
+    }
+  } catch {
+    // Not a JSON message
+  }
+  return message;
+}
+
+const prepareMessageToSign = (
+  currency: CryptoCurrency,
+  path: string,
+  derivationMode: DerivationMode,
+  message: string
+): MessageData | TypedMessageData => {
+  const hexToStringMessage = Buffer.from(message, "hex").toString();
+  const parsedMessage = tryConvertToJSON(hexToStringMessage);
+
+  const messageData = {
+    currency,
+    path,
+    derivationMode,
+    rawMessage: "0x" + message,
+  };
+  if (typeof parsedMessage === "string") {
+    return {
+      ...messageData,
+      message: parsedMessage,
+    };
+  } else {
+    return {
+      ...messageData,
+      message: parsedMessage,
+      hashes: {
+        stringHash: "",
+        domainHash: bufferToHex(domainHash(parsedMessage)),
+        messageHash: bufferToHex(messageHash(parsedMessage)),
+      },
+    };
+  }
+};
+
+type PartialMessageData = {
+  path: string;
+  message: string | EIP712Message;
+  rawMessage: string;
+};
+const signMessage: EthSignMessage = async (
+  transport: Transport,
+  { path, message, rawMessage }: PartialMessageData
 ) => {
   const eth = new Eth(transport);
-  const parsedMessage = (() => {
-    try {
-      return JSON.parse(message as string);
-    } catch (e) {
-      return message;
-    }
-  })();
+  let parsedMessage = message;
+  if (typeof message === "string") {
+    parsedMessage = tryConvertToJSON(message);
+  }
 
   let result: Awaited<ReturnType<typeof eth.signPersonalMessage>>;
   if (typeof parsedMessage === "string") {
@@ -70,4 +122,4 @@ const resolver: EthResolver = async (
   };
 };
 
-export default resolver;
+export default { prepareMessageToSign, signMessage };

package/src/families/ethereum/types.ts

@@ -1,15 +1,15 @@
-import { EIP712Message } from "@ledgerhq/hw-app-eth/lib/modules/EIP712/EIP712.types";
 import type { BigNumber } from "bignumber.js";
+import { EIP712Message } from "@ledgerhq/hw-app-eth/lib/modules/EIP712/EIP712.types";
+import type { Unit } from "@ledgerhq/types-cryptoassets";
 import type { TransactionMode, ModeModule } from "./modules";
 import type { Range, RangeRaw } from "../../range";
-import type { DerivationMode } from "../../derivation";
 import type {
   TransactionCommon,
   TransactionCommonRaw,
   TransactionStatusCommon,
   TransactionStatusCommonRaw,
 } from "@ledgerhq/types-live";
-import type { CryptoCurrency, Unit } from "@ledgerhq/types-cryptoassets";
+import type { MessageData } from "../../hw/signMessage/types";
 
 export type EthereumGasLimitRequest = {
   from?: string;
@@ -61,14 +61,12 @@ export type TransactionRaw = TransactionCommonRaw & {
   collectionName?: string;
   quantities?: string[];
 };
-export type TypedMessageData = {
-  currency: CryptoCurrency;
-  path: string;
-  verify?: boolean;
-  derivationMode: DerivationMode;
+export type TypedMessageData = Omit<MessageData, "message"> & {
   message: EIP712Message;
   hashes: {
     stringHash: string;
+    domainHash: string;
+    messageHash: string;
   };
 };