From 2797e7c01a4ba67534406c87dd2259be0bb40126 Mon Sep 17 00:00:00 2001
From: mattverse <mattpark1028@gmail.com>
Date: Thu, 12 Oct 2023 16:50:26 +0900
Subject: [PATCH 01/12] Add trader fee query

---
 proto/osmosis/poolmanager/v1beta1/query.proto |  20 +
 wasmbinding/stargate_whitelist.go             |   1 +
 x/poolmanager/client/grpc/grpc_query.go       |  11 +
 x/poolmanager/client/query_proto_wrap.go      |  12 +
 x/poolmanager/client/queryproto/query.pb.go   | 669 +++++++++++++++---
 .../client/queryproto/query.pb.gw.go          |  83 +++
 6 files changed, 678 insertions(+), 118 deletions(-)

diff --git a/proto/osmosis/poolmanager/v1beta1/query.proto b/proto/osmosis/poolmanager/v1beta1/query.proto
index 2b105f44b90..3fb5c513656 100644
--- a/proto/osmosis/poolmanager/v1beta1/query.proto
+++ b/proto/osmosis/poolmanager/v1beta1/query.proto
@@ -119,6 +119,13 @@ service Query {
         "/osmosis/poolmanager/v1beta1/pools/{pool_id}/total_volume";
   }
 
+  // TotalVolumeForPool returns the total volume of the specified pool.
+  rpc TradingPairTakerFee(TradingPairTakerFeeRequest)
+      returns (TradingPairTakerFeeResponse) {
+    option (google.api.http).get =
+        "/osmosis/poolmanager/v1beta1/pools/trading_pair_takerfee";
+  }
+
   // EstimateTradeBasedOnPriceImpact returns an estimated trade based on price
   // impact, if a trade cannot be estimated a 0 input and 0 output would be
   // returned.
@@ -281,6 +288,19 @@ message TotalVolumeForPoolResponse {
   ];
 }
 
+//=============================== TotalVolumeForPool
+message TradingPairTakerFeeRequest {
+  string denom_0 = 1 [ (gogoproto.moretags) = "yaml:\"denom_0\"" ];
+  string denom_1 = 2 [ (gogoproto.moretags) = "yaml:\"denom_1\"" ];
+}
+
+message TradingPairTakerFeeResponse {
+  string taker_fee = 1 [
+    (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
+    (gogoproto.nullable) = false
+  ];
+}
+
 //=============================== EstimateTradeBasedOnPriceImpact
 
 // EstimateTradeBasedOnPriceImpactRequest represents a request to estimate a
diff --git a/wasmbinding/stargate_whitelist.go b/wasmbinding/stargate_whitelist.go
index 44564f0aa39..8f3bbe6472b 100644
--- a/wasmbinding/stargate_whitelist.go
+++ b/wasmbinding/stargate_whitelist.go
@@ -145,6 +145,7 @@ func init() {
 	setWhitelistedQuery("/osmosis.poolmanager.v1beta1.Query/SpotPrice", &poolmanagerqueryproto.SpotPriceResponse{})
 	setWhitelistedQuery("/osmosis.poolmanager.v1beta1.Query/TotalPoolLiquidity", &poolmanagerqueryproto.TotalPoolLiquidityResponse{})
 	setWhitelistedQuery("/osmosis.poolmanager.v1beta1.Query/Params", &poolmanagerqueryproto.ParamsResponse{})
+	setWhitelistedQuery("/osmosis.poolmanager.v1beta1.Query/TradingPairTakerFee", &poolmanagerqueryproto.TradingPairTakerFeeResponse{})
 
 	// txfees
 	setWhitelistedQuery("/osmosis.txfees.v1beta1.Query/FeeTokens", &txfeestypes.QueryFeeTokensResponse{})
diff --git a/x/poolmanager/client/grpc/grpc_query.go b/x/poolmanager/client/grpc/grpc_query.go
index f88b08037ce..2019ae16d38 100644
--- a/x/poolmanager/client/grpc/grpc_query.go
+++ b/x/poolmanager/client/grpc/grpc_query.go
@@ -91,6 +91,17 @@ func (q Querier) NumPools(grpcCtx context.Context,
 	return q.Q.NumPools(ctx, *req)
 }
 
+
+func (q Querier) TradingPairTakerFee(grpcCtx context.Context,
+	req *queryproto.TradingPairTakerFeeRequest,
+) (*queryproto.TradingPairTakerFeeResponse, error) {
+	if req == nil {
+		return nil, status.Error(codes.InvalidArgument, "empty request")
+	}
+	ctx := sdk.UnwrapSDKContext(grpcCtx)
+	return q.Q.TradingPairTakerFee(ctx, *req)
+}
+
 func (q Querier) EstimateTradeBasedOnPriceImpact(grpcCtx context.Context,
 	req *queryproto.EstimateTradeBasedOnPriceImpactRequest,
 ) (*queryproto.EstimateTradeBasedOnPriceImpactResponse, error) {
diff --git a/x/poolmanager/client/query_proto_wrap.go b/x/poolmanager/client/query_proto_wrap.go
index 7ca7923bae0..f8cc19d07a7 100644
--- a/x/poolmanager/client/query_proto_wrap.go
+++ b/x/poolmanager/client/query_proto_wrap.go
@@ -298,6 +298,18 @@ func (q Querier) TotalVolumeForPool(ctx sdk.Context, req queryproto.TotalVolumeF
 	}, nil
 }
 
+// TradingPairTakerFee returns the taker fee for the given trading pair
+func (q Querier) TradingPairTakerFee(ctx sdk.Context, req queryproto.TradingPairTakerFeeRequest) (*queryproto.TradingPairTakerFeeResponse, error) {
+	tradingPairTakerFee, err := q.K.GetTradingPairTakerFee(ctx, req.Denom_0, req.Denom_1)
+	if err != nil {
+		return nil, status.Error(codes.Internal, err.Error())
+	}
+
+	return &queryproto.TradingPairTakerFeeResponse{
+		TakerFee: tradingPairTakerFee,
+	}, nil
+}
+
 // EstimateTradeBasedOnPriceImpact returns the input and output amount of coins for a pool trade
 // based on external price and maximum price impact.
 func (q Querier) EstimateTradeBasedOnPriceImpact(
diff --git a/x/poolmanager/client/queryproto/query.pb.go b/x/poolmanager/client/queryproto/query.pb.go
index 0a337669065..715318c337f 100644
--- a/x/poolmanager/client/queryproto/query.pb.go
+++ b/x/poolmanager/client/queryproto/query.pb.go
@@ -1205,6 +1205,96 @@ func (m *TotalVolumeForPoolResponse) GetVolume() github_com_cosmos_cosmos_sdk_ty
 	return nil
 }
 
+// =============================== TotalVolumeForPool
+type TradingPairTakerFeeRequest struct {
+	Denom_0 string `protobuf:"bytes,1,opt,name=denom_0,json=denom0,proto3" json:"denom_0,omitempty" yaml:"denom_0"`
+	Denom_1 string `protobuf:"bytes,2,opt,name=denom_1,json=denom1,proto3" json:"denom_1,omitempty" yaml:"denom_1"`
+}
+
+func (m *TradingPairTakerFeeRequest) Reset()         { *m = TradingPairTakerFeeRequest{} }
+func (m *TradingPairTakerFeeRequest) String() string { return proto.CompactTextString(m) }
+func (*TradingPairTakerFeeRequest) ProtoMessage()    {}
+func (*TradingPairTakerFeeRequest) Descriptor() ([]byte, []int) {
+	return fileDescriptor_6256a4106f701b7d, []int{24}
+}
+func (m *TradingPairTakerFeeRequest) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *TradingPairTakerFeeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_TradingPairTakerFeeRequest.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 *TradingPairTakerFeeRequest) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TradingPairTakerFeeRequest.Merge(m, src)
+}
+func (m *TradingPairTakerFeeRequest) XXX_Size() int {
+	return m.Size()
+}
+func (m *TradingPairTakerFeeRequest) XXX_DiscardUnknown() {
+	xxx_messageInfo_TradingPairTakerFeeRequest.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TradingPairTakerFeeRequest proto.InternalMessageInfo
+
+func (m *TradingPairTakerFeeRequest) GetDenom_0() string {
+	if m != nil {
+		return m.Denom_0
+	}
+	return ""
+}
+
+func (m *TradingPairTakerFeeRequest) GetDenom_1() string {
+	if m != nil {
+		return m.Denom_1
+	}
+	return ""
+}
+
+type TradingPairTakerFeeResponse struct {
+	TakerFee github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=taker_fee,json=takerFee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"taker_fee"`
+}
+
+func (m *TradingPairTakerFeeResponse) Reset()         { *m = TradingPairTakerFeeResponse{} }
+func (m *TradingPairTakerFeeResponse) String() string { return proto.CompactTextString(m) }
+func (*TradingPairTakerFeeResponse) ProtoMessage()    {}
+func (*TradingPairTakerFeeResponse) Descriptor() ([]byte, []int) {
+	return fileDescriptor_6256a4106f701b7d, []int{25}
+}
+func (m *TradingPairTakerFeeResponse) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *TradingPairTakerFeeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_TradingPairTakerFeeResponse.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 *TradingPairTakerFeeResponse) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TradingPairTakerFeeResponse.Merge(m, src)
+}
+func (m *TradingPairTakerFeeResponse) XXX_Size() int {
+	return m.Size()
+}
+func (m *TradingPairTakerFeeResponse) XXX_DiscardUnknown() {
+	xxx_messageInfo_TradingPairTakerFeeResponse.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TradingPairTakerFeeResponse proto.InternalMessageInfo
+
 // EstimateTradeBasedOnPriceImpactRequest represents a request to estimate a
 // trade for Balancer/StableSwap/Concentrated liquidity pool types based on the
 // given parameters.
@@ -1232,7 +1322,7 @@ func (m *EstimateTradeBasedOnPriceImpactRequest) Reset() {
 func (m *EstimateTradeBasedOnPriceImpactRequest) String() string { return proto.CompactTextString(m) }
 func (*EstimateTradeBasedOnPriceImpactRequest) ProtoMessage()    {}
 func (*EstimateTradeBasedOnPriceImpactRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_6256a4106f701b7d, []int{24}
+	return fileDescriptor_6256a4106f701b7d, []int{26}
 }
 func (m *EstimateTradeBasedOnPriceImpactRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1301,7 +1391,7 @@ func (m *EstimateTradeBasedOnPriceImpactResponse) Reset() {
 func (m *EstimateTradeBasedOnPriceImpactResponse) String() string { return proto.CompactTextString(m) }
 func (*EstimateTradeBasedOnPriceImpactResponse) ProtoMessage()    {}
 func (*EstimateTradeBasedOnPriceImpactResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_6256a4106f701b7d, []int{25}
+	return fileDescriptor_6256a4106f701b7d, []int{27}
 }
 func (m *EstimateTradeBasedOnPriceImpactResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1369,6 +1459,8 @@ func init() {
 	proto.RegisterType((*TotalLiquidityResponse)(nil), "osmosis.poolmanager.v1beta1.TotalLiquidityResponse")
 	proto.RegisterType((*TotalVolumeForPoolRequest)(nil), "osmosis.poolmanager.v1beta1.TotalVolumeForPoolRequest")
 	proto.RegisterType((*TotalVolumeForPoolResponse)(nil), "osmosis.poolmanager.v1beta1.TotalVolumeForPoolResponse")
+	proto.RegisterType((*TradingPairTakerFeeRequest)(nil), "osmosis.poolmanager.v1beta1.TradingPairTakerFeeRequest")
+	proto.RegisterType((*TradingPairTakerFeeResponse)(nil), "osmosis.poolmanager.v1beta1.TradingPairTakerFeeResponse")
 	proto.RegisterType((*EstimateTradeBasedOnPriceImpactRequest)(nil), "osmosis.poolmanager.v1beta1.EstimateTradeBasedOnPriceImpactRequest")
 	proto.RegisterType((*EstimateTradeBasedOnPriceImpactResponse)(nil), "osmosis.poolmanager.v1beta1.EstimateTradeBasedOnPriceImpactResponse")
 }
@@ -1378,122 +1470,129 @@ func init() {
 }
 
 var fileDescriptor_6256a4106f701b7d = []byte{
-	// 1836 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0xcd, 0x6f, 0x1b, 0x4f,
-	0x19, 0xce, 0x3a, 0x4e, 0x1a, 0x4f, 0x1a, 0xc7, 0x99, 0x36, 0x69, 0xe2, 0x96, 0x6c, 0xba, 0x2d,
-	0xad, 0xdb, 0x24, 0xbb, 0x4a, 0xd2, 0x52, 0x5a, 0x68, 0x8b, 0x9d, 0xa4, 0xad, 0x51, 0x21, 0x61,
-	0x93, 0x7e, 0x50, 0x28, 0xd6, 0xc6, 0xde, 0x3a, 0xab, 0x7a, 0x77, 0x1c, 0xef, 0x6c, 0x9a, 0x08,
-	0xf5, 0x82, 0x84, 0x40, 0x1c, 0x50, 0x81, 0x43, 0x0f, 0x1c, 0x10, 0x07, 0x2e, 0xed, 0x15, 0xfe,
-	0x87, 0x0a, 0x09, 0x14, 0x09, 0x0e, 0x88, 0x83, 0x41, 0x2d, 0x07, 0x24, 0x7a, 0xc1, 0x7f, 0xc1,
-	0x4f, 0xf3, 0xb1, 0x6b, 0x7b, 0x63, 0xaf, 0xd7, 0x4e, 0x0e, 0xbf, 0x53, 0xec, 0x99, 0xf7, 0xeb,
-	0x79, 0xe6, 0x7d, 0x76, 0xe7, 0x75, 0xc0, 0x65, 0x64, 0x9b, 0xc8, 0x36, 0x6c, 0xa5, 0x8c, 0x50,
-	0xc9, 0xd4, 0x2c, 0xad, 0xa8, 0x57, 0x94, 0xdd, 0x85, 0x2d, 0x1d, 0x6b, 0x0b, 0xca, 0x8e, 0xa3,
-	0x57, 0xf6, 0xe5, 0x72, 0x05, 0x61, 0x04, 0xcf, 0x72, 0x43, 0xb9, 0xc1, 0x50, 0xe6, 0x86, 0xc9,
-	0xd3, 0x45, 0x54, 0x44, 0xd4, 0x4e, 0x21, 0x9f, 0x98, 0x4b, 0xf2, 0x4a, 0x50, 0xec, 0xa2, 0x6e,
-	0xe9, 0x34, 0x1c, 0x35, 0xbd, 0x18, 0x64, 0x8a, 0xf7, 0xb8, 0xd5, 0x5c, 0x90, 0x95, 0xfd, 0x4a,
-	0x2b, 0xe7, 0x2a, 0xc8, 0xc1, 0x3a, 0xb7, 0x9e, 0xce, 0x53, 0x73, 0x65, 0x4b, 0xb3, 0x75, 0xcf,
-	0x2a, 0x8f, 0x0c, 0x8b, 0xef, 0x5f, 0x6d, 0xdc, 0xa7, 0x50, 0x3d, 0xab, 0xb2, 0x56, 0x34, 0x2c,
-	0x0d, 0x1b, 0xc8, 0xb5, 0x3d, 0x57, 0x44, 0xa8, 0x58, 0xd2, 0x15, 0xad, 0x6c, 0x28, 0x9a, 0x65,
-	0x21, 0x4c, 0x37, 0xdd, 0xea, 0xa7, 0xf8, 0x2e, 0xfd, 0xb6, 0xe5, 0xbc, 0x50, 0x34, 0x6b, 0xdf,
-	0xdd, 0x62, 0x49, 0x72, 0x8c, 0x1c, 0xf6, 0x85, 0x6f, 0x89, 0x7e, 0x2f, 0x6c, 0x98, 0xba, 0x8d,
-	0x35, 0xb3, 0xcc, 0x0c, 0xa4, 0x51, 0x30, 0xb2, 0xae, 0x55, 0x34, 0xd3, 0x56, 0xf5, 0x1d, 0x47,
-	0xb7, 0xb1, 0xb4, 0x01, 0xe2, 0xee, 0x82, 0x5d, 0x46, 0x96, 0xad, 0xc3, 0x34, 0x18, 0x2c, 0xd3,
-	0x95, 0x49, 0x61, 0x46, 0x48, 0x0d, 0x2f, 0x5e, 0x90, 0x03, 0x8e, 0x49, 0x66, 0xce, 0x99, 0xe8,
-	0x87, 0xaa, 0xd8, 0xa7, 0x72, 0x47, 0xe9, 0xb3, 0x00, 0x66, 0x56, 0x6d, 0x6c, 0x98, 0x1a, 0xd6,
-	0x37, 0x5e, 0x69, 0xe5, 0xd5, 0x3d, 0x2d, 0x8f, 0xd3, 0x26, 0x72, 0x2c, 0x9c, 0xb5, 0x78, 0x66,
-	0x38, 0x0b, 0x4e, 0x90, 0x80, 0x39, 0xa3, 0x30, 0x19, 0x99, 0x11, 0x52, 0xd1, 0x0c, 0xac, 0x55,
-	0xc5, 0xf8, 0xbe, 0x66, 0x96, 0x6e, 0x49, 0x7c, 0x43, 0x52, 0x07, 0xc9, 0xa7, 0x6c, 0x01, 0xca,
-	0x60, 0x08, 0xa3, 0x97, 0xba, 0x95, 0x33, 0xac, 0xc9, 0xfe, 0x19, 0x21, 0x15, 0xcb, 0x9c, 0xaa,
-	0x55, 0xc5, 0x51, 0x66, 0xed, 0xee, 0x48, 0xea, 0x09, 0xfa, 0x31, 0x6b, 0xc1, 0xe7, 0x60, 0x90,
-	0x9e, 0x9b, 0x3d, 0x19, 0x9d, 0xe9, 0x4f, 0x0d, 0x2f, 0xca, 0x81, 0x20, 0x48, 0x8d, 0x5e, 0x79,
-	0xc4, 0x2d, 0x33, 0x4e, 0xf0, 0xd4, 0xaa, 0xe2, 0x08, 0xcb, 0xc0, 0x62, 0x49, 0x2a, 0x0f, 0xfa,
-	0xed, 0xe8, 0x90, 0x90, 0x88, 0xa8, 0x83, 0xb6, 0x6e, 0x15, 0xf4, 0x8a, 0xf4, 0x2e, 0x02, 0x16,
-	0xdb, 0xc2, 0x7d, 0x62, 0xe0, 0xed, 0xf5, 0x8a, 0x61, 0x1a, 0xd8, 0xd8, 0xd5, 0x37, 0xf7, 0xcb,
-	0xba, 0xdd, 0x82, 0x00, 0xa1, 0x2b, 0x02, 0x22, 0x21, 0x08, 0xb8, 0x0b, 0xe2, 0xac, 0xd6, 0x9c,
-	0x9b, 0xa3, 0x7f, 0xa6, 0x3f, 0x15, 0xcd, 0x4c, 0xd5, 0xaa, 0xe2, 0x78, 0x23, 0xa8, 0x9c, 0x97,
-	0xea, 0x24, 0x5b, 0x58, 0x67, 0x09, 0x1f, 0x83, 0x09, 0x6e, 0xc0, 0xa2, 0x23, 0x07, 0xe7, 0x0a,
-	0xba, 0x85, 0x4c, 0xca, 0x68, 0x2c, 0x73, 0xbe, 0x56, 0x15, 0xbf, 0xd2, 0x14, 0xc8, 0x67, 0x27,
-	0xa9, 0xa7, 0xd8, 0xc6, 0x26, 0x59, 0x5f, 0x73, 0xf0, 0x0a, 0x5d, 0xfd, 0x8b, 0x00, 0xae, 0x7a,
-	0x64, 0x19, 0x56, 0xb1, 0xa4, 0x93, 0x84, 0x61, 0xba, 0xe4, 0xf8, 0x49, 0xca, 0x80, 0x51, 0x3f,
-	0x38, 0xd6, 0x5c, 0xc9, 0x5a, 0x55, 0x9c, 0x68, 0x74, 0x6b, 0x40, 0x35, 0x82, 0x9b, 0xf0, 0xfc,
-	0x4c, 0x00, 0xe7, 0x03, 0x7a, 0x9d, 0x8b, 0x6a, 0x0b, 0x24, 0xea, 0x81, 0x34, 0xba, 0x4b, 0xf1,
-	0xc4, 0x32, 0x5f, 0x27, 0x9d, 0xf6, 0xcf, 0xaa, 0x38, 0xce, 0x84, 0x6c, 0x17, 0x5e, 0xca, 0x06,
-	0x52, 0x4c, 0x0d, 0x6f, 0xcb, 0x59, 0x0b, 0xd7, 0xaa, 0xe2, 0x19, 0x7f, 0x1d, 0xcc, 0x5d, 0x52,
-	0xe3, 0x6e, 0x21, 0x2c, 0x9b, 0xf4, 0xff, 0xf6, 0x95, 0xac, 0x39, 0xb8, 0x27, 0xd9, 0xfd, 0xc8,
-	0x93, 0x51, 0x3f, 0x95, 0x91, 0x12, 0x52, 0x46, 0x24, 0x5f, 0x08, 0x1d, 0xc1, 0x05, 0x10, 0xf3,
-	0x70, 0x4d, 0x46, 0x29, 0x1f, 0xa7, 0x6b, 0x55, 0x31, 0xe1, 0x83, 0x2c, 0xa9, 0x43, 0x2e, 0x56,
-	0x9f, 0xf4, 0xde, 0x47, 0xc0, 0x52, 0x7b, 0xcc, 0xc7, 0xa4, 0xbd, 0xc3, 0x5a, 0x8a, 0x74, 0xa7,
-	0xa5, 0x0d, 0x30, 0xde, 0xa4, 0x11, 0xc3, 0xf2, 0xba, 0x8d, 0x48, 0x69, 0xa6, 0x56, 0x15, 0xcf,
-	0xb5, 0x90, 0x92, 0x6b, 0x26, 0xa9, 0xb0, 0x41, 0x49, 0x59, 0x8b, 0x36, 0x5e, 0x0f, 0xdc, 0x49,
-	0x7f, 0x15, 0xc0, 0x6c, 0x47, 0xed, 0xb5, 0xee, 0x95, 0x50, 0x2c, 0xf9, 0xd0, 0x31, 0x09, 0x36,
-	0xb0, 0xe4, 0x87, 0x75, 0x12, 0xb7, 0x05, 0xd4, 0x1f, 0x0a, 0xd0, 0x4f, 0x05, 0x20, 0x05, 0xb5,
-	0x3c, 0x57, 0x5f, 0xce, 0xd5, 0xb9, 0x61, 0x35, 0x8b, 0xef, 0x46, 0x27, 0xf1, 0x4d, 0xf8, 0x0a,
-	0x77, 0xb5, 0x37, 0xc2, 0x2b, 0xe7, 0xd2, 0x1b, 0x03, 0xa3, 0xdf, 0x75, 0x4c, 0x42, 0xa6, 0xf7,
-	0x62, 0x5d, 0x05, 0x89, 0xfa, 0x12, 0xaf, 0x63, 0x01, 0xc4, 0x2c, 0xc7, 0xa4, 0x5d, 0x62, 0x73,
-	0x46, 0x1b, 0x10, 0x7a, 0x5b, 0x92, 0x3a, 0x64, 0x71, 0x57, 0xe9, 0x16, 0x18, 0x26, 0x1f, 0x7a,
-	0x39, 0x11, 0x69, 0x19, 0x9c, 0x64, 0xbe, 0x3c, 0xfd, 0x12, 0x88, 0x92, 0x1d, 0xfe, 0x5e, 0x3f,
-	0x2d, 0xb3, 0xcb, 0x82, 0xec, 0x5e, 0x16, 0xe4, 0xb4, 0xb5, 0x9f, 0x89, 0xfd, 0xf9, 0x8f, 0xf3,
-	0x03, 0xb4, 0x6d, 0x55, 0x6a, 0x4c, 0xa0, 0xa5, 0x4b, 0xa5, 0x26, 0x68, 0x59, 0x90, 0xa8, 0x2f,
-	0xf1, 0xd8, 0xd7, 0xc1, 0x80, 0x0b, 0xab, 0x3f, 0x4c, 0x70, 0x66, 0x2d, 0x1d, 0x08, 0x20, 0xb1,
-	0x51, 0x46, 0x78, 0xbd, 0x62, 0xe4, 0xf5, 0x9e, 0xda, 0x6e, 0x15, 0x24, 0xc8, 0x6d, 0x2b, 0xa7,
-	0xd9, 0xb6, 0x8e, 0x9b, 0x1a, 0xef, 0x6c, 0xfd, 0xe1, 0xe9, 0xb7, 0x90, 0xd4, 0x38, 0x59, 0x4a,
-	0x93, 0x15, 0xd6, 0x7c, 0x0f, 0xc0, 0xd8, 0x8e, 0x83, 0x70, 0x73, 0x1c, 0xd6, 0x84, 0xe7, 0x6a,
-	0x55, 0x71, 0x92, 0xc5, 0x39, 0x64, 0x22, 0xa9, 0xa3, 0x74, 0xad, 0x1e, 0x49, 0xca, 0x82, 0xb1,
-	0x06, 0x44, 0x9c, 0x9e, 0x6b, 0x00, 0xd8, 0x65, 0x84, 0x73, 0x65, 0xb2, 0xca, 0x9b, 0x6f, 0xbc,
-	0x56, 0x15, 0xc7, 0x58, 0xdc, 0xfa, 0x9e, 0xa4, 0xc6, 0x6c, 0xd7, 0x5b, 0x7a, 0x00, 0xa6, 0x36,
-	0x11, 0xd6, 0x28, 0xd5, 0x0f, 0x8d, 0x1d, 0xc7, 0x28, 0x18, 0x78, 0xbf, 0xa7, 0x56, 0xf8, 0xad,
-	0x00, 0x92, 0xad, 0x42, 0xf1, 0xf2, 0x5e, 0x83, 0x58, 0xc9, 0x5d, 0xe4, 0x27, 0x38, 0x25, 0xf3,
-	0x9b, 0x25, 0x21, 0xca, 0x7b, 0xc4, 0x2f, 0x23, 0xc3, 0xca, 0xac, 0xf0, 0x87, 0x3a, 0xef, 0x5b,
-	0xcf, 0x53, 0x7a, 0xf7, 0x2f, 0x31, 0x55, 0x34, 0xf0, 0xb6, 0xb3, 0x25, 0xe7, 0x91, 0xc9, 0xaf,
-	0xa6, 0xfc, 0xcf, 0xbc, 0x5d, 0x78, 0xa9, 0x60, 0xf2, 0x0c, 0xa6, 0x41, 0x6c, 0xb5, 0x9e, 0x51,
-	0x3a, 0x03, 0xc6, 0x69, 0x71, 0x7e, 0x8c, 0xd2, 0x5b, 0x01, 0x4c, 0xf8, 0x77, 0xbe, 0x1c, 0x25,
-	0xbb, 0x47, 0xf3, 0x18, 0x95, 0x1c, 0x53, 0xbf, 0x87, 0x2a, 0x3d, 0xab, 0xf4, 0xd7, 0xee, 0xd1,
-	0xf8, 0x42, 0x71, 0x9c, 0x18, 0x0c, 0xee, 0xd2, 0x8d, 0xce, 0x20, 0xd3, 0xcd, 0x2f, 0x5b, 0xe6,
-	0xd6, 0x1d, 0x42, 0x9e, 0x4b, 0xfa, 0x7b, 0x04, 0x5c, 0x72, 0x1f, 0xac, 0x9b, 0x15, 0xad, 0xa0,
-	0x67, 0x34, 0x5b, 0x2f, 0xac, 0x59, 0xb4, 0x2f, 0xb3, 0x66, 0x59, 0xcb, 0x7b, 0x2f, 0x89, 0x6f,
-	0x82, 0xd8, 0x8b, 0x0a, 0x32, 0x73, 0x64, 0x0c, 0xe2, 0x8f, 0x96, 0x80, 0x1a, 0xd9, 0xa0, 0x30,
-	0x44, 0x3c, 0xc8, 0x77, 0x28, 0x81, 0x11, 0x8c, 0xa8, 0x6f, 0xa3, 0x76, 0xd5, 0x61, 0x8c, 0xc8,
-	0x36, 0xd3, 0xe6, 0x99, 0x3a, 0x9d, 0x44, 0x91, 0x51, 0x4f, 0xfb, 0x4f, 0x41, 0xc2, 0xd4, 0xf6,
-	0x98, 0x70, 0x72, 0x06, 0xad, 0x8a, 0xbf, 0x09, 0x65, 0xfe, 0x60, 0xbf, 0x14, 0x02, 0xf9, 0x8a,
-	0x9e, 0x57, 0xe3, 0xa6, 0xb6, 0xd7, 0x80, 0x0d, 0x3e, 0x02, 0x71, 0x7d, 0x0f, 0xeb, 0x15, 0x4b,
-	0x2b, 0x71, 0xcd, 0x0e, 0xf4, 0x14, 0x77, 0xc4, 0x8d, 0xc2, 0x04, 0xfd, 0x5e, 0x00, 0x97, 0x3b,
-	0xd2, 0xca, 0x0f, 0xfe, 0x0e, 0x00, 0x86, 0x55, 0x76, 0x70, 0x57, 0xc4, 0xc6, 0xa8, 0x0b, 0x65,
-	0xf6, 0x5b, 0x60, 0x18, 0x39, 0xd8, 0x0b, 0x10, 0x09, 0x17, 0x00, 0x30, 0x1f, 0xb2, 0xb2, 0xf8,
-	0x8b, 0x29, 0x30, 0xf0, 0x3d, 0x32, 0xc4, 0xc2, 0x5f, 0x0a, 0x60, 0x90, 0x4d, 0x7a, 0xf0, 0x6a,
-	0x88, 0x71, 0x90, 0xb7, 0x46, 0x72, 0x36, 0x94, 0x2d, 0xc3, 0x2b, 0xcd, 0xfe, 0xe4, 0x6f, 0xff,
-	0xf9, 0x4d, 0xe4, 0xab, 0xf0, 0x82, 0x12, 0x34, 0x92, 0xf3, 0x2a, 0xfe, 0x2b, 0x80, 0xa9, 0xb6,
-	0xb7, 0x6e, 0x78, 0x3b, 0x30, 0x6f, 0xa7, 0xc9, 0x34, 0x79, 0xa7, 0x57, 0x77, 0x8e, 0xe4, 0x21,
-	0x45, 0x72, 0x0f, 0xae, 0x04, 0x22, 0xf9, 0x31, 0xef, 0xe9, 0xd7, 0x8a, 0xce, 0x23, 0xb2, 0xdf,
-	0x1b, 0x74, 0x12, 0x93, 0x5f, 0x34, 0x72, 0x86, 0x05, 0x7f, 0x1f, 0x69, 0xb8, 0xb4, 0x75, 0x9e,
-	0x2e, 0xe1, 0x5a, 0x6f, 0xd5, 0xb7, 0xbd, 0x2b, 0x1f, 0x99, 0x0e, 0x8d, 0xd2, 0xf1, 0x03, 0xf8,
-	0xfd, 0xe3, 0xa0, 0x23, 0xf7, 0xca, 0xc0, 0xdb, 0x44, 0x92, 0xac, 0xd0, 0x1c, 0x95, 0x1a, 0xfc,
-	0x79, 0x04, 0x5c, 0x08, 0x31, 0x54, 0xc2, 0xfb, 0xe1, 0xa0, 0x74, 0x1c, 0x4b, 0x8f, 0xcc, 0xc9,
-	0x53, 0xca, 0x89, 0x0a, 0xd7, 0xbb, 0xe6, 0x84, 0xd6, 0xc6, 0x06, 0x8d, 0x96, 0xed, 0xf2, 0x59,
-	0x00, 0xc9, 0xf6, 0x57, 0x62, 0xd8, 0x53, 0xe1, 0xf5, 0x91, 0x20, 0x79, 0xb7, 0x67, 0x7f, 0x8e,
-	0xfc, 0x3b, 0x14, 0xf9, 0x7d, 0xb8, 0x7a, 0xf4, 0x6e, 0x40, 0x0e, 0x86, 0x7f, 0x88, 0x80, 0xb9,
-	0x6e, 0x06, 0x40, 0xb8, 0xde, 0x23, 0x80, 0xf6, 0xfa, 0x38, 0x32, 0x25, 0x5b, 0x94, 0x92, 0x1f,
-	0xc2, 0x67, 0xc7, 0x42, 0x49, 0x6b, 0x85, 0xbc, 0x89, 0x80, 0x8b, 0x61, 0x46, 0x3f, 0xf8, 0xe0,
-	0x68, 0x12, 0x39, 0xce, 0x56, 0x79, 0x4e, 0x79, 0x79, 0x02, 0x1f, 0x75, 0xc9, 0x0b, 0x61, 0xa1,
-	0x83, 0x50, 0x48, 0xeb, 0xbc, 0x15, 0xc0, 0x90, 0x3b, 0xa2, 0xc1, 0xb9, 0xc0, 0x62, 0x7d, 0xc3,
-	0x5d, 0x72, 0x3e, 0xa4, 0x35, 0x07, 0x22, 0x53, 0x20, 0x29, 0x78, 0x29, 0x10, 0x88, 0x37, 0xff,
-	0xc1, 0x5f, 0x09, 0x20, 0x4a, 0x22, 0xc0, 0x54, 0xf0, 0x0b, 0xb4, 0x7e, 0xe5, 0x4c, 0x5e, 0x09,
-	0x61, 0xc9, 0xab, 0xb9, 0x46, 0xab, 0x91, 0xe1, 0x5c, 0x60, 0x35, 0xb4, 0x92, 0x3a, 0xb9, 0x94,
-	0x2d, 0x77, 0xea, 0xeb, 0xc0, 0x96, 0x6f, 0x5e, 0xec, 0xc0, 0x96, 0x7f, 0x94, 0x0c, 0xc9, 0x96,
-	0x56, 0x2a, 0xcd, 0x33, 0xb6, 0x7e, 0x27, 0x80, 0x98, 0x37, 0x71, 0xc1, 0xe0, 0x64, 0xfe, 0x59,
-	0x33, 0x29, 0x87, 0x35, 0xe7, 0xc5, 0x2d, 0xd1, 0xe2, 0xe6, 0xe1, 0x6c, 0xcb, 0xe2, 0x7c, 0xa4,
-	0x29, 0xf4, 0xea, 0x68, 0xc3, 0x03, 0x01, 0xc0, 0xc3, 0xd3, 0x17, 0xfc, 0x5a, 0x60, 0xee, 0xb6,
-	0x93, 0x5f, 0xf2, 0x46, 0xd7, 0x7e, 0xbc, 0xf8, 0x2c, 0x2d, 0x7e, 0x19, 0xa6, 0xbb, 0x39, 0x79,
-	0x05, 0x93, 0x80, 0x4c, 0x48, 0xde, 0xfc, 0x03, 0xff, 0x24, 0x80, 0x78, 0xf3, 0x64, 0x06, 0x17,
-	0x3b, 0x97, 0x75, 0x08, 0xca, 0x52, 0x57, 0x3e, 0x1c, 0xc6, 0x2d, 0x0a, 0xe3, 0x1a, 0x5c, 0x0c,
-	0x01, 0x83, 0x15, 0x5f, 0xaf, 0xfb, 0x83, 0x7b, 0x14, 0x4d, 0xd3, 0x56, 0x98, 0xa3, 0x68, 0x35,
-	0xe9, 0x85, 0x39, 0x8a, 0x96, 0x63, 0x9d, 0x94, 0xa6, 0x18, 0xbe, 0x01, 0x6f, 0xf6, 0x70, 0x14,
-	0x6c, 0x46, 0x83, 0xff, 0x13, 0x80, 0xd8, 0x61, 0x98, 0x80, 0xcb, 0xa1, 0x9e, 0xc1, 0xc1, 0x13,
-	0x5e, 0x72, 0xe5, 0x68, 0x41, 0x38, 0xe2, 0xdb, 0x14, 0xf1, 0x0d, 0x78, 0xbd, 0xdb, 0xa7, 0x39,
-	0xa6, 0x81, 0x9f, 0x7f, 0xf8, 0x38, 0x2d, 0x1c, 0x7c, 0x9c, 0x16, 0xfe, 0xfd, 0x71, 0x5a, 0x78,
-	0xf3, 0x69, 0xba, 0xef, 0xe0, 0xd3, 0x74, 0xdf, 0x3f, 0x3e, 0x4d, 0xf7, 0x3d, 0x5b, 0x6e, 0x98,
-	0xc5, 0x78, 0xe8, 0xf9, 0x92, 0xb6, 0x65, 0x7b, 0x79, 0x76, 0x17, 0x6e, 0x2a, 0x7b, 0x4d, 0xd9,
-	0xf2, 0x25, 0x43, 0xb7, 0x30, 0xfb, 0x0f, 0x1d, 0xfb, 0x85, 0x6a, 0x90, 0xfe, 0x59, 0xfa, 0x22,
-	0x00, 0x00, 0xff, 0xff, 0x30, 0x9d, 0xbd, 0xeb, 0xbd, 0x1c, 0x00, 0x00,
+	// 1951 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0xcb, 0x73, 0x1b, 0x49,
+	0x19, 0xcf, 0xc8, 0x8a, 0xd7, 0xfa, 0x1c, 0x3f, 0xd2, 0x89, 0x13, 0x5b, 0x09, 0x96, 0xb7, 0xb3,
+	0x64, 0xbd, 0x71, 0x3c, 0x5a, 0xdb, 0x59, 0x92, 0x0d, 0xec, 0xc3, 0xb2, 0x9d, 0x8d, 0x60, 0x21,
+	0x66, 0xe2, 0x7d, 0xb0, 0x10, 0xa6, 0xc6, 0x56, 0x47, 0x19, 0xa2, 0x99, 0x56, 0x34, 0x3d, 0x8e,
+	0x5d, 0xd4, 0x5e, 0xa8, 0xa2, 0xe0, 0x44, 0x2d, 0x70, 0xd8, 0x03, 0x07, 0x8a, 0x03, 0x97, 0xdd,
+	0x2b, 0xfc, 0x0f, 0xa9, 0xad, 0x82, 0x72, 0x15, 0x54, 0x41, 0x71, 0x10, 0x54, 0xc2, 0x81, 0x2a,
+	0x72, 0x41, 0x7f, 0x01, 0xd5, 0x8f, 0x19, 0x49, 0x63, 0x69, 0x34, 0x92, 0x7d, 0xd8, 0x93, 0xa5,
+	0xee, 0xef, 0xf5, 0xfb, 0xf5, 0xf7, 0xf5, 0xcc, 0x4f, 0x86, 0x97, 0xa9, 0xe7, 0x50, 0xcf, 0xf6,
+	0xf2, 0x55, 0x4a, 0x2b, 0x8e, 0xe5, 0x5a, 0x65, 0x52, 0xcb, 0xef, 0x2e, 0x6d, 0x13, 0x66, 0x2d,
+	0xe5, 0x1f, 0xf9, 0xa4, 0xb6, 0xaf, 0x57, 0x6b, 0x94, 0x51, 0x74, 0x41, 0x19, 0xea, 0x2d, 0x86,
+	0xba, 0x32, 0xcc, 0x9e, 0x2d, 0xd3, 0x32, 0x15, 0x76, 0x79, 0xfe, 0x49, 0xba, 0x64, 0x5f, 0x89,
+	0x8b, 0x5d, 0x26, 0x2e, 0x11, 0xe1, 0x84, 0xe9, 0x4b, 0x71, 0xa6, 0x6c, 0x4f, 0x59, 0x5d, 0x8d,
+	0xb3, 0xf2, 0x1e, 0x5b, 0x55, 0xb3, 0x46, 0x7d, 0x46, 0x94, 0xf5, 0xec, 0x8e, 0x30, 0xcf, 0x6f,
+	0x5b, 0x1e, 0x09, 0xad, 0x76, 0xa8, 0xed, 0xaa, 0xfd, 0x2b, 0xad, 0xfb, 0x02, 0x6a, 0x68, 0x55,
+	0xb5, 0xca, 0xb6, 0x6b, 0x31, 0x9b, 0x06, 0xb6, 0x17, 0xcb, 0x94, 0x96, 0x2b, 0x24, 0x6f, 0x55,
+	0xed, 0xbc, 0xe5, 0xba, 0x94, 0x89, 0xcd, 0xa0, 0xfa, 0x19, 0xb5, 0x2b, 0xbe, 0x6d, 0xfb, 0xf7,
+	0xf3, 0x96, 0xbb, 0x1f, 0x6c, 0xc9, 0x24, 0xa6, 0x24, 0x47, 0x7e, 0x51, 0x5b, 0xb9, 0xa8, 0x17,
+	0xb3, 0x1d, 0xe2, 0x31, 0xcb, 0xa9, 0x4a, 0x03, 0x3c, 0x01, 0x63, 0x9b, 0x56, 0xcd, 0x72, 0x3c,
+	0x83, 0x3c, 0xf2, 0x89, 0xc7, 0xf0, 0x5d, 0x18, 0x0f, 0x16, 0xbc, 0x2a, 0x75, 0x3d, 0x82, 0x56,
+	0x61, 0xb8, 0x2a, 0x56, 0xa6, 0xb5, 0x39, 0x6d, 0x7e, 0x74, 0xf9, 0x92, 0x1e, 0x73, 0x4c, 0xba,
+	0x74, 0x2e, 0xa4, 0x9f, 0xd4, 0x73, 0x27, 0x0c, 0xe5, 0x88, 0x9f, 0x6b, 0x30, 0xb7, 0xe1, 0x31,
+	0xdb, 0xb1, 0x18, 0xb9, 0xfb, 0xd8, 0xaa, 0x6e, 0xec, 0x59, 0x3b, 0x6c, 0xd5, 0xa1, 0xbe, 0xcb,
+	0x8a, 0xae, 0xca, 0x8c, 0x16, 0xe0, 0x05, 0x1e, 0xd0, 0xb4, 0x4b, 0xd3, 0xa9, 0x39, 0x6d, 0x3e,
+	0x5d, 0x40, 0x8d, 0x7a, 0x6e, 0x7c, 0xdf, 0x72, 0x2a, 0x37, 0xb1, 0xda, 0xc0, 0xc6, 0x30, 0xff,
+	0x54, 0x2c, 0x21, 0x1d, 0x46, 0x18, 0x7d, 0x48, 0x5c, 0xd3, 0x76, 0xa7, 0x87, 0xe6, 0xb4, 0xf9,
+	0x4c, 0xe1, 0x4c, 0xa3, 0x9e, 0x9b, 0x90, 0xd6, 0xc1, 0x0e, 0x36, 0x5e, 0x10, 0x1f, 0x8b, 0x2e,
+	0xba, 0x07, 0xc3, 0xe2, 0xdc, 0xbc, 0xe9, 0xf4, 0xdc, 0xd0, 0xfc, 0xe8, 0xb2, 0x1e, 0x0b, 0x82,
+	0xd7, 0x18, 0x96, 0xc7, 0xdd, 0x0a, 0x53, 0x1c, 0x4f, 0xa3, 0x9e, 0x1b, 0x93, 0x19, 0x64, 0x2c,
+	0x6c, 0xa8, 0xa0, 0xdf, 0x4c, 0x8f, 0x68, 0x93, 0x29, 0x63, 0xd8, 0x23, 0x6e, 0x89, 0xd4, 0xf0,
+	0x67, 0x29, 0x58, 0xee, 0x0a, 0xf7, 0x03, 0x9b, 0x3d, 0xd8, 0xac, 0xd9, 0x8e, 0xcd, 0xec, 0x5d,
+	0xb2, 0xb5, 0x5f, 0x25, 0x5e, 0x07, 0x02, 0xb4, 0xbe, 0x08, 0x48, 0x25, 0x20, 0xe0, 0x2d, 0x18,
+	0x97, 0xb5, 0x9a, 0x41, 0x8e, 0xa1, 0xb9, 0xa1, 0xf9, 0x74, 0x61, 0xa6, 0x51, 0xcf, 0x4d, 0xb5,
+	0x82, 0x32, 0xc3, 0x54, 0xa7, 0xe4, 0xc2, 0xa6, 0x4c, 0xf8, 0x3e, 0x9c, 0x53, 0x06, 0x32, 0x3a,
+	0xf5, 0x99, 0x59, 0x22, 0x2e, 0x75, 0x04, 0xa3, 0x99, 0xc2, 0x8b, 0x8d, 0x7a, 0xee, 0x2b, 0x6d,
+	0x81, 0x22, 0x76, 0xd8, 0x38, 0x23, 0x37, 0xb6, 0xf8, 0xfa, 0x1d, 0x9f, 0xad, 0x8b, 0xd5, 0x3f,
+	0x69, 0x70, 0x25, 0x24, 0xcb, 0x76, 0xcb, 0x15, 0xc2, 0x13, 0x26, 0xe9, 0x92, 0xe3, 0x27, 0xa9,
+	0x00, 0x13, 0x51, 0x70, 0xb2, 0xb9, 0xb2, 0x8d, 0x7a, 0xee, 0x5c, 0xab, 0x5b, 0x0b, 0xaa, 0x31,
+	0xd6, 0x86, 0xe7, 0x67, 0x1a, 0xbc, 0x18, 0xd3, 0xeb, 0x6a, 0xa8, 0xb6, 0x61, 0xb2, 0x19, 0xc8,
+	0x12, 0xbb, 0x02, 0x4f, 0xa6, 0x70, 0x83, 0x77, 0xda, 0x3f, 0xea, 0xb9, 0x29, 0x39, 0xc8, 0x5e,
+	0xe9, 0xa1, 0x6e, 0xd3, 0xbc, 0x63, 0xb1, 0x07, 0x7a, 0xd1, 0x65, 0x8d, 0x7a, 0xee, 0x7c, 0xb4,
+	0x0e, 0xe9, 0x8e, 0x8d, 0xf1, 0xa0, 0x10, 0x99, 0x0d, 0xff, 0xaf, 0x7b, 0x25, 0x77, 0x7c, 0x36,
+	0xd0, 0xd8, 0xfd, 0x30, 0x1c, 0xa3, 0x21, 0x31, 0x46, 0xf9, 0x84, 0x63, 0xc4, 0xf3, 0x25, 0x98,
+	0x23, 0xb4, 0x04, 0x99, 0x10, 0xd7, 0x74, 0x5a, 0xf0, 0x71, 0xb6, 0x51, 0xcf, 0x4d, 0x46, 0x20,
+	0x63, 0x63, 0x24, 0xc0, 0x1a, 0x19, 0xbd, 0xcf, 0x53, 0xb0, 0xd2, 0x1d, 0xf3, 0x31, 0xcd, 0xde,
+	0xe1, 0x59, 0x4a, 0xf5, 0x37, 0x4b, 0x77, 0x61, 0xaa, 0x6d, 0x46, 0x6c, 0x37, 0xec, 0x36, 0x3e,
+	0x4a, 0x73, 0x8d, 0x7a, 0xee, 0x62, 0x87, 0x51, 0x0a, 0xcc, 0xb0, 0x81, 0x5a, 0x26, 0xa9, 0xe8,
+	0x8a, 0xc6, 0x1b, 0x80, 0x3b, 0xfc, 0x67, 0x0d, 0x16, 0x7a, 0xce, 0x5e, 0xe7, 0x5e, 0x49, 0xc4,
+	0x52, 0x04, 0x9d, 0x1c, 0xc1, 0x16, 0x96, 0xa2, 0xb0, 0x4e, 0xb1, 0xae, 0x80, 0x86, 0x12, 0x01,
+	0xfa, 0xa9, 0x06, 0x38, 0xae, 0xe5, 0xd5, 0xf4, 0x99, 0xc1, 0x9c, 0xdb, 0x6e, 0xfb, 0xf0, 0x5d,
+	0xef, 0x35, 0x7c, 0xe7, 0x22, 0x85, 0x07, 0xb3, 0x37, 0xa6, 0x2a, 0x57, 0xa3, 0x77, 0x1a, 0x26,
+	0xbe, 0xe3, 0x3b, 0x9c, 0xcc, 0xf0, 0xc1, 0xba, 0x01, 0x93, 0xcd, 0x25, 0x55, 0xc7, 0x12, 0x64,
+	0x5c, 0xdf, 0x11, 0x5d, 0xe2, 0x29, 0x46, 0x5b, 0x10, 0x86, 0x5b, 0xd8, 0x18, 0x71, 0x95, 0x2b,
+	0xbe, 0x09, 0xa3, 0xfc, 0xc3, 0x20, 0x27, 0x82, 0xd7, 0xe0, 0x94, 0xf4, 0x55, 0xe9, 0x57, 0x20,
+	0xcd, 0x77, 0xd4, 0x73, 0xfd, 0xac, 0x2e, 0x5f, 0x16, 0xf4, 0xe0, 0x65, 0x41, 0x5f, 0x75, 0xf7,
+	0x0b, 0x99, 0x2f, 0xfe, 0xb0, 0x78, 0x52, 0xb4, 0xad, 0x21, 0x8c, 0x39, 0xb4, 0xd5, 0x4a, 0xa5,
+	0x0d, 0x5a, 0x11, 0x26, 0x9b, 0x4b, 0x2a, 0xf6, 0x6b, 0x70, 0x32, 0x80, 0x35, 0x94, 0x24, 0xb8,
+	0xb4, 0xc6, 0x07, 0x1a, 0x4c, 0xde, 0xad, 0x52, 0xb6, 0x59, 0xb3, 0x77, 0xc8, 0x40, 0x6d, 0xb7,
+	0x01, 0x93, 0xfc, 0x6d, 0xcb, 0xb4, 0x3c, 0x8f, 0xb0, 0xb6, 0xc6, 0xbb, 0xd0, 0xbc, 0x3c, 0xa3,
+	0x16, 0xd8, 0x18, 0xe7, 0x4b, 0xab, 0x7c, 0x45, 0x36, 0xdf, 0x6d, 0x38, 0xfd, 0xc8, 0xa7, 0xac,
+	0x3d, 0x8e, 0x6c, 0xc2, 0x8b, 0x8d, 0x7a, 0x6e, 0x5a, 0xc6, 0x39, 0x64, 0x82, 0x8d, 0x09, 0xb1,
+	0xd6, 0x8c, 0x84, 0x8b, 0x70, 0xba, 0x05, 0x91, 0xa2, 0xe7, 0x1a, 0x80, 0x57, 0xa5, 0xcc, 0xac,
+	0xf2, 0x55, 0xd5, 0x7c, 0x53, 0x8d, 0x7a, 0xee, 0xb4, 0x8c, 0xdb, 0xdc, 0xc3, 0x46, 0xc6, 0x0b,
+	0xbc, 0xf1, 0x6d, 0x98, 0xd9, 0xa2, 0xcc, 0x12, 0x54, 0xbf, 0x6b, 0x3f, 0xf2, 0xed, 0x92, 0xcd,
+	0xf6, 0x07, 0x6a, 0x85, 0xdf, 0x68, 0x90, 0xed, 0x14, 0x4a, 0x95, 0xf7, 0x31, 0x64, 0x2a, 0xc1,
+	0xa2, 0x3a, 0xc1, 0x19, 0x5d, 0xbd, 0x59, 0x72, 0xa2, 0xc2, 0x2b, 0x7e, 0x8d, 0xda, 0x6e, 0x61,
+	0x5d, 0x5d, 0xea, 0xaa, 0x6f, 0x43, 0x4f, 0xfc, 0xd9, 0x3f, 0x73, 0xf3, 0x65, 0x9b, 0x3d, 0xf0,
+	0xb7, 0xf5, 0x1d, 0xea, 0xa8, 0x57, 0x53, 0xf5, 0x67, 0xd1, 0x2b, 0x3d, 0xcc, 0x33, 0x7e, 0x07,
+	0x8b, 0x20, 0x9e, 0xd1, 0xcc, 0x88, 0xcf, 0xc3, 0x94, 0x28, 0x2e, 0x8a, 0x11, 0x7f, 0xaa, 0xc1,
+	0xb9, 0xe8, 0xce, 0x97, 0xa3, 0xe4, 0xe0, 0x68, 0xde, 0xa7, 0x15, 0xdf, 0x21, 0xb7, 0x68, 0x6d,
+	0xe0, 0x29, 0xfd, 0x55, 0x70, 0x34, 0x91, 0x50, 0x0a, 0x27, 0x83, 0xe1, 0x5d, 0xb1, 0xd1, 0x1b,
+	0xe4, 0x6a, 0xfb, 0xc3, 0x56, 0xba, 0xf5, 0x87, 0x50, 0xe5, 0xc2, 0xbb, 0x90, 0xdd, 0xaa, 0x59,
+	0x25, 0xdb, 0x2d, 0x6f, 0x5a, 0x76, 0x6d, 0xcb, 0x7a, 0x48, 0x6a, 0xb7, 0x48, 0xeb, 0x80, 0x8a,
+	0xee, 0x37, 0x5f, 0x55, 0xad, 0xdc, 0x82, 0x4f, 0x6d, 0x60, 0x63, 0x58, 0x7c, 0x7a, 0xb5, 0x69,
+	0xbc, 0xa4, 0xe6, 0xf2, 0x90, 0xf1, 0x52, 0x60, 0xbc, 0x84, 0x7f, 0x04, 0x17, 0x3a, 0xe6, 0x55,
+	0x64, 0x7c, 0x0b, 0x32, 0x8c, 0xaf, 0x99, 0xf7, 0x49, 0x30, 0x45, 0xba, 0xba, 0xc2, 0x2f, 0x27,
+	0xc0, 0xb8, 0x4e, 0x76, 0x8c, 0x11, 0xa6, 0x82, 0xe2, 0xbf, 0xa6, 0xe0, 0x72, 0xf0, 0xf0, 0xe0,
+	0x49, 0x49, 0xc1, 0xf2, 0x48, 0xe9, 0x8e, 0x2b, 0x66, 0xaf, 0xe8, 0x54, 0xad, 0x9d, 0xf0, 0x41,
+	0xf8, 0x0d, 0xc8, 0xdc, 0xaf, 0x51, 0xc7, 0xe4, 0x52, 0x4f, 0x5d, 0x9f, 0x31, 0xe7, 0x20, 0xc5,
+	0xd0, 0x08, 0xf7, 0xe0, 0xdf, 0x11, 0x86, 0x31, 0x46, 0x85, 0x6f, 0xeb, 0xfd, 0x64, 0x8c, 0x32,
+	0xca, 0xb7, 0xe5, 0xfd, 0x73, 0xbe, 0xd9, 0x32, 0xfc, 0xd6, 0x49, 0x87, 0xf7, 0xdb, 0x87, 0x30,
+	0xe9, 0x58, 0x7b, 0xf2, 0x72, 0x30, 0x6d, 0x51, 0x95, 0x7a, 0xda, 0xf7, 0x8b, 0x7c, 0xdc, 0xb1,
+	0xf6, 0x5a, 0xb0, 0xa1, 0xf7, 0x60, 0x9c, 0xec, 0x31, 0x52, 0x73, 0xad, 0x8a, 0xba, 0x97, 0x4e,
+	0x0e, 0x14, 0x77, 0x2c, 0x88, 0x22, 0x2f, 0xad, 0xcf, 0x35, 0x78, 0xb9, 0x27, 0xad, 0xea, 0x3c,
+	0xdf, 0x04, 0xb0, 0xdd, 0xaa, 0xcf, 0xfa, 0x22, 0x36, 0x23, 0x5c, 0x04, 0xb3, 0x6f, 0xc3, 0x28,
+	0xf5, 0x59, 0x18, 0x20, 0x95, 0x2c, 0x00, 0x48, 0x1f, 0xbe, 0xb2, 0xfc, 0xb7, 0x2c, 0x9c, 0xfc,
+	0x2e, 0x17, 0xea, 0xe8, 0x17, 0x1a, 0x0c, 0x4b, 0x35, 0x8b, 0xae, 0x24, 0x90, 0xbc, 0xaa, 0x35,
+	0xb2, 0x0b, 0x89, 0x6c, 0x25, 0x5e, 0xbc, 0xf0, 0x93, 0xbf, 0xfc, 0xfb, 0xd7, 0xa9, 0xaf, 0xa2,
+	0x4b, 0xf9, 0xb8, 0x9f, 0x1d, 0x54, 0x15, 0xff, 0xd1, 0x60, 0xa6, 0xab, 0xb2, 0x40, 0x6f, 0xc4,
+	0xe6, 0xed, 0xa5, 0xbe, 0xb3, 0x6f, 0x0e, 0xea, 0xae, 0x90, 0xbc, 0x2b, 0x90, 0xdc, 0x42, 0xeb,
+	0xb1, 0x48, 0x7e, 0xac, 0x7a, 0xfa, 0xe3, 0x3c, 0x51, 0x11, 0xe5, 0x6f, 0x2a, 0x84, 0xc7, 0x54,
+	0x2f, 0x53, 0xa6, 0xed, 0xa2, 0xdf, 0xa5, 0x5a, 0x5e, 0x4c, 0x7b, 0x2b, 0x68, 0x74, 0x67, 0xb0,
+	0xea, 0xbb, 0xea, 0x81, 0x23, 0xd3, 0x61, 0x09, 0x3a, 0xbe, 0x8f, 0xbe, 0x77, 0x1c, 0x74, 0x98,
+	0x8f, 0x6d, 0xf6, 0x80, 0x8f, 0xa4, 0x2c, 0xd4, 0x14, 0xa3, 0x86, 0x7e, 0x9e, 0x82, 0x4b, 0x09,
+	0x84, 0x33, 0x7a, 0x27, 0x19, 0x94, 0x9e, 0xd2, 0xfb, 0xc8, 0x9c, 0x7c, 0x28, 0x38, 0x31, 0xd0,
+	0x66, 0xdf, 0x9c, 0x88, 0xda, 0xa4, 0x98, 0xea, 0xd8, 0x2e, 0xcf, 0x35, 0xc8, 0x76, 0x7f, 0xed,
+	0x47, 0x03, 0x15, 0xde, 0x94, 0x3d, 0xd9, 0xb7, 0x06, 0xf6, 0x57, 0xc8, 0xbf, 0x2d, 0x90, 0xbf,
+	0x83, 0x36, 0x8e, 0xde, 0x0d, 0xd4, 0x67, 0xe8, 0xf7, 0x29, 0xb8, 0xda, 0x8f, 0xc8, 0x45, 0x9b,
+	0x03, 0x02, 0xe8, 0x3e, 0x1f, 0x47, 0xa6, 0x64, 0x5b, 0x50, 0xf2, 0x03, 0xf4, 0xd1, 0xb1, 0x50,
+	0xd2, 0x79, 0x42, 0x3e, 0x49, 0xc1, 0x4b, 0x49, 0xe4, 0x2d, 0xba, 0x7d, 0xb4, 0x11, 0x39, 0xce,
+	0x56, 0xb9, 0x27, 0x78, 0xf9, 0x00, 0xbd, 0xd7, 0x27, 0x2f, 0x9c, 0x85, 0x1e, 0x83, 0xc2, 0x5b,
+	0xe7, 0x53, 0x0d, 0x46, 0x02, 0x19, 0x8a, 0xae, 0xc6, 0x16, 0x1b, 0x11, 0xb0, 0xd9, 0xc5, 0x84,
+	0xd6, 0x0a, 0x88, 0x2e, 0x80, 0xcc, 0xa3, 0xcb, 0xb1, 0x40, 0x42, 0x8d, 0x8b, 0x7e, 0xa9, 0x41,
+	0x9a, 0x47, 0x40, 0xf3, 0xf1, 0x0f, 0xd0, 0xe6, 0x6b, 0x75, 0xf6, 0x95, 0x04, 0x96, 0xaa, 0x9a,
+	0x6b, 0xa2, 0x1a, 0x1d, 0x5d, 0x8d, 0xad, 0x46, 0x54, 0xd2, 0x24, 0x57, 0xb0, 0x15, 0x28, 0xdb,
+	0x1e, 0x6c, 0x45, 0x34, 0x71, 0x0f, 0xb6, 0xa2, 0x72, 0x39, 0x21, 0x5b, 0x56, 0xa5, 0xb2, 0x28,
+	0xd9, 0xfa, 0xad, 0x06, 0x99, 0x50, 0x55, 0xa2, 0xf8, 0x64, 0x51, 0x3d, 0x9d, 0xd5, 0x93, 0x9a,
+	0xab, 0xe2, 0x56, 0x44, 0x71, 0x8b, 0x68, 0xa1, 0x63, 0x71, 0x11, 0xd2, 0xf2, 0xe2, 0xd5, 0xd1,
+	0x43, 0x07, 0x1a, 0xa0, 0xc3, 0x0a, 0x13, 0x7d, 0x2d, 0x36, 0x77, 0x57, 0x75, 0x9b, 0xbd, 0xde,
+	0xb7, 0x9f, 0x2a, 0xbe, 0x28, 0x8a, 0x5f, 0x43, 0xab, 0xfd, 0x9c, 0x7c, 0x9e, 0xf1, 0x80, 0x72,
+	0x90, 0x42, 0x8d, 0x87, 0xfe, 0xa8, 0xc1, 0x78, 0xbb, 0xfa, 0x44, 0xcb, 0xbd, 0xcb, 0x3a, 0x04,
+	0x65, 0xa5, 0x2f, 0x1f, 0x05, 0xe3, 0xa6, 0x80, 0x71, 0x0d, 0x2d, 0x27, 0x80, 0x21, 0x8b, 0x6f,
+	0xd6, 0xfd, 0x24, 0x38, 0x8a, 0x36, 0x45, 0x99, 0xe4, 0x28, 0x3a, 0xa9, 0xd9, 0x24, 0x47, 0xd1,
+	0x51, 0xba, 0xe2, 0x55, 0x81, 0xe1, 0xeb, 0xe8, 0xf5, 0x01, 0x8e, 0x42, 0xea, 0x50, 0xf4, 0x85,
+	0x06, 0x67, 0x3a, 0x08, 0x42, 0xd4, 0xa3, 0xa6, 0xae, 0xd2, 0x35, 0x7b, 0xa3, 0x7f, 0x47, 0x85,
+	0xe6, 0x6d, 0x81, 0xe6, 0x26, 0xba, 0x91, 0xe4, 0x44, 0x64, 0x1c, 0xb3, 0x6a, 0xd9, 0x35, 0x53,
+	0x08, 0xce, 0xfb, 0x84, 0xa0, 0xff, 0x6a, 0x90, 0xeb, 0xa1, 0x8c, 0xd0, 0x5a, 0xa2, 0x07, 0x4a,
+	0xbc, 0x5c, 0xcd, 0xae, 0x1f, 0x2d, 0x88, 0x02, 0xfc, 0x86, 0x00, 0x7c, 0x1d, 0xbd, 0xd6, 0xef,
+	0xa3, 0x89, 0x89, 0xc0, 0xf7, 0x9e, 0x3c, 0x9d, 0xd5, 0x0e, 0x9e, 0xce, 0x6a, 0xff, 0x7a, 0x3a,
+	0xab, 0x7d, 0xf2, 0x6c, 0xf6, 0xc4, 0xc1, 0xb3, 0xd9, 0x13, 0x7f, 0x7f, 0x36, 0x7b, 0xe2, 0xa3,
+	0xb5, 0x16, 0x61, 0xa9, 0x42, 0x2f, 0x56, 0xac, 0x6d, 0x2f, 0xcc, 0xb3, 0xbb, 0xf4, 0x7a, 0x7e,
+	0xaf, 0x2d, 0xdb, 0x4e, 0xc5, 0x26, 0x2e, 0x93, 0xff, 0x52, 0x95, 0x3f, 0x29, 0x0e, 0x8b, 0x3f,
+	0x2b, 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x70, 0x5b, 0x58, 0x32, 0x6e, 0x1e, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -1543,6 +1642,8 @@ type QueryClient interface {
 	TotalLiquidity(ctx context.Context, in *TotalLiquidityRequest, opts ...grpc.CallOption) (*TotalLiquidityResponse, error)
 	// TotalVolumeForPool returns the total volume of the specified pool.
 	TotalVolumeForPool(ctx context.Context, in *TotalVolumeForPoolRequest, opts ...grpc.CallOption) (*TotalVolumeForPoolResponse, error)
+	// TotalVolumeForPool returns the total volume of the specified pool.
+	TradingPairTakerFee(ctx context.Context, in *TradingPairTakerFeeRequest, opts ...grpc.CallOption) (*TradingPairTakerFeeResponse, error)
 	// EstimateTradeBasedOnPriceImpact returns an estimated trade based on price
 	// impact, if a trade cannot be estimated a 0 input and 0 output would be
 	// returned.
@@ -1683,6 +1784,15 @@ func (c *queryClient) TotalVolumeForPool(ctx context.Context, in *TotalVolumeFor
 	return out, nil
 }
 
+func (c *queryClient) TradingPairTakerFee(ctx context.Context, in *TradingPairTakerFeeRequest, opts ...grpc.CallOption) (*TradingPairTakerFeeResponse, error) {
+	out := new(TradingPairTakerFeeResponse)
+	err := c.cc.Invoke(ctx, "/osmosis.poolmanager.v1beta1.Query/TradingPairTakerFee", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *queryClient) EstimateTradeBasedOnPriceImpact(ctx context.Context, in *EstimateTradeBasedOnPriceImpactRequest, opts ...grpc.CallOption) (*EstimateTradeBasedOnPriceImpactResponse, error) {
 	out := new(EstimateTradeBasedOnPriceImpactResponse)
 	err := c.cc.Invoke(ctx, "/osmosis.poolmanager.v1beta1.Query/EstimateTradeBasedOnPriceImpact", in, out, opts...)
@@ -1729,6 +1839,8 @@ type QueryServer interface {
 	TotalLiquidity(context.Context, *TotalLiquidityRequest) (*TotalLiquidityResponse, error)
 	// TotalVolumeForPool returns the total volume of the specified pool.
 	TotalVolumeForPool(context.Context, *TotalVolumeForPoolRequest) (*TotalVolumeForPoolResponse, error)
+	// TotalVolumeForPool returns the total volume of the specified pool.
+	TradingPairTakerFee(context.Context, *TradingPairTakerFeeRequest) (*TradingPairTakerFeeResponse, error)
 	// EstimateTradeBasedOnPriceImpact returns an estimated trade based on price
 	// impact, if a trade cannot be estimated a 0 input and 0 output would be
 	// returned.
@@ -1781,6 +1893,9 @@ func (*UnimplementedQueryServer) TotalLiquidity(ctx context.Context, req *TotalL
 func (*UnimplementedQueryServer) TotalVolumeForPool(ctx context.Context, req *TotalVolumeForPoolRequest) (*TotalVolumeForPoolResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method TotalVolumeForPool not implemented")
 }
+func (*UnimplementedQueryServer) TradingPairTakerFee(ctx context.Context, req *TradingPairTakerFeeRequest) (*TradingPairTakerFeeResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method TradingPairTakerFee not implemented")
+}
 func (*UnimplementedQueryServer) EstimateTradeBasedOnPriceImpact(ctx context.Context, req *EstimateTradeBasedOnPriceImpactRequest) (*EstimateTradeBasedOnPriceImpactResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method EstimateTradeBasedOnPriceImpact not implemented")
 }
@@ -2041,6 +2156,24 @@ func _Query_TotalVolumeForPool_Handler(srv interface{}, ctx context.Context, dec
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Query_TradingPairTakerFee_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(TradingPairTakerFeeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(QueryServer).TradingPairTakerFee(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/osmosis.poolmanager.v1beta1.Query/TradingPairTakerFee",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(QueryServer).TradingPairTakerFee(ctx, req.(*TradingPairTakerFeeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _Query_EstimateTradeBasedOnPriceImpact_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(EstimateTradeBasedOnPriceImpactRequest)
 	if err := dec(in); err != nil {
@@ -2119,6 +2252,10 @@ var _Query_serviceDesc = grpc.ServiceDesc{
 			MethodName: "TotalVolumeForPool",
 			Handler:    _Query_TotalVolumeForPool_Handler,
 		},
+		{
+			MethodName: "TradingPairTakerFee",
+			Handler:    _Query_TradingPairTakerFee_Handler,
+		},
 		{
 			MethodName: "EstimateTradeBasedOnPriceImpact",
 			Handler:    _Query_EstimateTradeBasedOnPriceImpact_Handler,
@@ -2992,6 +3129,76 @@ func (m *TotalVolumeForPoolResponse) MarshalToSizedBuffer(dAtA []byte) (int, err
 	return len(dAtA) - i, nil
 }
 
+func (m *TradingPairTakerFeeRequest) 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 *TradingPairTakerFeeRequest) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *TradingPairTakerFeeRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if len(m.Denom_1) > 0 {
+		i -= len(m.Denom_1)
+		copy(dAtA[i:], m.Denom_1)
+		i = encodeVarintQuery(dAtA, i, uint64(len(m.Denom_1)))
+		i--
+		dAtA[i] = 0x12
+	}
+	if len(m.Denom_0) > 0 {
+		i -= len(m.Denom_0)
+		copy(dAtA[i:], m.Denom_0)
+		i = encodeVarintQuery(dAtA, i, uint64(len(m.Denom_0)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *TradingPairTakerFeeResponse) 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 *TradingPairTakerFeeResponse) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *TradingPairTakerFeeResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	{
+		size := m.TakerFee.Size()
+		i -= size
+		if _, err := m.TakerFee.MarshalTo(dAtA[i:]); err != nil {
+			return 0, err
+		}
+		i = encodeVarintQuery(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0xa
+	return len(dAtA) - i, nil
+}
+
 func (m *EstimateTradeBasedOnPriceImpactRequest) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
@@ -3476,6 +3683,34 @@ func (m *TotalVolumeForPoolResponse) Size() (n int) {
 	return n
 }
 
+func (m *TradingPairTakerFeeRequest) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.Denom_0)
+	if l > 0 {
+		n += 1 + l + sovQuery(uint64(l))
+	}
+	l = len(m.Denom_1)
+	if l > 0 {
+		n += 1 + l + sovQuery(uint64(l))
+	}
+	return n
+}
+
+func (m *TradingPairTakerFeeResponse) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = m.TakerFee.Size()
+	n += 1 + l + sovQuery(uint64(l))
+	return n
+}
+
 func (m *EstimateTradeBasedOnPriceImpactRequest) Size() (n int) {
 	if m == nil {
 		return 0
@@ -5835,6 +6070,204 @@ func (m *TotalVolumeForPoolResponse) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
+func (m *TradingPairTakerFeeRequest) 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 ErrIntOverflowQuery
+			}
+			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: TradingPairTakerFeeRequest: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: TradingPairTakerFeeRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Denom_0", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				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 ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Denom_0 = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Denom_1", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				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 ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Denom_1 = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipQuery(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *TradingPairTakerFeeResponse) 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 ErrIntOverflowQuery
+			}
+			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: TradingPairTakerFeeResponse: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: TradingPairTakerFeeResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field TakerFee", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowQuery
+				}
+				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 ErrInvalidLengthQuery
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if err := m.TakerFee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipQuery(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthQuery
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
 func (m *EstimateTradeBasedOnPriceImpactRequest) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
diff --git a/x/poolmanager/client/queryproto/query.pb.gw.go b/x/poolmanager/client/queryproto/query.pb.gw.go
index 493c24bee7a..a22f9280715 100644
--- a/x/poolmanager/client/queryproto/query.pb.gw.go
+++ b/x/poolmanager/client/queryproto/query.pb.gw.go
@@ -771,6 +771,42 @@ func local_request_Query_TotalVolumeForPool_0(ctx context.Context, marshaler run
 
 }
 
+var (
+	filter_Query_TradingPairTakerFee_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
+)
+
+func request_Query_TradingPairTakerFee_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq TradingPairTakerFeeRequest
+	var metadata runtime.ServerMetadata
+
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_TradingPairTakerFee_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	msg, err := client.TradingPairTakerFee(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	return msg, metadata, err
+
+}
+
+func local_request_Query_TradingPairTakerFee_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq TradingPairTakerFeeRequest
+	var metadata runtime.ServerMetadata
+
+	if err := req.ParseForm(); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_TradingPairTakerFee_0); err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	msg, err := server.TradingPairTakerFee(ctx, &protoReq)
+	return msg, metadata, err
+
+}
+
 var (
 	filter_Query_EstimateTradeBasedOnPriceImpact_0 = &utilities.DoubleArray{Encoding: map[string]int{"pool_id": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}
 )
@@ -1171,6 +1207,29 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 
 	})
 
+	mux.Handle("GET", pattern_Query_TradingPairTakerFee_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := local_request_Query_TradingPairTakerFee_0(rctx, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
+		ctx = runtime.NewServerMetadataContext(ctx, md)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_Query_TradingPairTakerFee_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
 	mux.Handle("GET", pattern_Query_EstimateTradeBasedOnPriceImpact_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -1515,6 +1574,26 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 
 	})
 
+	mux.Handle("GET", pattern_Query_TradingPairTakerFee_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)
+		rctx, err := runtime.AnnotateContext(ctx, mux, req)
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := request_Query_TradingPairTakerFee_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_TradingPairTakerFee_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
 	mux.Handle("GET", pattern_Query_EstimateTradeBasedOnPriceImpact_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -1567,6 +1646,8 @@ var (
 
 	pattern_Query_TotalVolumeForPool_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5}, []string{"osmosis", "poolmanager", "v1beta1", "pools", "pool_id", "total_volume"}, "", runtime.AssumeColonVerbOpt(false)))
 
+	pattern_Query_TradingPairTakerFee_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"osmosis", "poolmanager", "v1beta1", "pools", "trading_pair_takerfee"}, "", runtime.AssumeColonVerbOpt(false)))
+
 	pattern_Query_EstimateTradeBasedOnPriceImpact_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"osmosis", "poolmanager", "v1beta1", "pool_id", "estimate_trade"}, "", runtime.AssumeColonVerbOpt(false)))
 )
 
@@ -1599,5 +1680,7 @@ var (
 
 	forward_Query_TotalVolumeForPool_0 = runtime.ForwardResponseMessage
 
+	forward_Query_TradingPairTakerFee_0 = runtime.ForwardResponseMessage
+
 	forward_Query_EstimateTradeBasedOnPriceImpact_0 = runtime.ForwardResponseMessage
 )

From a42635133946dec10fec463f802fe41d291b6e44 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Thu, 12 Oct 2023 07:54:46 +0000
Subject: [PATCH 02/12] Generated protofile changes

---
 x/poolmanager/client/grpc/grpc_query.go | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/x/poolmanager/client/grpc/grpc_query.go b/x/poolmanager/client/grpc/grpc_query.go
index 2019ae16d38..f88b08037ce 100644
--- a/x/poolmanager/client/grpc/grpc_query.go
+++ b/x/poolmanager/client/grpc/grpc_query.go
@@ -91,17 +91,6 @@ func (q Querier) NumPools(grpcCtx context.Context,
 	return q.Q.NumPools(ctx, *req)
 }
 
-
-func (q Querier) TradingPairTakerFee(grpcCtx context.Context,
-	req *queryproto.TradingPairTakerFeeRequest,
-) (*queryproto.TradingPairTakerFeeResponse, error) {
-	if req == nil {
-		return nil, status.Error(codes.InvalidArgument, "empty request")
-	}
-	ctx := sdk.UnwrapSDKContext(grpcCtx)
-	return q.Q.TradingPairTakerFee(ctx, *req)
-}
-
 func (q Querier) EstimateTradeBasedOnPriceImpact(grpcCtx context.Context,
 	req *queryproto.EstimateTradeBasedOnPriceImpactRequest,
 ) (*queryproto.EstimateTradeBasedOnPriceImpactResponse, error) {

From 56a589bda347ed6cabc6aa0903629819c9f962f2 Mon Sep 17 00:00:00 2001
From: mattverse <mattpark1028@gmail.com>
Date: Thu, 12 Oct 2023 16:56:30 +0900
Subject: [PATCH 03/12] Add Taker fee

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ad5c2fe667..3b04ab506f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -58,6 +58,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * [#6421](https://github.com/osmosis-labs/osmosis/pull/6421) Moves ValidatePermissionlessPoolCreationEnabled out of poolmanager module
 * [#6627](https://github.com/osmosis-labs/osmosis/pull/6627) Limit pow iterations in osmomath.
 * [#6586](https://github.com/osmosis-labs/osmosis/pull/6586) add auth.moduleaccounts to the stargate whitelist
+* [#6680](https://github.com/osmosis-labs/osmosis/pull/6680) Add Taker Fee query and add it to stargate whitelist
 
 ### Bug Fixes
 * [#6644](https://github.com/osmosis-labs/osmosis/pull/6644) fix: genesis bug in pool incentives linking NoLock gauges and PoolIDs

From 8113527c944723122ffec34e18cf6178dc459872 Mon Sep 17 00:00:00 2001
From: mattverse <mattpark1028@gmail.com>
Date: Thu, 12 Oct 2023 17:12:28 +0900
Subject: [PATCH 04/12] Add querier logic

---
 x/poolmanager/client/grpc/grpc_query.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/x/poolmanager/client/grpc/grpc_query.go b/x/poolmanager/client/grpc/grpc_query.go
index f88b08037ce..184ec306a86 100644
--- a/x/poolmanager/client/grpc/grpc_query.go
+++ b/x/poolmanager/client/grpc/grpc_query.go
@@ -91,6 +91,16 @@ func (q Querier) NumPools(grpcCtx context.Context,
 	return q.Q.NumPools(ctx, *req)
 }
 
+func (q Querier) TradingPairTakerFee(grpcCtx context.Context,
+	req *queryproto.TradingPairTakerFeeRequest,
+) (*queryproto.TradingPairTakerFeeResponse, error) {
+	if req == nil {
+		return nil, status.Error(codes.InvalidArgument, "empty request")
+	}
+	ctx := sdk.UnwrapSDKContext(grpcCtx)
+	return q.Q.TradingPairTakerFee(ctx, *req)
+}
+
 func (q Querier) EstimateTradeBasedOnPriceImpact(grpcCtx context.Context,
 	req *queryproto.EstimateTradeBasedOnPriceImpactRequest,
 ) (*queryproto.EstimateTradeBasedOnPriceImpactResponse, error) {

From ec927e071a843c5bf9b0b3c75556db058f5d97df Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Thu, 12 Oct 2023 08:14:47 +0000
Subject: [PATCH 05/12] Generated protofile changes

---
 x/poolmanager/client/grpc/grpc_query.go | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/x/poolmanager/client/grpc/grpc_query.go b/x/poolmanager/client/grpc/grpc_query.go
index 184ec306a86..f88b08037ce 100644
--- a/x/poolmanager/client/grpc/grpc_query.go
+++ b/x/poolmanager/client/grpc/grpc_query.go
@@ -91,16 +91,6 @@ func (q Querier) NumPools(grpcCtx context.Context,
 	return q.Q.NumPools(ctx, *req)
 }
 
-func (q Querier) TradingPairTakerFee(grpcCtx context.Context,
-	req *queryproto.TradingPairTakerFeeRequest,
-) (*queryproto.TradingPairTakerFeeResponse, error) {
-	if req == nil {
-		return nil, status.Error(codes.InvalidArgument, "empty request")
-	}
-	ctx := sdk.UnwrapSDKContext(grpcCtx)
-	return q.Q.TradingPairTakerFee(ctx, *req)
-}
-
 func (q Querier) EstimateTradeBasedOnPriceImpact(grpcCtx context.Context,
 	req *queryproto.EstimateTradeBasedOnPriceImpactRequest,
 ) (*queryproto.EstimateTradeBasedOnPriceImpactResponse, error) {

From ced0a47d09362bc90fe6cfbff2b21340b593a6bd Mon Sep 17 00:00:00 2001
From: mattverse <mattpark1028@gmail.com>
Date: Thu, 12 Oct 2023 21:55:42 +0900
Subject: [PATCH 06/12] Add grpc guery.go

---
 x/poolmanager/client/grpc/grpc_query.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/x/poolmanager/client/grpc/grpc_query.go b/x/poolmanager/client/grpc/grpc_query.go
index f88b08037ce..184ec306a86 100644
--- a/x/poolmanager/client/grpc/grpc_query.go
+++ b/x/poolmanager/client/grpc/grpc_query.go
@@ -91,6 +91,16 @@ func (q Querier) NumPools(grpcCtx context.Context,
 	return q.Q.NumPools(ctx, *req)
 }
 
+func (q Querier) TradingPairTakerFee(grpcCtx context.Context,
+	req *queryproto.TradingPairTakerFeeRequest,
+) (*queryproto.TradingPairTakerFeeResponse, error) {
+	if req == nil {
+		return nil, status.Error(codes.InvalidArgument, "empty request")
+	}
+	ctx := sdk.UnwrapSDKContext(grpcCtx)
+	return q.Q.TradingPairTakerFee(ctx, *req)
+}
+
 func (q Querier) EstimateTradeBasedOnPriceImpact(grpcCtx context.Context,
 	req *queryproto.EstimateTradeBasedOnPriceImpactRequest,
 ) (*queryproto.EstimateTradeBasedOnPriceImpactResponse, error) {

From 621e101559a11a41f1c754c882895870455c9895 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Thu, 12 Oct 2023 12:58:25 +0000
Subject: [PATCH 07/12] Generated protofile changes

---
 x/poolmanager/client/grpc/grpc_query.go | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/x/poolmanager/client/grpc/grpc_query.go b/x/poolmanager/client/grpc/grpc_query.go
index 184ec306a86..f88b08037ce 100644
--- a/x/poolmanager/client/grpc/grpc_query.go
+++ b/x/poolmanager/client/grpc/grpc_query.go
@@ -91,16 +91,6 @@ func (q Querier) NumPools(grpcCtx context.Context,
 	return q.Q.NumPools(ctx, *req)
 }
 
-func (q Querier) TradingPairTakerFee(grpcCtx context.Context,
-	req *queryproto.TradingPairTakerFeeRequest,
-) (*queryproto.TradingPairTakerFeeResponse, error) {
-	if req == nil {
-		return nil, status.Error(codes.InvalidArgument, "empty request")
-	}
-	ctx := sdk.UnwrapSDKContext(grpcCtx)
-	return q.Q.TradingPairTakerFee(ctx, *req)
-}
-
 func (q Querier) EstimateTradeBasedOnPriceImpact(grpcCtx context.Context,
 	req *queryproto.EstimateTradeBasedOnPriceImpactRequest,
 ) (*queryproto.EstimateTradeBasedOnPriceImpactResponse, error) {

From 98eb12a1982c1b2d7353ce58262ed053e8f98f96 Mon Sep 17 00:00:00 2001
From: "Matt, Park" <45252226+mattverse@users.noreply.github.com>
Date: Fri, 13 Oct 2023 18:15:49 +0900
Subject: [PATCH 08/12] Update proto/osmosis/poolmanager/v1beta1/query.proto

Co-authored-by: Adam Tucker <adam@osmosis.team>
---
 proto/osmosis/poolmanager/v1beta1/query.proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proto/osmosis/poolmanager/v1beta1/query.proto b/proto/osmosis/poolmanager/v1beta1/query.proto
index 3fb5c513656..6dcb158cd3b 100644
--- a/proto/osmosis/poolmanager/v1beta1/query.proto
+++ b/proto/osmosis/poolmanager/v1beta1/query.proto
@@ -119,7 +119,7 @@ service Query {
         "/osmosis/poolmanager/v1beta1/pools/{pool_id}/total_volume";
   }
 
-  // TotalVolumeForPool returns the total volume of the specified pool.
+  // TradingPairTakerFee returns the taker fee for a given set of denoms
   rpc TradingPairTakerFee(TradingPairTakerFeeRequest)
       returns (TradingPairTakerFeeResponse) {
     option (google.api.http).get =

From c32025499e85420c6d9daa93ea824b41e22599f9 Mon Sep 17 00:00:00 2001
From: "Matt, Park" <45252226+mattverse@users.noreply.github.com>
Date: Fri, 13 Oct 2023 18:15:55 +0900
Subject: [PATCH 09/12] Update proto/osmosis/poolmanager/v1beta1/query.proto

Co-authored-by: Adam Tucker <adam@osmosis.team>
---
 proto/osmosis/poolmanager/v1beta1/query.proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proto/osmosis/poolmanager/v1beta1/query.proto b/proto/osmosis/poolmanager/v1beta1/query.proto
index 6dcb158cd3b..1d4b20a602d 100644
--- a/proto/osmosis/poolmanager/v1beta1/query.proto
+++ b/proto/osmosis/poolmanager/v1beta1/query.proto
@@ -288,7 +288,7 @@ message TotalVolumeForPoolResponse {
   ];
 }
 
-//=============================== TotalVolumeForPool
+//=============================== TradingPairTakerFee
 message TradingPairTakerFeeRequest {
   string denom_0 = 1 [ (gogoproto.moretags) = "yaml:\"denom_0\"" ];
   string denom_1 = 2 [ (gogoproto.moretags) = "yaml:\"denom_1\"" ];

From efccf6afa2708e674caaec3db382083736f43213 Mon Sep 17 00:00:00 2001
From: mattverse <mattpark1028@gmail.com>
Date: Fri, 13 Oct 2023 20:04:39 +0900
Subject: [PATCH 10/12] Add cli

---
 x/poolmanager/client/cli/query.go           | 10 ++++++++++
 x/poolmanager/client/grpc/grpc_query.go     | 10 ++++++++++
 x/poolmanager/client/queryproto/query.pb.go |  6 +++---
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/x/poolmanager/client/cli/query.go b/x/poolmanager/client/cli/query.go
index e42491632c7..cd585ab88af 100644
--- a/x/poolmanager/client/cli/query.go
+++ b/x/poolmanager/client/cli/query.go
@@ -30,6 +30,7 @@ func GetQueryCmd() *cobra.Command {
 	osmocli.AddQueryCmd(cmd, queryproto.NewQueryClient, GetCmdAllPools)
 	osmocli.AddQueryCmd(cmd, queryproto.NewQueryClient, GetCmdPool)
 	osmocli.AddQueryCmd(cmd, queryproto.NewQueryClient, GetCmdTotalVolumeForPool)
+	osmocli.AddQueryCmd(cmd, queryproto.NewQueryClient, GetCmdTradingPairTakerFee)
 	osmocli.AddQueryCmd(cmd, queryproto.NewQueryClient, GetCmdEstimateTradeBasedOnPriceImpact)
 	cmd.AddCommand(
 		osmocli.GetParams[*queryproto.ParamsRequest](
@@ -181,6 +182,15 @@ func GetCmdTotalVolumeForPool() (*osmocli.QueryDescriptor, *queryproto.TotalVolu
 	}, &queryproto.TotalVolumeForPoolRequest{}
 }
 
+func GetCmdTradingPairTakerFee() (*osmocli.QueryDescriptor, *queryproto.TradingPairTakerFeeRequest) {
+	return &osmocli.QueryDescriptor{
+		Use:   "trading-pair-taker-fee",
+		Short: "Query trading pair taker fee",
+		Long: `{{.Short}}
+		{{.CommandPrefix}} trading-pair-taker-fee uosmo uatom`,
+	}, &queryproto.TradingPairTakerFeeRequest{}
+}
+
 func GetCmdEstimateTradeBasedOnPriceImpact() (
 	*osmocli.QueryDescriptor, *queryproto.EstimateTradeBasedOnPriceImpactRequest,
 ) {
diff --git a/x/poolmanager/client/grpc/grpc_query.go b/x/poolmanager/client/grpc/grpc_query.go
index f88b08037ce..184ec306a86 100644
--- a/x/poolmanager/client/grpc/grpc_query.go
+++ b/x/poolmanager/client/grpc/grpc_query.go
@@ -91,6 +91,16 @@ func (q Querier) NumPools(grpcCtx context.Context,
 	return q.Q.NumPools(ctx, *req)
 }
 
+func (q Querier) TradingPairTakerFee(grpcCtx context.Context,
+	req *queryproto.TradingPairTakerFeeRequest,
+) (*queryproto.TradingPairTakerFeeResponse, error) {
+	if req == nil {
+		return nil, status.Error(codes.InvalidArgument, "empty request")
+	}
+	ctx := sdk.UnwrapSDKContext(grpcCtx)
+	return q.Q.TradingPairTakerFee(ctx, *req)
+}
+
 func (q Querier) EstimateTradeBasedOnPriceImpact(grpcCtx context.Context,
 	req *queryproto.EstimateTradeBasedOnPriceImpactRequest,
 ) (*queryproto.EstimateTradeBasedOnPriceImpactResponse, error) {
diff --git a/x/poolmanager/client/queryproto/query.pb.go b/x/poolmanager/client/queryproto/query.pb.go
index 715318c337f..baff2ec9473 100644
--- a/x/poolmanager/client/queryproto/query.pb.go
+++ b/x/poolmanager/client/queryproto/query.pb.go
@@ -1205,7 +1205,7 @@ func (m *TotalVolumeForPoolResponse) GetVolume() github_com_cosmos_cosmos_sdk_ty
 	return nil
 }
 
-// =============================== TotalVolumeForPool
+// =============================== TradingPairTakerFee
 type TradingPairTakerFeeRequest struct {
 	Denom_0 string `protobuf:"bytes,1,opt,name=denom_0,json=denom0,proto3" json:"denom_0,omitempty" yaml:"denom_0"`
 	Denom_1 string `protobuf:"bytes,2,opt,name=denom_1,json=denom1,proto3" json:"denom_1,omitempty" yaml:"denom_1"`
@@ -1642,7 +1642,7 @@ type QueryClient interface {
 	TotalLiquidity(ctx context.Context, in *TotalLiquidityRequest, opts ...grpc.CallOption) (*TotalLiquidityResponse, error)
 	// TotalVolumeForPool returns the total volume of the specified pool.
 	TotalVolumeForPool(ctx context.Context, in *TotalVolumeForPoolRequest, opts ...grpc.CallOption) (*TotalVolumeForPoolResponse, error)
-	// TotalVolumeForPool returns the total volume of the specified pool.
+	// TradingPairTakerFee returns the taker fee for a given set of denoms
 	TradingPairTakerFee(ctx context.Context, in *TradingPairTakerFeeRequest, opts ...grpc.CallOption) (*TradingPairTakerFeeResponse, error)
 	// EstimateTradeBasedOnPriceImpact returns an estimated trade based on price
 	// impact, if a trade cannot be estimated a 0 input and 0 output would be
@@ -1839,7 +1839,7 @@ type QueryServer interface {
 	TotalLiquidity(context.Context, *TotalLiquidityRequest) (*TotalLiquidityResponse, error)
 	// TotalVolumeForPool returns the total volume of the specified pool.
 	TotalVolumeForPool(context.Context, *TotalVolumeForPoolRequest) (*TotalVolumeForPoolResponse, error)
-	// TotalVolumeForPool returns the total volume of the specified pool.
+	// TradingPairTakerFee returns the taker fee for a given set of denoms
 	TradingPairTakerFee(context.Context, *TradingPairTakerFeeRequest) (*TradingPairTakerFeeResponse, error)
 	// EstimateTradeBasedOnPriceImpact returns an estimated trade based on price
 	// impact, if a trade cannot be estimated a 0 input and 0 output would be

From 395a70f99f1cd7dd32ade775f5f30a39b4babe1b Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Fri, 13 Oct 2023 11:11:52 +0000
Subject: [PATCH 11/12] Generated protofile changes

---
 x/poolmanager/client/grpc/grpc_query.go | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/x/poolmanager/client/grpc/grpc_query.go b/x/poolmanager/client/grpc/grpc_query.go
index 7bdf362a0fa..f1d5e2b6b30 100644
--- a/x/poolmanager/client/grpc/grpc_query.go
+++ b/x/poolmanager/client/grpc/grpc_query.go
@@ -91,16 +91,6 @@ func (q Querier) NumPools(grpcCtx context.Context,
 	return q.Q.NumPools(ctx, *req)
 }
 
-func (q Querier) TradingPairTakerFee(grpcCtx context.Context,
-	req *queryproto.TradingPairTakerFeeRequest,
-) (*queryproto.TradingPairTakerFeeResponse, error) {
-	if req == nil {
-		return nil, status.Error(codes.InvalidArgument, "empty request")
-	}
-	ctx := sdk.UnwrapSDKContext(grpcCtx)
-	return q.Q.TradingPairTakerFee(ctx, *req)
-}
-
 func (q Querier) EstimateTradeBasedOnPriceImpact(grpcCtx context.Context,
 	req *queryproto.EstimateTradeBasedOnPriceImpactRequest,
 ) (*queryproto.EstimateTradeBasedOnPriceImpactResponse, error) {

From a36d493c8f50d7ad723dfe239ca8cd4bc9407d1f Mon Sep 17 00:00:00 2001
From: Adam Tucker <adamleetucker@outlook.com>
Date: Fri, 13 Oct 2023 07:57:49 -0600
Subject: [PATCH 12/12] register query in query server

---
 proto/osmosis/poolmanager/v1beta1/query.yml |  5 +++++
 x/poolmanager/client/grpc/grpc_query.go     | 10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/proto/osmosis/poolmanager/v1beta1/query.yml b/proto/osmosis/poolmanager/v1beta1/query.yml
index bf7a65369ad..08bd7c07f0a 100644
--- a/proto/osmosis/poolmanager/v1beta1/query.yml
+++ b/proto/osmosis/poolmanager/v1beta1/query.yml
@@ -83,3 +83,8 @@ queries:
       response: "*queryproto.EstimateTradeBasedOnPriceImpactResponse"
     cli:
       cmd: "EstimateTradeBasedOnPriceImpact"
+  TradingPairTakerFee:
+    proto_wrapper:
+      query_func: "k.GetTradingPairTakerFee"
+    cli:
+      cmd: "TradingPairTakerFee"
diff --git a/x/poolmanager/client/grpc/grpc_query.go b/x/poolmanager/client/grpc/grpc_query.go
index f1d5e2b6b30..a47c7e9b9d3 100644
--- a/x/poolmanager/client/grpc/grpc_query.go
+++ b/x/poolmanager/client/grpc/grpc_query.go
@@ -21,6 +21,16 @@ type Querier struct {
 
 var _ queryproto.QueryServer = Querier{}
 
+func (q Querier) TradingPairTakerFee(grpcCtx context.Context,
+	req *queryproto.TradingPairTakerFeeRequest,
+) (*queryproto.TradingPairTakerFeeResponse, error) {
+	if req == nil {
+		return nil, status.Error(codes.InvalidArgument, "empty request")
+	}
+	ctx := sdk.UnwrapSDKContext(grpcCtx)
+	return q.Q.TradingPairTakerFee(ctx, *req)
+}
+
 func (q Querier) TotalVolumeForPool(grpcCtx context.Context,
 	req *queryproto.TotalVolumeForPoolRequest,
 ) (*queryproto.TotalVolumeForPoolResponse, error) {