@onekeyfe/hd-core 1.0.12-alpha.2 → 1.0.13

package/src/api/cardano/CardanoGetPublicKey.ts

@@ -57,12 +57,12 @@ export default class CardanoGetPublicKey extends BaseMethod<CardanoPublicKeyPara
       responses.push({
         path: batch.address_n,
         serializedPath: serializedPath(batch.address_n),
-        publicKey: message.xpub,
+        xpub: message.xpub,
         node: message.node,
       });
     }
 
-    validateResult(responses, ['publicKey'], {
+    validateResult(responses, ['xpub'], {
       expectedLength: this.params.length,
     });
 

package/src/api/cosmos/CosmosGetPublicKey.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 { CosmosGetPublicKeyParams } from '../../types';
+import { CosmosAddress, CosmosGetPublicKeyParams } from '../../types';
 
 export default class CosmosGetPublicKey extends BaseMethod<any> {
   hasBundle = false;
@@ -64,12 +64,15 @@ export default class CosmosGetPublicKey extends BaseMethod<any> {
       ecdsa_curve_name: this.params[0].curve,
     });
 
-    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: CosmosAddress[] = res.message.public_keys.map(
+      (publicKey: string, index: number) => ({
+        path: serializedPath((this.params as unknown as any[])[index].address_n),
+        pub: publicKey,
+        publicKey,
+      })
+    );
 
-    validateResult(responses, ['publicKey'], {
+    validateResult(responses, ['pub'], {
       expectedLength: this.params.length,
     });
 

package/src/api/evm/EVMGetPublicKey.ts

@@ -70,10 +70,11 @@ export default class EVMGetPublicKey extends BaseMethod<EthereumGetPublicKeyOneK
       });
       const result = res.message.public_keys.map((publicKey: string, index: number) => ({
         path: serializedPath((this.params as unknown as any[])[index].address_n),
+        pub: publicKey,
         publicKey,
       }));
 
-      validateResult(responses, ['publicKey'], {
+      validateResult(responses, ['pub'], {
         expectedLength: this.params.length,
       });
       return Promise.resolve(result);
@@ -86,12 +87,13 @@ export default class EVMGetPublicKey extends BaseMethod<EthereumGetPublicKeyOneK
 
       responses.push({
         path: serializedPath(param.address_n),
+        pub: res.message.node.public_key,
         publicKey: res.message.node.public_key,
         ...res.message,
       });
     }
 
-    validateResult(responses, ['publicKey'], {
+    validateResult(responses, ['pub'], {
       expectedLength: this.params.length,
     });
 

package/src/api/lightning/LnurlAuth.ts

@@ -43,6 +43,9 @@ export default class LnurlAuth1 extends BaseMethod<ILnurlAuth> {
 
     validateResult(message, ['publickey', 'path']);
 
-    return message;
+    return {
+      ...message,
+      pub: message.publickey,
+    };
   }
 }

package/src/api/nostr/NostrGetPublicKey.ts

@@ -60,7 +60,9 @@ export default class NostrGetPublicKey extends BaseMethod<GetPublicKey[]> {
 
       const response = {
         path: serializedPath(param.address_n),
-        ...res.message,
+        npub: res.message.npub,
+        pub: res.message.publickey,
+        publickey: res.message.publickey,
       };
 
       responses.push(response);

package/src/api/polkadot/PolkadotGetAddress.ts

@@ -64,6 +64,7 @@ export default class PolkadotGetAddress extends BaseMethod<HardwarePolkadotGetAd
       responses.push({
         path,
         address,
+        pub: public_key ?? '',
         publicKey: public_key ?? '',
       });
 
@@ -73,7 +74,7 @@ export default class PolkadotGetAddress extends BaseMethod<HardwarePolkadotGetAd
       });
     }
 
-    validateResult(responses, ['address', 'publicKey'], {
+    validateResult(responses, ['address', 'pub'], {
       expectedLength: this.params.length,
     });
 

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/ton/TonSignMessage.ts

@@ -1,11 +1,15 @@
 import { TonSignMessage as HardwareTonSignMessage } from '@onekeyfe/hd-transport';
-
+import semver from 'semver';
+import BigNumber from 'bignumber.js';
+import { isEmpty } from 'lodash';
+import { ERRORS, HardwareErrorCode } 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 { DeviceModelToTypes, TonSignMessageParams } from '../../types';
-import { getDeviceType } from '../../utils';
+import { DeviceFirmwareRange, DeviceModelToTypes, TonSignMessageParams } from '../../types';
+import { getDeviceFirmwareVersion, getDeviceType, getMethodVersionRange } from '../../utils';
+import { formatAnyHex, stripHexStartZeroes } from '../helpers/hexUtils';
 
 export default class TonSignMessage extends BaseMethod<HardwareTonSignMessage> {
   init() {
@@ -18,14 +22,14 @@ export default class TonSignMessage extends BaseMethod<HardwareTonSignMessage> {
       { name: 'destination', type: 'string' },
       { name: 'jettonMasterAddress', type: 'string' },
       { name: 'jettonWalletAddress', type: 'string' },
-      { name: 'tonAmount', type: 'number' },
-      { name: 'jettonAmount', type: 'number' },
-      { name: 'fwdFee', type: 'number' },
+      { name: 'tonAmount' },
+      { name: 'jettonAmount' },
+      { name: 'fwdFee' },
       { name: 'comment', type: 'string' },
       { name: 'isRawData', type: 'boolean' },
       { name: 'mode', type: 'number' },
       { name: 'seqno', type: 'number' },
-      { name: 'expireAt', type: 'number' },
+      { name: 'expireAt' },
       { name: 'walletVersion' },
       { name: 'walletId', type: 'number' },
       { name: 'workchain' },
@@ -45,7 +49,6 @@ export default class TonSignMessage extends BaseMethod<HardwareTonSignMessage> {
       jetton_master_address: this.payload.jettonMasterAddress,
       jetton_wallet_address: this.payload.jettonWalletAddress,
       ton_amount: this.payload.tonAmount,
-      jetton_amount: this.payload.jettonAmount,
       fwd_fee: this.payload.fwdFee,
       comment: this.payload.comment,
       mode: this.payload.mode,
@@ -68,10 +71,90 @@ export default class TonSignMessage extends BaseMethod<HardwareTonSignMessage> {
       model_touch: {
         min: '4.10.0',
       },
+      classic1s: {
+        min: '3.10.0',
+      },
+    };
+  }
+
+  getSupportJettonAmountBytesVersionRange(): DeviceFirmwareRange {
+    return {
+      pro: {
+        min: '4.10.2',
+      },
+    };
+  }
+
+  checkSupportJettonAmountBytes() {
+    const firmwareVersion = getDeviceFirmwareVersion(this.device.features)?.join('.');
+    const versionRange = getMethodVersionRange(
+      this.device.features,
+      type => this.getSupportJettonAmountBytesVersionRange()[type]
+    );
+
+    if (!versionRange) {
+      // Equipment that does not need to be repaired
+      return true;
+    }
+
+    if (semver.valid(firmwareVersion) && semver.gte(firmwareVersion, versionRange.min)) {
+      return true;
+    }
+    return false;
+  }
+
+  getFixCommentErrorVersionRange(): DeviceFirmwareRange {
+    return {
+      pro: {
+        min: '4.10.1',
+      },
     };
   }
 
+  checkFixCommentError() {
+    // The issue of missing comments when transferring tokens.
+    const { comment, jettonAmount } = this.payload;
+
+    if (isEmpty(comment) || jettonAmount === null || jettonAmount === undefined) {
+      return;
+    }
+
+    const firmwareVersion = getDeviceFirmwareVersion(this.device.features)?.join('.');
+    const versionRange = getMethodVersionRange(
+      this.device.features,
+      type => this.getFixCommentErrorVersionRange()[type]
+    );
+
+    if (!versionRange) {
+      // Equipment that does not need to be repaired
+      return;
+    }
+
+    if (semver.valid(firmwareVersion) && semver.lt(firmwareVersion, versionRange.min)) {
+      throw ERRORS.TypedError(
+        HardwareErrorCode.CallMethodNeedUpgradeFirmware,
+        `Device firmware version is too low, please update to ${versionRange.min}`,
+        { current: firmwareVersion, require: versionRange.min }
+      );
+    }
+  }
+
   async run() {
+    // checkFixCommentError
+    this.checkFixCommentError();
+
+    // check jettonAmount
+    const { jettonAmount } = this.payload;
+    if (jettonAmount) {
+      if (this.checkSupportJettonAmountBytes()) {
+        this.params.jetton_amount_bytes = stripHexStartZeroes(
+          formatAnyHex(new BigNumber(jettonAmount).toString(16))
+        );
+      } else {
+        this.params.jetton_amount = jettonAmount;
+      }
+    }
+
     const deviceType = getDeviceType(this.device.features);
     const res = await this.device.commands.typedCall('TonSignMessage', 'TonSignedMessage', {
       ...this.params,

package/src/api/ton/TonSignProof.ts

@@ -16,7 +16,7 @@ export default class TonSignProof extends BaseMethod<HardwareTonSignProof> {
       { name: 'path', required: true },
       { name: 'appdomain', type: 'string' },
       { name: 'comment', type: 'string' },
-      { name: 'expireAt', type: 'number' },
+      { name: 'expireAt' },
       { name: 'walletVersion' },
       { name: 'walletId', type: 'number' },
       { name: 'workchain' },

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/data/messages/messages.json

@@ -10628,6 +10628,10 @@
           "rule": "repeated",
           "type": "string",
           "id": 20
+        },
+        "jetton_amount_bytes": {
+          "type": "bytes",
+          "id": 21
         }
       }
     },

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,14 @@ type AllNetworkAddressPayload =
 
 export type AllNetworkAddress = CommonResponseParams & {
   success: boolean;
-  error?: string;
-  payload?: AllNetworkAddressPayload;
+  payload?:
+    | AllNetworkAddressPayload
+    | {
+        error: string;
+        code: number;
+        connectId: string;
+        deviceId: string;
+      };
 };
 
 export type AllNetworkGetAddressParams = {
@@ -95,5 +107,5 @@ export type AllNetworkGetAddressParams = {
 export declare function allNetworkGetAddress(
   connectId: string,
   deviceId: string,
-  params: CommonParams & AllNetworkGetAddressParams
+  params: CommonParams & AllNetworkGetAddressParams,
 ): Response<AllNetworkAddress[]>;

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;