Merge pull request #23 from daostack/working_flow

All tests passing!

.babelrc

@@ -1,4 +1,6 @@
 {
   "presets": ["es2015"],
-  "plugins": ["syntax-async-functions"]
+  "plugins": ["syntax-async-functions"],
+  // for VS Code test code debugging
+  "sourceMaps": "inline"
 }

.eslintrc.json

@@ -26,6 +26,7 @@
     "no-confusing-arrow": 2,
     "no-lonely-if": 2,
     "no-continue": 2,
-    "indent": ["error", 2, { "SwitchCase": 1 }]
+    "indent": ["error", 2, { "SwitchCase": 1 }],
+    "quotes": [2, "double", "avoid-escape"]
   }
 }

.gitignore

@@ -1,5 +1,9 @@
 node_modules/
 .node-xmlhttprequest-sync*
+.node-xmlhttprequest-content*
 *.tgz
 .vscode/
-testrpcDb/
+ganacheDb/
+dist/
+ganacheDb.zip
+migrated_contracts/

.travis.yml

@@ -3,7 +3,7 @@ dist: trusty
 language: node_js
 
 node_js:
-  - "7.10.0"
+  - "9.3.0"
 
 before_install:
   - sudo apt-get update -qq
@@ -14,13 +14,14 @@ before_install:
   - sudo apt-get install geth -y -qq
 
 install:
-  - yarn
-  - yarn start test.testrpcDb.restoreFromZip
-  - nohup yarn start test.testrpcDb.run &
+  - npm install
+  - npm start migrateContracts.initialize
+  - nohup npm start test.ganache.run &
+  - npm start migrateContracts
 
 script:
-  - yarn start lint
-  - yarn start test.automated
+  - npm start lint
+  - npm start test.automated
 
 notifications:
   slack: daostack:fGuaFPsiQiV5mgmzRcSzbYqw

README.md

@@ -22,7 +22,7 @@ The default configuration settings for Arc can be found in config/default.json,
   "providerUrl": "http://localhost:8545",
   "network": "kovan", // Options are 'homestead', 'ropsten', 'rinkeby', 'kovan'
   "apiToken": "" // Required for Infura or Etherscan
-  "gasLimit": 6500000
+  "gasLimit": [a number like 6015000]
 }
 ```
 

config/default.json

@@ -1,5 +1,6 @@
 {
   "providerUrl": "http://localhost:8545",
-  "network": "kovan",
-  "gasLimit": 6500000
-}
+  "network": "ganache",
+  "gasLimit": 6015000,
+  "apiToken": ""
+}