@onekeyfe/hd-core 1.1.3-alpha.2 → 1.1.3-alpha.3

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.
@@ -1 +1 @@
1
- {"version":3,"file":"AllNetworkGetAddressBase.d.ts","sourceRoot":"","sources":["../../../src/api/allnetwork/AllNetworkGetAddressBase.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,EACV,uBAAuB,EACvB,QAAQ,EACR,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,sCAAsC,CAAC;AAY9C,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,MAAM,OAAO,CAAC;IAC1B,SAAS,CAAC,EAAE,CAAC,UAAU,EAAE,uBAAuB,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,GAAG,CAAC;IAClG,kBAAkB,CAAC,EAAE,CAAC,MAAM,OAAO,CAAC,EAAE,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,CAAC,CAAC;AAEzF,MAAM,MAAM,gBAAgB,GAAG;KAC5B,CAAC,IAAI,YAAY,GAAG,aAAa;CACnC,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,YAAY,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAOrD,CAAC;AA8LF,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,MAAM,OAAO,CAAC;IAC1B,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,oBAAoB,EAAE,uBAAuB,CAAC;IAC9C,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,wBAAyB,SAAQ,UAAU,CACvE;IACE,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,EAAE,CACJ;IACC,eAAe,EAAE,eAAe,GAAG,IAAI,CAAQ;IAE/C,IAAI;IAkBJ,kBAAkB,CAAC,EACjB,OAAO,EACP,OAAO,EACP,aAAa,GACd,EAAE;QACD,OAAO,EAAE,QAAQ,CAAC;QAClB,OAAO,EAAE,uBAAuB,CAAC;QACjC,aAAa,EAAE,MAAM,CAAC;KACvB,GAAG,YAAY;IAqBV,UAAU,CACd,UAAU,EAAE,MAAM,OAAO,EACzB,MAAM,EAAE,GAAG,GAAG;QACZ,MAAM,EAAE,CAAC,GAAG,GAAG;YAAE,oBAAoB,EAAE,oBAAoB,CAAA;SAAE,CAAC,EAAE,CAAC;KAClE;IAgFH,QAAQ,CAAC,oBAAoB,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAEvD,GAAG;CAoBV"}
1
+ {"version":3,"file":"AllNetworkGetAddressBase.d.ts","sourceRoot":"","sources":["../../../src/api/allnetwork/AllNetworkGetAddressBase.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,EACV,uBAAuB,EACvB,QAAQ,EACR,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,sCAAsC,CAAC;AAa9C,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,EAAE,MAAM,OAAO,CAAC;IAC1B,SAAS,CAAC,EAAE,CAAC,UAAU,EAAE,uBAAuB,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,GAAG,CAAC;IAClG,kBAAkB,CAAC,EAAE,CAAC,MAAM,OAAO,CAAC,EAAE,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,CAAC,CAAC;AAEzF,MAAM,MAAM,gBAAgB,GAAG;KAC5B,CAAC,IAAI,YAAY,GAAG,aAAa;CACnC,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE;IAC3B,CAAC,GAAG,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,YAAY,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAOrD,CAAC;AA8LF,KAAK,YAAY,GAAG;IAClB,UAAU,EAAE,MAAM,OAAO,CAAC;IAC1B,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9C,oBAAoB,EAAE,uBAAuB,CAAC;IAC9C,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,wBAAyB,SAAQ,UAAU,CACvE;IACE,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,EAAE,CACJ;IACC,eAAe,EAAE,eAAe,GAAG,IAAI,CAAQ;IAE/C,IAAI;IAkBJ,kBAAkB,CAAC,EACjB,OAAO,EACP,OAAO,EACP,aAAa,GACd,EAAE;QACD,OAAO,EAAE,QAAQ,CAAC;QAClB,OAAO,EAAE,uBAAuB,CAAC;QACjC,aAAa,EAAE,MAAM,CAAC;KACvB,GAAG,YAAY;IAqBV,UAAU,CACd,UAAU,EAAE,MAAM,OAAO,EACzB,MAAM,EAAE,GAAG,GAAG;QACZ,MAAM,EAAE,CAAC,GAAG,GAAG;YAAE,oBAAoB,EAAE,oBAAoB,CAAA;SAAE,CAAC,EAAE,CAAC;KAClE;IAgFH,QAAQ,CAAC,oBAAoB,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAEvD,GAAG;CAuBV"}
package/dist/index.js CHANGED
@@ -30181,9 +30181,10 @@ class AllNetworkGetAddressBase extends BaseMethod {
30181
30181
  }
30182
30182
  run() {
30183
30183
  return __awaiter(this, void 0, void 0, function* () {
30184
- const features = yield this.device.unlockDevice();
30185
- if (features.passphrase_protection) {
30186
- yield this.device.checkPassphraseStateSafety();
30184
+ const passphraseStateSafety = yield this.device.checkPassphraseStateSafety(this.payload.passphraseState, this.payload.useEmptyPassphrase);
30185
+ if (!passphraseStateSafety) {
30186
+ DevicePool.clearDeviceCache(this.payload.connectId);
30187
+ return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceCheckPassphraseStateError));
30187
30188
  }
30188
30189
  this.postMessage(createUiMessage(UI_REQUEST.CLOSE_UI_PIN_WINDOW));
30189
30190
  this.abortController = new AbortController();
@@ -30358,7 +30359,7 @@ class AllNetworkGetAddressByLoop extends AllNetworkGetAddressBase {
30358
30359
  errorMessage = hardwareError.message;
30359
30360
  }
30360
30361
  this.sendFinishCallback({
30361
- callbackId,
30362
+ callbackId: callbackIdFinish,
30362
30363
  error: {
30363
30364
  success: false,
30364
30365
  payload: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@onekeyfe/hd-core",
3
- "version": "1.1.3-alpha.2",
3
+ "version": "1.1.3-alpha.3",
4
4
  "description": "> TODO: description",
5
5
  "author": "OneKey",
6
6
  "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
25
25
  "url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
26
26
  },
27
27
  "dependencies": {
28
- "@onekeyfe/hd-shared": "^1.1.3-alpha.2",
29
- "@onekeyfe/hd-transport": "^1.1.3-alpha.2",
28
+ "@onekeyfe/hd-shared": "^1.1.3-alpha.3",
29
+ "@onekeyfe/hd-transport": "^1.1.3-alpha.3",
30
30
  "axios": "^0.27.2",
31
31
  "bignumber.js": "^9.0.2",
32
32
  "bytebuffer": "^5.0.1",
@@ -46,5 +46,5 @@
46
46
  "@types/web-bluetooth": "^0.0.21",
47
47
  "ripple-keypairs": "^1.1.4"
48
48
  },
49
- "gitHead": "e2646cea6f41aaf3295f8730ab144705af372053"
49
+ "gitHead": "910ed3ac7a95b20cd6fa4131aa4fe5d7f3b9e2e9"
50
50
  }
@@ -24,6 +24,7 @@ import { getDeviceFirmwareVersion, getMethodVersionRange } from '../../utils';
24
24
  import { Device, DeviceEvents } from '../../device/Device';
25
25
  import { UI_REQUEST } from '../../constants/ui-request';
26
26
  import { onDeviceButtonHandler } from '../../core';
27
+ import { DevicePool } from '../../device/DevicePool';
27
28
 
28
29
  const Mainnet = 'mainnet';
29
30
 
@@ -388,15 +389,18 @@ export default abstract class AllNetworkGetAddressBase extends BaseMethod<
388
389
  abstract getAllNetworkAddress(): Promise<AllNetworkAddress[]>;
389
390
 
390
391
  async run() {
391
- // if (!this.device.features?.unlocked) {
392
- // unlock device
393
- const features = await this.device.unlockDevice();
394
- if (features.passphrase_protection) {
395
- // check passphrase state
396
- await this.device.checkPassphraseStateSafety();
392
+ // check passphrase state
393
+ const passphraseStateSafety = await this.device.checkPassphraseStateSafety(
394
+ this.payload.passphraseState,
395
+ this.payload.useEmptyPassphrase
396
+ );
397
+
398
+ if (!passphraseStateSafety) {
399
+ DevicePool.clearDeviceCache(this.payload.connectId);
400
+ return Promise.reject(ERRORS.TypedError(HardwareErrorCode.DeviceCheckPassphraseStateError));
397
401
  }
402
+
398
403
  this.postMessage(createUiMessage(UI_REQUEST.CLOSE_UI_PIN_WINDOW));
399
- // }
400
404
 
401
405
  this.abortController = new AbortController();
402
406
 
@@ -100,7 +100,7 @@ export default class AllNetworkGetAddressByLoop extends AllNetworkGetAddressBase
100
100
  }
101
101
 
102
102
  this.sendFinishCallback({
103
- callbackId,
103
+ callbackId: callbackIdFinish,
104
104
  error: {
105
105
  success: false,
106
106
  payload: {