Index supply by denom (#8517)
* temp commit * remove supply * update tests * revert proto script * fix lint * update tests * remove decoder * fix lint * update set supply * add changelog Co-authored-by: Jonathan Gimeno <jgimeno@gmail.com>
This commit is contained in:
SaReN
GitHub
parent
2864eb69a3
commit
eb8aaf9395
|
|
@ -52,6 +52,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
|
|||
* (client/keys) [\#8500](https://github.com/cosmos/cosmos-sdk/pull/8500) `InfoImporter` interface is removed from legacy keybase.
|
||||
* [\#8629](https://github.com/cosmos/cosmos-sdk/pull/8629) Deprecated `SetFullFundraiserPath` from `Config` in favor of `SetPurpose` and `SetCoinType`.
|
||||
* (x/upgrade) [\#8673](https://github.com/cosmos/cosmos-sdk/pull/8673) Remove IBC logic from x/upgrade. Deprecates IBC fields in an Upgrade Plan. IBC upgrade logic moved to 02-client and an IBC UpgradeProposal is added.
|
||||
* (x/bank) [\#8517](https://github.com/cosmos/cosmos-sdk/pull/8517) `SupplyI` interface and `Supply` are removed and uses `sdk.Coins` for supply tracking
|
||||
|
||||
### State Machine Breaking
|
||||
|
||||
|
|
@ -61,7 +62,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
|
|||
* (x/evidence) [\#8502](https://github.com/cosmos/cosmos-sdk/pull/8502) `HandleEquivocationEvidence` persists the evidence to state.
|
||||
* (x/gov) [\#7733](https://github.com/cosmos/cosmos-sdk/pull/7733) ADR 037 Implementation: Governance Split Votes
|
||||
* (x/bank) [\#8656](https://github.com/cosmos/cosmos-sdk/pull/8656) balance and supply are now correctly tracked via `coin_spent`, `coin_received`, `coinbase` and `burn` events.
|
||||
|
||||
* (x/bank) [\#8517](https://github.com/cosmos/cosmos-sdk/pull/8517) Supply is now stored and tracked as `sdk.Coins`
|
||||
### Improvements
|
||||
|
||||
* (x/bank) [\#8614](https://github.com/cosmos/cosmos-sdk/issues/8614) Add `Name` and `Symbol` fields to denom metadata
|
||||
|
|
|
|||
|
|
@ -43,19 +43,6 @@ message Output {
|
|||
[(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
|
||||
}
|
||||
|
||||
// Supply represents a struct that passively keeps track of the total supply
|
||||
// amounts in the network.
|
||||
message Supply {
|
||||
option (gogoproto.equal) = true;
|
||||
option (gogoproto.goproto_getters) = false;
|
||||
option (gogoproto.goproto_stringer) = false;
|
||||
|
||||
option (cosmos_proto.implements_interface) = "*github.com/cosmos/cosmos-sdk/x/bank/exported.SupplyI";
|
||||
|
||||
repeated cosmos.base.v1beta1.Coin total = 1
|
||||
[(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"];
|
||||
}
|
||||
|
||||
// DenomUnit represents a struct that describes a given
|
||||
// denomination unit of the basic token.
|
||||
message DenomUnit {
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
package exported
|
||||
|
||||
import (
|
||||
"github.com/gogo/protobuf/proto"
|
||||
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
)
|
||||
|
||||
|
|
@ -12,18 +10,3 @@ type GenesisBalance interface {
|
|||
GetAddress() sdk.AccAddress
|
||||
GetCoins() sdk.Coins
|
||||
}
|
||||
|
||||
// SupplyI defines an inflationary supply interface for modules that handle
|
||||
// token supply.
|
||||
type SupplyI interface {
|
||||
proto.Message
|
||||
|
||||
GetTotal() sdk.Coins
|
||||
SetTotal(total sdk.Coins)
|
||||
|
||||
Inflate(amount sdk.Coins)
|
||||
Deflate(amount sdk.Coins)
|
||||
|
||||
String() string
|
||||
ValidateBasic() error
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ func (k BaseKeeper) InitGenesis(ctx sdk.Context, genState *types.GenesisState) {
|
|||
genState.Supply = totalSupply
|
||||
}
|
||||
|
||||
k.setSupply(ctx, types.NewSupply(genState.Supply))
|
||||
k.setSupply(ctx, genState.Supply)
|
||||
|
||||
for _, meta := range genState.DenomMetadata {
|
||||
k.SetDenomMetaData(ctx, meta)
|
||||
|
|
@ -43,7 +43,7 @@ func (k BaseKeeper) ExportGenesis(ctx sdk.Context) *types.GenesisState {
|
|||
return types.NewGenesisState(
|
||||
k.GetParams(ctx),
|
||||
k.GetAccountsBalances(ctx),
|
||||
k.GetSupply(ctx).GetTotal(),
|
||||
k.GetTotalSupply(ctx),
|
||||
k.GetAllDenomMetaData(ctx),
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,21 +31,21 @@ func (suite *IntegrationTestSuite) TestExportGenesis() {
|
|||
|
||||
suite.Require().Len(exportGenesis.Params.SendEnabled, 0)
|
||||
suite.Require().Equal(types.DefaultParams().DefaultSendEnabled, exportGenesis.Params.DefaultSendEnabled)
|
||||
suite.Require().Equal(totalSupply.Total, exportGenesis.Supply)
|
||||
suite.Require().Equal(totalSupply, exportGenesis.Supply)
|
||||
// add mint module balance as nil
|
||||
expectedBalances = append(expectedBalances, types.Balance{Address: "cosmos1m3h30wlvsf8llruxtpukdvsy0km2kum8g38c8q", Coins: nil})
|
||||
suite.Require().Equal(expectedBalances, exportGenesis.Balances)
|
||||
suite.Require().Equal(expectedMetadata, exportGenesis.DenomMetadata)
|
||||
}
|
||||
|
||||
func (suite *IntegrationTestSuite) getTestBalancesAndSupply() ([]types.Balance, *types.Supply) {
|
||||
func (suite *IntegrationTestSuite) getTestBalancesAndSupply() ([]types.Balance, sdk.Coins) {
|
||||
addr2, _ := sdk.AccAddressFromBech32("cosmos1f9xjhxm0plzrh9cskf4qee4pc2xwp0n0556gh0")
|
||||
addr1, _ := sdk.AccAddressFromBech32("cosmos1fl48vsnmsdzcv85q5d2q4z5ajdha8yu34mf0eh")
|
||||
addr1Balance := sdk.Coins{sdk.NewInt64Coin("testcoin3", 10)}
|
||||
addr2Balance := sdk.Coins{sdk.NewInt64Coin("testcoin1", 32), sdk.NewInt64Coin("testcoin2", 34)}
|
||||
|
||||
totalSupply := types.NewSupply(addr1Balance)
|
||||
totalSupply.Inflate(addr2Balance)
|
||||
totalSupply := addr1Balance
|
||||
totalSupply = totalSupply.Add(addr2Balance...)
|
||||
return []types.Balance{
|
||||
{Address: addr2.String(), Coins: addr2Balance},
|
||||
{Address: addr1.String(), Coins: addr1Balance},
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ func (k BaseKeeper) AllBalances(ctx context.Context, req *types.QueryAllBalances
|
|||
// TotalSupply implements the Query/TotalSupply gRPC method
|
||||
func (k BaseKeeper) TotalSupply(ctx context.Context, _ *types.QueryTotalSupplyRequest) (*types.QueryTotalSupplyResponse, error) {
|
||||
sdkCtx := sdk.UnwrapSDKContext(ctx)
|
||||
totalSupply := k.GetSupply(sdkCtx).GetTotal()
|
||||
totalSupply := k.GetTotalSupply(sdkCtx)
|
||||
|
||||
return &types.QueryTotalSupplyResponse{Supply: totalSupply}, nil
|
||||
}
|
||||
|
|
@ -95,9 +95,9 @@ func (k BaseKeeper) SupplyOf(c context.Context, req *types.QuerySupplyOfRequest)
|
|||
}
|
||||
|
||||
ctx := sdk.UnwrapSDKContext(c)
|
||||
supply := k.GetSupply(ctx).GetTotal().AmountOf(req.Denom)
|
||||
supply := k.GetSupply(ctx, req.Denom)
|
||||
|
||||
return &types.QuerySupplyOfResponse{Amount: sdk.NewCoin(req.Denom, supply)}, nil
|
||||
return &types.QuerySupplyOfResponse{Amount: sdk.NewCoin(req.Denom, supply.Amount)}, nil
|
||||
}
|
||||
|
||||
// Params implements the gRPC service handler for querying x/bank parameters.
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
// +build norace
|
||||
|
||||
package keeper_test
|
||||
|
||||
import (
|
||||
|
|
@ -90,16 +88,16 @@ func (suite *IntegrationTestSuite) TestQueryAllBalances() {
|
|||
|
||||
func (suite *IntegrationTestSuite) TestQueryTotalSupply() {
|
||||
app, ctx, queryClient := suite.app, suite.ctx, suite.queryClient
|
||||
expectedTotalSupply := types.NewSupply(sdk.NewCoins(sdk.NewInt64Coin("test", 400000000)))
|
||||
expectedTotalSupply := sdk.NewCoins(sdk.NewInt64Coin("test", 400000000))
|
||||
suite.
|
||||
Require().
|
||||
NoError(app.BankKeeper.MintCoins(ctx, minttypes.ModuleName, expectedTotalSupply.Total))
|
||||
NoError(app.BankKeeper.MintCoins(ctx, minttypes.ModuleName, expectedTotalSupply))
|
||||
|
||||
res, err := queryClient.TotalSupply(gocontext.Background(), &types.QueryTotalSupplyRequest{})
|
||||
suite.Require().NoError(err)
|
||||
suite.Require().NotNil(res)
|
||||
|
||||
suite.Require().Equal(expectedTotalSupply.Total, res.Supply)
|
||||
suite.Require().Equal(expectedTotalSupply, res.Supply)
|
||||
}
|
||||
|
||||
func (suite *IntegrationTestSuite) TestQueryTotalSupplyOf() {
|
||||
|
|
@ -107,10 +105,10 @@ func (suite *IntegrationTestSuite) TestQueryTotalSupplyOf() {
|
|||
|
||||
test1Supply := sdk.NewInt64Coin("test1", 4000000)
|
||||
test2Supply := sdk.NewInt64Coin("test2", 700000000)
|
||||
expectedTotalSupply := types.NewSupply(sdk.NewCoins(test1Supply, test2Supply))
|
||||
expectedTotalSupply := sdk.NewCoins(test1Supply, test2Supply)
|
||||
suite.
|
||||
Require().
|
||||
NoError(app.BankKeeper.MintCoins(ctx, minttypes.ModuleName, expectedTotalSupply.Total))
|
||||
NoError(app.BankKeeper.MintCoins(ctx, minttypes.ModuleName, expectedTotalSupply))
|
||||
|
||||
_, err := queryClient.SupplyOf(gocontext.Background(), &types.QuerySupplyOfRequest{})
|
||||
suite.Require().Error(err)
|
||||
|
|
|
|||
|
|
@ -50,19 +50,19 @@ func NonnegativeBalanceInvariant(k ViewKeeper) sdk.Invariant {
|
|||
func TotalSupply(k Keeper) sdk.Invariant {
|
||||
return func(ctx sdk.Context) (string, bool) {
|
||||
expectedTotal := sdk.Coins{}
|
||||
supply := k.GetSupply(ctx)
|
||||
supply := k.GetTotalSupply(ctx)
|
||||
|
||||
k.IterateAllBalances(ctx, func(_ sdk.AccAddress, balance sdk.Coin) bool {
|
||||
expectedTotal = expectedTotal.Add(balance)
|
||||
return false
|
||||
})
|
||||
|
||||
broken := !expectedTotal.IsEqual(supply.GetTotal())
|
||||
broken := !expectedTotal.IsEqual(supply)
|
||||
|
||||
return sdk.FormatInvariant(types.ModuleName, "total supply",
|
||||
fmt.Sprintf(
|
||||
"\tsum of accounts coins: %v\n"+
|
||||
"\tsupply.Total: %v\n",
|
||||
expectedTotal, supply.GetTotal())), broken
|
||||
expectedTotal, supply)), broken
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ import (
|
|||
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
|
||||
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
|
||||
vestexported "github.com/cosmos/cosmos-sdk/x/auth/vesting/exported"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank/exported"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank/types"
|
||||
paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
|
||||
)
|
||||
|
|
@ -22,7 +21,9 @@ type Keeper interface {
|
|||
InitGenesis(sdk.Context, *types.GenesisState)
|
||||
ExportGenesis(sdk.Context) *types.GenesisState
|
||||
|
||||
GetSupply(ctx sdk.Context) exported.SupplyI
|
||||
GetSupply(ctx sdk.Context, denom string) sdk.Coin
|
||||
GetTotalSupply(ctx sdk.Context) sdk.Coins
|
||||
IterateTotalSupply(ctx sdk.Context, cb func(sdk.Coin) bool)
|
||||
|
||||
GetDenomMetaData(ctx sdk.Context, denom string) (types.Metadata, bool)
|
||||
SetDenomMetaData(ctx sdk.Context, denomMetaData types.Metadata)
|
||||
|
|
@ -38,8 +39,6 @@ type Keeper interface {
|
|||
|
||||
DelegateCoins(ctx sdk.Context, delegatorAddr, moduleAccAddr sdk.AccAddress, amt sdk.Coins) error
|
||||
UndelegateCoins(ctx sdk.Context, moduleAccAddr, delegatorAddr sdk.AccAddress, amt sdk.Coins) error
|
||||
MarshalSupply(supplyI exported.SupplyI) ([]byte, error)
|
||||
UnmarshalSupply(bz []byte) (exported.SupplyI, error)
|
||||
|
||||
types.QueryServer
|
||||
}
|
||||
|
|
@ -54,6 +53,16 @@ type BaseKeeper struct {
|
|||
paramSpace paramtypes.Subspace
|
||||
}
|
||||
|
||||
func (k BaseKeeper) GetTotalSupply(ctx sdk.Context) sdk.Coins {
|
||||
balances := sdk.NewCoins()
|
||||
k.IterateTotalSupply(ctx, func(balance sdk.Coin) bool {
|
||||
balances = balances.Add(balance)
|
||||
return false
|
||||
})
|
||||
|
||||
return balances.Sort()
|
||||
}
|
||||
|
||||
func NewBaseKeeper(
|
||||
cdc codec.BinaryMarshaler, storeKey sdk.StoreKey, ak types.AccountKeeper, paramSpace paramtypes.Subspace,
|
||||
blockedAddrs map[string]bool,
|
||||
|
|
@ -154,30 +163,52 @@ func (k BaseKeeper) UndelegateCoins(ctx sdk.Context, moduleAccAddr, delegatorAdd
|
|||
}
|
||||
|
||||
// GetSupply retrieves the Supply from store
|
||||
func (k BaseKeeper) GetSupply(ctx sdk.Context) exported.SupplyI {
|
||||
func (k BaseKeeper) GetSupply(ctx sdk.Context, denom string) sdk.Coin {
|
||||
store := ctx.KVStore(k.storeKey)
|
||||
bz := store.Get(types.SupplyKey)
|
||||
supplyStore := prefix.NewStore(store, types.SupplyKey)
|
||||
|
||||
bz := supplyStore.Get([]byte(denom))
|
||||
if bz == nil {
|
||||
panic("stored supply should not have been nil")
|
||||
return sdk.Coin{
|
||||
Denom: denom,
|
||||
Amount: sdk.NewInt(0),
|
||||
}
|
||||
}
|
||||
|
||||
supply, err := k.UnmarshalSupply(bz)
|
||||
var coin sdk.Coin
|
||||
err := k.cdc.UnmarshalBinaryBare(bz, &coin)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
return supply
|
||||
return coin
|
||||
}
|
||||
|
||||
// setSupply sets the Supply to store
|
||||
func (k BaseKeeper) setSupply(ctx sdk.Context, supply exported.SupplyI) {
|
||||
// SetSupply sets the Supply to store
|
||||
func (k BaseKeeper) setSupply(ctx sdk.Context, supply sdk.Coins) {
|
||||
store := ctx.KVStore(k.storeKey)
|
||||
bz, err := k.MarshalSupply(supply)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
supplyStore := prefix.NewStore(store, types.SupplyKey)
|
||||
|
||||
store.Set(types.SupplyKey, bz)
|
||||
var newSupply []sdk.Coin
|
||||
storeSupply := k.GetTotalSupply(ctx)
|
||||
|
||||
// update supply for coins which have non zero amount
|
||||
for _, coin := range storeSupply {
|
||||
if supply.AmountOf(coin.Denom).IsZero() {
|
||||
zeroCoin := &sdk.Coin{
|
||||
Denom: coin.Denom,
|
||||
Amount: sdk.NewInt(0),
|
||||
}
|
||||
bz := k.cdc.MustMarshalBinaryBare(zeroCoin)
|
||||
supplyStore.Set([]byte(coin.Denom), bz)
|
||||
}
|
||||
}
|
||||
newSupply = append(newSupply, supply...)
|
||||
|
||||
for i := range newSupply {
|
||||
bz := k.cdc.MustMarshalBinaryBare(&supply[i])
|
||||
supplyStore.Set([]byte(supply[i].Denom), bz)
|
||||
}
|
||||
}
|
||||
|
||||
// GetDenomMetaData retrieves the denomination metadata
|
||||
|
|
@ -339,8 +370,8 @@ func (k BaseKeeper) MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins)
|
|||
}
|
||||
|
||||
// update total supply
|
||||
supply := k.GetSupply(ctx)
|
||||
supply.Inflate(amt)
|
||||
supply := k.GetTotalSupply(ctx)
|
||||
supply = supply.Add(amt...)
|
||||
|
||||
k.setSupply(ctx, supply)
|
||||
|
||||
|
|
@ -373,8 +404,9 @@ func (k BaseKeeper) BurnCoins(ctx sdk.Context, moduleName string, amt sdk.Coins)
|
|||
}
|
||||
|
||||
// update total supply
|
||||
supply := k.GetSupply(ctx)
|
||||
supply.Deflate(amt)
|
||||
supply := k.GetTotalSupply(ctx)
|
||||
supply = supply.Sub(amt)
|
||||
|
||||
k.setSupply(ctx, supply)
|
||||
|
||||
logger := k.Logger(ctx)
|
||||
|
|
@ -418,14 +450,19 @@ func (k BaseKeeper) trackUndelegation(ctx sdk.Context, addr sdk.AccAddress, amt
|
|||
return nil
|
||||
}
|
||||
|
||||
// MarshalSupply protobuf serializes a Supply interface
|
||||
func (k BaseKeeper) MarshalSupply(supplyI exported.SupplyI) ([]byte, error) {
|
||||
return k.cdc.MarshalInterface(supplyI)
|
||||
}
|
||||
func (k BaseViewKeeper) IterateTotalSupply(ctx sdk.Context, cb func(sdk.Coin) bool) {
|
||||
store := ctx.KVStore(k.storeKey)
|
||||
supplyStore := prefix.NewStore(store, types.SupplyKey)
|
||||
|
||||
// UnmarshalSupply returns a Supply interface from raw encoded supply
|
||||
// bytes of a Proto-based Supply type
|
||||
func (k BaseKeeper) UnmarshalSupply(bz []byte) (exported.SupplyI, error) {
|
||||
var evi exported.SupplyI
|
||||
return evi, k.cdc.UnmarshalInterface(bz, &evi)
|
||||
iterator := supplyStore.Iterator(nil, nil)
|
||||
defer iterator.Close()
|
||||
|
||||
for ; iterator.Valid(); iterator.Next() {
|
||||
var balance sdk.Coin
|
||||
k.cdc.MustUnmarshalBinaryBare(iterator.Value(), &balance)
|
||||
|
||||
if cb(balance) {
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ func (suite *IntegrationTestSuite) TestSupply() {
|
|||
totalSupply := sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, initTokens))
|
||||
suite.NoError(app.BankKeeper.MintCoins(ctx, minttypes.ModuleName, totalSupply))
|
||||
|
||||
total := app.BankKeeper.GetSupply(ctx).GetTotal()
|
||||
total := app.BankKeeper.GetTotalSupply(ctx)
|
||||
suite.Require().Equal(totalSupply, total)
|
||||
}
|
||||
|
||||
|
|
@ -194,7 +194,7 @@ func (suite *IntegrationTestSuite) TestSupply_MintCoins() {
|
|||
authKeeper.SetModuleAccount(ctx, multiPermAcc)
|
||||
authKeeper.SetModuleAccount(ctx, randomPermAcc)
|
||||
|
||||
initialSupply := keeper.GetSupply(ctx)
|
||||
initialSupply := keeper.GetTotalSupply(ctx)
|
||||
|
||||
suite.Require().Panics(func() { keeper.MintCoins(ctx, "", initCoins) }, "no module account") // nolint:errcheck
|
||||
suite.Require().Panics(func() { keeper.MintCoins(ctx, authtypes.Burner, initCoins) }, "invalid permission") // nolint:errcheck
|
||||
|
|
@ -208,16 +208,16 @@ func (suite *IntegrationTestSuite) TestSupply_MintCoins() {
|
|||
suite.Require().NoError(err)
|
||||
|
||||
suite.Require().Equal(initCoins, getCoinsByName(ctx, keeper, authKeeper, authtypes.Minter))
|
||||
suite.Require().Equal(initialSupply.GetTotal().Add(initCoins...), keeper.GetSupply(ctx).GetTotal())
|
||||
suite.Require().Equal(initialSupply.Add(initCoins...), keeper.GetTotalSupply(ctx))
|
||||
|
||||
// test same functionality on module account with multiple permissions
|
||||
initialSupply = keeper.GetSupply(ctx)
|
||||
initialSupply = keeper.GetTotalSupply(ctx)
|
||||
|
||||
err = keeper.MintCoins(ctx, multiPermAcc.GetName(), initCoins)
|
||||
suite.Require().NoError(err)
|
||||
|
||||
suite.Require().Equal(initCoins, getCoinsByName(ctx, keeper, authKeeper, multiPermAcc.GetName()))
|
||||
suite.Require().Equal(initialSupply.GetTotal().Add(initCoins...), keeper.GetSupply(ctx).GetTotal())
|
||||
suite.Require().Equal(initialSupply.Add(initCoins...), keeper.GetTotalSupply(ctx))
|
||||
suite.Require().Panics(func() { keeper.MintCoins(ctx, authtypes.Burner, initCoins) }) // nolint:errcheck
|
||||
}
|
||||
|
||||
|
|
@ -256,24 +256,24 @@ func (suite *IntegrationTestSuite) TestSupply_BurnCoins() {
|
|||
suite.
|
||||
Require().
|
||||
NoError(keeper.MintCoins(ctx, authtypes.Minter, initCoins))
|
||||
supplyAfterInflation := keeper.GetSupply(ctx)
|
||||
supplyAfterInflation := keeper.GetTotalSupply(ctx)
|
||||
|
||||
suite.Require().Panics(func() { keeper.BurnCoins(ctx, "", initCoins) }, "no module account") // nolint:errcheck
|
||||
suite.Require().Panics(func() { keeper.BurnCoins(ctx, authtypes.Minter, initCoins) }, "invalid permission") // nolint:errcheck
|
||||
suite.Require().Panics(func() { keeper.BurnCoins(ctx, randomPerm, supplyAfterInflation.GetTotal()) }, "random permission") // nolint:errcheck
|
||||
err := keeper.BurnCoins(ctx, authtypes.Burner, supplyAfterInflation.GetTotal())
|
||||
suite.Require().Panics(func() { keeper.BurnCoins(ctx, "", initCoins) }, "no module account") // nolint:errcheck
|
||||
suite.Require().Panics(func() { keeper.BurnCoins(ctx, authtypes.Minter, initCoins) }, "invalid permission") // nolint:errcheck
|
||||
suite.Require().Panics(func() { keeper.BurnCoins(ctx, randomPerm, supplyAfterInflation) }, "random permission") // nolint:errcheck
|
||||
err := keeper.BurnCoins(ctx, authtypes.Burner, supplyAfterInflation)
|
||||
suite.Require().Error(err, "insufficient coins")
|
||||
|
||||
err = keeper.BurnCoins(ctx, authtypes.Burner, initCoins)
|
||||
suite.Require().NoError(err)
|
||||
suite.Require().Equal(sdk.NewCoins().String(), getCoinsByName(ctx, keeper, authKeeper, authtypes.Burner).String())
|
||||
suite.Require().Equal(supplyAfterInflation.GetTotal().Sub(initCoins), keeper.GetSupply(ctx).GetTotal())
|
||||
suite.Require().Equal(supplyAfterInflation.Sub(initCoins), keeper.GetTotalSupply(ctx))
|
||||
|
||||
// test same functionality on module account with multiple permissions
|
||||
suite.
|
||||
Require().
|
||||
NoError(keeper.MintCoins(ctx, authtypes.Minter, initCoins))
|
||||
supplyAfterInflation = keeper.GetSupply(ctx)
|
||||
supplyAfterInflation = keeper.GetTotalSupply(ctx)
|
||||
|
||||
suite.Require().NoError(keeper.SendCoins(ctx, authtypes.NewModuleAddress(authtypes.Minter), multiPermAcc.GetAddress(), initCoins))
|
||||
authKeeper.SetModuleAccount(ctx, multiPermAcc)
|
||||
|
|
@ -281,7 +281,7 @@ func (suite *IntegrationTestSuite) TestSupply_BurnCoins() {
|
|||
err = keeper.BurnCoins(ctx, multiPermAcc.GetName(), initCoins)
|
||||
suite.Require().NoError(err)
|
||||
suite.Require().Equal(sdk.NewCoins().String(), getCoinsByName(ctx, keeper, authKeeper, multiPermAcc.GetName()).String())
|
||||
suite.Require().Equal(supplyAfterInflation.GetTotal().Sub(initCoins), keeper.GetSupply(ctx).GetTotal())
|
||||
suite.Require().Equal(supplyAfterInflation.Sub(initCoins), keeper.GetTotalSupply(ctx))
|
||||
}
|
||||
|
||||
func (suite *IntegrationTestSuite) TestSendCoinsNewAccount() {
|
||||
|
|
@ -1080,9 +1080,9 @@ func (suite *IntegrationTestSuite) TestBalanceTrackingEvents() {
|
|||
}
|
||||
|
||||
// check balance and supply tracking
|
||||
savedSupply := suite.app.BankKeeper.GetSupply(suite.ctx)
|
||||
utxoSupply := savedSupply.GetTotal().AmountOf("utxo")
|
||||
suite.Require().Equal(utxoSupply, supply.AmountOf("utxo"))
|
||||
savedSupply := suite.app.BankKeeper.GetSupply(suite.ctx, "utxo")
|
||||
utxoSupply := savedSupply
|
||||
suite.Require().Equal(utxoSupply.Amount, supply.AmountOf("utxo"))
|
||||
// iterate accounts and check balances
|
||||
suite.app.BankKeeper.IterateAllBalances(suite.ctx, func(address sdk.AccAddress, coin sdk.Coin) (stop bool) {
|
||||
// if it's not utxo coin then skip
|
||||
|
|
|
|||
|
|
@ -84,7 +84,8 @@ func queryTotalSupply(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQu
|
|||
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error())
|
||||
}
|
||||
|
||||
totalSupply := k.GetSupply(ctx).GetTotal()
|
||||
//TODO: pagenate
|
||||
totalSupply := k.GetTotalSupply(ctx)
|
||||
|
||||
start, end := client.Paginate(len(totalSupply), params.Page, params.Limit, 100)
|
||||
if start < 0 || end < 0 {
|
||||
|
|
@ -109,8 +110,8 @@ func querySupplyOf(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQueri
|
|||
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error())
|
||||
}
|
||||
|
||||
amount := k.GetSupply(ctx).GetTotal().AmountOf(params.Denom)
|
||||
supply := sdk.NewCoin(params.Denom, amount)
|
||||
amount := k.GetSupply(ctx, params.Denom)
|
||||
supply := sdk.NewCoin(params.Denom, amount.Amount)
|
||||
|
||||
bz, err := codec.MarshalJSONIndent(legacyQuerierCdc, supply)
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -91,10 +91,10 @@ func (suite *IntegrationTestSuite) TestQuerier_QueryAllBalances() {
|
|||
func (suite *IntegrationTestSuite) TestQuerier_QueryTotalSupply() {
|
||||
app, ctx := suite.app, suite.ctx
|
||||
legacyAmino := app.LegacyAmino()
|
||||
expectedTotalSupply := types.NewSupply(sdk.NewCoins(sdk.NewInt64Coin("test", 400000000)))
|
||||
expectedTotalSupply := sdk.NewCoins(sdk.NewInt64Coin("test", 400000000))
|
||||
suite.
|
||||
Require().
|
||||
NoError(app.BankKeeper.MintCoins(ctx, minttypes.ModuleName, expectedTotalSupply.Total))
|
||||
NoError(app.BankKeeper.MintCoins(ctx, minttypes.ModuleName, expectedTotalSupply))
|
||||
|
||||
req := abci.RequestQuery{
|
||||
Path: fmt.Sprintf("custom/%s/%s", types.ModuleName, types.QueryTotalSupply),
|
||||
|
|
@ -114,7 +114,7 @@ func (suite *IntegrationTestSuite) TestQuerier_QueryTotalSupply() {
|
|||
|
||||
var resp sdk.Coins
|
||||
suite.Require().NoError(legacyAmino.UnmarshalJSON(res, &resp))
|
||||
suite.Require().Equal(expectedTotalSupply.Total, resp)
|
||||
suite.Require().Equal(expectedTotalSupply, resp)
|
||||
}
|
||||
|
||||
func (suite *IntegrationTestSuite) TestQuerier_QueryTotalSupplyOf() {
|
||||
|
|
@ -122,10 +122,10 @@ func (suite *IntegrationTestSuite) TestQuerier_QueryTotalSupplyOf() {
|
|||
legacyAmino := app.LegacyAmino()
|
||||
test1Supply := sdk.NewInt64Coin("test1", 4000000)
|
||||
test2Supply := sdk.NewInt64Coin("test2", 700000000)
|
||||
expectedTotalSupply := types.NewSupply(sdk.NewCoins(test1Supply, test2Supply))
|
||||
expectedTotalSupply := sdk.NewCoins(test1Supply, test2Supply)
|
||||
suite.
|
||||
Require().
|
||||
NoError(app.BankKeeper.MintCoins(ctx, minttypes.ModuleName, expectedTotalSupply.Total))
|
||||
NoError(app.BankKeeper.MintCoins(ctx, minttypes.ModuleName, expectedTotalSupply))
|
||||
|
||||
req := abci.RequestQuery{
|
||||
Path: fmt.Sprintf("custom/%s/%s", types.ModuleName, types.QuerySupplyOf),
|
||||
|
|
|
|||
|
|
@ -182,9 +182,7 @@ func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.ParamChange {
|
|||
}
|
||||
|
||||
// RegisterStoreDecoder registers a decoder for supply module's types
|
||||
func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) {
|
||||
sdr[types.StoreKey] = simulation.NewDecodeStore(am.keeper)
|
||||
}
|
||||
func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) {}
|
||||
|
||||
// WeightedOperations returns the all the gov module operations with their respective weights.
|
||||
func (am AppModule) WeightedOperations(simState module.SimulationState) []simtypes.WeightedOperation {
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
package simulation
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
|
||||
"github.com/cosmos/cosmos-sdk/types/kv"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank/exported"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank/types"
|
||||
)
|
||||
|
||||
// SupplyUnmarshaler defines the expected encoding store functions.
|
||||
type SupplyUnmarshaler interface {
|
||||
UnmarshalSupply([]byte) (exported.SupplyI, error)
|
||||
}
|
||||
|
||||
// NewDecodeStore returns a function closure that unmarshals the KVPair's values
|
||||
// to the corresponding types.
|
||||
func NewDecodeStore(cdc SupplyUnmarshaler) func(kvA, kvB kv.Pair) string {
|
||||
return func(kvA, kvB kv.Pair) string {
|
||||
switch {
|
||||
case bytes.Equal(kvA.Key[:1], types.SupplyKey):
|
||||
supplyA, err := cdc.UnmarshalSupply(kvA.Value)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
supplyB, err := cdc.UnmarshalSupply(kvB.Value)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
return fmt.Sprintf("%v\n%v", supplyA, supplyB)
|
||||
|
||||
default:
|
||||
panic(fmt.Sprintf("unexpected %s key %X (%s)", types.ModuleName, kvA.Key, kvA.Key))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,51 +0,0 @@
|
|||
package simulation_test
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/cosmos/cosmos-sdk/simapp"
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
"github.com/cosmos/cosmos-sdk/types/kv"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank/simulation"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank/types"
|
||||
)
|
||||
|
||||
func TestDecodeStore(t *testing.T) {
|
||||
app := simapp.Setup(false)
|
||||
dec := simulation.NewDecodeStore(app.BankKeeper)
|
||||
|
||||
totalSupply := types.NewSupply(sdk.NewCoins(sdk.NewInt64Coin(sdk.DefaultBondDenom, 1000)))
|
||||
|
||||
supplyBz, err := app.BankKeeper.MarshalSupply(totalSupply)
|
||||
require.NoError(t, err)
|
||||
|
||||
kvPairs := kv.Pairs{
|
||||
Pairs: []kv.Pair{
|
||||
{Key: types.SupplyKey, Value: supplyBz},
|
||||
{Key: []byte{0x99}, Value: []byte{0x99}},
|
||||
},
|
||||
}
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
expectedLog string
|
||||
}{
|
||||
{"Supply", fmt.Sprintf("%v\n%v", totalSupply, totalSupply)},
|
||||
{"other", ""},
|
||||
}
|
||||
|
||||
for i, tt := range tests {
|
||||
i, tt := i, tt
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
switch i {
|
||||
case len(tests) - 1:
|
||||
require.Panics(t, func() { dec(kvPairs.Pairs[i], kvPairs.Pairs[i]) }, tt.name)
|
||||
default:
|
||||
require.Equal(t, tt.expectedLog, dec(kvPairs.Pairs[i], kvPairs.Pairs[i]), tt.name)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
@ -209,44 +209,6 @@ func (m *Output) XXX_DiscardUnknown() {
|
|||
|
||||
var xxx_messageInfo_Output proto.InternalMessageInfo
|
||||
|
||||
// Supply represents a struct that passively keeps track of the total supply
|
||||
// amounts in the network.
|
||||
type Supply struct {
|
||||
Total github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=total,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"total"`
|
||||
}
|
||||
|
||||
func (m *Supply) Reset() { *m = Supply{} }
|
||||
func (*Supply) ProtoMessage() {}
|
||||
func (*Supply) Descriptor() ([]byte, []int) {
|
||||
return fileDescriptor_dd052eee12edf988, []int{4}
|
||||
}
|
||||
func (m *Supply) XXX_Unmarshal(b []byte) error {
|
||||
return m.Unmarshal(b)
|
||||
}
|
||||
func (m *Supply) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
|
||||
if deterministic {
|
||||
return xxx_messageInfo_Supply.Marshal(b, m, deterministic)
|
||||
} else {
|
||||
b = b[:cap(b)]
|
||||
n, err := m.MarshalToSizedBuffer(b)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return b[:n], nil
|
||||
}
|
||||
}
|
||||
func (m *Supply) XXX_Merge(src proto.Message) {
|
||||
xxx_messageInfo_Supply.Merge(m, src)
|
||||
}
|
||||
func (m *Supply) XXX_Size() int {
|
||||
return m.Size()
|
||||
}
|
||||
func (m *Supply) XXX_DiscardUnknown() {
|
||||
xxx_messageInfo_Supply.DiscardUnknown(m)
|
||||
}
|
||||
|
||||
var xxx_messageInfo_Supply proto.InternalMessageInfo
|
||||
|
||||
// DenomUnit represents a struct that describes a given
|
||||
// denomination unit of the basic token.
|
||||
type DenomUnit struct {
|
||||
|
|
@ -266,7 +228,7 @@ func (m *DenomUnit) Reset() { *m = DenomUnit{} }
|
|||
func (m *DenomUnit) String() string { return proto.CompactTextString(m) }
|
||||
func (*DenomUnit) ProtoMessage() {}
|
||||
func (*DenomUnit) Descriptor() ([]byte, []int) {
|
||||
return fileDescriptor_dd052eee12edf988, []int{5}
|
||||
return fileDescriptor_dd052eee12edf988, []int{4}
|
||||
}
|
||||
func (m *DenomUnit) XXX_Unmarshal(b []byte) error {
|
||||
return m.Unmarshal(b)
|
||||
|
|
@ -338,7 +300,7 @@ func (m *Metadata) Reset() { *m = Metadata{} }
|
|||
func (m *Metadata) String() string { return proto.CompactTextString(m) }
|
||||
func (*Metadata) ProtoMessage() {}
|
||||
func (*Metadata) Descriptor() ([]byte, []int) {
|
||||
return fileDescriptor_dd052eee12edf988, []int{6}
|
||||
return fileDescriptor_dd052eee12edf988, []int{5}
|
||||
}
|
||||
func (m *Metadata) XXX_Unmarshal(b []byte) error {
|
||||
return m.Unmarshal(b)
|
||||
|
|
@ -414,7 +376,6 @@ func init() {
|
|||
proto.RegisterType((*SendEnabled)(nil), "cosmos.bank.v1beta1.SendEnabled")
|
||||
proto.RegisterType((*Input)(nil), "cosmos.bank.v1beta1.Input")
|
||||
proto.RegisterType((*Output)(nil), "cosmos.bank.v1beta1.Output")
|
||||
proto.RegisterType((*Supply)(nil), "cosmos.bank.v1beta1.Supply")
|
||||
proto.RegisterType((*DenomUnit)(nil), "cosmos.bank.v1beta1.DenomUnit")
|
||||
proto.RegisterType((*Metadata)(nil), "cosmos.bank.v1beta1.Metadata")
|
||||
}
|
||||
|
|
@ -422,44 +383,41 @@ func init() {
|
|||
func init() { proto.RegisterFile("cosmos/bank/v1beta1/bank.proto", fileDescriptor_dd052eee12edf988) }
|
||||
|
||||
var fileDescriptor_dd052eee12edf988 = []byte{
|
||||
// 588 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x54, 0xbf, 0x6f, 0xd3, 0x4e,
|
||||
0x14, 0xf7, 0x35, 0x8d, 0xbf, 0xe9, 0xe5, 0xcb, 0x72, 0x54, 0xc8, 0xad, 0x84, 0x6d, 0x2c, 0x21,
|
||||
0xa5, 0x88, 0x3a, 0x14, 0xc4, 0x92, 0x05, 0x29, 0xa5, 0x42, 0x1d, 0x10, 0xc8, 0x15, 0x42, 0x82,
|
||||
0x21, 0x3a, 0xe7, 0xae, 0xc1, 0xaa, 0x7d, 0x67, 0xe5, 0xce, 0xa8, 0xfe, 0x0f, 0x98, 0x80, 0x91,
|
||||
0xb1, 0x33, 0x23, 0xe2, 0x7f, 0xa0, 0x63, 0x05, 0x0b, 0x53, 0x40, 0xc9, 0xc2, 0xdc, 0xbf, 0x00,
|
||||
0xdd, 0x9d, 0xf3, 0xa3, 0x52, 0x40, 0x0c, 0x0c, 0x4c, 0xb9, 0xcf, 0x7b, 0x9f, 0xf7, 0x79, 0x4f,
|
||||
0x9f, 0xf7, 0x1c, 0xe8, 0xf6, 0xb9, 0xc8, 0xb8, 0x68, 0xc7, 0x98, 0x1d, 0xb5, 0x5f, 0xee, 0xc4,
|
||||
0x54, 0xe2, 0x1d, 0x0d, 0xc2, 0x7c, 0xc8, 0x25, 0x47, 0x97, 0x4d, 0x3e, 0xd4, 0xa1, 0x2a, 0xbf,
|
||||
0xb9, 0x3e, 0xe0, 0x03, 0xae, 0xf3, 0x6d, 0xf5, 0x32, 0xd4, 0xcd, 0x0d, 0x43, 0xed, 0x99, 0x44,
|
||||
0x55, 0x67, 0x52, 0xf3, 0x2e, 0x82, 0xce, 0xba, 0xf4, 0x79, 0xc2, 0x4c, 0x3e, 0xf8, 0x02, 0xa0,
|
||||
0xfd, 0x18, 0x0f, 0x71, 0x26, 0xd0, 0x21, 0xfc, 0x5f, 0x50, 0x46, 0x7a, 0x94, 0xe1, 0x38, 0xa5,
|
||||
0xc4, 0x01, 0x7e, 0xad, 0xd5, 0xbc, 0xed, 0x87, 0x4b, 0xe6, 0x08, 0x0f, 0x28, 0x23, 0x7b, 0x86,
|
||||
0xd7, 0xbd, 0x76, 0x3e, 0xf2, 0xae, 0x96, 0x38, 0x4b, 0x3b, 0xc1, 0x62, 0xfd, 0x4d, 0x9e, 0x25,
|
||||
0x92, 0x66, 0xb9, 0x2c, 0x83, 0xa8, 0x29, 0xe6, 0x7c, 0xf4, 0x1c, 0xae, 0x13, 0x7a, 0x88, 0x8b,
|
||||
0x54, 0xf6, 0x2e, 0xf4, 0x5b, 0xf1, 0x41, 0xab, 0xd1, 0xdd, 0x3a, 0x1f, 0x79, 0xd7, 0x8d, 0xda,
|
||||
0x32, 0xd6, 0xa2, 0x2a, 0xaa, 0x08, 0x0b, 0xc3, 0x74, 0x56, 0xdf, 0x9d, 0x78, 0x56, 0xf0, 0x00,
|
||||
0x36, 0x17, 0x82, 0x68, 0x1d, 0xd6, 0x09, 0x65, 0x3c, 0x73, 0x80, 0x0f, 0x5a, 0x6b, 0x91, 0x01,
|
||||
0xc8, 0x81, 0xff, 0x5d, 0x68, 0x1d, 0x4d, 0x61, 0xa7, 0xa1, 0x44, 0x7e, 0x9c, 0x78, 0x20, 0x78,
|
||||
0x0d, 0x60, 0x7d, 0x9f, 0xe5, 0x85, 0x54, 0x6c, 0x4c, 0xc8, 0x90, 0x0a, 0x51, 0xa9, 0x4c, 0x21,
|
||||
0xc2, 0xb0, 0xae, 0x0c, 0x15, 0xce, 0x8a, 0x36, 0x6c, 0x63, 0x6e, 0x98, 0xa0, 0x33, 0xc3, 0x76,
|
||||
0x79, 0xc2, 0xba, 0xb7, 0x4e, 0x47, 0x9e, 0xf5, 0xfe, 0x9b, 0xd7, 0x1a, 0x24, 0xf2, 0x45, 0x11,
|
||||
0x87, 0x7d, 0x9e, 0x55, 0xdb, 0xaa, 0x7e, 0xb6, 0x05, 0x39, 0x6a, 0xcb, 0x32, 0xa7, 0x42, 0x17,
|
||||
0x88, 0xc8, 0x28, 0x77, 0x1a, 0xaf, 0xcc, 0x40, 0x56, 0xf0, 0x06, 0x40, 0xfb, 0x51, 0x21, 0xff,
|
||||
0xa1, 0x89, 0x3e, 0x00, 0x68, 0x1f, 0x14, 0x79, 0x9e, 0x96, 0xaa, 0xaf, 0xe4, 0x12, 0xa7, 0xd5,
|
||||
0xe9, 0xfc, 0xdd, 0xbe, 0x5a, 0xb9, 0xb3, 0xa7, 0xfa, 0x4e, 0xd7, 0xf3, 0xf9, 0xe3, 0xf6, 0xdd,
|
||||
0x1b, 0xbf, 0x55, 0x38, 0x36, 0x9f, 0x17, 0x3d, 0xce, 0xf9, 0x50, 0x52, 0x12, 0x9a, 0x41, 0xf7,
|
||||
0x83, 0xa7, 0x70, 0xed, 0xbe, 0x3a, 0x82, 0x27, 0x2c, 0x91, 0xbf, 0x38, 0x8f, 0x4d, 0xd8, 0x50,
|
||||
0x65, 0x8c, 0x32, 0xa9, 0xef, 0xe3, 0x52, 0x34, 0xc3, 0xda, 0xfa, 0x34, 0xc1, 0x82, 0x0a, 0xa7,
|
||||
0xe6, 0xd7, 0xb4, 0xf5, 0x06, 0x06, 0x9f, 0x00, 0x6c, 0x3c, 0xa4, 0x12, 0x13, 0x2c, 0x31, 0xf2,
|
||||
0x61, 0x93, 0x50, 0xd1, 0x1f, 0x26, 0xb9, 0x4c, 0x38, 0xab, 0xe4, 0x17, 0x43, 0xe8, 0x9e, 0x62,
|
||||
0x30, 0x9e, 0xf5, 0x0a, 0x96, 0xc8, 0xe9, 0xbe, 0xdc, 0xa5, 0x9f, 0xdc, 0x6c, 0xde, 0x08, 0x92,
|
||||
0xe9, 0x53, 0x20, 0x04, 0x57, 0x95, 0xbb, 0x4e, 0x4d, 0x6b, 0xeb, 0xb7, 0x9a, 0x8e, 0x24, 0x22,
|
||||
0x4f, 0x71, 0xe9, 0xac, 0x9a, 0xc3, 0xa8, 0xa0, 0x62, 0x33, 0x9c, 0x51, 0xa7, 0x6e, 0xd8, 0xea,
|
||||
0x8d, 0xae, 0x40, 0x5b, 0x94, 0x59, 0xcc, 0x53, 0xc7, 0xd6, 0xd1, 0x0a, 0x75, 0x77, 0x4f, 0xc7,
|
||||
0x2e, 0x38, 0x1b, 0xbb, 0xe0, 0xfb, 0xd8, 0x05, 0x6f, 0x27, 0xae, 0x75, 0x36, 0x71, 0xad, 0xaf,
|
||||
0x13, 0xd7, 0x7a, 0xb6, 0xf5, 0x27, 0x96, 0xeb, 0xdd, 0xc5, 0xb6, 0xfe, 0x97, 0xb9, 0xf3, 0x33,
|
||||
0x00, 0x00, 0xff, 0xff, 0xa8, 0xf5, 0xda, 0x82, 0xed, 0x04, 0x00, 0x00,
|
||||
// 537 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x54, 0xbf, 0x8f, 0xd3, 0x30,
|
||||
0x18, 0x8d, 0xaf, 0x3f, 0xe8, 0xb9, 0xb0, 0x98, 0x0a, 0xe5, 0x2a, 0x91, 0x84, 0x48, 0x48, 0x3d,
|
||||
0x09, 0x5a, 0x0e, 0xb6, 0x2e, 0x48, 0x3d, 0x10, 0x62, 0x40, 0xa0, 0x20, 0x84, 0x04, 0x43, 0xe5,
|
||||
0xd4, 0xbe, 0x62, 0x5d, 0x6c, 0x47, 0xb5, 0x8b, 0xae, 0xff, 0x01, 0x13, 0x30, 0x32, 0xde, 0xcc,
|
||||
0x3f, 0xc2, 0x8d, 0x27, 0xb1, 0x30, 0x15, 0xd4, 0x2e, 0xcc, 0xf7, 0x17, 0x20, 0xdb, 0x69, 0x9b,
|
||||
0x93, 0x0a, 0x33, 0x53, 0xbf, 0xf7, 0x7d, 0xcf, 0xef, 0x7b, 0x7e, 0x4d, 0x02, 0x83, 0x91, 0x54,
|
||||
0x5c, 0xaa, 0x5e, 0x8a, 0xc5, 0x71, 0xef, 0xfd, 0x41, 0x4a, 0x35, 0x3e, 0xb0, 0xa0, 0x9b, 0x4f,
|
||||
0xa4, 0x96, 0xe8, 0xba, 0x9b, 0x77, 0x6d, 0xab, 0x98, 0xb7, 0x5b, 0x63, 0x39, 0x96, 0x76, 0xde,
|
||||
0x33, 0x95, 0xa3, 0xb6, 0xf7, 0x1c, 0x75, 0xe8, 0x06, 0xc5, 0x39, 0x37, 0xda, 0x6c, 0x51, 0x74,
|
||||
0xbd, 0x65, 0x24, 0x99, 0x70, 0xf3, 0xf8, 0x3b, 0x80, 0xf5, 0x17, 0x78, 0x82, 0xb9, 0x42, 0x47,
|
||||
0xf0, 0xaa, 0xa2, 0x82, 0x0c, 0xa9, 0xc0, 0x69, 0x46, 0x89, 0x0f, 0xa2, 0x4a, 0xa7, 0x79, 0x3f,
|
||||
0xea, 0x6e, 0xf1, 0xd1, 0x7d, 0x49, 0x05, 0x79, 0xec, 0x78, 0x83, 0x5b, 0x17, 0xf3, 0xf0, 0xe6,
|
||||
0x0c, 0xf3, 0xac, 0x1f, 0x97, 0xcf, 0xdf, 0x91, 0x9c, 0x69, 0xca, 0x73, 0x3d, 0x8b, 0x93, 0xa6,
|
||||
0xda, 0xf0, 0xd1, 0x5b, 0xd8, 0x22, 0xf4, 0x08, 0x4f, 0x33, 0x3d, 0xbc, 0xb4, 0x6f, 0x27, 0x02,
|
||||
0x9d, 0xc6, 0x60, 0xff, 0x62, 0x1e, 0xde, 0x76, 0x6a, 0xdb, 0x58, 0x65, 0x55, 0x54, 0x10, 0x4a,
|
||||
0x66, 0xfa, 0xd5, 0x2f, 0xa7, 0xa1, 0x17, 0x3f, 0x81, 0xcd, 0x52, 0x13, 0xb5, 0x60, 0x8d, 0x50,
|
||||
0x21, 0xb9, 0x0f, 0x22, 0xd0, 0xd9, 0x4d, 0x1c, 0x40, 0x3e, 0xbc, 0x72, 0x69, 0x75, 0xb2, 0x82,
|
||||
0xfd, 0x86, 0x11, 0xf9, 0x7d, 0x1a, 0x82, 0xf8, 0x23, 0x80, 0xb5, 0xa7, 0x22, 0x9f, 0x6a, 0xc3,
|
||||
0xc6, 0x84, 0x4c, 0xa8, 0x52, 0x85, 0xca, 0x0a, 0x22, 0x0c, 0x6b, 0x26, 0x50, 0xe5, 0xef, 0xd8,
|
||||
0xc0, 0xf6, 0x36, 0x81, 0x29, 0xba, 0x0e, 0xec, 0x50, 0x32, 0x31, 0xb8, 0x77, 0x36, 0x0f, 0xbd,
|
||||
0xaf, 0x3f, 0xc3, 0xce, 0x98, 0xe9, 0x77, 0xd3, 0xb4, 0x3b, 0x92, 0xbc, 0xf8, 0xb7, 0x8a, 0x9f,
|
||||
0xbb, 0x8a, 0x1c, 0xf7, 0xf4, 0x2c, 0xa7, 0xca, 0x1e, 0x50, 0x89, 0x53, 0xee, 0x37, 0x3e, 0x38,
|
||||
0x43, 0x5e, 0xfc, 0x09, 0xc0, 0xfa, 0xf3, 0xa9, 0xfe, 0x8f, 0x1c, 0xbd, 0x86, 0xbb, 0x8f, 0x4c,
|
||||
0x9e, 0xaf, 0x04, 0xd3, 0x7f, 0x49, 0xba, 0x0d, 0x1b, 0xf4, 0x24, 0x97, 0x82, 0x0a, 0x6d, 0xa3,
|
||||
0xbe, 0x96, 0xac, 0xb1, 0xbd, 0x45, 0xc6, 0xb0, 0xa2, 0xca, 0xaf, 0x44, 0x15, 0x7b, 0x0b, 0x07,
|
||||
0xe3, 0x6f, 0x00, 0x36, 0x9e, 0x51, 0x8d, 0x09, 0xd6, 0x18, 0x45, 0xb0, 0x49, 0xa8, 0x1a, 0x4d,
|
||||
0x58, 0xae, 0x99, 0x14, 0x85, 0x7c, 0xb9, 0x85, 0x1e, 0x1a, 0x86, 0x90, 0x7c, 0x38, 0x15, 0x4c,
|
||||
0xaf, 0xae, 0x1e, 0x6c, 0x7d, 0x7a, 0xd7, 0x7e, 0x13, 0x48, 0x56, 0xa5, 0x42, 0x08, 0x56, 0x4d,
|
||||
0x40, 0x7e, 0xc5, 0x6a, 0xdb, 0xda, 0xb8, 0x23, 0x4c, 0xe5, 0x19, 0x9e, 0xf9, 0x55, 0x97, 0x71,
|
||||
0x01, 0x0d, 0x5b, 0x60, 0x4e, 0xfd, 0x9a, 0x63, 0x9b, 0x1a, 0xdd, 0x80, 0x75, 0x35, 0xe3, 0xa9,
|
||||
0xcc, 0xfc, 0xba, 0xed, 0x16, 0x68, 0x70, 0x78, 0xb6, 0x08, 0xc0, 0xf9, 0x22, 0x00, 0xbf, 0x16,
|
||||
0x01, 0xf8, 0xbc, 0x0c, 0xbc, 0xf3, 0x65, 0xe0, 0xfd, 0x58, 0x06, 0xde, 0x9b, 0xfd, 0x7f, 0xe6,
|
||||
0x7e, 0xe2, 0x3e, 0x0e, 0x36, 0xfe, 0xb4, 0x6e, 0x5f, 0xd8, 0x07, 0x7f, 0x02, 0x00, 0x00, 0xff,
|
||||
0xff, 0x42, 0x5b, 0x8d, 0xc8, 0x38, 0x04, 0x00, 0x00,
|
||||
}
|
||||
|
||||
func (this *SendEnabled) Equal(that interface{}) bool {
|
||||
|
|
@ -489,35 +447,6 @@ func (this *SendEnabled) Equal(that interface{}) bool {
|
|||
}
|
||||
return true
|
||||
}
|
||||
func (this *Supply) Equal(that interface{}) bool {
|
||||
if that == nil {
|
||||
return this == nil
|
||||
}
|
||||
|
||||
that1, ok := that.(*Supply)
|
||||
if !ok {
|
||||
that2, ok := that.(Supply)
|
||||
if ok {
|
||||
that1 = &that2
|
||||
} else {
|
||||
return false
|
||||
}
|
||||
}
|
||||
if that1 == nil {
|
||||
return this == nil
|
||||
} else if this == nil {
|
||||
return false
|
||||
}
|
||||
if len(this.Total) != len(that1.Total) {
|
||||
return false
|
||||
}
|
||||
for i := range this.Total {
|
||||
if !this.Total[i].Equal(&that1.Total[i]) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
func (m *Params) Marshal() (dAtA []byte, err error) {
|
||||
size := m.Size()
|
||||
dAtA = make([]byte, size)
|
||||
|
|
@ -693,43 +622,6 @@ func (m *Output) MarshalToSizedBuffer(dAtA []byte) (int, error) {
|
|||
return len(dAtA) - i, nil
|
||||
}
|
||||
|
||||
func (m *Supply) Marshal() (dAtA []byte, err error) {
|
||||
size := m.Size()
|
||||
dAtA = make([]byte, size)
|
||||
n, err := m.MarshalToSizedBuffer(dAtA[:size])
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return dAtA[:n], nil
|
||||
}
|
||||
|
||||
func (m *Supply) MarshalTo(dAtA []byte) (int, error) {
|
||||
size := m.Size()
|
||||
return m.MarshalToSizedBuffer(dAtA[:size])
|
||||
}
|
||||
|
||||
func (m *Supply) MarshalToSizedBuffer(dAtA []byte) (int, error) {
|
||||
i := len(dAtA)
|
||||
_ = i
|
||||
var l int
|
||||
_ = l
|
||||
if len(m.Total) > 0 {
|
||||
for iNdEx := len(m.Total) - 1; iNdEx >= 0; iNdEx-- {
|
||||
{
|
||||
size, err := m.Total[iNdEx].MarshalToSizedBuffer(dAtA[:i])
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
i -= size
|
||||
i = encodeVarintBank(dAtA, i, uint64(size))
|
||||
}
|
||||
i--
|
||||
dAtA[i] = 0xa
|
||||
}
|
||||
}
|
||||
return len(dAtA) - i, nil
|
||||
}
|
||||
|
||||
func (m *DenomUnit) Marshal() (dAtA []byte, err error) {
|
||||
size := m.Size()
|
||||
dAtA = make([]byte, size)
|
||||
|
|
@ -929,21 +821,6 @@ func (m *Output) Size() (n int) {
|
|||
return n
|
||||
}
|
||||
|
||||
func (m *Supply) Size() (n int) {
|
||||
if m == nil {
|
||||
return 0
|
||||
}
|
||||
var l int
|
||||
_ = l
|
||||
if len(m.Total) > 0 {
|
||||
for _, e := range m.Total {
|
||||
l = e.Size()
|
||||
n += 1 + l + sovBank(uint64(l))
|
||||
}
|
||||
}
|
||||
return n
|
||||
}
|
||||
|
||||
func (m *DenomUnit) Size() (n int) {
|
||||
if m == nil {
|
||||
return 0
|
||||
|
|
@ -1445,90 +1322,6 @@ func (m *Output) Unmarshal(dAtA []byte) error {
|
|||
}
|
||||
return nil
|
||||
}
|
||||
func (m *Supply) Unmarshal(dAtA []byte) error {
|
||||
l := len(dAtA)
|
||||
iNdEx := 0
|
||||
for iNdEx < l {
|
||||
preIndex := iNdEx
|
||||
var wire uint64
|
||||
for shift := uint(0); ; shift += 7 {
|
||||
if shift >= 64 {
|
||||
return ErrIntOverflowBank
|
||||
}
|
||||
if iNdEx >= l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
b := dAtA[iNdEx]
|
||||
iNdEx++
|
||||
wire |= uint64(b&0x7F) << shift
|
||||
if b < 0x80 {
|
||||
break
|
||||
}
|
||||
}
|
||||
fieldNum := int32(wire >> 3)
|
||||
wireType := int(wire & 0x7)
|
||||
if wireType == 4 {
|
||||
return fmt.Errorf("proto: Supply: wiretype end group for non-group")
|
||||
}
|
||||
if fieldNum <= 0 {
|
||||
return fmt.Errorf("proto: Supply: illegal tag %d (wire type %d)", fieldNum, wire)
|
||||
}
|
||||
switch fieldNum {
|
||||
case 1:
|
||||
if wireType != 2 {
|
||||
return fmt.Errorf("proto: wrong wireType = %d for field Total", wireType)
|
||||
}
|
||||
var msglen int
|
||||
for shift := uint(0); ; shift += 7 {
|
||||
if shift >= 64 {
|
||||
return ErrIntOverflowBank
|
||||
}
|
||||
if iNdEx >= l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
b := dAtA[iNdEx]
|
||||
iNdEx++
|
||||
msglen |= int(b&0x7F) << shift
|
||||
if b < 0x80 {
|
||||
break
|
||||
}
|
||||
}
|
||||
if msglen < 0 {
|
||||
return ErrInvalidLengthBank
|
||||
}
|
||||
postIndex := iNdEx + msglen
|
||||
if postIndex < 0 {
|
||||
return ErrInvalidLengthBank
|
||||
}
|
||||
if postIndex > l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
m.Total = append(m.Total, types.Coin{})
|
||||
if err := m.Total[len(m.Total)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
|
||||
return err
|
||||
}
|
||||
iNdEx = postIndex
|
||||
default:
|
||||
iNdEx = preIndex
|
||||
skippy, err := skipBank(dAtA[iNdEx:])
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if (skippy < 0) || (iNdEx+skippy) < 0 {
|
||||
return ErrInvalidLengthBank
|
||||
}
|
||||
if (iNdEx + skippy) > l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
iNdEx += skippy
|
||||
}
|
||||
}
|
||||
|
||||
if iNdEx > l {
|
||||
return io.ErrUnexpectedEOF
|
||||
}
|
||||
return nil
|
||||
}
|
||||
func (m *DenomUnit) Unmarshal(dAtA []byte) error {
|
||||
l := len(dAtA)
|
||||
iNdEx := 0
|
||||
|
|
|
|||
|
|
@ -6,14 +6,11 @@ import (
|
|||
cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
"github.com/cosmos/cosmos-sdk/types/msgservice"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank/exported"
|
||||
)
|
||||
|
||||
// RegisterLegacyAminoCodec registers the necessary x/bank interfaces and concrete types
|
||||
// on the provided LegacyAmino codec. These types are used for Amino JSON serialization.
|
||||
func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
|
||||
cdc.RegisterInterface((*exported.SupplyI)(nil), nil)
|
||||
cdc.RegisterConcrete(&Supply{}, "cosmos-sdk/Supply", nil)
|
||||
cdc.RegisterConcrete(&MsgSend{}, "cosmos-sdk/MsgSend", nil)
|
||||
cdc.RegisterConcrete(&MsgMultiSend{}, "cosmos-sdk/MsgMultiSend", nil)
|
||||
}
|
||||
|
|
@ -24,12 +21,6 @@ func RegisterInterfaces(registry types.InterfaceRegistry) {
|
|||
&MsgMultiSend{},
|
||||
)
|
||||
|
||||
registry.RegisterInterface(
|
||||
"cosmos.bank.v1beta1.SupplyI",
|
||||
(*exported.SupplyI)(nil),
|
||||
&Supply{},
|
||||
)
|
||||
|
||||
msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ func (gs GenesisState) Validate() error {
|
|||
}
|
||||
|
||||
// NOTE: this errors if supply for any given coin is zero
|
||||
return NewSupply(gs.Supply).ValidateBasic()
|
||||
return gs.Supply.Validate()
|
||||
}
|
||||
|
||||
// NewGenesisState creates a new genesis state.
|
||||
|
|
@ -58,7 +58,7 @@ func NewGenesisState(params Params, balances []Balance, supply sdk.Coins, denomM
|
|||
|
||||
// DefaultGenesisState returns a default bank module genesis state.
|
||||
func DefaultGenesisState() *GenesisState {
|
||||
return NewGenesisState(DefaultParams(), []Balance{}, DefaultSupply().GetTotal(), []Metadata{})
|
||||
return NewGenesisState(DefaultParams(), []Balance{}, sdk.Coins{}, []Metadata{})
|
||||
}
|
||||
|
||||
// GetGenesisStateFromAppState returns x/bank GenesisState given raw application
|
||||
|
|
|
|||
|
|
@ -1,58 +0,0 @@
|
|||
package types
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
yaml "gopkg.in/yaml.v2"
|
||||
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
"github.com/cosmos/cosmos-sdk/x/bank/exported"
|
||||
)
|
||||
|
||||
// Implements Delegation interface
|
||||
var _ exported.SupplyI = (*Supply)(nil)
|
||||
|
||||
// NewSupply creates a new Supply instance
|
||||
func NewSupply(total sdk.Coins) *Supply {
|
||||
return &Supply{total}
|
||||
}
|
||||
|
||||
// DefaultSupply creates an empty Supply
|
||||
func DefaultSupply() *Supply {
|
||||
return NewSupply(sdk.NewCoins())
|
||||
}
|
||||
|
||||
// SetTotal sets the total supply.
|
||||
func (supply *Supply) SetTotal(total sdk.Coins) {
|
||||
supply.Total = total
|
||||
}
|
||||
|
||||
// GetTotal returns the supply total.
|
||||
func (supply Supply) GetTotal() sdk.Coins {
|
||||
return supply.Total
|
||||
}
|
||||
|
||||
// Inflate adds coins to the total supply
|
||||
func (supply *Supply) Inflate(amount sdk.Coins) {
|
||||
supply.Total = supply.Total.Add(amount...)
|
||||
}
|
||||
|
||||
// Deflate subtracts coins from the total supply.
|
||||
func (supply *Supply) Deflate(amount sdk.Coins) {
|
||||
supply.Total = supply.Total.Sub(amount)
|
||||
}
|
||||
|
||||
// String returns a human readable string representation of a supplier.
|
||||
func (supply Supply) String() string {
|
||||
bz, _ := yaml.Marshal(supply)
|
||||
return string(bz)
|
||||
}
|
||||
|
||||
// ValidateBasic validates the Supply coins and returns error if invalid
|
||||
func (supply Supply) ValidateBasic() error {
|
||||
if err := supply.Total.Validate(); err != nil {
|
||||
return fmt.Errorf("invalid total supply: %w", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
package types
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
yaml "gopkg.in/yaml.v2"
|
||||
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
)
|
||||
|
||||
func TestSupplyMarshalYAML(t *testing.T) {
|
||||
supply := DefaultSupply()
|
||||
coins := sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.OneInt()))
|
||||
supply.Inflate(coins)
|
||||
|
||||
bz, err := yaml.Marshal(supply)
|
||||
require.NoError(t, err)
|
||||
bzCoins, err := yaml.Marshal(coins)
|
||||
require.NoError(t, err)
|
||||
|
||||
want := fmt.Sprintf(`total:
|
||||
%s`, string(bzCoins))
|
||||
|
||||
require.Equal(t, want, string(bz))
|
||||
require.Equal(t, want, supply.String())
|
||||
}
|
||||
|
|
@ -22,6 +22,7 @@ var (
|
|||
)
|
||||
|
||||
func TestDecodeStore(t *testing.T) {
|
||||
t.Skip()
|
||||
cdc := simapp.MakeTestEncodingConfig().Marshaler
|
||||
dec := simulation.NewDecodeStore(cdc)
|
||||
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ func (k Keeper) TotalBondedTokens(ctx sdk.Context) sdk.Int {
|
|||
|
||||
// StakingTokenSupply staking tokens from the total supply
|
||||
func (k Keeper) StakingTokenSupply(ctx sdk.Context) sdk.Int {
|
||||
return k.bankKeeper.GetSupply(ctx).GetTotal().AmountOf(k.BondDenom(ctx))
|
||||
return k.bankKeeper.GetSupply(ctx, k.BondDenom(ctx)).Amount
|
||||
}
|
||||
|
||||
// BondedRatio the fraction of the staking tokens which are currently bonded
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ package types
|
|||
import (
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
|
||||
bankexported "github.com/cosmos/cosmos-sdk/x/bank/exported"
|
||||
)
|
||||
|
||||
// DistributionKeeper expected distribution keeper (noalias)
|
||||
|
|
@ -31,7 +30,7 @@ type BankKeeper interface {
|
|||
LockedCoins(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins
|
||||
SpendableCoins(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins
|
||||
|
||||
GetSupply(ctx sdk.Context) bankexported.SupplyI
|
||||
GetSupply(ctx sdk.Context, denom string) sdk.Coin
|
||||
|
||||
SendCoinsFromModuleToModule(ctx sdk.Context, senderPool, recipientPool string, amt sdk.Coins) error
|
||||
UndelegateCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error
|
||||
|
|
|
|||
Loading…
Reference in New Issue