@onekeyfe/hd-core 1.0.15-alpha.1 → 1.0.16-alpha.0

package/__tests__/benfen.test.ts

@@ -0,0 +1,16 @@
+import { publicKeyToAddress, hex2BfcAddress } from '../src/api/benfen/normalize';
+
+describe('Benfen Address Normalization', () => {
+  it('publicKeyToBFCAddress', () => {
+    // Test case with a known public key and its expected address
+    const publicKey = '6e9c9ef745cc3a250168db15526d18075dc52849d49f8a6ea5477c1c264b4848';
+    const expectedHexAddress = '0xb4ced58018b75d7ba72a10fa97c09b7bf66533ff104bf9db1bfdb004b17d8eaa';
+    const expectedAddress =
+      'BFCb4ced58018b75d7ba72a10fa97c09b7bf66533ff104bf9db1bfdb004b17d8eaa2e35';
+
+    const hexAddress = publicKeyToAddress(publicKey);
+    const bfcAddress = hex2BfcAddress(hexAddress);
+    expect(hexAddress).toBe(expectedHexAddress);
+    expect(bfcAddress).toBe(expectedAddress);
+  });
+});

package/__tests__/checkBootloaderReleast.test.js

@@ -1,5 +1,11 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
-const { shouldUpdateBootloaderForClassicAndMini } = require('../src/api/firmware/bootloaderHelper');
+import { shouldUpdateBootloaderForClassicAndMini } from '../src/api/firmware/bootloaderHelper';
+
+// Add mock for config module
+jest.mock('../src/data/config', () => ({
+  getSDKVersion: () => '1.0.0',
+  DEFAULT_DOMAIN: 'https://jssdk.onekey.so/1.0.0/',
+}));
 
 const fixtures = [
   {

package/dist/api/benfen/BenfenSignTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BenfenSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/api/benfen/BenfenSignTransaction.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,cAAc,EAAe,MAAM,wBAAwB,CAAC;AAK9F,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAExE,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,UAAU,CAAC,YAAY,CAAC;IACzE,IAAI;IA+BJ,aAAa,SAAQ;IAErB,gBAAgB,cACH,SAAS,OACf,qBAAqB,gBAAgB,CAAC,GAAG,qBAAqB,iBAAiB,CAAC,QAC/E,MAAM,sBAEX,QAAQ,cAAc,CAAC,CA+BxB;IAEI,GAAG;CAkBV"}
+{"version":3,"file":"BenfenSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/api/benfen/BenfenSignTransaction.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,cAAc,EAAe,MAAM,wBAAwB,CAAC;AAK9F,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAG3C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAExE,MAAM,CAAC,OAAO,OAAO,qBAAsB,SAAQ,UAAU,CAAC,YAAY,CAAC;IACzE,IAAI;IA8BJ,aAAa,SAAQ;IAErB,gBAAgB,cACH,SAAS,OACf,qBAAqB,gBAAgB,CAAC,GAAG,qBAAqB,iBAAiB,CAAC,QAC/E,MAAM,sBAEX,QAAQ,cAAc,CAAC,CA+BxB;IAEI,GAAG;CAkBV"}

package/dist/api/benfen/normalize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../../src/api/benfen/normalize.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,qBAAqB,KAAK,CAAC;AACxC,eAAO,MAAM,eAAe,KAAK,CAAC;AAElC,eAAO,MAAM,wBAAwB;;CAEpC,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,UAAQ,GAAG,MAAM,CAMhF;AAED,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,UAQnD;AAED,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAezD"}
+{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../../src/api/benfen/normalize.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,qBAAqB,KAAK,CAAC;AACxC,eAAO,MAAM,eAAe,KAAK,CAAC;AAElC,eAAO,MAAM,wBAAwB;;CAEpC,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,UAAQ,GAAG,MAAM,CAMhF;AAED,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,UAQnD;AAQD,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAezD"}

package/dist/index.d.ts

@@ -2138,6 +2138,7 @@ type BenfenSignedTx = {
 } & AptosSignedTx$1;
 type BenfenSignTransactionParams = {
     path: string | number[];
+    coinType?: string;
     rawTx?: string;
 };
 declare function benfenSignTransaction(connectId: string, deviceId: string, params: CommonParams & BenfenSignTransactionParams): Response<BenfenSignedTx>;

package/dist/index.js

@@ -35613,18 +35613,13 @@ class BenfenSignTransaction extends BaseMethod {
         validateParams(this.payload, [
             { name: 'path', required: true },
             { name: 'rawTx', type: 'hexString', required: true },
-            { name: 'coinType', type: 'string', required: true },
+            { name: 'coinType', type: 'string', required: false },
         ]);
         const { path, rawTx, coinType } = this.payload;
         const addressN = validatePath(path, 3);
-        const coinTypeHex = coinType.startsWith('0x')
-            ? coinType.slice(2)
-            : Buffer.from(coinType).toString('hex');
-        this.params = {
-            address_n: addressN,
-            raw_tx: formatAnyHex(rawTx),
-            coin_type: formatAnyHex(coinTypeHex),
-        };
+        this.params = Object.assign({ address_n: addressN, raw_tx: formatAnyHex(rawTx) }, (coinType && {
+            coin_type: formatAnyHex(Buffer.from(coinType).toString('hex')),
+        }));
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {

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

@@ -6,6 +6,7 @@ export type BenfenSignedTx = {
 } & HardwareAptosSignedTx;
 export type BenfenSignTransactionParams = {
     path: string | number[];
+    coinType?: string;
     rawTx?: string;
 };
 export declare function benfenSignTransaction(connectId: string, deviceId: string, params: CommonParams & BenfenSignTransactionParams): Response<BenfenSignedTx>;

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

@@ -1 +1 @@
-{"version":3,"file":"benfenSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/types/api/benfenSignTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,IAAI,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,qBAAqB,CAAC;AAE1B,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,qBAAqB,CAC3C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,2BAA2B,GACjD,QAAQ,CAAC,cAAc,CAAC,CAAC"}
+{"version":3,"file":"benfenSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/types/api/benfenSignTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,IAAI,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,qBAAqB,CAAC;AAE1B,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,qBAAqB,CAC3C,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,2BAA2B,GACjD,QAAQ,CAAC,cAAc,CAAC,CAAC"}

package/jest.config.js

@@ -2,4 +2,5 @@ module.exports = {
   preset: '../../jest.config.js',
   testEnvironment: 'node',
   modulePathIgnorePatterns: ['node_modules', '<rootDir>/lib', '<rootDir>/libDev'],
+  collectCoverage: true,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.0.15-alpha.1",
+  "version": "1.0.16-alpha.0",
   "description": "> TODO: description",
   "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.0.15-alpha.1",
-    "@onekeyfe/hd-transport": "^1.0.15-alpha.1",
+    "@onekeyfe/hd-shared": "^1.0.16-alpha.0",
+    "@onekeyfe/hd-transport": "^1.0.16-alpha.0",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -44,5 +44,5 @@
     "@types/semver": "^7.3.9",
     "ripple-keypairs": "^1.1.4"
   },
-  "gitHead": "a9109a126624f719af1534ad0f1d15314a80ce13"
+  "gitHead": "233ae26c003f089644e203620fcf53210385f591"
 }

package/src/api/benfen/BenfenSignTransaction.ts

@@ -16,19 +16,18 @@ export default class BenfenSignTransaction extends BaseMethod<BenfenSignTx> {
     validateParams(this.payload, [
       { name: 'path', required: true },
       { name: 'rawTx', type: 'hexString', required: true },
-      { name: 'coinType', type: 'string', required: true },
+      { name: 'coinType', type: 'string', required: false },
     ]);
 
     const { path, rawTx, coinType } = this.payload;
     const addressN = validatePath(path, 3);
-    const coinTypeHex = coinType.startsWith('0x')
-      ? coinType.slice(2)
-      : Buffer.from(coinType).toString('hex');
 
     this.params = {
       address_n: addressN,
       raw_tx: formatAnyHex(rawTx),
-      coin_type: formatAnyHex(coinTypeHex),
+      ...(coinType && {
+        coin_type: formatAnyHex(Buffer.from(coinType).toString('hex')),
+      }),
     };
   }
 

package/src/api/benfen/normalize.ts

@@ -27,6 +27,12 @@ export function publicKeyToAddress(publicKey: string) {
   );
 }
 
+/**
+ * 将十六进制地址转换为 BFC 格式地址
+ * @param hexAddress - 输入的十六进制地址（可以带有0x前缀）
+ * @returns BFC格式的地址，格式为：BFC + 64位地址 + 4位校验和
+ * @throws {Error} 当输入地址格式无效时
+ */
 export function hex2BfcAddress(hexAddress: string): string {
   // 如果已经是BFC格式，直接返回
   if (/^BFC/i.test(hexAddress)) {

package/src/types/api/benfenSignTransaction.ts

@@ -8,6 +8,7 @@ export type BenfenSignedTx = {
 
 export type BenfenSignTransactionParams = {
   path: string | number[];
+  coinType?: string;
   rawTx?: string;
 };