fixed some error and update version 1.0.5.

diff --git a/main.js b/main.js
index 28ba491..d4a65b3 100644 (file)
--- a/main.js
+++ b/main.js
@@ -150,9 +150,7 @@ function setBytomInit(event, bytomNetwork) {
 
   bytomdInit.on('exit', function (code) {
     event.sender.send('ConfiguredNetwork','init')
-      .then(() =>
-        setBytomMining(event)
-      )
+    setBytomMining(event)
     bytomdLog.info('bytom init exited with code ' + code)
   })
 

diff --git a/modules/settings.js b/modules/settings.js
index 508f7b5..bd33b54 100644 (file)
--- a/modules/settings.js
+++ b/modules/settings.js
@@ -1,7 +1,8 @@
 const { app } = require('electron')
 const path = require('path')
+const glob = require('glob')
 
-import logger from './logger'
+// import logger from './logger'
 
 let instance = null
 
@@ -15,10 +16,10 @@ class Settings {
   }
 
   init() {
-    const logLevel = { logLevel: 'info' }
-    const logFolder = { logFolder: path.join(this.userDataPath, 'logs') }
-    const loggerOptions = Object.assign('info', logLevel, logFolder)
-    logger.setup(loggerOptions)
+    // const logLevel = { logLevel: 'info' }
+    // const logFolder = { logFolder: path.join(this.userDataPath, 'logs') }
+    // const loggerOptions = Object.assign('info', logLevel, logFolder)
+    // logger.setup(loggerOptions)
   }
 
   get userDataPath() {
@@ -37,7 +38,7 @@ class Settings {
   get bytomdPath() {
     return process.env.DEV?
       path.join(__dirname, '../bytomd/bytomd-darwin_amd64'):
-      glob.sync( path.join(__dirname, '../bytomd/bytomd*'))
+      glob.sync( path.join(__dirname, '../../bytomd/bytomd*'))
   }
 
   get bytomdDataPath(){

diff --git a/package-lock.json b/package-lock.json
index 0c09817..b7a4572 100644 (file)
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "bytom-wallet",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1164,7 +1164,6 @@
       "version": "6.22.0",
       "resolved": "http://registry.npm.taobao.org/babel-register/download/babel-register-6.22.0.tgz",
       "integrity": "sha1-ph3YOXX5ykqefW7/MFlJTNXqTGM=",
-      "dev": true,
       "requires": {
         "babel-core": "6.26.3",
         "babel-runtime": "6.26.0",

diff --git a/package.json b/package.json
index 2998ed8..f2a96a9 100644 (file)
--- a/package.json
+++ b/package.json
@@ -87,6 +87,7 @@
   ],
   "dependencies": {
     "babel-polyfill": "~6.16.0",
+    "babel-register": "~6.22.0",
     "bootstrap-sass": "~3.3.7",
     "btoa": "^1.1.2",
     "classnames": "~2.2.5",
@@ -129,7 +130,6 @@
     "babel-preset-es2015": "~6.9.0",
     "babel-preset-react": "~6.5.0",
     "babel-preset-react-hmre": "~1.1.1",
-    "babel-register": "~6.22.0",
     "bootstrap-loader": "~1.0.10",
     "chai": "~3.5.0",
     "chai-as-promised": "~6.0.0",