From 38f3f634524923c4d74638852da1ace52e5a0cf0 Mon Sep 17 00:00:00 2001 From: Vadim Arasev Date: Mon, 8 Oct 2018 18:06:58 +0300 Subject: [PATCH] (Update) Hard fork #2 in Core --- abis/BallotsStorage.abi.json | 148 ++++-- abis/EmissionFunds.abi.json | 162 ++++++ abis/IBallotsStorage.abi.json | 109 ---- abis/IKeysManager.abi.json | 378 -------------- abis/IPoaNetworkConsensus.abi.json | 126 ----- abis/IProxyStorage.abi.json | 139 ----- abis/KeysManager.abi.json | 358 +++++++++---- abis/Migrations.abi.json | 64 --- abis/PoaNetworkConsensus.abi.json | 196 ++++--- abis/ProxyStorage.abi.json | 180 +++++-- abis/RewardByBlock.abi.json | 354 +++++++++++++ abis/SafeMath.abi.json | 1 - abis/ValidatorMetadata.abi.json | 355 ++++--------- abis/VotingToChangeKeys.abi.json | 608 +++++++++------------- abis/VotingToChangeMinThreshold.abi.json | 499 +++++++++--------- abis/VotingToChangeProxyAddress.abi.json | 491 ++++++++--------- abis/VotingToManageEmissionFunds.abi.json | 593 +++++++++++++++++++++ contracts.json | 19 +- spec.json | 7 +- 19 files changed, 2563 insertions(+), 2224 deletions(-) create mode 100644 abis/EmissionFunds.abi.json delete mode 100644 abis/IBallotsStorage.abi.json delete mode 100644 abis/IKeysManager.abi.json delete mode 100644 abis/IPoaNetworkConsensus.abi.json delete mode 100644 abis/IProxyStorage.abi.json delete mode 100644 abis/Migrations.abi.json create mode 100644 abis/RewardByBlock.abi.json delete mode 100644 abis/SafeMath.abi.json create mode 100644 abis/VotingToManageEmissionFunds.abi.json diff --git a/abis/BallotsStorage.abi.json b/abis/BallotsStorage.abi.json index 2b1ca6c..02bde52 100644 --- a/abis/BallotsStorage.abi.json +++ b/abis/BallotsStorage.abi.json @@ -11,63 +11,80 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x247b3210" }, { "constant": true, "inputs": [ { "name": "_ballotType", - "type": "uint8" + "type": "uint256" + }, + { + "name": "_affectedKeyType", + "type": "uint256" + }, + { + "name": "_affectedKey", + "type": "address" + }, + { + "name": "_miningKey", + "type": "address" } ], - "name": "getBallotThreshold", + "name": "areKeysBallotParamsValid", "outputs": [ { "name": "", - "type": "uint256" + "type": "bool" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x3fd626d4" }, { - "constant": false, + "constant": true, "inputs": [ { - "name": "_newValue", + "name": "_ballotType", "type": "uint256" - }, + } + ], + "name": "getBallotThreshold", + "outputs": [ { - "name": "_thresholdType", - "type": "uint8" + "name": "", + "type": "uint256" } ], - "name": "setThreshold", - "outputs": [], "payable": false, - "stateMutability": "nonpayable", - "type": "function" + "stateMutability": "view", + "type": "function", + "signature": "0x45e23b53" }, { "constant": true, "inputs": [], - "name": "proxyStorage", + "name": "initDisabled", "outputs": [ { "name": "", - "type": "address" + "type": "bool" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x52a36938" }, { "constant": true, "inputs": [], - "name": "getTotalNumberOfValidators", + "name": "metadataChangeConfirmationsLimit", "outputs": [ { "name": "", @@ -75,13 +92,14 @@ } ], "payable": false, - "stateMutability": "view", - "type": "function" + "stateMutability": "pure", + "type": "function", + "signature": "0x93673620" }, { "constant": true, "inputs": [], - "name": "getVotingToChangeThreshold", + "name": "proxyStorage", "outputs": [ { "name": "", @@ -90,26 +108,82 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xae4b1b5b" + }, + { + "constant": false, + "inputs": [ + { + "name": "_newValue", + "type": "uint256" + }, + { + "name": "_thresholdType", + "type": "uint256" + } + ], + "name": "setThreshold", + "outputs": [ + { + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "nonpayable", + "type": "function", + "signature": "0xb9c36209" + }, + { + "constant": false, + "inputs": [ + { + "name": "_prevBallotsStorage", + "type": "address" + } + ], + "name": "migrate", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function", + "signature": "0xce5494bb" }, { "constant": true, "inputs": [], - "name": "getProxyThreshold", + "name": "getVotingToChangeThreshold", "outputs": [ { "name": "", - "type": "uint256" + "type": "address" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xd1104cb2" + }, + { + "constant": false, + "inputs": [ + { + "name": "_thresholds", + "type": "uint256[]" + } + ], + "name": "init", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function", + "signature": "0xd88b06db" }, { "constant": true, "inputs": [], - "name": "getBallotLimitPerValidator", + "name": "getProxyThreshold", "outputs": [ { "name": "", @@ -118,18 +192,23 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xeecd1079" }, { - "inputs": [ + "constant": true, + "inputs": [], + "name": "getBallotLimitPerValidator", + "outputs": [ { - "name": "_proxyStorage", - "type": "address" + "name": "", + "type": "uint256" } ], "payable": false, - "stateMutability": "nonpayable", - "type": "constructor" + "stateMutability": "view", + "type": "function", + "signature": "0xfcff021c" }, { "anonymous": false, @@ -137,7 +216,7 @@ { "indexed": true, "name": "thresholdType", - "type": "uint8" + "type": "uint256" }, { "indexed": false, @@ -146,6 +225,7 @@ } ], "name": "ThresholdChanged", - "type": "event" + "type": "event", + "signature": "0x3164947cf0f49f08dd0cd80e671535b1e11590d347c55dcaa97ba3c24a96b33a" } ] \ No newline at end of file diff --git a/abis/EmissionFunds.abi.json b/abis/EmissionFunds.abi.json new file mode 100644 index 0000000..fde1a72 --- /dev/null +++ b/abis/EmissionFunds.abi.json @@ -0,0 +1,162 @@ +[ + { + "constant": false, + "inputs": [ + { + "name": "_receiver", + "type": "address" + }, + { + "name": "_amount", + "type": "uint256" + } + ], + "name": "sendFundsTo", + "outputs": [ + { + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "nonpayable", + "type": "function", + "signature": "0x0cd1812f" + }, + { + "constant": false, + "inputs": [ + { + "name": "_amount", + "type": "uint256" + } + ], + "name": "burnFunds", + "outputs": [ + { + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "nonpayable", + "type": "function", + "signature": "0x1995333b" + }, + { + "constant": false, + "inputs": [ + { + "name": "_amount", + "type": "uint256" + } + ], + "name": "freezeFunds", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function", + "signature": "0x40b7cd3f" + }, + { + "constant": true, + "inputs": [], + "name": "votingToManageEmissionFunds", + "outputs": [ + { + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0xb26c8ff5" + }, + { + "inputs": [ + { + "name": "_votingToManageEmissionFunds", + "type": "address" + } + ], + "payable": false, + "stateMutability": "nonpayable", + "type": "constructor", + "signature": "constructor" + }, + { + "payable": true, + "stateMutability": "payable", + "type": "fallback" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "receiver", + "type": "address" + }, + { + "indexed": false, + "name": "caller", + "type": "address" + }, + { + "indexed": false, + "name": "amount", + "type": "uint256" + }, + { + "indexed": true, + "name": "success", + "type": "bool" + } + ], + "name": "FundsSentTo", + "type": "event", + "signature": "0x54e055e5b3ac3be6694426a1f1f1f26a2e586337ee9592657f6b0f373b0806ed" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "name": "caller", + "type": "address" + }, + { + "indexed": false, + "name": "amount", + "type": "uint256" + }, + { + "indexed": true, + "name": "success", + "type": "bool" + } + ], + "name": "FundsBurnt", + "type": "event", + "signature": "0x733e8f38c94e9d04690b6b5890ee94fd939f3061c84bfdc9ff7df11163fda860" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "name": "caller", + "type": "address" + }, + { + "indexed": false, + "name": "amount", + "type": "uint256" + } + ], + "name": "FundsFrozen", + "type": "event", + "signature": "0x87bd35dd5213917fa3c4bc2cf1e339f2266264ea12945571c332c3ccd0f6b194" + } +] \ No newline at end of file diff --git a/abis/IBallotsStorage.abi.json b/abis/IBallotsStorage.abi.json deleted file mode 100644 index 3b26aef..0000000 --- a/abis/IBallotsStorage.abi.json +++ /dev/null @@ -1,109 +0,0 @@ -[ - { - "constant": true, - "inputs": [], - "name": "getMaxLimitBallot", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "uint8" - } - ], - "name": "getBallotThreshold", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "", - "type": "uint256" - }, - { - "name": "", - "type": "uint8" - } - ], - "name": "setThreshold", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getTotalNumberOfValidators", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getVotingToChangeThreshold", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getProxyThreshold", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getBallotLimitPerValidator", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - } -] \ No newline at end of file diff --git a/abis/IKeysManager.abi.json b/abis/IKeysManager.abi.json deleted file mode 100644 index 2e53eaf..0000000 --- a/abis/IKeysManager.abi.json +++ /dev/null @@ -1,378 +0,0 @@ -[ - { - "constant": false, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "removePayoutKey", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "removeVotingKey", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "getVotingByMining", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "getMiningKeyByVoting", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "addMiningKey", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getTime", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "isVotingActive", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "", - "type": "address" - }, - { - "name": "", - "type": "address" - } - ], - "name": "addPayoutKey", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "", - "type": "address" - }, - { - "name": "", - "type": "address" - } - ], - "name": "swapPayoutKey", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "getPayoutByMining", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "removeMiningKey", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "migrateMiningKey", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "initiateKeys", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "", - "type": "address" - }, - { - "name": "", - "type": "address" - } - ], - "name": "addVotingKey", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "migrateInitialKey", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "isMiningActive", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "getMiningKeyHistory", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "getInitialKey", - "outputs": [ - { - "name": "", - "type": "uint8" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "", - "type": "address" - }, - { - "name": "", - "type": "address" - }, - { - "name": "", - "type": "address" - } - ], - "name": "createKeys", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "", - "type": "address" - }, - { - "name": "", - "type": "address" - } - ], - "name": "swapVotingKey", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "", - "type": "address" - }, - { - "name": "", - "type": "address" - } - ], - "name": "swapMiningKey", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "isPayoutActive", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - } -] \ No newline at end of file diff --git a/abis/IPoaNetworkConsensus.abi.json b/abis/IPoaNetworkConsensus.abi.json deleted file mode 100644 index 8ddc562..0000000 --- a/abis/IPoaNetworkConsensus.abi.json +++ /dev/null @@ -1,126 +0,0 @@ -[ - { - "constant": true, - "inputs": [], - "name": "getCurrentValidatorsLength", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "", - "type": "address" - }, - { - "name": "", - "type": "bool" - } - ], - "name": "addValidator", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getPendingList", - "outputs": [ - { - "name": "", - "type": "address[]" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [], - "name": "finalizeChange", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "", - "type": "address" - }, - { - "name": "", - "type": "address" - } - ], - "name": "swapValidatorKey", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getValidators", - "outputs": [ - { - "name": "", - "type": "address[]" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "", - "type": "address" - }, - { - "name": "", - "type": "bool" - } - ], - "name": "removeValidator", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "isValidator", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - } -] \ No newline at end of file diff --git a/abis/IProxyStorage.abi.json b/abis/IProxyStorage.abi.json deleted file mode 100644 index c4859c3..0000000 --- a/abis/IProxyStorage.abi.json +++ /dev/null @@ -1,139 +0,0 @@ -[ - { - "constant": false, - "inputs": [ - { - "name": "", - "type": "address" - }, - { - "name": "", - "type": "address" - }, - { - "name": "", - "type": "address" - }, - { - "name": "", - "type": "address" - }, - { - "name": "", - "type": "address" - } - ], - "name": "initializeAddresses", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getBallotsStorage", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getVotingToChangeKeys", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getPoaConsensus", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getKeysManager", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getVotingToChangeMinThreshold", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "", - "type": "uint256" - }, - { - "name": "", - "type": "address" - } - ], - "name": "setContractAddress", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "address" - } - ], - "name": "isValidator", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - } -] \ No newline at end of file diff --git a/abis/KeysManager.abi.json b/abis/KeysManager.abi.json index 18cb54f..a7c05f2 100644 --- a/abis/KeysManager.abi.json +++ b/abis/KeysManager.abi.json @@ -2,8 +2,43 @@ { "constant": true, "inputs": [ + { + "name": "_initialKey", + "type": "address" + } + ], + "name": "getInitialKeyStatus", + "outputs": [ { "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x17706507" + }, + { + "constant": false, + "inputs": [ + { + "name": "_previousKeysManager", + "type": "address" + } + ], + "name": "init", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function", + "signature": "0x19ab453c" + }, + { + "constant": true, + "inputs": [ + { + "name": "_miningKey", "type": "address" } ], @@ -16,7 +51,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x1e48e146" }, { "constant": false, @@ -27,10 +63,16 @@ } ], "name": "removePayoutKey", - "outputs": [], + "outputs": [ + { + "name": "", + "type": "bool" + } + ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x1e534e71" }, { "constant": false, @@ -41,10 +83,16 @@ } ], "name": "removeVotingKey", - "outputs": [], + "outputs": [ + { + "name": "", + "type": "bool" + } + ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x2a968f49" }, { "constant": true, @@ -63,7 +111,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x2befe2e1" }, { "constant": true, @@ -82,7 +131,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x2d260227" }, { "constant": false, @@ -93,10 +143,16 @@ } ], "name": "addMiningKey", - "outputs": [], + "outputs": [ + { + "name": "", + "type": "bool" + } + ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x38949514" }, { "constant": true, @@ -110,13 +166,14 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x4433418f" }, { "constant": true, "inputs": [ { - "name": "", + "name": "_miningKey", "type": "address" } ], @@ -129,7 +186,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x458779da" }, { "constant": true, @@ -143,7 +201,23 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x49285b58" + }, + { + "constant": true, + "inputs": [], + "name": "initDisabled", + "outputs": [ + { + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x52a36938" }, { "constant": true, @@ -157,42 +231,44 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x557ed1ba" }, { "constant": true, "inputs": [ { - "name": "", + "name": "_miningKey", "type": "address" } ], "name": "validatorKeys", "outputs": [ { - "name": "votingKey", + "name": "validatorVotingKey", "type": "address" }, { - "name": "payoutKey", + "name": "validatorPayoutKey", "type": "address" }, { - "name": "isMiningActive", + "name": "isValidatorMiningActive", "type": "bool" }, { - "name": "isVotingActive", + "name": "isValidatorVotingActive", "type": "bool" }, { - "name": "isPayoutActive", + "name": "isValidatorPayoutActive", "type": "bool" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x5c0569f8" }, { "constant": true, @@ -206,7 +282,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x62907170" }, { "constant": true, @@ -225,7 +302,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x62b46d64" }, { "constant": false, @@ -240,29 +318,40 @@ } ], "name": "addPayoutKey", - "outputs": [], + "outputs": [ + { + "name": "", + "type": "bool" + } + ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x651ebb5f" }, { "constant": true, "inputs": [ { - "name": "", + "name": "_currentKey", + "type": "address" + }, + { + "name": "_newKey", "type": "address" } ], - "name": "initialKeys", + "name": "checkIfMiningExisted", "outputs": [ { "name": "", - "type": "uint8" + "type": "bool" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x731fcb9a" }, { "constant": false, @@ -277,10 +366,16 @@ } ], "name": "swapPayoutKey", - "outputs": [], + "outputs": [ + { + "name": "", + "type": "bool" + } + ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x771ae299" }, { "constant": true, @@ -299,7 +394,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x7cded930" }, { "constant": false, @@ -310,10 +406,16 @@ } ], "name": "removeMiningKey", - "outputs": [], + "outputs": [ + { + "name": "", + "type": "bool" + } + ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x7ebf43fc" }, { "constant": true, @@ -326,8 +428,9 @@ } ], "payable": false, - "stateMutability": "view", - "type": "function" + "stateMutability": "pure", + "type": "function", + "signature": "0x81b03427" }, { "constant": false, @@ -341,7 +444,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x85b84ccb" }, { "constant": false, @@ -355,7 +459,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x8743e882" }, { "constant": false, @@ -370,10 +475,16 @@ } ], "name": "addVotingKey", - "outputs": [], + "outputs": [ + { + "name": "", + "type": "bool" + } + ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x9503ab72" }, { "constant": false, @@ -387,7 +498,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x98943eb6" }, { "constant": true, @@ -406,21 +518,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "contractVersion", - "outputs": [ - { - "name": "", - "type": "uint8" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x9bc91c22" }, { "constant": true, @@ -439,7 +538,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xa5a36dee" }, { "constant": true, @@ -453,26 +553,43 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xae4b1b5b" + }, + { + "constant": true, + "inputs": [], + "name": "maxOldMiningKeysDeepCheck", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "pure", + "type": "function", + "signature": "0xb9bdaa07" }, { "constant": true, "inputs": [ { - "name": "_initialKey", + "name": "_payoutKey", "type": "address" } ], - "name": "getInitialKey", + "name": "miningKeyByPayout", "outputs": [ { "name": "", - "type": "uint8" + "type": "address" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xc04455b5" }, { "constant": false, @@ -494,7 +611,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xc6232a15" }, { "constant": true, @@ -508,7 +626,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xd2acbc12" }, { "constant": false, @@ -523,10 +642,16 @@ } ], "name": "swapVotingKey", - "outputs": [], + "outputs": [ + { + "name": "", + "type": "bool" + } + ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xd33eb5ae" }, { "constant": false, @@ -541,10 +666,36 @@ } ], "name": "swapMiningKey", - "outputs": [], + "outputs": [ + { + "name": "", + "type": "bool" + } + ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xd44379cf" + }, + { + "constant": true, + "inputs": [ + { + "name": "_miningKey", + "type": "address" + } + ], + "name": "isVotingActiveByMiningKey", + "outputs": [ + { + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0xdb7cf00b" }, { "constant": true, @@ -557,14 +708,15 @@ } ], "payable": false, - "stateMutability": "view", - "type": "function" + "stateMutability": "pure", + "type": "function", + "signature": "0xe7f57c83" }, { "constant": true, "inputs": [ { - "name": "", + "name": "_votingKey", "type": "address" } ], @@ -577,7 +729,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xfa46eacd" }, { "constant": true, @@ -591,7 +744,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xfa81b200" }, { "constant": true, @@ -610,30 +764,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "name": "_proxyStorage", - "type": "address" - }, - { - "name": "_poaConsensus", - "type": "address" - }, - { - "name": "_masterOfCeremony", - "type": "address" - }, - { - "name": "_previousKeysManager", - "type": "address" - } - ], - "payable": false, - "stateMutability": "nonpayable", - "type": "constructor" + "type": "function", + "signature": "0xfee09285" }, { "anonymous": false, @@ -643,19 +775,15 @@ "name": "key", "type": "address" }, - { - "indexed": true, - "name": "miningKey", - "type": "address" - }, { "indexed": false, "name": "action", "type": "string" } ], - "name": "PayoutKeyChanged", - "type": "event" + "name": "MiningKeyChanged", + "type": "event", + "signature": "0x31511048ccdf9fbe46c149f8f729923c1232debeff658d242292f37365b45718" }, { "anonymous": false, @@ -677,7 +805,8 @@ } ], "name": "VotingKeyChanged", - "type": "event" + "type": "event", + "signature": "0x3c12ed73d04c6ac636caa62bedf7896dc1452a189bd7fcdbcae6e9765233ca55" }, { "anonymous": false, @@ -687,14 +816,20 @@ "name": "key", "type": "address" }, + { + "indexed": true, + "name": "miningKey", + "type": "address" + }, { "indexed": false, "name": "action", "type": "string" } ], - "name": "MiningKeyChanged", - "type": "event" + "name": "PayoutKeyChanged", + "type": "event", + "signature": "0x568d585fdb4f8eee3a22e8b798c49e9d6ac5fbfced5bc1b872a74808e3be7c7d" }, { "anonymous": false, @@ -716,7 +851,8 @@ } ], "name": "ValidatorInitialized", - "type": "event" + "type": "event", + "signature": "0x09b714df46e3a39ff284866b80612984e10c731561c157cd03aca91e436808a5" }, { "anonymous": false, @@ -738,7 +874,8 @@ } ], "name": "InitialKeyCreated", - "type": "event" + "type": "event", + "signature": "0x8f0993529f6c865998786a88a06fce1f0261f632bf90ee1b50fa640338d5e936" }, { "anonymous": false, @@ -755,6 +892,7 @@ } ], "name": "Migrated", - "type": "event" + "type": "event", + "signature": "0x495f7fdbe153771103489f5c94591c07cd8e655814d1f12739f591b94411ec07" } ] \ No newline at end of file diff --git a/abis/Migrations.abi.json b/abis/Migrations.abi.json deleted file mode 100644 index b889e18..0000000 --- a/abis/Migrations.abi.json +++ /dev/null @@ -1,64 +0,0 @@ -[ - { - "constant": false, - "inputs": [ - { - "name": "new_address", - "type": "address" - } - ], - "name": "upgrade", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "last_completed_migration", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "owner", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "completed", - "type": "uint256" - } - ], - "name": "setCompleted", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "constructor" - } -] \ No newline at end of file diff --git a/abis/PoaNetworkConsensus.abi.json b/abis/PoaNetworkConsensus.abi.json index f8d1cf8..113ac6b 100644 --- a/abis/PoaNetworkConsensus.abi.json +++ b/abis/PoaNetworkConsensus.abi.json @@ -16,7 +16,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x03aca792" }, { "constant": true, @@ -30,7 +31,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x0eaba26a" }, { "constant": false, @@ -44,7 +46,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x10855269" }, { "constant": false, @@ -59,24 +62,46 @@ } ], "name": "addValidator", - "outputs": [], + "outputs": [ + { + "name": "", + "type": "bool" + } + ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x21a3fb85" }, { "constant": true, "inputs": [], - "name": "currentValidatorsLength", + "name": "isMasterOfCeremonyRemovedPending", "outputs": [ { "name": "", - "type": "uint256" + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x273cb593" + }, + { + "constant": true, + "inputs": [], + "name": "isMasterOfCeremonyRemoved", + "outputs": [ + { + "name": "", + "type": "bool" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x379fed9a" }, { "constant": true, @@ -92,6 +117,10 @@ "name": "isValidator", "type": "bool" }, + { + "name": "isValidatorFinalized", + "type": "bool" + }, { "name": "index", "type": "uint256" @@ -99,7 +128,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x4110a489" }, { "constant": true, @@ -113,21 +143,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getVotingToChangeKeys", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x45199e0a" }, { "constant": false, @@ -136,7 +153,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x75286211" }, { "constant": false, @@ -151,10 +169,36 @@ } ], "name": "swapValidatorKey", - "outputs": [], + "outputs": [ + { + "name": "", + "type": "bool" + } + ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x879736b2" + }, + { + "constant": true, + "inputs": [ + { + "name": "_someone", + "type": "address" + } + ], + "name": "isValidatorFinalized", + "outputs": [ + { + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x8f2eabe1" }, { "constant": true, @@ -173,7 +217,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x900eb5a8" }, { "constant": true, @@ -187,12 +232,13 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x9a573786" }, { "constant": true, "inputs": [], - "name": "isMasterOfCeremonyInitialized", + "name": "wasProxyStorageSet", "outputs": [ { "name": "", @@ -201,7 +247,23 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xa5f8b874" + }, + { + "constant": true, + "inputs": [], + "name": "getCurrentValidatorsLengthWithoutMoC", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0xa8756337" }, { "constant": true, @@ -215,7 +277,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xae4b1b5b" }, { "constant": true, @@ -229,7 +292,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xb3f05b97" }, { "constant": true, @@ -243,7 +307,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xb7ab4db5" }, { "constant": true, @@ -257,7 +322,23 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xd3e848f1" + }, + { + "constant": true, + "inputs": [], + "name": "masterOfCeremonyPending", + "outputs": [ + { + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0xec7de1e9" }, { "constant": false, @@ -272,10 +353,16 @@ } ], "name": "removeValidator", - "outputs": [], + "outputs": [ + { + "name": "", + "type": "bool" + } + ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xf89a77b1" }, { "constant": true, @@ -289,7 +376,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xfa81b200" }, { "constant": true, @@ -308,7 +396,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xfacd743b" }, { "inputs": [ @@ -323,7 +412,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "constructor" + "type": "constructor", + "signature": "constructor" }, { "anonymous": false, @@ -340,7 +430,8 @@ } ], "name": "InitiateChange", - "type": "event" + "type": "event", + "signature": "0x55252fa6eee4741b4e24a74a70e9c11fd2c2281df8d6ea13126ff845f7825c89" }, { "anonymous": false, @@ -352,24 +443,8 @@ } ], "name": "ChangeFinalized", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "name": "nameOfContract", - "type": "string" - }, - { - "indexed": false, - "name": "newAddress", - "type": "address" - } - ], - "name": "ChangeReference", - "type": "event" + "type": "event", + "signature": "0x8564cd629b15f47dc310d45bcbfc9bcf5420b0d51bf0659a16c67f91d2763253" }, { "anonymous": false, @@ -381,6 +456,7 @@ } ], "name": "MoCInitializedProxyStorage", - "type": "event" + "type": "event", + "signature": "0x600bcf04a13e752d1e3670a5a9f1c21177ca2a93c6f5391d4f1298d098097c22" } ] \ No newline at end of file diff --git a/abis/ProxyStorage.abi.json b/abis/ProxyStorage.abi.json index 983a674..ab1d0d5 100644 --- a/abis/ProxyStorage.abi.json +++ b/abis/ProxyStorage.abi.json @@ -1,4 +1,19 @@ [ + { + "constant": true, + "inputs": [], + "name": "getRewardByBlock", + "outputs": [ + { + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x02afdfd4" + }, { "constant": true, "inputs": [], @@ -11,37 +26,23 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x13e468b3" }, { "constant": false, "inputs": [ { - "name": "_keysManager", - "type": "address" - }, - { - "name": "_votingToChangeKeys", - "type": "address" - }, - { - "name": "_votingToChangeMinThreshold", - "type": "address" - }, - { - "name": "_votingToChangeProxy", - "type": "address" - }, - { - "name": "_ballotsStorage", + "name": "_poaConsensus", "type": "address" } ], - "name": "initializeAddresses", + "name": "init", "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x19ab453c" }, { "constant": true, @@ -55,7 +56,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x36ee7773" }, { "constant": true, @@ -69,12 +71,13 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x49285b58" }, { "constant": true, "inputs": [], - "name": "mocInitialized", + "name": "initDisabled", "outputs": [ { "name": "", @@ -83,26 +86,28 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x52a36938" }, { "constant": true, "inputs": [], - "name": "getPoaConsensus", + "name": "mocInitialized", "outputs": [ { "name": "", - "type": "address" + "type": "bool" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x6398316c" }, { "constant": true, "inputs": [], - "name": "getKeysManager", + "name": "getVotingToManageEmissionFunds", "outputs": [ { "name": "", @@ -111,26 +116,28 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x6ecad99d" }, { "constant": true, "inputs": [], - "name": "contractVersion", + "name": "getPoaConsensus", "outputs": [ { "name": "", - "type": "uint8" + "type": "address" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x8b8414c4" }, { "constant": true, "inputs": [], - "name": "getVotingToChangeMinThreshold", + "name": "getKeysManager", "outputs": [ { "name": "", @@ -139,87 +146,153 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x9a573786" }, { "constant": false, "inputs": [ { - "name": "_contractType", - "type": "uint256" + "name": "_keysManagerEternalStorage", + "type": "address" }, { - "name": "_contractAddress", + "name": "_votingToChangeKeysEternalStorage", + "type": "address" + }, + { + "name": "_votingToChangeMinThresholdEternalStorage", + "type": "address" + }, + { + "name": "_votingToChangeProxyEternalStorage", + "type": "address" + }, + { + "name": "_votingToManageEmissionFundsEternalStorage", + "type": "address" + }, + { + "name": "_ballotsStorageEternalStorage", + "type": "address" + }, + { + "name": "_validatorMetadataEternalStorage", + "type": "address" + }, + { + "name": "_rewardByBlockEternalStorage", "type": "address" } ], - "name": "setContractAddress", + "name": "initializeAddresses", "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x9efa82cf" }, { "constant": true, - "inputs": [ + "inputs": [], + "name": "getVotingToChangeMinThreshold", + "outputs": [ { - "name": "_validator", + "name": "", "type": "address" } ], - "name": "isValidator", + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0xa3b3fff1" + }, + { + "constant": true, + "inputs": [], + "name": "getValidatorMetadata", "outputs": [ { "name": "", - "type": "bool" + "type": "address" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xb1339de3" }, { + "constant": false, "inputs": [ { - "name": "_poaConsensus", + "name": "_contractType", + "type": "uint256" + }, + { + "name": "_contractAddress", "type": "address" } ], + "name": "setContractAddress", + "outputs": [ + { + "name": "", + "type": "bool" + } + ], "payable": false, "stateMutability": "nonpayable", - "type": "constructor" + "type": "function", + "signature": "0xbb0165b1" }, { "anonymous": false, "inputs": [ { "indexed": false, - "name": "keysManager", + "name": "keysManagerEternalStorage", + "type": "address" + }, + { + "indexed": false, + "name": "votingToChangeKeysEternalStorage", + "type": "address" + }, + { + "indexed": false, + "name": "votingToChangeMinThresholdEternalStorage", + "type": "address" + }, + { + "indexed": false, + "name": "votingToChangeProxyEternalStorage", "type": "address" }, { "indexed": false, - "name": "votingToChangeKeys", + "name": "votingToManageEmissionFundsEternalStorage", "type": "address" }, { "indexed": false, - "name": "votingToChangeMinThreshold", + "name": "ballotsStorageEternalStorage", "type": "address" }, { "indexed": false, - "name": "votingToChangeProxy", + "name": "validatorMetadataEternalStorage", "type": "address" }, { "indexed": false, - "name": "ballotsStorage", + "name": "rewardByBlockEternalStorage", "type": "address" } ], "name": "ProxyInitialized", - "type": "event" + "type": "event", + "signature": "0xa0b05192e1273ceffbbdd1e02195c6ea17c6555a090c4f498adbd7ba31a19eb6" }, { "anonymous": false, @@ -236,6 +309,7 @@ } ], "name": "AddressSet", - "type": "event" + "type": "event", + "signature": "0xcb8f0f32182a0f756b1e065dab832c24d2c48fa533912c33552252a7f25bf4ae" } ] \ No newline at end of file diff --git a/abis/RewardByBlock.abi.json b/abis/RewardByBlock.abi.json new file mode 100644 index 0000000..952b775 --- /dev/null +++ b/abis/RewardByBlock.abi.json @@ -0,0 +1,354 @@ +[ + { + "constant": true, + "inputs": [ + { + "name": "_receiver", + "type": "address" + } + ], + "name": "extraReceiverAmount", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x0f3a0533" + }, + { + "constant": true, + "inputs": [], + "name": "bridgesAllowedLength", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x10f2ee7c" + }, + { + "constant": true, + "inputs": [], + "name": "emissionFunds", + "outputs": [ + { + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x1f4356e4" + }, + { + "constant": true, + "inputs": [], + "name": "blockRewardAmount", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x26cc2256" + }, + { + "constant": true, + "inputs": [ + { + "name": "_account", + "type": "address" + }, + { + "name": "_blockNumber", + "type": "uint256" + } + ], + "name": "mintedForAccountInBlock", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x30f6eb16" + }, + { + "constant": true, + "inputs": [ + { + "name": "_account", + "type": "address" + } + ], + "name": "mintedForAccount", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x3d84b8c1" + }, + { + "constant": true, + "inputs": [ + { + "name": "_blockNumber", + "type": "uint256" + } + ], + "name": "mintedInBlock", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x4476d66a" + }, + { + "constant": true, + "inputs": [], + "name": "mintedTotally", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x553a5c85" + }, + { + "constant": true, + "inputs": [], + "name": "bridgesAllowed", + "outputs": [ + { + "name": "", + "type": "address[3]" + } + ], + "payable": false, + "stateMutability": "pure", + "type": "function", + "signature": "0x899ca7fc" + }, + { + "constant": false, + "inputs": [ + { + "name": "_amount", + "type": "uint256" + }, + { + "name": "_receiver", + "type": "address" + } + ], + "name": "addExtraReceiver", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function", + "signature": "0xaa9fa274" + }, + { + "constant": true, + "inputs": [], + "name": "proxyStorage", + "outputs": [ + { + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0xae4b1b5b" + }, + { + "constant": true, + "inputs": [ + { + "name": "_bridge", + "type": "address" + } + ], + "name": "mintedTotallyByBridge", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0xb4a523e8" + }, + { + "constant": true, + "inputs": [ + { + "name": "_index", + "type": "uint256" + } + ], + "name": "extraReceiverByIndex", + "outputs": [ + { + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0xdb456f77" + }, + { + "constant": true, + "inputs": [ + { + "name": "_bridge", + "type": "address" + } + ], + "name": "bridgeAmount", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0xe73b9e2f" + }, + { + "constant": true, + "inputs": [], + "name": "emissionFundsAmount", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0xee8d75ff" + }, + { + "constant": true, + "inputs": [], + "name": "extraReceiversLength", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0xefdc4d01" + }, + { + "constant": false, + "inputs": [ + { + "name": "benefactors", + "type": "address[]" + }, + { + "name": "kind", + "type": "uint16[]" + } + ], + "name": "reward", + "outputs": [ + { + "name": "", + "type": "address[]" + }, + { + "name": "", + "type": "uint256[]" + } + ], + "payable": false, + "stateMutability": "nonpayable", + "type": "function", + "signature": "0xf91c2898" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "name": "amount", + "type": "uint256" + }, + { + "indexed": true, + "name": "receiver", + "type": "address" + }, + { + "indexed": true, + "name": "bridge", + "type": "address" + } + ], + "name": "AddedReceiver", + "type": "event", + "signature": "0x3c798bbcf33115b42c728b8504cff11dd58736e9fa789f1cda2738db7d696b2a" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": false, + "name": "receivers", + "type": "address[]" + }, + { + "indexed": false, + "name": "rewards", + "type": "uint256[]" + } + ], + "name": "Rewarded", + "type": "event", + "signature": "0xb747d4e9a0b39cc47496d84b42e4066ba8b8a0b89776528bcec4ac2997e22453" + } +] \ No newline at end of file diff --git a/abis/SafeMath.abi.json b/abis/SafeMath.abi.json deleted file mode 100644 index 0637a08..0000000 --- a/abis/SafeMath.abi.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/abis/ValidatorMetadata.abi.json b/abis/ValidatorMetadata.abi.json index 3c65a01..90915d6 100644 --- a/abis/ValidatorMetadata.abi.json +++ b/abis/ValidatorMetadata.abi.json @@ -52,30 +52,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "_newProxyAddress", - "type": "address" - } - ], - "name": "pendingProxyConfirmations", - "outputs": [ - { - "name": "count", - "type": "uint256" - }, - { - "name": "voters", - "type": "address[]" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x022c254a" }, { "constant": false, @@ -113,35 +91,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getBallotsStorage", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "_newProxyAddress", - "type": "address" - } - ], - "name": "setProxyAddress", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x334460a4" }, { "constant": true, @@ -164,7 +115,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x4ecb35c4" }, { "constant": false, @@ -178,21 +130,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "version", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x4ef39b75" }, { "constant": true, @@ -206,40 +145,23 @@ ], "payable": false, "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "implementation", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x557ed1ba" }, { - "constant": true, + "constant": false, "inputs": [ { - "name": "_votingKey", - "type": "address" - } - ], - "name": "getMiningByVotingKey", - "outputs": [ - { - "name": "", + "name": "_miningKey", "type": "address" } ], + "name": "clearMetadata", + "outputs": [], "payable": false, - "stateMutability": "view", - "type": "function" + "stateMutability": "nonpayable", + "type": "function", + "signature": "0x885c69b5" }, { "constant": false, @@ -293,49 +215,38 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x8ae881a6" }, { "constant": false, "inputs": [ { - "name": "_newProxyAddress", + "name": "_miningKey", "type": "address" } ], - "name": "confirmNewProxyAddress", + "name": "confirmPendingChange", "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x9c715535" }, { "constant": true, "inputs": [], - "name": "getKeysManager", + "name": "initMetadataDisabled", "outputs": [ { "name": "", - "type": "address" + "type": "bool" } ], "payable": false, "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [ - { - "name": "_miningKey", - "type": "address" - } - ], - "name": "confirmPendingChange", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xa6662a3c" }, { "constant": true, @@ -349,54 +260,51 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xae4b1b5b" }, { - "constant": false, + "constant": true, "inputs": [ { - "name": "_firstName", - "type": "bytes32" - }, - { - "name": "_lastName", - "type": "bytes32" - }, - { - "name": "_licenseId", - "type": "bytes32" - }, - { - "name": "_fullAddress", - "type": "string" - }, + "name": "_miningKey", + "type": "address" + } + ], + "name": "getValidatorName", + "outputs": [ { - "name": "_state", + "name": "firstName", "type": "bytes32" }, { - "name": "_zipcode", + "name": "lastName", "type": "bytes32" - }, + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0xaf2e2da9" + }, + { + "constant": false, + "inputs": [ { - "name": "_expirationDate", - "type": "uint256" + "name": "_oldMiningKey", + "type": "address" }, { - "name": "_miningKey", + "name": "_newMiningKey", "type": "address" } ], - "name": "changeRequestForValidator", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], + "name": "moveMetadata", + "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xc2d0916f" }, { "constant": false, @@ -439,40 +347,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "_miningKey", - "type": "address" - } - ], - "name": "onlyIfChangeExist", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "pendingProxyStorage", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xc3f1b0ea" }, { "constant": true, @@ -486,44 +362,32 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xe6bbe9dd" }, { - "constant": true, - "inputs": [ - { - "name": "_miningKey", - "type": "address" - }, - { - "name": "_voter", - "type": "address" - } - ], - "name": "isAddressAlreadyVoted", - "outputs": [ - { - "name": "", - "type": "bool" - } - ], + "constant": false, + "inputs": [], + "name": "initMetadataDisable", + "outputs": [], "payable": false, - "stateMutability": "view", - "type": "function" + "stateMutability": "nonpayable", + "type": "function", + "signature": "0xf0174a25" }, { "constant": true, "inputs": [ { - "name": "_newProxy", + "name": "_miningKey", "type": "address" }, { - "name": "_voter", + "name": "_voterMiningKey", "type": "address" } ], - "name": "isAddressAlreadyVotedProxy", + "name": "isValidatorAlreadyVoted", "outputs": [ { "name": "", @@ -532,16 +396,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" - }, - { - "constant": false, - "inputs": [], - "name": "initMetadataDisable", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xf73294b8" }, { "constant": false, @@ -555,7 +411,8 @@ ], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0xf94c12cb" }, { "constant": true, @@ -610,7 +467,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xfa52c7d8" }, { "anonymous": false, @@ -621,8 +479,9 @@ "type": "address" } ], - "name": "MetadataCreated", - "type": "event" + "name": "MetadataCleared", + "type": "event", + "signature": "0x1928e25e316bab82325e01eaf5b4a29f7b2d5e3d77fc0b6ac959eb95112f3ee9" }, { "anonymous": false, @@ -633,20 +492,27 @@ "type": "address" } ], - "name": "ChangeRequestInitiated", - "type": "event" + "name": "MetadataCreated", + "type": "event", + "signature": "0x76a10cc0839d166c55eec8dba39ff22f75470574ede5014b744b45cebea5fc7e" }, { "anonymous": false, "inputs": [ { "indexed": true, - "name": "miningKey", + "name": "oldMiningKey", + "type": "address" + }, + { + "indexed": true, + "name": "newMiningKey", "type": "address" } ], - "name": "CancelledRequest", - "type": "event" + "name": "MetadataMoved", + "type": "event", + "signature": "0x6a3e5f5cc14de86bb3be87bc976b74890ecd0c8fa0cfca2fe3fefe55c9b47dde" }, { "anonymous": false, @@ -655,15 +521,11 @@ "indexed": true, "name": "miningKey", "type": "address" - }, - { - "indexed": false, - "name": "votingSender", - "type": "address" } ], - "name": "Confirmed", - "type": "event" + "name": "ChangeRequestInitiated", + "type": "event", + "signature": "0x6ec0e3afd4b29a1fe1c688cb1e6474d9e2c6a1032858c3add0ff32b7ba95f32f" }, { "anonymous": false, @@ -674,31 +536,44 @@ "type": "address" } ], - "name": "FinalizedChange", - "type": "event" + "name": "CancelledRequest", + "type": "event", + "signature": "0x5a1dcc05b2a41ad121a798e749b9ba9584177c68a4047ee52ef37d4ca76ce08c" }, { "anonymous": false, "inputs": [ + { + "indexed": true, + "name": "miningKey", + "type": "address" + }, + { + "indexed": false, + "name": "votingSender", + "type": "address" + }, { "indexed": false, - "name": "newProxyAddress", + "name": "votingSenderMiningKey", "type": "address" } ], - "name": "RequestForNewProxy", - "type": "event" + "name": "Confirmed", + "type": "event", + "signature": "0x603c57ecb4a9802537649ceb6523e5d48c939e7856768ce6f9b3128a889a5cfe" }, { "anonymous": false, "inputs": [ { - "indexed": false, - "name": "newProxyAddress", + "indexed": true, + "name": "miningKey", "type": "address" } ], - "name": "ChangeProxyStorage", - "type": "event" + "name": "FinalizedChange", + "type": "event", + "signature": "0xccf0f685803f0fba33ec88246b35d75b758b1e77c3d65ef5658f7e630f36b85b" } ] \ No newline at end of file diff --git a/abis/VotingToChangeKeys.abi.json b/abis/VotingToChangeKeys.abi.json index d9de48f..b7bf5dc 100644 --- a/abis/VotingToChangeKeys.abi.json +++ b/abis/VotingToChangeKeys.abi.json @@ -1,18 +1,4 @@ [ - { - "constant": false, - "inputs": [ - { - "name": "_id", - "type": "uint256" - } - ], - "name": "finalize", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, { "constant": true, "inputs": [ @@ -21,7 +7,7 @@ "type": "uint256" } ], - "name": "getIsFinalized", + "name": "canBeFinalizedNow", "outputs": [ { "name": "", @@ -30,73 +16,48 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x009b38fa" }, { "constant": true, - "inputs": [ - { - "name": "_id", - "type": "uint256" - }, - { - "name": "_votingKey", - "type": "address" - } - ], - "name": "isValidVote", + "inputs": [], + "name": "minBallotDuration", "outputs": [ { "name": "", - "type": "bool" + "type": "uint256" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x02a99b9d" }, { - "constant": true, + "constant": false, "inputs": [ { "name": "_id", "type": "uint256" } ], - "name": "getMiningKey", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getBallotsStorage", - "outputs": [ - { - "name": "", - "type": "address" - } - ], + "name": "finalize", + "outputs": [], "payable": false, - "stateMutability": "view", - "type": "function" + "stateMutability": "nonpayable", + "type": "function", + "signature": "0x05261aea" }, { "constant": true, "inputs": [ { - "name": "", + "name": "_id", "type": "uint256" } ], - "name": "activeBallots", + "name": "getQuorumState", "outputs": [ { "name": "", @@ -105,7 +66,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x08dbb18e" }, { "constant": true, @@ -115,40 +77,83 @@ "type": "uint256" } ], - "name": "getTotalVoters", + "name": "getBallotInfo", "outputs": [ { - "name": "", + "name": "startTime", "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getTime", - "outputs": [ + }, { - "name": "", + "name": "endTime", + "type": "uint256" + }, + { + "name": "affectedKey", + "type": "address" + }, + { + "name": "affectedKeyType", + "type": "uint256" + }, + { + "name": "newVotingKey", + "type": "address" + }, + { + "name": "newPayoutKey", + "type": "address" + }, + { + "name": "miningKey", + "type": "address" + }, + { + "name": "totalVoters", + "type": "uint256" + }, + { + "name": "progress", + "type": "int256" + }, + { + "name": "isFinalized", + "type": "bool" + }, + { + "name": "ballotType", "type": "uint256" + }, + { + "name": "creator", + "type": "address" + }, + { + "name": "memo", + "type": "string" + }, + { + "name": "canBeFinalizedNow", + "type": "bool" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x141bd92a" }, { "constant": true, "inputs": [ { - "name": "_miningKey", + "name": "_id", + "type": "uint256" + }, + { + "name": "_votingKey", "type": "address" } ], - "name": "withinLimit", + "name": "isValidVote", "outputs": [ { "name": "", @@ -157,17 +162,18 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x288fa739" }, { "constant": true, "inputs": [ { - "name": "_id", + "name": "_index", "type": "uint256" } ], - "name": "getAffectedKeyType", + "name": "activeBallots", "outputs": [ { "name": "", @@ -176,123 +182,126 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x3bf05e95" }, { - "constant": true, + "constant": false, "inputs": [ { - "name": "_votingKey", + "name": "_startTime", + "type": "uint256" + }, + { + "name": "_endTime", + "type": "uint256" + }, + { + "name": "_memo", + "type": "string" + }, + { + "name": "_newMiningKey", + "type": "address" + }, + { + "name": "_newVotingKey", + "type": "address" + }, + { + "name": "_newPayoutKey", "type": "address" } ], - "name": "getMiningByVotingKey", + "name": "createBallotToAddNewValidator", "outputs": [ { "name": "", - "type": "address" + "type": "uint256" } ], "payable": false, - "stateMutability": "view", - "type": "function" + "stateMutability": "nonpayable", + "type": "function", + "signature": "0x47e82f31" }, { "constant": true, "inputs": [], - "name": "activeBallotsLength", + "name": "initDisabled", "outputs": [ { "name": "", - "type": "uint256" + "type": "bool" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x52a36938" }, { "constant": true, - "inputs": [ - { - "name": "_currentKey", - "type": "address" - }, - { - "name": "_affectedKey", - "type": "address" - } - ], - "name": "checkIfMiningExisted", + "inputs": [], + "name": "getTime", "outputs": [ { "name": "", - "type": "bool" + "type": "uint256" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x557ed1ba" }, { "constant": true, - "inputs": [ - { - "name": "_id", - "type": "uint256" - } - ], - "name": "getMemo", + "inputs": [], + "name": "activeBallotsLength", "outputs": [ { "name": "", - "type": "string" + "type": "uint256" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x6ccc0234" }, { - "constant": true, + "constant": false, "inputs": [ { "name": "_id", "type": "uint256" - } - ], - "name": "isActive", - "outputs": [ + }, { - "name": "", - "type": "bool" + "name": "_prevVotingToChange", + "type": "address" + }, + { + "name": "_voters", + "type": "address[]" } ], + "name": "migrateBasicOne", + "outputs": [], "payable": false, - "stateMutability": "view", - "type": "function" + "stateMutability": "nonpayable", + "type": "function", + "signature": "0x73ece100" }, { "constant": true, "inputs": [ { - "name": "_ballotType", - "type": "uint256" - }, - { - "name": "_affectedKey", - "type": "address" - }, - { - "name": "_affectedKeyType", + "name": "_id", "type": "uint256" - }, - { - "name": "_miningKey", - "type": "address" } ], - "name": "areBallotParamsValid", + "name": "isActive", "outputs": [ { "name": "", @@ -301,7 +310,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x82afd23b" }, { "constant": true, @@ -311,35 +321,57 @@ "type": "uint256" } ], - "name": "getAffectedKey", + "name": "getIndex", "outputs": [ { "name": "", - "type": "address" + "type": "uint256" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x8e7cb6e1" }, { "constant": true, - "inputs": [ + "inputs": [], + "name": "maxBallotDuration", + "outputs": [ { - "name": "_id", + "name": "", "type": "uint256" } ], - "name": "getEndTime", + "payable": false, + "stateMutability": "pure", + "type": "function", + "signature": "0x96bc6ef0" + }, + { + "constant": true, + "inputs": [], + "name": "migrateDisabled", "outputs": [ { "name": "", - "type": "uint256" + "type": "bool" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x9fc18d4b" + }, + { + "constant": false, + "inputs": [], + "name": "migrateDisable", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function", + "signature": "0xa3ac1eb1" }, { "constant": false, @@ -353,63 +385,37 @@ "type": "uint256" }, { - "name": "_affectedKey", - "type": "address" - }, - { - "name": "_affectedKeyType", + "name": "_ballotType", "type": "uint256" }, { - "name": "_miningKey", - "type": "address" - }, - { - "name": "_ballotType", + "name": "_affectedKeyType", "type": "uint256" }, { - "name": "memo", + "name": "_memo", "type": "string" - } - ], - "name": "createVotingForKeys", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": false, - "inputs": [ + }, { - "name": "_id", - "type": "uint256" + "name": "_affectedKey", + "type": "address" }, { - "name": "_choice", - "type": "uint8" + "name": "_miningKey", + "type": "address" } ], - "name": "vote", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getKeysManager", + "name": "createBallot", "outputs": [ { "name": "", - "type": "address" + "type": "uint256" } ], "payable": false, - "stateMutability": "view", - "type": "function" + "stateMutability": "nonpayable", + "type": "function", + "signature": "0xa896f64b" }, { "constant": true, @@ -423,40 +429,42 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xae4b1b5b" }, { - "constant": true, - "inputs": [], - "name": "maxOldMiningKeysDeepCheck", - "outputs": [ + "constant": false, + "inputs": [ { - "name": "", - "type": "uint8" + "name": "_id", + "type": "uint256" + }, + { + "name": "_choice", + "type": "uint256" } ], + "name": "vote", + "outputs": [], "payable": false, - "stateMutability": "view", - "type": "function" + "stateMutability": "nonpayable", + "type": "function", + "signature": "0xb384abef" }, { - "constant": true, + "constant": false, "inputs": [ { - "name": "_id", - "type": "uint256" - } - ], - "name": "getStartTime", - "outputs": [ - { - "name": "", + "name": "_minBallotDuration", "type": "uint256" } ], + "name": "init", + "outputs": [], "payable": false, - "stateMutability": "view", - "type": "function" + "stateMutability": "nonpayable", + "type": "function", + "signature": "0xb7b0422d" }, { "constant": true, @@ -475,7 +483,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xc088003d" }, { "constant": true, @@ -498,21 +507,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getGlobalMinThresholdOfVoters", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xc14bfd29" }, { "constant": true, @@ -535,26 +531,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "_id", - "type": "uint256" - } - ], - "name": "getBallotType", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xc7dea777" }, { "constant": true, @@ -568,32 +546,14 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xdc6bfbb5" }, { "constant": true, "inputs": [ { - "name": "_id", - "type": "uint256" - } - ], - "name": "getProgress", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", + "name": "_miningKey", "type": "address" } ], @@ -606,103 +566,23 @@ ], "payable": false, "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getBallotLimitPerValidator", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "uint256" - } - ], - "name": "votingState", - "outputs": [ - { - "name": "startTime", - "type": "uint256" - }, - { - "name": "endTime", - "type": "uint256" - }, - { - "name": "affectedKey", - "type": "address" - }, - { - "name": "affectedKeyType", - "type": "uint256" - }, - { - "name": "miningKey", - "type": "address" - }, - { - "name": "totalVoters", - "type": "uint256" - }, - { - "name": "progress", - "type": "int256" - }, - { - "name": "isFinalized", - "type": "bool" - }, - { - "name": "quorumState", - "type": "uint8" - }, - { - "name": "ballotType", - "type": "uint256" - }, - { - "name": "index", - "type": "uint256" - }, - { - "name": "minThresholdOfVoters", - "type": "uint256" - }, - { - "name": "creator", - "type": "address" - }, - { - "name": "memo", - "type": "string" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xf49774ee" }, { + "constant": false, "inputs": [ { - "name": "_proxyStorage", + "name": "_prevVotingToChange", "type": "address" } ], + "name": "migrateBasicAll", + "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "constructor" + "type": "function", + "signature": "0xf71de2ed" }, { "anonymous": false, @@ -713,23 +593,19 @@ "type": "uint256" }, { - "indexed": false, - "name": "decision", + "indexed": true, + "name": "ballotType", "type": "uint256" }, { "indexed": true, - "name": "voter", + "name": "creator", "type": "address" - }, - { - "indexed": false, - "name": "time", - "type": "uint256" } ], - "name": "Vote", - "type": "event" + "name": "BallotCreated", + "type": "event", + "signature": "0xd1ba591c76ef71222e2d30b8277758713cc6eef1de29efaf98a716744ac2420b" }, { "anonymous": false, @@ -746,7 +622,8 @@ } ], "name": "BallotFinalized", - "type": "event" + "type": "event", + "signature": "0x3b208472607d900e1f689c976139d1147afc463fa00df525e9aff8b0604d2984" }, { "anonymous": false, @@ -757,17 +634,28 @@ "type": "uint256" }, { - "indexed": true, - "name": "ballotType", + "indexed": false, + "name": "decision", "type": "uint256" }, { "indexed": true, - "name": "creator", + "name": "voter", + "type": "address" + }, + { + "indexed": false, + "name": "time", + "type": "uint256" + }, + { + "indexed": false, + "name": "voterMiningKey", "type": "address" } ], - "name": "BallotCreated", - "type": "event" + "name": "Vote", + "type": "event", + "signature": "0x1fad44b452b708aff155b3190058d690f8a0f2e2463fc757b96d1ce1877d0ccc" } ] \ No newline at end of file diff --git a/abis/VotingToChangeMinThreshold.abi.json b/abis/VotingToChangeMinThreshold.abi.json index c4f4239..e40ca5c 100644 --- a/abis/VotingToChangeMinThreshold.abi.json +++ b/abis/VotingToChangeMinThreshold.abi.json @@ -1,43 +1,53 @@ [ { - "constant": false, + "constant": true, "inputs": [ { "name": "_id", "type": "uint256" } ], - "name": "finalize", - "outputs": [], + "name": "canBeFinalizedNow", + "outputs": [ + { + "name": "", + "type": "bool" + } + ], "payable": false, - "stateMutability": "nonpayable", - "type": "function" + "stateMutability": "view", + "type": "function", + "signature": "0x009b38fa" }, { - "constant": false, - "inputs": [ - { - "name": "_startTime", - "type": "uint256" - }, + "constant": true, + "inputs": [], + "name": "minBallotDuration", + "outputs": [ { - "name": "_endTime", + "name": "", "type": "uint256" - }, + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x02a99b9d" + }, + { + "constant": false, + "inputs": [ { - "name": "_proposedValue", + "name": "_id", "type": "uint256" - }, - { - "name": "memo", - "type": "string" } ], - "name": "createBallotToChangeThreshold", + "name": "finalize", "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x05261aea" }, { "constant": true, @@ -47,82 +57,78 @@ "type": "uint256" } ], - "name": "getIsFinalized", + "name": "getQuorumState", "outputs": [ { "name": "", - "type": "bool" + "type": "uint256" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x08dbb18e" }, { - "constant": true, + "constant": false, "inputs": [ { - "name": "_id", + "name": "_startTime", "type": "uint256" }, { - "name": "_votingKey", - "type": "address" - } - ], - "name": "isValidVote", - "outputs": [ + "name": "_endTime", + "type": "uint256" + }, { - "name": "", - "type": "bool" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getBallotsStorage", - "outputs": [ + "name": "_proposedValue", + "type": "uint256" + }, { - "name": "", - "type": "address" + "name": "_memo", + "type": "string" } ], + "name": "createBallot", + "outputs": [], "payable": false, - "stateMutability": "view", - "type": "function" + "stateMutability": "nonpayable", + "type": "function", + "signature": "0x1700cc3c" }, { "constant": true, "inputs": [ { - "name": "", + "name": "_id", "type": "uint256" + }, + { + "name": "_votingKey", + "type": "address" } ], - "name": "activeBallots", + "name": "isValidVote", "outputs": [ { "name": "", - "type": "uint256" + "type": "bool" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x288fa739" }, { "constant": true, "inputs": [ { - "name": "_id", + "name": "_index", "type": "uint256" } ], - "name": "getTotalVoters", + "name": "activeBallots", "outputs": [ { "name": "", @@ -131,31 +137,13 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x3bf05e95" }, { "constant": true, "inputs": [], - "name": "getTime", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "_miningKey", - "type": "address" - } - ], - "name": "withinLimit", + "name": "initDisabled", "outputs": [ { "name": "", @@ -164,26 +152,23 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x52a36938" }, { "constant": true, - "inputs": [ - { - "name": "_votingKey", - "type": "address" - } - ], - "name": "getMiningByVotingKey", + "inputs": [], + "name": "getTime", "outputs": [ { "name": "", - "type": "address" + "type": "uint256" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x557ed1ba" }, { "constant": true, @@ -197,26 +182,31 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x6ccc0234" }, { - "constant": true, + "constant": false, "inputs": [ { "name": "_id", "type": "uint256" - } - ], - "name": "getMemo", - "outputs": [ + }, { - "name": "", - "type": "string" + "name": "_prevVotingToChange", + "type": "address" + }, + { + "name": "_voters", + "type": "address[]" } ], + "name": "migrateBasicOne", + "outputs": [], "payable": false, - "stateMutability": "view", - "type": "function" + "stateMutability": "nonpayable", + "type": "function", + "signature": "0x73ece100" }, { "constant": true, @@ -235,7 +225,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x82afd23b" }, { "constant": true, @@ -243,144 +234,177 @@ { "name": "_id", "type": "uint256" + }, + { + "name": "_votingKey", + "type": "address" } ], - "name": "getEndTime", + "name": "getBallotInfo", "outputs": [ { - "name": "", + "name": "startTime", "type": "uint256" + }, + { + "name": "endTime", + "type": "uint256" + }, + { + "name": "totalVoters", + "type": "uint256" + }, + { + "name": "progress", + "type": "int256" + }, + { + "name": "isFinalized", + "type": "bool" + }, + { + "name": "proposedValue", + "type": "uint256" + }, + { + "name": "creator", + "type": "address" + }, + { + "name": "memo", + "type": "string" + }, + { + "name": "canBeFinalizedNow", + "type": "bool" + }, + { + "name": "alreadyVoted", + "type": "bool" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x8c64a20d" }, { - "constant": false, + "constant": true, "inputs": [ { "name": "_id", "type": "uint256" - }, - { - "name": "_choice", - "type": "uint8" } ], - "name": "vote", - "outputs": [], - "payable": false, - "stateMutability": "nonpayable", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getKeysManager", + "name": "getIndex", "outputs": [ { "name": "", - "type": "address" + "type": "uint256" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x8e7cb6e1" }, { "constant": true, "inputs": [], - "name": "proxyStorage", + "name": "maxBallotDuration", "outputs": [ { "name": "", - "type": "address" + "type": "uint256" } ], "payable": false, - "stateMutability": "view", - "type": "function" + "stateMutability": "pure", + "type": "function", + "signature": "0x96bc6ef0" }, { "constant": true, "inputs": [], - "name": "maxOldMiningKeysDeepCheck", + "name": "migrateDisabled", "outputs": [ { "name": "", - "type": "uint8" + "type": "bool" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x9fc18d4b" }, { - "constant": true, + "constant": false, + "inputs": [], + "name": "migrateDisable", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function", + "signature": "0xa3ac1eb1" + }, + { + "constant": false, "inputs": [ { - "name": "_id", + "name": "_minBallotDuration", "type": "uint256" - } - ], - "name": "getStartTime", - "outputs": [ + }, { - "name": "", + "name": "_minPossibleThreshold", "type": "uint256" } ], + "name": "init", + "outputs": [], "payable": false, - "stateMutability": "view", - "type": "function" + "stateMutability": "nonpayable", + "type": "function", + "signature": "0xa5843f08" }, { "constant": true, - "inputs": [ - { - "name": "_id", - "type": "uint256" - } - ], - "name": "getMinThresholdOfVoters", + "inputs": [], + "name": "proxyStorage", "outputs": [ { "name": "", - "type": "uint256" + "type": "address" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xae4b1b5b" }, { - "constant": true, + "constant": false, "inputs": [ { "name": "_id", "type": "uint256" }, { - "name": "_votingKey", - "type": "address" - } - ], - "name": "hasAlreadyVoted", - "outputs": [ - { - "name": "", - "type": "bool" + "name": "_choice", + "type": "uint256" } ], + "name": "vote", + "outputs": [], "payable": false, - "stateMutability": "view", - "type": "function" + "stateMutability": "nonpayable", + "type": "function", + "signature": "0xb384abef" }, { "constant": true, "inputs": [], - "name": "getGlobalMinThresholdOfVoters", + "name": "minPossibleThreshold", "outputs": [ { "name": "", @@ -389,7 +413,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xb3ea87c4" }, { "constant": true, @@ -397,22 +422,19 @@ { "name": "_id", "type": "uint256" - }, - { - "name": "_miningKey", - "type": "address" } ], - "name": "areOldMiningKeysVoted", + "name": "getMinThresholdOfVoters", "outputs": [ { "name": "", - "type": "bool" + "type": "uint256" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xc088003d" }, { "constant": true, @@ -420,32 +442,23 @@ { "name": "_id", "type": "uint256" - } - ], - "name": "getProposedValue", - "outputs": [ + }, { - "name": "", - "type": "uint256" + "name": "_votingKey", + "type": "address" } ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "nextBallotId", + "name": "hasAlreadyVoted", "outputs": [ { "name": "", - "type": "uint256" + "type": "bool" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xc14bfd29" }, { "constant": true, @@ -453,42 +466,28 @@ { "name": "_id", "type": "uint256" - } - ], - "name": "getProgress", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ + }, { - "name": "", + "name": "_miningKey", "type": "address" } ], - "name": "validatorActiveBallots", + "name": "areOldMiningKeysVoted", "outputs": [ { "name": "", - "type": "uint256" + "type": "bool" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xc7dea777" }, { "constant": true, "inputs": [], - "name": "getBallotLimitPerValidator", + "name": "nextBallotId", "outputs": [ { "name": "", @@ -497,77 +496,43 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xdc6bfbb5" }, { "constant": true, "inputs": [ { - "name": "", - "type": "uint256" + "name": "_miningKey", + "type": "address" } ], - "name": "votingState", + "name": "validatorActiveBallots", "outputs": [ { - "name": "startTime", - "type": "uint256" - }, - { - "name": "endTime", - "type": "uint256" - }, - { - "name": "totalVoters", - "type": "uint256" - }, - { - "name": "progress", - "type": "int256" - }, - { - "name": "isFinalized", - "type": "bool" - }, - { - "name": "quorumState", - "type": "uint8" - }, - { - "name": "index", - "type": "uint256" - }, - { - "name": "minThresholdOfVoters", - "type": "uint256" - }, - { - "name": "proposedValue", + "name": "", "type": "uint256" - }, - { - "name": "creator", - "type": "address" - }, - { - "name": "memo", - "type": "string" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xf49774ee" }, { + "constant": false, "inputs": [ { - "name": "_proxyStorage", + "name": "_prevVotingToChange", "type": "address" } ], + "name": "migrateBasicAll", + "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "constructor" + "type": "function", + "signature": "0xf71de2ed" }, { "anonymous": false, @@ -578,23 +543,19 @@ "type": "uint256" }, { - "indexed": false, - "name": "decision", + "indexed": true, + "name": "ballotType", "type": "uint256" }, { "indexed": true, - "name": "voter", + "name": "creator", "type": "address" - }, - { - "indexed": false, - "name": "time", - "type": "uint256" } ], - "name": "Vote", - "type": "event" + "name": "BallotCreated", + "type": "event", + "signature": "0xd1ba591c76ef71222e2d30b8277758713cc6eef1de29efaf98a716744ac2420b" }, { "anonymous": false, @@ -611,7 +572,8 @@ } ], "name": "BallotFinalized", - "type": "event" + "type": "event", + "signature": "0x3b208472607d900e1f689c976139d1147afc463fa00df525e9aff8b0604d2984" }, { "anonymous": false, @@ -622,17 +584,28 @@ "type": "uint256" }, { - "indexed": true, - "name": "ballotType", + "indexed": false, + "name": "decision", "type": "uint256" }, { "indexed": true, - "name": "creator", + "name": "voter", + "type": "address" + }, + { + "indexed": false, + "name": "time", + "type": "uint256" + }, + { + "indexed": false, + "name": "voterMiningKey", "type": "address" } ], - "name": "BallotCreated", - "type": "event" + "name": "Vote", + "type": "event", + "signature": "0x1fad44b452b708aff155b3190058d690f8a0f2e2463fc757b96d1ce1877d0ccc" } ] \ No newline at end of file diff --git a/abis/VotingToChangeProxyAddress.abi.json b/abis/VotingToChangeProxyAddress.abi.json index 2e0842b..6300340 100644 --- a/abis/VotingToChangeProxyAddress.abi.json +++ b/abis/VotingToChangeProxyAddress.abi.json @@ -1,4 +1,39 @@ [ + { + "constant": true, + "inputs": [ + { + "name": "_id", + "type": "uint256" + } + ], + "name": "canBeFinalizedNow", + "outputs": [ + { + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x009b38fa" + }, + { + "constant": true, + "inputs": [], + "name": "minBallotDuration", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x02a99b9d" + }, { "constant": false, "inputs": [ @@ -11,7 +46,8 @@ "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x05261aea" }, { "constant": true, @@ -21,16 +57,17 @@ "type": "uint256" } ], - "name": "getIsFinalized", + "name": "getQuorumState", "outputs": [ { "name": "", - "type": "bool" + "type": "uint256" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x08dbb18e" }, { "constant": true, @@ -53,27 +90,14 @@ ], "payable": false, "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getBallotsStorage", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x288fa739" }, { "constant": true, "inputs": [ { - "name": "", + "name": "_index", "type": "uint256" } ], @@ -86,26 +110,23 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x3bf05e95" }, { "constant": true, - "inputs": [ - { - "name": "_id", - "type": "uint256" - } - ], - "name": "getTotalVoters", + "inputs": [], + "name": "initDisabled", "outputs": [ { "name": "", - "type": "uint256" + "type": "bool" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x52a36938" }, { "constant": true, @@ -119,7 +140,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x557ed1ba" }, { "constant": false, @@ -132,76 +154,63 @@ "name": "_endTime", "type": "uint256" }, - { - "name": "_proposedValue", - "type": "address" - }, { "name": "_contractType", - "type": "uint8" + "type": "uint256" }, { - "name": "memo", + "name": "_memo", "type": "string" + }, + { + "name": "_proposedValue", + "type": "address" } ], - "name": "createBallotToChangeProxyAddress", + "name": "createBallot", "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "function" + "type": "function", + "signature": "0x5908c674" }, { "constant": true, - "inputs": [ - { - "name": "_miningKey", - "type": "address" - } - ], - "name": "withinLimit", + "inputs": [], + "name": "activeBallotsLength", "outputs": [ { "name": "", - "type": "bool" + "type": "uint256" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x6ccc0234" }, { - "constant": true, + "constant": false, "inputs": [ { - "name": "_votingKey", - "type": "address" - } - ], - "name": "getMiningByVotingKey", - "outputs": [ + "name": "_id", + "type": "uint256" + }, { - "name": "", + "name": "_prevVotingToChange", "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "activeBallotsLength", - "outputs": [ + }, { - "name": "", - "type": "uint256" + "name": "_voters", + "type": "address[]" } ], + "name": "migrateBasicOne", + "outputs": [], "payable": false, - "stateMutability": "view", - "type": "function" + "stateMutability": "nonpayable", + "type": "function", + "signature": "0x73ece100" }, { "constant": true, @@ -211,16 +220,17 @@ "type": "uint256" } ], - "name": "getMemo", + "name": "isActive", "outputs": [ { "name": "", - "type": "string" + "type": "bool" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x82afd23b" }, { "constant": true, @@ -228,18 +238,63 @@ { "name": "_id", "type": "uint256" + }, + { + "name": "_votingKey", + "type": "address" } ], - "name": "isActive", + "name": "getBallotInfo", "outputs": [ { - "name": "", + "name": "startTime", + "type": "uint256" + }, + { + "name": "endTime", + "type": "uint256" + }, + { + "name": "totalVoters", + "type": "uint256" + }, + { + "name": "progress", + "type": "int256" + }, + { + "name": "isFinalized", + "type": "bool" + }, + { + "name": "proposedValue", + "type": "address" + }, + { + "name": "contractType", + "type": "uint256" + }, + { + "name": "creator", + "type": "address" + }, + { + "name": "memo", + "type": "string" + }, + { + "name": "canBeFinalizedNow", + "type": "bool" + }, + { + "name": "alreadyVoted", "type": "bool" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x8c64a20d" }, { "constant": true, @@ -249,7 +304,7 @@ "type": "uint256" } ], - "name": "getEndTime", + "name": "getIndex", "outputs": [ { "name": "", @@ -258,105 +313,97 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x8e7cb6e1" }, { - "constant": false, - "inputs": [ + "constant": true, + "inputs": [], + "name": "maxBallotDuration", + "outputs": [ { - "name": "_id", + "name": "", "type": "uint256" - }, - { - "name": "_choice", - "type": "uint8" } ], - "name": "vote", - "outputs": [], "payable": false, - "stateMutability": "nonpayable", - "type": "function" + "stateMutability": "pure", + "type": "function", + "signature": "0x96bc6ef0" }, { "constant": true, "inputs": [], - "name": "getKeysManager", + "name": "migrateDisabled", "outputs": [ { "name": "", - "type": "address" + "type": "bool" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0x9fc18d4b" }, { - "constant": true, + "constant": false, "inputs": [], - "name": "proxyStorage", - "outputs": [ - { - "name": "", - "type": "address" - } - ], + "name": "migrateDisable", + "outputs": [], "payable": false, - "stateMutability": "view", - "type": "function" + "stateMutability": "nonpayable", + "type": "function", + "signature": "0xa3ac1eb1" }, { "constant": true, "inputs": [], - "name": "maxOldMiningKeysDeepCheck", + "name": "proxyStorage", "outputs": [ { "name": "", - "type": "uint8" + "type": "address" } ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xae4b1b5b" }, { - "constant": true, + "constant": false, "inputs": [ { "name": "_id", "type": "uint256" - } - ], - "name": "getStartTime", - "outputs": [ + }, { - "name": "", + "name": "_choice", "type": "uint256" } ], + "name": "vote", + "outputs": [], "payable": false, - "stateMutability": "view", - "type": "function" + "stateMutability": "nonpayable", + "type": "function", + "signature": "0xb384abef" }, { - "constant": true, + "constant": false, "inputs": [ { - "name": "_id", - "type": "uint256" - } - ], - "name": "getContractType", - "outputs": [ - { - "name": "", + "name": "_minBallotDuration", "type": "uint256" } ], + "name": "init", + "outputs": [], "payable": false, - "stateMutability": "view", - "type": "function" + "stateMutability": "nonpayable", + "type": "function", + "signature": "0xb7b0422d" }, { "constant": true, @@ -375,7 +422,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xc088003d" }, { "constant": true, @@ -398,21 +446,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getGlobalMinThresholdOfVoters", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xc14bfd29" }, { "constant": true, @@ -435,26 +470,8 @@ ], "payable": false, "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "_id", - "type": "uint256" - } - ], - "name": "getProposedValue", - "outputs": [ - { - "name": "", - "type": "address" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xc7dea777" }, { "constant": true, @@ -468,32 +485,14 @@ ], "payable": false, "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xdc6bfbb5" }, { "constant": true, "inputs": [ { - "name": "_id", - "type": "uint256" - } - ], - "name": "getProgress", - "outputs": [ - { - "name": "", - "type": "int256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", + "name": "_miningKey", "type": "address" } ], @@ -506,95 +505,23 @@ ], "payable": false, "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [], - "name": "getBallotLimitPerValidator", - "outputs": [ - { - "name": "", - "type": "uint256" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" - }, - { - "constant": true, - "inputs": [ - { - "name": "", - "type": "uint256" - } - ], - "name": "votingState", - "outputs": [ - { - "name": "startTime", - "type": "uint256" - }, - { - "name": "endTime", - "type": "uint256" - }, - { - "name": "totalVoters", - "type": "uint256" - }, - { - "name": "progress", - "type": "int256" - }, - { - "name": "isFinalized", - "type": "bool" - }, - { - "name": "quorumState", - "type": "uint8" - }, - { - "name": "index", - "type": "uint256" - }, - { - "name": "minThresholdOfVoters", - "type": "uint256" - }, - { - "name": "proposedValue", - "type": "address" - }, - { - "name": "contractType", - "type": "uint8" - }, - { - "name": "creator", - "type": "address" - }, - { - "name": "memo", - "type": "string" - } - ], - "payable": false, - "stateMutability": "view", - "type": "function" + "type": "function", + "signature": "0xf49774ee" }, { + "constant": false, "inputs": [ { - "name": "_proxyStorage", + "name": "_prevVotingToChange", "type": "address" } ], + "name": "migrateBasicAll", + "outputs": [], "payable": false, "stateMutability": "nonpayable", - "type": "constructor" + "type": "function", + "signature": "0xf71de2ed" }, { "anonymous": false, @@ -605,23 +532,19 @@ "type": "uint256" }, { - "indexed": false, - "name": "decision", + "indexed": true, + "name": "ballotType", "type": "uint256" }, { "indexed": true, - "name": "voter", + "name": "creator", "type": "address" - }, - { - "indexed": false, - "name": "time", - "type": "uint256" } ], - "name": "Vote", - "type": "event" + "name": "BallotCreated", + "type": "event", + "signature": "0xd1ba591c76ef71222e2d30b8277758713cc6eef1de29efaf98a716744ac2420b" }, { "anonymous": false, @@ -638,7 +561,8 @@ } ], "name": "BallotFinalized", - "type": "event" + "type": "event", + "signature": "0x3b208472607d900e1f689c976139d1147afc463fa00df525e9aff8b0604d2984" }, { "anonymous": false, @@ -649,17 +573,28 @@ "type": "uint256" }, { - "indexed": true, - "name": "ballotType", + "indexed": false, + "name": "decision", "type": "uint256" }, { "indexed": true, - "name": "creator", + "name": "voter", + "type": "address" + }, + { + "indexed": false, + "name": "time", + "type": "uint256" + }, + { + "indexed": false, + "name": "voterMiningKey", "type": "address" } ], - "name": "BallotCreated", - "type": "event" + "name": "Vote", + "type": "event", + "signature": "0x1fad44b452b708aff155b3190058d690f8a0f2e2463fc757b96d1ce1877d0ccc" } ] \ No newline at end of file diff --git a/abis/VotingToManageEmissionFunds.abi.json b/abis/VotingToManageEmissionFunds.abi.json new file mode 100644 index 0000000..344edf9 --- /dev/null +++ b/abis/VotingToManageEmissionFunds.abi.json @@ -0,0 +1,593 @@ +[ + { + "constant": true, + "inputs": [ + { + "name": "_id", + "type": "uint256" + } + ], + "name": "canBeFinalizedNow", + "outputs": [ + { + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x009b38fa" + }, + { + "constant": false, + "inputs": [ + { + "name": "_id", + "type": "uint256" + } + ], + "name": "finalize", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function", + "signature": "0x05261aea" + }, + { + "constant": true, + "inputs": [ + { + "name": "_id", + "type": "uint256" + } + ], + "name": "getQuorumState", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x08dbb18e" + }, + { + "constant": true, + "inputs": [ + { + "name": "_id", + "type": "uint256" + } + ], + "name": "getBallotInfo", + "outputs": [ + { + "name": "creationTime", + "type": "uint256" + }, + { + "name": "startTime", + "type": "uint256" + }, + { + "name": "endTime", + "type": "uint256" + }, + { + "name": "isCanceled", + "type": "bool" + }, + { + "name": "isFinalized", + "type": "bool" + }, + { + "name": "creator", + "type": "address" + }, + { + "name": "memo", + "type": "string" + }, + { + "name": "amount", + "type": "uint256" + }, + { + "name": "burnVotes", + "type": "uint256" + }, + { + "name": "freezeVotes", + "type": "uint256" + }, + { + "name": "sendVotes", + "type": "uint256" + }, + { + "name": "receiver", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x141bd92a" + }, + { + "constant": true, + "inputs": [], + "name": "noActiveBallotExists", + "outputs": [ + { + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x1923e5d4" + }, + { + "constant": true, + "inputs": [], + "name": "emissionFunds", + "outputs": [ + { + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x1f4356e4" + }, + { + "constant": true, + "inputs": [], + "name": "distributionThreshold", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x236ae025" + }, + { + "constant": true, + "inputs": [ + { + "name": "_id", + "type": "uint256" + }, + { + "name": "_votingKey", + "type": "address" + } + ], + "name": "isValidVote", + "outputs": [ + { + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x288fa739" + }, + { + "constant": true, + "inputs": [], + "name": "ballotCancelingThreshold", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "pure", + "type": "function", + "signature": "0x2b633f77" + }, + { + "constant": true, + "inputs": [ + { + "name": "_id", + "type": "uint256" + } + ], + "name": "getTotalVoters", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x43d3a4c1" + }, + { + "constant": true, + "inputs": [], + "name": "initDisabled", + "outputs": [ + { + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x52a36938" + }, + { + "constant": true, + "inputs": [], + "name": "getTime", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x557ed1ba" + }, + { + "constant": false, + "inputs": [ + { + "name": "_startTime", + "type": "uint256" + }, + { + "name": "_endTime", + "type": "uint256" + }, + { + "name": "_receiver", + "type": "address" + }, + { + "name": "_memo", + "type": "string" + } + ], + "name": "createBallot", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function", + "signature": "0x55ca92f8" + }, + { + "constant": true, + "inputs": [], + "name": "emissionReleaseTime", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x72b556c7" + }, + { + "constant": true, + "inputs": [], + "name": "emissionReleaseThreshold", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x7ea95733" + }, + { + "constant": true, + "inputs": [ + { + "name": "_id", + "type": "uint256" + } + ], + "name": "isActive", + "outputs": [ + { + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0x82afd23b" + }, + { + "constant": false, + "inputs": [], + "name": "refreshEmissionReleaseTime", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "nonpayable", + "type": "function", + "signature": "0x85cb2e6e" + }, + { + "constant": false, + "inputs": [], + "name": "cancelNewBallot", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function", + "signature": "0xa8d1fcff" + }, + { + "constant": true, + "inputs": [], + "name": "proxyStorage", + "outputs": [ + { + "name": "", + "type": "address" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0xae4b1b5b" + }, + { + "constant": false, + "inputs": [ + { + "name": "_id", + "type": "uint256" + }, + { + "name": "_choice", + "type": "uint256" + } + ], + "name": "vote", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function", + "signature": "0xb384abef" + }, + { + "constant": true, + "inputs": [ + { + "name": "_id", + "type": "uint256" + } + ], + "name": "getMinThresholdOfVoters", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0xc088003d" + }, + { + "constant": true, + "inputs": [ + { + "name": "_id", + "type": "uint256" + }, + { + "name": "_votingKey", + "type": "address" + } + ], + "name": "hasAlreadyVoted", + "outputs": [ + { + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0xc14bfd29" + }, + { + "constant": true, + "inputs": [ + { + "name": "_id", + "type": "uint256" + }, + { + "name": "_miningKey", + "type": "address" + } + ], + "name": "areOldMiningKeysVoted", + "outputs": [ + { + "name": "", + "type": "bool" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0xc7dea777" + }, + { + "constant": false, + "inputs": [ + { + "name": "_emissionReleaseTime", + "type": "uint256" + }, + { + "name": "_emissionReleaseThreshold", + "type": "uint256" + }, + { + "name": "_distributionThreshold", + "type": "uint256" + }, + { + "name": "_emissionFunds", + "type": "address" + } + ], + "name": "init", + "outputs": [], + "payable": false, + "stateMutability": "nonpayable", + "type": "function", + "signature": "0xcdd7b1fd" + }, + { + "constant": true, + "inputs": [], + "name": "nextBallotId", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function", + "signature": "0xdc6bfbb5" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "id", + "type": "uint256" + }, + { + "indexed": true, + "name": "votingKey", + "type": "address" + } + ], + "name": "BallotCanceled", + "type": "event", + "signature": "0xeb7821930e09b446fdcdb7528c42df382ded62ddcb26a92d5b7970b3a3ea9744" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "id", + "type": "uint256" + }, + { + "indexed": true, + "name": "ballotType", + "type": "uint256" + }, + { + "indexed": true, + "name": "creator", + "type": "address" + } + ], + "name": "BallotCreated", + "type": "event", + "signature": "0xd1ba591c76ef71222e2d30b8277758713cc6eef1de29efaf98a716744ac2420b" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "id", + "type": "uint256" + }, + { + "indexed": true, + "name": "voter", + "type": "address" + } + ], + "name": "BallotFinalized", + "type": "event", + "signature": "0x3b208472607d900e1f689c976139d1147afc463fa00df525e9aff8b0604d2984" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "name": "id", + "type": "uint256" + }, + { + "indexed": false, + "name": "decision", + "type": "uint256" + }, + { + "indexed": true, + "name": "voter", + "type": "address" + }, + { + "indexed": false, + "name": "time", + "type": "uint256" + }, + { + "indexed": false, + "name": "voterMiningKey", + "type": "address" + } + ], + "name": "Vote", + "type": "event", + "signature": "0x1fad44b452b708aff155b3190058d690f8a0f2e2463fc757b96d1ce1877d0ccc" + } +] \ No newline at end of file diff --git a/contracts.json b/contracts.json index 4d34be2..9163b85 100644 --- a/contracts.json +++ b/contracts.json @@ -1,12 +1,15 @@ { - "VOTING_TO_CHANGE_KEYS_ADDRESS": "0x215794efe4b86a2fbcbf706bc9ade63663f1eae1", - "VOTING_TO_CHANGE_MIN_THRESHOLD_ADDRESS": "0xca863b0d12193a87b5173fd51fa4aa1703fb8a32", - "VOTING_TO_CHANGE_PROXY_ADDRESS": "0x9c8a06f0197ee718cd820adeb48a88ea2a9b5c48", - "BALLOTS_STORAGE_ADDRESS": "0x3a28ecc276d222829f78c98d43d719eafda0a6fe", - "KEYS_MANAGER_ADDRESS": "0x2b1dbc7390a65dc40f7d64d67ea11b4d627dd1bf", - "METADATA_ADDRESS": "0x4c0eb450d8dfa6e89eb14ac154867bc86b3c559c", - "PROXY_ADDRESS": "0x6f4aadbb17789b4f5e9e97d456dc4e01b117ccb3", - "POA_ADDRESS": "0x83451c8bc04d4ee9745ccc58edfab88037bc48cc", + "VOTING_TO_CHANGE_KEYS_ADDRESS": "0xA4508af18F1005943678769dB3D95223C062258D", + "VOTING_TO_CHANGE_MIN_THRESHOLD_ADDRESS": "0xa45e35472693AE60a95DB8cB1cE73eEa22ab5328", + "VOTING_TO_CHANGE_PROXY_ADDRESS": "0x468758926C796722D85BdeD792d1831F0839cAA6", + "VOTING_TO_MANAGE_EMISSION_FUNDS_ADDRESS": "0x7E9B90B22cdD1F6aA206f0D852aC96212217d60E", + "BALLOTS_STORAGE_ADDRESS": "0x94156F378C34d85eEe63f0654DAbB08352Ec3aB0", + "KEYS_MANAGER_ADDRESS": "0xCd9D0C11b0b3C91280CB70F2356d948f2BA93d88", + "METADATA_ADDRESS": "0x0bc0EB3a1Ddc4ACC2515b72B7eB8A2F276EDa00F", + "PROXY_ADDRESS": "0x82716162Cd02a2C82ad4a65CCF84e22075B13296", + "POA_ADDRESS": "0xa105Db0e6671C7B5f4f350ff1Af6460E6C696e71", + "EMISSION_FUNDS_ADDRESS": "0x548806F2215F44571431292F2314480c3F519044", + "REWARD_BY_BLOCK_ADDRESS": "0x4d0153D434384128D17243409e02fca1B3EE21D6", "MOC": "0xCf260eA317555637C55F70e55dbA8D5ad8414Cb0", "PROOF_OF_PHYSICAL_ADDRESS": "0x03ebcfd4ffc4aefbcb36e4824b6c18494c144493" } diff --git a/spec.json b/spec.json index e6d9621..c160449 100644 --- a/spec.json +++ b/spec.json @@ -14,9 +14,14 @@ }, "772000": { "safeContract": "0x83451c8bc04d4ee9745ccc58edfab88037bc48cc" + }, + "5329160": { + "safeContract": "0xa105Db0e6671C7B5f4f350ff1Af6460E6C696e71" } } - } + }, + "blockRewardContractAddress": "0x4d0153D434384128D17243409e02fca1B3EE21D6", + "blockRewardContractTransition": 5761140 } } },