Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions x/tokenfactory/keeper/bankactions.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,14 @@ func (k Keeper) mintTo(ctx sdk.Context, amount sdk.Coin, mintTo string, isSudo b
sdk.NewCoins(amount))
}

func (k Keeper) burnFrom(ctx sdk.Context, amount sdk.Coin, burnFrom string) error {
// verify that denom is an x/tokenfactory denom
_, _, err := types.DeconstructDenom(amount.Denom)
if err != nil {
return err
}
func (k Keeper) burnFrom(ctx sdk.Context, amount sdk.Coin, burnFrom string /*, isTokenOwner bool*/) error {
//// verify that denom is an x/tokenfactory denom
//if !isTokenOwner {
// _, _, err := types.DeconstructDenom(amount.Denom)
// if err != nil {
// return err
// }
//}

addr, err := sdk.AccAddressFromBech32(burnFrom)
if err != nil {
Expand Down
27 changes: 15 additions & 12 deletions x/tokenfactory/keeper/msg_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,22 +96,25 @@ func (server msgServer) Mint(goCtx context.Context, msg *types.MsgMint) (*types.
func (server msgServer) Burn(goCtx context.Context, msg *types.MsgBurn) (*types.MsgBurnResponse, error) {
ctx := sdk.UnwrapSDKContext(goCtx)

authorityMetadata, err := server.Keeper.GetAuthorityMetadata(ctx, msg.Amount.GetDenom())
if err != nil {
return nil, err
}

if msg.Sender != authorityMetadata.GetAdmin() {
return nil, types.ErrUnauthorized
}

if msg.BurnFromAddress == "" {
msg.BurnFromAddress = msg.Sender
} else if !types.IsCapabilityEnabled(server.Keeper.enabledCapabilities, types.EnableBurnFrom) {
return nil, types.ErrCapabilityNotEnabled
} else if msg.BurnFromAddress == msg.Sender {
} else {
if !types.IsCapabilityEnabled(server.Keeper.enabledCapabilities, types.EnableBurnFrom) {
return nil, types.ErrCapabilityNotEnabled
}

authorityMetadata, err := server.Keeper.GetAuthorityMetadata(ctx, msg.Amount.GetDenom())
if err != nil {
return nil, err
}

if msg.Sender != authorityMetadata.GetAdmin() {
return nil, types.ErrUnauthorized
}
}

err = server.Keeper.burnFrom(ctx, msg.Amount, msg.BurnFromAddress)
err := server.Keeper.burnFrom(ctx, msg.Amount, msg.BurnFromAddress)
if err != nil {
return nil, err
}
Expand Down