From 16bcf95f8f250bbe7b8db5c7b9e469b754959eb5 Mon Sep 17 00:00:00 2001 From: Zaki Manian Date: Sat, 9 Feb 2019 12:40:38 -0800 Subject: [PATCH 1/2] Other Bond Denom fixes --- x/staking/simulation/invariants.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x/staking/simulation/invariants.go b/x/staking/simulation/invariants.go index ef44df2c5..1f17b4a12 100644 --- a/x/staking/simulation/invariants.go +++ b/x/staking/simulation/invariants.go @@ -76,13 +76,13 @@ func SupplyInvariants(ck bank.Keeper, k staking.Keeper, feePool := d.GetFeePool(ctx) // add outstanding fees - loose = loose.Add(sdk.NewDecFromInt(f.GetCollectedFees(ctx).AmountOf(staking.DefaultBondDenom))) + loose = loose.Add(sdk.NewDecFromInt(f.GetCollectedFees(ctx).AmountOf(k.BondDenom(ctx)))) // add community pool - loose = loose.Add(feePool.CommunityPool.AmountOf(staking.DefaultBondDenom)) + loose = loose.Add(feePool.CommunityPool.AmountOf(k.BondDenom(ctx))) // add yet-to-be-withdrawn - loose = loose.Add(d.GetOutstandingRewards(ctx).AmountOf(staking.DefaultBondDenom)) + loose = loose.Add(d.GetOutstandingRewards(ctx).AmountOf(k.BondDenom(ctx))) // Not-bonded tokens should equal coin supply plus unbonding delegations // plus tokens on unbonded validators From cb07f136729848e22106a38e12ebc24ca4fdb68d Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Sat, 9 Feb 2019 12:51:48 -0800 Subject: [PATCH 2/2] gaia/genesis.go: rename bondDenom to defaultBondDenom to avoid confusion --- cmd/gaia/app/genesis.go | 6 +++--- cmd/gaia/app/genesis_test.go | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/gaia/app/genesis.go b/cmd/gaia/app/genesis.go index 6e6adda49..2cf3e3cba 100644 --- a/cmd/gaia/app/genesis.go +++ b/cmd/gaia/app/genesis.go @@ -27,8 +27,8 @@ import ( var ( // bonded tokens given to genesis validators/accounts - freeFermionsAcc = staking.TokensFromTendermintPower(150) - bondDenom = staking.DefaultBondDenom + freeFermionsAcc = staking.TokensFromTendermintPower(150) + defaultBondDenom = staking.DefaultBondDenom ) // State to Unmarshal @@ -401,7 +401,7 @@ func NewDefaultGenesisAccount(addr sdk.AccAddress) GenesisAccount { accAuth := auth.NewBaseAccountWithAddress(addr) coins := sdk.Coins{ sdk.NewCoin("footoken", sdk.NewInt(1000)), - sdk.NewCoin(bondDenom, freeFermionsAcc), + sdk.NewCoin(defaultBondDenom, freeFermionsAcc), } coins.Sort() diff --git a/cmd/gaia/app/genesis_test.go b/cmd/gaia/app/genesis_test.go index 30765c6ae..cbbad1ee7 100644 --- a/cmd/gaia/app/genesis_test.go +++ b/cmd/gaia/app/genesis_test.go @@ -41,7 +41,7 @@ func makeGenesisState(t *testing.T, genTxs []auth.StdTx) GenesisState { msg := msgs[0].(staking.MsgCreateValidator) acc := auth.NewBaseAccountWithAddress(sdk.AccAddress(msg.ValidatorAddr)) - acc.Coins = sdk.Coins{sdk.NewInt64Coin(bondDenom, 150)} + acc.Coins = sdk.Coins{sdk.NewInt64Coin(defaultBondDenom, 150)} genAccs[i] = NewGenesisAccount(&acc) stakingData.Pool.NotBondedTokens = stakingData.Pool.NotBondedTokens.Add(sdk.NewInt(150)) // increase the supply } @@ -55,7 +55,7 @@ func TestToAccount(t *testing.T) { priv := ed25519.GenPrivKey() addr := sdk.AccAddress(priv.PubKey().Address()) authAcc := auth.NewBaseAccountWithAddress(addr) - authAcc.SetCoins(sdk.Coins{sdk.NewInt64Coin(bondDenom, 150)}) + authAcc.SetCoins(sdk.Coins{sdk.NewInt64Coin(defaultBondDenom, 150)}) genAcc := NewGenesisAccount(&authAcc) acc := genAcc.ToAccount() require.IsType(t, &auth.BaseAccount{}, acc) @@ -104,7 +104,7 @@ func TestGaiaAppGenState(t *testing.T) { func makeMsg(name string, pk crypto.PubKey) auth.StdTx { desc := staking.NewDescription(name, "", "", "") comm := staking.CommissionMsg{} - msg := staking.NewMsgCreateValidator(sdk.ValAddress(pk.Address()), pk, sdk.NewInt64Coin(bondDenom, + msg := staking.NewMsgCreateValidator(sdk.ValAddress(pk.Address()), pk, sdk.NewInt64Coin(defaultBondDenom, 50), desc, comm, sdk.OneInt()) return auth.NewStdTx([]sdk.Msg{msg}, auth.StdFee{}, nil, "") } @@ -151,7 +151,7 @@ func TestNewDefaultGenesisAccount(t *testing.T) { addr := secp256k1.GenPrivKeySecp256k1([]byte("")).PubKey().Address() acc := NewDefaultGenesisAccount(sdk.AccAddress(addr)) require.Equal(t, sdk.NewInt(1000), acc.Coins.AmountOf("footoken")) - require.Equal(t, staking.TokensFromTendermintPower(150), acc.Coins.AmountOf(bondDenom)) + require.Equal(t, staking.TokensFromTendermintPower(150), acc.Coins.AmountOf(defaultBondDenom)) } func TestGenesisStateSanitize(t *testing.T) {