@onekeyfe/hd-core 0.1.30 → 0.1.33

package/dist/api/evm/EVMSignTransaction.d.ts

@@ -6,7 +6,7 @@ export default class EVMSignTransaction extends BaseMethod {
     isEIP1559: boolean;
     formattedTx: EVMTransaction | EVMTransactionEIP1559 | undefined;
     init(): void;
-    processTxRequest: (request: EthereumTxRequest, data: string, chain_id?: number | undefined) => Promise<EVMSignedTx>;
+    processTxRequest: (request: EthereumTxRequest, data: string, chain_id: number | undefined) => Promise<EVMSignedTx>;
     evmSignTx: (addressN: number[], tx: EVMTransaction) => Promise<EVMSignedTx>;
     evmSignTxEip1559: (addressN: number[], tx: EVMTransactionEIP1559) => Promise<EVMSignedTx>;
     getVersionRange(): {

package/dist/api/evm/EVMSignTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EVMSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/api/evm/EVMSignTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAKlG,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EACL,WAAW,EAEX,cAAc,EACd,qBAAqB,EACtB,MAAM,oCAAoC,CAAC;AAI5C,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,UAAU;IACxD,QAAQ,EAAE,MAAM,EAAE,CAAM;IAExB,SAAS,UAAS;IAElB,WAAW,EAAE,cAAc,GAAG,qBAAqB,GAAG,SAAS,CAAC;IAEhE,IAAI;IAoCJ,gBAAgB,YACL,iBAAiB,QACpB,MAAM,aACD,MAAM,GAAG,SAAS,KAC5B,QAAQ,WAAW,CAAC,CA+BrB;IAEF,SAAS,aAAoB,MAAM,EAAE,MAAM,cAAc,0BAuCvD;IAEF,gBAAgB,aAAoB,MAAM,EAAE,MAAM,qBAAqB,0BAyCrE;IAEF,eAAe;;;;;IAeT,GAAG;CASV"}
+{"version":3,"file":"EVMSignTransaction.d.ts","sourceRoot":"","sources":["../../../src/api/evm/EVMSignTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAKlG,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EACL,WAAW,EAEX,cAAc,EACd,qBAAqB,EACtB,MAAM,oCAAoC,CAAC;AAI5C,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,UAAU;IACxD,QAAQ,EAAE,MAAM,EAAE,CAAM;IAExB,SAAS,UAAS;IAElB,WAAW,EAAE,cAAc,GAAG,qBAAqB,GAAG,SAAS,CAAC;IAEhE,IAAI;IAoCJ,gBAAgB,YACL,iBAAiB,QACpB,MAAM,YACF,MAAM,GAAG,SAAS,KAC3B,QAAQ,WAAW,CAAC,CA+BrB;IAEF,SAAS,aAAoB,MAAM,EAAE,MAAM,cAAc,0BAuCvD;IAEF,gBAAgB,aAAoB,MAAM,EAAE,MAAM,qBAAqB,0BAyCrE;IAEF,eAAe;;;;;IAeT,GAAG;CASV"}

package/dist/device/Device.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Device.d.ts","sourceRoot":"","sources":["../../src/device/Device.ts"],"names":[],"mappings":";AAAA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,gBAAgB,IAAI,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,EAEL,QAAQ,EAIT,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,eAAe,MAAM,mBAAmB,CAAC;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAUlD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,WAAW,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AACzF,OAAO,EAAE,MAAM,EAAE,0BAA0B,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAEtF,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAIrC,aAAK,UAAU,GAAG;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AASF,MAAM,WAAW,YAAY;IAC3B,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,oBAAoB,GAAG,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC,CAAC;IAChG,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC;IACpE,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;IACtD,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;CACpD;AAED,MAAM,WAAW,MAAM;IACrB,EAAE,CAAC,CAAC,SAAS,MAAM,YAAY,EAAE,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IAC/F,GAAG,CAAC,CAAC,SAAS,MAAM,YAAY,EAAE,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IAChG,IAAI,CAAC,CAAC,SAAS,MAAM,YAAY,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;CAChF;AAED,qBAAa,MAAO,SAAQ,YAAY;IAItC,kBAAkB,EAAE,gBAAgB,CAAC;IAOrC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAKvB,eAAe,CAAC,EAAE,eAAe,GAAG,IAAI,CAAQ;IAMhD,QAAQ,EAAE,cAAc,CAAC;IAKzB,QAAQ,EAAE,QAAQ,GAAG,SAAS,CAAa;IAK3C,mBAAmB,UAAS;IAE5B,UAAU,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAEnC,aAAa,EAAE,MAAM,EAAE,CAAM;IAE7B,uBAAuB,EAAE,uBAAuB,CAAM;IAEtD,QAAQ,SAAK;IAEb,aAAa,EAAE,MAAM,EAAE,CAAM;IAE7B,gBAAgB,UAAS;IAKzB,WAAW,UAAS;gBAER,UAAU,EAAE,gBAAgB;IAKxC,MAAM,CAAC,cAAc,CAAC,kBAAkB,EAAE,gBAAgB;IAM1D,eAAe,IAAI,WAAW,GAAG,IAAI;IAiCrC,OAAO;IA+BD,OAAO;IA+BP,OAAO;IA2Bb,WAAW;IAIX,gBAAgB;IAIV,UAAU;IAcV,WAAW;IAKjB,eAAe,CAAC,IAAI,EAAE,QAAQ;IAiB9B,gBAAgB,CAAC,UAAU,EAAE,gBAAgB,EAAE,WAAW,UAAQ;IAiBlE,eAAe,CAAC,MAAM,EAAE,MAAM;IASxB,GAAG,CAAC,EAAE,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,EAAE,UAAU;IAYlD,SAAS,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,EAAE,OAAO,EAAE,UAAU;IAgDpE,uBAAuB;IASvB,oBAAoB;IAS1B,OAAO;IAOP,kBAAkB;IAKlB,qBAAqB;IAKrB,MAAM;IAIN,UAAU;IAQV,eAAe,IAAI,OAAO;IAI1B,YAAY;IAIZ,aAAa;IAIb,UAAU;IAIV,YAAY,IAAI,OAAO;IAIvB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;IAsBpD,aAAa,CAAC,QAAQ,EAAE,MAAM;CAM/B;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"Device.d.ts","sourceRoot":"","sources":["../../src/device/Device.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -10428,9 +10428,6 @@ class DeviceCommands {
         if (res.type === 'Features') {
             return Promise.resolve(patchFeatures(res));
         }
-        if ((_a = this.device.features) === null || _a === void 0 ? void 0 : _a.passphrase_protection) {
-            return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotSupportPassphrase));
-        }
         if (res.type === 'ButtonRequest') {
             if (res.message.code === 'ButtonRequest_PassphraseEntry') {
                 this.device.emit(DEVICE.PASSPHRASE_ON_DEVICE, this.device);
@@ -10453,6 +10450,9 @@ class DeviceCommands {
                 return this._commonCall('PinMatrixAck', { pin });
             }, () => this._commonCall('Cancel', {}));
         }
+        if ((_a = this.device.features) === null || _a === void 0 ? void 0 : _a.passphrase_protection) {
+            return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotSupportPassphrase));
+        }
         if (res.type === 'PassphraseRequest') {
             return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotSupportPassphrase));
         }
@@ -10738,6 +10738,19 @@ class Device extends events.exports {
             }
             const { message } = yield this.commands.typedCall('Initialize', 'Features', payload);
             this._updateFeatures(message);
+            if (message.passphrase_protection) {
+                if (this.listenerCount(DEVICE.PIN) > 0) {
+                    Log$3.debug('try to close passpharse');
+                    try {
+                        yield this.commands.typedCall('ApplySettings', 'Success', { use_passphrase: false });
+                    }
+                    catch (e) {
+                        yield this.release();
+                        this.runPromise = null;
+                        throw e;
+                    }
+                }
+            }
         });
     }
     getFeatures() {
@@ -10789,6 +10802,7 @@ class Device extends events.exports {
         });
     }
     _runInner(fn, options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.isUsedHere() || this.commands.disposed) {
                 const env = DataManager.getSettings('env');
@@ -10807,12 +10821,35 @@ class Device extends events.exports {
                         return Promise.reject(hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceInitializeFailed, `Initialize failed: ${error.message}, code: ${error.code}`));
                     }
                 }
+                else if (env === 'react-native') {
+                    if ((_a = this.features) === null || _a === void 0 ? void 0 : _a.passphrase_protection) {
+                        if (this.listenerCount(DEVICE.PIN) > 0) {
+                            Log$3.debug('try to close passpharse for mobile');
+                            try {
+                                yield this.commands.typedCall('ApplySettings', 'Success', { use_passphrase: false });
+                            }
+                            catch (e) {
+                                this.runPromise = null;
+                                return Promise.reject(e);
+                            }
+                        }
+                    }
+                }
             }
             if (options.keepSession) {
                 this.keepSession = true;
             }
             if (fn) {
-                yield fn();
+                try {
+                    yield fn();
+                }
+                catch (e) {
+                    if (this.runPromise) {
+                        this.runPromise.reject(e);
+                    }
+                    this.runPromise = null;
+                    return;
+                }
             }
             if ((!this.keepSession && typeof options.keepSession !== 'boolean') ||
                 options.keepSession === false) {
@@ -12452,7 +12489,7 @@ class EVMSignTransaction extends BaseMethod {
                 })),
             };
             const response = yield this.device.commands.typedCall('EthereumSignTxEIP1559', 'EthereumTxRequest', message);
-            return this.processTxRequest(response.message, rest);
+            return this.processTxRequest(response.message, rest, chainId);
         });
     }
     init() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-core",
-  "version": "0.1.30",
+  "version": "0.1.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.1.30",
-    "@onekeyfe/hd-transport": "^0.1.30",
+    "@onekeyfe/hd-shared": "^0.1.33",
+    "@onekeyfe/hd-transport": "^0.1.33",
     "axios": "^0.27.2",
     "bignumber.js": "^9.0.2",
     "js-sha256": "^0.9.0",
@@ -37,5 +37,5 @@
     "@types/parse-uri": "^1.0.0",
     "@types/semver": "^7.3.9"
   },
-  "gitHead": "4a3f78fd3b62456303cabe1ea315bc7fe5bd1ccd"
+  "gitHead": "243a982fe1520e397f980892e3071fd53912339e"
 }

package/src/api/evm/EVMSignTransaction.ts

@@ -60,7 +60,7 @@ export default class EVMSignTransaction extends BaseMethod {
   processTxRequest = async (
     request: EthereumTxRequest,
     data: string,
-    chain_id?: number | undefined
+    chain_id: number | undefined
   ): Promise<EVMSignedTx> => {
     if (!request.data_length) {
       let v = request.signature_v;
@@ -175,7 +175,7 @@ export default class EVMSignTransaction extends BaseMethod {
       message
     );
 
-    return this.processTxRequest(response.message, rest);
+    return this.processTxRequest(response.message, rest, chainId);
   };
 
   getVersionRange() {

package/src/device/Device.ts

@@ -255,6 +255,18 @@ export class Device extends EventEmitter {
 
     const { message } = await this.commands.typedCall('Initialize', 'Features', payload);
     this._updateFeatures(message);
+    if (message.passphrase_protection) {
+      if (this.listenerCount(DEVICE.PIN) > 0) {
+        Log.debug('try to close passpharse');
+        try {
+          await this.commands.typedCall('ApplySettings', 'Success', { use_passphrase: false });
+        } catch (e) {
+          await this.release();
+          this.runPromise = null;
+          throw e;
+        }
+      }
+    }
   }
 
   async getFeatures() {
@@ -338,6 +350,21 @@ export class Device extends EventEmitter {
             )
           );
         }
+      } else if (env === 'react-native') {
+        /**
+         * The timing of the mobile initialization is different, so it needs to be closed here
+         */
+        if (this.features?.passphrase_protection) {
+          if (this.listenerCount(DEVICE.PIN) > 0) {
+            Log.debug('try to close passpharse for mobile');
+            try {
+              await this.commands.typedCall('ApplySettings', 'Success', { use_passphrase: false });
+            } catch (e) {
+              this.runPromise = null;
+              return Promise.reject(e);
+            }
+          }
+        }
       }
     }
 
@@ -346,7 +373,16 @@ export class Device extends EventEmitter {
     }
 
     if (fn) {
-      await fn();
+      try {
+        await fn();
+      } catch (e) {
+        if (this.runPromise) {
+          this.runPromise.reject(e);
+        }
+
+        this.runPromise = null;
+        return;
+      }
     }
 
     if (

package/src/device/DeviceCommands.ts

@@ -181,13 +181,6 @@ export class DeviceCommands {
       return Promise.resolve(patchFeatures(res));
     }
 
-    /**
-     * Temporary, do not support passphrase
-     */
-    if (this.device.features?.passphrase_protection) {
-      return Promise.reject(ERRORS.TypedError(HardwareErrorCode.DeviceNotSupportPassphrase));
-    }
-
     if (res.type === 'ButtonRequest') {
       if (res.message.code === 'ButtonRequest_PassphraseEntry') {
         this.device.emit(DEVICE.PASSPHRASE_ON_DEVICE, this.device);
@@ -221,6 +214,13 @@ export class DeviceCommands {
       );
     }
 
+    /**
+     * Temporary, do not support passphrase
+     */
+    if (this.device.features?.passphrase_protection) {
+      return Promise.reject(ERRORS.TypedError(HardwareErrorCode.DeviceNotSupportPassphrase));
+    }
+
     if (res.type === 'PassphraseRequest') {
       /**
        * Temporary, do not support passphrase