From e1996048f84762f5c3654a326a23250a94b186d3 Mon Sep 17 00:00:00 2001 From: Zaki Manian Date: Sat, 9 Feb 2019 12:22:36 -0800 Subject: [PATCH] Merge PR #3574: Fixes for non-default staking token --- cmd/gaia/app/genesis.go | 2 +- x/staking/simulation/invariants.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/gaia/app/genesis.go b/cmd/gaia/app/genesis.go index da71e750a..6e6adda49 100644 --- a/cmd/gaia/app/genesis.go +++ b/cmd/gaia/app/genesis.go @@ -187,7 +187,7 @@ func GaiaAppGenState(cdc *codec.Codec, genDoc tmtypes.GenesisDoc, appGenTxs []js for _, acc := range genesisState.Accounts { for _, coin := range acc.Coins { - if coin.Denom == bondDenom { + if coin.Denom == genesisState.StakingData.Params.BondDenom { stakingData.Pool.NotBondedTokens = stakingData.Pool.NotBondedTokens. Add(coin.Amount) // increase the supply } diff --git a/x/staking/simulation/invariants.go b/x/staking/simulation/invariants.go index 6a6efafc8..ef44df2c5 100644 --- a/x/staking/simulation/invariants.go +++ b/x/staking/simulation/invariants.go @@ -54,7 +54,7 @@ func SupplyInvariants(ck bank.Keeper, k staking.Keeper, loose := sdk.ZeroDec() bonded := sdk.ZeroDec() am.IterateAccounts(ctx, func(acc auth.Account) bool { - loose = loose.Add(sdk.NewDecFromInt(acc.GetCoins().AmountOf(staking.DefaultBondDenom))) + loose = loose.Add(sdk.NewDecFromInt(acc.GetCoins().AmountOf(k.BondDenom(ctx)))) return false }) k.IterateUnbondingDelegations(ctx, func(_ int64, ubd staking.UnbondingDelegation) bool {