diff --git a/docs/ibc/proto-docs.md b/docs/ibc/proto-docs.md
index 6510b6b75f3..662081f9459 100644
--- a/docs/ibc/proto-docs.md
+++ b/docs/ibc/proto-docs.md
@@ -34,6 +34,7 @@
- [ibc/applications/fee/v1/genesis.proto](#ibc/applications/fee/v1/genesis.proto)
- [FeeEnabledChannel](#ibc.applications.fee.v1.FeeEnabledChannel)
+ - [ForwardRelayerAddress](#ibc.applications.fee.v1.ForwardRelayerAddress)
- [GenesisState](#ibc.applications.fee.v1.GenesisState)
- [RegisteredRelayerAddress](#ibc.applications.fee.v1.RegisteredRelayerAddress)
@@ -749,7 +750,7 @@ and an optional list of relayers that are permitted to receive the fee.
### FeeEnabledChannel
-Contains the PortID & ChannelID for a fee enabled channel
+FeeEnabledChannel contains the PortID & ChannelID for a fee enabled channel
| Field | Type | Label | Description |
@@ -762,6 +763,22 @@ Contains the PortID & ChannelID for a fee enabled channel
+
+
+### ForwardRelayerAddress
+ForwardRelayerAddress contains the forward relayer address and packetId used for async acknowledgements
+
+
+| Field | Type | Label | Description |
+| ----- | ---- | ----- | ----------- |
+| `address` | [string](#string) | | |
+| `packet_id` | [ibc.core.channel.v1.PacketId](#ibc.core.channel.v1.PacketId) | | |
+
+
+
+
+
+
### GenesisState
@@ -773,6 +790,7 @@ GenesisState defines the fee middleware genesis state
| `identified_fees` | [IdentifiedPacketFee](#ibc.applications.fee.v1.IdentifiedPacketFee) | repeated | |
| `fee_enabled_channels` | [FeeEnabledChannel](#ibc.applications.fee.v1.FeeEnabledChannel) | repeated | |
| `registered_relayers` | [RegisteredRelayerAddress](#ibc.applications.fee.v1.RegisteredRelayerAddress) | repeated | |
+| `forward_relayers` | [ForwardRelayerAddress](#ibc.applications.fee.v1.ForwardRelayerAddress) | repeated | |
@@ -782,7 +800,7 @@ GenesisState defines the fee middleware genesis state
### RegisteredRelayerAddress
-Contains the address and counterparty address for a specific relayer (for distributing fees)
+RegisteredRelayerAddress contains the address and counterparty address for a specific relayer (for distributing fees)
| Field | Type | Label | Description |
diff --git a/go.mod b/go.mod
index 2cfda348a7d..2a8ed9f82c6 100644
--- a/go.mod
+++ b/go.mod
@@ -27,6 +27,12 @@ require (
gopkg.in/yaml.v2 v2.4.0
)
+require (
+ github.com/gin-gonic/gin v1.7.0 // indirect
+ github.com/opencontainers/image-spec v1.0.2 // indirect
+ github.com/opencontainers/runc v1.0.3 // indirect
+)
+
require (
filippo.io/edwards25519 v1.0.0-beta.2 // indirect
github.com/99designs/keyring v1.1.6 // indirect
@@ -117,10 +123,3 @@ require (
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
nhooyr.io/websocket v1.8.6 // indirect
)
-
-require (
- github.com/cosmos/ibc-go v1.2.5
- github.com/gin-gonic/gin v1.7.0 // indirect
- github.com/opencontainers/image-spec v1.0.2 // indirect
- github.com/opencontainers/runc v1.0.3 // indirect
-)
diff --git a/go.sum b/go.sum
index 65b440dd4a3..8342959fd77 100644
--- a/go.sum
+++ b/go.sum
@@ -209,8 +209,6 @@ github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY
github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
github.com/cosmos/iavl v0.17.3 h1:s2N819a2olOmiauVa0WAhoIJq9EhSXE9HDBAoR9k+8Y=
github.com/cosmos/iavl v0.17.3/go.mod h1:prJoErZFABYZGDHka1R6Oay4z9PrNeFFiMKHDAMOi4w=
-github.com/cosmos/ibc-go v1.2.5 h1:BiA48yKEDUcabBRkmp7qqSX41ZrgXTSNCtdjDURbLwE=
-github.com/cosmos/ibc-go v1.2.5/go.mod h1:wkGkkX8Ou6yXgE8lO2xP9NOwo+Tl5x1dJaTTE6jBDpg=
github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4=
github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY=
github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI=
@@ -630,7 +628,6 @@ github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:F
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs=
github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A=
@@ -1458,7 +1455,6 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy
gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/ini.v1 v1.63.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI=
gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c=
diff --git a/modules/apps/29-fee/ibc_module.go b/modules/apps/29-fee/ibc_module.go
index a45a9548426..1b54981d7ea 100644
--- a/modules/apps/29-fee/ibc_module.go
+++ b/modules/apps/29-fee/ibc_module.go
@@ -185,14 +185,13 @@ func (im IBCModule) OnRecvPacket(
ack := im.app.OnRecvPacket(ctx, packet, relayer)
forwardRelayer, found := im.keeper.GetCounterpartyAddress(ctx, relayer.String())
- if !found {
- forwardRelayer = ""
- }
- return types.IncentivizedAcknowledgement{
- Result: ack.Acknowledgement(),
- ForwardRelayerAddress: forwardRelayer,
+ // incase of async aknowledgement (ack == nil) store the ForwardRelayer address for use later
+ if ack == nil && found {
+ im.keeper.SetForwardRelayerAddress(ctx, channeltypes.NewPacketId(packet.GetSourceChannel(), packet.GetSourcePort(), packet.GetSequence()), forwardRelayer)
}
+
+ return types.NewIncentivizedAcknowledgement(forwardRelayer, ack.Acknowledgement())
}
// OnAcknowledgementPacket implements the IBCModule interface
diff --git a/modules/apps/29-fee/keeper/escrow.go b/modules/apps/29-fee/keeper/escrow.go
index 45ffc2f72d3..9ba1709a8dc 100644
--- a/modules/apps/29-fee/keeper/escrow.go
+++ b/modules/apps/29-fee/keeper/escrow.go
@@ -37,7 +37,6 @@ func (k Keeper) EscrowPacketFee(ctx sdk.Context, identifiedFee *types.Identified
}
// Store fee in state for reference later
- // feeInEscrow///packet// -> Fee (timeout, ack, onrecv)
k.SetFeeInEscrow(ctx, identifiedFee)
return nil
}
diff --git a/modules/apps/29-fee/keeper/genesis.go b/modules/apps/29-fee/keeper/genesis.go
index b817b33c9a4..51879dbe14f 100644
--- a/modules/apps/29-fee/keeper/genesis.go
+++ b/modules/apps/29-fee/keeper/genesis.go
@@ -16,6 +16,10 @@ func (k Keeper) InitGenesis(ctx sdk.Context, state types.GenesisState) {
k.SetCounterpartyAddress(ctx, addr.Address, addr.CounterpartyAddress)
}
+ for _, forwardAddr := range state.ForwardRelayers {
+ k.SetForwardRelayerAddress(ctx, forwardAddr.PacketId, forwardAddr.Address)
+ }
+
for _, enabledChan := range state.FeeEnabledChannels {
k.SetFeeEnabled(ctx, enabledChan.PortId, enabledChan.ChannelId)
}
@@ -27,5 +31,6 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState {
IdentifiedFees: k.GetAllIdentifiedPacketFees(ctx),
FeeEnabledChannels: k.GetAllFeeEnabledChannels(ctx),
RegisteredRelayers: k.GetAllRelayerAddresses(ctx),
+ ForwardRelayers: k.GetAllForwardRelayerAddresses(ctx),
}
}
diff --git a/modules/apps/29-fee/keeper/genesis_test.go b/modules/apps/29-fee/keeper/genesis_test.go
index 45198e4b0a5..58e772ac66c 100644
--- a/modules/apps/29-fee/keeper/genesis_test.go
+++ b/modules/apps/29-fee/keeper/genesis_test.go
@@ -94,6 +94,9 @@ func (suite *KeeperTestSuite) TestExportGenesis() {
// set counterparty address
suite.chainA.GetSimApp().IBCFeeKeeper.SetCounterpartyAddress(suite.chainA.GetContext(), sender, counterparty)
+ // set forward relayer address
+ suite.chainA.GetSimApp().IBCFeeKeeper.SetForwardRelayerAddress(suite.chainA.GetContext(), packetId, sender)
+
// export genesis
genesisState := suite.chainA.GetSimApp().IBCFeeKeeper.ExportGenesis(suite.chainA.GetContext())
@@ -110,4 +113,8 @@ func (suite *KeeperTestSuite) TestExportGenesis() {
// check registered relayer addresses
suite.Require().Equal(sender, genesisState.RegisteredRelayers[0].Address)
suite.Require().Equal(counterparty, genesisState.RegisteredRelayers[0].CounterpartyAddress)
+
+ // check registered relayer addresses
+ suite.Require().Equal(sender, genesisState.ForwardRelayers[0].Address)
+ suite.Require().Equal(packetId, genesisState.ForwardRelayers[0].PacketId)
}
diff --git a/modules/apps/29-fee/keeper/keeper.go b/modules/apps/29-fee/keeper/keeper.go
index 26d0d62f5e9..53f9c9c091b 100644
--- a/modules/apps/29-fee/keeper/keeper.go
+++ b/modules/apps/29-fee/keeper/keeper.go
@@ -1,6 +1,7 @@
package keeper
import (
+ "strconv"
"strings"
"github.com/cosmos/cosmos-sdk/codec"
@@ -12,7 +13,6 @@ import (
"github.com/cosmos/ibc-go/v3/modules/apps/29-fee/types"
channeltypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"
host "github.com/cosmos/ibc-go/v3/modules/core/24-host"
- ibcexported "github.com/cosmos/ibc-go/v3/modules/core/exported"
)
// Middleware must implement types.ChannelKeeper and types.PortKeeper expected interfaces
@@ -77,22 +77,6 @@ func (k Keeper) GetFeeModuleAddress() sdk.AccAddress {
return k.authKeeper.GetModuleAddress(types.ModuleName)
}
-// 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
-func (k Keeper) WriteAcknowledgement(
- ctx sdk.Context,
- chanCap *capabilitytypes.Capability,
- packet ibcexported.PacketI,
- acknowledgement []byte,
-) error {
- return nil
- // return k.channelKeeper.WriteAcknowledgement(ctx, chanCap, packet, acknowledgement)
-}
-
// SetFeeEnabled sets a flag to determine if fee handling logic should run for the given channel
// identified by channel and port identifiers.
func (k Keeper) SetFeeEnabled(ctx sdk.Context, portID, channelID string) {
@@ -169,6 +153,7 @@ func (k Keeper) GetCounterpartyAddress(ctx sdk.Context, address string) (string,
return addr, true
}
+// GetAllRelayerAddresses returns all registered relayer addresses
func (k Keeper) GetAllRelayerAddresses(ctx sdk.Context) []*types.RegisteredRelayerAddress {
store := ctx.KVStore(k.storeKey)
iterator := sdk.KVStorePrefixIterator(store, []byte(types.RelayerAddressKeyPrefix))
@@ -189,6 +174,59 @@ func (k Keeper) GetAllRelayerAddresses(ctx sdk.Context) []*types.RegisteredRelay
return registeredAddrArr
}
+// SetForwardRelayerAddress sets the forward relayer address during OnRecvPacket in case of async acknowledgement
+func (k Keeper) SetForwardRelayerAddress(ctx sdk.Context, packetId *channeltypes.PacketId, address string) {
+ store := ctx.KVStore(k.storeKey)
+ store.Set(types.KeyForwardRelayerAddress(packetId), []byte(address))
+}
+
+// GetForwardRelayerAddress gets forward relayer address for a particular packet
+func (k Keeper) GetForwardRelayerAddress(ctx sdk.Context, packetId *channeltypes.PacketId) (string, bool) {
+ store := ctx.KVStore(k.storeKey)
+ key := types.KeyForwardRelayerAddress(packetId)
+ if !store.Has(key) {
+ return "", false
+ }
+
+ addr := string(store.Get(key))
+ return addr, true
+}
+
+// GetAllForwardRelayerAddresses returns all forward relayer addresses stored for async acknowledgements
+func (k Keeper) GetAllForwardRelayerAddresses(ctx sdk.Context) []*types.ForwardRelayerAddress {
+ store := ctx.KVStore(k.storeKey)
+ iterator := sdk.KVStorePrefixIterator(store, []byte(types.ForwardRelayerPrefix))
+ defer iterator.Close()
+
+ var forwardRelayerAddr []*types.ForwardRelayerAddress
+ for ; iterator.Valid(); iterator.Next() {
+ keySplit := strings.Split(string(iterator.Key()), "/")
+
+ seq, err := strconv.ParseUint(keySplit[3], 0, 64)
+ if err != nil {
+ panic("failed to parse packet sequence in forward relayer address mapping")
+ }
+
+ packetId := channeltypes.NewPacketId(keySplit[2], keySplit[1], seq)
+
+ addr := &types.ForwardRelayerAddress{
+ Address: string(iterator.Value()),
+ PacketId: packetId,
+ }
+
+ forwardRelayerAddr = append(forwardRelayerAddr, addr)
+ }
+
+ return forwardRelayerAddr
+}
+
+// Deletes the forwardRelayerAddr associated with the packetId
+func (k Keeper) DeleteForwardRelayerAddress(ctx sdk.Context, packetId *channeltypes.PacketId) {
+ store := ctx.KVStore(k.storeKey)
+ key := types.KeyForwardRelayerAddress(packetId)
+ store.Delete(key)
+}
+
// Stores a Fee for a given packet in state
func (k Keeper) SetFeeInEscrow(ctx sdk.Context, fee *types.IdentifiedPacketFee) {
store := ctx.KVStore(k.storeKey)
diff --git a/modules/apps/29-fee/keeper/relay.go b/modules/apps/29-fee/keeper/relay.go
new file mode 100644
index 00000000000..078f22eba9f
--- /dev/null
+++ b/modules/apps/29-fee/keeper/relay.go
@@ -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)
+}
diff --git a/modules/apps/29-fee/keeper/relay_test.go b/modules/apps/29-fee/keeper/relay_test.go
new file mode 100644
index 00000000000..79410552b05
--- /dev/null
+++ b/modules/apps/29-fee/keeper/relay_test.go
@@ -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)
+ }
+ })
+ }
+}
diff --git a/modules/apps/29-fee/types/ack.go b/modules/apps/29-fee/types/ack.go
index 05908ce7b01..f54214d8432 100644
--- a/modules/apps/29-fee/types/ack.go
+++ b/modules/apps/29-fee/types/ack.go
@@ -4,6 +4,14 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
)
+// NewIncentivizedAcknowledgement creates a new instance of IncentivizedAcknowledgement
+func NewIncentivizedAcknowledgement(relayer string, ack []byte) IncentivizedAcknowledgement {
+ return IncentivizedAcknowledgement{
+ Result: ack,
+ ForwardRelayerAddress: relayer,
+ }
+}
+
// Success implements the Acknowledgement interface. The acknowledgement is
// considered successful if the forward relayer address is empty. Otherwise it is
// considered a failed acknowledgement.
diff --git a/modules/apps/29-fee/types/ack.pb.go b/modules/apps/29-fee/types/ack.pb.go
index 0b970a8f918..796fa3cd139 100644
--- a/modules/apps/29-fee/types/ack.pb.go
+++ b/modules/apps/29-fee/types/ack.pb.go
@@ -84,25 +84,25 @@ func init() {
func init() { proto.RegisterFile("ibc/applications/fee/v1/ack.proto", fileDescriptor_ab2834946fb65ea4) }
var fileDescriptor_ab2834946fb65ea4 = []byte{
- // 273 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0xd0, 0xb1, 0x4e, 0xf3, 0x30,
- 0x10, 0x07, 0xf0, 0xf8, 0x1b, 0x2a, 0x7d, 0x11, 0x53, 0x04, 0xb4, 0x02, 0xc9, 0x94, 0x4c, 0x5d,
- 0x1a, 0xab, 0x65, 0x82, 0xad, 0xdd, 0x90, 0x98, 0x32, 0x76, 0xa9, 0x1c, 0xfb, 0x12, 0xac, 0x3a,
- 0xb9, 0xc8, 0x76, 0x52, 0x85, 0xa7, 0x80, 0xb7, 0x62, 0xec, 0xc8, 0x84, 0x50, 0xf2, 0x06, 0x3c,
- 0x01, 0x4a, 0xd3, 0x81, 0x85, 0xed, 0xee, 0xfe, 0xbf, 0xe5, 0xfe, 0xfe, 0xad, 0x4a, 0x04, 0xe3,
- 0x65, 0xa9, 0x95, 0xe0, 0x4e, 0x61, 0x61, 0x59, 0x0a, 0xc0, 0xea, 0x05, 0xe3, 0x62, 0x17, 0x95,
- 0x06, 0x1d, 0x06, 0x63, 0x95, 0x88, 0xe8, 0x37, 0x89, 0x52, 0x80, 0xa8, 0x5e, 0x5c, 0x9d, 0x67,
- 0x98, 0xe1, 0xd1, 0xb0, 0x7e, 0x1a, 0x78, 0xf8, 0x46, 0xfc, 0xeb, 0xc7, 0x42, 0x40, 0xe1, 0x54,
- 0xad, 0x5e, 0x40, 0xae, 0xc4, 0xae, 0xc0, 0xbd, 0x06, 0x99, 0x41, 0x0e, 0x85, 0x0b, 0x2e, 0xfd,
- 0x91, 0x01, 0x5b, 0x69, 0x37, 0x21, 0x53, 0x32, 0x3b, 0x8b, 0x4f, 0x5b, 0xb0, 0xf1, 0xc7, 0x29,
- 0x9a, 0x3d, 0x37, 0x72, 0x6b, 0x40, 0xf3, 0x06, 0xcc, 0x96, 0x4b, 0x69, 0xc0, 0xda, 0xc9, 0xbf,
- 0x29, 0x99, 0xfd, 0x5f, 0x87, 0xdf, 0x9f, 0x37, 0xb4, 0xe1, 0xb9, 0x7e, 0x08, 0xff, 0x80, 0x61,
- 0x7c, 0x71, 0x4a, 0xe2, 0x21, 0x58, 0x0d, 0xf7, 0xf5, 0xd3, 0x7b, 0x4b, 0xc9, 0xa1, 0xa5, 0xe4,
- 0xab, 0xa5, 0xe4, 0xb5, 0xa3, 0xde, 0xa1, 0xa3, 0xde, 0x47, 0x47, 0xbd, 0xcd, 0x32, 0x53, 0xee,
- 0xb9, 0x4a, 0x22, 0x81, 0x39, 0x13, 0x68, 0x73, 0xb4, 0x4c, 0x25, 0x62, 0x9e, 0x21, 0xcb, 0x51,
- 0x56, 0x1a, 0x6c, 0x5f, 0x8e, 0x65, 0xcb, 0xfb, 0x79, 0xdf, 0x8b, 0x6b, 0x4a, 0xb0, 0xc9, 0xe8,
- 0xf8, 0xe8, 0xdd, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xac, 0x06, 0x77, 0x12, 0x3c, 0x01, 0x00,
- 0x00,
+ // 274 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0xd0, 0xb1, 0x4e, 0xc3, 0x30,
+ 0x10, 0x06, 0xe0, 0x9a, 0xa1, 0x12, 0x11, 0x53, 0x04, 0xb4, 0x02, 0xc9, 0x94, 0x4c, 0x5d, 0x1a,
+ 0xab, 0x54, 0x0c, 0xb0, 0xb5, 0x1b, 0x13, 0x52, 0xc6, 0x2e, 0x95, 0x63, 0x5f, 0x82, 0x55, 0x27,
+ 0x17, 0xd9, 0x4e, 0xaa, 0xf0, 0x14, 0xf0, 0x56, 0x8c, 0x1d, 0x99, 0x10, 0x4a, 0xde, 0x80, 0x27,
+ 0x40, 0x69, 0x3a, 0xb0, 0xb0, 0xdd, 0xdd, 0xff, 0x2d, 0xf7, 0x7b, 0xb7, 0x2a, 0x16, 0x8c, 0x17,
+ 0x85, 0x56, 0x82, 0x3b, 0x85, 0xb9, 0x65, 0x09, 0x00, 0xab, 0xe6, 0x8c, 0x8b, 0x6d, 0x58, 0x18,
+ 0x74, 0xe8, 0x8f, 0x54, 0x2c, 0xc2, 0xbf, 0x24, 0x4c, 0x00, 0xc2, 0x6a, 0x7e, 0x75, 0x9e, 0x62,
+ 0x8a, 0x07, 0xc3, 0xba, 0xa9, 0xe7, 0xc1, 0x3b, 0xf1, 0xae, 0x9f, 0x72, 0x01, 0xb9, 0x53, 0x95,
+ 0x7a, 0x05, 0xb9, 0x14, 0xdb, 0x1c, 0x77, 0x1a, 0x64, 0x0a, 0x19, 0xe4, 0xce, 0xbf, 0xf4, 0x86,
+ 0x06, 0x6c, 0xa9, 0xdd, 0x98, 0x4c, 0xc8, 0xf4, 0x2c, 0x3a, 0x6e, 0xfe, 0xda, 0x1b, 0x25, 0x68,
+ 0x76, 0xdc, 0xc8, 0x8d, 0x01, 0xcd, 0x6b, 0x30, 0x1b, 0x2e, 0xa5, 0x01, 0x6b, 0xc7, 0x27, 0x13,
+ 0x32, 0x3d, 0x5d, 0x05, 0x3f, 0x5f, 0x37, 0xb4, 0xe6, 0x99, 0x7e, 0x0c, 0xfe, 0x81, 0x41, 0x74,
+ 0x71, 0x4c, 0xa2, 0x3e, 0x58, 0xf6, 0xf7, 0xd5, 0xf3, 0x47, 0x43, 0xc9, 0xbe, 0xa1, 0xe4, 0xbb,
+ 0xa1, 0xe4, 0xad, 0xa5, 0x83, 0x7d, 0x4b, 0x07, 0x9f, 0x2d, 0x1d, 0xac, 0xef, 0x53, 0xe5, 0x5e,
+ 0xca, 0x38, 0x14, 0x98, 0x31, 0x81, 0x36, 0x43, 0xcb, 0x54, 0x2c, 0x66, 0x29, 0xb2, 0x6a, 0xc1,
+ 0x32, 0x94, 0xa5, 0x06, 0xdb, 0xf5, 0x63, 0xd9, 0xdd, 0xc3, 0xac, 0xab, 0xc6, 0xd5, 0x05, 0xd8,
+ 0x78, 0x78, 0xf8, 0x75, 0xf1, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x50, 0xc6, 0xd5, 0xaa, 0x3f, 0x01,
+ 0x00, 0x00,
}
func (m *IncentivizedAcknowledgement) Marshal() (dAtA []byte, err error) {
diff --git a/modules/apps/29-fee/types/errors.go b/modules/apps/29-fee/types/errors.go
index 7891d6e18b8..55ce843e92c 100644
--- a/modules/apps/29-fee/types/errors.go
+++ b/modules/apps/29-fee/types/errors.go
@@ -6,11 +6,12 @@ import (
// 29-fee sentinel errors
var (
- ErrInvalidVersion = sdkerrors.Register(ModuleName, 2, "invalid ICS29 middleware version")
- ErrRefundAccNotFound = sdkerrors.Register(ModuleName, 3, "no account found for given refund address")
- ErrBalanceNotFound = sdkerrors.Register(ModuleName, 4, "balance not found for given account address")
- ErrFeeNotFound = sdkerrors.Register(ModuleName, 5, "there is no fee escrowed for the given packetID")
- ErrRelayersNotNil = sdkerrors.Register(ModuleName, 6, "relayers must be nil. This feature is not supported")
- ErrCounterpartyAddressEmpty = sdkerrors.Register(ModuleName, 7, "counterparty address must not be empty")
- ErrFeeNotEnabled = sdkerrors.Register(ModuleName, 8, "fee module is not enabled for this channel. If this error occurs after channel setup, fee module may not be enabled")
+ ErrInvalidVersion = sdkerrors.Register(ModuleName, 2, "invalid ICS29 middleware version")
+ ErrRefundAccNotFound = sdkerrors.Register(ModuleName, 3, "no account found for given refund address")
+ ErrBalanceNotFound = sdkerrors.Register(ModuleName, 4, "balance not found for given account address")
+ ErrFeeNotFound = sdkerrors.Register(ModuleName, 5, "there is no fee escrowed for the given packetID")
+ ErrRelayersNotNil = sdkerrors.Register(ModuleName, 6, "relayers must be nil. This feature is not supported")
+ ErrCounterpartyAddressEmpty = sdkerrors.Register(ModuleName, 7, "counterparty address must not be empty")
+ ErrForwardRelayerAddressNotFound = sdkerrors.Register(ModuleName, 8, "forward relayer address not found")
+ ErrFeeNotEnabled = sdkerrors.Register(ModuleName, 9, "fee module is not enabled for this channel. If this error occurs after channel setup, fee module may not be enabled")
)
diff --git a/modules/apps/29-fee/types/fee.pb.go b/modules/apps/29-fee/types/fee.pb.go
index d3c55514660..0f50271f0f0 100644
--- a/modules/apps/29-fee/types/fee.pb.go
+++ b/modules/apps/29-fee/types/fee.pb.go
@@ -169,37 +169,38 @@ func init() {
func init() { proto.RegisterFile("ibc/applications/fee/v1/fee.proto", fileDescriptor_cb3319f1af2a53e5) }
var fileDescriptor_cb3319f1af2a53e5 = []byte{
- // 480 bytes of a gzipped FileDescriptorProto
+ // 483 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0x31, 0x8f, 0xd3, 0x30,
- 0x14, 0xc7, 0x1b, 0x72, 0x3a, 0xae, 0xae, 0x38, 0xa1, 0x70, 0x88, 0x5e, 0x05, 0x69, 0xc9, 0x94,
- 0xa5, 0xb6, 0x5a, 0x58, 0x60, 0x82, 0x20, 0x55, 0x3a, 0x89, 0xe1, 0x94, 0x91, 0xa5, 0x72, 0xec,
- 0xd7, 0x9e, 0xd5, 0x24, 0x8e, 0xe2, 0x34, 0x52, 0x57, 0x16, 0x56, 0x3e, 0x07, 0x9f, 0xe4, 0xc6,
- 0x1b, 0x99, 0x0a, 0x6a, 0xbf, 0x41, 0x57, 0x16, 0xe4, 0xd8, 0x3d, 0x55, 0x42, 0xe8, 0xd4, 0xc9,
- 0xf6, 0x7b, 0xef, 0xef, 0xdf, 0x7b, 0xcf, 0xcf, 0xe8, 0xb5, 0x48, 0x18, 0xa1, 0x45, 0x91, 0x0a,
- 0x46, 0x2b, 0x21, 0x73, 0x45, 0x66, 0x00, 0xa4, 0x1e, 0xe9, 0x05, 0x17, 0xa5, 0xac, 0xa4, 0xf7,
- 0x42, 0x24, 0x0c, 0x1f, 0x86, 0x60, 0xed, 0xab, 0x47, 0x3d, 0x9f, 0x49, 0x95, 0x49, 0x45, 0x12,
- 0xaa, 0xb4, 0x24, 0x81, 0x8a, 0x8e, 0x08, 0x93, 0x22, 0x37, 0xc2, 0xde, 0xc5, 0x5c, 0xce, 0x65,
- 0xb3, 0x25, 0x7a, 0x67, 0xad, 0x0d, 0x91, 0xc9, 0x12, 0x08, 0xbb, 0xa1, 0x79, 0x0e, 0xa9, 0xa6,
- 0xd9, 0xad, 0x09, 0x09, 0xbe, 0xb9, 0xc8, 0x9d, 0x00, 0x78, 0x5f, 0x1d, 0xd4, 0x29, 0x81, 0x81,
- 0xa8, 0x61, 0x3a, 0x03, 0xe8, 0x3a, 0x03, 0x37, 0xec, 0x8c, 0x2f, 0xb1, 0xe1, 0x62, 0xcd, 0xc5,
- 0x96, 0x8b, 0x3f, 0x49, 0x91, 0x47, 0x93, 0xdb, 0x75, 0xbf, 0xb5, 0x5b, 0xf7, 0xbd, 0x15, 0xcd,
- 0xd2, 0xf7, 0xc1, 0x81, 0x36, 0xf8, 0xf1, 0xab, 0x1f, 0xce, 0x45, 0x75, 0xb3, 0x4c, 0x30, 0x93,
- 0x19, 0xb1, 0xa9, 0x9b, 0x65, 0xa8, 0xf8, 0x82, 0x54, 0xab, 0x02, 0x54, 0x73, 0x8d, 0x8a, 0x91,
- 0x55, 0xea, 0x24, 0x6a, 0xf4, 0x98, 0xb2, 0x45, 0xc3, 0x7f, 0xf4, 0x10, 0x3f, 0xb2, 0xfc, 0x73,
- 0xc3, 0xb7, 0xba, 0xe3, 0xd8, 0xa7, 0x94, 0x2d, 0xf6, 0xc5, 0x57, 0x22, 0x03, 0xb9, 0xac, 0x1a,
- 0xb8, 0x7b, 0x64, 0xf1, 0x07, 0xda, 0x23, 0x8b, 0xb7, 0xca, 0x09, 0x40, 0xf0, 0xc7, 0x41, 0xcf,
- 0xae, 0x38, 0xe4, 0x95, 0x98, 0x09, 0xe0, 0xd7, 0x94, 0x2d, 0x40, 0xdb, 0xbd, 0x6b, 0xd4, 0x2e,
- 0x9a, 0xc3, 0x54, 0xf0, 0xae, 0x33, 0x70, 0xc2, 0xce, 0xf8, 0x15, 0xd6, 0x73, 0xa2, 0x1f, 0x16,
- 0xef, 0x5f, 0xb3, 0x1e, 0x61, 0x23, 0xb9, 0xe2, 0xd1, 0xc5, 0x6e, 0xdd, 0x7f, 0x6a, 0x32, 0xbb,
- 0x57, 0x06, 0xf1, 0x59, 0x61, 0xfd, 0xde, 0x5b, 0xe4, 0x9a, 0x16, 0xeb, 0xbb, 0x5e, 0xe2, 0xff,
- 0xcc, 0x1c, 0x9e, 0x00, 0x44, 0x27, 0xba, 0xd0, 0x58, 0x87, 0x7b, 0x1f, 0xd0, 0x79, 0x09, 0xb3,
- 0x65, 0xce, 0xa7, 0x94, 0xf3, 0x12, 0x94, 0xea, 0xba, 0x03, 0x27, 0x6c, 0x47, 0x97, 0xbb, 0x75,
- 0xff, 0xf9, 0x7e, 0x08, 0x0e, 0xfd, 0x41, 0xfc, 0xc4, 0x18, 0x3e, 0x9a, 0xb3, 0xd7, 0x43, 0x67,
- 0x25, 0xa4, 0x74, 0x05, 0xa5, 0xea, 0x9e, 0x0c, 0xdc, 0xb0, 0x1d, 0xdf, 0x9f, 0xa3, 0xcf, 0xb7,
- 0x1b, 0xdf, 0xb9, 0xdb, 0xf8, 0xce, 0xef, 0x8d, 0xef, 0x7c, 0xdf, 0xfa, 0xad, 0xbb, 0xad, 0xdf,
- 0xfa, 0xb9, 0xf5, 0x5b, 0x5f, 0xc6, 0xff, 0x76, 0x53, 0x24, 0x6c, 0x38, 0x97, 0x24, 0x93, 0x7c,
- 0x99, 0x82, 0xd2, 0x7f, 0x4a, 0x91, 0xf1, 0xbb, 0xa1, 0xfe, 0x4e, 0x4d, 0x77, 0x93, 0xd3, 0x66,
- 0xb8, 0xdf, 0xfc, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xbf, 0x7c, 0x4e, 0x14, 0x73, 0x03, 0x00, 0x00,
+ 0x14, 0xc7, 0x1b, 0x72, 0x3a, 0xae, 0xae, 0x38, 0xa1, 0x70, 0x88, 0x5e, 0x05, 0x49, 0xc9, 0x94,
+ 0xa5, 0xb6, 0xda, 0x83, 0x01, 0x26, 0x08, 0x52, 0xa5, 0x9b, 0x38, 0x65, 0x64, 0xa9, 0x1c, 0xe7,
+ 0xb5, 0x67, 0x35, 0x89, 0xa3, 0x38, 0x8d, 0xd4, 0x95, 0x85, 0x95, 0xcf, 0xc1, 0x27, 0xb9, 0xf1,
+ 0x46, 0xa6, 0x82, 0xda, 0x6f, 0xd0, 0x95, 0x05, 0x39, 0x76, 0xab, 0x4a, 0x08, 0x9d, 0x3a, 0xd9,
+ 0x7e, 0xef, 0xfd, 0xfd, 0x7b, 0xef, 0xf9, 0x19, 0xbd, 0xe6, 0x31, 0x23, 0xb4, 0x28, 0x52, 0xce,
+ 0x68, 0xc5, 0x45, 0x2e, 0xc9, 0x14, 0x80, 0xd4, 0x43, 0xb5, 0xe0, 0xa2, 0x14, 0x95, 0x70, 0x5e,
+ 0xf0, 0x98, 0xe1, 0xc3, 0x10, 0xac, 0x7c, 0xf5, 0xb0, 0xe7, 0x32, 0x21, 0x33, 0x21, 0x49, 0x4c,
+ 0xa5, 0x92, 0xc4, 0x50, 0xd1, 0x21, 0x61, 0x82, 0xe7, 0x5a, 0xd8, 0xbb, 0x98, 0x89, 0x99, 0x68,
+ 0xb6, 0x44, 0xed, 0x8c, 0xb5, 0x21, 0x32, 0x51, 0x02, 0x61, 0xb7, 0x34, 0xcf, 0x21, 0x55, 0x34,
+ 0xb3, 0xd5, 0x21, 0xfe, 0x37, 0x1b, 0xd9, 0x63, 0x00, 0xe7, 0xab, 0x85, 0x3a, 0x25, 0x30, 0xe0,
+ 0x35, 0x4c, 0xa6, 0x00, 0x5d, 0xab, 0x6f, 0x07, 0x9d, 0xd1, 0x25, 0xd6, 0x5c, 0xac, 0xb8, 0xd8,
+ 0x70, 0xf1, 0x27, 0xc1, 0xf3, 0x70, 0x7c, 0xb7, 0xf2, 0x5a, 0xdb, 0x95, 0xe7, 0x2c, 0x69, 0x96,
+ 0xbe, 0xf7, 0x0f, 0xb4, 0xfe, 0x8f, 0x5f, 0x5e, 0x30, 0xe3, 0xd5, 0xed, 0x22, 0xc6, 0x4c, 0x64,
+ 0xc4, 0xa4, 0xae, 0x97, 0x81, 0x4c, 0xe6, 0xa4, 0x5a, 0x16, 0x20, 0x9b, 0x6b, 0x64, 0x84, 0x8c,
+ 0x52, 0x25, 0x51, 0xa3, 0xc7, 0x94, 0xcd, 0x1b, 0xfe, 0xa3, 0x87, 0xf8, 0xa1, 0xe1, 0x9f, 0x6b,
+ 0xbe, 0xd1, 0x1d, 0xc7, 0x3e, 0xa5, 0x6c, 0xbe, 0x2b, 0xbe, 0xe2, 0x19, 0x88, 0x45, 0xd5, 0xc0,
+ 0xed, 0x23, 0x8b, 0x3f, 0xd0, 0x1e, 0x59, 0xbc, 0x51, 0x8e, 0x01, 0xfc, 0x3f, 0x16, 0x7a, 0x76,
+ 0x9d, 0x40, 0x5e, 0xf1, 0x29, 0x87, 0xe4, 0x86, 0xb2, 0x39, 0x28, 0xbb, 0x73, 0x83, 0xda, 0x45,
+ 0x73, 0x98, 0xf0, 0xa4, 0x6b, 0xf5, 0xad, 0xa0, 0x33, 0x7a, 0x85, 0xd5, 0x9c, 0xa8, 0x87, 0xc5,
+ 0xbb, 0xd7, 0xac, 0x87, 0x58, 0x4b, 0xae, 0x93, 0xf0, 0x62, 0xbb, 0xf2, 0x9e, 0xea, 0xcc, 0xf6,
+ 0x4a, 0x3f, 0x3a, 0x2b, 0x8c, 0xdf, 0x79, 0x83, 0x6c, 0xdd, 0x62, 0x75, 0xd7, 0x4b, 0xfc, 0x9f,
+ 0x99, 0xc3, 0x63, 0x80, 0xf0, 0x44, 0x15, 0x1a, 0xa9, 0x70, 0xe7, 0x03, 0x3a, 0x2f, 0x61, 0xba,
+ 0xc8, 0x93, 0x09, 0x4d, 0x92, 0x12, 0xa4, 0xec, 0xda, 0x7d, 0x2b, 0x68, 0x87, 0x97, 0xdb, 0x95,
+ 0xf7, 0x7c, 0x37, 0x04, 0x87, 0x7e, 0x3f, 0x7a, 0xa2, 0x0d, 0x1f, 0xf5, 0xd9, 0xe9, 0xa1, 0xb3,
+ 0x12, 0x52, 0xba, 0x84, 0x52, 0x76, 0x4f, 0xfa, 0x76, 0xd0, 0x8e, 0xf6, 0xe7, 0xf0, 0xf3, 0xdd,
+ 0xda, 0xb5, 0xee, 0xd7, 0xae, 0xf5, 0x7b, 0xed, 0x5a, 0xdf, 0x37, 0x6e, 0xeb, 0x7e, 0xe3, 0xb6,
+ 0x7e, 0x6e, 0xdc, 0xd6, 0x97, 0xb7, 0xff, 0x76, 0x93, 0xc7, 0x6c, 0x30, 0x13, 0xa4, 0xbe, 0x22,
+ 0x99, 0x48, 0x16, 0x29, 0x48, 0xf5, 0xad, 0x24, 0x19, 0xbd, 0x1b, 0xa8, 0x1f, 0xd5, 0x34, 0x38,
+ 0x3e, 0x6d, 0xe6, 0xfb, 0xea, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0b, 0xc2, 0x60, 0x3e, 0x76,
+ 0x03, 0x00, 0x00,
}
func (m *Fee) Marshal() (dAtA []byte, err error) {
diff --git a/modules/apps/29-fee/types/genesis.pb.go b/modules/apps/29-fee/types/genesis.pb.go
index 80a2e44d3df..c1c6750597f 100644
--- a/modules/apps/29-fee/types/genesis.pb.go
+++ b/modules/apps/29-fee/types/genesis.pb.go
@@ -5,6 +5,7 @@ package types
import (
fmt "fmt"
+ types "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"
_ "github.com/gogo/protobuf/gogoproto"
proto "github.com/gogo/protobuf/proto"
io "io"
@@ -28,6 +29,7 @@ type GenesisState struct {
IdentifiedFees []*IdentifiedPacketFee `protobuf:"bytes,1,rep,name=identified_fees,json=identifiedFees,proto3" json:"identified_fees,omitempty" yaml:"identified_fees"`
FeeEnabledChannels []*FeeEnabledChannel `protobuf:"bytes,2,rep,name=fee_enabled_channels,json=feeEnabledChannels,proto3" json:"fee_enabled_channels,omitempty" yaml:"fee_enabled_channels"`
RegisteredRelayers []*RegisteredRelayerAddress `protobuf:"bytes,3,rep,name=registered_relayers,json=registeredRelayers,proto3" json:"registered_relayers,omitempty" yaml:"registered_relayers"`
+ ForwardRelayers []*ForwardRelayerAddress `protobuf:"bytes,4,rep,name=forward_relayers,json=forwardRelayers,proto3" json:"forward_relayers,omitempty" yaml:"forward_relayers"`
}
func (m *GenesisState) Reset() { *m = GenesisState{} }
@@ -84,7 +86,14 @@ func (m *GenesisState) GetRegisteredRelayers() []*RegisteredRelayerAddress {
return nil
}
-// Contains the PortID & ChannelID for a fee enabled channel
+func (m *GenesisState) GetForwardRelayers() []*ForwardRelayerAddress {
+ if m != nil {
+ return m.ForwardRelayers
+ }
+ return nil
+}
+
+// FeeEnabledChannel contains the PortID & ChannelID for a fee enabled channel
type FeeEnabledChannel struct {
PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"`
ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
@@ -137,7 +146,7 @@ func (m *FeeEnabledChannel) GetChannelId() string {
return ""
}
-// Contains the address and counterparty address for a specific relayer (for distributing fees)
+// RegisteredRelayerAddress contains the address and counterparty address for a specific relayer (for distributing fees)
type RegisteredRelayerAddress struct {
Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
CounterpartyAddress string `protobuf:"bytes,2,opt,name=counterparty_address,json=counterpartyAddress,proto3" json:"counterparty_address,omitempty" yaml:"counterparty_address"`
@@ -190,10 +199,64 @@ func (m *RegisteredRelayerAddress) GetCounterpartyAddress() string {
return ""
}
+// ForwardRelayerAddress contains the forward relayer address and packetId used for async acknowledgements
+type ForwardRelayerAddress struct {
+ Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
+ PacketId *types.PacketId `protobuf:"bytes,2,opt,name=packet_id,json=packetId,proto3" json:"packet_id,omitempty" yaml:"packet_id"`
+}
+
+func (m *ForwardRelayerAddress) Reset() { *m = ForwardRelayerAddress{} }
+func (m *ForwardRelayerAddress) String() string { return proto.CompactTextString(m) }
+func (*ForwardRelayerAddress) ProtoMessage() {}
+func (*ForwardRelayerAddress) Descriptor() ([]byte, []int) {
+ return fileDescriptor_7191992e856dff95, []int{3}
+}
+func (m *ForwardRelayerAddress) XXX_Unmarshal(b []byte) error {
+ return m.Unmarshal(b)
+}
+func (m *ForwardRelayerAddress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+ if deterministic {
+ return xxx_messageInfo_ForwardRelayerAddress.Marshal(b, m, deterministic)
+ } else {
+ b = b[:cap(b)]
+ n, err := m.MarshalToSizedBuffer(b)
+ if err != nil {
+ return nil, err
+ }
+ return b[:n], nil
+ }
+}
+func (m *ForwardRelayerAddress) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_ForwardRelayerAddress.Merge(m, src)
+}
+func (m *ForwardRelayerAddress) XXX_Size() int {
+ return m.Size()
+}
+func (m *ForwardRelayerAddress) XXX_DiscardUnknown() {
+ xxx_messageInfo_ForwardRelayerAddress.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ForwardRelayerAddress proto.InternalMessageInfo
+
+func (m *ForwardRelayerAddress) GetAddress() string {
+ if m != nil {
+ return m.Address
+ }
+ return ""
+}
+
+func (m *ForwardRelayerAddress) GetPacketId() *types.PacketId {
+ if m != nil {
+ return m.PacketId
+ }
+ return nil
+}
+
func init() {
proto.RegisterType((*GenesisState)(nil), "ibc.applications.fee.v1.GenesisState")
proto.RegisterType((*FeeEnabledChannel)(nil), "ibc.applications.fee.v1.FeeEnabledChannel")
proto.RegisterType((*RegisteredRelayerAddress)(nil), "ibc.applications.fee.v1.RegisteredRelayerAddress")
+ proto.RegisterType((*ForwardRelayerAddress)(nil), "ibc.applications.fee.v1.ForwardRelayerAddress")
}
func init() {
@@ -201,37 +264,43 @@ func init() {
}
var fileDescriptor_7191992e856dff95 = []byte{
- // 470 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0x41, 0x8b, 0xd3, 0x40,
- 0x14, 0xc7, 0x9b, 0x2d, 0xec, 0xb2, 0xa3, 0xac, 0xec, 0x6c, 0xd5, 0x50, 0x21, 0x59, 0x07, 0x84,
- 0x45, 0xdd, 0x84, 0x56, 0x2f, 0x7a, 0xb3, 0x62, 0xa5, 0xe0, 0x41, 0xc6, 0x9b, 0x97, 0x30, 0xc9,
- 0xbc, 0x64, 0x07, 0xd3, 0x4c, 0x9c, 0x99, 0x16, 0x7a, 0xf0, 0x22, 0x08, 0x1e, 0xfd, 0x58, 0x1e,
- 0xf7, 0xe8, 0xa9, 0x48, 0xfb, 0x0d, 0xfa, 0x09, 0x24, 0x99, 0x76, 0xb7, 0xd4, 0xe6, 0xf6, 0x66,
- 0xde, 0xef, 0xff, 0xff, 0xe7, 0x65, 0x1e, 0x7a, 0x22, 0xe2, 0x24, 0x64, 0x65, 0x99, 0x8b, 0x84,
- 0x19, 0x21, 0x0b, 0x1d, 0xa6, 0x00, 0xe1, 0xb4, 0x17, 0x66, 0x50, 0x80, 0x16, 0x3a, 0x28, 0x95,
- 0x34, 0x12, 0x3f, 0x14, 0x71, 0x12, 0x6c, 0x63, 0x41, 0x0a, 0x10, 0x4c, 0x7b, 0xdd, 0x4e, 0x26,
- 0x33, 0x59, 0x33, 0x61, 0x55, 0x59, 0xbc, 0xfb, 0xb8, 0xc9, 0xb5, 0x52, 0xd5, 0x08, 0xf9, 0xd1,
- 0x46, 0x77, 0xdf, 0xdb, 0x8c, 0x4f, 0x86, 0x19, 0xc0, 0x5f, 0xd1, 0x3d, 0xc1, 0xa1, 0x30, 0x22,
- 0x15, 0xc0, 0xa3, 0x14, 0x40, 0xbb, 0xce, 0x79, 0xfb, 0xe2, 0x4e, 0xff, 0x79, 0xd0, 0x10, 0x1e,
- 0x8c, 0x6e, 0xf8, 0x8f, 0x2c, 0xf9, 0x02, 0x66, 0x08, 0x30, 0xe8, 0xae, 0xe6, 0xfe, 0x83, 0x19,
- 0x1b, 0xe7, 0xaf, 0xc9, 0x8e, 0x1d, 0xa1, 0x27, 0xb7, 0x37, 0x43, 0x00, 0x8d, 0xbf, 0xa1, 0x4e,
- 0x0a, 0x10, 0x41, 0xc1, 0xe2, 0x1c, 0x78, 0x94, 0x5c, 0xb1, 0xa2, 0x80, 0x5c, 0xbb, 0x07, 0x75,
- 0xee, 0xd3, 0xc6, 0xdc, 0x21, 0xc0, 0x3b, 0xab, 0x79, 0x6b, 0x25, 0x03, 0x7f, 0x35, 0xf7, 0x1f,
- 0xd9, 0xd4, 0x7d, 0x8e, 0x84, 0xe2, 0x74, 0x57, 0xa3, 0xf1, 0x77, 0x07, 0x9d, 0x29, 0xc8, 0x84,
- 0x36, 0xa0, 0x80, 0x47, 0x0a, 0x72, 0x36, 0x03, 0xa5, 0xdd, 0x76, 0x1d, 0xdf, 0x6b, 0x8c, 0xa7,
- 0x37, 0x1a, 0x6a, 0x25, 0x6f, 0x38, 0x57, 0xa0, 0xf5, 0xc0, 0x5b, 0xcd, 0xfd, 0xae, 0xfd, 0x8a,
- 0x3d, 0xbe, 0x84, 0x62, 0xb5, 0xab, 0xd4, 0x64, 0x8a, 0x4e, 0xff, 0x1b, 0x07, 0x3f, 0x43, 0x47,
- 0xa5, 0x54, 0x26, 0x12, 0xdc, 0x75, 0xce, 0x9d, 0x8b, 0xe3, 0x01, 0x5e, 0xcd, 0xfd, 0x13, 0xeb,
- 0xbc, 0x6e, 0x10, 0x7a, 0x58, 0x55, 0x23, 0x8e, 0x5f, 0x22, 0xb4, 0x9e, 0xb3, 0xe2, 0x0f, 0x6a,
- 0xfe, 0xfe, 0x6a, 0xee, 0x9f, 0x5a, 0xfe, 0xb6, 0x47, 0xe8, 0xf1, 0xfa, 0x30, 0xe2, 0xe4, 0xa7,
- 0x83, 0xdc, 0xa6, 0x41, 0xb0, 0x8b, 0x8e, 0x98, 0x2d, 0x6d, 0x3e, 0xdd, 0x1c, 0x31, 0x45, 0x9d,
- 0x44, 0x4e, 0x0a, 0x03, 0xaa, 0x64, 0xca, 0xcc, 0xa2, 0x0d, 0x66, 0x63, 0xb7, 0x9e, 0x61, 0x1f,
- 0x45, 0xe8, 0xd9, 0xf6, 0xf5, 0xe6, 0xb7, 0x7d, 0xf8, 0xbd, 0xf0, 0x9c, 0xeb, 0x85, 0xe7, 0xfc,
- 0x5d, 0x78, 0xce, 0xaf, 0xa5, 0xd7, 0xba, 0x5e, 0x7a, 0xad, 0x3f, 0x4b, 0xaf, 0xf5, 0xb9, 0x9f,
- 0x09, 0x73, 0x35, 0x89, 0x83, 0x44, 0x8e, 0xc3, 0x44, 0xea, 0xb1, 0xd4, 0xa1, 0x88, 0x93, 0xcb,
- 0x4c, 0x86, 0x63, 0xc9, 0x27, 0x39, 0xe8, 0x6a, 0xc9, 0x75, 0xd8, 0x7f, 0x75, 0x59, 0xed, 0xb7,
- 0x99, 0x95, 0xa0, 0xe3, 0xc3, 0x7a, 0xbf, 0x5f, 0xfc, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x14, 0xf8,
- 0xcc, 0x98, 0x5a, 0x03, 0x00, 0x00,
+ // 570 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x54, 0x4f, 0x6f, 0xd4, 0x3e,
+ 0x10, 0x6d, 0xda, 0x9f, 0xda, 0x5f, 0x5d, 0xd4, 0x3f, 0xee, 0x96, 0xae, 0xb6, 0x22, 0x29, 0x96,
+ 0x90, 0x2a, 0xa0, 0x89, 0xb6, 0x85, 0x03, 0xdc, 0x58, 0x44, 0xd1, 0x9e, 0xa8, 0xcc, 0x8d, 0xcb,
+ 0x2a, 0x7f, 0x26, 0xa9, 0x45, 0x36, 0x0e, 0xb6, 0x1b, 0xb4, 0x07, 0x2e, 0x70, 0xe1, 0xc8, 0xc7,
+ 0xe2, 0xd8, 0x23, 0xa7, 0x08, 0x75, 0xbf, 0x41, 0xee, 0x48, 0x28, 0x71, 0xd2, 0x2e, 0xcb, 0x86,
+ 0xdb, 0xd8, 0xf3, 0xde, 0xbc, 0xe7, 0xb1, 0xc7, 0xe8, 0x01, 0xf3, 0x7c, 0xc7, 0x4d, 0xd3, 0x98,
+ 0xf9, 0xae, 0x62, 0x3c, 0x91, 0x4e, 0x08, 0xe0, 0x64, 0x7d, 0x27, 0x82, 0x04, 0x24, 0x93, 0x76,
+ 0x2a, 0xb8, 0xe2, 0x78, 0x9f, 0x79, 0xbe, 0x3d, 0x0b, 0xb3, 0x43, 0x00, 0x3b, 0xeb, 0xf7, 0x3a,
+ 0x11, 0x8f, 0x78, 0x85, 0x71, 0xca, 0x48, 0xc3, 0x7b, 0xf7, 0xdb, 0xaa, 0x96, 0xac, 0x19, 0x88,
+ 0xcf, 0x05, 0x38, 0xfe, 0x85, 0x9b, 0x24, 0x10, 0x97, 0xe9, 0x3a, 0xd4, 0x10, 0xf2, 0x6b, 0x05,
+ 0xdd, 0x79, 0xad, 0x6d, 0xbc, 0x55, 0xae, 0x02, 0xfc, 0x01, 0x6d, 0xb1, 0x00, 0x12, 0xc5, 0x42,
+ 0x06, 0xc1, 0x28, 0x04, 0x90, 0x5d, 0xe3, 0x70, 0xe5, 0x68, 0xe3, 0xe4, 0xb1, 0xdd, 0xe2, 0xcf,
+ 0x1e, 0xde, 0xe0, 0xcf, 0x5d, 0xff, 0x3d, 0xa8, 0x33, 0x80, 0x41, 0xaf, 0xc8, 0xad, 0xbb, 0x13,
+ 0x77, 0x1c, 0x3f, 0x27, 0x73, 0xe5, 0x08, 0xdd, 0xbc, 0xdd, 0x39, 0x03, 0x90, 0xf8, 0x13, 0xea,
+ 0x84, 0x00, 0x23, 0x48, 0x5c, 0x2f, 0x86, 0x60, 0x54, 0x1b, 0x94, 0xdd, 0xe5, 0x4a, 0xf7, 0x61,
+ 0xab, 0xee, 0x19, 0xc0, 0x2b, 0xcd, 0x79, 0xa9, 0x29, 0x03, 0xab, 0xc8, 0xad, 0x03, 0xad, 0xba,
+ 0xa8, 0x22, 0xa1, 0x38, 0x9c, 0xe7, 0x48, 0xfc, 0xd9, 0x40, 0xbb, 0x02, 0x22, 0x26, 0x15, 0x08,
+ 0x08, 0x46, 0x02, 0x62, 0x77, 0x02, 0x42, 0x76, 0x57, 0x2a, 0xf9, 0x7e, 0xab, 0x3c, 0xbd, 0xe1,
+ 0x50, 0x4d, 0x79, 0x11, 0x04, 0x02, 0xa4, 0x1c, 0x98, 0x45, 0x6e, 0xf5, 0xb4, 0x8b, 0x05, 0x75,
+ 0x09, 0xc5, 0x62, 0x9e, 0x29, 0x71, 0x86, 0xb6, 0x43, 0x2e, 0x3e, 0xba, 0x62, 0xc6, 0xc0, 0x7f,
+ 0x95, 0x01, 0xbb, 0xfd, 0xfc, 0x9a, 0x30, 0xa7, 0x7e, 0x50, 0xe4, 0xd6, 0x7e, 0xdd, 0x83, 0xb9,
+ 0x8a, 0x84, 0x6e, 0x85, 0x7f, 0x70, 0x24, 0xc9, 0xd0, 0xce, 0x5f, 0x6d, 0xc4, 0x8f, 0xd0, 0x5a,
+ 0xca, 0x85, 0x1a, 0xb1, 0xa0, 0x6b, 0x1c, 0x1a, 0x47, 0xeb, 0x03, 0x5c, 0xe4, 0xd6, 0xa6, 0xae,
+ 0x59, 0x27, 0x08, 0x5d, 0x2d, 0xa3, 0x61, 0x80, 0x9f, 0x20, 0x54, 0xf7, 0xb7, 0xc4, 0x2f, 0x57,
+ 0xf8, 0xbd, 0x22, 0xb7, 0x76, 0x34, 0xfe, 0x36, 0x47, 0xe8, 0x7a, 0xbd, 0x18, 0x06, 0xe4, 0xab,
+ 0x81, 0xba, 0x6d, 0x0d, 0xc4, 0x5d, 0xb4, 0xe6, 0xea, 0x50, 0xeb, 0xd3, 0x66, 0x89, 0x29, 0xea,
+ 0xf8, 0xfc, 0x32, 0x51, 0x20, 0x52, 0x57, 0xa8, 0xc9, 0xa8, 0x81, 0x69, 0xd9, 0x99, 0xeb, 0x5f,
+ 0x84, 0x22, 0x74, 0x77, 0x76, 0xbb, 0x56, 0x23, 0x5f, 0x0c, 0xb4, 0xb7, 0xb0, 0x95, 0xff, 0xf0,
+ 0x71, 0x8e, 0xd6, 0xd3, 0xea, 0xad, 0x37, 0x67, 0xde, 0x38, 0xb9, 0x57, 0xdd, 0x53, 0x39, 0x6d,
+ 0x76, 0x33, 0x62, 0x59, 0xdf, 0xd6, 0x13, 0x31, 0x0c, 0x06, 0x9d, 0x22, 0xb7, 0xb6, 0xeb, 0x16,
+ 0x36, 0x4c, 0x42, 0xff, 0x4f, 0x9b, 0xfc, 0x9b, 0xef, 0xd7, 0xa6, 0x71, 0x75, 0x6d, 0x1a, 0x3f,
+ 0xaf, 0x4d, 0xe3, 0xdb, 0xd4, 0x5c, 0xba, 0x9a, 0x9a, 0x4b, 0x3f, 0xa6, 0xe6, 0xd2, 0xbb, 0xa7,
+ 0x11, 0x53, 0x17, 0x97, 0x9e, 0xed, 0xf3, 0xb1, 0xe3, 0x73, 0x39, 0xe6, 0xd2, 0x61, 0x9e, 0x7f,
+ 0x1c, 0x71, 0x27, 0x3b, 0x75, 0xc6, 0x3c, 0xb8, 0x8c, 0x41, 0x96, 0x1f, 0x81, 0x74, 0x4e, 0x9e,
+ 0x1d, 0x97, 0x7f, 0x80, 0x9a, 0xa4, 0x20, 0xbd, 0xd5, 0x6a, 0xc0, 0x4f, 0x7f, 0x07, 0x00, 0x00,
+ 0xff, 0xff, 0x3f, 0xe2, 0x1d, 0x20, 0x7e, 0x04, 0x00, 0x00,
}
func (m *GenesisState) Marshal() (dAtA []byte, err error) {
@@ -254,6 +323,20 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) {
_ = i
var l int
_ = l
+ if len(m.ForwardRelayers) > 0 {
+ for iNdEx := len(m.ForwardRelayers) - 1; iNdEx >= 0; iNdEx-- {
+ {
+ size, err := m.ForwardRelayers[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+ if err != nil {
+ return 0, err
+ }
+ i -= size
+ i = encodeVarintGenesis(dAtA, i, uint64(size))
+ }
+ i--
+ dAtA[i] = 0x22
+ }
+ }
if len(m.RegisteredRelayers) > 0 {
for iNdEx := len(m.RegisteredRelayers) - 1; iNdEx >= 0; iNdEx-- {
{
@@ -373,6 +456,48 @@ func (m *RegisteredRelayerAddress) MarshalToSizedBuffer(dAtA []byte) (int, error
return len(dAtA) - i, nil
}
+func (m *ForwardRelayerAddress) Marshal() (dAtA []byte, err error) {
+ size := m.Size()
+ dAtA = make([]byte, size)
+ n, err := m.MarshalToSizedBuffer(dAtA[:size])
+ if err != nil {
+ return nil, err
+ }
+ return dAtA[:n], nil
+}
+
+func (m *ForwardRelayerAddress) MarshalTo(dAtA []byte) (int, error) {
+ size := m.Size()
+ return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *ForwardRelayerAddress) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+ i := len(dAtA)
+ _ = i
+ var l int
+ _ = l
+ if m.PacketId != nil {
+ {
+ size, err := m.PacketId.MarshalToSizedBuffer(dAtA[:i])
+ if err != nil {
+ return 0, err
+ }
+ i -= size
+ i = encodeVarintGenesis(dAtA, i, uint64(size))
+ }
+ i--
+ dAtA[i] = 0x12
+ }
+ if len(m.Address) > 0 {
+ i -= len(m.Address)
+ copy(dAtA[i:], m.Address)
+ i = encodeVarintGenesis(dAtA, i, uint64(len(m.Address)))
+ i--
+ dAtA[i] = 0xa
+ }
+ return len(dAtA) - i, nil
+}
+
func encodeVarintGenesis(dAtA []byte, offset int, v uint64) int {
offset -= sovGenesis(v)
base := offset
@@ -408,6 +533,12 @@ func (m *GenesisState) Size() (n int) {
n += 1 + l + sovGenesis(uint64(l))
}
}
+ if len(m.ForwardRelayers) > 0 {
+ for _, e := range m.ForwardRelayers {
+ l = e.Size()
+ n += 1 + l + sovGenesis(uint64(l))
+ }
+ }
return n
}
@@ -445,6 +576,23 @@ func (m *RegisteredRelayerAddress) Size() (n int) {
return n
}
+func (m *ForwardRelayerAddress) Size() (n int) {
+ if m == nil {
+ return 0
+ }
+ var l int
+ _ = l
+ l = len(m.Address)
+ if l > 0 {
+ n += 1 + l + sovGenesis(uint64(l))
+ }
+ if m.PacketId != nil {
+ l = m.PacketId.Size()
+ n += 1 + l + sovGenesis(uint64(l))
+ }
+ return n
+}
+
func sovGenesis(x uint64) (n int) {
return (math_bits.Len64(x|1) + 6) / 7
}
@@ -582,6 +730,40 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error {
return err
}
iNdEx = postIndex
+ case 4:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field ForwardRelayers", wireType)
+ }
+ var msglen int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowGenesis
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ msglen |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ if msglen < 0 {
+ return ErrInvalidLengthGenesis
+ }
+ postIndex := iNdEx + msglen
+ if postIndex < 0 {
+ return ErrInvalidLengthGenesis
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.ForwardRelayers = append(m.ForwardRelayers, &ForwardRelayerAddress{})
+ if err := m.ForwardRelayers[len(m.ForwardRelayers)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ return err
+ }
+ iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipGenesis(dAtA[iNdEx:])
@@ -831,6 +1013,124 @@ func (m *RegisteredRelayerAddress) Unmarshal(dAtA []byte) error {
}
return nil
}
+func (m *ForwardRelayerAddress) Unmarshal(dAtA []byte) error {
+ l := len(dAtA)
+ iNdEx := 0
+ for iNdEx < l {
+ preIndex := iNdEx
+ var wire uint64
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowGenesis
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ wire |= uint64(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ fieldNum := int32(wire >> 3)
+ wireType := int(wire & 0x7)
+ if wireType == 4 {
+ return fmt.Errorf("proto: ForwardRelayerAddress: wiretype end group for non-group")
+ }
+ if fieldNum <= 0 {
+ return fmt.Errorf("proto: ForwardRelayerAddress: illegal tag %d (wire type %d)", fieldNum, wire)
+ }
+ switch fieldNum {
+ case 1:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType)
+ }
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowGenesis
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ stringLen |= uint64(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ intStringLen := int(stringLen)
+ if intStringLen < 0 {
+ return ErrInvalidLengthGenesis
+ }
+ postIndex := iNdEx + intStringLen
+ if postIndex < 0 {
+ return ErrInvalidLengthGenesis
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ m.Address = string(dAtA[iNdEx:postIndex])
+ iNdEx = postIndex
+ case 2:
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field PacketId", wireType)
+ }
+ var msglen int
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowGenesis
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ msglen |= int(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ if msglen < 0 {
+ return ErrInvalidLengthGenesis
+ }
+ postIndex := iNdEx + msglen
+ if postIndex < 0 {
+ return ErrInvalidLengthGenesis
+ }
+ if postIndex > l {
+ return io.ErrUnexpectedEOF
+ }
+ if m.PacketId == nil {
+ m.PacketId = &types.PacketId{}
+ }
+ if err := m.PacketId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+ return err
+ }
+ iNdEx = postIndex
+ default:
+ iNdEx = preIndex
+ skippy, err := skipGenesis(dAtA[iNdEx:])
+ if err != nil {
+ return err
+ }
+ if (skippy < 0) || (iNdEx+skippy) < 0 {
+ return ErrInvalidLengthGenesis
+ }
+ if (iNdEx + skippy) > l {
+ return io.ErrUnexpectedEOF
+ }
+ iNdEx += skippy
+ }
+ }
+
+ if iNdEx > l {
+ return io.ErrUnexpectedEOF
+ }
+ return nil
+}
func skipGenesis(dAtA []byte) (n int, err error) {
l := len(dAtA)
iNdEx := 0
diff --git a/modules/apps/29-fee/types/keys.go b/modules/apps/29-fee/types/keys.go
index c017af5d32f..15b33f67a33 100644
--- a/modules/apps/29-fee/types/keys.go
+++ b/modules/apps/29-fee/types/keys.go
@@ -29,6 +29,9 @@ const (
// FeeInEscrowPrefix is the key prefix for fee in escrow mapping
FeeInEscrowPrefix = "feeInEscrow"
+
+ // ForwardRelayerPrefix is the key prefix for forward relayer addresses stored in state for async acknowledgements
+ ForwardRelayerPrefix = "forwardRelayer"
)
// FeeEnabledKey returns the key that stores a flag to determine if fee logic should
@@ -42,6 +45,11 @@ func KeyRelayerAddress(address string) []byte {
return []byte(fmt.Sprintf("%s/%s", RelayerAddressKeyPrefix, address))
}
+// KeyForwardRelayerAddress returns the key for packetID -> forwardAddress mapping
+func KeyForwardRelayerAddress(packetId *channeltypes.PacketId) []byte {
+ return []byte(fmt.Sprintf("%s/%s/%s/%d/", ForwardRelayerPrefix, packetId.PortId, packetId.ChannelId, packetId.Sequence))
+}
+
// KeyFeeInEscrow returns the key for escrowed fees
func KeyFeeInEscrow(packetID *channeltypes.PacketId) []byte {
return []byte(fmt.Sprintf("%s/%d", KeyFeeInEscrowChannelPrefix(packetID.PortId, packetID.ChannelId), packetID.Sequence))
diff --git a/modules/apps/29-fee/types/query.pb.go b/modules/apps/29-fee/types/query.pb.go
index 6361527729d..421dec212f8 100644
--- a/modules/apps/29-fee/types/query.pb.go
+++ b/modules/apps/29-fee/types/query.pb.go
@@ -245,41 +245,41 @@ func init() {
}
var fileDescriptor_0638a8a78ca2503c = []byte{
- // 542 bytes of a gzipped FileDescriptorProto
+ // 544 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x41, 0x6f, 0x12, 0x41,
- 0x14, 0xee, 0x50, 0x35, 0x3a, 0x78, 0x1a, 0x9a, 0x48, 0x88, 0xae, 0x14, 0xa3, 0x12, 0x23, 0x33,
- 0x01, 0x0f, 0xb6, 0x1e, 0x3d, 0x34, 0x92, 0x78, 0xa8, 0x1c, 0x4d, 0x0c, 0xd9, 0x9d, 0x7d, 0x2c,
- 0x13, 0x61, 0x67, 0xcb, 0x0c, 0x24, 0xad, 0x36, 0x9a, 0x7a, 0xed, 0xc1, 0xc4, 0x5f, 0xe3, 0x3f,
- 0xf0, 0xd8, 0xe8, 0xc5, 0xa3, 0x01, 0x7f, 0x88, 0x99, 0xd9, 0x59, 0xdc, 0x04, 0x36, 0x16, 0x6f,
- 0xc3, 0x7b, 0xdf, 0xf7, 0xbe, 0x8f, 0xef, 0xcd, 0x2c, 0xbe, 0x27, 0x02, 0xce, 0xfc, 0x24, 0x19,
- 0x09, 0xee, 0x6b, 0x21, 0x63, 0xc5, 0x06, 0x00, 0x6c, 0xd6, 0x66, 0x47, 0x53, 0x98, 0x1c, 0xd3,
- 0x64, 0x22, 0xb5, 0x24, 0xb7, 0x44, 0xc0, 0x69, 0x1e, 0x44, 0x07, 0x00, 0x74, 0xd6, 0xae, 0xed,
- 0x44, 0x32, 0x92, 0x16, 0xc3, 0xcc, 0x29, 0x85, 0xd7, 0x1e, 0x71, 0xa9, 0xc6, 0x52, 0xb1, 0xc0,
- 0x57, 0x90, 0xce, 0x61, 0xb3, 0x76, 0x00, 0xda, 0x6f, 0xb3, 0xc4, 0x8f, 0x44, 0x6c, 0x67, 0x38,
- 0xec, 0x6e, 0x91, 0xbe, 0x51, 0x48, 0x21, 0xb7, 0x23, 0x29, 0xa3, 0x11, 0x30, 0x3f, 0x11, 0xcc,
- 0x8f, 0x63, 0xa9, 0x9d, 0x87, 0xdc, 0x00, 0x2e, 0x27, 0xc0, 0xf8, 0xd0, 0x8f, 0x63, 0x18, 0x19,
- 0xb2, 0x3b, 0x6e, 0xee, 0xa7, 0x71, 0x8e, 0xf0, 0xdd, 0x57, 0x06, 0xd2, 0x8d, 0x39, 0xc4, 0x5a,
- 0xcc, 0xc4, 0x09, 0x84, 0x87, 0x3e, 0x7f, 0x0b, 0x5a, 0xf5, 0xe0, 0x68, 0x0a, 0x4a, 0x93, 0x03,
- 0x8c, 0xff, 0xf2, 0xaa, 0xa8, 0x8e, 0x9a, 0xe5, 0xce, 0x03, 0x9a, 0x8a, 0x50, 0x23, 0x42, 0xd3,
- 0xf0, 0x9c, 0x08, 0x3d, 0xf4, 0x23, 0x70, 0xdc, 0x5e, 0x8e, 0x49, 0x76, 0xf1, 0x4d, 0x0b, 0xec,
- 0x0f, 0x41, 0x44, 0x43, 0x5d, 0x2d, 0xd5, 0x51, 0xf3, 0x4a, 0xaf, 0x6c, 0x6b, 0x2f, 0x6c, 0xa9,
- 0xf1, 0x09, 0xe1, 0x7a, 0xb1, 0x1d, 0x95, 0xc8, 0x58, 0x01, 0xe9, 0xe3, 0x1d, 0x91, 0x6b, 0xf7,
- 0x93, 0xb4, 0x5f, 0x45, 0xf5, 0xed, 0x66, 0xb9, 0xf3, 0x98, 0x16, 0x6c, 0x8f, 0x76, 0x43, 0xc3,
- 0x19, 0x88, 0x6c, 0xe2, 0x01, 0x40, 0xaf, 0x22, 0x56, 0x85, 0x1a, 0x1f, 0xb0, 0x57, 0x60, 0x22,
- 0x8b, 0xe4, 0x19, 0xbe, 0x91, 0xaa, 0xf6, 0x45, 0xe8, 0x12, 0xb9, 0x63, 0x75, 0xcd, 0x66, 0x68,
- 0xb6, 0x8e, 0x99, 0xc9, 0xc2, 0xa0, 0xba, 0x61, 0xef, 0x7a, 0xe2, 0x4e, 0x97, 0x89, 0xe1, 0x63,
- 0xf1, 0x56, 0x96, 0x29, 0xbc, 0xc1, 0x95, 0x35, 0x29, 0x38, 0x33, 0x9b, 0x85, 0x40, 0x56, 0x43,
- 0xe8, 0x7c, 0xdf, 0xc6, 0x57, 0xad, 0x05, 0xf2, 0x15, 0xe1, 0xca, 0x9a, 0x75, 0x90, 0xbd, 0x42,
- 0x8d, 0x7f, 0x5c, 0xa8, 0xda, 0xfe, 0x7f, 0x30, 0xd3, 0x7f, 0xdd, 0x68, 0x9d, 0xfd, 0xf8, 0xfd,
- 0xa5, 0xf4, 0x90, 0xdc, 0x67, 0xee, 0x21, 0x2d, 0x1f, 0xd0, 0xba, 0x2b, 0x41, 0xce, 0x4b, 0x98,
- 0xac, 0x8e, 0x23, 0x4f, 0x37, 0x35, 0x90, 0x39, 0xdf, 0xdb, 0x9c, 0xe8, 0x8c, 0x9f, 0x21, 0xeb,
- 0xfc, 0x3d, 0x39, 0xb9, 0x8c, 0x73, 0x96, 0xc8, 0x89, 0x66, 0xef, 0x96, 0x77, 0x8c, 0x9a, 0xdf,
- 0x7d, 0x11, 0x9e, 0x2e, 0x5f, 0x7d, 0xae, 0xe7, 0x4a, 0xb6, 0xad, 0x8c, 0xd1, 0x98, 0x43, 0xbe,
- 0x9f, 0xd5, 0x4e, 0x9f, 0xbf, 0xfc, 0x36, 0xf7, 0xd0, 0xc5, 0xdc, 0x43, 0xbf, 0xe6, 0x1e, 0xfa,
- 0xbc, 0xf0, 0xb6, 0x2e, 0x16, 0xde, 0xd6, 0xcf, 0x85, 0xb7, 0xf5, 0xba, 0x13, 0x09, 0x3d, 0x9c,
- 0x06, 0x94, 0xcb, 0x31, 0x73, 0x9f, 0x0f, 0x11, 0xf0, 0x56, 0x24, 0xd9, 0x58, 0x86, 0xd3, 0x11,
- 0xa8, 0xd4, 0x71, 0x67, 0xbf, 0x65, 0x4c, 0xeb, 0xe3, 0x04, 0x54, 0x70, 0xcd, 0x7e, 0x42, 0x9e,
- 0xfc, 0x09, 0x00, 0x00, 0xff, 0xff, 0x6a, 0x6c, 0x98, 0x87, 0x54, 0x05, 0x00, 0x00,
+ 0x14, 0x66, 0xa8, 0x1a, 0x1d, 0x3c, 0x0d, 0x4d, 0x24, 0x44, 0x57, 0x8a, 0x51, 0x89, 0x91, 0x99,
+ 0x40, 0x63, 0x6c, 0x3d, 0x7a, 0x68, 0xe4, 0x64, 0xe5, 0x68, 0x62, 0xc8, 0xee, 0xec, 0x63, 0x99,
+ 0x08, 0x3b, 0x5b, 0x66, 0xd8, 0xa4, 0xd5, 0x46, 0x53, 0xaf, 0x3d, 0x98, 0xf8, 0x6b, 0xfc, 0x07,
+ 0x1e, 0x1b, 0xbd, 0x78, 0x34, 0xe0, 0x0f, 0x31, 0xb3, 0x3b, 0x8b, 0x9b, 0xc0, 0xc6, 0xe2, 0x6d,
+ 0x78, 0xef, 0xfb, 0xde, 0xf7, 0xf1, 0xbd, 0x99, 0xc5, 0xf7, 0x84, 0xc7, 0x99, 0x1b, 0x45, 0x63,
+ 0xc1, 0x5d, 0x2d, 0x64, 0xa8, 0xd8, 0x10, 0x80, 0xc5, 0x1d, 0x76, 0x34, 0x83, 0xe9, 0x31, 0x8d,
+ 0xa6, 0x52, 0x4b, 0x72, 0x4b, 0x78, 0x9c, 0xe6, 0x41, 0x74, 0x08, 0x40, 0xe3, 0x4e, 0x7d, 0x3b,
+ 0x90, 0x81, 0x4c, 0x30, 0xcc, 0x9c, 0x52, 0x78, 0x7d, 0xa7, 0x68, 0xa6, 0x61, 0xa5, 0x90, 0xdb,
+ 0x81, 0x94, 0xc1, 0x18, 0x98, 0x1b, 0x09, 0xe6, 0x86, 0xa1, 0xd4, 0x76, 0x6e, 0x6e, 0x00, 0x97,
+ 0x53, 0x60, 0x7c, 0xe4, 0x86, 0x21, 0x8c, 0x0d, 0xd9, 0x1e, 0x2d, 0xe4, 0x11, 0x97, 0x6a, 0x22,
+ 0x15, 0xf3, 0x5c, 0x05, 0xa9, 0x57, 0x16, 0x77, 0x3c, 0xd0, 0x6e, 0x87, 0x45, 0x6e, 0x20, 0xc2,
+ 0x64, 0x5e, 0x8a, 0x6d, 0x9e, 0x23, 0x7c, 0xf7, 0x95, 0x81, 0xf4, 0x42, 0x0e, 0xa1, 0x16, 0xb1,
+ 0x38, 0x01, 0xff, 0xd0, 0xe5, 0x6f, 0x41, 0xab, 0x3e, 0x1c, 0xcd, 0x40, 0x69, 0x72, 0x80, 0xf1,
+ 0x5f, 0x5e, 0x0d, 0x35, 0x50, 0xab, 0xd2, 0x7d, 0x40, 0x53, 0x11, 0x6a, 0x44, 0x68, 0x1a, 0x88,
+ 0x15, 0xa1, 0x87, 0x6e, 0x00, 0x96, 0xdb, 0xcf, 0x31, 0xc9, 0x0e, 0xbe, 0x99, 0x00, 0x07, 0x23,
+ 0x10, 0xc1, 0x48, 0xd7, 0xca, 0x0d, 0xd4, 0xba, 0xd2, 0xaf, 0x24, 0xb5, 0x17, 0x49, 0xa9, 0xf9,
+ 0x09, 0xe1, 0x46, 0xb1, 0x1d, 0x15, 0xc9, 0x50, 0x01, 0x19, 0xe0, 0x6d, 0x91, 0x6b, 0x0f, 0xa2,
+ 0xb4, 0x5f, 0x43, 0x8d, 0xad, 0x56, 0xa5, 0xfb, 0x98, 0x16, 0x6c, 0x84, 0xf6, 0x7c, 0xc3, 0x19,
+ 0x8a, 0x6c, 0xe2, 0x01, 0x40, 0xbf, 0x2a, 0x56, 0x85, 0x9a, 0x1f, 0xb0, 0x53, 0x60, 0x22, 0x8b,
+ 0xe4, 0x19, 0xbe, 0x91, 0xaa, 0x0e, 0x84, 0x6f, 0x13, 0xb9, 0x93, 0xe8, 0x9a, 0xcd, 0xd0, 0x6c,
+ 0x1d, 0xb1, 0xc9, 0xc2, 0xa0, 0x7a, 0x7e, 0xff, 0x7a, 0x64, 0x4f, 0x97, 0x89, 0xe1, 0x63, 0xf1,
+ 0x56, 0x96, 0x29, 0xbc, 0xc1, 0xd5, 0x35, 0x29, 0x58, 0x33, 0x9b, 0x85, 0x40, 0x56, 0x43, 0xe8,
+ 0x7e, 0xdf, 0xc2, 0x57, 0x13, 0x0b, 0xe4, 0x2b, 0xc2, 0xd5, 0x35, 0xeb, 0x20, 0x7b, 0x85, 0x1a,
+ 0xff, 0xb8, 0x50, 0xf5, 0xfd, 0xff, 0x60, 0xa6, 0xff, 0xba, 0xd9, 0x3e, 0xfb, 0xf1, 0xfb, 0x4b,
+ 0xf9, 0x21, 0xb9, 0xcf, 0xec, 0x43, 0x5a, 0x3e, 0xa0, 0x75, 0x57, 0x82, 0x9c, 0x97, 0x31, 0x59,
+ 0x1d, 0x47, 0x9e, 0x6e, 0x6a, 0x20, 0x73, 0xbe, 0xb7, 0x39, 0xd1, 0x1a, 0x3f, 0x43, 0x89, 0xf3,
+ 0xf7, 0xe4, 0xe4, 0x32, 0xce, 0x59, 0x24, 0xa7, 0x9a, 0xbd, 0x5b, 0xde, 0x31, 0x6a, 0x7e, 0x0f,
+ 0x84, 0x7f, 0xba, 0x7c, 0xf5, 0xb9, 0x9e, 0x2d, 0x25, 0x6d, 0x65, 0x8c, 0x86, 0x1c, 0xf2, 0xfd,
+ 0xac, 0x76, 0xfa, 0xfc, 0xe5, 0xb7, 0xb9, 0x83, 0x2e, 0xe6, 0x0e, 0xfa, 0x35, 0x77, 0xd0, 0xe7,
+ 0x85, 0x53, 0xba, 0x58, 0x38, 0xa5, 0x9f, 0x0b, 0xa7, 0xf4, 0xfa, 0x49, 0x20, 0xf4, 0x68, 0xe6,
+ 0x51, 0x2e, 0x27, 0xcc, 0x7e, 0x3e, 0x84, 0xc7, 0xdb, 0x81, 0x64, 0xf1, 0x2e, 0x9b, 0x48, 0x7f,
+ 0x36, 0x06, 0x95, 0x9a, 0xee, 0xee, 0xb7, 0x8d, 0x6f, 0x7d, 0x1c, 0x81, 0xf2, 0xae, 0x25, 0x5f,
+ 0x91, 0xdd, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4f, 0xd8, 0x1b, 0x4b, 0x2b, 0x05, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
diff --git a/modules/apps/29-fee/types/tx.pb.go b/modules/apps/29-fee/types/tx.pb.go
index 382779cc86e..2c36575ecb0 100644
--- a/modules/apps/29-fee/types/tx.pb.go
+++ b/modules/apps/29-fee/types/tx.pb.go
@@ -281,44 +281,44 @@ func init() {
func init() { proto.RegisterFile("ibc/applications/fee/v1/tx.proto", fileDescriptor_05c93128649f1b96) }
var fileDescriptor_05c93128649f1b96 = []byte{
- // 585 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0x4f, 0x6f, 0xd3, 0x4c,
- 0x10, 0xc6, 0xed, 0xa6, 0x6f, 0xdf, 0x76, 0xa9, 0xa8, 0xea, 0xa6, 0x34, 0x75, 0x23, 0x3b, 0x58,
- 0x08, 0xe5, 0x40, 0x6c, 0x1a, 0x40, 0x88, 0x5e, 0xaa, 0xa6, 0x52, 0x45, 0x24, 0x22, 0x45, 0x3e,
- 0x72, 0x89, 0x9c, 0xf5, 0xc4, 0x5d, 0x48, 0xbc, 0xd6, 0xee, 0xa6, 0xc2, 0x5f, 0xa0, 0xe2, 0xd8,
- 0x1b, 0x1c, 0x7b, 0xe5, 0x9b, 0xf4, 0xd8, 0x23, 0xa7, 0x08, 0x25, 0x17, 0xce, 0xf9, 0x04, 0xc8,
- 0x76, 0x92, 0x3a, 0xcd, 0x1f, 0x15, 0x6e, 0xbb, 0x3b, 0xbf, 0x79, 0x76, 0xe6, 0xd9, 0xd5, 0xa0,
- 0x02, 0x69, 0x62, 0xcb, 0x09, 0x82, 0x36, 0xc1, 0x8e, 0x20, 0xd4, 0xe7, 0x56, 0x0b, 0xc0, 0xba,
- 0x38, 0xb4, 0xc4, 0x17, 0x33, 0x60, 0x54, 0x50, 0x65, 0x8f, 0x34, 0xb1, 0x99, 0x26, 0xcc, 0x16,
- 0x80, 0x79, 0x71, 0xa8, 0x66, 0x3d, 0xea, 0xd1, 0x98, 0xb1, 0xa2, 0x55, 0x82, 0xab, 0x4f, 0x17,
- 0x09, 0x46, 0x59, 0x29, 0x04, 0x53, 0x06, 0x16, 0x3e, 0x77, 0x7c, 0x1f, 0xda, 0x51, 0x78, 0xb4,
- 0x4c, 0x10, 0xe3, 0xbb, 0x8c, 0xb4, 0x1a, 0xf7, 0x6c, 0xf0, 0x08, 0x17, 0xc0, 0x4e, 0x69, 0xd7,
- 0x17, 0xc0, 0x02, 0x87, 0x89, 0xf0, 0xc4, 0x75, 0x19, 0x70, 0xae, 0xe4, 0xd0, 0xff, 0x4e, 0xb2,
- 0xcc, 0xc9, 0x05, 0xb9, 0xb8, 0x61, 0x8f, 0xb7, 0x8a, 0x8d, 0xb2, 0x38, 0x95, 0xd0, 0x18, 0x63,
- 0x2b, 0x11, 0x56, 0xd1, 0x87, 0x3d, 0xfd, 0x20, 0x74, 0x3a, 0xed, 0x23, 0x63, 0x1e, 0x65, 0xd8,
- 0x3b, 0x78, 0xf6, 0xb6, 0xa3, 0xf5, 0xaf, 0xd7, 0xba, 0xf4, 0xfb, 0x5a, 0x97, 0x8c, 0x22, 0x7a,
- 0xbe, 0xbc, 0x32, 0x1b, 0x78, 0x40, 0x7d, 0x0e, 0xc6, 0xd5, 0x0a, 0xda, 0xaa, 0x71, 0xaf, 0xee,
- 0x84, 0x75, 0x07, 0x7f, 0x06, 0x71, 0x06, 0xa0, 0xbc, 0x46, 0x99, 0x16, 0x40, 0x5c, 0xf1, 0xa3,
- 0x72, 0xde, 0x5c, 0xe0, 0xad, 0x79, 0x06, 0x50, 0x59, 0xbd, 0xe9, 0xe9, 0x92, 0x1d, 0xe1, 0xca,
- 0x31, 0x7a, 0xcc, 0x69, 0x97, 0x61, 0x68, 0x04, 0x94, 0x89, 0x06, 0x71, 0x47, 0xbd, 0xec, 0x0f,
- 0x7b, 0xfa, 0x6e, 0xd2, 0xcb, 0x74, 0xdc, 0xb0, 0x37, 0x93, 0x83, 0x3a, 0x65, 0xa2, 0xea, 0x2a,
- 0xef, 0xd1, 0xf6, 0x08, 0x18, 0xf9, 0x1c, 0x69, 0x64, 0x62, 0x8d, 0xfc, 0xb0, 0xa7, 0xe7, 0xa6,
- 0x34, 0xee, 0x10, 0xc3, 0xde, 0x4a, 0xce, 0x4e, 0x93, 0xa3, 0xaa, 0xab, 0x3c, 0x41, 0x6b, 0x9c,
- 0x78, 0x3e, 0xb0, 0xdc, 0x6a, 0xec, 0xfa, 0x68, 0xa7, 0xa8, 0x68, 0x9d, 0x41, 0xdb, 0x09, 0x81,
- 0xf1, 0xdc, 0x7f, 0x85, 0x4c, 0x71, 0xc3, 0x9e, 0xec, 0x53, 0xe6, 0xed, 0xa3, 0xbd, 0x7b, 0x8e,
- 0x4c, 0xdc, 0xfa, 0x21, 0xa3, 0xec, 0xbd, 0xd8, 0x09, 0x0f, 0x7d, 0xac, 0x5c, 0xca, 0x68, 0x97,
- 0xb8, 0xe0, 0x0b, 0xd2, 0x22, 0xe0, 0x36, 0x82, 0x38, 0xda, 0xb8, 0x73, 0xf1, 0xc5, 0x42, 0x17,
- 0xab, 0x93, 0xac, 0x89, 0x64, 0xe5, 0x59, 0xe4, 0xea, 0xb0, 0xa7, 0xe7, 0x93, 0x96, 0xe7, 0x0a,
- 0x1b, 0xf6, 0x0e, 0x99, 0x4d, 0x4d, 0xb5, 0xa1, 0xa1, 0xfc, 0xbc, 0x52, 0xc7, 0xbd, 0x94, 0x2f,
- 0x33, 0x28, 0x53, 0xe3, 0x9e, 0xf2, 0x4d, 0x46, 0x07, 0xcb, 0xfe, 0xf0, 0xdb, 0x85, 0xa5, 0x2f,
- 0xff, 0x62, 0xea, 0xf1, 0x3f, 0x26, 0x8e, 0x2b, 0x54, 0x3e, 0xa1, 0xcd, 0xa9, 0x7f, 0x59, 0x5c,
- 0x26, 0x98, 0x26, 0xd5, 0x97, 0x0f, 0x25, 0x27, 0x77, 0x85, 0x68, 0x7b, 0xf6, 0x55, 0x4b, 0x0f,
- 0x95, 0x89, 0x71, 0xf5, 0xcd, 0x5f, 0xe1, 0xe3, 0xab, 0x2b, 0x1f, 0x6e, 0xfa, 0x9a, 0x7c, 0xdb,
- 0xd7, 0xe4, 0x5f, 0x7d, 0x4d, 0xbe, 0x1a, 0x68, 0xd2, 0xed, 0x40, 0x93, 0x7e, 0x0e, 0x34, 0xe9,
- 0x63, 0xd9, 0x23, 0xe2, 0xbc, 0xdb, 0x34, 0x31, 0xed, 0x58, 0x98, 0xf2, 0x0e, 0xe5, 0x16, 0x69,
- 0xe2, 0x92, 0x47, 0xad, 0x0e, 0x75, 0xbb, 0x6d, 0xe0, 0xd1, 0x10, 0xe3, 0x56, 0xf9, 0x5d, 0x29,
- 0x9a, 0x5f, 0x22, 0x0c, 0x80, 0x37, 0xd7, 0xe2, 0xe1, 0xf4, 0xea, 0x4f, 0x00, 0x00, 0x00, 0xff,
- 0xff, 0x20, 0xf7, 0x8a, 0xce, 0x35, 0x05, 0x00, 0x00,
+ // 587 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0x4f, 0x4f, 0xdb, 0x4c,
+ 0x10, 0xc6, 0x6d, 0xc2, 0xcb, 0x0b, 0x5b, 0x54, 0x84, 0x81, 0x12, 0x4c, 0x64, 0x53, 0xab, 0xaa,
+ 0x72, 0x68, 0xec, 0x12, 0x8a, 0xaa, 0x72, 0x41, 0x04, 0x09, 0x35, 0x87, 0xa8, 0x91, 0x8f, 0xbd,
+ 0x44, 0xce, 0x7a, 0x62, 0xb6, 0x4d, 0xbc, 0xd6, 0xee, 0x26, 0xaa, 0xbf, 0x00, 0xea, 0x91, 0x5b,
+ 0x7b, 0xe4, 0xda, 0x6f, 0xc2, 0x91, 0x63, 0x4f, 0x51, 0x95, 0x5c, 0x7a, 0xce, 0x27, 0xa8, 0x6c,
+ 0x27, 0xc1, 0x21, 0x7f, 0x44, 0x7b, 0xdb, 0xdd, 0xf9, 0xcd, 0xb3, 0x33, 0xcf, 0xae, 0x06, 0x1d,
+ 0x90, 0x3a, 0xb6, 0x9c, 0x20, 0x68, 0x12, 0xec, 0x08, 0x42, 0x7d, 0x6e, 0x35, 0x00, 0xac, 0xce,
+ 0xa1, 0x25, 0xbe, 0x98, 0x01, 0xa3, 0x82, 0x2a, 0xbb, 0xa4, 0x8e, 0xcd, 0x34, 0x61, 0x36, 0x00,
+ 0xcc, 0xce, 0xa1, 0xba, 0xed, 0x51, 0x8f, 0xc6, 0x8c, 0x15, 0xad, 0x12, 0x5c, 0x7d, 0x3e, 0x4f,
+ 0x30, 0xca, 0x4a, 0x21, 0x98, 0x32, 0xb0, 0xf0, 0xa5, 0xe3, 0xfb, 0xd0, 0x8c, 0xc2, 0xc3, 0x65,
+ 0x82, 0x18, 0xdf, 0x65, 0xa4, 0x55, 0xb8, 0x67, 0x83, 0x47, 0xb8, 0x00, 0x76, 0x4e, 0xdb, 0xbe,
+ 0x00, 0x16, 0x38, 0x4c, 0x84, 0x67, 0xae, 0xcb, 0x80, 0x73, 0x25, 0x8b, 0xfe, 0x77, 0x92, 0x65,
+ 0x56, 0x3e, 0x90, 0xf3, 0x6b, 0xf6, 0x68, 0xab, 0xd8, 0x68, 0x1b, 0xa7, 0x12, 0x6a, 0x23, 0x6c,
+ 0x29, 0xc2, 0x4a, 0xfa, 0xa0, 0xab, 0xef, 0x87, 0x4e, 0xab, 0x79, 0x62, 0xcc, 0xa2, 0x0c, 0x7b,
+ 0x0b, 0x4f, 0xdf, 0x76, 0xb2, 0xfa, 0xf5, 0x46, 0x97, 0x7e, 0xdf, 0xe8, 0x92, 0x91, 0x47, 0x2f,
+ 0x17, 0x57, 0x66, 0x03, 0x0f, 0xa8, 0xcf, 0xc1, 0xb8, 0x5e, 0x42, 0x1b, 0x15, 0xee, 0x55, 0x9d,
+ 0xb0, 0xea, 0xe0, 0xcf, 0x20, 0x2e, 0x00, 0x94, 0x37, 0x28, 0xd3, 0x00, 0x88, 0x2b, 0x7e, 0x52,
+ 0xcc, 0x99, 0x73, 0xbc, 0x35, 0x2f, 0x00, 0x4a, 0xcb, 0xb7, 0x5d, 0x5d, 0xb2, 0x23, 0x5c, 0x39,
+ 0x45, 0x4f, 0x39, 0x6d, 0x33, 0x0c, 0xb5, 0x80, 0x32, 0x51, 0x23, 0xee, 0xb0, 0x97, 0xbd, 0x41,
+ 0x57, 0xdf, 0x49, 0x7a, 0x99, 0x8c, 0x1b, 0xf6, 0x7a, 0x72, 0x50, 0xa5, 0x4c, 0x94, 0x5d, 0xe5,
+ 0x3d, 0xda, 0x1c, 0x02, 0x43, 0x9f, 0x23, 0x8d, 0x4c, 0xac, 0x91, 0x1b, 0x74, 0xf5, 0xec, 0x84,
+ 0xc6, 0x3d, 0x62, 0xd8, 0x1b, 0xc9, 0xd9, 0x79, 0x72, 0x54, 0x76, 0x95, 0x67, 0x68, 0x85, 0x13,
+ 0xcf, 0x07, 0x96, 0x5d, 0x8e, 0x5d, 0x1f, 0xee, 0x14, 0x15, 0xad, 0x32, 0x68, 0x3a, 0x21, 0x30,
+ 0x9e, 0xfd, 0xef, 0x20, 0x93, 0x5f, 0xb3, 0xc7, 0xfb, 0x94, 0x79, 0x7b, 0x68, 0xf7, 0x81, 0x23,
+ 0x63, 0xb7, 0x7e, 0xc8, 0x68, 0xfb, 0x41, 0xec, 0x8c, 0x87, 0x3e, 0x56, 0xae, 0x64, 0xb4, 0x43,
+ 0x5c, 0xf0, 0x05, 0x69, 0x10, 0x70, 0x6b, 0x41, 0x1c, 0xad, 0xdd, 0xbb, 0xf8, 0x6a, 0xae, 0x8b,
+ 0xe5, 0x71, 0xd6, 0x58, 0xb2, 0xf4, 0x22, 0x72, 0x75, 0xd0, 0xd5, 0x73, 0x49, 0xcb, 0x33, 0x85,
+ 0x0d, 0x7b, 0x8b, 0x4c, 0xa7, 0xa6, 0xda, 0xd0, 0x50, 0x6e, 0x56, 0xa9, 0xa3, 0x5e, 0x8a, 0x57,
+ 0x19, 0x94, 0xa9, 0x70, 0x4f, 0xf9, 0x26, 0xa3, 0xfd, 0x45, 0x7f, 0xf8, 0xed, 0xdc, 0xd2, 0x17,
+ 0x7f, 0x31, 0xf5, 0xf4, 0x1f, 0x13, 0x47, 0x15, 0x2a, 0x9f, 0xd0, 0xfa, 0xc4, 0xbf, 0xcc, 0x2f,
+ 0x12, 0x4c, 0x93, 0xea, 0xeb, 0xc7, 0x92, 0xe3, 0xbb, 0x42, 0xb4, 0x39, 0xfd, 0xaa, 0x85, 0xc7,
+ 0xca, 0xc4, 0xb8, 0x7a, 0xfc, 0x57, 0xf8, 0xe8, 0xea, 0xd2, 0x87, 0xdb, 0x9e, 0x26, 0xdf, 0xf5,
+ 0x34, 0xf9, 0x57, 0x4f, 0x93, 0xaf, 0xfb, 0x9a, 0x74, 0xd7, 0xd7, 0xa4, 0x9f, 0x7d, 0x4d, 0xfa,
+ 0x78, 0xec, 0x11, 0x71, 0xd9, 0xae, 0x9b, 0x98, 0xb6, 0x2c, 0x4c, 0x79, 0x8b, 0x72, 0x8b, 0xd4,
+ 0x71, 0xc1, 0xa3, 0x56, 0xe7, 0xc8, 0x6a, 0x51, 0xb7, 0xdd, 0x04, 0x1e, 0xcd, 0x31, 0x6e, 0x15,
+ 0xdf, 0x15, 0xa2, 0x11, 0x26, 0xc2, 0x00, 0x78, 0x7d, 0x25, 0x9e, 0x4f, 0x47, 0x7f, 0x02, 0x00,
+ 0x00, 0xff, 0xff, 0x35, 0x7a, 0x51, 0x8c, 0x38, 0x05, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/ibc/applications/fee/v1/ack.proto b/proto/ibc/applications/fee/v1/ack.proto
index bfc76e38385..626b4518f18 100644
--- a/proto/ibc/applications/fee/v1/ack.proto
+++ b/proto/ibc/applications/fee/v1/ack.proto
@@ -2,11 +2,11 @@ syntax = "proto3";
package ibc.applications.fee.v1;
import "gogoproto/gogo.proto";
-option go_package = "github.com/cosmos/ibc-go/modules/apps/29-fee/types";
+option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/29-fee/types";
// IncentivizedAcknowledgement is the acknowledgement format to be used by applications wrapped in the fee middleware
// It contains the raw acknowledgement bytes, as well as the forward relayer address
message IncentivizedAcknowledgement {
bytes result = 1;
string forward_relayer_address = 2 [(gogoproto.moretags) = "yaml:\"forward_relayer_address\""];
-}
\ No newline at end of file
+}
diff --git a/proto/ibc/applications/fee/v1/fee.proto b/proto/ibc/applications/fee/v1/fee.proto
index eb21f44caec..1f5d9c0d05c 100644
--- a/proto/ibc/applications/fee/v1/fee.proto
+++ b/proto/ibc/applications/fee/v1/fee.proto
@@ -4,7 +4,7 @@ package ibc.applications.fee.v1;
import "cosmos/base/v1beta1/coin.proto";
import "gogoproto/gogo.proto";
import "ibc/core/channel/v1/channel.proto";
-option go_package = "github.com/cosmos/ibc-go/modules/apps/29-fee/types";
+option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/29-fee/types";
// Fee implements the ics29 Fee interface
// See Fee Payment Middleware spec:
diff --git a/proto/ibc/applications/fee/v1/genesis.proto b/proto/ibc/applications/fee/v1/genesis.proto
index cef33b501a0..632693e808c 100644
--- a/proto/ibc/applications/fee/v1/genesis.proto
+++ b/proto/ibc/applications/fee/v1/genesis.proto
@@ -3,23 +3,32 @@ syntax = "proto3";
package ibc.applications.fee.v1;
import "gogoproto/gogo.proto";
import "ibc/applications/fee/v1/fee.proto";
-option go_package = "github.com/cosmos/ibc-go/modules/apps/29-fee/types";
+import "ibc/core/channel/v1/channel.proto";
+
+option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/29-fee/types";
// GenesisState defines the fee middleware genesis state
message GenesisState {
repeated IdentifiedPacketFee identified_fees = 1 [(gogoproto.moretags) = "yaml:\"identified_fees\""];
repeated FeeEnabledChannel fee_enabled_channels = 2 [(gogoproto.moretags) = "yaml:\"fee_enabled_channels\""];
repeated RegisteredRelayerAddress registered_relayers = 3 [(gogoproto.moretags) = "yaml:\"registered_relayers\""];
+ repeated ForwardRelayerAddress forward_relayers = 4 [(gogoproto.moretags) = "yaml:\"forward_relayers\""];
}
-// Contains the PortID & ChannelID for a fee enabled channel
+// FeeEnabledChannel contains the PortID & ChannelID for a fee enabled channel
message FeeEnabledChannel {
string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""];
string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""];
}
-// Contains the address and counterparty address for a specific relayer (for distributing fees)
+// RegisteredRelayerAddress contains the address and counterparty address for a specific relayer (for distributing fees)
message RegisteredRelayerAddress {
string address = 1;
string counterparty_address = 2 [(gogoproto.moretags) = "yaml:\"counterparty_address\""];
}
+
+// ForwardRelayerAddress contains the forward relayer address and packetId used for async acknowledgements
+message ForwardRelayerAddress {
+ string address = 1;
+ ibc.core.channel.v1.PacketId packet_id = 2 [(gogoproto.moretags) = "yaml:\"packet_id\""];
+}
diff --git a/proto/ibc/applications/fee/v1/query.proto b/proto/ibc/applications/fee/v1/query.proto
index d8b258359ae..75a7d3c0491 100644
--- a/proto/ibc/applications/fee/v1/query.proto
+++ b/proto/ibc/applications/fee/v1/query.proto
@@ -3,13 +3,12 @@ syntax = "proto3";
package ibc.applications.fee.v1;
import "gogoproto/gogo.proto";
-import "cosmos/base/query/v1beta1/pagination.proto";
import "ibc/applications/fee/v1/fee.proto";
import "google/api/annotations.proto";
import "ibc/core/channel/v1/channel.proto";
import "cosmos/base/query/v1beta1/pagination.proto";
-option go_package = "github.com/cosmos/ibc-go/modules/apps/29-fee/types";
+option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/29-fee/types";
// Query provides defines the gRPC querier service.
service Query {
diff --git a/proto/ibc/applications/fee/v1/tx.proto b/proto/ibc/applications/fee/v1/tx.proto
index 6313e94d0ef..07517f52a80 100644
--- a/proto/ibc/applications/fee/v1/tx.proto
+++ b/proto/ibc/applications/fee/v1/tx.proto
@@ -5,7 +5,7 @@ package ibc.applications.fee.v1;
import "gogoproto/gogo.proto";
import "ibc/applications/fee/v1/fee.proto";
import "ibc/core/channel/v1/channel.proto";
-option go_package = "github.com/cosmos/ibc-go/modules/apps/29-fee/types";
+option go_package = "github.com/cosmos/ibc-go/v3/modules/apps/29-fee/types";
// Msg defines the ibc/fee Msg service.
service Msg {