@onekeyfe/hd-core 1.0.12 → 1.0.14

package/src/api/sui/SuiGetAddress.ts

@@ -20,9 +20,9 @@ export default class SuiGetAddress extends BaseMethod<HardwareSuiGetAddress[]> {
     this.hasBundle = !!this.payload?.bundle;
     const payload = this.hasBundle ? this.payload : { bundle: [this.payload] };
 
-    this.shouldConfirm = this.hasBundle
-      ? this.payload.bundle.some((i: any) => !!i.showOnOneKey)
-      : false;
+    this.shouldConfirm =
+      this.payload.showOnOneKey ||
+      this.payload.bundle?.some((i: SuiGetAddressParams) => !!i.showOnOneKey);
 
     // check payload
     validateParams(payload, [{ name: 'bundle', type: 'array' }]);
@@ -58,46 +58,66 @@ export default class SuiGetAddress extends BaseMethod<HardwareSuiGetAddress[]> {
   }
 
   async run() {
-    if (this.hasBundle && supportBatchPublicKey(this.device?.features) && !this.shouldConfirm) {
-      const res = await this.device.commands.typedCall('BatchGetPublickeys', 'EcdsaPublicKeys', {
-        paths: this.params,
-        ecdsa_curve_name: 'ed25519',
-      });
-      const result = res.message.public_keys.map((publicKey: string, index: number) => ({
-        path: serializedPath((this.params as unknown as any[])[index].address_n),
-        publicKey,
-        address: publicKeyToAddress(publicKey),
-      }));
-
-      validateResult(result, ['address'], {
-        expectedLength: this.params.length,
-      });
-
-      return Promise.resolve(result);
-    }
-
-    const responses: SuiAddress[] = [];
-    for (let i = 0; i < this.params.length; i++) {
-      const param = this.params[i];
-
-      const res = await this.device.commands.typedCall('SuiGetAddress', 'SuiAddress', {
-        ...param,
-      });
-
-      const { address } = res.message;
-
-      const result = {
-        path: serializedPath(param.address_n),
-        address: address?.toLowerCase(),
-      };
-      responses.push(result);
-      this.postPreviousAddressMessage(result);
+    const supportsBatchPublicKey = supportBatchPublicKey(this.device?.features);
+    let responses: SuiAddress[] = [];
+    if (supportsBatchPublicKey) {
+      const publicKeyRes = await this.device.commands.typedCall(
+        'BatchGetPublickeys',
+        'EcdsaPublicKeys',
+        {
+          paths: this.params,
+          ecdsa_curve_name: 'ed25519',
+        }
+      );
+      for (let i = 0; i < this.params.length; i++) {
+        const param = this.params[i];
+        const publicKey = publicKeyRes.message.public_keys[i];
+        let address: string;
+
+        if (this.shouldConfirm) {
+          const addressRes = await this.device.commands.typedCall(
+            'SuiGetAddress',
+            'SuiAddress',
+            param
+          );
+          address = addressRes.message.address?.toLowerCase() ?? '';
+        } else {
+          address = publicKeyToAddress(publicKey);
+        }
+
+        const result: SuiAddress = {
+          path: serializedPath(param.address_n),
+          address,
+          publicKey,
+          pub: publicKey,
+        };
+
+        if (this.shouldConfirm) {
+          this.postPreviousAddressMessage(result);
+        }
+
+        responses.push(result);
+      }
+    } else {
+      responses = await Promise.all(
+        this.params.map(async param => {
+          const res = await this.device.commands.typedCall('SuiGetAddress', 'SuiAddress', param);
+          const result = {
+            path: serializedPath(param.address_n),
+            address: res.message.address?.toLowerCase() ?? '',
+          };
+          if (this.shouldConfirm) {
+            this.postPreviousAddressMessage(result);
+          }
+          return result;
+        })
+      );
     }
 
     validateResult(responses, ['address'], {
       expectedLength: this.params.length,
     });
 
-    return Promise.resolve(this.hasBundle ? responses : responses[0]);
+    return this.hasBundle ? responses : responses[0];
   }
 }

package/src/api/sui/SuiGetPublicKey.ts

@@ -2,7 +2,7 @@ import { UI_REQUEST } from '../../constants/ui-request';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
-import { SuiGetAddressParams } from '../../types';
+import { SuiGetAddressParams, SuiPublicKey } from '../../types';
 
 export default class SuiGetPublicKey extends BaseMethod<any> {
   hasBundle = false;
@@ -53,12 +53,15 @@ export default class SuiGetPublicKey extends BaseMethod<any> {
       ecdsa_curve_name: 'ed25519',
     });
 
-    const responses = res.message.public_keys.map((publicKey: string, index: number) => ({
-      path: serializedPath((this.params as unknown as any[])[index].address_n),
-      publicKey,
-    }));
+    const responses: SuiPublicKey[] = res.message.public_keys.map(
+      (publicKey: string, index: number) => ({
+        path: serializedPath((this.params as unknown as any[])[index].address_n),
+        publicKey,
+        pub: publicKey,
+      })
+    );
 
-    validateResult(responses, ['publicKey'], {
+    validateResult(responses, ['pub'], {
       expectedLength: this.params.length,
     });
 

package/src/api/ton/TonGetAddress.ts

@@ -76,13 +76,14 @@ export default class TonGetAddress extends BaseMethod<HardwareTonGetAddress[]> {
       const result = {
         path: serializedPath(param.address_n),
         publicKey: public_key,
+        pub: public_key,
         address,
       };
       responses.push(result);
       this.postPreviousAddressMessage(result);
     }
 
-    validateResult(responses, ['address', 'publicKey'], {
+    validateResult(responses, ['address', 'pub'], {
       expectedLength: this.params.length,
     });
 

package/src/api/xrp/XrpGetAddress.ts

@@ -97,6 +97,7 @@ export default class XrpGetAddress extends BaseMethod<
         path,
         address,
         publicKey: publicKey.message?.public_keys?.[0],
+        pub: publicKey.message?.public_keys?.[0],
       });
 
       this.postPreviousAddressMessage({
@@ -105,7 +106,7 @@ export default class XrpGetAddress extends BaseMethod<
       });
     }
 
-    validateResult(responses, ['address', 'publicKey'], {
+    validateResult(responses, ['address', 'pub'], {
       expectedLength: this.params.length,
     });
 

package/src/constants/ui-request.ts

@@ -13,4 +13,5 @@ export const UI_REQUEST = {
   FIRMWARE_TIP: 'ui-firmware-tip',
 
   PREVIOUS_ADDRESS_RESULT: 'ui-previous_address_result',
+  DEVICE_PROGRESS: 'ui-device_progress',
 } as const;

package/src/core/index.ts

@@ -3,6 +3,10 @@ import EventEmitter from 'events';
 import { Features, LowlevelTransportSharedPlugin, OneKeyDeviceInfo } from '@onekeyfe/hd-transport';
 import {
   createDeferred,
+  createDeprecatedHardwareError,
+  createNeedUpgradeFirmwareHardwareError,
+  createNewFirmwareForceUpdateHardwareError,
+  createNewFirmwareUnReleaseHardwareError,
   Deferred,
   ERRORS,
   HardwareError,
@@ -175,26 +179,18 @@ export const callAPI = async (message: CoreMessage) => {
           (newVersionStatus === 'required' || bleVersionStatus === 'required') &&
           method.skipForceUpdateCheck === false
         ) {
-          throw ERRORS.TypedError(
-            HardwareErrorCode.NewFirmwareForceUpdate,
-            'Device firmware version is too low, please update to the latest version',
-            { connectId: method.connectId, deviceId: method.deviceId }
-          );
+          throw createNewFirmwareForceUpdateHardwareError(method.connectId, method.deviceId);
         }
 
         if (versionRange) {
           const currentVersion = getDeviceFirmwareVersion(device.features).join('.');
           if (semver.valid(versionRange.min) && semver.lt(currentVersion, versionRange.min)) {
             if (newVersionStatus === 'none' || newVersionStatus === 'valid') {
-              throw ERRORS.TypedError(HardwareErrorCode.NewFirmwareUnRelease);
+              throw createNewFirmwareUnReleaseHardwareError(currentVersion, versionRange.min);
             }
 
             return Promise.reject(
-              ERRORS.TypedError(
-                HardwareErrorCode.CallMethodNeedUpgradeFirmware,
-                `Device firmware version is too low, please update to ${versionRange.min}`,
-                { current: currentVersion, require: versionRange.min }
-              )
+              createNeedUpgradeFirmwareHardwareError(currentVersion, versionRange.min)
             );
           }
           if (
@@ -202,13 +198,7 @@ export const callAPI = async (message: CoreMessage) => {
             semver.valid(versionRange.max) &&
             semver.gte(currentVersion, versionRange.max)
           ) {
-            return Promise.reject(
-              ERRORS.TypedError(
-                HardwareErrorCode.CallMethodDeprecated,
-                `Device firmware version is too high, this method has been deprecated in ${versionRange.max}`,
-                { current: currentVersion, deprecated: versionRange.max }
-              )
-            );
+            return Promise.reject(createDeprecatedHardwareError(currentVersion, versionRange.max));
           }
         }
       }

package/src/device/Device.ts

@@ -492,6 +492,21 @@ export class Device extends EventEmitter {
           this.runPromise.reject(e);
         }
 
+        if (
+          e instanceof HardwareError &&
+          (e.errorCode === HardwareErrorCode.DeviceInitializeFailed ||
+            e.errorCode === HardwareErrorCode.DeviceInterruptedFromOutside ||
+            e.errorCode === HardwareErrorCode.DeviceInterruptedFromUser ||
+            e.errorCode === HardwareErrorCode.DeviceCheckPassphraseStateError ||
+            e.errorCode === HardwareErrorCode.ResponseUnexpectTypeError ||
+            e.errorCode === HardwareErrorCode.PinInvalid ||
+            e.errorCode === HardwareErrorCode.PinCancelled ||
+            e.errorCode === HardwareErrorCode.UnexpectPassphrase)
+        ) {
+          await this.release();
+          Log.debug(`error code ${e.errorCode} release device, mainId: ${this.mainId}`);
+        }
+
         this.runPromise = null;
         return;
       }

package/src/events/ui-request.ts

@@ -13,6 +13,7 @@ export const UI_REQUEST = {
   REQUEST_PASSPHRASE_ON_DEVICE: 'ui-request_passphrase_on_device',
 
   CLOSE_UI_WINDOW: 'ui-close_window',
+  DEVICE_PROGRESS: 'ui-device_progress',
 
   BLUETOOTH_PERMISSION: 'ui-bluetooth_permission',
   BLUETOOTH_CHARACTERISTIC_NOTIFY_CHANGE_FAILURE:
@@ -81,6 +82,13 @@ export interface FirmwareTip {
   };
 }
 
+export interface DeviceProgress {
+  type: typeof UI_REQUEST.DEVICE_PROGRESS;
+  payload: {
+    progress?: number;
+  };
+}
+
 export interface PreviousAddressResult {
   type: typeof UI_REQUEST.PREVIOUS_ADDRESS_RESULT;
   payload: {
@@ -100,6 +108,7 @@ export type UiEvent =
   | UiRequestPassphrase
   | FirmwareProgress
   | FirmwareTip
+  | DeviceProgress
   | PreviousAddressResult;
 
 export type UiEventMessage = UiEvent & { event: typeof UI_EVENT };

package/src/types/api/alephiumGetAddress.ts

@@ -2,7 +2,11 @@ import type { CommonParams, Response } from '../params';
 
 export type AlephiumAddress = {
   path: string;
+  /**
+   * @deprecated Use `pub` instead.
+   */
   publicKey?: string;
+  pub?: string;
   address: string;
   derivedPath: string;
 };

package/src/types/api/allNetworkGetAddress.ts

@@ -46,13 +46,19 @@ export type AllNetworkAddressParams = {
   chainName?: string;
   prefix?: string;
   showOnOneKey?: boolean;
+
+  includePublicKey?: boolean;
+  group?: string;
 };
 
 type AllNetworkAddressPayload =
   | {
       address: string;
-      publicKey?: string;
       pub?: string;
+      /**
+       * @deprecated Use `pub` instead.
+       */
+      publicKey?: string;
       // Nostr public key (bech32)
       npub?: string;
     }
@@ -84,8 +90,15 @@ type AllNetworkAddressPayload =
 
 export type AllNetworkAddress = CommonResponseParams & {
   success: boolean;
-  error?: string;
-  payload?: AllNetworkAddressPayload;
+  payload?:
+    | AllNetworkAddressPayload
+    | {
+        error: string;
+        code: number;
+        connectId?: string;
+        deviceId?: string;
+        params: any;
+      };
 };
 
 export type AllNetworkGetAddressParams = {

package/src/types/api/aptosGetAddress.ts

@@ -3,6 +3,10 @@ import type { CommonParams, Response } from '../params';
 
 export type AptosAddress = {
   path: string;
+  pub?: string;
+  /**
+   * @deprecated Use `pub` instead.
+   */
   publicKey?: string;
 } & HardwareAptosAddress;
 

package/src/types/api/aptosGetPublicKey.ts

@@ -2,7 +2,11 @@ import type { CommonParams, Response } from '../params';
 
 export type AptosPublicKey = {
   path: string;
-  publicKey: string;
+  pub: string;
+  /**
+   * @deprecated Use `pub` instead.
+   */
+  publicKey?: string;
 };
 
 export type AptosGetPublicKeyParams = {

package/src/types/api/cardanoGetPublicKey.ts

@@ -4,7 +4,7 @@ import { PROTO } from '../../constants';
 export type CardanoPublicKey = {
   path: number[];
   serializedPath: string;
-  publicKey: string;
+  xpub: string;
   node: PROTO.HDNodeType;
 };
 

package/src/types/api/cosmosGetPublicKey.ts

@@ -2,7 +2,11 @@ import type { CommonParams, Response } from '../params';
 
 export type CosmosPublicKey = {
   path: string;
-  publicKey: string;
+  pub: string;
+  /**
+   * @deprecated Use `pub` instead.
+   */
+  publicKey?: string;
 };
 
 export type CosmosGetPublicKeyParams = {

package/src/types/api/evmGetPublicKey.ts

@@ -3,7 +3,11 @@ import type { CommonParams, Response } from '../params';
 
 export type EVMPublicKey = {
   path: string;
-  publicKey: string;
+  pub: string;
+  /**
+   * @deprecated Use `pub` instead.
+   */
+  publicKey?: string;
 } & EthereumPublicKey;
 
 export type EVMGetPublicKeyParams = {

package/src/types/api/lnurlAuth.ts

@@ -1,6 +1,10 @@
 import type { CommonParams, Response } from '../params';
 
 export interface LnurlAuth {
+  pub?: string;
+  /**
+   * @deprecated Use `pub` instead.
+   */
   publickey?: string;
   path?: string;
   signature?: string;

package/src/types/api/nostrGetPublicKey.ts

@@ -2,7 +2,11 @@ import type { CommonParams, Response } from '../params';
 
 export type NostrPublicKey = {
   npub?: string;
-  publickey?: string;
+  pub?: string;
+  /**
+   * @deprecated Use `pub` instead.
+   */
+  publicKey?: string;
   path: string;
 };
 

package/src/types/api/polkadotGetAddress.ts

@@ -3,7 +3,11 @@ import type { CommonParams, Response } from '../params';
 
 export type PolkadotAddress = {
   path: string;
-  publicKey: string;
+  pub: string;
+  /**
+   * @deprecated Use `pub` instead.
+   */
+  publicKey?: string;
 } & HardwarePolkadotAddress;
 
 export type PolkadotGetAddressParams = {

package/src/types/api/suiGetAddress.ts

@@ -3,6 +3,10 @@ import type { CommonParams, Response } from '../params';
 
 export type SuiAddress = {
   path: string;
+  pub?: string;
+  /**
+   * @deprecated Use `pub` instead.
+   */
   publicKey?: string;
 } & HardwareSuiAddress;
 

package/src/types/api/suiGetPublicKey.ts

@@ -2,7 +2,11 @@ import type { CommonParams, Response } from '../params';
 
 export type SuiPublicKey = {
   path: string;
-  publicKey: string;
+  pub: string;
+  /**
+   * @deprecated Use `pub` instead.
+   */
+  publicKey?: string;
 };
 
 export type SuiGetPublicKeyParams = {

package/src/types/api/tonGetAddress.ts

@@ -3,7 +3,11 @@ import type { CommonParams, Response } from '../params';
 
 export type TonAddress = {
   path: string;
-  publicKey: string;
+  pub: string;
+  /**
+   * @deprecated Use `pub` instead.
+   */
+  publicKey?: string;
   address: string;
 };
 

package/src/types/api/xrpGetAddress.ts

@@ -2,6 +2,10 @@ import type { CommonParams, Response } from '../params';
 
 export type XrpAddress = {
   path: string;
+  pub?: string;
+  /**
+   * @deprecated Use `pub` instead.
+   */
   publicKey?: string;
   address: string;
 };