Merge branch '000-snt-voting-dapp' of https://github.com/status-im/contracts into 000-snt-voting-dapp

This commit is contained in:
Barry Gitarts 2018-06-27 15:35:41 -04:00
commit 811d09979d
2 changed files with 8 additions and 4 deletions

View File

@ -108,8 +108,10 @@ const AddPoll = withFormik({
const { addPoll } = PollManager.methods; const { addPoll } = PollManager.methods;
const currentBlock = await getBlockNumber(); const currentBlock = await getBlockNumber();
const endTime = currentBlock + (oneDayinBlocks * 90); const endTime = currentBlock + (oneDayinBlocks * 90);
const toSend = addPoll(endTime, singleChoiceDef(description, ['YES'])); const toSend = addPoll(endTime, singleChoiceDef(description, ['YES']));
setSubmitting(true);
toSend.estimateGas() toSend.estimateGas()
.then(gasEstimated => { .then(gasEstimated => {
console.log("addPoll gas estimated: "+gasEstimated); console.log("addPoll gas estimated: "+gasEstimated);
@ -122,6 +124,8 @@ const AddPoll = withFormik({
}) })
.catch(res => { .catch(res => {
console.log('fail:', res); console.log('fail:', res);
})
.finally(() => {
setSubmitting(false); setSubmitting(false);
}); });

View File

@ -24,13 +24,13 @@
"deploy": false "deploy": false
}, },
"DelegationProxyFactory": { "DelegationProxyFactory": {
"deploy": true "deploy": false
}, },
"ProposalManager": { "ProposalManager": {
"deploy": false "deploy": false
}, },
"TrustNetwork": { "TrustNetwork": {
"deploy": true, "deploy": false,
"args": ["$DelegationProxyFactory"] "args": ["$DelegationProxyFactory"]
}, },
"Factory": { "Factory": {
@ -72,7 +72,7 @@
"args": ["$SNT", "$TrustNetwork"] "args": ["$SNT", "$TrustNetwork"]
}, },
"Democracy": { "Democracy": {
"deploy": true, "deploy": false,
"args": [ "args": [
"$SNT", "$SNT",
"$DelegationProxyFactory" "$DelegationProxyFactory"