Staking fixes

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Added
+
+* Indicate if a validator has been revoked in the Staking UI @mappum
+
 ### Changed
 
 * Copy the network configuration only during local builds. @NodeGuy

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

@@ -70,7 +70,11 @@ export default {
       return this.user.atoms > 0
     },
     delegateType() {
-      return this.delegate.isValidator ? "Validator" : "Candidate"
+      return this.delegate.revoked
+        ? "Revoked"
+        : this.delegate.isValidator
+          ? "Validator"
+          : "Candidate"
     }
   },
   data: () => ({ num: num }),

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

@@ -35,10 +35,14 @@ tm-page.page-bond(:title="`Bond ${denom}`")
       :class="bondGroupClass(delta(d.atoms, d.oldAtoms))")
       .bond-group__fields
         .bond-bar
-          label.bond-bar__label {{ d.delegate.moniker }}
+          label.bond-bar__label(v-if="!d.delegate.revoked") {{ d.delegate.moniker }}
+          label.bond-bar__label.revoked(v-if="d.delegate.revoked") {{ d.delegate.moniker }}
+          label.bond-bar__revoked(v-if="d.delegate.revoked") REVOKED
           .bond-bar__input
             .bond-bar-old__outer
-              .bond-bar-old__inner(:style="styleBondBarInner(d.oldAtoms)")
+              .bond-bar-old__inner(
+                :style="styleBondBarInner(d.oldAtoms)"
+                v-if="d.oldAtoms > 0")
             .bond-bar__outer
               .bond-bar__inner.bond-bar__inner--editable(:id="'delegate-' + d.id"
                 :style="styleBondBarInner(d.atoms)")
@@ -57,9 +61,9 @@ tm-page.page-bond(:title="`Bond ${denom}`")
             placeholder="Atoms"
             step="1"
             min="0"
-            :max="$v.fields.delegates.$each[index].atoms.$params.between.max"
+            :max=newUnbondedAtoms
             v-model.number="d.atoms"
-            @change.native="limitMax(d, $event)")
+            @change.native="limitMax(d, parseInt($event.target.max))")
 
       tm-form-msg(name="Atoms" type="required"
         v-if="!$v.fields.delegates.$each[index].atoms.required")
@@ -99,6 +103,7 @@ tm-page.page-bond(:title="`Bond ${denom}`")
 
     tm-form-group(field-id="bond-confirm" field-label=''
       :error='$v.fields.bondConfirm.$error')
+      tm-form-msg(v-if="showsRevokedValidators") A revoked validator is not validating and therefor is not producing rewards. The revoked state may be temporary.
       .tm-field-checkbox
         .tm-field-checkbox-input
           input#bond-confirm(type="checkbox" v-model="fields.bondConfirm")
@@ -188,6 +193,9 @@ export default {
     },
     unbondedAtomsDeltaPct() {
       return this.percent(this.unbondedAtomsDelta, this.totalAtoms)
+    },
+    showsRevokedValidators() {
+      return !!this.fields.delegates.find(d => d.delegate.revoked)
     }
   },
   data: () => ({
@@ -320,16 +328,14 @@ export default {
     },
     updateDelegateAtoms(delegateId, rawAtoms) {
       let d = this.fields.delegates.find(d => d.id === delegateId)
-      if (d) {
-        d.bondedRatio = rawAtoms / this.totalAtoms
-        d.atoms = Math.round(rawAtoms)
-        d.deltaAtoms = this.delta(rawAtoms, d.oldAtoms, "int")
-        d.deltaAtomsPercent = this.percent(
-          this.delta(rawAtoms, d.oldAtoms),
-          this.totalAtoms
-        )
-        return d
-      }
+      d.bondedRatio = rawAtoms / this.totalAtoms
+      d.atoms = Math.round(rawAtoms)
+      d.deltaAtoms = this.delta(rawAtoms, d.oldAtoms, "int")
+      d.deltaAtomsPercent = this.percent(
+        this.delta(rawAtoms, d.oldAtoms),
+        this.totalAtoms
+      )
+      return d
     },
     setBondBarOuterWidth() {
       let outerBar = this.$el.querySelector(".bond-bar__outer")
@@ -355,10 +361,8 @@ export default {
       }
       return value + "%"
     },
-    limitMax(delegate, event) {
-      let max = parseInt(event.target.max)
+    limitMax(delegate, max) {
       if (delegate.atoms >= max) {
-        console.log(`${delegate.atoms} <= ${max}`)
         delegate.atoms = max
         return
       }
@@ -423,19 +427,22 @@ export default {
 
   .bond-delta
     color var(--success)
+
     span:before
       content '+'
       display inline
 
   &.bond-group--unbonding
     .bond-bar__inner
       background var(--warning)
+
     .bond-delta
       color var(--warning)
 
 .bond-group--negative
   .bond-bar-old__inner
     background var(--input-bc)
+
   .bond-delta
     color var(--input-bc)
 
@@ -455,25 +462,31 @@ export default {
   font-size x
   text-align left
 
+.bond-bar__label.revoked
+  text-decoration line-through
+
+.bond-bar__revoked
+  color red
+  font-weight bold
+  margin-left 6px
+
 .bond-bar__input
   height 2rem
   border-radius 1rem
   border 1px solid var(--input-bc)
   padding 1px
   position relative
 
-.bond-bar__outer
-.bond-bar-old__outer
-  height 2rem - 4*px
+.bond-bar__outer, .bond-bar-old__outer
+  height 2rem - 4 * px
   border-radius 1rem
   position absolute
   top 1px
   left 1px
   right 1px
   bottom 1px
 
-.bond-bar__inner
-.bond-bar-old__inner
+.bond-bar__inner, .bond-bar-old__inner
   height 2rem - 0.25rem
   border-radius 1rem
   background var(--dim)
@@ -482,7 +495,6 @@ export default {
 
 .bond-bar__inner
   position relative
-
   // debug
   color var(--app-bg)
   font-size xs
@@ -500,11 +512,9 @@ export default {
     background var(--txt)
     border-radius 1rem
     z-index z(listItem)
-
     display flex
     align-items center
     justify-content center
-
     content 'drag_handle'
     font-size x
     font-family 'Material Icons'
@@ -517,12 +527,12 @@ export default {
   display flex
   align-items center
   justify-content flex-end
+
   span
     font-size sm
     font-weight 500
 
-.bond-percent
-.bond-value
+.bond-percent, .bond-value
   input
     text-align right
 

app/src/renderer/connectors/lcdClient.js

@@ -93,6 +93,7 @@ Object.assign(Client.prototype, {
   // staking
   updateDelegations: req("POST", "/stake/delegations"),
   candidates: req("GET", "/stake/validators"),
+  getValidators: req("GET", "/validatorsets/latest"),
   queryDelegation: function(delegator, validator) {
     return req("GET", `/stake/${delegator}/bonding_status/${validator}`).call(
       this

app/src/renderer/connectors/lcdClientMock.js

@@ -178,9 +178,10 @@ let state = {
       pool_shares: { amount: "19/1" },
       description: {
         description: "Herr Schmidt",
-        moniker: "herr_schmidt",
+        moniker: "herr_schmidt_revoked",
         country: "DE"
-      }
+      },
+      revoked: true
     }
   ],
   sendHeight: 2
@@ -362,6 +363,12 @@ module.exports = {
   async candidates() {
     return state.candidates
   },
+  async getValidators() {
+    return {
+      block_height: 1,
+      validators: state.candidates
+    }
+  },
   // exports to be used in tests
   state,
   addresses,

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

@@ -1,5 +1,3 @@
-import indicateValidators from "scripts/indicateValidators"
-
 export default ({ dispatch, node }) => {
   const state = {
     delegates: [],
@@ -41,13 +39,15 @@ export default ({ dispatch, node }) => {
     async getDelegates({ state, dispatch, commit, rootState }) {
       commit("setDelegateLoading", true)
       let delegates = await node.candidates()
+      let { validators } = await node.getValidators()
       for (let delegate of delegates) {
+        if (validators.find(v => v.pub_key === delegate.pub_key)) {
+          delegate.isValidator = true
+        }
         commit("addDelegate", delegate)
       }
-      commit(
-        "setDelegates",
-        indicateValidators(state.delegates, rootState.config.maxValidators)
-      )
+
+      commit("setDelegates", delegates)
       commit("setDelegateLoading", false)
 
       return state.delegates

test/unit/helpers/vuex-setup.js

@@ -15,7 +15,7 @@ export default function vuexSetup() {
   function init(
     componentConstructor,
     testType = shallow,
-    { stubs, getters = {}, propsData }
+    { stubs, getters = {}, propsData, doBefore = ({ store, router }) => {} }
   ) {
     const node = Object.assign({}, require("../helpers/node_mock"))
     const modules = Modules({ node })
@@ -35,6 +35,10 @@ export default function vuexSetup() {
         store.commit("addHistory", from.fullPath)
       next()
     })
+
+    // execute some preparation logic on the store or router before mounting
+    doBefore({ store, router })
+
     return {
       node,
       store,
@@ -53,17 +57,25 @@ export default function vuexSetup() {
 
   return {
     localVue,
-    shallow: (componentConstructor, { stubs, getters, propsData } = {}) =>
+    shallow: (
+      componentConstructor,
+      { stubs, getters, propsData, doBefore } = {}
+    ) =>
       init(componentConstructor, shallow, {
         stubs,
         getters,
-        propsData
+        propsData,
+        doBefore
       }),
-    mount: (componentConstructor, { stubs, getters, propsData } = {}) =>
+    mount: (
+      componentConstructor,
+      { stubs, getters, propsData, doBefore } = {}
+    ) =>
       init(componentConstructor, mount, {
         stubs,
         getters,
-        propsData
+        propsData,
+        doBefore
       })
   }
 }

test/unit/specs/components/staking/LiDelegate.spec.js

@@ -65,4 +65,27 @@ describe("LiDelegate", () => {
     expect(wrapper.vm.inCart).toBeFalsy()
     expect(wrapper.html()).not.toContain("li-delegate-active")
   })
+
+  it("should show the type of the candidate", () => {
+    wrapper.vm.delegate = {
+      revoked: false,
+      isValidator: false
+    }
+    expect(wrapper.vm.delegateType).toBe("Candidate")
+    wrapper.vm.delegate = {
+      revoked: false,
+      isValidator: true
+    }
+    expect(wrapper.vm.delegateType).toBe("Validator")
+    wrapper.vm.delegate = {
+      revoked: true,
+      isValidator: false
+    }
+    expect(wrapper.vm.delegateType).toBe("Revoked")
+    wrapper.vm.delegate = {
+      revoked: true,
+      isValidator: true
+    }
+    expect(wrapper.vm.delegateType).toBe("Revoked")
+  })
 })