@onekeyfe/hd-core 1.1.34-alpha.3 → 1.1.34-alpha.4

package/src/api/nervos/NervosSignTransaction.ts

@@ -5,12 +5,8 @@ import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { formatAnyHex } from '../helpers/hexUtils';
 
-import type { DeviceFirmwareRange, NervosSignTransactionParams, NervosSignedTx } from '../../types';
-import type {
-  NervosSignTx as HardwareNervosSignTx,
-  NervosTxRequest,
-  TypedCall,
-} from '@onekeyfe/hd-transport';
+import type { NervosSignTransactionParams, NervosSignedTx } from '../../types';
+import type { NervosSignTx as HardwareNervosSignTx, TypedCall } from '@onekeyfe/hd-transport';
 import type { TypedResponseMessage } from '../../device/DeviceCommands';
 
 type NervosSignTx = Omit<HardwareNervosSignTx, 'data_initial_chunk' | 'data_length'> & {
@@ -45,12 +41,8 @@ export default class NervosSignTransaction extends BaseMethod<NervosSignTx> {
     };
   }
 
-  getVersionRange(): DeviceFirmwareRange {
+  getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       model_mini: {
         min: '3.7.0',
       },
@@ -67,9 +59,7 @@ export default class NervosSignTransaction extends BaseMethod<NervosSignTx> {
     res: TypedResponseMessage<'NervosSignedTx'> | TypedResponseMessage<'NervosTxRequest'>,
     data: Buffer,
     offset = 0
-    // The final NervosTxRequest may return a signature without data_length or address,
-    // so the result accurately uses a union type.
-  ): Promise<NervosSignedTx | (NervosTxRequest & { path: string })> => {
+  ): Promise<NervosSignedTx> => {
     if (res.type === 'NervosSignedTx') {
       if (!res?.message?.signature) {
         throw new Error('No signature returned');

package/src/api/nexa/NexaGetAddress.ts

@@ -4,7 +4,7 @@ import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
 
 import type { NexaGetAddress as HardwareNexaGetAddress } from '@onekeyfe/hd-transport';
-import type { DeviceFirmwareRange, NexaGetAddressParams } from '../../types';
+import type { NexaGetAddressParams } from '../../types';
 
 export default class NexaGetAddress extends BaseMethod<HardwareNexaGetAddress[]> {
   hasBundle = false;
@@ -43,12 +43,8 @@ export default class NexaGetAddress extends BaseMethod<HardwareNexaGetAddress[]>
     });
   }
 
-  getVersionRange(): DeviceFirmwareRange {
+  getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       model_mini: {
         min: '3.2.0',
       },

package/src/api/nexa/NexaSignTransaction.ts

@@ -6,7 +6,7 @@ import { validateParams } from '../helpers/paramsValidator';
 
 import type { TypedResponseMessage } from '../../device/DeviceCommands';
 import type { TypedCall } from '@onekeyfe/hd-transport';
-import type { DeviceFirmwareRange, NexaSignTransactionParams, NexaSignature } from '../../types';
+import type { NexaSignTransactionParams, NexaSignature } from '../../types';
 
 export default class NexaSignTransaction extends BaseMethod<NexaSignTransactionParams> {
   hasBundle = false;
@@ -27,12 +27,8 @@ export default class NexaSignTransaction extends BaseMethod<NexaSignTransactionP
     this.params = payload;
   }
 
-  getVersionRange(): DeviceFirmwareRange {
+  getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       model_mini: {
         min: '3.2.0',
       },
@@ -72,12 +68,17 @@ export default class NexaSignTransaction extends BaseMethod<NexaSignTransactionP
 
       const nextIndex = res.message.request_index;
       const input = this.params.inputs[nextIndex];
-      const response = await typedCall('NexaTxInputAck', ['NexaTxInputRequest', 'NexaSignedTx'], {
-        // Normalize a string path to address_n, matching the first input handled by run().
-        address_n: validatePath(input.path, 3),
-        raw_message: input.message,
-      });
+      const response = await typedCall(
+        'NexaTxInputAck',
+        // @ts-expect-error
+        ['NexaTxInputRequest', 'NexaSignedTx'],
+        {
+          address_n: input.path,
+          raw_message: input.message,
+        }
+      );
 
+      // @ts-expect-error
       return this.processTxRequest(typedCall, response, nextIndex, signatures);
     }
 

package/src/api/polkadot/networks.ts

@@ -23,9 +23,6 @@ const baseVersionRange = {
   model_touch: {
     min: '4.3.0',
   },
-  pro2: {
-    min: '0.0.0',
-  },
 };
 
 const specialVersionRange: Record<string, DeviceFirmwareRange> = {
@@ -36,9 +33,6 @@ const specialVersionRange: Record<string, DeviceFirmwareRange> = {
     model_touch: {
       min: '4.7.0',
     },
-    pro2: {
-      min: '0.0.0',
-    },
   },
   [Networks.Manta]: {
     model_mini: {
@@ -47,9 +41,6 @@ const specialVersionRange: Record<string, DeviceFirmwareRange> = {
     model_touch: {
       min: '4.9.0',
     },
-    pro2: {
-      min: '0.0.0',
-    },
   },
 };
 

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 { DeviceFirmwareRange, ScdoAddress, ScdoGetAddressParams } from '../../types';
+import type { ScdoAddress, ScdoGetAddressParams } from '../../types';
 
 export default class ScdoGetAddress extends BaseMethod<HardwareScdoGetAddress[]> {
   hasBundle = false;
@@ -38,12 +38,8 @@ export default class ScdoGetAddress extends BaseMethod<HardwareScdoGetAddress[]>
     });
   }
 
-  getVersionRange(): DeviceFirmwareRange {
+  getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-        unsupported: true,
-      },
       model_touch: {
         min: '4.10.0',
       },

package/src/api/scdo/ScdoSignMessage.ts

@@ -5,7 +5,6 @@ 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() {
@@ -29,12 +28,8 @@ export default class ScdoSignMessage extends BaseMethod<HardwareScdoSignMessage>
     };
   }
 
-  getVersionRange(): DeviceFirmwareRange {
+  getVersionRange() {
     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 { DeviceFirmwareRange, ScdoSignTransactionParams } from '../../types';
+import type { ScdoSignTransactionParams } from '../../types';
 import type {
   ScdoSignTx as HardwareScdoSignTx,
   ScdoSignedTx,
@@ -51,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/SolGetAddress.ts

@@ -38,10 +38,6 @@ export default class SolGetAddress extends BaseMethod<SolanaGetAddress[]> {
     });
   }
 
-  getVersionRange() {
-    return {};
-  }
-
   async run() {
     const responses: SolanaAddress[] = [];
 

package/src/api/solana/SolSignMessage.ts

@@ -30,9 +30,6 @@ export default class SolSignMessage extends BaseMethod<HardwareSolSignUnsafeMess
 
   getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-      },
       pro: {
         min: '4.12.0',
       },

package/src/api/solana/SolSignOffchainMessage.ts

@@ -36,9 +36,6 @@ export default class SolSignOffchainMessage extends BaseMethod<HardwareSolSignOf
 
   getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-      },
       pro: {
         min: '4.12.0',
       },

package/src/api/solana/SolSignTransaction.ts

@@ -43,9 +43,6 @@ export default class SolSignTransaction extends BaseMethod<HardwareSolanaSignTx[
   getVersionRange() {
     if (this.existsVersionedTx()) {
       return {
-        pro2: {
-          min: '0.0.0',
-        },
         model_mini: {
           min: '3.1.0',
         },
@@ -56,9 +53,6 @@ export default class SolSignTransaction extends BaseMethod<HardwareSolanaSignTx[
     }
 
     return {
-      pro2: {
-        min: '0.0.0',
-      },
       classic: {
         min: '2.1.9',
       },

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':

package/src/api/sui/SuiGetAddress.ts

@@ -2,8 +2,9 @@ import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
+import { supportBatchPublicKey } from '../../utils/deviceFeaturesUtils';
 import { publicKeyToAddress } from './normalize';
-import { batchGetPublickeys, supportBatchPublicKeyByDevice } from '../helpers/batchGetPublickeys';
+import { batchGetPublickeys } from '../helpers/batchGetPublickeys';
 
 import type { SuiAddress, SuiGetAddressParams } from '../../types';
 import type { SuiGetAddress as HardwareSuiGetAddress } from '@onekeyfe/hd-transport';
@@ -48,9 +49,6 @@ export default class SuiGetAddress extends BaseMethod<HardwareSuiGetAddress[]> {
 
   getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-      },
       model_mini: {
         min: '3.0.0',
       },
@@ -61,7 +59,7 @@ export default class SuiGetAddress extends BaseMethod<HardwareSuiGetAddress[]> {
   }
 
   async run() {
-    const supportsBatchPublicKey = supportBatchPublicKeyByDevice(this.device);
+    const supportsBatchPublicKey = supportBatchPublicKey(this.device?.features);
     let responses: SuiAddress[] = [];
     if (supportsBatchPublicKey) {
       const publicKeyRes = await batchGetPublickeys(this.device, this.params, 'ed25519', 784);

package/src/api/sui/SuiGetPublicKey.ts

@@ -40,9 +40,6 @@ export default class SuiGetPublicKey extends BaseMethod<any> {
 
   getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-      },
       model_mini: {
         min: '3.0.0',
       },

package/src/api/sui/SuiSignMessage.ts

@@ -30,9 +30,6 @@ export default class SuiSignMessage extends BaseMethod<HardwareSuiSignMessage> {
 
   getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-      },
       model_mini: {
         min: '3.4.0',
       },

package/src/api/sui/SuiSignTransaction.ts

@@ -1,16 +1,20 @@
 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';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 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;
 
@@ -39,9 +43,6 @@ export default class SuiSignTransaction extends BaseMethod<SuiSignTx> {
 
   getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-      },
       model_mini: {
         min: '3.0.0',
       },
@@ -52,12 +53,8 @@ export default class SuiSignTransaction extends BaseMethod<SuiSignTx> {
   }
 
   supportChunkTransfer() {
-    if (this.device.isProtocolV2() || this.device.getCurrentDeviceType() === EDeviceType.Pro2) {
-      return true;
-    }
-
-    const deviceType = this.device.getCurrentDeviceType();
-    const deviceFirmwareVersion = this.device.getCurrentFirmwareVersionString() ?? '0.0.0';
+    const deviceType = getDeviceType(this.device.features);
+    const deviceFirmwareVersion = getDeviceFirmwareVersion(this.device.features).join('.');
 
     if (DeviceModelToTypes.model_mini.includes(deviceType)) {
       if (semver.valid(deviceFirmwareVersion)) {
@@ -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/TonGetAddress.ts

@@ -57,9 +57,6 @@ export default class TonGetAddress extends BaseMethod<HardwareTonGetAddress[]> {
 
   getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-      },
       model_touch: {
         min: '4.10.0',
       },

package/src/api/ton/TonSignData.ts

@@ -9,8 +9,9 @@ import type { TonSignDataParams } from '../../types/api/tonSignData';
 
 export default class TonSignData extends BaseMethod<HardwareTonSignData> {
   init() {
-    // Keep strict-check off for touch/classic1s until their firmware release
-    // versions are decided. Pro2 is explicitly allowed by getVersionRange().
+    // Keep strict-check off until the firmware release that ships TonSignData
+    // is decided — we don't yet know the min versions for touch/classic1s.
+    // Flip back to true and add getVersionRange() once those numbers land.
     this.strictCheckDeviceSupport = false;
     this.checkDeviceId = true;
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.NOT_INITIALIZE];
@@ -50,10 +51,6 @@ export default class TonSignData extends BaseMethod<HardwareTonSignData> {
     };
   }
 
-  getVersionRange() {
-    return {};
-  }
-
   async run() {
     const res = await this.device.commands.typedCall('TonSignData', 'TonSignedData', {
       ...this.params,

package/src/api/ton/TonSignMessage.ts

@@ -7,6 +7,7 @@ import { validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { DeviceModelToTypes } from '../../types';
+import { getDeviceFirmwareVersion, getDeviceType, getMethodVersionRange } from '../../utils';
 import { formatAnyHex, stripHexStartZeroes } from '../helpers/hexUtils';
 import { cutString } from '../helpers/stringUtils';
 
@@ -85,9 +86,6 @@ export default class TonSignMessage extends BaseMethod<HardwareTonSignMessage> {
 
   getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-      },
       model_touch: {
         min: '4.10.0',
       },
@@ -109,8 +107,9 @@ export default class TonSignMessage extends BaseMethod<HardwareTonSignMessage> {
   }
 
   checkSupportJettonAmountBytes() {
-    const firmwareVersion = this.device.getCurrentFirmwareVersionString() ?? '0.0.0';
-    const versionRange = this.device.getCurrentMethodVersionRange(
+    const firmwareVersion = getDeviceFirmwareVersion(this.device.features)?.join('.');
+    const versionRange = getMethodVersionRange(
+      this.device.features,
       type => this.getSupportJettonAmountBytesVersionRange()[type]
     );
 
@@ -168,7 +167,7 @@ export default class TonSignMessage extends BaseMethod<HardwareTonSignMessage> {
     data: string
   ): Promise<TonTxAck | TonSignedMessageResponse> => {
     if (!request.init_data_length) {
-      const deviceType = this.device.getCurrentDeviceType();
+      const deviceType = getDeviceType(this.device.features);
       const hasClassic = DeviceModelToTypes.model_classic1s.includes(deviceType);
       // use signing_message_repr sign, not exists signning_message, skip validate
       const hasSigningMessageRepr = request.signning_message == null;

package/src/api/ton/TonSignProof.ts

@@ -44,9 +44,6 @@ export default class TonSignProof extends BaseMethod<HardwareTonSignProof> {
 
   getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-      },
       model_touch: {
         min: '4.10.0',
       },

package/src/api/tron/TronSignMessage.ts

@@ -29,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)
       );
     }
 
@@ -45,9 +45,6 @@ export default class TronSignMessage extends BaseMethod<HardwareTronSignMessage>
 
   getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-      },
       model_mini: {
         min: '2.5.0',
       },

package/src/api/tron/TronSignTransaction.ts

@@ -148,9 +148,6 @@ export default class TronSignTransaction extends BaseMethod<TronSignTx> {
 
   getVersionRange() {
     return {
-      pro2: {
-        min: '0.0.0',
-      },
       model_mini: {
         min: '2.5.0',
       },

package/src/api/utils.ts

@@ -2,20 +2,16 @@ import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 
 import * as ApiMethods from './index';
 
-import type { BaseMethod } from './BaseMethod';
 import type { IFrameCallMessage } from '../events';
 
-type MethodConstructor = new (message: IFrameCallMessage & { id?: number }) => BaseMethod<any>;
-
-const publicMethodRegistry = ApiMethods as unknown as Record<string, MethodConstructor>;
-
-export function findMethod(message: IFrameCallMessage & { id?: number }): BaseMethod<any> {
+export function findMethod(message: IFrameCallMessage & { id?: number }) {
   const { method } = message.payload;
   if (typeof method !== 'string') {
     throw ERRORS.TypedError(HardwareErrorCode.CallMethodInvalidParameter, 'Method is not set');
   }
 
-  const MethodConstructor = publicMethodRegistry[method];
+  // @ts-expect-error
+  const MethodConstructor = ApiMethods[method];
   if (MethodConstructor) {
     return new MethodConstructor(message);
   }

package/src/api/xrp/XrpSignTransaction.ts

@@ -30,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/constants/index.ts

@@ -1,8 +1,2 @@
 export { safeThrowError } from './errors';
-export {
-  Messages as PROTO,
-  ResourceType,
-  TonSignDataType,
-  TonWalletVersion,
-} from '@onekeyfe/hd-transport';
-export type { HDNodeType, Success as DeviceSuccess } from '@onekeyfe/hd-transport';
+export { Messages as PROTO, TonSignDataType } from '@onekeyfe/hd-transport';