@onekeyfe/hd-core 1.2.0-alpha.45 → 1.2.0-alpha.46

package/dist/utils/pro2Nft.d.ts

@@ -3,8 +3,8 @@ export declare const PRO2_NFT_IMAGE_HEIGHT = 540;
 export declare const PRO2_NFT_THUMBNAIL_WIDTH = 263;
 export declare const PRO2_NFT_THUMBNAIL_HEIGHT = 263;
 export declare const PRO2_NFT_DIRECTORY = "vol1:/nft";
-export declare const PRO2_NFT_DEFAULT_CHUNK_SIZE = 512;
-export declare const PRO2_NFT_DEFAULT_PACE_MS = 20;
+export declare const PRO2_NFT_DEFAULT_CHUNK_SIZE = 2048;
+export declare const PRO2_NFT_DEFAULT_PACE_MS = 0;
 export declare const PRO2_NFT_DEFAULT_TIMEOUT_MS = 15000;
 export declare const PRO2_NFT_MIN_CHUNK_SIZE = 64;
 export declare const PRO2_NFT_MAX_CHUNK_SIZE = 2048;

package/dist/utils/pro2Nft.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pro2Nft.d.ts","sourceRoot":"","sources":["../../src/utils/pro2Nft.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,oBAAoB,MAAM,CAAC;AACxC,eAAO,MAAM,qBAAqB,MAAM,CAAC;AACzC,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAC5C,eAAO,MAAM,yBAAyB,MAAM,CAAC;AAC7C,eAAO,MAAM,kBAAkB,cAAc,CAAC;AAC9C,eAAO,MAAM,2BAA2B,MAAM,CAAC;AAC/C,eAAO,MAAM,wBAAwB,KAAK,CAAC;AAC3C,eAAO,MAAM,2BAA2B,QAAS,CAAC;AAClD,eAAO,MAAM,uBAAuB,KAAK,CAAC;AAC1C,eAAO,MAAM,uBAAuB,OAAO,CAAC;AAC5C,eAAO,MAAM,kBAAkB,KAAK,CAAC;AAErC,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,UAAU,GAAG,WAAW,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,UAAU,CAAC;IACtB,QAAQ,EAAE,UAAU,CAAC;CACtB,CAAC;AAiCF,wBAAgB,2BAA2B,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAiB5E;AAsBD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAC1C,KAAK,EAAE,YAAY,CAAC;IACpB,SAAS,EAAE,YAAY,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB,GAAG,aAAa,CAkChB"}
+{"version":3,"file":"pro2Nft.d.ts","sourceRoot":"","sources":["../../src/utils/pro2Nft.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,oBAAoB,MAAM,CAAC;AACxC,eAAO,MAAM,qBAAqB,MAAM,CAAC;AACzC,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAC5C,eAAO,MAAM,yBAAyB,MAAM,CAAC;AAC7C,eAAO,MAAM,kBAAkB,cAAc,CAAC;AAC9C,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAChD,eAAO,MAAM,wBAAwB,IAAI,CAAC;AAC1C,eAAO,MAAM,2BAA2B,QAAS,CAAC;AAClD,eAAO,MAAM,uBAAuB,KAAK,CAAC;AAC1C,eAAO,MAAM,uBAAuB,OAAO,CAAC;AAC5C,eAAO,MAAM,kBAAkB,KAAK,CAAC;AAErC,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,UAAU,GAAG,WAAW,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,UAAU,CAAC;IACtB,QAAQ,EAAE,UAAU,CAAC;CACtB,CAAC;AAiCF,wBAAgB,2BAA2B,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAiB5E;AAsBD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAC1C,KAAK,EAAE,YAAY,CAAC;IACpB,SAAS,EAAE,YAAY,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB,GAAG,aAAa,CAkChB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.2.0-alpha.45",
+  "version": "1.2.0-alpha.46",
   "description": "Core processes and APIs for communicating with OneKey hardware devices.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.0-alpha.45",
-    "@onekeyfe/hd-transport": "1.2.0-alpha.45",
+    "@onekeyfe/hd-shared": "1.2.0-alpha.46",
+    "@onekeyfe/hd-transport": "1.2.0-alpha.46",
     "axios": "1.15.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -44,5 +44,5 @@
     "@types/w3c-web-usb": "^1.0.10",
     "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "8fc6c0d642bfaa268d23a2aa2a98e235d1a876f6"
+  "gitHead": "23bc93ba87e4f8557380c636b308aea06f569ae2"
 }

package/src/api/FirmwareUpdateV4.ts

@@ -45,7 +45,6 @@ import type { TypedResponseMessage } from '../device/DeviceCommands';
 import type {
   Features,
   IFirmwareReleaseInfo,
-  IProtocolV2BootResources,
   IProtocolV2FirmwareComponent,
   IProtocolV2Resource,
   IVersionArray,
@@ -75,7 +74,6 @@ const PROTOCOL_V2_OKPP_HEADER_SIZE = 0x52a0;
 const PROTOCOL_V2_OKPP_PAYLOAD_HASH_OFFSET = 0x200;
 const PROTOCOL_V2_OKPP_HEADER_HASH_OFFSET = 0x240;
 const PROTOCOL_V2_OKPP_HASH_SIZE = 64;
-const PROTOCOL_V2_BOOT_RESOURCES_FILE_NAME = 'boot_resources.crate.okpkg';
 
 const getProtocolV2DeviceTransferProgress = (
   bytesBeforeChunk: number,
@@ -110,7 +108,7 @@ type ProtocolV2FirmwareUpdateStartResponse = TypedResponseMessage<'Success'>;
 
 type ProtocolV2TargetBinary = { fileName: string; binary: ArrayBuffer; targetId: number };
 type ProtocolV2InstallItem = ProtocolV2TargetBinary & {
-  kind: ProtocolV2RemoteComponentTarget['kind'] | 'boot_resources';
+  kind: ProtocolV2RemoteComponentTarget['kind'];
 };
 type ProtocolV2InstallTarget = ProtocolV2InstallItem & {
   path: string;
@@ -371,11 +369,10 @@ export const assertProtocolV2ReconnectIdentity = (
   expectedSerialNumber?: string,
   actualSerialNumber?: string
 ) => {
+  // Some Pro2 loader builds omit serial_no. Reconnect still uses the same BLE
+  // descriptor or requires a uniquely enumerated USB device before this check.
   if (!expectedSerialNumber || !actualSerialNumber) {
-    throw ERRORS.TypedError(
-      HardwareErrorCode.DeviceNotFound,
-      'Protocol V2 reconnect physical identity is unavailable'
-    );
+    return;
   }
   if (actualSerialNumber !== expectedSerialNumber) {
     throw ERRORS.TypedError(
@@ -426,7 +423,6 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       { name: 'chunkSize', type: 'number' },
       { name: 'forcedUpdateRes', type: 'boolean' },
       { name: 'bootloaderBinary', type: 'buffer' },
-      { name: 'bootResourcesBinary', type: 'buffer' },
       { name: 'romloaderBinary', type: 'buffer' },
       { name: 'applicationP1Binary', type: 'buffer' },
       { name: 'applicationP2Binary', type: 'buffer' },
@@ -445,7 +441,6 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       chunkSize: payload.chunkSize,
       forcedUpdateRes: payload.forcedUpdateRes,
       bootloaderBinary: payload.bootloaderBinary,
-      bootResourcesBinary: payload.bootResourcesBinary,
       romloaderBinary: payload.romloaderBinary,
       applicationP1Binary: payload.applicationP1Binary,
       applicationP2Binary: payload.applicationP2Binary,
@@ -494,7 +489,6 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
 
     let fwBinaryMap: ProtocolV2TargetBinary[] = [];
     let bootloaderBinary: ArrayBuffer | null = null;
-    let bootResourcesInstallItem: ProtocolV2InstallItem | undefined;
     let installItems: ProtocolV2InstallItem[] | undefined;
     let resourceBundles: ProtocolV2ResourceBundleBinary[] | undefined;
     try {
@@ -505,10 +499,7 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
       const needsRemoteResources =
         !this.params.resourceBundleFiles?.length &&
         !!this.params.targetsToUpdate?.includes('resource');
-      const needsRemoteBootResources =
-        !this.params.bootResourcesBinary &&
-        !!this.params.targetsToUpdate?.includes('boot_resources');
-      if (needsRemoteFirmware || needsRemoteResources || needsRemoteBootResources) {
+      if (needsRemoteFirmware || needsRemoteResources) {
         // Remote updates must use a freshly fetched config before any reboot or file write.
         await DataManager.forceReloadData();
       }
@@ -521,25 +512,13 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
         fwBinaryMap = remoteBinaries.fwBinaryMap;
         installItems = remoteBinaries.installItems;
       }
-      bootResourcesInstallItem = await this.prepareProtocolV2BootResources();
-      if (bootResourcesInstallItem) {
-        installItems = [
-          bootResourcesInstallItem,
-          ...(installItems ?? this.buildProtocolV2InstallItems({ bootloaderBinary, fwBinaryMap })),
-        ];
-      }
       resourceBundles = await this.prepareProtocolV2ResourceBundles(resourceRecoveryMode);
       this.postTipMessage(FirmwareUpdateTipMessage.FinishDownloadFirmware);
     } catch (err) {
       throw ERRORS.TypedError(HardwareErrorCode.FirmwareUpdateDownloadFailed, err.message ?? err);
     }
 
-    if (
-      !bootloaderBinary &&
-      fwBinaryMap.length === 0 &&
-      !installItems?.length &&
-      !resourceBundles?.length
-    ) {
+    if (!bootloaderBinary && fwBinaryMap.length === 0 && !resourceBundles?.length) {
       if (resourceBundles !== undefined) {
         this.postTipMessage(FirmwareUpdateTipMessage.FirmwareUpdateCompleted);
         return this.getProtocolV2VersionResult(deviceFeatures);
@@ -619,7 +598,6 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     return (
       !!this.params.resourceBundleFiles?.length ||
       !!this.params.bootloaderBinary ||
-      !!this.params.bootResourcesBinary ||
       fwBinaryMap.length > 0
     );
   }
@@ -769,54 +747,6 @@ export default class FirmwareUpdateV4 extends FirmwareUpdateBaseMethod<FirmwareU
     };
   }
 
-  private validateProtocolV2BootResourcesBinary(
-    binary: ArrayBuffer,
-    resource?: IProtocolV2BootResources
-  ) {
-    if (resource && !isProtocolV2ResourceFileValid(binary, resource)) {
-      throw new Error('Pro2 boot resources file verification failed');
-    }
-    const header = parseProtocolV2OkppHeader(toProtocolV2Bytes(binary));
-    if (!header || header.type !== 'CRAT') {
-      throw new Error('Invalid Pro2 boot resources CRATE header');
-    }
-    if (resource) {
-      const expectedPayloadHash = normalizeProtocolV2Hex(resource.payloadHash);
-      const expectedHeaderHash = normalizeProtocolV2Hex(resource.headerHash);
-      if (header.payloadHash !== expectedPayloadHash) {
-        throw new Error('Pro2 boot resources payload hash mismatch');
-      }
-      if (header.headerHash !== expectedHeaderHash) {
-        throw new Error('Pro2 boot resources header hash mismatch');
-      }
-    }
-  }
-
-  private async prepareProtocolV2BootResources(): Promise<ProtocolV2InstallItem | undefined> {
-    let binary = this.params.bootResourcesBinary;
-    let resource: IProtocolV2BootResources | undefined;
-
-    if (!binary) {
-      if (!this.params.targetsToUpdate?.includes('boot_resources')) {
-        return undefined;
-      }
-      resource = DataManager.getProtocolV2BootResources();
-      if (!resource) {
-        throw new Error('Missing Pro2 boot resources configuration');
-      }
-      Log.log('[FirmwareUpdateV4] downloading Pro2 boot resources CRATE');
-      ({ binary } = await getSysResourceBinary(resource.url));
-    }
-
-    this.validateProtocolV2BootResourcesBinary(binary, resource);
-    return {
-      fileName: PROTOCOL_V2_BOOT_RESOURCES_FILE_NAME,
-      binary,
-      targetId: ProtocolV2FirmwareTargetType.FW_MGMT_TARGET_CRATE,
-      kind: 'boot_resources',
-    };
-  }
-
   private async prepareProtocolV2ResourceBundles(
     recoveryMode: boolean
   ): Promise<ProtocolV2ResourceBundleBinary[] | undefined> {

package/src/core/index.ts

@@ -26,6 +26,7 @@ import {
   createRequestContext,
   createSdkTracingContext,
   formatRequestContext,
+  generateInstanceId,
   getActiveRequestsByDeviceInstance,
   updateRequestContext,
 } from '../utils/tracing';
@@ -53,6 +54,7 @@ import {
 import TransportManager from '../data-manager/TransportManager';
 import DeviceConnector from '../device/DeviceConnector';
 import RequestQueue from './RequestQueue';
+import { findUiPromiseForResponse } from './uiPromiseRegistry';
 import { registerHardwareUiEventListeners } from './deviceEventRegistration';
 import { getSynchronize } from '../utils/getSynchronize';
 import { runMethodWithUnlockPolicy } from '../protocols/protocol-v2/unlockPolicyRunner';
@@ -1260,6 +1262,7 @@ const onDevicePinHandler = async (...[device, type, callback]: DeviceEvents['pin
     createUiMessage(UI_REQUEST.REQUEST_PIN, {
       device: device.toMessageObject() as unknown as KnownDevice,
       type,
+      responseCorrelation: uiPromise.responseCorrelation,
     })
   );
   // wait for pin
@@ -1308,6 +1311,7 @@ const onDevicePassphraseHandler = async (
       reason: requestPayload.reason,
       expectedPassphraseState: requestPayload.expectedPassphraseState,
       ...(requestPayload.interaction ? { interaction: requestPayload.interaction } : {}),
+      responseCorrelation: uiPromise.responseCorrelation,
     })
   );
   // wait for passphrase
@@ -1431,14 +1435,21 @@ const postMessage = (message: CoreMessage) => {
 
 const createUiPromise = <T extends UiPromiseResponse['type']>(promiseEvent: T, device?: Device) => {
   const uiPromise: UiPromise<T> = createDeferred(promiseEvent, device);
+  if (
+    device &&
+    (promiseEvent === UI_RESPONSE.RECEIVE_PIN || promiseEvent === UI_RESPONSE.RECEIVE_PASSPHRASE)
+  ) {
+    const publicDeviceId = device.toMessageObject()?.deviceId;
+    uiPromise.responseCorrelation = {
+      interactionId: generateInstanceId('UiResponse', device.sdkInstanceId),
+      deviceId: publicDeviceId || device.instanceId,
+    };
+  }
   _uiPromises.push(uiPromise as any);
 
   return uiPromise;
 };
 
-const findUiPromise = <T extends UiPromiseResponse['type']>(promiseEvent: T) =>
-  _uiPromises.find(p => p.id === promiseEvent);
-
 const removeUiPromise = (promise: Deferred<any>) => {
   _uiPromises = _uiPromises.filter(p => p !== promise);
 };
@@ -1490,11 +1501,16 @@ export default class Core extends EventEmitter {
       case UI_RESPONSE.RECEIVE_PASSPHRASE:
       case UI_RESPONSE.SELECT_DEVICE_IN_BOOTLOADER_FOR_WEB_DEVICE:
       case UI_RESPONSE.SELECT_DEVICE_FOR_SWITCH_FIRMWARE_WEB_DEVICE: {
-        const uiPromise = findUiPromise(message.type);
+        const uiPromise = findUiPromiseForResponse(_uiPromises, message);
         if (uiPromise) {
           Log.log('receive UI Response: ', message.type);
           uiPromise.resolve(message);
           removeUiPromise(uiPromise);
+        } else if (
+          message.type === UI_RESPONSE.RECEIVE_PIN ||
+          message.type === UI_RESPONSE.RECEIVE_PASSPHRASE
+        ) {
+          Log.warn('Ignored unmatched or ambiguous sensitive UI response:', message.type);
         }
         break;
       }

package/src/core/uiPromiseRegistry.ts

@@ -0,0 +1,41 @@
+import { UI_RESPONSE } from '../events/ui-response';
+
+import type { UiPromise, UiPromiseResponse } from '../events/ui-promise';
+import type { UiResponseEvent } from '../events/ui-response';
+
+const isSensitiveUiResponse = (
+  response: UiResponseEvent
+): response is Extract<
+  UiResponseEvent,
+  { type: typeof UI_RESPONSE.RECEIVE_PIN | typeof UI_RESPONSE.RECEIVE_PASSPHRASE }
+> => response.type === UI_RESPONSE.RECEIVE_PIN || response.type === UI_RESPONSE.RECEIVE_PASSPHRASE;
+
+export const findUiPromiseForResponse = (
+  uiPromises: UiPromise<UiPromiseResponse['type']>[],
+  response: UiResponseEvent
+) => {
+  const candidates = uiPromises.filter(promise => promise.id === response.type);
+  if (!isSensitiveUiResponse(response)) {
+    return candidates[0];
+  }
+
+  const hasInteractionId = typeof response.interactionId === 'string';
+  const hasDeviceId = typeof response.deviceId === 'string';
+  if (hasInteractionId !== hasDeviceId) {
+    return undefined;
+  }
+
+  if (hasInteractionId && hasDeviceId) {
+    return candidates.find(promise => {
+      const correlation = promise.responseCorrelation;
+      return (
+        correlation?.interactionId === response.interactionId &&
+        correlation?.deviceId === response.deviceId
+      );
+    });
+  }
+
+  // Legacy clients do not return correlation metadata. Preserve their single-request
+  // behavior, but never guess when multiple sensitive requests are pending.
+  return candidates.length === 1 ? candidates[0] : undefined;
+};

package/src/data-manager/DataManager.ts

@@ -509,10 +509,6 @@ export default class DataManager {
     return this.deviceMap[EDeviceType.Pro2]?.resources?.stable;
   }
 
-  static getProtocolV2BootResources() {
-    return this.deviceMap[EDeviceType.Pro2]?.resources?.boot;
-  }
-
   static getProtobufMessages(schema: ProtobufMessageSchema = 'v1CurrentSchema'): JSON {
     return this.messages[schema];
   }

package/src/events/ui-promise.ts

@@ -1,7 +1,7 @@
 import type { Deferred } from '@onekeyfe/hd-shared';
 import type { DEVICE } from './device';
 import type { Device } from '../device/Device';
-import type { UiResponseEvent } from './ui-response';
+import type { UiResponseCorrelation, UiResponseEvent } from './ui-response';
 
 export type UiPromiseResponse =
   | UiResponseEvent
@@ -11,4 +11,6 @@ export type UiPromise<T extends UiPromiseResponse['type']> = Deferred<
   Extract<UiPromiseResponse, { type: T }>,
   T,
   Device
->;
+> & {
+  responseCorrelation?: UiResponseCorrelation;
+};

package/src/events/ui-request.ts

@@ -1,6 +1,7 @@
 import type { PROTO } from '../constants';
 import type { Device } from '../types';
 import type { DeviceButtonRequest } from './device';
+import type { UiResponseCorrelation } from './ui-response';
 import type { MessageFactoryFn } from './utils';
 
 export const UI_EVENT = 'UI_EVENT';
@@ -121,6 +122,7 @@ export type UiRequestDeviceAction = {
   payload: ProtocolV2UiEventMetadata & {
     device: Device;
     type?: PROTO.PinMatrixRequestType | 'ButtonRequest_PinEntry' | 'ButtonRequest_AttachPin';
+    responseCorrelation?: UiResponseCorrelation;
   };
 };
 
@@ -140,6 +142,7 @@ export interface UiRequestPassphrase {
     reason?: 'open-wallet' | 'session-recovery';
     expectedPassphraseState?: string;
     interaction?: HardwareUiInteractionMeta;
+    responseCorrelation?: UiResponseCorrelation;
   };
 }
 

package/src/events/ui-response.ts

@@ -11,12 +11,22 @@ export const UI_RESPONSE = {
     'ui-receive_select-device-for-switch-firmware-web-device',
 } as const;
 
-export interface UiResponsePin {
+export interface UiResponseCorrelation {
+  interactionId: string;
+  deviceId: string;
+}
+
+export interface UiResponseCorrelationFields {
+  interactionId?: string;
+  deviceId?: string;
+}
+
+export interface UiResponsePin extends UiResponseCorrelationFields {
   type: typeof UI_RESPONSE.RECEIVE_PIN;
   payload: string;
 }
 
-export interface UiResponsePassphrase {
+export interface UiResponsePassphrase extends UiResponseCorrelationFields {
   type: typeof UI_RESPONSE.RECEIVE_PASSPHRASE;
   payload: {
     value: string;

package/src/protocols/protocol-v2/resources.ts

@@ -1,7 +1,6 @@
 import { sha256 } from '@noble/hashes/sha256';
 
 import type {
-  IProtocolV2BootResources,
   IProtocolV2Resource,
   IProtocolV2ResourceType,
   IProtocolV2Resources,
@@ -150,34 +149,6 @@ function validateResource(value: unknown, index: number): IProtocolV2Resource {
   };
 }
 
-function validateBootResources(value: unknown): IProtocolV2BootResources {
-  if (!value || typeof value !== 'object') {
-    throw new Error('Invalid Pro2 boot resources config');
-  }
-  const resource = value as Partial<IProtocolV2BootResources>;
-  if (resource.required !== false) {
-    throw new Error('Invalid Pro2 boot resources required flag: expected false');
-  }
-  if (resource.target !== 'CRATE') {
-    throw new Error('Invalid Pro2 boot resources target: expected CRATE');
-  }
-  if (typeof resource.url !== 'string' || !resource.url.startsWith('https://')) {
-    throw new Error('Invalid Pro2 boot resources url');
-  }
-  if (!Number.isSafeInteger(resource.size) || Number(resource.size) <= 0) {
-    throw new Error('Invalid Pro2 boot resources size');
-  }
-  return {
-    required: false,
-    target: 'CRATE',
-    url: resource.url,
-    size: Number(resource.size),
-    fileHash: normalizeHex(resource.fileHash, SHA256_HEX_LENGTH, 'boot fileHash'),
-    payloadHash: normalizeHex(resource.payloadHash, SHA3_512_HEX_LENGTH, 'boot payloadHash'),
-    headerHash: normalizeHex(resource.headerHash, SHA3_512_HEX_LENGTH, 'boot headerHash'),
-  };
-}
-
 /** Validate a complete Pro2 stable resource set from remote configuration. */
 export function parseProtocolV2Resources(value: unknown): IProtocolV2Resources | undefined {
   if (value === undefined) return undefined;
@@ -189,8 +160,7 @@ export function parseProtocolV2Resources(value: unknown): IProtocolV2Resources |
     throw new Error('Invalid Pro2 resources config: stable must be an array');
   }
 
-  const config = value as { stable: unknown[]; boot?: unknown };
-  const stable = config.stable.map(validateResource);
+  const stable = (value as { stable: unknown[] }).stable.map(validateResource);
   const types = new Set(stable.map(resource => resource.type));
   if (stable.length !== PROTOCOL_V2_RESOURCE_TYPES.length || types.size !== stable.length) {
     throw new Error('Invalid Pro2 resources config: stable must contain six unique resource types');
@@ -200,7 +170,6 @@ export function parseProtocolV2Resources(value: unknown): IProtocolV2Resources |
       throw new Error(`Invalid Pro2 resources config: stable is missing ${type}`);
     }
   }
-  const boot = config.boot === undefined ? undefined : validateBootResources(config.boot);
   return {
     stable: PROTOCOL_V2_RESOURCE_TYPES.map(type => {
       const resource = stable.find(item => item.type === type);
@@ -209,7 +178,6 @@ export function parseProtocolV2Resources(value: unknown): IProtocolV2Resources |
       }
       return resource;
     }),
-    ...(boot ? { boot } : undefined),
   };
 }
 

package/src/protocols/protocol-v2/walletSession.ts

@@ -164,9 +164,13 @@ const selectDeviceSession = async (
     return getDeviceSession(device, buildDeviceSessionGetRequest({ deriveCardano }));
   }
 
+  const passphraseOnDeviceInteraction = device.createProtocolV2UiPhaseMetadata?.(
+    'passphrase-on-device',
+    'start'
+  );
   device.emit(DEVICE.PASSPHRASE_ON_DEVICE, device, {
     ...metadata,
-    ...(passphraseInteraction ? { interaction: passphraseInteraction } : {}),
+    ...(passphraseOnDeviceInteraction ? { interaction: passphraseOnDeviceInteraction } : {}),
   });
   await askDevicePassphrase(device, { on_device: true });
   return getDeviceSession(device, buildDeviceSessionGetRequest({ deriveCardano }));

package/src/types/api/firmwareUpdate.ts

@@ -63,7 +63,6 @@ export interface FirmwareUpdateV3Params {
  */
 export type FirmwareUpdateV4Target =
   | 'boot'
-  | 'boot_resources'
   | 'app_v1'
   | 'app_v2'
   | 'coprocessor'
@@ -83,8 +82,6 @@ export interface FirmwareUpdateV4Params {
   romloaderBinary?: ArrayBuffer;
   /** FW_MGMT_TARGET_BOOTLOADER = 3 */
   bootloaderBinary?: ArrayBuffer;
-  /** FW_MGMT_TARGET_CRATE = 1; optional Pro2 startup resources. */
-  bootResourcesBinary?: ArrayBuffer;
   /** FW_MGMT_TARGET_APPLICATION_P1 = 4 */
   applicationP1Binary?: ArrayBuffer;
   /** FW_MGMT_TARGET_APPLICATION_P2 = 5 */

package/src/types/settings.ts

@@ -81,24 +81,8 @@ export type IProtocolV2Resource = {
   headerHash: string;
 };
 
-/** Optional Pro2 startup-resource CRATE installed by the bootloader updater. */
-export type IProtocolV2BootResources = {
-  required: false;
-  target: 'CRATE';
-  url: string;
-  /** Complete CRATE file size in bytes. */
-  size: number;
-  /** SHA-256 of the complete CRATE file. */
-  fileHash: string;
-  /** SHA3-512 payload_hash from the signed CRATE header. */
-  payloadHash: string;
-  /** SHA3-512 header_hash from the signed CRATE header. */
-  headerHash: string;
-};
-
 export type IProtocolV2Resources = {
   stable: IProtocolV2Resource[];
-  boot?: IProtocolV2BootResources;
 };
 
 /** Pro2 RESC bundle okpkg descriptor for incremental FileWrite synchronization. */

package/src/utils/pro2Nft.ts

@@ -9,8 +9,8 @@ export const PRO2_NFT_IMAGE_HEIGHT = 540;
 export const PRO2_NFT_THUMBNAIL_WIDTH = 263;
 export const PRO2_NFT_THUMBNAIL_HEIGHT = 263;
 export const PRO2_NFT_DIRECTORY = 'vol1:/nft';
-export const PRO2_NFT_DEFAULT_CHUNK_SIZE = 512;
-export const PRO2_NFT_DEFAULT_PACE_MS = 20;
+export const PRO2_NFT_DEFAULT_CHUNK_SIZE = 2048;
+export const PRO2_NFT_DEFAULT_PACE_MS = 0;
 export const PRO2_NFT_DEFAULT_TIMEOUT_MS = 15_000;
 export const PRO2_NFT_MIN_CHUNK_SIZE = 64;
 export const PRO2_NFT_MAX_CHUNK_SIZE = 2048;