feat: Prepare v7.4.0 #375
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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,71 @@ | ||
| package ante | ||
|
|
||
| import ( | ||
| errorsmod "cosmossdk.io/errors" | ||
|
|
||
| "github.com/cosmos/cosmos-sdk/codec" | ||
| sdk "github.com/cosmos/cosmos-sdk/types" | ||
| sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" | ||
| "github.com/cosmos/cosmos-sdk/x/authz" | ||
|
|
||
| xerrors "github.com/kiichain/kiichain/v7/x/types/errors" | ||
| ) | ||
|
|
||
| // blockedVestingCreateMsgs is the set of vesting-module messages that open a | ||
| // new account with LockedCoins. Those accounts are the book the EVM locked- | ||
| // balance snapshot must stay consistent with; new creates are rejected until | ||
| // that path is safe. | ||
| var blockedVestingCreateMsgs = map[string]struct{}{ | ||
| sdk.MsgTypeURL(&sdkvesting.MsgCreateVestingAccount{}): {}, | ||
| sdk.MsgTypeURL(&sdkvesting.MsgCreatePeriodicVestingAccount{}): {}, | ||
| sdk.MsgTypeURL(&sdkvesting.MsgCreatePermanentLockedAccount{}): {}, | ||
| } | ||
|
|
||
| // VestingAccountCreationDecorator rejects messages that create vesting or | ||
| // permanently locked accounts, including when nested in authz.MsgExec. | ||
| type VestingAccountCreationDecorator struct { | ||
| cdc codec.BinaryCodec | ||
| } | ||
|
|
||
| // NewVestingAccountCreationDecorator returns a decorator that blocks new | ||
| // vesting account creation. | ||
| func NewVestingAccountCreationDecorator(cdc codec.BinaryCodec) VestingAccountCreationDecorator { | ||
| return VestingAccountCreationDecorator{cdc: cdc} | ||
| } | ||
|
|
||
| // AnteHandle rejects blocked vesting-create messages at any authz nesting depth. | ||
| func (d VestingAccountCreationDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (sdk.Context, error) { | ||
| if err := d.validateMsgs(tx.GetMsgs()); err != nil { | ||
| return ctx, err | ||
| } | ||
| return next(ctx, tx, simulate) | ||
| } | ||
|
|
||
| func (d VestingAccountCreationDecorator) validateMsgs(msgs []sdk.Msg) error { | ||
| for _, msg := range msgs { | ||
| if execMsg, ok := msg.(*authz.MsgExec); ok { | ||
| if err := d.validateAuthzExec(execMsg); err != nil { | ||
| return err | ||
| } | ||
| continue | ||
| } | ||
|
|
||
| typeURL := sdk.MsgTypeURL(msg) | ||
| if _, blocked := blockedVestingCreateMsgs[typeURL]; blocked { | ||
| return errorsmod.Wrapf(xerrors.ErrUnauthorized, "vesting account creation is disabled: %s", typeURL) | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (d VestingAccountCreationDecorator) validateAuthzExec(execMsg *authz.MsgExec) error { | ||
| innerMsgs := make([]sdk.Msg, 0, len(execMsg.Msgs)) | ||
| for _, v := range execMsg.Msgs { | ||
| var innerMsg sdk.Msg | ||
| if err := d.cdc.UnpackAny(v, &innerMsg); err != nil { | ||
| return errorsmod.Wrapf(xerrors.ErrUnauthorized, "cannot unmarshal authz exec msg (type %s): %v", v.TypeUrl, err) | ||
| } | ||
| innerMsgs = append(innerMsgs, innerMsg) | ||
| } | ||
| return d.validateMsgs(innerMsgs) | ||
| } |
This file contains hidden or 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 ante | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "cosmossdk.io/math" | ||
|
|
||
| "github.com/cosmos/cosmos-sdk/codec" | ||
| codectypes "github.com/cosmos/cosmos-sdk/codec/types" | ||
| sdk "github.com/cosmos/cosmos-sdk/types" | ||
| sdkvesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" | ||
| "github.com/cosmos/cosmos-sdk/x/authz" | ||
| banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" | ||
| ) | ||
|
|
||
| func TestVestingAccountCreationDecorator(t *testing.T) { | ||
| registry := codectypes.NewInterfaceRegistry() | ||
| authz.RegisterInterfaces(registry) | ||
| sdkvesting.RegisterInterfaces(registry) | ||
| banktypes.RegisterInterfaces(registry) | ||
| decorator := NewVestingAccountCreationDecorator(codec.NewProtoCodec(registry)) | ||
|
|
||
| from := sdk.AccAddress("from________________") | ||
| to := sdk.AccAddress("to__________________") | ||
| coins := sdk.NewCoins(sdk.NewCoin("akii", math.NewInt(1))) | ||
|
|
||
| exec := func(msgs ...sdk.Msg) sdk.Msg { | ||
| m := authz.NewMsgExec(from, msgs) | ||
| return &m | ||
| } | ||
|
|
||
| testCases := []struct { | ||
| name string | ||
| msgs []sdk.Msg | ||
| expectErr bool | ||
| }{ | ||
| { | ||
| name: "allow bank send", | ||
| msgs: []sdk.Msg{&banktypes.MsgSend{ | ||
| FromAddress: from.String(), | ||
| ToAddress: to.String(), | ||
| Amount: coins, | ||
| }}, | ||
| }, | ||
| { | ||
| name: "block MsgCreateVestingAccount", | ||
| msgs: []sdk.Msg{sdkvesting.NewMsgCreateVestingAccount(from, to, coins, 1, false)}, | ||
| expectErr: true, | ||
| }, | ||
| { | ||
| name: "block delayed MsgCreateVestingAccount", | ||
| msgs: []sdk.Msg{sdkvesting.NewMsgCreateVestingAccount(from, to, coins, 1, true)}, | ||
| expectErr: true, | ||
| }, | ||
| { | ||
| name: "block MsgCreatePeriodicVestingAccount", | ||
| msgs: []sdk.Msg{sdkvesting.NewMsgCreatePeriodicVestingAccount(from, to, 1, []sdkvesting.Period{{ | ||
| Length: 1, | ||
| Amount: coins, | ||
| }})}, | ||
| expectErr: true, | ||
| }, | ||
| { | ||
| name: "block MsgCreatePermanentLockedAccount", | ||
| msgs: []sdk.Msg{sdkvesting.NewMsgCreatePermanentLockedAccount(from, to, coins)}, | ||
| expectErr: true, | ||
| }, | ||
| { | ||
| name: "block MsgCreateVestingAccount inside authz.MsgExec", | ||
| msgs: []sdk.Msg{exec(sdkvesting.NewMsgCreateVestingAccount(from, to, coins, 1, false))}, | ||
| expectErr: true, | ||
| }, | ||
| { | ||
| name: "block MsgCreatePeriodicVestingAccount inside nested authz.MsgExec", | ||
| msgs: []sdk.Msg{exec(exec(sdkvesting.NewMsgCreatePeriodicVestingAccount(from, to, 1, []sdkvesting.Period{{ | ||
| Length: 1, | ||
| Amount: coins, | ||
| }})))}, | ||
| expectErr: true, | ||
| }, | ||
| { | ||
| name: "block MsgCreatePermanentLockedAccount inside authz.MsgExec", | ||
| msgs: []sdk.Msg{exec(sdkvesting.NewMsgCreatePermanentLockedAccount(from, to, coins))}, | ||
| expectErr: true, | ||
| }, | ||
| } | ||
|
|
||
| for _, tc := range testCases { | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| err := decorator.validateMsgs(tc.msgs) | ||
| if tc.expectErr { | ||
| require.Error(t, err) | ||
| require.ErrorContains(t, err, "vesting account creation is disabled") | ||
| } else { | ||
| require.NoError(t, err) | ||
| } | ||
| }) | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.