Merge PR #3574: Fixes for non-default staking token
This commit is contained in:
parent
14c0476f60
commit
e1996048f8
|
@ -187,7 +187,7 @@ func GaiaAppGenState(cdc *codec.Codec, genDoc tmtypes.GenesisDoc, appGenTxs []js
|
||||||
|
|
||||||
for _, acc := range genesisState.Accounts {
|
for _, acc := range genesisState.Accounts {
|
||||||
for _, coin := range acc.Coins {
|
for _, coin := range acc.Coins {
|
||||||
if coin.Denom == bondDenom {
|
if coin.Denom == genesisState.StakingData.Params.BondDenom {
|
||||||
stakingData.Pool.NotBondedTokens = stakingData.Pool.NotBondedTokens.
|
stakingData.Pool.NotBondedTokens = stakingData.Pool.NotBondedTokens.
|
||||||
Add(coin.Amount) // increase the supply
|
Add(coin.Amount) // increase the supply
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,7 +54,7 @@ func SupplyInvariants(ck bank.Keeper, k staking.Keeper,
|
||||||
loose := sdk.ZeroDec()
|
loose := sdk.ZeroDec()
|
||||||
bonded := sdk.ZeroDec()
|
bonded := sdk.ZeroDec()
|
||||||
am.IterateAccounts(ctx, func(acc auth.Account) bool {
|
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
|
return false
|
||||||
})
|
})
|
||||||
k.IterateUnbondingDelegations(ctx, func(_ int64, ubd staking.UnbondingDelegation) bool {
|
k.IterateUnbondingDelegations(ctx, func(_ int64, ubd staking.UnbondingDelegation) bool {
|
||||||
|
|
Loading…
Reference in New Issue