poquito requests

PENDING.md

@@ -6,3 +6,4 @@
 
 - [\#2301](https://github.com/cosmos/voyager/issues/2301) throttle requests for keybase identities @faboweb
 - [\#2272](https://github.com/cosmos/voyager/issues/2272) fixed showing uatoms instead of atoms @faboweb
+- [\#2289](https://github.com/cosmos/voyager/pull/2289) reduced amount of requests to full node @fedekunze

app/src/renderer/components/common/TmBalance.vue

@@ -53,6 +53,7 @@ export default {
  `connected`,
  `session`,
  `liquidAtoms`,
+ `lastHeader`,
  `totalAtoms`,
  `bondDenom`,
  `distribution`
@@ -67,6 +68,18 @@ export default {
  )
  }
  },
+ watch: {
+ lastHeader: {
+ immediate: true,
+ handler(newHeader) {
+ const waitTenBlocks = Number(newHeader.height) % 10 === 0
+ if (this.session.signedIn && waitTenBlocks) {
+ this.$store.dispatch(`getTotalRewards`)
+ this.$store.dispatch(`queryWalletBalances`)
+ }
+ }
+ }
+ },
  methods: {
  onWithdrawal() {
  this.$refs.modalWithdrawAllRewards.open()

app/src/renderer/components/staking/ModalWithdrawAllRewards.vue

@@ -41,12 +41,26 @@ export default {
  num
  }),
  computed: {
- ...mapGetters([`bondDenom`, `distribution`]),
+ ...mapGetters([`bondDenom`, `distribution`, `lastHeader`, `session`]),
  totalRewards({ bondDenom, distribution } = this) {
  const rewards = distribution.totalRewards[bondDenom]
  return (rewards && atoms(rewards)) || 0
  }
  },
+ watch: {
+ lastHeader: {
+ immediate: true,
+ handler() {
+ if (
+ this.session.signedIn &&
+ this.$refs.actionModal &&
+ this.$refs.actionModal.show
+ ) {
+ this.$store.dispatch(`getTotalRewards`)
+ }
+ }
+ }
+ },
  methods: {
  open() {
  this.$refs.actionModal.open()

app/src/renderer/components/staking/PageValidator.vue

@@ -173,7 +173,6 @@
 </template>
 
 <script>
-import BigNumber from "bignumber.js"
 import moment from "moment"
 import { calculateTokens } from "scripts/common"
 import { mapGetters } from "vuex"
@@ -207,6 +206,7 @@ export default {
  `lastHeader`,
  `bondDenom`,
  `delegates`,
+ `delegation`,
  `distribution`,
  `committedDelegations`,
  `keybase`,
@@ -238,12 +238,11 @@ export default {
  return String(uptime).substring(0, 4) + `%`
  },
  myBond() {
- return BigNumber(
- atoms(
- calculateTokens(
- this.validator,
- this.committedDelegations[this.validator.operator_address] || 0
- )
+ if (!this.validator) return 0
+ return atoms(
+ calculateTokens(
+ this.validator,
+ this.committedDelegations[this.validator.operator_address] || 0
  )
  )
  },
@@ -307,6 +306,16 @@ export default {
  }
  },
  watch: {
+ myBond: {
+ handler(myBond) {
+ if (myBond > 0) {
+ this.$store.dispatch(
+ `getRewardsFromValidator`,
+ this.$route.params.validator
+ )
+ }
+ }
+ },
  validator: {
  immediate: true,
  handler(validator) {
@@ -316,8 +325,15 @@ export default {
  },
  lastHeader: {
  immediate: true,
- handler() {
- if (this.session.signedIn) {
+ handler(newHeader) {
+ const waitTwentyBlocks = Number(newHeader.height) % 20 === 0
+ if (
+ this.session.signedIn &&
+ waitTwentyBlocks &&
+ this.$route.name === `validator` &&
+ this.delegation.loaded &&
+ Number(this.myBond) > 0
+ ) {
  this.$store.dispatch(
  `getRewardsFromValidator`,
  this.$route.params.validator
@@ -326,14 +342,6 @@ export default {
  }
  }
  },
- mounted() {
- if (this.session.signedIn) {
- this.$store.dispatch(
- `getRewardsFromValidator`,
- this.$route.params.validator
- )
- }
- },
  methods: {
  onDelegation() {
  this.$refs.delegationModal.open()

app/src/renderer/components/staking/TabMyDelegations.vue

@@ -85,11 +85,21 @@ export default {
  `committedDelegations`,
  `bondDenom`,
  `connected`,
- `session`
+ `session`,
+ `lastHeader`
  ]),
- yourValidators({ committedDelegations, delegates: { delegates } } = this) {
- return delegates.filter(
- ({ operator_address }) => operator_address in committedDelegations
+ yourValidators(
+ {
+ committedDelegations,
+ delegates: { delegates },
+ session: { signedIn }
+ } = this
+ ) {
+ return (
+ signedIn &&
+ delegates.filter(
+ ({ operator_address }) => operator_address in committedDelegations
+ )
  )
  },
  unbondingTransactions: ({ transactions, delegation } = this) =>
@@ -119,6 +129,22 @@ export default {
  watch: {
  "session.signedIn": function() {
  this.loadStakingTxs()
+ },
+ lastHeader: {
+ immediate: true,
+ handler(newHeader) {
+ const waitTwentyBlocks = Number(newHeader.height) % 20 === 0
+ if (
+ waitTwentyBlocks &&
+ this.yourValidators &&
+ this.yourValidators.length > 0
+ ) {
+ this.$store.dispatch(
+ `getRewardsFromAllValidators`,
+ this.yourValidators
+ )
+ }
+ }
  }
  },
  async mounted() {

app/src/renderer/components/staking/TabValidators.vue

@@ -25,15 +25,54 @@ export default {
  TmDataConnecting
  },
  computed: {
- ...mapGetters([`delegates`, `connected`, `session`])
+ ...mapGetters([
+ `lastHeader`,
+ `delegates`,
+ `committedDelegations`,
+ `connected`,
+ `session`
+ ]),
+ yourValidators(
+ {
+ committedDelegations,
+ delegates: { delegates },
+ session: { signedIn }
+ } = this
+ ) {
+ return (
+ signedIn &&
+ delegates.filter(
+ ({ operator_address }) => operator_address in committedDelegations
+ )
+ )
+ }
  },
  watch: {
  "session.signedIn": function(signedIn) {
  signedIn && this.$store.dispatch(`updateDelegates`)
+ },
+ lastHeader: {
+ immediate: true,
+ handler(newHeader) {
+ const waitTwentyBlocks = Number(newHeader.height) % 20 === 0
+ if (
+ waitTwentyBlocks &&
+ this.yourValidators &&
+ this.yourValidators.length > 0
+ ) {
+ this.$store.dispatch(
+ `getRewardsFromAllValidators`,
+ this.yourValidators
+ )
+ }
+ }
  }
  },
  mounted() {
  this.$store.dispatch(`updateDelegates`)
+ if (this.yourValidators) {
+ this.$store.dispatch(`getRewardsFromAllValidators`, this.yourValidators)
+ }
  }
 }
 </script>

app/src/renderer/components/staking/TableValidators.vue

@@ -139,13 +139,6 @@ export default {
  watch: {
  address: function() {
  this.session.address && this.$store.dispatch(`updateDelegates`)
- },
- validators: function(validators) {
- if (!validators || validators.length === 0 || !this.session.signedIn) {
- return
- }
-
- this.$store.dispatch(`getRewardsFromAllValidators`, this.yourValidators)
  }
  },
  mounted() {

app/src/renderer/components/wallet/PageTransactions.vue

@@ -62,8 +62,7 @@ export default {
  `session`,
  `bondDenom`,
  `delegation`,
- `delegates`,
- `lastHeader`
+ `delegates`
  ]),
  orderedTransactions() {
  return orderBy(
@@ -79,14 +78,6 @@ export default {
  return this.orderedTransactions.length === 0
  }
  },
- watch: {
- lastHeader: {
- immediate: true,
- handler() {
- this.refreshTransactions()
- }
- }
- },
  mounted() {
  this.refreshTransactions()
  },

app/src/renderer/components/wallet/PageWallet.vue

@@ -65,16 +65,6 @@ export default {
  )
  }
  },
- watch: {
- lastHeader: {
- immediate: true,
- handler() {
- if (this.session.signedIn) {
- this.queryWalletBalances()
- }
- }
- }
- },
  async mounted() {
  this.updateDelegates()
  await this.queryWalletBalances()

app/src/renderer/vuex/modules/connection.js

@@ -4,7 +4,7 @@ import config from "../../../config"
 
 const NODE_HALTED_TIMEOUT = config.node_halted_timeout
 
-export default function({ node }) {
+export default function ({ node }) {
  // get tendermint RPC client from basecoin client
 
  const state = {
@@ -98,10 +98,6 @@ export default function({ node }) {
  },
  ({ header }) => {
  dispatch(`setLastHeader`, header)
-
- if (rootState.session.signedIn) {
- dispatch(`getTotalRewards`)
- }
  }
  )
  if (rootState.session.signedIn) {

app/src/renderer/vuex/modules/delegation.js

@@ -42,7 +42,7 @@ export default ({ node }) => {
  setUnbondingDelegations(state, unbondingDelegations) {
  state.unbondingDelegations = unbondingDelegations
  ? unbondingDelegations
- // building a dict from the array and taking out the validators with no undelegations
+  // building a dict from the array and taking out the validators with no undelegations
  .reduce(
  (dict, { validator_address, entries }) => ({
  ...dict,
@@ -137,7 +137,7 @@ export default ({ node }) => {
  async updateDelegates({ dispatch, rootState }) {
  const candidates = await dispatch(`getDelegates`)
 
- if(rootState.session.signedIn) {
+ if (rootState.session.signedIn) {
  dispatch(`getBondedDelegates`, candidates)
  }
  },
@@ -178,6 +178,7 @@ export default ({ node }) => {
  value: state.committedDelegates[validator_address] + Number(amount)
  })
 
+ await dispatch(`getAllTxs`)
  // load delegates after delegation to get new atom distribution on validators
  dispatch(`updateDelegates`)
  },
@@ -201,6 +202,7 @@ export default ({ node }) => {
  password,
  submitType
  })
+ await dispatch(`getAllTxs`)
  },
  async submitRedelegation(
  {
@@ -223,6 +225,8 @@ export default ({ node }) => {
  password,
  submitType
  })
+
+ await dispatch(`getAllTxs`)
  }
  }
 

app/src/renderer/vuex/modules/distribution.js

@@ -97,6 +97,7 @@ export default ({ node }) => {
  })
  await dispatch(`getTotalRewards`)
  await dispatch(`queryWalletBalances`)
+ await dispatch(`getAllTxs`)
  },
  async getRewardsFromAllValidators({ state, dispatch }, validators) {
  state.loading = true

app/src/renderer/vuex/modules/governance/deposits.js

@@ -61,6 +61,7 @@ export default ({ node }) => {
 
  await dispatch(`getProposalDeposits`, proposal_id)
  await dispatch(`getProposal`, proposal_id)
+ await dispatch(`getAllTxs`)
  }
  }
  return {