Skip distribution if refund fails to send on channel closure #1523
Conversation
This file contains 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
chatton
commented
Jun 10, 2022
modules/apps/29-fee/keeper/escrow.go
Outdated
Comment on lines
218
to
220
| if k.bankKeeper.BlockedAddr(refundAddr) { | ||
| continue | ||
| } |
There was a problem hiding this comment.
this blocked check happens in SendCoinsFromModuleToAccount now instead
| } | ||
|
|
||
| k.DeleteFeesInEscrow(cacheCtx, identifiedPacketFee.PacketId) | ||
| if !failedToSendCoins { |
There was a problem hiding this comment.
it's possible an error occurred sending the coins, we don't want to remove them unless they were actually sent.
Codecov Report
@@ Coverage Diff @@
## main #1523 +/- ##
==========================================
+ Coverage 80.27% 80.29% +0.02%
==========================================
Files 166 166
Lines 12252 12252
==========================================
+ Hits 9835 9838 +3
+ Misses 1954 1952 -2
+ Partials 463 462 -1
|
…n-if-refund-fails-to-send-on-channel-closure' into cian/issue#1396-skip-distribution-if-refund-fails-to-send-on-channel-closure
chatton
requested review from
AdityaSripal,
seantking,
charleenfei,
colin-axner,
damiannolan and
crodriguezvega
as code owners
charleenfei
reviewed
Jun 10, 2022
modules/apps/29-fee/keeper/escrow.go
Outdated
| @@ -214,21 +215,16 @@ func (k Keeper) RefundFeesOnChannelClosure(ctx sdk.Context, portID, channelID st | |||
| return err | |||
There was a problem hiding this comment.
i think this error also still needs to be handled so improperly formatted refund addr doesnt stop channel closure?
There was a problem hiding this comment.
ah that's a good point, it's effectively the same situation. Nice catch!
…fails-to-send-on-channel-closure
…n-if-refund-fails-to-send-on-channel-closure' into cian/issue#1396-skip-distribution-if-refund-fails-to-send-on-channel-closure
chatton
deleted the
cian/issue#1396-skip-distribution-if-refund-fails-to-send-on-channel-closure
branch
damiannolan
reviewed
Jun 14, 2022
Comment on lines
-5
to
+8
| "github.com/tendermint/tendermint/crypto/secp256k1" | ||
|
|
||
| "github.com/cosmos/ibc-go/v3/modules/apps/29-fee/types" | ||
| transfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" | ||
| channeltypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" | ||
| "github.com/tendermint/tendermint/crypto/secp256k1" |
There was a problem hiding this comment.
nit: group imports by type, see #382
import (
// standard library imports
"fmt"
"testing"
// external library imports
"github.com/stretchr/testify/require"
abci "github.com/tendermint/tendermint/abci/types"
// ibc-go library imports
"github.com/cosmos/ibc-go/modules/core/23-commitment/types"
)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
closes: #1396
Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.
docs/) or specification (x/<module>/spec/)godoccomments.Unreleasedsection inCHANGELOG.mdFiles changedin the Github PR explorerCodecov Reportin the comment section below once CI passes