@onekeyfe/hd-core 0.3.32 → 0.3.33

package/dist/api/polkadot/PolkadotGetAddress.d.ts

@@ -4,7 +4,7 @@ import { PolkadotAddress } from '../../types';
 export default class PolkadotGetAddress extends BaseMethod<HardwarePolkadotGetAddress[]> {
     hasBundle: boolean;
     init(): void;
-    getVersionRange(): {
+    getVersionRange(): import("../../types").DeviceFirmwareRange | {
         model_mini: {
             min: string;
         };

package/dist/api/polkadot/PolkadotGetAddress.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PolkadotGetAddress.d.ts","sourceRoot":"","sources":["../../../src/api/polkadot/PolkadotGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,IAAI,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAG1F,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,eAAe,EAA4B,MAAM,aAAa,CAAC;AAExE,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,UAAU,CAAC,0BAA0B,EAAE,CAAC;IACtF,SAAS,UAAS;IAElB,IAAI;IAkCJ,eAAe;;;;;;;;IAWT,GAAG;CA2BV"}
+{"version":3,"file":"PolkadotGetAddress.d.ts","sourceRoot":"","sources":["../../../src/api/polkadot/PolkadotGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,IAAI,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAG1F,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,eAAe,EAA4B,MAAM,aAAa,CAAC;AAGxE,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,UAAU,CAAC,0BAA0B,EAAE,CAAC;IACtF,SAAS,UAAS;IAElB,IAAI;IAkCJ,eAAe;;;;;;;;IAKT,GAAG;CA2BV"}

package/dist/api/polkadot/PolkadotSignTransaction.d.ts

@@ -3,14 +3,7 @@ import { BaseMethod } from '../BaseMethod';
 export default class PolkadotSignTransaction extends BaseMethod<HardwarePolkadotSignTx> {
     hasBundle: boolean;
     init(): void;
-    getVersionRange(): {
-        model_mini: {
-            min: string;
-        };
-        model_touch: {
-            min: string;
-        };
-    };
+    getVersionRange(): import("../../types").DeviceFirmwareRange;
     run(): Promise<{
         path: string;
         signature: string;

package/dist/api/polkadot/PolkadotSignTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PolkadotSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/api/polkadot/PolkadotSignTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,IAAI,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAElF,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAK3C,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,UAAU,CAAC,sBAAsB,CAAC;IACrF,SAAS,UAAS;IAElB,IAAI;IAsBJ,eAAe;;;;;;;;IAWT,GAAG;;;;CAYV"}
+{"version":3,"file":"PolkadotSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/api/polkadot/PolkadotSignTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,IAAI,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAElF,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAM3C,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,UAAU,CAAC,sBAAsB,CAAC;IACrF,SAAS,UAAS;IAElB,IAAI;IAsBJ,eAAe;IAIT,GAAG;;;;CAYV"}

package/dist/api/polkadot/networks.d.ts

@@ -0,0 +1,19 @@
+import type { DeviceFirmwareRange } from '../../types';
+declare enum Networks {
+    Polkadot = "polkadot",
+    Westend = "westend",
+    Kusama = "kusama",
+    Astar = "astar",
+    JoyStream = "joystream"
+}
+export default Networks;
+export declare function getPolkadotVersionRange(network: string): DeviceFirmwareRange;
+export declare function getPolkadotVersionRangeWithBundle(networks: string[]): DeviceFirmwareRange | {
+    model_mini: {
+        min: string;
+    };
+    model_touch: {
+        min: string;
+    };
+};
+//# sourceMappingURL=networks.d.ts.map

package/dist/api/polkadot/networks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"networks.d.ts","sourceRoot":"","sources":["../../../src/api/polkadot/networks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAGvD,aAAK,QAAQ;IACX,QAAQ,aAAa;IACrB,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,KAAK,UAAU;IACf,SAAS,cAAc;CACxB;AAuBD,eAAe,QAAQ,CAAC;AAExB,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,uBAEtD;AAED,wBAAgB,iCAAiC,CAAC,QAAQ,EAAE,MAAM,EAAE;;;;;;;EAKnE"}

package/dist/index.js

@@ -30784,6 +30784,43 @@ class FilecoinSignTransaction extends BaseMethod {
     }
 }
 
+var Networks;
+(function (Networks) {
+    Networks["Polkadot"] = "polkadot";
+    Networks["Westend"] = "westend";
+    Networks["Kusama"] = "kusama";
+    Networks["Astar"] = "astar";
+    Networks["JoyStream"] = "joystream";
+})(Networks || (Networks = {}));
+const baseVersionRange = {
+    model_mini: {
+        min: '3.0.0',
+    },
+    model_touch: {
+        min: '4.3.0',
+    },
+};
+const specialVersionRange = {
+    [Networks.JoyStream]: {
+        model_mini: {
+            min: '3.6.0',
+        },
+        model_touch: {
+            min: '4.7.0',
+        },
+    },
+};
+function getPolkadotVersionRange(network) {
+    var _a;
+    return (_a = specialVersionRange[network]) !== null && _a !== void 0 ? _a : baseVersionRange;
+}
+function getPolkadotVersionRangeWithBundle(networks) {
+    if (networks.includes(Networks.JoyStream)) {
+        return specialVersionRange[Networks.JoyStream];
+    }
+    return baseVersionRange;
+}
+
 class PolkadotGetAddress extends BaseMethod {
     constructor() {
         super(...arguments);
@@ -30817,14 +30854,8 @@ class PolkadotGetAddress extends BaseMethod {
         });
     }
     getVersionRange() {
-        return {
-            model_mini: {
-                min: '3.0.0',
-            },
-            model_touch: {
-                min: '4.3.0',
-            },
-        };
+        const networks = this.params.map(param => param.network);
+        return getPolkadotVersionRangeWithBundle(networks);
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -30871,14 +30902,7 @@ class PolkadotSignTransaction extends BaseMethod {
         };
     }
     getVersionRange() {
-        return {
-            model_mini: {
-                min: '3.0.0',
-            },
-            model_touch: {
-                min: '4.3.0',
-            },
-        };
+        return getPolkadotVersionRange(this.params.network);
     }
     run() {
         return __awaiter(this, void 0, void 0, function* () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.3.32",
+  "version": "0.3.33",
   "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": "^0.3.32",
-    "@onekeyfe/hd-transport": "^0.3.32",
+    "@onekeyfe/hd-shared": "^0.3.33",
+    "@onekeyfe/hd-transport": "^0.3.33",
     "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": "4b1c767b6fe7588ed59d8b4a4ec1b56b3e0ccf85"
+  "gitHead": "c0c2cfa956cd00a1f9ff2ac7bdd8ed1c3f8e0cf3"
 }

package/src/api/polkadot/PolkadotGetAddress.ts

@@ -4,6 +4,7 @@ import { serializedPath, validatePath } from '../helpers/pathUtils';
 import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { PolkadotAddress, PolkadotGetAddressParams } from '../../types';
+import { getPolkadotVersionRangeWithBundle } from './networks';
 
 export default class PolkadotGetAddress extends BaseMethod<HardwarePolkadotGetAddress[]> {
   hasBundle = false;
@@ -43,14 +44,8 @@ export default class PolkadotGetAddress extends BaseMethod<HardwarePolkadotGetAd
   }
 
   getVersionRange() {
-    return {
-      model_mini: {
-        min: '3.0.0',
-      },
-      model_touch: {
-        min: '4.3.0',
-      },
-    };
+    const networks = this.params.map(param => param.network);
+    return getPolkadotVersionRangeWithBundle(networks);
   }
 
   async run() {

package/src/api/polkadot/PolkadotSignTransaction.ts

@@ -4,6 +4,7 @@ import { BaseMethod } from '../BaseMethod';
 import { validateParams } from '../helpers/paramsValidator';
 import { PolkadotSignTransactionParams } from '../../types';
 import { formatAnyHex } from '../helpers/hexUtils';
+import { getPolkadotVersionRange } from './networks';
 
 export default class PolkadotSignTransaction extends BaseMethod<HardwarePolkadotSignTx> {
   hasBundle = false;
@@ -31,14 +32,7 @@ export default class PolkadotSignTransaction extends BaseMethod<HardwarePolkadot
   }
 
   getVersionRange() {
-    return {
-      model_mini: {
-        min: '3.0.0',
-      },
-      model_touch: {
-        min: '4.3.0',
-      },
-    };
+    return getPolkadotVersionRange(this.params.network);
   }
 
   async run() {

package/src/api/polkadot/networks.ts

@@ -0,0 +1,44 @@
+import type { DeviceFirmwareRange } from '../../types';
+
+// 100% sure which networks are supported
+enum Networks {
+  Polkadot = 'polkadot',
+  Westend = 'westend',
+  Kusama = 'kusama',
+  Astar = 'astar',
+  JoyStream = 'joystream',
+}
+
+// All polkadot networks are included in no special case
+const baseVersionRange = {
+  model_mini: {
+    min: '3.0.0',
+  },
+  model_touch: {
+    min: '4.3.0',
+  },
+};
+
+const specialVersionRange: Record<string, DeviceFirmwareRange> = {
+  [Networks.JoyStream]: {
+    model_mini: {
+      min: '3.6.0',
+    },
+    model_touch: {
+      min: '4.7.0',
+    },
+  },
+};
+
+export default Networks;
+
+export function getPolkadotVersionRange(network: string) {
+  return specialVersionRange[network] ?? baseVersionRange;
+}
+
+export function getPolkadotVersionRangeWithBundle(networks: string[]) {
+  if (networks.includes(Networks.JoyStream)) {
+    return specialVersionRange[Networks.JoyStream];
+  }
+  return baseVersionRange;
+}