@onekeyfe/hd-core 0.1.46 → 0.1.48
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api/tron/TronGetAddress.d.ts +1 -1
- package/dist/api/tron/TronGetAddress.d.ts.map +1 -1
- package/dist/api/tron/TronSignMessage.d.ts +1 -1
- package/dist/api/tron/TronSignMessage.d.ts.map +1 -1
- package/dist/api/tron/TronSignTransaction.d.ts +1 -1
- package/dist/api/tron/TronSignTransaction.d.ts.map +1 -1
- package/dist/device/DeviceCommands.d.ts +1 -1
- package/dist/device/DeviceCommands.d.ts.map +1 -1
- package/dist/index.js +12 -13
- package/package.json +4 -4
- package/src/api/near/NearGetAddress.ts +1 -1
- package/src/api/near/NearSignTransaction.ts +1 -1
- package/src/api/tron/TronGetAddress.ts +2 -2
- package/src/api/tron/TronSignMessage.ts +3 -3
- package/src/api/tron/TronSignTransaction.ts +2 -2
- package/src/device/DeviceCommands.ts +7 -8
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import { TronGetAddress as HardwareTronGetAddress } from '@onekeyfe/hd-transport';
|
|
1
2
|
import { BaseMethod } from '../BaseMethod';
|
|
2
3
|
import { TronAddress } from '../../types';
|
|
3
|
-
import { TronGetAddress as HardwareTronGetAddress } from '@onekeyfe/hd-transport';
|
|
4
4
|
export default class TronGetAddress extends BaseMethod<HardwareTronGetAddress[]> {
|
|
5
5
|
hasBundle: boolean;
|
|
6
6
|
init(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TronGetAddress.d.ts","sourceRoot":"","sources":["../../../src/api/tron/TronGetAddress.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"TronGetAddress.d.ts","sourceRoot":"","sources":["../../../src/api/tron/TronGetAddress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,IAAI,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAGlF,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAwB,WAAW,EAAE,MAAM,aAAa,CAAC;AAEhE,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,UAAU,CAAC,sBAAsB,EAAE,CAAC;IAC9E,SAAS,UAAS;IAElB,IAAI;IA6BJ,eAAe;;;;;IAQT,GAAG;CAoBV"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { BaseMethod } from '../BaseMethod';
|
|
2
1
|
import { TronSignMessage as HardwareTronSignMessage } from '@onekeyfe/hd-transport';
|
|
2
|
+
import { BaseMethod } from '../BaseMethod';
|
|
3
3
|
export default class TronSignMessage extends BaseMethod<HardwareTronSignMessage> {
|
|
4
4
|
init(): void;
|
|
5
5
|
getVersionRange(): {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TronSignMessage.d.ts","sourceRoot":"","sources":["../../../src/api/tron/TronSignMessage.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"TronSignMessage.d.ts","sourceRoot":"","sources":["../../../src/api/tron/TronSignMessage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,IAAI,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAGpF,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAI3C,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,UAAU,CAAC,uBAAuB,CAAC;IAC9E,IAAI;IAoBJ,eAAe;;;;;IAQT,GAAG;CAWV"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import { TronSignTx } from '@onekeyfe/hd-transport';
|
|
1
2
|
import { BaseMethod } from '../BaseMethod';
|
|
2
3
|
import { TronTransaction } from '../../types/api/tronSignTransaction';
|
|
3
|
-
import { TronSignTx } from '@onekeyfe/hd-transport';
|
|
4
4
|
export default class TronSignTransaction extends BaseMethod<TronSignTx> {
|
|
5
5
|
parseTx(tx: TronTransaction, address_n: number[]): TronSignTx;
|
|
6
6
|
init(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TronSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/api/tron/TronSignTransaction.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"TronSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/api/tron/TronSignTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAGpD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AAGtE,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,UAAU,CAAC,UAAU,CAAC;IACrE,OAAO,CAAC,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,UAAU;IAqC7D,IAAI;IAyBJ,eAAe;;;;;IAQT,GAAG;CAOV"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeviceCommands.d.ts","sourceRoot":"","sources":["../../src/device/DeviceCommands.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"DeviceCommands.d.ts","sourceRoot":"","sources":["../../src/device/DeviceCommands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAKlE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGvC,aAAK,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;AACxC,aAAK,UAAU,GAAG,MAAM,WAAW,CAAC;AACpC,oBAAY,oBAAoB,CAAC,CAAC,SAAS,UAAU,IAAI;IACvD,IAAI,EAAE,CAAC,CAAC;IACR,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;CACzB,CAAC;AACF,aAAK,oBAAoB,GAAG;KACzB,CAAC,IAAI,MAAM,WAAW,GAAG,oBAAoB,CAAC,CAAC,CAAC;CAClD,CAAC;AACF,oBAAY,sBAAsB,GAAG,oBAAoB,CAAC,MAAM,WAAW,CAAC,CAAC;AAE7E,oBAAY,wBAAwB,GAAG;IACrC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAcF,qBAAa,cAAc;IACzB,MAAM,EAAE,MAAM,CAAC;IAEf,SAAS,EAAE,SAAS,CAAC;IAErB,MAAM,EAAE,MAAM,CAAC;IAEf,QAAQ,EAAE,OAAO,CAAC;IAElB,WAAW,CAAC,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAE9C,kBAAkB,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;gBAE/B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAOpC,OAAO,CAAC,aAAa,EAAE,OAAO;IAU9B,IAAI,CACR,IAAI,EAAE,UAAU,EAChB,GAAG,GAAE,sBAAsB,CAAC,SAAS,CAAM,GAC1C,OAAO,CAAC,sBAAsB,CAAC;IAkBlC,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,UAAU,EAAE,EACpD,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,CAAC,EACV,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAE3C,SAAS,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,SAAS,UAAU,EAClD,IAAI,EAAE,CAAC,EACP,OAAO,EAAE,CAAC,EACV,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAuC7B,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC,EAAE,sBAAsB,CAAC,SAAS,CAAC;IAK3E,kBAAkB,CAAC,GAAG,EAAE,sBAAsB,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAuGhF,UAAU,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,oBAAoB;CAuBhD;AAED,oBAAY,SAAS,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -4,10 +4,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
|
|
|
4
4
|
|
|
5
5
|
var semver = require('semver');
|
|
6
6
|
var hdShared = require('@onekeyfe/hd-shared');
|
|
7
|
-
var hdTransport = require('@onekeyfe/hd-transport');
|
|
8
7
|
var axios = require('axios');
|
|
9
8
|
var BigNumber = require('bignumber.js');
|
|
10
9
|
var sha256 = require('js-sha256');
|
|
10
|
+
var hdTransport = require('@onekeyfe/hd-transport');
|
|
11
11
|
|
|
12
12
|
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
13
13
|
|
|
@@ -10901,22 +10901,21 @@ class DeviceCommands {
|
|
|
10901
10901
|
_filterCommonTypes(res) {
|
|
10902
10902
|
Log$5.debug('_filterCommonTypes: ', res);
|
|
10903
10903
|
if (res.type === 'Failure') {
|
|
10904
|
-
const { code } = res.message;
|
|
10905
|
-
const { message } = res.message;
|
|
10904
|
+
const { code, message } = res.message;
|
|
10906
10905
|
let error = null;
|
|
10907
|
-
if (code ===
|
|
10906
|
+
if (code === 'Failure_FirmwareError' && !message) {
|
|
10908
10907
|
error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.FirmwareError);
|
|
10909
10908
|
}
|
|
10910
|
-
if (code ===
|
|
10909
|
+
if (code === 'Failure_ActionCancelled') {
|
|
10911
10910
|
error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.ActionCancelled);
|
|
10912
10911
|
}
|
|
10913
|
-
if (code ===
|
|
10912
|
+
if (code === 'Failure_PinInvalid') {
|
|
10914
10913
|
error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.PinInvalid, message);
|
|
10915
10914
|
}
|
|
10916
|
-
if (code ===
|
|
10915
|
+
if (code === 'Failure_PinCancelled') {
|
|
10917
10916
|
error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.PinCancelled);
|
|
10918
10917
|
}
|
|
10919
|
-
if (code ===
|
|
10918
|
+
if (code === 'Failure_DataError' && message === 'Please confirm the BlindSign enabled') {
|
|
10920
10919
|
error = hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BlindSignDisabled);
|
|
10921
10920
|
}
|
|
10922
10921
|
if (error) {
|
|
@@ -14560,7 +14559,7 @@ class TronGetAddress extends BaseMethod {
|
|
|
14560
14559
|
getVersionRange() {
|
|
14561
14560
|
return {
|
|
14562
14561
|
model_mini: {
|
|
14563
|
-
min: '2.
|
|
14562
|
+
min: '2.5.0',
|
|
14564
14563
|
},
|
|
14565
14564
|
};
|
|
14566
14565
|
}
|
|
@@ -14599,7 +14598,7 @@ class TronSignMessage extends BaseMethod {
|
|
|
14599
14598
|
getVersionRange() {
|
|
14600
14599
|
return {
|
|
14601
14600
|
model_mini: {
|
|
14602
|
-
min: '2.
|
|
14601
|
+
min: '2.5.0',
|
|
14603
14602
|
},
|
|
14604
14603
|
};
|
|
14605
14604
|
}
|
|
@@ -14667,7 +14666,7 @@ class TronSignTransaction extends BaseMethod {
|
|
|
14667
14666
|
getVersionRange() {
|
|
14668
14667
|
return {
|
|
14669
14668
|
model_mini: {
|
|
14670
|
-
min: '2.
|
|
14669
|
+
min: '2.5.0',
|
|
14671
14670
|
},
|
|
14672
14671
|
};
|
|
14673
14672
|
}
|
|
@@ -14709,7 +14708,7 @@ class NearGetAddress extends BaseMethod {
|
|
|
14709
14708
|
getVersionRange() {
|
|
14710
14709
|
return {
|
|
14711
14710
|
model_mini: {
|
|
14712
|
-
min: '2.
|
|
14711
|
+
min: '2.5.0',
|
|
14713
14712
|
},
|
|
14714
14713
|
};
|
|
14715
14714
|
}
|
|
@@ -14748,7 +14747,7 @@ class NearSignTransaction extends BaseMethod {
|
|
|
14748
14747
|
getVersionRange() {
|
|
14749
14748
|
return {
|
|
14750
14749
|
model_mini: {
|
|
14751
|
-
min: '2.
|
|
14750
|
+
min: '2.5.0',
|
|
14752
14751
|
},
|
|
14753
14752
|
};
|
|
14754
14753
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@onekeyfe/hd-core",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.48",
|
|
4
4
|
"description": "> TODO: description",
|
|
5
5
|
"author": "OneKey",
|
|
6
6
|
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
|
|
@@ -24,8 +24,8 @@
|
|
|
24
24
|
"url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@onekeyfe/hd-shared": "^0.1.
|
|
28
|
-
"@onekeyfe/hd-transport": "^0.1.
|
|
27
|
+
"@onekeyfe/hd-shared": "^0.1.48",
|
|
28
|
+
"@onekeyfe/hd-transport": "^0.1.48",
|
|
29
29
|
"axios": "^0.27.2",
|
|
30
30
|
"bignumber.js": "^9.0.2",
|
|
31
31
|
"js-sha256": "^0.9.0",
|
|
@@ -36,5 +36,5 @@
|
|
|
36
36
|
"@types/parse-uri": "^1.0.0",
|
|
37
37
|
"@types/semver": "^7.3.9"
|
|
38
38
|
},
|
|
39
|
-
"gitHead": "
|
|
39
|
+
"gitHead": "591633098720e2845ecfbe95460b5f7bc2d15e5b"
|
|
40
40
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
+
import { TronGetAddress as HardwareTronGetAddress } from '@onekeyfe/hd-transport';
|
|
1
2
|
import { UI_REQUEST } from '../../constants/ui-request';
|
|
2
3
|
import { serializedPath, validatePath } from '../helpers/pathUtils';
|
|
3
4
|
import { BaseMethod } from '../BaseMethod';
|
|
4
5
|
import { validateParams } from '../helpers/paramsValidator';
|
|
5
6
|
import { TronGetAddressParams, TronAddress } from '../../types';
|
|
6
|
-
import { TronGetAddress as HardwareTronGetAddress } from '@onekeyfe/hd-transport';
|
|
7
7
|
|
|
8
8
|
export default class TronGetAddress extends BaseMethod<HardwareTronGetAddress[]> {
|
|
9
9
|
hasBundle = false;
|
|
@@ -40,7 +40,7 @@ export default class TronGetAddress extends BaseMethod<HardwareTronGetAddress[]>
|
|
|
40
40
|
getVersionRange() {
|
|
41
41
|
return {
|
|
42
42
|
model_mini: {
|
|
43
|
-
min: '2.
|
|
43
|
+
min: '2.5.0',
|
|
44
44
|
},
|
|
45
45
|
};
|
|
46
46
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
+
import { TronSignMessage as HardwareTronSignMessage } from '@onekeyfe/hd-transport';
|
|
1
2
|
import { UI_REQUEST } from '../../constants/ui-request';
|
|
2
3
|
import { validatePath } from '../helpers/pathUtils';
|
|
3
4
|
import { BaseMethod } from '../BaseMethod';
|
|
4
5
|
import { validateParams } from '../helpers/paramsValidator';
|
|
5
6
|
import { stripHexPrefix } from '../helpers/hexUtils';
|
|
6
|
-
import { TronSignMessage as HardwareTronSignMessage } from '@onekeyfe/hd-transport';
|
|
7
7
|
|
|
8
8
|
export default class TronSignMessage extends BaseMethod<HardwareTronSignMessage> {
|
|
9
9
|
init() {
|
|
@@ -29,7 +29,7 @@ export default class TronSignMessage extends BaseMethod<HardwareTronSignMessage>
|
|
|
29
29
|
getVersionRange() {
|
|
30
30
|
return {
|
|
31
31
|
model_mini: {
|
|
32
|
-
min: '2.
|
|
32
|
+
min: '2.5.0',
|
|
33
33
|
},
|
|
34
34
|
};
|
|
35
35
|
}
|
|
@@ -40,7 +40,7 @@ export default class TronSignMessage extends BaseMethod<HardwareTronSignMessage>
|
|
|
40
40
|
'TronMessageSignature',
|
|
41
41
|
{
|
|
42
42
|
...this.params,
|
|
43
|
-
}
|
|
43
|
+
}
|
|
44
44
|
);
|
|
45
45
|
|
|
46
46
|
return Promise.resolve(response.message);
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
+
import { TronSignTx } from '@onekeyfe/hd-transport';
|
|
1
2
|
import { UI_REQUEST } from '../../constants/ui-request';
|
|
2
3
|
import { validatePath } from '../helpers/pathUtils';
|
|
3
4
|
import { BaseMethod } from '../BaseMethod';
|
|
4
5
|
import { validateParams } from '../helpers/paramsValidator';
|
|
5
6
|
import { TronTransaction } from '../../types/api/tronSignTransaction';
|
|
6
|
-
import { TronSignTx } from '@onekeyfe/hd-transport';
|
|
7
7
|
import { formatAnyHex } from '../helpers/hexUtils';
|
|
8
8
|
|
|
9
9
|
export default class TronSignTransaction extends BaseMethod<TronSignTx> {
|
|
@@ -72,7 +72,7 @@ export default class TronSignTransaction extends BaseMethod<TronSignTx> {
|
|
|
72
72
|
getVersionRange() {
|
|
73
73
|
return {
|
|
74
74
|
model_mini: {
|
|
75
|
-
min: '2.
|
|
75
|
+
min: '2.5.0',
|
|
76
76
|
},
|
|
77
77
|
};
|
|
78
78
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Transport, Messages
|
|
1
|
+
import type { Transport, Messages } from '@onekeyfe/hd-transport';
|
|
2
2
|
import { ERRORS, HardwareError, HardwareErrorCode } from '@onekeyfe/hd-shared';
|
|
3
3
|
import TransportManager from '../data-manager/TransportManager';
|
|
4
4
|
import DataManager from '../data-manager/DataManager';
|
|
@@ -143,27 +143,26 @@ export class DeviceCommands {
|
|
|
143
143
|
_filterCommonTypes(res: DefaultMessageResponse): Promise<DefaultMessageResponse> {
|
|
144
144
|
Log.debug('_filterCommonTypes: ', res);
|
|
145
145
|
if (res.type === 'Failure') {
|
|
146
|
-
const { code } = res.message;
|
|
147
|
-
const { message } = res.message;
|
|
146
|
+
const { code, message } = res.message;
|
|
148
147
|
let error: HardwareError | null = null;
|
|
149
148
|
// Model One does not send any message in firmware update
|
|
150
|
-
if (code ===
|
|
149
|
+
if (code === 'Failure_FirmwareError' && !message) {
|
|
151
150
|
error = ERRORS.TypedError(HardwareErrorCode.FirmwareError);
|
|
152
151
|
}
|
|
153
152
|
// Failure_ActionCancelled message could be also missing
|
|
154
|
-
if (code ===
|
|
153
|
+
if (code === 'Failure_ActionCancelled') {
|
|
155
154
|
error = ERRORS.TypedError(HardwareErrorCode.ActionCancelled);
|
|
156
155
|
}
|
|
157
156
|
|
|
158
|
-
if (code ===
|
|
157
|
+
if (code === 'Failure_PinInvalid') {
|
|
159
158
|
error = ERRORS.TypedError(HardwareErrorCode.PinInvalid, message);
|
|
160
159
|
}
|
|
161
160
|
|
|
162
|
-
if (code ===
|
|
161
|
+
if (code === 'Failure_PinCancelled') {
|
|
163
162
|
error = ERRORS.TypedError(HardwareErrorCode.PinCancelled);
|
|
164
163
|
}
|
|
165
164
|
|
|
166
|
-
if (code ===
|
|
165
|
+
if (code === 'Failure_DataError' && message === 'Please confirm the BlindSign enabled') {
|
|
167
166
|
error = ERRORS.TypedError(HardwareErrorCode.BlindSignDisabled);
|
|
168
167
|
}
|
|
169
168
|
|