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

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 { DeviceFirmwareRange, ScdoSignTransactionParams } from '../../types';
+import type { ScdoSignTransactionParams } from '../../types';
 import type {
   ScdoSignTx as HardwareScdoSignTx,
   ScdoSignedTx,
@@ -18,6 +18,7 @@ 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, [
@@ -50,12 +51,8 @@ export default class ScdoSignTransaction extends BaseMethod<HardwareScdoSignTx>
     };
   }
 
-  getVersionRange(): DeviceFirmwareRange {
+  getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       model_touch: {
         min: '4.10.0',
       },

package/src/api/solana/SolSignMessage.ts

@@ -10,6 +10,7 @@ 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, [

package/src/api/solana/SolSignOffchainMessage.ts

@@ -10,6 +10,7 @@ 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, [

package/src/api/solana/SolSignTransaction.ts

@@ -13,6 +13,7 @@ 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] };

package/src/api/starcoin/StarcoinSignMessage.ts

@@ -10,6 +10,7 @@ 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,6 +10,7 @@ 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 { DeviceFirmwareRange, StellarAddress, StellarGetAddressParams } from '../../types';
+import type { StellarAddress, StellarGetAddressParams } from '../../types';
 
 export default class StellarGetAddress extends BaseMethod<HardwareStellarGetAddress[]> {
   hasBundle = false;
@@ -38,15 +38,6 @@ 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,11 +10,7 @@ import type {
   StellarSignTx as HardwareStellarSignTx,
   StellarSignedTx,
 } from '@onekeyfe/hd-transport';
-import type {
-  DeviceFirmwareRange,
-  StellarOperation,
-  StellarSignTransactionParams,
-} from '../../types';
+import type { StellarOperation, StellarSignTransactionParams } from '../../types';
 
 // Firmware accepts up to 1024 bytes per chunk; 1 byte = 2 hex chars
 const SOROBAN_CHUNK_BYTES = 1024;
@@ -32,15 +28,6 @@ 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':
@@ -231,6 +218,7 @@ 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,6 +10,7 @@ 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,6 +1,5 @@
 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';
@@ -10,8 +9,12 @@ import { formatAnyHex } from '../helpers/hexUtils';
 import { getDeviceFirmwareVersion, getDeviceType } from '../../utils';
 import { DeviceModelToTypes } from '../../types';
 
-import type { SuiSignTx as HardwareSuiSignTx, SuiSignedTx } from '@onekeyfe/hd-transport';
-import type { TypedCall, TypedResponseMessage } from '../../device/DeviceCommands';
+import type {
+  SuiSignTx as HardwareSuiSignTx,
+  SuiSignedTx,
+  TypedCall,
+} from '@onekeyfe/hd-transport';
+import type { TypedResponseMessage } from '../../device/DeviceCommands';
 
 type SuiSignTx = Omit<HardwareSuiSignTx, 'data_initial_chunk' | 'data_length'> & HardwareSuiSignTx;
 
@@ -19,6 +22,7 @@ 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, [
@@ -49,13 +53,6 @@ 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('.');
 
@@ -88,7 +85,7 @@ export default class SuiSignTransaction extends BaseMethod<SuiSignTx> {
 
     if (!data_length) {
       // sign Done
-      return res.message as SuiSignedTx;
+      return res.message;
     }
 
     const payload = data.subarray(offset, offset + data_length);
@@ -107,7 +104,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.alloc(0);
+    let data: Buffer;
 
     if (this.supportChunkTransfer()) {
       offset = this.chunkByteSize;
@@ -124,6 +121,7 @@ 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,6 +15,7 @@ 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,6 +26,7 @@ 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,6 +11,7 @@ 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/TronSignMessage.ts

@@ -14,6 +14,7 @@ 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, [
@@ -28,7 +29,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)
       );
     }
 

package/src/api/tron/TronSignTransaction.ts

@@ -123,6 +123,7 @@ 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, [

package/src/api/xrp/XrpSignTransaction.ts

@@ -11,6 +11,7 @@ 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, [
@@ -29,7 +30,7 @@ export default class XrpGetAddress extends BaseMethod<XrpSignTransactionParams>
       { name: 'payment', type: 'object' },
     ]);
     validateParams(transaction.payment, [
-      { name: 'amount', type: 'uint', required: true },
+      { name: 'amount', type: 'number', required: true },
       { name: 'destination', type: 'string', required: true },
       { name: 'destinationTag', type: 'number' },
     ]);

package/src/core/PollingStateManager.ts

@@ -0,0 +1,47 @@
+/**
+ * Manages polling state for device connection attempts.
+ *
+ * Polling is isolated by connectId (device), so:
+ * - New request for device A only stops device A's previous polling
+ * - Device B's polling is unaffected
+ */
+export class PollingStateManager {
+  // connectId -> current polling ID
+  private activePolls = new Map<string, number>();
+
+  /**
+   * Start a new polling session for a device.
+   * Automatically stops the previous polling for the same device.
+   * @param connectId - Device identifier (use empty string for USB without connectId)
+   * @returns The new polling ID
+   */
+  start(connectId: string): number {
+    const currentId = (this.activePolls.get(connectId) ?? 0) + 1;
+    this.activePolls.set(connectId, currentId);
+    return currentId;
+  }
+
+  /**
+   * Check if a polling session is still active.
+   * @param connectId - Device identifier
+   * @param pollingId - The polling ID to check
+   */
+  isActive(connectId: string, pollingId: number): boolean {
+    return this.activePolls.get(connectId) === pollingId;
+  }
+
+  /**
+   * Stop polling for a specific device.
+   * @param connectId - Device identifier
+   */
+  stop(connectId: string): void {
+    this.activePolls.delete(connectId);
+  }
+
+  /**
+   * Stop all active polling sessions.
+   */
+  stopAll(): void {
+    this.activePolls.clear();
+  }
+}

package/src/core/RequestQueue.ts

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