@onekeyfe/hd-core 0.2.35 → 0.2.36

package/dist/api/btc/BTCGetPublicKey.d.ts

@@ -4,6 +4,7 @@ import { BTCPublicKey } from '../../types/api/btcGetPublicKey';
 export default class BTCGetPublicKey extends BaseMethod<GetPublicKey[]> {
     hasBundle: boolean;
     init(): void;
+    private isBtcNetwork;
     run(): Promise<BTCPublicKey | BTCPublicKey[]>;
 }
 //# sourceMappingURL=BTCGetPublicKey.d.ts.map

package/dist/api/btc/BTCGetPublicKey.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BTCGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/api/btc/BTCGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAU,CAAC,YAAY,EAAE,CAAC;IACrE,SAAS,UAAS;IAElB,IAAI;IA4CE,GAAG;CAkBV"}
+{"version":3,"file":"BTCGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/api/btc/BTCGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAU,CAAC,YAAY,EAAE,CAAC;IACrE,SAAS,UAAS;IAElB,IAAI;IA4CJ,OAAO,CAAC,YAAY;IAId,GAAG;CA8BV"}

package/dist/api/helpers/pathUtils.d.ts

@@ -5,6 +5,7 @@ export declare const getHDPath: (path: string) => Array<number>;
 export declare const isMultisigPath: (path: Array<number>) => boolean;
 export declare const isSegwitPath: (path: Array<number>) => boolean;
 export declare const isBech32Path: (path: Array<number>) => boolean;
+export declare const isTaprootPath: (path: number[] | undefined) => boolean;
 export declare const getScriptType: (path: Array<number>) => InputScriptType;
 export declare const getOutputScriptType: (path?: number[] | undefined) => ChangeOutputScriptType;
 export declare const serializedPath: (path: Array<number>) => string;

package/dist/api/helpers/pathUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pathUtils.d.ts","sourceRoot":"","sources":["../../../src/api/helpers/pathUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAIjF,eAAO,MAAM,UAAU,MAAO,MAAM,KAAG,MAAiC,CAAC;AACzE,eAAO,MAAM,YAAY,MAAO,MAAM,KAAG,MAAkC,CAAC;AAW5E,eAAO,MAAM,SAAS,SAAU,MAAM,KAAG,MAAM,MAAM,CAuBpD,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,MAAM,MAAM,CAAC,KAAG,OACF,CAAC;AAEpD,eAAO,MAAM,YAAY,SAAU,MAAM,MAAM,CAAC,KAAG,OACA,CAAC;AAEpD,eAAO,MAAM,YAAY,SAAU,MAAM,MAAM,CAAC,KAAG,OACA,CAAC;AAEpD,eAAO,MAAM,aAAa,SAAU,MAAM,MAAM,CAAC,KAAG,eAcnD,CAAC;AAEF,eAAO,MAAM,mBAAmB,mCAAsB,sBAmBrD,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,MAAM,MAAM,CAAC,KAAG,MAWpD,CAAC;AAEF,eAAO,MAAM,YAAY,SACjB,MAAM,GAAG,MAAM,MAAM,CAAC,sCAG3B,MAAM,MAAM,CAoBd,CAAC"}
+{"version":3,"file":"pathUtils.d.ts","sourceRoot":"","sources":["../../../src/api/helpers/pathUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAIjF,eAAO,MAAM,UAAU,MAAO,MAAM,KAAG,MAAiC,CAAC;AACzE,eAAO,MAAM,YAAY,MAAO,MAAM,KAAG,MAAkC,CAAC;AAW5E,eAAO,MAAM,SAAS,SAAU,MAAM,KAAG,MAAM,MAAM,CAuBpD,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,MAAM,MAAM,CAAC,KAAG,OACF,CAAC;AAEpD,eAAO,MAAM,YAAY,SAAU,MAAM,MAAM,CAAC,KAAG,OACA,CAAC;AAEpD,eAAO,MAAM,YAAY,SAAU,MAAM,MAAM,CAAC,KAAG,OACA,CAAC;AAEpD,eAAO,MAAM,aAAa,SAAU,MAAM,EAAE,GAAG,SAAS,YAC8B,CAAC;AAEvF,eAAO,MAAM,aAAa,SAAU,MAAM,MAAM,CAAC,KAAG,eAiBnD,CAAC;AAEF,eAAO,MAAM,mBAAmB,mCAAsB,sBAuBrD,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,MAAM,MAAM,CAAC,KAAG,MAWpD,CAAC;AAEF,eAAO,MAAM,YAAY,SACjB,MAAM,GAAG,MAAM,MAAM,CAAC,sCAG3B,MAAM,MAAM,CAoBd,CAAC"}

package/dist/index.d.ts

@@ -542,6 +542,7 @@ declare function btcGetAddress(connectId: string, deviceId: string, params: Comm
 
 declare type BTCPublicKey = {
     path: string;
+    xpubSegwit?: string;
 } & PublicKey;
 declare type BTCGetPublicKeyParams = {
     path: string | number[];

package/dist/index.js

@@ -688,6 +688,7 @@ const getHDPath = (path) => {
 };
 const isMultisigPath = (path) => Array.isArray(path) && path[0] === toHardened(48);
 const isSegwitPath = (path) => Array.isArray(path) && path[0] === toHardened(49);
+const isTaprootPath = (path) => Array.isArray(path) && (path[0] === toHardened(86) || path[0] === toHardened(10025));
 const getScriptType = (path) => {
     if (!Array.isArray(path) || path.length < 1)
         return 'SPENDADDRESS';
@@ -699,6 +700,9 @@ const getScriptType = (path) => {
             return 'SPENDP2SHWITNESS';
         case 84:
             return 'SPENDWITNESS';
+        case 86:
+        case 10025:
+            return 'SPENDTAPROOT';
         default:
             return 'SPENDADDRESS';
     }
@@ -717,6 +721,9 @@ const getOutputScriptType = (path) => {
             return 'PAYTOP2SHWITNESS';
         case 84:
             return 'PAYTOWITNESS';
+        case 86:
+        case 10025:
+            return 'PAYTOTAPROOT';
         default:
             return 'PAYTOADDRESS';
     }
@@ -14173,13 +14180,24 @@ class BTCGetPublicKey extends BaseMethod {
             });
         });
     }
+    isBtcNetwork(param) {
+        return param.coin_name === 'Testnet' || param.coin_name === 'Bitcoin';
+    }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
             const responses = [];
             for (let i = 0; i < this.params.length; i++) {
                 const param = this.params[i];
                 const res = yield this.device.commands.typedCall('GetPublicKey', 'PublicKey', Object.assign({}, param));
-                responses.push(Object.assign({ path: serializedPath(param.address_n) }, res.message));
+                const response = Object.assign(Object.assign({ path: serializedPath(param.address_n) }, res.message), { xpubSegwit: res.message.xpub });
+                if (this.isBtcNetwork(param) && isTaprootPath(param.address_n)) {
+                    const fingerprint = Number(response.root_fingerprint || 0)
+                        .toString(16)
+                        .padStart(8, '0');
+                    const descriptorPath = `${fingerprint}${response.path.substring(1)}`;
+                    response.xpubSegwit = `tr([${descriptorPath}]${response.xpub}/<0;1>/*)`;
+                }
+                responses.push(response);
             }
             return Promise.resolve(this.hasBundle ? responses : responses[0]);
         });

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

@@ -2,6 +2,7 @@ import { InputScriptType, PublicKey } from '@onekeyfe/hd-transport';
 import type { CommonParams, Response } from '../params';
 export declare type BTCPublicKey = {
     path: string;
+    xpubSegwit?: string;
 } & PublicKey;
 export declare type BTCGetPublicKeyParams = {
     path: string | number[];

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

@@ -1 +1 @@
-{"version":3,"file":"btcGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/types/api/btcGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,oBAAY,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;CACd,GAAG,SAAS,CAAC;AAEd,oBAAY,qBAAqB,GAAG;IAClC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,UAAU,CAAC,EAAE,eAAe,CAAC;CAC9B,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,qBAAqB,GAC3C,QAAQ,CAAC,YAAY,CAAC,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,qBAAqB,EAAE,CAAA;CAAE,GAC1D,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC"}
+{"version":3,"file":"btcGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/types/api/btcGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAExD,oBAAY,YAAY,GAAG;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GAAG,SAAS,CAAC;AAEd,oBAAY,qBAAqB,GAAG;IAClC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,UAAU,CAAC,EAAE,eAAe,CAAC;CAC9B,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG,qBAAqB,GAC3C,QAAQ,CAAC,YAAY,CAAC,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,YAAY,GAAG;IAAE,MAAM,CAAC,EAAE,qBAAqB,EAAE,CAAA;CAAE,GAC1D,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.2.35",
+  "version": "0.2.36",
   "description": "> TODO: description",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -24,8 +24,8 @@
     "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "^0.2.35",
-    "@onekeyfe/hd-transport": "^0.2.35",
+    "@onekeyfe/hd-shared": "^0.2.36",
+    "@onekeyfe/hd-transport": "^0.2.36",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "jszip": "^3.10.1",
@@ -42,5 +42,5 @@
     "@types/semver": "^7.3.9",
     "ripple-keypairs": "^1.1.4"
   },
-  "gitHead": "3dc0a64c3a036bf1ffbb1959bfc7957091aab1e6"
+  "gitHead": "53dfab54b8e9f221b4b855e5f36f2b618ebfcdd9"
 }

package/src/api/btc/BTCGetPublicKey.ts

@@ -1,6 +1,6 @@
 import { GetPublicKey } from '@onekeyfe/hd-transport';
 import { UI_REQUEST } from '../../constants/ui-request';
-import { getScriptType, serializedPath, validatePath } from '../helpers/pathUtils';
+import { getScriptType, isTaprootPath, serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { BTCGetAddressParams } from '../../types/api/btcGetAddress';
@@ -54,6 +54,10 @@ export default class BTCGetPublicKey extends BaseMethod<GetPublicKey[]> {
     });
   }
 
+  private isBtcNetwork(param: GetPublicKey) {
+    return param.coin_name === 'Testnet' || param.coin_name === 'Bitcoin';
+  }
+
   async run() {
     const responses: BTCPublicKey[] = [];
 
@@ -64,10 +68,22 @@ export default class BTCGetPublicKey extends BaseMethod<GetPublicKey[]> {
         ...param,
       });
 
-      responses.push({
+      const response = {
         path: serializedPath(param.address_n),
         ...res.message,
-      });
+        xpubSegwit: res.message.xpub,
+      };
+
+      if (this.isBtcNetwork(param) && isTaprootPath(param.address_n)) {
+        // wrap regular xpub into bitcoind native descriptor
+        const fingerprint = Number(response.root_fingerprint || 0)
+          .toString(16)
+          .padStart(8, '0');
+        const descriptorPath = `${fingerprint}${response.path.substring(1)}`;
+        response.xpubSegwit = `tr([${descriptorPath}]${response.xpub}/<0;1>/*)`;
+      }
+
+      responses.push(response);
     }
 
     return Promise.resolve(this.hasBundle ? responses : responses[0]);

package/src/api/helpers/pathUtils.ts

@@ -50,6 +50,9 @@ export const isSegwitPath = (path: Array<number>): boolean =>
 export const isBech32Path = (path: Array<number>): boolean =>
   Array.isArray(path) && path[0] === toHardened(84);
 
+export const isTaprootPath = (path: number[] | undefined) =>
+  Array.isArray(path) && (path[0] === toHardened(86) || path[0] === toHardened(10025));
+
 export const getScriptType = (path: Array<number>): InputScriptType => {
   if (!Array.isArray(path) || path.length < 1) return 'SPENDADDRESS';
 
@@ -61,6 +64,9 @@ export const getScriptType = (path: Array<number>): InputScriptType => {
       return 'SPENDP2SHWITNESS';
     case 84:
       return 'SPENDWITNESS';
+    case 86:
+    case 10025:
+      return 'SPENDTAPROOT';
     default:
       return 'SPENDADDRESS';
   }
@@ -82,6 +88,10 @@ export const getOutputScriptType = (path?: number[]): ChangeOutputScriptType =>
       return 'PAYTOP2SHWITNESS';
     case 84:
       return 'PAYTOWITNESS';
+    // 10025 - SLIP-25 https://github.com/satoshilabs/slips/blob/master/slip-0025.md#public-key-derivation
+    case 86:
+    case 10025:
+      return 'PAYTOTAPROOT';
     default:
       return 'PAYTOADDRESS';
   }

package/src/types/api/btcGetPublicKey.ts

@@ -3,6 +3,7 @@ import type { CommonParams, Response } from '../params';
 
 export type BTCPublicKey = {
   path: string;
+  xpubSegwit?: string;
 } & PublicKey;
 
 export type BTCGetPublicKeyParams = {