@ledgerhq/live-common 34.48.0-nightly.0 → 34.48.0-nightly.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ledgerhq/live-common",
   "description": "Common ground for the Ledger Live apps",
-  "version": "34.48.0-nightly.0",
+  "version": "34.48.0-nightly.10",
   "repository": {
     "type": "git",
     "url": "https://github.com/LedgerHQ/ledger-live.git"
@@ -106,7 +106,7 @@
     "@dfinity/agent": "^0.21.0",
     "@dfinity/candid": "^0.21.0",
     "@dfinity/principal": "^0.15.6",
-    "@ledgerhq/device-management-kit": "0.0.0-fix-lns-20250901094837",
+    "@ledgerhq/device-management-kit": "0.9.0",
     "@ledgerhq/live-app-sdk": "^0.8.1",
     "@ledgerhq/wallet-api-client": "^1.10.0",
     "@ledgerhq/wallet-api-core": "^1.22.0",
@@ -138,6 +138,7 @@
     "bip39": "^3.0.4",
     "bs58": "^4.0.1",
     "date-fns": "^2.23.0",
+    "ethers": "6.15.0",
     "expect": "^27.4.6",
     "fuse.js": "^6.6.2",
     "i18next": "20.6.1",
@@ -165,47 +166,49 @@
     "xstate": "^5.19.2",
     "yargs": "^17.0.0",
     "zod": "^3.22.4",
-    "@ledgerhq/coin-algorand": "^0.10.1-nightly.0",
-    "@ledgerhq/coin-aptos": "^3.2.1-nightly.0",
-    "@ledgerhq/coin-bitcoin": "^0.21.1-nightly.0",
-    "@ledgerhq/coin-canton": "^0.4.1-nightly.0",
-    "@ledgerhq/coin-cardano": "^0.12.1-nightly.0",
-    "@ledgerhq/coin-casper": "^2.1.1-nightly.0",
-    "@ledgerhq/coin-celo": "^1.3.1-nightly.0",
-    "@ledgerhq/coin-cosmos": "^0.17.1-nightly.0",
-    "@ledgerhq/coin-evm": "^2.29.1-nightly.0",
-    "@ledgerhq/coin-framework": "^6.4.0-nightly.0",
-    "@ledgerhq/coin-filecoin": "^1.11.1-nightly.0",
-    "@ledgerhq/coin-hedera": "^1.11.1-nightly.0",
-    "@ledgerhq/coin-icon": "^0.12.1-nightly.0",
-    "@ledgerhq/coin-internet_computer": "^1.8.1-nightly.0",
-    "@ledgerhq/coin-mina": "^1.2.1-nightly.0",
-    "@ledgerhq/coin-multiversx": "^0.5.1-nightly.0",
-    "@ledgerhq/coin-near": "^0.13.1-nightly.0",
-    "@ledgerhq/coin-polkadot": "^6.9.1-nightly.0",
-    "@ledgerhq/coin-solana": "^0.32.1-nightly.0",
-    "@ledgerhq/coin-stacks": "^0.9.1-nightly.0",
-    "@ledgerhq/coin-stellar": "^6.3.1-nightly.0",
-    "@ledgerhq/coin-sui": "^0.12.1-nightly.0",
-    "@ledgerhq/coin-tezos": "^6.3.1-nightly.0",
-    "@ledgerhq/coin-ton": "^0.14.1-nightly.0",
-    "@ledgerhq/coin-vechain": "^2.9.1-nightly.0",
-    "@ledgerhq/coin-xrp": "^7.3.1-nightly.0",
-    "@ledgerhq/crypto-icons-ui": "^1.18.0",
-    "@ledgerhq/cryptoassets": "^13.27.0",
-    "@ledgerhq/coin-tron": "^5.3.1-nightly.0",
-    "@ledgerhq/device-core": "^0.6.2",
+    "@ledgerhq/coin-algorand": "^0.10.1-nightly.5",
+    "@ledgerhq/coin-aptos": "^3.3.0-nightly.5",
+    "@ledgerhq/coin-bitcoin": "^0.21.1-nightly.5",
+    "@ledgerhq/coin-canton": "^0.5.0-nightly.6",
+    "@ledgerhq/coin-cardano": "^0.12.1-nightly.5",
+    "@ledgerhq/coin-casper": "^2.1.1-nightly.5",
+    "@ledgerhq/coin-celo": "^1.4.0-nightly.6",
+    "@ledgerhq/coin-cosmos": "^0.17.1-nightly.5",
+    "@ledgerhq/coin-evm": "^2.30.0-nightly.6",
+    "@ledgerhq/coin-filecoin": "^1.11.1-nightly.5",
+    "@ledgerhq/coin-framework": "^6.4.0-nightly.5",
+    "@ledgerhq/coin-hedera": "^1.11.1-nightly.5",
+    "@ledgerhq/coin-icon": "^0.12.1-nightly.5",
+    "@ledgerhq/coin-internet_computer": "^1.8.1-nightly.5",
+    "@ledgerhq/coin-kaspa": "^1.1.0-nightly.6",
+    "@ledgerhq/coin-mina": "^1.2.1-nightly.5",
+    "@ledgerhq/coin-multiversx": "^0.5.1-nightly.5",
+    "@ledgerhq/coin-near": "^0.13.1-nightly.5",
+    "@ledgerhq/coin-polkadot": "^6.10.0-nightly.5",
+    "@ledgerhq/coin-solana": "^0.32.1-nightly.5",
+    "@ledgerhq/coin-stacks": "^0.9.1-nightly.5",
+    "@ledgerhq/coin-stellar": "^6.4.0-nightly.5",
+    "@ledgerhq/coin-sui": "^0.13.0-nightly.7",
+    "@ledgerhq/coin-tezos": "^6.4.0-nightly.5",
+    "@ledgerhq/coin-ton": "^0.14.1-nightly.5",
+    "@ledgerhq/coin-tron": "^5.4.0-nightly.5",
+    "@ledgerhq/coin-vechain": "^2.10.0-nightly.5",
+    "@ledgerhq/coin-xrp": "^7.4.0-nightly.6",
+    "@ledgerhq/crypto-icons-ui": "^1.19.0-nightly.1",
+    "@ledgerhq/cryptoassets": "^13.28.0-nightly.3",
+    "@ledgerhq/device-core": "^0.6.3-nightly.2",
     "@ledgerhq/devices": "8.5.1",
     "@ledgerhq/errors": "^6.25.0",
     "@ledgerhq/hw-app-algorand": "^6.31.6",
     "@ledgerhq/hw-app-aptos": "^6.34.6",
     "@ledgerhq/hw-app-btc": "^10.10.2",
-    "@ledgerhq/hw-app-celo": "^6.34.2",
+    "@ledgerhq/hw-app-celo": "^6.34.3-nightly.2",
     "@ledgerhq/hw-app-cosmos": "^6.32.6",
-    "@ledgerhq/hw-app-eth": "^6.45.17",
-    "@ledgerhq/hw-app-exchange": "^0.13.2",
+    "@ledgerhq/hw-app-eth": "^6.45.18-nightly.2",
+    "@ledgerhq/hw-app-exchange": "^0.13.3-nightly.0",
     "@ledgerhq/hw-app-hedera": "^1.2.6",
     "@ledgerhq/hw-app-icon": "^1.3.6",
+    "@ledgerhq/hw-app-kaspa": "^1.3.0-nightly.0",
     "@ledgerhq/hw-app-multiversx": "^6.25.1",
     "@ledgerhq/hw-app-near": "^6.31.6",
     "@ledgerhq/hw-app-polkadot": "^6.34.6",
@@ -213,27 +216,27 @@
     "@ledgerhq/hw-app-sui": "^1.4.0",
     "@ledgerhq/hw-app-tezos": "^6.31.6",
     "@ledgerhq/hw-app-trx": "^6.31.6",
-    "@ledgerhq/hw-app-vet": "^0.5.15",
+    "@ledgerhq/hw-app-vet": "^0.6.0-nightly.3",
     "@ledgerhq/hw-app-xrp": "^6.32.4",
     "@ledgerhq/hw-transport": "^6.31.10",
     "@ledgerhq/hw-transport-mocker": "^6.29.10",
-    "@ledgerhq/ledger-cal-service": "^1.3.1",
+    "@ledgerhq/ledger-cal-service": "^1.3.2-nightly.1",
     "@ledgerhq/live-config": "^3.2.0",
-    "@ledgerhq/live-countervalues": "^0.7.1-nightly.0",
-    "@ledgerhq/live-countervalues-react": "^0.5.2-nightly.0",
-    "@ledgerhq/live-dmk-shared": "^0.12.3",
-    "@ledgerhq/live-env": "^2.15.0",
+    "@ledgerhq/live-countervalues": "^0.7.1-nightly.5",
+    "@ledgerhq/live-countervalues-react": "^0.5.2-nightly.5",
+    "@ledgerhq/live-dmk-shared": "^0.12.4-nightly.0",
+    "@ledgerhq/live-env": "^2.16.0-nightly.1",
     "@ledgerhq/live-hooks": "0.1.0",
-    "@ledgerhq/live-network": "^2.0.16",
-    "@ledgerhq/live-nft": "^0.8.20-nightly.0",
+    "@ledgerhq/live-network": "^2.0.17-nightly.1",
+    "@ledgerhq/live-nft": "^0.8.20-nightly.5",
     "@ledgerhq/live-promise": "^0.1.1",
-    "@ledgerhq/live-signer-canton": "^0.2.4-nightly.0",
-    "@ledgerhq/live-signer-evm": "^0.7.5-nightly.0",
-    "@ledgerhq/live-signer-solana": "^0.5.5-nightly.0",
-    "@ledgerhq/live-wallet": "^0.13.1-nightly.0",
+    "@ledgerhq/live-signer-canton": "^0.2.4-nightly.6",
+    "@ledgerhq/live-signer-evm": "^0.7.5-nightly.7",
+    "@ledgerhq/live-signer-solana": "^0.5.5-nightly.5",
+    "@ledgerhq/live-wallet": "^0.13.1-nightly.6",
     "@ledgerhq/logs": "^6.13.0",
-    "@ledgerhq/speculos-transport": "^0.2.9",
-    "@ledgerhq/wallet-api-acre-module": "^0.6.0",
+    "@ledgerhq/speculos-transport": "^0.2.10-nightly.1",
+    "@ledgerhq/wallet-api-acre-module": "^0.7.0-nightly.0",
     "@ledgerhq/wallet-api-exchange-module": "^0.16.0"
   },
   "devDependencies": {
@@ -282,10 +285,10 @@
     "undici": "6.19.2",
     "uuid": "^8.3.2",
     "ws": "7",
-    "@ledgerhq/device-react": "^0.2.43",
-    "@ledgerhq/types-cryptoassets": "^7.26.0",
+    "@ledgerhq/device-react": "^0.2.44-nightly.2",
+    "@ledgerhq/types-cryptoassets": "^7.27.0-nightly.0",
     "@ledgerhq/types-devices": "^6.27.0",
-    "@ledgerhq/types-live": "^6.83.0"
+    "@ledgerhq/types-live": "^6.84.0-nightly.1"
   },
   "scripts": {
     "build": "zx ./scripts/build-ts.mjs",

package/src/__tests__/test-helpers/environment.ts

@@ -119,6 +119,7 @@ setSupportedCurrencies([
   "canton_network",
   "canton_network_devnet",
   "canton_network_localnet",
+  "kaspa",
 ]);
 LiveConfig.setConfig(liveConfig);
 

package/src/apps/inlineAppInstall.ts

@@ -9,7 +9,6 @@ import { runAllWithProgress } from "./runner";
 import { InlineAppInstallEvent } from "./types";
 import { mergeMap, map, throttleTime } from "rxjs/operators";
 import { LocalTracer } from "@ledgerhq/logs";
-import { AppStorageType, StorageProvider } from "../device/use-cases/appDataBackup/types";
 
 /**
  * Tries to install a list of apps
@@ -26,13 +25,11 @@ const inlineAppInstall = ({
   appNames,
   onSuccessObs,
   allowPartialDependencies = false,
-  storage,
 }: {
   transport: Transport;
   appNames: string[];
   onSuccessObs?: () => Observable<any>;
   allowPartialDependencies?: boolean;
-  storage?: StorageProvider<AppStorageType>;
 }): Observable<InlineAppInstallEvent | ConnectAppEvent> => {
   const tracer = new LocalTracer("hw", {
     ...transport.getTraceContext(),
@@ -105,7 +102,7 @@ const inlineAppInstall = ({
               installQueue: state.installQueue,
             }),
             maybeSkippedEvent,
-            runAllWithProgress(state, exec, storage).pipe(
+            runAllWithProgress(state, exec).pipe(
               throttleTime(100),
               map(({ globalProgress, itemProgress, installQueue, currentAppOp }) => ({
                 type: "inline-install",

package/src/apps/react.ts

@@ -12,14 +12,12 @@ import {
 import { runAppOp } from "./runner";
 import { App } from "@ledgerhq/types-live";
 import { useFeatureFlags } from "../featureFlags";
-import { AppStorageType, StorageProvider } from "../device/use-cases/appDataBackup/types";
 
 type UseAppsRunnerResult = [State, (arg0: Action) => void];
 // use for React apps. support dynamic change of the state.
 export const useAppsRunner = (
   listResult: ListAppsResult,
   exec: Exec,
-  storage: StorageProvider<AppStorageType>,
   appsToRestore?: string[],
 ): UseAppsRunnerResult => {
   // $FlowFixMe for ledger-live-mobile older react/flow version
@@ -36,7 +34,7 @@ export const useAppsRunner = (
 
   useEffect(() => {
     if (appOp) {
-      const sub = runAppOp({ state, appOp, exec, storage }).subscribe(event => {
+      const sub = runAppOp({ state, appOp, exec }).subscribe(event => {
         dispatch({
           type: "onRunnerEvent",
           event,

package/src/apps/runner.ts

@@ -13,18 +13,15 @@ import type { Exec, State, AppOp, RunnerEvent, Action } from "./types";
 import { reducer, getActionPlan, getNextAppOp } from "./logic";
 import { delay } from "../promise";
 import { getEnv } from "@ledgerhq/live-env";
-import { AppStorageType, StorageProvider } from "../device/use-cases/appDataBackup/types";
 
 export const runAppOp = ({
   state,
   appOp,
   exec,
-  storage,
 }: {
   state: State;
   appOp: AppOp;
   exec: Exec;
-  storage?: StorageProvider<AppStorageType>;
 }): Observable<RunnerEvent> => {
   const { appByName, deviceInfo, deviceModel } = state;
   const app = appByName[appOp.name];
@@ -56,7 +53,6 @@ export const runAppOp = ({
         targetId: deviceInfo.targetId,
         app,
         modelId: deviceModel.id,
-        ...(storage ? { storage } : {}),
         ...(state.skipAppDataBackup ? { skipAppDataBackup: true } : {}),
       }),
     ).pipe(
@@ -99,7 +95,6 @@ type InlineInstallProgress = {
 export const runAllWithProgress = (
   state: State,
   exec: Exec,
-  storage?: StorageProvider<AppStorageType>,
   precision = 100,
 ): Observable<InlineInstallProgress> => {
   const total = state.uninstallQueue.length + state.installQueue.length;
@@ -110,9 +105,7 @@ export const runAllWithProgress = (
     return p;
   }
 
-  return concat(
-    ...getActionPlan(state).map(appOp => runAppOp({ state, appOp, exec, storage })),
-  ).pipe(
+  return concat(...getActionPlan(state).map(appOp => runAppOp({ state, appOp, exec }))).pipe(
     map(event => {
       if (event.type === "runError") {
         throw event.error;

package/src/bridge/crypto-assets/index.test.ts

@@ -2,22 +2,8 @@ import { LiveConfig } from "@ledgerhq/live-config/LiveConfig";
 import { getCryptoAssetsStore, setCryptoAssetsStore } from ".";
 import * as legacy from "@ledgerhq/cryptoassets/tokens";
 import type { CryptoAssetsStore } from "@ledgerhq/types-live";
-import * as calIntegration from "./cal-integration";
 
 describe("Testing CryptoAssetStore", () => {
-  let isCALIntegrationEnabledSpy: jest.SpyInstance;
-  let getCALStoreSpy: jest.SpyInstance;
-
-  beforeEach(() => {
-    isCALIntegrationEnabledSpy = jest
-      .spyOn(calIntegration, "isCALIntegrationEnabled")
-      .mockReturnValue(false);
-    getCALStoreSpy = jest.spyOn(calIntegration, "getCALStore");
-  });
-
-  afterEach(() => {
-    jest.restoreAllMocks();
-  });
   it("should return the default methods from cryptoassets libs when feature flag does not exists", () => {
     LiveConfig.setConfig({
       some_other_feature: {
@@ -82,37 +68,4 @@ describe("Testing CryptoAssetStore", () => {
     const store = getCryptoAssetsStore();
     expect(store).toBe(newStore);
   });
-
-  it("should return CAL store when CAL integration is enabled", () => {
-    isCALIntegrationEnabledSpy.mockReturnValue(true);
-
-    const mockCALStore = {} as unknown as CryptoAssetsStore;
-    getCALStoreSpy.mockReturnValue(mockCALStore);
-
-    const store = getCryptoAssetsStore();
-
-    expect(isCALIntegrationEnabledSpy).toHaveBeenCalled();
-    expect(getCALStoreSpy).toHaveBeenCalled();
-    expect(store).toBe(mockCALStore);
-  });
-
-  it("should prioritize CAL integration over feature flags", () => {
-    isCALIntegrationEnabledSpy.mockReturnValue(true);
-
-    LiveConfig.setConfig({
-      feature_cal_lazy_loading: {
-        type: "boolean",
-        default: true,
-      },
-    });
-
-    const mockCALStore = {} as unknown as CryptoAssetsStore;
-    getCALStoreSpy.mockReturnValue(mockCALStore);
-
-    const store = getCryptoAssetsStore();
-
-    expect(store).toBe(mockCALStore);
-    expect(isCALIntegrationEnabledSpy).toHaveBeenCalled();
-    expect(getCALStoreSpy).toHaveBeenCalled();
-  });
 });

package/src/bridge/crypto-assets/index.ts

@@ -1,7 +1,6 @@
 import { LiveConfig } from "@ledgerhq/live-config/LiveConfig";
 import * as legacy from "@ledgerhq/cryptoassets/tokens";
 import type { CryptoAssetsStore } from "@ledgerhq/types-live";
-import { isCALIntegrationEnabled, getCALStore } from "./cal-integration";
 
 const legacyStore: CryptoAssetsStore = {
   findTokenByAddress: legacy.findTokenByAddress,
@@ -18,10 +17,6 @@ export function setCryptoAssetsStore(store: CryptoAssetsStore) {
 }
 
 export function getCryptoAssetsStore(): CryptoAssetsStore {
-  if (isCALIntegrationEnabled()) {
-    return getCALStore();
-  }
-
   const featureEnabled =
     LiveConfig.isConfigSet() && LiveConfig.getValueByKey("feature_cal_lazy_loading");
   if (!featureEnabled) {

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

@@ -14,9 +14,14 @@ import { genericEstimateMaxSpendable } from "./estimateMaxSpendable";
 import { createTransaction } from "./createTransaction";
 import { genericBroadcast } from "./broadcast";
 import { genericSignOperation } from "./signOperation";
+import type { AlpacaSigner } from "./signer/types";
 
-export function getAlpacaAccountBridge(network: string, kind: string): AccountBridge<any> {
-  const signer = getSigner(network);
+export function getAlpacaAccountBridge(
+  network: string,
+  kind: string,
+  customSigner?: AlpacaSigner,
+): AccountBridge<any> {
+  const signer = customSigner ?? getSigner(network);
   return {
     sync: makeSync({ getAccountShape: genericGetAccountShape(network, kind) }),
     receive: makeAccountBridgeReceive(getAddressWrapper(signer.getAddress)),
@@ -28,5 +33,5 @@ export function getAlpacaAccountBridge(network: string, kind: string): AccountBr
     broadcast: genericBroadcast(network, kind),
     signOperation: genericSignOperation(network, kind)(signer.context),
     getSerializedAddressParameters, // NOTE: check wether it should be exposed by coin-module's api instead?
-  } satisfies Partial<AccountBridge<any>> as AccountBridge<any>;
+  } satisfies Partial<AccountBridge<any>>;
 }

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

@@ -2,37 +2,32 @@ import { createApi as createXrpApi } from "@ledgerhq/coin-xrp/api/index";
 import { createApi as createStellarApi } from "@ledgerhq/coin-stellar/api/index";
 import { createApi as createCantonApi } from "@ledgerhq/coin-canton/api/index";
 import { createApi as createTronApi } from "@ledgerhq/coin-tron/api/index";
+import { createApi as createEvmApi } from "@ledgerhq/coin-evm/api/index";
 import { getCurrencyConfiguration } from "../../../config";
-import { getCryptoCurrencyById } from "@ledgerhq/cryptoassets/currencies";
 import { getNetworkAlpacaApi } from "./network/network-alpaca";
 import { Api } from "@ledgerhq/coin-framework/api/types";
 import { XrpCoinConfig } from "@ledgerhq/coin-xrp/config";
 import { StellarCoinConfig } from "@ledgerhq/coin-stellar/config";
 import { CantonCoinConfig } from "@ledgerhq/coin-canton/config";
 import { TronCoinConfig } from "@ledgerhq/coin-tron/config";
+import { EvmConfigInfo } from "@ledgerhq/coin-evm/config";
+import { findCryptoCurrencyByNetwork } from "../utils";
 
-export function getAlpacaApi(network, kind): Api<any> {
+export function getAlpacaApi(network: string, kind: string): Api<any> {
   if (kind === "local") {
-    switch (network) {
+    const currency = findCryptoCurrencyByNetwork(network);
+    switch (currency?.family) {
       case "xrp":
-        return createXrpApi(
-          getCurrencyConfiguration<XrpCoinConfig>(getCryptoCurrencyById("ripple")),
-        ) as Api<any>; // FIXME: createXrpApi returns a strongly typed Api<XrpSender>, fix Api<any> to allow it
+        return createXrpApi(getCurrencyConfiguration<XrpCoinConfig>(currency)) as Api<any>; // FIXME: createXrpApi returns a strongly typed Api<XrpSender>, fix Api<any> to allow it
       case "stellar":
-        return createStellarApi(
-          getCurrencyConfiguration<StellarCoinConfig>(getCryptoCurrencyById("stellar")),
-        ) as Api<any>;
+        return createStellarApi(getCurrencyConfiguration<StellarCoinConfig>(currency)) as Api<any>;
       case "canton":
-        return createCantonApi(
-          getCurrencyConfiguration<CantonCoinConfig>(
-            getCryptoCurrencyById("canton_network_devnet"),
-          ),
-        ) as Api<any>;
+        return createCantonApi(getCurrencyConfiguration<CantonCoinConfig>(currency)) as Api<any>;
       case "tron":
-        return createTronApi(
-          getCurrencyConfiguration<TronCoinConfig>(getCryptoCurrencyById("tron")),
-        ) as Api<any>;
+        return createTronApi(getCurrencyConfiguration<TronCoinConfig>(currency)) as Api<any>;
+      case "evm":
+        return createEvmApi(getCurrencyConfiguration<EvmConfigInfo>(currency), network) as Api<any>;
     }
   }
-  return getNetworkAlpacaApi(network) satisfies Partial<Api<any>> as Api<any>;
+  return getNetworkAlpacaApi(network) satisfies Partial<Api<any>>;
 }

package/src/bridge/generic-alpaca/alpaca/index.unit.test.ts

@@ -3,6 +3,7 @@ import * as xrpModule from "@ledgerhq/coin-xrp/api/index";
 import * as stellarModule from "@ledgerhq/coin-stellar/api/index";
 import * as cantonModule from "@ledgerhq/coin-canton/api/index";
 import * as tronModule from "@ledgerhq/coin-tron/api/index";
+import * as evmModule from "@ledgerhq/coin-evm/api/index";
 import * as config from "../../../config";
 import * as networkApi from "./network/network-alpaca";
 import * as cryptoAssets from "@ledgerhq/cryptoassets/currencies";
@@ -10,7 +11,7 @@ import * as cryptoAssets from "@ledgerhq/cryptoassets/currencies";
 const mockApiInstance = { mock: "api" };
 
 jest.mock("@ledgerhq/cryptoassets/currencies", () => ({
-  getCryptoCurrencyById: jest.fn(),
+  findCryptoCurrencyById: jest.fn(),
 }));
 
 jest.mock("../../../config", () => ({
@@ -33,18 +34,37 @@ jest.mock("@ledgerhq/coin-tron/api/index", () => ({
   createApi: jest.fn(),
 }));
 
+jest.mock("@ledgerhq/coin-evm/api/index", () => ({
+  createApi: jest.fn(),
+}));
+
 jest.mock("./network/network-alpaca", () => ({
   getNetworkAlpacaApi: jest.fn(),
 }));
 
 describe("getAlpacaApi", () => {
-  const mockCurrency = { id: "mock-currency" };
-
   beforeEach(() => {
     jest.clearAllMocks();
 
     // Common mocks
-    (cryptoAssets.getCryptoCurrencyById as jest.Mock).mockReturnValue(mockCurrency);
+    (cryptoAssets.findCryptoCurrencyById as jest.Mock).mockImplementation(id => {
+      switch (id) {
+        case "ripple":
+          return { family: "xrp" };
+        case "stellar":
+          return { family: "stellar" };
+        case "canton":
+          return { family: "canton" };
+        case "tron":
+          return { family: "tron" };
+        case "ethereum":
+          return { family: "evm" };
+        case "sonic":
+          return { family: "evm" };
+        default:
+          return undefined;
+      }
+    });
     (config.getCurrencyConfiguration as jest.Mock).mockReturnValue({ config: true });
 
     // API mocks
@@ -52,21 +72,29 @@ describe("getAlpacaApi", () => {
     jest.spyOn(stellarModule, "createApi").mockReturnValue(mockApiInstance as any);
     jest.spyOn(cantonModule, "createApi").mockReturnValue(mockApiInstance as any);
     jest.spyOn(tronModule, "createApi").mockReturnValue(mockApiInstance as any);
+    jest.spyOn(evmModule, "createApi").mockReturnValue(mockApiInstance as any);
     jest.spyOn(networkApi, "getNetworkAlpacaApi").mockReturnValue(mockApiInstance as any);
   });
 
   const testCases = [
-    { network: "xrp", module: xrpModule, label: "XRP" },
-    { network: "stellar", module: stellarModule, label: "Stellar" },
-    { network: "tron", module: tronModule, label: "Tron" },
-    { network: "canton", module: cantonModule, label: "Canton" },
+    { network: "xrp", module: xrpModule, label: "XRP", params: [{ config: true }] },
+    { network: "stellar", module: stellarModule, label: "Stellar", params: [{ config: true }] },
+    { network: "tron", module: tronModule, label: "Tron", params: [{ config: true }] },
+    { network: "canton", module: cantonModule, label: "Canton", params: [{ config: true }] },
+    {
+      network: "ethereum",
+      module: evmModule,
+      label: "Ethereum",
+      params: [{ config: true }, "ethereum"],
+    },
+    { network: "sonic", module: evmModule, label: "Sonic", params: [{ config: true }, "sonic"] },
   ];
 
-  testCases.forEach(({ network, module, label }) => {
+  testCases.forEach(({ network, module, label, params }) => {
     it(`should return ${label} API for network "${network}" and kind "local"`, () => {
       const result = getAlpacaApi(network, "local");
       expect(result).toEqual(mockApiInstance);
-      expect(module.createApi).toHaveBeenCalledWith({ config: true });
+      expect(module.createApi).toHaveBeenCalledWith(...params);
     });
   });
 

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

@@ -13,6 +13,7 @@ import type {
   Page,
   Stake,
   Reward,
+  CraftedTransaction,
 } from "@ledgerhq/coin-framework/api/index";
 import network from "@ledgerhq/live-network";
 
@@ -160,8 +161,8 @@ const buildLastBlock = networkFamily =>
   };
 
 const buildCraftTransaction = networkFamily =>
-  async function craftTransaction(intent: TransactionIntent<any>): Promise<string> {
-    const { data } = await network<any, unknown>({
+  async function craftTransaction(intent: TransactionIntent<any>): Promise<CraftedTransaction> {
+    const { data } = await network<CraftedTransaction, unknown>({
       method: "POST",
       url: `${ALPACA_URL}/${networkFamily}/transaction/encode`,
       data: {
@@ -171,7 +172,7 @@ const buildCraftTransaction = networkFamily =>
         },
       },
     });
-    return data.rawTransaction;
+    return data;
   };
 
 export const getNetworkAlpacaApi = (networkFamily: string) =>

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/signOperation.ts

@@ -123,7 +123,7 @@ export const genericSignOperation =
           transactionIntent.sequence = sequenceNumber;
 
           /* Craft unsigned blob via Alpaca */
-          const unsigned: string = await getAlpacaApi(network, kind).craftTransaction(
+          const { transaction: unsigned } = await getAlpacaApi(network, kind).craftTransaction(
             transactionIntent,
             { value: fees },
           );