Merge branch 'zos-release' of github.com:OpenZeppelin/zeppelin-solidity into zos-release

6669f3fc · Francisco Giordano · 27d696aa · 18e16a5d · 6669f3fc · 6669f3fc
Commit 6669f3fc authored Apr 20, 2018 by Francisco Giordano
Show whitespace changes
Inline Side-by-side

Showing with 17 additions and 3 deletions

package-lock.json package-lock.json +0 -0

package.json package.json +2 -1

package.zos.json package.zos.json +10 -0

truffle-config.js truffle-config.js +5 -2

No files found.
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -63,6 +63,7 @@
  },
  "dependencies": {
    "dotenv": "^4.0.0",
-    "zos-lib": "git://github.com/zeppelinos/zos-lib.git"
+    "zos": "^0.3.7",
+    "zos-lib": "0.0.5"
  }
 }
--- a/package.zos.json
+++ b/package.zos.json
+{
+  "contracts": {
+    "DetailedMintableToken": "DetailedMintableToken",
+    "DetailedPremintedToken": "DetailedPremintedToken",
+    "MintableERC721Token": "MintableERC721Token",
+    "TokenTimelock": "TokenTimelock",
+    "TokenVesting": "TokenVesting"
+  },
+  "name": "openzeppelin-zos"
+}
--- a/truffle-config.js
+++ b/truffle-config.js
@@ -24,8 +24,11 @@ module.exports = {
      network_id: '*', // eslint-disable-line camelcase
    },
    ropsten: {
-      provider: ropstenProvider,
-      network_id: 3, // eslint-disable-line camelcase
+      host: 'localhost',
+      network_id: '3',
+      port: 8555,
+      gas: 4700000,
+      gasPrice: 10e9,
    },
    coverage: {
      host: 'localhost',