Merge PR #3574: Fixes for non-default staking token

zmanian · jackzampolin · commit e1996048f847 · 2019-02-09T12:22:36.000-08:00
diff --git 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
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ func GaiaAppGenState(cdc *codec.Codec, genDoc tmtypes.GenesisDoc, appGenTxs []js`
`187`	`187`
`188`	`188`	`for _, acc := range genesisState.Accounts {`
`189`	`189`	`for _, coin := range acc.Coins {`
`190`		`- if coin.Denom == bondDenom {`
	`190`	`+ if coin.Denom == genesisState.StakingData.Params.BondDenom {`
`191`	`191`	`stakingData.Pool.NotBondedTokens = stakingData.Pool.NotBondedTokens.`
`192`	`192`	`Add(coin.Amount) // increase the supply`
`193`	`193`	`}`