@ledgerhq/live-common 22.0.3 → 22.2.0-next.0

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

@@ -19,21 +19,22 @@ import {
 import {
   SolanaAccountNotFunded,
   SolanaAddressOffEd25519,
+  SolanaInvalidValidator,
   SolanaMemoIsTooLong,
-  SolanaTokenAccountHoldsAnotherToken,
   SolanaRecipientAssociatedTokenAccountWillBeFunded,
-  SolanaTokenRecipientIsSenderATA,
-  SolanaTokenAccounNotInitialized,
-  SolanaInvalidValidator,
-  SolanaValidatorRequired,
-  SolanaStakeAccountRequired,
+  SolanaStakeAccountIsNotDelegatable,
+  SolanaStakeAccountIsNotUndelegatable,
   SolanaStakeAccountNotFound,
   SolanaStakeAccountNothingToWithdraw,
-  SolanaStakeAccountIsNotDelegatable,
+  SolanaStakeAccountRequired,
   SolanaStakeAccountValidatorIsUnchangeable,
-  SolanaStakeAccountIsNotUndelegatable,
-  SolanaStakeNoWithdrawAuth,
   SolanaStakeNoStakeAuth,
+  SolanaStakeNoWithdrawAuth,
+  SolanaTokenAccounNotInitialized,
+  SolanaTokenAccountHoldsAnotherToken,
+  SolanaTokenRecipientIsSenderATA,
+  SolanaUseAllAmountStakeWarning,
+  SolanaValidatorRequired,
 } from "./errors";
 import {
   decodeAccountIdWithTokenAccountAddress,
@@ -41,7 +42,7 @@ import {
   isValidBase58Address,
   MAX_MEMO_LENGTH,
 } from "./logic";
-
+import { estimateTxFee } from "./tx-fees";
 import type {
   CommandDescriptor,
   SolanaStake,
@@ -186,8 +187,8 @@ const deriveTokenTransferCommandDescriptor = async (
       ? defaultRecipientDescriptor
       : recipientDescriptorOrError;
 
-  // TODO: check if SOL balance enough to pay fees
-  const txFee = (await api.getTxFeeCalculator()).lamportsPerSignature;
+  const txFee = await estimateTxFee(api, mainAccount, "token.transfer");
+
   const assocAccRentExempt =
     recipientDescriptor.shouldCreateAsAssociatedTokenAccount
       ? await api.getAssocTokenAccMinNativeBalance()
@@ -289,7 +290,7 @@ async function deriveCreateAssociatedTokenAccountCommandDescriptor(
     mint
   );
 
-  const txFee = (await api.getTxFeeCalculator()).lamportsPerSignature;
+  const txFee = await estimateTxFee(api, mainAccount, "token.createATA");
   const assocAccRentExempt = await api.getAssocTokenAccMinNativeBalance();
 
   return {
@@ -322,10 +323,10 @@ async function deriveTransferCommandDescriptor(
     validateMemoCommon(memo, errors);
   }
 
-  const fee = (await api.getTxFeeCalculator()).lamportsPerSignature;
+  const fee = await estimateTxFee(api, mainAccount, "transfer");
 
   const txAmount = tx.useAllAmount
-    ? BigNumber.max(mainAccount.balance.minus(fee), 0)
+    ? BigNumber.max(mainAccount.spendableBalance.minus(fee), 0)
     : tx.amount;
 
   if (tx.useAllAmount) {
@@ -335,7 +336,7 @@ async function deriveTransferCommandDescriptor(
   } else {
     if (txAmount.lte(0)) {
       errors.amount = new AmountRequired();
-    } else if (txAmount.plus(fee).gt(mainAccount.balance)) {
+    } else if (txAmount.plus(fee).gt(mainAccount.spendableBalance)) {
       errors.amount = new NotEnoughBalance();
     }
   }
@@ -362,33 +363,42 @@ async function deriveStakeCreateAccountCommandDescriptor(
   api: ChainAPI
 ): Promise<CommandDescriptor> {
   const errors: Record<string, Error> = {};
+  const warnings: Record<string, Error> = {};
 
   if (!tx.useAllAmount && tx.amount.lte(0)) {
     errors.amount = new AmountRequired();
   }
 
-  const txFee = (await api.getTxFeeCalculator()).lamportsPerSignature;
+  const txFee = await estimateTxFee(api, mainAccount, "stake.createAccount");
+
   const stakeAccRentExemptAmount =
     await getStakeAccountMinimumBalanceForRentExemption(api);
 
   const fee = txFee + stakeAccRentExemptAmount;
 
   const amount = tx.useAllAmount
-    ? BigNumber.max(mainAccount.balance.minus(fee), 0)
+    ? BigNumber.max(mainAccount.spendableBalance.minus(fee), 0)
     : tx.amount;
 
-  if (!errors.amount && mainAccount.balance.lt(amount.plus(fee))) {
+  if (!errors.amount && mainAccount.spendableBalance.lt(amount.plus(fee))) {
     errors.amount = new NotEnoughBalance();
   }
 
+  if (!errors.amount && tx.useAllAmount) {
+    warnings.amount = new SolanaUseAllAmountStakeWarning();
+  }
+
   const {
     uiState: { delegate },
   } = model;
 
   await validateValidatorCommon(delegate.voteAccAddress, errors, api);
 
-  const { addr: stakeAccAddress, seed: stakeAccAddressSeed } =
-    await nextStakeAccAddr(mainAccount);
+  const stakeAccAddressSeed = `stake:${Math.random().toString()}`;
+  const stakeAccAddress = await getStakeAccountAddressWithSeed({
+    fromAddress: mainAccount.freshAddress,
+    seed: stakeAccAddressSeed,
+  });
 
   return {
     command: {
@@ -401,7 +411,7 @@ async function deriveStakeCreateAccountCommandDescriptor(
       seed: stakeAccAddressSeed,
     },
     fee,
-    warnings: {},
+    warnings,
     errors,
   };
 }
@@ -445,9 +455,9 @@ async function deriveStakeDelegateCommandDescriptor(
     }
   }
 
-  const txFee = (await api.getTxFeeCalculator()).lamportsPerSignature;
+  const txFee = await estimateTxFee(api, mainAccount, "stake.delegate");
 
-  if (mainAccount.balance.lt(txFee)) {
+  if (mainAccount.spendableBalance.lt(txFee)) {
     errors.fee = new NotEnoughBalance();
   }
 
@@ -497,9 +507,9 @@ async function deriveStakeUndelegateCommandDescriptor(
     }
   }
 
-  const txFee = (await api.getTxFeeCalculator()).lamportsPerSignature;
+  const txFee = await estimateTxFee(api, mainAccount, "stake.undelegate");
 
-  if (mainAccount.balance.lt(txFee)) {
+  if (mainAccount.spendableBalance.lt(txFee)) {
     errors.fee = new NotEnoughBalance();
   }
 
@@ -538,9 +548,9 @@ async function deriveStakeWithdrawCommandDescriptor(
     }
   }
 
-  const txFee = (await api.getTxFeeCalculator()).lamportsPerSignature;
+  const txFee = await estimateTxFee(api, mainAccount, "stake.withdraw");
 
-  if (mainAccount.balance.lt(txFee)) {
+  if (mainAccount.spendableBalance.lt(txFee)) {
     errors.fee = new NotEnoughBalance();
   }
 
@@ -583,8 +593,11 @@ async function deriveStakeSplitCommandDescriptor(
 
   const commandFees = await getStakeAccountMinimumBalanceForRentExemption(api);
 
-  const { addr: splitStakeAccAddr, seed: splitStakeAccAddrSeed } =
-    await nextStakeAccAddr(mainAccount);
+  const splitStakeAccAddrSeed = `stake:${Math.random().toString()}`;
+  const splitStakeAccAddr = await getStakeAccountAddressWithSeed({
+    fromAddress: mainAccount.freshAddress,
+    seed: splitStakeAccAddrSeed,
+  });
 
   return {
     command: {
@@ -627,42 +640,6 @@ async function isAccountFunded(
   return balance > 0;
 }
 
-async function nextStakeAccAddr(account: Account, base = "stake") {
-  const usedStakeAccAddrs = (account.solanaResources?.stakes ?? []).map(
-    (s) => s.stakeAccAddr
-  );
-
-  return nextStakeAccAddrRoutine(
-    account.freshAddress,
-    new Set(usedStakeAccAddrs),
-    base,
-    0
-  );
-}
-
-async function nextStakeAccAddrRoutine(
-  fromAddress: string,
-  usedAddresses: Set<string>,
-  base: string,
-  idx: number
-): Promise<{
-  seed: string;
-  addr: string;
-}> {
-  const seed = `${base}:${idx}`;
-  const addr = await getStakeAccountAddressWithSeed({
-    fromAddress,
-    seed,
-  });
-
-  return usedAddresses.has(addr)
-    ? nextStakeAccAddrRoutine(fromAddress, usedAddresses, base, idx + 1)
-    : {
-        seed,
-        addr,
-      };
-}
-
 async function validateRecipientCommon(
   mainAccount: Account,
   tx: Transaction,

package/src/families/solana/js-signOperation.ts

@@ -39,11 +39,20 @@ const buildOptimisticOperation = (
     throw new Error("invalid command");
   }
 
-  return buildOptimisticOperationForCommand(
+  const optimisticOp = buildOptimisticOperationForCommand(
     account,
     transaction,
     commandDescriptor
   );
+
+  const lastOpSeqNumber =
+    account.pendingOperations[0]?.transactionSequenceNumber ??
+    account.operations[0]?.transactionSequenceNumber ??
+    0;
+
+  optimisticOp.transactionSequenceNumber = lastOpSeqNumber + 1;
+
+  return optimisticOp;
 };
 
 export const signOperationWithAPI = (
@@ -62,8 +71,11 @@ export const signOperationWithAPI = (
     (transport) =>
       new Observable((subscriber) => {
         const main = async () => {
-          const [msgToHardwareBytes, signOnChainTransaction] =
-            await buildTransactionWithAPI(account, transaction, await api());
+          const [tx, signOnChainTransaction] = await buildTransactionWithAPI(
+            account,
+            transaction,
+            await api()
+          );
 
           const hwApp = new Solana(transport);
 
@@ -73,20 +85,20 @@ export const signOperationWithAPI = (
 
           const { signature } = await hwApp.signTransaction(
             account.freshAddressPath,
-            msgToHardwareBytes
+            tx.compileMessage().serialize()
           );
 
           subscriber.next({
             type: "device-signature-granted",
           });
 
-          const signedOnChainTxBytes = signOnChainTransaction(signature);
+          const signedTx = signOnChainTransaction(signature);
 
           subscriber.next({
             type: "signed",
             signedOperation: {
               operation: buildOptimisticOperation(account, transaction),
-              signature: signedOnChainTxBytes.toString("hex"),
+              signature: signedTx.serialize().toString("hex"),
               expirationDate: null,
             },
           });

package/src/families/solana/js-synchronization.ts

@@ -37,11 +37,12 @@ import {
   uniqBy,
   flow,
   sortBy,
+  sum,
 } from "lodash/fp";
 import { parseQuiet } from "./api/chain/program";
 import {
   InflationReward,
-  ParsedConfirmedTransactionMeta,
+  ParsedTransactionMeta,
   ParsedMessageAccount,
   ParsedTransaction,
   StakeActivationData,
@@ -73,7 +74,6 @@ export const getAccountShapeWithAPI = async (
   const {
     blockHeight,
     balance: mainAccBalance,
-    spendableBalance: mainAccSpendableBalance,
     tokenAccounts: onChaintokenAccounts,
     stakes: onChainStakes,
   } = await getAccount(mainAccAddress, api);
@@ -212,8 +212,20 @@ export const getAccountShapeWithAPI = async (
     api
   );
 
+  const lastOpSeqNumber =
+    mainInitialAcc?.operations?.[0]?.transactionSequenceNumber ?? 0;
+  const newOpsCount = newMainAccTxs.length;
+
   const newMainAccOps = newMainAccTxs
-    .map((tx) => txToMainAccOperation(tx, mainAccountId, mainAccAddress))
+    .map((tx, i) =>
+      txToMainAccOperation(
+        tx,
+        mainAccountId,
+        mainAccAddress,
+        // transactions are ordered by date (0'th - most recent tx)
+        lastOpSeqNumber + newOpsCount - i
+      )
+    )
     .filter((op): op is Operation => op !== undefined);
 
   const mainAccTotalOperations = mergeOps(
@@ -221,14 +233,16 @@ export const getAccountShapeWithAPI = async (
     newMainAccOps
   );
 
+  const totalStakedBalance = sum(stakes.map((s) => s.stakeAccBalance));
+
   const shape: Partial<Account> = {
     // uncomment when tokens are supported
     // subAccounts as undefined makes TokenList disappear in desktop
     //subAccounts: nextSubAccs,
     id: mainAccountId,
     blockHeight,
-    balance: mainAccBalance,
-    spendableBalance: mainAccSpendableBalance,
+    balance: mainAccBalance.plus(totalStakedBalance),
+    spendableBalance: mainAccBalance,
     operations: mainAccTotalOperations,
     operationsCount: mainAccTotalOperations.length,
     solanaResources: {
@@ -315,7 +329,8 @@ function patchedSubAcc({
 function txToMainAccOperation(
   tx: TransactionDescriptor,
   accountId: string,
-  accountAddress: string
+  accountAddress: string,
+  txSeqNumber: number
 ): Operation | undefined {
   if (!tx.info.blockTime || !tx.parsed.meta) {
     return undefined;
@@ -392,6 +407,7 @@ function txToMainAccOperation(
     date: txDate,
     value: opValue,
     fee: opFee,
+    transactionSequenceNumber: txSeqNumber,
   };
 }
 
@@ -551,7 +567,7 @@ function getTokenSendersRecipients({
   meta,
   accounts,
 }: {
-  meta: ParsedConfirmedTransactionMeta;
+  meta: ParsedTransactionMeta;
   accounts: ParsedMessageAccount[];
 }) {
   const { preTokenBalances, postTokenBalances } = meta;
@@ -625,7 +641,6 @@ async function getAccount(
   api: ChainAPI
 ): Promise<{
   balance: BigNumber;
-  spendableBalance: BigNumber;
   blockHeight: number;
   tokenAccounts: ParsedOnChainTokenAccountWithInfo[];
   stakes: {
@@ -682,7 +697,6 @@ async function getAccount(
 
   return {
     balance,
-    spendableBalance: balance,
     blockHeight,
     tokenAccounts,
     stakes,

package/src/families/solana/logic.ts

@@ -2,7 +2,7 @@ import { findTokenById } from "@ledgerhq/cryptoassets";
 import { PublicKey } from "@solana/web3.js";
 import { TokenAccount } from "../../types/account";
 import { StakeMeta } from "./api/chain/account/stake";
-import { SolanaStake } from "./types";
+import { SolanaStake, StakeAction } from "./types";
 import { assertUnreachable } from "./utils";
 
 export type Awaited<T> = T extends PromiseLike<infer U> ? U : T;
@@ -54,8 +54,6 @@ export function tokenIsListedOnLedger(mint: string): boolean {
   return findTokenById(toTokenId(mint))?.type === "TokenCurrency";
 }
 
-type StakeAction = "deactivate" | "activate" | "withdraw" | "reactivate";
-
 export function stakeActions(stake: SolanaStake): StakeAction[] {
   const actions: StakeAction[] = [];
 

package/src/families/solana/react.ts

@@ -1,5 +1,4 @@
 import { CryptoCurrency } from "@ledgerhq/cryptoassets";
-import { shuffle } from "lodash/fp";
 import { useMemo } from "react";
 import { useObservable } from "../../observable";
 import {
@@ -7,8 +6,6 @@ import {
   getSolanaPreloadData,
 } from "./js-preload-data";
 import { SolanaPreloadDataV1, SolanaStake, SolanaStakeWithMeta } from "./types";
-import { LEDGER_VALIDATOR_ADDRESS, swap } from "./utils";
-import { ValidatorsAppValidator } from "./validator-app";
 
 export function useSolanaPreloadData(
   currency: CryptoCurrency
@@ -19,11 +16,11 @@ export function useSolanaPreloadData(
   );
 }
 
-export function useLedgerFirstShuffledValidators(currency: CryptoCurrency) {
+export function useValidators(currency: CryptoCurrency) {
   const data = useSolanaPreloadData(currency);
 
   return useMemo(() => {
-    return reorderValidators(data?.validators ?? []);
+    return data?.validators ?? [];
   }, [data]);
 }
 
@@ -62,20 +59,3 @@ export function useSolanaStakesWithMeta(
     };
   });
 }
-
-function reorderValidators(
-  validators: ValidatorsAppValidator[]
-): ValidatorsAppValidator[] {
-  const shuffledValidators = shuffle(validators);
-
-  // move Ledger validator to the first position
-  const ledgerValidatorIdx = shuffledValidators.findIndex(
-    (v) => v.voteAccount === LEDGER_VALIDATOR_ADDRESS
-  );
-
-  if (ledgerValidatorIdx !== -1) {
-    swap(shuffledValidators, ledgerValidatorIdx, 0);
-  }
-
-  return shuffledValidators;
-}

package/src/families/solana/specs.ts

@@ -37,7 +37,9 @@ const solana: AppSpec<Transaction> = {
         const transaction = bridge.createTransaction(account);
         const sibling = pickSiblings(siblings);
         const recipient = sibling.freshAddress;
-        const amount = account.balance.div(1.9 + 0.2 * Math.random());
+        const amount = account.spendableBalance
+          .div(1.9 + 0.2 * Math.random())
+          .integerValue();
         return {
           transaction,
           updates: [{ recipient }, { amount }, maybeTransferMemo()],
@@ -64,7 +66,7 @@ const solana: AppSpec<Transaction> = {
       },
       test: (input) => {
         const { account } = input;
-        expect(account.balance.toNumber()).toBe(0);
+        expect(account.spendableBalance.toNumber()).toBe(0);
         expectCorrectBalanceChange(input);
         expectCorrectMemo(input);
       },
@@ -83,7 +85,7 @@ const solana: AppSpec<Transaction> = {
           "already enough delegations"
         );
 
-        invariant(account.balance.gte(3000000), "not enough balance");
+        invariant(account.spendableBalance.gte(3000000), "not enough balance");
 
         const { validators } = getCurrentSolanaPreloadData(account.currency);
 
@@ -148,7 +150,7 @@ const solana: AppSpec<Transaction> = {
       maxRun: 1,
       deviceAction: acceptStakeUndelegateTransaction,
       transaction: ({ account, bridge }) => {
-        invariant(account.balance.gt(0), "not enough balance");
+        invariant(account.spendableBalance.gt(0), "not enough balance");
         const { solanaResources } = account;
 
         if (solanaResources === undefined) {
@@ -210,7 +212,7 @@ const solana: AppSpec<Transaction> = {
       maxRun: 1,
       deviceAction: acceptStakeUndelegateTransaction,
       transaction: ({ account, bridge }) => {
-        invariant(account.balance.gt(0), "not enough balance");
+        invariant(account.spendableBalance.gt(0), "not enough balance");
         const { solanaResources } = account;
 
         if (solanaResources === undefined) {
@@ -272,7 +274,7 @@ const solana: AppSpec<Transaction> = {
       maxRun: 1,
       deviceAction: acceptStakeDelegateTransaction,
       transaction: ({ account, bridge }) => {
-        invariant(account.balance.gt(0), "not enough balance");
+        invariant(account.spendableBalance.gt(0), "not enough balance");
         const { solanaResources } = account;
 
         if (solanaResources === undefined) {
@@ -341,7 +343,7 @@ const solana: AppSpec<Transaction> = {
       maxRun: 1,
       deviceAction: acceptStakeDelegateTransaction,
       transaction: ({ account, bridge }) => {
-        invariant(account.balance.gt(0), "not enough balance");
+        invariant(account.spendableBalance.gt(0), "not enough balance");
         const { solanaResources } = account;
 
         if (solanaResources === undefined) {
@@ -410,7 +412,7 @@ const solana: AppSpec<Transaction> = {
       maxRun: 1,
       deviceAction: acceptStakeWithdrawTransaction,
       transaction: ({ account, bridge }) => {
-        invariant(account.balance.gt(0), "not enough balance");
+        invariant(account.spendableBalance.gt(0), "not enough balance");
         const { solanaResources } = account;
 
         if (solanaResources === undefined) {

package/src/families/solana/test-specifics.ts

@@ -13,6 +13,7 @@ import { SolanaStake, Transaction } from "./types";
 
 const baseAccount = {
   balance: new BigNumber(0),
+  spendableBalance: new BigNumber(0),
 } as Account;
 
 const baseTx = {
@@ -22,10 +23,8 @@ const baseTx = {
 } as Transaction;
 
 const baseAPI = {
-  getTxFeeCalculator: () =>
-    Promise.resolve({
-      lamportsPerSignature: testOnChainData.fees.lamportsPerSignature,
-    }),
+  getFeeForMessage: (_msg: unknown) =>
+    Promise.resolve(testOnChainData.fees.lamportsPerSignature),
 } as ChainAPI;
 
 type StakeTestSpec = {