Skip to content

Commit

Permalink
Merge pull request #2296 from cosmos/release-candidate/v1.0.0-beta.21
Browse files Browse the repository at this point in the history
automatic release created for v1.0.0-beta.21
  • Loading branch information
faboweb authored Mar 16, 2019
2 parents d047486 + 2380f0a commit 78360e5
Show file tree
Hide file tree
Showing 33 changed files with 1,806 additions and 912 deletions.
12 changes: 10 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,13 @@ jobs:
- yarn-install
- run: |
mkdir -p app/dist
CIRCLECI=true yarn build:ui
if [ "${CIRCLE_BRANCH}" == "master" ]; then
STARGATE=https://stargate.cosmos.network RPC=https://rpc.cosmos.network CIRCLECI=true yarn build:ui
else
CIRCLECI=true yarn build:ui
fi
- store_artifacts:
path: *DIST
- persist_to_workspace:
Expand Down Expand Up @@ -311,7 +317,9 @@ workflows:
- build
filters:
branches:
ignore: release
ignore:
- release
- master

- publish:
requires:
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [1.0.0-beta.21] - 2019-03-16

### Added

- [\#2228](https://github.com/cosmos/voyager/issues/2228) display balances of vesting accounts @faboweb
- [\#2230](https://github.com/cosmos/voyager/issues/2230) calculate fees and estimated transaction gas @fedekunze
- [\#2291](https://github.com/cosmos/voyager/pull/2291) master built against main net full node @sabau

### Fixed

- [\#2269](https://github.com/cosmos/voyager/pull/2269) Persist session type if signed in with ledger @faboweb
- [\#2273](https://github.com/cosmos/voyager/issues/2273) fixed atoms and uatoms conversion @fedekunze


## [1.0.0-beta.20] - 2019-03-15

### Fixed
Expand Down
6 changes: 3 additions & 3 deletions app/src/renderer/components/common/ActionModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -194,15 +194,15 @@ export default {
track
}),
computed: {
...mapGetters([`connected`, `ledger`, `session`]),
...mapGetters([`connected`, `session`]),
selectedSignMethod() {
if (this.ledger.isConnected) {
if (this.session.sessionType === `ledger`) {
return signWithLedger
}
return signWithLocalKeystore
},
signMethods() {
if (this.ledger.isConnected) {
if (this.session.sessionType === `ledger`) {
return [
{
key: `Ledger Nano S`,
Expand Down
2 changes: 2 additions & 0 deletions app/src/renderer/components/staking/TabMyDelegations.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
:validators="yourValidators"
:bonding-denom="bondDenom"
:url="validatorURL"
:fees="transaction.tx.value.fee.amount &&
transaction.tx.value.fee.amount[0]"
:unbonding-time="
time.getUnbondingTime(
transaction,
Expand Down
11 changes: 11 additions & 0 deletions app/src/renderer/components/transactions/LiAnyTransaction.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
<li-bank-transaction
v-if="bankTx"
:transaction="transaction"
:bonding-denom="bondingDenom"
:address="address"
:fees="fees"
/>
<li-stake-transaction
v-else-if="stakingTx"
Expand All @@ -12,13 +14,15 @@
:unbonding-time="unbondingTime"
:bonding-denom="bondingDenom"
:tx-type="type"
:fees="fees"
/>
<li-gov-transaction
v-else-if="governanceTx"
:transaction="transaction"
:bonding-denom="bondingDenom"
:url="proposalsUrl"
:tx-type="type"
:fees="fees"
/>
<li-distribution-transaction
v-else-if="distributionTx"
Expand All @@ -27,6 +31,7 @@
:bonding-denom="bondingDenom"
:tx-type="type"
:validators="validators"
:fees="fees"
/>
<li-transaction
v-else
Expand Down Expand Up @@ -88,6 +93,12 @@ export default {
type() {
return this.transaction.tx.value.msg[0].type
},
fees() {
return (
this.transaction.tx.value.fee.amount &&
this.transaction.tx.value.fee.amount[0]
)
},
bankTx() {
return [`cosmos-sdk/MsgSend`].includes(this.type)
},
Expand Down
32 changes: 26 additions & 6 deletions app/src/renderer/components/transactions/LiBankTransaction.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,25 @@
>
<template v-if="address === ''">
<div slot="caption">
Sent&nbsp;<b>{{ full(atoms(coins.amount)) }}</b>
<span>&nbsp;{{ coins.denom.toUpperCase() }}</span>
Sent<b>{{ full(atoms(coins.amount)) }}</b>
<span>{{ coins.denom }}s</span>
</div>
<span slot="details">
<template>
From <short-bech32 :address="sender" />
to <short-bech32 :address="receiver" />
</template>
</span>
<div slot="fees">
Network Fee:&nbsp;<b>{{ fees ? full(atoms(fees.amount)) : full(0) }}</b>
<span>{{ fees ? fees.denom : bondingDenom }}s</span>
</div>
</template>
<template v-else-if="sent">
<div slot="caption">
Sent&nbsp;
Sent
<b>{{ full(atoms(coins.amount)) }}</b>
<span>&nbsp;{{ coins.denom.toUpperCase() }}</span>
<span>{{ coins.denom }}s</span>
</div>
<span slot="details">
<template v-if="sentSelf">
Expand All @@ -30,14 +34,22 @@
To <short-bech32 :address="receiver" />
</template>
</span>
<div slot="fees">
Network Fee:&nbsp;<b>{{ fees ? full(atoms(fees.amount)) : full(0) }}</b>
<span>{{ fees ? fees.denom : bondingDenom }}s</span>
</div>
</template>
<template v-else>
<div slot="caption">
Received&nbsp;
Received
<b>{{ full(atoms(coins.amount)) }}</b>
<span>&nbsp;{{ coins.denom.toUpperCase() }}</span>
<span>{{ coins.denom }}s</span>
</div>
<span slot="details">From <short-bech32 :address="sender" /></span>
<div slot="fees">
Network Fee:&nbsp;<b>{{ fees ? full(atoms(fees.amount)) : full(0) }}</b>
<span>{{ fees ? fees.denom : bondingDenom }}s</span>
</div>
</template>
</li-transaction>
</template>
Expand All @@ -59,9 +71,17 @@ export default {
type: Object,
required: true
},
fees: {
type: Object,
default: null
},
address: {
type: String,
default: null
},
bondingDenom: {
type: String,
required: true
}
},
data: () => ({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,14 @@
Withdraw rewards
</div>
<div slot="details">
From&nbsp;<router-link :to="url + '/' + tx.validator_address">
From<router-link :to="url + '/' + tx.validator_address">
{{ moniker(tx.validator_address) }}
</router-link>
</div>
<div slot="fees">
Network Fee:&nbsp;<b>{{ fees ? full(atoms(fees.amount)) : full(0) }}</b>
<span>{{ fees ? fees.denom : bondingDenom }}s</span>
</div>
</template>
<template v-else-if="txType === `cosmos-sdk/MsgSetWithdrawAddress`">
<div slot="caption">
Expand All @@ -21,6 +25,10 @@
<div slot="details">
To {{ tx.withdraw_address }}
</div>
<div slot="fees">
Network Fee:&nbsp;<b>{{ fees ? full(atoms(fees.amount)) : full(0) }}</b>
<span>{{ fees ? fees.denom : bondingDenom }}s</span>
</div>
</template>
<template
v-else-if="txType === `cosmos-sdk/MsgWithdrawValidatorCommission`"
Expand All @@ -29,17 +37,21 @@
Withdraw validator commission
</div>
<div slot="details">
From&nbsp;<router-link :to="url + '/' + tx.validator_address">
From<router-link :to="url + '/' + tx.validator_address">
{{ moniker(tx.validator_address) }}
</router-link>
</div>
<div slot="fees">
Network Fee:&nbsp;<b>{{ fees ? full(atoms(fees.amount)) : full(0) }}</b>
<span>{{ fees ? fees.denom : bondingDenom }}s</span>
</div>
</template>
</li-transaction>
</template>

<script>
import LiTransaction from "./LiTransaction"
import { pretty, atoms } from "../../scripts/num.js"
import { pretty, atoms, full } from "../../scripts/num.js"
export default {
name: `li-distribution-transaction`,
Expand All @@ -49,6 +61,10 @@ export default {
type: Object,
required: true
},
fees: {
type: Object,
default: null
},
url: {
type: String,
required: true
Expand All @@ -68,6 +84,7 @@ export default {
},
data: () => ({
atoms,
full,
pretty
}),
computed: {
Expand Down
32 changes: 24 additions & 8 deletions app/src/renderer/components/transactions/LiGovTransaction.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,51 @@
>
<template v-if="txType === `cosmos-sdk/MsgSubmitProposal`">
<div slot="caption">
Submit {{ tx.proposal_type.toLowerCase() }} proposal&nbsp;
Submit {{ tx.proposal_type.toLowerCase() }} proposal
<b>{{ full(atoms(tx.initial_deposit[0].amount)) }}</b>
<span>&nbsp;{{ tx.initial_deposit[0].denom }}s</span>
<span>{{ tx.initial_deposit[0].denom }}s</span>
</div>
<div slot="details">
Title:&nbsp;<i>{{ tx.title }}</i>
Title:<i>{{ tx.title }}</i>
</div>
<div slot="fees">
Network Fee:&nbsp;<b>{{ fees ? full(atoms(fees.amount)) : full(0) }}</b>
<span>{{ fees ? fees.denom : bondingDenom }}s</span>
</div>
</template>
<template v-else-if="txType === `cosmos-sdk/MsgDeposit`">
<div slot="caption">
Deposit&nbsp;
Deposit
<template>
<b>{{ full(atoms(tx.amount[0].amount)) }}</b>
<span>&nbsp;{{ tx.amount[0].denom }}s</span>
<span>{{ tx.amount[0].denom }}s</span>
</template>
</div>
<div slot="details">
On&nbsp;
On
<router-link :to="`${url}/${tx.proposal_id}`">
Proposal &#35;{{ tx.proposal_id }}
</router-link>
</div>
<div slot="fees">
Network Fee:&nbsp;<b>{{ fees ? full(atoms(fees.amount)) : full(0) }}</b>
<span>{{ fees ? fees.denom : bondingDenom }}s</span>
</div>
</template>
<template v-else-if="txType === `cosmos-sdk/MsgVote`">
<div slot="caption">
Vote&nbsp;<b>{{ tx.option }}</b>
Vote{{ tx.option }}
</div>
<div slot="details">
On&nbsp;
On
<router-link :to="`${url}/${tx.proposal_id}`">
Proposal &#35;{{ tx.proposal_id }}
</router-link>
</div>
<div slot="fees">
Network Fee:&nbsp;<b>{{ fees ? full(atoms(fees.amount)) : full(0) }}</b>
<span>{{ fees ? fees.denom : bondingDenom }}s</span>
</div>
</template>
</li-transaction>
</template>
Expand All @@ -55,6 +67,10 @@ export default {
type: Object,
required: true
},
fees: {
type: Object,
default: null
},
url: {
type: String,
required: true
Expand Down
Loading

0 comments on commit 78360e5

Please sign in to comment.