@ledgerhq/live-common 23.1.0 → 24.0.0-next.0

package/src/families/bitcoin/{test-dataset.ts → bridge.integration.test.ts}

@@ -1,42 +1,47 @@
+import "../../__tests__/test-helpers/setup";
+import { testBridge } from "../../__tests__/test-helpers/bridge";
+
 import type { DatasetTest } from "../../types";
 import type { Transaction } from "./types";
-// import bitcoin_cash from "./datasets/bitcoin_cash";
-// import bitcoin_gold from "./datasets/bitcoin_gold";
+import bitcoin_cash from "./datasets/bitcoin_cash";
+import bitcoin_gold from "./datasets/bitcoin_gold";
 import bitcoin from "./datasets/bitcoin";
 import dash from "./datasets/dash";
-// import decred from "./datasets/decred";
+import decred from "./datasets/decred";
 import digibyte from "./datasets/digibyte";
 import dogecoin from "./datasets/dogecoin";
-// import zencash from "./datasets/zencash";
+import zencash from "./datasets/zencash";
 import komodo from "./datasets/komodo";
 import litecoin from "./datasets/litecoin";
 import peercoin from "./datasets/peercoin";
 import pivx from "./datasets/pivx";
 import qtum from "./datasets/qtum";
-// import stakenet from "./datasets/stakenet";
+import stakenet from "./datasets/stakenet";
 import vertcoin from "./datasets/vertcoin";
 import viacoin from "./datasets/viacoin";
-// import zcash from "./datasets/zcash";
+import zcash from "./datasets/zcash";
+
 const dataset: DatasetTest<Transaction> = {
   implementations: ["js", "mock"],
   currencies: {
     bitcoin,
-    // bitcoin_cash,
-    // bitcoin_gold,
+    bitcoin_cash,
+    bitcoin_gold,
     dash,
-    // decred, // BACK-2443
+    decred,
     digibyte,
     dogecoin,
-    // zencash,
+    zencash,
     komodo,
     litecoin,
     peercoin,
     pivx,
     qtum,
-    // stakenet,
+    stakenet,
     vertcoin,
     viacoin,
-    // zcash,
+    zcash,
   },
 };
-export default dataset;
+
+testBridge(dataset);

package/src/families/bitcoin/descriptor.ts

@@ -23,6 +23,7 @@ const perDerivation: Partial<
   "": (fragment) => `pkh(${fragment})`,
   segwit: (fragment) => `sh(wpkh(${fragment}))`,
   native_segwit: (fragment) => `wpkh(${fragment})`,
+  taproot: (fragment) => `tr(${fragment})`,
 };
 
 function makeFingerprint(compressedPubKey) {

package/src/families/bitcoin/satstack.test.ts

@@ -71,9 +71,10 @@ describe("isValidHost", () => {
     expect(isValidHost("")).toBe(false);
     expect(isValidHost("a b")).toBe(false);
     expect(isValidHost("ledger .com")).toBe(false);
-    expect(isValidHost("ledger.com/foo")).toBe(false);
   });
   test("valid", () => {
+    expect(isValidHost("52.207.220.222/node/btc/")).toBe(true);
+    expect(isValidHost("ledger.com/foo")).toBe(true);
     expect(isValidHost("ledger.com")).toBe(true);
     expect(isValidHost("localhost")).toBe(true);
     expect(isValidHost("0.0.0.0")).toBe(true);
@@ -82,6 +83,8 @@ describe("isValidHost", () => {
     expect(isValidHost("192.168.0.1:8888")).toBe(true);
     expect(isValidHost("locahost:8888")).toBe(true);
     expect(isValidHost("ledger:8888")).toBe(true);
+    expect(isValidHost("ledger1:8888")).toBe(true);
+    expect(isValidHost("ledger-1:8888")).toBe(true);
   });
 });
 const mockConfig = {

package/src/families/bitcoin/satstack.ts

@@ -1,7 +1,6 @@
 import { log } from "@ledgerhq/logs";
 import { Observable, interval, from } from "rxjs";
 import semver from "semver";
-import url from "url";
 import { share, switchMap, filter } from "rxjs/operators";
 import {
   SatStackVersionTooOld,
@@ -37,12 +36,17 @@ export type RPCNodeConfig = {
   password: string;
   tls?: boolean;
 };
+
 export function isValidHost(host: string): boolean {
-  const splits = host.split(":");
-  if (splits.length > 2) return false;
-  // domainToASCII returns "" when a domain is invalid
-  return Boolean(url.domainToASCII(splits[0]));
+  const pattern = new RegExp(
+    "^" + // beginning of url
+      "(((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,})|^[a-z\\d-]{2,}|" + // domain name
+      "((\\d{1,3}\\.){3}\\d{1,3}))" + // OR ip (v4) address
+      "(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*$"
+  ); // port and path
+  return !!pattern.test(host);
 }
+
 // we would call this only during the user validation of the rpc node configuration
 export function validateRPCNodeConfig(config: RPCNodeConfig): Array<{
   field: string;

package/src/families/bitcoin/specs.ts

@@ -289,7 +289,6 @@ const bitcoinTestnet: AppSpec<Transaction> = {
   appQuery: {
     model: DeviceModelId.nanoS,
     appName: "Bitcoin Test",
-    appVersion: "2.0.0-beta",
   },
   test: genericTest,
   mutations: bitcoinLikeMutations({

package/src/families/cardano/{test-dataset.ts → bridge.integration.test.ts}

@@ -1,3 +1,5 @@
+import "../../__tests__/test-helpers/setup";
+import { testBridge } from "../../__tests__/test-helpers/bridge";
 import BigNumber from "bignumber.js";
 import type { DatasetTest } from "../../types";
 import { cardanoRawAccount1 } from "./datasets/rawAccount.1";
@@ -38,4 +40,4 @@ const dataset: DatasetTest<Transaction> = {
   },
 };
 
-export default dataset;
+testBridge(dataset);

package/src/families/celo/bridge.integration.test.ts

@@ -0,0 +1,14 @@
+import "../../__tests__/test-helpers/setup";
+import { testBridge } from "../../__tests__/test-helpers/bridge";
+import type { DatasetTest } from "../../types";
+import celo from "./datasets/celo.scanAccounts.1";
+import type { Transaction } from "./types";
+
+const dataset: DatasetTest<Transaction> = {
+  implementations: ["js"],
+  currencies: {
+    celo,
+  },
+};
+
+testBridge(dataset);

package/src/families/cosmos/{test-dataset.ts → bridge.integration.test.ts}

@@ -1,3 +1,5 @@
+import "../../__tests__/test-helpers/setup";
+import { testBridge } from "../../__tests__/test-helpers/bridge";
 import { BigNumber } from "bignumber.js";
 import type { CurrenciesData, DatasetTest } from "../../types";
 import {
@@ -11,7 +13,6 @@ import invariant from "invariant";
 import type { Transaction } from "./types";
 import transactionTransformer from "./transaction";
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const cosmos: CurrenciesData<Transaction> = {
   FIXME_ignoreAccountFields: [
     "cosmosResources.unbondingBalance", // They move once all unbonding are done
@@ -25,19 +26,19 @@ const cosmos: CurrenciesData<Transaction> = {
     {
       name: "cosmos seed 1",
       apdus: `
-          => 550400001b06636f736d6f732c00008076000080000000800000000000000000
-          <= 0388459b2653519948b12492f1a0b464720110c147a8155d23d423a5cc3c21d89a636f736d6f73316738343933346a70753376356465357971756b6b6b68786d63767377337532616a787670646c9000
-          => 550400001b06636f736d6f732c00008076000080000000800000000000000000
-          <= 0388459b2653519948b12492f1a0b464720110c147a8155d23d423a5cc3c21d89a636f736d6f73316738343933346a70753376356465357971756b6b6b68786d63767377337532616a787670646c9000
-          => 550400001b06636f736d6f732c00008076000080010000800000000000000000
-          <= 02624ac83690d5ef627927104767d679aef73d3d3c9544abe4206b1d0c463c94ff636f736d6f7331303875793571396a743539677775677135797264686b7a6364396a7279736c6d706373746b359000
-          => 550400001b06636f736d6f732c00008076000080020000800000000000000000
-          <= 038ff98278402aa3e46ccfd020561dc9724ab63d7179ca507c8154b5257c7d5200636f736d6f733163676336393661793270673664346763656a656b3279386c6136366a376535793363376b79779000
-          => 550400001b06636f736d6f732c00008076000080030000800000000000000000
-          <= 02ecca2a8c647b50bcea2cb4667bb8b2c5f5b2b8439d51c842bc9fd20c4185a95c636f736d6f73313474673476736430713734356678687a6e333239706b78306b727174737a6378797a6c356b759000
-          => 550400001b06636f736d6f732c00008076000080040000800000000000000000
-          <= 03f9f9ddeefd1b762648af6b3ba3e14b0054d7137cf5ed67f501f01524a773c8d0636f736d6f733138713661643239346477357766376e7565713763746c656568786839666774386463656372399000
-      `,
+            => 550400001b06636f736d6f732c00008076000080000000800000000000000000
+            <= 0388459b2653519948b12492f1a0b464720110c147a8155d23d423a5cc3c21d89a636f736d6f73316738343933346a70753376356465357971756b6b6b68786d63767377337532616a787670646c9000
+            => 550400001b06636f736d6f732c00008076000080000000800000000000000000
+            <= 0388459b2653519948b12492f1a0b464720110c147a8155d23d423a5cc3c21d89a636f736d6f73316738343933346a70753376356465357971756b6b6b68786d63767377337532616a787670646c9000
+            => 550400001b06636f736d6f732c00008076000080010000800000000000000000
+            <= 02624ac83690d5ef627927104767d679aef73d3d3c9544abe4206b1d0c463c94ff636f736d6f7331303875793571396a743539677775677135797264686b7a6364396a7279736c6d706373746b359000
+            => 550400001b06636f736d6f732c00008076000080020000800000000000000000
+            <= 038ff98278402aa3e46ccfd020561dc9724ab63d7179ca507c8154b5257c7d5200636f736d6f733163676336393661793270673664346763656a656b3279386c6136366a376535793363376b79779000
+            => 550400001b06636f736d6f732c00008076000080030000800000000000000000
+            <= 02ecca2a8c647b50bcea2cb4667bb8b2c5f5b2b8439d51c842bc9fd20c4185a95c636f736d6f73313474673476736430713734356678687a6e333239706b78306b727174737a6378797a6c356b759000
+            => 550400001b06636f736d6f732c00008076000080040000800000000000000000
+            <= 03f9f9ddeefd1b762648af6b3ba3e14b0054d7137cf5ed67f501f01524a773c8d0636f736d6f733138713661643239346477357766376e7565713763746c656568786839666774386463656372399000
+        `,
     },
   ],
   accounts: [
@@ -462,4 +463,5 @@ const dataset: DatasetTest<Transaction> = {
     cosmos,
   },
 };
-export default dataset;
+
+testBridge(dataset);

package/src/families/cosmos/speculos-deviceActions.ts

@@ -81,12 +81,12 @@ const acceptTransaction: DeviceAction<Transaction, any> = deviceActionFlow({
       expectedValue: ({ account }) => account.freshAddress,
     },
     {
-      title: "Approve",
+      title: "APPROVE",
       button: "LRlr",
       final: true,
     },
     {
-      title: "Reject",
+      title: "REJECT",
     },
   ],
 });