Merge pull request #3576 from cosmos/master
Merge master back into develop for v0.31.1
This commit is contained in:
commit
ed2b427fd6
|
@ -27,8 +27,8 @@ import (
|
||||||
|
|
||||||
var (
|
var (
|
||||||
// bonded tokens given to genesis validators/accounts
|
// bonded tokens given to genesis validators/accounts
|
||||||
freeFermionsAcc = staking.TokensFromTendermintPower(150)
|
freeFermionsAcc = staking.TokensFromTendermintPower(150)
|
||||||
bondDenom = staking.DefaultBondDenom
|
defaultBondDenom = staking.DefaultBondDenom
|
||||||
)
|
)
|
||||||
|
|
||||||
// State to Unmarshal
|
// State to Unmarshal
|
||||||
|
@ -401,7 +401,7 @@ func NewDefaultGenesisAccount(addr sdk.AccAddress) GenesisAccount {
|
||||||
accAuth := auth.NewBaseAccountWithAddress(addr)
|
accAuth := auth.NewBaseAccountWithAddress(addr)
|
||||||
coins := sdk.Coins{
|
coins := sdk.Coins{
|
||||||
sdk.NewCoin("footoken", sdk.NewInt(1000)),
|
sdk.NewCoin("footoken", sdk.NewInt(1000)),
|
||||||
sdk.NewCoin(bondDenom, freeFermionsAcc),
|
sdk.NewCoin(defaultBondDenom, freeFermionsAcc),
|
||||||
}
|
}
|
||||||
|
|
||||||
coins.Sort()
|
coins.Sort()
|
||||||
|
|
|
@ -41,7 +41,7 @@ func makeGenesisState(t *testing.T, genTxs []auth.StdTx) GenesisState {
|
||||||
msg := msgs[0].(staking.MsgCreateValidator)
|
msg := msgs[0].(staking.MsgCreateValidator)
|
||||||
|
|
||||||
acc := auth.NewBaseAccountWithAddress(sdk.AccAddress(msg.ValidatorAddr))
|
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)
|
genAccs[i] = NewGenesisAccount(&acc)
|
||||||
stakingData.Pool.NotBondedTokens = stakingData.Pool.NotBondedTokens.Add(sdk.NewInt(150)) // increase the supply
|
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()
|
priv := ed25519.GenPrivKey()
|
||||||
addr := sdk.AccAddress(priv.PubKey().Address())
|
addr := sdk.AccAddress(priv.PubKey().Address())
|
||||||
authAcc := auth.NewBaseAccountWithAddress(addr)
|
authAcc := auth.NewBaseAccountWithAddress(addr)
|
||||||
authAcc.SetCoins(sdk.Coins{sdk.NewInt64Coin(bondDenom, 150)})
|
authAcc.SetCoins(sdk.Coins{sdk.NewInt64Coin(defaultBondDenom, 150)})
|
||||||
genAcc := NewGenesisAccount(&authAcc)
|
genAcc := NewGenesisAccount(&authAcc)
|
||||||
acc := genAcc.ToAccount()
|
acc := genAcc.ToAccount()
|
||||||
require.IsType(t, &auth.BaseAccount{}, acc)
|
require.IsType(t, &auth.BaseAccount{}, acc)
|
||||||
|
@ -104,7 +104,7 @@ func TestGaiaAppGenState(t *testing.T) {
|
||||||
func makeMsg(name string, pk crypto.PubKey) auth.StdTx {
|
func makeMsg(name string, pk crypto.PubKey) auth.StdTx {
|
||||||
desc := staking.NewDescription(name, "", "", "")
|
desc := staking.NewDescription(name, "", "", "")
|
||||||
comm := staking.CommissionMsg{}
|
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())
|
50), desc, comm, sdk.OneInt())
|
||||||
return auth.NewStdTx([]sdk.Msg{msg}, auth.StdFee{}, nil, "")
|
return auth.NewStdTx([]sdk.Msg{msg}, auth.StdFee{}, nil, "")
|
||||||
}
|
}
|
||||||
|
@ -151,7 +151,7 @@ func TestNewDefaultGenesisAccount(t *testing.T) {
|
||||||
addr := secp256k1.GenPrivKeySecp256k1([]byte("")).PubKey().Address()
|
addr := secp256k1.GenPrivKeySecp256k1([]byte("")).PubKey().Address()
|
||||||
acc := NewDefaultGenesisAccount(sdk.AccAddress(addr))
|
acc := NewDefaultGenesisAccount(sdk.AccAddress(addr))
|
||||||
require.Equal(t, sdk.NewInt(1000), acc.Coins.AmountOf("footoken"))
|
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) {
|
func TestGenesisStateSanitize(t *testing.T) {
|
||||||
|
|
|
@ -76,13 +76,13 @@ func SupplyInvariants(ck bank.Keeper, k staking.Keeper,
|
||||||
feePool := d.GetFeePool(ctx)
|
feePool := d.GetFeePool(ctx)
|
||||||
|
|
||||||
// add outstanding fees
|
// 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
|
// 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
|
// 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
|
// Not-bonded tokens should equal coin supply plus unbonding delegations
|
||||||
// plus tokens on unbonded validators
|
// plus tokens on unbonded validators
|
||||||
|
|
Loading…
Reference in New Issue