@ledgerhq/live-common 34.50.0-nightly.4 → 34.50.0

package/src/bridge/generic-alpaca/buildSubAccounts.ts

@@ -55,47 +55,47 @@ function buildTokenAccount({
   };
 }
 
-export async function buildSubAccounts({
+export function buildSubAccounts({
   currency,
   accountId,
-  allTokenAssetsBalances,
+  assetsBalance,
   syncConfig,
   operations,
   getTokenFromAsset,
 }: {
   currency: CryptoCurrency;
   accountId: string;
-  allTokenAssetsBalances: Balance[];
+  assetsBalance: Balance[];
   syncConfig: SyncConfig;
   operations: OperationCommon[];
-  getTokenFromAsset?: (asset: AssetInfo) => Promise<TokenCurrency | undefined>;
-}): Promise<TokenAccount[]> {
+  getTokenFromAsset?: (asset: AssetInfo) => TokenCurrency | undefined;
+}): TokenAccount[] | undefined {
   const { blacklistedTokenIds = [] } = syncConfig;
   const allTokens = listTokensForCryptoCurrency(currency);
-  const tokenAccounts: TokenAccount[] = [];
-
-  if (allTokens.length === 0 || allTokenAssetsBalances.length === 0) {
-    return tokenAccounts;
-  }
 
-  for (const balance of allTokenAssetsBalances) {
-    const token = getTokenFromAsset && (await getTokenFromAsset(balance.asset));
-    // NOTE: for future tokens, will need to check over currencyName/standard(erc20,trc10,trc20, etc)/id
-    if (token && !blacklistedTokenIds.includes(token.id)) {
-      tokenAccounts.push(
-        buildTokenAccount({
-          parentAccountId: accountId,
-          assetBalance: balance,
-          token,
-          operations: operations.filter(
-            op =>
-              op.extra.assetReference === balance.asset?.["assetReference"] &&
-              op.extra.assetOwner === balance.asset?.["assetOwner"], // NOTE: we could narrow type
-          ),
-        }),
-      );
-    }
+  if (allTokens.length === 0 || assetsBalance.length === 0) {
+    return undefined;
   }
-
+  const tokenAccounts: TokenAccount[] = [];
+  assetsBalance
+    .filter(b => b.asset.type !== "native") // NOTE: this could be removed, keeping here while fixing things up
+    .map(balance => {
+      const token = getTokenFromAsset && getTokenFromAsset(balance.asset);
+      // NOTE: for future tokens, will need to check over currencyName/standard(erc20,trc10,trc20, etc)/id
+      if (token && !blacklistedTokenIds.includes(token.id)) {
+        tokenAccounts.push(
+          buildTokenAccount({
+            parentAccountId: accountId,
+            assetBalance: balance,
+            token,
+            operations: operations.filter(
+              op =>
+                op.extra.assetReference === balance.asset?.["assetReference"] &&
+                op.extra.assetOwner === balance.asset?.["assetOwner"], // NOTE: we could narrow type
+            ),
+          }),
+        );
+      }
+    });
   return tokenAccounts;
 }

package/src/bridge/generic-alpaca/createTransaction.ts

@@ -30,17 +30,6 @@ export function createTransaction(account: Account | TokenAccount): GenericTrans
         assetOwner: "",
         networkInfo: null,
       };
-    case "tezos":
-      // note: default transaction for tezos, mode will be set by UI (send, stake, unstake)
-      return {
-        family: currency.family,
-        amount: new BigNumber(0),
-        fees: null,
-        recipient: "",
-        useAllAmount: false,
-        mode: "send",
-        networkInfo: null,
-      };
     case "evm": {
       return {
         mode: "send-eip1559",

package/src/bridge/generic-alpaca/getAccountShape.ts

@@ -1,6 +1,5 @@
 import { encodeAccountId } from "@ledgerhq/coin-framework/account/index";
 import { GetAccountShape, mergeOps } from "@ledgerhq/coin-framework/bridge/jsHelpers";
-import { encodeOperationId } from "@ledgerhq/coin-framework/operation";
 import BigNumber from "bignumber.js";
 import { getAlpacaApi } from "./alpaca";
 import { adaptCoreOperationToLiveOperation, extractBalance } from "./utils";
@@ -32,25 +31,18 @@ export function genericGetAccountShape(network: string, kind: string): GetAccoun
     const balanceRes = await alpacaApi.getBalance(address);
     const nativeAsset = extractBalance(balanceRes, "native");
 
-    const allTokenAssetsBalances = balanceRes.filter(b => b.asset.type !== "native");
+    const assetsBalance = balanceRes
+      .filter(b => b.asset.type !== "native")
+      .filter(b => alpacaApi.getTokenFromAsset && alpacaApi.getTokenFromAsset(b.asset));
     const nativeBalance = BigInt(nativeAsset?.value ?? "0");
 
     const spendableBalance = BigInt(nativeBalance - BigInt(nativeAsset?.locked ?? "0"));
 
-    // Normalize pre-alpaca operations to the new accountId to keep UI rendering consistent
-    const oldOps = ((initialAccount?.operations || []) as OperationCommon[]).map(op =>
-      op.accountId === accountId
-        ? op
-        : { ...op, accountId, id: encodeOperationId(accountId, op.hash, op.type) },
-    );
+    const oldOps = (initialAccount?.operations || []) as OperationCommon[];
     const lastPagingToken = oldOps[0]?.extra?.pagingToken || "";
 
-    // Calculate minHeight for pagination
-    let minHeight: number = 0;
-    if (oldOps.length > 0 && initialAccount?.blockHeight !== 0) {
-      minHeight = (oldOps[0].blockHeight ?? 0) + 1;
-    }
-    const paginationParams: Pagination = { minHeight, order: "asc" };
+    const blockHeight = oldOps.length ? (oldOps[0].blockHeight ?? 0) + 1 : 0;
+    const paginationParams: Pagination = { minHeight: blockHeight, order: "asc" };
     if (lastPagingToken) {
       paginationParams.lastPagingToken = lastPagingToken;
     }
@@ -72,14 +64,15 @@ export function genericGetAccountShape(network: string, kind: string): GetAccoun
       }
     });
 
-    const subAccounts = await buildSubAccounts({
-      currency,
-      accountId,
-      allTokenAssetsBalances,
-      syncConfig,
-      operations: assetOperations,
-      getTokenFromAsset: alpacaApi.getTokenFromAsset,
-    });
+    const subAccounts =
+      buildSubAccounts({
+        currency,
+        accountId,
+        assetsBalance,
+        syncConfig,
+        operations: assetOperations,
+        getTokenFromAsset: alpacaApi.getTokenFromAsset,
+      }) || [];
 
     const operations = mergedOps.map(op => {
       const subOperations = inferSubOperations(op.hash, subAccounts);

package/src/bridge/generic-alpaca/getTransactionStatus.ts

@@ -13,7 +13,7 @@ export function genericGetTransactionStatus(
   return async (account, transaction: GenericTransaction) => {
     const alpacaApi = getAlpacaApi(account.currency.id, kind);
     const draftTransaction = {
-      mode: transaction?.mode ?? "send",
+      mode: transaction?.mode,
       recipient: transaction.recipient,
       amount: transaction.amount ?? new BigNumber(0),
       useAllAmount: !!transaction.useAllAmount,

package/src/bridge/generic-alpaca/prepareTransaction.ts

@@ -26,7 +26,7 @@ export function genericPrepareTransaction(
   kind,
 ): AccountBridge<GenericTransaction, Account>["prepareTransaction"] {
   return async (account, transaction: GenericTransaction) => {
-    const { getAssetFromToken, computeIntentType, estimateFees, validateIntent } = getAlpacaApi(
+    const { getAssetFromToken, computeIntentType, estimateFees } = getAlpacaApi(
       account.currency.id,
       kind,
     );
@@ -50,7 +50,7 @@ export function genericPrepareTransaction(
     }
 
     if (!bnEq(transaction.fees, new BigNumber(fees.toString()))) {
-      const next: GenericTransaction = {
+      return {
         ...transaction,
         fees: new BigNumber(fees.toString()),
         assetReference,
@@ -61,52 +61,6 @@ export function genericPrepareTransaction(
           },
         },
       };
-
-      // propagate storageLimit fee parameter when present (ex: tezos)
-      const feeEstimation = await estimateFees(
-        transactionToIntent(
-          account,
-          {
-            ...transaction,
-          },
-          computeIntentType,
-        ),
-      );
-      const params = feeEstimation?.parameters;
-      if (params) {
-        const storageLimit = params["storageLimit"];
-        if (
-          storageLimit !== undefined &&
-          (typeof storageLimit === "bigint" ||
-            typeof storageLimit === "number" ||
-            typeof storageLimit === "string")
-        ) {
-          next.storageLimit = new BigNumber(storageLimit.toString());
-          // Add storageLimit to customFees parameters
-          if (next.customFees?.parameters) {
-            next.customFees.parameters.storageLimit = new BigNumber(storageLimit.toString());
-          }
-        }
-      }
-
-      // align with stellar/xrp: when send max (or staking intents), reflect validated amount in UI
-      if (
-        transaction.useAllAmount ||
-        transaction["mode"] === "stake" ||
-        transaction["mode"] === "unstake"
-      ) {
-        const { amount } = await validateIntent(
-          transactionToIntent(
-            account,
-            {
-              ...transaction,
-            },
-            computeIntentType,
-          ),
-        );
-        next.amount = new BigNumber(amount.toString());
-      }
-      return next;
     }
 
     return transaction;

package/src/bridge/generic-alpaca/signer/index.ts

@@ -1,15 +1,12 @@
 import xrpGetAddress from "@ledgerhq/coin-xrp/signer/getAddress";
 import stellarGetAddress from "@ledgerhq/coin-stellar/signer/getAddress";
 import Stellar from "@ledgerhq/hw-app-str";
-import { signTransaction, stellarSignTransaction, tezosSignTransaction } from "./signTransaction";
+import { signTransaction, stellarSignTransaction } from "./signTransaction";
 import { StrKey } from "@stellar/stellar-sdk";
 import { CreateSigner, executeWithSigner } from "../../setup";
 import Xrp from "@ledgerhq/hw-app-xrp";
 import Transport from "@ledgerhq/hw-transport";
 import { AlpacaSigner } from "./types";
-import { DerivationType, LedgerSigner as TaquitoLedgerSigner } from "@taquito/ledger-signer";
-import tezosGetAddress from "@ledgerhq/coin-tezos/signer/getAddress";
-import Tezos from "@ledgerhq/hw-app-tezos";
 
 const createSignerXrp: CreateSigner<Xrp> = (transport: Transport) => {
   return new Xrp(transport);
@@ -40,39 +37,6 @@ const createSignerStellar: CreateSigner<Stellar> = (transport: Transport) => {
 
 const signerContextStellar = executeWithSigner(createSignerStellar);
 
-const createSignerTezos: CreateSigner<
-  Tezos & { createLedgerSigner: (path: string, prompt: boolean, derivationType: number) => any }
-> = (transport: Transport) => {
-  const tezos = new Tezos(transport);
-  // align with genericSignOperation that calls signer.signTransaction
-  return Object.assign(tezos, {
-    async signTransaction(path: string, rawTxHex: string) {
-      const { signature } = await tezos.signOperation(path, rawTxHex, {});
-      return signature;
-    },
-    async getAddress(path: string, { verify }: { verify?: boolean } = {}) {
-      // Use Taquito LedgerSigner to retrieve base58 public key and matching pkh (like oldbridge)
-      const ledgerSigner = new TaquitoLedgerSigner(
-        transport,
-        path,
-        !!verify,
-        DerivationType.ED25519,
-      );
-      const address = await ledgerSigner.publicKeyHash();
-      const publicKey = await ledgerSigner.publicKey();
-      return { path, address, publicKey };
-    },
-    createLedgerSigner(path: string, prompt: boolean, derivationType: number) {
-      // Map 0 -> ED25519, 1 -> SECP256K1, 2 -> P256 by convention
-      let dt: DerivationType = DerivationType.ED25519;
-      if (derivationType === 1) dt = DerivationType.SECP256K1;
-      else if (derivationType === 2) dt = DerivationType.P256;
-      return new TaquitoLedgerSigner(transport, path, prompt, dt);
-    },
-  });
-};
-const signerContextTezos = executeWithSigner(createSignerTezos);
-
 export function getSigner(network: string): AlpacaSigner {
   switch (network) {
     case "ripple":
@@ -90,13 +54,6 @@ export function getSigner(network: string): AlpacaSigner {
         context: signerContextStellar,
       };
     }
-    case "tezos": {
-      return {
-        getAddress: tezosGetAddress(signerContextTezos),
-        signTransaction: tezosSignTransaction(executeWithSigner(createSignerTezos)),
-        context: signerContextTezos,
-      };
-    }
   }
   throw new Error(`signer for ${network} not implemented`);
 }

package/src/bridge/generic-alpaca/signer/signTransaction.ts

@@ -1,6 +1,5 @@
 import { SignerContext } from "@ledgerhq/coin-framework/signer";
 import { StellarSigner } from "@ledgerhq/coin-stellar/types/signer";
-import { TezosSigner } from "@ledgerhq/coin-tezos/types/signer";
 import { LegacySigner, SignTransactionOptions } from "./types";
 
 export const signTransaction = <Signer extends LegacySigner>(
@@ -24,12 +23,3 @@ export const stellarSignTransaction = (signerContext: SignerContext<StellarSigne
     return signedTx.signature.toString("base64"); // It should return a Buffer
   };
 };
-
-export const tezosSignTransaction = (signerContext: SignerContext<TezosSigner>) => {
-  return async (deviceId: string, { path, rawTxHex }: SignTransactionOptions) => {
-    const signed = await signerContext(deviceId, signer =>
-      signer.signOperation(path, rawTxHex, {}),
-    );
-    return signed.signature;
-  };
-};

package/src/bridge/generic-alpaca/tests/estimateMaxSpendable.test.ts

@@ -35,23 +35,9 @@ const dummyAccounts = [
     freshAddress: "s123",
     pendingOperations: [],
   },
-  {
-    id: "js:2:tezos:t123",
-    type: "Account",
-    spendableBalance: new BigNumber(50000000),
-    balance: new BigNumber(60000000),
-    currency: {
-      id: "tezos",
-      family: "tezos",
-      name: "Tezos",
-      units: [{ name: "XTZ", magnitude: 6 }],
-    },
-    freshAddress: "t123",
-    pendingOperations: [],
-  },
 ] as unknown as Account[];
 
-["xrp", "stellar", "tezos"].forEach((currencyName, idx) => {
+["xrp", "stellar"].forEach((currencyName, idx) => {
   describe(`genericEstimateMaxSpendable for ${currencyName}`, () => {
     const dummyAccount = dummyAccounts[idx];
 

package/src/bridge/generic-alpaca/tests/getAccountShape.test.ts

@@ -117,11 +117,9 @@ describe("genericGetAccountShape (stellar & xrp)", () => {
         lastPagingToken: "pt1",
       });
 
-      const assetsBalancePassed = buildSubAccountsMock.mock.calls[0][0].allTokenAssetsBalances;
-      expect(assetsBalancePassed).toEqual([
-        { asset: { symbol: "TOK1", type: "token" }, value: "42" },
-        { asset: { symbol: "TOK_IGNORE", type: "token" }, value: "5" },
-      ]);
+      const assetsBalancePassed = buildSubAccountsMock.mock.calls[0][0].assetsBalance;
+      expect(assetsBalancePassed).toHaveLength(1);
+      expect(assetsBalancePassed[0].asset.symbol).toBe("TOK1");
 
       const assetOpsPassed = buildSubAccountsMock.mock.calls[0][0].operations;
       expect(assetOpsPassed).toHaveLength(1);

package/src/bridge/generic-alpaca/tests/signOperation.test.ts

@@ -14,7 +14,7 @@ jest.mock("../utils", () => ({
   transactionToIntent: jest.fn(),
 }));
 describe("genericSignOperation", () => {
-  const networks = ["xrp", "stellar", "tezos"];
+  const networks = ["xrp", "stellar"];
   const kind = "local";
 
   const mockSignerContext = jest.fn();

package/src/bridge/generic-alpaca/types.ts

@@ -18,16 +18,8 @@ export type GenericTransaction = TransactionCommon & {
   memoType?: string | null;
   memoValue?: string | null;
   data?: Buffer;
-  mode?:
-    | "send"
-    | "changeTrust"
-    | "send-legacy"
-    | "send-eip1559"
-    | "delegate"
-    | "stake"
-    | "undelegate"
-    | "unstake";
   type?: number;
+  mode?: "send" | "changeTrust" | "send-legacy" | "send-eip1559";
   assetReference?: string;
   assetOwner?: string;
   networkInfo?: NetworkInfo | null;

package/src/bridge/generic-alpaca/utils.ts

@@ -128,18 +128,15 @@ export function transactionToIntent(
   data?: { type: string; value?: unknown };
 } {
   const intentType = (computeIntentType ?? defaultComputeIntentType)(transaction);
-  const isStaking = ["stake", "unstake"].includes(intentType);
-  const amount = isStaking ? 0n : fromBigNumberToBigInt(transaction.amount, 0n);
-  const useAllAmount = isStaking || !!transaction.useAllAmount;
   const res: TransactionIntent & { memo?: { type: string; value?: string } } & {
     data?: { type: string; value?: unknown };
   } = {
     type: intentType,
     sender: account.freshAddress,
     recipient: transaction.recipient,
-    amount,
+    amount: fromBigNumberToBigInt(transaction.amount, BigInt(0)),
     asset: { type: "native", name: account.currency.name, unit: account.currency.units[0] },
-    useAllAmount,
+    useAllAmount: !!transaction.useAllAmount,
     feesStrategy:
       transaction.feesStrategy === "custom" ? undefined : transaction.feesStrategy ?? undefined,
     data: Buffer.isBuffer(transaction.data)

package/src/bridge/impl.ts

@@ -27,7 +27,6 @@ import { getCryptoAssetsStore, setCryptoAssetsStore } from "./crypto-assets";
 const alpacaized = {
   xrp: true,
   stellar: true,
-  tezos: true,
 };
 
 // let accountBridgeInstance: AccountBridge<any> | null = null;

package/src/e2e/enum/Account.ts

@@ -110,12 +110,6 @@ export class Account {
     "0xa1baa625c5E6A9304cB7AcD86d2fee6B710eC3eB",
     1,
   );
-  static readonly BSC_POL = new Account(
-    Currency.BSC_POL,
-    "BNB Chain 1",
-    "0x4BE2E2B8872AA298D6d123b9211B53E41f611566",
-    0,
-  );
   static readonly BSC_SHIBA = new Account(
     Currency.BSC_SHIBA,
     "BNB Chain 1",
@@ -248,8 +242,6 @@ export class Account {
     undefined,
     [Nft.ANTITUS, Nft.PODIUM, Nft.NY_LA_MUSE],
   );
-  // don't use this account as a recipient, it's balance
-  // should stay close to null to allow for error message testing
   static readonly ETH_2 = new Account(
     Currency.ETH,
     "Ethereum 2",
@@ -284,8 +276,6 @@ export class Account {
     0,
   );
 
-  static readonly HEDERA_1 = new Account(Currency.HBAR, "Hedera 1", "0.0.9374930", 0);
-
   static readonly INJ_1 = new Account(
     Currency.INJ,
     "Injective 1",
@@ -526,19 +516,6 @@ export class Account {
     1,
   );
 
-  static readonly SUI_1 = new Account(
-    Currency.SUI,
-    "Sui 1",
-    "0xc6169bcce8718609e43d179b087e6c1e2ac28e5325660af34d22fb5ce284031e",
-    0,
-  );
-  static readonly SUI_2 = new Account(
-    Currency.SUI,
-    "Sui 2",
-    "0x6644c1ce77c5e5ef8d8bd3ae2a4e18239e5d418a5e0800ed5037818399e3a7f6",
-    1,
-  );
-
   static readonly EMPTY = new Account(Currency.BTC, "Empty", "", 0);
 }
 
@@ -653,24 +630,6 @@ export class TokenAccount extends Account {
     TokenType.TRC20,
     Account.TRX_1,
   );
-
-  static readonly SUI_USDC_1 = new TokenAccount(
-    Currency.SUI_USDC,
-    "SUI USDC 1",
-    Account.SUI_1.address,
-    0,
-    TokenType.ERC20,
-    Account.SUI_1,
-  );
-
-  static readonly SUI_USDC_2 = new TokenAccount(
-    Currency.SUI_USDC,
-    "SUI USDC 2",
-    Account.SUI_2.address,
-    1,
-    TokenType.ERC20,
-    Account.SUI_2,
-  );
 }
 
 export type AccountType = Account | TokenAccount;

package/src/e2e/enum/AppInfos.ts

@@ -33,8 +33,6 @@ export class AppInfos {
 
   static readonly STELLAR = new AppInfos("Stellar");
 
-  static readonly SUI = new AppInfos("Sui");
-
   static readonly BITCOIN_CASH = new AppInfos("Bitcoin Cash");
 
   static readonly ALGORAND = new AppInfos("Algorand");
@@ -64,6 +62,4 @@ export class AppInfos {
   static readonly LTC = new AppInfos("Litecoin");
 
   static readonly KASPA = new AppInfos("Kaspa");
-
-  static readonly HEDERA = new AppInfos("Hedera");
 }

package/src/e2e/enum/Currency.ts

@@ -27,10 +27,6 @@ export class Currency {
 
   static readonly KAS = new Currency("Kaspa", "KAS", "kaspa", AppInfos.KASPA, [Network.KASPA]);
 
-  static readonly HBAR = new Currency("Hedera", "HBAR", "hedera", AppInfos.HEDERA, [
-    Network.HEDERA,
-  ]);
-
   static readonly tBTC = new Currency(
     "Bitcoin Testnet",
     "𝚝BTC",
@@ -83,7 +79,6 @@ export class Currency {
   static readonly XLM = new Currency("Stellar", "XLM", "stellar", AppInfos.STELLAR, [
     Network.STELLAR,
   ]);
-  static readonly SUI = new Currency("Sui", "SUI", "sui", AppInfos.SUI, [Network.SUI]);
   static readonly BCH = new Currency("Bitcoin Cash", "BCH", "bitcoin_cash", AppInfos.BITCOIN_CASH, [
     Network.BITCOIN_CASH,
   ]);
@@ -157,13 +152,6 @@ export class Currency {
     AppInfos.BNB_CHAIN,
     [Network.BNB_CHAIN, Network.POLYGON],
   );
-  static readonly BSC_POL = new Currency(
-    "Matic Token",
-    "MATIC",
-    "bsc/bep20/matic_token",
-    AppInfos.BNB_CHAIN,
-    [Network.BNB_CHAIN],
-  );
   static readonly BSC_SHIBA = new Currency("Shiba Inu", "SHIB", "bsc", AppInfos.BNB_CHAIN, [
     Network.BNB_CHAIN,
     Network.ETHEREUM,
@@ -208,13 +196,4 @@ export class Currency {
   static readonly OP = new Currency("OP Mainnet", "OP", "optimism", AppInfos.ETHEREUM, [
     Network.OPTIMISM,
   ]);
-
-  static readonly SUI_USDC = new Currency(
-    "USDC",
-    "USDC",
-    "sui/coin/usdc_0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::usdc",
-    AppInfos.SUI,
-    [Network.SUI],
-    "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7",
-  );
 }

package/src/e2e/enum/Network.ts

@@ -16,7 +16,6 @@ export enum Network {
   XRP = "XRP",
   CARDANO = "Cardano",
   STELLAR = "Stellar",
-  SUI = "Sui",
   BITCOIN_CASH = "Bitcoin Cash",
   ALGORAND = "Algorand",
   COSMOS = "Cosmos",
@@ -33,5 +32,4 @@ export enum Network {
   MULTIVERS_X = "MultiversX",
   LITECOIN = "Litecoin",
   KASPA = "Kaspa",
-  HEDERA = "Hedera",
 }

package/src/e2e/enum/TokenType.ts

@@ -2,5 +2,4 @@ export enum TokenType {
   ERC20 = "erc20",
   TRC20 = "trc20",
   SPL = "spl",
-  SUI = "sui",
 }

package/src/e2e/enum/TransactionStatus.ts

@@ -2,11 +2,8 @@ export enum TransactionStatus {
   RECEIVED = "Received",
   DELEGATED = "Delegated",
   NFT_RECEIVED = "NFT Received",
-  SEND = "Send",
   SENT = "Sent",
   FEES = "Fees",
   STAKED = "Staked",
   SENDING = "Sending",
-  TRANSACTION_SENT = "Transaction sent",
-  CONFIRMED = "Confirmed",
 }