diff --git a/docs/client/swagger-ui/swagger.yaml b/docs/client/swagger-ui/swagger.yaml
index 409bddcafc2..ca13125f6fa 100644
--- a/docs/client/swagger-ui/swagger.yaml
+++ b/docs/client/swagger-ui/swagger.yaml
@@ -1046,24 +1046,26 @@ paths:
format: uint64
tags:
- Query
- '/ibc/apps/fee/v1/channels/{channel_id}/relayers/{relayer_address}/counterparty_address':
+ '/ibc/apps/fee/v1/channels/{channel_id}/relayers/{relayer}/counterparty_payee':
get:
summary: >-
- CounterpartyAddress returns the registered counterparty address for
- forward relaying
- operationId: CounterpartyAddress
+ CounterpartyPayee returns the registered counterparty payee for forward
+ relaying
+ operationId: CounterpartyPayee
responses:
'200':
description: A successful response.
schema:
type: object
properties:
- counterparty_address:
+ counterparty_payee:
type: string
- title: the counterparty address used to compensate forward relaying
+ title: >-
+ the counterparty payee address used to compensate forward
+ relaying
title: >-
- QueryCounterpartyAddressResponse defines the response type for the
- CounterpartyAddress rpc
+ QueryCounterpartyPayeeResponse defines the response type for the
+ CounterpartyPayee rpc
default:
description: An unexpected error response
schema:
@@ -1259,14 +1261,14 @@ paths:
in: path
required: true
type: string
- - name: relayer_address
+ - name: relayer
description: the relayer address to which the counterparty is registered
in: path
required: true
type: string
tags:
- Query
- '/ibc/apps/fee/v1/channels/{channel_id}/relayers/{relayer_address}/payee':
+ '/ibc/apps/fee/v1/channels/{channel_id}/relayers/{relayer}/payee':
get:
summary: >-
Payee returns the registered payee address for a specific channel given
@@ -1477,7 +1479,7 @@ paths:
in: path
required: true
type: string
- - name: relayer_address
+ - name: relayer
description: the relayer address to which the distribution address is registered
in: path
required: true
@@ -13524,15 +13526,15 @@ definitions:
title: >-
PacketFee contains ICS29 relayer fees, refund address and optional list of
permitted relayers
- ibc.applications.fee.v1.QueryCounterpartyAddressResponse:
+ ibc.applications.fee.v1.QueryCounterpartyPayeeResponse:
type: object
properties:
- counterparty_address:
+ counterparty_payee:
type: string
- title: the counterparty address used to compensate forward relaying
+ title: the counterparty payee address used to compensate forward relaying
title: >-
- QueryCounterpartyAddressResponse defines the response type for the
- CounterpartyAddress rpc
+ QueryCounterpartyPayeeResponse defines the response type for the
+ CounterpartyPayee rpc
ibc.applications.fee.v1.QueryFeeEnabledChannelResponse:
type: object
properties:
diff --git a/docs/ibc/proto-docs.md b/docs/ibc/proto-docs.md
index 1641af76b8e..30c6d350bd1 100644
--- a/docs/ibc/proto-docs.md
+++ b/docs/ibc/proto-docs.md
@@ -45,8 +45,8 @@
- [Metadata](#ibc.applications.fee.v1.Metadata)
- [ibc/applications/fee/v1/query.proto](#ibc/applications/fee/v1/query.proto)
- - [QueryCounterpartyAddressRequest](#ibc.applications.fee.v1.QueryCounterpartyAddressRequest)
- - [QueryCounterpartyAddressResponse](#ibc.applications.fee.v1.QueryCounterpartyAddressResponse)
+ - [QueryCounterpartyPayeeRequest](#ibc.applications.fee.v1.QueryCounterpartyPayeeRequest)
+ - [QueryCounterpartyPayeeResponse](#ibc.applications.fee.v1.QueryCounterpartyPayeeResponse)
- [QueryFeeEnabledChannelRequest](#ibc.applications.fee.v1.QueryFeeEnabledChannelRequest)
- [QueryFeeEnabledChannelResponse](#ibc.applications.fee.v1.QueryFeeEnabledChannelResponse)
- [QueryFeeEnabledChannelsRequest](#ibc.applications.fee.v1.QueryFeeEnabledChannelsRequest)
@@ -940,31 +940,31 @@ See ICS004: https://github.com/cosmos/ibc/tree/master/spec/core/ics-004-channel-
-
+
-### QueryCounterpartyAddressRequest
-QueryCounterpartyAddressRequest defines the request type for the CounterpartyAddress rpc
+### QueryCounterpartyPayeeRequest
+QueryCounterpartyPayeeRequest defines the request type for the CounterpartyPayee rpc
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| `channel_id` | [string](#string) | | unique channel identifier |
-| `relayer_address` | [string](#string) | | the relayer address to which the counterparty is registered |
+| `relayer` | [string](#string) | | the relayer address to which the counterparty is registered |
-
+
-### QueryCounterpartyAddressResponse
-QueryCounterpartyAddressResponse defines the response type for the CounterpartyAddress rpc
+### QueryCounterpartyPayeeResponse
+QueryCounterpartyPayeeResponse defines the response type for the CounterpartyPayee rpc
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
-| `counterparty_address` | [string](#string) | | the counterparty address used to compensate forward relaying |
+| `counterparty_payee` | [string](#string) | | the counterparty payee address used to compensate forward relaying |
@@ -1138,7 +1138,7 @@ QueryPayeeRequest defines the request type for the Payee rpc
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| `channel_id` | [string](#string) | | unique channel identifier |
-| `relayer_address` | [string](#string) | | the relayer address to which the distribution address is registered |
+| `relayer` | [string](#string) | | the relayer address to which the distribution address is registered |
@@ -1269,8 +1269,8 @@ Query defines the ICS29 gRPC querier service.
| `TotalRecvFees` | [QueryTotalRecvFeesRequest](#ibc.applications.fee.v1.QueryTotalRecvFeesRequest) | [QueryTotalRecvFeesResponse](#ibc.applications.fee.v1.QueryTotalRecvFeesResponse) | TotalRecvFees returns the total receive fees for a packet given its identifier | GET|/ibc/apps/fee/v1/channels/{packet_id.channel_id}/ports/{packet_id.port_id}/sequences/{packet_id.sequence}/total_recv_fees|
| `TotalAckFees` | [QueryTotalAckFeesRequest](#ibc.applications.fee.v1.QueryTotalAckFeesRequest) | [QueryTotalAckFeesResponse](#ibc.applications.fee.v1.QueryTotalAckFeesResponse) | TotalAckFees returns the total acknowledgement fees for a packet given its identifier | GET|/ibc/apps/fee/v1/channels/{packet_id.channel_id}/ports/{packet_id.port_id}/sequences/{packet_id.sequence}/total_ack_fees|
| `TotalTimeoutFees` | [QueryTotalTimeoutFeesRequest](#ibc.applications.fee.v1.QueryTotalTimeoutFeesRequest) | [QueryTotalTimeoutFeesResponse](#ibc.applications.fee.v1.QueryTotalTimeoutFeesResponse) | TotalTimeoutFees returns the total timeout fees for a packet given its identifier | GET|/ibc/apps/fee/v1/channels/{packet_id.channel_id}/ports/{packet_id.port_id}/sequences/{packet_id.sequence}/total_timeout_fees|
-| `Payee` | [QueryPayeeRequest](#ibc.applications.fee.v1.QueryPayeeRequest) | [QueryPayeeResponse](#ibc.applications.fee.v1.QueryPayeeResponse) | Payee returns the registered payee address for a specific channel given the relayer address | GET|/ibc/apps/fee/v1/channels/{channel_id}/relayers/{relayer_address}/payee|
-| `CounterpartyAddress` | [QueryCounterpartyAddressRequest](#ibc.applications.fee.v1.QueryCounterpartyAddressRequest) | [QueryCounterpartyAddressResponse](#ibc.applications.fee.v1.QueryCounterpartyAddressResponse) | CounterpartyAddress returns the registered counterparty address for forward relaying | GET|/ibc/apps/fee/v1/channels/{channel_id}/relayers/{relayer_address}/counterparty_address|
+| `Payee` | [QueryPayeeRequest](#ibc.applications.fee.v1.QueryPayeeRequest) | [QueryPayeeResponse](#ibc.applications.fee.v1.QueryPayeeResponse) | Payee returns the registered payee address for a specific channel given the relayer address | GET|/ibc/apps/fee/v1/channels/{channel_id}/relayers/{relayer}/payee|
+| `CounterpartyPayee` | [QueryCounterpartyPayeeRequest](#ibc.applications.fee.v1.QueryCounterpartyPayeeRequest) | [QueryCounterpartyPayeeResponse](#ibc.applications.fee.v1.QueryCounterpartyPayeeResponse) | CounterpartyPayee returns the registered counterparty payee for forward relaying | GET|/ibc/apps/fee/v1/channels/{channel_id}/relayers/{relayer}/counterparty_payee|
| `FeeEnabledChannels` | [QueryFeeEnabledChannelsRequest](#ibc.applications.fee.v1.QueryFeeEnabledChannelsRequest) | [QueryFeeEnabledChannelsResponse](#ibc.applications.fee.v1.QueryFeeEnabledChannelsResponse) | FeeEnabledChannels returns a list of all fee enabled channels | GET|/ibc/apps/fee/v1/fee_enabled|
| `FeeEnabledChannel` | [QueryFeeEnabledChannelRequest](#ibc.applications.fee.v1.QueryFeeEnabledChannelRequest) | [QueryFeeEnabledChannelResponse](#ibc.applications.fee.v1.QueryFeeEnabledChannelResponse) | FeeEnabledChannel returns true if the provided port and channel identifiers belong to a fee enabled channel | GET|/ibc/apps/fee/v1/channels/{channel_id}/ports/{port_id}/fee_enabled|
diff --git a/modules/apps/29-fee/client/cli/cli.go b/modules/apps/29-fee/client/cli/cli.go
index d609104ba67..332493deec8 100644
--- a/modules/apps/29-fee/client/cli/cli.go
+++ b/modules/apps/29-fee/client/cli/cli.go
@@ -22,7 +22,7 @@ func GetQueryCmd() *cobra.Command {
GetCmdTotalTimeoutFees(),
GetCmdIncentivizedPacketsForChannel(),
GetCmdPayee(),
- GetCmdCounterpartyAddress(),
+ GetCmdCounterpartyPayee(),
GetCmdFeeEnabledChannel(),
GetCmdFeeEnabledChannels(),
)
diff --git a/modules/apps/29-fee/client/cli/query.go b/modules/apps/29-fee/client/cli/query.go
index 3cfdcb27b33..3714c576748 100644
--- a/modules/apps/29-fee/client/cli/query.go
+++ b/modules/apps/29-fee/client/cli/query.go
@@ -242,7 +242,7 @@ func GetCmdTotalTimeoutFees() *cobra.Command {
// GetCmdPayee returns the command handler for the Query/Payee rpc.
func GetCmdPayee() *cobra.Command {
cmd := &cobra.Command{
- Use: "payee [channel-id] [relayer-address]",
+ Use: "payee [channel-id] [relayer]",
Short: "Query the relayer payee address on a given channel",
Long: "Query the relayer payee address on a given channel",
Args: cobra.ExactArgs(2),
@@ -260,8 +260,8 @@ func GetCmdPayee() *cobra.Command {
queryClient := types.NewQueryClient(clientCtx)
req := &types.QueryPayeeRequest{
- ChannelId: args[0],
- RelayerAddress: args[1],
+ ChannelId: args[0],
+ Relayer: args[1],
}
res, err := queryClient.Payee(cmd.Context(), req)
@@ -278,14 +278,14 @@ func GetCmdPayee() *cobra.Command {
return cmd
}
-// GetCmdCounterpartyAddress returns the command handler for the Query/CounterpartyAddress rpc.
-func GetCmdCounterpartyAddress() *cobra.Command {
+// GetCmdCounterpartyPayee returns the command handler for the Query/CounterpartyPayee rpc.
+func GetCmdCounterpartyPayee() *cobra.Command {
cmd := &cobra.Command{
- Use: "counterparty-address [channel-id] [address]",
- Short: "Query the relayer counterparty address on a given channel",
- Long: "Query the relayer counterparty address on a given channel",
+ Use: "counterparty-payee [channel-id] [relayer]",
+ Short: "Query the relayer counterparty payee on a given channel",
+ Long: "Query the relayer counterparty payee on a given channel",
Args: cobra.ExactArgs(2),
- Example: fmt.Sprintf("%s query ibc-fee counterparty-address channel-5 cosmos1layxcsmyye0dc0har9sdfzwckaz8sjwlfsj8zs", version.AppName),
+ Example: fmt.Sprintf("%s query ibc-fee counterparty-payee channel-5 cosmos1layxcsmyye0dc0har9sdfzwckaz8sjwlfsj8zs", version.AppName),
RunE: func(cmd *cobra.Command, args []string) error {
clientCtx, err := client.GetClientQueryContext(cmd)
if err != nil {
@@ -298,12 +298,12 @@ func GetCmdCounterpartyAddress() *cobra.Command {
queryClient := types.NewQueryClient(clientCtx)
- req := &types.QueryCounterpartyAddressRequest{
- ChannelId: args[0],
- RelayerAddress: args[1],
+ req := &types.QueryCounterpartyPayeeRequest{
+ ChannelId: args[0],
+ Relayer: args[1],
}
- res, err := queryClient.CounterpartyAddress(cmd.Context(), req)
+ res, err := queryClient.CounterpartyPayee(cmd.Context(), req)
if err != nil {
return err
}
diff --git a/modules/apps/29-fee/keeper/genesis.go b/modules/apps/29-fee/keeper/genesis.go
index 6d6f01b7b34..24e5ddd1ece 100644
--- a/modules/apps/29-fee/keeper/genesis.go
+++ b/modules/apps/29-fee/keeper/genesis.go
@@ -34,7 +34,7 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState {
return &types.GenesisState{
IdentifiedFees: k.GetAllIdentifiedPacketFees(ctx),
FeeEnabledChannels: k.GetAllFeeEnabledChannels(ctx),
- RegisteredPayees: k.GetAllPayeeAddresses(ctx),
+ RegisteredPayees: k.GetAllPayees(ctx),
RegisteredCounterpartyPayees: k.GetAllCounterpartyPayees(ctx),
ForwardRelayers: k.GetAllForwardRelayerAddresses(ctx),
}
diff --git a/modules/apps/29-fee/keeper/grpc_query.go b/modules/apps/29-fee/keeper/grpc_query.go
index ec8bf2ea656..4abe16cbe90 100644
--- a/modules/apps/29-fee/keeper/grpc_query.go
+++ b/modules/apps/29-fee/keeper/grpc_query.go
@@ -179,9 +179,9 @@ func (k Keeper) Payee(goCtx context.Context, req *types.QueryPayeeRequest) (*typ
ctx := sdk.UnwrapSDKContext(goCtx)
- payeeAddr, found := k.GetPayeeAddress(ctx, req.RelayerAddress, req.ChannelId)
+ payeeAddr, found := k.GetPayeeAddress(ctx, req.Relayer, req.ChannelId)
if !found {
- return nil, status.Errorf(codes.NotFound, "payee address not found for address: %s on channel: %s", req.RelayerAddress, req.ChannelId)
+ return nil, status.Errorf(codes.NotFound, "payee address not found for address: %s on channel: %s", req.Relayer, req.ChannelId)
}
return &types.QueryPayeeResponse{
@@ -189,21 +189,21 @@ func (k Keeper) Payee(goCtx context.Context, req *types.QueryPayeeRequest) (*typ
}, nil
}
-// CounterpartyAddress implements the Query/CounterpartyAddress gRPC method and returns the registered counterparty address for forward relaying
-func (k Keeper) CounterpartyAddress(goCtx context.Context, req *types.QueryCounterpartyAddressRequest) (*types.QueryCounterpartyAddressResponse, error) {
+// CounterpartyPayee implements the Query/CounterpartyPayee gRPC method and returns the registered counterparty payee address for forward relaying
+func (k Keeper) CounterpartyPayee(goCtx context.Context, req *types.QueryCounterpartyPayeeRequest) (*types.QueryCounterpartyPayeeResponse, error) {
if req == nil {
return nil, status.Error(codes.InvalidArgument, "empty request")
}
ctx := sdk.UnwrapSDKContext(goCtx)
- counterpartyAddr, found := k.GetCounterpartyPayeeAddress(ctx, req.RelayerAddress, req.ChannelId)
+ counterpartyPayeeAddr, found := k.GetCounterpartyPayeeAddress(ctx, req.Relayer, req.ChannelId)
if !found {
- return nil, status.Errorf(codes.NotFound, "counterparty address not found for address: %s on channel: %s", req.RelayerAddress, req.ChannelId)
+ return nil, status.Errorf(codes.NotFound, "counterparty payee address not found for address: %s on channel: %s", req.Relayer, req.ChannelId)
}
- return &types.QueryCounterpartyAddressResponse{
- CounterpartyAddress: counterpartyAddr,
+ return &types.QueryCounterpartyPayeeResponse{
+ CounterpartyPayee: counterpartyPayeeAddr,
}, nil
}
diff --git a/modules/apps/29-fee/keeper/grpc_query_test.go b/modules/apps/29-fee/keeper/grpc_query_test.go
index 2f7b4f3f4bc..42a9091178a 100644
--- a/modules/apps/29-fee/keeper/grpc_query_test.go
+++ b/modules/apps/29-fee/keeper/grpc_query_test.go
@@ -432,7 +432,7 @@ func (suite *KeeperTestSuite) TestQueryPayee() {
{
"payee address not found: invalid relayer address",
func() {
- req.RelayerAddress = "invalid-addr"
+ req.Relayer = "invalid-addr"
},
false,
},
@@ -453,8 +453,8 @@ func (suite *KeeperTestSuite) TestQueryPayee() {
)
req = &types.QueryPayeeRequest{
- ChannelId: suite.path.EndpointA.ChannelID,
- RelayerAddress: suite.chainA.SenderAccount.GetAddress().String(),
+ ChannelId: suite.path.EndpointA.ChannelID,
+ Relayer: suite.chainA.SenderAccount.GetAddress().String(),
}
tc.malleate()
@@ -472,8 +472,8 @@ func (suite *KeeperTestSuite) TestQueryPayee() {
}
}
-func (suite *KeeperTestSuite) TestQueryCounterpartyAddress() {
- var req *types.QueryCounterpartyAddressRequest
+func (suite *KeeperTestSuite) TestQueryCounterpartyPayee() {
+ var req *types.QueryCounterpartyPayeeRequest
testCases := []struct {
name string
@@ -495,7 +495,7 @@ func (suite *KeeperTestSuite) TestQueryCounterpartyAddress() {
{
"counterparty address not found: invalid address",
func() {
- req.RelayerAddress = "invalid-addr"
+ req.Relayer = "invalid-addr"
},
false,
},
@@ -506,28 +506,28 @@ func (suite *KeeperTestSuite) TestQueryCounterpartyAddress() {
suite.SetupTest() // reset
pk := secp256k1.GenPrivKey().PubKey()
- expectedCounterpartyAddr := sdk.AccAddress(pk.Address())
+ expCounterpartyPayeeAddr := sdk.AccAddress(pk.Address())
suite.chainA.GetSimApp().IBCFeeKeeper.SetCounterpartyPayeeAddress(
suite.chainA.GetContext(),
suite.chainA.SenderAccount.GetAddress().String(),
- expectedCounterpartyAddr.String(),
+ expCounterpartyPayeeAddr.String(),
suite.path.EndpointA.ChannelID,
)
- req = &types.QueryCounterpartyAddressRequest{
- ChannelId: suite.path.EndpointA.ChannelID,
- RelayerAddress: suite.chainA.SenderAccount.GetAddress().String(),
+ req = &types.QueryCounterpartyPayeeRequest{
+ ChannelId: suite.path.EndpointA.ChannelID,
+ Relayer: suite.chainA.SenderAccount.GetAddress().String(),
}
tc.malleate()
ctx := sdk.WrapSDKContext(suite.chainA.GetContext())
- res, err := suite.queryClient.CounterpartyAddress(ctx, req)
+ res, err := suite.queryClient.CounterpartyPayee(ctx, req)
if tc.expPass {
suite.Require().NoError(err)
- suite.Require().Equal(expectedCounterpartyAddr.String(), res.CounterpartyAddress)
+ suite.Require().Equal(expCounterpartyPayeeAddr.String(), res.CounterpartyPayee)
} else {
suite.Require().Error(err)
}
diff --git a/modules/apps/29-fee/keeper/keeper.go b/modules/apps/29-fee/keeper/keeper.go
index 143acafb80d..c94f661c904 100644
--- a/modules/apps/29-fee/keeper/keeper.go
+++ b/modules/apps/29-fee/keeper/keeper.go
@@ -165,8 +165,8 @@ func (k Keeper) SetPayeeAddress(ctx sdk.Context, relayerAddr, payeeAddr, channel
store.Set(types.KeyPayee(relayerAddr, channelID), []byte(payeeAddr))
}
-// GetAllPayeeAddresses returns all registered payees addresses
-func (k Keeper) GetAllPayeeAddresses(ctx sdk.Context) []types.RegisteredPayee {
+// GetAllPayees returns all registered payees addresses
+func (k Keeper) GetAllPayees(ctx sdk.Context) []types.RegisteredPayee {
store := ctx.KVStore(k.storeKey)
iterator := sdk.KVStorePrefixIterator(store, []byte(types.PayeeKeyPrefix))
defer iterator.Close()
diff --git a/modules/apps/29-fee/keeper/keeper_test.go b/modules/apps/29-fee/keeper/keeper_test.go
index 1b6b0ede99f..f72888599e8 100644
--- a/modules/apps/29-fee/keeper/keeper_test.go
+++ b/modules/apps/29-fee/keeper/keeper_test.go
@@ -258,26 +258,7 @@ func (suite *KeeperTestSuite) TestGetAllFeeEnabledChannels() {
suite.Require().Equal(ch, expectedCh)
}
-func (suite *KeeperTestSuite) TestGetAllRelayerAddresses() {
- relayerAddr := suite.chainA.SenderAccount.GetAddress().String()
- counterpartyPayee := suite.chainB.SenderAccount.GetAddress().String()
-
- suite.chainA.GetSimApp().IBCFeeKeeper.SetCounterpartyPayeeAddress(suite.chainA.GetContext(), relayerAddr, counterpartyPayee, ibctesting.FirstChannelID)
-
- expectedCounterpartyPayee := []types.RegisteredCounterpartyPayee{
- {
- Relayer: relayerAddr,
- CounterpartyPayee: counterpartyPayee,
- ChannelId: ibctesting.FirstChannelID,
- },
- }
-
- counterpartyPayeeAddr := suite.chainA.GetSimApp().IBCFeeKeeper.GetAllCounterpartyPayees(suite.chainA.GetContext())
- suite.Require().Len(counterpartyPayeeAddr, len(expectedCounterpartyPayee))
- suite.Require().Equal(counterpartyPayeeAddr, expectedCounterpartyPayee)
-}
-
-func (suite *KeeperTestSuite) TestGetAllPayeeAddresses() {
+func (suite *KeeperTestSuite) TestGetAllPayees() {
var expectedPayees []types.RegisteredPayee
for i := 0; i < 3; i++ {
@@ -297,7 +278,26 @@ func (suite *KeeperTestSuite) TestGetAllPayeeAddresses() {
expectedPayees = append(expectedPayees, registeredPayee)
}
- registeredPayees := suite.chainA.GetSimApp().IBCFeeKeeper.GetAllPayeeAddresses(suite.chainA.GetContext())
+ registeredPayees := suite.chainA.GetSimApp().IBCFeeKeeper.GetAllPayees(suite.chainA.GetContext())
suite.Require().Len(registeredPayees, len(expectedPayees))
suite.Require().ElementsMatch(expectedPayees, registeredPayees)
}
+
+func (suite *KeeperTestSuite) TestGetAllCounterpartyPayees() {
+ relayerAddr := suite.chainA.SenderAccount.GetAddress().String()
+ counterpartyPayee := suite.chainB.SenderAccount.GetAddress().String()
+
+ suite.chainA.GetSimApp().IBCFeeKeeper.SetCounterpartyPayeeAddress(suite.chainA.GetContext(), relayerAddr, counterpartyPayee, ibctesting.FirstChannelID)
+
+ expectedCounterpartyPayee := []types.RegisteredCounterpartyPayee{
+ {
+ Relayer: relayerAddr,
+ CounterpartyPayee: counterpartyPayee,
+ ChannelId: ibctesting.FirstChannelID,
+ },
+ }
+
+ counterpartyPayeeAddr := suite.chainA.GetSimApp().IBCFeeKeeper.GetAllCounterpartyPayees(suite.chainA.GetContext())
+ suite.Require().Len(counterpartyPayeeAddr, len(expectedCounterpartyPayee))
+ suite.Require().Equal(counterpartyPayeeAddr, expectedCounterpartyPayee)
+}
diff --git a/modules/apps/29-fee/types/query.pb.go b/modules/apps/29-fee/types/query.pb.go
index 9d0de9110a5..46e12a4e437 100644
--- a/modules/apps/29-fee/types/query.pb.go
+++ b/modules/apps/29-fee/types/query.pb.go
@@ -642,7 +642,7 @@ type QueryPayeeRequest struct {
// unique channel identifier
ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
// the relayer address to which the distribution address is registered
- RelayerAddress string `protobuf:"bytes,2,opt,name=relayer_address,json=relayerAddress,proto3" json:"relayer_address,omitempty" yaml:"relayer_address"`
+ Relayer string `protobuf:"bytes,2,opt,name=relayer,proto3" json:"relayer,omitempty"`
}
func (m *QueryPayeeRequest) Reset() { *m = QueryPayeeRequest{} }
@@ -685,9 +685,9 @@ func (m *QueryPayeeRequest) GetChannelId() string {
return ""
}
-func (m *QueryPayeeRequest) GetRelayerAddress() string {
+func (m *QueryPayeeRequest) GetRelayer() string {
if m != nil {
- return m.RelayerAddress
+ return m.Relayer
}
return ""
}
@@ -738,26 +738,26 @@ func (m *QueryPayeeResponse) GetPayeeAddress() string {
return ""
}
-// QueryCounterpartyAddressRequest defines the request type for the CounterpartyAddress rpc
-type QueryCounterpartyAddressRequest struct {
+// QueryCounterpartyPayeeRequest defines the request type for the CounterpartyPayee rpc
+type QueryCounterpartyPayeeRequest struct {
// unique channel identifier
ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"`
// the relayer address to which the counterparty is registered
- RelayerAddress string `protobuf:"bytes,2,opt,name=relayer_address,json=relayerAddress,proto3" json:"relayer_address,omitempty" yaml:"relayer_address"`
+ Relayer string `protobuf:"bytes,2,opt,name=relayer,proto3" json:"relayer,omitempty"`
}
-func (m *QueryCounterpartyAddressRequest) Reset() { *m = QueryCounterpartyAddressRequest{} }
-func (m *QueryCounterpartyAddressRequest) String() string { return proto.CompactTextString(m) }
-func (*QueryCounterpartyAddressRequest) ProtoMessage() {}
-func (*QueryCounterpartyAddressRequest) Descriptor() ([]byte, []int) {
+func (m *QueryCounterpartyPayeeRequest) Reset() { *m = QueryCounterpartyPayeeRequest{} }
+func (m *QueryCounterpartyPayeeRequest) String() string { return proto.CompactTextString(m) }
+func (*QueryCounterpartyPayeeRequest) ProtoMessage() {}
+func (*QueryCounterpartyPayeeRequest) Descriptor() ([]byte, []int) {
return fileDescriptor_0638a8a78ca2503c, []int{14}
}
-func (m *QueryCounterpartyAddressRequest) XXX_Unmarshal(b []byte) error {
+func (m *QueryCounterpartyPayeeRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
}
-func (m *QueryCounterpartyAddressRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *QueryCounterpartyPayeeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
if deterministic {
- return xxx_messageInfo_QueryCounterpartyAddressRequest.Marshal(b, m, deterministic)
+ return xxx_messageInfo_QueryCounterpartyPayeeRequest.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
n, err := m.MarshalToSizedBuffer(b)
@@ -767,50 +767,50 @@ func (m *QueryCounterpartyAddressRequest) XXX_Marshal(b []byte, deterministic bo
return b[:n], nil
}
}
-func (m *QueryCounterpartyAddressRequest) XXX_Merge(src proto.Message) {
- xxx_messageInfo_QueryCounterpartyAddressRequest.Merge(m, src)
+func (m *QueryCounterpartyPayeeRequest) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_QueryCounterpartyPayeeRequest.Merge(m, src)
}
-func (m *QueryCounterpartyAddressRequest) XXX_Size() int {
+func (m *QueryCounterpartyPayeeRequest) XXX_Size() int {
return m.Size()
}
-func (m *QueryCounterpartyAddressRequest) XXX_DiscardUnknown() {
- xxx_messageInfo_QueryCounterpartyAddressRequest.DiscardUnknown(m)
+func (m *QueryCounterpartyPayeeRequest) XXX_DiscardUnknown() {
+ xxx_messageInfo_QueryCounterpartyPayeeRequest.DiscardUnknown(m)
}
-var xxx_messageInfo_QueryCounterpartyAddressRequest proto.InternalMessageInfo
+var xxx_messageInfo_QueryCounterpartyPayeeRequest proto.InternalMessageInfo
-func (m *QueryCounterpartyAddressRequest) GetChannelId() string {
+func (m *QueryCounterpartyPayeeRequest) GetChannelId() string {
if m != nil {
return m.ChannelId
}
return ""
}
-func (m *QueryCounterpartyAddressRequest) GetRelayerAddress() string {
+func (m *QueryCounterpartyPayeeRequest) GetRelayer() string {
if m != nil {
- return m.RelayerAddress
+ return m.Relayer
}
return ""
}
-// QueryCounterpartyAddressResponse defines the response type for the CounterpartyAddress rpc
-type QueryCounterpartyAddressResponse struct {
- // the counterparty address used to compensate forward relaying
- CounterpartyAddress string `protobuf:"bytes,1,opt,name=counterparty_address,json=counterpartyAddress,proto3" json:"counterparty_address,omitempty" yaml:"counterparty_address"`
+// QueryCounterpartyPayeeResponse defines the response type for the CounterpartyPayee rpc
+type QueryCounterpartyPayeeResponse struct {
+ // the counterparty payee address used to compensate forward relaying
+ CounterpartyPayee string `protobuf:"bytes,1,opt,name=counterparty_payee,json=counterpartyPayee,proto3" json:"counterparty_payee,omitempty" yaml:"counterparty_payee"`
}
-func (m *QueryCounterpartyAddressResponse) Reset() { *m = QueryCounterpartyAddressResponse{} }
-func (m *QueryCounterpartyAddressResponse) String() string { return proto.CompactTextString(m) }
-func (*QueryCounterpartyAddressResponse) ProtoMessage() {}
-func (*QueryCounterpartyAddressResponse) Descriptor() ([]byte, []int) {
+func (m *QueryCounterpartyPayeeResponse) Reset() { *m = QueryCounterpartyPayeeResponse{} }
+func (m *QueryCounterpartyPayeeResponse) String() string { return proto.CompactTextString(m) }
+func (*QueryCounterpartyPayeeResponse) ProtoMessage() {}
+func (*QueryCounterpartyPayeeResponse) Descriptor() ([]byte, []int) {
return fileDescriptor_0638a8a78ca2503c, []int{15}
}
-func (m *QueryCounterpartyAddressResponse) XXX_Unmarshal(b []byte) error {
+func (m *QueryCounterpartyPayeeResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
}
-func (m *QueryCounterpartyAddressResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+func (m *QueryCounterpartyPayeeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
if deterministic {
- return xxx_messageInfo_QueryCounterpartyAddressResponse.Marshal(b, m, deterministic)
+ return xxx_messageInfo_QueryCounterpartyPayeeResponse.Marshal(b, m, deterministic)
} else {
b = b[:cap(b)]
n, err := m.MarshalToSizedBuffer(b)
@@ -820,21 +820,21 @@ func (m *QueryCounterpartyAddressResponse) XXX_Marshal(b []byte, deterministic b
return b[:n], nil
}
}
-func (m *QueryCounterpartyAddressResponse) XXX_Merge(src proto.Message) {
- xxx_messageInfo_QueryCounterpartyAddressResponse.Merge(m, src)
+func (m *QueryCounterpartyPayeeResponse) XXX_Merge(src proto.Message) {
+ xxx_messageInfo_QueryCounterpartyPayeeResponse.Merge(m, src)
}
-func (m *QueryCounterpartyAddressResponse) XXX_Size() int {
+func (m *QueryCounterpartyPayeeResponse) XXX_Size() int {
return m.Size()
}
-func (m *QueryCounterpartyAddressResponse) XXX_DiscardUnknown() {
- xxx_messageInfo_QueryCounterpartyAddressResponse.DiscardUnknown(m)
+func (m *QueryCounterpartyPayeeResponse) XXX_DiscardUnknown() {
+ xxx_messageInfo_QueryCounterpartyPayeeResponse.DiscardUnknown(m)
}
-var xxx_messageInfo_QueryCounterpartyAddressResponse proto.InternalMessageInfo
+var xxx_messageInfo_QueryCounterpartyPayeeResponse proto.InternalMessageInfo
-func (m *QueryCounterpartyAddressResponse) GetCounterpartyAddress() string {
+func (m *QueryCounterpartyPayeeResponse) GetCounterpartyPayee() string {
if m != nil {
- return m.CounterpartyAddress
+ return m.CounterpartyPayee
}
return ""
}
@@ -1056,8 +1056,8 @@ func init() {
proto.RegisterType((*QueryTotalTimeoutFeesResponse)(nil), "ibc.applications.fee.v1.QueryTotalTimeoutFeesResponse")
proto.RegisterType((*QueryPayeeRequest)(nil), "ibc.applications.fee.v1.QueryPayeeRequest")
proto.RegisterType((*QueryPayeeResponse)(nil), "ibc.applications.fee.v1.QueryPayeeResponse")
- proto.RegisterType((*QueryCounterpartyAddressRequest)(nil), "ibc.applications.fee.v1.QueryCounterpartyAddressRequest")
- proto.RegisterType((*QueryCounterpartyAddressResponse)(nil), "ibc.applications.fee.v1.QueryCounterpartyAddressResponse")
+ proto.RegisterType((*QueryCounterpartyPayeeRequest)(nil), "ibc.applications.fee.v1.QueryCounterpartyPayeeRequest")
+ proto.RegisterType((*QueryCounterpartyPayeeResponse)(nil), "ibc.applications.fee.v1.QueryCounterpartyPayeeResponse")
proto.RegisterType((*QueryFeeEnabledChannelsRequest)(nil), "ibc.applications.fee.v1.QueryFeeEnabledChannelsRequest")
proto.RegisterType((*QueryFeeEnabledChannelsResponse)(nil), "ibc.applications.fee.v1.QueryFeeEnabledChannelsResponse")
proto.RegisterType((*QueryFeeEnabledChannelRequest)(nil), "ibc.applications.fee.v1.QueryFeeEnabledChannelRequest")
@@ -1069,92 +1069,91 @@ func init() {
}
var fileDescriptor_0638a8a78ca2503c = []byte{
- // 1358 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcd, 0x6f, 0x1b, 0x45,
- 0x1c, 0xcd, 0xa4, 0x5f, 0xc9, 0x24, 0xfd, 0xc8, 0x38, 0xb4, 0xa9, 0x49, 0xec, 0x74, 0x4a, 0x21,
- 0xa4, 0xca, 0xae, 0xe2, 0xd0, 0xa6, 0x45, 0x42, 0xa2, 0x76, 0x49, 0x09, 0x08, 0x35, 0x6c, 0x2b,
- 0x04, 0x08, 0x70, 0xd7, 0xbb, 0x63, 0x67, 0x15, 0x67, 0x67, 0xbb, 0xbb, 0xb6, 0x70, 0xd3, 0x00,
- 0xad, 0x88, 0x40, 0x80, 0x00, 0x09, 0x89, 0x03, 0xe2, 0x8a, 0x90, 0x90, 0x38, 0x70, 0xe4, 0x3f,
- 0xe8, 0x09, 0x45, 0xe2, 0xc2, 0xc9, 0xa0, 0x84, 0x13, 0x47, 0x9f, 0x38, 0x00, 0x42, 0x3b, 0x33,
- 0x6b, 0xaf, 0xb3, 0xbb, 0x89, 0x9d, 0x46, 0x81, 0x53, 0xec, 0xf9, 0x7d, 0xcc, 0x7b, 0x6f, 0x7e,
- 0xbb, 0xf3, 0x1c, 0x78, 0xd6, 0x28, 0x68, 0xb2, 0x6a, 0x59, 0x65, 0x43, 0x53, 0x5d, 0x83, 0x9a,
- 0x8e, 0x5c, 0x24, 0x44, 0xae, 0x4e, 0xcb, 0xb7, 0x2b, 0xc4, 0xae, 0x49, 0x96, 0x4d, 0x5d, 0x8a,
- 0x4e, 0x19, 0x05, 0x4d, 0x0a, 0x26, 0x49, 0x45, 0x42, 0xa4, 0xea, 0x74, 0x72, 0xb8, 0x44, 0x4b,
- 0x94, 0xe5, 0xc8, 0xde, 0x27, 0x9e, 0x9e, 0x1c, 0x2d, 0x51, 0x5a, 0x2a, 0x13, 0x59, 0xb5, 0x0c,
- 0x59, 0x35, 0x4d, 0xea, 0x8a, 0x22, 0x1e, 0x4d, 0x69, 0xd4, 0x59, 0xa6, 0x8e, 0x5c, 0x50, 0x1d,
- 0x6f, 0xa3, 0x02, 0x71, 0xd5, 0x69, 0x59, 0xa3, 0x86, 0x29, 0xe2, 0x93, 0xc1, 0x38, 0x43, 0xd1,
- 0xcc, 0xb2, 0xd4, 0x92, 0x61, 0xb2, 0x66, 0x22, 0xf7, 0x4c, 0x1c, 0x7a, 0x0f, 0x1f, 0x4f, 0x39,
- 0x17, 0x97, 0x52, 0x22, 0x26, 0x71, 0x0c, 0x27, 0xd8, 0x49, 0xa3, 0x36, 0x91, 0xb5, 0x45, 0xd5,
- 0x34, 0x49, 0xd9, 0x4b, 0x11, 0x1f, 0x79, 0x0a, 0xfe, 0x04, 0xc0, 0xf4, 0xcb, 0x1e, 0x9e, 0x79,
- 0x53, 0x23, 0xa6, 0x6b, 0x54, 0x8d, 0x3b, 0x44, 0x5f, 0x50, 0xb5, 0x25, 0xe2, 0x3a, 0x0a, 0xb9,
- 0x5d, 0x21, 0x8e, 0x8b, 0xe6, 0x20, 0x6c, 0x81, 0x1c, 0x01, 0xe3, 0x60, 0x62, 0x20, 0xf3, 0xb8,
- 0xc4, 0x19, 0x49, 0x1e, 0x23, 0x89, 0xeb, 0x2a, 0x18, 0x49, 0x0b, 0x6a, 0x89, 0x88, 0x5a, 0x25,
- 0x50, 0x89, 0xce, 0xc0, 0x41, 0x96, 0x98, 0x5f, 0x24, 0x46, 0x69, 0xd1, 0x1d, 0xe9, 0x1d, 0x07,
- 0x13, 0x07, 0x95, 0x01, 0xb6, 0xf6, 0x3c, 0x5b, 0xc2, 0x1f, 0x01, 0x38, 0x1e, 0x0f, 0xc7, 0xb1,
- 0xa8, 0xe9, 0x10, 0x54, 0x84, 0xc3, 0x46, 0x20, 0x9c, 0xb7, 0x78, 0x7c, 0x04, 0x8c, 0x1f, 0x98,
- 0x18, 0xc8, 0x4c, 0x49, 0x31, 0x07, 0x2b, 0xcd, 0xeb, 0x5e, 0x4d, 0xd1, 0xf0, 0x3b, 0xce, 0x11,
- 0xe2, 0x64, 0x0f, 0x3e, 0xa8, 0xa7, 0x7b, 0x94, 0x84, 0x11, 0xde, 0x0f, 0xaf, 0x01, 0x98, 0x8a,
- 0x01, 0xe3, 0x4b, 0xf3, 0x2c, 0xec, 0xe7, 0xbb, 0xe7, 0x0d, 0x5d, 0x28, 0x33, 0xc6, 0xf6, 0xf7,
- 0x54, 0x97, 0x7c, 0xa9, 0xab, 0x9e, 0x26, 0x5e, 0xd6, 0xbc, 0x2e, 0xf6, 0xeb, 0xb3, 0xc4, 0xf7,
- 0x4e, 0x44, 0xf9, 0x20, 0xfe, 0x8c, 0x9a, 0x9a, 0xe8, 0x30, 0x11, 0xa1, 0x89, 0x80, 0xb4, 0x2b,
- 0x49, 0x50, 0x58, 0x12, 0xfc, 0x13, 0x80, 0x4f, 0xc6, 0x1d, 0xcf, 0x1c, 0xb5, 0x73, 0x9c, 0xef,
- 0x5e, 0xcf, 0xcd, 0x29, 0x78, 0xc4, 0xa2, 0x36, 0x93, 0xd8, 0x53, 0xa7, 0x5f, 0x39, 0xec, 0x7d,
- 0x9d, 0xd7, 0xd1, 0x18, 0x84, 0x42, 0x62, 0x2f, 0x76, 0x80, 0xc5, 0xfa, 0xc5, 0x4a, 0x84, 0xb4,
- 0x07, 0xc3, 0xd2, 0x7e, 0x0a, 0xe0, 0x64, 0x27, 0x84, 0x84, 0xca, 0xb7, 0xf6, 0x70, 0xf2, 0xa2,
- 0x67, 0xee, 0x4d, 0x78, 0x9a, 0xe1, 0xb9, 0x49, 0x5d, 0xb5, 0xac, 0x10, 0xad, 0xca, 0x52, 0xf7,
- 0x6a, 0xda, 0xf0, 0x57, 0x00, 0x26, 0xa3, 0xfa, 0x0b, 0x7e, 0x77, 0x61, 0xbf, 0x4d, 0xb4, 0x6a,
- 0xbe, 0x48, 0x88, 0x4f, 0xea, 0x74, 0xdb, 0x81, 0xf9, 0x47, 0x95, 0xa3, 0x86, 0x99, 0xbd, 0xea,
- 0x35, 0x6f, 0xd4, 0xd3, 0x27, 0x6a, 0xea, 0x72, 0xf9, 0x69, 0xdc, 0xac, 0xc4, 0xdf, 0xfd, 0x9a,
- 0x9e, 0x28, 0x19, 0xee, 0x62, 0xa5, 0x20, 0x69, 0x74, 0x59, 0x16, 0xef, 0x3e, 0xfe, 0x67, 0xca,
- 0xd1, 0x97, 0x64, 0xb7, 0x66, 0x11, 0x87, 0x35, 0x71, 0x94, 0x3e, 0x5b, 0xa0, 0xc0, 0x6f, 0xc0,
- 0x91, 0x16, 0xb6, 0x2b, 0xda, 0xd2, 0xde, 0x52, 0xff, 0x12, 0x04, 0xa5, 0x6d, 0xb6, 0x17, 0xcc,
- 0x6b, 0xb0, 0x4f, 0xd5, 0x96, 0x3a, 0x24, 0x9e, 0x13, 0xc4, 0x8f, 0x73, 0xe2, 0x7e, 0x61, 0x77,
- 0xbc, 0x8f, 0xa8, 0x1c, 0x02, 0xbe, 0x05, 0x47, 0x5b, 0xb8, 0x6e, 0x1a, 0xcb, 0x84, 0x56, 0xdc,
- 0xbd, 0xa5, 0xfe, 0x2d, 0x80, 0x63, 0x31, 0x5b, 0x08, 0xfa, 0x6b, 0x00, 0x0e, 0xba, 0x7c, 0xbd,
- 0x43, 0x0d, 0xae, 0x09, 0x0d, 0x12, 0x5c, 0x83, 0x60, 0x71, 0x77, 0x3a, 0x0c, 0xb8, 0x2d, 0x3c,
- 0xde, 0xf3, 0x38, 0xc4, 0x90, 0x2e, 0xa8, 0x35, 0xe2, 0xbf, 0x0c, 0xd0, 0x53, 0x6d, 0xcf, 0xb9,
- 0x27, 0x41, 0x7f, 0xf6, 0x91, 0x46, 0x3d, 0x3d, 0xc4, 0xf7, 0x6e, 0xc5, 0x70, 0xf0, 0xf1, 0xcf,
- 0xc1, 0xe3, 0x36, 0x29, 0xab, 0x35, 0x62, 0xe7, 0x55, 0x5d, 0xb7, 0x89, 0xe3, 0xf0, 0xd7, 0x47,
- 0x36, 0xd9, 0xa8, 0xa7, 0x4f, 0xfa, 0x33, 0xdb, 0x96, 0x80, 0x95, 0x63, 0x62, 0xe5, 0x8a, 0x58,
- 0xb8, 0x01, 0x51, 0x10, 0x8f, 0x90, 0xeb, 0x19, 0x78, 0xd4, 0xf2, 0x16, 0x9a, 0x8d, 0x39, 0xa6,
- 0x91, 0x46, 0x3d, 0x3d, 0xcc, 0x1b, 0xb7, 0x85, 0xb1, 0x32, 0xc8, 0xbe, 0xfb, 0x4d, 0xbf, 0xf6,
- 0x5f, 0xe8, 0x39, 0x5a, 0x31, 0x5d, 0x62, 0x5b, 0xaa, 0xed, 0xd6, 0x44, 0xf0, 0x7f, 0xc0, 0xb9,
- 0x2a, 0xee, 0xe0, 0x48, 0x74, 0x42, 0x01, 0x05, 0x0e, 0x6b, 0x81, 0xf0, 0x16, 0x21, 0xd2, 0x8d,
- 0x7a, 0xfa, 0x51, 0x01, 0x34, 0x22, 0x0b, 0x2b, 0x09, 0x2d, 0xdc, 0x1b, 0x7f, 0xec, 0xdf, 0xb7,
- 0x73, 0x84, 0x3c, 0x67, 0xaa, 0x85, 0x32, 0xd1, 0xc5, 0x0b, 0xf8, 0xbf, 0xb0, 0x22, 0xdf, 0xf8,
- 0x87, 0x14, 0x85, 0x46, 0xa8, 0x70, 0x0f, 0xc0, 0xe1, 0x22, 0x21, 0x79, 0xc2, 0xe3, 0x79, 0x71,
- 0x10, 0xfe, 0xe3, 0x33, 0x19, 0x7b, 0x21, 0x84, 0x7a, 0x66, 0xcf, 0x8a, 0xe7, 0x49, 0xc8, 0x16,
- 0xd5, 0x15, 0x2b, 0xa8, 0x18, 0xc2, 0x82, 0xef, 0xfb, 0x0f, 0x77, 0xa8, 0xa7, 0x2f, 0xda, 0xf9,
- 0xd6, 0xfd, 0xc9, 0x8f, 0x07, 0x35, 0xea, 0xe9, 0x63, 0x62, 0x4e, 0x79, 0x00, 0x37, 0xef, 0xd4,
- 0xf6, 0xb9, 0xeb, 0xed, 0x6c, 0xee, 0xf0, 0x6b, 0x71, 0x27, 0xd7, 0x94, 0x6a, 0x16, 0x0e, 0x04,
- 0x38, 0x31, 0x20, 0x7d, 0xd9, 0x93, 0x8d, 0x7a, 0x1a, 0x85, 0x08, 0x63, 0x05, 0xb6, 0x78, 0x66,
- 0xfe, 0x19, 0x82, 0x87, 0x58, 0x6f, 0xf4, 0x23, 0x80, 0x89, 0x88, 0x7b, 0x1a, 0x5d, 0x8a, 0x95,
- 0x79, 0x07, 0x67, 0x9b, 0xbc, 0xbc, 0x8b, 0x4a, 0xce, 0x07, 0x4f, 0xdd, 0xff, 0xf9, 0xf7, 0x2f,
- 0x7a, 0x9f, 0x40, 0xe7, 0x64, 0xe1, 0xc5, 0x9b, 0x1e, 0x3c, 0xca, 0x21, 0xa0, 0xcf, 0x7a, 0x21,
- 0x0a, 0xb7, 0x43, 0xb3, 0xdd, 0x02, 0xf0, 0x91, 0x5f, 0xea, 0xbe, 0x50, 0x00, 0x5f, 0x03, 0x0c,
- 0xf9, 0xbb, 0x68, 0x35, 0x84, 0xdc, 0x1f, 0x34, 0x79, 0xa5, 0x79, 0xe1, 0x48, 0xad, 0x03, 0x5f,
- 0x95, 0xbd, 0x11, 0x69, 0x0b, 0x8a, 0xe9, 0x59, 0x95, 0x1d, 0x0f, 0x96, 0xa9, 0x91, 0xb6, 0xa8,
- 0xbf, 0xb8, 0x1a, 0x25, 0x09, 0xfa, 0x1b, 0xc0, 0xb1, 0x6d, 0x5d, 0x17, 0xca, 0x76, 0x7d, 0x3a,
- 0x21, 0x0f, 0x9a, 0xcc, 0x3d, 0x54, 0x0f, 0x21, 0xd9, 0x0d, 0xa6, 0xd8, 0x4b, 0xe8, 0xc5, 0x6d,
- 0x14, 0x8b, 0xd2, 0xc9, 0x57, 0x27, 0x72, 0x22, 0xfe, 0x02, 0xf0, 0x68, 0x9b, 0x0b, 0x43, 0x99,
- 0xed, 0xb1, 0x46, 0x59, 0xc2, 0xe4, 0x4c, 0x57, 0x35, 0x82, 0xcf, 0x3d, 0x3e, 0x02, 0x2b, 0xa8,
- 0xb6, 0x7f, 0x23, 0xe0, 0x7a, 0x48, 0xf2, 0x4d, 0x8f, 0x88, 0xfe, 0x04, 0x70, 0x30, 0xe8, 0xc4,
- 0xd0, 0x74, 0x07, 0x4c, 0xda, 0x4d, 0x61, 0x32, 0xd3, 0x4d, 0x89, 0xe0, 0xfe, 0x1e, 0xe7, 0x7e,
- 0x07, 0xbd, 0xbd, 0xdf, 0xdc, 0x7d, 0x9b, 0x88, 0x3e, 0xec, 0x85, 0x27, 0xb6, 0x3a, 0x31, 0x74,
- 0xa1, 0x03, 0x2e, 0x61, 0x73, 0x98, 0xbc, 0xd8, 0x6d, 0x99, 0x90, 0xe1, 0x7d, 0x2e, 0xc3, 0x3b,
- 0xe8, 0xee, 0x7e, 0xcb, 0x10, 0x74, 0x8a, 0xe8, 0x07, 0x00, 0x0f, 0x31, 0x6b, 0x85, 0x26, 0xb7,
- 0x27, 0x12, 0xf4, 0x83, 0xc9, 0xf3, 0x1d, 0xe5, 0x0a, 0xa6, 0xd7, 0x19, 0xd1, 0x79, 0x74, 0xad,
- 0xc3, 0x87, 0x57, 0x98, 0x21, 0x47, 0x5e, 0xd9, 0x62, 0x94, 0x56, 0x65, 0x66, 0xe2, 0xd0, 0x1f,
- 0x00, 0x26, 0x22, 0xac, 0xd1, 0x4e, 0xd7, 0x50, 0xbc, 0xd7, 0xdb, 0xe9, 0x1a, 0xda, 0xc6, 0x87,
- 0xe1, 0xb7, 0x18, 0xbb, 0x57, 0xd1, 0x2b, 0x0f, 0xcf, 0x2e, 0xca, 0xa9, 0xa1, 0xef, 0x01, 0x44,
- 0x61, 0x03, 0xb4, 0xd3, 0xbd, 0x15, 0x6b, 0xe0, 0x76, 0xba, 0xb7, 0xe2, 0xbd, 0x16, 0x7e, 0x8c,
- 0x31, 0x4d, 0xa1, 0xd1, 0x10, 0xd3, 0x80, 0x75, 0x40, 0xeb, 0x00, 0x0e, 0x85, 0x9a, 0xa0, 0x8b,
- 0x5d, 0xee, 0xea, 0xa3, 0x9d, 0xed, 0xba, 0x4e, 0x80, 0x7d, 0x81, 0x81, 0xbd, 0x8a, 0xb2, 0xbb,
- 0xbc, 0x31, 0x02, 0x94, 0xb2, 0xd7, 0x1f, 0x6c, 0xa4, 0xc0, 0xfa, 0x46, 0x0a, 0xfc, 0xb6, 0x91,
- 0x02, 0x9f, 0x6f, 0xa6, 0x7a, 0xd6, 0x37, 0x53, 0x3d, 0xbf, 0x6c, 0xa6, 0x7a, 0x5e, 0xbf, 0x10,
- 0xfe, 0x91, 0x65, 0x14, 0xb4, 0xa9, 0x12, 0x95, 0xab, 0x33, 0xf2, 0x32, 0xd5, 0x2b, 0x65, 0xe2,
- 0xf0, 0xcd, 0x33, 0x97, 0xa7, 0xbc, 0xfd, 0xd9, 0xef, 0xae, 0xc2, 0x61, 0xf6, 0xaf, 0xbf, 0x99,
- 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x64, 0x8c, 0x96, 0x8a, 0x27, 0x15, 0x00, 0x00,
+ // 1338 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x5d, 0x6f, 0xdb, 0x54,
+ 0x18, 0xee, 0xe9, 0x3e, 0xda, 0x9e, 0x76, 0xb0, 0x9c, 0x16, 0x96, 0x86, 0x36, 0xe9, 0x3c, 0x06,
+ 0xa5, 0x53, 0x6d, 0x35, 0x65, 0x74, 0x43, 0x42, 0xd0, 0x74, 0x74, 0x14, 0x06, 0x94, 0xac, 0x37,
+ 0x20, 0x50, 0xe6, 0x38, 0x27, 0xa9, 0xd5, 0xd4, 0xc7, 0xb3, 0x9d, 0x88, 0xac, 0x2b, 0xb0, 0x89,
+ 0x0a, 0x04, 0x08, 0x90, 0x90, 0xb8, 0xe0, 0x1e, 0x21, 0x90, 0xf8, 0x01, 0xfc, 0x83, 0x5d, 0xa1,
+ 0x4a, 0xdc, 0x20, 0x2e, 0x02, 0x6a, 0x11, 0x3f, 0x20, 0x57, 0x5c, 0x80, 0x84, 0x7c, 0xce, 0xeb,
+ 0xc4, 0x99, 0xed, 0x36, 0x29, 0xa5, 0x5c, 0xd5, 0xf6, 0x79, 0x3f, 0x9e, 0xe7, 0x39, 0xaf, 0x7d,
+ 0x9e, 0x14, 0x9f, 0xd3, 0xf3, 0x9a, 0xa2, 0x9a, 0x66, 0x59, 0xd7, 0x54, 0x47, 0x67, 0x86, 0xad,
+ 0x14, 0x29, 0x55, 0xaa, 0x33, 0xca, 0xcd, 0x0a, 0xb5, 0x6a, 0xb2, 0x69, 0x31, 0x87, 0x91, 0x33,
+ 0x7a, 0x5e, 0x93, 0xfd, 0x41, 0x72, 0x91, 0x52, 0xb9, 0x3a, 0x93, 0x18, 0x29, 0xb1, 0x12, 0xe3,
+ 0x31, 0x8a, 0x7b, 0x25, 0xc2, 0x13, 0x63, 0x25, 0xc6, 0x4a, 0x65, 0xaa, 0xa8, 0xa6, 0xae, 0xa8,
+ 0x86, 0xc1, 0x1c, 0x48, 0x12, 0xab, 0x49, 0x8d, 0xd9, 0xeb, 0xcc, 0x56, 0xf2, 0xaa, 0xed, 0x36,
+ 0xca, 0x53, 0x47, 0x9d, 0x51, 0x34, 0xa6, 0x1b, 0xb0, 0x3e, 0xe5, 0x5f, 0xe7, 0x28, 0x9a, 0x51,
+ 0xa6, 0x5a, 0xd2, 0x0d, 0x5e, 0x0c, 0x62, 0xcf, 0x46, 0xa1, 0x77, 0xf1, 0x89, 0x90, 0xf3, 0x51,
+ 0x21, 0x25, 0x6a, 0x50, 0x5b, 0xb7, 0xfd, 0x95, 0x34, 0x66, 0x51, 0x45, 0x5b, 0x55, 0x0d, 0x83,
+ 0x96, 0xdd, 0x10, 0xb8, 0x14, 0x21, 0xd2, 0x27, 0x08, 0xa7, 0x5e, 0x73, 0xf1, 0x2c, 0x19, 0x1a,
+ 0x35, 0x1c, 0xbd, 0xaa, 0xdf, 0xa2, 0x85, 0x65, 0x55, 0x5b, 0xa3, 0x8e, 0x9d, 0xa5, 0x37, 0x2b,
+ 0xd4, 0x76, 0xc8, 0x22, 0xc6, 0x2d, 0x90, 0x71, 0x34, 0x81, 0x26, 0x07, 0xd3, 0x8f, 0xc9, 0x82,
+ 0x91, 0xec, 0x32, 0x92, 0x85, 0xae, 0xc0, 0x48, 0x5e, 0x56, 0x4b, 0x14, 0x72, 0xb3, 0xbe, 0x4c,
+ 0x72, 0x16, 0x0f, 0xf1, 0xc0, 0xdc, 0x2a, 0xd5, 0x4b, 0xab, 0x4e, 0xbc, 0x77, 0x02, 0x4d, 0x1e,
+ 0xcf, 0x0e, 0xf2, 0x67, 0x2f, 0xf0, 0x47, 0xd2, 0x47, 0x08, 0x4f, 0x44, 0xc3, 0xb1, 0x4d, 0x66,
+ 0xd8, 0x94, 0x14, 0xf1, 0x88, 0xee, 0x5b, 0xce, 0x99, 0x62, 0x3d, 0x8e, 0x26, 0x8e, 0x4d, 0x0e,
+ 0xa6, 0xa7, 0xe5, 0x88, 0x8d, 0x95, 0x97, 0x0a, 0x6e, 0x4e, 0x51, 0xf7, 0x2a, 0x2e, 0x52, 0x6a,
+ 0x67, 0x8e, 0xdf, 0xab, 0xa7, 0x7a, 0xb2, 0xc3, 0x7a, 0xb0, 0x9f, 0xb4, 0x85, 0x70, 0x32, 0x02,
+ 0x8c, 0x27, 0xcd, 0x73, 0x78, 0x40, 0x74, 0xcf, 0xe9, 0x05, 0x50, 0x66, 0x9c, 0xf7, 0x77, 0x55,
+ 0x97, 0x3d, 0xa9, 0xab, 0xae, 0x26, 0x6e, 0xd4, 0x52, 0x01, 0xfa, 0xf5, 0x9b, 0x70, 0xdf, 0x89,
+ 0x28, 0x1f, 0x44, 0xef, 0x51, 0x53, 0x93, 0x02, 0x1e, 0x0e, 0xd1, 0x04, 0x20, 0x1d, 0x48, 0x12,
+ 0x12, 0x94, 0x44, 0xfa, 0x11, 0xe1, 0x27, 0xa2, 0xb6, 0x67, 0x91, 0x59, 0x0b, 0x82, 0xef, 0x61,
+ 0xcf, 0xcd, 0x19, 0xdc, 0x67, 0x32, 0x8b, 0x4b, 0xec, 0xaa, 0x33, 0x90, 0x3d, 0xe9, 0xde, 0x2e,
+ 0x15, 0xc8, 0x38, 0xc6, 0x20, 0xb1, 0xbb, 0x76, 0x8c, 0xaf, 0x0d, 0xc0, 0x93, 0x10, 0x69, 0x8f,
+ 0x07, 0xa5, 0xfd, 0x14, 0xe1, 0xa9, 0x4e, 0x08, 0x81, 0xca, 0x37, 0x0e, 0x71, 0xf2, 0xc2, 0x67,
+ 0xee, 0x2d, 0x3c, 0xca, 0xf1, 0xac, 0x30, 0x47, 0x2d, 0x67, 0xa9, 0x56, 0xe5, 0xa1, 0x87, 0x35,
+ 0x6d, 0xd2, 0x57, 0x08, 0x27, 0xc2, 0xea, 0x03, 0xbf, 0xdb, 0x78, 0xc0, 0xa2, 0x5a, 0x35, 0x57,
+ 0xa4, 0xd4, 0x23, 0x35, 0xda, 0xb6, 0x61, 0xde, 0x56, 0x2d, 0x30, 0xdd, 0xc8, 0x5c, 0x71, 0x8b,
+ 0x37, 0xea, 0xa9, 0xd3, 0x35, 0x75, 0xbd, 0xfc, 0xb4, 0xd4, 0xcc, 0x94, 0xbe, 0xfb, 0x35, 0x35,
+ 0x59, 0xd2, 0x9d, 0xd5, 0x4a, 0x5e, 0xd6, 0xd8, 0xba, 0x02, 0xdf, 0x3e, 0xf1, 0x67, 0xda, 0x2e,
+ 0xac, 0x29, 0x4e, 0xcd, 0xa4, 0x36, 0x2f, 0x62, 0x67, 0xfb, 0x2d, 0x40, 0x21, 0xbd, 0x89, 0xe3,
+ 0x2d, 0x6c, 0xf3, 0xda, 0xda, 0xe1, 0x52, 0xff, 0x12, 0xf9, 0xa5, 0x6d, 0x96, 0x07, 0xe6, 0x35,
+ 0xdc, 0xaf, 0x6a, 0x6b, 0x1d, 0x12, 0x5f, 0x00, 0xe2, 0x0f, 0x0a, 0xe2, 0x5e, 0x62, 0x77, 0xbc,
+ 0xfb, 0x54, 0x01, 0x41, 0xba, 0x81, 0xc7, 0x5a, 0xb8, 0x56, 0xf4, 0x75, 0xca, 0x2a, 0xce, 0xe1,
+ 0x52, 0xff, 0x06, 0xe1, 0xf1, 0x88, 0x16, 0x40, 0x7f, 0x0b, 0xe1, 0x21, 0x47, 0x3c, 0xef, 0x50,
+ 0x83, 0xab, 0xa0, 0xc1, 0xb0, 0xd0, 0xc0, 0x9f, 0xdc, 0x9d, 0x0e, 0x83, 0x4e, 0x0b, 0x8f, 0xa4,
+ 0xe1, 0x18, 0x07, 0xba, 0xac, 0xd6, 0xa8, 0xf7, 0x2d, 0x20, 0x4f, 0xb6, 0xbd, 0xe6, 0xae, 0x02,
+ 0x03, 0x99, 0x87, 0x1a, 0xf5, 0x54, 0x4c, 0xb4, 0x6e, 0xad, 0x49, 0xfe, 0xb7, 0x3f, 0x8e, 0xfb,
+ 0x2c, 0x5a, 0x56, 0x6b, 0xd4, 0x82, 0xaf, 0x86, 0x77, 0x2b, 0x5d, 0xc7, 0xc4, 0xdf, 0x04, 0x24,
+ 0x78, 0x06, 0x9f, 0x32, 0xdd, 0x07, 0x39, 0xb5, 0x50, 0xb0, 0xa8, 0x6d, 0x43, 0xa3, 0x78, 0xa3,
+ 0x9e, 0x1a, 0x11, 0x8d, 0xda, 0x96, 0xa5, 0xec, 0x10, 0xbf, 0x9f, 0x87, 0x5b, 0x06, 0x12, 0x2f,
+ 0xb0, 0x8a, 0xe1, 0x50, 0xcb, 0x54, 0x2d, 0xe7, 0xbf, 0x65, 0x61, 0xc0, 0xe1, 0x14, 0xd2, 0x10,
+ 0x18, 0x5d, 0xc3, 0x44, 0xf3, 0x2d, 0xe6, 0x38, 0x5e, 0xe8, 0x3c, 0xde, 0xa8, 0xa7, 0x46, 0xa1,
+ 0x73, 0x20, 0x46, 0xca, 0xc6, 0xb4, 0xfb, 0xab, 0x4a, 0x1f, 0x7b, 0xa7, 0xe1, 0x22, 0xa5, 0xcf,
+ 0x1b, 0x6a, 0xbe, 0x4c, 0x0b, 0xf0, 0x79, 0xfc, 0x3f, 0x8c, 0xc2, 0xd7, 0xde, 0x99, 0x18, 0x86,
+ 0x06, 0xf8, 0xdf, 0x41, 0x78, 0xa4, 0x48, 0x69, 0x8e, 0x8a, 0xf5, 0x1c, 0xa8, 0xea, 0x0d, 0xf7,
+ 0x54, 0xe4, 0xe7, 0x3a, 0x50, 0x33, 0x73, 0x0e, 0xa6, 0xfd, 0x11, 0x21, 0x59, 0x58, 0x55, 0x29,
+ 0x4b, 0x8a, 0x01, 0x2c, 0xd2, 0x5d, 0xef, 0xd5, 0x0b, 0xd4, 0xf4, 0x44, 0xbb, 0xd0, 0x3a, 0xdd,
+ 0xc4, 0xd6, 0x90, 0x46, 0x3d, 0xf5, 0x00, 0x4c, 0x9c, 0x58, 0x90, 0x9a, 0x27, 0x5e, 0xfb, 0x10,
+ 0xf5, 0x76, 0x36, 0x44, 0xd2, 0xeb, 0x51, 0x3b, 0xd7, 0x94, 0x6a, 0x0e, 0x0f, 0xfa, 0x38, 0x71,
+ 0x20, 0xfd, 0x99, 0x87, 0x1b, 0xf5, 0x14, 0x09, 0x10, 0x96, 0xb2, 0xb8, 0xc5, 0x33, 0xfd, 0x47,
+ 0x0c, 0x9f, 0xe0, 0xb5, 0xc9, 0x0f, 0x08, 0x0f, 0x87, 0x9c, 0xa2, 0xe4, 0x52, 0xa4, 0xcc, 0xfb,
+ 0xf8, 0xce, 0xc4, 0xe5, 0x03, 0x64, 0x0a, 0x3e, 0xd2, 0xf4, 0xdd, 0x9f, 0x7e, 0xff, 0xa2, 0xf7,
+ 0x71, 0x72, 0x5e, 0x01, 0xa7, 0xdc, 0x74, 0xc8, 0x61, 0xe7, 0x37, 0xf9, 0xac, 0x17, 0x93, 0x60,
+ 0x39, 0x32, 0xd7, 0x2d, 0x00, 0x0f, 0xf9, 0xa5, 0xee, 0x13, 0x01, 0xf8, 0x16, 0xe2, 0xc8, 0xdf,
+ 0x25, 0x9b, 0x01, 0xe4, 0xde, 0xa0, 0x29, 0x1b, 0xcd, 0xe3, 0x40, 0x6e, 0x6d, 0xf8, 0xa6, 0xe2,
+ 0x8e, 0x48, 0xdb, 0x22, 0x4c, 0xcf, 0xa6, 0x62, 0xbb, 0xb0, 0x0c, 0x8d, 0xb6, 0xad, 0x7a, 0x0f,
+ 0x37, 0xc3, 0x24, 0x21, 0x7f, 0x23, 0x3c, 0xbe, 0xa7, 0x27, 0x22, 0x99, 0xae, 0x77, 0x27, 0xe0,
+ 0x10, 0x13, 0x0b, 0xff, 0xaa, 0x06, 0x48, 0x76, 0x9d, 0x2b, 0xf6, 0x32, 0x79, 0x69, 0x0f, 0xc5,
+ 0xc2, 0x74, 0xf2, 0xd4, 0x09, 0x9d, 0x88, 0xbf, 0x10, 0x3e, 0xd5, 0xe6, 0x91, 0x48, 0x7a, 0x6f,
+ 0xac, 0x61, 0x86, 0x2d, 0x31, 0xdb, 0x55, 0x0e, 0xf0, 0xb9, 0x23, 0x46, 0x60, 0x83, 0xd4, 0x8e,
+ 0x6e, 0x04, 0x1c, 0x17, 0x49, 0xae, 0xe9, 0xe0, 0xc8, 0x9f, 0x08, 0x0f, 0xf9, 0x7d, 0x12, 0x99,
+ 0xe9, 0x80, 0x49, 0xbb, 0x65, 0x4b, 0xa4, 0xbb, 0x49, 0x01, 0xee, 0xef, 0x09, 0xee, 0xb7, 0xc8,
+ 0xdb, 0x47, 0xcd, 0xdd, 0x33, 0x71, 0xe4, 0xc3, 0x5e, 0x7c, 0xfa, 0x7e, 0x9f, 0x44, 0x2e, 0x76,
+ 0xc0, 0x25, 0x68, 0xdd, 0x12, 0x4f, 0x75, 0x9b, 0x06, 0x32, 0xbc, 0x2f, 0x64, 0x78, 0x87, 0xdc,
+ 0x3e, 0x6a, 0x19, 0xfc, 0x3e, 0x8e, 0x7c, 0x8b, 0xf0, 0x09, 0x7e, 0xf8, 0x93, 0xa9, 0xbd, 0x89,
+ 0xf8, 0x8d, 0x4e, 0xe2, 0x42, 0x47, 0xb1, 0xc0, 0xf4, 0x2a, 0x27, 0x3a, 0x4f, 0x9e, 0xed, 0xf0,
+ 0xe5, 0x05, 0xf7, 0x63, 0x2b, 0x1b, 0x70, 0xb5, 0xa9, 0x70, 0xcb, 0x42, 0x7e, 0x41, 0x38, 0x16,
+ 0xb0, 0x42, 0x64, 0x9f, 0x0d, 0x88, 0x32, 0x6b, 0x89, 0xb9, 0xae, 0xf3, 0x80, 0xcf, 0x0a, 0xe7,
+ 0xf3, 0x0a, 0xb9, 0x76, 0x70, 0x3e, 0x41, 0x3f, 0x46, 0xbe, 0x47, 0x98, 0x04, 0x8d, 0xce, 0x7e,
+ 0xe7, 0x53, 0xa4, 0x51, 0xdb, 0xef, 0x7c, 0x8a, 0xf6, 0x54, 0xd2, 0xa3, 0x9c, 0x5f, 0x92, 0x8c,
+ 0x05, 0xf8, 0xf9, 0x2c, 0x02, 0xd9, 0x46, 0x38, 0x16, 0x28, 0xb2, 0xdf, 0x66, 0x44, 0x39, 0xa4,
+ 0xc4, 0x5c, 0xd7, 0x79, 0x00, 0xf6, 0x45, 0x0e, 0xf6, 0x0a, 0xc9, 0x1c, 0xf0, 0x64, 0xf0, 0x51,
+ 0xca, 0xbc, 0x7a, 0x6f, 0x27, 0x89, 0xb6, 0x77, 0x92, 0xe8, 0xb7, 0x9d, 0x24, 0xfa, 0x7c, 0x37,
+ 0xd9, 0xb3, 0xbd, 0x9b, 0xec, 0xf9, 0x79, 0x37, 0xd9, 0xf3, 0xc6, 0xc5, 0xe0, 0x4f, 0x1d, 0x3d,
+ 0xaf, 0x4d, 0x97, 0x98, 0x52, 0x9d, 0x55, 0xd6, 0x59, 0xa1, 0x52, 0xa6, 0xb6, 0x68, 0x9e, 0xbe,
+ 0x3c, 0xed, 0xf6, 0xe7, 0xbf, 0x7e, 0xf2, 0x27, 0xf9, 0x3f, 0xe0, 0x66, 0xff, 0x09, 0x00, 0x00,
+ 0xff, 0xff, 0x15, 0xfb, 0x28, 0xf6, 0xad, 0x14, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@@ -1183,8 +1182,8 @@ type QueryClient interface {
TotalTimeoutFees(ctx context.Context, in *QueryTotalTimeoutFeesRequest, opts ...grpc.CallOption) (*QueryTotalTimeoutFeesResponse, error)
// Payee returns the registered payee address for a specific channel given the relayer address
Payee(ctx context.Context, in *QueryPayeeRequest, opts ...grpc.CallOption) (*QueryPayeeResponse, error)
- // CounterpartyAddress returns the registered counterparty address for forward relaying
- CounterpartyAddress(ctx context.Context, in *QueryCounterpartyAddressRequest, opts ...grpc.CallOption) (*QueryCounterpartyAddressResponse, error)
+ // CounterpartyPayee returns the registered counterparty payee for forward relaying
+ CounterpartyPayee(ctx context.Context, in *QueryCounterpartyPayeeRequest, opts ...grpc.CallOption) (*QueryCounterpartyPayeeResponse, error)
// FeeEnabledChannels returns a list of all fee enabled channels
FeeEnabledChannels(ctx context.Context, in *QueryFeeEnabledChannelsRequest, opts ...grpc.CallOption) (*QueryFeeEnabledChannelsResponse, error)
// FeeEnabledChannel returns true if the provided port and channel identifiers belong to a fee enabled channel
@@ -1262,9 +1261,9 @@ func (c *queryClient) Payee(ctx context.Context, in *QueryPayeeRequest, opts ...
return out, nil
}
-func (c *queryClient) CounterpartyAddress(ctx context.Context, in *QueryCounterpartyAddressRequest, opts ...grpc.CallOption) (*QueryCounterpartyAddressResponse, error) {
- out := new(QueryCounterpartyAddressResponse)
- err := c.cc.Invoke(ctx, "/ibc.applications.fee.v1.Query/CounterpartyAddress", in, out, opts...)
+func (c *queryClient) CounterpartyPayee(ctx context.Context, in *QueryCounterpartyPayeeRequest, opts ...grpc.CallOption) (*QueryCounterpartyPayeeResponse, error) {
+ out := new(QueryCounterpartyPayeeResponse)
+ err := c.cc.Invoke(ctx, "/ibc.applications.fee.v1.Query/CounterpartyPayee", in, out, opts...)
if err != nil {
return nil, err
}
@@ -1305,8 +1304,8 @@ type QueryServer interface {
TotalTimeoutFees(context.Context, *QueryTotalTimeoutFeesRequest) (*QueryTotalTimeoutFeesResponse, error)
// Payee returns the registered payee address for a specific channel given the relayer address
Payee(context.Context, *QueryPayeeRequest) (*QueryPayeeResponse, error)
- // CounterpartyAddress returns the registered counterparty address for forward relaying
- CounterpartyAddress(context.Context, *QueryCounterpartyAddressRequest) (*QueryCounterpartyAddressResponse, error)
+ // CounterpartyPayee returns the registered counterparty payee for forward relaying
+ CounterpartyPayee(context.Context, *QueryCounterpartyPayeeRequest) (*QueryCounterpartyPayeeResponse, error)
// FeeEnabledChannels returns a list of all fee enabled channels
FeeEnabledChannels(context.Context, *QueryFeeEnabledChannelsRequest) (*QueryFeeEnabledChannelsResponse, error)
// FeeEnabledChannel returns true if the provided port and channel identifiers belong to a fee enabled channel
@@ -1338,8 +1337,8 @@ func (*UnimplementedQueryServer) TotalTimeoutFees(ctx context.Context, req *Quer
func (*UnimplementedQueryServer) Payee(ctx context.Context, req *QueryPayeeRequest) (*QueryPayeeResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method Payee not implemented")
}
-func (*UnimplementedQueryServer) CounterpartyAddress(ctx context.Context, req *QueryCounterpartyAddressRequest) (*QueryCounterpartyAddressResponse, error) {
- return nil, status.Errorf(codes.Unimplemented, "method CounterpartyAddress not implemented")
+func (*UnimplementedQueryServer) CounterpartyPayee(ctx context.Context, req *QueryCounterpartyPayeeRequest) (*QueryCounterpartyPayeeResponse, error) {
+ return nil, status.Errorf(codes.Unimplemented, "method CounterpartyPayee not implemented")
}
func (*UnimplementedQueryServer) FeeEnabledChannels(ctx context.Context, req *QueryFeeEnabledChannelsRequest) (*QueryFeeEnabledChannelsResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method FeeEnabledChannels not implemented")
@@ -1478,20 +1477,20 @@ func _Query_Payee_Handler(srv interface{}, ctx context.Context, dec func(interfa
return interceptor(ctx, in, info, handler)
}
-func _Query_CounterpartyAddress_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
- in := new(QueryCounterpartyAddressRequest)
+func _Query_CounterpartyPayee_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+ in := new(QueryCounterpartyPayeeRequest)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
- return srv.(QueryServer).CounterpartyAddress(ctx, in)
+ return srv.(QueryServer).CounterpartyPayee(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
- FullMethod: "/ibc.applications.fee.v1.Query/CounterpartyAddress",
+ FullMethod: "/ibc.applications.fee.v1.Query/CounterpartyPayee",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
- return srv.(QueryServer).CounterpartyAddress(ctx, req.(*QueryCounterpartyAddressRequest))
+ return srv.(QueryServer).CounterpartyPayee(ctx, req.(*QueryCounterpartyPayeeRequest))
}
return interceptor(ctx, in, info, handler)
}
@@ -1565,8 +1564,8 @@ var _Query_serviceDesc = grpc.ServiceDesc{
Handler: _Query_Payee_Handler,
},
{
- MethodName: "CounterpartyAddress",
- Handler: _Query_CounterpartyAddress_Handler,
+ MethodName: "CounterpartyPayee",
+ Handler: _Query_CounterpartyPayee_Handler,
},
{
MethodName: "FeeEnabledChannels",
@@ -2050,10 +2049,10 @@ func (m *QueryPayeeRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
_ = i
var l int
_ = l
- if len(m.RelayerAddress) > 0 {
- i -= len(m.RelayerAddress)
- copy(dAtA[i:], m.RelayerAddress)
- i = encodeVarintQuery(dAtA, i, uint64(len(m.RelayerAddress)))
+ if len(m.Relayer) > 0 {
+ i -= len(m.Relayer)
+ copy(dAtA[i:], m.Relayer)
+ i = encodeVarintQuery(dAtA, i, uint64(len(m.Relayer)))
i--
dAtA[i] = 0x12
}
@@ -2097,7 +2096,7 @@ func (m *QueryPayeeResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return len(dAtA) - i, nil
}
-func (m *QueryCounterpartyAddressRequest) Marshal() (dAtA []byte, err error) {
+func (m *QueryCounterpartyPayeeRequest) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -2107,20 +2106,20 @@ func (m *QueryCounterpartyAddressRequest) Marshal() (dAtA []byte, err error) {
return dAtA[:n], nil
}
-func (m *QueryCounterpartyAddressRequest) MarshalTo(dAtA []byte) (int, error) {
+func (m *QueryCounterpartyPayeeRequest) MarshalTo(dAtA []byte) (int, error) {
size := m.Size()
return m.MarshalToSizedBuffer(dAtA[:size])
}
-func (m *QueryCounterpartyAddressRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *QueryCounterpartyPayeeRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i := len(dAtA)
_ = i
var l int
_ = l
- if len(m.RelayerAddress) > 0 {
- i -= len(m.RelayerAddress)
- copy(dAtA[i:], m.RelayerAddress)
- i = encodeVarintQuery(dAtA, i, uint64(len(m.RelayerAddress)))
+ if len(m.Relayer) > 0 {
+ i -= len(m.Relayer)
+ copy(dAtA[i:], m.Relayer)
+ i = encodeVarintQuery(dAtA, i, uint64(len(m.Relayer)))
i--
dAtA[i] = 0x12
}
@@ -2134,7 +2133,7 @@ func (m *QueryCounterpartyAddressRequest) MarshalToSizedBuffer(dAtA []byte) (int
return len(dAtA) - i, nil
}
-func (m *QueryCounterpartyAddressResponse) Marshal() (dAtA []byte, err error) {
+func (m *QueryCounterpartyPayeeResponse) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
n, err := m.MarshalToSizedBuffer(dAtA[:size])
@@ -2144,20 +2143,20 @@ func (m *QueryCounterpartyAddressResponse) Marshal() (dAtA []byte, err error) {
return dAtA[:n], nil
}
-func (m *QueryCounterpartyAddressResponse) MarshalTo(dAtA []byte) (int, error) {
+func (m *QueryCounterpartyPayeeResponse) MarshalTo(dAtA []byte) (int, error) {
size := m.Size()
return m.MarshalToSizedBuffer(dAtA[:size])
}
-func (m *QueryCounterpartyAddressResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+func (m *QueryCounterpartyPayeeResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i := len(dAtA)
_ = i
var l int
_ = l
- if len(m.CounterpartyAddress) > 0 {
- i -= len(m.CounterpartyAddress)
- copy(dAtA[i:], m.CounterpartyAddress)
- i = encodeVarintQuery(dAtA, i, uint64(len(m.CounterpartyAddress)))
+ if len(m.CounterpartyPayee) > 0 {
+ i -= len(m.CounterpartyPayee)
+ copy(dAtA[i:], m.CounterpartyPayee)
+ i = encodeVarintQuery(dAtA, i, uint64(len(m.CounterpartyPayee)))
i--
dAtA[i] = 0xa
}
@@ -2505,7 +2504,7 @@ func (m *QueryPayeeRequest) Size() (n int) {
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
- l = len(m.RelayerAddress)
+ l = len(m.Relayer)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
@@ -2525,7 +2524,7 @@ func (m *QueryPayeeResponse) Size() (n int) {
return n
}
-func (m *QueryCounterpartyAddressRequest) Size() (n int) {
+func (m *QueryCounterpartyPayeeRequest) Size() (n int) {
if m == nil {
return 0
}
@@ -2535,20 +2534,20 @@ func (m *QueryCounterpartyAddressRequest) Size() (n int) {
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
- l = len(m.RelayerAddress)
+ l = len(m.Relayer)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
return n
}
-func (m *QueryCounterpartyAddressResponse) Size() (n int) {
+func (m *QueryCounterpartyPayeeResponse) Size() (n int) {
if m == nil {
return 0
}
var l int
_ = l
- l = len(m.CounterpartyAddress)
+ l = len(m.CounterpartyPayee)
if l > 0 {
n += 1 + l + sovQuery(uint64(l))
}
@@ -3812,7 +3811,7 @@ func (m *QueryPayeeRequest) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
case 2:
if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field RelayerAddress", wireType)
+ return fmt.Errorf("proto: wrong wireType = %d for field Relayer", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@@ -3840,7 +3839,7 @@ func (m *QueryPayeeRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.RelayerAddress = string(dAtA[iNdEx:postIndex])
+ m.Relayer = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
default:
iNdEx = preIndex
@@ -3945,7 +3944,7 @@ func (m *QueryPayeeResponse) Unmarshal(dAtA []byte) error {
}
return nil
}
-func (m *QueryCounterpartyAddressRequest) Unmarshal(dAtA []byte) error {
+func (m *QueryCounterpartyPayeeRequest) Unmarshal(dAtA []byte) error {
l := len(dAtA)
iNdEx := 0
for iNdEx < l {
@@ -3968,10 +3967,10 @@ func (m *QueryCounterpartyAddressRequest) Unmarshal(dAtA []byte) error {
fieldNum := int32(wire >> 3)
wireType := int(wire & 0x7)
if wireType == 4 {
- return fmt.Errorf("proto: QueryCounterpartyAddressRequest: wiretype end group for non-group")
+ return fmt.Errorf("proto: QueryCounterpartyPayeeRequest: wiretype end group for non-group")
}
if fieldNum <= 0 {
- return fmt.Errorf("proto: QueryCounterpartyAddressRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+ return fmt.Errorf("proto: QueryCounterpartyPayeeRequest: illegal tag %d (wire type %d)", fieldNum, wire)
}
switch fieldNum {
case 1:
@@ -4008,7 +4007,7 @@ func (m *QueryCounterpartyAddressRequest) Unmarshal(dAtA []byte) error {
iNdEx = postIndex
case 2:
if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field RelayerAddress", wireType)
+ return fmt.Errorf("proto: wrong wireType = %d for field Relayer", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@@ -4036,7 +4035,7 @@ func (m *QueryCounterpartyAddressRequest) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.RelayerAddress = string(dAtA[iNdEx:postIndex])
+ m.Relayer = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
default:
iNdEx = preIndex
@@ -4059,7 +4058,7 @@ func (m *QueryCounterpartyAddressRequest) Unmarshal(dAtA []byte) error {
}
return nil
}
-func (m *QueryCounterpartyAddressResponse) Unmarshal(dAtA []byte) error {
+func (m *QueryCounterpartyPayeeResponse) Unmarshal(dAtA []byte) error {
l := len(dAtA)
iNdEx := 0
for iNdEx < l {
@@ -4082,15 +4081,15 @@ func (m *QueryCounterpartyAddressResponse) Unmarshal(dAtA []byte) error {
fieldNum := int32(wire >> 3)
wireType := int(wire & 0x7)
if wireType == 4 {
- return fmt.Errorf("proto: QueryCounterpartyAddressResponse: wiretype end group for non-group")
+ return fmt.Errorf("proto: QueryCounterpartyPayeeResponse: wiretype end group for non-group")
}
if fieldNum <= 0 {
- return fmt.Errorf("proto: QueryCounterpartyAddressResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+ return fmt.Errorf("proto: QueryCounterpartyPayeeResponse: illegal tag %d (wire type %d)", fieldNum, wire)
}
switch fieldNum {
case 1:
if wireType != 2 {
- return fmt.Errorf("proto: wrong wireType = %d for field CounterpartyAddress", wireType)
+ return fmt.Errorf("proto: wrong wireType = %d for field CounterpartyPayee", wireType)
}
var stringLen uint64
for shift := uint(0); ; shift += 7 {
@@ -4118,7 +4117,7 @@ func (m *QueryCounterpartyAddressResponse) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.CounterpartyAddress = string(dAtA[iNdEx:postIndex])
+ m.CounterpartyPayee = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
default:
iNdEx = preIndex
diff --git a/modules/apps/29-fee/types/query.pb.gw.go b/modules/apps/29-fee/types/query.pb.gw.go
index 309fab4da17..d6e723f9bdd 100644
--- a/modules/apps/29-fee/types/query.pb.gw.go
+++ b/modules/apps/29-fee/types/query.pb.gw.go
@@ -647,15 +647,15 @@ func request_Query_Payee_0(ctx context.Context, marshaler runtime.Marshaler, cli
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "channel_id", err)
}
- val, ok = pathParams["relayer_address"]
+ val, ok = pathParams["relayer"]
if !ok {
- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "relayer_address")
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "relayer")
}
- protoReq.RelayerAddress, err = runtime.String(val)
+ protoReq.Relayer, err = runtime.String(val)
if err != nil {
- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "relayer_address", err)
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "relayer", err)
}
msg, err := client.Payee(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
@@ -685,15 +685,15 @@ func local_request_Query_Payee_0(ctx context.Context, marshaler runtime.Marshale
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "channel_id", err)
}
- val, ok = pathParams["relayer_address"]
+ val, ok = pathParams["relayer"]
if !ok {
- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "relayer_address")
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "relayer")
}
- protoReq.RelayerAddress, err = runtime.String(val)
+ protoReq.Relayer, err = runtime.String(val)
if err != nil {
- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "relayer_address", err)
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "relayer", err)
}
msg, err := server.Payee(ctx, &protoReq)
@@ -701,8 +701,8 @@ func local_request_Query_Payee_0(ctx context.Context, marshaler runtime.Marshale
}
-func request_Query_CounterpartyAddress_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
- var protoReq QueryCounterpartyAddressRequest
+func request_Query_CounterpartyPayee_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+ var protoReq QueryCounterpartyPayeeRequest
var metadata runtime.ServerMetadata
var (
@@ -723,24 +723,24 @@ func request_Query_CounterpartyAddress_0(ctx context.Context, marshaler runtime.
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "channel_id", err)
}
- val, ok = pathParams["relayer_address"]
+ val, ok = pathParams["relayer"]
if !ok {
- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "relayer_address")
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "relayer")
}
- protoReq.RelayerAddress, err = runtime.String(val)
+ protoReq.Relayer, err = runtime.String(val)
if err != nil {
- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "relayer_address", err)
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "relayer", err)
}
- msg, err := client.CounterpartyAddress(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+ msg, err := client.CounterpartyPayee(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
return msg, metadata, err
}
-func local_request_Query_CounterpartyAddress_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
- var protoReq QueryCounterpartyAddressRequest
+func local_request_Query_CounterpartyPayee_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+ var protoReq QueryCounterpartyPayeeRequest
var metadata runtime.ServerMetadata
var (
@@ -761,18 +761,18 @@ func local_request_Query_CounterpartyAddress_0(ctx context.Context, marshaler ru
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "channel_id", err)
}
- val, ok = pathParams["relayer_address"]
+ val, ok = pathParams["relayer"]
if !ok {
- return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "relayer_address")
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "relayer")
}
- protoReq.RelayerAddress, err = runtime.String(val)
+ protoReq.Relayer, err = runtime.String(val)
if err != nil {
- return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "relayer_address", err)
+ return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "relayer", err)
}
- msg, err := server.CounterpartyAddress(ctx, &protoReq)
+ msg, err := server.CounterpartyPayee(ctx, &protoReq)
return msg, metadata, err
}
@@ -1035,7 +1035,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
})
- mux.Handle("GET", pattern_Query_CounterpartyAddress_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+ mux.Handle("GET", pattern_Query_CounterpartyPayee_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
ctx, cancel := context.WithCancel(req.Context())
defer cancel()
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
@@ -1044,14 +1044,14 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
return
}
- resp, md, err := local_request_Query_CounterpartyAddress_0(rctx, inboundMarshaler, server, req, pathParams)
+ resp, md, err := local_request_Query_CounterpartyPayee_0(rctx, inboundMarshaler, server, req, pathParams)
ctx = runtime.NewServerMetadataContext(ctx, md)
if err != nil {
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
return
}
- forward_Query_CounterpartyAddress_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+ forward_Query_CounterpartyPayee_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
@@ -1276,7 +1276,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
})
- mux.Handle("GET", pattern_Query_CounterpartyAddress_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+ mux.Handle("GET", pattern_Query_CounterpartyPayee_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
ctx, cancel := context.WithCancel(req.Context())
defer cancel()
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
@@ -1285,14 +1285,14 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
return
}
- resp, md, err := request_Query_CounterpartyAddress_0(rctx, inboundMarshaler, client, req, pathParams)
+ resp, md, err := request_Query_CounterpartyPayee_0(rctx, inboundMarshaler, client, req, pathParams)
ctx = runtime.NewServerMetadataContext(ctx, md)
if err != nil {
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
return
}
- forward_Query_CounterpartyAddress_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+ forward_Query_CounterpartyPayee_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
})
@@ -1352,9 +1352,9 @@ var (
pattern_Query_TotalTimeoutFees_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5, 2, 6, 1, 0, 4, 1, 5, 7, 2, 8, 1, 0, 4, 1, 5, 9, 2, 10}, []string{"ibc", "apps", "fee", "v1", "channels", "packet_id.channel_id", "ports", "packet_id.port_id", "sequences", "packet_id.sequence", "total_timeout_fees"}, "", runtime.AssumeColonVerbOpt(true)))
- pattern_Query_Payee_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5, 2, 6, 1, 0, 4, 1, 5, 7, 2, 8}, []string{"ibc", "apps", "fee", "v1", "channels", "channel_id", "relayers", "relayer_address", "payee"}, "", runtime.AssumeColonVerbOpt(true)))
+ pattern_Query_Payee_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5, 2, 6, 1, 0, 4, 1, 5, 7, 2, 8}, []string{"ibc", "apps", "fee", "v1", "channels", "channel_id", "relayers", "relayer", "payee"}, "", runtime.AssumeColonVerbOpt(true)))
- pattern_Query_CounterpartyAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5, 2, 6, 1, 0, 4, 1, 5, 7, 2, 8}, []string{"ibc", "apps", "fee", "v1", "channels", "channel_id", "relayers", "relayer_address", "counterparty_address"}, "", runtime.AssumeColonVerbOpt(true)))
+ pattern_Query_CounterpartyPayee_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5, 2, 6, 1, 0, 4, 1, 5, 7, 2, 8}, []string{"ibc", "apps", "fee", "v1", "channels", "channel_id", "relayers", "relayer", "counterparty_payee"}, "", runtime.AssumeColonVerbOpt(true)))
pattern_Query_FeeEnabledChannels_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"ibc", "apps", "fee", "v1", "fee_enabled"}, "", runtime.AssumeColonVerbOpt(true)))
@@ -1376,7 +1376,7 @@ var (
forward_Query_Payee_0 = runtime.ForwardResponseMessage
- forward_Query_CounterpartyAddress_0 = runtime.ForwardResponseMessage
+ forward_Query_CounterpartyPayee_0 = runtime.ForwardResponseMessage
forward_Query_FeeEnabledChannels_0 = runtime.ForwardResponseMessage
diff --git a/proto/ibc/applications/fee/v1/query.proto b/proto/ibc/applications/fee/v1/query.proto
index e08eee99816..ffa447ffd68 100644
--- a/proto/ibc/applications/fee/v1/query.proto
+++ b/proto/ibc/applications/fee/v1/query.proto
@@ -52,13 +52,12 @@ service Query {
// Payee returns the registered payee address for a specific channel given the relayer address
rpc Payee(QueryPayeeRequest) returns (QueryPayeeResponse) {
- option (google.api.http).get = "/ibc/apps/fee/v1/channels/{channel_id}/relayers/{relayer_address}/payee";
+ option (google.api.http).get = "/ibc/apps/fee/v1/channels/{channel_id}/relayers/{relayer}/payee";
}
- // CounterpartyAddress returns the registered counterparty address for forward relaying
- rpc CounterpartyAddress(QueryCounterpartyAddressRequest) returns (QueryCounterpartyAddressResponse) {
- option (google.api.http).get =
- "/ibc/apps/fee/v1/channels/{channel_id}/relayers/{relayer_address}/counterparty_address";
+ // CounterpartyPayee returns the registered counterparty payee for forward relaying
+ rpc CounterpartyPayee(QueryCounterpartyPayeeRequest) returns (QueryCounterpartyPayeeResponse) {
+ option (google.api.http).get = "/ibc/apps/fee/v1/channels/{channel_id}/relayers/{relayer}/counterparty_payee";
}
// FeeEnabledChannels returns a list of all fee enabled channels
@@ -170,7 +169,7 @@ message QueryPayeeRequest {
// unique channel identifier
string channel_id = 1 [(gogoproto.moretags) = "yaml:\"channel_id\""];
// the relayer address to which the distribution address is registered
- string relayer_address = 2 [(gogoproto.moretags) = "yaml:\"relayer_address\""];
+ string relayer = 2;
}
// QueryPayeeResponse defines the response type for the Payee rpc
@@ -179,18 +178,18 @@ message QueryPayeeResponse {
string payee_address = 1 [(gogoproto.moretags) = "yaml:\"payee_address\""];
}
-// QueryCounterpartyAddressRequest defines the request type for the CounterpartyAddress rpc
-message QueryCounterpartyAddressRequest {
+// QueryCounterpartyPayeeRequest defines the request type for the CounterpartyPayee rpc
+message QueryCounterpartyPayeeRequest {
// unique channel identifier
string channel_id = 1 [(gogoproto.moretags) = "yaml:\"channel_id\""];
// the relayer address to which the counterparty is registered
- string relayer_address = 2 [(gogoproto.moretags) = "yaml:\"relayer_address\""];
+ string relayer = 2;
}
-// QueryCounterpartyAddressResponse defines the response type for the CounterpartyAddress rpc
-message QueryCounterpartyAddressResponse {
- // the counterparty address used to compensate forward relaying
- string counterparty_address = 1 [(gogoproto.moretags) = "yaml:\"counterparty_address\""];
+// QueryCounterpartyPayeeResponse defines the response type for the CounterpartyPayee rpc
+message QueryCounterpartyPayeeResponse {
+ // the counterparty payee address used to compensate forward relaying
+ string counterparty_payee = 1 [(gogoproto.moretags) = "yaml:\"counterparty_payee\""];
}
// QueryFeeEnabledChannelsRequest defines the request type for the FeeEnabledChannels rpc