@onekeyfe/hd-core 1.1.27-alpha.4 → 1.1.27-alpha.40

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

@@ -0,0 +1,161 @@
+import { DeviceRebootType } from '@onekeyfe/hd-transport';
+
+import { invalidParameter, validateNonEmptyString } from '../helpers/filesystemValidation';
+
+import type {
+  DeviceFirmwareTarget,
+  DeviceFirmwareTargetType,
+  DeviceInfoTargets,
+  DeviceInfoTypes,
+  TransportCallOptions,
+} from '@onekeyfe/hd-transport';
+
+export type RebootTypeInput = DeviceRebootType | keyof typeof DeviceRebootType | string | number;
+
+export type DeviceRebootParams = {
+  rebootType?: RebootTypeInput;
+  reboot_type?: RebootTypeInput;
+};
+
+export type DeviceGetDeviceInfoParams = {
+  targets?: DeviceInfoTargets;
+  types?: DeviceInfoTypes;
+  targetHw?: boolean;
+  targetFw?: boolean;
+  targetBt?: boolean;
+  targetSe1?: boolean;
+  targetSe2?: boolean;
+  targetSe3?: boolean;
+  targetSe4?: boolean;
+  targetStatus?: boolean;
+  includeVersion?: boolean;
+  includeBuildId?: boolean;
+  includeHash?: boolean;
+  includeSpecific?: boolean;
+};
+
+export type DeviceFirmwareTargetInput =
+  | DeviceFirmwareTarget
+  | {
+      targetId?: DeviceFirmwareTargetType | string | number;
+      target_id?: DeviceFirmwareTargetType | string | number;
+      path: string;
+    };
+
+export type DeviceFirmwareUpdateParams = {
+  targets?: DeviceFirmwareTargetInput[];
+  targetId?: DeviceFirmwareTargetType | string | number;
+  target_id?: DeviceFirmwareTargetType | string | number;
+  path?: string;
+};
+
+export type FactoryDeviceInfoSettingsParams = {
+  serial_no?: string;
+  serialNo?: string;
+  cpu_info?: string;
+  cpuInfo?: string;
+  pre_firmware?: string;
+  preFirmware?: string;
+};
+
+const DEVICE_REBOOT_TYPES: Record<string, DeviceRebootType> = {
+  Normal: DeviceRebootType.Normal,
+  normal: DeviceRebootType.Normal,
+  Boardloader: DeviceRebootType.Boardloader,
+  boardloader: DeviceRebootType.Boardloader,
+  Bootloader: DeviceRebootType.Bootloader,
+  bootloader: DeviceRebootType.Bootloader,
+};
+
+export const PROTOCOL_V2_FIRMWARE_UPDATE_OPTIONS: TransportCallOptions = {
+  intermediateTypes: ['DeviceFirmwareInstallProgress'],
+};
+
+export const PROTOCOL_V2_FIRMWARE_UPDATE_RESPONSE_TYPES: (
+  | 'Success'
+  | 'DeviceFirmwareUpdateStatus'
+)[] = ['Success', 'DeviceFirmwareUpdateStatus'];
+
+export function normalizeRebootType(value: RebootTypeInput | undefined): DeviceRebootType {
+  if (typeof value === 'number') return value;
+  if (typeof value === 'string') {
+    const numeric = Number(value);
+    if (Number.isFinite(numeric)) return numeric;
+    if (value in DEVICE_REBOOT_TYPES) return DEVICE_REBOOT_TYPES[value];
+  }
+  return DeviceRebootType.Normal;
+}
+
+function normalizeTargetId(
+  value: DeviceFirmwareTargetType | string | number | undefined,
+  name: string
+): DeviceFirmwareTargetType {
+  if (value === undefined || value === null) {
+    throw invalidParameter(`Missing required parameter: ${name}`);
+  }
+  if (typeof value === 'number') {
+    if (Number.isSafeInteger(value) && value > 0) return value;
+    throw invalidParameter(`Parameter [${name}] must be a valid firmware target id.`);
+  }
+  const numeric = Number(value);
+  if (Number.isSafeInteger(numeric) && numeric > 0) return numeric;
+  throw invalidParameter(`Parameter [${name}] must be a valid firmware target id.`);
+}
+
+export function normalizeFirmwareTargets(
+  params: DeviceFirmwareUpdateParams
+): DeviceFirmwareTarget[] {
+  const targets =
+    params.targets ??
+    (params.path
+      ? [
+          {
+            target_id: params.target_id ?? params.targetId ?? 0,
+            path: params.path,
+          },
+        ]
+      : []);
+
+  if (!Array.isArray(targets) || targets.length === 0) {
+    throw invalidParameter('Parameter [targets] must contain at least one firmware target.');
+  }
+
+  return targets.map((target, index) => {
+    if (!target || typeof target !== 'object') {
+      throw invalidParameter(`Parameter [targets.${index}] must be an object.`);
+    }
+    const targetId = target.target_id ?? target.targetId;
+    return {
+      target_id: normalizeTargetId(targetId, `targets.${index}.target_id`),
+      path: validateNonEmptyString(target.path, `targets.${index}.path`),
+    };
+  });
+}
+
+export function buildTargets(params: DeviceGetDeviceInfoParams): DeviceInfoTargets | undefined {
+  if (params.targets) return params.targets;
+
+  const targets: DeviceInfoTargets = {
+    hw: params.targetHw,
+    fw: params.targetFw,
+    bt: params.targetBt,
+    se1: params.targetSe1,
+    se2: params.targetSe2,
+    se3: params.targetSe3,
+    se4: params.targetSe4,
+    status: params.targetStatus,
+  };
+  return Object.values(targets).some(value => value !== undefined) ? targets : undefined;
+}
+
+export function buildTypes(params: DeviceGetDeviceInfoParams): DeviceInfoTypes | undefined {
+  if (params.types) return params.types;
+
+  const types: DeviceInfoTypes = {
+    version: params.includeVersion,
+    build_id: params.includeBuildId,
+    hash: params.includeHash,
+    specific: params.includeSpecific,
+  };
+  return Object.values(types).some(value => value !== undefined) ? types : undefined;
+}

package/src/api/scdo/ScdoGetAddress.ts

@@ -4,7 +4,7 @@ import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
 
 import type { ScdoGetAddress as HardwareScdoGetAddress } from '@onekeyfe/hd-transport';
-import type { ScdoAddress, ScdoGetAddressParams } from '../../types';
+import type { DeviceFirmwareRange, ScdoAddress, ScdoGetAddressParams } from '../../types';
 
 export default class ScdoGetAddress extends BaseMethod<HardwareScdoGetAddress[]> {
   hasBundle = false;
@@ -38,8 +38,12 @@ export default class ScdoGetAddress extends BaseMethod<HardwareScdoGetAddress[]>
     });
   }
 
-  getVersionRange() {
+  getVersionRange(): DeviceFirmwareRange {
     return {
+      pro2: {
+        min: '0.0.0',
+        unsupported: true,
+      },
       model_touch: {
         min: '4.10.0',
       },

package/src/api/scdo/ScdoSignMessage.ts

@@ -5,12 +5,12 @@ import { validateParams } from '../helpers/paramsValidator';
 import { stripHexPrefix } from '../helpers/hexUtils';
 
 import type { ScdoSignMessage as HardwareScdoSignMessage } from '@onekeyfe/hd-transport';
+import type { DeviceFirmwareRange } from '../../types';
 
 export default class ScdoSignMessage extends BaseMethod<HardwareScdoSignMessage> {
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [
@@ -28,8 +28,12 @@ export default class ScdoSignMessage extends BaseMethod<HardwareScdoSignMessage>
     };
   }
 
-  getVersionRange() {
+  getVersionRange(): DeviceFirmwareRange {
     return {
+      pro2: {
+        min: '0.0.0',
+        unsupported: true,
+      },
       model_touch: {
         min: '4.10.0',
       },

package/src/api/scdo/ScdoSignTransaction.ts

@@ -6,7 +6,7 @@ import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { formatAnyHex, stripHexStartZeroes } from '../helpers/hexUtils';
 
-import type { ScdoSignTransactionParams } from '../../types';
+import type { DeviceFirmwareRange, ScdoSignTransactionParams } from '../../types';
 import type {
   ScdoSignTx as HardwareScdoSignTx,
   ScdoSignedTx,
@@ -18,7 +18,6 @@ export default class ScdoSignTransaction extends BaseMethod<HardwareScdoSignTx>
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [
@@ -51,8 +50,12 @@ export default class ScdoSignTransaction extends BaseMethod<HardwareScdoSignTx>
     };
   }
 
-  getVersionRange() {
+  getVersionRange(): DeviceFirmwareRange {
     return {
+      pro2: {
+        min: '0.0.0',
+        unsupported: true,
+      },
       model_touch: {
         min: '4.10.0',
       },

package/src/api/solana/SolGetAddress.ts

@@ -38,6 +38,15 @@ export default class SolGetAddress extends BaseMethod<SolanaGetAddress[]> {
     });
   }
 
+  getVersionRange() {
+    return {
+      pro2: {
+        min: '0.0.0',
+        unsupported: true,
+      },
+    };
+  }
+
   async run() {
     const responses: SolanaAddress[] = [];
 

package/src/api/solana/SolSignMessage.ts

@@ -10,7 +10,6 @@ export default class SolSignMessage extends BaseMethod<HardwareSolSignUnsafeMess
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [
@@ -30,6 +29,10 @@ export default class SolSignMessage extends BaseMethod<HardwareSolSignUnsafeMess
 
   getVersionRange() {
     return {
+      pro2: {
+        min: '0.0.0',
+        unsupported: true,
+      },
       pro: {
         min: '4.12.0',
       },

package/src/api/solana/SolSignOffchainMessage.ts

@@ -10,7 +10,6 @@ export default class SolSignOffchainMessage extends BaseMethod<HardwareSolSignOf
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [
@@ -36,6 +35,10 @@ export default class SolSignOffchainMessage extends BaseMethod<HardwareSolSignOf
 
   getVersionRange() {
     return {
+      pro2: {
+        min: '0.0.0',
+        unsupported: true,
+      },
       pro: {
         min: '4.12.0',
       },

package/src/api/solana/SolSignTransaction.ts

@@ -13,7 +13,6 @@ export default class SolSignTransaction extends BaseMethod<HardwareSolanaSignTx[
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     this.hasBundle = !!this.payload?.bundle;
     const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };
@@ -43,6 +42,10 @@ export default class SolSignTransaction extends BaseMethod<HardwareSolanaSignTx[
   getVersionRange() {
     if (this.existsVersionedTx()) {
       return {
+        pro2: {
+          min: '0.0.0',
+          unsupported: true,
+        },
         model_mini: {
           min: '3.1.0',
         },
@@ -53,6 +56,10 @@ export default class SolSignTransaction extends BaseMethod<HardwareSolanaSignTx[
     }
 
     return {
+      pro2: {
+        min: '0.0.0',
+        unsupported: true,
+      },
       classic: {
         min: '2.1.9',
       },

package/src/api/starcoin/StarcoinSignMessage.ts

@@ -10,7 +10,6 @@ export default class StarcoinSignMessage extends BaseMethod<HardwareStarcoinSign
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/starcoin/StarcoinSignTransaction.ts

@@ -10,7 +10,6 @@ export default class StarcoinSignTransaction extends BaseMethod<StarcoinSignTx>
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/stellar/StellarGetAddress.ts

@@ -4,7 +4,7 @@ import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
 
 import type { StellarGetAddress as HardwareStellarGetAddress } from '@onekeyfe/hd-transport';
-import type { StellarAddress, StellarGetAddressParams } from '../../types';
+import type { DeviceFirmwareRange, StellarAddress, StellarGetAddressParams } from '../../types';
 
 export default class StellarGetAddress extends BaseMethod<HardwareStellarGetAddress[]> {
   hasBundle = false;
@@ -38,6 +38,15 @@ export default class StellarGetAddress extends BaseMethod<HardwareStellarGetAddr
     });
   }
 
+  getVersionRange(): DeviceFirmwareRange {
+    return {
+      pro2: {
+        min: '0.0.0',
+        unsupported: true,
+      },
+    };
+  }
+
   async run() {
     const responses: StellarAddress[] = [];
 

package/src/api/stellar/StellarSignTransaction.ts

@@ -10,7 +10,11 @@ import type {
   StellarSignTx as HardwareStellarSignTx,
   StellarSignedTx,
 } from '@onekeyfe/hd-transport';
-import type { StellarOperation, StellarSignTransactionParams } from '../../types';
+import type {
+  DeviceFirmwareRange,
+  StellarOperation,
+  StellarSignTransactionParams,
+} from '../../types';
 
 // Firmware accepts up to 1024 bytes per chunk; 1 byte = 2 hex chars
 const SOROBAN_CHUNK_BYTES = 1024;
@@ -28,6 +32,15 @@ export default class StellarSignTransaction extends BaseMethod<HardwareStellarSi
     extSent: number;
   };
 
+  getVersionRange(): DeviceFirmwareRange {
+    return {
+      pro2: {
+        min: '0.0.0',
+        unsupported: true,
+      },
+    };
+  }
+
   parseOperation = (op: StellarOperation) => {
     switch (op.type) {
       case 'createAccount':
@@ -218,7 +231,6 @@ export default class StellarSignTransaction extends BaseMethod<HardwareStellarSi
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/sui/SuiSignMessage.ts

@@ -10,7 +10,6 @@ export default class SuiSignMessage extends BaseMethod<HardwareSuiSignMessage> {
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [

package/src/api/sui/SuiSignTransaction.ts

@@ -1,5 +1,6 @@
 import semver from 'semver';
 import { bytesToHex } from '@noble/hashes/utils';
+import { EDeviceType } from '@onekeyfe/hd-shared';
 
 import { UI_REQUEST } from '../../constants/ui-request';
 import { validatePath } from '../helpers/pathUtils';
@@ -9,12 +10,8 @@ import { formatAnyHex } from '../helpers/hexUtils';
 import { getDeviceFirmwareVersion, getDeviceType } from '../../utils';
 import { DeviceModelToTypes } from '../../types';
 
-import type {
-  SuiSignTx as HardwareSuiSignTx,
-  SuiSignedTx,
-  TypedCall,
-} from '@onekeyfe/hd-transport';
-import type { TypedResponseMessage } from '../../device/DeviceCommands';
+import type { SuiSignTx as HardwareSuiSignTx, SuiSignedTx } from '@onekeyfe/hd-transport';
+import type { TypedCall, TypedResponseMessage } from '../../device/DeviceCommands';
 
 type SuiSignTx = Omit<HardwareSuiSignTx, 'data_initial_chunk' | 'data_length'> & HardwareSuiSignTx;
 
@@ -22,7 +19,6 @@ export default class SuiSignTransaction extends BaseMethod<SuiSignTx> {
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [
@@ -53,6 +49,13 @@ export default class SuiSignTransaction extends BaseMethod<SuiSignTx> {
   }
 
   supportChunkTransfer() {
+    if (
+      this.device.originalDescriptor?.protocolType === 'V2' ||
+      getDeviceType(this.device.features) === EDeviceType.Pro2
+    ) {
+      return true;
+    }
+
     const deviceType = getDeviceType(this.device.features);
     const deviceFirmwareVersion = getDeviceFirmwareVersion(this.device.features).join('.');
 
@@ -85,7 +88,7 @@ export default class SuiSignTransaction extends BaseMethod<SuiSignTx> {
 
     if (!data_length) {
       // sign Done
-      return res.message;
+      return res.message as SuiSignedTx;
     }
 
     const payload = data.subarray(offset, offset + data_length);
@@ -104,7 +107,7 @@ export default class SuiSignTransaction extends BaseMethod<SuiSignTx> {
   async run() {
     const typedCall = this.device.getCommands().typedCall.bind(this.device.getCommands());
     let offset = 0;
-    let data: Buffer;
+    let data = Buffer.alloc(0);
 
     if (this.supportChunkTransfer()) {
       offset = this.chunkByteSize;
@@ -121,7 +124,6 @@ export default class SuiSignTransaction extends BaseMethod<SuiSignTx> {
       ...this.params,
     });
 
-    // @ts-expect-error
     return this.processTxRequest(typedCall, res, data, offset);
   }
 }

package/src/api/ton/TonSignData.ts

@@ -15,7 +15,6 @@ export default class TonSignData extends BaseMethod<HardwareTonSignData> {
     this.strictCheckDeviceSupport = false;
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     validateParams(this.payload, [
       { name: 'path', required: true },

package/src/api/ton/TonSignMessage.ts

@@ -26,7 +26,6 @@ export default class TonSignMessage extends BaseMethod<HardwareTonSignMessage> {
     this.strictCheckDeviceSupport = true;
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     // init params
     validateParams(this.payload, [

package/src/api/ton/TonSignProof.ts

@@ -11,7 +11,6 @@ export default class TonSignProof extends BaseMethod<HardwareTonSignProof> {
     this.strictCheckDeviceSupport = true;
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     // init params
     validateParams(this.payload, [

package/src/api/tron/TronGetAddress.ts

@@ -40,6 +40,10 @@ export default class TronGetAddress extends BaseMethod<HardwareTronGetAddress[]>
 
   getVersionRange() {
     return {
+      pro2: {
+        min: '0.0.0',
+        unsupported: true,
+      },
       model_mini: {
         min: '2.5.0',
       },

package/src/api/tron/TronSignMessage.ts

@@ -14,7 +14,6 @@ export default class TronSignMessage extends BaseMethod<HardwareTronSignMessage>
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [
@@ -29,7 +28,7 @@ export default class TronSignMessage extends BaseMethod<HardwareTronSignMessage>
     if (this.payload.messageType === 'V1' || this.payload.messageType == null) {
       throw createDeviceNotSupportMethodError(
         'TronSignMessage',
-        getFirmwareType(this.device.features)
+        getFirmwareType(this.device?.features)
       );
     }
 
@@ -45,6 +44,10 @@ export default class TronSignMessage extends BaseMethod<HardwareTronSignMessage>
 
   getVersionRange() {
     return {
+      pro2: {
+        min: '0.0.0',
+        unsupported: true,
+      },
       model_mini: {
         min: '2.5.0',
       },

package/src/api/tron/TronSignTransaction.ts

@@ -123,7 +123,6 @@ export default class TronSignTransaction extends BaseMethod<TronSignTx> {
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     // check payload
     validateParams(this.payload, [
@@ -148,6 +147,10 @@ export default class TronSignTransaction extends BaseMethod<TronSignTx> {
 
   getVersionRange() {
     return {
+      pro2: {
+        min: '0.0.0',
+        unsupported: true,
+      },
       model_mini: {
         min: '2.5.0',
       },

package/src/api/xrp/XrpSignTransaction.ts

@@ -11,7 +11,6 @@ export default class XrpGetAddress extends BaseMethod<XrpSignTransactionParams>
   init() {
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
-    this.allowUsePreInitialize = true;
 
     const { payload } = this;
     validateParams(payload, [
@@ -30,7 +29,7 @@ export default class XrpGetAddress extends BaseMethod<XrpSignTransactionParams>
       { name: 'payment', type: 'object' },
     ]);
     validateParams(transaction.payment, [
-      { name: 'amount', type: 'number', required: true },
+      { name: 'amount', type: 'uint', required: true },
       { name: 'destination', type: 'string', required: true },
       { name: 'destinationTag', type: 'number' },
     ]);

package/src/core/RequestQueue.ts

@@ -113,20 +113,13 @@ export default class RequestQueue {
 
     callbackPromise.promise.finally(() => {
       Log.debug(`Callback task completed for connectId: ${connectId}`);
-      // Delete by identity so a newer task that replaced this slot isn't orphaned.
-      if (this.pendingCallbackTasks.get(connectId) === callbackPromise) {
-        this.pendingCallbackTasks.delete(connectId);
-      }
+      this.pendingCallbackTasks.delete(connectId);
     });
   }
 
-  public async waitForPendingCallbackTasks(
-    connectId: string,
-    exceptTask?: Deferred<void>
-  ): Promise<void> {
+  public async waitForPendingCallbackTasks(connectId: string): Promise<void> {
     const pendingTask = this.pendingCallbackTasks.get(connectId);
-    // Skip only the caller's own task (self-wait); a different one is still awaited.
-    if (pendingTask && pendingTask !== exceptTask) {
+    if (pendingTask) {
       Log.debug(`Waiting for pending callback task to complete for connectId: ${connectId}`);
       await pendingTask.promise;
     }