Compare commits

...

7 Commits

Author SHA1 Message Date
15169b245b v1.0.4 2017-03-09 15:04:14 -03:00
cc222c02a9 Merge pull request #156 from maraoz/ethpm
Add ethpm support
2017-03-09 15:00:09 -03:00
29ab824e5c revert TokenGrant instantiation to old style 2017-03-09 14:37:02 -03:00
8d828bc789 fix ethpm.json 2017-03-07 16:57:51 -03:00
f038cdc9c9 fix ethpm.json 2017-03-07 16:57:12 -03:00
72d31c2471 attempt to publish to ethpm 2017-03-07 16:56:13 -03:00
b31c92c27c ethpm integration 2017-03-07 16:17:48 -03:00
4 changed files with 44 additions and 13 deletions

View File

@ -45,7 +45,8 @@ contract VestedToken is StandardToken {
throw; 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); grants[_to].push(grant);
transfer(_to, _value); transfer(_to, _value);

17
ethpm.json Normal file
View File

@ -0,0 +1,17 @@
{
"package_name": "zeppelin",
"version": "1.0.4",
"description": "Secure Smart Contract library for Solidity",
"authors": [
"Manuel Araoz <manuelaraoz@gmail.com>"
],
"keywords": [
"solidity",
"ethereum",
"smart",
"contracts",
"security",
"zeppelin"
],
"license": "MIT"
}

View File

@ -1,16 +1,8 @@
{ {
"name": "zeppelin-solidity", "name": "zeppelin-solidity",
"version": "1.0.3", "version": "1.0.4",
"description": "Secure Smart Contract library for Solidity", "description": "Secure Smart Contract library for Solidity",
"main": "truffle.js", "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": { "scripts": {
"test": "scripts/test.sh", "test": "scripts/test.sh",
"console": "truffle console", "console": "truffle console",
@ -33,5 +25,16 @@
"bugs": { "bugs": {
"url": "https://github.com/OpenZeppelin/zeppelin-solidity/issues" "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"
}
} }

View File

@ -1,12 +1,22 @@
require('babel-register'); require('babel-register');
require('babel-polyfill'); require('babel-polyfill');
var HDWalletProvider = require('truffle-hdwallet-provider');
var mnemonic = '[REDACTED]';
var provider = new HDWalletProvider(mnemonic, 'https://ropsten.infura.io/');
module.exports = { module.exports = {
networks: { networks: {
development: { development: {
host: "localhost", host: 'localhost',
port: 8545, port: 8545,
network_id: "*" network_id: '*'
},
ropsten: {
provider: provider,
network_id: 3 // official id of the ropsten network
} }
} }
}; };