+
@@ -24,9 +22,6 @@ import AppHeader from "common/AppHeader"
import TmNotifications from "common/TmNotifications"
import ModalError from "common/TmModalError"
import ModalHelp from "common/TmModalHelp"
-import ModalLcdApproval from "common/TmModalLCDApproval"
-import ModalNodeHalted from "common/TmModalNodeHalted"
-import ModalReceive from "common/TmModalReceive"
import Onboarding from "common/TmOnboarding"
import Session from "common/TmSession"
import store from "./vuex/store"
@@ -38,9 +33,6 @@ import store from "./vuex/store"
* @vue-data {Object} nothing
* @vue-computed {function} notifications mapGetter
* @vue-computed {function} config mapGetter
- * @vue-computed {function} themes mapGetter
- * @vue-computed {function} approval mapGetter
- * @vue-computed {function} required mapGetter
* @vue-computed {function} onboarding mapGetter
*/
export default {
@@ -49,25 +41,15 @@ export default {
AppHeader,
ModalError,
ModalHelp,
- ModalLcdApproval,
- ModalReceive,
TmNotifications,
- ModalNodeHalted,
Onboarding,
Session
},
computed: {
- ...mapGetters([
- `notifications`,
- `config`,
- `themes`,
- `approvalRequired`,
- `onboarding`
- ])
+ ...mapGetters([`notifications`, `config`, `onboarding`])
},
mounted() {
this.$store.commit(`loadOnboarding`)
- this.$store.commit(`setTheme`, `dark`)
},
store
}
diff --git a/app/src/renderer/assets/fonts/FontAwesome.otf b/app/src/renderer/assets/fonts/FontAwesome.otf
deleted file mode 100644
index 401ec0f36e..0000000000
Binary files a/app/src/renderer/assets/fonts/FontAwesome.otf and /dev/null differ
diff --git a/app/src/renderer/assets/fonts/fontawesome-webfont.eot b/app/src/renderer/assets/fonts/fontawesome-webfont.eot
deleted file mode 100644
index e9f60ca953..0000000000
Binary files a/app/src/renderer/assets/fonts/fontawesome-webfont.eot and /dev/null differ
diff --git a/app/src/renderer/assets/fonts/fontawesome-webfont.svg b/app/src/renderer/assets/fonts/fontawesome-webfont.svg
deleted file mode 100644
index 855c845e53..0000000000
--- a/app/src/renderer/assets/fonts/fontawesome-webfont.svg
+++ /dev/null
@@ -1,2671 +0,0 @@
-
-
-
diff --git a/app/src/renderer/assets/fonts/fontawesome-webfont.ttf b/app/src/renderer/assets/fonts/fontawesome-webfont.ttf
deleted file mode 100644
index 35acda2fa1..0000000000
Binary files a/app/src/renderer/assets/fonts/fontawesome-webfont.ttf and /dev/null differ
diff --git a/app/src/renderer/assets/fonts/fontawesome-webfont.woff b/app/src/renderer/assets/fonts/fontawesome-webfont.woff
deleted file mode 100644
index 400014a4b0..0000000000
Binary files a/app/src/renderer/assets/fonts/fontawesome-webfont.woff and /dev/null differ
diff --git a/app/src/renderer/assets/fonts/fontawesome-webfont.woff2 b/app/src/renderer/assets/fonts/fontawesome-webfont.woff2
deleted file mode 100644
index 4d13fc6040..0000000000
Binary files a/app/src/renderer/assets/fonts/fontawesome-webfont.woff2 and /dev/null differ
diff --git a/app/src/renderer/components/common/ActionModal.vue b/app/src/renderer/components/common/ActionModal.vue
new file mode 100644
index 0000000000..8d88657fe0
--- /dev/null
+++ b/app/src/renderer/components/common/ActionModal.vue
@@ -0,0 +1,345 @@
+
+ DEVELOPMENT MODE
+
+
+ 
+
+ {{ user.signedIn ? title : `Sign in required` }}
+
+
+
+
+
+ {{ user.signedIn ? title : `Sign in required` }}
+
+
+
+
+ You need to sign in to submit a transaction.
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
diff --git a/app/src/renderer/components/common/ShortBech32.vue b/app/src/renderer/components/common/ShortBech32.vue
index 59ff9c3a88..e800568d76 100644
--- a/app/src/renderer/components/common/ShortBech32.vue
+++ b/app/src/renderer/components/common/ShortBech32.vue
@@ -15,7 +15,6 @@
-
-
-
-
-
-
diff --git a/app/src/renderer/components/common/TmModalNodeHalted.vue b/app/src/renderer/components/common/TmModalNodeHalted.vue
deleted file mode 100644
index 78ed330bd4..0000000000
--- a/app/src/renderer/components/common/TmModalNodeHalted.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
- sync problem
-
- Node approval required
-
- Voyager needs to approve the node you're trying to connect to. Please
- compare the hash below against the hash from a trusted source. If you
- are 100% sure that the hashes match, click approve to proceed.
-
-
-
-
-
-
-
-
diff --git a/app/src/renderer/components/common/TmModalSearch.vue b/app/src/renderer/components/common/TmModalSearch.vue
index 8a33cfa93e..d70cbf5eed 100644
--- a/app/src/renderer/components/common/TmModalSearch.vue
+++ b/app/src/renderer/components/common/TmModalSearch.vue
@@ -55,7 +55,7 @@ export default {
open(open) {
if (open) {
setTimeout(() => {
- let el = this.$el.querySelector(`.tm-field`)
+ const el = this.$el.querySelector(`.tm-field`)
el.focus()
})
}
diff --git a/app/src/renderer/components/common/TmNotification.vue b/app/src/renderer/components/common/TmNotification.vue
index a03ff08086..4347bdf005 100644
--- a/app/src/renderer/components/common/TmNotification.vue
+++ b/app/src/renderer/components/common/TmNotification.vue
@@ -68,7 +68,7 @@ export default {
setDeactivation() {
if (!this.layout || this.layout === `banner`) {
// notification active duration is 5 seconds - (time since creation)
- let activeDuration = this.duration - (Date.now() - this.time)
+ const activeDuration = this.duration - (Date.now() - this.time)
// disable visibility if it's an old notification
if (activeDuration < 0) {
@@ -86,12 +86,13 @@ export default {
diff --git a/app/src/renderer/components/common/TmSessionAccountDelete.vue b/app/src/renderer/components/common/TmSessionAccountDelete.vue
index 86583e9af9..29fa7945f7 100644
--- a/app/src/renderer/components/common/TmSessionAccountDelete.vue
+++ b/app/src/renderer/components/common/TmSessionAccountDelete.vue
@@ -69,7 +69,7 @@
diff --git a/app/src/renderer/components/common/TmUserPane.vue b/app/src/renderer/components/common/TmUserPane.vue
index 8fe3791466..73db9f9604 100644
--- a/app/src/renderer/components/common/TmUserPane.vue
+++ b/app/src/renderer/components/common/TmUserPane.vue
@@ -17,7 +17,7 @@ import TmListItem from "common/TmListItem"
export default {
name: `tm-user-pane`,
components: { TmListItem },
- computed: { ...mapGetters([`user`, `config`]) },
+ computed: { ...mapGetters([`user`]) },
methods: {
close() {
this.$store.commit(`setActiveMenu`, ``)
diff --git a/app/src/renderer/components/common/ToolBar.vue b/app/src/renderer/components/common/ToolBar.vue
index aa4af2a2f4..2276bdfa48 100644
--- a/app/src/renderer/components/common/ToolBar.vue
+++ b/app/src/renderer/components/common/ToolBar.vue
@@ -1,44 +1,68 @@
-
-
-
- sync_problem
-
- Node has halted
-
- The node your are connected to appears to have halted. You can try to
- connect to another node or switch to a demo connection so you can try
- out Voyager.
-
-
-
+
diff --git a/app/src/renderer/components/governance/LiProposal.vue b/app/src/renderer/components/governance/LiProposal.vue
index 9fa96009cb..b684c37eba 100644
--- a/app/src/renderer/components/governance/LiProposal.vue
+++ b/app/src/renderer/components/governance/LiProposal.vue
@@ -48,8 +48,8 @@ export default {
computed: {
...mapGetters([`proposals`]),
tally() {
- let proposalTally
- proposalTally = this.proposals.tallies[this.proposal.proposal_id] || {}
+ const proposalTally =
+ this.proposals.tallies[this.proposal.proposal_id] || {}
proposalTally.yes = Math.round(parseFloat(proposalTally.yes))
proposalTally.no = Math.round(parseFloat(proposalTally.no))
proposalTally.no_with_veto = Math.round(
@@ -95,9 +95,6 @@ export default {
diff --git a/app/src/renderer/components/governance/ModalPropose.vue b/app/src/renderer/components/governance/ModalPropose.vue
index ed5c786146..ed17df4953 100644
--- a/app/src/renderer/components/governance/ModalPropose.vue
+++ b/app/src/renderer/components/governance/ModalPropose.vue
@@ -1,19 +1,18 @@
-
-
-
- search
-
-
+
diff --git a/app/src/renderer/components/governance/TabParameters.vue b/app/src/renderer/components/governance/TabParameters.vue
index ce9ca9fec6..bff6ab3334 100644
--- a/app/src/renderer/components/governance/TabParameters.vue
+++ b/app/src/renderer/components/governance/TabParameters.vue
@@ -1,163 +1,153 @@
-`;
-
-exports[`TmConnectedNetwork shows the connected node 1`] = `
-
-
- Title
- Description
- Deposit amount
- {{ denom }}
+
-
-
- Account password
-
-
-
+
-
diff --git a/app/src/renderer/components/governance/ModalVote.vue b/app/src/renderer/components/governance/ModalVote.vue
index 50e2933000..fc476050de 100644
--- a/app/src/renderer/components/governance/ModalVote.vue
+++ b/app/src/renderer/components/governance/ModalVote.vue
@@ -1,93 +1,62 @@
-
- Create Proposal
-
-
+ Create Proposal
-
- -
-
+
+
-
-
-
-
+
diff --git a/app/src/renderer/components/governance/PageGovernance.vue b/app/src/renderer/components/governance/PageGovernance.vue
index 2f013de24e..c569382e7c 100644
--- a/app/src/renderer/components/governance/PageGovernance.vue
+++ b/app/src/renderer/components/governance/PageGovernance.vue
@@ -1,52 +1,37 @@
-
- Vote
-
-
- Vote
-
-
-
- Title: {{ proposalTitle }}
-Proposal ID: {{ `#` + proposalId }}
--
-
-
-
@@ -55,65 +55,11 @@ exports[`TmConnectedNetwork has the expected html structure 1`] = `
class="tm-connected-network__string"
id="tm-connected-network__block"
>
-
- #42
-
- exit_to_app
-
-
- - Deposit Parameters - info_outline -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/renderer/components/wallet/PageTransactions.vue b/app/src/renderer/components/wallet/PageTransactions.vue
index cab3176ea1..46d0b1410b 100644
--- a/app/src/renderer/components/wallet/PageTransactions.vue
+++ b/app/src/renderer/components/wallet/PageTransactions.vue
@@ -1,36 +1,22 @@
-
- refreshsearch
-
-
+ ({
shortid: shortid,
@@ -81,7 +52,7 @@ export default {
order: `desc`
},
validatorURL: `/staking/validators`,
- proposalsURL: `/governance`,
+ governanceURL: `/governance`,
time
}),
computed: {
@@ -92,12 +63,8 @@ export default {
`wallet`,
`bondDenom`,
`delegation`,
- `delegates`,
- `connected`
+ `delegates`
]),
- somethingToSearch() {
- return !this.transactions.loading && !!this.allTransactions.length
- },
orderedTransactions() {
return orderBy(
this.allTransactions.map(t => {
@@ -109,7 +76,7 @@ export default {
)
},
filteredTransactions() {
- let query = this.filters.transactions.search.query
+ const query = this.filters.transactions.search.query
if (this.filters.transactions.search.visible) {
// doing a full text comparison on the transaction data
return this.orderedTransactions.filter(t =>
@@ -118,20 +85,17 @@ export default {
} else {
return this.orderedTransactions
}
+ },
+ hasFilteredData({ filteredTransactions } = this) {
+ return filteredTransactions.length > 0
}
},
mounted() {
- Mousetrap.bind([`command+f`, `ctrl+f`], () => this.setSearch(true))
- Mousetrap.bind(`esc`, () => this.setSearch(false))
this.refreshTransactions()
},
methods: {
- refreshTransactions() {
- this.$store.dispatch(`getAllTxs`)
- },
- setSearch(bool = !this.filters[`transactions`].search.visible) {
- if (!this.somethingToSearch) return false
- this.$store.commit(`setSearchVisible`, [`transactions`, bool])
+ async refreshTransactions() {
+ await this.$store.dispatch(`getAllTxs`)
}
}
}
diff --git a/app/src/renderer/components/wallet/PageWallet.vue b/app/src/renderer/components/wallet/PageWallet.vue
index bb5f32c87c..33b8ecf30b 100644
--- a/app/src/renderer/components/wallet/PageWallet.vue
+++ b/app/src/renderer/components/wallet/PageWallet.vue
@@ -1,49 +1,27 @@
-
-
-
-
- refresh
-
-
- search
-
-
-
-
+
+
-
@@ -51,28 +29,16 @@
import num from "scripts/num"
import { mapGetters, mapActions } from "vuex"
import { includes, orderBy } from "lodash"
-import Mousetrap from "mousetrap"
-import DataEmptySearch from "common/TmDataEmptySearch"
-import TmDataConnecting from "common/TmDataConnecting"
-import LiCopy from "common/TmLiCopy"
import LiCoin from "./LiCoin"
-import TmListItem from "common/TmListItem"
+import SendModal from "wallet/SendModal"
import TmPage from "common/TmPage"
-import TmPart from "common/TmPart"
-import TmDataLoading from "common/TmDataLoading"
import TmDataMsg from "common/TmDataMsg"
-import TmBalance from "common/TmBalance"
-import ModalSearch from "common/TmModalSearch"
-import ToolBar from "common/ToolBar"
/**
* Page Wallet
* @vue-prop {Number} num Module that implements all the numerical methods
* @vue-computed {function} filters mapGetter
* @vue-computed {function} wallet mapGetter
- * @vue-computed {function} committedDelegations mapGetter
- * @vue-computed {function} oldBondedAtoms mapGetter
- * @vue-computed {function} config mapGetter
* @vue-computed {function} connected mapGetter
*
* @vue-computed {function} somethingToSearch returns a boolean stating true if we have data and we are not in loading phase
@@ -80,56 +46,43 @@ import ToolBar from "common/ToolBar"
* @vue-computed {function} filteredBalances filter the balance per coin name, returns an ordered list
*
* @vue-methods {function} updateDelegates mapAction
- * @vue-methods {function} updateDelegates mapAction
* @vue-methods {function} setSearch launches the setSearchVisible action if somethingToSearch returns true
- * @vue-methods {function} updateBalances dispatch a queryWalletBalances action to update the informations
+ * @vue-methods {function} queryWalletBalances trigger an update of the balances
*/
export default {
name: `page-wallet`,
components: {
- TmBalance,
- TmDataLoading,
TmDataMsg,
- DataEmptySearch,
- TmDataConnecting,
LiCoin,
- LiCopy,
- TmListItem,
- ModalSearch,
TmPage,
- TmPart,
- ToolBar
+ SendModal
},
- data: () => ({ num }),
+ data: () => ({ num, showSendModal: false }),
computed: {
- ...mapGetters([
- `filters`,
- `wallet`,
- `committedDelegations`,
- `oldBondedAtoms`,
- `config`,
- `connected`
- ]),
+ ...mapGetters([`filters`, `wallet`, `connected`]),
somethingToSearch() {
return !this.wallet.loading && !!this.wallet.balances.length
},
allDenomBalances() {
// for denoms not in balances, add empty balance
- let balances = this.wallet.balances.slice(0)
- let hasDenom = denom => {
+ const balances = this.wallet.balances.slice(0)
+ const hasDenom = denom => {
return !!balances.filter(balance => balance.denom === denom)[0]
}
- for (let denom of this.wallet.denoms) {
+ for (const denom of this.wallet.denoms) {
if (hasDenom(denom)) continue
balances.push({ denom, amount: 0 })
}
return balances
},
+ allBalances() {
+ return this.wallet.balances
+ },
filteredBalances() {
- let query = this.filters.balances.search.query
- let list = orderBy(
+ const query = this.filters.balances.search.query
+ const list = orderBy(
this.allDenomBalances,
- [`amount`, `denom`],
+ [`amount`, balance => balance.denom.toLowerCase()],
[`desc`, `asc`]
)
if (this.filters.balances.search.visible) {
@@ -139,19 +92,19 @@ export default {
} else {
return list
}
+ },
+ hasFilteredData({ filteredBalances } = this) {
+ return filteredBalances.length > 0
}
},
- mounted() {
- Mousetrap.bind([`command+f`, `ctrl+f`], () => this.setSearch(true))
- Mousetrap.bind(`esc`, () => this.setSearch(false))
+ async mounted() {
this.updateDelegates()
- this.queryWalletBalances()
+ await this.queryWalletBalances()
},
methods: {
...mapActions([`updateDelegates`, `queryWalletBalances`]),
- setSearch(bool = !this.filters[`balances`].search.visible) {
- if (!this.somethingToSearch) return false
- this.$store.commit(`setSearchVisible`, [`balances`, bool])
+ showModal(denomination) {
+ this.$refs.sendModal.open(denomination)
}
}
}
diff --git a/app/src/renderer/components/wallet/SendModal.vue b/app/src/renderer/components/wallet/SendModal.vue
new file mode 100644
index 0000000000..94120abf74
--- /dev/null
+++ b/app/src/renderer/components/wallet/SendModal.vue
@@ -0,0 +1,203 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/renderer/connectors/lcdClient.js b/app/src/renderer/connectors/lcdClient.js
index df51ae78cf..45590397b6 100644
--- a/app/src/renderer/connectors/lcdClient.js
+++ b/app/src/renderer/connectors/lcdClient.js
@@ -1,191 +1,178 @@
"use strict"
-const Client = (axios, localLcdURL, remoteLcdURL) => {
- async function request(method, path, data, useRemote) {
- const url = useRemote ? remoteLcdURL : localLcdURL
+const Client = (axios, remoteLcdURL) => {
+ async function request(method, path, data) {
+ const url = remoteLcdURL
const result = await axios({ data, method, url: url + path })
return result.data
}
// returns an async function which makes a request for the given
// HTTP method (GET/POST/DELETE/etc) and path (/foo/bar)
- function req(method, path, useRemote) {
+ function req(method, path) {
return async function(data) {
- return await request(method, path, data, useRemote)
+ return await request(method, path, data)
}
}
// returns an async function which makes a request for the given
// HTTP method and path, which accepts arguments to be appended
// to the path (/foo/{arg}/...)
- function argReq(method, prefix, suffix = ``, useRemote) {
+ function argReq(method, prefix, suffix = ``) {
return function(args, data) {
- return request(method, `${prefix}/${args}${suffix}`, data, useRemote)
- }
- }
-
- let fetchAccount = argReq(`GET`, `/auth/accounts`, ``, true)
-
- const keys = {
- add: req(`POST`, `/keys`),
- delete: argReq(`DELETE`, `/keys`),
-
- get: async key => {
- try {
- return await req(`GET`, `/keys/${key}`)()
- } catch (exception) {
- if (exception.response.status !== 404) {
- throw exception
- }
- }
- },
-
- seed: () => keys.get(`seed`),
- set: argReq(`PUT`, `/keys`),
-
- values: async () => {
- const values = await req(`GET`, `/keys`)()
- // Workaround for https://github.com/cosmos/cosmos-sdk/issues/2470
- return values === `[]` ? [] : values
+ return request(method, `${prefix}/${args}${suffix}`, data)
}
}
return {
// meta
lcdConnected: function() {
- return keys.values().then(() => true, () => false)
+ return this.nodeVersion().then(() => true, () => false)
},
nodeVersion: req(`GET`, `/node_version`),
// tx
- postTx: req(`POST`, `/tx`),
-
- keys,
+ postTx: req(`POST`, `/tx/broadcast`),
// coins
send: argReq(`POST`, `/bank/accounts`, `/transfers`),
- queryAccount(address) {
- return fetchAccount(address)
+ queryAccount: function(address) {
+ const emptyAccount = {
+ coins: [],
+ sequence: `0`,
+ account_number: `0`
+ }
+ return req(`GET`, `/auth/accounts/${address}`)()
.then(res => {
- return res.value
+ return res.value || emptyAccount
})
.catch(err => {
// if account not found, return null instead of throwing
- if (err.response.data.includes(`account bytes are empty`)) {
- return null
+ if (
+ err.response &&
+ (err.response.data.includes(`account bytes are empty`) ||
+ err.response.data.includes(`failed to prove merkle proof`))
+ ) {
+ return emptyAccount
}
throw err
})
},
txs: function(addr) {
return Promise.all([
- req(`GET`, `/txs?sender=${addr}`, true)(),
- req(`GET`, `/txs?recipient=${addr}`, true)()
+ req(`GET`, `/txs?sender=${addr}`)(),
+ req(`GET`, `/txs?recipient=${addr}`)()
]).then(([senderTxs, recipientTxs]) => [].concat(senderTxs, recipientTxs))
},
- tx: argReq(`GET`, `/txs`, ``, true),
+ tx: argReq(`GET`, `/txs`),
/* ============ STAKE ============ */
// Get all delegations information from a delegator
getDelegations: function(addr) {
- return req(`GET`, `/stake/delegators/${addr}/delegations`, true)()
+ return req(`GET`, `/staking/delegators/${addr}/delegations`)()
},
getUndelegations: function(addr) {
return req(
`GET`,
- `/stake/delegators/${addr}/unbonding_delegations`,
+ `/staking/delegators/${addr}/unbonding_delegations`,
true
)()
},
getRedelegations: function(addr) {
- return req(`GET`, `/stake/delegators/${addr}/redelegations`, true)()
+ return req(`GET`, `/staking/redelegations?delegator=${addr}`)()
},
// Get all txs from a delegator
getDelegatorTxs: function(addr, types) {
if (!types) {
- return req(`GET`, `/stake/delegators/${addr}/txs`, true)()
+ return req(`GET`, `/staking/delegators/${addr}/txs`)()
} else {
- return req(`GET`, `/stake/delegators/${addr}/txs?type=${types}`, true)()
+ return req(`GET`, `/staking/delegators/${addr}/txs?type=${types}`)()
}
},
// Query all validators that a delegator is bonded to
getDelegatorValidators: function(delegatorAddr) {
- return req(`GET`, `/stake/delegators/${delegatorAddr}/validators`, true)()
+ return req(`GET`, `/staking/delegators/${delegatorAddr}/validators`)()
},
// // Query a validator info that a delegator is bonded to
// getDelegatorValidator: function(delegatorAddr, validatorAddr) {
- // return req("GET", `/stake/delegators/${delegatorAddr}/validators/${validatorAddr}`)()
+ // return req("GET", `/staking/delegators/${delegatorAddr}/validators/${validatorAddr}`)()
// },
// Get a list containing all the validator candidates
- getCandidates: req(`GET`, `/stake/validators`, true),
+ getCandidates: req(`GET`, `/staking/validators`),
// Get information from a validator
getCandidate: function(addr) {
- return req(`GET`, `/stake/validators/${addr}`, true)()
+ return req(`GET`, `/staking/validators/${addr}`)()
},
// // Get all of the validator bonded delegators
// getValidatorDelegators: function(addr) {
- // return req("GET", `/stake/validator/${addr}/delegators`)()
+ // return req("GET", `/staking/validator/${addr}/delegators`)()
// },
// Get the list of the validators in the latest validator set
- getValidatorSet: req(`GET`, `/validatorsets/latest`, true),
+ getValidatorSet: req(`GET`, `/validatorsets/latest`),
postDelegation: function(delegatorAddr, data) {
- return req(`POST`, `/stake/delegators/${delegatorAddr}/delegations`)(data)
+ return req(
+ `POST`,
+ `/staking/delegators/${delegatorAddr}/delegations`,
+ true
+ )(data)
},
postUnbondingDelegation: function(delegatorAddr, data) {
return req(
`POST`,
- `/stake/delegators/${delegatorAddr}/unbonding_delegations`
+ `/staking/delegators/${delegatorAddr}/unbonding_delegations`
)(data)
},
postRedelegation: function(delegatorAddr, data) {
- return req(`POST`, `/stake/delegators/${delegatorAddr}/redelegations`)(
- data
- )
+ return req(
+ `POST`,
+ `/staking/delegators/${delegatorAddr}/redelegations`,
+ true
+ )(data)
},
// Query a delegation between a delegator and a validator
queryDelegation: function(delegatorAddr, validatorAddr) {
return req(
`GET`,
- `/stake/delegators/${delegatorAddr}/delegations/${validatorAddr}`,
+ `/staking/delegators/${delegatorAddr}/delegations/${validatorAddr}`,
true
)()
},
queryUnbonding: function(delegatorAddr, validatorAddr) {
return req(
`GET`,
- `/stake/delegators/${delegatorAddr}/unbonding_delegations/${validatorAddr}`,
+ `/staking/delegators/${delegatorAddr}/unbonding_delegations/${validatorAddr}`,
true
)()
},
- getPool: req(`GET`, `/stake/pool`, true),
- getStakingParameters: req(`GET`, `/stake/parameters`, true),
+ getPool: req(`GET`, `/staking/pool`),
+ getStakingParameters: req(`GET`, `/staking/parameters`),
/* ============ Slashing ============ */
queryValidatorSigningInfo: function(pubKey) {
- return req(`GET`, `/slashing/validators/${pubKey}/signing_info`, true)()
+ return req(`GET`, `/slashing/validators/${pubKey}/signing_info`)()
},
/* ============ Governance ============ */
- queryProposals: req(`GET`, `/gov/proposals`, true),
+ queryProposals: req(`GET`, `/gov/proposals`),
queryProposal: function(proposalId) {
- return req(`GET`, `/gov/proposals/${proposalId}`, true)()
+ return req(`GET`, `/gov/proposals/${proposalId}`)()
},
queryProposalVotes: function(proposalId) {
- return req(`GET`, `/gov/proposals/${proposalId}/votes`, true)()
+ return req(`GET`, `/gov/proposals/${proposalId}/votes`)()
},
queryProposalVote: function(proposalId, address) {
- return req(`GET`, `/gov/proposals/${proposalId}/votes/${address}`, true)()
+ return req(`GET`, `/gov/proposals/${proposalId}/votes/${address}`)()
},
queryProposalDeposits: function(proposalId) {
- return req(`GET`, `/gov/proposals/${proposalId}/deposits`, true)()
+ return req(`GET`, `/gov/proposals/${proposalId}/deposits`)()
},
queryProposalDeposit: function(proposalId, address) {
return req(
@@ -195,27 +182,30 @@ const Client = (axios, localLcdURL, remoteLcdURL) => {
)()
},
getProposalTally: function(proposalId) {
- return req(`GET`, `/gov/proposals/${proposalId}/tally`, true)()
+ return req(`GET`, `/gov/proposals/${proposalId}/tally`)()
},
- getGovDepositParameters: req(`GET`, `/gov/parameters/deposit`, true),
- getGovTallyingParameters: req(`GET`, `/gov/parameters/tallying`, true),
- getGovVotingParameters: req(`GET`, `/gov/parameters/voting`, true),
+ getGovDepositParameters: req(`GET`, `/gov/parameters/deposit`),
+ getGovTallyingParameters: req(`GET`, `/gov/parameters/tallying`),
+ getGovVotingParameters: req(`GET`, `/gov/parameters/voting`),
submitProposal: function(data) {
- return req(`POST`, `/gov/proposals`, true)(data)
+ return req(`POST`, `/gov/proposals`)(data)
},
submitProposalVote: function(proposalId, data) {
- return req(`POST`, `/gov/proposals/${proposalId}/votes`, true)(data)
+ return req(`POST`, `/gov/proposals/${proposalId}/votes`)(data)
},
submitProposalDeposit: function(proposalId, data) {
- return req(`POST`, `/gov/proposals/${proposalId}/deposits`, true)(data)
+ return req(`POST`, `/gov/proposals/${proposalId}/deposits`)(data)
},
getGovernanceTxs: async function(address) {
return await Promise.all([
- req(`GET`, `/txs?action=submit_proposal&proposer=${address}`, true)(),
- req(`GET`, `/txs?action=deposit&depositor=${address}`, true)()
+ req(`GET`, `/txs?action=submit_proposal&proposer=${address}`)(),
+ req(`GET`, `/txs?action=deposit&depositor=${address}`)()
]).then(([depositorTxs, proposerTxs]) =>
[].concat(depositorTxs, proposerTxs)
)
+ },
+ getBlock: function(blockHeight) {
+ return req(`GET`, `/blocks/${blockHeight}`)()
}
}
}
diff --git a/app/src/renderer/connectors/lcdClientMock.js b/app/src/renderer/connectors/lcdClientMock.js
index 6d80e78f2c..0cd8b51fcc 100644
--- a/app/src/renderer/connectors/lcdClientMock.js
+++ b/app/src/renderer/connectors/lcdClientMock.js
@@ -4,6 +4,8 @@ const moment = require(`moment`)
const b32 = require(`../scripts/b32.js`)
const { getHeight } = require(`./rpcWrapperMock.js`)
+const day = 86400000
+
const botAddress = `cosmos1p6zajjw6xged056andyhn62lm7axwzyspkzjq0`
const addresses = [
`cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9`,
@@ -15,7 +17,7 @@ const validators = [
`cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctplpn3au`,
`cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctgurrg7n`
]
-let state = {
+const state = {
keys: [
{
name: `default`,
@@ -268,7 +270,7 @@ let state = {
rate: `0`,
max_rate: `0`,
max_change_rate: `0`,
- update_time: `1970-01-01T00:00:00Z`
+ update_time: new Date(Date.now()).toISOString()
},
prev_bonded_shares: `0`
},
@@ -292,7 +294,7 @@ let state = {
rate: `0`,
max_rate: `0`,
max_change_rate: `0`,
- update_time: `1970-01-01T00:00:00Z`
+ update_time: new Date(Date.now()).toISOString()
},
prev_bonded_shares: `0`
}
@@ -331,7 +333,7 @@ let state = {
signing_info: {
start_height: 2,
index_offset: 1,
- jailed_until: `1970-01-01T00:00:00Z`,
+ jailed_until: new Date(Date.now()).toISOString(),
signed_blocks_counter: 1
},
proposals: {
@@ -352,12 +354,12 @@ let state = {
amount: `100`
}
],
- submit_time: `2018-11-21T13:29:24.66404Z`,
- deposit_end_time: `2018-11-23T13:29:24.66404Z`,
- voting_start_time: `2018-11-23T13:29:24.66404Z`,
- voting_end_time: `2018-11-25T13:29:24.66404Z`,
+ submit_time: new Date(Date.now()).toISOString(),
+ deposit_end_time: new Date(Date.now() + day * 2).toISOString(),
+ voting_start_time: new Date(Date.now() + day * 2).toISOString(),
+ voting_end_time: new Date(Date.now() + day * 4).toISOString(),
proposal_status: `Passed`,
- tally_result: {
+ final_tally_result: {
yes: `500`,
no: `25`,
no_with_veto: `10`,
@@ -381,12 +383,12 @@ let state = {
amount: `200`
}
],
- submit_time: `2018-11-21T13:29:24.66404Z`,
- deposit_end_time: `2018-11-23T13:29:24.66404Z`,
- voting_start_time: `2018-11-23T13:29:24.66404Z`,
- voting_end_time: `2018-11-25T13:29:24.66404Z`,
+ submit_time: new Date(Date.now()).toISOString(),
+ deposit_end_time: new Date(Date.now() + day * 2).toISOString(),
+ voting_start_time: new Date(Date.now() + day * 2).toISOString(),
+ voting_end_time: new Date(Date.now() + day * 4).toISOString(),
proposal_status: `VotingPeriod`,
- tally_result: {
+ final_tally_result: {
yes: `0`,
no: `0`,
no_with_veto: `0`,
@@ -410,12 +412,12 @@ let state = {
amount: `170`
}
],
- submit_time: `2018-11-21T13:29:24.66404Z`,
- deposit_end_time: `2018-11-23T13:29:24.66404Z`,
+ submit_time: new Date(Date.now()).toISOString(),
+ deposit_end_time: new Date(Date.now() + day * 2).toISOString(),
voting_start_time: `0001-01-01T00:00:00Z`,
voting_end_time: `0001-01-01T00:00:00Z`,
proposal_status: `DepositPeriod`,
- tally_result: {
+ final_tally_result: {
yes: `0`,
no: `0`,
no_with_veto: `0`,
@@ -439,12 +441,12 @@ let state = {
amount: `100`
}
],
- submit_time: `2018-11-21T13:29:24.66404Z`,
- deposit_end_time: `2018-11-23T13:29:24.66404Z`,
- voting_start_time: `2018-11-23T13:29:24.66404Z`,
- voting_end_time: `2018-11-25T13:29:24.66404Z`,
+ submit_time: new Date(Date.now()).toISOString(),
+ deposit_end_time: new Date(Date.now() + day * 2).toISOString(),
+ voting_start_time: new Date(Date.now() + day * 2).toISOString(),
+ voting_end_time: new Date(Date.now() + day * 4).toISOString(),
proposal_status: `Rejected`,
- tally_result: {
+ final_tally_result: {
yes: `10`,
no: `30`,
no_with_veto: `100`,
@@ -595,7 +597,7 @@ let state = {
const keys = {
add: async ({ name, password, seed }) => {
- let key = {
+ const key = {
name,
password,
address: makeHash()
@@ -605,7 +607,7 @@ const keys = {
},
delete: async (account, { name, password }) => {
- let key = state.keys.find(k => k.name === name)
+ const key = state.keys.find(k => k.name === name)
if (key.password !== password) {
throw new Error(`Passwords do not match`)
}
@@ -619,7 +621,7 @@ const keys = {
set: async (account, { name, old_password, new_password }) => {
// eslint-disable-line camelcase
- let key = state.keys.find(k => k.name === name)
+ const key = state.keys.find(k => k.name === name)
if (key.password !== old_password) {
// eslint-disable-line camelcase
throw new Error(`Passwords do not match`)
@@ -649,7 +651,7 @@ module.exports = {
async txs(address) {
// filter the txs for the ones for this account
return state.txs.filter(tx => {
- let type = tx.tx.value.msg[0].type
+ const type = tx.tx.value.msg[0].type
if (type === `cosmos-sdk/Send`) {
return (
tx.tx.value.msg[0].value.inputs.find(
@@ -667,7 +669,7 @@ module.exports = {
return state.txs.find(tx => tx.hash === hash)
},
async send(to, req) {
- let fromKey = state.keys.find(a => a.name === req.base_req.name)
+ const fromKey = state.keys.find(a => a.name === req.base_req.name)
if (!fromKey)
throw Error(
`Key you want to send from does not exist in the lcd connection mock`
@@ -685,8 +687,8 @@ module.exports = {
delegation
}
) {
- let fromKey = state.keys.find(a => a.name === name)
- let fromAccount = state.accounts[fromKey.address]
+ const fromKey = state.keys.find(a => a.name === name)
+ const fromAccount = state.accounts[fromKey.address]
let delegator = state.stake[fromKey.address]
if (delegator_addr !== fromKey.address) {
return txResult(1, `Must use own delegator account`)
@@ -708,8 +710,8 @@ module.exports = {
`Expected sequence "${fromAccount.sequence}", got "${sequence}"`
)
}
- let denom = state.stakingParameters.parameters.bond_denom
- let amount = parseInt(delegation.amount)
+ const denom = state.stakingParameters.parameters.bond_denom
+ const amount = parseInt(delegation.amount)
if (amount < 0) {
return txResult(1, `Amount cannot be negative`)
}
@@ -721,7 +723,7 @@ module.exports = {
fromAccount.coins.find(c => c.denom === denom).amount -= amount
// update stake
- let existingDelegation = delegator.delegations.find(
+ const existingDelegation = delegator.delegations.find(
d => d.validator_addr === validator_addr
)
if (!existingDelegation) {
@@ -734,9 +736,9 @@ module.exports = {
delegator.delegations.push(delegation)
}
- let shares = parseInt(delegation.shares)
+ const shares = parseInt(delegation.shares)
delegation.shares = (shares + amount).toString()
- let candidate = state.candidates.find(
+ const candidate = state.candidates.find(
c => c.operator_address === validator_addr
)
// TODO: Update error msg
@@ -771,8 +773,8 @@ Msg Traces:
shares
}
) {
- let fromKey = state.keys.find(a => a.name === name)
- let fromAccount = state.accounts[fromKey.address]
+ const fromKey = state.keys.find(a => a.name === name)
+ const fromAccount = state.accounts[fromKey.address]
let delegator = state.stake[fromKey.address]
if (!delegator) {
state.stake[fromKey.address] = {
@@ -793,10 +795,10 @@ Msg Traces:
}
incrementSequence(fromAccount)
- let amount = parseInt(shares)
+ const amount = parseInt(shares)
// update stake
- let delegation = delegator.delegations.find(
+ const delegation = delegator.delegations.find(
d => d.validator_addr === validator_addr
)
if (!delegation) {
@@ -804,13 +806,13 @@ Msg Traces:
}
// update sender balance
- let coinBalance = fromAccount.coins.find(
+ const coinBalance = fromAccount.coins.find(
c => c.denom === state.stakingParameters.parameters.bond_denom
)
coinBalance.amount = String(parseInt(coinBalance.amount) + amount)
- let delegationShares = parseInt(delegation.shares)
+ const delegationShares = parseInt(delegation.shares)
delegation.shares = (+delegationShares - amount).toString()
updateValidatorShares(state, validator_addr, amount)
@@ -842,8 +844,8 @@ Msg Traces:
shares
}
) {
- let fromKey = state.keys.find(a => a.name === name)
- let fromAccount = state.accounts[fromKey.address]
+ const fromKey = state.keys.find(a => a.name === name)
+ const fromAccount = state.accounts[fromKey.address]
let delegator = state.stake[fromKey.address]
if (!delegator) {
state.stake[fromKey.address] = {
@@ -865,7 +867,7 @@ Msg Traces:
incrementSequence(fromAccount)
// check if source validator exist
- let srcValidator = state.candidates.find(
+ const srcValidator = state.candidates.find(
c => c.operator_address === validator_src_addr
)
@@ -874,7 +876,7 @@ Msg Traces:
}
// check if dest validator exist
- let dstValidator = state.candidates.find(
+ const dstValidator = state.candidates.find(
c => c.operator_address === validator_dst_addr
)
@@ -897,7 +899,7 @@ Msg Traces:
}
// check if delegation exists
- let srcDelegation = delegator.delegations.find(
+ const srcDelegation = delegator.delegations.find(
d => d.validator_addr === validator_src_addr
)
if (!srcDelegation) {
@@ -905,7 +907,7 @@ Msg Traces:
}
// check if there's an existing redelegation
- let redelegations = this.getRedelegations(delegator_addr)
+ const redelegations = this.getRedelegations(delegator_addr)
let red = redelegations.find(
red =>
red.validator_src_addr === validator_src_addr &&
@@ -916,7 +918,7 @@ Msg Traces:
return txResult(3, `conflicting redelegation`)
}
- let height = getHeight()
+ const height = getHeight()
// check if amount of shares redelegated is valid
if (Number(srcDelegation.shares) < shares) {
@@ -930,7 +932,7 @@ Msg Traces:
srcDelegation.height = height
// delegate to dst validator
- let dstDelegation = delegator.delegations.find(
+ const dstDelegation = delegator.delegations.find(
d => d.validator_addr === validator_dst_addr
)
if (dstDelegation) {
@@ -945,11 +947,11 @@ Msg Traces:
}
// add redelegation object
- let coins = {
+ const coins = {
amount: shares, // in mock mode we assume 1 share = 1 token
denom: state.stakingParameters.parameters.bond_denom
}
- let minTime = Date.now()
+ const minTime = Date.now()
red = {
delegator_addr,
validator_src_addr,
@@ -976,7 +978,7 @@ Msg Traces:
return txResult(0)
},
async queryDelegation(delegatorAddress, validatorAddress) {
- let delegator = state.stake[delegatorAddress]
+ const delegator = state.stake[delegatorAddress]
if (!delegator)
return {
shares: `0`
@@ -986,7 +988,7 @@ Msg Traces:
)
},
async queryUnbonding(delegatorAddress, validatorAddress) {
- let delegator = state.stake[delegatorAddress]
+ const delegator = state.stake[delegatorAddress]
if (!delegator) return
return delegator.unbonding_delegations.find(
d => d.validator_addr === validatorAddress
@@ -994,21 +996,21 @@ Msg Traces:
},
// Get all delegations information from a delegator
getDelegations(delegatorAddress) {
- let delegator = state.stake[delegatorAddress] || {}
+ const delegator = state.stake[delegatorAddress] || {}
return delegator.delegations || []
},
getUndelegations(delegatorAddress) {
- let delegator = state.stake[delegatorAddress] || {}
+ const delegator = state.stake[delegatorAddress] || {}
return delegator.unbonding_delegations || []
},
getRedelegations(delegatorAddress) {
- let delegator = state.stake[delegatorAddress] || {}
+ const delegator = state.stake[delegatorAddress] || {}
return delegator.redelegations || []
},
async getDelegatorTxs(addr, types = []) {
// filter for transactions belonging to that delegator and are staking
- let delegatorTxs = state.txs.filter(tx => {
- let type = tx.tx.value.msg[0].type
+ const delegatorTxs = state.txs.filter(tx => {
+ const type = tx.tx.value.msg[0].type
if (
type === `cosmos-sdk/MsgDelegate` ||
type === `cosmos-sdk/BeginRedelegate` ||
@@ -1085,24 +1087,24 @@ Msg Traces:
return results
}
- let tally_result = {
+ const final_tally_result = {
yes: `0`,
no: `0`,
no_with_veto: `0`,
abstain: `0`
}
- let submit_time = Date.now()
- let deposit_end_time = moment(submit_time)
+ const submit_time = Date.now()
+ const deposit_end_time = moment(submit_time)
.add(86400000, `ms`)
.toDate()
- let proposal = {
+ const proposal = {
proposal_id,
title,
description,
proposal_type,
proposal_status: `DepositPeriod`,
- tally_result,
+ final_tally_result,
submit_time,
deposit_end_time,
voting_start_time: undefined,
@@ -1128,8 +1130,8 @@ Msg Traces:
return state.proposals[proposalId]
},
async getProposalTally(proposalId) {
- let proposal = await this.getProposal(proposalId)
- return proposal.tally_result
+ const proposal = await this.getProposal(proposalId)
+ return proposal.final_tally_result
},
async getProposalDeposits(proposalId) {
return state.deposits[proposalId] || []
@@ -1145,9 +1147,9 @@ Msg Traces:
depositor,
amount
}) {
- let results = []
- let fromKey = state.keys.find(a => a.name === name)
- let fromAccount = state.accounts[fromKey.address]
+ const results = []
+ const fromKey = state.keys.find(a => a.name === name)
+ const fromAccount = state.accounts[fromKey.address]
if (fromAccount == null) {
results.push(txResult(1, `Nonexistent account`))
return results
@@ -1163,7 +1165,7 @@ Msg Traces:
return results
}
- let proposal = await this.getProposal(proposal_id)
+ const proposal = await this.getProposal(proposal_id)
if (!proposal) {
results.push(txResult(3, `Nonexistent proposal`))
return results
@@ -1176,7 +1178,7 @@ Msg Traces:
}
let coin
- let submittedDeposit = {
+ const submittedDeposit = {
proposal_id,
depositor,
amount
@@ -1185,8 +1187,8 @@ Msg Traces:
// javascript's forEach doesn't support break, so using classic for loop...
for (let i = 0; i < amount.length; i++) {
coin = amount[i]
- let depositCoinAmt = parseInt(coin.amount)
- let coinBalance = fromAccount.coins.find(c => c.denom === coin.denom)
+ const depositCoinAmt = parseInt(coin.amount)
+ const coinBalance = fromAccount.coins.find(c => c.denom === coin.denom)
if (depositCoinAmt < 0) {
results.push(txResult(1, `Amount of ${coin.denom}s cannot be negative`))
@@ -1201,7 +1203,7 @@ Msg Traces:
// ============= TOTAL PROPOSAL's DEPOSIT =============
// Increment total deposit of the proposal
- let deposit = proposal.total_deposit.find(
+ const deposit = proposal.total_deposit.find(
deposit => deposit.denom === coin.denom
)
if (!deposit) {
@@ -1209,13 +1211,13 @@ Msg Traces:
proposal.total_deposit.push(coin)
} else {
// if there's an existing deposit with that denom we add the submited deposit amount to it
- let newAmt = String(parseInt(deposit.amount) + parseInt(coin.amount))
+ const newAmt = String(parseInt(deposit.amount) + parseInt(coin.amount))
deposit.amount = newAmt
}
// ============= USER'S DEPOSITS =============
// check if there's an existing deposit by the depositor
- let prevDeposit =
+ const prevDeposit =
state.deposits[proposal_id] &&
state.deposits[proposal_id].find(
deposit => deposit.depositor === depositor
@@ -1229,14 +1231,14 @@ Msg Traces:
} else {
// ============= USER'S DEPOSITS WITH SAME COIN DENOM =============
// if there's a prev deposit, add the new amount to the corresponding coin
- let prevDepCoin = prevDeposit.amount.find(prevDepCoin => {
+ const prevDepCoin = prevDeposit.amount.find(prevDepCoin => {
return prevDepCoin.denom === coin.denom
})
if (!prevDepCoin) {
prevDeposit.amount.push(coin)
} else {
// there's a previous deposit from the depositor with the same coin
- let newAmt = parseInt(prevDepCoin.amount) + parseInt(coin.amount)
+ const newAmt = parseInt(prevDepCoin.amount) + parseInt(coin.amount)
prevDepCoin.amount = String(newAmt)
}
}
@@ -1247,11 +1249,11 @@ Msg Traces:
// check if the propoposal is now active
if (proposal.proposal_status === `DepositPeriod`) {
// TODO: get min deposit denom from gov params instead of stake params
- let depositCoinAmt = proposal.total_deposit.find(coin => {
+ const depositCoinAmt = proposal.total_deposit.find(coin => {
return coin.denom === `STAKE`
}).amount
- let minDepositCoin = state.governanceParameters.deposit.min_deposit[0]
+ const minDepositCoin = state.governanceParameters.deposit.min_deposit[0]
if (parseInt(depositCoinAmt) >= parseInt(minDepositCoin.amount)) {
proposal.proposal_status = `VotingPeriod`
proposal.voting_start_time = Date.now()
@@ -1276,9 +1278,9 @@ Msg Traces:
option,
voter
}) {
- let results = []
- let fromKey = state.keys.find(a => a.name === name)
- let fromAccount = state.accounts[fromKey.address]
+ const results = []
+ const fromKey = state.keys.find(a => a.name === name)
+ const fromAccount = state.accounts[fromKey.address]
if (fromAccount == null) {
results.push(txResult(1, `Nonexistent account`))
@@ -1295,7 +1297,7 @@ Msg Traces:
return results
}
- let proposal = await this.getProposal(proposal_id)
+ const proposal = await this.getProposal(proposal_id)
if (!proposal) {
results.push(txResult(3, `Nonexistent proposal`))
@@ -1313,15 +1315,15 @@ Msg Traces:
return results
}
- let vote = {
+ const vote = {
proposal_id,
option,
voter
}
state.votes[proposal_id].push(vote)
- let intTallyResult = parseInt(proposal.tally_result[option])
- proposal.tally_result[option] = String(intTallyResult + 1)
+ const intTallyResult = parseInt(proposal.final_tally_result[option])
+ proposal.final_tally_result[option] = String(intTallyResult + 1)
storeTx(`cosmos-sdk/MsgVote`, vote)
results.push(txResult(0))
@@ -1332,7 +1334,7 @@ Msg Traces:
},
async queryProposals() {
// TODO: return only value of the `value` property when https://github.com/cosmos/cosmos-sdk/issues/2507 is solved
- let proposals = state.proposals
+ const proposals = state.proposals
return Object.keys(proposals).map(key => {
return {
value: JSON.parse(JSON.stringify(proposals[key])),
@@ -1343,7 +1345,7 @@ Msg Traces:
async getGovernanceTxs(addr) {
return (
state.txs.filter(tx => {
- let type = tx.tx.value.msg[0].type
+ const type = tx.tx.value.msg[0].type
if (type === `cosmos-sdk/MsgSubmitProposal`) {
return tx.tx.value.msg[0].value.proposer === addr
@@ -1381,16 +1383,16 @@ function makeHash() {
}
function send(to, from, req) {
- let fromAccount = state.accounts[from]
+ const fromAccount = state.accounts[from]
if (fromAccount == null) {
return txResult(1, `Nonexistent account`)
}
- for (let { denom, amount } of req.amount) {
+ for (const { denom, amount } of req.amount) {
if (parseInt(amount) < 0) {
return txResult(1, `Amount cannot be negative`)
}
- let coins = fromAccount.coins.find(c => c.denom === denom)
+ const coins = fromAccount.coins.find(c => c.denom === denom)
if (!coins || coins.amount < parseInt(amount)) {
return txResult(1, `Not enough coins in your account`)
}
@@ -1408,8 +1410,8 @@ function send(to, from, req) {
incrementSequence(fromAccount)
// update sender balances
- for (let { denom, amount } of req.amount) {
- let senderBalance = fromAccount.coins.find(c => c.denom === denom)
+ for (const { denom, amount } of req.amount) {
+ const senderBalance = fromAccount.coins.find(c => c.denom === denom)
senderBalance.amount = String(
parseInt(senderBalance.amount) - parseInt(amount)
)
@@ -1423,7 +1425,7 @@ function send(to, from, req) {
sequence: `0`
}
}
- for (let { denom, amount } of req.amount) {
+ for (const { denom, amount } of req.amount) {
let receiverBalance = receiverAccount.coins.find(c => c.denom === denom)
if (!receiverBalance) {
receiverBalance = { amount: `0`, denom }
@@ -1504,10 +1506,10 @@ function incrementSequence(account) {
}
function updateValidatorShares(state, operator_address, amount) {
- let candidate = state.candidates.find(
+ const candidate = state.candidates.find(
c => c.operator_address === operator_address
)
- let shares = parseInt(candidate.tokens)
+ const shares = parseInt(candidate.tokens)
candidate.tokens = (+shares - amount).toString()
candidate.delegator_shares = (+shares - amount).toString()
}
diff --git a/app/src/renderer/connectors/node.js b/app/src/renderer/connectors/node.js
index 88579ed521..5803183845 100644
--- a/app/src/renderer/connectors/node.js
+++ b/app/src/renderer/connectors/node.js
@@ -1,33 +1,24 @@
"use strict"
const RestClient = require(`./lcdClient.js`)
-const mockedRestClient = require(`./lcdClientMock.js`)
const RpcWrapper = require(`./rpcWrapper.js`)
-const MockedRpcWrapper = require(`./rpcWrapperMock.js`)
-module.exports = function(axios, localLcdURL, remoteLcdURL, mocked = false) {
- let connector = {
+module.exports = function(axios, stargateUrl, mocked = false) {
+ const connector = {
mocked,
- localLcdURL,
- remoteLcdURL,
+ remoteLcdURL: stargateUrl,
// activate or deactivate the mocked lcdClient
setup: mocked => {
console.log(`Setting connector to state:` + (mocked ? `mocked` : `live`))
- let newRestClient = mocked
- ? mockedRestClient
- : new RestClient(axios, localLcdURL, remoteLcdURL)
- let newRpcClient = mocked
- ? MockedRpcWrapper(connector)
- : RpcWrapper(connector)
+ const newRestClient = new RestClient(axios, stargateUrl)
+ const newRpcClient = RpcWrapper(connector)
Object.assign(connector, newRestClient, newRpcClient)
// we can't assign class functions to an object so we need to iterate over the prototype
- if (!mocked) {
- Object.getOwnPropertyNames(
- Object.getPrototypeOf(newRestClient)
- ).forEach(prop => {
+ Object.getOwnPropertyNames(Object.getPrototypeOf(newRestClient)).forEach(
+ prop => {
connector[prop] = newRestClient[prop]
- })
- }
+ }
+ )
}
}
// TODO: eventually, get all data from light-client connection instead of RPC
diff --git a/app/src/renderer/connectors/rpcWrapper.js b/app/src/renderer/connectors/rpcWrapper.js
index fa6d9fb06a..0441522620 100644
--- a/app/src/renderer/connectors/rpcWrapper.js
+++ b/app/src/renderer/connectors/rpcWrapper.js
@@ -1,10 +1,9 @@
"use strict"
-const RpcClient = require(`tendermint`)
-const { ipcRenderer } = require(`electron`)
+const { RpcClient } = require(`tendermint`)
module.exports = function setRpcWrapper(container) {
- let rpcWrapper = {
+ const rpcWrapper = {
// RPC
rpcInfo: {
connecting: false,
@@ -23,37 +22,39 @@ module.exports = function setRpcWrapper(container) {
rpcWrapper.rpcInfo.connected = false
},
- rpcConnect(rpcURL) {
- let rpcHost =
+ async rpcConnect(rpcURL) {
+ const rpcHost =
rpcURL.startsWith(`http`) && rpcURL.indexOf(`//`) !== -1
? rpcURL.split(`//`)[1]
: rpcURL
+ const https = rpcURL.startsWith(`https`)
+
if (container.rpc) {
rpcWrapper.rpcDisconnect()
}
console.log(`init rpc with ` + rpcURL)
- let newRpc = new RpcClient(`ws://${rpcHost}`)
+ const newRpc = new RpcClient(`${https ? `wss` : `ws`}://${rpcHost}`)
rpcWrapper.rpcInfo.connected = true
// we need to check immediately if the connection fails. later we will not be able to check this error
- newRpc.on(`error`, err => {
- console.log(`rpc error`, err)
- if (err.code === `ECONNREFUSED` || err.code === `ENETUNREACH`) {
- rpcWrapper.rpcInfo.connected = false
- }
- })
- container.rpc = newRpc
+ const connectionAttempt = await Promise.race([
+ new Promise(resolve => {
+ newRpc.on(`error`, err => {
+ resolve({ error: err })
+ })
+ }),
+ newRpc.health()
+ ])
rpcWrapper.rpcInfo.connecting = false
- },
- rpcReconnect: (alreadyConnecting = rpcWrapper.rpcInfo.connecting) => {
- if (alreadyConnecting) return
- rpcWrapper.rpcInfo.connecting = true
- console.log(`trying to reconnect`)
+ if (connectionAttempt.error) {
+ rpcWrapper.rpcInfo.connected = false
+ throw new Error(`WS connection failed`)
+ }
- ipcRenderer.send(`reconnect`)
+ container.rpc = newRpc
}
}
diff --git a/app/src/renderer/connectors/rpcWrapperMock.js b/app/src/renderer/connectors/rpcWrapperMock.js
index c8974b0c94..ff42b6266f 100644
--- a/app/src/renderer/connectors/rpcWrapperMock.js
+++ b/app/src/renderer/connectors/rpcWrapperMock.js
@@ -3,7 +3,7 @@
const mockValidators = require(`../../helpers/json/mock_validators.json`)
const { sleep } = require(`../scripts/common.js`)
-let state = { blockMetas: [], blocks: [], connected: true }
+const state = { blockMetas: [], blocks: [], connected: true }
createBlockMetas(state)
const RpcClientMock = {
@@ -23,7 +23,7 @@ const RpcClientMock = {
cb(null, {
block_metas: state.blockMetas.slice(minHeight)
}),
- status: cb =>
+ health: cb =>
cb(null, {
sync_info: {
latest_block_height: 42
@@ -37,7 +37,7 @@ const RpcClientMock = {
}
module.exports = function setRPCWrapperMock(container) {
- let rpcWrapper = {
+ const rpcWrapper = {
// RPC
// made this a subobject so we can manipulate it in here while assigning it to the outer node object
rpcInfo: {
@@ -52,10 +52,6 @@ module.exports = function setRPCWrapperMock(container) {
state.connected = true
rpcWrapper.rpcInfo.connected = true
container.rpc = RpcClientMock
- },
- rpcReconnect: async () => {
- rpcWrapper.rpcConnect()
- return `127.0.0.1`
}
}
@@ -97,9 +93,9 @@ function createBlock(height) {
}
function createBlockMetas(state) {
- let now = new Date()
+ const now = new Date()
new Array(200).fill(null).forEach((_, i) => {
- let time = new Date(now)
+ const time = new Date(now)
time.setMinutes(time.getMinutes() - i)
state.blockMetas[i] = createBlockMeta(time, i)
@@ -110,7 +106,7 @@ function createBlockMetas(state) {
async function produceBlockHeaders(cb) {
let height = 200
while (state.connected) {
- let newBlockHeader = createBlockMeta(Date.now(), ++height)
+ const newBlockHeader = createBlockMeta(Date.now(), ++height)
state.blockMetas[newBlockHeader.height] = newBlockHeader
cb(null, { data: { value: { header: newBlockHeader } } })
await sleep(1000)
@@ -120,7 +116,7 @@ async function produceBlockHeaders(cb) {
async function produceBlocks(cb) {
let height = 200
while (state.connected) {
- let newBlock = createBlock(++height)
+ const newBlock = createBlock(++height)
state.blocks.push(newBlock)
cb(null, { data: { value: { block: newBlock } } })
await sleep(1000)
diff --git a/app/src/renderer/google-analytics.js b/app/src/renderer/google-analytics.js
index 6ac2df0584..3fd684e113 100644
--- a/app/src/renderer/google-analytics.js
+++ b/app/src/renderer/google-analytics.js
@@ -1,11 +1,27 @@
+/* istanbul ignore file */
+/* global ga */
"use strict"
-/**
- * Google analytics gets injected here
- * @module google-analytics
- */
-import Analytics from "electron-ga"
-
-module.exports = function(gaUID) {
- const analytics = new Analytics(gaUID)
- window.analytics = analytics
+
+module.exports.enableGoogleAnalytics = function enableGoogleAnalytics(gaUID) {
+ // if set to true disables google analytics
+ window[`ga-disable-${gaUID}`] = false
+
+ window.ga =
+ window.ga ||
+ function() {
+ ;(ga.q = ga.q || []).push(arguments)
+ }
+ ga.l = +new Date()
+ ga(`create`, gaUID, `auto`)
+}
+
+module.exports.disableGoogleAnalytics = function disableGoogleAnalytics(gaUID) {
+ // if set to true disables google analytics
+ window[`ga-disable-${gaUID}`] = true
+}
+
+module.exports.track = function track(...args) {
+ if (window.ga) {
+ window.ga(`send`, ...args)
+ }
}
diff --git a/app/src/renderer/main.js b/app/src/renderer/main.js
index 0789439137..250c56cc13 100644
--- a/app/src/renderer/main.js
+++ b/app/src/renderer/main.js
@@ -4,150 +4,7 @@
* @module main
*/
-import Vue from "vue"
-import Electron from "vue-electron"
-import Router from "vue-router"
-import Tooltip from "vue-directive-tooltip"
-import Vuelidate from "vuelidate"
-import * as Sentry from "@sentry/browser"
-import { ipcRenderer, remote } from "electron"
-
-import App from "./App"
-import routes from "./routes"
-import Node from "./connectors/node"
-import Store from "./vuex/store"
-import AxiosProxy from "./scripts/axiosProxy"
-
-const config = remote.getGlobal(`config`)
-
-// exporting this for testing
-let store
-let node
-let router
-
-// Sentry is used for automatic error reporting. It is turned off by default.
-Sentry.init({})
-
-// this will pass the state to Sentry when errors are sent.
-Sentry.configureScope(scope => {
- scope.setExtra(Store.state)
-})
-
-// handle uncaught errors
-window.addEventListener(`unhandledrejection`, function(event) {
- Sentry.captureException(event.reason)
-})
-window.addEventListener(`error`, function(event) {
- Sentry.captureException(event.reason)
-})
-
-Vue.config.errorHandler = (error, vm, info) => {
- console.error(`An error has occurred: ${error}
-
-Guru Meditation #${info}`)
-
- Sentry.captureException(error)
-
- if (store.state.devMode) {
- throw error
- }
-}
-
-Vue.config.warnHandler = (msg, vm, trace) => {
- console.warn(`A warning has occurred: ${msg}
-
-Guru Meditation #${trace}`)
-
- if (store.state.devMode) {
- throw new Error(msg)
- }
-}
-
-Vue.use(Electron)
-Vue.use(Router)
-Vue.use(Tooltip, { delay: 1 })
-Vue.use(Vuelidate)
-
-// directive to focus form fields
-Vue.directive(`focus`, {
- inserted: function(el) {
- el.focus()
- }
-})
-
-/**
- * Main method to boot the renderer. It act as Entrypoint
- */
-async function main() {
- let lcdPort = config.development ? config.lcd_port : config.lcd_port_prod
- let localLcdURL = `https://localhost:${lcdPort}`
- console.log(`Expecting lcd-server on port: ` + lcdPort)
-
- node = Node(AxiosProxy(), localLcdURL, config.node_lcd, config.mocked)
-
- store = Store({ node })
- store.dispatch(`loadTheme`)
-
- router = new Router({
- scrollBehavior: () => ({ y: 0 }),
- routes
- })
-
- router.beforeEach((to, from, next) => {
- if (from.fullPath !== to.fullPath && !store.getters.user.pauseHistory)
- store.commit(`addHistory`, from.fullPath)
- next()
- })
-
- ipcRenderer.on(`error`, (event, err) => {
- switch (err.code) {
- case `NO_NODES_AVAILABLE`:
- store.commit(`setModalNoNodes`, true)
- break
- default:
- store.commit(`setModalError`, true)
- store.commit(`setModalErrorMessage`, err.message)
- }
- })
- ipcRenderer.on(`approve-hash`, (event, hash) => {
- console.log(hash)
- store.commit(`setNodeApprovalRequired`, hash)
- })
-
- let firstStart = true
- ipcRenderer.on(`connected`, (event, { rpcURL }) => {
- node.rpcConnect(rpcURL)
- store.dispatch(`rpcSubscribe`)
- store.dispatch(`subscribeToBlocks`)
-
- if (firstStart) {
- store.dispatch(`showInitialScreen`)
-
- // test connection
- node.lcdConnected().then(connected => {
- if (connected) {
- ipcRenderer.send(`successful-launch`)
- }
- })
-
- firstStart = false
- } else {
- store.dispatch(`reconnected`)
- }
- })
-
- ipcRenderer.send(`booted`)
-
- return new Vue({
- router,
- ...App,
- store
- }).$mount(`#app`)
-}
+import { main } from "scripts/boot"
+// run
main()
-
-// exporting this for testing
-module.exports.store = store
-module.exports.node = node
-module.exports.router = router
diff --git a/app/src/renderer/routes.js b/app/src/renderer/routes.js
index 08cf51e2ef..2f6e5cae3c 100644
--- a/app/src/renderer/routes.js
+++ b/app/src/renderer/routes.js
@@ -31,17 +31,17 @@ export default [
component: require(`./components/governance/PageProposal`).default,
props: true
},
- // STAKE
{
path: `/staking`,
name: `Staking`,
component: require(`./components/staking/PageStaking`).default,
- redirect: `/staking/my-delegations/`,
+ redirect: `/staking/validators/`,
children: [
{
path: `my-delegations`,
name: `My Delegations`,
- component: require(`./components/staking/TabMyDelegations`).default
+ component: require(`./components/staking/TabMyDelegations`).default,
+ meta: { requiresAuth: true }
},
{
path: `validators`,
@@ -60,30 +60,41 @@ export default [
name: `validator`,
component: require(`./components/staking/PageValidator`).default
},
-
{
path: `/preferences`,
name: `preferences`,
- component: require(`./components/common/PagePreferences`).default
+ component: require(`./components/common/PagePreferences`).default,
+ meta: { requiresAuth: true }
},
-
{
path: `/`,
name: `wallet`,
- component: require(`./components/wallet/PageWallet`).default
+ component: require(`./components/wallet/PageWallet`).default,
+ meta: { requiresAuth: true }
},
{
path: `/wallet/send/:denom?`,
name: `send`,
props: true,
- component: require(`./components/wallet/PageSend`).default
+ component: require(`./components/wallet/SendModal`).default,
+ meta: { requiresAuth: true }
},
{
path: `/transactions`,
name: `transactions`,
- component: require(`./components/wallet/PageTransactions`).default
+ component: require(`./components/wallet/PageTransactions`).default,
+ meta: { requiresAuth: true }
+ },
+ {
+ path: `/network`,
+ name: `network`,
+ component: require(`./components/network/PageNetwork`).default
+ },
+ {
+ path: `/blocks/:height`,
+ name: `block`,
+ component: require(`./components/network/PageBlock`).default
},
-
{ path: `/404`, component: require(`./components/common/Page404`).default },
{ path: `*`, component: require(`./components/common/Page404`).default }
]
diff --git a/app/src/renderer/scripts/axiosProxy.js b/app/src/renderer/scripts/axiosProxy.js
deleted file mode 100644
index 773a2eb5e2..0000000000
--- a/app/src/renderer/scripts/axiosProxy.js
+++ /dev/null
@@ -1,36 +0,0 @@
-const { ipcRenderer } = require(`electron`)
-
-// Proxy requests to Axios through the main process because we need
-// Node.js in order to support self-signed TLS certificates.
-module.exports = (requestCounter = 0) => {
- return options =>
- new Promise((resolve, reject) => {
- requestCounter++
-
- if (requestCounter === Number.MAX_SAFE_INTEGER) {
- requestCounter = 0
- }
-
- const channel = `Axios/${requestCounter}`
- ipcRenderer.once(channel, (event, { exception, value }) => {
- ipcRenderer.removeAllListeners(channel)
- if (exception) {
- // TODO: delete console logs on web
- console.error(
- `Request ${options.method.toUpperCase()} ${options.url} failed`,
- exception
- )
- reject(exception)
- } else {
- // TODO: delete console logs on web
- console.log(
- `Request ${options.method.toUpperCase()} ${options.url} successful`,
- value.data
- )
- resolve(value)
- }
- })
-
- ipcRenderer.send(`Axios`, requestCounter, options)
- })
-}
diff --git a/app/src/renderer/scripts/b32.js b/app/src/renderer/scripts/b32.js
index e9952c1dd6..6ae928054e 100644
--- a/app/src/renderer/scripts/b32.js
+++ b/app/src/renderer/scripts/b32.js
@@ -4,11 +4,11 @@ const bech32 = require(`bech32`)
module.exports = {
decode(value) {
- let words = bech32.decode(value)
+ const words = bech32.decode(value)
return Buffer.from(bech32.fromWords(words.words)).toString(`hex`)
},
- encode(value, prefix = `tb`, type = `hex`) {
- let words = bech32.toWords(Buffer.from(value, type))
+ encode(value, prefix = `cosmos1`, type = `hex`) {
+ const words = bech32.toWords(Buffer.from(value, type))
return bech32.encode(prefix, words)
}
}
diff --git a/app/src/renderer/scripts/boot.js b/app/src/renderer/scripts/boot.js
new file mode 100644
index 0000000000..37dc4018b6
--- /dev/null
+++ b/app/src/renderer/scripts/boot.js
@@ -0,0 +1,145 @@
+"use strict"
+/**
+ * Main module
+ * @module main
+ */
+
+import _Vue from "vue"
+import Router from "vue-router"
+import Tooltip from "vue-directive-tooltip"
+import Vuelidate from "vuelidate"
+import * as _Sentry from "@sentry/browser"
+import axios from "axios"
+
+import App from "../App"
+import routes from "../routes"
+import _Node from "../connectors/node"
+import _Store from "../vuex/store"
+import * as urlHelpers from "../../helpers/url.js"
+import _config from "../../config"
+
+export const routeGuard = store => (to, from, next) => {
+ if (from.fullPath !== to.fullPath && !store.getters.user.pauseHistory) {
+ store.commit(`addHistory`, from.fullPath)
+ }
+
+ if (to.redirectedFrom == `/staking` && store.state.user.signedIn) {
+ to = Object.assign({}, to, {
+ path: `/staking/my-delegations`,
+ fullPath: `/staking/my-delegations`,
+ name: `My Delegations`
+ })
+ next(to.path)
+ } else if (
+ !store.state.user.signedIn &&
+ to.matched.some(record => record.meta.requiresAuth)
+ ) {
+ // redirect to session page if auth required
+ store.commit(`setModalSessionState`, `welcome`)
+ store.commit(`setModalSession`, true)
+ }
+ next()
+}
+
+/**
+ * Start the Vue app
+ */
+export const startApp = async (
+ config,
+ Node = _Node,
+ Store = _Store,
+ env = process.env,
+ Sentry = _Sentry,
+ Vue = _Vue
+) => {
+ /* istanbul ignore next */
+ Vue.config.errorHandler = (error, vm, info) => {
+ console.error(`An error has occurred: ${error}
+
+ Guru Meditation #${info}`)
+
+ _Sentry.captureException(error)
+
+ if (store.state.devMode) {
+ throw error
+ }
+ }
+
+ /* istanbul ignore next */
+ Vue.config.warnHandler = (msg, vm, trace) => {
+ console.warn(`A warning has occurred: ${msg}
+
+ Guru Meditation #${trace}`)
+
+ if (store.state.devMode) {
+ throw new Error(msg)
+ }
+ }
+
+ Vue.use(Router)
+ Vue.use(Tooltip, { delay: 1 })
+ Vue.use(Vuelidate)
+
+ // directive to focus form fields
+ /* istanbul ignore next */
+ Vue.directive(`focus`, {
+ inserted: function(el) {
+ el.focus()
+ }
+ })
+
+ // add error handlers in production
+ if (env.NODE_ENV === `production`) {
+ // Sentry is used for automatic error reporting. It is turned off by default.
+ Sentry.init({})
+
+ // this will pass the state to Sentry when errors are sent.
+ // this would also sent passwords...
+ // Sentry.configureScope(scope => {
+ // scope.setExtra(_Store.state)
+ // })
+
+ // handle uncaught errors
+ /* istanbul ignore next */
+ window.addEventListener(`unhandledrejection`, function(event) {
+ Sentry.captureException(event.reason)
+ })
+ /* istanbul ignore next */
+ window.addEventListener(`error`, function(event) {
+ Sentry.captureException(event.reason)
+ })
+ }
+
+ console.log(`Expecting stargate at: ${config.stargate}`)
+
+ const node = Node(axios, config.stargate)
+ const store = Store({ node })
+ const router = new Router({
+ scrollBehavior: () => ({ y: 0 }),
+ routes
+ })
+
+ router.beforeEach(routeGuard(store))
+
+ store.dispatch(`connect`)
+ store.dispatch(`showInitialScreen`)
+
+ return new Vue({
+ router,
+ ...App,
+ store
+ }).$mount(`#app`)
+}
+
+/**
+ * Main method to prepare the boot process. It acts as the entrypoint.
+ */
+export const main = async (
+ getURLParams = urlHelpers.getURLParams,
+ start = startApp
+) => {
+ const params = getURLParams(window)
+ const enrichedConfig = Object.assign({}, _config, params)
+
+ await start(enrichedConfig)
+}
diff --git a/app/src/renderer/scripts/common.js b/app/src/renderer/scripts/common.js
index 24097577ed..95ff9d06c3 100644
--- a/app/src/renderer/scripts/common.js
+++ b/app/src/renderer/scripts/common.js
@@ -21,8 +21,8 @@ module.exports.shortAddress = function(address, length = 4) {
// convert rat format ('123/456') to big number
module.exports.ratToBigNumber = function(rat) {
if (rat.indexOf(`/`) !== -1) {
- let n = new BN(rat.split(`/`)[0])
- let d = new BN(rat.split(`/`)[1] || 1)
+ const n = new BN(rat.split(`/`)[0])
+ const d = new BN(rat.split(`/`)[1] || 1)
return n.div(d)
}
return new BN(rat)
@@ -42,13 +42,13 @@ module.exports.ratToBigNumber = function(rat) {
// could be used in optimistic update PR, pls uncomment or delete when addressed
module.exports.calculateShares = function(validator, tokens) {
- let myTokens = new BN(tokens || 0)
+ const myTokens = new BN(tokens || 0)
- let totalSharesN = new BN(validator.delegator_shares.split(`/`)[0])
- let totalSharesD = new BN(validator.delegator_shares.split(`/`)[1] || 1)
+ const totalSharesN = new BN(validator.delegator_shares.split(`/`)[0])
+ const totalSharesD = new BN(validator.delegator_shares.split(`/`)[1] || 1)
- let totalTokensN = new BN(validator.tokens.split(`/`)[0])
- let totalTokensD = new BN(validator.tokens.split(`/`)[1] || 1)
+ const totalTokensN = new BN(validator.tokens.split(`/`)[0])
+ const totalTokensD = new BN(validator.tokens.split(`/`)[1] || 1)
if (totalTokensN.eq(0)) return new BN(0)
return myTokens
@@ -61,12 +61,12 @@ module.exports.calculateTokens = function(validator, shares) {
// this is the based on the idea that tokens should equal
// (myShares / totalShares) * totalTokens where totalShares
// and totalTokens are both represented as fractions
- let myShares = new BN(shares || 0)
- let totalSharesN = new BN(validator.delegator_shares.split(`/`)[0])
- let totalSharesD = new BN(validator.delegator_shares.split(`/`)[1] || 1)
+ const myShares = new BN(shares || 0)
+ const totalSharesN = new BN(validator.delegator_shares.split(`/`)[0])
+ const totalSharesD = new BN(validator.delegator_shares.split(`/`)[1] || 1)
- let totalTokensN = new BN(validator.tokens.split(`/`)[0])
- let totalTokensD = new BN(validator.tokens.split(`/`)[1] || 1)
+ const totalTokensN = new BN(validator.tokens.split(`/`)[0])
+ const totalTokensD = new BN(validator.tokens.split(`/`)[1] || 1)
if (totalSharesN.eq(0)) return new BN(0)
return myShares
.times(totalSharesD)
diff --git a/app/src/renderer/scripts/keystore.js b/app/src/renderer/scripts/keystore.js
new file mode 100644
index 0000000000..8739f66935
--- /dev/null
+++ b/app/src/renderer/scripts/keystore.js
@@ -0,0 +1,119 @@
+const CryptoJS = require(`crypto-js`)
+
+const keySize = 256
+const iterations = 100
+
+import {
+ generateWallet,
+ generateWalletFromSeed,
+ standardRandomBytesFunc
+} from "./wallet.js"
+
+export function storeKeys(keys) {
+ localStorage.setItem(`keys`, JSON.stringify(keys))
+}
+export function loadKeys() {
+ return JSON.parse(localStorage.getItem(`keys`) || `[]`)
+}
+
+export function getKey(name, password) {
+ const keys = loadKeys()
+ const key = keys.find(key => key.name === name)
+ try {
+ const decrypted = decrypt(key.wallet, password)
+ const wallet = JSON.parse(decrypted)
+
+ return wallet
+ } catch (err) {
+ throw new Error(`The entered password is not correct for the stored key.`)
+ }
+}
+
+function addKey(wallet, name, password) {
+ const keys = loadKeys()
+
+ if (keys.find(key => key.name === name))
+ throw new Error(`Key with that name already exists`)
+
+ const ciphertext = encrypt(JSON.stringify(wallet), password)
+
+ keys.push({
+ name,
+ address: wallet.cosmosAddress,
+ wallet: ciphertext
+ })
+
+ localStorage.setItem(`keys`, JSON.stringify(keys))
+}
+
+export function testPassword(name, password) {
+ const keys = loadKeys()
+
+ const key = keys.find(key => key.name === name)
+ try {
+ // try to decode and check if is json format to proofs that decoding worked
+ const decrypted = decrypt(key.wallet, password)
+ JSON.parse(decrypted)
+ return true
+ } catch (err) {
+ return false
+ }
+}
+
+export function addNewKey(
+ name,
+ password,
+ randomBytesFunc = standardRandomBytesFunc
+) {
+ const wallet = generateWallet(randomBytesFunc)
+ addKey(wallet, name, password)
+
+ return wallet
+}
+export function importKey(name, password, seed) {
+ const wallet = generateWalletFromSeed(seed)
+ addKey(wallet, name, password)
+
+ return wallet
+}
+
+// TODO needs proof reading
+function encrypt(msg, pass) {
+ const salt = CryptoJS.lib.WordArray.random(128 / 8)
+
+ const key = CryptoJS.PBKDF2(pass, salt, {
+ keySize: keySize / 32,
+ iterations: iterations
+ })
+
+ const iv = CryptoJS.lib.WordArray.random(128 / 8)
+
+ const encrypted = CryptoJS.AES.encrypt(msg, key, {
+ iv: iv,
+ padding: CryptoJS.pad.Pkcs7,
+ mode: CryptoJS.mode.CBC
+ })
+
+ // salt, iv will be hex 32 in length
+ // append them to the ciphertext for use in decryption
+ const transitmessage = salt.toString() + iv.toString() + encrypted.toString()
+ return transitmessage
+}
+
+function decrypt(transitmessage, pass) {
+ const salt = CryptoJS.enc.Hex.parse(transitmessage.substr(0, 32))
+ const iv = CryptoJS.enc.Hex.parse(transitmessage.substr(32, 32))
+ const encrypted = transitmessage.substring(64)
+
+ const key = CryptoJS.PBKDF2(pass, salt, {
+ keySize: keySize / 32,
+ iterations: iterations
+ })
+
+ const decrypted = CryptoJS.AES.decrypt(encrypted, key, {
+ iv: iv,
+ padding: CryptoJS.pad.Pkcs7,
+ mode: CryptoJS.mode.CBC
+ }).toString(CryptoJS.enc.Utf8)
+ return decrypted
+}
diff --git a/app/src/renderer/scripts/time.js b/app/src/renderer/scripts/time.js
index c60dea373c..cc13647893 100644
--- a/app/src/renderer/scripts/time.js
+++ b/app/src/renderer/scripts/time.js
@@ -1,9 +1,9 @@
"use strict"
const getUnbondingTime = ({ height, tx }, unbondingDelegations) => {
- let { type, value } = tx.value.msg[0]
+ const { type, value } = tx.value.msg[0]
if (type === `cosmos-sdk/BeginUnbonding`) {
- let unbondingDelegation = unbondingDelegations[value.validator_addr]
+ const unbondingDelegation = unbondingDelegations[value.validator_addr]
if (
unbondingDelegation &&
unbondingDelegation.creation_height === String(height)
diff --git a/app/src/renderer/scripts/tx-utils.js b/app/src/renderer/scripts/tx-utils.js
index 9818a06219..31ff9098a6 100644
--- a/app/src/renderer/scripts/tx-utils.js
+++ b/app/src/renderer/scripts/tx-utils.js
@@ -4,11 +4,11 @@ import crypto from "crypto"
module.exports = {
getTxHash(txstring) {
- let s256Buffer = crypto
+ const s256Buffer = crypto
.createHash(`sha256`)
.update(Buffer.from(txstring, `base64`))
.digest()
- let txbytes = new Uint8Array(s256Buffer)
+ const txbytes = new Uint8Array(s256Buffer)
return Buffer.from(txbytes.slice(0, 20)).toString(`hex`)
}
}
diff --git a/app/src/renderer/scripts/wallet.js b/app/src/renderer/scripts/wallet.js
new file mode 100644
index 0000000000..da4c312f5c
--- /dev/null
+++ b/app/src/renderer/scripts/wallet.js
@@ -0,0 +1,190 @@
+const bip39 = require(`bip39`)
+const bip32 = require(`bip32`)
+const bech32 = require(`bech32`)
+const secp256k1 = require(`secp256k1`)
+import sha256 from "crypto-js/sha256"
+import ripemd160 from "crypto-js/ripemd160"
+import CryptoJS from "crypto-js"
+
+const hdPathAtom = `m/44'/118'/0'/0/0` // key controlling ATOM allocation
+
+const standardRandomBytesFunc = x => CryptoJS.lib.WordArray.random(x).toString()
+
+export function generateWalletFromSeed(mnemonic) {
+ const masterKey = deriveMasterKey(mnemonic)
+ const { privateKey, publicKey } = deriveKeypair(masterKey)
+ const cosmosAddress = createCosmosAddress(publicKey)
+ return {
+ privateKey: privateKey.toString(`hex`),
+ publicKey: publicKey.toString(`hex`),
+ cosmosAddress
+ }
+}
+
+export function generateSeed(randomBytesFunc = standardRandomBytesFunc) {
+ const randomBytes = Buffer.from(randomBytesFunc(32), `hex`)
+ if (randomBytes.length !== 32) throw Error(`Entropy has incorrect length`)
+ const mnemonic = bip39.entropyToMnemonic(randomBytes.toString(`hex`))
+
+ return mnemonic
+}
+
+export function generateWallet(randomBytesFunc = standardRandomBytesFunc) {
+ const mnemonic = generateSeed(randomBytesFunc)
+ return generateWalletFromSeed(mnemonic)
+}
+
+// NOTE: this only works with a compressed public key (33 bytes)
+export function createCosmosAddress(publicKey) {
+ const message = CryptoJS.enc.Hex.parse(publicKey.toString(`hex`))
+ const hash = ripemd160(sha256(message)).toString()
+ const address = Buffer.from(hash, `hex`)
+ const cosmosAddress = bech32ify(address, `cosmos`)
+
+ return cosmosAddress
+}
+
+function deriveMasterKey(mnemonic) {
+ // throws if mnemonic is invalid
+ bip39.validateMnemonic(mnemonic)
+
+ const seed = bip39.mnemonicToSeed(mnemonic)
+ const masterKey = bip32.fromSeed(seed)
+ return masterKey
+}
+
+function deriveKeypair(masterKey) {
+ const cosmosHD = masterKey.derivePath(hdPathAtom)
+ const privateKey = cosmosHD.privateKey
+ const publicKey = secp256k1.publicKeyCreate(privateKey, true)
+
+ return {
+ privateKey,
+ publicKey
+ }
+}
+
+function bech32ify(address, prefix) {
+ const words = bech32.toWords(address)
+ return bech32.encode(prefix, words)
+}
+
+// Transactions often have amino decoded objects in them {type, value}.
+// We need to strip this clutter as we need to sign only the values.
+export function prepareSignBytes(jsonTx) {
+ if (Array.isArray(jsonTx)) {
+ return jsonTx.map(prepareSignBytes)
+ }
+
+ // string or number
+ if (typeof jsonTx !== `object`) {
+ return jsonTx
+ }
+
+ // TODO temporary, https://github.com/cosmos/cosmos-sdk/issues/3336
+ if (
+ jsonTx.type === `cosmos-sdk/MsgSubmitProposal` ||
+ jsonTx.type === `cosmos-sdk/MsgDeposit` ||
+ jsonTx.type === `cosmos-sdk/MsgVote`
+ ) {
+ return prepareSignBytes(jsonTx.value)
+ }
+
+ const sorted = {}
+ Object.keys(jsonTx)
+ .sort()
+ .forEach(key => {
+ if (jsonTx[key] === undefined || jsonTx[key] === null) return
+
+ sorted[key] = prepareSignBytes(jsonTx[key])
+ })
+ return sorted
+}
+
+/*
+The SDK expects a certain message format to serialize and then sign.
+
+type StdSignMsg struct {
+ ChainID string `json:"chain_id"`
+ AccountNumber uint64 `json:"account_number"`
+ Sequence uint64 `json:"sequence"`
+ Fee auth.StdFee `json:"fee"`
+ Msgs []sdk.Msg `json:"msgs"`
+ Memo string `json:"memo"`
+}
+*/
+export function createSignMessage(
+ jsonTx,
+ { sequence, account_number, chain_id }
+) {
+ // sign bytes need amount to be an array
+ const fee = {
+ amount: jsonTx.fee.amount || [],
+ gas: jsonTx.fee.gas
+ }
+
+ return JSON.stringify(
+ prepareSignBytes({
+ fee,
+ memo: jsonTx.memo,
+ msgs: jsonTx.msg, // weird msg vs. msgs
+ sequence,
+ account_number,
+ chain_id
+ })
+ )
+}
+
+// produces the signature for a message (returns Buffer)
+export function signWithPrivateKey(signMessage, privateKey) {
+ const signHash = Buffer.from(sha256(signMessage).toString(), `hex`)
+ const { signature } = secp256k1.sign(signHash, Buffer.from(privateKey, `hex`))
+ return signature
+}
+
+export function createSignature(
+ signature,
+ sequence,
+ account_number,
+ publicKey
+) {
+ return {
+ signature: signature.toString(`base64`),
+ account_number,
+ sequence,
+ pub_key: {
+ type: `tendermint/PubKeySecp256k1`, // TODO: allow other keytypes
+ value: publicKey.toString(`base64`)
+ }
+ }
+}
+
+// main function to sign a jsonTx using the local keystore wallet
+// returns the complete signature object to add to the tx
+export function sign(jsonTx, wallet, requestMetaData) {
+ const { sequence, account_number } = requestMetaData
+ const signMessage = createSignMessage(jsonTx, requestMetaData)
+ const signatureBuffer = signWithPrivateKey(signMessage, wallet.privateKey)
+ const pubKeyBuffer = Buffer.from(wallet.publicKey, `hex`)
+ return createSignature(
+ signatureBuffer,
+ sequence,
+ account_number,
+ pubKeyBuffer
+ )
+}
+
+// adds the signature object to the tx
+export function createSignedTx(tx, signature) {
+ return Object.assign({}, tx, {
+ signatures: [signature]
+ })
+}
+
+// the broadcast body consists of the signed tx and a return type
+export function createBroadcastBody(signedTx) {
+ return JSON.stringify({
+ tx: signedTx,
+ return: `block`
+ })
+}
diff --git a/app/src/renderer/styles/app.css b/app/src/renderer/styles/app.css
index 12d0b71477..618b4ff4e9 100644
--- a/app/src/renderer/styles/app.css
+++ b/app/src/renderer/styles/app.css
@@ -1,9 +1,6 @@
/* @import '../../../../node_modules/nib/index.styl' */
@import "reset";
@import "variables";
-@import "vendor/font-awesome-adblock-bypass.css";
-@import "vendor/font-awesome.css";
-@import "vendor/font-awesome.min.css";
@import "vendor/material-icons.css";
@import "vendor/perfect-scrollbar.css";
@import "vendor/vue-directive-tooltip.css";
@@ -28,9 +25,10 @@ html {
a {
color: var(--link);
text-decoration: none;
+ font-weight: 500;
}
a:hover {
- color: #1f75ff;
+ color: var(--link-hover);
}
.desktop-only {
display: none;
@@ -52,15 +50,24 @@ a:hover {
.tm-field {
border-radius: 0.25rem !important;
}
+input[readonly],
+input[disabled],
+textarea[readonly],
+textarea[disabled] {
+ background: var(--bc-dim) !important;
+ border-color: var(--bc) !important;
+}
+
+input[type="radio"] {
+ margin: 0;
+}
input.tm-field {
height: inherit !important;
}
-.tm-select .tm-field {
- border: 1px solid var(--bc, #ddd);
-}
.tm-select .tm-field-select-addon {
height: 100% !important;
- border-left: 1px solid var(--bc, #ddd);
+ border-left: 1px solid var(--input-bc, #ccc);
+ width: 29px !important;
}
.tm-part-main {
padding-right: 0 !important;
@@ -72,16 +79,24 @@ input.tm-field {
.tm-data-msg {
border: 1px solid var(--bc-dim);
}
-.tm-btn__container {
- border-width: 1px;
- padding: 0 2rem;
-}
.tm-page-header-body {
position: relative;
}
.tm-li-container {
margin-right: 1rem;
}
+.input-suffix {
+ background: var(--bc-dim);
+ display: inline-block;
+ position: absolute;
+ padding: 6px 8px;
+ font-size: var(--sm);
+ right: 30px;
+ letter-spacing: 1px;
+ text-align: right;
+ font-weight: 500;
+ border-radius: 2px;
+}
#app-content {
flex: 1;
display: flex;
@@ -103,3 +118,14 @@ input.tm-field {
.desktop-only {
display: inline;
}
+
+#develop-mode-warning {
+ background: red;
+ text-align: center;
+ height: 2.5rem;
+ padding: 0.5rem;
+ position: fixed;
+ z-index: 1000000;
+ width: 100%;
+ top: 0;
+}
diff --git a/app/src/renderer/styles/table.css b/app/src/renderer/styles/table.css
index ea255fd9f3..1fb870fd97 100644
--- a/app/src/renderer/styles/table.css
+++ b/app/src/renderer/styles/table.css
@@ -1,56 +1,37 @@
.data-table {
border-spacing: 0 0.25rem;
- margin: 0 0 0 2rem;
+ width: 100%;
padding: 0;
table-layout: auto;
- counter-reset: rowNumber1;
-}
-
-.data-table tr {
- counter-increment: rowNumber;
}
.data-table tr td:first-child::before {
- content: counter(rowNumber);
position: absolute;
- font-size: sm;
- width: 2rem;
+ font-size: var(--sm);
text-align: right;
color: var(--dim);
- left: -3rem;
-}
-
-.data-table th {
- /* min-width: 130px; */
- width: 100%;
- padding: 0.5rem;
+ left: -1.5rem;
}
.data-table th {
- min-width: 122px;
- width: 100%;
padding: 0.5rem;
text-align: left;
}
+
.data-table td {
- min-width: 122px;
- width: 100%;
padding: 0.5rem;
position: relative;
- vertical-align: bottom;
-}
-.data-table td:not(:first-child) {
- padding-bottom: 1rem;
+ color: var(--bright);
}
.data-table__row__cell__separator:after {
display: block;
position: absolute;
content: "";
- height: 2rem;
+ height: 2.5rem;
width: 2px;
- top: 1.5rem;
- right: 0.5rem;
+ top: 0.75rem;
+ right: 0.75rem;
background: var(--bc-dim);
}
@@ -60,25 +41,27 @@
border-radius: 0.25rem;
border: 1px solid var(--bc-dim);
}
+
.data-table__row:hover {
background: var(--hover-bg);
}
+
.data-table__row__info {
display: flex;
align-items: center;
width: 100%;
- min-width: 284px;
}
+
.data-table__row__info__container__status {
left: 0;
top: 9px;
border-radius: 50%;
display: inline-block;
height: 0.5rem;
- /* left: -1rem; */
position: absolute;
width: 0.5rem;
}
+
.data-table__row__info__container__status.red {
background: var(--danger);
}
@@ -90,9 +73,11 @@
.data-table__row__info__container__status.green {
background: var(--success);
}
+
.data-table__row__info__container {
position: relative;
}
+
.data-table__row__info__container__name {
padding-left: 1rem;
max-width: 200px;
@@ -100,17 +85,19 @@
white-space: nowrap;
text-overflow: ellipsis;
}
+
.data-table__row__info__image {
height: 3rem;
width: 3rem;
- margin: 0.5rem;
- border-radius: 50%;
+ margin-right: 0.5rem;
display: block;
background: var(--app-nav);
}
+
.data-table__row__info__image--no-img {
padding: 0.5rem;
}
+
.data-table__row__info__container__description {
font-size: var(--sm);
padding-left: 1rem;
diff --git a/app/src/renderer/styles/variables.css b/app/src/renderer/styles/variables.css
index 30cb48cd14..be6bd1e058 100644
--- a/app/src/renderer/styles/variables.css
+++ b/app/src/renderer/styles/variables.css
@@ -5,6 +5,7 @@
--secondary: hsl(277, 92%, 58%);
--primary: hsl(233, 88%, 57%);
--link: hsl(217, 100%, 70%);
+ --link-hover: rgba(31, 117, 255, 1);
--hover: rgba(0, 0, 0, 8%);
--hover-bg: rgba(27, 113, 255, 0.1);
--bright: hsl(0, 100%, 100%);
diff --git a/app/src/renderer/styles/vendor/font-awesome-adblock-bypass.css b/app/src/renderer/styles/vendor/font-awesome-adblock-bypass.css
deleted file mode 100644
index 8c03a39d09..0000000000
--- a/app/src/renderer/styles/vendor/font-awesome-adblock-bypass.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.fa-twatter:before {
- content: "\f099";
-}
-.fa-footbook:before {
- content: "\f09a";
-}
-.fa-slick:before {
- content: "\f198";
-}
-.fa-linkedout:before {
- content: "\f0e1";
-}
diff --git a/app/src/renderer/styles/vendor/font-awesome.css b/app/src/renderer/styles/vendor/font-awesome.css
deleted file mode 100644
index f734577a8d..0000000000
--- a/app/src/renderer/styles/vendor/font-awesome.css
+++ /dev/null
@@ -1,2343 +0,0 @@
-/*!
- * Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
- * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */
-/* FONT PATH
- * -------------------------- */
-@font-face {
- font-family: "FontAwesome";
- src: url("../../assets/fonts/fontawesome-webfont.eot?v=4.7.0");
- src: url("../../assets/fonts/fontawesome-webfont.eot?#iefix&v=4.7.0")
- format("embedded-opentype"),
- url("../../assets/fonts/fontawesome-webfont.woff2?v=4.7.0") format("woff2"),
- url("../../assets/fonts/fontawesome-webfont.woff?v=4.7.0") format("woff"),
- url("../../assets/fonts/fontawesome-webfont.ttf?v=4.7.0") format("truetype"),
- url("../../assets/fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular")
- format("svg");
- font-weight: normal;
- font-style: normal;
-}
-.fa {
- display: inline-block;
- font: normal normal normal 14px/1 FontAwesome;
- font-size: inherit;
- text-rendering: auto;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-/* makes the font 33% larger relative to the icon container */
-.fa-lg {
- font-size: 1.33333333em;
- line-height: 0.75em;
- vertical-align: -15%;
-}
-.fa-2x {
- font-size: 2em;
-}
-.fa-3x {
- font-size: 3em;
-}
-.fa-4x {
- font-size: 4em;
-}
-.fa-5x {
- font-size: 5em;
-}
-.fa-fw {
- width: 1.28571429em;
- text-align: center;
-}
-.fa-ul {
- padding-left: 0;
- margin-left: 2.14285714em;
- list-style-type: none;
-}
-.fa-ul > li {
- position: relative;
-}
-.fa-li {
- position: absolute;
- left: -2.14285714em;
- width: 2.14285714em;
- top: 0.14285714em;
- text-align: center;
-}
-.fa-li.fa-lg {
- left: -1.85714286em;
-}
-.fa-border {
- padding: 0.2em 0.25em 0.15em;
- border: solid 0.08em #eeeeee;
- border-radius: 0.1em;
-}
-.fa-pull-left {
- float: left;
-}
-.fa-pull-right {
- float: right;
-}
-.fa.fa-pull-left {
- margin-right: 0.3em;
-}
-.fa.fa-pull-right {
- margin-left: 0.3em;
-}
-/* Deprecated as of 4.4.0 */
-.pull-right {
- float: right;
-}
-.pull-left {
- float: left;
-}
-.fa.pull-left {
- margin-right: 0.3em;
-}
-.fa.pull-right {
- margin-left: 0.3em;
-}
-.fa-spin {
- -webkit-animation: fa-spin 2s infinite linear;
- animation: fa-spin 2s infinite linear;
-}
-.fa-pulse {
- -webkit-animation: fa-spin 1s infinite steps(8);
- animation: fa-spin 1s infinite steps(8);
-}
-@-webkit-keyframes fa-spin {
- 0% {
- -webkit-transform: rotate(0deg);
- transform: rotate(0deg);
- }
- 100% {
- -webkit-transform: rotate(359deg);
- transform: rotate(359deg);
- }
-}
-@keyframes fa-spin {
- 0% {
- -webkit-transform: rotate(0deg);
- transform: rotate(0deg);
- }
- 100% {
- -webkit-transform: rotate(359deg);
- transform: rotate(359deg);
- }
-}
-.fa-rotate-90 {
- -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";
- -webkit-transform: rotate(90deg);
- -ms-transform: rotate(90deg);
- transform: rotate(90deg);
-}
-.fa-rotate-180 {
- -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";
- -webkit-transform: rotate(180deg);
- -ms-transform: rotate(180deg);
- transform: rotate(180deg);
-}
-.fa-rotate-270 {
- -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";
- -webkit-transform: rotate(270deg);
- -ms-transform: rotate(270deg);
- transform: rotate(270deg);
-}
-.fa-flip-horizontal {
- -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";
- -webkit-transform: scale(-1, 1);
- -ms-transform: scale(-1, 1);
- transform: scale(-1, 1);
-}
-.fa-flip-vertical {
- -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";
- -webkit-transform: scale(1, -1);
- -ms-transform: scale(1, -1);
- transform: scale(1, -1);
-}
-:root .fa-rotate-90,
-:root .fa-rotate-180,
-:root .fa-rotate-270,
-:root .fa-flip-horizontal,
-:root .fa-flip-vertical {
- filter: none;
-}
-.fa-stack {
- position: relative;
- display: inline-block;
- width: 2em;
- height: 2em;
- line-height: 2em;
- vertical-align: middle;
-}
-.fa-stack-1x,
-.fa-stack-2x {
- position: absolute;
- left: 0;
- width: 100%;
- text-align: center;
-}
-.fa-stack-1x {
- line-height: inherit;
-}
-.fa-stack-2x {
- font-size: 2em;
-}
-.fa-inverse {
- color: #ffffff;
-}
-/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
- readers do not read off random characters that represent icons */
-.fa-glass:before {
- content: "\f000";
-}
-.fa-music:before {
- content: "\f001";
-}
-.fa-search:before {
- content: "\f002";
-}
-.fa-envelope-o:before {
- content: "\f003";
-}
-.fa-heart:before {
- content: "\f004";
-}
-.fa-star:before {
- content: "\f005";
-}
-.fa-star-o:before {
- content: "\f006";
-}
-.fa-user:before {
- content: "\f007";
-}
-.fa-film:before {
- content: "\f008";
-}
-.fa-th-large:before {
- content: "\f009";
-}
-.fa-th:before {
- content: "\f00a";
-}
-.fa-th-list:before {
- content: "\f00b";
-}
-.fa-check:before {
- content: "\f00c";
-}
-.fa-remove:before,
-.fa-close:before,
-.fa-times:before {
- content: "\f00d";
-}
-.fa-search-plus:before {
- content: "\f00e";
-}
-.fa-search-minus:before {
- content: "\f010";
-}
-.fa-power-off:before {
- content: "\f011";
-}
-.fa-signal:before {
- content: "\f012";
-}
-.fa-gear:before,
-.fa-cog:before {
- content: "\f013";
-}
-.fa-trash-o:before {
- content: "\f014";
-}
-.fa-home:before {
- content: "\f015";
-}
-.fa-file-o:before {
- content: "\f016";
-}
-.fa-clock-o:before {
- content: "\f017";
-}
-.fa-road:before {
- content: "\f018";
-}
-.fa-download:before {
- content: "\f019";
-}
-.fa-arrow-circle-o-down:before {
- content: "\f01a";
-}
-.fa-arrow-circle-o-up:before {
- content: "\f01b";
-}
-.fa-inbox:before {
- content: "\f01c";
-}
-.fa-play-circle-o:before {
- content: "\f01d";
-}
-.fa-rotate-right:before,
-.fa-repeat:before {
- content: "\f01e";
-}
-.fa-refresh:before {
- content: "\f021";
-}
-.fa-list-alt:before {
- content: "\f022";
-}
-.fa-lock:before {
- content: "\f023";
-}
-.fa-flag:before {
- content: "\f024";
-}
-.fa-headphones:before {
- content: "\f025";
-}
-.fa-volume-off:before {
- content: "\f026";
-}
-.fa-volume-down:before {
- content: "\f027";
-}
-.fa-volume-up:before {
- content: "\f028";
-}
-.fa-qrcode:before {
- content: "\f029";
-}
-.fa-barcode:before {
- content: "\f02a";
-}
-.fa-tag:before {
- content: "\f02b";
-}
-.fa-tags:before {
- content: "\f02c";
-}
-.fa-book:before {
- content: "\f02d";
-}
-.fa-bookmark:before {
- content: "\f02e";
-}
-.fa-print:before {
- content: "\f02f";
-}
-.fa-camera:before {
- content: "\f030";
-}
-.fa-font:before {
- content: "\f031";
-}
-.fa-bold:before {
- content: "\f032";
-}
-.fa-italic:before {
- content: "\f033";
-}
-.fa-text-height:before {
- content: "\f034";
-}
-.fa-text-width:before {
- content: "\f035";
-}
-.fa-align-left:before {
- content: "\f036";
-}
-.fa-align-center:before {
- content: "\f037";
-}
-.fa-align-right:before {
- content: "\f038";
-}
-.fa-align-justify:before {
- content: "\f039";
-}
-.fa-list:before {
- content: "\f03a";
-}
-.fa-dedent:before,
-.fa-outdent:before {
- content: "\f03b";
-}
-.fa-indent:before {
- content: "\f03c";
-}
-.fa-video-camera:before {
- content: "\f03d";
-}
-.fa-photo:before,
-.fa-image:before,
-.fa-picture-o:before {
- content: "\f03e";
-}
-.fa-pencil:before {
- content: "\f040";
-}
-.fa-map-marker:before {
- content: "\f041";
-}
-.fa-adjust:before {
- content: "\f042";
-}
-.fa-tint:before {
- content: "\f043";
-}
-.fa-edit:before,
-.fa-pencil-square-o:before {
- content: "\f044";
-}
-.fa-share-square-o:before {
- content: "\f045";
-}
-.fa-check-square-o:before {
- content: "\f046";
-}
-.fa-arrows:before {
- content: "\f047";
-}
-.fa-step-backward:before {
- content: "\f048";
-}
-.fa-fast-backward:before {
- content: "\f049";
-}
-.fa-backward:before {
- content: "\f04a";
-}
-.fa-play:before {
- content: "\f04b";
-}
-.fa-pause:before {
- content: "\f04c";
-}
-.fa-stop:before {
- content: "\f04d";
-}
-.fa-forward:before {
- content: "\f04e";
-}
-.fa-fast-forward:before {
- content: "\f050";
-}
-.fa-step-forward:before {
- content: "\f051";
-}
-.fa-eject:before {
- content: "\f052";
-}
-.fa-chevron-left:before {
- content: "\f053";
-}
-.fa-chevron-right:before {
- content: "\f054";
-}
-.fa-plus-circle:before {
- content: "\f055";
-}
-.fa-minus-circle:before {
- content: "\f056";
-}
-.fa-times-circle:before {
- content: "\f057";
-}
-.fa-check-circle:before {
- content: "\f058";
-}
-.fa-question-circle:before {
- content: "\f059";
-}
-.fa-info-circle:before {
- content: "\f05a";
-}
-.fa-crosshairs:before {
- content: "\f05b";
-}
-.fa-times-circle-o:before {
- content: "\f05c";
-}
-.fa-check-circle-o:before {
- content: "\f05d";
-}
-.fa-ban:before {
- content: "\f05e";
-}
-.fa-arrow-left:before {
- content: "\f060";
-}
-.fa-arrow-right:before {
- content: "\f061";
-}
-.fa-arrow-up:before {
- content: "\f062";
-}
-.fa-arrow-down:before {
- content: "\f063";
-}
-.fa-mail-forward:before,
-.fa-share:before {
- content: "\f064";
-}
-.fa-expand:before {
- content: "\f065";
-}
-.fa-compress:before {
- content: "\f066";
-}
-.fa-plus:before {
- content: "\f067";
-}
-.fa-minus:before {
- content: "\f068";
-}
-.fa-asterisk:before {
- content: "\f069";
-}
-.fa-exclamation-circle:before {
- content: "\f06a";
-}
-.fa-gift:before {
- content: "\f06b";
-}
-.fa-leaf:before {
- content: "\f06c";
-}
-.fa-fire:before {
- content: "\f06d";
-}
-.fa-eye:before {
- content: "\f06e";
-}
-.fa-eye-slash:before {
- content: "\f070";
-}
-.fa-warning:before,
-.fa-exclamation-triangle:before {
- content: "\f071";
-}
-.fa-plane:before {
- content: "\f072";
-}
-.fa-calendar:before {
- content: "\f073";
-}
-.fa-random:before {
- content: "\f074";
-}
-.fa-comment:before {
- content: "\f075";
-}
-.fa-magnet:before {
- content: "\f076";
-}
-.fa-chevron-up:before {
- content: "\f077";
-}
-.fa-chevron-down:before {
- content: "\f078";
-}
-.fa-retweet:before {
- content: "\f079";
-}
-.fa-shopping-cart:before {
- content: "\f07a";
-}
-.fa-folder:before {
- content: "\f07b";
-}
-.fa-folder-open:before {
- content: "\f07c";
-}
-.fa-arrows-v:before {
- content: "\f07d";
-}
-.fa-arrows-h:before {
- content: "\f07e";
-}
-.fa-bar-chart-o:before,
-.fa-bar-chart:before {
- content: "\f080";
-}
-.fa-twitter-square:before {
- content: "\f081";
-}
-.fa-facebook-square:before {
- content: "\f082";
-}
-.fa-camera-retro:before {
- content: "\f083";
-}
-.fa-key:before {
- content: "\f084";
-}
-.fa-gears:before,
-.fa-cogs:before {
- content: "\f085";
-}
-.fa-comments:before {
- content: "\f086";
-}
-.fa-thumbs-o-up:before {
- content: "\f087";
-}
-.fa-thumbs-o-down:before {
- content: "\f088";
-}
-.fa-star-half:before {
- content: "\f089";
-}
-.fa-heart-o:before {
- content: "\f08a";
-}
-.fa-sign-out:before {
- content: "\f08b";
-}
-.fa-linkedin-square:before {
- content: "\f08c";
-}
-.fa-thumb-tack:before {
- content: "\f08d";
-}
-.fa-external-link:before {
- content: "\f08e";
-}
-.fa-sign-in:before {
- content: "\f090";
-}
-.fa-trophy:before {
- content: "\f091";
-}
-.fa-github-square:before {
- content: "\f092";
-}
-.fa-upload:before {
- content: "\f093";
-}
-.fa-lemon-o:before {
- content: "\f094";
-}
-.fa-phone:before {
- content: "\f095";
-}
-.fa-square-o:before {
- content: "\f096";
-}
-.fa-bookmark-o:before {
- content: "\f097";
-}
-.fa-phone-square:before {
- content: "\f098";
-}
-.fa-twitter:before {
- content: "\f099";
-}
-.fa-facebook-f:before,
-.fa-facebook:before {
- content: "\f09a";
-}
-.fa-github:before {
- content: "\f09b";
-}
-.fa-unlock:before {
- content: "\f09c";
-}
-.fa-credit-card:before {
- content: "\f09d";
-}
-.fa-feed:before,
-.fa-rss:before {
- content: "\f09e";
-}
-.fa-hdd-o:before {
- content: "\f0a0";
-}
-.fa-bullhorn:before {
- content: "\f0a1";
-}
-.fa-bell:before {
- content: "\f0f3";
-}
-.fa-certificate:before {
- content: "\f0a3";
-}
-.fa-hand-o-right:before {
- content: "\f0a4";
-}
-.fa-hand-o-left:before {
- content: "\f0a5";
-}
-.fa-hand-o-up:before {
- content: "\f0a6";
-}
-.fa-hand-o-down:before {
- content: "\f0a7";
-}
-.fa-arrow-circle-left:before {
- content: "\f0a8";
-}
-.fa-arrow-circle-right:before {
- content: "\f0a9";
-}
-.fa-arrow-circle-up:before {
- content: "\f0aa";
-}
-.fa-arrow-circle-down:before {
- content: "\f0ab";
-}
-.fa-globe:before {
- content: "\f0ac";
-}
-.fa-wrench:before {
- content: "\f0ad";
-}
-.fa-tasks:before {
- content: "\f0ae";
-}
-.fa-filter:before {
- content: "\f0b0";
-}
-.fa-briefcase:before {
- content: "\f0b1";
-}
-.fa-arrows-alt:before {
- content: "\f0b2";
-}
-.fa-group:before,
-.fa-users:before {
- content: "\f0c0";
-}
-.fa-chain:before,
-.fa-link:before {
- content: "\f0c1";
-}
-.fa-cloud:before {
- content: "\f0c2";
-}
-.fa-flask:before {
- content: "\f0c3";
-}
-.fa-cut:before,
-.fa-scissors:before {
- content: "\f0c4";
-}
-.fa-copy:before,
-.fa-files-o:before {
- content: "\f0c5";
-}
-.fa-paperclip:before {
- content: "\f0c6";
-}
-.fa-save:before,
-.fa-floppy-o:before {
- content: "\f0c7";
-}
-.fa-square:before {
- content: "\f0c8";
-}
-.fa-navicon:before,
-.fa-reorder:before,
-.fa-bars:before {
- content: "\f0c9";
-}
-.fa-list-ul:before {
- content: "\f0ca";
-}
-.fa-list-ol:before {
- content: "\f0cb";
-}
-.fa-strikethrough:before {
- content: "\f0cc";
-}
-.fa-underline:before {
- content: "\f0cd";
-}
-.fa-table:before {
- content: "\f0ce";
-}
-.fa-magic:before {
- content: "\f0d0";
-}
-.fa-truck:before {
- content: "\f0d1";
-}
-.fa-pinterest:before {
- content: "\f0d2";
-}
-.fa-pinterest-square:before {
- content: "\f0d3";
-}
-.fa-google-plus-square:before {
- content: "\f0d4";
-}
-.fa-google-plus:before {
- content: "\f0d5";
-}
-.fa-money:before {
- content: "\f0d6";
-}
-.fa-caret-down:before {
- content: "\f0d7";
-}
-.fa-caret-up:before {
- content: "\f0d8";
-}
-.fa-caret-left:before {
- content: "\f0d9";
-}
-.fa-caret-right:before {
- content: "\f0da";
-}
-.fa-columns:before {
- content: "\f0db";
-}
-.fa-unsorted:before,
-.fa-sort:before {
- content: "\f0dc";
-}
-.fa-sort-down:before,
-.fa-sort-desc:before {
- content: "\f0dd";
-}
-.fa-sort-up:before,
-.fa-sort-asc:before {
- content: "\f0de";
-}
-.fa-envelope:before {
- content: "\f0e0";
-}
-.fa-linkedin:before {
- content: "\f0e1";
-}
-.fa-rotate-left:before,
-.fa-undo:before {
- content: "\f0e2";
-}
-.fa-legal:before,
-.fa-gavel:before {
- content: "\f0e3";
-}
-.fa-dashboard:before,
-.fa-tachometer:before {
- content: "\f0e4";
-}
-.fa-comment-o:before {
- content: "\f0e5";
-}
-.fa-comments-o:before {
- content: "\f0e6";
-}
-.fa-flash:before,
-.fa-bolt:before {
- content: "\f0e7";
-}
-.fa-sitemap:before {
- content: "\f0e8";
-}
-.fa-umbrella:before {
- content: "\f0e9";
-}
-.fa-paste:before,
-.fa-clipboard:before {
- content: "\f0ea";
-}
-.fa-lightbulb-o:before {
- content: "\f0eb";
-}
-.fa-exchange:before {
- content: "\f0ec";
-}
-.fa-cloud-download:before {
- content: "\f0ed";
-}
-.fa-cloud-upload:before {
- content: "\f0ee";
-}
-.fa-user-md:before {
- content: "\f0f0";
-}
-.fa-stethoscope:before {
- content: "\f0f1";
-}
-.fa-suitcase:before {
- content: "\f0f2";
-}
-.fa-bell-o:before {
- content: "\f0a2";
-}
-.fa-coffee:before {
- content: "\f0f4";
-}
-.fa-cutlery:before {
- content: "\f0f5";
-}
-.fa-file-text-o:before {
- content: "\f0f6";
-}
-.fa-building-o:before {
- content: "\f0f7";
-}
-.fa-hospital-o:before {
- content: "\f0f8";
-}
-.fa-ambulance:before {
- content: "\f0f9";
-}
-.fa-medkit:before {
- content: "\f0fa";
-}
-.fa-fighter-jet:before {
- content: "\f0fb";
-}
-.fa-beer:before {
- content: "\f0fc";
-}
-.fa-h-square:before {
- content: "\f0fd";
-}
-.fa-plus-square:before {
- content: "\f0fe";
-}
-.fa-angle-double-left:before {
- content: "\f100";
-}
-.fa-angle-double-right:before {
- content: "\f101";
-}
-.fa-angle-double-up:before {
- content: "\f102";
-}
-.fa-angle-double-down:before {
- content: "\f103";
-}
-.fa-angle-left:before {
- content: "\f104";
-}
-.fa-angle-right:before {
- content: "\f105";
-}
-.fa-angle-up:before {
- content: "\f106";
-}
-.fa-angle-down:before {
- content: "\f107";
-}
-.fa-desktop:before {
- content: "\f108";
-}
-.fa-laptop:before {
- content: "\f109";
-}
-.fa-tablet:before {
- content: "\f10a";
-}
-.fa-mobile-phone:before,
-.fa-mobile:before {
- content: "\f10b";
-}
-.fa-circle-o:before {
- content: "\f10c";
-}
-.fa-quote-left:before {
- content: "\f10d";
-}
-.fa-quote-right:before {
- content: "\f10e";
-}
-.fa-spinner:before {
- content: "\f110";
-}
-.fa-circle:before {
- content: "\f111";
-}
-.fa-mail-reply:before,
-.fa-reply:before {
- content: "\f112";
-}
-.fa-github-alt:before {
- content: "\f113";
-}
-.fa-folder-o:before {
- content: "\f114";
-}
-.fa-folder-open-o:before {
- content: "\f115";
-}
-.fa-smile-o:before {
- content: "\f118";
-}
-.fa-frown-o:before {
- content: "\f119";
-}
-.fa-meh-o:before {
- content: "\f11a";
-}
-.fa-gamepad:before {
- content: "\f11b";
-}
-.fa-keyboard-o:before {
- content: "\f11c";
-}
-.fa-flag-o:before {
- content: "\f11d";
-}
-.fa-flag-checkered:before {
- content: "\f11e";
-}
-.fa-terminal:before {
- content: "\f120";
-}
-.fa-code:before {
- content: "\f121";
-}
-.fa-mail-reply-all:before,
-.fa-reply-all:before {
- content: "\f122";
-}
-.fa-star-half-empty:before,
-.fa-star-half-full:before,
-.fa-star-half-o:before {
- content: "\f123";
-}
-.fa-location-arrow:before {
- content: "\f124";
-}
-.fa-crop:before {
- content: "\f125";
-}
-.fa-code-fork:before {
- content: "\f126";
-}
-.fa-unlink:before,
-.fa-chain-broken:before {
- content: "\f127";
-}
-.fa-question:before {
- content: "\f128";
-}
-.fa-info:before {
- content: "\f129";
-}
-.fa-exclamation:before {
- content: "\f12a";
-}
-.fa-superscript:before {
- content: "\f12b";
-}
-.fa-subscript:before {
- content: "\f12c";
-}
-.fa-eraser:before {
- content: "\f12d";
-}
-.fa-puzzle-piece:before {
- content: "\f12e";
-}
-.fa-microphone:before {
- content: "\f130";
-}
-.fa-microphone-slash:before {
- content: "\f131";
-}
-.fa-shield:before {
- content: "\f132";
-}
-.fa-calendar-o:before {
- content: "\f133";
-}
-.fa-fire-extinguisher:before {
- content: "\f134";
-}
-.fa-rocket:before {
- content: "\f135";
-}
-.fa-maxcdn:before {
- content: "\f136";
-}
-.fa-chevron-circle-left:before {
- content: "\f137";
-}
-.fa-chevron-circle-right:before {
- content: "\f138";
-}
-.fa-chevron-circle-up:before {
- content: "\f139";
-}
-.fa-chevron-circle-down:before {
- content: "\f13a";
-}
-.fa-html5:before {
- content: "\f13b";
-}
-.fa-css3:before {
- content: "\f13c";
-}
-.fa-anchor:before {
- content: "\f13d";
-}
-.fa-unlock-alt:before {
- content: "\f13e";
-}
-.fa-bullseye:before {
- content: "\f140";
-}
-.fa-ellipsis-h:before {
- content: "\f141";
-}
-.fa-ellipsis-v:before {
- content: "\f142";
-}
-.fa-rss-square:before {
- content: "\f143";
-}
-.fa-play-circle:before {
- content: "\f144";
-}
-.fa-ticket:before {
- content: "\f145";
-}
-.fa-minus-square:before {
- content: "\f146";
-}
-.fa-minus-square-o:before {
- content: "\f147";
-}
-.fa-level-up:before {
- content: "\f148";
-}
-.fa-level-down:before {
- content: "\f149";
-}
-.fa-check-square:before {
- content: "\f14a";
-}
-.fa-pencil-square:before {
- content: "\f14b";
-}
-.fa-external-link-square:before {
- content: "\f14c";
-}
-.fa-share-square:before {
- content: "\f14d";
-}
-.fa-compass:before {
- content: "\f14e";
-}
-.fa-toggle-down:before,
-.fa-caret-square-o-down:before {
- content: "\f150";
-}
-.fa-toggle-up:before,
-.fa-caret-square-o-up:before {
- content: "\f151";
-}
-.fa-toggle-right:before,
-.fa-caret-square-o-right:before {
- content: "\f152";
-}
-.fa-euro:before,
-.fa-eur:before {
- content: "\f153";
-}
-.fa-gbp:before {
- content: "\f154";
-}
-.fa-dollar:before,
-.fa-usd:before {
- content: "\f155";
-}
-.fa-rupee:before,
-.fa-inr:before {
- content: "\f156";
-}
-.fa-cny:before,
-.fa-rmb:before,
-.fa-yen:before,
-.fa-jpy:before {
- content: "\f157";
-}
-.fa-ruble:before,
-.fa-rouble:before,
-.fa-rub:before {
- content: "\f158";
-}
-.fa-won:before,
-.fa-krw:before {
- content: "\f159";
-}
-.fa-bitcoin:before,
-.fa-btc:before {
- content: "\f15a";
-}
-.fa-file:before {
- content: "\f15b";
-}
-.fa-file-text:before {
- content: "\f15c";
-}
-.fa-sort-alpha-asc:before {
- content: "\f15d";
-}
-.fa-sort-alpha-desc:before {
- content: "\f15e";
-}
-.fa-sort-amount-asc:before {
- content: "\f160";
-}
-.fa-sort-amount-desc:before {
- content: "\f161";
-}
-.fa-sort-numeric-asc:before {
- content: "\f162";
-}
-.fa-sort-numeric-desc:before {
- content: "\f163";
-}
-.fa-thumbs-up:before {
- content: "\f164";
-}
-.fa-thumbs-down:before {
- content: "\f165";
-}
-.fa-youtube-square:before {
- content: "\f166";
-}
-.fa-youtube:before {
- content: "\f167";
-}
-.fa-xing:before {
- content: "\f168";
-}
-.fa-xing-square:before {
- content: "\f169";
-}
-.fa-youtube-play:before {
- content: "\f16a";
-}
-.fa-dropbox:before {
- content: "\f16b";
-}
-.fa-stack-overflow:before {
- content: "\f16c";
-}
-.fa-instagram:before {
- content: "\f16d";
-}
-.fa-flickr:before {
- content: "\f16e";
-}
-.fa-adn:before {
- content: "\f170";
-}
-.fa-bitbucket:before {
- content: "\f171";
-}
-.fa-bitbucket-square:before {
- content: "\f172";
-}
-.fa-tumblr:before {
- content: "\f173";
-}
-.fa-tumblr-square:before {
- content: "\f174";
-}
-.fa-long-arrow-down:before {
- content: "\f175";
-}
-.fa-long-arrow-up:before {
- content: "\f176";
-}
-.fa-long-arrow-left:before {
- content: "\f177";
-}
-.fa-long-arrow-right:before {
- content: "\f178";
-}
-.fa-apple:before {
- content: "\f179";
-}
-.fa-windows:before {
- content: "\f17a";
-}
-.fa-android:before {
- content: "\f17b";
-}
-.fa-linux:before {
- content: "\f17c";
-}
-.fa-dribbble:before {
- content: "\f17d";
-}
-.fa-skype:before {
- content: "\f17e";
-}
-.fa-foursquare:before {
- content: "\f180";
-}
-.fa-trello:before {
- content: "\f181";
-}
-.fa-female:before {
- content: "\f182";
-}
-.fa-male:before {
- content: "\f183";
-}
-.fa-gittip:before,
-.fa-gratipay:before {
- content: "\f184";
-}
-.fa-sun-o:before {
- content: "\f185";
-}
-.fa-moon-o:before {
- content: "\f186";
-}
-.fa-archive:before {
- content: "\f187";
-}
-.fa-bug:before {
- content: "\f188";
-}
-.fa-vk:before {
- content: "\f189";
-}
-.fa-weibo:before {
- content: "\f18a";
-}
-.fa-renren:before {
- content: "\f18b";
-}
-.fa-pagelines:before {
- content: "\f18c";
-}
-.fa-stack-exchange:before {
- content: "\f18d";
-}
-.fa-arrow-circle-o-right:before {
- content: "\f18e";
-}
-.fa-arrow-circle-o-left:before {
- content: "\f190";
-}
-.fa-toggle-left:before,
-.fa-caret-square-o-left:before {
- content: "\f191";
-}
-.fa-dot-circle-o:before {
- content: "\f192";
-}
-.fa-wheelchair:before {
- content: "\f193";
-}
-.fa-vimeo-square:before {
- content: "\f194";
-}
-.fa-turkish-lira:before,
-.fa-try:before {
- content: "\f195";
-}
-.fa-plus-square-o:before {
- content: "\f196";
-}
-.fa-space-shuttle:before {
- content: "\f197";
-}
-.fa-slack:before {
- content: "\f198";
-}
-.fa-envelope-square:before {
- content: "\f199";
-}
-.fa-wordpress:before {
- content: "\f19a";
-}
-.fa-openid:before {
- content: "\f19b";
-}
-.fa-institution:before,
-.fa-bank:before,
-.fa-university:before {
- content: "\f19c";
-}
-.fa-mortar-board:before,
-.fa-graduation-cap:before {
- content: "\f19d";
-}
-.fa-yahoo:before {
- content: "\f19e";
-}
-.fa-google:before {
- content: "\f1a0";
-}
-.fa-reddit:before {
- content: "\f1a1";
-}
-.fa-reddit-square:before {
- content: "\f1a2";
-}
-.fa-stumbleupon-circle:before {
- content: "\f1a3";
-}
-.fa-stumbleupon:before {
- content: "\f1a4";
-}
-.fa-delicious:before {
- content: "\f1a5";
-}
-.fa-digg:before {
- content: "\f1a6";
-}
-.fa-pied-piper-pp:before {
- content: "\f1a7";
-}
-.fa-pied-piper-alt:before {
- content: "\f1a8";
-}
-.fa-drupal:before {
- content: "\f1a9";
-}
-.fa-joomla:before {
- content: "\f1aa";
-}
-.fa-language:before {
- content: "\f1ab";
-}
-.fa-fax:before {
- content: "\f1ac";
-}
-.fa-building:before {
- content: "\f1ad";
-}
-.fa-child:before {
- content: "\f1ae";
-}
-.fa-paw:before {
- content: "\f1b0";
-}
-.fa-spoon:before {
- content: "\f1b1";
-}
-.fa-cube:before {
- content: "\f1b2";
-}
-.fa-cubes:before {
- content: "\f1b3";
-}
-.fa-behance:before {
- content: "\f1b4";
-}
-.fa-behance-square:before {
- content: "\f1b5";
-}
-.fa-steam:before {
- content: "\f1b6";
-}
-.fa-steam-square:before {
- content: "\f1b7";
-}
-.fa-recycle:before {
- content: "\f1b8";
-}
-.fa-automobile:before,
-.fa-car:before {
- content: "\f1b9";
-}
-.fa-cab:before,
-.fa-taxi:before {
- content: "\f1ba";
-}
-.fa-tree:before {
- content: "\f1bb";
-}
-.fa-spotify:before {
- content: "\f1bc";
-}
-.fa-deviantart:before {
- content: "\f1bd";
-}
-.fa-soundcloud:before {
- content: "\f1be";
-}
-.fa-database:before {
- content: "\f1c0";
-}
-.fa-file-pdf-o:before {
- content: "\f1c1";
-}
-.fa-file-word-o:before {
- content: "\f1c2";
-}
-.fa-file-excel-o:before {
- content: "\f1c3";
-}
-.fa-file-powerpoint-o:before {
- content: "\f1c4";
-}
-.fa-file-photo-o:before,
-.fa-file-picture-o:before,
-.fa-file-image-o:before {
- content: "\f1c5";
-}
-.fa-file-zip-o:before,
-.fa-file-archive-o:before {
- content: "\f1c6";
-}
-.fa-file-sound-o:before,
-.fa-file-audio-o:before {
- content: "\f1c7";
-}
-.fa-file-movie-o:before,
-.fa-file-video-o:before {
- content: "\f1c8";
-}
-.fa-file-code-o:before {
- content: "\f1c9";
-}
-.fa-vine:before {
- content: "\f1ca";
-}
-.fa-codepen:before {
- content: "\f1cb";
-}
-.fa-jsfiddle:before {
- content: "\f1cc";
-}
-.fa-life-bouy:before,
-.fa-life-buoy:before,
-.fa-life-saver:before,
-.fa-support:before,
-.fa-life-ring:before {
- content: "\f1cd";
-}
-.fa-circle-o-notch:before {
- content: "\f1ce";
-}
-.fa-ra:before,
-.fa-resistance:before,
-.fa-rebel:before {
- content: "\f1d0";
-}
-.fa-ge:before,
-.fa-empire:before {
- content: "\f1d1";
-}
-.fa-git-square:before {
- content: "\f1d2";
-}
-.fa-git:before {
- content: "\f1d3";
-}
-.fa-y-combinator-square:before,
-.fa-yc-square:before,
-.fa-hacker-news:before {
- content: "\f1d4";
-}
-.fa-tencent-weibo:before {
- content: "\f1d5";
-}
-.fa-qq:before {
- content: "\f1d6";
-}
-.fa-wechat:before,
-.fa-weixin:before {
- content: "\f1d7";
-}
-.fa-send:before,
-.fa-paper-plane:before {
- content: "\f1d8";
-}
-.fa-send-o:before,
-.fa-paper-plane-o:before {
- content: "\f1d9";
-}
-.fa-history:before {
- content: "\f1da";
-}
-.fa-circle-thin:before {
- content: "\f1db";
-}
-.fa-header:before {
- content: "\f1dc";
-}
-.fa-paragraph:before {
- content: "\f1dd";
-}
-.fa-sliders:before {
- content: "\f1de";
-}
-.fa-share-alt:before {
- content: "\f1e0";
-}
-.fa-share-alt-square:before {
- content: "\f1e1";
-}
-.fa-bomb:before {
- content: "\f1e2";
-}
-.fa-soccer-ball-o:before,
-.fa-futbol-o:before {
- content: "\f1e3";
-}
-.fa-tty:before {
- content: "\f1e4";
-}
-.fa-binoculars:before {
- content: "\f1e5";
-}
-.fa-plug:before {
- content: "\f1e6";
-}
-.fa-slideshare:before {
- content: "\f1e7";
-}
-.fa-twitch:before {
- content: "\f1e8";
-}
-.fa-yelp:before {
- content: "\f1e9";
-}
-.fa-newspaper-o:before {
- content: "\f1ea";
-}
-.fa-wifi:before {
- content: "\f1eb";
-}
-.fa-calculator:before {
- content: "\f1ec";
-}
-.fa-paypal:before {
- content: "\f1ed";
-}
-.fa-google-wallet:before {
- content: "\f1ee";
-}
-.fa-cc-visa:before {
- content: "\f1f0";
-}
-.fa-cc-mastercard:before {
- content: "\f1f1";
-}
-.fa-cc-discover:before {
- content: "\f1f2";
-}
-.fa-cc-amex:before {
- content: "\f1f3";
-}
-.fa-cc-paypal:before {
- content: "\f1f4";
-}
-.fa-cc-stripe:before {
- content: "\f1f5";
-}
-.fa-bell-slash:before {
- content: "\f1f6";
-}
-.fa-bell-slash-o:before {
- content: "\f1f7";
-}
-.fa-trash:before {
- content: "\f1f8";
-}
-.fa-copyright:before {
- content: "\f1f9";
-}
-.fa-at:before {
- content: "\f1fa";
-}
-.fa-eyedropper:before {
- content: "\f1fb";
-}
-.fa-paint-brush:before {
- content: "\f1fc";
-}
-.fa-birthday-cake:before {
- content: "\f1fd";
-}
-.fa-area-chart:before {
- content: "\f1fe";
-}
-.fa-pie-chart:before {
- content: "\f200";
-}
-.fa-line-chart:before {
- content: "\f201";
-}
-.fa-lastfm:before {
- content: "\f202";
-}
-.fa-lastfm-square:before {
- content: "\f203";
-}
-.fa-toggle-off:before {
- content: "\f204";
-}
-.fa-toggle-on:before {
- content: "\f205";
-}
-.fa-bicycle:before {
- content: "\f206";
-}
-.fa-bus:before {
- content: "\f207";
-}
-.fa-ioxhost:before {
- content: "\f208";
-}
-.fa-angellist:before {
- content: "\f209";
-}
-.fa-cc:before {
- content: "\f20a";
-}
-.fa-shekel:before,
-.fa-sheqel:before,
-.fa-ils:before {
- content: "\f20b";
-}
-.fa-meanpath:before {
- content: "\f20c";
-}
-.fa-buysellads:before {
- content: "\f20d";
-}
-.fa-connectdevelop:before {
- content: "\f20e";
-}
-.fa-dashcube:before {
- content: "\f210";
-}
-.fa-forumbee:before {
- content: "\f211";
-}
-.fa-leanpub:before {
- content: "\f212";
-}
-.fa-sellsy:before {
- content: "\f213";
-}
-.fa-shirtsinbulk:before {
- content: "\f214";
-}
-.fa-simplybuilt:before {
- content: "\f215";
-}
-.fa-skyatlas:before {
- content: "\f216";
-}
-.fa-cart-plus:before {
- content: "\f217";
-}
-.fa-cart-arrow-down:before {
- content: "\f218";
-}
-.fa-diamond:before {
- content: "\f219";
-}
-.fa-ship:before {
- content: "\f21a";
-}
-.fa-user-secret:before {
- content: "\f21b";
-}
-.fa-motorcycle:before {
- content: "\f21c";
-}
-.fa-street-view:before {
- content: "\f21d";
-}
-.fa-heartbeat:before {
- content: "\f21e";
-}
-.fa-venus:before {
- content: "\f221";
-}
-.fa-mars:before {
- content: "\f222";
-}
-.fa-mercury:before {
- content: "\f223";
-}
-.fa-intersex:before,
-.fa-transgender:before {
- content: "\f224";
-}
-.fa-transgender-alt:before {
- content: "\f225";
-}
-.fa-venus-double:before {
- content: "\f226";
-}
-.fa-mars-double:before {
- content: "\f227";
-}
-.fa-venus-mars:before {
- content: "\f228";
-}
-.fa-mars-stroke:before {
- content: "\f229";
-}
-.fa-mars-stroke-v:before {
- content: "\f22a";
-}
-.fa-mars-stroke-h:before {
- content: "\f22b";
-}
-.fa-neuter:before {
- content: "\f22c";
-}
-.fa-genderless:before {
- content: "\f22d";
-}
-.fa-facebook-official:before {
- content: "\f230";
-}
-.fa-pinterest-p:before {
- content: "\f231";
-}
-.fa-whatsapp:before {
- content: "\f232";
-}
-.fa-server:before {
- content: "\f233";
-}
-.fa-user-plus:before {
- content: "\f234";
-}
-.fa-user-times:before {
- content: "\f235";
-}
-.fa-hotel:before,
-.fa-bed:before {
- content: "\f236";
-}
-.fa-viacoin:before {
- content: "\f237";
-}
-.fa-train:before {
- content: "\f238";
-}
-.fa-subway:before {
- content: "\f239";
-}
-.fa-medium:before {
- content: "\f23a";
-}
-.fa-yc:before,
-.fa-y-combinator:before {
- content: "\f23b";
-}
-.fa-optin-monster:before {
- content: "\f23c";
-}
-.fa-opencart:before {
- content: "\f23d";
-}
-.fa-expeditedssl:before {
- content: "\f23e";
-}
-.fa-battery-4:before,
-.fa-battery:before,
-.fa-battery-full:before {
- content: "\f240";
-}
-.fa-battery-3:before,
-.fa-battery-three-quarters:before {
- content: "\f241";
-}
-.fa-battery-2:before,
-.fa-battery-half:before {
- content: "\f242";
-}
-.fa-battery-1:before,
-.fa-battery-quarter:before {
- content: "\f243";
-}
-.fa-battery-0:before,
-.fa-battery-empty:before {
- content: "\f244";
-}
-.fa-mouse-pointer:before {
- content: "\f245";
-}
-.fa-i-cursor:before {
- content: "\f246";
-}
-.fa-object-group:before {
- content: "\f247";
-}
-.fa-object-ungroup:before {
- content: "\f248";
-}
-.fa-sticky-note:before {
- content: "\f249";
-}
-.fa-sticky-note-o:before {
- content: "\f24a";
-}
-.fa-cc-jcb:before {
- content: "\f24b";
-}
-.fa-cc-diners-club:before {
- content: "\f24c";
-}
-.fa-clone:before {
- content: "\f24d";
-}
-.fa-balance-scale:before {
- content: "\f24e";
-}
-.fa-hourglass-o:before {
- content: "\f250";
-}
-.fa-hourglass-1:before,
-.fa-hourglass-start:before {
- content: "\f251";
-}
-.fa-hourglass-2:before,
-.fa-hourglass-half:before {
- content: "\f252";
-}
-.fa-hourglass-3:before,
-.fa-hourglass-end:before {
- content: "\f253";
-}
-.fa-hourglass:before {
- content: "\f254";
-}
-.fa-hand-grab-o:before,
-.fa-hand-rock-o:before {
- content: "\f255";
-}
-.fa-hand-stop-o:before,
-.fa-hand-paper-o:before {
- content: "\f256";
-}
-.fa-hand-scissors-o:before {
- content: "\f257";
-}
-.fa-hand-lizard-o:before {
- content: "\f258";
-}
-.fa-hand-spock-o:before {
- content: "\f259";
-}
-.fa-hand-pointer-o:before {
- content: "\f25a";
-}
-.fa-hand-peace-o:before {
- content: "\f25b";
-}
-.fa-trademark:before {
- content: "\f25c";
-}
-.fa-registered:before {
- content: "\f25d";
-}
-.fa-creative-commons:before {
- content: "\f25e";
-}
-.fa-gg:before {
- content: "\f260";
-}
-.fa-gg-circle:before {
- content: "\f261";
-}
-.fa-tripadvisor:before {
- content: "\f262";
-}
-.fa-odnoklassniki:before {
- content: "\f263";
-}
-.fa-odnoklassniki-square:before {
- content: "\f264";
-}
-.fa-get-pocket:before {
- content: "\f265";
-}
-.fa-wikipedia-w:before {
- content: "\f266";
-}
-.fa-safari:before {
- content: "\f267";
-}
-.fa-chrome:before {
- content: "\f268";
-}
-.fa-firefox:before {
- content: "\f269";
-}
-.fa-opera:before {
- content: "\f26a";
-}
-.fa-internet-explorer:before {
- content: "\f26b";
-}
-.fa-tv:before,
-.fa-television:before {
- content: "\f26c";
-}
-.fa-contao:before {
- content: "\f26d";
-}
-.fa-500px:before {
- content: "\f26e";
-}
-.fa-amazon:before {
- content: "\f270";
-}
-.fa-calendar-plus-o:before {
- content: "\f271";
-}
-.fa-calendar-minus-o:before {
- content: "\f272";
-}
-.fa-calendar-times-o:before {
- content: "\f273";
-}
-.fa-calendar-check-o:before {
- content: "\f274";
-}
-.fa-industry:before {
- content: "\f275";
-}
-.fa-map-pin:before {
- content: "\f276";
-}
-.fa-map-signs:before {
- content: "\f277";
-}
-.fa-map-o:before {
- content: "\f278";
-}
-.fa-map:before {
- content: "\f279";
-}
-.fa-commenting:before {
- content: "\f27a";
-}
-.fa-commenting-o:before {
- content: "\f27b";
-}
-.fa-houzz:before {
- content: "\f27c";
-}
-.fa-vimeo:before {
- content: "\f27d";
-}
-.fa-black-tie:before {
- content: "\f27e";
-}
-.fa-fonticons:before {
- content: "\f280";
-}
-.fa-reddit-alien:before {
- content: "\f281";
-}
-.fa-edge:before {
- content: "\f282";
-}
-.fa-credit-card-alt:before {
- content: "\f283";
-}
-.fa-codiepie:before {
- content: "\f284";
-}
-.fa-modx:before {
- content: "\f285";
-}
-.fa-fort-awesome:before {
- content: "\f286";
-}
-.fa-usb:before {
- content: "\f287";
-}
-.fa-product-hunt:before {
- content: "\f288";
-}
-.fa-mixcloud:before {
- content: "\f289";
-}
-.fa-scribd:before {
- content: "\f28a";
-}
-.fa-pause-circle:before {
- content: "\f28b";
-}
-.fa-pause-circle-o:before {
- content: "\f28c";
-}
-.fa-stop-circle:before {
- content: "\f28d";
-}
-.fa-stop-circle-o:before {
- content: "\f28e";
-}
-.fa-shopping-bag:before {
- content: "\f290";
-}
-.fa-shopping-basket:before {
- content: "\f291";
-}
-.fa-hashtag:before {
- content: "\f292";
-}
-.fa-bluetooth:before {
- content: "\f293";
-}
-.fa-bluetooth-b:before {
- content: "\f294";
-}
-.fa-percent:before {
- content: "\f295";
-}
-.fa-gitlab:before {
- content: "\f296";
-}
-.fa-wpbeginner:before {
- content: "\f297";
-}
-.fa-wpforms:before {
- content: "\f298";
-}
-.fa-envira:before {
- content: "\f299";
-}
-.fa-universal-access:before {
- content: "\f29a";
-}
-.fa-wheelchair-alt:before {
- content: "\f29b";
-}
-.fa-question-circle-o:before {
- content: "\f29c";
-}
-.fa-blind:before {
- content: "\f29d";
-}
-.fa-audio-description:before {
- content: "\f29e";
-}
-.fa-volume-control-phone:before {
- content: "\f2a0";
-}
-.fa-braille:before {
- content: "\f2a1";
-}
-.fa-assistive-listening-systems:before {
- content: "\f2a2";
-}
-.fa-asl-interpreting:before,
-.fa-american-sign-language-interpreting:before {
- content: "\f2a3";
-}
-.fa-deafness:before,
-.fa-hard-of-hearing:before,
-.fa-deaf:before {
- content: "\f2a4";
-}
-.fa-glide:before {
- content: "\f2a5";
-}
-.fa-glide-g:before {
- content: "\f2a6";
-}
-.fa-signing:before,
-.fa-sign-language:before {
- content: "\f2a7";
-}
-.fa-low-vision:before {
- content: "\f2a8";
-}
-.fa-viadeo:before {
- content: "\f2a9";
-}
-.fa-viadeo-square:before {
- content: "\f2aa";
-}
-.fa-snapchat:before {
- content: "\f2ab";
-}
-.fa-snapchat-ghost:before {
- content: "\f2ac";
-}
-.fa-snapchat-square:before {
- content: "\f2ad";
-}
-.fa-pied-piper:before {
- content: "\f2ae";
-}
-.fa-first-order:before {
- content: "\f2b0";
-}
-.fa-yoast:before {
- content: "\f2b1";
-}
-.fa-themeisle:before {
- content: "\f2b2";
-}
-.fa-google-plus-circle:before,
-.fa-google-plus-official:before {
- content: "\f2b3";
-}
-.fa-fa:before,
-.fa-font-awesome:before {
- content: "\f2b4";
-}
-.fa-handshake-o:before {
- content: "\f2b5";
-}
-.fa-envelope-open:before {
- content: "\f2b6";
-}
-.fa-envelope-open-o:before {
- content: "\f2b7";
-}
-.fa-linode:before {
- content: "\f2b8";
-}
-.fa-address-book:before {
- content: "\f2b9";
-}
-.fa-address-book-o:before {
- content: "\f2ba";
-}
-.fa-vcard:before,
-.fa-address-card:before {
- content: "\f2bb";
-}
-.fa-vcard-o:before,
-.fa-address-card-o:before {
- content: "\f2bc";
-}
-.fa-user-circle:before {
- content: "\f2bd";
-}
-.fa-user-circle-o:before {
- content: "\f2be";
-}
-.fa-user-o:before {
- content: "\f2c0";
-}
-.fa-id-badge:before {
- content: "\f2c1";
-}
-.fa-drivers-license:before,
-.fa-id-card:before {
- content: "\f2c2";
-}
-.fa-drivers-license-o:before,
-.fa-id-card-o:before {
- content: "\f2c3";
-}
-.fa-quora:before {
- content: "\f2c4";
-}
-.fa-free-code-camp:before {
- content: "\f2c5";
-}
-.fa-telegram:before {
- content: "\f2c6";
-}
-.fa-thermometer-4:before,
-.fa-thermometer:before,
-.fa-thermometer-full:before {
- content: "\f2c7";
-}
-.fa-thermometer-3:before,
-.fa-thermometer-three-quarters:before {
- content: "\f2c8";
-}
-.fa-thermometer-2:before,
-.fa-thermometer-half:before {
- content: "\f2c9";
-}
-.fa-thermometer-1:before,
-.fa-thermometer-quarter:before {
- content: "\f2ca";
-}
-.fa-thermometer-0:before,
-.fa-thermometer-empty:before {
- content: "\f2cb";
-}
-.fa-shower:before {
- content: "\f2cc";
-}
-.fa-bathtub:before,
-.fa-s15:before,
-.fa-bath:before {
- content: "\f2cd";
-}
-.fa-podcast:before {
- content: "\f2ce";
-}
-.fa-window-maximize:before {
- content: "\f2d0";
-}
-.fa-window-minimize:before {
- content: "\f2d1";
-}
-.fa-window-restore:before {
- content: "\f2d2";
-}
-.fa-times-rectangle:before,
-.fa-window-close:before {
- content: "\f2d3";
-}
-.fa-times-rectangle-o:before,
-.fa-window-close-o:before {
- content: "\f2d4";
-}
-.fa-bandcamp:before {
- content: "\f2d5";
-}
-.fa-grav:before {
- content: "\f2d6";
-}
-.fa-etsy:before {
- content: "\f2d7";
-}
-.fa-imdb:before {
- content: "\f2d8";
-}
-.fa-ravelry:before {
- content: "\f2d9";
-}
-.fa-eercast:before {
- content: "\f2da";
-}
-.fa-microchip:before {
- content: "\f2db";
-}
-.fa-snowflake-o:before {
- content: "\f2dc";
-}
-.fa-superpowers:before {
- content: "\f2dd";
-}
-.fa-wpexplorer:before {
- content: "\f2de";
-}
-.fa-meetup:before {
- content: "\f2e0";
-}
-.sr-only {
- position: absolute;
- width: 1px;
- height: 1px;
- padding: 0;
- margin: -1px;
- overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
-}
-.sr-only-focusable:active,
-.sr-only-focusable:focus {
- position: static;
- width: auto;
- height: auto;
- margin: 0;
- overflow: visible;
- clip: auto;
-}
diff --git a/app/src/renderer/styles/vendor/font-awesome.min.css b/app/src/renderer/styles/vendor/font-awesome.min.css
deleted file mode 100644
index bd4e1451ce..0000000000
--- a/app/src/renderer/styles/vendor/font-awesome.min.css
+++ /dev/null
@@ -1,2337 +0,0 @@
-/*!
- * Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
- * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */
-@font-face {
- font-family: "FontAwesome";
- src: url("../../assets/fonts/fontawesome-webfont.eot?v=4.7.0");
- src: url("../../assets/fonts/fontawesome-webfont.eot?#iefix&v=4.7.0")
- format("embedded-opentype"),
- url("../../assets/fonts/fontawesome-webfont.woff2?v=4.7.0") format("woff2"),
- url("../../assets/fonts/fontawesome-webfont.woff?v=4.7.0") format("woff"),
- url("../../assets/fonts/fontawesome-webfont.ttf?v=4.7.0") format("truetype"),
- url("../../assets/fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular")
- format("svg");
- font-weight: normal;
- font-style: normal;
-}
-.fa {
- display: inline-block;
- font: normal normal normal 14px/1 FontAwesome;
- font-size: inherit;
- text-rendering: auto;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-.fa-lg {
- font-size: 1.33333333em;
- line-height: 0.75em;
- vertical-align: -15%;
-}
-.fa-2x {
- font-size: 2em;
-}
-.fa-3x {
- font-size: 3em;
-}
-.fa-4x {
- font-size: 4em;
-}
-.fa-5x {
- font-size: 5em;
-}
-.fa-fw {
- width: 1.28571429em;
- text-align: center;
-}
-.fa-ul {
- padding-left: 0;
- margin-left: 2.14285714em;
- list-style-type: none;
-}
-.fa-ul > li {
- position: relative;
-}
-.fa-li {
- position: absolute;
- left: -2.14285714em;
- width: 2.14285714em;
- top: 0.14285714em;
- text-align: center;
-}
-.fa-li.fa-lg {
- left: -1.85714286em;
-}
-.fa-border {
- padding: 0.2em 0.25em 0.15em;
- border: solid 0.08em #eee;
- border-radius: 0.1em;
-}
-.fa-pull-left {
- float: left;
-}
-.fa-pull-right {
- float: right;
-}
-.fa.fa-pull-left {
- margin-right: 0.3em;
-}
-.fa.fa-pull-right {
- margin-left: 0.3em;
-}
-.pull-right {
- float: right;
-}
-.pull-left {
- float: left;
-}
-.fa.pull-left {
- margin-right: 0.3em;
-}
-.fa.pull-right {
- margin-left: 0.3em;
-}
-.fa-spin {
- -webkit-animation: fa-spin 2s infinite linear;
- animation: fa-spin 2s infinite linear;
-}
-.fa-pulse {
- -webkit-animation: fa-spin 1s infinite steps(8);
- animation: fa-spin 1s infinite steps(8);
-}
-@-webkit-keyframes fa-spin {
- 0% {
- -webkit-transform: rotate(0deg);
- transform: rotate(0deg);
- }
- 100% {
- -webkit-transform: rotate(359deg);
- transform: rotate(359deg);
- }
-}
-@keyframes fa-spin {
- 0% {
- -webkit-transform: rotate(0deg);
- transform: rotate(0deg);
- }
- 100% {
- -webkit-transform: rotate(359deg);
- transform: rotate(359deg);
- }
-}
-.fa-rotate-90 {
- -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";
- -webkit-transform: rotate(90deg);
- -ms-transform: rotate(90deg);
- transform: rotate(90deg);
-}
-.fa-rotate-180 {
- -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";
- -webkit-transform: rotate(180deg);
- -ms-transform: rotate(180deg);
- transform: rotate(180deg);
-}
-.fa-rotate-270 {
- -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";
- -webkit-transform: rotate(270deg);
- -ms-transform: rotate(270deg);
- transform: rotate(270deg);
-}
-.fa-flip-horizontal {
- -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";
- -webkit-transform: scale(-1, 1);
- -ms-transform: scale(-1, 1);
- transform: scale(-1, 1);
-}
-.fa-flip-vertical {
- -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";
- -webkit-transform: scale(1, -1);
- -ms-transform: scale(1, -1);
- transform: scale(1, -1);
-}
-:root .fa-rotate-90,
-:root .fa-rotate-180,
-:root .fa-rotate-270,
-:root .fa-flip-horizontal,
-:root .fa-flip-vertical {
- filter: none;
-}
-.fa-stack {
- position: relative;
- display: inline-block;
- width: 2em;
- height: 2em;
- line-height: 2em;
- vertical-align: middle;
-}
-.fa-stack-1x,
-.fa-stack-2x {
- position: absolute;
- left: 0;
- width: 100%;
- text-align: center;
-}
-.fa-stack-1x {
- line-height: inherit;
-}
-.fa-stack-2x {
- font-size: 2em;
-}
-.fa-inverse {
- color: #fff;
-}
-.fa-glass:before {
- content: "\f000";
-}
-.fa-music:before {
- content: "\f001";
-}
-.fa-search:before {
- content: "\f002";
-}
-.fa-envelope-o:before {
- content: "\f003";
-}
-.fa-heart:before {
- content: "\f004";
-}
-.fa-star:before {
- content: "\f005";
-}
-.fa-star-o:before {
- content: "\f006";
-}
-.fa-user:before {
- content: "\f007";
-}
-.fa-film:before {
- content: "\f008";
-}
-.fa-th-large:before {
- content: "\f009";
-}
-.fa-th:before {
- content: "\f00a";
-}
-.fa-th-list:before {
- content: "\f00b";
-}
-.fa-check:before {
- content: "\f00c";
-}
-.fa-remove:before,
-.fa-close:before,
-.fa-times:before {
- content: "\f00d";
-}
-.fa-search-plus:before {
- content: "\f00e";
-}
-.fa-search-minus:before {
- content: "\f010";
-}
-.fa-power-off:before {
- content: "\f011";
-}
-.fa-signal:before {
- content: "\f012";
-}
-.fa-gear:before,
-.fa-cog:before {
- content: "\f013";
-}
-.fa-trash-o:before {
- content: "\f014";
-}
-.fa-home:before {
- content: "\f015";
-}
-.fa-file-o:before {
- content: "\f016";
-}
-.fa-clock-o:before {
- content: "\f017";
-}
-.fa-road:before {
- content: "\f018";
-}
-.fa-download:before {
- content: "\f019";
-}
-.fa-arrow-circle-o-down:before {
- content: "\f01a";
-}
-.fa-arrow-circle-o-up:before {
- content: "\f01b";
-}
-.fa-inbox:before {
- content: "\f01c";
-}
-.fa-play-circle-o:before {
- content: "\f01d";
-}
-.fa-rotate-right:before,
-.fa-repeat:before {
- content: "\f01e";
-}
-.fa-refresh:before {
- content: "\f021";
-}
-.fa-list-alt:before {
- content: "\f022";
-}
-.fa-lock:before {
- content: "\f023";
-}
-.fa-flag:before {
- content: "\f024";
-}
-.fa-headphones:before {
- content: "\f025";
-}
-.fa-volume-off:before {
- content: "\f026";
-}
-.fa-volume-down:before {
- content: "\f027";
-}
-.fa-volume-up:before {
- content: "\f028";
-}
-.fa-qrcode:before {
- content: "\f029";
-}
-.fa-barcode:before {
- content: "\f02a";
-}
-.fa-tag:before {
- content: "\f02b";
-}
-.fa-tags:before {
- content: "\f02c";
-}
-.fa-book:before {
- content: "\f02d";
-}
-.fa-bookmark:before {
- content: "\f02e";
-}
-.fa-print:before {
- content: "\f02f";
-}
-.fa-camera:before {
- content: "\f030";
-}
-.fa-font:before {
- content: "\f031";
-}
-.fa-bold:before {
- content: "\f032";
-}
-.fa-italic:before {
- content: "\f033";
-}
-.fa-text-height:before {
- content: "\f034";
-}
-.fa-text-width:before {
- content: "\f035";
-}
-.fa-align-left:before {
- content: "\f036";
-}
-.fa-align-center:before {
- content: "\f037";
-}
-.fa-align-right:before {
- content: "\f038";
-}
-.fa-align-justify:before {
- content: "\f039";
-}
-.fa-list:before {
- content: "\f03a";
-}
-.fa-dedent:before,
-.fa-outdent:before {
- content: "\f03b";
-}
-.fa-indent:before {
- content: "\f03c";
-}
-.fa-video-camera:before {
- content: "\f03d";
-}
-.fa-photo:before,
-.fa-image:before,
-.fa-picture-o:before {
- content: "\f03e";
-}
-.fa-pencil:before {
- content: "\f040";
-}
-.fa-map-marker:before {
- content: "\f041";
-}
-.fa-adjust:before {
- content: "\f042";
-}
-.fa-tint:before {
- content: "\f043";
-}
-.fa-edit:before,
-.fa-pencil-square-o:before {
- content: "\f044";
-}
-.fa-share-square-o:before {
- content: "\f045";
-}
-.fa-check-square-o:before {
- content: "\f046";
-}
-.fa-arrows:before {
- content: "\f047";
-}
-.fa-step-backward:before {
- content: "\f048";
-}
-.fa-fast-backward:before {
- content: "\f049";
-}
-.fa-backward:before {
- content: "\f04a";
-}
-.fa-play:before {
- content: "\f04b";
-}
-.fa-pause:before {
- content: "\f04c";
-}
-.fa-stop:before {
- content: "\f04d";
-}
-.fa-forward:before {
- content: "\f04e";
-}
-.fa-fast-forward:before {
- content: "\f050";
-}
-.fa-step-forward:before {
- content: "\f051";
-}
-.fa-eject:before {
- content: "\f052";
-}
-.fa-chevron-left:before {
- content: "\f053";
-}
-.fa-chevron-right:before {
- content: "\f054";
-}
-.fa-plus-circle:before {
- content: "\f055";
-}
-.fa-minus-circle:before {
- content: "\f056";
-}
-.fa-times-circle:before {
- content: "\f057";
-}
-.fa-check-circle:before {
- content: "\f058";
-}
-.fa-question-circle:before {
- content: "\f059";
-}
-.fa-info-circle:before {
- content: "\f05a";
-}
-.fa-crosshairs:before {
- content: "\f05b";
-}
-.fa-times-circle-o:before {
- content: "\f05c";
-}
-.fa-check-circle-o:before {
- content: "\f05d";
-}
-.fa-ban:before {
- content: "\f05e";
-}
-.fa-arrow-left:before {
- content: "\f060";
-}
-.fa-arrow-right:before {
- content: "\f061";
-}
-.fa-arrow-up:before {
- content: "\f062";
-}
-.fa-arrow-down:before {
- content: "\f063";
-}
-.fa-mail-forward:before,
-.fa-share:before {
- content: "\f064";
-}
-.fa-expand:before {
- content: "\f065";
-}
-.fa-compress:before {
- content: "\f066";
-}
-.fa-plus:before {
- content: "\f067";
-}
-.fa-minus:before {
- content: "\f068";
-}
-.fa-asterisk:before {
- content: "\f069";
-}
-.fa-exclamation-circle:before {
- content: "\f06a";
-}
-.fa-gift:before {
- content: "\f06b";
-}
-.fa-leaf:before {
- content: "\f06c";
-}
-.fa-fire:before {
- content: "\f06d";
-}
-.fa-eye:before {
- content: "\f06e";
-}
-.fa-eye-slash:before {
- content: "\f070";
-}
-.fa-warning:before,
-.fa-exclamation-triangle:before {
- content: "\f071";
-}
-.fa-plane:before {
- content: "\f072";
-}
-.fa-calendar:before {
- content: "\f073";
-}
-.fa-random:before {
- content: "\f074";
-}
-.fa-comment:before {
- content: "\f075";
-}
-.fa-magnet:before {
- content: "\f076";
-}
-.fa-chevron-up:before {
- content: "\f077";
-}
-.fa-chevron-down:before {
- content: "\f078";
-}
-.fa-retweet:before {
- content: "\f079";
-}
-.fa-shopping-cart:before {
- content: "\f07a";
-}
-.fa-folder:before {
- content: "\f07b";
-}
-.fa-folder-open:before {
- content: "\f07c";
-}
-.fa-arrows-v:before {
- content: "\f07d";
-}
-.fa-arrows-h:before {
- content: "\f07e";
-}
-.fa-bar-chart-o:before,
-.fa-bar-chart:before {
- content: "\f080";
-}
-.fa-twitter-square:before {
- content: "\f081";
-}
-.fa-facebook-square:before {
- content: "\f082";
-}
-.fa-camera-retro:before {
- content: "\f083";
-}
-.fa-key:before {
- content: "\f084";
-}
-.fa-gears:before,
-.fa-cogs:before {
- content: "\f085";
-}
-.fa-comments:before {
- content: "\f086";
-}
-.fa-thumbs-o-up:before {
- content: "\f087";
-}
-.fa-thumbs-o-down:before {
- content: "\f088";
-}
-.fa-star-half:before {
- content: "\f089";
-}
-.fa-heart-o:before {
- content: "\f08a";
-}
-.fa-sign-out:before {
- content: "\f08b";
-}
-.fa-linkedin-square:before {
- content: "\f08c";
-}
-.fa-thumb-tack:before {
- content: "\f08d";
-}
-.fa-external-link:before {
- content: "\f08e";
-}
-.fa-sign-in:before {
- content: "\f090";
-}
-.fa-trophy:before {
- content: "\f091";
-}
-.fa-github-square:before {
- content: "\f092";
-}
-.fa-upload:before {
- content: "\f093";
-}
-.fa-lemon-o:before {
- content: "\f094";
-}
-.fa-phone:before {
- content: "\f095";
-}
-.fa-square-o:before {
- content: "\f096";
-}
-.fa-bookmark-o:before {
- content: "\f097";
-}
-.fa-phone-square:before {
- content: "\f098";
-}
-.fa-twitter:before {
- content: "\f099";
-}
-.fa-facebook-f:before,
-.fa-facebook:before {
- content: "\f09a";
-}
-.fa-github:before {
- content: "\f09b";
-}
-.fa-unlock:before {
- content: "\f09c";
-}
-.fa-credit-card:before {
- content: "\f09d";
-}
-.fa-feed:before,
-.fa-rss:before {
- content: "\f09e";
-}
-.fa-hdd-o:before {
- content: "\f0a0";
-}
-.fa-bullhorn:before {
- content: "\f0a1";
-}
-.fa-bell:before {
- content: "\f0f3";
-}
-.fa-certificate:before {
- content: "\f0a3";
-}
-.fa-hand-o-right:before {
- content: "\f0a4";
-}
-.fa-hand-o-left:before {
- content: "\f0a5";
-}
-.fa-hand-o-up:before {
- content: "\f0a6";
-}
-.fa-hand-o-down:before {
- content: "\f0a7";
-}
-.fa-arrow-circle-left:before {
- content: "\f0a8";
-}
-.fa-arrow-circle-right:before {
- content: "\f0a9";
-}
-.fa-arrow-circle-up:before {
- content: "\f0aa";
-}
-.fa-arrow-circle-down:before {
- content: "\f0ab";
-}
-.fa-globe:before {
- content: "\f0ac";
-}
-.fa-wrench:before {
- content: "\f0ad";
-}
-.fa-tasks:before {
- content: "\f0ae";
-}
-.fa-filter:before {
- content: "\f0b0";
-}
-.fa-briefcase:before {
- content: "\f0b1";
-}
-.fa-arrows-alt:before {
- content: "\f0b2";
-}
-.fa-group:before,
-.fa-users:before {
- content: "\f0c0";
-}
-.fa-chain:before,
-.fa-link:before {
- content: "\f0c1";
-}
-.fa-cloud:before {
- content: "\f0c2";
-}
-.fa-flask:before {
- content: "\f0c3";
-}
-.fa-cut:before,
-.fa-scissors:before {
- content: "\f0c4";
-}
-.fa-copy:before,
-.fa-files-o:before {
- content: "\f0c5";
-}
-.fa-paperclip:before {
- content: "\f0c6";
-}
-.fa-save:before,
-.fa-floppy-o:before {
- content: "\f0c7";
-}
-.fa-square:before {
- content: "\f0c8";
-}
-.fa-navicon:before,
-.fa-reorder:before,
-.fa-bars:before {
- content: "\f0c9";
-}
-.fa-list-ul:before {
- content: "\f0ca";
-}
-.fa-list-ol:before {
- content: "\f0cb";
-}
-.fa-strikethrough:before {
- content: "\f0cc";
-}
-.fa-underline:before {
- content: "\f0cd";
-}
-.fa-table:before {
- content: "\f0ce";
-}
-.fa-magic:before {
- content: "\f0d0";
-}
-.fa-truck:before {
- content: "\f0d1";
-}
-.fa-pinterest:before {
- content: "\f0d2";
-}
-.fa-pinterest-square:before {
- content: "\f0d3";
-}
-.fa-google-plus-square:before {
- content: "\f0d4";
-}
-.fa-google-plus:before {
- content: "\f0d5";
-}
-.fa-money:before {
- content: "\f0d6";
-}
-.fa-caret-down:before {
- content: "\f0d7";
-}
-.fa-caret-up:before {
- content: "\f0d8";
-}
-.fa-caret-left:before {
- content: "\f0d9";
-}
-.fa-caret-right:before {
- content: "\f0da";
-}
-.fa-columns:before {
- content: "\f0db";
-}
-.fa-unsorted:before,
-.fa-sort:before {
- content: "\f0dc";
-}
-.fa-sort-down:before,
-.fa-sort-desc:before {
- content: "\f0dd";
-}
-.fa-sort-up:before,
-.fa-sort-asc:before {
- content: "\f0de";
-}
-.fa-envelope:before {
- content: "\f0e0";
-}
-.fa-linkedin:before {
- content: "\f0e1";
-}
-.fa-rotate-left:before,
-.fa-undo:before {
- content: "\f0e2";
-}
-.fa-legal:before,
-.fa-gavel:before {
- content: "\f0e3";
-}
-.fa-dashboard:before,
-.fa-tachometer:before {
- content: "\f0e4";
-}
-.fa-comment-o:before {
- content: "\f0e5";
-}
-.fa-comments-o:before {
- content: "\f0e6";
-}
-.fa-flash:before,
-.fa-bolt:before {
- content: "\f0e7";
-}
-.fa-sitemap:before {
- content: "\f0e8";
-}
-.fa-umbrella:before {
- content: "\f0e9";
-}
-.fa-paste:before,
-.fa-clipboard:before {
- content: "\f0ea";
-}
-.fa-lightbulb-o:before {
- content: "\f0eb";
-}
-.fa-exchange:before {
- content: "\f0ec";
-}
-.fa-cloud-download:before {
- content: "\f0ed";
-}
-.fa-cloud-upload:before {
- content: "\f0ee";
-}
-.fa-user-md:before {
- content: "\f0f0";
-}
-.fa-stethoscope:before {
- content: "\f0f1";
-}
-.fa-suitcase:before {
- content: "\f0f2";
-}
-.fa-bell-o:before {
- content: "\f0a2";
-}
-.fa-coffee:before {
- content: "\f0f4";
-}
-.fa-cutlery:before {
- content: "\f0f5";
-}
-.fa-file-text-o:before {
- content: "\f0f6";
-}
-.fa-building-o:before {
- content: "\f0f7";
-}
-.fa-hospital-o:before {
- content: "\f0f8";
-}
-.fa-ambulance:before {
- content: "\f0f9";
-}
-.fa-medkit:before {
- content: "\f0fa";
-}
-.fa-fighter-jet:before {
- content: "\f0fb";
-}
-.fa-beer:before {
- content: "\f0fc";
-}
-.fa-h-square:before {
- content: "\f0fd";
-}
-.fa-plus-square:before {
- content: "\f0fe";
-}
-.fa-angle-double-left:before {
- content: "\f100";
-}
-.fa-angle-double-right:before {
- content: "\f101";
-}
-.fa-angle-double-up:before {
- content: "\f102";
-}
-.fa-angle-double-down:before {
- content: "\f103";
-}
-.fa-angle-left:before {
- content: "\f104";
-}
-.fa-angle-right:before {
- content: "\f105";
-}
-.fa-angle-up:before {
- content: "\f106";
-}
-.fa-angle-down:before {
- content: "\f107";
-}
-.fa-desktop:before {
- content: "\f108";
-}
-.fa-laptop:before {
- content: "\f109";
-}
-.fa-tablet:before {
- content: "\f10a";
-}
-.fa-mobile-phone:before,
-.fa-mobile:before {
- content: "\f10b";
-}
-.fa-circle-o:before {
- content: "\f10c";
-}
-.fa-quote-left:before {
- content: "\f10d";
-}
-.fa-quote-right:before {
- content: "\f10e";
-}
-.fa-spinner:before {
- content: "\f110";
-}
-.fa-circle:before {
- content: "\f111";
-}
-.fa-mail-reply:before,
-.fa-reply:before {
- content: "\f112";
-}
-.fa-github-alt:before {
- content: "\f113";
-}
-.fa-folder-o:before {
- content: "\f114";
-}
-.fa-folder-open-o:before {
- content: "\f115";
-}
-.fa-smile-o:before {
- content: "\f118";
-}
-.fa-frown-o:before {
- content: "\f119";
-}
-.fa-meh-o:before {
- content: "\f11a";
-}
-.fa-gamepad:before {
- content: "\f11b";
-}
-.fa-keyboard-o:before {
- content: "\f11c";
-}
-.fa-flag-o:before {
- content: "\f11d";
-}
-.fa-flag-checkered:before {
- content: "\f11e";
-}
-.fa-terminal:before {
- content: "\f120";
-}
-.fa-code:before {
- content: "\f121";
-}
-.fa-mail-reply-all:before,
-.fa-reply-all:before {
- content: "\f122";
-}
-.fa-star-half-empty:before,
-.fa-star-half-full:before,
-.fa-star-half-o:before {
- content: "\f123";
-}
-.fa-location-arrow:before {
- content: "\f124";
-}
-.fa-crop:before {
- content: "\f125";
-}
-.fa-code-fork:before {
- content: "\f126";
-}
-.fa-unlink:before,
-.fa-chain-broken:before {
- content: "\f127";
-}
-.fa-question:before {
- content: "\f128";
-}
-.fa-info:before {
- content: "\f129";
-}
-.fa-exclamation:before {
- content: "\f12a";
-}
-.fa-superscript:before {
- content: "\f12b";
-}
-.fa-subscript:before {
- content: "\f12c";
-}
-.fa-eraser:before {
- content: "\f12d";
-}
-.fa-puzzle-piece:before {
- content: "\f12e";
-}
-.fa-microphone:before {
- content: "\f130";
-}
-.fa-microphone-slash:before {
- content: "\f131";
-}
-.fa-shield:before {
- content: "\f132";
-}
-.fa-calendar-o:before {
- content: "\f133";
-}
-.fa-fire-extinguisher:before {
- content: "\f134";
-}
-.fa-rocket:before {
- content: "\f135";
-}
-.fa-maxcdn:before {
- content: "\f136";
-}
-.fa-chevron-circle-left:before {
- content: "\f137";
-}
-.fa-chevron-circle-right:before {
- content: "\f138";
-}
-.fa-chevron-circle-up:before {
- content: "\f139";
-}
-.fa-chevron-circle-down:before {
- content: "\f13a";
-}
-.fa-html5:before {
- content: "\f13b";
-}
-.fa-css3:before {
- content: "\f13c";
-}
-.fa-anchor:before {
- content: "\f13d";
-}
-.fa-unlock-alt:before {
- content: "\f13e";
-}
-.fa-bullseye:before {
- content: "\f140";
-}
-.fa-ellipsis-h:before {
- content: "\f141";
-}
-.fa-ellipsis-v:before {
- content: "\f142";
-}
-.fa-rss-square:before {
- content: "\f143";
-}
-.fa-play-circle:before {
- content: "\f144";
-}
-.fa-ticket:before {
- content: "\f145";
-}
-.fa-minus-square:before {
- content: "\f146";
-}
-.fa-minus-square-o:before {
- content: "\f147";
-}
-.fa-level-up:before {
- content: "\f148";
-}
-.fa-level-down:before {
- content: "\f149";
-}
-.fa-check-square:before {
- content: "\f14a";
-}
-.fa-pencil-square:before {
- content: "\f14b";
-}
-.fa-external-link-square:before {
- content: "\f14c";
-}
-.fa-share-square:before {
- content: "\f14d";
-}
-.fa-compass:before {
- content: "\f14e";
-}
-.fa-toggle-down:before,
-.fa-caret-square-o-down:before {
- content: "\f150";
-}
-.fa-toggle-up:before,
-.fa-caret-square-o-up:before {
- content: "\f151";
-}
-.fa-toggle-right:before,
-.fa-caret-square-o-right:before {
- content: "\f152";
-}
-.fa-euro:before,
-.fa-eur:before {
- content: "\f153";
-}
-.fa-gbp:before {
- content: "\f154";
-}
-.fa-dollar:before,
-.fa-usd:before {
- content: "\f155";
-}
-.fa-rupee:before,
-.fa-inr:before {
- content: "\f156";
-}
-.fa-cny:before,
-.fa-rmb:before,
-.fa-yen:before,
-.fa-jpy:before {
- content: "\f157";
-}
-.fa-ruble:before,
-.fa-rouble:before,
-.fa-rub:before {
- content: "\f158";
-}
-.fa-won:before,
-.fa-krw:before {
- content: "\f159";
-}
-.fa-bitcoin:before,
-.fa-btc:before {
- content: "\f15a";
-}
-.fa-file:before {
- content: "\f15b";
-}
-.fa-file-text:before {
- content: "\f15c";
-}
-.fa-sort-alpha-asc:before {
- content: "\f15d";
-}
-.fa-sort-alpha-desc:before {
- content: "\f15e";
-}
-.fa-sort-amount-asc:before {
- content: "\f160";
-}
-.fa-sort-amount-desc:before {
- content: "\f161";
-}
-.fa-sort-numeric-asc:before {
- content: "\f162";
-}
-.fa-sort-numeric-desc:before {
- content: "\f163";
-}
-.fa-thumbs-up:before {
- content: "\f164";
-}
-.fa-thumbs-down:before {
- content: "\f165";
-}
-.fa-youtube-square:before {
- content: "\f166";
-}
-.fa-youtube:before {
- content: "\f167";
-}
-.fa-xing:before {
- content: "\f168";
-}
-.fa-xing-square:before {
- content: "\f169";
-}
-.fa-youtube-play:before {
- content: "\f16a";
-}
-.fa-dropbox:before {
- content: "\f16b";
-}
-.fa-stack-overflow:before {
- content: "\f16c";
-}
-.fa-instagram:before {
- content: "\f16d";
-}
-.fa-flickr:before {
- content: "\f16e";
-}
-.fa-adn:before {
- content: "\f170";
-}
-.fa-bitbucket:before {
- content: "\f171";
-}
-.fa-bitbucket-square:before {
- content: "\f172";
-}
-.fa-tumblr:before {
- content: "\f173";
-}
-.fa-tumblr-square:before {
- content: "\f174";
-}
-.fa-long-arrow-down:before {
- content: "\f175";
-}
-.fa-long-arrow-up:before {
- content: "\f176";
-}
-.fa-long-arrow-left:before {
- content: "\f177";
-}
-.fa-long-arrow-right:before {
- content: "\f178";
-}
-.fa-apple:before {
- content: "\f179";
-}
-.fa-windows:before {
- content: "\f17a";
-}
-.fa-android:before {
- content: "\f17b";
-}
-.fa-linux:before {
- content: "\f17c";
-}
-.fa-dribbble:before {
- content: "\f17d";
-}
-.fa-skype:before {
- content: "\f17e";
-}
-.fa-foursquare:before {
- content: "\f180";
-}
-.fa-trello:before {
- content: "\f181";
-}
-.fa-female:before {
- content: "\f182";
-}
-.fa-male:before {
- content: "\f183";
-}
-.fa-gittip:before,
-.fa-gratipay:before {
- content: "\f184";
-}
-.fa-sun-o:before {
- content: "\f185";
-}
-.fa-moon-o:before {
- content: "\f186";
-}
-.fa-archive:before {
- content: "\f187";
-}
-.fa-bug:before {
- content: "\f188";
-}
-.fa-vk:before {
- content: "\f189";
-}
-.fa-weibo:before {
- content: "\f18a";
-}
-.fa-renren:before {
- content: "\f18b";
-}
-.fa-pagelines:before {
- content: "\f18c";
-}
-.fa-stack-exchange:before {
- content: "\f18d";
-}
-.fa-arrow-circle-o-right:before {
- content: "\f18e";
-}
-.fa-arrow-circle-o-left:before {
- content: "\f190";
-}
-.fa-toggle-left:before,
-.fa-caret-square-o-left:before {
- content: "\f191";
-}
-.fa-dot-circle-o:before {
- content: "\f192";
-}
-.fa-wheelchair:before {
- content: "\f193";
-}
-.fa-vimeo-square:before {
- content: "\f194";
-}
-.fa-turkish-lira:before,
-.fa-try:before {
- content: "\f195";
-}
-.fa-plus-square-o:before {
- content: "\f196";
-}
-.fa-space-shuttle:before {
- content: "\f197";
-}
-.fa-slack:before {
- content: "\f198";
-}
-.fa-envelope-square:before {
- content: "\f199";
-}
-.fa-wordpress:before {
- content: "\f19a";
-}
-.fa-openid:before {
- content: "\f19b";
-}
-.fa-institution:before,
-.fa-bank:before,
-.fa-university:before {
- content: "\f19c";
-}
-.fa-mortar-board:before,
-.fa-graduation-cap:before {
- content: "\f19d";
-}
-.fa-yahoo:before {
- content: "\f19e";
-}
-.fa-google:before {
- content: "\f1a0";
-}
-.fa-reddit:before {
- content: "\f1a1";
-}
-.fa-reddit-square:before {
- content: "\f1a2";
-}
-.fa-stumbleupon-circle:before {
- content: "\f1a3";
-}
-.fa-stumbleupon:before {
- content: "\f1a4";
-}
-.fa-delicious:before {
- content: "\f1a5";
-}
-.fa-digg:before {
- content: "\f1a6";
-}
-.fa-pied-piper-pp:before {
- content: "\f1a7";
-}
-.fa-pied-piper-alt:before {
- content: "\f1a8";
-}
-.fa-drupal:before {
- content: "\f1a9";
-}
-.fa-joomla:before {
- content: "\f1aa";
-}
-.fa-language:before {
- content: "\f1ab";
-}
-.fa-fax:before {
- content: "\f1ac";
-}
-.fa-building:before {
- content: "\f1ad";
-}
-.fa-child:before {
- content: "\f1ae";
-}
-.fa-paw:before {
- content: "\f1b0";
-}
-.fa-spoon:before {
- content: "\f1b1";
-}
-.fa-cube:before {
- content: "\f1b2";
-}
-.fa-cubes:before {
- content: "\f1b3";
-}
-.fa-behance:before {
- content: "\f1b4";
-}
-.fa-behance-square:before {
- content: "\f1b5";
-}
-.fa-steam:before {
- content: "\f1b6";
-}
-.fa-steam-square:before {
- content: "\f1b7";
-}
-.fa-recycle:before {
- content: "\f1b8";
-}
-.fa-automobile:before,
-.fa-car:before {
- content: "\f1b9";
-}
-.fa-cab:before,
-.fa-taxi:before {
- content: "\f1ba";
-}
-.fa-tree:before {
- content: "\f1bb";
-}
-.fa-spotify:before {
- content: "\f1bc";
-}
-.fa-deviantart:before {
- content: "\f1bd";
-}
-.fa-soundcloud:before {
- content: "\f1be";
-}
-.fa-database:before {
- content: "\f1c0";
-}
-.fa-file-pdf-o:before {
- content: "\f1c1";
-}
-.fa-file-word-o:before {
- content: "\f1c2";
-}
-.fa-file-excel-o:before {
- content: "\f1c3";
-}
-.fa-file-powerpoint-o:before {
- content: "\f1c4";
-}
-.fa-file-photo-o:before,
-.fa-file-picture-o:before,
-.fa-file-image-o:before {
- content: "\f1c5";
-}
-.fa-file-zip-o:before,
-.fa-file-archive-o:before {
- content: "\f1c6";
-}
-.fa-file-sound-o:before,
-.fa-file-audio-o:before {
- content: "\f1c7";
-}
-.fa-file-movie-o:before,
-.fa-file-video-o:before {
- content: "\f1c8";
-}
-.fa-file-code-o:before {
- content: "\f1c9";
-}
-.fa-vine:before {
- content: "\f1ca";
-}
-.fa-codepen:before {
- content: "\f1cb";
-}
-.fa-jsfiddle:before {
- content: "\f1cc";
-}
-.fa-life-bouy:before,
-.fa-life-buoy:before,
-.fa-life-saver:before,
-.fa-support:before,
-.fa-life-ring:before {
- content: "\f1cd";
-}
-.fa-circle-o-notch:before {
- content: "\f1ce";
-}
-.fa-ra:before,
-.fa-resistance:before,
-.fa-rebel:before {
- content: "\f1d0";
-}
-.fa-ge:before,
-.fa-empire:before {
- content: "\f1d1";
-}
-.fa-git-square:before {
- content: "\f1d2";
-}
-.fa-git:before {
- content: "\f1d3";
-}
-.fa-y-combinator-square:before,
-.fa-yc-square:before,
-.fa-hacker-news:before {
- content: "\f1d4";
-}
-.fa-tencent-weibo:before {
- content: "\f1d5";
-}
-.fa-qq:before {
- content: "\f1d6";
-}
-.fa-wechat:before,
-.fa-weixin:before {
- content: "\f1d7";
-}
-.fa-send:before,
-.fa-paper-plane:before {
- content: "\f1d8";
-}
-.fa-send-o:before,
-.fa-paper-plane-o:before {
- content: "\f1d9";
-}
-.fa-history:before {
- content: "\f1da";
-}
-.fa-circle-thin:before {
- content: "\f1db";
-}
-.fa-header:before {
- content: "\f1dc";
-}
-.fa-paragraph:before {
- content: "\f1dd";
-}
-.fa-sliders:before {
- content: "\f1de";
-}
-.fa-share-alt:before {
- content: "\f1e0";
-}
-.fa-share-alt-square:before {
- content: "\f1e1";
-}
-.fa-bomb:before {
- content: "\f1e2";
-}
-.fa-soccer-ball-o:before,
-.fa-futbol-o:before {
- content: "\f1e3";
-}
-.fa-tty:before {
- content: "\f1e4";
-}
-.fa-binoculars:before {
- content: "\f1e5";
-}
-.fa-plug:before {
- content: "\f1e6";
-}
-.fa-slideshare:before {
- content: "\f1e7";
-}
-.fa-twitch:before {
- content: "\f1e8";
-}
-.fa-yelp:before {
- content: "\f1e9";
-}
-.fa-newspaper-o:before {
- content: "\f1ea";
-}
-.fa-wifi:before {
- content: "\f1eb";
-}
-.fa-calculator:before {
- content: "\f1ec";
-}
-.fa-paypal:before {
- content: "\f1ed";
-}
-.fa-google-wallet:before {
- content: "\f1ee";
-}
-.fa-cc-visa:before {
- content: "\f1f0";
-}
-.fa-cc-mastercard:before {
- content: "\f1f1";
-}
-.fa-cc-discover:before {
- content: "\f1f2";
-}
-.fa-cc-amex:before {
- content: "\f1f3";
-}
-.fa-cc-paypal:before {
- content: "\f1f4";
-}
-.fa-cc-stripe:before {
- content: "\f1f5";
-}
-.fa-bell-slash:before {
- content: "\f1f6";
-}
-.fa-bell-slash-o:before {
- content: "\f1f7";
-}
-.fa-trash:before {
- content: "\f1f8";
-}
-.fa-copyright:before {
- content: "\f1f9";
-}
-.fa-at:before {
- content: "\f1fa";
-}
-.fa-eyedropper:before {
- content: "\f1fb";
-}
-.fa-paint-brush:before {
- content: "\f1fc";
-}
-.fa-birthday-cake:before {
- content: "\f1fd";
-}
-.fa-area-chart:before {
- content: "\f1fe";
-}
-.fa-pie-chart:before {
- content: "\f200";
-}
-.fa-line-chart:before {
- content: "\f201";
-}
-.fa-lastfm:before {
- content: "\f202";
-}
-.fa-lastfm-square:before {
- content: "\f203";
-}
-.fa-toggle-off:before {
- content: "\f204";
-}
-.fa-toggle-on:before {
- content: "\f205";
-}
-.fa-bicycle:before {
- content: "\f206";
-}
-.fa-bus:before {
- content: "\f207";
-}
-.fa-ioxhost:before {
- content: "\f208";
-}
-.fa-angellist:before {
- content: "\f209";
-}
-.fa-cc:before {
- content: "\f20a";
-}
-.fa-shekel:before,
-.fa-sheqel:before,
-.fa-ils:before {
- content: "\f20b";
-}
-.fa-meanpath:before {
- content: "\f20c";
-}
-.fa-buysellads:before {
- content: "\f20d";
-}
-.fa-connectdevelop:before {
- content: "\f20e";
-}
-.fa-dashcube:before {
- content: "\f210";
-}
-.fa-forumbee:before {
- content: "\f211";
-}
-.fa-leanpub:before {
- content: "\f212";
-}
-.fa-sellsy:before {
- content: "\f213";
-}
-.fa-shirtsinbulk:before {
- content: "\f214";
-}
-.fa-simplybuilt:before {
- content: "\f215";
-}
-.fa-skyatlas:before {
- content: "\f216";
-}
-.fa-cart-plus:before {
- content: "\f217";
-}
-.fa-cart-arrow-down:before {
- content: "\f218";
-}
-.fa-diamond:before {
- content: "\f219";
-}
-.fa-ship:before {
- content: "\f21a";
-}
-.fa-user-secret:before {
- content: "\f21b";
-}
-.fa-motorcycle:before {
- content: "\f21c";
-}
-.fa-street-view:before {
- content: "\f21d";
-}
-.fa-heartbeat:before {
- content: "\f21e";
-}
-.fa-venus:before {
- content: "\f221";
-}
-.fa-mars:before {
- content: "\f222";
-}
-.fa-mercury:before {
- content: "\f223";
-}
-.fa-intersex:before,
-.fa-transgender:before {
- content: "\f224";
-}
-.fa-transgender-alt:before {
- content: "\f225";
-}
-.fa-venus-double:before {
- content: "\f226";
-}
-.fa-mars-double:before {
- content: "\f227";
-}
-.fa-venus-mars:before {
- content: "\f228";
-}
-.fa-mars-stroke:before {
- content: "\f229";
-}
-.fa-mars-stroke-v:before {
- content: "\f22a";
-}
-.fa-mars-stroke-h:before {
- content: "\f22b";
-}
-.fa-neuter:before {
- content: "\f22c";
-}
-.fa-genderless:before {
- content: "\f22d";
-}
-.fa-facebook-official:before {
- content: "\f230";
-}
-.fa-pinterest-p:before {
- content: "\f231";
-}
-.fa-whatsapp:before {
- content: "\f232";
-}
-.fa-server:before {
- content: "\f233";
-}
-.fa-user-plus:before {
- content: "\f234";
-}
-.fa-user-times:before {
- content: "\f235";
-}
-.fa-hotel:before,
-.fa-bed:before {
- content: "\f236";
-}
-.fa-viacoin:before {
- content: "\f237";
-}
-.fa-train:before {
- content: "\f238";
-}
-.fa-subway:before {
- content: "\f239";
-}
-.fa-medium:before {
- content: "\f23a";
-}
-.fa-yc:before,
-.fa-y-combinator:before {
- content: "\f23b";
-}
-.fa-optin-monster:before {
- content: "\f23c";
-}
-.fa-opencart:before {
- content: "\f23d";
-}
-.fa-expeditedssl:before {
- content: "\f23e";
-}
-.fa-battery-4:before,
-.fa-battery:before,
-.fa-battery-full:before {
- content: "\f240";
-}
-.fa-battery-3:before,
-.fa-battery-three-quarters:before {
- content: "\f241";
-}
-.fa-battery-2:before,
-.fa-battery-half:before {
- content: "\f242";
-}
-.fa-battery-1:before,
-.fa-battery-quarter:before {
- content: "\f243";
-}
-.fa-battery-0:before,
-.fa-battery-empty:before {
- content: "\f244";
-}
-.fa-mouse-pointer:before {
- content: "\f245";
-}
-.fa-i-cursor:before {
- content: "\f246";
-}
-.fa-object-group:before {
- content: "\f247";
-}
-.fa-object-ungroup:before {
- content: "\f248";
-}
-.fa-sticky-note:before {
- content: "\f249";
-}
-.fa-sticky-note-o:before {
- content: "\f24a";
-}
-.fa-cc-jcb:before {
- content: "\f24b";
-}
-.fa-cc-diners-club:before {
- content: "\f24c";
-}
-.fa-clone:before {
- content: "\f24d";
-}
-.fa-balance-scale:before {
- content: "\f24e";
-}
-.fa-hourglass-o:before {
- content: "\f250";
-}
-.fa-hourglass-1:before,
-.fa-hourglass-start:before {
- content: "\f251";
-}
-.fa-hourglass-2:before,
-.fa-hourglass-half:before {
- content: "\f252";
-}
-.fa-hourglass-3:before,
-.fa-hourglass-end:before {
- content: "\f253";
-}
-.fa-hourglass:before {
- content: "\f254";
-}
-.fa-hand-grab-o:before,
-.fa-hand-rock-o:before {
- content: "\f255";
-}
-.fa-hand-stop-o:before,
-.fa-hand-paper-o:before {
- content: "\f256";
-}
-.fa-hand-scissors-o:before {
- content: "\f257";
-}
-.fa-hand-lizard-o:before {
- content: "\f258";
-}
-.fa-hand-spock-o:before {
- content: "\f259";
-}
-.fa-hand-pointer-o:before {
- content: "\f25a";
-}
-.fa-hand-peace-o:before {
- content: "\f25b";
-}
-.fa-trademark:before {
- content: "\f25c";
-}
-.fa-registered:before {
- content: "\f25d";
-}
-.fa-creative-commons:before {
- content: "\f25e";
-}
-.fa-gg:before {
- content: "\f260";
-}
-.fa-gg-circle:before {
- content: "\f261";
-}
-.fa-tripadvisor:before {
- content: "\f262";
-}
-.fa-odnoklassniki:before {
- content: "\f263";
-}
-.fa-odnoklassniki-square:before {
- content: "\f264";
-}
-.fa-get-pocket:before {
- content: "\f265";
-}
-.fa-wikipedia-w:before {
- content: "\f266";
-}
-.fa-safari:before {
- content: "\f267";
-}
-.fa-chrome:before {
- content: "\f268";
-}
-.fa-firefox:before {
- content: "\f269";
-}
-.fa-opera:before {
- content: "\f26a";
-}
-.fa-internet-explorer:before {
- content: "\f26b";
-}
-.fa-tv:before,
-.fa-television:before {
- content: "\f26c";
-}
-.fa-contao:before {
- content: "\f26d";
-}
-.fa-500px:before {
- content: "\f26e";
-}
-.fa-amazon:before {
- content: "\f270";
-}
-.fa-calendar-plus-o:before {
- content: "\f271";
-}
-.fa-calendar-minus-o:before {
- content: "\f272";
-}
-.fa-calendar-times-o:before {
- content: "\f273";
-}
-.fa-calendar-check-o:before {
- content: "\f274";
-}
-.fa-industry:before {
- content: "\f275";
-}
-.fa-map-pin:before {
- content: "\f276";
-}
-.fa-map-signs:before {
- content: "\f277";
-}
-.fa-map-o:before {
- content: "\f278";
-}
-.fa-map:before {
- content: "\f279";
-}
-.fa-commenting:before {
- content: "\f27a";
-}
-.fa-commenting-o:before {
- content: "\f27b";
-}
-.fa-houzz:before {
- content: "\f27c";
-}
-.fa-vimeo:before {
- content: "\f27d";
-}
-.fa-black-tie:before {
- content: "\f27e";
-}
-.fa-fonticons:before {
- content: "\f280";
-}
-.fa-reddit-alien:before {
- content: "\f281";
-}
-.fa-edge:before {
- content: "\f282";
-}
-.fa-credit-card-alt:before {
- content: "\f283";
-}
-.fa-codiepie:before {
- content: "\f284";
-}
-.fa-modx:before {
- content: "\f285";
-}
-.fa-fort-awesome:before {
- content: "\f286";
-}
-.fa-usb:before {
- content: "\f287";
-}
-.fa-product-hunt:before {
- content: "\f288";
-}
-.fa-mixcloud:before {
- content: "\f289";
-}
-.fa-scribd:before {
- content: "\f28a";
-}
-.fa-pause-circle:before {
- content: "\f28b";
-}
-.fa-pause-circle-o:before {
- content: "\f28c";
-}
-.fa-stop-circle:before {
- content: "\f28d";
-}
-.fa-stop-circle-o:before {
- content: "\f28e";
-}
-.fa-shopping-bag:before {
- content: "\f290";
-}
-.fa-shopping-basket:before {
- content: "\f291";
-}
-.fa-hashtag:before {
- content: "\f292";
-}
-.fa-bluetooth:before {
- content: "\f293";
-}
-.fa-bluetooth-b:before {
- content: "\f294";
-}
-.fa-percent:before {
- content: "\f295";
-}
-.fa-gitlab:before {
- content: "\f296";
-}
-.fa-wpbeginner:before {
- content: "\f297";
-}
-.fa-wpforms:before {
- content: "\f298";
-}
-.fa-envira:before {
- content: "\f299";
-}
-.fa-universal-access:before {
- content: "\f29a";
-}
-.fa-wheelchair-alt:before {
- content: "\f29b";
-}
-.fa-question-circle-o:before {
- content: "\f29c";
-}
-.fa-blind:before {
- content: "\f29d";
-}
-.fa-audio-description:before {
- content: "\f29e";
-}
-.fa-volume-control-phone:before {
- content: "\f2a0";
-}
-.fa-braille:before {
- content: "\f2a1";
-}
-.fa-assistive-listening-systems:before {
- content: "\f2a2";
-}
-.fa-asl-interpreting:before,
-.fa-american-sign-language-interpreting:before {
- content: "\f2a3";
-}
-.fa-deafness:before,
-.fa-hard-of-hearing:before,
-.fa-deaf:before {
- content: "\f2a4";
-}
-.fa-glide:before {
- content: "\f2a5";
-}
-.fa-glide-g:before {
- content: "\f2a6";
-}
-.fa-signing:before,
-.fa-sign-language:before {
- content: "\f2a7";
-}
-.fa-low-vision:before {
- content: "\f2a8";
-}
-.fa-viadeo:before {
- content: "\f2a9";
-}
-.fa-viadeo-square:before {
- content: "\f2aa";
-}
-.fa-snapchat:before {
- content: "\f2ab";
-}
-.fa-snapchat-ghost:before {
- content: "\f2ac";
-}
-.fa-snapchat-square:before {
- content: "\f2ad";
-}
-.fa-pied-piper:before {
- content: "\f2ae";
-}
-.fa-first-order:before {
- content: "\f2b0";
-}
-.fa-yoast:before {
- content: "\f2b1";
-}
-.fa-themeisle:before {
- content: "\f2b2";
-}
-.fa-google-plus-circle:before,
-.fa-google-plus-official:before {
- content: "\f2b3";
-}
-.fa-fa:before,
-.fa-font-awesome:before {
- content: "\f2b4";
-}
-.fa-handshake-o:before {
- content: "\f2b5";
-}
-.fa-envelope-open:before {
- content: "\f2b6";
-}
-.fa-envelope-open-o:before {
- content: "\f2b7";
-}
-.fa-linode:before {
- content: "\f2b8";
-}
-.fa-address-book:before {
- content: "\f2b9";
-}
-.fa-address-book-o:before {
- content: "\f2ba";
-}
-.fa-vcard:before,
-.fa-address-card:before {
- content: "\f2bb";
-}
-.fa-vcard-o:before,
-.fa-address-card-o:before {
- content: "\f2bc";
-}
-.fa-user-circle:before {
- content: "\f2bd";
-}
-.fa-user-circle-o:before {
- content: "\f2be";
-}
-.fa-user-o:before {
- content: "\f2c0";
-}
-.fa-id-badge:before {
- content: "\f2c1";
-}
-.fa-drivers-license:before,
-.fa-id-card:before {
- content: "\f2c2";
-}
-.fa-drivers-license-o:before,
-.fa-id-card-o:before {
- content: "\f2c3";
-}
-.fa-quora:before {
- content: "\f2c4";
-}
-.fa-free-code-camp:before {
- content: "\f2c5";
-}
-.fa-telegram:before {
- content: "\f2c6";
-}
-.fa-thermometer-4:before,
-.fa-thermometer:before,
-.fa-thermometer-full:before {
- content: "\f2c7";
-}
-.fa-thermometer-3:before,
-.fa-thermometer-three-quarters:before {
- content: "\f2c8";
-}
-.fa-thermometer-2:before,
-.fa-thermometer-half:before {
- content: "\f2c9";
-}
-.fa-thermometer-1:before,
-.fa-thermometer-quarter:before {
- content: "\f2ca";
-}
-.fa-thermometer-0:before,
-.fa-thermometer-empty:before {
- content: "\f2cb";
-}
-.fa-shower:before {
- content: "\f2cc";
-}
-.fa-bathtub:before,
-.fa-s15:before,
-.fa-bath:before {
- content: "\f2cd";
-}
-.fa-podcast:before {
- content: "\f2ce";
-}
-.fa-window-maximize:before {
- content: "\f2d0";
-}
-.fa-window-minimize:before {
- content: "\f2d1";
-}
-.fa-window-restore:before {
- content: "\f2d2";
-}
-.fa-times-rectangle:before,
-.fa-window-close:before {
- content: "\f2d3";
-}
-.fa-times-rectangle-o:before,
-.fa-window-close-o:before {
- content: "\f2d4";
-}
-.fa-bandcamp:before {
- content: "\f2d5";
-}
-.fa-grav:before {
- content: "\f2d6";
-}
-.fa-etsy:before {
- content: "\f2d7";
-}
-.fa-imdb:before {
- content: "\f2d8";
-}
-.fa-ravelry:before {
- content: "\f2d9";
-}
-.fa-eercast:before {
- content: "\f2da";
-}
-.fa-microchip:before {
- content: "\f2db";
-}
-.fa-snowflake-o:before {
- content: "\f2dc";
-}
-.fa-superpowers:before {
- content: "\f2dd";
-}
-.fa-wpexplorer:before {
- content: "\f2de";
-}
-.fa-meetup:before {
- content: "\f2e0";
-}
-.sr-only {
- position: absolute;
- width: 1px;
- height: 1px;
- padding: 0;
- margin: -1px;
- overflow: hidden;
- clip: rect(0, 0, 0, 0);
- border: 0;
-}
-.sr-only-focusable:active,
-.sr-only-focusable:focus {
- position: static;
- width: auto;
- height: auto;
- margin: 0;
- overflow: visible;
- clip: auto;
-}
diff --git a/app/src/renderer/vuex/getters.js b/app/src/renderer/vuex/getters.js
index 2c2cdcdb91..d0f1ac9b98 100644
--- a/app/src/renderer/vuex/getters.js
+++ b/app/src/renderer/vuex/getters.js
@@ -12,7 +12,6 @@ export const lastPage = state => {
state.user.history[state.user.history.length - 1]
)
}
-export const themes = state => state.themes
export const onboarding = state => state.onboarding
// wallet
@@ -21,12 +20,19 @@ export const allTransactions = state =>
state.transactions.staking,
state.transactions.governance
)
+export const ledger = state => state.ledger
export const wallet = state => state.wallet
// staking
+export const liquidAtoms = state =>
+ (
+ state.wallet.balances.find(
+ balance => balance.denom === state.stakingParameters.parameters.bond_denom
+ ) || { amount: 0 }
+ ).amount
export const delegation = state => state.delegation
export const totalAtoms = (state, getters) => {
- return new BN(getters.user.atoms)
+ return new BN(getters.liquidAtoms)
.plus(new BN(getters.oldBondedAtoms))
.plus(new BN(getters.oldUnbondingAtoms))
.toString()
@@ -35,8 +41,8 @@ export const oldBondedAtoms = (state, getters) => {
let totalOldBondedAtoms = new BN(0)
Object.keys(getters.delegation.committedDelegates).forEach(
delegatorAddress => {
- let shares = getters.delegation.committedDelegates[delegatorAddress]
- let delegator = getters.delegates.delegates.find(
+ const shares = getters.delegation.committedDelegates[delegatorAddress]
+ const delegator = getters.delegates.delegates.find(
d => d.id === delegatorAddress
)
if (!delegator) {
@@ -74,11 +80,16 @@ export const votes = state => state.votes.votes
export const deposits = state => state.deposits.deposits
export const governanceParameters = state => state.governanceParameters
export const depositDenom = getters =>
- getters.governanceParameters.parameters.deposit.min_deposit[0].denom
+ getters.governanceParameters.loaded
+ ? getters.governanceParameters.parameters.deposit.min_deposit[0].denom
+ : ``
-// status
+// connection
export const approvalRequired = state => state.connection.approvalRequired
export const connected = state => state.connection.connected
export const lastHeader = state => state.connection.lastHeader
-export const nodeURL = state =>
- state.connection.node ? state.connection.node.remoteLcdURL : undefined
+export const nodeUrl = state =>
+ state.connection.connected ? state.connection.nodeUrl : undefined
+
+export const blocks = state => (state.blocks ? state.blocks.blocks : [])
+export const block = state => (state.blocks ? state.blocks.block : [])
diff --git a/app/src/renderer/vuex/modules/blockchain.js b/app/src/renderer/vuex/modules/blockchain.js
deleted file mode 100644
index 0ca48d753e..0000000000
--- a/app/src/renderer/vuex/modules/blockchain.js
+++ /dev/null
@@ -1,116 +0,0 @@
-import * as Sentry from "@sentry/browser"
-
-export default ({ node }) => {
- const state = {
- blockMetaInfo: { block_id: {} },
- blockHeight: null, // we remember the height so we can requery the block, if querying failed
- subscription: false,
- syncing: true,
- blockMetas: {},
- subscribedRPC: null,
- loading: false,
- error: null
- }
-
- const mutations = {
- setBlockHeight(state, height) {
- state.blockHeight = height
- },
- setSyncing(state, syncing) {
- state.syncing = syncing
- },
- setBlockMetas(state, blockMetas) {
- state.blockMetas = blockMetas
- },
- setSubscribedRPC(state, subscribedRPC) {
- state.subscribedRPC = subscribedRPC
- },
- setSubscription(state, subscription) {
- state.subscription = subscription
- }
- }
-
- const actions = {
- reconnected({ commit, dispatch }) {
- //on a reconnect we assume, that the rpc connector changed, so we can safely resubscribe to blocks
- commit(`setSubscription`, false)
- dispatch(`subscribeToBlocks`)
- },
- async queryBlockInfo({ state, commit }, height) {
- try {
- let blockMetaInfo = state.blockMetas[height]
- if (blockMetaInfo) {
- return blockMetaInfo
- }
- state.loading = true
- blockMetaInfo = await new Promise((resolve, reject) => {
- node.rpc.blockchain(
- { minHeight: String(height), maxHeight: String(height) },
- (error, data) => {
- if (error) {
- reject(new Error(`Couldn't query block. ${error.message}`))
- } else {
- resolve(data.block_metas && data.block_metas[0])
- }
- }
- )
- })
- state.loading = false
-
- commit(`setBlockMetas`, {
- ...state.blockMetas,
- [height]: blockMetaInfo
- })
- return blockMetaInfo
- } catch (error) {
- commit(`notifyError`, {
- title: `Error fetching block information`,
- body: error.message
- })
- Sentry.captureException(error)
- state.loading = false
- state.error = error.message
- return null
- }
- },
- subscribeToBlocks({ state, commit, dispatch }) {
- // ensure we never subscribe twice
- if (state.subscription) return false
- if (state.subscribedRPC === node.rpc) return false
- commit(`setSubscribedRPC`, node.rpc)
-
- function handleError(error) {
- dispatch(`nodeHasHalted`)
- state.error = error
- }
-
- node.rpc.status((error, status) => {
- if (error) return handleError(error)
- commit(`setBlockHeight`, status.sync_info.latest_block_height)
- if (status.sync_info.catching_up) {
- // still syncing, let's try subscribing again in 30 seconds
- commit(`setSyncing`, true)
- commit(`setSubscription`, false)
- setTimeout(() => dispatch(`subscribeToBlocks`), 30e3)
- return false
- }
-
- commit(`setSyncing`, false)
-
- // only subscribe if the node is not catching up anymore
- node.rpc.subscribe({ query: `tm.event = 'NewBlock'` }, error => {
- if (error) return handleError(error)
-
- if (state.subscription === false) commit(`setSubscription`, true)
- })
- })
- return true
- }
- }
-
- return {
- state,
- mutations,
- actions
- }
-}
diff --git a/app/src/renderer/vuex/modules/blocks.js b/app/src/renderer/vuex/modules/blocks.js
new file mode 100644
index 0000000000..09c3557d6b
--- /dev/null
+++ b/app/src/renderer/vuex/modules/blocks.js
@@ -0,0 +1,127 @@
+import * as Sentry from "@sentry/browser"
+import Vue from "vue"
+
+export const cache = (list, element, maxSize = 100) => {
+ if (list.length >= maxSize) list.splice(-1, 1)
+ list.unshift(element)
+ return list
+}
+
+export default ({ node }) => {
+ const state = {
+ blockMetaInfo: { block_id: {} },
+ blockHeight: null, // we remember the height so we can requery the block, if querying failed
+ subscription: false,
+ syncing: true,
+ blockMetas: {},
+ subscribedRPC: null,
+ loading: false,
+ error: null,
+ peers: [],
+ blocks: [],
+ // one block, specified by height
+ block: {
+ block_meta: {}
+ }
+ }
+
+ const mutations = {
+ setLoading: (state, loading) => (state.loading = loading),
+ setError: (state, error) => (state.error = error),
+ setBlockHeight: (state, height) => (state.blockHeight = height),
+ setSyncing: (state, syncing) => (state.syncing = syncing),
+ setBlockMetas: (state, blockMetas) => (state.blockMetas = blockMetas),
+ setPeers: (state, peers) => (state.peers = peers),
+ setBlocks: (state, blocks) => (state.blocks = blocks),
+ setBlock: (state, block) => (state.block = block),
+ addBlock: (state, block) =>
+ Vue.set(state, `blocks`, cache(state.blocks, block)),
+ setSubscribedRPC: (state, subscribedRPC) =>
+ (state.subscribedRPC = subscribedRPC),
+ setSubscription: (state, subscription) =>
+ (state.subscription = subscription)
+ }
+
+ const actions = {
+ reconnected({ commit, dispatch }) {
+ //on a reconnect we assume, that the rpc connector changed, so we can safely resubscribe to blocks
+ commit(`setSubscription`, false)
+ dispatch(`subscribeToBlocks`)
+ },
+ async queryBlockInfo({ state, commit }, height) {
+ try {
+ let blockMetaInfo = state.blockMetas[height]
+ if (blockMetaInfo) {
+ return blockMetaInfo
+ }
+ commit(`setLoading`, true)
+ const block = await node.getBlock(height)
+
+ blockMetaInfo = block.block_metas ? block.block_metas[0] : undefined
+ commit(`setLoading`, false)
+
+ commit(`setBlockMetas`, {
+ ...state.blockMetas,
+ [height]: blockMetaInfo
+ })
+ commit(`setBlock`, block)
+ return blockMetaInfo
+ } catch (error) {
+ commit(`notifyError`, {
+ title: `Error fetching block information`,
+ body: error.message
+ })
+ Sentry.captureException(error)
+ commit(`setLoading`, false)
+ commit(`setError`, error)
+ return null
+ }
+ },
+ async subscribeToBlocks({ state, commit, dispatch }) {
+ // ensure we never subscribe twice
+ if (state.subscription) return false
+ if (state.subscribedRPC === node.rpc) return false
+ commit(`setSubscribedRPC`, node.rpc)
+
+ const status = await node.rpc.status()
+ commit(`setBlockHeight`, status.sync_info.latest_block_height)
+ if (status.sync_info.catching_up) {
+ // still syncing, let's try subscribing again in 30 seconds
+ commit(`setSyncing`, true)
+ commit(`setSubscription`, false)
+ setTimeout(() => dispatch(`subscribeToBlocks`), 30e3)
+ return false
+ }
+
+ commit(`setSyncing`, false)
+ // New RPC endpoint in sync, reset UI block list
+ commit(`setBlocks`, [])
+
+ // only subscribe if the node is not catching up anymore
+ node.rpc.subscribe({ query: `tm.event = 'NewBlock'` }, event => {
+ if (state.subscription === false) commit(`setSubscription`, true)
+ commit(`addBlock`, event.block)
+ event.block &&
+ event.block.header &&
+ commit(`setBlockHeight`, event.block.header.height)
+ })
+
+ return true
+ },
+ async getPeers({ state, commit }) {
+ if (!(state.connected && node.rpc)) return []
+
+ const {
+ result: { peers }
+ } = await node.rpc.net_info()
+ commit(`setPeers`, peers)
+ return peers
+ }
+ }
+
+ return {
+ state,
+ mutations,
+ actions
+ }
+}
diff --git a/app/src/renderer/vuex/modules/config.js b/app/src/renderer/vuex/modules/config.js
index 5297f9d78a..4cc08ee6a1 100644
--- a/app/src/renderer/vuex/modules/config.js
+++ b/app/src/renderer/vuex/modules/config.js
@@ -19,8 +19,7 @@ export default () => {
active: true,
state: `loading`
},
- noNodes: { active: false },
- nodeHalted: { active: false }
+ noNodes: { active: false }
}
}
const state = JSON.parse(JSON.stringify(emptyState))
@@ -57,9 +56,6 @@ export default () => {
setModalNoNodes(state, value) {
state.modals.noNodes.active = value
},
- setModalNodeHalted(state, value) {
- state.modals.nodeHalted.active = value
- },
setActiveMenu(state, value) {
state.activeMenu = value
},
diff --git a/app/src/renderer/vuex/modules/connection.js b/app/src/renderer/vuex/modules/connection.js
index c9e61191a3..b8e4e8cb7c 100644
--- a/app/src/renderer/vuex/modules/connection.js
+++ b/app/src/renderer/vuex/modules/connection.js
@@ -1,15 +1,13 @@
-import { ipcRenderer, remote } from "electron"
-import * as Sentry from "@sentry/browser"
import { sleep } from "scripts/common.js"
+import Vue from "vue"
+import config from "../../../config"
-const config = remote.getGlobal(`config`)
const NODE_HALTED_TIMEOUT = config.node_halted_timeout
export default function({ node }) {
// get tendermint RPC client from basecoin client
const state = {
- node: null,
stopConnecting: false,
connected: false,
lastHeader: {
@@ -17,21 +15,23 @@ export default function({ node }) {
chain_id: ``
},
approvalRequired: null,
- mocked: node.mocked
+ mocked: node.mocked,
+ nodeUrl: config.stargate,
+ externals: {
+ node,
+ config
+ }
}
const mutations = {
stopConnecting(state, stop) {
- state.stopConnecting = stop
+ Vue.set(state, `stopConnecting`, stop)
},
setConnected(state, connected) {
- state.connected = connected
- },
- setNode(state, node) {
- state.node = node
+ Vue.set(state, `connected`, connected)
},
setNodeApprovalRequired(state, hash) {
- state.approvalRequired = hash
+ Vue.set(state, `approvalRequired`, hash)
}
}
@@ -45,13 +45,26 @@ export default function({ node }) {
if (rootState.user.signedIn)
await dispatch(`maybeUpdateValidators`, header)
},
- async reconnect({ commit }) {
+ async connect({ state, commit, dispatch }) {
+ const { node, config } = state.externals
+
if (state.stopConnecting) return
commit(`setConnected`, false)
- node.rpcReconnect()
+ try {
+ await node.rpcConnect(config.rpc)
+ commit(`setConnected`, true)
+ dispatch(`rpcSubscribe`)
+ dispatch(`subscribeToBlocks`)
+ } catch (err) {
+ console.log(`Failed reconnect attempt`)
+ setTimeout(() => {
+ dispatch(`connect`)
+ }, 1000)
+ }
},
- async rpcSubscribe({ commit, dispatch }) {
+ async rpcSubscribe({ commit, dispatch, rootState }) {
+ const { node } = state.externals
if (state.stopConnecting) return
// the rpc socket can be closed before we can even attach a listener
@@ -59,23 +72,23 @@ export default function({ node }) {
// we handle the reconnection here so we can attach all these listeners on reconnect
if (!node.rpcInfo.connected) {
await sleep(500)
- dispatch(`reconnect`)
+ dispatch(`connect`)
return
}
commit(`setConnected`, true)
- commit(`setNode`, node)
// TODO: get event from light-client websocket instead of RPC connection (once that exists)
node.rpc.on(`error`, error => {
- if (error.message.indexOf(`disconnected`) !== -1) {
+ if (
+ error instanceof Event || // this is always a disconnect, strange that it is 2 different types
+ error.message.indexOf(`disconnected`) !== -1
+ ) {
commit(`setConnected`, false)
- dispatch(`reconnect`)
+ dispatch(`connect`)
}
})
- node.rpc.status((error, result) => {
- if (error) return console.error(error)
- let status = result
+ node.rpc.status().then(status => {
dispatch(`setLastHeader`, {
height: status.sync_info.latest_block_height,
chain_id: status.node_info.network
@@ -83,17 +96,16 @@ export default function({ node }) {
})
node.rpc.subscribe(
- { query: `tm.event = 'NewBlockHeader'` },
- (error, event) => {
- if (error) {
- Sentry.captureException(error)
- return console.error(`error subscribing to headers`, error)
- }
- dispatch(`setLastHeader`, event.data.value.header)
+ {
+ query: `tm.event = 'NewBlockHeader'`
+ },
+ ({ header }) => {
+ dispatch(`setLastHeader`, header)
}
)
-
- dispatch(`walletSubscribe`)
+ if (rootState.user.signedIn) {
+ dispatch(`walletSubscribe`)
+ }
dispatch(`checkNodeHalted`)
dispatch(`pollRPCConnection`)
},
@@ -107,44 +119,26 @@ export default function({ node }) {
}
}, nodeHaltedTimeout) // default 30s
},
- nodeHasHalted({ commit }) {
- console.log(`node has halted`)
- clearTimeout(state.nodeHaltedTimeout)
- state.nodeHaltedTimeout = undefined
- commit(`setModalNodeHalted`, true)
- },
- pollRPCConnection({ state, dispatch }, timeout = 3000) {
- if (state.nodeTimeout || state.stopConnecting) return
+ async pollRPCConnection(
+ { state, dispatch, commit },
+ timeout = config.block_timeout
+ ) {
+ const { node } = state.externals
+ if (state.stopConnecting) return
- state.nodeTimeout = setTimeout(() => {
- // clear timeout doesn't work
- if (state.nodeTimeout && !state.mocked) {
- state.connected = false
- state.nodeTimeout = null
- dispatch(`pollRPCConnection`)
- }
- }, timeout)
- node.rpc.status(error => {
- if (error) {
- Sentry.captureException(error)
- console.error(`Couldn't get status via RPC:`, error)
- return
- }
+ try {
+ // TODO: replace with ping when we implement ws connection ourselves
+ await node.rpc.health()
+ } catch (err) {
+ console.error(`Error pinging websocket. Assuming connection dropped.`)
+ commit(`setConnected`, false)
+ dispatch(`connect`)
+ return
+ }
- state.nodeTimeout = null
- state.connected = true
- setTimeout(() => {
- dispatch(`pollRPCConnection`)
- }, timeout)
- })
- },
- approveNodeHash({ state }, hash) {
- state.approvalRequired = null
- ipcRenderer.send(`hash-approved`, hash)
- },
- disapproveNodeHash({ state }, hash) {
- state.approvalRequired = null
- ipcRenderer.send(`hash-disapproved`, hash)
+ setTimeout(() => {
+ dispatch(`pollRPCConnection`)
+ }, timeout)
}
}
diff --git a/app/src/renderer/vuex/modules/delegates.js b/app/src/renderer/vuex/modules/delegates.js
index bc48ccaf48..d5346bd78a 100644
--- a/app/src/renderer/vuex/modules/delegates.js
+++ b/app/src/renderer/vuex/modules/delegates.js
@@ -59,9 +59,9 @@ export default ({ node }) => {
rootState.delegates = JSON.parse(JSON.stringify(emptyState))
},
async updateSigningInfo({ commit }, validators) {
- for (let validator of validators) {
+ for (const validator of validators) {
if (validator.consensus_pubkey) {
- let signing_info = await node.queryValidatorSigningInfo(
+ const signing_info = await node.queryValidatorSigningInfo(
validator.consensus_pubkey
)
if (!isEmpty(signing_info)) validator.signing_info = signing_info
@@ -76,12 +76,12 @@ export default ({ node }) => {
try {
let validators = await node.getCandidates()
- let { validators: validatorSet } = await node.getValidatorSet()
+ const { validators: validatorSet } = await node.getValidatorSet()
state.error = null
state.loading = false
state.loaded = true
- for (let validator of validators) {
+ for (const validator of validators) {
validator.isValidator = false
if (validatorSet.find(v => v.pub_key === validator.pub_key)) {
validator.isValidator = true
@@ -107,7 +107,6 @@ export default ({ node }) => {
body: error.message
})
Sentry.captureException(error)
- commit(`setDelegateLoading`, false)
state.error = error
return []
}
@@ -115,13 +114,13 @@ 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(
+ const hexAddr = b32.decode(validator.operator_address)
+ const operatorCosmosAddr = b32.encode(hexAddr, `cosmos`)
+ const delegation = await node.queryDelegation(
operatorCosmosAddr,
validator.operator_address
)
- let ratio = new BN(delegation.shares).div(
+ const ratio = new BN(delegation.shares).div(
ratToBigNumber(validator.delegator_shares)
)
diff --git a/app/src/renderer/vuex/modules/delegation.js b/app/src/renderer/vuex/modules/delegation.js
index c9655cd19d..4a2bf9b67d 100644
--- a/app/src/renderer/vuex/modules/delegation.js
+++ b/app/src/renderer/vuex/modules/delegation.js
@@ -3,7 +3,7 @@ import Vue from "vue"
import { calculateShares } from "scripts/common"
export default ({ node }) => {
- let emptyState = {
+ const emptyState = {
loading: false,
loaded: false,
error: null,
@@ -20,7 +20,7 @@ export default ({ node }) => {
const mutations = {
addToCart(state, delegate) {
// don't add to cart if already in cart
- for (let existingDelegate of state.delegates) {
+ for (const existingDelegate of state.delegates) {
if (delegate.id === existingDelegate.id) return
}
@@ -37,7 +37,6 @@ export default ({ node }) => {
Vue.set(state.committedDelegates, candidateId, value)
if (value === 0) {
delete state.committedDelegates[candidateId]
- Vue.set(state, `committedDelegates`, state.committedDelegates)
}
},
setUnbondingDelegations(state, unbondingDelegations) {
@@ -57,9 +56,9 @@ export default ({ node }) => {
: {}
}
}
- let actions = {
- reconnected({ state, dispatch }) {
- if (state.loading) {
+ const actions = {
+ reconnected({ state, dispatch, rootState }) {
+ if (state.loading && rootState.user.signedIn) {
dispatch(`getBondedDelegates`)
}
},
@@ -75,14 +74,14 @@ export default ({ node }) => {
if (!rootState.connection.connected) return
- let address = rootState.user.address
+ const address = rootState.user.address
candidates = candidates || (await dispatch(`getDelegates`))
try {
- let delegations = await node.getDelegations(address)
- let unbondingDelegations = await node.getUndelegations(address)
- let redelegations = await node.getRedelegations(address)
- let delegator = {
+ const delegations = await node.getDelegations(address)
+ const unbondingDelegations = await node.getUndelegations(address)
+ const redelegations = await node.getRedelegations(address)
+ const delegator = {
delegations,
unbondingDelegations,
redelegations
@@ -137,17 +136,18 @@ export default ({ node }) => {
state.loading = false
},
async updateDelegates({ dispatch }) {
- let candidates = await dispatch(`getDelegates`)
+ const candidates = await dispatch(`getDelegates`)
return dispatch(`getBondedDelegates`, candidates)
},
async submitDelegation(
{
- rootState: { stakingParameters, user, wallet },
+ rootState: { stakingParameters, wallet },
+ getters: { liquidAtoms },
state,
dispatch,
commit
},
- { validator_addr, amount, password }
+ { validator_addr, amount, password, submitType }
) {
const denom = stakingParameters.parameters.bond_denom
const delegation = {
@@ -159,26 +159,32 @@ export default ({ node }) => {
type: `postDelegation`,
to: wallet.address, // TODO strange syntax
password,
+ submitType,
delegator_addr: wallet.address,
validator_addr,
delegation
})
// optimistic update the atoms of the user before we get the new values from chain
- commit(`setAtoms`, user.atoms - amount)
+ commit(`updateWalletBalance`, {
+ denom,
+ amount: Number(liquidAtoms) - Number(amount)
+ })
// optimistically update the committed delegations
- Vue.set(
- state.committedDelegates,
- validator_addr,
- state.committedDelegates[validator_addr] + amount
- )
+ commit(`setCommittedDelegation`, {
+ candidateId: validator_addr,
+ value: state.committedDelegates[validator_addr] + Number(amount)
+ })
+
+ // load delegates after delegation to get new atom distribution on validators
+ dispatch(`updateDelegates`)
},
async submitUnbondingDelegation(
{
rootState: { wallet },
dispatch
},
- { validator, amount, password }
+ { validator, amount, password, submitType }
) {
// TODO: change to 10 when available https://github.com/cosmos/cosmos-sdk/issues/2317
const shares = String(
@@ -190,7 +196,8 @@ export default ({ node }) => {
delegator_addr: wallet.address,
validator_addr: validator.operator_address,
shares,
- password
+ password,
+ submitType
})
},
async submitRedelegation(
@@ -198,7 +205,7 @@ export default ({ node }) => {
rootState: { wallet },
dispatch
},
- { validatorSrc, validatorDst, amount, password }
+ { validatorSrc, validatorDst, amount, password, submitType }
) {
const shares = String(
Math.abs(calculateShares(validatorSrc, amount)).toFixed(10)
@@ -211,7 +218,8 @@ export default ({ node }) => {
validator_src_addr: validatorSrc.operator_address,
validator_dst_addr: validatorDst.operator_address,
shares,
- password
+ password,
+ submitType
})
}
}
diff --git a/app/src/renderer/vuex/modules/governance/deposits.js b/app/src/renderer/vuex/modules/governance/deposits.js
index 3ea3a2e148..0cf9409a58 100644
--- a/app/src/renderer/vuex/modules/governance/deposits.js
+++ b/app/src/renderer/vuex/modules/governance/deposits.js
@@ -14,14 +14,14 @@ export default ({ node }) => {
Vue.set(state.deposits, proposalId, deposits)
}
}
- let actions = {
+ const actions = {
async getProposalDeposits({ state, commit, rootState }, proposalId) {
state.loading = true
if (!rootState.connection.connected) return
try {
- let deposits = await node.queryProposalDeposits(proposalId)
+ const deposits = await node.queryProposalDeposits(proposalId)
state.error = null
state.loading = false
state.loaded = true
@@ -40,7 +40,7 @@ export default ({ node }) => {
rootState: { wallet },
dispatch
},
- { proposal_id, amount, password }
+ { proposal_id, amount, password, submitType }
) {
await dispatch(`sendTx`, {
type: `submitProposalDeposit`,
@@ -48,7 +48,8 @@ export default ({ node }) => {
proposal_id,
depositor: wallet.address,
amount,
- password
+ password,
+ submitType
})
await dispatch(`getProposalDeposits`, proposal_id)
await dispatch(`getProposal`, proposal_id)
diff --git a/app/src/renderer/vuex/modules/governance/parameters.js b/app/src/renderer/vuex/modules/governance/parameters.js
index 2d08a48c56..77be2b7e02 100644
--- a/app/src/renderer/vuex/modules/governance/parameters.js
+++ b/app/src/renderer/vuex/modules/governance/parameters.js
@@ -26,9 +26,9 @@ export default ({ node }) => {
if (!rootState.connection.connected) return
try {
- let deposit = await node.getGovDepositParameters()
- let tallying = await node.getGovTallyingParameters()
- let voting = await node.getGovVotingParameters()
+ const deposit = await node.getGovDepositParameters()
+ const tallying = await node.getGovTallyingParameters()
+ const voting = await node.getGovVotingParameters()
state.error = null
state.loading = false
state.loaded = true
diff --git a/app/src/renderer/vuex/modules/governance/proposals.js b/app/src/renderer/vuex/modules/governance/proposals.js
index 9eb5c741fa..8fd12e4050 100644
--- a/app/src/renderer/vuex/modules/governance/proposals.js
+++ b/app/src/renderer/vuex/modules/governance/proposals.js
@@ -2,7 +2,7 @@ import * as Sentry from "@sentry/browser"
import Vue from "vue"
export default ({ node }) => {
- let emptyState = {
+ const emptyState = {
loading: false,
loaded: false,
error: null,
@@ -14,11 +14,11 @@ export default ({ node }) => {
setProposal(state, proposal) {
Vue.set(state.proposals, proposal.proposal_id, proposal)
},
- setProposalTally(state, { proposal_id, tally_result }) {
- Vue.set(state.tallies, proposal_id, tally_result)
+ setProposalTally(state, { proposal_id, final_tally_result }) {
+ Vue.set(state.tallies, proposal_id, final_tally_result)
}
}
- let actions = {
+ const actions = {
async reconnected({ state, dispatch }) {
if (state.loading) {
await dispatch(`getProposals`)
@@ -33,24 +33,24 @@ export default ({ node }) => {
if (!rootState.connection.connected) return
try {
- let tally_result
- let proposals = await node.queryProposals()
+ let final_tally_result
+ const proposals = await node.queryProposals()
if (proposals.length > 0) {
await Promise.all(
proposals.map(async proposal => {
commit(`setProposal`, proposal.value)
if (proposal.value.proposal_status === `VotingPeriod`) {
- tally_result = await node.getProposalTally(
+ final_tally_result = await node.getProposalTally(
proposal.value.proposal_id
)
} else {
- tally_result = JSON.parse(
- JSON.stringify(proposal.value.tally_result)
+ final_tally_result = JSON.parse(
+ JSON.stringify(proposal.value.final_tally_result)
)
}
commit(`setProposalTally`, {
proposal_id: proposal.value.proposal_id,
- tally_result
+ final_tally_result
})
})
)
@@ -70,18 +70,22 @@ export default ({ node }) => {
async getProposal({ state, commit }, proposal_id) {
state.loading = true
try {
- let tally_result
+ let final_tally_result
state.error = null
state.loading = false
state.loaded = true // TODO make state for single proposal
- let proposal = await node.queryProposal(proposal_id)
+ const proposal = await node.queryProposal(proposal_id)
commit(`setProposal`, proposal.value)
if (proposal.value.proposal_status === `VotingPeriod`) {
- tally_result = await node.getProposalTally(proposal.value.proposal_id)
+ final_tally_result = await node.getProposalTally(
+ proposal.value.proposal_id
+ )
} else {
- tally_result = JSON.parse(JSON.stringify(proposal.value.tally_result))
+ final_tally_result = JSON.parse(
+ JSON.stringify(proposal.value.final_tally_result)
+ )
}
- commit(`setProposalTally`, { proposal_id, tally_result })
+ commit(`setProposalTally`, { proposal_id, final_tally_result })
} catch (error) {
commit(`notifyError`, {
title: `Error querying proposal with id #${proposal_id}`,
@@ -96,7 +100,7 @@ export default ({ node }) => {
rootState: { wallet },
dispatch
},
- { title, description, type, initial_deposit, password }
+ { title, description, type, initial_deposit, password, submitType }
) {
await dispatch(`sendTx`, {
type: `submitProposal`,
@@ -105,7 +109,8 @@ export default ({ node }) => {
title,
description,
initial_deposit,
- password
+ password,
+ submitType
})
await dispatch(`getProposals`)
}
diff --git a/app/src/renderer/vuex/modules/governance/votes.js b/app/src/renderer/vuex/modules/governance/votes.js
index 61a8e12b68..05bbace305 100644
--- a/app/src/renderer/vuex/modules/governance/votes.js
+++ b/app/src/renderer/vuex/modules/governance/votes.js
@@ -14,14 +14,14 @@ export default ({ node }) => {
Vue.set(state.votes, proposalId, votes)
}
}
- let actions = {
+ const actions = {
async getProposalVotes({ state, commit, rootState }, proposalId) {
state.loading = true
if (!rootState.connection.connected) return
try {
- let votes = await node.queryProposalVotes(proposalId)
+ const votes = await node.queryProposalVotes(proposalId)
commit(`setProposalVotes`, { proposalId, votes })
state.error = null
state.loading = false
@@ -37,7 +37,7 @@ export default ({ node }) => {
},
async submitVote(
{ rootState, dispatch },
- { proposal_id, option, password }
+ { proposal_id, option, password, submitType }
) {
await dispatch(`sendTx`, {
to: proposal_id,
@@ -45,7 +45,8 @@ export default ({ node }) => {
proposal_id,
voter: rootState.wallet.address,
option,
- password
+ password,
+ submitType
})
await dispatch(`getProposalVotes`, proposal_id)
await dispatch(`getProposal`, proposal_id)
diff --git a/app/src/renderer/vuex/modules/index.js b/app/src/renderer/vuex/modules/index.js
index eeb8d8523b..1d616f6970 100644
--- a/app/src/renderer/vuex/modules/index.js
+++ b/app/src/renderer/vuex/modules/index.js
@@ -1,7 +1,7 @@
"use strict"
export default opts => ({
- blockchain: require(`./blockchain.js`).default(opts),
+ blocks: require(`./blocks.js`).default(opts),
transactions: require(`./transactions.js`).default(opts),
config: require(`./config.js`).default(opts),
delegates: require(`./delegates.js`).default(opts),
@@ -15,9 +15,9 @@ export default opts => ({
deposits: require(`./governance/deposits.js`).default(opts),
governanceParameters: require(`./governance/parameters.js`).default(opts),
send: require(`./send.js`).default(opts),
- themes: require(`./themes.js`).default(opts),
user: require(`./user.js`).default(opts),
validators: require(`./validators.js`).default(opts),
+ ledger: require(`./ledger.js`).default(opts),
wallet: require(`./wallet.js`).default(opts),
keybase: require(`./keybase.js`).default(opts),
stakingParameters: require(`./parameters.js`).default(opts),
diff --git a/app/src/renderer/vuex/modules/keybase.js b/app/src/renderer/vuex/modules/keybase.js
index 3e3df26b84..7b9a58f95f 100644
--- a/app/src/renderer/vuex/modules/keybase.js
+++ b/app/src/renderer/vuex/modules/keybase.js
@@ -23,11 +23,11 @@ export default ({}) => {
if (!/.{16}/.test(keybaseId)) return // the keybase id is not correct
if (state.identities[keybaseId]) return // we already have this identity
- let urlPrefix = `https://keybase.io/_/api/1.0/user/lookup.json?key_suffix=`
- let fullUrl = urlPrefix + keybaseId
- let json = await axios.get(fullUrl)
+ const urlPrefix = `https://keybase.io/_/api/1.0/user/lookup.json?key_suffix=`
+ const fullUrl = urlPrefix + keybaseId
+ const json = await axios.get(fullUrl)
if (json.data.status.name === `OK`) {
- let user = json.data.them[0]
+ const user = json.data.them[0]
if (user && user.pictures && user.pictures.primary) {
return {
keybaseId,
diff --git a/app/src/renderer/vuex/modules/ledger.js b/app/src/renderer/vuex/modules/ledger.js
new file mode 100644
index 0000000000..7affb88148
--- /dev/null
+++ b/app/src/renderer/vuex/modules/ledger.js
@@ -0,0 +1,139 @@
+import * as Sentry from "@sentry/browser"
+import { App, comm_u2f } from "ledger-cosmos-js"
+import { createCosmosAddress } from "../../scripts/wallet.js"
+
+// TODO: discuss TIMEOUT value
+const TIMEOUT = 50 // seconds to wait for user action on Ledger
+
+/*
+HD wallet derivation path (BIP44)
+DerivationPath{44, 118, account, 0, index}
+*/
+const HDPATH = [44, 118, 0, 0, 0]
+
+export default () => {
+ const emptyState = {
+ error: null,
+ cosmosApp: null,
+ isConnected: false,
+ pubKey: null, // 33 bytes; used for broadcasting signed txs and getting the address
+ cosmosAppVersion: null
+ }
+ const state = {
+ ...emptyState,
+ externals: { createCosmosAddress, App, comm_u2f } // for testing
+ }
+ const mutations = {
+ setCosmosApp(state, app) {
+ state.cosmosApp = app
+ },
+ setCosmosAppVersion(state, version) {
+ state.cosmosAppVersion = version
+ },
+ setLedgerPubKey(state, pubKey) {
+ state.pubKey = pubKey
+ },
+ setLedgerConnection(state, isConnected) {
+ state.isConnected = isConnected
+ },
+ setLedgerError(state, error) {
+ state.error = error
+ }
+ }
+
+ const actions = {
+ resetSessionData({ rootState }) {
+ rootState.ledger = {
+ ...JSON.parse(JSON.stringify(emptyState)),
+ externals: state.externals
+ }
+ },
+ /* TODO: Create a function to detect ledger is connected (i.e unlocked with
+ password and on Home app) */
+ async connectLedgerApp({ commit, dispatch, state }) {
+ let success = false
+ try {
+ const communicationMethod = await state.externals.comm_u2f.create_async(
+ TIMEOUT,
+ true
+ )
+ const cosmosLedgerApp = new state.externals.App(communicationMethod)
+ commit(`setCosmosApp`, cosmosLedgerApp)
+ await dispatch(`getLedgerCosmosVersion`)
+ commit(`setLedgerConnection`, true)
+ await dispatch(`getLedgerPubKey`)
+ const address = state.externals.createCosmosAddress(state.pubKey)
+ await dispatch(`signIn`, { sessionType: `ledger`, address })
+ success = true
+ } catch (error) {
+ commit(`notifyError`, {
+ title: `Error connecting to Ledger Nano S`,
+ body: error
+ })
+ Sentry.captureException(error)
+ commit(`setLedgerError`, error)
+ } finally {
+ return success
+ }
+ },
+ async getLedgerCosmosVersion({ commit, state }) {
+ let response
+ try {
+ response = await state.cosmosApp.get_version()
+ actions.checkLedgerErrors(response)
+ const { major, minor, patch, test_mode } = response
+ const version = { major, minor, patch, test_mode }
+ commit(`setCosmosAppVersion`, version)
+ } catch (error) {
+ commit(`notifyError`, {
+ title: `Error retrieving Cosmos Ledger app version`,
+ body: error
+ })
+ Sentry.captureException(error)
+ commit(`setLedgerError`, error)
+ }
+ },
+ async getLedgerPubKey({ commit, state }) {
+ let response
+ try {
+ response = await state.cosmosApp.publicKey(HDPATH)
+ actions.checkLedgerErrors(response)
+ commit(`setLedgerPubKey`, response.compressed_pk)
+ } catch (error) {
+ commit(`notifyError`, {
+ title: `Error getting public key from Ledger`,
+ body: error
+ })
+ Sentry.captureException(error)
+ commit(`setLedgerError`, error)
+ }
+ },
+ async signWithLedger({ commit, state }, message) {
+ let signature
+ try {
+ const response = await state.cosmosApp.sign(HDPATH, message)
+ signature = response.signature
+ actions.checkLedgerErrors(response)
+ } catch (error) {
+ commit(`notifyError`, {
+ title: `Signing transaction with Ledger failed`,
+ body: error
+ })
+ Sentry.captureException(error)
+ commit(`setLedgerError`, error)
+ } finally {
+ return signature
+ }
+ },
+ checkLedgerErrors(response) {
+ if (response && response.error_message !== `No errors`) {
+ throw new Error(response.error_message)
+ }
+ }
+ }
+ return {
+ state,
+ mutations,
+ actions
+ }
+}
diff --git a/app/src/renderer/vuex/modules/notifications.js b/app/src/renderer/vuex/modules/notifications.js
index 1b8e30b4d7..c00d82a011 100644
--- a/app/src/renderer/vuex/modules/notifications.js
+++ b/app/src/renderer/vuex/modules/notifications.js
@@ -40,20 +40,20 @@ export default () => {
state.push(Object.assign({}, note, { key: key++ }))
},
notify(state, data) {
- let note = data
+ const note = data
note.icon = `check_circle`
note.time = Date.now()
mutations.addNotification(state, note)
},
notifyWarn(state, data) {
- let note = data
+ const note = data
note.icon = `warning`
note.time = Date.now()
note.type = `warning`
mutations.addNotification(state, note)
},
notifyError(state, data) {
- let note = data
+ const note = data
note.icon = `error`
note.time = Date.now()
note.layout = `alert`
@@ -61,22 +61,22 @@ export default () => {
mutations.addNotification(state, note)
},
notifySignUp(state) {
- let note = JSON.parse(JSON.stringify(noteSignUp))
+ const note = JSON.parse(JSON.stringify(noteSignUp))
note.time = Date.now()
mutations.addNotification(state, note)
},
notifySignIn(state) {
- let note = JSON.parse(JSON.stringify(noteSignIn))
+ const note = JSON.parse(JSON.stringify(noteSignIn))
note.time = Date.now()
mutations.addNotification(state, note)
},
notifySignOut(state) {
- let note = JSON.parse(JSON.stringify(noteSignOut))
+ const note = JSON.parse(JSON.stringify(noteSignOut))
note.time = Date.now()
mutations.addNotification(state, note)
},
notifyAuthRequired(state, body) {
- let note = JSON.parse(JSON.stringify(noteAuthRequired))
+ const note = JSON.parse(JSON.stringify(noteAuthRequired))
note.time = Date.now()
if (body) note.body = body
mutations.addNotification(state, note)
diff --git a/app/src/renderer/vuex/modules/parameters.js b/app/src/renderer/vuex/modules/parameters.js
index 0f904bd6b3..f3b9c8a679 100644
--- a/app/src/renderer/vuex/modules/parameters.js
+++ b/app/src/renderer/vuex/modules/parameters.js
@@ -22,7 +22,7 @@ export default ({ node }) => {
if (!rootState.connection.connected) return
try {
- let parameters = await node.getStakingParameters()
+ const parameters = await node.getStakingParameters()
commit(`setStakingParameters`, parameters)
state.error = null
state.loading = false
diff --git a/app/src/renderer/vuex/modules/pool.js b/app/src/renderer/vuex/modules/pool.js
index e3a8880997..fe2c8846ff 100644
--- a/app/src/renderer/vuex/modules/pool.js
+++ b/app/src/renderer/vuex/modules/pool.js
@@ -27,7 +27,7 @@ export default ({ node }) => {
if (!rootState.connection.connected) return
try {
- let pool = await node.getPool()
+ const pool = await node.getPool()
commit(`setPool`, pool)
state.error = null
state.loading = false
diff --git a/app/src/renderer/vuex/modules/send.js b/app/src/renderer/vuex/modules/send.js
index 806aea7a6b..da4258079e 100644
--- a/app/src/renderer/vuex/modules/send.js
+++ b/app/src/renderer/vuex/modules/send.js
@@ -1,8 +1,28 @@
-export default ({ node }) => {
- let lock = null
+import {
+ sign,
+ createBroadcastBody,
+ createSignMessage,
+ createSignedTx,
+ createSignature
+} from "../../scripts/wallet.js"
+import { getKey } from "../../scripts/keystore"
+import config from "../../../config"
+import { signatureImport } from "secp256k1"
- let state = {
- nonce: `0`
+export default ({ node }) => {
+ const state = {
+ lock: null,
+ nonce: `0`,
+ externals: {
+ config,
+ sign,
+ createBroadcastBody,
+ createSignMessage,
+ createSignedTx,
+ createSignature,
+ getKey,
+ signatureImport
+ }
}
const mutations = {
@@ -13,86 +33,109 @@ export default ({ node }) => {
}
}
- async function doSend({ state, dispatch, commit, rootState }, args) {
- if (!rootState.connection.connected) {
- throw Error(
- `Currently not connected to a secure node. Please try again when Voyager has secured a connection.`
- )
- }
-
- await dispatch(`queryWalletBalances`) // the nonce was getting out of sync, this is to force a sync
- let requestMetaData = {
- sequence: state.nonce,
- name: rootState.user.account,
- password: args.password,
- account_number: rootState.wallet.accountNumber, // TODO move into LCD?
- chain_id: rootState.connection.lastHeader.chain_id,
- gas: `500000`
- }
- args.base_req = requestMetaData
-
- // extract type
- let type = args.type || `send`
- delete args.type
-
- // extract "to" address
- let to = args.to
- delete args.to
-
- // submit to LCD to build, sign, and broadcast
- let req = to ? node[type](to, args) : node[type](args)
-
- let res = await req.catch(err => {
- let message
- // TODO: get rid of this logic once the appended message is actually included inside the object message
- if (!err.response.data.message) {
- let idxColon = err.response.data.indexOf(`:`)
- let indexOpenBracket = err.response.data.indexOf(`{`)
- if (idxColon < indexOpenBracket) {
- // e.g => Msg 0 failed: {"codespace":4,"code":102,"abci_code":262246,"message":"existing unbonding delegation found"}
- message = JSON.parse(err.response.data.substr(idxColon + 1)).message
- } else {
- message = err.response.data
- }
- } else {
- message = err.response.data.message
- }
- throw new Error(message)
- })
-
- // check response code
- assertOk(res)
-
- commit(`setNonce`, (parseInt(state.nonce) + 1).toString())
- }
-
- let actions = {
+ const actions = {
// `lock` is a Promise which is set if we are in the process
// of sending a transaction, so that we can ensure only one send
// happens at once. otherwise, we might try to send 2 transactions
// using the same sequence number, which means 1 of them won't be valid.
- async sendTx(...args) {
+ async queueTx({ dispatch, state }, args) {
// wait to acquire lock
- while (lock != null) {
+ while (state.lock != null) {
// eslint-disable-line no-unmodified-loop-condition
- await lock
+ await state.lock
}
try {
- // send and unlock when done
- lock = doSend(...args)
- // wait for doSend to finish
- let res = await lock
+ // send tx and store lock to prevent other txs to be send meanwhile
+ state.lock = dispatch(`sendTx`, args)
+
+ // wait for sendTx to finish
+ const res = await state.lock
return res
} catch (error) {
throw error
} finally {
// get rid of lock whether doSend throws or succeeds
- lock = null
+ state.lock = null
}
},
resetSessionData({ state }) {
state.nonce = `0`
+ },
+ async sendTx({ state, dispatch, commit, rootState }, args) {
+ if (!rootState.connection.connected) {
+ throw Error(
+ `Currently not connected to a secure node. Please try again when Voyager has secured a connection.`
+ )
+ }
+
+ await dispatch(`queryWalletBalances`) // the nonce was getting out of sync, this is to force a sync
+
+ const requestMetaData = {
+ sequence: state.nonce,
+ from: rootState.wallet.address,
+ account_number: rootState.wallet.accountNumber,
+ chain_id: rootState.connection.lastHeader.chain_id,
+ gas: String(state.externals.config.default_gas),
+ generate_only: true
+ }
+ args.base_req = requestMetaData
+
+ // extract type
+ const type = args.type || `send`
+ delete args.type
+
+ // get signing method: localkeystore or ledger
+ const submitType = args.submitType || `local`
+ delete args.submitType
+
+ // extract "to" address
+ const to = args.to
+ delete args.to
+
+ // get the generated tx by querying it from the backend
+ const req = to ? node[type](to, args) : node[type](args)
+ const generationRes = await req.catch(handleSDKError)
+ const tx = generationRes.value
+
+ let signature
+ if (rootState.ledger.isConnected && submitType === `ledger`) {
+ // TODO: move to wallet script
+ const signMessage = state.externals.createSignMessage(
+ tx,
+ requestMetaData
+ )
+ const signatureByteArray = await dispatch(`signWithLedger`, signMessage)
+ // we have to parse the signature from Ledger as it's in DER format
+ const signatureBuffer = state.externals.signatureImport(
+ signatureByteArray
+ )
+ /*
+ NOTE: message is not hashed since Ledger needs to display it on screen
+ and then internally hashes the json before signing it
+ */
+ signature = state.externals.createSignature(
+ signatureBuffer,
+ requestMetaData.sequence,
+ requestMetaData.account_number,
+ rootState.ledger.pubKey
+ )
+ } else {
+ // get private key to sign
+ const wallet = state.externals.getKey(
+ rootState.user.account,
+ args.password
+ )
+ signature = state.externals.sign(tx, wallet, requestMetaData)
+ }
+ // TODO: signer app
+ // broadcast transaction
+ const signedTx = state.externals.createSignedTx(tx, signature)
+ const body = state.externals.createBroadcastBody(signedTx)
+ const res = await node.postTx(body).catch(handleSDKError)
+ // check response code
+ assertOk(res)
+ commit(`setNonce`, String(parseInt(state.nonce) + 1))
}
}
@@ -111,7 +154,25 @@ function assertOk(res) {
}
if (res.check_tx.code || res.deliver_tx.code) {
- let message = res.check_tx.log || res.deliver_tx.log
+ const message = res.check_tx.log || res.deliver_tx.log
throw new Error(message)
}
}
+
+function handleSDKError(err) {
+ let message
+ // TODO: get rid of this logic once the appended message is actually included inside the object message
+ if (!err.message) {
+ const idxColon = err.indexOf(`:`)
+ const indexOpenBracket = err.indexOf(`{`)
+ if (idxColon < indexOpenBracket) {
+ // e.g => Msg 0 failed: {"codespace":4,"code":102,"abci_code":262246,"message":"existing unbonding delegation found"}
+ message = JSON.parse(err.substr(idxColon + 1)).message
+ } else {
+ message = err
+ }
+ } else {
+ message = err.message
+ }
+ throw new Error(message)
+}
diff --git a/app/src/renderer/vuex/modules/themes.js b/app/src/renderer/vuex/modules/themes.js
deleted file mode 100644
index 4eb21ba89b..0000000000
--- a/app/src/renderer/vuex/modules/themes.js
+++ /dev/null
@@ -1,42 +0,0 @@
-"use strict"
-
-import dark from "../json/theme-dark.json"
-
-export default () => {
- const state = {
- active: `dark`,
- options: {
- dark: dark
- }
- }
- const mutations = {
- setTheme(state, theme) {
- state.active = theme
- localStorage.setItem(`appTheme`, theme)
- mutations.updateTheme(state, theme)
- },
- updateTheme(state, theme) {
- const newTheme = state.options[theme]
- const isWin = navigator.platform.toUpperCase().indexOf(`WIN`) >= 0
- if (isWin) {
- document.documentElement.style.setProperty(`--font-weight`, 400)
- }
- for (let key in newTheme) {
- document.documentElement.style.setProperty(`--${key}`, newTheme[key])
- }
- }
- }
-
- const actions = {
- loadTheme({ commit }) {
- const theme = localStorage.getItem(`appTheme`)
- commit(`setTheme`, theme)
- }
- }
-
- return {
- state,
- mutations,
- actions
- }
-}
diff --git a/app/src/renderer/vuex/modules/transactions.js b/app/src/renderer/vuex/modules/transactions.js
index d54c686758..62466aa0ef 100644
--- a/app/src/renderer/vuex/modules/transactions.js
+++ b/app/src/renderer/vuex/modules/transactions.js
@@ -1,9 +1,8 @@
-import fp from "lodash/fp"
import { uniqBy } from "lodash"
import * as Sentry from "@sentry/browser"
import Vue from "vue"
export default ({ node }) => {
- let emptyState = {
+ const emptyState = {
loading: false,
loaded: false,
error: null,
@@ -11,23 +10,23 @@ export default ({ node }) => {
staking: [],
governance: []
}
- let state = JSON.parse(JSON.stringify(emptyState))
+ const state = JSON.parse(JSON.stringify(emptyState))
// properties under which txs of different categories are stored
const txCategories = [`staking`, `wallet`, `governance`]
- let mutations = {
+ const mutations = {
setWalletTxs(state, txs) {
- state.wallet = txs
+ Vue.set(state, `wallet`, txs)
},
setStakingTxs(state, txs) {
- state.staking = txs
+ Vue.set(state, `staking`, txs)
},
setGovernanceTxs(state, txs) {
- state.governance = txs
+ Vue.set(state, `governance`, txs)
},
setHistoryLoading(state, loading) {
- state.loading = loading
+ Vue.set(state, `loading`, loading)
},
setTransactionTime(state, { blockHeight, blockMetaInfo }) {
txCategories.forEach(category => {
@@ -41,19 +40,20 @@ export default ({ node }) => {
}
}
- let actions = {
+ const actions = {
resetSessionData({ rootState }) {
// clear previous account state
rootState.transactions = JSON.parse(JSON.stringify(emptyState))
},
- async reconnected({ dispatch }) {
- if (state.loading) {
+ async reconnected({ state, dispatch, rootState }) {
+ // TODO: remove signedIn check when we support the option for setting a custom address for txs page
+ if (state.loading && rootState.user.signedIn) {
await dispatch(`getAllTxs`)
}
},
async getAllTxs({ commit, dispatch, state, rootState }) {
try {
- state.loading = true
+ commit(`setHistoryLoading`, true)
if (!rootState.connection.connected) return
@@ -71,7 +71,7 @@ export default ({ node }) => {
transactions: allTxs
})
state.error = null
- state.loading = false
+ commit(`setHistoryLoading`, false)
state.loaded = true
} catch (error) {
commit(`notifyError`, {
@@ -104,7 +104,7 @@ export default ({ node }) => {
default:
throw new Error(`Unknown transaction type`)
}
- const transactionsPlusType = response.map(fp.set(`type`, type))
+ const transactionsPlusType = response.map(t => ({ ...t, type }))
return response ? uniqBy(transactionsPlusType, `hash`) : []
},
async enrichTransactions({ dispatch }, { transactions }) {
@@ -118,7 +118,7 @@ export default ({ node }) => {
)
},
async queryTransactionTime({ commit, dispatch }, { blockHeight }) {
- let blockMetaInfo = await dispatch(`queryBlockInfo`, blockHeight)
+ const blockMetaInfo = await dispatch(`queryBlockInfo`, blockHeight)
commit(`setTransactionTime`, {
blockHeight,
blockMetaInfo
diff --git a/app/src/renderer/vuex/modules/user.js b/app/src/renderer/vuex/modules/user.js
index e0f1a9c23d..a9e291b45e 100644
--- a/app/src/renderer/vuex/modules/user.js
+++ b/app/src/renderer/vuex/modules/user.js
@@ -1,12 +1,17 @@
import * as Sentry from "@sentry/browser"
-import { ipcRenderer, remote } from "electron"
-import enableGoogleAnalytics from "../../google-analytics.js"
-const config = remote.getGlobal(`config`)
+import {
+ enableGoogleAnalytics,
+ disableGoogleAnalytics,
+ track
+} from "../../google-analytics.js"
+import config from "../../../config"
+import { loadKeys, importKey, testPassword } from "../../scripts/keystore.js"
+import { generateSeed } from "../../scripts/wallet.js"
-export default ({ node }) => {
+export default ({}) => {
const ERROR_COLLECTION_KEY = `voyager_error_collection`
- let state = {
+ const state = {
atoms: 0,
signedIn: false,
accounts: [],
@@ -16,22 +21,40 @@ export default ({ node }) => {
address: null,
errorCollection: false,
stateLoaded: false, // shows if the persisted state is already loaded. used to prevent overwriting the persisted state before it is loaded
- error: null
+ error: null,
+
+ // import into state to be able to test easier
+ externals: {
+ config,
+ loadKeys,
+ importKey,
+ testPassword,
+ generateSeed,
+ enableGoogleAnalytics,
+ disableGoogleAnalytics,
+ track,
+ Sentry
+ }
}
const mutations = {
+ setSignIn(state, hasSignedIn) {
+ state.signedIn = hasSignedIn
+ },
setAccounts(state, accounts) {
state.accounts = accounts
},
+ setUserAddress(state, address) {
+ state.address = address
+ },
setAtoms(state, atoms) {
state.atoms = atoms
},
addHistory(state, path) {
state.history.push(path)
- window.analytics &&
- window.analytics.send(`pageview`, {
- dl: path
- })
+ state.externals.track(`pageview`, {
+ dl: path
+ })
},
popHistory(state) {
state.history.pop()
@@ -46,26 +69,19 @@ export default ({ node }) => {
// reload available accounts as the reconnect could be a result of a switch from a mocked connection with mocked accounts
await dispatch(`loadAccounts`)
},
- async showInitialScreen({ dispatch, commit }) {
+ async showInitialScreen({ state, dispatch, commit }) {
dispatch(`resetSessionData`)
-
await dispatch(`loadAccounts`)
- let exists = state.accounts.length > 0
- let screen = exists ? `sign-in` : `welcome`
- commit(`setModalSessionState`, screen)
-
- window.analytics &&
- window.analytics.send(`pageview`, {
- dl: `/session/` + screen
- })
+ commit(`setModalSessionState`, `welcome`)
+ state.externals.track(`pageview`, { dl: `/` })
},
async loadAccounts({ commit, state }) {
state.loading = true
try {
- let keys = await node.keys.values()
+ const keys = await state.externals.loadKeys()
commit(`setAccounts`, keys)
} catch (error) {
- Sentry.captureException(error)
+ state.externals.Sentry.captureException(error)
commit(`notifyError`, {
title: `Couldn't read keys`,
body: error.message
@@ -75,98 +91,105 @@ export default ({ node }) => {
state.loading = false
}
},
- async testLogin(state, { password, account }) {
- try {
- return await node.keys.set(account, {
- name: account,
- new_password: password,
- old_password: password
- })
- } catch (error) {
- throw Error(`Incorrect passphrase`)
- }
+ async testLogin({}, { password, account }) {
+ return await testPassword(account, password)
},
createSeed() {
- // generate seed phrase
- return node.keys.seed()
+ return state.externals.generateSeed()
},
async createKey({ dispatch }, { seedPhrase, password, name }) {
- let { address } = await node.keys.add({
+ const { cosmosAddress } = await state.externals.importKey(
name,
password,
- seed: seedPhrase
- })
- dispatch(`initializeWallet`, address)
- return address
- },
- async deleteKey(ignore, { password, name }) {
- await node.keys.delete(name, { name, password })
- return true
+ seedPhrase
+ )
+ await dispatch(`initializeWallet`, { address: cosmosAddress })
+ return cosmosAddress
},
- async signIn({ state, commit, dispatch }, { account }) {
- state.account = account
- state.signedIn = true
-
- let { address } = await node.keys.get(account)
- state.address = address
-
+ async signIn(
+ { state, commit, dispatch },
+ { account, address, sessionType = `local`, errorCollection = false }
+ ) {
+ let accountAddress
+ switch (sessionType) {
+ case `ledger`:
+ accountAddress = address
+ break
+ default:
+ // local keyStore
+ state.account = account // TODO: why do we have state.account and state.accounts ??
+ const keys = await state.externals.loadKeys()
+ accountAddress = keys.find(({ name }) => name === account).address
+ }
+ commit(`setSignIn`, true)
+ dispatch(`setErrorCollection`, {
+ account: accountAddress,
+ optin: errorCollection
+ })
+ commit(`setUserAddress`, accountAddress)
dispatch(`loadPersistedState`)
commit(`setModalSession`, false)
await dispatch(`getStakingParameters`)
- dispatch(`initializeWallet`, address)
await dispatch(`getGovParameters`)
- dispatch(`loadErrorCollection`, account)
+ dispatch(`loadErrorCollection`, accountAddress)
+ await dispatch(`initializeWallet`, { address: accountAddress })
},
signOut({ state, commit, dispatch }) {
state.account = null
- state.signedIn = false
-
+ commit(`setSignIn`, false)
commit(`setModalSession`, true)
+ commit(`setLedgerConnection`, false)
+ commit(`setCosmosAppVersion`, {})
dispatch(`showInitialScreen`)
},
- resetSessionData({ state }) {
- state.atoms = 0
+ resetSessionData({ commit, state }) {
+ commit(`setAtoms`, 0)
state.history = []
state.account = null
- state.address = null
+ commit(`setUserAddress`, null)
},
loadErrorCollection({ state, dispatch }, account) {
- let errorCollection =
+ const errorCollection =
localStorage.getItem(`${ERROR_COLLECTION_KEY}_${account}`) === `true`
if (state.errorCollection !== errorCollection)
dispatch(`setErrorCollection`, { account, optin: errorCollection })
},
setErrorCollection({ state, commit }, { account, optin }) {
- if (state.errorCollection !== optin && config.development) {
+ if (
+ optin &&
+ state.errorCollection === false &&
+ state.externals.config.development
+ ) {
commit(`notifyError`, {
- title: `Couldn't switch ${optin ? `on` : `off`} error collection.`,
+ title: `Couldn't switch on error collection.`,
body: `Error collection is disabled during development.`
})
}
- state.errorCollection = config.development ? false : optin
+ state.errorCollection = state.externals.config.development ? false : optin
localStorage.setItem(
`${ERROR_COLLECTION_KEY}_${account}`,
state.errorCollection
)
if (state.errorCollection) {
- Sentry.init({
+ state.externals.Sentry.init({
dsn: config.sentry_dsn,
- release: `voyager@${config.version}`
+ release: `voyager@${state.externals.config.version}`
})
- enableGoogleAnalytics(config.google_analytics_uid)
+ state.externals.enableGoogleAnalytics(
+ state.externals.config.google_analytics_uid
+ )
console.log(`Analytics and error reporting have been enabled`)
- window.analytics &&
- window.analytics.send(`pageview`, {
- dl: window.location.pathname
- })
+ state.externals.track(`pageview`, {
+ dl: window.location.pathname
+ })
} else {
console.log(`Analytics disabled in browser`)
- Sentry.init({})
- window.analytics = null
+ state.externals.Sentry.init({})
+ state.externals.disableGoogleAnalytics(
+ state.externals.config.google_analytics_uid
+ )
}
-
- ipcRenderer.send(`error-collection`, state.errorCollection)
}
}
diff --git a/app/src/renderer/vuex/modules/validators.js b/app/src/renderer/vuex/modules/validators.js
index 883627e5f4..887e3c2c79 100644
--- a/app/src/renderer/vuex/modules/validators.js
+++ b/app/src/renderer/vuex/modules/validators.js
@@ -8,7 +8,7 @@ export default ({ node }) => {
error: null,
validatorHash: null
}
- let state = JSON.parse(JSON.stringify(emptyState))
+ const state = JSON.parse(JSON.stringify(emptyState))
const mutations = {
setValidators(state, validators) {
@@ -35,7 +35,7 @@ export default ({ node }) => {
if (!rootState.connection.connected) return
try {
- let validators = (await node.getValidatorSet()).validators
+ const validators = (await node.getValidatorSet()).validators
state.error = null
state.loading = false
state.loaded = true
@@ -50,7 +50,7 @@ export default ({ node }) => {
}
},
async maybeUpdateValidators({ state, commit, dispatch }, header) {
- let validatorHash = header.validators_hash
+ const validatorHash = header.validators_hash
if (validatorHash === state.validatorHash) return
commit(`setValidatorHash`, validatorHash)
await dispatch(`getValidators`)
diff --git a/app/src/renderer/vuex/modules/wallet.js b/app/src/renderer/vuex/modules/wallet.js
index b2422ee9b7..bb8de7b2c8 100644
--- a/app/src/renderer/vuex/modules/wallet.js
+++ b/app/src/renderer/vuex/modules/wallet.js
@@ -1,26 +1,34 @@
import * as Sentry from "@sentry/browser"
-import fs from "fs-extra"
-import { join } from "path"
-import { remote } from "electron"
-import { sleep } from "scripts/common.js"
-const root = remote.getGlobal(`root`)
+import Vue from "vue"
+import config from "../../../config"
export default ({ node }) => {
- let emptyState = {
+ const emptyState = {
balances: [],
loading: true,
loaded: false,
error: null,
denoms: [],
+ accountNumber: null,
address: null,
subscribedRPC: null
}
- let state = JSON.parse(JSON.stringify(emptyState))
+ const state = JSON.parse(JSON.stringify(emptyState))
- let mutations = {
+ const mutations = {
setWalletBalances(state, balances) {
- state.balances = balances
- state.loading = false
+ Vue.set(state, `balances`, balances)
+ Vue.set(state, `loading`, false)
+ },
+ updateWalletBalance(state, balance) {
+ const findBalanceIndex = state.balances.findIndex(
+ ({ denom }) => balance.denom === denom
+ )
+ if (findBalanceIndex === -1) {
+ state.balances.push(balance)
+ return
+ }
+ Vue.set(state.balances, findBalanceIndex, balance)
},
setWalletAddress(state, address) {
state.address = address
@@ -29,19 +37,19 @@ export default ({ node }) => {
state.accountNumber = accountNumber
},
setDenoms(state, denoms) {
- state.denoms = denoms
+ Vue.set(state, `denoms`, denoms)
}
}
- let actions = {
- reconnected({ state, dispatch }) {
- if (state.loading && state.address) {
- dispatch(`queryWalletBalances`)
+ const actions = {
+ async reconnected({ rootState, state, dispatch }) {
+ if (state.loading && state.address && rootState.user.signedIn) {
+ await dispatch(`queryWalletBalances`)
}
},
- initializeWallet({ commit, dispatch }, address) {
+ async initializeWallet({ commit, dispatch }, { address }) {
commit(`setWalletAddress`, address)
- dispatch(`queryWalletBalances`)
+ await dispatch(`queryWalletBalances`)
dispatch(`loadDenoms`)
dispatch(`walletSubscribe`)
},
@@ -56,25 +64,12 @@ export default ({ node }) => {
if (!rootState.connection.connected) return
try {
- let res = await node.queryAccount(state.address)
- if (!res) {
- state.loading = false
- state.loaded = true
- return
- }
+ const res = await node.queryAccount(state.address)
state.error = null
- let coins = res.coins || []
+ const coins = res.coins || []
commit(`setNonce`, res.sequence)
commit(`setAccountNumber`, res.account_number)
commit(`setWalletBalances`, coins)
- for (let coin of coins) {
- if (
- coin.denom === rootState.stakingParameters.parameters.bond_denom
- ) {
- commit(`setAtoms`, parseFloat(coin.amount))
- break
- }
- }
state.loading = false
state.loaded = true
} catch (error) {
@@ -86,47 +81,30 @@ export default ({ node }) => {
state.error = error
}
},
- async loadDenoms({ commit, state }, maxIterations = 10) {
- // read genesis.json to get default denoms
-
- // wait for genesis.json to exist
- let genesisPath = join(root, `genesis.json`)
-
- // wait for the genesis and load it
- // at some point give up and throw an error
- while (maxIterations) {
- try {
- await fs.pathExists(genesisPath)
- break
- } catch (error) {
- console.log(`waiting for genesis`, error, genesisPath)
- maxIterations--
- await sleep(500)
- }
- }
- if (maxIterations === 0) {
- const error = new Error(`Couldn't load genesis at path ${genesisPath}`)
- Sentry.captureException(error)
- state.error = error
- return
- }
-
- let genesis = await fs.readJson(genesisPath)
- let denoms = []
- for (let account of genesis.app_state.accounts) {
- if (account.coins) {
- for (let { denom } of account.coins) {
- denoms.push(denom)
- }
- }
- }
+ async sendCoins(
+ { dispatch, commit, state },
+ { receiver, amount, denom, password }
+ ) {
+ await dispatch(`sendTx`, {
+ type: `send`,
+ password,
+ to: receiver,
+ amount: [{ denom, amount: String(amount) }]
+ })
- commit(`setDenoms`, denoms)
+ const oldBalance = state.balances.find(balance => balance.denom === denom)
+ commit(`updateWalletBalance`, {
+ denom,
+ amount: oldBalance.amount - amount
+ })
+ },
+ loadDenoms({ commit }) {
+ commit(`setDenoms`, config.denoms)
},
queryWalletStateAfterHeight({ rootState, dispatch }, height) {
return new Promise(resolve => {
// wait until height is >= `height`
- let interval = setInterval(() => {
+ const interval = setInterval(() => {
if (rootState.connection.lastHeader.height < height) return
clearInterval(interval)
dispatch(`queryWalletBalances`)
@@ -143,16 +121,8 @@ export default ({ node }) => {
state.subscribedRPC = node.rpc
- function onTx(error, event) {
- if (error) {
- Sentry.captureException(error)
- console.error(`error subscribing to transactions`, error)
- return
- }
- dispatch(
- `queryWalletStateAfterHeight`,
- event.data.value.TxResult.height + 1
- )
+ function onTx(data) {
+ dispatch(`queryWalletStateAfterHeight`, data.TxResult.height + 1)
}
const queries = [
diff --git a/app/src/renderer/vuex/store.js b/app/src/renderer/vuex/store.js
index f80f1936ce..a79301be11 100644
--- a/app/src/renderer/vuex/store.js
+++ b/app/src/renderer/vuex/store.js
@@ -6,7 +6,7 @@
import Vue from "vue"
import Vuex from "vuex"
-import _ from "lodash"
+import merge from "lodash/merge"
import * as getters from "./getters"
import modules from "./modules"
@@ -33,41 +33,53 @@ export default (opts = {}) => {
let pending = null
store.subscribe((mutation, state) => {
- // since persisting the state is costly we should only do it on mutations that change the data
- const updatingMutations = [
- `setWalletBalances`,
- `setWalletHistory`,
- `setCommittedDelegation`,
- `setUnbondingDelegations`,
- `setDelegates`,
- `setStakingParameters`,
- `setPool`,
- `setProposal`,
- `setProposalDeposits`,
- `setProposalVotes`,
- `setProposalTally`,
- `setGovParameters`,
- `setKeybaseIdentities`
- ]
+ /* istanbul ignore next */
+ pending = storeUpdateHandler(mutation, state, pending)
+ })
- if (updatingMutations.indexOf(mutation.type) === -1) return
+ return store
+}
- // if the user is logged in cache the balances and the tx-history for that user
- if (!state.user.account) return
+/*
+ * We want to store a sub-state of the state to local storage to serve data faster for the user.
+ * This function is triggered on all mutations.
+ */
+export function storeUpdateHandler(mutation, state, pending) {
+ // since persisting the state is costly we should only do it on mutations that change the data
+ const updatingMutations = [
+ `setWalletBalances`,
+ `setWalletHistory`,
+ `setCommittedDelegation`,
+ `setUnbondingDelegations`,
+ `setDelegates`,
+ `setStakingParameters`,
+ `setPool`,
+ `setProposal`,
+ `setProposalDeposits`,
+ `setProposalVotes`,
+ `setProposalTally`,
+ `setGovParameters`,
+ `setKeybaseIdentities`
+ ]
- if (pending) {
- clearTimeout(pending)
- }
- pending = setTimeout(() => {
- persistState(state)
- }, 5000)
- })
+ if (updatingMutations.indexOf(mutation.type) === -1) return
- return store
+ // if the user is logged in cache the balances and the tx-history for that user
+ if (!state.user.address) return
+
+ // throttle updates so we don't write to disk on every mutation
+ // pending is the last updates setTimeout
+ if (pending) {
+ clearTimeout(pending)
+ }
+ return setTimeout(() => {
+ persistState(state)
+ }, 5000)
}
/**
* Persist the state passed as parameter
+ * Only persists a subset of the state
* @param state
*/
function persistState(state) {
@@ -106,7 +118,7 @@ function persistState(state) {
* @param state
* @returns {string}
*/
-function getStorageKey(state) {
+export function getStorageKey(state) {
const chainId = state.connection.lastHeader.chain_id
const address = state.user.address
return `store_${chainId}_${address}`
@@ -117,7 +129,7 @@ function getStorageKey(state) {
* @param state
* @param commit
*/
-function loadPersistedState({ state, commit }) {
+export function loadPersistedState({ state, commit }) {
const storageKey = getStorageKey(state)
let cachedState
try {
@@ -127,7 +139,7 @@ function loadPersistedState({ state, commit }) {
}
if (cachedState) {
// Replace the state object with the stored state
- _.merge(state, cachedState, {
+ merge(state, cachedState, {
// set loading indicators to false
transactions: {
loaded: true,
diff --git a/app/src/root.js b/app/src/root.js
deleted file mode 100644
index d649913770..0000000000
--- a/app/src/root.js
+++ /dev/null
@@ -1,19 +0,0 @@
-"use strict"
-
-const { COSMOS_HOME, NODE_ENV } = process.env
-
-if (COSMOS_HOME) {
- module.exports = COSMOS_HOME
-} else {
- const { resolve, join } = require(`path`)
- const networkName = require(`./network.js`).name
- const appDir = resolve(`${__dirname}/../../`)
- const buildTestnetPath = join(appDir, `builds`, `testnets`)
-
- const { name } = require(`../../package.json`)
- const DEV = NODE_ENV === `development`
- const appName = name.toLowerCase()
- const appDirName = `${appName}${DEV ? `-dev` : ``}`
-
- module.exports = join(buildTestnetPath, networkName, appDirName)
-}
diff --git a/app/static/icons/android-chrome-192x192.png b/app/static/icons/android-chrome-192x192.png
new file mode 100644
index 0000000000..36f5276da1
Binary files /dev/null and b/app/static/icons/android-chrome-192x192.png differ
diff --git a/app/static/icons/android-chrome-512x512.png b/app/static/icons/android-chrome-512x512.png
new file mode 100644
index 0000000000..3992f3dda8
Binary files /dev/null and b/app/static/icons/android-chrome-512x512.png differ
diff --git a/app/static/icons/apple-touch-icon.png b/app/static/icons/apple-touch-icon.png
new file mode 100644
index 0000000000..26e00e7c43
Binary files /dev/null and b/app/static/icons/apple-touch-icon.png differ
diff --git a/app/static/icons/browserconfig.xml b/app/static/icons/browserconfig.xml
new file mode 100644
index 0000000000..5a3b33b230
--- /dev/null
+++ b/app/static/icons/browserconfig.xml
@@ -0,0 +1,9 @@
+
+
+
+
+ #603cba
+
+
+
diff --git a/app/static/icons/favicon-16x16.png b/app/static/icons/favicon-16x16.png
new file mode 100644
index 0000000000..49b4666be9
Binary files /dev/null and b/app/static/icons/favicon-16x16.png differ
diff --git a/app/static/icons/favicon-32x32.png b/app/static/icons/favicon-32x32.png
new file mode 100644
index 0000000000..b92a2d869f
Binary files /dev/null and b/app/static/icons/favicon-32x32.png differ
diff --git a/app/static/icons/favicon.ico b/app/static/icons/favicon.ico
new file mode 100644
index 0000000000..3ae9c4a64f
Binary files /dev/null and b/app/static/icons/favicon.ico differ
diff --git a/app/static/icons/mstile-150x150.png b/app/static/icons/mstile-150x150.png
new file mode 100644
index 0000000000..42d0f65c4b
Binary files /dev/null and b/app/static/icons/mstile-150x150.png differ
diff --git a/app/icons/png/1024x1024.png b/app/static/icons/png/1024x1024.png
similarity index 100%
rename from app/icons/png/1024x1024.png
rename to app/static/icons/png/1024x1024.png
diff --git a/app/icons/png/128x128.png b/app/static/icons/png/128x128.png
similarity index 100%
rename from app/icons/png/128x128.png
rename to app/static/icons/png/128x128.png
diff --git a/app/icons/png/16x16.png b/app/static/icons/png/16x16.png
similarity index 100%
rename from app/icons/png/16x16.png
rename to app/static/icons/png/16x16.png
diff --git a/app/icons/png/24x24.png b/app/static/icons/png/24x24.png
similarity index 100%
rename from app/icons/png/24x24.png
rename to app/static/icons/png/24x24.png
diff --git a/app/icons/png/256x256.png b/app/static/icons/png/256x256.png
similarity index 100%
rename from app/icons/png/256x256.png
rename to app/static/icons/png/256x256.png
diff --git a/app/icons/png/32x32.png b/app/static/icons/png/32x32.png
similarity index 100%
rename from app/icons/png/32x32.png
rename to app/static/icons/png/32x32.png
diff --git a/app/icons/png/48x48.png b/app/static/icons/png/48x48.png
similarity index 100%
rename from app/icons/png/48x48.png
rename to app/static/icons/png/48x48.png
diff --git a/app/icons/png/512x512.png b/app/static/icons/png/512x512.png
similarity index 100%
rename from app/icons/png/512x512.png
rename to app/static/icons/png/512x512.png
diff --git a/app/icons/png/64x64.png b/app/static/icons/png/64x64.png
similarity index 100%
rename from app/icons/png/64x64.png
rename to app/static/icons/png/64x64.png
diff --git a/app/icons/png/96x96.png b/app/static/icons/png/96x96.png
similarity index 100%
rename from app/icons/png/96x96.png
rename to app/static/icons/png/96x96.png
diff --git a/app/static/icons/safari-pinned-tab.svg b/app/static/icons/safari-pinned-tab.svg
new file mode 100644
index 0000000000..6341f0b289
--- /dev/null
+++ b/app/static/icons/safari-pinned-tab.svg
@@ -0,0 +1,38 @@
+
+
+
diff --git a/app/static/icons/site.webmanifest b/app/static/icons/site.webmanifest
new file mode 100644
index 0000000000..cf2ad0f885
--- /dev/null
+++ b/app/static/icons/site.webmanifest
@@ -0,0 +1,19 @@
+{
+ "name": "Voyager",
+ "short_name": "Voyager",
+ "icons": [
+ {
+ "src": "/static/icons/android-chrome-192x192.png",
+ "sizes": "192x192",
+ "type": "image/png"
+ },
+ {
+ "src": "/static/icons/android-chrome-512x512.png",
+ "sizes": "512x512",
+ "type": "image/png"
+ }
+ ],
+ "theme_color": "#ffffff",
+ "background_color": "#ffffff",
+ "display": "standalone"
+}
diff --git a/circle.ebs_deploy.sh b/circle.ebs_deploy.sh
new file mode 100644
index 0000000000..fbf8b3df9e
--- /dev/null
+++ b/circle.ebs_deploy.sh
@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+set -euo pipefail
+JQ="jq --raw-output --exit-status"
+S3_PATH="s3://${S3_DEPLOY_BUCKET}/"
+DOCKER_DEPLOY_FILE="${CIRCLE_BUILD_NUM}-${CIRCLE_PROJECT_REPONAME}.zip"
+
+echo "Deploying to ${APPLICATION_ENV}"
+
+configure_aws_cli(){
+ aws --version
+ aws configure set default.region ${AWS_REGION}
+ aws configure set default.output json
+}
+
+
+push_ecr_image(){
+ # copy the guy that clone the right hash and do all the magic as fetching by himself the S3 genesis file
+ cp .aws/Dockerfile .
+ # get our login and clean it a bit
+ eval $(aws ecr get-login --region ${AWS_REGION} | sed -e "s/-e none//g" - )
+
+ # tag with our current circleCi run (hash was OK but less readable, this is sequential so seems easier to read)
+ docker tag $DOCKER_REPO_URL:$CIRCLE_BUILD_NUM $DOCKER_REPO_URL:latest
+
+ # push new tag
+ docker push $DOCKER_REPO_URL:$CIRCLE_BUILD_NUM
+
+ # update latest tag to reference this version
+ docker push $DOCKER_REPO_URL:latest
+}
+
+
+upload_s3_build_file() {
+ # clean repo url
+ DOCKER_ESCAPE_URL=`sed 's@\/@\\\/@g' <<< "$DOCKER_REPO_URL"`
+
+ # create form the template a proper Dockerrun json by replacing the correct values
+ sed -e "s//${CIRCLE_BUILD_NUM}/" -e "s//${DOCKER_ESCAPE_URL}/" .aws/Dockerrun.aws.tpl.json > Dockerrun.aws.json
+
+ # add all the extensions
+ cp -r .aws/.ebextensions .
+
+ # zip and push it to S3 ALWAYS to the same file, no jokes, just a static veriable in CircleCi env variable
+ zip -r ${DOCKER_DEPLOY_FILE} .ebextensions Dockerrun.aws.json
+ aws s3 cp ${DOCKER_DEPLOY_FILE} $S3_PATH --region=${AWS_REGION}
+}
+
+deploy_ebs() {
+ # Create a version of the APPLICATION_NAME with the current build number as version. The source is the S3 file we know
+ aws elasticbeanstalk create-application-version --region=${AWS_REGION} --application-name ${APPLICATION_NAME} \
+ --version-label $CIRCLE_BUILD_NUM --source-bundle S3Bucket=${S3_DEPLOY_BUCKET},S3Key=${DOCKER_DEPLOY_FILE}
+
+ # update and run, should be ok
+ aws elasticbeanstalk update-environment --region=${AWS_REGION} --application-name ${APPLICATION_NAME} --environment-name ${APPLICATION_ENV} \
+ --version-label $CIRCLE_BUILD_NUM
+}
+
+configure_aws_cli
+push_ecr_image
+upload_s3_build_file
+# Export import of genesis is totally missing, STEP 2
+# for now static S3 file with Genesis always the same for every node we want
+deploy_ebs
diff --git a/codecov.yaml b/codecov.yaml
index 2b8569cb6a..bf36496ba8 100644
--- a/codecov.yaml
+++ b/codecov.yaml
@@ -5,7 +5,7 @@ coverage:
status:
project:
- default: on
+ default: off
patch:
default: on
changes:
@@ -22,4 +22,3 @@ ignore:
- "tasks/releasePullRequest.js"
- "tasks/publish.js"
- "app/src/renderer/components/govern/*"
- - "app/src/main/menu.js" # a test for this file would only test electron code
diff --git a/jest.config.js b/jest.config.js
index 7c88204716..0570fccd09 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -41,7 +41,6 @@ module.exports = {
`./test/unit/helpers/fixed_time.js`,
`./test/unit/helpers/console_error_throw.js`,
`./test/unit/helpers/genesis_mock.js`,
- `./test/unit/helpers/electron_mock.js`,
`./test/unit/helpers/sentry_mock.js`,
`./test/unit/helpers/mock_perfect-scrollbar.js`,
`./test/unit/helpers/window_mock.js`,
diff --git a/package.json b/package.json
index d26a7b4ee4..b286061257 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "cosmos-voyager",
"productName": "Cosmos Voyager",
- "version": "0.10003.3",
+ "version": "0.10003.4",
"description": "Voyager is an electron-based user interface for the Cosmos Network.",
"author": "All In Bits, Inc ",
"license": "Apache-2.0",
@@ -18,16 +18,14 @@
"build:testnets": "cd tasks/build/testnets && ./localBuild.sh",
"build:gaia": "cd tasks/build/Gaia && ./localBuild.sh",
"build:local": "node tasks/build/local/build",
+ "build:ui": "cross-env NODE_ENV=production webpack --colors --config webpack.renderer.config.js --mode=production --profile --json > app/dist/build.stats.json",
+ "start": "yarn frontend & yarn backend skip-rebuild",
+ "start:new": "yarn frontend & yarn backend",
"doc": "jsdoc -r -c jsdoc.json",
- "start": "node tasks/testnet.js",
- "testnet": "echo \"'yarn testnet' has been deprecated. Please use 'yarn start'\"",
"lint": "yarn lint:eslint && yarn lint:format",
"lint:eslint": "eslint -f ./node_modules/eslint-friendly-formatter \"{,**/}*.{js,vue}\"",
"lint:format": "prettier --list-different \"{,**/}*.{css,js,json,vue}\" \"!testArtifacts/**\" \"!app/networks/**\"",
"lint:fix": "prettier --write \"{,**/}*.{css,js,json,vue}\" \"!testArtifacts/**\"",
- "pack": "yarn run pack:main && yarn run pack:renderer",
- "pack:main": "cross-env NODE_ENV=production webpack --colors --config webpack.main.config.js",
- "pack:renderer": "cross-env NODE_ENV=production webpack --colors --config webpack.renderer.config.js",
"test": "yarn run lint && yarn test:unit && yarn test:e2e",
"test:unit": "cross-env LOGGING=false ANALYTICS=false NODE_ENV=testing jest --maxWorkers=2",
"test:e2e": "cross-env ANALYTICS=false yarn run pack && tape \"${TEST:-test/e2e/*.js}\"",
@@ -37,7 +35,14 @@
"precommit": "pretty-quick --staged",
"prepush": "bash ./tasks/changelog-changed-check.sh && yarn lint",
"postcheckout": "yarn",
- "watch": "tasks/watch.sh"
+ "watch": "tasks/watch.sh",
+ "nodes": "node ./tasks/testnet.js",
+ "proxy": "caddy",
+ "stargate": "./builds/Gaia/darwin_amd64/gaiacli rest-server --laddr 'tcp://localhost:9070' --home './builds/testnets/local-testnet/cli_home' --node 'http://localhost:26657' --chain-id 'local-testnet' --trust-node true",
+ "frontend": "cross-env NODE_ENV=development webpack-dev-server --hot --colors --config webpack.renderer.config.js --port 9080 --content-base app/dist --https --mode=development",
+ "frontend:fixed-https": "yarn frontend --cert 'server_dev.crt' --key 'server_dev.key'",
+ "backend": "yarn stargate & yarn proxy & yarn nodes 2",
+ "backend:fixed-https": "yarn nodes 2 skip-rebuild & yarn stargate --ssl-certfile 'server_dev.crt' --ssl-keyfile 'server_dev.key'"
},
"devDependencies": {
"@nodeguy/cli": "0.2.2",
@@ -53,13 +58,11 @@
"babel-register": "6.26.0",
"babel-runtime": "6.26.0",
"canonical-json": "0.0.4",
+ "clean-webpack-plugin": "1.0.1",
"cross-env": "3.2.4",
"css-loader": "0.28.11",
"deterministic-zip": "1.0.5",
"duplexer": "0.1.1",
- "electron-debug": "1.5.0",
- "electron-devtools-installer": "2.2.4",
- "electron-packager": "10.1.2",
"eslint": "5.9.0",
"eslint-config-prettier": "3.3.0",
"eslint-friendly-formatter": "2.0.7",
@@ -68,13 +71,13 @@
"express": "4.16.4",
"express-mung": "0.5.1",
"file-loader": "1.1.11",
- "html-webpack-plugin": "2.30.1",
+ "html-webpack-plugin": "3.2.0",
"http-server": "0.11.1",
"husky": "0.14.3",
- "jsdoc": "3.5.5",
- "jsdoc-vuejs": "2.3.3",
"jest": "23.6.0",
"jest-localstorage-mock": "2.3.0",
+ "jsdoc": "3.5.5",
+ "jsdoc-vuejs": "2.3.3",
"json-loader": "0.5.7",
"lodash": "4.17.10",
"markdown-it": "8.4.1",
@@ -83,12 +86,7 @@
"prettier": "1.15.2",
"pretty-quick": "1.4.1",
"publish-release": "1.5.1",
- "pug": "2.0.3",
- "pug-plain-loader": "1.0.0",
- "spectron": "https://github.com/electron/spectron.git#c527b4e5fd8ab89ed0c6454a4dfb69f0980e9e1d",
"style-loader": "0.21.0",
- "stylus": "0.54.5",
- "stylus-loader": "3.0.2",
"swagger-express-middleware": "1.1.1",
"tape": "4.9.0",
"tape-promise": "2.0.1",
@@ -99,9 +97,11 @@
"vue-loader": "15.4.2",
"vue-style-loader": "4.1.0",
"vue-template-compiler": "2.5.21",
- "vue-template-es2015-compiler": "1.6.0",
- "webpack": "3.11.0",
- "webpack-dev-server": "2.11.2"
+ "vue-template-es2015-compiler": "1.8.1",
+ "webpack": "4.28.3",
+ "webpack-cli": "3.2.0",
+ "webpack-dev-server": "3.1.14",
+ "webpack-bundle-analyzer": "3.0.3"
},
"dependencies": {
"@sentry/browser": "4.4.1",
@@ -111,14 +111,13 @@
"axios": "0.18.0",
"bech32": "1.1.3",
"bignumber.js": "7.2.1",
- "chart.js": "2.7.2",
+ "bip32": "1.0.2",
+ "bip39": "2.5.0",
"crypto-js": "3.1.9-1",
- "electron": "2.0.8",
- "electron-chromedriver": "3.0.0-beta.1",
- "electron-ga": "1.0.6",
"fs-extra": "7.0.0",
"glob": "7.1.3",
"js-beautify": "1.8.6",
+ "ledger-cosmos-js": "https://github.com/ZondaX/ledger-cosmos-js",
"markdown-it-anchor": "5.0.2",
"moment": "2.22.1",
"mousetrap": "1.6.1",
@@ -126,18 +125,19 @@
"no-scroll": "2.1.0",
"numeral": "2.0.6",
"perfect-scrollbar": "1.3.0",
+ "secp256k1": "3.6.1",
"semver": "5.5.0",
"shortid": "2.2.8",
- "tendermint": "2.0.5",
+ "tendermint": "3.4.0",
+ "timezone-mock": "1.0.3",
"toml": "2.3.3",
"user-home": "2.0.0",
"varint": "5.0.0",
"vue": "2.5.21",
"vue-click-outside": "1.0.7",
"vue-directive-tooltip": "1.4.5",
- "vue-electron": "1.0.6",
"vue-router": "3.0.1",
- "vuelidate": "0.6.2",
+ "vuelidate": "0.7.3",
"vuex": "3.0.1"
}
}
diff --git a/tasks/build/Gaia/COMMIT.sh b/tasks/build/Gaia/COMMIT.sh
index 70f9214653..fc9a8567d7 100755
--- a/tasks/build/Gaia/COMMIT.sh
+++ b/tasks/build/Gaia/COMMIT.sh
@@ -2,4 +2,4 @@
# This is the commit of the SDK version to use for building Gaia. We use an
# explicit hash instead of a tag so we don't have to trust GitHub.
-export COMMIT=6bff7082607a2c36439f8b6218816878c41ca6af
+export COMMIT=30aebc1173ed6dae2848d1e845ec2f4e22750355
diff --git a/tasks/build/Gaia/build.sh b/tasks/build/Gaia/build.sh
index 7e56fb9ccf..dacb185891 100755
--- a/tasks/build/Gaia/build.sh
+++ b/tasks/build/Gaia/build.sh
@@ -9,12 +9,12 @@ git checkout $COMMIT
echo ###############################################################################
echo Installing development tools.
echo ###############################################################################
-make get_tools
+make devtools
# Build Gaia for each platform.
export GOOS
-platforms="darwin linux windows"
+platforms=${PLATFORM:="darwin linux windows"}
for GOOS in $platforms; do
echo ###############################################################################
@@ -22,10 +22,12 @@ for GOOS in $platforms; do
echo ###############################################################################
make get_vendor_deps
make install
-done
-# Give the Linux binaries a prefix to make them like the others.
-mkdir --parents $TARGET/linux_amd64
-cp /go/bin/gaia* $TARGET/linux_amd64/
+ if [[ "$GOOS" == "linux" ]]; then
+ # Give the Linux binaries a prefix to make them like the others.
+ mkdir --parents $TARGET/linux_amd64
+ cp /go/bin/gaia* $TARGET/linux_amd64/
+ fi
+done
cp --recursive /go/bin/*_amd64 $TARGET/
diff --git a/tasks/build/Gaia/localBuild.sh b/tasks/build/Gaia/localBuild.sh
index 76c7935a65..a5eaf84652 100755
--- a/tasks/build/Gaia/localBuild.sh
+++ b/tasks/build/Gaia/localBuild.sh
@@ -1,14 +1,34 @@
#!/bin/sh
. ./COMMIT.sh
+version="$(pwd)/../../../builds/GaiaVersions/$COMMIT"
source="$(pwd)/../../../builds/Gaia"
-mkdir -p "$source"
-export TARGET=/mnt
-
-docker run \
- --interactive \
- --env COMMIT \
- --env TARGET \
- --mount type=bind,source="$source",target="$TARGET" \
- --rm \
- golang:1.11.1 < build.sh
+mkdir -p "$version"
+rm -rf "$source"
+
+unameOut="$(uname -s)"
+case "${unameOut}" in
+ Linux*) export PLATFORM=linux;;
+ Darwin*) export PLATFORM=darwin;;
+ CYGWIN*) export PLATFORM=windows;;
+ *) echo "UNKNOWN machine:${unameOut}"
+esac
+
+if [[ -f "$version/${PLATFORM}_amd64/gaiad" ]]; then
+ echo "Already built $COMMIT for $PLATFORM"
+else
+ echo "Building new version: $COMMIT for $PLATFORM "
+
+ export TARGET=/mnt
+
+ docker run \
+ --interactive \
+ --env COMMIT \
+ --env TARGET \
+ --env PLATFORM \
+ --mount type=bind,source="$version",target="$TARGET" \
+ --rm \
+ golang:1.11.5 < build.sh
+fi
+
+ln -s ${version} ${source}
diff --git a/tasks/build/build.js b/tasks/build/build.js
deleted file mode 100644
index d1c40a98f8..0000000000
--- a/tasks/build/build.js
+++ /dev/null
@@ -1,301 +0,0 @@
-"use strict"
-
-const canonicalJson = require(`canonical-json`)
-const stream = require(`stream`)
-const util = require(`util`)
-const childProcess = require(`child_process`)
-const { cli } = require(`@nodeguy/cli`)
-const { createHash } = require(`crypto`)
-const fp = require(`lodash/fp`)
-const zip = require(`deterministic-zip`)
-const path = require(`path`)
-const packager = util.promisify(require(`electron-packager`))
-const fs = require(`fs-extra`)
-const glob = require(`glob`)
-const zlib = require(`zlib`)
-const tar = require(`tar-stream`)
-const duplexer = require(`duplexer`)
-const packageJson = require(`../../package.json`)
-
-const generateAppPackageJson = packageJson =>
- Object.assign({}, fp.pick([`productName`, `version`], packageJson), {
- main: `./dist/main.js`
- })
-
-const updateConfig = (config, { network }) =>
- config.replace(
- /default_network = ".*"/,
- `default_network = "${path.basename(network)}"`
- )
-
-const copyGaia = options => (
- buildPath,
- electronVersion,
- platform,
- arch,
- callback
-) => {
- const platformPath = platform === `win32` ? `windows` : platform
- const binaryName = platform === `win32` ? `gaiacli.exe` : `gaiacli`
-
- const binaryPath =
- options.binaryPath === `default`
- ? path.join(
- __dirname,
- `../../builds/Gaia/${platformPath}_amd64/${binaryName}`
- )
- : options.binaryPath
- fs.copy(binaryPath, `${buildPath}/bin/${binaryName}`, callback)
-}
-
-/**
- * Build webpack in production
- */
-const pack = () => {
- console.log(`\x1b[33mBuilding webpack in production mode...\n\x1b[0m`)
- childProcess.execSync(`npm run pack`, { stdio: `inherit` })
-}
-
-const sha256 = async data => {
- const hash = createHash(`sha256`).setEncoding(`base64`)
-
- return data instanceof stream.Readable
- ? new Promise((resolve, reject) => {
- data
- .pipe(hash)
- .once(`data`, resolve)
- .once(`error`, reject)
- })
- : hash.update(canonicalJson(data)).digest(`base64`)
-}
-
-const zipFolder = async (inDir, outDir) => {
- const outFile = path.join(outDir, `${path.basename(inDir)}.zip`)
- await util.promisify(zip)(inDir, outFile, { cwd: inDir })
- return outFile
-}
-
-async function tarFolder(inDir, outDir) {
- let outFile = path.join(outDir, `${path.basename(inDir)}.tar.gz`)
- const pack = tar.pack()
-
- let files = glob(inDir + `/**`, { sync: true })
-
- // add files to tar
- for (let file of files) {
- try {
- let stats = fs.lstatSync(file)
-
- let contents, linkname, type
- if (stats.isDirectory()) {
- continue
- } else if (stats.isSymbolicLink()) {
- linkname = fs.readlinkSync(file)
- type = `symlink`
- } else {
- contents = fs.readFileSync(file)
- type = `file`
- }
- await new Promise(resolve => {
- pack.entry(
- Object.assign({}, stats, {
- name: path.relative(inDir, file),
- type,
- linkname
- }),
- contents,
- resolve
- )
- })
- } catch (error) {
- console.error(`Couldn't pack file`, file, error)
- // skip this file
- }
- }
- pack.finalize()
-
- // make tar deterministic
- await new Promise(resolve => {
- pack
- .pipe(deterministicTar())
- // save tar to disc
- .pipe(zlib.createGzip())
- .pipe(fs.createWriteStream(outFile))
- .once(`finish`, resolve)
- })
-
- return outFile
-}
-
-function deterministicTar() {
- const UNIXZERO = new Date(new Date().getTimezoneOffset() * -1)
-
- const pack = tar.pack()
-
- const extract = tar
- .extract()
- .on(`entry`, function(header, stream, cb) {
- header.mtime = header.atime = header.ctime = UNIXZERO
- header.uid = header.gid = 0
-
- delete header.uname
- delete header.gname
-
- if (header.type === `file`) {
- stream.pipe(pack.entry(header, cb))
- } else {
- pack.entry(header, cb)
- }
- })
- .on(`finish`, function() {
- pack.finalize()
- })
-
- return duplexer(extract, pack)
-}
-
-const platformNames = {
- darwin: `macOS`,
- linux: `Linux`,
- win32: `Windows`
-}
-
-// GitHub doesn't allow spaces in release asset names. :-(
-const sanitizeAssetName = name => name.replace(` `, `_`)
-
-// Choose better names than Electron Packager does for the application paths.
-const packagerWrapper = async ({ productName, version }, options) => {
- const source = (await packager(options))[0]
-
- const destination = sanitizeAssetName(
- `${productName}-v${version}-${platformNames[options.platform]}`
- )
-
- await fs.move(source, destination, {
- overwrite: true
- })
-
- return destination
-}
-
-/**
- * Use electron-packager to build electron app
- */
-const build = cliOptions => async platform => {
- // electron-packager options
- // Docs: https://simulatedgreg.gitbooks.io/electron-vue/content/docs/building_your_app.html
- const options = {
- afterCopy: [copyGaia(cliOptions)],
- arch: `x64`,
- asar: false,
- dir: path.join(__dirname, `../../app`),
- icon: path.join(__dirname, `../../app/icons/icon`),
- ignore: /^\/(src|index\.ejs|icons)/,
- out: path.join(__dirname, `../../builds/Voyager`),
- overwrite: true,
- packageManager: `yarn`,
- platform
- }
-
- console.log(
- `\x1b[34mBuilding electron app(s) for platform ${platform}...\n\x1b[0m`
- )
-
- const appPath = await packagerWrapper(packageJson, options)
- console.log(`Build(s) successful!`)
- console.log(appPath)
- console.log(`\n\x1b[34mArchiving files...\n\x1b[0m`)
-
- const outFile = await (platform === `linux` ? tarFolder : zipFolder)(
- appPath,
- options.out
- )
-
- const hash = await sha256(fs.createReadStream(outFile))
- console.log(`Archive successful!`, outFile, `SHA256:`, hash)
- console.log(`\n\x1b[34mDONE\n\x1b[0m`)
- return hash
-}
-
-const summary = async ({
- buildHashes,
- end,
- gaiaVersionHash,
- options,
- start
-}) => {
- const inputsHash = await sha256([gaiaVersionHash, options])
- const outputsHash = await sha256(buildHashes)
- const duration = end - start
- const seconds = Math.floor(duration / 1000)
- const minutes = Math.floor(seconds / 60)
- return `inputs hash: ${inputsHash}
-outputs hash: ${outputsHash}
-build time: ${minutes}:${seconds % 60}`
-}
-
-const copyNetworks = root => {
- const networksPath = path.join(root, `app/networks`)
-
- // Remove the symbolic link.
- fs.removeSync(networksPath)
-
- // Copy the directory.
- fs.mkdirpSync(networksPath)
- fs.copySync(path.join(root, `builds/testnets`), networksPath)
-}
-
-const buildAllPlatforms = async options => {
- const start = new Date()
- console.log(`--- Building all platforms ---`)
-
- const gaiaVersionHash = await sha256(
- fs.createReadStream(path.join(__dirname, `Gaia/COMMIT.sh`))
- )
-
- // Copy the network configuration from Gaia.
- copyNetworks(path.join(__dirname, `../..`))
-
- // Generate package.json for the app directory.
- fs.writeFileSync(
- path.join(__dirname, `../../app/package.json`),
- JSON.stringify(generateAppPackageJson(packageJson))
- )
-
- pack()
- const oss = options.os === `all` ? [`darwin`, `linux`, `win32`] : [options.os]
- const buildHashes = await Promise.all(oss.map(build(options)))
- const end = new Date()
-
- console.log(
- await summary({ buildHashes, end, gaiaVersionHash, options, start })
- )
-}
-
-const optionsSpecification = {
- network: [`name of the default network to use`, `unspecified`],
- os: [`os to build`, `all`],
- binaryPath: [`path of gaiacli binary`, `default`]
-}
-
-if (require.main === module) {
- cli(optionsSpecification, async options => {
- if (options.network !== `unspecified`) {
- // Rewrite config file.
- const configFile = path.join(__dirname, `../../app`, `config.toml`)
- const config = fs.readFileSync(configFile, { encoding: `utf8` })
- fs.writeFileSync(configFile, updateConfig(config, options))
- }
-
- await buildAllPlatforms(options)
- })
-}
-
-module.exports = {
- buildAllPlatforms,
- generateAppPackageJson,
- sanitizeAssetName,
- sha256,
- summary,
- updateConfig
-}
diff --git a/tasks/build/local/helper.js b/tasks/build/local/helper.js
index 59645a366f..3d5e57297f 100644
--- a/tasks/build/local/helper.js
+++ b/tasks/build/local/helper.js
@@ -39,14 +39,14 @@ Default account:
)
} catch (error) {
console.log(`Encountered an Error:`)
- console.error(error.msg ? error : error.toString())
+ console.error(error.msg ? error : String(error))
}
}
// save the version of the currently used gaia into the newly created network config folder
const saveVersion = nodeHome => {
const versionPath = join(nodeHome, `config`)
- let versionFilePath = join(versionPath, `gaiaversion.txt`) // nodeHome/config is used to copy created config files from
+ const versionFilePath = join(versionPath, `gaiaversion.txt`) // nodeHome/config is used to copy created config files from
return makeExec(
`mkdir -p ${versionPath} && ${nodeBinary} version > ${versionFilePath}`
)
@@ -55,20 +55,27 @@ const saveVersion = nodeHome => {
// nodes[0] is a placeholder just to be aligned with the enumeration used in gaia
// TODO: next PR refactor also gaia to simplify numeration
const startNodes = async (nodes, mainAccountSignInfo, chainId) => {
+ const startupProcesses = []
for (let i = 1; i < nodes.length; i++) {
- // start secondary nodes and connect to node one
- // wait until all nodes are showing blocks, so we know they are running
- await startLocalNode(nodes[i].home, i, i > 1 ? nodes[1].id : ``)
- // make our secondary nodes also to validators
- i > 1 &&
- (await makeValidator(
- mainAccountSignInfo,
- nodes[i].home,
- nodes[i].cliHome,
- nodes[i].moniker,
- chainId
- ))
+ startupProcesses.push(
+ (async () => {
+ // start secondary nodes and connect to node one
+ // wait until all nodes are showing blocks, so we know they are running
+ await startLocalNode(nodes[i].home, i, i > 1 ? nodes[1].id : ``)
+ // make our secondary nodes also to validators
+ i > 1 &&
+ (await makeValidator(
+ mainAccountSignInfo,
+ nodes[i].home,
+ nodes[i].cliHome,
+ nodes[i].moniker,
+ chainId
+ ))
+ })()
+ )
}
+
+ return Promise.all(startupProcesses)
}
const buildNodes = async (
@@ -78,7 +85,7 @@ const buildNodes = async (
password: `1234567890`,
overwrite: true,
moniker: `local`,
- keyName: `main-account`
+ keyName: `account-with-funds`
},
numberNodes = 1,
isTest = false
@@ -112,8 +119,9 @@ const buildNodes = async (
password: options.password,
clientHomeDir: cliHome
}
- let { address } = await createKey(mainAccountSignInfo)
- genesis = await initGenesis(mainAccountSignInfo, address, home)
+ const account = await createKey(mainAccountSignInfo)
+ console.log(`Created Account:`, account)
+ genesis = await initGenesis(mainAccountSignInfo, account.address, home)
}
}
@@ -146,7 +154,7 @@ async function setupLocalNode(
function adjustConfig(nodeHome, isTest = false, strictAddressbook = false) {
const configPath = join(nodeHome, `config`, `config.toml`)
- let configToml = fs.readFileSync(configPath, `utf8`)
+ const configToml = fs.readFileSync(configPath, `utf8`)
const timeouts = [
`timeout_propose`,
@@ -163,6 +171,21 @@ function adjustConfig(nodeHome, isTest = false, strictAddressbook = false) {
.map(line => {
let [key, value] = line.split(` = `)
+ // needs to be turned off when running multiple nodes locally
+ if (key === `addr_book_strict`) {
+ return `${key} = ${strictAddressbook ? `true` : `false`}`
+ }
+
+ // disable profile server which causes port errors when running multiple nodes
+ if (key === `prof_laddr`) {
+ return `prof_laddr = ""`
+ }
+
+ // need to allow as all nodes are on localhost
+ if (key === `allow_duplicate_ip`) {
+ return `allow_duplicate_ip = true`
+ }
+
if (!isTest) {
// TODO: this was happening on ./builds/testnets/local-testnet/config.toml
// but then the network was launched through the config ~/.gaiad-testnet/config/config.toml
@@ -173,10 +196,6 @@ function adjustConfig(nodeHome, isTest = false, strictAddressbook = false) {
return line
}
- if (key === `addr_book_strict`) {
- return `${key} = ${strictAddressbook ? `true` : `false`}`
- }
-
if (!timeouts.includes(key)) {
return line
}
@@ -208,7 +227,7 @@ const setupAccounts = async (srcClientDir, dstClientDir, options) => {
clientHomeDir: dstClientDir
})
- let accounts = await getKeys(dstClientDir)
+ const accounts = await getKeys(dstClientDir)
console.log(`setup test accounts`, accounts)
return accounts
diff --git a/tasks/createReleasePR.js b/tasks/createReleasePR.js
index dbf061d980..5d4d4326ae 100644
--- a/tasks/createReleasePR.js
+++ b/tasks/createReleasePR.js
@@ -5,7 +5,7 @@ const fs = require(`fs`)
const octokit = require(`@octokit/rest`)()
function bumpVersion(versionString) {
- let versionElements = versionString.split(`.`)
+ const versionElements = versionString.split(`.`)
versionElements[2] = parseInt(versionElements[2]) + 1
return versionElements.join(`.`)
}
@@ -27,7 +27,8 @@ const pushCommit = ({ token, branch }) =>
set -o verbose
git config --local user.name "Voyager Bot"
git config --local user.email "voyager_bot@tendermint.com"
-git commit --all --message="Bump version for release."
+git add CHANGELOG.md package.json
+git commit --message="Bump version for release."
git tag --force release-candidate
git remote add bot https://${token}@github.com/cosmos/voyager.git
git push --force --tags bot HEAD:${branch}
@@ -47,7 +48,7 @@ const createPullRequest = async ({ changeLog, token, tag, head }) => {
repo: `voyager`,
title: `automatic release created for ${tag}`,
head,
- base: `develop`,
+ base: `master`,
body: recentChanges(changeLog),
maintainer_can_modify: true
})
diff --git a/tasks/gaia.js b/tasks/gaia.js
index 54d0b3c91e..1de8f6ae39 100644
--- a/tasks/gaia.js
+++ b/tasks/gaia.js
@@ -2,22 +2,24 @@ const path = require(`path`)
const fs = require(`fs-extra`)
const util = require(`util`)
const { spawn, exec } = require(`child_process`)
-let { sleep } = require(`../test/e2e/common.js`)
+const { sleep } = require(`../test/e2e/common.js`)
const osFolderName = {
win32: `windows_amd64`,
darwin: `darwin_amd64`,
linux: `linux_amd64`
}[process.platform]
-let cliBinary =
+const cliBinary =
process.env.BINARY_PATH ||
path.join(__dirname, `../builds/Gaia/`, osFolderName, `gaiacli`)
-let nodeBinary =
+const nodeBinary =
process.env.NODE_BINARY_PATH ||
path.join(__dirname, `../builds/Gaia/`, osFolderName, `gaiad`)
const defaultStartPort = 26656
const getStartPort = nodeNumber => defaultStartPort - (nodeNumber - 1) * 3
+const defaultStakePool = 2000 * 10e6
+const defaultStakedPerValidator = 10 * 10e6
// initialise the node config folder and genesis
async function initNode(
@@ -27,7 +29,7 @@ async function initNode(
password = `1234567890`,
overwrite = false
) {
- let command = `${nodeBinary} init --home ${homeDir} --moniker ${moniker} --chain-id ${chainId}`
+ let command = `${nodeBinary} init ${moniker} --home ${homeDir} --chain-id ${chainId}`
if (overwrite) {
command += ` -o`
}
@@ -35,13 +37,13 @@ async function initNode(
}
async function createKey({ keyName, password, clientHomeDir }) {
- let command = `${cliBinary} keys add ${keyName} --home ${clientHomeDir} -o json`
+ const command = `${cliBinary} keys add ${keyName} --home ${clientHomeDir} -o json`
return makeExecWithInputs(command, [password, password])
}
async function getKeys(clientHomeDir) {
- let command = `${cliBinary} keys list --home ${clientHomeDir} -o json`
- let accounts = await makeExec(command)
+ const command = `${cliBinary} keys list --home ${clientHomeDir} -o json`
+ const accounts = await makeExec(command)
return JSON.parse(accounts)
}
@@ -52,26 +54,9 @@ async function initGenesis(
address, // this address will have funds after initialization
nodeHomeDir
) {
- const genesisLocation = path.join(nodeHomeDir, `config/genesis.json`)
- let genesis = require(genesisLocation)
- console.log(
- `Adding tokens to genesis at ${genesisLocation} for address ${address}`
+ await makeExec(
+ `${nodeBinary} add-genesis-account ${address} ${defaultStakePool}stake,1000photino --home ${nodeHomeDir}`
)
- genesis.app_state.accounts = genesis.app_state.accounts || []
- genesis.app_state.accounts.push({
- address,
- coins: [
- {
- denom: `STAKE`,
- amount: `150`
- },
- {
- denom: `localcoin`,
- amount: `1000`
- }
- ]
- })
- fs.writeJSONSync(genesisLocation, genesis)
await makeExecWithInputs(
`${nodeBinary} gentx --name ${keyName} --home ${nodeHomeDir} --home-client ${clientHomeDir}`,
@@ -81,7 +66,8 @@ async function initGenesis(
await makeExec(`${nodeBinary} collect-gentxs --home ${nodeHomeDir}`)
- genesis = fs.readJSONSync(genesisLocation)
+ const genesisLocation = path.join(nodeHomeDir, `config/genesis.json`)
+ const genesis = require(genesisLocation)
return genesis
}
@@ -100,21 +86,27 @@ async function makeValidator(
moniker,
chainId,
operatorSignInfo = {
- keyName: `local`,
+ keyName: `${moniker}-operator`,
password: `1234567890`,
clientHomeDir: cliHome
}
) {
- let valPubKey = await getValPubKey(nodeHome)
- let { address } = await createKey(operatorSignInfo)
- await sendTokens(mainSignInfo, `10STAKE`, address, chainId)
+ const valPubKey = await getValPubKey(nodeHome)
+ const account = await createKey(operatorSignInfo)
+
+ const address = account.address
+ await sendTokens(
+ mainSignInfo,
+ `${defaultStakedPerValidator}stake`,
+ address,
+ chainId
+ )
+ console.log(`Waiting for funds to delegate`)
while (true) {
- console.log(`Waiting for funds to delegate`)
try {
await sleep(1000)
await getBalance(cliHome, address)
} catch (error) {
- console.error(error) // kept in here to see if something unexpected fails
continue
}
break
@@ -129,15 +121,15 @@ async function makeValidator(
}
async function getValPubKey(node_home) {
- let command = `${nodeBinary} tendermint show-validator --home ${node_home}`
+ const command = `${nodeBinary} tendermint show-validator --home ${node_home}`
return await makeExec(command)
}
async function getNodeId(node_home) {
- let command = `${nodeBinary} tendermint show-node-id --home ${node_home}`
+ const command = `${nodeBinary} tendermint show-node-id --home ${node_home}`
return await makeExec(command)
}
async function getBalance(cliHome, address) {
- let command = `${cliBinary} query account ${address} --home ${cliHome} --output "json" --trust-node`
+ const command = `${cliBinary} query account ${address} --home ${cliHome} --output "json" --trust-node`
return JSON.parse(await makeExec(command))
}
@@ -149,11 +141,11 @@ async function declareValidator(
operatorAddress,
chainId
) {
- let command =
- `${cliBinary} tx stake create-validator` +
+ const command =
+ `${cliBinary} tx staking create-validator` +
` --home ${clientHomeDir}` +
` --from ${keyName}` +
- ` --amount=10STAKE` +
+ ` --amount=${defaultStakedPerValidator}stake` +
` --pubkey=${valPubKey}` +
` --address-delegator=${operatorAddress}` +
` --moniker=${moniker}` +
@@ -161,7 +153,8 @@ async function declareValidator(
` --commission-max-change-rate=0` +
` --commission-max-rate=0` +
` --commission-rate=0` +
- ` --json`
+ ` --min-self-delegation=1` +
+ ` --output=json`
return makeExecWithInputs(command, [password])
}
@@ -172,12 +165,12 @@ async function sendTokens(
toAddress,
chainId
) {
- let command =
+ const command =
`${cliBinary} tx send` +
+ ` ${toAddress}` +
+ ` ${tokenString}` +
` --home ${clientHomeDir}` +
` --from ${keyName}` +
- ` --amount=${tokenString}` +
- ` --to=${toAddress}` +
` --chain-id=${chainId}`
return makeExecWithInputs(command, [password], false)
}
@@ -191,7 +184,7 @@ function startLocalNode(
nodeOneId = ``
) {
return new Promise((resolve, reject) => {
- let command = `${nodeBinary} start --home ${nodeHome}` // TODO add --minimum_fees 1STAKE here
+ let command = `${nodeBinary} start --home ${nodeHome}` // TODO add --minimum_fees 1stake here
if (number > 1) {
const port = getStartPort(number)
// setup different ports
@@ -200,14 +193,16 @@ function startLocalNode(
// set the first node as a persistent peer
command += ` --p2p.persistent_peers="${nodeOneId}@localhost:${defaultStartPort}"`
}
- console.log(command)
+ if (process.env.VERBOSE) {
+ console.log(`$ ` + command)
+ }
const localnodeProcess = spawn(command, { shell: true })
// log output for debugging
const logPath = path.join(nodeHome, `process.log`)
console.log(`Redirecting node ` + number + ` output to ` + logPath)
fs.createFileSync(logPath)
- let logStream = fs.createWriteStream(logPath, { flags: `a` })
+ const logStream = fs.createWriteStream(logPath, { flags: `a` })
localnodeProcess.stdout.pipe(logStream)
localnodeProcess.stderr.pipe(process.stderr)
@@ -219,7 +214,7 @@ function startLocalNode(
// wait for a message about a block being produced
function listener(data) {
- let msg = data.toString()
+ const msg = data.toString()
if (msg.includes(`Executed block`)) {
localnodeProcess.stdout.removeListener(`data`, listener)
@@ -238,7 +233,10 @@ function startLocalNode(
// execute command and return stdout
function makeExec(command) {
- console.log(`$ ` + command)
+ if (process.env.VERBOSE) {
+ console.log(`$ ` + command)
+ }
+
return util
.promisify(exec)(command)
.then(({ stdout }) => stdout.trim())
@@ -246,10 +244,12 @@ function makeExec(command) {
// execute command, write all inputs followed by enter to stdin and return stdout
function makeExecWithInputs(command, inputs = [], json = true) {
- console.log(`$ ` + command)
+ if (process.env.VERBOSE) {
+ console.log(`$ ` + command)
+ }
- let binary = command.split(` `)[0]
- let args = command.split(` `).slice(1)
+ const binary = command.split(` `)[0]
+ const args = command.split(` `).slice(1)
return new Promise((resolve, reject) => {
const child = spawn(binary, args)
@@ -258,8 +258,10 @@ function makeExecWithInputs(command, inputs = [], json = true) {
child.stdout.on(`error`, console.error)
child.stdin.on(`error`, console.error)
- child.stderr.pipe(process.stderr)
- child.stdout.pipe(process.stdout)
+ if (process.env.VERBOSE) {
+ child.stderr.pipe(process.stderr)
+ child.stdout.pipe(process.stdout)
+ }
inputs.forEach(input => {
child.stdin.write(`${input}\n`)
})
diff --git a/tasks/publish.js b/tasks/publish.js
index e38dc4bd39..87e683c451 100644
--- a/tasks/publish.js
+++ b/tasks/publish.js
@@ -6,13 +6,11 @@ const path = require(`path`)
const release = require(`publish-release`)
const util = require(`util`)
-const assetsDir = path.join(__dirname, `../builds/Voyager`)
-
const recentChanges = changeLog =>
changeLog.match(/.+?## .+?\n## .+?\n\n(.+?)\n## /s)[1]
const createNotes = changeLog => `NOTE: DO NOT ENTER YOUR FUNDRAISER SEED. THIS SOFTWARE HAS NOT BEEN AUDITED.
-NEVER ENTER YOUR FUNDRAISER SEED 12 WORDS ONTO AN ONLINE COMPUTER.
+NEVER ENTER YOUR FUNDRAISER SEED 24 WORDS ONTO AN ONLINE COMPUTER.
Even when we do start supporting fundraiser seeds, don't use it except for
testing or with small amounts. We will release a CLI to use for offline signing
@@ -28,8 +26,7 @@ const publishRelease = ({ notes, tag, token }) =>
tag,
name: `Cosmos Voyager Alpha ${tag} (UNSAFE)`,
notes,
- prerelease: true,
- assets: fs.readdirSync(assetsDir).map(file => path.join(assetsDir, file))
+ prerelease: true
})
if (require.main === module) {
diff --git a/tasks/runner.js b/tasks/runner.js
deleted file mode 100644
index 00a96956d4..0000000000
--- a/tasks/runner.js
+++ /dev/null
@@ -1,100 +0,0 @@
-"use strict"
-const fs = require(`fs`)
-const config = require(`../app/src/config`)
-const spawn = require(`child_process`).spawn
-const path = require(`path`)
-const { cleanExitChild } = require(`./common.js`)
-
-let YELLOW = `\x1b[33m`
-let BLUE = `\x1b[34m`
-let END = `\x1b[0m`
-
-let NPM_BIN = path.join(path.dirname(__dirname), `node_modules`, `.bin`)
-let PATH = `${NPM_BIN}:${process.env.PATH}`
-
-const format = (command, data, color) =>
- `${color}${command}${END} ${data
- .toString()
- .trim()
- .replace(/\n/g, `\n${` `.repeat(command.length + 2)}`)}\n`
-
-function run(command, color, name, env) {
- env = Object.assign({ PATH }, env)
- let child = spawn(command, { env, shell: true })
- child.stdout.on(`data`, data => {
- console.log(format(name, data, color))
- })
- child.stderr.on(`data`, data => {
- console.error(format(name, data, color))
- })
- child.on(`exit`, code => {
- console.log(`exited`, command, code)
- })
- return child
-}
-
-function startRendererServer() {
- return new Promise(resolve => {
- console.log(`${YELLOW}Starting webpack-dev-server...\n${END}`)
- let child = run(
- `webpack-dev-server --hot --colors --config webpack.renderer.config.js --port ${
- config.wds_port
- } --content-base app/dist`,
- YELLOW,
- `webpack`
- )
- let waitForCompile = data => {
- if (!data.toString().includes(`Compiled`)) return
- child.stdout.removeListener(`data`, waitForCompile)
- resolve(child)
- }
- child.stdout.on(`data`, waitForCompile)
- })
-}
-
-module.exports = async function(networkPath, extendedEnv = {}) {
- if (!fs.existsSync(networkPath)) {
- console.error(
- `The network configuration for the network you want to connect to doesn't exist. Have you run \`yarn build:testnets\` to download the latest configurations?`
- )
- process.exit()
- }
-
- let renderProcess = await startRendererServer()
-
- console.log(
- `${BLUE}Starting electron...\n (network path: ${networkPath})\n${END}`
- )
- const packageJSON = require(`../package.json`)
- const voyagerVersion = packageJSON.version
- const gaiaVersion = fs
- .readFileSync(path.join(networkPath, `gaiaversion.txt`))
- .toString()
- .split(`-`)[0]
- let env = Object.assign(
- {},
- {
- NODE_ENV: `development`,
- COSMOS_NETWORK: networkPath,
- GAIA_VERSION: gaiaVersion,
- VOYAGER_VERSION: voyagerVersion
- },
- extendedEnv,
- process.env
- )
- let mainProcess = run(
- `electron app/src/main/index.dev.js`,
- BLUE,
- `electron`,
- env
- )
-
- // terminate running processes on exit of main process
- mainProcess.on(`exit`, async () => {
- await cleanExitChild(renderProcess)
- // webpack-dev-server spins up an own process we have no access to. so we kill all processes on our port
- process.exit(0)
- })
-
- return [renderProcess, mainProcess]
-}
diff --git a/tasks/test-build.js b/tasks/test-build.js
index 9d5153e844..e7078f6fbd 100644
--- a/tasks/test-build.js
+++ b/tasks/test-build.js
@@ -16,7 +16,7 @@ function test(executablePath) {
child.stdout.pipe(process.stdout)
child.stdout.on(`data`, async data => {
- let msg = Buffer.from(data, `utf-8`).toString()
+ const msg = Buffer.from(data, `utf-8`).toString()
if (msg.indexOf(`[START SUCCESS]`) !== -1) {
clearTimeout(wait)
await cleanExitChild(child)
@@ -24,7 +24,7 @@ function test(executablePath) {
}
})
- let wait = setTimeout(async () => {
+ const wait = setTimeout(async () => {
await cleanExitChild(child)
reject()
}, 5000)
@@ -37,7 +37,7 @@ function test(executablePath) {
}
async function main() {
- let executablePath = process.argv[2]
+ const executablePath = process.argv[2]
if (!executablePath) {
console.error(
diff --git a/tasks/testnet.js b/tasks/testnet.js
index 59269026b0..d371ddff31 100644
--- a/tasks/testnet.js
+++ b/tasks/testnet.js
@@ -1,59 +1,43 @@
"use strict"
-let runner = require(`./runner.js`)
-let config = require(`../app/src/config.js`)
const fs = require(`fs-extra`)
const { join, resolve } = require(`path`)
-const {
- startNodes,
- buildNodes,
- setupAccounts
-} = require(`./build/local/helper`)
+const { startNodes, buildNodes } = require(`./build/local/helper`)
+const { getNodeId, startLocalNode } = require(`./gaia`)
const appDir = resolve(`${__dirname}/../`)
const buildTestnetPath = join(appDir, `builds`, `testnets`)
async function main() {
- const network = process.argv[2] || config.default_network
- const numberNodes = parseInt(process.argv[3], 10) || 1
+ const network = `local-testnet`
+ const numberNodes = parseInt(process.argv[2], 10) || 1
+ const skipRebuild = process.argv[3] === `skip-rebuild`
+ const targetDir = join(buildTestnetPath, network)
- let extendedEnv = {}
- let networkPath = `./app/networks/${network}/`
+ if (skipRebuild) {
+ const nodeHomePrefix = join(targetDir, `node_home`)
- if (network === `local-testnet`) {
+ const nodeOneId = await getNodeId(nodeHomePrefix + `_1`)
+ for (let i = 1; i < numberNodes + 1; i++) {
+ const home = `${nodeHomePrefix}_${i}`
+ startLocalNode(home, i, nodeOneId)
+ }
+ } else {
const { cliHomePrefix, nodes, mainAccountSignInfo } = await buildNodes(
- join(buildTestnetPath, network),
+ targetDir,
{
chainId: network,
password: `1234567890`,
- overwrite: false,
+ overwrite: true,
moniker: `local`,
- keyName: `main-account`
+ keyName: `account-with-funds`
},
numberNodes
)
await startNodes(nodes, mainAccountSignInfo, network)
fs.copySync(join(nodes[1].home, `config`), cliHomePrefix)
- let { version } = require(`../package.json`)
+ const { version } = require(`../package.json`)
fs.writeFileSync(`${cliHomePrefix}/app_version`, version)
- networkPath = cliHomePrefix // join(nodes[1].home, `config`)
- extendedEnv = {
- LCD_URL: `https://localhost:9070`,
- RPC_URL: `http://localhost:26657`,
- COSMOS_HOME: cliHomePrefix
- }
- await setupAccounts(nodes[1].cliHome, join(cliHomePrefix, `lcd`), {
- keyName: `local-test`
- })
}
-
- // run Voyager in a development environment
- let children = await runner(networkPath, extendedEnv)
-
- // kill all development processes if master process fails
- process.on(`exit`, () => {
- children.forEach(child => child.kill(`SIGKILL`))
- })
- children.forEach(child => child.on(`exit`, () => process.exit()))
}
main().catch(function(error) {
diff --git a/tasks/windows-installer.js b/tasks/windows-installer.js
deleted file mode 100644
index 94a8ab8d95..0000000000
--- a/tasks/windows-installer.js
+++ /dev/null
@@ -1,22 +0,0 @@
-"use strict"
-
-const electronInstaller = require(`electron-winstaller`)
-const { author, version } = require(`../package.json`)
-
-// Installer is customizable: https://github.com/electron/windows-installer
-let resultPromise = electronInstaller.createWindowsInstaller({
- appDirectory: `./builds/cosmos-voyager-win32-x64`,
- outputDirectory: `./builds/cosmos/cosmos-voyager-win32`,
- title: `Cosmos Voyager`,
- authors: author,
- exe: `Cosmos Voyager.exe`,
- setupExe: `Cosmos-Voyager-Setup-v${version}.exe`,
- iconUrl: `https://github.com/cosmos/voyager/raw/develop/app/icons/icon.ico`,
- setupIcon: `./app/icons/icon.ico`,
- noMsi: true
-})
-
-return resultPromise.then(
- () => console.log(`It worked!`),
- e => console.log(`No dice: ${e.message}`)
-)
diff --git a/test/browserstack-logo-600x315.png b/test/browserstack-logo-600x315.png
new file mode 100644
index 0000000000..5a0cea27a1
Binary files /dev/null and b/test/browserstack-logo-600x315.png differ
diff --git a/test/e2e/common.js b/test/e2e/common.js
index 847bb92400..f8f434c7e6 100644
--- a/test/e2e/common.js
+++ b/test/e2e/common.js
@@ -68,7 +68,7 @@ module.exports = {
},
sleep,
async waitForText(elGetterFn, text, timeout = 5000) {
- let start = Date.now()
+ const start = Date.now()
while ((await elGetterFn().getText()) !== text) {
if (Date.now() - start >= timeout) {
throw Error(
@@ -80,7 +80,7 @@ module.exports = {
}
},
async waitForValue(elGetterFn, value, timeout = 5000) {
- let start = Date.now()
+ const start = Date.now()
while ((await elGetterFn().getValue()) !== value) {
if (Date.now() - start >= timeout) {
throw Error(
@@ -95,7 +95,7 @@ module.exports = {
},
async login(app, account = `default`) {
console.log(`logging into ` + account)
- let accountsSelect = `#sign-in-name select`
+ const accountsSelect = `#sign-in-name select`
await app.client.waitForExist(accountsSelect, 10000)
@@ -112,7 +112,7 @@ module.exports = {
// checking if user is logged in
await module.exports.openMenu(app)
- let activeUser = await app.client.$(`#address`).getText()
+ const activeUser = await app.client.$(`#address`).getText()
if (!activeUser) {
throw new Error(
`Incorrect user logged in (` + account + `, ` + activeUser + `)`
@@ -139,7 +139,7 @@ module.exports = {
},
async selectOption(app, selectSelector, text) {
await app.client.$(selectSelector).click()
- for (let letter of text.split()) {
+ for (const letter of text.split()) {
if ((await app.client.$(selectSelector).getValue()) === text) break
await app.client.keys(letter)
}
diff --git a/test/e2e/delegation.js b/test/e2e/delegation.js
index f80b055507..6d5c635cff 100644
--- a/test/e2e/delegation.js
+++ b/test/e2e/delegation.js
@@ -1,6 +1,6 @@
-let test = require(`tape-promise/tape`)
-let { getApp, restart } = require(`./launch.js`)
-let {
+const test = require(`tape-promise/tape`)
+const { getApp, restart } = require(`./launch.js`)
+const {
navigate,
login,
sleep,
@@ -12,7 +12,7 @@ let {
*/
test(`delegation`, async function(t) {
- let { app } = await getApp(t)
+ const { app } = await getApp(t)
// app.env.COSMOS_MOCKED = false
await restart(app)
@@ -20,11 +20,11 @@ test(`delegation`, async function(t) {
await navigate(app, `Staking`)
// default values from e2e mounted node
- let bondedStake = 100
+ const bondedStake = 100
t.test(`Validators`, async function(t) {
// Select the Validators tab.
- await app.client.click(`//a[. = 'Validators']`)
+ await app.client.click(`//a[normalize-space() = 'Validators']`)
t.equal(
(await app.client.$$(`.li-validator`)).length,
@@ -60,17 +60,17 @@ test(`delegation`, async function(t) {
})
t.test(`Stake`, async t => {
- let totalAtoms = (await app.client
+ const totalAtoms = (await app.client
.$(`.header-balance .total-atoms h2`)
.getText()).split(`.`)[0] // 130.000...
- let unbondedAtoms = (await app.client
+ const unbondedAtoms = (await app.client
.$(`.header-balance .unbonded-atoms h2`)
.getText()).split(`.`)[0] // 30.000...
await t.equal(totalAtoms, `130`, `i have 130 Atoms`)
await t.equal(unbondedAtoms, `30`, `i have 30 unbounded Atoms`)
// Select the second validator.
- await app.client.click(`//*[. = 'local_2']`)
+ await app.client.click(`//*[normalize-space() = 'local_2']`)
// For some reason we need to sleep at this point in order to prevent the
// following error:
@@ -82,11 +82,11 @@ test(`delegation`, async function(t) {
await sleep(500)
await app.client
- .click(`//button/*[. = 'Delegate']`)
+ .click(`//button/*[normalize-space() = 'Delegate']`)
.setValue(`#amount`, 10)
.setValue(`#password`, `1234567890`)
.click(
- `//*[@id = 'delegation-modal']//button//*[. = 'Confirm Delegation']`
+ `//*[@id = 'delegation-modal']//button//*[normalize-space() = 'Submit']`
)
.waitForVisible(
`//*[. = 'You have successfully delegated your STAKEs']`,
@@ -94,12 +94,12 @@ test(`delegation`, async function(t) {
)
// Go back to Staking page.
- .click(`//a//*[. = 'Staking']`)
+ .click(`//a//*[normalize-space() = 'Staking']`)
console.log(`Testing total balance`)
await waitForText(
() => app.client.$(`.header-balance .total-atoms h2`),
- `${parseInt(totalAtoms) - 10}.0000…`,
+ `${parseInt(totalAtoms)}.0000…`,
10 * 1000
)
console.log(`Testing unbonded balance`)
@@ -117,11 +117,12 @@ test(`delegation`, async function(t) {
t.test(`Undelegate`, async t => {
await app.client
+ .waitForVisible(`//a[normalize-space() = 'Validators']`)
// Select the Validators tab.
- .click(`//a[. = 'Validators']`)
+ .click(`//a[normalize-space() = 'Validators']`)
// Select the second validator.
- .click(`//*[. = 'local_1']`)
+ .click(`//*[normalize-space() = 'local_1']`)
// For some reason we need to sleep at this point in order to prevent the
// following error:
@@ -133,17 +134,19 @@ test(`delegation`, async function(t) {
await sleep(500)
await app.client
- .click(`//button/*[. = 'Undelegate']`)
+ .click(`//button/*[normalize-space() = 'Undelegate']`)
.setValue(`#amount`, 5)
.setValue(`#password`, `1234567890`)
- .click(`//*[@id = 'undelegation-modal']//button//*[. = 'Undelegate']`)
+ .click(
+ `//*[@id = 'undelegation-modal']//button//*[normalize-space() = 'Submit']`
+ )
.waitForVisible(
`//*[. = 'You have successfully undelegated 5 STAKEs.']`,
5 * 1000
)
// Go back to Staking page.
- .click(`//a//*[. = 'Staking']`)
+ .click(`//a//*[normalize-space() = 'Staking']`)
await closeNotifications(app)
// Shouldn't be necessary but see
@@ -172,7 +175,7 @@ test(`delegation`, async function(t) {
t.test(`Parameters`, async function(t) {
await navigate(app, `Staking`)
- await app.client.click(`//a[. = 'Parameters']`)
+ await app.client.click(`//a[normalize-space() = 'Parameters']`)
await t.ok(
await app.client.waitForVisible(
`//h3[contains(text(), "Staking Pool")]`,
diff --git a/test/e2e/governance.js b/test/e2e/governance.js
index b45d829100..2645b0ca52 100644
--- a/test/e2e/governance.js
+++ b/test/e2e/governance.js
@@ -1,8 +1,8 @@
"use strict"
-let test = require(`tape-promise/tape`)
-let { getApp, restart } = require(`./launch.js`)
-let {
+const test = require(`tape-promise/tape`)
+const { getApp, restart } = require(`./launch.js`)
+const {
navigate,
login,
closeNotifications,
@@ -13,9 +13,9 @@ let {
*/
test(`Governance`, async function(t) {
- let { app } = await getApp(t)
+ const { app } = await getApp(t)
await restart(app)
- let $ = (...args) => app.client.$(...args)
+ const $ = (...args) => app.client.$(...args)
await login(app, `testkey`)
await navigate(app, `Governance`)
@@ -32,14 +32,13 @@ test(`Governance`, async function(t) {
})
t.test(`submit proposal`, async function(t) {
- let balance = parseInt(
+ const balance = parseInt(
(await app.client.$(`.total-atoms__value`).getText()).split(`.`)[0]
)
- await app.client.$(`#propose-btn`).click()
- await t.ok(
- await app.client.$(`#modal-propose`).isVisible(),
- `opens modal proposal`
- )
+ await app.client
+ .$(`#propose-btn`)
+ .click()
+ .waitForVisible(`#modal-propose`)
await app.client
.setValue(`#title`, `E2E test proposal title`)
.setValue(`#description`, `E2E test proposal title`)
@@ -47,7 +46,7 @@ test(`Governance`, async function(t) {
.setValue(`#password`, `1234567890`)
await t.ok(
await app.client
- .click(`//button/*[. = 'Submit proposal']`)
+ .click(`//button/*[. = 'Submit']`)
.waitForVisible(
`//*[. = 'You have successfully submitted a new text proposal']`,
4 * 1000
@@ -83,27 +82,28 @@ test(`Governance`, async function(t) {
})
t.test(`deposit`, async function(t) {
- let balance = parseInt(
+ const balance = parseInt(
(await app.client.$(`.total-atoms__value`).getText()).split(`.`)[0]
)
- let deposit = () =>
+ const deposit = () =>
$(`//dt[contains(text(), "Deposit")]`)
.$(`..`)
.$(`dd`)
- let amount = parseInt((await deposit().getText()).split(` `)[0])
+ const amount = parseInt((await deposit().getText()).split(` `)[0])
await t.ok(
await app.client.$(`.page-profile__status.yellow`).isVisible(),
`the proposal is open for deposits`
)
- await app.client.$(`#deposit-btn`).click()
- await t.ok(
- await app.client.$(`#modal-deposit`).isVisible(),
- `opens deposit modal`
- )
+ await app.client
+ .$(`#deposit-btn`)
+ .click()
+ .waitForVisible(`#modal-deposit`)
await app.client.setValue(`#amount`, 10).setValue(`#password`, `1234567890`)
await t.ok(
await app.client
- .$(`#submit-deposit`)
+ .$(
+ `//*[@id = 'modal-deposit']//button//*[normalize-space() = 'Submit']`
+ )
.click()
.waitForVisible(
`//*[. = 'You have successfully deposited your STAKEs on proposal #1']`,
@@ -111,7 +111,7 @@ test(`Governance`, async function(t) {
),
`successful deposit`
)
- let newAmount = parseInt((await deposit().getText()).split(` `)[0])
+ const newAmount = parseInt((await deposit().getText()).split(` `)[0])
t.equal(
newAmount,
amount + 10,
@@ -133,17 +133,16 @@ test(`Governance`, async function(t) {
await app.client.$(`.page-profile__status.green`).isVisible(),
`the proposal is open for voting`
)
- await app.client.$(`#vote-btn`).click()
- await t.ok(
- await app.client.$(`#modal-vote`).isVisible(),
- `opens voting modal`
- )
+ await app.client
+ .$(`#vote-btn`)
+ .click()
+ .waitForVisible(`#modal-vote`)
await app.client.$(`#vote-yes`).click()
await app.client.setValue(`#password`, `1234567890`)
await t.ok(
await app.client
- .$(`#cast-vote`)
+ .$(`//*[@id = 'modal-vote']//button//*[normalize-space() = 'Submit']`)
.click()
.waitForVisible(
`//*[. = 'You have successfully voted Yes on proposal #1']`,
diff --git a/test/e2e/init.js b/test/e2e/init.js
index 647097c1c1..91a895f294 100644
--- a/test/e2e/init.js
+++ b/test/e2e/init.js
@@ -1,13 +1,13 @@
"use strict"
-let test = require(`tape-promise/tape`)
-let fs = require(`fs-extra`)
-let { join } = require(`path`)
-let { getApp, startApp, stop } = require(`./launch.js`)
+const test = require(`tape-promise/tape`)
+const fs = require(`fs-extra`)
+const { join } = require(`path`)
+const { getApp, startApp, stop } = require(`./launch.js`)
// tests for initialization and failover over the application as well as handling of configuration files
test(`initialization`, async function(t) {
- let { app, cliHome } = await getApp(t)
+ const { app, cliHome } = await getApp(t)
t.test(`survive config folder mess up`, async function(t) {
// TODO: uncomment below once we restore initting
diff --git a/test/e2e/launch.js b/test/e2e/launch.js
index 4720ce5f44..f5df161e50 100644
--- a/test/e2e/launch.js
+++ b/test/e2e/launch.js
@@ -1,16 +1,20 @@
"use strict"
-let { Application } = require(`spectron`)
-let test = require(`tape-promise/tape`)
-let electron = require(`electron`)
-let { join } = require(`path`)
-let fs = require(`fs-extra`)
+const { Application } = require(`spectron`)
+const test = require(`tape-promise/tape`)
+const electron = require(`electron`)
+const { join } = require(`path`)
+const fs = require(`fs-extra`)
const {
setupAccounts,
buildNodes,
startNodes
} = require(`../../tasks/build/local/helper`)
-let { cliBinary, nodeBinary, defaultStartPort } = require(`../../tasks/gaia.js`)
+const {
+ cliBinary,
+ nodeBinary,
+ defaultStartPort
+} = require(`../../tasks/gaia.js`)
const testDir = join(__dirname, `..`, `..`, `testArtifacts`)
let app, started, crashed
@@ -62,7 +66,7 @@ function launch(t) {
await stop(app)
// setup additional accounts for testing
- let accounts = await setupAccounts(cliHome, join(cliHomePrefix, `lcd`))
+ const accounts = await setupAccounts(cliHome, join(cliHomePrefix, `lcd`))
await startApp(app, `.tm-session-title=Sign In`)
t.ok(app.isRunning(), `app is running`)
diff --git a/test/e2e/preferences.js b/test/e2e/preferences.js
index 3f8f61b007..db98859672 100644
--- a/test/e2e/preferences.js
+++ b/test/e2e/preferences.js
@@ -1,24 +1,23 @@
"use strict"
-let test = require(`tape-promise/tape`)
-let { getApp, restart } = require(`./launch.js`)
-let { navigateToPreferences, login } = require(`./common.js`)
+const test = require(`tape-promise/tape`)
+const { getApp, restart } = require(`./launch.js`)
+const { navigateToPreferences, login } = require(`./common.js`)
/*
* NOTE: don't use a global `let client = app.client` as the client object changes when restarting the app
*/
test(`preferences`, async function(t) {
- let { app } = await getApp(t)
- let $ = (...args) => app.client.$(...args)
+ const { app } = await getApp(t)
+ const $ = (...args) => app.client.$(...args)
await restart(app)
await login(app, `testkey`)
await navigateToPreferences(app)
t.test(`shows preferences`, async function(t) {
- t.ok(await $(`div*=Settings`).waitForExist(), `shows Settings`)
- t.ok(await $(`div*=Account`).waitForExist(), `shows Account`)
+ t.ok(await $(`div*=Node IP`).waitForExist(), `shows Node IP`)
t.end()
})
diff --git a/test/e2e/signin.js b/test/e2e/signin.js
index 5e1cabae0f..395f3a1053 100644
--- a/test/e2e/signin.js
+++ b/test/e2e/signin.js
@@ -1,8 +1,8 @@
"use strict"
-let test = require(`tape-promise/tape`)
-let { getApp, refresh } = require(`./launch.js`)
-let { openMenu, login, sleep } = require(`./common.js`)
+const test = require(`tape-promise/tape`)
+const { getApp, refresh } = require(`./launch.js`)
+const { openMenu, login, sleep } = require(`./common.js`)
/*
* NOTE: For some strange reason element.click() does not always work. In some cases I needed to use client.leftClick(selector). But this will be deprecated and pollutes the console with a deprecation warning.
@@ -13,9 +13,9 @@ let { openMenu, login, sleep } = require(`./common.js`)
*/
test(`sign in`, async function(t) {
- let { app } = await getApp(t)
+ const { app } = await getApp(t)
await refresh(app)
- let el = (...args) => app.client.$(...args)
+ const el = (...args) => app.client.$(...args)
app.browserWindow.setBounds({ x: 0, y: 0, width: 1600, height: 1024 })
app.browserWindow.setSize(1600, 1024)
// clicking the button does fail in webdriver as there is no actual click handler on the button
@@ -41,10 +41,10 @@ test(`sign in`, async function(t) {
await sleep(500) // circleci error where the checkbox somehow isn't ready to be clicked yet
- let accountName = () => el(`#sign-up-name`)
- let password = () => el(`#sign-up-password`)
- let passwordConfirm = () => el(`#sign-up-password-confirm`)
- let warning = () => el(`#sign-up-warning`)
+ const accountName = () => el(`#sign-up-name`)
+ const password = () => el(`#sign-up-password`)
+ const passwordConfirm = () => el(`#sign-up-password-confirm`)
+ const warning = () => el(`#sign-up-warning`)
t.test(`did check warning`, async function(t) {
await clickContinue()
@@ -155,7 +155,7 @@ test(`sign in`, async function(t) {
// checking if user is logged in
await app.client.waitForExist(`#app-content`, 10000)
await openMenu(app)
- let activeUser = await app.client.$(`#address`).getText()
+ const activeUser = await app.client.$(`#address`).getText()
t.ok(activeUser.startsWith(`cosmos`), `user is logged in`)
t.end()
@@ -190,10 +190,10 @@ test(`sign in`, async function(t) {
.$(`..`)
.click()
- let accountName = () => el(`#import-name`)
- let password = () => el(`#import-password`)
- let passwordConfirm = () => el(`#import-password-confirmation`)
- let seed = () => el(`#import-seed`)
+ const accountName = () => el(`#import-name`)
+ const password = () => el(`#import-password`)
+ const passwordConfirm = () => el(`#import-password-confirmation`)
+ const seed = () => el(`#import-seed`)
t.test(`set account name`, async function(t) {
await clickContinue()
@@ -304,7 +304,7 @@ test(`sign in`, async function(t) {
// checking if user is logged in
await app.client.waitForExist(`#app-content`, 5000)
await openMenu(app)
- let activeUser = await app.client.$(`#address`).getText()
+ const activeUser = await app.client.$(`#address`).getText()
t.ok(activeUser.startsWith(`cosmos`), `user is logged in`)
t.end()
diff --git a/test/e2e/wallet.js b/test/e2e/wallet.js
index fef7b2ce8e..ea48030e5c 100644
--- a/test/e2e/wallet.js
+++ b/test/e2e/wallet.js
@@ -1,31 +1,28 @@
"use strict"
-let test = require(`tape-promise/tape`)
-let { getApp, restart } = require(`./launch.js`)
-let {
+const test = require(`tape-promise/tape`)
+const { getApp, restart } = require(`./launch.js`)
+const {
navigate,
waitForText,
login,
closeNotifications
} = require(`./common.js`)
-let {
- addresses
-} = require(`../../app/src/renderer/connectors/lcdClientMock.js`)
/*
* NOTE: don't use a global `let client = app.client` as the client object changes when restarting the app
*/
test(`wallet`, async function(t) {
- let { app, accounts } = await getApp(t)
+ const { app, accounts } = await getApp(t)
// app.env.COSMOS_MOCKED = false
await restart(app)
- let $ = (...args) => app.client.$(...args)
+ const $ = (...args) => app.client.$(...args)
await login(app, `testkey`)
- let balanceEl = denom => {
+ const balanceEl = denom => {
return app.client.waitForExist(`.coin-denom=${denom}`, 20000).then(() =>
$(`.coin-denom=${denom}`)
.$(`..`)
@@ -39,124 +36,51 @@ test(`wallet`, async function(t) {
t.equal((await app.client.$$(`.li-coin`)).length, 2, `it shows all 2 coins`)
// denom
await t.ok(
- await app.client.$(`.coin-denom=Stake`).isVisible(),
+ await app.client.$(`.coin-denom=STAKE`).isVisible(),
`show coin stake`
)
await t.ok(
- await app.client.$(`.coin-denom=Localcoin`).isVisible(),
+ await app.client.$(`.coin-denom=localcoin`).isVisible(),
`show coin localcoin`
)
t.end()
})
t.test(`send`, async function(t) {
- async function goToSendPage() {
+ async function showSendModal() {
await navigate(app, `Wallet`)
- await app.client
- .$(`.coin-denom=Localcoin`)
- .$(`..`)
- .$(`..`)
- .$(`a`)
- .$(`button`)
- .click()
+ await app.client.click(
+ `//*[@id = 'li-coin--localcoin']//button//*[normalize-space() = 'Send']`
+ )
}
- await navigate(app, `Wallet`)
+ const sendBtn = () =>
+ $(`//*[@id = 'send-modal']//button//*[normalize-space() = 'Submit']`)
+ const addressInput = () => $(`#send-address`)
+ const amountInput = () => $(`#amount`)
+ const defaultBalance = 1000.0
- let sendBtn = () => $(`.tm-form-footer button`)
- let addressInput = () => $(`#send-address`)
- let amountInput = () => $(`#send-amount`)
- let defaultBalance = 1000.0
t.test(`Localcoin balance before sending`, async function(t) {
await app.client.waitForExist(
`//span[contains(text(), "Send")]`,
15 * defaultBalance
)
- let LocalcoinEl = balanceEl(`Localcoin`)
+ const LocalcoinEl = balanceEl(`localcoin`)
await waitForText(() => LocalcoinEl, `1,000.0000000000`)
t.end()
})
- t.test(`hit send with empty form`, async function(t) {
- await goToSendPage()
- await sendBtn().click()
- t.equal(await sendBtn().getText(), `Send Tokens`, `not sending`)
- t.end()
- })
-
- t.test(`address w/ less than or greater than 40 chars`, async function(t) {
- await goToSendPage()
- await addressInput().setValue(`012345`)
- await amountInput().setValue(`100`)
- await app.client.setValue(`#password`, `1234567890`)
- await sendBtn().click()
- await $(`div*=Address is invalid bech32`).waitForExist()
- t.pass(`got correct error message`)
- await sendBtn().click()
- t.equal(await sendBtn().getText(), `Send Tokens`, `not sending`)
-
- let fourtyOneZeros = `01234` + `0`.repeat(36)
-
- await addressInput().setValue(fourtyOneZeros)
-
- await sendBtn().click()
- await $(`div*=Address is invalid bech32`).waitForExist()
- t.pass(`got correct error message`)
- await sendBtn().click()
- t.equal(await sendBtn().getText(), `Send Tokens`, `not sending`)
-
- t.end()
- })
-
- t.test(`address not alphaNum`, async function(t) {
- await goToSendPage()
- await addressInput().setValue(`~`.repeat(40))
- await app.client.setValue(`#password`, `1234567890`)
- await $(`div*=Address is invalid bech32`).waitForExist()
- t.pass(`got correct error message`)
-
- await sendBtn().click()
- t.equal(await sendBtn().getText(), `Send Tokens`, `not sending`)
- t.end()
- })
-
- t.test(`correct address mis-typed`, async function(t) {
- await goToSendPage()
- let validAddress = addresses[0]
- let invalidAddress = validAddress.slice(0, -1) + `4`
- await addressInput().setValue(invalidAddress)
- await amountInput().setValue(`100`)
- await app.client.setValue(`#password`, `1234567890`)
- await $(`div*=Address is invalid bech32`).waitForExist()
- t.pass(`got correct error message`)
-
- await sendBtn().click()
- t.equal(await sendBtn().getText(), `Send Tokens`, `not sending`)
- t.end()
- })
-
- t.test(`amount set`, async function(t) {
- await goToSendPage()
- await addressInput().setValue(``)
- await amountInput().setValue(`100`)
- await sendBtn().click()
- t.equal(await sendBtn().getText(), `Send Tokens`, `not sending`)
- t.end()
- })
-
t.test(`send`, async function(t) {
- await goToSendPage()
- await amountInput().setValue(`100`)
+ await showSendModal()
await addressInput().setValue(accounts[1].address)
+ await amountInput().setValue(`10`)
await app.client.setValue(`#password`, `1234567890`)
await sendBtn().click()
- // the confirmation popup will open
- await app.client.$(`#send-confirmation-btn`).click()
await app.client.waitForExist(`.tm-notification`, 10 * 1000)
- let msg = await app.client.$(`.tm-notification .body`).getText()
+ const msg = await app.client.$(`.tm-notification .body`).getText()
t.ok(msg.includes(`Success`), `Send successful`)
// close the notifications to have a clean setup for the next tests
await closeNotifications(app)
@@ -173,23 +97,21 @@ test(`wallet`, async function(t) {
`it shows all 2 coins`
)
- let LocalcoinEl = () => balanceEl(`Localcoin`)
- await waitForText(LocalcoinEl, `900.0000000000`, 20000)
+ const LocalcoinEl = () => balanceEl(`localcoin`)
+ await waitForText(LocalcoinEl, `990.0000000000`, 20000)
t.pass(`balance is reduced by 100`)
t.end()
})
t.test(`sent to self`, async function(t) {
- await goToSendPage()
- await amountInput().setValue(`100`)
+ await showSendModal()
+ await amountInput().setValue(`10`)
await addressInput().setValue(accounts[0].address)
await app.client.setValue(`#password`, `1234567890`)
await sendBtn().click()
- // the confirmation popup will open
- await app.client.$(`#send-confirmation-btn`).click()
await app.client.waitForExist(`.tm-notification`, 10 * 1000)
- let msg = await app.client.$(`.tm-notification .body`).getText()
+ const msg = await app.client.$(`.tm-notification .body`).getText()
t.ok(msg.includes(`Success`), `Send successful`)
// close the notifications to have a clean setup for the next tests
await closeNotifications(app)
@@ -223,13 +145,13 @@ test(`wallet`, async function(t) {
await login(app, `testreceiver`)
await navigate(app, `Wallet`)
- let LocalcoinEl = () => balanceEl(`Localcoin`)
+ const LocalcoinEl = () => balanceEl(`localcoin`)
await app.client.waitForExist(
`//span[contains(text(), "Send")]`,
15 * 1000
)
- await waitForText(LocalcoinEl, `100.0000000000`, 10000)
+ await waitForText(LocalcoinEl, `10.0000000000`, 10000)
t.pass(`received mycoin transaction`)
t.end()
})
diff --git a/test/unit/helpers/electron_mock.js b/test/unit/helpers/electron_mock.js
deleted file mode 100644
index b30c798407..0000000000
--- a/test/unit/helpers/electron_mock.js
+++ /dev/null
@@ -1,31 +0,0 @@
-"use strict"
-
-// this mocks the IPC layer and isolates the mainthread from the renderer thread in tests
-jest.mock(`electron`, () => ({
- clipboard: { writeText: jest.fn() },
- ipcRenderer: {
- send: jest.fn(),
- once: jest.fn(),
- on: jest.fn(),
- removeAllListeners: jest.fn()
- },
- ipcMain: { on: jest.fn() },
- remote: {
- getGlobal(name) {
- if (name === `config`)
- return {
- default_network: `mock-net`,
- google_analytics_uid: `UA-TEST`,
- sentry_dsn: `https://xx:xx@sentry.io/xx`,
- version: `0.0.1`
- }
- if (name === `root`) return `./test/unit/tmp/test_root/`
- },
- app: {
- getVersion: jest.fn(() => `0.5.5`)
- }
- },
- shell: {
- openItem: jest.fn()
- }
-}))
diff --git a/test/unit/helpers/fixed_time.js b/test/unit/helpers/fixed_time.js
index f318ba4e1a..89fddc662b 100644
--- a/test/unit/helpers/fixed_time.js
+++ b/test/unit/helpers/fixed_time.js
@@ -1,11 +1,6 @@
"use strict"
-
-/* globals jest */
-require(`moment`)
-const mockMomentTz = require(`moment-timezone`)
-jest.mock(`moment`, () => time => mockMomentTz(time).tz(`Etc/UTC`))
+const timezone_mock = require(`timezone-mock`)
+timezone_mock.register(`UTC`)
const DATE_TO_USE = new Date(Date.UTC(1970, 0, 1, 0, 0, 42))
-global._Date = Date
-global.Date = jest.fn(() => new global._Date(DATE_TO_USE.toISOString()))
Date.now = jest.fn(() => DATE_TO_USE.getTime())
diff --git a/test/unit/helpers/fs-mock.js b/test/unit/helpers/fs-mock.js
index 950ed0ee2e..5b94fa24ff 100644
--- a/test/unit/helpers/fs-mock.js
+++ b/test/unit/helpers/fs-mock.js
@@ -9,7 +9,7 @@ const { normalize, sep } = require(`path`)
export default function mockFsExtra(fileSystem = {}) {
const fsExtraMock = {
copy: (from, to) => {
- let { file } = get(from, fsExtraMock.fs)
+ const { file } = get(from, fsExtraMock.fs)
if (file === null) {
throwENOENT(from)
}
@@ -17,13 +17,13 @@ export default function mockFsExtra(fileSystem = {}) {
},
copyFile: (from, to) => fsExtraMock.copy(from, to),
ensureFile: path => {
- let { file } = get(path, fsExtraMock.fs)
+ const { file } = get(path, fsExtraMock.fs)
if (file === null) {
create(path, fsExtraMock.fs)
}
},
ensureDir: path => {
- let { file } = get(path, fsExtraMock.fs)
+ const { file } = get(path, fsExtraMock.fs)
if (file === null) {
create(path, fsExtraMock.fs)
}
@@ -31,7 +31,7 @@ export default function mockFsExtra(fileSystem = {}) {
createWriteStream: () => new Writable(),
// for simplicity we say if there is a file we can access it
access: path => {
- let { file } = get(path, fsExtraMock.fs)
+ const { file } = get(path, fsExtraMock.fs)
if (file === null) {
throwENOENT(path)
return false
@@ -39,11 +39,11 @@ export default function mockFsExtra(fileSystem = {}) {
return !!get(path, fsExtraMock.fs).file
},
remove: path => {
- let { parent, name } = get(path, fsExtraMock.fs)
+ const { parent, name } = get(path, fsExtraMock.fs)
delete parent[name]
},
readFile: path => {
- let { file } = get(path, fsExtraMock.fs)
+ const { file } = get(path, fsExtraMock.fs)
if (!file) {
throwENOENT(path)
}
@@ -52,7 +52,7 @@ export default function mockFsExtra(fileSystem = {}) {
writeFile: (path, file) => create(path, fsExtraMock.fs, file),
pathExists: path => !!get(path, fsExtraMock.fs).file,
exists: path => {
- let { file } = get(path, fsExtraMock.fs)
+ const { file } = get(path, fsExtraMock.fs)
return file !== null
}
}
@@ -81,7 +81,7 @@ export default function mockFsExtra(fileSystem = {}) {
}
function throwENOENT(path) {
- let error = new Error(
+ const error = new Error(
`Path ` +
path +
` doesnt exist.\nFS:` +
@@ -93,8 +93,8 @@ export default function mockFsExtra(fileSystem = {}) {
function get(path, fs) {
path = normalize(path)
- let pathArr = path.split(sep).filter(x => x !== ``)
- let current = pathArr.shift()
+ const pathArr = path.split(sep).filter(x => x !== ``)
+ const current = pathArr.shift()
if (fs[current]) {
if (pathArr.length === 0) {
@@ -115,8 +115,8 @@ export default function mockFsExtra(fileSystem = {}) {
function create(path, fs, file = {}) {
path = normalize(path)
- let pathArr = path.split(sep).filter(x => x !== ``)
- let current = pathArr.shift()
+ const pathArr = path.split(sep).filter(x => x !== ``)
+ const current = pathArr.shift()
if (!fs[current]) {
fs[current] = {}
diff --git a/test/unit/helpers/genesis_mock.js b/test/unit/helpers/genesis_mock.js
index 7fcfcecfe0..6a3cc8ee6b 100644
--- a/test/unit/helpers/genesis_mock.js
+++ b/test/unit/helpers/genesis_mock.js
@@ -1,6 +1,6 @@
import fs from "fs-extra"
-let testRoot = `./test/unit/tmp/test_root/`
+const testRoot = `./test/unit/tmp/test_root/`
function mockGenesis() {
process.env.COSMOS_NETWORK = `./networks/gaiaiaiaiaiaia/`
diff --git a/test/unit/helpers/node_mock.js b/test/unit/helpers/node_mock.js
index 1950794dce..457e82b91f 100644
--- a/test/unit/helpers/node_mock.js
+++ b/test/unit/helpers/node_mock.js
@@ -1,7 +1,7 @@
"use strict"
-let mockValidators = require(`src/helpers/json/mock_validators.json`)
-let mockLcd = require(`../../../app/src/renderer/connectors/lcdClientMock.js`)
+const mockValidators = require(`src/helpers/json/mock_validators.json`)
+const mockLcd = require(`../../../app/src/renderer/connectors/lcdClientMock.js`)
module.exports = {
// REST
@@ -36,16 +36,48 @@ module.exports = {
rpc: {
on: () => {},
subscribe: () => {},
- validators: cb => cb(null, { validators: mockValidators }),
- block: (args, cb) => cb({}),
- blockchain: (args, cb) => cb(null, { block_metas: {} }),
- status: cb =>
- cb(null, {
+ async validators() {
+ return { validators: mockValidators }
+ },
+ async block() {},
+ async blockchain() {
+ return { block_metas: {} }
+ },
+ async status() {
+ return {
sync_info: {
latest_block_height: 42
},
node_info: { network: `test-net` }
- })
+ }
+ },
+ async net_info() {
+ return {
+ result: {
+ peers: [
+ {
+ node_info: {
+ protocol_version: {
+ p2p: `5`,
+ block: `8`,
+ app: `0`
+ },
+ id: `73173022bd8913e41e04c17a884edb6b35256db2`,
+ listen_addr: `tcp://0.0.0.0:26656`,
+ network: `testnet`,
+ version: `0.27.4`,
+ channels: `4020212223303800`,
+ moniker: `operator1`,
+ other: {
+ tx_index: `on`,
+ rpc_address: `tcp://0.0.0.0:26657`
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
},
rpcInfo: {
connected: true,
@@ -53,7 +85,6 @@ module.exports = {
},
rpcConnect: () => {},
rpcDisconnect: () => {},
- rpcReconnect: () => Promise.resolve(`1.1.1.1`),
setup: () => {},
...mockLcd
diff --git a/test/unit/helpers/vuex-setup.js b/test/unit/helpers/vuex-setup.js
index beda9df511..52c67cc382 100644
--- a/test/unit/helpers/vuex-setup.js
+++ b/test/unit/helpers/vuex-setup.js
@@ -20,7 +20,7 @@ export default function vuexSetup() {
) {
const node = Object.assign({}, require(`../helpers/node_mock`))
const modules = Modules({ node })
- let store = new Vuex.Store({
+ const store = new Vuex.Store({
getters: Object.assign({}, Getters, args.getters),
modules,
actions: {
diff --git a/test/unit/specs/App.spec.js b/test/unit/specs/App.spec.js
index f2cd92ec3c..11d48b01a5 100644
--- a/test/unit/specs/App.spec.js
+++ b/test/unit/specs/App.spec.js
@@ -1,216 +1,222 @@
-/* mocking electron differently in one file apparently didn't work so I had to split the App tests in 2 files */
-
-jest.mock(
- `renderer/connectors/node.js`,
- () => jest.fn(() => require(`../helpers/node_mock`)) // using jest.fn to be able to spy on the constructor call
-)
+import { startApp, main, routeGuard } from "renderer/scripts/boot"
+import App from "renderer/App"
+
+describe(`App vue`, () => {
+ it(`mount and call the store`, () => {
+ const $store = { commit: jest.fn() }
+ App.mounted.call({ $store })
+ expect($store.commit).toHaveBeenCalledWith(`loadOnboarding`)
+ })
+})
describe(`App Start`, () => {
- jest.mock(`../../../app/src/config`, () => ({
- google_analytics_uid: `123`
- }))
- jest.mock(`renderer/google-analytics.js`, () => () => {})
// popper.js is used by tooltips and causes some errors if
// not mocked because it requires a real DOM
jest.mock(`popper.js`, () => () => {})
- jest.mock(`electron`, () => ({
- remote: {
- getGlobal: () => ({
- mocked: false,
- node_lcd: `https://awesomenode.de:12345`
- }),
- app: {
- getPath: () => {
- return `$HOME`
- }
- }
- },
- ipcRenderer: {
- on: () => {},
- send: () => {}
- }
- }))
beforeEach(() => {
- window.history.pushState(
- {},
- `Mock Voyager`,
- `/?node=localhost&lcd_port=8080`
- )
document.body.innerHTML = ``
jest.resetModules()
})
- it(`has all dependencies`, async () => {
- await require(`renderer/main.js`)
- })
+ it(`waits for the node have connected to init subscription`, async () => {
+ const node = {
+ rpcConnect: jest.fn(),
+ lcdConnected: jest.fn()
+ }
+ const Node = () => node
+ const store = {
+ state: {
+ devMode: true
+ },
+ commit: jest.fn(),
+ dispatch: jest.fn()
+ }
+ const Store = () => store
+ const Vue = class {
+ constructor() {
+ this.$mount = jest.fn()
+ }
+ static config = {}
+ static use = () => {}
+ static directive = () => {}
+ }
+ const Sentry = {
+ init: jest.fn()
+ }
- it(`uses a mocked connector implementation if set in config`, async () => {
- let electron = require(`electron`)
- electron.remote.getGlobal = () => ({
- env: { NODE_ENV: `test` },
- mocked: true,
- node_lcd: `https://awesomenode.de:12345`,
- development: false,
- lcd_port_prod: `8080`
- })
- let Node = require(`renderer/connectors/node.js`)
- require(`renderer/main.js`)
- expect(Node).toHaveBeenCalledWith(
- expect.any(Function),
- `https://localhost:8080`, // axios or axios proxy
- `https://awesomenode.de:12345`,
- true
+ await startApp(
+ {
+ stargate: `http://localhost:12344`
+ },
+ Node,
+ Store,
+ {
+ NODE_ENV: `production`
+ },
+ Sentry,
+ Vue
)
- jest.resetModules()
- })
- it(`does not activate google analytics if analytics is disabled`, async mockDone => {
- jest.mock(`renderer/google-analytics.js`, () => () => {
- mockDone.fail()
- })
- await require(`renderer/main.js`)
- mockDone()
+ expect(store.dispatch).toHaveBeenCalledWith(`connect`)
})
- it(`does not set Sentry dsn if analytics is disabled`, mockDone => {
- jest.mock(`@sentry/browser`, () => ({
- init: config => {
- expect(config).toEqual({})
- mockDone()
- },
- configureScope: () => {},
- captureException: () => {}
+ it(`gathers url parameters to overwrite the app config before starting the app`, () => {
+ const getURLParams = jest.fn(() => ({
+ x: 1
}))
- require(`renderer/main.js`)
+ const startApp = jest.fn()
+ main(getURLParams, startApp)
+ expect(getURLParams).toHaveBeenCalled()
+ expect(startApp).toHaveBeenCalled()
+ expect(startApp.mock.calls[0][0]).toHaveProperty(`x`, 1)
})
- it(`opens error modal`, async () => {
- jest.resetModules()
- const { ipcRenderer } = require(`electron`)
- ipcRenderer.on = (type, cb) => {
- if (type === `error`) {
- cb(null, new Error(`Expected`))
+ it(`Check the calls on VUE`, async () => {
+ jest.mock(`vue-router`)
+ jest.mock(`vue-directive-tooltip`)
+ jest.mock(`vuelidate`)
+ const $mount = jest.fn()
+ class mockVue {
+ constructor() {
+ this.$mount = $mount
}
}
+ mockVue.config = {}
+ mockVue.use = jest.fn()
+ mockVue.directive = jest.fn()
- const { store } = require(`renderer/main.js`)
- expect(store.state.config.modals.error.active).toBe(true)
- expect(store.state.config.modals.error.message).toBe(`Expected`)
- })
-
- it(`triggers the approval flow on IPC message`, async () => {
- jest.resetModules()
- const { ipcRenderer } = require(`electron`)
- ipcRenderer.on = (type, cb) => {
- if (type === `approve-hash`) {
- cb(null, `THISISSOMEHASH`)
- }
+ const node = {
+ rpcConnect: jest.fn(),
+ lcdConnected: jest.fn()
}
+ const Node = () => node
- const { store } = require(`renderer/main.js`)
- expect(store.state.connection.approvalRequired).toBe(`THISISSOMEHASH`)
- })
-
- it(`sends a message to the main thread, that the app has loaded`, () => {
- const { ipcRenderer } = require(`electron`)
- ipcRenderer.send = jest.fn()
-
- require(`renderer/main.js`)
-
- expect(ipcRenderer.send).toHaveBeenCalledWith(`booted`)
- })
-
- it(`sends a message to the main thread, that the app sucessfully connected to a node and is usable`, async () => {
- jest.resetModules()
- const { ipcRenderer } = require(`electron`)
- ipcRenderer.send = jest.fn()
- let connectedCB
- ipcRenderer.on = (type, cb) => {
- if (type === `connected`) {
- connectedCB = cb
- }
+ const store = {
+ state: {
+ devMode: true
+ },
+ commit: jest.fn(),
+ dispatch: jest.fn()
}
+ const Store = () => store
- require(`renderer/main.js`)
- await connectedCB(null, `localhost`)
-
- expect(ipcRenderer.send.mock.calls).toEqual([
- [`booted`],
- [`successful-launch`]
- ])
+ const Sentry = {
+ init: jest.fn()
+ }
+ await startApp(
+ {
+ stargate: `http://localhost:12344`
+ },
+ Node,
+ Store,
+ {
+ NODE_ENV: `production`
+ },
+ Sentry,
+ mockVue
+ )
+ expect(mockVue.directive).toHaveBeenCalledTimes(1)
+ expect(mockVue.use).toHaveBeenCalledTimes(3)
})
- it(`show that there are no nodes available to connect to`, async () => {
- jest.resetModules()
- const { ipcRenderer } = require(`electron`)
- ipcRenderer.send = jest.fn()
- let connectedCB
- ipcRenderer.on = (type, cb) => {
- if (type === `error`) {
- connectedCB = cb
+ describe(`Route guard`, () => {
+ it(`Check the route guard`, async () => {
+ const commit = jest.fn()
+ const store = {
+ commit,
+ state: { user: { pauseHistory: true, signedIn: false } },
+ getters: { user: { pauseHistory: true, signedIn: false } }
}
- }
-
- let { store } = require(`renderer/main.js`)
- await connectedCB(null, {
- code: `NO_NODES_AVAILABLE`,
- message: `message`
+ const next = jest.fn()
+ const guard = routeGuard(store)
+ const to = {
+ redirectedFrom: `/`,
+ fullPath: `/`,
+ path: `/`,
+ matched: [{ meta: { requiresAuth: false } }]
+ }
+ // from.fullPath !== to.fullPath && !store.getters.user.pauseHistory
+ guard(to, { fullPath: `b` }, next)
+ expect(commit).not.toHaveBeenCalled()
+ expect(next).toHaveBeenCalled()
})
- expect(store.state.config.modals.noNodes.active).toBe(true)
- })
-
- it(`sends a successful-launch only on first start`, async () => {
- jest.resetModules()
- const { ipcRenderer } = require(`electron`)
- ipcRenderer.send = jest.fn()
- let connectedCB
- ipcRenderer.on = (type, cb) => {
- if (type === `connected`) {
- connectedCB = cb
+ it(`Check the route guard with no pause in history`, async () => {
+ const commit = jest.fn()
+ const store = {
+ commit,
+ state: { user: { pauseHistory: false, signedIn: false } },
+ getters: { user: { pauseHistory: false, signedIn: false } }
}
- }
-
- require(`renderer/main.js`)
- connectedCB(null, `localhost`)
- await connectedCB(null, `localhost`)
-
- expect(ipcRenderer.send.mock.calls).toEqual([
- [`booted`],
- [`successful-launch`]
- ])
- })
-
- it(`does not send a successful-launch if can not connect to node`, async () => {
- jest.resetModules()
- const { ipcRenderer } = require(`electron`)
- jest.doMock(`renderer/connectors/node`, () => () => ({
- rpcInfo: { connected: true },
- rpc: {
- subscribe: () => {},
- on: () => {},
- status: () => {}
- },
- rpcConnect: () => {},
- rpcReconnect: () => {},
- lcdConnected: () => Promise.resolve(false),
- keys: {
- values: () => []
+ const next = jest.fn()
+ const guard = routeGuard(store)
+ const to = {
+ redirectedFrom: `/`,
+ fullPath: `/`,
+ path: `/`,
+ matched: [{ meta: { requiresAuth: false } }]
}
- }))
+ // from.fullPath !== to.fullPath && !store.getters.user.pauseHistory
+ guard(to, { fullPath: `b` }, next)
+ expect(commit).toHaveBeenCalledWith(`addHistory`, `b`)
+ expect(next).toHaveBeenCalled()
+ })
- ipcRenderer.send = jest.fn()
- let connectedCB
- ipcRenderer.on = (type, cb) => {
- if (type === `connected`) {
- connectedCB = cb
+ it(`Check the route guard when routes does not change`, async () => {
+ const commit = jest.fn()
+ const store = {
+ commit,
+ state: { user: { pauseHistory: false, signedIn: true } },
+ getters: { user: { pauseHistory: false, signedIn: true } }
}
- }
-
- await require(`renderer/main.js`)
- await connectedCB(null, `localhost`)
+ const next = jest.fn()
+ const guard = routeGuard(store)
+ // from.fullPath !== to.fullPath && !store.getters.user.pauseHistory
+ guard({ fullPath: `a` }, { fullPath: `a` }, next)
+ expect(commit).not.toHaveBeenCalled()
+ expect(next).toHaveBeenCalled()
+ })
+ it(`redirects to my validators`, async () => {
+ const commit = jest.fn()
+ const store = {
+ commit,
+ state: { user: { pauseHistory: false, signedIn: true } },
+ getters: { user: { pauseHistory: false, signedIn: true } }
+ }
+ const to = {
+ redirectedFrom: `/staking`,
+ fullPath: `/staking/validators`,
+ path: `/staking/validators`,
+ name: `Validators`
+ }
+ const next = jest.fn()
+ const guard = routeGuard(store)
+ // from.fullPath !== to.fullPath && !store.getters.user.pauseHistory
+ guard(to, { fullPath: `/` }, next)
+ expect(next).toHaveBeenCalledWith(`/staking/my-delegations`)
+ })
- expect(ipcRenderer.send.mock.calls).toEqual([[`booted`]])
+ it(`redirects to session page if not logged in`, async () => {
+ const commit = jest.fn()
+ const store = {
+ commit,
+ state: { user: { pauseHistory: false, signedIn: false } },
+ getters: { user: { pauseHistory: false, signedIn: false } }
+ }
+ const to = {
+ redirectedFrom: ``,
+ fullPath: `/wallet`,
+ path: `/wallet`,
+ name: `Wallet`,
+ matched: [{ meta: { requiresAuth: true } }]
+ }
+ const next = jest.fn()
+ const guard = routeGuard(store)
+ // from.fullPath !== to.fullPath && !store.getters.user.pauseHistory
+ guard(to, { fullPath: `/` }, next)
+ expect(commit).toHaveBeenCalledWith(`setModalSessionState`, `welcome`)
+ expect(commit).toHaveBeenCalledWith(`setModalSession`, true)
+ })
})
})
diff --git a/test/unit/specs/__snapshots__/addressbook.spec.js.snap b/test/unit/specs/__snapshots__/addressbook.spec.js.snap
deleted file mode 100644
index 34ba290d40..0000000000
--- a/test/unit/specs/__snapshots__/addressbook.spec.js.snap
+++ /dev/null
@@ -1,7 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Addressbook should always return a specified node 1`] = `"123.456.123.456:26657"`;
-
-exports[`Addressbook should cycle though nodes until it finds one that is available 1`] = `"223.456.123.456:26657"`;
-
-exports[`Addressbook should return node 1`] = `"123.456.123.456:26657"`;
diff --git a/test/unit/specs/__snapshots__/main.spec.js.snap b/test/unit/specs/__snapshots__/main.spec.js.snap
deleted file mode 100644
index 8d7bb16573..0000000000
--- a/test/unit/specs/__snapshots__/main.spec.js.snap
+++ /dev/null
@@ -1,21 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Startup Process Error handling should error on gaiacli crashing async instead of breaking 1`] = `
-Array [
- "error",
- Object {
- "message": "The gaiacli rest-server (LCD) experienced an error:
-Gaiacli errord asynchronous",
- },
-]
-`;
-
-exports[`Startup Process Error handling should error on gaiacli crashing on reconnect instead of breaking 1`] = `
-Array [
- "error",
- Object {
- "message": "The gaiacli rest-server (LCD) experienced an error:
-Some error",
- },
-]
-`;
diff --git a/test/unit/specs/addressbook.spec.js b/test/unit/specs/addressbook.spec.js
deleted file mode 100644
index b411253690..0000000000
--- a/test/unit/specs/addressbook.spec.js
+++ /dev/null
@@ -1,234 +0,0 @@
-"use strict"
-
-const mockFsExtra = require(`../helpers/fs-mock`).default
-let Addressbook
-
-const mockConfig = {
- default_tendermint_port: 26657
-}
-
-describe(`Addressbook`, () => {
- beforeEach(() => {
- jest.resetModules()
- jest.mock(`fs-extra`, () => mockFsExtra())
- Addressbook = require(`src/main/addressbook.js`)
-
- jest.mock(`axios`, () => ({
- get: async () => {
- return { data: { result: { peers: [] } } }
- }
- }))
- })
-
- it(`should store peristent peers`, () => {
- let addressbook = new Addressbook(mockConfig, `./`, {
- persistent_peers: [`123.456.123.456`]
- })
- expect(addressbook.peers.map(p => p.host)).toContain(`123.456.123.456`)
- })
-
- it(`should restore saved peers`, () => {
- let fs = require(`fs-extra`)
- fs.writeFileSync(
- `./config/addressbook.json`,
- JSON.stringify([`123.456.123.456`])
- )
- let addressbook = new Addressbook(mockConfig, `./config`)
- expect(addressbook.peers.map(p => p.host)).toContain(`123.456.123.456`)
- })
-
- it(`should save initial peers to disc`, () => {
- let fs = require(`fs-extra`)
- let addressbook = new Addressbook(mockConfig, `./`, {
- persistent_peers: [`123.456.123.456`]
- })
- expect(addressbook.peers.map(p => p.host)).toContain(`123.456.123.456`)
- let content = fs.readFileSync(`./addressbook.json`)
- expect(JSON.parse(content)).toEqual([`123.456.123.456`])
- })
-
- it(`should return node`, async () => {
- jest.doMock(`axios`, () => ({
- get: async () => {
- return { data: { result: { peers: [] } } }
- }
- }))
- jest.resetModules()
- Addressbook = require(`src/main/addressbook.js`)
-
- let addressbook = new Addressbook(mockConfig, `./`, {
- persistent_peers: [`123.456.123.456`]
- })
- let node = await addressbook.pickNode()
- expect(node).toMatchSnapshot()
- })
-
- it(`should always return a specified node`, async () => {
- process.env.COSMOS_NODE = `123.456.123.456`
- try {
- jest.resetModules()
- Addressbook = require(`src/main/addressbook.js`)
- let addressbook = new Addressbook(mockConfig, `./config`)
-
- expect(await addressbook.pickNode()).toMatchSnapshot()
- } catch (error) {
- throw error
- } finally {
- delete process.env.COSMOS_NODE
- }
- })
-
- it(`should error if fixed node is unavailable`, async done => {
- process.env.COSMOS_NODE = `123.456.123.456`
- try {
- jest.doMock(`axios`, () => ({
- get: async () => {
- return Promise.reject()
- }
- }))
- jest.resetModules()
- Addressbook = require(`src/main/addressbook.js`)
- let addressbook = new Addressbook(mockConfig, `./config`)
-
- await addressbook.pickNode()
- done.fail()
- } catch (error) {
- done()
- } finally {
- delete process.env.COSMOS_NODE
- }
- })
-
- it(`should cycle though nodes until it finds one that is available`, async () => {
- jest.doMock(`axios`, () => ({
- get: async url => {
- if (url.indexOf(`123.456.123.456`) !== -1) return Promise.reject()
- return Promise.resolve({
- data: { result: { peers: [] } }
- })
- }
- }))
- jest.resetModules()
- Addressbook = require(`src/main/addressbook.js`)
-
- let addressbook = new Addressbook(mockConfig, `./`, {
- persistent_peers: [`123.456.123.456`, `223.456.123.456`]
- })
- let node = await addressbook.pickNode()
- expect(node).toMatchSnapshot()
- })
-
- it(`should throw an error if there are no nodes available`, async done => {
- jest.doMock(`axios`, () => ({
- get: async () => {
- return Promise.reject()
- }
- }))
- jest.resetModules()
- Addressbook = require(`src/main/addressbook.js`)
-
- let addressbook = new Addressbook(mockConfig, `./`, {
- persistent_peers: [`123.456.123.456`, `223.456.123.456`]
- })
- await addressbook.pickNode().then(done.fail, err => {
- expect(err.message).toMatch(`No nodes available to connect to`)
- done()
- })
- })
-
- it(`should query peers on connecting to a node`, async () => {
- jest.doMock(`axios`, () => ({
- get: async () => {
- return { data: { result: { peers: [] } } }
- }
- }))
- jest.resetModules()
- Addressbook = require(`src/main/addressbook.js`)
- let addressbook = new Addressbook(mockConfig, `./`, {
- persistent_peers: [`123.456.123.456`, `223.456.123.456`]
- })
- addressbook.discoverPeers = jest.fn()
- await addressbook.pickNode()
- expect(addressbook.discoverPeers).toHaveBeenCalled()
- })
-
- it(`should query and store peers of connected node`, async () => {
- jest.doMock(`axios`, () => ({
- get: async () => {
- return {
- data: {
- result: {
- peers: [
- {
- node_info: {
- listen_addr: `323.456.123.456`
- }
- },
- {
- node_info: {
- listen_addr: `423.456.123.456`
- }
- }
- ]
- }
- }
- }
- }
- }))
- jest.resetModules()
- Addressbook = require(`src/main/addressbook.js`)
-
- let addressbook = new Addressbook(mockConfig, `./`, {
- persistent_peers: [`123.456.123.456`, `223.456.123.456`]
- })
- await addressbook.discoverPeers(`123.456.123.456`)
- expect(addressbook.peers.map(p => p.host)).toContain(`323.456.123.456`)
- expect(addressbook.peers.map(p => p.host)).toContain(`423.456.123.456`)
-
- const fs = require(`fs-extra`)
- let content = fs.readFileSync(`./addressbook.json`)
- let storedNodes = JSON.parse(content)
- expect(storedNodes).toContain(`323.456.123.456`)
- expect(storedNodes).toContain(`423.456.123.456`)
- })
-
- it(`should provide the ability to reset the state of the nodes to try to reconnect to all, i.e. after an internet outage`, async done => {
- let addressbook = new Addressbook(mockConfig, `./`, {
- persistent_peers: [`123.456.123.456`, `223.456.123.456`]
- })
-
- addressbook.peers = addressbook.peers.map(p => {
- p.state = `down`
- return p
- })
-
- await addressbook.pickNode().then(done.fail, err => {
- expect(err.message).toMatch(`No nodes available to connect to`)
- })
-
- addressbook.resetNodes()
-
- await addressbook.pickNode().then(() => done(), done.fail)
- })
-
- it(`should call back on connection`, async () => {
- let spy = jest.fn()
- let addressbook = new Addressbook(mockConfig, `./config`, {
- persistent_peers: [`123.456.123.456`],
- onConnectionMessage: spy
- })
- await addressbook.pickNode()
- expect(spy).toHaveBeenCalled()
- })
-
- it(`should flag nodes incompatible`, async done => {
- let addressbook = new Addressbook(mockConfig, `./config`, {
- persistent_peers: [`123.456.123.456`]
- })
- addressbook.flagNodeIncompatible(`123.456.123.456`)
- await addressbook
- .pickNode()
- .then(done.fail)
- .catch(() => done())
- })
-})
diff --git a/test/unit/specs/components/common/ActionModal.spec.js b/test/unit/specs/components/common/ActionModal.spec.js
new file mode 100644
index 0000000000..1a68fd52da
--- /dev/null
+++ b/test/unit/specs/components/common/ActionModal.spec.js
@@ -0,0 +1,276 @@
+import { shallowMount, createLocalVue } from "@vue/test-utils"
+import Vuelidate from "vuelidate"
+import ActionModal from "renderer/components/common/ActionModal"
+
+const localVue = createLocalVue()
+localVue.use(Vuelidate)
+
+describe(`ActionModal`, () => {
+ let wrapper, $store
+
+ beforeEach(() => {
+ $store = {
+ commit: jest.fn(),
+ dispatch: jest.fn(),
+ getters: {
+ connected: true,
+ ledger: { isConnected: false },
+ user: { signedIn: true }
+ }
+ }
+
+ wrapper = shallowMount(ActionModal, {
+ localVue,
+ propsData: {
+ title: `Action Modal`,
+ submitFn: jest.fn(),
+ validate: jest.fn()
+ },
+ mocks: {
+ $store
+ }
+ })
+ wrapper.vm.open()
+ })
+
+ describe(`has the expected html structure`, () => {
+ describe(`when user has logged in`, () => {
+ it(`with local keystore`, () => {
+ expect(wrapper.vm.$el).toMatchSnapshot()
+ })
+
+ it(`with ledger`, async () => {
+ $store = {
+ getters: {
+ connected: true,
+ ledger: { isConnected: true },
+ user: { signedIn: true }
+ }
+ }
+ wrapper = shallowMount(ActionModal, {
+ localVue,
+ propsData: {
+ title: `Action Modal`,
+ submitFn: jest.fn(),
+ validate: jest.fn()
+ },
+ mocks: {
+ $store
+ }
+ })
+ wrapper.vm.open()
+ expect(wrapper.vm.$el).toMatchSnapshot()
+ })
+
+ it(`with ledger and is on sign step`, async () => {
+ wrapper.vm.ledger.isConnected = true
+ wrapper.vm.step = `sign`
+ await wrapper.vm.$nextTick()
+ expect(wrapper.vm.$el).toMatchSnapshot()
+ })
+ })
+ it(`when user hasn't logged in`, async () => {
+ wrapper.vm.user.signedIn = false
+ await wrapper.vm.$nextTick()
+ expect(wrapper.vm.$el).toMatchSnapshot()
+ })
+ })
+ it(`should default to submissionError being null`, () => {
+ expect(wrapper.vm.submissionError).toBe(null)
+ })
+
+ it(`opens`, () => {
+ wrapper.vm.open()
+
+ expect(wrapper.isEmpty()).not.toBe(true)
+ })
+
+ describe(`close modal`, () => {
+ it(`closes`, () => {
+ wrapper.vm.open()
+ wrapper.vm.close()
+ expect(wrapper.isEmpty()).toBe(true)
+ })
+
+ it(`should close if submitted`, async () => {
+ wrapper.vm.close = jest.fn()
+ const submitFn = jest.fn()
+ await wrapper.vm.submit(submitFn)
+ expect(wrapper.vm.close).toHaveBeenCalled()
+ })
+
+ it(`should erase password on close`, () => {
+ wrapper.vm.password = `mySecretPassword`
+ wrapper.vm.close()
+ expect(wrapper.vm.password).toBeNull()
+ })
+ })
+
+ it(`should set the step to transaction details`, () => {
+ wrapper.vm.step = `sign`
+ wrapper.vm.close()
+ expect(wrapper.vm.step).toBe(`txDetails`)
+ })
+
+ it(`should set the submissionError if the submission is rejected`, async () => {
+ const submitFn = jest
+ .fn()
+ .mockRejectedValue(new Error(`some kind of error message`))
+ const self = { submitFn, submissionErrorPrefix: `PREFIX` }
+ await ActionModal.methods.submit.call(self)
+
+ expect(self.submissionError).toEqual(`PREFIX: some kind of error message.`)
+ })
+
+ it(`should clear the submissionError after a timeout if the function is rejected`, async () => {
+ jest.useFakeTimers()
+
+ const submitFn = jest
+ .fn()
+ .mockRejectedValue(new Error(`some kind of error message`))
+ const self = { submitFn, submissionErrorPrefix: `PREFIX` }
+ await ActionModal.methods.submit.call(self)
+
+ jest.runAllTimers()
+ expect(self.submissionError).toEqual(null)
+ })
+
+ describe(`runs validation and changes step`, () => {
+ let self, getterValues
+ beforeEach(() => {
+ getterValues = { ledger: { isConnected: false } }
+ self = {
+ ...getterValues,
+ submit: jest.fn(),
+ validate: jest.fn(() => true),
+ $v: {
+ $touch: () => {}
+ },
+ selectedSignMethod: `local`,
+ step: `txDetails`
+ }
+ })
+ it(`if connected to local`, async () => {
+ await ActionModal.methods.validateChangeStep.call(self)
+ expect(self.validate).toHaveBeenCalled()
+ expect(self.submit).toHaveBeenCalled()
+ })
+
+ it(`if connected to ledger and is on 'txDetails' step`, async () => {
+ self.ledger = { isConnected: true }
+ self.selectedSignMethod = `ledger`
+ await ActionModal.methods.validateChangeStep.call(self)
+ expect(self.validate).toHaveBeenCalled()
+ expect(self.submit).not.toHaveBeenCalled()
+ expect(self.step).toBe(`sign`)
+ })
+
+ it(`if connected to ledger and is on 'sign' step`, async () => {
+ self.ledger = { isConnected: true }
+ self.selectedSignMethod = `ledger`
+ self.step = `sign`
+ await ActionModal.methods.validateChangeStep.call(self)
+ expect(self.validate).toHaveBeenCalled()
+ expect(self.submit).toHaveBeenCalled()
+ })
+
+ it(`doesn't submit on failed validation`, async () => {
+ self.validate = jest.fn(() => false)
+ await ActionModal.methods.validateChangeStep.call(self)
+ expect(self.validate).toHaveBeenCalled()
+ expect(self.submit).not.toHaveBeenCalled()
+ })
+
+ it(`fails validation if the password is missing`, async () => {
+ wrapper.setData({ password: null })
+ await wrapper.vm.validateChangeStep()
+ expect(wrapper.vm.submitFn).not.toHaveBeenCalled()
+ expect(wrapper.vm.$v.$invalid).toBe(true)
+ })
+ })
+
+ describe(`shows sending indication`, () => {
+ let self, getterValues
+
+ beforeEach(() => {
+ getterValues = { ledger: { isConnected: false } }
+ self = {
+ ...getterValues,
+ submit: jest.fn(
+ () => new Promise(resolve => setTimeout(resolve, 1000))
+ ),
+ validate: jest.fn(() => true),
+ $v: {
+ $touch: () => {}
+ },
+ selectedSignMethod: `local`,
+ step: `txDetails`
+ }
+ })
+
+ it(`when signing with local keystore`, done => {
+ ActionModal.methods.validateChangeStep.call(self).then(() => {
+ expect(self.sending).toBe(false)
+ done()
+ })
+ expect(self.sending).toBe(true)
+ jest.runAllTimers()
+ })
+
+ it(`when signing with ledger`, done => {
+ self.ledger = { isConnected: true }
+ self.step = `sign`
+ ActionModal.methods.validateChangeStep.call(self).then(() => {
+ expect(self.sending).toBe(false)
+ done()
+ })
+ expect(self.sending).toBe(true)
+ jest.runAllTimers()
+ })
+ })
+
+ it(`shows a password input for local signing`, () => {
+ expect(wrapper.vm.selectedSignMethod).toBe(`local`)
+ expect(wrapper.find(`#password`).exists()).toBe(true)
+ })
+
+ it(`hides password input if signing with Ledger`, async () => {
+ $store.getters.ledger.isConnected = true
+ wrapper = shallowMount(ActionModal, {
+ localVue,
+ propsData: {
+ title: `Action Modal`,
+ submitFn: jest.fn(),
+ validate: jest.fn()
+ },
+ mocks: {
+ $store
+ }
+ })
+ wrapper.vm.open()
+ expect(wrapper.find(`#password`).exists()).toBe(false)
+ })
+
+ describe(`selected sign method`, () => {
+ it(`selects local signed in with account`, () => {
+ expect(wrapper.vm.selectedSignMethod).toBe(`local`)
+ expect(wrapper.vm.signMethods).toEqual([
+ {
+ key: `(Unsafe) Local Account`,
+ value: `local`
+ }
+ ])
+ })
+
+ it(`selects ledger if device is connected`, () => {
+ $store.getters.ledger.isConnected = true
+ expect(wrapper.vm.selectedSignMethod).toBe(`ledger`)
+ expect(wrapper.vm.signMethods).toEqual([
+ {
+ key: `Ledger Nano S`,
+ value: `ledger`
+ }
+ ])
+ })
+ })
+})
diff --git a/test/unit/specs/components/common/AnchorCopy.spec.js b/test/unit/specs/components/common/AnchorCopy.spec.js
index 1dfa152d39..9ca4192d70 100644
--- a/test/unit/specs/components/common/AnchorCopy.spec.js
+++ b/test/unit/specs/components/common/AnchorCopy.spec.js
@@ -3,10 +3,10 @@ import AnchorCopy from "renderer/components/common/AnchorCopy"
describe(`AnchorCopy`, () => {
let wrapper, store
- let instance = setup()
+ const instance = setup()
beforeEach(() => {
- let test = instance.mount(AnchorCopy, {
+ const test = instance.mount(AnchorCopy, {
propsData: {
title: `title`,
body: `body`,
@@ -17,6 +17,8 @@ describe(`AnchorCopy`, () => {
})
wrapper = test.wrapper
store = test.store
+
+ wrapper.vm.copy = jest.fn()
})
it(`has the expected html structure`, () => {
diff --git a/test/unit/specs/components/common/AppHeader.spec.js b/test/unit/specs/components/common/AppHeader.spec.js
index a52d500de5..6e2959e159 100644
--- a/test/unit/specs/components/common/AppHeader.spec.js
+++ b/test/unit/specs/components/common/AppHeader.spec.js
@@ -3,7 +3,7 @@ import setup from "../../../helpers/vuex-setup"
describe(`AppHeader`, () => {
let wrapper, store, instance
- let { mount } = setup()
+ const { mount } = setup()
beforeEach(() => {
instance = mount(AppHeader, {
@@ -76,13 +76,4 @@ describe(`AppHeader`, () => {
expect(store.commit).toHaveBeenCalledWith(`setConfigDesktop`, false)
})
-
- it(`handles dark theme`, () => {
- expect(wrapper.find(`#logo-white`).exists()).toBeTruthy()
- })
-
- it(`handles light theme`, () => {
- store.commit(`setTheme`, `light`)
- expect(wrapper.find(`#logo-black`).exists()).toBeTruthy()
- })
})
diff --git a/test/unit/specs/components/common/AppMenu.spec.js b/test/unit/specs/components/common/AppMenu.spec.js
index 0992233259..d0fc811c47 100644
--- a/test/unit/specs/components/common/AppMenu.spec.js
+++ b/test/unit/specs/components/common/AppMenu.spec.js
@@ -1,55 +1,28 @@
+import { shallowMount } from "@vue/test-utils"
import AppMenu from "common/AppMenu"
-import setup from "../../../helpers/vuex-setup"
describe(`AppMenu`, () => {
- let wrapper, store, instance
- let { mount } = setup()
+ let wrapper, $store
beforeEach(async () => {
- instance = mount(AppMenu)
- store = instance.store
- wrapper = instance.wrapper
- await store.dispatch(`signIn`, {
- account: `default`,
- password: `1234567890`
- })
- })
+ $store = {
+ commit: jest.fn()
+ }
- it(`has the expected html structure`, () => {
- Object.assign(store.state.connection, {
- mocked: false,
- node: {
- remoteLcdURL: `123.123.123.123`
+ wrapper = shallowMount(AppMenu, {
+ mocks: {
+ $store
},
- lastHeader: Object.assign(store.state.connection.lastHeader, {
- chain_id: `chain_id`
- }),
- connected: true
+ stubs: [`router-link`]
})
-
- expect(wrapper.vm.$el).toMatchSnapshot()
- })
-
- it(`checks whether current page is validators`, () => {
- expect(wrapper.vm.isValidatorPage).toBeFalsy()
})
it(`has a perfect scrollbar`, () => {
expect(wrapper.vm.ps).toBeDefined()
})
- it(`shows staking page because of mocked connector`, () => {
- expect(wrapper.find(`#app-menu__staking`)).toBeDefined()
- })
-
- it(`shows transactions page because of mocked connector`, () => {
- expect(wrapper.find(`#app-menu__transactions`)).toBeDefined()
- })
-
it(`can close the app menu`, () => {
wrapper.find(`#app-menu__wallet`).trigger(`click`)
- expect(store.commit).toHaveBeenCalled()
- expect(store.commit.mock.calls[0][0]).toBe(`setActiveMenu`)
- expect(store.commit.mock.calls[0][1]).toBeFalsy()
+ expect($store.commit).toHaveBeenCalledWith(`setActiveMenu`, ``)
})
})
diff --git a/test/unit/specs/components/common/Page404.spec.js b/test/unit/specs/components/common/Page404.spec.js
index 4f2982df14..dab0012f91 100644
--- a/test/unit/specs/components/common/Page404.spec.js
+++ b/test/unit/specs/components/common/Page404.spec.js
@@ -2,11 +2,11 @@ import setup from "../../../helpers/vuex-setup"
import Page404 from "renderer/components/common/Page404"
describe(`Page404`, () => {
- let instance = setup()
+ const instance = setup()
let wrapper
beforeEach(() => {
- let test = instance.mount(Page404)
+ const test = instance.mount(Page404)
wrapper = test.wrapper
})
@@ -15,6 +15,6 @@ describe(`Page404`, () => {
})
it(`should show links to other pages`, () => {
- expect(wrapper.findAll(`.tm-li`).length > 0).toBe(true)
+ expect(wrapper.findAll(`router-link-stub`).length > 0).toBe(true)
})
})
diff --git a/test/unit/specs/components/common/PagePreferences.spec.js b/test/unit/specs/components/common/PagePreferences.spec.js
index c30c9851b5..6f7171ebf8 100644
--- a/test/unit/specs/components/common/PagePreferences.spec.js
+++ b/test/unit/specs/components/common/PagePreferences.spec.js
@@ -1,44 +1,44 @@
-import setup from "../../../helpers/vuex-setup"
+import { shallowMount } from "@vue/test-utils"
import PagePreferences from "renderer/components/common/PagePreferences"
-import lcdClientMock from "renderer/connectors/lcdClientMock.js"
jest.mock(`renderer/google-analytics.js`, () => () => {})
describe(`PagePreferences`, () => {
- let wrapper, store
- let { stakingParameters } = lcdClientMock.state
- let { mount } = setup()
+ let wrapper, $store
- beforeEach(async () => {
- let instance = mount(PagePreferences)
- wrapper = instance.wrapper
- store = instance.store
-
- store.commit(`setConnected`, true)
- store.commit(`setStakingParameters`, stakingParameters.parameters)
- await store.dispatch(`signIn`, {
+ const getters = {
+ user: {
account: `default`,
- password: `1234567890`
+ errorCollection: false
+ },
+ onboarding: {},
+ mockedConnector: false,
+ nodeUrl: `http://localhost:9070`
+ }
+
+ beforeEach(async () => {
+ $store = {
+ commit: jest.fn(),
+ dispatch: jest.fn(),
+ getters
+ }
+
+ wrapper = shallowMount(PagePreferences, {
+ mocks: {
+ $store
+ }
})
})
it(`has the expected html structure if connected`, async () => {
- store.commit(`setStakingParameters`, stakingParameters.parameters)
expect(wrapper.vm.$el).toMatchSnapshot()
+ expect(wrapper.vm.$el.outerHTML).toContain(`Node IP`)
expect(wrapper.vm.$el.outerHTML).toContain(`View tutorial`)
expect(wrapper.vm.$el.outerHTML).toContain(`Automatically send`)
- expect(wrapper.vm.$el.outerHTML).toContain(`Switch account`)
- expect(wrapper.vm.$el.outerHTML).toContain(`Sign Out`)
- })
-
- it(`should sign the user out`, async () => {
- wrapper.vm.signOut()
- expect(store.dispatch).toHaveBeenCalledWith(`signOut`)
- expect(store.commit).toHaveBeenCalledWith(`notifySignOut`)
})
it(`should set the error collection opt in`, async () => {
- let errorCollection = wrapper.vm.user.errorCollection
+ const errorCollection = wrapper.vm.user.errorCollection
const dispatch = jest.fn()
wrapper.vm.setErrorCollection({
$store: {
@@ -51,20 +51,10 @@ describe(`PagePreferences`, () => {
})
})
- it(`can switch the theme`, () => {
- wrapper.vm.setAppTheme()
- expect(store.commit).toHaveBeenCalledWith(`setTheme`, `light`)
- expect(store.state.themes.active).toBe(`light`)
- // store.commit.mockClear()
- wrapper.vm.setAppTheme()
- expect(store.commit).toHaveBeenCalledWith(`setTheme`, `dark`)
- expect(store.state.themes.active).toBe(`dark`)
- })
-
it(`can show onboarding again`, () => {
wrapper.find(`#toggle-onboarding`).trigger(`click`)
- expect(store.commit).toHaveBeenCalledWith(`setOnboardingState`, 0)
- expect(store.commit).toHaveBeenCalledWith(`setOnboardingActive`, true)
+ expect($store.commit).toHaveBeenCalledWith(`setOnboardingState`, 0)
+ expect($store.commit).toHaveBeenCalledWith(`setOnboardingActive`, true)
expect(wrapper.find(`#onboarding`)).toBeDefined()
})
})
diff --git a/test/unit/specs/components/common/PageProfile.spec.js b/test/unit/specs/components/common/PageProfile.spec.js
deleted file mode 100644
index f8ba177fc8..0000000000
--- a/test/unit/specs/components/common/PageProfile.spec.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { mount } from "@vue/test-utils"
-import PageProfile from "renderer/components/common/PageProfile"
-
-describe(`PageProfile`, () => {
- let wrapper
- beforeEach(() => {
- wrapper = mount(PageProfile)
- })
-
- it(`has the expected html structure`, () => {
- expect(wrapper.vm.$el).toMatchSnapshot()
- })
-})
diff --git a/test/unit/specs/components/common/ShortBech32.spec.js b/test/unit/specs/components/common/ShortBech32.spec.js
index f0a4066fcc..6e203575d1 100644
--- a/test/unit/specs/components/common/ShortBech32.spec.js
+++ b/test/unit/specs/components/common/ShortBech32.spec.js
@@ -3,11 +3,15 @@ import ShortBech32 from "renderer/components/common/ShortBech32"
describe(`ShortBech32`, () => {
let wrapper
- let instance = setup()
+ const instance = setup()
beforeEach(() => {
- let test = instance.mount(ShortBech32, {
- propsData: { address: `cosmosftw123456789` }
+ const test = instance.mount(ShortBech32, {
+ propsData: { address: `cosmosftw123456789` },
+ data: () => ({
+ showSuccess: false,
+ copyToClipboard: jest.fn()
+ })
})
wrapper = test.wrapper
})
diff --git a/test/unit/specs/components/common/Tabs.spec.js b/test/unit/specs/components/common/Tabs.spec.js
new file mode 100644
index 0000000000..de2265bae8
--- /dev/null
+++ b/test/unit/specs/components/common/Tabs.spec.js
@@ -0,0 +1,27 @@
+import { shallowMount } from "@vue/test-utils"
+import Tabs from "renderer/components/common/Tabs"
+
+describe(`Tabs`, () => {
+ let wrapper
+ it(`has the expected html structure`, async () => {
+ wrapper = shallowMount(Tabs, {})
+ expect(wrapper.findAll(`.tabs .tab`).length).toBe(0)
+ expect(wrapper.vm.$el).toMatchSnapshot()
+ })
+
+ it(`should show links to other pages`, () => {
+ wrapper = shallowMount(Tabs, {
+ propsData: {
+ tabs: [{ pathName: `r1`, displayName: `one` }]
+ },
+ mocks: {
+ $route: {
+ name: `r1`
+ }
+ },
+ stubs: [`router-link`]
+ })
+ expect(wrapper.findAll(`.tabs .tab`).length).toBe(1)
+ expect(wrapper.vm.$el).toMatchSnapshot()
+ })
+})
diff --git a/test/unit/specs/components/common/TmBalance.spec.js b/test/unit/specs/components/common/TmBalance.spec.js
index 838d9d6715..124608eb49 100644
--- a/test/unit/specs/components/common/TmBalance.spec.js
+++ b/test/unit/specs/components/common/TmBalance.spec.js
@@ -4,21 +4,18 @@ import lcdClientMock from "renderer/connectors/lcdClientMock.js"
describe(`TmBalance`, () => {
let wrapper, store
- let { stakingParameters } = lcdClientMock.state
- let { mount } = setup()
+ const { stakingParameters } = lcdClientMock.state
+ const { mount } = setup()
beforeEach(() => {
- let instance = mount(TmBalance, {
+ const instance = mount(TmBalance, {
getters: {
- user: () => {
- return {
- atoms: 123,
- address: `useraddress16876876876876876786876876876876876`
- }
- },
- totalAtoms: () => {
- return 321
- }
+ user: () => ({
+ address: `cosmos1address`,
+ signedIn: true
+ }),
+ liquidAtoms: () => 123,
+ totalAtoms: () => 321
},
propsData: {
tabs: []
@@ -30,6 +27,6 @@ describe(`TmBalance`, () => {
})
it(`has the expected html structure before adding props`, () => {
- expect(wrapper.vm.$el).toMatchSnapshot()
+ expect(wrapper.html()).toMatchSnapshot()
})
})
diff --git a/test/unit/specs/components/common/TmBarDiscrete.spec.js b/test/unit/specs/components/common/TmBarDiscrete.spec.js
index 5964c0f889..0274ae88fd 100644
--- a/test/unit/specs/components/common/TmBarDiscrete.spec.js
+++ b/test/unit/specs/components/common/TmBarDiscrete.spec.js
@@ -4,7 +4,7 @@ import { shallowMount } from "@vue/test-utils"
describe(`TmBarDiscrete`, () => {
let wrapper, clickSpy
beforeEach(async () => {
- let nodes = [{}, {}]
+ const nodes = [{}, {}]
clickSpy = jest.fn()
wrapper = shallowMount(TmBarDiscrete, {
propsData: { nodes, active: 1, "click-fn": clickSpy }
diff --git a/test/unit/specs/components/common/TmBtnCopy.spec.js b/test/unit/specs/components/common/TmBtnCopy.spec.js
index 265a57b295..7f25881097 100644
--- a/test/unit/specs/components/common/TmBtnCopy.spec.js
+++ b/test/unit/specs/components/common/TmBtnCopy.spec.js
@@ -3,10 +3,10 @@ import TmBtnCopy from "renderer/components/common/TmBtnCopy"
describe(`TmBtnCopy`, () => {
let wrapper, store
- let instance = setup()
+ const instance = setup()
beforeEach(() => {
- let test = instance.mount(TmBtnCopy, {
+ const test = instance.mount(TmBtnCopy, {
propsData: {
title: `title`,
body: `body`,
@@ -15,6 +15,8 @@ describe(`TmBtnCopy`, () => {
})
wrapper = test.wrapper
store = test.store
+
+ wrapper.vm.copy = jest.fn()
})
it(`has the expected html structure`, () => {
diff --git a/test/unit/specs/components/common/TmBtnReceive.spec.js b/test/unit/specs/components/common/TmBtnReceive.spec.js
index 6c9eeeb6f4..a6508bec26 100644
--- a/test/unit/specs/components/common/TmBtnReceive.spec.js
+++ b/test/unit/specs/components/common/TmBtnReceive.spec.js
@@ -3,10 +3,10 @@ import TmBtnReceive from "renderer/components/common/TmBtnReceive"
describe(`TmBtnReceive`, () => {
let wrapper, store
- let { mount } = setup()
+ const { mount } = setup()
beforeEach(() => {
- let instance = mount(TmBtnReceive)
+ const instance = mount(TmBtnReceive)
wrapper = instance.wrapper
store = instance.store
})
diff --git a/test/unit/specs/components/common/TmConnectedNetwork.spec.js b/test/unit/specs/components/common/TmConnectedNetwork.spec.js
index 3c6441da51..591bd612c6 100644
--- a/test/unit/specs/components/common/TmConnectedNetwork.spec.js
+++ b/test/unit/specs/components/common/TmConnectedNetwork.spec.js
@@ -1,20 +1,31 @@
+import { shallowMount, createLocalVue } from "@vue/test-utils"
import TmConnectedNetwork from "common/TmConnectedNetwork"
-import setup from "../../../helpers/vuex-setup"
+
+const localVue = createLocalVue()
+localVue.directive(`tooltip`, () => {})
describe(`TmConnectedNetwork`, () => {
- let wrapper, store
- let { mount } = setup()
+ let wrapper, $store
- beforeEach(async () => {
- const instance = mount(TmConnectedNetwork, {
+ beforeEach(() => {
+ $store = {
getters: {
- lastHeader: () => ({ chain_id: `Test Net`, height: 42 }),
- nodeUrl: () => `https://faboNode.de`,
- connected: () => true
+ lastHeader: {
+ chain_id: `gaia-20k`,
+ height: `6001`
+ },
+ nodeUrl: `https://faboNode.de`,
+ connected: true
}
+ }
+
+ wrapper = shallowMount(TmConnectedNetwork, {
+ localVue,
+ mocks: {
+ $store
+ },
+ stubs: [`router-link`]
})
- store = instance.store
- wrapper = instance.wrapper
})
it(`has the expected html structure`, () => {
@@ -36,7 +47,7 @@ describe(`TmConnectedNetwork`, () => {
.find(`#tm-connected-network__string`)
.text()
.trim()
- ).toBe(`Test Net`)
+ ).toBe(`gaia-20k`)
})
it(`has a block string`, () => {
@@ -45,53 +56,28 @@ describe(`TmConnectedNetwork`, () => {
.find(`#tm-connected-network__block`)
.text()
.trim()
- ).toContain(`#42`)
- })
-
- it(`has link to the external block explorer`, () => {
- expect(wrapper.vm.explorerLink).toBe(
- `https://explorecosmos.network/blocks/42`
- )
+ ).toBe(`#6,001`)
})
it(`has a connecting state`, async () => {
- let { wrapper } = mount(TmConnectedNetwork, {
+ $store = {
getters: {
- lastHeader: () => ({ chain_id: `Test Net`, height: 0 }),
- connected: () => false
+ lastHeader: {
+ chain_id: ``,
+ height: ``
+ },
+ nodeUrl: null,
+ connected: false
}
- })
- expect(wrapper.vm.$el).toMatchSnapshot()
- })
+ }
- it(`shows a link to the preferences page if not on the preferences page`, () => {
- expect(wrapper.find(`#tm-connected-network_preferences-link`)).toBeDefined()
- wrapper.setData({
- $route: {
- name: `preferences`
- }
- })
- expect(
- wrapper.vm.$el.querySelector(`#tm-connected-network_preferences-link`)
- ).toBeFalsy()
- })
-
- it(`shows the connected node`, async () => {
- let instance = mount(TmConnectedNetwork)
- store = instance.store
- wrapper = instance.wrapper
-
- Object.assign(store.state.connection, {
- mocked: false,
- node: {
- remoteLcdURL: `123.123.123.123`
+ wrapper = shallowMount(TmConnectedNetwork, {
+ localVue,
+ mocks: {
+ $store
},
- lastHeader: Object.assign(store.state.connection.lastHeader, {
- chain_id: `chain_id`
- }),
- connected: true
+ stubs: [`router-link`]
})
-
expect(wrapper.vm.$el).toMatchSnapshot()
})
})
diff --git a/test/unit/specs/components/common/TmDataMsg.spec.js b/test/unit/specs/components/common/TmDataMsg.spec.js
index 49db0258d0..a0f7dfe4a9 100644
--- a/test/unit/specs/components/common/TmDataMsg.spec.js
+++ b/test/unit/specs/components/common/TmDataMsg.spec.js
@@ -4,7 +4,7 @@ import TmDataMsg from "common/TmDataMsg"
describe(`TmDataMsg`, () => {
let wrapper
- let propsData = {
+ const propsData = {
title: `sOmEtHiNg Is HaPpEnIng!!!`,
subtitle: `Oh my! What could it be?`,
icon: `help`,
diff --git a/test/unit/specs/components/common/TmField.spec.js b/test/unit/specs/components/common/TmField.spec.js
index 4b57bc893a..52f32ece5e 100644
--- a/test/unit/specs/components/common/TmField.spec.js
+++ b/test/unit/specs/components/common/TmField.spec.js
@@ -104,18 +104,6 @@ describe(`TmField`, () => {
expect(wrapper.emittedByOrder()).toEqual([{ args: [42], name: `input` }])
})
- it(`limits inputs to min and max`, () => {
- const wrapper = shallowMount(TmField, {
- propsData: { type: `number`, min: 5, max: 100 }
- })
- wrapper.vm.updateValue(3)
- wrapper.vm.updateValue(200)
- expect(wrapper.emittedByOrder()).toEqual([
- { args: [5], name: `input` },
- { args: [100], name: `input` }
- ])
- })
-
it(`displays a toggle`, () => {
const wrapper = shallowMount(TmField, {
propsData: {
@@ -152,8 +140,7 @@ describe(`TmField`, () => {
it(`allows for style customization`, () => {
const wrapper = shallowMount(TmField, {
propsData: {
- size: `lg`,
- theme: `light`
+ size: `lg`
}
})
expect(wrapper.vm.$el).toMatchSnapshot()
diff --git a/test/unit/specs/components/common/TmFieldSeed.spec.js b/test/unit/specs/components/common/TmFieldSeed.spec.js
index db81a911ee..e7d23aea61 100644
--- a/test/unit/specs/components/common/TmFieldSeed.spec.js
+++ b/test/unit/specs/components/common/TmFieldSeed.spec.js
@@ -4,7 +4,7 @@ import TmFieldSeed from "common/TmFieldSeed"
describe(`TmFieldSeed`, () => {
let wrapper
- let propsData = {
+ const propsData = {
value: `one two three four five six seven eight nine ten eleven twelve`
}
diff --git a/test/unit/specs/components/common/TmFormGroup.spec.js b/test/unit/specs/components/common/TmFormGroup.spec.js
index d8165f0384..de04e17f1b 100644
--- a/test/unit/specs/components/common/TmFormGroup.spec.js
+++ b/test/unit/specs/components/common/TmFormGroup.spec.js
@@ -4,7 +4,7 @@ import TmFormGroup from "common/TmFormGroup"
describe(`TmFormGroup`, () => {
let wrapper
- let propsData = {
+ const propsData = {
error: true,
fieldId: `sign-in-password`,
fieldLabel: `Sign In Password`
diff --git a/test/unit/specs/components/common/TmFormMsg.spec.js b/test/unit/specs/components/common/TmFormMsg.spec.js
index 05ecd5f693..ad06e91177 100644
--- a/test/unit/specs/components/common/TmFormMsg.spec.js
+++ b/test/unit/specs/components/common/TmFormMsg.spec.js
@@ -3,7 +3,7 @@ import TmFormMsg from "common/TmFormMsg"
describe(`TmFormMsg`, () => {
let wrapper
- let propsData = [
+ const propsData = [
{
type: `length`,
name: `Password`,
@@ -82,9 +82,24 @@ describe(`TmFormMsg`, () => {
error: `Asdf must be a valid URL (http:// required)`
},
{
- type: `asdf`,
+ type: `default`,
name: `Asdf`,
error: `Asdf must be valid`
+ },
+ {
+ type: `bech32`,
+ name: `Address`,
+ error: `Address is invalid bech32`
+ },
+ {
+ type: `integer`,
+ name: `Number`,
+ error: `Number must be an integer`
+ },
+ {
+ type: `custom`,
+ msg: `HALLO WORLD`,
+ error: `HALLO WORLD`
}
]
@@ -102,8 +117,8 @@ describe(`TmFormMsg`, () => {
for (let i = 0; i < propsData.length; i++) {
it(`shows correct message for ` + propsData[i].type, () => {
- let { type, name, min, max, length } = propsData[i]
- wrapper.setProps({ type, name, min, max, length })
+ const { type, name, min, max, length, msg } = propsData[i]
+ wrapper.setProps({ type, name, min, max, length, msg })
expect(
wrapper
.find(`.tm-form-msg`)
diff --git a/test/unit/specs/components/common/TmFormStruct.spec.js b/test/unit/specs/components/common/TmFormStruct.spec.js
index d8a5d23ebb..01bff905bf 100644
--- a/test/unit/specs/components/common/TmFormStruct.spec.js
+++ b/test/unit/specs/components/common/TmFormStruct.spec.js
@@ -4,7 +4,7 @@ import TmFormStruct from "common/TmFormStruct"
describe(`TmFormStruct`, () => {
let wrapper
- let propsData = {
+ const propsData = {
width: `narrow`,
submit: function() {
// console.log("form successfully submitted")
diff --git a/test/unit/specs/components/common/TmHardwareState.spec.js b/test/unit/specs/components/common/TmHardwareState.spec.js
index 1754bb46d2..763b8884e4 100644
--- a/test/unit/specs/components/common/TmHardwareState.spec.js
+++ b/test/unit/specs/components/common/TmHardwareState.spec.js
@@ -4,7 +4,7 @@ import TmHardwareState from "common/TmHardwareState"
describe(`TmHardwareState`, () => {
let wrapper
- let propsData = {
+ const propsData = {
icon: `rotate_right`,
spin: true,
value: `Detecting your Ledger Wallet`
diff --git a/test/unit/specs/components/common/TmLiCopy.spec.js b/test/unit/specs/components/common/TmLiCopy.spec.js
index 542f990bc3..202f40084f 100644
--- a/test/unit/specs/components/common/TmLiCopy.spec.js
+++ b/test/unit/specs/components/common/TmLiCopy.spec.js
@@ -3,10 +3,10 @@ import TmLiCopy from "common/TmLiCopy"
describe(`TmLiCopy`, () => {
let wrapper
- let { mount } = setup()
+ const { mount } = setup()
beforeEach(() => {
- let instance = mount(TmLiCopy, {
+ const instance = mount(TmLiCopy, {
propsData: {
value: `hallo`,
receive: false
diff --git a/test/unit/specs/components/common/TmLiSession.spec.js b/test/unit/specs/components/common/TmLiSession.spec.js
index 4f1a762d62..152968de73 100644
--- a/test/unit/specs/components/common/TmLiSession.spec.js
+++ b/test/unit/specs/components/common/TmLiSession.spec.js
@@ -3,7 +3,7 @@ import TmLiSession from "common/TmLiSession"
describe(`TmLiSession`, () => {
let wrapper
- let propsData = {
+ const propsData = {
icon: `mood`,
title: `useful title`,
subtitle: `useful subtitle`
diff --git a/test/unit/specs/components/common/TmModalError.spec.js b/test/unit/specs/components/common/TmModalError.spec.js
index 2ebc139914..824795dcc1 100644
--- a/test/unit/specs/components/common/TmModalError.spec.js
+++ b/test/unit/specs/components/common/TmModalError.spec.js
@@ -1,5 +1,5 @@
import Vuex from "vuex"
-import { mount, createLocalVue } from "@vue/test-utils"
+import { shallowMount, createLocalVue } from "@vue/test-utils"
import TmModalError from "common/TmModalError"
const localVue = createLocalVue()
@@ -7,20 +7,9 @@ localVue.use(Vuex)
localVue.directive(`tooltip`, () => {})
localVue.directive(`focus`, () => {})
-jest.mock(`electron`, () => ({
- remote: {
- getGlobal: () => {
- return `$HOME/.cosmos-voyager-dev`
- }
- },
- shell: {
- openItem: jest.fn()
- }
-}))
-
describe(`TmModalError`, () => {
let wrapper
- let store = new Vuex.Store({
+ const store = new Vuex.Store({
getters: {
config: () => ({ devMode: true }),
lastHeader: () => ({ chain_id: `gaia-test`, height: `31337` })
@@ -28,7 +17,7 @@ describe(`TmModalError`, () => {
})
beforeEach(() => {
- wrapper = mount(TmModalError, {
+ wrapper = shallowMount(TmModalError, {
localVue,
store
})
@@ -97,15 +86,7 @@ describe(`TmModalError`, () => {
).toBe(`body-x`)
})
- it(`knows the path to the app log`, () => {
- expect(wrapper.vm.logPath).toBe(`$HOME/.cosmos-voyager-dev/main.log`)
- })
-
it(`has a button to create an issue`, () => {
wrapper.find(`#tm-modal-error__btn-issue`).trigger(`click`)
})
-
- it(`has a button to view the app logs`, () => {
- wrapper.find(`#tm-modal-error__btn-logs`).trigger(`click`)
- })
})
diff --git a/test/unit/specs/components/common/TmModalHelp.spec.js b/test/unit/specs/components/common/TmModalHelp.spec.js
index 75c10125a8..f4cba7b54a 100644
--- a/test/unit/specs/components/common/TmModalHelp.spec.js
+++ b/test/unit/specs/components/common/TmModalHelp.spec.js
@@ -3,10 +3,10 @@ import TmModalHelp from "common/TmModalHelp"
describe(`TmModalHelp`, () => {
let wrapper, store
- let { mount } = setup()
+ const { mount } = setup()
beforeEach(() => {
- let instance = mount(TmModalHelp)
+ const instance = mount(TmModalHelp)
wrapper = instance.wrapper
store = instance.store
store.commit(`setModalHelp`, true)
diff --git a/test/unit/specs/components/common/TmModalLCDApproval.spec.js b/test/unit/specs/components/common/TmModalLCDApproval.spec.js
deleted file mode 100644
index 53f45821a0..0000000000
--- a/test/unit/specs/components/common/TmModalLCDApproval.spec.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import setup from "../../../helpers/vuex-setup"
-import TmModalLCDApproval from "common/TmModalLCDApproval"
-
-let instance = setup()
-
-describe(`TmModalLCDApproval`, () => {
- let wrapper, store
-
- beforeEach(() => {
- let test = instance.mount(TmModalLCDApproval, {
- propsData: { hash: `this_is_a_hash` }
- })
- wrapper = test.wrapper
- store = test.store
- })
-
- it(`has the expected html structure`, () => {
- expect(wrapper.vm.$el).toMatchSnapshot()
- })
-
- it(`shows the hash`, () => {
- expect(wrapper.vm.hash).toBe(`this_is_a_hash`)
- expect(wrapper.vm.$el.querySelector(`textarea`).value).toBe(
- `this_is_a_hash`
- )
- })
-
- it(`allows to approve a hash`, () => {
- wrapper.vm.approve()
- expect(store.dispatch).toHaveBeenCalledWith(
- `approveNodeHash`,
- `this_is_a_hash`
- )
- })
-
- it(`allows to disapprove a hash`, () => {
- wrapper.vm.newNode()
- expect(store.dispatch).toHaveBeenCalledWith(
- `disapproveNodeHash`,
- `this_is_a_hash`
- )
- })
-})
diff --git a/test/unit/specs/components/common/TmModalNodeHalted.spec.js b/test/unit/specs/components/common/TmModalNodeHalted.spec.js
deleted file mode 100644
index a45b9f080a..0000000000
--- a/test/unit/specs/components/common/TmModalNodeHalted.spec.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import TmModalNodeHalted from "common/TmModalNodeHalted"
-import setup from "../../../helpers/vuex-setup"
-
-describe(`TmModalNodeHalted`, () => {
- let wrapper, store
- let { mount } = setup()
-
- beforeEach(() => {
- let instance = mount(TmModalNodeHalted)
- store = instance.store
- wrapper = instance.wrapper
- })
-
- it(`has the expected html structure`, () => {
- expect(wrapper.html()).not.toBeUndefined()
- expect(wrapper.vm.$el).toMatchSnapshot()
- })
-
- it(`send a connection retry event`, () => {
- let { ipcRenderer } = require(`electron`)
- wrapper.vm.switchNode()
- let spy = jest.spyOn(ipcRenderer, `send`)
- expect(spy).toHaveBeenCalledWith(`reconnect`)
-
- // also closing the modal
- expect(store.state.config.modals.nodeHalted.active).toBe(false)
- })
-})
diff --git a/test/unit/specs/components/common/TmModalReceive.spec.js b/test/unit/specs/components/common/TmModalReceive.spec.js
index 7c9ef13589..4e430c4470 100644
--- a/test/unit/specs/components/common/TmModalReceive.spec.js
+++ b/test/unit/specs/components/common/TmModalReceive.spec.js
@@ -3,10 +3,10 @@ import TmModalReceive from "common/TmModalReceive"
describe(`TmModalReceive`, () => {
let wrapper, store
- let { mount } = setup()
+ const { mount } = setup()
beforeEach(() => {
- let instance = mount(TmModalReceive)
+ const instance = mount(TmModalReceive)
wrapper = instance.wrapper
store = instance.store
store.commit(`setModalHelp`, true)
diff --git a/test/unit/specs/components/common/TmModalSearch.spec.js b/test/unit/specs/components/common/TmModalSearch.spec.js
index f984104a6f..4f69ff0121 100644
--- a/test/unit/specs/components/common/TmModalSearch.spec.js
+++ b/test/unit/specs/components/common/TmModalSearch.spec.js
@@ -3,10 +3,12 @@ import setup from "../../../helpers/vuex-setup"
describe(`TmModalSearch`, () => {
let wrapper, store
- let { mount } = setup()
+ const { mount } = setup()
beforeEach(() => {
- let instance = mount(TmModalSearch, { propsData: { type: `transactions` } })
+ const instance = mount(TmModalSearch, {
+ propsData: { type: `transactions` }
+ })
store = instance.store
wrapper = instance.wrapper
store.commit(`setSearchVisible`, [`transactions`, true])
diff --git a/test/unit/specs/components/common/TmNotification.spec.js b/test/unit/specs/components/common/TmNotification.spec.js
index 7fec1e2d4f..026183383e 100644
--- a/test/unit/specs/components/common/TmNotification.spec.js
+++ b/test/unit/specs/components/common/TmNotification.spec.js
@@ -4,39 +4,39 @@ import TmNotification from "common/TmNotification"
describe(`TmNotification.vue`, () => {
const notifications = [
{
- time: 44000,
+ time: Date.now() - 1,
body: `asdf`
},
{
title: `title`,
- time: 44000,
+ time: Date.now() - 1,
body: `sadf`
},
{
icon: `search`,
- time: 44000,
+ time: Date.now() - 1,
body: `sadf`
},
{
type: `warning`,
- time: 44000,
+ time: Date.now() - 1,
body: `sadf`
},
{
type: `error`,
- time: 44000,
+ time: Date.now() - 1,
body: `sadf`
},
{
layout: `alert`,
- time: 44000,
+ time: Date.now() - 1,
body: `sadf`
}
]
it(`has the expected html structure`, () => {
notifications.forEach(notification => {
- let wrapper = mount(TmNotification, {
+ const wrapper = mount(TmNotification, {
propsData: { ...notification }
})
expect(wrapper.vm.$el).toMatchSnapshot()
@@ -45,7 +45,7 @@ describe(`TmNotification.vue`, () => {
it(`closes after a certain timeout automatically`, () => {
jest.useFakeTimers()
- let wrapper = mount(TmNotification, {
+ const wrapper = mount(TmNotification, {
propsData: {
time: 44000,
body: `asdf`
@@ -57,7 +57,7 @@ describe(`TmNotification.vue`, () => {
})
it(`is hidden if timed out`, () => {
- let wrapper = mount(TmNotification, {
+ const wrapper = mount(TmNotification, {
propsData: {
time: 100,
body: `asdf`
diff --git a/test/unit/specs/components/common/TmNotifications.spec.js b/test/unit/specs/components/common/TmNotifications.spec.js
index 250cde2e82..4852c604d0 100644
--- a/test/unit/specs/components/common/TmNotifications.spec.js
+++ b/test/unit/specs/components/common/TmNotifications.spec.js
@@ -7,11 +7,11 @@ describe(`TmNotifications.vue`, () => {
const notifications = [
{
body: `asdf`,
- time: 44000
+ time: Date.now() - 1
},
{
body: `sadf`,
- time: 44000
+ time: Date.now() - 1
}
]
wrapper = mount(TmNotifications, {
diff --git a/test/unit/specs/components/common/TmOnboarding.spec.js b/test/unit/specs/components/common/TmOnboarding.spec.js
index c1ce063fa2..c6bbd823b6 100644
--- a/test/unit/specs/components/common/TmOnboarding.spec.js
+++ b/test/unit/specs/components/common/TmOnboarding.spec.js
@@ -25,9 +25,9 @@ jest.mock(
describe(`TmOnboarding`, () => {
let wrapper, store, instance
- let { stakingParameters } = lcdClientMock.state
+ const { stakingParameters } = lcdClientMock.state
- let { mount } = setup()
+ const { mount } = setup()
beforeEach(() => {
instance = mount(TmOnboarding)
diff --git a/test/unit/specs/components/common/TmPage.spec.js b/test/unit/specs/components/common/TmPage.spec.js
new file mode 100644
index 0000000000..16f5453b32
--- /dev/null
+++ b/test/unit/specs/components/common/TmPage.spec.js
@@ -0,0 +1,124 @@
+import { shallowMount, createLocalVue } from "@vue/test-utils"
+import TmPage from "renderer/components/common/TmPage"
+import Vuex from "vuex"
+const localVue = createLocalVue()
+
+localVue.use(Vuex)
+
+describe(`TmPage`, () => {
+ let wrapper
+ let actions
+ let store
+ let getters
+
+ beforeEach(() => {
+ getters = {
+ user: () => ({ address: `cosmos`, atoms: 1 }),
+ connected: () => true
+ }
+ actions = {
+ actionClick: jest.fn(),
+ actionInput: jest.fn()
+ }
+ store = new Vuex.Store({
+ state: {},
+ actions,
+ getters
+ })
+ })
+
+ it(`has the expected html structure`, async () => {
+ wrapper = shallowMount(TmPage, { store, localVue })
+ expect(wrapper.vm.$el).toMatchSnapshot()
+ })
+
+ it(`should show links to other pages`, () => {
+ wrapper = shallowMount(TmPage, {
+ store,
+ localVue,
+ propsData: {
+ dataset: [1, 2, 3],
+ search: `stuff`
+ },
+ mocks: {
+ $route: {
+ name: `r1`
+ }
+ },
+ slots: {
+ "managed-body": `
@@ -46,7 +46,7 @@ exports[`TmConnectedNetwork has the expected html structure 1`] = `
- Test Net
+ gaia-20k
-
- -
-
- - Minimum Deposit - info_outline - -
- - {{ - governanceParameters.parameters.deposit.min_deposit - ? minimumDeposit - : `n/a` - }} - -
-
+ -
-
- - Maximum Deposit Period - info_outline - -
- - {{ - governanceParameters.parameters.deposit.max_deposit_period - ? depositPeriodInDays + ` days` - : `n/a` - }} - -
+
-
+
+
+ -
+
- + Minimum Deposit + info_outline + +
- + {{ + governanceParameters.parameters.deposit.min_deposit + ? minimumDeposit + : `n/a` + }} + +
+
-
+
- + Maximum Deposit Period + info_outline + +
- + {{ + governanceParameters.parameters.deposit.max_deposit_period + ? depositPeriodInDays + ` days` + : `n/a` + }} + +
-
+
@@ -10,15 +10,11 @@
-
-
+
@@ -43,10 +39,7 @@ export default {
return num.full(parseFloat(this.coin.amount))
},
denomination() {
- return (
- this.coin.denom.substring(0, 1).toUpperCase() +
- this.coin.denom.substring(1).toLowerCase()
- )
+ return this.coin.denom
}
}
}
@@ -60,7 +53,6 @@ export default {
margin-bottom: 0.5rem;
border: 1px solid var(--bc-dim);
background: var(--app-fg);
- min-width: 45rem;
}
.li-coin:hover {
diff --git a/app/src/renderer/components/wallet/PageSend.vue b/app/src/renderer/components/wallet/PageSend.vue
deleted file mode 100644
index ead2c2f3b4..0000000000
--- a/app/src/renderer/components/wallet/PageSend.vue
+++ /dev/null
@@ -1,302 +0,0 @@
-
- - Tally Parameters - info_outline -
-
-
@@ -46,10 +46,10 @@ export default {
}
},
computed: {
- date() {
- const time = moment(this.time)
- return time.format(
- `${moment().isSame(time, `day`) ? `` : `YYYY/MM/DD `}HH:mm`
+ date({ time } = this) {
+ const momentTime = moment(time)
+ return momentTime.format(
+ `${moment().isSame(momentTime, `day`) ? `` : `MMM Do YYYY `}HH:mm:ss`
)
}
}
@@ -60,11 +60,11 @@ export default {
.tm-li-tx {
display: flex;
align-items: center;
- font-size: m;
margin-bottom: 0.5rem;
border: 1px solid var(--bc-dim);
background: var(--app-fg);
- min-width: 45rem;
+ width: 100%;
+ font-weight: 300;
}
.tm-li-tx:hover {
@@ -92,7 +92,6 @@ export default {
flex-direction: row;
width: 100%;
padding: 1rem;
- font-size: m;
}
.tm-li-tx__content__left,
@@ -122,8 +121,8 @@ export default {
}
.tm-li-tx__content__caption {
- line-height: lg;
- font-size: lg;
+ line-height: 18px;
+ font-size: 18px;
color: var(--bright);
}
@@ -131,13 +130,14 @@ export default {
.tm-li-tx__content__block {
display: flex;
width: 100%;
- font-size: 14px;
color: var(--dim);
+ line-height: 14px;
+ font-size: 14px;
align-items: baseline;
}
.tm-li-tx__content__information {
- padding-top: 3px;
+ padding-top: 4px;
}
.tm-li-tx__content__block {
diff --git a/app/src/renderer/components/wallet/LiCoin.vue b/app/src/renderer/components/wallet/LiCoin.vue
index c750ba70d2..fe6e059cf1 100644
--- a/app/src/renderer/components/wallet/LiCoin.vue
+++ b/app/src/renderer/components/wallet/LiCoin.vue
@@ -1,5 +1,5 @@
-
-
-
- -
-
- - Threshold - info_outline - -
- - {{ - governanceParameters.parameters.tallying.threshold - ? `${parseFloat( - governanceParameters.parameters.tallying.threshold - ) * 100} %` - : `n/a` - }} - -
-
-
- - Veto - info_outline - -
- - {{ - governanceParameters.parameters.tallying.veto - ? `${parseFloat( - governanceParameters.parameters.tallying.veto - ) * 100} %` - : `n/a` - }} - -
-
+
+ -
-
- - Governance Penalty - info_outline - -
- - {{ - governanceParameters.parameters.tallying.governance_penalty - ? governanceParameters.parameters.tallying - .governance_penalty - : `n/a` - }} - -
+
-
+
+
+
+ -
+
- + Threshold + info_outline + +
- + {{ + governanceParameters.parameters.tallying.threshold + ? `${parseFloat( + governanceParameters.parameters.tallying.threshold + ) * 100} %` + : `n/a` + }} + +
-
+
- + Veto + info_outline + +
- + {{ + governanceParameters.parameters.tallying.veto + ? `${parseFloat( + governanceParameters.parameters.tallying.veto + ) * 100} %` + : `n/a` + }} + +
+
-
+
- + Governance Penalty + info_outline + +
- + {{ + governanceParameters.parameters.tallying.governance_penalty + ? governanceParameters.parameters.tallying.governance_penalty + : `n/a` + }} + +
-
+
- + Quorum + info_outline + +
- + {{ + governanceParameters.parameters.tallying.quorum + ? governanceParameters.parameters.tallying.quorum + : `n/a` + }} + +
-
- Voting Parameters - info_outline -
-
-
+
+
+
+
+
diff --git a/app/src/renderer/components/network/PageNetwork.vue b/app/src/renderer/components/network/PageNetwork.vue
new file mode 100644
index 0000000000..4b7615dedd
--- /dev/null
+++ b/app/src/renderer/components/network/PageNetwork.vue
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/renderer/components/staking/DelegationModal.vue b/app/src/renderer/components/staking/DelegationModal.vue
index 3cdac85538..b801e32501 100644
--- a/app/src/renderer/components/staking/DelegationModal.vue
+++ b/app/src/renderer/components/staking/DelegationModal.vue
@@ -1,117 +1,94 @@
-
- refreshsearch
-
-
-
diff --git a/app/src/renderer/components/staking/TableValidators.vue b/app/src/renderer/components/staking/TableValidators.vue
index 24fb144883..b3aacf11e7 100644
--- a/app/src/renderer/components/staking/TableValidators.vue
+++ b/app/src/renderer/components/staking/TableValidators.vue
@@ -61,6 +61,7 @@ export default {
`committedDelegations`,
`config`,
`user`,
+ `liquidAtoms`,
`connected`,
`bondDenom`,
`keybase`
@@ -95,8 +96,8 @@ export default {
)
},
sortedFilteredEnrichedDelegates() {
- let query = this.filters.delegates.search.query || ``
- let sortedEnrichedDelegates = orderBy(
+ const query = this.filters.delegates.search.query || ``
+ const sortedEnrichedDelegates = orderBy(
this.enrichedDelegates.slice(0),
[this.sort.property, `small_moniker`],
[this.sort.order, `asc`]
@@ -110,7 +111,7 @@ export default {
}
},
userCanDelegate() {
- return this.user.atoms > 0 && this.delegation.loaded
+ return this.liquidAtoms > 0 && this.delegation.loaded
},
properties() {
return [
@@ -121,27 +122,23 @@ export default {
class: `name`
},
{
- title: `Delegated ${this.bondDenom}`,
+ title: `My Delegations`,
value: `your_votes`,
tooltip: `Number of ${
this.bondDenom
- } you have delegated to the validator`,
+ } you have delegated to this validator`,
class: `your-votes`
},
{
title: `Rewards`,
value: `your_rewards`, // TODO: use real rewards
- tooltip: `Rewards of ${
- this.bondDenom
- } you have gained from the validator`,
- class: `your-rewards` // TODO: use real rewards
+ tooltip: `Rewards you have earned from this validator`,
+ class: `your-rewards`
},
{
title: `Voting Power`,
value: `percent_of_vote`,
- tooltip: `Percentage of ${
- this.bondDenom
- } the validator has on The Cosmos Hub`,
+ tooltip: `Percentage of voting shares`,
class: `percent_of_vote`
},
{
@@ -173,9 +170,6 @@ export default {
async mounted() {
Mousetrap.bind([`command+f`, `ctrl+f`], () => this.setSearch(true))
Mousetrap.bind(`esc`, () => this.setSearch(false))
-
- // XXX temporary because querying the shares shows old shares after bonding
- // this.updateDelegates()
},
methods: {
updateDelegates() {
diff --git a/app/src/renderer/components/staking/UndelegationModal.vue b/app/src/renderer/components/staking/UndelegationModal.vue
index 11fdc7a1d7..c741958cc0 100644
--- a/app/src/renderer/components/staking/UndelegationModal.vue
+++ b/app/src/renderer/components/staking/UndelegationModal.vue
@@ -1,102 +1,85 @@
-
-
@@ -199,7 +189,7 @@ export default {
computed: {
...mapGetters([`config`, `governanceParameters`]),
minimumDeposit() {
- let coin = this.governanceParameters.parameters.deposit.min_deposit[0]
+ const coin = this.governanceParameters.parameters.deposit.min_deposit[0]
return `${coin.amount} ${coin.denom}s`
},
depositPeriodInDays() {
@@ -228,55 +218,13 @@ export default {
}
.parameters__section {
- background-color: var(--app-fg);
- display: flex;
margin-bottom: 1rem;
- padding: 2rem;
width: 100%;
}
-h3 {
- margin: 1em auto;
-}
-
-.info-button {
- color: var(--link);
-}
-
-.column {
- display: flex;
- flex-flow: column;
- position: relative;
-}
-
-.row {
- display: flex;
- flex-direction: row;
- width: 100%;
-}
-
-.info_dl {
- display: flex;
- flex-flow: column;
- margin-bottom: 1.5rem;
- margin-right: 1rem;
-}
-
-.info_dl dt {
- color: var(--dim);
- font-size: var(--sm);
- margin-bottom: 4px;
-}
-
-.info_dl dd {
- border: 1px solid var(--white-fade-2);
- border-radius: 2px;
- font-size: 1rem;
- line-height: 1rem;
- padding: 0.5rem;
-}
-
-.info_dl dd.info_dl__text-box {
- min-height: 6.91rem;
+.parameters__section h3 {
+ padding: 0.5rem 1rem;
+ font-size: var(--h3);
+ font-weight: 500;
}
diff --git a/app/src/renderer/components/governance/TableProposals.vue b/app/src/renderer/components/governance/TableProposals.vue
index d0b1786857..b7df0a4700 100644
--- a/app/src/renderer/components/governance/TableProposals.vue
+++ b/app/src/renderer/components/governance/TableProposals.vue
@@ -53,8 +53,8 @@ export default {
return Object.keys(this.proposals).length > 0
},
filteredProposals() {
- let query = this.filters.proposals.search.query || ``
- let proposals = orderBy(
+ const query = this.filters.proposals.search.query || ``
+ const proposals = orderBy(
this.proposals,
[this.sort.property],
[this.sort.order]
@@ -76,7 +76,7 @@ export default {
class: `proposal_title`
},
{
- title: `Proposal id`,
+ title: `Proposal Id`,
value: `proposal_id`,
tooltip: `Id of the proposal`,
class: `proposal_id`
@@ -116,7 +116,7 @@ export default {
methods: {
setSearch() {
if (this.somethingToSearch) {
- let toggle = !this.filters[`proposals`].search.visible
+ const toggle = !this.filters[`proposals`].search.visible
this.$store.commit(`setSearchVisible`, [`proposals`, toggle])
}
}
diff --git a/app/src/renderer/components/network/PageBlock.vue b/app/src/renderer/components/network/PageBlock.vue
new file mode 100644
index 0000000000..e3b193d2ca
--- /dev/null
+++ b/app/src/renderer/components/network/PageBlock.vue
@@ -0,0 +1,112 @@
+
+
-
-
+
+ -
-
- - Voting Period - info_outline - -
- - {{ - governanceParameters.parameters.voting.voting_period - ? votingPeriodInDays + ` days` - : `n/a` - }} - -
+
+
+
+
-
+
- + Voting Period + info_outline + +
- + {{ + governanceParameters.parameters.voting.voting_period + ? votingPeriodInDays + ` days` + : `n/a` + }} + +
+
+
+
+
+
+
+
+
+
+ Block {{ blockTitle }}
++ {{ block.block_meta.block_id.hash }} +
+
+
+ -
+
- Time +
- {{ blockTime }} +
+
+
+
+
+
+
+ -
+
- Transactions +
- {{ block.block.data.txs || `No Transactions` }} +
+
+
+
+
+
+
+ -
+
- Evidence +
- {{ block.block.evidence.evidence || `No Evidence` }} +
+
+
+
+
+
+
+
+
+ {{ lastHeader.chain_id }}
+
+
+ -
+
- Block Height +
- {{ `#` + num.prettyInt(lastHeader.height) }} +
-
+
- Last Block +
- {{ lastBlock }} +
-
+
- Transactions +
- {{ lastHeader.total_txs }} +
-
+
- Number of Validators +
- {{ delegates.delegates.length }} +
+
+
+
+ -
+
- Total Liquid {{ bondDenom }} +
- + {{ pool.pool.loose_tokens ? pool.pool.loose_tokens : `n/a` }} + +
+
+ -
+
- Total Delegated {{ bondDenom }} +
- + {{ pool.pool.bonded_tokens ? pool.pool.bonded_tokens : `n/a` }} + +
|
+ |
+ {{ block.header.num_txs }} | +
-
-
-
-
+
+ {{ denom }}
-
-
+
+
-
-
diff --git a/app/src/renderer/components/staking/LiValidator.vue b/app/src/renderer/components/staking/LiValidator.vue
index 010bf78165..bb130e08c2 100644
--- a/app/src/renderer/components/staking/LiValidator.vue
+++ b/app/src/renderer/components/staking/LiValidator.vue
@@ -79,11 +79,11 @@ export default {
return `${this.num.pretty(this.validator.commission.rate)}%`
},
uptime() {
- let rollingWindow = 10000 // param of slashing period
- let info = this.validator.signing_info
+ const rollingWindow = 10000 // param of slashing period
+ const info = this.validator.signing_info
if (info) {
// uptime in the past 10k blocks
- let uptimeRollingWindow = info.signed_blocks_counter / rollingWindow
+ const uptimeRollingWindow = info.signed_blocks_counter / rollingWindow
return `${this.num.pretty(uptimeRollingWindow * 100)}%`
}
return `n/a`
@@ -138,12 +138,3 @@ export default {
}
}
-
-
diff --git a/app/src/renderer/components/staking/PageStaking.vue b/app/src/renderer/components/staking/PageStaking.vue
index 8322b49feb..c5025cf39a 100644
--- a/app/src/renderer/components/staking/PageStaking.vue
+++ b/app/src/renderer/components/staking/PageStaking.vue
@@ -1,39 +1,21 @@
-
- Delegation
-
-
+ Delegation
-
-
-
-
+ {{ denom }}
-
-
+
- Undelegate
-
-
Undelegate
-
-
- Unbonded {{
calculatePrettifiedTokens(tx.validator_addr, tx.shares_amount)
}} {{ bondingDenom }}s - {{ timeDiff }} {{ timeDiff }}
@@ -112,7 +112,7 @@ export default {
// only show time diff if still waiting to be terminated
if (this.state !== `locked`) return ``
- return moment(this.unbondingTime).fromNow()
+ return `(liquid ` + moment(this.unbondingTime).fromNow() + `)`
},
// unbonding transactions can be in the state 'locked', 'ended'
// the transaction needs to be enriched from the outside with `unbondingDelegation`
@@ -130,13 +130,13 @@ export default {
},
methods: {
moniker(validatorAddr) {
- let validator = this.validators.find(
+ const validator = this.validators.find(
c => c.operator_address === validatorAddr
)
return validator ? validator.description.moniker : validatorAddr
},
calculatePrettifiedTokens(validatorAddr, shares) {
- let validator = this.validators.find(
+ const validator = this.validators.find(
val => val.operator_address === validatorAddr
)
return calculateTokens(validator, shares).toNumber()
@@ -223,6 +223,10 @@ export default {
cursor: pointer;
}
+.tx-unbonding__time-diff {
+ font-size: var(--sm);
+}
+
@media screen and (min-width: 700px) {
.tm-li-tx {
font-size: 0.875rem;
diff --git a/app/src/renderer/components/transactions/TmLiTransaction.vue b/app/src/renderer/components/transactions/TmLiTransaction.vue
index eab9939cf2..b4cee28f10 100644
--- a/app/src/renderer/components/transactions/TmLiTransaction.vue
+++ b/app/src/renderer/components/transactions/TmLiTransaction.vue
@@ -18,8 +18,8 @@
- Block #{{ block }} Block #{{ block }} @ {{ date }}
{{ amount }}
-
-
- Account empty
-
- This account doesn't hold any coins yet. Go to the
- token faucet to
- aquire tokens to play with.
-
+ This account doesn't have anything in it yet.
-
-
+
+`;
+
+exports[`ActionModal has the expected html structure when user has logged in with ledger and is on sign step 1`] = `
+
+
+
+
+
+ Action Modal
+
+
+
+
+
+
+
+
+
+
+ Action Modal
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
+
+exports[`ActionModal has the expected html structure when user has logged in with local keystore 1`] = `
+
+
+
+
+
+ Action Modal
+
+
+
+
+
+
+
+
+
+
+ Action Modal
+
+
+
+
+
+
+
+
+
+
+`;
+
+exports[`ActionModal has the expected html structure when user hasn't logged in 1`] = `
+
+
+
+
+
+ Action Modal
+
+
+
+
+
+
+
+
+
+
+ Action Modal
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
diff --git a/test/unit/specs/components/common/__snapshots__/AppMenu.spec.js.snap b/test/unit/specs/components/common/__snapshots__/AppMenu.spec.js.snap
deleted file mode 100644
index a024ae28ac..0000000000
--- a/test/unit/specs/components/common/__snapshots__/AppMenu.spec.js.snap
+++ /dev/null
@@ -1,136 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`AppMenu has the expected html structure 1`] = `
-
-`;
diff --git a/test/unit/specs/components/common/__snapshots__/Page404.spec.js.snap b/test/unit/specs/components/common/__snapshots__/Page404.spec.js.snap
index 093acd1aeb..11890c2dab 100644
--- a/test/unit/specs/components/common/__snapshots__/Page404.spec.js.snap
+++ b/test/unit/specs/components/common/__snapshots__/Page404.spec.js.snap
@@ -2,154 +2,88 @@
exports[`Page404 has the expected html structure 1`] = `
+
+
+
+
+ Sign in required
+
+
+
+
+
+
+
+
+
+
+ Sign in required
+
+
+
+
+
+
+
+
++ You need to sign in to submit a transaction. +
+
-
+
+
-
-
-
+
+
diff --git a/test/unit/specs/components/common/__snapshots__/PagePreferences.spec.js.snap b/test/unit/specs/components/common/__snapshots__/PagePreferences.spec.js.snap
index 66e71112b3..a596ce530b 100644
--- a/test/unit/specs/components/common/__snapshots__/PagePreferences.spec.js.snap
+++ b/test/unit/specs/components/common/__snapshots__/PagePreferences.spec.js.snap
@@ -1,452 +1,51 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`PagePreferences has the expected html structure if connected 1`] = `
-![](\\"~assets/images/cosmos-logo.png\\")
"
`;
diff --git a/test/unit/specs/components/common/__snapshots__/TmConnectedNetwork.spec.js.snap b/test/unit/specs/components/common/__snapshots__/TmConnectedNetwork.spec.js.snap
index b81ec70695..0714dfa86e 100644
--- a/test/unit/specs/components/common/__snapshots__/TmConnectedNetwork.spec.js.snap
+++ b/test/unit/specs/components/common/__snapshots__/TmConnectedNetwork.spec.js.snap
@@ -14,7 +14,7 @@ exports[`TmConnectedNetwork has a connecting state 1`] = `
class="tm-connected-network__string tm-connected-network__string--connecting"
>
- Connecting to Test Net…
+ Connecting to …
+
+
+
+
-
-
-
-
+
+
-
-
- + Oops! We can't find the page you're looking for. +
+ ++ Error code: 404 +
+
-
-
+
-
-
+
-
+ Governance
+
+
+
-
-
- Try another page...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Wallet
-
-
-
-
-
- + Here are some helpful links to get you out of here: +
-
-
-
+
+
-
-
-
-
+
+
+
+
-
-
-
-
- Staking
-
-
-
-
-
-
-
-
+
+
+
+
+ http://localhost:9070
+
-
-
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- - Total STAKE -
- -- 1,000.0000… -
-
-
- - Available STAKE -
- -- 1,000.0000… -
-
-
-
-
-
-
-
- cosmos…xxn9
-
-
-
-
-
- check
-
-
- Copied
-
-
-
-
-
-
-
-
-
-
-
-
- Settings
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Node IP
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- View tutorial for Voyager
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Automatically send usage statistics and crash reports
-
-
-
- to the Voyager development team
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Account
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Switch account
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-`;
diff --git a/test/unit/specs/components/common/__snapshots__/Tabs.spec.js.snap b/test/unit/specs/components/common/__snapshots__/Tabs.spec.js.snap
new file mode 100644
index 0000000000..20822fd171
--- /dev/null
+++ b/test/unit/specs/components/common/__snapshots__/Tabs.spec.js.snap
@@ -0,0 +1,25 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Tabs has the expected html structure 1`] = `
+
+`;
+
+exports[`Tabs should show links to other pages 1`] = `
+
-
-
-
-
-
-
-
-
-
-
-
+
+`;
diff --git a/test/unit/specs/components/common/__snapshots__/TmBalance.spec.js.snap b/test/unit/specs/components/common/__snapshots__/TmBalance.spec.js.snap
index 82282de9ba..f2a094a74a 100644
--- a/test/unit/specs/components/common/__snapshots__/TmBalance.spec.js.snap
+++ b/test/unit/specs/components/common/__snapshots__/TmBalance.spec.js.snap
@@ -1,77 +1,7 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`TmBalance has the expected html structure before adding props 1`] = `
-
+
+
+ one
+
+
+
+
-
+"
-
-
-
-
-
-
-
-
-
-
- - Total STAKE -
- -- 321.0000… -
-
-
- - Available STAKE -
- -- 123.0000… -
-
-
-
-
-
-
-
- useraddress…6876
-
-
-
-
-
- check
-
-
- Copied
-
-
- Total STAKE
321.0000…
Available STAKE
123.0000…
+ cosmos…ress
+
checkCopied
-
`;
diff --git a/test/unit/specs/components/common/__snapshots__/TmField.spec.js.snap b/test/unit/specs/components/common/__snapshots__/TmField.spec.js.snap
index 0d0aec3586..a98ba33ce0 100644
--- a/test/unit/specs/components/common/__snapshots__/TmField.spec.js.snap
+++ b/test/unit/specs/components/common/__snapshots__/TmField.spec.js.snap
@@ -2,7 +2,7 @@
exports[`TmField allows for style customization 1`] = `
`;
diff --git a/test/unit/specs/components/common/__snapshots__/TmModalError.spec.js.snap b/test/unit/specs/components/common/__snapshots__/TmModalError.spec.js.snap
index 9c281177a2..3400da23f7 100644
--- a/test/unit/specs/components/common/__snapshots__/TmModalError.spec.js.snap
+++ b/test/unit/specs/components/common/__snapshots__/TmModalError.spec.js.snap
@@ -32,48 +32,15 @@ exports[`TmModalError has the expected html structure 1`] = `
diff --git a/test/unit/specs/components/common/__snapshots__/TmModalLCDApproval.spec.js.snap b/test/unit/specs/components/common/__snapshots__/TmModalLCDApproval.spec.js.snap
deleted file mode 100644
index 7b51963645..0000000000
--- a/test/unit/specs/components/common/__snapshots__/TmModalLCDApproval.spec.js.snap
+++ /dev/null
@@ -1,87 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`TmModalLCDApproval has the expected html structure 1`] = `
-
-
-
-
-
- lock
-
-
-
-
-
- chain_id
-
-
-
-
- #0
-
- exit_to_app
-
-
+ #6,001
+
-
-`;
diff --git a/test/unit/specs/components/common/__snapshots__/TmModalNodeHalted.spec.js.snap b/test/unit/specs/components/common/__snapshots__/TmModalNodeHalted.spec.js.snap
deleted file mode 100644
index 83ad725154..0000000000
--- a/test/unit/specs/components/common/__snapshots__/TmModalNodeHalted.spec.js.snap
+++ /dev/null
@@ -1,62 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`TmModalNodeHalted has the expected html structure 1`] = `
-
-
-
-
- sync problem
-
-
-
-
- Node approval required
-
-
-
-
- Voyager needs to approve the node you're trying to connect to. Please
- compare the hash below against the hash from a trusted source. If you
- are 100% sure that the hashes match, click approve to proceed.
-
-
-
-
-
-
-`;
diff --git a/test/unit/specs/components/common/__snapshots__/TmPage.spec.js.snap b/test/unit/specs/components/common/__snapshots__/TmPage.spec.js.snap
new file mode 100644
index 0000000000..9d4f2a9a01
--- /dev/null
+++ b/test/unit/specs/components/common/__snapshots__/TmPage.spec.js.snap
@@ -0,0 +1,71 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`TmPage has the expected html structure 1`] = `
+
-
-
-
- sync_problem
-
-
-
-
- Node has halted
-
-
-
-
- The node your are connected to appears to have halted. You can try to
- connect to another node or switch to a demo connection so you can try
- out Voyager.
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
+
+exports[`TmPage should show links to other pages 1`] = `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
diff --git a/test/unit/specs/components/common/__snapshots__/TmSessionHardware.spec.js.snap b/test/unit/specs/components/common/__snapshots__/TmSessionHardware.spec.js.snap
index ab70d6b2b3..e02059ac7c 100644
--- a/test/unit/specs/components/common/__snapshots__/TmSessionHardware.spec.js.snap
+++ b/test/unit/specs/components/common/__snapshots__/TmSessionHardware.spec.js.snap
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[`NISessionHardware has the expected html structure 1`] = `
+exports[`TmSessionHardware has the expected html structure 1`] = `
@@ -48,13 +48,11 @@ exports[`NISessionHardware has the expected html structure 1`] = `
-
-
- Please plug in your Ledger Wallet
+ Please plug in your Ledger Nano S and open the Cosmos app
`;
-exports[`NISessionHardware should show a state indicator for different states of the hardware connection 1`] = `" "`;
-
-exports[`NISessionHardware should show a state indicator for different states of the hardware connection 2`] = `" "`;
+exports[`TmSessionHardware should show a state indicator for different states of the hardware connection 1`] = `" "`;
-exports[`NISessionHardware should show a state indicator for different states of the hardware connection 3`] = `" "`;
+exports[`TmSessionHardware should show a state indicator for different states of the hardware connection 2`] = `" "`;
diff --git a/test/unit/specs/components/common/__snapshots__/TmSessionImport.spec.js.snap b/test/unit/specs/components/common/__snapshots__/TmSessionImport.spec.js.snap
index 0af3a3faf1..ad3ffbc448 100644
--- a/test/unit/specs/components/common/__snapshots__/TmSessionImport.spec.js.snap
+++ b/test/unit/specs/components/common/__snapshots__/TmSessionImport.spec.js.snap
@@ -66,11 +66,7 @@ exports[`TmSessionImport has the expected html structure 1`] = `
type="text"
/>
-
@@ -97,11 +93,7 @@ exports[`TmSessionImport has the expected html structure 1`] = `
type="password"
/>
- usb
Please plug in your Ledger Wallet
rotate_right
Detecting your Ledger Wallet
usb
Please plug in your Ledger Nano S and open the Cosmos app
check_circle
Ledger Wallet successfully loaded
rotate_right
Connecting...
- Name is required
-
+
- Password is required
-
+
@@ -153,11 +145,7 @@ exports[`TmSessionImport has the expected html structure 1`] = `
style="overflow-x: hidden; word-wrap: break-word; overflow-y: hidden;"
/>
-
- Seed is required
-
+
diff --git a/test/unit/specs/components/common/__snapshots__/TmSessionLoading.spec.js.snap b/test/unit/specs/components/common/__snapshots__/TmSessionLoading.spec.js.snap
index 6d4b8dbf6c..06707b2706 100644
--- a/test/unit/specs/components/common/__snapshots__/TmSessionLoading.spec.js.snap
+++ b/test/unit/specs/components/common/__snapshots__/TmSessionLoading.spec.js.snap
@@ -26,7 +26,7 @@ exports[`TmSessionLoading has the expected html structure 1`] = `
src="~assets/images/loader.svg"
/>
- HALLO WORLD + diff --git a/test/unit/specs/components/common/__snapshots__/TmSessionSignIn.spec.js.snap b/test/unit/specs/components/common/__snapshots__/TmSessionSignIn.spec.js.snap index 1efbcb7128..cd08ebc07e 100644 --- a/test/unit/specs/components/common/__snapshots__/TmSessionSignIn.spec.js.snap +++ b/test/unit/specs/components/common/__snapshots__/TmSessionSignIn.spec.js.snap @@ -4,157 +4,82 @@ exports[`TmSessionSignIn has the expected html structure 1`] = `
-
+
`;
diff --git a/test/unit/specs/components/common/__snapshots__/TmSessionSignUp.spec.js.snap b/test/unit/specs/components/common/__snapshots__/TmSessionSignUp.spec.js.snap
index 9bfb7f1276..04c87e89da 100644
--- a/test/unit/specs/components/common/__snapshots__/TmSessionSignUp.spec.js.snap
+++ b/test/unit/specs/components/common/__snapshots__/TmSessionSignUp.spec.js.snap
@@ -1,265 +1,174 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[`NISessionSignUp has the expected html structure 1`] = `
+exports[`SessionSignUp has the expected html structure 1`] = `
-
+
`;
diff --git a/test/unit/specs/components/common/__snapshots__/TmUserPane.spec.js.snap b/test/unit/specs/components/common/__snapshots__/TmUserPane.spec.js.snap
index fa9875094c..b20a753d3c 100644
--- a/test/unit/specs/components/common/__snapshots__/TmUserPane.spec.js.snap
+++ b/test/unit/specs/components/common/__snapshots__/TmUserPane.spec.js.snap
@@ -1,49 +1,11 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`TmUserPane has the expected html structure 1`] = `
-
-
-
-
-
-
-
-
-
-
-
- Preferences
-
-
-
- default
-
-
-
-
- arrow_back
-
-
+
+
+
@@ -25,16 +18,8 @@ exports[`ToolBar has the expected html structure 1`] = `
-
-
- settings
-
-
+
+
diff --git a/test/unit/specs/components/governance/LiProposal.spec.js b/test/unit/specs/components/governance/LiProposal.spec.js
index 89d32986d5..f3d2d8f2d4 100644
--- a/test/unit/specs/components/governance/LiProposal.spec.js
+++ b/test/unit/specs/components/governance/LiProposal.spec.js
@@ -2,8 +2,8 @@ import setup from "../../../helpers/vuex-setup"
import lcdClientMock from "renderer/connectors/lcdClientMock.js"
import LiProposal from "renderer/components/governance/LiProposal"
-let { proposals, tallies } = lcdClientMock.state
-let proposal = proposals[`2`]
+const { proposals, tallies } = lcdClientMock.state
+const proposal = proposals[`2`]
const $store = {
commit: jest.fn(),
@@ -15,16 +15,16 @@ const $store = {
describe(`LiProposal`, () => {
let wrapper
- let { mount } = setup()
+ const { mount } = setup()
beforeEach(() => {
- let instance = mount(LiProposal, {
+ const instance = mount(LiProposal, {
doBefore: ({ store }) => {
store.commit(`setConnected`, true)
store.commit(`setProposal`, proposal)
store.commit(`setProposalTally`, {
proposal_id: `2`,
- tally_result: tallies[`2`]
+ final_tally_result: tallies[`2`]
})
},
propsData: { proposal },
@@ -101,7 +101,7 @@ describe(`LiProposal`, () => {
proposals: { proposals, tallies: {} }
}
}
- let instance = mount(LiProposal, {
+ const instance = mount(LiProposal, {
doBefore: ({ store }) => {
store.commit(`setConnected`, true)
store.commit(`setProposal`, proposal)
diff --git a/test/unit/specs/components/governance/ModalDeposit.spec.js b/test/unit/specs/components/governance/ModalDeposit.spec.js
index 58b5a10900..0477928d09 100644
--- a/test/unit/specs/components/governance/ModalDeposit.spec.js
+++ b/test/unit/specs/components/governance/ModalDeposit.spec.js
@@ -7,29 +7,35 @@ import lcdClientMock from "renderer/connectors/lcdClientMock.js"
describe(`ModalDeposit`, () => {
let wrapper, store
- let { mount, localVue } = setup()
+ const { mount, localVue } = setup()
localVue.use(Vuelidate)
localVue.directive(`tooltip`, () => {})
localVue.directive(`focus`, () => {})
- beforeEach(() => {
+ beforeEach(async () => {
const coins = [
{
amount: `20`,
denom: `stake`
}
]
- let instance = mount(ModalDeposit, {
+ const instance = mount(ModalDeposit, {
localVue,
propsData: {
proposalId: `1`,
proposalTitle: lcdClientMock.state.proposals[`1`].title,
denom: `stake`
- }
+ },
+ sync: false
})
wrapper = instance.wrapper
store = instance.store
+ store.state.connection.connected = true
store.commit(`setWalletBalances`, coins)
+ store.commit(`setSignIn`, true)
+
+ await wrapper.vm.$nextTick()
+ wrapper.vm.$refs.actionModal.open()
})
describe(`component matches snapshot`, () => {
@@ -38,41 +44,23 @@ describe(`ModalDeposit`, () => {
})
})
- describe(`default values are set correctly`, () => {
- it(`the 'amount' defaults to 0`, () => {
- expect(wrapper.vm.amount).toEqual(0)
- })
-
- it(`account password defaults to an empty string`, () => {
- expect(wrapper.vm.password).toEqual(``)
- })
-
- it(`password is hidden by default`, () => {
- expect(wrapper.vm.showPassword).toBe(false)
- })
+ it(`opens`, () => {
+ wrapper.vm.$refs.actionModal.open = jest.fn()
+ wrapper.vm.open()
+ expect(wrapper.vm.$refs.actionModal.open).toHaveBeenCalled()
})
- describe(`Password display`, () => {
- it(`toggles the password between text and password`, () => {
- wrapper.vm.togglePassword()
- expect(wrapper.vm.showPassword).toBe(true)
- wrapper.vm.togglePassword()
- expect(wrapper.vm.showPassword).toBe(false)
- })
- })
-
- describe(`enables or disables 'Deposit' button correctly`, () => {
- describe(`disables the 'Deposit' button`, () => {
+ describe(`validation`, () => {
+ describe(`fails`, () => {
it(`with default values`, () => {
- let depositBtn = wrapper.find(`#submit-deposit`)
- expect(depositBtn.html()).toContain(`disabled="disabled"`)
+ expect(wrapper.vm.validateForm()).toBe(false)
})
- it(`when the amount deposited higher than the user's balance`, () => {
- wrapper.setData({ amount: 25, password: `1234567890` })
- let depositBtn = wrapper.find(`#submit-deposit`)
- expect(depositBtn.html()).toContain(`disabled="disabled"`)
- let errorMessage = wrapper.find(`input#amount + div`)
+ it(`when the amount deposited higher than the user's balance`, async () => {
+ wrapper.setData({ amount: 25 })
+ expect(wrapper.vm.validateForm()).toBe(false)
+ await wrapper.vm.$nextTick()
+ const errorMessage = wrapper.find(`input#amount + div`)
expect(errorMessage.classes()).toContain(`tm-form-msg--error`)
})
@@ -84,63 +72,52 @@ describe(`ModalDeposit`, () => {
}
]
store.commit(`setWalletBalances`, otherCoins)
- wrapper.setData({ amount: 25, password: `1234567890` })
- let depositBtn = wrapper.find(`#submit-deposit`)
- expect(depositBtn.html()).toContain(`disabled="disabled"`)
- })
-
- it(`when the password field is empty`, () => {
- wrapper.setData({ amount: 10, password: `` })
- let depositBtn = wrapper.find(`#submit-deposit`)
- expect(depositBtn.html()).toContain(`disabled="disabled"`)
+ wrapper.setData({ amount: 25 })
+ expect(wrapper.vm.validateForm()).toBe(false)
})
})
- describe(`enables the 'Deposit' button`, () => {
- it(`when the user has enough balance to submit a deposit`, () => {
- wrapper.setData({ amount: 15, password: `1234567890` })
- let submitButton = wrapper.find(`#submit-deposit`)
- expect(submitButton.html()).not.toContain(`disabled="disabled"`)
+ describe(`succeeds`, () => {
+ it(`when the user has enough balance to submit a deposit`, async () => {
+ wrapper.setData({ amount: 15 })
+ expect(wrapper.vm.validateForm()).toBe(true)
})
})
})
- describe(`closes modal correctly`, () => {
- it(`X button emits close signal`, () => {
- wrapper.vm.close()
- expect(wrapper.emittedByOrder()).toEqual([
- {
- name: `update:showModalDeposit`,
- args: [false]
- }
- ])
- })
- })
-
describe(`Deposit`, () => {
- it(`Deposit button casts a deposit and closes modal`, () => {
+ it(`submits a deposit`, async () => {
+ wrapper.vm.$store.dispatch = jest.fn()
+ wrapper.vm.$store.commit = jest.fn()
+
wrapper.setData({ amount: 10 })
- wrapper.vm.onDeposit()
+ await wrapper.vm.submitForm(`local`, `1234567890`)
+
+ expect(wrapper.vm.$store.dispatch.mock.calls).toEqual([
+ [
+ `submitDeposit`,
+ {
+ amount: [
+ {
+ amount: `10`,
+ denom: `stake`
+ }
+ ],
+ proposal_id: `1`,
+ password: `1234567890`,
+ submitType: `local`
+ }
+ ]
+ ])
- expect(wrapper.emittedByOrder()).toEqual([
- {
- name: `submitDeposit`,
- args: [
- {
- amount: [
- {
- amount: `10`,
- denom: `stake`
- }
- ],
- password: ``
- }
- ]
- },
- {
- name: `update:showModalDeposit`,
- args: [false]
- }
+ expect(wrapper.vm.$store.commit.mock.calls).toEqual([
+ [
+ `notify`,
+ {
+ body: `You have successfully deposited your stakes on proposal #1`,
+ title: `Successful deposit!`
+ }
+ ]
])
})
})
diff --git a/test/unit/specs/components/governance/ModalPropose.spec.js b/test/unit/specs/components/governance/ModalPropose.spec.js
index 788011e812..948654d7b6 100644
--- a/test/unit/specs/components/governance/ModalPropose.spec.js
+++ b/test/unit/specs/components/governance/ModalPropose.spec.js
@@ -5,23 +5,22 @@ import ModalPropose from "renderer/components/governance/ModalPropose"
describe(`ModalPropose`, () => {
let wrapper, store
- let { mount } = setup()
+ const { mount } = setup()
- const proposal = {
+ const inputs = {
amount: 15,
title: `A new text proposal for Cosmos`,
- description: `a valid description for the proposal`,
- password: `1234567890`
+ description: `a valid description for the proposal`
}
- beforeEach(() => {
+ beforeEach(async () => {
const coins = [
{
amount: `20`,
denom: `stake`
}
]
- let instance = mount(ModalPropose, {
+ const instance = mount(ModalPropose, {
propsData: {
denom: `stake`
},
@@ -29,7 +28,12 @@ describe(`ModalPropose`, () => {
})
wrapper = instance.wrapper
store = instance.store
+ store.state.connection.connected = true
store.commit(`setWalletBalances`, coins)
+ store.commit(`setSignIn`, true)
+
+ await wrapper.vm.$nextTick()
+ wrapper.vm.$refs.actionModal.open()
})
describe(`component matches snapshot`, () => {
@@ -38,6 +42,12 @@ describe(`ModalPropose`, () => {
})
})
+ it(`opens`, () => {
+ wrapper.vm.$refs.actionModal.open = jest.fn()
+ wrapper.vm.open()
+ expect(wrapper.vm.$refs.actionModal.open).toHaveBeenCalled()
+ })
+
describe(`default values are set correctly`, () => {
it(`the proposal type defaults to 'Text'`, () => {
expect(wrapper.vm.type).toEqual(`Text`)
@@ -50,43 +60,21 @@ describe(`ModalPropose`, () => {
it(`the proposal type defaults to the empty string`, () => {
expect(wrapper.vm.description).toEqual(``)
})
-
- it(`the 'amount' defaults to 0`, () => {
- expect(wrapper.vm.amount).toEqual(0)
- })
-
- it(`account password defaults to an empty string`, () => {
- expect(wrapper.vm.password).toEqual(``)
- })
-
- it(`password is hidden by default`, () => {
- expect(wrapper.vm.showPassword).toBe(false)
- })
- })
-
- describe(`Password display`, () => {
- it(`toggles the password between text and password`, () => {
- wrapper.vm.togglePassword()
- expect(wrapper.vm.showPassword).toBe(true)
- wrapper.vm.togglePassword()
- expect(wrapper.vm.showPassword).toBe(false)
- })
})
- describe(`enables or disables 'Create Proposal' button correctly`, () => {
- describe(`disables the 'Create Proposal' button`, () => {
+ describe(`validation`, () => {
+ describe(`fails`, () => {
it(`with the default values`, () => {
- let proposeBtn = wrapper.find(`#submit-proposal`)
- expect(proposeBtn.html()).toContain(`disabled="disabled"`)
+ expect(wrapper.vm.validateForm()).toBe(false)
})
it(`if the amount for initial deposit is higher than the user's balance`, async () => {
- wrapper.setData(proposal)
+ wrapper.setData(inputs)
wrapper.setData({ amount: 25 })
await wrapper.vm.$nextTick()
- let proposeBtn = wrapper.find(`#submit-proposal`)
- expect(proposeBtn.html()).toContain(`disabled="disabled"`)
- let errorMessage = wrapper.find(`input#amount + div`)
+ expect(wrapper.vm.validateForm()).toBe(false)
+ await wrapper.vm.$nextTick()
+ const errorMessage = wrapper.find(`input#amount + div`)
expect(errorMessage.classes()).toContain(`tm-form-msg--error`)
})
@@ -97,96 +85,87 @@ describe(`ModalPropose`, () => {
denom: `otherCoin`
}
]
- wrapper.setData(proposal)
+ wrapper.setData(inputs)
store.commit(`setWalletBalances`, otherCoins)
wrapper.setData({ amount: 25 })
await wrapper.vm.$nextTick()
- let proposeBtn = wrapper.find(`#submit-proposal`)
- expect(proposeBtn.html()).toContain(`disabled="disabled"`)
+ expect(wrapper.vm.validateForm()).toBe(false)
})
it(`if title is blank`, () => {
- wrapper.setData(proposal)
+ wrapper.setData(inputs)
wrapper.setData({ title: ` ` })
- let proposeBtn = wrapper.find(`#submit-proposal`)
- expect(proposeBtn.html()).toContain(`disabled="disabled"`)
+ expect(wrapper.vm.validateForm()).toBe(false)
})
it(`if description is blank`, () => {
wrapper.setData({ description: ` ` })
- let proposeBtn = wrapper.find(`#submit-proposal`)
- expect(proposeBtn.html()).toContain(`disabled="disabled"`)
+ expect(wrapper.vm.validateForm()).toBe(false)
})
it(`if title is too long disable submit button and show error message`, async () => {
wrapper.setData({ title: `x`.repeat(65) })
await wrapper.vm.$nextTick()
- let proposeBtn = wrapper.find(`#submit-proposal`)
- expect(proposeBtn.html()).toContain(`disabled="disabled"`)
- let errorMessage = wrapper.find(`input#title + div`)
+ expect(wrapper.vm.validateForm()).toBe(false)
+ await wrapper.vm.$nextTick()
+ const errorMessage = wrapper.find(`input#title + div`)
expect(errorMessage.classes()).toContain(`tm-form-msg--error`)
})
it(`if description is too long disable submit button and show error message`, async () => {
wrapper.setData({ description: `x`.repeat(201) })
await wrapper.vm.$nextTick()
- let proposeBtn = wrapper.find(`#submit-proposal`)
- expect(proposeBtn.html()).toContain(`disabled="disabled"`)
- let errorMessage = wrapper.find(`textarea#description + div`)
+ expect(wrapper.vm.validateForm()).toBe(false)
+ await wrapper.vm.$nextTick()
+ const errorMessage = wrapper.find(`textarea#description + div`)
expect(errorMessage.classes()).toContain(`tm-form-msg--error`)
})
it(`if proposal type is invalid`, () => {
- wrapper.setData(proposal)
+ wrapper.setData(inputs)
wrapper.setData({ type: `Other` })
- let proposeBtn = wrapper.find(`#submit-proposal`)
- expect(proposeBtn.html()).toContain(`disabled="disabled"`)
- })
-
- it(`if the password field is empty`, () => {
- wrapper.setData(proposal)
- wrapper.setData({ password: `` })
- let proposeBtn = wrapper.find(`#submit-proposal`)
- expect(proposeBtn.html()).toContain(`disabled="disabled"`)
+ expect(wrapper.vm.validateForm()).toBe(false)
})
})
- describe(`enables the 'Create Proposal' button`, () => {
+ describe(`successful`, () => {
it(`if the user has enough balance and the fields are within the length ranges`, async () => {
- wrapper.setData(proposal)
- await wrapper.vm.$nextTick()
- let submitButton = wrapper.find(`#submit-proposal`)
- expect(submitButton.html()).not.toContain(`disabled="disabled"`)
+ wrapper.setData(inputs)
+ expect(wrapper.vm.validateForm()).toBe(true)
})
})
})
- describe(`closes modal correctly`, () => {
- it(`X button emits close signal`, () => {
- wrapper.vm.close()
- expect(wrapper.emittedByOrder()).toEqual([
- {
- name: `update:showModalPropose`,
- args: [false]
- }
+ describe(`Propose`, () => {
+ it(`submits a proposal`, async () => {
+ wrapper.vm.$store.dispatch = jest.fn()
+ wrapper.vm.$store.commit = jest.fn()
+
+ wrapper.setData(inputs)
+ await wrapper.vm.submitForm(`local`, `1234567890`)
+
+ expect(wrapper.vm.$store.dispatch.mock.calls).toEqual([
+ [
+ `submitProposal`,
+ {
+ description: `a valid description for the proposal`,
+ initial_deposit: [{ amount: `15`, denom: `stake` }],
+ title: `A new text proposal for Cosmos`,
+ type: `Text`,
+ password: `1234567890`,
+ submitType: `local`
+ }
+ ]
])
- })
- })
- describe(`Propose`, () => {
- it(`'Create Proposal' button submits a new proposal and closes modal`, () => {
- wrapper.setData(proposal)
- wrapper.vm.onPropose()
-
- expect(wrapper.emittedByOrder()).toEqual([
- {
- name: `createProposal`,
- args: [{ type: `Text`, ...proposal }]
- },
- {
- name: `update:showModalPropose`,
- args: [false]
- }
+ expect(wrapper.vm.$store.commit.mock.calls).toEqual([
+ [
+ `notify`,
+ {
+ body: `You have successfully submitted a new text proposal`,
+ title: `Successful proposal submission!`
+ }
+ ]
])
})
})
diff --git a/test/unit/specs/components/governance/ModalVote.spec.js b/test/unit/specs/components/governance/ModalVote.spec.js
index eeea27085a..23a6c0e967 100644
--- a/test/unit/specs/components/governance/ModalVote.spec.js
+++ b/test/unit/specs/components/governance/ModalVote.spec.js
@@ -6,94 +6,73 @@ import ModalVote from "renderer/components/governance/ModalVote"
import lcdClientMock from "renderer/connectors/lcdClientMock.js"
describe(`ModalVote`, () => {
- let wrapper
- let { mount, localVue } = setup()
+ let wrapper, store
+ const { mount, localVue } = setup()
localVue.use(Vuelidate)
localVue.directive(`tooltip`, () => {})
localVue.directive(`focus`, () => {})
beforeEach(() => {
- let instance = mount(ModalVote, {
+ const instance = mount(ModalVote, {
localVue,
propsData: {
proposalId: `1`,
proposalTitle: lcdClientMock.state.proposals[`1`].title
}
})
+
+ instance.store.state.connection.connected = true
wrapper = instance.wrapper
- })
+ store = instance.store
+ store.commit(`setSignIn`, true)
- describe(`component matches snapshot`, () => {
- it(`has the expected html structure`, async () => {
- expect(wrapper.vm.$el).toMatchSnapshot()
- })
+ wrapper.vm.$refs.actionModal.open()
})
- describe(`default values are set correctly`, () => {
- it(`the 'option' defaults to an empty string`, () => {
- expect(wrapper.vm.option).toEqual(``)
- })
-
- it(`account password defaults to an empty string`, () => {
- expect(wrapper.vm.password).toEqual(``)
- })
-
- it(`password is hidden by default`, () => {
- expect(wrapper.vm.showPassword).toBe(false)
- })
+ it(`has the expected html structure`, async () => {
+ expect(wrapper.vm.$el).toMatchSnapshot()
})
- describe(`Password display`, () => {
- it(`toggles the password between text and password`, () => {
- wrapper.vm.togglePassword()
- expect(wrapper.vm.showPassword).toBe(true)
- wrapper.vm.togglePassword()
- expect(wrapper.vm.showPassword).toBe(false)
- })
+ it(`opens`, () => {
+ wrapper.vm.$refs.actionModal.open = jest.fn()
+ wrapper.vm.open()
+ expect(wrapper.vm.$refs.actionModal.open).toHaveBeenCalled()
})
- describe(`enables or disables Vote correctly`, () => {
- it(`disables the 'Vote' button`, () => {
+ describe(`validation`, () => {
+ it(`fails`, () => {
+ wrapper.vm.submitForm = jest.fn()
+
// default values
- let voteBtn = wrapper.find(`#cast-vote`)
- expect(voteBtn.html()).toContain(`disabled="disabled"`)
+ expect(wrapper.vm.validateForm()).toBe(false)
// non valid option value
- wrapper.setData({ option: `other`, password: `1234567890` })
- expect(voteBtn.html()).toContain(`disabled="disabled"`)
-
- // no password
- wrapper.setData({ option: `No`, password: `` })
- expect(voteBtn.html()).toContain(`disabled="disabled"`)
+ wrapper.setData({ vote: `other` })
+ expect(wrapper.vm.validateForm()).toBe(false)
})
- it(`enables the 'Vote' button if the user selected a valid option`, () => {
- wrapper.setData({ option: `Yes`, password: `1234567890` })
- let voteBtn = wrapper.find(`#vote-yes`)
- let submitButton = wrapper.find(`#cast-vote`)
- expect(voteBtn.html()).toContain(`active`)
- expect(submitButton.html()).not.toContain(`disabled="disabled"`)
+ it(`succeeds`, async () => {
+ wrapper.vm.submitForm = jest.fn()
- wrapper.setData({ option: `No` })
- voteBtn = wrapper.find(`#vote-no`)
- expect(voteBtn.html()).toContain(`active`)
- expect(submitButton.html()).not.toContain(`disabled="disabled"`)
+ wrapper.setData({ vote: `Yes` })
+ expect(wrapper.vm.validateForm()).toBe(true)
- wrapper.setData({ option: `NoWithVeto` })
- voteBtn = wrapper.find(`#vote-veto`)
- expect(voteBtn.html()).toContain(`active`)
- expect(submitButton.html()).not.toContain(`disabled="disabled"`)
+ wrapper.setData({ vote: `No` })
+ expect(wrapper.vm.validateForm()).toBe(true)
- wrapper.setData({ option: `Abstain` })
- voteBtn = wrapper.find(`#vote-abstain`)
- expect(voteBtn.html()).toContain(`active`)
- expect(submitButton.html()).not.toContain(`disabled="disabled"`)
+ wrapper.setData({ vote: `NoWithVeto` })
+ expect(wrapper.vm.validateForm()).toBe(true)
+
+ wrapper.setData({ vote: `Abstain` })
+ expect(wrapper.vm.validateForm()).toBe(true)
})
})
describe(`Disable already voted options`, () => {
- it(`disable button if equals the last vote: Abstain`, () => {
+ it(`disable button if equals the last vote: Abstain`, async () => {
wrapper.setProps({ lastVoteOption: `Abstain` })
+ await wrapper.vm.$nextTick()
+
let voteBtn = wrapper.find(`#vote-yes`)
expect(voteBtn.html()).not.toContain(`disabled="disabled"`)
voteBtn = wrapper.find(`#vote-no`)
@@ -105,50 +84,34 @@ describe(`ModalVote`, () => {
})
})
- describe(`closes modal correctly`, () => {
- it(`X button emits close signal`, () => {
- wrapper.vm.close()
-
- expect(wrapper.emittedByOrder()).toEqual([
- {
- name: `update:showModalVote`,
- args: [false]
- }
- ])
- })
- })
-
describe(`Vote`, () => {
- it(`updates the selected option on click`, () => {
- wrapper.vm.vote(`Yes`)
- expect(wrapper.vm.option).toEqual(`Yes`)
-
- wrapper.vm.vote(`No`)
- expect(wrapper.vm.option).toEqual(`No`)
-
- wrapper.vm.vote(`NoWithVeto`)
- expect(wrapper.vm.option).toEqual(`NoWithVeto`)
-
- wrapper.vm.vote(`Abstain`)
- expect(wrapper.vm.option).toEqual(`Abstain`)
-
- wrapper.vm.vote(`Abstain`)
- expect(wrapper.vm.option).toEqual(``)
- })
+ it(`submits a vote`, async () => {
+ wrapper.vm.$store.dispatch = jest.fn()
+ wrapper.vm.$store.commit = jest.fn()
+
+ wrapper.setData({ vote: `Yes` })
+ await wrapper.vm.submitForm(`local`, `1234567890`)
+
+ expect(wrapper.vm.$store.dispatch.mock.calls).toEqual([
+ [
+ `submitVote`,
+ {
+ option: `Yes`,
+ proposal_id: `1`,
+ password: `1234567890`,
+ submitType: `local`
+ }
+ ]
+ ])
- it(`Vote button casts a vote and closes modal`, () => {
- wrapper.setData({ option: `Yes`, password: `1234567890` })
- wrapper.vm.onVote()
-
- expect(wrapper.emittedByOrder()).toEqual([
- {
- name: `castVote`,
- args: [{ option: `Yes`, password: `1234567890` }]
- },
- {
- name: `update:showModalVote`,
- args: [false]
- }
+ expect(wrapper.vm.$store.commit.mock.calls).toEqual([
+ [
+ `notify`,
+ {
+ body: `You have successfully voted Yes on proposal #1`,
+ title: `Successful vote!`
+ }
+ ]
])
})
})
diff --git a/test/unit/specs/components/governance/PageGovernance.spec.js b/test/unit/specs/components/governance/PageGovernance.spec.js
index 5ffcf0ef5d..7a2f9dfc04 100644
--- a/test/unit/specs/components/governance/PageGovernance.spec.js
+++ b/test/unit/specs/components/governance/PageGovernance.spec.js
@@ -4,36 +4,35 @@ import PageGovernance from "renderer/components/governance/PageGovernance"
import ModalPropose from "renderer/components/governance/ModalPropose"
import lcdClientMock from "renderer/connectors/lcdClientMock.js"
-const proposal = {
- amount: 15,
- title: `A new text proposal for Cosmos`,
- description: `a valid description for the proposal`,
- type: `Text`,
- password: `1234567890`
-}
const { governanceParameters, stakingParameters } = lcdClientMock.state
-const depositDenom = governanceParameters.deposit.min_deposit[0].denom
+// TODO: refactor according to new unit test standard
describe(`PageGovernance`, () => {
let wrapper, store
- let { mount, localVue } = setup()
+ const { mount, localVue } = setup()
localVue.use(Vuelidate)
localVue.directive(`tooltip`, () => {})
localVue.directive(`focus`, () => {})
beforeEach(() => {
- let instance = mount(PageGovernance, {
+ const instance = mount(PageGovernance, {
doBefore: ({ store }) => {
store.commit(`setGovParameters`, governanceParameters)
+ store.state.governanceParameters.loaded = true
store.commit(`setStakingParameters`, stakingParameters.parameters)
store.commit(`setConnected`, true)
+ store.commit(`setSignIn`, true)
+ },
+ stubs: {
+ "tm-balance": true
}
})
wrapper = instance.wrapper
store = instance.store
store.state.user.address = lcdClientMock.addresses[0]
store.dispatch(`updateDelegates`)
- store.commit(`setAtoms`, 1337)
+
+ wrapper.vm.$refs.modalPropose = { open: () => {} }
})
it(`has the expected html structure`, async () => {
@@ -42,11 +41,6 @@ describe(`PageGovernance`, () => {
expect(wrapper.vm.$el).toMatchSnapshot()
})
- it(`should show the search on click`, () => {
- wrapper.find(`.tm-tool-bar i.search`).trigger(`click`)
- expect(wrapper.contains(`.tm-modal-search`)).toBe(true)
- })
-
it(`disables proposal creation if not connected`, async () => {
expect(
wrapper.vm.$el.querySelector(`#propose-btn`).getAttribute(`disabled`)
@@ -58,71 +52,11 @@ describe(`PageGovernance`, () => {
expect(wrapper.vm.$el).toMatchSnapshot()
})
- describe(`Modal onPropose modal on click`, () => {
- it(`displays the Propose modal`, () => {
- let proposeBtn = wrapper.find(`#propose-btn`)
+ describe(`Modal onPropose`, () => {
+ it(`displays the Propose modal on click`, () => {
+ const proposeBtn = wrapper.find(`#propose-btn`)
proposeBtn.trigger(`click`)
expect(wrapper.contains(ModalPropose)).toEqual(true)
})
})
-
- it(`submits a proposal`, async () => {
- wrapper.vm.$store.commit = jest.fn()
- wrapper.vm.$store.dispatch = jest.fn(() => Promise.resolve())
- await wrapper.vm.propose(proposal)
-
- expect(wrapper.vm.$store.dispatch.mock.calls).toEqual([
- [
- `submitProposal`,
- {
- description: `a valid description for the proposal`,
- initial_deposit: [{ amount: `15`, denom: depositDenom }],
- title: `A new text proposal for Cosmos`,
- type: `Text`,
- password: `1234567890`
- }
- ]
- ])
-
- expect(wrapper.vm.$store.commit.mock.calls).toEqual([
- [
- `notify`,
- {
- body: `You have successfully submitted a new text proposal`,
- title: `Successful proposal submission!`
- }
- ]
- ])
- })
-
- it(`raises an error when submitting a proposal fails`, async () => {
- wrapper.vm.$store.commit = jest.fn()
- wrapper.vm.$store.dispatch = jest.fn(() => {
- throw new Error(`unexpected error`)
- })
- await wrapper.vm.propose(proposal)
-
- expect(wrapper.vm.$store.dispatch.mock.calls).toEqual([
- [
- `submitProposal`,
- {
- description: `a valid description for the proposal`,
- initial_deposit: [{ amount: `15`, denom: depositDenom }],
- title: `A new text proposal for Cosmos`,
- type: `Text`,
- password: `1234567890`
- }
- ]
- ])
-
- expect(wrapper.vm.$store.commit.mock.calls).toEqual([
- [
- `notifyError`,
- {
- body: `unexpected error`,
- title: `Error while submitting a new text proposal`
- }
- ]
- ])
- })
})
diff --git a/test/unit/specs/components/governance/PageProposal.spec.js b/test/unit/specs/components/governance/PageProposal.spec.js
index f5533d0cec..9285717704 100644
--- a/test/unit/specs/components/governance/PageProposal.spec.js
+++ b/test/unit/specs/components/governance/PageProposal.spec.js
@@ -8,17 +8,17 @@ import ModalDeposit from "renderer/components/governance/ModalDeposit"
import ModalVote from "renderer/components/governance/ModalVote"
import lcdClientMock from "renderer/connectors/lcdClientMock.js"
-let {
+const {
proposals,
tallies,
stakingParameters,
governanceParameters
} = lcdClientMock.state
-let proposal = proposals[`2`]
+const proposal = proposals[`2`]
describe(`PageProposal`, () => {
let wrapper, store
- let { mount, localVue } = setup()
+ const { mount, localVue } = setup()
localVue.use(Vuelidate)
localVue.directive(`tooltip`, () => {})
localVue.directive(`focus`, () => {})
@@ -27,38 +27,69 @@ describe(`PageProposal`, () => {
commit: jest.fn(),
dispatch: jest.fn(),
getters: {
+ depositDenom: governanceParameters.deposit.min_deposit[0].denom,
proposals: { proposals, tallies },
- bondDenom: stakingParameters.parameters.bond_denom,
- depositDenom: governanceParameters.deposit.min_deposit[0].denom
+ connected: true,
+ wallet: {
+ address: `cosmos1234abcd5678`
+ }
}
}
beforeEach(() => {
- let instance = mount(PageProposal, {
+ const instance = mount(PageProposal, {
localVue,
doBefore: ({ store }) => {
+ store.commit(`setSignIn`, true)
store.commit(`setConnected`, true)
+ store.state.governanceParameters.loaded = true
store.commit(`setGovParameters`, governanceParameters)
store.commit(`setStakingParameters`, stakingParameters.parameters)
store.commit(`setProposal`, proposal)
store.commit(`setProposalTally`, {
proposal_id: `2`,
- tally_result: tallies[`2`]
+ final_tally_result: tallies[`2`]
})
},
propsData: { proposalId: proposal.proposal_id },
- $store
+ $store,
+ stubs: {
+ "modal-deposit": true,
+ "modal-vote": true
+ }
})
wrapper = instance.wrapper
store = instance.store
+
+ wrapper.vm.$refs.modalDepoist = { open: jest.fn() }
+ wrapper.vm.$refs.modalVote = { open: jest.fn() }
+ })
+
+ describe(`has the expected html structure`, () => {
+ it(`if user has signed in`, async () => {
+ expect(wrapper.vm.$el).toMatchSnapshot()
+ })
+
+ it(`if user hasn't signed in`, async () => {
+ store.commit(`setSignIn`, false)
+ expect(wrapper.vm.$el).toMatchSnapshot()
+ })
})
- it(`has the expected html structure`, async () => {
+ it(`has the expected html structure when voting is open`, async () => {
+ wrapper.setData({
+ tally: {
+ yes: 10,
+ no: 20,
+ no_with_veto: 30,
+ abstain: 40
+ }
+ })
expect(wrapper.vm.$el).toMatchSnapshot()
})
it(`shows an error if the proposal couldn't be found`, () => {
- let instance = mount(PageProposal, {
+ const instance = mount(PageProposal, {
doBefore: ({}) => {
store.commit(`setProposal`, {})
},
@@ -85,7 +116,7 @@ describe(`PageProposal`, () => {
it(`should return the time that voting started`, () => {
expect(wrapper.vm.votingStartedAgo).toEqual(
- moment(new Date(proposal.voting_start_block)).fromNow()
+ moment(new Date(proposal.voting_start_time)).fromNow()
)
})
@@ -138,16 +169,17 @@ describe(`PageProposal`, () => {
describe(`Modal onVote`, () => {
it(`enables voting if the proposal is on the 'VotingPeriod'`, () => {
- let proposal = proposals[`2`]
+ const proposal = proposals[`2`]
proposal.proposal_status = `VotingPeriod`
- let instance = mount(PageProposal, {
+ const instance = mount(PageProposal, {
localVue,
doBefore: ({ store }) => {
+ store.commit(`setSignIn`, true)
store.commit(`setConnected`, true)
store.commit(`setProposal`, proposal)
store.commit(`setProposalTally`, {
proposal_id: `2`,
- tally_result: tallies[`2`]
+ final_tally_result: tallies[`2`]
})
},
propsData: {
@@ -158,7 +190,7 @@ describe(`PageProposal`, () => {
wrapper = instance.wrapper
store = instance.store
- let voteBtn = wrapper.find(`#vote-btn`)
+ const voteBtn = wrapper.find(`#vote-btn`)
voteBtn.trigger(`click`)
expect(wrapper.vm.$store.dispatch.mock.calls).toEqual([
@@ -196,16 +228,17 @@ describe(`PageProposal`, () => {
describe(`Modal onDeposit`, () => {
it(`enables deposits if the proposal on 'DepositPeriod'`, () => {
- let proposal = proposals[`5`]
- let instance = mount(PageProposal, {
+ const proposal = proposals[`5`]
+ const instance = mount(PageProposal, {
localVue,
doBefore: ({ store }) => {
+ store.commit(`setSignIn`, true)
store.commit(`setConnected`, true)
store.commit(`setStakingParameters`, stakingParameters.parameters)
store.commit(`setProposal`, proposal)
store.commit(`setProposalTally`, {
proposal_id: `5`,
- tally_result: tallies[`5`]
+ final_tally_result: tallies[`5`]
})
},
propsData: {
@@ -217,7 +250,7 @@ describe(`PageProposal`, () => {
store = instance.store
store.commit(`setGovParameters`, governanceParameters)
wrapper.vm.proposal.proposal_status = `DepositPeriod`
- let depositBtn = wrapper.find(`#deposit-btn`)
+ const depositBtn = wrapper.find(`#deposit-btn`)
depositBtn.trigger(`click`)
expect(wrapper.contains(ModalDeposit)).toEqual(true)
expect(depositBtn.html()).not.toContain(`disabled="disabled"`)
@@ -226,148 +259,29 @@ describe(`PageProposal`, () => {
it(`disables deposits if the proposal is not active`, () => {
expect(wrapper.find(`#deposit-btn`).exists()).toEqual(false)
})
- })
-
- it(`casts a vote`, async () => {
- wrapper.vm.$store.commit = jest.fn()
- wrapper.vm.$store.dispatch = jest.fn()
- await wrapper.vm.castVote({ option: `Abstain`, password: `12345` })
+ it(`disables interaction buttons if not connected`, () => {
+ store.commit(`setConnected`, false)
- expect(wrapper.vm.$store.dispatch.mock.calls).toEqual([
- [`submitVote`, { option: `Abstain`, proposal_id: `2`, password: `12345` }]
- ])
-
- expect(wrapper.vm.$store.commit.mock.calls).toEqual([
- [
- `notify`,
- {
- body: `You have successfully voted Abstain on proposal #2`,
- title: `Successful vote!`
- }
- ]
- ])
- })
-
- it(`shows an error if casting a vote fails`, async () => {
- wrapper.vm.$store.commit = jest.fn()
- wrapper.vm.$store.dispatch = jest.fn(() => {
- throw new Error(`unexpected error`)
- })
-
- await wrapper.vm.castVote({ option: `NoWithVeto`, password: `12345` })
-
- expect(wrapper.vm.$store.dispatch.mock.calls).toEqual([
- [
- `submitVote`,
- { option: `NoWithVeto`, proposal_id: `2`, password: `12345` }
- ]
- ])
-
- expect(wrapper.vm.$store.commit.mock.calls).toEqual([
- [
- `notifyError`,
- {
- body: `unexpected error`,
- title: `Error while voting on proposal #2`
- }
- ]
- ])
- })
-
- it(`allows the user to deposit on a proposal`, async () => {
- wrapper.vm.$store.commit = jest.fn()
- wrapper.vm.$store.dispatch = jest.fn()
-
- let amount = [
- {
- amount: `15`,
- denom: `atom`
- }
- ]
-
- await wrapper.vm.deposit({ amount, password: `12345` })
-
- expect(wrapper.vm.$store.dispatch.mock.calls).toEqual([
- [
- `submitDeposit`,
- {
- amount,
- proposal_id: `2`,
- password: `12345`
- }
- ]
- ])
-
- expect(wrapper.vm.$store.commit.mock.calls).toEqual([
- [
- `notify`,
- {
- body: `You have successfully deposited your STAKEs on proposal #2`,
- title: `Successful deposit!`
- }
- ]
- ])
- })
-
- it(`shows an error if depositing on a proposal fails`, async () => {
- wrapper.vm.$store.commit = jest.fn()
- wrapper.vm.$store.dispatch = jest.fn(() => {
- throw new Error(`unexpected error`)
+ store.commit(
+ `setProposal`,
+ Object.assign({}, proposal, {
+ proposal_status: `VotingPeriod`
+ })
+ )
+ expect(
+ wrapper.vm.$el.querySelector(`#vote-btn`).getAttribute(`disabled`)
+ ).toBe(`disabled`)
+
+ store.commit(
+ `setProposal`,
+ Object.assign({}, proposal, {
+ proposal_status: `DepositPeriod`
+ })
+ )
+ expect(
+ wrapper.vm.$el.querySelector(`#deposit-btn`).getAttribute(`disabled`)
+ ).toBe(`disabled`)
})
-
- let amount = [
- {
- amount: `9`,
- denom: `atom`
- }
- ]
-
- await wrapper.vm.deposit({ amount, password: `12345` })
-
- expect(wrapper.vm.$store.dispatch.mock.calls).toEqual([
- [
- `submitDeposit`,
- {
- amount,
- proposal_id: `2`,
- password: `12345`
- }
- ]
- ])
-
- expect(wrapper.vm.$store.commit.mock.calls).toEqual([
- [
- `notifyError`,
- {
- body: `unexpected error`,
- title: `Error while submitting a deposit on proposal #2`
- }
- ]
- ])
- })
-
- it(`disables interaction buttons if not connected`, () => {
- store.commit(`setConnected`, false)
-
- store.commit(
- `setProposal`,
- Object.assign({}, proposal, {
- proposal_status: `VotingPeriod`
- })
- )
- expect(
- wrapper.vm.$el.querySelector(`#vote-btn`).getAttribute(`disabled`)
- ).toBe(`disabled`)
-
- store.commit(
- `setProposal`,
- Object.assign({}, proposal, {
- proposal_status: `DepositPeriod`
- })
- )
- expect(
- wrapper.vm.$el.querySelector(`#deposit-btn`).getAttribute(`disabled`)
- ).toBe(`disabled`)
})
})
diff --git a/test/unit/specs/components/governance/TabParameters.spec.js b/test/unit/specs/components/governance/TabParameters.spec.js
index ffb3c798eb..d015bb3b20 100644
--- a/test/unit/specs/components/governance/TabParameters.spec.js
+++ b/test/unit/specs/components/governance/TabParameters.spec.js
@@ -3,11 +3,11 @@ import setup from "../../../helpers/vuex-setup"
import TabParameters from "renderer/components/governance/TabParameters"
import lcdClientMock from "renderer/connectors/lcdClientMock.js"
-let { governanceParameters, stakingParameters } = lcdClientMock.state
+const { governanceParameters, stakingParameters } = lcdClientMock.state
describe(`TabParameters`, () => {
let wrapper, store
- let { mount, localVue } = setup()
+ const { mount, localVue } = setup()
localVue.use(Vuelidate)
localVue.directive(`tooltip`, () => {})
localVue.directive(`focus`, () => {})
@@ -23,7 +23,7 @@ describe(`TabParameters`, () => {
}
beforeEach(() => {
- let instance = mount(TabParameters, {
+ const instance = mount(TabParameters, {
localVue,
doBefore: ({ store }) => {
store.commit(`setGovParameters`, governanceParameters)
@@ -47,7 +47,7 @@ describe(`TabParameters`, () => {
})
it(`displays the minimum deposit`, () => {
- let coin = governanceParameters.deposit.min_deposit[0]
+ const coin = governanceParameters.deposit.min_deposit[0]
expect(wrapper.vm.minimumDeposit).toEqual(`${coin.amount} ${coin.denom}s`)
})
diff --git a/test/unit/specs/components/governance/TabProposals.spec.js b/test/unit/specs/components/governance/TabProposals.spec.js
index 2b127a799e..eab242b3b7 100644
--- a/test/unit/specs/components/governance/TabProposals.spec.js
+++ b/test/unit/specs/components/governance/TabProposals.spec.js
@@ -2,13 +2,13 @@ import setup from "../../../helpers/vuex-setup"
import TabProposals from "renderer/components/governance/TabProposals"
const lcdClientMock = require(`renderer/connectors/lcdClientMock.js`)
-let { tallies } = lcdClientMock.state
+const { tallies } = lcdClientMock.state
describe(`TabProposals`, () => {
- let { mount } = setup()
+ const { mount } = setup()
it(`has the expected html structure`, async () => {
- let { wrapper } = mount(TabProposals, {
+ const { wrapper } = mount(TabProposals, {
getters: {
proposals: () => ({
loading: false,
@@ -26,7 +26,7 @@ describe(`TabProposals`, () => {
})
it(`shows a message if still connecting`, async () => {
- let { wrapper } = mount(TabProposals, {
+ const { wrapper } = mount(TabProposals, {
getters: {
proposals: () => ({
loading: false,
@@ -44,7 +44,7 @@ describe(`TabProposals`, () => {
})
it(`shows a message if still loading`, async () => {
- let { wrapper } = mount(TabProposals, {
+ const { wrapper } = mount(TabProposals, {
getters: {
proposals: () => ({
loading: true,
@@ -62,7 +62,7 @@ describe(`TabProposals`, () => {
})
it(`shows a message if there is nothing to display`, async () => {
- let { wrapper } = mount(TabProposals, {
+ const { wrapper } = mount(TabProposals, {
getters: {
proposals: () => ({
loading: false,
diff --git a/test/unit/specs/components/governance/TableProposals.spec.js b/test/unit/specs/components/governance/TableProposals.spec.js
index 457c5aaccf..3d98893bb9 100644
--- a/test/unit/specs/components/governance/TableProposals.spec.js
+++ b/test/unit/specs/components/governance/TableProposals.spec.js
@@ -2,11 +2,11 @@ import setup from "../../../helpers/vuex-setup"
import TableProposals from "renderer/components/governance/TableProposals"
import lcdClientMock from "renderer/connectors/lcdClientMock.js"
-let { proposals, tallies } = lcdClientMock.state
+const { proposals, tallies } = lcdClientMock.state
describe(`TableProposals`, () => {
let wrapper, store
- let { mount } = setup()
+ const { mount } = setup()
const $store = {
commit: jest.fn(),
@@ -17,11 +17,14 @@ describe(`TableProposals`, () => {
}
beforeEach(() => {
- let instance = mount(TableProposals, {
+ const instance = mount(TableProposals, {
doBefore: ({ store }) => {
store.commit(`setConnected`, true)
store.state.user.address = `address1234`
- store.commit(`setAtoms`, 1337)
+ store.commit(`updateWalletBalance`, {
+ denom: `atom`,
+ amount: 1337
+ })
for (const [proposal_id, tally_result] of Object.entries(tallies)) {
store.commit(`setProposalTally`, { proposal_id, tally_result })
}
@@ -79,11 +82,14 @@ describe(`TableProposals`, () => {
})
it(`should show placeholder if no items to display`, () => {
- let { wrapper } = mount(TableProposals, {
+ const { wrapper } = mount(TableProposals, {
doBefore: ({ store }) => {
store.commit(`setConnected`, true)
store.state.user.address = `address1234`
- store.commit(`setAtoms`, 1337)
+ store.commit(`updateWalletBalance`, {
+ denom: `atom`,
+ amount: 1337
+ })
},
propsData: { proposals: {} },
stubs: { "data-empty-search": true }
diff --git a/test/unit/specs/components/governance/__snapshots__/ModalDeposit.spec.js.snap b/test/unit/specs/components/governance/__snapshots__/ModalDeposit.spec.js.snap
index f69f92ce25..d1720e3ab4 100644
--- a/test/unit/specs/components/governance/__snapshots__/ModalDeposit.spec.js.snap
+++ b/test/unit/specs/components/governance/__snapshots__/ModalDeposit.spec.js.snap
@@ -2,24 +2,28 @@
exports[`ModalDeposit component matches snapshot has the expected html structure 1`] = `
+
- Deposit
+
+ Deposit
+
-
+
+
`;
diff --git a/test/unit/specs/components/governance/__snapshots__/ModalPropose.spec.js.snap b/test/unit/specs/components/governance/__snapshots__/ModalPropose.spec.js.snap
index 09053fec5f..326de6e19e 100644
--- a/test/unit/specs/components/governance/__snapshots__/ModalPropose.spec.js.snap
+++ b/test/unit/specs/components/governance/__snapshots__/ModalPropose.spec.js.snap
@@ -2,24 +2,28 @@
exports[`ModalPropose component matches snapshot has the expected html structure 1`] = `
+
- Deposit
+
+ Deposit
+
-
-
-
- Title: Proposal Title -
- -- Proposal ID: #1 -
-
-
-
-
-
-
-
-
-
-
+
-
+
- +
+
+ stake
+
+
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
+
+
+
+
- Create Proposal
+
+ Proposal
+
+
+
+
- Vote
+
+ Vote
+
-
-
-
-
- - Title: Proposal Title -
- -- Proposal ID: #1 -
-
+
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
- - Total STAKE -
- -- 1,337.0000… -
-
-
- - Available STAKE -
- -- 1,337.0000… -
-
-
-
-
-
- cosmos…xxn9
-
-
-
-
-
- check
-
-
- Copied
-
-
-
-
-
-
-
-
- Proposals
-
-
-
-
- Parameters
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
- - Total STAKE -
- -- 1,351.0000… -
-
-
- - Available STAKE -
- -- 1,337.0000… -
-
-
-
-
-
- cosmos…xxn9
-
-
-
-
-
- check
-
-
- Copied
-
-
-
-
-
-
-
-
- Proposals
-
-
-
-
- Parameters
-
-
-
+
+
+
+
+
+
+
-
+`;
+
+exports[`PageProposal has the expected html structure if user hasn't signed in 1`] = `
+
-
+
+
+
+
+ + #2 +
+ +
+
+
+
+
+
+
+ + VotingPeriod proposal +
+ ++ + Proposer: Fede + +
+
+
+
+
+
+
+
+
+
+
+
+ -
+
- + Submitted + + +
- + a few seconds ago + +
-
+
- + Proposal Status + + +
- + + Voting started in 2 days. + + +
-
+
- + Deposit Count + + +
- + + 200 STAKE + + +
-
+
- + Vote Count + + +
- + 0 + +
+
+
+
+
+
+ -
+
- + Yes + + +
- + 0 / 0% + +
-
+
- + No + + +
- + 0 / 0% + +
-
+
- + No with Veto + + +
- + 0 / 0% + +
-
+
- + Abstain + + +
- + 0 / 0% + +
+
+
+
+ -
+
- + Description + + +
-
+ ++
+ custom text proposal description +
+ + +
+
+
+
+
+
+
+
+
+
+
+
+`;
+
+exports[`PageProposal has the expected html structure when voting is open 1`] = `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + Total STAKE +
+ ++ 0.0000… +
+
+
+ + Available STAKE +
+ ++ 0.0000… +
+
+
+
+
+
+
+
+ Address Not Found
+
+
+
+
+
+ check
+
+
+ Copied
+
+
+
+
+
+
+
+
+ + #2 +
+ +
+
+
+
+
+
+
+ + VotingPeriod proposal +
+ ++ + Proposer: Fede + +
+
+
+
+
+
+
+
+
+
+
+
+ -
+
- + Submitted + + +
- + a few seconds ago + +
-
+
- + Proposal Status + + +
- + + Voting started in 2 days. + + +
-
+
- + Deposit Count + + +
- + + 200 STAKE + + +
-
+
- + Vote Count + + +
- + 0 + +
+
+
+
+
+
+ -
+
- + Yes + + +
- + 0 / 0% + +
-
+
- + No + + +
- + 0 / 0% + +
-
+
- + No with Veto + + +
- + 0 / 0% + +
-
+
- + Abstain + + +
- + 0 / 0% + +
+
+
+
+ -
+
- + Description + + +
-
+ ++
+ custom text proposal description +
+ + +
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- arrow_back
-
-
-
+ Available STAKE
+
+
+
+
+
+
-
+
+
+
+
+
-
+ Total STAKE
+
+
+
- - arrow_back -
- + 0.0000… + ++ 0.0000… +
+
+
-
- settings
-
-
-
- exit_to_app
+ check
-
+
+ Copied
+
+
-
- help_outline
-
-
+
+ Address Not Found
+
+
-
+
+ + #2 +
+
-
+
+
-
-
-
+ Proposer: Fede
+
+
-
-
-
-
- VotingPeriod proposal (#2)
+ VotingPeriod proposal
+
+
+
-
-
-
+
+
+ -
+
- + Submitted + + +
- + a few seconds ago + +
-
+ Proposal Status
+
+
+
- Submitted a few seconds ago.
- Voting started a few seconds ago
+ Voting started in 2 days.
-
-
+
+
- +
-
+ -
-
- - Deposit - - -
- - - 200 STAKE +
- + Deposit Count + + +
- - -
-
+
- + Vote Count + - +
- + 100 + +
+
-
+
+
+ -
+
- + Yes + -
- - Yes - - -
- - 0 / 0% - -
- + 10 / 10% + +
-
-
-
+
- + No + -
- - No - - -
- - 0 / 0% - -
- + 20 / 20% + +
-
-
-
+
- + No with Veto + -
- - No with Veto - - -
- - 0 / 0% - -
- + 30 / 30% + +
-
-
-
+
- + Abstain + +
- + 40 / 40% + +
+
- - Abstain + Description
-
- 0 / 0%
+ +
+ custom text proposal description +
+ + +
-
-
-
+
-
-
-
-
-
- - custom text proposal description -
- - -
-
-
-
- - Deposit Parameters - - - info_outline - -
- +
-
+
+ Maximum Deposit Period
+
+
+ info_outline
+
+
+
+
+
+ 1 days
+
+
+
-
-
- -
-
- - - Minimum Deposit - - - info_outline - - - -
- - - 10.0000000000 STAKEs - - -
+
+ Minimum Deposit
+
+
+ info_outline
+
+
+
+
+
+ 10.0000000000 STAKEs
+
+
+
+
+
+
+
+ -
-
- - - Maximum Deposit Period - - - info_outline - - - -
- - - 1 days - - -
-
-
-
-
Title
+
+ arrow_drop_up
+
- Proposal id
+ Proposal Id
+
+ arrow_drop_up
+
Yes
+
+ arrow_drop_up
+
No
+
+ arrow_drop_up
+
No with Veto
+
+ arrow_drop_up
+
Abstain
+
+ arrow_drop_up
+
diff --git a/test/unit/specs/components/governance/__snapshots__/TableProposals.spec.js.snap b/test/unit/specs/components/governance/__snapshots__/TableProposals.spec.js.snap
index 6b74b9193e..861ac5916c 100644
--- a/test/unit/specs/components/governance/__snapshots__/TableProposals.spec.js.snap
+++ b/test/unit/specs/components/governance/__snapshots__/TableProposals.spec.js.snap
@@ -10,57 +10,87 @@ exports[`TableProposals has the expected html structure 1`] = `
class="panel-sort-container"
>
Title
+
+ arrow_drop_up
+
- Proposal id
+ Proposal Id
+
+ arrow_drop_up
+
Yes
+
+ arrow_drop_up
+
No
+
+ arrow_drop_up
+
No with Veto
+
+ arrow_drop_up
+
Abstain
+
+ arrow_drop_up
+
@@ -316,57 +346,87 @@ exports[`TableProposals should filter the proposals 1`] = `
class="panel-sort-container"
>
Title
+
+ arrow_drop_up
+
- Proposal id
+ Proposal Id
+
+ arrow_drop_up
+
Yes
+
+ arrow_drop_up
+
No
+
+ arrow_drop_up
+
No with Veto
+
+ arrow_drop_up
+
Abstain
+
+ arrow_drop_up
+
diff --git a/test/unit/specs/components/network/PageBlock.spec.js b/test/unit/specs/components/network/PageBlock.spec.js
new file mode 100644
index 0000000000..11f28360ee
--- /dev/null
+++ b/test/unit/specs/components/network/PageBlock.spec.js
@@ -0,0 +1,77 @@
+import { shallowMount, createLocalVue } from "@vue/test-utils"
+import PageBlock from "renderer/components/network/PageBlock"
+
+const localVue = createLocalVue()
+localVue.directive(`tooltip`, () => {})
+
+describe(`PageBlock`, () => {
+ let wrapper
+
+ beforeEach(() => {
+ const getters = {
+ connected: true,
+ block: {
+ block_meta: {
+ block_id: {
+ hash: `ABCD1234`
+ }
+ },
+ block: {
+ data: {
+ txs: `txs`
+ },
+ header: {
+ height: `100`,
+ num_txs: 1200,
+ proposer_address: `ABCDEFG123456HIJKLMNOP`,
+ time: Date.now()
+ },
+ evidence: {
+ evidence: `evidence`
+ },
+ last_commit: {
+ precommits: [
+ {
+ validator_address: `validator address`,
+ timestamp: Date.now(),
+ round: 0
+ }
+ ]
+ }
+ }
+ }
+ }
+
+ wrapper = shallowMount(PageBlock, {
+ localVue,
+ mocks: {
+ $store: {
+ getters,
+ dispatch: jest.fn()
+ },
+ $route: {
+ params: { height: `100` }
+ }
+ },
+ stubs: [`router-link`]
+ })
+ })
+
+ it(`has the expected html structure`, () => {
+ expect(wrapper.vm.$el).toMatchSnapshot()
+ })
+
+ it(`sets properties for the block table`, () => {
+ expect(wrapper.vm.properties).toEqual([
+ {
+ title: `Proposer`
+ },
+ {
+ title: `Time`
+ },
+ {
+ title: `Round`
+ }
+ ])
+ })
+})
diff --git a/test/unit/specs/components/network/PageNetwork.spec.js b/test/unit/specs/components/network/PageNetwork.spec.js
new file mode 100644
index 0000000000..10e5ddad6e
--- /dev/null
+++ b/test/unit/specs/components/network/PageNetwork.spec.js
@@ -0,0 +1,123 @@
+import { shallowMount, createLocalVue } from "@vue/test-utils"
+import PageNetwork from "renderer/components/network/PageNetwork"
+
+const localVue = createLocalVue()
+localVue.directive(`tooltip`, () => {})
+
+describe(`PageNetwork`, () => {
+ let wrapper, $store
+
+ beforeEach(() => {
+ $store = {
+ getters: {
+ connected: true,
+ lastHeader: {
+ chain_id: `gaia-20k`,
+ proposer_address: `EFH47FH723HDHSH`,
+ height: `6001`,
+ total_txs: `108`,
+ time: Date.now()
+ },
+ delegates: {
+ delegates: [
+ {
+ a: `b`,
+ c: `d`
+ }
+ ]
+ },
+ config: {
+ devMode: true
+ },
+ pool: {
+ pool: {
+ bonded_tokens: 125,
+ loose_tokens: 10
+ }
+ },
+ bondDenom: `stake`,
+ blocks: [
+ {
+ header: {
+ height: `100`,
+ num_txs: 1200,
+ proposer_address: `ABCDEFG123456HIJKLMNOP`
+ }
+ },
+ {
+ header: {
+ height: `101`,
+ num_txs: 405,
+ proposer_address: `ZYXCRS123456HIJKLMNOPQ`
+ }
+ }
+ ]
+ }
+ }
+
+ wrapper = shallowMount(PageNetwork, {
+ localVue,
+ mocks: {
+ $store
+ },
+ stubs: [`router-link`]
+ })
+ })
+
+ it(`has the expected html structure`, () => {
+ expect(wrapper.vm.$el).toMatchSnapshot()
+ })
+
+ it(`sets the status correctly`, () => {
+ expect(wrapper.vm.status).toEqual({
+ color: `green`,
+ message: `Network is up and running`
+ })
+
+ $store = {
+ getters: {
+ connected: false
+ }
+ }
+
+ wrapper = shallowMount(PageNetwork, {
+ localVue,
+ mocks: {
+ $store
+ },
+ stubs: [`router-link`]
+ })
+
+ expect(wrapper.vm.status).toEqual({
+ color: `red`,
+ message: `Network is down`
+ })
+ })
+
+ it(`sets last block to something human readable`, () => {
+ expect(wrapper.vm.lastBlock).toEqual(`a few seconds ago`)
+ })
+
+ it(`sets propertoes for the block table`, () => {
+ expect(wrapper.vm.properties).toEqual([
+ {
+ title: `Block Number`,
+ value: `block_number`,
+ tooltip: `Block Number`,
+ class: `blockNumber`
+ },
+ {
+ title: `Transactions`,
+ value: `transactions`,
+ tooltip: `Number of transactions per block`,
+ class: `transactions`
+ },
+ {
+ title: `Proposer`,
+ value: `proposer`,
+ tooltip: `Validator responsible for block proposals`,
+ class: `proposer`
+ }
+ ])
+ })
+})
diff --git a/test/unit/specs/components/network/__snapshots__/PageBlock.spec.js.snap b/test/unit/specs/components/network/__snapshots__/PageBlock.spec.js.snap
new file mode 100644
index 0000000000..ab48b16245
--- /dev/null
+++ b/test/unit/specs/components/network/__snapshots__/PageBlock.spec.js.snap
@@ -0,0 +1,113 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`PageBlock has the expected html structure 1`] = `
+
+
+
+`;
diff --git a/test/unit/specs/components/network/__snapshots__/PageNetwork.spec.js.snap b/test/unit/specs/components/network/__snapshots__/PageNetwork.spec.js.snap
new file mode 100644
index 0000000000..95af163216
--- /dev/null
+++ b/test/unit/specs/components/network/__snapshots__/PageNetwork.spec.js.snap
@@ -0,0 +1,184 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`PageNetwork has the expected html structure 1`] = `
+
+
+
+
+
+
+`;
diff --git a/test/unit/specs/components/staking/DelegationModal.spec.js b/test/unit/specs/components/staking/DelegationModal.spec.js
index 4f8e9567e0..1e8df3080c 100644
--- a/test/unit/specs/components/staking/DelegationModal.spec.js
+++ b/test/unit/specs/components/staking/DelegationModal.spec.js
@@ -7,16 +7,17 @@ import lcdClientMock from "renderer/connectors/lcdClientMock.js"
describe(`DelegationModal`, () => {
let wrapper, store
- let { stakingParameters } = lcdClientMock.state
- let { mount, localVue } = setup()
+ const { stakingParameters } = lcdClientMock.state
+ const { mount, localVue } = setup()
localVue.use(Vuelidate)
localVue.directive(`tooltip`, () => {})
localVue.directive(`focus`, () => {})
beforeEach(() => {
- let instance = mount(DelegationModal, {
+ const instance = mount(DelegationModal, {
localVue,
propsData: {
+ validator: lcdClientMock.state.candidates[0],
fromOptions: [
{
address: `cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9`,
@@ -25,7 +26,7 @@ describe(`DelegationModal`, () => {
value: 0
},
{
- address: `cosmos126ayk3hse5zvk9gxfmpsjr9565ef72pv9g20yx`,
+ address: lcdClientMock.state.candidates[0].operator_address,
key: `Billy the Bill - cosmos…psjr9565ef72pv9g20yx`,
maximum: 23.0484375481,
value: 1
@@ -43,7 +44,14 @@ describe(`DelegationModal`, () => {
})
wrapper = instance.wrapper
store = instance.store
+
+ store.state.connection.connected = true
+ store.state.wallet.address = `cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9`
+ store.state.delegates.delegates = lcdClientMock.state.candidates
store.commit(`setStakingParameters`, stakingParameters.parameters)
+ store.commit(`setSignIn`, true)
+
+ wrapper.vm.$refs.actionModal.open()
})
describe(`component matches snapshot`, () => {
@@ -52,106 +60,93 @@ describe(`DelegationModal`, () => {
})
})
- describe(`default values are set correctly`, () => {
- it(`the 'amount' defaults to 0`, () => {
- expect(wrapper.vm.amount).toEqual(0)
- })
-
- it(`displays the user's wallet address as the default`, () => {
- let toField = wrapper.find(`#to`)
- expect(toField).toBeDefined()
- expect(toField.element.value).toEqual(
- `cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctplpn3au`
- )
- })
-
- it(`account password defaults to an empty string`, () => {
- expect(wrapper.vm.password).toEqual(``)
- })
-
- it(`password is hidden by default`, () => {
- expect(wrapper.vm.showPassword).toBe(false)
- })
+ it(`opens`, () => {
+ wrapper.vm.$refs.actionModal.open = jest.fn()
+ wrapper.vm.open()
+ expect(wrapper.vm.$refs.actionModal.open).toHaveBeenCalled()
})
- describe(`Password display`, () => {
- it(`toggles the password between text and password`, () => {
- wrapper.vm.togglePassword()
- expect(wrapper.vm.showPassword).toBe(true)
- wrapper.vm.togglePassword()
- expect(wrapper.vm.showPassword).toBe(false)
- })
- })
-
- describe(`enables or disables the Delegation button correctly`, () => {
- describe(`disables the 'Delegation' button`, () => {
+ describe(`validation`, () => {
+ describe(`fails`, () => {
it(`with default values`, () => {
- let delegationBtn = wrapper.find(`#submit-delegation`)
- expect(delegationBtn.html()).toContain(`disabled="disabled"`)
+ expect(wrapper.vm.validateForm()).toBe(false)
})
it(`if the user manually inputs a number greater than the balance`, () => {
- wrapper.setData({ amount: 142, password: `1234567890` })
- let amountField = wrapper.find(`#amount`)
-
- let delegationBtn = wrapper.find(`#submit-delegation`)
- expect(delegationBtn.html()).toContain(`disabled="disabled"`)
- let errorMessage = wrapper.find(`input#amount + div`)
- expect(errorMessage.classes()).toContain(`tm-form-msg--error`)
-
- amountField.trigger(`input`)
- expect(amountField.element.value).toBe(`100`)
- })
-
- it(`if the password field is empty`, () => {
- wrapper.setData({ amount: 10, password: `` })
- let delegationBtn = wrapper.find(`#submit-delegation`)
- expect(delegationBtn.html()).toContain(`disabled="disabled"`)
+ wrapper.setData({ amount: 142 })
+ expect(wrapper.vm.validateForm()).toBe(false)
})
})
- describe(`enables the 'Delegation' button`, () => {
- it(`if the amout is positive and the user has enough balance`, () => {
- wrapper.setData({ amount: 50, password: `1234567890` })
-
- let delegationBtn = wrapper.find(`#submit-delegation`)
- expect(delegationBtn.html()).not.toContain(`disabled="disabled"`)
+ describe(`succeeds`, () => {
+ it(`if the amount is positive and the user has enough balance`, () => {
+ wrapper.setData({ amount: 50 })
+ expect(wrapper.vm.validateForm()).toBe(true)
})
})
})
describe(`(Re)delegate`, () => {
- it(`Delegation button submits a (re)delegation and closes modal`, () => {
- wrapper.setData({ amount: 50, password: `1234567890` })
- wrapper.vm.onDelegation()
-
- expect(wrapper.emittedByOrder()).toEqual([
- {
- name: `submitDelegation`,
- args: [
- {
- amount: 50,
- from: `cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9`,
- password: `1234567890`
- }
- ]
- },
- {
- name: `update:showDelegationModal`,
- args: [false]
- }
+ it(`submits a delegation`, async () => {
+ wrapper.vm.$store.dispatch = jest.fn()
+ wrapper.vm.$store.commit = jest.fn()
+
+ wrapper.setData({ amount: 50 })
+ await wrapper.vm.submitForm(`local`, `1234567890`)
+
+ expect(wrapper.vm.$store.dispatch.mock.calls).toEqual([
+ [
+ `submitDelegation`,
+ {
+ amount: `50`,
+ // validatorSrc: lcdClientMock.state.candidates[1],
+ // validatorDst: lcdClientMock.state.candidates[0],
+ validator_addr: `cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctqzh8yqw`,
+ password: `1234567890`,
+ submitType: `local`
+ }
+ ]
+ ])
+
+ expect(wrapper.vm.$store.commit.mock.calls).toEqual([
+ [
+ `notify`,
+ {
+ body: `You have successfully delegated your STAKEs`,
+ title: `Successful delegation!`
+ }
+ ]
])
})
- })
- describe(`closes modal correctly`, () => {
- it(`X button emits close signal`, () => {
- wrapper.vm.close()
- expect(wrapper.emittedByOrder()).toEqual([
- {
- name: `update:showDelegationModal`,
- args: [false]
- }
+ it(`submits a redelegation`, async () => {
+ wrapper.vm.$store.dispatch = jest.fn()
+ wrapper.vm.$store.commit = jest.fn()
+
+ wrapper.setData({ amount: 50, selectedIndex: 1 })
+ await wrapper.vm.submitForm(`local`, `1234567890`)
+
+ expect(wrapper.vm.$store.dispatch.mock.calls).toEqual([
+ [
+ `submitRedelegation`,
+ {
+ amount: `50`,
+ validatorSrc: lcdClientMock.state.candidates[0],
+ validatorDst: lcdClientMock.state.candidates[0],
+ submitType: `local`,
+ password: `1234567890`
+ }
+ ]
+ ])
+
+ expect(wrapper.vm.$store.commit.mock.calls).toEqual([
+ [
+ `notify`,
+ {
+ body: `You have successfully redelegated your STAKEs`,
+ title: `Successful redelegation!`
+ }
+ ]
])
})
})
diff --git a/test/unit/specs/components/staking/LiValidator.spec.js b/test/unit/specs/components/staking/LiValidator.spec.js
index 5eee31e901..b348d041ed 100644
--- a/test/unit/specs/components/staking/LiValidator.spec.js
+++ b/test/unit/specs/components/staking/LiValidator.spec.js
@@ -4,7 +4,7 @@ import LiValidator from "renderer/components/staking/LiValidator"
describe(`LiValidator`, () => {
let wrapper, store
- let { mount } = setup()
+ const { mount } = setup()
const validator = Object.assign({}, lcdClientMock.state.candidates[1], {
commission: {
rate: `0.05`,
@@ -24,7 +24,7 @@ describe(`LiValidator`, () => {
})
beforeEach(() => {
- let instance = mount(LiValidator, {
+ const instance = mount(LiValidator, {
propsData: {
validator,
disabled: false
@@ -41,7 +41,7 @@ describe(`LiValidator`, () => {
})
it(`should calculate the validator's power ratio`, () => {
- let ratio = wrapper.vm.validator.tokens / wrapper.vm.delegates.globalPower
+ const ratio = wrapper.vm.validator.tokens / wrapper.vm.delegates.globalPower
expect(wrapper.vm.powerRatio).toBe(ratio)
})
diff --git a/test/unit/specs/components/staking/PageStaking.spec.js b/test/unit/specs/components/staking/PageStaking.spec.js
index e24f196364..cd75a45b58 100644
--- a/test/unit/specs/components/staking/PageStaking.spec.js
+++ b/test/unit/specs/components/staking/PageStaking.spec.js
@@ -2,37 +2,34 @@ import setup from "../../../helpers/vuex-setup"
import PageStaking from "renderer/components/staking/PageStaking"
import lcdClientMock from "renderer/connectors/lcdClientMock.js"
+// TODO refactor according to new unit test standard
describe(`PageStaking`, () => {
let wrapper, store
- let { stakingParameters } = lcdClientMock.state
- let { mount } = setup()
+ const { mount } = setup()
beforeEach(() => {
- let instance = mount(PageStaking)
+ const instance = mount(PageStaking, {
+ doBefore: ({ store }) => {
+ store.commit(`setSignIn`, true)
+ store.commit(`setConnected`, true)
+ store.dispatch(`updateDelegates`)
+ },
+ stubs: {
+ "tm-balance": true
+ }
+ })
wrapper = instance.wrapper
store = instance.store
-
- store.commit(`setConnected`, true)
store.state.user.address = lcdClientMock.addresses[0]
- store.dispatch(`updateDelegates`)
- store.commit(`setAtoms`, 1337)
- store.commit(`setStakingParameters`, stakingParameters.parameters)
})
- it(`has the expected html structure`, async () => {
- // somehow we need to wait one tick for the total atoms to update
- await wrapper.vm.$nextTick()
+ it(`has the expected html structure`, () => {
expect(wrapper.vm.$el).toMatchSnapshot()
})
- it(`should show the search on click`, () => {
- wrapper.find(`.tm-tool-bar i.search`).trigger(`click`)
- expect(wrapper.contains(`.tm-modal-search`)).toBe(true)
- })
-
it(`should refresh candidates on click`, () => {
wrapper
- .findAll(`.tm-tool-bar i`)
+ .findAll(`.tool-bar i`)
.at(1)
.trigger(`click`)
expect(store.dispatch).toHaveBeenCalledWith(`updateDelegates`)
diff --git a/test/unit/specs/components/staking/PageValidator.spec.js b/test/unit/specs/components/staking/PageValidator.spec.js
index 828ab0d9b7..18ed901f13 100644
--- a/test/unit/specs/components/staking/PageValidator.spec.js
+++ b/test/unit/specs/components/staking/PageValidator.spec.js
@@ -1,4 +1,3 @@
-import Delegation from "renderer/vuex/modules/delegation"
import DelegationModal from "staking/DelegationModal"
import UndelegationModal from "staking/UndelegationModal"
import TmModal from "common/TmModal"
@@ -13,11 +12,14 @@ const validator = Object.assign({}, lcdClientMock.state.candidates[0], {
rate: `0.05`,
max_rate: `0.1`,
max_change_rate: `0.005`,
- update_time: `1970-01-01T00:00:00Z`
+ update_time: Date.now() - 1
},
prev_bonded_shares: `0`,
voting_power: `10`,
- selfBond: 0.01
+ selfBond: 0.01,
+ signing_info: {
+ missed_blocks_counter: 2
+ }
})
const validatorTo = lcdClientMock.state.candidates[1]
@@ -34,10 +36,13 @@ const getterValues = {
committedDelegations: {
[lcdClientMock.validators[0]]: 0
},
+ lastHeader: {
+ height: 500
+ },
keybase: `keybase`,
- oldBondedAtoms: 50,
- totalAtoms: 100,
- user: { atoms: 42 },
+ liquidAtoms: 1337,
+ oldBondedAtoms: 100,
+ totalAtoms: 1437,
wallet: { address: `cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9` },
connected: true,
lastPage: null,
@@ -45,18 +50,20 @@ const getterValues = {
bondDenom: stakingParameters.parameters.bond_denom
}
+// TODO refactor tests according to new unit test standard
describe(`PageValidator`, () => {
let wrapper, store
- let { mount } = setup()
+ const { mount } = setup()
beforeEach(() => {
- let instance = mount(PageValidator, {
+ const instance = mount(PageValidator, {
doBefore: ({ store }) => {
store.commit(`setCommittedDelegation`, {
candidateId: lcdClientMock.validators[0],
value: `123.45678`
})
store.commit(`setConnected`, true)
+ store.commit(`setSignIn`, true)
store.commit(`setDelegates`, [validator, validatorTo])
},
mocks: {
@@ -64,14 +71,33 @@ describe(`PageValidator`, () => {
params: { validator: validator.operator_address }
}
},
- getters: { bondDenom: () => stakingParameters.parameters.bond_denom }
+ stubs: {
+ "undelegation-modal": true,
+ "delegation-modal": true
+ },
+ getters: {
+ bondDenom: () => stakingParameters.parameters.bond_denom,
+ wallet: () => ({
+ address: `cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9`
+ })
+ }
})
wrapper = instance.wrapper
store = instance.store
+
+ wrapper.vm.$refs.undelegationModal = { open: () => {} }
+ wrapper.vm.$refs.delegationModal = { open: () => {} }
})
- it(`has the expected html structure`, async () => {
- expect(wrapper.vm.$el).toMatchSnapshot()
+ describe(`has the expected html structure`, () => {
+ it(`if user has signed in`, async () => {
+ expect(wrapper.vm.$el).toMatchSnapshot()
+ })
+
+ it(`if user hasn't signed in`, async () => {
+ store.commit(`setSignIn`, false)
+ expect(wrapper.vm.$el).toMatchSnapshot()
+ })
})
it(`should return one delegate based on route params`, () => {
@@ -84,24 +110,47 @@ describe(`PageValidator`, () => {
expect(wrapper.vm.$el).toMatchSnapshot()
})
+ it(`should return the self bond based on the validator`, () => {
+ const validator = {
+ selfBond: 1
+ }
+ wrapper.setData({ validator })
+ expect(wrapper.vm.selfBond).toBe(`100.00%`)
+
+ validator.selfBond = undefined
+ wrapper.setData({ validator })
+ expect(wrapper.vm.selfBond).toBe(`0.00%`)
+ })
+
it(`shows an error if the validator couldn't be found`, () => {
- let instance = mount(PageValidator, {
+ const instance = mount(PageValidator, {
getters: {
config: () => ({ desktop: false }),
delegates: () => ({
delegates: []
}),
- bondDenom: () => stakingParameters.parameters.bond_denom
+ bondDenom: () => stakingParameters.parameters.bond_denom,
+ wallet: () => ({
+ address: `cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9`
+ })
},
mocks: {
$route: {
params: { validator: validator.operator_address }
}
+ },
+ stubs: {
+ "undelegation-modal": true,
+ "delegation-modal": true
}
})
wrapper = instance.wrapper
store = instance.store
+
+ wrapper.vm.$refs.undelegationModal = { open: () => {} }
+ wrapper.vm.$refs.delegationModal = { open: () => {} }
+
expect(wrapper.vm.$el).toMatchSnapshot()
})
@@ -113,7 +162,7 @@ describe(`PageValidator`, () => {
},
ratio: 0.01
})
- expect(wrapper.find(`#page-profile__self-bond`).text()).toBe(`1.00 %`)
+ expect(wrapper.find(`#page-profile__self-bond`).text()).toBe(`1.00%`)
})
it(`should show the validator status`, () => {
@@ -237,12 +286,12 @@ describe(`PageValidator`, () => {
describe(`delegationTargetOptions`, () => {
it(`always shows wallet in the first position`, () => {
- let $store = {
+ const $store = {
commit: jest.fn(),
dispatch: jest.fn()
}
- let options = PageValidator.methods.delegationTargetOptions.call({
+ const options = PageValidator.methods.delegationTargetOptions.call({
...getterValues,
committedDelegations: {},
$store,
@@ -257,12 +306,12 @@ describe(`delegationTargetOptions`, () => {
})
it(`hides displayed validator if bonded`, () => {
- let $store = {
+ const $store = {
commit: jest.fn(),
dispatch: jest.fn()
}
- let options = PageValidator.methods.delegationTargetOptions.call({
+ const options = PageValidator.methods.delegationTargetOptions.call({
...getterValues,
committedDelegations: {
[lcdClientMock.validators[0]]: 10
@@ -288,12 +337,12 @@ describe(`delegationTargetOptions`, () => {
})
it(`shows bonded validators for redelegation options`, () => {
- let $store = {
+ const $store = {
commit: jest.fn(),
dispatch: jest.fn()
}
- let options = PageValidator.methods.delegationTargetOptions.call({
+ const options = PageValidator.methods.delegationTargetOptions.call({
...getterValues,
committedDelegations: {
[lcdClientMock.validators[0]]: 10,
@@ -325,336 +374,86 @@ describe(`delegationTargetOptions`, () => {
})
})
-describe(`onDelegation`, () => {
+describe(`Staking functions`, () => {
let wrapper, store
beforeEach(() => {
- let { mount } = setup()
+ const { mount } = setup()
- let instance = mount(PageValidator, {
+ const instance = mount(PageValidator, {
doBefore: ({ store }) => {
+ store.commit(`setSignIn`, true)
store.commit(`setCommittedDelegation`, {
candidateId: lcdClientMock.validators[0],
value: 100
})
- store.commit(`setAtoms`, 1337)
store.commit(`setConnected`, true)
+ store.commit(`setStakingParameters`, stakingParameters.parameters)
store.commit(`setDelegates`, [validator, validatorTo])
+ store.commit(`updateWalletBalance`, {
+ denom: `STAKE`,
+ amount: 1337
+ })
store.state.wallet.address = lcdClientMock.addresses[0]
+ store.commit(`setStakingParameters`, stakingParameters.parameters)
},
mocks: {
$route: {
params: { validator: validator.operator_address }
}
},
- getters: { bondDenom: () => stakingParameters.parameters.bond_denom }
+ stubs: {
+ "undelegation-modal": true,
+ "delegation-modal": true
+ },
+ getters: {
+ bondDenom: () => stakingParameters.parameters.bond_denom,
+ wallet: () => ({
+ address: `cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9`
+ })
+ }
})
wrapper = instance.wrapper
store = instance.store
- })
-
- describe(`make sure we have enough atoms to delegate`, () => {
- it(`is enough`, () => {
- wrapper.find(`#delegation-btn`).trigger(`click`)
- expect(wrapper.contains(DelegationModal)).toEqual(true)
- })
-
- it(`is not enough`, () => {
- store.commit(`setAtoms`, 0)
-
- wrapper.find(`#delegation-btn`).trigger(`click`)
- expect(wrapper.vm.showCannotModal).toBe(true)
- expect(wrapper.contains(TmModal)).toEqual(true)
- expect(wrapper.text()).toContain(`delegate.`) // ...no atoms to delegate.
- expect(wrapper.vm.$el).toMatchSnapshot()
- wrapper.find(`#no-atoms-modal__btn`).trigger(`click`)
- expect(wrapper.vm.showCannotModal).toBe(false)
- expect(wrapper.contains(TmModal)).toEqual(false)
- expect(wrapper.text()).not.toContain(`delegate.`) // ...no atoms to delegate.
- expect(wrapper.vm.$el).toMatchSnapshot()
- })
+ wrapper.vm.$refs.undelegationModal = { open: () => {} }
+ wrapper.vm.$refs.delegationModal = { open: () => {} }
})
- describe(`submitDelegation`, () => {
- describe(`delegation`, () => {
- describe(`unit`, () => {
- it(`success`, async () => {
- let $store = {
- commit: jest.fn(),
- dispatch: jest.fn(),
- getters: { bondDenom: stakingParameters.parameters.bond_denom }
- }
- const address = `cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9`
-
- await PageValidator.methods.submitDelegation.call(
- {
- ...getterValues,
- validator,
- $store
- },
- {
- amount: 10,
- from: address,
- password: `12345`
- }
- )
-
- expect($store.dispatch.mock.calls).toEqual([
- [
- `submitDelegation`,
- {
- password: `12345`,
- validator_addr: validator.operator_address,
- amount: 10
- }
- ]
- ])
- expect($store.commit.mock.calls).toEqual([
- [
- `notify`,
- {
- body: `You have successfully delegated your ${
- stakingParameters.parameters.bond_denom
- }s`,
- title: `Successful delegation!`
- }
- ]
- ])
- })
-
- it(`error`, async () => {
- let $store = {
- commit: jest.fn(),
- dispatch: jest.fn(() => {
- throw new Error(`message`)
- }),
- getters: { bondDenom: stakingParameters.parameters.bond_denom }
- }
- const address = `cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9`
-
- await PageValidator.methods.submitDelegation.call(
- {
- ...getterValues,
- validator,
- $store
- },
- {
- amount: 10000000,
- from: address,
- password: `12345`
- }
- )
-
- expect($store.dispatch.mock.calls).toEqual([
- [
- `submitDelegation`,
- {
- password: `12345`,
- validator_addr: validator.operator_address,
- amount: 10000000
- }
- ]
- ])
-
- expect($store.commit.mock.calls).toEqual([
- [
- `notifyError`,
- {
- body: `message`,
- title: `Error while delegating ${
- stakingParameters.parameters.bond_denom
- }s`
- }
- ]
- ])
- })
- })
-
- describe(`composition`, () => {
- it(`delegation.submitDelegation`, async () => {
- const delegation = Delegation({})
- const address = `cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9`
- const dispatch = jest.fn((type, payload) => {
- if (type === `submitDelegation`) {
- delegation.actions[type]($store, payload)
- }
- })
-
- const $store = {
- commit: jest.fn(),
- dispatch,
- rootState: getterValues,
- state: {
- committedDelegates: { [lcdClientMock.validators[0]]: 0 },
- unbondingDelegations: {},
- getters: { bondDenom: stakingParameters.parameters.bond_denom }
- }
- }
-
- await PageValidator.methods.submitDelegation.call(
- {
- ...getterValues,
- validator,
- $store
- },
- {
- amount: 10,
- from: address,
- password: `12345`
- }
- )
-
- expect($store.dispatch.mock.calls).toMatchSnapshot()
- expect($store.commit.mock.calls).toMatchSnapshot()
- })
+ describe(`onDelegation`, () => {
+ describe(`make sure we have enough atoms to delegate`, () => {
+ it(`is enough`, () => {
+ wrapper.find(`#delegation-btn`).trigger(`click`)
+ expect(wrapper.contains(DelegationModal)).toEqual(true)
})
- })
- describe(`redelegation`, () => {
- describe(`unit`, () => {
- it(`success`, async () => {
- let $store = {
- commit: jest.fn(),
- dispatch: jest.fn(),
- getters: { bondDenom: stakingParameters.parameters.bond_denom }
- }
-
- await PageValidator.methods.submitDelegation.call(
- {
- ...getterValues,
- validator: validatorTo,
- $store
- },
- {
- amount: 5,
- from: validator.operator_address,
- password: `12345`
- }
- )
-
- expect($store.dispatch.mock.calls).toEqual([
- [
- `submitRedelegation`,
- {
- password: `12345`,
- validatorSrc: validator,
- validatorDst: validatorTo,
- amount: 5
- }
- ]
- ])
-
- expect($store.commit.mock.calls).toEqual([
- [
- `notify`,
- {
- title: `Successful redelegation!`,
- body: `You have successfully redelegated your ${
- stakingParameters.parameters.bond_denom
- }s`
- }
- ]
- ])
+ it(`is not enough`, () => {
+ store.commit(`updateWalletBalance`, {
+ denom: `STAKE`,
+ amount: 0
})
- it(`error`, async () => {
- let $store = {
- commit: jest.fn(),
- dispatch: jest.fn(() => {
- throw new Error(`message`)
- }),
- getters: { bondDenom: stakingParameters.parameters.bond_denom }
- }
-
- await PageValidator.methods.submitDelegation.call(
- {
- ...getterValues,
- validator: validatorTo,
- $store,
- $route: {
- params: { validator: validatorTo.operator_address }
- }
- },
- {
- password: `12345`,
- amount: 5,
- from: validator.operator_address,
- password: `12345`
- }
- )
-
- expect($store.dispatch.mock.calls).toEqual([
- [
- `submitRedelegation`,
- {
- password: `12345`,
- validatorSrc: validator,
- validatorDst: validatorTo,
- amount: 5
- }
- ]
- ])
-
- expect($store.commit.mock.calls).toEqual([
- [
- `notifyError`,
- {
- title: `Error while redelegating ${
- stakingParameters.parameters.bond_denom
- }s`,
- body: `message`
- }
- ]
- ])
- })
- })
+ wrapper.find(`#delegation-btn`).trigger(`click`)
+ expect(wrapper.vm.showCannotModal).toBe(true)
+ expect(wrapper.contains(TmModal)).toEqual(true)
+ expect(wrapper.text()).toContain(`delegate.`) // ...no atoms to delegate.
+ expect(wrapper.vm.$el).toMatchSnapshot()
- describe(`composition`, () => {
- it(`redelegation.submitDelegation`, async () => {
- const delegation = Delegation({})
-
- const dispatch = jest.fn((type, payload) => {
- if (type === `submitDelegation`) {
- delegation.actions[type]($store, payload)
- }
- })
-
- const $store = {
- commit: jest.fn(),
- dispatch,
- getters: getterValues,
- rootState: getterValues,
- state: {
- committedDelegates: { [lcdClientMock.validators[0]]: 10 },
- unbondingDelegations: {},
- getters: { bondDenom: stakingParameters.parameters.bond_denom }
- }
- }
-
- await PageValidator.methods.submitDelegation.call(
- {
- ...getterValues,
- validator: validatorTo,
- $store
- },
- {
- password: `12345`,
- amount: 5,
- from: validator.operator_address,
- password: `12345`
- }
- )
-
- expect($store.dispatch.mock.calls).toMatchSnapshot()
- expect($store.commit.mock.calls).toMatchSnapshot()
- })
+ wrapper.find(`#no-atoms-modal__btn`).trigger(`click`)
+ expect(wrapper.vm.showCannotModal).toBe(false)
+ expect(wrapper.contains(TmModal)).toEqual(false)
+ expect(wrapper.text()).not.toContain(`delegate.`) // ...no atoms to delegate.
+ expect(wrapper.vm.$el).toMatchSnapshot()
})
})
})
- describe(`onUnstake`, () => {
+ describe(`onUndelegation`, () => {
describe(`make sure there are enough atoms to unstake`, () => {
+ beforeEach(() => {
+ store.commit(`setSignIn`, true)
+ })
+
it(`is enough`, () => {
store.commit(`setCommittedDelegation`, {
candidateId: lcdClientMock.validators[0],
@@ -663,11 +462,10 @@ describe(`onDelegation`, () => {
wrapper.find(`#undelegation-btn`).trigger(`click`)
expect(wrapper.vm.myBond.isGreaterThan(0)).toBe(true)
- expect(wrapper.vm.showUndelegationModal).toBe(true)
expect(wrapper.contains(UndelegationModal)).toEqual(true)
})
- it(`is not enough`, () => {
+ it(`is not enough`, async () => {
store.commit(`setCommittedDelegation`, {
candidateId: lcdClientMock.validators[0],
value: 0
@@ -684,136 +482,5 @@ describe(`onDelegation`, () => {
expect(wrapper.vm.$el).toMatchSnapshot()
})
})
-
- describe(`submitUndelegation`, () => {
- describe(`unit`, () => {
- it(`success`, async () => {
- let $store = {
- commit: jest.fn(),
- dispatch: jest.fn(),
- getters: { bondDenom: stakingParameters.parameters.bond_denom }
- }
-
- await PageValidator.methods.submitUndelegation.call(
- {
- ...getterValues,
- validator,
- $store
- },
- {
- amount: 10,
- password: `12345`
- }
- )
-
- expect($store.dispatch.mock.calls).toEqual([
- [
- `submitUnbondingDelegation`,
- {
- password: `12345`,
- amount: -10,
- validator
- }
- ]
- ])
-
- expect($store.commit.mock.calls).toEqual([
- [
- `notify`,
- {
- body: `You have successfully undelegated 10 ${
- stakingParameters.parameters.bond_denom
- }s.`,
- title: `Successful undelegation!`
- }
- ]
- ])
- })
-
- it(`error`, async () => {
- let $store = {
- commit: jest.fn(),
- dispatch: jest.fn(() => {
- throw new Error(`message`)
- }),
- getters: { bondDenom: stakingParameters.parameters.bond_denom }
- }
-
- await PageValidator.methods.submitUndelegation.call(
- {
- ...getterValues,
- validator,
- $store
- },
- {
- amount: 10,
- password: `12345`
- }
- )
-
- expect($store.dispatch.mock.calls).toEqual([
- [
- `submitUnbondingDelegation`,
- {
- password: `12345`,
- amount: -10,
- validator
- }
- ]
- ])
-
- expect($store.commit.mock.calls).toEqual([
- [
- `notifyError`,
- {
- body: `message`,
- title: `Error while undelegating ${
- stakingParameters.parameters.bond_denom
- }s`
- }
- ]
- ])
- })
- })
-
- describe(`composition`, () => {
- it(`submits a successful undelegation`, async () => {
- const delegation = Delegation({})
-
- const dispatch = jest.fn((type, payload) => {
- if (type === `submitDelegation`) {
- delegation.actions[type]($store, payload)
- }
- })
-
- const $store = {
- commit: jest.fn(),
- dispatch,
- getters: getterValues,
- rootState: getterValues,
- state: {
- committedDelegates: { [lcdClientMock.validators[0]]: 10 },
- unbondingDelegations: {},
- getters: { bondDenom: stakingParameters.parameters.bond_denom }
- }
- }
-
- await PageValidator.methods.submitUndelegation.call(
- {
- ...getterValues,
- validator,
- $store
- },
- {
- password: `12345`,
- amount: 10
- }
- )
-
- expect($store.dispatch.mock.calls).toMatchSnapshot()
- expect($store.commit.mock.calls).toMatchSnapshot()
- })
- })
- })
})
})
diff --git a/test/unit/specs/components/staking/PanelSort.spec.js b/test/unit/specs/components/staking/PanelSort.spec.js
index d49e4f3ea8..125639ba3e 100644
--- a/test/unit/specs/components/staking/PanelSort.spec.js
+++ b/test/unit/specs/components/staking/PanelSort.spec.js
@@ -3,10 +3,10 @@ import PanelSort from "renderer/components/staking/PanelSort"
describe(`PanelSort`, () => {
let wrapper
- let instance = setup()
+ const instance = setup()
beforeEach(() => {
- let test = instance.mount(PanelSort, {
+ const test = instance.mount(PanelSort, {
propsData: {
sort: {
order: `asc`
@@ -31,8 +31,8 @@ describe(`PanelSort`, () => {
})
it(`should show an arrow according to ordering`, () => {
- let firstCol = wrapper.vm.$el.querySelector(`.sort-by`)
- let link = wrapper.vm.$el.querySelector(`.sort-by-link`)
+ const firstCol = wrapper.vm.$el.querySelector(`.sort-by`)
+ const link = wrapper.vm.$el.querySelector(`.sort-by-link`)
expect(firstCol.className.split(` `)).not.toContain(`asc`)
expect(firstCol.className.split(` `)).not.toContain(`desc`)
link.click()
@@ -47,10 +47,10 @@ describe(`PanelSort`, () => {
})
it(`should only sort one col actively`, () => {
- let firstCol = wrapper.vm.$el.querySelectorAll(`.sort-by`)[0]
- let secondCol = wrapper.vm.$el.querySelectorAll(`.sort-by`)[1]
- let firstLink = wrapper.vm.$el.querySelectorAll(`.sort-by-link`)[0]
- let secondLink = wrapper.vm.$el.querySelectorAll(`.sort-by-link`)[1]
+ const firstCol = wrapper.vm.$el.querySelectorAll(`.sort-by`)[0]
+ const secondCol = wrapper.vm.$el.querySelectorAll(`.sort-by`)[1]
+ const firstLink = wrapper.vm.$el.querySelectorAll(`.sort-by-link`)[0]
+ const secondLink = wrapper.vm.$el.querySelectorAll(`.sort-by-link`)[1]
firstLink.click()
secondLink.click()
expect(firstCol.className.split(` `)).not.toContain(`asc`)
diff --git a/test/unit/specs/components/staking/TabMyDelegations.spec.js b/test/unit/specs/components/staking/TabMyDelegations.spec.js
index 9dd43877ed..f4b6bdb013 100644
--- a/test/unit/specs/components/staking/TabMyDelegations.spec.js
+++ b/test/unit/specs/components/staking/TabMyDelegations.spec.js
@@ -12,11 +12,11 @@ const unbondingTransactions = lcdClientMock.state.txs.slice(5).map(t => {
})
describe(`Component: TabMyDelegations`, () => {
- let { mount } = setup()
+ const { mount } = setup()
const { stakingParameters } = lcdClientMock.state
it(`should show committed validators`, () => {
- let instance = mount(TabMyDelegations, {
+ const instance = mount(TabMyDelegations, {
getters: {
committedDelegations: () => ({
[delegates[0].operator_address]: 42
@@ -41,7 +41,7 @@ describe(`Component: TabMyDelegations`, () => {
it(`should show unbonding validators and the current committed validator`, () => {
const address = delegates[0].operator_address
- let instance = mount(TabMyDelegations, {
+ const instance = mount(TabMyDelegations, {
getters: {
// We decided that is should not be possible to undelegate from something that is not committed
committedDelegations: () => ({
@@ -54,7 +54,7 @@ describe(`Component: TabMyDelegations`, () => {
unbondingDelegations: {
[address]: {
creation_height: `170`,
- min_time: new Date().toISOString()
+ min_time: new Date(Date.now()).toISOString()
}
},
loaded: true
@@ -65,12 +65,12 @@ describe(`Component: TabMyDelegations`, () => {
}
})
- expect(instance.wrapper.html()).toContain(`Unbonding transactions`)
+ expect(instance.wrapper.html()).toContain(`Pending Undelegations`)
expect(instance.wrapper.vm.$el).toMatchSnapshot()
})
it(`should show a message if not staked yet to any validator`, () => {
- let instance = mount(TabMyDelegations, {
+ const instance = mount(TabMyDelegations, {
getters: {
committedDelegations: () => ({}),
delegates: () => ({
@@ -89,7 +89,7 @@ describe(`Component: TabMyDelegations`, () => {
})
it(`should show a message if not still connecting to a node`, () => {
- let instance = mount(TabMyDelegations, {
+ const instance = mount(TabMyDelegations, {
getters: {
committedDelegations: () => ({}),
delegates: () => ({
@@ -111,7 +111,7 @@ describe(`Component: TabMyDelegations`, () => {
})
it(`should show a message if not still loading delegations`, () => {
- let instance = mount(TabMyDelegations, {
+ const instance = mount(TabMyDelegations, {
getters: {
committedDelegations: () => ({}),
delegates: () => ({
diff --git a/test/unit/specs/components/staking/TabParameters.spec.js b/test/unit/specs/components/staking/TabParameters.spec.js
index b6bef6898e..462fc5e273 100644
--- a/test/unit/specs/components/staking/TabParameters.spec.js
+++ b/test/unit/specs/components/staking/TabParameters.spec.js
@@ -2,14 +2,14 @@ import setup from "../../../helpers/vuex-setup"
import TabParameters from "renderer/components/staking/TabParameters"
import lcdClientMock from "renderer/connectors/lcdClientMock.js"
-let { pool, stakingParameters } = lcdClientMock.state
+const { stakingParameters } = lcdClientMock.state
describe(`TabParameters`, () => {
let wrapper, store
- let { mount } = setup()
+ const { mount } = setup()
beforeEach(() => {
- let instance = mount(TabParameters, {
+ const instance = mount(TabParameters, {
stubs: {
"tm-data-connecting": true,
"tm-data-loading": true
@@ -18,21 +18,18 @@ describe(`TabParameters`, () => {
wrapper = instance.wrapper
store = instance.store
store.commit(`setConnected`, true)
- store.commit(`setPool`, pool)
store.commit(`setStakingParameters`, stakingParameters.parameters)
store.state.stakingParameters.loaded = true
- store.state.pool.loaded = true
})
it(`has the expected html structure`, async () => {
expect(wrapper.vm.$el).toMatchSnapshot()
})
- it(`shows the staking parameters and pool`, () => {
+ it(`shows the staking parameters`, () => {
expect(store.state.stakingParameters.parameters).toEqual(
stakingParameters.parameters
)
- expect(store.state.pool.pool).toEqual(pool)
})
it(`displays unbonding period in days`, () => {
@@ -47,25 +44,23 @@ describe(`TabParameters`, () => {
expect(wrapper.vm.$el).toMatchSnapshot()
store.state.stakingParameters.loaded = true
- store.state.pool.loaded = false
+
expect(wrapper.vm.$el).toMatchSnapshot()
- expect(wrapper.contains(`tm-data-connecting-stub`)).toBe(true)
+ expect(wrapper.contains(`tm-data-connecting-stub`)).toBe(false)
})
it(`displays a message if loading`, () => {
store.commit(`setConnected`, true)
store.state.stakingParameters.loaded = false
store.state.stakingParameters.loading = true
- store.state.pool.loaded = true
- store.state.pool.loading = true
+
expect(wrapper.vm.$el).toMatchSnapshot()
expect(wrapper.contains(`tm-data-loading-stub`)).toBe(true)
store.state.stakingParameters.loaded = true
store.state.stakingParameters.loading = false
- store.state.pool.loaded = false
- store.state.pool.loading = true
+
expect(wrapper.vm.$el).toMatchSnapshot()
- expect(wrapper.contains(`tm-data-loading-stub`)).toBe(true)
+ expect(wrapper.contains(`tm-data-loading-stub`)).toBe(false)
})
})
diff --git a/test/unit/specs/components/staking/TabValidators.spec.js b/test/unit/specs/components/staking/TabValidators.spec.js
index 2aba0c7d8b..6bf4b9fbbe 100644
--- a/test/unit/specs/components/staking/TabValidators.spec.js
+++ b/test/unit/specs/components/staking/TabValidators.spec.js
@@ -2,15 +2,15 @@ import setup from "../../../helpers/vuex-setup"
import TabValidators from "renderer/components/staking/TabValidators"
import lcdClientMock from "renderer/connectors/lcdClientMock.js"
-let { stakingParameters } = lcdClientMock.state
+const { stakingParameters } = lcdClientMock.state
describe(`TabValidators`, () => {
let wrapper
let store
- let { mount } = setup()
+ const { mount } = setup()
beforeEach(async () => {
- let instance = mount(TabValidators, {
+ const instance = mount(TabValidators, {
doBefore: ({ store }) => {
store.commit(`setConnected`, true)
},
diff --git a/test/unit/specs/components/staking/TableValidators.spec.js b/test/unit/specs/components/staking/TableValidators.spec.js
index 253ca892dc..cfc02fbcd3 100644
--- a/test/unit/specs/components/staking/TableValidators.spec.js
+++ b/test/unit/specs/components/staking/TableValidators.spec.js
@@ -2,24 +2,30 @@ import setup from "../../../helpers/vuex-setup"
import TableValidators from "renderer/components/staking/TableValidators"
import lcdClientMock from "renderer/connectors/lcdClientMock.js"
-let { stakingParameters } = lcdClientMock.state
+const { stakingParameters } = lcdClientMock.state
describe(`TableValidators`, () => {
let wrapper, store
- let { mount } = setup()
+ const { mount } = setup()
beforeEach(() => {
- let instance = mount(TableValidators, {
+ const instance = mount(TableValidators, {
doBefore: ({ store }) => {
store.commit(`setConnected`, true)
- store.commit(`setAtoms`, 1337)
+ store.commit(`updateWalletBalance`, {
+ denom: `atom`,
+ amount: 1337
+ })
},
propsData: { validators: lcdClientMock.candidates }
})
wrapper = instance.wrapper
store = instance.store
store.state.user.address = `address1234`
- store.commit(`setAtoms`, 1337)
+ store.commit(`updateWalletBalance`, {
+ denom: `atom`,
+ amount: 1337
+ })
store.commit(`setStakingParameters`, stakingParameters.parameters)
})
@@ -68,6 +74,32 @@ describe(`TableValidators`, () => {
expect(wrapper.vm.somethingToSearch).toBe(false)
})
+ it(`should disallow delegation if user can't delegate`, () => {
+ let res = TableValidators.computed.userCanDelegate.call({
+ liquidAtoms: 0,
+ delegation: {
+ loaded: true
+ }
+ })
+ expect(res).toBe(false)
+
+ res = TableValidators.computed.userCanDelegate.call({
+ liquidAtoms: 1,
+ delegation: {
+ loaded: true
+ }
+ })
+ expect(res).toBe(true)
+
+ res = TableValidators.computed.userCanDelegate.call({
+ liquidAtoms: 1,
+ delegation: {
+ loaded: false
+ }
+ })
+ expect(res).toBe(false)
+ })
+
describe(`setSearch`, () => {
it(`should show search when there is something to search`, () => {
const $store = {
diff --git a/test/unit/specs/components/staking/UndelegationModal.spec.js b/test/unit/specs/components/staking/UndelegationModal.spec.js
index de7403beee..41f79cdea1 100644
--- a/test/unit/specs/components/staking/UndelegationModal.spec.js
+++ b/test/unit/specs/components/staking/UndelegationModal.spec.js
@@ -7,130 +7,99 @@ import lcdClientMock from "renderer/connectors/lcdClientMock.js"
describe(`UndelegationModal`, () => {
let wrapper, store
- let { stakingParameters } = lcdClientMock.state
- let { mount, localVue } = setup()
+ const { stakingParameters } = lcdClientMock.state
+ const { mount, localVue } = setup()
localVue.use(Vuelidate)
localVue.directive(`tooltip`, () => {})
localVue.directive(`focus`, () => {})
beforeEach(() => {
- let instance = mount(UndelegationModal, {
+ const instance = mount(UndelegationModal, {
localVue,
propsData: {
maximum: 100,
+ validator: lcdClientMock.state.candidates[0],
to: `cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctplpn3au`,
- denom: stakingParameters.parameters.bond_denom
+ denom: stakingParameters.parameters.bond_denom,
+ fromOptions: [
+ {
+ address: `cosmosval1234`
+ }
+ ]
}
})
wrapper = instance.wrapper
store = instance.store
+ store.state.connection.connected = true
store.commit(`setStakingParameters`, stakingParameters.parameters)
+ store.commit(`setSignIn`, true)
+
+ wrapper.vm.$refs.actionModal.open()
})
describe(`component matches snapshot`, () => {
- it(`has the expected html structure`, async () => {
+ it(`has the expected html structure`, () => {
expect(wrapper.vm.$el).toMatchSnapshot()
})
})
- describe(`default values are set correctly`, () => {
- it(`the 'amount' defaults to 0`, () => {
- expect(wrapper.vm.amount).toEqual(0)
- })
+ it(`opens`, () => {
+ wrapper.vm.$refs.actionModal.open = jest.fn()
+ wrapper.vm.open()
+ expect(wrapper.vm.$refs.actionModal.open).toHaveBeenCalled()
+ })
+ describe(`default values are set correctly`, () => {
it(`displays the user's wallet address as the default`, () => {
- let toField = wrapper.find(`#to`)
+ const toField = wrapper.find(`#to`)
expect(toField).toBeDefined()
expect(toField.element.value).toEqual(
`cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctplpn3au`
)
})
-
- it(`account password defaults to an empty string`, () => {
- expect(wrapper.vm.password).toEqual(``)
- })
-
- it(`password is hidden by default`, () => {
- expect(wrapper.vm.showPassword).toBe(false)
- })
- })
-
- describe(`Password display`, () => {
- it(`toggles the password between text and password`, () => {
- wrapper.vm.togglePassword()
- expect(wrapper.vm.showPassword).toBe(true)
- wrapper.vm.togglePassword()
- expect(wrapper.vm.showPassword).toBe(false)
- })
})
- describe(`enables or disables the Delegation button correctly`, () => {
- describe(`disables the 'Delegation' button`, () => {
- it(`with default values`, () => {
- let undelegationBtn = wrapper.find(`#submit-undelegation`)
- expect(undelegationBtn.html()).toContain(`disabled="disabled"`)
- })
-
- it(`if the user manually inputs a number greater than the balance`, () => {
- wrapper.setData({ amount: 142, password: `1234567890` })
- let amountField = wrapper.find(`#amount`)
- let undelegationBtn = wrapper.find(`#submit-undelegation`)
- expect(undelegationBtn.html()).toContain(`disabled="disabled"`)
- let errorMessage = wrapper.find(`input#amount + div`)
- expect(errorMessage.classes()).toContain(`tm-form-msg--error`)
-
- amountField.trigger(`input`)
- expect(amountField.element.value).toBe(`100`)
+ describe(`only submits on correct form`, () => {
+ describe(`validates`, () => {
+ it(`to false with default values`, () => {
+ expect(wrapper.vm.validateForm()).toBe(false)
})
- it(`if the password field is empty`, () => {
- wrapper.setData({ amount: 10, password: `` })
- let undelegationBtn = wrapper.find(`#submit-undelegation`)
- expect(undelegationBtn.html()).toContain(`disabled="disabled"`)
- })
- })
-
- describe(`enables the 'Delegation' button`, () => {
- it(`if the amout is positive and the user has enough balance`, () => {
- wrapper.setData({ amount: 50, password: `1234567890` })
-
- let undelegationBtn = wrapper.find(`#submit-undelegation`)
- expect(undelegationBtn.html()).not.toContain(`disabled="disabled"`)
+ it(`to true if the amount is positive and the user has enough liquid atoms`, () => {
+ wrapper.setData({ amount: 50 })
+ expect(wrapper.vm.validateForm()).toBe(true)
})
})
})
describe(`Undelegate`, () => {
- it(`Undelegation button submits an unbonding delegation and closes modal`, () => {
- wrapper.setData({ amount: 4.2, password: `1234567890` })
- wrapper.vm.onUndelegate()
-
- expect(wrapper.emittedByOrder()).toEqual([
- {
- name: `submitUndelegation`,
- args: [
- {
- amount: 4.2,
- password: `1234567890`
- }
- ]
- },
- {
- name: `update:showUndelegationModal`,
- args: [false]
- }
+ it(`submits undelegation`, async () => {
+ wrapper.vm.$store.dispatch = jest.fn()
+ wrapper.vm.$store.commit = jest.fn()
+
+ wrapper.setData({ amount: 4.2 })
+ await wrapper.vm.submitForm(`local`, `1234567890`)
+
+ expect(wrapper.vm.$store.dispatch.mock.calls).toEqual([
+ [
+ `submitUnbondingDelegation`,
+ {
+ amount: -4.2,
+ validator: lcdClientMock.state.candidates[0],
+ submitType: `local`,
+ password: `1234567890`
+ }
+ ]
])
- })
- })
- describe(`closes modal correctly`, () => {
- it(`X button emits close signal`, () => {
- wrapper.vm.close()
- expect(wrapper.emittedByOrder()).toEqual([
- {
- name: `update:showUndelegationModal`,
- args: [false]
- }
+ expect(wrapper.vm.$store.commit.mock.calls).toEqual([
+ [
+ `notify`,
+ {
+ body: `You have successfully undelegated 4.2 STAKEs.`,
+ title: `Successful undelegation!`
+ }
+ ]
])
})
})
diff --git a/test/unit/specs/components/staking/__snapshots__/DelegationModal.spec.js.snap b/test/unit/specs/components/staking/__snapshots__/DelegationModal.spec.js.snap
index ce672925b5..703420f5b6 100644
--- a/test/unit/specs/components/staking/__snapshots__/DelegationModal.spec.js.snap
+++ b/test/unit/specs/components/staking/__snapshots__/DelegationModal.spec.js.snap
@@ -2,24 +2,28 @@
exports[`DelegationModal component matches snapshot has the expected html structure 1`] = `
+
- Delegation
+
+ Delegate
+
-
-
+
+
`;
diff --git a/test/unit/specs/components/staking/__snapshots__/PageStaking.spec.js.snap b/test/unit/specs/components/staking/__snapshots__/PageStaking.spec.js.snap
index 9874508413..d5296083a4 100644
--- a/test/unit/specs/components/staking/__snapshots__/PageStaking.spec.js.snap
+++ b/test/unit/specs/components/staking/__snapshots__/PageStaking.spec.js.snap
@@ -21,136 +21,23 @@ exports[`PageStaking has the expected html structure 1`] = `
- - Tally Parameters - - - info_outline - -
- +
+
+
+ -
+
- + + Threshold + + + info_outline + + + +
- + + 50 % + + +
-
+
- + + Veto + + + info_outline + + + +
- + + 33.4 % + + +
-
+
+ 0.0100000000
+
+
+
-
+
+ Quorum
+
+
+ info_outline
+
+
+
+
+
+ n/a
+
+
+
-
+
+ Governance Penalty
+
+
+ info_outline
+
+
-
+ -
-
- - - Threshold - - - info_outline - - - -
- - - 50 % - - -
-
-
- - - Veto - - - info_outline - - - -
- - - 33.4 % - - -
-
+ -
-
- - - Governance Penalty - - - info_outline - - - -
- - - 0.0100000000 - - -
-
diff --git a/test/unit/specs/components/governance/__snapshots__/TabProposals.spec.js.snap b/test/unit/specs/components/governance/__snapshots__/TabProposals.spec.js.snap
index 938fa96c98..f37fd9e027 100644
--- a/test/unit/specs/components/governance/__snapshots__/TabProposals.spec.js.snap
+++ b/test/unit/specs/components/governance/__snapshots__/TabProposals.spec.js.snap
@@ -10,57 +10,87 @@ exports[`TabProposals has the expected html structure 1`] = `
class="panel-sort-container"
>
- - Voting Parameters - - - info_outline - -
- +
-
+
+ Voting Period
+
+
+ info_outline
+
+
+
+
+
+ 1 days
+
+
+
+
+
-
-
-
+ -
-
- - - Voting Period - - - info_outline - - - -
- - - 1 days - - -
+
+
+
+
+
+
+
+
+
+ + Block #100 +
+ ++ + ABCD1234 + +
+
+
+ -
+
- + Time + + +
- + Jan 1st 1970, 00:00:42 + +
+
+
+
+
+
+
+ -
+
- + Transactions + + +
- + txs + +
+
+
+
+
+
+ -
+
- + Evidence + + +
- + evidence + +
+
+
+
+
+
+
+
+
+
+
+
+ + gaia-20k +
+
+
+
+ -
+
- + Block Height + + +
- + #6,001 + +
-
+
- + Last Block + + +
- + a few seconds ago + +
-
+
- + Transactions + + +
- + 108 + +
-
+
- + Number of Validators + + +
- + 1 + +
+
+
+
+
+ -
+
- + Total Liquid stake + + +
- + + 10 + + +
+
+ -
+
- + Total Delegated stake + + +
- + + 125 + + +
|
+ |
+
+ + 1200 + | +
|
+ |
+
+ + 405 + | +
+
- Delegation
+
+ Delegate
+
-
-
+
-
+
-
-
-
-
+
+
+
+
+
+
+
-
+
diff --git a/test/unit/specs/components/staking/__snapshots__/PageValidator.spec.js.snap b/test/unit/specs/components/staking/__snapshots__/PageValidator.spec.js.snap
index 79597c360a..3acc5ed5ac 100644
--- a/test/unit/specs/components/staking/__snapshots__/PageValidator.spec.js.snap
+++ b/test/unit/specs/components/staking/__snapshots__/PageValidator.spec.js.snap
@@ -1,8 +1,8 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[`PageValidator has the expected html structure 1`] = `
+exports[`PageValidator has the expected html structure if user has signed in 1`] = `
+
+
+
+
+
+
+
+
+
+`;
+
+exports[`PageValidator has the expected html structure if user hasn't signed in 1`] = `
+
-
+
-
-
-
-
-
-
-
-
-
-
- - Total STAKE -
- -- 1,351.0000… -
-
-
- - Available STAKE -
- -- 1,337.0000… -
-
-
-
-
-
- cosmos…xxn9
-
-
-
-
-
- check
-
-
- Copied
-
-
-
-
-
-
-
- My Delegations
-
-
-
-
- Validators
-
-
-
-
- Parameters
-
-
-
+
+
+
+
+
+
+
+
+
+ mr_mounty
+
+
+
+
+
+
+
+ cosmosvaladdr…8yqw
+
+
+
+
+
+ check
+
+
+ Copied
+
+
+
+
+
+
+
+
+
+
+ -
+
- + My Delegation + + +
- + 123.45678 STAKE + +
-
+
- + My Rewards + + +
- + -- + +
+
+ -
+
- + Voting Power + + +
- + 100.00% + +
-
+
- + Uptime + + +
- + -Inf% + +
-
+
- + Commission + + +
- + + 5.00% + + +
-
+
- + Slashes + + +
- + -- + +
+
+
+
+
+
+
+
+ -
+
- + First Seen + + +
- + Block #0 + +
-
+
- + Full Operator Address + + +
- + cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctqzh8yqw + +
-
+
- + Keybase ID + + +
- + + -- + + +
-
+
- + Website + + +
- + + www.monty.ca + + +
-
+
- + Description + + +
- + + Mr Mounty + + +
+
+ -
+
- + Current Commission Rate + + +
- + 5.00% + +
-
+
- + Max Commission Rate + + +
- + 10.00% + +
-
+
- + Max Daily Commission Change + + +
- + 0.50% + +
-
+
- + Last Commission Change + + +
- + a few seconds ago + +
-
+
- + Self Delegation + + +
- + 1.00% + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + Total STAKE +
+ ++ 123.4568… +
+
+
+ + Available STAKE +
+ ++ 0.0000… +
+
+
+
+
+
+
+
+ Address Not Found
+
+
+
+
+
+ check
+
+
+ Copied
+
+
+
+
+
+
+
+
+
@@ -351,7 +842,7 @@ exports[`PageValidator has the expected html structure 1`] = `
- Operator
+ First Seen
- cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctqzh8yqw
+ Block #0
@@ -375,13 +866,11 @@ exports[`PageValidator has the expected html structure 1`] = `
class="info_dl"
>
- Keybase ID
+ Full Operator Address
-
- n/a
-
+ cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctqzh8yqw
@@ -389,11 +878,13 @@ exports[`PageValidator has the expected html structure 1`] = `
class="info_dl"
>
- First Seen
+ Keybase ID
- n/a
+
+ --
+
@@ -415,7 +906,7 @@ exports[`PageValidator has the expected html structure 1`] = `
class="info_dl"
>
- Details
+ Description
- Commission Rate
+ Current Commission Rate
- 0.05 %
+ 5.00%
@@ -451,7 +942,7 @@ exports[`PageValidator has the expected html structure 1`] = `
- 0.1 %
+ 10.00%
@@ -463,7 +954,7 @@ exports[`PageValidator has the expected html structure 1`] = `
- 0.005 %
+ 0.50%
@@ -475,9 +966,7 @@ exports[`PageValidator has the expected html structure 1`] = `
-
a few seconds ago
-
@@ -485,34 +974,33 @@ exports[`PageValidator has the expected html structure 1`] = `
class="info_dl"
>
- Self Delegated STAKE
+ Self Delegation
- 1.00 %
-
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
-
+
+
+
-
-
-
-
- mr_mounty
-
+ mr_mounty
+
- - Delegated STAKE + My Delegation
- - - 123.4568… - + 123.45678 STAKE
- My Rewards
- - n/a + --
- Voting Power @@ -298,12 +792,12 @@ exports[`PageValidator has the expected html structure 1`] = `
- - 100.00 % + 100.00%
- Uptime @@ -312,15 +806,12 @@ exports[`PageValidator has the expected html structure 1`] = `
- - - n/a - % - + -Inf%
- Commission @@ -330,20 +821,20 @@ exports[`PageValidator has the expected html structure 1`] = ` id="page-profile__commission" > - 0.0500… % + 5.00%
- Slashes
- - n/a + --
-
-
- - Minimum Self Delegated STAKE - - -
- - 0 % + 1.00%
-
+
+
+
@@ -870,7 +1350,7 @@ exports[`PageValidator shows a default avatar 1`] = `
- Operator
+ First Seen
- cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctqzh8yqw
+ Block #0
@@ -894,13 +1374,11 @@ exports[`PageValidator shows a default avatar 1`] = `
class="info_dl"
>
- Keybase ID
+ Full Operator Address
-
- n/a
-
+ cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctqzh8yqw
@@ -908,11 +1386,13 @@ exports[`PageValidator shows a default avatar 1`] = `
class="info_dl"
>
- First Seen
+ Keybase ID
- n/a
+
+ --
+
@@ -934,7 +1414,7 @@ exports[`PageValidator shows a default avatar 1`] = `
class="info_dl"
>
- Details
+ Description
- Commission Rate
+ Current Commission Rate
- 0.05 %
+ 5.00%
@@ -970,7 +1450,7 @@ exports[`PageValidator shows a default avatar 1`] = `
- 0.1 %
+ 10.00%
@@ -982,7 +1462,7 @@ exports[`PageValidator shows a default avatar 1`] = `
- 0.005 %
+ 0.50%
@@ -994,9 +1474,7 @@ exports[`PageValidator shows a default avatar 1`] = `
-
a few seconds ago
-
@@ -1004,34 +1482,33 @@ exports[`PageValidator shows a default avatar 1`] = `
class="info_dl"
>
- Self Delegated STAKE
+ Self Delegation
- 1.00 %
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
-
-
-
-
- mr_mounty
-
+ mr_mounty
+
- - Delegated STAKE + My Delegation
- - - 123.4568… - + 123.45678 STAKE
- My Rewards
- - n/a + --
- Voting Power @@ -817,12 +1300,12 @@ exports[`PageValidator shows a default avatar 1`] = `
- - 100.00 % + 100.00%
- Uptime @@ -831,15 +1314,12 @@ exports[`PageValidator shows a default avatar 1`] = `
- - - n/a - % - + -Inf%
- Commission @@ -849,20 +1329,20 @@ exports[`PageValidator shows a default avatar 1`] = ` id="page-profile__commission" > - 0.0500… % + 5.00%
- Slashes
- - n/a + --
-
-
- - Minimum Self Delegated STAKE - - -
- - 0 % + 1.00%
@@ -1244,48 +1713,9 @@ exports[`PageValidator shows an error if the validator couldn't be found 1`] = `
exports[`PageValidator shows that a validator is revoked 1`] = `"This validator has been jailed and is not currently validating"`;
-exports[`delegationTargetOptions always shows wallet in the first position 1`] = `
-Array [
- Object {
- "address": "cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9",
- "key": "My Wallet - cosmos…3p4mqpjyrm5ctpesxxn9",
- "maximum": 50,
- "value": 0,
- },
-]
-`;
-
-exports[`delegationTargetOptions hides displayed validator if bonded 1`] = `
-Array [
- Object {
- "address": "cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9",
- "key": "My Wallet - cosmos…3p4mqpjyrm5ctpesxxn9",
- "maximum": 50,
- "value": 0,
- },
-]
-`;
-
-exports[`delegationTargetOptions shows bonded validators for redelegation options 1`] = `
-Array [
- Object {
- "address": "cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9",
- "key": "My Wallet - cosmos…3p4mqpjyrm5ctpesxxn9",
- "maximum": 50,
- "value": 0,
- },
- Object {
- "address": "cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctplpn3au",
- "key": "good_greg - cosmosvaladdr…3p4mqpjyrm5ctplpn3au",
- "maximum": 5,
- "value": 1,
- },
-]
-`;
-
-exports[`onDelegation make sure we have enough atoms to delegate is not enough 1`] = `
+exports[`Staking functions onDelegation make sure we have enough atoms to delegate is not enough 1`] = `
+
+
+
-
-
-
-
+
+
+
@@ -1634,7 +2056,7 @@ exports[`onDelegation make sure we have enough atoms to delegate is not enough 1
- Operator
+ First Seen
- cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctqzh8yqw
+ Block #0
@@ -1658,13 +2080,11 @@ exports[`onDelegation make sure we have enough atoms to delegate is not enough 1
class="info_dl"
>
- Keybase ID
+ Full Operator Address
-
- n/a
-
+ cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctqzh8yqw
@@ -1672,11 +2092,13 @@ exports[`onDelegation make sure we have enough atoms to delegate is not enough 1
class="info_dl"
>
- First Seen
+ Keybase ID
- n/a
+
+ --
+
@@ -1698,7 +2120,7 @@ exports[`onDelegation make sure we have enough atoms to delegate is not enough 1
class="info_dl"
>
- Details
+ Description
- Commission Rate
+ Current Commission Rate
- 0.05 %
+ 5.00%
@@ -1734,7 +2156,7 @@ exports[`onDelegation make sure we have enough atoms to delegate is not enough 1
- 0.1 %
+ 10.00%
@@ -1746,7 +2168,7 @@ exports[`onDelegation make sure we have enough atoms to delegate is not enough 1
- 0.005 %
+ 0.50%
@@ -1758,9 +2180,7 @@ exports[`onDelegation make sure we have enough atoms to delegate is not enough 1
-
a few seconds ago
-
@@ -1768,34 +2188,33 @@ exports[`onDelegation make sure we have enough atoms to delegate is not enough 1
class="info_dl"
>
- Self Delegated STAKE
+ Self Delegation
- 1.00 %
-
-
-
-
-
+
+
+
-
+
+
+
-
-
-
-
- mr_mounty
-
+ mr_mounty
+
- - Delegated STAKE + My Delegation
- - - 100.0000… - + 100 STAKE
- My Rewards
- - n/a + --
- Voting Power @@ -1581,12 +2006,12 @@ exports[`onDelegation make sure we have enough atoms to delegate is not enough 1
- - 100.00 % + 100.00%
- Uptime @@ -1595,15 +2020,12 @@ exports[`onDelegation make sure we have enough atoms to delegate is not enough 1
- - - n/a - % - + -Inf%
- Commission @@ -1613,20 +2035,20 @@ exports[`onDelegation make sure we have enough atoms to delegate is not enough 1 id="page-profile__commission" > - 0.0500… % + 5.00%
- Slashes
- - n/a + --
-
-
- - Minimum Self Delegated STAKE - - -
- - 0 % + id="page-profile__self-bond" + > + 1.00%
`;
-exports[`onDelegation make sure we have enough atoms to delegate is not enough 2`] = `
+exports[`Staking functions onDelegation make sure we have enough atoms to delegate is not enough 2`] = `
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
@@ -2220,7 +2631,7 @@ exports[`onDelegation make sure we have enough atoms to delegate is not enough 2
- Operator
+ First Seen
- cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctqzh8yqw
+ Block #0
@@ -2244,13 +2655,11 @@ exports[`onDelegation make sure we have enough atoms to delegate is not enough 2
class="info_dl"
>
- Keybase ID
+ Full Operator Address
-
- n/a
-
+ cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctqzh8yqw
@@ -2258,11 +2667,13 @@ exports[`onDelegation make sure we have enough atoms to delegate is not enough 2
class="info_dl"
>
- First Seen
+ Keybase ID
- n/a
+
+ --
+
@@ -2284,7 +2695,7 @@ exports[`onDelegation make sure we have enough atoms to delegate is not enough 2
class="info_dl"
>
- Details
+ Description
- Commission Rate
+ Current Commission Rate
- 0.05 %
+ 5.00%
@@ -2320,7 +2731,7 @@ exports[`onDelegation make sure we have enough atoms to delegate is not enough 2
- 0.1 %
+ 10.00%
@@ -2332,7 +2743,7 @@ exports[`onDelegation make sure we have enough atoms to delegate is not enough 2
- 0.005 %
+ 0.50%
@@ -2344,9 +2755,7 @@ exports[`onDelegation make sure we have enough atoms to delegate is not enough 2
-
a few seconds ago
-
@@ -2354,43 +2763,42 @@ exports[`onDelegation make sure we have enough atoms to delegate is not enough 2
class="info_dl"
>
- Self Delegated STAKE
+ Self Delegation
- 1.00 %
-
-
-
-
-
+
`;
-exports[`onDelegation onUnstake make sure there are enough atoms to unstake is not enough 1`] = `
+exports[`Staking functions onUndelegation make sure there are enough atoms to unstake is not enough 1`] = `
+
+
-
+
+
+
-
-
-
-
- mr_mounty
-
+ mr_mounty
+
- - Delegated STAKE + My Delegation
- - - 100.0000… - + 100 STAKE
- My Rewards
- - n/a + --
- Voting Power @@ -2167,12 +2581,12 @@ exports[`onDelegation make sure we have enough atoms to delegate is not enough 2
- - 100.00 % + 100.00%
- Uptime @@ -2181,15 +2595,12 @@ exports[`onDelegation make sure we have enough atoms to delegate is not enough 2
- - - n/a - % - + -Inf%
- Commission @@ -2199,20 +2610,20 @@ exports[`onDelegation make sure we have enough atoms to delegate is not enough 2 id="page-profile__commission" > - 0.0500… % + 5.00%
- Slashes
- - n/a + --
-
-
- - Minimum Self Delegated STAKE - - -
- - 0 % + 1.00%
-
+
+
+
@@ -2739,7 +3139,7 @@ exports[`onDelegation onUnstake make sure there are enough atoms to unstake is n
- Operator
+ First Seen
- cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctqzh8yqw
+ Block #0
@@ -2763,13 +3163,11 @@ exports[`onDelegation onUnstake make sure there are enough atoms to unstake is n
class="info_dl"
>
- Keybase ID
+ Full Operator Address
-
- n/a
-
+ cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctqzh8yqw
@@ -2777,11 +3175,13 @@ exports[`onDelegation onUnstake make sure there are enough atoms to unstake is n
class="info_dl"
>
- First Seen
+ Keybase ID
- n/a
+
+ --
+
@@ -2803,7 +3203,7 @@ exports[`onDelegation onUnstake make sure there are enough atoms to unstake is n
class="info_dl"
>
- Details
+ Description
- Commission Rate
+ Current Commission Rate
- 0.05 %
+ 5.00%
@@ -2839,7 +3239,7 @@ exports[`onDelegation onUnstake make sure there are enough atoms to unstake is n
- 0.1 %
+ 10.00%
@@ -2851,7 +3251,7 @@ exports[`onDelegation onUnstake make sure there are enough atoms to unstake is n
- 0.005 %
+ 0.50%
@@ -2863,9 +3263,7 @@ exports[`onDelegation onUnstake make sure there are enough atoms to unstake is n
-
a few seconds ago
-
@@ -2873,34 +3271,33 @@ exports[`onDelegation onUnstake make sure there are enough atoms to unstake is n
class="info_dl"
>
- Self Delegated STAKE
+ Self Delegation
- 1.00 %
-
-
-
-
-
+
+
+
-
+
+
+
-
-
-
-
- mr_mounty
-
+ mr_mounty
+
- - Delegated STAKE + My Delegation
- - - 0.0000… - + --
- My Rewards
- - n/a + --
- Voting Power @@ -2686,12 +3089,12 @@ exports[`onDelegation onUnstake make sure there are enough atoms to unstake is n
- - 100.00 % + 100.00%
- Uptime @@ -2700,15 +3103,12 @@ exports[`onDelegation onUnstake make sure there are enough atoms to unstake is n
- - - n/a - % - + -Inf%
- Commission @@ -2718,20 +3118,20 @@ exports[`onDelegation onUnstake make sure there are enough atoms to unstake is n id="page-profile__commission" > - 0.0500… % + 5.00%
- Slashes
- - n/a + --
-
-
- - Minimum Self Delegated STAKE - - -
- - 0 % + 1.00%
`;
-exports[`onDelegation onUnstake make sure there are enough atoms to unstake is not enough 2`] = `
+exports[`Staking functions onUndelegation make sure there are enough atoms to unstake is not enough 2`] = `
+
+
+
-
-
-
ID
+
+ arrow_drop_up
+
AMOUNT
+
+ arrow_drop_up
+
diff --git a/test/unit/specs/components/staking/__snapshots__/TabMyDelegations.spec.js.snap b/test/unit/specs/components/staking/__snapshots__/TabMyDelegations.spec.js.snap
index 26367d072f..c0776c69f4 100644
--- a/test/unit/specs/components/staking/__snapshots__/TabMyDelegations.spec.js.snap
+++ b/test/unit/specs/components/staking/__snapshots__/TabMyDelegations.spec.js.snap
@@ -50,29 +50,12 @@ exports[`Component: TabMyDelegations should show a message if not staked yet to
-
-
`;
exports[`Component: TabMyDelegations should show committed validators 1`] = `
-
+
+
+
@@ -3325,7 +3714,7 @@ exports[`onDelegation onUnstake make sure there are enough atoms to unstake is n
- Operator
+ First Seen
- cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctqzh8yqw
+ Block #0
@@ -3349,13 +3738,11 @@ exports[`onDelegation onUnstake make sure there are enough atoms to unstake is n
class="info_dl"
>
- Keybase ID
+ Full Operator Address
-
- n/a
-
+ cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctqzh8yqw
@@ -3363,11 +3750,13 @@ exports[`onDelegation onUnstake make sure there are enough atoms to unstake is n
class="info_dl"
>
- First Seen
+ Keybase ID
- n/a
+
+ --
+
@@ -3389,7 +3778,7 @@ exports[`onDelegation onUnstake make sure there are enough atoms to unstake is n
class="info_dl"
>
- Details
+ Description
- Commission Rate
+ Current Commission Rate
- 0.05 %
+ 5.00%
@@ -3425,7 +3814,7 @@ exports[`onDelegation onUnstake make sure there are enough atoms to unstake is n
- 0.1 %
+ 10.00%
@@ -3437,7 +3826,7 @@ exports[`onDelegation onUnstake make sure there are enough atoms to unstake is n
- 0.005 %
+ 0.50%
@@ -3449,9 +3838,7 @@ exports[`onDelegation onUnstake make sure there are enough atoms to unstake is n
-
a few seconds ago
-
@@ -3459,212 +3846,74 @@ exports[`onDelegation onUnstake make sure there are enough atoms to unstake is n
class="info_dl"
>
- Self Delegated STAKE
+ Self Delegation
- 1.00 %
-
-
-
-
-
+
`;
-exports[`onDelegation onUnstake submitUndelegation composition submits a successful undelegation 1`] = `
-Array [
- Array [
- "submitUnbondingDelegation",
- Object {
- "amount": -10,
- "password": "12345",
- "validator": Object {
- "bond_height": "0",
- "bond_intra_tx_counter": 6,
- "commission": Object {
- "max_change_rate": "0.005",
- "max_rate": "0.1",
- "rate": "0.05",
- "update_time": "1970-01-01T00:00:00Z",
- },
- "delegator_shares": "14",
- "description": Object {
- "country": "Canada",
- "details": "Mr Mounty",
- "moniker": "mr_mounty",
- "website": "www.monty.ca",
- },
- "id": "cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctqzh8yqw",
- "keybase": undefined,
- "operator_address": "cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctqzh8yqw",
- "percent_of_vote": "100.00%",
- "prev_bonded_shares": "0",
- "proposer_reward_pool": null,
- "pub_key": "cosmosvalpub1234",
- "revoked": false,
- "selfBond": 0.01,
- "status": 2,
- "tokens": "14",
- "voting_power": "14",
- },
- },
- ],
-]
-`;
-
-exports[`onDelegation onUnstake submitUndelegation composition submits a successful undelegation 2`] = `
-Array [
- Array [
- "notify",
- Object {
- "body": "You have successfully undelegated 10 STAKEs.",
- "title": "Successful undelegation!",
- },
- ],
-]
-`;
-
-exports[`onDelegation submitDelegation delegation composition delegation.submitDelegation 1`] = `
-Array [
- Array [
- "submitDelegation",
- Object {
- "amount": 10,
- "password": "12345",
- "validator_addr": "cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctqzh8yqw",
- },
- ],
- Array [
- "sendTx",
- Object {
- "delegation": Object {
- "amount": "10",
- "denom": "STAKE",
- },
- "delegator_addr": "cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9",
- "password": "12345",
- "to": "cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9",
- "type": "postDelegation",
- "validator_addr": "cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctqzh8yqw",
- },
- ],
-]
-`;
-
-exports[`onDelegation submitDelegation delegation composition delegation.submitDelegation 2`] = `
+exports[`delegationTargetOptions always shows wallet in the first position 1`] = `
Array [
- Array [
- "setAtoms",
- 32,
- ],
- Array [
- "notify",
- Object {
- "body": "You have successfully delegated your STAKEs",
- "title": "Successful delegation!",
- },
- ],
+ Object {
+ "address": "cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9",
+ "key": "My Wallet - cosmos…3p4mqpjyrm5ctpesxxn9",
+ "maximum": 1337,
+ "value": 0,
+ },
]
`;
-exports[`onDelegation submitDelegation redelegation composition redelegation.submitDelegation 1`] = `
+exports[`delegationTargetOptions hides displayed validator if bonded 1`] = `
Array [
- Array [
- "submitRedelegation",
- Object {
- "amount": 5,
- "password": "12345",
- "validatorDst": Object {
- "bond_height": "0",
- "bond_intra_tx_counter": 6,
- "commission": Object {
- "max_change_rate": "0",
- "max_rate": "0",
- "rate": "0",
- "update_time": "1970-01-01T00:00:00Z",
- },
- "delegator_shares": "0",
- "description": Object {
- "country": "USA",
- "details": "Good Guy Greg",
- "moniker": "good_greg",
- "website": "www.greg.com",
- },
- "id": "cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctplpn3au",
- "operator_address": "cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctplpn3au",
- "percent_of_vote": "0.00%",
- "prev_bonded_shares": "0",
- "proposer_reward_pool": null,
- "pub_key": "cosmosvalpub5678",
- "revoked": false,
- "status": 2,
- "tokens": "0",
- "voting_power": "0",
- },
- "validatorSrc": Object {
- "bond_height": "0",
- "bond_intra_tx_counter": 6,
- "commission": Object {
- "max_change_rate": "0.005",
- "max_rate": "0.1",
- "rate": "0.05",
- "update_time": "1970-01-01T00:00:00Z",
- },
- "delegator_shares": "14",
- "description": Object {
- "country": "Canada",
- "details": "Mr Mounty",
- "moniker": "mr_mounty",
- "website": "www.monty.ca",
- },
- "id": "cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctqzh8yqw",
- "keybase": undefined,
- "operator_address": "cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctqzh8yqw",
- "percent_of_vote": "100.00%",
- "prev_bonded_shares": "0",
- "proposer_reward_pool": null,
- "pub_key": "cosmosvalpub1234",
- "revoked": false,
- "selfBond": 0.01,
- "status": 2,
- "tokens": "14",
- "voting_power": "14",
- },
- },
- ],
+ Object {
+ "address": "cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9",
+ "key": "My Wallet - cosmos…3p4mqpjyrm5ctpesxxn9",
+ "maximum": 1337,
+ "value": 0,
+ },
]
`;
-exports[`onDelegation submitDelegation redelegation composition redelegation.submitDelegation 2`] = `
+exports[`delegationTargetOptions shows bonded validators for redelegation options 1`] = `
Array [
- Array [
- "notify",
- Object {
- "body": "You have successfully redelegated your STAKEs",
- "title": "Successful redelegation!",
- },
- ],
+ Object {
+ "address": "cosmos15ky9du8a2wlstz6fpx3p4mqpjyrm5ctpesxxn9",
+ "key": "My Wallet - cosmos…3p4mqpjyrm5ctpesxxn9",
+ "maximum": 1337,
+ "value": 0,
+ },
+ Object {
+ "address": "cosmosvaladdr15ky9du8a2wlstz6fpx3p4mqpjyrm5ctplpn3au",
+ "key": "good_greg - cosmosvaladdr…3p4mqpjyrm5ctplpn3au",
+ "maximum": 5,
+ "value": 1,
+ },
]
`;
diff --git a/test/unit/specs/components/staking/__snapshots__/PanelSort.spec.js.snap b/test/unit/specs/components/staking/__snapshots__/PanelSort.spec.js.snap
index 107c77e3ba..dca5a118e8 100644
--- a/test/unit/specs/components/staking/__snapshots__/PanelSort.spec.js.snap
+++ b/test/unit/specs/components/staking/__snapshots__/PanelSort.spec.js.snap
@@ -5,21 +5,31 @@ exports[`PanelSort has the expected html structure 1`] = `
class="panel-sort-container"
>
+
+
-
+
+
+
-
-
-
-
- mr_mounty
-
+ mr_mounty
+
- - Delegated STAKE + My Delegation
- - - 0.0000… - + --
- My Rewards
- - n/a + --
- Voting Power @@ -3272,12 +3664,12 @@ exports[`onDelegation onUnstake make sure there are enough atoms to unstake is n
- - 100.00 % + 100.00%
- Uptime @@ -3286,15 +3678,12 @@ exports[`onDelegation onUnstake make sure there are enough atoms to unstake is n
- - - n/a - % - + -Inf%
- Commission @@ -3304,20 +3693,20 @@ exports[`onDelegation onUnstake make sure there are enough atoms to unstake is n id="page-profile__commission" > - 0.0500… % + 5.00%
- Slashes
- - n/a + --
-
-
- - Minimum Self Delegated STAKE - - -
- - 0 % + 1.00%
-
- - My active validators - - - - info_outline - - -
-| Moniker + + arrow_drop_up + | - Delegated STAKE + My Delegations + + arrow_drop_up + | Rewards + + arrow_drop_up + | Voting Power + + arrow_drop_up + | Uptime + + arrow_drop_up + | Commission + + arrow_drop_up + | Slashes + + arrow_drop_up + | @@ -254,22 +272,6 @@ exports[`Component: TabMyDelegations should show committed validators 1`] = ` - - `; @@ -277,21 +279,6 @@ exports[`Component: TabMyDelegations should show committed validators 1`] = ` exports[`Component: TabMyDelegations should show unbonding validators and the current committed validator 1`] = `
|---|
| Moniker + + arrow_drop_up + | - Delegated STAKE + My Delegations + + arrow_drop_up + | Rewards + + arrow_drop_up + | Voting Power + + arrow_drop_up + | Uptime + + arrow_drop_up + | Commission + + arrow_drop_up + | Slashes + + arrow_drop_up + | @@ -473,36 +495,11 @@ exports[`Component: TabMyDelegations should show unbonding validators and the cu - -Moniker + + arrow_drop_up + | - Delegated STAKE + My Delegations + + arrow_drop_up + | Rewards + + arrow_drop_up + | Voting Power + + arrow_drop_up + | Uptime + + arrow_drop_up + | Commission + + arrow_drop_up + | Slashes + + arrow_drop_up + | @@ -397,66 +432,101 @@ exports[`TabValidators shows a message if still loading 1`] = ` class="panel-sort-container" >Moniker + + arrow_drop_up + | - Delegated STAKE + My Delegations + + arrow_drop_up + | Rewards + + arrow_drop_up + | Voting Power + + arrow_drop_up + | Uptime + + arrow_drop_up + | Commission + + arrow_drop_up + | Slashes + + arrow_drop_up + | diff --git a/test/unit/specs/components/staking/__snapshots__/TableValidators.spec.js.snap b/test/unit/specs/components/staking/__snapshots__/TableValidators.spec.js.snap index 42680a95b6..ea99c2a4c6 100644 --- a/test/unit/specs/components/staking/__snapshots__/TableValidators.spec.js.snap +++ b/test/unit/specs/components/staking/__snapshots__/TableValidators.spec.js.snap @@ -10,66 +10,101 @@ exports[`TableValidators has the expected html structure 1`] = ` class="panel-sort-container" >Moniker + + arrow_drop_up + | - Delegated STAKE + My Delegations + + arrow_drop_up + | Rewards + + arrow_drop_up + | Voting Power + + arrow_drop_up + | Uptime + + arrow_drop_up + | Commission + + arrow_drop_up + | Slashes + + arrow_drop_up + | @@ -388,66 +423,101 @@ exports[`TableValidators should filter the delegates 1`] = ` class="panel-sort-container" >Moniker + + arrow_drop_up + | - Delegated STAKE + My Delegations + + arrow_drop_up + | Rewards + + arrow_drop_up + | Voting Power + + arrow_drop_up + | Uptime + + arrow_drop_up + | Commission + + arrow_drop_up + | Slashes + + arrow_drop_up + | diff --git a/test/unit/specs/components/staking/__snapshots__/UndelegationModal.spec.js.snap b/test/unit/specs/components/staking/__snapshots__/UndelegationModal.spec.js.snap index 2fcabac9ea..ed4fa750d0 100644 --- a/test/unit/specs/components/staking/__snapshots__/UndelegationModal.spec.js.snap +++ b/test/unit/specs/components/staking/__snapshots__/UndelegationModal.spec.js.snap @@ -2,24 +2,29 @@ exports[`UndelegationModal component matches snapshot has the expected html structure 1`] = `
|---|