Merge 80f9161 into c642905

wearekickback · Nov 29, 2019 · a0049e9 · a0049e9
2 parents c642905 + 80f9161
commit a0049e9
Show file tree

Hide file tree

Showing 9 changed files with 2,892 additions and 2,676 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,7 @@ npm-debug.log
 node_modules
 yarn-error.log
 .DS_Store
-.vscode/*
+.vscode
 .node*
 archive/*
 build/

diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,11 @@
 language: node_js
 git:
   depth: 1
-node_js: lts/*
+node_js: 10
 cache: yarn
 install:
 - yarn
-- yarn global add ganache-cli@6.1.8
+- yarn global add ganache-cli@6.7.0
 before_script:
 - cp .deployment-sample.js .deployment.js
 - ganache-cli --defaultBalanceEther 2000000 --accounts 500 >ganache.log 2>&1 &

diff --git a/package.json b/package.json
@@ -63,7 +63,7 @@
     "solgraph": "^0.3.2",
     "solhint": "^2.0.0",
     "solidity-coverage": "^0.6.4",
-    "truffle": "5.0.5",
+    "truffle": "^5.1.0",
     "truffle-hdwallet-provider": "^1.0.0-web3one.0",
     "uuid": "^3.0.1",
     "web3": "1.0.0-beta.33",