Commit 95fdc7bd by Alejo Salles

update contracts and config

parent eff3d7ca
pragma solidity ^0.4.21;
import 'zos-upgradeability/contracts/migrations/Initializable.sol';
import 'zos-lib/contracts/migrations/Initializable.sol';
/**
* @title Ownable
......
pragma solidity ^0.4.21;
import "./ERC20.sol";
import 'zos-upgradeability/contracts/migrations/Initializable.sol';
import 'zos-lib/contracts/migrations/Initializable.sol';
contract DetailedERC20 is Initializable, ERC20 {
string public name;
......
pragma solidity ^0.4.21;
import "./SafeERC20.sol";
import "zos-upgradeability/contracts/migrations/Initializable.sol";
import "zos-lib/contracts/migrations/Initializable.sol";
/**
* @title TokenTimelock
......
......@@ -6,7 +6,7 @@ import "./ERC20Basic.sol";
import "./SafeERC20.sol";
import "../../ownership/Ownable.sol";
import "../../math/SafeMath.sol";
import 'zos-upgradeability/contracts/migrations/Initializable.sol';
import 'zos-lib/contracts/migrations/Initializable.sol';
/**
......
......@@ -2,7 +2,7 @@ pragma solidity ^0.4.21;
import "./ERC721.sol";
import "./ERC721BasicToken.sol";
import "zos-upgradeability/contracts/migrations/Initializable.sol";
import "zos-lib/contracts/migrations/Initializable.sol";
/**
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -63,6 +63,7 @@
},
"dependencies": {
"dotenv": "^4.0.0",
"zos-upgradeability": "git://github.com/zeppelinos/upgradeability-lib.git"
"zos": "^0.3.7",
"zos-lib": "0.0.5"
}
}
......@@ -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',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment