forked from cosmos/cosmos-sdk
-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'osmosis-main' into remove-genesis-supply-offsets
- Loading branch information
Showing
32 changed files
with
1,184 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| syntax = "proto3"; | ||
| package cosmos.upgrade.v1beta1; | ||
|
|
||
| import "gogoproto/gogo.proto"; | ||
| import "cosmos/upgrade/v1beta1/upgrade.proto"; | ||
|
|
||
| option go_package = "github.com/cosmos/cosmos-sdk/x/upgrade/types"; | ||
|
|
||
| // GenesisState defines the x/upgrade module's genesis state. | ||
| message GenesisState { | ||
| // params defines the x/upgrade parameters. | ||
| Params params = 1 [(gogoproto.nullable) = false]; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package types | ||
|
|
||
| // AppVersionManager defines the interface which allows managing the appVersion | ||
| // field. | ||
| type AppVersionManager interface { | ||
| GetAppVersion() (uint64, error) | ||
| SetAppVersion(version uint64) error | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| package keeper | ||
|
|
||
| import ( | ||
| sdk "github.com/cosmos/cosmos-sdk/types" | ||
| "github.com/cosmos/cosmos-sdk/x/bank/types" | ||
| ) | ||
|
|
||
| // Implements StakingHooks interface | ||
| var _ types.BankHooks = BaseSendKeeper{} | ||
|
|
||
| // BeforeSend executes the BeforeSend hook if registered. | ||
| func (k BaseSendKeeper) BeforeSend(ctx sdk.Context, from, to sdk.AccAddress, amount sdk.Coins) error { | ||
| if k.hooks != nil { | ||
| return k.hooks.BeforeSend(ctx, from, to, amount) | ||
| } | ||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| package keeper_test | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
| tmproto "github.com/tendermint/tendermint/proto/tendermint/types" | ||
|
|
||
| "github.com/cosmos/cosmos-sdk/simapp" | ||
| sdk "github.com/cosmos/cosmos-sdk/types" | ||
| "github.com/cosmos/cosmos-sdk/x/bank/keeper" | ||
| "github.com/cosmos/cosmos-sdk/x/bank/types" | ||
|
|
||
| stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" | ||
| ) | ||
|
|
||
| var _ types.BankHooks = &MockBankHooksReceiver{} | ||
|
|
||
| // BankHooks event hooks for bank (noalias) | ||
| type MockBankHooksReceiver struct{} | ||
|
|
||
| // Mock BeforeSend bank hook that doesn't allow the sending of exactly 100 coins of any denom. | ||
| func (h *MockBankHooksReceiver) BeforeSend(ctx sdk.Context, from, to sdk.AccAddress, amount sdk.Coins) error { | ||
| for _, coin := range amount { | ||
| if coin.Amount.Equal(sdk.NewInt(100)) { | ||
| return fmt.Errorf("not allowed; expected %v, got: %v", 100, coin.Amount) | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func TestHooks(t *testing.T) { | ||
| app := simapp.Setup(false) | ||
| ctx := app.BaseApp.NewContext(false, tmproto.Header{}) | ||
|
|
||
| addrs := simapp.AddTestAddrs(app, ctx, 2, sdk.NewInt(1000)) | ||
| simapp.FundModuleAccount(app.BankKeeper, ctx, stakingtypes.BondedPoolName, sdk.NewCoins(sdk.NewCoin(app.StakingKeeper.BondDenom(ctx), sdk.NewInt(1000)))) | ||
|
|
||
| // create a valid send amount which is 1 coin, and an invalidSendAmount which is 100 coins | ||
| validSendAmount := sdk.NewCoins(sdk.NewCoin(app.StakingKeeper.BondDenom(ctx), sdk.NewInt(1))) | ||
| invalidSendAmount := sdk.NewCoins(sdk.NewCoin(app.StakingKeeper.BondDenom(ctx), sdk.NewInt(100))) | ||
|
|
||
| // setup our mock bank hooks receiver that prevents the send of 100 coins | ||
| bankHooksReceiver := MockBankHooksReceiver{} | ||
| baseBankKeeper, ok := app.BankKeeper.(keeper.BaseKeeper) | ||
| require.True(t, ok) | ||
| keeper.UnsafeSetHooks( | ||
| &baseBankKeeper, types.NewMultiBankHooks(&bankHooksReceiver), | ||
| ) | ||
| app.BankKeeper = baseBankKeeper | ||
|
|
||
| // try sending a validSendAmount and it should work | ||
| err := app.BankKeeper.SendCoins(ctx, addrs[0], addrs[1], validSendAmount) | ||
| require.NoError(t, err) | ||
|
|
||
| // try sending an invalidSendAmount and it should not work | ||
| err = app.BankKeeper.SendCoins(ctx, addrs[0], addrs[1], invalidSendAmount) | ||
| require.Error(t, err) | ||
|
|
||
| // try doing SendManyCoins and make sure if even a single subsend is invalid, the entire function fails | ||
| err = app.BankKeeper.SendManyCoins(ctx, addrs[0], []sdk.AccAddress{addrs[0], addrs[1]}, []sdk.Coins{invalidSendAmount, validSendAmount}) | ||
| require.Error(t, err) | ||
|
|
||
| // make sure that account to module doesn't bypass hook | ||
| err = app.BankKeeper.SendCoinsFromAccountToModule(ctx, addrs[0], stakingtypes.BondedPoolName, validSendAmount) | ||
| require.NoError(t, err) | ||
| err = app.BankKeeper.SendCoinsFromAccountToModule(ctx, addrs[0], stakingtypes.BondedPoolName, invalidSendAmount) | ||
| require.Error(t, err) | ||
|
|
||
| // make sure that module to account doesn't bypass hook | ||
| err = app.BankKeeper.SendCoinsFromModuleToAccount(ctx, stakingtypes.BondedPoolName, addrs[0], validSendAmount) | ||
| require.NoError(t, err) | ||
| err = app.BankKeeper.SendCoinsFromModuleToAccount(ctx, stakingtypes.BondedPoolName, addrs[0], invalidSendAmount) | ||
| require.Error(t, err) | ||
|
|
||
| // make sure that module to module doesn't bypass hook | ||
| err = app.BankKeeper.SendCoinsFromModuleToModule(ctx, stakingtypes.BondedPoolName, stakingtypes.NotBondedPoolName, validSendAmount) | ||
| require.NoError(t, err) | ||
| err = app.BankKeeper.SendCoinsFromModuleToModule(ctx, stakingtypes.BondedPoolName, stakingtypes.NotBondedPoolName, invalidSendAmount) | ||
| require.Error(t, err) | ||
|
|
||
| // make sure that module to many accounts doesn't bypass hook | ||
| err = app.BankKeeper.SendCoinsFromModuleToManyAccounts(ctx, stakingtypes.BondedPoolName, []sdk.AccAddress{addrs[0], addrs[1]}, []sdk.Coins{validSendAmount, validSendAmount}) | ||
| require.NoError(t, err) | ||
| err = app.BankKeeper.SendCoinsFromModuleToManyAccounts(ctx, stakingtypes.BondedPoolName, []sdk.AccAddress{addrs[0], addrs[1]}, []sdk.Coins{validSendAmount, invalidSendAmount}) | ||
| require.Error(t, err) | ||
|
|
||
| // make sure that DelegateCoins doesn't bypass the hook | ||
| err = app.BankKeeper.DelegateCoins(ctx, addrs[0], app.AccountKeeper.GetModuleAddress(stakingtypes.BondedPoolName), validSendAmount) | ||
| require.NoError(t, err) | ||
| err = app.BankKeeper.DelegateCoins(ctx, addrs[0], app.AccountKeeper.GetModuleAddress(stakingtypes.BondedPoolName), invalidSendAmount) | ||
| require.Error(t, err) | ||
|
|
||
| // make sure that UndelegateCoins doesn't bypass the hook | ||
| err = app.BankKeeper.UndelegateCoins(ctx, app.AccountKeeper.GetModuleAddress(stakingtypes.BondedPoolName), addrs[0], validSendAmount) | ||
| require.NoError(t, err) | ||
| err = app.BankKeeper.UndelegateCoins(ctx, app.AccountKeeper.GetModuleAddress(stakingtypes.BondedPoolName), addrs[0], invalidSendAmount) | ||
| require.Error(t, err) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| package keeper | ||
|
|
||
| import "github.com/cosmos/cosmos-sdk/x/bank/types" | ||
|
|
||
| // UnsafeSetHooks updates the x/bank keeper's hooks, overriding any potential | ||
| // pre-existing hooks. | ||
| // | ||
| // WARNING: this function should only be used in tests. | ||
| func UnsafeSetHooks(k *BaseKeeper, h types.BankHooks) { | ||
| k.hooks = h | ||
| } |
Oops, something went wrong.