-
Notifications
You must be signed in to change notification settings - Fork 624
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ics4 callbacks fee middleware (#580)
* feat: adding WriteAcknowledgement * updating genesis & relayer prefix * fix: comment * fix: comments * Update modules/apps/29-fee/keeper/relay.go Co-authored-by: colin axnér <[email protected]> * feat: add DeleteForwardRelayerAddr helper + use Set in ack * fix: SetForwardAddr * chore: add panic * fix: remove fmt * test: add WriteAcknowledgement test * Update modules/apps/29-fee/ibc_module.go Co-authored-by: Aditya <[email protected]> * fix: remove print * fix: WriteAck * fix: use constructor * Update modules/apps/29-fee/keeper/keeper.go Co-authored-by: colin axnér <[email protected]> * fix: nits * fix: remove found var not used * test: adding check that forward relayer address is successfully deleted if set * fix: merge issues Co-authored-by: colin axnér <[email protected]> Co-authored-by: Aditya <[email protected]>
- Loading branch information
3 people
authored
Jan 12, 2022
1 parent
9285133
commit f3e9f95
Showing
23 changed files
with
691 additions
and
207 deletions.
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
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
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 |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package keeper | ||
|
|
||
| import ( | ||
| sdk "github.com/cosmos/cosmos-sdk/types" | ||
| capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" | ||
|
|
||
| "github.com/cosmos/ibc-go/v3/modules/apps/29-fee/types" | ||
| channeltypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" | ||
| ibcexported "github.com/cosmos/ibc-go/v3/modules/core/exported" | ||
| ) | ||
|
|
||
| // SendPacket wraps IBC ChannelKeeper's SendPacket function | ||
| func (k Keeper) SendPacket(ctx sdk.Context, chanCap *capabilitytypes.Capability, packet ibcexported.PacketI) error { | ||
| return k.ics4Wrapper.SendPacket(ctx, chanCap, packet) | ||
| } | ||
|
|
||
| // WriteAcknowledgement wraps IBC ChannelKeeper's WriteAcknowledgement function | ||
| // ICS29 WriteAcknowledgement is used for asynchronous acknowledgements | ||
| func (k Keeper) WriteAcknowledgement(ctx sdk.Context, chanCap *capabilitytypes.Capability, packet ibcexported.PacketI, acknowledgement []byte) error { | ||
| // retrieve the forward relayer that was stored in `onRecvPacket` | ||
| packetId := channeltypes.NewPacketId(packet.GetSourceChannel(), packet.GetSourcePort(), packet.GetSequence()) | ||
| relayer, _ := k.GetForwardRelayerAddress(ctx, packetId) | ||
|
|
||
| k.DeleteForwardRelayerAddress(ctx, packetId) | ||
|
|
||
| ack := types.NewIncentivizedAcknowledgement(relayer, acknowledgement) | ||
| bz := ack.Acknowledgement() | ||
|
|
||
| // ics4Wrapper may be core IBC or higher-level middleware | ||
| return k.ics4Wrapper.WriteAcknowledgement(ctx, chanCap, packet, bz) | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| package keeper_test | ||
|
|
||
| import ( | ||
| clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" | ||
| channeltypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types" | ||
| ) | ||
|
|
||
| func (suite *KeeperTestSuite) TestWriteAcknowledgementAsync() { | ||
| testCases := []struct { | ||
| name string | ||
| malleate func() | ||
| expPass bool | ||
| }{ | ||
| { | ||
| "success", | ||
| func() {}, | ||
| true, | ||
| }, | ||
| { | ||
| "forward relayer address is successfully deleted", | ||
| func() { | ||
| suite.chainB.GetSimApp().IBCFeeKeeper.SetForwardRelayerAddress(suite.chainB.GetContext(), channeltypes.NewPacketId(suite.path.EndpointA.ChannelID, suite.path.EndpointA.ChannelConfig.PortID, 1), suite.chainA.SenderAccount.GetAddress().String()) | ||
| }, | ||
| true, | ||
| }, | ||
| } | ||
|
|
||
| for _, tc := range testCases { | ||
| tc := tc | ||
| suite.Run(tc.name, func() { | ||
| suite.SetupTest() | ||
|
|
||
| // open incentivized channel | ||
| suite.coordinator.Setup(suite.path) | ||
|
|
||
| // build packet | ||
| timeoutTimestamp := ^uint64(0) | ||
| packet := channeltypes.NewPacket( | ||
| []byte("packetData"), | ||
| 1, | ||
| suite.path.EndpointA.ChannelConfig.PortID, | ||
| suite.path.EndpointA.ChannelID, | ||
| suite.path.EndpointB.ChannelConfig.PortID, | ||
| suite.path.EndpointB.ChannelID, | ||
| clienttypes.ZeroHeight(), | ||
| timeoutTimestamp, | ||
| ) | ||
|
|
||
| ack := []byte("ack") | ||
| chanCap := suite.chainB.GetChannelCapability(suite.path.EndpointB.ChannelConfig.PortID, suite.path.EndpointB.ChannelID) | ||
|
|
||
| // malleate test case | ||
| tc.malleate() | ||
|
|
||
| err := suite.chainB.GetSimApp().IBCFeeKeeper.WriteAcknowledgement(suite.chainB.GetContext(), chanCap, packet, ack) | ||
|
|
||
| if tc.expPass { | ||
| suite.Require().NoError(err) | ||
| _, found := suite.chainB.GetSimApp().IBCFeeKeeper.GetForwardRelayerAddress(suite.chainB.GetContext(), channeltypes.NewPacketId(suite.path.EndpointA.ChannelID, suite.path.EndpointA.ChannelConfig.PortID, 1)) | ||
| suite.Require().False(found) | ||
| } else { | ||
| suite.Require().Error(err) | ||
| } | ||
| }) | ||
| } | ||
| } |
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.