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

Commit

Permalink
Kwun/v0.39.x 7 (#455)
Browse files Browse the repository at this point in the history
* update npm packages

* add transaction interval to default settings

* fix a bug that VP chart is not showing

* update changelog

* update version
  • Loading branch information
kwunyeung authored Jan 20, 2021
1 parent cab0969 commit 603bd84
Show file tree
Hide file tree
Showing 6 changed files with 57 additions and 83 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## v0.39.x-7

* [#452] Fix VP Chart not being shown

## v0.39.x-6

* Index transactions with timer settings
Expand Down
1 change: 1 addition & 0 deletions default_settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"defaultBlockTime": 5000,
"validatorUpdateWindow": 300,
"blockInterval": 15000,
"transactionsInterval": 18000,
"keybaseFetchingInterval": 18000000,
"consensusInterval": 1000,
"statusInterval":7500,
Expand Down
4 changes: 4 additions & 0 deletions imports/api/blocks/server/methods.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ calculateVPDist = async (analyticsData, blockData) => {
}
}

// console.log(topTwentyPower)
// console.log(bottomEightyPower)

bottomSixtySixPercent = 1 - topThirtyFourPercent;
numBottomSixtySix = activeValidators.length - numTopThirtyFour;

Expand Down Expand Up @@ -390,6 +393,7 @@ Meteor.methods({
let valData = validatorSet[v];
let valExist = Validators.findOne({consensus_pubkey:v});

analyticsData.voting_power += valData.voting_power

if (!valExist && valData.consensus_pubkey){

Expand Down
121 changes: 43 additions & 78 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@types/meteor-universe-i18n": "^1.14.5",
"babel-polyfill": "^6.26.0",
"bech32": "^1.1.4",
"bootstrap": "^4.5.3",
"bootstrap": "^4.6.0",
"bootswatch": "^4.5.3",
"chart.js": "^2.9.4",
"cheerio": "^1.0.0-rc.5",
Expand All @@ -39,14 +39,14 @@
"react-google-tag-manager": "^2.2.1",
"react-helmet": "^5.2.1",
"react-jazzicon": "^0.1.3",
"react-json-view": "^1.19.1",
"react-json-view": "^1.20.2",
"react-pose": "^4.0.10",
"react-router-dom": "^4.3.1",
"react-showdown": "^1.6.0",
"react-sidebar": "^3.0.2",
"react-toastify": "^4.5.2",
"reactstrap": "^8.8.1",
"rollup": "^2.36.0",
"reactstrap": "^8.9.0",
"rollup": "^2.37.1",
"secp256k1": "^3.8.0",
"styled-components": "^4.4.1",
"tendermint": "^4.0.8",
Expand Down
2 changes: 1 addition & 1 deletion private/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.39.x-5
v0.39.x-7

0 comments on commit 603bd84

Please sign in to comment.