Merge branch 'LedgerHQ:master' into master

Author: AlexandruPislariu

cli/yarn.lock

@@ -3940,9 +3940,9 @@ [email protected]:
   integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
 
 follow-redirects@^1.10.0, follow-redirects@^1.14.0, follow-redirects@^1.14.4, follow-redirects@^1.14.7:
-  version "1.14.7"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
-  integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
+  version "1.14.8"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
+  integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==
 
 foreach@^2.0.5:
   version "2.0.5"
@@ -6954,9 +6954,9 @@ url-parse-lax@^3.0.0:
     prepend-http "^2.0.0"
 
 url-parse@^1.4.3, url-parse@^1.5.1:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.4.tgz#e4f645a7e2a0852cc8a66b14b292a3e9a11a97fd"
-  integrity sha512-ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg==
+  version "1.5.7"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.7.tgz#00780f60dbdae90181f51ed85fb24109422c932a"
+  integrity sha512-HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA==
   dependencies:
     querystringify "^2.1.1"
     requires-port "^1.0.0"

mobile-test-app/yarn.lock

@@ -3345,9 +3345,9 @@ [email protected]:
   integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
 
 follow-redirects@^1.10.0, follow-redirects@^1.14.0:
-  version "1.14.7"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
-  integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
+  version "1.14.8"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
+  integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==
 
 for-in@^1.0.2:
   version "1.0.2"
@@ -6870,9 +6870,9 @@ urix@^0.1.0:
   integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
 
 url-parse@^1.4.3:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862"
-  integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==
+  version "1.5.7"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.7.tgz#00780f60dbdae90181f51ed85fb24109422c932a"
+  integrity sha512-HxWkieX+STA38EDk7CE9MEryFeHCKzgagxlGvsdS7WBImq9Mk+PGwiT56w82WI3aicwJA8REp42Cxo98c8FZMA==
   dependencies:
     querystringify "^2.1.1"
     requires-port "^1.0.0"

package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/LedgerHQ/ledger-live-common"
   },
-  "version": "21.32.5",
+  "version": "21.33.0",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "license": "Apache-2.0",
@@ -49,13 +49,13 @@
     "@ethereumjs/common": "^2.6.0",
     "@ethereumjs/tx": "^3.4.0",
     "@ledgerhq/compressjs": "1.3.2",
-    "@ledgerhq/cryptoassets": "6.24.1",
+    "@ledgerhq/cryptoassets": "6.25.0",
     "@ledgerhq/devices": "6.24.1",
     "@ledgerhq/errors": "6.10.0",
     "@ledgerhq/hw-app-algorand": "6.24.1",
     "@ledgerhq/hw-app-btc": "6.24.1",
     "@ledgerhq/hw-app-cosmos": "6.24.1",
-    "@ledgerhq/hw-app-eth": "6.24.1",
+    "@ledgerhq/hw-app-eth": "6.25.0",
     "@ledgerhq/hw-app-polkadot": "6.24.1",
     "@ledgerhq/hw-app-solana": "^6.24.1",
     "@ledgerhq/hw-app-str": "6.24.1",

src/__tests__/families/bitcoin/wallet-btc/wallet.integration.test.ts

@@ -34,7 +34,7 @@ describe("testing wallet", () => {
     const balance = await wallet.getAccountBalance(account);
 
     expect(balance.toNumber()).toEqual(109088);
-  }, 60000);
+  });
 
   it("should allow to store and load an account", async () => {
     const serializedAccount = await wallet.exportToSerializedAccount(account);

src/account/support.ts

@@ -20,7 +20,7 @@ import { getMainAccount } from "../account";
 import { getAccountBridge } from "../bridge";
 import jsBridges from "../generated/bridge/js";
 
-const experimentalIntegrations = ["algorand", "tezos"];
+const experimentalIntegrations = ["tezos"];
 
 export function shouldUseJS(currency: CryptoCurrency) {
   const jsBridge = jsBridges[currency.family];

src/apps/support.ts

@@ -29,7 +29,7 @@ export function shouldUpgrade(
 const appVersionsRequired = {
   Cosmos: ">= 2.14",
   Algorand: ">= 1.2.9",
-  Polkadot: ">= 9.9140.0",
+  Polkadot: ">= 10.9160.1",
   Elrond: ">= 1.0.11",
   Ethereum: ">= 1.9.17",
 };

src/errors.ts

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

src/families/crypto_org/js-getTransactionStatus.ts

@@ -5,6 +5,7 @@ import {
   InvalidAddress,
   FeeNotLoaded,
   AmountRequired,
+  InvalidAddressBecauseDestinationIsAlsoSource,
 } from "@ledgerhq/errors";
 import type { Account, TransactionStatus } from "../../types";
 import type { Transaction } from "./types";
@@ -46,6 +47,8 @@ const getTransactionStatus = async (
     errors.recipient = new RecipientRequired();
   } else if (!isValidAddress(t.recipient, a.currency.id)) {
     errors.recipient = new InvalidAddress();
+  } else if (t.mode === "send" && a.freshAddress === t.recipient) {
+    errors.recipient = new InvalidAddressBecauseDestinationIsAlsoSource();
   }
 
   return Promise.resolve({

src/families/tezos/bridge/js.ts

@@ -12,6 +12,7 @@ import {
   FeeTooHigh,
   InvalidAddressBecauseDestinationIsAlsoSource,
   RecommendUndelegation,
+  NotEnoughBalanceBecauseDestinationNotCreated,
 } from "@ledgerhq/errors";
 import { validateRecipient } from "../../../bridge/shared";
 import type {
@@ -35,9 +36,12 @@ import { signOperation } from "../signOperation";
 import { patchOperationWithHash } from "../../../operation";
 import { log } from "@ledgerhq/logs";
 import { InvalidAddressBecauseAlreadyDelegated } from "../../../errors";
+import api from "../api/tzkt";
 
 const receive = makeAccountBridgeReceive();
 
+const EXISTENTIAL_DEPOSIT = new BigNumber(275000);
+
 const createTransaction: () => Transaction = () => ({
   family: "tezos",
   mode: "send",
@@ -71,6 +75,7 @@ const getTransactionStatus = async (
   } = {};
 
   const estimatedFees = t.estimatedFees || new BigNumber(0);
+  let amount = t.amount;
 
   const { tezosResources } = account;
   if (!tezosResources) throw new Error("tezosResources is missing");
@@ -95,14 +100,30 @@ const getTransactionStatus = async (
   }
 
   if (t.mode === "send") {
-    if (!errors.amount && t.amount.eq(0)) {
+    const spendableBalance = account.balance.minus(EXISTENTIAL_DEPOSIT).lt(0)
+      ? account.balance.minus(EXISTENTIAL_DEPOSIT)
+      : account.balance;
+    if (!errors.amount && t.amount.eq(0) && !t.useAllAmount) {
       errors.amount = new AmountRequired();
-    } else if (!errors.amount && t.amount.lt(0)) {
+    } else if (!errors.amount && t.amount.gt(spendableBalance)) {
       errors.amount = new NotEnoughBalance();
+      if (t.useAllAmount) {
+        amount = new BigNumber(0);
+      }
     } else if (t.amount.gt(0) && estimatedFees.times(10).gt(t.amount)) {
       warnings.feeTooHigh = new FeeTooHigh();
     }
 
+    if (
+      !errors.amount &&
+      (await api.getAccountByAddress(t.recipient)).type === "empty" &&
+      t.amount.lt(EXISTENTIAL_DEPOSIT)
+    ) {
+      errors.amount = new NotEnoughBalanceBecauseDestinationNotCreated("", {
+        minimalAmount: "0.275 XTZ",
+      });
+    }
+
     const thresholdWarning = 0.5 * 10 ** account.currency.units[0].magnitude;
 
     if (
@@ -146,8 +167,8 @@ const getTransactionStatus = async (
     errors,
     warnings,
     estimatedFees,
-    amount: t.amount,
-    totalSpent: t.amount.plus(estimatedFees),
+    amount: amount,
+    totalSpent: amount.plus(estimatedFees),
   };
   return Promise.resolve(result);
 };
@@ -222,7 +243,6 @@ const prepareTransaction = async (
       default:
         throw new Error("unsupported mode=" + transaction.mode);
     }
-
     if (t.useAllAmount) {
       const totalFees = out.suggestedFeeMutez + out.burnFeeMutez;
       const maxAmount = account.balance

src/families/tezos/datasets/tezos.scanAccounts.1.ts

@@ -5,18 +5,10 @@ export default {
   apdus: `
     => 800200000d038000002c800006c180000000
     <= 2102ac76ba226118e2d593d09cd7e395546b7540c0e7fb3eb430da59f7982af632969000
-    => 8002000015058000002c800006c1800000008000000080000000
-    <= 2102f7ed85c519f7d39a664935a410d1a41ca302dfa3eee228e92cbe0dc12aba7a189000
     => 8002000015058000002c800006c1800000008000000080000001
     <= 2102b058662fd530e6463d774e3951a40ddd5e430dbeb62673f90caca0cec58735fd9000
-    => 800200000d038000002c800006c180000000
-    <= 2102ac76ba226118e2d593d09cd7e395546b7540c0e7fb3eb430da59f7982af632969000
-    => 8002000011048000002c800006c18000000080000000
-    <= 210294e8344ae6df2d3123fa100b5abd40cee339c67838b1c34c4f243cc582f4d2d89000
     => 8002000011048000002c800006c18000000080000001
     <= 2102670e5e92d06e725b68edda589678fdf0f85a582df06ee634d841cf8042db63839000
-    => 800200000d038000002c800006c180000000
-    <= 2102ac76ba226118e2d593d09cd7e395546b7540c0e7fb3eb430da59f7982af632969000
     => 8002000015058000002c800006c1800000008000000080000000
     <= 2102f7ed85c519f7d39a664935a410d1a41ca302dfa3eee228e92cbe0dc12aba7a189000
     => 8002000015058000002c800006c1800000018000000080000000
@@ -31,8 +23,6 @@ export default {
     <= 21020162dc75ad3c2b6e097d15a1513033c60d8a033f2312ff5a6ead812228d9d6539000
     => 8002000015058000002c800006c1800000068000000080000000
     <= 21021831897c4224296519d496d32fdf9e17fb4af680635c5dbbc46cde84fe11dcc99000
-    => 800200000d038000002c800006c180000000
-    <= 2102ac76ba226118e2d593d09cd7e395546b7540c0e7fb3eb430da59f7982af632969000
     => 8002000011048000002c800006c18000000080000000
     <= 210294e8344ae6df2d3123fa100b5abd40cee339c67838b1c34c4f243cc582f4d2d89000
     => 8002000011048000002c800006c18000000180000000