@onekeyfe/hd-core 1.1.16-alpha.8 → 1.1.17-patch.1

package/dist/api/evm/EVMSignTypedData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EVMSignTypedData.d.ts","sourceRoot":"","sources":["../../../src/api/evm/EVMSignTypedData.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,UAAU,EACV,eAAe,EACf,SAAS,EAEV,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAK3C,OAAO,EAEL,KAAK,4BAA4B,EACjC,KAAK,0BAA0B,EAChC,MAAM,aAAa,CAAC;AAQrB,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,IAAI,EAAE,4BAA4B,CAAC,0BAA0B,CAAC,CAAC;IAC/D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,UAAU,CAAC,sBAAsB,CAAC;IAC9E,IAAI;IAqCE,mBAAmB,CAAC,EACxB,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,aAAa,GACd,EAAE;QACD,SAAS,EAAE,SAAS,CAAC;QACrB,QAAQ,EAAE,4BAA4B,CAAC,0BAA0B,CAAC,CAAC;QACnE,QAAQ,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;QACtC,aAAa,EAAE,OAAO,CAAC;KACxB;;;;IA+JK,aAAa;;;;IAsCnB,aAAa,CAAC,EACZ,SAAS,EACT,QAAQ,EACR,OAAO,EACP,UAAU,EACV,WAAW,GACZ,EAAE;QACD,SAAS,EAAE,SAAS,CAAC;QACrB,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;QAC5B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;QAC/B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;KACjC;IA2BD,eAAe;;;;;IAQf,aAAa,CAAC,IAAI,EAAE,4BAA4B,CAAC,0BAA0B,CAAC;IAiB5E,eAAe,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO;IA8BnC,gBAAgB;IAcV,GAAG;CA2EV"}
+{"version":3,"file":"EVMSignTypedData.d.ts","sourceRoot":"","sources":["../../../src/api/evm/EVMSignTypedData.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,UAAU,EACV,eAAe,EACf,SAAS,EAEV,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAK3C,OAAO,EAEL,KAAK,4BAA4B,EACjC,KAAK,0BAA0B,EAChC,MAAM,aAAa,CAAC;AAQrB,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,IAAI,EAAE,4BAA4B,CAAC,0BAA0B,CAAC,CAAC;IAC/D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,UAAU,CAAC,sBAAsB,CAAC;IAC9E,IAAI;IAqCE,mBAAmB,CAAC,EACxB,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,aAAa,GACd,EAAE;QACD,SAAS,EAAE,SAAS,CAAC;QACrB,QAAQ,EAAE,4BAA4B,CAAC,0BAA0B,CAAC,CAAC;QACnE,QAAQ,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;QACtC,aAAa,EAAE,OAAO,CAAC;KACxB;;;;IA+JK,aAAa;;;;IAsCnB,aAAa,CAAC,EACZ,SAAS,EACT,QAAQ,EACR,OAAO,EACP,UAAU,EACV,WAAW,GACZ,EAAE;QACD,SAAS,EAAE,SAAS,CAAC;QACrB,QAAQ,EAAE,MAAM,EAAE,CAAC;QACnB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;QAC5B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;QAC/B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;KACjC;IA2BD,eAAe;;;;;IAQf,aAAa,CAAC,IAAI,EAAE,4BAA4B,CAAC,0BAA0B,CAAC;IAuB5E,eAAe,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO;IA8BnC,gBAAgB;IAcV,GAAG;CA2EV"}

package/dist/api/xrp/XrpGetAddress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"XrpGetAddress.d.ts","sourceRoot":"","sources":["../../../src/api/xrp/XrpGetAddress.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAuB,MAAM,+BAA+B,CAAC;AAEhF,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAK3C,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAU,CACnD;IACE,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;CACvB,EAAE,CACJ;IACC,SAAS,UAAS;IAElB,aAAa,UAAS;IAEtB,IAAI;IA+BJ,eAAe;;;;;IAQT,GAAG;CAuDV"}
+{"version":3,"file":"XrpGetAddress.d.ts","sourceRoot":"","sources":["../../../src/api/xrp/XrpGetAddress.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAuB,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAU,CACnD;IACE,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;CACvB,EAAE,CACJ;IACC,SAAS,UAAS;IAElB,aAAa,UAAS;IAEtB,IAAI;IA+BJ,eAAe;;;;;IAQT,GAAG;CAuCV"}

package/dist/index.js

@@ -14,7 +14,6 @@ var blake2s = require('@noble/hashes/blake2s');
 var sha256 = require('@noble/hashes/sha256');
 var JSZip = require('jszip');
 var sha3 = require('@noble/hashes/sha3');
-var rippleKeypairs = require('ripple-keypairs');
 var blake2b = require('@noble/hashes/blake2b');
 var buffer = require('buffer');
 
@@ -33030,8 +33029,12 @@ class EVMSignTypedData extends BaseMethod {
             return false;
         let biggerLimit = 1024;
         const currentVersion = getDeviceFirmwareVersion(this.device.features).join('.');
+        const currentDeviceType = getDeviceType(this.device.features);
         const supportBiggerDataVersion = '4.4.0';
-        if (semver__default["default"].gte(currentVersion, supportBiggerDataVersion)) {
+        const supportBiggerData = DeviceModelToTypes.model_classic1s.includes(currentDeviceType) ||
+            (DeviceModelToTypes.model_touch.includes(currentDeviceType) &&
+                semver__default["default"].gte(currentVersion, supportBiggerDataVersion));
+        if (supportBiggerData) {
             biggerLimit = 1536;
         }
         const startIndex = data.startsWith('0x') ? 2 : 0;
@@ -34963,21 +34966,8 @@ class XrpGetAddress$1 extends BaseMethod {
         };
     }
     run() {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.hasBundle && supportBatchPublicKey((_a = this.device) === null || _a === void 0 ? void 0 : _a.features) && !this.shouldConfirm) {
-                const res = yield batchGetPublickeys(this.device, this.params, 'secp256k1', 144);
-                const result = res.public_keys.map((publicKey, index) => ({
-                    path: serializedPath(this.params[index].address_n),
-                    address: rippleKeypairs.deriveAddress(publicKey),
-                    publicKey,
-                    pub: publicKey,
-                }));
-                validateResult(result, ['address', 'publicKey'], {
-                    expectedLength: this.params.length,
-                });
-                return Promise.resolve(result);
-            }
             const responses = [];
             for (let i = 0; i < this.params.length; i++) {
                 const param = this.params[i];
@@ -34991,8 +34981,8 @@ class XrpGetAddress$1 extends BaseMethod {
                 responses.push({
                     path,
                     address,
-                    publicKey: (_c = (_b = publicKey.message) === null || _b === void 0 ? void 0 : _b.public_keys) === null || _c === void 0 ? void 0 : _c[0],
-                    pub: (_e = (_d = publicKey.message) === null || _d === void 0 ? void 0 : _d.public_keys) === null || _e === void 0 ? void 0 : _e[0],
+                    publicKey: (_b = (_a = publicKey.message) === null || _a === void 0 ? void 0 : _a.public_keys) === null || _b === void 0 ? void 0 : _b[0],
+                    pub: (_d = (_c = publicKey.message) === null || _c === void 0 ? void 0 : _c.public_keys) === null || _d === void 0 ? void 0 : _d[0],
                 });
                 this.postPreviousAddressMessage({
                     path,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.1.16-alpha.8",
+  "version": "1.1.17-patch.1",
   "description": "Core processes and APIs for communicating with OneKey hardware devices.",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.1.16-alpha.8",
-    "@onekeyfe/hd-transport": "1.1.16-alpha.8",
+    "@onekeyfe/hd-shared": "1.1.17-patch.1",
+    "@onekeyfe/hd-transport": "1.1.17-patch.1",
     "axios": "1.12.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -35,16 +35,14 @@
     "semver": "^7.3.7"
   },
   "peerDependencies": {
-    "@noble/hashes": "^1.1.3",
-    "ripple-keypairs": "^1.3.1"
+    "@noble/hashes": "^1.1.3"
   },
   "devDependencies": {
     "@noble/hashes": "^1.1.3",
     "@types/parse-uri": "^1.0.0",
     "@types/semver": "^7.3.9",
     "@types/w3c-web-usb": "^1.0.10",
-    "@types/web-bluetooth": "^0.0.21",
-    "ripple-keypairs": "^1.3.1"
+    "@types/web-bluetooth": "^0.0.21"
   },
-  "gitHead": "2b168194312758f2444446bbe954df67815739b5"
+  "gitHead": "d8fb620849996e75b22360cf5de8537d4d8b6d2f"
 }

package/src/api/evm/EVMSignTypedData.ts

@@ -1,7 +1,7 @@
 import semver from 'semver';
 import { get } from 'lodash';
 import BigNumber from 'bignumber.js';
-import { ERRORS, HardwareErrorCode, EDeviceType } from '@onekeyfe/hd-shared';
+import { ERRORS, HardwareErrorCode } from '@onekeyfe/hd-shared';
 import {
   EthereumTypedDataSignature,
   EthereumTypedDataStructAck,
@@ -337,9 +337,15 @@ export default class EVMSignTypedData extends BaseMethod<EVMSignTypedDataParams>
     let biggerLimit = 1024; // 1k
 
     const currentVersion = getDeviceFirmwareVersion(this.device.features).join('.');
+    const currentDeviceType = getDeviceType(this.device.features);
     const supportBiggerDataVersion = '4.4.0';
 
-    if (semver.gte(currentVersion, supportBiggerDataVersion)) {
+    const supportBiggerData =
+      DeviceModelToTypes.model_classic1s.includes(currentDeviceType) ||
+      (DeviceModelToTypes.model_touch.includes(currentDeviceType) &&
+        semver.gte(currentVersion, supportBiggerDataVersion));
+
+    if (supportBiggerData) {
       biggerLimit = 1536; // 1.5k
     }
 

package/src/api/firmware/FirmwareUpdateBaseMethod.ts

@@ -278,7 +278,7 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
         updaeteResponse = {
           type: 'Success',
           message: { message: FIRMWARE_UPDATE_CONFIRM },
-        }
+        };
       } else {
         throw error;
       }

package/src/api/xrp/XrpGetAddress.ts

@@ -1,11 +1,8 @@
-import { deriveAddress } from 'ripple-keypairs';
 import { UI_REQUEST } from '../../constants/ui-request';
 import { XrpAddress, XrpGetAddressParams } from '../../types/api/xrpGetAddress';
-import { supportBatchPublicKey } from '../../utils/deviceFeaturesUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams, validateResult } from '../helpers/paramsValidator';
 import { serializedPath, validatePath } from '../helpers/pathUtils';
-import { batchGetPublickeys } from '../helpers/batchGetPublickeys';
 
 export default class XrpGetAddress extends BaseMethod<
   {
@@ -57,22 +54,6 @@ export default class XrpGetAddress extends BaseMethod<
   }
 
   async run() {
-    if (this.hasBundle && supportBatchPublicKey(this.device?.features) && !this.shouldConfirm) {
-      const res = await batchGetPublickeys(this.device, this.params, 'secp256k1', 144);
-      const result = res.public_keys.map((publicKey: string, index: number) => ({
-        path: serializedPath((this.params as unknown as any[])[index].address_n),
-        address: deriveAddress(publicKey),
-        publicKey,
-        pub: publicKey,
-      }));
-
-      validateResult(result, ['address', 'publicKey'], {
-        expectedLength: this.params.length,
-      });
-
-      return Promise.resolve(result);
-    }
-
     const responses: XrpAddress[] = [];
     for (let i = 0; i < this.params.length; i++) {
       const param = this.params[i];