diff --git a/src/contracts/KeysManager.contract.js b/src/contracts/KeysManager.contract.js index 2f7f98b..eac2eb3 100644 --- a/src/contracts/KeysManager.contract.js +++ b/src/contracts/KeysManager.contract.js @@ -1,7 +1,7 @@ import KeysManagerAbi from './keysManager.abi.json' import Web3 from 'web3'; -const KEYS_MANAGER_ADDRESS = '0x88a34124bfffa27ef3e052c8dd2908e212643771'; +const KEYS_MANAGER_ADDRESS = '0xfc90125492e58dbfe80c0bfb6a2a759c4f703ca8'; export default class KeysManager { constructor(){ if(window.web3.currentProvider){ diff --git a/src/contracts/Metadata.contract.js b/src/contracts/Metadata.contract.js index ca84f2d..635fe51 100644 --- a/src/contracts/Metadata.contract.js +++ b/src/contracts/Metadata.contract.js @@ -17,7 +17,7 @@ var toAscii = function(hex) { return str; }; -const METADATA_ADDRESS = '0xfda8a3536aa1bb69073259d305fd22fcec368b71'; +const METADATA_ADDRESS = '0xa1b344ee240564f61117f2dbf999547ad4b871ed'; export default class Metadata { constructor(){ if(window.web3.currentProvider){ diff --git a/src/contracts/metadata.abi.json b/src/contracts/metadata.abi.json index 46fc39d..dfa5f5e 100644 --- a/src/contracts/metadata.abi.json +++ b/src/contracts/metadata.abi.json @@ -56,12 +56,7 @@ }, { "constant": true, - "inputs": [ - { - "name": "_miningKey", - "type": "address" - } - ], + "inputs": [], "name": "getBallotsStorage", "outputs": [ { @@ -101,48 +96,14 @@ } ], "name": "finalize", - "outputs": [ - { - "name": "", - "type": "address" - } - ], + "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function" }, { "constant": true, - "inputs": [ - { - "name": "_firstName", - "type": "bytes32" - }, - { - "name": "_lastName", - "type": "bytes32" - }, - { - "name": "_licenseId", - "type": "bytes32" - }, - { - "name": "_fullAddress", - "type": "string" - }, - { - "name": "_state", - "type": "bytes32" - }, - { - "name": "_zipcode", - "type": "uint256" - }, - { - "name": "_expirationDate", - "type": "uint256" - } - ], + "inputs": [], "name": "getTime", "outputs": [ { @@ -207,56 +168,6 @@ ], "name": "changeRequest", "outputs": [ - { - "components": [ - { - "name": "firstName", - "type": "bytes32" - }, - { - "name": "lastName", - "type": "bytes32" - }, - { - "name": "licenseId", - "type": "bytes32" - }, - { - "name": "fullAddress", - "type": "string" - }, - { - "name": "state", - "type": "bytes32" - }, - { - "name": "zipcode", - "type": "uint256" - }, - { - "name": "expirationDate", - "type": "uint256" - }, - { - "name": "createdDate", - "type": "uint256" - }, - { - "name": "updatedDate", - "type": "uint256" - }, - { - "name": "minThreshold", - "type": "uint256" - }, - { - "name": "requestNonce", - "type": "uint256" - } - ], - "name": "", - "type": "bool" - }, { "name": "", "type": "bool" @@ -268,12 +179,7 @@ }, { "constant": true, - "inputs": [ - { - "name": "_miningKey", - "type": "address" - } - ], + "inputs": [], "name": "getKeysManager", "outputs": [ { @@ -294,12 +200,7 @@ } ], "name": "confirmPendingChange", - "outputs": [ - { - "name": "", - "type": "address" - } - ], + "outputs": [], "payable": false, "stateMutability": "nonpayable", "type": "function" @@ -320,36 +221,7 @@ }, { "constant": true, - "inputs": [ - { - "name": "_firstName", - "type": "bytes32" - }, - { - "name": "_lastName", - "type": "bytes32" - }, - { - "name": "_licenseId", - "type": "bytes32" - }, - { - "name": "_fullAddress", - "type": "string" - }, - { - "name": "_state", - "type": "bytes32" - }, - { - "name": "_zipcode", - "type": "uint256" - }, - { - "name": "_expirationDate", - "type": "uint256" - } - ], + "inputs": [], "name": "getMinThreshold", "outputs": [ { @@ -371,6 +243,26 @@ { "name": "_voter", "type": "address" + }, + { + "name": "_licenseId", + "type": "bytes32" + }, + { + "name": "_fullAddress", + "type": "string" + }, + { + "name": "_state", + "type": "bytes32" + }, + { + "name": "_zipcode", + "type": "uint256" + }, + { + "name": "_expirationDate", + "type": "uint256" } ], "name": "isAddressAlreadyVoted", @@ -476,10 +368,6 @@ { "name": "minThreshold", "type": "uint256" - }, - { - "name": "requestNonce", - "type": "uint256" } ], "payable": false, diff --git a/src/contracts/poaConsensus.abi.json b/src/contracts/poaConsensus.abi.json index 9a7768a..4f1944d 100644 --- a/src/contracts/poaConsensus.abi.json +++ b/src/contracts/poaConsensus.abi.json @@ -18,6 +18,25 @@ "stateMutability": "view", "type": "function" }, + { + "constant": true, + "inputs": [ + { + "name": "_newAddress", + "type": "address" + } + ], + "name": "getCurrentValidatorsLength", + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], + "payable": false, + "stateMutability": "view", + "type": "function" + }, { "constant": false, "inputs": [ @@ -41,19 +60,33 @@ } ], "name": "removeValidator", - "outputs": [], + "outputs": [ + { + "name": "", + "type": "uint256" + } + ], "payable": false, "stateMutability": "nonpayable", "type": "function" }, { "constant": true, - "inputs": [], + "inputs": [ + { + "name": "", + "type": "address" + } + ], "name": "currentValidatorsLength", "outputs": [ { "name": "", "type": "uint256" + }, + { + "name": "index", + "type": "uint256" } ], "payable": false, @@ -99,7 +132,12 @@ }, { "constant": true, - "inputs": [], + "inputs": [ + { + "name": "_validator", + "type": "address" + } + ], "name": "getVotingToChangeKeys", "outputs": [ { @@ -127,9 +165,19 @@ }, { "constant": false, - "inputs": [], + "inputs": [ + { + "name": "", + "type": "uint256" + } + ], "name": "finalizeChange", - "outputs": [], + "outputs": [ + { + "name": "", + "type": "address" + } + ], "payable": false, "stateMutability": "nonpayable", "type": "function" @@ -239,7 +287,12 @@ }, { "constant": true, - "inputs": [], + "inputs": [ + { + "name": "_someone", + "type": "address" + } + ], "name": "masterOfCeremony", "outputs": [ { @@ -252,34 +305,42 @@ "type": "function" }, { - "constant": true, "inputs": [ { "name": "_someone", "type": "address" } ], + "payable": false, + "stateMutability": "view", + "type": "function", + "constant": true, "name": "isValidator", "outputs": [ { "name": "", "type": "bool" } - ], - "payable": false, - "stateMutability": "view", - "type": "function" + ] }, { + "anonymous": false, "inputs": [ { + "indexed": true, "name": "_masterOfCeremony", "type": "address" + }, + { + "indexed": false, + "name": "newSet", + "type": "address[]" } ], + "name": "InitiateChange", + "type": "constructor", "payable": false, - "stateMutability": "nonpayable", - "type": "constructor" + "stateMutability": "nonpayable" }, { "anonymous": false, @@ -305,6 +366,11 @@ "indexed": false, "name": "newSet", "type": "address[]" + }, + { + "indexed": false, + "name": "newAddress", + "type": "address" } ], "name": "ChangeFinalized",