@ledgerhq/live-common 21.24.0 → 21.26.0

package/package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/LedgerHQ/ledger-live-common"
   },
-  "version": "21.24.0",
+  "version": "21.26.0",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "license": "Apache-2.0",
@@ -44,13 +44,13 @@
   "dependencies": {
     "@crypto-com/chain-jslib": "0.0.19",
     "@ledgerhq/compressjs": "1.3.2",
-    "@ledgerhq/cryptoassets": "6.22.0",
+    "@ledgerhq/cryptoassets": "6.22.3",
     "@ledgerhq/devices": "6.20.0",
     "@ledgerhq/errors": "6.10.0",
     "@ledgerhq/hw-app-algorand": "6.20.0",
     "@ledgerhq/hw-app-btc": "6.21.0",
     "@ledgerhq/hw-app-cosmos": "6.20.0",
-    "@ledgerhq/hw-app-eth": "6.22.0",
+    "@ledgerhq/hw-app-eth": "6.22.3",
     "@ledgerhq/hw-app-polkadot": "6.20.0",
     "@ledgerhq/hw-app-solana": "^6.20.0",
     "@ledgerhq/hw-app-str": "6.20.0",
@@ -101,7 +101,7 @@
     "ethereumjs-common": "^1.5.2",
     "ethereumjs-tx": "^2.1.2",
     "ethereumjs-util": "^7.1.3",
-    "expect": "^27.4.2",
+    "expect": "^27.4.6",
     "generic-pool": "^3.8.2",
     "invariant": "^2.2.2",
     "isomorphic-ws": "^4.0.1",
@@ -127,7 +127,7 @@
     "stellar-sdk": "^9.1.0",
     "triple-beam": "^1.3.0",
     "winston": "^3.3.3",
-    "xstate": "^4.26.1",
+    "xstate": "^4.27.0",
     "zcash-bitcore-lib": "^0.13.20-rc3"
   },
   "devDependencies": {
@@ -149,15 +149,15 @@
     "eslint-config-prettier": "^8.3.0",
     "eslint-config-typescript": "^3.0.0",
     "eslint-formatter-pretty": "^3.0.1",
-    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-jsx-a11y": "^6.5.1",
     "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-react": "^7.27.1",
+    "eslint-plugin-react": "^7.28.0",
     "eslint-plugin-react-hooks": "^4.3.0",
     "eslint-plugin-typescript": "^0.14.0",
     "fs": "^0.0.1-security",
     "glob": "^7.2.0",
-    "jest": "^27.4.5",
+    "jest": "^27.4.7",
     "jest-file-snapshot": "^0.5.0",
     "prettier": "2.3.2",
     "react": "17.0.2",

package/src/account/support.ts

@@ -20,31 +20,7 @@ import { getMainAccount } from "../account";
 import { getAccountBridge } from "../bridge";
 import jsBridges from "../generated/bridge/js";
 
-const experimentalIntegrations = [
-  "algorand",
-  "bitcoin",
-  "bsc",
-  "bitcoin_cash",
-  "litecoin",
-  "dash",
-  "qtum",
-  "zcash",
-  "bitcoin_gold",
-  "stratis",
-  "dogecoin",
-  "digibyte",
-  "komodo",
-  "pivx",
-  "zencash",
-  "vertcoin",
-  "peercoin",
-  "viacoin",
-  "stakenet",
-  "stealthcoin",
-  "decred",
-  "bitcoin_testnet",
-  "tezos",
-];
+const experimentalIntegrations = ["algorand", "tezos"];
 export function shouldUseJS(currency: CryptoCurrency) {
   const jsBridge = jsBridges[currency.family];
   if (!jsBridge) return false;

package/src/api/explorerConfig/index.ts

@@ -14,10 +14,6 @@ const initialExplorerConfig: FullConfig = {
   bitcoin_cash: {
     id: "bch",
     stable: {
-      base: "EXPLORER",
-      version: "v2",
-    },
-    experimental: {
       base: "EXPLORER",
       version: "v3",
     },

package/src/errors.ts

@@ -23,6 +23,9 @@ export const LowerThanMinimumRelayFee = createCustomErrorClass(
 export const TransactionRefusedOnDevice = createCustomErrorClass(
   "TransactionRefusedOnDevice"
 );
+export const InvalidAddressBecauseAlreadyDelegated = createCustomErrorClass(
+  "InvalidAddressBecauseAlreadyDelegated"
+);
 export const TronNoFrozenForBandwidth = createCustomErrorClass(
   "TronNoFrozenForBandwidth"
 );

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

@@ -18,7 +18,7 @@ import vertcoin from "./datasets/vertcoin";
 import viacoin from "./datasets/viacoin";
 // import zcash from "./datasets/zcash";
 const dataset: DatasetTest<Transaction> = {
-  implementations: ["js", "libcore", "mock"],
+  implementations: ["js", "mock"],
   currencies: {
     bitcoin,
     // bitcoin_cash,

package/src/families/crypto_org/deviceTransactionConfig.ts

@@ -0,0 +1,52 @@
+import type { AccountLike, Account, TransactionStatus } from "../../types";
+import type { Transaction } from "./types";
+import type { DeviceTransactionField } from "../../transaction";
+
+function getDeviceTransactionConfig({
+  transaction,
+  status: { estimatedFees },
+}: {
+  account: AccountLike;
+  parentAccount?: Account;
+  transaction: Transaction;
+  status: TransactionStatus;
+}): Array<DeviceTransactionField> {
+  const fields: Array<DeviceTransactionField> = [];
+
+  if (transaction.useAllAmount) {
+    fields.push({
+      type: "text",
+      label: "Method",
+      value: "Send all",
+    });
+  } else {
+    fields.push({
+      type: "text",
+      label: "Method",
+      value: "Send",
+    });
+    fields.push({
+      type: "amount",
+      label: "Amount",
+    });
+  }
+
+  if (!estimatedFees.isZero()) {
+    fields.push({
+      type: "fees",
+      label: "Fees",
+    });
+  }
+
+  if (transaction.memo) {
+    fields.push({
+      type: "text",
+      label: "Memo",
+      value: transaction.memo,
+    });
+  }
+
+  return fields;
+}
+
+export default getDeviceTransactionConfig;

package/src/families/ethereum/modules/compound.ts

@@ -160,6 +160,8 @@ const compoundSupply: ModeModule = {
       ];
     }
   },
+
+  getResolutionConfig: () => ({ erc20: true, externalPlugins: true }),
 };
 
 /**

package/src/families/ethereum/modules/erc1155.ts

@@ -122,6 +122,8 @@ const erc1155Transfer: ModeModule = {
   },
 
   prepareTransaction,
+
+  getResolutionConfig: () => ({ nft: true }),
 };
 
 function serializeTransactionData(

package/src/families/ethereum/modules/erc20.ts

@@ -138,6 +138,8 @@ const erc20approve: ModeModule = {
   fillOptimisticOperation(_account, _transaction, operation) {
     operation.type = "FEES";
   },
+
+  getResolutionConfig: () => ({ erc20: true, externalPlugins: true }),
 };
 export const modes: Record<Modes, ModeModule> = {
   "erc20.approve": erc20approve,

package/src/families/ethereum/modules/erc721.ts

@@ -119,6 +119,8 @@ const erc721Transfer: ModeModule = {
   fillOptimisticOperation(a, t, op) {
     op.type = "FEES";
   },
+
+  getResolutionConfig: () => ({ nft: true }),
 };
 
 function serializeTransactionData(

package/src/families/ethereum/modules/index.ts

@@ -20,6 +20,8 @@ import type { Modes as ERC20Modes } from "./erc20";
 import type { Modes as SendModes } from "./send";
 import type { Modes as ERC721Modes } from "./erc721";
 import type { Modes as ERC1155Modes } from "./erc1155";
+import { ResolutionConfig } from "@ledgerhq/hw-app-eth/lib/services/types";
+
 const modules = {
   erc20,
   compound,
@@ -98,6 +100,14 @@ export type ModeModule = {
     account: Account,
     transaction: Transaction
   ) => Promise<Transaction>;
+
+  /**
+   * tells what needs to be resolved in the transaction
+   */
+  getResolutionConfig?: (
+    account: Account,
+    transaction: Transaction
+  ) => ResolutionConfig;
 };
 export const modes: Record<TransactionMode, ModeModule> = {} as Record<
   TransactionMode,

package/src/families/ethereum/signOperation.ts

@@ -7,6 +7,7 @@ import { log } from "@ledgerhq/logs";
 import { FeeNotLoaded } from "@ledgerhq/errors";
 import Eth from "@ledgerhq/hw-app-eth";
 import { byContractAddressAndChainId } from "@ledgerhq/hw-app-eth/erc20";
+import ethLedgerServices from "@ledgerhq/hw-app-eth/lib/services/ledger";
 import type { Transaction } from "./types";
 import type { Operation, Account, SignOperationEvent } from "../../types";
 import { getGasLimit, buildEthereumTx } from "./transaction";
@@ -15,6 +16,7 @@ import { withDevice } from "../../hw/deviceAccess";
 import { modes } from "./modules";
 import { isNFTActive } from "../../nft";
 import { getEnv } from "../../env";
+import { LoadConfig } from "@ledgerhq/hw-app-eth/lib/services/types";
 export const signOperation = ({
   account,
   deviceId,
@@ -61,13 +63,31 @@ export const signOperation = ({
               const value = new BigNumber(
                 "0x" + (tx.value.toString("hex") || "0")
               );
-              const eth = new Eth(transport);
+
+              const txHex = tx.serialize().toString("hex");
+
+              const loadConfig: LoadConfig = {};
               if (isNFTActive(account.currency)) {
-                eth.setLoadConfig({
-                  nftExplorerBaseURL:
-                    getEnv("NFT_ETH_METADATA_SERVICE") + "/v1/ethereum",
-                });
+                loadConfig.nftExplorerBaseURL =
+                  getEnv("NFT_ETH_METADATA_SERVICE") + "/v1/ethereum";
               }
+
+              const m = modes[transaction.mode];
+              invariant(m, "missing module for mode=" + transaction.mode);
+
+              const resolutionConfig = m.getResolutionConfig
+                ? m.getResolutionConfig(account, transaction)
+                : {};
+
+              const resolution = await ethLedgerServices.resolveTransaction(
+                txHex,
+                loadConfig,
+                resolutionConfig
+              );
+
+              const eth = new Eth(transport);
+              eth.setLoadConfig(loadConfig);
+
               // FIXME this part is still required for compound to correctly display info on the device
               const addrs =
                 (fillTransactionDataResult &&
@@ -91,7 +111,8 @@ export const signOperation = ({
               });
               const result = await eth.signTransaction(
                 freshAddressPath,
-                tx.serialize().toString("hex")
+                txHex,
+                resolution
               );
               if (cancelled) return;
               o.next({
@@ -131,8 +152,6 @@ export const signOperation = ({
                 date: new Date(),
                 extra: {},
               };
-              const m = modes[transaction.mode];
-              invariant(m, "missing module for mode=" + transaction.mode);
               m.fillOptimisticOperation(account, transaction, operation);
               o.next({
                 type: "signed",

package/src/families/polkadot/address.ts

@@ -1,4 +1,5 @@
-import { decodeAddress } from "@polkadot/util-crypto";
+import { encodeAddress, decodeAddress } from "@polkadot/util-crypto";
+import { hexToU8a, isHex } from "@polkadot/util";
 
 const POLKADOT_SS58_PREFIX = 0;
 
@@ -7,6 +8,7 @@ const POLKADOT_SS58_PREFIX = 0;
  *
  * @param {*} address
  */
+// TODO Cache this to improve perf
 export const isValidAddress = (
   address: string,
   ss58Format: number = POLKADOT_SS58_PREFIX
@@ -14,7 +16,11 @@ export const isValidAddress = (
   if (!address) return false;
 
   try {
-    decodeAddress(address, false, ss58Format);
+    encodeAddress(
+      isHex(address)
+        ? hexToU8a(address)
+        : decodeAddress(address, false, ss58Format)
+    );
     return true;
   } catch (err) {
     return false;

package/src/families/polkadot/js-getTransactionStatus.ts

@@ -58,7 +58,9 @@ const getSendTransactionStatus = async (
   } else if (a.freshAddress === t.recipient) {
     errors.recipient = new InvalidAddressBecauseDestinationIsAlsoSource();
   } else if (!isValidAddress(t.recipient)) {
-    errors.recipient = new InvalidAddress("");
+    errors.recipient = new InvalidAddress("", {
+      currencyName: a.currency.name,
+    });
   }
 
   const estimatedFees = t.fees || new BigNumber(0);
@@ -181,7 +183,9 @@ const getTransactionStatus = async (a: Account, t: Transaction) => {
         if (!t.recipient) {
           errors.recipient = new RecipientRequired("");
         } else if (!isValidAddress(t.recipient)) {
-          errors.recipient = new InvalidAddress("");
+          errors.recipient = new InvalidAddress("", {
+            currencyName: a.currency.name,
+          });
         } else if (await isControllerAddress(t.recipient)) {
           errors.recipient = new PolkadotUnauthorizedOperation(
             "Recipient is already a controller"

package/src/families/tezos/bridge/js.ts

@@ -30,6 +30,7 @@ import { getEnv } from "../../../env";
 import { signOperation } from "../signOperation";
 import { patchOperationWithHash } from "../../../operation";
 import { log } from "@ledgerhq/logs";
+import { InvalidAddressBecauseAlreadyDelegated } from "../../../errors";
 
 const receive = makeAccountBridgeReceive();
 
@@ -70,54 +71,52 @@ const getTransactionStatus = async (
   const { tezosResources } = account;
   if (!tezosResources) throw new Error("tezosResources is missing");
 
-  if (!t.taquitoError) {
-    if (t.mode !== "undelegate") {
-      if (account.freshAddress === t.recipient) {
-        errors.recipient = new InvalidAddressBecauseDestinationIsAlsoSource();
-      } else {
-        const { recipientError, recipientWarning } = await validateRecipient(
-          account.currency,
-          t.recipient
-        );
+  if (t.mode !== "undelegate") {
+    if (account.freshAddress === t.recipient) {
+      errors.recipient = new InvalidAddressBecauseDestinationIsAlsoSource();
+    } else {
+      const { recipientError, recipientWarning } = await validateRecipient(
+        account.currency,
+        t.recipient
+      );
 
-        if (recipientError) {
-          errors.recipient = recipientError;
-        }
+      if (recipientError) {
+        errors.recipient = recipientError;
+      }
 
-        if (recipientWarning) {
-          warnings.recipient = recipientWarning;
-        }
+      if (recipientWarning) {
+        warnings.recipient = recipientWarning;
       }
     }
+  }
 
-    if (t.mode === "send") {
-      if (!errors.amount && t.amount.eq(0)) {
-        errors.amount = new AmountRequired();
-      } else if (!errors.amount && t.amount.lt(0)) {
-        errors.amount = new NotEnoughBalance();
-      } else if (t.amount.gt(0) && estimatedFees.times(10).gt(t.amount)) {
-        warnings.feeTooHigh = new FeeTooHigh();
-      }
+  if (t.mode === "send") {
+    if (!errors.amount && t.amount.eq(0)) {
+      errors.amount = new AmountRequired();
+    } else if (!errors.amount && t.amount.lt(0)) {
+      errors.amount = new NotEnoughBalance();
+    } else if (t.amount.gt(0) && estimatedFees.times(10).gt(t.amount)) {
+      warnings.feeTooHigh = new FeeTooHigh();
+    }
 
-      const thresholdWarning = 0.5 * 10 ** account.currency.units[0].magnitude;
-
-      if (
-        !errors.amount &&
-        account.balance
-          .minus(t.amount)
-          .minus(estimatedFees)
-          .lt(thresholdWarning)
-      ) {
-        if (isAccountDelegating(account)) {
-          if (t.useAllAmount) {
-            errors.amount = new RecommendUndelegation();
-          } else {
-            warnings.amount = new RecommendUndelegation();
-          }
+    const thresholdWarning = 0.5 * 10 ** account.currency.units[0].magnitude;
+
+    if (
+      !errors.amount &&
+      account.balance.minus(t.amount).minus(estimatedFees).lt(thresholdWarning)
+    ) {
+      if (isAccountDelegating(account)) {
+        if (t.useAllAmount) {
+          errors.amount = new RecommendUndelegation();
+        } else {
+          warnings.amount = new RecommendUndelegation();
         }
       }
     }
-  } else {
+  }
+
+  // if we also have taquitoError, we interprete them and they override the previously inferred errors
+  if (t.taquitoError) {
     log("taquitoerror", String(t.taquitoError));
 
     // remap taquito errors
@@ -127,7 +126,9 @@ const getTransactionStatus = async (
       } else {
         errors.amount = new NotEnoughBalanceToDelegate();
       }
-    } else {
+    } else if (t.taquitoError.endsWith("delegate.unchanged")) {
+      errors.recipient = new InvalidAddressBecauseAlreadyDelegated();
+    } else if (!errors.amount) {
       // unidentified error case
       errors.amount = new Error(t.taquitoError);
     }

package/src/families/tezos/hw-getAddress.ts

@@ -3,9 +3,7 @@ import type { Resolver } from "../../hw/getAddress/types";
 
 const resolver: Resolver = async (transport, { path, verify }) => {
   const xtz = new Xtz(transport);
-  const r = await xtz.getAddress(path, {
-    verify,
-  });
+  const r = await xtz.getAddress(path, { verify });
   return { ...r, path };
 };
 

package/src/families/tezos/synchronisation.ts

@@ -48,9 +48,10 @@ export const getAccountShape: GetAccountShape = async (infoInput) => {
     derivationMode,
   });
 
-  const initialStableOperations = initialAccount
-    ? initialAccount.operations
-    : [];
+  const initialStableOperations =
+    initialAccount && initialAccount.id === accountId
+      ? initialAccount.operations
+      : [];
 
   // fetch transactions, incrementally if possible
   const mostRecentStableOperation = initialStableOperations[0];

package/src/generated/deviceTransactionConfig.ts

@@ -4,6 +4,8 @@ import bitcoin from "../families/bitcoin/deviceTransactionConfig";
 
 import cosmos from "../families/cosmos/deviceTransactionConfig";
 
+import crypto_org from "../families/crypto_org/deviceTransactionConfig";
+
 import elrond from "../families/elrond/deviceTransactionConfig";
 
 import ethereum from "../families/ethereum/deviceTransactionConfig";
@@ -25,6 +27,7 @@ export default {
   algorand,
   bitcoin,
   cosmos,
+  crypto_org,
   elrond,
   ethereum,
   polkadot,

package/src/hw/actions/transaction.ts

@@ -17,7 +17,7 @@ import { getMainAccount } from "../../account";
 import { getAccountBridge } from "../../bridge";
 import type { ConnectAppEvent, Input as ConnectAppInput } from "../connectApp";
 import type { Action, Device } from "./types";
-import type { AppState } from "./app";
+import type { AppRequest, AppState } from "./app";
 import { createAction as createAppAction } from "./app";
 type State = {
   signedOperation: SignedOperation | null | undefined;
@@ -33,6 +33,8 @@ type TransactionRequest = {
   transaction: Transaction;
   status: TransactionStatus;
   appName?: string;
+  dependencies?: AppRequest[];
+  requireLatestFirmware?: boolean;
 };
 type TransactionResult =
   | {
@@ -112,7 +114,8 @@ export const createAction = (
     reduxDevice: Device | null | undefined,
     txRequest: TransactionRequest
   ): TransactionState => {
-    const { transaction, appName } = txRequest;
+    const { transaction, appName, dependencies, requireLatestFirmware } =
+      txRequest;
     const mainAccount = getMainAccount(
       txRequest.account,
       txRequest.parentAccount
@@ -120,6 +123,8 @@ export const createAction = (
     const appState = createAppAction(connectAppExec).useHook(reduxDevice, {
       account: mainAccount,
       appName,
+      dependencies,
+      requireLatestFirmware,
     });
     const { device, opened, inWrongDeviceForAccount, error } = appState;
     const [state, setState] = useState(initialState);