Fabo/1517 fix self bond querying

CHANGELOG.md

@@ -42,6 +42,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 * [\#1480](https://github.com/cosmos/voyager/issues/1480) Fixed false detection of node crash in e2e test start. @faboweb
 * [\#1451](https://github.com/cosmos/voyager/issues/1451) Provide better sourcemaps to make debugging easier. @faboweb
 * [\#1409](https://github.com/cosmos/voyager/issues/1409) Fixed disabled unbond and redelegation button when delegation amount was less than 1 @fedekunze
+* [\#1517](https://github.com/cosmos/voyager/issues/1517) Fixed wrong account format used for querying selfBond @faboweb
 
 ## [0.10.7] - 2018-10-10
 

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

@@ -392,8 +392,12 @@ export default {
     }
   },
   watch: {
-    validator(validator) {
-      this.$store.dispatch(`getSelfBond`, validator)
+    validator: {
+      immediate: true,
+      handler(validator) {
+        if (!validator) return
+        this.$store.dispatch(`getSelfBond`, validator)
+      }
     }
   }
 }

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

@@ -4,6 +4,7 @@ import BN from "bignumber.js"
 import { ratToBigNumber } from "scripts/common"
 import num from "scripts/num"
 import { isEmpty } from "lodash"
+import b32 from "scripts/b32"
 export default ({ node }) => {
   const emptyState = {
     delegates: [],
@@ -96,8 +97,10 @@ export default ({ node }) => {
     async getSelfBond({ commit }, validator) {
       if (validator.selfBond) return validator.selfBond
       else {
+        let hexAddr = b32.decode(validator.operator_address)
+        let operatorCosmosAddr = b32.encode(hexAddr, `cosmos`)
         let delegation = await node.queryDelegation(
-          validator.operator_address,
+          operatorCosmosAddr,
           validator.operator_address
         )
         let ratio = new BN(delegation.shares).div(

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

@@ -470,6 +470,8 @@ describe(`onDelegation`, () => {
             { atoms: 10, validator: validator }
           ]
 
+          $store.dispatch.mockClear()
+
           await submitDelegation({
             amount: 10,
             from: `cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9`
@@ -495,9 +497,7 @@ describe(`onDelegation`, () => {
         it(`error`, async () => {
           const $store = {
             commit: jest.fn(),
-            dispatch: jest.fn(() => {
-              throw new Error(`message`)
-            }),
+            dispatch: jest.fn(),
             getters: getterValues
           }
 
@@ -520,6 +520,11 @@ describe(`onDelegation`, () => {
             { atoms: 10, validator: validator }
           ]
 
+          $store.dispatch.mockClear()
+          $store.dispatch = jest.fn(() => {
+            throw new Error(`message`)
+          })
+
           await submitDelegation({
             amount: 10,
             from: `cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9`
@@ -543,9 +548,7 @@ describe(`onDelegation`, () => {
         it(`error with data`, async () => {
           const $store = {
             commit: jest.fn(),
-            dispatch: jest.fn(() => {
-              throw new Error(`one\ntwo\nthree\nfour\nfive\nsix\nseven`)
-            }),
+            dispatch: jest.fn(),
             getters: getterValues
           }
 
@@ -568,6 +571,11 @@ describe(`onDelegation`, () => {
             { atoms: 10, validator: validator }
           ]
 
+          $store.dispatch.mockClear()
+          $store.dispatch = jest.fn(() => {
+            throw new Error(`one\ntwo\nthree\nfour\nfive\nsix\nseven`)
+          })
+
           await submitDelegation({
             amount: 10,
             from: `cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9`
@@ -619,6 +627,8 @@ describe(`onDelegation`, () => {
             }
           })
 
+          $store.dispatch.mockClear()
+
           await submitDelegation({
             amount: 10,
             from: `cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9`
@@ -728,6 +738,8 @@ describe(`onDelegation`, () => {
             { atoms: 5, validatorSrc: validator, validatorDst: validatorTo }
           ]
 
+          $store.dispatch.mockClear()
+
           await submitDelegation({
             amount: 5,
             from: lcdClientMock.validators[0]
@@ -753,9 +765,7 @@ describe(`onDelegation`, () => {
         it(`error`, async () => {
           const $store = {
             commit: jest.fn(),
-            dispatch: jest.fn(() => {
-              throw new Error(`message`)
-            }),
+            dispatch: jest.fn(),
             getters: getterValues
           }
 
@@ -778,6 +788,11 @@ describe(`onDelegation`, () => {
             { atoms: 5, validatorSrc: validator, validatorDst: validatorTo }
           ]
 
+          $store.dispatch.mockClear()
+          $store.dispatch = jest.fn(() => {
+            throw new Error(`message`)
+          })
+
           await submitDelegation({
             amount: 5,
             from: lcdClientMock.validators[0]
@@ -801,9 +816,7 @@ describe(`onDelegation`, () => {
         it(`error with data`, async () => {
           const $store = {
             commit: jest.fn(),
-            dispatch: jest.fn(() => {
-              throw new Error(`one\ntwo\nthree\nfour\nfive\nsix\nseven`)
-            }),
+            dispatch: jest.fn(),
             getters: getterValues
           }
 
@@ -826,6 +839,11 @@ describe(`onDelegation`, () => {
             { atoms: 5, validatorSrc: validator, validatorDst: validatorTo }
           ]
 
+          $store.dispatch.mockClear()
+          $store.dispatch = jest.fn(() => {
+            throw new Error(`one\ntwo\nthree\nfour\nfive\nsix\nseven`)
+          })
+
           await submitDelegation({
             amount: 5,
             from: lcdClientMock.validators[0]
@@ -881,6 +899,8 @@ describe(`onDelegation`, () => {
             }
           })
 
+          $store.dispatch.mockClear()
+
           await submitDelegation({
             amount: 5,
             from: lcdClientMock.validators[0]
@@ -1012,6 +1032,8 @@ describe(`onUnstake`, () => {
           }
         })
 
+        $store.dispatch.mockClear()
+
         await submitUndelegation({ amount: 10 })
 
         expect($store.dispatch.mock.calls).toEqual([
@@ -1035,9 +1057,7 @@ describe(`onUnstake`, () => {
       it(`error`, async () => {
         const $store = {
           commit: jest.fn(),
-          dispatch: jest.fn(() => {
-            throw new Error(`message`)
-          }),
+          dispatch: jest.fn(),
           getters: getterValues
         }
 
@@ -1050,6 +1070,11 @@ describe(`onUnstake`, () => {
           }
         })
 
+        $store.dispatch.mockClear()
+        $store.dispatch = jest.fn(() => {
+          throw new Error(`message`)
+        })
+
         await submitUndelegation({ amount: 10 })
 
         expect($store.dispatch.mock.calls).toEqual([
@@ -1073,9 +1098,7 @@ describe(`onUnstake`, () => {
       it(`error with data`, async () => {
         const $store = {
           commit: jest.fn(),
-          dispatch: jest.fn(() => {
-            throw new Error(`one\ntwo\nthree\nfour\nfive\nsix"seven`)
-          }),
+          dispatch: jest.fn(),
           getters: getterValues
         }
 
@@ -1088,6 +1111,11 @@ describe(`onUnstake`, () => {
           }
         })
 
+        $store.dispatch.mockClear()
+        $store.dispatch = jest.fn(() => {
+          throw new Error(`one\ntwo\nthree\nfour\nfive\nsix"seven`)
+        })
+
         await submitUndelegation({ amount: 10 })
 
         expect($store.dispatch.mock.calls).toEqual([
@@ -1141,6 +1169,8 @@ describe(`onUnstake`, () => {
           }
         })
 
+        $store.dispatch.mockClear()
+
         await submitUndelegation({ amount: 10 })
 
         expect($store.dispatch.mock.calls).toEqual([

test/unit/specs/components/staking/__snapshots__/PageValidator.spec.js.snap

@@ -400,7 +400,7 @@ exports[`PageValidator has the expected html structure 1`] = `
             <dd
               id="validator-profile__self-bond"
             >
-              0 %
+              0.00 %
             </dd>
           </dl>
           <dl