@ledgerhq/live-common 21.32.3 → 21.32.4

package/src/families/bitcoin/wallet-btc/crypto/zec.ts

@@ -1,11 +1,8 @@
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-import { toOutputScript } from "bitcoinjs-lib/src/address";
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
 import zec from "zcash-bitcore-lib";
 import bs58check from "bs58check";
-import coininfo from "coininfo";
+import * as bjs from "bitcoinjs-lib";
 import { InvalidAddress } from "@ledgerhq/errors";
 import { DerivationModes } from "../types";
 import Base from "./base";
@@ -32,19 +29,13 @@ class ZCash extends Base {
     return bs58check.encode(Buffer.from(taddr));
   }
 
-  private static toBitcoinAddr(taddr: string) {
-    // refer to https://runkitcdn.com/gojomo/baddr2taddr/1.0.2
-    const baddr = new Uint8Array(21);
-    baddr.set(bs58check.decode(taddr).slice(2), 1);
-    return bs58check.encode(Buffer.from(baddr));
-  }
-
   // eslint-disable-next-line
   getLegacyAddress(xpub: string, account: number, index: number): string {
-    const pubkey = new zec.HDPublicKey(xpub);
-    const child = pubkey.derive(account).derive(index);
-    const address = new zec.Address(child.publicKey, zec.Networks.livenet);
-    return address.toString();
+    const pk = bjs.crypto.hash160(this.getPubkeyAt(xpub, account, index));
+    const payload = Buffer.allocUnsafe(22);
+    payload.writeUInt16BE(this.network.pubKeyHash, 0);
+    pk.copy(payload, 2);
+    return bs58check.encode(payload);
   }
 
   customGetAddress(
@@ -65,11 +56,20 @@ class ZCash extends Base {
     if (!this.validateAddress(address)) {
       throw new InvalidAddress();
     }
-    // TODO find a better way to calculate the script from zec address instead of converting to bitcoin address
-    return toOutputScript(
-      ZCash.toBitcoinAddr(address),
-      coininfo.bitcoin.main.toBitcoinJS()
+    const version = Number(
+      "0x" + bs58check.decode(address).slice(0, 2).toString("hex")
     );
+    if (version === this.network.pubKeyHash) {
+      //Pay-to-PubkeyHash
+      return bjs.payments.p2pkh({ hash: bs58check.decode(address).slice(2) })
+        .output as Buffer;
+    }
+    if (version === this.network.scriptHash) {
+      //Pay-to-Script-Hash
+      return bjs.payments.p2sh({ hash: bs58check.decode(address).slice(2) })
+        .output as Buffer;
+    }
+    throw new InvalidAddress();
   }
 
   // eslint-disable-next-line class-methods-use-this

package/src/families/bitcoin/wallet-btc/crypto/zen.ts

@@ -1,14 +1,8 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import { toOutputScript } from "bitcoinjs-lib/src/address";
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import zec from "zcash-bitcore-lib";
 import bs58check from "bs58check";
-import coininfo from "coininfo";
 import { InvalidAddress } from "@ledgerhq/errors";
 import { DerivationModes } from "../types";
 import Base from "./base";
+import * as bjs from "bitcoinjs-lib";
 
 class Zen extends Base {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -26,15 +20,15 @@ class Zen extends Base {
       },
       bip44: 121,
       private: 0x80,
-      public: 0x2096,
-      scripthash: 0x2089,
+      public: 0x2089,
+      scripthash: 0x2096,
     };
     this.network.name = "Zencash";
     this.network.unit = "ZEN";
     this.network.messagePrefix = "Zencash Signed Message:\n";
     this.network.wif = 0x80;
-    this.network.pubKeyHash = 0x2096;
-    this.network.scriptHash = 0x2089;
+    this.network.pubKeyHash = 0x2089;
+    this.network.scriptHash = 0x2096;
     this.network.dustThreshold = 10000;
     this.network.dustPolicy = "FIXED";
     this.network.usesTimestampedTransaction = false;
@@ -50,21 +44,13 @@ class Zen extends Base {
     return bs58check.encode(Buffer.from(taddr));
   }
 
-  private static toBitcoinAddr(taddr: string) {
-    // refer to https://runkitcdn.com/gojomo/baddr2taddr/1.0.2
-    const baddr = new Uint8Array(21);
-    baddr.set(bs58check.decode(taddr).slice(2), 1);
-    return bs58check.encode(Buffer.from(baddr));
-  }
-
   // eslint-disable-next-line
   getLegacyAddress(xpub: string, account: number, index: number): string {
-    const pubkey = new zec.HDPublicKey(xpub);
-    const child = pubkey.derive(account).derive(index);
-    const address = new zec.Address(child.publicKey, zec.Networks.livenet);
-    const baddr = new Uint8Array(21);
-    baddr.set(bs58check.decode(address.toString()).slice(2), 1);
-    return this.baddrToTaddr(bs58check.encode(Buffer.from(baddr)));
+    const pk = bjs.crypto.hash160(this.getPubkeyAt(xpub, account, index));
+    const payload = Buffer.allocUnsafe(22);
+    payload.writeUInt16BE(this.network.pubKeyHash, 0);
+    pk.copy(payload, 2);
+    return bs58check.encode(payload);
   }
 
   customGetAddress(
@@ -85,10 +71,23 @@ class Zen extends Base {
     if (!this.validateAddress(address)) {
       throw new InvalidAddress();
     }
-    const outputScript = toOutputScript(
-      Zen.toBitcoinAddr(address),
-      coininfo.bitcoin.main.toBitcoinJS()
+    let outputScript: Buffer;
+    const version = Number(
+      "0x" + bs58check.decode(address).slice(0, 2).toString("hex")
     );
+    if (version === this.network.pubKeyHash) {
+      //Pay-to-PubkeyHash
+      outputScript = bjs.payments.p2pkh({
+        hash: bs58check.decode(address).slice(2),
+      }).output as Buffer;
+    } else if (version === this.network.scriptHash) {
+      //Pay-to-Script-Hash
+      outputScript = bjs.payments.p2sh({
+        hash: bs58check.decode(address).slice(2),
+      }).output as Buffer;
+    } else {
+      throw new InvalidAddress();
+    }
     // refer to https://github.com/LedgerHQ/lib-ledger-core/blob/fc9d762b83fc2b269d072b662065747a64ab2816/core/src/wallet/bitcoin/scripts/BitcoinLikeScript.cpp#L139 and https://github.com/LedgerHQ/lib-ledger-core/blob/fc9d762b83fc2b269d072b662065747a64ab2816/core/src/wallet/bitcoin/networks.cpp#L39 for bip115 Script and its network parameters
     const bip115Script = Buffer.from(
       "209ec9845acb02fab24e1c0368b3b517c1a4488fba97f0e3459ac053ea0100000003c01f02b4",

package/src/families/solana/test-dataset.ts

@@ -1,5 +1,5 @@
 import BigNumber from "bignumber.js";
-import { DatasetTest, encodeAccountId } from "../../types";
+import { CurrenciesData, DatasetTest, encodeAccountId } from "../../types";
 
 import { Transaction, TransactionModel } from "./types";
 
@@ -75,8 +75,7 @@ const fees = (signatureCount: number) =>
 
 const zero = new BigNumber(0);
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const solana = {
+const solana: CurrenciesData<Transaction> = {
   scanAccounts: [scanAccounts1],
   accounts: [
     {
@@ -438,7 +437,7 @@ const solana = {
 const dataset: DatasetTest<Transaction> = {
   implementations: [getEnv("MOCK") ? "mock" : "js"], // FIXME we should actually put both mock and js like other dataset do
   currencies: {
-    // solana, // TODO re enable when it's ready
+    solana,
   },
 };
 

package/src/families/tezos/synchronisation.ts

@@ -74,6 +74,7 @@ export const getAccountShape: GetAccountShape = async (infoInput) => {
   if (apiAccount.type === "empty") {
     return {
       id: accountId,
+      xpub: address,
       blockHeight,
       lastSyncDate: new Date(),
       tezosResources: {
@@ -110,6 +111,7 @@ export const getAccountShape: GetAccountShape = async (infoInput) => {
 
   const accountShape = {
     id: accountId,
+    xpub: address,
     operations,
     balance,
     subAccounts,

package/src/featureFlags/FeatureToggle.tsx

@@ -17,8 +17,8 @@ export const FeatureToggle = ({
   const feature = useFeature(featureId);
 
   if (!feature || !feature.enabled) {
-    return fallback;
+    return fallback ?? null;
   }
 
-  return children;
+  return children ?? null;
 };

package/src/featureFlags/defaultFeatures.ts

@@ -1,7 +1,7 @@
 import { DefaultFeatures } from "./types";
 
 export const defaultFeatures: DefaultFeatures = {
-  market: {
+  learn: {
     enabled: false,
   },
 };

package/src/featureFlags/types.ts

@@ -1,4 +1,4 @@
-export type FeatureId = "market"; // Add others with union
+export type FeatureId = "learn"; // Add others with union (e.g. "learn" | "market" | "foo")
 
 // We use objects instead of direct booleans for potential future improvements
 // like feature versioning etc

package/src/platform/PlatformAppProvider/helpers.ts

@@ -6,6 +6,7 @@ export type FilterParams = {
   private?: boolean;
   version?: string;
 };
+import { getEnv } from "../../env";
 
 function matchVersion(filterParams: FilterParams, manifest: AppManifest) {
   return (
@@ -52,3 +53,31 @@ export function mergeManifestLists(
   const newIds = new Set(list2.map((elem) => elem.id));
   return [...list1.filter((elem) => !newIds.has(elem.id)), ...list2];
 }
+
+export const initializeLocalManifest = (): Map<string, AppManifest> => {
+  const localManifestJsonRaw: string | null | undefined = getEnv(
+    "PLATFORM_LOCAL_MANIFEST_JSON"
+  );
+
+  if (!localManifestJsonRaw) {
+    return new Map();
+  }
+
+  try {
+    const manifest: AppManifest | [AppManifest] =
+      JSON.parse(localManifestJsonRaw);
+
+    const manifestArray = Array.isArray(manifest) ? manifest : [manifest];
+
+    const map = new Map(manifestArray.map((m) => [m.id, m]));
+
+    return map;
+  } catch (error) {
+    /**
+     * Probable error during `JSON.parse` call, log error and return empty map
+     * as if env variable was not defined
+     */
+    console.error(error);
+    return new Map();
+  }
+};

package/src/platform/PlatformAppProvider/index.tsx

@@ -9,11 +9,12 @@ import React, {
 import type { PlatformAppContextType, Props, State } from "./types";
 import api from "./api";
 import type { AppManifest } from "../types";
+import { initializeLocalManifest } from "./helpers";
 
 // @ts-expect-error empty object creates an error
 const PlatformAppContext = createContext<PlatformAppContextType>({});
 const initialState: State = {
-  localManifests: new Map(),
+  localManifests: initializeLocalManifest(),
   remoteManifests: new Map(),
   isLoading: false,
   lastUpdateTime: undefined,
@@ -28,7 +29,7 @@ export function PlatformAppProvider({
   autoUpdateDelay,
   platformAppsServerURL,
   children,
-}: Props) {
+}: Props): JSX.Element {
   const [state, setState] = useState<State>(initialState);
 
   const addLocalManifest = useCallback((manifest: AppManifest) => {