From 5910ab784a6fb33accbc0405e69a48cac5e5ee88 Mon Sep 17 00:00:00 2001 From: Damian Nolan Date: Thu, 7 Apr 2022 10:02:30 +0200 Subject: [PATCH 1/6] adding protobuf codegen --- docs/ibc/proto-docs.md | 68 ++ go.mod | 2 +- go.sum | 120 +-- modules/apps/29-fee/types/query.pb.go | 1063 +++++++++++++++++++-- modules/apps/29-fee/types/query.pb.gw.go | 200 ++++ proto/ibc/applications/fee/v1/query.proto | 40 + 6 files changed, 1279 insertions(+), 214 deletions(-) diff --git a/docs/ibc/proto-docs.md b/docs/ibc/proto-docs.md index 539b8bb2c77..84a68d54c6f 100644 --- a/docs/ibc/proto-docs.md +++ b/docs/ibc/proto-docs.md @@ -44,6 +44,10 @@ - [Metadata](#ibc.applications.fee.v1.Metadata) - [ibc/applications/fee/v1/query.proto](#ibc/applications/fee/v1/query.proto) + - [QueryFeeEnabledChannelRequest](#ibc.applications.fee.v1.QueryFeeEnabledChannelRequest) + - [QueryFeeEnabledChannelResponse](#ibc.applications.fee.v1.QueryFeeEnabledChannelResponse) + - [QueryFeeEnabledChannelsRequest](#ibc.applications.fee.v1.QueryFeeEnabledChannelsRequest) + - [QueryFeeEnabledChannelsResponse](#ibc.applications.fee.v1.QueryFeeEnabledChannelsResponse) - [QueryIncentivizedPacketRequest](#ibc.applications.fee.v1.QueryIncentivizedPacketRequest) - [QueryIncentivizedPacketResponse](#ibc.applications.fee.v1.QueryIncentivizedPacketResponse) - [QueryIncentivizedPacketsForChannelRequest](#ibc.applications.fee.v1.QueryIncentivizedPacketsForChannelRequest) @@ -906,6 +910,68 @@ See ICS004: https://github.com/cosmos/ibc/tree/master/spec/core/ics-004-channel- + + +### QueryFeeEnabledChannelRequest +QueryFeeEnabledChannelRequest defines the request type for the FeeEnabledChannel rpc + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| `port_id` | [string](#string) | | unique port identifier | +| `channel_id` | [string](#string) | | unique channel identifier | + + + + + + + + +### QueryFeeEnabledChannelResponse +QueryFeeEnabledChannelResponse defines the response type for the FeeEnabledChannel rpc + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| `fee_enabled` | [bool](#bool) | | boolean flag representing the fee enabled channel status | + + + + + + + + +### QueryFeeEnabledChannelsRequest +QueryFeeEnabledChannelsRequest defines the request type for the FeeEnabledChannels rpc + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| `pagination` | [cosmos.base.query.v1beta1.PageRequest](#cosmos.base.query.v1beta1.PageRequest) | | pagination defines an optional pagination for the request. | +| `query_height` | [uint64](#uint64) | | block height at which to query | + + + + + + + + +### QueryFeeEnabledChannelsResponse +QueryFeeEnabledChannelsResponse defines the response type for the FeeEnabledChannels rpc + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| `fee_enabled_channels` | [FeeEnabledChannel](#ibc.applications.fee.v1.FeeEnabledChannel) | repeated | list of fee enabled channels | + + + + + + ### QueryIncentivizedPacketRequest @@ -1111,6 +1177,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/total_recv_fees/port/{packet_id.port_id}/channel/{packet_id.channel_id}/sequence/{packet_id.sequence}| | `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/total_ack_fees/port/{packet_id.port_id}/channel/{packet_id.channel_id}/sequence/{packet_id.sequence}| | `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/total_timeout_fees/port/{packet_id.port_id}/channel/{packet_id.channel_id}/sequence/{packet_id.sequence}| +| `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/fee_enabled/{port_id}/{channel_id}| diff --git a/go.mod b/go.mod index 372b65ce148..d13f9bc4ef7 100644 --- a/go.mod +++ b/go.mod @@ -58,7 +58,7 @@ require ( github.com/go-logfmt/logfmt v0.5.0 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/gateway v1.1.0 // indirect - github.com/golang/snappy v0.0.3 // indirect + github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3 // indirect github.com/google/btree v1.0.0 // indirect github.com/google/orderedcode v0.0.1 // indirect github.com/gorilla/handlers v1.5.1 // indirect diff --git a/go.sum b/go.sum index 38008de3b95..a3904fbbaa6 100644 --- a/go.sum +++ b/go.sum @@ -18,14 +18,6 @@ cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmW cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= -cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= -cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= -cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= -cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= -cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= -cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= -cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -35,7 +27,6 @@ cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM7 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= -cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -112,7 +103,6 @@ github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4 github.com/armon/go-metrics v0.3.10 h1:FR+drcQStOe+32sYyJYyZ7FIdgoGGBnwLl+flodp8Uo= github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.25.48/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= @@ -152,7 +142,6 @@ github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= @@ -176,9 +165,7 @@ github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XP github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/coinbase/rosetta-sdk-go v0.7.0 h1:lmTO/JEpCvZgpbkOITL95rA80CPKb5CtMzLaqF2mCNg= @@ -267,9 +254,7 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= -github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= github.com/ethereum/go-ethereum v1.9.25/go.mod h1:vMkFiYLHI4tgPw4k2j4MHKoovchFE8plZ0M9VMk4/oM= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ= github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= @@ -279,9 +264,7 @@ github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 h1:E2s37DuLxFhQD github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= -github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= @@ -345,7 +328,6 @@ github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4er github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -377,9 +359,8 @@ github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3 h1:ur2rms48b3Ep1dxh7aUV2FZEQ8jEVO2F6ILKx8ofkAg= github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA= -github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -395,7 +376,6 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa h1:Q75Upo5UN4JbPFURXZ8nLKYUvF85dyFRop/vQ0Rv+64= @@ -403,7 +383,6 @@ github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/orderedcode v0.0.1 h1:UzfcAexk9Vhv8+9pNOgRu41f16lHq725vPwnSeiG/Us= github.com/google/orderedcode v0.0.1/go.mod h1:iVyU4/qPKHY5h/wSd6rZZCDcLJNxiWO6dvsYES2Sb20= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -417,17 +396,12 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= -github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= @@ -464,25 +438,18 @@ github.com/gtank/ristretto255 v0.1.2 h1:JEqUCPA1NvLq5DwYtuzigd7ss8fwbYay9fi4/5uM github.com/gtank/ristretto255 v0.1.2/go.mod h1:Ph5OpO6c7xKUGROZfWVLiJf9icMDwUeIvY4OmlYW69o= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= -github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= @@ -498,11 +465,8 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87 h1:uUjLpLt6bVvZ72SQc/B4dXcPBw4Vgd7soowdRl52qEM= github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87/go.mod h1:XGsKKeXxeRr95aEOgipvluMPlgjr7dGlk9ZTWOjcUcg= github.com/holiman/uint256 v1.1.1/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= @@ -510,7 +474,6 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc= github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= -github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/improbable-eng/grpc-web v0.14.1 h1:NrN4PY71A6tAz2sKDvC5JCauENWp0ykG8Oq1H3cpFvw= @@ -538,7 +501,6 @@ github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= @@ -576,7 +538,6 @@ github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoR github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/lucasjones/reggen v0.0.0-20180717132126-cdb49ff09d77/go.mod h1:5ELEyG+X8f+meRWHuqUOewBOhvHkl7M76pdGEansxW4= -github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= @@ -584,19 +545,12 @@ github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaW github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.5-0.20180830101745-3fb116b82035/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= -github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= @@ -606,14 +560,11 @@ github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= -github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 h1:hLDRPB66XQT/8+wG9WsDpiCvZf1yKO7sz7scAjSlBa0= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= github.com/minio/highwayhash v1.0.1 h1:dZ6IIu8Z14VlC0VpfKofAhCy74wu/Qb5gcn52yWoz/0= github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -633,7 +584,6 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns= @@ -729,7 +679,6 @@ github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= @@ -795,7 +744,6 @@ github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa h1:0U2s5loxrTy6/VgfVoLuVLFJcURKLH49ie0zSch7gh4= github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= @@ -820,7 +768,6 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= @@ -918,11 +865,8 @@ go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= -go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= @@ -955,7 +899,6 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190909091759-094676da4a83/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -1005,7 +948,6 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1056,11 +998,8 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= -golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f h1:w6wWR0H+nyVpbSAQbzVEIACVyr/h8l/BEkY6Sokc7Eg= golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1076,11 +1015,6 @@ golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1103,7 +1037,6 @@ golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1117,11 +1050,9 @@ golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1132,7 +1063,6 @@ golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1161,7 +1091,6 @@ golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1170,20 +1099,11 @@ golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210903071746-97244b99971b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486 h1:5hpz5aRr+W1erYCL5JRhSUBJRph7l9XkNveoExlrKYk= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= @@ -1218,7 +1138,6 @@ golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1264,8 +1183,6 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1295,17 +1212,6 @@ google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjR google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= -google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= -google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= -google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= -google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= -google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= -google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= -google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= -google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= -google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1360,26 +1266,8 @@ google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= -google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= -google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa h1:I0YcKz0I7OAhddo7ya8kMnvprhcWM045PmkBdMO9zN0= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= @@ -1409,17 +1297,11 @@ google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/modules/apps/29-fee/types/query.pb.go b/modules/apps/29-fee/types/query.pb.go index dd130bcc3fd..20f3c5fdbf7 100644 --- a/modules/apps/29-fee/types/query.pb.go +++ b/modules/apps/29-fee/types/query.pb.go @@ -637,6 +637,208 @@ func (m *QueryTotalTimeoutFeesResponse) GetTimeoutFees() github_com_cosmos_cosmo return nil } +// QueryFeeEnabledChannelsRequest defines the request type for the FeeEnabledChannels rpc +type QueryFeeEnabledChannelsRequest struct { + // pagination defines an optional pagination for the request. + Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` + // block height at which to query + QueryHeight uint64 `protobuf:"varint,2,opt,name=query_height,json=queryHeight,proto3" json:"query_height,omitempty"` +} + +func (m *QueryFeeEnabledChannelsRequest) Reset() { *m = QueryFeeEnabledChannelsRequest{} } +func (m *QueryFeeEnabledChannelsRequest) String() string { return proto.CompactTextString(m) } +func (*QueryFeeEnabledChannelsRequest) ProtoMessage() {} +func (*QueryFeeEnabledChannelsRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_0638a8a78ca2503c, []int{12} +} +func (m *QueryFeeEnabledChannelsRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryFeeEnabledChannelsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryFeeEnabledChannelsRequest.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 *QueryFeeEnabledChannelsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryFeeEnabledChannelsRequest.Merge(m, src) +} +func (m *QueryFeeEnabledChannelsRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryFeeEnabledChannelsRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryFeeEnabledChannelsRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryFeeEnabledChannelsRequest proto.InternalMessageInfo + +func (m *QueryFeeEnabledChannelsRequest) GetPagination() *query.PageRequest { + if m != nil { + return m.Pagination + } + return nil +} + +func (m *QueryFeeEnabledChannelsRequest) GetQueryHeight() uint64 { + if m != nil { + return m.QueryHeight + } + return 0 +} + +// QueryFeeEnabledChannelsResponse defines the response type for the FeeEnabledChannels rpc +type QueryFeeEnabledChannelsResponse struct { + // list of fee enabled channels + FeeEnabledChannels []FeeEnabledChannel `protobuf:"bytes,1,rep,name=fee_enabled_channels,json=feeEnabledChannels,proto3" json:"fee_enabled_channels" yaml:"fee_enabled_channels"` +} + +func (m *QueryFeeEnabledChannelsResponse) Reset() { *m = QueryFeeEnabledChannelsResponse{} } +func (m *QueryFeeEnabledChannelsResponse) String() string { return proto.CompactTextString(m) } +func (*QueryFeeEnabledChannelsResponse) ProtoMessage() {} +func (*QueryFeeEnabledChannelsResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_0638a8a78ca2503c, []int{13} +} +func (m *QueryFeeEnabledChannelsResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryFeeEnabledChannelsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryFeeEnabledChannelsResponse.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 *QueryFeeEnabledChannelsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryFeeEnabledChannelsResponse.Merge(m, src) +} +func (m *QueryFeeEnabledChannelsResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryFeeEnabledChannelsResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryFeeEnabledChannelsResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryFeeEnabledChannelsResponse proto.InternalMessageInfo + +func (m *QueryFeeEnabledChannelsResponse) GetFeeEnabledChannels() []FeeEnabledChannel { + if m != nil { + return m.FeeEnabledChannels + } + return nil +} + +// QueryFeeEnabledChannelRequest defines the request type for the FeeEnabledChannel rpc +type QueryFeeEnabledChannelRequest struct { + // unique port identifier + PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"` + // unique channel identifier + ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"` +} + +func (m *QueryFeeEnabledChannelRequest) Reset() { *m = QueryFeeEnabledChannelRequest{} } +func (m *QueryFeeEnabledChannelRequest) String() string { return proto.CompactTextString(m) } +func (*QueryFeeEnabledChannelRequest) ProtoMessage() {} +func (*QueryFeeEnabledChannelRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_0638a8a78ca2503c, []int{14} +} +func (m *QueryFeeEnabledChannelRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryFeeEnabledChannelRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryFeeEnabledChannelRequest.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 *QueryFeeEnabledChannelRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryFeeEnabledChannelRequest.Merge(m, src) +} +func (m *QueryFeeEnabledChannelRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryFeeEnabledChannelRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryFeeEnabledChannelRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryFeeEnabledChannelRequest proto.InternalMessageInfo + +func (m *QueryFeeEnabledChannelRequest) GetPortId() string { + if m != nil { + return m.PortId + } + return "" +} + +func (m *QueryFeeEnabledChannelRequest) GetChannelId() string { + if m != nil { + return m.ChannelId + } + return "" +} + +// QueryFeeEnabledChannelResponse defines the response type for the FeeEnabledChannel rpc +type QueryFeeEnabledChannelResponse struct { + // boolean flag representing the fee enabled channel status + FeeEnabled bool `protobuf:"varint,1,opt,name=fee_enabled,json=feeEnabled,proto3" json:"fee_enabled,omitempty" yaml:"fee_enabled"` +} + +func (m *QueryFeeEnabledChannelResponse) Reset() { *m = QueryFeeEnabledChannelResponse{} } +func (m *QueryFeeEnabledChannelResponse) String() string { return proto.CompactTextString(m) } +func (*QueryFeeEnabledChannelResponse) ProtoMessage() {} +func (*QueryFeeEnabledChannelResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_0638a8a78ca2503c, []int{15} +} +func (m *QueryFeeEnabledChannelResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryFeeEnabledChannelResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryFeeEnabledChannelResponse.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 *QueryFeeEnabledChannelResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryFeeEnabledChannelResponse.Merge(m, src) +} +func (m *QueryFeeEnabledChannelResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryFeeEnabledChannelResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryFeeEnabledChannelResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryFeeEnabledChannelResponse proto.InternalMessageInfo + +func (m *QueryFeeEnabledChannelResponse) GetFeeEnabled() bool { + if m != nil { + return m.FeeEnabled + } + return false +} + func init() { proto.RegisterType((*QueryIncentivizedPacketsRequest)(nil), "ibc.applications.fee.v1.QueryIncentivizedPacketsRequest") proto.RegisterType((*QueryIncentivizedPacketsResponse)(nil), "ibc.applications.fee.v1.QueryIncentivizedPacketsResponse") @@ -650,6 +852,10 @@ func init() { proto.RegisterType((*QueryTotalAckFeesResponse)(nil), "ibc.applications.fee.v1.QueryTotalAckFeesResponse") proto.RegisterType((*QueryTotalTimeoutFeesRequest)(nil), "ibc.applications.fee.v1.QueryTotalTimeoutFeesRequest") proto.RegisterType((*QueryTotalTimeoutFeesResponse)(nil), "ibc.applications.fee.v1.QueryTotalTimeoutFeesResponse") + 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") + proto.RegisterType((*QueryFeeEnabledChannelResponse)(nil), "ibc.applications.fee.v1.QueryFeeEnabledChannelResponse") } func init() { @@ -657,67 +863,80 @@ func init() { } var fileDescriptor_0638a8a78ca2503c = []byte{ - // 956 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xcf, 0x6f, 0xdc, 0x44, - 0x14, 0xce, 0xa4, 0xa1, 0x4d, 0x66, 0x83, 0xa8, 0x26, 0x95, 0x9a, 0x5a, 0x8d, 0x93, 0x1a, 0x01, - 0xa1, 0xd2, 0x7a, 0x94, 0x8d, 0x0a, 0x2d, 0x42, 0x08, 0x92, 0x2a, 0x90, 0x13, 0x65, 0xd5, 0x13, - 0x02, 0x6d, 0xbd, 0xe3, 0x59, 0x67, 0x94, 0x5d, 0x8f, 0xbb, 0xf6, 0x1a, 0xb6, 0x69, 0x90, 0xa8, - 0x14, 0x21, 0xa1, 0x0a, 0x21, 0x21, 0x71, 0xe0, 0x1f, 0x40, 0xe2, 0x3f, 0xe0, 0xc0, 0xbd, 0x27, - 0x54, 0x89, 0x0b, 0xa7, 0x82, 0x12, 0xce, 0x1c, 0x10, 0x07, 0x8e, 0x68, 0x7e, 0xd8, 0xeb, 0xe0, - 0x75, 0xb1, 0xd3, 0xcd, 0x29, 0xf6, 0xbc, 0xf7, 0xe6, 0x7d, 0xdf, 0xf7, 0xc6, 0xdf, 0x64, 0xe1, - 0x8b, 0xac, 0x4d, 0xb0, 0x13, 0x04, 0x5d, 0x46, 0x9c, 0x88, 0x71, 0x3f, 0xc4, 0x1d, 0x4a, 0x71, - 0xbc, 0x86, 0xef, 0x0e, 0x68, 0x7f, 0x68, 0x07, 0x7d, 0x1e, 0x71, 0x74, 0x91, 0xb5, 0x89, 0x9d, - 0x4d, 0xb2, 0x3b, 0x94, 0xda, 0xf1, 0x9a, 0x71, 0xc1, 0xe3, 0x1e, 0x97, 0x39, 0x58, 0x3c, 0xa9, - 0x74, 0xe3, 0xb2, 0xc7, 0xb9, 0xd7, 0xa5, 0xd8, 0x09, 0x18, 0x76, 0x7c, 0x9f, 0x47, 0xba, 0x48, - 0x45, 0x4d, 0xc2, 0xc3, 0x1e, 0x0f, 0x71, 0xdb, 0x09, 0x45, 0xa3, 0x36, 0x8d, 0x9c, 0x35, 0x4c, - 0x38, 0xf3, 0x75, 0xfc, 0x6a, 0x36, 0x2e, 0x51, 0xa4, 0x59, 0x81, 0xe3, 0x31, 0x5f, 0x6e, 0xa6, - 0x73, 0xaf, 0x14, 0xa1, 0x17, 0xf8, 0x32, 0x29, 0x84, 0xf7, 0x29, 0x26, 0x3b, 0x8e, 0xef, 0xd3, - 0xae, 0x08, 0xeb, 0x47, 0x95, 0x62, 0x3d, 0x04, 0x70, 0xf9, 0x03, 0xd1, 0x68, 0xdb, 0x27, 0xd4, - 0x8f, 0x58, 0xcc, 0xee, 0x51, 0xf7, 0x96, 0x43, 0x76, 0x69, 0x14, 0x36, 0xe9, 0xdd, 0x01, 0x0d, - 0x23, 0xb4, 0x05, 0xe1, 0xa8, 0xfb, 0x22, 0x58, 0x01, 0xab, 0xb5, 0xc6, 0xcb, 0xb6, 0x82, 0x6a, - 0x0b, 0xa8, 0xb6, 0x12, 0x4c, 0x43, 0xb5, 0x6f, 0x39, 0x1e, 0xd5, 0xb5, 0xcd, 0x4c, 0x25, 0xba, - 0x02, 0xe7, 0x65, 0x62, 0x6b, 0x87, 0x32, 0x6f, 0x27, 0x5a, 0x9c, 0x5e, 0x01, 0xab, 0x33, 0xcd, - 0x9a, 0x5c, 0x7b, 0x4f, 0x2e, 0x59, 0x5f, 0x02, 0xb8, 0x52, 0x0c, 0x27, 0x0c, 0xb8, 0x1f, 0x52, - 0xd4, 0x81, 0x17, 0x58, 0x26, 0xdc, 0x0a, 0x54, 0x7c, 0x11, 0xac, 0x9c, 0x59, 0xad, 0x35, 0xea, - 0x76, 0xc1, 0xc4, 0xec, 0x6d, 0x57, 0xd4, 0x74, 0x58, 0xb2, 0xe3, 0x16, 0xa5, 0xe1, 0xc6, 0xcc, - 0xa3, 0x27, 0xcb, 0x53, 0xcd, 0x05, 0x96, 0xef, 0x67, 0x1d, 0x00, 0x68, 0x16, 0x80, 0x49, 0xa4, - 0x79, 0x1b, 0xce, 0xa9, 0xee, 0x2d, 0xe6, 0x6a, 0x65, 0x96, 0x64, 0x7f, 0xa1, 0xba, 0x9d, 0x48, - 0x1d, 0x0b, 0x4d, 0x44, 0xd6, 0xb6, 0xab, 0xfb, 0xcd, 0x06, 0xfa, 0xbd, 0x8c, 0x28, 0x5f, 0x14, - 0xcf, 0x28, 0xd5, 0xc4, 0x85, 0x0b, 0x63, 0x34, 0xd1, 0x90, 0x4e, 0x24, 0x09, 0xca, 0x4b, 0x62, - 0xfd, 0x0c, 0xe0, 0xab, 0x45, 0xe3, 0xd9, 0xe2, 0xfd, 0x4d, 0xc5, 0x77, 0xd2, 0xe7, 0xe6, 0x22, - 0x3c, 0x17, 0xf0, 0xbe, 0x94, 0x58, 0xa8, 0x33, 0xd7, 0x3c, 0x2b, 0x5e, 0xb7, 0x5d, 0xb4, 0x04, - 0xa1, 0x96, 0x58, 0xc4, 0xce, 0xc8, 0xd8, 0x9c, 0x5e, 0x19, 0x23, 0xed, 0x4c, 0x5e, 0xda, 0xaf, - 0x00, 0xbc, 0x5a, 0x86, 0x90, 0x56, 0xf9, 0xce, 0x04, 0x4f, 0xde, 0xf8, 0x33, 0xf7, 0x31, 0xbc, - 0x24, 0xf1, 0xdc, 0xe6, 0x91, 0xd3, 0x6d, 0x52, 0x12, 0xcb, 0xd4, 0x49, 0x9d, 0x36, 0xeb, 0x3b, - 0x00, 0x8d, 0x71, 0xfb, 0x6b, 0x7e, 0xf7, 0xe1, 0x5c, 0x9f, 0x92, 0xb8, 0xd5, 0xa1, 0x34, 0x21, - 0x75, 0xe9, 0xd8, 0xc0, 0x92, 0x51, 0x6d, 0x72, 0xe6, 0x6f, 0xdc, 0x14, 0x9b, 0xff, 0xf5, 0x64, - 0xf9, 0xfc, 0xd0, 0xe9, 0x75, 0xdf, 0xb0, 0xd2, 0x4a, 0xeb, 0x87, 0xdf, 0x96, 0x57, 0x3d, 0x16, - 0xed, 0x0c, 0xda, 0x36, 0xe1, 0x3d, 0xac, 0x4d, 0x4d, 0xfd, 0xa9, 0x87, 0xee, 0x2e, 0x8e, 0x86, - 0x01, 0x0d, 0xe5, 0x26, 0x61, 0x73, 0xb6, 0xaf, 0x51, 0x58, 0x1f, 0xc1, 0xc5, 0x11, 0xb6, 0x77, - 0xc8, 0xee, 0x64, 0xa9, 0x7f, 0x0b, 0xb2, 0xd2, 0xa6, 0xdb, 0x6b, 0xe6, 0x43, 0x38, 0xeb, 0x90, - 0xdd, 0x92, 0xc4, 0x37, 0x35, 0xf1, 0x17, 0x14, 0xf1, 0xa4, 0xb0, 0x1a, 0xef, 0x73, 0x8e, 0x82, - 0x60, 0xdd, 0x81, 0x97, 0x47, 0xb8, 0x6e, 0xb3, 0x1e, 0xe5, 0x83, 0x68, 0xb2, 0xd4, 0xbf, 0x07, - 0x70, 0xa9, 0xa0, 0x85, 0xa6, 0x7f, 0x00, 0xe0, 0x7c, 0xa4, 0xd6, 0x4b, 0x6a, 0xf0, 0xae, 0xd6, - 0x60, 0x41, 0x69, 0x90, 0x2d, 0xae, 0xa6, 0x43, 0x2d, 0x1a, 0xe1, 0x69, 0xfc, 0x54, 0x83, 0xcf, - 0x49, 0xa4, 0xe8, 0x47, 0x00, 0x17, 0xc6, 0x7c, 0x94, 0xe8, 0x7a, 0xe1, 0x47, 0xf6, 0x3f, 0xd7, - 0x98, 0x71, 0xe3, 0x04, 0x95, 0x4a, 0x1e, 0xab, 0xfe, 0xe0, 0x97, 0x3f, 0xbe, 0x99, 0x7e, 0x05, - 0xbd, 0x84, 0xf5, 0xa5, 0x9b, 0x5e, 0xb6, 0xe3, 0xec, 0x00, 0x3d, 0x9c, 0x86, 0x28, 0xbf, 0x1d, - 0x7a, 0xbd, 0x2a, 0x80, 0x04, 0xf9, 0xf5, 0xea, 0x85, 0x1a, 0xf8, 0x03, 0x20, 0x91, 0xdf, 0x47, - 0xf7, 0xca, 0x20, 0xc7, 0xc2, 0x57, 0xf1, 0x5e, 0x7a, 0xda, 0x6c, 0x6d, 0xbb, 0xfb, 0xe9, 0xff, - 0x0f, 0x99, 0xd8, 0xc8, 0x79, 0xf7, 0x71, 0x28, 0x80, 0xfa, 0x84, 0x66, 0xe3, 0xc9, 0xda, 0x3e, - 0xfa, 0x13, 0xc0, 0xa5, 0xa7, 0xfa, 0x2b, 0xda, 0xa8, 0x3c, 0x9a, 0xdc, 0x6d, 0x63, 0x6c, 0x3e, - 0xd3, 0x1e, 0x5a, 0xaf, 0x9b, 0x52, 0xae, 0xb7, 0xd0, 0x9b, 0xa5, 0x06, 0x8d, 0xf7, 0x52, 0x81, - 0xf6, 0x32, 0x72, 0xa0, 0x7f, 0x00, 0x7c, 0xfe, 0x98, 0xc1, 0xa2, 0xc6, 0xd3, 0xc1, 0x8d, 0x73, - 0x7b, 0x63, 0xbd, 0x52, 0x8d, 0x26, 0xf0, 0x99, 0x24, 0xf0, 0x29, 0x8a, 0x73, 0x04, 0x22, 0x91, - 0xdf, 0x4a, 0x4d, 0xfa, 0x94, 0x66, 0xfd, 0x37, 0x80, 0xf3, 0x59, 0x83, 0x45, 0x6b, 0x25, 0x58, - 0x1c, 0xf7, 0x7a, 0xa3, 0x51, 0xa5, 0x44, 0xf3, 0xde, 0x97, 0xbc, 0x3f, 0x41, 0x83, 0x02, 0xde, - 0x89, 0x47, 0x9f, 0x12, 0xed, 0x83, 0x69, 0x78, 0xfe, 0xbf, 0xe6, 0x8a, 0xae, 0x95, 0xe0, 0x91, - 0xf7, 0x7b, 0xe3, 0xb5, 0xaa, 0x65, 0x5a, 0x82, 0xcf, 0xd5, 0xb7, 0xbe, 0x87, 0x86, 0x05, 0x1a, - 0x64, 0x3d, 0xfa, 0x74, 0x74, 0xd8, 0x78, 0xff, 0xd1, 0xa1, 0x09, 0x1e, 0x1f, 0x9a, 0xe0, 0xf7, - 0x43, 0x13, 0x7c, 0x7d, 0x64, 0x4e, 0x3d, 0x3e, 0x32, 0xa7, 0x7e, 0x3d, 0x32, 0xa7, 0x3e, 0xbc, - 0x96, 0xbf, 0x10, 0x58, 0x9b, 0xd4, 0x3d, 0x8e, 0xe3, 0x75, 0xdc, 0xe3, 0xee, 0xa0, 0x4b, 0x43, - 0x85, 0xb9, 0x71, 0xa3, 0x2e, 0x60, 0xcb, 0x3b, 0xa2, 0x7d, 0x56, 0xfe, 0x4c, 0x59, 0xff, 0x37, - 0x00, 0x00, 0xff, 0xff, 0x54, 0xbb, 0x0e, 0x52, 0xac, 0x0d, 0x00, 0x00, + // 1158 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x4d, 0x6c, 0x1b, 0x45, + 0x14, 0xce, 0xa4, 0xa5, 0x8d, 0xc7, 0xa1, 0xb4, 0x93, 0x40, 0x53, 0x93, 0xd8, 0xe9, 0x96, 0x42, + 0x08, 0xf2, 0x8e, 0xe2, 0x90, 0xa6, 0x05, 0x84, 0xc0, 0x29, 0x81, 0x9c, 0x28, 0x56, 0x2f, 0x20, + 0x90, 0xbb, 0x5e, 0x8f, 0x37, 0xa3, 0xd8, 0x3b, 0x5b, 0xef, 0xda, 0xe0, 0xa6, 0x41, 0x6a, 0xa4, + 0x08, 0x09, 0x2a, 0x84, 0x84, 0xc4, 0x81, 0x3b, 0x42, 0x42, 0xe2, 0xc0, 0x91, 0x23, 0xb7, 0x9e, + 0x50, 0x25, 0x2e, 0x9c, 0x0c, 0x4a, 0x38, 0x73, 0x88, 0x38, 0x70, 0x44, 0xf3, 0xb3, 0xeb, 0x0d, + 0xeb, 0x4d, 0xbc, 0xc5, 0x11, 0xa7, 0xd8, 0xf3, 0x7e, 0xe6, 0xfb, 0xbe, 0x37, 0x7e, 0xef, 0x29, + 0xf0, 0x12, 0xad, 0x98, 0xd8, 0x70, 0x9c, 0x3a, 0x35, 0x0d, 0x8f, 0x32, 0xdb, 0xc5, 0x35, 0x42, + 0x70, 0x7b, 0x01, 0xdf, 0x6e, 0x91, 0x66, 0x47, 0x77, 0x9a, 0xcc, 0x63, 0xe8, 0x3c, 0xad, 0x98, + 0x7a, 0xd8, 0x49, 0xaf, 0x11, 0xa2, 0xb7, 0x17, 0x32, 0x93, 0x16, 0xb3, 0x98, 0xf0, 0xc1, 0xfc, + 0x93, 0x74, 0xcf, 0x4c, 0x5b, 0x8c, 0x59, 0x75, 0x82, 0x0d, 0x87, 0x62, 0xc3, 0xb6, 0x99, 0xa7, + 0x82, 0xa4, 0x35, 0x6b, 0x32, 0xb7, 0xc1, 0x5c, 0x5c, 0x31, 0x5c, 0x7e, 0x51, 0x85, 0x78, 0xc6, + 0x02, 0x36, 0x19, 0xb5, 0x95, 0x7d, 0x3e, 0x6c, 0x17, 0x28, 0x02, 0x2f, 0xc7, 0xb0, 0xa8, 0x2d, + 0x92, 0x29, 0xdf, 0x8b, 0x71, 0xe8, 0x39, 0x3e, 0xe9, 0x72, 0x39, 0xce, 0xc5, 0x22, 0x36, 0x71, + 0xa9, 0x1b, 0xce, 0x64, 0xb2, 0x26, 0xc1, 0xe6, 0xba, 0x61, 0xdb, 0xa4, 0xce, 0x5d, 0xd4, 0x47, + 0xe9, 0xa2, 0xdd, 0x07, 0x30, 0xf7, 0x0e, 0xc7, 0xb3, 0x66, 0x9b, 0xc4, 0xf6, 0x68, 0x9b, 0xde, + 0x21, 0xd5, 0x1b, 0x86, 0xb9, 0x41, 0x3c, 0xb7, 0x44, 0x6e, 0xb7, 0x88, 0xeb, 0xa1, 0x55, 0x08, + 0x7b, 0x20, 0xa7, 0xc0, 0x2c, 0x98, 0x4b, 0x17, 0x9e, 0xd5, 0x25, 0x23, 0x9d, 0x33, 0xd2, 0xa5, + 0xae, 0x8a, 0x91, 0x7e, 0xc3, 0xb0, 0x88, 0x8a, 0x2d, 0x85, 0x22, 0xd1, 0x45, 0x38, 0x2e, 0x1c, + 0xcb, 0xeb, 0x84, 0x5a, 0xeb, 0xde, 0xd4, 0xe8, 0x2c, 0x98, 0x3b, 0x59, 0x4a, 0x8b, 0xb3, 0xb7, + 0xc4, 0x91, 0xf6, 0x29, 0x80, 0xb3, 0xf1, 0x70, 0x5c, 0x87, 0xd9, 0x2e, 0x41, 0x35, 0x38, 0x49, + 0x43, 0xe6, 0xb2, 0x23, 0xed, 0x53, 0x60, 0xf6, 0xc4, 0x5c, 0xba, 0x90, 0xd7, 0x63, 0x0a, 0xab, + 0xaf, 0x55, 0x79, 0x4c, 0x8d, 0xfa, 0x19, 0x57, 0x09, 0x71, 0x8b, 0x27, 0x1f, 0x74, 0x73, 0x23, + 0xa5, 0x09, 0x1a, 0xbd, 0x4f, 0xdb, 0x01, 0x30, 0x1b, 0x03, 0xc6, 0x97, 0xe6, 0x35, 0x98, 0x92, + 0xb7, 0x97, 0x69, 0x55, 0x29, 0x33, 0x23, 0xee, 0xe7, 0xaa, 0xeb, 0xbe, 0xd4, 0x6d, 0xae, 0x09, + 0xf7, 0x5a, 0xab, 0xaa, 0xfb, 0xc6, 0x1c, 0xf5, 0x7d, 0x10, 0x51, 0x3e, 0x89, 0xaf, 0x51, 0xa0, + 0x49, 0x15, 0x4e, 0xf4, 0xd1, 0x44, 0x41, 0x7a, 0x24, 0x49, 0x50, 0x54, 0x12, 0xed, 0x67, 0x00, + 0x9f, 0x8f, 0x2b, 0xcf, 0x2a, 0x6b, 0xae, 0x48, 0xbe, 0xc3, 0x7e, 0x37, 0xe7, 0xe1, 0x69, 0x87, + 0x35, 0x85, 0xc4, 0x5c, 0x9d, 0x54, 0xe9, 0x14, 0xff, 0xba, 0x56, 0x45, 0x33, 0x10, 0x2a, 0x89, + 0xb9, 0xed, 0x84, 0xb0, 0xa5, 0xd4, 0x49, 0x1f, 0x69, 0x4f, 0x46, 0xa5, 0xfd, 0x1c, 0xc0, 0xf9, + 0x41, 0x08, 0x29, 0x95, 0x6f, 0x0d, 0xf1, 0xe5, 0xf5, 0x7f, 0x73, 0x1f, 0xc0, 0x0b, 0x02, 0xcf, + 0x4d, 0xe6, 0x19, 0xf5, 0x12, 0x31, 0xdb, 0xc2, 0x75, 0x58, 0xaf, 0x4d, 0xfb, 0x1a, 0xc0, 0x4c, + 0xbf, 0xfc, 0x8a, 0xdf, 0x5d, 0x98, 0x6a, 0x12, 0xb3, 0x5d, 0xae, 0x11, 0xe2, 0x93, 0xba, 0x70, + 0xa0, 0x60, 0x7e, 0xa9, 0x56, 0x18, 0xb5, 0x8b, 0xd7, 0x79, 0xf2, 0xfd, 0x6e, 0xee, 0x6c, 0xc7, + 0x68, 0xd4, 0x5f, 0xd2, 0x82, 0x48, 0xed, 0xbb, 0xdf, 0x72, 0x73, 0x16, 0xf5, 0xd6, 0x5b, 0x15, + 0xdd, 0x64, 0x0d, 0xac, 0x7a, 0x9f, 0xfc, 0x93, 0x77, 0xab, 0x1b, 0xd8, 0xeb, 0x38, 0xc4, 0x15, + 0x49, 0xdc, 0xd2, 0x58, 0x53, 0xa1, 0xd0, 0xde, 0x87, 0x53, 0x3d, 0x6c, 0xaf, 0x9b, 0x1b, 0xc3, + 0xa5, 0xfe, 0x15, 0x08, 0x4b, 0x1b, 0xa4, 0x57, 0xcc, 0x3b, 0x70, 0xcc, 0x30, 0x37, 0x06, 0x24, + 0xbe, 0xa2, 0x88, 0x3f, 0x21, 0x89, 0xfb, 0x81, 0xc9, 0x78, 0x9f, 0x36, 0x24, 0x04, 0xed, 0x16, + 0x9c, 0xee, 0xe1, 0xba, 0x49, 0x1b, 0x84, 0xb5, 0xbc, 0xe1, 0x52, 0xff, 0x16, 0xc0, 0x99, 0x98, + 0x2b, 0x14, 0xfd, 0x1d, 0x00, 0xc7, 0x3d, 0x79, 0x3e, 0xa0, 0x06, 0x6f, 0x2a, 0x0d, 0x26, 0xa4, + 0x06, 0xe1, 0xe0, 0x64, 0x3a, 0xa4, 0xbd, 0x1e, 0x1e, 0xed, 0x33, 0xbf, 0xe5, 0xae, 0x12, 0xf2, + 0x86, 0x6d, 0x54, 0xea, 0xa4, 0xaa, 0x7e, 0x83, 0xff, 0xc7, 0x34, 0xfa, 0xc6, 0x6f, 0xbc, 0xfd, + 0xd0, 0x28, 0xe5, 0xee, 0x01, 0x38, 0x59, 0x23, 0xa4, 0x4c, 0xa4, 0xbd, 0xac, 0xea, 0xe1, 0x2b, + 0x38, 0x1f, 0xdb, 0x13, 0x22, 0x39, 0x8b, 0x97, 0x94, 0xa4, 0x4f, 0x4b, 0x49, 0xfb, 0x65, 0xd5, + 0x4a, 0xa8, 0x16, 0xc1, 0xa2, 0x6d, 0xfb, 0xf5, 0x8d, 0xe4, 0xf4, 0x45, 0x7b, 0xa1, 0xd7, 0x42, + 0xb9, 0x62, 0xa9, 0x22, 0xda, 0xef, 0xe6, 0xce, 0xc8, 0x7b, 0x94, 0x41, 0x0b, 0xda, 0xea, 0x8b, + 0x07, 0xda, 0xaa, 0x68, 0xb9, 0xc5, 0x27, 0xf7, 0xbb, 0xb9, 0x73, 0xd2, 0xbf, 0x67, 0xd3, 0x42, + 0xdd, 0x56, 0x7b, 0x37, 0xae, 0x72, 0x81, 0x54, 0xcb, 0x30, 0x1d, 0xe2, 0x24, 0x80, 0x8c, 0x15, + 0x9f, 0xda, 0xef, 0xe6, 0x50, 0x84, 0xb0, 0x56, 0x82, 0x3d, 0x9e, 0x85, 0x1f, 0xce, 0xc0, 0xc7, + 0x44, 0x6e, 0xf4, 0x23, 0x80, 0x13, 0x7d, 0x5a, 0x35, 0xba, 0x1a, 0x2b, 0xf3, 0x11, 0xcb, 0x4d, + 0xe6, 0xda, 0x23, 0x44, 0x4a, 0x3e, 0x5a, 0x7e, 0xfb, 0x97, 0x3f, 0xbe, 0x1c, 0x7d, 0x0e, 0x5d, + 0xc6, 0x6a, 0x1d, 0x0b, 0xd6, 0xb0, 0x7e, 0x43, 0x02, 0xdd, 0x1f, 0x85, 0x28, 0x9a, 0x0e, 0x2d, + 0x27, 0x05, 0xe0, 0x23, 0xbf, 0x9a, 0x3c, 0x50, 0x01, 0xdf, 0x06, 0x02, 0xf9, 0x5d, 0x74, 0x67, + 0x10, 0xe4, 0x98, 0x3f, 0x0b, 0xbc, 0x19, 0xf4, 0x20, 0x5d, 0x3d, 0x98, 0xad, 0x60, 0xab, 0x0c, + 0xd9, 0x7a, 0x8f, 0x63, 0x0b, 0xbb, 0x1c, 0xa8, 0x6d, 0x92, 0xb0, 0xdd, 0x3f, 0xdb, 0x42, 0x7f, + 0x02, 0x38, 0x73, 0xe8, 0xd4, 0x45, 0xc5, 0xc4, 0xa5, 0x89, 0xec, 0x20, 0x99, 0x95, 0xff, 0x94, + 0x43, 0xe9, 0x75, 0x5d, 0xc8, 0xf5, 0x2a, 0x7a, 0x65, 0xa0, 0x42, 0xe3, 0xcd, 0x40, 0xa0, 0xcd, + 0x90, 0x1c, 0xe8, 0x6f, 0x00, 0x1f, 0x3f, 0x30, 0x76, 0x51, 0xe1, 0x70, 0x70, 0xfd, 0x76, 0x80, + 0xcc, 0x62, 0xa2, 0x18, 0x45, 0xe0, 0x63, 0x41, 0xe0, 0x23, 0xd4, 0x8e, 0x10, 0xf0, 0xb8, 0x7f, + 0x39, 0x18, 0xdd, 0xc7, 0x54, 0xeb, 0xbf, 0x00, 0x1c, 0x0f, 0x8f, 0x5d, 0xb4, 0x30, 0x00, 0x8b, + 0x83, 0x1b, 0x40, 0xa6, 0x90, 0x24, 0x44, 0xf1, 0xde, 0x12, 0xbc, 0x3f, 0x44, 0xad, 0x18, 0xde, + 0xfe, 0xe4, 0x3e, 0x26, 0xda, 0x3b, 0xa3, 0xf0, 0xec, 0xbf, 0x47, 0x2e, 0x5a, 0x1a, 0x80, 0x47, + 0x74, 0x0b, 0xc8, 0x5c, 0x49, 0x1a, 0xa6, 0x24, 0xb8, 0x27, 0x7f, 0xeb, 0x9b, 0xa8, 0x13, 0xa3, + 0x41, 0x78, 0x72, 0x1f, 0x93, 0x0e, 0xdf, 0x03, 0x88, 0xa2, 0x23, 0xf4, 0xa8, 0xce, 0x17, 0xbb, + 0x02, 0x1c, 0xd5, 0xf9, 0xe2, 0xa7, 0xb5, 0xf6, 0x8c, 0x10, 0x23, 0x8b, 0xa6, 0x23, 0x62, 0x84, + 0x86, 0x0f, 0xfa, 0x09, 0xc0, 0x73, 0x91, 0x24, 0xe8, 0x4a, 0xc2, 0x5b, 0x7d, 0xb4, 0xcb, 0x89, + 0xe3, 0x14, 0xd8, 0x97, 0x05, 0xd8, 0x25, 0xb4, 0x78, 0x18, 0xd8, 0x98, 0x6e, 0x53, 0x7c, 0xfb, + 0xc1, 0x6e, 0x16, 0x3c, 0xdc, 0xcd, 0x82, 0xdf, 0x77, 0xb3, 0xe0, 0x8b, 0xbd, 0xec, 0xc8, 0xc3, + 0xbd, 0xec, 0xc8, 0xaf, 0x7b, 0xd9, 0x91, 0xf7, 0x96, 0xa2, 0xab, 0x19, 0xad, 0x98, 0x79, 0x8b, + 0xe1, 0xf6, 0x22, 0x6e, 0xb0, 0x6a, 0xab, 0x4e, 0x5c, 0x79, 0x5b, 0xe1, 0x5a, 0x9e, 0x5f, 0x28, + 0xb6, 0xb5, 0xca, 0x29, 0xf1, 0x0f, 0x83, 0xc5, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x86, 0x29, + 0x9d, 0x29, 0x5d, 0x11, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -744,6 +963,10 @@ type QueryClient interface { TotalAckFees(ctx context.Context, in *QueryTotalAckFeesRequest, opts ...grpc.CallOption) (*QueryTotalAckFeesResponse, error) // TotalTimeoutFees returns the total timeout fees for a packet given its identifier TotalTimeoutFees(ctx context.Context, in *QueryTotalTimeoutFeesRequest, opts ...grpc.CallOption) (*QueryTotalTimeoutFeesResponse, 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 + FeeEnabledChannel(ctx context.Context, in *QueryFeeEnabledChannelRequest, opts ...grpc.CallOption) (*QueryFeeEnabledChannelResponse, error) } type queryClient struct { @@ -808,6 +1031,24 @@ func (c *queryClient) TotalTimeoutFees(ctx context.Context, in *QueryTotalTimeou return out, nil } +func (c *queryClient) FeeEnabledChannels(ctx context.Context, in *QueryFeeEnabledChannelsRequest, opts ...grpc.CallOption) (*QueryFeeEnabledChannelsResponse, error) { + out := new(QueryFeeEnabledChannelsResponse) + err := c.cc.Invoke(ctx, "/ibc.applications.fee.v1.Query/FeeEnabledChannels", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *queryClient) FeeEnabledChannel(ctx context.Context, in *QueryFeeEnabledChannelRequest, opts ...grpc.CallOption) (*QueryFeeEnabledChannelResponse, error) { + out := new(QueryFeeEnabledChannelResponse) + err := c.cc.Invoke(ctx, "/ibc.applications.fee.v1.Query/FeeEnabledChannel", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // QueryServer is the server API for Query service. type QueryServer interface { // IncentivizedPackets returns all incentivized packets and their associated fees @@ -822,6 +1063,10 @@ type QueryServer interface { TotalAckFees(context.Context, *QueryTotalAckFeesRequest) (*QueryTotalAckFeesResponse, error) // TotalTimeoutFees returns the total timeout fees for a packet given its identifier TotalTimeoutFees(context.Context, *QueryTotalTimeoutFeesRequest) (*QueryTotalTimeoutFeesResponse, 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 + FeeEnabledChannel(context.Context, *QueryFeeEnabledChannelRequest) (*QueryFeeEnabledChannelResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. @@ -846,6 +1091,12 @@ func (*UnimplementedQueryServer) TotalAckFees(ctx context.Context, req *QueryTot func (*UnimplementedQueryServer) TotalTimeoutFees(ctx context.Context, req *QueryTotalTimeoutFeesRequest) (*QueryTotalTimeoutFeesResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method TotalTimeoutFees not implemented") } +func (*UnimplementedQueryServer) FeeEnabledChannels(ctx context.Context, req *QueryFeeEnabledChannelsRequest) (*QueryFeeEnabledChannelsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method FeeEnabledChannels not implemented") +} +func (*UnimplementedQueryServer) FeeEnabledChannel(ctx context.Context, req *QueryFeeEnabledChannelRequest) (*QueryFeeEnabledChannelResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method FeeEnabledChannel not implemented") +} func RegisterQueryServer(s grpc1.Server, srv QueryServer) { s.RegisterService(&_Query_serviceDesc, srv) @@ -959,6 +1210,42 @@ func _Query_TotalTimeoutFees_Handler(srv interface{}, ctx context.Context, dec f return interceptor(ctx, in, info, handler) } +func _Query_FeeEnabledChannels_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryFeeEnabledChannelsRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).FeeEnabledChannels(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/ibc.applications.fee.v1.Query/FeeEnabledChannels", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).FeeEnabledChannels(ctx, req.(*QueryFeeEnabledChannelsRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Query_FeeEnabledChannel_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryFeeEnabledChannelRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).FeeEnabledChannel(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/ibc.applications.fee.v1.Query/FeeEnabledChannel", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).FeeEnabledChannel(ctx, req.(*QueryFeeEnabledChannelRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _Query_serviceDesc = grpc.ServiceDesc{ ServiceName: "ibc.applications.fee.v1.Query", HandlerType: (*QueryServer)(nil), @@ -987,6 +1274,14 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "TotalTimeoutFees", Handler: _Query_TotalTimeoutFees_Handler, }, + { + MethodName: "FeeEnabledChannels", + Handler: _Query_FeeEnabledChannels_Handler, + }, + { + MethodName: "FeeEnabledChannel", + Handler: _Query_FeeEnabledChannel_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "ibc/applications/fee/v1/query.proto", @@ -1441,55 +1736,202 @@ func (m *QueryTotalTimeoutFeesResponse) MarshalToSizedBuffer(dAtA []byte) (int, return len(dAtA) - i, nil } -func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { - offset -= sovQuery(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ +func (m *QueryFeeEnabledChannelsRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } - dAtA[offset] = uint8(v) - return base + return dAtA[:n], nil } -func (m *QueryIncentivizedPacketsRequest) Size() (n int) { - if m == nil { - return 0 - } + +func (m *QueryFeeEnabledChannelsRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryFeeEnabledChannelsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l - if m.Pagination != nil { - l = m.Pagination.Size() - n += 1 + l + sovQuery(uint64(l)) - } if m.QueryHeight != 0 { - n += 1 + sovQuery(uint64(m.QueryHeight)) + i = encodeVarintQuery(dAtA, i, uint64(m.QueryHeight)) + i-- + dAtA[i] = 0x10 } - return n + if m.Pagination != nil { + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil } -func (m *QueryIncentivizedPacketsResponse) Size() (n int) { - if m == nil { - return 0 +func (m *QueryFeeEnabledChannelsResponse) 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 *QueryFeeEnabledChannelsResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryFeeEnabledChannelsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i var l int _ = l - if len(m.IncentivizedPackets) > 0 { - for _, e := range m.IncentivizedPackets { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) + if len(m.FeeEnabledChannels) > 0 { + for iNdEx := len(m.FeeEnabledChannels) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.FeeEnabledChannels[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa } } - return n + return len(dAtA) - i, nil } -func (m *QueryIncentivizedPacketRequest) Size() (n int) { - if m == nil { - return 0 +func (m *QueryFeeEnabledChannelRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } - var l int - _ = l - l = m.PacketId.Size() + return dAtA[:n], nil +} + +func (m *QueryFeeEnabledChannelRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryFeeEnabledChannelRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.ChannelId) > 0 { + i -= len(m.ChannelId) + copy(dAtA[i:], m.ChannelId) + i = encodeVarintQuery(dAtA, i, uint64(len(m.ChannelId))) + i-- + dAtA[i] = 0x12 + } + if len(m.PortId) > 0 { + i -= len(m.PortId) + copy(dAtA[i:], m.PortId) + i = encodeVarintQuery(dAtA, i, uint64(len(m.PortId))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *QueryFeeEnabledChannelResponse) 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 *QueryFeeEnabledChannelResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryFeeEnabledChannelResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.FeeEnabled { + i-- + if m.FeeEnabled { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { + offset -= sovQuery(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *QueryIncentivizedPacketsRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + if m.QueryHeight != 0 { + n += 1 + sovQuery(uint64(m.QueryHeight)) + } + return n +} + +func (m *QueryIncentivizedPacketsResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.IncentivizedPackets) > 0 { + for _, e := range m.IncentivizedPackets { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + return n +} + +func (m *QueryIncentivizedPacketRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = m.PacketId.Size() n += 1 + l + sovQuery(uint64(l)) if m.QueryHeight != 0 { n += 1 + sovQuery(uint64(m.QueryHeight)) @@ -1625,6 +2067,66 @@ func (m *QueryTotalTimeoutFeesResponse) Size() (n int) { return n } +func (m *QueryFeeEnabledChannelsRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } + if m.QueryHeight != 0 { + n += 1 + sovQuery(uint64(m.QueryHeight)) + } + return n +} + +func (m *QueryFeeEnabledChannelsResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.FeeEnabledChannels) > 0 { + for _, e := range m.FeeEnabledChannels { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + return n +} + +func (m *QueryFeeEnabledChannelRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.PortId) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.ChannelId) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryFeeEnabledChannelResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.FeeEnabled { + n += 2 + } + return n +} + func sovQuery(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -2759,6 +3261,379 @@ func (m *QueryTotalTimeoutFeesResponse) Unmarshal(dAtA []byte) error { } return nil } +func (m *QueryFeeEnabledChannelsRequest) 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: QueryFeeEnabledChannelsRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryFeeEnabledChannelsRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field QueryHeight", wireType) + } + m.QueryHeight = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.QueryHeight |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + 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 *QueryFeeEnabledChannelsResponse) 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: QueryFeeEnabledChannelsResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryFeeEnabledChannelsResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field FeeEnabledChannels", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.FeeEnabledChannels = append(m.FeeEnabledChannels, FeeEnabledChannel{}) + if err := m.FeeEnabledChannels[len(m.FeeEnabledChannels)-1].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 *QueryFeeEnabledChannelRequest) 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: QueryFeeEnabledChannelRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryFeeEnabledChannelRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PortId", 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.PortId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", 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.ChannelId = 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 *QueryFeeEnabledChannelResponse) 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: QueryFeeEnabledChannelResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryFeeEnabledChannelResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field FeeEnabled", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.FeeEnabled = bool(v != 0) + 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 skipQuery(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/modules/apps/29-fee/types/query.pb.gw.go b/modules/apps/29-fee/types/query.pb.gw.go index 8775f7404fd..574886e85a4 100644 --- a/modules/apps/29-fee/types/query.pb.gw.go +++ b/modules/apps/29-fee/types/query.pb.gw.go @@ -625,6 +625,118 @@ func local_request_Query_TotalTimeoutFees_0(ctx context.Context, marshaler runti } +var ( + filter_Query_FeeEnabledChannels_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) + +func request_Query_FeeEnabledChannels_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryFeeEnabledChannelsRequest + 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_FeeEnabledChannels_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.FeeEnabledChannels(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_FeeEnabledChannels_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryFeeEnabledChannelsRequest + 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_FeeEnabledChannels_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.FeeEnabledChannels(ctx, &protoReq) + return msg, metadata, err + +} + +func request_Query_FeeEnabledChannel_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryFeeEnabledChannelRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["port_id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "port_id") + } + + protoReq.PortId, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "port_id", err) + } + + val, ok = pathParams["channel_id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "channel_id") + } + + protoReq.ChannelId, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "channel_id", err) + } + + msg, err := client.FeeEnabledChannel(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_FeeEnabledChannel_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryFeeEnabledChannelRequest + var metadata runtime.ServerMetadata + + var ( + val string + ok bool + err error + _ = err + ) + + val, ok = pathParams["port_id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "port_id") + } + + protoReq.PortId, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "port_id", err) + } + + val, ok = pathParams["channel_id"] + if !ok { + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "channel_id") + } + + protoReq.ChannelId, err = runtime.String(val) + + if err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "channel_id", err) + } + + msg, err := server.FeeEnabledChannel(ctx, &protoReq) + return msg, metadata, err + +} + // RegisterQueryHandlerServer registers the http handlers for service Query to "mux". // UnaryRPC :call QueryServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. @@ -751,6 +863,46 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) + mux.Handle("GET", pattern_Query_FeeEnabledChannels_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.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_FeeEnabledChannels_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_FeeEnabledChannels_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_FeeEnabledChannel_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.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_FeeEnabledChannel_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_FeeEnabledChannel_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } @@ -912,6 +1064,46 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) + mux.Handle("GET", pattern_Query_FeeEnabledChannels_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_FeeEnabledChannels_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_FeeEnabledChannels_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + + mux.Handle("GET", pattern_Query_FeeEnabledChannel_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_FeeEnabledChannel_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_FeeEnabledChannel_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } @@ -927,6 +1119,10 @@ var ( pattern_Query_TotalAckFees_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 2, 5, 1, 0, 4, 1, 5, 6, 2, 7, 1, 0, 4, 1, 5, 8, 2, 9, 1, 0, 4, 1, 5, 10}, []string{"ibc", "apps", "fee", "v1", "total_ack_fees", "port", "packet_id.port_id", "channel", "packet_id.channel_id", "sequence", "packet_id.sequence"}, "", runtime.AssumeColonVerbOpt(true))) pattern_Query_TotalTimeoutFees_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 2, 5, 1, 0, 4, 1, 5, 6, 2, 7, 1, 0, 4, 1, 5, 8, 2, 9, 1, 0, 4, 1, 5, 10}, []string{"ibc", "apps", "fee", "v1", "total_timeout_fees", "port", "packet_id.port_id", "channel", "packet_id.channel_id", "sequence", "packet_id.sequence"}, "", 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))) + + pattern_Query_FeeEnabledChannel_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"ibc", "apps", "fee", "v1", "fee_enabled", "port_id", "channel_id"}, "", runtime.AssumeColonVerbOpt(true))) ) var ( @@ -941,4 +1137,8 @@ var ( forward_Query_TotalAckFees_0 = runtime.ForwardResponseMessage forward_Query_TotalTimeoutFees_0 = runtime.ForwardResponseMessage + + forward_Query_FeeEnabledChannels_0 = runtime.ForwardResponseMessage + + forward_Query_FeeEnabledChannel_0 = runtime.ForwardResponseMessage ) diff --git a/proto/ibc/applications/fee/v1/query.proto b/proto/ibc/applications/fee/v1/query.proto index 3e5d6b8740d..5214a9b7d13 100644 --- a/proto/ibc/applications/fee/v1/query.proto +++ b/proto/ibc/applications/fee/v1/query.proto @@ -9,6 +9,7 @@ import "google/api/annotations.proto"; import "cosmos/base/v1beta1/coin.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; import "ibc/applications/fee/v1/fee.proto"; +import "ibc/applications/fee/v1/genesis.proto"; import "ibc/core/channel/v1/channel.proto"; // Query defines the ICS29 gRPC querier service. @@ -48,6 +49,16 @@ service Query { option (google.api.http).get = "/ibc/apps/fee/v1/total_timeout_fees/port/{packet_id.port_id}/channel/" "{packet_id.channel_id}/sequence/{packet_id.sequence}"; } + + // FeeEnabledChannels returns a list of all fee enabled channels + rpc FeeEnabledChannels(QueryFeeEnabledChannelsRequest) returns (QueryFeeEnabledChannelsResponse) { + option (google.api.http).get = "/ibc/apps/fee/v1/fee_enabled"; + } + + // FeeEnabledChannel returns true if the provided port and channel identifiers belong to a fee enabled channel + rpc FeeEnabledChannel(QueryFeeEnabledChannelRequest) returns (QueryFeeEnabledChannelResponse) { + option (google.api.http).get = "/ibc/apps/fee/v1/fee_enabled/{port_id}/{channel_id}"; + } } // QueryIncentivizedPacketsRequest defines the request type for the IncentivizedPackets rpc @@ -142,3 +153,32 @@ message QueryTotalTimeoutFeesResponse { (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" ]; } + +// QueryFeeEnabledChannelsRequest defines the request type for the FeeEnabledChannels rpc +message QueryFeeEnabledChannelsRequest { + // pagination defines an optional pagination for the request. + cosmos.base.query.v1beta1.PageRequest pagination = 1; + // block height at which to query + uint64 query_height = 2; +} + +// QueryFeeEnabledChannelsResponse defines the response type for the FeeEnabledChannels rpc +message QueryFeeEnabledChannelsResponse { + // list of fee enabled channels + repeated ibc.applications.fee.v1.FeeEnabledChannel fee_enabled_channels = 1 + [(gogoproto.moretags) = "yaml:\"fee_enabled_channels\"", (gogoproto.nullable) = false]; +} + +// QueryFeeEnabledChannelRequest defines the request type for the FeeEnabledChannel rpc +message QueryFeeEnabledChannelRequest { + // unique port identifier + string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; + // unique channel identifier + string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""]; +} + +// QueryFeeEnabledChannelResponse defines the response type for the FeeEnabledChannel rpc +message QueryFeeEnabledChannelResponse { + // boolean flag representing the fee enabled channel status + bool fee_enabled = 1 [(gogoproto.moretags) = "yaml:\"fee_enabled\""]; +} From 281fea87087e3f3bf885e1e56d457e0bbd3cc1df Mon Sep 17 00:00:00 2001 From: Damian Nolan Date: Thu, 7 Apr 2022 10:02:45 +0200 Subject: [PATCH 2/6] adding grpc queries and tests --- modules/apps/29-fee/keeper/grpc_query.go | 50 ++++++ modules/apps/29-fee/keeper/grpc_query_test.go | 159 ++++++++++++++++++ 2 files changed, 209 insertions(+) diff --git a/modules/apps/29-fee/keeper/grpc_query.go b/modules/apps/29-fee/keeper/grpc_query.go index 68f2cb332ca..01012af12a0 100644 --- a/modules/apps/29-fee/keeper/grpc_query.go +++ b/modules/apps/29-fee/keeper/grpc_query.go @@ -173,3 +173,53 @@ func (k Keeper) TotalTimeoutFees(goCtx context.Context, req *types.QueryTotalTim TimeoutFees: timeoutFees, }, nil } + +// FeeEnabledChannels implements the Query/FeeEnabledChannels gRPC method +func (k Keeper) FeeEnabledChannels(goCtx context.Context, req *types.QueryFeeEnabledChannelsRequest) (*types.QueryFeeEnabledChannelsResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "empty request") + } + + ctx := sdk.UnwrapSDKContext(goCtx).WithBlockHeight(int64(req.QueryHeight)) + + var feeEnabledChannels []types.FeeEnabledChannel + store := prefix.NewStore(ctx.KVStore(k.storeKey), []byte(types.FeeEnabledKeyPrefix)) + _, err := query.Paginate(store, req.Pagination, func(key, value []byte) error { + portID, channelID, err := types.ParseKeyFeeEnabled(types.FeeEnabledKeyPrefix + string(key)) + if err != nil { + return err + } + + feeEnabledChannel := types.FeeEnabledChannel{ + PortId: portID, + ChannelId: channelID, + } + + feeEnabledChannels = append(feeEnabledChannels, feeEnabledChannel) + + return nil + }) + + if err != nil { + return nil, status.Error(codes.NotFound, err.Error()) + } + + return &types.QueryFeeEnabledChannelsResponse{ + FeeEnabledChannels: feeEnabledChannels, + }, nil +} + +// FeeEnabledChannel implements the Query/FeeEnabledChannel gRPC method +func (k Keeper) FeeEnabledChannel(goCtx context.Context, req *types.QueryFeeEnabledChannelRequest) (*types.QueryFeeEnabledChannelResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "empty request") + } + + ctx := sdk.UnwrapSDKContext(goCtx) + + isFeeEnabled := k.IsFeeEnabled(ctx, req.PortId, req.ChannelId) + + return &types.QueryFeeEnabledChannelResponse{ + FeeEnabled: isFeeEnabled, + }, nil +} diff --git a/modules/apps/29-fee/keeper/grpc_query_test.go b/modules/apps/29-fee/keeper/grpc_query_test.go index 4bd55b92903..60434299e4b 100644 --- a/modules/apps/29-fee/keeper/grpc_query_test.go +++ b/modules/apps/29-fee/keeper/grpc_query_test.go @@ -2,6 +2,7 @@ package keeper_test import ( "fmt" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" @@ -426,3 +427,161 @@ func (suite *KeeperTestSuite) TestQueryTotalTimeoutFees() { }) } } + +func (suite *KeeperTestSuite) TestQueryFeeEnabledChannels() { + var ( + req *types.QueryFeeEnabledChannelsRequest + expFeeEnabledChannels []types.FeeEnabledChannel + ) + + testCases := []struct { + name string + malleate func() + expPass bool + }{ + { + "success", + func() {}, + true, + }, + { + "success, empty pagination", + func() { + req = &types.QueryFeeEnabledChannelsRequest{} + }, + true, + }, + { + "success, with multiple fee enabled channels", + func() { + suite.coordinator.Setup(suite.pathAToC) + + expChannel := types.FeeEnabledChannel{ + PortId: suite.pathAToC.EndpointA.ChannelConfig.PortID, + ChannelId: suite.pathAToC.EndpointA.ChannelID, + } + + expFeeEnabledChannels = append(expFeeEnabledChannels, expChannel) + }, + true, + }, + { + "success, pagination with multiple fee enabled channels", + func() { + // start at index 1, as channel-0 is already added to expFeeEnabledChannels below + for i := 1; i < 10; i++ { + channelID := channeltypes.FormatChannelIdentifier(uint64(i)) + suite.chainA.GetSimApp().IBCFeeKeeper.SetFeeEnabled(suite.chainA.GetContext(), ibctesting.MockFeePort, channelID) + + expChannel := types.FeeEnabledChannel{ + PortId: ibctesting.MockFeePort, + ChannelId: channelID, + } + + if i < 5 { // add only the first 5 channels, as our default pagination limit is 5 + expFeeEnabledChannels = append(expFeeEnabledChannels, expChannel) + } + } + + suite.chainA.NextBlock() + }, + true, + }, + { + "empty response", + func() { + suite.chainA.GetSimApp().IBCFeeKeeper.DeleteFeeEnabled(suite.chainA.GetContext(), suite.path.EndpointA.ChannelConfig.PortID, suite.path.EndpointA.ChannelID) + expFeeEnabledChannels = nil + + suite.chainA.NextBlock() + }, + true, + }, + } + + for _, tc := range testCases { + suite.Run(tc.name, func() { + suite.SetupTest() // reset + + suite.coordinator.Setup(suite.path) + + expChannel := types.FeeEnabledChannel{ + PortId: suite.path.EndpointA.ChannelConfig.PortID, + ChannelId: suite.path.EndpointA.ChannelID, + } + + expFeeEnabledChannels = []types.FeeEnabledChannel{expChannel} + + req = &types.QueryFeeEnabledChannelsRequest{ + Pagination: &query.PageRequest{ + Limit: 5, + CountTotal: false, + }, + QueryHeight: 0, + } + + tc.malleate() + + ctx := sdk.WrapSDKContext(suite.chainA.GetContext()) + res, err := suite.queryClient.FeeEnabledChannels(ctx, req) + + if tc.expPass { + suite.Require().NoError(err) + suite.Require().Equal(expFeeEnabledChannels, res.FeeEnabledChannels) + } else { + suite.Require().Error(err) + } + }) + } +} + +func (suite *KeeperTestSuite) TestQueryFeeEnabledChannel() { + var ( + req *types.QueryFeeEnabledChannelRequest + ) + + testCases := []struct { + name string + malleate func() + expPass bool + }{ + { + "success", + func() {}, + true, + }, + { + "fee not enabled on channel", + func() { + req.ChannelId = "invalid-channel-id" + req.PortId = "invalid-port-id" + }, + false, + }, + } + + for _, tc := range testCases { + suite.Run(tc.name, func() { + suite.SetupTest() // reset + + suite.coordinator.Setup(suite.path) + + req = &types.QueryFeeEnabledChannelRequest{ + PortId: suite.path.EndpointA.ChannelConfig.PortID, + ChannelId: suite.path.EndpointA.ChannelID, + } + + tc.malleate() + + ctx := sdk.WrapSDKContext(suite.chainA.GetContext()) + res, err := suite.queryClient.FeeEnabledChannel(ctx, req) + + if tc.expPass { + suite.Require().NoError(err) + suite.Require().True(res.FeeEnabled) + } else { + suite.Require().False(res.FeeEnabled) + } + }) + } +} From 4f2ed02ca4cbfacb0b2cb4523debd725eee88cf7 Mon Sep 17 00:00:00 2001 From: Damian Nolan Date: Thu, 7 Apr 2022 10:02:55 +0200 Subject: [PATCH 3/6] adding clis for queries --- modules/apps/29-fee/client/cli/cli.go | 2 + modules/apps/29-fee/client/cli/query.go | 76 +++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/modules/apps/29-fee/client/cli/cli.go b/modules/apps/29-fee/client/cli/cli.go index 292f1d7b3d8..57d3e3e6347 100644 --- a/modules/apps/29-fee/client/cli/cli.go +++ b/modules/apps/29-fee/client/cli/cli.go @@ -18,6 +18,8 @@ func GetQueryCmd() *cobra.Command { GetCmdTotalRecvFees(), GetCmdTotalAckFees(), GetCmdTotalTimeoutFees(), + GetCmdFeeEnabledChannel(), + GetCmdFeeEnabledChannels(), ) return queryCmd diff --git a/modules/apps/29-fee/client/cli/query.go b/modules/apps/29-fee/client/cli/query.go index 95bb0959ba7..ef43991748b 100644 --- a/modules/apps/29-fee/client/cli/query.go +++ b/modules/apps/29-fee/client/cli/query.go @@ -149,3 +149,79 @@ func GetCmdTotalTimeoutFees() *cobra.Command { return cmd } + +// GetCmdFeeEnabledChannels returns the command handler for the Query/FeeEnabledChannels rpc. +func GetCmdFeeEnabledChannels() *cobra.Command { + cmd := &cobra.Command{ + Use: "channels", + Short: "Query the ibc-fee enabled channels", + Long: "Query the ibc-fee enabled channels", + Args: cobra.NoArgs, + Example: fmt.Sprintf("%s query ibc-fee channels", version.AppName), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + pageReq, err := client.ReadPageRequest(cmd.Flags()) + if err != nil { + return err + } + + req := &types.QueryFeeEnabledChannelsRequest{ + Pagination: pageReq, + QueryHeight: uint64(clientCtx.Height), + } + + queryClient := types.NewQueryClient(clientCtx) + + res, err := queryClient.FeeEnabledChannels(cmd.Context(), req) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + flags.AddPaginationFlagsToCmd(cmd, "channels") + + return cmd +} + +// GetCmdFeeEnabledChannel returns the command handler for the Query/FeeEnabledChannel rpc. +func GetCmdFeeEnabledChannel() *cobra.Command { + cmd := &cobra.Command{ + Use: "channel [port-id] [channel-id]", + Short: "Query the ibc-fee enabled status of a channel", + Long: "Query the ibc-fee enabled status of a channel", + Args: cobra.ExactArgs(2), + Example: fmt.Sprintf("%s query ibc-fee channel transfer channel-6", version.AppName), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + req := &types.QueryFeeEnabledChannelRequest{ + PortId: args[0], + ChannelId: args[1], + } + + queryClient := types.NewQueryClient(clientCtx) + + res, err := queryClient.FeeEnabledChannel(cmd.Context(), req) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} From 0cbbc1304a1863e576f653653788725a1fd18886 Mon Sep 17 00:00:00 2001 From: Damian Nolan Date: Thu, 7 Apr 2022 16:50:25 +0200 Subject: [PATCH 4/6] adding changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a393565403b..0baf1dc5403 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,8 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Features +* (apps/29-fee) [\#1225](https://github.com/cosmos/ibc-go/pull/1225) Adding Query/FeeEnabledChannel and Query/FeeEnabledChannels with CLIs to ICS29 fee middleware. + ### Bug Fixes * (modules/core/04-channel) [\#1130](https://github.com/cosmos/ibc-go/pull/1130) Call `packet.GetSequence()` rather than passing func in `WriteAcknowledgement` log output From af87518af33bcdab11c72c170b971178439a0b0b Mon Sep 17 00:00:00 2001 From: Damian Nolan Date: Thu, 7 Apr 2022 16:53:38 +0200 Subject: [PATCH 5/6] resolving nits from pr review --- modules/apps/29-fee/keeper/grpc_query.go | 5 +++-- modules/apps/29-fee/keeper/grpc_query_test.go | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/apps/29-fee/keeper/grpc_query.go b/modules/apps/29-fee/keeper/grpc_query.go index 01012af12a0..a99c4315635 100644 --- a/modules/apps/29-fee/keeper/grpc_query.go +++ b/modules/apps/29-fee/keeper/grpc_query.go @@ -174,7 +174,7 @@ func (k Keeper) TotalTimeoutFees(goCtx context.Context, req *types.QueryTotalTim }, nil } -// FeeEnabledChannels implements the Query/FeeEnabledChannels gRPC method +// FeeEnabledChannels implements the Query/FeeEnabledChannels gRPC method and returns a list of fee enabled channels func (k Keeper) FeeEnabledChannels(goCtx context.Context, req *types.QueryFeeEnabledChannelsRequest) (*types.QueryFeeEnabledChannelsResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "empty request") @@ -209,7 +209,8 @@ func (k Keeper) FeeEnabledChannels(goCtx context.Context, req *types.QueryFeeEna }, nil } -// FeeEnabledChannel implements the Query/FeeEnabledChannel gRPC method +// FeeEnabledChannel implements the Query/FeeEnabledChannel gRPC method and returns true if the provided +// port and channel identifiers belong to a fee enabled channel func (k Keeper) FeeEnabledChannel(goCtx context.Context, req *types.QueryFeeEnabledChannelRequest) (*types.QueryFeeEnabledChannelResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "empty request") diff --git a/modules/apps/29-fee/keeper/grpc_query_test.go b/modules/apps/29-fee/keeper/grpc_query_test.go index 60434299e4b..66fc66f4744 100644 --- a/modules/apps/29-fee/keeper/grpc_query_test.go +++ b/modules/apps/29-fee/keeper/grpc_query_test.go @@ -445,14 +445,14 @@ func (suite *KeeperTestSuite) TestQueryFeeEnabledChannels() { true, }, { - "success, empty pagination", + "success: empty pagination", func() { req = &types.QueryFeeEnabledChannelsRequest{} }, true, }, { - "success, with multiple fee enabled channels", + "success: with multiple fee enabled channels", func() { suite.coordinator.Setup(suite.pathAToC) @@ -466,7 +466,7 @@ func (suite *KeeperTestSuite) TestQueryFeeEnabledChannels() { true, }, { - "success, pagination with multiple fee enabled channels", + "success: pagination with multiple fee enabled channels", func() { // start at index 1, as channel-0 is already added to expFeeEnabledChannels below for i := 1; i < 10; i++ { From c6f4d5cd0f4a9824eedf30913c22c5655fba6139 Mon Sep 17 00:00:00 2001 From: Damian Nolan Date: Thu, 7 Apr 2022 17:18:10 +0200 Subject: [PATCH 6/6] updating grpc gateway options --- docs/ibc/proto-docs.md | 2 +- modules/apps/29-fee/types/query.pb.go | 148 +++++++++++----------- modules/apps/29-fee/types/query.pb.gw.go | 2 +- proto/ibc/applications/fee/v1/query.proto | 2 +- 4 files changed, 77 insertions(+), 77 deletions(-) diff --git a/docs/ibc/proto-docs.md b/docs/ibc/proto-docs.md index 84a68d54c6f..cbd108dab68 100644 --- a/docs/ibc/proto-docs.md +++ b/docs/ibc/proto-docs.md @@ -1178,7 +1178,7 @@ Query defines the ICS29 gRPC querier service. | `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/total_ack_fees/port/{packet_id.port_id}/channel/{packet_id.channel_id}/sequence/{packet_id.sequence}| | `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/total_timeout_fees/port/{packet_id.port_id}/channel/{packet_id.channel_id}/sequence/{packet_id.sequence}| | `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/fee_enabled/{port_id}/{channel_id}| +| `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/fee_enabled/port/{port_id}/channel/{channel_id}| diff --git a/modules/apps/29-fee/types/query.pb.go b/modules/apps/29-fee/types/query.pb.go index 20f3c5fdbf7..181d508b298 100644 --- a/modules/apps/29-fee/types/query.pb.go +++ b/modules/apps/29-fee/types/query.pb.go @@ -863,80 +863,80 @@ func init() { } var fileDescriptor_0638a8a78ca2503c = []byte{ - // 1158 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x4d, 0x6c, 0x1b, 0x45, - 0x14, 0xce, 0xa4, 0xa5, 0x8d, 0xc7, 0xa1, 0xb4, 0x93, 0x40, 0x53, 0x93, 0xd8, 0xe9, 0x96, 0x42, - 0x08, 0xf2, 0x8e, 0xe2, 0x90, 0xa6, 0x05, 0x84, 0xc0, 0x29, 0x81, 0x9c, 0x28, 0x56, 0x2f, 0x20, - 0x90, 0xbb, 0x5e, 0x8f, 0x37, 0xa3, 0xd8, 0x3b, 0x5b, 0xef, 0xda, 0xe0, 0xa6, 0x41, 0x6a, 0xa4, - 0x08, 0x09, 0x2a, 0x84, 0x84, 0xc4, 0x81, 0x3b, 0x42, 0x42, 0xe2, 0xc0, 0x91, 0x23, 0xb7, 0x9e, - 0x50, 0x25, 0x2e, 0x9c, 0x0c, 0x4a, 0x38, 0x73, 0x88, 0x38, 0x70, 0x44, 0xf3, 0xb3, 0xeb, 0x0d, - 0xeb, 0x4d, 0xbc, 0xc5, 0x11, 0xa7, 0xd8, 0xf3, 0x7e, 0xe6, 0xfb, 0xbe, 0x37, 0x7e, 0xef, 0x29, - 0xf0, 0x12, 0xad, 0x98, 0xd8, 0x70, 0x9c, 0x3a, 0x35, 0x0d, 0x8f, 0x32, 0xdb, 0xc5, 0x35, 0x42, - 0x70, 0x7b, 0x01, 0xdf, 0x6e, 0x91, 0x66, 0x47, 0x77, 0x9a, 0xcc, 0x63, 0xe8, 0x3c, 0xad, 0x98, - 0x7a, 0xd8, 0x49, 0xaf, 0x11, 0xa2, 0xb7, 0x17, 0x32, 0x93, 0x16, 0xb3, 0x98, 0xf0, 0xc1, 0xfc, - 0x93, 0x74, 0xcf, 0x4c, 0x5b, 0x8c, 0x59, 0x75, 0x82, 0x0d, 0x87, 0x62, 0xc3, 0xb6, 0x99, 0xa7, - 0x82, 0xa4, 0x35, 0x6b, 0x32, 0xb7, 0xc1, 0x5c, 0x5c, 0x31, 0x5c, 0x7e, 0x51, 0x85, 0x78, 0xc6, - 0x02, 0x36, 0x19, 0xb5, 0x95, 0x7d, 0x3e, 0x6c, 0x17, 0x28, 0x02, 0x2f, 0xc7, 0xb0, 0xa8, 0x2d, - 0x92, 0x29, 0xdf, 0x8b, 0x71, 0xe8, 0x39, 0x3e, 0xe9, 0x72, 0x39, 0xce, 0xc5, 0x22, 0x36, 0x71, - 0xa9, 0x1b, 0xce, 0x64, 0xb2, 0x26, 0xc1, 0xe6, 0xba, 0x61, 0xdb, 0xa4, 0xce, 0x5d, 0xd4, 0x47, - 0xe9, 0xa2, 0xdd, 0x07, 0x30, 0xf7, 0x0e, 0xc7, 0xb3, 0x66, 0x9b, 0xc4, 0xf6, 0x68, 0x9b, 0xde, - 0x21, 0xd5, 0x1b, 0x86, 0xb9, 0x41, 0x3c, 0xb7, 0x44, 0x6e, 0xb7, 0x88, 0xeb, 0xa1, 0x55, 0x08, - 0x7b, 0x20, 0xa7, 0xc0, 0x2c, 0x98, 0x4b, 0x17, 0x9e, 0xd5, 0x25, 0x23, 0x9d, 0x33, 0xd2, 0xa5, - 0xae, 0x8a, 0x91, 0x7e, 0xc3, 0xb0, 0x88, 0x8a, 0x2d, 0x85, 0x22, 0xd1, 0x45, 0x38, 0x2e, 0x1c, - 0xcb, 0xeb, 0x84, 0x5a, 0xeb, 0xde, 0xd4, 0xe8, 0x2c, 0x98, 0x3b, 0x59, 0x4a, 0x8b, 0xb3, 0xb7, - 0xc4, 0x91, 0xf6, 0x29, 0x80, 0xb3, 0xf1, 0x70, 0x5c, 0x87, 0xd9, 0x2e, 0x41, 0x35, 0x38, 0x49, - 0x43, 0xe6, 0xb2, 0x23, 0xed, 0x53, 0x60, 0xf6, 0xc4, 0x5c, 0xba, 0x90, 0xd7, 0x63, 0x0a, 0xab, - 0xaf, 0x55, 0x79, 0x4c, 0x8d, 0xfa, 0x19, 0x57, 0x09, 0x71, 0x8b, 0x27, 0x1f, 0x74, 0x73, 0x23, - 0xa5, 0x09, 0x1a, 0xbd, 0x4f, 0xdb, 0x01, 0x30, 0x1b, 0x03, 0xc6, 0x97, 0xe6, 0x35, 0x98, 0x92, - 0xb7, 0x97, 0x69, 0x55, 0x29, 0x33, 0x23, 0xee, 0xe7, 0xaa, 0xeb, 0xbe, 0xd4, 0x6d, 0xae, 0x09, - 0xf7, 0x5a, 0xab, 0xaa, 0xfb, 0xc6, 0x1c, 0xf5, 0x7d, 0x10, 0x51, 0x3e, 0x89, 0xaf, 0x51, 0xa0, - 0x49, 0x15, 0x4e, 0xf4, 0xd1, 0x44, 0x41, 0x7a, 0x24, 0x49, 0x50, 0x54, 0x12, 0xed, 0x67, 0x00, - 0x9f, 0x8f, 0x2b, 0xcf, 0x2a, 0x6b, 0xae, 0x48, 0xbe, 0xc3, 0x7e, 0x37, 0xe7, 0xe1, 0x69, 0x87, - 0x35, 0x85, 0xc4, 0x5c, 0x9d, 0x54, 0xe9, 0x14, 0xff, 0xba, 0x56, 0x45, 0x33, 0x10, 0x2a, 0x89, - 0xb9, 0xed, 0x84, 0xb0, 0xa5, 0xd4, 0x49, 0x1f, 0x69, 0x4f, 0x46, 0xa5, 0xfd, 0x1c, 0xc0, 0xf9, - 0x41, 0x08, 0x29, 0x95, 0x6f, 0x0d, 0xf1, 0xe5, 0xf5, 0x7f, 0x73, 0x1f, 0xc0, 0x0b, 0x02, 0xcf, - 0x4d, 0xe6, 0x19, 0xf5, 0x12, 0x31, 0xdb, 0xc2, 0x75, 0x58, 0xaf, 0x4d, 0xfb, 0x1a, 0xc0, 0x4c, - 0xbf, 0xfc, 0x8a, 0xdf, 0x5d, 0x98, 0x6a, 0x12, 0xb3, 0x5d, 0xae, 0x11, 0xe2, 0x93, 0xba, 0x70, - 0xa0, 0x60, 0x7e, 0xa9, 0x56, 0x18, 0xb5, 0x8b, 0xd7, 0x79, 0xf2, 0xfd, 0x6e, 0xee, 0x6c, 0xc7, - 0x68, 0xd4, 0x5f, 0xd2, 0x82, 0x48, 0xed, 0xbb, 0xdf, 0x72, 0x73, 0x16, 0xf5, 0xd6, 0x5b, 0x15, - 0xdd, 0x64, 0x0d, 0xac, 0x7a, 0x9f, 0xfc, 0x93, 0x77, 0xab, 0x1b, 0xd8, 0xeb, 0x38, 0xc4, 0x15, - 0x49, 0xdc, 0xd2, 0x58, 0x53, 0xa1, 0xd0, 0xde, 0x87, 0x53, 0x3d, 0x6c, 0xaf, 0x9b, 0x1b, 0xc3, - 0xa5, 0xfe, 0x15, 0x08, 0x4b, 0x1b, 0xa4, 0x57, 0xcc, 0x3b, 0x70, 0xcc, 0x30, 0x37, 0x06, 0x24, - 0xbe, 0xa2, 0x88, 0x3f, 0x21, 0x89, 0xfb, 0x81, 0xc9, 0x78, 0x9f, 0x36, 0x24, 0x04, 0xed, 0x16, - 0x9c, 0xee, 0xe1, 0xba, 0x49, 0x1b, 0x84, 0xb5, 0xbc, 0xe1, 0x52, 0xff, 0x16, 0xc0, 0x99, 0x98, - 0x2b, 0x14, 0xfd, 0x1d, 0x00, 0xc7, 0x3d, 0x79, 0x3e, 0xa0, 0x06, 0x6f, 0x2a, 0x0d, 0x26, 0xa4, - 0x06, 0xe1, 0xe0, 0x64, 0x3a, 0xa4, 0xbd, 0x1e, 0x1e, 0xed, 0x33, 0xbf, 0xe5, 0xae, 0x12, 0xf2, - 0x86, 0x6d, 0x54, 0xea, 0xa4, 0xaa, 0x7e, 0x83, 0xff, 0xc7, 0x34, 0xfa, 0xc6, 0x6f, 0xbc, 0xfd, - 0xd0, 0x28, 0xe5, 0xee, 0x01, 0x38, 0x59, 0x23, 0xa4, 0x4c, 0xa4, 0xbd, 0xac, 0xea, 0xe1, 0x2b, - 0x38, 0x1f, 0xdb, 0x13, 0x22, 0x39, 0x8b, 0x97, 0x94, 0xa4, 0x4f, 0x4b, 0x49, 0xfb, 0x65, 0xd5, - 0x4a, 0xa8, 0x16, 0xc1, 0xa2, 0x6d, 0xfb, 0xf5, 0x8d, 0xe4, 0xf4, 0x45, 0x7b, 0xa1, 0xd7, 0x42, - 0xb9, 0x62, 0xa9, 0x22, 0xda, 0xef, 0xe6, 0xce, 0xc8, 0x7b, 0x94, 0x41, 0x0b, 0xda, 0xea, 0x8b, - 0x07, 0xda, 0xaa, 0x68, 0xb9, 0xc5, 0x27, 0xf7, 0xbb, 0xb9, 0x73, 0xd2, 0xbf, 0x67, 0xd3, 0x42, - 0xdd, 0x56, 0x7b, 0x37, 0xae, 0x72, 0x81, 0x54, 0xcb, 0x30, 0x1d, 0xe2, 0x24, 0x80, 0x8c, 0x15, - 0x9f, 0xda, 0xef, 0xe6, 0x50, 0x84, 0xb0, 0x56, 0x82, 0x3d, 0x9e, 0x85, 0x1f, 0xce, 0xc0, 0xc7, - 0x44, 0x6e, 0xf4, 0x23, 0x80, 0x13, 0x7d, 0x5a, 0x35, 0xba, 0x1a, 0x2b, 0xf3, 0x11, 0xcb, 0x4d, - 0xe6, 0xda, 0x23, 0x44, 0x4a, 0x3e, 0x5a, 0x7e, 0xfb, 0x97, 0x3f, 0xbe, 0x1c, 0x7d, 0x0e, 0x5d, - 0xc6, 0x6a, 0x1d, 0x0b, 0xd6, 0xb0, 0x7e, 0x43, 0x02, 0xdd, 0x1f, 0x85, 0x28, 0x9a, 0x0e, 0x2d, - 0x27, 0x05, 0xe0, 0x23, 0xbf, 0x9a, 0x3c, 0x50, 0x01, 0xdf, 0x06, 0x02, 0xf9, 0x5d, 0x74, 0x67, - 0x10, 0xe4, 0x98, 0x3f, 0x0b, 0xbc, 0x19, 0xf4, 0x20, 0x5d, 0x3d, 0x98, 0xad, 0x60, 0xab, 0x0c, - 0xd9, 0x7a, 0x8f, 0x63, 0x0b, 0xbb, 0x1c, 0xa8, 0x6d, 0x92, 0xb0, 0xdd, 0x3f, 0xdb, 0x42, 0x7f, - 0x02, 0x38, 0x73, 0xe8, 0xd4, 0x45, 0xc5, 0xc4, 0xa5, 0x89, 0xec, 0x20, 0x99, 0x95, 0xff, 0x94, - 0x43, 0xe9, 0x75, 0x5d, 0xc8, 0xf5, 0x2a, 0x7a, 0x65, 0xa0, 0x42, 0xe3, 0xcd, 0x40, 0xa0, 0xcd, - 0x90, 0x1c, 0xe8, 0x6f, 0x00, 0x1f, 0x3f, 0x30, 0x76, 0x51, 0xe1, 0x70, 0x70, 0xfd, 0x76, 0x80, - 0xcc, 0x62, 0xa2, 0x18, 0x45, 0xe0, 0x63, 0x41, 0xe0, 0x23, 0xd4, 0x8e, 0x10, 0xf0, 0xb8, 0x7f, - 0x39, 0x18, 0xdd, 0xc7, 0x54, 0xeb, 0xbf, 0x00, 0x1c, 0x0f, 0x8f, 0x5d, 0xb4, 0x30, 0x00, 0x8b, - 0x83, 0x1b, 0x40, 0xa6, 0x90, 0x24, 0x44, 0xf1, 0xde, 0x12, 0xbc, 0x3f, 0x44, 0xad, 0x18, 0xde, - 0xfe, 0xe4, 0x3e, 0x26, 0xda, 0x3b, 0xa3, 0xf0, 0xec, 0xbf, 0x47, 0x2e, 0x5a, 0x1a, 0x80, 0x47, - 0x74, 0x0b, 0xc8, 0x5c, 0x49, 0x1a, 0xa6, 0x24, 0xb8, 0x27, 0x7f, 0xeb, 0x9b, 0xa8, 0x13, 0xa3, - 0x41, 0x78, 0x72, 0x1f, 0x93, 0x0e, 0xdf, 0x03, 0x88, 0xa2, 0x23, 0xf4, 0xa8, 0xce, 0x17, 0xbb, - 0x02, 0x1c, 0xd5, 0xf9, 0xe2, 0xa7, 0xb5, 0xf6, 0x8c, 0x10, 0x23, 0x8b, 0xa6, 0x23, 0x62, 0x84, - 0x86, 0x0f, 0xfa, 0x09, 0xc0, 0x73, 0x91, 0x24, 0xe8, 0x4a, 0xc2, 0x5b, 0x7d, 0xb4, 0xcb, 0x89, - 0xe3, 0x14, 0xd8, 0x97, 0x05, 0xd8, 0x25, 0xb4, 0x78, 0x18, 0xd8, 0x98, 0x6e, 0x53, 0x7c, 0xfb, - 0xc1, 0x6e, 0x16, 0x3c, 0xdc, 0xcd, 0x82, 0xdf, 0x77, 0xb3, 0xe0, 0x8b, 0xbd, 0xec, 0xc8, 0xc3, - 0xbd, 0xec, 0xc8, 0xaf, 0x7b, 0xd9, 0x91, 0xf7, 0x96, 0xa2, 0xab, 0x19, 0xad, 0x98, 0x79, 0x8b, - 0xe1, 0xf6, 0x22, 0x6e, 0xb0, 0x6a, 0xab, 0x4e, 0x5c, 0x79, 0x5b, 0xe1, 0x5a, 0x9e, 0x5f, 0x28, - 0xb6, 0xb5, 0xca, 0x29, 0xf1, 0x0f, 0x83, 0xc5, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x86, 0x29, - 0x9d, 0x29, 0x5d, 0x11, 0x00, 0x00, + // 1164 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcf, 0x6f, 0x1b, 0xc5, + 0x17, 0xcf, 0xa4, 0xf9, 0xb6, 0xf1, 0x38, 0xdf, 0xd2, 0x4e, 0x02, 0x4d, 0x4d, 0x62, 0xa7, 0x5b, + 0x0a, 0x21, 0xc8, 0x3b, 0x8a, 0x43, 0x9b, 0x16, 0x21, 0x54, 0x9c, 0x12, 0x9a, 0x13, 0xc5, 0xea, + 0x05, 0x04, 0x72, 0xd7, 0xeb, 0xf1, 0x66, 0x14, 0x7b, 0x67, 0xeb, 0x5d, 0x1b, 0xdc, 0x34, 0x48, + 0x8d, 0x14, 0x21, 0x41, 0x85, 0x90, 0x90, 0x38, 0x70, 0x47, 0x48, 0x48, 0xfc, 0x01, 0x5c, 0x38, + 0xf7, 0x54, 0x55, 0xe2, 0xc2, 0xc9, 0xa0, 0x84, 0x33, 0x87, 0x88, 0x03, 0x47, 0x34, 0x3f, 0x76, + 0xbd, 0x61, 0xbd, 0x89, 0xb7, 0x38, 0xe2, 0x14, 0x7b, 0xde, 0x8f, 0xf9, 0x7c, 0x3e, 0x6f, 0xfc, + 0xde, 0x53, 0xe0, 0x45, 0x5a, 0x31, 0xb1, 0xe1, 0x38, 0x75, 0x6a, 0x1a, 0x1e, 0x65, 0xb6, 0x8b, + 0x6b, 0x84, 0xe0, 0xf6, 0x22, 0xbe, 0xdb, 0x22, 0xcd, 0x8e, 0xee, 0x34, 0x99, 0xc7, 0xd0, 0x39, + 0x5a, 0x31, 0xf5, 0xb0, 0x93, 0x5e, 0x23, 0x44, 0x6f, 0x2f, 0x66, 0xa6, 0x2c, 0x66, 0x31, 0xe1, + 0x83, 0xf9, 0x27, 0xe9, 0x9e, 0x99, 0xb1, 0x18, 0xb3, 0xea, 0x04, 0x1b, 0x0e, 0xc5, 0x86, 0x6d, + 0x33, 0x4f, 0x05, 0x49, 0x6b, 0xd6, 0x64, 0x6e, 0x83, 0xb9, 0xb8, 0x62, 0xb8, 0xfc, 0xa2, 0x0a, + 0xf1, 0x8c, 0x45, 0x6c, 0x32, 0x6a, 0x2b, 0xfb, 0x42, 0xd8, 0x2e, 0x50, 0x04, 0x5e, 0x8e, 0x61, + 0x51, 0x5b, 0x24, 0x53, 0xbe, 0x17, 0xe2, 0xd0, 0x73, 0x7c, 0xd2, 0xe5, 0x52, 0x9c, 0x8b, 0x45, + 0x6c, 0xe2, 0x52, 0x37, 0x9c, 0xc9, 0x64, 0x4d, 0x82, 0xcd, 0x75, 0xc3, 0xb6, 0x49, 0x9d, 0xbb, + 0xa8, 0x8f, 0xd2, 0x45, 0x7b, 0x08, 0x60, 0xee, 0x5d, 0x8e, 0x67, 0xcd, 0x36, 0x89, 0xed, 0xd1, + 0x36, 0xbd, 0x47, 0xaa, 0xb7, 0x0c, 0x73, 0x83, 0x78, 0x6e, 0x89, 0xdc, 0x6d, 0x11, 0xd7, 0x43, + 0xab, 0x10, 0xf6, 0x40, 0x4e, 0x83, 0x39, 0x30, 0x9f, 0x2e, 0xbc, 0xa8, 0x4b, 0x46, 0x3a, 0x67, + 0xa4, 0x4b, 0x5d, 0x15, 0x23, 0xfd, 0x96, 0x61, 0x11, 0x15, 0x5b, 0x0a, 0x45, 0xa2, 0x0b, 0x70, + 0x42, 0x38, 0x96, 0xd7, 0x09, 0xb5, 0xd6, 0xbd, 0xe9, 0xd1, 0x39, 0x30, 0x3f, 0x56, 0x4a, 0x8b, + 0xb3, 0x9b, 0xe2, 0x48, 0xfb, 0x0c, 0xc0, 0xb9, 0x78, 0x38, 0xae, 0xc3, 0x6c, 0x97, 0xa0, 0x1a, + 0x9c, 0xa2, 0x21, 0x73, 0xd9, 0x91, 0xf6, 0x69, 0x30, 0x77, 0x62, 0x3e, 0x5d, 0xc8, 0xeb, 0x31, + 0x85, 0xd5, 0xd7, 0xaa, 0x3c, 0xa6, 0x46, 0xfd, 0x8c, 0xab, 0x84, 0xb8, 0xc5, 0xb1, 0x47, 0xdd, + 0xdc, 0x48, 0x69, 0x92, 0x46, 0xef, 0xd3, 0x76, 0x00, 0xcc, 0xc6, 0x80, 0xf1, 0xa5, 0xb9, 0x0e, + 0x53, 0xf2, 0xf6, 0x32, 0xad, 0x2a, 0x65, 0x66, 0xc5, 0xfd, 0x5c, 0x75, 0xdd, 0x97, 0xba, 0xcd, + 0x35, 0xe1, 0x5e, 0x6b, 0x55, 0x75, 0xdf, 0xb8, 0xa3, 0xbe, 0x0f, 0x22, 0xca, 0xa7, 0xf1, 0x35, + 0x0a, 0x34, 0xa9, 0xc2, 0xc9, 0x3e, 0x9a, 0x28, 0x48, 0x4f, 0x25, 0x09, 0x8a, 0x4a, 0xa2, 0x3d, + 0x06, 0xf0, 0xe5, 0xb8, 0xf2, 0xac, 0xb2, 0xe6, 0x8a, 0xe4, 0x3b, 0xec, 0x77, 0x73, 0x0e, 0x9e, + 0x72, 0x58, 0x53, 0x48, 0xcc, 0xd5, 0x49, 0x95, 0x4e, 0xf2, 0xaf, 0x6b, 0x55, 0x34, 0x0b, 0xa1, + 0x92, 0x98, 0xdb, 0x4e, 0x08, 0x5b, 0x4a, 0x9d, 0xf4, 0x91, 0x76, 0x2c, 0x2a, 0xed, 0x17, 0x00, + 0x2e, 0x0c, 0x42, 0x48, 0xa9, 0x7c, 0x67, 0x88, 0x2f, 0xaf, 0xff, 0x9b, 0xfb, 0x10, 0x9e, 0x17, + 0x78, 0x6e, 0x33, 0xcf, 0xa8, 0x97, 0x88, 0xd9, 0x16, 0xae, 0xc3, 0x7a, 0x6d, 0xda, 0x37, 0x00, + 0x66, 0xfa, 0xe5, 0x57, 0xfc, 0xee, 0xc3, 0x54, 0x93, 0x98, 0xed, 0x72, 0x8d, 0x10, 0x9f, 0xd4, + 0xf9, 0x03, 0x05, 0xf3, 0x4b, 0xb5, 0xc2, 0xa8, 0x5d, 0xbc, 0xc1, 0x93, 0xef, 0x77, 0x73, 0x67, + 0x3a, 0x46, 0xa3, 0xfe, 0x9a, 0x16, 0x44, 0x6a, 0xdf, 0xff, 0x9a, 0x9b, 0xb7, 0xa8, 0xb7, 0xde, + 0xaa, 0xe8, 0x26, 0x6b, 0x60, 0xd5, 0xfb, 0xe4, 0x9f, 0xbc, 0x5b, 0xdd, 0xc0, 0x5e, 0xc7, 0x21, + 0xae, 0x48, 0xe2, 0x96, 0xc6, 0x9b, 0x0a, 0x85, 0xf6, 0x01, 0x9c, 0xee, 0x61, 0x7b, 0xd3, 0xdc, + 0x18, 0x2e, 0xf5, 0xaf, 0x41, 0x58, 0xda, 0x20, 0xbd, 0x62, 0xde, 0x81, 0xe3, 0x86, 0xb9, 0x31, + 0x20, 0xf1, 0x15, 0x45, 0xfc, 0x19, 0x49, 0xdc, 0x0f, 0x4c, 0xc6, 0xfb, 0x94, 0x21, 0x21, 0x68, + 0x77, 0xe0, 0x4c, 0x0f, 0xd7, 0x6d, 0xda, 0x20, 0xac, 0xe5, 0x0d, 0x97, 0xfa, 0x77, 0x00, 0xce, + 0xc6, 0x5c, 0xa1, 0xe8, 0xef, 0x00, 0x38, 0xe1, 0xc9, 0xf3, 0x01, 0x35, 0x78, 0x5b, 0x69, 0x30, + 0x29, 0x35, 0x08, 0x07, 0x27, 0xd3, 0x21, 0xed, 0xf5, 0xf0, 0x68, 0x9f, 0xfb, 0x2d, 0x77, 0x95, + 0x90, 0xb7, 0x6c, 0xa3, 0x52, 0x27, 0x55, 0xf5, 0x1b, 0xfc, 0x2f, 0xa6, 0xd1, 0xb7, 0x7e, 0xe3, + 0xed, 0x87, 0x46, 0x29, 0xf7, 0x00, 0xc0, 0xa9, 0x1a, 0x21, 0x65, 0x22, 0xed, 0x65, 0x55, 0x0f, + 0x5f, 0xc1, 0x85, 0xd8, 0x9e, 0x10, 0xc9, 0x59, 0xbc, 0xa8, 0x24, 0x7d, 0x5e, 0x4a, 0xda, 0x2f, + 0xab, 0x56, 0x42, 0xb5, 0x08, 0x16, 0x6d, 0xdb, 0xaf, 0x6f, 0x24, 0xa7, 0x2f, 0xda, 0x2b, 0xbd, + 0x16, 0xca, 0x15, 0x4b, 0x15, 0xd1, 0x7e, 0x37, 0x77, 0x5a, 0xde, 0xa3, 0x0c, 0x5a, 0xd0, 0x56, + 0x5f, 0x3d, 0xd0, 0x56, 0x45, 0xcb, 0x2d, 0x3e, 0xbb, 0xdf, 0xcd, 0x9d, 0x95, 0xfe, 0x3d, 0x9b, + 0x16, 0xea, 0xb6, 0xda, 0x7b, 0x71, 0x95, 0x0b, 0xa4, 0x5a, 0x86, 0xe9, 0x10, 0x27, 0x01, 0x64, + 0xbc, 0xf8, 0xdc, 0x7e, 0x37, 0x87, 0x22, 0x84, 0xb5, 0x12, 0xec, 0xf1, 0x2c, 0xfc, 0x74, 0x1a, + 0xfe, 0x4f, 0xe4, 0x46, 0x3f, 0x02, 0x38, 0xd9, 0xa7, 0x55, 0xa3, 0xab, 0xb1, 0x32, 0x1f, 0xb1, + 0xdc, 0x64, 0xae, 0x3d, 0x45, 0xa4, 0xe4, 0xa3, 0xe5, 0xb7, 0x7f, 0xfe, 0xfd, 0xab, 0xd1, 0x97, + 0xd0, 0x25, 0xac, 0xd6, 0xb1, 0x60, 0x0d, 0xeb, 0x37, 0x24, 0xd0, 0xc3, 0x51, 0x88, 0xa2, 0xe9, + 0xd0, 0x72, 0x52, 0x00, 0x3e, 0xf2, 0xab, 0xc9, 0x03, 0x15, 0xf0, 0x6d, 0x20, 0x90, 0xdf, 0x47, + 0xf7, 0x06, 0x41, 0x8e, 0xf9, 0xb3, 0xc0, 0x9b, 0x41, 0x0f, 0xd2, 0xd5, 0x83, 0xd9, 0x0a, 0xb6, + 0xca, 0x90, 0xad, 0xf7, 0x38, 0xb6, 0xb0, 0xcb, 0x81, 0xda, 0x26, 0x09, 0xdb, 0xfd, 0xb3, 0x2d, + 0xf4, 0x07, 0x80, 0xb3, 0x87, 0x4e, 0x5d, 0x54, 0x4c, 0x5c, 0x9a, 0xc8, 0x0e, 0x92, 0x59, 0xf9, + 0x57, 0x39, 0x94, 0x5e, 0x37, 0x84, 0x5c, 0x6f, 0xa0, 0xd7, 0x07, 0x2a, 0x34, 0xde, 0x0c, 0x04, + 0xda, 0x0c, 0xc9, 0x81, 0xfe, 0x02, 0xf0, 0xff, 0x07, 0xc6, 0x2e, 0x2a, 0x1c, 0x0e, 0xae, 0xdf, + 0x0e, 0x90, 0x59, 0x4a, 0x14, 0xa3, 0x08, 0x7c, 0x22, 0x08, 0x7c, 0x8c, 0xda, 0x11, 0x02, 0x1e, + 0xf7, 0x2f, 0x07, 0xa3, 0xfb, 0x98, 0x6a, 0xfd, 0x27, 0x80, 0x13, 0xe1, 0xb1, 0x8b, 0x16, 0x07, + 0x60, 0x71, 0x70, 0x03, 0xc8, 0x14, 0x92, 0x84, 0x28, 0xde, 0x5b, 0x82, 0xf7, 0x47, 0xa8, 0x15, + 0xc3, 0xdb, 0x9f, 0xdc, 0xc7, 0x44, 0x7b, 0x67, 0x14, 0x9e, 0xf9, 0xe7, 0xc8, 0x45, 0x97, 0x07, + 0xe0, 0x11, 0xdd, 0x02, 0x32, 0x57, 0x92, 0x86, 0x29, 0x09, 0x1e, 0xc8, 0xdf, 0xfa, 0x26, 0xea, + 0xc4, 0x68, 0x10, 0x9e, 0xdc, 0xc7, 0xa4, 0xc3, 0x0f, 0x00, 0xa2, 0xe8, 0x08, 0x3d, 0xaa, 0xf3, + 0xc5, 0xae, 0x00, 0x47, 0x75, 0xbe, 0xf8, 0x69, 0xad, 0xbd, 0x20, 0xc4, 0xc8, 0xa2, 0x99, 0x88, + 0x18, 0xa1, 0xe1, 0x83, 0x1e, 0x03, 0x78, 0x36, 0x92, 0x04, 0x5d, 0x49, 0x78, 0xab, 0x8f, 0x76, + 0x39, 0x71, 0x9c, 0x02, 0x7b, 0x53, 0x80, 0x2d, 0xa2, 0xeb, 0x87, 0x81, 0xf5, 0x4b, 0x16, 0x29, + 0x54, 0xa8, 0x3c, 0xc5, 0x77, 0x1e, 0xed, 0x66, 0xc1, 0x93, 0xdd, 0x2c, 0xf8, 0x6d, 0x37, 0x0b, + 0xbe, 0xdc, 0xcb, 0x8e, 0x3c, 0xd9, 0xcb, 0x8e, 0xfc, 0xb2, 0x97, 0x1d, 0x79, 0xff, 0x72, 0x74, + 0x4f, 0xa3, 0x15, 0x33, 0x6f, 0x31, 0xdc, 0x5e, 0xc2, 0x0d, 0x56, 0x6d, 0xd5, 0x89, 0x2b, 0xaf, + 0x2e, 0x5c, 0xcb, 0xf3, 0xdb, 0xc5, 0xea, 0x56, 0x39, 0x29, 0xfe, 0x7b, 0xb0, 0xf4, 0x77, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x74, 0xc0, 0xcd, 0xbb, 0x6a, 0x11, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/modules/apps/29-fee/types/query.pb.gw.go b/modules/apps/29-fee/types/query.pb.gw.go index 574886e85a4..d0b6aec47be 100644 --- a/modules/apps/29-fee/types/query.pb.gw.go +++ b/modules/apps/29-fee/types/query.pb.gw.go @@ -1122,7 +1122,7 @@ var ( 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))) - pattern_Query_FeeEnabledChannel_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5, 1, 0, 4, 1, 5, 6}, []string{"ibc", "apps", "fee", "v1", "fee_enabled", "port_id", "channel_id"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_FeeEnabledChannel_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 2, 5, 1, 0, 4, 1, 5, 6, 2, 7, 1, 0, 4, 1, 5, 8}, []string{"ibc", "apps", "fee", "v1", "fee_enabled", "port", "port_id", "channel", "channel_id"}, "", runtime.AssumeColonVerbOpt(true))) ) var ( diff --git a/proto/ibc/applications/fee/v1/query.proto b/proto/ibc/applications/fee/v1/query.proto index 5214a9b7d13..275412940f5 100644 --- a/proto/ibc/applications/fee/v1/query.proto +++ b/proto/ibc/applications/fee/v1/query.proto @@ -57,7 +57,7 @@ service Query { // FeeEnabledChannel returns true if the provided port and channel identifiers belong to a fee enabled channel rpc FeeEnabledChannel(QueryFeeEnabledChannelRequest) returns (QueryFeeEnabledChannelResponse) { - option (google.api.http).get = "/ibc/apps/fee/v1/fee_enabled/{port_id}/{channel_id}"; + option (google.api.http).get = "/ibc/apps/fee/v1/fee_enabled/port/{port_id}/channel/{channel_id}"; } }