From 024f3a19a3baa2a88157340472a242cf33ecc5f0 Mon Sep 17 00:00:00 2001 From: Richard Ramos Date: Thu, 28 Jun 2018 09:30:37 -0400 Subject: [PATCH 1/3] Increasing gasLimit --- app/components/simple-voting/AddPoll.js | 2 +- app/components/simple-voting/PollsList.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/simple-voting/AddPoll.js b/app/components/simple-voting/AddPoll.js index 1c5ff00..58381b2 100644 --- a/app/components/simple-voting/AddPoll.js +++ b/app/components/simple-voting/AddPoll.js @@ -99,7 +99,7 @@ const AddPoll = withFormik({ toSend.estimateGas() .then(gasEstimated => { console.log("addPoll gas estimated: "+gasEstimated); - return toSend.send({gas: gasEstimated + 1000}); + return toSend.send({gas: gasEstimated + 100000}); }) .then(res => { console.log('sucess:', res); diff --git a/app/components/simple-voting/PollsList.js b/app/components/simple-voting/PollsList.js index fa714cd..2550faf 100644 --- a/app/components/simple-voting/PollsList.js +++ b/app/components/simple-voting/PollsList.js @@ -34,7 +34,7 @@ class Poll extends Component { toSend.estimateGas() .then(gasEstimated => { console.log("voting gas estimated: " + gasEstimated); - return toSend.send({gas: gasEstimated + 1000}); + return toSend.send({gas: gasEstimated + 100000}); }) .then(res => { console.log('sucess:', res); From ce5143aa709331eefbf5e6229a54cbb86bccbe3f Mon Sep 17 00:00:00 2001 From: Richard Ramos Date: Thu, 28 Jun 2018 10:16:12 -0400 Subject: [PATCH 2/3] Updated blockchain.json with syncModes --- config/blockchain.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/blockchain.json b/config/blockchain.json index 638c816..3e17281 100644 --- a/config/blockchain.json +++ b/config/blockchain.json @@ -24,7 +24,7 @@ "testnet": { "enabled": true, "networkType": "testnet", - "light": true, + "syncMode": "light", "rpcHost": "localhost", "rpcPort": 8545, "rpcCorsDomain": "http://localhost:8000", @@ -35,7 +35,7 @@ "livenet": { "enabled": true, "networkType": "livenet", - "light": true, + "syncMode": "light", "rpcHost": "localhost", "rpcPort": 8545, "rpcCorsDomain": "http://localhost:8000", From 46f11a335ff8ef3aaa514baaf729b6b53084aa10 Mon Sep 17 00:00:00 2001 From: Richard Ramos Date: Thu, 28 Jun 2018 15:02:22 -0400 Subject: [PATCH 3/3] Contract config for deployment --- config/blockchain.json | 3 ++ config/contracts.json | 82 ++++++++++++++++-------------------------- 2 files changed, 33 insertions(+), 52 deletions(-) diff --git a/config/blockchain.json b/config/blockchain.json index 3e17281..b079225 100644 --- a/config/blockchain.json +++ b/config/blockchain.json @@ -23,6 +23,7 @@ }, "testnet": { "enabled": true, + "proxy": false, "networkType": "testnet", "syncMode": "light", "rpcHost": "localhost", @@ -34,6 +35,7 @@ }, "livenet": { "enabled": true, + "proxy": false, "networkType": "livenet", "syncMode": "light", "rpcHost": "localhost", @@ -45,6 +47,7 @@ }, "privatenet": { "enabled": true, + "proxy": false, "networkType": "custom", "rpcHost": "localhost", "rpcPort": 8545, diff --git a/config/contracts.json b/config/contracts.json index e4e0910..8cc0739 100644 --- a/config/contracts.json +++ b/config/contracts.json @@ -11,46 +11,28 @@ ], "gas": "auto", "contracts": { - "ERC20Receiver": { - "deploy": false - }, - "MiniMeToken": { - "deploy": false + "SafeMath": {"deploy": false}, + "ERC20Receiver": { "deploy": false }, + "MiniMeToken": { "deploy": false }, + "DelegationProxy": { "deploy": false }, + "DelegationProxyFactory": { "deploy": false }, + "ProposalManager": { "deploy": false }, + "TrustNetwork": { "deploy": false }, + "Factory": { "deploy": false }, + "Instance": { "deploy": false }, + "InstanceStorage": { "deploy": false }, + "UpdatableInstance": { "deploy": false }, + "DelegationProxyView": { "deploy": false }, + "DelegationProxyKernel": { "deploy": false }, + "ProposalCuration": { "deploy": false }, + "Democracy": { "deploy": false }, + "TestToken": { }, "MiniMeTokenFactory": { - "deploy": true - }, - "DelegationProxy": { - "deploy": false - }, - "DelegationProxyFactory": { - "deploy": false - }, - "ProposalManager": { - "deploy": false - }, - "TrustNetwork": { - "deploy": false, - "args": ["$DelegationProxyFactory"] - }, - "Factory": { - "deploy": false - }, - "Instance": { - "deploy": false - }, - "InstanceStorage": { - "deploy": false - }, - "UpdatableInstance": { - "deploy": false - }, - "TestToken": { - "deploy": true + }, "SNT": { "instanceOf": "MiniMeToken", - "deploy": true, "args": [ "$MiniMeTokenFactory", 0, @@ -61,26 +43,22 @@ true ] }, - "DelegationProxyView": { - "deploy": false + "PollManager": { + "args": ["$MiniMeTokenFactory", "$SNT"] + } + } + }, + "testnet":{ + "contracts": { + "TestToken": { "deploy": false }, + "MiniMeTokenFactory": { + "address": "0x6bfa86a71a7dbc68566d5c741f416e3009804279" }, - "DelegationProxyKernel": { - "deploy": false - }, - "ProposalCuration": { - "deploy": false, - "args": ["$SNT", "$TrustNetwork"] - }, - "Democracy": { - "deploy": false, - "args": [ - "$SNT", - "$DelegationProxyFactory" - ], - "gasLimit": 5000000 + "SNT": { + "instanceOf": "MiniMeToken", + "address": "0xc55cf4b03948d7ebc8b9e8bad92643703811d162" }, "PollManager": { - "deploy": true, "args": ["$MiniMeTokenFactory", "$SNT"] } }