@onekeyfe/hd-core 0.0.4 → 0.0.7

package/dist/api/SearchDevices.d.ts

@@ -5,7 +5,7 @@ export default class SearchDevices extends BaseMethod {
     init(): void;
     run(): Promise<{
         connectId: string;
-        deviceType: string;
+        deviceType: import("..").IDeviceType | null;
         path: string;
         session?: string | null | undefined;
         debugSession?: string | null | undefined;

package/dist/api/SearchDevices.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SearchDevices.d.ts","sourceRoot":"","sources":["../../src/api/SearchDevices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAKxD,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAU;IACnD,SAAS,CAAC,EAAE,eAAe,CAAC;IAE5B,IAAI;IAIE,GAAG;;;;;;;;;;CA+BV"}
+{"version":3,"file":"SearchDevices.d.ts","sourceRoot":"","sources":["../../src/api/SearchDevices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAMxD,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAU;IACnD,SAAS,CAAC,EAAE,eAAe,CAAC;IAE5B,IAAI;IAIE,GAAG;;;;;;;;;;CA8BV"}

package/dist/api/helpers/pathUtils.d.ts

@@ -1,5 +1,4 @@
 import { ChangeOutputScriptType, InputScriptType } from '@onekeyfe/hd-transport/src/types/messages';
-export declare const HD_HARDENED = 2147483648;
 export declare const toHardened: (n: number) => number;
 export declare const fromHardened: (n: number) => number;
 export declare const getHDPath: (path: string) => Array<number>;

package/dist/api/helpers/pathUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pathUtils.d.ts","sourceRoot":"","sources":["../../../src/api/helpers/pathUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAGpG,eAAO,MAAM,WAAW,aAAa,CAAC;AACtC,eAAO,MAAM,UAAU,MAAO,MAAM,KAAG,MAAiC,CAAC;AACzE,eAAO,MAAM,YAAY,MAAO,MAAM,KAAG,MAAkC,CAAC;AAQ5E,eAAO,MAAM,SAAS,SAAU,MAAM,KAAG,MAAM,MAAM,CAuBpD,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,MAAM,MAAM,CAAC,KAAG,OACF,CAAC;AAEpD,eAAO,MAAM,YAAY,SAAU,MAAM,MAAM,CAAC,KAAG,OACA,CAAC;AAEpD,eAAO,MAAM,YAAY,SAAU,MAAM,MAAM,CAAC,KAAG,OACA,CAAC;AAEpD,eAAO,MAAM,aAAa,SAAU,MAAM,MAAM,CAAC,KAAG,eAcnD,CAAC;AAEF,eAAO,MAAM,mBAAmB,mCAAsB,sBAmBrD,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,MAAM,MAAM,CAAC,KAAG,MAWpD,CAAC;AAEF,eAAO,MAAM,YAAY,SACjB,MAAM,GAAG,MAAM,MAAM,CAAC,sCAG3B,MAAM,MAAM,CAoBd,CAAC"}
+{"version":3,"file":"pathUtils.d.ts","sourceRoot":"","sources":["../../../src/api/helpers/pathUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAIpG,eAAO,MAAM,UAAU,MAAO,MAAM,KAAG,MAAiC,CAAC;AACzE,eAAO,MAAM,YAAY,MAAO,MAAM,KAAG,MAAkC,CAAC;AAQ5E,eAAO,MAAM,SAAS,SAAU,MAAM,KAAG,MAAM,MAAM,CAuBpD,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,MAAM,MAAM,CAAC,KAAG,OACF,CAAC;AAEpD,eAAO,MAAM,YAAY,SAAU,MAAM,MAAM,CAAC,KAAG,OACA,CAAC;AAEpD,eAAO,MAAM,YAAY,SAAU,MAAM,MAAM,CAAC,KAAG,OACA,CAAC;AAEpD,eAAO,MAAM,aAAa,SAAU,MAAM,MAAM,CAAC,KAAG,eAcnD,CAAC;AAEF,eAAO,MAAM,mBAAmB,mCAAsB,sBAmBrD,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,MAAM,MAAM,CAAC,KAAG,MAWpD,CAAC;AAEF,eAAO,MAAM,YAAY,SACjB,MAAM,GAAG,MAAM,MAAM,CAAC,sCAG3B,MAAM,MAAM,CAoBd,CAAC"}

package/dist/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AAAA,OAAO,YAAY,MAAM,QAAQ,CAAC;AASlC,OAAO,EACL,WAAW,EAYZ,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,UAAU,CAAC;AAE7D,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAWxD,eAAO,MAAM,OAAO,YAAmB,WAAW,iBAuHjD,CAAC;AAoHF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IACtC,aAAa,CAAC,OAAO,EAAE,WAAW;IAqBxC,OAAO;CAGR;AAED,eAAO,MAAM,QAAQ,YAGpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAGzB,CAAC;AAMF,eAAO,MAAM,IAAI,aAAoB,eAAe,aAAa,GAAG,8BAgBnE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":";AAAA,OAAO,YAAY,MAAM,QAAQ,CAAC;AASlC,OAAO,EACL,WAAW,EAYZ,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,UAAU,CAAC;AAE7D,OAAO,eAAe,MAAM,2BAA2B,CAAC;AAWxD,eAAO,MAAM,OAAO,YAAmB,WAAW,iBAgIjD,CAAC;AAoHF,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,YAAY;IACtC,aAAa,CAAC,OAAO,EAAE,WAAW;IA2BxC,OAAO;CAGR;AAED,eAAO,MAAM,QAAQ,YAGpB,CAAC;AAEF,eAAO,MAAM,aAAa,uBAGzB,CAAC;AAMF,eAAO,MAAM,IAAI,aAAoB,eAAe,aAAa,GAAG,8BAgBnE,CAAC"}

package/dist/events/ui-request.d.ts

@@ -8,9 +8,11 @@ export declare const UI_REQUEST: {
     readonly INVALID_PIN: "ui-invalid_pin";
     readonly REQUEST_BUTTON: "ui-button";
     readonly CLOSE_UI_WINDOW: "ui-close_window";
+    readonly BLUETOOTH_PERMISSION: "ui-bluetooth_permission";
+    readonly LOCATION_PERMISSION: "ui-location_permission";
 };
 export interface UiRequestWithoutPayload {
-    type: typeof UI_REQUEST.CLOSE_UI_WINDOW;
+    type: typeof UI_REQUEST.CLOSE_UI_WINDOW | typeof UI_REQUEST.BLUETOOTH_PERMISSION | typeof UI_REQUEST.LOCATION_PERMISSION;
     payload?: typeof undefined;
 }
 export declare type UiRequestDeviceAction = {

package/dist/events/ui-request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-request.d.ts","sourceRoot":"","sources":["../../src/events/ui-request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD,eAAO,MAAM,QAAQ,aAAa,CAAC;AAEnC,eAAO,MAAM,UAAU;;;;;CAMb,CAAC;AAEX,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,OAAO,UAAU,CAAC,eAAe,CAAC;IACxC,OAAO,CAAC,EAAE,OAAO,SAAS,CAAC;CAC5B;AAED,oBAAY,qBAAqB,GAAG;IAClC,IAAI,EAAE,OAAO,UAAU,CAAC,WAAW,CAAC;IACpC,OAAO,EAAE;QACP,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,KAAK,CAAC,oBAAoB,CAAC;KACnC,CAAC;CACH,CAAC;AAEF,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,OAAO,UAAU,CAAC,cAAc,CAAC;IACvC,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC;CACzC;AAED,oBAAY,OAAO,GAAG,uBAAuB,GAAG,qBAAqB,GAAG,eAAe,CAAC;AAExF,oBAAY,cAAc,GAAG,OAAO,GAAG;IAAE,KAAK,EAAE,OAAO,QAAQ,CAAA;CAAE,CAAC;AAElE,eAAO,MAAM,eAAe,EAAE,gBAAgB,CAAC,OAAO,QAAQ,EAAE,OAAO,CAK5D,CAAC"}
+{"version":3,"file":"ui-request.d.ts","sourceRoot":"","sources":["../../src/events/ui-request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAEhD,eAAO,MAAM,QAAQ,aAAa,CAAC;AAEnC,eAAO,MAAM,UAAU;;;;;;;CASb,CAAC;AAEX,MAAM,WAAW,uBAAuB;IACtC,IAAI,EACA,OAAO,UAAU,CAAC,eAAe,GACjC,OAAO,UAAU,CAAC,oBAAoB,GACtC,OAAO,UAAU,CAAC,mBAAmB,CAAC;IAC1C,OAAO,CAAC,EAAE,OAAO,SAAS,CAAC;CAC5B;AAED,oBAAY,qBAAqB,GAAG;IAClC,IAAI,EAAE,OAAO,UAAU,CAAC,WAAW,CAAC;IACpC,OAAO,EAAE;QACP,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,KAAK,CAAC,oBAAoB,CAAC;KACnC,CAAC;CACH,CAAC;AAEF,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,OAAO,UAAU,CAAC,cAAc,CAAC;IACvC,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC;CACzC;AAED,oBAAY,OAAO,GAAG,uBAAuB,GAAG,qBAAqB,GAAG,eAAe,CAAC;AAExF,oBAAY,cAAc,GAAG,OAAO,GAAG;IAAE,KAAK,EAAE,OAAO,QAAQ,CAAA;CAAE,CAAC;AAElE,eAAO,MAAM,eAAe,EAAE,gBAAgB,CAAC,OAAO,QAAQ,EAAE,OAAO,CAK5D,CAAC"}

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import EventEmitter, { EventEmitter as EventEmitter$1 } from 'events';
 import { Messages, Transport, OneKeyDeviceInfo } from '@onekeyfe/hd-transport';
 export { Messages as PROTO } from '@onekeyfe/hd-transport';
-import { EthereumPublicKey, EthereumMessageSignature, Success as Success$1, Address, MultisigRedeemScriptType, InputScriptType, PublicKey, MessageSignature, TxInputType, TxOutputType, PrevInput, TxOutputBinType, TxInput, RecoveryDeviceType, SafetyCheckLevel, StarcoinAddress as StarcoinAddress$1, StarcoinPublicKey as StarcoinPublicKey$1, StarcoinMessageSignature, StarcoinSignedTx } from '@onekeyfe/hd-transport/src/types/messages';
+import { EthereumPublicKey, EthereumMessageSignature, Success as Success$1, Address, MultisigRedeemScriptType, InputScriptType, PublicKey, MessageSignature, PrevInput, TxOutputBinType, TxInput, TxOutputType, TxInputType, RecoveryDeviceType, SafetyCheckLevel, StarcoinAddress as StarcoinAddress$1, StarcoinPublicKey as StarcoinPublicKey$1, StarcoinMessageSignature, StarcoinSignedTx } from '@onekeyfe/hd-transport/src/types/messages';
 
 interface CommonParams {
     keepSession?: boolean;
@@ -361,6 +361,20 @@ declare type BTCSignMessageParams = {
 };
 declare function btcSignMessage(connectId: string, params: CommonParams & BTCSignMessageParams): Response<MessageSignature>;
 
+declare type SignedTransaction = {
+    signatures: string[];
+    serializedTx: string;
+    txid?: string;
+};
+declare type TransactionOptions = {
+    version?: number;
+    lock_time?: number;
+    expiry?: number;
+    overwintered?: boolean;
+    version_group_id?: number;
+    timestamp?: number;
+    branch_id?: number;
+};
 declare type RefTransaction = {
     hash: string;
     version: number;
@@ -417,7 +431,7 @@ declare type BTCSignTransactionParams = {
     branchId?: number;
     timestamp?: number;
 };
-declare function btcSignTransaction(connectId: string, params: CommonParams & BTCSignTransactionParams): Response<Success$1>;
+declare function btcSignTransaction(connectId: string, params: CommonParams & BTCSignTransactionParams): Response<SignedTransaction>;
 
 declare type BTCVerifyMessageParams = {
     address: string;
@@ -629,9 +643,11 @@ declare const UI_REQUEST: {
     readonly INVALID_PIN: "ui-invalid_pin";
     readonly REQUEST_BUTTON: "ui-button";
     readonly CLOSE_UI_WINDOW: "ui-close_window";
+    readonly BLUETOOTH_PERMISSION: "ui-bluetooth_permission";
+    readonly LOCATION_PERMISSION: "ui-location_permission";
 };
 interface UiRequestWithoutPayload {
-    type: typeof UI_REQUEST.CLOSE_UI_WINDOW;
+    type: typeof UI_REQUEST.CLOSE_UI_WINDOW | typeof UI_REQUEST.BLUETOOTH_PERMISSION | typeof UI_REQUEST.LOCATION_PERMISSION;
     payload?: typeof undefined;
 }
 declare type UiRequestDeviceAction = {
@@ -874,10 +890,13 @@ declare const getDeviceType: (features?: {
     display_rotation: number | null;
     experimental_features: boolean | null;
 } | undefined) => IDeviceType;
+declare const getDeviceTypeByBleName: (name?: string | undefined) => IDeviceType | null;
+declare const getDeviceTypeByDeviceId: (deviceId?: string | undefined) => IDeviceType;
 declare const getDeviceUUID: (features: Features) => string;
 declare const getDeviceLabel: (features: Features) => string;
-declare const getDeviceFirmwareVersion: (features: Features) => IVersionArray;
-declare const getDeviceBLEFirmwareVersion: (features: Features) => IVersionArray | null;
+
+declare const getHDPath: (path: string) => Array<number>;
+declare const getScriptType: (path: Array<number>) => InputScriptType;
 
 declare type RunOptions = {
     keepSession?: boolean;
@@ -982,4 +1001,4 @@ declare class DataManager {
 
 declare const HardwareSdk: ({ init, call, dispose, eventEmitter, uiResponse, cancel, }: InjectApi) => CoreApi;
 
-export { AssetsMap, BTCAddress, BTCGetAddressParams, BTCGetPublicKeyParams, BTCPublicKey, BTCSignMessageParams, BTCVerifyMessageParams, CORE_EVENT, CallMethod, CallMethodAnyResponse, CallMethodKeys, CallMethodPayload, CallMethodResponse, CallMethodUnion, CommonParams, ConnectSettings, Core, CoreApi, CoreMessage, DEFAULT_PRIORITY, DEVICE, DEVICE_EVENT, DataManager, Deferred, Device$1 as Device, DeviceButtonRequest, DeviceButtonRequestPayload, DeviceChangePinParams, DeviceEvent, DeviceEventListenerFn, DeviceEventMessage, DeviceFlagsParams, DeviceMode, DeviceRecoveryParams, DeviceResetParams, DeviceSettingsParams, DeviceStatus, DeviceTypeMap, errors as ERRORS, EVMAccessList, EVMAddress, EVMGetAddressParams, EVMGetPublicKeyParams, EVMPublicKey, EVMSignMessageEIP712Params, EVMSignMessageParams, EVMSignTransactionParams, EVMSignTypedDataParams, EVMSignedTx, EVMTransaction, EVMTransactionEIP1559, EVMVerifyMessageParams, EthereumSignTypedDataMessage, EthereumSignTypedDataTypeProperty, EthereumSignTypedDataTypes, Features, FirmwareRange, FirmwareRelease, IBLEFirmwareReleaseInfo, IDeviceBLEFirmwareStatus, IDeviceFirmwareStatus, IDeviceType, IFRAME, IFirmwareReleaseInfo, IFrameBridge, IFrameCallMessage, IFrameEvent, IFrameEventMessage, IFrameInit, ILocale, ITransportStatus, IVersionArray, KnownDevice, MethodResponseMessage, PostMessageEvent, RESPONSE_EVENT, ReleaseInfo, RemoteConfigResponse, Response, SearchDevice, StarcoinAddress, StarcoinGetAddressParams, StarcoinGetPublicKeyParams, StarcoinPublicKey, StarcoinSignMessageParams, StarcoinSignTransactionParams, StarcoinVerifyMessageParams, Success, TransportReleaseStatus, UI_EVENT, UI_REQUEST, UI_RESPONSE, UiEvent, UiEventMessage, UiPromise, UiPromiseResponse, UiRequestButton, UiRequestDeviceAction, UiRequestWithoutPayload, UiResponseEvent, UiResponseMessage, UiResponsePin, UnavailableCapabilities, UnavailableCapability, Unsuccessful, VersionArray, corsValidator, create, createDeviceMessage, createErrorMessage, createIFrameMessage, createResponseMessage, createUiMessage, createUiResponse, HardwareSdk as default, enableLog, getDeviceBLEFirmwareVersion, getDeviceFirmwareVersion, getDeviceLabel, getDeviceType, getDeviceUUID, getEnv, getTimeStamp, httpRequest, init as initCore, initLog, isValidVersionArray, isValidVersionString, normalizeVersionArray, parseConnectSettings, parseMessage, versionCompare, versionSplit };
+export { AccountAddress, AccountAddresses, AssetsMap, BTCAddress, BTCGetAddressParams, BTCGetPublicKeyParams, BTCPublicKey, BTCSignMessageParams, BTCSignTransactionParams, BTCVerifyMessageParams, CORE_EVENT, CallMethod, CallMethodAnyResponse, CallMethodKeys, CallMethodPayload, CallMethodResponse, CallMethodUnion, CommonParams, ConnectSettings, Core, CoreApi, CoreMessage, DEFAULT_PRIORITY, DEVICE, DEVICE_EVENT, DataManager, Deferred, Device$1 as Device, DeviceButtonRequest, DeviceButtonRequestPayload, DeviceChangePinParams, DeviceEvent, DeviceEventListenerFn, DeviceEventMessage, DeviceFlagsParams, DeviceMode, DeviceRecoveryParams, DeviceResetParams, DeviceSettingsParams, DeviceStatus, DeviceTypeMap, errors as ERRORS, EVMAccessList, EVMAddress, EVMGetAddressParams, EVMGetPublicKeyParams, EVMPublicKey, EVMSignMessageEIP712Params, EVMSignMessageParams, EVMSignTransactionParams, EVMSignTypedDataParams, EVMSignedTx, EVMTransaction, EVMTransactionEIP1559, EVMVerifyMessageParams, EthereumSignTypedDataMessage, EthereumSignTypedDataTypeProperty, EthereumSignTypedDataTypes, Features, FirmwareRange, FirmwareRelease, IBLEFirmwareReleaseInfo, IDeviceBLEFirmwareStatus, IDeviceFirmwareStatus, IDeviceType, IFRAME, IFirmwareReleaseInfo, IFrameBridge, IFrameCallMessage, IFrameEvent, IFrameEventMessage, IFrameInit, ILocale, ITransportStatus, IVersionArray, KnownDevice, MethodResponseMessage, PostMessageEvent, RESPONSE_EVENT, RefTransaction, ReleaseInfo, RemoteConfigResponse, Response, SearchDevice, SignedTransaction, StarcoinAddress, StarcoinGetAddressParams, StarcoinGetPublicKeyParams, StarcoinPublicKey, StarcoinSignMessageParams, StarcoinSignTransactionParams, StarcoinVerifyMessageParams, Success, TransactionOptions, TransportReleaseStatus, UI_EVENT, UI_REQUEST, UI_RESPONSE, UiEvent, UiEventMessage, UiPromise, UiPromiseResponse, UiRequestButton, UiRequestDeviceAction, UiRequestWithoutPayload, UiResponseEvent, UiResponseMessage, UiResponsePin, UnavailableCapabilities, UnavailableCapability, Unsuccessful, VersionArray, corsValidator, create, createDeviceMessage, createErrorMessage, createIFrameMessage, createResponseMessage, createUiMessage, createUiResponse, HardwareSdk as default, enableLog, getDeviceLabel, getDeviceType, getDeviceTypeByBleName, getDeviceTypeByDeviceId, getDeviceUUID, getEnv, getHDPath, getScriptType, getTimeStamp, httpRequest, init as initCore, initLog, isValidVersionArray, isValidVersionString, normalizeVersionArray, parseConnectSettings, parseMessage, versionCompare, versionSplit };

package/dist/index.js

@@ -814,6 +814,26 @@ const getDeviceType = (features) => {
     }
     const serialNo = features.serial_no;
     const miniFlag = serialNo.slice(0, 2);
+    if (miniFlag.toLowerCase() === 'mi')
+        return 'mini';
+    if (miniFlag.toLowerCase() === 'tc')
+        return 'touch';
+    return 'classic';
+};
+const getDeviceTypeByBleName = (name) => {
+    if (!name)
+        return 'classic';
+    if (name.startsWith('MI'))
+        return 'mini';
+    if (name.startsWith('T'))
+        return 'touch';
+    return 'classic';
+};
+const getDeviceTypeByDeviceId = (deviceId) => {
+    if (!deviceId) {
+        return 'classic';
+    }
+    const miniFlag = deviceId.slice(0, 2);
     if (miniFlag.toLowerCase() === 'mi')
         return 'mini';
     return 'classic';
@@ -845,6 +865,109 @@ const getDeviceBLEFirmwareVersion = (features) => {
     return features.ble_ver.split('.');
 };
 
+const HD_HARDENED = 0x80000000;
+const toHardened = (n) => (n | HD_HARDENED) >>> 0;
+const fromHardened = (n) => (n & ~HD_HARDENED) >>> 0;
+const PATH_NOT_VALID = TypedError('Method_InvalidParameter', 'Not a valid path');
+const PATH_NEGATIVE_VALUES = TypedError('Method_InvalidParameter', 'Path cannot contain negative values');
+const getHDPath = (path) => {
+    const parts = path.toLowerCase().split('/');
+    if (parts[0] !== 'm')
+        throw PATH_NOT_VALID;
+    return parts
+        .filter((p) => p !== 'm' && p !== '')
+        .map((p) => {
+        let hardened = false;
+        if (p.substr(p.length - 1) === "'") {
+            hardened = true;
+            p = p.substr(0, p.length - 1);
+        }
+        let n = parseInt(p);
+        if (Number.isNaN(n)) {
+            throw PATH_NOT_VALID;
+        }
+        else if (n < 0) {
+            throw PATH_NEGATIVE_VALUES;
+        }
+        if (hardened) {
+            n = toHardened(n);
+        }
+        return n;
+    });
+};
+const isMultisigPath = (path) => Array.isArray(path) && path[0] === toHardened(48);
+const isSegwitPath = (path) => Array.isArray(path) && path[0] === toHardened(49);
+const getScriptType = (path) => {
+    if (!Array.isArray(path) || path.length < 1)
+        return 'SPENDADDRESS';
+    const p1 = fromHardened(path[0]);
+    switch (p1) {
+        case 48:
+            return 'SPENDMULTISIG';
+        case 49:
+            return 'SPENDP2SHWITNESS';
+        case 84:
+            return 'SPENDWITNESS';
+        default:
+            return 'SPENDADDRESS';
+    }
+};
+const getOutputScriptType = (path) => {
+    if (!Array.isArray(path) || path.length < 1)
+        return 'PAYTOADDRESS';
+    if (path[0] === 49) {
+        return 'PAYTOP2SHWITNESS';
+    }
+    const p = fromHardened(path[0]);
+    switch (p) {
+        case 48:
+            return 'PAYTOMULTISIG';
+        case 49:
+            return 'PAYTOP2SHWITNESS';
+        case 84:
+            return 'PAYTOWITNESS';
+        default:
+            return 'PAYTOADDRESS';
+    }
+};
+const serializedPath = (path) => {
+    const pathStr = path
+        .map((p) => {
+        if (p & HD_HARDENED) {
+            return `${p & ~HD_HARDENED}'`;
+        }
+        return p;
+    })
+        .join('/');
+    return `m/${pathStr}`;
+};
+const validatePath = (path, length = 0, base = false) => {
+    let valid;
+    if (typeof path === 'string') {
+        valid = getHDPath(path);
+    }
+    else if (Array.isArray(path)) {
+        valid = path.map((p) => {
+            const n = parseInt(p);
+            if (Number.isNaN(n)) {
+                throw PATH_NOT_VALID;
+            }
+            else if (n < 0) {
+                throw PATH_NEGATIVE_VALUES;
+            }
+            return n;
+        });
+    }
+    else {
+        valid = undefined;
+    }
+    if (!valid)
+        throw PATH_NOT_VALID;
+    if (length > 0 && valid.length < length)
+        throw PATH_NOT_VALID;
+    return base ? valid.splice(0, 3) : valid;
+};
+
 var nested = {
 	BinanceGetAddress: {
 		fields: {
@@ -9808,6 +9931,8 @@ const UI_REQUEST$1 = {
     INVALID_PIN: 'ui-invalid_pin',
     REQUEST_BUTTON: 'ui-button',
     CLOSE_UI_WINDOW: 'ui-close_window',
+    BLUETOOTH_PERMISSION: 'ui-bluetooth_permission',
+    LOCATION_PERMISSION: 'ui-location_permission',
 };
 const createUiMessage = (type, payload) => ({
     event: UI_EVENT,
@@ -10457,7 +10582,10 @@ class SearchDevices extends BaseMethod {
             const devicesDescriptor = (_c = deviceDiff === null || deviceDiff === void 0 ? void 0 : deviceDiff.descriptors) !== null && _c !== void 0 ? _c : [];
             const env = DataManager.getSettings('env');
             if (env === 'react-native') {
-                return devicesDescriptor.map(device => (Object.assign(Object.assign({}, device), { connectId: device.id, deviceType: 'classic' })));
+                return devicesDescriptor.map(device => {
+                    var _a;
+                    return (Object.assign(Object.assign({}, device), { connectId: device.id, deviceType: getDeviceTypeByBleName((_a = device.name) !== null && _a !== void 0 ? _a : '') }));
+                });
             }
             const devices = [];
             try {
@@ -10492,109 +10620,6 @@ class GetFeatures extends BaseMethod {
     }
 }
 
-const HD_HARDENED = 0x80000000;
-const toHardened = (n) => (n | HD_HARDENED) >>> 0;
-const fromHardened = (n) => (n & ~HD_HARDENED) >>> 0;
-const PATH_NOT_VALID = TypedError('Method_InvalidParameter', 'Not a valid path');
-const PATH_NEGATIVE_VALUES = TypedError('Method_InvalidParameter', 'Path cannot contain negative values');
-const getHDPath = (path) => {
-    const parts = path.toLowerCase().split('/');
-    if (parts[0] !== 'm')
-        throw PATH_NOT_VALID;
-    return parts
-        .filter((p) => p !== 'm' && p !== '')
-        .map((p) => {
-        let hardened = false;
-        if (p.substr(p.length - 1) === "'") {
-            hardened = true;
-            p = p.substr(0, p.length - 1);
-        }
-        let n = parseInt(p);
-        if (Number.isNaN(n)) {
-            throw PATH_NOT_VALID;
-        }
-        else if (n < 0) {
-            throw PATH_NEGATIVE_VALUES;
-        }
-        if (hardened) {
-            n = toHardened(n);
-        }
-        return n;
-    });
-};
-const isMultisigPath = (path) => Array.isArray(path) && path[0] === toHardened(48);
-const isSegwitPath = (path) => Array.isArray(path) && path[0] === toHardened(49);
-const getScriptType = (path) => {
-    if (!Array.isArray(path) || path.length < 1)
-        return 'SPENDADDRESS';
-    const p1 = fromHardened(path[0]);
-    switch (p1) {
-        case 48:
-            return 'SPENDMULTISIG';
-        case 49:
-            return 'SPENDP2SHWITNESS';
-        case 84:
-            return 'SPENDWITNESS';
-        default:
-            return 'SPENDADDRESS';
-    }
-};
-const getOutputScriptType = (path) => {
-    if (!Array.isArray(path) || path.length < 1)
-        return 'PAYTOADDRESS';
-    if (path[0] === 49) {
-        return 'PAYTOP2SHWITNESS';
-    }
-    const p = fromHardened(path[0]);
-    switch (p) {
-        case 48:
-            return 'PAYTOMULTISIG';
-        case 49:
-            return 'PAYTOP2SHWITNESS';
-        case 84:
-            return 'PAYTOWITNESS';
-        default:
-            return 'PAYTOADDRESS';
-    }
-};
-const serializedPath = (path) => {
-    const pathStr = path
-        .map((p) => {
-        if (p & HD_HARDENED) {
-            return `${p & ~HD_HARDENED}'`;
-        }
-        return p;
-    })
-        .join('/');
-    return `m/${pathStr}`;
-};
-const validatePath = (path, length = 0, base = false) => {
-    let valid;
-    if (typeof path === 'string') {
-        valid = getHDPath(path);
-    }
-    else if (Array.isArray(path)) {
-        valid = path.map((p) => {
-            const n = parseInt(p);
-            if (Number.isNaN(n)) {
-                throw PATH_NOT_VALID;
-            }
-            else if (n < 0) {
-                throw PATH_NEGATIVE_VALUES;
-            }
-            return n;
-        });
-    }
-    else {
-        valid = undefined;
-    }
-    if (!valid)
-        throw PATH_NOT_VALID;
-    if (length > 0 && valid.length < length)
-        throw PATH_NOT_VALID;
-    return base ? valid.splice(0, 3) : valid;
-};
-
 const hasHexPrefix = (str) => str.slice(0, 2).toLowerCase() === '0x';
 const stripHexPrefix = (str) => (hasHexPrefix(str) ? str.slice(2) : str);
 const addHexPrefix = (str) => (hasHexPrefix(str) ? str : `0x${str}`);
@@ -10987,8 +11012,8 @@ class BTCGetPublicKey extends BaseMethod {
     }
     init() {
         this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
-        const hasBundle = Object.prototype.hasOwnProperty.call(this.payload, 'bundle');
-        const payload = hasBundle ? this.payload : { bundle: [this.payload] };
+        this.hasBundle = Object.prototype.hasOwnProperty.call(this.payload, 'bundle');
+        const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };
         validateParams(payload, [{ name: 'bundle', type: 'array' }]);
         this.params = [];
         payload.bundle.forEach((batch) => {
@@ -12325,7 +12350,7 @@ let _connector;
 let _uiPromises = [];
 let _callPromise;
 const callAPI = (message) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
+    var _a, _b;
     if (!message.id || !message.payload || message.type !== IFRAME.CALL) {
         return Promise.reject(TypedError('Method_InvalidParameter', 'onCall: message.id or message.payload is missing'));
     }
@@ -12345,7 +12370,10 @@ const callAPI = (message) => __awaiter(void 0, void 0, void 0, function* () {
             return createResponseMessage(method.responseID, true, response);
         }
         catch (error) {
-            return createResponseMessage(method.responseID, false, error);
+            return createResponseMessage(method.responseID, false, {
+                code: error.code,
+                error: (_a = error.message) !== null && _a !== void 0 ? _a : error,
+            });
         }
     }
     try {
@@ -12368,7 +12396,7 @@ const callAPI = (message) => __awaiter(void 0, void 0, void 0, function* () {
         return Promise.reject(error);
     }
     Log.debug('Call API - setDevice: ', device);
-    (_a = method.setDevice) === null || _a === void 0 ? void 0 : _a.call(method, device);
+    (_b = method.setDevice) === null || _b === void 0 ? void 0 : _b.call(method, device);
     device.on(DEVICE.PIN, onDevicePinHandler);
     device.on(DEVICE.BUTTON, (d, code) => {
         onDeviceButtonHandler(d, code);
@@ -12397,7 +12425,13 @@ const callAPI = (message) => __awaiter(void 0, void 0, void 0, function* () {
         Log.debug('Call API - Device Run: ', device);
         const deviceRun = () => device.run(inner);
         _callPromise = create(deviceRun);
-        return yield _callPromise.promise;
+        try {
+            return yield _callPromise.promise;
+        }
+        catch (e) {
+            console.log('Device Run Error: ', e);
+            return createResponseMessage(method.responseID, false, e.message);
+        }
     }
     catch (error) {
         messageResponse = createResponseMessage(method.responseID, false, error);
@@ -12506,6 +12540,11 @@ class Core extends events.exports {
                     }
                     break;
                 }
+                case UI_REQUEST$1.BLUETOOTH_PERMISSION:
+                case UI_REQUEST$1.LOCATION_PERMISSION: {
+                    postMessage(message);
+                    break;
+                }
                 case IFRAME.CALL: {
                     const response = yield callAPI(message);
                     return response;
@@ -12534,7 +12573,7 @@ const init = (settings, Transport) => __awaiter(void 0, void 0, void 0, function
             yield DataManager.load(settings);
             initTransport(Transport);
         }
-        catch (_b) {
+        catch (_c) {
             Log.error('DataManager.load error');
         }
         enableLog(DataManager.getSettings('debug'));
@@ -12582,12 +12621,14 @@ exports.createUiMessage = createUiMessage;
 exports.createUiResponse = createUiResponse;
 exports["default"] = HardwareSdk;
 exports.enableLog = enableLog;
-exports.getDeviceBLEFirmwareVersion = getDeviceBLEFirmwareVersion;
-exports.getDeviceFirmwareVersion = getDeviceFirmwareVersion;
 exports.getDeviceLabel = getDeviceLabel;
 exports.getDeviceType = getDeviceType;
+exports.getDeviceTypeByBleName = getDeviceTypeByBleName;
+exports.getDeviceTypeByDeviceId = getDeviceTypeByDeviceId;
 exports.getDeviceUUID = getDeviceUUID;
 exports.getEnv = getEnv;
+exports.getHDPath = getHDPath;
+exports.getScriptType = getScriptType;
 exports.getTimeStamp = getTimeStamp;
 exports.httpRequest = httpRequest;
 exports.initCore = init;

package/dist/types/api/btcSignTransaction.d.ts

@@ -1,4 +1,4 @@
-import { TxInput as OrigTxInput, PrevInput, Success, TxOutputBinType, TxOutputType, TxInputType } from '@onekeyfe/hd-transport/src/types/messages';
+import { TxInput as OrigTxInput, PrevInput, TxOutputBinType, TxOutputType, TxInputType } from '@onekeyfe/hd-transport/src/types/messages';
 import type { CommonParams, Response } from '../params';
 export declare type SignedTransaction = {
     signatures: string[];
@@ -70,5 +70,5 @@ export declare type BTCSignTransactionParams = {
     branchId?: number;
     timestamp?: number;
 };
-export declare function btcSignTransaction(connectId: string, params: CommonParams & BTCSignTransactionParams): Response<Success>;
+export declare function btcSignTransaction(connectId: string, params: CommonParams & BTCSignTransactionParams): Response<SignedTransaction>;
 //# sourceMappingURL=btcSignTransaction.d.ts.map

package/dist/types/api/btcSignTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"btcSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/types/api/btcSignTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,IAAI,WAAW,EACtB,SAAS,EACT,OAAO,EACP,eAAe,EACf,YAAY,EACZ,WAAW,EACZ,MAAM,2CAA2C,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,oBAAY,iBAAiB,GAAG;IAC9B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,oBAAY,kBAAkB,GAAG;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,oBAAY,cAAc,GACtB;IACE,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,WAAW,EAAE,eAAe,EAAE,CAAC;IAC/B,OAAO,CAAC,EAAE,OAAO,SAAS,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,WAAW,CAAC,EAAE,OAAO,SAAS,CAAC;IAC/B,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEN,oBAAY,cAAc,GAAG;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,oBAAY,gBAAgB,GAAG;IAC7B,MAAM,EAAE,cAAc,EAAE,CAAC;IACzB,IAAI,EAAE,cAAc,EAAE,CAAC;IACvB,MAAM,EAAE,cAAc,EAAE,CAAC;CAC1B,CAAC;AAEF,oBAAY,wBAAwB,GAAG;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,MAAM,EAAE,cAAc,EAAE,CAAC;IACzB,OAAO,CAAC,EAAE;QAER,SAAS,EAAE,gBAAgB,CAAC;KAC7B,CAAC;IACF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,YAAY,GAAG,wBAAwB,GAC9C,QAAQ,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"btcSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/types/api/btcSignTransaction.ts"],"names":[],"mappings":"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"}

package/dist/types/api/export.d.ts

@@ -2,6 +2,7 @@ export type { BTCAddress, BTCGetAddressParams } from './btcGetAddress';
 export type { BTCPublicKey, BTCGetPublicKeyParams } from './btcGetPublicKey';
 export type { BTCSignMessageParams } from './btcSignMessage';
 export type { BTCVerifyMessageParams } from './btcVerifyMessage';
+export type { RefTransaction, AccountAddress, AccountAddresses, BTCSignTransactionParams, SignedTransaction, TransactionOptions, } from './btcSignTransaction';
 export type { DeviceChangePinParams } from './deviceChangePin';
 export type { DeviceFlagsParams } from './deviceFlags';
 export type { DeviceRecoveryParams } from './deviceRecovery';

package/dist/types/api/export.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../../src/types/api/export.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACvE,YAAY,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,YAAY,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAEjE,YAAY,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC/D,YAAY,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,YAAY,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE7D,YAAY,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACvE,YAAY,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,YAAY,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AACzE,YAAY,EACV,cAAc,EACd,qBAAqB,EACrB,WAAW,EACX,wBAAwB,EACxB,aAAa,GACd,MAAM,sBAAsB,CAAC;AAC9B,YAAY,EACV,0BAA0B,EAC1B,iCAAiC,EACjC,4BAA4B,EAC5B,sBAAsB,GACvB,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAEjE,YAAY,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AACtF,YAAY,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAC5F,YAAY,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AACvE,YAAY,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAC/E,YAAY,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC"}
+{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../../src/types/api/export.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACvE,YAAY,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,YAAY,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AACjE,YAAY,EACV,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,wBAAwB,EACxB,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,sBAAsB,CAAC;AAE9B,YAAY,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC/D,YAAY,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,YAAY,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAE7D,YAAY,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACvE,YAAY,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC7E,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,YAAY,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AACzE,YAAY,EACV,cAAc,EACd,qBAAqB,EACrB,WAAW,EACX,wBAAwB,EACxB,aAAa,GACd,MAAM,sBAAsB,CAAC;AAC9B,YAAY,EACV,0BAA0B,EAC1B,iCAAiC,EACjC,4BAA4B,EAC5B,sBAAsB,GACvB,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAEjE,YAAY,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AACtF,YAAY,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAC5F,YAAY,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AACvE,YAAY,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAC/E,YAAY,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC"}

package/dist/utils/deviceFeaturesUtils.d.ts

@@ -46,6 +46,8 @@ export declare const getDeviceType: (features?: {
     display_rotation: number | null;
     experimental_features: boolean | null;
 } | undefined) => IDeviceType;
+export declare const getDeviceTypeByBleName: (name?: string | undefined) => IDeviceType | null;
+export declare const getDeviceTypeByDeviceId: (deviceId?: string | undefined) => IDeviceType;
 export declare const getDeviceUUID: (features: Features) => string;
 export declare const getDeviceLabel: (features: Features) => string;
 export declare const getDeviceFirmwareVersion: (features: Features) => IVersionArray;

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

@@ -1 +1 @@
-{"version":3,"file":"deviceFeaturesUtils.d.ts","sourceRoot":"","sources":["../../src/utils/deviceFeaturesUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAErE,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAA0B,WASnD,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,QAAQ,WAM/C,CAAC;AAEF,eAAO,MAAM,cAAc,aAAc,QAAQ,WAOhD,CAAC;AAKF,eAAO,MAAM,wBAAwB,aAAc,QAAQ,kBAK1D,CAAC;AAKF,eAAO,MAAM,2BAA2B,aAAc,QAAQ,KAAG,aAAa,GAAG,IAKhF,CAAC"}
+{"version":3,"file":"deviceFeaturesUtils.d.ts","sourceRoot":"","sources":["../../src/utils/deviceFeaturesUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAErE,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAA0B,WAUnD,CAAC;AAEF,eAAO,MAAM,sBAAsB,iCAAoB,WAAW,GAAG,IAKpE,CAAC;AAEF,eAAO,MAAM,uBAAuB,qCAAwB,WAQ3D,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,QAAQ,WAM/C,CAAC;AAEF,eAAO,MAAM,cAAc,aAAc,QAAQ,WAOhD,CAAC;AAKF,eAAO,MAAM,wBAAwB,aAAc,QAAQ,kBAK1D,CAAC;AAKF,eAAO,MAAM,2BAA2B,aAAc,QAAQ,KAAG,aAAa,GAAG,IAKhF,CAAC"}

package/dist/utils/index.d.ts

@@ -2,6 +2,7 @@ import { initLog, enableLog } from './logger';
 export * from './assets';
 export * from './versionUtils';
 export * from './deferred';
-export * from './deviceFeaturesUtils';
+export { getDeviceType, getDeviceTypeByBleName, getDeviceTypeByDeviceId, getDeviceUUID, getDeviceLabel, } from './deviceFeaturesUtils';
+export { getHDPath, getScriptType } from '../api/helpers/pathUtils';
 export { initLog, enableLog };
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE9C,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,uBAAuB,CAAC;AAEtC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE9C,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,OAAO,EACL,aAAa,EACb,sBAAsB,EACtB,uBAAuB,EACvB,aAAa,EACb,cAAc,GACf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEpE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.0.4",
+  "version": "0.0.7",
   "description": "> TODO: description",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,7 +25,7 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-transport": "^0.0.4",
+    "@onekeyfe/hd-transport": "^0.0.7",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "parse-uri": "^1.0.7",
@@ -35,5 +35,5 @@
     "@types/parse-uri": "^1.0.0",
     "@types/semver": "^7.3.9"
   },
-  "gitHead": "cabba10f92c55ebbe16c54a329c892d03a0c05fb"
+  "gitHead": "7be7677368fcb50f411891f009367424ea77df33"
 }

package/src/api/SearchDevices.ts

@@ -3,6 +3,7 @@ import DeviceConnector from '../device/DeviceConnector';
 import TransportManager from '../data-manager/TransportManager';
 import { Device } from '../device/Device';
 import { DataManager } from '../data-manager';
+import { getDeviceTypeByBleName } from '../utils';
 
 export default class SearchDevices extends BaseMethod {
   connector?: DeviceConnector;
@@ -26,8 +27,7 @@ export default class SearchDevices extends BaseMethod {
       return devicesDescriptor.map(device => ({
         ...device,
         connectId: device.id,
-        // 蓝牙场景只有 classic 能被搜索到
-        deviceType: 'classic',
+        deviceType: getDeviceTypeByBleName(device.name ?? ''),
       }));
     }
 

package/src/api/btc/BTCGetPublicKey.ts

@@ -13,8 +13,8 @@ export default class BTCGetPublicKey extends BaseMethod<GetPublicKey[]> {
   init() {
     this.allowDeviceMode = [...this.allowDeviceMode, UI_REQUEST.INITIALIZE];
 
-    const hasBundle = Object.prototype.hasOwnProperty.call(this.payload, 'bundle');
-    const payload = hasBundle ? this.payload : { bundle: [this.payload] };
+    this.hasBundle = Object.prototype.hasOwnProperty.call(this.payload, 'bundle');
+    const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };
 
     validateParams(payload, [{ name: 'bundle', type: 'array' }]);
 

package/src/api/helpers/pathUtils.ts

@@ -3,7 +3,7 @@
 import { ChangeOutputScriptType, InputScriptType } from '@onekeyfe/hd-transport/src/types/messages';
 import { ERRORS } from '../../constants';
 
-export const HD_HARDENED = 0x80000000;
+const HD_HARDENED = 0x80000000;
 export const toHardened = (n: number): number => (n | HD_HARDENED) >>> 0;
 export const fromHardened = (n: number): number => (n & ~HD_HARDENED) >>> 0;
 

package/src/core/index.ts

@@ -61,7 +61,10 @@ export const callAPI = async (message: CoreMessage) => {
       const response = await method.run();
       return createResponseMessage(method.responseID, true, response);
     } catch (error) {
-      return createResponseMessage(method.responseID, false, error);
+      return createResponseMessage(method.responseID, false, {
+        code: error.code,
+        error: error.message ?? error,
+      });
     }
   }
 
@@ -136,7 +139,13 @@ export const callAPI = async (message: CoreMessage) => {
     Log.debug('Call API - Device Run: ', device);
     const deviceRun = () => device.run(inner);
     _callPromise = createDeferred(deviceRun);
-    return await _callPromise.promise;
+
+    try {
+      return await _callPromise.promise;
+    } catch (e) {
+      console.log('Device Run Error: ', e);
+      return createResponseMessage(method.responseID, false, e.message);
+    }
   } catch (error) {
     messageResponse = createResponseMessage(method.responseID, false, error);
     _callPromise?.reject(ERRORS.TypedError('Call_API', error));
@@ -282,6 +291,12 @@ export default class Core extends EventEmitter {
         break;
       }
 
+      case UI_REQUEST.BLUETOOTH_PERMISSION:
+      case UI_REQUEST.LOCATION_PERMISSION: {
+        postMessage(message);
+        break;
+      }
+
       case IFRAME.CALL: {
         const response = await callAPI(message);
         return response;

package/src/events/ui-request.ts

@@ -11,10 +11,16 @@ export const UI_REQUEST = {
   REQUEST_BUTTON: 'ui-button',
 
   CLOSE_UI_WINDOW: 'ui-close_window',
+
+  BLUETOOTH_PERMISSION: 'ui-bluetooth_permission',
+  LOCATION_PERMISSION: 'ui-location_permission',
 } as const;
 
 export interface UiRequestWithoutPayload {
-  type: typeof UI_REQUEST.CLOSE_UI_WINDOW;
+  type:
+    | typeof UI_REQUEST.CLOSE_UI_WINDOW
+    | typeof UI_REQUEST.BLUETOOTH_PERMISSION
+    | typeof UI_REQUEST.LOCATION_PERMISSION;
   payload?: typeof undefined;
 }
 

package/src/types/api/btcSignTransaction.ts

@@ -1,7 +1,6 @@
 import {
   TxInput as OrigTxInput,
   PrevInput,
-  Success,
   TxOutputBinType,
   TxOutputType,
   TxInputType,
@@ -95,4 +94,4 @@ export type BTCSignTransactionParams = {
 export declare function btcSignTransaction(
   connectId: string,
   params: CommonParams & BTCSignTransactionParams
-): Response<Success>;
+): Response<SignedTransaction>;

package/src/types/api/export.ts

@@ -2,6 +2,14 @@ export type { BTCAddress, BTCGetAddressParams } from './btcGetAddress';
 export type { BTCPublicKey, BTCGetPublicKeyParams } from './btcGetPublicKey';
 export type { BTCSignMessageParams } from './btcSignMessage';
 export type { BTCVerifyMessageParams } from './btcVerifyMessage';
+export type {
+  RefTransaction,
+  AccountAddress,
+  AccountAddresses,
+  BTCSignTransactionParams,
+  SignedTransaction,
+  TransactionOptions,
+} from './btcSignTransaction';
 
 export type { DeviceChangePinParams } from './deviceChangePin';
 export type { DeviceFlagsParams } from './deviceFlags';

package/src/utils/deviceFeaturesUtils.ts

@@ -8,6 +8,24 @@ export const getDeviceType = (features?: Features): IDeviceType => {
   const serialNo = features.serial_no;
   const miniFlag = serialNo.slice(0, 2);
   if (miniFlag.toLowerCase() === 'mi') return 'mini';
+  if (miniFlag.toLowerCase() === 'tc') return 'touch';
+  return 'classic';
+};
+
+export const getDeviceTypeByBleName = (name?: string): IDeviceType | null => {
+  if (!name) return 'classic';
+  if (name.startsWith('MI')) return 'mini';
+  if (name.startsWith('T')) return 'touch';
+  return 'classic';
+};
+
+export const getDeviceTypeByDeviceId = (deviceId?: string): IDeviceType => {
+  if (!deviceId) {
+    return 'classic';
+  }
+
+  const miniFlag = deviceId.slice(0, 2);
+  if (miniFlag.toLowerCase() === 'mi') return 'mini';
   return 'classic';
 };
 

package/src/utils/index.ts

@@ -3,6 +3,13 @@ import { initLog, enableLog } from './logger';
 export * from './assets';
 export * from './versionUtils';
 export * from './deferred';
-export * from './deviceFeaturesUtils';
+export {
+  getDeviceType,
+  getDeviceTypeByBleName,
+  getDeviceTypeByDeviceId,
+  getDeviceUUID,
+  getDeviceLabel,
+} from './deviceFeaturesUtils';
+export { getHDPath, getScriptType } from '../api/helpers/pathUtils';
 
 export { initLog, enableLog };