Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: do not allow blocked addr as recipient #153

Merged
merged 6 commits into from
Feb 12, 2024
Merged
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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.21
require (
github.com/CosmWasm/wasmd v0.45.0
github.com/CosmWasm/wasmvm v1.5.2
github.com/OmniFlix/streampay/v2 v2.3.0
github.com/OmniFlix/streampay/v2 v2.4.0
github.com/bianjieai/nft-transfer v1.1.3-ibc-v7.3.0
github.com/cometbft/cometbft v0.37.4
github.com/cometbft/cometbft-db v0.8.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,8 @@ github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2y
github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE=
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw=
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk=
github.com/OmniFlix/streampay/v2 v2.3.0 h1:C2uK6bhGDLmluXf6awQ+P759Cc34Icv/TvoCNbE0bfs=
github.com/OmniFlix/streampay/v2 v2.3.0/go.mod h1:U1JTcIJ9GqnSoeNX87+qVUSS+BlYpri510hJEKnGU5I=
github.com/OmniFlix/streampay/v2 v2.4.0 h1:IqveswOwo+j5qUVx2Rr1LIWODerd/F2QAwXKoWFMyqs=
github.com/OmniFlix/streampay/v2 v2.4.0/go.mod h1:GMG8JQH7K/OrRB3mvxTUz765kYpeBRvLLZeAtqmPXes=
github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
Expand Down
15 changes: 15 additions & 0 deletions x/marketplace/keeper/keeper.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ package keeper
import (
"fmt"

sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"

onfttypes "github.com/OmniFlix/omniflixhub/v3/x/onft/types"

errorsmod "cosmossdk.io/errors"
Expand Down Expand Up @@ -363,3 +365,16 @@ func (k Keeper) TransferRoyalty(
}
return nil
}

func (k Keeper) ValidateSplitShareAddresses(splitShares []types.WeightedAddress) error {
for _, share := range splitShares {
addr, err := sdk.AccAddressFromBech32(share.Address)
if err != nil {
return err
}
if k.bankKeeper.BlockedAddr(addr) {
return errorsmod.Wrapf(sdkerrors.ErrUnauthorized, "%s is blocked address, not allowed receive funds", addr)
}
}
return nil
}
13 changes: 11 additions & 2 deletions x/marketplace/keeper/msg_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ func (m msgServer) ListNFT(goCtx context.Context, msg *types.MsgListNFT) (*types
types.ErrNftNonTransferable, "non-transferable nfts not allowed to list in marketplace")
}

if err := m.Keeper.ValidateSplitShareAddresses(msg.SplitShares); err != nil {
return nil, err
}

listing := types.NewListing(msg.Id, msg.NftId, msg.DenomId, msg.Price, owner, msg.SplitShares)
err = m.Keeper.AddListing(ctx, listing)
if err != nil {
Expand Down Expand Up @@ -186,6 +190,11 @@ func (m msgServer) CreateAuction(goCtx context.Context, msg *types.MsgCreateAuct
return nil, errorsmod.Wrapf(
types.ErrNftNonTransferable, "non-transferable nfts not allowed to list in marketplace")
}

if err := m.Keeper.ValidateSplitShareAddresses(msg.SplitShares); err != nil {
return nil, err
}

var endTime *time.Time
if msg.Duration != nil {
maxAuctionDuration := m.Keeper.GetMaxAuctionDuration(ctx)
Expand Down Expand Up @@ -215,7 +224,7 @@ func (m msgServer) CreateAuction(goCtx context.Context, msg *types.MsgCreateAuct
}, nil
}

// CancelAuction
// CancelAuction cancels an auction if auction creator want to cancel it, and it has no bids
func (m msgServer) CancelAuction(goCtx context.Context, msg *types.MsgCancelAuction) (*types.MsgCancelAuctionResponse, error) {
ctx := sdk.UnwrapSDKContext(goCtx)

Expand All @@ -242,7 +251,7 @@ func (m msgServer) CancelAuction(goCtx context.Context, msg *types.MsgCancelAuct
return &types.MsgCancelAuctionResponse{}, nil
}

// PlaceBid
// PlaceBid places a bid on an active auction
func (m msgServer) PlaceBid(goCtx context.Context, msg *types.MsgPlaceBid) (*types.MsgPlaceBidResponse, error) {
ctx := sdk.UnwrapSDKContext(goCtx)

Expand Down
1 change: 1 addition & 0 deletions x/marketplace/types/expected_keepers.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ type AccountKeeper interface {

type BankKeeper interface {
// Methods imported from bank should be defined here
BlockedAddr(recipient sdk.AccAddress) bool
SpendableCoins(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins
SendCoins(ctx sdk.Context, from sdk.AccAddress, to sdk.AccAddress, amount sdk.Coins) error
SendCoinsFromModuleToAccount(ctx sdk.Context, formModule string, toAddr sdk.AccAddress, amt sdk.Coins) error
Expand Down
16 changes: 16 additions & 0 deletions x/onft/keeper/keeper.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ package keeper
import (
"fmt"

errorsmod "cosmossdk.io/errors"

"github.com/cometbft/cometbft/libs/log"
storetypes "github.com/cosmos/cosmos-sdk/store/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"

"github.com/cosmos/cosmos-sdk/codec"
sdk "github.com/cosmos/cosmos-sdk/types"
Expand Down Expand Up @@ -61,3 +64,16 @@ func (k Keeper) Logger(ctx sdk.Context) log.Logger {
func (k Keeper) NFTkeeper() nftkeeper.Keeper {
return k.nk
}

func (k Keeper) ValidateRoyaltyReceiverAddresses(splitShares []*types.WeightedAddress) error {
for _, share := range splitShares {
addr, err := sdk.AccAddressFromBech32(share.Address)
if err != nil {
return err
}
if k.bankKeeper.BlockedAddr(addr) {
return errorsmod.Wrapf(sdkerrors.ErrUnauthorized, "%s is a blocked address and not allowed receive funds", addr)
}
}
return nil
}
13 changes: 13 additions & 0 deletions x/onft/keeper/msg_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@ func (m msgServer) CreateDenom(goCtx context.Context, msg *types.MsgCreateDenom)
if m.Keeper.HasDenom(ctx, msg.Id) {
return nil, errorsmod.Wrapf(types.ErrDenomIdExists, "denom id already exists %s", msg.Id)
}

if msg.RoyaltyReceivers != nil {
if err := m.Keeper.ValidateRoyaltyReceiverAddresses(msg.RoyaltyReceivers); err != nil {
return nil, err
}
}

denomCreationFee := m.Keeper.GetDenomCreationFee(ctx)
if !msg.CreationFee.Equal(denomCreationFee) {
if msg.CreationFee.Denom != denomCreationFee.Denom {
Expand Down Expand Up @@ -100,6 +107,12 @@ func (m msgServer) UpdateDenom(goCtx context.Context, msg *types.MsgUpdateDenom)
return nil, err
}

if msg.RoyaltyReceivers != nil {
if err := m.Keeper.ValidateRoyaltyReceiverAddresses(msg.RoyaltyReceivers); err != nil {
return nil, err
}
}

ctx := sdk.UnwrapSDKContext(goCtx)
err = m.Keeper.UpdateDenom(ctx, msg)
if err != nil {
Expand Down
1 change: 1 addition & 0 deletions x/onft/types/expected_keepers.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ type AccountKeeper interface {

// BankKeeper defines the expected interface needed to retrieve account balances.
type BankKeeper interface {
BlockedAddr(addr sdk.AccAddress) bool
GetAllBalances(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins
GetBalance(ctx sdk.Context, addr sdk.AccAddress, denom string) sdk.Coin
LockedCoins(ctx sdk.Context, addr sdk.AccAddress) sdk.Coins
Expand Down
Loading