Skip to content

[forbole] upgrade 39.2 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Mar 19, 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
14 changes: 0 additions & 14 deletions .github/PULL_REQUEST_TEMPLATE/pull_request_template.md

This file was deleted.

1 change: 1 addition & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ Fixes #
## Checklist
- [ ] Targeted PR against correct branch.
- [ ] Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
- [ ] Run `meteor npm run lint`
- [ ] Added an entry to the `CHANGELOG.md` file.
- [ ] Re-reviewed `Files changed` in the Github PR explorer.
2 changes: 1 addition & 1 deletion .meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ [email protected]
[email protected]
meteortesting:[email protected]
meteortesting:[email protected]
meteortesting:mocha-core@7.2.0
meteortesting:mocha-core@7.0.1
[email protected]
[email protected]
[email protected]
Expand Down
29 changes: 20 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,31 @@
# Changelog

* Sif gold color style client/styles
* server/methods.js fix for missing Sif (monkey-bars) genesis values
* testnet-settings
## v0.39.x-2

## [Unreleased]
* [392] Fixed account page not rendering when the account is empty
* [413] Fixed validator page error after logging in with Ledger

* Bump Meteor to v1.10.2 and update some dependency pcakges with security issues
## v0.39.x-1

* [#425] Fixed `commission_rates` might not exists in `validator.commission` object

## v0.39.x

* [#420] Update brand font
* [#418] Fix avatar at delegation pane
* [#404] Replace "casted" with "cast"
* [#421] Fix NaN on account delegation pane
* [#417] Fix NaN on account total value
* [#416] Add version number to UI
* Bump Meteor to v1.11.1 and update some dependency pcakges with security issues
* Dockerize big-dipper
* [#306] Display errors with SDK v0.38 format
* [#301] Using Jazzicon as avatar if no Keybase avatar exists
* [#297] Prettify unrecognized JSON messages
* [#294] Fixed cloneDeep typo in Account section for case-sensitve filesystems.
* [#284] Support Tendermint v0.33 block format
* [#346] Changed "Governanza" typo to "Gobernanza" in Spanish Translation
* [#375] Fixed the Commission Value Calculations that caused Account Page to break
* [#346] Changed "Governanza" typo to "Gobernanza" in Spanish Translation
* [#375] Fixed the Commission Value Calculations that caused Account Page to break
* [#372] Fixed Redelegation List showing on all account pages

## v0.37.x-patch-11
Expand All @@ -27,7 +38,7 @@
* Added Russian transation
* Fixed Unjail message with a correct account address.
* [#323] Display rewards amount in activities list.
* [#327] Fixed error in Proposals section to accept String and Number as a value in Changes table
* [#327] Fixed error in Proposals section to accept String and Number as a value in Changes table
* Hide Italian it-IT Translation
* Fixed hash overflow on mobile in Transaction Section (Added scroller)

Expand Down Expand Up @@ -76,6 +87,6 @@
* [#239] Fixed Coin untilty. Now it shows coins from the chain matching with the `settings.json` if configuration exist. Please note there is a new `coins` object in the [`settings.json`](https://github.com/forbole/big_dipper/blob/master/default_settings.json#L17) to define the display parameters of each coin
* [#238] Styled the tooltip not to block the validator info
* [#230] Removed the delegation shares in account's delegation panel
* [#229] Fixed the account address display
* [#229] Fixed the account address display
* [#228] Added rewards column to account's delegation panel
* Added memo button in each transaction
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM geoffreybooth/meteor-base:1.10.2
FROM geoffreybooth/meteor-base:1.11.1

COPY package*.json $APP_SOURCE_FOLDER/

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ Block Explorer for Cosmos

## Projects running on mainnets

[Explorer Akash with Big Dipper](https://akash.bigdipper.live/)
[Explore Akash with Big Dipper](https://akash.bigdipper.live/)

[Explore Band Protocol with Big Dipper](http://band.bigdipper.live/)
[Explore Band Protocol with Big Dipper](https://band.bigdipper.live/)

[Explore Cosmos Hub with Big Dipper](https://cosmos.bigdipper.live)

Expand Down Expand Up @@ -42,7 +42,7 @@ Block Explorer for Cosmos

### Requirements

* [Meteor v1.10.x](https://www.meteor.com/install)
* [Meteor v1.11.x](https://www.meteor.com/install)

### Run in local

Expand All @@ -68,7 +68,7 @@ You will need to have [MongoDB >= 4.x](https://docs.mongodb.com/manual/administr

### Docker builds

big-dipper docker image is a multi stage build that is based on [disney/meteor-base](https://github.com/disney/meteor-base/). When you change the meteor or node version, change the lines `FROM geoffreybooth/meteor-base:1.10.2` and `FROM node:12.16.1-alpine` respectively. When running the image follow the same [environment variable principles](https://guide.meteor.com/deployment.html#environment) mentioned above. If you get an `non-zero exit (137)` error during the build phase, increase docker container memory and swap limit. Ideally you can set up [remote docker host](https://www.digitalocean.com/community/tutorials/how-to-provision-and-manage-remote-docker-hosts-with-docker-machine-on-ubuntu-18-04) to prevent your computer's fan going brrrrrr.
big-dipper docker image is a multi stage build that is based on [disney/meteor-base](https://github.com/disney/meteor-base/). When you change the meteor or node version, change the lines `FROM geoffreybooth/meteor-base:1.11.1` and `FROM node:12.16.1-alpine` respectively. When running the image follow the same [environment variable principles](https://guide.meteor.com/deployment.html#environment) mentioned above. If you get an `non-zero exit (137)` error during the build phase, increase docker container memory and swap limit. Ideally you can set up [remote docker host](https://www.digitalocean.com/community/tutorials/how-to-provision-and-manage-remote-docker-hosts-with-docker-machine-on-ubuntu-18-04) to prevent your computer's fan going brrrrrr.

---
## Donations :pray:
Expand Down
4 changes: 2 additions & 2 deletions both/document.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<head>
<meta charset="utf-8" />
<title>The Big Dipper | Cosmos Block Explorer by Forbole</title>
<title>Big Dipper | Block Explorer by Forbole</title>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
<link href="https://fonts.googleapis.com/css?family=Inconsolata" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Inconsolata&Red+Hat+Display:wght@500&display=swap" rel="stylesheet">
<link rel="shortcut icon" type="image/png" href="/img/big-dipper.png"/>
<link rel="apple-touch-icon" sizes="180x180" href="/img/big-dipper.png">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
Expand Down
6 changes: 3 additions & 3 deletions both/i18n/en-us.i18n.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ common:
retry: 'Retry'
rewards: 'Rewards'
navbar:
siteName: 'The Big Dipper'
version: 'beta'
siteName: 'BIG DIPPER'
version: '-'
validators: 'Validators'
blocks: 'Blocks'
transactions: 'Transactions'
Expand Down Expand Up @@ -171,7 +171,7 @@ proposals:
percentageVoted: '<span class="text-info">{$percent}</span> of online voting power has been voted.'
validMessage: 'This proposal is {$tentative}<strong>valid</strong>.'
invalidMessage: 'Less than {$quorum} of voting power is voted. This proposal is <strong>invalid</strong>.'
moreVoteMessage: 'It will be a valid proposal once <span class="text-info">{$moreVotes}</span> more votes are casted.'
moreVoteMessage: 'It will be a valid proposal once <span class="text-info">{$moreVotes}</span> more votes are cast.'
key: 'Key'
value: 'Value'
amount: 'Amount'
Expand Down
3 changes: 1 addition & 2 deletions both/i18n/es-es.i18n.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ common:
cancel: 'Cancelar'
retry: 'Reintentar'
navbar:
siteName: 'The Big Dipper'
version: 'beta'
siteName: 'BIG DIPPER'
validators: 'Validadores'
blocks: 'Bloques'
transactions: 'Transacciones'
Expand Down
3 changes: 1 addition & 2 deletions both/i18n/it-IT.i18n.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ common:
retry: 'Riprova'
rewards: 'Reward'
navbar:
siteName: 'The Big Dipper'
version: 'beta'
siteName: 'BIG DIPPER'
validators: 'Validatori'
blocks: 'Blocchi'
transactions: 'Transazioni'
Expand Down
1 change: 0 additions & 1 deletion both/i18n/pl-PL.i18n.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ common:
rewards: 'Nagrody'
navbar:
siteName: 'Wielki Wóz'
version: 'beta'
validators: 'Walidatorzy'
blocks: 'Bloki'
transactions: 'Transakcje'
Expand Down
3 changes: 1 addition & 2 deletions both/i18n/pt-BR.i18n.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ common:
retry: 'Tentar novamente'
rewards: 'Recompensas'
navbar:
siteName: 'The Big Dipper'
version: 'beta'
siteName: 'BIG DIPPER'
validators: 'Validadores'
blocks: 'Blocos'
transactions: 'Transações'
Expand Down
3 changes: 1 addition & 2 deletions both/i18n/ru-RU.i18n.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ common:
retry: 'Повторить попытку'
rewards: 'награды'
navbar:
siteName: 'The Big Dipper'
version: 'бета'
siteName: 'BIG DIPPER'
validators: 'валидаторы'
blocks: 'блоки'
transactions: 'транзакции'
Expand Down
1 change: 0 additions & 1 deletion both/i18n/zh-hans.i18n.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ common:
retry: '重试'
navbar:
siteName: '北斗'
version: 'beta'
validators: '验证人'
blocks: '区块'
transactions: '交易'
Expand Down
1 change: 0 additions & 1 deletion both/i18n/zh-hant.i18n.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ common:
retry: '重試'
navbar:
siteName: '北斗'
version: 'beta'
validators: '驗證人'
blocks: '區塊'
transactions: '交易'
Expand Down
2 changes: 1 addition & 1 deletion both/utils/coins.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const coinList = Meteor.settings.public.coins;
for (let i in coinList) {
const coin = coinList[i];
if (!coin.displayNamePlural) {
coin.displayNamePlural = coin.displayName + 's';
coin.displayNamePlural = coin.displayName;
}
}

Expand Down
25 changes: 13 additions & 12 deletions client/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,18 @@ body {
}
}

.ledger-sign-in .error-message, .ledger-modal .error-message {
color: red;
}

#header {
.sign-in-btn {
margin-top: 5px;
}

a.navbar-brand span {
font-family: 'Red Hat Display', sans-serif;
}
.dropdown-header img {
height: 2em;
margin-right: 0.25em;
Expand All @@ -97,17 +108,7 @@ body {
.sign-in-btn {
color: rgba(255, 255, 255, 0.75);
}
}

.ledger-sign-in .error-message, .ledger-modal .error-message {
color: red;
}

#header {
.sign-in-btn {
margin-top: 5px;
}


#user-acconut-icon {
a {
position: relative;
Expand Down Expand Up @@ -344,7 +345,7 @@ body {
}

.progress {
height: inherit !important;
height: 1.5rem !important;
font-size: inherit !important;
border: 1px solid #ddd !important;
}
Expand Down
1 change: 0 additions & 1 deletion imports/api/accounts/server/methods.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ const fetchFromUrl = (url) => {
};
}
catch (e){
console.log(res);
console.log(e);
}
}
Expand Down
4 changes: 2 additions & 2 deletions imports/api/blocks/server/methods.js
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ Meteor.methods({
console.log('Checking all validators against db...')
let dbValidators = {}
Validators.find({}, {fields: {consensus_pubkey: 1, status: 1}}
).forEach((v) => dbValidators[v.consensus_pubkey] = v.status)
).forEach((v) => dbValidators[v.consensus_pubkey] = v.status)
Object.keys(validatorSet).forEach((conPubKey) => {
let validatorData = validatorSet[conPubKey];
// Active validators should have been updated in previous steps
Expand Down Expand Up @@ -555,7 +555,7 @@ Meteor.methods({
let profileUrl = getValidatorProfileUrl(validator.description.identity)
if (profileUrl) {
bulkValidators.find({address: validator.address}
).upsert().updateOne({$set:{'profile_url':profileUrl}});
).upsert().updateOne({$set:{'profile_url':profileUrl}});
}
} catch (e) {
console.log(profileUrl);
Expand Down
4 changes: 4 additions & 0 deletions imports/startup/server/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,9 @@ Meteor.methods({
let page = cheerio.load(teamPage.content);
return page(".kb-main-card img").attr('src');
}
},
getVersion: function(){
const version = Assets.getText('version');
return version ? version : 'beta'
}
})
Loading