@ledgerhq/live-common 34.48.0-nightly.2 → 34.48.0-nightly.4

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

@@ -19,7 +19,7 @@ export function createTransaction(account: Account | TokenAccount): TransactionC
   feeCustomUnit?: Unit | null | undefined;
   memoType?: string | null;
   memoValue?: string | null;
-  mode?: "send" | "changeTrust";
+  mode?: "send" | "changeTrust" | "send-legacy" | "send-eip1559";
   assetReference?: string;
   assetOwner?: string;
   networkInfo?: NetworkInfo | null;
@@ -51,6 +51,14 @@ export function createTransaction(account: Account | TokenAccount): TransactionC
         assetOwner: "",
         networkInfo: null,
       };
+    case "evm": {
+      return {
+        mode: "send-eip1559",
+        family: currency.family,
+        amount: new BigNumber(0),
+        recipient: "",
+      };
+    }
     default:
       throw new Error(`Unsupported currency family: ${currency.family}`);
   }

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

@@ -2,8 +2,14 @@ import { makeScanAccounts } from "@ledgerhq/coin-framework/bridge/jsHelpers";
 import { CurrencyBridge } from "@ledgerhq/types-live";
 import { genericGetAccountShape } from "./getAccountShape";
 import { getSigner } from "./signer";
+import type { AlpacaSigner } from "./signer/types";
 
-export function getAlpacaCurrencyBridge(network: string, kind: string): CurrencyBridge {
+export function getAlpacaCurrencyBridge(
+  network: string,
+  kind: string,
+  customSigner?: AlpacaSigner,
+): CurrencyBridge {
+  const signer = customSigner ?? getSigner(network);
   return {
     preload: () => Promise.resolve({}),
     hydrate: () => {
@@ -11,7 +17,7 @@ export function getAlpacaCurrencyBridge(network: string, kind: string): Currency
     },
     scanAccounts: makeScanAccounts({
       getAccountShape: genericGetAccountShape(network, kind),
-      getAddressFn: getSigner(network).getAddress,
+      getAddressFn: signer.getAddress.bind(signer),
     }),
   };
 }

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

@@ -73,7 +73,7 @@ export function genericGetAccountShape(network: string, kind: string): GetAccoun
         getTokenFromAsset: alpacaApi.getTokenFromAsset,
       }) || [];
 
-    const operationsWithSubs = mergedOps.map(op => {
+    const operations = mergedOps.map(op => {
       const subOperations = inferSubOperations(op.hash, subAccounts);
 
       return {
@@ -85,13 +85,12 @@ export function genericGetAccountShape(network: string, kind: string): GetAccoun
     const res = {
       id: accountId,
       xpub: address,
-      blockHeight:
-        operationsWithSubs.length === 0 ? 0 : blockInfo.height || initialAccount?.blockHeight,
+      blockHeight: operations.length === 0 ? 0 : blockInfo.height || initialAccount?.blockHeight,
       balance: new BigNumber(nativeBalance.toString()),
       spendableBalance: new BigNumber(spendableBalance.toString()),
-      operations: operationsWithSubs,
+      operations,
       subAccounts,
-      operationsCount: operationsWithSubs.length,
+      operationsCount: operations.length,
     };
     return res;
   };

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

@@ -0,0 +1,70 @@
+import { filter, firstValueFrom } from "rxjs";
+import { EvmAddress, EvmSignature, EvmSigner } from "@ledgerhq/coin-evm/types/signer";
+import { CreateSigner } from "../../setup";
+import { DeviceManagementKit } from "@ledgerhq/device-management-kit";
+import { DmkSignerEth, LegacySignerEth } from "@ledgerhq/live-signer-evm";
+import Transport from "@ledgerhq/hw-transport";
+import { getEnv } from "@ledgerhq/live-env";
+import { ResolutionConfig, LoadConfig } from "@ledgerhq/hw-app-eth/lib/services/types";
+import { Signature } from "ethers";
+
+export type Signer = {
+  getAddress: (path: string) => Promise<EvmAddress>;
+  signTransaction: (path: string, tx: string) => Promise<string>;
+};
+
+const isDmkTransport = (
+  transport: Transport,
+): transport is Transport & { dmk: DeviceManagementKit; sessionId: string } => {
+  return (
+    "dmk" in transport &&
+    transport.dmk !== undefined &&
+    "sessionId" in transport &&
+    transport.sessionId !== undefined
+  );
+};
+
+const createLiveSigner: CreateSigner<EvmSigner> = (transport: Transport) => {
+  if (isDmkTransport(transport)) {
+    return new DmkSignerEth(transport.dmk, transport.sessionId);
+  }
+
+  return new LegacySignerEth(transport);
+};
+
+export const createSigner: CreateSigner<Signer> = (transport: Transport) => {
+  const signer = createLiveSigner(transport);
+
+  return {
+    getAddress: signer.getAddress.bind(signer),
+    signTransaction: async (path, tx) => {
+      // Configure type of resolutions necessary for the clear signing
+      const resolutionConfig: ResolutionConfig = {
+        externalPlugins: true,
+        erc20: true,
+        nft: false,
+        uniswapV3: true,
+      };
+      const loadConfig: LoadConfig = {
+        cryptoassetsBaseURL: getEnv("DYNAMIC_CAL_BASE_URL"),
+        nftExplorerBaseURL: getEnv("NFT_METADATA_SERVICE") + "/v1/ethereum",
+      };
+
+      signer.setLoadConfig(loadConfig);
+
+      const observable = signer.clearSignTransaction(path, tx.substring(2), resolutionConfig, true);
+      const event = observable.pipe(
+        filter((event): event is { type: "signer.evm.signed"; value: EvmSignature } => {
+          return event.type === "signer.evm.signed";
+        }),
+      );
+      const { value } = await firstValueFrom(event);
+
+      return Signature.from({
+        r: "0x" + value.r,
+        s: "0x" + value.s,
+        v: typeof value.v === "number" ? value.v : parseInt(value.v, 16),
+      }).serialized;
+    },
+  };
+};

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

@@ -1,22 +1,12 @@
-import { GetAddressFn } from "@ledgerhq/coin-framework/bridge/getAddressWrapper";
 import xrpGetAddress from "@ledgerhq/coin-xrp/signer/getAddress";
 import stellarGetAddress from "@ledgerhq/coin-stellar/signer/getAddress";
-import { CreateSigner, executeWithSigner } from "../../setup";
-import Xrp from "@ledgerhq/hw-app-xrp";
 import Stellar from "@ledgerhq/hw-app-str";
-
-import Transport from "@ledgerhq/hw-transport";
 import { signTransaction, stellarSignTransaction } from "./signTransaction";
-import { SignerContext } from "@ledgerhq/coin-framework/signer";
-import { SignTransactionOptions } from "./types";
 import { StrKey } from "@stellar/stellar-sdk";
-
-export type AlpacaSigner = {
-  getAddress: GetAddressFn;
-  signTransaction?: (deviceId: string, opts: SignTransactionOptions) => Promise<string>;
-  signMessage?: (message: string) => Promise<string>;
-  context: SignerContext<any>;
-};
+import { CreateSigner, executeWithSigner } from "../../setup";
+import Xrp from "@ledgerhq/hw-app-xrp";
+import Transport from "@ledgerhq/hw-transport";
+import { AlpacaSigner } from "./types";
 
 const createSignerXrp: CreateSigner<Xrp> = (transport: Transport) => {
   return new Xrp(transport);
@@ -47,7 +37,7 @@ const createSignerStellar: CreateSigner<Stellar> = (transport: Transport) => {
 
 const signerContextStellar = executeWithSigner(createSignerStellar);
 
-export function getSigner(network): AlpacaSigner {
+export function getSigner(network: string): AlpacaSigner {
   switch (network) {
     case "ripple":
     case "xrp": {

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

@@ -1,9 +1,10 @@
 import { SignerContext } from "@ledgerhq/coin-framework/signer";
-import { XrpSigner } from "@ledgerhq/coin-xrp/index";
-import { SignTransactionOptions } from "./types";
 import { StellarSigner } from "@ledgerhq/coin-stellar/types/signer";
+import { LegacySigner, SignTransactionOptions } from "./types";
 
-export const signTransaction = (signerContext: SignerContext<XrpSigner>) => {
+export const signTransaction = <Signer extends LegacySigner>(
+  signerContext: SignerContext<Signer>,
+) => {
   return async (deviceId: string, { path, rawTxHex }: SignTransactionOptions) => {
     const signedTx = await signerContext(deviceId, signer =>
       signer.signTransaction(path, rawTxHex),

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

@@ -1,3 +1,17 @@
+import { GetAddressFn } from "@ledgerhq/coin-framework/bridge/getAddressWrapper";
+import { SignerContext } from "@ledgerhq/coin-framework/signer";
+
+export type LegacySigner = {
+  signTransaction: (path: string, rawTxHex: string) => Promise<string>;
+};
+
+export type AlpacaSigner<S = unknown> = {
+  getAddress: GetAddressFn;
+  signTransaction?: (deviceId: string, opts: SignTransactionOptions) => Promise<string>;
+  signMessage?: (message: string) => Promise<string>;
+  context: SignerContext<S>;
+};
+
 export type SignTransactionOptions = {
   rawTxHex: string;
   path: string;

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

@@ -1,8 +1,36 @@
-import { adaptCoreOperationToLiveOperation, extractBalance } from "./utils";
+import {
+  adaptCoreOperationToLiveOperation,
+  extractBalance,
+  findCryptoCurrencyByNetwork,
+} from "./utils";
 import BigNumber from "bignumber.js";
 import { Operation as CoreOperation } from "@ledgerhq/coin-framework/api/types";
 
 describe("Alpaca utils", () => {
+  describe("findCryptoCurrencyByNetwork", () => {
+    it("finds a crypto currency by id", () => {
+      expect(findCryptoCurrencyByNetwork("ethereum")).toMatchObject({
+        id: "ethereum",
+        family: "evm",
+      });
+    });
+
+    it("takes currency remapping into account", () => {
+      expect(findCryptoCurrencyByNetwork("ripple")).toMatchObject({
+        id: "ripple",
+        family: "xrp",
+      });
+      expect(findCryptoCurrencyByNetwork("xrp")).toMatchObject({
+        id: "ripple",
+        family: "xrp",
+      });
+    });
+
+    it("does not find non existing currencies", () => {
+      expect(findCryptoCurrencyByNetwork("non_existing_currency")).toBeUndefined();
+    });
+  });
+
   describe("extractBalance", () => {
     it("extracts an existing balance", () => {
       expect(extractBalance([{ value: 4n, asset: { type: "type1" } }], "type1")).toEqual({

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

@@ -7,6 +7,15 @@ import {
   Operation as CoreOperation,
   TransactionIntent,
 } from "@ledgerhq/coin-framework/api/types";
+import { findCryptoCurrencyById } from "@ledgerhq/cryptoassets/currencies";
+import { CryptoCurrency } from "@ledgerhq/types-cryptoassets";
+
+export function findCryptoCurrencyByNetwork(network: string): CryptoCurrency | undefined {
+  const networksRemap = {
+    xrp: "ripple",
+  };
+  return findCryptoCurrencyById(networksRemap[network] ?? network);
+}
 
 export function extractBalance(balances: Balance[], type: string): Balance {
   return (
@@ -110,6 +119,12 @@ export function transactionToIntent(
       case "send":
         transactionType = "send";
         break;
+      case "send-legacy":
+        transactionType = "send-legacy";
+        break;
+      case "send-eip1559":
+        transactionType = "send-eip1559";
+        break;
       default:
         throw new Error(`Unsupported transaction mode: ${transaction.mode}`);
     }

package/src/config/sharedConfig.ts

@@ -11,6 +11,7 @@ import { evmConfig } from "../families/evm/config";
 import { fileCoinConfig } from "../families/filecoin/config";
 import { hederaConfig } from "../families/hedera/config";
 import { internetComputerConfig } from "../families/internet_computer/config";
+import { kaspaConfig } from "../families/kaspa/config";
 import { nearConfig } from "../families/near/config";
 import { minaConfig } from "../families/mina/config";
 import { polkadotConfig } from "../families/polkadot/config";
@@ -55,6 +56,7 @@ export const liveConfig: ConfigSchema = {
   ...fileCoinConfig,
   ...hederaConfig,
   ...internetComputerConfig,
+  ...kaspaConfig,
   ...nearConfig,
   ...minaConfig,
   ...polkadotConfig,

package/src/e2e/enum/Account.ts

@@ -276,6 +276,20 @@ export class Account {
     0,
   );
 
+  static readonly KASPA_1 = new Account(
+    Currency.KAS,
+    "KASPA 1",
+    "kaspa:kaspa:qqpqtujclz2usyj7rgmhghfu8e5echrh8t2pkz69tq37uclfrpu3g0w6laqqk",
+    0,
+  );
+
+  static readonly KASPA_2 = new Account(
+    Currency.KAS,
+    "KASPA 2",
+    "kaspa:qrx2agwk93qyjvlcuzz5jy37knt298zupvw2ls05p4te55c29uwuyzzra5qkv",
+    1,
+  );
+
   static readonly LTC_1 = new Account(
     Currency.LTC,
     "Litecoin 1",

package/src/e2e/enum/AppInfos.ts

@@ -60,4 +60,6 @@ export class AppInfos {
   static readonly CELO = new AppInfos("Celo");
 
   static readonly LTC = new AppInfos("Litecoin");
+
+  static readonly KASPA = new AppInfos("Kaspa");
 }

package/src/e2e/enum/Currency.ts

@@ -25,6 +25,8 @@ export class Currency {
 
   static readonly APT = new Currency("Aptos", "APT", "aptos", AppInfos.APTOS, [Network.APTOS]);
 
+  static readonly KAS = new Currency("Kaspa", "KAS", "kaspa", AppInfos.KASPA, [Network.KASPA]);
+
   static readonly tBTC = new Currency(
     "Bitcoin Testnet",
     "𝚝BTC",

package/src/e2e/enum/Network.ts

@@ -30,4 +30,5 @@ export enum Network {
   OSMOSIS = "Osmosis",
   MULTIVERS_X = "MultiversX",
   LITECOIN = "Litecoin",
+  KASPA = "Kaspa",
 }

package/src/e2e/families/kaspa.ts

@@ -0,0 +1,17 @@
+import expect from "expect";
+import { pressBoth, pressUntilTextFound, waitFor, containsSubstringInEvent } from "../speculos";
+import { DeviceLabels } from "../enum/DeviceLabels";
+import { Delegate } from "../models/Delegate";
+
+export async function sendKaspa() {
+  await pressUntilTextFound(DeviceLabels.APPROVE);
+  await pressBoth();
+}
+
+export async function delegateKaspa(delegatingAccount: Delegate) {
+  await waitFor(DeviceLabels.REVIEW_OPERATION);
+  const events = await pressUntilTextFound(DeviceLabels.APPROVE);
+  const isAmountCorrect = containsSubstringInEvent(delegatingAccount.amount, events);
+  expect(isAmountCorrect).toBeTruthy();
+  await pressBoth();
+}

package/src/e2e/speculos.ts

@@ -30,6 +30,7 @@ import { sendXRP } from "./families/xrp";
 import { delegateAptos, sendAptos } from "./families/aptos";
 import { delegateNear } from "./families/near";
 import { delegateCosmos, sendCosmos } from "./families/cosmos";
+import { sendKaspa } from "./families/kaspa";
 import { delegateSolana, sendSolana } from "./families/solana";
 import { delegateTezos } from "./families/tezos";
 import { delegateCelo } from "./families/celo";
@@ -325,6 +326,14 @@ export const specs: Specs = {
     },
     dependency: "",
   },
+  Kaspa: {
+    currency: getCryptoCurrencyById("kaspa"),
+    appQuery: {
+      model: getSpeculosModel(),
+      appName: "Kaspa",
+    },
+    dependency: "",
+  },
 };
 
 export async function startSpeculos(
@@ -677,6 +686,9 @@ export async function signSendTransaction(tx: Transaction) {
     case Currency.APT:
       await sendAptos();
       break;
+    case Currency.KAS:
+      await sendKaspa();
+      break;
     default:
       throw new Error(`Unsupported currency: ${currencyName.ticker}`);
   }