@onekeyfe/hd-core 1.2.0-alpha.106 → 1.2.0-alpha.107

package/src/api/SearchDevices.ts

@@ -42,8 +42,8 @@ export default class SearchDevices extends BaseMethod {
             ...device,
             connectId: device.id,
             serialNo: null,
-            // Legacy BLE discovery identifier. The physical serial number is unavailable here.
-            uuid: device.id,
+            // BLE discovery cannot provide a physical-device identity before initialization.
+            uuid: '',
             deviceId: null,
             name: bleName || device.name,
             deviceType: getDeviceTypeByBleName(bleName),

package/src/api/UploadPortfolio.ts

@@ -1,28 +1,21 @@
 import { createDeviceNotSupportMethodError } from '@onekeyfe/hd-shared';
 
 import { supportsProtocolV2Message } from '../protocols/protocol-v2/features';
-import { decodeCanonicalBase64 } from './helpers/base64Data';
 import FileWrite from './FileWrite';
 
 export type UploadPortfolioParams = {
-  packageBase64: string;
+  packageBytes: ArrayBuffer | Uint8Array | Blob;
   timeoutMs?: number | string;
 };
 
 const PORTFOLIO_PENDING_PATH = 'vol1:/portfolio/portfolio.okpkg.pending';
 const PORTFOLIO_CHUNK_SIZE = 2048;
-const PORTFOLIO_PACKAGE_MAX_BYTES = 128 * 1024;
 const FILESYSTEM_FILE_WRITE_MESSAGE_TYPE = 60805;
 const PORTFOLIO_UPDATE_MESSAGE_TYPE = 61400;
 
 export default class UploadPortfolio extends FileWrite {
   init() {
-    const { packageBase64, timeoutMs } = this.payload as UploadPortfolioParams;
-    const packageBytes = decodeCanonicalBase64({
-      value: packageBase64,
-      parameterName: 'packageBase64',
-      maxBytes: PORTFOLIO_PACKAGE_MAX_BYTES,
-    });
+    const { packageBytes, timeoutMs } = this.payload as UploadPortfolioParams;
     this.payload = {
       ...this.payload,
       path: PORTFOLIO_PENDING_PATH,

package/src/api/protocol-v2/DeviceUploadNft.ts

@@ -7,26 +7,21 @@ import {
   PRO2_NFT_DEFAULT_PACE_MS,
   PRO2_NFT_DEFAULT_TIMEOUT_MS,
   PRO2_NFT_DIRECTORY,
-  PRO2_NFT_IMAGE_HEIGHT,
-  PRO2_NFT_IMAGE_WIDTH,
   PRO2_NFT_MAX_CHUNK_SIZE,
   PRO2_NFT_MAX_ITEMS,
   PRO2_NFT_MIN_CHUNK_SIZE,
-  PRO2_NFT_THUMBNAIL_HEIGHT,
-  PRO2_NFT_THUMBNAIL_WIDTH,
   type Pro2NftBundle,
-  buildPro2NftBundleFromEncodedImages,
+  type Pro2NftImage,
+  buildPro2NftBundle,
   getCompletePro2NftBasenames,
 } from '../../utils/pro2Nft';
-import { encodePro2Image } from '../../utils/pro2Wallpaper';
 import { BaseMethod } from '../BaseMethod';
-import { decodeJpegBase64ToRgba } from '../helpers/base64Data';
 import { invalidParameter } from '../helpers/filesystemValidation';
 import { writeProtocolV2File } from '../helpers/protocolV2FileWrite';
 
 export type DeviceUploadNftParams = {
-  imageJpegBase64: string;
-  thumbnailJpegBase64: string;
+  image: Pro2NftImage;
+  thumbnail: Pro2NftImage;
   title: string;
   subtitle: string;
   timestampMs?: number;
@@ -59,8 +54,8 @@ export default class DeviceUploadNft extends BaseMethod<DeviceUploadNftParams> {
 
   init() {
     const {
-      imageJpegBase64,
-      thumbnailJpegBase64,
+      image,
+      thumbnail,
       title,
       subtitle,
       timestampMs = Date.now(),
@@ -84,51 +79,8 @@ export default class DeviceUploadNft extends BaseMethod<DeviceUploadNftParams> {
       throw invalidParameter('Parameter [timeoutMs] must be a positive integer.');
     }
 
-    const encodedImage = (() => {
-      const decoded = decodeJpegBase64ToRgba({
-        jpegBase64: imageJpegBase64,
-        parameterName: 'imageJpegBase64',
-        expectedWidth: PRO2_NFT_IMAGE_WIDTH,
-        expectedHeight: PRO2_NFT_IMAGE_HEIGHT,
-      });
-      return encodePro2Image({
-        width: PRO2_NFT_IMAGE_WIDTH,
-        height: PRO2_NFT_IMAGE_HEIGHT,
-        rgba: decoded.data,
-        alphaMode: 'black-background',
-      }).data;
-    })();
-    const encodedThumbnail = (() => {
-      const decoded = decodeJpegBase64ToRgba({
-        jpegBase64: thumbnailJpegBase64,
-        parameterName: 'thumbnailJpegBase64',
-        expectedWidth: PRO2_NFT_THUMBNAIL_WIDTH,
-        expectedHeight: PRO2_NFT_THUMBNAIL_HEIGHT,
-      });
-      return encodePro2Image({
-        width: PRO2_NFT_THUMBNAIL_WIDTH,
-        height: PRO2_NFT_THUMBNAIL_HEIGHT,
-        rgba: decoded.data,
-        alphaMode: 'black-background',
-      }).data;
-    })();
-    this.bundle = buildPro2NftBundleFromEncodedImages({
-      image: encodedImage,
-      thumbnail: encodedThumbnail,
-      title,
-      subtitle,
-      timestampMs,
-    });
-    this.params = {
-      imageJpegBase64,
-      thumbnailJpegBase64,
-      title,
-      subtitle,
-      timestampMs,
-      chunkSize,
-      paceMs,
-      timeoutMs,
-    };
+    this.bundle = buildPro2NftBundle({ image, thumbnail, title, subtitle, timestampMs });
+    this.params = { image, thumbnail, title, subtitle, timestampMs, chunkSize, paceMs, timeoutMs };
     this.unlockPolicy = 'none';
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;

package/src/api/protocol-v2/DeviceUploadWallpaper.ts

@@ -1,13 +1,10 @@
 import { blake2s } from '@noble/hashes/blake2s';
 import { bytesToHex } from '@noble/hashes/utils';
-import { createDeviceNotSupportMethodError } from '@onekeyfe/hd-shared';
 
 import { BaseMethod } from '../BaseMethod';
-import { decodeJpegBase64ToRgba } from '../helpers/base64Data';
 import { invalidParameter } from '../helpers/filesystemValidation';
 import { writeProtocolV2File } from '../helpers/protocolV2FileWrite';
 import { UI_REQUEST, createUiMessage } from '../../events/ui-request';
-import { supportsProtocolV2Message } from '../../protocols/protocol-v2/features';
 import {
   PRO2_WALLPAPER_HEIGHT,
   PRO2_WALLPAPER_WIDTH,
@@ -16,7 +13,9 @@ import {
 } from '../../utils/pro2Wallpaper';
 
 export type DeviceUploadWallpaperParams = {
-  jpegBase64: string;
+  width: number;
+  height: number;
+  rgba: Uint8Array | ArrayBuffer;
   fileName?: string;
   chunkSize?: number;
 };
@@ -30,9 +29,6 @@ export type DeviceUploadWallpaperResponse = {
 
 const WALLPAPER_DIRECTORY = 'vol1:/wallpapers';
 const SAFE_FILE_NAME = /^[A-Za-z0-9_-]+(?:\.bin)?$/;
-const DEVICE_SETTINGS_SET_MESSAGE_TYPE = 60412;
-const FILESYSTEM_FILE_WRITE_MESSAGE_TYPE = 60805;
-const FILESYSTEM_DIR_MAKE_MESSAGE_TYPE = 60809;
 
 function normalizeFileName(fileName: string | undefined, data: Uint8Array): string {
   if (fileName !== undefined && (!fileName || !SAFE_FILE_NAME.test(fileName))) {
@@ -58,45 +54,31 @@ export default class DeviceUploadWallpaper extends BaseMethod<DeviceUploadWallpa
   private path = '';
 
   init() {
-    const { jpegBase64, fileName, chunkSize } = this.payload;
+    const { width, height, rgba, fileName, chunkSize } = this.payload;
+    if (width !== PRO2_WALLPAPER_WIDTH || height !== PRO2_WALLPAPER_HEIGHT) {
+      throw invalidParameter(
+        `Pro2 wallpaper dimensions must be ${PRO2_WALLPAPER_WIDTH}x${PRO2_WALLPAPER_HEIGHT}.`
+      );
+    }
+    if (!(rgba instanceof ArrayBuffer) && !ArrayBuffer.isView(rgba)) {
+      throw invalidParameter('Parameter [rgba] must be an ArrayBuffer or Uint8Array.');
+    }
     if (chunkSize !== undefined && (!Number.isInteger(chunkSize) || chunkSize <= 0)) {
       throw invalidParameter('Parameter [chunkSize] must be a positive integer.');
     }
 
-    const decoded = decodeJpegBase64ToRgba({
-      jpegBase64,
-      parameterName: 'jpegBase64',
-      expectedWidth: PRO2_WALLPAPER_WIDTH,
-      expectedHeight: PRO2_WALLPAPER_HEIGHT,
-    });
-    this.encoded = encodePro2Wallpaper({
-      width: PRO2_WALLPAPER_WIDTH,
-      height: PRO2_WALLPAPER_HEIGHT,
-      rgba: decoded.data,
-    });
+    const rgbaBytes =
+      rgba instanceof ArrayBuffer
+        ? rgba
+        : new Uint8Array(rgba.buffer, rgba.byteOffset, rgba.byteLength);
+    this.encoded = encodePro2Wallpaper({ width, height, rgba: rgbaBytes });
     this.path = `${WALLPAPER_DIRECTORY}/${normalizeFileName(fileName, this.encoded.data)}`;
-    this.params = { jpegBase64, fileName, chunkSize };
+    this.params = { width, height, rgba: rgbaBytes, fileName, chunkSize };
     this.unlockPolicy = 'none';
     this.skipForceUpdateCheck = true;
     this.useDevicePassphraseState = false;
   }
 
-  private async assertCapabilities() {
-    const protocolInfo = await this.device.ensureProtocolV2RuntimeContext();
-    const requiredMessageTypes = [
-      DEVICE_SETTINGS_SET_MESSAGE_TYPE,
-      FILESYSTEM_FILE_WRITE_MESSAGE_TYPE,
-      FILESYSTEM_DIR_MAKE_MESSAGE_TYPE,
-    ];
-    if (
-      requiredMessageTypes.some(
-        messageType => !supportsProtocolV2Message(protocolInfo, messageType)
-      )
-    ) {
-      throw createDeviceNotSupportMethodError(this.name, this.device.getCurrentFirmwareType());
-    }
-  }
-
   private async ensureDirectory() {
     if (this.directoryReady) return;
     try {
@@ -137,7 +119,6 @@ export default class DeviceUploadWallpaper extends BaseMethod<DeviceUploadWallpa
   async run(): Promise<DeviceUploadWallpaperResponse> {
     const { encoded } = this;
     if (!encoded) throw invalidParameter('Wallpaper data has not been initialized.');
-    await this.assertCapabilities();
     await this.ensureDirectory();
     await this.upload();
     const response = await this.device.commands.typedCall('DeviceSettingsSet', 'Success', {

package/src/api/ton/TonSignMessage.ts

@@ -174,14 +174,12 @@ export default class TonSignMessage extends BaseMethod<HardwareTonSignMessage> {
     if (!request.init_data_length) {
       const deviceType = this.device.getCurrentDeviceType();
       const hasClassic = DeviceModelToTypes.model_classic1s.includes(deviceType);
-      const signingMessage = request.signing_message ?? request.signning_message;
-      // Blind signing omits the signing message in both protocol schemas.
-      const shouldSkipValidation = signingMessage == null;
+      // use signing_message_repr sign, not exists signning_message, skip validate
+      const hasSigningMessageRepr = request.signning_message == null;
 
       return Promise.resolve({
         ...request,
-        signing_message: signingMessage,
-        skip_validate: hasClassic || shouldSkipValidation,
+        skip_validate: hasClassic || hasSigningMessageRepr,
       });
     }
 

package/src/core/index.ts

@@ -136,9 +136,6 @@ const toError = (error: unknown): Error | undefined => {
   }
 };
 
-const isExpectedCompatibilityError = (error: unknown) =>
-  error instanceof HardwareError && error.errorCode === HardwareErrorCode.DeviceNotSupportMethod;
-
 const updateMethodRequestContext = (method: BaseMethod, updates: any) => {
   if (method.requestContext) {
     updateRequestContext(method.requestContext.responseID, updates);
@@ -696,9 +693,7 @@ const onCallDevice = async (
     try {
       return await task.callPromise.promise;
     } catch (e) {
-      if (!isExpectedCompatibilityError(e)) {
-        Log.debug('Device Run Error: ', e);
-      }
+      Log.debug('Device Run Error: ', e);
       completeMethodRequestContext(method, e);
       return createResponseMessage(method.responseID, false, { error: e });
     }
@@ -1253,6 +1248,7 @@ const cleanup = () => {
     pendingUiPromises,
     ERRORS.TypedError(HardwareErrorCode.ActionCancelled, 'UI request was cancelled')
   );
+  Log.debug('Cleanup...');
 };
 
 const removeDeviceListener = (device: Device) => {

package/src/device/Device.ts

@@ -61,7 +61,6 @@ import {
   PROTOCOL_V2_VERSIONS_DEVICE_INFO_REQUEST,
   type ProtocolV2RuntimeMode,
   getProtocolV2RuntimeMode,
-  isLegacyProtocolV2ProtocolInfo,
   requestProtocolV2DeviceInfo,
   requestProtocolV2DeviceStatus,
   requestProtocolV2ProtocolInfo,
@@ -486,10 +485,6 @@ export class Device extends EventEmitter {
       }
 
       this.commands = new DeviceCommands(this, this.mainId ?? '');
-      // Protocol V2 runtime metadata belongs to one active transport link. A
-      // successful acquire creates a fresh link/session, so never carry cached
-      // ProtocolInfo or pre-initialize state across that boundary.
-      this.invalidateProtocolV2RuntimeState();
     } catch (error) {
       if (options?.forceProtocolDetection) {
         this.originalDescriptor.protocolType = previousProtocol;
@@ -982,7 +977,11 @@ export class Device extends EventEmitter {
       });
       // The default request excludes SE/hash data and therefore uses basic scope.
       // Full version and verification data require getDeviceState({ scope: 'firmware' }).
-      await this.probeProtocolV2RuntimeState(deviceInfo, options?.protocolV2DeviceInfoTimeoutMs);
+      const features = await this.probeProtocolV2RuntimeState(
+        deviceInfo,
+        options?.protocolV2DeviceInfoTimeoutMs
+      );
+      Log.debug('Protocol V2 features:', features);
     } catch (error) {
       Log.error('Protocol V2 initialization failed:', error);
       throw error;
@@ -1054,13 +1053,7 @@ export class Device extends EventEmitter {
       }
 
       if (refresh.has('status') && !initializedWithDeviceInfo) {
-        const cachedMode = this.state?.status.mode;
-        await this.probeProtocolV2RuntimeState(refreshedDeviceInfo, undefined, {
-          // Loader firmware does not support DeviceStatusGet. Renegotiate ProtocolInfo
-          // during an explicit refresh so a device rebooted into application firmware
-          // can leave the cached loader state.
-          forceRuntimeContextRefresh: cachedMode === 'bootloader' || cachedMode === 'romloader',
-        });
+        await this.probeProtocolV2RuntimeState(refreshedDeviceInfo);
       }
 
       if (refresh.has('settings') && this.state?.status.mode === 'normal') {
@@ -1108,10 +1101,9 @@ export class Device extends EventEmitter {
       source,
       changedKeys: result.changedKeys,
     };
-    Log.debug('Device state updated', {
+    Log.debug('Device state patch committed', {
       source,
-      revision: result.revision,
-      changedKeyCount: result.changedKeys.length,
+      keys: result.changedKeys,
     });
     this.emit(DEVICE.STATE, this, event);
     if (result.state.protocol === 'V1') {
@@ -1132,17 +1124,12 @@ export class Device extends EventEmitter {
     return this.features;
   }
 
-  async ensureProtocolV2RuntimeContext(
-    timeoutMs?: number,
-    options?: { forceRefresh?: boolean }
-  ): Promise<ProtocolInfo> {
+  async ensureProtocolV2RuntimeContext(timeoutMs?: number): Promise<ProtocolInfo> {
     const cachedProtocolInfo =
-      options?.forceRefresh === true
-        ? undefined
-        : this.protocolV2RuntimeContext ??
-          (!this.protocolV2StateNeedsReload
-            ? this.state?.raw?.protocolV2ProtocolInfo ?? undefined
-            : undefined);
+      this.protocolV2RuntimeContext ??
+      (!this.protocolV2StateNeedsReload
+        ? this.state?.raw?.protocolV2ProtocolInfo ?? undefined
+        : undefined);
     if (cachedProtocolInfo) {
       this.protocolV2RuntimeContext = cachedProtocolInfo;
       return cachedProtocolInfo;
@@ -1182,19 +1169,10 @@ export class Device extends EventEmitter {
     }
   }
 
-  async probeProtocolV2RuntimeState(
-    deviceInfo?: ProtocolV2DeviceInfo,
-    timeoutMs?: number,
-    options?: {
-      forceRuntimeContextRefresh?: boolean;
-    }
-  ) {
-    const protocolInfo = await this.ensureProtocolV2RuntimeContext(timeoutMs, {
-      forceRefresh: options?.forceRuntimeContextRefresh,
-    });
+  async probeProtocolV2RuntimeState(deviceInfo?: ProtocolV2DeviceInfo, timeoutMs?: number) {
+    const protocolInfo = await this.ensureProtocolV2RuntimeContext(timeoutMs);
+    const runtimeMode = getProtocolV2RuntimeMode(protocolInfo);
     const runtimeDeviceInfo = deviceInfo ?? this.state?.raw?.protocolV2DeviceInfo;
-    const runtimeMode = getProtocolV2RuntimeMode(protocolInfo, runtimeDeviceInfo);
-    const legacyProtocolInfo = isLegacyProtocolV2ProtocolInfo(protocolInfo);
     const protocolV2DeviceType = runtimeDeviceInfo
       ? resolveProtocolV2DeviceIdentity(runtimeDeviceInfo.hw?.Device_type).deviceType
       : this.getCurrentDeviceType();
@@ -1208,9 +1186,10 @@ export class Device extends EventEmitter {
         'Protocol V2 romloader mode is only supported for Pro2 and Neo.'
       );
     }
-    const deviceStatusSupported =
-      legacyProtocolInfo ||
-      supportsProtocolV2Message(protocolInfo, PROTOCOL_V2_DEVICE_STATUS_GET_MESSAGE_TYPE);
+    const deviceStatusSupported = supportsProtocolV2Message(
+      protocolInfo,
+      PROTOCOL_V2_DEVICE_STATUS_GET_MESSAGE_TYPE
+    );
 
     if (runtimeMode === 'bootloader' || runtimeMode === 'romloader') {
       return this.updateProtocolV2Features(deviceInfo, null, runtimeMode, protocolInfo);
@@ -1271,7 +1250,8 @@ export class Device extends EventEmitter {
     });
   }
 
-  private invalidateProtocolV2RuntimeState() {
+  markTransportDisconnected() {
+    this.deviceAcquired = false;
     if (!this.isProtocolV2()) return;
     this.protocolV2StateNeedsReload = true;
     this.protocolV2RuntimeContext = undefined;
@@ -1280,11 +1260,6 @@ export class Device extends EventEmitter {
     this.clearPreInitialized();
   }
 
-  markTransportDisconnected() {
-    this.deviceAcquired = false;
-    this.invalidateProtocolV2RuntimeState();
-  }
-
   invalidateAfterWipe() {
     const deviceId = this.getCurrentDeviceId();
     if (deviceId) {
@@ -1294,7 +1269,10 @@ export class Device extends EventEmitter {
       if (this.originalDescriptor.path !== deviceId) {
         deviceWalletSessionStore.deleteDevice(this.originalDescriptor.path);
       }
-      this.invalidateProtocolV2RuntimeState();
+      this.protocolV2StateNeedsReload = true;
+      this.protocolV2RuntimeContext = undefined;
+      this.protocolV2RuntimeContextPromise = undefined;
+      this.protocolV2RuntimeContextRequestToken = undefined;
     }
 
     this.passphraseState = undefined;
@@ -1306,7 +1284,11 @@ export class Device extends EventEmitter {
   markProtocolV2Reboot(rebootType: DeviceRebootType) {
     if (!this.isProtocolV2()) return;
 
-    this.invalidateProtocolV2RuntimeState();
+    this.protocolV2StateNeedsReload = true;
+    this.protocolV2RuntimeContext = undefined;
+    this.protocolV2RuntimeContextPromise = undefined;
+    this.protocolV2RuntimeContextRequestToken = undefined;
+    this.clearPreInitialized();
     let loaderMode: 'bootloader' | 'romloader' | undefined;
     if (rebootType === DeviceRebootType.Bootloader) {
       loaderMode = 'bootloader';
@@ -1380,10 +1362,6 @@ export class Device extends EventEmitter {
     if (device.features) {
       this._updateFeatures(device.features);
     }
-    // Adopting another Device instance's command channel also crosses an active
-    // link boundary. Renegotiate runtime metadata on that channel instead of
-    // retaining ProtocolInfo from the previous instance/session.
-    this.invalidateProtocolV2RuntimeState();
   }
 
   async run(fn?: () => Promise<void>, options?: RunOptions) {

package/src/device/DeviceCommands.ts

@@ -304,6 +304,13 @@ export class DeviceCommands {
       const promise = this.transport.call(this.mainId, type, msg ?? {}, options) as any;
       this.callPromise = promise;
       const res = await promise;
+      if (!shouldReduceDebug) {
+        LogCore.debug(
+          '[DeviceCommands] [call] Received',
+          res.type,
+          getSafeTransportLogPayload(res.message, res.type)
+        );
+      }
       return res;
     } catch (error) {
       LogCore.debug('[DeviceCommands] [call] Received error', {
@@ -438,10 +445,13 @@ export class DeviceCommands {
       if (!shouldReduceDebugForCall(callType)) {
         Log.debug('_filterCommonTypes: ', {
           request: callType,
-          response: {
-            type: res.type,
-            message: getSafeTransportLogPayload(res.message, res.type),
-          },
+          response:
+            callType === 'DeviceFirmwareUpdateStatusGet'
+              ? {
+                  type: res.type,
+                  message: getSafeTransportLogPayload(res.message, res.type),
+                }
+              : res.type,
         });
       }
     } catch (error) {

package/src/device/DevicePool.ts

@@ -218,13 +218,9 @@ export class DevicePool extends EventEmitter {
    * Device.getDeviceState skips unsupported status/settings calls in loader mode.
    */
   static async _refreshProtocolV2DiscoveryState(device: Device) {
-    await device.getDeviceState({
-      refreshSections: ['status'],
-    });
+    await device.getDeviceState({ refreshSections: ['status'] });
     try {
-      await device.getDeviceState({
-        refreshSections: ['settings'],
-      });
+      await device.getDeviceState({ refreshSections: ['settings'] });
     } catch (error) {
       Log.debug('Unable to refresh Protocol V2 device label during discovery', error);
     }

package/src/events/logBlockEvent.ts

@@ -17,14 +17,6 @@ const LogLabelMethod: Set<string> = new Set([
   'fileRead',
 ]);
 
-// 资源上传参数可能包含很大的 Base64 字符串。这里按方法整段跳过，避免日志层
-// 递归复制和序列化这些数据；资源 API 与传输内容本身保持不变。
-const LogPayloadBlockMethod: Set<string> = new Set([
-  'deviceUploadNft',
-  'deviceUploadWallpaper',
-  'uploadPortfolio',
-]);
-
 const SensitiveLogKeys: Set<string> = new Set([
   'devicestate',
   'entropy',
@@ -94,12 +86,7 @@ export function getLogBlockLabel(message: unknown): string | undefined {
 }
 
 export function getSafeLogPayload(value: unknown, blockLabel?: string): unknown {
-  if (
-    blockLabel &&
-    (LogBlockEvent.has(blockLabel) ||
-      LogPayloadBlockMethod.has(blockLabel) ||
-      isSigningMethod(blockLabel))
-  ) {
+  if (blockLabel && (LogBlockEvent.has(blockLabel) || isSigningMethod(blockLabel))) {
     return { method: blockLabel, payload: '[REDACTED]' };
   }
 

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

@@ -56,16 +56,6 @@ export const getProtocolV2SeType = (se?: DeviceSEInfo): string | null =>
 
 export type ProtocolV2RuntimeMode = 'normal' | 'bootloader' | 'romloader';
 
-export type ProtocolV2ProtocolInfo = ProtocolInfo & {
-  /** Present only when hd-transport decoded the pre-build-fingerprint wire layout. */
-  protobuf_definition?: string | null;
-};
-
-export const isLegacyProtocolV2ProtocolInfo = (
-  protocolInfo: ProtocolInfo
-): protocolInfo is ProtocolV2ProtocolInfo & { protobuf_definition: string | null } =>
-  Object.prototype.hasOwnProperty.call(protocolInfo, 'protobuf_definition');
-
 /**
  * Protocol V2 fingerprints use:
  * <binary>__<version>__<commit>__<PROD|DEV>__<DEBUG|RELEASE>
@@ -97,18 +87,11 @@ export const parseProtocolV2BuildFingerprint = (
 };
 
 export const getProtocolV2RuntimeMode = (
-  protocolInfo: ProtocolInfo,
-  deviceInfo?: ProtocolV2DeviceInfo
+  protocolInfo: ProtocolInfo
 ): ProtocolV2RuntimeMode | undefined => {
   const binary = parseProtocolV2BuildFingerprint(protocolInfo.build_fingerprint)?.binary;
   if (binary === 'application') return 'normal';
-  if (binary) return binary;
-
-  if (isLegacyProtocolV2ProtocolInfo(protocolInfo) && !deviceInfo?.fw?.application) {
-    if (deviceInfo?.fw?.romloader) return 'romloader';
-    if (deviceInfo?.fw?.bootloader) return 'bootloader';
-  }
-  return undefined;
+  return binary;
 };
 
 // MessageType_DeviceStatusGet in the Protocol V2 protobuf registry.

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

@@ -7,7 +7,6 @@ export {
   getProtocolV2RuntimeMode,
   getProtocolV2SeState,
   getProtocolV2SeType,
-  isLegacyProtocolV2ProtocolInfo,
   parseProtocolV2BuildFingerprint,
   requestProtocolV2ProtocolInfo,
   supportsProtocolV2Message,
@@ -19,7 +18,6 @@ export type {
   ProtocolV2SEInfo,
   ProtocolV2SeStateLabel,
   ProtocolV2RuntimeMode,
-  ProtocolV2ProtocolInfo,
 } from './features';
 export * from './firmware';
 export * from './walletSession';

package/src/types/api/protocolV2.ts

@@ -68,7 +68,7 @@ export declare function deviceUploadNft(
 export declare function uploadPortfolio(
   connectId: string,
   params: {
-    packageBase64: string;
+    packageBytes: ArrayBuffer | Uint8Array | Blob;
     timeoutMs?: number | string;
   }
 ): Response<FileInfo & { portfolioUpdated: true }>;

package/src/types/device.ts

@@ -75,7 +75,8 @@ export type SearchDevice = {
   serialNo?: string | null;
   /**
    * @deprecated Ambiguous legacy identifier. Use serialNo for hardware identity
-   * and connectId for transport routing.
+   * and connectId for transport routing. Empty during BLE discovery until the
+   * physical serial number is available after initialization.
    */
   uuid: string;
   deviceId: string | null;

package/src/utils/deviceSettings.ts

@@ -200,7 +200,7 @@ export const getAutoShutDownOptions = (
       return withNever([60_000, 120_000, 300_000, 600_000], protocol);
     case EDeviceType.Pro2:
     case EDeviceType.Neo:
-      return withNever([60_000, 120_000, 300_000, 600_000], protocol);
+      return withNever([60_000, 120_000, 300_000, 600_000, 1_800_000], protocol);
     default:
       return [];
   }