Merge branch '000-snt-voting-dapp' of https://github.com/status-im/contracts into 000-snt-voting-dapp
This commit is contained in:
commit
882dd64128
|
@ -23,6 +23,7 @@
|
||||||
},
|
},
|
||||||
"testnet": {
|
"testnet": {
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
|
"proxy": false,
|
||||||
"networkType": "testnet",
|
"networkType": "testnet",
|
||||||
"syncMode": "light",
|
"syncMode": "light",
|
||||||
"rpcHost": "localhost",
|
"rpcHost": "localhost",
|
||||||
|
@ -34,6 +35,7 @@
|
||||||
},
|
},
|
||||||
"livenet": {
|
"livenet": {
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
|
"proxy": false,
|
||||||
"networkType": "livenet",
|
"networkType": "livenet",
|
||||||
"syncMode": "light",
|
"syncMode": "light",
|
||||||
"rpcHost": "localhost",
|
"rpcHost": "localhost",
|
||||||
|
@ -45,6 +47,7 @@
|
||||||
},
|
},
|
||||||
"privatenet": {
|
"privatenet": {
|
||||||
"enabled": true,
|
"enabled": true,
|
||||||
|
"proxy": false,
|
||||||
"networkType": "custom",
|
"networkType": "custom",
|
||||||
"rpcHost": "localhost",
|
"rpcHost": "localhost",
|
||||||
"rpcPort": 8545,
|
"rpcPort": 8545,
|
||||||
|
|
|
@ -11,46 +11,28 @@
|
||||||
],
|
],
|
||||||
"gas": "auto",
|
"gas": "auto",
|
||||||
"contracts": {
|
"contracts": {
|
||||||
"ERC20Receiver": {
|
"SafeMath": {"deploy": false},
|
||||||
"deploy": false
|
"ERC20Receiver": { "deploy": false },
|
||||||
},
|
"MiniMeToken": { "deploy": false },
|
||||||
"MiniMeToken": {
|
"DelegationProxy": { "deploy": false },
|
||||||
"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": {
|
"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": {
|
"SNT": {
|
||||||
"instanceOf": "MiniMeToken",
|
"instanceOf": "MiniMeToken",
|
||||||
"deploy": true,
|
|
||||||
"args": [
|
"args": [
|
||||||
"$MiniMeTokenFactory",
|
"$MiniMeTokenFactory",
|
||||||
0,
|
0,
|
||||||
|
@ -61,26 +43,22 @@
|
||||||
true
|
true
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"DelegationProxyView": {
|
"PollManager": {
|
||||||
"deploy": false
|
"args": ["$MiniMeTokenFactory", "$SNT"]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"testnet":{
|
||||||
|
"contracts": {
|
||||||
|
"TestToken": { "deploy": false },
|
||||||
|
"MiniMeTokenFactory": {
|
||||||
|
"address": "0x6bfa86a71a7dbc68566d5c741f416e3009804279"
|
||||||
},
|
},
|
||||||
"DelegationProxyKernel": {
|
"SNT": {
|
||||||
"deploy": false
|
"instanceOf": "MiniMeToken",
|
||||||
},
|
"address": "0xc55cf4b03948d7ebc8b9e8bad92643703811d162"
|
||||||
"ProposalCuration": {
|
|
||||||
"deploy": false,
|
|
||||||
"args": ["$SNT", "$TrustNetwork"]
|
|
||||||
},
|
|
||||||
"Democracy": {
|
|
||||||
"deploy": false,
|
|
||||||
"args": [
|
|
||||||
"$SNT",
|
|
||||||
"$DelegationProxyFactory"
|
|
||||||
],
|
|
||||||
"gasLimit": 5000000
|
|
||||||
},
|
},
|
||||||
"PollManager": {
|
"PollManager": {
|
||||||
"deploy": true,
|
|
||||||
"args": ["$MiniMeTokenFactory", "$SNT"]
|
"args": ["$MiniMeTokenFactory", "$SNT"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue