🎨 (signer-utils): Moved ApplicationChecker into SignerUtils

Author: fAnselmi-Ledger

.changeset/lazy-showers-cut.md

@@ -0,0 +1,7 @@
+---
+"@ledgerhq/device-signer-kit-solana": patch
+"@ledgerhq/signer-utils": patch
+"@ledgerhq/device-signer-kit-ethereum": patch
+---
+
+Moved ApplicationChecker into SignerUtils

packages/signer/signer-eth/src/internal/app-binder/device-action/SignTransaction/SignTransactionDeviceAction.ts

@@ -10,6 +10,10 @@ import {
   UserInteractionRequired,
   XStateDeviceAction,
 } from "@ledgerhq/device-management-kit";
+import {
+  ApplicationChecker,
+  ApplicationCheckerSupportedAppNames,
+} from "@ledgerhq/signer-utils";
 import { Left, Right } from "purify-ts";
 import { and, assign, fromPromise, setup } from "xstate";
 
@@ -52,7 +56,6 @@ import {
   type ProvideTransactionContextsTaskResult,
 } from "@internal/app-binder/task/ProvideTransactionContextsTask";
 import { SendSignTransactionTask } from "@internal/app-binder/task/SendSignTransactionTask";
-import { ApplicationChecker } from "@internal/shared/utils/ApplicationChecker";
 
 export type MachineDependencies = {
   readonly getAddress: (arg0: {
@@ -146,6 +149,7 @@ export class SignTransactionDeviceAction extends XStateDeviceAction<
           new ApplicationChecker(
             internalApi.getDeviceSessionState(),
             context._internalState.appConfig!,
+            ApplicationCheckerSupportedAppNames.Ethereum,
           )
             .withMinVersionExclusive("1.15.0")
             .excludeDeviceModel(DeviceModelId.NANO_S)

packages/signer/signer-eth/src/internal/app-binder/device-action/SignTypedData/SignTypedDataDeviceAction.ts

@@ -11,6 +11,10 @@ import {
   UserInteractionRequired,
   XStateDeviceAction,
 } from "@ledgerhq/device-management-kit";
+import {
+  ApplicationChecker,
+  ApplicationCheckerSupportedAppNames,
+} from "@ledgerhq/signer-utils";
 import { Left, Nothing, Right } from "purify-ts";
 import { and, assign, fromPromise, setup } from "xstate";
 
@@ -44,7 +48,6 @@ import {
   type ProvideEIP712ContextTaskReturnType,
 } from "@internal/app-binder/task/ProvideEIP712ContextTask";
 import { SignTypedDataLegacyTask } from "@internal/app-binder/task/SignTypedDataLegacyTask";
-import { ApplicationChecker } from "@internal/shared/utils/ApplicationChecker";
 import { type TransactionMapperService } from "@internal/transaction/service/mapper/TransactionMapperService";
 import { type TransactionParserService } from "@internal/transaction/service/parser/TransactionParserService";
 import { type TypedDataParserService } from "@internal/typed-data/service/TypedDataParserService";
@@ -152,6 +155,7 @@ export class SignTypedDataDeviceAction extends XStateDeviceAction<
           new ApplicationChecker(
             internalApi.getDeviceSessionState(),
             context._internalState.appConfig!,
+            ApplicationCheckerSupportedAppNames.Ethereum,
           )
             .withMinVersionExclusive("1.15.0")
             .excludeDeviceModel(DeviceModelId.NANO_S)

packages/signer/signer-eth/src/internal/app-binder/task/BuildBaseContexts.ts

@@ -11,12 +11,15 @@ import {
   type InternalApi,
   isSuccessCommandResult,
 } from "@ledgerhq/device-management-kit";
+import {
+  ApplicationChecker,
+  ApplicationCheckerSupportedAppNames,
+} from "@ledgerhq/signer-utils";
 
 import { type GetConfigCommandResponse } from "@api/app-binder/GetConfigCommandTypes";
 import { ClearSigningType } from "@api/model/ClearSigningType";
 import { type TransactionOptions } from "@api/model/TransactionOptions";
 import { GetChallengeCommand } from "@internal/app-binder/command/GetChallengeCommand";
-import { ApplicationChecker } from "@internal/shared/utils/ApplicationChecker";
 
 export const NESTED_CALLDATA_CONTEXT_TYPES_FILTER: ClearSignContextType[] = [
   ClearSignContextType.TRANSACTION_INFO,
@@ -220,7 +223,11 @@ export class BuildBaseContexts {
     deviceState: DeviceSessionState,
     appConfig: GetConfigCommandResponse,
   ): boolean {
-    return new ApplicationChecker(deviceState, appConfig)
+    return new ApplicationChecker(
+      deviceState,
+      appConfig,
+      ApplicationCheckerSupportedAppNames.Ethereum,
+    )
       .withMinVersionExclusive("1.14.0")
       .excludeDeviceModel(DeviceModelId.NANO_S)
       .check();

packages/signer/signer-eth/src/internal/app-binder/task/BuildEIP712ContextTask.ts

@@ -11,6 +11,10 @@ import {
   type InternalApi,
   isSuccessCommandResult,
 } from "@ledgerhq/device-management-kit";
+import {
+  ApplicationChecker,
+  ApplicationCheckerSupportedAppNames,
+} from "@ledgerhq/signer-utils";
 import { Just, type Maybe, Nothing } from "purify-ts";
 
 import { type GetConfigCommandResponse } from "@api/app-binder/GetConfigCommandTypes";
@@ -23,7 +27,6 @@ import {
   type ContextWithSubContexts,
 } from "@internal/app-binder/task/BuildFullContextsTask";
 import { type ProvideEIP712ContextTaskArgs } from "@internal/app-binder/task/ProvideEIP712ContextTask";
-import { ApplicationChecker } from "@internal/shared/utils/ApplicationChecker";
 import { type TransactionMapperService } from "@internal/transaction/service/mapper/TransactionMapperService";
 import { type TransactionParserService } from "@internal/transaction/service/parser/TransactionParserService";
 import { TypedDataValueField } from "@internal/typed-data/model/Types";
@@ -147,7 +150,11 @@ export class BuildEIP712ContextTask {
     deviceState: DeviceSessionState,
   ): Maybe<"v1" | "v2"> {
     if (
-      !new ApplicationChecker(deviceState, this.appConfig)
+      !new ApplicationChecker(
+        deviceState,
+        this.appConfig,
+        ApplicationCheckerSupportedAppNames.Ethereum,
+      )
         .withMinVersionInclusive("1.10.0")
         .excludeDeviceModel(DeviceModelId.NANO_S)
         .check()
@@ -166,6 +173,7 @@ export class BuildEIP712ContextTask {
     const shouldUseV2Filters = new ApplicationChecker(
       deviceState,
       this.appConfig,
+      ApplicationCheckerSupportedAppNames.Ethereum,
     )
       .withMinVersionInclusive("1.12.0")
       .check();

packages/signer/signer-eth/src/internal/shared/utils/ApplicationChecker.ts

@@ -11,6 +11,10 @@ import {
   UserInteractionRequired,
   XStateDeviceAction,
 } from "@ledgerhq/device-management-kit";
+import {
+  ApplicationChecker,
+  ApplicationCheckerSupportedAppNames,
+} from "@ledgerhq/signer-utils";
 import { Left, type Maybe, Right } from "purify-ts";
 import { assign, fromPromise, setup } from "xstate";
 
@@ -28,7 +32,6 @@ import { type TransactionResolutionContext } from "@api/model/TransactionResolut
 import { GetAppConfigurationCommand } from "@internal/app-binder/command/GetAppConfigurationCommand";
 import { SignTransactionCommand } from "@internal/app-binder/command/SignTransactionCommand";
 import { type SolanaAppErrorCodes } from "@internal/app-binder/command/utils/SolanaApplicationErrors";
-import { ApplicationChecker } from "@internal/app-binder/services/ApplicationChecker";
 import {
   SolanaTransactionTypes,
   TransactionInspector,
@@ -142,6 +145,7 @@ export class SignTransactionDeviceAction extends XStateDeviceAction<
           new ApplicationChecker(
             internalApi.getDeviceSessionState(),
             context._internalState.appConfig!,
+            ApplicationCheckerSupportedAppNames.Solana,
           )
             .withMinVersionExclusive("1.4.0")
             .excludeDeviceModel(DeviceModelId.NANO_S)