poanetwork
/
poa-dapps-voting
mirror of https://github.com/poanetwork/poa-dapps-voting.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

(Fix) Light optimization #2

This commit is contained in:
Vadim Arasev 2018-06-14 12:06:22 +03:00
parent b07af3dba9
commit d9514c84e2
3 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/components/BallotKeysCard.jsx
View File

@ -50,16 +50,11 @@ export class BallotKeysCard extends React.Component {
this.miningKey = votingState.miningKey;
if (this.miningKey && this.miningKey !== '0x0000000000000000000000000000000000000000') {
let metadata;
try {
metadata = await contractsStore.getValidatorMetadata(this.miningKey);
} catch(e) {
console.log(e.message);
}
if (metadata) {
this.miningKey = `${metadata.lastName} ${this.miningKey}`;
} else {
this.miningKey = `${this.miningKey}`;
for (let i = 0; i < contractsStore.validatorsMetadata.length; i++) {
if (contractsStore.validatorsMetadata[i].value.toLowerCase() === this.miningKey.toLowerCase()) {
this.miningKey = contractsStore.validatorsMetadata[i].labelInvers;
break;
}
}
}
} else {
@ -140,22 +135,19 @@ export class BallotKeysCard extends React.Component {
@action("Get mining key of keys ballot")
getMiningKey = async () => {
const { contractsStore, id } = this.props;
let miningKey, metadata;
let miningKey;
try {
miningKey = await contractsStore.votingToChangeKeys.getMiningKey(id);
} catch(e) {
console.log(e.message);
}
if (miningKey && miningKey !== '0x0000000000000000000000000000000000000000') {
try {
metadata = await contractsStore.getValidatorMetadata(miningKey);
} catch(e) {
console.log(e.message);
}
if (metadata) {
this.miningKey = `${metadata.lastName} ${miningKey}`;
} else {
this.miningKey = `${miningKey}`;
this.miningKey = miningKey;
for (let i = 0; i < contractsStore.validatorsMetadata.length; i++) {
if (contractsStore.validatorsMetadata[i].value.toLowerCase() === this.miningKey.toLowerCase()) {
this.miningKey = contractsStore.validatorsMetadata[i].labelInvers;
break;
}
}
}
}

6
src/index.js
View File

@ -59,14 +59,14 @@ class AppMainRouter extends Component {
await contractsStore.setMiningKey(web3Config);
await contractsStore.setVotingKey(web3Config);
await contractsStore.getAllValidatorMetadata();
await contractsStore.getAllBallots();
contractsStore.getValidatorsLength();
contractsStore.getKeysBallotThreshold();
contractsStore.getMinThresholdBallotThreshold();
contractsStore.getProxyBallotThreshold();
contractsStore.getValidatorActiveBallots();
contractsStore.getAllValidatorMetadata();
contractsStore.getBallotsLimits();
console.log("votingKey", contractsStore.votingKey);
console.log("miningKey", contractsStore.miningKey);
commonStore.hideLoading();

13
src/stores/ContractsStore.js
View File

@ -229,7 +229,7 @@ class ContractsStore {
}
@action
async getValidatorActiveBallots() {
async getBallotsLimits() {
if(this.web3Instance && this.netId){
let setVotingToChangeKeys = this.setVotingToChangeKeys({web3Instance: this.web3Instance, netId: this.netId})
let setVotingToChangeMinThreshold = this.setVotingToChangeMinThreshold({web3Instance: this.web3Instance, netId: this.netId})
@ -254,15 +254,16 @@ class ContractsStore {
async getAllValidatorMetadata() {
this.validatorsMetadata.push(constants.NEW_MINING_KEY);
const keys = await this.poaConsensus.getValidators();
this.validatorsLength = keys.length;
keys.forEach(async (key) => {
const metadata = await this.validatorMetadata.getValidatorData({miningKey: key})
this.validatorsMetadata.push({label: `${key} ${metadata.lastName}`, value: key})
this.validatorsMetadata.push({
label: `${key} ${metadata.lastName}`,
labelInvers: `${metadata.lastName} ${key}`,
value: key
})
})
}
@action
async getValidatorMetadata(miningKey) {
return await this.validatorMetadata.getValidatorData({miningKey})
}
}
const contractsStore = new ContractsStore();