Skip to content

Commit

Permalink
Merge pull request OpenZeppelin#156 from maraoz/ethpm
Browse files Browse the repository at this point in the history
Add ethpm support
  • Loading branch information
maraoz authored Mar 9, 2017
2 parents eb2cb5d + 29ab824 commit cc222c0
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 12 deletions.
3 changes: 2 additions & 1 deletion contracts/token/VestedToken.sol
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ contract VestedToken is StandardToken {
throw;
}

TokenGrant memory grant = TokenGrant({start: _start, value: _value, cliff: _cliff, vesting: _vesting, granter: msg.sender});

TokenGrant memory grant = TokenGrant(msg.sender, _value, _cliff, _vesting, _start);
grants[_to].push(grant);

transfer(_to, _value);
Expand Down
17 changes: 17 additions & 0 deletions ethpm.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"package_name": "zeppelin",
"version": "1.0.3",
"description": "Secure Smart Contract library for Solidity",
"authors": [
"Manuel Araoz <manuelaraoz@gmail.com>"
],
"keywords": [
"solidity",
"ethereum",
"smart",
"contracts",
"security",
"zeppelin"
],
"license": "MIT"
}
21 changes: 12 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@
"version": "1.0.3",
"description": "Secure Smart Contract library for Solidity",
"main": "truffle.js",
"devDependencies": {
"babel-preset-es2015": "^6.18.0",
"babel-preset-stage-2": "^6.18.0",
"babel-preset-stage-3": "^6.17.0",
"babel-register": "^6.23.0",
"ethereumjs-testrpc": "^3.0.2",
"truffle": "https://github.com/ConsenSys/truffle.git#3.1.9"
},
"scripts": {
"test": "scripts/test.sh",
"console": "truffle console",
Expand All @@ -33,5 +25,16 @@
"bugs": {
"url": "https://github.com/OpenZeppelin/zeppelin-solidity/issues"
},
"homepage": "https://github.com/OpenZeppelin/zeppelin-solidity"
"homepage": "https://github.com/OpenZeppelin/zeppelin-solidity",
"dependencies": {
"truffle-hdwallet-provider": "0.0.3"
},
"devDependencies": {
"babel-preset-es2015": "^6.18.0",
"babel-preset-stage-2": "^6.18.0",
"babel-preset-stage-3": "^6.17.0",
"babel-register": "^6.23.0",
"ethereumjs-testrpc": "^3.0.2",
"truffle": "https://github.com/ConsenSys/truffle.git#3.1.9"
}
}
14 changes: 12 additions & 2 deletions truffle.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
require('babel-register');
require('babel-polyfill');

var HDWalletProvider = require('truffle-hdwallet-provider');

var mnemonic = '[REDACTED]';
var provider = new HDWalletProvider(mnemonic, 'https://ropsten.infura.io/');


module.exports = {
networks: {
development: {
host: "localhost",
host: 'localhost',
port: 8545,
network_id: "*"
network_id: '*'
},
ropsten: {
provider: provider,
network_id: 3 // official id of the ropsten network
}
}
};

0 comments on commit cc222c0

Please sign in to comment.