Skip to content
This repository has been archived by the owner on Dec 1, 2021. It is now read-only.

Fixed delegators voting power display on gov proposals #521

Merged
merged 5 commits into from
May 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

## [UNRELEASED]
* [#488] Updated missing proposer address in proposals.
* [#486] Fixed delegators voting power display on gov proposals
* [#493] Fixed validators address showing as undefined in links.

## v0.41.x-13
* [#484] Replaced delegation list displayed under validator page with total number of delegations.
* [#509] Added display list of addresses available for user to login with when connecting the Ledger.
Expand Down
25 changes: 11 additions & 14 deletions imports/api/proposals/server/methods.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ Meteor.methods({
}
bulkProposals.find({proposalId: proposal.proposalId}).upsert().updateOne({$set:proposal});
}
catch(e){
bulkProposals.find({proposalId: proposal.proposalId}).upsert().updateOne({$set:proposal});
// console.log(url);
// console.log(e.response.content);
catch (e) {
bulkProposals.find({proposalId:proposal.proposalId}).upsert().updateOne({ $set: proposal});
console.log(url);
console.log(e.response.content);
}
}
}
Expand Down Expand Up @@ -136,31 +136,28 @@ const getVoteDetail = (votes) => {
try{
let response = HTTP.get(url);
if (response.statusCode == 200){
delegations = JSON.parse(response.content).delegations_response;
delegations = JSON.parse(response.content).delegation_responses;
if (delegations && delegations.length > 0) {
delegations.forEach((delegation) => {
let shares = parseFloat(delegation.delegation.shares);
if (validatorAddressMap[delegation.delegation.validator_address]) {
// deduct delegated shareds from validator if a delegator votes
let validator = votingPowerMap[validatorAddressMap[delegation.validator_address]];
let validator = votingPowerMap[validatorAddressMap[delegation.delegation.validator_address]];
validator.deductedShares -= shares;
if (validator.delegatorShares != 0){ // avoiding division by zero
votingPower += (shares/validator.delegatorShares) * validator.tokens;
if (parseFloat(validator.delegatorShares) != 0){ // avoiding division by zero
votingPower += (shares / parseFloat(validator.delegatorShares)) * parseFloat(validator.tokens);
}

} else {
let validator = Validators.findOne({operatorAddress: delegation.validator_address});
if (validator && validator.delegatorShares != 0){ // avoiding division by zero
votingPower += (shares/parseFloat(validator.delegatorShares)) * parseFloat(validator.tokens);
}
votingPower += shares
}
});
}
}
}
catch (e){
console.log(url);
console.log(e.response.content);
console.log(e);
}
votingPowerMap[voter] = {votingPower: votingPower};
}
Expand All @@ -170,7 +167,7 @@ const getVoteDetail = (votes) => {
let votingPower = voter.votingPower;
if (votingPower == undefined) {
// voter is a validator
votingPower = voter.delegatorShares?((voter.deductedShares/voter.delegatorShares) * voter.tokens):0;
votingPower = voter.delegatorShares?((parseFloat(voter.deductedShares) / parseFloat(voter.delegatorShares)) * parseFloat(voter.tokens)):0;
}
return {...vote, votingPower};
});
Expand Down
2 changes: 1 addition & 1 deletion imports/ui/proposals/Proposal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ export default class Proposal extends Component{
</Col>
<Col className="voting-power-percent data" md={3}>
<i className="material-icons d-md-none">equalizer</i>
{(vote.votingPower!==undefined)?numbro(vote.votingPower/this.state.totalVotes).format('0,0.00%'):""}
{(vote.votingPower!==undefined)?numbro(vote.votingPower/this.state.totalVotes).format('0,0.000000%'):""}
</Col>
</Row></Card>
)}
Expand Down