From b31c92c27cc4454b9947768f6efeb06923991981 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Fri, 3 Mar 2017 11:59:48 -0300 Subject: [PATCH 1/5] ethpm integration --- package.json | 5 ++++- truffle.js | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 934f4ede5..3b3675f08 100644 --- a/package.json +++ b/package.json @@ -33,5 +33,8 @@ "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" + } } diff --git a/truffle.js b/truffle.js index f7215a966..fa3f23ba1 100644 --- a/truffle.js +++ b/truffle.js @@ -1,12 +1,22 @@ require('babel-register'); require('babel-polyfill'); +var HDWalletProvider = require('truffle-hdwallet-provider'); + +var mnemonic = 'opinion destroy betray ...'; +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 } } }; From 72d31c2471f1f6eadeec63391e6f9003dddc52f4 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Tue, 7 Mar 2017 16:56:13 -0300 Subject: [PATCH 2/5] attempt to publish to ethpm --- ethpm.json | 17 +++++++++++++++++ package.json | 16 ++++++++-------- truffle.js | 2 +- 3 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 ethpm.json diff --git a/ethpm.json b/ethpm.json new file mode 100644 index 000000000..f4721ac31 --- /dev/null +++ b/ethpm.json @@ -0,0 +1,17 @@ +{ + "package_name": "zeppelin", + "version": "1.0.3", + "description": "Secure Smart Contract library for Solidity", + "authors": [ + "Manuel Araoz " + ], + "keywords": [ + "solidity", + "ethereum", + "smart", + "contracts", + "security", + "zeppelin" + ], + "license": "MIT" +} diff --git a/package.json b/package.json index 3b3675f08..0d2f6b793 100644 --- a/package.json +++ b/package.json @@ -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", @@ -36,5 +28,13 @@ "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" } } diff --git a/truffle.js b/truffle.js index fa3f23ba1..d101dc5bf 100644 --- a/truffle.js +++ b/truffle.js @@ -3,7 +3,7 @@ require('babel-polyfill'); var HDWalletProvider = require('truffle-hdwallet-provider'); -var mnemonic = 'opinion destroy betray ...'; +var mnemonic = '[REDACTED]'; var provider = new HDWalletProvider(mnemonic, 'https://ropsten.infura.io/'); From f038cdc9c9460bf4d5169c2fc2cade4cab6106c0 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Tue, 7 Mar 2017 16:57:12 -0300 Subject: [PATCH 3/5] fix ethpm.json --- ethpm.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethpm.json b/ethpm.json index f4721ac31..6c6ee81c1 100644 --- a/ethpm.json +++ b/ethpm.json @@ -3,7 +3,7 @@ "version": "1.0.3", "description": "Secure Smart Contract library for Solidity", "authors": [ - "Manuel Araoz " + "Manuel Araoz " ], "keywords": [ "solidity", From 8d828bc7891af7c0413c60197d12f12593c2116a Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Tue, 7 Mar 2017 16:57:51 -0300 Subject: [PATCH 4/5] fix ethpm.json --- ethpm.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethpm.json b/ethpm.json index 6c6ee81c1..92922fd77 100644 --- a/ethpm.json +++ b/ethpm.json @@ -3,7 +3,7 @@ "version": "1.0.3", "description": "Secure Smart Contract library for Solidity", "authors": [ - "Manuel Araoz " + "Manuel Araoz " ], "keywords": [ "solidity", From 29ab824e5cd11c99e4aa40a300b4e83f61ff0ee8 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Thu, 9 Mar 2017 14:37:02 -0300 Subject: [PATCH 5/5] revert TokenGrant instantiation to old style --- contracts/token/VestedToken.sol | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contracts/token/VestedToken.sol b/contracts/token/VestedToken.sol index a697bd652..68be5b831 100644 --- a/contracts/token/VestedToken.sol +++ b/contracts/token/VestedToken.sol @@ -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);