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.

Sign up for GitHub

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: Check blocked addresses before sending tokenize shares rewards #22718

Merged
merged 4 commits into from
Dec 4, 2024
Merged

fix: Check blocked addresses before sending tokenize shares rewards #22718

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4c76868
check blocked addresses before sending tokenize shares rewards
stana-miric Dec 2, 2024
844a465
remove duplicated import
stana-miric Dec 3, 2024
47b290d
move checks from msg_server to keeper
stana-miric Dec 3, 2024
f5eb1d3
added comments
stana-miric Dec 4, 2024
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
4 changes: 4 additions & 0 deletions x/distribution/keeper/keeper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,10 @@ func (k Keeper) WithdrawSingleShareRecordReward(ctx context.Context, recordID ui
}
owner := sdk.AccAddress(ownerAddr)

if k.bankKeeper.BlockedAddr(owner) {
stana-miric marked this conversation as resolved.
Show resolved Hide resolved
stana-miric marked this conversation as resolved.
Show resolved Hide resolved
return errorsmod.Wrapf(sdkerrors.ErrUnauthorized, "%s is not allowed to receive funds", owner.String())
}

valAddr, err := k.stakingKeeper.ValidatorAddressCodec().StringToBytes(record.Validator)
if err != nil {
return err
Expand Down
10 changes: 10 additions & 0 deletions x/distribution/keeper/msg_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,11 @@ func (k msgServer) WithdrawTokenizeShareRecordReward(goCtx context.Context, msg
if err != nil {
return nil, err
}

if k.bankKeeper.BlockedAddr(ownerAddr) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please consider moving this check to the WithdrawTokenizeShareRecordReward function. It contains all the validation for the procedure. It should be near the top of the function, right after fetch/unmarshal steps.

return nil, errors.Wrapf(sdkerrors.ErrUnauthorized, "%s is not allowed to receive funds", ownerAddr)
}

amount, err := k.Keeper.WithdrawTokenizeShareRecordReward(ctx, ownerAddr, msg.RecordId)
if err != nil {
return nil, err
Expand Down Expand Up @@ -271,6 +276,11 @@ func (k msgServer) WithdrawAllTokenizeShareRecordReward(goCtx context.Context, m
if err != nil {
return nil, err
}

if k.bankKeeper.BlockedAddr(ownerAddr) {
return nil, errors.Wrapf(sdkerrors.ErrUnauthorized, "%s is not allowed to receive external funds", ownerAddr)
}

amount, err := k.Keeper.WithdrawAllTokenizeShareRecordReward(ctx, ownerAddr)
if err != nil {
return nil, err
Expand Down
Loading