fix: add base account getter (#12154)
This commit is contained in:
parent
544afb65e2
commit
a39be7b78f
|
@ -60,6 +60,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
|
||||||
* (cli) [#12095](https://github.com/cosmos/cosmos-sdk/pull/12095) Fix running a tx with --dry-run returns an error
|
* (cli) [#12095](https://github.com/cosmos/cosmos-sdk/pull/12095) Fix running a tx with --dry-run returns an error
|
||||||
* (x/auth) [#12108](https://github.com/cosmos/cosmos-sdk/pull/12108) Fix GetBlockWithTxs error when querying block with 0 tx
|
* (x/auth) [#12108](https://github.com/cosmos/cosmos-sdk/pull/12108) Fix GetBlockWithTxs error when querying block with 0 tx
|
||||||
* (genutil) [#12140](https://github.com/cosmos/cosmos-sdk/pull/12140) Fix staking's genesis JSON migrate in the `simd migrate v0.46` CLI command.
|
* (genutil) [#12140](https://github.com/cosmos/cosmos-sdk/pull/12140) Fix staking's genesis JSON migrate in the `simd migrate v0.46` CLI command.
|
||||||
|
* (types) [#12154](https://github.com/cosmos/cosmos-sdk/pull/12154) Add `baseAccountGetter` to avoid invalid account error when create vesting account.
|
||||||
|
|
||||||
## [v0.46.0-rc1](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.46.0-rc1) - 2022-05-23
|
## [v0.46.0-rc1](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.46.0-rc1) - 2022-05-23
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,10 @@ type msgServer struct {
|
||||||
types.BankKeeper
|
types.BankKeeper
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type baseAccountGetter interface {
|
||||||
|
GetBaseAccount() *authtypes.BaseAccount
|
||||||
|
}
|
||||||
|
|
||||||
// NewMsgServerImpl returns an implementation of the vesting MsgServer interface,
|
// NewMsgServerImpl returns an implementation of the vesting MsgServer interface,
|
||||||
// wrapping the corresponding AccountKeeper and BankKeeper.
|
// wrapping the corresponding AccountKeeper and BankKeeper.
|
||||||
func NewMsgServerImpl(k keeper.AccountKeeper, bk types.BankKeeper) types.MsgServer {
|
func NewMsgServerImpl(k keeper.AccountKeeper, bk types.BankKeeper) types.MsgServer {
|
||||||
|
@ -53,12 +57,18 @@ func (s msgServer) CreateVestingAccount(goCtx context.Context, msg *types.MsgCre
|
||||||
return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "account %s already exists", msg.ToAddress)
|
return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "account %s already exists", msg.ToAddress)
|
||||||
}
|
}
|
||||||
|
|
||||||
baseAccount := ak.NewAccountWithAddress(ctx, to)
|
account := ak.NewAccountWithAddress(ctx, to)
|
||||||
if _, ok := baseAccount.(*authtypes.BaseAccount); !ok {
|
baseAccount, ok := account.(*authtypes.BaseAccount)
|
||||||
|
if !ok {
|
||||||
|
if getter, ok := account.(baseAccountGetter); ok {
|
||||||
|
baseAccount = getter.GetBaseAccount()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if baseAccount == nil {
|
||||||
return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid account type; expected: BaseAccount, got: %T", baseAccount)
|
return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidRequest, "invalid account type; expected: BaseAccount, got: %T", baseAccount)
|
||||||
}
|
}
|
||||||
|
|
||||||
baseVestingAccount := types.NewBaseVestingAccount(baseAccount.(*authtypes.BaseAccount), msg.Amount.Sort(), msg.EndTime)
|
baseVestingAccount := types.NewBaseVestingAccount(baseAccount, msg.Amount.Sort(), msg.EndTime)
|
||||||
|
|
||||||
var acc authtypes.AccountI
|
var acc authtypes.AccountI
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue