@ledgerhq/live-common 21.22.1 → 21.23.0

package/src/families/algorand/specs.ts

@@ -1,6 +1,6 @@
 import expect from "expect";
 import invariant from "invariant";
-import type { Transaction } from "./types";
+import type { AlgorandTransaction } from "./types";
 import { getCryptoCurrencyById, parseCurrencyUnit } from "../../currencies";
 import { isAccountEmpty } from "../../account";
 import { pickSiblings } from "../../bot/specs";
@@ -12,18 +12,9 @@ import { listTokensForCryptoCurrency } from "../../currencies";
 import { extractTokenId } from "./tokens";
 import { DeviceModelId } from "@ledgerhq/devices";
 const currency = getCryptoCurrencyById("algorand");
-// Minimum fees
-const minFees = parseCurrencyUnit(currency.units[0], "0.001");
 // Minimum balance required for a new non-ASA account
 const minBalanceNewAccount = parseCurrencyUnit(currency.units[0], "0.1");
 
-// Spendable balance for a non-ASA account
-const getSpendableBalance = (maxSpendable) => {
-  maxSpendable = maxSpendable.minus(minFees);
-  invariant(maxSpendable.gt(0), "Spendable balance is too low");
-  return maxSpendable;
-};
-
 // Ensure that, when the recipient corresponds to an empty account,
 // the amount to send is greater or equal to the required minimum
 // balance for such a recipient
@@ -74,7 +65,7 @@ const getRandomAssetId = (account) => {
   return sample(diff);
 };
 
-const algorand: AppSpec<Transaction> = {
+const algorand: AppSpec<AlgorandTransaction> = {
   name: "Algorand",
   currency,
   appQuery: {
@@ -86,11 +77,11 @@ const algorand: AppSpec<Transaction> = {
       name: "move ~50%",
       maxRun: 2,
       transaction: ({ account, siblings, bridge, maxSpendable }) => {
-        const spendableBalance = getSpendableBalance(maxSpendable);
+        invariant(maxSpendable.gt(0), "Spendable balance is too low");
         const sibling = pickSiblings(siblings, 4);
         const recipient = sibling.freshAddress;
         const transaction = bridge.createTransaction(account);
-        const amount = spendableBalance
+        const amount = maxSpendable
           .div(1.9 + 0.2 * Math.random())
           .integerValue();
         checkSendableToEmptyAccount(amount, sibling);
@@ -119,10 +110,10 @@ const algorand: AppSpec<Transaction> = {
       name: "send max",
       maxRun: 1,
       transaction: ({ account, siblings, bridge, maxSpendable }) => {
-        const spendableBalance = getSpendableBalance(maxSpendable);
+        invariant(maxSpendable.gt(0), "Spendable balance is too low");
         const sibling = pickSiblings(siblings, 4);
         // Send the full spendable balance
-        const amount = spendableBalance;
+        const amount = maxSpendable;
         checkSendableToEmptyAccount(amount, sibling);
         return {
           transaction: bridge.createTransaction(account),
@@ -147,7 +138,7 @@ const algorand: AppSpec<Transaction> = {
       name: "send ASA ~50%",
       maxRun: 2,
       transaction: ({ account, siblings, bridge, maxSpendable }) => {
-        invariant(maxSpendable.gt(minFees), "Spendable balance is too low");
+        invariant(maxSpendable.gt(0), "Spendable balance is too low");
         const subAccount = sample(getAssetsWithBalance(account));
         invariant(
           subAccount && subAccount.type === "TokenAccount",
@@ -161,7 +152,7 @@ const algorand: AppSpec<Transaction> = {
         const amount = subAccount.balance
           .div(1.9 + 0.2 * Math.random())
           .integerValue();
-        const updates: Array<Partial<Transaction>> = [
+        const updates: Array<Partial<AlgorandTransaction>> = [
           {
             mode,
             subAccountId: subAccount.id,
@@ -196,10 +187,13 @@ const algorand: AppSpec<Transaction> = {
       name: "opt-In ASA available",
       maxRun: 1,
       transaction: ({ account, bridge, maxSpendable }) => {
-        // maxSpendable is expected to be greater than 100,000 micro-Algos (+ 1,000 for fees)
+        // maxSpendable is expected to be greater than 100,000 micro-Algos
         // corresponding to the requirement that the main account will have
         // one more ASA after the opt-in; its minimum balance is updated accordingly
-        invariant(maxSpendable.gt(new BigNumber(101000)), "balance is too low");
+        invariant(
+          maxSpendable.gt(new BigNumber(100000)),
+          "Spendable balance is too low"
+        );
         const transaction = bridge.createTransaction(account);
         const mode = "optIn";
         const assetId = getRandomAssetId(account);
@@ -207,7 +201,7 @@ const algorand: AppSpec<Transaction> = {
           ? account.subAccounts.find((a) => a.id.includes(assetId as string))
           : null;
         invariant(!subAccount, "already opt-in");
-        const updates: Array<Partial<Transaction>> = [
+        const updates: Array<Partial<AlgorandTransaction>> = [
           {
             mode,
           },
@@ -241,10 +235,10 @@ const algorand: AppSpec<Transaction> = {
         invariant(rewards && rewards.gt(0), "No pending rewards");
         // Ensure that the rewards can effectively be claimed
         // (fees have to be paid in order to claim the rewards)
-        invariant(maxSpendable.gt(minFees), "Spendable balance is too low");
+        invariant(maxSpendable.gt(0), "Spendable balance is too low");
         const transaction = bridge.createTransaction(account);
         const mode = "claimReward";
-        const updates: Array<Partial<Transaction>> = [
+        const updates: Array<Partial<AlgorandTransaction>> = [
           {
             mode,
           },

package/src/families/algorand/speculos-deviceActions.ts

@@ -1,5 +1,5 @@
 import type { DeviceAction } from "../../bot/types";
-import type { Transaction } from "./types";
+import type { AlgorandTransaction } from "./types";
 import { formatCurrencyUnit, findTokenById } from "../../currencies";
 import { deviceActionFlow } from "../../bot/specs";
 import { extractTokenId, addPrefixToken } from "./tokens";
@@ -11,88 +11,93 @@ const expectedAmount = ({ account, status }) =>
     disableRounding: true,
   });
 
-const acceptTransaction: DeviceAction<Transaction, any> = deviceActionFlow({
-  steps: [
-    {
-      title: "Txn Type",
-      button: "Rr",
-      expectedValue: ({ transaction }) =>
-        transaction.subAccountId ? "Asset xfer" : "Payment",
-    },
-    {
-      title: "Asset xfer",
-      button: "Rr",
-    },
-    {
-      title: "Payment",
-      button: "Rr",
-    },
-    {
-      title: "Fee",
-      button: "Rr",
-      expectedValue: ({ account, status }) =>
-        formatCurrencyUnit(account.unit, status.estimatedFees, {
-          disableRounding: true,
-        }),
-    },
-    {
-      title: "Asset ID",
-      button: "Rr",
-      expectedValue: ({ transaction }) => {
-        const id = transaction.assetId
-          ? extractTokenId(transaction.assetId)
-          : transaction.subAccountId
-          ? extractTokenId(transaction.subAccountId)
-          : "";
-        const token = findTokenById(addPrefixToken(id));
-        return token ? displayTokenValue(token) : `#${id}`;
+const acceptTransaction: DeviceAction<AlgorandTransaction, any> =
+  deviceActionFlow({
+    steps: [
+      {
+        title: "Txn Type",
+        button: "Rr",
+        expectedValue: ({ transaction }) =>
+          transaction.subAccountId ? "Asset xfer" : "Payment",
       },
-    },
-    {
-      title: "Asset amt",
-      button: "Rr",
-      expectedValue: ({ transaction, status }) =>
-        transaction.mode === "optIn" ? "0" : status.amount.toString(),
-    },
-    {
-      title: "Receiver",
-      button: "Rr",
-      expectedValue: ({ transaction }) => transaction.recipient,
-    },
-    {
-      title: "Asset dst",
-      button: "Rr",
-      expectedValue: ({ transaction }) => transaction.recipient,
-    },
-    {
-      title: "Amount",
-      button: "Rr",
-      expectedValue: ({ account, status, transaction }) =>
-        transaction.mode === "claimReward"
-          ? "0"
-          : expectedAmount({
-              account,
-              status,
-            }),
-    },
-    {
-      title: "Sign",
-      button: "LRlr",
-    },
-    {
-      title: "Review",
-      button: "Rr",
-    },
-    {
-      title: "Genesis ID",
-      button: "Rr",
-    }, // Only on testnet
-    {
-      title: "Genesis hash",
-      button: "Rr",
-    }, // Only on testnet
-  ],
-});
+      {
+        title: "Asset xfer",
+        button: "Rr",
+      },
+      {
+        title: "Payment",
+        button: "Rr",
+      },
+      {
+        title: "Fee",
+        button: "Rr",
+        expectedValue: ({ account, status }) =>
+          formatCurrencyUnit(account.unit, status.estimatedFees, {
+            disableRounding: true,
+          }),
+      },
+      {
+        title: "Asset ID",
+        button: "Rr",
+        expectedValue: ({ transaction }) => {
+          const id = transaction.assetId
+            ? extractTokenId(transaction.assetId)
+            : transaction.subAccountId
+            ? extractTokenId(transaction.subAccountId)
+            : "";
+          const token = findTokenById(addPrefixToken(id));
+          return token ? displayTokenValue(token) : `#${id}`;
+        },
+      },
+      {
+        title: "Asset amt",
+        button: "Rr",
+        expectedValue: ({ transaction, status }) =>
+          transaction.mode === "optIn" ? "0" : status.amount.toString(),
+      },
+      {
+        title: "Sender",
+        button: "Rr",
+      },
+      {
+        title: "Receiver",
+        button: "Rr",
+        expectedValue: ({ transaction }) => transaction.recipient,
+      },
+      {
+        title: "Asset dst",
+        button: "Rr",
+        expectedValue: ({ transaction }) => transaction.recipient,
+      },
+      {
+        title: "Amount",
+        button: "Rr",
+        expectedValue: ({ account, status, transaction }) =>
+          transaction.mode === "claimReward"
+            ? "0"
+            : expectedAmount({
+                account,
+                status,
+              }),
+      },
+      {
+        title: "Sign",
+        button: "LRlr",
+      },
+      {
+        title: "Review",
+        button: "Rr",
+      },
+      {
+        title: "Genesis ID",
+        button: "Rr",
+      }, // Only on testnet
+      {
+        title: "Genesis hash",
+        button: "Rr",
+      }, // Only on testnet
+    ],
+  });
 export default {
   acceptTransaction,
 };

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

@@ -6,19 +6,18 @@ import {
   NotEnoughBalanceBecauseDestinationNotCreated,
 } from "@ledgerhq/errors";
 import { AlgorandASANotOptInInRecipient } from "../../errors";
-import type { Transaction } from "./types";
+import type { AlgorandTransaction } from "./types";
 // const notCreatedAlgorandAddress =
 //   "ZBILW5BPM7AQU54YQZICSGS4J7KJ2XV6OC3DFUQ7BB4DVLYKKUEVWDDBGM";
-const dataset: DatasetTest<Transaction> = {
+const dataset: DatasetTest<AlgorandTransaction> = {
   implementations: ["libcore"],
   // test disabled. FIXME ctx LL-5485
   currencies: {} || {
     algorand: {
       FIXME_ignoreAccountFields: [
-        "algorandResources.rewards", // We cant keep track of this since it's always move
-        "algorandResources.rewardsAccumulated", // same
-        "balance", // I think rewards are included
-        "spendableBalance", // same since the rewards are included here
+        "algorandResources.rewards", // We cant keep track of this since it's always moving
+        "balance", // Rewards are included, same as above
+        "spendableBalance", // Same since the rewards are included here too
       ],
       scanAccounts: [
         {

package/src/families/algorand/tokens.ts

@@ -1,4 +1,5 @@
 export const addPrefixToken = (tokenId: string) => `algorand/asa/${tokenId}`;
+
 export const extractTokenId = (tokenId: string) => {
   return tokenId.split("/")[2];
 };

package/src/families/algorand/transaction.ts

@@ -1,5 +1,5 @@
 import { BigNumber } from "bignumber.js";
-import type { Transaction, TransactionRaw } from "./types";
+import type { AlgorandTransaction, AlgorandTransactionRaw } from "./types";
 import {
   fromTransactionCommonRaw,
   toTransactionCommonRaw,
@@ -8,7 +8,14 @@ import type { Account } from "../../types";
 import { getAccountUnit } from "../../account";
 import { formatCurrencyUnit } from "../../currencies";
 export const formatTransaction = (
-  { mode, subAccountId, amount, recipient, fees, useAllAmount }: Transaction,
+  {
+    mode,
+    subAccountId,
+    amount,
+    recipient,
+    fees,
+    useAllAmount,
+  }: AlgorandTransaction,
   mainAccount: Account
 ): string => {
   const account =
@@ -41,7 +48,9 @@ export const formatTransaction = (
     }`;
 };
 
-const fromTransactionRaw = (tr: TransactionRaw): Transaction => {
+const fromTransactionRaw = (
+  tr: AlgorandTransactionRaw
+): AlgorandTransaction => {
   const common = fromTransactionCommonRaw(tr);
   return {
     ...common,
@@ -53,7 +62,7 @@ const fromTransactionRaw = (tr: TransactionRaw): Transaction => {
   };
 };
 
-const toTransactionRaw = (t: Transaction): TransactionRaw => {
+const toTransactionRaw = (t: AlgorandTransaction): AlgorandTransactionRaw => {
   const common = toTransactionCommonRaw(t);
   return {
     ...common,

package/src/families/algorand/types.ts

@@ -95,34 +95,39 @@ declare class CoreAlgorandOperation {
 }
 
 export type CoreCurrencySpecifics = Record<string, never>;
+
 export type AlgorandResources = {
   rewards: BigNumber;
-  rewardsAccumulated: BigNumber;
+  // Ledger Live only supports a limited list of ASA (defined here https://github.com/LedgerHQ/ledgerjs/blob/master/packages/cryptoassets/data/asa.js)
+  // This is the actual number of ASA opted-in for the Algo account
+  nbAssets: number;
 };
 export type AlgorandResourcesRaw = {
   rewards: string;
-  rewardsAccumulated: string;
+  nbAssets: number;
 };
-export type AlgorandOperationMode = "send" | "optIn" | "claimReward" | "optOut";
+export type AlgorandOperationMode = "send" | "optIn" | "claimReward";
 export type {
   CoreAlgorandOperation,
   CoreAlgorandAccount,
   CoreAlgorandTransaction,
 };
-export type Transaction = TransactionCommon & {
+export type AlgorandTransaction = TransactionCommon & {
   family: "algorand";
   mode: AlgorandOperationMode;
   fees: BigNumber | null | undefined;
   assetId: string | null | undefined;
   memo: string | null | undefined;
 };
-export type TransactionRaw = TransactionCommonRaw & {
+export type AlgorandTransactionRaw = TransactionCommonRaw & {
   family: "algorand";
   mode: AlgorandOperationMode;
   fees: string | null | undefined;
   assetId: string | null | undefined;
   memo: string | null | undefined;
 };
+export type Transaction = AlgorandTransaction;
+export type TransactionRaw = AlgorandTransactionRaw;
 export type AlgorandOperation = Operation & {
   extra: AlgorandExtraTxInfo;
 };

package/src/families/bitcoin/js-prepareTransaction.ts

@@ -18,8 +18,9 @@ const prepareTransaction = async (
   const feePerByte = inferFeePerByte(t, networkInfo);
 
   if (
-    t.networkInfo === networkInfo &&
-    (feePerByte === t.feePerByte || feePerByte.eq(t.feePerByte || 0))
+    (t.networkInfo === networkInfo &&
+      (feePerByte === t.feePerByte || feePerByte.eq(t.feePerByte || 0))) ||
+    t.feesStrategy === "custom"
   ) {
     // nothing changed
     return t;

package/src/families/bitcoin/js-synchronisation.ts

@@ -140,8 +140,9 @@ const mapTxToOperations = (
       if (!accountAddresses.includes(output.address)) {
         // The output doesn't belong to this account
         if (
-          tx.outputs.length === 1 || // The transaction has only 1 output
-          output.output_index < changeOutputIndex // The output isn't the change output
+          accountInputs.length > 0 && // It's a SEND operation
+          (tx.outputs.length === 1 || // The transaction has only 1 output
+            output.output_index < changeOutputIndex) // The output isn't the change output
         ) {
           recipients.push(
             syncReplaceAddress

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

@@ -60,12 +60,11 @@ class BIP32 {
   hmacSHA512(key, data) {
     return createHmac("sha512", key).update(data).digest();
   }
-  hash160(buffer) {
-    const sha256Hash = createHash("sha256").update(buffer).digest();
-    return createHash("rmd160").update(sha256Hash).digest();
+  hashSHA256(buffer) {
+    return createHash("sha256").update(buffer).digest();
   }
   fingerprint() {
-    return this.hash160(this.pk()).slice(0, 4);
+    return this.hashSHA256(this.pk()).slice(0, 4);
   }
 
   toBase58() {

package/src/generated/bridge/js.ts

@@ -1,3 +1,5 @@
+import algorand from "../../families/algorand/bridge/js";
+
 import bitcoin from "../../families/bitcoin/bridge/js";
 
 import crypto_org from "../../families/crypto_org/bridge/js";
@@ -24,6 +26,7 @@ import tron from "../../families/tron/bridge/js";
 
 
 export default {
+  algorand,
   bitcoin,
   crypto_org,
   elrond,

package/src/libcore/buildAccount/index.ts

@@ -228,8 +228,7 @@ export async function buildAccount({
     used: false,
     balance,
     balanceHistory,
-    spendableBalance: balance,
-    // FIXME need libcore concept
+    spendableBalance: balance, // FIXME need libcore concept
     blockHeight,
     currency,
     unit: currency.units[0],

package/src/mock/account.ts

@@ -396,6 +396,32 @@ export function genAccount(
     balanceHistoryCache: emptyHistoryCache,
   };
 
+  if (
+    ["ethereum", "ethereum_ropsten", "tron", "algorand"].includes(currency.id)
+  ) {
+    const tokenCount =
+      typeof opts.subAccountsCount === "number"
+        ? opts.subAccountsCount
+        : rng.nextInt(0, 8);
+    const all = listTokensForCryptoCurrency(account.currency).filter((t) =>
+      hardcodedMarketcap.includes(t.id)
+    );
+    const compoundReadyTokens = all.filter(findCompoundToken);
+    const notCompoundReadyTokens = all.filter((a) => !findCompoundToken(a));
+    // favorize the generation of compound tokens
+    const tokens = compoundReadyTokens
+      .concat(
+        // from random index
+        notCompoundReadyTokens.slice(
+          rng.nextInt(Math.floor(notCompoundReadyTokens.length / 2))
+        )
+      )
+      .slice(0, tokenCount);
+    account.subAccounts = tokens.map((token, i) =>
+      genTokenAccount(i, account, token)
+    );
+  }
+
   if (currency.id === "cosmos") {
     account.cosmosResources = {
       // TODO variation in these
@@ -419,7 +445,7 @@ export function genAccount(
   if (currency.family === "algorand") {
     account.algorandResources = {
       rewards: new BigNumber(0),
-      rewardsAccumulated: new BigNumber(0),
+      nbAssets: account.subAccounts?.length ?? 0,
     };
   }
 
@@ -437,32 +463,6 @@ export function genAccount(
     };
   }
 
-  if (
-    ["ethereum", "ethereum_ropsten", "tron", "algorand"].includes(currency.id)
-  ) {
-    const tokenCount =
-      typeof opts.subAccountsCount === "number"
-        ? opts.subAccountsCount
-        : rng.nextInt(0, 8);
-    const all = listTokensForCryptoCurrency(account.currency).filter((t) =>
-      hardcodedMarketcap.includes(t.id)
-    );
-    const compoundReadyTokens = all.filter(findCompoundToken);
-    const notCompoundReadyTokens = all.filter((a) => !findCompoundToken(a));
-    // favorize the generation of compound tokens
-    const tokens = compoundReadyTokens
-      .concat(
-        // from random index
-        notCompoundReadyTokens.slice(
-          rng.nextInt(Math.floor(notCompoundReadyTokens.length / 2))
-        )
-      )
-      .slice(0, tokenCount);
-    account.subAccounts = tokens.map((token, i) =>
-      genTokenAccount(i, account, token)
-    );
-  }
-
   account.operations = Array(operationsSize)
     .fill(null)
     .reduce((ops: Operation[]) => {

package/src/types/operation.ts

@@ -7,14 +7,17 @@ export type OperationType =
   | "NONE"
   | "CREATE"
   | "REVEAL"
+  // COSMOS
   | "DELEGATE"
   | "UNDELEGATE"
   | "REDELEGATE"
   | "REWARD"
-  | "FEES" // TRON
+  // TRON
+  | "FEES"
   | "FREEZE"
   | "UNFREEZE"
-  | "VOTE" // POLKADOT
+  // POLKADOT
+  | "VOTE"
   | "REWARD_PAYOUT"
   | "BOND"
   | "UNBOND"
@@ -22,13 +25,15 @@ export type OperationType =
   | "SET_CONTROLLER"
   | "SLASH"
   | "NOMINATE"
-  | "CHILL" // COMPOUND TYPE OPERATIONS
+  | "CHILL"
+  // COMPOUND TYPE OPERATIONS
   | "SUPPLY"
   | "REDEEM"
   | "APPROVE"
+  // ALGORAND
   | "OPT_IN"
   | "OPT_OUT"
-  | "CLOSE_ACCOUNT"
+  // NFT
   | "NFT_IN"
   | "NFT_OUT";
 export type Operation = {