-
Notifications
You must be signed in to change notification settings - Fork 624
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
Fee Closing Handshake #551
Merged
Merged
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
0504176
add iterate logic
AdityaSripal 229f2cb
Merge branch 'ics29-fee-middleware' of github.com:cosmos/ibc-go into …
AdityaSripal 21c86be
add closing logic with tests
AdityaSripal cc0e5ac
add comments for panic
AdityaSripal 4ab4b02
change invariant breaking recovery to disabling middleware rather tha…
AdityaSripal c479a35
fix merge and add docs
AdityaSripal 6653378
docs, tests, minor refactor
AdityaSripal 5d109cc
fix merge
AdityaSripal 1d0d3fd
Merge branch 'ics29-fee-middleware' into aditya/closing-handshake
AdityaSripal File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,6 +13,10 @@ import ( | |
|
||
// EscrowPacketFee sends the packet fee to the 29-fee module account to hold in escrow | ||
func (k Keeper) EscrowPacketFee(ctx sdk.Context, identifiedFee *types.IdentifiedPacketFee) error { | ||
if !k.IsFeeEnabled(ctx, identifiedFee.PacketId.PortId, identifiedFee.PacketId.ChannelId) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Prevents further escrows if channel gets disabled |
||
// users may not escrow fees on this channel. Must send packets without a fee message | ||
return sdkerrors.Wrap(types.ErrFeeNotEnabled, "cannot escrow fee for packet") | ||
} | ||
// check if the refund account exists | ||
refundAcc, err := sdk.AccAddressFromBech32(identifiedFee.RefundAddress) | ||
if err != nil { | ||
|
@@ -108,3 +112,40 @@ func (k Keeper) DistributeFeeTimeout(ctx sdk.Context, refundAcc, timeoutRelayer | |
|
||
return nil | ||
} | ||
|
||
func (k Keeper) RefundFeesOnChannel(ctx sdk.Context, portID, channelID string) error { | ||
AdityaSripal marked this conversation as resolved.
Show resolved
Hide resolved
|
||
// get module accAddr | ||
feeModuleAccAddr := k.authKeeper.GetModuleAddress(types.ModuleName) | ||
|
||
var refundErr error | ||
|
||
k.IterateChannelFeesInEscrow(ctx, portID, channelID, func(identifiedFee types.IdentifiedPacketFee) (stop bool) { | ||
refundAccAddr, err := sdk.AccAddressFromBech32(identifiedFee.RefundAddress) | ||
if err != nil { | ||
refundErr = err | ||
return true | ||
} | ||
|
||
// refund all fees to refund address | ||
// Use SendCoins rather than the module account send functions since refund address may be a user account or module address. | ||
// if any `SendCoins` call returns an error, we return error and stop iteration | ||
err = k.bankKeeper.SendCoins(ctx, feeModuleAccAddr, refundAccAddr, identifiedFee.Fee.ReceiveFee) | ||
if err != nil { | ||
refundErr = err | ||
return true | ||
} | ||
err = k.bankKeeper.SendCoins(ctx, feeModuleAccAddr, refundAccAddr, identifiedFee.Fee.AckFee) | ||
if err != nil { | ||
refundErr = err | ||
return true | ||
} | ||
err = k.bankKeeper.SendCoins(ctx, feeModuleAccAddr, refundAccAddr, identifiedFee.Fee.TimeoutFee) | ||
if err != nil { | ||
refundErr = err | ||
return true | ||
} | ||
return false | ||
}) | ||
|
||
return refundErr | ||
} |
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Disabling all channels will effectively "turn off" the fee module. I added a check for
IsFeeEnabled
onEscrowFee
.Also,
OnAckPacket
andOnTimeoutPacket
will check if fee is enabled on the channel before running middleware logic. So if we disable all channels, any further escrows will get rejected and all distributions will be bypassed. Thus, we can turn off the fee functionality without affecting underlying applications. IBC can still run even if fee module gets disabled due to invalid stateThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be nice to have
IsFeeEnabled
as a param we can change via governance. That way if a bug was discovered a chain could potentially disable a channel. Although, maybe the proposal would take too long.Either way, I think this approach works better. Nice 👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Potentially we could have a global enabled param, rather than a per-channel one. But that should be in a separate PR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed 👍