@ledgerhq/live-common 34.40.0-nightly.3 → 34.40.0

package/src/exchange/swap/setBroadcastTransaction.ts

@@ -11,15 +11,13 @@ export const setBroadcastTransaction = ({
   targetCurrencyId,
   hardwareWalletType,
   swapType,
-  swapAppVersion,
 }: {
-  result: { operation: Operation | string; swapId: string };
+  result: { operation: Operation; swapId: string };
   provider: string;
   sourceCurrencyId?: string;
   targetCurrencyId?: string;
   hardwareWalletType?: DeviceModelId;
   swapType?: TradeMethod;
-  swapAppVersion?: string;
 }) => {
   const { operation, swapId } = result;
 
@@ -38,18 +36,16 @@ export const setBroadcastTransaction = ({
       targetCurrencyId,
       hardwareWalletType,
       swapType: swapType,
-      swapAppVersion,
     });
   } else {
     postSwapAccepted({
       provider,
       swapId,
-      transactionId: typeof operation === "string" ? operation : operation.hash,
+      transactionId: operation.hash,
       sourceCurrencyId,
       targetCurrencyId,
       hardwareWalletType,
       swapType,
-      swapAppVersion,
     });
   }
 };

package/src/exchange/swap/types.ts

@@ -4,7 +4,6 @@ import { Account, AccountLike, AccountRaw, AccountRawLike, Operation } from "@le
 import { BigNumber } from "bignumber.js";
 import { Result as UseBridgeTransactionResult } from "../../bridge/useBridgeTransaction";
 import { Transaction, TransactionRaw } from "../../generated/types";
-
 export type { SwapLiveError } from "@ledgerhq/wallet-api-exchange-module";
 
 export type ExchangeSwap = {
@@ -199,7 +198,6 @@ type SwapStateRequest = {
   targetCurrencyId: string;
   hardwareWalletType: DeviceModelId;
   swapType: TradeMethod;
-  swapAppVersion?: string;
 }>;
 
 export type SwapStateAcceptedRequest = SwapStateRequest & {
@@ -338,65 +336,3 @@ export type SwapTransactionType = UseBridgeTransactionResult & {
   fromAmountError?: Error;
   fromAmountWarning?: Error;
 };
-
-export type SwapPayloadRequestData = {
-  provider: string;
-  deviceTransactionId: string;
-  fromAccountAddress: string;
-  toAccountAddress: string;
-  fromAccountCurrency: string;
-  toAccountCurrency: string;
-  amount: string;
-  amountInAtomicUnit: number;
-  quoteId?: string;
-  toNewTokenId?: string;
-};
-export type SwapPayloadResponse = {
-  binaryPayload: string;
-  signature: string;
-  payinAddress: string;
-  swapId: string;
-  payinExtraId?: string;
-  extraTransactionParameters?: string;
-};
-
-export type ConfirmSwapRequest = {
-  provider: string;
-  swapId: string;
-  transactionId: string;
-  sourceCurrencyId?: string;
-  targetCurrencyId?: string;
-  hardwareWalletType?: string;
-};
-
-export type CancelSwapRequest = {
-  provider: string;
-  swapId: string;
-  statusCode?: string;
-  errorMessage?: string;
-  sourceCurrencyId?: string;
-  targetCurrencyId?: string;
-  hardwareWalletType?: string;
-  swapType?: string;
-  swapStep?: string;
-};
-
-export type SwapBackendResponse = {
-  provider: string;
-  swapId: string;
-  apiExtraFee: number;
-  apiFee: number;
-  refundAddress: string;
-  amountExpectedFrom: number;
-  amountExpectedTo: number;
-  status: string;
-  from: string;
-  to: string;
-  payinAddress: string;
-  payoutAddress: string;
-  createdAt: string; // ISO-8601
-  binaryPayload: string;
-  signature: string;
-  payinExtraId?: string;
-  extraTransactionParameters?: string;
-};

package/src/featureFlags/defaultFeatures.ts

@@ -153,7 +153,6 @@ export const DEFAULT_FEATURES: Features = {
   protectServicesDesktop: {
     enabled: false,
     params: {
-      openWithDevTools: false,
       availableOnDesktop: false,
       isNew: false,
       ledgerliveStorageState: false,

package/src/hw/connectManager.ts

@@ -64,6 +64,20 @@ const cmd = (transport: Transport, { request }: Input): Observable<ConnectManage
             throw new DeviceNotOnboarded();
           }
 
+          if (deviceInfo.isBootloader) {
+            return of({
+              type: "bootloader",
+              deviceInfo,
+            } as ConnectManagerEvent);
+          }
+
+          if (deviceInfo.isOSU) {
+            return of({
+              type: "osu",
+              deviceInfo,
+            } as ConnectManagerEvent);
+          }
+
           if (
             isCharonSupported(
               deviceInfo.seVersion ?? "",
@@ -79,20 +93,6 @@ const cmd = (transport: Transport, { request }: Input): Observable<ConnectManage
             }
           }
 
-          if (deviceInfo.isBootloader) {
-            return of({
-              type: "bootloader",
-              deviceInfo,
-            } as ConnectManagerEvent);
-          }
-
-          if (deviceInfo.isOSU) {
-            return of({
-              type: "osu",
-              deviceInfo,
-            } as ConnectManagerEvent);
-          }
-
           return concat(
             of({
               type: "listingApps",

package/src/hw/getOnboardingStatePolling.test.ts

@@ -13,6 +13,7 @@ import { withDevice } from "./deviceAccess";
 import { getVersion } from "../device/use-cases/getVersionUseCase";
 import { extractOnboardingState, OnboardingState, OnboardingStep } from "./extractOnboardingState";
 import { SeedPhraseType } from "@ledgerhq/types-live";
+import { DeviceDisconnectedWhileSendingError } from "@ledgerhq/device-management-kit";
 
 jest.mock("./deviceAccess");
 jest.mock("../device/use-cases/getVersionUseCase");
@@ -95,6 +96,34 @@ describe("getOnboardingStatePolling", () => {
         // The timeout is equal to pollingPeriodMs by default
         jest.advanceTimersByTime(pollingPeriodMs - 1);
       });
+
+      it("should update the onboarding state to null and keep track of the allowed DMK error", done => {
+        mockedGetVersion.mockRejectedValue(
+          new DeviceDisconnectedWhileSendingError("An allowed error"),
+        );
+        mockedExtractOnboardingState.mockReturnValue(anOnboardingState);
+
+        const device = aDevice;
+
+        getOnboardingStatePolling({
+          deviceId: device.deviceId,
+          pollingPeriodMs,
+        }).subscribe({
+          next: value => {
+            try {
+              expect(value.onboardingState).toBeNull();
+              expect(value.allowedError).toBeInstanceOf(DeviceDisconnectedWhileSendingError);
+              expect(value.lockedDevice).toBe(false);
+              done();
+            } catch (expectError) {
+              done(expectError);
+            }
+          },
+        });
+
+        // The timeout is equal to pollingPeriodMs by default
+        jest.advanceTimersByTime(pollingPeriodMs - 1);
+      });
     });
 
     describe("and when the error is due to a locked device", () => {

package/src/hw/getOnboardingStatePolling.ts

@@ -16,6 +16,7 @@ import {
 } from "@ledgerhq/errors";
 import { FirmwareInfo } from "@ledgerhq/types-live";
 import { extractOnboardingState, OnboardingState } from "./extractOnboardingState";
+import { DeviceDisconnectedWhileSendingError } from "@ledgerhq/device-management-kit";
 
 export type OnboardingStatePollingResult = {
   onboardingState: OnboardingState | null;
@@ -143,6 +144,7 @@ export const isAllowedOnboardingStatePollingError = (error: unknown): boolean =>
       error instanceof TransportExchangeTimeoutError ||
       error instanceof DisconnectedDevice ||
       error instanceof DisconnectedDeviceDuringOperation ||
+      error instanceof DeviceDisconnectedWhileSendingError ||
       error instanceof CantOpenDevice ||
       error instanceof TransportRaceCondition ||
       error instanceof TransportStatusError ||

package/src/wallet-api/Exchange/server.test.ts

@@ -1,14 +1,14 @@
-import { RpcRequest } from "@ledgerhq/wallet-api-core";
+import { handlers } from "./server";
+import { AppBranch, AppPlatform, Visibility } from "../types";
+import { of } from "rxjs";
 import {
   ExchangeStartParams,
   ExchangeStartSellParams,
   ExchangeStartSwapParams,
 } from "@ledgerhq/wallet-api-exchange-module";
-import { WalletContext, WalletHandlers } from "@ledgerhq/wallet-api-server";
-import { of } from "rxjs";
+import { RpcRequest } from "@ledgerhq/wallet-api-core";
 import { genAccount } from "../../mock/account";
-import { AppBranch, AppPlatform, Visibility } from "../types";
-import { handlers } from "./server";
+import { WalletContext, WalletHandlers } from "@ledgerhq/wallet-api-server";
 
 const mockTracking = {
   startExchangeRequested: jest.fn(),
@@ -46,7 +46,6 @@ const testAppManifest = {
 
 const mockUiStartExchange = jest.fn();
 const mockUiCompleteExchange = jest.fn();
-const mockUiSwap = jest.fn();
 const mockUiError = jest.fn();
 const mockIsReady = jest.fn();
 
@@ -55,7 +54,6 @@ const mockUiHooks = {
   "custom.exchange.complete": mockUiCompleteExchange,
   "custom.exchange.error": mockUiError,
   "custom.isReady": mockIsReady,
-  "custom.exchange.swap": mockUiSwap,
 };
 
 // Mock converter id to send back the id received in params.