@ledgerhq/live-common 34.33.2-hotfix.0 → 34.34.0-nightly.0

package/src/domain/getTokensWithFunds.test.ts

@@ -0,0 +1,94 @@
+import { genAccount } from "@ledgerhq/coin-framework/lib/mocks/account";
+import { getCryptoCurrencyById } from "@ledgerhq/live-common/currencies/index";
+import { Account } from "@ledgerhq/types-live";
+import BigNumber from "bignumber.js";
+import { getTokensWithFunds } from "./getTokensWithFunds";
+
+const ETH = getCryptoCurrencyById("ethereum");
+
+const mockedAccounts: Account[] = [
+  genAccount("mocked-account-2", {
+    currency: ETH,
+  }),
+];
+
+describe("getTokensWithFunds", () => {
+  it("should return empty array if no accounts", () => {
+    const result = getTokensWithFunds([]);
+    expect(result).toEqual([]);
+  });
+
+  it("should return array with accounts with funds", () => {
+    const account = mockedAccounts[0];
+    const result = getTokensWithFunds(mockedAccounts);
+
+    expect(account.balance).toBeTruthy();
+    expect(account.balance instanceof BigNumber).toBe(true);
+    expect(account.balance.gt(0)).toBe(true);
+
+    expect(account.subAccounts).toBeDefined();
+    expect(account.subAccounts?.length).toBe(2);
+
+    const [zrxAccount, repAccount] = account.subAccounts || [];
+
+    expect(zrxAccount.balance).toBeTruthy();
+    expect(zrxAccount.balance instanceof BigNumber).toBe(true);
+    expect(zrxAccount.balance.gt(0)).toBe(true);
+
+    expect(repAccount.balance).toBeTruthy();
+    expect(repAccount.balance instanceof BigNumber).toBe(true);
+    expect(repAccount.balance.gt(0)).toBe(true);
+
+    expect(result).toEqual(["ETH on Ethereum", "ZRX on Ethereum", "REP on Ethereum"]);
+  });
+
+  it("should return array with accounts with funds", () => {
+    const account = mockedAccounts[0];
+
+    expect(account.balance).toBeTruthy();
+    expect(account.balance instanceof BigNumber).toBe(true);
+    expect(account.balance.gt(0)).toBe(true);
+
+    expect(account.subAccounts).toBeDefined();
+    expect(account.subAccounts?.length).toBe(2);
+
+    const [zrxAccount, repAccount] = account.subAccounts || [];
+
+    const emptyRepAccount = { ...repAccount, balance: new BigNumber(0) };
+
+    expect(zrxAccount.balance).toBeTruthy();
+    expect(zrxAccount.balance instanceof BigNumber).toBe(true);
+    expect(zrxAccount.balance.gt(0)).toBe(true);
+
+    expect(emptyRepAccount.balance).toBeTruthy();
+    expect(emptyRepAccount.balance instanceof BigNumber).toBe(true);
+    expect(emptyRepAccount.balance.gt(0)).toBe(false);
+
+    const accounts = { ...account, subAccounts: [zrxAccount, emptyRepAccount] };
+
+    const result = getTokensWithFunds([accounts]);
+
+    expect(result).toEqual(["ETH on Ethereum", "ZRX on Ethereum"]);
+  });
+
+  it("should return array with accounts with funds without duplication", () => {
+    const account = mockedAccounts[0];
+
+    expect(account.balance).toBeTruthy();
+    expect(account.balance instanceof BigNumber).toBe(true);
+    expect(account.balance.gt(0)).toBe(true);
+
+    expect(account.subAccounts).toBeDefined();
+    expect(account.subAccounts?.length).toBe(2);
+
+    const [zrxAccount, repAccount] = account.subAccounts || [];
+
+    const accounts = { ...account, subAccounts: [zrxAccount, repAccount, repAccount] };
+
+    expect(accounts.subAccounts.length).toBe(3);
+
+    const result = getTokensWithFunds([accounts]);
+
+    expect(result).toEqual(["ETH on Ethereum", "ZRX on Ethereum", "REP on Ethereum"]);
+  });
+});

package/src/domain/getTokensWithFunds.ts

@@ -0,0 +1,36 @@
+import { getParentAccount } from "@ledgerhq/coin-framework/account/helpers";
+import { Account } from "@ledgerhq/types-live";
+
+export const getTokensWithFunds = (accounts: Account[]): string[] => {
+  if (!accounts?.length) return [];
+
+  const tokensMap = new Map<string, { ticker: string; networkName: string }>();
+
+  for (const account of accounts) {
+    const { balance, currency } = account || {};
+    if (!balance?.gt(0) || !currency) continue;
+
+    const parentAccount = getParentAccount(account, accounts);
+    const networkName = parentAccount?.currency?.name;
+    if (!networkName) continue;
+
+    const mainKey = `${currency.ticker}:${networkName}`;
+    tokensMap.set(mainKey, {
+      ticker: currency.ticker,
+      networkName,
+    });
+
+    account.subAccounts?.forEach(subAccount => {
+      const { balance, token } = subAccount || {};
+      if (!balance?.gt(0) || !token) return;
+
+      const subKey = `${token.ticker}:${networkName}`;
+      tokensMap.set(subKey, {
+        ticker: token.ticker,
+        networkName,
+      });
+    });
+  }
+
+  return Array.from(tokensMap.values(), ({ ticker, networkName }) => `${ticker} on ${networkName}`);
+};

package/src/exchange/swap/getIncompatibleCurrencyKeys.ts

@@ -20,6 +20,10 @@ const INCOMPATIBLE_NANO_S_TOKENS_KEYS: Keys = {
     title: "swap.incompatibility.spl_tokens_title",
     description: "swap.incompatibility.spl_tokens_description",
   },
+  ton: {
+    title: "swap.incompatibility.ton_tokens_title",
+    description: "swap.incompatibility.ton_tokens_description",
+  },
 };
 
 const INCOMPATIBLE_NANO_S_CURRENCY_KEYS: Keys = {

package/src/families/aptos/__snapshots__/bridge.integration.test.ts.snap

@@ -3,34 +3,36 @@
 exports[`aptos currency bridge scanAccounts aptos seed 1 1`] = `
 [
   {
-    "balance": "30100",
+    "balance": "19949100",
     "currencyId": "aptos",
     "derivationMode": "aptos",
     "freshAddress": "0x445fa0013887abd1a0c14acdec6e48090e0ad3fed3e08202aac15ca14f3be26b",
     "freshAddressPath": "44'/637'/0'/0'/0'",
     "id": "js:2:aptos:d1a8c6a1cdd52dd40c7ea61ee4571fb51fcae440a594c1eca18636928f1d3956:aptos",
     "index": 0,
-    "operationsCount": 5,
+    "operationsCount": 7,
     "pendingOperations": [],
     "seedIdentifier": "d6816f4f22f867b56cf9304b776f452a16d107835d73ee8a33c4ced210300583",
-    "spendableBalance": "30100",
+    "spendableBalance": "19949100",
+    "subAccounts": [],
     "swapHistory": [],
     "syncHash": undefined,
     "used": true,
     "xpub": "d1a8c6a1cdd52dd40c7ea61ee4571fb51fcae440a594c1eca18636928f1d3956",
   },
   {
-    "balance": "20000",
+    "balance": "20020000",
     "currencyId": "aptos",
     "derivationMode": "aptos",
     "freshAddress": "0xd20fa44192f94ba086ab16bfdf57e43ff118ada69b4c66fa9b9a9223cbc068c1",
     "freshAddressPath": "44'/637'/1'/0'/0'",
     "id": "js:2:aptos:6a7712fdac0cb4ed27076c707e7798be52cf6c93a2d43d5cf9b874d0a45a111e:aptos",
     "index": 1,
-    "operationsCount": 1,
+    "operationsCount": 2,
     "pendingOperations": [],
     "seedIdentifier": "d6816f4f22f867b56cf9304b776f452a16d107835d73ee8a33c4ced210300583",
-    "spendableBalance": "20000",
+    "spendableBalance": "20020000",
+    "subAccounts": [],
     "swapHistory": [],
     "syncHash": undefined,
     "used": true,
@@ -48,6 +50,7 @@ exports[`aptos currency bridge scanAccounts aptos seed 1 1`] = `
     "pendingOperations": [],
     "seedIdentifier": "d6816f4f22f867b56cf9304b776f452a16d107835d73ee8a33c4ced210300583",
     "spendableBalance": "0",
+    "subAccounts": [],
     "swapHistory": [],
     "syncHash": undefined,
     "used": false,
@@ -122,6 +125,27 @@ exports[`aptos currency bridge scanAccounts aptos seed 1 2`] = `
       "type": "IN",
       "value": "20000",
     },
+    {
+      "accountId": "js:2:aptos:d1a8c6a1cdd52dd40c7ea61ee4571fb51fcae440a594c1eca18636928f1d3956:aptos",
+      "blockHash": "0xf9429d651797c3c3254773407bccf9c0e4c5009104d360b97e08286429b7c79a",
+      "blockHeight": 302070324,
+      "extra": {
+        "version": "2463183347",
+      },
+      "fee": "30100",
+      "hasFailed": true,
+      "hash": "0x93b7213cb4facc242726d80cf7a14ec1c9c10daa7d2dccc4ad47958c2f88ee0e",
+      "id": "js:2:aptos:d1a8c6a1cdd52dd40c7ea61ee4571fb51fcae440a594c1eca18636928f1d3956:aptos-0x93b7213cb4facc242726d80cf7a14ec1c9c10daa7d2dccc4ad47958c2f88ee0e-OUT",
+      "recipients": [
+        "0xd20fa44192f94ba086ab16bfdf57e43ff118ada69b4c66fa9b9a9223cbc068c1",
+      ],
+      "senders": [
+        "0x445fa0013887abd1a0c14acdec6e48090e0ad3fed3e08202aac15ca14f3be26b",
+      ],
+      "transactionSequenceNumber": 1,
+      "type": "OUT",
+      "value": "30100",
+    },
     {
       "accountId": "js:2:aptos:d1a8c6a1cdd52dd40c7ea61ee4571fb51fcae440a594c1eca18636928f1d3956:aptos",
       "blockHash": "0x1bbe17059abba7dc500aca2eb174c217e71f3dcd7486cd4b27dc6136cce8a60a",
@@ -143,6 +167,27 @@ exports[`aptos currency bridge scanAccounts aptos seed 1 2`] = `
       "type": "IN",
       "value": "10000",
     },
+    {
+      "accountId": "js:2:aptos:d1a8c6a1cdd52dd40c7ea61ee4571fb51fcae440a594c1eca18636928f1d3956:aptos",
+      "blockHash": "0xd9ffa9abc5a6aae3f342e353a55ab115d50d582a400e909f37cd48063487de5f",
+      "blockHeight": 302074007,
+      "extra": {
+        "version": "2463213242",
+      },
+      "fee": "1100",
+      "hasFailed": false,
+      "hash": "0xf8c8a486c8e0c0c530f92ea5b26220829e8f8e24f8b0d9f35b57dbd804d36daf",
+      "id": "js:2:aptos:d1a8c6a1cdd52dd40c7ea61ee4571fb51fcae440a594c1eca18636928f1d3956:aptos-0xf8c8a486c8e0c0c530f92ea5b26220829e8f8e24f8b0d9f35b57dbd804d36daf-IN",
+      "recipients": [
+        "0x445fa0013887abd1a0c14acdec6e48090e0ad3fed3e08202aac15ca14f3be26b",
+      ],
+      "senders": [
+        "0xa0d8abc262e3321f87d745bd5d687e8f3fb14c87d48f840b6b56867df0026ec8",
+      ],
+      "transactionSequenceNumber": 86,
+      "type": "IN",
+      "value": "20000000",
+    },
     {
       "accountId": "js:2:aptos:d1a8c6a1cdd52dd40c7ea61ee4571fb51fcae440a594c1eca18636928f1d3956:aptos",
       "blockHash": "0xf37ce698cf2e6d9e4a0048cd6d09fb3f19f417ab8251a3cc1f19b8d0e503538f",
@@ -166,6 +211,27 @@ exports[`aptos currency bridge scanAccounts aptos seed 1 2`] = `
     },
   ],
   [
+    {
+      "accountId": "js:2:aptos:6a7712fdac0cb4ed27076c707e7798be52cf6c93a2d43d5cf9b874d0a45a111e:aptos",
+      "blockHash": "0x27db591a136924b48d10e6e152a3e856a5c38b332654767da252851adbb454b2",
+      "blockHeight": 302074528,
+      "extra": {
+        "version": "2463216946",
+      },
+      "fee": "1100",
+      "hasFailed": false,
+      "hash": "0x40d445cdfc3ab007a9a7c809a5f12d9488c6137ba691a3ab5ade1ff619cab61f",
+      "id": "js:2:aptos:6a7712fdac0cb4ed27076c707e7798be52cf6c93a2d43d5cf9b874d0a45a111e:aptos-0x40d445cdfc3ab007a9a7c809a5f12d9488c6137ba691a3ab5ade1ff619cab61f-IN",
+      "recipients": [
+        "0xd20fa44192f94ba086ab16bfdf57e43ff118ada69b4c66fa9b9a9223cbc068c1",
+      ],
+      "senders": [
+        "0xa0d8abc262e3321f87d745bd5d687e8f3fb14c87d48f840b6b56867df0026ec8",
+      ],
+      "transactionSequenceNumber": 87,
+      "type": "IN",
+      "value": "20000000",
+    },
     {
       "accountId": "js:2:aptos:6a7712fdac0cb4ed27076c707e7798be52cf6c93a2d43d5cf9b874d0a45a111e:aptos",
       "blockHash": "0xf37ce698cf2e6d9e4a0048cd6d09fb3f19f417ab8251a3cc1f19b8d0e503538f",