fix accounts, windows support, ganache version, broken npm scripts

merge fixes, lint revert to deterministic lint
daostack · Dec 27, 2018 · a9745ef · a9745ef
1 parent 5ef08f7
commit a9745ef
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 node_modules
 .env
-db
+db
+.vscode
diff --git a/migrate.js b/migrate.js
@@ -38,7 +38,7 @@ const defaults = {
  */
 const wrapCommand = fn => async options => {
   let { quiet, force, provider, gasPrice, privateKey, mnemonic, output, params } = { ...defaults, ...options }
-  const emptySpinner = new Proxy({}, { get: () => () => {} }) // spinner that does nothing
+  const emptySpinner = new Proxy({}, { get: () => () => { } }) // spinner that does nothing
   const spinner = quiet ? emptySpinner : ora()
 
   process.on('unhandledRejection', (reason, promise) => {

diff --git a/migration.json b/migration.json
@@ -93,4 +93,4 @@
       "NativeReputation": "0xBbF1eE256BC68b76f37E019AE5A7fC9E04Bde997"
     }
   }
-}
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,10 +10,10 @@
     "node": ">=10.14.2"
   },
   "scripts": {
-    "cleandb": "rm -rf db",
-    "ganache": "mkdir -p db && ganache-cli --db=./db --deterministic --hostname=0.0.0.0",
     "lint": "eslint .",
-    "migrate": "./migrate.js",
+    "cleandb": "rimraf db",
+    "ganache": "mkdirp db && ganache-cli --db=./db --networkId 1512051714758 --deterministic --hostname=0.0.0.0",
+    "migrate": "node ./migrate.js",
     "docker:build": "docker build . -t daostack/migration:$(cat package.json | jq -r '.version')",
     "docker:push": "docker push daostack/migration:$(cat package.json | jq -r '.version')",
     "release": "./release.sh",
@@ -33,13 +33,15 @@
   "dependencies": {
     "@daostack/arc": "0.0.0-alpha.58",
     "ethereumjs-wallet": "^0.6.2",
-    "ganache-cli": "^6.2.4",
+    "ganache-cli": "^6.2.5",
     "hdwallet-accounts": "0.0.1",
     "inquirer": "^6.2.0",
+    "mkdirp": "^0.5.1",
     "moment": "^2.22.2",
     "ora": "^3.0.0",
     "prompt-confirm": "^2.0.4",
     "web3": "^1.0.0-beta.37",
+    "rimraf": "^2.6.2",
     "yargs": "^12.0.2"
   },
   "devDependencies": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -93,4 +93,4 @@ @@
           "NativeReputation": "0xBbF1eE256BC68b76f37E019AE5A7fC9E04Bde997"
         }
       }
-    }
+    }