feat: add dependencies support on wallet-api and dapp browser for tra…

…nsaction

Also bump the wallet-api to add dependencies option

.changeset/brave-laws-begin.md

@@ -0,0 +1,7 @@
+---
+"ledger-live-desktop": minor
+"live-mobile": minor
+"@ledgerhq/live-common": minor
+---
+
+feat: add dependencies support on wallet-api and dapp browser for transaction

.changeset/mighty-pillows-battle.md

@@ -0,0 +1,5 @@
+---
+"@ledgerhq/wallet-api-exchange-module": patch
+---
+
+chore: bump wallet-api deps

apps/ledger-live-desktop/src/renderer/components/Web3AppWebview/WalletAPIWebview.tsx

@@ -121,6 +121,7 @@ function useUiHook(manifest: AppManifest, tracking: Record<string, TrackFunction
             stepId: canEditFees && !hasFeesProvided ? "amount" : "summary",
             transactionData: liveTx,
             useApp: options?.hwAppId,
+            dependencies: options?.dependencies,
             account,
             parentAccount,
             onResult: onSuccess,

apps/ledger-live-desktop/src/renderer/modals/SignTransaction/Body.tsx

@@ -30,6 +30,7 @@ export type Params = {
   canEditFees: boolean;
   stepId?: StepId;
   useApp?: string;
+  dependencies?: string[];
   account: AccountLike;
   transactionData: Partial<Transaction>;
   onResult: (signedOperation: SignedOperation) => void;
@@ -223,6 +224,7 @@ export default function Body({ onChangeStepId, onClose, setError, stepId, params
     manifestId: params.manifestId,
     manifestName: params.manifestName,
     useApp: params.useApp,
+    dependencies: params.dependencies,
     steps,
     errorSteps,
     device,

apps/ledger-live-desktop/src/renderer/modals/SignTransaction/steps/StepConnectDevice.tsx

@@ -1,22 +1,43 @@
-import React from "react";
+import React, { useMemo } from "react";
 import TrackPage from "~/renderer/analytics/TrackPage";
 import { getMainAccount } from "@ledgerhq/live-common/account/index";
 import GenericStepConnectDevice from "./GenericStepConnectDevice";
 import { StepProps } from "../types";
+
+function dependenciesToAppRequests(dependencies?: string[]) {
+  if (!dependencies) {
+    return;
+  }
+
+  return dependencies.map(appName => ({ appName }));
+}
+
 export default function StepConnectDevice({
   account,
   parentAccount,
   transaction,
   status,
   transitionTo,
   useApp,
+  dependencies,
   onTransactionError,
   onTransactionSigned,
   manifestId,
   manifestName,
 }: StepProps) {
-  // Nb setting the mainAccount as a dependency will ensure latest versions of plugins.
-  const dependencies = (account && [getMainAccount(account, parentAccount)]) || [];
+  const connectDependencies = useMemo(() => {
+    const appRequests = dependenciesToAppRequests(dependencies);
+
+    if (account) {
+      // Nb setting the mainAccount as a dependency will ensure latest versions of plugins.
+      return [
+        { currency: getMainAccount(account, parentAccount).currency },
+        ...(appRequests || []),
+      ];
+    }
+    return appRequests;
+  }, [account, dependencies, parentAccount]);
+
   return (
     <>
       <TrackPage category="Sign Transaction Flow" name="Step ConnectDevice" />
@@ -29,7 +50,7 @@ export default function StepConnectDevice({
         transitionTo={transitionTo}
         onTransactionError={onTransactionError}
         onTransactionSigned={onTransactionSigned}
-        dependencies={dependencies}
+        dependencies={connectDependencies}
         manifestId={manifestId}
         manifestName={manifestName}
         requireLatestFirmware

apps/ledger-live-desktop/src/renderer/modals/SignTransaction/types.ts

@@ -10,6 +10,7 @@ export type StepProps = {
   transitionTo: (a: string) => void;
   openedFromAccount: boolean;
   useApp?: string;
+  dependencies?: string[];
   device: Device | undefined | null;
   account: AccountLike | undefined | null;
   parentAccount: Account | undefined | null;

apps/ledger-live-mobile/src/components/RootNavigator/types/SignTransactionNavigator.ts

@@ -52,6 +52,7 @@ export type SignTransactionNavigatorParamList = {
     overrideAmountLabel?: string;
     hideTotal?: boolean;
     appName?: string;
+    dependencies?: string[];
     currentNavigation:
       | ScreenName.SignTransactionSummary
       | ScreenName.SendSummary
@@ -69,6 +70,7 @@ export type SignTransactionNavigatorParamList = {
     transaction: Transaction;
     status: TransactionStatus;
     appName?: string;
+    dependencies?: string[];
     onSuccess: (payload: unknown) => void;
     onError: (_: Error) => void;
     analyticsPropertyFlow?: string;

apps/ledger-live-mobile/src/components/Web3AppWebview/helpers.ts

@@ -402,6 +402,7 @@ function useUiHook(): UiHook {
             accountId: account.id,
             parentId: parentAccount ? parentAccount.id : undefined,
             appName: options?.hwAppId,
+            dependencies: options?.dependencies,
             onSuccess: ({
               signedOperation,
               transactionSignError,

apps/ledger-live-mobile/src/screens/SignTransaction/02-ConnectDevice.tsx

@@ -16,6 +16,14 @@ import { ScreenName } from "~/const";
 import { StackNavigatorProps } from "~/components/RootNavigator/types/helpers";
 import { useTransactionDeviceAction } from "~/hooks/deviceActions";
 
+function dependenciesToAppRequests(dependencies?: string[]) {
+  if (!dependencies) {
+    return [];
+  }
+
+  return dependencies.map(appName => ({ appName }));
+}
+
 function ConnectDevice({
   navigation,
   route,
@@ -27,7 +35,7 @@ function ConnectDevice({
   const { colors } = useTheme();
   const { account, parentAccount } = useSelector(accountScreenSelector(route));
   invariant(account, "account is required");
-  const { appName, onSuccess } = route.params;
+  const { appName, dependencies, onSuccess } = route.params;
   const mainAccount = getMainAccount(account, parentAccount);
   const { transaction, status } = useBridgeTransaction(() => ({
     account: mainAccount,
@@ -46,10 +54,22 @@ function ConnectDevice({
       transaction,
       status,
       tokenCurrency,
-      dependencies: [mainAccount],
+      dependencies: [
+        { currency: mainAccount.currency },
+        ...dependenciesToAppRequests(dependencies),
+      ],
       requireLatestFirmware: true,
     }),
-    [account, appName, mainAccount, parentAccount, status, tokenCurrency, transaction],
+    [
+      account,
+      appName,
+      dependencies,
+      mainAccount,
+      parentAccount,
+      status,
+      tokenCurrency,
+      transaction,
+    ],
   );
   return transaction ? (
     <SafeAreaView

libs/exchange-module/package.json

@@ -33,8 +33,8 @@
     "lint:fix": "pnpm lint --fix"
   },
   "dependencies": {
-    "@ledgerhq/wallet-api-client": "^1.5.9",
-    "@ledgerhq/wallet-api-core": "^1.10.1"
+    "@ledgerhq/wallet-api-client": "^1.5.10",
+    "@ledgerhq/wallet-api-core": "^1.11.0"
   },
   "devDependencies": {
     "@types/node": "^20.2.5"

libs/ledger-live-common/package.json

@@ -184,10 +184,10 @@
     "@ledgerhq/live-wallet": "workspace:^",
     "@ledgerhq/logs": "workspace:^",
     "@ledgerhq/speculos-transport": "workspace:^",
-    "@ledgerhq/wallet-api-client": "^1.5.9",
-    "@ledgerhq/wallet-api-core": "^1.10.1",
+    "@ledgerhq/wallet-api-client": "^1.5.10",
+    "@ledgerhq/wallet-api-core": "^1.11.0",
     "@ledgerhq/wallet-api-exchange-module": "workspace:^",
-    "@ledgerhq/wallet-api-server": "^1.5.10",
+    "@ledgerhq/wallet-api-server": "^1.5.11",
     "@stacks/network": "6.10.0",
     "@stacks/transactions": "6.11.0",
     "@stricahq/typhonjs": "^2.0.0",
@@ -301,4 +301,4 @@
     "uuid": "^8.3.2",
     "ws": "7"
   }
-}
+}

libs/ledger-live-common/src/hw/actions/app.ts

@@ -371,12 +371,17 @@ const reducer = (state: State, e: Event): State => {
  * specify an account or a currency without resolving manually the actual
  * applications we depend on in order to access the flow.
  */
-function inferCommandParams(appRequest: AppRequest) {
+function inferCommandParams(appRequest: AppRequest): ConnectAppRequest {
   let derivationMode;
   let derivationPath;
 
-  const { account, requireLatestFirmware, allowPartialDependencies } = appRequest;
-  let { appName, currency, dependencies } = appRequest;
+  const {
+    account,
+    requireLatestFirmware,
+    allowPartialDependencies = false,
+    dependencies: appDependencies,
+  } = appRequest;
+  let { appName, currency } = appRequest;
 
   if (!currency && account) {
     currency = account.currency;
@@ -388,8 +393,9 @@ function inferCommandParams(appRequest: AppRequest) {
 
   invariant(appName, "appName or currency or account is missing");
 
-  if (dependencies) {
-    dependencies = dependencies.map(d => inferCommandParams(d).appName);
+  let dependencies: string[] | undefined = undefined;
+  if (appDependencies) {
+    dependencies = appDependencies.map(d => inferCommandParams(d).appName);
   }
 
   if (!currency) {
@@ -450,7 +456,7 @@ export const createAction = (
     const firmwareResolvedRef = useRef(false);
     const outdatedAppRef = useRef<AppAndVersion>();
 
-    const request: ConnectAppRequest = useMemo(
+    const request = useMemo(
       () => inferCommandParams(appRequest), // for now i don't have better
       // eslint-disable-next-line react-hooks/exhaustive-deps
       [

libs/ledger-live-common/src/platform/types.ts

@@ -103,6 +103,7 @@ export type LiveAppManifestDapp = {
   provider: DappProviders;
   networks: Array<LiveAppManifestParamsNetwork>;
   nanoApp: string;
+  dependencies?: string[];
 };
 
 export type LiveAppManifest = {

libs/ledger-live-common/src/wallet-api/useDappLogic.ts

@@ -189,6 +189,7 @@ export function useDappLogic({
   currentAccountHistDb?: CurrentAccountHistDB;
 }) {
   const nanoApp = manifest.dapp?.nanoApp;
+  const dependencies = manifest.dapp?.dependencies;
   const ws = useRef<SmartWebsocket>();
   const { currentAccount, currentParentAccount, setCurrentAccountHist } = useDappAccountLogic({
     manifest,
@@ -427,7 +428,9 @@ export function useDappLogic({
 
           if (address.toLowerCase() === ethTX.from.toLowerCase()) {
             try {
-              const options = nanoApp ? { hwAppId: nanoApp } : undefined;
+              const options = nanoApp
+                ? { hwAppId: nanoApp, dependencies: dependencies }
+                : undefined;
               tracking.dappSendTransactionRequested(manifest);
 
               const signFlowInfos = getWalletAPITransactionSignFlowInfos({