poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

logic changes to clusetr key contract to handle org suborg

This commit is contained in:
vsmk98 2018-11-22 10:16:34 +08:00
parent 09dced454b
commit dfdc5e11b0
3 changed files with 83 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
controls/cluster/Clusterkeys.sol
View File

@ -6,6 +6,7 @@ contract Clusterkeys {
enum Operation {None, Add, Delete} enum Operation {None, Add, Delete}
struct OrgDetails { struct OrgDetails {
string orgId; string orgId;
string vorgId;
string [] privateKey; string [] privateKey;
string pendingKey; string pendingKey;
Operation pendingOp; Operation pendingOp;
@ -17,6 +18,7 @@ contract Clusterkeys {
struct OrgVoterDetails { struct OrgVoterDetails {
string orgId; string orgId;
address [] orgVoterAccount; address [] orgVoterAccount;
string [] privateKey;
} }
OrgVoterDetails [] private voterList; OrgVoterDetails [] private voterList;
mapping(bytes32 => uint) private VoterOrgIndex; mapping(bytes32 => uint) private VoterOrgIndex;
@ -67,9 +69,10 @@ contract Clusterkeys {
// checks if the sender is one of the registered voter account for the org // checks if the sender is one of the registered voter account for the org
modifier canVote(string _orgId){ modifier canVote(string _orgId){
bool flag = false; bool flag = false;
uint orgIndex = getOrgIndexVoter(_orgId); uint orgIndex = getOrgIndex(_orgId);
for (uint i = 0; i < voterList[orgIndex].orgVoterAccount.length; i++){ uint vorgIndex = getOrgIndexVoter(orgList[orgIndex].vorgId);
if ( voterList[orgIndex].orgVoterAccount[i] == msg.sender){ for (uint i = 0; i < voterList[vorgIndex].orgVoterAccount.length; i++){
if ( voterList[vorgIndex].orgVoterAccount[i] == msg.sender){
flag = true; flag = true;
break; break;
} }
@ -82,7 +85,8 @@ contract Clusterkeys {
// checks if the org has any voter accounts set up or not // checks if the org has any voter accounts set up or not
function checkIfVoterExists(string _orgId, address _address) internal view returns (bool, uint){ function checkIfVoterExists(string _orgId, address _address) internal view returns (bool, uint){
bool keyExists = false; bool keyExists = false;
uint voterIndex = getOrgIndexVoter(_orgId); uint orgIndex = getOrgIndex(_orgId);
uint voterIndex = getOrgIndexVoter(orgList[orgIndex].vorgId);
for (uint i = 0; i < voterList[voterIndex].orgVoterAccount.length; i++){ for (uint i = 0; i < voterList[voterIndex].orgVoterAccount.length; i++){
if(keccak256(abi.encodePacked(voterList[voterIndex].orgVoterAccount[i])) == keccak256(abi.encodePacked(_address))){ if(keccak256(abi.encodePacked(voterList[voterIndex].orgVoterAccount[i])) == keccak256(abi.encodePacked(_address))){
keyExists = true; keyExists = true;
@ -95,12 +99,14 @@ contract Clusterkeys {
// checks if the voter account is already in the voter accounts list for the org // checks if the voter account is already in the voter accounts list for the org
function checkVotingAccountExists(string _orgId) internal returns (bool) function checkVotingAccountExists(string _orgId) internal returns (bool)
{ {
if (VoterOrgIndex[keccak256(abi.encodePacked(_orgId))] == 0){
uint orgIndex = getOrgIndex(_orgId);
if (VoterOrgIndex[keccak256(abi.encodePacked(orgList[orgIndex].vorgId))] == 0){
emit NoVotingAccount(_orgId); emit NoVotingAccount(_orgId);
return false; return false;
} }
uint orgIndex = getOrgIndexVoter(_orgId); uint vorgIndex = getOrgIndexVoter(orgList[orgIndex].vorgId);
if (voterList[orgIndex].orgVoterAccount.length == 0) { if (voterList[vorgIndex].orgVoterAccount.length == 0) {
emit NoVotingAccount(_orgId); emit NoVotingAccount(_orgId);
return false; return false;
} }
@ -133,13 +139,13 @@ contract Clusterkeys {
return (keyExists, i); return (keyExists, i);
} }
// function for adding a voter account to a org // function for adding a voter account to a master org
function addVoter(string _orgId, address _address) external function addVoter(string _orgId, address _address) external
{ {
if (VoterOrgIndex[keccak256(abi.encodePacked(_orgId))] == 0) { if (VoterOrgIndex[keccak256(abi.encodePacked(_orgId))] == 0) {
orgVoterNum++; orgVoterNum++;
VoterOrgIndex[keccak256(abi.encodePacked(_orgId))] = orgVoterNum; VoterOrgIndex[keccak256(abi.encodePacked(_orgId))] = orgVoterNum;
voterList.push( OrgVoterDetails(_orgId, new address[](0))); voterList.push( OrgVoterDetails(_orgId, new address[](0), new string[](0)));
voterList[orgVoterNum - 1].orgVoterAccount.push(_address); voterList[orgVoterNum - 1].orgVoterAccount.push(_address);
emit VoterAdded(_orgId, _address); emit VoterAdded(_orgId, _address);
} }
@ -158,7 +164,7 @@ contract Clusterkeys {
} }
} }
// function for deleting a voter account to a org // function for deleting a voter account to a master org
function deleteVoter(string _orgId, address _address) external function deleteVoter(string _orgId, address _address) external
{ {
if (VoterOrgIndex[keccak256(abi.encodePacked(_orgId))] == 0) { if (VoterOrgIndex[keccak256(abi.encodePacked(_orgId))] == 0) {
@ -184,13 +190,13 @@ contract Clusterkeys {
// function for adding a private key for the org. Thsi will be added once // function for adding a private key for the org. Thsi will be added once
// approval process is complete // approval process is complete
function addOrgKey(string _orgId, string _privateKey) external function addOrgKey(string _orgId, string _morgId, string _privateKey) external
{ {
if (checkVotingAccountExists(_orgId)){ if (checkVotingAccountExists(_orgId)){
if (OrgIndex[keccak256(abi.encodePacked(_orgId))] == 0) { if (OrgIndex[keccak256(abi.encodePacked(_orgId))] == 0) {
numberOfOrgs++; numberOfOrgs++;
OrgIndex[keccak256(abi.encodePacked(_orgId))] = numberOfOrgs; OrgIndex[keccak256(abi.encodePacked(_orgId))] = numberOfOrgs;
orgList.push( OrgDetails(_orgId, new string[](0), _privateKey, Operation.Add)); orgList.push( OrgDetails(_orgId, _morgId, new string[](0), _privateKey, Operation.Add));
voterInit(_orgId); voterInit(_orgId);
emit ItemForApproval(_orgId, Operation.Add, _privateKey); emit ItemForApproval(_orgId, Operation.Add, _privateKey);
} }
@ -267,16 +273,17 @@ contract Clusterkeys {
// initialize the voter account votes to false. This will be called when a // initialize the voter account votes to false. This will be called when a
// new item is initiated for approval // new item is initiated for approval
function voterInit(string _orgId) internal { function voterInit(string _orgId) internal {
uint orgIndex = getOrgIndexVoter(_orgId); uint orgIndex = getOrgIndex(_orgId);
for (uint i = 0; i < voterList[orgIndex].orgVoterAccount.length; i++){ uint vorgIndex = getOrgIndexVoter(orgList[orgIndex].vorgId);
voteStatus[orgIndex][voterList[orgIndex].orgVoterAccount[i]] = false; for (uint i = 0; i < voterList[vorgIndex].orgVoterAccount.length; i++){
voteStatus[orgIndex][voterList[vorgIndex].orgVoterAccount[i]] = false;
} }
voteCount[orgIndex] = 0; voteCount[orgIndex] = 0;
} }
// processes the vote from the voter account. // processes the vote from the voter account.
function processVote (string _orgId) internal { function processVote (string _orgId) internal {
uint orgIndex = getOrgIndexVoter(_orgId); uint orgIndex = getOrgIndex(_orgId);
if (voteStatus[orgIndex][msg.sender] == false ){ if (voteStatus[orgIndex][msg.sender] == false ){
voteStatus[orgIndex][msg.sender] = true; voteStatus[orgIndex][msg.sender] = true;
voteCount[orgIndex]++; voteCount[orgIndex]++;
@ -286,19 +293,75 @@ contract Clusterkeys {
// checks if enough votes have been cast for the pending operation. If yes // checks if enough votes have been cast for the pending operation. If yes
// returns true // returns true
function checkEnoughVotes (string _orgId) internal view returns (bool) { function checkEnoughVotes (string _orgId) internal view returns (bool) {
uint orgIndex = getOrgIndexVoter(_orgId); uint orgIndex = getOrgIndex(_orgId);
if (voteCount[orgIndex] > voterList[orgIndex].orgVoterAccount.length / 2 ){ if (voteCount[orgIndex] > voterList[orgIndex].orgVoterAccount.length / 2 ){
return true; return true;
} }
return false; return false;
} }
function checkKeyInUse(string _orgId, string _vorgId, string _key) internal view returns (bool) {
bool keyInUse = false;
for (uint i = 0; i < orgList.length; i++){
if (keccak256(abi.encodePacked(orgList[i].orgId)) == keccak256(abi.encodePacked(_orgId))){
continue;
}
if (keccak256(abi.encodePacked(orgList[i].vorgId)) == keccak256(abi.encodePacked(_vorgId))){
for (uint j = 0; j < orgList[i].privateKey.length; j++){
if (keccak256(abi.encodePacked(orgList[i].privateKey[j])) == keccak256(abi.encodePacked(_key))){
keyInUse = true;
break;
}
}
}
if (keyInUse == true) {
return true;
}
}
return false;
}
// updates the master keys list with the key being added or deleted
function masterKeyUpdate(string _orgId, string _vorgId, string _key, Operation _op) internal {
uint vorgIndex = getOrgIndexVoter(_vorgId);
if (_op == Operation.Add) {
// check if the key is existing. if yes ignore else add to master list
bool keyExists = false;
for (uint i = 0; i < voterList[vorgIndex].privateKey.length; i++){
if(keccak256(abi.encodePacked(orgList[vorgIndex].privateKey[i])) == keccak256(abi.encodePacked(_key))){
keyExists = true;
break;
}
}
if (keyExists == false ){
voterList[vorgIndex].privateKey.push(_key);
}
}
else {
// the key can be deleted from master list only when none of the suborgs have the
// key in the private keys
if (!(checkKeyInUse(_orgId, _vorgId, _key))){
uint index;
for (index = 0; i < voterList[vorgIndex].privateKey.length; index++) {
if(keccak256(abi.encodePacked(voterList[vorgIndex].privateKey[index])) == keccak256(abi.encodePacked(_key))) {
break;
}
}
for (uint j = index; j < voterList[vorgIndex].privateKey.length -1; j++){
voterList[vorgIndex].privateKey[j] = voterList[vorgIndex].privateKey[j+1];
}
delete voterList[vorgIndex].privateKey[voterList[vorgIndex].privateKey.length -1];
voterList[vorgIndex].privateKey.length --;
}
}
}
// function to process the approavl for add or delete // function to process the approavl for add or delete
function processApproval(uint _orgIndex) internal { function processApproval(uint _orgIndex) internal {
if(checkEnoughVotes(orgList[_orgIndex].orgId)){ if(checkEnoughVotes(orgList[_orgIndex].orgId)){
string storage locKey = orgList[_orgIndex].pendingKey; string storage locKey = orgList[_orgIndex].pendingKey;
if (orgList[_orgIndex].pendingOp == Operation.Add){ if (orgList[_orgIndex].pendingOp == Operation.Add){
orgList[_orgIndex].privateKey.push(orgList[_orgIndex].pendingKey); orgList[_orgIndex].privateKey.push(orgList[_orgIndex].pendingKey);
masterKeyUpdate(orgList[_orgIndex].orgId, orgList[_orgIndex].vorgId, orgList[_orgIndex].pendingKey, Operation.Add);
emit OrgKeyAdded(orgList[_orgIndex].orgId, locKey); emit OrgKeyAdded(orgList[_orgIndex].orgId, locKey);
} }
else { else {
@ -310,6 +373,7 @@ contract Clusterkeys {
} }
delete orgList[_orgIndex].privateKey[orgList[_orgIndex].privateKey.length -1]; delete orgList[_orgIndex].privateKey[orgList[_orgIndex].privateKey.length -1];
orgList[_orgIndex].privateKey.length --; orgList[_orgIndex].privateKey.length --;
masterKeyUpdate(orgList[_orgIndex].orgId, orgList[_orgIndex].vorgId, orgList[_orgIndex].pendingKey, Operation.Delete);
emit OrgKeyDeleted(orgList[_orgIndex].orgId, locKey); emit OrgKeyDeleted(orgList[_orgIndex].orgId, locKey);
} }
orgList[_orgIndex].pendingOp = Operation.None; orgList[_orgIndex].pendingOp = Operation.None;

2
controls/cluster/abi/Clusterkeys.abi
View File

@ -1 +1 @@
[{"constant":false,"inputs":[],"name":"printAllOrg","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_orgId","type":"string"}],"name":"approvePendingOp","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_orgId","type":"string"},{"name":"_privateKey","type":"string"}],"name":"deleteOrgKey","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_orgId","type":"string"},{"name":"_address","type":"address"}],"name":"addVoter","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_orgId","type":"string"},{"name":"_address","type":"address"}],"name":"deleteVoter","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"printAllVoter","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_orgId","type":"string"},{"name":"_privateKey","type":"string"}],"name":"addOrgKey","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"},{"indexed":false,"name":"_privateKey","type":"string"}],"name":"OrgKeyAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"},{"indexed":false,"name":"_privateKey","type":"string"}],"name":"OrgKeyDeleted","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"},{"indexed":false,"name":"_voterAccount","type":"string"}],"name":"orgVoterAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_privateKey","type":"string"}],"name":"KeyNotFound","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"}],"name":"OrgNotFound","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"},{"indexed":false,"name":"_privateKey","type":"string"}],"name":"KeyExists","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"},{"indexed":false,"name":"_address","type":"address"}],"name":"VoterAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"},{"indexed":false,"name":"_address","type":"address"}],"name":"VoterExists","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"},{"indexed":false,"name":"_address","type":"address"}],"name":"VoterNotFound","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"},{"indexed":false,"name":"_address","type":"address"}],"name":"VoterAccountDeleted","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"}],"name":"NoVotingAccount","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"}],"name":"PendingApproval","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"},{"indexed":false,"name":"_pendingOp","type":"uint8"},{"indexed":false,"name":"_privateKey","type":"string"}],"name":"ItemForApproval","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"}],"name":"NothingToApprove","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"},{"indexed":false,"name":"_privateKey","type":"string"}],"name":"PrintAll","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"},{"indexed":false,"name":"_voterAccount","type":"address"}],"name":"PrintVoter","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"},{"indexed":false,"name":"_pendingOp","type":"uint8"},{"indexed":false,"name":"_pendingKey","type":"string"}],"name":"PrintKey","type":"event"}] [{"constant":false,"inputs":[],"name":"printAllOrg","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_orgId","type":"string"}],"name":"approvePendingOp","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_orgId","type":"string"},{"name":"_morgId","type":"string"},{"name":"_privateKey","type":"string"}],"name":"addOrgKey","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_orgId","type":"string"},{"name":"_privateKey","type":"string"}],"name":"deleteOrgKey","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_orgId","type":"string"},{"name":"_address","type":"address"}],"name":"addVoter","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_orgId","type":"string"},{"name":"_address","type":"address"}],"name":"deleteVoter","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[],"name":"printAllVoter","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"},{"indexed":false,"name":"_privateKey","type":"string"}],"name":"OrgKeyAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"},{"indexed":false,"name":"_privateKey","type":"string"}],"name":"OrgKeyDeleted","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_privateKey","type":"string"}],"name":"KeyNotFound","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"},{"indexed":false,"name":"_privateKey","type":"string"}],"name":"KeyExists","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"}],"name":"OrgNotFound","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"}],"name":"PendingApproval","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"},{"indexed":false,"name":"_pendingOp","type":"uint8"},{"indexed":false,"name":"_privateKey","type":"string"}],"name":"ItemForApproval","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"}],"name":"NothingToApprove","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"}],"name":"NoVotingAccount","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"},{"indexed":false,"name":"_address","type":"address"}],"name":"VoterAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"},{"indexed":false,"name":"_address","type":"address"}],"name":"VoterNotFound","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"},{"indexed":false,"name":"_address","type":"address"}],"name":"VoterAccountDeleted","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"},{"indexed":false,"name":"_address","type":"address"}],"name":"VoterExists","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"},{"indexed":false,"name":"_privateKey","type":"string"}],"name":"PrintAll","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_orgId","type":"string"},{"indexed":false,"name":"_voterAccount","type":"address"}],"name":"PrintVoter","type":"event"}]

1
controls/cluster/abi/Clusterkeys.bin-runtime Normal file
View File

File diff suppressed because one or more lines are too long