@onekeyfe/hd-core 1.0.34 → 1.0.35

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,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAG3D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAK/D,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAU,CAAC,YAAY,EAAE,CAAC;IACrE,SAAS,UAAS;IAElB,IAAI;IA4CJ,OAAO,CAAC,YAAY;IAIpB,eAAe;;;;;;;;;;;IAIT,GAAG;CAkFV"}
+{"version":3,"file":"BTCGetPublicKey.d.ts","sourceRoot":"","sources":["../../../src/api/btc/BTCGetPublicKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAG3D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAK/D,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAU,CAAC,YAAY,EAAE,CAAC;IACrE,SAAS,UAAS;IAElB,IAAI;IA4CJ,OAAO,CAAC,YAAY;IAIpB,eAAe;;;;;;;;;;;IAIT,GAAG;CA2FV"}

package/dist/api/btc/helpers/xpubUtils.d.ts

@@ -1,3 +1,4 @@
 import type { HDNodeType, InputScriptType } from '@onekeyfe/hd-transport';
+export declare function getVersionBytes(coinName: string, scriptType?: InputScriptType): number | undefined;
 export declare function createExtendedPublicKey(node: HDNodeType, coinName: string, scriptType?: InputScriptType): string;
 //# sourceMappingURL=xpubUtils.d.ts.map

package/dist/api/btc/helpers/xpubUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xpubUtils.d.ts","sourceRoot":"","sources":["../../../../src/api/btc/helpers/xpubUtils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAwF1E,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,eAAe,GAC3B,MAAM,CAUR"}
+{"version":3,"file":"xpubUtils.d.ts","sourceRoot":"","sources":["../../../../src/api/btc/helpers/xpubUtils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAY1E,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,eAAe,GAC3B,MAAM,GAAG,SAAS,CA6CpB;AAuDD,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,eAAe,GAC3B,MAAM,CAUR"}

package/dist/index.js

@@ -30403,22 +30403,29 @@ function getVersionBytes(coinName, scriptType) {
                 return VERSION_BYTES.XPUB;
         }
     }
-    else if (coinName.toLowerCase() === 'testnet') {
-        return 0x043587cf;
-    }
-    else if (coinName.toLowerCase() === 'regtest') {
-        return 0x043587cf;
-    }
     else if (coinName.toLowerCase() === 'litecoin') {
-        return 0x019da462;
+        switch (scriptType) {
+            case 'SPENDADDRESS':
+            case 'SPENDMULTISIG':
+                return 0x019da462;
+            case 'SPENDP2SHWITNESS':
+                return 0x01b26ef6;
+            case 'SPENDWITNESS':
+                return 0x04b24746;
+            default:
+                return undefined;
+        }
     }
     else if (coinName.toLowerCase() === 'dogecoin') {
-        return 0x02facafd;
-    }
-    else if (coinName.toLowerCase() === 'dash') {
-        return 0x02fe52cc;
+        if (scriptType === 'SPENDADDRESS') {
+            return 0x02facafd;
+        }
+        if (scriptType === 'SPENDMULTISIG') {
+            return 0x0488b21e;
+        }
+        return undefined;
     }
-    return VERSION_BYTES.XPUB;
+    return undefined;
 }
 function base58Check(data) {
     const checksum = sha256.sha256(sha256.sha256(new Uint8Array(data))).slice(0, 4);
@@ -30444,6 +30451,9 @@ function base58Check(data) {
 }
 function generateExtendedPublicKey(coinName, depth, fingerprint, childNum, chainCode, publicKey, scriptType) {
     const versionBytes = getVersionBytes(coinName, scriptType);
+    if (!versionBytes) {
+        throw new Error(`Invalid coinName, not support generate xpub for scriptType: ${scriptType}`);
+    }
     const buffer = Buffer.alloc(78);
     buffer.writeUInt32BE(versionBytes, 0);
     buffer.writeUInt8(depth, 4);
@@ -30510,6 +30520,12 @@ class BTCGetPublicKey extends BaseMethod {
                 if (existsShowDisplay || !this.hasBundle) {
                     throw new Error('Goto getPublickey');
                 }
+                for (const param of this.params) {
+                    const versionBytes = getVersionBytes(param.coin_name, param.script_type);
+                    if (!versionBytes) {
+                        throw new Error(`Invalid coinName, not support generate xpub for scriptType: ${param.script_type}`);
+                    }
+                }
                 const res = yield batchGetPublickeys(this.device, this.params, 'secp256k1', 0, {
                     includeNode: true,
                     ignoreCoinType: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "1.0.34",
+  "version": "1.0.35",
   "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.34",
-    "@onekeyfe/hd-transport": "^1.0.34",
+    "@onekeyfe/hd-shared": "^1.0.35",
+    "@onekeyfe/hd-transport": "^1.0.35",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "bytebuffer": "^5.0.1",
@@ -46,5 +46,5 @@
     "@types/web-bluetooth": "^0.0.21",
     "ripple-keypairs": "^1.1.4"
   },
-  "gitHead": "3172095f33c4637dd76b36fee3ea0cfa0bd3ae40"
+  "gitHead": "8775875f070433e8133d6465885bc050d53b6ea5"
 }

package/src/api/btc/BTCGetPublicKey.ts

@@ -8,7 +8,7 @@ import { getCoinInfo } from './helpers/btcParamsUtils';
 import { BTCPublicKey } from '../../types/api/btcGetPublicKey';
 import { getBitcoinForkVersionRange } from './helpers/versionLimit';
 import { batchGetPublickeys } from '../helpers/batchGetPublickeys';
-import { createExtendedPublicKey } from './helpers/xpubUtils';
+import { createExtendedPublicKey, getVersionBytes } from './helpers/xpubUtils';
 
 export default class BTCGetPublicKey extends BaseMethod<GetPublicKey[]> {
   hasBundle = false;
@@ -74,6 +74,15 @@ export default class BTCGetPublicKey extends BaseMethod<GetPublicKey[]> {
         throw new Error('Goto getPublickey');
       }
 
+      for (const param of this.params) {
+        const versionBytes = getVersionBytes(param.coin_name, param.script_type);
+        if (!versionBytes) {
+          throw new Error(
+            `Invalid coinName, not support generate xpub for scriptType: ${param.script_type}`
+          );
+        }
+      }
+
       const res = await batchGetPublickeys(this.device, this.params, 'secp256k1', 0, {
         includeNode: true,
         ignoreCoinType: true,

package/src/api/btc/helpers/xpubUtils.ts

@@ -11,31 +11,54 @@ const VERSION_BYTES = {
   ZPUB: 0x04b24746,
 };
 
-function getVersionBytes(coinName: string, scriptType?: InputScriptType): number {
+export function getVersionBytes(
+  coinName: string,
+  scriptType?: InputScriptType
+): number | undefined {
   if (coinName.toLowerCase() === 'bitcoin') {
     switch (scriptType) {
       case 'SPENDADDRESS':
       case 'SPENDMULTISIG':
+        // 44、48
         return VERSION_BYTES.XPUB;
       case 'SPENDP2SHWITNESS':
+        // 49
         return VERSION_BYTES.YPUB;
       case 'SPENDWITNESS':
+        // 84
         return VERSION_BYTES.ZPUB;
       default:
+        // 86、10025
         return VERSION_BYTES.XPUB;
     }
-  } else if (coinName.toLowerCase() === 'testnet') {
-    return 0x043587cf;
-  } else if (coinName.toLowerCase() === 'regtest') {
-    return 0x043587cf;
   } else if (coinName.toLowerCase() === 'litecoin') {
-    return 0x019da462;
+    switch (scriptType) {
+      case 'SPENDADDRESS':
+      case 'SPENDMULTISIG':
+        // 44、48
+        return 0x019da462;
+      case 'SPENDP2SHWITNESS':
+        // 49
+        return 0x01b26ef6;
+      case 'SPENDWITNESS':
+        // 84
+        return 0x04b24746;
+      default:
+        // not support 86、10025 path
+        return undefined;
+    }
   } else if (coinName.toLowerCase() === 'dogecoin') {
-    return 0x02facafd;
-  } else if (coinName.toLowerCase() === 'dash') {
-    return 0x02fe52cc;
+    if (scriptType === 'SPENDADDRESS') {
+      // 44
+      return 0x02facafd;
+    }
+    if (scriptType === 'SPENDMULTISIG') {
+      // 48
+      return 0x0488b21e;
+    }
+    return undefined;
   }
-  return VERSION_BYTES.XPUB;
+  return undefined;
 }
 
 function base58Check(data: Buffer): string {
@@ -76,6 +99,10 @@ function generateExtendedPublicKey(
 ): string {
   const versionBytes = getVersionBytes(coinName, scriptType);
 
+  if (!versionBytes) {
+    throw new Error(`Invalid coinName, not support generate xpub for scriptType: ${scriptType}`);
+  }
+
   const buffer = Buffer.alloc(78);
   buffer.writeUInt32BE(versionBytes, 0);
   buffer.writeUInt8(depth, 4);