Merge pull request #11 from vbaranov/core

Updated contract addresses and definitions for core network
This commit is contained in:
Victor 2017-12-15 17:21:32 -08:00 committed by GitHub
commit 2b087ce459
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 107 additions and 153 deletions

View File

@ -1,7 +1,7 @@
import KeysManagerAbi from './keysManager.abi.json' import KeysManagerAbi from './keysManager.abi.json'
import Web3 from 'web3'; import Web3 from 'web3';
const KEYS_MANAGER_ADDRESS = '0x88a34124bfffa27ef3e052c8dd2908e212643771'; const KEYS_MANAGER_ADDRESS = '0xfc90125492e58dbfe80c0bfb6a2a759c4f703ca8';
export default class KeysManager { export default class KeysManager {
constructor(){ constructor(){
if(window.web3.currentProvider){ if(window.web3.currentProvider){

View File

@ -17,7 +17,7 @@ var toAscii = function(hex) {
return str; return str;
}; };
const METADATA_ADDRESS = '0xfda8a3536aa1bb69073259d305fd22fcec368b71'; const METADATA_ADDRESS = '0xa1b344ee240564f61117f2dbf999547ad4b871ed';
export default class Metadata { export default class Metadata {
constructor(){ constructor(){
if(window.web3.currentProvider){ if(window.web3.currentProvider){

View File

@ -56,12 +56,7 @@
}, },
{ {
"constant": true, "constant": true,
"inputs": [ "inputs": [],
{
"name": "_miningKey",
"type": "address"
}
],
"name": "getBallotsStorage", "name": "getBallotsStorage",
"outputs": [ "outputs": [
{ {
@ -101,48 +96,14 @@
} }
], ],
"name": "finalize", "name": "finalize",
"outputs": [ "outputs": [],
{
"name": "",
"type": "address"
}
],
"payable": false, "payable": false,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"type": "function" "type": "function"
}, },
{ {
"constant": true, "constant": true,
"inputs": [ "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"
}
],
"name": "getTime", "name": "getTime",
"outputs": [ "outputs": [
{ {
@ -207,56 +168,6 @@
], ],
"name": "changeRequest", "name": "changeRequest",
"outputs": [ "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": "", "name": "",
"type": "bool" "type": "bool"
@ -268,12 +179,7 @@
}, },
{ {
"constant": true, "constant": true,
"inputs": [ "inputs": [],
{
"name": "_miningKey",
"type": "address"
}
],
"name": "getKeysManager", "name": "getKeysManager",
"outputs": [ "outputs": [
{ {
@ -294,12 +200,7 @@
} }
], ],
"name": "confirmPendingChange", "name": "confirmPendingChange",
"outputs": [ "outputs": [],
{
"name": "",
"type": "address"
}
],
"payable": false, "payable": false,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"type": "function" "type": "function"
@ -320,36 +221,7 @@
}, },
{ {
"constant": true, "constant": true,
"inputs": [ "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"
}
],
"name": "getMinThreshold", "name": "getMinThreshold",
"outputs": [ "outputs": [
{ {
@ -371,6 +243,26 @@
{ {
"name": "_voter", "name": "_voter",
"type": "address" "type": "address"
},
{
"name": "_licenseId",
"type": "bytes32"
},
{
"name": "_fullAddress",
"type": "string"
},
{
"name": "_state",
"type": "bytes32"
},
{
"name": "_zipcode",
"type": "uint256"
},
{
"name": "_expirationDate",
"type": "uint256"
} }
], ],
"name": "isAddressAlreadyVoted", "name": "isAddressAlreadyVoted",
@ -476,10 +368,6 @@
{ {
"name": "minThreshold", "name": "minThreshold",
"type": "uint256" "type": "uint256"
},
{
"name": "requestNonce",
"type": "uint256"
} }
], ],
"payable": false, "payable": false,

View File

@ -18,6 +18,25 @@
"stateMutability": "view", "stateMutability": "view",
"type": "function" "type": "function"
}, },
{
"constant": true,
"inputs": [
{
"name": "_newAddress",
"type": "address"
}
],
"name": "getCurrentValidatorsLength",
"outputs": [
{
"name": "",
"type": "uint256"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{ {
"constant": false, "constant": false,
"inputs": [ "inputs": [
@ -41,19 +60,33 @@
} }
], ],
"name": "removeValidator", "name": "removeValidator",
"outputs": [], "outputs": [
{
"name": "",
"type": "uint256"
}
],
"payable": false, "payable": false,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"type": "function" "type": "function"
}, },
{ {
"constant": true, "constant": true,
"inputs": [], "inputs": [
{
"name": "",
"type": "address"
}
],
"name": "currentValidatorsLength", "name": "currentValidatorsLength",
"outputs": [ "outputs": [
{ {
"name": "", "name": "",
"type": "uint256" "type": "uint256"
},
{
"name": "index",
"type": "uint256"
} }
], ],
"payable": false, "payable": false,
@ -99,7 +132,12 @@
}, },
{ {
"constant": true, "constant": true,
"inputs": [], "inputs": [
{
"name": "_validator",
"type": "address"
}
],
"name": "getVotingToChangeKeys", "name": "getVotingToChangeKeys",
"outputs": [ "outputs": [
{ {
@ -127,9 +165,19 @@
}, },
{ {
"constant": false, "constant": false,
"inputs": [], "inputs": [
{
"name": "",
"type": "uint256"
}
],
"name": "finalizeChange", "name": "finalizeChange",
"outputs": [], "outputs": [
{
"name": "",
"type": "address"
}
],
"payable": false, "payable": false,
"stateMutability": "nonpayable", "stateMutability": "nonpayable",
"type": "function" "type": "function"
@ -239,7 +287,12 @@
}, },
{ {
"constant": true, "constant": true,
"inputs": [], "inputs": [
{
"name": "_someone",
"type": "address"
}
],
"name": "masterOfCeremony", "name": "masterOfCeremony",
"outputs": [ "outputs": [
{ {
@ -252,34 +305,42 @@
"type": "function" "type": "function"
}, },
{ {
"constant": true,
"inputs": [ "inputs": [
{ {
"name": "_someone", "name": "_someone",
"type": "address" "type": "address"
} }
], ],
"payable": false,
"stateMutability": "view",
"type": "function",
"constant": true,
"name": "isValidator", "name": "isValidator",
"outputs": [ "outputs": [
{ {
"name": "", "name": "",
"type": "bool" "type": "bool"
} }
], ]
"payable": false,
"stateMutability": "view",
"type": "function"
}, },
{ {
"anonymous": false,
"inputs": [ "inputs": [
{ {
"indexed": true,
"name": "_masterOfCeremony", "name": "_masterOfCeremony",
"type": "address" "type": "address"
},
{
"indexed": false,
"name": "newSet",
"type": "address[]"
} }
], ],
"name": "InitiateChange",
"type": "constructor",
"payable": false, "payable": false,
"stateMutability": "nonpayable", "stateMutability": "nonpayable"
"type": "constructor"
}, },
{ {
"anonymous": false, "anonymous": false,
@ -305,6 +366,11 @@
"indexed": false, "indexed": false,
"name": "newSet", "name": "newSet",
"type": "address[]" "type": "address[]"
},
{
"indexed": false,
"name": "newAddress",
"type": "address"
} }
], ],
"name": "ChangeFinalized", "name": "ChangeFinalized",