@ledgerhq/live-common 21.32.1 → 21.32.5

package/src/families/ethereum/transaction.ts

@@ -6,8 +6,8 @@ import type {
   TransactionRaw,
   EthereumGasLimitRequest,
 } from "./types";
-import Common from "ethereumjs-common";
-import { Transaction as EthereumTx } from "ethereumjs-tx";
+import Common from "@ethereumjs/common";
+import { Transaction as EthereumTx } from "@ethereumjs/tx";
 import eip55 from "eip55";
 import {
   InvalidAddress,
@@ -196,23 +196,18 @@ function getEthereumjsTxCommon(currency) {
     `currency ${currency.id} did not set ethereumLikeInfo`
   );
   if (ethereumLikeInfo.chainId === 1) {
-    return new Common(
-      // $FlowFixMe
-      ethereumLikeInfo.baseChain || "mainnet",
-      // $FlowFixMe
-      ethereumLikeInfo.hardfork || "petersburg"
-    );
+    return new Common({
+      chain: ethereumLikeInfo.baseChain || "mainnet",
+      hardfork: ethereumLikeInfo.hardfork || "petersburg",
+    });
   }
   return Common.forCustomChain(
-    // $FlowFixMe
     ethereumLikeInfo.baseChain || "mainnet",
     {
       name: currency.ticker,
       chainId: ethereumLikeInfo.chainId,
-      // $FlowFixMe
       networkId: ethereumLikeInfo.networkId || ethereumLikeInfo.chainId,
     },
-    // $FlowFixMe
     ethereumLikeInfo.hardfork || "petersburg"
   );
 }
@@ -239,8 +234,6 @@ export function buildEthereumTx(
     "only token accounts expected"
   );
   const common = getEthereumjsTxCommon(currency);
-  invariant(common, `common not found for currency ${currency.name}`);
-  // FIXME: make sure it doesn't break
   if (!common) {
     throw new Error(`common not found for currency ${currency.name}`);
   }
@@ -258,18 +251,11 @@ export function buildEthereumTx(
     ethTxObject
   );
   log("ethereum", "buildEthereumTx", ethTxObject);
-  const tx = new EthereumTx(ethTxObject, {
-    common,
-  });
-  // these will be filled by device signature
-  tx.raw[6] = Buffer.from([common.chainId()]); // v
-
-  tx.raw[7] = Buffer.from([]); // r
-
-  tx.raw[8] = Buffer.from([]); // s
-
+  const tx = new EthereumTx(ethTxObject, { common });
   return {
     tx,
+    common,
+    ethTxObject,
     fillTransactionDataResult,
   };
 }
@@ -294,7 +280,7 @@ export function inferEthereumGasLimitRequest(
     }
 
     if (to) {
-      r.to = "0x" + to.toString("hex");
+      r.to = to.toString();
     }
 
     if (data) {

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/bridge/js.ts

@@ -1,6 +1,10 @@
 // @flow
 import { BigNumber } from "bignumber.js";
-import { TezosToolkit, DEFAULT_FEE } from "@taquito/taquito";
+import {
+  TezosToolkit,
+  DEFAULT_FEE,
+  DEFAULT_STORAGE_LIMIT,
+} from "@taquito/taquito";
 import {
   AmountRequired,
   NotEnoughBalance,
@@ -201,6 +205,7 @@ const prepareTransaction = async (
           mutez: true,
           to: transaction.recipient,
           amount: amount.toNumber(),
+          storageLimit: DEFAULT_STORAGE_LIMIT.ORIGINATION, // https://github.com/TezTech/eztz/blob/master/PROTO_003_FEES.md for originating an account
         });
         break;
       case "delegate":

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/families/tron/synchronisation.test.ts

@@ -6,6 +6,8 @@ import { defaultTronResources } from "./utils";
 import bridge from "./bridge/js";
 import { Account } from "../../types";
 
+jest.setTimeout(30000);
+
 const tron = getCryptoCurrencyById("tron");
 const defaultSyncConfig = {
   paginationConfig: {},

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/load/speculos.ts

@@ -412,7 +412,13 @@ function parseAppSearch(query: string):
   };
 }
 
-async function openImplicitSpeculos(query: string) {
+export async function createImplicitSpeculos(query: string): Promise<{
+  device: {
+    transport: SpeculosTransport;
+    id: string;
+  };
+  appCandidate: AppCandidate;
+} | null> {
   const coinapps = getEnv("COINAPPS");
   invariant(coinapps, "COINAPPS folder is missing!");
   const seed = getEnv("SEED");
@@ -438,16 +444,23 @@ async function openImplicitSpeculos(query: string) {
     "speculos",
     "using app " + formatAppCandidate(appCandidate as AppCandidate)
   );
-  const device = appCandidate
-    ? await createSpeculosDevice({
-        ...appCandidate,
-        coinapps,
-        appName,
-        dependency,
-        seed,
-      })
+  return appCandidate
+    ? {
+        device: await createSpeculosDevice({
+          ...appCandidate,
+          coinapps,
+          appName,
+          dependency,
+          seed,
+        }),
+        appCandidate,
+      }
     : null;
-  return device?.transport;
+}
+
+async function openImplicitSpeculos(query: string) {
+  const r = await createImplicitSpeculos(query);
+  return r?.device.transport;
 }
 
 registerTransportModule({

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) => {

package/src/types/manager.ts

@@ -155,9 +155,10 @@ export type Application = {
   compatibleWalletsJSON: string | null | undefined;
 };
 export enum AppType {
-  APP = "app",
-  PLUGIN = "plugin",
-  TOOL = "tool", // Nb not used for now
+  app = "app",
+  plugin = "plugin",
+  tool = "tool",
+  swap = "swap",
 }
 // App is higher level on top of Application and ApplicationVersion
 // with all fields Live needs and in normalized form (but still serializable)