Merge branch 'develop' into fabo/persist-ledger-session-type

luniehq · Mar 15, 2019 · 4984770 · 4984770
2 parents 9f48f47 + 510ea15
commit 4984770
Show file tree

Hide file tree

Showing 9 changed files with 94 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,22 +7,28 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.0.0-beta.20] - 2019-03-15
+
+### Fixed
+
+- [\#2273](https://github.com/cosmos/voyager/issues/2273) fixed atoms and uatoms conversion @fedekunze
+
 ## [1.0.0-beta.19] - 2019-03-15
 
 ### Added
 
 - [\#2263](https://github.com/cosmos/voyager/pull/2263) Added guide on how to connect via a local full node to any network @faboweb
 
-### Fixed
-
-- Fix for inflation on our testnet
-- [\#2257](https://github.com/cosmos/voyager/pull/2257) fixed console error on page validator if loading the page from URL @faboweb
-
 ### Changed
 
+- [\#1337](https://github.com/cosmos/voyager/issues/1337) refactor unit tests: Page404, ShortBech32 @fedekunze
 - [\#2255](https://github.com/cosmos/voyager/pull/2255) removed onboarding tutorial @fedekunze
 - [\#2259](https://github.com/cosmos/voyager/issues/2259) removed PagePreferences @fedekunze
-- [\#1337](https://github.com/cosmos/voyager/issues/1337) refactor unit tests: Page404, ShortBech32 @fedekunze
+
+### Fixed
+
+- Fix for inflation on our testnet
+- [\#2257](https://github.com/cosmos/voyager/pull/2257) fixed console error on page validator if loading the page from URL @faboweb
 
 
 ## [1.0.0-beta.18] - 2019-03-14

diff --git a/PENDING.md b/PENDING.md
@@ -1,4 +1,9 @@
+### Added
+
+- [\#2228](https://github.com/cosmos/voyager/issues/2228) display balances of vesting accounts @faboweb
+
 ### Fixed
 
-- Persist session type if signed in with ledger @faboweb
+- [\#2257](https://github.com/cosmos/voyager/pull/2257) fixed console
+- [\#2269](https://github.com/cosmos/voyager/pull/2269) Persist session type if signed in with ledger @faboweb
 - [\#2273](https://github.com/cosmos/voyager/issues/2273) fixed atoms and uatoms conversion @fedekunze
diff --git a/...ts/governance/TabGovernanceParameters.vue → ...r/components/governance/TabParameters.vue b/...ts/governance/TabGovernanceParameters.vue → ...r/components/governance/TabParameters.vue
@@ -24,7 +24,7 @@
         </div>
         <div class="column">
           <dl class="info_dl">
-            <dt>
+            <dt v-tooltip.top="depositTooltips.max_deposit_period">
               Maximum Deposit Period
               <i
                 v-tooltip.top="depositTooltips.max_deposit_period"
@@ -139,7 +139,7 @@
 import { mapGetters } from "vuex"
 import { atoms } from "../../scripts/num.js"
 export default {
-  name: `tab-governance-parameters`,
+  name: `tab-staking-parameters`,
   data: () => ({
     atoms,
     depositTooltips: {

diff --git a/app/src/renderer/connectors/api.js b/app/src/renderer/connectors/api.js
@@ -45,7 +45,22 @@ const Client = (axios, remoteLcdURL) => {
       }
       return req(`GET`, `/auth/accounts/${address}`)()
         .then(res => {
-          return res.value || emptyAccount
+          // HACK, hope for: https://github.com/cosmos/cosmos-sdk/issues/3885
+          let account = res.value || emptyAccount
+          if (res.type === `auth/DelayedVestingAccount`) {
+            if (!account.BaseVestingAccount) {
+              console.error(`SDK format of vesting accounts responses has changed`)
+              return emptyAccount
+            }
+            account = Object.assign(
+              {},
+              account.BaseVestingAccount.BaseAccount,
+              account.BaseVestingAccount
+            )
+            delete account.BaseAccount
+            delete account.BaseVestingAccount
+          }
+          return account
         })
         .catch(err => {
           // if account not found, return null instead of throwing

diff --git a/app/src/renderer/routes.js b/app/src/renderer/routes.js
@@ -21,7 +21,7 @@ export default [
       {
         path: `governance-parameters`,
         name: `Governance Parameters`,
-        component: require(`./components/governance/TabGovernanceParameters`).default
+        component: require(`./components/governance/TabParameters`).default
       }
     ]
   },

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cosmos-voyager",
   "productName": "Cosmos Voyager",
-  "version": "1.0.0-beta.19",
+  "version": "1.0.0-beta.20",
   "description": "Voyager is an electron-based user interface for the Cosmos Network.",
   "author": "All In Bits, Inc <[email protected]>",
   "license": "Apache-2.0",
@@ -43,7 +43,7 @@
     "frontend:fixed-https": "yarn frontend --cert 'server_dev.crt' --key 'server_dev.key'",
     "connect": "concurrently -k \"yarn stargate\" \"yarn proxy\"",
     "backend:new": "concurrently -k \"yarn connect\" \"yarn nodes 2\"",
-    "backend": "concurrently -k \"yarn connect\" \"yarn nodes 2 skip-rebuild\"",
+    "backend": "concurrently -k \"yarn yarn connect\" \"yarn nodes 2 skip-rebuild\"",
     "backend:fixed-https": "concurrently -k \"yarn nodes 2 skip-rebuild\" \"yarn stargate --ssl-certfile 'server_dev.crt' --ssl-keyfile 'server_dev.key'\""
   },
   "devDependencies": {
@@ -149,4 +149,4 @@
     "vuelidate": "0.7.3",
     "vuex": "3.0.1"
   }
-}
+}
diff --git a/...overnance/TabGovernanceParameters.spec.js → ...mponents/governance/TabParameters.spec.js b/...overnance/TabGovernanceParameters.spec.js → ...mponents/governance/TabParameters.spec.js
@@ -1,11 +1,11 @@
 import Vuelidate from "vuelidate"
 import setup from "../../../helpers/vuex-setup"
-import TabGovernanceParameters from "renderer/components/governance/TabGovernanceParameters"
+import TabParameters from "renderer/components/governance/TabParameters"
 import lcdClientMock from "renderer/connectors/lcdClientMock.js"
 
 const { governanceParameters, stakingParameters } = lcdClientMock.state
 
-describe(`TabGovernanceParameters`, () => {
+describe(`TabParameters`, () => {
   let wrapper, store
   const { mount, localVue } = setup()
   localVue.use(Vuelidate)
@@ -23,7 +23,7 @@ describe(`TabGovernanceParameters`, () => {
   }
 
   beforeEach(() => {
-    const instance = mount(TabGovernanceParameters, {
+    const instance = mount(TabParameters, {
       localVue,
       doBefore: ({ store }) => {
         store.commit(`setGovParameters`, governanceParameters)

diff --git a/...ts__/TabGovernanceParameters.spec.js.snap → .../__snapshots__/TabParameters.spec.js.snap b/...ts__/TabGovernanceParameters.spec.js.snap → .../__snapshots__/TabParameters.spec.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`TabGovernanceParameters has the expected html structure 1`] = `
+exports[`TabParameters has the expected html structure 1`] = `
 <div>
   <div
     class="parameters__details parameters__section"

diff --git a/test/unit/specs/connectors/api.spec.js b/test/unit/specs/connectors/api.spec.js
@@ -669,6 +669,56 @@ describe(`API`, () => {
           expect(error.response.data).toBe(`something failed`)
         }
       })
+
+      it(`returns a flat response for vesting account`, async () => {
+        axios.mockReturnValueOnce(
+          Promise.resolve({
+            data: {
+              type: `auth/DelayedVestingAccount`,
+              value: {
+                BaseVestingAccount: {
+                  BaseAccount: {
+                    coins: [{ x: 1 }],
+                    sequence: `1`,
+                    account_number: `213`
+                  },
+                  vestingProp: `Y`
+                }
+              }
+            }
+          })
+        )
+        const res = await client.getAccount(`address`)
+        expect(res).toEqual({
+          coins: [{ x: 1 }],
+          sequence: `1`,
+          account_number: `213`,
+          vestingProp: `Y`
+        })
+      })
+
+      it(`shows an error if vesting format changed`, async () => {
+        const spy = jest.spyOn(console, `error`).mockImplementationOnce(() => {})
+        axios.mockReturnValueOnce(
+          Promise.resolve({
+            data: {
+              type: `auth/DelayedVestingAccount`,
+              value: {
+                xxx: {
+                }
+              }
+            }
+          })
+        )
+        const res = await client.getAccount(`address`)
+        expect(res).toEqual({
+          coins: [],
+          sequence: `0`,
+          account_number: `0`
+        })
+        expect(spy).toHaveBeenCalled()
+        console.error.mockReset()
+      })
     })
 
     describe(`Fee Distribution`, () => {