@onekeyfe/hd-core 0.1.54 → 0.1.56

package/src/device/Device.ts

@@ -251,6 +251,13 @@ export class Device extends EventEmitter {
     return this.commands;
   }
 
+  private generateStateKey(deviceId: string, passphraseState?: string) {
+    if (passphraseState) {
+      return `${deviceId}@${passphraseState}`;
+    }
+    return deviceId;
+  }
+
   getInternalState(_deviceId?: string) {
     Log.debug(
       'getInternalState session param: ',
@@ -264,19 +271,27 @@ export class Device extends EventEmitter {
     if (!deviceId) return undefined;
     if (!this.passphraseState) return undefined;
 
-    const usePassKey = `${deviceId}@${this.passphraseState}`;
+    const usePassKey = this.generateStateKey(deviceId, this.passphraseState);
+    return deviceSessionCache[usePassKey];
+  }
 
-    if (!deviceSessionCache[usePassKey]) {
-      const key = `${deviceId}`;
-      if (deviceSessionCache[key]) {
-        deviceSessionCache[usePassKey] = deviceSessionCache[key];
-      }
-    }
+  tryFixInternalState(state: string, deviceId: string) {
+    Log.debug(
+      'tryFixInternalState session param: ',
+      `device_id: ${deviceId}`,
+      `passphraseState: ${state}`
+    );
 
-    return deviceSessionCache[usePassKey];
+    const key = `${deviceId}`;
+    const session = deviceSessionCache[key];
+    if (session) {
+      deviceSessionCache[this.generateStateKey(deviceId, state)] = session;
+      delete deviceSessionCache[key];
+    }
+    Log.debug('tryFixInternalState session cache: ', deviceSessionCache);
   }
 
-  setInternalState(state: string, initSession?: boolean) {
+  private setInternalState(state: string, initSession?: boolean) {
     Log.debug(
       'setInternalState session param: ',
       `state: ${state}`,
@@ -288,10 +303,11 @@ export class Device extends EventEmitter {
     if (!this.features) return;
     if (!this.passphraseState && !initSession) return;
 
-    let key = `${this.features.device_id}`;
-    if (this.passphraseState) {
-      key += `@${this.passphraseState}`;
-    }
+    const deviceId = this.features?.device_id;
+    if (!deviceId) return;
+
+    const key = this.generateStateKey(deviceId, this.passphraseState);
+
     if (state) {
       deviceSessionCache[key] = state;
     }
@@ -307,7 +323,7 @@ export class Device extends EventEmitter {
     delete deviceSessionCache[key];
 
     if (this.passphraseState) {
-      const usePassKey = `${deviceId}@${this.passphraseState}`;
+      const usePassKey = this.generateStateKey(deviceId, this.passphraseState);
       delete deviceSessionCache[usePassKey];
     }
   }

package/src/device/DeviceCommands.ts

@@ -1,4 +1,4 @@
-import type { Transport, Messages } from '@onekeyfe/hd-transport';
+import type { Transport, Messages, FailureType } from '@onekeyfe/hd-transport';
 import { ERRORS, HardwareError, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import TransportManager from '../data-manager/TransportManager';
 import DataManager from '../data-manager/DataManager';
@@ -146,7 +146,10 @@ export class DeviceCommands {
   ): Promise<DefaultMessageResponse> {
     Log.debug('_filterCommonTypes: ', res);
     if (res.type === 'Failure') {
-      const { code, message } = res.message;
+      const { code, message } = res.message as {
+        code?: string | FailureType;
+        message?: string;
+      };
       let error: HardwareError | null = null;
       // Model One does not send any message in firmware update
       if (code === 'Failure_FirmwareError' && !message) {

package/src/inject.ts

@@ -53,12 +53,6 @@ export const inject = ({
      */
     getFeatures: connectId => call({ connectId, method: 'getFeatures' }),
 
-    /**
-     * 批量获取公钥
-     */
-    batchGetPublicKey: (connectId, deviceId, params) =>
-      call({ ...params, connectId, deviceId, method: 'batchGetPublicKey' }),
-
     /**
      * 检查固件版本
      */
@@ -177,6 +171,8 @@ export const inject = ({
 
     aptosGetAddress: (connectId, deviceId, params) =>
       call({ ...params, connectId, deviceId, method: 'aptosGetAddress' }),
+    aptosGetPublicKey: (connectId, deviceId, params) =>
+      call({ ...params, connectId, deviceId, method: 'aptosGetPublicKey' }),
     aptosSignTransaction: (connectId, deviceId, params) =>
       call({ ...params, connectId, deviceId, method: 'aptosSignTransaction' }),
   };

package/src/types/api/aptosGetPublicKey.ts

@@ -0,0 +1,23 @@
+import type { CommonParams, Response } from '../params';
+
+export type AptosPublicKey = {
+  path: string;
+  publicKey: string;
+};
+
+export type AptosGetPublicKeyParams = {
+  path: string | number[];
+  showOnOneKey?: boolean;
+};
+
+export declare function aptosGetPublicKey(
+  connectId: string,
+  deviceId: string,
+  params: CommonParams & AptosGetPublicKeyParams
+): Response<AptosPublicKey>;
+
+export declare function aptosGetPublicKey(
+  connectId: string,
+  deviceId: string,
+  params: CommonParams & { bundle?: AptosGetPublicKeyParams[] }
+): Response<Array<AptosPublicKey>>;

package/src/types/api/export.ts

@@ -94,4 +94,5 @@ export type { NearAddress, NearGetAddressParams } from './nearGetAddress';
 export type { NearSignTransactionParams } from './nearSignTransaction';
 
 export type { AptosAddress, AptosGetAddressParams } from './aptosGetAddress';
+export type { AptosPublicKey, AptosGetPublicKeyParams } from './aptosGetPublicKey';
 export type { AptosSignedTx, AptosSignTransactionParams } from './aptosSignTransaction';

package/src/types/api/index.ts

@@ -26,7 +26,6 @@ import { deviceFlags } from './deviceFlags';
 import { deviceUpdateReboot } from './deviceUpdateReboot';
 import { deviceSupportFeatures } from './deviceSupportFeatures';
 
-import { batchGetPublicKey } from './batchGetPublicKey';
 import { cipherKeyValue } from './cipherKeyValue';
 
 import { evmGetAddress } from './evmGetAddress';
@@ -71,6 +70,7 @@ import { nearGetAddress } from './nearGetAddress';
 import { nearSignTransaction } from './nearSignTransaction';
 
 import { aptosGetAddress } from './aptosGetAddress';
+import { aptosGetPublicKey } from './aptosGetPublicKey';
 import { aptosSignTransaction } from './aptosSignTransaction';
 
 export * from './export';
@@ -118,7 +118,6 @@ export type CoreApi = {
   firmwareUpdate: typeof firmwareUpdate;
   firmwareUpdateV2: typeof firmwareUpdate;
 
-  batchGetPublicKey: typeof batchGetPublicKey;
   cipherKeyValue: typeof cipherKeyValue;
 
   /**
@@ -193,5 +192,6 @@ export type CoreApi = {
    * Aptos function
    */
   aptosGetAddress: typeof aptosGetAddress;
+  aptosGetPublicKey: typeof aptosGetPublicKey;
   aptosSignTransaction: typeof aptosSignTransaction;
 };

package/dist/api/BatchGetPublicKey.d.ts

@@ -1,11 +0,0 @@
-import { BaseMethod } from './BaseMethod';
-export default class BatchGetPublicKey extends BaseMethod {
-    init(): void;
-    getVersionRange(): {
-        model_mini: {
-            min: string;
-        };
-    };
-    run(): Promise<any>;
-}
-//# sourceMappingURL=BatchGetPublicKey.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"BatchGetPublicKey.d.ts","sourceRoot":"","sources":["../../src/api/BatchGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI1C,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,UAAU;IACvD,IAAI;IAaJ,eAAe;;;;;IAQT,GAAG;CAaV"}

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

@@ -1,11 +0,0 @@
-import type { CommonParams, Response } from '../params';
-export declare type BatchGetPublicKeyParams = {
-    paths: string[];
-    ecdsaCurveName: 'secp256k1' | 'ed25519';
-};
-export declare type BatchGetPublicKeyResponse = {
-    path: string;
-    publicKey: string;
-}[];
-export declare function batchGetPublicKey(connectId: string, deviceId: string, params: CommonParams & BatchGetPublicKeyParams): Response<BatchGetPublicKeyResponse>;
-//# sourceMappingURL=batchGetPublicKey.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"batchGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/types/api/batchGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,oBAAY,uBAAuB,GAAG;IACpC,KAAK,EAAE,MAAM,EAAE,CAAC;IAKhB,cAAc,EAAE,WAAW,GAAG,SAAS,CAAC;CACzC,CAAC;AAEF,oBAAY,yBAAyB,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC;AAE9E,MAAM,CAAC,OAAO,UAAU,iBAAiB,CACvC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,uBAAuB,GAC7C,QAAQ,CAAC,yBAAyB,CAAC,CAAC"}

package/src/api/BatchGetPublicKey.ts

@@ -1,40 +0,0 @@
-import { BaseMethod } from './BaseMethod';
-import { validateParams } from './helpers/paramsValidator';
-import { validatePath, serializedPath } from './helpers/pathUtils';
-
-export default class BatchGetPublicKey extends BaseMethod {
-  init() {
-    this.checkDeviceId = true;
-    validateParams(this.payload, [
-      { name: 'paths', type: 'array' },
-      { name: 'ecdsaCurveName', type: 'string' },
-    ]);
-
-    this.params = this.payload.paths.map((path: string) => {
-      const addressN = validatePath(path, 1);
-      return { address_n: addressN };
-    });
-  }
-
-  getVersionRange() {
-    return {
-      model_mini: {
-        min: '2.6.0',
-      },
-    };
-  }
-
-  async run() {
-    // @ts-expect-error
-    const res = await this.device.commands.typedCall('BatchGetPublickeys', 'EcdsaPublicKeys', {
-      paths: this.params,
-      ecdsa_curve_name: this.payload.ecdsaCurveName ?? 'secp256k1',
-    });
-    // @ts-expect-error
-    const result = res.message.public_keys.map((publicKey: string, index: number) => ({
-      path: serializedPath((this.params as unknown as any[])[index].address_n),
-      publicKey,
-    }));
-    return Promise.resolve(result);
-  }
-}

package/src/types/api/batchGetPublicKey.ts

@@ -1,18 +0,0 @@
-import type { CommonParams, Response } from '../params';
-
-export type BatchGetPublicKeyParams = {
-  paths: string[];
-  /**
-   * secp256k1 for eth and btc
-   * ed25519 for sol, stc, aptos
-   */
-  ecdsaCurveName: 'secp256k1' | 'ed25519';
-};
-
-export type BatchGetPublicKeyResponse = { path: string; publicKey: string }[];
-
-export declare function batchGetPublicKey(
-  connectId: string,
-  deviceId: string,
-  params: CommonParams & BatchGetPublicKeyParams
-): Response<BatchGetPublicKeyResponse>;