Merge pull request #40 from gnosis/reenable-stuff

Reenable stuff for 0.3.2
gnosis · Aug 25, 2017 · 2610003 · 2610003
2 parents b92b7b5 + a83ca8d
commit 2610003
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gnosis.pm/gnosis-core-contracts",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Collection of smart contracts for the Gnosis prediction market platform",
   "scripts": {
     "lint": "eslint .",

diff --git a/truffle.js b/truffle.js
@@ -1,12 +1,12 @@
-// const HDWalletProvider = require('truffle-hdwallet-provider')
+const HDWalletProvider = require('truffle-hdwallet-provider')
 
-// let config = {
-//     infuraAccessToken: '',
-//     hdWalletMnemonic: 'bag path text august check lab grit fatigue antenna stem trouble cluster',
-// }
+let config = {
+    infuraAccessToken: '',
+    hdWalletMnemonic: 'bag path text august check lab grit fatigue antenna stem trouble cluster',
+}
 
-// // eslint-disable-next-line no-empty
-// try { Object.assign(config, require('./local-config')) } catch(e) { }
+// eslint-disable-next-line no-empty
+try { Object.assign(config, require('./local-config')) } catch(e) { }
 
 module.exports = {
     networks: {
@@ -23,19 +23,19 @@ module.exports = {
             gas: 0xfffffffffff,
             gasPrice: 0x01
         },
-        // ropsten: {
-        //     network_id: "3",
-        //     provider: new HDWalletProvider(config.hdWalletMnemonic, `https://ropsten.infura.io/${config.infuraAccessToken}`),
-        // },
-        // kovan: {
-        //     network_id: "42",
-        //     provider: new HDWalletProvider(config.hdWalletMnemonic, `https://kovan.infura.io/${config.infuraAccessToken}`),
-        // },
-        // rinkeby: {
-        //     network_id: "4",
-        //     provider: new HDWalletProvider(config.hdWalletMnemonic, `https://rinkeby.infura.io/${config.infuraAccessToken}`),
-        //     gasPrice: 1e11,
-        // },
+        ropsten: {
+            network_id: "3",
+            provider: new HDWalletProvider(config.hdWalletMnemonic, `https://ropsten.infura.io/${config.infuraAccessToken}`),
+        },
+        kovan: {
+            network_id: "42",
+            provider: new HDWalletProvider(config.hdWalletMnemonic, `https://kovan.infura.io/${config.infuraAccessToken}`),
+        },
+        rinkeby: {
+            network_id: "4",
+            provider: new HDWalletProvider(config.hdWalletMnemonic, `https://rinkeby.infura.io/${config.infuraAccessToken}`),
+            gasPrice: 1e11,
+        },
     },
     mocha: {
         enableTimeouts: false,