From 4344ed56a487ccaaa6980d9f71bdff26461641a1 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Mon, 20 Jul 2020 15:28:20 +0200 Subject: [PATCH 1/2] Rename proto Req to Pagination --- proto/cosmos/bank/query.proto | 2 +- proto/cosmos/distribution/query.proto | 2 +- proto/cosmos/evidence/query.proto | 2 +- proto/cosmos/gov/query.proto | 6 +- proto/cosmos/query/pagination.proto | 2 +- proto/cosmos/slashing/query.proto | 2 +- proto/cosmos/staking/query.proto | 14 +- proto/ibc/channel/query.proto | 6 +- proto/ibc/connection/query.proto | 2 +- scripts/protocgen.sh | 2 +- testutil/testdata/proto.pb.go | 76 +- types/query/filtered_pagination.go | 14 +- types/query/pagination.go | 14 +- types/query/pagination.pb.go | 2 +- types/query/pagination_test.go | 2 +- x/bank/keeper/grpc_query.go | 2 +- x/bank/types/querier.go | 4 +- x/bank/types/query.pb.go | 90 +- x/distribution/client/cli/query.go | 2 +- x/distribution/keeper/grpc_query.go | 2 +- x/distribution/keeper/grpc_query_test.go | 6 +- x/distribution/types/query.pb.go | 138 +-- x/evidence/client/cli/query.go | 2 +- x/evidence/keeper/grpc_query.go | 2 +- x/evidence/types/querier.go | 4 +- x/evidence/types/query.pb.go | 75 +- x/gov/client/cli/query.go | 6 +- x/gov/keeper/grpc_query.go | 6 +- x/gov/keeper/grpc_query_test.go | 6 +- x/gov/types/query.pb.go | 174 +-- x/ibc/03-connection/client/cli/query.go | 2 +- x/ibc/03-connection/client/rest/query.go | 2 +- x/ibc/03-connection/keeper/grpc_query.go | 2 +- x/ibc/03-connection/keeper/grpc_query_test.go | 2 +- x/ibc/03-connection/types/query.pb.go | 91 +- x/ibc/04-channel/client/cli/query.go | 6 +- x/ibc/04-channel/keeper/grpc_query.go | 6 +- x/ibc/04-channel/keeper/grpc_query_test.go | 10 +- x/ibc/04-channel/types/query.pb.go | 183 +-- x/slashing/client/cli/query.go | 2 +- x/slashing/keeper/grpc_query.go | 2 +- x/slashing/keeper/grpc_query_test.go | 4 +- x/slashing/types/query.pb.go | 82 +- x/staking/client/cli/query.go | 12 +- x/staking/keeper/grpc_query.go | 16 +- x/staking/keeper/grpc_query_test.go | 18 +- x/staking/types/query.pb.go | 292 ++--- x/staking/types/staking.pb.go | 1016 ++++++++--------- 48 files changed, 1209 insertions(+), 1206 deletions(-) diff --git a/proto/cosmos/bank/query.proto b/proto/cosmos/bank/query.proto index 5c63cbc349f8..b0fe4b8789db 100644 --- a/proto/cosmos/bank/query.proto +++ b/proto/cosmos/bank/query.proto @@ -42,7 +42,7 @@ message QueryAllBalancesRequest { // address is the address to query balances for bytes address = 1 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"]; - cosmos.query.PageRequest req = 2; + cosmos.query.PageRequest pagination = 2; } // QueryAllBalancesResponse is the response type for the Query/AllBalances RPC method diff --git a/proto/cosmos/distribution/query.proto b/proto/cosmos/distribution/query.proto index 115c68ce069a..a9793afdad05 100644 --- a/proto/cosmos/distribution/query.proto +++ b/proto/cosmos/distribution/query.proto @@ -71,7 +71,7 @@ message QueryValidatorSlashesRequest { bytes validator_address = 1 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ValAddress"]; uint64 starting_height = 2; uint64 ending_height = 3; - cosmos.query.PageRequest req = 4; + cosmos.query.PageRequest pagination = 4; } // QueryValidatorSlashesResponse is the response type for the Query/ValidatorSlashes RPC method diff --git a/proto/cosmos/evidence/query.proto b/proto/cosmos/evidence/query.proto index bf5047e2c759..9301d8fd05dd 100644 --- a/proto/cosmos/evidence/query.proto +++ b/proto/cosmos/evidence/query.proto @@ -28,7 +28,7 @@ message QueryEvidenceResponse { // QueryEvidenceRequest is the request type for the Query/AllEvidence RPC method message QueryAllEvidenceRequest { - cosmos.query.PageRequest req = 1; + cosmos.query.PageRequest pagination = 1; } // QueryAllEvidenceResponse is the response type for the Query/AllEvidence RPC method diff --git a/proto/cosmos/gov/query.proto b/proto/cosmos/gov/query.proto index 210129afb364..735f9dacf7ea 100644 --- a/proto/cosmos/gov/query.proto +++ b/proto/cosmos/gov/query.proto @@ -56,7 +56,7 @@ message QueryProposalsRequest { // Deposit addresses from the proposals. bytes depositor = 3 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"]; - cosmos.query.PageRequest req = 4; + cosmos.query.PageRequest pagination = 4; } // QueryProposalsResponse is the response type for the Query/Proposals RPC method @@ -85,7 +85,7 @@ message QueryVotesRequest { // unique id of the proposal uint64 proposal_id = 1; - cosmos.query.PageRequest req = 2; + cosmos.query.PageRequest pagination = 2; } // QueryVotesResponse is the response type for the Query/Votes RPC method @@ -126,7 +126,7 @@ message QueryDepositsRequest { // unique id of the proposal uint64 proposal_id = 1; - cosmos.query.PageRequest req = 2; + cosmos.query.PageRequest pagination = 2; } // QueryDepositsResponse is the response type for the Query/Deposits RPC method diff --git a/proto/cosmos/query/pagination.proto b/proto/cosmos/query/pagination.proto index cd3a1f27bf1b..bf8874e5772b 100644 --- a/proto/cosmos/query/pagination.proto +++ b/proto/cosmos/query/pagination.proto @@ -8,7 +8,7 @@ option go_package = "github.com/cosmos/cosmos-sdk/types/query"; // // message SomeRequest { // Foo some_parameter = 1; -// PageRequest page = 2; +// PageRequest pagination = 2; // } message PageRequest { // key is a value returned in PageResponse.next_key to begin diff --git a/proto/cosmos/slashing/query.proto b/proto/cosmos/slashing/query.proto index 450892d680ac..43fb21a74d41 100644 --- a/proto/cosmos/slashing/query.proto +++ b/proto/cosmos/slashing/query.proto @@ -41,7 +41,7 @@ message QuerySigningInfoResponse{ // QuerySigningInfosRequest is the request type for the Query/SigningInfos RPC method message QuerySigningInfosRequest{ - cosmos.query.PageRequest req = 1; + cosmos.query.PageRequest pagination = 1; } // QuerySigningInfosResponse is the response type for the Query/SigningInfos RPC method diff --git a/proto/cosmos/staking/query.proto b/proto/cosmos/staking/query.proto index c37add5c1146..54314f1f5e28 100644 --- a/proto/cosmos/staking/query.proto +++ b/proto/cosmos/staking/query.proto @@ -56,7 +56,7 @@ service Query { message QueryValidatorsRequest{ string status = 1; - cosmos.query.PageRequest req = 2; + cosmos.query.PageRequest pagination = 2; } // QueryValidatorsResponse is response type for the Query/Validators RPC method @@ -80,7 +80,7 @@ message QueryValidatorResponse { message QueryValidatorDelegationsRequest { bytes validator_addr = 1 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ValAddress"]; - cosmos.query.PageRequest req = 2; + cosmos.query.PageRequest pagination = 2; } // QueryValidatorDelegationsRequest is response type for the Query/ValidatorDelegations RPC method @@ -94,7 +94,7 @@ message QueryValidatorDelegationsResponse { message QueryValidatorUnbondingDelegationsRequest { bytes validator_addr = 1 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ValAddress"]; - cosmos.query.PageRequest req = 2; + cosmos.query.PageRequest pagination = 2; } // QueryValidatorUnbondingDelegationsResponse is response type for the Query/ValidatorUnbondingDelegations RPC method @@ -132,7 +132,7 @@ message QueryUnbondingDelegationResponse { message QueryDelegatorDelegationsRequest { bytes delegator_addr = 1 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"]; - cosmos.query.PageRequest req = 2; + cosmos.query.PageRequest pagination = 2; } // QueryDelegatorDelegationsResponse is response type for the Query/DelegatorDelegations RPC method @@ -146,7 +146,7 @@ message QueryDelegatorDelegationsResponse { message QueryDelegatorUnbondingDelegationsRequest { bytes delegator_addr = 1 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"]; - cosmos.query.PageRequest req = 2; + cosmos.query.PageRequest pagination = 2; } // QueryUnbondingDelegatorDelegationsResponse is response type for the Query/UnbondingDelegatorDelegations RPC method message QueryDelegatorUnbondingDelegationsResponse { @@ -163,7 +163,7 @@ message QueryRedelegationsRequest { bytes dst_validator_addr = 3 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.ValAddress"]; - cosmos.query.PageRequest req = 4; + cosmos.query.PageRequest pagination = 4; } // QueryRedelegationsResponse is response type for the Query/Redelegations RPC method @@ -177,7 +177,7 @@ message QueryRedelegationsResponse { message QueryDelegatorValidatorsRequest { bytes delegator_addr = 1 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"]; - cosmos.query.PageRequest req = 2; + cosmos.query.PageRequest pagination = 2; } // QueryDelegatorValidatorsResponse is response type for the Query/DelegatorValidators RPC method diff --git a/proto/ibc/channel/query.proto b/proto/ibc/channel/query.proto index fc12d3156503..64c4362ef86b 100644 --- a/proto/ibc/channel/query.proto +++ b/proto/ibc/channel/query.proto @@ -63,7 +63,7 @@ message QueryChannelResponse { // QueryChannelsRequest is the request type for the Query/Channels RPC method message QueryChannelsRequest { // pagination request - cosmos.query.PageRequest req = 1; + cosmos.query.PageRequest pagination = 1; } // QueryChannelsResponse is the response type for the Query/Channels RPC method. @@ -81,7 +81,7 @@ message QueryConnectionChannelsRequest { // connection unique identifier string connection = 1; // pagination request - cosmos.query.PageRequest req = 2; + cosmos.query.PageRequest pagination = 2; } // QueryConnectionChannelsResponse is the Response type for the Query/QueryConnectionChannels RPC method @@ -124,7 +124,7 @@ message QueryPacketCommitmentsRequest { // channel unique identifier string channel_id = 2 [(gogoproto.customname) = "ChannelID"]; // pagination request - cosmos.query.PageRequest req = 3; + cosmos.query.PageRequest pagination = 3; } // QueryPacketCommitmentsResponse is the request type for the Query/QueryPacketCommitments RPC method diff --git a/proto/ibc/connection/query.proto b/proto/ibc/connection/query.proto index 9eb060efbb8c..af7e4e0b02ac 100644 --- a/proto/ibc/connection/query.proto +++ b/proto/ibc/connection/query.proto @@ -41,7 +41,7 @@ message QueryConnectionResponse { // QueryConnectionsRequest is the request type for the Query/Connections RPC method message QueryConnectionsRequest { - cosmos.query.PageRequest req = 1; + cosmos.query.PageRequest pagination = 1; } // QueryConnectionsResponse is the response type for the Query/Connections RPC method. diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index c99a4c007c30..8771781cace2 100755 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -14,7 +14,7 @@ done # generate codec/testdata proto code protoc -I "proto" -I "third_party/proto" -I "testutil/testdata" --gocosmos_out=plugins=interfacetype+grpc,\ -Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:. ./codec/testdata/proto.proto +Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:. ./testutil/testdata/proto.proto # move proto files to the right places cp -r github.com/cosmos/cosmos-sdk/* ./ diff --git a/testutil/testdata/proto.pb.go b/testutil/testdata/proto.pb.go index e83df04d9cc1..ba1608115e73 100644 --- a/testutil/testdata/proto.pb.go +++ b/testutil/testdata/proto.pb.go @@ -656,44 +656,44 @@ func init() { func init() { proto.RegisterFile("proto.proto", fileDescriptor_2fcc84b9998d60d8) } var fileDescriptor_2fcc84b9998d60d8 = []byte{ - // 583 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xcd, 0x6e, 0xd4, 0x30, - 0x10, 0xc7, 0x6b, 0xb6, 0x9f, 0xb3, 0x51, 0x17, 0x4c, 0x41, 0x69, 0x0e, 0x69, 0x15, 0x09, 0x75, - 0x25, 0x68, 0x22, 0x5a, 0xf5, 0xd2, 0x03, 0x52, 0x5a, 0x16, 0x2a, 0xa1, 0x5e, 0x52, 0xc4, 0x81, - 0x4b, 0xe5, 0x4d, 0x5c, 0xaf, 0xd5, 0xc4, 0x2e, 0x71, 0x52, 0x35, 0x3c, 0x05, 0xaf, 0xc0, 0xd3, - 0xc0, 0x71, 0x8f, 0x9c, 0x10, 0xda, 0x7d, 0x0b, 0x4e, 0x28, 0xdf, 0x4b, 0xb5, 0xaa, 0xf6, 0x92, - 0xcc, 0x8c, 0xff, 0xf3, 0xb3, 0x3d, 0x7f, 0x43, 0xf7, 0x26, 0x96, 0x89, 0xb4, 0x8b, 0x2f, 0x5e, - 0x4f, 0xa8, 0x4a, 0x02, 0x92, 0x10, 0x63, 0x9b, 0x49, 0xc9, 0x42, 0xea, 0x14, 0xf5, 0x61, 0x7a, - 0xe5, 0x10, 0x91, 0x95, 0x22, 0x63, 0x8b, 0x49, 0x26, 0x8b, 0xd0, 0xc9, 0xa3, 0xb2, 0x6a, 0xed, - 0x43, 0xe7, 0xad, 0x64, 0x18, 0xc3, 0xb2, 0xe2, 0x5f, 0xa9, 0x8e, 0x76, 0x51, 0x7f, 0xc3, 0x2b, - 0xe2, 0xbc, 0x26, 0x48, 0x44, 0xf5, 0x47, 0x65, 0x2d, 0x8f, 0xad, 0x23, 0xe8, 0x9c, 0x92, 0x04, - 0xeb, 0xb0, 0x16, 0x49, 0xc1, 0xaf, 0x69, 0x5c, 0x75, 0xd4, 0x29, 0xde, 0x82, 0x95, 0x90, 0xdf, - 0x52, 0x55, 0x74, 0xad, 0x78, 0x65, 0x62, 0xbd, 0x87, 0x8d, 0x33, 0xa2, 0x5c, 0xc1, 0x23, 0x12, - 0xe2, 0x57, 0xb0, 0x4a, 0x8a, 0xa8, 0xe8, 0xed, 0x1e, 0x6c, 0xd9, 0xe5, 0xa1, 0xed, 0xfa, 0xd0, - 0xb6, 0x2b, 0x32, 0xaf, 0xd2, 0x60, 0x0d, 0xd0, 0x5d, 0x01, 0xeb, 0x78, 0xe8, 0xce, 0x3a, 0x05, - 0xed, 0x8c, 0xa8, 0x96, 0x75, 0x08, 0x30, 0x22, 0xea, 0x72, 0x01, 0xde, 0xc6, 0xa8, 0x6e, 0xb2, - 0xce, 0xa1, 0x57, 0x42, 0x5a, 0xce, 0x31, 0x6c, 0xe6, 0x9c, 0x05, 0x59, 0xda, 0x68, 0xa6, 0xd7, - 0xda, 0x83, 0xee, 0xc0, 0x1f, 0x49, 0x8f, 0x7e, 0x49, 0xa9, 0x2a, 0x67, 0x43, 0x95, 0x22, 0x8c, - 0x36, 0xb3, 0x29, 0x53, 0xab, 0x0f, 0x5a, 0x29, 0x54, 0x37, 0x52, 0x28, 0xfa, 0x80, 0xf2, 0x05, - 0xf4, 0x2e, 0x48, 0x76, 0x46, 0xc3, 0xb0, 0xc1, 0xd6, 0x6e, 0xa0, 0x19, 0x37, 0x6c, 0x78, 0xdc, - 0xca, 0x2a, 0xa8, 0x01, 0xeb, 0x2c, 0xa6, 0x34, 0xe1, 0x82, 0x55, 0xda, 0x26, 0xb7, 0x06, 0xb0, - 0xf9, 0x91, 0xaa, 0x24, 0xbf, 0x42, 0x45, 0x3d, 0x04, 0x20, 0x22, 0x5b, 0x68, 0x7e, 0x44, 0x64, - 0xd5, 0x85, 0x07, 0xd0, 0x6b, 0x30, 0xd5, 0xae, 0x07, 0x73, 0x7c, 0x78, 0x6a, 0xd7, 0xcf, 0xd2, - 0x6e, 0x86, 0x35, 0x6b, 0xc3, 0x27, 0x58, 0xcb, 0x31, 0xe7, 0x8a, 0xe1, 0x0f, 0xb0, 0xa6, 0x38, - 0x13, 0x34, 0x56, 0x3a, 0xda, 0xed, 0xf4, 0xb5, 0x93, 0xd7, 0x7f, 0x7f, 0xef, 0xec, 0x33, 0x9e, - 0x8c, 0xd2, 0xa1, 0xed, 0xcb, 0xc8, 0xf1, 0xa5, 0x8a, 0xa4, 0xaa, 0x7e, 0xfb, 0x2a, 0xb8, 0x76, - 0x92, 0xec, 0x86, 0x2a, 0xdb, 0xf5, 0x7d, 0x37, 0x08, 0x62, 0xaa, 0x94, 0x57, 0x13, 0xac, 0x21, - 0x3c, 0x39, 0x21, 0xc1, 0x79, 0x1a, 0x26, 0xfc, 0x82, 0x33, 0x41, 0x92, 0x34, 0xa6, 0xd8, 0x04, - 0x50, 0x75, 0x52, 0x6d, 0xe2, 0xcd, 0x54, 0xf0, 0x1e, 0xf4, 0x22, 0x12, 0x72, 0x9f, 0xcb, 0x54, - 0x5d, 0x5e, 0x71, 0x1a, 0x06, 0xfa, 0xca, 0x2e, 0xea, 0x6b, 0xde, 0x66, 0x53, 0x7e, 0x97, 0x57, - 0x8f, 0x97, 0xc7, 0xdf, 0x77, 0xd0, 0xc1, 0x0f, 0x04, 0xdd, 0xfc, 0xf0, 0x17, 0x34, 0xbe, 0xe5, - 0x3e, 0xc5, 0x47, 0xb0, 0x9c, 0x5b, 0x8b, 0x9f, 0xb5, 0x77, 0x9e, 0x79, 0x13, 0xc6, 0xf3, 0xfb, - 0xe5, 0x6a, 0x6c, 0x2e, 0xac, 0xd7, 0x06, 0xe2, 0xed, 0x56, 0x73, 0xcf, 0x7b, 0xc3, 0x98, 0xb7, - 0x54, 0x21, 0xde, 0x94, 0x53, 0x74, 0x45, 0x86, 0xf5, 0x56, 0xf6, 0xbf, 0xcd, 0xc6, 0xf6, 0x9c, - 0x95, 0xb2, 0xff, 0x64, 0xf0, 0x73, 0x62, 0xa2, 0xf1, 0xc4, 0x44, 0x7f, 0x26, 0x26, 0xfa, 0x36, - 0x35, 0x97, 0xc6, 0x53, 0x73, 0xe9, 0xd7, 0xd4, 0x5c, 0xfa, 0xfc, 0xf2, 0xc1, 0xf9, 0xfb, 0x32, - 0xa0, 0xbe, 0x53, 0x63, 0x87, 0xab, 0xc5, 0x63, 0x39, 0xfc, 0x17, 0x00, 0x00, 0xff, 0xff, 0x6f, - 0x03, 0x13, 0xf7, 0x98, 0x04, 0x00, 0x00, + // 585 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xcf, 0x4e, 0xdc, 0x3e, + 0x10, 0xc7, 0xf1, 0x6f, 0xf9, 0x3b, 0xbb, 0x62, 0x7f, 0x75, 0x69, 0xb5, 0xe4, 0x10, 0x50, 0xa4, + 0x8a, 0x3d, 0x94, 0xac, 0x0a, 0xe2, 0xc2, 0xa1, 0x52, 0xa0, 0xb4, 0x2b, 0x55, 0x5c, 0x42, 0xd5, + 0x43, 0x2f, 0xc8, 0x9b, 0x18, 0xaf, 0x45, 0x62, 0xd3, 0x8c, 0x83, 0x48, 0x9f, 0xa2, 0xaf, 0xd0, + 0xa7, 0x69, 0x8f, 0x1c, 0x7b, 0xaa, 0x2a, 0x78, 0x8b, 0x9e, 0xaa, 0xfc, 0xdf, 0x22, 0x84, 0xb8, + 0x24, 0x33, 0xe3, 0xef, 0x7c, 0x6c, 0xcf, 0xd7, 0xd0, 0xbd, 0x48, 0xb4, 0xd1, 0x6e, 0xf1, 0xa5, + 0xcb, 0x86, 0xa3, 0x09, 0x99, 0x61, 0xd6, 0xba, 0xd0, 0x5a, 0x44, 0x7c, 0x54, 0xd4, 0x27, 0xe9, + 0xd9, 0x88, 0xa9, 0xac, 0x14, 0x59, 0x6b, 0x42, 0x0b, 0x5d, 0x84, 0xa3, 0x3c, 0x2a, 0xab, 0xce, + 0x36, 0x74, 0xde, 0x68, 0x41, 0x29, 0xcc, 0xa3, 0xfc, 0xc2, 0x07, 0x64, 0x93, 0x0c, 0x57, 0xfc, + 0x22, 0xce, 0x6b, 0x8a, 0xc5, 0x7c, 0xf0, 0x5f, 0x59, 0xcb, 0x63, 0x67, 0x0f, 0x3a, 0x87, 0xcc, + 0xd0, 0x01, 0x2c, 0xc5, 0x5a, 0xc9, 0x73, 0x9e, 0x54, 0x1d, 0x75, 0x4a, 0xd7, 0x60, 0x21, 0x92, + 0x97, 0x1c, 0x8b, 0xae, 0x05, 0xbf, 0x4c, 0x9c, 0x77, 0xb0, 0x32, 0x66, 0xe8, 0x29, 0x19, 0xb3, + 0x88, 0xbe, 0x84, 0x45, 0x56, 0x44, 0x45, 0x6f, 0x77, 0x67, 0xcd, 0x2d, 0x0f, 0xed, 0xd6, 0x87, + 0x76, 0x3d, 0x95, 0xf9, 0x95, 0x86, 0xf6, 0x80, 0x5c, 0x15, 0xb0, 0x8e, 0x4f, 0xae, 0x9c, 0x43, + 0xe8, 0x8d, 0x19, 0xb6, 0xac, 0x5d, 0x80, 0x29, 0xc3, 0xd3, 0x47, 0xf0, 0x56, 0xa6, 0x75, 0x93, + 0x73, 0x0c, 0xfd, 0x12, 0xd2, 0x72, 0xf6, 0x61, 0x35, 0xe7, 0x3c, 0x92, 0xd5, 0x9b, 0xce, 0xf4, + 0x3a, 0x5b, 0xd0, 0x3d, 0x0a, 0xa6, 0xda, 0xe7, 0x9f, 0x53, 0x8e, 0xe5, 0x6c, 0x38, 0x22, 0x13, + 0xbc, 0x99, 0x4d, 0x99, 0x3a, 0x43, 0xe8, 0x95, 0x42, 0xbc, 0xd0, 0x0a, 0xf9, 0x03, 0xca, 0x17, + 0xd0, 0x3f, 0x61, 0xd9, 0x98, 0x47, 0x51, 0x83, 0xad, 0xdd, 0x20, 0x33, 0x6e, 0xb8, 0xf0, 0x7f, + 0x2b, 0xab, 0xa0, 0x16, 0x2c, 0x8b, 0x84, 0x73, 0x23, 0x95, 0xa8, 0xb4, 0x4d, 0xee, 0x1c, 0xc1, + 0xea, 0x07, 0x8e, 0x26, 0xbf, 0x42, 0x45, 0xdd, 0x05, 0x60, 0x2a, 0x7b, 0xd4, 0xfc, 0x98, 0xca, + 0xaa, 0x0b, 0x1f, 0x41, 0xbf, 0xc1, 0x54, 0xbb, 0xee, 0xdc, 0xe3, 0xc3, 0x53, 0xb7, 0x7e, 0x96, + 0x6e, 0x33, 0xac, 0x59, 0x1b, 0x3e, 0xc2, 0x52, 0x8e, 0x39, 0x46, 0x41, 0xdf, 0xc3, 0x12, 0x4a, + 0xa1, 0x78, 0x82, 0x03, 0xb2, 0xd9, 0x19, 0xf6, 0x0e, 0x5e, 0xfd, 0xf9, 0xb5, 0xb1, 0x2d, 0xa4, + 0x99, 0xa6, 0x13, 0x37, 0xd0, 0xf1, 0x28, 0xd0, 0x18, 0x6b, 0xac, 0x7e, 0xdb, 0x18, 0x9e, 0x8f, + 0x4c, 0x76, 0xc1, 0xd1, 0xf5, 0x82, 0xc0, 0x0b, 0xc3, 0x84, 0x23, 0xfa, 0x35, 0xc1, 0x99, 0xc0, + 0x93, 0x03, 0x16, 0x1e, 0xa7, 0x91, 0x91, 0x27, 0x52, 0x28, 0x66, 0xd2, 0x84, 0x53, 0x1b, 0x00, + 0xeb, 0xa4, 0xda, 0xc4, 0x9f, 0xa9, 0xd0, 0x2d, 0xe8, 0xc7, 0x2c, 0x92, 0x81, 0xd4, 0x29, 0x9e, + 0x9e, 0x49, 0x1e, 0x85, 0x83, 0x85, 0x4d, 0x32, 0xec, 0xf9, 0xab, 0x4d, 0xf9, 0x6d, 0x5e, 0xdd, + 0x9f, 0xbf, 0xfe, 0xb6, 0x41, 0x76, 0xbe, 0x13, 0xe8, 0xe6, 0x87, 0x3f, 0xe1, 0xc9, 0xa5, 0x0c, + 0x38, 0xdd, 0x83, 0xf9, 0xdc, 0x5a, 0xfa, 0xac, 0xbd, 0xf3, 0xcc, 0x9b, 0xb0, 0x9e, 0xdf, 0x2d, + 0x57, 0x63, 0xf3, 0x60, 0xb9, 0x36, 0x90, 0xae, 0xb7, 0x9a, 0x3b, 0xde, 0x5b, 0xd6, 0x7d, 0x4b, + 0x15, 0xe2, 0x75, 0x39, 0x45, 0x4f, 0x65, 0x74, 0xd0, 0xca, 0xfe, 0xb5, 0xd9, 0x5a, 0xbf, 0x67, + 0xa5, 0xec, 0x3f, 0x18, 0xff, 0xb8, 0xb1, 0xc9, 0xf5, 0x8d, 0x4d, 0x7e, 0xdf, 0xd8, 0xe4, 0xeb, + 0xad, 0x3d, 0x77, 0x7d, 0x6b, 0xcf, 0xfd, 0xbc, 0xb5, 0xe7, 0x3e, 0xb9, 0x0f, 0xcf, 0x9f, 0xa3, + 0x49, 0x8d, 0x8c, 0x46, 0x35, 0x79, 0xb2, 0x58, 0xbc, 0x97, 0xdd, 0xbf, 0x01, 0x00, 0x00, 0xff, + 0xff, 0x5b, 0x22, 0x19, 0xf5, 0x9b, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/types/query/filtered_pagination.go b/types/query/filtered_pagination.go index 629dd0a0f1b9..fe8a905a68b4 100644 --- a/types/query/filtered_pagination.go +++ b/types/query/filtered_pagination.go @@ -16,19 +16,19 @@ import ( // to the client. func FilteredPaginate( prefixStore types.KVStore, - req *PageRequest, + pageRequest *PageRequest, onResult func(key []byte, value []byte, accumulate bool) (bool, error), ) (*PageResponse, error) { // if the PageRequest is nil, use default PageRequest - if req == nil { - req = &PageRequest{} + if pageRequest == nil { + pageRequest = &PageRequest{} } - offset := req.Offset - key := req.Key - limit := req.Limit - countTotal := req.CountTotal + offset := pageRequest.Offset + key := pageRequest.Key + limit := pageRequest.Limit + countTotal := pageRequest.CountTotal if offset > 0 && key != nil { return nil, fmt.Errorf("invalid request, either offset or key is expected, got both") diff --git a/types/query/pagination.go b/types/query/pagination.go index 0505e708b763..b263a1ba4af7 100644 --- a/types/query/pagination.go +++ b/types/query/pagination.go @@ -14,19 +14,19 @@ const defaultLimit = 100 // provided PageRequest. onResult should be used to do actual unmarshaling. func Paginate( prefixStore types.KVStore, - req *PageRequest, + pageRequest *PageRequest, onResult func(key []byte, value []byte) error, ) (*PageResponse, error) { // if the PageRequest is nil, use default PageRequest - if req == nil { - req = &PageRequest{} + if pageRequest == nil { + pageRequest = &PageRequest{} } - offset := req.Offset - key := req.Key - limit := req.Limit - countTotal := req.CountTotal + offset := pageRequest.Offset + key := pageRequest.Key + limit := pageRequest.Limit + countTotal := pageRequest.CountTotal if offset > 0 && key != nil { return nil, fmt.Errorf("invalid request, either offset or key is expected, got both") diff --git a/types/query/pagination.pb.go b/types/query/pagination.pb.go index 32d75937a3cb..e9f3b6fb15f7 100644 --- a/types/query/pagination.pb.go +++ b/types/query/pagination.pb.go @@ -27,7 +27,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // // message SomeRequest { // Foo some_parameter = 1; -// PageRequest page = 2; +// PageRequest pagination = 2; // } type PageRequest struct { // key is a value returned in PageResponse.next_key to begin diff --git a/types/query/pagination_test.go b/types/query/pagination_test.go index f2e19e4e42ff..be12a8d014d3 100644 --- a/types/query/pagination_test.go +++ b/types/query/pagination_test.go @@ -168,7 +168,7 @@ func ExamplePaginate() { authStore := ctx.KVStore(app.GetKey(authtypes.StoreKey)) balancesStore := prefix.NewStore(authStore, types.BalancesPrefix) accountStore := prefix.NewStore(balancesStore, addr1.Bytes()) - res, err := query.Paginate(accountStore, request.Req, func(key []byte, value []byte) error { + res, err := query.Paginate(accountStore, request.Pagination, func(key []byte, value []byte) error { var tempRes sdk.Coin err := app.Codec().UnmarshalBinaryBare(value, &tempRes) if err != nil { diff --git a/x/bank/keeper/grpc_query.go b/x/bank/keeper/grpc_query.go index 9bcc9d3ea127..81dcfbb9177d 100644 --- a/x/bank/keeper/grpc_query.go +++ b/x/bank/keeper/grpc_query.go @@ -52,7 +52,7 @@ func (q BaseKeeper) AllBalances(c context.Context, req *types.QueryAllBalancesRe balancesStore := prefix.NewStore(store, types.BalancesPrefix) accountStore := prefix.NewStore(balancesStore, addr.Bytes()) - res, err := query.Paginate(accountStore, req.Req, func(key []byte, value []byte) error { + res, err := query.Paginate(accountStore, req.Pagination, func(key []byte, value []byte) error { var result sdk.Coin err := q.cdc.UnmarshalBinaryBare(value, &result) if err != nil { diff --git a/x/bank/types/querier.go b/x/bank/types/querier.go index a2992a1b4b9a..62466564cda7 100644 --- a/x/bank/types/querier.go +++ b/x/bank/types/querier.go @@ -20,10 +20,10 @@ func NewQueryBalanceRequest(addr sdk.AccAddress, denom string) *QueryBalanceRequ // NewQueryAllBalancesRequest creates a new instance of QueryAllBalancesRequest. func NewQueryAllBalancesRequest(addr sdk.AccAddress, req *query.PageRequest) *QueryAllBalancesRequest { - return &QueryAllBalancesRequest{Address: addr, Req: req} + return &QueryAllBalancesRequest{Address: addr, Pagination: req} } -// QueryTotalSupply defines the params for the following queries: +// QueryTotalSupplyParams defines the params for the following queries: // // - 'custom/bank/totalSupply' type QueryTotalSupplyParams struct { diff --git a/x/bank/types/query.pb.go b/x/bank/types/query.pb.go index 20e450ef04c5..6d358221bd57 100644 --- a/x/bank/types/query.pb.go +++ b/x/bank/types/query.pb.go @@ -135,8 +135,8 @@ func (m *QueryBalanceResponse) GetBalance() *types.Coin { // QueryBalanceRequest is the request type for the Query/AllBalances RPC method type QueryAllBalancesRequest struct { // address is the address to query balances for - Address github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,1,opt,name=address,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"address,omitempty"` - Req *query.PageRequest `protobuf:"bytes,2,opt,name=req,proto3" json:"req,omitempty"` + Address github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,1,opt,name=address,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"address,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryAllBalancesRequest) Reset() { *m = QueryAllBalancesRequest{} } @@ -179,9 +179,9 @@ func (m *QueryAllBalancesRequest) GetAddress() github_com_cosmos_cosmos_sdk_type return nil } -func (m *QueryAllBalancesRequest) GetReq() *query.PageRequest { +func (m *QueryAllBalancesRequest) GetPagination() *query.PageRequest { if m != nil { - return m.Req + return m.Pagination } return nil } @@ -422,39 +422,39 @@ func init() { proto.RegisterFile("cosmos/bank/query.proto", fileDescriptor_1b02e var fileDescriptor_1b02ea4db7d9aa9f = []byte{ // 525 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0xcf, 0x6e, 0xd3, 0x4c, - 0x14, 0xc5, 0xed, 0x56, 0x4d, 0xfa, 0x4d, 0xba, 0x9a, 0xe6, 0x53, 0x53, 0x4b, 0x38, 0x61, 0xc4, - 0x9f, 0x20, 0x5a, 0x1b, 0xc2, 0x1e, 0x29, 0xee, 0x92, 0x05, 0xc5, 0x05, 0x16, 0x15, 0x1b, 0xc7, - 0x19, 0x4c, 0x54, 0x67, 0xc6, 0xf1, 0xd8, 0x52, 0xf3, 0x16, 0x48, 0xbc, 0x02, 0x2b, 0x9e, 0xa4, - 0xcb, 0x2e, 0x11, 0x8b, 0x80, 0x92, 0x1d, 0x8f, 0xc0, 0x0a, 0xcd, 0xcc, 0x75, 0xe5, 0x24, 0x56, - 0xe8, 0x02, 0x76, 0xf6, 0xcc, 0x9d, 0x73, 0x7f, 0xd7, 0xe7, 0x78, 0xd0, 0x41, 0xc8, 0xc5, 0x98, - 0x0b, 0x77, 0x10, 0xb0, 0x0b, 0x77, 0x92, 0xd3, 0x74, 0xea, 0x24, 0x29, 0xcf, 0x38, 0x6e, 0xe8, - 0x0d, 0x47, 0x6e, 0x58, 0x77, 0xa0, 0x4a, 0x15, 0xb8, 0x49, 0x10, 0x8d, 0x58, 0x90, 0x8d, 0x38, - 0xd3, 0xb5, 0x56, 0x33, 0xe2, 0x11, 0x57, 0x8f, 0xae, 0x7c, 0x82, 0xd5, 0x7d, 0x38, 0x04, 0x42, - 0x6a, 0x91, 0x5c, 0xa2, 0xfd, 0x57, 0x52, 0xc4, 0x0b, 0xe2, 0x80, 0x85, 0xd4, 0xa7, 0x93, 0x9c, - 0x8a, 0x0c, 0xbf, 0x40, 0xf5, 0x60, 0x38, 0x4c, 0xa9, 0x10, 0x2d, 0xb3, 0x63, 0x76, 0xf7, 0xbc, - 0xa7, 0xbf, 0x66, 0xed, 0xe3, 0x68, 0x94, 0x7d, 0xc8, 0x07, 0x4e, 0xc8, 0xc7, 0xee, 0x92, 0xd6, - 0xb1, 0x18, 0x5e, 0xb8, 0xd9, 0x34, 0xa1, 0xc2, 0xe9, 0x87, 0x61, 0x5f, 0x1f, 0xf4, 0x0b, 0x05, - 0xdc, 0x44, 0x3b, 0x43, 0xca, 0xf8, 0xb8, 0xb5, 0xd5, 0x31, 0xbb, 0xff, 0xf9, 0xfa, 0x85, 0x3c, - 0x47, 0xcd, 0xe5, 0xce, 0x22, 0xe1, 0x4c, 0x50, 0xfc, 0x00, 0xd5, 0x07, 0x7a, 0x49, 0xb5, 0x6e, - 0xf4, 0xf6, 0x1c, 0x20, 0x3e, 0xe1, 0x23, 0xe6, 0x17, 0x9b, 0xe4, 0x93, 0x89, 0x0e, 0x94, 0x40, - 0x3f, 0x8e, 0x41, 0x43, 0xfc, 0x13, 0xfc, 0xc7, 0x68, 0x3b, 0xa5, 0x13, 0x05, 0xdf, 0xe8, 0x1d, - 0x16, 0x30, 0xda, 0x9b, 0xd3, 0x20, 0x2a, 0xbe, 0x99, 0x2f, 0xab, 0xc8, 0x67, 0x13, 0xb5, 0xd6, - 0xa9, 0x60, 0xb4, 0x73, 0xb4, 0x0b, 0xf4, 0x92, 0x6b, 0x7b, 0x75, 0x36, 0xef, 0xc9, 0xd5, 0xac, - 0x6d, 0x7c, 0xf9, 0xde, 0xee, 0xde, 0x82, 0x54, 0x1e, 0x10, 0xfe, 0x8d, 0x1e, 0x3e, 0x92, 0x94, - 0x02, 0x28, 0xad, 0x2a, 0x4a, 0x0d, 0x21, 0x31, 0x05, 0x39, 0x84, 0x6f, 0xf7, 0x9a, 0x67, 0x41, - 0x7c, 0x96, 0x27, 0x49, 0x3c, 0x85, 0x31, 0x48, 0x0a, 0x03, 0x2c, 0x6d, 0xc1, 0x00, 0x6f, 0x51, - 0x4d, 0xa8, 0x95, 0xbf, 0x84, 0x0f, 0x6a, 0xe4, 0x08, 0xb2, 0xa0, 0xdb, 0xbd, 0x7c, 0x5f, 0xf8, - 0x78, 0x93, 0x1c, 0xb3, 0x9c, 0x1c, 0x86, 0xfe, 0x5f, 0xa9, 0x06, 0xbc, 0x37, 0xa8, 0x16, 0x8c, - 0x79, 0xce, 0xb2, 0xaa, 0xe4, 0x78, 0xae, 0xc4, 0xfb, 0x36, 0x6b, 0x3f, 0xbc, 0x25, 0x9e, 0x0f, - 0x62, 0xbd, 0x9f, 0x5b, 0x68, 0x47, 0x35, 0xc4, 0xa7, 0xa8, 0x0e, 0xa6, 0xe2, 0x8e, 0x53, 0xfa, - 0x21, 0x9d, 0x8a, 0x7f, 0xc8, 0xba, 0xbb, 0xa1, 0x42, 0x03, 0x13, 0x03, 0xbf, 0x43, 0x8d, 0x52, - 0x52, 0xf0, 0xbd, 0xf5, 0x33, 0xeb, 0xf1, 0xb6, 0xee, 0xff, 0xa1, 0xaa, 0xac, 0x5e, 0xb2, 0xb1, - 0x4a, 0x7d, 0x3d, 0x00, 0x55, 0xea, 0x15, 0x59, 0x20, 0x06, 0x3e, 0x43, 0xbb, 0x85, 0x05, 0xb8, - 0x62, 0xd8, 0x15, 0x33, 0x2d, 0xb2, 0xa9, 0xa4, 0x10, 0xf5, 0x4e, 0xae, 0xe6, 0xb6, 0x79, 0x3d, - 0xb7, 0xcd, 0x1f, 0x73, 0xdb, 0xfc, 0xb8, 0xb0, 0x8d, 0xeb, 0x85, 0x6d, 0x7c, 0x5d, 0xd8, 0xc6, - 0xf9, 0xa3, 0x8d, 0xbe, 0x5d, 0xea, 0x2b, 0x53, 0xd9, 0x37, 0xa8, 0xa9, 0xcb, 0xed, 0xd9, 0xef, - 0x00, 0x00, 0x00, 0xff, 0xff, 0x06, 0xd8, 0xbc, 0xab, 0x4e, 0x05, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0x3f, 0x6f, 0xd3, 0x40, + 0x1c, 0xb5, 0x5b, 0x35, 0x29, 0xbf, 0x74, 0xba, 0x06, 0x35, 0xb5, 0x84, 0x13, 0x4e, 0xfc, 0x09, + 0x52, 0x6b, 0x43, 0x98, 0x58, 0x90, 0xe2, 0x8e, 0x0c, 0x14, 0x17, 0x18, 0x2a, 0x16, 0xc7, 0x31, + 0x26, 0xaa, 0x73, 0xe7, 0xfa, 0x6c, 0xa9, 0xf9, 0x16, 0x7c, 0x05, 0x24, 0x26, 0x3e, 0x49, 0xc7, + 0x8e, 0x88, 0x21, 0xa0, 0x64, 0xe3, 0x23, 0x30, 0x21, 0xdf, 0xfd, 0x5c, 0x9c, 0xc4, 0x0a, 0x1d, + 0x60, 0xb3, 0xef, 0xde, 0xbd, 0xdf, 0x7b, 0xf7, 0x9e, 0x0d, 0x7b, 0x3e, 0x17, 0x63, 0x2e, 0xec, + 0x81, 0xc7, 0xce, 0xec, 0xf3, 0x2c, 0x48, 0x26, 0x56, 0x9c, 0xf0, 0x94, 0x93, 0x86, 0xda, 0xb0, + 0xf2, 0x0d, 0xe3, 0x0e, 0xa2, 0x24, 0xc0, 0x8e, 0xbd, 0x70, 0xc4, 0xbc, 0x74, 0xc4, 0x99, 0xc2, + 0x1a, 0xcd, 0x90, 0x87, 0x5c, 0x3e, 0xda, 0xf9, 0x13, 0xae, 0xee, 0xe2, 0x21, 0x24, 0x92, 0x8b, + 0xf4, 0x02, 0x76, 0x5f, 0xe5, 0x24, 0x8e, 0x17, 0x79, 0xcc, 0x0f, 0xdc, 0xe0, 0x3c, 0x0b, 0x44, + 0x4a, 0x5e, 0x40, 0xdd, 0x1b, 0x0e, 0x93, 0x40, 0x88, 0x96, 0xde, 0xd1, 0xbb, 0x3b, 0xce, 0x93, + 0x5f, 0xd3, 0xf6, 0x61, 0x38, 0x4a, 0x3f, 0x64, 0x03, 0xcb, 0xe7, 0x63, 0x7b, 0x81, 0xeb, 0x50, + 0x0c, 0xcf, 0xec, 0x74, 0x12, 0x07, 0xc2, 0xea, 0xfb, 0x7e, 0x5f, 0x1d, 0x74, 0x0b, 0x06, 0xd2, + 0x84, 0xad, 0x61, 0xc0, 0xf8, 0xb8, 0xb5, 0xd1, 0xd1, 0xbb, 0xb7, 0x5c, 0xf5, 0x42, 0x9f, 0x43, + 0x73, 0x71, 0xb2, 0x88, 0x39, 0x13, 0x01, 0x79, 0x00, 0xf5, 0x81, 0x5a, 0x92, 0xa3, 0x1b, 0xbd, + 0x1d, 0x0b, 0x15, 0x1f, 0xf1, 0x11, 0x73, 0x8b, 0x4d, 0xfa, 0x49, 0x87, 0x3d, 0x49, 0xd0, 0x8f, + 0x22, 0xe4, 0x10, 0xff, 0x45, 0xfe, 0x33, 0x80, 0x3f, 0x37, 0x2c, 0x3d, 0x34, 0x7a, 0xfb, 0x85, + 0x26, 0x15, 0xd1, 0xb1, 0x17, 0x16, 0x57, 0xe7, 0x96, 0xc0, 0xf4, 0xb3, 0x0e, 0xad, 0x55, 0x8d, + 0x68, 0xf4, 0x14, 0xb6, 0xd1, 0x4b, 0xae, 0x72, 0x73, 0xd9, 0xa9, 0xf3, 0xf8, 0x72, 0xda, 0xd6, + 0xbe, 0x7c, 0x6f, 0x77, 0x6f, 0xa0, 0x3b, 0x3f, 0x20, 0xdc, 0x6b, 0x3e, 0x72, 0x00, 0x9b, 0x49, + 0x20, 0x50, 0xac, 0x51, 0x25, 0x56, 0x89, 0x70, 0x73, 0x18, 0xdd, 0xc7, 0x9b, 0x7c, 0xcd, 0x53, + 0x2f, 0x3a, 0xc9, 0xe2, 0x38, 0x9a, 0xa0, 0x1b, 0x9a, 0xa0, 0x81, 0x85, 0x2d, 0x34, 0xf0, 0x16, + 0x6a, 0x42, 0xae, 0xfc, 0x23, 0xf9, 0xc8, 0x46, 0x0f, 0xb0, 0x19, 0x6a, 0xdc, 0xcb, 0xf7, 0x45, + 0xaa, 0xd7, 0x3d, 0xd2, 0xcb, 0x3d, 0x62, 0x70, 0x7b, 0x09, 0x8d, 0xf2, 0xde, 0x40, 0xcd, 0x1b, + 0xf3, 0x8c, 0xa5, 0x55, 0x3d, 0x72, 0xec, 0x5c, 0xde, 0xb7, 0x69, 0xfb, 0xe1, 0x0d, 0xe5, 0xb9, + 0x48, 0xd6, 0xfb, 0xb9, 0x01, 0x5b, 0x72, 0x20, 0x39, 0x86, 0x3a, 0x86, 0x4a, 0x3a, 0x56, 0xe9, + 0xf3, 0xb4, 0x2a, 0xbe, 0x28, 0xe3, 0xee, 0x1a, 0x84, 0x12, 0x4c, 0x35, 0xf2, 0x0e, 0x1a, 0xa5, + 0xa6, 0x90, 0x7b, 0xab, 0x67, 0x56, 0xcb, 0x6e, 0xdc, 0xff, 0x0b, 0xaa, 0xcc, 0x5e, 0x8a, 0xb1, + 0x8a, 0x7d, 0xb5, 0x00, 0x55, 0xec, 0x15, 0x5d, 0xa0, 0x1a, 0x39, 0x81, 0xed, 0x22, 0x02, 0x52, + 0x61, 0x76, 0x29, 0x4c, 0x83, 0xae, 0x83, 0x14, 0xa4, 0xce, 0xd1, 0xe5, 0xcc, 0xd4, 0xaf, 0x66, + 0xa6, 0xfe, 0x63, 0x66, 0xea, 0x1f, 0xe7, 0xa6, 0x76, 0x35, 0x37, 0xb5, 0xaf, 0x73, 0x53, 0x3b, + 0x7d, 0xb4, 0x36, 0xb7, 0x0b, 0xf5, 0x03, 0x95, 0xf1, 0x0d, 0x6a, 0xf2, 0x57, 0xf7, 0xf4, 0x77, + 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x12, 0xa7, 0xcf, 0x5c, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -745,9 +745,9 @@ func (m *QueryAllBalancesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l - if m.Req != nil { + if m.Pagination != nil { { - size, err := m.Req.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -990,8 +990,8 @@ func (m *QueryAllBalancesRequest) Size() (n int) { if l > 0 { n += 1 + l + sovQuery(uint64(l)) } - if m.Req != nil { - l = m.Req.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -1343,7 +1343,7 @@ func (m *QueryAllBalancesRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Req", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -1370,10 +1370,10 @@ func (m *QueryAllBalancesRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Req == nil { - m.Req = &query.PageRequest{} + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} } - if err := m.Req.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/distribution/client/cli/query.go b/x/distribution/client/cli/query.go index 5733bd5abfe1..f23d8c1e9ec7 100644 --- a/x/distribution/client/cli/query.go +++ b/x/distribution/client/cli/query.go @@ -199,7 +199,7 @@ $ %s query distribution slashes cosmosvaloper1gghjut3ccd8ay0zduzj64hwre2fxs9ldmq ValidatorAddress: validatorAddr, StartingHeight: startHeight, EndingHeight: endHeight, - Req: pageReq, + Pagination: pageReq, }, ) if err != nil { diff --git a/x/distribution/keeper/grpc_query.go b/x/distribution/keeper/grpc_query.go index 9367d2d6f065..293b37e03775 100644 --- a/x/distribution/keeper/grpc_query.go +++ b/x/distribution/keeper/grpc_query.go @@ -75,7 +75,7 @@ func (k Keeper) ValidatorSlashes(c context.Context, req *types.QueryValidatorSla store := ctx.KVStore(k.storeKey) slashesStore := prefix.NewStore(store, types.GetValidatorSlashEventPrefix(req.ValidatorAddress)) - res, err := query.FilteredPaginate(slashesStore, req.Req, func(key []byte, value []byte, accumulate bool) (bool, error) { + res, err := query.FilteredPaginate(slashesStore, req.Pagination, func(key []byte, value []byte, accumulate bool) (bool, error) { var result types.ValidatorSlashEvent err := k.cdc.UnmarshalBinaryBare(value, &result) diff --git a/x/distribution/keeper/grpc_query_test.go b/x/distribution/keeper/grpc_query_test.go index 7902f5c78a3e..681251a64080 100644 --- a/x/distribution/keeper/grpc_query_test.go +++ b/x/distribution/keeper/grpc_query_test.go @@ -266,7 +266,7 @@ func (suite *KeeperTestSuite) TestGRPCValidatorSlashes() { ValidatorAddress: valAddrs[0], StartingHeight: 1, EndingHeight: 10, - Req: pageReq, + Pagination: pageReq, } expRes = &types.QueryValidatorSlashesResponse{ @@ -287,7 +287,7 @@ func (suite *KeeperTestSuite) TestGRPCValidatorSlashes() { ValidatorAddress: valAddrs[0], StartingHeight: 1, EndingHeight: 10, - Req: pageReq, + Pagination: pageReq, } expRes = &types.QueryValidatorSlashesResponse{ @@ -308,7 +308,7 @@ func (suite *KeeperTestSuite) TestGRPCValidatorSlashes() { ValidatorAddress: valAddrs[0], StartingHeight: 1, EndingHeight: 10, - Req: pageReq, + Pagination: pageReq, } expRes = &types.QueryValidatorSlashesResponse{ diff --git a/x/distribution/types/query.pb.go b/x/distribution/types/query.pb.go index 2726686e9f06..5a6c15ed96df 100644 --- a/x/distribution/types/query.pb.go +++ b/x/distribution/types/query.pb.go @@ -302,7 +302,7 @@ type QueryValidatorSlashesRequest struct { ValidatorAddress github_com_cosmos_cosmos_sdk_types.ValAddress `protobuf:"bytes,1,opt,name=validator_address,json=validatorAddress,proto3,casttype=github.com/cosmos/cosmos-sdk/types.ValAddress" json:"validator_address,omitempty"` StartingHeight uint64 `protobuf:"varint,2,opt,name=starting_height,json=startingHeight,proto3" json:"starting_height,omitempty"` EndingHeight uint64 `protobuf:"varint,3,opt,name=ending_height,json=endingHeight,proto3" json:"ending_height,omitempty"` - Req *query.PageRequest `protobuf:"bytes,4,opt,name=req,proto3" json:"req,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,4,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryValidatorSlashesRequest) Reset() { *m = QueryValidatorSlashesRequest{} } @@ -359,9 +359,9 @@ func (m *QueryValidatorSlashesRequest) GetEndingHeight() uint64 { return 0 } -func (m *QueryValidatorSlashesRequest) GetReq() *query.PageRequest { +func (m *QueryValidatorSlashesRequest) GetPagination() *query.PageRequest { if m != nil { - return m.Req + return m.Pagination } return nil } @@ -901,66 +901,66 @@ func init() { func init() { proto.RegisterFile("cosmos/distribution/query.proto", fileDescriptor_2111c1b119d22af6) } var fileDescriptor_2111c1b119d22af6 = []byte{ - // 940 bytes of a gzipped FileDescriptorProto + // 941 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4f, 0x6f, 0xdc, 0x44, 0x14, 0xdf, 0x49, 0xd2, 0x54, 0xbc, 0xb4, 0x24, 0x9d, 0x54, 0x68, 0xeb, 0xd0, 0xdd, 0xc8, 0x05, - 0xb2, 0x52, 0xa9, 0x4d, 0x36, 0x20, 0x28, 0x82, 0x43, 0xd2, 0x20, 0x55, 0x42, 0x82, 0xed, 0x82, - 0x0a, 0x54, 0xd0, 0x6a, 0x62, 0x8f, 0xbc, 0x16, 0x5e, 0xcf, 0xc6, 0x33, 0x4e, 0x88, 0xf8, 0x23, - 0x90, 0x0a, 0x12, 0x07, 0x24, 0x24, 0x0e, 0x5c, 0xf8, 0x04, 0xfd, 0x24, 0x3d, 0x96, 0x1b, 0xa7, - 0x16, 0x25, 0x9f, 0x02, 0x4e, 0xc8, 0x33, 0x63, 0x67, 0x9d, 0xd8, 0xce, 0x66, 0x89, 0xf6, 0xb6, - 0xfb, 0xe6, 0xbd, 0xdf, 0xfb, 0xbd, 0xdf, 0xbc, 0x79, 0x33, 0x86, 0xa6, 0xc3, 0x78, 0x9f, 0x71, - 0xdb, 0xf5, 0xb9, 0x88, 0xfc, 0xad, 0x58, 0xf8, 0x2c, 0xb4, 0xb7, 0x63, 0x1a, 0xed, 0x59, 0x83, - 0x88, 0x09, 0x86, 0x17, 0x95, 0x83, 0x35, 0xec, 0x60, 0x5c, 0xd5, 0x51, 0xd2, 0xd1, 0x1e, 0x10, - 0xcf, 0x0f, 0x49, 0xb2, 0xa0, 0x62, 0x8c, 0xcb, 0x1e, 0xf3, 0x98, 0xfc, 0x69, 0x27, 0xbf, 0xb4, - 0x55, 0x23, 0xd9, 0x1a, 0x50, 0x19, 0x5f, 0x29, 0xca, 0x3f, 0xfc, 0x47, 0xf9, 0x99, 0x97, 0x01, - 0xdf, 0x49, 0x92, 0x75, 0x48, 0x44, 0xfa, 0xbc, 0x4b, 0xb7, 0x63, 0xca, 0x85, 0xd9, 0x81, 0xc5, - 0x9c, 0x95, 0x0f, 0x58, 0xc8, 0x29, 0xbe, 0x09, 0xb3, 0x03, 0x69, 0xa9, 0xa3, 0x65, 0xd4, 0x9a, - 0x6b, 0x2f, 0x59, 0x05, 0x45, 0x58, 0x2a, 0x68, 0x63, 0xe6, 0xf1, 0xd3, 0x66, 0xad, 0xab, 0x03, - 0xcc, 0x9f, 0x11, 0xac, 0x48, 0xc8, 0xbb, 0x24, 0xf0, 0x5d, 0x22, 0x58, 0xf4, 0x61, 0x2c, 0xb8, - 0x20, 0xa1, 0xeb, 0x87, 0x5e, 0x97, 0xee, 0x92, 0xc8, 0x4d, 0xb3, 0xe3, 0xfb, 0x70, 0x69, 0x27, - 0xf5, 0x7a, 0x40, 0x5c, 0x37, 0xa2, 0x5c, 0x65, 0xbc, 0xb0, 0xb1, 0xfa, 0xef, 0xd3, 0xe6, 0x0d, - 0xcf, 0x17, 0xbd, 0x78, 0xcb, 0x72, 0x58, 0xdf, 0xce, 0x95, 0x7e, 0x83, 0xbb, 0x5f, 0xda, 0x62, - 0x6f, 0x40, 0xb9, 0x75, 0x97, 0x04, 0xeb, 0x2a, 0xb0, 0xbb, 0x90, 0x61, 0x69, 0x8b, 0xf9, 0x0d, - 0xb4, 0x4e, 0xa6, 0xa2, 0x4b, 0xee, 0xc0, 0xf9, 0x48, 0x99, 0x74, 0xcd, 0xaf, 0x15, 0xd6, 0x5c, - 0x01, 0xa5, 0x85, 0x48, 0x61, 0xcc, 0x1f, 0x10, 0x34, 0xf3, 0xe9, 0x6f, 0xb1, 0x7e, 0xdf, 0xe7, - 0xdc, 0x67, 0xe1, 0xa4, 0x14, 0xf8, 0x16, 0x96, 0xcb, 0x29, 0xe8, 0xca, 0x3f, 0x03, 0x70, 0x32, - 0xab, 0x2e, 0x7e, 0xad, 0xba, 0xf8, 0x75, 0xc7, 0x89, 0xfb, 0x71, 0x40, 0x04, 0x75, 0x0f, 0x01, - 0x75, 0xfd, 0x43, 0x60, 0xe6, 0x3f, 0x08, 0x5e, 0xcc, 0xe7, 0xff, 0x28, 0x20, 0xbc, 0x47, 0x27, - 0xd5, 0x01, 0x78, 0x05, 0xe6, 0xb9, 0x20, 0x91, 0xf0, 0x43, 0xef, 0x41, 0x8f, 0xfa, 0x5e, 0x4f, - 0xd4, 0xa7, 0x96, 0x51, 0x6b, 0xa6, 0xfb, 0x7c, 0x6a, 0xbe, 0x2d, 0xad, 0xf8, 0x1a, 0x5c, 0xa4, - 0x72, 0x33, 0x53, 0xb7, 0x69, 0xe9, 0x76, 0x41, 0x19, 0xb5, 0xd3, 0x75, 0x98, 0x8e, 0xe8, 0x76, - 0x7d, 0x46, 0x4a, 0x74, 0x25, 0x95, 0x48, 0x1d, 0xf6, 0x0e, 0xf1, 0xa8, 0xae, 0xaa, 0x9b, 0x78, - 0x99, 0xbf, 0x23, 0xb8, 0x5a, 0x52, 0xbb, 0x16, 0xfe, 0x36, 0x9c, 0xe7, 0xca, 0x54, 0x47, 0xcb, - 0xd3, 0xad, 0xb9, 0x76, 0xab, 0x5a, 0x75, 0x19, 0xff, 0xde, 0x0e, 0x0d, 0x45, 0xda, 0x6a, 0x3a, - 0x1c, 0xbf, 0x9a, 0x10, 0xe3, 0xb2, 0xb4, 0xb9, 0xb6, 0x51, 0x44, 0x4c, 0xa5, 0x4c, 0x98, 0x71, - 0xf3, 0x59, 0xca, 0x6c, 0x93, 0x06, 0xd4, 0x93, 0x73, 0xe7, 0xf8, 0xc1, 0x74, 0xd5, 0xda, 0xd8, - 0xdb, 0xb2, 0xee, 0x38, 0xd9, 0xb6, 0x64, 0x58, 0xe9, 0xb6, 0x14, 0x6e, 0xfb, 0xd4, 0xd9, 0xb5, - 0xfd, 0xf7, 0x08, 0x1a, 0x65, 0x15, 0x6a, 0xf1, 0xef, 0x0f, 0x9f, 0xf7, 0x44, 0xfc, 0xf9, 0x54, - 0xb6, 0x4d, 0xea, 0xdc, 0x62, 0x7e, 0xb8, 0xb1, 0x96, 0x68, 0xfc, 0xe8, 0x59, 0xf3, 0xfa, 0x08, - 0x6c, 0x74, 0x0c, 0x3f, 0x3c, 0xfd, 0x0f, 0x11, 0x98, 0x47, 0x28, 0x7c, 0xcc, 0x04, 0x09, 0x26, - 0xab, 0xb4, 0xf9, 0x27, 0x82, 0x6b, 0x95, 0x34, 0xb4, 0x1c, 0x1f, 0x1c, 0x95, 0xc3, 0x2a, 0xec, - 0xc5, 0x43, 0x94, 0xcd, 0x34, 0x93, 0x42, 0x3a, 0x32, 0xfc, 0xf0, 0x3d, 0x38, 0x27, 0x92, 0x3c, - 0xf5, 0xa9, 0x33, 0x14, 0x57, 0x41, 0x1e, 0x0e, 0xd6, 0x8c, 0x43, 0x76, 0x44, 0x26, 0xa6, 0x6b, - 0xac, 0x07, 0x6b, 0x21, 0x05, 0xad, 0xe9, 0x1d, 0x80, 0xac, 0x33, 0x95, 0xac, 0x63, 0xb5, 0xf7, - 0x10, 0x88, 0xf9, 0x13, 0x82, 0x97, 0xf2, 0x79, 0x3f, 0xf1, 0x45, 0xcf, 0x8d, 0xc8, 0x6e, 0xea, - 0x3d, 0xa1, 0xfa, 0x7f, 0x44, 0xf0, 0xf2, 0x09, 0x44, 0xb4, 0x0a, 0x9f, 0xc3, 0xc2, 0xae, 0x5e, - 0xfa, 0xff, 0x44, 0xe6, 0x77, 0xf3, 0x59, 0xcc, 0x25, 0xb8, 0x22, 0x69, 0x24, 0xd7, 0x50, 0x1c, - 0xfa, 0x62, 0xaf, 0xc3, 0x58, 0x90, 0xbe, 0x6e, 0x76, 0xc0, 0x28, 0x5a, 0xd4, 0xc4, 0x3e, 0x85, - 0x99, 0x01, 0x63, 0xc1, 0x99, 0x1e, 0x7f, 0x89, 0xd8, 0x7e, 0xf4, 0x1c, 0x9c, 0x93, 0x89, 0xf1, - 0x17, 0x30, 0xab, 0x5e, 0x49, 0x78, 0xa5, 0xf0, 0x3c, 0x1d, 0x7f, 0x92, 0x19, 0xad, 0x93, 0x1d, - 0x55, 0x01, 0x66, 0x0d, 0xff, 0x81, 0x60, 0xa9, 0xe2, 0x45, 0x82, 0xdf, 0x29, 0xc7, 0x3a, 0xf9, - 0x79, 0x66, 0xbc, 0x3b, 0x66, 0x74, 0x46, 0xef, 0x21, 0x82, 0xc5, 0x82, 0x97, 0x07, 0x7e, 0x7d, - 0x04, 0xe0, 0x63, 0x6f, 0x25, 0xe3, 0x8d, 0x53, 0x46, 0x65, 0x34, 0xbe, 0x86, 0x85, 0xa3, 0x77, - 0x30, 0x5e, 0x1d, 0x01, 0x2c, 0xff, 0x56, 0x31, 0xda, 0xa7, 0x09, 0xc9, 0x92, 0x7f, 0x07, 0x97, - 0x8e, 0x5d, 0x42, 0xb8, 0x02, 0xaa, 0xec, 0x4e, 0x36, 0xd6, 0x4e, 0x15, 0x93, 0xe5, 0xff, 0x05, - 0xc1, 0x0b, 0xc5, 0xb3, 0x1f, 0xbf, 0x39, 0x0a, 0x62, 0xc1, 0xa5, 0x65, 0xbc, 0x75, 0xfa, 0xc0, - 0x5c, 0x4f, 0x14, 0x0c, 0xcd, 0xaa, 0x9e, 0x28, 0x1f, 0xf3, 0x55, 0x3d, 0x51, 0x31, 0x99, 0xcd, - 0x1a, 0xfe, 0x0d, 0x41, 0xbd, 0x6c, 0x74, 0xe1, 0x9b, 0x23, 0xa0, 0x16, 0xcf, 0x5d, 0xe3, 0xed, - 0x71, 0x42, 0x33, 0x56, 0x11, 0x5c, 0xcc, 0xcd, 0x2a, 0x6c, 0x95, 0xc3, 0x15, 0x4d, 0x3c, 0xc3, - 0x1e, 0xd9, 0x3f, 0xcd, 0xb9, 0xf1, 0xfe, 0xe3, 0xfd, 0x06, 0x7a, 0xb2, 0xdf, 0x40, 0x7f, 0xef, - 0x37, 0xd0, 0xaf, 0x07, 0x8d, 0xda, 0x93, 0x83, 0x46, 0xed, 0xaf, 0x83, 0x46, 0xed, 0xde, 0x6a, - 0xe5, 0xe4, 0xfb, 0x2a, 0xff, 0xc9, 0x29, 0x07, 0xe1, 0xd6, 0xac, 0xfc, 0xd8, 0x5c, 0xfb, 0x2f, - 0x00, 0x00, 0xff, 0xff, 0xff, 0xaa, 0x49, 0xeb, 0x16, 0x0f, 0x00, 0x00, + 0xb2, 0x12, 0xd4, 0x26, 0x1b, 0x10, 0x04, 0xc1, 0x21, 0x69, 0x90, 0x2a, 0x21, 0xc1, 0x76, 0x41, + 0x05, 0x2a, 0x68, 0x35, 0xb1, 0x47, 0x5e, 0x0b, 0xaf, 0x67, 0xeb, 0x19, 0x27, 0x44, 0xfc, 0x11, + 0x48, 0x05, 0xc4, 0x01, 0x09, 0x89, 0x03, 0x17, 0x3e, 0x41, 0x3f, 0x49, 0x8f, 0xe5, 0xc6, 0xa9, + 0x45, 0xc9, 0xb7, 0xe0, 0x84, 0x3c, 0x33, 0xf6, 0xae, 0x13, 0xdb, 0xd9, 0xa4, 0xd1, 0xde, 0x76, + 0xdf, 0xbc, 0xf7, 0x7b, 0xbf, 0xf7, 0x9b, 0x37, 0x6f, 0xc6, 0xd0, 0x74, 0x18, 0xef, 0x33, 0x6e, + 0xbb, 0x3e, 0x17, 0x91, 0xbf, 0x1d, 0x0b, 0x9f, 0x85, 0xf6, 0xfd, 0x98, 0x46, 0x7b, 0xd6, 0x20, + 0x62, 0x82, 0xe1, 0x45, 0xe5, 0x60, 0x8d, 0x3a, 0x18, 0x57, 0x75, 0x94, 0x74, 0xb4, 0x07, 0xc4, + 0xf3, 0x43, 0x92, 0x2c, 0xa8, 0x18, 0xe3, 0xb2, 0xc7, 0x3c, 0x26, 0x7f, 0xda, 0xc9, 0x2f, 0x6d, + 0xd5, 0x48, 0xb6, 0x06, 0x54, 0xc6, 0x57, 0x8a, 0xf2, 0x8f, 0xfe, 0x51, 0x7e, 0xe6, 0x65, 0xc0, + 0xb7, 0x92, 0x64, 0x1d, 0x12, 0x91, 0x3e, 0xef, 0xd2, 0xfb, 0x31, 0xe5, 0xc2, 0xec, 0xc0, 0x62, + 0xce, 0xca, 0x07, 0x2c, 0xe4, 0x14, 0xaf, 0xc3, 0xec, 0x40, 0x5a, 0xea, 0x68, 0x19, 0xb5, 0xe6, + 0xda, 0x4b, 0x56, 0x41, 0x11, 0x96, 0x0a, 0xda, 0x9c, 0x79, 0xf4, 0xa4, 0x59, 0xeb, 0xea, 0x00, + 0xf3, 0x57, 0x04, 0x2b, 0x12, 0xf2, 0x36, 0x09, 0x7c, 0x97, 0x08, 0x16, 0x7d, 0x14, 0x0b, 0x2e, + 0x48, 0xe8, 0xfa, 0xa1, 0xd7, 0xa5, 0xbb, 0x24, 0x72, 0xd3, 0xec, 0xf8, 0x2e, 0x5c, 0xda, 0x49, + 0xbd, 0xee, 0x11, 0xd7, 0x8d, 0x28, 0x57, 0x19, 0x2f, 0x6c, 0xae, 0xfe, 0xf7, 0xa4, 0x79, 0xdd, + 0xf3, 0x45, 0x2f, 0xde, 0xb6, 0x1c, 0xd6, 0xb7, 0x73, 0xa5, 0x5f, 0xe7, 0xee, 0x57, 0xb6, 0xd8, + 0x1b, 0x50, 0x6e, 0xdd, 0x26, 0xc1, 0x86, 0x0a, 0xec, 0x2e, 0x64, 0x58, 0xda, 0x62, 0x7e, 0x0b, + 0xad, 0xe3, 0xa9, 0xe8, 0x92, 0x3b, 0x70, 0x3e, 0x52, 0x26, 0x5d, 0xf3, 0xeb, 0x85, 0x35, 0x57, + 0x40, 0x69, 0x21, 0x52, 0x18, 0xf3, 0x47, 0x04, 0xcd, 0x7c, 0xfa, 0x1b, 0xac, 0xdf, 0xf7, 0x39, + 0xf7, 0x59, 0x38, 0x29, 0x05, 0xbe, 0x83, 0xe5, 0x72, 0x0a, 0xba, 0xf2, 0xcf, 0x01, 0x9c, 0xcc, + 0xaa, 0x8b, 0x5f, 0xab, 0x2e, 0x7e, 0xc3, 0x71, 0xe2, 0x7e, 0x1c, 0x10, 0x41, 0xdd, 0x21, 0xa0, + 0xae, 0x7f, 0x04, 0xcc, 0xfc, 0x65, 0x0a, 0x5e, 0xcc, 0xe7, 0xff, 0x38, 0x20, 0xbc, 0x47, 0x27, + 0xd5, 0x01, 0x78, 0x05, 0xe6, 0xb9, 0x20, 0x91, 0xf0, 0x43, 0xef, 0x5e, 0x8f, 0xfa, 0x5e, 0x4f, + 0xd4, 0xa7, 0x96, 0x51, 0x6b, 0xa6, 0xfb, 0x7c, 0x6a, 0xbe, 0x29, 0xad, 0xf8, 0x1a, 0x5c, 0xa4, + 0x72, 0x33, 0x53, 0xb7, 0x69, 0xe9, 0x76, 0x41, 0x19, 0xb5, 0xd3, 0x3a, 0xc0, 0xf0, 0xa8, 0xd6, + 0x67, 0xa4, 0x52, 0x57, 0x52, 0xa5, 0xd4, 0x99, 0xef, 0x10, 0x8f, 0xea, 0xe2, 0xba, 0x23, 0xce, + 0xe6, 0x9f, 0x08, 0xae, 0x96, 0x28, 0xa1, 0xb7, 0xe1, 0x26, 0x9c, 0xe7, 0xca, 0x54, 0x47, 0xcb, + 0xd3, 0xad, 0xb9, 0x76, 0xab, 0x7a, 0x0f, 0x64, 0xfc, 0xfb, 0x3b, 0x34, 0x14, 0x69, 0xe3, 0xe9, + 0x70, 0xfc, 0x1a, 0x4c, 0x47, 0x94, 0xcb, 0x42, 0xe7, 0xda, 0x46, 0x11, 0x3f, 0x95, 0xb2, 0x9b, + 0xb8, 0x99, 0x4f, 0x53, 0x66, 0x5b, 0x34, 0xa0, 0x9e, 0x64, 0x7b, 0xf4, 0x98, 0xba, 0x6a, 0xed, + 0xd4, 0x9b, 0xb4, 0xe1, 0x38, 0xd9, 0x26, 0x65, 0x58, 0xe9, 0x26, 0x15, 0x36, 0xc1, 0xd4, 0xd9, + 0x1d, 0x82, 0x1f, 0x10, 0x34, 0xca, 0x2a, 0xd4, 0xe2, 0xdf, 0x1d, 0x3d, 0xfd, 0x89, 0xf8, 0xf3, + 0xa9, 0x6c, 0x5b, 0xd4, 0xb9, 0xc1, 0xfc, 0x70, 0x73, 0x2d, 0xd1, 0xf8, 0xe1, 0xd3, 0xe6, 0xab, + 0x63, 0xb0, 0xd1, 0x31, 0x7c, 0x38, 0x0b, 0x1e, 0x20, 0x30, 0x0f, 0x51, 0xf8, 0x84, 0x09, 0x12, + 0x4c, 0x56, 0x69, 0xf3, 0x6f, 0x04, 0xd7, 0x2a, 0x69, 0x68, 0x39, 0x3e, 0x3c, 0x2c, 0x87, 0x55, + 0xd8, 0x8b, 0x43, 0x94, 0xad, 0x34, 0x93, 0x42, 0x3a, 0x34, 0x0a, 0xf1, 0x1d, 0x38, 0x27, 0x92, + 0x3c, 0xf5, 0xa9, 0x33, 0x14, 0x57, 0x41, 0x0e, 0xc7, 0x6c, 0xc6, 0x21, 0x3b, 0x22, 0x13, 0xd3, + 0x35, 0xd6, 0x63, 0xb6, 0x90, 0x82, 0xd6, 0xf4, 0x16, 0x40, 0xd6, 0x99, 0x4a, 0xd6, 0x53, 0xb5, + 0xf7, 0x08, 0x88, 0xf9, 0x33, 0x82, 0x97, 0xf2, 0x79, 0x3f, 0xf5, 0x45, 0xcf, 0x8d, 0xc8, 0x6e, + 0xea, 0x3d, 0xa1, 0xfa, 0x7f, 0x42, 0xf0, 0xf2, 0x31, 0x44, 0xb4, 0x0a, 0x5f, 0xc0, 0xc2, 0xae, + 0x5e, 0x7a, 0x76, 0x22, 0xf3, 0xbb, 0xf9, 0x2c, 0xe6, 0x12, 0x5c, 0x91, 0x34, 0x92, 0x4b, 0x29, + 0x0e, 0x7d, 0xb1, 0xd7, 0x61, 0x2c, 0x48, 0xdf, 0x3a, 0x3b, 0x60, 0x14, 0x2d, 0x6a, 0x62, 0x9f, + 0xc1, 0xcc, 0x80, 0xb1, 0xe0, 0x4c, 0x8f, 0xbf, 0x44, 0x6c, 0x3f, 0x7c, 0x0e, 0xce, 0xc9, 0xc4, + 0xf8, 0x4b, 0x98, 0x55, 0x6f, 0x26, 0xbc, 0x52, 0x78, 0x9e, 0x8e, 0x3e, 0xd0, 0x8c, 0xd6, 0xf1, + 0x8e, 0xaa, 0x00, 0xb3, 0x86, 0xff, 0x42, 0xb0, 0x54, 0xf1, 0x3e, 0xc1, 0xef, 0x96, 0x63, 0x1d, + 0xff, 0x58, 0x33, 0xde, 0x3b, 0x65, 0x74, 0x46, 0xef, 0x01, 0x82, 0xc5, 0x82, 0x77, 0x08, 0x7e, + 0x63, 0x0c, 0xe0, 0x23, 0x2f, 0x27, 0xe3, 0xcd, 0x13, 0x46, 0x65, 0x34, 0xbe, 0x81, 0x85, 0xc3, + 0x77, 0x30, 0x5e, 0x1d, 0x03, 0x2c, 0xff, 0x72, 0x31, 0xda, 0x27, 0x09, 0xc9, 0x92, 0x7f, 0x0f, + 0x97, 0x8e, 0x5c, 0x42, 0xb8, 0x02, 0xaa, 0xec, 0x4e, 0x36, 0xd6, 0x4e, 0x14, 0x93, 0xe5, 0xff, + 0x0d, 0xc1, 0x0b, 0xc5, 0xb3, 0x1f, 0xbf, 0x35, 0x0e, 0x62, 0xc1, 0xa5, 0x65, 0xbc, 0x7d, 0xf2, + 0xc0, 0x5c, 0x4f, 0x14, 0x0c, 0xcd, 0xaa, 0x9e, 0x28, 0x1f, 0xf3, 0x55, 0x3d, 0x51, 0x31, 0x99, + 0xcd, 0x1a, 0xfe, 0x03, 0x41, 0xbd, 0x6c, 0x74, 0xe1, 0xf5, 0x31, 0x50, 0x8b, 0xe7, 0xae, 0xf1, + 0xce, 0x69, 0x42, 0x33, 0x56, 0x11, 0x5c, 0xcc, 0xcd, 0x2a, 0x6c, 0x95, 0xc3, 0x15, 0x4d, 0x3c, + 0xc3, 0x1e, 0xdb, 0x3f, 0xcd, 0xb9, 0xf9, 0xc1, 0xa3, 0xfd, 0x06, 0x7a, 0xbc, 0xdf, 0x40, 0xff, + 0xee, 0x37, 0xd0, 0xef, 0x07, 0x8d, 0xda, 0xe3, 0x83, 0x46, 0xed, 0x9f, 0x83, 0x46, 0xed, 0xce, + 0x6a, 0xe5, 0xe4, 0xfb, 0x3a, 0xff, 0x01, 0x2a, 0x07, 0xe1, 0xf6, 0xac, 0xfc, 0xf4, 0x5c, 0xfb, + 0x3f, 0x00, 0x00, 0xff, 0xff, 0x5a, 0xdc, 0x55, 0xbf, 0x24, 0x0f, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1551,9 +1551,9 @@ func (m *QueryValidatorSlashesRequest) MarshalToSizedBuffer(dAtA []byte) (int, e _ = i var l int _ = l - if m.Req != nil { + if m.Pagination != nil { { - size, err := m.Req.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2064,8 +2064,8 @@ func (m *QueryValidatorSlashesRequest) Size() (n int) { if m.EndingHeight != 0 { n += 1 + sovQuery(uint64(m.EndingHeight)) } - if m.Req != nil { - l = m.Req.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -2828,7 +2828,7 @@ func (m *QueryValidatorSlashesRequest) Unmarshal(dAtA []byte) error { } case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Req", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -2855,10 +2855,10 @@ func (m *QueryValidatorSlashesRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Req == nil { - m.Req = &query.PageRequest{} + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} } - if err := m.Req.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/evidence/client/cli/query.go b/x/evidence/client/cli/query.go index e61a3c92e7e4..d3d183ec0369 100644 --- a/x/evidence/client/cli/query.go +++ b/x/evidence/client/cli/query.go @@ -94,7 +94,7 @@ func queryAllEvidence(clientCtx client.Context, pageReq *query.PageRequest) erro queryClient := types.NewQueryClient(clientCtx) params := &types.QueryAllEvidenceRequest{ - Req: pageReq, + Pagination: pageReq, } res, err := queryClient.AllEvidence(context.Background(), params) diff --git a/x/evidence/keeper/grpc_query.go b/x/evidence/keeper/grpc_query.go index be23db9dbdab..cf43ed49953e 100644 --- a/x/evidence/keeper/grpc_query.go +++ b/x/evidence/keeper/grpc_query.go @@ -61,7 +61,7 @@ func (k Keeper) AllEvidence(c context.Context, req *types.QueryAllEvidenceReques store := ctx.KVStore(k.storeKey) evidenceStore := prefix.NewStore(store, types.KeyPrefixEvidence) - res, err := query.Paginate(evidenceStore, req.Req, func(key []byte, value []byte) error { + res, err := query.Paginate(evidenceStore, req.Pagination, func(key []byte, value []byte) error { result, err := k.UnmarshalEvidence(value) if err != nil { return err diff --git a/x/evidence/types/querier.go b/x/evidence/types/querier.go index 826d0f494ecc..72f8a604d3e0 100644 --- a/x/evidence/types/querier.go +++ b/x/evidence/types/querier.go @@ -18,8 +18,8 @@ func NewQueryEvidenceRequest(hash tmbytes.HexBytes) *QueryEvidenceRequest { } // NewQueryAllEvidenceRequest creates a new instance of QueryAllEvidenceRequest. -func NewQueryAllEvidenceRequest(req *query.PageRequest) *QueryAllEvidenceRequest { - return &QueryAllEvidenceRequest{Req: req} +func NewQueryAllEvidenceRequest(pageReq *query.PageRequest) *QueryAllEvidenceRequest { + return &QueryAllEvidenceRequest{Pagination: pageReq} } // QueryAllEvidenceParams defines the parameters necessary for querying for all Evidence. diff --git a/x/evidence/types/query.pb.go b/x/evidence/types/query.pb.go index de7b2952725c..fffaa13b86aa 100644 --- a/x/evidence/types/query.pb.go +++ b/x/evidence/types/query.pb.go @@ -123,7 +123,7 @@ func (m *QueryEvidenceResponse) GetEvidence() *types.Any { // QueryEvidenceRequest is the request type for the Query/AllEvidence RPC method type QueryAllEvidenceRequest struct { - Req *query.PageRequest `protobuf:"bytes,1,opt,name=req,proto3" json:"req,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryAllEvidenceRequest) Reset() { *m = QueryAllEvidenceRequest{} } @@ -159,9 +159,9 @@ func (m *QueryAllEvidenceRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryAllEvidenceRequest proto.InternalMessageInfo -func (m *QueryAllEvidenceRequest) GetReq() *query.PageRequest { +func (m *QueryAllEvidenceRequest) GetPagination() *query.PageRequest { if m != nil { - return m.Req + return m.Pagination } return nil } @@ -229,32 +229,33 @@ func init() { func init() { proto.RegisterFile("cosmos/evidence/query.proto", fileDescriptor_6afffc78347cbc5e) } var fileDescriptor_6afffc78347cbc5e = []byte{ - // 400 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xc1, 0x6a, 0xdb, 0x30, - 0x18, 0xc7, 0xed, 0x85, 0x8d, 0xa0, 0x64, 0x0c, 0x44, 0xc6, 0x12, 0x8f, 0x79, 0xc3, 0xb0, 0x91, - 0xb1, 0x45, 0x1a, 0x59, 0x0f, 0xbd, 0x26, 0xd0, 0x36, 0xbd, 0xb5, 0x3e, 0xb6, 0x94, 0x62, 0xc7, - 0xaa, 0x6d, 0xea, 0x48, 0x8e, 0x25, 0x97, 0xb8, 0x4f, 0xd1, 0xc7, 0x2a, 0x3d, 0xe5, 0xd8, 0x53, - 0x29, 0xc9, 0x5b, 0xf4, 0x54, 0x2c, 0x5b, 0x6d, 0x48, 0x0c, 0xe9, 0x29, 0x5f, 0xac, 0x9f, 0xff, - 0xbf, 0x4f, 0x9f, 0x64, 0xf0, 0x75, 0xcc, 0xf8, 0x84, 0x71, 0x4c, 0xae, 0x42, 0x8f, 0xd0, 0x31, - 0xc1, 0xd3, 0x94, 0x24, 0x19, 0x8a, 0x13, 0x26, 0x18, 0xfc, 0x54, 0x2c, 0x22, 0xb5, 0x68, 0x7c, - 0x2b, 0x69, 0x09, 0xe1, 0xd8, 0xf1, 0x43, 0xea, 0x88, 0x90, 0xd1, 0x82, 0x37, 0x5a, 0x3e, 0xf3, - 0x99, 0x2c, 0x71, 0x5e, 0x95, 0x4f, 0x3b, 0x3e, 0x63, 0x7e, 0x44, 0xb0, 0xfc, 0xe7, 0xa6, 0x17, - 0xd8, 0xa1, 0xa5, 0xc0, 0x4a, 0x41, 0xeb, 0x38, 0x8f, 0xda, 0x2b, 0x05, 0x36, 0x99, 0xa6, 0x84, - 0x0b, 0x78, 0x06, 0x3e, 0x2a, 0xe7, 0x79, 0xe0, 0xf0, 0xa0, 0xad, 0xff, 0xd0, 0xbb, 0xcd, 0xe1, - 0xee, 0xd3, 0xc3, 0xf7, 0x1d, 0x3f, 0x14, 0x41, 0xea, 0xa2, 0x31, 0x9b, 0x60, 0x41, 0xa8, 0x47, - 0x92, 0x49, 0x48, 0xc5, 0x6a, 0x19, 0x85, 0x2e, 0xc7, 0x6e, 0x26, 0x08, 0x47, 0x23, 0x32, 0x1b, - 0xe6, 0x85, 0xdd, 0x54, 0x71, 0x23, 0x87, 0x07, 0xd6, 0x21, 0xf8, 0xbc, 0xa6, 0xe5, 0x31, 0xa3, - 0x9c, 0xc0, 0x7f, 0xa0, 0xae, 0x40, 0xa9, 0x6c, 0xf4, 0x5b, 0xa8, 0xe8, 0x1e, 0xa9, 0xee, 0xd1, - 0x80, 0x66, 0xf6, 0x0b, 0x65, 0xed, 0x83, 0x2f, 0x32, 0x6a, 0x10, 0x45, 0xeb, 0x9b, 0xf8, 0x03, - 0x6a, 0x09, 0x99, 0x96, 0x39, 0x1d, 0x54, 0xce, 0xb2, 0x98, 0xef, 0x91, 0xe3, 0x2b, 0xce, 0xce, - 0x29, 0xeb, 0x1a, 0xb4, 0x37, 0x73, 0x2a, 0xbb, 0xaa, 0x6d, 0xef, 0x0a, 0xfe, 0xcd, 0xd5, 0xbc, - 0xfd, 0x4e, 0xaa, 0x8d, 0x2a, 0x75, 0x11, 0x9d, 0xbb, 0x79, 0xff, 0x4e, 0x07, 0xef, 0xa5, 0x1c, - 0x9e, 0x82, 0xba, 0xb2, 0xc3, 0x9f, 0x68, 0xed, 0xf4, 0x51, 0xd5, 0x51, 0x19, 0xbf, 0xb6, 0x61, - 0x85, 0xc9, 0xd2, 0xa0, 0x07, 0x1a, 0x2b, 0xbb, 0x83, 0xdd, 0xea, 0x17, 0x37, 0x07, 0x69, 0xfc, - 0x7e, 0x03, 0xa9, 0x2c, 0xc3, 0x83, 0xdb, 0x85, 0xa9, 0xcf, 0x17, 0xa6, 0xfe, 0xb8, 0x30, 0xf5, - 0x9b, 0xa5, 0xa9, 0xcd, 0x97, 0xa6, 0x76, 0xbf, 0x34, 0xb5, 0x93, 0xde, 0xca, 0xcd, 0x29, 0xef, - 0x71, 0xf1, 0xd3, 0xe3, 0xde, 0x25, 0x9e, 0xbd, 0x7e, 0x02, 0x22, 0x8b, 0x09, 0x77, 0x3f, 0xc8, - 0xd9, 0xfe, 0x7f, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x6a, 0xbc, 0xe1, 0xb4, 0x22, 0x03, 0x00, 0x00, + // 403 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x41, 0x6b, 0xdb, 0x30, + 0x1c, 0xc5, 0xed, 0x85, 0x8d, 0xa0, 0x64, 0x0c, 0x44, 0xc6, 0x12, 0x8f, 0x79, 0xc3, 0xb0, 0x91, + 0xc1, 0x22, 0x8d, 0x6c, 0x87, 0xed, 0x98, 0xc0, 0x58, 0x76, 0x5b, 0x4d, 0x4f, 0x2d, 0xa5, 0xd8, + 0xb1, 0x6a, 0x9b, 0x3a, 0x92, 0x63, 0xc9, 0x25, 0xee, 0xa7, 0xe8, 0xc7, 0x2a, 0x3d, 0xe5, 0xd8, + 0x53, 0x29, 0xc9, 0xb7, 0xe8, 0xa9, 0x58, 0xb6, 0x1a, 0x93, 0x18, 0xd2, 0x93, 0xff, 0xb6, 0x7e, + 0x7e, 0xef, 0xe9, 0x59, 0x06, 0xef, 0xa7, 0x8c, 0xcf, 0x18, 0xc7, 0xe4, 0x22, 0xf4, 0x08, 0x9d, + 0x12, 0x3c, 0x4f, 0x49, 0x92, 0xa1, 0x38, 0x61, 0x82, 0xc1, 0x37, 0xc5, 0x22, 0x52, 0x8b, 0xc6, + 0x87, 0x92, 0x96, 0x10, 0x8e, 0x1d, 0x3f, 0xa4, 0x8e, 0x08, 0x19, 0x2d, 0x78, 0xa3, 0xe3, 0x33, + 0x9f, 0xc9, 0x11, 0xe7, 0x53, 0xf9, 0xb4, 0xe7, 0x33, 0xe6, 0x47, 0x04, 0xcb, 0x3b, 0x37, 0x3d, + 0xc3, 0x0e, 0x2d, 0x0d, 0xac, 0x14, 0x74, 0x0e, 0x72, 0xa9, 0x3f, 0xa5, 0x81, 0x4d, 0xe6, 0x29, + 0xe1, 0x02, 0x9e, 0x80, 0xd7, 0xca, 0xf3, 0x34, 0x70, 0x78, 0xd0, 0xd5, 0x3f, 0xe9, 0xfd, 0xf6, + 0xf8, 0xd7, 0xc3, 0xdd, 0xc7, 0x9f, 0x7e, 0x28, 0x82, 0xd4, 0x45, 0x53, 0x36, 0xc3, 0x82, 0x50, + 0x8f, 0x24, 0xb3, 0x90, 0x8a, 0xea, 0x18, 0x85, 0x2e, 0xc7, 0x6e, 0x26, 0x08, 0x47, 0x13, 0xb2, + 0x18, 0xe7, 0x83, 0xdd, 0x56, 0x72, 0x13, 0x87, 0x07, 0xd6, 0x3f, 0xf0, 0x76, 0xcb, 0x96, 0xc7, + 0x8c, 0x72, 0x02, 0xbf, 0x83, 0xa6, 0x02, 0xa5, 0x65, 0x6b, 0xd8, 0x41, 0x45, 0x7a, 0xa4, 0xd2, + 0xa3, 0x11, 0xcd, 0xec, 0x27, 0xca, 0x3a, 0x04, 0xef, 0xa4, 0xd4, 0x28, 0x8a, 0xb6, 0x37, 0xf1, + 0x1b, 0x80, 0x4d, 0x43, 0xa5, 0x5c, 0x0f, 0x95, 0x95, 0x16, 0x35, 0xff, 0x77, 0x7c, 0x85, 0xdb, + 0x15, 0xd8, 0xba, 0x04, 0xdd, 0x5d, 0xd5, 0xda, 0x8c, 0x8d, 0xfd, 0x19, 0xe1, 0x37, 0xd0, 0x48, + 0x08, 0xef, 0xbe, 0x90, 0x09, 0x8c, 0xba, 0x04, 0x85, 0xb4, 0x9d, 0x63, 0xc3, 0x1b, 0x1d, 0xbc, + 0x94, 0xe6, 0xf0, 0x18, 0x34, 0x95, 0x3b, 0xfc, 0x8c, 0xb6, 0xce, 0x02, 0xaa, 0xfb, 0x70, 0xc6, + 0x97, 0x7d, 0x58, 0xe1, 0x64, 0x69, 0xd0, 0x03, 0xad, 0xca, 0xee, 0x60, 0xbf, 0xfe, 0xc5, 0xdd, + 0x5a, 0x8d, 0xaf, 0xcf, 0x20, 0x95, 0xcb, 0xf8, 0xef, 0xf5, 0xca, 0xd4, 0x97, 0x2b, 0x53, 0xbf, + 0x5f, 0x99, 0xfa, 0xd5, 0xda, 0xd4, 0x96, 0x6b, 0x53, 0xbb, 0x5d, 0x9b, 0xda, 0xd1, 0xa0, 0x72, + 0x8e, 0xca, 0x53, 0x5d, 0x5c, 0x06, 0xdc, 0x3b, 0xc7, 0x8b, 0xcd, 0x0f, 0x21, 0xb2, 0x98, 0x70, + 0xf7, 0x95, 0xec, 0xf6, 0xc7, 0x63, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb4, 0x0c, 0x57, 0x20, 0x30, + 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -462,9 +463,9 @@ func (m *QueryAllEvidenceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l - if m.Req != nil { + if m.Pagination != nil { { - size, err := m.Req.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -569,8 +570,8 @@ func (m *QueryAllEvidenceRequest) Size() (n int) { } var l int _ = l - if m.Req != nil { - l = m.Req.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -808,7 +809,7 @@ func (m *QueryAllEvidenceRequest) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Req", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -835,10 +836,10 @@ func (m *QueryAllEvidenceRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Req == nil { - m.Req = &query.PageRequest{} + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} } - if err := m.Req.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/gov/client/cli/query.go b/x/gov/client/cli/query.go index 47b7b91710d0..413029abafab 100644 --- a/x/gov/client/cli/query.go +++ b/x/gov/client/cli/query.go @@ -144,7 +144,7 @@ $ %s query gov proposals --page=2 --limit=100 ProposalStatus: proposalStatus, Voter: voterAddr, Depositor: depositorAddr, - Req: pageReq, + Pagination: pageReq, }, ) if err != nil { @@ -303,7 +303,7 @@ $ %[1]s query gov votes 1 --page=2 --limit=100 res, err := queryClient.Votes( context.Background(), - &types.QueryVotesRequest{ProposalId: proposalID, Req: pageReq}, + &types.QueryVotesRequest{ProposalId: proposalID, Pagination: pageReq}, ) if err != nil { return err @@ -450,7 +450,7 @@ $ %s query gov deposits 1 res, err := queryClient.Deposits( context.Background(), - &types.QueryDepositsRequest{ProposalId: proposalID, Req: pageReq}, + &types.QueryDepositsRequest{ProposalId: proposalID, Pagination: pageReq}, ) if err != nil { return err diff --git a/x/gov/keeper/grpc_query.go b/x/gov/keeper/grpc_query.go index 39f9c5f7e638..c3cc933c8fe7 100644 --- a/x/gov/keeper/grpc_query.go +++ b/x/gov/keeper/grpc_query.go @@ -41,7 +41,7 @@ func (q Keeper) Proposals(c context.Context, req *types.QueryProposalsRequest) ( store := ctx.KVStore(q.storeKey) proposalStore := prefix.NewStore(store, types.ProposalsKeyPrefix) - res, err := query.FilteredPaginate(proposalStore, req.Req, func(key []byte, value []byte, accumulate bool) (bool, error) { + res, err := query.FilteredPaginate(proposalStore, req.Pagination, func(key []byte, value []byte, accumulate bool) (bool, error) { var p types.Proposal if err := q.cdc.UnmarshalBinaryBare(value, &p); err != nil { return false, status.Error(codes.Internal, err.Error()) @@ -123,7 +123,7 @@ func (q Keeper) Votes(c context.Context, req *types.QueryVotesRequest) (*types.Q store := ctx.KVStore(q.storeKey) votesStore := prefix.NewStore(store, types.VotesKey(req.ProposalId)) - res, err := query.Paginate(votesStore, req.Req, func(key []byte, value []byte) error { + res, err := query.Paginate(votesStore, req.Pagination, func(key []byte, value []byte) error { var vote types.Vote if err := q.cdc.UnmarshalBinaryBare(value, &vote); err != nil { return err @@ -208,7 +208,7 @@ func (q Keeper) Deposits(c context.Context, req *types.QueryDepositsRequest) (*t store := ctx.KVStore(q.storeKey) depositStore := prefix.NewStore(store, types.DepositsKey(req.ProposalId)) - res, err := query.Paginate(depositStore, req.Req, func(key []byte, value []byte) error { + res, err := query.Paginate(depositStore, req.Pagination, func(key []byte, value []byte) error { var deposit types.Deposit if err := q.cdc.UnmarshalBinaryBare(value, &deposit); err != nil { return err diff --git a/x/gov/keeper/grpc_query_test.go b/x/gov/keeper/grpc_query_test.go index 9fb3aa5e7a67..77112985eaab 100644 --- a/x/gov/keeper/grpc_query_test.go +++ b/x/gov/keeper/grpc_query_test.go @@ -113,7 +113,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryProposals() { } req = &types.QueryProposalsRequest{ - Req: &query.PageRequest{Limit: 3}, + Pagination: &query.PageRequest{Limit: 3}, } expRes = &types.QueryProposalsResponse{ @@ -126,7 +126,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryProposals() { "request 2nd page with limit 4", func() { req = &types.QueryProposalsRequest{ - Req: &query.PageRequest{Offset: 3, Limit: 3}, + Pagination: &query.PageRequest{Offset: 3, Limit: 3}, } expRes = &types.QueryProposalsResponse{ @@ -139,7 +139,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryProposals() { "request with limit 2 and count true", func() { req = &types.QueryProposalsRequest{ - Req: &query.PageRequest{Limit: 2, CountTotal: true}, + Pagination: &query.PageRequest{Limit: 2, CountTotal: true}, } expRes = &types.QueryProposalsResponse{ diff --git a/x/gov/types/query.pb.go b/x/gov/types/query.pb.go index a3aa67de42ea..ba3794cbf9b4 100644 --- a/x/gov/types/query.pb.go +++ b/x/gov/types/query.pb.go @@ -7,9 +7,9 @@ import ( context "context" fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" - grpc1 "github.com/gogo/protobuf/grpc" query "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/gogo/protobuf/gogoproto" + grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -128,8 +128,8 @@ type QueryProposalsRequest struct { // Voter address for the proposals. Voter github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,2,opt,name=voter,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"voter,omitempty"` // Deposit addresses from the proposals. - Depositor github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,3,opt,name=depositor,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"depositor,omitempty"` - Req *query.PageRequest `protobuf:"bytes,4,opt,name=req,proto3" json:"req,omitempty"` + Depositor github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,3,opt,name=depositor,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"depositor,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,4,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryProposalsRequest) Reset() { *m = QueryProposalsRequest{} } @@ -186,9 +186,9 @@ func (m *QueryProposalsRequest) GetDepositor() github_com_cosmos_cosmos_sdk_type return nil } -func (m *QueryProposalsRequest) GetReq() *query.PageRequest { +func (m *QueryProposalsRequest) GetPagination() *query.PageRequest { if m != nil { - return m.Req + return m.Pagination } return nil } @@ -350,7 +350,7 @@ func (m *QueryVoteResponse) GetVote() Vote { type QueryVotesRequest struct { // unique id of the proposal ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id,omitempty"` - Req *query.PageRequest `protobuf:"bytes,2,opt,name=req,proto3" json:"req,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryVotesRequest) Reset() { *m = QueryVotesRequest{} } @@ -393,9 +393,9 @@ func (m *QueryVotesRequest) GetProposalId() uint64 { return 0 } -func (m *QueryVotesRequest) GetReq() *query.PageRequest { +func (m *QueryVotesRequest) GetPagination() *query.PageRequest { if m != nil { - return m.Req + return m.Pagination } return nil } @@ -663,7 +663,7 @@ func (m *QueryDepositResponse) GetDeposit() Deposit { type QueryDepositsRequest struct { // unique id of the proposal ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id,omitempty"` - Req *query.PageRequest `protobuf:"bytes,2,opt,name=req,proto3" json:"req,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryDepositsRequest) Reset() { *m = QueryDepositsRequest{} } @@ -706,9 +706,9 @@ func (m *QueryDepositsRequest) GetProposalId() uint64 { return 0 } -func (m *QueryDepositsRequest) GetReq() *query.PageRequest { +func (m *QueryDepositsRequest) GetPagination() *query.PageRequest { if m != nil { - return m.Req + return m.Pagination } return nil } @@ -879,58 +879,58 @@ func init() { func init() { proto.RegisterFile("cosmos/gov/query.proto", fileDescriptor_6efb1c1bc2595eda) } var fileDescriptor_6efb1c1bc2595eda = []byte{ - // 807 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4b, 0x4f, 0x13, 0x51, - 0x14, 0xee, 0xf4, 0x01, 0xed, 0x29, 0x20, 0x5e, 0x10, 0xea, 0x44, 0xda, 0x3a, 0xba, 0x20, 0x0a, - 0x6d, 0x84, 0xa0, 0xc6, 0x8d, 0x52, 0x7c, 0x86, 0x44, 0x60, 0x24, 0x2e, 0xd8, 0x90, 0xa1, 0x33, - 0x19, 0x1b, 0x4b, 0xef, 0x30, 0xf7, 0xb6, 0xb1, 0x09, 0x0b, 0x77, 0xae, 0x4c, 0xfc, 0x0f, 0xfe, - 0x19, 0x96, 0x2c, 0x5d, 0x11, 0x03, 0xfe, 0x0a, 0x57, 0x66, 0xee, 0x63, 0x3a, 0xd3, 0xe9, 0xd4, - 0xe2, 0x63, 0x45, 0x39, 0xf7, 0x3b, 0xdf, 0xfd, 0xce, 0x77, 0xce, 0x3d, 0x2d, 0xcc, 0xd5, 0x31, - 0x39, 0xc4, 0xa4, 0x6a, 0xe3, 0x4e, 0xf5, 0xa8, 0x6d, 0xb9, 0xdd, 0x8a, 0xe3, 0x62, 0x8a, 0x11, - 0xf0, 0x78, 0xc5, 0xc6, 0x1d, 0x75, 0x41, 0x60, 0xd8, 0x79, 0xd5, 0x31, 0xec, 0x46, 0xcb, 0xa0, - 0x0d, 0xdc, 0xe2, 0x50, 0x75, 0xd6, 0xc6, 0x36, 0x66, 0x1f, 0xab, 0xde, 0x27, 0x19, 0x0d, 0x10, - 0xdb, 0xb8, 0xc3, 0xa3, 0xda, 0x03, 0x98, 0xdd, 0xf1, 0x58, 0xb6, 0x5d, 0xec, 0x60, 0x62, 0x34, - 0x75, 0xeb, 0xa8, 0x6d, 0x11, 0x8a, 0x4a, 0x90, 0x77, 0x44, 0x68, 0xbf, 0x61, 0x16, 0x94, 0xb2, - 0xb2, 0x98, 0xd6, 0x41, 0x86, 0x5e, 0x99, 0xda, 0x16, 0x5c, 0xeb, 0x4b, 0x24, 0x0e, 0x6e, 0x11, - 0x0b, 0xdd, 0x87, 0xac, 0x84, 0xb1, 0xb4, 0xfc, 0xca, 0x6c, 0xa5, 0xa7, 0xbd, 0x22, 0xf1, 0xb5, - 0xf4, 0xc9, 0x59, 0x29, 0xa1, 0xfb, 0x58, 0xed, 0x6b, 0xb2, 0x8f, 0x91, 0x48, 0x2d, 0x1b, 0x70, - 0xc5, 0xd7, 0x42, 0xa8, 0x41, 0xdb, 0x84, 0x11, 0x4f, 0xad, 0xa8, 0x83, 0x88, 0xdf, 0x30, 0x84, - 0x3e, 0xe5, 0x84, 0xfe, 0x47, 0x2f, 0x20, 0xd3, 0xc1, 0xd4, 0x72, 0x0b, 0xc9, 0xb2, 0xb2, 0x38, - 0x51, 0xbb, 0xf7, 0xf3, 0xac, 0xb4, 0x6c, 0x37, 0xe8, 0xbb, 0xf6, 0x41, 0xa5, 0x8e, 0x0f, 0xab, - 0xc2, 0x1c, 0xfe, 0x67, 0x99, 0x98, 0xef, 0xab, 0xb4, 0xeb, 0x58, 0xa4, 0xb2, 0x5e, 0xaf, 0xaf, - 0x9b, 0xa6, 0x6b, 0x11, 0xa2, 0xf3, 0x7c, 0xb4, 0x05, 0x39, 0xd3, 0x72, 0x30, 0x69, 0x50, 0xec, - 0x16, 0x52, 0x7f, 0x4a, 0xd6, 0xe3, 0x40, 0x77, 0x21, 0xe5, 0x5a, 0x47, 0x85, 0x34, 0xf3, 0xea, - 0xba, 0x2c, 0x89, 0xf7, 0x7e, 0xdb, 0xb0, 0x2d, 0x61, 0x83, 0xee, 0xa1, 0xb4, 0x8f, 0x0a, 0xcc, - 0xf5, 0xbb, 0x24, 0x8c, 0x7f, 0x08, 0x39, 0x59, 0xb3, 0x67, 0x50, 0xea, 0x37, 0xce, 0xf7, 0xc0, - 0x68, 0xc9, 0x53, 0x40, 0x98, 0x33, 0xf9, 0x9e, 0xa9, 0x41, 0x05, 0xfc, 0x0a, 0x4f, 0x02, 0xd1, - 0x8e, 0x61, 0x9a, 0x29, 0x78, 0x8b, 0xa9, 0x35, 0xea, 0xb8, 0xfc, 0x33, 0xfb, 0xb5, 0xc7, 0x70, - 0x35, 0x70, 0xbb, 0x28, 0xfd, 0x0e, 0xa4, 0xbd, 0x53, 0x31, 0x6f, 0xd3, 0xc1, 0xaa, 0x3d, 0x9c, - 0xa8, 0x98, 0x61, 0x34, 0x23, 0x40, 0x40, 0x46, 0xd6, 0x2f, 0x9a, 0x94, 0x1c, 0xa9, 0x49, 0x0e, - 0xa0, 0xe0, 0x15, 0x42, 0xe4, 0x12, 0xb7, 0x40, 0xf6, 0x26, 0x4e, 0x25, 0x07, 0x5d, 0xb2, 0x27, - 0x6b, 0xe2, 0xc6, 0x6d, 0xc3, 0x35, 0x0e, 0x43, 0x55, 0xb1, 0xc0, 0xbe, 0xe7, 0x26, 0xab, 0x2a, - 0xa7, 0x03, 0x0f, 0xed, 0x76, 0x1d, 0x4b, 0xfb, 0xa1, 0xc0, 0x4c, 0x28, 0x4f, 0x48, 0xdd, 0x80, - 0xc9, 0x0e, 0xa6, 0x8d, 0x96, 0xbd, 0xcf, 0xc1, 0xc2, 0xd8, 0x42, 0x9f, 0xe4, 0x46, 0xcb, 0xe6, - 0x89, 0x42, 0xfa, 0x44, 0x27, 0x10, 0x43, 0xcf, 0x61, 0x4a, 0x0c, 0xb9, 0x64, 0xe9, 0x73, 0xcf, - 0x63, 0x79, 0xca, 0x11, 0x21, 0x9a, 0x49, 0x33, 0x18, 0x44, 0x4f, 0x60, 0x82, 0x1a, 0xcd, 0x66, - 0x57, 0xb2, 0xa4, 0x18, 0xcb, 0x7c, 0x90, 0x65, 0xd7, 0x3b, 0x0f, 0x71, 0xe4, 0x69, 0x2f, 0xa4, - 0x7d, 0x92, 0x65, 0x8a, 0xdb, 0x46, 0xee, 0x7a, 0xe8, 0xad, 0x27, 0xff, 0xfe, 0xad, 0x6b, 0x9b, - 0x62, 0xdd, 0xfa, 0x42, 0x84, 0xe1, 0xab, 0x30, 0x2e, 0x40, 0xc2, 0xea, 0x99, 0x01, 0x26, 0x89, - 0xd2, 0x24, 0x52, 0x33, 0xc3, 0x64, 0xff, 0x69, 0x98, 0x8f, 0xc5, 0x5a, 0xee, 0xdd, 0x22, 0x34, - 0xaf, 0x41, 0x56, 0x28, 0x91, 0x23, 0x3d, 0x44, 0xb4, 0x0f, 0xbd, 0xe4, 0x60, 0x3f, 0x82, 0x79, - 0x76, 0x3b, 0xeb, 0xb0, 0x6e, 0x91, 0x76, 0x93, 0x5e, 0xe2, 0x2b, 0xaa, 0x10, 0xcd, 0xf5, 0x0d, - 0xcf, 0xb0, 0x09, 0x11, 0x76, 0x47, 0xa7, 0x89, 0xe3, 0xe5, 0x9b, 0x64, 0xd8, 0x95, 0xcf, 0x19, - 0xc8, 0x30, 0x46, 0xb4, 0x03, 0x59, 0xb9, 0x4e, 0x51, 0x39, 0x98, 0x3b, 0xe8, 0xcb, 0x54, 0xbd, - 0x39, 0x04, 0xc1, 0xf5, 0x68, 0x09, 0xb4, 0x0b, 0x39, 0x7f, 0xa7, 0xa3, 0xf8, 0x0c, 0xd9, 0x65, - 0x55, 0x1b, 0x06, 0xf1, 0x59, 0x9f, 0x41, 0xda, 0xdb, 0x2d, 0xe8, 0x46, 0x04, 0x1d, 0x58, 0xdf, - 0xea, 0x42, 0xcc, 0xa9, 0x4f, 0xf3, 0x12, 0x32, 0x6c, 0x99, 0xa1, 0xc1, 0x48, 0x5f, 0x54, 0x31, - 0xee, 0xd8, 0x67, 0xda, 0x84, 0x31, 0xf1, 0xae, 0xa3, 0xd8, 0xd0, 0xf6, 0x52, 0x4b, 0xb1, 0xe7, - 0x3e, 0xd9, 0x6b, 0x18, 0x17, 0x63, 0x86, 0xa2, 0xe8, 0xf0, 0x63, 0x57, 0xcb, 0xf1, 0x00, 0x9f, - 0x6f, 0x07, 0xb2, 0x72, 0xcc, 0x51, 0x2c, 0x9e, 0xc4, 0xb7, 0xb5, 0xff, 0x8d, 0x68, 0x09, 0xb4, - 0x07, 0xf9, 0xc0, 0x3c, 0xa1, 0x5b, 0x91, 0x9c, 0xe8, 0x64, 0xab, 0xb7, 0x87, 0x83, 0x24, 0x77, - 0xad, 0x76, 0x72, 0x5e, 0x54, 0x4e, 0xcf, 0x8b, 0xca, 0xf7, 0xf3, 0xa2, 0xf2, 0xe5, 0xa2, 0x98, - 0x38, 0xbd, 0x28, 0x26, 0xbe, 0x5d, 0x14, 0x13, 0x7b, 0x8b, 0x43, 0x37, 0xd4, 0x07, 0xf6, 0x23, - 0x90, 0xed, 0xa9, 0x83, 0x31, 0xf6, 0x3b, 0x70, 0xf5, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4f, - 0xc2, 0x0e, 0x6f, 0x78, 0x0a, 0x00, 0x00, + // 809 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4b, 0x4f, 0x13, 0x51, + 0x14, 0xee, 0xf4, 0x01, 0xed, 0x29, 0x20, 0x5e, 0x10, 0xea, 0x44, 0xda, 0x7a, 0x75, 0x41, 0x0c, + 0xb4, 0x11, 0x82, 0xaf, 0x8d, 0x52, 0x7c, 0x86, 0x44, 0x60, 0x24, 0x2e, 0xd8, 0x90, 0xa1, 0x9d, + 0x8c, 0x8d, 0xa5, 0x77, 0x98, 0x7b, 0xdb, 0xd8, 0x84, 0x85, 0x3b, 0x57, 0x26, 0xfe, 0x15, 0xff, + 0x05, 0x4b, 0x96, 0xae, 0x88, 0x01, 0x7f, 0x85, 0x2b, 0x33, 0xf7, 0x31, 0x9d, 0x69, 0x3b, 0x95, + 0xaa, 0x71, 0x45, 0x39, 0xf7, 0x3b, 0xdf, 0xfd, 0xce, 0x77, 0xce, 0x3d, 0x2d, 0xcc, 0x55, 0x09, + 0x3d, 0x24, 0xb4, 0x6c, 0x93, 0x76, 0xf9, 0xa8, 0x65, 0xb9, 0x9d, 0x92, 0xe3, 0x12, 0x46, 0x10, + 0x88, 0x78, 0xc9, 0x26, 0x6d, 0x7d, 0x41, 0x62, 0xf8, 0x79, 0xd9, 0x31, 0xed, 0x7a, 0xd3, 0x64, + 0x75, 0xd2, 0x14, 0x50, 0x7d, 0xd6, 0x26, 0x36, 0xe1, 0x1f, 0xcb, 0xde, 0x27, 0x15, 0x0d, 0x10, + 0xdb, 0xa4, 0x2d, 0xa2, 0xf8, 0x3e, 0xcc, 0xee, 0x78, 0x2c, 0xdb, 0x2e, 0x71, 0x08, 0x35, 0x1b, + 0x86, 0x75, 0xd4, 0xb2, 0x28, 0x43, 0x05, 0xc8, 0x3a, 0x32, 0xb4, 0x5f, 0xaf, 0xe5, 0xb4, 0xa2, + 0xb6, 0x98, 0x34, 0x40, 0x85, 0x5e, 0xd5, 0xf0, 0x16, 0x5c, 0xeb, 0x49, 0xa4, 0x0e, 0x69, 0x52, + 0x0b, 0xdd, 0x83, 0xb4, 0x82, 0xf1, 0xb4, 0xec, 0xca, 0x6c, 0xa9, 0xab, 0xbd, 0xa4, 0xf0, 0x95, + 0xe4, 0xc9, 0x59, 0x21, 0x66, 0xf8, 0x58, 0xfc, 0x35, 0xde, 0xc3, 0x48, 0x95, 0x96, 0x0d, 0xb8, + 0xe2, 0x6b, 0xa1, 0xcc, 0x64, 0x2d, 0xca, 0x89, 0xa7, 0x56, 0xf4, 0x41, 0xc4, 0x6f, 0x38, 0xc2, + 0x98, 0x72, 0x42, 0xff, 0xa3, 0x17, 0x90, 0x6a, 0x13, 0x66, 0xb9, 0xb9, 0x78, 0x51, 0x5b, 0x9c, + 0xa8, 0xdc, 0xfd, 0x79, 0x56, 0x58, 0xb6, 0xeb, 0xec, 0x5d, 0xeb, 0xa0, 0x54, 0x25, 0x87, 0x65, + 0x69, 0x8e, 0xf8, 0xb3, 0x4c, 0x6b, 0xef, 0xcb, 0xac, 0xe3, 0x58, 0xb4, 0xb4, 0x5e, 0xad, 0xae, + 0xd7, 0x6a, 0xae, 0x45, 0xa9, 0x21, 0xf2, 0xd1, 0x16, 0x64, 0x6a, 0x96, 0x43, 0x68, 0x9d, 0x11, + 0x37, 0x97, 0xf8, 0x53, 0xb2, 0x2e, 0x07, 0x7a, 0x08, 0xd0, 0x6d, 0x61, 0x2e, 0xc9, 0x2d, 0xbb, + 0xae, 0x2a, 0x13, 0x23, 0xb0, 0x6d, 0xda, 0x96, 0x74, 0xc3, 0x08, 0x80, 0xf1, 0x47, 0x0d, 0xe6, + 0x7a, 0x3d, 0x93, 0x6d, 0x78, 0x00, 0x19, 0xe5, 0x80, 0x67, 0x57, 0xe2, 0x37, 0x7d, 0xe8, 0x82, + 0xd1, 0x12, 0x24, 0x5c, 0x8b, 0x72, 0x9f, 0xb2, 0x5d, 0x8b, 0x83, 0x42, 0xc4, 0x15, 0x86, 0x07, + 0xc3, 0xc7, 0x30, 0xcd, 0x15, 0xbc, 0x25, 0xcc, 0xba, 0xec, 0xf0, 0xfc, 0xb3, 0x66, 0xe0, 0xc7, + 0x70, 0x35, 0x70, 0xbb, 0x2c, 0xfd, 0x0e, 0x24, 0xbd, 0x53, 0x39, 0x7d, 0xd3, 0xc1, 0xaa, 0x3d, + 0x9c, 0xac, 0x98, 0x63, 0x30, 0x09, 0x10, 0xd0, 0x4b, 0xeb, 0x0f, 0xb7, 0x2c, 0x3e, 0x4a, 0xcb, + 0x1c, 0x40, 0xc1, 0x0b, 0xa5, 0xe4, 0x25, 0x61, 0x88, 0xea, 0x54, 0x94, 0x66, 0x01, 0x1a, 0xb1, + 0x43, 0x6b, 0xf2, 0xc6, 0x6d, 0xd3, 0x35, 0x0f, 0x43, 0x35, 0xf2, 0xc0, 0xbe, 0xe7, 0x2d, 0xaf, + 0x31, 0xe3, 0x09, 0xf5, 0x42, 0xbb, 0x1d, 0xc7, 0xc2, 0x3f, 0x34, 0x98, 0x09, 0xe5, 0x49, 0xa9, + 0x1b, 0x30, 0xd9, 0x26, 0xac, 0xde, 0xb4, 0xf7, 0x05, 0x58, 0xda, 0x9c, 0xeb, 0x91, 0x5c, 0x6f, + 0xda, 0x22, 0x51, 0x4a, 0x9f, 0x68, 0x07, 0x62, 0xe8, 0x39, 0x4c, 0xc9, 0x07, 0xa0, 0x58, 0x7a, + 0x4c, 0xf4, 0x58, 0x9e, 0x0a, 0x44, 0x88, 0x66, 0xb2, 0x16, 0x0c, 0xa2, 0x27, 0x30, 0xc1, 0xcc, + 0x46, 0xa3, 0xa3, 0x58, 0x12, 0x9c, 0x65, 0x3e, 0xc8, 0xb2, 0xeb, 0x9d, 0x87, 0x38, 0xb2, 0xac, + 0x1b, 0xc2, 0x9f, 0x54, 0x99, 0xf2, 0xb6, 0x4b, 0xcf, 0x40, 0x68, 0x0f, 0xc4, 0xff, 0x7e, 0x0f, + 0xe0, 0x4d, 0xb9, 0x8a, 0x7d, 0x21, 0xd2, 0xf0, 0x55, 0x18, 0x97, 0x20, 0x69, 0xf5, 0xcc, 0x00, + 0x93, 0x64, 0x69, 0x0a, 0x89, 0xdd, 0x30, 0xd9, 0x7f, 0x19, 0xed, 0x63, 0xb9, 0xc0, 0xbb, 0x77, + 0xca, 0x0a, 0xd6, 0x20, 0x2d, 0x75, 0xa9, 0x01, 0x1f, 0x52, 0x82, 0x0f, 0x1d, 0x71, 0xcc, 0x1f, + 0xc1, 0x3c, 0xbf, 0x9d, 0xf7, 0xdb, 0xb0, 0x68, 0xab, 0xc1, 0x46, 0xf8, 0x32, 0xcb, 0xf5, 0xe7, + 0xfa, 0xf6, 0xa7, 0xf8, 0xbc, 0x48, 0xf3, 0xfb, 0x67, 0x4b, 0xe0, 0xd5, 0x0b, 0xe5, 0xd8, 0x95, + 0xcf, 0x29, 0x48, 0x71, 0x46, 0xb4, 0x03, 0x69, 0xb5, 0x6a, 0x51, 0x31, 0x98, 0x3b, 0xe8, 0x6b, + 0x57, 0xbf, 0x39, 0x04, 0x21, 0xf4, 0xe0, 0x18, 0xda, 0x85, 0x8c, 0xbf, 0xef, 0x51, 0x74, 0x86, + 0xea, 0xb9, 0x8e, 0x87, 0x41, 0x7c, 0xd6, 0x67, 0x90, 0xf4, 0x36, 0x0d, 0xba, 0xd1, 0x87, 0x0e, + 0xac, 0x76, 0x7d, 0x21, 0xe2, 0xd4, 0xa7, 0x79, 0x09, 0x29, 0xbe, 0xda, 0xd0, 0x60, 0xa4, 0x2f, + 0x2a, 0x1f, 0x75, 0xec, 0x33, 0x6d, 0xc2, 0x98, 0x7c, 0xe5, 0xfd, 0xd8, 0xd0, 0x2e, 0xd3, 0x0b, + 0x91, 0xe7, 0x3e, 0xd9, 0x6b, 0x18, 0x97, 0x63, 0x86, 0xfa, 0xd1, 0xe1, 0xa7, 0xaf, 0x17, 0xa3, + 0x01, 0x3e, 0xdf, 0x0e, 0xa4, 0xd5, 0x98, 0xa3, 0x48, 0x3c, 0x8d, 0x6e, 0x6b, 0xef, 0x1b, 0xc1, + 0x31, 0xb4, 0x07, 0xd9, 0xc0, 0x3c, 0xa1, 0x5b, 0x7d, 0x39, 0xfd, 0x93, 0xad, 0xdf, 0x1e, 0x0e, + 0x52, 0xdc, 0x95, 0xca, 0xc9, 0x79, 0x5e, 0x3b, 0x3d, 0xcf, 0x6b, 0xdf, 0xcf, 0xf3, 0xda, 0x97, + 0x8b, 0x7c, 0xec, 0xf4, 0x22, 0x1f, 0xfb, 0x76, 0x91, 0x8f, 0xed, 0x2d, 0x0e, 0xdd, 0x57, 0x1f, + 0xf8, 0xcf, 0x45, 0xbe, 0xb5, 0x0e, 0xc6, 0xf8, 0x2f, 0xc6, 0xd5, 0x5f, 0x01, 0x00, 0x00, 0xff, + 0xff, 0xcc, 0x3b, 0x6c, 0xf4, 0xa2, 0x0a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1362,9 +1362,9 @@ func (m *QueryProposalsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Req != nil { + if m.Pagination != nil { { - size, err := m.Req.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1533,9 +1533,9 @@ func (m *QueryVotesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Req != nil { + if m.Pagination != nil { { - size, err := m.Req.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1773,9 +1773,9 @@ func (m *QueryDepositsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Req != nil { + if m.Pagination != nil { { - size, err := m.Req.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1954,8 +1954,8 @@ func (m *QueryProposalsRequest) Size() (n int) { if l > 0 { n += 1 + l + sovQuery(uint64(l)) } - if m.Req != nil { - l = m.Req.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -2016,8 +2016,8 @@ func (m *QueryVotesRequest) Size() (n int) { if m.ProposalId != 0 { n += 1 + sovQuery(uint64(m.ProposalId)) } - if m.Req != nil { - l = m.Req.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -2106,8 +2106,8 @@ func (m *QueryDepositsRequest) Size() (n int) { if m.ProposalId != 0 { n += 1 + sovQuery(uint64(m.ProposalId)) } - if m.Req != nil { - l = m.Req.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -2437,7 +2437,7 @@ func (m *QueryProposalsRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Req", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -2464,10 +2464,10 @@ func (m *QueryProposalsRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Req == nil { - m.Req = &query.PageRequest{} + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} } - if err := m.Req.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -2860,7 +2860,7 @@ func (m *QueryVotesRequest) Unmarshal(dAtA []byte) error { } case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Req", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -2887,10 +2887,10 @@ func (m *QueryVotesRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Req == nil { - m.Req = &query.PageRequest{} + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} } - if err := m.Req.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -3520,7 +3520,7 @@ func (m *QueryDepositsRequest) Unmarshal(dAtA []byte) error { } case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Req", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -3547,10 +3547,10 @@ func (m *QueryDepositsRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Req == nil { - m.Req = &query.PageRequest{} + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} } - if err := m.Req.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/ibc/03-connection/client/cli/query.go b/x/ibc/03-connection/client/cli/query.go index ed48a8aa6ce3..d25eb8cea74e 100644 --- a/x/ibc/03-connection/client/cli/query.go +++ b/x/ibc/03-connection/client/cli/query.go @@ -37,7 +37,7 @@ func GetCmdQueryConnections() *cobra.Command { limit, _ := cmd.Flags().GetInt(flags.FlagLimit) req := &types.QueryConnectionsRequest{ - Req: &query.PageRequest{ + Pagination: &query.PageRequest{ Offset: uint64(offset), Limit: uint64(limit), }, diff --git a/x/ibc/03-connection/client/rest/query.go b/x/ibc/03-connection/client/rest/query.go index 56a4e6804e60..35416fa8b035 100644 --- a/x/ibc/03-connection/client/rest/query.go +++ b/x/ibc/03-connection/client/rest/query.go @@ -31,7 +31,7 @@ func queryConnectionsHandlerFn(clientCtx client.Context) http.HandlerFunc { queryClient := types.NewQueryClient(clientCtx) req := &types.QueryConnectionsRequest{ - Req: &query.PageRequest{}, + Pagination: &query.PageRequest{}, } res, err := queryClient.Connections(context.Background(), req) diff --git a/x/ibc/03-connection/keeper/grpc_query.go b/x/ibc/03-connection/keeper/grpc_query.go index 1c44b1b41ac4..bacb3e874b32 100644 --- a/x/ibc/03-connection/keeper/grpc_query.go +++ b/x/ibc/03-connection/keeper/grpc_query.go @@ -52,7 +52,7 @@ func (q Keeper) Connections(c context.Context, req *types.QueryConnectionsReques connections := []*types.ConnectionEnd{} store := prefix.NewStore(ctx.KVStore(q.storeKey), host.KeyConnectionPrefix) - res, err := query.Paginate(store, req.Req, func(_, value []byte) error { + res, err := query.Paginate(store, req.Pagination, func(_, value []byte) error { var result types.ConnectionEnd if err := q.cdc.UnmarshalBinaryBare(value, &result); err != nil { return err diff --git a/x/ibc/03-connection/keeper/grpc_query_test.go b/x/ibc/03-connection/keeper/grpc_query_test.go index 0afc941116ab..79bf61817df3 100644 --- a/x/ibc/03-connection/keeper/grpc_query_test.go +++ b/x/ibc/03-connection/keeper/grpc_query_test.go @@ -126,7 +126,7 @@ func (suite *KeeperTestSuite) TestQueryConnections() { expConnections = []*types.ConnectionEnd{&conn1, &conn2, &conn3} req = &types.QueryConnectionsRequest{ - Req: &query.PageRequest{ + Pagination: &query.PageRequest{ Limit: 3, CountTotal: true, }, diff --git a/x/ibc/03-connection/types/query.pb.go b/x/ibc/03-connection/types/query.pb.go index 4083182b492c..c69f30cfa183 100644 --- a/x/ibc/03-connection/types/query.pb.go +++ b/x/ibc/03-connection/types/query.pb.go @@ -152,7 +152,7 @@ func (m *QueryConnectionResponse) GetProofHeight() uint64 { // QueryConnectionsRequest is the request type for the Query/Connections RPC method type QueryConnectionsRequest struct { - Req *query.PageRequest `protobuf:"bytes,1,opt,name=req,proto3" json:"req,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryConnectionsRequest) Reset() { *m = QueryConnectionsRequest{} } @@ -188,9 +188,9 @@ func (m *QueryConnectionsRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryConnectionsRequest proto.InternalMessageInfo -func (m *QueryConnectionsRequest) GetReq() *query.PageRequest { +func (m *QueryConnectionsRequest) GetPagination() *query.PageRequest { if m != nil { - return m.Req + return m.Pagination } return nil } @@ -392,40 +392,41 @@ func init() { func init() { proto.RegisterFile("ibc/connection/query.proto", fileDescriptor_5ee60d8b08ce3606) } var fileDescriptor_5ee60d8b08ce3606 = []byte{ - // 527 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xc1, 0x6e, 0xd3, 0x40, - 0x10, 0xcd, 0x36, 0x6d, 0xd5, 0x4c, 0x02, 0x94, 0x55, 0x55, 0x8c, 0xa5, 0xb8, 0xc1, 0x07, 0x48, - 0x05, 0xb1, 0x51, 0x2a, 0xb8, 0x21, 0xa4, 0x52, 0x10, 0xe1, 0x42, 0xd8, 0x23, 0x97, 0x28, 0xb6, - 0x17, 0xdb, 0x82, 0x7a, 0x9d, 0xec, 0x46, 0xa2, 0x7f, 0xc1, 0x2f, 0x20, 0x7e, 0x80, 0x6f, 0xe0, - 0xc4, 0xb1, 0x47, 0x4e, 0x15, 0x72, 0x7e, 0x04, 0xed, 0xae, 0xd3, 0x35, 0x4d, 0xaa, 0x70, 0xe1, - 0x94, 0xdd, 0x9d, 0x37, 0x33, 0xef, 0xbd, 0x89, 0x07, 0xec, 0x34, 0x08, 0xfd, 0x90, 0x65, 0x19, - 0x0d, 0x45, 0xca, 0x32, 0x7f, 0x32, 0xa3, 0xd3, 0x33, 0x2f, 0x9f, 0x32, 0xc1, 0xf0, 0xcd, 0x34, - 0x08, 0x3d, 0x13, 0xb3, 0xf7, 0x62, 0x16, 0x33, 0x15, 0xf2, 0xe5, 0x49, 0xa3, 0xec, 0x76, 0xc8, - 0xf8, 0x29, 0xe3, 0x3a, 0xd3, 0xcf, 0xc7, 0x71, 0x9a, 0x8d, 0x25, 0xbc, 0x0c, 0x1f, 0x5c, 0x69, - 0x60, 0x8e, 0x1a, 0xe0, 0xbe, 0x85, 0xfd, 0x77, 0x32, 0xf5, 0xc5, 0x65, 0x80, 0xd0, 0xc9, 0x8c, - 0x72, 0x81, 0x9f, 0xc0, 0x0d, 0x83, 0x1e, 0xa5, 0x91, 0x85, 0x3a, 0xa8, 0xdb, 0x38, 0xde, 0x2d, - 0x2e, 0x0e, 0x5a, 0x06, 0x3d, 0x38, 0x21, 0x2d, 0x03, 0x1b, 0x44, 0xee, 0x77, 0x04, 0x77, 0x96, - 0x2a, 0xf2, 0x9c, 0x65, 0x9c, 0xe2, 0x67, 0x00, 0x06, 0xab, 0xea, 0x35, 0xfb, 0x6d, 0xef, 0x6f, - 0x9d, 0x9e, 0xc9, 0x7b, 0x99, 0x45, 0xa4, 0x92, 0x80, 0xf7, 0x60, 0x2b, 0x9f, 0x32, 0xf6, 0xc1, - 0xda, 0xe8, 0xa0, 0x6e, 0x8b, 0xe8, 0x0b, 0x6e, 0x03, 0xa8, 0xc3, 0x28, 0x1f, 0x8b, 0xc4, 0xaa, - 0x4b, 0x92, 0xa4, 0xa1, 0x5e, 0x86, 0x63, 0x91, 0xe0, 0x7b, 0xd0, 0xd2, 0xe1, 0x84, 0xa6, 0x71, - 0x22, 0xac, 0xcd, 0x0e, 0xea, 0x6e, 0x92, 0xa6, 0x7a, 0x7b, 0xad, 0x9e, 0xdc, 0x57, 0x4b, 0x8c, - 0xf9, 0xc2, 0x84, 0x87, 0x50, 0x9f, 0xd2, 0x49, 0x49, 0xf5, 0xae, 0xa7, 0xcd, 0xf6, 0xf4, 0x98, - 0x86, 0xe3, 0x98, 0x96, 0x38, 0x22, 0x51, 0xee, 0x57, 0x04, 0xd6, 0x72, 0xa1, 0x52, 0xfb, 0x73, - 0x68, 0x1a, 0x29, 0xdc, 0x42, 0x9d, 0xfa, 0x7a, 0xf1, 0xd5, 0x0c, 0xfc, 0x48, 0x52, 0xe1, 0x4a, - 0x7b, 0xb3, 0x6f, 0xaf, 0xa2, 0xa2, 0x3b, 0x49, 0x2e, 0x1c, 0xef, 0xc3, 0x76, 0x29, 0x58, 0x3a, - 0x52, 0x27, 0xe5, 0xcd, 0x7d, 0x03, 0x6d, 0x4d, 0xf1, 0x53, 0x4a, 0x33, 0xb1, 0x42, 0xf1, 0x21, - 0x34, 0x42, 0x15, 0x33, 0x23, 0x6f, 0x15, 0x17, 0x07, 0x3b, 0x3a, 0x61, 0x70, 0x42, 0x76, 0x74, - 0x78, 0x10, 0xb9, 0xdf, 0x10, 0x38, 0xd7, 0x15, 0x2b, 0x55, 0x1f, 0xc2, 0x6e, 0xe5, 0x4f, 0x24, - 0x27, 0xa4, 0xa5, 0x37, 0xc8, 0x2d, 0xf3, 0x2e, 0xe7, 0xc4, 0xff, 0xd7, 0x74, 0xfb, 0x3f, 0x36, - 0x60, 0x4b, 0xb1, 0xc4, 0x23, 0x00, 0xc3, 0x11, 0xdf, 0xbf, 0xea, 0xfd, 0xea, 0xef, 0xc0, 0x7e, - 0xb0, 0x16, 0xa7, 0xb5, 0xba, 0x35, 0x1c, 0x40, 0xb3, 0x62, 0x02, 0x5e, 0x97, 0xb9, 0xf0, 0xdc, - 0xee, 0xae, 0x07, 0x5e, 0xf6, 0x10, 0x70, 0x7b, 0xc9, 0x6e, 0xdc, 0x5b, 0x5d, 0xe0, 0x9a, 0x19, - 0xdb, 0xde, 0xbf, 0xc2, 0x17, 0x5d, 0x8f, 0x87, 0x3f, 0x0b, 0x07, 0x9d, 0x17, 0x0e, 0xfa, 0x5d, - 0x38, 0xe8, 0xcb, 0xdc, 0xa9, 0x9d, 0xcf, 0x9d, 0xda, 0xaf, 0xb9, 0x53, 0x7b, 0xff, 0x34, 0x4e, - 0x45, 0x32, 0x0b, 0xbc, 0x90, 0x9d, 0xfa, 0xe5, 0x2e, 0xd2, 0x3f, 0x3d, 0x1e, 0x7d, 0xf4, 0x3f, - 0xfb, 0x72, 0x01, 0x3d, 0x3e, 0xea, 0x55, 0x76, 0x90, 0x38, 0xcb, 0x29, 0x0f, 0xb6, 0xd5, 0xfe, - 0x39, 0xfa, 0x13, 0x00, 0x00, 0xff, 0xff, 0x8b, 0x7d, 0x4e, 0xc5, 0x03, 0x05, 0x00, 0x00, + // 529 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xcd, 0x6e, 0xd3, 0x40, + 0x10, 0xce, 0x36, 0x6d, 0xd5, 0x4c, 0x0c, 0x94, 0x55, 0x55, 0x8c, 0xa5, 0x38, 0xc1, 0x07, 0x48, + 0x25, 0x62, 0xa3, 0x54, 0x20, 0x71, 0x40, 0x48, 0xa5, 0x48, 0x84, 0x0b, 0x61, 0xc5, 0x89, 0x4b, + 0xe4, 0x9f, 0xc5, 0xb6, 0xa0, 0x5e, 0x37, 0xbb, 0x91, 0xe8, 0x5b, 0xf0, 0x0a, 0x88, 0x17, 0xe0, + 0x19, 0x38, 0x71, 0xec, 0x91, 0x53, 0x85, 0x9c, 0x17, 0x41, 0xde, 0x75, 0xba, 0xa6, 0x49, 0x15, + 0x2e, 0x9c, 0xbc, 0x3b, 0xf3, 0xcd, 0xcf, 0xf7, 0xcd, 0x7a, 0xc0, 0x4a, 0x83, 0xd0, 0x0b, 0x59, + 0x96, 0xd1, 0x50, 0xa4, 0x2c, 0xf3, 0x4e, 0x67, 0x74, 0x7a, 0xe6, 0xe6, 0x53, 0x26, 0x18, 0xbe, + 0x99, 0x06, 0xa1, 0xab, 0x7d, 0xd6, 0x5e, 0xcc, 0x62, 0x26, 0x5d, 0x5e, 0x79, 0x52, 0x28, 0xab, + 0x13, 0x32, 0x7e, 0xc2, 0xb8, 0x8a, 0xf4, 0x72, 0x3f, 0x4e, 0x33, 0xbf, 0x84, 0x57, 0xee, 0xee, + 0x95, 0x02, 0xfa, 0xa8, 0x00, 0xce, 0x1b, 0xd8, 0x7f, 0x5b, 0x86, 0xbe, 0xb8, 0x74, 0x10, 0x7a, + 0x3a, 0xa3, 0x5c, 0xe0, 0xc7, 0x70, 0x43, 0xa3, 0x27, 0x69, 0x64, 0xa2, 0x1e, 0xea, 0xb7, 0x8e, + 0x76, 0x8b, 0x8b, 0xae, 0xa1, 0xd1, 0xa3, 0x63, 0x62, 0x68, 0xd8, 0x28, 0x72, 0xbe, 0x23, 0xb8, + 0xb3, 0x94, 0x91, 0xe7, 0x2c, 0xe3, 0x14, 0x3f, 0x03, 0xd0, 0x58, 0x99, 0xaf, 0x3d, 0xec, 0xb8, + 0x7f, 0xf3, 0x74, 0x75, 0xdc, 0xcb, 0x2c, 0x22, 0xb5, 0x00, 0xbc, 0x07, 0x5b, 0xf9, 0x94, 0xb1, + 0x0f, 0xe6, 0x46, 0x0f, 0xf5, 0x0d, 0xa2, 0x2e, 0xb8, 0x03, 0x20, 0x0f, 0x93, 0xdc, 0x17, 0x89, + 0xd9, 0x2c, 0x9b, 0x24, 0x2d, 0x69, 0x19, 0xfb, 0x22, 0xc1, 0xf7, 0xc0, 0x50, 0xee, 0x84, 0xa6, + 0x71, 0x22, 0xcc, 0xcd, 0x1e, 0xea, 0x6f, 0x92, 0xb6, 0xb4, 0xbd, 0x92, 0x26, 0xe7, 0xdd, 0x52, + 0xc7, 0x7c, 0x21, 0xc2, 0x53, 0x00, 0xad, 0x69, 0xd5, 0xf1, 0x5d, 0x57, 0x69, 0xee, 0xaa, 0x69, + 0x8d, 0xfd, 0x98, 0x56, 0x70, 0x52, 0x03, 0x3b, 0x5f, 0x11, 0x98, 0xcb, 0x69, 0x2b, 0x25, 0x9e, + 0x43, 0x5b, 0x13, 0xe3, 0x26, 0xea, 0x35, 0xd7, 0x4b, 0x51, 0x8f, 0xc0, 0x0f, 0xa1, 0x39, 0xa5, + 0x5c, 0x2a, 0xd1, 0x1e, 0x5a, 0xab, 0x3a, 0x52, 0x95, 0x48, 0x09, 0xc3, 0xfb, 0xb0, 0x5d, 0xd1, + 0x2f, 0xf5, 0x69, 0x92, 0xea, 0xe6, 0xbc, 0x86, 0x8e, 0x6a, 0xf1, 0x53, 0x4a, 0x33, 0xb1, 0x82, + 0xff, 0x01, 0xb4, 0x42, 0xe9, 0xd3, 0x0f, 0xc0, 0x28, 0x2e, 0xba, 0x3b, 0x2a, 0x60, 0x74, 0x4c, + 0x76, 0x94, 0x7b, 0x14, 0x39, 0xdf, 0x10, 0xd8, 0xd7, 0x25, 0xab, 0x58, 0x1f, 0xc0, 0x6e, 0xed, + 0x49, 0x95, 0xf3, 0x52, 0xd4, 0x5b, 0xe4, 0x96, 0xb6, 0x97, 0x53, 0xe3, 0xff, 0x6b, 0xd6, 0xc3, + 0x1f, 0x1b, 0xb0, 0x25, 0xbb, 0xc4, 0x13, 0x00, 0xdd, 0x23, 0xbe, 0x7f, 0x55, 0xfb, 0xd5, 0x7f, + 0x85, 0xf5, 0x60, 0x2d, 0x4e, 0x71, 0x75, 0x1a, 0x38, 0x80, 0x76, 0x4d, 0x04, 0xbc, 0x2e, 0x72, + 0xa1, 0xb9, 0xd5, 0x5f, 0x0f, 0xbc, 0xac, 0x21, 0xe0, 0xf6, 0x92, 0xdc, 0x78, 0xb0, 0x3a, 0xc1, + 0x35, 0x33, 0xb6, 0xdc, 0x7f, 0x85, 0x2f, 0xaa, 0x1e, 0x8d, 0x7f, 0x16, 0x36, 0x3a, 0x2f, 0x6c, + 0xf4, 0xbb, 0xb0, 0xd1, 0x97, 0xb9, 0xdd, 0x38, 0x9f, 0xdb, 0x8d, 0x5f, 0x73, 0xbb, 0xf1, 0xfe, + 0x49, 0x9c, 0x8a, 0x64, 0x16, 0xb8, 0x21, 0x3b, 0xf1, 0xaa, 0xcd, 0xa4, 0x3e, 0x03, 0x1e, 0x7d, + 0xf4, 0x3e, 0x7b, 0xe5, 0x3a, 0x7a, 0x74, 0x38, 0xa8, 0x6d, 0x24, 0x71, 0x96, 0x53, 0x1e, 0x6c, + 0xcb, 0x6d, 0x74, 0xf8, 0x27, 0x00, 0x00, 0xff, 0xff, 0x85, 0x37, 0x97, 0x80, 0x11, 0x05, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -690,9 +691,9 @@ func (m *QueryConnectionsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l - if m.Req != nil { + if m.Pagination != nil { { - size, err := m.Req.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -894,8 +895,8 @@ func (m *QueryConnectionsRequest) Size() (n int) { } var l int _ = l - if m.Req != nil { - l = m.Req.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -1258,7 +1259,7 @@ func (m *QueryConnectionsRequest) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Req", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -1285,10 +1286,10 @@ func (m *QueryConnectionsRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Req == nil { - m.Req = &query.PageRequest{} + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} } - if err := m.Req.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/ibc/04-channel/client/cli/query.go b/x/ibc/04-channel/client/cli/query.go index 416ebd7e8296..5bf57cd90a7c 100644 --- a/x/ibc/04-channel/client/cli/query.go +++ b/x/ibc/04-channel/client/cli/query.go @@ -42,7 +42,7 @@ func GetCmdQueryChannels() *cobra.Command { limit, _ := cmd.Flags().GetInt(flags.FlagLimit) req := &types.QueryChannelsRequest{ - Req: &query.PageRequest{ + Pagination: &query.PageRequest{ Offset: uint64(offset), Limit: uint64(limit), }, @@ -124,7 +124,7 @@ func GetCmdQueryConnectionChannels() *cobra.Command { req := &types.QueryConnectionChannelsRequest{ Connection: args[0], - Req: &query.PageRequest{ + Pagination: &query.PageRequest{ Offset: uint64(offset), Limit: uint64(limit), }, @@ -203,7 +203,7 @@ func GetCmdQueryPacketCommitments() *cobra.Command { req := &types.QueryPacketCommitmentsRequest{ PortID: args[0], ChannelID: args[1], - Req: &query.PageRequest{ + Pagination: &query.PageRequest{ Offset: uint64(offset), Limit: uint64(limit), }, diff --git a/x/ibc/04-channel/keeper/grpc_query.go b/x/ibc/04-channel/keeper/grpc_query.go index c38a7566dcff..c830e45b29ff 100644 --- a/x/ibc/04-channel/keeper/grpc_query.go +++ b/x/ibc/04-channel/keeper/grpc_query.go @@ -51,7 +51,7 @@ func (q Keeper) Channels(c context.Context, req *types.QueryChannelsRequest) (*t channels := []*types.IdentifiedChannel{} store := prefix.NewStore(ctx.KVStore(q.storeKey), []byte(host.KeyChannelPrefix)) - res, err := query.Paginate(store, req.Req, func(key, value []byte) error { + res, err := query.Paginate(store, req.Pagination, func(key, value []byte) error { var result types.Channel if err := q.cdc.UnmarshalBinaryBare(value, &result); err != nil { return err @@ -93,7 +93,7 @@ func (q Keeper) ConnectionChannels(c context.Context, req *types.QueryConnection channels := []*types.IdentifiedChannel{} store := prefix.NewStore(ctx.KVStore(q.storeKey), []byte(host.KeyChannelPrefix)) - res, err := query.Paginate(store, req.Req, func(key, value []byte) error { + res, err := query.Paginate(store, req.Pagination, func(key, value []byte) error { var result types.Channel if err := q.cdc.UnmarshalBinaryBare(value, &result); err != nil { return err @@ -165,7 +165,7 @@ func (q Keeper) PacketCommitments(c context.Context, req *types.QueryPacketCommi commitments := []*types.PacketAckCommitment{} store := prefix.NewStore(ctx.KVStore(q.storeKey), []byte(host.PacketCommitmentPrefixPath(req.PortID, req.ChannelID))) - res, err := query.Paginate(store, req.Req, func(key, value []byte) error { + res, err := query.Paginate(store, req.Pagination, func(key, value []byte) error { keySplit := strings.Split(string(key), "/") sequence, err := strconv.ParseUint(keySplit[len(keySplit)-1], 10, 64) diff --git a/x/ibc/04-channel/keeper/grpc_query_test.go b/x/ibc/04-channel/keeper/grpc_query_test.go index 78f8159e30b5..5a0ba97a8552 100644 --- a/x/ibc/04-channel/keeper/grpc_query_test.go +++ b/x/ibc/04-channel/keeper/grpc_query_test.go @@ -153,7 +153,7 @@ func (suite *KeeperTestSuite) TestQueryChannels() { expChannels = []*types.IdentifiedChannel{&idCh0, &idCh1} req = &types.QueryChannelsRequest{ - Req: &query.PageRequest{ + Pagination: &query.PageRequest{ Key: nil, Limit: 2, CountTotal: true, @@ -245,7 +245,7 @@ func (suite *KeeperTestSuite) TestQueryConnectionChannels() { req = &types.QueryConnectionChannelsRequest{ Connection: connB0.ID, - Req: &query.PageRequest{ + Pagination: &query.PageRequest{ Key: nil, Limit: 2, CountTotal: true, @@ -261,7 +261,7 @@ func (suite *KeeperTestSuite) TestQueryConnectionChannels() { expChannels = []*types.IdentifiedChannel{} req = &types.QueryConnectionChannelsRequest{ Connection: "externalConnID", - Req: &query.PageRequest{ + Pagination: &query.PageRequest{ Key: nil, Limit: 2, CountTotal: false, @@ -425,7 +425,7 @@ func (suite *KeeperTestSuite) TestQueryPacketCommitments() { req = &types.QueryPacketCommitmentsRequest{ PortID: "test-port-id", ChannelID: "test-channel-id", - Req: &query.PageRequest{ + Pagination: &query.PageRequest{ Key: nil, Limit: 2, CountTotal: true, @@ -450,7 +450,7 @@ func (suite *KeeperTestSuite) TestQueryPacketCommitments() { req = &types.QueryPacketCommitmentsRequest{ PortID: channelA.PortID, ChannelID: channelA.ID, - Req: &query.PageRequest{ + Pagination: &query.PageRequest{ Key: nil, Limit: 11, CountTotal: true, diff --git a/x/ibc/04-channel/types/query.pb.go b/x/ibc/04-channel/types/query.pb.go index 7e417c264b29..6b00737d0351 100644 --- a/x/ibc/04-channel/types/query.pb.go +++ b/x/ibc/04-channel/types/query.pb.go @@ -162,7 +162,7 @@ func (m *QueryChannelResponse) GetProofHeight() uint64 { // QueryChannelsRequest is the request type for the Query/Channels RPC method type QueryChannelsRequest struct { // pagination request - Req *query.PageRequest `protobuf:"bytes,1,opt,name=req,proto3" json:"req,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryChannelsRequest) Reset() { *m = QueryChannelsRequest{} } @@ -198,9 +198,9 @@ func (m *QueryChannelsRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryChannelsRequest proto.InternalMessageInfo -func (m *QueryChannelsRequest) GetReq() *query.PageRequest { +func (m *QueryChannelsRequest) GetPagination() *query.PageRequest { if m != nil { - return m.Req + return m.Pagination } return nil } @@ -274,7 +274,7 @@ type QueryConnectionChannelsRequest struct { // connection unique identifier Connection string `protobuf:"bytes,1,opt,name=connection,proto3" json:"connection,omitempty"` // pagination request - Req *query.PageRequest `protobuf:"bytes,2,opt,name=req,proto3" json:"req,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryConnectionChannelsRequest) Reset() { *m = QueryConnectionChannelsRequest{} } @@ -317,9 +317,9 @@ func (m *QueryConnectionChannelsRequest) GetConnection() string { return "" } -func (m *QueryConnectionChannelsRequest) GetReq() *query.PageRequest { +func (m *QueryConnectionChannelsRequest) GetPagination() *query.PageRequest { if m != nil { - return m.Req + return m.Pagination } return nil } @@ -533,7 +533,7 @@ type QueryPacketCommitmentsRequest struct { // channel unique identifier ChannelID string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` // pagination request - Req *query.PageRequest `protobuf:"bytes,3,opt,name=req,proto3" json:"req,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,3,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryPacketCommitmentsRequest) Reset() { *m = QueryPacketCommitmentsRequest{} } @@ -583,9 +583,9 @@ func (m *QueryPacketCommitmentsRequest) GetChannelID() string { return "" } -func (m *QueryPacketCommitmentsRequest) GetReq() *query.PageRequest { +func (m *QueryPacketCommitmentsRequest) GetPagination() *query.PageRequest { if m != nil { - return m.Req + return m.Pagination } return nil } @@ -1181,65 +1181,66 @@ func init() { func init() { proto.RegisterFile("ibc/channel/query.proto", fileDescriptor_2150995751d4f15a) } var fileDescriptor_2150995751d4f15a = []byte{ - // 928 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0xcf, 0x6f, 0xe3, 0x44, + // 931 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0x41, 0x6f, 0xe3, 0x44, 0x14, 0x8e, 0x9b, 0x6c, 0xda, 0xbc, 0x14, 0xb1, 0x4c, 0x5b, 0x48, 0xcd, 0xd6, 0x4d, 0xcd, 0x25, - 0x6c, 0x5b, 0x07, 0x65, 0x39, 0x71, 0xdb, 0x76, 0x0f, 0xe4, 0x00, 0x0a, 0x5e, 0xed, 0x05, 0x09, - 0x45, 0xae, 0x33, 0x9b, 0x58, 0x69, 0x66, 0xdc, 0xcc, 0x64, 0x69, 0xf9, 0x1f, 0x90, 0x10, 0x17, - 0xc4, 0x05, 0x0e, 0x48, 0x1c, 0x38, 0xf0, 0x77, 0x70, 0xdc, 0x23, 0x17, 0x2a, 0x94, 0xfe, 0x1b, - 0x1c, 0x90, 0xe7, 0x87, 0xe3, 0x24, 0x76, 0xe5, 0x03, 0x16, 0x7b, 0x4a, 0xfc, 0xe6, 0x9b, 0xf7, - 0xbe, 0xf7, 0xcd, 0x37, 0xe3, 0x31, 0xbc, 0x17, 0x5c, 0xf8, 0x6d, 0x7f, 0xe4, 0x11, 0x82, 0x2f, - 0xdb, 0x57, 0x33, 0x3c, 0xbd, 0x71, 0xc2, 0x29, 0xe5, 0x14, 0xd5, 0x83, 0x0b, 0xdf, 0x51, 0x03, - 0xe6, 0xee, 0x90, 0x0e, 0xa9, 0x88, 0xb7, 0xa3, 0x7f, 0x12, 0x62, 0x1e, 0xf8, 0x94, 0x4d, 0x28, - 0x93, 0xd3, 0xda, 0xa1, 0x37, 0x0c, 0x88, 0xc7, 0x03, 0x4a, 0xd4, 0xf0, 0x7e, 0x32, 0xb5, 0xfa, - 0x95, 0x43, 0xf6, 0x08, 0x76, 0xbe, 0x88, 0x26, 0x9d, 0xcb, 0xa8, 0x8b, 0xaf, 0x66, 0x98, 0x71, - 0xf4, 0x01, 0x6c, 0x86, 0x74, 0xca, 0xfb, 0xc1, 0xa0, 0x61, 0x34, 0x8d, 0x56, 0xed, 0x0c, 0xe6, - 0xb7, 0x87, 0xd5, 0x1e, 0x9d, 0xf2, 0xee, 0x33, 0xb7, 0x1a, 0x0d, 0x75, 0x07, 0xe8, 0x04, 0x40, - 0x25, 0x8b, 0x70, 0x1b, 0x02, 0xf7, 0xd6, 0xfc, 0xf6, 0xb0, 0xa6, 0x92, 0x75, 0x9f, 0xb9, 0x35, - 0x05, 0xe8, 0x0e, 0xec, 0x9f, 0x0c, 0xd8, 0x5d, 0x2e, 0xc5, 0x42, 0x4a, 0x18, 0x46, 0x0e, 0x6c, - 0x2a, 0x94, 0xa8, 0x55, 0xef, 0xec, 0x3a, 0x89, 0x8e, 0x1d, 0x0d, 0xd7, 0x20, 0xb4, 0x0b, 0x0f, - 0xc2, 0x29, 0xa5, 0x2f, 0x45, 0xc5, 0x6d, 0x57, 0x3e, 0xa0, 0x03, 0x00, 0xf1, 0xa7, 0x1f, 0x7a, - 0x7c, 0xd4, 0x28, 0x47, 0x64, 0xdc, 0x9a, 0x88, 0xf4, 0x3c, 0x3e, 0x42, 0x47, 0xb0, 0x2d, 0x87, - 0x47, 0x38, 0x18, 0x8e, 0x78, 0xa3, 0xd2, 0x34, 0x5a, 0x15, 0xb7, 0x2e, 0x62, 0x9f, 0x8a, 0x90, - 0x7d, 0xbe, 0xcc, 0x8f, 0x69, 0x2d, 0x8e, 0xa1, 0x3c, 0xc5, 0x57, 0x8a, 0xdb, 0xbe, 0x23, 0xa5, - 0x76, 0xe4, 0x0a, 0xf5, 0xbc, 0x21, 0x56, 0x38, 0x37, 0x42, 0xd9, 0x3f, 0x1a, 0xb0, 0xb7, 0x92, - 0x45, 0xb5, 0xf9, 0x09, 0x6c, 0xa9, 0x0e, 0x58, 0xc3, 0x68, 0x96, 0x5b, 0xf5, 0x8e, 0xb5, 0xd4, - 0x67, 0x77, 0x80, 0x09, 0x0f, 0x5e, 0x06, 0x78, 0xa0, 0x3b, 0x8e, 0xf1, 0xe8, 0x24, 0xa2, 0xc0, - 0x44, 0xc3, 0xf5, 0x8e, 0x99, 0x46, 0x41, 0x16, 0x89, 0x38, 0x30, 0xf4, 0x2e, 0x54, 0x55, 0x97, - 0x91, 0x0c, 0x65, 0x57, 0x3d, 0xd9, 0x13, 0xb0, 0x24, 0x35, 0x4a, 0x08, 0xf6, 0x23, 0x7f, 0xac, - 0xb6, 0x6a, 0x01, 0xf8, 0xf1, 0xa0, 0x5c, 0x79, 0x37, 0x11, 0xd1, 0x52, 0x6c, 0xe4, 0x92, 0xe2, - 0x17, 0x03, 0x0e, 0x33, 0xeb, 0xbd, 0x31, 0xa2, 0x7c, 0x6b, 0xc0, 0x23, 0xc1, 0xb2, 0xe7, 0xf9, - 0x63, 0xcc, 0xcf, 0xe9, 0x64, 0x12, 0xf0, 0x09, 0x26, 0xbc, 0xb8, 0xad, 0x80, 0x4c, 0xd8, 0x62, - 0x51, 0x76, 0xe2, 0x63, 0xc1, 0xa6, 0xe2, 0xc6, 0xcf, 0xf6, 0x0f, 0x06, 0x1c, 0x64, 0xf0, 0x51, - 0x9a, 0x89, 0x45, 0xd2, 0x51, 0xc1, 0x69, 0xdb, 0x4d, 0x44, 0x0a, 0xdb, 0x1f, 0x3f, 0x67, 0x31, - 0x63, 0x05, 0x4a, 0xa5, 0x1c, 0x57, 0xce, 0xe5, 0xb8, 0xdf, 0x0c, 0xe5, 0xf0, 0x14, 0x86, 0x4a, - 0xbc, 0x33, 0xa8, 0x2f, 0xa4, 0xd2, 0x9e, 0x6b, 0x2e, 0x79, 0x4e, 0x4e, 0x7e, 0xea, 0x8f, 0x13, - 0xda, 0x27, 0x27, 0xfd, 0x47, 0xc6, 0xfb, 0xde, 0x80, 0xa3, 0x04, 0xd9, 0xa7, 0xfe, 0x98, 0xd0, - 0xaf, 0x2f, 0xf1, 0x60, 0x88, 0xff, 0x47, 0xf7, 0xfd, 0x6a, 0x80, 0x7d, 0x1f, 0x29, 0xa5, 0x62, - 0x0b, 0xde, 0xf6, 0x96, 0x87, 0x94, 0x0f, 0x57, 0xc3, 0x85, 0x99, 0xf1, 0x1f, 0xbd, 0x6d, 0x5f, - 0x90, 0x29, 0xbe, 0xf4, 0x6e, 0xf0, 0x40, 0x32, 0x2e, 0xd2, 0x8b, 0x5f, 0xc1, 0xfb, 0xa1, 0x28, - 0xd2, 0x5f, 0xb8, 0xa1, 0xaf, 0xa5, 0x63, 0x8d, 0x72, 0xb3, 0xdc, 0xaa, 0x9c, 0x1d, 0xcc, 0x6f, - 0x0f, 0xf7, 0x57, 0xfd, 0xf7, 0x5c, 0x83, 0xdc, 0xfd, 0x30, 0x6b, 0x08, 0x3d, 0x86, 0x87, 0x2b, - 0xea, 0x31, 0xd1, 0xf9, 0x96, 0xbb, 0x16, 0xb7, 0x5f, 0xa8, 0xad, 0xb8, 0xde, 0xbd, 0x5a, 0xa1, - 0x47, 0x50, 0x5b, 0x30, 0x8b, 0x5c, 0x5e, 0x71, 0x17, 0x81, 0x84, 0x27, 0x37, 0x96, 0x3c, 0xc9, - 0xd5, 0x89, 0xfd, 0x39, 0xbe, 0x8e, 0x89, 0xb9, 0xd8, 0xc7, 0xc1, 0x2b, 0x5c, 0xe0, 0xcd, 0xe0, - 0x77, 0x03, 0x9a, 0xd9, 0x65, 0x55, 0x43, 0x1d, 0xd8, 0x23, 0xf8, 0x7a, 0xa1, 0x77, 0x7f, 0x2a, - 0x01, 0x82, 0x45, 0xc5, 0xdd, 0x21, 0xeb, 0x73, 0x0b, 0x33, 0x1f, 0xd3, 0x2f, 0x52, 0xd9, 0xc2, - 0xf9, 0x65, 0x10, 0x2d, 0x24, 0xf7, 0x78, 0x91, 0x2a, 0xbd, 0x52, 0xc7, 0x85, 0x2e, 0x1a, 0xa9, - 0x42, 0xd8, 0x8c, 0x15, 0x5c, 0xb7, 0xf3, 0x57, 0x15, 0x1e, 0x88, 0xc2, 0xa8, 0x07, 0x9b, 0x0a, - 0x81, 0x96, 0x4f, 0xcc, 0x94, 0x1b, 0xa4, 0x79, 0x74, 0x0f, 0x42, 0x2e, 0xa9, 0x5d, 0x42, 0xcf, - 0x61, 0x4b, 0x5f, 0x09, 0x50, 0xf6, 0x04, 0xbd, 0xa7, 0x4d, 0xfb, 0x3e, 0x48, 0x9c, 0xf4, 0x0a, - 0xd0, 0xfa, 0x8d, 0x03, 0x1d, 0xa7, 0xcc, 0xcd, 0xba, 0x07, 0x99, 0x27, 0xf9, 0xc0, 0x71, 0xc9, - 0x31, 0x3c, 0x5c, 0xdd, 0xf2, 0xe8, 0xc3, 0xf5, 0x1c, 0x19, 0x57, 0x0c, 0xf3, 0x71, 0x1e, 0x68, - 0x5c, 0x8c, 0xc0, 0x3b, 0x6b, 0xef, 0x37, 0x94, 0x23, 0x45, 0xdc, 0xdd, 0x71, 0x2e, 0x6c, 0x5c, - 0xef, 0x1b, 0xd8, 0x4b, 0x7d, 0x1b, 0x20, 0x27, 0x2b, 0x4f, 0xfa, 0xbb, 0xcc, 0x6c, 0xe7, 0xc6, - 0x27, 0x85, 0x5d, 0x3d, 0xe2, 0xd2, 0x84, 0xcd, 0x78, 0x09, 0xa4, 0x09, 0x9b, 0x75, 0x62, 0xda, - 0x25, 0xc4, 0x61, 0x27, 0xe5, 0x04, 0x42, 0x29, 0x66, 0xc8, 0x3e, 0x1f, 0xcd, 0xd3, 0x9c, 0x68, - 0x5d, 0xf5, 0xec, 0xb3, 0x3f, 0xe6, 0x96, 0xf1, 0x7a, 0x6e, 0x19, 0x7f, 0xcf, 0x2d, 0xe3, 0xbb, - 0x3b, 0xab, 0xf4, 0xfa, 0xce, 0x2a, 0xfd, 0x79, 0x67, 0x95, 0xbe, 0x7c, 0x32, 0x0c, 0xf8, 0x68, - 0x76, 0xe1, 0xf8, 0x74, 0xd2, 0x56, 0x1f, 0x78, 0xf2, 0xe7, 0x94, 0x0d, 0xc6, 0xed, 0xeb, 0x76, - 0xf4, 0x55, 0xf7, 0xd1, 0xc7, 0xa7, 0xfa, 0xc3, 0x8e, 0xdf, 0x84, 0x98, 0x5d, 0x54, 0xc5, 0x77, - 0xdd, 0x93, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x4c, 0x49, 0xe7, 0x97, 0x4f, 0x0e, 0x00, 0x00, + 0xec, 0xb6, 0x0e, 0xca, 0x72, 0x81, 0xdb, 0xb6, 0x7b, 0x20, 0x07, 0x50, 0x76, 0x56, 0x7b, 0x41, + 0x42, 0x91, 0xeb, 0xcc, 0x26, 0x56, 0x9a, 0x19, 0x37, 0x33, 0x5d, 0x5a, 0xf8, 0x0d, 0x48, 0x88, + 0x0b, 0xe2, 0xc2, 0x05, 0x89, 0x03, 0x12, 0xfc, 0x0e, 0x8e, 0x7b, 0xe4, 0x42, 0x85, 0xd2, 0xbf, + 0xc1, 0x01, 0x79, 0x66, 0xec, 0x38, 0x8e, 0x5d, 0xa5, 0x12, 0x16, 0x9c, 0x12, 0xbf, 0xf9, 0xe6, + 0xbd, 0xef, 0x7d, 0xf3, 0xcd, 0x78, 0x0c, 0xef, 0xf8, 0xa7, 0x5e, 0xdb, 0x1b, 0xb9, 0x94, 0x92, + 0xb3, 0xf6, 0xf9, 0x05, 0x99, 0x5e, 0x39, 0xc1, 0x94, 0x09, 0x86, 0xea, 0xfe, 0xa9, 0xe7, 0xe8, + 0x01, 0x73, 0x7b, 0xc8, 0x86, 0x4c, 0xc6, 0xdb, 0xe1, 0x3f, 0x05, 0x31, 0xf7, 0x3c, 0xc6, 0x27, + 0x8c, 0xab, 0x69, 0xed, 0xc0, 0x1d, 0xfa, 0xd4, 0x15, 0x3e, 0xa3, 0x7a, 0x78, 0x37, 0x99, 0x5a, + 0xff, 0xaa, 0x21, 0x7b, 0x04, 0x5b, 0xcf, 0xc2, 0x49, 0x27, 0x2a, 0x8a, 0xc9, 0xf9, 0x05, 0xe1, + 0x02, 0xbd, 0x07, 0xeb, 0x01, 0x9b, 0x8a, 0xbe, 0x3f, 0x68, 0x18, 0x4d, 0xa3, 0x55, 0x3b, 0x86, + 0xd9, 0xf5, 0x7e, 0xb5, 0xc7, 0xa6, 0xa2, 0xfb, 0x14, 0x57, 0xc3, 0xa1, 0xee, 0x00, 0x1d, 0x02, + 0xe8, 0x64, 0x21, 0x6e, 0x4d, 0xe2, 0xde, 0x98, 0x5d, 0xef, 0xd7, 0x74, 0xb2, 0xee, 0x53, 0x5c, + 0xd3, 0x80, 0xee, 0xc0, 0xfe, 0xd1, 0x80, 0xed, 0xc5, 0x52, 0x3c, 0x60, 0x94, 0x13, 0xe4, 0xc0, + 0xba, 0x46, 0xc9, 0x5a, 0xf5, 0xce, 0xb6, 0x93, 0xe8, 0xd8, 0x89, 0xe0, 0x11, 0x08, 0x6d, 0xc3, + 0xbd, 0x60, 0xca, 0xd8, 0x4b, 0x59, 0x71, 0x13, 0xab, 0x07, 0xb4, 0x07, 0x20, 0xff, 0xf4, 0x03, + 0x57, 0x8c, 0x1a, 0xe5, 0x90, 0x0c, 0xae, 0xc9, 0x48, 0xcf, 0x15, 0x23, 0x74, 0x00, 0x9b, 0x6a, + 0x78, 0x44, 0xfc, 0xe1, 0x48, 0x34, 0x2a, 0x4d, 0xa3, 0x55, 0xc1, 0x75, 0x19, 0xfb, 0x44, 0x86, + 0xec, 0x67, 0x8b, 0xfc, 0x78, 0xa4, 0xc5, 0x47, 0x00, 0x73, 0x45, 0x35, 0xc5, 0x5d, 0x47, 0x29, + 0xee, 0xa8, 0x85, 0xea, 0xb9, 0x43, 0xa2, 0xe1, 0x38, 0x01, 0xb6, 0x7f, 0x30, 0x60, 0x27, 0x95, + 0x53, 0x37, 0xfd, 0x31, 0x6c, 0xe8, 0x7e, 0x78, 0xc3, 0x68, 0x96, 0x5b, 0xf5, 0x8e, 0xb5, 0xd0, + 0x75, 0x77, 0x40, 0xa8, 0xf0, 0x5f, 0xfa, 0x64, 0x10, 0xf5, 0x1f, 0xe3, 0xd1, 0x21, 0x94, 0xa7, + 0x84, 0xcb, 0xf6, 0xeb, 0x1d, 0x33, 0x8b, 0x89, 0x2a, 0x82, 0x43, 0x18, 0x7a, 0x1b, 0xaa, 0xba, + 0xe7, 0x50, 0x94, 0x32, 0xd6, 0x4f, 0xf6, 0xd7, 0x60, 0x29, 0x6a, 0x8c, 0x52, 0xe2, 0x85, 0x74, + 0xd3, 0x8d, 0x5b, 0x00, 0x5e, 0x3c, 0xa8, 0x7c, 0x80, 0x13, 0x91, 0x94, 0x30, 0x6b, 0x77, 0x11, + 0xe6, 0x27, 0x03, 0xf6, 0x73, 0xab, 0xff, 0x6f, 0x24, 0xfa, 0xc6, 0x80, 0x07, 0x92, 0x65, 0xcf, + 0xf5, 0xc6, 0x44, 0x9c, 0xb0, 0xc9, 0xc4, 0x17, 0x13, 0x42, 0x45, 0x71, 0xdb, 0x04, 0x99, 0xb0, + 0xc1, 0xc3, 0xec, 0xd4, 0x23, 0x92, 0x4d, 0x05, 0xc7, 0xcf, 0xf6, 0xf7, 0x06, 0xec, 0xe5, 0xf0, + 0xd1, 0x9a, 0xc9, 0x25, 0x8b, 0xa2, 0x92, 0xd3, 0x26, 0x4e, 0x44, 0x0a, 0xdb, 0x3b, 0xbf, 0xe6, + 0x31, 0xe3, 0x05, 0x4a, 0xb5, 0xe8, 0xbf, 0xf2, 0x5d, 0xfc, 0xf7, 0x8b, 0xa1, 0xdd, 0x9f, 0xc1, + 0x57, 0x4b, 0x79, 0x0c, 0xf5, 0xb9, 0x70, 0x91, 0x03, 0x9b, 0x0b, 0x0e, 0x54, 0x93, 0x9f, 0x78, + 0xe3, 0xc4, 0x4a, 0x24, 0x27, 0xfd, 0x4b, 0x36, 0xfc, 0xce, 0x80, 0x83, 0x04, 0xd9, 0x27, 0xde, + 0x98, 0xb2, 0x2f, 0xcf, 0xc8, 0x60, 0x48, 0xfe, 0x43, 0x2f, 0xfe, 0x6c, 0x80, 0x7d, 0x1b, 0x29, + 0xad, 0x62, 0x0b, 0xde, 0x74, 0x17, 0x87, 0xb4, 0x2b, 0xd3, 0xe1, 0xc2, 0xac, 0xf9, 0x77, 0xb4, + 0x89, 0x5f, 0xd0, 0x29, 0x39, 0x73, 0xaf, 0xc8, 0x40, 0x31, 0x2e, 0xd2, 0x99, 0x5f, 0xc0, 0xbb, + 0x81, 0x2c, 0xd2, 0x9f, 0xbb, 0xa1, 0x1f, 0x49, 0xc7, 0x1b, 0xe5, 0x66, 0xb9, 0x55, 0x39, 0xde, + 0x9b, 0x5d, 0xef, 0xef, 0xa6, 0xfd, 0xf7, 0x3c, 0x02, 0xe1, 0xdd, 0x20, 0x6f, 0x08, 0x3d, 0x84, + 0xfb, 0x29, 0xf5, 0xb8, 0xec, 0x7c, 0x03, 0x2f, 0xc5, 0xed, 0x17, 0x7a, 0x63, 0x2e, 0x77, 0xaf, + 0x57, 0xe8, 0x01, 0xd4, 0xe6, 0xcc, 0x42, 0x97, 0x57, 0xf0, 0x3c, 0x90, 0xf0, 0xe4, 0xda, 0x82, + 0x27, 0x85, 0x3e, 0xbf, 0x3f, 0x23, 0x97, 0x31, 0x31, 0x4c, 0x3c, 0xe2, 0xbf, 0x22, 0x05, 0xde, + 0x21, 0x7e, 0x33, 0xa0, 0x99, 0x5f, 0x56, 0x37, 0xd4, 0x81, 0x1d, 0x4a, 0x2e, 0xe7, 0x7a, 0xf7, + 0xa7, 0x0a, 0x20, 0x59, 0x54, 0xf0, 0x16, 0x5d, 0x9e, 0x5b, 0x98, 0xf9, 0x78, 0xf4, 0x92, 0x55, + 0x2d, 0x9c, 0x9c, 0xf9, 0xe1, 0x42, 0x0a, 0x57, 0x14, 0xa9, 0xd2, 0x2b, 0x7d, 0x5c, 0x44, 0x45, + 0x43, 0x55, 0x28, 0xbf, 0xe0, 0x05, 0xd7, 0xed, 0xfc, 0x59, 0x85, 0x7b, 0xb2, 0x30, 0xea, 0xc1, + 0xba, 0x46, 0xa0, 0xc5, 0x13, 0x33, 0xe3, 0xae, 0x69, 0x1e, 0xdc, 0x82, 0x50, 0x4b, 0x6a, 0x97, + 0xd0, 0x73, 0xd8, 0x88, 0x2e, 0x08, 0x28, 0x7f, 0x42, 0xb4, 0xa7, 0x4d, 0xfb, 0x36, 0x48, 0x9c, + 0xf4, 0x1c, 0xd0, 0xf2, 0xfd, 0x03, 0x3d, 0xca, 0x98, 0x9b, 0x77, 0x47, 0x32, 0x0f, 0x57, 0x03, + 0xc7, 0x25, 0xc7, 0x70, 0x3f, 0xbd, 0xe5, 0xd1, 0xfb, 0xcb, 0x39, 0x72, 0x2e, 0x1c, 0xe6, 0xc3, + 0x55, 0xa0, 0x71, 0x31, 0x0a, 0x6f, 0x2d, 0xbd, 0xdf, 0xd0, 0x0a, 0x29, 0xe2, 0xee, 0x1e, 0xad, + 0x84, 0x8d, 0xeb, 0x7d, 0x05, 0x3b, 0x99, 0x6f, 0x03, 0xe4, 0xe4, 0xe5, 0xc9, 0x7e, 0x97, 0x99, + 0xed, 0x95, 0xf1, 0x49, 0x61, 0xd3, 0x47, 0x5c, 0x96, 0xb0, 0x39, 0x2f, 0x81, 0x2c, 0x61, 0xf3, + 0x4e, 0x4c, 0xbb, 0x84, 0x04, 0x6c, 0x65, 0x9c, 0x40, 0x28, 0xc3, 0x0c, 0xf9, 0xe7, 0xa3, 0x79, + 0xb4, 0x22, 0x3a, 0xaa, 0x7a, 0xfc, 0xe9, 0xef, 0x33, 0xcb, 0x78, 0x3d, 0xb3, 0x8c, 0xbf, 0x66, + 0x96, 0xf1, 0xed, 0x8d, 0x55, 0x7a, 0x7d, 0x63, 0x95, 0xfe, 0xb8, 0xb1, 0x4a, 0x9f, 0x3f, 0x1e, + 0xfa, 0x62, 0x74, 0x71, 0xea, 0x78, 0x6c, 0xd2, 0xd6, 0x9f, 0x82, 0xea, 0xe7, 0x88, 0x0f, 0xc6, + 0xed, 0xcb, 0x76, 0xf8, 0xfd, 0xf7, 0xc1, 0x87, 0x47, 0xd1, 0x27, 0xa0, 0xb8, 0x0a, 0x08, 0x3f, + 0xad, 0xca, 0x2f, 0xc0, 0xc7, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x1f, 0xf1, 0x95, 0x4a, 0x79, + 0x0e, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1701,9 +1702,9 @@ func (m *QueryChannelsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Req != nil { + if m.Pagination != nil { { - size, err := m.Req.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1790,9 +1791,9 @@ func (m *QueryConnectionChannelsRequest) MarshalToSizedBuffer(dAtA []byte) (int, _ = i var l int _ = l - if m.Req != nil { + if m.Pagination != nil { { - size, err := m.Req.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1977,9 +1978,9 @@ func (m *QueryPacketCommitmentsRequest) MarshalToSizedBuffer(dAtA []byte) (int, _ = i var l int _ = l - if m.Req != nil { + if m.Pagination != nil { { - size, err := m.Req.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2478,8 +2479,8 @@ func (m *QueryChannelsRequest) Size() (n int) { } var l int _ = l - if m.Req != nil { - l = m.Req.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -2517,8 +2518,8 @@ func (m *QueryConnectionChannelsRequest) Size() (n int) { if l > 0 { n += 1 + l + sovQuery(uint64(l)) } - if m.Req != nil { - l = m.Req.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -2604,8 +2605,8 @@ func (m *QueryPacketCommitmentsRequest) Size() (n int) { if l > 0 { n += 1 + l + sovQuery(uint64(l)) } - if m.Req != nil { - l = m.Req.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -3125,7 +3126,7 @@ func (m *QueryChannelsRequest) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Req", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -3152,10 +3153,10 @@ func (m *QueryChannelsRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Req == nil { - m.Req = &query.PageRequest{} + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} } - if err := m.Req.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -3388,7 +3389,7 @@ func (m *QueryConnectionChannelsRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Req", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -3415,10 +3416,10 @@ func (m *QueryConnectionChannelsRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Req == nil { - m.Req = &query.PageRequest{} + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} } - if err := m.Req.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -3991,7 +3992,7 @@ func (m *QueryPacketCommitmentsRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Req", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -4018,10 +4019,10 @@ func (m *QueryPacketCommitmentsRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Req == nil { - m.Req = &query.PageRequest{} + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} } - if err := m.Req.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/slashing/client/cli/query.go b/x/slashing/client/cli/query.go index bca9b7886e47..8398a7e53fd8 100644 --- a/x/slashing/client/cli/query.go +++ b/x/slashing/client/cli/query.go @@ -93,7 +93,7 @@ $ query slashing signing-infos queryClient := types.NewQueryClient(clientCtx) - params := &types.QuerySigningInfosRequest{Req: client.ReadPageRequest(cmd.Flags())} + params := &types.QuerySigningInfosRequest{Pagination: client.ReadPageRequest(cmd.Flags())} res, err := queryClient.SigningInfos(context.Background(), params) if err != nil { return err diff --git a/x/slashing/keeper/grpc_query.go b/x/slashing/keeper/grpc_query.go index b4462976c742..74edcc64ea55 100644 --- a/x/slashing/keeper/grpc_query.go +++ b/x/slashing/keeper/grpc_query.go @@ -53,7 +53,7 @@ func (k Keeper) SigningInfos(c context.Context, req *types.QuerySigningInfosRequ var signInfos []types.ValidatorSigningInfo sigInfoStore := prefix.NewStore(store, types.ValidatorSigningInfoKeyPrefix) - res, err := query.Paginate(sigInfoStore, req.Req, func(key []byte, value []byte) error { + res, err := query.Paginate(sigInfoStore, req.Pagination, func(key []byte, value []byte) error { var info types.ValidatorSigningInfo err := k.cdc.UnmarshalBinaryBare(value, &info) if err != nil { diff --git a/x/slashing/keeper/grpc_query_test.go b/x/slashing/keeper/grpc_query_test.go index 7f1d5cd4edf1..cfe50c25c284 100644 --- a/x/slashing/keeper/grpc_query_test.go +++ b/x/slashing/keeper/grpc_query_test.go @@ -92,12 +92,12 @@ func (suite *SlashingTestSuite) TestGRPCSigningInfos() { // verify all values are returned without pagination var infoResp, err = queryClient.SigningInfos(gocontext.Background(), - &types.QuerySigningInfosRequest{Req: nil}) + &types.QuerySigningInfosRequest{Pagination: nil}) suite.NoError(err) suite.Equal(signingInfos, infoResp.Info) infoResp, err = queryClient.SigningInfos(gocontext.Background(), - &types.QuerySigningInfosRequest{Req: &query.PageRequest{Limit: 1, CountTotal: true}}) + &types.QuerySigningInfosRequest{Pagination: &query.PageRequest{Limit: 1, CountTotal: true}}) suite.NoError(err) suite.Len(infoResp.Info, 1) suite.Equal(signingInfos[0], infoResp.Info[0]) diff --git a/x/slashing/types/query.pb.go b/x/slashing/types/query.pb.go index cf912465f5b7..bbda2aba0187 100644 --- a/x/slashing/types/query.pb.go +++ b/x/slashing/types/query.pb.go @@ -206,7 +206,7 @@ func (m *QuerySigningInfoResponse) GetValSigningInfo() ValidatorSigningInfo { // QuerySigningInfosRequest is the request type for the Query/SigningInfos RPC method type QuerySigningInfosRequest struct { - Req *query.PageRequest `protobuf:"bytes,1,opt,name=req,proto3" json:"req,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,1,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QuerySigningInfosRequest) Reset() { *m = QuerySigningInfosRequest{} } @@ -242,9 +242,9 @@ func (m *QuerySigningInfosRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QuerySigningInfosRequest proto.InternalMessageInfo -func (m *QuerySigningInfosRequest) GetReq() *query.PageRequest { +func (m *QuerySigningInfosRequest) GetPagination() *query.PageRequest { if m != nil { - return m.Req + return m.Pagination } return nil } @@ -315,36 +315,36 @@ func init() { func init() { proto.RegisterFile("cosmos/slashing/query.proto", fileDescriptor_12bf00fd6c136588) } var fileDescriptor_12bf00fd6c136588 = []byte{ - // 460 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0xb6, 0xdb, 0x92, 0xc3, 0x26, 0x02, 0xb4, 0x54, 0x6a, 0x6a, 0x84, 0x8b, 0x0c, 0x48, 0xe5, - 0xa7, 0xb6, 0x14, 0xc4, 0x19, 0x11, 0x0e, 0x15, 0x12, 0x87, 0x62, 0x14, 0x0e, 0x5c, 0xa2, 0xad, - 0xbd, 0xdd, 0xae, 0x70, 0x76, 0x6d, 0x8f, 0x53, 0xd1, 0x57, 0xe0, 0xc4, 0x8b, 0xf0, 0x1e, 0x3d, - 0xe6, 0xc8, 0x29, 0x42, 0xc9, 0x5b, 0x70, 0x42, 0xde, 0x5d, 0x27, 0x26, 0x8e, 0x42, 0x38, 0x79, - 0x3c, 0xf3, 0xcd, 0x7c, 0xdf, 0xb7, 0x3b, 0x8b, 0xee, 0x47, 0x12, 0x46, 0x12, 0x02, 0x48, 0x08, - 0x5c, 0x72, 0xc1, 0x82, 0x6c, 0x4c, 0xf3, 0x6b, 0x3f, 0xcd, 0x65, 0x21, 0xf1, 0x1d, 0x5d, 0xf4, - 0xab, 0xa2, 0xf3, 0xc0, 0xa0, 0x15, 0x28, 0x48, 0x09, 0xe3, 0x82, 0x14, 0x5c, 0x0a, 0x8d, 0x77, - 0xf6, 0x99, 0x64, 0x52, 0x85, 0x41, 0x19, 0x99, 0xac, 0xbb, 0x4a, 0x51, 0x05, 0xba, 0xee, 0xed, - 0x23, 0xfc, 0xa1, 0x9c, 0x77, 0x46, 0x72, 0x32, 0x82, 0x90, 0x66, 0x63, 0x0a, 0x85, 0xf7, 0x1e, - 0xdd, 0xfb, 0x2b, 0x0b, 0xa9, 0x14, 0x40, 0xf1, 0x2b, 0xd4, 0x4a, 0x55, 0xa6, 0x6b, 0x3f, 0xb4, - 0x8f, 0xdb, 0xbd, 0x03, 0x7f, 0x45, 0xa3, 0xaf, 0x1b, 0xfa, 0x7b, 0x37, 0xd3, 0x23, 0x2b, 0x34, - 0x60, 0x2f, 0x45, 0x07, 0x6a, 0xda, 0x47, 0xce, 0x04, 0x17, 0xec, 0x9d, 0xb8, 0x90, 0x86, 0x08, - 0x0f, 0x50, 0x27, 0x92, 0x02, 0x86, 0x24, 0x8e, 0x73, 0x0a, 0x7a, 0x6e, 0xa7, 0xdf, 0xfb, 0x3d, - 0x3d, 0xf2, 0x19, 0x2f, 0x2e, 0xc7, 0xe7, 0x7e, 0x24, 0x47, 0x81, 0xf1, 0xa0, 0x3f, 0x27, 0x10, - 0x7f, 0x09, 0x8a, 0xeb, 0x94, 0x82, 0xff, 0x56, 0x0a, 0x78, 0xa3, 0x3b, 0xc3, 0x76, 0xb4, 0xfc, - 0xf1, 0x32, 0xd4, 0x6d, 0x32, 0x1a, 0x13, 0x03, 0x74, 0xf7, 0x8a, 0x24, 0x43, 0xd0, 0xa5, 0x21, - 0x17, 0x17, 0xd2, 0xd8, 0x79, 0xd2, 0xb0, 0xf3, 0x89, 0x24, 0x3c, 0x26, 0x85, 0xcc, 0x6b, 0x83, - 0x8c, 0xb9, 0xdb, 0x57, 0x24, 0xa9, 0x65, 0xbd, 0xd3, 0x26, 0x65, 0x75, 0x9c, 0xf8, 0x39, 0xda, - 0xcd, 0x69, 0x66, 0x58, 0x0e, 0x2b, 0x16, 0x7d, 0xd9, 0x67, 0x84, 0x51, 0x83, 0x0b, 0x4b, 0x94, - 0xf7, 0xcd, 0x46, 0x87, 0x6b, 0x26, 0x19, 0xf5, 0xaf, 0xd1, 0x9e, 0x51, 0xbc, 0xfb, 0xbf, 0x8a, - 0x55, 0x23, 0x7e, 0x51, 0x6a, 0x81, 0xee, 0x8e, 0xd2, 0xe2, 0xac, 0xd3, 0xa2, 0x99, 0x4a, 0x31, - 0xd0, 0xfb, 0xb1, 0x83, 0x6e, 0x29, 0x31, 0x78, 0x80, 0x5a, 0xfa, 0x72, 0xf1, 0xa3, 0x06, 0x69, - 0x73, 0x83, 0x9c, 0xc7, 0x9b, 0x41, 0x9a, 0xc3, 0xb3, 0x70, 0x8c, 0xda, 0x35, 0xa5, 0xf8, 0x78, - 0x7d, 0x5b, 0x73, 0x73, 0x9c, 0xa7, 0x5b, 0x20, 0x17, 0x2c, 0x0c, 0x75, 0xea, 0xa7, 0x89, 0xff, - 0xdd, 0xbc, 0x30, 0xf2, 0x6c, 0x1b, 0x68, 0x45, 0xd4, 0x3f, 0xbd, 0x99, 0xb9, 0xf6, 0x64, 0xe6, - 0xda, 0xbf, 0x66, 0xae, 0xfd, 0x7d, 0xee, 0x5a, 0x93, 0xb9, 0x6b, 0xfd, 0x9c, 0xbb, 0xd6, 0xe7, - 0x93, 0x8d, 0xfb, 0xfc, 0x75, 0xf9, 0x40, 0xd5, 0x6a, 0x9f, 0xb7, 0xd4, 0xf3, 0x7c, 0xf9, 0x27, - 0x00, 0x00, 0xff, 0xff, 0x73, 0x48, 0x10, 0xb6, 0x23, 0x04, 0x00, 0x00, + // 461 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xc1, 0x6e, 0xd3, 0x40, + 0x10, 0xb5, 0xdb, 0x92, 0xc3, 0x24, 0x02, 0xb4, 0x54, 0x6a, 0x6a, 0x84, 0x8b, 0x0c, 0x48, 0x05, + 0x51, 0x5b, 0x0a, 0xe2, 0xc0, 0x09, 0x11, 0x0e, 0x08, 0x89, 0x43, 0x31, 0x32, 0x07, 0x2e, 0xd1, + 0xd6, 0xde, 0x6e, 0x57, 0x38, 0xbb, 0x8e, 0xd7, 0xa9, 0xc8, 0x2f, 0x70, 0xe2, 0x47, 0xf8, 0x8f, + 0x1c, 0x73, 0xe4, 0x14, 0xa1, 0xe4, 0x2f, 0x38, 0xa1, 0xec, 0xae, 0x13, 0x13, 0x47, 0x21, 0x3d, + 0x79, 0x3d, 0xf3, 0x66, 0xde, 0x7b, 0x3b, 0xb3, 0x70, 0x3f, 0x16, 0xb2, 0x2f, 0x64, 0x20, 0x53, + 0x2c, 0xaf, 0x18, 0xa7, 0xc1, 0x60, 0x48, 0xf2, 0x91, 0x9f, 0xe5, 0xa2, 0x10, 0xe8, 0x8e, 0x4e, + 0xfa, 0x65, 0xd2, 0x79, 0x60, 0xd0, 0x0a, 0x14, 0x64, 0x98, 0x32, 0x8e, 0x0b, 0x26, 0xb8, 0xc6, + 0x3b, 0x87, 0x54, 0x50, 0xa1, 0x8e, 0xc1, 0xe2, 0x64, 0xa2, 0xee, 0x3a, 0x45, 0x79, 0xd0, 0x79, + 0xef, 0x10, 0xd0, 0xc7, 0x45, 0xbf, 0x73, 0x9c, 0xe3, 0xbe, 0x0c, 0xc9, 0x60, 0x48, 0x64, 0xe1, + 0x7d, 0x80, 0x7b, 0xff, 0x44, 0x65, 0x26, 0xb8, 0x24, 0xe8, 0x25, 0x34, 0x32, 0x15, 0x69, 0xdb, + 0x0f, 0xed, 0xd3, 0x66, 0xe7, 0xc8, 0x5f, 0xd3, 0xe8, 0xeb, 0x82, 0xee, 0xc1, 0x78, 0x7a, 0x62, + 0x85, 0x06, 0xec, 0x65, 0x70, 0xa4, 0xba, 0x7d, 0x62, 0x94, 0x33, 0x4e, 0xdf, 0xf3, 0x4b, 0x61, + 0x88, 0x50, 0x04, 0xad, 0x58, 0x70, 0xd9, 0xc3, 0x49, 0x92, 0x13, 0xa9, 0xfb, 0xb6, 0xba, 0x9d, + 0x3f, 0xd3, 0x13, 0x9f, 0xb2, 0xe2, 0x6a, 0x78, 0xe1, 0xc7, 0xa2, 0x1f, 0x18, 0x0f, 0xfa, 0x73, + 0x26, 0x93, 0xaf, 0x41, 0x31, 0xca, 0x88, 0xf4, 0xdf, 0x0a, 0x2e, 0xdf, 0xe8, 0xca, 0xb0, 0x19, + 0xaf, 0x7e, 0xbc, 0x01, 0xb4, 0xeb, 0x8c, 0xc6, 0x44, 0x04, 0x77, 0xaf, 0x71, 0xda, 0x93, 0x3a, + 0xd5, 0x63, 0xfc, 0x52, 0x18, 0x3b, 0x4f, 0x6a, 0x76, 0x3e, 0xe3, 0x94, 0x25, 0xb8, 0x10, 0x79, + 0xa5, 0x91, 0x31, 0x77, 0xfb, 0x1a, 0xa7, 0x95, 0xa8, 0x17, 0xd5, 0x29, 0xcb, 0xeb, 0x44, 0xaf, + 0x00, 0x56, 0xe3, 0x32, 0x64, 0xc7, 0x25, 0x99, 0x9e, 0xf9, 0x39, 0xa6, 0xc4, 0xc0, 0xc3, 0x0a, + 0xd8, 0xfb, 0x6e, 0xc3, 0xf1, 0x86, 0xbe, 0xc6, 0xcb, 0x6b, 0x38, 0x30, 0xfa, 0xf7, 0x6f, 0xaa, + 0x5f, 0x15, 0xa2, 0xe7, 0xb0, 0x9f, 0x13, 0xd9, 0xde, 0x53, 0x92, 0x9c, 0x4d, 0x92, 0x34, 0x53, + 0xb8, 0x80, 0x75, 0x7e, 0xee, 0xc1, 0x2d, 0x25, 0x06, 0x45, 0xd0, 0xd0, 0xa3, 0x46, 0x8f, 0x6a, + 0xa4, 0xf5, 0x7d, 0x72, 0x1e, 0x6f, 0x07, 0x69, 0x0e, 0xcf, 0x42, 0x09, 0x34, 0x2b, 0x4a, 0xd1, + 0xe9, 0xe6, 0xb2, 0xfa, 0x1e, 0x39, 0x4f, 0x77, 0x40, 0x2e, 0x59, 0x28, 0xb4, 0xaa, 0xb7, 0x89, + 0xfe, 0x5f, 0xbc, 0x34, 0xf2, 0x6c, 0x17, 0x68, 0x49, 0xd4, 0x7d, 0x37, 0x9e, 0xb9, 0xf6, 0x64, + 0xe6, 0xda, 0xbf, 0x67, 0xae, 0xfd, 0x63, 0xee, 0x5a, 0x93, 0xb9, 0x6b, 0xfd, 0x9a, 0xbb, 0xd6, + 0x97, 0xb3, 0xad, 0xdb, 0xfd, 0x6d, 0xf5, 0x5c, 0xd5, 0xa2, 0x5f, 0x34, 0xd4, 0x63, 0x7d, 0xf1, + 0x37, 0x00, 0x00, 0xff, 0xff, 0xc8, 0x92, 0xe1, 0x2a, 0x31, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -644,9 +644,9 @@ func (m *QuerySigningInfosRequest) MarshalToSizedBuffer(dAtA []byte) (int, error _ = i var l int _ = l - if m.Req != nil { + if m.Pagination != nil { { - size, err := m.Req.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -769,8 +769,8 @@ func (m *QuerySigningInfosRequest) Size() (n int) { } var l int _ = l - if m.Req != nil { - l = m.Req.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -1144,7 +1144,7 @@ func (m *QuerySigningInfosRequest) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Req", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -1171,10 +1171,10 @@ func (m *QuerySigningInfosRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Req == nil { - m.Req = &query.PageRequest{} + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} } - if err := m.Req.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/staking/client/cli/query.go b/x/staking/client/cli/query.go index 381491bd5fe5..8a2772261484 100644 --- a/x/staking/client/cli/query.go +++ b/x/staking/client/cli/query.go @@ -171,7 +171,7 @@ $ %s query staking unbonding-delegations-from cosmosvaloper1gghjut3ccd8ay0zduzj6 params := &types.QueryValidatorUnbondingDelegationsRequest{ ValidatorAddr: valAddr, - Req: pageReq, + Pagination: pageReq, } res, err := queryClient.ValidatorUnbondingDelegations(context.Background(), params) @@ -226,7 +226,7 @@ $ %s query staking redelegations-from cosmosvaloper1gghjut3ccd8ay0zduzj64hwre2fx params := &types.QueryRedelegationsRequest{ SrcValidatorAddr: valSrcAddr, - Req: pageReq, + Pagination: pageReq, } res, err := queryClient.Redelegations(context.Background(), params) @@ -334,7 +334,7 @@ $ %s query staking delegations cosmos1gghjut3ccd8ay0zduzj64hwre2fxs9ld75ru9p params := &types.QueryDelegatorDelegationsRequest{ DelegatorAddr: delAddr, - Req: pageReq, + Pagination: pageReq, } res, err := queryClient.DelegatorDelegations(context.Background(), params) @@ -389,7 +389,7 @@ $ %s query staking delegations-to cosmosvaloper1gghjut3ccd8ay0zduzj64hwre2fxs9ld params := &types.QueryValidatorDelegationsRequest{ ValidatorAddr: valAddr, - Req: pageReq, + Pagination: pageReq, } res, err := queryClient.ValidatorDelegations(context.Background(), params) @@ -498,7 +498,7 @@ $ %s query staking unbonding-delegations cosmos1gghjut3ccd8ay0zduzj64hwre2fxs9ld params := &types.QueryDelegatorUnbondingDelegationsRequest{ DelegatorAddr: delegatorAddr, - Req: pageReq, + Pagination: pageReq, } res, err := queryClient.DelegatorUnbondingDelegations(context.Background(), params) @@ -613,7 +613,7 @@ $ %s query staking redelegation cosmos1gghjut3ccd8ay0zduzj64hwre2fxs9ld75ru9p params := &types.QueryRedelegationsRequest{ DelegatorAddr: delAddr, - Req: pageReq, + Pagination: pageReq, } res, err := queryClient.Redelegations(context.Background(), params) diff --git a/x/staking/keeper/grpc_query.go b/x/staking/keeper/grpc_query.go index d0f22714b1ba..e5a71167c952 100644 --- a/x/staking/keeper/grpc_query.go +++ b/x/staking/keeper/grpc_query.go @@ -38,7 +38,7 @@ func (k Querier) Validators(c context.Context, req *types.QueryValidatorsRequest store := ctx.KVStore(k.storeKey) valStore := prefix.NewStore(store, types.ValidatorsKey) - res, err := query.FilteredPaginate(valStore, req.Req, func(key []byte, value []byte, accumulate bool) (bool, error) { + res, err := query.FilteredPaginate(valStore, req.Pagination, func(key []byte, value []byte, accumulate bool) (bool, error) { val, err := types.UnmarshalValidator(k.cdc, value) if err != nil { return false, err @@ -93,7 +93,7 @@ func (k Querier) ValidatorDelegations(c context.Context, req *types.QueryValidat store := ctx.KVStore(k.storeKey) valStore := prefix.NewStore(store, types.DelegationKey) - res, err := query.FilteredPaginate(valStore, req.Req, func(key []byte, value []byte, accumulate bool) (bool, error) { + res, err := query.FilteredPaginate(valStore, req.Pagination, func(key []byte, value []byte, accumulate bool) (bool, error) { delegation, err := types.UnmarshalDelegation(k.cdc, value) if err != nil { return false, err @@ -134,7 +134,7 @@ func (k Querier) ValidatorUnbondingDelegations(c context.Context, req *types.Que store := ctx.KVStore(k.storeKey) ubdStore := prefix.NewStore(store, types.GetUBDsByValIndexKey(req.ValidatorAddr)) - res, err := query.Paginate(ubdStore, req.Req, func(key []byte, value []byte) error { + res, err := query.Paginate(ubdStore, req.Pagination, func(key []byte, value []byte) error { ubd, err := types.UnmarshalUBD(k.cdc, value) if err != nil { return err @@ -221,7 +221,7 @@ func (k Querier) DelegatorDelegations(c context.Context, req *types.QueryDelegat store := ctx.KVStore(k.storeKey) delStore := prefix.NewStore(store, types.GetDelegationsKey(req.DelegatorAddr)) - res, err := query.Paginate(delStore, req.Req, func(key []byte, value []byte) error { + res, err := query.Paginate(delStore, req.Pagination, func(key []byte, value []byte) error { delegation, err := types.UnmarshalDelegation(k.cdc, value) if err != nil { return err @@ -283,7 +283,7 @@ func (k Querier) DelegatorUnbondingDelegations(c context.Context, req *types.Que store := ctx.KVStore(k.storeKey) unbStore := prefix.NewStore(store, types.GetUBDsKey(req.DelegatorAddr)) - res, err := query.Paginate(unbStore, req.Req, func(key []byte, value []byte) error { + res, err := query.Paginate(unbStore, req.Pagination, func(key []byte, value []byte) error { unbond, err := types.UnmarshalUBD(k.cdc, value) if err != nil { return err @@ -360,7 +360,7 @@ func (k Querier) DelegatorValidators(c context.Context, req *types.QueryDelegato store := ctx.KVStore(k.storeKey) delStore := prefix.NewStore(store, types.GetDelegationsKey(req.DelegatorAddr)) - res, err := query.Paginate(delStore, req.Req, func(key []byte, value []byte) error { + res, err := query.Paginate(delStore, req.Pagination, func(key []byte, value []byte) error { delegation, err := types.UnmarshalDelegation(k.cdc, value) if err != nil { return err @@ -421,7 +421,7 @@ func queryRedelegation(ctx sdk.Context, k Querier, req *types.QueryRedelegations func queryRedelegationsFromSrcValidator(store sdk.KVStore, k Querier, req *types.QueryRedelegationsRequest) (redels types.Redelegations, res *query.PageResponse, err error) { srcValPrefix := types.GetREDsFromValSrcIndexKey(req.SrcValidatorAddr) redStore := prefix.NewStore(store, srcValPrefix) - res, err = query.Paginate(redStore, req.Req, func(key []byte, value []byte) error { + res, err = query.Paginate(redStore, req.Pagination, func(key []byte, value []byte) error { storeKey := types.GetREDKeyFromValSrcIndexKey(append(srcValPrefix, key...)) storeValue := store.Get(storeKey) red, err := types.UnmarshalRED(k.cdc, storeValue) @@ -437,7 +437,7 @@ func queryRedelegationsFromSrcValidator(store sdk.KVStore, k Querier, req *types func queryAllRedelegations(store sdk.KVStore, k Querier, req *types.QueryRedelegationsRequest) (redels types.Redelegations, res *query.PageResponse, err error) { redStore := prefix.NewStore(store, types.GetREDsKey(req.DelegatorAddr)) - res, err = query.Paginate(redStore, req.Req, func(key []byte, value []byte) error { + res, err = query.Paginate(redStore, req.Pagination, func(key []byte, value []byte) error { redelegation, err := types.UnmarshalRED(k.cdc, value) if err != nil { return err diff --git a/x/staking/keeper/grpc_query_test.go b/x/staking/keeper/grpc_query_test.go index 2cb88f46ff1b..7477f73f14f9 100644 --- a/x/staking/keeper/grpc_query_test.go +++ b/x/staking/keeper/grpc_query_test.go @@ -42,7 +42,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryValidators() { {"valid request", func() { req = &types.QueryValidatorsRequest{Status: sdk.Bonded.String(), - Req: &query.PageRequest{Limit: 1, CountTotal: true}} + Pagination: &query.PageRequest{Limit: 1, CountTotal: true}} }, true, }, @@ -125,7 +125,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryDelegatorValidators() { func() { req = &types.QueryDelegatorValidatorsRequest{ DelegatorAddr: addrs[0], - Req: &query.PageRequest{Limit: 1, CountTotal: true}} + Pagination: &query.PageRequest{Limit: 1, CountTotal: true}} }, true, }, @@ -281,7 +281,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryDelegatorDelegations() { {"valid request", func() { req = &types.QueryDelegatorDelegationsRequest{DelegatorAddr: addrAcc, - Req: &query.PageRequest{Limit: 1, CountTotal: true}} + Pagination: &query.PageRequest{Limit: 1, CountTotal: true}} }, true, }, @@ -338,7 +338,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryValidatorDelegations() { {"valid request", func() { req = &types.QueryValidatorDelegationsRequest{ValidatorAddr: addrVal1, - Req: &query.PageRequest{Limit: 1, CountTotal: true}} + Pagination: &query.PageRequest{Limit: 1, CountTotal: true}} }, true, false, @@ -457,7 +457,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryDelegatorUnbondingDelegations() { {"valid request", func() { req = &types.QueryDelegatorUnbondingDelegationsRequest{DelegatorAddr: addrAcc, - Req: &query.PageRequest{Limit: 1, CountTotal: true}} + Pagination: &query.PageRequest{Limit: 1, CountTotal: true}} }, true, false, @@ -602,7 +602,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryRedelegation() { func() { req = &types.QueryRedelegationsRequest{ DelegatorAddr: addrAcc1, SrcValidatorAddr: val1.OperatorAddress, - DstValidatorAddr: val2.OperatorAddress, Req: &query.PageRequest{}} + DstValidatorAddr: val2.OperatorAddress, Pagination: &query.PageRequest{}} }, true, false, @@ -611,7 +611,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryRedelegation() { func() { req = &types.QueryRedelegationsRequest{ DelegatorAddr: addrAcc1, SrcValidatorAddr: val1.OperatorAddress, - Req: &query.PageRequest{}} + Pagination: &query.PageRequest{}} }, true, false, @@ -620,7 +620,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryRedelegation() { func() { req = &types.QueryRedelegationsRequest{ SrcValidatorAddr: val1.GetOperator(), - Req: &query.PageRequest{Limit: 1, CountTotal: true}} + Pagination: &query.PageRequest{Limit: 1, CountTotal: true}} }, true, false, @@ -676,7 +676,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryValidatorUnbondingDelegations() { func() { req = &types.QueryValidatorUnbondingDelegationsRequest{ ValidatorAddr: val1.GetOperator(), - Req: &query.PageRequest{Limit: 1, CountTotal: true}} + Pagination: &query.PageRequest{Limit: 1, CountTotal: true}} }, true, }, diff --git a/x/staking/types/query.pb.go b/x/staking/types/query.pb.go index fcb7a04618fe..87a726a77223 100644 --- a/x/staking/types/query.pb.go +++ b/x/staking/types/query.pb.go @@ -32,8 +32,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // QueryValidatorsRequest is request type for Query/Validators RPC method type QueryValidatorsRequest struct { - Status string `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"` - Req *query.PageRequest `protobuf:"bytes,2,opt,name=req,proto3" json:"req,omitempty"` + Status string `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryValidatorsRequest) Reset() { *m = QueryValidatorsRequest{} } @@ -76,9 +76,9 @@ func (m *QueryValidatorsRequest) GetStatus() string { return "" } -func (m *QueryValidatorsRequest) GetReq() *query.PageRequest { +func (m *QueryValidatorsRequest) GetPagination() *query.PageRequest { if m != nil { - return m.Req + return m.Pagination } return nil } @@ -229,7 +229,7 @@ func (m *QueryValidatorResponse) GetValidator() Validator { // QueryValidatorDelegationsRequest is request type for the Query/ValidatorDelegations RPC method type QueryValidatorDelegationsRequest struct { ValidatorAddr github_com_cosmos_cosmos_sdk_types.ValAddress `protobuf:"bytes,1,opt,name=validator_addr,json=validatorAddr,proto3,casttype=github.com/cosmos/cosmos-sdk/types.ValAddress" json:"validator_addr,omitempty"` - Req *query.PageRequest `protobuf:"bytes,2,opt,name=req,proto3" json:"req,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryValidatorDelegationsRequest) Reset() { *m = QueryValidatorDelegationsRequest{} } @@ -272,9 +272,9 @@ func (m *QueryValidatorDelegationsRequest) GetValidatorAddr() github_com_cosmos_ return nil } -func (m *QueryValidatorDelegationsRequest) GetReq() *query.PageRequest { +func (m *QueryValidatorDelegationsRequest) GetPagination() *query.PageRequest { if m != nil { - return m.Req + return m.Pagination } return nil } @@ -335,7 +335,7 @@ func (m *QueryValidatorDelegationsResponse) GetRes() *query.PageResponse { // QueryValidatorUnbondingDelegationsRequest is required type for the Query/ValidatorUnbondingDelegations RPC method type QueryValidatorUnbondingDelegationsRequest struct { ValidatorAddr github_com_cosmos_cosmos_sdk_types.ValAddress `protobuf:"bytes,1,opt,name=validator_addr,json=validatorAddr,proto3,casttype=github.com/cosmos/cosmos-sdk/types.ValAddress" json:"validator_addr,omitempty"` - Req *query.PageRequest `protobuf:"bytes,2,opt,name=req,proto3" json:"req,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryValidatorUnbondingDelegationsRequest) Reset() { @@ -382,9 +382,9 @@ func (m *QueryValidatorUnbondingDelegationsRequest) GetValidatorAddr() github_co return nil } -func (m *QueryValidatorUnbondingDelegationsRequest) GetReq() *query.PageRequest { +func (m *QueryValidatorUnbondingDelegationsRequest) GetPagination() *query.PageRequest { if m != nil { - return m.Req + return m.Pagination } return nil } @@ -645,7 +645,7 @@ func (m *QueryUnbondingDelegationResponse) GetUnbond() UnbondingDelegation { // QueryDelegatorDelegationsRequest is request type for the Query/DelegatorDelegations RPC method type QueryDelegatorDelegationsRequest struct { DelegatorAddr github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,1,opt,name=delegator_addr,json=delegatorAddr,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"delegator_addr,omitempty"` - Req *query.PageRequest `protobuf:"bytes,2,opt,name=req,proto3" json:"req,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryDelegatorDelegationsRequest) Reset() { *m = QueryDelegatorDelegationsRequest{} } @@ -688,9 +688,9 @@ func (m *QueryDelegatorDelegationsRequest) GetDelegatorAddr() github_com_cosmos_ return nil } -func (m *QueryDelegatorDelegationsRequest) GetReq() *query.PageRequest { +func (m *QueryDelegatorDelegationsRequest) GetPagination() *query.PageRequest { if m != nil { - return m.Req + return m.Pagination } return nil } @@ -751,7 +751,7 @@ func (m *QueryDelegatorDelegationsResponse) GetRes() *query.PageResponse { // QueryDelegatorUnbondingDelegationsRequest is request type for the Query/DelegatorUnbondingDelegations RPC method type QueryDelegatorUnbondingDelegationsRequest struct { DelegatorAddr github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,1,opt,name=delegator_addr,json=delegatorAddr,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"delegator_addr,omitempty"` - Req *query.PageRequest `protobuf:"bytes,2,opt,name=req,proto3" json:"req,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryDelegatorUnbondingDelegationsRequest) Reset() { @@ -798,9 +798,9 @@ func (m *QueryDelegatorUnbondingDelegationsRequest) GetDelegatorAddr() github_co return nil } -func (m *QueryDelegatorUnbondingDelegationsRequest) GetReq() *query.PageRequest { +func (m *QueryDelegatorUnbondingDelegationsRequest) GetPagination() *query.PageRequest { if m != nil { - return m.Req + return m.Pagination } return nil } @@ -867,7 +867,7 @@ type QueryRedelegationsRequest struct { DelegatorAddr github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,1,opt,name=delegator_addr,json=delegatorAddr,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"delegator_addr,omitempty"` SrcValidatorAddr github_com_cosmos_cosmos_sdk_types.ValAddress `protobuf:"bytes,2,opt,name=src_validator_addr,json=srcValidatorAddr,proto3,casttype=github.com/cosmos/cosmos-sdk/types.ValAddress" json:"src_validator_addr,omitempty"` DstValidatorAddr github_com_cosmos_cosmos_sdk_types.ValAddress `protobuf:"bytes,3,opt,name=dst_validator_addr,json=dstValidatorAddr,proto3,casttype=github.com/cosmos/cosmos-sdk/types.ValAddress" json:"dst_validator_addr,omitempty"` - Req *query.PageRequest `protobuf:"bytes,4,opt,name=req,proto3" json:"req,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,4,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryRedelegationsRequest) Reset() { *m = QueryRedelegationsRequest{} } @@ -924,9 +924,9 @@ func (m *QueryRedelegationsRequest) GetDstValidatorAddr() github_com_cosmos_cosm return nil } -func (m *QueryRedelegationsRequest) GetReq() *query.PageRequest { +func (m *QueryRedelegationsRequest) GetPagination() *query.PageRequest { if m != nil { - return m.Req + return m.Pagination } return nil } @@ -987,7 +987,7 @@ func (m *QueryRedelegationsResponse) GetRes() *query.PageResponse { // QueryDelegatorValidatorsRequest is request type for the Query/DelegatorValidators RPC method type QueryDelegatorValidatorsRequest struct { DelegatorAddr github_com_cosmos_cosmos_sdk_types.AccAddress `protobuf:"bytes,1,opt,name=delegator_addr,json=delegatorAddr,proto3,casttype=github.com/cosmos/cosmos-sdk/types.AccAddress" json:"delegator_addr,omitempty"` - Req *query.PageRequest `protobuf:"bytes,2,opt,name=req,proto3" json:"req,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryDelegatorValidatorsRequest) Reset() { *m = QueryDelegatorValidatorsRequest{} } @@ -1030,9 +1030,9 @@ func (m *QueryDelegatorValidatorsRequest) GetDelegatorAddr() github_com_cosmos_c return nil } -func (m *QueryDelegatorValidatorsRequest) GetReq() *query.PageRequest { +func (m *QueryDelegatorValidatorsRequest) GetPagination() *query.PageRequest { if m != nil { - return m.Req + return m.Pagination } return nil } @@ -1484,76 +1484,76 @@ func init() { func init() { proto.RegisterFile("cosmos/staking/query.proto", fileDescriptor_802d43a0c79dce0e) } var fileDescriptor_802d43a0c79dce0e = []byte{ - // 1099 bytes of a gzipped FileDescriptorProto + // 1097 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0x4f, 0x6f, 0x1b, 0x45, 0x14, 0xf7, 0x24, 0xc6, 0x52, 0x1e, 0x6d, 0x54, 0xc6, 0xae, 0x49, 0xb7, 0xd4, 0x76, 0xb7, 0x50, - 0xfa, 0xd7, 0x4e, 0x43, 0x2f, 0x20, 0x21, 0x94, 0x50, 0x21, 0x38, 0x20, 0xb5, 0x8b, 0x08, 0xa8, - 0x80, 0xcc, 0xc6, 0xbb, 0xac, 0x57, 0x71, 0x3c, 0xce, 0xce, 0x1a, 0x08, 0x12, 0x57, 0xc4, 0x11, - 0x6e, 0x7c, 0x04, 0x40, 0x82, 0x03, 0x07, 0xbe, 0x01, 0xa2, 0x07, 0x0e, 0x3d, 0x80, 0xc4, 0x29, - 0xa0, 0x84, 0x4f, 0xd1, 0x13, 0xda, 0xd9, 0xb7, 0xe3, 0xf5, 0xee, 0xec, 0x66, 0x9d, 0xa6, 0x90, - 0x9e, 0x6c, 0xcf, 0xbc, 0xf7, 0x7b, 0xbf, 0x79, 0xef, 0xcd, 0x7b, 0x6f, 0x0c, 0x5a, 0x8f, 0xf1, - 0x2d, 0xc6, 0x3b, 0xdc, 0x37, 0x37, 0xdd, 0xa1, 0xd3, 0xd9, 0x1e, 0xdb, 0xde, 0x4e, 0x7b, 0xe4, - 0x31, 0x9f, 0xd1, 0xc5, 0x70, 0xaf, 0x8d, 0x7b, 0xda, 0x39, 0x94, 0x15, 0x32, 0x9d, 0x91, 0xe9, - 0xb8, 0x43, 0xd3, 0x77, 0xd9, 0x30, 0x14, 0xd7, 0x6a, 0x0e, 0x73, 0x98, 0xf8, 0xda, 0x09, 0xbe, - 0xe1, 0xea, 0x33, 0x09, 0x03, 0xf8, 0x19, 0xee, 0xea, 0x1f, 0x40, 0xfd, 0x4e, 0x80, 0xb6, 0x6e, - 0x0e, 0x5c, 0xcb, 0xf4, 0x99, 0xc7, 0x0d, 0x7b, 0x7b, 0x6c, 0x73, 0x9f, 0xd6, 0xa1, 0xc2, 0x7d, - 0xd3, 0x1f, 0xf3, 0x25, 0xd2, 0x22, 0x97, 0x16, 0x0c, 0xfc, 0x45, 0xaf, 0xc2, 0xbc, 0x67, 0x6f, - 0x2f, 0xcd, 0xb5, 0xc8, 0xa5, 0x27, 0x57, 0xce, 0xb4, 0x91, 0x62, 0x48, 0xfb, 0xb6, 0xe9, 0xd8, - 0xa8, 0x6f, 0x04, 0x52, 0xfa, 0x97, 0x04, 0x9e, 0x4e, 0xe1, 0xf3, 0x11, 0x1b, 0x72, 0x9b, 0xbe, - 0x02, 0xf0, 0xb1, 0x5c, 0x5d, 0x22, 0xad, 0xf9, 0x38, 0x5e, 0xc4, 0x52, 0xea, 0xad, 0x95, 0xef, - 0xed, 0x36, 0x4b, 0x46, 0x4c, 0x85, 0x5e, 0x0b, 0x98, 0x70, 0x64, 0xa2, 0xa9, 0x98, 0x84, 0x96, - 0x02, 0x2a, 0x5c, 0xdf, 0x86, 0xd3, 0xd3, 0x4c, 0xa2, 0x83, 0xbe, 0x0b, 0x8b, 0x12, 0xb4, 0x6b, - 0x5a, 0x96, 0x27, 0x0e, 0x7c, 0x62, 0xed, 0xc6, 0x83, 0xdd, 0xe6, 0x75, 0xc7, 0xf5, 0xfb, 0xe3, - 0x8d, 0x76, 0x8f, 0x6d, 0x75, 0xd0, 0x8f, 0xe1, 0xc7, 0x75, 0x6e, 0x6d, 0x76, 0xfc, 0x9d, 0x91, - 0xcd, 0x03, 0x8a, 0xab, 0x96, 0xe5, 0xd9, 0x9c, 0x1b, 0x27, 0x25, 0x50, 0xb0, 0xa2, 0xbf, 0x93, - 0x74, 0xae, 0x3c, 0xfb, 0xcb, 0xb0, 0x20, 0x45, 0x85, 0xb9, 0x02, 0x47, 0x9f, 0x68, 0xe8, 0xdf, - 0x11, 0x68, 0x4d, 0x23, 0xdf, 0xb2, 0x07, 0xb6, 0x23, 0x92, 0x81, 0x3f, 0xf2, 0x73, 0xcd, 0x96, - 0x02, 0xbf, 0x10, 0x38, 0x9f, 0xc3, 0x15, 0x1d, 0xe2, 0x41, 0xcd, 0x92, 0xcb, 0x5d, 0x0f, 0x97, - 0xa3, 0xb4, 0xd0, 0x93, 0xbe, 0x99, 0x40, 0x44, 0x08, 0x6b, 0x67, 0x03, 0x27, 0x7d, 0xff, 0x57, - 0xb3, 0x9a, 0xde, 0xe3, 0x46, 0xd5, 0x4a, 0x2f, 0xce, 0x98, 0x3f, 0x3f, 0x11, 0xb8, 0x3c, 0x7d, - 0x8e, 0xb7, 0x87, 0x1b, 0x6c, 0x68, 0xb9, 0x43, 0xe7, 0xf8, 0x3a, 0xff, 0x67, 0x02, 0x57, 0x8a, - 0x90, 0xc6, 0x28, 0xdc, 0x85, 0xea, 0x38, 0xda, 0x4f, 0x05, 0xe1, 0x42, 0x32, 0x08, 0x0a, 0x28, - 0x4c, 0x55, 0x2a, 0x51, 0x0e, 0xeb, 0xed, 0xdf, 0x08, 0xde, 0x9d, 0x78, 0x34, 0xa5, 0x6b, 0x31, - 0x9a, 0x87, 0x73, 0xed, 0x6a, 0xaf, 0x27, 0x5d, 0x2b, 0x81, 0x84, 0x6b, 0xd3, 0x41, 0x9b, 0x3b, - 0xa2, 0x4a, 0xf0, 0x45, 0x54, 0x07, 0xd3, 0xc9, 0x49, 0x37, 0xa1, 0xaa, 0x48, 0x7d, 0xac, 0x0a, - 0x45, 0x32, 0xbf, 0xfe, 0x60, 0xb7, 0x49, 0xd3, 0xeb, 0x06, 0x4d, 0x27, 0xbd, 0xfe, 0x07, 0x81, - 0xa6, 0x20, 0xa2, 0x08, 0xde, 0xe3, 0xec, 0x60, 0x1b, 0x0b, 0xa2, 0xf2, 0x58, 0xe8, 0xe8, 0x55, - 0xa8, 0x84, 0x79, 0x89, 0xbe, 0x9d, 0x21, 0xa1, 0x51, 0x71, 0x52, 0x78, 0x6f, 0x45, 0xe7, 0x52, - 0xdf, 0xfd, 0x47, 0xe4, 0xbf, 0x99, 0xee, 0xfe, 0x8f, 0x51, 0xe1, 0x55, 0x73, 0x45, 0xa7, 0xbc, - 0xf7, 0xd0, 0x85, 0x37, 0xf4, 0xd0, 0x51, 0x56, 0x58, 0x49, 0xf8, 0x80, 0x0a, 0x7b, 0x1c, 0xbc, - 0x2c, 0x2b, 0xec, 0x01, 0xa4, 0x8f, 0x5d, 0x85, 0xfd, 0x67, 0x0e, 0xce, 0x08, 0xe2, 0x86, 0x6d, - 0xfd, 0x97, 0xde, 0xed, 0x02, 0xe5, 0x5e, 0xaf, 0x7b, 0x54, 0x75, 0xe0, 0x14, 0xf7, 0x7a, 0xeb, - 0x53, 0x0d, 0xb2, 0x0b, 0xd4, 0xe2, 0x7e, 0xd2, 0xc0, 0xfc, 0xa1, 0x0d, 0x58, 0xdc, 0x5f, 0x57, - 0x75, 0xe0, 0x72, 0xa1, 0xfc, 0xf8, 0x81, 0x80, 0xa6, 0x72, 0x33, 0xe6, 0x83, 0x09, 0x75, 0xcf, - 0xce, 0xb9, 0x80, 0xcf, 0x26, 0x53, 0x22, 0x0e, 0x93, 0xb8, 0x82, 0xa7, 0x3d, 0xfb, 0xe1, 0x2f, - 0xe1, 0xb7, 0x51, 0x83, 0x90, 0xf9, 0x9c, 0x7e, 0x1a, 0x1c, 0x93, 0xab, 0xf7, 0x75, 0xaa, 0x18, - 0xff, 0xff, 0xaf, 0x8c, 0xdf, 0x09, 0x34, 0x32, 0x38, 0x3d, 0xce, 0xed, 0xf5, 0xc3, 0xcc, 0xa4, - 0x38, 0xaa, 0x27, 0xcd, 0x4d, 0xbc, 0x26, 0xaf, 0xbb, 0xdc, 0x67, 0x9e, 0xdb, 0x33, 0x07, 0x6f, - 0x0c, 0x3f, 0x62, 0xb1, 0xc7, 0x68, 0xdf, 0x76, 0x9d, 0xbe, 0x2f, 0x90, 0xe7, 0x0d, 0xfc, 0xa5, - 0xdf, 0x81, 0xb3, 0x4a, 0x2d, 0xe4, 0xb4, 0x02, 0xe5, 0xbe, 0xcb, 0x7d, 0xa4, 0xd3, 0x48, 0xd2, - 0x49, 0x68, 0x09, 0x59, 0x9d, 0xc2, 0x29, 0x01, 0x79, 0x9b, 0xb1, 0x01, 0x9a, 0xd7, 0x5f, 0x85, - 0xa7, 0x62, 0x6b, 0x08, 0xde, 0x86, 0xf2, 0x88, 0xb1, 0x01, 0x82, 0xd7, 0x92, 0xe0, 0x81, 0x2c, - 0x1e, 0x53, 0xc8, 0xe9, 0x35, 0xa0, 0x21, 0x88, 0xe9, 0x99, 0x5b, 0xd1, 0x5d, 0xd2, 0x77, 0xa0, - 0x3a, 0xb5, 0x8a, 0xe0, 0x37, 0xa1, 0x32, 0x12, 0x2b, 0x08, 0x5f, 0x4f, 0xc1, 0x8b, 0xdd, 0x68, - 0x3c, 0x09, 0x65, 0x67, 0xcb, 0xd5, 0x95, 0x5f, 0x4f, 0xc0, 0x13, 0xc2, 0x36, 0xed, 0x02, 0x4c, - 0xae, 0x0e, 0xbd, 0x98, 0xb4, 0xa5, 0xfe, 0x87, 0x40, 0x7b, 0xfe, 0x40, 0x39, 0x1c, 0x3a, 0x4b, - 0xf4, 0x7d, 0x58, 0x90, 0xeb, 0xf4, 0xb9, 0x7c, 0xbd, 0x08, 0xfe, 0xe2, 0x41, 0x62, 0x12, 0xfd, - 0x73, 0xa8, 0xa9, 0x1e, 0x97, 0x74, 0x39, 0x1f, 0x21, 0x3d, 0x54, 0x68, 0x37, 0x66, 0xd0, 0x90, - 0xe6, 0xbf, 0x21, 0x70, 0x2e, 0xf7, 0x7d, 0x45, 0x5f, 0xcc, 0x87, 0xcd, 0x19, 0x73, 0xb4, 0x97, - 0x0e, 0xa3, 0x2a, 0xa9, 0x75, 0x01, 0x26, 0x1b, 0x19, 0x81, 0x4d, 0x3d, 0x00, 0x32, 0x02, 0x9b, - 0x1e, 0xfd, 0xf4, 0x12, 0xfd, 0x0c, 0xaa, 0x0a, 0x0a, 0xb4, 0xa3, 0x44, 0xc8, 0x7e, 0x73, 0x68, - 0xcb, 0xc5, 0x15, 0xe2, 0x61, 0x57, 0x8d, 0xb6, 0x19, 0x61, 0xcf, 0x99, 0xd8, 0x33, 0xc2, 0x9e, - 0x37, 0x37, 0x63, 0xd8, 0x73, 0x87, 0xbe, 0x8c, 0xb0, 0x17, 0x99, 0x6e, 0x33, 0xc2, 0x5e, 0x68, - 0xc6, 0xd4, 0x4b, 0xb4, 0x0f, 0x27, 0xa7, 0xc6, 0x0d, 0x7a, 0x59, 0x09, 0xa7, 0x9a, 0xfc, 0xb4, - 0x2b, 0x45, 0x44, 0xe3, 0xf1, 0x57, 0x74, 0xdf, 0x8c, 0xf8, 0x67, 0x8f, 0x14, 0xda, 0x72, 0x71, - 0x05, 0x69, 0xfb, 0x13, 0xa0, 0x69, 0x01, 0xda, 0x2e, 0x88, 0x14, 0x59, 0xee, 0x14, 0x96, 0x97, - 0x86, 0x37, 0x61, 0x71, 0xba, 0x75, 0x50, 0xb5, 0xd3, 0x94, 0xbd, 0x4c, 0xbb, 0x5a, 0x48, 0x56, - 0x1a, 0x7b, 0x13, 0xca, 0x41, 0x2b, 0xa1, 0x2d, 0xa5, 0x5a, 0xac, 0x4b, 0x69, 0xe7, 0x73, 0x24, - 0x24, 0xdc, 0x5b, 0x50, 0x09, 0x5b, 0x07, 0xd5, 0xd5, 0xe2, 0xf1, 0xee, 0xa4, 0x5d, 0xc8, 0x95, - 0x89, 0x40, 0xd7, 0x5e, 0xbb, 0xb7, 0xd7, 0x20, 0xf7, 0xf7, 0x1a, 0xe4, 0xef, 0xbd, 0x06, 0xf9, - 0x6a, 0xbf, 0x51, 0xba, 0xbf, 0xdf, 0x28, 0xfd, 0xb9, 0xdf, 0x28, 0xdd, 0xbd, 0x96, 0x3b, 0x76, - 0x7c, 0x2a, 0xff, 0x95, 0x16, 0x03, 0xc8, 0x46, 0x45, 0xfc, 0x29, 0xfd, 0xc2, 0xbf, 0x01, 0x00, - 0x00, 0xff, 0xff, 0x4d, 0x50, 0xb2, 0x10, 0x15, 0x17, 0x00, 0x00, + 0xda, 0xd2, 0xda, 0x69, 0xe8, 0xa5, 0x48, 0x08, 0x25, 0x54, 0x08, 0x0e, 0x48, 0xed, 0x22, 0x02, + 0x2a, 0x48, 0x66, 0xe3, 0x5d, 0xd6, 0x2b, 0x3b, 0x1e, 0x67, 0x67, 0x0d, 0x04, 0x89, 0x2b, 0xe2, + 0x08, 0x37, 0x3e, 0x03, 0x12, 0x1c, 0xcb, 0x95, 0x0b, 0xa2, 0x07, 0x0e, 0x3d, 0x80, 0xc4, 0x29, + 0xa0, 0xe4, 0x1b, 0x70, 0xec, 0x09, 0x79, 0xf6, 0xed, 0x78, 0xbd, 0x3b, 0xbb, 0x59, 0x27, 0x29, + 0x4d, 0x4e, 0xb6, 0x67, 0xde, 0xfb, 0xbd, 0xff, 0x7f, 0xc6, 0xa0, 0x75, 0x18, 0xdf, 0x64, 0xbc, + 0xc5, 0x7d, 0xb3, 0xe7, 0x0e, 0x9c, 0xd6, 0xd6, 0xc8, 0xf6, 0xb6, 0x9b, 0x43, 0x8f, 0xf9, 0x8c, + 0x2e, 0x06, 0x77, 0x4d, 0xbc, 0xd3, 0x2e, 0x20, 0xad, 0xa0, 0x69, 0x0d, 0x4d, 0xc7, 0x1d, 0x98, + 0xbe, 0xcb, 0x06, 0x01, 0xb9, 0x56, 0x71, 0x98, 0xc3, 0xc4, 0xd7, 0xd6, 0xf8, 0x1b, 0x9e, 0xbe, + 0x10, 0x13, 0x80, 0x9f, 0xc1, 0xad, 0xde, 0x83, 0xea, 0xbd, 0x31, 0xda, 0xba, 0xd9, 0x77, 0x2d, + 0xd3, 0x67, 0x1e, 0x37, 0xec, 0xad, 0x91, 0xcd, 0x7d, 0x5a, 0x85, 0x12, 0xf7, 0x4d, 0x7f, 0xc4, + 0x97, 0x48, 0x83, 0x5c, 0x59, 0x30, 0xf0, 0x17, 0xbd, 0x0d, 0x30, 0x91, 0xbc, 0x34, 0xd7, 0x20, + 0x57, 0x9e, 0x5d, 0x39, 0xd7, 0x44, 0x4d, 0x03, 0xed, 0xef, 0x9a, 0x8e, 0x8d, 0x30, 0x46, 0x84, + 0x58, 0xff, 0x86, 0xc0, 0xf3, 0x09, 0x69, 0x7c, 0xc8, 0x06, 0xdc, 0xa6, 0x6f, 0x00, 0x7c, 0x26, + 0x4f, 0x97, 0x48, 0x63, 0x3e, 0x0a, 0x1b, 0xea, 0x2c, 0xf9, 0xd6, 0x8a, 0x0f, 0x77, 0xea, 0x05, + 0x23, 0xc2, 0x42, 0xaf, 0xc3, 0xbc, 0x67, 0x73, 0x54, 0x48, 0x53, 0x29, 0x14, 0x48, 0x32, 0xc6, + 0x64, 0xfa, 0x16, 0x9c, 0x9d, 0xd6, 0x24, 0x34, 0xfb, 0x43, 0x58, 0x94, 0xa0, 0x6d, 0xd3, 0xb2, + 0x3c, 0x61, 0xfe, 0xa9, 0xb5, 0x9b, 0x8f, 0x77, 0xea, 0x37, 0x1c, 0xd7, 0xef, 0x8e, 0x36, 0x9a, + 0x1d, 0xb6, 0xd9, 0x42, 0xaf, 0x06, 0x1f, 0x37, 0xb8, 0xd5, 0x6b, 0xf9, 0xdb, 0x43, 0x9b, 0x8f, + 0x55, 0x5c, 0xb5, 0x2c, 0xcf, 0xe6, 0xdc, 0x38, 0x2d, 0x81, 0xc6, 0x27, 0xfa, 0x07, 0x71, 0x57, + 0x4b, 0xdb, 0x5f, 0x87, 0x05, 0x49, 0x2a, 0xc4, 0xe5, 0x30, 0x7d, 0xc2, 0xa1, 0xff, 0x4c, 0xa0, + 0x31, 0x8d, 0x7c, 0xc7, 0xee, 0xdb, 0x8e, 0xf0, 0x39, 0x7f, 0xe2, 0x76, 0x1d, 0x26, 0x21, 0x7e, + 0x25, 0x70, 0x31, 0x43, 0x73, 0x74, 0x8f, 0x07, 0x15, 0x4b, 0x1e, 0xb7, 0x3d, 0x3c, 0x0e, 0x93, + 0x44, 0x8f, 0x7b, 0x6a, 0x02, 0x11, 0x22, 0xac, 0x9d, 0x1f, 0xbb, 0xec, 0x87, 0xbf, 0xeb, 0xe5, + 0xe4, 0x1d, 0x37, 0xca, 0x56, 0xf2, 0x70, 0xc6, 0x6c, 0xfa, 0x85, 0xc0, 0xd5, 0x69, 0x3b, 0xde, + 0x1f, 0x6c, 0xb0, 0x81, 0xe5, 0x0e, 0x9c, 0x93, 0x12, 0x8a, 0x07, 0x04, 0xae, 0xe5, 0x31, 0x01, + 0x63, 0x72, 0x1f, 0xca, 0xa3, 0xf0, 0x3e, 0x11, 0x92, 0x4b, 0xf1, 0x90, 0x28, 0xa0, 0x30, 0x8d, + 0xa9, 0x44, 0x39, 0xa8, 0xef, 0x7f, 0x27, 0x58, 0x57, 0xd1, 0xd8, 0x4a, 0x47, 0x63, 0x6c, 0x0f, + 0xe6, 0xe8, 0xd5, 0x4e, 0x47, 0x3a, 0x5a, 0x02, 0x09, 0x47, 0x27, 0x43, 0x38, 0x77, 0x44, 0x5d, + 0xe2, 0xeb, 0xb0, 0x47, 0x26, 0x53, 0x95, 0xf6, 0xa0, 0xac, 0x28, 0x04, 0xec, 0x18, 0x79, 0xea, + 0xa0, 0xfa, 0x78, 0xa7, 0x4e, 0x93, 0xe7, 0x06, 0x4d, 0x96, 0x80, 0xfe, 0x27, 0x81, 0xba, 0x50, + 0x44, 0x11, 0xbc, 0x93, 0xec, 0x60, 0x1b, 0x9b, 0xa5, 0xd2, 0x2c, 0x74, 0xf4, 0x2a, 0x94, 0x82, + 0xbc, 0x44, 0xdf, 0xce, 0x90, 0xd0, 0xc8, 0x38, 0x69, 0xca, 0x77, 0x42, 0xbb, 0xd4, 0x9d, 0xe0, + 0x09, 0xf9, 0xef, 0x10, 0x9d, 0xe0, 0xa7, 0xb0, 0x29, 0xab, 0x35, 0x47, 0x17, 0x7d, 0x74, 0xe8, + 0xa6, 0x1c, 0xf8, 0xeb, 0x28, 0xbb, 0xaf, 0x54, 0x78, 0x9f, 0xee, 0x7b, 0xfc, 0x7c, 0x2e, 0xbb, + 0xef, 0x3e, 0x26, 0x1c, 0xbb, 0xee, 0xfb, 0xef, 0x1c, 0x9c, 0x13, 0x8a, 0x1b, 0xb6, 0xf5, 0x7f, + 0xfa, 0xba, 0x0d, 0x94, 0x7b, 0x9d, 0xf6, 0x51, 0xf5, 0x88, 0x33, 0xdc, 0xeb, 0xac, 0x4f, 0x8d, + 0xd2, 0x36, 0x50, 0x8b, 0xfb, 0x71, 0x01, 0xf3, 0x07, 0x16, 0x60, 0x71, 0x7f, 0x3d, 0x63, 0x56, + 0x17, 0x67, 0xc9, 0x96, 0x1f, 0x09, 0x68, 0x2a, 0xa7, 0x63, 0x76, 0x98, 0x50, 0xf5, 0xec, 0x8c, + 0xe2, 0x7c, 0x31, 0x9e, 0x20, 0x51, 0x98, 0x58, 0x79, 0x9e, 0xf5, 0xec, 0xc3, 0x17, 0xe8, 0x83, + 0x70, 0x94, 0xc8, 0xec, 0x4e, 0x3e, 0x37, 0x8e, 0x65, 0x59, 0x7e, 0x97, 0x68, 0xe2, 0x4f, 0xff, + 0xe5, 0xf2, 0x07, 0x81, 0x5a, 0x8a, 0x4e, 0x27, 0x79, 0x2c, 0x7f, 0x92, 0x9a, 0x22, 0x47, 0xf5, + 0x4c, 0xba, 0x85, 0x45, 0xf3, 0xb6, 0xcb, 0x7d, 0xe6, 0xb9, 0x1d, 0xb3, 0xff, 0xce, 0xe0, 0x53, + 0x16, 0x79, 0xee, 0x76, 0x6d, 0xd7, 0xe9, 0xfa, 0x02, 0x79, 0xde, 0xc0, 0x5f, 0xfa, 0x3d, 0x38, + 0xaf, 0xe4, 0x42, 0x9d, 0x56, 0xa0, 0xd8, 0x75, 0xb9, 0x8f, 0xea, 0xd4, 0xe2, 0xea, 0xc4, 0xb8, + 0x04, 0xad, 0x4e, 0xe1, 0x8c, 0x80, 0xbc, 0xcb, 0x58, 0x1f, 0xc5, 0xeb, 0x6f, 0xc2, 0x73, 0x91, + 0x33, 0x04, 0x6f, 0x42, 0x71, 0xc8, 0x58, 0x1f, 0xc1, 0x2b, 0x71, 0xf0, 0x31, 0x2d, 0x9a, 0x29, + 0xe8, 0xf4, 0x0a, 0xd0, 0x00, 0xc4, 0xf4, 0xcc, 0xcd, 0xb0, 0xb2, 0xf4, 0x6d, 0x28, 0x4f, 0x9d, + 0x22, 0xf8, 0x2d, 0x28, 0x0d, 0xc5, 0x09, 0xc2, 0x57, 0x13, 0xf0, 0xe2, 0x36, 0x5c, 0x6b, 0x02, + 0xda, 0xd9, 0x72, 0x75, 0xe5, 0xb7, 0x53, 0xf0, 0x8c, 0x90, 0x4d, 0xdb, 0x00, 0x93, 0xd2, 0xa1, + 0x97, 0xe3, 0xb2, 0xd4, 0xff, 0x41, 0x68, 0x2f, 0xef, 0x4b, 0x87, 0xcb, 0x6a, 0x81, 0x7e, 0x0c, + 0x0b, 0xf2, 0x9c, 0xbe, 0x94, 0xcd, 0x17, 0xc2, 0x5f, 0xde, 0x8f, 0x4c, 0xa2, 0x7f, 0x05, 0x15, + 0xd5, 0x13, 0x95, 0x2e, 0x67, 0x23, 0x24, 0xd7, 0x0f, 0xed, 0xe6, 0x0c, 0x1c, 0x52, 0xfc, 0xf7, + 0x04, 0x2e, 0x64, 0xbe, 0xcb, 0xe8, 0xed, 0x6c, 0xd8, 0x8c, 0x85, 0x48, 0x7b, 0xed, 0x20, 0xac, + 0x52, 0xb5, 0x36, 0xc0, 0xe4, 0x22, 0x25, 0xb0, 0x89, 0x87, 0x43, 0x4a, 0x60, 0x93, 0x4b, 0xa2, + 0x5e, 0xa0, 0x5f, 0x42, 0x59, 0xa1, 0x02, 0x6d, 0x29, 0x11, 0xd2, 0xdf, 0x2a, 0xda, 0x72, 0x7e, + 0x86, 0x68, 0xd8, 0x55, 0x4b, 0x70, 0x4a, 0xd8, 0x33, 0x36, 0xfd, 0x94, 0xb0, 0x67, 0x6d, 0xd8, + 0x18, 0xf6, 0xcc, 0x85, 0x30, 0x25, 0xec, 0x79, 0xf6, 0xe0, 0x94, 0xb0, 0xe7, 0xda, 0x3f, 0xf5, + 0x02, 0xed, 0xc2, 0xe9, 0xa9, 0xe5, 0x83, 0x5e, 0x55, 0xc2, 0xa9, 0xb6, 0x42, 0xed, 0x5a, 0x1e, + 0xd2, 0x68, 0xfc, 0x15, 0xd3, 0x37, 0x25, 0xfe, 0xe9, 0x0b, 0x86, 0xb6, 0x9c, 0x9f, 0x41, 0xca, + 0xfe, 0x1c, 0x68, 0x92, 0x80, 0x36, 0x73, 0x22, 0x85, 0x92, 0x5b, 0xb9, 0xe9, 0xa5, 0xe0, 0x1e, + 0x2c, 0x4e, 0x8f, 0x0e, 0xaa, 0x76, 0x9a, 0x72, 0x96, 0x69, 0xaf, 0xe4, 0xa2, 0x95, 0xc2, 0xde, + 0x85, 0xe2, 0x78, 0x94, 0xd0, 0x86, 0x92, 0x2d, 0x32, 0xa5, 0xb4, 0x8b, 0x19, 0x14, 0x12, 0xee, + 0x3d, 0x28, 0x05, 0xa3, 0x83, 0xea, 0x6a, 0xf2, 0xe8, 0x74, 0xd2, 0x2e, 0x65, 0xd2, 0x84, 0xa0, + 0x6b, 0x6f, 0x3d, 0xdc, 0xad, 0x91, 0x47, 0xbb, 0x35, 0xf2, 0xcf, 0x6e, 0x8d, 0x7c, 0xbb, 0x57, + 0x2b, 0x3c, 0xda, 0xab, 0x15, 0xfe, 0xda, 0xab, 0x15, 0xee, 0x5f, 0xcf, 0x5c, 0x3b, 0xbe, 0x90, + 0xff, 0x7b, 0x8b, 0x05, 0x64, 0xa3, 0x24, 0xfe, 0xf6, 0x7e, 0xf5, 0xbf, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xbd, 0x8c, 0x65, 0x94, 0x77, 0x17, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2152,9 +2152,9 @@ func (m *QueryValidatorsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l - if m.Req != nil { + if m.Pagination != nil { { - size, err := m.Req.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2306,9 +2306,9 @@ func (m *QueryValidatorDelegationsRequest) MarshalToSizedBuffer(dAtA []byte) (in _ = i var l int _ = l - if m.Req != nil { + if m.Pagination != nil { { - size, err := m.Req.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2397,9 +2397,9 @@ func (m *QueryValidatorUnbondingDelegationsRequest) MarshalToSizedBuffer(dAtA [] _ = i var l int _ = l - if m.Req != nil { + if m.Pagination != nil { { - size, err := m.Req.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2630,9 +2630,9 @@ func (m *QueryDelegatorDelegationsRequest) MarshalToSizedBuffer(dAtA []byte) (in _ = i var l int _ = l - if m.Req != nil { + if m.Pagination != nil { { - size, err := m.Req.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2721,9 +2721,9 @@ func (m *QueryDelegatorUnbondingDelegationsRequest) MarshalToSizedBuffer(dAtA [] _ = i var l int _ = l - if m.Req != nil { + if m.Pagination != nil { { - size, err := m.Req.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2812,9 +2812,9 @@ func (m *QueryRedelegationsRequest) MarshalToSizedBuffer(dAtA []byte) (int, erro _ = i var l int _ = l - if m.Req != nil { + if m.Pagination != nil { { - size, err := m.Req.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2917,9 +2917,9 @@ func (m *QueryDelegatorValidatorsRequest) MarshalToSizedBuffer(dAtA []byte) (int _ = i var l int _ = l - if m.Req != nil { + if m.Pagination != nil { { - size, err := m.Req.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -3266,8 +3266,8 @@ func (m *QueryValidatorsRequest) Size() (n int) { if l > 0 { n += 1 + l + sovQuery(uint64(l)) } - if m.Req != nil { - l = m.Req.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -3326,8 +3326,8 @@ func (m *QueryValidatorDelegationsRequest) Size() (n int) { if l > 0 { n += 1 + l + sovQuery(uint64(l)) } - if m.Req != nil { - l = m.Req.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -3362,8 +3362,8 @@ func (m *QueryValidatorUnbondingDelegationsRequest) Size() (n int) { if l > 0 { n += 1 + l + sovQuery(uint64(l)) } - if m.Req != nil { - l = m.Req.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -3456,8 +3456,8 @@ func (m *QueryDelegatorDelegationsRequest) Size() (n int) { if l > 0 { n += 1 + l + sovQuery(uint64(l)) } - if m.Req != nil { - l = m.Req.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -3492,8 +3492,8 @@ func (m *QueryDelegatorUnbondingDelegationsRequest) Size() (n int) { if l > 0 { n += 1 + l + sovQuery(uint64(l)) } - if m.Req != nil { - l = m.Req.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -3536,8 +3536,8 @@ func (m *QueryRedelegationsRequest) Size() (n int) { if l > 0 { n += 1 + l + sovQuery(uint64(l)) } - if m.Req != nil { - l = m.Req.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -3572,8 +3572,8 @@ func (m *QueryDelegatorValidatorsRequest) Size() (n int) { if l > 0 { n += 1 + l + sovQuery(uint64(l)) } - if m.Req != nil { - l = m.Req.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -3764,7 +3764,7 @@ func (m *QueryValidatorsRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Req", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -3791,10 +3791,10 @@ func (m *QueryValidatorsRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Req == nil { - m.Req = &query.PageRequest{} + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} } - if err := m.Req.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -4183,7 +4183,7 @@ func (m *QueryValidatorDelegationsRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Req", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -4210,10 +4210,10 @@ func (m *QueryValidatorDelegationsRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Req == nil { - m.Req = &query.PageRequest{} + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} } - if err := m.Req.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -4429,7 +4429,7 @@ func (m *QueryValidatorUnbondingDelegationsRequest) Unmarshal(dAtA []byte) error iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Req", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -4456,10 +4456,10 @@ func (m *QueryValidatorUnbondingDelegationsRequest) Unmarshal(dAtA []byte) error if postIndex > l { return io.ErrUnexpectedEOF } - if m.Req == nil { - m.Req = &query.PageRequest{} + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} } - if err := m.Req.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -5092,7 +5092,7 @@ func (m *QueryDelegatorDelegationsRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Req", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -5119,10 +5119,10 @@ func (m *QueryDelegatorDelegationsRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Req == nil { - m.Req = &query.PageRequest{} + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} } - if err := m.Req.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -5338,7 +5338,7 @@ func (m *QueryDelegatorUnbondingDelegationsRequest) Unmarshal(dAtA []byte) error iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Req", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -5365,10 +5365,10 @@ func (m *QueryDelegatorUnbondingDelegationsRequest) Unmarshal(dAtA []byte) error if postIndex > l { return io.ErrUnexpectedEOF } - if m.Req == nil { - m.Req = &query.PageRequest{} + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} } - if err := m.Req.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -5652,7 +5652,7 @@ func (m *QueryRedelegationsRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Req", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -5679,10 +5679,10 @@ func (m *QueryRedelegationsRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Req == nil { - m.Req = &query.PageRequest{} + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} } - if err := m.Req.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -5898,7 +5898,7 @@ func (m *QueryDelegatorValidatorsRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Req", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -5925,10 +5925,10 @@ func (m *QueryDelegatorValidatorsRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Req == nil { - m.Req = &query.PageRequest{} + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} } - if err := m.Req.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/staking/types/staking.pb.go b/x/staking/types/staking.pb.go index 01ca5ad2668f..6b6282948993 100644 --- a/x/staking/types/staking.pb.go +++ b/x/staking/types/staking.pb.go @@ -1569,101 +1569,101 @@ func (this *Pool) Description() (desc *github_com_gogo_protobuf_protoc_gen_gogo_ func StakingDescription() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet) { d := &github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet{} var gzipped = []byte{ - // 9458 bytes of a gzipped FileDescriptorSet + // 9459 bytes of a gzipped FileDescriptorSet 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x7d, 0x6d, 0x70, 0x24, 0xc7, 0x75, 0x18, 0xf6, 0x03, 0x8b, 0xdd, 0xb7, 0x8b, 0xc5, 0xa2, 0x81, 0xbb, 0xdb, 0x5b, 0x92, 0xb7, 0xc7, 0x39, 0x7e, 0xe0, 0xf8, 0x81, 0xa3, 0x4e, 0xfc, 0xdc, 0xa3, 0x48, 0x61, 0x01, 0xdc, 0x1d, - 0x48, 0xe0, 0x0e, 0x1c, 0x00, 0x47, 0x8a, 0xb2, 0x3c, 0x1e, 0xcc, 0x36, 0x16, 0x43, 0xec, 0xce, - 0x2c, 0x67, 0x66, 0xef, 0x00, 0x96, 0x52, 0xc5, 0x94, 0x64, 0x5b, 0x72, 0x64, 0x4b, 0x76, 0xec, - 0x84, 0x96, 0x25, 0x85, 0x52, 0x2a, 0x91, 0xac, 0xc4, 0xf2, 0x47, 0x1c, 0x59, 0x72, 0xfe, 0xa8, + 0x48, 0xe0, 0x0e, 0x1c, 0x00, 0x47, 0x8a, 0xb2, 0x3d, 0x1e, 0xcc, 0x36, 0x16, 0x43, 0xec, 0xce, + 0x2c, 0x67, 0x66, 0xef, 0x00, 0x96, 0x52, 0xc5, 0x94, 0x64, 0x5b, 0x72, 0x64, 0x4b, 0x76, 0x9c, + 0x84, 0x96, 0x25, 0x85, 0x52, 0x2a, 0x91, 0xa3, 0xc4, 0xb2, 0x9d, 0x38, 0xfa, 0x70, 0xfe, 0xa8, 0x2a, 0xe5, 0x58, 0xa9, 0x72, 0xa5, 0xa4, 0x94, 0x93, 0x72, 0xa5, 0x52, 0xb0, 0x45, 0xaa, 0xca, - 0x8e, 0xc2, 0x24, 0xca, 0x85, 0x76, 0xb9, 0xa4, 0x1f, 0x71, 0xf5, 0xd7, 0x7c, 0xed, 0x2c, 0x66, - 0x70, 0x3a, 0x52, 0x74, 0x89, 0xbf, 0xb0, 0xfd, 0xfa, 0xbd, 0xd7, 0xdd, 0xaf, 0x5f, 0xbf, 0xf7, - 0xfa, 0x75, 0xf7, 0x00, 0xbe, 0x9c, 0x86, 0xdb, 0x34, 0xd3, 0xee, 0x9a, 0xf6, 0x99, 0x17, 0xfb, - 0xd8, 0xda, 0x3b, 0xd3, 0x53, 0xdb, 0xba, 0xa1, 0x3a, 0xba, 0x69, 0xcc, 0xf6, 0x2c, 0xd3, 0x31, - 0x51, 0x89, 0x55, 0xcf, 0xd2, 0x6a, 0xc9, 0x80, 0xe2, 0xaa, 0xda, 0xc6, 0x32, 0x7e, 0xb1, 0x8f, - 0x6d, 0x07, 0x55, 0x20, 0xb3, 0x83, 0xf7, 0xaa, 0xa9, 0x93, 0xa9, 0x99, 0x92, 0x4c, 0x7e, 0xa2, - 0xa3, 0x90, 0x33, 0xb7, 0xb6, 0x6c, 0xec, 0x54, 0xd3, 0x27, 0x53, 0x33, 0x59, 0x99, 0x97, 0xd0, - 0x34, 0x8c, 0x76, 0xf4, 0xae, 0xee, 0x54, 0x33, 0x14, 0xcc, 0x0a, 0xa8, 0x0e, 0x45, 0xcd, 0xec, - 0x1b, 0x8e, 0xe2, 0x98, 0x8e, 0xda, 0xa9, 0x66, 0x4f, 0xa6, 0x66, 0xf2, 0x32, 0x50, 0xd0, 0x3a, - 0x81, 0x48, 0x4f, 0x42, 0x89, 0xb5, 0x67, 0xf7, 0x4c, 0xc3, 0xc6, 0xe8, 0x38, 0xe4, 0x0d, 0xbc, - 0xeb, 0x28, 0x5e, 0xab, 0x63, 0xa4, 0xfc, 0x34, 0xde, 0x23, 0x2d, 0x30, 0x2e, 0xac, 0x61, 0x56, - 0x68, 0x36, 0xbf, 0xf9, 0xda, 0x89, 0xd4, 0xb7, 0x5e, 0x3b, 0x91, 0xfa, 0x8b, 0xd7, 0x4e, 0xa4, - 0x3e, 0xf5, 0xfa, 0x89, 0x91, 0x6f, 0xbd, 0x7e, 0x62, 0xe4, 0xcf, 0x5e, 0x3f, 0x31, 0xf2, 0xfc, - 0x4c, 0x5b, 0x77, 0xb6, 0xfb, 0x9b, 0xb3, 0x9a, 0xd9, 0x3d, 0xc3, 0x45, 0xc0, 0xfe, 0xdc, 0x6f, - 0xb7, 0x76, 0xce, 0x38, 0x7b, 0x3d, 0xcc, 0x65, 0xb2, 0x99, 0xa3, 0x92, 0x78, 0x2f, 0xfc, 0xc6, - 0x39, 0x38, 0xd9, 0x36, 0xcd, 0x76, 0x07, 0x9f, 0xa1, 0x90, 0xcd, 0xfe, 0xd6, 0x99, 0x16, 0xb6, - 0x35, 0x4b, 0xef, 0x39, 0xa6, 0xc5, 0xe5, 0x35, 0xc1, 0x30, 0x66, 0x05, 0x86, 0xb4, 0x02, 0x93, - 0xe7, 0xf5, 0x0e, 0x5e, 0x70, 0x11, 0xd7, 0xb0, 0x83, 0x1e, 0x85, 0xec, 0x96, 0xde, 0xc1, 0xd5, - 0xd4, 0xc9, 0xcc, 0x4c, 0xf1, 0xec, 0x1d, 0xb3, 0x21, 0xa2, 0xd9, 0x20, 0xc5, 0x2a, 0x01, 0xcb, - 0x94, 0x42, 0xfa, 0x6e, 0x16, 0xa6, 0x22, 0x6a, 0x11, 0x82, 0xac, 0xa1, 0x76, 0x31, 0x95, 0x4a, - 0x41, 0xa6, 0xbf, 0x51, 0x15, 0xc6, 0x7a, 0xaa, 0xb6, 0xa3, 0xb6, 0x31, 0x15, 0x4a, 0x41, 0x16, - 0x45, 0x74, 0x02, 0xa0, 0x85, 0x7b, 0xd8, 0x68, 0x61, 0x43, 0xdb, 0xab, 0x66, 0x4e, 0x66, 0x66, - 0x0a, 0xb2, 0x0f, 0x82, 0xee, 0x85, 0xc9, 0x5e, 0x7f, 0xb3, 0xa3, 0x6b, 0x8a, 0x0f, 0x0d, 0x4e, - 0x66, 0x66, 0x46, 0xe5, 0x0a, 0xab, 0x58, 0xf0, 0x90, 0xef, 0x86, 0x89, 0x6b, 0x58, 0xdd, 0xf1, - 0xa3, 0x16, 0x29, 0x6a, 0x99, 0x80, 0x7d, 0x88, 0xf3, 0x50, 0xea, 0x62, 0xdb, 0x56, 0xdb, 0x58, - 0x21, 0xf2, 0xad, 0x66, 0xe9, 0xe8, 0x4f, 0x0e, 0x8c, 0x3e, 0x3c, 0xf2, 0x22, 0xa7, 0x5a, 0xdf, - 0xeb, 0x61, 0x34, 0x07, 0x05, 0x6c, 0xf4, 0xbb, 0x8c, 0xc3, 0xe8, 0x10, 0xf9, 0x2d, 0x1a, 0xfd, - 0x6e, 0x98, 0x4b, 0x9e, 0x90, 0x71, 0x16, 0x63, 0x36, 0xb6, 0xae, 0xea, 0x1a, 0xae, 0xe6, 0x28, - 0x83, 0xbb, 0x07, 0x18, 0xac, 0xb1, 0xfa, 0x30, 0x0f, 0x41, 0x87, 0xe6, 0xa1, 0x80, 0x77, 0x1d, - 0x6c, 0xd8, 0xba, 0x69, 0x54, 0xc7, 0x28, 0x93, 0x3b, 0x23, 0x66, 0x11, 0x77, 0x5a, 0x61, 0x16, - 0x1e, 0x1d, 0x7a, 0x18, 0xc6, 0xcc, 0x1e, 0x59, 0x6b, 0x76, 0x35, 0x7f, 0x32, 0x35, 0x53, 0x3c, - 0x7b, 0x6b, 0xa4, 0x22, 0x5c, 0x66, 0x38, 0xb2, 0x40, 0x46, 0x4b, 0x50, 0xb1, 0xcd, 0xbe, 0xa5, - 0x61, 0x45, 0x33, 0x5b, 0x58, 0xd1, 0x8d, 0x2d, 0xb3, 0x5a, 0xa0, 0x0c, 0xea, 0x83, 0x03, 0xa1, - 0x88, 0xf3, 0x66, 0x0b, 0x2f, 0x19, 0x5b, 0xa6, 0x5c, 0xb6, 0x03, 0x65, 0xb2, 0x5e, 0xed, 0x3d, - 0xc3, 0x51, 0x77, 0xab, 0x25, 0xaa, 0x21, 0xbc, 0x24, 0x7d, 0x3d, 0x07, 0x13, 0x49, 0x54, 0xec, - 0x1c, 0x8c, 0x6e, 0x91, 0x51, 0x56, 0xd3, 0x87, 0x91, 0x01, 0xa3, 0x09, 0x0a, 0x31, 0x77, 0x83, - 0x42, 0x9c, 0x83, 0xa2, 0x81, 0x6d, 0x07, 0xb7, 0x98, 0x46, 0x64, 0x12, 0xea, 0x14, 0x30, 0xa2, - 0x41, 0x95, 0xca, 0xde, 0x90, 0x4a, 0x3d, 0x07, 0x13, 0x6e, 0x97, 0x14, 0x4b, 0x35, 0xda, 0x42, - 0x37, 0xcf, 0xc4, 0xf5, 0x64, 0x76, 0x51, 0xd0, 0xc9, 0x84, 0x4c, 0x2e, 0xe3, 0x40, 0x19, 0x2d, - 0x00, 0x98, 0x06, 0x36, 0xb7, 0x94, 0x16, 0xd6, 0x3a, 0xd5, 0xfc, 0x10, 0x29, 0x5d, 0x26, 0x28, - 0x03, 0x52, 0x32, 0x19, 0x54, 0xeb, 0xa0, 0xc7, 0x3c, 0x55, 0x1b, 0x1b, 0xa2, 0x29, 0x2b, 0x6c, - 0x91, 0x0d, 0x68, 0xdb, 0x06, 0x94, 0x2d, 0x4c, 0xf4, 0x1e, 0xb7, 0xf8, 0xc8, 0x0a, 0xb4, 0x13, - 0xb3, 0xb1, 0x23, 0x93, 0x39, 0x19, 0x1b, 0xd8, 0xb8, 0xe5, 0x2f, 0xa2, 0x53, 0xe0, 0x02, 0x14, - 0xaa, 0x56, 0x40, 0xad, 0x50, 0x49, 0x00, 0x2f, 0xa9, 0x5d, 0x5c, 0x7b, 0x09, 0xca, 0x41, 0xf1, - 0x10, 0x33, 0x6f, 0x3b, 0xaa, 0xe5, 0x50, 0x2d, 0x1c, 0x95, 0x59, 0x81, 0x38, 0x22, 0x6c, 0xb4, - 0xa8, 0x95, 0x1b, 0x95, 0xc9, 0x4f, 0xf4, 0x7e, 0x6f, 0xc0, 0x19, 0x3a, 0xe0, 0xbb, 0x06, 0x67, - 0x34, 0xc0, 0x39, 0x3c, 0xee, 0xda, 0x23, 0x30, 0x1e, 0x18, 0x40, 0xd2, 0xa6, 0xa5, 0x0f, 0xc3, - 0x91, 0x48, 0xd6, 0xe8, 0x39, 0x98, 0xee, 0x1b, 0xba, 0xe1, 0x60, 0xab, 0x67, 0x61, 0xa2, 0xb1, - 0xac, 0xa9, 0xea, 0x5f, 0x8e, 0x0d, 0xd1, 0xb9, 0x0d, 0x3f, 0x36, 0xe3, 0x22, 0x4f, 0xf5, 0x07, - 0x81, 0xf7, 0x14, 0xf2, 0x7f, 0x35, 0x56, 0x79, 0xf9, 0xe5, 0x97, 0x5f, 0x4e, 0x4b, 0xaf, 0xe4, - 0x60, 0x3a, 0x6a, 0xcd, 0x44, 0x2e, 0xdf, 0xa3, 0x90, 0x33, 0xfa, 0xdd, 0x4d, 0x6c, 0x51, 0x21, - 0x8d, 0xca, 0xbc, 0x84, 0xe6, 0x60, 0xb4, 0xa3, 0x6e, 0x62, 0xe6, 0x92, 0xcb, 0x67, 0xef, 0x4d, - 0xb4, 0x2a, 0x67, 0x97, 0x09, 0x89, 0xcc, 0x28, 0xd1, 0x13, 0x90, 0xe5, 0x26, 0x9a, 0x70, 0xb8, - 0x27, 0x19, 0x07, 0xb2, 0x96, 0x64, 0x4a, 0x87, 0x6e, 0x81, 0x02, 0xf9, 0xcb, 0x74, 0x23, 0x47, - 0xfb, 0x9c, 0x27, 0x00, 0xa2, 0x17, 0xa8, 0x06, 0x79, 0xba, 0x4c, 0x5a, 0x58, 0xb8, 0x36, 0xb7, - 0x4c, 0x14, 0xab, 0x85, 0xb7, 0xd4, 0x7e, 0xc7, 0x51, 0xae, 0xaa, 0x9d, 0x3e, 0xa6, 0x0a, 0x5f, - 0x90, 0x4b, 0x1c, 0x78, 0x85, 0xc0, 0x48, 0xe4, 0xc1, 0x56, 0x95, 0x6e, 0xb4, 0xf0, 0x2e, 0xb5, - 0x9e, 0xa3, 0x32, 0x5b, 0x68, 0x4b, 0x04, 0x42, 0x9a, 0x7f, 0xc1, 0x36, 0x0d, 0xa1, 0x9a, 0xb4, - 0x09, 0x02, 0xa0, 0xcd, 0x3f, 0x12, 0x36, 0xdc, 0xb7, 0x45, 0x0f, 0x2f, 0xac, 0x53, 0xd2, 0x57, - 0xd3, 0x90, 0xa5, 0xf6, 0x62, 0x02, 0x8a, 0xeb, 0x1f, 0x58, 0x5d, 0x54, 0x16, 0x2e, 0x6f, 0x34, - 0x97, 0x17, 0x2b, 0x29, 0x54, 0x06, 0xa0, 0x80, 0xf3, 0xcb, 0x97, 0xe7, 0xd6, 0x2b, 0x69, 0xb7, - 0xbc, 0x74, 0x69, 0xfd, 0xe1, 0x07, 0x2b, 0x19, 0x97, 0x60, 0x83, 0x01, 0xb2, 0x7e, 0x84, 0xf7, - 0x9e, 0xad, 0x8c, 0xa2, 0x0a, 0x94, 0x18, 0x83, 0xa5, 0xe7, 0x16, 0x17, 0x1e, 0x7e, 0xb0, 0x92, - 0x0b, 0x42, 0xde, 0x7b, 0xb6, 0x32, 0x86, 0xc6, 0xa1, 0x40, 0x21, 0xcd, 0xcb, 0x97, 0x97, 0x2b, - 0x79, 0x97, 0xe7, 0xda, 0xba, 0xbc, 0x74, 0xe9, 0x42, 0xa5, 0xe0, 0xf2, 0xbc, 0x20, 0x5f, 0xde, - 0x58, 0xad, 0x80, 0xcb, 0x61, 0x65, 0x71, 0x6d, 0x6d, 0xee, 0xc2, 0x62, 0xa5, 0xe8, 0x62, 0x34, - 0x3f, 0xb0, 0xbe, 0xb8, 0x56, 0x29, 0x05, 0xba, 0xf5, 0xde, 0xb3, 0x95, 0x71, 0xb7, 0x89, 0xc5, - 0x4b, 0x1b, 0x2b, 0x95, 0x32, 0x9a, 0x84, 0x71, 0xd6, 0x84, 0xe8, 0xc4, 0x44, 0x08, 0xf4, 0xf0, - 0x83, 0x95, 0x8a, 0xd7, 0x11, 0xc6, 0x65, 0x32, 0x00, 0x78, 0xf8, 0xc1, 0x0a, 0x92, 0xe6, 0x61, - 0x94, 0x6a, 0x17, 0x42, 0x50, 0x5e, 0x9e, 0x6b, 0x2e, 0x2e, 0x2b, 0x97, 0x57, 0xd7, 0x97, 0x2e, - 0x5f, 0x9a, 0x5b, 0xae, 0xa4, 0x3c, 0x98, 0xbc, 0xf8, 0xcc, 0xc6, 0x92, 0xbc, 0xb8, 0x50, 0x49, - 0xfb, 0x61, 0xab, 0x8b, 0x73, 0xeb, 0x8b, 0x0b, 0x95, 0x8c, 0xa4, 0xc1, 0x74, 0x94, 0x9d, 0x8c, - 0x5c, 0x19, 0xbe, 0x29, 0x4e, 0x0f, 0x99, 0x62, 0xca, 0x6b, 0x60, 0x8a, 0x5f, 0x4f, 0xc3, 0x54, - 0x84, 0xaf, 0x88, 0x6c, 0xe4, 0x49, 0x18, 0x65, 0x2a, 0xca, 0xbc, 0xe7, 0xe9, 0x48, 0xa7, 0x43, - 0x15, 0x76, 0xc0, 0x83, 0x52, 0x3a, 0x7f, 0x04, 0x91, 0x19, 0x12, 0x41, 0x10, 0x16, 0x03, 0x36, - 0xfd, 0x43, 0x03, 0x36, 0x9d, 0xb9, 0xbd, 0x87, 0x93, 0xb8, 0x3d, 0x0a, 0x3b, 0x9c, 0x6d, 0x1f, - 0x8d, 0xb0, 0xed, 0xe7, 0x60, 0x72, 0x80, 0x51, 0x62, 0x1b, 0xfb, 0x91, 0x14, 0x54, 0x87, 0x09, + 0x8e, 0xc2, 0x24, 0xca, 0x85, 0x76, 0x5c, 0xd2, 0x8f, 0xb8, 0xfa, 0x6b, 0xbe, 0x76, 0x16, 0x33, + 0x38, 0x1e, 0x29, 0xba, 0xc4, 0x5f, 0xd8, 0x7e, 0xfd, 0xde, 0xeb, 0xee, 0xd7, 0xaf, 0xdf, 0x7b, + 0xfd, 0xba, 0x7b, 0x00, 0x5f, 0x4e, 0xc3, 0x6d, 0x9a, 0x69, 0x77, 0x4d, 0xfb, 0xcc, 0x8b, 0x7d, + 0x6c, 0xed, 0x9d, 0xe9, 0xa9, 0x6d, 0xdd, 0x50, 0x1d, 0xdd, 0x34, 0x66, 0x7b, 0x96, 0xe9, 0x98, + 0xa8, 0xc4, 0xaa, 0x67, 0x69, 0xb5, 0x64, 0x40, 0x71, 0x55, 0x6d, 0x63, 0x19, 0xbf, 0xd8, 0xc7, + 0xb6, 0x83, 0x2a, 0x90, 0xd9, 0xc1, 0x7b, 0xd5, 0xd4, 0xc9, 0xd4, 0x4c, 0x49, 0x26, 0x3f, 0xd1, + 0x51, 0xc8, 0x99, 0x5b, 0x5b, 0x36, 0x76, 0xaa, 0xe9, 0x93, 0xa9, 0x99, 0xac, 0xcc, 0x4b, 0x68, + 0x1a, 0x46, 0x3b, 0x7a, 0x57, 0x77, 0xaa, 0x19, 0x0a, 0x66, 0x05, 0x54, 0x87, 0xa2, 0x66, 0xf6, + 0x0d, 0x47, 0x71, 0x4c, 0x47, 0xed, 0x54, 0xb3, 0x27, 0x53, 0x33, 0x79, 0x19, 0x28, 0x68, 0x9d, + 0x40, 0xa4, 0x27, 0xa1, 0xc4, 0xda, 0xb3, 0x7b, 0xa6, 0x61, 0x63, 0x74, 0x1c, 0xf2, 0x06, 0xde, + 0x75, 0x14, 0xaf, 0xd5, 0x31, 0x52, 0x7e, 0x1a, 0xef, 0x91, 0x16, 0x18, 0x17, 0xd6, 0x30, 0x2b, + 0x34, 0x9b, 0xdf, 0x7a, 0xed, 0x44, 0xea, 0xdb, 0xaf, 0x9d, 0x48, 0xfd, 0xd9, 0x6b, 0x27, 0x52, + 0x9f, 0x7e, 0xfd, 0xc4, 0xc8, 0xb7, 0x5f, 0x3f, 0x31, 0xf2, 0x27, 0xaf, 0x9f, 0x18, 0x79, 0x7e, + 0xa6, 0xad, 0x3b, 0xdb, 0xfd, 0xcd, 0x59, 0xcd, 0xec, 0x9e, 0xe1, 0x22, 0x60, 0x7f, 0xee, 0xb7, + 0x5b, 0x3b, 0x67, 0x9c, 0xbd, 0x1e, 0xe6, 0x32, 0xd9, 0xcc, 0x51, 0x49, 0xbc, 0x1f, 0x7e, 0xe3, + 0x1c, 0x9c, 0x6c, 0x9b, 0x66, 0xbb, 0x83, 0xcf, 0x50, 0xc8, 0x66, 0x7f, 0xeb, 0x4c, 0x0b, 0xdb, + 0x9a, 0xa5, 0xf7, 0x1c, 0xd3, 0xe2, 0xf2, 0x9a, 0x60, 0x18, 0xb3, 0x02, 0x43, 0x5a, 0x81, 0xc9, + 0xf3, 0x7a, 0x07, 0x2f, 0xb8, 0x88, 0x6b, 0xd8, 0x41, 0x8f, 0x42, 0x76, 0x4b, 0xef, 0xe0, 0x6a, + 0xea, 0x64, 0x66, 0xa6, 0x78, 0xf6, 0x8e, 0xd9, 0x10, 0xd1, 0x6c, 0x90, 0x62, 0x95, 0x80, 0x65, + 0x4a, 0x21, 0x7d, 0x2f, 0x0b, 0x53, 0x11, 0xb5, 0x08, 0x41, 0xd6, 0x50, 0xbb, 0x98, 0x4a, 0xa5, + 0x20, 0xd3, 0xdf, 0xa8, 0x0a, 0x63, 0x3d, 0x55, 0xdb, 0x51, 0xdb, 0x98, 0x0a, 0xa5, 0x20, 0x8b, + 0x22, 0x3a, 0x01, 0xd0, 0xc2, 0x3d, 0x6c, 0xb4, 0xb0, 0xa1, 0xed, 0x55, 0x33, 0x27, 0x33, 0x33, + 0x05, 0xd9, 0x07, 0x41, 0xf7, 0xc2, 0x64, 0xaf, 0xbf, 0xd9, 0xd1, 0x35, 0xc5, 0x87, 0x06, 0x27, + 0x33, 0x33, 0xa3, 0x72, 0x85, 0x55, 0x2c, 0x78, 0xc8, 0x77, 0xc3, 0xc4, 0x35, 0xac, 0xee, 0xf8, + 0x51, 0x8b, 0x14, 0xb5, 0x4c, 0xc0, 0x3e, 0xc4, 0x79, 0x28, 0x75, 0xb1, 0x6d, 0xab, 0x6d, 0xac, + 0x10, 0xf9, 0x56, 0xb3, 0x74, 0xf4, 0x27, 0x07, 0x46, 0x1f, 0x1e, 0x79, 0x91, 0x53, 0xad, 0xef, + 0xf5, 0x30, 0x9a, 0x83, 0x02, 0x36, 0xfa, 0x5d, 0xc6, 0x61, 0x74, 0x88, 0xfc, 0x16, 0x8d, 0x7e, + 0x37, 0xcc, 0x25, 0x4f, 0xc8, 0x38, 0x8b, 0x31, 0x1b, 0x5b, 0x57, 0x75, 0x0d, 0x57, 0x73, 0x94, + 0xc1, 0xdd, 0x03, 0x0c, 0xd6, 0x58, 0x7d, 0x98, 0x87, 0xa0, 0x43, 0xf3, 0x50, 0xc0, 0xbb, 0x0e, + 0x36, 0x6c, 0xdd, 0x34, 0xaa, 0x63, 0x94, 0xc9, 0x9d, 0x11, 0xb3, 0x88, 0x3b, 0xad, 0x30, 0x0b, + 0x8f, 0x0e, 0x3d, 0x0c, 0x63, 0x66, 0x8f, 0xac, 0x35, 0xbb, 0x9a, 0x3f, 0x99, 0x9a, 0x29, 0x9e, + 0xbd, 0x35, 0x52, 0x11, 0x2e, 0x33, 0x1c, 0x59, 0x20, 0xa3, 0x25, 0xa8, 0xd8, 0x66, 0xdf, 0xd2, + 0xb0, 0xa2, 0x99, 0x2d, 0xac, 0xe8, 0xc6, 0x96, 0x59, 0x2d, 0x50, 0x06, 0xf5, 0xc1, 0x81, 0x50, + 0xc4, 0x79, 0xb3, 0x85, 0x97, 0x8c, 0x2d, 0x53, 0x2e, 0xdb, 0x81, 0x32, 0x59, 0xaf, 0xf6, 0x9e, + 0xe1, 0xa8, 0xbb, 0xd5, 0x12, 0xd5, 0x10, 0x5e, 0x92, 0xbe, 0x91, 0x83, 0x89, 0x24, 0x2a, 0x76, + 0x0e, 0x46, 0xb7, 0xc8, 0x28, 0xab, 0xe9, 0xc3, 0xc8, 0x80, 0xd1, 0x04, 0x85, 0x98, 0xbb, 0x41, + 0x21, 0xce, 0x41, 0xd1, 0xc0, 0xb6, 0x83, 0x5b, 0x4c, 0x23, 0x32, 0x09, 0x75, 0x0a, 0x18, 0xd1, + 0xa0, 0x4a, 0x65, 0x6f, 0x48, 0xa5, 0x9e, 0x83, 0x09, 0xb7, 0x4b, 0x8a, 0xa5, 0x1a, 0x6d, 0xa1, + 0x9b, 0x67, 0xe2, 0x7a, 0x32, 0xbb, 0x28, 0xe8, 0x64, 0x42, 0x26, 0x97, 0x71, 0xa0, 0x8c, 0x16, + 0x00, 0x4c, 0x03, 0x9b, 0x5b, 0x4a, 0x0b, 0x6b, 0x9d, 0x6a, 0x7e, 0x88, 0x94, 0x2e, 0x13, 0x94, + 0x01, 0x29, 0x99, 0x0c, 0xaa, 0x75, 0xd0, 0x63, 0x9e, 0xaa, 0x8d, 0x0d, 0xd1, 0x94, 0x15, 0xb6, + 0xc8, 0x06, 0xb4, 0x6d, 0x03, 0xca, 0x16, 0x26, 0x7a, 0x8f, 0x5b, 0x7c, 0x64, 0x05, 0xda, 0x89, + 0xd9, 0xd8, 0x91, 0xc9, 0x9c, 0x8c, 0x0d, 0x6c, 0xdc, 0xf2, 0x17, 0xd1, 0x29, 0x70, 0x01, 0x0a, + 0x55, 0x2b, 0xa0, 0x56, 0xa8, 0x24, 0x80, 0x97, 0xd4, 0x2e, 0xae, 0xbd, 0x04, 0xe5, 0xa0, 0x78, + 0x88, 0x99, 0xb7, 0x1d, 0xd5, 0x72, 0xa8, 0x16, 0x8e, 0xca, 0xac, 0x40, 0x1c, 0x11, 0x36, 0x5a, + 0xd4, 0xca, 0x8d, 0xca, 0xe4, 0x27, 0xfa, 0xa0, 0x37, 0xe0, 0x0c, 0x1d, 0xf0, 0x5d, 0x83, 0x33, + 0x1a, 0xe0, 0x1c, 0x1e, 0x77, 0xed, 0x11, 0x18, 0x0f, 0x0c, 0x20, 0x69, 0xd3, 0xd2, 0x47, 0xe0, + 0x48, 0x24, 0x6b, 0xf4, 0x1c, 0x4c, 0xf7, 0x0d, 0xdd, 0x70, 0xb0, 0xd5, 0xb3, 0x30, 0xd1, 0x58, + 0xd6, 0x54, 0xf5, 0xcf, 0xc7, 0x86, 0xe8, 0xdc, 0x86, 0x1f, 0x9b, 0x71, 0x91, 0xa7, 0xfa, 0x83, + 0xc0, 0x7b, 0x0a, 0xf9, 0xbf, 0x18, 0xab, 0xbc, 0xfc, 0xf2, 0xcb, 0x2f, 0xa7, 0xa5, 0x57, 0x72, + 0x30, 0x1d, 0xb5, 0x66, 0x22, 0x97, 0xef, 0x51, 0xc8, 0x19, 0xfd, 0xee, 0x26, 0xb6, 0xa8, 0x90, + 0x46, 0x65, 0x5e, 0x42, 0x73, 0x30, 0xda, 0x51, 0x37, 0x31, 0x73, 0xc9, 0xe5, 0xb3, 0xf7, 0x26, + 0x5a, 0x95, 0xb3, 0xcb, 0x84, 0x44, 0x66, 0x94, 0xe8, 0x09, 0xc8, 0x72, 0x13, 0x4d, 0x38, 0xdc, + 0x93, 0x8c, 0x03, 0x59, 0x4b, 0x32, 0xa5, 0x43, 0xb7, 0x40, 0x81, 0xfc, 0x65, 0xba, 0x91, 0xa3, + 0x7d, 0xce, 0x13, 0x00, 0xd1, 0x0b, 0x54, 0x83, 0x3c, 0x5d, 0x26, 0x2d, 0x2c, 0x5c, 0x9b, 0x5b, + 0x26, 0x8a, 0xd5, 0xc2, 0x5b, 0x6a, 0xbf, 0xe3, 0x28, 0x57, 0xd5, 0x4e, 0x1f, 0x53, 0x85, 0x2f, + 0xc8, 0x25, 0x0e, 0xbc, 0x42, 0x60, 0x24, 0xf2, 0x60, 0xab, 0x4a, 0x37, 0x5a, 0x78, 0x97, 0x5a, + 0xcf, 0x51, 0x99, 0x2d, 0xb4, 0x25, 0x02, 0x21, 0xcd, 0xbf, 0x60, 0x9b, 0x86, 0x50, 0x4d, 0xda, + 0x04, 0x01, 0xd0, 0xe6, 0x1f, 0x09, 0x1b, 0xee, 0xdb, 0xa2, 0x87, 0x17, 0xd6, 0x29, 0xe9, 0xab, + 0x69, 0xc8, 0x52, 0x7b, 0x31, 0x01, 0xc5, 0xf5, 0x0f, 0xad, 0x2e, 0x2a, 0x0b, 0x97, 0x37, 0x9a, + 0xcb, 0x8b, 0x95, 0x14, 0x2a, 0x03, 0x50, 0xc0, 0xf9, 0xe5, 0xcb, 0x73, 0xeb, 0x95, 0xb4, 0x5b, + 0x5e, 0xba, 0xb4, 0xfe, 0xf0, 0x83, 0x95, 0x8c, 0x4b, 0xb0, 0xc1, 0x00, 0x59, 0x3f, 0xc2, 0xfb, + 0xcf, 0x56, 0x46, 0x51, 0x05, 0x4a, 0x8c, 0xc1, 0xd2, 0x73, 0x8b, 0x0b, 0x0f, 0x3f, 0x58, 0xc9, + 0x05, 0x21, 0xef, 0x3f, 0x5b, 0x19, 0x43, 0xe3, 0x50, 0xa0, 0x90, 0xe6, 0xe5, 0xcb, 0xcb, 0x95, + 0xbc, 0xcb, 0x73, 0x6d, 0x5d, 0x5e, 0xba, 0x74, 0xa1, 0x52, 0x70, 0x79, 0x5e, 0x90, 0x2f, 0x6f, + 0xac, 0x56, 0xc0, 0xe5, 0xb0, 0xb2, 0xb8, 0xb6, 0x36, 0x77, 0x61, 0xb1, 0x52, 0x74, 0x31, 0x9a, + 0x1f, 0x5a, 0x5f, 0x5c, 0xab, 0x94, 0x02, 0xdd, 0x7a, 0xff, 0xd9, 0xca, 0xb8, 0xdb, 0xc4, 0xe2, + 0xa5, 0x8d, 0x95, 0x4a, 0x19, 0x4d, 0xc2, 0x38, 0x6b, 0x42, 0x74, 0x62, 0x22, 0x04, 0x7a, 0xf8, + 0xc1, 0x4a, 0xc5, 0xeb, 0x08, 0xe3, 0x32, 0x19, 0x00, 0x3c, 0xfc, 0x60, 0x05, 0x49, 0xf3, 0x30, + 0x4a, 0xb5, 0x0b, 0x21, 0x28, 0x2f, 0xcf, 0x35, 0x17, 0x97, 0x95, 0xcb, 0xab, 0xeb, 0x4b, 0x97, + 0x2f, 0xcd, 0x2d, 0x57, 0x52, 0x1e, 0x4c, 0x5e, 0x7c, 0x66, 0x63, 0x49, 0x5e, 0x5c, 0xa8, 0xa4, + 0xfd, 0xb0, 0xd5, 0xc5, 0xb9, 0xf5, 0xc5, 0x85, 0x4a, 0x46, 0xd2, 0x60, 0x3a, 0xca, 0x4e, 0x46, + 0xae, 0x0c, 0xdf, 0x14, 0xa7, 0x87, 0x4c, 0x31, 0xe5, 0x35, 0x30, 0xc5, 0xaf, 0xa7, 0x61, 0x2a, + 0xc2, 0x57, 0x44, 0x36, 0xf2, 0x24, 0x8c, 0x32, 0x15, 0x65, 0xde, 0xf3, 0x74, 0xa4, 0xd3, 0xa1, + 0x0a, 0x3b, 0xe0, 0x41, 0x29, 0x9d, 0x3f, 0x82, 0xc8, 0x0c, 0x89, 0x20, 0x08, 0x8b, 0x01, 0x9b, + 0xfe, 0xd3, 0x03, 0x36, 0x9d, 0xb9, 0xbd, 0x87, 0x93, 0xb8, 0x3d, 0x0a, 0x3b, 0x9c, 0x6d, 0x1f, + 0x8d, 0xb0, 0xed, 0xe7, 0x60, 0x72, 0x80, 0x51, 0x62, 0x1b, 0xfb, 0xd1, 0x14, 0x54, 0x87, 0x09, 0x27, 0xc6, 0xd2, 0xa5, 0x03, 0x96, 0xee, 0x5c, 0x58, 0x82, 0xb7, 0x0f, 0x9f, 0x84, 0x81, 0xb9, - 0xfe, 0x62, 0x0a, 0x8e, 0x46, 0x47, 0x8a, 0x91, 0x7d, 0x78, 0x02, 0x72, 0x5d, 0xec, 0x6c, 0x9b, + 0xfe, 0x52, 0x0a, 0x8e, 0x46, 0x47, 0x8a, 0x91, 0x7d, 0x78, 0x02, 0x72, 0x5d, 0xec, 0x6c, 0x9b, 0x22, 0x5a, 0xba, 0x2b, 0xc2, 0x07, 0x93, 0xea, 0xf0, 0x64, 0x73, 0x2a, 0xbf, 0x13, 0xcf, 0x0c, - 0x0b, 0xf7, 0x58, 0x6f, 0x06, 0x7a, 0xfa, 0xf1, 0x34, 0x1c, 0x89, 0x64, 0x1e, 0xd9, 0xd1, 0xdb, + 0x0b, 0xf7, 0x58, 0x6f, 0x06, 0x7a, 0xfa, 0x89, 0x34, 0x1c, 0x89, 0x64, 0x1e, 0xd9, 0xd1, 0xdb, 0x00, 0x74, 0xa3, 0xd7, 0x77, 0x58, 0x44, 0xc4, 0x0c, 0x6c, 0x81, 0x42, 0xa8, 0xf1, 0x22, 0xc6, 0xb3, 0xef, 0xb8, 0xf5, 0x19, 0x5a, 0x0f, 0x0c, 0x44, 0x11, 0x1e, 0xf5, 0x3a, 0x9a, 0xa5, 0x1d, 0x3d, 0x31, 0x64, 0xa4, 0x03, 0x8a, 0xf9, 0x00, 0x54, 0xb4, 0x8e, 0x8e, 0x0d, 0x47, 0xb1, 0x1d, 0x0b, 0xab, 0x5d, 0xdd, 0x68, 0x53, 0x0f, 0x92, 0x6f, 0x8c, 0x6e, 0xa9, 0x1d, 0x1b, 0xcb, 0x13, 0xac, 0x7a, 0x4d, 0xd4, 0x12, 0x0a, 0xaa, 0x40, 0x96, 0x8f, 0x22, 0x17, 0xa0, 0x60, 0xd5, 0x2e, - 0x85, 0xf4, 0x2b, 0x05, 0x28, 0xfa, 0xe2, 0x6a, 0x74, 0x3b, 0x94, 0x5e, 0x50, 0xaf, 0xaa, 0x8a, + 0x85, 0xf4, 0xab, 0x05, 0x28, 0xfa, 0xe2, 0x6a, 0x74, 0x3b, 0x94, 0x5e, 0x50, 0xaf, 0xaa, 0x8a, 0xd8, 0x2b, 0x31, 0x49, 0x14, 0x09, 0x6c, 0x95, 0xef, 0x97, 0x1e, 0x80, 0x69, 0x8a, 0x62, 0xf6, 0x1d, 0x6c, 0x29, 0x5a, 0x47, 0xb5, 0x6d, 0x2a, 0xb4, 0x3c, 0x45, 0x45, 0xa4, 0xee, 0x32, 0xa9, 0x9a, 0x17, 0x35, 0xe8, 0x21, 0x98, 0xa2, 0x14, 0xdd, 0x7e, 0xc7, 0xd1, 0x7b, 0x1d, 0xac, 0x90, @@ -1690,38 +1690,38 @@ func StakingDescription() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descri 0x51, 0x04, 0x1a, 0x9e, 0xa1, 0x68, 0xe5, 0xde, 0x76, 0xcf, 0xdf, 0xee, 0x29, 0x18, 0x27, 0x98, 0x5e, 0xa3, 0xa7, 0x59, 0x40, 0xd6, 0xdb, 0xf6, 0xb5, 0xf8, 0x20, 0x1c, 0x25, 0x48, 0x5d, 0xec, 0xa8, 0x2d, 0xd5, 0x51, 0x7d, 0xd8, 0xf7, 0x51, 0x6c, 0x22, 0xf7, 0x15, 0x5e, 0x19, 0xe8, 0xa7, - 0xd5, 0xdf, 0xdc, 0x73, 0x35, 0xeb, 0x7e, 0xd6, 0x4f, 0x02, 0x13, 0xba, 0xf5, 0x96, 0x05, 0xdd, + 0xd5, 0xdf, 0xdc, 0x73, 0x35, 0xeb, 0x7e, 0xd6, 0x4f, 0x02, 0x13, 0xba, 0xf5, 0xb6, 0x05, 0xdd, 0x52, 0x03, 0x4a, 0x7e, 0xc5, 0x47, 0x05, 0x60, 0xaa, 0x5f, 0x49, 0x91, 0x28, 0x68, 0xfe, 0xf2, 0x02, 0x89, 0x5f, 0x9e, 0x5f, 0xac, 0xa4, 0x49, 0x1c, 0xb5, 0xbc, 0xb4, 0xbe, 0xa8, 0xc8, 0x1b, 0x97, 0xd6, 0x97, 0x56, 0x16, 0x2b, 0x19, 0x5f, 0xc0, 0xfe, 0x54, 0x36, 0x7f, 0x57, 0xe5, 0x6e, - 0xe9, 0xdb, 0x69, 0x28, 0x07, 0x77, 0x60, 0xe8, 0x71, 0x38, 0x26, 0xd2, 0x25, 0x36, 0x76, 0x94, + 0xe9, 0x3b, 0x69, 0x28, 0x07, 0x77, 0x60, 0xe8, 0x71, 0x38, 0x26, 0xd2, 0x25, 0x36, 0x76, 0x94, 0x6b, 0xba, 0x45, 0x57, 0x64, 0x57, 0x65, 0xde, 0xd1, 0xd5, 0x89, 0x69, 0x8e, 0xb5, 0x86, 0x9d, 0x67, 0x75, 0x8b, 0xac, 0xb7, 0xae, 0xea, 0xa0, 0x65, 0xa8, 0x1b, 0xa6, 0x62, 0x3b, 0xaa, 0xd1, 0x52, 0xad, 0x96, 0xe2, 0x25, 0xaa, 0x14, 0x55, 0xd3, 0xb0, 0x6d, 0x9b, 0xcc, 0x13, 0xba, 0x5c, 0x6e, 0x35, 0xcc, 0x35, 0x8e, 0xec, 0xb9, 0x88, 0x39, 0x8e, 0x1a, 0xd2, 0xdf, 0xcc, 0x30, 0xfd, 0xbd, 0x05, 0x0a, 0x5d, 0xb5, 0xa7, 0x60, 0xc3, 0xb1, 0xf6, 0x68, 0xdc, 0x9d, 0x97, 0xf3, 0x5d, - 0xb5, 0xb7, 0x48, 0xca, 0x6f, 0xcb, 0xf6, 0xe7, 0xa9, 0x6c, 0x3e, 0x5f, 0x29, 0x3c, 0x95, 0xcd, + 0xb5, 0xb7, 0x48, 0xca, 0xef, 0xc8, 0xf6, 0xe7, 0xa9, 0x6c, 0x3e, 0x5f, 0x29, 0x3c, 0x95, 0xcd, 0x17, 0x2a, 0x20, 0xbd, 0x96, 0x81, 0x92, 0x3f, 0x0e, 0x27, 0xdb, 0x1a, 0x8d, 0xba, 0xac, 0x14, 0x35, 0x6a, 0xa7, 0x0e, 0x8c, 0xda, 0x67, 0xe7, 0x89, 0x2f, 0x6b, 0xe4, 0x58, 0x74, 0x2c, 0x33, 0x4a, 0x12, 0x47, 0x10, 0x65, 0xc3, 0x2c, 0x1a, 0xc9, 0xcb, 0xbc, 0x84, 0x2e, 0x40, 0xee, 0x05, 0x9b, 0xf2, 0xce, 0x51, 0xde, 0x77, 0x1c, 0xcc, 0xfb, 0xa9, 0x35, 0xca, 0xbc, 0xf0, 0xd4, 0x9a, 0x72, 0xe9, 0xb2, 0xbc, 0x32, 0xb7, 0x2c, 0x73, 0x72, 0x74, 0x1c, 0xb2, 0x1d, 0xf5, 0xa5, 0xbd, 0xa0, 0xd7, 0xa3, 0xa0, 0xa4, 0x93, 0x70, 0x1c, 0xb2, 0xd7, 0xb0, 0xba, 0x13, 0xf4, 0x35, 0x14, - 0xf4, 0x16, 0x2e, 0x86, 0x33, 0x30, 0x4a, 0xe5, 0x85, 0x00, 0xb8, 0xc4, 0x2a, 0x23, 0x28, 0x0f, + 0xf4, 0x36, 0x2e, 0x86, 0x33, 0x30, 0x4a, 0xe5, 0x85, 0x00, 0xb8, 0xc4, 0x2a, 0x23, 0x28, 0x0f, 0xd9, 0xf9, 0xcb, 0x32, 0x59, 0x10, 0x15, 0x28, 0x31, 0xa8, 0xb2, 0xba, 0xb4, 0x38, 0xbf, 0x58, 0x49, 0x4b, 0x0f, 0x41, 0x8e, 0x09, 0x81, 0x2c, 0x16, 0x57, 0x0c, 0x95, 0x11, 0x5e, 0xe4, 0x3c, 0x52, 0xa2, 0x76, 0x63, 0xa5, 0xb9, 0x28, 0x57, 0xd2, 0xc1, 0xa9, 0xce, 0x56, 0x46, 0x25, 0x1b, - 0x4a, 0xfe, 0x40, 0xfc, 0xed, 0xd9, 0x64, 0x7f, 0x23, 0x05, 0x45, 0x5f, 0x60, 0x4d, 0x22, 0x22, + 0x4a, 0xfe, 0x40, 0xfc, 0x9d, 0xd9, 0x64, 0x7f, 0x33, 0x05, 0x45, 0x5f, 0x60, 0x4d, 0x22, 0x22, 0xb5, 0xd3, 0x31, 0xaf, 0x29, 0x6a, 0x47, 0x57, 0x6d, 0xae, 0x1a, 0x40, 0x41, 0x73, 0x04, 0x92, - 0x74, 0xea, 0xde, 0xa6, 0x25, 0x32, 0x5a, 0xc9, 0x49, 0x9f, 0x4b, 0x41, 0x25, 0x1c, 0xd9, 0x86, - 0xba, 0x99, 0xfa, 0x71, 0x76, 0x53, 0xfa, 0x4c, 0x0a, 0xca, 0xc1, 0x70, 0x36, 0xd4, 0xbd, 0xdb, - 0x7f, 0xac, 0xdd, 0xfb, 0x8b, 0x34, 0x8c, 0x07, 0x82, 0xd8, 0xa4, 0xbd, 0x7b, 0x11, 0x26, 0xf5, + 0x74, 0xea, 0xde, 0xa1, 0x25, 0x32, 0x5a, 0xc9, 0x49, 0x9f, 0x4f, 0x41, 0x25, 0x1c, 0xd9, 0x86, + 0xba, 0x99, 0xfa, 0x71, 0x76, 0x53, 0xfa, 0x6c, 0x0a, 0xca, 0xc1, 0x70, 0x36, 0xd4, 0xbd, 0xdb, + 0x7f, 0xac, 0xdd, 0xfb, 0xb3, 0x34, 0x8c, 0x07, 0x82, 0xd8, 0xa4, 0xbd, 0x7b, 0x11, 0x26, 0xf5, 0x16, 0xee, 0xf6, 0x4c, 0x07, 0x1b, 0xda, 0x9e, 0xd2, 0xc1, 0x57, 0x71, 0xa7, 0x2a, 0x51, 0xa3, 0x71, 0xe6, 0xe0, 0x30, 0x79, 0x76, 0xc9, 0xa3, 0x5b, 0x26, 0x64, 0x8d, 0xa9, 0xa5, 0x85, 0xc5, - 0x95, 0xd5, 0xcb, 0xeb, 0x8b, 0x97, 0xe6, 0x3f, 0xa0, 0x6c, 0x5c, 0x7a, 0xfa, 0xd2, 0xe5, 0x67, - 0x2f, 0xc9, 0x15, 0x3d, 0x84, 0xf6, 0x16, 0x2e, 0xfb, 0x55, 0xa8, 0x84, 0x3b, 0x85, 0x8e, 0x41, + 0x95, 0xd5, 0xcb, 0xeb, 0x8b, 0x97, 0xe6, 0x3f, 0xa4, 0x6c, 0x5c, 0x7a, 0xfa, 0xd2, 0xe5, 0x67, + 0x2f, 0xc9, 0x15, 0x3d, 0x84, 0xf6, 0x36, 0x2e, 0xfb, 0x55, 0xa8, 0x84, 0x3b, 0x85, 0x8e, 0x41, 0x54, 0xb7, 0x2a, 0x23, 0x68, 0x0a, 0x26, 0x2e, 0x5d, 0x56, 0xd6, 0x96, 0x16, 0x16, 0x95, 0xc5, - 0xf3, 0xe7, 0x17, 0xe7, 0xd7, 0xd7, 0x58, 0xe2, 0xc3, 0xc5, 0x5e, 0x0f, 0x2c, 0x70, 0xe9, 0xd3, + 0xf3, 0xe7, 0x17, 0xe7, 0xd7, 0xd7, 0x58, 0xe2, 0xc3, 0xc5, 0x5e, 0x0f, 0x2c, 0x70, 0xe9, 0x33, 0x19, 0x98, 0x8a, 0xe8, 0x09, 0x9a, 0xe3, 0x5b, 0x16, 0xb6, 0x8b, 0xba, 0x3f, 0x49, 0xef, 0x67, 0x49, 0xcc, 0xb0, 0xaa, 0x5a, 0x0e, 0xdf, 0xe1, 0x9c, 0x06, 0x22, 0x25, 0xc3, 0xd1, 0xb7, 0x74, 0x6c, 0xf1, 0x3c, 0x11, 0xdb, 0xc7, 0x4c, 0x78, 0x70, 0x96, 0x2a, 0xba, 0x0f, 0x50, 0xcf, 0xb4, @@ -1732,436 +1732,436 @@ func StakingDescription() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descri 0xb7, 0x2d, 0xc2, 0x5c, 0x30, 0x62, 0x1b, 0x93, 0xb2, 0x0b, 0xa6, 0x88, 0xb5, 0xa7, 0x20, 0x2f, 0xe4, 0x40, 0x5c, 0x35, 0x91, 0x84, 0xd2, 0x63, 0xbb, 0xed, 0xf4, 0x4c, 0x41, 0xce, 0x1b, 0xa2, 0xf2, 0x76, 0x28, 0xe9, 0xb6, 0xe2, 0x25, 0xe7, 0xd3, 0x27, 0xd3, 0x33, 0x79, 0xb9, 0xa8, 0xdb, - 0x6e, 0x62, 0x53, 0xfa, 0x62, 0x1a, 0xca, 0xc1, 0xc3, 0x05, 0xb4, 0x00, 0xf9, 0x8e, 0xa9, 0xd1, + 0x6e, 0x62, 0x53, 0xfa, 0x52, 0x1a, 0xca, 0xc1, 0xc3, 0x05, 0xb4, 0x00, 0xf9, 0x8e, 0xa9, 0xd1, 0xd3, 0x43, 0x7e, 0xb2, 0x35, 0x13, 0x73, 0x1e, 0x31, 0xbb, 0xcc, 0xf1, 0x65, 0x97, 0xb2, 0xf6, - 0x9f, 0x52, 0x90, 0x17, 0x60, 0x74, 0x14, 0xb2, 0x3d, 0xd5, 0xd9, 0xa6, 0xec, 0x46, 0x9b, 0xe9, + 0x1f, 0x53, 0x90, 0x17, 0x60, 0x74, 0x14, 0xb2, 0x3d, 0xd5, 0xd9, 0xa6, 0xec, 0x46, 0x9b, 0xe9, 0x4a, 0x4a, 0xa6, 0x65, 0x02, 0xb7, 0x7b, 0xaa, 0x41, 0x55, 0x80, 0xc3, 0x49, 0x99, 0xcc, 0x6b, 0x07, 0xab, 0x2d, 0xba, 0xeb, 0x31, 0xbb, 0x5d, 0x6c, 0x38, 0xb6, 0x98, 0x57, 0x0e, 0x9f, 0xe7, 0x60, 0x74, 0x2f, 0x4c, 0x3a, 0x96, 0xaa, 0x77, 0x02, 0xb8, 0x59, 0x8a, 0x5b, 0x11, 0x15, 0x2e, 0x72, 0x03, 0x8e, 0x0b, 0xbe, 0x2d, 0xec, 0xa8, 0xda, 0x36, 0x6e, 0x79, 0x44, 0x39, 0x9a, 0xdd, - 0x38, 0xc6, 0x11, 0x16, 0x78, 0xbd, 0xa0, 0x95, 0xbe, 0x9d, 0x82, 0x49, 0xb1, 0x4f, 0x6b, 0xb9, + 0x38, 0xc6, 0x11, 0x16, 0x78, 0xbd, 0xa0, 0x95, 0xbe, 0x93, 0x82, 0x49, 0xb1, 0x4f, 0x6b, 0xb9, 0xc2, 0x5a, 0x01, 0x50, 0x0d, 0xc3, 0x74, 0xfc, 0xe2, 0x1a, 0x54, 0xe5, 0x01, 0xba, 0xd9, 0x39, 0x97, 0x48, 0xf6, 0x31, 0xa8, 0x75, 0x01, 0xbc, 0x9a, 0xa1, 0x62, 0xab, 0x43, 0x91, 0x9f, 0x1c, 0xd1, 0xe3, 0x47, 0xb6, 0xb3, 0x07, 0x06, 0x22, 0x1b, 0x3a, 0x34, 0x0d, 0xa3, 0x9b, 0xb8, 0xad, - 0x1b, 0x3c, 0x1f, 0xcc, 0x0a, 0x22, 0xff, 0x92, 0x75, 0xf3, 0x2f, 0xcd, 0x4f, 0xa6, 0x60, 0x4a, + 0x1b, 0x3c, 0x1f, 0xcc, 0x0a, 0x22, 0xff, 0x92, 0x75, 0xf3, 0x2f, 0xcd, 0x4f, 0xa5, 0x60, 0x4a, 0x33, 0xbb, 0xe1, 0xfe, 0x36, 0x2b, 0xa1, 0xf4, 0x82, 0x7d, 0x31, 0xf5, 0xfc, 0x13, 0xbe, 0x93, 0xd6, 0xb6, 0xd9, 0x51, 0x8d, 0xb6, 0x77, 0x7e, 0x4a, 0x7f, 0x68, 0xf7, 0xb7, 0xb1, 0x71, 0x7f, - 0xdb, 0xf4, 0x9d, 0xa6, 0x9e, 0xf3, 0x7e, 0xfe, 0x6d, 0x2a, 0xf5, 0x85, 0x74, 0xe6, 0xc2, 0x6a, + 0xdb, 0xf4, 0x9d, 0xa6, 0x9e, 0xf3, 0x7e, 0xfe, 0x75, 0x2a, 0xf5, 0xc5, 0x74, 0xe6, 0xc2, 0x6a, 0xf3, 0xcb, 0xe9, 0xda, 0x05, 0xd6, 0xdc, 0xaa, 0x10, 0x8f, 0x8c, 0xb7, 0x3a, 0x58, 0x23, 0x43, - 0x86, 0xef, 0xdd, 0x0b, 0xd3, 0x6d, 0xb3, 0x6d, 0x52, 0x8e, 0x67, 0xc8, 0x2f, 0x7e, 0x22, 0x5b, + 0x86, 0xef, 0xdf, 0x0b, 0xd3, 0x6d, 0xb3, 0x6d, 0x52, 0x8e, 0x67, 0xc8, 0x2f, 0x7e, 0x22, 0x5b, 0x70, 0xa1, 0xb5, 0xd8, 0xe3, 0xdb, 0xc6, 0x25, 0x98, 0xe2, 0xc8, 0x0a, 0x3d, 0x12, 0x62, 0x1b, - 0x1b, 0x74, 0x60, 0x5a, 0xad, 0xfa, 0xbb, 0xdf, 0xa5, 0x0e, 0x5d, 0x9e, 0xe4, 0xa4, 0xa4, 0x8e, - 0xed, 0x7d, 0x1a, 0x32, 0x1c, 0x09, 0xf0, 0x63, 0xcb, 0x16, 0x5b, 0x31, 0x1c, 0xff, 0x88, 0x73, - 0x9c, 0xf2, 0x71, 0x5c, 0xe3, 0xa4, 0x8d, 0x79, 0x18, 0x3f, 0x0c, 0xaf, 0xff, 0xc0, 0x79, 0x95, + 0x1b, 0x74, 0x60, 0x5a, 0xad, 0xfa, 0xbb, 0xdf, 0xa3, 0x0e, 0x5d, 0x9e, 0xe4, 0xa4, 0xa4, 0x8e, + 0xed, 0x7d, 0x1a, 0x32, 0x1c, 0x09, 0xf0, 0x63, 0xcb, 0x16, 0x5b, 0x31, 0x1c, 0xff, 0x80, 0x73, + 0x9c, 0xf2, 0x71, 0x5c, 0xe3, 0xa4, 0x8d, 0x79, 0x18, 0x3f, 0x0c, 0xaf, 0x7f, 0xcf, 0x79, 0x95, 0xb0, 0x9f, 0xc9, 0x05, 0x98, 0xa0, 0x4c, 0xb4, 0xbe, 0xed, 0x98, 0x5d, 0x6a, 0x13, 0x0f, 0x66, - 0xf3, 0xc7, 0xdf, 0x65, 0xeb, 0xa8, 0x4c, 0xc8, 0xe6, 0x5d, 0xaa, 0x46, 0x03, 0xe8, 0x29, 0x58, - 0x0b, 0x6b, 0x9d, 0x18, 0x0e, 0xdf, 0xe4, 0x1d, 0x71, 0xf1, 0x1b, 0x57, 0x60, 0x9a, 0xfc, 0xa6, - 0x26, 0xcb, 0xdf, 0x93, 0xf8, 0x1c, 0x5c, 0xf5, 0xdb, 0x1f, 0x61, 0x4b, 0x75, 0xca, 0x65, 0xe0, + 0xf3, 0x87, 0xdf, 0x63, 0xeb, 0xa8, 0x4c, 0xc8, 0xe6, 0x5d, 0xaa, 0x46, 0x03, 0xe8, 0x29, 0x58, + 0x0b, 0x6b, 0x9d, 0x18, 0x0e, 0xdf, 0xe2, 0x1d, 0x71, 0xf1, 0x1b, 0x57, 0x60, 0x9a, 0xfc, 0xa6, + 0x26, 0xcb, 0xdf, 0x93, 0xf8, 0x1c, 0x5c, 0xf5, 0x3b, 0x1f, 0x65, 0x4b, 0x75, 0xca, 0x65, 0xe0, 0xeb, 0x93, 0x6f, 0x16, 0xdb, 0xd8, 0x71, 0xb0, 0x65, 0x2b, 0x6a, 0x27, 0xaa, 0x7b, 0xbe, 0x24, 0x46, 0xf5, 0xd7, 0xdf, 0x08, 0xce, 0xe2, 0x05, 0x46, 0x39, 0xd7, 0xe9, 0x34, 0x36, 0xe0, 0x58, - 0x84, 0x56, 0x24, 0xe0, 0xf9, 0x69, 0xce, 0x73, 0x7a, 0x40, 0x33, 0x08, 0xdb, 0x55, 0x10, 0x70, + 0x84, 0x56, 0x24, 0xe0, 0xf9, 0x19, 0xce, 0x73, 0x7a, 0x40, 0x33, 0x08, 0xdb, 0x55, 0x10, 0x70, 0x77, 0x2e, 0x13, 0xf0, 0xfc, 0x0d, 0xce, 0x13, 0x71, 0x5a, 0x31, 0xa5, 0x84, 0xe3, 0x53, 0x30, - 0x79, 0x15, 0x5b, 0x9b, 0xa6, 0xcd, 0x13, 0x47, 0x09, 0xd8, 0x7d, 0x86, 0xb3, 0x9b, 0xe0, 0x84, - 0x34, 0x93, 0x44, 0x78, 0x3d, 0x06, 0xf9, 0x2d, 0x55, 0xc3, 0x09, 0x58, 0x7c, 0x96, 0xb3, 0x18, - 0x23, 0xf8, 0x84, 0x74, 0x0e, 0x4a, 0x6d, 0x93, 0x7b, 0xad, 0x78, 0xf2, 0xcf, 0x71, 0xf2, 0xa2, - 0xa0, 0xe1, 0x2c, 0x7a, 0x66, 0xaf, 0xdf, 0x21, 0x2e, 0x2d, 0x9e, 0xc5, 0x3f, 0x13, 0x2c, 0x04, + 0x79, 0x15, 0x5b, 0x9b, 0xa6, 0xcd, 0x13, 0x47, 0x09, 0xd8, 0x7d, 0x96, 0xb3, 0x9b, 0xe0, 0x84, + 0x34, 0x93, 0x44, 0x78, 0x3d, 0x06, 0xf9, 0x2d, 0x55, 0xc3, 0x09, 0x58, 0x7c, 0x8e, 0xb3, 0x18, + 0x23, 0xf8, 0x84, 0x74, 0x0e, 0x4a, 0x6d, 0x93, 0x7b, 0xad, 0x78, 0xf2, 0xcf, 0x73, 0xf2, 0xa2, + 0xa0, 0xe1, 0x2c, 0x7a, 0x66, 0xaf, 0xdf, 0x21, 0x2e, 0x2d, 0x9e, 0xc5, 0x3f, 0x16, 0x2c, 0x04, 0x0d, 0x67, 0x71, 0x08, 0xb1, 0xbe, 0x2a, 0x58, 0xd8, 0x3e, 0x79, 0x3e, 0x09, 0x45, 0xd3, 0xe8, - 0xec, 0x99, 0x46, 0x92, 0x4e, 0x7c, 0x9e, 0x73, 0x00, 0x4e, 0x42, 0x18, 0x9c, 0x83, 0x42, 0xd2, - 0x89, 0xf8, 0x17, 0x6f, 0x88, 0xe5, 0x21, 0x66, 0xe0, 0x02, 0x4c, 0x08, 0x03, 0xa5, 0x9b, 0x46, - 0x02, 0x16, 0xff, 0x92, 0xb3, 0x28, 0xfb, 0xc8, 0xf8, 0x30, 0x1c, 0x6c, 0x3b, 0x6d, 0x9c, 0x84, - 0xc9, 0x17, 0xc5, 0x30, 0x38, 0x09, 0x17, 0xe5, 0x26, 0x36, 0xb4, 0xed, 0x64, 0x1c, 0xbe, 0x24, - 0x44, 0x29, 0x68, 0x08, 0x8b, 0x79, 0x18, 0xef, 0xaa, 0x96, 0xbd, 0xad, 0x76, 0x12, 0x4d, 0xc7, - 0x6f, 0x72, 0x1e, 0x25, 0x97, 0x88, 0x4b, 0xa4, 0x6f, 0x1c, 0x86, 0xcd, 0x97, 0x85, 0x44, 0x7c, - 0x64, 0x7c, 0xe9, 0xd9, 0x0e, 0xcd, 0xb2, 0x1d, 0x86, 0xdb, 0xbf, 0x12, 0x4b, 0x8f, 0xd1, 0xae, - 0xf8, 0x39, 0x9e, 0x83, 0x82, 0xad, 0xbf, 0x94, 0x88, 0xcd, 0xbf, 0x16, 0x33, 0x4d, 0x09, 0x08, - 0xf1, 0x07, 0xe0, 0x78, 0xa4, 0x9b, 0x48, 0xc0, 0xec, 0xb7, 0x38, 0xb3, 0xa3, 0x11, 0xae, 0x82, - 0x9b, 0x84, 0xc3, 0xb2, 0xfc, 0x8a, 0x30, 0x09, 0x38, 0xc4, 0x6b, 0x95, 0xec, 0x23, 0x6c, 0x75, - 0xeb, 0x70, 0x52, 0xfb, 0x6d, 0x21, 0x35, 0x46, 0x1b, 0x90, 0xda, 0x3a, 0x1c, 0xe5, 0x1c, 0x0f, - 0x37, 0xaf, 0xbf, 0x23, 0x0c, 0x2b, 0xa3, 0xde, 0x08, 0xce, 0xee, 0x07, 0xa1, 0xe6, 0x8a, 0x53, - 0x04, 0xac, 0xb6, 0xd2, 0x55, 0x7b, 0x09, 0x38, 0xff, 0x2e, 0xe7, 0x2c, 0x2c, 0xbe, 0x1b, 0xf1, - 0xda, 0x2b, 0x6a, 0x8f, 0x30, 0x7f, 0x0e, 0xaa, 0x82, 0x79, 0xdf, 0xb0, 0xb0, 0x66, 0xb6, 0x0d, - 0xfd, 0x25, 0xdc, 0x4a, 0xc0, 0xfa, 0xf7, 0x42, 0x53, 0xb5, 0xe1, 0x23, 0x27, 0x9c, 0x97, 0xa0, - 0xe2, 0xc6, 0x2a, 0x8a, 0xde, 0xed, 0x99, 0x96, 0x13, 0xc3, 0xf1, 0xdf, 0x88, 0x99, 0x72, 0xe9, - 0x96, 0x28, 0x59, 0x63, 0x11, 0xca, 0xb4, 0x98, 0x54, 0x25, 0x7f, 0x9f, 0x33, 0x1a, 0xf7, 0xa8, - 0xb8, 0xe1, 0xd0, 0xcc, 0x6e, 0x4f, 0xb5, 0x92, 0xd8, 0xbf, 0x7f, 0x2b, 0x0c, 0x07, 0x27, 0xe1, - 0x86, 0xc3, 0xd9, 0xeb, 0x61, 0xe2, 0xed, 0x13, 0x70, 0xf8, 0xaa, 0x30, 0x1c, 0x82, 0x86, 0xb3, - 0x10, 0x01, 0x43, 0x02, 0x16, 0x7f, 0x20, 0x58, 0x08, 0x1a, 0xc2, 0xe2, 0x19, 0xcf, 0xd1, 0x5a, - 0xb8, 0xad, 0xdb, 0x8e, 0xc5, 0xc2, 0xe4, 0x83, 0x59, 0x7d, 0xed, 0x8d, 0x60, 0x10, 0x26, 0xfb, - 0x48, 0x89, 0x25, 0xe2, 0x69, 0x57, 0xba, 0x8b, 0x8a, 0xef, 0xd8, 0xd7, 0x85, 0x25, 0xf2, 0x91, - 0x91, 0xbe, 0xf9, 0x22, 0x44, 0x22, 0x76, 0x8d, 0xec, 0x1d, 0x12, 0xb0, 0xfb, 0xc3, 0x50, 0xe7, - 0xd6, 0x04, 0x2d, 0xe1, 0xe9, 0x8b, 0x7f, 0xfa, 0xc6, 0x0e, 0xde, 0x4b, 0xa4, 0x9d, 0xff, 0x2e, - 0x14, 0xff, 0x6c, 0x30, 0x4a, 0x66, 0x43, 0x26, 0x42, 0xf1, 0x14, 0x8a, 0xbb, 0x3f, 0x54, 0xfd, - 0x87, 0x6f, 0xf2, 0xf1, 0x06, 0xc3, 0xa9, 0xc6, 0x32, 0x51, 0xf2, 0x60, 0xd0, 0x13, 0xcf, 0xec, - 0x23, 0x6f, 0xba, 0x7a, 0x1e, 0x88, 0x79, 0x1a, 0xe7, 0x61, 0x3c, 0x10, 0xf0, 0xc4, 0xb3, 0xfa, - 0x28, 0x67, 0x55, 0xf2, 0xc7, 0x3b, 0x8d, 0x87, 0x20, 0x4b, 0x82, 0x97, 0x78, 0xf2, 0x9f, 0xe5, - 0xe4, 0x14, 0xbd, 0xf1, 0x3e, 0xc8, 0x8b, 0xa0, 0x25, 0x9e, 0xf4, 0xe7, 0x38, 0xa9, 0x4b, 0x42, - 0xc8, 0x45, 0xc0, 0x12, 0x4f, 0xfe, 0xf3, 0x82, 0x5c, 0x90, 0x10, 0xf2, 0xe4, 0x22, 0xfc, 0xc6, - 0x3f, 0xca, 0x72, 0xa7, 0x23, 0x64, 0x77, 0x0e, 0xc6, 0x78, 0xa4, 0x12, 0x4f, 0xfd, 0x71, 0xde, - 0xb8, 0xa0, 0x68, 0x3c, 0x02, 0xa3, 0x09, 0x05, 0xfe, 0x8b, 0x9c, 0x94, 0xe1, 0x37, 0xe6, 0xa1, - 0xe8, 0x8b, 0x4e, 0xe2, 0xc9, 0x7f, 0x89, 0x93, 0xfb, 0xa9, 0x48, 0xd7, 0x79, 0x74, 0x12, 0xcf, - 0xe0, 0x93, 0xa2, 0xeb, 0x9c, 0x82, 0x88, 0x4d, 0x04, 0x26, 0xf1, 0xd4, 0x9f, 0x12, 0x52, 0x17, - 0x24, 0x8d, 0x27, 0xa1, 0xe0, 0x3a, 0x9b, 0x78, 0xfa, 0x5f, 0xe6, 0xf4, 0x1e, 0x0d, 0x91, 0x80, - 0xcf, 0xd9, 0xc5, 0xb3, 0xf8, 0x15, 0x21, 0x01, 0x1f, 0x15, 0x59, 0x46, 0xe1, 0x00, 0x26, 0x9e, - 0xd3, 0x3f, 0x16, 0xcb, 0x28, 0x14, 0xbf, 0x90, 0xd9, 0xa4, 0x36, 0x3f, 0x9e, 0xc5, 0xaf, 0x8a, - 0xd9, 0xa4, 0xf8, 0xa4, 0x1b, 0xe1, 0x88, 0x20, 0x9e, 0xc7, 0x3f, 0x15, 0xdd, 0x08, 0x05, 0x04, - 0x8d, 0x55, 0x40, 0x83, 0xd1, 0x40, 0x3c, 0xbf, 0x57, 0x38, 0xbf, 0xc9, 0x81, 0x60, 0xa0, 0xf1, - 0x2c, 0x1c, 0x8d, 0x8e, 0x04, 0xe2, 0xb9, 0xfe, 0xfa, 0x9b, 0xa1, 0xbd, 0x9b, 0x3f, 0x10, 0x68, - 0xac, 0x7b, 0x2e, 0xc5, 0x1f, 0x05, 0xc4, 0xb3, 0xfd, 0xf4, 0x9b, 0x41, 0xc3, 0xed, 0x0f, 0x02, - 0x1a, 0x73, 0x00, 0x9e, 0x03, 0x8e, 0xe7, 0xf5, 0x19, 0xce, 0xcb, 0x47, 0x44, 0x96, 0x06, 0xf7, - 0xbf, 0xf1, 0xf4, 0x9f, 0x15, 0x4b, 0x83, 0x53, 0x90, 0xa5, 0x21, 0x5c, 0x6f, 0x3c, 0xf5, 0xe7, - 0xc4, 0xd2, 0x10, 0x24, 0x44, 0xb3, 0x7d, 0xde, 0x2d, 0x9e, 0xc3, 0xe7, 0x85, 0x66, 0xfb, 0xa8, - 0x1a, 0x97, 0x60, 0x72, 0xc0, 0x21, 0xc6, 0xb3, 0xfa, 0x02, 0x67, 0x55, 0x09, 0xfb, 0x43, 0xbf, - 0xf3, 0xe2, 0xce, 0x30, 0x9e, 0xdb, 0x3f, 0x0f, 0x39, 0x2f, 0xee, 0x0b, 0x1b, 0xe7, 0x20, 0x6f, - 0xf4, 0x3b, 0x1d, 0xb2, 0x78, 0xd0, 0xc1, 0x77, 0xfe, 0xaa, 0xff, 0xe3, 0x87, 0x5c, 0x3a, 0x82, - 0xa0, 0xf1, 0x10, 0x8c, 0xe2, 0xee, 0x26, 0x6e, 0xc5, 0x51, 0x7e, 0xef, 0x87, 0xc2, 0x60, 0x12, - 0xec, 0xc6, 0x93, 0x00, 0x2c, 0x35, 0x42, 0x8f, 0x07, 0x63, 0x68, 0xff, 0xe7, 0x0f, 0xf9, 0x6d, - 0x1c, 0x8f, 0xc4, 0x63, 0xc0, 0xee, 0xf6, 0x1c, 0xcc, 0xe0, 0x8d, 0x20, 0x03, 0x3a, 0x23, 0x8f, - 0xc1, 0xd8, 0x0b, 0xb6, 0x69, 0x38, 0x6a, 0x3b, 0x8e, 0xfa, 0x7f, 0x71, 0x6a, 0x81, 0x4f, 0x04, - 0xd6, 0x35, 0x2d, 0xec, 0xa8, 0x6d, 0x3b, 0x8e, 0xf6, 0x7f, 0x73, 0x5a, 0x97, 0x80, 0x10, 0x6b, - 0xaa, 0xed, 0x24, 0x19, 0xf7, 0xff, 0x11, 0xc4, 0x82, 0x80, 0x74, 0x9a, 0xfc, 0xde, 0xc1, 0x7b, - 0x71, 0xb4, 0xdf, 0x17, 0x9d, 0xe6, 0xf8, 0x8d, 0xf7, 0x41, 0x81, 0xfc, 0x64, 0x57, 0xec, 0x62, - 0x88, 0xff, 0x2f, 0x27, 0xf6, 0x28, 0x48, 0xcb, 0xb6, 0xd3, 0x72, 0xf4, 0x78, 0x61, 0x5f, 0xe7, - 0x33, 0x2d, 0xf0, 0x1b, 0x73, 0x50, 0xb4, 0x9d, 0x56, 0xab, 0xcf, 0xe3, 0xd3, 0x18, 0xf2, 0xff, - 0xf7, 0x43, 0x37, 0x65, 0xe1, 0xd2, 0x90, 0xd9, 0xbe, 0xb6, 0xe3, 0xf4, 0x4c, 0x7a, 0x04, 0x12, - 0xc7, 0xe1, 0x4d, 0xce, 0xc1, 0x47, 0xd2, 0x98, 0x87, 0x12, 0x19, 0x8b, 0x85, 0x7b, 0x98, 0x9e, - 0x57, 0xc5, 0xb0, 0xf8, 0x6b, 0x2e, 0x80, 0x00, 0x51, 0xf3, 0x43, 0xc3, 0xde, 0xdd, 0x44, 0xa7, - 0x8d, 0xe1, 0x82, 0x79, 0xc1, 0x64, 0x09, 0xe3, 0xe7, 0xa5, 0x40, 0xba, 0xb8, 0x6d, 0x7a, 0xd9, - 0x5a, 0x77, 0x93, 0x03, 0x7f, 0x98, 0x86, 0x3b, 0xe9, 0x75, 0x5f, 0xab, 0xab, 0x1b, 0xce, 0x19, - 0xcd, 0xda, 0xeb, 0x39, 0xe6, 0x99, 0x2e, 0xb6, 0x76, 0x3a, 0x98, 0xff, 0xe1, 0xd9, 0xdf, 0xaa, - 0x87, 0x36, 0xcb, 0xd0, 0x66, 0x59, 0x7d, 0x2d, 0x32, 0x5b, 0x2c, 0xcd, 0xc3, 0xd8, 0xaa, 0x65, - 0x9a, 0x5b, 0x97, 0x7b, 0x08, 0xf1, 0x1b, 0xcc, 0xfc, 0x66, 0x1c, 0x55, 0x43, 0xfe, 0xe2, 0x29, - 0xed, 0xbd, 0x78, 0x42, 0x90, 0x6d, 0xa9, 0x8e, 0x4a, 0x13, 0xe6, 0x25, 0x99, 0xfe, 0x96, 0x9a, - 0x30, 0x4a, 0x99, 0xa0, 0xc7, 0x20, 0x63, 0xf6, 0x6c, 0x9e, 0xdd, 0xbf, 0x7d, 0x76, 0x58, 0x5f, - 0x66, 0x79, 0x93, 0xcd, 0xec, 0x37, 0xf7, 0xeb, 0x23, 0x32, 0xa1, 0x69, 0xae, 0xfe, 0xed, 0x77, - 0x4e, 0xa4, 0xbe, 0xf4, 0xda, 0x89, 0xd4, 0xd0, 0x17, 0x4c, 0xb3, 0x3e, 0x41, 0xf9, 0x84, 0x31, - 0x4c, 0x2e, 0xee, 0x3b, 0xa6, 0x5f, 0x48, 0xc3, 0x09, 0x1f, 0x52, 0x47, 0xdf, 0xb4, 0xcf, 0xec, - 0x5c, 0x65, 0x4f, 0x9e, 0xb8, 0xd4, 0x90, 0xaf, 0xa7, 0xa4, 0x7e, 0x76, 0xe7, 0xea, 0x10, 0x79, - 0xcd, 0x42, 0x76, 0x55, 0xd5, 0xad, 0x88, 0xa7, 0x60, 0xd3, 0xde, 0xe5, 0x56, 0x02, 0x63, 0x05, - 0xe9, 0x2c, 0xe4, 0x9f, 0x5e, 0x7a, 0xf8, 0xc1, 0x24, 0x34, 0x19, 0x4e, 0xd3, 0x94, 0x85, 0x28, - 0xbe, 0x16, 0x21, 0x8e, 0x6f, 0xbc, 0x7e, 0x22, 0x15, 0xf9, 0xa8, 0x2b, 0x5a, 0x24, 0x7c, 0xb4, - 0xae, 0x30, 0x3e, 0x95, 0x86, 0x7a, 0xf8, 0x54, 0x80, 0x2c, 0x45, 0xdb, 0x51, 0xbb, 0xbd, 0x61, - 0x6f, 0xba, 0xce, 0x41, 0x61, 0x5d, 0xe0, 0xa0, 0x2a, 0x8c, 0xd9, 0x58, 0x33, 0x8d, 0x96, 0x4d, - 0x47, 0x92, 0x91, 0x45, 0x91, 0x8c, 0xc6, 0x50, 0x0d, 0xd3, 0xe6, 0x57, 0x4e, 0x59, 0xa1, 0xf9, - 0x4f, 0x52, 0x87, 0x5b, 0x1b, 0x65, 0xb7, 0x29, 0xba, 0x40, 0x56, 0x53, 0xcf, 0xdf, 0x7b, 0xd0, - 0x81, 0x0a, 0x7b, 0xb9, 0xe6, 0x0e, 0xc1, 0x77, 0x7a, 0x72, 0x22, 0x7c, 0x7a, 0xf2, 0x2c, 0xee, - 0x74, 0x9e, 0x36, 0xcc, 0x6b, 0xc6, 0x3a, 0xa1, 0x71, 0x45, 0xf2, 0x89, 0x34, 0x9c, 0x18, 0x38, - 0x28, 0xe1, 0xe6, 0x65, 0x98, 0x44, 0x1a, 0x90, 0x5f, 0x10, 0x56, 0xeb, 0xb0, 0x02, 0xf9, 0xd5, - 0x43, 0x0a, 0x64, 0x5c, 0xb4, 0x24, 0xe4, 0x71, 0x4f, 0xbc, 0x3c, 0x44, 0xff, 0x6f, 0x40, 0x1c, - 0x1f, 0x7d, 0x02, 0x6e, 0xf7, 0x29, 0x90, 0xba, 0xa9, 0xe9, 0xfc, 0x79, 0xa0, 0x7f, 0xc5, 0x1c, - 0xf1, 0xad, 0x18, 0x82, 0x32, 0x4b, 0x2b, 0xa3, 0x17, 0x4d, 0x2d, 0x99, 0xed, 0xaa, 0xc5, 0xac, - 0xd2, 0x5a, 0x9c, 0xe2, 0xd6, 0x62, 0xa6, 0x51, 0xfa, 0x9b, 0x51, 0x18, 0x13, 0x6f, 0x39, 0x1f, - 0x85, 0x2c, 0xd6, 0xb6, 0x4d, 0x7e, 0xdb, 0x5d, 0x9a, 0x8d, 0x1c, 0xcf, 0x2c, 0xc7, 0x5e, 0xd4, - 0xb6, 0xcd, 0x8b, 0x23, 0x32, 0xa5, 0xa0, 0x6f, 0xc0, 0x3a, 0x7d, 0x7b, 0x9b, 0x5f, 0x4a, 0x3e, - 0x75, 0x30, 0xe9, 0x79, 0x82, 0x7a, 0x71, 0x44, 0x66, 0x34, 0xa4, 0x59, 0xfa, 0x7e, 0x2d, 0x9b, - 0xa4, 0xd9, 0x25, 0x63, 0x8b, 0x36, 0x4b, 0x28, 0xd0, 0x45, 0x00, 0x1b, 0x3b, 0xe2, 0x2a, 0xc3, - 0x28, 0xa5, 0xbf, 0xfb, 0x60, 0xfa, 0x35, 0xec, 0x30, 0xb7, 0x75, 0x71, 0x44, 0x2e, 0xd8, 0xa2, - 0x40, 0x38, 0xe9, 0x86, 0xee, 0x28, 0xda, 0xb6, 0xaa, 0x1b, 0xf4, 0x0c, 0x3e, 0x96, 0xd3, 0x92, - 0xa1, 0x3b, 0xf3, 0x04, 0x9d, 0x70, 0xd2, 0x45, 0x81, 0x88, 0x82, 0xbe, 0x19, 0xe5, 0x8f, 0xac, - 0x62, 0x44, 0xf1, 0x0c, 0x41, 0x25, 0xa2, 0xa0, 0x34, 0xe8, 0x69, 0x28, 0xd2, 0xe3, 0x56, 0x65, - 0xb3, 0x63, 0x6a, 0x3b, 0xfc, 0x65, 0xc9, 0xcc, 0xc1, 0x2c, 0x9a, 0x84, 0xa0, 0x49, 0xf0, 0x2f, - 0x8e, 0xc8, 0xb0, 0xe9, 0x96, 0x50, 0x13, 0xf2, 0xec, 0xda, 0xaf, 0xb3, 0xcb, 0xdf, 0x06, 0xde, - 0x79, 0x30, 0x27, 0x7a, 0x03, 0x78, 0x7d, 0xf7, 0xe2, 0x88, 0x3c, 0xa6, 0xb1, 0x9f, 0x68, 0x11, - 0x0a, 0xd8, 0x68, 0xf1, 0xee, 0x14, 0xf9, 0x2b, 0xaa, 0x83, 0xf5, 0xc2, 0x68, 0x89, 0xce, 0xe4, - 0x31, 0xff, 0x8d, 0x9e, 0x80, 0x9c, 0x66, 0x76, 0xbb, 0xba, 0x43, 0xdf, 0x18, 0x16, 0xcf, 0xde, - 0x11, 0xd3, 0x11, 0x8a, 0x7b, 0x71, 0x44, 0xe6, 0x54, 0x64, 0x7a, 0x5a, 0xb8, 0xa3, 0x5f, 0xc5, - 0x16, 0x19, 0xcc, 0x54, 0x92, 0xe9, 0x59, 0x60, 0xf8, 0x74, 0x38, 0x85, 0x96, 0x28, 0x34, 0xc7, - 0xb8, 0x7b, 0x91, 0xee, 0x86, 0xa2, 0x4f, 0x93, 0x89, 0xc5, 0xe2, 0x3b, 0x10, 0xee, 0xec, 0x45, - 0x51, 0x2a, 0x43, 0xc9, 0xaf, 0xb7, 0x52, 0xd7, 0x25, 0xa4, 0x87, 0xf8, 0x55, 0x18, 0xbb, 0x8a, - 0x2d, 0x9b, 0x9d, 0xe0, 0x53, 0x42, 0x5e, 0x44, 0xa7, 0x60, 0x9c, 0xca, 0x4d, 0x11, 0xf5, 0xec, - 0x59, 0x72, 0x89, 0x02, 0xaf, 0x70, 0xa4, 0x3a, 0x14, 0x7b, 0x67, 0x7b, 0x2e, 0x0a, 0x7b, 0x1b, - 0x0d, 0xbd, 0xb3, 0x3d, 0x8e, 0x20, 0x35, 0xa0, 0x12, 0x56, 0x5d, 0xbf, 0xd7, 0x2c, 0x44, 0x78, - 0xcd, 0x82, 0xf0, 0xb4, 0xbf, 0x93, 0x76, 0x89, 0x5d, 0x6d, 0x25, 0xcb, 0x8d, 0x18, 0x09, 0x4a, - 0x5d, 0x3c, 0x5b, 0x1b, 0x08, 0xed, 0x5c, 0x5f, 0xd3, 0xcc, 0x93, 0x50, 0xe4, 0x53, 0x7f, 0x5e, - 0x4f, 0xc9, 0x94, 0x02, 0x1d, 0x27, 0x0a, 0xa5, 0xea, 0x86, 0xa2, 0xb7, 0xc4, 0x6b, 0x62, 0x5a, - 0x5e, 0x6a, 0xa1, 0x67, 0xa0, 0xa2, 0x99, 0x86, 0x8d, 0x0d, 0xbb, 0x6f, 0x2b, 0x3d, 0xd5, 0x52, - 0xbb, 0xde, 0xa3, 0xbb, 0xe8, 0x69, 0x9a, 0x17, 0xe8, 0xab, 0x14, 0x5b, 0x9e, 0xd0, 0x82, 0x00, - 0xb4, 0x0c, 0x70, 0x55, 0xed, 0xe8, 0x2d, 0xd5, 0x31, 0x2d, 0x9b, 0x3f, 0x4e, 0x19, 0xc6, 0xec, - 0x8a, 0x40, 0xdc, 0xe8, 0xb5, 0x54, 0x07, 0xf3, 0x20, 0xca, 0x47, 0x8f, 0xee, 0x82, 0x09, 0xb5, - 0xd7, 0x53, 0x6c, 0x47, 0x75, 0xb0, 0xb2, 0xb9, 0xe7, 0x60, 0x9b, 0xda, 0x8b, 0x92, 0x3c, 0xae, - 0xf6, 0x7a, 0x6b, 0x04, 0xda, 0x24, 0x40, 0xa9, 0xe5, 0xce, 0x36, 0x5d, 0x9a, 0x6e, 0x6c, 0x97, - 0xf2, 0x62, 0x3b, 0x02, 0xa3, 0x57, 0x2b, 0x98, 0x0c, 0xc4, 0x6d, 0x94, 0xdc, 0x36, 0xd6, 0xdb, - 0xdb, 0xec, 0x79, 0x7b, 0x46, 0xe6, 0x25, 0x32, 0x31, 0x3d, 0xcb, 0xbc, 0x8a, 0xf9, 0xcb, 0x76, - 0x56, 0x90, 0x7e, 0x2d, 0x0d, 0x93, 0x03, 0xcb, 0x97, 0xf0, 0xa5, 0x17, 0xfc, 0x79, 0x5b, 0xe4, - 0x37, 0x3a, 0x47, 0xf8, 0xaa, 0x2d, 0xfe, 0x68, 0xa5, 0x78, 0xf6, 0xb6, 0x21, 0x12, 0xb8, 0x48, - 0x91, 0xf8, 0xc0, 0x39, 0x09, 0xda, 0x80, 0x4a, 0x47, 0xb5, 0x1d, 0x85, 0xad, 0x22, 0xf6, 0x4a, - 0x38, 0x73, 0xa0, 0x25, 0x58, 0x56, 0xc5, 0xea, 0x23, 0xca, 0xcd, 0xd9, 0x95, 0x3b, 0x01, 0x28, - 0x7a, 0x0e, 0xa6, 0x37, 0xf7, 0x5e, 0x52, 0x0d, 0x47, 0x37, 0xe8, 0x65, 0xa3, 0xe0, 0x1c, 0xd5, - 0x87, 0xb0, 0x5e, 0xbc, 0xaa, 0xb7, 0xb0, 0xa1, 0x89, 0xc9, 0x99, 0x72, 0x59, 0xb8, 0x93, 0x67, - 0x4b, 0xcf, 0x41, 0x39, 0x68, 0x8b, 0x50, 0x19, 0xd2, 0xce, 0x2e, 0x97, 0x48, 0xda, 0xd9, 0x45, - 0x0f, 0xf3, 0x88, 0x3c, 0x4d, 0x6f, 0xcb, 0x0d, 0x73, 0x16, 0x9c, 0xda, 0x7b, 0x4b, 0x28, 0x49, - 0xee, 0x4a, 0x70, 0x0d, 0x43, 0x98, 0xb7, 0x74, 0x1a, 0x26, 0x42, 0x46, 0xcc, 0x37, 0xad, 0x29, - 0xff, 0xb4, 0x4a, 0x13, 0x30, 0x1e, 0xb0, 0x55, 0xd2, 0x9f, 0xe4, 0x20, 0xef, 0x7e, 0xa3, 0xe0, - 0x22, 0x14, 0xf0, 0xae, 0x86, 0x7b, 0x8e, 0xb0, 0x0a, 0x07, 0x19, 0x71, 0x46, 0xb3, 0x28, 0xf0, - 0x89, 0xb9, 0x72, 0x89, 0xd1, 0x63, 0x01, 0x97, 0x7c, 0x2a, 0x8e, 0x89, 0xdf, 0x27, 0x3f, 0x1e, - 0xf4, 0xc9, 0x77, 0xc4, 0xd0, 0x86, 0x9c, 0xf2, 0x63, 0x01, 0xa7, 0x1c, 0xd7, 0x70, 0xc0, 0x2b, - 0x2f, 0x45, 0x78, 0xe5, 0xb8, 0xe1, 0x0f, 0x71, 0xcb, 0x4b, 0x11, 0x6e, 0x79, 0x26, 0xb6, 0x2f, - 0x91, 0x7e, 0xf9, 0xf1, 0xa0, 0x5f, 0x8e, 0x13, 0x47, 0xc8, 0x31, 0x2f, 0x47, 0x39, 0xe6, 0xd3, - 0x31, 0x3c, 0x86, 0x7a, 0xe6, 0xf9, 0x01, 0xcf, 0x7c, 0x57, 0x0c, 0xab, 0x08, 0xd7, 0xbc, 0x14, - 0xf0, 0x89, 0x90, 0x48, 0x36, 0xd1, 0x4e, 0x11, 0x9d, 0x1f, 0xf4, 0xf2, 0x77, 0xc7, 0xa9, 0x5a, - 0x94, 0x9b, 0x7f, 0x32, 0xe4, 0xe6, 0xef, 0x8c, 0x1b, 0x55, 0xc8, 0xcf, 0x7b, 0xde, 0xf9, 0x34, - 0xb1, 0x8f, 0xa1, 0x95, 0x41, 0x6c, 0x29, 0xb6, 0x2c, 0xd3, 0xe2, 0x8e, 0x8f, 0x15, 0xa4, 0x19, - 0x62, 0xb1, 0x3d, 0xfd, 0x3f, 0xc0, 0x93, 0xd3, 0x45, 0xeb, 0xd3, 0x76, 0xe9, 0x6b, 0x29, 0x8f, - 0x96, 0x5a, 0x36, 0xbf, 0xb5, 0x2f, 0x70, 0x6b, 0xef, 0x73, 0xf0, 0xe9, 0xa0, 0x83, 0xaf, 0x43, - 0x91, 0xf8, 0x94, 0x90, 0xef, 0x56, 0x7b, 0xc2, 0x77, 0xa3, 0x7b, 0x60, 0x92, 0xda, 0x5f, 0x16, - 0x06, 0x70, 0x43, 0x92, 0xa5, 0x86, 0x64, 0x82, 0x54, 0x30, 0x09, 0x32, 0x47, 0x71, 0x3f, 0x4c, - 0xf9, 0x70, 0x09, 0x5f, 0xea, 0x0b, 0x98, 0x93, 0xaa, 0xb8, 0xd8, 0x73, 0xbd, 0xde, 0x45, 0xd5, - 0xde, 0x96, 0x56, 0x3c, 0x01, 0x79, 0x71, 0x01, 0x82, 0xac, 0x66, 0xb6, 0xd8, 0xb8, 0xc7, 0x65, - 0xfa, 0x9b, 0xc4, 0x0a, 0x1d, 0xb3, 0xcd, 0x6f, 0x40, 0x92, 0x9f, 0x04, 0xcb, 0x5d, 0xda, 0x05, - 0xb6, 0x66, 0xa5, 0xdf, 0x4f, 0x79, 0xfc, 0xbc, 0x50, 0x21, 0xca, 0xab, 0xa7, 0x6e, 0xa6, 0x57, - 0x4f, 0xff, 0x68, 0x5e, 0x5d, 0x7a, 0x33, 0xe5, 0x4d, 0xa9, 0xeb, 0xaf, 0x6f, 0x4c, 0x04, 0x44, - 0xbb, 0xd8, 0x4b, 0x70, 0x76, 0x53, 0x97, 0x15, 0x44, 0xa8, 0x95, 0x8b, 0x48, 0x50, 0x8c, 0xf9, - 0x92, 0x1a, 0xe8, 0x21, 0xea, 0xe7, 0xcd, 0x2d, 0x6e, 0x1a, 0xea, 0x31, 0x89, 0x1e, 0x99, 0x61, - 0xfb, 0xfc, 0x4b, 0x21, 0x10, 0x36, 0xdc, 0x0a, 0x05, 0xd2, 0x75, 0xf6, 0xfc, 0x09, 0x78, 0x7a, - 0x51, 0x00, 0xa4, 0x16, 0xa0, 0x41, 0x1b, 0x83, 0x2e, 0x41, 0x0e, 0x5f, 0xa5, 0xb7, 0x51, 0x59, - 0xb2, 0xe9, 0xd6, 0xa1, 0x8e, 0x18, 0x1b, 0x4e, 0xb3, 0x4a, 0x84, 0xf9, 0xbd, 0xfd, 0x7a, 0x85, - 0xd1, 0xdc, 0x67, 0x76, 0x75, 0x07, 0x77, 0x7b, 0xce, 0x9e, 0xcc, 0xb9, 0x48, 0x3f, 0x9f, 0x26, - 0xfe, 0x30, 0x60, 0x7f, 0x22, 0xc5, 0x2b, 0x16, 0x4d, 0xda, 0x17, 0x22, 0x25, 0x13, 0xf9, 0x6d, - 0x00, 0x6d, 0xd5, 0x56, 0xae, 0xa9, 0x86, 0x83, 0x5b, 0x5c, 0xee, 0x85, 0xb6, 0x6a, 0x3f, 0x4b, - 0x01, 0x24, 0xde, 0x24, 0xd5, 0x7d, 0x1b, 0xb7, 0xe8, 0x04, 0x64, 0xe4, 0xb1, 0xb6, 0x6a, 0x6f, - 0xd8, 0xb8, 0xe5, 0x1b, 0xeb, 0xd8, 0xcd, 0x18, 0x6b, 0x50, 0xde, 0xf9, 0xb0, 0xbc, 0x3f, 0x9e, - 0xf6, 0x56, 0x87, 0x17, 0x3e, 0xfc, 0x64, 0xca, 0xe2, 0xb3, 0x74, 0x4f, 0x11, 0x74, 0x02, 0xe8, - 0x03, 0x30, 0xe9, 0xae, 0x4a, 0xa5, 0x4f, 0x57, 0xab, 0xd0, 0xc2, 0xc3, 0x2d, 0xee, 0xca, 0xd5, - 0x20, 0xd8, 0x46, 0x3f, 0x0d, 0xc7, 0x42, 0x36, 0xc8, 0x6d, 0x20, 0x7d, 0x28, 0x53, 0x74, 0x24, - 0x68, 0x8a, 0x04, 0x7f, 0x4f, 0x7a, 0x99, 0x9b, 0xb2, 0x6a, 0xee, 0x20, 0x21, 0xac, 0xdf, 0xbd, - 0x45, 0xe9, 0x84, 0xf4, 0xa7, 0x29, 0x98, 0x08, 0x75, 0x10, 0x3d, 0x0a, 0xa3, 0xcc, 0x03, 0xa7, - 0x0e, 0x4c, 0x84, 0x50, 0x89, 0xf3, 0x31, 0x31, 0x02, 0x34, 0x07, 0x79, 0xcc, 0xa3, 0x6b, 0x2e, - 0x94, 0x3b, 0x63, 0x82, 0x70, 0x4e, 0xef, 0x92, 0xa1, 0x05, 0x28, 0xb8, 0xa2, 0x8f, 0xd9, 0xb9, - 0xb9, 0x33, 0xc7, 0x99, 0x78, 0x84, 0xd2, 0x3c, 0x14, 0x7d, 0xdd, 0x63, 0x6f, 0x01, 0x77, 0xf9, - 0x76, 0x8b, 0x05, 0xd0, 0xf9, 0xae, 0xba, 0x4b, 0x77, 0x5a, 0xe8, 0x18, 0x8c, 0x91, 0xca, 0x36, - 0x7f, 0x2c, 0x95, 0x91, 0x73, 0x5d, 0x75, 0xf7, 0x82, 0x6a, 0x4b, 0x9f, 0x48, 0x41, 0x39, 0xd8, - 0x4f, 0x74, 0x2f, 0x20, 0x82, 0xab, 0xb6, 0xb1, 0x62, 0xf4, 0xbb, 0xcc, 0x47, 0x0a, 0x8e, 0x13, - 0x5d, 0x75, 0x77, 0xae, 0x8d, 0x2f, 0xf5, 0xbb, 0xb4, 0x69, 0x1b, 0xad, 0x40, 0x45, 0x20, 0x8b, - 0x64, 0x17, 0x97, 0xca, 0xf1, 0xc1, 0xef, 0xd5, 0x70, 0x04, 0xb6, 0xd7, 0x7d, 0x85, 0xec, 0x75, - 0xcb, 0x8c, 0x9f, 0xa8, 0x91, 0x1e, 0x82, 0x89, 0xd0, 0x88, 0x91, 0x04, 0xe3, 0xbd, 0xfe, 0xa6, - 0xb2, 0x83, 0xf7, 0xe8, 0xf3, 0x77, 0xa6, 0xea, 0x05, 0xb9, 0xd8, 0xeb, 0x6f, 0x3e, 0x8d, 0xf7, - 0x68, 0xee, 0x50, 0xd2, 0xa0, 0x1c, 0xdc, 0x4c, 0x11, 0xc7, 0x61, 0x99, 0x7d, 0xa3, 0x25, 0x3e, - 0x6c, 0x40, 0x0b, 0xe8, 0x1c, 0x8c, 0x5e, 0x35, 0x99, 0x36, 0x1f, 0xb4, 0x7b, 0xba, 0x62, 0x3a, - 0xd8, 0xb7, 0x25, 0x63, 0x34, 0x92, 0x0d, 0xa3, 0x54, 0x2f, 0x23, 0x0f, 0x2a, 0xae, 0x00, 0xa8, - 0x8e, 0x63, 0xe9, 0x9b, 0x7d, 0x8f, 0x7d, 0x75, 0x76, 0x30, 0xad, 0x3f, 0xbb, 0xaa, 0xea, 0x56, - 0xf3, 0x56, 0xae, 0xd9, 0xd3, 0x1e, 0x8d, 0x4f, 0xbb, 0x7d, 0x9c, 0xa4, 0x37, 0xb2, 0x90, 0x63, - 0xdb, 0x4d, 0xf4, 0x44, 0x30, 0xf9, 0x51, 0x3c, 0x7b, 0x62, 0x58, 0xf7, 0x19, 0x16, 0xef, 0xbd, - 0x1b, 0x41, 0xdd, 0x15, 0xce, 0x28, 0x34, 0x8b, 0xaf, 0xed, 0xd7, 0xc7, 0x68, 0xf4, 0xb1, 0xb4, - 0xe0, 0xa5, 0x17, 0x86, 0xed, 0xae, 0x45, 0x2e, 0x23, 0x7b, 0xe8, 0x5c, 0xc6, 0x45, 0x18, 0xf7, - 0x85, 0x5b, 0x7a, 0x8b, 0xef, 0x53, 0x4e, 0x1c, 0xb4, 0xe8, 0x96, 0x16, 0x78, 0xff, 0x8b, 0x6e, - 0x38, 0xb6, 0xd4, 0x42, 0x33, 0xc1, 0x4d, 0x36, 0x8d, 0xda, 0x58, 0xb8, 0xe0, 0xdb, 0x37, 0xd3, - 0x37, 0xf9, 0xb7, 0x40, 0x81, 0x3e, 0x6c, 0xa6, 0x28, 0x2c, 0x7a, 0xc8, 0x13, 0x00, 0xad, 0xbc, - 0x1b, 0x26, 0xbc, 0xc0, 0x86, 0xa1, 0xe4, 0x19, 0x17, 0x0f, 0x4c, 0x11, 0x1f, 0x80, 0x69, 0xfa, - 0x01, 0xbc, 0x30, 0x76, 0x81, 0x62, 0x23, 0x52, 0x77, 0x25, 0x48, 0x71, 0x27, 0x94, 0x3d, 0x13, - 0x4a, 0x71, 0x81, 0xa5, 0x3e, 0x5c, 0x28, 0x45, 0x3b, 0x0e, 0x79, 0x37, 0xec, 0x2c, 0xb2, 0x2f, - 0xeb, 0xa9, 0x2c, 0xda, 0x74, 0x03, 0x59, 0x0b, 0xdb, 0xfd, 0x8e, 0xc3, 0x99, 0x94, 0x28, 0x0e, - 0x0d, 0x64, 0x65, 0x06, 0xa7, 0xb8, 0xa7, 0x60, 0x5c, 0x58, 0x15, 0x86, 0x37, 0x4e, 0xf1, 0x4a, - 0x02, 0x48, 0x91, 0x4e, 0x43, 0xa5, 0x67, 0x99, 0x3d, 0xd3, 0xc6, 0x96, 0xa2, 0xb6, 0x5a, 0x16, - 0xb6, 0xed, 0x6a, 0x99, 0xf1, 0x13, 0xf0, 0x39, 0x06, 0x96, 0xde, 0x03, 0x63, 0x22, 0x9e, 0x9e, - 0x86, 0xd1, 0xa6, 0x6b, 0x21, 0xb3, 0x32, 0x2b, 0x10, 0xff, 0x3a, 0xd7, 0xeb, 0xf1, 0xec, 0x1a, - 0xf9, 0x29, 0x75, 0x60, 0x8c, 0x4f, 0x58, 0x64, 0x4e, 0x65, 0x05, 0x4a, 0x3d, 0xd5, 0x22, 0xc3, - 0xf0, 0x67, 0x56, 0x86, 0xed, 0x08, 0x57, 0x55, 0xcb, 0x59, 0xc3, 0x4e, 0x20, 0xc1, 0x52, 0xa4, - 0xf4, 0x0c, 0x24, 0x3d, 0x06, 0xe3, 0x01, 0x1c, 0xef, 0x3b, 0x84, 0x7c, 0xa1, 0xd3, 0x82, 0xdb, - 0x93, 0xb4, 0xd7, 0x13, 0xe9, 0x1c, 0x14, 0xdc, 0xb9, 0x22, 0x1b, 0x0d, 0x21, 0x0a, 0xfe, 0x61, - 0x43, 0x5e, 0xa4, 0x49, 0x24, 0xf3, 0x1a, 0xff, 0x44, 0x53, 0x46, 0x66, 0x05, 0x09, 0xfb, 0x0c, - 0x13, 0xf3, 0x66, 0xe8, 0x71, 0x18, 0xe3, 0x86, 0x89, 0xaf, 0xc7, 0x61, 0xe9, 0xa2, 0x55, 0x6a, - 0xa9, 0x44, 0xba, 0x88, 0xd9, 0x2d, 0xaf, 0x99, 0xb4, 0xbf, 0x99, 0x0f, 0x43, 0x5e, 0x18, 0x9f, - 0xa0, 0x97, 0x60, 0x2d, 0x9c, 0x8c, 0xf3, 0x12, 0xbc, 0x11, 0x8f, 0x90, 0x68, 0x93, 0xad, 0xb7, - 0x0d, 0xdc, 0x52, 0xbc, 0x25, 0xc8, 0x1f, 0xcc, 0x4e, 0xb0, 0x8a, 0x65, 0xb1, 0xbe, 0xa4, 0x07, - 0x20, 0xc7, 0xfa, 0x1a, 0x69, 0xe2, 0xa2, 0x5c, 0xeb, 0x77, 0x53, 0x90, 0x17, 0xee, 0x23, 0x92, - 0x28, 0x30, 0x88, 0xf4, 0x8d, 0x0e, 0xe2, 0xe6, 0x9b, 0xa4, 0xfb, 0x00, 0x51, 0x4d, 0x51, 0xae, - 0x9a, 0x8e, 0x6e, 0xb4, 0x15, 0x36, 0x17, 0xfc, 0xdd, 0x20, 0xad, 0xb9, 0x42, 0x2b, 0x56, 0x09, - 0xfc, 0x9e, 0x53, 0x50, 0xf4, 0x65, 0xb9, 0xd0, 0x18, 0x64, 0x2e, 0xe1, 0x6b, 0x95, 0x11, 0x54, - 0x84, 0x31, 0x19, 0xd3, 0x1c, 0x41, 0x25, 0x75, 0xf6, 0x8d, 0x31, 0x98, 0x98, 0x6b, 0xce, 0x2f, - 0xcd, 0xf5, 0x7a, 0x1d, 0x9d, 0xbf, 0xa7, 0xbb, 0x0c, 0x59, 0xba, 0x4f, 0x4e, 0x70, 0xbe, 0x53, - 0x4b, 0x92, 0x70, 0x42, 0x32, 0x8c, 0xd2, 0xed, 0x34, 0x4a, 0x72, 0xec, 0x53, 0x4b, 0x94, 0x87, - 0x22, 0x9d, 0xa4, 0x0a, 0x97, 0xe0, 0x34, 0xa8, 0x96, 0x24, 0x39, 0x85, 0x7e, 0x1a, 0x0a, 0xde, - 0x3e, 0x39, 0xe9, 0x19, 0x51, 0x2d, 0x71, 0xda, 0x8a, 0xf0, 0xf7, 0x76, 0x06, 0x49, 0x8f, 0x26, - 0x6a, 0x89, 0xf3, 0x35, 0xe8, 0x39, 0x18, 0x13, 0x7b, 0xb0, 0x64, 0xa7, 0x38, 0xb5, 0x84, 0x29, - 0x25, 0x32, 0x7d, 0x6c, 0xeb, 0x9c, 0xe4, 0xa8, 0xaa, 0x96, 0x28, 0x6f, 0x86, 0x36, 0x20, 0xc7, - 0x83, 0xdf, 0x44, 0x27, 0x3d, 0xb5, 0x64, 0x89, 0x22, 0x22, 0x64, 0x2f, 0x39, 0x91, 0xf4, 0x78, - 0xae, 0x96, 0x38, 0x61, 0x88, 0x54, 0x00, 0xdf, 0x7e, 0x3a, 0xf1, 0xb9, 0x5b, 0x2d, 0x79, 0x22, - 0x10, 0x7d, 0x10, 0xf2, 0xee, 0xae, 0x29, 0xe1, 0x49, 0x5a, 0x2d, 0x69, 0x2e, 0xae, 0xb9, 0x91, - 0xf8, 0x96, 0xc4, 0xbd, 0xb1, 0xb7, 0x24, 0xbc, 0x43, 0x6e, 0xf7, 0x18, 0xfc, 0xaf, 0x53, 0x70, - 0x3c, 0x7c, 0x9c, 0xac, 0x1a, 0x7b, 0x43, 0x2e, 0x04, 0x0c, 0xb9, 0x2d, 0xf2, 0x38, 0x64, 0xe6, - 0x8c, 0x3d, 0x12, 0x6c, 0xd0, 0x6f, 0xfb, 0xf5, 0xad, 0x8e, 0x48, 0xd3, 0x91, 0xf2, 0x86, 0xd5, - 0x89, 0xbe, 0x35, 0xd2, 0xc8, 0x7e, 0xff, 0xf3, 0xf5, 0x91, 0xe6, 0x4e, 0xc4, 0xa8, 0x62, 0xee, - 0x0a, 0xe4, 0xe7, 0x8c, 0x3d, 0x71, 0x4d, 0x60, 0x94, 0x0e, 0xe8, 0xb0, 0xc7, 0xff, 0xaf, 0x97, - 0x08, 0x67, 0xdf, 0xf7, 0x81, 0xf9, 0x88, 0x73, 0xac, 0x34, 0xe4, 0x84, 0x3f, 0xfe, 0xc6, 0x40, - 0x6d, 0xb8, 0x34, 0xa5, 0x0b, 0x90, 0x9d, 0x37, 0x75, 0x1a, 0xf2, 0xb4, 0xb0, 0x61, 0x76, 0x45, - 0xce, 0x93, 0x16, 0xd0, 0x29, 0xc8, 0xa9, 0x5d, 0xb3, 0x6f, 0x38, 0x22, 0x6a, 0x26, 0xae, 0xe4, - 0xbf, 0xed, 0xd7, 0x33, 0x4b, 0x86, 0x23, 0xf3, 0xaa, 0x46, 0xf6, 0xaf, 0x5e, 0xad, 0xa7, 0xa4, - 0xa7, 0x60, 0x6c, 0x01, 0x6b, 0x37, 0xc2, 0x6b, 0x01, 0x6b, 0x21, 0x5e, 0xa7, 0x21, 0xbf, 0x64, - 0x38, 0xec, 0xa3, 0x61, 0xb7, 0x41, 0x46, 0x37, 0xd8, 0xb1, 0x48, 0xa8, 0x7d, 0x02, 0x27, 0xa8, - 0x0b, 0x58, 0x73, 0x51, 0x5b, 0x58, 0x0b, 0xa3, 0x12, 0xf6, 0x04, 0x2e, 0x35, 0xa1, 0x74, 0x45, - 0xed, 0xf0, 0x70, 0x0f, 0xdb, 0xe8, 0x3e, 0x28, 0xa8, 0xa2, 0x40, 0x77, 0x56, 0xa5, 0x66, 0xf9, - 0x07, 0xfb, 0x75, 0xf0, 0x90, 0x64, 0x0f, 0xa1, 0x91, 0x7d, 0xf9, 0xbf, 0x9f, 0x4c, 0x49, 0x26, - 0x8c, 0x5d, 0x50, 0x6d, 0x6a, 0xe9, 0x1f, 0x0c, 0x24, 0x52, 0x68, 0xa4, 0xd8, 0x3c, 0x72, 0x7d, - 0xbf, 0x3e, 0xb9, 0xa7, 0x76, 0x3b, 0x0d, 0xc9, 0xab, 0x93, 0xfc, 0xf9, 0x95, 0x59, 0x5f, 0x7e, - 0x85, 0x46, 0x92, 0xcd, 0xa9, 0xeb, 0xfb, 0xf5, 0x09, 0x8f, 0x86, 0xd4, 0x48, 0x6e, 0xd2, 0x45, - 0xea, 0x41, 0x8e, 0x05, 0xbd, 0x91, 0x27, 0x84, 0x3c, 0xe5, 0x93, 0xf6, 0x52, 0x3e, 0x8d, 0x43, - 0xa5, 0x19, 0x78, 0x5c, 0xc6, 0x28, 0x1a, 0xd9, 0x8f, 0xbd, 0x5a, 0x1f, 0x91, 0x2c, 0x40, 0x6b, - 0x7a, 0xb7, 0xdf, 0x61, 0x0f, 0xbf, 0xc5, 0x51, 0xd3, 0x83, 0xac, 0xdf, 0x34, 0x9d, 0xc4, 0x02, - 0xb2, 0x89, 0x59, 0xae, 0xa4, 0x5c, 0x20, 0x2c, 0xce, 0xf8, 0xd6, 0x7e, 0x3d, 0x45, 0x7b, 0x4f, - 0x65, 0x74, 0x17, 0xe4, 0x58, 0x28, 0xcf, 0xe3, 0x9f, 0xb2, 0xa0, 0x61, 0x63, 0x92, 0x79, 0xad, - 0xf4, 0x04, 0x8c, 0xad, 0xd8, 0xed, 0x05, 0x32, 0xa4, 0xe3, 0x90, 0xef, 0xda, 0x6d, 0xc5, 0x17, - 0x4d, 0x8d, 0x75, 0xed, 0xf6, 0xfa, 0x90, 0x28, 0x8c, 0x4f, 0xcb, 0x7b, 0x21, 0xb7, 0xbe, 0x4b, - 0xc9, 0x4f, 0xb9, 0x52, 0xca, 0xf8, 0xfb, 0xc8, 0xb9, 0x07, 0x88, 0x3e, 0x9a, 0x01, 0x58, 0xdf, - 0x75, 0x47, 0x38, 0xe4, 0x08, 0x0e, 0x49, 0x90, 0x73, 0x76, 0xdd, 0x88, 0xba, 0xd0, 0x84, 0xd7, - 0xf6, 0xeb, 0xb9, 0xf5, 0x5d, 0xb2, 0xbd, 0x90, 0x79, 0x4d, 0x30, 0x95, 0x95, 0x09, 0xa5, 0xb2, - 0xdc, 0x04, 0x5e, 0x36, 0x22, 0x81, 0x37, 0xea, 0x3b, 0x01, 0x38, 0x06, 0x63, 0x96, 0x7a, 0x4d, - 0x21, 0x33, 0xca, 0xbe, 0x42, 0x9a, 0xb3, 0xd4, 0x6b, 0xcb, 0x66, 0x1b, 0xcd, 0x43, 0xb6, 0x63, - 0xb6, 0x45, 0xde, 0xed, 0xa8, 0x18, 0x14, 0x89, 0xb8, 0xf8, 0x6d, 0xe2, 0x65, 0xb3, 0xdd, 0x3c, - 0x46, 0xe4, 0xff, 0xe5, 0x3f, 0xaf, 0x4f, 0x04, 0xe1, 0xb6, 0x4c, 0x89, 0xdd, 0x64, 0x60, 0x7e, - 0x68, 0x32, 0xb0, 0x70, 0x50, 0x32, 0x10, 0x82, 0xc9, 0xc0, 0x3b, 0xe8, 0x99, 0x26, 0x3b, 0xc3, - 0x99, 0x1e, 0x08, 0x3e, 0xe7, 0x8c, 0x3d, 0x7a, 0x8a, 0x7a, 0x2b, 0x14, 0xdc, 0x8b, 0x42, 0xfc, - 0xb3, 0xcf, 0x1e, 0x80, 0xeb, 0xdb, 0xc7, 0x52, 0x50, 0x0e, 0xf6, 0x98, 0xe6, 0x73, 0xec, 0x36, - 0xff, 0x60, 0x2a, 0x4b, 0x7b, 0x12, 0xa5, 0x58, 0x12, 0x99, 0xf2, 0x90, 0xce, 0xcf, 0x85, 0x74, - 0x7e, 0x4a, 0x08, 0x88, 0xbd, 0xdd, 0x61, 0xaa, 0x3e, 0xcd, 0xa5, 0x53, 0xf2, 0x01, 0x6d, 0x4f, - 0xf5, 0xa9, 0x46, 0xfc, 0x0c, 0x14, 0x7d, 0xb5, 0x91, 0x41, 0xfd, 0x23, 0x11, 0xc9, 0x8e, 0x49, - 0x77, 0x42, 0x44, 0x8d, 0x38, 0x42, 0xf0, 0x50, 0x5d, 0x45, 0x2d, 0xb8, 0x48, 0x49, 0xaf, 0x57, - 0x34, 0x17, 0xfe, 0xec, 0x3b, 0x27, 0x46, 0x5e, 0x7e, 0xed, 0xc4, 0xc8, 0xd0, 0xfb, 0x99, 0x52, - 0xfc, 0x17, 0xe6, 0x5d, 0x2f, 0xf3, 0xf1, 0xf7, 0xc3, 0xad, 0x1c, 0xc7, 0x76, 0xd4, 0x1d, 0xdd, - 0x68, 0x8b, 0xbf, 0xdc, 0xdd, 0x94, 0xf9, 0x68, 0x38, 0xf4, 0xc6, 0xdd, 0xce, 0x8f, 0x7a, 0x69, - 0xac, 0x16, 0xe5, 0x0d, 0xa5, 0xfd, 0x2c, 0xa0, 0x15, 0xbb, 0x3d, 0x6f, 0x61, 0xf6, 0xb1, 0x11, - 0xbe, 0x4f, 0x0a, 0x3e, 0xf6, 0xe1, 0x36, 0xea, 0x96, 0xd9, 0xe0, 0x58, 0xdc, 0xef, 0x46, 0x7b, - 0x39, 0xa2, 0xc0, 0x13, 0xa1, 0x45, 0x00, 0x9a, 0x5e, 0xb1, 0x6d, 0x2f, 0x99, 0x57, 0x0f, 0xf3, - 0x98, 0x77, 0x31, 0x64, 0xd5, 0xc1, 0xb6, 0x98, 0x6b, 0x8f, 0x10, 0x7d, 0x18, 0xa6, 0xba, 0xba, - 0xa1, 0xd8, 0xb8, 0xb3, 0xa5, 0xb4, 0x70, 0x87, 0x7e, 0x8a, 0x85, 0x1f, 0xdc, 0x15, 0x9a, 0xcb, - 0xdc, 0x31, 0xdd, 0x15, 0x3f, 0x67, 0xb3, 0x4b, 0x86, 0x73, 0x7d, 0xbf, 0x5e, 0x63, 0xde, 0x21, - 0x82, 0xa5, 0x24, 0x4f, 0x76, 0x75, 0x63, 0x0d, 0x77, 0xb6, 0x16, 0x5c, 0x18, 0x7a, 0x09, 0x26, - 0x39, 0x86, 0xe9, 0x25, 0x3d, 0x88, 0xed, 0x29, 0x35, 0x57, 0xae, 0xef, 0xd7, 0xab, 0x8c, 0xdb, - 0x00, 0x8a, 0xf4, 0x83, 0xfd, 0xfa, 0xfd, 0x09, 0xfa, 0x34, 0xa7, 0x69, 0xc2, 0x3d, 0x56, 0x5c, - 0x26, 0x1c, 0x42, 0xda, 0xf6, 0x12, 0xf4, 0xa2, 0xed, 0xd1, 0x70, 0xdb, 0x03, 0x28, 0x49, 0xdb, - 0xf6, 0xb9, 0x66, 0x2f, 0x83, 0x2f, 0xda, 0x3e, 0x0a, 0xb9, 0x5e, 0x7f, 0x53, 0x9c, 0xa2, 0x15, - 0x64, 0x5e, 0x42, 0x33, 0xfe, 0x83, 0xb4, 0xe2, 0xd9, 0x92, 0x98, 0x4f, 0x12, 0xab, 0xb8, 0x69, - 0x4e, 0x16, 0xfb, 0xd1, 0xe8, 0xe3, 0x6b, 0x19, 0xa8, 0xac, 0xd8, 0xed, 0xc5, 0x96, 0xee, 0xdc, - 0x64, 0xf5, 0xea, 0x45, 0x49, 0x87, 0x7a, 0xb3, 0xe6, 0xfc, 0xf5, 0xfd, 0x7a, 0x99, 0x49, 0xe7, - 0x66, 0xca, 0xa4, 0x0b, 0x13, 0x9e, 0x5e, 0x2a, 0x96, 0xea, 0x70, 0xf7, 0xd4, 0x5c, 0x48, 0xa8, - 0x81, 0x0b, 0x58, 0xbb, 0xbe, 0x5f, 0x3f, 0xca, 0x7a, 0x16, 0x62, 0x25, 0xc9, 0x65, 0x2d, 0xb0, - 0x16, 0xd0, 0x6e, 0xb4, 0xe2, 0xd3, 0xf3, 0xa7, 0xe6, 0xc5, 0xb7, 0x50, 0xe9, 0xf9, 0xd4, 0xfd, - 0x41, 0x1a, 0x8a, 0xc4, 0xd5, 0x33, 0x38, 0x8e, 0x5e, 0x0a, 0xa9, 0x1f, 0xe3, 0x52, 0x48, 0xbf, - 0x3d, 0x4b, 0xe1, 0x1e, 0x37, 0xd6, 0xce, 0x0c, 0xd5, 0xf9, 0x60, 0xc8, 0xfd, 0x9f, 0x33, 0xd4, - 0xaa, 0xd2, 0x1d, 0xa4, 0x8c, 0x5b, 0xef, 0x04, 0x01, 0xfe, 0x6c, 0x0a, 0x8e, 0x78, 0xe2, 0xb1, - 0x2d, 0x2d, 0x24, 0xc5, 0x67, 0xae, 0xef, 0xd7, 0x6f, 0x0d, 0x4b, 0xd1, 0x87, 0x76, 0x03, 0x92, - 0x9c, 0x72, 0x19, 0xad, 0x59, 0x5a, 0x74, 0x3f, 0x5a, 0xb6, 0xe3, 0xf6, 0x23, 0x33, 0xbc, 0x1f, - 0x3e, 0xb4, 0x1f, 0xa9, 0x1f, 0x0b, 0xb6, 0x33, 0x38, 0xa9, 0xd9, 0x84, 0x93, 0xfa, 0xf5, 0x34, - 0x8c, 0xaf, 0xd8, 0xed, 0x0d, 0xa3, 0xf5, 0xee, 0x82, 0x38, 0xec, 0x82, 0xf8, 0x44, 0x0a, 0xca, - 0x17, 0x75, 0xdb, 0x31, 0x2d, 0x5d, 0x53, 0x3b, 0x74, 0x37, 0xe3, 0xdd, 0x91, 0x4c, 0x1d, 0xfe, - 0x8e, 0xe4, 0x23, 0x90, 0xbb, 0xaa, 0x76, 0xd8, 0xbf, 0x2b, 0xca, 0xd0, 0x33, 0xc2, 0x90, 0xef, - 0x08, 0xe7, 0x80, 0x39, 0x3a, 0xef, 0xce, 0x6f, 0xa7, 0x61, 0x22, 0x14, 0x78, 0xa0, 0x26, 0x64, - 0xa9, 0x45, 0x67, 0x1b, 0xde, 0xd9, 0x43, 0xc4, 0x15, 0x64, 0x4f, 0x4c, 0x69, 0xd1, 0x4f, 0x41, - 0xbe, 0xab, 0xee, 0x32, 0xcf, 0xc0, 0xf6, 0x37, 0x73, 0x87, 0xe3, 0xe3, 0xed, 0x5e, 0x05, 0x1f, - 0x49, 0x1e, 0xeb, 0xaa, 0xbb, 0xd4, 0x1f, 0xf4, 0x60, 0x82, 0x40, 0xb5, 0x6d, 0xd5, 0x68, 0x63, - 0xbf, 0xfb, 0xb9, 0x78, 0xe8, 0x46, 0x8e, 0x7a, 0x8d, 0xf8, 0xd8, 0x49, 0xf2, 0x78, 0x57, 0xdd, - 0x9d, 0xa7, 0x00, 0xd2, 0x62, 0x23, 0xff, 0xca, 0xab, 0xf5, 0x11, 0x2a, 0xb1, 0xff, 0x98, 0x02, - 0xf0, 0x24, 0x86, 0xd6, 0xa1, 0x12, 0x72, 0x5f, 0xe2, 0x8e, 0x51, 0x6c, 0x80, 0xe7, 0x6d, 0x6c, - 0x27, 0xb4, 0xd0, 0x14, 0x7c, 0x10, 0x8a, 0xec, 0x96, 0x80, 0x42, 0x93, 0xf1, 0xe9, 0xd8, 0x64, - 0xfc, 0x09, 0xc2, 0xeb, 0xfa, 0x7e, 0x1d, 0xb1, 0xe1, 0xf8, 0x88, 0x25, 0x9a, 0xa2, 0x07, 0x06, - 0x21, 0x04, 0xc1, 0xb1, 0x14, 0x7d, 0xb1, 0x05, 0xbd, 0x7b, 0x66, 0x1a, 0xfa, 0x0e, 0xb6, 0xdc, - 0x3d, 0x32, 0x2b, 0xa2, 0x1a, 0xe4, 0xd9, 0x57, 0x05, 0x9d, 0x3d, 0xf1, 0xef, 0x2a, 0x44, 0x99, - 0x50, 0x5d, 0xc3, 0x9b, 0xb6, 0x2e, 0x66, 0x41, 0x16, 0x45, 0x74, 0x1e, 0x2a, 0x36, 0xd6, 0xfa, - 0x96, 0xee, 0xec, 0x29, 0x9a, 0x69, 0x38, 0xaa, 0xe6, 0x70, 0xa7, 0x7d, 0xcb, 0xf5, 0xfd, 0xfa, - 0x31, 0xd6, 0xd7, 0x30, 0x86, 0x24, 0x4f, 0x08, 0xd0, 0x3c, 0x83, 0x90, 0x16, 0x5a, 0xd8, 0x51, - 0xf5, 0x8e, 0xcd, 0x37, 0xb6, 0xa2, 0xe8, 0x1b, 0xcb, 0x57, 0xc6, 0xfc, 0x87, 0x51, 0xd7, 0xa0, - 0x62, 0xf6, 0xb0, 0x15, 0x61, 0x8f, 0x96, 0xbd, 0x96, 0xc3, 0x18, 0x37, 0x60, 0x12, 0x26, 0x04, - 0x0f, 0x61, 0x11, 0xce, 0x07, 0xee, 0x9c, 0xb1, 0xb8, 0x31, 0x1d, 0x1e, 0x72, 0x18, 0x43, 0xf2, - 0x5f, 0x34, 0x63, 0xd1, 0xe5, 0x51, 0xc8, 0xbd, 0xa0, 0xea, 0x1d, 0xf1, 0xa9, 0x55, 0x99, 0x97, - 0xd0, 0x12, 0xe4, 0x6c, 0x47, 0x75, 0xfa, 0x2c, 0xf4, 0x1e, 0x6d, 0xbe, 0x27, 0x61, 0x9f, 0x9b, - 0xa6, 0xd1, 0x5a, 0xa3, 0x84, 0x32, 0x67, 0x80, 0xce, 0x43, 0xce, 0x31, 0x77, 0xb0, 0xc1, 0x85, - 0x7a, 0xa8, 0x95, 0x4e, 0x13, 0x75, 0x8c, 0x1a, 0x39, 0xe0, 0x19, 0x65, 0xc5, 0xde, 0x56, 0x2d, - 0x6c, 0xb3, 0x50, 0xb9, 0xb9, 0x74, 0xe8, 0xe5, 0x78, 0x2c, 0xec, 0x29, 0x18, 0x3f, 0x49, 0x9e, - 0x70, 0x41, 0x6b, 0x14, 0x12, 0x8e, 0x9c, 0xc7, 0x6e, 0x28, 0x72, 0x3e, 0x0f, 0x95, 0xbe, 0xb1, - 0x69, 0x1a, 0xf4, 0xb3, 0x88, 0x3c, 0x4d, 0x93, 0x3f, 0x99, 0x9a, 0xc9, 0xf8, 0x67, 0x2b, 0x8c, - 0x21, 0xc9, 0x13, 0x2e, 0x88, 0xdf, 0x7e, 0x6c, 0x41, 0xd9, 0xc3, 0xa2, 0x4b, 0xb6, 0x10, 0xbb, - 0x64, 0x6f, 0xe7, 0x4b, 0xf6, 0x48, 0xb8, 0x15, 0x6f, 0xd5, 0x8e, 0xbb, 0x40, 0x42, 0x86, 0xde, - 0x1f, 0xd8, 0x46, 0x02, 0x6f, 0x61, 0xa8, 0x95, 0x49, 0xbe, 0x83, 0x2c, 0xbe, 0x2d, 0x3b, 0xc8, - 0x46, 0xe9, 0x63, 0xaf, 0xd6, 0x47, 0xdc, 0x05, 0xfb, 0x0b, 0x69, 0xc8, 0x2d, 0x5c, 0xa1, 0xcf, - 0x28, 0x7f, 0x42, 0xc3, 0x07, 0x9f, 0xf5, 0x7a, 0x1f, 0x8c, 0x31, 0x59, 0xd8, 0xe8, 0x2c, 0x8c, - 0xf6, 0xc8, 0x0f, 0x9e, 0x6b, 0x3c, 0x3a, 0xa0, 0xd2, 0x14, 0x4f, 0xec, 0x30, 0x29, 0xaa, 0xf4, - 0x85, 0x0c, 0xc0, 0xc2, 0x95, 0x2b, 0xeb, 0x96, 0xde, 0xeb, 0x60, 0xe7, 0xdd, 0xf0, 0xfa, 0x9d, - 0x13, 0x5e, 0xfb, 0xe6, 0xf8, 0x69, 0x28, 0x7a, 0x73, 0x64, 0xa3, 0xc7, 0x21, 0xef, 0xf0, 0xdf, - 0x7c, 0xaa, 0x6b, 0x83, 0x53, 0x2d, 0xd0, 0xf9, 0x74, 0xbb, 0x14, 0xd2, 0x7f, 0x4d, 0x03, 0xc4, - 0x25, 0x67, 0x7e, 0x02, 0x02, 0xf0, 0xf3, 0x90, 0xe3, 0x1e, 0x27, 0x73, 0x43, 0xd1, 0x2a, 0xa7, - 0xf6, 0xcd, 0xd2, 0x77, 0xd2, 0x30, 0xb5, 0x21, 0xcc, 0xee, 0xbb, 0x12, 0x46, 0x17, 0x61, 0x0c, - 0x1b, 0x8e, 0xa5, 0x63, 0x91, 0x06, 0x9f, 0x09, 0x6b, 0x69, 0x84, 0xb4, 0xe8, 0xbf, 0x4b, 0x10, - 0xb7, 0xe5, 0x38, 0xb9, 0x4f, 0xc6, 0x9f, 0xcc, 0x40, 0x75, 0x18, 0x15, 0x9a, 0x87, 0x09, 0xcd, - 0xc2, 0x14, 0xa0, 0xf8, 0x4f, 0x4e, 0x9a, 0x35, 0x5f, 0xc6, 0x28, 0x88, 0x20, 0xc9, 0x65, 0x01, - 0xe1, 0x0e, 0xb9, 0x4d, 0x13, 0x54, 0x64, 0xa9, 0x10, 0xac, 0x84, 0x41, 0xb4, 0xc4, 0x3d, 0xb2, - 0x97, 0x96, 0xf2, 0x33, 0x60, 0x2e, 0xb9, 0xec, 0x41, 0xa9, 0x4f, 0x7e, 0x11, 0x26, 0x74, 0x43, - 0x77, 0x74, 0xb5, 0xa3, 0x6c, 0xaa, 0x1d, 0xd5, 0xd0, 0x6e, 0x64, 0x2b, 0xc2, 0xbc, 0x29, 0x6f, - 0x36, 0xc4, 0x4e, 0x92, 0xcb, 0x1c, 0xd2, 0x64, 0x00, 0x32, 0x23, 0xa2, 0xa9, 0xec, 0x0d, 0x05, - 0x6e, 0x82, 0xdc, 0x37, 0x23, 0xbf, 0x98, 0x81, 0x49, 0x37, 0x3f, 0xf3, 0xee, 0x54, 0x24, 0x9d, - 0x8a, 0x15, 0x00, 0x66, 0x40, 0x88, 0xe7, 0xb8, 0x81, 0xd9, 0x20, 0x26, 0xa8, 0xc0, 0x38, 0x2c, - 0xd8, 0x8e, 0x6f, 0x3e, 0xfe, 0x32, 0x03, 0x25, 0xff, 0x7c, 0xbc, 0xeb, 0xd2, 0xdf, 0x41, 0x19, - 0xb3, 0x39, 0xcf, 0x24, 0x66, 0xf9, 0x77, 0x51, 0x42, 0x26, 0x71, 0x60, 0x29, 0x0d, 0xb7, 0x85, - 0x7f, 0x93, 0x86, 0x1c, 0xbf, 0x97, 0xad, 0x0d, 0xec, 0x22, 0x52, 0x71, 0xf7, 0xbe, 0x0f, 0xde, - 0x44, 0xbc, 0x12, 0xb9, 0x89, 0x28, 0x77, 0xd5, 0x5d, 0x25, 0xf0, 0x8a, 0x29, 0x35, 0x33, 0xde, - 0x3c, 0xee, 0x71, 0x09, 0xd6, 0xb3, 0x5c, 0x88, 0x77, 0x27, 0x17, 0x3d, 0x02, 0x45, 0x82, 0xe1, - 0x79, 0x05, 0x42, 0x7e, 0xd4, 0x4b, 0x3e, 0xf8, 0x2a, 0x25, 0x19, 0xba, 0xea, 0xee, 0x22, 0x2b, - 0xa0, 0x65, 0x40, 0xdb, 0x6e, 0xea, 0x4b, 0xf1, 0x44, 0x48, 0xe8, 0x6f, 0xbb, 0xbe, 0x5f, 0x3f, - 0xce, 0xe8, 0x07, 0x71, 0x24, 0x79, 0xd2, 0x03, 0x0a, 0x6e, 0x0f, 0x02, 0x90, 0x71, 0x29, 0xec, - 0x4e, 0x08, 0xdb, 0xc2, 0xfa, 0x2e, 0x4a, 0x78, 0x75, 0x92, 0x5c, 0x20, 0x85, 0x05, 0xf2, 0xdb, - 0x27, 0xf8, 0x5f, 0x4a, 0x01, 0xf2, 0x7c, 0x8f, 0x7b, 0x5e, 0xff, 0x7e, 0xfa, 0x2e, 0x51, 0xec, - 0x8c, 0x52, 0xd1, 0x9b, 0x2c, 0x8f, 0x4e, 0x6c, 0xb2, 0x7c, 0x4b, 0xf5, 0x3e, 0xcf, 0x3e, 0xa7, - 0x87, 0x66, 0x05, 0x23, 0x6c, 0xf0, 0xbf, 0x4f, 0xc1, 0xf1, 0x01, 0xc5, 0x71, 0xfb, 0x75, 0x05, - 0x90, 0xe5, 0xab, 0xe4, 0xff, 0xa1, 0x28, 0xc5, 0xff, 0xe3, 0x5f, 0x42, 0xfd, 0x9b, 0xb4, 0x06, - 0x6c, 0xfc, 0xcd, 0xf3, 0x26, 0x3c, 0xa3, 0x98, 0x82, 0x69, 0x7f, 0xf3, 0xee, 0x00, 0xce, 0x43, - 0xc9, 0xdf, 0x3a, 0xef, 0xfa, 0xad, 0x07, 0x75, 0x9d, 0xf7, 0x3a, 0x40, 0x87, 0x96, 0xbc, 0xd5, - 0x27, 0xfe, 0xe9, 0x64, 0xdc, 0xe8, 0xdd, 0x8b, 0x6c, 0xa1, 0x55, 0xc8, 0x7a, 0xfc, 0xff, 0x53, - 0x90, 0x5d, 0x35, 0xcd, 0x0e, 0x32, 0x61, 0xd2, 0x30, 0x1d, 0x85, 0x28, 0x0b, 0x6e, 0x29, 0x3c, - 0x37, 0xc2, 0xb2, 0xa0, 0xf3, 0x87, 0x13, 0xca, 0xf7, 0xf6, 0xeb, 0x83, 0xac, 0xe4, 0x09, 0xc3, - 0x74, 0x9a, 0x14, 0xb2, 0xce, 0x32, 0x27, 0x1f, 0x86, 0xf1, 0x60, 0x63, 0x2c, 0x53, 0xf4, 0xec, - 0xa1, 0x1b, 0x0b, 0xb2, 0xb9, 0xbe, 0x5f, 0x9f, 0xf6, 0x16, 0x81, 0x0b, 0x96, 0xe4, 0xd2, 0xa6, - 0xaf, 0xf5, 0x46, 0x9e, 0x8c, 0xfe, 0xfb, 0xaf, 0xd6, 0x53, 0xcd, 0xf3, 0x43, 0x6f, 0x00, 0xdc, - 0x77, 0x60, 0x17, 0x76, 0xdd, 0xa3, 0xfe, 0xe0, 0x5d, 0x80, 0x5f, 0x9b, 0x85, 0x5a, 0xe8, 0x2e, - 0x00, 0x7d, 0x87, 0x3c, 0xe4, 0x26, 0xc0, 0xc1, 0xff, 0xc0, 0x7f, 0xc8, 0x45, 0x81, 0x03, 0x2f, - 0x1b, 0x48, 0x1f, 0x82, 0xa3, 0xf4, 0x2a, 0xa7, 0x67, 0xb6, 0xc4, 0x57, 0x62, 0x8e, 0xba, 0x09, - 0xb4, 0x14, 0xff, 0x7f, 0xe1, 0x2c, 0x1b, 0x76, 0x2f, 0x64, 0x2c, 0xfc, 0xa2, 0xfb, 0xd2, 0x86, - 0x77, 0x91, 0x75, 0x9b, 0xfd, 0x07, 0x7f, 0x4a, 0x2f, 0x13, 0x2c, 0xe9, 0x63, 0x29, 0x38, 0x36, - 0xc0, 0x9f, 0xeb, 0xf9, 0x93, 0x81, 0x27, 0xa2, 0xa9, 0x64, 0x59, 0x79, 0xff, 0xb7, 0x1e, 0xee, - 0x23, 0x3d, 0xb1, 0xdd, 0x20, 0x29, 0xa2, 0x27, 0xac, 0x25, 0xd2, 0x15, 0x5b, 0x7a, 0x11, 0x8e, - 0x04, 0x7b, 0x22, 0x06, 0xfa, 0x1c, 0x94, 0x83, 0x3b, 0x02, 0x1e, 0x2e, 0xbc, 0xe7, 0xf0, 0x5e, - 0x70, 0x3c, 0xb0, 0x2b, 0x90, 0x9e, 0x0d, 0x0b, 0xd7, 0x1d, 0xfb, 0xfb, 0x06, 0x2f, 0xd8, 0xc7, - 0x0e, 0xdd, 0xf7, 0xfe, 0xea, 0x37, 0x53, 0x70, 0x32, 0xc8, 0xd9, 0x33, 0xb4, 0xf6, 0x5b, 0x3e, - 0xae, 0xc3, 0xa9, 0xc0, 0x1f, 0xa5, 0xe0, 0xf6, 0x03, 0xfa, 0xca, 0x05, 0x62, 0xc1, 0xb4, 0xcf, - 0x66, 0x5b, 0x1c, 0x2c, 0xd4, 0x42, 0x1a, 0xee, 0x57, 0x5c, 0x93, 0x75, 0x0b, 0xbf, 0x60, 0x34, - 0x35, 0x58, 0x67, 0xcb, 0x53, 0x83, 0x76, 0xf6, 0xb0, 0xfa, 0xf3, 0x7b, 0x29, 0x38, 0x1d, 0x1c, - 0x47, 0xc4, 0xce, 0xec, 0x9d, 0x26, 0xfc, 0xaf, 0xa6, 0xe0, 0x9e, 0x24, 0x9d, 0xe6, 0xb3, 0xf0, - 0x3c, 0x4c, 0x79, 0x91, 0x51, 0x78, 0x12, 0x4e, 0x25, 0xd8, 0xcf, 0x72, 0x55, 0x45, 0x2e, 0x97, - 0x1b, 0x95, 0xf6, 0x9f, 0xa4, 0xf8, 0xda, 0xf1, 0xcf, 0xa6, 0x2b, 0xda, 0x60, 0xf8, 0x7e, 0x48, - 0xd1, 0xfa, 0x42, 0xf8, 0xf1, 0x40, 0x08, 0x1f, 0x31, 0x69, 0xe9, 0x9b, 0x64, 0x09, 0x7e, 0x4e, - 0xd8, 0xc1, 0x88, 0x40, 0x6a, 0x07, 0xa6, 0x22, 0x54, 0xdf, 0x7d, 0x1d, 0x1a, 0xaf, 0xf9, 0x47, - 0x7f, 0xb0, 0x5f, 0x8f, 0x88, 0xd0, 0x64, 0x34, 0xa8, 0xf4, 0xd2, 0x7f, 0x49, 0x41, 0x9d, 0x76, - 0x24, 0x62, 0xf2, 0xfe, 0x3e, 0x0b, 0x18, 0x73, 0x83, 0x18, 0x39, 0x2c, 0x2e, 0xe8, 0x39, 0xc8, - 0x31, 0xbd, 0xe4, 0xb2, 0x3d, 0x84, 0x42, 0x73, 0x42, 0xcf, 0xf0, 0x2e, 0x88, 0x71, 0x45, 0xaf, - 0xfd, 0xb7, 0x48, 0x7e, 0x87, 0x5a, 0xfb, 0x5f, 0x11, 0x86, 0x37, 0xba, 0xaf, 0x5c, 0x28, 0x1f, - 0xfc, 0x91, 0x0d, 0x2f, 0xff, 0xce, 0xcf, 0x4d, 0xb4, 0xb0, 0x6e, 0x87, 0x63, 0x2c, 0xec, 0x3b, - 0x41, 0xca, 0xae, 0x85, 0x8d, 0xe9, 0xf4, 0x3b, 0xce, 0xc2, 0x7e, 0x37, 0x0d, 0xc7, 0x69, 0xc7, - 0xfd, 0xbb, 0x80, 0xb7, 0x41, 0xba, 0x0a, 0x20, 0xdb, 0xd2, 0x94, 0x9b, 0x65, 0x07, 0x2a, 0xb6, - 0xa5, 0x5d, 0x09, 0x38, 0x48, 0x05, 0x50, 0xcb, 0x76, 0xc2, 0x0d, 0x64, 0x6e, 0xb8, 0x81, 0x96, - 0xed, 0x5c, 0x89, 0xf2, 0xc0, 0xd9, 0x44, 0xfa, 0xf1, 0x5b, 0x29, 0xa8, 0x45, 0x89, 0x99, 0xeb, - 0x83, 0x0a, 0x47, 0x03, 0xbb, 0xd5, 0xb0, 0x4a, 0xdc, 0x71, 0xd0, 0x9e, 0x2d, 0xb4, 0x04, 0x8f, - 0x58, 0xf8, 0x47, 0x5f, 0x84, 0x5f, 0x12, 0x0e, 0xc2, 0xd5, 0xe7, 0xc1, 0xad, 0xc1, 0x3b, 0x64, - 0xe9, 0xfd, 0xf2, 0x80, 0x31, 0xfe, 0xf1, 0xef, 0x32, 0xfe, 0x34, 0x05, 0x27, 0x86, 0xf4, 0xe9, - 0xef, 0xb3, 0x7b, 0xfd, 0x99, 0xa1, 0x4a, 0x71, 0xb3, 0xb6, 0x34, 0x0f, 0xf2, 0x65, 0x12, 0xbc, - 0xf3, 0xe5, 0xdb, 0x8c, 0x46, 0x7e, 0x9f, 0xed, 0x19, 0xb8, 0x25, 0x92, 0x8a, 0xf7, 0xe9, 0x2c, - 0x64, 0xb7, 0x75, 0xdb, 0x71, 0x3f, 0x5a, 0x10, 0xea, 0x4e, 0x88, 0x8a, 0xe2, 0x4a, 0x08, 0x2a, - 0x94, 0xe5, 0xaa, 0x69, 0x76, 0x78, 0xf3, 0xd2, 0x3c, 0x4c, 0xfa, 0x60, 0x9c, 0xf9, 0x2c, 0x64, - 0x7b, 0xa6, 0xd9, 0xe1, 0xcc, 0xa7, 0xc3, 0xcc, 0x09, 0x2e, 0x1f, 0x26, 0xc5, 0x93, 0xa6, 0x01, - 0x31, 0x26, 0xec, 0x73, 0x1a, 0x9c, 0xf5, 0x1e, 0x4c, 0x05, 0xa0, 0xee, 0x7b, 0x9f, 0x5c, 0xe0, - 0x43, 0x4c, 0x03, 0xa7, 0xdb, 0x0c, 0xdf, 0x7d, 0xd9, 0xcd, 0x12, 0xa3, 0x87, 0xd2, 0xd5, 0xb3, - 0x7f, 0x5c, 0x12, 0x4f, 0x42, 0x15, 0x00, 0x5f, 0xde, 0xf2, 0xae, 0x70, 0x5b, 0xd1, 0x19, 0x82, - 0xda, 0xdd, 0xb1, 0x78, 0x3c, 0xe8, 0x1c, 0x41, 0x3f, 0xe5, 0xbf, 0x73, 0x74, 0xe7, 0xc1, 0x74, - 0x82, 0xfd, 0x5d, 0x71, 0x68, 0x2e, 0xf7, 0x7f, 0x00, 0xd3, 0x51, 0x9b, 0x4b, 0xf4, 0xc0, 0xc1, - 0x1c, 0x06, 0x83, 0x8a, 0xda, 0x7b, 0x0e, 0x41, 0xe1, 0x36, 0xff, 0x4a, 0x0a, 0x6e, 0x3b, 0x70, - 0x7f, 0x85, 0x1e, 0x3b, 0x98, 0xed, 0x01, 0x61, 0x4e, 0xad, 0x71, 0x23, 0xa4, 0x6e, 0xd7, 0x94, - 0xc0, 0xe1, 0x77, 0xb4, 0x44, 0x07, 0x36, 0x00, 0x43, 0x26, 0x76, 0x30, 0xf4, 0x93, 0x46, 0xd0, - 0x4b, 0xd1, 0x87, 0xc0, 0x67, 0x22, 0x39, 0x0c, 0xdf, 0x73, 0xd4, 0x1e, 0x48, 0x4e, 0xe0, 0x9f, - 0xf6, 0xa8, 0xd0, 0x76, 0xc8, 0xb4, 0x1f, 0x10, 0xb1, 0x0f, 0x99, 0xf6, 0x83, 0xe2, 0x66, 0x3e, - 0xed, 0x07, 0x06, 0x7d, 0x43, 0xa6, 0x3d, 0x49, 0x74, 0x3b, 0x64, 0xda, 0x13, 0xc5, 0x98, 0xd2, - 0x08, 0xda, 0x86, 0xf1, 0x40, 0xb8, 0x81, 0x4e, 0x47, 0xb2, 0x8b, 0x8a, 0xfc, 0x6a, 0xf7, 0x24, - 0x41, 0xf5, 0xcf, 0x7f, 0x84, 0xf7, 0x1d, 0x32, 0xff, 0xc3, 0x43, 0x8a, 0xda, 0x03, 0xc9, 0x09, - 0xdc, 0xb6, 0xaf, 0xb9, 0xe7, 0x12, 0x3e, 0x04, 0x34, 0x9b, 0x90, 0x93, 0x68, 0xf9, 0x4c, 0x62, - 0x7c, 0xb7, 0xe1, 0x9d, 0x81, 0xab, 0xc9, 0xd1, 0x42, 0x8b, 0xf4, 0x65, 0xb5, 0x7b, 0x13, 0xe1, - 0xba, 0x8d, 0xad, 0xf0, 0xa4, 0xfb, 0xc9, 0x48, 0x32, 0x9f, 0x97, 0xaa, 0xdd, 0x7e, 0x00, 0x86, - 0xcb, 0x6e, 0xcd, 0x3d, 0x45, 0x93, 0xa2, 0xd1, 0xfd, 0xde, 0xa9, 0x76, 0xea, 0x40, 0x1c, 0xc1, - 0xf4, 0x66, 0xe7, 0xc5, 0xff, 0x2e, 0x00, 0x00, 0xff, 0xff, 0x11, 0x64, 0x65, 0x92, 0xad, 0x96, - 0x00, 0x00, + 0xec, 0x99, 0x46, 0x92, 0x4e, 0x7c, 0x81, 0x73, 0x00, 0x4e, 0x42, 0x18, 0x9c, 0x83, 0x42, 0xd2, + 0x89, 0xf8, 0xa7, 0x6f, 0x88, 0xe5, 0x21, 0x66, 0xe0, 0x02, 0x4c, 0x08, 0x03, 0xa5, 0x9b, 0x46, + 0x02, 0x16, 0xff, 0x8c, 0xb3, 0x28, 0xfb, 0xc8, 0xf8, 0x30, 0x1c, 0x6c, 0x3b, 0x6d, 0x9c, 0x84, + 0xc9, 0x97, 0xc4, 0x30, 0x38, 0x09, 0x17, 0xe5, 0x26, 0x36, 0xb4, 0xed, 0x64, 0x1c, 0x7e, 0x53, + 0x88, 0x52, 0xd0, 0x10, 0x16, 0xf3, 0x30, 0xde, 0x55, 0x2d, 0x7b, 0x5b, 0xed, 0x24, 0x9a, 0x8e, + 0x7f, 0xce, 0x79, 0x94, 0x5c, 0x22, 0x2e, 0x91, 0xbe, 0x71, 0x18, 0x36, 0x5f, 0x16, 0x12, 0xf1, + 0x91, 0xf1, 0xa5, 0x67, 0x3b, 0x34, 0xcb, 0x76, 0x18, 0x6e, 0xff, 0x42, 0x2c, 0x3d, 0x46, 0xbb, + 0xe2, 0xe7, 0x78, 0x0e, 0x0a, 0xb6, 0xfe, 0x52, 0x22, 0x36, 0xff, 0x52, 0xcc, 0x34, 0x25, 0x20, + 0xc4, 0x1f, 0x82, 0xe3, 0x91, 0x6e, 0x22, 0x01, 0xb3, 0xdf, 0xe2, 0xcc, 0x8e, 0x46, 0xb8, 0x0a, + 0x6e, 0x12, 0x0e, 0xcb, 0xf2, 0x2b, 0xc2, 0x24, 0xe0, 0x10, 0xaf, 0x55, 0xb2, 0x8f, 0xb0, 0xd5, + 0xad, 0xc3, 0x49, 0xed, 0xb7, 0x85, 0xd4, 0x18, 0x6d, 0x40, 0x6a, 0xeb, 0x70, 0x94, 0x73, 0x3c, + 0xdc, 0xbc, 0xfe, 0x8e, 0x30, 0xac, 0x8c, 0x7a, 0x23, 0x38, 0xbb, 0x1f, 0x86, 0x9a, 0x2b, 0x4e, + 0x11, 0xb0, 0xda, 0x4a, 0x57, 0xed, 0x25, 0xe0, 0xfc, 0xbb, 0x9c, 0xb3, 0xb0, 0xf8, 0x6e, 0xc4, + 0x6b, 0xaf, 0xa8, 0x3d, 0xc2, 0xfc, 0x39, 0xa8, 0x0a, 0xe6, 0x7d, 0xc3, 0xc2, 0x9a, 0xd9, 0x36, + 0xf4, 0x97, 0x70, 0x2b, 0x01, 0xeb, 0x7f, 0x15, 0x9a, 0xaa, 0x0d, 0x1f, 0x39, 0xe1, 0xbc, 0x04, + 0x15, 0x37, 0x56, 0x51, 0xf4, 0x6e, 0xcf, 0xb4, 0x9c, 0x18, 0x8e, 0xff, 0x5a, 0xcc, 0x94, 0x4b, + 0xb7, 0x44, 0xc9, 0x1a, 0x8b, 0x50, 0xa6, 0xc5, 0xa4, 0x2a, 0xf9, 0x7b, 0x9c, 0xd1, 0xb8, 0x47, + 0xc5, 0x0d, 0x87, 0x66, 0x76, 0x7b, 0xaa, 0x95, 0xc4, 0xfe, 0xfd, 0x1b, 0x61, 0x38, 0x38, 0x09, + 0x37, 0x1c, 0xce, 0x5e, 0x0f, 0x13, 0x6f, 0x9f, 0x80, 0xc3, 0x57, 0x85, 0xe1, 0x10, 0x34, 0x9c, + 0x85, 0x08, 0x18, 0x12, 0xb0, 0xf8, 0x9a, 0x60, 0x21, 0x68, 0x08, 0x8b, 0x67, 0x3c, 0x47, 0x6b, + 0xe1, 0xb6, 0x6e, 0x3b, 0x16, 0x0b, 0x93, 0x0f, 0x66, 0xf5, 0xf5, 0x37, 0x82, 0x41, 0x98, 0xec, + 0x23, 0x25, 0x96, 0x88, 0xa7, 0x5d, 0xe9, 0x2e, 0x2a, 0xbe, 0x63, 0xdf, 0x10, 0x96, 0xc8, 0x47, + 0x46, 0xfa, 0xe6, 0x8b, 0x10, 0x89, 0xd8, 0x35, 0xb2, 0x77, 0x48, 0xc0, 0xee, 0xf7, 0x43, 0x9d, + 0x5b, 0x13, 0xb4, 0x84, 0xa7, 0x2f, 0xfe, 0xe9, 0x1b, 0x3b, 0x78, 0x2f, 0x91, 0x76, 0xfe, 0xdb, + 0x50, 0xfc, 0xb3, 0xc1, 0x28, 0x99, 0x0d, 0x99, 0x08, 0xc5, 0x53, 0x28, 0xee, 0xfe, 0x50, 0xf5, + 0xef, 0xbe, 0xc9, 0xc7, 0x1b, 0x0c, 0xa7, 0x1a, 0xcb, 0x44, 0xc9, 0x83, 0x41, 0x4f, 0x3c, 0xb3, + 0x8f, 0xbe, 0xe9, 0xea, 0x79, 0x20, 0xe6, 0x69, 0x9c, 0x87, 0xf1, 0x40, 0xc0, 0x13, 0xcf, 0xea, + 0x63, 0x9c, 0x55, 0xc9, 0x1f, 0xef, 0x34, 0x1e, 0x82, 0x2c, 0x09, 0x5e, 0xe2, 0xc9, 0x7f, 0x8e, + 0x93, 0x53, 0xf4, 0xc6, 0x07, 0x20, 0x2f, 0x82, 0x96, 0x78, 0xd2, 0x9f, 0xe7, 0xa4, 0x2e, 0x09, + 0x21, 0x17, 0x01, 0x4b, 0x3c, 0xf9, 0x2f, 0x08, 0x72, 0x41, 0x42, 0xc8, 0x93, 0x8b, 0xf0, 0x9b, + 0x7f, 0x2f, 0xcb, 0x9d, 0x8e, 0x90, 0xdd, 0x39, 0x18, 0xe3, 0x91, 0x4a, 0x3c, 0xf5, 0x27, 0x78, + 0xe3, 0x82, 0xa2, 0xf1, 0x08, 0x8c, 0x26, 0x14, 0xf8, 0x2f, 0x71, 0x52, 0x86, 0xdf, 0x98, 0x87, + 0xa2, 0x2f, 0x3a, 0x89, 0x27, 0xff, 0x65, 0x4e, 0xee, 0xa7, 0x22, 0x5d, 0xe7, 0xd1, 0x49, 0x3c, + 0x83, 0x4f, 0x89, 0xae, 0x73, 0x0a, 0x22, 0x36, 0x11, 0x98, 0xc4, 0x53, 0x7f, 0x5a, 0x48, 0x5d, + 0x90, 0x34, 0x9e, 0x84, 0x82, 0xeb, 0x6c, 0xe2, 0xe9, 0x7f, 0x85, 0xd3, 0x7b, 0x34, 0x44, 0x02, + 0x3e, 0x67, 0x17, 0xcf, 0xe2, 0x57, 0x85, 0x04, 0x7c, 0x54, 0x64, 0x19, 0x85, 0x03, 0x98, 0x78, + 0x4e, 0x7f, 0x5f, 0x2c, 0xa3, 0x50, 0xfc, 0x42, 0x66, 0x93, 0xda, 0xfc, 0x78, 0x16, 0xbf, 0x26, + 0x66, 0x93, 0xe2, 0x93, 0x6e, 0x84, 0x23, 0x82, 0x78, 0x1e, 0xff, 0x48, 0x74, 0x23, 0x14, 0x10, + 0x34, 0x56, 0x01, 0x0d, 0x46, 0x03, 0xf1, 0xfc, 0x5e, 0xe1, 0xfc, 0x26, 0x07, 0x82, 0x81, 0xc6, + 0xb3, 0x70, 0x34, 0x3a, 0x12, 0x88, 0xe7, 0xfa, 0xeb, 0x6f, 0x86, 0xf6, 0x6e, 0xfe, 0x40, 0xa0, + 0xb1, 0xee, 0xb9, 0x14, 0x7f, 0x14, 0x10, 0xcf, 0xf6, 0x33, 0x6f, 0x06, 0x0d, 0xb7, 0x3f, 0x08, + 0x68, 0xcc, 0x01, 0x78, 0x0e, 0x38, 0x9e, 0xd7, 0x67, 0x39, 0x2f, 0x1f, 0x11, 0x59, 0x1a, 0xdc, + 0xff, 0xc6, 0xd3, 0x7f, 0x4e, 0x2c, 0x0d, 0x4e, 0x41, 0x96, 0x86, 0x70, 0xbd, 0xf1, 0xd4, 0x9f, + 0x17, 0x4b, 0x43, 0x90, 0x10, 0xcd, 0xf6, 0x79, 0xb7, 0x78, 0x0e, 0x5f, 0x10, 0x9a, 0xed, 0xa3, + 0x6a, 0x5c, 0x82, 0xc9, 0x01, 0x87, 0x18, 0xcf, 0xea, 0x8b, 0x9c, 0x55, 0x25, 0xec, 0x0f, 0xfd, + 0xce, 0x8b, 0x3b, 0xc3, 0x78, 0x6e, 0xff, 0x24, 0xe4, 0xbc, 0xb8, 0x2f, 0x6c, 0x9c, 0x83, 0xbc, + 0xd1, 0xef, 0x74, 0xc8, 0xe2, 0x41, 0x07, 0xdf, 0xf9, 0xab, 0xfe, 0xf7, 0x1f, 0x71, 0xe9, 0x08, + 0x82, 0xc6, 0x43, 0x30, 0x8a, 0xbb, 0x9b, 0xb8, 0x15, 0x47, 0xf9, 0xfd, 0x1f, 0x09, 0x83, 0x49, + 0xb0, 0x1b, 0x4f, 0x02, 0xb0, 0xd4, 0x08, 0x3d, 0x1e, 0x8c, 0xa1, 0xfd, 0x1f, 0x3f, 0xe2, 0xb7, + 0x71, 0x3c, 0x12, 0x8f, 0x01, 0xbb, 0xdb, 0x73, 0x30, 0x83, 0x37, 0x82, 0x0c, 0xe8, 0x8c, 0x3c, + 0x06, 0x63, 0x2f, 0xd8, 0xa6, 0xe1, 0xa8, 0xed, 0x38, 0xea, 0xff, 0xc9, 0xa9, 0x05, 0x3e, 0x11, + 0x58, 0xd7, 0xb4, 0xb0, 0xa3, 0xb6, 0xed, 0x38, 0xda, 0xff, 0xc5, 0x69, 0x5d, 0x02, 0x42, 0xac, + 0xa9, 0xb6, 0x93, 0x64, 0xdc, 0xff, 0x5b, 0x10, 0x0b, 0x02, 0xd2, 0x69, 0xf2, 0x7b, 0x07, 0xef, + 0xc5, 0xd1, 0xfe, 0x40, 0x74, 0x9a, 0xe3, 0x37, 0x3e, 0x00, 0x05, 0xf2, 0x93, 0x5d, 0xb1, 0x8b, + 0x21, 0xfe, 0x3f, 0x9c, 0xd8, 0xa3, 0x20, 0x2d, 0xdb, 0x4e, 0xcb, 0xd1, 0xe3, 0x85, 0x7d, 0x9d, + 0xcf, 0xb4, 0xc0, 0x6f, 0xcc, 0x41, 0xd1, 0x76, 0x5a, 0xad, 0x3e, 0x8f, 0x4f, 0x63, 0xc8, 0xff, + 0xef, 0x8f, 0xdc, 0x94, 0x85, 0x4b, 0x43, 0x66, 0xfb, 0xda, 0x8e, 0xd3, 0x33, 0xe9, 0x11, 0x48, + 0x1c, 0x87, 0x37, 0x39, 0x07, 0x1f, 0x49, 0x63, 0x1e, 0x4a, 0x64, 0x2c, 0x16, 0xee, 0x61, 0x7a, + 0x5e, 0x15, 0xc3, 0xe2, 0x2f, 0xb9, 0x00, 0x02, 0x44, 0xcd, 0x9f, 0x1e, 0xf6, 0xee, 0x26, 0x3a, + 0x6d, 0x0c, 0x17, 0xcc, 0x0b, 0x26, 0x4b, 0x18, 0x3f, 0x2f, 0x05, 0xd2, 0xc5, 0x6d, 0xd3, 0xcb, + 0xd6, 0xba, 0x9b, 0x1c, 0xf8, 0xfd, 0x34, 0xdc, 0x49, 0xaf, 0xfb, 0x5a, 0x5d, 0xdd, 0x70, 0xce, + 0x68, 0xd6, 0x5e, 0xcf, 0x31, 0xcf, 0x74, 0xb1, 0xb5, 0xd3, 0xc1, 0xfc, 0x0f, 0xcf, 0xfe, 0x56, + 0x3d, 0xb4, 0x59, 0x86, 0x36, 0xcb, 0xea, 0x6b, 0x91, 0xd9, 0x62, 0x69, 0x1e, 0xc6, 0x56, 0x2d, + 0xd3, 0xdc, 0xba, 0xdc, 0x43, 0x88, 0xdf, 0x60, 0xe6, 0x37, 0xe3, 0xa8, 0x1a, 0xf2, 0x17, 0x4f, + 0x69, 0xef, 0xc5, 0x13, 0x82, 0x6c, 0x4b, 0x75, 0x54, 0x9a, 0x30, 0x2f, 0xc9, 0xf4, 0xb7, 0xd4, + 0x84, 0x51, 0xca, 0x04, 0x3d, 0x06, 0x19, 0xb3, 0x67, 0xf3, 0xec, 0xfe, 0xed, 0xb3, 0xc3, 0xfa, + 0x32, 0xcb, 0x9b, 0x6c, 0x66, 0xbf, 0xb5, 0x5f, 0x1f, 0x91, 0x09, 0x4d, 0x73, 0xf5, 0xaf, 0xbf, + 0x7b, 0x22, 0xf5, 0x9b, 0xaf, 0x9d, 0x48, 0x0d, 0x7d, 0xc1, 0x34, 0xeb, 0x13, 0x94, 0x4f, 0x18, + 0xc3, 0xe4, 0xe2, 0xbe, 0x63, 0xfa, 0xc5, 0x34, 0x9c, 0xf0, 0x21, 0x75, 0xf4, 0x4d, 0xfb, 0xcc, + 0xce, 0x55, 0xf6, 0xe4, 0x89, 0x4b, 0x0d, 0xf9, 0x7a, 0x4a, 0xea, 0x67, 0x77, 0xae, 0x0e, 0x91, + 0xd7, 0x2c, 0x64, 0x57, 0x55, 0xdd, 0x8a, 0x78, 0x0a, 0x36, 0xed, 0x5d, 0x6e, 0x25, 0x30, 0x56, + 0x90, 0xce, 0x42, 0xfe, 0xe9, 0xa5, 0x87, 0x1f, 0x4c, 0x42, 0x93, 0xe1, 0x34, 0x4d, 0x59, 0x88, + 0xe2, 0xeb, 0x11, 0xe2, 0xf8, 0xe6, 0xeb, 0x27, 0x52, 0x91, 0x8f, 0xba, 0xa2, 0x45, 0xc2, 0x47, + 0xeb, 0x0a, 0xe3, 0xd3, 0x69, 0xa8, 0x87, 0x4f, 0x05, 0xc8, 0x52, 0xb4, 0x1d, 0xb5, 0xdb, 0x1b, + 0xf6, 0xa6, 0xeb, 0x1c, 0x14, 0xd6, 0x05, 0x0e, 0xaa, 0xc2, 0x98, 0x8d, 0x35, 0xd3, 0x68, 0xd9, + 0x74, 0x24, 0x19, 0x59, 0x14, 0xc9, 0x68, 0x0c, 0xd5, 0x30, 0x6d, 0x7e, 0xe5, 0x94, 0x15, 0x9a, + 0xff, 0x30, 0x75, 0xb8, 0xb5, 0x51, 0x76, 0x9b, 0xa2, 0x0b, 0x64, 0x35, 0xf5, 0xfc, 0xbd, 0x07, + 0x1d, 0xa8, 0xb0, 0x97, 0x6b, 0xee, 0x10, 0x7c, 0xa7, 0x27, 0x27, 0xc2, 0xa7, 0x27, 0xcf, 0xe2, + 0x4e, 0xe7, 0x69, 0xc3, 0xbc, 0x66, 0xac, 0x13, 0x1a, 0x57, 0x24, 0x9f, 0x4c, 0xc3, 0x89, 0x81, + 0x83, 0x12, 0x6e, 0x5e, 0x86, 0x49, 0xa4, 0x01, 0xf9, 0x05, 0x61, 0xb5, 0x0e, 0x2b, 0x90, 0x5f, + 0x3b, 0xa4, 0x40, 0xc6, 0x45, 0x4b, 0x42, 0x1e, 0xf7, 0xc4, 0xcb, 0x43, 0xf4, 0xff, 0x06, 0xc4, + 0xf1, 0xb1, 0x27, 0xe0, 0x76, 0x9f, 0x02, 0xa9, 0x9b, 0x9a, 0xce, 0x9f, 0x07, 0xfa, 0x57, 0xcc, + 0x11, 0xdf, 0x8a, 0x21, 0x28, 0xb3, 0xb4, 0x32, 0x7a, 0xd1, 0xd4, 0x92, 0xd9, 0xae, 0x5a, 0xcc, + 0x2a, 0xad, 0xc5, 0x29, 0x6e, 0x2d, 0x66, 0x1a, 0xa5, 0xbf, 0x1a, 0x85, 0x31, 0xf1, 0x96, 0xf3, + 0x51, 0xc8, 0x62, 0x6d, 0xdb, 0xe4, 0xb7, 0xdd, 0xa5, 0xd9, 0xc8, 0xf1, 0xcc, 0x72, 0xec, 0x45, + 0x6d, 0xdb, 0xbc, 0x38, 0x22, 0x53, 0x0a, 0xfa, 0x06, 0xac, 0xd3, 0xb7, 0xb7, 0xf9, 0xa5, 0xe4, + 0x53, 0x07, 0x93, 0x9e, 0x27, 0xa8, 0x17, 0x47, 0x64, 0x46, 0x43, 0x9a, 0xa5, 0xef, 0xd7, 0xb2, + 0x49, 0x9a, 0x5d, 0x32, 0xb6, 0x68, 0xb3, 0x84, 0x02, 0x5d, 0x04, 0xb0, 0xb1, 0x23, 0xae, 0x32, + 0x8c, 0x52, 0xfa, 0xbb, 0x0f, 0xa6, 0x5f, 0xc3, 0x0e, 0x73, 0x5b, 0x17, 0x47, 0xe4, 0x82, 0x2d, + 0x0a, 0x84, 0x93, 0x6e, 0xe8, 0x8e, 0xa2, 0x6d, 0xab, 0xba, 0x41, 0xcf, 0xe0, 0x63, 0x39, 0x2d, + 0x19, 0xba, 0x33, 0x4f, 0xd0, 0x09, 0x27, 0x5d, 0x14, 0x88, 0x28, 0xe8, 0x9b, 0x51, 0xfe, 0xc8, + 0x2a, 0x46, 0x14, 0xcf, 0x10, 0x54, 0x22, 0x0a, 0x4a, 0x83, 0x9e, 0x86, 0x22, 0x3d, 0x6e, 0x55, + 0x36, 0x3b, 0xa6, 0xb6, 0xc3, 0x5f, 0x96, 0xcc, 0x1c, 0xcc, 0xa2, 0x49, 0x08, 0x9a, 0x04, 0xff, + 0xe2, 0x88, 0x0c, 0x9b, 0x6e, 0x09, 0x35, 0x21, 0xcf, 0xae, 0xfd, 0x3a, 0xbb, 0xfc, 0x6d, 0xe0, + 0x9d, 0x07, 0x73, 0xa2, 0x37, 0x80, 0xd7, 0x77, 0x2f, 0x8e, 0xc8, 0x63, 0x1a, 0xfb, 0x89, 0x16, + 0xa1, 0x80, 0x8d, 0x16, 0xef, 0x4e, 0x91, 0xbf, 0xa2, 0x3a, 0x58, 0x2f, 0x8c, 0x96, 0xe8, 0x4c, + 0x1e, 0xf3, 0xdf, 0xe8, 0x09, 0xc8, 0x69, 0x66, 0xb7, 0xab, 0x3b, 0xf4, 0x8d, 0x61, 0xf1, 0xec, + 0x1d, 0x31, 0x1d, 0xa1, 0xb8, 0x17, 0x47, 0x64, 0x4e, 0x45, 0xa6, 0xa7, 0x85, 0x3b, 0xfa, 0x55, + 0x6c, 0x91, 0xc1, 0x4c, 0x25, 0x99, 0x9e, 0x05, 0x86, 0x4f, 0x87, 0x53, 0x68, 0x89, 0x42, 0x73, + 0x8c, 0xbb, 0x17, 0xe9, 0x6e, 0x28, 0xfa, 0x34, 0x99, 0x58, 0x2c, 0xbe, 0x03, 0xe1, 0xce, 0x5e, + 0x14, 0xa5, 0x32, 0x94, 0xfc, 0x7a, 0x2b, 0x75, 0x5d, 0x42, 0x7a, 0x88, 0x5f, 0x85, 0xb1, 0xab, + 0xd8, 0xb2, 0xd9, 0x09, 0x3e, 0x25, 0xe4, 0x45, 0x74, 0x0a, 0xc6, 0xa9, 0xdc, 0x14, 0x51, 0xcf, + 0x9e, 0x25, 0x97, 0x28, 0xf0, 0x0a, 0x47, 0xaa, 0x43, 0xb1, 0x77, 0xb6, 0xe7, 0xa2, 0xb0, 0xb7, + 0xd1, 0xd0, 0x3b, 0xdb, 0xe3, 0x08, 0x52, 0x03, 0x2a, 0x61, 0xd5, 0xf5, 0x7b, 0xcd, 0x42, 0x84, + 0xd7, 0x2c, 0x08, 0x4f, 0xfb, 0x3b, 0x69, 0x97, 0xd8, 0xd5, 0x56, 0xb2, 0xdc, 0x88, 0x91, 0xa0, + 0xd4, 0xc5, 0xb3, 0xb5, 0x81, 0xd0, 0xce, 0xf5, 0x35, 0xcd, 0x3c, 0x09, 0x45, 0x3e, 0xfd, 0xa7, + 0xf5, 0x94, 0x4c, 0x29, 0xd0, 0x71, 0xa2, 0x50, 0xaa, 0x6e, 0x28, 0x7a, 0x4b, 0xbc, 0x26, 0xa6, + 0xe5, 0xa5, 0x16, 0x7a, 0x06, 0x2a, 0x9a, 0x69, 0xd8, 0xd8, 0xb0, 0xfb, 0xb6, 0xd2, 0x53, 0x2d, + 0xb5, 0xeb, 0x3d, 0xba, 0x8b, 0x9e, 0xa6, 0x79, 0x81, 0xbe, 0x4a, 0xb1, 0xe5, 0x09, 0x2d, 0x08, + 0x40, 0xcb, 0x00, 0x57, 0xd5, 0x8e, 0xde, 0x52, 0x1d, 0xd3, 0xb2, 0xf9, 0xe3, 0x94, 0x61, 0xcc, + 0xae, 0x08, 0xc4, 0x8d, 0x5e, 0x4b, 0x75, 0x30, 0x0f, 0xa2, 0x7c, 0xf4, 0xe8, 0x2e, 0x98, 0x50, + 0x7b, 0x3d, 0xc5, 0x76, 0x54, 0x07, 0x2b, 0x9b, 0x7b, 0x0e, 0xb6, 0xa9, 0xbd, 0x28, 0xc9, 0xe3, + 0x6a, 0xaf, 0xb7, 0x46, 0xa0, 0x4d, 0x02, 0x94, 0x5a, 0xee, 0x6c, 0xd3, 0xa5, 0xe9, 0xc6, 0x76, + 0x29, 0x2f, 0xb6, 0x23, 0x30, 0x7a, 0xb5, 0x82, 0xc9, 0x40, 0xdc, 0x46, 0xc9, 0x6d, 0x63, 0xbd, + 0xbd, 0xcd, 0x9e, 0xb7, 0x67, 0x64, 0x5e, 0x22, 0x13, 0xd3, 0xb3, 0xcc, 0xab, 0x98, 0xbf, 0x6c, + 0x67, 0x05, 0xe9, 0x1f, 0xa4, 0x61, 0x72, 0x60, 0xf9, 0x12, 0xbe, 0xf4, 0x82, 0x3f, 0x6f, 0x8b, + 0xfc, 0x46, 0xe7, 0x08, 0x5f, 0xb5, 0xc5, 0x1f, 0xad, 0x14, 0xcf, 0xde, 0x36, 0x44, 0x02, 0x17, + 0x29, 0x12, 0x1f, 0x38, 0x27, 0x41, 0x1b, 0x50, 0xe9, 0xa8, 0xb6, 0xa3, 0xb0, 0x55, 0xc4, 0x5e, + 0x09, 0x67, 0x0e, 0xb4, 0x04, 0xcb, 0xaa, 0x58, 0x7d, 0x44, 0xb9, 0x39, 0xbb, 0x72, 0x27, 0x00, + 0x45, 0xcf, 0xc1, 0xf4, 0xe6, 0xde, 0x4b, 0xaa, 0xe1, 0xe8, 0x06, 0xbd, 0x6c, 0x14, 0x9c, 0xa3, + 0xfa, 0x10, 0xd6, 0x8b, 0x57, 0xf5, 0x16, 0x36, 0x34, 0x31, 0x39, 0x53, 0x2e, 0x0b, 0x77, 0xf2, + 0x6c, 0xe9, 0x39, 0x28, 0x07, 0x6d, 0x11, 0x2a, 0x43, 0xda, 0xd9, 0xe5, 0x12, 0x49, 0x3b, 0xbb, + 0xe8, 0x61, 0x1e, 0x91, 0xa7, 0xe9, 0x6d, 0xb9, 0x61, 0xce, 0x82, 0x53, 0x7b, 0x6f, 0x09, 0x25, + 0xc9, 0x5d, 0x09, 0xae, 0x61, 0x08, 0xf3, 0x96, 0x4e, 0xc3, 0x44, 0xc8, 0x88, 0xf9, 0xa6, 0x35, + 0xe5, 0x9f, 0x56, 0x69, 0x02, 0xc6, 0x03, 0xb6, 0x4a, 0xfa, 0xa3, 0x1c, 0xe4, 0xdd, 0x6f, 0x14, + 0x5c, 0x84, 0x02, 0xde, 0xd5, 0x70, 0xcf, 0x11, 0x56, 0xe1, 0x20, 0x23, 0xce, 0x68, 0x16, 0x05, + 0x3e, 0x31, 0x57, 0x2e, 0x31, 0x7a, 0x2c, 0xe0, 0x92, 0x4f, 0xc5, 0x31, 0xf1, 0xfb, 0xe4, 0xc7, + 0x83, 0x3e, 0xf9, 0x8e, 0x18, 0xda, 0x90, 0x53, 0x7e, 0x2c, 0xe0, 0x94, 0xe3, 0x1a, 0x0e, 0x78, + 0xe5, 0xa5, 0x08, 0xaf, 0x1c, 0x37, 0xfc, 0x21, 0x6e, 0x79, 0x29, 0xc2, 0x2d, 0xcf, 0xc4, 0xf6, + 0x25, 0xd2, 0x2f, 0x3f, 0x1e, 0xf4, 0xcb, 0x71, 0xe2, 0x08, 0x39, 0xe6, 0xe5, 0x28, 0xc7, 0x7c, + 0x3a, 0x86, 0xc7, 0x50, 0xcf, 0x3c, 0x3f, 0xe0, 0x99, 0xef, 0x8a, 0x61, 0x15, 0xe1, 0x9a, 0x97, + 0x02, 0x3e, 0x11, 0x12, 0xc9, 0x26, 0xda, 0x29, 0xa2, 0xf3, 0x83, 0x5e, 0xfe, 0xee, 0x38, 0x55, + 0x8b, 0x72, 0xf3, 0x4f, 0x86, 0xdc, 0xfc, 0x9d, 0x71, 0xa3, 0x0a, 0xf9, 0x79, 0xcf, 0x3b, 0x9f, + 0x26, 0xf6, 0x31, 0xb4, 0x32, 0x88, 0x2d, 0xc5, 0x96, 0x65, 0x5a, 0xdc, 0xf1, 0xb1, 0x82, 0x34, + 0x43, 0x2c, 0xb6, 0xa7, 0xff, 0x07, 0x78, 0x72, 0xba, 0x68, 0x7d, 0xda, 0x2e, 0x7d, 0x3d, 0xe5, + 0xd1, 0x52, 0xcb, 0xe6, 0xb7, 0xf6, 0x05, 0x6e, 0xed, 0x7d, 0x0e, 0x3e, 0x1d, 0x74, 0xf0, 0x75, + 0x28, 0x12, 0x9f, 0x12, 0xf2, 0xdd, 0x6a, 0x4f, 0xf8, 0x6e, 0x74, 0x0f, 0x4c, 0x52, 0xfb, 0xcb, + 0xc2, 0x00, 0x6e, 0x48, 0xb2, 0xd4, 0x90, 0x4c, 0x90, 0x0a, 0x26, 0x41, 0xe6, 0x28, 0xee, 0x87, + 0x29, 0x1f, 0x2e, 0xe1, 0x4b, 0x7d, 0x01, 0x73, 0x52, 0x15, 0x17, 0x7b, 0xae, 0xd7, 0xbb, 0xa8, + 0xda, 0xdb, 0xd2, 0x8a, 0x27, 0x20, 0x2f, 0x2e, 0x40, 0x90, 0xd5, 0xcc, 0x16, 0x1b, 0xf7, 0xb8, + 0x4c, 0x7f, 0x93, 0x58, 0xa1, 0x63, 0xb6, 0xf9, 0x0d, 0x48, 0xf2, 0x93, 0x60, 0xb9, 0x4b, 0xbb, + 0xc0, 0xd6, 0xac, 0xf4, 0x7b, 0x29, 0x8f, 0x9f, 0x17, 0x2a, 0x44, 0x79, 0xf5, 0xd4, 0xcd, 0xf4, + 0xea, 0xe9, 0xb7, 0xe6, 0xd5, 0xa5, 0x37, 0x53, 0xde, 0x94, 0xba, 0xfe, 0xfa, 0xc6, 0x44, 0x40, + 0xb4, 0x8b, 0xbd, 0x04, 0x67, 0x37, 0x75, 0x59, 0x41, 0x84, 0x5a, 0xb9, 0x88, 0x04, 0xc5, 0x98, + 0x2f, 0xa9, 0x81, 0x1e, 0xa2, 0x7e, 0xde, 0xdc, 0xe2, 0xa6, 0xa1, 0x1e, 0x93, 0xe8, 0x91, 0x19, + 0xb6, 0xcf, 0xbf, 0x14, 0x02, 0x61, 0xc3, 0xad, 0x50, 0x20, 0x5d, 0x67, 0xcf, 0x9f, 0x80, 0xa7, + 0x17, 0x05, 0x40, 0x6a, 0x01, 0x1a, 0xb4, 0x31, 0xe8, 0x12, 0xe4, 0xf0, 0x55, 0x7a, 0x1b, 0x95, + 0x25, 0x9b, 0x6e, 0x1d, 0xea, 0x88, 0xb1, 0xe1, 0x34, 0xab, 0x44, 0x98, 0xdf, 0xdf, 0xaf, 0x57, + 0x18, 0xcd, 0x7d, 0x66, 0x57, 0x77, 0x70, 0xb7, 0xe7, 0xec, 0xc9, 0x9c, 0x8b, 0xf4, 0x0b, 0x69, + 0xe2, 0x0f, 0x03, 0xf6, 0x27, 0x52, 0xbc, 0x62, 0xd1, 0xa4, 0x7d, 0x21, 0x52, 0x32, 0x91, 0xdf, + 0x06, 0xd0, 0x56, 0x6d, 0xe5, 0x9a, 0x6a, 0x38, 0xb8, 0xc5, 0xe5, 0x5e, 0x68, 0xab, 0xf6, 0xb3, + 0x14, 0x40, 0xe2, 0x4d, 0x52, 0xdd, 0xb7, 0x71, 0x8b, 0x4e, 0x40, 0x46, 0x1e, 0x6b, 0xab, 0xf6, + 0x86, 0x8d, 0x5b, 0xbe, 0xb1, 0x8e, 0xdd, 0x8c, 0xb1, 0x06, 0xe5, 0x9d, 0x0f, 0xcb, 0xfb, 0x13, + 0x69, 0x6f, 0x75, 0x78, 0xe1, 0xc3, 0x4f, 0xa6, 0x2c, 0x3e, 0x47, 0xf7, 0x14, 0x41, 0x27, 0x80, + 0x3e, 0x04, 0x93, 0xee, 0xaa, 0x54, 0xfa, 0x74, 0xb5, 0x0a, 0x2d, 0x3c, 0xdc, 0xe2, 0xae, 0x5c, + 0x0d, 0x82, 0x6d, 0xf4, 0x33, 0x70, 0x2c, 0x64, 0x83, 0xdc, 0x06, 0xd2, 0x87, 0x32, 0x45, 0x47, + 0x82, 0xa6, 0x48, 0xf0, 0xf7, 0xa4, 0x97, 0xb9, 0x29, 0xab, 0xe6, 0x0e, 0x12, 0xc2, 0xfa, 0xdd, + 0x5b, 0x94, 0x4e, 0x48, 0x7f, 0x9c, 0x82, 0x89, 0x50, 0x07, 0xd1, 0xa3, 0x30, 0xca, 0x3c, 0x70, + 0xea, 0xc0, 0x44, 0x08, 0x95, 0x38, 0x1f, 0x13, 0x23, 0x40, 0x73, 0x90, 0xc7, 0x3c, 0xba, 0xe6, + 0x42, 0xb9, 0x33, 0x26, 0x08, 0xe7, 0xf4, 0x2e, 0x19, 0x5a, 0x80, 0x82, 0x2b, 0xfa, 0x98, 0x9d, + 0x9b, 0x3b, 0x73, 0x9c, 0x89, 0x47, 0x28, 0xcd, 0x43, 0xd1, 0xd7, 0x3d, 0xf6, 0x16, 0x70, 0x97, + 0x6f, 0xb7, 0x58, 0x00, 0x9d, 0xef, 0xaa, 0xbb, 0x74, 0xa7, 0x85, 0x8e, 0xc1, 0x18, 0xa9, 0x6c, + 0xf3, 0xc7, 0x52, 0x19, 0x39, 0xd7, 0x55, 0x77, 0x2f, 0xa8, 0xb6, 0xf4, 0xc9, 0x14, 0x94, 0x83, + 0xfd, 0x44, 0xf7, 0x02, 0x22, 0xb8, 0x6a, 0x1b, 0x2b, 0x46, 0xbf, 0xcb, 0x7c, 0xa4, 0xe0, 0x38, + 0xd1, 0x55, 0x77, 0xe7, 0xda, 0xf8, 0x52, 0xbf, 0x4b, 0x9b, 0xb6, 0xd1, 0x0a, 0x54, 0x04, 0xb2, + 0x48, 0x76, 0x71, 0xa9, 0x1c, 0x1f, 0xfc, 0x5e, 0x0d, 0x47, 0x60, 0x7b, 0xdd, 0x57, 0xc8, 0x5e, + 0xb7, 0xcc, 0xf8, 0x89, 0x1a, 0xe9, 0x21, 0x98, 0x08, 0x8d, 0x18, 0x49, 0x30, 0xde, 0xeb, 0x6f, + 0x2a, 0x3b, 0x78, 0x8f, 0x3e, 0x7f, 0x67, 0xaa, 0x5e, 0x90, 0x8b, 0xbd, 0xfe, 0xe6, 0xd3, 0x78, + 0x8f, 0xe6, 0x0e, 0x25, 0x0d, 0xca, 0xc1, 0xcd, 0x14, 0x71, 0x1c, 0x96, 0xd9, 0x37, 0x5a, 0xe2, + 0xc3, 0x06, 0xb4, 0x80, 0xce, 0xc1, 0xe8, 0x55, 0x93, 0x69, 0xf3, 0x41, 0xbb, 0xa7, 0x2b, 0xa6, + 0x83, 0x7d, 0x5b, 0x32, 0x46, 0x23, 0xd9, 0x30, 0x4a, 0xf5, 0x32, 0xf2, 0xa0, 0xe2, 0x0a, 0x80, + 0xea, 0x38, 0x96, 0xbe, 0xd9, 0xf7, 0xd8, 0x57, 0x67, 0x07, 0xd3, 0xfa, 0xb3, 0xab, 0xaa, 0x6e, + 0x35, 0x6f, 0xe5, 0x9a, 0x3d, 0xed, 0xd1, 0xf8, 0xb4, 0xdb, 0xc7, 0x49, 0x7a, 0x23, 0x0b, 0x39, + 0xb6, 0xdd, 0x44, 0x4f, 0x04, 0x93, 0x1f, 0xc5, 0xb3, 0x27, 0x86, 0x75, 0x9f, 0x61, 0xf1, 0xde, + 0xbb, 0x11, 0xd4, 0x5d, 0xe1, 0x8c, 0x42, 0xb3, 0xf8, 0xda, 0x7e, 0x7d, 0x8c, 0x46, 0x1f, 0x4b, + 0x0b, 0x5e, 0x7a, 0x61, 0xd8, 0xee, 0x5a, 0xe4, 0x32, 0xb2, 0x87, 0xce, 0x65, 0x5c, 0x84, 0x71, + 0x5f, 0xb8, 0xa5, 0xb7, 0xf8, 0x3e, 0xe5, 0xc4, 0x41, 0x8b, 0x6e, 0x69, 0x81, 0xf7, 0xbf, 0xe8, + 0x86, 0x63, 0x4b, 0x2d, 0x34, 0x13, 0xdc, 0x64, 0xd3, 0xa8, 0x8d, 0x85, 0x0b, 0xbe, 0x7d, 0x33, + 0x7d, 0x93, 0x7f, 0x0b, 0x14, 0xe8, 0xc3, 0x66, 0x8a, 0xc2, 0xa2, 0x87, 0x3c, 0x01, 0xd0, 0xca, + 0xbb, 0x61, 0xc2, 0x0b, 0x6c, 0x18, 0x4a, 0x9e, 0x71, 0xf1, 0xc0, 0x14, 0xf1, 0x01, 0x98, 0xa6, + 0x1f, 0xc0, 0x0b, 0x63, 0x17, 0x28, 0x36, 0x22, 0x75, 0x57, 0x82, 0x14, 0x77, 0x42, 0xd9, 0x33, + 0xa1, 0x14, 0x17, 0x58, 0xea, 0xc3, 0x85, 0x52, 0xb4, 0xe3, 0x90, 0x77, 0xc3, 0xce, 0x22, 0xfb, + 0xb2, 0x9e, 0xca, 0xa2, 0x4d, 0x37, 0x90, 0xb5, 0xb0, 0xdd, 0xef, 0x38, 0x9c, 0x49, 0x89, 0xe2, + 0xd0, 0x40, 0x56, 0x66, 0x70, 0x8a, 0x7b, 0x0a, 0xc6, 0x85, 0x55, 0x61, 0x78, 0xe3, 0x14, 0xaf, + 0x24, 0x80, 0x14, 0xe9, 0x34, 0x54, 0x7a, 0x96, 0xd9, 0x33, 0x6d, 0x6c, 0x29, 0x6a, 0xab, 0x65, + 0x61, 0xdb, 0xae, 0x96, 0x19, 0x3f, 0x01, 0x9f, 0x63, 0x60, 0xe9, 0x7d, 0x30, 0x26, 0xe2, 0xe9, + 0x69, 0x18, 0x6d, 0xba, 0x16, 0x32, 0x2b, 0xb3, 0x02, 0xf1, 0xaf, 0x73, 0xbd, 0x1e, 0xcf, 0xae, + 0x91, 0x9f, 0x52, 0x07, 0xc6, 0xf8, 0x84, 0x45, 0xe6, 0x54, 0x56, 0xa0, 0xd4, 0x53, 0x2d, 0x32, + 0x0c, 0x7f, 0x66, 0x65, 0xd8, 0x8e, 0x70, 0x55, 0xb5, 0x9c, 0x35, 0xec, 0x04, 0x12, 0x2c, 0x45, + 0x4a, 0xcf, 0x40, 0xd2, 0x63, 0x30, 0x1e, 0xc0, 0xf1, 0xbe, 0x43, 0xc8, 0x17, 0x3a, 0x2d, 0xb8, + 0x3d, 0x49, 0x7b, 0x3d, 0x91, 0xce, 0x41, 0xc1, 0x9d, 0x2b, 0xb2, 0xd1, 0x10, 0xa2, 0xe0, 0x1f, + 0x36, 0xe4, 0x45, 0x9a, 0x44, 0x32, 0xaf, 0xf1, 0x4f, 0x34, 0x65, 0x64, 0x56, 0x90, 0xb0, 0xcf, + 0x30, 0x31, 0x6f, 0x86, 0x1e, 0x87, 0x31, 0x6e, 0x98, 0xf8, 0x7a, 0x1c, 0x96, 0x2e, 0x5a, 0xa5, + 0x96, 0x4a, 0xa4, 0x8b, 0x98, 0xdd, 0xf2, 0x9a, 0x49, 0xfb, 0x9b, 0xf9, 0x08, 0xe4, 0x85, 0xf1, + 0x09, 0x7a, 0x09, 0xd6, 0xc2, 0xc9, 0x38, 0x2f, 0xc1, 0x1b, 0xf1, 0x08, 0x89, 0x36, 0xd9, 0x7a, + 0xdb, 0xc0, 0x2d, 0xc5, 0x5b, 0x82, 0xfc, 0xc1, 0xec, 0x04, 0xab, 0x58, 0x16, 0xeb, 0x4b, 0x7a, + 0x00, 0x72, 0xac, 0xaf, 0x91, 0x26, 0x2e, 0xca, 0xb5, 0x7e, 0x2f, 0x05, 0x79, 0xe1, 0x3e, 0x22, + 0x89, 0x02, 0x83, 0x48, 0xdf, 0xe8, 0x20, 0x6e, 0xbe, 0x49, 0xba, 0x0f, 0x10, 0xd5, 0x14, 0xe5, + 0xaa, 0xe9, 0xe8, 0x46, 0x5b, 0x61, 0x73, 0xc1, 0xdf, 0x0d, 0xd2, 0x9a, 0x2b, 0xb4, 0x62, 0x95, + 0xc0, 0xef, 0x39, 0x05, 0x45, 0x5f, 0x96, 0x0b, 0x8d, 0x41, 0xe6, 0x12, 0xbe, 0x56, 0x19, 0x41, + 0x45, 0x18, 0x93, 0x31, 0xcd, 0x11, 0x54, 0x52, 0x67, 0xdf, 0x18, 0x83, 0x89, 0xb9, 0xe6, 0xfc, + 0xd2, 0x5c, 0xaf, 0xd7, 0xd1, 0xf9, 0x7b, 0xba, 0xcb, 0x90, 0xa5, 0xfb, 0xe4, 0x04, 0xe7, 0x3b, + 0xb5, 0x24, 0x09, 0x27, 0x24, 0xc3, 0x28, 0xdd, 0x4e, 0xa3, 0x24, 0xc7, 0x3e, 0xb5, 0x44, 0x79, + 0x28, 0xd2, 0x49, 0xaa, 0x70, 0x09, 0x4e, 0x83, 0x6a, 0x49, 0x92, 0x53, 0xe8, 0x67, 0xa0, 0xe0, + 0xed, 0x93, 0x93, 0x9e, 0x11, 0xd5, 0x12, 0xa7, 0xad, 0x08, 0x7f, 0x6f, 0x67, 0x90, 0xf4, 0x68, + 0xa2, 0x96, 0x38, 0x5f, 0x83, 0x9e, 0x83, 0x31, 0xb1, 0x07, 0x4b, 0x76, 0x8a, 0x53, 0x4b, 0x98, + 0x52, 0x22, 0xd3, 0xc7, 0xb6, 0xce, 0x49, 0x8e, 0xaa, 0x6a, 0x89, 0xf2, 0x66, 0x68, 0x03, 0x72, + 0x3c, 0xf8, 0x4d, 0x74, 0xd2, 0x53, 0x4b, 0x96, 0x28, 0x22, 0x42, 0xf6, 0x92, 0x13, 0x49, 0x8f, + 0xe7, 0x6a, 0x89, 0x13, 0x86, 0x48, 0x05, 0xf0, 0xed, 0xa7, 0x13, 0x9f, 0xbb, 0xd5, 0x92, 0x27, + 0x02, 0xd1, 0x87, 0x21, 0xef, 0xee, 0x9a, 0x12, 0x9e, 0xa4, 0xd5, 0x92, 0xe6, 0xe2, 0x9a, 0x1b, + 0x89, 0x6f, 0x49, 0xdc, 0x1b, 0x7b, 0x4b, 0xc2, 0x3b, 0xe4, 0x76, 0x8f, 0xc1, 0xff, 0x32, 0x05, + 0xc7, 0xc3, 0xc7, 0xc9, 0xaa, 0xb1, 0x37, 0xe4, 0x42, 0xc0, 0x90, 0xdb, 0x22, 0x8f, 0x43, 0x66, + 0xce, 0xd8, 0x23, 0xc1, 0x06, 0xfd, 0xb6, 0x5f, 0xdf, 0xea, 0x88, 0x34, 0x1d, 0x29, 0x6f, 0x58, + 0x9d, 0xe8, 0x5b, 0x23, 0x8d, 0xec, 0x0f, 0xbe, 0x50, 0x1f, 0x69, 0xee, 0x44, 0x8c, 0x2a, 0xe6, + 0xae, 0x40, 0x7e, 0xce, 0xd8, 0x13, 0xd7, 0x04, 0x46, 0xe9, 0x80, 0x0e, 0x7b, 0xfc, 0xff, 0x7a, + 0x89, 0x70, 0xf6, 0x7d, 0x1f, 0x98, 0x8f, 0x38, 0xc7, 0x4a, 0x43, 0x4e, 0xf8, 0xe3, 0x6f, 0x0c, + 0xd4, 0x86, 0x4b, 0x53, 0xba, 0x00, 0xd9, 0x79, 0x53, 0xa7, 0x21, 0x4f, 0x0b, 0x1b, 0x66, 0x57, + 0xe4, 0x3c, 0x69, 0x01, 0x9d, 0x82, 0x9c, 0xda, 0x35, 0xfb, 0x86, 0x23, 0xa2, 0x66, 0xe2, 0x4a, + 0xfe, 0xeb, 0x7e, 0x3d, 0xb3, 0x64, 0x38, 0x32, 0xaf, 0x6a, 0x64, 0xff, 0xe2, 0xd5, 0x7a, 0x4a, + 0x7a, 0x0a, 0xc6, 0x16, 0xb0, 0x76, 0x23, 0xbc, 0x16, 0xb0, 0x16, 0xe2, 0x75, 0x1a, 0xf2, 0x4b, + 0x86, 0xc3, 0x3e, 0x1a, 0x76, 0x1b, 0x64, 0x74, 0x83, 0x1d, 0x8b, 0x84, 0xda, 0x27, 0x70, 0x82, + 0xba, 0x80, 0x35, 0x17, 0xb5, 0x85, 0xb5, 0x30, 0x2a, 0x61, 0x4f, 0xe0, 0x52, 0x13, 0x4a, 0x57, + 0xd4, 0x0e, 0x0f, 0xf7, 0xb0, 0x8d, 0xee, 0x83, 0x82, 0x2a, 0x0a, 0x74, 0x67, 0x55, 0x6a, 0x96, + 0x7f, 0xb8, 0x5f, 0x07, 0x0f, 0x49, 0xf6, 0x10, 0x1a, 0xd9, 0x97, 0xff, 0xdb, 0xc9, 0x94, 0x64, + 0xc2, 0xd8, 0x05, 0xd5, 0xa6, 0x96, 0xfe, 0xc1, 0x40, 0x22, 0x85, 0x46, 0x8a, 0xcd, 0x23, 0xd7, + 0xf7, 0xeb, 0x93, 0x7b, 0x6a, 0xb7, 0xd3, 0x90, 0xbc, 0x3a, 0xc9, 0x9f, 0x5f, 0x99, 0xf5, 0xe5, + 0x57, 0x68, 0x24, 0xd9, 0x9c, 0xba, 0xbe, 0x5f, 0x9f, 0xf0, 0x68, 0x48, 0x8d, 0xe4, 0x26, 0x5d, + 0xa4, 0x1e, 0xe4, 0x58, 0xd0, 0x1b, 0x79, 0x42, 0xc8, 0x53, 0x3e, 0x69, 0x2f, 0xe5, 0xd3, 0x38, + 0x54, 0x9a, 0x81, 0xc7, 0x65, 0x8c, 0xa2, 0x91, 0xfd, 0xf8, 0xab, 0xf5, 0x11, 0xc9, 0x02, 0xb4, + 0xa6, 0x77, 0xfb, 0x1d, 0xf6, 0xf0, 0x5b, 0x1c, 0x35, 0x3d, 0xc8, 0xfa, 0x4d, 0xd3, 0x49, 0x2c, + 0x20, 0x9b, 0x98, 0xe5, 0x4a, 0xca, 0x05, 0xc2, 0xe2, 0x8c, 0x6f, 0xef, 0xd7, 0x53, 0xb4, 0xf7, + 0x54, 0x46, 0x77, 0x41, 0x8e, 0x85, 0xf2, 0x3c, 0xfe, 0x29, 0x0b, 0x1a, 0x36, 0x26, 0x99, 0xd7, + 0x4a, 0x4f, 0xc0, 0xd8, 0x8a, 0xdd, 0x5e, 0x20, 0x43, 0x3a, 0x0e, 0xf9, 0xae, 0xdd, 0x56, 0x7c, + 0xd1, 0xd4, 0x58, 0xd7, 0x6e, 0xaf, 0x0f, 0x89, 0xc2, 0xf8, 0xb4, 0xbc, 0x1f, 0x72, 0xeb, 0xbb, + 0x94, 0xfc, 0x94, 0x2b, 0xa5, 0x8c, 0xbf, 0x8f, 0x9c, 0x7b, 0x80, 0xe8, 0x63, 0x19, 0x80, 0xf5, + 0x5d, 0x77, 0x84, 0x43, 0x8e, 0xe0, 0x90, 0x04, 0x39, 0x67, 0xd7, 0x8d, 0xa8, 0x0b, 0x4d, 0x78, + 0x6d, 0xbf, 0x9e, 0x5b, 0xdf, 0x25, 0xdb, 0x0b, 0x99, 0xd7, 0x04, 0x53, 0x59, 0x99, 0x50, 0x2a, + 0xcb, 0x4d, 0xe0, 0x65, 0x23, 0x12, 0x78, 0xa3, 0xbe, 0x13, 0x80, 0x63, 0x30, 0x66, 0xa9, 0xd7, + 0x14, 0x32, 0xa3, 0xec, 0x2b, 0xa4, 0x39, 0x4b, 0xbd, 0xb6, 0x6c, 0xb6, 0xd1, 0x3c, 0x64, 0x3b, + 0x66, 0x5b, 0xe4, 0xdd, 0x8e, 0x8a, 0x41, 0x91, 0x88, 0x8b, 0xdf, 0x26, 0x5e, 0x36, 0xdb, 0xcd, + 0x63, 0x44, 0xfe, 0x5f, 0xfe, 0xd3, 0xfa, 0x44, 0x10, 0x6e, 0xcb, 0x94, 0xd8, 0x4d, 0x06, 0xe6, + 0x87, 0x26, 0x03, 0x0b, 0x07, 0x25, 0x03, 0x21, 0x98, 0x0c, 0xbc, 0x83, 0x9e, 0x69, 0xb2, 0x33, + 0x9c, 0xe9, 0x81, 0xe0, 0x73, 0xce, 0xd8, 0xa3, 0xa7, 0xa8, 0xb7, 0x42, 0xc1, 0xbd, 0x28, 0xc4, + 0x3f, 0xfb, 0xec, 0x01, 0xb8, 0xbe, 0x7d, 0x3c, 0x05, 0xe5, 0x60, 0x8f, 0x69, 0x3e, 0xc7, 0x6e, + 0xf3, 0x0f, 0xa6, 0xb2, 0xb4, 0x27, 0x51, 0x8a, 0x25, 0x91, 0x29, 0x0f, 0xe9, 0xfc, 0x5c, 0x48, + 0xe7, 0xa7, 0x84, 0x80, 0xd8, 0xdb, 0x1d, 0xa6, 0xea, 0xd3, 0x5c, 0x3a, 0x25, 0x1f, 0xd0, 0xf6, + 0x54, 0x9f, 0x6a, 0xc4, 0xcf, 0x42, 0xd1, 0x57, 0x1b, 0x19, 0xd4, 0x3f, 0x12, 0x91, 0xec, 0x98, + 0x74, 0x27, 0x44, 0xd4, 0x88, 0x23, 0x04, 0x0f, 0xd5, 0x55, 0xd4, 0x82, 0x8b, 0x94, 0xf4, 0x7a, + 0x45, 0x73, 0xe1, 0x4f, 0xbe, 0x7b, 0x62, 0xe4, 0xe5, 0xd7, 0x4e, 0x8c, 0x0c, 0xbd, 0x9f, 0x29, + 0xc5, 0x7f, 0x61, 0xde, 0xf5, 0x32, 0x9f, 0xf8, 0x20, 0xdc, 0xca, 0x71, 0x6c, 0x47, 0xdd, 0xd1, + 0x8d, 0xb6, 0xf8, 0xcb, 0xdd, 0x4d, 0x99, 0x8f, 0x86, 0x43, 0x6f, 0xdc, 0xed, 0xbc, 0xd5, 0x4b, + 0x63, 0xb5, 0x28, 0x6f, 0x28, 0xed, 0x67, 0x01, 0xad, 0xd8, 0xed, 0x79, 0x0b, 0xb3, 0x8f, 0x8d, + 0xf0, 0x7d, 0x52, 0xf0, 0xb1, 0x0f, 0xb7, 0x51, 0xb7, 0xcc, 0x06, 0xc7, 0xe2, 0x7e, 0x37, 0xda, + 0xcb, 0x11, 0x05, 0x9e, 0x08, 0x2d, 0x02, 0xd0, 0xf4, 0x8a, 0x6d, 0x7b, 0xc9, 0xbc, 0x7a, 0x98, + 0xc7, 0xbc, 0x8b, 0x21, 0xab, 0x0e, 0xb6, 0xc5, 0x5c, 0x7b, 0x84, 0xe8, 0x23, 0x30, 0xd5, 0xd5, + 0x0d, 0xc5, 0xc6, 0x9d, 0x2d, 0xa5, 0x85, 0x3b, 0xf4, 0x53, 0x2c, 0xfc, 0xe0, 0xae, 0xd0, 0x5c, + 0xe6, 0x8e, 0xe9, 0xae, 0xf8, 0x39, 0x9b, 0x5d, 0x32, 0x9c, 0xeb, 0xfb, 0xf5, 0x1a, 0xf3, 0x0e, + 0x11, 0x2c, 0x25, 0x79, 0xb2, 0xab, 0x1b, 0x6b, 0xb8, 0xb3, 0xb5, 0xe0, 0xc2, 0xd0, 0x4b, 0x30, + 0xc9, 0x31, 0x4c, 0x2f, 0xe9, 0x41, 0x6c, 0x4f, 0xa9, 0xb9, 0x72, 0x7d, 0xbf, 0x5e, 0x65, 0xdc, + 0x06, 0x50, 0xa4, 0x1f, 0xee, 0xd7, 0xef, 0x4f, 0xd0, 0xa7, 0x39, 0x4d, 0x13, 0xee, 0xb1, 0xe2, + 0x32, 0xe1, 0x10, 0xd2, 0xb6, 0x97, 0xa0, 0x17, 0x6d, 0x8f, 0x86, 0xdb, 0x1e, 0x40, 0x49, 0xda, + 0xb6, 0xcf, 0x35, 0x7b, 0x19, 0x7c, 0xd1, 0xf6, 0x51, 0xc8, 0xf5, 0xfa, 0x9b, 0xe2, 0x14, 0xad, + 0x20, 0xf3, 0x12, 0x9a, 0xf1, 0x1f, 0xa4, 0x15, 0xcf, 0x96, 0xc4, 0x7c, 0x92, 0x58, 0xc5, 0x4d, + 0x73, 0xb2, 0xd8, 0x8f, 0x46, 0x1f, 0x5f, 0xcf, 0x40, 0x65, 0xc5, 0x6e, 0x2f, 0xb6, 0x74, 0xe7, + 0x26, 0xab, 0x57, 0x2f, 0x4a, 0x3a, 0xd4, 0x9b, 0x35, 0xe7, 0xaf, 0xef, 0xd7, 0xcb, 0x4c, 0x3a, + 0x37, 0x53, 0x26, 0x5d, 0x98, 0xf0, 0xf4, 0x52, 0xb1, 0x54, 0x87, 0xbb, 0xa7, 0xe6, 0x42, 0x42, + 0x0d, 0x5c, 0xc0, 0xda, 0xf5, 0xfd, 0xfa, 0x51, 0xd6, 0xb3, 0x10, 0x2b, 0x49, 0x2e, 0x6b, 0x81, + 0xb5, 0x80, 0x76, 0xa3, 0x15, 0x9f, 0x9e, 0x3f, 0x35, 0x2f, 0xbe, 0x8d, 0x4a, 0xcf, 0xa7, 0xee, + 0x6b, 0x69, 0x28, 0x12, 0x57, 0xcf, 0xe0, 0x38, 0x7a, 0x29, 0xa4, 0x7e, 0x8c, 0x4b, 0x21, 0xfd, + 0xce, 0x2c, 0x85, 0x7b, 0xdc, 0x58, 0x3b, 0x33, 0x54, 0xe7, 0x83, 0x21, 0xf7, 0x7f, 0xca, 0x50, + 0xab, 0x4a, 0x77, 0x90, 0x32, 0x6e, 0xbd, 0x1b, 0x04, 0xf8, 0x73, 0x29, 0x38, 0xe2, 0x89, 0xc7, + 0xb6, 0xb4, 0x90, 0x14, 0x9f, 0xb9, 0xbe, 0x5f, 0xbf, 0x35, 0x2c, 0x45, 0x1f, 0xda, 0x0d, 0x48, + 0x72, 0xca, 0x65, 0xb4, 0x66, 0x69, 0xd1, 0xfd, 0x68, 0xd9, 0x8e, 0xdb, 0x8f, 0xcc, 0xf0, 0x7e, + 0xf8, 0xd0, 0xde, 0x52, 0x3f, 0x16, 0x6c, 0x67, 0x70, 0x52, 0xb3, 0x09, 0x27, 0xf5, 0x1b, 0x69, + 0x18, 0x5f, 0xb1, 0xdb, 0x1b, 0x46, 0xeb, 0xbd, 0x05, 0x71, 0xd8, 0x05, 0xf1, 0xc9, 0x14, 0x94, + 0x2f, 0xea, 0xb6, 0x63, 0x5a, 0xba, 0xa6, 0x76, 0xe8, 0x6e, 0xc6, 0xbb, 0x23, 0x99, 0x3a, 0xfc, + 0x1d, 0xc9, 0x47, 0x20, 0x77, 0x55, 0xed, 0xb0, 0x7f, 0x57, 0x94, 0xa1, 0x67, 0x84, 0x21, 0xdf, + 0x11, 0xce, 0x01, 0x73, 0x74, 0xde, 0x9d, 0xdf, 0x4e, 0xc3, 0x44, 0x28, 0xf0, 0x40, 0x4d, 0xc8, + 0x52, 0x8b, 0xce, 0x36, 0xbc, 0xb3, 0x87, 0x88, 0x2b, 0xc8, 0x9e, 0x98, 0xd2, 0xa2, 0x9f, 0x82, + 0x7c, 0x57, 0xdd, 0x65, 0x9e, 0x81, 0xed, 0x6f, 0xe6, 0x0e, 0xc7, 0xc7, 0xdb, 0xbd, 0x0a, 0x3e, + 0x92, 0x3c, 0xd6, 0x55, 0x77, 0xa9, 0x3f, 0xe8, 0xc1, 0x04, 0x81, 0x6a, 0xdb, 0xaa, 0xd1, 0xc6, + 0x7e, 0xf7, 0x73, 0xf1, 0xd0, 0x8d, 0x1c, 0xf5, 0x1a, 0xf1, 0xb1, 0x93, 0xe4, 0xf1, 0xae, 0xba, + 0x3b, 0x4f, 0x01, 0xa4, 0xc5, 0x46, 0xfe, 0x95, 0x57, 0xeb, 0x23, 0x54, 0x62, 0xff, 0x21, 0x05, + 0xe0, 0x49, 0x0c, 0xad, 0x43, 0x25, 0xe4, 0xbe, 0xc4, 0x1d, 0xa3, 0xd8, 0x00, 0xcf, 0xdb, 0xd8, + 0x4e, 0x68, 0xa1, 0x29, 0xf8, 0x30, 0x14, 0xd9, 0x2d, 0x01, 0x85, 0x26, 0xe3, 0xd3, 0xb1, 0xc9, + 0xf8, 0x13, 0x84, 0xd7, 0xf5, 0xfd, 0x3a, 0x62, 0xc3, 0xf1, 0x11, 0x4b, 0x34, 0x45, 0x0f, 0x0c, + 0x42, 0x08, 0x82, 0x63, 0x29, 0xfa, 0x62, 0x0b, 0x7a, 0xf7, 0xcc, 0x34, 0xf4, 0x1d, 0x6c, 0xb9, + 0x7b, 0x64, 0x56, 0x44, 0x35, 0xc8, 0xb3, 0xaf, 0x0a, 0x3a, 0x7b, 0xe2, 0xdf, 0x55, 0x88, 0x32, + 0xa1, 0xba, 0x86, 0x37, 0x6d, 0x5d, 0xcc, 0x82, 0x2c, 0x8a, 0xe8, 0x3c, 0x54, 0x6c, 0xac, 0xf5, + 0x2d, 0xdd, 0xd9, 0x53, 0x34, 0xd3, 0x70, 0x54, 0xcd, 0xe1, 0x4e, 0xfb, 0x96, 0xeb, 0xfb, 0xf5, + 0x63, 0xac, 0xaf, 0x61, 0x0c, 0x49, 0x9e, 0x10, 0xa0, 0x79, 0x06, 0x21, 0x2d, 0xb4, 0xb0, 0xa3, + 0xea, 0x1d, 0x9b, 0x6f, 0x6c, 0x45, 0xd1, 0x37, 0x96, 0xaf, 0x8c, 0xf9, 0x0f, 0xa3, 0xae, 0x41, + 0xc5, 0xec, 0x61, 0x2b, 0xc2, 0x1e, 0x2d, 0x7b, 0x2d, 0x87, 0x31, 0x6e, 0xc0, 0x24, 0x4c, 0x08, + 0x1e, 0xc2, 0x22, 0x9c, 0x0f, 0xdc, 0x39, 0x63, 0x71, 0x63, 0x3a, 0x3c, 0xe4, 0x30, 0x86, 0xe4, + 0xbf, 0x68, 0xc6, 0xa2, 0xcb, 0xa3, 0x90, 0x7b, 0x41, 0xd5, 0x3b, 0xe2, 0x53, 0xab, 0x32, 0x2f, + 0xa1, 0x25, 0xc8, 0xd9, 0x8e, 0xea, 0xf4, 0x59, 0xe8, 0x3d, 0xda, 0x7c, 0x5f, 0xc2, 0x3e, 0x37, + 0x4d, 0xa3, 0xb5, 0x46, 0x09, 0x65, 0xce, 0x00, 0x9d, 0x87, 0x9c, 0x63, 0xee, 0x60, 0x83, 0x0b, + 0xf5, 0x50, 0x2b, 0x9d, 0x26, 0xea, 0x18, 0x35, 0x72, 0xc0, 0x33, 0xca, 0x8a, 0xbd, 0xad, 0x5a, + 0xd8, 0x66, 0xa1, 0x72, 0x73, 0xe9, 0xd0, 0xcb, 0xf1, 0x58, 0xd8, 0x53, 0x30, 0x7e, 0x92, 0x3c, + 0xe1, 0x82, 0xd6, 0x28, 0x24, 0x1c, 0x39, 0x8f, 0xdd, 0x50, 0xe4, 0x7c, 0x1e, 0x2a, 0x7d, 0x63, + 0xd3, 0x34, 0xe8, 0x67, 0x11, 0x79, 0x9a, 0x26, 0x7f, 0x32, 0x35, 0x93, 0xf1, 0xcf, 0x56, 0x18, + 0x43, 0x92, 0x27, 0x5c, 0x10, 0xbf, 0xfd, 0xd8, 0x82, 0xb2, 0x87, 0x45, 0x97, 0x6c, 0x21, 0x76, + 0xc9, 0xde, 0xce, 0x97, 0xec, 0x91, 0x70, 0x2b, 0xde, 0xaa, 0x1d, 0x77, 0x81, 0x84, 0x0c, 0x7d, + 0x30, 0xb0, 0x8d, 0x04, 0xde, 0xc2, 0x50, 0x2b, 0x93, 0x7c, 0x07, 0x59, 0x7c, 0x47, 0x76, 0x90, + 0x8d, 0xd2, 0xc7, 0x5f, 0xad, 0x8f, 0xb8, 0x0b, 0xf6, 0x17, 0xd3, 0x90, 0x5b, 0xb8, 0x42, 0x9f, + 0x51, 0xfe, 0x84, 0x86, 0x0f, 0x3e, 0xeb, 0xf5, 0x01, 0x18, 0x63, 0xb2, 0xb0, 0xd1, 0x59, 0x18, + 0xed, 0x91, 0x1f, 0x3c, 0xd7, 0x78, 0x74, 0x40, 0xa5, 0x29, 0x9e, 0xd8, 0x61, 0x52, 0x54, 0xe9, + 0x8b, 0x19, 0x80, 0x85, 0x2b, 0x57, 0xd6, 0x2d, 0xbd, 0xd7, 0xc1, 0xce, 0x7b, 0xe1, 0xf5, 0xbb, + 0x27, 0xbc, 0xf6, 0xcd, 0xf1, 0xd3, 0x50, 0xf4, 0xe6, 0xc8, 0x46, 0x8f, 0x43, 0xde, 0xe1, 0xbf, + 0xf9, 0x54, 0xd7, 0x06, 0xa7, 0x5a, 0xa0, 0xf3, 0xe9, 0x76, 0x29, 0xa4, 0xff, 0x92, 0x06, 0x88, + 0x4b, 0xce, 0xfc, 0x04, 0x04, 0xe0, 0xe7, 0x21, 0xc7, 0x3d, 0x4e, 0xe6, 0x86, 0xa2, 0x55, 0x4e, + 0xed, 0x9b, 0xa5, 0xef, 0xa6, 0x61, 0x6a, 0x43, 0x98, 0xdd, 0xf7, 0x24, 0x8c, 0x2e, 0xc2, 0x18, + 0x36, 0x1c, 0x4b, 0xc7, 0x22, 0x0d, 0x3e, 0x13, 0xd6, 0xd2, 0x08, 0x69, 0xd1, 0x7f, 0x97, 0x20, + 0x6e, 0xcb, 0x71, 0x72, 0x9f, 0x8c, 0x3f, 0x95, 0x81, 0xea, 0x30, 0x2a, 0x34, 0x0f, 0x13, 0x9a, + 0x85, 0x29, 0x40, 0xf1, 0x9f, 0x9c, 0x34, 0x6b, 0xbe, 0x8c, 0x51, 0x10, 0x41, 0x92, 0xcb, 0x02, + 0xc2, 0x1d, 0x72, 0x9b, 0x26, 0xa8, 0xc8, 0x52, 0x21, 0x58, 0x09, 0x83, 0x68, 0x89, 0x7b, 0x64, + 0x2f, 0x2d, 0xe5, 0x67, 0xc0, 0x5c, 0x72, 0xd9, 0x83, 0x52, 0x9f, 0xfc, 0x22, 0x4c, 0xe8, 0x86, + 0xee, 0xe8, 0x6a, 0x47, 0xd9, 0x54, 0x3b, 0xaa, 0xa1, 0xdd, 0xc8, 0x56, 0x84, 0x79, 0x53, 0xde, + 0x6c, 0x88, 0x9d, 0x24, 0x97, 0x39, 0xa4, 0xc9, 0x00, 0x64, 0x46, 0x44, 0x53, 0xd9, 0x1b, 0x0a, + 0xdc, 0x04, 0xb9, 0x6f, 0x46, 0x7e, 0x29, 0x03, 0x93, 0x6e, 0x7e, 0xe6, 0xbd, 0xa9, 0x48, 0x3a, + 0x15, 0x2b, 0x00, 0xcc, 0x80, 0x10, 0xcf, 0x71, 0x03, 0xb3, 0x41, 0x4c, 0x50, 0x81, 0x71, 0x58, + 0xb0, 0x1d, 0xdf, 0x7c, 0xfc, 0x79, 0x06, 0x4a, 0xfe, 0xf9, 0x78, 0xcf, 0xa5, 0xbf, 0x8b, 0x32, + 0x66, 0x73, 0x9e, 0x49, 0xcc, 0xf2, 0xef, 0xa2, 0x84, 0x4c, 0xe2, 0xc0, 0x52, 0x1a, 0x6e, 0x0b, + 0xff, 0x2a, 0x0d, 0x39, 0x7e, 0x2f, 0x5b, 0x1b, 0xd8, 0x45, 0xa4, 0xe2, 0xee, 0x7d, 0x1f, 0xbc, + 0x89, 0x78, 0x25, 0x72, 0x13, 0x51, 0xee, 0xaa, 0xbb, 0x4a, 0xe0, 0x15, 0x53, 0x6a, 0x66, 0xbc, + 0x79, 0xdc, 0xe3, 0x12, 0xac, 0x67, 0xb9, 0x10, 0xef, 0x4e, 0x2e, 0x7a, 0x04, 0x8a, 0x04, 0xc3, + 0xf3, 0x0a, 0x84, 0xfc, 0xa8, 0x97, 0x7c, 0xf0, 0x55, 0x4a, 0x32, 0x74, 0xd5, 0xdd, 0x45, 0x56, + 0x40, 0xcb, 0x80, 0xb6, 0xdd, 0xd4, 0x97, 0xe2, 0x89, 0x90, 0xd0, 0xdf, 0x76, 0x7d, 0xbf, 0x7e, + 0x9c, 0xd1, 0x0f, 0xe2, 0x48, 0xf2, 0xa4, 0x07, 0x14, 0xdc, 0x1e, 0x04, 0x20, 0xe3, 0x52, 0xd8, + 0x9d, 0x10, 0xb6, 0x85, 0xf5, 0x5d, 0x94, 0xf0, 0xea, 0x24, 0xb9, 0x40, 0x0a, 0x0b, 0xe4, 0xb7, + 0x4f, 0xf0, 0xbf, 0x9c, 0x02, 0xe4, 0xf9, 0x1e, 0xf7, 0xbc, 0xfe, 0x83, 0xf4, 0x5d, 0xa2, 0xd8, + 0x19, 0xa5, 0xa2, 0x37, 0x59, 0x1e, 0x9d, 0xd8, 0x64, 0xf9, 0x96, 0xea, 0x7d, 0x9e, 0x7d, 0x4e, + 0x0f, 0xcd, 0x0a, 0x46, 0xd8, 0xe0, 0x7f, 0x97, 0x82, 0xe3, 0x03, 0x8a, 0xe3, 0xf6, 0xeb, 0x0a, + 0x20, 0xcb, 0x57, 0xc9, 0xff, 0x43, 0x51, 0x8a, 0xff, 0xc7, 0xbf, 0x84, 0xfa, 0x37, 0x69, 0x0d, + 0xd8, 0xf8, 0x9b, 0xe7, 0x4d, 0x78, 0x46, 0x31, 0x05, 0xd3, 0xfe, 0xe6, 0xdd, 0x01, 0x9c, 0x87, + 0x92, 0xbf, 0x75, 0xde, 0xf5, 0x5b, 0x0f, 0xea, 0x3a, 0xef, 0x75, 0x80, 0x0e, 0x2d, 0x79, 0xab, + 0x4f, 0xfc, 0xd3, 0xc9, 0xb8, 0xd1, 0xbb, 0x17, 0xd9, 0x42, 0xab, 0x90, 0xf5, 0xf8, 0xff, 0xa7, + 0x20, 0xbb, 0x6a, 0x9a, 0x1d, 0x64, 0xc2, 0xa4, 0x61, 0x3a, 0x0a, 0x51, 0x16, 0xdc, 0x52, 0x78, + 0x6e, 0x84, 0x65, 0x41, 0xe7, 0x0f, 0x27, 0x94, 0xef, 0xef, 0xd7, 0x07, 0x59, 0xc9, 0x13, 0x86, + 0xe9, 0x34, 0x29, 0x64, 0x9d, 0x65, 0x4e, 0x3e, 0x02, 0xe3, 0xc1, 0xc6, 0x58, 0xa6, 0xe8, 0xd9, + 0x43, 0x37, 0x16, 0x64, 0x73, 0x7d, 0xbf, 0x3e, 0xed, 0x2d, 0x02, 0x17, 0x2c, 0xc9, 0xa5, 0x4d, + 0x5f, 0xeb, 0x8d, 0x3c, 0x19, 0xfd, 0x0f, 0x5e, 0xad, 0xa7, 0x9a, 0xe7, 0x87, 0xde, 0x00, 0xb8, + 0xef, 0xc0, 0x2e, 0xec, 0xba, 0x47, 0xfd, 0xc1, 0xbb, 0x00, 0xff, 0x6f, 0x16, 0x6a, 0xa1, 0xbb, + 0x00, 0xf4, 0x1d, 0xf2, 0x90, 0x9b, 0x00, 0x07, 0xff, 0x03, 0xff, 0x21, 0x17, 0x05, 0x0e, 0xbc, + 0x6c, 0x20, 0xed, 0xc0, 0x51, 0x7a, 0x95, 0xd3, 0x33, 0x5b, 0xe2, 0x2b, 0x31, 0x47, 0xdd, 0x04, + 0x5a, 0x8a, 0xff, 0xbf, 0x70, 0x96, 0x0d, 0x7b, 0x0c, 0xc0, 0x6b, 0xd9, 0x7d, 0x70, 0xc3, 0x7b, + 0xca, 0x7a, 0xcf, 0xfe, 0x91, 0x3f, 0x65, 0x23, 0xfb, 0x90, 0xa5, 0x8f, 0xa7, 0xe0, 0xd8, 0x40, + 0x6b, 0x5c, 0xeb, 0x9f, 0x0c, 0x3c, 0x18, 0x4d, 0x25, 0xcb, 0xd1, 0xfb, 0xbf, 0xfc, 0x70, 0x1f, + 0x64, 0x2c, 0xf7, 0xb1, 0x58, 0x2d, 0xaa, 0x43, 0xac, 0x25, 0x99, 0xa0, 0x49, 0x2f, 0xc2, 0x91, + 0x60, 0x4f, 0xc4, 0xb0, 0x9f, 0x83, 0x72, 0x70, 0x7f, 0xc0, 0x83, 0x87, 0xf7, 0x1d, 0xde, 0x27, + 0x8e, 0x07, 0xf6, 0x08, 0xd2, 0xb3, 0x61, 0x51, 0xbb, 0x63, 0xff, 0xc0, 0xe0, 0x75, 0xfb, 0xd8, + 0xa1, 0xfb, 0x5e, 0x63, 0x7d, 0x2d, 0x05, 0x27, 0x83, 0x9c, 0x3d, 0xb3, 0x6b, 0xbf, 0xed, 0xe3, + 0x7a, 0x2b, 0x0a, 0xf1, 0x07, 0x29, 0xb8, 0xfd, 0x80, 0x9e, 0x73, 0xf1, 0x58, 0x30, 0xed, 0xb3, + 0xe7, 0x16, 0x07, 0x0b, 0x25, 0x91, 0x86, 0xfb, 0x1c, 0xd7, 0x9c, 0xdd, 0xc2, 0x2f, 0x1f, 0x4d, + 0x0d, 0xd6, 0xd9, 0xf2, 0xd4, 0xa0, 0x0d, 0x3e, 0xac, 0x36, 0x7d, 0x33, 0x05, 0xa7, 0x83, 0xe3, + 0x88, 0xd8, 0xb5, 0xbd, 0xbb, 0xa7, 0xe2, 0xab, 0x29, 0xb8, 0x27, 0xc9, 0x10, 0xf8, 0x9c, 0x3c, + 0x0f, 0x53, 0x5e, 0x0c, 0x15, 0x9e, 0x92, 0x53, 0x09, 0x76, 0xbe, 0x5c, 0x8d, 0x91, 0xcb, 0xe5, + 0x46, 0x65, 0xff, 0x47, 0x29, 0xbe, 0xae, 0xfc, 0x73, 0xeb, 0x0a, 0x3a, 0x18, 0xe8, 0x1f, 0x52, + 0xd0, 0xbe, 0x60, 0x7f, 0x3c, 0x10, 0xec, 0x47, 0x4c, 0x61, 0xfa, 0x26, 0x59, 0x89, 0x9f, 0x17, + 0x36, 0x32, 0x22, 0xe4, 0xda, 0x81, 0xa9, 0x88, 0x85, 0xe0, 0xbe, 0x23, 0x8d, 0x5f, 0x07, 0x47, + 0x7f, 0xb8, 0x5f, 0x8f, 0x88, 0xe5, 0x64, 0x34, 0xb8, 0x04, 0xa4, 0xff, 0x9c, 0x82, 0x3a, 0xed, + 0x48, 0xc4, 0xe4, 0xfd, 0x6d, 0x16, 0x30, 0xe6, 0xc6, 0x32, 0x72, 0x58, 0x5c, 0xd0, 0x73, 0x90, + 0x63, 0x7a, 0xc9, 0x65, 0x7b, 0x08, 0x85, 0xe6, 0x84, 0x9e, 0x51, 0x5e, 0x10, 0xe3, 0x8a, 0xb6, + 0x04, 0x6f, 0x93, 0xfc, 0xde, 0x82, 0x25, 0xf8, 0x8a, 0x30, 0xca, 0xd1, 0x3d, 0xe7, 0x22, 0xfa, + 0xf0, 0x5b, 0x36, 0xca, 0xfc, 0xfb, 0x40, 0x37, 0xd1, 0xfa, 0xba, 0x1d, 0x8e, 0xb1, 0xbe, 0xef, + 0x3e, 0x99, 0xbb, 0xd6, 0x37, 0x66, 0x08, 0xef, 0x3a, 0xeb, 0x7b, 0x3d, 0x0d, 0xc7, 0x69, 0xc7, + 0xfd, 0x7b, 0x89, 0x77, 0x40, 0xd6, 0x0a, 0x20, 0xdb, 0xd2, 0x94, 0x9b, 0x65, 0x23, 0x2a, 0xb6, + 0xa5, 0x5d, 0x09, 0xb8, 0x52, 0x05, 0x50, 0xcb, 0x76, 0xc2, 0x0d, 0x64, 0x6e, 0xb8, 0x81, 0x96, + 0xed, 0x5c, 0x39, 0xc0, 0x57, 0x67, 0x0f, 0xa3, 0x2d, 0xbf, 0x95, 0x82, 0x5a, 0x94, 0xd0, 0xb9, + 0x76, 0xa8, 0x70, 0x34, 0xb0, 0x03, 0x0e, 0x2b, 0xc8, 0x1d, 0x07, 0xed, 0x03, 0x43, 0xcb, 0xf3, + 0x88, 0x85, 0xdf, 0xfa, 0x02, 0xfd, 0xaa, 0x70, 0x25, 0xae, 0x76, 0x0f, 0x6e, 0x37, 0xde, 0x95, + 0xcb, 0xf2, 0x57, 0x06, 0x8c, 0xf8, 0x8f, 0x7f, 0xe7, 0xf2, 0xc7, 0x29, 0x38, 0x31, 0xa4, 0x4f, + 0x7f, 0x9b, 0xdd, 0xf2, 0xcf, 0x0e, 0x55, 0x91, 0x9b, 0xb5, 0x4d, 0x7a, 0x90, 0x2f, 0x9a, 0xe0, + 0xad, 0x32, 0xdf, 0x76, 0x37, 0xf2, 0x0b, 0x70, 0xcf, 0xc0, 0x2d, 0x91, 0x54, 0xbc, 0x4f, 0x67, + 0x21, 0xbb, 0xad, 0xdb, 0x8e, 0xfb, 0x59, 0x84, 0x50, 0x77, 0x42, 0x54, 0x14, 0x57, 0x42, 0x50, + 0xa1, 0x2c, 0x57, 0x4d, 0xb3, 0xc3, 0x9b, 0x97, 0xe6, 0x61, 0xd2, 0x07, 0xe3, 0xcc, 0x67, 0x21, + 0xdb, 0x33, 0xcd, 0x0e, 0x67, 0x3e, 0x1d, 0x66, 0x4e, 0x70, 0xf9, 0x30, 0x29, 0x9e, 0x34, 0x0d, + 0x88, 0x31, 0x61, 0x1f, 0xec, 0xe0, 0xac, 0xf7, 0x60, 0x2a, 0x00, 0x75, 0x5f, 0x14, 0xe5, 0x02, + 0x9f, 0x7a, 0x1a, 0x38, 0x3f, 0x67, 0xf8, 0xee, 0xdb, 0x71, 0x96, 0x7a, 0x3d, 0x94, 0xae, 0x9e, + 0xfd, 0xc3, 0x92, 0x78, 0x74, 0xaa, 0x00, 0xf8, 0x32, 0xa3, 0x77, 0x85, 0xdb, 0x8a, 0xce, 0x41, + 0xd4, 0xee, 0x8e, 0xc5, 0xe3, 0xc1, 0xea, 0x08, 0xfa, 0x29, 0xff, 0xad, 0xa6, 0x3b, 0x0f, 0xa6, + 0x13, 0xec, 0xef, 0x8a, 0x43, 0x73, 0xb9, 0xff, 0x1d, 0x98, 0x8e, 0xda, 0xa2, 0xa2, 0x07, 0x0e, + 0xe6, 0x30, 0x18, 0x7e, 0xd4, 0xde, 0x77, 0x08, 0x0a, 0xb7, 0xf9, 0x57, 0x52, 0x70, 0xdb, 0x81, + 0xfb, 0x32, 0xf4, 0xd8, 0xc1, 0x6c, 0x0f, 0x08, 0x88, 0x6a, 0x8d, 0x1b, 0x21, 0x75, 0xbb, 0xa6, + 0x04, 0x8e, 0xd7, 0xa3, 0x25, 0x3a, 0xb0, 0x71, 0x18, 0x32, 0xb1, 0x83, 0x41, 0xa2, 0x34, 0x82, + 0x5e, 0x8a, 0x3e, 0x66, 0x3e, 0x13, 0xc9, 0x61, 0xf8, 0x5e, 0xa5, 0xf6, 0x40, 0x72, 0x02, 0xff, + 0xb4, 0x47, 0x05, 0xc1, 0x43, 0xa6, 0xfd, 0x80, 0x48, 0x7f, 0xc8, 0xb4, 0x1f, 0x14, 0x61, 0xf3, + 0x69, 0x3f, 0x30, 0x20, 0x1c, 0x32, 0xed, 0x49, 0xe2, 0xe0, 0x21, 0xd3, 0x9e, 0x28, 0xfe, 0x94, + 0x46, 0xd0, 0x36, 0x8c, 0x07, 0x82, 0x0f, 0x74, 0x3a, 0x92, 0x5d, 0x54, 0x54, 0x58, 0xbb, 0x27, + 0x09, 0xaa, 0x7f, 0xfe, 0x23, 0xbc, 0xef, 0x90, 0xf9, 0x1f, 0x1e, 0x60, 0xd4, 0x1e, 0x48, 0x4e, + 0xe0, 0xb6, 0x7d, 0xcd, 0x3d, 0xf9, 0xf0, 0x21, 0xa0, 0xd9, 0x84, 0x9c, 0x44, 0xcb, 0x67, 0x12, + 0xe3, 0xbb, 0x0d, 0xef, 0x0c, 0x5c, 0x7e, 0x8e, 0x16, 0x5a, 0xa4, 0x2f, 0xab, 0xdd, 0x9b, 0x08, + 0xd7, 0x6d, 0x6c, 0x85, 0xa7, 0xf5, 0x4f, 0x46, 0x92, 0xf9, 0xbc, 0x54, 0xed, 0xf6, 0x03, 0x30, + 0x5c, 0x76, 0x6b, 0xee, 0x39, 0x9d, 0x14, 0x8d, 0xee, 0xf7, 0x4e, 0xb5, 0x53, 0x07, 0xe2, 0x08, + 0xa6, 0x37, 0x3b, 0xf3, 0xfe, 0x37, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4b, 0x66, 0xf0, 0x36, 0x0f, + 0x97, 0x00, 0x00, } r := bytes.NewReader(gzipped) gzipr, err := compress_gzip.NewReader(r) From a922e5764e0dfc87b4ab32ca74d6d095075df3d3 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Mon, 20 Jul 2020 16:37:58 +0200 Subject: [PATCH 2/2] Change Res to Pagination --- proto/cosmos/bank/query.proto | 2 +- proto/cosmos/distribution/query.proto | 2 +- proto/cosmos/evidence/query.proto | 2 +- proto/cosmos/gov/query.proto | 6 +- proto/cosmos/slashing/query.proto | 2 +- proto/cosmos/staking/query.proto | 16 +- proto/ibc/channel/query.proto | 6 +- proto/ibc/connection/query.proto | 2 +- types/query/filtered_pagination_test.go | 6 +- types/query/pagination_test.go | 46 +- x/bank/keeper/grpc_query.go | 4 +- x/bank/keeper/grpc_query_test.go | 6 +- x/bank/types/query.pb.go | 90 +- x/distribution/keeper/grpc_query.go | 4 +- x/distribution/keeper/grpc_query_test.go | 4 +- x/distribution/types/query.pb.go | 144 +-- x/evidence/keeper/grpc_query.go | 4 +- x/evidence/keeper/grpc_query_test.go | 2 +- x/evidence/types/query.pb.go | 78 +- x/gov/keeper/grpc_query.go | 12 +- x/gov/types/query.pb.go | 176 ++-- x/ibc/03-connection/keeper/grpc_query.go | 4 +- x/ibc/03-connection/types/query.pb.go | 88 +- x/ibc/04-channel/keeper/grpc_query.go | 20 +- x/ibc/04-channel/keeper/grpc_query_test.go | 2 +- x/ibc/04-channel/types/query.pb.go | 181 ++-- x/slashing/keeper/grpc_query.go | 4 +- x/slashing/keeper/grpc_query_test.go | 4 +- x/slashing/types/query.pb.go | 84 +- x/staking/keeper/grpc_query.go | 32 +- x/staking/keeper/grpc_query_test.go | 22 +- x/staking/types/query.pb.go | 318 +++--- x/staking/types/staking.pb.go | 1054 ++++++++++---------- 33 files changed, 1213 insertions(+), 1214 deletions(-) diff --git a/proto/cosmos/bank/query.proto b/proto/cosmos/bank/query.proto index b0fe4b8789db..13fdc78c2885 100644 --- a/proto/cosmos/bank/query.proto +++ b/proto/cosmos/bank/query.proto @@ -51,7 +51,7 @@ message QueryAllBalancesResponse { repeated cosmos.Coin balances = 1 [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; - cosmos.query.PageResponse res = 2; + cosmos.query.PageResponse pagination = 2; } // QueryTotalSupplyRequest is the request type for the Query/TotalSupply RPC method diff --git a/proto/cosmos/distribution/query.proto b/proto/cosmos/distribution/query.proto index a9793afdad05..f0d18a954ac2 100644 --- a/proto/cosmos/distribution/query.proto +++ b/proto/cosmos/distribution/query.proto @@ -78,7 +78,7 @@ message QueryValidatorSlashesRequest { message QueryValidatorSlashesResponse { repeated ValidatorSlashEvent slashes = 1 [(gogoproto.nullable) = false]; - cosmos.query.PageResponse res = 2; + cosmos.query.PageResponse pagination = 2; } // QueryDelegationRewardsRequest is the request type for the Query/DelegationRewards RPC method diff --git a/proto/cosmos/evidence/query.proto b/proto/cosmos/evidence/query.proto index 9301d8fd05dd..451ae67d83cd 100644 --- a/proto/cosmos/evidence/query.proto +++ b/proto/cosmos/evidence/query.proto @@ -35,5 +35,5 @@ message QueryAllEvidenceRequest { message QueryAllEvidenceResponse { repeated google.protobuf.Any evidence = 1; - cosmos.query.PageResponse res = 2; + cosmos.query.PageResponse pagination = 2; } diff --git a/proto/cosmos/gov/query.proto b/proto/cosmos/gov/query.proto index 735f9dacf7ea..b9d0ce7b3ac5 100644 --- a/proto/cosmos/gov/query.proto +++ b/proto/cosmos/gov/query.proto @@ -63,7 +63,7 @@ message QueryProposalsRequest { message QueryProposalsResponse { repeated Proposal proposals = 1 [(gogoproto.nullable) = false]; - cosmos.query.PageResponse res = 2; + cosmos.query.PageResponse pagination = 2; } // QueryVoteRequest is the request type for the Query/Vote RPC method @@ -92,7 +92,7 @@ message QueryVotesRequest { message QueryVotesResponse { repeated Vote votes = 1 [(gogoproto.nullable) = false]; - cosmos.query.PageResponse res = 2; + cosmos.query.PageResponse pagination = 2; } // QueryParamsRequest is the request type for the Query/Params RPC method @@ -133,7 +133,7 @@ message QueryDepositsRequest { message QueryDepositsResponse { repeated Deposit deposits = 1 [(gogoproto.nullable) = false]; - cosmos.query.PageResponse res = 2; + cosmos.query.PageResponse pagination = 2; } // QueryTallyResultRequest is the request type for the Query/Tally RPC method diff --git a/proto/cosmos/slashing/query.proto b/proto/cosmos/slashing/query.proto index 43fb21a74d41..f61a78d0a4da 100644 --- a/proto/cosmos/slashing/query.proto +++ b/proto/cosmos/slashing/query.proto @@ -48,5 +48,5 @@ message QuerySigningInfosRequest{ message QuerySigningInfosResponse{ // info is the signing info of all validators repeated cosmos.slashing.ValidatorSigningInfo info = 1[(gogoproto.nullable)= false]; - cosmos.query.PageResponse res =2; + cosmos.query.PageResponse pagination =2; } diff --git a/proto/cosmos/staking/query.proto b/proto/cosmos/staking/query.proto index 54314f1f5e28..13619b8cbd5e 100644 --- a/proto/cosmos/staking/query.proto +++ b/proto/cosmos/staking/query.proto @@ -63,7 +63,7 @@ message QueryValidatorsRequest{ message QueryValidatorsResponse { repeated cosmos.staking.Validator validators = 1 [(gogoproto.nullable) = false]; - cosmos.query.PageResponse res = 2; + cosmos.query.PageResponse pagination = 2; } // QueryValidatorRequest is response type for the Query/Validator RPC method @@ -87,7 +87,7 @@ message QueryValidatorDelegationsRequest { message QueryValidatorDelegationsResponse { repeated DelegationResponse delegation_responses = 1 [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "DelegationResponses"]; - cosmos.query.PageResponse res = 2; + cosmos.query.PageResponse pagination = 2; } // QueryValidatorUnbondingDelegationsRequest is required type for the Query/ValidatorUnbondingDelegations RPC method @@ -101,7 +101,7 @@ message QueryValidatorUnbondingDelegationsRequest { message QueryValidatorUnbondingDelegationsResponse { repeated UnbondingDelegation unbonding_responses = 1 [(gogoproto.nullable) = false]; - cosmos.query.PageResponse res = 2; + cosmos.query.PageResponse pagination = 2; } // QueryDelegationRequest is request type for the Query/Delegation RPC method @@ -139,7 +139,7 @@ message QueryDelegatorDelegationsRequest { message QueryDelegatorDelegationsResponse { repeated DelegationResponse delegation_responses = 1 [(gogoproto.nullable) = false]; - cosmos.query.PageResponse res = 2; + cosmos.query.PageResponse pagination = 2; } // QueryDelegatorUnbondingDelegationsRequest is request type for the Query/DelegatorUnbondingDelegations RPC method @@ -152,7 +152,7 @@ message QueryDelegatorUnbondingDelegationsRequest { message QueryDelegatorUnbondingDelegationsResponse { repeated UnbondingDelegation unbonding_responses = 1 [(gogoproto.nullable) = false]; - cosmos.query.PageResponse res = 2; + cosmos.query.PageResponse pagination = 2; } // QueryRedelegationsRequest is request type for the Query/Redelegations RPC method @@ -170,7 +170,7 @@ message QueryRedelegationsRequest { message QueryRedelegationsResponse { repeated RedelegationResponse redelegation_responses = 1 [(gogoproto.nullable) = false]; - cosmos.query.PageResponse res = 2; + cosmos.query.PageResponse pagination = 2; } // QueryDelegatorValidatorsRequest is request type for the Query/DelegatorValidators RPC method @@ -184,7 +184,7 @@ message QueryDelegatorValidatorsRequest { message QueryDelegatorValidatorsResponse { repeated Validator validators = 1 [(gogoproto.nullable) = false]; - cosmos.query.PageResponse res = 2; + cosmos.query.PageResponse pagination = 2; } // QueryDelegatorValidatorRequest is request type for the Query/DelegatorValidator RPC method @@ -224,5 +224,5 @@ message QueryParamsRequest { } message QueryParamsResponse { Params params = 1 [(gogoproto.nullable) = false]; - cosmos.query.PageResponse res = 2; + cosmos.query.PageResponse pagination = 2; } \ No newline at end of file diff --git a/proto/ibc/channel/query.proto b/proto/ibc/channel/query.proto index 64c4362ef86b..fdd945c726a0 100644 --- a/proto/ibc/channel/query.proto +++ b/proto/ibc/channel/query.proto @@ -71,7 +71,7 @@ message QueryChannelsResponse { // list of stored channels of the chain. repeated ibc.channel.IdentifiedChannel channels = 1; // pagination response - cosmos.query.PageResponse res = 2; + cosmos.query.PageResponse pagination = 2; // query block height int64 height = 3; } @@ -89,7 +89,7 @@ message QueryConnectionChannelsResponse { // list of channels associated with a connection. repeated ibc.channel.IdentifiedChannel channels = 1; // pagination response - cosmos.query.PageResponse res = 2; + cosmos.query.PageResponse pagination = 2; // query block height int64 height = 3; } @@ -131,7 +131,7 @@ message QueryPacketCommitmentsRequest { message QueryPacketCommitmentsResponse { repeated ibc.channel.PacketAckCommitment commitments = 1; // pagination response - cosmos.query.PageResponse res = 2; + cosmos.query.PageResponse pagination = 2; // query block height int64 height = 3; } diff --git a/proto/ibc/connection/query.proto b/proto/ibc/connection/query.proto index af7e4e0b02ac..0ed5bf8f7a22 100644 --- a/proto/ibc/connection/query.proto +++ b/proto/ibc/connection/query.proto @@ -49,7 +49,7 @@ message QueryConnectionsResponse { // list of stored connections of the chain. repeated ibc.connection.ConnectionEnd connections = 1; // pagination response - cosmos.query.PageResponse res = 2; + cosmos.query.PageResponse pagination = 2; // query block height int64 height = 3; } diff --git a/types/query/filtered_pagination_test.go b/types/query/filtered_pagination_test.go index 7dc2b1082872..8dc744b08eea 100644 --- a/types/query/filtered_pagination_test.go +++ b/types/query/filtered_pagination_test.go @@ -117,7 +117,7 @@ func ExampleFilteredPaginate() { accountStore := prefix.NewStore(balancesStore, addr1.Bytes()) var balResult sdk.Coins - res, err := query.FilteredPaginate(accountStore, pageReq, func(key []byte, value []byte, accumulate bool) (bool, error) { + pageRes, err := query.FilteredPaginate(accountStore, pageReq, func(key []byte, value []byte, accumulate bool) (bool, error) { var bal sdk.Coin err := appCodec.UnmarshalBinaryBare(value, &bal) if err != nil { @@ -139,9 +139,9 @@ func ExampleFilteredPaginate() { if err != nil { // should return no error fmt.Println(err) } - fmt.Println(&types.QueryAllBalancesResponse{Balances: balResult, Res: res}) + fmt.Println(&types.QueryAllBalancesResponse{Balances: balResult, Pagination: pageRes}) // Output: - // balances: res: + // balances: pagination: } func execFilterPaginate(store sdk.KVStore, pageReq *query.PageRequest, appCodec codec.Marshaler) (balances sdk.Coins, res *query.PageResponse, err error) { diff --git a/types/query/pagination_test.go b/types/query/pagination_test.go index be12a8d014d3..bd33f5dc0df0 100644 --- a/types/query/pagination_test.go +++ b/types/query/pagination_test.go @@ -59,8 +59,8 @@ func TestPagination(t *testing.T) { request := types.NewQueryAllBalancesRequest(addr1, pageReq) res, err := queryClient.AllBalances(gocontext.Background(), request) require.NoError(t, err) - require.Equal(t, res.Res.Total, uint64(numBalances)) - require.NotNil(t, res.Res.NextKey) + require.Equal(t, res.Pagination.Total, uint64(numBalances)) + require.NotNil(t, res.Pagination.NextKey) require.LessOrEqual(t, res.Balances.Len(), defaultLimit) t.Log("verify page request with limit > defaultLimit, returns less or equal to `limit` records") @@ -68,8 +68,8 @@ func TestPagination(t *testing.T) { request = types.NewQueryAllBalancesRequest(addr1, pageReq) res, err = queryClient.AllBalances(gocontext.Background(), request) require.NoError(t, err) - require.Equal(t, res.Res.Total, uint64(0)) - require.NotNil(t, res.Res.NextKey) + require.Equal(t, res.Pagination.Total, uint64(0)) + require.NotNil(t, res.Pagination.NextKey) require.LessOrEqual(t, res.Balances.Len(), overLimit) t.Log("verify paginate with custom limit and countTotal true") @@ -78,8 +78,8 @@ func TestPagination(t *testing.T) { res, err = queryClient.AllBalances(gocontext.Background(), request) require.NoError(t, err) require.Equal(t, res.Balances.Len(), underLimit) - require.NotNil(t, res.Res.NextKey) - require.Equal(t, res.Res.Total, uint64(numBalances)) + require.NotNil(t, res.Pagination.NextKey) + require.Equal(t, res.Pagination.Total, uint64(numBalances)) t.Log("verify paginate with custom limit and countTotal false") pageReq = &query.PageRequest{Limit: defaultLimit, CountTotal: false} @@ -87,27 +87,27 @@ func TestPagination(t *testing.T) { res, err = queryClient.AllBalances(gocontext.Background(), request) require.NoError(t, err) require.Equal(t, res.Balances.Len(), defaultLimit) - require.NotNil(t, res.Res.NextKey) - require.Equal(t, res.Res.Total, uint64(0)) + require.NotNil(t, res.Pagination.NextKey) + require.Equal(t, res.Pagination.Total, uint64(0)) t.Log("verify paginate with custom limit, key and countTotal false") - pageReq = &query.PageRequest{Key: res.Res.NextKey, Limit: defaultLimit, CountTotal: false} + pageReq = &query.PageRequest{Key: res.Pagination.NextKey, Limit: defaultLimit, CountTotal: false} request = types.NewQueryAllBalancesRequest(addr1, pageReq) res, err = queryClient.AllBalances(gocontext.Background(), request) require.NoError(t, err) require.Equal(t, res.Balances.Len(), defaultLimit) - require.NotNil(t, res.Res.NextKey) - require.Equal(t, res.Res.Total, uint64(0)) + require.NotNil(t, res.Pagination.NextKey) + require.Equal(t, res.Pagination.Total, uint64(0)) t.Log("verify paginate for last page, results in records less than max limit") - pageReq = &query.PageRequest{Key: res.Res.NextKey, Limit: defaultLimit, CountTotal: false} + pageReq = &query.PageRequest{Key: res.Pagination.NextKey, Limit: defaultLimit, CountTotal: false} request = types.NewQueryAllBalancesRequest(addr1, pageReq) res, err = queryClient.AllBalances(gocontext.Background(), request) require.NoError(t, err) require.LessOrEqual(t, res.Balances.Len(), defaultLimit) require.Equal(t, res.Balances.Len(), lastPageRecords) - require.Nil(t, res.Res.NextKey) - require.Equal(t, res.Res.Total, uint64(0)) + require.Nil(t, res.Pagination.NextKey) + require.Equal(t, res.Pagination.Total, uint64(0)) t.Log("verify paginate with offset and limit") pageReq = &query.PageRequest{Offset: 200, Limit: defaultLimit, CountTotal: false} @@ -116,8 +116,8 @@ func TestPagination(t *testing.T) { require.NoError(t, err) require.LessOrEqual(t, res.Balances.Len(), defaultLimit) require.Equal(t, res.Balances.Len(), lastPageRecords) - require.Nil(t, res.Res.NextKey) - require.Equal(t, res.Res.Total, uint64(0)) + require.Nil(t, res.Pagination.NextKey) + require.Equal(t, res.Pagination.Total, uint64(0)) t.Log("verify paginate with offset and limit") pageReq = &query.PageRequest{Offset: 100, Limit: defaultLimit, CountTotal: false} @@ -125,11 +125,11 @@ func TestPagination(t *testing.T) { res, err = queryClient.AllBalances(gocontext.Background(), request) require.NoError(t, err) require.LessOrEqual(t, res.Balances.Len(), defaultLimit) - require.NotNil(t, res.Res.NextKey) - require.Equal(t, res.Res.Total, uint64(0)) + require.NotNil(t, res.Pagination.NextKey) + require.Equal(t, res.Pagination.Total, uint64(0)) t.Log("verify paginate with offset and key - error") - pageReq = &query.PageRequest{Key: res.Res.NextKey, Offset: 100, Limit: defaultLimit, CountTotal: false} + pageReq = &query.PageRequest{Key: res.Pagination.NextKey, Offset: 100, Limit: defaultLimit, CountTotal: false} request = types.NewQueryAllBalancesRequest(addr1, pageReq) res, err = queryClient.AllBalances(gocontext.Background(), request) require.Error(t, err) @@ -141,7 +141,7 @@ func TestPagination(t *testing.T) { res, err = queryClient.AllBalances(gocontext.Background(), request) require.NoError(t, err) require.LessOrEqual(t, res.Balances.Len(), 0) - require.Nil(t, res.Res.NextKey) + require.Nil(t, res.Pagination.NextKey) } func ExamplePaginate() { @@ -168,7 +168,7 @@ func ExamplePaginate() { authStore := ctx.KVStore(app.GetKey(authtypes.StoreKey)) balancesStore := prefix.NewStore(authStore, types.BalancesPrefix) accountStore := prefix.NewStore(balancesStore, addr1.Bytes()) - res, err := query.Paginate(accountStore, request.Pagination, func(key []byte, value []byte) error { + pageRes, err := query.Paginate(accountStore, request.Pagination, func(key []byte, value []byte) error { var tempRes sdk.Coin err := app.Codec().UnmarshalBinaryBare(value, &tempRes) if err != nil { @@ -180,9 +180,9 @@ func ExamplePaginate() { if err != nil { // should return no error fmt.Println(err) } - fmt.Println(&types.QueryAllBalancesResponse{Balances: balResult, Res: res}) + fmt.Println(&types.QueryAllBalancesResponse{Balances: balResult, Pagination: pageRes}) // Output: - // balances: res: + // balances: pagination: } func setupTest() (*simapp.SimApp, sdk.Context, codec.Marshaler) { diff --git a/x/bank/keeper/grpc_query.go b/x/bank/keeper/grpc_query.go index 81dcfbb9177d..244ea55086f2 100644 --- a/x/bank/keeper/grpc_query.go +++ b/x/bank/keeper/grpc_query.go @@ -52,7 +52,7 @@ func (q BaseKeeper) AllBalances(c context.Context, req *types.QueryAllBalancesRe balancesStore := prefix.NewStore(store, types.BalancesPrefix) accountStore := prefix.NewStore(balancesStore, addr.Bytes()) - res, err := query.Paginate(accountStore, req.Pagination, func(key []byte, value []byte) error { + pageRes, err := query.Paginate(accountStore, req.Pagination, func(key []byte, value []byte) error { var result sdk.Coin err := q.cdc.UnmarshalBinaryBare(value, &result) if err != nil { @@ -66,7 +66,7 @@ func (q BaseKeeper) AllBalances(c context.Context, req *types.QueryAllBalancesRe return &types.QueryAllBalancesResponse{}, err } - return &types.QueryAllBalancesResponse{Balances: balances, Res: res}, nil + return &types.QueryAllBalancesResponse{Balances: balances, Pagination: pageRes}, nil } // TotalSupply implements the Query/TotalSupply gRPC method diff --git a/x/bank/keeper/grpc_query_test.go b/x/bank/keeper/grpc_query_test.go index 1612ac55df34..6776ffed5a31 100644 --- a/x/bank/keeper/grpc_query_test.go +++ b/x/bank/keeper/grpc_query_test.go @@ -78,18 +78,18 @@ func (suite *IntegrationTestSuite) TestQueryAllBalances() { suite.Require().NoError(err) suite.Require().NotNil(res) suite.Equal(res.Balances.Len(), 1) - suite.NotNil(res.Res.NextKey) + suite.NotNil(res.Pagination.NextKey) suite.T().Log("query second page with nextkey") pageReq = &query.PageRequest{ - Key: res.Res.NextKey, + Key: res.Pagination.NextKey, Limit: 1, CountTotal: true, } req = types.NewQueryAllBalancesRequest(addr, pageReq) res, err = queryClient.AllBalances(gocontext.Background(), req) suite.Equal(res.Balances.Len(), 1) - suite.Nil(res.Res.NextKey) + suite.Nil(res.Pagination.NextKey) } func (suite *IntegrationTestSuite) TestQueryTotalSupply() { diff --git a/x/bank/types/query.pb.go b/x/bank/types/query.pb.go index 6d358221bd57..3f3867afdbf0 100644 --- a/x/bank/types/query.pb.go +++ b/x/bank/types/query.pb.go @@ -189,8 +189,8 @@ func (m *QueryAllBalancesRequest) GetPagination() *query.PageRequest { // QueryAllBalancesResponse is the response type for the Query/AllBalances RPC method type QueryAllBalancesResponse struct { // balances is the balances of the coins - Balances github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=balances,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"balances"` - Res *query.PageResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` + Balances github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=balances,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"balances"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryAllBalancesResponse) Reset() { *m = QueryAllBalancesResponse{} } @@ -233,9 +233,9 @@ func (m *QueryAllBalancesResponse) GetBalances() github_com_cosmos_cosmos_sdk_ty return nil } -func (m *QueryAllBalancesResponse) GetRes() *query.PageResponse { +func (m *QueryAllBalancesResponse) GetPagination() *query.PageResponse { if m != nil { - return m.Res + return m.Pagination } return nil } @@ -421,40 +421,40 @@ func init() { func init() { proto.RegisterFile("cosmos/bank/query.proto", fileDescriptor_1b02ea4db7d9aa9f) } var fileDescriptor_1b02ea4db7d9aa9f = []byte{ - // 525 bytes of a gzipped FileDescriptorProto + // 521 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0x3f, 0x6f, 0xd3, 0x40, - 0x1c, 0xb5, 0x5b, 0x35, 0x29, 0xbf, 0x74, 0xba, 0x06, 0x35, 0xb5, 0x84, 0x13, 0x4e, 0xfc, 0x09, - 0x52, 0x6b, 0x43, 0x98, 0x58, 0x90, 0xe2, 0x8e, 0x0c, 0x14, 0x17, 0x18, 0x2a, 0x16, 0xc7, 0x31, - 0x26, 0xaa, 0x73, 0xe7, 0xfa, 0x6c, 0xa9, 0xf9, 0x16, 0x7c, 0x05, 0x24, 0x26, 0x3e, 0x49, 0xc7, - 0x8e, 0x88, 0x21, 0xa0, 0x64, 0xe3, 0x23, 0x30, 0x21, 0xdf, 0xfd, 0x5c, 0x9c, 0xc4, 0x0a, 0x1d, - 0x60, 0xb3, 0xef, 0xde, 0xbd, 0xdf, 0x7b, 0xf7, 0x9e, 0x0d, 0x7b, 0x3e, 0x17, 0x63, 0x2e, 0xec, - 0x81, 0xc7, 0xce, 0xec, 0xf3, 0x2c, 0x48, 0x26, 0x56, 0x9c, 0xf0, 0x94, 0x93, 0x86, 0xda, 0xb0, - 0xf2, 0x0d, 0xe3, 0x0e, 0xa2, 0x24, 0xc0, 0x8e, 0xbd, 0x70, 0xc4, 0xbc, 0x74, 0xc4, 0x99, 0xc2, - 0x1a, 0xcd, 0x90, 0x87, 0x5c, 0x3e, 0xda, 0xf9, 0x13, 0xae, 0xee, 0xe2, 0x21, 0x24, 0x92, 0x8b, - 0xf4, 0x02, 0x76, 0x5f, 0xe5, 0x24, 0x8e, 0x17, 0x79, 0xcc, 0x0f, 0xdc, 0xe0, 0x3c, 0x0b, 0x44, - 0x4a, 0x5e, 0x40, 0xdd, 0x1b, 0x0e, 0x93, 0x40, 0x88, 0x96, 0xde, 0xd1, 0xbb, 0x3b, 0xce, 0x93, - 0x5f, 0xd3, 0xf6, 0x61, 0x38, 0x4a, 0x3f, 0x64, 0x03, 0xcb, 0xe7, 0x63, 0x7b, 0x81, 0xeb, 0x50, - 0x0c, 0xcf, 0xec, 0x74, 0x12, 0x07, 0xc2, 0xea, 0xfb, 0x7e, 0x5f, 0x1d, 0x74, 0x0b, 0x06, 0xd2, - 0x84, 0xad, 0x61, 0xc0, 0xf8, 0xb8, 0xb5, 0xd1, 0xd1, 0xbb, 0xb7, 0x5c, 0xf5, 0x42, 0x9f, 0x43, - 0x73, 0x71, 0xb2, 0x88, 0x39, 0x13, 0x01, 0x79, 0x00, 0xf5, 0x81, 0x5a, 0x92, 0xa3, 0x1b, 0xbd, - 0x1d, 0x0b, 0x15, 0x1f, 0xf1, 0x11, 0x73, 0x8b, 0x4d, 0xfa, 0x49, 0x87, 0x3d, 0x49, 0xd0, 0x8f, - 0x22, 0xe4, 0x10, 0xff, 0x45, 0xfe, 0x33, 0x80, 0x3f, 0x37, 0x2c, 0x3d, 0x34, 0x7a, 0xfb, 0x85, - 0x26, 0x15, 0xd1, 0xb1, 0x17, 0x16, 0x57, 0xe7, 0x96, 0xc0, 0xf4, 0xb3, 0x0e, 0xad, 0x55, 0x8d, - 0x68, 0xf4, 0x14, 0xb6, 0xd1, 0x4b, 0xae, 0x72, 0x73, 0xd9, 0xa9, 0xf3, 0xf8, 0x72, 0xda, 0xd6, - 0xbe, 0x7c, 0x6f, 0x77, 0x6f, 0xa0, 0x3b, 0x3f, 0x20, 0xdc, 0x6b, 0x3e, 0x72, 0x00, 0x9b, 0x49, - 0x20, 0x50, 0xac, 0x51, 0x25, 0x56, 0x89, 0x70, 0x73, 0x18, 0xdd, 0xc7, 0x9b, 0x7c, 0xcd, 0x53, - 0x2f, 0x3a, 0xc9, 0xe2, 0x38, 0x9a, 0xa0, 0x1b, 0x9a, 0xa0, 0x81, 0x85, 0x2d, 0x34, 0xf0, 0x16, - 0x6a, 0x42, 0xae, 0xfc, 0x23, 0xf9, 0xc8, 0x46, 0x0f, 0xb0, 0x19, 0x6a, 0xdc, 0xcb, 0xf7, 0x45, - 0xaa, 0xd7, 0x3d, 0xd2, 0xcb, 0x3d, 0x62, 0x70, 0x7b, 0x09, 0x8d, 0xf2, 0xde, 0x40, 0xcd, 0x1b, - 0xf3, 0x8c, 0xa5, 0x55, 0x3d, 0x72, 0xec, 0x5c, 0xde, 0xb7, 0x69, 0xfb, 0xe1, 0x0d, 0xe5, 0xb9, - 0x48, 0xd6, 0xfb, 0xb9, 0x01, 0x5b, 0x72, 0x20, 0x39, 0x86, 0x3a, 0x86, 0x4a, 0x3a, 0x56, 0xe9, - 0xf3, 0xb4, 0x2a, 0xbe, 0x28, 0xe3, 0xee, 0x1a, 0x84, 0x12, 0x4c, 0x35, 0xf2, 0x0e, 0x1a, 0xa5, - 0xa6, 0x90, 0x7b, 0xab, 0x67, 0x56, 0xcb, 0x6e, 0xdc, 0xff, 0x0b, 0xaa, 0xcc, 0x5e, 0x8a, 0xb1, - 0x8a, 0x7d, 0xb5, 0x00, 0x55, 0xec, 0x15, 0x5d, 0xa0, 0x1a, 0x39, 0x81, 0xed, 0x22, 0x02, 0x52, - 0x61, 0x76, 0x29, 0x4c, 0x83, 0xae, 0x83, 0x14, 0xa4, 0xce, 0xd1, 0xe5, 0xcc, 0xd4, 0xaf, 0x66, - 0xa6, 0xfe, 0x63, 0x66, 0xea, 0x1f, 0xe7, 0xa6, 0x76, 0x35, 0x37, 0xb5, 0xaf, 0x73, 0x53, 0x3b, - 0x7d, 0xb4, 0x36, 0xb7, 0x0b, 0xf5, 0x03, 0x95, 0xf1, 0x0d, 0x6a, 0xf2, 0x57, 0xf7, 0xf4, 0x77, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x12, 0xa7, 0xcf, 0x5c, 0x05, 0x00, 0x00, + 0x1c, 0xf5, 0x15, 0x35, 0x29, 0xbf, 0x74, 0xba, 0x06, 0x35, 0xb5, 0x84, 0x13, 0x4e, 0xfc, 0x09, + 0x12, 0xb5, 0x21, 0x4c, 0x30, 0x20, 0xc5, 0x1d, 0x19, 0x28, 0x2e, 0x30, 0x54, 0x2c, 0x17, 0xc7, + 0x98, 0xa8, 0xce, 0x9d, 0x9b, 0xb3, 0xa5, 0xe6, 0x5b, 0xf0, 0x15, 0x58, 0x19, 0xf9, 0x14, 0x1d, + 0x3b, 0x22, 0x86, 0x80, 0x92, 0x8d, 0x8f, 0xc0, 0x84, 0x7c, 0x77, 0x2e, 0x4e, 0x6c, 0x85, 0x0e, + 0x74, 0xb3, 0xef, 0xde, 0xbd, 0xdf, 0x7b, 0xf7, 0x9e, 0x0d, 0xbb, 0x3e, 0x17, 0x63, 0x2e, 0x9c, + 0x01, 0x65, 0x27, 0xce, 0x69, 0x1a, 0x4c, 0xa6, 0x76, 0x3c, 0xe1, 0x09, 0xc7, 0x0d, 0xb5, 0x61, + 0x67, 0x1b, 0xe6, 0x6d, 0x8d, 0x92, 0x00, 0x27, 0xa6, 0xe1, 0x88, 0xd1, 0x64, 0xc4, 0x99, 0xc2, + 0x9a, 0xcd, 0x90, 0x87, 0x5c, 0x3e, 0x3a, 0xd9, 0x93, 0x5e, 0xdd, 0xd1, 0x87, 0x34, 0x91, 0x5c, + 0x24, 0x67, 0xb0, 0xf3, 0x3a, 0x23, 0x71, 0x69, 0x44, 0x99, 0x1f, 0x78, 0xc1, 0x69, 0x1a, 0x88, + 0x04, 0xbf, 0x84, 0x3a, 0x1d, 0x0e, 0x27, 0x81, 0x10, 0x2d, 0xd4, 0x41, 0xdd, 0x6d, 0xf7, 0xc9, + 0xef, 0x59, 0x7b, 0x3f, 0x1c, 0x25, 0x1f, 0xd3, 0x81, 0xed, 0xf3, 0xb1, 0xb3, 0xc4, 0xb5, 0x2f, + 0x86, 0x27, 0x4e, 0x32, 0x8d, 0x03, 0x61, 0xf7, 0x7d, 0xbf, 0xaf, 0x0e, 0x7a, 0x39, 0x03, 0x6e, + 0xc2, 0xe6, 0x30, 0x60, 0x7c, 0xdc, 0xda, 0xe8, 0xa0, 0xee, 0x4d, 0x4f, 0xbd, 0x90, 0x17, 0xd0, + 0x5c, 0x9e, 0x2c, 0x62, 0xce, 0x44, 0x80, 0xef, 0x43, 0x7d, 0xa0, 0x96, 0xe4, 0xe8, 0x46, 0x6f, + 0xdb, 0xd6, 0x8a, 0x0f, 0xf8, 0x88, 0x79, 0xf9, 0x26, 0xf9, 0x8c, 0x60, 0x57, 0x12, 0xf4, 0xa3, + 0x48, 0x73, 0x88, 0x6b, 0x91, 0xff, 0x0c, 0xe0, 0xef, 0x0d, 0x4b, 0x0f, 0x8d, 0xde, 0x5e, 0xae, + 0x49, 0x45, 0x74, 0x48, 0xc3, 0xfc, 0xea, 0xbc, 0x02, 0x98, 0x7c, 0x45, 0xd0, 0x2a, 0x6b, 0xd4, + 0x46, 0x8f, 0x61, 0x4b, 0x7b, 0xc9, 0x54, 0xde, 0x58, 0x75, 0xea, 0x3e, 0x3e, 0x9f, 0xb5, 0x8d, + 0x2f, 0x3f, 0xda, 0xdd, 0x2b, 0xe8, 0xce, 0x0e, 0x08, 0xef, 0x92, 0x0f, 0x3f, 0xaf, 0xd0, 0x6c, + 0x56, 0x69, 0x56, 0x5a, 0x96, 0x44, 0xef, 0xe9, 0x7b, 0x7d, 0xc3, 0x13, 0x1a, 0x1d, 0xa5, 0x71, + 0x1c, 0x4d, 0xb5, 0x37, 0x32, 0xd1, 0x76, 0x96, 0xb6, 0xb4, 0x9d, 0x77, 0x50, 0x13, 0x72, 0xe5, + 0x3f, 0x99, 0xd1, 0x6c, 0xe4, 0x91, 0xee, 0x89, 0x1a, 0xf7, 0xea, 0x43, 0x9e, 0xf1, 0x65, 0xab, + 0x50, 0xb1, 0x55, 0x0c, 0x6e, 0xad, 0xa0, 0xb5, 0xbc, 0xb7, 0x50, 0xa3, 0x63, 0x9e, 0xb2, 0xa4, + 0xaa, 0x55, 0xae, 0x93, 0xc9, 0xfb, 0x3e, 0x6b, 0x3f, 0xb8, 0xa2, 0x3c, 0x4f, 0x93, 0xf5, 0x7e, + 0x6d, 0xc0, 0xa6, 0x1c, 0x88, 0x0f, 0xa1, 0xae, 0x23, 0xc6, 0x1d, 0xbb, 0xf0, 0xb1, 0xda, 0x15, + 0xdf, 0x97, 0x79, 0x67, 0x0d, 0x42, 0x09, 0x26, 0x06, 0x7e, 0x0f, 0x8d, 0x42, 0x6f, 0xf0, 0xdd, + 0xf2, 0x99, 0x72, 0xf5, 0xcd, 0x7b, 0xff, 0x40, 0x15, 0xd9, 0x0b, 0x31, 0x56, 0xb1, 0x97, 0x0b, + 0x50, 0xc5, 0x5e, 0xd1, 0x05, 0x62, 0xe0, 0x23, 0xd8, 0xca, 0x23, 0xc0, 0x15, 0x66, 0x57, 0xc2, + 0x34, 0xc9, 0x3a, 0x48, 0x4e, 0xea, 0x1e, 0x9c, 0xcf, 0x2d, 0x74, 0x31, 0xb7, 0xd0, 0xcf, 0xb9, + 0x85, 0x3e, 0x2d, 0x2c, 0xe3, 0x62, 0x61, 0x19, 0xdf, 0x16, 0x96, 0x71, 0xfc, 0x70, 0x6d, 0x6e, + 0x67, 0xea, 0x77, 0x2a, 0xe3, 0x1b, 0xd4, 0xe4, 0x8f, 0xef, 0xe9, 0x9f, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xd4, 0x4d, 0xf4, 0x62, 0x6a, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -787,9 +787,9 @@ func (m *QueryAllBalancesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error _ = i var l int _ = l - if m.Res != nil { + if m.Pagination != nil { { - size, err := m.Res.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1009,8 +1009,8 @@ func (m *QueryAllBalancesResponse) Size() (n int) { n += 1 + l + sovQuery(uint64(l)) } } - if m.Res != nil { - l = m.Res.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -1466,7 +1466,7 @@ func (m *QueryAllBalancesResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Res", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -1493,10 +1493,10 @@ func (m *QueryAllBalancesResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Res == nil { - m.Res = &query.PageResponse{} + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} } - if err := m.Res.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/distribution/keeper/grpc_query.go b/x/distribution/keeper/grpc_query.go index 293b37e03775..1d762250496d 100644 --- a/x/distribution/keeper/grpc_query.go +++ b/x/distribution/keeper/grpc_query.go @@ -75,7 +75,7 @@ func (k Keeper) ValidatorSlashes(c context.Context, req *types.QueryValidatorSla store := ctx.KVStore(k.storeKey) slashesStore := prefix.NewStore(store, types.GetValidatorSlashEventPrefix(req.ValidatorAddress)) - res, err := query.FilteredPaginate(slashesStore, req.Pagination, func(key []byte, value []byte, accumulate bool) (bool, error) { + pageRes, err := query.FilteredPaginate(slashesStore, req.Pagination, func(key []byte, value []byte, accumulate bool) (bool, error) { var result types.ValidatorSlashEvent err := k.cdc.UnmarshalBinaryBare(value, &result) @@ -97,7 +97,7 @@ func (k Keeper) ValidatorSlashes(c context.Context, req *types.QueryValidatorSla return &types.QueryValidatorSlashesResponse{}, err } - return &types.QueryValidatorSlashesResponse{Slashes: events, Res: res}, nil + return &types.QueryValidatorSlashesResponse{Slashes: events, Pagination: pageRes}, nil } // DelegationRewards the total rewards accrued by a delegation diff --git a/x/distribution/keeper/grpc_query_test.go b/x/distribution/keeper/grpc_query_test.go index 681251a64080..03bed8d9165c 100644 --- a/x/distribution/keeper/grpc_query_test.go +++ b/x/distribution/keeper/grpc_query_test.go @@ -238,7 +238,7 @@ func (suite *KeeperTestSuite) TestGRPCValidatorSlashes() { StartingHeight: 10, EndingHeight: 1, } - expRes = &types.QueryValidatorSlashesResponse{Res: &query.PageResponse{}} + expRes = &types.QueryValidatorSlashesResponse{Pagination: &query.PageResponse{}} }, false, }, @@ -250,7 +250,7 @@ func (suite *KeeperTestSuite) TestGRPCValidatorSlashes() { StartingHeight: 1, EndingHeight: 10, } - expRes = &types.QueryValidatorSlashesResponse{Res: &query.PageResponse{}} + expRes = &types.QueryValidatorSlashesResponse{Pagination: &query.PageResponse{}} }, true, }, diff --git a/x/distribution/types/query.pb.go b/x/distribution/types/query.pb.go index 5a6c15ed96df..7e1de4f3faf3 100644 --- a/x/distribution/types/query.pb.go +++ b/x/distribution/types/query.pb.go @@ -368,8 +368,8 @@ func (m *QueryValidatorSlashesRequest) GetPagination() *query.PageRequest { // QueryValidatorSlashesResponse is the response type for the Query/ValidatorSlashes RPC method type QueryValidatorSlashesResponse struct { - Slashes []ValidatorSlashEvent `protobuf:"bytes,1,rep,name=slashes,proto3" json:"slashes"` - Res *query.PageResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` + Slashes []ValidatorSlashEvent `protobuf:"bytes,1,rep,name=slashes,proto3" json:"slashes"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryValidatorSlashesResponse) Reset() { *m = QueryValidatorSlashesResponse{} } @@ -412,9 +412,9 @@ func (m *QueryValidatorSlashesResponse) GetSlashes() []ValidatorSlashEvent { return nil } -func (m *QueryValidatorSlashesResponse) GetRes() *query.PageResponse { +func (m *QueryValidatorSlashesResponse) GetPagination() *query.PageResponse { if m != nil { - return m.Res + return m.Pagination } return nil } @@ -901,66 +901,66 @@ func init() { func init() { proto.RegisterFile("cosmos/distribution/query.proto", fileDescriptor_2111c1b119d22af6) } var fileDescriptor_2111c1b119d22af6 = []byte{ - // 941 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4f, 0x6f, 0xdc, 0x44, - 0x14, 0xdf, 0x49, 0xd2, 0x54, 0xbc, 0xb4, 0x24, 0x9d, 0x54, 0x68, 0xeb, 0xd0, 0xdd, 0xc8, 0x05, - 0xb2, 0x12, 0xd4, 0x26, 0x1b, 0x10, 0x04, 0xc1, 0x21, 0x69, 0x90, 0x2a, 0x21, 0xc1, 0x76, 0x41, - 0x05, 0x2a, 0x68, 0x35, 0xb1, 0x47, 0x5e, 0x0b, 0xaf, 0x67, 0xeb, 0x19, 0x27, 0x44, 0xfc, 0x11, - 0x48, 0x05, 0xc4, 0x01, 0x09, 0x89, 0x03, 0x17, 0x3e, 0x41, 0x3f, 0x49, 0x8f, 0xe5, 0xc6, 0xa9, - 0x45, 0xc9, 0xb7, 0xe0, 0x84, 0x3c, 0x33, 0xf6, 0xae, 0x13, 0xdb, 0xd9, 0xa4, 0xd1, 0xde, 0x76, - 0xdf, 0xbc, 0xf7, 0x7b, 0xbf, 0xf7, 0x9b, 0x37, 0x6f, 0xc6, 0xd0, 0x74, 0x18, 0xef, 0x33, 0x6e, - 0xbb, 0x3e, 0x17, 0x91, 0xbf, 0x1d, 0x0b, 0x9f, 0x85, 0xf6, 0xfd, 0x98, 0x46, 0x7b, 0xd6, 0x20, - 0x62, 0x82, 0xe1, 0x45, 0xe5, 0x60, 0x8d, 0x3a, 0x18, 0x57, 0x75, 0x94, 0x74, 0xb4, 0x07, 0xc4, - 0xf3, 0x43, 0x92, 0x2c, 0xa8, 0x18, 0xe3, 0xb2, 0xc7, 0x3c, 0x26, 0x7f, 0xda, 0xc9, 0x2f, 0x6d, - 0xd5, 0x48, 0xb6, 0x06, 0x54, 0xc6, 0x57, 0x8a, 0xf2, 0x8f, 0xfe, 0x51, 0x7e, 0xe6, 0x65, 0xc0, - 0xb7, 0x92, 0x64, 0x1d, 0x12, 0x91, 0x3e, 0xef, 0xd2, 0xfb, 0x31, 0xe5, 0xc2, 0xec, 0xc0, 0x62, - 0xce, 0xca, 0x07, 0x2c, 0xe4, 0x14, 0xaf, 0xc3, 0xec, 0x40, 0x5a, 0xea, 0x68, 0x19, 0xb5, 0xe6, - 0xda, 0x4b, 0x56, 0x41, 0x11, 0x96, 0x0a, 0xda, 0x9c, 0x79, 0xf4, 0xa4, 0x59, 0xeb, 0xea, 0x00, - 0xf3, 0x57, 0x04, 0x2b, 0x12, 0xf2, 0x36, 0x09, 0x7c, 0x97, 0x08, 0x16, 0x7d, 0x14, 0x0b, 0x2e, - 0x48, 0xe8, 0xfa, 0xa1, 0xd7, 0xa5, 0xbb, 0x24, 0x72, 0xd3, 0xec, 0xf8, 0x2e, 0x5c, 0xda, 0x49, - 0xbd, 0xee, 0x11, 0xd7, 0x8d, 0x28, 0x57, 0x19, 0x2f, 0x6c, 0xae, 0xfe, 0xf7, 0xa4, 0x79, 0xdd, - 0xf3, 0x45, 0x2f, 0xde, 0xb6, 0x1c, 0xd6, 0xb7, 0x73, 0xa5, 0x5f, 0xe7, 0xee, 0x57, 0xb6, 0xd8, - 0x1b, 0x50, 0x6e, 0xdd, 0x26, 0xc1, 0x86, 0x0a, 0xec, 0x2e, 0x64, 0x58, 0xda, 0x62, 0x7e, 0x0b, - 0xad, 0xe3, 0xa9, 0xe8, 0x92, 0x3b, 0x70, 0x3e, 0x52, 0x26, 0x5d, 0xf3, 0xeb, 0x85, 0x35, 0x57, - 0x40, 0x69, 0x21, 0x52, 0x18, 0xf3, 0x47, 0x04, 0xcd, 0x7c, 0xfa, 0x1b, 0xac, 0xdf, 0xf7, 0x39, - 0xf7, 0x59, 0x38, 0x29, 0x05, 0xbe, 0x83, 0xe5, 0x72, 0x0a, 0xba, 0xf2, 0xcf, 0x01, 0x9c, 0xcc, - 0xaa, 0x8b, 0x5f, 0xab, 0x2e, 0x7e, 0xc3, 0x71, 0xe2, 0x7e, 0x1c, 0x10, 0x41, 0xdd, 0x21, 0xa0, - 0xae, 0x7f, 0x04, 0xcc, 0xfc, 0x65, 0x0a, 0x5e, 0xcc, 0xe7, 0xff, 0x38, 0x20, 0xbc, 0x47, 0x27, - 0xd5, 0x01, 0x78, 0x05, 0xe6, 0xb9, 0x20, 0x91, 0xf0, 0x43, 0xef, 0x5e, 0x8f, 0xfa, 0x5e, 0x4f, - 0xd4, 0xa7, 0x96, 0x51, 0x6b, 0xa6, 0xfb, 0x7c, 0x6a, 0xbe, 0x29, 0xad, 0xf8, 0x1a, 0x5c, 0xa4, - 0x72, 0x33, 0x53, 0xb7, 0x69, 0xe9, 0x76, 0x41, 0x19, 0xb5, 0xd3, 0x3a, 0xc0, 0xf0, 0xa8, 0xd6, - 0x67, 0xa4, 0x52, 0x57, 0x52, 0xa5, 0xd4, 0x99, 0xef, 0x10, 0x8f, 0xea, 0xe2, 0xba, 0x23, 0xce, - 0xe6, 0x9f, 0x08, 0xae, 0x96, 0x28, 0xa1, 0xb7, 0xe1, 0x26, 0x9c, 0xe7, 0xca, 0x54, 0x47, 0xcb, - 0xd3, 0xad, 0xb9, 0x76, 0xab, 0x7a, 0x0f, 0x64, 0xfc, 0xfb, 0x3b, 0x34, 0x14, 0x69, 0xe3, 0xe9, - 0x70, 0xfc, 0x1a, 0x4c, 0x47, 0x94, 0xcb, 0x42, 0xe7, 0xda, 0x46, 0x11, 0x3f, 0x95, 0xb2, 0x9b, - 0xb8, 0x99, 0x4f, 0x53, 0x66, 0x5b, 0x34, 0xa0, 0x9e, 0x64, 0x7b, 0xf4, 0x98, 0xba, 0x6a, 0xed, - 0xd4, 0x9b, 0xb4, 0xe1, 0x38, 0xd9, 0x26, 0x65, 0x58, 0xe9, 0x26, 0x15, 0x36, 0xc1, 0xd4, 0xd9, - 0x1d, 0x82, 0x1f, 0x10, 0x34, 0xca, 0x2a, 0xd4, 0xe2, 0xdf, 0x1d, 0x3d, 0xfd, 0x89, 0xf8, 0xf3, - 0xa9, 0x6c, 0x5b, 0xd4, 0xb9, 0xc1, 0xfc, 0x70, 0x73, 0x2d, 0xd1, 0xf8, 0xe1, 0xd3, 0xe6, 0xab, - 0x63, 0xb0, 0xd1, 0x31, 0x7c, 0x38, 0x0b, 0x1e, 0x20, 0x30, 0x0f, 0x51, 0xf8, 0x84, 0x09, 0x12, - 0x4c, 0x56, 0x69, 0xf3, 0x6f, 0x04, 0xd7, 0x2a, 0x69, 0x68, 0x39, 0x3e, 0x3c, 0x2c, 0x87, 0x55, - 0xd8, 0x8b, 0x43, 0x94, 0xad, 0x34, 0x93, 0x42, 0x3a, 0x34, 0x0a, 0xf1, 0x1d, 0x38, 0x27, 0x92, - 0x3c, 0xf5, 0xa9, 0x33, 0x14, 0x57, 0x41, 0x0e, 0xc7, 0x6c, 0xc6, 0x21, 0x3b, 0x22, 0x13, 0xd3, - 0x35, 0xd6, 0x63, 0xb6, 0x90, 0x82, 0xd6, 0xf4, 0x16, 0x40, 0xd6, 0x99, 0x4a, 0xd6, 0x53, 0xb5, - 0xf7, 0x08, 0x88, 0xf9, 0x33, 0x82, 0x97, 0xf2, 0x79, 0x3f, 0xf5, 0x45, 0xcf, 0x8d, 0xc8, 0x6e, - 0xea, 0x3d, 0xa1, 0xfa, 0x7f, 0x42, 0xf0, 0xf2, 0x31, 0x44, 0xb4, 0x0a, 0x5f, 0xc0, 0xc2, 0xae, - 0x5e, 0x7a, 0x76, 0x22, 0xf3, 0xbb, 0xf9, 0x2c, 0xe6, 0x12, 0x5c, 0x91, 0x34, 0x92, 0x4b, 0x29, - 0x0e, 0x7d, 0xb1, 0xd7, 0x61, 0x2c, 0x48, 0xdf, 0x3a, 0x3b, 0x60, 0x14, 0x2d, 0x6a, 0x62, 0x9f, - 0xc1, 0xcc, 0x80, 0xb1, 0xe0, 0x4c, 0x8f, 0xbf, 0x44, 0x6c, 0x3f, 0x7c, 0x0e, 0xce, 0xc9, 0xc4, - 0xf8, 0x4b, 0x98, 0x55, 0x6f, 0x26, 0xbc, 0x52, 0x78, 0x9e, 0x8e, 0x3e, 0xd0, 0x8c, 0xd6, 0xf1, - 0x8e, 0xaa, 0x00, 0xb3, 0x86, 0xff, 0x42, 0xb0, 0x54, 0xf1, 0x3e, 0xc1, 0xef, 0x96, 0x63, 0x1d, - 0xff, 0x58, 0x33, 0xde, 0x3b, 0x65, 0x74, 0x46, 0xef, 0x01, 0x82, 0xc5, 0x82, 0x77, 0x08, 0x7e, - 0x63, 0x0c, 0xe0, 0x23, 0x2f, 0x27, 0xe3, 0xcd, 0x13, 0x46, 0x65, 0x34, 0xbe, 0x81, 0x85, 0xc3, - 0x77, 0x30, 0x5e, 0x1d, 0x03, 0x2c, 0xff, 0x72, 0x31, 0xda, 0x27, 0x09, 0xc9, 0x92, 0x7f, 0x0f, - 0x97, 0x8e, 0x5c, 0x42, 0xb8, 0x02, 0xaa, 0xec, 0x4e, 0x36, 0xd6, 0x4e, 0x14, 0x93, 0xe5, 0xff, - 0x0d, 0xc1, 0x0b, 0xc5, 0xb3, 0x1f, 0xbf, 0x35, 0x0e, 0x62, 0xc1, 0xa5, 0x65, 0xbc, 0x7d, 0xf2, - 0xc0, 0x5c, 0x4f, 0x14, 0x0c, 0xcd, 0xaa, 0x9e, 0x28, 0x1f, 0xf3, 0x55, 0x3d, 0x51, 0x31, 0x99, - 0xcd, 0x1a, 0xfe, 0x03, 0x41, 0xbd, 0x6c, 0x74, 0xe1, 0xf5, 0x31, 0x50, 0x8b, 0xe7, 0xae, 0xf1, - 0xce, 0x69, 0x42, 0x33, 0x56, 0x11, 0x5c, 0xcc, 0xcd, 0x2a, 0x6c, 0x95, 0xc3, 0x15, 0x4d, 0x3c, - 0xc3, 0x1e, 0xdb, 0x3f, 0xcd, 0xb9, 0xf9, 0xc1, 0xa3, 0xfd, 0x06, 0x7a, 0xbc, 0xdf, 0x40, 0xff, - 0xee, 0x37, 0xd0, 0xef, 0x07, 0x8d, 0xda, 0xe3, 0x83, 0x46, 0xed, 0x9f, 0x83, 0x46, 0xed, 0xce, - 0x6a, 0xe5, 0xe4, 0xfb, 0x3a, 0xff, 0x01, 0x2a, 0x07, 0xe1, 0xf6, 0xac, 0xfc, 0xf4, 0x5c, 0xfb, - 0x3f, 0x00, 0x00, 0xff, 0xff, 0x5a, 0xdc, 0x55, 0xbf, 0x24, 0x0f, 0x00, 0x00, + // 936 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcd, 0x6f, 0xdc, 0x44, + 0x14, 0xdf, 0xd9, 0xa6, 0xa9, 0x78, 0x6d, 0x49, 0x3a, 0xa9, 0xd0, 0xd6, 0xa1, 0xbb, 0x91, 0x0b, + 0x64, 0x25, 0x54, 0x9b, 0x24, 0x20, 0x48, 0x05, 0x87, 0xa4, 0x41, 0xaa, 0x84, 0x04, 0xdb, 0x05, + 0x15, 0xa8, 0xa0, 0xd5, 0xc4, 0x1e, 0x79, 0x2d, 0xbc, 0x9e, 0xad, 0x67, 0x9c, 0x10, 0xf1, 0x21, + 0x90, 0x0a, 0x88, 0x03, 0x12, 0x12, 0x57, 0xae, 0x5c, 0xfa, 0x97, 0xf4, 0x58, 0x6e, 0x9c, 0x5a, + 0x94, 0xfc, 0x17, 0x9c, 0xd0, 0xce, 0x8c, 0xbd, 0xeb, 0xc4, 0xf6, 0x7e, 0x34, 0xda, 0xdb, 0xee, + 0x9b, 0xf7, 0x7e, 0xef, 0xf7, 0x3e, 0xe6, 0xcd, 0x33, 0x34, 0x1c, 0xc6, 0xbb, 0x8c, 0xdb, 0xae, + 0xcf, 0x45, 0xe4, 0xef, 0xc6, 0xc2, 0x67, 0xa1, 0xfd, 0x20, 0xa6, 0xd1, 0x81, 0xd5, 0x8b, 0x98, + 0x60, 0x78, 0x49, 0x29, 0x58, 0xc3, 0x0a, 0xc6, 0x55, 0x6d, 0x25, 0x15, 0xed, 0x1e, 0xf1, 0xfc, + 0x90, 0xf4, 0x0f, 0x94, 0x8d, 0x71, 0xd9, 0x63, 0x1e, 0x93, 0x3f, 0xed, 0xfe, 0x2f, 0x2d, 0xd5, + 0x48, 0xb6, 0x06, 0x54, 0xc2, 0xd7, 0xf2, 0xfc, 0x0f, 0xff, 0x51, 0x7a, 0xe6, 0x65, 0xc0, 0xb7, + 0xfb, 0xce, 0x5a, 0x24, 0x22, 0x5d, 0xde, 0xa6, 0x0f, 0x62, 0xca, 0x85, 0xd9, 0x82, 0xa5, 0x8c, + 0x94, 0xf7, 0x58, 0xc8, 0x29, 0xde, 0x84, 0xf9, 0x9e, 0x94, 0xd4, 0xd0, 0x0a, 0x6a, 0x9e, 0x5f, + 0x5f, 0xb6, 0x72, 0x82, 0xb0, 0x94, 0xd1, 0xf6, 0xdc, 0xe3, 0xa7, 0x8d, 0x4a, 0x5b, 0x1b, 0x98, + 0xbf, 0x22, 0x58, 0x95, 0x90, 0x77, 0x48, 0xe0, 0xbb, 0x44, 0xb0, 0xe8, 0xa3, 0x58, 0x70, 0x41, + 0x42, 0xd7, 0x0f, 0xbd, 0x36, 0xdd, 0x27, 0x91, 0x9b, 0x78, 0xc7, 0xf7, 0xe0, 0xd2, 0x5e, 0xa2, + 0x75, 0x9f, 0xb8, 0x6e, 0x44, 0xb9, 0xf2, 0x78, 0x61, 0x7b, 0xed, 0xbf, 0xa7, 0x8d, 0xeb, 0x9e, + 0x2f, 0x3a, 0xf1, 0xae, 0xe5, 0xb0, 0xae, 0x9d, 0x09, 0xfd, 0x3a, 0x77, 0xbf, 0xb2, 0xc5, 0x41, + 0x8f, 0x72, 0xeb, 0x0e, 0x09, 0xb6, 0x94, 0x61, 0x7b, 0x31, 0xc5, 0xd2, 0x12, 0xf3, 0x5b, 0x68, + 0x8e, 0xa6, 0xa2, 0x43, 0x6e, 0xc1, 0xb9, 0x48, 0x89, 0x74, 0xcc, 0x6f, 0xe4, 0xc6, 0x5c, 0x02, + 0xa5, 0x13, 0x91, 0xc0, 0x98, 0x3f, 0x22, 0x68, 0x64, 0xdd, 0xdf, 0x64, 0xdd, 0xae, 0xcf, 0xb9, + 0xcf, 0xc2, 0x59, 0x65, 0xe0, 0x3b, 0x58, 0x29, 0xa6, 0xa0, 0x23, 0xff, 0x1c, 0xc0, 0x49, 0xa5, + 0x3a, 0xf8, 0x8d, 0xf2, 0xe0, 0xb7, 0x1c, 0x27, 0xee, 0xc6, 0x01, 0x11, 0xd4, 0x1d, 0x00, 0xea, + 0xf8, 0x87, 0xc0, 0xcc, 0x5f, 0xaa, 0xf0, 0x72, 0xd6, 0xff, 0xc7, 0x01, 0xe1, 0x1d, 0x3a, 0xab, + 0x0e, 0xc0, 0xab, 0xb0, 0xc0, 0x05, 0x89, 0x84, 0x1f, 0x7a, 0xf7, 0x3b, 0xd4, 0xf7, 0x3a, 0xa2, + 0x56, 0x5d, 0x41, 0xcd, 0xb9, 0xf6, 0x8b, 0x89, 0xf8, 0x96, 0x94, 0xe2, 0x6b, 0x70, 0x91, 0xca, + 0x62, 0x26, 0x6a, 0x67, 0xa4, 0xda, 0x05, 0x25, 0xd4, 0x4a, 0x9b, 0x00, 0x83, 0xab, 0x5a, 0x9b, + 0x93, 0x99, 0xba, 0x92, 0x64, 0x4a, 0xdd, 0xf9, 0x16, 0xf1, 0xa8, 0x0e, 0xae, 0x3d, 0xa4, 0x6c, + 0xfe, 0x85, 0xe0, 0x6a, 0x41, 0x26, 0x74, 0x19, 0x6e, 0xc1, 0x39, 0xae, 0x44, 0x35, 0xb4, 0x72, + 0xa6, 0x79, 0x7e, 0xbd, 0x59, 0x5e, 0x03, 0x69, 0xff, 0xfe, 0x1e, 0x0d, 0x45, 0xd2, 0x78, 0xda, + 0x1c, 0xdf, 0xc8, 0xd0, 0xac, 0x4a, 0x9a, 0x46, 0x1e, 0x4d, 0xe5, 0x39, 0xc3, 0xf3, 0x59, 0xc2, + 0x73, 0x87, 0x06, 0xd4, 0x93, 0xb2, 0x93, 0x97, 0xd6, 0x55, 0x67, 0x53, 0x97, 0x6c, 0xcb, 0x71, + 0xd2, 0x92, 0xa5, 0x58, 0x49, 0xc9, 0x72, 0x5b, 0xa2, 0x7a, 0x7a, 0x57, 0xe2, 0x07, 0x04, 0xf5, + 0xa2, 0x08, 0x75, 0x29, 0xee, 0x0d, 0xcf, 0x82, 0x7e, 0x29, 0x16, 0x92, 0xec, 0xed, 0x50, 0xe7, + 0x26, 0xf3, 0xc3, 0xed, 0x8d, 0x7e, 0xc6, 0x1f, 0x3d, 0x6b, 0xbc, 0x3e, 0x06, 0x1b, 0x6d, 0xc3, + 0x07, 0x93, 0xe1, 0x21, 0x02, 0xf3, 0x18, 0x85, 0x4f, 0x98, 0x20, 0xc1, 0x6c, 0x33, 0x6d, 0xfe, + 0x8d, 0xe0, 0x5a, 0x29, 0x0d, 0x9d, 0x8e, 0x0f, 0x8f, 0xa7, 0xc3, 0xca, 0xed, 0xcc, 0x01, 0xca, + 0x4e, 0xe2, 0x49, 0x21, 0x1d, 0x1b, 0x8c, 0xf8, 0x2e, 0x9c, 0x15, 0x7d, 0x3f, 0xb5, 0xea, 0x29, + 0x26, 0x57, 0x41, 0x0e, 0x86, 0x6e, 0xca, 0x21, 0xbd, 0x30, 0x33, 0xcb, 0x6b, 0xac, 0x87, 0x6e, + 0x2e, 0x05, 0x9d, 0xd3, 0xdb, 0x00, 0x69, 0x67, 0xaa, 0xb4, 0x4e, 0xd5, 0xde, 0x43, 0x20, 0xe6, + 0xcf, 0x08, 0x5e, 0xc9, 0xfa, 0xfd, 0xd4, 0x17, 0x1d, 0x37, 0x22, 0xfb, 0x89, 0xf6, 0x8c, 0xe2, + 0xff, 0x09, 0xc1, 0xab, 0x23, 0x88, 0xe8, 0x2c, 0x7c, 0x01, 0x8b, 0xfb, 0xfa, 0xe8, 0xf9, 0x89, + 0x2c, 0xec, 0x67, 0xbd, 0x98, 0xcb, 0x70, 0x45, 0xd2, 0xe8, 0x3f, 0x51, 0x71, 0xe8, 0x8b, 0x83, + 0x16, 0x63, 0x41, 0xb2, 0xf9, 0xec, 0x81, 0x91, 0x77, 0xa8, 0x89, 0x7d, 0x06, 0x73, 0x3d, 0xc6, + 0x82, 0x53, 0xbd, 0xfe, 0x12, 0x71, 0xfd, 0xd1, 0x0b, 0x70, 0x56, 0x3a, 0xc6, 0x5f, 0xc2, 0xbc, + 0xda, 0xa0, 0xf0, 0x6a, 0xee, 0x7d, 0x3a, 0xb9, 0xae, 0x19, 0xcd, 0xd1, 0x8a, 0x2a, 0x00, 0xb3, + 0x82, 0xff, 0x44, 0xb0, 0x5c, 0xb2, 0xad, 0xe0, 0x77, 0x8b, 0xb1, 0x46, 0xaf, 0x6e, 0xc6, 0x7b, + 0x53, 0x5a, 0xa7, 0xf4, 0x1e, 0x22, 0x58, 0xca, 0xd9, 0x4a, 0xf0, 0x9b, 0x63, 0x00, 0x9f, 0xd8, + 0xa3, 0x8c, 0xb7, 0x26, 0xb4, 0x4a, 0x69, 0x7c, 0x03, 0x8b, 0xc7, 0x5f, 0x64, 0xbc, 0x36, 0x06, + 0x58, 0x76, 0x8f, 0x31, 0xd6, 0x27, 0x31, 0x49, 0x9d, 0x7f, 0x0f, 0x97, 0x4e, 0x3c, 0x42, 0xb8, + 0x04, 0xaa, 0xe8, 0x4d, 0x36, 0x36, 0x26, 0xb2, 0x49, 0xfd, 0xff, 0x86, 0xe0, 0xa5, 0xfc, 0xd9, + 0x8f, 0xdf, 0x1e, 0x07, 0x31, 0xe7, 0xd1, 0x32, 0xde, 0x99, 0xdc, 0x30, 0xd3, 0x13, 0x39, 0x43, + 0xb3, 0xac, 0x27, 0x8a, 0xc7, 0x7c, 0x59, 0x4f, 0x94, 0x4c, 0x66, 0xb3, 0x82, 0xff, 0x40, 0x50, + 0x2b, 0x1a, 0x5d, 0x78, 0x73, 0x0c, 0xd4, 0xfc, 0xb9, 0x6b, 0xdc, 0x98, 0xc6, 0x34, 0x65, 0x15, + 0xc1, 0xc5, 0xcc, 0xac, 0xc2, 0x56, 0x31, 0x5c, 0xde, 0xc4, 0x33, 0xec, 0xb1, 0xf5, 0x13, 0x9f, + 0xdb, 0x1f, 0x3c, 0x3e, 0xac, 0xa3, 0x27, 0x87, 0x75, 0xf4, 0xef, 0x61, 0x1d, 0xfd, 0x7e, 0x54, + 0xaf, 0x3c, 0x39, 0xaa, 0x57, 0xfe, 0x39, 0xaa, 0x57, 0xee, 0xae, 0x95, 0x4e, 0xbe, 0xaf, 0xb3, + 0x9f, 0xa3, 0x72, 0x10, 0xee, 0xce, 0xcb, 0x0f, 0xd1, 0x8d, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, + 0x6d, 0x56, 0x99, 0x70, 0x32, 0x0f, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1603,9 +1603,9 @@ func (m *QueryValidatorSlashesResponse) MarshalToSizedBuffer(dAtA []byte) (int, _ = i var l int _ = l - if m.Res != nil { + if m.Pagination != nil { { - size, err := m.Res.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2083,8 +2083,8 @@ func (m *QueryValidatorSlashesResponse) Size() (n int) { n += 1 + l + sovQuery(uint64(l)) } } - if m.Res != nil { - l = m.Res.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -2951,7 +2951,7 @@ func (m *QueryValidatorSlashesResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Res", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -2978,10 +2978,10 @@ func (m *QueryValidatorSlashesResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Res == nil { - m.Res = &query.PageResponse{} + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} } - if err := m.Res.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/evidence/keeper/grpc_query.go b/x/evidence/keeper/grpc_query.go index cf43ed49953e..f084c16717a0 100644 --- a/x/evidence/keeper/grpc_query.go +++ b/x/evidence/keeper/grpc_query.go @@ -61,7 +61,7 @@ func (k Keeper) AllEvidence(c context.Context, req *types.QueryAllEvidenceReques store := ctx.KVStore(k.storeKey) evidenceStore := prefix.NewStore(store, types.KeyPrefixEvidence) - res, err := query.Paginate(evidenceStore, req.Pagination, func(key []byte, value []byte) error { + pageRes, err := query.Paginate(evidenceStore, req.Pagination, func(key []byte, value []byte) error { result, err := k.UnmarshalEvidence(value) if err != nil { return err @@ -84,5 +84,5 @@ func (k Keeper) AllEvidence(c context.Context, req *types.QueryAllEvidenceReques return &types.QueryAllEvidenceResponse{}, err } - return &types.QueryAllEvidenceResponse{Evidence: evidence, Res: res}, nil + return &types.QueryAllEvidenceResponse{Evidence: evidence, Pagination: pageRes}, nil } diff --git a/x/evidence/keeper/grpc_query_test.go b/x/evidence/keeper/grpc_query_test.go index e9c5a480359e..df760c8edfe0 100644 --- a/x/evidence/keeper/grpc_query_test.go +++ b/x/evidence/keeper/grpc_query_test.go @@ -115,7 +115,7 @@ func (suite *KeeperTestSuite) TestQueryAllEvidence() { true, func(res *types.QueryAllEvidenceResponse) { suite.Equal(len(res.Evidence), 50) - suite.NotNil(res.Res.NextKey) + suite.NotNil(res.Pagination.NextKey) }, }, } diff --git a/x/evidence/types/query.pb.go b/x/evidence/types/query.pb.go index fffaa13b86aa..fcdf257a3b77 100644 --- a/x/evidence/types/query.pb.go +++ b/x/evidence/types/query.pb.go @@ -168,8 +168,8 @@ func (m *QueryAllEvidenceRequest) GetPagination() *query.PageRequest { // QueryAllEvidenceResponse is the response type for the Query/AllEvidence RPC method type QueryAllEvidenceResponse struct { - Evidence []*types.Any `protobuf:"bytes,1,rep,name=evidence,proto3" json:"evidence,omitempty"` - Res *query.PageResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` + Evidence []*types.Any `protobuf:"bytes,1,rep,name=evidence,proto3" json:"evidence,omitempty"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryAllEvidenceResponse) Reset() { *m = QueryAllEvidenceResponse{} } @@ -212,9 +212,9 @@ func (m *QueryAllEvidenceResponse) GetEvidence() []*types.Any { return nil } -func (m *QueryAllEvidenceResponse) GetRes() *query.PageResponse { +func (m *QueryAllEvidenceResponse) GetPagination() *query.PageResponse { if m != nil { - return m.Res + return m.Pagination } return nil } @@ -229,33 +229,33 @@ func init() { func init() { proto.RegisterFile("cosmos/evidence/query.proto", fileDescriptor_6afffc78347cbc5e) } var fileDescriptor_6afffc78347cbc5e = []byte{ - // 403 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x41, 0x6b, 0xdb, 0x30, - 0x1c, 0xc5, 0xed, 0x85, 0x8d, 0xa0, 0x64, 0x0c, 0x44, 0xc6, 0x12, 0x8f, 0x79, 0xc3, 0xb0, 0x91, - 0xc1, 0x22, 0x8d, 0x6c, 0x87, 0xed, 0x98, 0xc0, 0x58, 0x76, 0x5b, 0x4d, 0x4f, 0x2d, 0xa5, 0xd8, - 0xb1, 0x6a, 0x9b, 0x3a, 0x92, 0x63, 0xc9, 0x25, 0xee, 0xa7, 0xe8, 0xc7, 0x2a, 0x3d, 0xe5, 0xd8, - 0x53, 0x29, 0xc9, 0xb7, 0xe8, 0xa9, 0x58, 0xb6, 0x1a, 0x93, 0x18, 0xd2, 0x93, 0xff, 0xb6, 0x7e, - 0x7e, 0xef, 0xe9, 0x59, 0x06, 0xef, 0xa7, 0x8c, 0xcf, 0x18, 0xc7, 0xe4, 0x22, 0xf4, 0x08, 0x9d, - 0x12, 0x3c, 0x4f, 0x49, 0x92, 0xa1, 0x38, 0x61, 0x82, 0xc1, 0x37, 0xc5, 0x22, 0x52, 0x8b, 0xc6, - 0x87, 0x92, 0x96, 0x10, 0x8e, 0x1d, 0x3f, 0xa4, 0x8e, 0x08, 0x19, 0x2d, 0x78, 0xa3, 0xe3, 0x33, - 0x9f, 0xc9, 0x11, 0xe7, 0x53, 0xf9, 0xb4, 0xe7, 0x33, 0xe6, 0x47, 0x04, 0xcb, 0x3b, 0x37, 0x3d, - 0xc3, 0x0e, 0x2d, 0x0d, 0xac, 0x14, 0x74, 0x0e, 0x72, 0xa9, 0x3f, 0xa5, 0x81, 0x4d, 0xe6, 0x29, - 0xe1, 0x02, 0x9e, 0x80, 0xd7, 0xca, 0xf3, 0x34, 0x70, 0x78, 0xd0, 0xd5, 0x3f, 0xe9, 0xfd, 0xf6, - 0xf8, 0xd7, 0xc3, 0xdd, 0xc7, 0x9f, 0x7e, 0x28, 0x82, 0xd4, 0x45, 0x53, 0x36, 0xc3, 0x82, 0x50, - 0x8f, 0x24, 0xb3, 0x90, 0x8a, 0xea, 0x18, 0x85, 0x2e, 0xc7, 0x6e, 0x26, 0x08, 0x47, 0x13, 0xb2, - 0x18, 0xe7, 0x83, 0xdd, 0x56, 0x72, 0x13, 0x87, 0x07, 0xd6, 0x3f, 0xf0, 0x76, 0xcb, 0x96, 0xc7, - 0x8c, 0x72, 0x02, 0xbf, 0x83, 0xa6, 0x02, 0xa5, 0x65, 0x6b, 0xd8, 0x41, 0x45, 0x7a, 0xa4, 0xd2, - 0xa3, 0x11, 0xcd, 0xec, 0x27, 0xca, 0x3a, 0x04, 0xef, 0xa4, 0xd4, 0x28, 0x8a, 0xb6, 0x37, 0xf1, - 0x1b, 0x80, 0x4d, 0x43, 0xa5, 0x5c, 0x0f, 0x95, 0x95, 0x16, 0x35, 0xff, 0x77, 0x7c, 0x85, 0xdb, - 0x15, 0xd8, 0xba, 0x04, 0xdd, 0x5d, 0xd5, 0xda, 0x8c, 0x8d, 0xfd, 0x19, 0xe1, 0x37, 0xd0, 0x48, - 0x08, 0xef, 0xbe, 0x90, 0x09, 0x8c, 0xba, 0x04, 0x85, 0xb4, 0x9d, 0x63, 0xc3, 0x1b, 0x1d, 0xbc, - 0x94, 0xe6, 0xf0, 0x18, 0x34, 0x95, 0x3b, 0xfc, 0x8c, 0xb6, 0xce, 0x02, 0xaa, 0xfb, 0x70, 0xc6, - 0x97, 0x7d, 0x58, 0xe1, 0x64, 0x69, 0xd0, 0x03, 0xad, 0xca, 0xee, 0x60, 0xbf, 0xfe, 0xc5, 0xdd, - 0x5a, 0x8d, 0xaf, 0xcf, 0x20, 0x95, 0xcb, 0xf8, 0xef, 0xf5, 0xca, 0xd4, 0x97, 0x2b, 0x53, 0xbf, - 0x5f, 0x99, 0xfa, 0xd5, 0xda, 0xd4, 0x96, 0x6b, 0x53, 0xbb, 0x5d, 0x9b, 0xda, 0xd1, 0xa0, 0x72, - 0x8e, 0xca, 0x53, 0x5d, 0x5c, 0x06, 0xdc, 0x3b, 0xc7, 0x8b, 0xcd, 0x0f, 0x21, 0xb2, 0x98, 0x70, - 0xf7, 0x95, 0xec, 0xf6, 0xc7, 0x63, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb4, 0x0c, 0x57, 0x20, 0x30, - 0x03, 0x00, 0x00, + // 402 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x41, 0x4f, 0xdb, 0x30, + 0x1c, 0xc5, 0x93, 0x4d, 0x9b, 0x2a, 0xb7, 0xd3, 0x24, 0xab, 0xd3, 0xda, 0x4c, 0xcb, 0xa6, 0x48, + 0x9b, 0xba, 0x43, 0xed, 0xa9, 0x70, 0x00, 0x6e, 0xad, 0x84, 0x28, 0x37, 0x88, 0x38, 0x81, 0x10, + 0x4a, 0x1a, 0x93, 0x44, 0xa4, 0x76, 0x5a, 0x3b, 0xa8, 0xf9, 0x06, 0x1c, 0xf9, 0x58, 0x88, 0x53, + 0x8f, 0x9c, 0x10, 0x6a, 0xbf, 0x05, 0x27, 0x54, 0x27, 0xa6, 0xa1, 0x8d, 0x54, 0x4e, 0xf9, 0x27, + 0x7e, 0x79, 0xef, 0xe7, 0x17, 0x07, 0xfc, 0x18, 0x30, 0x3e, 0x64, 0x1c, 0x93, 0xeb, 0xd0, 0x23, + 0x74, 0x40, 0xf0, 0x28, 0x21, 0xe3, 0x14, 0xc5, 0x63, 0x26, 0x18, 0xfc, 0x9a, 0x2d, 0x22, 0xb5, + 0x68, 0xfc, 0xcc, 0xd5, 0x52, 0x84, 0x63, 0xc7, 0x0f, 0xa9, 0x23, 0x42, 0x46, 0x33, 0xbd, 0x51, + 0xf7, 0x99, 0xcf, 0xe4, 0x88, 0x17, 0x53, 0xfe, 0xb4, 0xe9, 0x33, 0xe6, 0x47, 0x04, 0xcb, 0x3b, + 0x37, 0xb9, 0xc4, 0x0e, 0xcd, 0x03, 0xac, 0x04, 0xd4, 0x8f, 0x17, 0x56, 0xfb, 0x79, 0x80, 0x4d, + 0x46, 0x09, 0xe1, 0x02, 0x9e, 0x83, 0x2f, 0x2a, 0xf3, 0x22, 0x70, 0x78, 0xd0, 0xd0, 0x7f, 0xeb, + 0xad, 0x5a, 0x6f, 0xe7, 0xf9, 0xf1, 0xd7, 0xb6, 0x1f, 0x8a, 0x20, 0x71, 0xd1, 0x80, 0x0d, 0xb1, + 0x20, 0xd4, 0x23, 0xe3, 0x61, 0x48, 0x45, 0x71, 0x8c, 0x42, 0x97, 0x63, 0x37, 0x15, 0x84, 0xa3, + 0x3e, 0x99, 0xf4, 0x16, 0x83, 0x5d, 0x53, 0x76, 0x7d, 0x87, 0x07, 0xd6, 0x21, 0xf8, 0xb6, 0x12, + 0xcb, 0x63, 0x46, 0x39, 0x81, 0xff, 0x41, 0x45, 0x09, 0x65, 0x64, 0xb5, 0x53, 0x47, 0x19, 0x3d, + 0x52, 0xf4, 0xa8, 0x4b, 0x53, 0xfb, 0x55, 0x65, 0x9d, 0x80, 0xef, 0xd2, 0xaa, 0x1b, 0x45, 0xab, + 0x9b, 0xd8, 0x05, 0x60, 0xd9, 0x50, 0x6e, 0xd7, 0x44, 0x79, 0xa5, 0x59, 0xcd, 0x47, 0x8e, 0xaf, + 0xe4, 0x76, 0x41, 0x6c, 0xdd, 0xe8, 0xa0, 0xb1, 0x6e, 0x5b, 0x0a, 0xf9, 0x71, 0x33, 0x24, 0xdc, + 0x7b, 0x43, 0xf2, 0x41, 0x92, 0x18, 0x65, 0x24, 0x59, 0x42, 0x11, 0xa5, 0x73, 0xaf, 0x83, 0x4f, + 0x12, 0x05, 0x9e, 0x81, 0x8a, 0x62, 0x81, 0x7f, 0xd0, 0xca, 0xd1, 0x40, 0x65, 0xdf, 0xd1, 0xf8, + 0xbb, 0x49, 0x96, 0x05, 0x5a, 0x1a, 0xf4, 0x40, 0xb5, 0xb0, 0x57, 0xd8, 0x2a, 0x7f, 0x71, 0xbd, + 0x65, 0xe3, 0xdf, 0x3b, 0x94, 0x2a, 0xa5, 0x77, 0x70, 0x37, 0x33, 0xf5, 0xe9, 0xcc, 0xd4, 0x9f, + 0x66, 0xa6, 0x7e, 0x3b, 0x37, 0xb5, 0xe9, 0xdc, 0xd4, 0x1e, 0xe6, 0xa6, 0x76, 0xda, 0x2e, 0x1c, + 0xab, 0xfc, 0x90, 0x67, 0x97, 0x36, 0xf7, 0xae, 0xf0, 0x64, 0xf9, 0x7f, 0x88, 0x34, 0x26, 0xdc, + 0xfd, 0x2c, 0x9b, 0xde, 0x7a, 0x09, 0x00, 0x00, 0xff, 0xff, 0xbd, 0x1c, 0xab, 0xe8, 0x3f, 0x03, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -498,9 +498,9 @@ func (m *QueryAllEvidenceResponse) MarshalToSizedBuffer(dAtA []byte) (int, error _ = i var l int _ = l - if m.Res != nil { + if m.Pagination != nil { { - size, err := m.Res.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -589,8 +589,8 @@ func (m *QueryAllEvidenceResponse) Size() (n int) { n += 1 + l + sovQuery(uint64(l)) } } - if m.Res != nil { - l = m.Res.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -932,7 +932,7 @@ func (m *QueryAllEvidenceResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Res", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -959,10 +959,10 @@ func (m *QueryAllEvidenceResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Res == nil { - m.Res = &query.PageResponse{} + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} } - if err := m.Res.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/gov/keeper/grpc_query.go b/x/gov/keeper/grpc_query.go index c3cc933c8fe7..5917e21d8abe 100644 --- a/x/gov/keeper/grpc_query.go +++ b/x/gov/keeper/grpc_query.go @@ -41,7 +41,7 @@ func (q Keeper) Proposals(c context.Context, req *types.QueryProposalsRequest) ( store := ctx.KVStore(q.storeKey) proposalStore := prefix.NewStore(store, types.ProposalsKeyPrefix) - res, err := query.FilteredPaginate(proposalStore, req.Pagination, func(key []byte, value []byte, accumulate bool) (bool, error) { + pageRes, err := query.FilteredPaginate(proposalStore, req.Pagination, func(key []byte, value []byte, accumulate bool) (bool, error) { var p types.Proposal if err := q.cdc.UnmarshalBinaryBare(value, &p); err != nil { return false, status.Error(codes.Internal, err.Error()) @@ -79,7 +79,7 @@ func (q Keeper) Proposals(c context.Context, req *types.QueryProposalsRequest) ( return nil, status.Error(codes.Internal, err.Error()) } - return &types.QueryProposalsResponse{Proposals: filteredProposals, Res: res}, nil + return &types.QueryProposalsResponse{Proposals: filteredProposals, Pagination: pageRes}, nil } // Vote returns Voted information based on proposalID, voterAddr @@ -123,7 +123,7 @@ func (q Keeper) Votes(c context.Context, req *types.QueryVotesRequest) (*types.Q store := ctx.KVStore(q.storeKey) votesStore := prefix.NewStore(store, types.VotesKey(req.ProposalId)) - res, err := query.Paginate(votesStore, req.Pagination, func(key []byte, value []byte) error { + pageRes, err := query.Paginate(votesStore, req.Pagination, func(key []byte, value []byte) error { var vote types.Vote if err := q.cdc.UnmarshalBinaryBare(value, &vote); err != nil { return err @@ -137,7 +137,7 @@ func (q Keeper) Votes(c context.Context, req *types.QueryVotesRequest) (*types.Q return nil, status.Error(codes.Internal, err.Error()) } - return &types.QueryVotesResponse{Votes: votes, Res: res}, nil + return &types.QueryVotesResponse{Votes: votes, Pagination: pageRes}, nil } // Params queries all params @@ -208,7 +208,7 @@ func (q Keeper) Deposits(c context.Context, req *types.QueryDepositsRequest) (*t store := ctx.KVStore(q.storeKey) depositStore := prefix.NewStore(store, types.DepositsKey(req.ProposalId)) - res, err := query.Paginate(depositStore, req.Pagination, func(key []byte, value []byte) error { + pageRes, err := query.Paginate(depositStore, req.Pagination, func(key []byte, value []byte) error { var deposit types.Deposit if err := q.cdc.UnmarshalBinaryBare(value, &deposit); err != nil { return err @@ -222,7 +222,7 @@ func (q Keeper) Deposits(c context.Context, req *types.QueryDepositsRequest) (*t return nil, status.Error(codes.Internal, err.Error()) } - return &types.QueryDepositsResponse{Deposits: deposits, Res: res}, nil + return &types.QueryDepositsResponse{Deposits: deposits, Pagination: pageRes}, nil } // TallyResult queries the tally of a proposal vote diff --git a/x/gov/types/query.pb.go b/x/gov/types/query.pb.go index ba3794cbf9b4..346eeffdf35e 100644 --- a/x/gov/types/query.pb.go +++ b/x/gov/types/query.pb.go @@ -195,8 +195,8 @@ func (m *QueryProposalsRequest) GetPagination() *query.PageRequest { // QueryProposalsResponse is the response type for the Query/Proposals RPC method type QueryProposalsResponse struct { - Proposals []Proposal `protobuf:"bytes,1,rep,name=proposals,proto3" json:"proposals"` - Res *query.PageResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` + Proposals []Proposal `protobuf:"bytes,1,rep,name=proposals,proto3" json:"proposals"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryProposalsResponse) Reset() { *m = QueryProposalsResponse{} } @@ -239,9 +239,9 @@ func (m *QueryProposalsResponse) GetProposals() []Proposal { return nil } -func (m *QueryProposalsResponse) GetRes() *query.PageResponse { +func (m *QueryProposalsResponse) GetPagination() *query.PageResponse { if m != nil { - return m.Res + return m.Pagination } return nil } @@ -402,8 +402,8 @@ func (m *QueryVotesRequest) GetPagination() *query.PageRequest { // QueryVotesResponse is the response type for the Query/Votes RPC method type QueryVotesResponse struct { - Votes []Vote `protobuf:"bytes,1,rep,name=votes,proto3" json:"votes"` - Res *query.PageResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` + Votes []Vote `protobuf:"bytes,1,rep,name=votes,proto3" json:"votes"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryVotesResponse) Reset() { *m = QueryVotesResponse{} } @@ -446,9 +446,9 @@ func (m *QueryVotesResponse) GetVotes() []Vote { return nil } -func (m *QueryVotesResponse) GetRes() *query.PageResponse { +func (m *QueryVotesResponse) GetPagination() *query.PageResponse { if m != nil { - return m.Res + return m.Pagination } return nil } @@ -715,8 +715,8 @@ func (m *QueryDepositsRequest) GetPagination() *query.PageRequest { // QueryDepositsResponse is the response type for the Query/Deposits RPC method type QueryDepositsResponse struct { - Deposits []Deposit `protobuf:"bytes,1,rep,name=deposits,proto3" json:"deposits"` - Res *query.PageResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` + Deposits []Deposit `protobuf:"bytes,1,rep,name=deposits,proto3" json:"deposits"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryDepositsResponse) Reset() { *m = QueryDepositsResponse{} } @@ -759,9 +759,9 @@ func (m *QueryDepositsResponse) GetDeposits() []Deposit { return nil } -func (m *QueryDepositsResponse) GetRes() *query.PageResponse { +func (m *QueryDepositsResponse) GetPagination() *query.PageResponse { if m != nil { - return m.Res + return m.Pagination } return nil } @@ -879,58 +879,58 @@ func init() { func init() { proto.RegisterFile("cosmos/gov/query.proto", fileDescriptor_6efb1c1bc2595eda) } var fileDescriptor_6efb1c1bc2595eda = []byte{ - // 809 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4b, 0x4f, 0x13, 0x51, - 0x14, 0xee, 0xf4, 0x01, 0xed, 0x29, 0x20, 0x5e, 0x10, 0xea, 0x44, 0xda, 0x7a, 0x75, 0x41, 0x0c, - 0xb4, 0x11, 0x82, 0xaf, 0x8d, 0x52, 0x7c, 0x86, 0x44, 0x60, 0x24, 0x2e, 0xd8, 0x90, 0xa1, 0x9d, - 0x8c, 0x8d, 0xa5, 0x77, 0x98, 0x7b, 0xdb, 0xd8, 0x84, 0x85, 0x3b, 0x57, 0x26, 0xfe, 0x15, 0xff, - 0x05, 0x4b, 0x96, 0xae, 0x88, 0x01, 0x7f, 0x85, 0x2b, 0x33, 0xf7, 0x31, 0x9d, 0x69, 0x3b, 0x95, - 0xaa, 0x71, 0x45, 0x39, 0xf7, 0x3b, 0xdf, 0xfd, 0xce, 0x77, 0xce, 0x3d, 0x2d, 0xcc, 0x55, 0x09, - 0x3d, 0x24, 0xb4, 0x6c, 0x93, 0x76, 0xf9, 0xa8, 0x65, 0xb9, 0x9d, 0x92, 0xe3, 0x12, 0x46, 0x10, - 0x88, 0x78, 0xc9, 0x26, 0x6d, 0x7d, 0x41, 0x62, 0xf8, 0x79, 0xd9, 0x31, 0xed, 0x7a, 0xd3, 0x64, - 0x75, 0xd2, 0x14, 0x50, 0x7d, 0xd6, 0x26, 0x36, 0xe1, 0x1f, 0xcb, 0xde, 0x27, 0x15, 0x0d, 0x10, - 0xdb, 0xa4, 0x2d, 0xa2, 0xf8, 0x3e, 0xcc, 0xee, 0x78, 0x2c, 0xdb, 0x2e, 0x71, 0x08, 0x35, 0x1b, - 0x86, 0x75, 0xd4, 0xb2, 0x28, 0x43, 0x05, 0xc8, 0x3a, 0x32, 0xb4, 0x5f, 0xaf, 0xe5, 0xb4, 0xa2, - 0xb6, 0x98, 0x34, 0x40, 0x85, 0x5e, 0xd5, 0xf0, 0x16, 0x5c, 0xeb, 0x49, 0xa4, 0x0e, 0x69, 0x52, - 0x0b, 0xdd, 0x83, 0xb4, 0x82, 0xf1, 0xb4, 0xec, 0xca, 0x6c, 0xa9, 0xab, 0xbd, 0xa4, 0xf0, 0x95, - 0xe4, 0xc9, 0x59, 0x21, 0x66, 0xf8, 0x58, 0xfc, 0x35, 0xde, 0xc3, 0x48, 0x95, 0x96, 0x0d, 0xb8, - 0xe2, 0x6b, 0xa1, 0xcc, 0x64, 0x2d, 0xca, 0x89, 0xa7, 0x56, 0xf4, 0x41, 0xc4, 0x6f, 0x38, 0xc2, - 0x98, 0x72, 0x42, 0xff, 0xa3, 0x17, 0x90, 0x6a, 0x13, 0x66, 0xb9, 0xb9, 0x78, 0x51, 0x5b, 0x9c, - 0xa8, 0xdc, 0xfd, 0x79, 0x56, 0x58, 0xb6, 0xeb, 0xec, 0x5d, 0xeb, 0xa0, 0x54, 0x25, 0x87, 0x65, - 0x69, 0x8e, 0xf8, 0xb3, 0x4c, 0x6b, 0xef, 0xcb, 0xac, 0xe3, 0x58, 0xb4, 0xb4, 0x5e, 0xad, 0xae, - 0xd7, 0x6a, 0xae, 0x45, 0xa9, 0x21, 0xf2, 0xd1, 0x16, 0x64, 0x6a, 0x96, 0x43, 0x68, 0x9d, 0x11, - 0x37, 0x97, 0xf8, 0x53, 0xb2, 0x2e, 0x07, 0x7a, 0x08, 0xd0, 0x6d, 0x61, 0x2e, 0xc9, 0x2d, 0xbb, - 0xae, 0x2a, 0x13, 0x23, 0xb0, 0x6d, 0xda, 0x96, 0x74, 0xc3, 0x08, 0x80, 0xf1, 0x47, 0x0d, 0xe6, - 0x7a, 0x3d, 0x93, 0x6d, 0x78, 0x00, 0x19, 0xe5, 0x80, 0x67, 0x57, 0xe2, 0x37, 0x7d, 0xe8, 0x82, - 0xd1, 0x12, 0x24, 0x5c, 0x8b, 0x72, 0x9f, 0xb2, 0x5d, 0x8b, 0x83, 0x42, 0xc4, 0x15, 0x86, 0x07, - 0xc3, 0xc7, 0x30, 0xcd, 0x15, 0xbc, 0x25, 0xcc, 0xba, 0xec, 0xf0, 0xfc, 0xb3, 0x66, 0xe0, 0xc7, - 0x70, 0x35, 0x70, 0xbb, 0x2c, 0xfd, 0x0e, 0x24, 0xbd, 0x53, 0x39, 0x7d, 0xd3, 0xc1, 0xaa, 0x3d, - 0x9c, 0xac, 0x98, 0x63, 0x30, 0x09, 0x10, 0xd0, 0x4b, 0xeb, 0x0f, 0xb7, 0x2c, 0x3e, 0x4a, 0xcb, - 0x1c, 0x40, 0xc1, 0x0b, 0xa5, 0xe4, 0x25, 0x61, 0x88, 0xea, 0x54, 0x94, 0x66, 0x01, 0x1a, 0xb1, - 0x43, 0x6b, 0xf2, 0xc6, 0x6d, 0xd3, 0x35, 0x0f, 0x43, 0x35, 0xf2, 0xc0, 0xbe, 0xe7, 0x2d, 0xaf, - 0x31, 0xe3, 0x09, 0xf5, 0x42, 0xbb, 0x1d, 0xc7, 0xc2, 0x3f, 0x34, 0x98, 0x09, 0xe5, 0x49, 0xa9, - 0x1b, 0x30, 0xd9, 0x26, 0xac, 0xde, 0xb4, 0xf7, 0x05, 0x58, 0xda, 0x9c, 0xeb, 0x91, 0x5c, 0x6f, - 0xda, 0x22, 0x51, 0x4a, 0x9f, 0x68, 0x07, 0x62, 0xe8, 0x39, 0x4c, 0xc9, 0x07, 0xa0, 0x58, 0x7a, - 0x4c, 0xf4, 0x58, 0x9e, 0x0a, 0x44, 0x88, 0x66, 0xb2, 0x16, 0x0c, 0xa2, 0x27, 0x30, 0xc1, 0xcc, - 0x46, 0xa3, 0xa3, 0x58, 0x12, 0x9c, 0x65, 0x3e, 0xc8, 0xb2, 0xeb, 0x9d, 0x87, 0x38, 0xb2, 0xac, - 0x1b, 0xc2, 0x9f, 0x54, 0x99, 0xf2, 0xb6, 0x4b, 0xcf, 0x40, 0x68, 0x0f, 0xc4, 0xff, 0x7e, 0x0f, - 0xe0, 0x4d, 0xb9, 0x8a, 0x7d, 0x21, 0xd2, 0xf0, 0x55, 0x18, 0x97, 0x20, 0x69, 0xf5, 0xcc, 0x00, - 0x93, 0x64, 0x69, 0x0a, 0x89, 0xdd, 0x30, 0xd9, 0x7f, 0x19, 0xed, 0x63, 0xb9, 0xc0, 0xbb, 0x77, - 0xca, 0x0a, 0xd6, 0x20, 0x2d, 0x75, 0xa9, 0x01, 0x1f, 0x52, 0x82, 0x0f, 0x1d, 0x71, 0xcc, 0x1f, - 0xc1, 0x3c, 0xbf, 0x9d, 0xf7, 0xdb, 0xb0, 0x68, 0xab, 0xc1, 0x46, 0xf8, 0x32, 0xcb, 0xf5, 0xe7, - 0xfa, 0xf6, 0xa7, 0xf8, 0xbc, 0x48, 0xf3, 0xfb, 0x67, 0x4b, 0xe0, 0xd5, 0x0b, 0xe5, 0xd8, 0x95, - 0xcf, 0x29, 0x48, 0x71, 0x46, 0xb4, 0x03, 0x69, 0xb5, 0x6a, 0x51, 0x31, 0x98, 0x3b, 0xe8, 0x6b, - 0x57, 0xbf, 0x39, 0x04, 0x21, 0xf4, 0xe0, 0x18, 0xda, 0x85, 0x8c, 0xbf, 0xef, 0x51, 0x74, 0x86, - 0xea, 0xb9, 0x8e, 0x87, 0x41, 0x7c, 0xd6, 0x67, 0x90, 0xf4, 0x36, 0x0d, 0xba, 0xd1, 0x87, 0x0e, - 0xac, 0x76, 0x7d, 0x21, 0xe2, 0xd4, 0xa7, 0x79, 0x09, 0x29, 0xbe, 0xda, 0xd0, 0x60, 0xa4, 0x2f, - 0x2a, 0x1f, 0x75, 0xec, 0x33, 0x6d, 0xc2, 0x98, 0x7c, 0xe5, 0xfd, 0xd8, 0xd0, 0x2e, 0xd3, 0x0b, - 0x91, 0xe7, 0x3e, 0xd9, 0x6b, 0x18, 0x97, 0x63, 0x86, 0xfa, 0xd1, 0xe1, 0xa7, 0xaf, 0x17, 0xa3, - 0x01, 0x3e, 0xdf, 0x0e, 0xa4, 0xd5, 0x98, 0xa3, 0x48, 0x3c, 0x8d, 0x6e, 0x6b, 0xef, 0x1b, 0xc1, - 0x31, 0xb4, 0x07, 0xd9, 0xc0, 0x3c, 0xa1, 0x5b, 0x7d, 0x39, 0xfd, 0x93, 0xad, 0xdf, 0x1e, 0x0e, - 0x52, 0xdc, 0x95, 0xca, 0xc9, 0x79, 0x5e, 0x3b, 0x3d, 0xcf, 0x6b, 0xdf, 0xcf, 0xf3, 0xda, 0x97, - 0x8b, 0x7c, 0xec, 0xf4, 0x22, 0x1f, 0xfb, 0x76, 0x91, 0x8f, 0xed, 0x2d, 0x0e, 0xdd, 0x57, 0x1f, - 0xf8, 0xcf, 0x45, 0xbe, 0xb5, 0x0e, 0xc6, 0xf8, 0x2f, 0xc6, 0xd5, 0x5f, 0x01, 0x00, 0x00, 0xff, - 0xff, 0xcc, 0x3b, 0x6c, 0xf4, 0xa2, 0x0a, 0x00, 0x00, + // 808 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xdf, 0x4f, 0xd3, 0x50, + 0x14, 0x5e, 0xc7, 0x06, 0xdb, 0x19, 0x20, 0x5e, 0x10, 0x66, 0x23, 0xdb, 0xac, 0x3e, 0x10, 0x23, + 0x5b, 0x84, 0xa0, 0xc2, 0x8b, 0x32, 0xfc, 0x19, 0x12, 0x81, 0x49, 0x7c, 0xe0, 0x85, 0x94, 0xb5, + 0xa9, 0x8d, 0x63, 0xb7, 0xf4, 0xde, 0x2d, 0x2e, 0x31, 0xbe, 0x9a, 0x98, 0x68, 0xfc, 0x57, 0xfc, + 0x2f, 0x78, 0xe4, 0xd1, 0x27, 0x62, 0xc0, 0xbf, 0xc2, 0x27, 0xd3, 0xfb, 0xa3, 0x6b, 0xd7, 0x75, + 0x4e, 0x31, 0x3e, 0x31, 0xce, 0xfd, 0xce, 0x77, 0xbf, 0xf3, 0x9d, 0xd3, 0xd3, 0xc2, 0x6c, 0x1d, + 0x93, 0x43, 0x4c, 0x2a, 0x16, 0x6e, 0x57, 0x8e, 0x5a, 0xa6, 0xdb, 0x29, 0x3b, 0x2e, 0xa6, 0x18, + 0x01, 0x8f, 0x97, 0x2d, 0xdc, 0x56, 0xe7, 0x05, 0x86, 0x9d, 0x57, 0x1c, 0xdd, 0xb2, 0x9b, 0x3a, + 0xb5, 0x71, 0x93, 0x43, 0xd5, 0x19, 0x0b, 0x5b, 0x98, 0xfd, 0xac, 0x78, 0xbf, 0x64, 0x34, 0x40, + 0x6c, 0xe1, 0x36, 0x8f, 0x6a, 0xf7, 0x60, 0x66, 0xc7, 0x63, 0xd9, 0x76, 0xb1, 0x83, 0x89, 0xde, + 0xa8, 0x99, 0x47, 0x2d, 0x93, 0x50, 0x54, 0x84, 0x9c, 0x23, 0x42, 0xfb, 0xb6, 0x91, 0x57, 0x4a, + 0xca, 0x42, 0xaa, 0x06, 0x32, 0xf4, 0xdc, 0xd0, 0xb6, 0xe0, 0x4a, 0x4f, 0x22, 0x71, 0x70, 0x93, + 0x98, 0xe8, 0x2e, 0x64, 0x24, 0x8c, 0xa5, 0xe5, 0x96, 0x66, 0xca, 0x5d, 0xed, 0x65, 0x89, 0xaf, + 0xa6, 0x8e, 0x4f, 0x8b, 0x89, 0x9a, 0x8f, 0xd5, 0xbe, 0x26, 0x7b, 0x18, 0x89, 0xd4, 0xb2, 0x01, + 0x97, 0x7c, 0x2d, 0x84, 0xea, 0xb4, 0x45, 0x18, 0xf1, 0xe4, 0x92, 0xda, 0x8f, 0xf8, 0x25, 0x43, + 0xd4, 0x26, 0x9d, 0xd0, 0xff, 0xe8, 0x29, 0xa4, 0xdb, 0x98, 0x9a, 0x6e, 0x3e, 0x59, 0x52, 0x16, + 0xc6, 0xab, 0x77, 0x7e, 0x9e, 0x16, 0x17, 0x2d, 0x9b, 0xbe, 0x6e, 0x1d, 0x94, 0xeb, 0xf8, 0xb0, + 0x22, 0xcc, 0xe1, 0x7f, 0x16, 0x89, 0xf1, 0xa6, 0x42, 0x3b, 0x8e, 0x49, 0xca, 0xeb, 0xf5, 0xfa, + 0xba, 0x61, 0xb8, 0x26, 0x21, 0x35, 0x9e, 0x8f, 0xb6, 0x20, 0x6b, 0x98, 0x0e, 0x26, 0x36, 0xc5, + 0x6e, 0x7e, 0xe4, 0x6f, 0xc9, 0xba, 0x1c, 0x68, 0x15, 0xa0, 0xdb, 0xc2, 0x7c, 0x8a, 0x59, 0x76, + 0x55, 0x56, 0xc6, 0x47, 0x60, 0x5b, 0xb7, 0x4c, 0xe1, 0x46, 0x2d, 0x00, 0xd6, 0x3e, 0x2b, 0x30, + 0xdb, 0xeb, 0x99, 0x68, 0xc3, 0x7d, 0xc8, 0x4a, 0x07, 0x3c, 0xbb, 0x46, 0x7e, 0xd3, 0x87, 0x2e, + 0x18, 0xad, 0x85, 0xf4, 0x24, 0x99, 0x1e, 0xb5, 0x9f, 0x1e, 0x7e, 0x53, 0x48, 0xd0, 0x3b, 0x98, + 0x62, 0x7a, 0x5e, 0x61, 0x6a, 0x0e, 0x3b, 0x4a, 0xff, 0xac, 0x35, 0xda, 0x03, 0xb8, 0x1c, 0xb8, + 0x5d, 0x18, 0x71, 0x0b, 0x52, 0xde, 0xa9, 0x98, 0xc5, 0xa9, 0xa0, 0x07, 0x1e, 0x4e, 0xd4, 0xcf, + 0x30, 0x1a, 0x0e, 0x10, 0x90, 0xa1, 0xf5, 0xaf, 0xf6, 0x31, 0x6c, 0xc8, 0x06, 0xbe, 0x07, 0x14, + 0xbc, 0x50, 0x48, 0xbe, 0xcd, 0x0d, 0x91, 0x7d, 0x8b, 0xd3, 0xcc, 0x41, 0x17, 0xea, 0xd7, 0x8a, + 0xb8, 0x7f, 0x5b, 0x77, 0xf5, 0xc3, 0x50, 0xc5, 0x2c, 0xb0, 0xef, 0x39, 0xcd, 0x2a, 0xce, 0x7a, + 0x69, 0x5e, 0x68, 0xb7, 0xe3, 0x98, 0xda, 0x0f, 0x05, 0xa6, 0x43, 0x79, 0x42, 0xf8, 0x06, 0x4c, + 0xb4, 0x31, 0xb5, 0x9b, 0xd6, 0x3e, 0x07, 0x0b, 0xd3, 0xf3, 0x3d, 0x05, 0xd8, 0x4d, 0x8b, 0x27, + 0x8a, 0x42, 0xc6, 0xdb, 0x81, 0x18, 0x7a, 0x02, 0x93, 0xe2, 0xe1, 0x90, 0x2c, 0x3d, 0x96, 0x7a, + 0x2c, 0x8f, 0x38, 0x22, 0x44, 0x33, 0x61, 0x04, 0x83, 0xe8, 0x21, 0x8c, 0x53, 0xbd, 0xd1, 0xe8, + 0x48, 0x96, 0x11, 0xc6, 0x32, 0x17, 0x64, 0xd9, 0xf5, 0xce, 0x43, 0x1c, 0x39, 0xda, 0x0d, 0x69, + 0x1f, 0x64, 0x99, 0xe2, 0xb6, 0xa1, 0x27, 0x22, 0xb4, 0x23, 0x92, 0x17, 0xdf, 0x11, 0xda, 0xa6, + 0x58, 0xd3, 0xbe, 0x10, 0x61, 0xf8, 0x32, 0x8c, 0x09, 0x90, 0xb0, 0x7a, 0xba, 0x8f, 0x49, 0xa2, + 0x34, 0x89, 0xd4, 0xdc, 0x30, 0xd9, 0x7f, 0x19, 0xf4, 0x8f, 0x8a, 0xd8, 0xee, 0xdd, 0x4b, 0x45, + 0x09, 0x2b, 0x90, 0x11, 0xc2, 0xe4, 0xbc, 0x0f, 0xa8, 0xc1, 0x87, 0x5e, 0x68, 0xea, 0xd7, 0x60, + 0x8e, 0x69, 0x61, 0xed, 0xaf, 0x99, 0xa4, 0xd5, 0xa0, 0x7f, 0xf0, 0xde, 0xcb, 0x47, 0x73, 0xfd, + 0x6e, 0xa4, 0xd9, 0xf8, 0x88, 0x5e, 0x44, 0x47, 0x8d, 0xe3, 0xe5, 0xe3, 0xcb, 0xb0, 0x4b, 0x9f, + 0xd2, 0x90, 0x66, 0x8c, 0x68, 0x07, 0x32, 0x72, 0x2b, 0xa3, 0x52, 0x30, 0xb7, 0xdf, 0x1b, 0x5a, + 0xbd, 0x3e, 0x00, 0xc1, 0xf5, 0x68, 0x09, 0xb4, 0x0b, 0x59, 0xff, 0xd5, 0x80, 0xe2, 0x33, 0xe4, + 0x08, 0xa8, 0xda, 0x20, 0x88, 0xcf, 0xfa, 0x18, 0x52, 0xde, 0x1a, 0x42, 0xd7, 0x22, 0xe8, 0xc0, + 0xde, 0x57, 0xe7, 0x63, 0x4e, 0x7d, 0x9a, 0x67, 0x90, 0x66, 0x7b, 0x0f, 0xf5, 0x47, 0xfa, 0xa2, + 0x0a, 0x71, 0xc7, 0x3e, 0xd3, 0x26, 0x8c, 0x8a, 0x87, 0x3e, 0x8a, 0x0d, 0xad, 0x36, 0xb5, 0x18, + 0x7b, 0xee, 0x93, 0xbd, 0x80, 0x31, 0x31, 0x74, 0x28, 0x8a, 0x0e, 0x6f, 0x02, 0xb5, 0x14, 0x0f, + 0xf0, 0xf9, 0x76, 0x20, 0x23, 0x87, 0x1e, 0xc5, 0xe2, 0x49, 0x7c, 0x5b, 0x7b, 0x9f, 0x18, 0x2d, + 0x81, 0xf6, 0x20, 0x17, 0x98, 0x27, 0x74, 0x23, 0x92, 0x13, 0x9d, 0x6c, 0xf5, 0xe6, 0x60, 0x90, + 0xe4, 0xae, 0x56, 0x8f, 0xcf, 0x0a, 0xca, 0xc9, 0x59, 0x41, 0xf9, 0x7e, 0x56, 0x50, 0xbe, 0x9c, + 0x17, 0x12, 0x27, 0xe7, 0x85, 0xc4, 0xb7, 0xf3, 0x42, 0x62, 0x6f, 0x61, 0xe0, 0xfa, 0x7a, 0xcb, + 0xbe, 0x2c, 0xd9, 0x12, 0x3b, 0x18, 0x65, 0x1f, 0x97, 0xcb, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, + 0x93, 0x13, 0x79, 0x06, 0xcd, 0x0a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1416,9 +1416,9 @@ func (m *QueryProposalsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l - if m.Res != nil { + if m.Pagination != nil { { - size, err := m.Res.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1573,9 +1573,9 @@ func (m *QueryVotesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Res != nil { + if m.Pagination != nil { { - size, err := m.Res.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1813,9 +1813,9 @@ func (m *QueryDepositsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Res != nil { + if m.Pagination != nil { { - size, err := m.Res.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1973,8 +1973,8 @@ func (m *QueryProposalsResponse) Size() (n int) { n += 1 + l + sovQuery(uint64(l)) } } - if m.Res != nil { - l = m.Res.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -2035,8 +2035,8 @@ func (m *QueryVotesResponse) Size() (n int) { n += 1 + l + sovQuery(uint64(l)) } } - if m.Res != nil { - l = m.Res.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -2125,8 +2125,8 @@ func (m *QueryDepositsResponse) Size() (n int) { n += 1 + l + sovQuery(uint64(l)) } } - if m.Res != nil { - l = m.Res.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -2560,7 +2560,7 @@ func (m *QueryProposalsResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Res", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -2587,10 +2587,10 @@ func (m *QueryProposalsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Res == nil { - m.Res = &query.PageResponse{} + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} } - if err := m.Res.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -2983,7 +2983,7 @@ func (m *QueryVotesResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Res", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -3010,10 +3010,10 @@ func (m *QueryVotesResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Res == nil { - m.Res = &query.PageResponse{} + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} } - if err := m.Res.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -3643,7 +3643,7 @@ func (m *QueryDepositsResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Res", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -3670,10 +3670,10 @@ func (m *QueryDepositsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Res == nil { - m.Res = &query.PageResponse{} + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} } - if err := m.Res.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/ibc/03-connection/keeper/grpc_query.go b/x/ibc/03-connection/keeper/grpc_query.go index bacb3e874b32..cbfd4586c4a9 100644 --- a/x/ibc/03-connection/keeper/grpc_query.go +++ b/x/ibc/03-connection/keeper/grpc_query.go @@ -52,7 +52,7 @@ func (q Keeper) Connections(c context.Context, req *types.QueryConnectionsReques connections := []*types.ConnectionEnd{} store := prefix.NewStore(ctx.KVStore(q.storeKey), host.KeyConnectionPrefix) - res, err := query.Paginate(store, req.Pagination, func(_, value []byte) error { + pageRes, err := query.Paginate(store, req.Pagination, func(_, value []byte) error { var result types.ConnectionEnd if err := q.cdc.UnmarshalBinaryBare(value, &result); err != nil { return err @@ -68,7 +68,7 @@ func (q Keeper) Connections(c context.Context, req *types.QueryConnectionsReques return &types.QueryConnectionsResponse{ Connections: connections, - Res: res, + Pagination: pageRes, Height: ctx.BlockHeight(), }, nil } diff --git a/x/ibc/03-connection/types/query.pb.go b/x/ibc/03-connection/types/query.pb.go index c69f30cfa183..d49e6baac498 100644 --- a/x/ibc/03-connection/types/query.pb.go +++ b/x/ibc/03-connection/types/query.pb.go @@ -200,7 +200,7 @@ type QueryConnectionsResponse struct { // list of stored connections of the chain. Connections []*ConnectionEnd `protobuf:"bytes,1,rep,name=connections,proto3" json:"connections,omitempty"` // pagination response - Res *query.PageResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` // query block height Height int64 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"` } @@ -245,9 +245,9 @@ func (m *QueryConnectionsResponse) GetConnections() []*ConnectionEnd { return nil } -func (m *QueryConnectionsResponse) GetRes() *query.PageResponse { +func (m *QueryConnectionsResponse) GetPagination() *query.PageResponse { if m != nil { - return m.Res + return m.Pagination } return nil } @@ -393,39 +393,39 @@ func init() { proto.RegisterFile("ibc/connection/query.proto", fileDescriptor_5e var fileDescriptor_5ee60d8b08ce3606 = []byte{ // 529 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0xce, 0x36, 0x6d, 0xd5, 0x4c, 0x0c, 0x94, 0x55, 0x55, 0x8c, 0xa5, 0x38, 0xc1, 0x07, 0x48, - 0x25, 0x62, 0xa3, 0x54, 0x20, 0x71, 0x40, 0x48, 0xa5, 0x48, 0x84, 0x0b, 0x61, 0xc5, 0x89, 0x4b, - 0xe4, 0x9f, 0xc5, 0xb6, 0xa0, 0x5e, 0x37, 0xbb, 0x91, 0xe8, 0x5b, 0xf0, 0x0a, 0x88, 0x17, 0xe0, - 0x19, 0x38, 0x71, 0xec, 0x91, 0x53, 0x85, 0x9c, 0x17, 0x41, 0xde, 0x75, 0xba, 0xa6, 0x49, 0x15, - 0x2e, 0x9c, 0xbc, 0x3b, 0xf3, 0xcd, 0xcf, 0xf7, 0xcd, 0x7a, 0xc0, 0x4a, 0x83, 0xd0, 0x0b, 0x59, - 0x96, 0xd1, 0x50, 0xa4, 0x2c, 0xf3, 0x4e, 0x67, 0x74, 0x7a, 0xe6, 0xe6, 0x53, 0x26, 0x18, 0xbe, - 0x99, 0x06, 0xa1, 0xab, 0x7d, 0xd6, 0x5e, 0xcc, 0x62, 0x26, 0x5d, 0x5e, 0x79, 0x52, 0x28, 0xab, - 0x13, 0x32, 0x7e, 0xc2, 0xb8, 0x8a, 0xf4, 0x72, 0x3f, 0x4e, 0x33, 0xbf, 0x84, 0x57, 0xee, 0xee, - 0x95, 0x02, 0xfa, 0xa8, 0x00, 0xce, 0x1b, 0xd8, 0x7f, 0x5b, 0x86, 0xbe, 0xb8, 0x74, 0x10, 0x7a, - 0x3a, 0xa3, 0x5c, 0xe0, 0xc7, 0x70, 0x43, 0xa3, 0x27, 0x69, 0x64, 0xa2, 0x1e, 0xea, 0xb7, 0x8e, - 0x76, 0x8b, 0x8b, 0xae, 0xa1, 0xd1, 0xa3, 0x63, 0x62, 0x68, 0xd8, 0x28, 0x72, 0xbe, 0x23, 0xb8, - 0xb3, 0x94, 0x91, 0xe7, 0x2c, 0xe3, 0x14, 0x3f, 0x03, 0xd0, 0x58, 0x99, 0xaf, 0x3d, 0xec, 0xb8, - 0x7f, 0xf3, 0x74, 0x75, 0xdc, 0xcb, 0x2c, 0x22, 0xb5, 0x00, 0xbc, 0x07, 0x5b, 0xf9, 0x94, 0xb1, - 0x0f, 0xe6, 0x46, 0x0f, 0xf5, 0x0d, 0xa2, 0x2e, 0xb8, 0x03, 0x20, 0x0f, 0x93, 0xdc, 0x17, 0x89, - 0xd9, 0x2c, 0x9b, 0x24, 0x2d, 0x69, 0x19, 0xfb, 0x22, 0xc1, 0xf7, 0xc0, 0x50, 0xee, 0x84, 0xa6, - 0x71, 0x22, 0xcc, 0xcd, 0x1e, 0xea, 0x6f, 0x92, 0xb6, 0xb4, 0xbd, 0x92, 0x26, 0xe7, 0xdd, 0x52, - 0xc7, 0x7c, 0x21, 0xc2, 0x53, 0x00, 0xad, 0x69, 0xd5, 0xf1, 0x5d, 0x57, 0x69, 0xee, 0xaa, 0x69, - 0x8d, 0xfd, 0x98, 0x56, 0x70, 0x52, 0x03, 0x3b, 0x5f, 0x11, 0x98, 0xcb, 0x69, 0x2b, 0x25, 0x9e, - 0x43, 0x5b, 0x13, 0xe3, 0x26, 0xea, 0x35, 0xd7, 0x4b, 0x51, 0x8f, 0xc0, 0x0f, 0xa1, 0x39, 0xa5, - 0x5c, 0x2a, 0xd1, 0x1e, 0x5a, 0xab, 0x3a, 0x52, 0x95, 0x48, 0x09, 0xc3, 0xfb, 0xb0, 0x5d, 0xd1, - 0x2f, 0xf5, 0x69, 0x92, 0xea, 0xe6, 0xbc, 0x86, 0x8e, 0x6a, 0xf1, 0x53, 0x4a, 0x33, 0xb1, 0x82, - 0xff, 0x01, 0xb4, 0x42, 0xe9, 0xd3, 0x0f, 0xc0, 0x28, 0x2e, 0xba, 0x3b, 0x2a, 0x60, 0x74, 0x4c, - 0x76, 0x94, 0x7b, 0x14, 0x39, 0xdf, 0x10, 0xd8, 0xd7, 0x25, 0xab, 0x58, 0x1f, 0xc0, 0x6e, 0xed, - 0x49, 0x95, 0xf3, 0x52, 0xd4, 0x5b, 0xe4, 0x96, 0xb6, 0x97, 0x53, 0xe3, 0xff, 0x6b, 0xd6, 0xc3, - 0x1f, 0x1b, 0xb0, 0x25, 0xbb, 0xc4, 0x13, 0x00, 0xdd, 0x23, 0xbe, 0x7f, 0x55, 0xfb, 0xd5, 0x7f, - 0x85, 0xf5, 0x60, 0x2d, 0x4e, 0x71, 0x75, 0x1a, 0x38, 0x80, 0x76, 0x4d, 0x04, 0xbc, 0x2e, 0x72, - 0xa1, 0xb9, 0xd5, 0x5f, 0x0f, 0xbc, 0xac, 0x21, 0xe0, 0xf6, 0x92, 0xdc, 0x78, 0xb0, 0x3a, 0xc1, - 0x35, 0x33, 0xb6, 0xdc, 0x7f, 0x85, 0x2f, 0xaa, 0x1e, 0x8d, 0x7f, 0x16, 0x36, 0x3a, 0x2f, 0x6c, - 0xf4, 0xbb, 0xb0, 0xd1, 0x97, 0xb9, 0xdd, 0x38, 0x9f, 0xdb, 0x8d, 0x5f, 0x73, 0xbb, 0xf1, 0xfe, - 0x49, 0x9c, 0x8a, 0x64, 0x16, 0xb8, 0x21, 0x3b, 0xf1, 0xaa, 0xcd, 0xa4, 0x3e, 0x03, 0x1e, 0x7d, - 0xf4, 0x3e, 0x7b, 0xe5, 0x3a, 0x7a, 0x74, 0x38, 0xa8, 0x6d, 0x24, 0x71, 0x96, 0x53, 0x1e, 0x6c, - 0xcb, 0x6d, 0x74, 0xf8, 0x27, 0x00, 0x00, 0xff, 0xff, 0x85, 0x37, 0x97, 0x80, 0x11, 0x05, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xcf, 0x6e, 0xd3, 0x4e, + 0x10, 0xce, 0x26, 0x6d, 0xd5, 0x4c, 0xfc, 0xfb, 0x51, 0x56, 0x55, 0x31, 0x96, 0xe2, 0x04, 0x1f, + 0x20, 0x3d, 0xc4, 0x46, 0xad, 0x40, 0x02, 0x09, 0x21, 0x95, 0x22, 0x11, 0x2e, 0x84, 0x15, 0x27, + 0x2e, 0x91, 0xff, 0x2c, 0xb6, 0x05, 0xf5, 0xba, 0xd9, 0x8d, 0x44, 0xdf, 0x82, 0x77, 0xe0, 0x01, + 0xe0, 0x19, 0x38, 0x71, 0xec, 0x91, 0x53, 0x85, 0x9c, 0x17, 0x41, 0xde, 0x75, 0xba, 0x6e, 0x93, + 0x2a, 0x5c, 0x38, 0x65, 0x3d, 0xf3, 0x7d, 0x33, 0xdf, 0x7e, 0xb3, 0x19, 0xb0, 0xd2, 0x20, 0xf4, + 0x42, 0x96, 0x65, 0x34, 0x14, 0x29, 0xcb, 0xbc, 0xd3, 0x19, 0x9d, 0x9e, 0xb9, 0xf9, 0x94, 0x09, + 0x86, 0xff, 0x4f, 0x83, 0xd0, 0xd5, 0x39, 0x6b, 0x37, 0x66, 0x31, 0x93, 0x29, 0xaf, 0x3c, 0x29, + 0x94, 0xd5, 0x0d, 0x19, 0x3f, 0x61, 0x5c, 0x31, 0xbd, 0xdc, 0x8f, 0xd3, 0xcc, 0x2f, 0xe1, 0x55, + 0xba, 0x77, 0xad, 0x81, 0x3e, 0x2a, 0x80, 0xf3, 0x06, 0xf6, 0xde, 0x96, 0xd4, 0x17, 0x97, 0x09, + 0x42, 0x4f, 0x67, 0x94, 0x0b, 0xfc, 0x08, 0xfe, 0xd3, 0xe8, 0x49, 0x1a, 0x99, 0xa8, 0x8f, 0x06, + 0xed, 0xa3, 0x9d, 0xe2, 0xa2, 0x67, 0x68, 0xf4, 0xe8, 0x98, 0x18, 0x1a, 0x36, 0x8a, 0x9c, 0xef, + 0x08, 0xee, 0x2c, 0x55, 0xe4, 0x39, 0xcb, 0x38, 0xc5, 0xcf, 0x00, 0x34, 0x56, 0xd6, 0xeb, 0x1c, + 0x74, 0xdd, 0xab, 0xf7, 0x74, 0x35, 0xef, 0x65, 0x16, 0x91, 0x1a, 0x01, 0xef, 0xc2, 0x66, 0x3e, + 0x65, 0xec, 0x83, 0xd9, 0xec, 0xa3, 0x81, 0x41, 0xd4, 0x07, 0xee, 0x02, 0xc8, 0xc3, 0x24, 0xf7, + 0x45, 0x62, 0xb6, 0x4a, 0x91, 0xa4, 0x2d, 0x23, 0x63, 0x5f, 0x24, 0xf8, 0x1e, 0x18, 0x2a, 0x9d, + 0xd0, 0x34, 0x4e, 0x84, 0xb9, 0xd1, 0x47, 0x83, 0x0d, 0xd2, 0x91, 0xb1, 0x57, 0x32, 0xe4, 0xbc, + 0x5b, 0x52, 0xcc, 0x17, 0x26, 0x3c, 0x01, 0xd0, 0x9e, 0x56, 0x8a, 0xef, 0xba, 0xca, 0x73, 0x57, + 0x4d, 0x6b, 0xec, 0xc7, 0xb4, 0x82, 0x93, 0x1a, 0xd8, 0xf9, 0x86, 0xc0, 0x5c, 0x2e, 0x5b, 0x39, + 0xf1, 0x1c, 0x3a, 0xfa, 0x62, 0xdc, 0x44, 0xfd, 0xd6, 0x7a, 0x2b, 0xea, 0x0c, 0xfc, 0xf4, 0x8a, + 0xb0, 0xa6, 0x14, 0x66, 0xad, 0x12, 0xa6, 0x1a, 0xd6, 0x95, 0xe1, 0x3d, 0xd8, 0xaa, 0xcc, 0x28, + 0xdd, 0x6a, 0x91, 0xea, 0xcb, 0x79, 0x0d, 0x5d, 0x25, 0xf8, 0x53, 0x4a, 0x33, 0xb1, 0xc2, 0x8d, + 0x7d, 0x68, 0x87, 0x32, 0xa7, 0x9f, 0x83, 0x51, 0x5c, 0xf4, 0xb6, 0x15, 0x61, 0x74, 0x4c, 0xb6, + 0x55, 0x7a, 0x14, 0x39, 0x5f, 0x11, 0xd8, 0x37, 0x15, 0xab, 0x3c, 0xd8, 0x87, 0x9d, 0xda, 0x03, + 0x2b, 0xa7, 0xa7, 0x8c, 0x68, 0x93, 0x5b, 0x3a, 0x5e, 0xce, 0x90, 0xff, 0xab, 0xc9, 0x1f, 0xfc, + 0x68, 0xc2, 0xa6, 0x54, 0x89, 0x27, 0x00, 0x5a, 0x23, 0xbe, 0x7f, 0x7d, 0x12, 0xab, 0xff, 0x23, + 0xd6, 0x83, 0xb5, 0x38, 0x75, 0x57, 0xa7, 0x81, 0x03, 0xe8, 0xd4, 0x4c, 0xc0, 0xeb, 0x98, 0x0b, + 0xcf, 0xad, 0xc1, 0x7a, 0xe0, 0x65, 0x0f, 0x01, 0xb7, 0x97, 0xec, 0xc6, 0xc3, 0xd5, 0x05, 0x6e, + 0x98, 0xb1, 0xe5, 0xfe, 0x2d, 0x7c, 0xd1, 0xf5, 0x68, 0xfc, 0xb3, 0xb0, 0xd1, 0x79, 0x61, 0xa3, + 0xdf, 0x85, 0x8d, 0xbe, 0xcc, 0xed, 0xc6, 0xf9, 0xdc, 0x6e, 0xfc, 0x9a, 0xdb, 0x8d, 0xf7, 0x8f, + 0xe3, 0x54, 0x24, 0xb3, 0xc0, 0x0d, 0xd9, 0x89, 0x57, 0xed, 0x29, 0xf5, 0x33, 0xe4, 0xd1, 0x47, + 0xef, 0xb3, 0x57, 0x2e, 0xa7, 0x87, 0x87, 0xc3, 0xda, 0x7e, 0x12, 0x67, 0x39, 0xe5, 0xc1, 0x96, + 0xdc, 0x4d, 0x87, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xed, 0x4b, 0x0d, 0x29, 0x1f, 0x05, 0x00, 0x00, } @@ -731,9 +731,9 @@ func (m *QueryConnectionsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error i-- dAtA[i] = 0x18 } - if m.Res != nil { + if m.Pagination != nil { { - size, err := m.Res.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -914,8 +914,8 @@ func (m *QueryConnectionsResponse) Size() (n int) { n += 1 + l + sovQuery(uint64(l)) } } - if m.Res != nil { - l = m.Res.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } if m.Height != 0 { @@ -1382,7 +1382,7 @@ func (m *QueryConnectionsResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Res", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -1409,10 +1409,10 @@ func (m *QueryConnectionsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Res == nil { - m.Res = &query.PageResponse{} + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} } - if err := m.Res.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/ibc/04-channel/keeper/grpc_query.go b/x/ibc/04-channel/keeper/grpc_query.go index c830e45b29ff..17692deee36f 100644 --- a/x/ibc/04-channel/keeper/grpc_query.go +++ b/x/ibc/04-channel/keeper/grpc_query.go @@ -51,7 +51,7 @@ func (q Keeper) Channels(c context.Context, req *types.QueryChannelsRequest) (*t channels := []*types.IdentifiedChannel{} store := prefix.NewStore(ctx.KVStore(q.storeKey), []byte(host.KeyChannelPrefix)) - res, err := query.Paginate(store, req.Pagination, func(key, value []byte) error { + pageRes, err := query.Paginate(store, req.Pagination, func(key, value []byte) error { var result types.Channel if err := q.cdc.UnmarshalBinaryBare(value, &result); err != nil { return err @@ -72,9 +72,9 @@ func (q Keeper) Channels(c context.Context, req *types.QueryChannelsRequest) (*t } return &types.QueryChannelsResponse{ - Channels: channels, - Res: res, - Height: ctx.BlockHeight(), + Channels: channels, + Pagination: pageRes, + Height: ctx.BlockHeight(), }, nil } @@ -93,7 +93,7 @@ func (q Keeper) ConnectionChannels(c context.Context, req *types.QueryConnection channels := []*types.IdentifiedChannel{} store := prefix.NewStore(ctx.KVStore(q.storeKey), []byte(host.KeyChannelPrefix)) - res, err := query.Paginate(store, req.Pagination, func(key, value []byte) error { + pageRes, err := query.Paginate(store, req.Pagination, func(key, value []byte) error { var result types.Channel if err := q.cdc.UnmarshalBinaryBare(value, &result); err != nil { return err @@ -120,9 +120,9 @@ func (q Keeper) ConnectionChannels(c context.Context, req *types.QueryConnection } return &types.QueryConnectionChannelsResponse{ - Channels: channels, - Res: res, - Height: ctx.BlockHeight(), + Channels: channels, + Pagination: pageRes, + Height: ctx.BlockHeight(), }, nil } @@ -165,7 +165,7 @@ func (q Keeper) PacketCommitments(c context.Context, req *types.QueryPacketCommi commitments := []*types.PacketAckCommitment{} store := prefix.NewStore(ctx.KVStore(q.storeKey), []byte(host.PacketCommitmentPrefixPath(req.PortID, req.ChannelID))) - res, err := query.Paginate(store, req.Pagination, func(key, value []byte) error { + pageRes, err := query.Paginate(store, req.Pagination, func(key, value []byte) error { keySplit := strings.Split(string(key), "/") sequence, err := strconv.ParseUint(keySplit[len(keySplit)-1], 10, 64) @@ -184,7 +184,7 @@ func (q Keeper) PacketCommitments(c context.Context, req *types.QueryPacketCommi return &types.QueryPacketCommitmentsResponse{ Commitments: commitments, - Res: res, + Pagination: pageRes, Height: ctx.BlockHeight(), }, nil } diff --git a/x/ibc/04-channel/keeper/grpc_query_test.go b/x/ibc/04-channel/keeper/grpc_query_test.go index 5a0ba97a8552..988bc82b2264 100644 --- a/x/ibc/04-channel/keeper/grpc_query_test.go +++ b/x/ibc/04-channel/keeper/grpc_query_test.go @@ -177,7 +177,7 @@ func (suite *KeeperTestSuite) TestQueryChannels() { suite.Require().NoError(err) suite.Require().NotNil(res) suite.Require().Equal(expChannels, res.Channels) - suite.Require().Equal(len(expChannels), int(res.Res.Total)) + suite.Require().Equal(len(expChannels), int(res.Pagination.Total)) } else { suite.Require().Error(err) } diff --git a/x/ibc/04-channel/types/query.pb.go b/x/ibc/04-channel/types/query.pb.go index 6b00737d0351..a4b2440ac330 100644 --- a/x/ibc/04-channel/types/query.pb.go +++ b/x/ibc/04-channel/types/query.pb.go @@ -210,7 +210,7 @@ type QueryChannelsResponse struct { // list of stored channels of the chain. Channels []*IdentifiedChannel `protobuf:"bytes,1,rep,name=channels,proto3" json:"channels,omitempty"` // pagination response - Res *query.PageResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` // query block height Height int64 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"` } @@ -255,9 +255,9 @@ func (m *QueryChannelsResponse) GetChannels() []*IdentifiedChannel { return nil } -func (m *QueryChannelsResponse) GetRes() *query.PageResponse { +func (m *QueryChannelsResponse) GetPagination() *query.PageResponse { if m != nil { - return m.Res + return m.Pagination } return nil } @@ -329,7 +329,7 @@ type QueryConnectionChannelsResponse struct { // list of channels associated with a connection. Channels []*IdentifiedChannel `protobuf:"bytes,1,rep,name=channels,proto3" json:"channels,omitempty"` // pagination response - Res *query.PageResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` // query block height Height int64 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"` } @@ -374,9 +374,9 @@ func (m *QueryConnectionChannelsResponse) GetChannels() []*IdentifiedChannel { return nil } -func (m *QueryConnectionChannelsResponse) GetRes() *query.PageResponse { +func (m *QueryConnectionChannelsResponse) GetPagination() *query.PageResponse { if m != nil { - return m.Res + return m.Pagination } return nil } @@ -594,7 +594,7 @@ func (m *QueryPacketCommitmentsRequest) GetPagination() *query.PageRequest { type QueryPacketCommitmentsResponse struct { Commitments []*PacketAckCommitment `protobuf:"bytes,1,rep,name=commitments,proto3" json:"commitments,omitempty"` // pagination response - Res *query.PageResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` // query block height Height int64 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"` } @@ -639,9 +639,9 @@ func (m *QueryPacketCommitmentsResponse) GetCommitments() []*PacketAckCommitment return nil } -func (m *QueryPacketCommitmentsResponse) GetRes() *query.PageResponse { +func (m *QueryPacketCommitmentsResponse) GetPagination() *query.PageResponse { if m != nil { - return m.Res + return m.Pagination } return nil } @@ -1181,66 +1181,65 @@ func init() { func init() { proto.RegisterFile("ibc/channel/query.proto", fileDescriptor_2150995751d4f15a) } var fileDescriptor_2150995751d4f15a = []byte{ - // 931 bytes of a gzipped FileDescriptorProto + // 928 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0x41, 0x6f, 0xe3, 0x44, 0x14, 0x8e, 0x9b, 0x6c, 0xda, 0xbc, 0x14, 0xb1, 0x4c, 0x5b, 0x48, 0xcd, 0xd6, 0x4d, 0xcd, 0x25, - 0xec, 0xb6, 0x0e, 0xca, 0x72, 0x81, 0xdb, 0xb6, 0x7b, 0x20, 0x07, 0x50, 0x76, 0x56, 0x7b, 0x41, - 0x42, 0x91, 0xeb, 0xcc, 0x26, 0x56, 0x9a, 0x19, 0x37, 0x33, 0x5d, 0x5a, 0xf8, 0x0d, 0x48, 0x88, - 0x0b, 0xe2, 0xc2, 0x05, 0x89, 0x03, 0x12, 0xfc, 0x0e, 0x8e, 0x7b, 0xe4, 0x42, 0x85, 0xd2, 0xbf, - 0xc1, 0x01, 0x79, 0x66, 0xec, 0x38, 0x8e, 0x5d, 0xa5, 0x12, 0x16, 0x9c, 0x12, 0xbf, 0xf9, 0xe6, - 0xbd, 0xef, 0x7d, 0xf3, 0xcd, 0x78, 0x0c, 0xef, 0xf8, 0xa7, 0x5e, 0xdb, 0x1b, 0xb9, 0x94, 0x92, - 0xb3, 0xf6, 0xf9, 0x05, 0x99, 0x5e, 0x39, 0xc1, 0x94, 0x09, 0x86, 0xea, 0xfe, 0xa9, 0xe7, 0xe8, - 0x01, 0x73, 0x7b, 0xc8, 0x86, 0x4c, 0xc6, 0xdb, 0xe1, 0x3f, 0x05, 0x31, 0xf7, 0x3c, 0xc6, 0x27, - 0x8c, 0xab, 0x69, 0xed, 0xc0, 0x1d, 0xfa, 0xd4, 0x15, 0x3e, 0xa3, 0x7a, 0x78, 0x37, 0x99, 0x5a, - 0xff, 0xaa, 0x21, 0x7b, 0x04, 0x5b, 0xcf, 0xc2, 0x49, 0x27, 0x2a, 0x8a, 0xc9, 0xf9, 0x05, 0xe1, - 0x02, 0xbd, 0x07, 0xeb, 0x01, 0x9b, 0x8a, 0xbe, 0x3f, 0x68, 0x18, 0x4d, 0xa3, 0x55, 0x3b, 0x86, - 0xd9, 0xf5, 0x7e, 0xb5, 0xc7, 0xa6, 0xa2, 0xfb, 0x14, 0x57, 0xc3, 0xa1, 0xee, 0x00, 0x1d, 0x02, - 0xe8, 0x64, 0x21, 0x6e, 0x4d, 0xe2, 0xde, 0x98, 0x5d, 0xef, 0xd7, 0x74, 0xb2, 0xee, 0x53, 0x5c, - 0xd3, 0x80, 0xee, 0xc0, 0xfe, 0xd1, 0x80, 0xed, 0xc5, 0x52, 0x3c, 0x60, 0x94, 0x13, 0xe4, 0xc0, - 0xba, 0x46, 0xc9, 0x5a, 0xf5, 0xce, 0xb6, 0x93, 0xe8, 0xd8, 0x89, 0xe0, 0x11, 0x08, 0x6d, 0xc3, - 0xbd, 0x60, 0xca, 0xd8, 0x4b, 0x59, 0x71, 0x13, 0xab, 0x07, 0xb4, 0x07, 0x20, 0xff, 0xf4, 0x03, - 0x57, 0x8c, 0x1a, 0xe5, 0x90, 0x0c, 0xae, 0xc9, 0x48, 0xcf, 0x15, 0x23, 0x74, 0x00, 0x9b, 0x6a, - 0x78, 0x44, 0xfc, 0xe1, 0x48, 0x34, 0x2a, 0x4d, 0xa3, 0x55, 0xc1, 0x75, 0x19, 0xfb, 0x44, 0x86, - 0xec, 0x67, 0x8b, 0xfc, 0x78, 0xa4, 0xc5, 0x47, 0x00, 0x73, 0x45, 0x35, 0xc5, 0x5d, 0x47, 0x29, - 0xee, 0xa8, 0x85, 0xea, 0xb9, 0x43, 0xa2, 0xe1, 0x38, 0x01, 0xb6, 0x7f, 0x30, 0x60, 0x27, 0x95, - 0x53, 0x37, 0xfd, 0x31, 0x6c, 0xe8, 0x7e, 0x78, 0xc3, 0x68, 0x96, 0x5b, 0xf5, 0x8e, 0xb5, 0xd0, - 0x75, 0x77, 0x40, 0xa8, 0xf0, 0x5f, 0xfa, 0x64, 0x10, 0xf5, 0x1f, 0xe3, 0xd1, 0x21, 0x94, 0xa7, - 0x84, 0xcb, 0xf6, 0xeb, 0x1d, 0x33, 0x8b, 0x89, 0x2a, 0x82, 0x43, 0x18, 0x7a, 0x1b, 0xaa, 0xba, - 0xe7, 0x50, 0x94, 0x32, 0xd6, 0x4f, 0xf6, 0xd7, 0x60, 0x29, 0x6a, 0x8c, 0x52, 0xe2, 0x85, 0x74, - 0xd3, 0x8d, 0x5b, 0x00, 0x5e, 0x3c, 0xa8, 0x7c, 0x80, 0x13, 0x91, 0x94, 0x30, 0x6b, 0x77, 0x11, - 0xe6, 0x27, 0x03, 0xf6, 0x73, 0xab, 0xff, 0x6f, 0x24, 0xfa, 0xc6, 0x80, 0x07, 0x92, 0x65, 0xcf, - 0xf5, 0xc6, 0x44, 0x9c, 0xb0, 0xc9, 0xc4, 0x17, 0x13, 0x42, 0x45, 0x71, 0xdb, 0x04, 0x99, 0xb0, - 0xc1, 0xc3, 0xec, 0xd4, 0x23, 0x92, 0x4d, 0x05, 0xc7, 0xcf, 0xf6, 0xf7, 0x06, 0xec, 0xe5, 0xf0, - 0xd1, 0x9a, 0xc9, 0x25, 0x8b, 0xa2, 0x92, 0xd3, 0x26, 0x4e, 0x44, 0x0a, 0xdb, 0x3b, 0xbf, 0xe6, - 0x31, 0xe3, 0x05, 0x4a, 0xb5, 0xe8, 0xbf, 0xf2, 0x5d, 0xfc, 0xf7, 0x8b, 0xa1, 0xdd, 0x9f, 0xc1, - 0x57, 0x4b, 0x79, 0x0c, 0xf5, 0xb9, 0x70, 0x91, 0x03, 0x9b, 0x0b, 0x0e, 0x54, 0x93, 0x9f, 0x78, - 0xe3, 0xc4, 0x4a, 0x24, 0x27, 0xfd, 0x4b, 0x36, 0xfc, 0xce, 0x80, 0x83, 0x04, 0xd9, 0x27, 0xde, - 0x98, 0xb2, 0x2f, 0xcf, 0xc8, 0x60, 0x48, 0xfe, 0x43, 0x2f, 0xfe, 0x6c, 0x80, 0x7d, 0x1b, 0x29, - 0xad, 0x62, 0x0b, 0xde, 0x74, 0x17, 0x87, 0xb4, 0x2b, 0xd3, 0xe1, 0xc2, 0xac, 0xf9, 0x77, 0xb4, - 0x89, 0x5f, 0xd0, 0x29, 0x39, 0x73, 0xaf, 0xc8, 0x40, 0x31, 0x2e, 0xd2, 0x99, 0x5f, 0xc0, 0xbb, - 0x81, 0x2c, 0xd2, 0x9f, 0xbb, 0xa1, 0x1f, 0x49, 0xc7, 0x1b, 0xe5, 0x66, 0xb9, 0x55, 0x39, 0xde, - 0x9b, 0x5d, 0xef, 0xef, 0xa6, 0xfd, 0xf7, 0x3c, 0x02, 0xe1, 0xdd, 0x20, 0x6f, 0x08, 0x3d, 0x84, - 0xfb, 0x29, 0xf5, 0xb8, 0xec, 0x7c, 0x03, 0x2f, 0xc5, 0xed, 0x17, 0x7a, 0x63, 0x2e, 0x77, 0xaf, - 0x57, 0xe8, 0x01, 0xd4, 0xe6, 0xcc, 0x42, 0x97, 0x57, 0xf0, 0x3c, 0x90, 0xf0, 0xe4, 0xda, 0x82, - 0x27, 0x85, 0x3e, 0xbf, 0x3f, 0x23, 0x97, 0x31, 0x31, 0x4c, 0x3c, 0xe2, 0xbf, 0x22, 0x05, 0xde, - 0x21, 0x7e, 0x33, 0xa0, 0x99, 0x5f, 0x56, 0x37, 0xd4, 0x81, 0x1d, 0x4a, 0x2e, 0xe7, 0x7a, 0xf7, - 0xa7, 0x0a, 0x20, 0x59, 0x54, 0xf0, 0x16, 0x5d, 0x9e, 0x5b, 0x98, 0xf9, 0x78, 0xf4, 0x92, 0x55, - 0x2d, 0x9c, 0x9c, 0xf9, 0xe1, 0x42, 0x0a, 0x57, 0x14, 0xa9, 0xd2, 0x2b, 0x7d, 0x5c, 0x44, 0x45, - 0x43, 0x55, 0x28, 0xbf, 0xe0, 0x05, 0xd7, 0xed, 0xfc, 0x59, 0x85, 0x7b, 0xb2, 0x30, 0xea, 0xc1, - 0xba, 0x46, 0xa0, 0xc5, 0x13, 0x33, 0xe3, 0xae, 0x69, 0x1e, 0xdc, 0x82, 0x50, 0x4b, 0x6a, 0x97, - 0xd0, 0x73, 0xd8, 0x88, 0x2e, 0x08, 0x28, 0x7f, 0x42, 0xb4, 0xa7, 0x4d, 0xfb, 0x36, 0x48, 0x9c, - 0xf4, 0x1c, 0xd0, 0xf2, 0xfd, 0x03, 0x3d, 0xca, 0x98, 0x9b, 0x77, 0x47, 0x32, 0x0f, 0x57, 0x03, - 0xc7, 0x25, 0xc7, 0x70, 0x3f, 0xbd, 0xe5, 0xd1, 0xfb, 0xcb, 0x39, 0x72, 0x2e, 0x1c, 0xe6, 0xc3, - 0x55, 0xa0, 0x71, 0x31, 0x0a, 0x6f, 0x2d, 0xbd, 0xdf, 0xd0, 0x0a, 0x29, 0xe2, 0xee, 0x1e, 0xad, - 0x84, 0x8d, 0xeb, 0x7d, 0x05, 0x3b, 0x99, 0x6f, 0x03, 0xe4, 0xe4, 0xe5, 0xc9, 0x7e, 0x97, 0x99, - 0xed, 0x95, 0xf1, 0x49, 0x61, 0xd3, 0x47, 0x5c, 0x96, 0xb0, 0x39, 0x2f, 0x81, 0x2c, 0x61, 0xf3, - 0x4e, 0x4c, 0xbb, 0x84, 0x04, 0x6c, 0x65, 0x9c, 0x40, 0x28, 0xc3, 0x0c, 0xf9, 0xe7, 0xa3, 0x79, - 0xb4, 0x22, 0x3a, 0xaa, 0x7a, 0xfc, 0xe9, 0xef, 0x33, 0xcb, 0x78, 0x3d, 0xb3, 0x8c, 0xbf, 0x66, - 0x96, 0xf1, 0xed, 0x8d, 0x55, 0x7a, 0x7d, 0x63, 0x95, 0xfe, 0xb8, 0xb1, 0x4a, 0x9f, 0x3f, 0x1e, - 0xfa, 0x62, 0x74, 0x71, 0xea, 0x78, 0x6c, 0xd2, 0xd6, 0x9f, 0x82, 0xea, 0xe7, 0x88, 0x0f, 0xc6, - 0xed, 0xcb, 0x76, 0xf8, 0xfd, 0xf7, 0xc1, 0x87, 0x47, 0xd1, 0x27, 0xa0, 0xb8, 0x0a, 0x08, 0x3f, - 0xad, 0xca, 0x2f, 0xc0, 0xc7, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x1f, 0xf1, 0x95, 0x4a, 0x79, - 0x0e, 0x00, 0x00, + 0xec, 0x6e, 0x1d, 0xd4, 0xe5, 0xc2, 0xde, 0xb6, 0xdd, 0x03, 0x39, 0x80, 0xb2, 0xb3, 0xda, 0x0b, + 0x12, 0x8a, 0x5c, 0x67, 0x36, 0xb1, 0xd2, 0xcc, 0xb8, 0x99, 0xe9, 0xd2, 0xc2, 0x6f, 0x40, 0x42, + 0x5c, 0xb8, 0x71, 0x84, 0x13, 0x48, 0xdc, 0xf8, 0x09, 0x1c, 0xf7, 0xc8, 0x85, 0x0a, 0xa5, 0x7f, + 0x83, 0x03, 0xf2, 0xcc, 0xd8, 0xb1, 0x1d, 0xbb, 0xca, 0x1e, 0x2c, 0x38, 0x25, 0x7e, 0xf3, 0xcd, + 0x7b, 0xdf, 0xfb, 0xe6, 0x9b, 0xf1, 0x18, 0xde, 0xf3, 0x4f, 0xbd, 0xae, 0x37, 0x76, 0x29, 0x25, + 0x67, 0xdd, 0xf3, 0x0b, 0x32, 0xbb, 0x72, 0x82, 0x19, 0x13, 0x0c, 0x35, 0xfd, 0x53, 0xcf, 0xd1, + 0x03, 0xe6, 0xf6, 0x88, 0x8d, 0x98, 0x8c, 0x77, 0xc3, 0x7f, 0x0a, 0x62, 0xee, 0x79, 0x8c, 0x4f, + 0x19, 0x57, 0xd3, 0xba, 0x81, 0x3b, 0xf2, 0xa9, 0x2b, 0x7c, 0x46, 0xf5, 0xf0, 0x6e, 0x32, 0xb5, + 0xfe, 0x55, 0x43, 0xf6, 0x18, 0xb6, 0x9e, 0x85, 0x93, 0x4e, 0x54, 0x14, 0x93, 0xf3, 0x0b, 0xc2, + 0x05, 0xfa, 0x00, 0xd6, 0x03, 0x36, 0x13, 0x03, 0x7f, 0xd8, 0x32, 0xda, 0x46, 0xa7, 0x71, 0x0c, + 0xf3, 0xeb, 0xfd, 0x7a, 0x9f, 0xcd, 0x44, 0xef, 0x29, 0xae, 0x87, 0x43, 0xbd, 0x21, 0x7a, 0x08, + 0xa0, 0x93, 0x85, 0xb8, 0x35, 0x89, 0x7b, 0x6b, 0x7e, 0xbd, 0xdf, 0xd0, 0xc9, 0x7a, 0x4f, 0x71, + 0x43, 0x03, 0x7a, 0x43, 0xfb, 0x47, 0x03, 0xb6, 0xd3, 0xa5, 0x78, 0xc0, 0x28, 0x27, 0xc8, 0x81, + 0x75, 0x8d, 0x92, 0xb5, 0x9a, 0x47, 0xdb, 0x4e, 0xa2, 0x63, 0x27, 0x82, 0x47, 0x20, 0xb4, 0x0d, + 0x77, 0x82, 0x19, 0x63, 0x2f, 0x65, 0xc5, 0x4d, 0xac, 0x1e, 0xd0, 0x1e, 0x80, 0xfc, 0x33, 0x08, + 0x5c, 0x31, 0x6e, 0x55, 0x43, 0x32, 0xb8, 0x21, 0x23, 0x7d, 0x57, 0x8c, 0xd1, 0x01, 0x6c, 0xaa, + 0xe1, 0x31, 0xf1, 0x47, 0x63, 0xd1, 0xaa, 0xb5, 0x8d, 0x4e, 0x0d, 0x37, 0x65, 0xec, 0x53, 0x19, + 0xb2, 0x9f, 0xa5, 0xf9, 0xf1, 0x48, 0x8b, 0x4f, 0x00, 0x16, 0x8a, 0x6a, 0x8a, 0xbb, 0x8e, 0x52, + 0xdc, 0x51, 0x0b, 0xd5, 0x77, 0x47, 0x44, 0xc3, 0x71, 0x02, 0x6c, 0xff, 0x6c, 0xc0, 0x4e, 0x26, + 0xa7, 0x6e, 0xfa, 0x31, 0x6c, 0xe8, 0x7e, 0x78, 0xcb, 0x68, 0x57, 0x3b, 0xcd, 0x23, 0x2b, 0xd5, + 0x75, 0x6f, 0x48, 0xa8, 0xf0, 0x5f, 0xfa, 0x64, 0x18, 0xf5, 0x1f, 0xe3, 0xd1, 0xe3, 0x14, 0xa1, + 0x35, 0x49, 0xc8, 0xcc, 0x23, 0xa4, 0x6a, 0x25, 0x19, 0xa1, 0x77, 0xa1, 0xae, 0x15, 0x08, 0x25, + 0xaa, 0x62, 0xfd, 0x64, 0x7f, 0x03, 0x96, 0x22, 0xca, 0x28, 0x25, 0x5e, 0x08, 0xcd, 0xca, 0x60, + 0x01, 0x78, 0xf1, 0xa0, 0x72, 0x05, 0x4e, 0x44, 0x32, 0x32, 0xad, 0xbd, 0x89, 0x4c, 0xbf, 0x19, + 0xb0, 0x5f, 0x58, 0xfd, 0x7f, 0x2a, 0xd8, 0xb7, 0x06, 0xdc, 0x93, 0x9c, 0xfb, 0xae, 0x37, 0x21, + 0xe2, 0x84, 0x4d, 0xa7, 0xbe, 0x98, 0x12, 0x2a, 0xca, 0xdb, 0x42, 0xc8, 0x84, 0x0d, 0x1e, 0x66, + 0xa7, 0x1e, 0x91, 0x6c, 0x6a, 0x38, 0x7e, 0xb6, 0x7f, 0x30, 0x60, 0xaf, 0x80, 0x8f, 0x56, 0x50, + 0x2e, 0x60, 0x14, 0x95, 0x9c, 0x36, 0x71, 0x22, 0x52, 0xda, 0xbe, 0xfa, 0xa5, 0x88, 0x19, 0x2f, + 0x51, 0xaa, 0xb4, 0x1b, 0xab, 0x6f, 0xe2, 0xc6, 0xdf, 0x0d, 0xbd, 0x17, 0x72, 0xf8, 0x6a, 0x29, + 0x8f, 0xa1, 0xb9, 0x10, 0x2e, 0xf2, 0x63, 0x3b, 0xe5, 0x47, 0x35, 0xf9, 0x89, 0x37, 0x49, 0xac, + 0x44, 0x72, 0x52, 0x29, 0xa6, 0xfc, 0xde, 0x80, 0x83, 0x04, 0xf5, 0x27, 0xde, 0x84, 0xb2, 0xaf, + 0xce, 0xc8, 0x70, 0x44, 0xfe, 0x43, 0x67, 0xfe, 0x64, 0x80, 0x7d, 0x1b, 0x29, 0xad, 0x69, 0x07, + 0xde, 0x76, 0xd3, 0x43, 0xda, 0xa3, 0xd9, 0x70, 0x69, 0x46, 0xfd, 0x27, 0xda, 0xd2, 0x2f, 0xe8, + 0x8c, 0x9c, 0xb9, 0x57, 0x64, 0xa8, 0x18, 0x97, 0xe9, 0xd3, 0x2f, 0xe1, 0xfd, 0x40, 0x16, 0x19, + 0x2c, 0xbc, 0x31, 0x88, 0xa4, 0xe3, 0xad, 0x6a, 0xbb, 0xda, 0xa9, 0x1d, 0xef, 0xcd, 0xaf, 0xf7, + 0x77, 0xb3, 0x6e, 0x7c, 0x1e, 0x81, 0xf0, 0x6e, 0x50, 0x34, 0x84, 0xee, 0xc3, 0xdd, 0x8c, 0x7a, + 0x5c, 0x76, 0xbe, 0x81, 0x97, 0xe2, 0xf6, 0x0b, 0xbd, 0x4d, 0x97, 0xbb, 0xd7, 0x2b, 0x74, 0x0f, + 0x1a, 0x0b, 0x66, 0xa1, 0xe7, 0x6b, 0x78, 0x11, 0x48, 0x78, 0x72, 0x2d, 0xe5, 0x49, 0xa1, 0xcf, + 0xf6, 0xcf, 0xc9, 0x65, 0x4c, 0x0c, 0x13, 0x8f, 0xf8, 0xaf, 0x48, 0x89, 0xb7, 0x8d, 0x5f, 0x0d, + 0x68, 0x17, 0x97, 0xd5, 0x0d, 0x1d, 0xc1, 0x0e, 0x25, 0x97, 0x0b, 0xbd, 0x07, 0x33, 0x05, 0x90, + 0x2c, 0x6a, 0x78, 0x8b, 0x2e, 0xcf, 0x2d, 0xcd, 0x7c, 0x3c, 0x7a, 0x01, 0xab, 0x16, 0x4e, 0xce, + 0xfc, 0x70, 0x21, 0x85, 0x2b, 0xca, 0x54, 0xe9, 0x95, 0x3e, 0x2e, 0xa2, 0xa2, 0xa1, 0x2a, 0x94, + 0x5f, 0xf0, 0x92, 0xeb, 0x1e, 0xfd, 0x55, 0x87, 0x3b, 0xb2, 0x30, 0xea, 0xc3, 0xba, 0x46, 0xa0, + 0xf4, 0xf9, 0x99, 0x73, 0x2b, 0x35, 0x0f, 0x6e, 0x41, 0xa8, 0x25, 0xb5, 0x2b, 0xe8, 0x39, 0x6c, + 0x44, 0x97, 0x07, 0x54, 0x3c, 0x21, 0xda, 0xd3, 0xa6, 0x7d, 0x1b, 0x24, 0x4e, 0x7a, 0x0e, 0x68, + 0xf9, 0x6e, 0x82, 0x1e, 0xe4, 0xcc, 0x2d, 0xba, 0x3f, 0x99, 0x0f, 0x57, 0x03, 0xc7, 0x25, 0x27, + 0x70, 0x37, 0xbb, 0xe5, 0xd1, 0x87, 0xcb, 0x39, 0x0a, 0xae, 0x1f, 0xe6, 0xfd, 0x55, 0xa0, 0x71, + 0x31, 0x0a, 0xef, 0x2c, 0xbd, 0xed, 0xd0, 0x0a, 0x29, 0xe2, 0xee, 0x1e, 0xac, 0x84, 0x8d, 0xeb, + 0x7d, 0x0d, 0x3b, 0xb9, 0x6f, 0x03, 0xe4, 0x14, 0xe5, 0xc9, 0x7f, 0x97, 0x99, 0xdd, 0x95, 0xf1, + 0x49, 0x61, 0xb3, 0x47, 0x5c, 0x9e, 0xb0, 0x05, 0x2f, 0x81, 0x3c, 0x61, 0x8b, 0x4e, 0x4c, 0xbb, + 0x82, 0x04, 0x6c, 0xe5, 0x9c, 0x40, 0x28, 0xc7, 0x0c, 0xc5, 0xe7, 0xa3, 0x79, 0xb8, 0x22, 0x3a, + 0xaa, 0x7a, 0xfc, 0xd9, 0x1f, 0x73, 0xcb, 0x78, 0x3d, 0xb7, 0x8c, 0xbf, 0xe7, 0x96, 0xf1, 0xdd, + 0x8d, 0x55, 0x79, 0x7d, 0x63, 0x55, 0xfe, 0xbc, 0xb1, 0x2a, 0x5f, 0x3c, 0x1a, 0xf9, 0x62, 0x7c, + 0x71, 0xea, 0x78, 0x6c, 0xda, 0xd5, 0x1f, 0x8d, 0xea, 0xe7, 0x90, 0x0f, 0x27, 0xdd, 0xcb, 0x6e, + 0xf8, 0xa5, 0xf8, 0xd1, 0xc7, 0x87, 0xd1, 0xc7, 0xa2, 0xb8, 0x0a, 0x08, 0x3f, 0xad, 0xcb, 0x6f, + 0xc5, 0x47, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x46, 0x7e, 0x04, 0x78, 0xa3, 0x0e, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1742,9 +1741,9 @@ func (m *QueryChannelsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x18 } - if m.Res != nil { + if m.Pagination != nil { { - size, err := m.Res.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1838,9 +1837,9 @@ func (m *QueryConnectionChannelsResponse) MarshalToSizedBuffer(dAtA []byte) (int i-- dAtA[i] = 0x18 } - if m.Res != nil { + if m.Pagination != nil { { - size, err := m.Res.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2032,9 +2031,9 @@ func (m *QueryPacketCommitmentsResponse) MarshalToSizedBuffer(dAtA []byte) (int, i-- dAtA[i] = 0x18 } - if m.Res != nil { + if m.Pagination != nil { { - size, err := m.Res.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2498,8 +2497,8 @@ func (m *QueryChannelsResponse) Size() (n int) { n += 1 + l + sovQuery(uint64(l)) } } - if m.Res != nil { - l = m.Res.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } if m.Height != 0 { @@ -2537,8 +2536,8 @@ func (m *QueryConnectionChannelsResponse) Size() (n int) { n += 1 + l + sovQuery(uint64(l)) } } - if m.Res != nil { - l = m.Res.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } if m.Height != 0 { @@ -2624,8 +2623,8 @@ func (m *QueryPacketCommitmentsResponse) Size() (n int) { n += 1 + l + sovQuery(uint64(l)) } } - if m.Res != nil { - l = m.Res.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } if m.Height != 0 { @@ -3249,7 +3248,7 @@ func (m *QueryChannelsResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Res", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -3276,10 +3275,10 @@ func (m *QueryChannelsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Res == nil { - m.Res = &query.PageResponse{} + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} } - if err := m.Res.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -3512,7 +3511,7 @@ func (m *QueryConnectionChannelsResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Res", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -3539,10 +3538,10 @@ func (m *QueryConnectionChannelsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Res == nil { - m.Res = &query.PageResponse{} + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} } - if err := m.Res.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -4115,7 +4114,7 @@ func (m *QueryPacketCommitmentsResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Res", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -4142,10 +4141,10 @@ func (m *QueryPacketCommitmentsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Res == nil { - m.Res = &query.PageResponse{} + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} } - if err := m.Res.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/slashing/keeper/grpc_query.go b/x/slashing/keeper/grpc_query.go index 74edcc64ea55..04ba220cb808 100644 --- a/x/slashing/keeper/grpc_query.go +++ b/x/slashing/keeper/grpc_query.go @@ -53,7 +53,7 @@ func (k Keeper) SigningInfos(c context.Context, req *types.QuerySigningInfosRequ var signInfos []types.ValidatorSigningInfo sigInfoStore := prefix.NewStore(store, types.ValidatorSigningInfoKeyPrefix) - res, err := query.Paginate(sigInfoStore, req.Pagination, func(key []byte, value []byte) error { + pageRes, err := query.Paginate(sigInfoStore, req.Pagination, func(key []byte, value []byte) error { var info types.ValidatorSigningInfo err := k.cdc.UnmarshalBinaryBare(value, &info) if err != nil { @@ -65,5 +65,5 @@ func (k Keeper) SigningInfos(c context.Context, req *types.QuerySigningInfosRequ if err != nil { return nil, err } - return &types.QuerySigningInfosResponse{Info: signInfos, Res: res}, nil + return &types.QuerySigningInfosResponse{Info: signInfos, Pagination: pageRes}, nil } diff --git a/x/slashing/keeper/grpc_query_test.go b/x/slashing/keeper/grpc_query_test.go index cfe50c25c284..5b4667907f4d 100644 --- a/x/slashing/keeper/grpc_query_test.go +++ b/x/slashing/keeper/grpc_query_test.go @@ -101,8 +101,8 @@ func (suite *SlashingTestSuite) TestGRPCSigningInfos() { suite.NoError(err) suite.Len(infoResp.Info, 1) suite.Equal(signingInfos[0], infoResp.Info[0]) - suite.NotNil(infoResp.Res.NextKey) - suite.Equal(uint64(2), infoResp.Res.Total) + suite.NotNil(infoResp.Pagination.NextKey) + suite.Equal(uint64(2), infoResp.Pagination.Total) } func TestSlashingTestSuite(t *testing.T) { diff --git a/x/slashing/types/query.pb.go b/x/slashing/types/query.pb.go index bbda2aba0187..d8883d3a99f8 100644 --- a/x/slashing/types/query.pb.go +++ b/x/slashing/types/query.pb.go @@ -252,8 +252,8 @@ func (m *QuerySigningInfosRequest) GetPagination() *query.PageRequest { // QuerySigningInfosResponse is the response type for the Query/SigningInfos RPC method type QuerySigningInfosResponse struct { // info is the signing info of all validators - Info []ValidatorSigningInfo `protobuf:"bytes,1,rep,name=info,proto3" json:"info"` - Res *query.PageResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` + Info []ValidatorSigningInfo `protobuf:"bytes,1,rep,name=info,proto3" json:"info"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QuerySigningInfosResponse) Reset() { *m = QuerySigningInfosResponse{} } @@ -296,9 +296,9 @@ func (m *QuerySigningInfosResponse) GetInfo() []ValidatorSigningInfo { return nil } -func (m *QuerySigningInfosResponse) GetRes() *query.PageResponse { +func (m *QuerySigningInfosResponse) GetPagination() *query.PageResponse { if m != nil { - return m.Res + return m.Pagination } return nil } @@ -315,36 +315,36 @@ func init() { func init() { proto.RegisterFile("cosmos/slashing/query.proto", fileDescriptor_12bf00fd6c136588) } var fileDescriptor_12bf00fd6c136588 = []byte{ - // 461 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xc1, 0x6e, 0xd3, 0x40, - 0x10, 0xb5, 0xdb, 0x92, 0xc3, 0x24, 0x02, 0xb4, 0x54, 0x6a, 0x6a, 0x84, 0x8b, 0x0c, 0x48, 0x05, - 0x51, 0x5b, 0x0a, 0xe2, 0xc0, 0x09, 0x11, 0x0e, 0x08, 0x89, 0x43, 0x31, 0x32, 0x07, 0x2e, 0xd1, - 0xd6, 0xde, 0x6e, 0x57, 0x38, 0xbb, 0x8e, 0xd7, 0xa9, 0xc8, 0x2f, 0x70, 0xe2, 0x47, 0xf8, 0x8f, - 0x1c, 0x73, 0xe4, 0x14, 0xa1, 0xe4, 0x2f, 0x38, 0xa1, 0xec, 0xae, 0x13, 0x13, 0x47, 0x21, 0x3d, - 0x79, 0x3d, 0xf3, 0x66, 0xde, 0x7b, 0x3b, 0xb3, 0x70, 0x3f, 0x16, 0xb2, 0x2f, 0x64, 0x20, 0x53, - 0x2c, 0xaf, 0x18, 0xa7, 0xc1, 0x60, 0x48, 0xf2, 0x91, 0x9f, 0xe5, 0xa2, 0x10, 0xe8, 0x8e, 0x4e, - 0xfa, 0x65, 0xd2, 0x79, 0x60, 0xd0, 0x0a, 0x14, 0x64, 0x98, 0x32, 0x8e, 0x0b, 0x26, 0xb8, 0xc6, - 0x3b, 0x87, 0x54, 0x50, 0xa1, 0x8e, 0xc1, 0xe2, 0x64, 0xa2, 0xee, 0x3a, 0x45, 0x79, 0xd0, 0x79, - 0xef, 0x10, 0xd0, 0xc7, 0x45, 0xbf, 0x73, 0x9c, 0xe3, 0xbe, 0x0c, 0xc9, 0x60, 0x48, 0x64, 0xe1, - 0x7d, 0x80, 0x7b, 0xff, 0x44, 0x65, 0x26, 0xb8, 0x24, 0xe8, 0x25, 0x34, 0x32, 0x15, 0x69, 0xdb, - 0x0f, 0xed, 0xd3, 0x66, 0xe7, 0xc8, 0x5f, 0xd3, 0xe8, 0xeb, 0x82, 0xee, 0xc1, 0x78, 0x7a, 0x62, - 0x85, 0x06, 0xec, 0x65, 0x70, 0xa4, 0xba, 0x7d, 0x62, 0x94, 0x33, 0x4e, 0xdf, 0xf3, 0x4b, 0x61, - 0x88, 0x50, 0x04, 0xad, 0x58, 0x70, 0xd9, 0xc3, 0x49, 0x92, 0x13, 0xa9, 0xfb, 0xb6, 0xba, 0x9d, - 0x3f, 0xd3, 0x13, 0x9f, 0xb2, 0xe2, 0x6a, 0x78, 0xe1, 0xc7, 0xa2, 0x1f, 0x18, 0x0f, 0xfa, 0x73, - 0x26, 0x93, 0xaf, 0x41, 0x31, 0xca, 0x88, 0xf4, 0xdf, 0x0a, 0x2e, 0xdf, 0xe8, 0xca, 0xb0, 0x19, - 0xaf, 0x7e, 0xbc, 0x01, 0xb4, 0xeb, 0x8c, 0xc6, 0x44, 0x04, 0x77, 0xaf, 0x71, 0xda, 0x93, 0x3a, - 0xd5, 0x63, 0xfc, 0x52, 0x18, 0x3b, 0x4f, 0x6a, 0x76, 0x3e, 0xe3, 0x94, 0x25, 0xb8, 0x10, 0x79, - 0xa5, 0x91, 0x31, 0x77, 0xfb, 0x1a, 0xa7, 0x95, 0xa8, 0x17, 0xd5, 0x29, 0xcb, 0xeb, 0x44, 0xaf, - 0x00, 0x56, 0xe3, 0x32, 0x64, 0xc7, 0x25, 0x99, 0x9e, 0xf9, 0x39, 0xa6, 0xc4, 0xc0, 0xc3, 0x0a, - 0xd8, 0xfb, 0x6e, 0xc3, 0xf1, 0x86, 0xbe, 0xc6, 0xcb, 0x6b, 0x38, 0x30, 0xfa, 0xf7, 0x6f, 0xaa, - 0x5f, 0x15, 0xa2, 0xe7, 0xb0, 0x9f, 0x13, 0xd9, 0xde, 0x53, 0x92, 0x9c, 0x4d, 0x92, 0x34, 0x53, - 0xb8, 0x80, 0x75, 0x7e, 0xee, 0xc1, 0x2d, 0x25, 0x06, 0x45, 0xd0, 0xd0, 0xa3, 0x46, 0x8f, 0x6a, - 0xa4, 0xf5, 0x7d, 0x72, 0x1e, 0x6f, 0x07, 0x69, 0x0e, 0xcf, 0x42, 0x09, 0x34, 0x2b, 0x4a, 0xd1, - 0xe9, 0xe6, 0xb2, 0xfa, 0x1e, 0x39, 0x4f, 0x77, 0x40, 0x2e, 0x59, 0x28, 0xb4, 0xaa, 0xb7, 0x89, - 0xfe, 0x5f, 0xbc, 0x34, 0xf2, 0x6c, 0x17, 0x68, 0x49, 0xd4, 0x7d, 0x37, 0x9e, 0xb9, 0xf6, 0x64, - 0xe6, 0xda, 0xbf, 0x67, 0xae, 0xfd, 0x63, 0xee, 0x5a, 0x93, 0xb9, 0x6b, 0xfd, 0x9a, 0xbb, 0xd6, - 0x97, 0xb3, 0xad, 0xdb, 0xfd, 0x6d, 0xf5, 0x5c, 0xd5, 0xa2, 0x5f, 0x34, 0xd4, 0x63, 0x7d, 0xf1, - 0x37, 0x00, 0x00, 0xff, 0xff, 0xc8, 0x92, 0xe1, 0x2a, 0x31, 0x04, 0x00, 0x00, + // 459 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xb1, 0x8e, 0xd3, 0x40, + 0x10, 0xb5, 0x8f, 0x23, 0xc5, 0x24, 0x02, 0xb4, 0x9c, 0x74, 0x77, 0x46, 0xf8, 0x90, 0x01, 0xe9, + 0x40, 0x3a, 0x5b, 0x0a, 0xa2, 0x80, 0x06, 0x11, 0x0a, 0x84, 0x44, 0x71, 0x18, 0x99, 0x82, 0x26, + 0xda, 0xd8, 0xce, 0x66, 0x85, 0xb3, 0xeb, 0x78, 0x9d, 0x88, 0xfc, 0x05, 0x25, 0x3f, 0xc1, 0x7f, + 0xa4, 0x4c, 0x49, 0x15, 0xa1, 0xe4, 0x2f, 0xa8, 0x50, 0x76, 0xd7, 0x89, 0x13, 0x47, 0x21, 0x57, + 0x79, 0x3d, 0xf3, 0x66, 0xde, 0x7b, 0x3b, 0xb3, 0xf0, 0x20, 0xe4, 0xa2, 0xcf, 0x85, 0x27, 0x12, + 0x2c, 0x7a, 0x94, 0x11, 0x6f, 0x30, 0x8c, 0xb3, 0xb1, 0x9b, 0x66, 0x3c, 0xe7, 0xe8, 0xae, 0x4a, + 0xba, 0x45, 0xd2, 0x7a, 0xa8, 0xd1, 0x12, 0xe4, 0xa5, 0x98, 0x50, 0x86, 0x73, 0xca, 0x99, 0xc2, + 0x5b, 0x27, 0x84, 0x13, 0x2e, 0x8f, 0xde, 0xf2, 0xa4, 0xa3, 0xf6, 0x36, 0x45, 0x71, 0x50, 0x79, + 0xe7, 0x04, 0xd0, 0xa7, 0x65, 0xbf, 0x6b, 0x9c, 0xe1, 0xbe, 0xf0, 0xe3, 0xc1, 0x30, 0x16, 0xb9, + 0xf3, 0x11, 0xee, 0x6f, 0x44, 0x45, 0xca, 0x99, 0x88, 0xd1, 0x4b, 0xa8, 0xa5, 0x32, 0x72, 0x66, + 0x3e, 0x32, 0x2f, 0xeb, 0xcd, 0x53, 0x77, 0x4b, 0xa3, 0xab, 0x0a, 0x5a, 0xc7, 0x93, 0xd9, 0x85, + 0xe1, 0x6b, 0xb0, 0x93, 0xc2, 0xa9, 0xec, 0xf6, 0x99, 0x12, 0x46, 0x19, 0xf9, 0xc0, 0xba, 0x5c, + 0x13, 0xa1, 0x00, 0x1a, 0x21, 0x67, 0xa2, 0x8d, 0xa3, 0x28, 0x8b, 0x85, 0xea, 0xdb, 0x68, 0x35, + 0xff, 0xce, 0x2e, 0x5c, 0x42, 0xf3, 0xde, 0xb0, 0xe3, 0x86, 0xbc, 0xef, 0x69, 0x0f, 0xea, 0x73, + 0x25, 0xa2, 0x6f, 0x5e, 0x3e, 0x4e, 0x63, 0xe1, 0xbe, 0xe3, 0x4c, 0xbc, 0x55, 0x95, 0x7e, 0x3d, + 0x5c, 0xff, 0x38, 0x03, 0x38, 0xab, 0x32, 0x6a, 0x13, 0x01, 0xdc, 0x1b, 0xe1, 0xa4, 0x2d, 0x54, + 0xaa, 0x4d, 0x59, 0x97, 0x6b, 0x3b, 0x4f, 0x2b, 0x76, 0xbe, 0xe0, 0x84, 0x46, 0x38, 0xe7, 0x59, + 0xa9, 0x91, 0x36, 0x77, 0x67, 0x84, 0x93, 0x52, 0xd4, 0x09, 0xaa, 0x94, 0xc5, 0x75, 0xa2, 0x57, + 0x00, 0xeb, 0x71, 0x69, 0xb2, 0xf3, 0x82, 0x4c, 0xcd, 0xfc, 0x1a, 0x93, 0x58, 0xc3, 0xfd, 0x12, + 0xd8, 0xf9, 0x69, 0xc2, 0xf9, 0x8e, 0xbe, 0xda, 0xcb, 0x1b, 0x38, 0xd6, 0xfa, 0x6f, 0xdd, 0x54, + 0xbf, 0x2c, 0x44, 0xaf, 0x37, 0x94, 0x1d, 0x49, 0x65, 0xd6, 0x2e, 0x65, 0x8a, 0xb0, 0x2c, 0xad, + 0xf9, 0xeb, 0x08, 0x6e, 0x4b, 0x69, 0x28, 0x80, 0x9a, 0x1a, 0x3c, 0x7a, 0x5c, 0x91, 0x50, 0xdd, + 0x2e, 0xeb, 0xc9, 0x7e, 0x90, 0xa2, 0x72, 0x0c, 0x14, 0x41, 0xbd, 0xa4, 0x1b, 0x5d, 0xee, 0x2e, + 0xab, 0x6e, 0x95, 0xf5, 0xec, 0x00, 0xe4, 0x8a, 0x85, 0x40, 0xa3, 0x7c, 0xb7, 0xe8, 0xff, 0xc5, + 0x2b, 0x23, 0xcf, 0x0f, 0x81, 0x16, 0x44, 0xad, 0xf7, 0x93, 0xb9, 0x6d, 0x4e, 0xe7, 0xb6, 0xf9, + 0x67, 0x6e, 0x9b, 0x3f, 0x16, 0xb6, 0x31, 0x5d, 0xd8, 0xc6, 0xef, 0x85, 0x6d, 0x7c, 0xbd, 0xda, + 0xbb, 0xeb, 0xdf, 0xd7, 0x8f, 0x57, 0xae, 0x7d, 0xa7, 0x26, 0x9f, 0xee, 0x8b, 0x7f, 0x01, 0x00, + 0x00, 0xff, 0xff, 0x59, 0xd0, 0x27, 0x68, 0x3f, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -679,9 +679,9 @@ func (m *QuerySigningInfosResponse) MarshalToSizedBuffer(dAtA []byte) (int, erro _ = i var l int _ = l - if m.Res != nil { + if m.Pagination != nil { { - size, err := m.Res.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -788,8 +788,8 @@ func (m *QuerySigningInfosResponse) Size() (n int) { n += 1 + l + sovQuery(uint64(l)) } } - if m.Res != nil { - l = m.Res.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -1267,7 +1267,7 @@ func (m *QuerySigningInfosResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Res", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -1294,10 +1294,10 @@ func (m *QuerySigningInfosResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Res == nil { - m.Res = &query.PageResponse{} + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} } - if err := m.Res.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/staking/keeper/grpc_query.go b/x/staking/keeper/grpc_query.go index e5a71167c952..8e86f0c15558 100644 --- a/x/staking/keeper/grpc_query.go +++ b/x/staking/keeper/grpc_query.go @@ -38,7 +38,7 @@ func (k Querier) Validators(c context.Context, req *types.QueryValidatorsRequest store := ctx.KVStore(k.storeKey) valStore := prefix.NewStore(store, types.ValidatorsKey) - res, err := query.FilteredPaginate(valStore, req.Pagination, func(key []byte, value []byte, accumulate bool) (bool, error) { + pageRes, err := query.FilteredPaginate(valStore, req.Pagination, func(key []byte, value []byte, accumulate bool) (bool, error) { val, err := types.UnmarshalValidator(k.cdc, value) if err != nil { return false, err @@ -58,7 +58,7 @@ func (k Querier) Validators(c context.Context, req *types.QueryValidatorsRequest return nil, status.Error(codes.Internal, err.Error()) } - return &types.QueryValidatorsResponse{Validators: validators, Res: res}, nil + return &types.QueryValidatorsResponse{Validators: validators, Pagination: pageRes}, nil } // Validator queries validator info for given validator addr @@ -93,7 +93,7 @@ func (k Querier) ValidatorDelegations(c context.Context, req *types.QueryValidat store := ctx.KVStore(k.storeKey) valStore := prefix.NewStore(store, types.DelegationKey) - res, err := query.FilteredPaginate(valStore, req.Pagination, func(key []byte, value []byte, accumulate bool) (bool, error) { + pageRes, err := query.FilteredPaginate(valStore, req.Pagination, func(key []byte, value []byte, accumulate bool) (bool, error) { delegation, err := types.UnmarshalDelegation(k.cdc, value) if err != nil { return false, err @@ -117,7 +117,7 @@ func (k Querier) ValidatorDelegations(c context.Context, req *types.QueryValidat } return &types.QueryValidatorDelegationsResponse{ - DelegationResponses: delResponses, Res: res}, nil + DelegationResponses: delResponses, Pagination: pageRes}, nil } // ValidatorUnbondingDelegations queries unbonding delegations of a validator @@ -134,7 +134,7 @@ func (k Querier) ValidatorUnbondingDelegations(c context.Context, req *types.Que store := ctx.KVStore(k.storeKey) ubdStore := prefix.NewStore(store, types.GetUBDsByValIndexKey(req.ValidatorAddr)) - res, err := query.Paginate(ubdStore, req.Pagination, func(key []byte, value []byte) error { + pageRes, err := query.Paginate(ubdStore, req.Pagination, func(key []byte, value []byte) error { ubd, err := types.UnmarshalUBD(k.cdc, value) if err != nil { return err @@ -148,7 +148,7 @@ func (k Querier) ValidatorUnbondingDelegations(c context.Context, req *types.Que return &types.QueryValidatorUnbondingDelegationsResponse{ UnbondingResponses: ubds, - Res: res, + Pagination: pageRes, }, nil } @@ -221,7 +221,7 @@ func (k Querier) DelegatorDelegations(c context.Context, req *types.QueryDelegat store := ctx.KVStore(k.storeKey) delStore := prefix.NewStore(store, types.GetDelegationsKey(req.DelegatorAddr)) - res, err := query.Paginate(delStore, req.Pagination, func(key []byte, value []byte) error { + pageRes, err := query.Paginate(delStore, req.Pagination, func(key []byte, value []byte) error { delegation, err := types.UnmarshalDelegation(k.cdc, value) if err != nil { return err @@ -243,7 +243,7 @@ func (k Querier) DelegatorDelegations(c context.Context, req *types.QueryDelegat return nil, status.Error(codes.Internal, err.Error()) } - return &types.QueryDelegatorDelegationsResponse{DelegationResponses: delegationResps, Res: res}, nil + return &types.QueryDelegatorDelegationsResponse{DelegationResponses: delegationResps, Pagination: pageRes}, nil } @@ -283,7 +283,7 @@ func (k Querier) DelegatorUnbondingDelegations(c context.Context, req *types.Que store := ctx.KVStore(k.storeKey) unbStore := prefix.NewStore(store, types.GetUBDsKey(req.DelegatorAddr)) - res, err := query.Paginate(unbStore, req.Pagination, func(key []byte, value []byte) error { + pageRes, err := query.Paginate(unbStore, req.Pagination, func(key []byte, value []byte) error { unbond, err := types.UnmarshalUBD(k.cdc, value) if err != nil { return err @@ -296,7 +296,7 @@ func (k Querier) DelegatorUnbondingDelegations(c context.Context, req *types.Que } return &types.QueryDelegatorUnbondingDelegationsResponse{ - UnbondingResponses: unbondingDelegations, Res: res}, nil + UnbondingResponses: unbondingDelegations, Pagination: pageRes}, nil } // HistoricalInfo queries the historical info for given height @@ -323,7 +323,7 @@ func (k Querier) Redelegations(c context.Context, req *types.QueryRedelegationsR } var redels types.Redelegations - var res *query.PageResponse + var pageRes *query.PageResponse var err error ctx := sdk.UnwrapSDKContext(c) @@ -332,9 +332,9 @@ func (k Querier) Redelegations(c context.Context, req *types.QueryRedelegationsR case !req.DelegatorAddr.Empty() && !req.SrcValidatorAddr.Empty() && !req.DstValidatorAddr.Empty(): redels, err = queryRedelegation(ctx, k, req) case req.DelegatorAddr.Empty() && !req.SrcValidatorAddr.Empty() && req.DstValidatorAddr.Empty(): - redels, res, err = queryRedelegationsFromSrcValidator(store, k, req) + redels, pageRes, err = queryRedelegationsFromSrcValidator(store, k, req) default: - redels, res, err = queryAllRedelegations(store, k, req) + redels, pageRes, err = queryAllRedelegations(store, k, req) } if err != nil { return nil, status.Error(codes.Internal, err.Error()) @@ -344,7 +344,7 @@ func (k Querier) Redelegations(c context.Context, req *types.QueryRedelegationsR return nil, status.Error(codes.Internal, err.Error()) } - return &types.QueryRedelegationsResponse{RedelegationResponses: redelResponses, Res: res}, nil + return &types.QueryRedelegationsResponse{RedelegationResponses: redelResponses, Pagination: pageRes}, nil } func (k Querier) DelegatorValidators(c context.Context, req *types.QueryDelegatorValidatorsRequest) (*types.QueryDelegatorValidatorsResponse, error) { @@ -360,7 +360,7 @@ func (k Querier) DelegatorValidators(c context.Context, req *types.QueryDelegato store := ctx.KVStore(k.storeKey) delStore := prefix.NewStore(store, types.GetDelegationsKey(req.DelegatorAddr)) - res, err := query.Paginate(delStore, req.Pagination, func(key []byte, value []byte) error { + pageRes, err := query.Paginate(delStore, req.Pagination, func(key []byte, value []byte) error { delegation, err := types.UnmarshalDelegation(k.cdc, value) if err != nil { return err @@ -379,7 +379,7 @@ func (k Querier) DelegatorValidators(c context.Context, req *types.QueryDelegato return nil, status.Error(codes.Internal, err.Error()) } - return &types.QueryDelegatorValidatorsResponse{Validators: validators, Res: res}, nil + return &types.QueryDelegatorValidatorsResponse{Validators: validators, Pagination: pageRes}, nil } // Pool queries the pool info diff --git a/x/staking/keeper/grpc_query_test.go b/x/staking/keeper/grpc_query_test.go index 7477f73f14f9..3c255145ed3b 100644 --- a/x/staking/keeper/grpc_query_test.go +++ b/x/staking/keeper/grpc_query_test.go @@ -55,8 +55,8 @@ func (suite *KeeperTestSuite) TestGRPCQueryValidators() { suite.NoError(err) suite.NotNil(valsResp) suite.Equal(1, len(valsResp.Validators)) - suite.NotNil(valsResp.Res.NextKey) - suite.Equal(uint64(len(vals)), valsResp.Res.Total) + suite.NotNil(valsResp.Pagination.NextKey) + suite.Equal(uint64(len(vals)), valsResp.Pagination.Total) } else { suite.Require().Error(err) } @@ -138,8 +138,8 @@ func (suite *KeeperTestSuite) TestGRPCQueryDelegatorValidators() { if tc.expPass { suite.NoError(err) suite.Equal(1, len(res.Validators)) - suite.NotNil(res.Res.NextKey) - suite.Equal(uint64(len(delValidators)), res.Res.Total) + suite.NotNil(res.Pagination.NextKey) + suite.Equal(uint64(len(delValidators)), res.Pagination.Total) } else { suite.Error(err) suite.Nil(res) @@ -292,7 +292,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryDelegatorDelegations() { tc.malleate() res, err := queryClient.DelegatorDelegations(gocontext.Background(), req) if tc.expPass { - suite.Equal(uint64(2), res.Res.Total) + suite.Equal(uint64(2), res.Pagination.Total) suite.Len(res.DelegationResponses, 1) suite.Equal(1, len(res.DelegationResponses)) suite.Equal(sdk.NewCoin(sdk.DefaultBondDenom, delegation.Shares.TruncateInt()), res.DelegationResponses[0].Balance) @@ -352,8 +352,8 @@ func (suite *KeeperTestSuite) TestGRPCQueryValidatorDelegations() { if tc.expPass && !tc.expErr { suite.NoError(err) suite.Len(res.DelegationResponses, 1) - suite.NotNil(res.Res.NextKey) - suite.Equal(uint64(2), res.Res.Total) + suite.NotNil(res.Pagination.NextKey) + suite.Equal(uint64(2), res.Pagination.Total) suite.Equal(addrVal1, res.DelegationResponses[0].Delegation.ValidatorAddress) suite.Equal(sdk.NewCoin(sdk.DefaultBondDenom, delegation.Shares.TruncateInt()), res.DelegationResponses[0].Balance) } else if !tc.expPass && !tc.expErr { @@ -470,8 +470,8 @@ func (suite *KeeperTestSuite) TestGRPCQueryDelegatorUnbondingDelegations() { res, err := queryClient.DelegatorUnbondingDelegations(gocontext.Background(), req) if tc.expPass && !tc.expErr { suite.NoError(err) - suite.NotNil(res.Res.NextKey) - suite.Equal(uint64(2), res.Res.Total) + suite.NotNil(res.Pagination.NextKey) + suite.Equal(uint64(2), res.Pagination.Total) suite.Len(res.UnbondingResponses, 1) suite.Equal(unbond, res.UnbondingResponses[0]) } else if !tc.expPass && !tc.expErr { @@ -676,7 +676,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryValidatorUnbondingDelegations() { func() { req = &types.QueryValidatorUnbondingDelegationsRequest{ ValidatorAddr: val1.GetOperator(), - Pagination: &query.PageRequest{Limit: 1, CountTotal: true}} + Pagination: &query.PageRequest{Limit: 1, CountTotal: true}} }, true, }, @@ -688,7 +688,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryValidatorUnbondingDelegations() { res, err := queryClient.ValidatorUnbondingDelegations(gocontext.Background(), req) if tc.expPass { suite.NoError(err) - suite.Equal(uint64(1), res.Res.Total) + suite.Equal(uint64(1), res.Pagination.Total) suite.Equal(1, len(res.UnbondingResponses)) } else { suite.Error(err) diff --git a/x/staking/types/query.pb.go b/x/staking/types/query.pb.go index 87a726a77223..73cdfc5a869f 100644 --- a/x/staking/types/query.pb.go +++ b/x/staking/types/query.pb.go @@ -86,7 +86,7 @@ func (m *QueryValidatorsRequest) GetPagination() *query.PageRequest { // QueryValidatorsResponse is response type for the Query/Validators RPC method type QueryValidatorsResponse struct { Validators []Validator `protobuf:"bytes,1,rep,name=validators,proto3" json:"validators"` - Res *query.PageResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryValidatorsResponse) Reset() { *m = QueryValidatorsResponse{} } @@ -129,9 +129,9 @@ func (m *QueryValidatorsResponse) GetValidators() []Validator { return nil } -func (m *QueryValidatorsResponse) GetRes() *query.PageResponse { +func (m *QueryValidatorsResponse) GetPagination() *query.PageResponse { if m != nil { - return m.Res + return m.Pagination } return nil } @@ -282,7 +282,7 @@ func (m *QueryValidatorDelegationsRequest) GetPagination() *query.PageRequest { // QueryValidatorDelegationsRequest is response type for the Query/ValidatorDelegations RPC method type QueryValidatorDelegationsResponse struct { DelegationResponses DelegationResponses `protobuf:"bytes,1,rep,name=delegation_responses,json=delegationResponses,proto3,castrepeated=DelegationResponses" json:"delegation_responses"` - Res *query.PageResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryValidatorDelegationsResponse) Reset() { *m = QueryValidatorDelegationsResponse{} } @@ -325,9 +325,9 @@ func (m *QueryValidatorDelegationsResponse) GetDelegationResponses() DelegationR return nil } -func (m *QueryValidatorDelegationsResponse) GetRes() *query.PageResponse { +func (m *QueryValidatorDelegationsResponse) GetPagination() *query.PageResponse { if m != nil { - return m.Res + return m.Pagination } return nil } @@ -392,7 +392,7 @@ func (m *QueryValidatorUnbondingDelegationsRequest) GetPagination() *query.PageR // QueryValidatorUnbondingDelegationsResponse is response type for the Query/ValidatorUnbondingDelegations RPC method type QueryValidatorUnbondingDelegationsResponse struct { UnbondingResponses []UnbondingDelegation `protobuf:"bytes,1,rep,name=unbonding_responses,json=unbondingResponses,proto3" json:"unbonding_responses"` - Res *query.PageResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryValidatorUnbondingDelegationsResponse) Reset() { @@ -439,9 +439,9 @@ func (m *QueryValidatorUnbondingDelegationsResponse) GetUnbondingResponses() []U return nil } -func (m *QueryValidatorUnbondingDelegationsResponse) GetRes() *query.PageResponse { +func (m *QueryValidatorUnbondingDelegationsResponse) GetPagination() *query.PageResponse { if m != nil { - return m.Res + return m.Pagination } return nil } @@ -698,7 +698,7 @@ func (m *QueryDelegatorDelegationsRequest) GetPagination() *query.PageRequest { // QueryDelegatorDelegationsResponse is response type for the Query/DelegatorDelegations RPC method type QueryDelegatorDelegationsResponse struct { DelegationResponses []DelegationResponse `protobuf:"bytes,1,rep,name=delegation_responses,json=delegationResponses,proto3" json:"delegation_responses"` - Res *query.PageResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryDelegatorDelegationsResponse) Reset() { *m = QueryDelegatorDelegationsResponse{} } @@ -741,9 +741,9 @@ func (m *QueryDelegatorDelegationsResponse) GetDelegationResponses() []Delegatio return nil } -func (m *QueryDelegatorDelegationsResponse) GetRes() *query.PageResponse { +func (m *QueryDelegatorDelegationsResponse) GetPagination() *query.PageResponse { if m != nil { - return m.Res + return m.Pagination } return nil } @@ -808,7 +808,7 @@ func (m *QueryDelegatorUnbondingDelegationsRequest) GetPagination() *query.PageR // QueryUnbondingDelegatorDelegationsResponse is response type for the Query/UnbondingDelegatorDelegations RPC method type QueryDelegatorUnbondingDelegationsResponse struct { UnbondingResponses []UnbondingDelegation `protobuf:"bytes,1,rep,name=unbonding_responses,json=unbondingResponses,proto3" json:"unbonding_responses"` - Res *query.PageResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryDelegatorUnbondingDelegationsResponse) Reset() { @@ -855,9 +855,9 @@ func (m *QueryDelegatorUnbondingDelegationsResponse) GetUnbondingResponses() []U return nil } -func (m *QueryDelegatorUnbondingDelegationsResponse) GetRes() *query.PageResponse { +func (m *QueryDelegatorUnbondingDelegationsResponse) GetPagination() *query.PageResponse { if m != nil { - return m.Res + return m.Pagination } return nil } @@ -934,7 +934,7 @@ func (m *QueryRedelegationsRequest) GetPagination() *query.PageRequest { // QueryRedelegationsResponse is response type for the Query/Redelegations RPC method type QueryRedelegationsResponse struct { RedelegationResponses []RedelegationResponse `protobuf:"bytes,1,rep,name=redelegation_responses,json=redelegationResponses,proto3" json:"redelegation_responses"` - Res *query.PageResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryRedelegationsResponse) Reset() { *m = QueryRedelegationsResponse{} } @@ -977,9 +977,9 @@ func (m *QueryRedelegationsResponse) GetRedelegationResponses() []RedelegationRe return nil } -func (m *QueryRedelegationsResponse) GetRes() *query.PageResponse { +func (m *QueryRedelegationsResponse) GetPagination() *query.PageResponse { if m != nil { - return m.Res + return m.Pagination } return nil } @@ -1040,7 +1040,7 @@ func (m *QueryDelegatorValidatorsRequest) GetPagination() *query.PageRequest { // QueryDelegatorValidatorsResponse is response type for the Query/DelegatorValidators RPC method type QueryDelegatorValidatorsResponse struct { Validators []Validator `protobuf:"bytes,1,rep,name=validators,proto3" json:"validators"` - Res *query.PageResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryDelegatorValidatorsResponse) Reset() { *m = QueryDelegatorValidatorsResponse{} } @@ -1083,9 +1083,9 @@ func (m *QueryDelegatorValidatorsResponse) GetValidators() []Validator { return nil } -func (m *QueryDelegatorValidatorsResponse) GetRes() *query.PageResponse { +func (m *QueryDelegatorValidatorsResponse) GetPagination() *query.PageResponse { if m != nil { - return m.Res + return m.Pagination } return nil } @@ -1399,8 +1399,8 @@ var xxx_messageInfo_QueryParamsRequest proto.InternalMessageInfo // QueryParametersResponse is response type for the Query/Parameters RPC method type QueryParamsResponse struct { - Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` - Res *query.PageResponse `protobuf:"bytes,2,opt,name=res,proto3" json:"res,omitempty"` + Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryParamsResponse) Reset() { *m = QueryParamsResponse{} } @@ -1443,9 +1443,9 @@ func (m *QueryParamsResponse) GetParams() Params { return Params{} } -func (m *QueryParamsResponse) GetRes() *query.PageResponse { +func (m *QueryParamsResponse) GetPagination() *query.PageResponse { if m != nil { - return m.Res + return m.Pagination } return nil } @@ -1484,76 +1484,76 @@ func init() { func init() { proto.RegisterFile("cosmos/staking/query.proto", fileDescriptor_802d43a0c79dce0e) } var fileDescriptor_802d43a0c79dce0e = []byte{ - // 1097 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xf7, 0x24, 0xc6, 0x52, 0x1e, 0x6d, 0x54, 0xc6, 0xae, 0x49, 0xb7, 0xd4, 0x76, 0xb7, 0x50, - 0xda, 0xd2, 0xda, 0x69, 0xe8, 0xa5, 0x48, 0x08, 0x25, 0x54, 0x08, 0x0e, 0x48, 0xed, 0x22, 0x02, - 0x2a, 0x48, 0x66, 0xe3, 0x5d, 0xd6, 0x2b, 0x3b, 0x1e, 0x67, 0x67, 0x0d, 0x04, 0x89, 0x2b, 0xe2, - 0x08, 0x37, 0x3e, 0x03, 0x12, 0x1c, 0xcb, 0x95, 0x0b, 0xa2, 0x07, 0x0e, 0x3d, 0x80, 0xc4, 0x29, - 0xa0, 0xe4, 0x1b, 0x70, 0xec, 0x09, 0x79, 0xf6, 0xed, 0x78, 0xbd, 0x3b, 0xbb, 0x59, 0x27, 0x29, - 0x4d, 0x4e, 0xb6, 0x67, 0xde, 0xfb, 0xbd, 0xff, 0x7f, 0xc6, 0xa0, 0x75, 0x18, 0xdf, 0x64, 0xbc, - 0xc5, 0x7d, 0xb3, 0xe7, 0x0e, 0x9c, 0xd6, 0xd6, 0xc8, 0xf6, 0xb6, 0x9b, 0x43, 0x8f, 0xf9, 0x8c, - 0x2e, 0x06, 0x77, 0x4d, 0xbc, 0xd3, 0x2e, 0x20, 0xad, 0xa0, 0x69, 0x0d, 0x4d, 0xc7, 0x1d, 0x98, - 0xbe, 0xcb, 0x06, 0x01, 0xb9, 0x56, 0x71, 0x98, 0xc3, 0xc4, 0xd7, 0xd6, 0xf8, 0x1b, 0x9e, 0xbe, - 0x10, 0x13, 0x80, 0x9f, 0xc1, 0xad, 0xde, 0x83, 0xea, 0xbd, 0x31, 0xda, 0xba, 0xd9, 0x77, 0x2d, - 0xd3, 0x67, 0x1e, 0x37, 0xec, 0xad, 0x91, 0xcd, 0x7d, 0x5a, 0x85, 0x12, 0xf7, 0x4d, 0x7f, 0xc4, - 0x97, 0x48, 0x83, 0x5c, 0x59, 0x30, 0xf0, 0x17, 0xbd, 0x0d, 0x30, 0x91, 0xbc, 0x34, 0xd7, 0x20, - 0x57, 0x9e, 0x5d, 0x39, 0xd7, 0x44, 0x4d, 0x03, 0xed, 0xef, 0x9a, 0x8e, 0x8d, 0x30, 0x46, 0x84, - 0x58, 0xff, 0x86, 0xc0, 0xf3, 0x09, 0x69, 0x7c, 0xc8, 0x06, 0xdc, 0xa6, 0x6f, 0x00, 0x7c, 0x26, - 0x4f, 0x97, 0x48, 0x63, 0x3e, 0x0a, 0x1b, 0xea, 0x2c, 0xf9, 0xd6, 0x8a, 0x0f, 0x77, 0xea, 0x05, - 0x23, 0xc2, 0x42, 0xaf, 0xc3, 0xbc, 0x67, 0x73, 0x54, 0x48, 0x53, 0x29, 0x14, 0x48, 0x32, 0xc6, - 0x64, 0xfa, 0x16, 0x9c, 0x9d, 0xd6, 0x24, 0x34, 0xfb, 0x43, 0x58, 0x94, 0xa0, 0x6d, 0xd3, 0xb2, - 0x3c, 0x61, 0xfe, 0xa9, 0xb5, 0x9b, 0x8f, 0x77, 0xea, 0x37, 0x1c, 0xd7, 0xef, 0x8e, 0x36, 0x9a, - 0x1d, 0xb6, 0xd9, 0x42, 0xaf, 0x06, 0x1f, 0x37, 0xb8, 0xd5, 0x6b, 0xf9, 0xdb, 0x43, 0x9b, 0x8f, - 0x55, 0x5c, 0xb5, 0x2c, 0xcf, 0xe6, 0xdc, 0x38, 0x2d, 0x81, 0xc6, 0x27, 0xfa, 0x07, 0x71, 0x57, - 0x4b, 0xdb, 0x5f, 0x87, 0x05, 0x49, 0x2a, 0xc4, 0xe5, 0x30, 0x7d, 0xc2, 0xa1, 0xff, 0x4c, 0xa0, - 0x31, 0x8d, 0x7c, 0xc7, 0xee, 0xdb, 0x8e, 0xf0, 0x39, 0x7f, 0xe2, 0x76, 0x1d, 0x26, 0x21, 0x7e, - 0x25, 0x70, 0x31, 0x43, 0x73, 0x74, 0x8f, 0x07, 0x15, 0x4b, 0x1e, 0xb7, 0x3d, 0x3c, 0x0e, 0x93, - 0x44, 0x8f, 0x7b, 0x6a, 0x02, 0x11, 0x22, 0xac, 0x9d, 0x1f, 0xbb, 0xec, 0x87, 0xbf, 0xeb, 0xe5, - 0xe4, 0x1d, 0x37, 0xca, 0x56, 0xf2, 0x70, 0xc6, 0x6c, 0xfa, 0x85, 0xc0, 0xd5, 0x69, 0x3b, 0xde, - 0x1f, 0x6c, 0xb0, 0x81, 0xe5, 0x0e, 0x9c, 0x93, 0x12, 0x8a, 0x07, 0x04, 0xae, 0xe5, 0x31, 0x01, - 0x63, 0x72, 0x1f, 0xca, 0xa3, 0xf0, 0x3e, 0x11, 0x92, 0x4b, 0xf1, 0x90, 0x28, 0xa0, 0x30, 0x8d, - 0xa9, 0x44, 0x39, 0xa8, 0xef, 0x7f, 0x27, 0x58, 0x57, 0xd1, 0xd8, 0x4a, 0x47, 0x63, 0x6c, 0x0f, - 0xe6, 0xe8, 0xd5, 0x4e, 0x47, 0x3a, 0x5a, 0x02, 0x09, 0x47, 0x27, 0x43, 0x38, 0x77, 0x44, 0x5d, - 0xe2, 0xeb, 0xb0, 0x47, 0x26, 0x53, 0x95, 0xf6, 0xa0, 0xac, 0x28, 0x04, 0xec, 0x18, 0x79, 0xea, - 0xa0, 0xfa, 0x78, 0xa7, 0x4e, 0x93, 0xe7, 0x06, 0x4d, 0x96, 0x80, 0xfe, 0x27, 0x81, 0xba, 0x50, - 0x44, 0x11, 0xbc, 0x93, 0xec, 0x60, 0x1b, 0x9b, 0xa5, 0xd2, 0x2c, 0x74, 0xf4, 0x2a, 0x94, 0x82, - 0xbc, 0x44, 0xdf, 0xce, 0x90, 0xd0, 0xc8, 0x38, 0x69, 0xca, 0x77, 0x42, 0xbb, 0xd4, 0x9d, 0xe0, - 0x09, 0xf9, 0xef, 0x10, 0x9d, 0xe0, 0xa7, 0xb0, 0x29, 0xab, 0x35, 0x47, 0x17, 0x7d, 0x74, 0xe8, - 0xa6, 0x1c, 0xf8, 0xeb, 0x28, 0xbb, 0xaf, 0x54, 0x78, 0x9f, 0xee, 0x7b, 0xfc, 0x7c, 0x2e, 0xbb, - 0xef, 0x3e, 0x26, 0x1c, 0xbb, 0xee, 0xfb, 0xef, 0x1c, 0x9c, 0x13, 0x8a, 0x1b, 0xb6, 0xf5, 0x7f, - 0xfa, 0xba, 0x0d, 0x94, 0x7b, 0x9d, 0xf6, 0x51, 0xf5, 0x88, 0x33, 0xdc, 0xeb, 0xac, 0x4f, 0x8d, - 0xd2, 0x36, 0x50, 0x8b, 0xfb, 0x71, 0x01, 0xf3, 0x07, 0x16, 0x60, 0x71, 0x7f, 0x3d, 0x63, 0x56, - 0x17, 0x67, 0xc9, 0x96, 0x1f, 0x09, 0x68, 0x2a, 0xa7, 0x63, 0x76, 0x98, 0x50, 0xf5, 0xec, 0x8c, - 0xe2, 0x7c, 0x31, 0x9e, 0x20, 0x51, 0x98, 0x58, 0x79, 0x9e, 0xf5, 0xec, 0xc3, 0x17, 0xe8, 0x83, - 0x70, 0x94, 0xc8, 0xec, 0x4e, 0x3e, 0x37, 0x8e, 0x65, 0x59, 0x7e, 0x97, 0x68, 0xe2, 0x4f, 0xff, - 0xe5, 0xf2, 0x07, 0x81, 0x5a, 0x8a, 0x4e, 0x27, 0x79, 0x2c, 0x7f, 0x92, 0x9a, 0x22, 0x47, 0xf5, - 0x4c, 0xba, 0x85, 0x45, 0xf3, 0xb6, 0xcb, 0x7d, 0xe6, 0xb9, 0x1d, 0xb3, 0xff, 0xce, 0xe0, 0x53, - 0x16, 0x79, 0xee, 0x76, 0x6d, 0xd7, 0xe9, 0xfa, 0x02, 0x79, 0xde, 0xc0, 0x5f, 0xfa, 0x3d, 0x38, - 0xaf, 0xe4, 0x42, 0x9d, 0x56, 0xa0, 0xd8, 0x75, 0xb9, 0x8f, 0xea, 0xd4, 0xe2, 0xea, 0xc4, 0xb8, - 0x04, 0xad, 0x4e, 0xe1, 0x8c, 0x80, 0xbc, 0xcb, 0x58, 0x1f, 0xc5, 0xeb, 0x6f, 0xc2, 0x73, 0x91, - 0x33, 0x04, 0x6f, 0x42, 0x71, 0xc8, 0x58, 0x1f, 0xc1, 0x2b, 0x71, 0xf0, 0x31, 0x2d, 0x9a, 0x29, - 0xe8, 0xf4, 0x0a, 0xd0, 0x00, 0xc4, 0xf4, 0xcc, 0xcd, 0xb0, 0xb2, 0xf4, 0x6d, 0x28, 0x4f, 0x9d, - 0x22, 0xf8, 0x2d, 0x28, 0x0d, 0xc5, 0x09, 0xc2, 0x57, 0x13, 0xf0, 0xe2, 0x36, 0x5c, 0x6b, 0x02, - 0xda, 0xd9, 0x72, 0x75, 0xe5, 0xb7, 0x53, 0xf0, 0x8c, 0x90, 0x4d, 0xdb, 0x00, 0x93, 0xd2, 0xa1, - 0x97, 0xe3, 0xb2, 0xd4, 0xff, 0x41, 0x68, 0x2f, 0xef, 0x4b, 0x87, 0xcb, 0x6a, 0x81, 0x7e, 0x0c, - 0x0b, 0xf2, 0x9c, 0xbe, 0x94, 0xcd, 0x17, 0xc2, 0x5f, 0xde, 0x8f, 0x4c, 0xa2, 0x7f, 0x05, 0x15, - 0xd5, 0x13, 0x95, 0x2e, 0x67, 0x23, 0x24, 0xd7, 0x0f, 0xed, 0xe6, 0x0c, 0x1c, 0x52, 0xfc, 0xf7, - 0x04, 0x2e, 0x64, 0xbe, 0xcb, 0xe8, 0xed, 0x6c, 0xd8, 0x8c, 0x85, 0x48, 0x7b, 0xed, 0x20, 0xac, - 0x52, 0xb5, 0x36, 0xc0, 0xe4, 0x22, 0x25, 0xb0, 0x89, 0x87, 0x43, 0x4a, 0x60, 0x93, 0x4b, 0xa2, - 0x5e, 0xa0, 0x5f, 0x42, 0x59, 0xa1, 0x02, 0x6d, 0x29, 0x11, 0xd2, 0xdf, 0x2a, 0xda, 0x72, 0x7e, - 0x86, 0x68, 0xd8, 0x55, 0x4b, 0x70, 0x4a, 0xd8, 0x33, 0x36, 0xfd, 0x94, 0xb0, 0x67, 0x6d, 0xd8, - 0x18, 0xf6, 0xcc, 0x85, 0x30, 0x25, 0xec, 0x79, 0xf6, 0xe0, 0x94, 0xb0, 0xe7, 0xda, 0x3f, 0xf5, - 0x02, 0xed, 0xc2, 0xe9, 0xa9, 0xe5, 0x83, 0x5e, 0x55, 0xc2, 0xa9, 0xb6, 0x42, 0xed, 0x5a, 0x1e, - 0xd2, 0x68, 0xfc, 0x15, 0xd3, 0x37, 0x25, 0xfe, 0xe9, 0x0b, 0x86, 0xb6, 0x9c, 0x9f, 0x41, 0xca, - 0xfe, 0x1c, 0x68, 0x92, 0x80, 0x36, 0x73, 0x22, 0x85, 0x92, 0x5b, 0xb9, 0xe9, 0xa5, 0xe0, 0x1e, - 0x2c, 0x4e, 0x8f, 0x0e, 0xaa, 0x76, 0x9a, 0x72, 0x96, 0x69, 0xaf, 0xe4, 0xa2, 0x95, 0xc2, 0xde, - 0x85, 0xe2, 0x78, 0x94, 0xd0, 0x86, 0x92, 0x2d, 0x32, 0xa5, 0xb4, 0x8b, 0x19, 0x14, 0x12, 0xee, - 0x3d, 0x28, 0x05, 0xa3, 0x83, 0xea, 0x6a, 0xf2, 0xe8, 0x74, 0xd2, 0x2e, 0x65, 0xd2, 0x84, 0xa0, - 0x6b, 0x6f, 0x3d, 0xdc, 0xad, 0x91, 0x47, 0xbb, 0x35, 0xf2, 0xcf, 0x6e, 0x8d, 0x7c, 0xbb, 0x57, - 0x2b, 0x3c, 0xda, 0xab, 0x15, 0xfe, 0xda, 0xab, 0x15, 0xee, 0x5f, 0xcf, 0x5c, 0x3b, 0xbe, 0x90, - 0xff, 0x7b, 0x8b, 0x05, 0x64, 0xa3, 0x24, 0xfe, 0xf6, 0x7e, 0xf5, 0xbf, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xbd, 0x8c, 0x65, 0x94, 0x77, 0x17, 0x00, 0x00, + // 1099 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0x41, 0x6f, 0x1b, 0x45, + 0x14, 0xf6, 0x24, 0xc1, 0x52, 0x1e, 0x6d, 0x54, 0xc6, 0xae, 0x49, 0xb7, 0xd4, 0x76, 0xb7, 0x50, + 0xda, 0x42, 0xed, 0x34, 0xf4, 0xd2, 0x4a, 0x08, 0x25, 0x54, 0x08, 0x0e, 0x48, 0xed, 0x22, 0x02, + 0x2a, 0x48, 0x66, 0xe3, 0x5d, 0xd6, 0x2b, 0x3b, 0x1e, 0x67, 0x67, 0x0d, 0x14, 0x89, 0x2b, 0x5c, + 0x39, 0x21, 0x6e, 0xdc, 0xf9, 0x01, 0x70, 0x80, 0x03, 0x07, 0x24, 0x7a, 0xe0, 0x50, 0x09, 0x90, + 0x38, 0x05, 0x94, 0xfc, 0x03, 0x8e, 0x3d, 0x21, 0xcf, 0xbe, 0x1d, 0xaf, 0x77, 0x67, 0x37, 0x9b, + 0xd8, 0xa9, 0x92, 0x93, 0xed, 0x99, 0xf7, 0xbe, 0xf7, 0xe6, 0x7b, 0x6f, 0xde, 0x7b, 0x63, 0xd0, + 0xda, 0x8c, 0x6f, 0x31, 0xde, 0xe4, 0xbe, 0xd9, 0x75, 0xfb, 0x4e, 0x73, 0x7b, 0x68, 0x7b, 0x0f, + 0x1a, 0x03, 0x8f, 0xf9, 0x8c, 0x2e, 0x05, 0x7b, 0x0d, 0xdc, 0xd3, 0x2e, 0xa0, 0xac, 0x90, 0x69, + 0x0e, 0x4c, 0xc7, 0xed, 0x9b, 0xbe, 0xcb, 0xfa, 0x81, 0xb8, 0x56, 0x76, 0x98, 0xc3, 0xc4, 0xd7, + 0xe6, 0xe8, 0x1b, 0xae, 0x3e, 0x17, 0x33, 0x80, 0x9f, 0xc1, 0xae, 0xde, 0x85, 0xca, 0xbd, 0x11, + 0xda, 0x86, 0xd9, 0x73, 0x2d, 0xd3, 0x67, 0x1e, 0x37, 0xec, 0xed, 0xa1, 0xcd, 0x7d, 0x5a, 0x81, + 0x22, 0xf7, 0x4d, 0x7f, 0xc8, 0x97, 0x49, 0x9d, 0x5c, 0x59, 0x34, 0xf0, 0x17, 0xbd, 0x05, 0x30, + 0xb6, 0xbc, 0x3c, 0x57, 0x27, 0x57, 0x9e, 0x5e, 0x3d, 0xd7, 0x40, 0x4f, 0x03, 0xef, 0xef, 0x9a, + 0x8e, 0x8d, 0x30, 0x46, 0x44, 0x58, 0xff, 0x86, 0xc0, 0xb3, 0x09, 0x6b, 0x7c, 0xc0, 0xfa, 0xdc, + 0xa6, 0xaf, 0x01, 0x7c, 0x22, 0x57, 0x97, 0x49, 0x7d, 0x3e, 0x0a, 0x1b, 0xfa, 0x2c, 0xf5, 0xd6, + 0x17, 0x1e, 0xee, 0xd4, 0x0a, 0x46, 0x44, 0x85, 0xde, 0x56, 0xf8, 0xa5, 0xa9, 0xfc, 0x0a, 0x0c, + 0x4e, 0x38, 0xb6, 0x0d, 0x67, 0x27, 0xfd, 0x0a, 0x49, 0x78, 0x1f, 0x96, 0xa4, 0x89, 0x96, 0x69, + 0x59, 0x9e, 0x20, 0xe3, 0xd4, 0xfa, 0x8d, 0xc7, 0x3b, 0xb5, 0xeb, 0x8e, 0xeb, 0x77, 0x86, 0x9b, + 0x8d, 0x36, 0xdb, 0x6a, 0x22, 0xc7, 0xc1, 0xc7, 0x75, 0x6e, 0x75, 0x9b, 0xfe, 0x83, 0x81, 0xcd, + 0x47, 0x0e, 0xaf, 0x59, 0x96, 0x67, 0x73, 0x6e, 0x9c, 0x96, 0x40, 0xa3, 0x15, 0xfd, 0xbd, 0x38, + 0xf1, 0x92, 0x89, 0x57, 0x61, 0x51, 0x8a, 0x0a, 0x73, 0x39, 0x88, 0x18, 0x6b, 0xe8, 0x3f, 0x12, + 0xa8, 0x4f, 0x22, 0xdf, 0xb1, 0x7b, 0xb6, 0x23, 0x0e, 0xca, 0x8f, 0xfc, 0x5c, 0xd3, 0xa4, 0xc7, + 0x1f, 0x04, 0x2e, 0x66, 0x78, 0x8e, 0xf4, 0x78, 0x50, 0xb6, 0xe4, 0x72, 0xcb, 0xc3, 0xe5, 0x30, + 0x65, 0xf4, 0x38, 0x53, 0x63, 0x88, 0x10, 0x61, 0xfd, 0xfc, 0x88, 0xb2, 0xef, 0xff, 0xa9, 0x95, + 0x92, 0x7b, 0xdc, 0x28, 0x59, 0xc9, 0xc5, 0xa9, 0x72, 0xeb, 0x17, 0x02, 0x57, 0x27, 0x4f, 0xf5, + 0x6e, 0x7f, 0x93, 0xf5, 0x2d, 0xb7, 0xef, 0x9c, 0x94, 0xc0, 0xfc, 0x4a, 0xe0, 0x5a, 0x9e, 0x23, + 0x60, 0x84, 0xee, 0x43, 0x69, 0x18, 0xee, 0x27, 0x02, 0x74, 0x29, 0x1e, 0x20, 0x05, 0x14, 0x26, + 0x35, 0x95, 0x28, 0xb3, 0x89, 0xc4, 0xef, 0x04, 0xef, 0x5c, 0x34, 0xee, 0x92, 0x76, 0x8c, 0xfb, + 0xe1, 0x68, 0x5f, 0x6b, 0xb7, 0x25, 0xed, 0x12, 0x48, 0xd0, 0x9e, 0x0c, 0xe8, 0xdc, 0x8c, 0x2a, + 0xc8, 0x97, 0x61, 0x35, 0x4d, 0xa6, 0x31, 0xed, 0x42, 0x49, 0x71, 0x49, 0xb0, 0x9a, 0xe4, 0xb9, + 0x23, 0x95, 0xc7, 0x3b, 0x35, 0x9a, 0x5c, 0x37, 0x68, 0xf2, 0x7a, 0xe8, 0x7f, 0x11, 0xa8, 0x09, + 0x47, 0x14, 0xa1, 0x3c, 0xc9, 0x04, 0xdb, 0x58, 0x48, 0x95, 0xc7, 0x42, 0xa2, 0xd7, 0xa0, 0x18, + 0x64, 0x29, 0x72, 0x7b, 0x80, 0xf4, 0x46, 0xc5, 0x71, 0xc1, 0xbe, 0x13, 0x9e, 0x4b, 0x5d, 0x17, + 0x8e, 0x88, 0xbf, 0x29, 0xea, 0xc2, 0xcf, 0x61, 0xc1, 0x56, 0x7b, 0x8e, 0x14, 0x7d, 0x30, 0x75, + 0xc1, 0x0e, 0xf8, 0x3a, 0xba, 0xca, 0x2c, 0xdd, 0xdf, 0xa7, 0x32, 0x1f, 0xbf, 0x08, 0xc8, 0xca, + 0xbc, 0xcf, 0x11, 0x8e, 0x79, 0x65, 0xfe, 0x6f, 0x0e, 0xce, 0x89, 0x63, 0x18, 0xb6, 0xf5, 0x24, + 0x99, 0x6f, 0x01, 0xe5, 0x5e, 0xbb, 0x35, 0xab, 0xfa, 0x71, 0x86, 0x7b, 0xed, 0x8d, 0x89, 0xa6, + 0xdb, 0x02, 0x6a, 0x71, 0x3f, 0x6e, 0x60, 0xfe, 0xd0, 0x06, 0x2c, 0xee, 0x6f, 0x64, 0x74, 0xf5, + 0x85, 0x83, 0xe4, 0xce, 0x4f, 0x04, 0x34, 0x15, 0xe9, 0x98, 0x2b, 0x26, 0x54, 0x3c, 0x3b, 0xe3, + 0xe2, 0x3e, 0x1f, 0x4f, 0x97, 0x28, 0x4c, 0xec, 0xea, 0x9e, 0xf5, 0xec, 0x59, 0x5f, 0xde, 0x1f, + 0xc2, 0xa6, 0x23, 0x33, 0x3f, 0xf9, 0x84, 0x39, 0x96, 0x57, 0xf6, 0xbb, 0x44, 0xb9, 0x3f, 0x6e, + 0xaf, 0xa1, 0x3f, 0x09, 0x54, 0x53, 0x3c, 0x3c, 0xc9, 0xed, 0xfc, 0xa3, 0xd4, 0x84, 0x99, 0xd5, + 0xd3, 0xeb, 0x26, 0x5e, 0xa8, 0x37, 0x5d, 0xee, 0x33, 0xcf, 0x6d, 0x9b, 0xbd, 0xb7, 0xfa, 0x1f, + 0xb3, 0xc8, 0x83, 0xba, 0x63, 0xbb, 0x4e, 0xc7, 0x17, 0xc8, 0xf3, 0x06, 0xfe, 0xd2, 0xef, 0xc1, + 0x79, 0xa5, 0x16, 0xfa, 0xb4, 0x0a, 0x0b, 0x1d, 0x97, 0xfb, 0xe8, 0x4e, 0x35, 0xee, 0x4e, 0x4c, + 0x4b, 0xc8, 0xea, 0x14, 0xce, 0x08, 0xc8, 0xbb, 0x8c, 0xf5, 0xd0, 0xbc, 0xfe, 0x3a, 0x3c, 0x13, + 0x59, 0x43, 0xf0, 0x06, 0x2c, 0x0c, 0x18, 0xeb, 0x21, 0x78, 0x39, 0x0e, 0x3e, 0x92, 0xc5, 0x63, + 0x0a, 0x39, 0xbd, 0x0c, 0x34, 0x00, 0x31, 0x3d, 0x73, 0x2b, 0xbc, 0x67, 0xfa, 0x57, 0x04, 0x4a, + 0x13, 0xcb, 0x88, 0x7e, 0x13, 0x8a, 0x03, 0xb1, 0x82, 0xf8, 0x95, 0x04, 0xbe, 0xd8, 0x0d, 0xe7, + 0xa1, 0x40, 0x76, 0x9a, 0xd4, 0x5d, 0xfd, 0xed, 0x14, 0x3c, 0x25, 0x3c, 0xa1, 0x2d, 0x80, 0xf1, + 0xbd, 0xa2, 0x97, 0xe3, 0x96, 0xd5, 0x7f, 0x7a, 0x68, 0x2f, 0xee, 0x2b, 0x87, 0x33, 0x6f, 0x81, + 0x7e, 0x08, 0x8b, 0x72, 0x9d, 0xbe, 0x90, 0xad, 0x17, 0xc2, 0x5f, 0xde, 0x4f, 0x4c, 0xa2, 0x7f, + 0x01, 0x65, 0xd5, 0x2b, 0x98, 0xae, 0x64, 0x23, 0x24, 0xe7, 0x16, 0xed, 0xc6, 0x01, 0x34, 0xa4, + 0xf9, 0x6f, 0x09, 0x5c, 0xc8, 0x7c, 0xec, 0xd1, 0x5b, 0xd9, 0xb0, 0x19, 0x93, 0x94, 0x76, 0xfb, + 0x30, 0xaa, 0xd2, 0xb5, 0x16, 0xc0, 0x78, 0x23, 0x25, 0xb0, 0x89, 0xf7, 0x47, 0x4a, 0x60, 0x93, + 0xb3, 0xa6, 0x5e, 0xa0, 0x9f, 0x43, 0x49, 0xe1, 0x02, 0x6d, 0x2a, 0x11, 0xd2, 0x9f, 0x3c, 0xda, + 0x4a, 0x7e, 0x85, 0x68, 0xd8, 0x55, 0xb3, 0x74, 0x4a, 0xd8, 0x33, 0x1e, 0x0c, 0x29, 0x61, 0xcf, + 0x1a, 0xd4, 0x31, 0xec, 0x99, 0x93, 0x64, 0x4a, 0xd8, 0xf3, 0x0c, 0xd0, 0x29, 0x61, 0xcf, 0x35, + 0xb8, 0xea, 0x05, 0xda, 0x81, 0xd3, 0x13, 0x73, 0x0a, 0xbd, 0xaa, 0x84, 0x53, 0x0d, 0x90, 0xda, + 0xb5, 0x3c, 0xa2, 0xd1, 0xf8, 0x2b, 0x5a, 0x73, 0x4a, 0xfc, 0xd3, 0xa7, 0x0f, 0x6d, 0x25, 0xbf, + 0x82, 0xb4, 0xfd, 0x29, 0xd0, 0xa4, 0x00, 0x6d, 0xe4, 0x44, 0x0a, 0x2d, 0x37, 0x73, 0xcb, 0x4b, + 0xc3, 0x5d, 0x58, 0x9a, 0xec, 0x24, 0x54, 0x4d, 0x9a, 0xb2, 0xb5, 0x69, 0x2f, 0xe5, 0x92, 0x95, + 0xc6, 0xde, 0x86, 0x85, 0x51, 0x67, 0xa1, 0x75, 0xa5, 0x5a, 0xa4, 0x69, 0x69, 0x17, 0x33, 0x24, + 0x24, 0xdc, 0x3b, 0x50, 0x0c, 0x1a, 0x09, 0xd5, 0xd5, 0xe2, 0xd1, 0x66, 0xa5, 0x5d, 0xca, 0x94, + 0x09, 0x41, 0xd7, 0xdf, 0x78, 0xb8, 0x5b, 0x25, 0x8f, 0x76, 0xab, 0xe4, 0xdf, 0xdd, 0x2a, 0xf9, + 0x7a, 0xaf, 0x5a, 0x78, 0xb4, 0x57, 0x2d, 0xfc, 0xbd, 0x57, 0x2d, 0xdc, 0x7f, 0x39, 0x73, 0x0a, + 0xf9, 0x4c, 0xfe, 0xd1, 0x2e, 0xe6, 0x91, 0xcd, 0xa2, 0xf8, 0x9f, 0xfd, 0x95, 0xff, 0x03, 0x00, + 0x00, 0xff, 0xff, 0x9c, 0xed, 0xaa, 0xa9, 0xe8, 0x17, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2194,9 +2194,9 @@ func (m *QueryValidatorsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l - if m.Res != nil { + if m.Pagination != nil { { - size, err := m.Res.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2348,9 +2348,9 @@ func (m *QueryValidatorDelegationsResponse) MarshalToSizedBuffer(dAtA []byte) (i _ = i var l int _ = l - if m.Res != nil { + if m.Pagination != nil { { - size, err := m.Res.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2439,9 +2439,9 @@ func (m *QueryValidatorUnbondingDelegationsResponse) MarshalToSizedBuffer(dAtA [ _ = i var l int _ = l - if m.Res != nil { + if m.Pagination != nil { { - size, err := m.Res.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2672,9 +2672,9 @@ func (m *QueryDelegatorDelegationsResponse) MarshalToSizedBuffer(dAtA []byte) (i _ = i var l int _ = l - if m.Res != nil { + if m.Pagination != nil { { - size, err := m.Res.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2763,9 +2763,9 @@ func (m *QueryDelegatorUnbondingDelegationsResponse) MarshalToSizedBuffer(dAtA [ _ = i var l int _ = l - if m.Res != nil { + if m.Pagination != nil { { - size, err := m.Res.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2868,9 +2868,9 @@ func (m *QueryRedelegationsResponse) MarshalToSizedBuffer(dAtA []byte) (int, err _ = i var l int _ = l - if m.Res != nil { + if m.Pagination != nil { { - size, err := m.Res.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2959,9 +2959,9 @@ func (m *QueryDelegatorValidatorsResponse) MarshalToSizedBuffer(dAtA []byte) (in _ = i var l int _ = l - if m.Res != nil { + if m.Pagination != nil { { - size, err := m.Res.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -3220,9 +3220,9 @@ func (m *QueryParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Res != nil { + if m.Pagination != nil { { - size, err := m.Res.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -3285,8 +3285,8 @@ func (m *QueryValidatorsResponse) Size() (n int) { n += 1 + l + sovQuery(uint64(l)) } } - if m.Res != nil { - l = m.Res.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -3345,8 +3345,8 @@ func (m *QueryValidatorDelegationsResponse) Size() (n int) { n += 1 + l + sovQuery(uint64(l)) } } - if m.Res != nil { - l = m.Res.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -3381,8 +3381,8 @@ func (m *QueryValidatorUnbondingDelegationsResponse) Size() (n int) { n += 1 + l + sovQuery(uint64(l)) } } - if m.Res != nil { - l = m.Res.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -3475,8 +3475,8 @@ func (m *QueryDelegatorDelegationsResponse) Size() (n int) { n += 1 + l + sovQuery(uint64(l)) } } - if m.Res != nil { - l = m.Res.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -3511,8 +3511,8 @@ func (m *QueryDelegatorUnbondingDelegationsResponse) Size() (n int) { n += 1 + l + sovQuery(uint64(l)) } } - if m.Res != nil { - l = m.Res.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -3555,8 +3555,8 @@ func (m *QueryRedelegationsResponse) Size() (n int) { n += 1 + l + sovQuery(uint64(l)) } } - if m.Res != nil { - l = m.Res.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -3591,8 +3591,8 @@ func (m *QueryDelegatorValidatorsResponse) Size() (n int) { n += 1 + l + sovQuery(uint64(l)) } } - if m.Res != nil { - l = m.Res.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -3688,8 +3688,8 @@ func (m *QueryParamsResponse) Size() (n int) { _ = l l = m.Params.Size() n += 1 + l + sovQuery(uint64(l)) - if m.Res != nil { - l = m.Res.Size() + if m.Pagination != nil { + l = m.Pagination.Size() n += 1 + l + sovQuery(uint64(l)) } return n @@ -3887,7 +3887,7 @@ func (m *QueryValidatorsResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Res", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -3914,10 +3914,10 @@ func (m *QueryValidatorsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Res == nil { - m.Res = &query.PageResponse{} + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} } - if err := m.Res.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -4306,7 +4306,7 @@ func (m *QueryValidatorDelegationsResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Res", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -4333,10 +4333,10 @@ func (m *QueryValidatorDelegationsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Res == nil { - m.Res = &query.PageResponse{} + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} } - if err := m.Res.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -4552,7 +4552,7 @@ func (m *QueryValidatorUnbondingDelegationsResponse) Unmarshal(dAtA []byte) erro iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Res", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -4579,10 +4579,10 @@ func (m *QueryValidatorUnbondingDelegationsResponse) Unmarshal(dAtA []byte) erro if postIndex > l { return io.ErrUnexpectedEOF } - if m.Res == nil { - m.Res = &query.PageResponse{} + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} } - if err := m.Res.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -5215,7 +5215,7 @@ func (m *QueryDelegatorDelegationsResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Res", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -5242,10 +5242,10 @@ func (m *QueryDelegatorDelegationsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Res == nil { - m.Res = &query.PageResponse{} + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} } - if err := m.Res.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -5461,7 +5461,7 @@ func (m *QueryDelegatorUnbondingDelegationsResponse) Unmarshal(dAtA []byte) erro iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Res", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -5488,10 +5488,10 @@ func (m *QueryDelegatorUnbondingDelegationsResponse) Unmarshal(dAtA []byte) erro if postIndex > l { return io.ErrUnexpectedEOF } - if m.Res == nil { - m.Res = &query.PageResponse{} + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} } - if err := m.Res.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -5775,7 +5775,7 @@ func (m *QueryRedelegationsResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Res", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -5802,10 +5802,10 @@ func (m *QueryRedelegationsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Res == nil { - m.Res = &query.PageResponse{} + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} } - if err := m.Res.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -6021,7 +6021,7 @@ func (m *QueryDelegatorValidatorsResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Res", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -6048,10 +6048,10 @@ func (m *QueryDelegatorValidatorsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Res == nil { - m.Res = &query.PageResponse{} + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} } - if err := m.Res.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -6703,7 +6703,7 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Res", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -6730,10 +6730,10 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Res == nil { - m.Res = &query.PageResponse{} + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} } - if err := m.Res.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/staking/types/staking.pb.go b/x/staking/types/staking.pb.go index 6b6282948993..f8a27b46f098 100644 --- a/x/staking/types/staking.pb.go +++ b/x/staking/types/staking.pb.go @@ -1574,12 +1574,12 @@ func StakingDescription() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descri 0x75, 0x18, 0xf6, 0x03, 0x8b, 0xdd, 0xb7, 0x8b, 0xc5, 0xa2, 0x81, 0xbb, 0xdb, 0x5b, 0x92, 0xb7, 0xc7, 0x39, 0x7e, 0xe0, 0xf8, 0x81, 0xa3, 0x4e, 0xfc, 0xdc, 0xa3, 0x48, 0x61, 0x01, 0xdc, 0x1d, 0x48, 0xe0, 0x0e, 0x1c, 0x00, 0x47, 0x8a, 0xb2, 0x3d, 0x1e, 0xcc, 0x36, 0x16, 0x43, 0xec, 0xce, - 0x2c, 0x67, 0x66, 0xef, 0x00, 0x96, 0x52, 0xc5, 0x94, 0x64, 0x5b, 0x72, 0x64, 0x4b, 0x76, 0x9c, - 0x84, 0x96, 0x25, 0x85, 0x52, 0x2a, 0x91, 0xa3, 0xc4, 0xb2, 0x9d, 0x38, 0xfa, 0x70, 0xfe, 0xa8, - 0x2a, 0xe5, 0x58, 0xa9, 0x72, 0xa5, 0xa4, 0x94, 0x93, 0x72, 0xa5, 0x52, 0xb0, 0x45, 0xaa, 0xca, - 0x8e, 0xc2, 0x24, 0xca, 0x85, 0x76, 0x5c, 0xd2, 0x8f, 0xb8, 0xfa, 0x6b, 0xbe, 0x76, 0x16, 0x33, - 0x38, 0x1e, 0x29, 0xba, 0xc4, 0x5f, 0xd8, 0x7e, 0xfd, 0xde, 0xeb, 0xee, 0xd7, 0xaf, 0xdf, 0x7b, - 0xfd, 0xba, 0x7b, 0x00, 0x5f, 0x4e, 0xc3, 0x6d, 0x9a, 0x69, 0x77, 0x4d, 0xfb, 0xcc, 0x8b, 0x7d, + 0x2c, 0x67, 0x66, 0xef, 0x00, 0x96, 0x52, 0xc5, 0x94, 0x64, 0x4b, 0x72, 0x64, 0x4b, 0x71, 0x1c, + 0x87, 0x96, 0x25, 0x99, 0x52, 0x2a, 0x91, 0xa3, 0x24, 0xfe, 0x48, 0x1c, 0x7d, 0xd8, 0xf9, 0xa1, + 0xaa, 0x7c, 0x58, 0xa9, 0x72, 0xa5, 0xa4, 0xc4, 0x49, 0xb9, 0x52, 0x29, 0xd8, 0x22, 0x55, 0x65, + 0x45, 0x61, 0x12, 0xe5, 0x42, 0xbb, 0x5c, 0xd2, 0x8f, 0xb8, 0xfa, 0x6b, 0xbe, 0x76, 0x16, 0x33, + 0x38, 0x1e, 0x29, 0xba, 0xa4, 0x5f, 0xd8, 0x7e, 0xfd, 0xde, 0xeb, 0xee, 0xd7, 0xaf, 0xdf, 0x7b, + 0xfd, 0xba, 0x7b, 0x00, 0x5f, 0x4a, 0xc3, 0x6d, 0x9a, 0x69, 0x77, 0x4d, 0xfb, 0xcc, 0x8b, 0x7d, 0x6c, 0xed, 0x9d, 0xe9, 0xa9, 0x6d, 0xdd, 0x50, 0x1d, 0xdd, 0x34, 0x66, 0x7b, 0x96, 0xe9, 0x98, 0xa8, 0xc4, 0xaa, 0x67, 0x69, 0xb5, 0x64, 0x40, 0x71, 0x55, 0x6d, 0x63, 0x19, 0xbf, 0xd8, 0xc7, 0xb6, 0x83, 0x2a, 0x90, 0xd9, 0xc1, 0x7b, 0xd5, 0xd4, 0xc9, 0xd4, 0x4c, 0x49, 0x26, 0x3f, 0xd1, @@ -1588,15 +1588,15 @@ func StakingDescription() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descri 0x0d, 0x47, 0x71, 0x4c, 0x47, 0xed, 0x54, 0xb3, 0x27, 0x53, 0x33, 0x79, 0x19, 0x28, 0x68, 0x9d, 0x40, 0xa4, 0x27, 0xa1, 0xc4, 0xda, 0xb3, 0x7b, 0xa6, 0x61, 0x63, 0x74, 0x1c, 0xf2, 0x06, 0xde, 0x75, 0x14, 0xaf, 0xd5, 0x31, 0x52, 0x7e, 0x1a, 0xef, 0x91, 0x16, 0x18, 0x17, 0xd6, 0x30, 0x2b, - 0x34, 0x9b, 0xdf, 0x7a, 0xed, 0x44, 0xea, 0xdb, 0xaf, 0x9d, 0x48, 0xfd, 0xd9, 0x6b, 0x27, 0x52, - 0x9f, 0x7e, 0xfd, 0xc4, 0xc8, 0xb7, 0x5f, 0x3f, 0x31, 0xf2, 0x27, 0xaf, 0x9f, 0x18, 0x79, 0x7e, + 0x34, 0x9b, 0xdf, 0x78, 0xed, 0x44, 0xea, 0x9b, 0xaf, 0x9d, 0x48, 0xfd, 0xd9, 0x6b, 0x27, 0x52, + 0x9f, 0x7a, 0xfd, 0xc4, 0xc8, 0x37, 0x5f, 0x3f, 0x31, 0xf2, 0x27, 0xaf, 0x9f, 0x18, 0x79, 0x7e, 0xa6, 0xad, 0x3b, 0xdb, 0xfd, 0xcd, 0x59, 0xcd, 0xec, 0x9e, 0xe1, 0x22, 0x60, 0x7f, 0xee, 0xb7, - 0x5b, 0x3b, 0x67, 0x9c, 0xbd, 0x1e, 0xe6, 0x32, 0xd9, 0xcc, 0x51, 0x49, 0xbc, 0x1f, 0x7e, 0xe3, + 0x5b, 0x3b, 0x67, 0x9c, 0xbd, 0x1e, 0xe6, 0x32, 0xd9, 0xcc, 0x51, 0x49, 0xbc, 0x17, 0x7e, 0xfd, 0x1c, 0x9c, 0x6c, 0x9b, 0x66, 0xbb, 0x83, 0xcf, 0x50, 0xc8, 0x66, 0x7f, 0xeb, 0x4c, 0x0b, 0xdb, 0x9a, 0xa5, 0xf7, 0x1c, 0xd3, 0xe2, 0xf2, 0x9a, 0x60, 0x18, 0xb3, 0x02, 0x43, 0x5a, 0x81, 0xc9, 0xf3, 0x7a, 0x07, 0x2f, 0xb8, 0x88, 0x6b, 0xd8, 0x41, 0x8f, 0x42, 0x76, 0x4b, 0xef, 0xe0, 0x6a, 0xea, 0x64, 0x66, 0xa6, 0x78, 0xf6, 0x8e, 0xd9, 0x10, 0xd1, 0x6c, 0x90, 0x62, 0x95, 0x80, 0x65, - 0x4a, 0x21, 0x7d, 0x2f, 0x0b, 0x53, 0x11, 0xb5, 0x08, 0x41, 0xd6, 0x50, 0xbb, 0x98, 0x4a, 0xa5, + 0x4a, 0x21, 0x7d, 0x27, 0x0b, 0x53, 0x11, 0xb5, 0x08, 0x41, 0xd6, 0x50, 0xbb, 0x98, 0x4a, 0xa5, 0x20, 0xd3, 0xdf, 0xa8, 0x0a, 0x63, 0x3d, 0x55, 0xdb, 0x51, 0xdb, 0x98, 0x0a, 0xa5, 0x20, 0x8b, 0x22, 0x3a, 0x01, 0xd0, 0xc2, 0x3d, 0x6c, 0xb4, 0xb0, 0xa1, 0xed, 0x55, 0x33, 0x27, 0x33, 0x33, 0x05, 0xd9, 0x07, 0x41, 0xf7, 0xc2, 0x64, 0xaf, 0xbf, 0xd9, 0xd1, 0x35, 0xc5, 0x87, 0x06, 0x27, @@ -1611,7 +1611,7 @@ func StakingDescription() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descri 0xbd, 0x35, 0x52, 0x11, 0x2e, 0x33, 0x1c, 0x59, 0x20, 0xa3, 0x25, 0xa8, 0xd8, 0x66, 0xdf, 0xd2, 0xb0, 0xa2, 0x99, 0x2d, 0xac, 0xe8, 0xc6, 0x96, 0x59, 0x2d, 0x50, 0x06, 0xf5, 0xc1, 0x81, 0x50, 0xc4, 0x79, 0xb3, 0x85, 0x97, 0x8c, 0x2d, 0x53, 0x2e, 0xdb, 0x81, 0x32, 0x59, 0xaf, 0xf6, 0x9e, - 0xe1, 0xa8, 0xbb, 0xd5, 0x12, 0xd5, 0x10, 0x5e, 0x92, 0xbe, 0x91, 0x83, 0x89, 0x24, 0x2a, 0x76, + 0xe1, 0xa8, 0xbb, 0xd5, 0x12, 0xd5, 0x10, 0x5e, 0x92, 0xbe, 0x96, 0x83, 0x89, 0x24, 0x2a, 0x76, 0x0e, 0x46, 0xb7, 0xc8, 0x28, 0xab, 0xe9, 0xc3, 0xc8, 0x80, 0xd1, 0x04, 0x85, 0x98, 0xbb, 0x41, 0x21, 0xce, 0x41, 0xd1, 0xc0, 0xb6, 0x83, 0x5b, 0x4c, 0x23, 0x32, 0x09, 0x75, 0x0a, 0x18, 0xd1, 0xa0, 0x4a, 0x65, 0x6f, 0x48, 0xa5, 0x9e, 0x83, 0x09, 0xb7, 0x4b, 0x8a, 0xa5, 0x1a, 0x6d, 0xa1, @@ -1622,209 +1622,209 @@ func StakingDescription() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descri 0xd9, 0xd8, 0x91, 0xc9, 0x9c, 0x8c, 0x0d, 0x6c, 0xdc, 0xf2, 0x17, 0xd1, 0x29, 0x70, 0x01, 0x0a, 0x55, 0x2b, 0xa0, 0x56, 0xa8, 0x24, 0x80, 0x97, 0xd4, 0x2e, 0xae, 0xbd, 0x04, 0xe5, 0xa0, 0x78, 0x88, 0x99, 0xb7, 0x1d, 0xd5, 0x72, 0xa8, 0x16, 0x8e, 0xca, 0xac, 0x40, 0x1c, 0x11, 0x36, 0x5a, - 0xd4, 0xca, 0x8d, 0xca, 0xe4, 0x27, 0xfa, 0xa0, 0x37, 0xe0, 0x0c, 0x1d, 0xf0, 0x5d, 0x83, 0x33, - 0x1a, 0xe0, 0x1c, 0x1e, 0x77, 0xed, 0x11, 0x18, 0x0f, 0x0c, 0x20, 0x69, 0xd3, 0xd2, 0x47, 0xe0, + 0xd4, 0xca, 0x8d, 0xca, 0xe4, 0x27, 0x7a, 0xbf, 0x37, 0xe0, 0x0c, 0x1d, 0xf0, 0x5d, 0x83, 0x33, + 0x1a, 0xe0, 0x1c, 0x1e, 0x77, 0xed, 0x11, 0x18, 0x0f, 0x0c, 0x20, 0x69, 0xd3, 0xd2, 0x87, 0xe0, 0x48, 0x24, 0x6b, 0xf4, 0x1c, 0x4c, 0xf7, 0x0d, 0xdd, 0x70, 0xb0, 0xd5, 0xb3, 0x30, 0xd1, 0x58, 0xd6, 0x54, 0xf5, 0xcf, 0xc7, 0x86, 0xe8, 0xdc, 0x86, 0x1f, 0x9b, 0x71, 0x91, 0xa7, 0xfa, 0x83, - 0xc0, 0x7b, 0x0a, 0xf9, 0xbf, 0x18, 0xab, 0xbc, 0xfc, 0xf2, 0xcb, 0x2f, 0xa7, 0xa5, 0x57, 0x72, - 0x30, 0x1d, 0xb5, 0x66, 0x22, 0x97, 0xef, 0x51, 0xc8, 0x19, 0xfd, 0xee, 0x26, 0xb6, 0xa8, 0x90, - 0x46, 0x65, 0x5e, 0x42, 0x73, 0x30, 0xda, 0x51, 0x37, 0x31, 0x73, 0xc9, 0xe5, 0xb3, 0xf7, 0x26, - 0x5a, 0x95, 0xb3, 0xcb, 0x84, 0x44, 0x66, 0x94, 0xe8, 0x09, 0xc8, 0x72, 0x13, 0x4d, 0x38, 0xdc, - 0x93, 0x8c, 0x03, 0x59, 0x4b, 0x32, 0xa5, 0x43, 0xb7, 0x40, 0x81, 0xfc, 0x65, 0xba, 0x91, 0xa3, - 0x7d, 0xce, 0x13, 0x00, 0xd1, 0x0b, 0x54, 0x83, 0x3c, 0x5d, 0x26, 0x2d, 0x2c, 0x5c, 0x9b, 0x5b, - 0x26, 0x8a, 0xd5, 0xc2, 0x5b, 0x6a, 0xbf, 0xe3, 0x28, 0x57, 0xd5, 0x4e, 0x1f, 0x53, 0x85, 0x2f, - 0xc8, 0x25, 0x0e, 0xbc, 0x42, 0x60, 0x24, 0xf2, 0x60, 0xab, 0x4a, 0x37, 0x5a, 0x78, 0x97, 0x5a, - 0xcf, 0x51, 0x99, 0x2d, 0xb4, 0x25, 0x02, 0x21, 0xcd, 0xbf, 0x60, 0x9b, 0x86, 0x50, 0x4d, 0xda, - 0x04, 0x01, 0xd0, 0xe6, 0x1f, 0x09, 0x1b, 0xee, 0xdb, 0xa2, 0x87, 0x17, 0xd6, 0x29, 0xe9, 0xab, - 0x69, 0xc8, 0x52, 0x7b, 0x31, 0x01, 0xc5, 0xf5, 0x0f, 0xad, 0x2e, 0x2a, 0x0b, 0x97, 0x37, 0x9a, - 0xcb, 0x8b, 0x95, 0x14, 0x2a, 0x03, 0x50, 0xc0, 0xf9, 0xe5, 0xcb, 0x73, 0xeb, 0x95, 0xb4, 0x5b, - 0x5e, 0xba, 0xb4, 0xfe, 0xf0, 0x83, 0x95, 0x8c, 0x4b, 0xb0, 0xc1, 0x00, 0x59, 0x3f, 0xc2, 0xfb, - 0xcf, 0x56, 0x46, 0x51, 0x05, 0x4a, 0x8c, 0xc1, 0xd2, 0x73, 0x8b, 0x0b, 0x0f, 0x3f, 0x58, 0xc9, - 0x05, 0x21, 0xef, 0x3f, 0x5b, 0x19, 0x43, 0xe3, 0x50, 0xa0, 0x90, 0xe6, 0xe5, 0xcb, 0xcb, 0x95, - 0xbc, 0xcb, 0x73, 0x6d, 0x5d, 0x5e, 0xba, 0x74, 0xa1, 0x52, 0x70, 0x79, 0x5e, 0x90, 0x2f, 0x6f, - 0xac, 0x56, 0xc0, 0xe5, 0xb0, 0xb2, 0xb8, 0xb6, 0x36, 0x77, 0x61, 0xb1, 0x52, 0x74, 0x31, 0x9a, - 0x1f, 0x5a, 0x5f, 0x5c, 0xab, 0x94, 0x02, 0xdd, 0x7a, 0xff, 0xd9, 0xca, 0xb8, 0xdb, 0xc4, 0xe2, - 0xa5, 0x8d, 0x95, 0x4a, 0x19, 0x4d, 0xc2, 0x38, 0x6b, 0x42, 0x74, 0x62, 0x22, 0x04, 0x7a, 0xf8, - 0xc1, 0x4a, 0xc5, 0xeb, 0x08, 0xe3, 0x32, 0x19, 0x00, 0x3c, 0xfc, 0x60, 0x05, 0x49, 0xf3, 0x30, - 0x4a, 0xb5, 0x0b, 0x21, 0x28, 0x2f, 0xcf, 0x35, 0x17, 0x97, 0x95, 0xcb, 0xab, 0xeb, 0x4b, 0x97, - 0x2f, 0xcd, 0x2d, 0x57, 0x52, 0x1e, 0x4c, 0x5e, 0x7c, 0x66, 0x63, 0x49, 0x5e, 0x5c, 0xa8, 0xa4, - 0xfd, 0xb0, 0xd5, 0xc5, 0xb9, 0xf5, 0xc5, 0x85, 0x4a, 0x46, 0xd2, 0x60, 0x3a, 0xca, 0x4e, 0x46, - 0xae, 0x0c, 0xdf, 0x14, 0xa7, 0x87, 0x4c, 0x31, 0xe5, 0x35, 0x30, 0xc5, 0xaf, 0xa7, 0x61, 0x2a, - 0xc2, 0x57, 0x44, 0x36, 0xf2, 0x24, 0x8c, 0x32, 0x15, 0x65, 0xde, 0xf3, 0x74, 0xa4, 0xd3, 0xa1, - 0x0a, 0x3b, 0xe0, 0x41, 0x29, 0x9d, 0x3f, 0x82, 0xc8, 0x0c, 0x89, 0x20, 0x08, 0x8b, 0x01, 0x9b, - 0xfe, 0xd3, 0x03, 0x36, 0x9d, 0xb9, 0xbd, 0x87, 0x93, 0xb8, 0x3d, 0x0a, 0x3b, 0x9c, 0x6d, 0x1f, - 0x8d, 0xb0, 0xed, 0xe7, 0x60, 0x72, 0x80, 0x51, 0x62, 0x1b, 0xfb, 0xd1, 0x14, 0x54, 0x87, 0x09, - 0x27, 0xc6, 0xd2, 0xa5, 0x03, 0x96, 0xee, 0x5c, 0x58, 0x82, 0xb7, 0x0f, 0x9f, 0x84, 0x81, 0xb9, - 0xfe, 0x52, 0x0a, 0x8e, 0x46, 0x47, 0x8a, 0x91, 0x7d, 0x78, 0x02, 0x72, 0x5d, 0xec, 0x6c, 0x9b, - 0x22, 0x5a, 0xba, 0x2b, 0xc2, 0x07, 0x93, 0xea, 0xf0, 0x64, 0x73, 0x2a, 0xbf, 0x13, 0xcf, 0x0c, - 0x0b, 0xf7, 0x58, 0x6f, 0x06, 0x7a, 0xfa, 0x89, 0x34, 0x1c, 0x89, 0x64, 0x1e, 0xd9, 0xd1, 0xdb, - 0x00, 0x74, 0xa3, 0xd7, 0x77, 0x58, 0x44, 0xc4, 0x0c, 0x6c, 0x81, 0x42, 0xa8, 0xf1, 0x22, 0xc6, - 0xb3, 0xef, 0xb8, 0xf5, 0x19, 0x5a, 0x0f, 0x0c, 0x44, 0x11, 0x1e, 0xf5, 0x3a, 0x9a, 0xa5, 0x1d, - 0x3d, 0x31, 0x64, 0xa4, 0x03, 0x8a, 0xf9, 0x00, 0x54, 0xb4, 0x8e, 0x8e, 0x0d, 0x47, 0xb1, 0x1d, - 0x0b, 0xab, 0x5d, 0xdd, 0x68, 0x53, 0x0f, 0x92, 0x6f, 0x8c, 0x6e, 0xa9, 0x1d, 0x1b, 0xcb, 0x13, - 0xac, 0x7a, 0x4d, 0xd4, 0x12, 0x0a, 0xaa, 0x40, 0x96, 0x8f, 0x22, 0x17, 0xa0, 0x60, 0xd5, 0x2e, - 0x85, 0xf4, 0xab, 0x05, 0x28, 0xfa, 0xe2, 0x6a, 0x74, 0x3b, 0x94, 0x5e, 0x50, 0xaf, 0xaa, 0x8a, - 0xd8, 0x2b, 0x31, 0x49, 0x14, 0x09, 0x6c, 0x95, 0xef, 0x97, 0x1e, 0x80, 0x69, 0x8a, 0x62, 0xf6, - 0x1d, 0x6c, 0x29, 0x5a, 0x47, 0xb5, 0x6d, 0x2a, 0xb4, 0x3c, 0x45, 0x45, 0xa4, 0xee, 0x32, 0xa9, - 0x9a, 0x17, 0x35, 0xe8, 0x21, 0x98, 0xa2, 0x14, 0xdd, 0x7e, 0xc7, 0xd1, 0x7b, 0x1d, 0xac, 0x90, - 0xdd, 0x9b, 0x4d, 0x3d, 0x89, 0xdb, 0xb3, 0x49, 0x82, 0xb1, 0xc2, 0x11, 0x48, 0x8f, 0x6c, 0xb4, - 0x00, 0xb7, 0x51, 0xb2, 0x36, 0x36, 0xb0, 0xa5, 0x3a, 0x58, 0xc1, 0x2f, 0xf6, 0xd5, 0x8e, 0xad, - 0xa8, 0x46, 0x4b, 0xd9, 0x56, 0xed, 0xed, 0xea, 0x34, 0x61, 0xd0, 0x4c, 0x57, 0x53, 0xf2, 0x71, - 0x82, 0x78, 0x81, 0xe3, 0x2d, 0x52, 0xb4, 0x39, 0xa3, 0x75, 0x51, 0xb5, 0xb7, 0x51, 0x03, 0x8e, - 0x52, 0x2e, 0xb6, 0x63, 0xe9, 0x46, 0x5b, 0xd1, 0xb6, 0xb1, 0xb6, 0xa3, 0xf4, 0x9d, 0xad, 0x47, - 0xab, 0xb7, 0xf8, 0xdb, 0xa7, 0x3d, 0x5c, 0xa3, 0x38, 0xf3, 0x04, 0x65, 0xc3, 0xd9, 0x7a, 0x14, - 0xad, 0x41, 0x89, 0x4c, 0x46, 0x57, 0x7f, 0x09, 0x2b, 0x5b, 0xa6, 0x45, 0x5d, 0x63, 0x39, 0xc2, - 0x34, 0xf9, 0x24, 0x38, 0x7b, 0x99, 0x13, 0xac, 0x98, 0x2d, 0xdc, 0x18, 0x5d, 0x5b, 0x5d, 0x5c, - 0x5c, 0x90, 0x8b, 0x82, 0xcb, 0x79, 0xd3, 0x22, 0x0a, 0xd5, 0x36, 0x5d, 0x01, 0x17, 0x99, 0x42, - 0xb5, 0x4d, 0x21, 0xde, 0x87, 0x60, 0x4a, 0xd3, 0xd8, 0x98, 0x75, 0x4d, 0xe1, 0x7b, 0x2c, 0xbb, - 0x5a, 0x09, 0x08, 0x4b, 0xd3, 0x2e, 0x30, 0x04, 0xae, 0xe3, 0x36, 0x7a, 0x0c, 0x8e, 0x78, 0xc2, - 0xf2, 0x13, 0x4e, 0x0e, 0x8c, 0x32, 0x4c, 0xfa, 0x10, 0x4c, 0xf5, 0xf6, 0x06, 0x09, 0x51, 0xa0, - 0xc5, 0xde, 0x5e, 0x98, 0xec, 0x11, 0x98, 0xee, 0x6d, 0xf7, 0x06, 0xe9, 0xee, 0xf1, 0xd3, 0xa1, - 0xde, 0x76, 0x2f, 0x4c, 0x78, 0x27, 0xdd, 0x70, 0x5b, 0x58, 0x53, 0x1d, 0xdc, 0xaa, 0x1e, 0xf3, - 0xa3, 0xfb, 0x2a, 0xd0, 0x19, 0xa8, 0x68, 0x9a, 0x82, 0x0d, 0x75, 0xb3, 0x83, 0x15, 0xd5, 0xc2, - 0x86, 0x6a, 0x57, 0xeb, 0x7e, 0xe4, 0xb2, 0xa6, 0x2d, 0xd2, 0xda, 0x39, 0x5a, 0x89, 0xee, 0x81, - 0x49, 0x73, 0xf3, 0x05, 0x8d, 0xa9, 0xa4, 0xd2, 0xb3, 0xf0, 0x96, 0xbe, 0x5b, 0xbd, 0x83, 0xca, - 0x77, 0x82, 0x54, 0x50, 0x85, 0x5c, 0xa5, 0x60, 0x74, 0x1a, 0x2a, 0x9a, 0xbd, 0xad, 0x5a, 0x3d, - 0x6a, 0x93, 0xed, 0x9e, 0xaa, 0xe1, 0xea, 0x9d, 0x0c, 0x95, 0xc1, 0x2f, 0x09, 0x30, 0x59, 0x12, - 0xf6, 0x35, 0x7d, 0xcb, 0x11, 0x1c, 0xef, 0x66, 0x4b, 0x82, 0xc2, 0x38, 0xb7, 0x19, 0xa8, 0x10, - 0x51, 0x04, 0x1a, 0x9e, 0xa1, 0x68, 0xe5, 0xde, 0x76, 0xcf, 0xdf, 0xee, 0x29, 0x18, 0x27, 0x98, - 0x5e, 0xa3, 0xa7, 0x59, 0x40, 0xd6, 0xdb, 0xf6, 0xb5, 0xf8, 0x20, 0x1c, 0x25, 0x48, 0x5d, 0xec, - 0xa8, 0x2d, 0xd5, 0x51, 0x7d, 0xd8, 0xf7, 0x51, 0x6c, 0x22, 0xf7, 0x15, 0x5e, 0x19, 0xe8, 0xa7, - 0xd5, 0xdf, 0xdc, 0x73, 0x35, 0xeb, 0x7e, 0xd6, 0x4f, 0x02, 0x13, 0xba, 0xf5, 0xb6, 0x05, 0xdd, - 0x52, 0x03, 0x4a, 0x7e, 0xc5, 0x47, 0x05, 0x60, 0xaa, 0x5f, 0x49, 0x91, 0x28, 0x68, 0xfe, 0xf2, - 0x02, 0x89, 0x5f, 0x9e, 0x5f, 0xac, 0xa4, 0x49, 0x1c, 0xb5, 0xbc, 0xb4, 0xbe, 0xa8, 0xc8, 0x1b, - 0x97, 0xd6, 0x97, 0x56, 0x16, 0x2b, 0x19, 0x5f, 0xc0, 0xfe, 0x54, 0x36, 0x7f, 0x57, 0xe5, 0x6e, - 0xe9, 0x3b, 0x69, 0x28, 0x07, 0x77, 0x60, 0xe8, 0x71, 0x38, 0x26, 0xd2, 0x25, 0x36, 0x76, 0x94, - 0x6b, 0xba, 0x45, 0x57, 0x64, 0x57, 0x65, 0xde, 0xd1, 0xd5, 0x89, 0x69, 0x8e, 0xb5, 0x86, 0x9d, - 0x67, 0x75, 0x8b, 0xac, 0xb7, 0xae, 0xea, 0xa0, 0x65, 0xa8, 0x1b, 0xa6, 0x62, 0x3b, 0xaa, 0xd1, - 0x52, 0xad, 0x96, 0xe2, 0x25, 0xaa, 0x14, 0x55, 0xd3, 0xb0, 0x6d, 0x9b, 0xcc, 0x13, 0xba, 0x5c, - 0x6e, 0x35, 0xcc, 0x35, 0x8e, 0xec, 0xb9, 0x88, 0x39, 0x8e, 0x1a, 0xd2, 0xdf, 0xcc, 0x30, 0xfd, - 0xbd, 0x05, 0x0a, 0x5d, 0xb5, 0xa7, 0x60, 0xc3, 0xb1, 0xf6, 0x68, 0xdc, 0x9d, 0x97, 0xf3, 0x5d, - 0xb5, 0xb7, 0x48, 0xca, 0xef, 0xc8, 0xf6, 0xe7, 0xa9, 0x6c, 0x3e, 0x5f, 0x29, 0x3c, 0x95, 0xcd, - 0x17, 0x2a, 0x20, 0xbd, 0x96, 0x81, 0x92, 0x3f, 0x0e, 0x27, 0xdb, 0x1a, 0x8d, 0xba, 0xac, 0x14, - 0x35, 0x6a, 0xa7, 0x0e, 0x8c, 0xda, 0x67, 0xe7, 0x89, 0x2f, 0x6b, 0xe4, 0x58, 0x74, 0x2c, 0x33, - 0x4a, 0x12, 0x47, 0x10, 0x65, 0xc3, 0x2c, 0x1a, 0xc9, 0xcb, 0xbc, 0x84, 0x2e, 0x40, 0xee, 0x05, - 0x9b, 0xf2, 0xce, 0x51, 0xde, 0x77, 0x1c, 0xcc, 0xfb, 0xa9, 0x35, 0xca, 0xbc, 0xf0, 0xd4, 0x9a, - 0x72, 0xe9, 0xb2, 0xbc, 0x32, 0xb7, 0x2c, 0x73, 0x72, 0x74, 0x1c, 0xb2, 0x1d, 0xf5, 0xa5, 0xbd, - 0xa0, 0xd7, 0xa3, 0xa0, 0xa4, 0x93, 0x70, 0x1c, 0xb2, 0xd7, 0xb0, 0xba, 0x13, 0xf4, 0x35, 0x14, - 0xf4, 0x36, 0x2e, 0x86, 0x33, 0x30, 0x4a, 0xe5, 0x85, 0x00, 0xb8, 0xc4, 0x2a, 0x23, 0x28, 0x0f, - 0xd9, 0xf9, 0xcb, 0x32, 0x59, 0x10, 0x15, 0x28, 0x31, 0xa8, 0xb2, 0xba, 0xb4, 0x38, 0xbf, 0x58, - 0x49, 0x4b, 0x0f, 0x41, 0x8e, 0x09, 0x81, 0x2c, 0x16, 0x57, 0x0c, 0x95, 0x11, 0x5e, 0xe4, 0x3c, - 0x52, 0xa2, 0x76, 0x63, 0xa5, 0xb9, 0x28, 0x57, 0xd2, 0xc1, 0xa9, 0xce, 0x56, 0x46, 0x25, 0x1b, - 0x4a, 0xfe, 0x40, 0xfc, 0x9d, 0xd9, 0x64, 0x7f, 0x33, 0x05, 0x45, 0x5f, 0x60, 0x4d, 0x22, 0x22, - 0xb5, 0xd3, 0x31, 0xaf, 0x29, 0x6a, 0x47, 0x57, 0x6d, 0xae, 0x1a, 0x40, 0x41, 0x73, 0x04, 0x92, - 0x74, 0xea, 0xde, 0xa1, 0x25, 0x32, 0x5a, 0xc9, 0x49, 0x9f, 0x4f, 0x41, 0x25, 0x1c, 0xd9, 0x86, - 0xba, 0x99, 0xfa, 0x71, 0x76, 0x53, 0xfa, 0x6c, 0x0a, 0xca, 0xc1, 0x70, 0x36, 0xd4, 0xbd, 0xdb, - 0x7f, 0xac, 0xdd, 0xfb, 0xb3, 0x34, 0x8c, 0x07, 0x82, 0xd8, 0xa4, 0xbd, 0x7b, 0x11, 0x26, 0xf5, - 0x16, 0xee, 0xf6, 0x4c, 0x07, 0x1b, 0xda, 0x9e, 0xd2, 0xc1, 0x57, 0x71, 0xa7, 0x2a, 0x51, 0xa3, - 0x71, 0xe6, 0xe0, 0x30, 0x79, 0x76, 0xc9, 0xa3, 0x5b, 0x26, 0x64, 0x8d, 0xa9, 0xa5, 0x85, 0xc5, - 0x95, 0xd5, 0xcb, 0xeb, 0x8b, 0x97, 0xe6, 0x3f, 0xa4, 0x6c, 0x5c, 0x7a, 0xfa, 0xd2, 0xe5, 0x67, - 0x2f, 0xc9, 0x15, 0x3d, 0x84, 0xf6, 0x36, 0x2e, 0xfb, 0x55, 0xa8, 0x84, 0x3b, 0x85, 0x8e, 0x41, - 0x54, 0xb7, 0x2a, 0x23, 0x68, 0x0a, 0x26, 0x2e, 0x5d, 0x56, 0xd6, 0x96, 0x16, 0x16, 0x95, 0xc5, - 0xf3, 0xe7, 0x17, 0xe7, 0xd7, 0xd7, 0x58, 0xe2, 0xc3, 0xc5, 0x5e, 0x0f, 0x2c, 0x70, 0xe9, 0x33, - 0x19, 0x98, 0x8a, 0xe8, 0x09, 0x9a, 0xe3, 0x5b, 0x16, 0xb6, 0x8b, 0xba, 0x3f, 0x49, 0xef, 0x67, - 0x49, 0xcc, 0xb0, 0xaa, 0x5a, 0x0e, 0xdf, 0xe1, 0x9c, 0x06, 0x22, 0x25, 0xc3, 0xd1, 0xb7, 0x74, - 0x6c, 0xf1, 0x3c, 0x11, 0xdb, 0xc7, 0x4c, 0x78, 0x70, 0x96, 0x2a, 0xba, 0x0f, 0x50, 0xcf, 0xb4, - 0x75, 0x47, 0xbf, 0x8a, 0x15, 0xdd, 0x10, 0x49, 0xa5, 0x2c, 0x3d, 0x65, 0xaa, 0x88, 0x9a, 0x25, - 0xc3, 0x71, 0xb1, 0x0d, 0xdc, 0x56, 0x43, 0xd8, 0xc4, 0x98, 0x67, 0xe4, 0x8a, 0xa8, 0x71, 0xb1, - 0x6f, 0x87, 0x52, 0xcb, 0xec, 0x93, 0x60, 0x8f, 0xe1, 0x11, 0xdf, 0x91, 0x92, 0x8b, 0x0c, 0xe6, - 0xa2, 0xf0, 0x30, 0xde, 0xcb, 0x66, 0x95, 0xe4, 0x22, 0x83, 0x31, 0x94, 0xbb, 0x61, 0x42, 0x6d, - 0xb7, 0x2d, 0xc2, 0x5c, 0x30, 0x62, 0x1b, 0x93, 0xb2, 0x0b, 0xa6, 0x88, 0xb5, 0xa7, 0x20, 0x2f, - 0xe4, 0x40, 0x5c, 0x35, 0x91, 0x84, 0xd2, 0x63, 0xbb, 0xed, 0xf4, 0x4c, 0x41, 0xce, 0x1b, 0xa2, - 0xf2, 0x76, 0x28, 0xe9, 0xb6, 0xe2, 0x25, 0xe7, 0xd3, 0x27, 0xd3, 0x33, 0x79, 0xb9, 0xa8, 0xdb, - 0x6e, 0x62, 0x53, 0xfa, 0x52, 0x1a, 0xca, 0xc1, 0xc3, 0x05, 0xb4, 0x00, 0xf9, 0x8e, 0xa9, 0xd1, - 0xd3, 0x43, 0x7e, 0xb2, 0x35, 0x13, 0x73, 0x1e, 0x31, 0xbb, 0xcc, 0xf1, 0x65, 0x97, 0xb2, 0xf6, - 0x1f, 0x53, 0x90, 0x17, 0x60, 0x74, 0x14, 0xb2, 0x3d, 0xd5, 0xd9, 0xa6, 0xec, 0x46, 0x9b, 0xe9, - 0x4a, 0x4a, 0xa6, 0x65, 0x02, 0xb7, 0x7b, 0xaa, 0x41, 0x55, 0x80, 0xc3, 0x49, 0x99, 0xcc, 0x6b, - 0x07, 0xab, 0x2d, 0xba, 0xeb, 0x31, 0xbb, 0x5d, 0x6c, 0x38, 0xb6, 0x98, 0x57, 0x0e, 0x9f, 0xe7, - 0x60, 0x74, 0x2f, 0x4c, 0x3a, 0x96, 0xaa, 0x77, 0x02, 0xb8, 0x59, 0x8a, 0x5b, 0x11, 0x15, 0x2e, - 0x72, 0x03, 0x8e, 0x0b, 0xbe, 0x2d, 0xec, 0xa8, 0xda, 0x36, 0x6e, 0x79, 0x44, 0x39, 0x9a, 0xdd, - 0x38, 0xc6, 0x11, 0x16, 0x78, 0xbd, 0xa0, 0x95, 0xbe, 0x93, 0x82, 0x49, 0xb1, 0x4f, 0x6b, 0xb9, - 0xc2, 0x5a, 0x01, 0x50, 0x0d, 0xc3, 0x74, 0xfc, 0xe2, 0x1a, 0x54, 0xe5, 0x01, 0xba, 0xd9, 0x39, - 0x97, 0x48, 0xf6, 0x31, 0xa8, 0x75, 0x01, 0xbc, 0x9a, 0xa1, 0x62, 0xab, 0x43, 0x91, 0x9f, 0x1c, - 0xd1, 0xe3, 0x47, 0xb6, 0xb3, 0x07, 0x06, 0x22, 0x1b, 0x3a, 0x34, 0x0d, 0xa3, 0x9b, 0xb8, 0xad, - 0x1b, 0x3c, 0x1f, 0xcc, 0x0a, 0x22, 0xff, 0x92, 0x75, 0xf3, 0x2f, 0xcd, 0x4f, 0xa5, 0x60, 0x4a, - 0x33, 0xbb, 0xe1, 0xfe, 0x36, 0x2b, 0xa1, 0xf4, 0x82, 0x7d, 0x31, 0xf5, 0xfc, 0x13, 0xbe, 0x93, - 0xd6, 0xb6, 0xd9, 0x51, 0x8d, 0xb6, 0x77, 0x7e, 0x4a, 0x7f, 0x68, 0xf7, 0xb7, 0xb1, 0x71, 0x7f, - 0xdb, 0xf4, 0x9d, 0xa6, 0x9e, 0xf3, 0x7e, 0xfe, 0x75, 0x2a, 0xf5, 0xc5, 0x74, 0xe6, 0xc2, 0x6a, - 0xf3, 0xcb, 0xe9, 0xda, 0x05, 0xd6, 0xdc, 0xaa, 0x10, 0x8f, 0x8c, 0xb7, 0x3a, 0x58, 0x23, 0x43, - 0x86, 0xef, 0xdf, 0x0b, 0xd3, 0x6d, 0xb3, 0x6d, 0x52, 0x8e, 0x67, 0xc8, 0x2f, 0x7e, 0x22, 0x5b, - 0x70, 0xa1, 0xb5, 0xd8, 0xe3, 0xdb, 0xc6, 0x25, 0x98, 0xe2, 0xc8, 0x0a, 0x3d, 0x12, 0x62, 0x1b, - 0x1b, 0x74, 0x60, 0x5a, 0xad, 0xfa, 0xbb, 0xdf, 0xa3, 0x0e, 0x5d, 0x9e, 0xe4, 0xa4, 0xa4, 0x8e, - 0xed, 0x7d, 0x1a, 0x32, 0x1c, 0x09, 0xf0, 0x63, 0xcb, 0x16, 0x5b, 0x31, 0x1c, 0xff, 0x80, 0x73, + 0xc0, 0x7b, 0x0a, 0xf9, 0xef, 0x8e, 0x55, 0x5e, 0x7e, 0xf9, 0xe5, 0x97, 0xd3, 0xd2, 0x2b, 0x39, + 0x98, 0x8e, 0x5a, 0x33, 0x91, 0xcb, 0xf7, 0x28, 0xe4, 0x8c, 0x7e, 0x77, 0x13, 0x5b, 0x54, 0x48, + 0xa3, 0x32, 0x2f, 0xa1, 0x39, 0x18, 0xed, 0xa8, 0x9b, 0x98, 0xb9, 0xe4, 0xf2, 0xd9, 0x7b, 0x13, + 0xad, 0xca, 0xd9, 0x65, 0x42, 0x22, 0x33, 0x4a, 0xf4, 0x04, 0x64, 0xb9, 0x89, 0x26, 0x1c, 0xee, + 0x49, 0xc6, 0x81, 0xac, 0x25, 0x99, 0xd2, 0xa1, 0x5b, 0xa0, 0x40, 0xfe, 0x32, 0xdd, 0xc8, 0xd1, + 0x3e, 0xe7, 0x09, 0x80, 0xe8, 0x05, 0xaa, 0x41, 0x9e, 0x2e, 0x93, 0x16, 0x16, 0xae, 0xcd, 0x2d, + 0x13, 0xc5, 0x6a, 0xe1, 0x2d, 0xb5, 0xdf, 0x71, 0x94, 0xab, 0x6a, 0xa7, 0x8f, 0xa9, 0xc2, 0x17, + 0xe4, 0x12, 0x07, 0x5e, 0x21, 0x30, 0x12, 0x79, 0xb0, 0x55, 0xa5, 0x1b, 0x2d, 0xbc, 0x4b, 0xad, + 0xe7, 0xa8, 0xcc, 0x16, 0xda, 0x12, 0x81, 0x90, 0xe6, 0x5f, 0xb0, 0x4d, 0x43, 0xa8, 0x26, 0x6d, + 0x82, 0x00, 0x68, 0xf3, 0x8f, 0x84, 0x0d, 0xf7, 0x6d, 0xd1, 0xc3, 0x0b, 0xeb, 0x94, 0xf4, 0xe5, + 0x34, 0x64, 0xa9, 0xbd, 0x98, 0x80, 0xe2, 0xfa, 0x07, 0x56, 0x17, 0x95, 0x85, 0xcb, 0x1b, 0xcd, + 0xe5, 0xc5, 0x4a, 0x0a, 0x95, 0x01, 0x28, 0xe0, 0xfc, 0xf2, 0xe5, 0xb9, 0xf5, 0x4a, 0xda, 0x2d, + 0x2f, 0x5d, 0x5a, 0x7f, 0xf8, 0xc1, 0x4a, 0xc6, 0x25, 0xd8, 0x60, 0x80, 0xac, 0x1f, 0xe1, 0xbd, + 0x67, 0x2b, 0xa3, 0xa8, 0x02, 0x25, 0xc6, 0x60, 0xe9, 0xb9, 0xc5, 0x85, 0x87, 0x1f, 0xac, 0xe4, + 0x82, 0x90, 0xf7, 0x9e, 0xad, 0x8c, 0xa1, 0x71, 0x28, 0x50, 0x48, 0xf3, 0xf2, 0xe5, 0xe5, 0x4a, + 0xde, 0xe5, 0xb9, 0xb6, 0x2e, 0x2f, 0x5d, 0xba, 0x50, 0x29, 0xb8, 0x3c, 0x2f, 0xc8, 0x97, 0x37, + 0x56, 0x2b, 0xe0, 0x72, 0x58, 0x59, 0x5c, 0x5b, 0x9b, 0xbb, 0xb0, 0x58, 0x29, 0xba, 0x18, 0xcd, + 0x0f, 0xac, 0x2f, 0xae, 0x55, 0x4a, 0x81, 0x6e, 0xbd, 0xf7, 0x6c, 0x65, 0xdc, 0x6d, 0x62, 0xf1, + 0xd2, 0xc6, 0x4a, 0xa5, 0x8c, 0x26, 0x61, 0x9c, 0x35, 0x21, 0x3a, 0x31, 0x11, 0x02, 0x3d, 0xfc, + 0x60, 0xa5, 0xe2, 0x75, 0x84, 0x71, 0x99, 0x0c, 0x00, 0x1e, 0x7e, 0xb0, 0x82, 0xa4, 0x79, 0x18, + 0xa5, 0xda, 0x85, 0x10, 0x94, 0x97, 0xe7, 0x9a, 0x8b, 0xcb, 0xca, 0xe5, 0xd5, 0xf5, 0xa5, 0xcb, + 0x97, 0xe6, 0x96, 0x2b, 0x29, 0x0f, 0x26, 0x2f, 0x3e, 0xb3, 0xb1, 0x24, 0x2f, 0x2e, 0x54, 0xd2, + 0x7e, 0xd8, 0xea, 0xe2, 0xdc, 0xfa, 0xe2, 0x42, 0x25, 0x23, 0x69, 0x30, 0x1d, 0x65, 0x27, 0x23, + 0x57, 0x86, 0x6f, 0x8a, 0xd3, 0x43, 0xa6, 0x98, 0xf2, 0x1a, 0x98, 0xe2, 0xd7, 0xd3, 0x30, 0x15, + 0xe1, 0x2b, 0x22, 0x1b, 0x79, 0x12, 0x46, 0x99, 0x8a, 0x32, 0xef, 0x79, 0x3a, 0xd2, 0xe9, 0x50, + 0x85, 0x1d, 0xf0, 0xa0, 0x94, 0xce, 0x1f, 0x41, 0x64, 0x86, 0x44, 0x10, 0x84, 0xc5, 0x80, 0x4d, + 0xff, 0xe9, 0x01, 0x9b, 0xce, 0xdc, 0xde, 0xc3, 0x49, 0xdc, 0x1e, 0x85, 0x1d, 0xce, 0xb6, 0x8f, + 0x46, 0xd8, 0xf6, 0x73, 0x30, 0x39, 0xc0, 0x28, 0xb1, 0x8d, 0xfd, 0x70, 0x0a, 0xaa, 0xc3, 0x84, + 0x13, 0x63, 0xe9, 0xd2, 0x01, 0x4b, 0x77, 0x2e, 0x2c, 0xc1, 0xdb, 0x87, 0x4f, 0xc2, 0xc0, 0x5c, + 0x7f, 0x31, 0x05, 0x47, 0xa3, 0x23, 0xc5, 0xc8, 0x3e, 0x3c, 0x01, 0xb9, 0x2e, 0x76, 0xb6, 0x4d, + 0x11, 0x2d, 0xdd, 0x15, 0xe1, 0x83, 0x49, 0x75, 0x78, 0xb2, 0x39, 0x95, 0xdf, 0x89, 0x67, 0x86, + 0x85, 0x7b, 0xac, 0x37, 0x03, 0x3d, 0xfd, 0x78, 0x1a, 0x8e, 0x44, 0x32, 0x8f, 0xec, 0xe8, 0x6d, + 0x00, 0xba, 0xd1, 0xeb, 0x3b, 0x2c, 0x22, 0x62, 0x06, 0xb6, 0x40, 0x21, 0xd4, 0x78, 0x11, 0xe3, + 0xd9, 0x77, 0xdc, 0xfa, 0x0c, 0xad, 0x07, 0x06, 0xa2, 0x08, 0x8f, 0x7a, 0x1d, 0xcd, 0xd2, 0x8e, + 0x9e, 0x18, 0x32, 0xd2, 0x01, 0xc5, 0x7c, 0x00, 0x2a, 0x5a, 0x47, 0xc7, 0x86, 0xa3, 0xd8, 0x8e, + 0x85, 0xd5, 0xae, 0x6e, 0xb4, 0xa9, 0x07, 0xc9, 0x37, 0x46, 0xb7, 0xd4, 0x8e, 0x8d, 0xe5, 0x09, + 0x56, 0xbd, 0x26, 0x6a, 0x09, 0x05, 0x55, 0x20, 0xcb, 0x47, 0x91, 0x0b, 0x50, 0xb0, 0x6a, 0x97, + 0x42, 0xfa, 0xe5, 0x02, 0x14, 0x7d, 0x71, 0x35, 0xba, 0x1d, 0x4a, 0x2f, 0xa8, 0x57, 0x55, 0x45, + 0xec, 0x95, 0x98, 0x24, 0x8a, 0x04, 0xb6, 0xca, 0xf7, 0x4b, 0x0f, 0xc0, 0x34, 0x45, 0x31, 0xfb, + 0x0e, 0xb6, 0x14, 0xad, 0xa3, 0xda, 0x36, 0x15, 0x5a, 0x9e, 0xa2, 0x22, 0x52, 0x77, 0x99, 0x54, + 0xcd, 0x8b, 0x1a, 0xf4, 0x10, 0x4c, 0x51, 0x8a, 0x6e, 0xbf, 0xe3, 0xe8, 0xbd, 0x0e, 0x56, 0xc8, + 0xee, 0xcd, 0xa6, 0x9e, 0xc4, 0xed, 0xd9, 0x24, 0xc1, 0x58, 0xe1, 0x08, 0xa4, 0x47, 0x36, 0x5a, + 0x80, 0xdb, 0x28, 0x59, 0x1b, 0x1b, 0xd8, 0x52, 0x1d, 0xac, 0xe0, 0x17, 0xfb, 0x6a, 0xc7, 0x56, + 0x54, 0xa3, 0xa5, 0x6c, 0xab, 0xf6, 0x76, 0x75, 0x9a, 0x30, 0x68, 0xa6, 0xab, 0x29, 0xf9, 0x38, + 0x41, 0xbc, 0xc0, 0xf1, 0x16, 0x29, 0xda, 0x9c, 0xd1, 0xba, 0xa8, 0xda, 0xdb, 0xa8, 0x01, 0x47, + 0x29, 0x17, 0xdb, 0xb1, 0x74, 0xa3, 0xad, 0x68, 0xdb, 0x58, 0xdb, 0x51, 0xfa, 0xce, 0xd6, 0xa3, + 0xd5, 0x5b, 0xfc, 0xed, 0xd3, 0x1e, 0xae, 0x51, 0x9c, 0x79, 0x82, 0xb2, 0xe1, 0x6c, 0x3d, 0x8a, + 0xd6, 0xa0, 0x44, 0x26, 0xa3, 0xab, 0xbf, 0x84, 0x95, 0x2d, 0xd3, 0xa2, 0xae, 0xb1, 0x1c, 0x61, + 0x9a, 0x7c, 0x12, 0x9c, 0xbd, 0xcc, 0x09, 0x56, 0xcc, 0x16, 0x6e, 0x8c, 0xae, 0xad, 0x2e, 0x2e, + 0x2e, 0xc8, 0x45, 0xc1, 0xe5, 0xbc, 0x69, 0x11, 0x85, 0x6a, 0x9b, 0xae, 0x80, 0x8b, 0x4c, 0xa1, + 0xda, 0xa6, 0x10, 0xef, 0x43, 0x30, 0xa5, 0x69, 0x6c, 0xcc, 0xba, 0xa6, 0xf0, 0x3d, 0x96, 0x5d, + 0xad, 0x04, 0x84, 0xa5, 0x69, 0x17, 0x18, 0x02, 0xd7, 0x71, 0x1b, 0x3d, 0x06, 0x47, 0x3c, 0x61, + 0xf9, 0x09, 0x27, 0x07, 0x46, 0x19, 0x26, 0x7d, 0x08, 0xa6, 0x7a, 0x7b, 0x83, 0x84, 0x28, 0xd0, + 0x62, 0x6f, 0x2f, 0x4c, 0xf6, 0x08, 0x4c, 0xf7, 0xb6, 0x7b, 0x83, 0x74, 0xf7, 0xf8, 0xe9, 0x50, + 0x6f, 0xbb, 0x17, 0x26, 0xbc, 0x93, 0x6e, 0xb8, 0x2d, 0xac, 0xa9, 0x0e, 0x6e, 0x55, 0x8f, 0xf9, + 0xd1, 0x7d, 0x15, 0xe8, 0x0c, 0x54, 0x34, 0x4d, 0xc1, 0x86, 0xba, 0xd9, 0xc1, 0x8a, 0x6a, 0x61, + 0x43, 0xb5, 0xab, 0x75, 0x3f, 0x72, 0x59, 0xd3, 0x16, 0x69, 0xed, 0x1c, 0xad, 0x44, 0xf7, 0xc0, + 0xa4, 0xb9, 0xf9, 0x82, 0xc6, 0x54, 0x52, 0xe9, 0x59, 0x78, 0x4b, 0xdf, 0xad, 0xde, 0x41, 0xe5, + 0x3b, 0x41, 0x2a, 0xa8, 0x42, 0xae, 0x52, 0x30, 0x3a, 0x0d, 0x15, 0xcd, 0xde, 0x56, 0xad, 0x1e, + 0xb5, 0xc9, 0x76, 0x4f, 0xd5, 0x70, 0xf5, 0x4e, 0x86, 0xca, 0xe0, 0x97, 0x04, 0x98, 0x2c, 0x09, + 0xfb, 0x9a, 0xbe, 0xe5, 0x08, 0x8e, 0x77, 0xb3, 0x25, 0x41, 0x61, 0x9c, 0xdb, 0x0c, 0x54, 0x88, + 0x28, 0x02, 0x0d, 0xcf, 0x50, 0xb4, 0x72, 0x6f, 0xbb, 0xe7, 0x6f, 0xf7, 0x14, 0x8c, 0x13, 0x4c, + 0xaf, 0xd1, 0xd3, 0x2c, 0x20, 0xeb, 0x6d, 0xfb, 0x5a, 0x7c, 0x10, 0x8e, 0x12, 0xa4, 0x2e, 0x76, + 0xd4, 0x96, 0xea, 0xa8, 0x3e, 0xec, 0xfb, 0x28, 0x36, 0x91, 0xfb, 0x0a, 0xaf, 0x0c, 0xf4, 0xd3, + 0xea, 0x6f, 0xee, 0xb9, 0x9a, 0x75, 0x3f, 0xeb, 0x27, 0x81, 0x09, 0xdd, 0x7a, 0xdb, 0x82, 0x6e, + 0xa9, 0x01, 0x25, 0xbf, 0xe2, 0xa3, 0x02, 0x30, 0xd5, 0xaf, 0xa4, 0x48, 0x14, 0x34, 0x7f, 0x79, + 0x81, 0xc4, 0x2f, 0xcf, 0x2f, 0x56, 0xd2, 0x24, 0x8e, 0x5a, 0x5e, 0x5a, 0x5f, 0x54, 0xe4, 0x8d, + 0x4b, 0xeb, 0x4b, 0x2b, 0x8b, 0x95, 0x8c, 0x2f, 0x60, 0x7f, 0x2a, 0x9b, 0xbf, 0xab, 0x72, 0xb7, + 0xf4, 0xad, 0x34, 0x94, 0x83, 0x3b, 0x30, 0xf4, 0x38, 0x1c, 0x13, 0xe9, 0x12, 0x1b, 0x3b, 0xca, + 0x35, 0xdd, 0xa2, 0x2b, 0xb2, 0xab, 0x32, 0xef, 0xe8, 0xea, 0xc4, 0x34, 0xc7, 0x5a, 0xc3, 0xce, + 0xb3, 0xba, 0x45, 0xd6, 0x5b, 0x57, 0x75, 0xd0, 0x32, 0xd4, 0x0d, 0x53, 0xb1, 0x1d, 0xd5, 0x68, + 0xa9, 0x56, 0x4b, 0xf1, 0x12, 0x55, 0x8a, 0xaa, 0x69, 0xd8, 0xb6, 0x4d, 0xe6, 0x09, 0x5d, 0x2e, + 0xb7, 0x1a, 0xe6, 0x1a, 0x47, 0xf6, 0x5c, 0xc4, 0x1c, 0x47, 0x0d, 0xe9, 0x6f, 0x66, 0x98, 0xfe, + 0xde, 0x02, 0x85, 0xae, 0xda, 0x53, 0xb0, 0xe1, 0x58, 0x7b, 0x34, 0xee, 0xce, 0xcb, 0xf9, 0xae, + 0xda, 0x5b, 0x24, 0xe5, 0x77, 0x64, 0xfb, 0xf3, 0x54, 0x36, 0x9f, 0xaf, 0x14, 0x9e, 0xca, 0xe6, + 0x0b, 0x15, 0x90, 0x5e, 0xcb, 0x40, 0xc9, 0x1f, 0x87, 0x93, 0x6d, 0x8d, 0x46, 0x5d, 0x56, 0x8a, + 0x1a, 0xb5, 0x53, 0x07, 0x46, 0xed, 0xb3, 0xf3, 0xc4, 0x97, 0x35, 0x72, 0x2c, 0x3a, 0x96, 0x19, + 0x25, 0x89, 0x23, 0x88, 0xb2, 0x61, 0x16, 0x8d, 0xe4, 0x65, 0x5e, 0x42, 0x17, 0x20, 0xf7, 0x82, + 0x4d, 0x79, 0xe7, 0x28, 0xef, 0x3b, 0x0e, 0xe6, 0xfd, 0xd4, 0x1a, 0x65, 0x5e, 0x78, 0x6a, 0x4d, + 0xb9, 0x74, 0x59, 0x5e, 0x99, 0x5b, 0x96, 0x39, 0x39, 0x3a, 0x0e, 0xd9, 0x8e, 0xfa, 0xd2, 0x5e, + 0xd0, 0xeb, 0x51, 0x50, 0xd2, 0x49, 0x38, 0x0e, 0xd9, 0x6b, 0x58, 0xdd, 0x09, 0xfa, 0x1a, 0x0a, + 0x7a, 0x1b, 0x17, 0xc3, 0x19, 0x18, 0xa5, 0xf2, 0x42, 0x00, 0x5c, 0x62, 0x95, 0x11, 0x94, 0x87, + 0xec, 0xfc, 0x65, 0x99, 0x2c, 0x88, 0x0a, 0x94, 0x18, 0x54, 0x59, 0x5d, 0x5a, 0x9c, 0x5f, 0xac, + 0xa4, 0xa5, 0x87, 0x20, 0xc7, 0x84, 0x40, 0x16, 0x8b, 0x2b, 0x86, 0xca, 0x08, 0x2f, 0x72, 0x1e, + 0x29, 0x51, 0xbb, 0xb1, 0xd2, 0x5c, 0x94, 0x2b, 0xe9, 0xe0, 0x54, 0x67, 0x2b, 0xa3, 0x92, 0x0d, + 0x25, 0x7f, 0x20, 0xfe, 0xce, 0x6c, 0xb2, 0xbf, 0x9e, 0x82, 0xa2, 0x2f, 0xb0, 0x26, 0x11, 0x91, + 0xda, 0xe9, 0x98, 0xd7, 0x14, 0xb5, 0xa3, 0xab, 0x36, 0x57, 0x0d, 0xa0, 0xa0, 0x39, 0x02, 0x49, + 0x3a, 0x75, 0xef, 0xd0, 0x12, 0x19, 0xad, 0xe4, 0xa4, 0xcf, 0xa5, 0xa0, 0x12, 0x8e, 0x6c, 0x43, + 0xdd, 0x4c, 0xfd, 0x28, 0xbb, 0x29, 0x7d, 0x26, 0x05, 0xe5, 0x60, 0x38, 0x1b, 0xea, 0xde, 0xed, + 0x3f, 0xd2, 0xee, 0xfd, 0x59, 0x1a, 0xc6, 0x03, 0x41, 0x6c, 0xd2, 0xde, 0xbd, 0x08, 0x93, 0x7a, + 0x0b, 0x77, 0x7b, 0xa6, 0x83, 0x0d, 0x6d, 0x4f, 0xe9, 0xe0, 0xab, 0xb8, 0x53, 0x95, 0xa8, 0xd1, + 0x38, 0x73, 0x70, 0x98, 0x3c, 0xbb, 0xe4, 0xd1, 0x2d, 0x13, 0xb2, 0xc6, 0xd4, 0xd2, 0xc2, 0xe2, + 0xca, 0xea, 0xe5, 0xf5, 0xc5, 0x4b, 0xf3, 0x1f, 0x50, 0x36, 0x2e, 0x3d, 0x7d, 0xe9, 0xf2, 0xb3, + 0x97, 0xe4, 0x8a, 0x1e, 0x42, 0x7b, 0x1b, 0x97, 0xfd, 0x2a, 0x54, 0xc2, 0x9d, 0x42, 0xc7, 0x20, + 0xaa, 0x5b, 0x95, 0x11, 0x34, 0x05, 0x13, 0x97, 0x2e, 0x2b, 0x6b, 0x4b, 0x0b, 0x8b, 0xca, 0xe2, + 0xf9, 0xf3, 0x8b, 0xf3, 0xeb, 0x6b, 0x2c, 0xf1, 0xe1, 0x62, 0xaf, 0x07, 0x16, 0xb8, 0xf4, 0xe9, + 0x0c, 0x4c, 0x45, 0xf4, 0x04, 0xcd, 0xf1, 0x2d, 0x0b, 0xdb, 0x45, 0xdd, 0x9f, 0xa4, 0xf7, 0xb3, + 0x24, 0x66, 0x58, 0x55, 0x2d, 0x87, 0xef, 0x70, 0x4e, 0x03, 0x91, 0x92, 0xe1, 0xe8, 0x5b, 0x3a, + 0xb6, 0x78, 0x9e, 0x88, 0xed, 0x63, 0x26, 0x3c, 0x38, 0x4b, 0x15, 0xdd, 0x07, 0xa8, 0x67, 0xda, + 0xba, 0xa3, 0x5f, 0xc5, 0x8a, 0x6e, 0x88, 0xa4, 0x52, 0x96, 0x9e, 0x32, 0x55, 0x44, 0xcd, 0x92, + 0xe1, 0xb8, 0xd8, 0x06, 0x6e, 0xab, 0x21, 0x6c, 0x62, 0xcc, 0x33, 0x72, 0x45, 0xd4, 0xb8, 0xd8, + 0xb7, 0x43, 0xa9, 0x65, 0xf6, 0x49, 0xb0, 0xc7, 0xf0, 0x88, 0xef, 0x48, 0xc9, 0x45, 0x06, 0x73, + 0x51, 0x78, 0x18, 0xef, 0x65, 0xb3, 0x4a, 0x72, 0x91, 0xc1, 0x18, 0xca, 0xdd, 0x30, 0xa1, 0xb6, + 0xdb, 0x16, 0x61, 0x2e, 0x18, 0xb1, 0x8d, 0x49, 0xd9, 0x05, 0x53, 0xc4, 0xda, 0x53, 0x90, 0x17, + 0x72, 0x20, 0xae, 0x9a, 0x48, 0x42, 0xe9, 0xb1, 0xdd, 0x76, 0x7a, 0xa6, 0x20, 0xe7, 0x0d, 0x51, + 0x79, 0x3b, 0x94, 0x74, 0x5b, 0xf1, 0x92, 0xf3, 0xe9, 0x93, 0xe9, 0x99, 0xbc, 0x5c, 0xd4, 0x6d, + 0x37, 0xb1, 0x29, 0x7d, 0x31, 0x0d, 0xe5, 0xe0, 0xe1, 0x02, 0x5a, 0x80, 0x7c, 0xc7, 0xd4, 0xe8, + 0xe9, 0x21, 0x3f, 0xd9, 0x9a, 0x89, 0x39, 0x8f, 0x98, 0x5d, 0xe6, 0xf8, 0xb2, 0x4b, 0x59, 0xfb, + 0x8f, 0x29, 0xc8, 0x0b, 0x30, 0x3a, 0x0a, 0xd9, 0x9e, 0xea, 0x6c, 0x53, 0x76, 0xa3, 0xcd, 0x74, + 0x25, 0x25, 0xd3, 0x32, 0x81, 0xdb, 0x3d, 0xd5, 0xa0, 0x2a, 0xc0, 0xe1, 0xa4, 0x4c, 0xe6, 0xb5, + 0x83, 0xd5, 0x16, 0xdd, 0xf5, 0x98, 0xdd, 0x2e, 0x36, 0x1c, 0x5b, 0xcc, 0x2b, 0x87, 0xcf, 0x73, + 0x30, 0xba, 0x17, 0x26, 0x1d, 0x4b, 0xd5, 0x3b, 0x01, 0xdc, 0x2c, 0xc5, 0xad, 0x88, 0x0a, 0x17, + 0xb9, 0x01, 0xc7, 0x05, 0xdf, 0x16, 0x76, 0x54, 0x6d, 0x1b, 0xb7, 0x3c, 0xa2, 0x1c, 0xcd, 0x6e, + 0x1c, 0xe3, 0x08, 0x0b, 0xbc, 0x5e, 0xd0, 0x4a, 0xdf, 0x4a, 0xc1, 0xa4, 0xd8, 0xa7, 0xb5, 0x5c, + 0x61, 0xad, 0x00, 0xa8, 0x86, 0x61, 0x3a, 0x7e, 0x71, 0x0d, 0xaa, 0xf2, 0x00, 0xdd, 0xec, 0x9c, + 0x4b, 0x24, 0xfb, 0x18, 0xd4, 0xba, 0x00, 0x5e, 0xcd, 0x50, 0xb1, 0xd5, 0xa1, 0xc8, 0x4f, 0x8e, + 0xe8, 0xf1, 0x23, 0xdb, 0xd9, 0x03, 0x03, 0x91, 0x0d, 0x1d, 0x9a, 0x86, 0xd1, 0x4d, 0xdc, 0xd6, + 0x0d, 0x9e, 0x0f, 0x66, 0x05, 0x91, 0x7f, 0xc9, 0xba, 0xf9, 0x97, 0xe6, 0x27, 0x53, 0x30, 0xa5, + 0x99, 0xdd, 0x70, 0x7f, 0x9b, 0x95, 0x50, 0x7a, 0xc1, 0xbe, 0x98, 0x7a, 0xfe, 0x09, 0xdf, 0x49, + 0x6b, 0xdb, 0xec, 0xa8, 0x46, 0xdb, 0x3b, 0x3f, 0xa5, 0x3f, 0xb4, 0xfb, 0xdb, 0xd8, 0xb8, 0xbf, + 0x6d, 0xfa, 0x4e, 0x53, 0xcf, 0x79, 0x3f, 0xff, 0x2a, 0x95, 0xfa, 0x42, 0x3a, 0x73, 0x61, 0xb5, + 0xf9, 0xa5, 0x74, 0xed, 0x02, 0x6b, 0x6e, 0x55, 0x88, 0x47, 0xc6, 0x5b, 0x1d, 0xac, 0x91, 0x21, + 0xc3, 0xf7, 0xee, 0x85, 0xe9, 0xb6, 0xd9, 0x36, 0x29, 0xc7, 0x33, 0xe4, 0x17, 0x3f, 0x91, 0x2d, + 0xb8, 0xd0, 0x5a, 0xec, 0xf1, 0x6d, 0xe3, 0x12, 0x4c, 0x71, 0x64, 0x85, 0x1e, 0x09, 0xb1, 0x8d, + 0x0d, 0x3a, 0x30, 0xad, 0x56, 0xfd, 0xdd, 0xef, 0x50, 0x87, 0x2e, 0x4f, 0x72, 0x52, 0x52, 0xc7, + 0xf6, 0x3e, 0x0d, 0x19, 0x8e, 0x04, 0xf8, 0xb1, 0x65, 0x8b, 0xad, 0x18, 0x8e, 0xff, 0x8e, 0x73, 0x9c, 0xf2, 0x71, 0x5c, 0xe3, 0xa4, 0x8d, 0x79, 0x18, 0x3f, 0x0c, 0xaf, 0x7f, 0xcf, 0x79, 0x95, 0xb0, 0x9f, 0xc9, 0x05, 0x98, 0xa0, 0x4c, 0xb4, 0xbe, 0xed, 0x98, 0x5d, 0x6a, 0x13, 0x0f, 0x66, - 0xf3, 0x87, 0xdf, 0x63, 0xeb, 0xa8, 0x4c, 0xc8, 0xe6, 0x5d, 0xaa, 0x46, 0x03, 0xe8, 0x29, 0x58, - 0x0b, 0x6b, 0x9d, 0x18, 0x0e, 0xdf, 0xe2, 0x1d, 0x71, 0xf1, 0x1b, 0x57, 0x60, 0x9a, 0xfc, 0xa6, - 0x26, 0xcb, 0xdf, 0x93, 0xf8, 0x1c, 0x5c, 0xf5, 0x3b, 0x1f, 0x65, 0x4b, 0x75, 0xca, 0x65, 0xe0, + 0xf3, 0x87, 0xdf, 0x61, 0xeb, 0xa8, 0x4c, 0xc8, 0xe6, 0x5d, 0xaa, 0x46, 0x03, 0xe8, 0x29, 0x58, + 0x0b, 0x6b, 0x9d, 0x18, 0x0e, 0xdf, 0xe0, 0x1d, 0x71, 0xf1, 0x1b, 0x57, 0x60, 0x9a, 0xfc, 0xa6, + 0x26, 0xcb, 0xdf, 0x93, 0xf8, 0x1c, 0x5c, 0xf5, 0x5b, 0x1f, 0x66, 0x4b, 0x75, 0xca, 0x65, 0xe0, 0xeb, 0x93, 0x6f, 0x16, 0xdb, 0xd8, 0x71, 0xb0, 0x65, 0x2b, 0x6a, 0x27, 0xaa, 0x7b, 0xbe, 0x24, - 0x46, 0xf5, 0xd7, 0xdf, 0x08, 0xce, 0xe2, 0x05, 0x46, 0x39, 0xd7, 0xe9, 0x34, 0x36, 0xe0, 0x58, - 0x84, 0x56, 0x24, 0xe0, 0xf9, 0x19, 0xce, 0x73, 0x7a, 0x40, 0x33, 0x08, 0xdb, 0x55, 0x10, 0x70, - 0x77, 0x2e, 0x13, 0xf0, 0xfc, 0x0d, 0xce, 0x13, 0x71, 0x5a, 0x31, 0xa5, 0x84, 0xe3, 0x53, 0x30, - 0x79, 0x15, 0x5b, 0x9b, 0xa6, 0xcd, 0x13, 0x47, 0x09, 0xd8, 0x7d, 0x96, 0xb3, 0x9b, 0xe0, 0x84, - 0x34, 0x93, 0x44, 0x78, 0x3d, 0x06, 0xf9, 0x2d, 0x55, 0xc3, 0x09, 0x58, 0x7c, 0x8e, 0xb3, 0x18, - 0x23, 0xf8, 0x84, 0x74, 0x0e, 0x4a, 0x6d, 0x93, 0x7b, 0xad, 0x78, 0xf2, 0xcf, 0x73, 0xf2, 0xa2, - 0xa0, 0xe1, 0x2c, 0x7a, 0x66, 0xaf, 0xdf, 0x21, 0x2e, 0x2d, 0x9e, 0xc5, 0x3f, 0x16, 0x2c, 0x04, - 0x0d, 0x67, 0x71, 0x08, 0xb1, 0xbe, 0x2a, 0x58, 0xd8, 0x3e, 0x79, 0x3e, 0x09, 0x45, 0xd3, 0xe8, - 0xec, 0x99, 0x46, 0x92, 0x4e, 0x7c, 0x81, 0x73, 0x00, 0x4e, 0x42, 0x18, 0x9c, 0x83, 0x42, 0xd2, - 0x89, 0xf8, 0xa7, 0x6f, 0x88, 0xe5, 0x21, 0x66, 0xe0, 0x02, 0x4c, 0x08, 0x03, 0xa5, 0x9b, 0x46, - 0x02, 0x16, 0xff, 0x8c, 0xb3, 0x28, 0xfb, 0xc8, 0xf8, 0x30, 0x1c, 0x6c, 0x3b, 0x6d, 0x9c, 0x84, - 0xc9, 0x97, 0xc4, 0x30, 0x38, 0x09, 0x17, 0xe5, 0x26, 0x36, 0xb4, 0xed, 0x64, 0x1c, 0x7e, 0x53, - 0x88, 0x52, 0xd0, 0x10, 0x16, 0xf3, 0x30, 0xde, 0x55, 0x2d, 0x7b, 0x5b, 0xed, 0x24, 0x9a, 0x8e, - 0x7f, 0xce, 0x79, 0x94, 0x5c, 0x22, 0x2e, 0x91, 0xbe, 0x71, 0x18, 0x36, 0x5f, 0x16, 0x12, 0xf1, - 0x91, 0xf1, 0xa5, 0x67, 0x3b, 0x34, 0xcb, 0x76, 0x18, 0x6e, 0xff, 0x42, 0x2c, 0x3d, 0x46, 0xbb, - 0xe2, 0xe7, 0x78, 0x0e, 0x0a, 0xb6, 0xfe, 0x52, 0x22, 0x36, 0xff, 0x52, 0xcc, 0x34, 0x25, 0x20, - 0xc4, 0x1f, 0x82, 0xe3, 0x91, 0x6e, 0x22, 0x01, 0xb3, 0xdf, 0xe2, 0xcc, 0x8e, 0x46, 0xb8, 0x0a, - 0x6e, 0x12, 0x0e, 0xcb, 0xf2, 0x2b, 0xc2, 0x24, 0xe0, 0x10, 0xaf, 0x55, 0xb2, 0x8f, 0xb0, 0xd5, - 0xad, 0xc3, 0x49, 0xed, 0xb7, 0x85, 0xd4, 0x18, 0x6d, 0x40, 0x6a, 0xeb, 0x70, 0x94, 0x73, 0x3c, - 0xdc, 0xbc, 0xfe, 0x8e, 0x30, 0xac, 0x8c, 0x7a, 0x23, 0x38, 0xbb, 0x1f, 0x86, 0x9a, 0x2b, 0x4e, - 0x11, 0xb0, 0xda, 0x4a, 0x57, 0xed, 0x25, 0xe0, 0xfc, 0xbb, 0x9c, 0xb3, 0xb0, 0xf8, 0x6e, 0xc4, - 0x6b, 0xaf, 0xa8, 0x3d, 0xc2, 0xfc, 0x39, 0xa8, 0x0a, 0xe6, 0x7d, 0xc3, 0xc2, 0x9a, 0xd9, 0x36, - 0xf4, 0x97, 0x70, 0x2b, 0x01, 0xeb, 0x7f, 0x15, 0x9a, 0xaa, 0x0d, 0x1f, 0x39, 0xe1, 0xbc, 0x04, - 0x15, 0x37, 0x56, 0x51, 0xf4, 0x6e, 0xcf, 0xb4, 0x9c, 0x18, 0x8e, 0xff, 0x5a, 0xcc, 0x94, 0x4b, - 0xb7, 0x44, 0xc9, 0x1a, 0x8b, 0x50, 0xa6, 0xc5, 0xa4, 0x2a, 0xf9, 0x7b, 0x9c, 0xd1, 0xb8, 0x47, - 0xc5, 0x0d, 0x87, 0x66, 0x76, 0x7b, 0xaa, 0x95, 0xc4, 0xfe, 0xfd, 0x1b, 0x61, 0x38, 0x38, 0x09, - 0x37, 0x1c, 0xce, 0x5e, 0x0f, 0x13, 0x6f, 0x9f, 0x80, 0xc3, 0x57, 0x85, 0xe1, 0x10, 0x34, 0x9c, - 0x85, 0x08, 0x18, 0x12, 0xb0, 0xf8, 0x9a, 0x60, 0x21, 0x68, 0x08, 0x8b, 0x67, 0x3c, 0x47, 0x6b, - 0xe1, 0xb6, 0x6e, 0x3b, 0x16, 0x0b, 0x93, 0x0f, 0x66, 0xf5, 0xf5, 0x37, 0x82, 0x41, 0x98, 0xec, - 0x23, 0x25, 0x96, 0x88, 0xa7, 0x5d, 0xe9, 0x2e, 0x2a, 0xbe, 0x63, 0xdf, 0x10, 0x96, 0xc8, 0x47, - 0x46, 0xfa, 0xe6, 0x8b, 0x10, 0x89, 0xd8, 0x35, 0xb2, 0x77, 0x48, 0xc0, 0xee, 0xf7, 0x43, 0x9d, - 0x5b, 0x13, 0xb4, 0x84, 0xa7, 0x2f, 0xfe, 0xe9, 0x1b, 0x3b, 0x78, 0x2f, 0x91, 0x76, 0xfe, 0xdb, + 0x46, 0xf5, 0xd7, 0xde, 0x08, 0xce, 0xe2, 0x05, 0x46, 0x39, 0xd7, 0xe9, 0x34, 0x36, 0xe0, 0x58, + 0x84, 0x56, 0x24, 0xe0, 0xf9, 0x69, 0xce, 0x73, 0x7a, 0x40, 0x33, 0x08, 0xdb, 0x55, 0x10, 0x70, + 0x77, 0x2e, 0x13, 0xf0, 0xfc, 0x75, 0xce, 0x13, 0x71, 0x5a, 0x31, 0xa5, 0x84, 0xe3, 0x53, 0x30, + 0x79, 0x15, 0x5b, 0x9b, 0xa6, 0xcd, 0x13, 0x47, 0x09, 0xd8, 0x7d, 0x86, 0xb3, 0x9b, 0xe0, 0x84, + 0x34, 0x93, 0x44, 0x78, 0x3d, 0x06, 0xf9, 0x2d, 0x55, 0xc3, 0x09, 0x58, 0x7c, 0x96, 0xb3, 0x18, + 0x23, 0xf8, 0x84, 0x74, 0x0e, 0x4a, 0x6d, 0x93, 0x7b, 0xad, 0x78, 0xf2, 0xcf, 0x71, 0xf2, 0xa2, + 0xa0, 0xe1, 0x2c, 0x7a, 0x66, 0xaf, 0xdf, 0x21, 0x2e, 0x2d, 0x9e, 0xc5, 0x6f, 0x08, 0x16, 0x82, + 0x86, 0xb3, 0x38, 0x84, 0x58, 0x5f, 0x15, 0x2c, 0x6c, 0x9f, 0x3c, 0x9f, 0x84, 0xa2, 0x69, 0x74, + 0xf6, 0x4c, 0x23, 0x49, 0x27, 0x3e, 0xcf, 0x39, 0x00, 0x27, 0x21, 0x0c, 0xce, 0x41, 0x21, 0xe9, + 0x44, 0xfc, 0xa3, 0x37, 0xc4, 0xf2, 0x10, 0x33, 0x70, 0x01, 0x26, 0x84, 0x81, 0xd2, 0x4d, 0x23, + 0x01, 0x8b, 0x7f, 0xcc, 0x59, 0x94, 0x7d, 0x64, 0x7c, 0x18, 0x0e, 0xb6, 0x9d, 0x36, 0x4e, 0xc2, + 0xe4, 0x8b, 0x62, 0x18, 0x9c, 0x84, 0x8b, 0x72, 0x13, 0x1b, 0xda, 0x76, 0x32, 0x0e, 0xbf, 0x29, + 0x44, 0x29, 0x68, 0x08, 0x8b, 0x79, 0x18, 0xef, 0xaa, 0x96, 0xbd, 0xad, 0x76, 0x12, 0x4d, 0xc7, + 0x3f, 0xe1, 0x3c, 0x4a, 0x2e, 0x11, 0x97, 0x48, 0xdf, 0x38, 0x0c, 0x9b, 0x2f, 0x09, 0x89, 0xf8, + 0xc8, 0xf8, 0xd2, 0xb3, 0x1d, 0x9a, 0x65, 0x3b, 0x0c, 0xb7, 0x7f, 0x2a, 0x96, 0x1e, 0xa3, 0x5d, + 0xf1, 0x73, 0x3c, 0x07, 0x05, 0x5b, 0x7f, 0x29, 0x11, 0x9b, 0x7f, 0x26, 0x66, 0x9a, 0x12, 0x10, + 0xe2, 0x0f, 0xc0, 0xf1, 0x48, 0x37, 0x91, 0x80, 0xd9, 0x3f, 0xe7, 0xcc, 0x8e, 0x46, 0xb8, 0x0a, + 0x6e, 0x12, 0x0e, 0xcb, 0xf2, 0xb7, 0x84, 0x49, 0xc0, 0x21, 0x5e, 0xab, 0x64, 0x1f, 0x61, 0xab, + 0x5b, 0x87, 0x93, 0xda, 0x6f, 0x0b, 0xa9, 0x31, 0xda, 0x80, 0xd4, 0xd6, 0xe1, 0x28, 0xe7, 0x78, + 0xb8, 0x79, 0xfd, 0x1d, 0x61, 0x58, 0x19, 0xf5, 0x46, 0x70, 0x76, 0x3f, 0x08, 0x35, 0x57, 0x9c, + 0x22, 0x60, 0xb5, 0x95, 0xae, 0xda, 0x4b, 0xc0, 0xf9, 0x77, 0x39, 0x67, 0x61, 0xf1, 0xdd, 0x88, + 0xd7, 0x5e, 0x51, 0x7b, 0x84, 0xf9, 0x73, 0x50, 0x15, 0xcc, 0xfb, 0x86, 0x85, 0x35, 0xb3, 0x6d, + 0xe8, 0x2f, 0xe1, 0x56, 0x02, 0xd6, 0xff, 0x22, 0x34, 0x55, 0x1b, 0x3e, 0x72, 0xc2, 0x79, 0x09, + 0x2a, 0x6e, 0xac, 0xa2, 0xe8, 0xdd, 0x9e, 0x69, 0x39, 0x31, 0x1c, 0xff, 0xa5, 0x98, 0x29, 0x97, + 0x6e, 0x89, 0x92, 0x35, 0x16, 0xa1, 0x4c, 0x8b, 0x49, 0x55, 0xf2, 0xf7, 0x38, 0xa3, 0x71, 0x8f, + 0x8a, 0x1b, 0x0e, 0xcd, 0xec, 0xf6, 0x54, 0x2b, 0x89, 0xfd, 0xfb, 0x57, 0xc2, 0x70, 0x70, 0x12, + 0x6e, 0x38, 0x9c, 0xbd, 0x1e, 0x26, 0xde, 0x3e, 0x01, 0x87, 0x2f, 0x0b, 0xc3, 0x21, 0x68, 0x38, + 0x0b, 0x11, 0x30, 0x24, 0x60, 0xf1, 0x15, 0xc1, 0x42, 0xd0, 0x10, 0x16, 0xcf, 0x78, 0x8e, 0xd6, + 0xc2, 0x6d, 0xdd, 0x76, 0x2c, 0x16, 0x26, 0x1f, 0xcc, 0xea, 0xab, 0x6f, 0x04, 0x83, 0x30, 0xd9, + 0x47, 0x4a, 0x2c, 0x11, 0x4f, 0xbb, 0xd2, 0x5d, 0x54, 0x7c, 0xc7, 0xbe, 0x26, 0x2c, 0x91, 0x8f, + 0x8c, 0xf4, 0xcd, 0x17, 0x21, 0x12, 0xb1, 0x6b, 0x64, 0xef, 0x90, 0x80, 0xdd, 0xef, 0x87, 0x3a, + 0xb7, 0x26, 0x68, 0x09, 0x4f, 0x5f, 0xfc, 0xd3, 0x37, 0x76, 0xf0, 0x5e, 0x22, 0xed, 0xfc, 0x83, 0x50, 0xfc, 0xb3, 0xc1, 0x28, 0x99, 0x0d, 0x99, 0x08, 0xc5, 0x53, 0x28, 0xee, 0xfe, 0x50, 0xf5, - 0xef, 0xbe, 0xc9, 0xc7, 0x1b, 0x0c, 0xa7, 0x1a, 0xcb, 0x44, 0xc9, 0x83, 0x41, 0x4f, 0x3c, 0xb3, - 0x8f, 0xbe, 0xe9, 0xea, 0x79, 0x20, 0xe6, 0x69, 0x9c, 0x87, 0xf1, 0x40, 0xc0, 0x13, 0xcf, 0xea, - 0x63, 0x9c, 0x55, 0xc9, 0x1f, 0xef, 0x34, 0x1e, 0x82, 0x2c, 0x09, 0x5e, 0xe2, 0xc9, 0x7f, 0x8e, - 0x93, 0x53, 0xf4, 0xc6, 0x07, 0x20, 0x2f, 0x82, 0x96, 0x78, 0xd2, 0x9f, 0xe7, 0xa4, 0x2e, 0x09, - 0x21, 0x17, 0x01, 0x4b, 0x3c, 0xf9, 0x2f, 0x08, 0x72, 0x41, 0x42, 0xc8, 0x93, 0x8b, 0xf0, 0x9b, - 0x7f, 0x2f, 0xcb, 0x9d, 0x8e, 0x90, 0xdd, 0x39, 0x18, 0xe3, 0x91, 0x4a, 0x3c, 0xf5, 0x27, 0x78, - 0xe3, 0x82, 0xa2, 0xf1, 0x08, 0x8c, 0x26, 0x14, 0xf8, 0x2f, 0x71, 0x52, 0x86, 0xdf, 0x98, 0x87, - 0xa2, 0x2f, 0x3a, 0x89, 0x27, 0xff, 0x65, 0x4e, 0xee, 0xa7, 0x22, 0x5d, 0xe7, 0xd1, 0x49, 0x3c, - 0x83, 0x4f, 0x89, 0xae, 0x73, 0x0a, 0x22, 0x36, 0x11, 0x98, 0xc4, 0x53, 0x7f, 0x5a, 0x48, 0x5d, - 0x90, 0x34, 0x9e, 0x84, 0x82, 0xeb, 0x6c, 0xe2, 0xe9, 0x7f, 0x85, 0xd3, 0x7b, 0x34, 0x44, 0x02, - 0x3e, 0x67, 0x17, 0xcf, 0xe2, 0x57, 0x85, 0x04, 0x7c, 0x54, 0x64, 0x19, 0x85, 0x03, 0x98, 0x78, - 0x4e, 0x7f, 0x5f, 0x2c, 0xa3, 0x50, 0xfc, 0x42, 0x66, 0x93, 0xda, 0xfc, 0x78, 0x16, 0xbf, 0x26, - 0x66, 0x93, 0xe2, 0x93, 0x6e, 0x84, 0x23, 0x82, 0x78, 0x1e, 0xff, 0x48, 0x74, 0x23, 0x14, 0x10, + 0x6f, 0xbf, 0xc9, 0xc7, 0x1b, 0x0c, 0xa7, 0x1a, 0xcb, 0x44, 0xc9, 0x83, 0x41, 0x4f, 0x3c, 0xb3, + 0x0f, 0xbf, 0xe9, 0xea, 0x79, 0x20, 0xe6, 0x69, 0x9c, 0x87, 0xf1, 0x40, 0xc0, 0x13, 0xcf, 0xea, + 0x23, 0x9c, 0x55, 0xc9, 0x1f, 0xef, 0x34, 0x1e, 0x82, 0x2c, 0x09, 0x5e, 0xe2, 0xc9, 0x7f, 0x8e, + 0x93, 0x53, 0xf4, 0xc6, 0xfb, 0x20, 0x2f, 0x82, 0x96, 0x78, 0xd2, 0x9f, 0xe7, 0xa4, 0x2e, 0x09, + 0x21, 0x17, 0x01, 0x4b, 0x3c, 0xf9, 0x47, 0x05, 0xb9, 0x20, 0x21, 0xe4, 0xc9, 0x45, 0xf8, 0xf5, + 0xbf, 0x93, 0xe5, 0x4e, 0x47, 0xc8, 0xee, 0x1c, 0x8c, 0xf1, 0x48, 0x25, 0x9e, 0xfa, 0xe3, 0xbc, + 0x71, 0x41, 0xd1, 0x78, 0x04, 0x46, 0x13, 0x0a, 0xfc, 0x17, 0x39, 0x29, 0xc3, 0x6f, 0xcc, 0x43, + 0xd1, 0x17, 0x9d, 0xc4, 0x93, 0xff, 0x12, 0x27, 0xf7, 0x53, 0x91, 0xae, 0xf3, 0xe8, 0x24, 0x9e, + 0xc1, 0x27, 0x45, 0xd7, 0x39, 0x05, 0x11, 0x9b, 0x08, 0x4c, 0xe2, 0xa9, 0x3f, 0x25, 0xa4, 0x2e, + 0x48, 0x1a, 0x4f, 0x42, 0xc1, 0x75, 0x36, 0xf1, 0xf4, 0x7f, 0x97, 0xd3, 0x7b, 0x34, 0x44, 0x02, + 0x3e, 0x67, 0x17, 0xcf, 0xe2, 0x97, 0x85, 0x04, 0x7c, 0x54, 0x64, 0x19, 0x85, 0x03, 0x98, 0x78, + 0x4e, 0x7f, 0x4f, 0x2c, 0xa3, 0x50, 0xfc, 0x42, 0x66, 0x93, 0xda, 0xfc, 0x78, 0x16, 0xbf, 0x22, + 0x66, 0x93, 0xe2, 0x93, 0x6e, 0x84, 0x23, 0x82, 0x78, 0x1e, 0xff, 0x40, 0x74, 0x23, 0x14, 0x10, 0x34, 0x56, 0x01, 0x0d, 0x46, 0x03, 0xf1, 0xfc, 0x5e, 0xe1, 0xfc, 0x26, 0x07, 0x82, 0x81, 0xc6, - 0xb3, 0x70, 0x34, 0x3a, 0x12, 0x88, 0xe7, 0xfa, 0xeb, 0x6f, 0x86, 0xf6, 0x6e, 0xfe, 0x40, 0xa0, - 0xb1, 0xee, 0xb9, 0x14, 0x7f, 0x14, 0x10, 0xcf, 0xf6, 0x33, 0x6f, 0x06, 0x0d, 0xb7, 0x3f, 0x08, - 0x68, 0xcc, 0x01, 0x78, 0x0e, 0x38, 0x9e, 0xd7, 0x67, 0x39, 0x2f, 0x1f, 0x11, 0x59, 0x1a, 0xdc, - 0xff, 0xc6, 0xd3, 0x7f, 0x4e, 0x2c, 0x0d, 0x4e, 0x41, 0x96, 0x86, 0x70, 0xbd, 0xf1, 0xd4, 0x9f, - 0x17, 0x4b, 0x43, 0x90, 0x10, 0xcd, 0xf6, 0x79, 0xb7, 0x78, 0x0e, 0x5f, 0x10, 0x9a, 0xed, 0xa3, - 0x6a, 0x5c, 0x82, 0xc9, 0x01, 0x87, 0x18, 0xcf, 0xea, 0x8b, 0x9c, 0x55, 0x25, 0xec, 0x0f, 0xfd, - 0xce, 0x8b, 0x3b, 0xc3, 0x78, 0x6e, 0xff, 0x24, 0xe4, 0xbc, 0xb8, 0x2f, 0x6c, 0x9c, 0x83, 0xbc, - 0xd1, 0xef, 0x74, 0xc8, 0xe2, 0x41, 0x07, 0xdf, 0xf9, 0xab, 0xfe, 0xf7, 0x1f, 0x71, 0xe9, 0x08, - 0x82, 0xc6, 0x43, 0x30, 0x8a, 0xbb, 0x9b, 0xb8, 0x15, 0x47, 0xf9, 0xfd, 0x1f, 0x09, 0x83, 0x49, - 0xb0, 0x1b, 0x4f, 0x02, 0xb0, 0xd4, 0x08, 0x3d, 0x1e, 0x8c, 0xa1, 0xfd, 0x1f, 0x3f, 0xe2, 0xb7, + 0xb3, 0x70, 0x34, 0x3a, 0x12, 0x88, 0xe7, 0xfa, 0x6b, 0x6f, 0x86, 0xf6, 0x6e, 0xfe, 0x40, 0xa0, + 0xb1, 0xee, 0xb9, 0x14, 0x7f, 0x14, 0x10, 0xcf, 0xf6, 0xd3, 0x6f, 0x06, 0x0d, 0xb7, 0x3f, 0x08, + 0x68, 0xcc, 0x01, 0x78, 0x0e, 0x38, 0x9e, 0xd7, 0x67, 0x38, 0x2f, 0x1f, 0x11, 0x59, 0x1a, 0xdc, + 0xff, 0xc6, 0xd3, 0x7f, 0x56, 0x2c, 0x0d, 0x4e, 0x41, 0x96, 0x86, 0x70, 0xbd, 0xf1, 0xd4, 0x9f, + 0x13, 0x4b, 0x43, 0x90, 0x10, 0xcd, 0xf6, 0x79, 0xb7, 0x78, 0x0e, 0x9f, 0x17, 0x9a, 0xed, 0xa3, + 0x6a, 0x5c, 0x82, 0xc9, 0x01, 0x87, 0x18, 0xcf, 0xea, 0x0b, 0x9c, 0x55, 0x25, 0xec, 0x0f, 0xfd, + 0xce, 0x8b, 0x3b, 0xc3, 0x78, 0x6e, 0xff, 0x30, 0xe4, 0xbc, 0xb8, 0x2f, 0x6c, 0x9c, 0x83, 0xbc, + 0xd1, 0xef, 0x74, 0xc8, 0xe2, 0x41, 0x07, 0xdf, 0xf9, 0xab, 0xfe, 0x8f, 0x1f, 0x72, 0xe9, 0x08, + 0x82, 0xc6, 0x43, 0x30, 0x8a, 0xbb, 0x9b, 0xb8, 0x15, 0x47, 0xf9, 0xbd, 0x1f, 0x0a, 0x83, 0x49, + 0xb0, 0x1b, 0x4f, 0x02, 0xb0, 0xd4, 0x08, 0x3d, 0x1e, 0x8c, 0xa1, 0xfd, 0x9f, 0x3f, 0xe4, 0xb7, 0x71, 0x3c, 0x12, 0x8f, 0x01, 0xbb, 0xdb, 0x73, 0x30, 0x83, 0x37, 0x82, 0x0c, 0xe8, 0x8c, 0x3c, - 0x06, 0x63, 0x2f, 0xd8, 0xa6, 0xe1, 0xa8, 0xed, 0x38, 0xea, 0xff, 0xc9, 0xa9, 0x05, 0x3e, 0x11, - 0x58, 0xd7, 0xb4, 0xb0, 0xa3, 0xb6, 0xed, 0x38, 0xda, 0xff, 0xc5, 0x69, 0x5d, 0x02, 0x42, 0xac, - 0xa9, 0xb6, 0x93, 0x64, 0xdc, 0xff, 0x5b, 0x10, 0x0b, 0x02, 0xd2, 0x69, 0xf2, 0x7b, 0x07, 0xef, - 0xc5, 0xd1, 0xfe, 0x40, 0x74, 0x9a, 0xe3, 0x37, 0x3e, 0x00, 0x05, 0xf2, 0x93, 0x5d, 0xb1, 0x8b, - 0x21, 0xfe, 0x3f, 0x9c, 0xd8, 0xa3, 0x20, 0x2d, 0xdb, 0x4e, 0xcb, 0xd1, 0xe3, 0x85, 0x7d, 0x9d, + 0x06, 0x63, 0x2f, 0xd8, 0xa6, 0xe1, 0xa8, 0xed, 0x38, 0xea, 0xff, 0xc5, 0xa9, 0x05, 0x3e, 0x11, + 0x58, 0xd7, 0xb4, 0xb0, 0xa3, 0xb6, 0xed, 0x38, 0xda, 0xff, 0xcd, 0x69, 0x5d, 0x02, 0x42, 0xac, + 0xa9, 0xb6, 0x93, 0x64, 0xdc, 0xff, 0x47, 0x10, 0x0b, 0x02, 0xd2, 0x69, 0xf2, 0x7b, 0x07, 0xef, + 0xc5, 0xd1, 0x7e, 0x5f, 0x74, 0x9a, 0xe3, 0x37, 0xde, 0x07, 0x05, 0xf2, 0x93, 0x5d, 0xb1, 0x8b, + 0x21, 0xfe, 0xbf, 0x9c, 0xd8, 0xa3, 0x20, 0x2d, 0xdb, 0x4e, 0xcb, 0xd1, 0xe3, 0x85, 0x7d, 0x9d, 0xcf, 0xb4, 0xc0, 0x6f, 0xcc, 0x41, 0xd1, 0x76, 0x5a, 0xad, 0x3e, 0x8f, 0x4f, 0x63, 0xc8, 0xff, - 0xef, 0x8f, 0xdc, 0x94, 0x85, 0x4b, 0x43, 0x66, 0xfb, 0xda, 0x8e, 0xd3, 0x33, 0xe9, 0x11, 0x48, + 0xdf, 0x0f, 0xdd, 0x94, 0x85, 0x4b, 0x43, 0x66, 0xfb, 0xda, 0x8e, 0xd3, 0x33, 0xe9, 0x11, 0x48, 0x1c, 0x87, 0x37, 0x39, 0x07, 0x1f, 0x49, 0x63, 0x1e, 0x4a, 0x64, 0x2c, 0x16, 0xee, 0x61, 0x7a, - 0x5e, 0x15, 0xc3, 0xe2, 0x2f, 0xb9, 0x00, 0x02, 0x44, 0xcd, 0x9f, 0x1e, 0xf6, 0xee, 0x26, 0x3a, + 0x5e, 0x15, 0xc3, 0xe2, 0x2f, 0xb8, 0x00, 0x02, 0x44, 0xcd, 0x9f, 0x1e, 0xf6, 0xee, 0x26, 0x3a, 0x6d, 0x0c, 0x17, 0xcc, 0x0b, 0x26, 0x4b, 0x18, 0x3f, 0x2f, 0x05, 0xd2, 0xc5, 0x6d, 0xd3, 0xcb, 0xd6, 0xba, 0x9b, 0x1c, 0xf8, 0xfd, 0x34, 0xdc, 0x49, 0xaf, 0xfb, 0x5a, 0x5d, 0xdd, 0x70, 0xce, 0x68, 0xd6, 0x5e, 0xcf, 0x31, 0xcf, 0x74, 0xb1, 0xb5, 0xd3, 0xc1, 0xfc, 0x0f, 0xcf, 0xfe, 0x56, @@ -1832,335 +1832,335 @@ func StakingDescription() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descri 0xd3, 0xdc, 0xba, 0xdc, 0x43, 0x88, 0xdf, 0x60, 0xe6, 0x37, 0xe3, 0xa8, 0x1a, 0xf2, 0x17, 0x4f, 0x69, 0xef, 0xc5, 0x13, 0x82, 0x6c, 0x4b, 0x75, 0x54, 0x9a, 0x30, 0x2f, 0xc9, 0xf4, 0xb7, 0xd4, 0x84, 0x51, 0xca, 0x04, 0x3d, 0x06, 0x19, 0xb3, 0x67, 0xf3, 0xec, 0xfe, 0xed, 0xb3, 0xc3, 0xfa, - 0x32, 0xcb, 0x9b, 0x6c, 0x66, 0xbf, 0xb5, 0x5f, 0x1f, 0x91, 0x09, 0x4d, 0x73, 0xf5, 0xaf, 0xbf, - 0x7b, 0x22, 0xf5, 0x9b, 0xaf, 0x9d, 0x48, 0x0d, 0x7d, 0xc1, 0x34, 0xeb, 0x13, 0x94, 0x4f, 0x18, - 0xc3, 0xe4, 0xe2, 0xbe, 0x63, 0xfa, 0xc5, 0x34, 0x9c, 0xf0, 0x21, 0x75, 0xf4, 0x4d, 0xfb, 0xcc, + 0x32, 0xcb, 0x9b, 0x6c, 0x66, 0xbf, 0xb1, 0x5f, 0x1f, 0x91, 0x09, 0x4d, 0x73, 0xf5, 0xaf, 0xbe, + 0x7d, 0x22, 0xf5, 0x9b, 0xaf, 0x9d, 0x48, 0x0d, 0x7d, 0xc1, 0x34, 0xeb, 0x13, 0x94, 0x4f, 0x18, + 0xc3, 0xe4, 0xe2, 0xbe, 0x63, 0xfa, 0x85, 0x34, 0x9c, 0xf0, 0x21, 0x75, 0xf4, 0x4d, 0xfb, 0xcc, 0xce, 0x55, 0xf6, 0xe4, 0x89, 0x4b, 0x0d, 0xf9, 0x7a, 0x4a, 0xea, 0x67, 0x77, 0xae, 0x0e, 0x91, 0xd7, 0x2c, 0x64, 0x57, 0x55, 0xdd, 0x8a, 0x78, 0x0a, 0x36, 0xed, 0x5d, 0x6e, 0x25, 0x30, 0x56, 0x90, 0xce, 0x42, 0xfe, 0xe9, 0xa5, 0x87, 0x1f, 0x4c, 0x42, 0x93, 0xe1, 0x34, 0x4d, 0x59, 0x88, - 0xe2, 0xeb, 0x11, 0xe2, 0xf8, 0xe6, 0xeb, 0x27, 0x52, 0x91, 0x8f, 0xba, 0xa2, 0x45, 0xc2, 0x47, - 0xeb, 0x0a, 0xe3, 0xd3, 0x69, 0xa8, 0x87, 0x4f, 0x05, 0xc8, 0x52, 0xb4, 0x1d, 0xb5, 0xdb, 0x1b, + 0xe2, 0xab, 0x11, 0xe2, 0xf8, 0xfa, 0xeb, 0x27, 0x52, 0x91, 0x8f, 0xba, 0xa2, 0x45, 0xc2, 0x47, + 0xeb, 0x0a, 0xe3, 0x53, 0x69, 0xa8, 0x87, 0x4f, 0x05, 0xc8, 0x52, 0xb4, 0x1d, 0xb5, 0xdb, 0x1b, 0xf6, 0xa6, 0xeb, 0x1c, 0x14, 0xd6, 0x05, 0x0e, 0xaa, 0xc2, 0x98, 0x8d, 0x35, 0xd3, 0x68, 0xd9, 0x74, 0x24, 0x19, 0x59, 0x14, 0xc9, 0x68, 0x0c, 0xd5, 0x30, 0x6d, 0x7e, 0xe5, 0x94, 0x15, 0x9a, - 0xff, 0x30, 0x75, 0xb8, 0xb5, 0x51, 0x76, 0x9b, 0xa2, 0x0b, 0x64, 0x35, 0xf5, 0xfc, 0xbd, 0x07, - 0x1d, 0xa8, 0xb0, 0x97, 0x6b, 0xee, 0x10, 0x7c, 0xa7, 0x27, 0x27, 0xc2, 0xa7, 0x27, 0xcf, 0xe2, - 0x4e, 0xe7, 0x69, 0xc3, 0xbc, 0x66, 0xac, 0x13, 0x1a, 0x57, 0x24, 0x9f, 0x4c, 0xc3, 0x89, 0x81, - 0x83, 0x12, 0x6e, 0x5e, 0x86, 0x49, 0xa4, 0x01, 0xf9, 0x05, 0x61, 0xb5, 0x0e, 0x2b, 0x90, 0x5f, - 0x3b, 0xa4, 0x40, 0xc6, 0x45, 0x4b, 0x42, 0x1e, 0xf7, 0xc4, 0xcb, 0x43, 0xf4, 0xff, 0x06, 0xc4, - 0xf1, 0xb1, 0x27, 0xe0, 0x76, 0x9f, 0x02, 0xa9, 0x9b, 0x9a, 0xce, 0x9f, 0x07, 0xfa, 0x57, 0xcc, - 0x11, 0xdf, 0x8a, 0x21, 0x28, 0xb3, 0xb4, 0x32, 0x7a, 0xd1, 0xd4, 0x92, 0xd9, 0xae, 0x5a, 0xcc, - 0x2a, 0xad, 0xc5, 0x29, 0x6e, 0x2d, 0x66, 0x1a, 0xa5, 0xbf, 0x1a, 0x85, 0x31, 0xf1, 0x96, 0xf3, - 0x51, 0xc8, 0x62, 0x6d, 0xdb, 0xe4, 0xb7, 0xdd, 0xa5, 0xd9, 0xc8, 0xf1, 0xcc, 0x72, 0xec, 0x45, - 0x6d, 0xdb, 0xbc, 0x38, 0x22, 0x53, 0x0a, 0xfa, 0x06, 0xac, 0xd3, 0xb7, 0xb7, 0xf9, 0xa5, 0xe4, - 0x53, 0x07, 0x93, 0x9e, 0x27, 0xa8, 0x17, 0x47, 0x64, 0x46, 0x43, 0x9a, 0xa5, 0xef, 0xd7, 0xb2, - 0x49, 0x9a, 0x5d, 0x32, 0xb6, 0x68, 0xb3, 0x84, 0x02, 0x5d, 0x04, 0xb0, 0xb1, 0x23, 0xae, 0x32, - 0x8c, 0x52, 0xfa, 0xbb, 0x0f, 0xa6, 0x5f, 0xc3, 0x0e, 0x73, 0x5b, 0x17, 0x47, 0xe4, 0x82, 0x2d, - 0x0a, 0x84, 0x93, 0x6e, 0xe8, 0x8e, 0xa2, 0x6d, 0xab, 0xba, 0x41, 0xcf, 0xe0, 0x63, 0x39, 0x2d, - 0x19, 0xba, 0x33, 0x4f, 0xd0, 0x09, 0x27, 0x5d, 0x14, 0x88, 0x28, 0xe8, 0x9b, 0x51, 0xfe, 0xc8, - 0x2a, 0x46, 0x14, 0xcf, 0x10, 0x54, 0x22, 0x0a, 0x4a, 0x83, 0x9e, 0x86, 0x22, 0x3d, 0x6e, 0x55, - 0x36, 0x3b, 0xa6, 0xb6, 0xc3, 0x5f, 0x96, 0xcc, 0x1c, 0xcc, 0xa2, 0x49, 0x08, 0x9a, 0x04, 0xff, - 0xe2, 0x88, 0x0c, 0x9b, 0x6e, 0x09, 0x35, 0x21, 0xcf, 0xae, 0xfd, 0x3a, 0xbb, 0xfc, 0x6d, 0xe0, - 0x9d, 0x07, 0x73, 0xa2, 0x37, 0x80, 0xd7, 0x77, 0x2f, 0x8e, 0xc8, 0x63, 0x1a, 0xfb, 0x89, 0x16, - 0xa1, 0x80, 0x8d, 0x16, 0xef, 0x4e, 0x91, 0xbf, 0xa2, 0x3a, 0x58, 0x2f, 0x8c, 0x96, 0xe8, 0x4c, - 0x1e, 0xf3, 0xdf, 0xe8, 0x09, 0xc8, 0x69, 0x66, 0xb7, 0xab, 0x3b, 0xf4, 0x8d, 0x61, 0xf1, 0xec, - 0x1d, 0x31, 0x1d, 0xa1, 0xb8, 0x17, 0x47, 0x64, 0x4e, 0x45, 0xa6, 0xa7, 0x85, 0x3b, 0xfa, 0x55, - 0x6c, 0x91, 0xc1, 0x4c, 0x25, 0x99, 0x9e, 0x05, 0x86, 0x4f, 0x87, 0x53, 0x68, 0x89, 0x42, 0x73, - 0x8c, 0xbb, 0x17, 0xe9, 0x6e, 0x28, 0xfa, 0x34, 0x99, 0x58, 0x2c, 0xbe, 0x03, 0xe1, 0xce, 0x5e, - 0x14, 0xa5, 0x32, 0x94, 0xfc, 0x7a, 0x2b, 0x75, 0x5d, 0x42, 0x7a, 0x88, 0x5f, 0x85, 0xb1, 0xab, - 0xd8, 0xb2, 0xd9, 0x09, 0x3e, 0x25, 0xe4, 0x45, 0x74, 0x0a, 0xc6, 0xa9, 0xdc, 0x14, 0x51, 0xcf, - 0x9e, 0x25, 0x97, 0x28, 0xf0, 0x0a, 0x47, 0xaa, 0x43, 0xb1, 0x77, 0xb6, 0xe7, 0xa2, 0xb0, 0xb7, - 0xd1, 0xd0, 0x3b, 0xdb, 0xe3, 0x08, 0x52, 0x03, 0x2a, 0x61, 0xd5, 0xf5, 0x7b, 0xcd, 0x42, 0x84, - 0xd7, 0x2c, 0x08, 0x4f, 0xfb, 0x3b, 0x69, 0x97, 0xd8, 0xd5, 0x56, 0xb2, 0xdc, 0x88, 0x91, 0xa0, - 0xd4, 0xc5, 0xb3, 0xb5, 0x81, 0xd0, 0xce, 0xf5, 0x35, 0xcd, 0x3c, 0x09, 0x45, 0x3e, 0xfd, 0xa7, - 0xf5, 0x94, 0x4c, 0x29, 0xd0, 0x71, 0xa2, 0x50, 0xaa, 0x6e, 0x28, 0x7a, 0x4b, 0xbc, 0x26, 0xa6, - 0xe5, 0xa5, 0x16, 0x7a, 0x06, 0x2a, 0x9a, 0x69, 0xd8, 0xd8, 0xb0, 0xfb, 0xb6, 0xd2, 0x53, 0x2d, - 0xb5, 0xeb, 0x3d, 0xba, 0x8b, 0x9e, 0xa6, 0x79, 0x81, 0xbe, 0x4a, 0xb1, 0xe5, 0x09, 0x2d, 0x08, - 0x40, 0xcb, 0x00, 0x57, 0xd5, 0x8e, 0xde, 0x52, 0x1d, 0xd3, 0xb2, 0xf9, 0xe3, 0x94, 0x61, 0xcc, - 0xae, 0x08, 0xc4, 0x8d, 0x5e, 0x4b, 0x75, 0x30, 0x0f, 0xa2, 0x7c, 0xf4, 0xe8, 0x2e, 0x98, 0x50, - 0x7b, 0x3d, 0xc5, 0x76, 0x54, 0x07, 0x2b, 0x9b, 0x7b, 0x0e, 0xb6, 0xa9, 0xbd, 0x28, 0xc9, 0xe3, - 0x6a, 0xaf, 0xb7, 0x46, 0xa0, 0x4d, 0x02, 0x94, 0x5a, 0xee, 0x6c, 0xd3, 0xa5, 0xe9, 0xc6, 0x76, - 0x29, 0x2f, 0xb6, 0x23, 0x30, 0x7a, 0xb5, 0x82, 0xc9, 0x40, 0xdc, 0x46, 0xc9, 0x6d, 0x63, 0xbd, - 0xbd, 0xcd, 0x9e, 0xb7, 0x67, 0x64, 0x5e, 0x22, 0x13, 0xd3, 0xb3, 0xcc, 0xab, 0x98, 0xbf, 0x6c, - 0x67, 0x05, 0xe9, 0x1f, 0xa4, 0x61, 0x72, 0x60, 0xf9, 0x12, 0xbe, 0xf4, 0x82, 0x3f, 0x6f, 0x8b, - 0xfc, 0x46, 0xe7, 0x08, 0x5f, 0xb5, 0xc5, 0x1f, 0xad, 0x14, 0xcf, 0xde, 0x36, 0x44, 0x02, 0x17, - 0x29, 0x12, 0x1f, 0x38, 0x27, 0x41, 0x1b, 0x50, 0xe9, 0xa8, 0xb6, 0xa3, 0xb0, 0x55, 0xc4, 0x5e, - 0x09, 0x67, 0x0e, 0xb4, 0x04, 0xcb, 0xaa, 0x58, 0x7d, 0x44, 0xb9, 0x39, 0xbb, 0x72, 0x27, 0x00, - 0x45, 0xcf, 0xc1, 0xf4, 0xe6, 0xde, 0x4b, 0xaa, 0xe1, 0xe8, 0x06, 0xbd, 0x6c, 0x14, 0x9c, 0xa3, - 0xfa, 0x10, 0xd6, 0x8b, 0x57, 0xf5, 0x16, 0x36, 0x34, 0x31, 0x39, 0x53, 0x2e, 0x0b, 0x77, 0xf2, - 0x6c, 0xe9, 0x39, 0x28, 0x07, 0x6d, 0x11, 0x2a, 0x43, 0xda, 0xd9, 0xe5, 0x12, 0x49, 0x3b, 0xbb, - 0xe8, 0x61, 0x1e, 0x91, 0xa7, 0xe9, 0x6d, 0xb9, 0x61, 0xce, 0x82, 0x53, 0x7b, 0x6f, 0x09, 0x25, - 0xc9, 0x5d, 0x09, 0xae, 0x61, 0x08, 0xf3, 0x96, 0x4e, 0xc3, 0x44, 0xc8, 0x88, 0xf9, 0xa6, 0x35, - 0xe5, 0x9f, 0x56, 0x69, 0x02, 0xc6, 0x03, 0xb6, 0x4a, 0xfa, 0xa3, 0x1c, 0xe4, 0xdd, 0x6f, 0x14, - 0x5c, 0x84, 0x02, 0xde, 0xd5, 0x70, 0xcf, 0x11, 0x56, 0xe1, 0x20, 0x23, 0xce, 0x68, 0x16, 0x05, - 0x3e, 0x31, 0x57, 0x2e, 0x31, 0x7a, 0x2c, 0xe0, 0x92, 0x4f, 0xc5, 0x31, 0xf1, 0xfb, 0xe4, 0xc7, - 0x83, 0x3e, 0xf9, 0x8e, 0x18, 0xda, 0x90, 0x53, 0x7e, 0x2c, 0xe0, 0x94, 0xe3, 0x1a, 0x0e, 0x78, - 0xe5, 0xa5, 0x08, 0xaf, 0x1c, 0x37, 0xfc, 0x21, 0x6e, 0x79, 0x29, 0xc2, 0x2d, 0xcf, 0xc4, 0xf6, - 0x25, 0xd2, 0x2f, 0x3f, 0x1e, 0xf4, 0xcb, 0x71, 0xe2, 0x08, 0x39, 0xe6, 0xe5, 0x28, 0xc7, 0x7c, - 0x3a, 0x86, 0xc7, 0x50, 0xcf, 0x3c, 0x3f, 0xe0, 0x99, 0xef, 0x8a, 0x61, 0x15, 0xe1, 0x9a, 0x97, - 0x02, 0x3e, 0x11, 0x12, 0xc9, 0x26, 0xda, 0x29, 0xa2, 0xf3, 0x83, 0x5e, 0xfe, 0xee, 0x38, 0x55, - 0x8b, 0x72, 0xf3, 0x4f, 0x86, 0xdc, 0xfc, 0x9d, 0x71, 0xa3, 0x0a, 0xf9, 0x79, 0xcf, 0x3b, 0x9f, - 0x26, 0xf6, 0x31, 0xb4, 0x32, 0x88, 0x2d, 0xc5, 0x96, 0x65, 0x5a, 0xdc, 0xf1, 0xb1, 0x82, 0x34, - 0x43, 0x2c, 0xb6, 0xa7, 0xff, 0x07, 0x78, 0x72, 0xba, 0x68, 0x7d, 0xda, 0x2e, 0x7d, 0x3d, 0xe5, - 0xd1, 0x52, 0xcb, 0xe6, 0xb7, 0xf6, 0x05, 0x6e, 0xed, 0x7d, 0x0e, 0x3e, 0x1d, 0x74, 0xf0, 0x75, - 0x28, 0x12, 0x9f, 0x12, 0xf2, 0xdd, 0x6a, 0x4f, 0xf8, 0x6e, 0x74, 0x0f, 0x4c, 0x52, 0xfb, 0xcb, - 0xc2, 0x00, 0x6e, 0x48, 0xb2, 0xd4, 0x90, 0x4c, 0x90, 0x0a, 0x26, 0x41, 0xe6, 0x28, 0xee, 0x87, - 0x29, 0x1f, 0x2e, 0xe1, 0x4b, 0x7d, 0x01, 0x73, 0x52, 0x15, 0x17, 0x7b, 0xae, 0xd7, 0xbb, 0xa8, - 0xda, 0xdb, 0xd2, 0x8a, 0x27, 0x20, 0x2f, 0x2e, 0x40, 0x90, 0xd5, 0xcc, 0x16, 0x1b, 0xf7, 0xb8, - 0x4c, 0x7f, 0x93, 0x58, 0xa1, 0x63, 0xb6, 0xf9, 0x0d, 0x48, 0xf2, 0x93, 0x60, 0xb9, 0x4b, 0xbb, - 0xc0, 0xd6, 0xac, 0xf4, 0x7b, 0x29, 0x8f, 0x9f, 0x17, 0x2a, 0x44, 0x79, 0xf5, 0xd4, 0xcd, 0xf4, - 0xea, 0xe9, 0xb7, 0xe6, 0xd5, 0xa5, 0x37, 0x53, 0xde, 0x94, 0xba, 0xfe, 0xfa, 0xc6, 0x44, 0x40, - 0xb4, 0x8b, 0xbd, 0x04, 0x67, 0x37, 0x75, 0x59, 0x41, 0x84, 0x5a, 0xb9, 0x88, 0x04, 0xc5, 0x98, - 0x2f, 0xa9, 0x81, 0x1e, 0xa2, 0x7e, 0xde, 0xdc, 0xe2, 0xa6, 0xa1, 0x1e, 0x93, 0xe8, 0x91, 0x19, - 0xb6, 0xcf, 0xbf, 0x14, 0x02, 0x61, 0xc3, 0xad, 0x50, 0x20, 0x5d, 0x67, 0xcf, 0x9f, 0x80, 0xa7, - 0x17, 0x05, 0x40, 0x6a, 0x01, 0x1a, 0xb4, 0x31, 0xe8, 0x12, 0xe4, 0xf0, 0x55, 0x7a, 0x1b, 0x95, - 0x25, 0x9b, 0x6e, 0x1d, 0xea, 0x88, 0xb1, 0xe1, 0x34, 0xab, 0x44, 0x98, 0xdf, 0xdf, 0xaf, 0x57, - 0x18, 0xcd, 0x7d, 0x66, 0x57, 0x77, 0x70, 0xb7, 0xe7, 0xec, 0xc9, 0x9c, 0x8b, 0xf4, 0x0b, 0x69, - 0xe2, 0x0f, 0x03, 0xf6, 0x27, 0x52, 0xbc, 0x62, 0xd1, 0xa4, 0x7d, 0x21, 0x52, 0x32, 0x91, 0xdf, - 0x06, 0xd0, 0x56, 0x6d, 0xe5, 0x9a, 0x6a, 0x38, 0xb8, 0xc5, 0xe5, 0x5e, 0x68, 0xab, 0xf6, 0xb3, - 0x14, 0x40, 0xe2, 0x4d, 0x52, 0xdd, 0xb7, 0x71, 0x8b, 0x4e, 0x40, 0x46, 0x1e, 0x6b, 0xab, 0xf6, - 0x86, 0x8d, 0x5b, 0xbe, 0xb1, 0x8e, 0xdd, 0x8c, 0xb1, 0x06, 0xe5, 0x9d, 0x0f, 0xcb, 0xfb, 0x13, - 0x69, 0x6f, 0x75, 0x78, 0xe1, 0xc3, 0x4f, 0xa6, 0x2c, 0x3e, 0x47, 0xf7, 0x14, 0x41, 0x27, 0x80, - 0x3e, 0x04, 0x93, 0xee, 0xaa, 0x54, 0xfa, 0x74, 0xb5, 0x0a, 0x2d, 0x3c, 0xdc, 0xe2, 0xae, 0x5c, - 0x0d, 0x82, 0x6d, 0xf4, 0x33, 0x70, 0x2c, 0x64, 0x83, 0xdc, 0x06, 0xd2, 0x87, 0x32, 0x45, 0x47, - 0x82, 0xa6, 0x48, 0xf0, 0xf7, 0xa4, 0x97, 0xb9, 0x29, 0xab, 0xe6, 0x0e, 0x12, 0xc2, 0xfa, 0xdd, - 0x5b, 0x94, 0x4e, 0x48, 0x7f, 0x9c, 0x82, 0x89, 0x50, 0x07, 0xd1, 0xa3, 0x30, 0xca, 0x3c, 0x70, - 0xea, 0xc0, 0x44, 0x08, 0x95, 0x38, 0x1f, 0x13, 0x23, 0x40, 0x73, 0x90, 0xc7, 0x3c, 0xba, 0xe6, - 0x42, 0xb9, 0x33, 0x26, 0x08, 0xe7, 0xf4, 0x2e, 0x19, 0x5a, 0x80, 0x82, 0x2b, 0xfa, 0x98, 0x9d, - 0x9b, 0x3b, 0x73, 0x9c, 0x89, 0x47, 0x28, 0xcd, 0x43, 0xd1, 0xd7, 0x3d, 0xf6, 0x16, 0x70, 0x97, - 0x6f, 0xb7, 0x58, 0x00, 0x9d, 0xef, 0xaa, 0xbb, 0x74, 0xa7, 0x85, 0x8e, 0xc1, 0x18, 0xa9, 0x6c, - 0xf3, 0xc7, 0x52, 0x19, 0x39, 0xd7, 0x55, 0x77, 0x2f, 0xa8, 0xb6, 0xf4, 0xc9, 0x14, 0x94, 0x83, - 0xfd, 0x44, 0xf7, 0x02, 0x22, 0xb8, 0x6a, 0x1b, 0x2b, 0x46, 0xbf, 0xcb, 0x7c, 0xa4, 0xe0, 0x38, - 0xd1, 0x55, 0x77, 0xe7, 0xda, 0xf8, 0x52, 0xbf, 0x4b, 0x9b, 0xb6, 0xd1, 0x0a, 0x54, 0x04, 0xb2, - 0x48, 0x76, 0x71, 0xa9, 0x1c, 0x1f, 0xfc, 0x5e, 0x0d, 0x47, 0x60, 0x7b, 0xdd, 0x57, 0xc8, 0x5e, - 0xb7, 0xcc, 0xf8, 0x89, 0x1a, 0xe9, 0x21, 0x98, 0x08, 0x8d, 0x18, 0x49, 0x30, 0xde, 0xeb, 0x6f, - 0x2a, 0x3b, 0x78, 0x8f, 0x3e, 0x7f, 0x67, 0xaa, 0x5e, 0x90, 0x8b, 0xbd, 0xfe, 0xe6, 0xd3, 0x78, - 0x8f, 0xe6, 0x0e, 0x25, 0x0d, 0xca, 0xc1, 0xcd, 0x14, 0x71, 0x1c, 0x96, 0xd9, 0x37, 0x5a, 0xe2, - 0xc3, 0x06, 0xb4, 0x80, 0xce, 0xc1, 0xe8, 0x55, 0x93, 0x69, 0xf3, 0x41, 0xbb, 0xa7, 0x2b, 0xa6, - 0x83, 0x7d, 0x5b, 0x32, 0x46, 0x23, 0xd9, 0x30, 0x4a, 0xf5, 0x32, 0xf2, 0xa0, 0xe2, 0x0a, 0x80, - 0xea, 0x38, 0x96, 0xbe, 0xd9, 0xf7, 0xd8, 0x57, 0x67, 0x07, 0xd3, 0xfa, 0xb3, 0xab, 0xaa, 0x6e, - 0x35, 0x6f, 0xe5, 0x9a, 0x3d, 0xed, 0xd1, 0xf8, 0xb4, 0xdb, 0xc7, 0x49, 0x7a, 0x23, 0x0b, 0x39, - 0xb6, 0xdd, 0x44, 0x4f, 0x04, 0x93, 0x1f, 0xc5, 0xb3, 0x27, 0x86, 0x75, 0x9f, 0x61, 0xf1, 0xde, - 0xbb, 0x11, 0xd4, 0x5d, 0xe1, 0x8c, 0x42, 0xb3, 0xf8, 0xda, 0x7e, 0x7d, 0x8c, 0x46, 0x1f, 0x4b, - 0x0b, 0x5e, 0x7a, 0x61, 0xd8, 0xee, 0x5a, 0xe4, 0x32, 0xb2, 0x87, 0xce, 0x65, 0x5c, 0x84, 0x71, - 0x5f, 0xb8, 0xa5, 0xb7, 0xf8, 0x3e, 0xe5, 0xc4, 0x41, 0x8b, 0x6e, 0x69, 0x81, 0xf7, 0xbf, 0xe8, - 0x86, 0x63, 0x4b, 0x2d, 0x34, 0x13, 0xdc, 0x64, 0xd3, 0xa8, 0x8d, 0x85, 0x0b, 0xbe, 0x7d, 0x33, - 0x7d, 0x93, 0x7f, 0x0b, 0x14, 0xe8, 0xc3, 0x66, 0x8a, 0xc2, 0xa2, 0x87, 0x3c, 0x01, 0xd0, 0xca, - 0xbb, 0x61, 0xc2, 0x0b, 0x6c, 0x18, 0x4a, 0x9e, 0x71, 0xf1, 0xc0, 0x14, 0xf1, 0x01, 0x98, 0xa6, - 0x1f, 0xc0, 0x0b, 0x63, 0x17, 0x28, 0x36, 0x22, 0x75, 0x57, 0x82, 0x14, 0x77, 0x42, 0xd9, 0x33, - 0xa1, 0x14, 0x17, 0x58, 0xea, 0xc3, 0x85, 0x52, 0xb4, 0xe3, 0x90, 0x77, 0xc3, 0xce, 0x22, 0xfb, - 0xb2, 0x9e, 0xca, 0xa2, 0x4d, 0x37, 0x90, 0xb5, 0xb0, 0xdd, 0xef, 0x38, 0x9c, 0x49, 0x89, 0xe2, - 0xd0, 0x40, 0x56, 0x66, 0x70, 0x8a, 0x7b, 0x0a, 0xc6, 0x85, 0x55, 0x61, 0x78, 0xe3, 0x14, 0xaf, - 0x24, 0x80, 0x14, 0xe9, 0x34, 0x54, 0x7a, 0x96, 0xd9, 0x33, 0x6d, 0x6c, 0x29, 0x6a, 0xab, 0x65, - 0x61, 0xdb, 0xae, 0x96, 0x19, 0x3f, 0x01, 0x9f, 0x63, 0x60, 0xe9, 0x7d, 0x30, 0x26, 0xe2, 0xe9, - 0x69, 0x18, 0x6d, 0xba, 0x16, 0x32, 0x2b, 0xb3, 0x02, 0xf1, 0xaf, 0x73, 0xbd, 0x1e, 0xcf, 0xae, - 0x91, 0x9f, 0x52, 0x07, 0xc6, 0xf8, 0x84, 0x45, 0xe6, 0x54, 0x56, 0xa0, 0xd4, 0x53, 0x2d, 0x32, - 0x0c, 0x7f, 0x66, 0x65, 0xd8, 0x8e, 0x70, 0x55, 0xb5, 0x9c, 0x35, 0xec, 0x04, 0x12, 0x2c, 0x45, - 0x4a, 0xcf, 0x40, 0xd2, 0x63, 0x30, 0x1e, 0xc0, 0xf1, 0xbe, 0x43, 0xc8, 0x17, 0x3a, 0x2d, 0xb8, - 0x3d, 0x49, 0x7b, 0x3d, 0x91, 0xce, 0x41, 0xc1, 0x9d, 0x2b, 0xb2, 0xd1, 0x10, 0xa2, 0xe0, 0x1f, - 0x36, 0xe4, 0x45, 0x9a, 0x44, 0x32, 0xaf, 0xf1, 0x4f, 0x34, 0x65, 0x64, 0x56, 0x90, 0xb0, 0xcf, - 0x30, 0x31, 0x6f, 0x86, 0x1e, 0x87, 0x31, 0x6e, 0x98, 0xf8, 0x7a, 0x1c, 0x96, 0x2e, 0x5a, 0xa5, - 0x96, 0x4a, 0xa4, 0x8b, 0x98, 0xdd, 0xf2, 0x9a, 0x49, 0xfb, 0x9b, 0xf9, 0x08, 0xe4, 0x85, 0xf1, - 0x09, 0x7a, 0x09, 0xd6, 0xc2, 0xc9, 0x38, 0x2f, 0xc1, 0x1b, 0xf1, 0x08, 0x89, 0x36, 0xd9, 0x7a, - 0xdb, 0xc0, 0x2d, 0xc5, 0x5b, 0x82, 0xfc, 0xc1, 0xec, 0x04, 0xab, 0x58, 0x16, 0xeb, 0x4b, 0x7a, - 0x00, 0x72, 0xac, 0xaf, 0x91, 0x26, 0x2e, 0xca, 0xb5, 0x7e, 0x2f, 0x05, 0x79, 0xe1, 0x3e, 0x22, - 0x89, 0x02, 0x83, 0x48, 0xdf, 0xe8, 0x20, 0x6e, 0xbe, 0x49, 0xba, 0x0f, 0x10, 0xd5, 0x14, 0xe5, - 0xaa, 0xe9, 0xe8, 0x46, 0x5b, 0x61, 0x73, 0xc1, 0xdf, 0x0d, 0xd2, 0x9a, 0x2b, 0xb4, 0x62, 0x95, - 0xc0, 0xef, 0x39, 0x05, 0x45, 0x5f, 0x96, 0x0b, 0x8d, 0x41, 0xe6, 0x12, 0xbe, 0x56, 0x19, 0x41, - 0x45, 0x18, 0x93, 0x31, 0xcd, 0x11, 0x54, 0x52, 0x67, 0xdf, 0x18, 0x83, 0x89, 0xb9, 0xe6, 0xfc, - 0xd2, 0x5c, 0xaf, 0xd7, 0xd1, 0xf9, 0x7b, 0xba, 0xcb, 0x90, 0xa5, 0xfb, 0xe4, 0x04, 0xe7, 0x3b, - 0xb5, 0x24, 0x09, 0x27, 0x24, 0xc3, 0x28, 0xdd, 0x4e, 0xa3, 0x24, 0xc7, 0x3e, 0xb5, 0x44, 0x79, - 0x28, 0xd2, 0x49, 0xaa, 0x70, 0x09, 0x4e, 0x83, 0x6a, 0x49, 0x92, 0x53, 0xe8, 0x67, 0xa0, 0xe0, - 0xed, 0x93, 0x93, 0x9e, 0x11, 0xd5, 0x12, 0xa7, 0xad, 0x08, 0x7f, 0x6f, 0x67, 0x90, 0xf4, 0x68, - 0xa2, 0x96, 0x38, 0x5f, 0x83, 0x9e, 0x83, 0x31, 0xb1, 0x07, 0x4b, 0x76, 0x8a, 0x53, 0x4b, 0x98, - 0x52, 0x22, 0xd3, 0xc7, 0xb6, 0xce, 0x49, 0x8e, 0xaa, 0x6a, 0x89, 0xf2, 0x66, 0x68, 0x03, 0x72, - 0x3c, 0xf8, 0x4d, 0x74, 0xd2, 0x53, 0x4b, 0x96, 0x28, 0x22, 0x42, 0xf6, 0x92, 0x13, 0x49, 0x8f, - 0xe7, 0x6a, 0x89, 0x13, 0x86, 0x48, 0x05, 0xf0, 0xed, 0xa7, 0x13, 0x9f, 0xbb, 0xd5, 0x92, 0x27, - 0x02, 0xd1, 0x87, 0x21, 0xef, 0xee, 0x9a, 0x12, 0x9e, 0xa4, 0xd5, 0x92, 0xe6, 0xe2, 0x9a, 0x1b, - 0x89, 0x6f, 0x49, 0xdc, 0x1b, 0x7b, 0x4b, 0xc2, 0x3b, 0xe4, 0x76, 0x8f, 0xc1, 0xff, 0x32, 0x05, - 0xc7, 0xc3, 0xc7, 0xc9, 0xaa, 0xb1, 0x37, 0xe4, 0x42, 0xc0, 0x90, 0xdb, 0x22, 0x8f, 0x43, 0x66, - 0xce, 0xd8, 0x23, 0xc1, 0x06, 0xfd, 0xb6, 0x5f, 0xdf, 0xea, 0x88, 0x34, 0x1d, 0x29, 0x6f, 0x58, - 0x9d, 0xe8, 0x5b, 0x23, 0x8d, 0xec, 0x0f, 0xbe, 0x50, 0x1f, 0x69, 0xee, 0x44, 0x8c, 0x2a, 0xe6, - 0xae, 0x40, 0x7e, 0xce, 0xd8, 0x13, 0xd7, 0x04, 0x46, 0xe9, 0x80, 0x0e, 0x7b, 0xfc, 0xff, 0x7a, - 0x89, 0x70, 0xf6, 0x7d, 0x1f, 0x98, 0x8f, 0x38, 0xc7, 0x4a, 0x43, 0x4e, 0xf8, 0xe3, 0x6f, 0x0c, - 0xd4, 0x86, 0x4b, 0x53, 0xba, 0x00, 0xd9, 0x79, 0x53, 0xa7, 0x21, 0x4f, 0x0b, 0x1b, 0x66, 0x57, - 0xe4, 0x3c, 0x69, 0x01, 0x9d, 0x82, 0x9c, 0xda, 0x35, 0xfb, 0x86, 0x23, 0xa2, 0x66, 0xe2, 0x4a, - 0xfe, 0xeb, 0x7e, 0x3d, 0xb3, 0x64, 0x38, 0x32, 0xaf, 0x6a, 0x64, 0xff, 0xe2, 0xd5, 0x7a, 0x4a, - 0x7a, 0x0a, 0xc6, 0x16, 0xb0, 0x76, 0x23, 0xbc, 0x16, 0xb0, 0x16, 0xe2, 0x75, 0x1a, 0xf2, 0x4b, - 0x86, 0xc3, 0x3e, 0x1a, 0x76, 0x1b, 0x64, 0x74, 0x83, 0x1d, 0x8b, 0x84, 0xda, 0x27, 0x70, 0x82, - 0xba, 0x80, 0x35, 0x17, 0xb5, 0x85, 0xb5, 0x30, 0x2a, 0x61, 0x4f, 0xe0, 0x52, 0x13, 0x4a, 0x57, - 0xd4, 0x0e, 0x0f, 0xf7, 0xb0, 0x8d, 0xee, 0x83, 0x82, 0x2a, 0x0a, 0x74, 0x67, 0x55, 0x6a, 0x96, - 0x7f, 0xb8, 0x5f, 0x07, 0x0f, 0x49, 0xf6, 0x10, 0x1a, 0xd9, 0x97, 0xff, 0xdb, 0xc9, 0x94, 0x64, - 0xc2, 0xd8, 0x05, 0xd5, 0xa6, 0x96, 0xfe, 0xc1, 0x40, 0x22, 0x85, 0x46, 0x8a, 0xcd, 0x23, 0xd7, - 0xf7, 0xeb, 0x93, 0x7b, 0x6a, 0xb7, 0xd3, 0x90, 0xbc, 0x3a, 0xc9, 0x9f, 0x5f, 0x99, 0xf5, 0xe5, - 0x57, 0x68, 0x24, 0xd9, 0x9c, 0xba, 0xbe, 0x5f, 0x9f, 0xf0, 0x68, 0x48, 0x8d, 0xe4, 0x26, 0x5d, - 0xa4, 0x1e, 0xe4, 0x58, 0xd0, 0x1b, 0x79, 0x42, 0xc8, 0x53, 0x3e, 0x69, 0x2f, 0xe5, 0xd3, 0x38, - 0x54, 0x9a, 0x81, 0xc7, 0x65, 0x8c, 0xa2, 0x91, 0xfd, 0xf8, 0xab, 0xf5, 0x11, 0xc9, 0x02, 0xb4, - 0xa6, 0x77, 0xfb, 0x1d, 0xf6, 0xf0, 0x5b, 0x1c, 0x35, 0x3d, 0xc8, 0xfa, 0x4d, 0xd3, 0x49, 0x2c, - 0x20, 0x9b, 0x98, 0xe5, 0x4a, 0xca, 0x05, 0xc2, 0xe2, 0x8c, 0x6f, 0xef, 0xd7, 0x53, 0xb4, 0xf7, - 0x54, 0x46, 0x77, 0x41, 0x8e, 0x85, 0xf2, 0x3c, 0xfe, 0x29, 0x0b, 0x1a, 0x36, 0x26, 0x99, 0xd7, - 0x4a, 0x4f, 0xc0, 0xd8, 0x8a, 0xdd, 0x5e, 0x20, 0x43, 0x3a, 0x0e, 0xf9, 0xae, 0xdd, 0x56, 0x7c, - 0xd1, 0xd4, 0x58, 0xd7, 0x6e, 0xaf, 0x0f, 0x89, 0xc2, 0xf8, 0xb4, 0xbc, 0x1f, 0x72, 0xeb, 0xbb, - 0x94, 0xfc, 0x94, 0x2b, 0xa5, 0x8c, 0xbf, 0x8f, 0x9c, 0x7b, 0x80, 0xe8, 0x63, 0x19, 0x80, 0xf5, - 0x5d, 0x77, 0x84, 0x43, 0x8e, 0xe0, 0x90, 0x04, 0x39, 0x67, 0xd7, 0x8d, 0xa8, 0x0b, 0x4d, 0x78, - 0x6d, 0xbf, 0x9e, 0x5b, 0xdf, 0x25, 0xdb, 0x0b, 0x99, 0xd7, 0x04, 0x53, 0x59, 0x99, 0x50, 0x2a, - 0xcb, 0x4d, 0xe0, 0x65, 0x23, 0x12, 0x78, 0xa3, 0xbe, 0x13, 0x80, 0x63, 0x30, 0x66, 0xa9, 0xd7, - 0x14, 0x32, 0xa3, 0xec, 0x2b, 0xa4, 0x39, 0x4b, 0xbd, 0xb6, 0x6c, 0xb6, 0xd1, 0x3c, 0x64, 0x3b, - 0x66, 0x5b, 0xe4, 0xdd, 0x8e, 0x8a, 0x41, 0x91, 0x88, 0x8b, 0xdf, 0x26, 0x5e, 0x36, 0xdb, 0xcd, - 0x63, 0x44, 0xfe, 0x5f, 0xfe, 0xd3, 0xfa, 0x44, 0x10, 0x6e, 0xcb, 0x94, 0xd8, 0x4d, 0x06, 0xe6, - 0x87, 0x26, 0x03, 0x0b, 0x07, 0x25, 0x03, 0x21, 0x98, 0x0c, 0xbc, 0x83, 0x9e, 0x69, 0xb2, 0x33, - 0x9c, 0xe9, 0x81, 0xe0, 0x73, 0xce, 0xd8, 0xa3, 0xa7, 0xa8, 0xb7, 0x42, 0xc1, 0xbd, 0x28, 0xc4, - 0x3f, 0xfb, 0xec, 0x01, 0xb8, 0xbe, 0x7d, 0x3c, 0x05, 0xe5, 0x60, 0x8f, 0x69, 0x3e, 0xc7, 0x6e, - 0xf3, 0x0f, 0xa6, 0xb2, 0xb4, 0x27, 0x51, 0x8a, 0x25, 0x91, 0x29, 0x0f, 0xe9, 0xfc, 0x5c, 0x48, - 0xe7, 0xa7, 0x84, 0x80, 0xd8, 0xdb, 0x1d, 0xa6, 0xea, 0xd3, 0x5c, 0x3a, 0x25, 0x1f, 0xd0, 0xf6, - 0x54, 0x9f, 0x6a, 0xc4, 0xcf, 0x42, 0xd1, 0x57, 0x1b, 0x19, 0xd4, 0x3f, 0x12, 0x91, 0xec, 0x98, - 0x74, 0x27, 0x44, 0xd4, 0x88, 0x23, 0x04, 0x0f, 0xd5, 0x55, 0xd4, 0x82, 0x8b, 0x94, 0xf4, 0x7a, - 0x45, 0x73, 0xe1, 0x4f, 0xbe, 0x7b, 0x62, 0xe4, 0xe5, 0xd7, 0x4e, 0x8c, 0x0c, 0xbd, 0x9f, 0x29, - 0xc5, 0x7f, 0x61, 0xde, 0xf5, 0x32, 0x9f, 0xf8, 0x20, 0xdc, 0xca, 0x71, 0x6c, 0x47, 0xdd, 0xd1, - 0x8d, 0xb6, 0xf8, 0xcb, 0xdd, 0x4d, 0x99, 0x8f, 0x86, 0x43, 0x6f, 0xdc, 0xed, 0xbc, 0xd5, 0x4b, - 0x63, 0xb5, 0x28, 0x6f, 0x28, 0xed, 0x67, 0x01, 0xad, 0xd8, 0xed, 0x79, 0x0b, 0xb3, 0x8f, 0x8d, - 0xf0, 0x7d, 0x52, 0xf0, 0xb1, 0x0f, 0xb7, 0x51, 0xb7, 0xcc, 0x06, 0xc7, 0xe2, 0x7e, 0x37, 0xda, - 0xcb, 0x11, 0x05, 0x9e, 0x08, 0x2d, 0x02, 0xd0, 0xf4, 0x8a, 0x6d, 0x7b, 0xc9, 0xbc, 0x7a, 0x98, - 0xc7, 0xbc, 0x8b, 0x21, 0xab, 0x0e, 0xb6, 0xc5, 0x5c, 0x7b, 0x84, 0xe8, 0x23, 0x30, 0xd5, 0xd5, - 0x0d, 0xc5, 0xc6, 0x9d, 0x2d, 0xa5, 0x85, 0x3b, 0xf4, 0x53, 0x2c, 0xfc, 0xe0, 0xae, 0xd0, 0x5c, - 0xe6, 0x8e, 0xe9, 0xae, 0xf8, 0x39, 0x9b, 0x5d, 0x32, 0x9c, 0xeb, 0xfb, 0xf5, 0x1a, 0xf3, 0x0e, - 0x11, 0x2c, 0x25, 0x79, 0xb2, 0xab, 0x1b, 0x6b, 0xb8, 0xb3, 0xb5, 0xe0, 0xc2, 0xd0, 0x4b, 0x30, - 0xc9, 0x31, 0x4c, 0x2f, 0xe9, 0x41, 0x6c, 0x4f, 0xa9, 0xb9, 0x72, 0x7d, 0xbf, 0x5e, 0x65, 0xdc, - 0x06, 0x50, 0xa4, 0x1f, 0xee, 0xd7, 0xef, 0x4f, 0xd0, 0xa7, 0x39, 0x4d, 0x13, 0xee, 0xb1, 0xe2, - 0x32, 0xe1, 0x10, 0xd2, 0xb6, 0x97, 0xa0, 0x17, 0x6d, 0x8f, 0x86, 0xdb, 0x1e, 0x40, 0x49, 0xda, - 0xb6, 0xcf, 0x35, 0x7b, 0x19, 0x7c, 0xd1, 0xf6, 0x51, 0xc8, 0xf5, 0xfa, 0x9b, 0xe2, 0x14, 0xad, - 0x20, 0xf3, 0x12, 0x9a, 0xf1, 0x1f, 0xa4, 0x15, 0xcf, 0x96, 0xc4, 0x7c, 0x92, 0x58, 0xc5, 0x4d, - 0x73, 0xb2, 0xd8, 0x8f, 0x46, 0x1f, 0x5f, 0xcf, 0x40, 0x65, 0xc5, 0x6e, 0x2f, 0xb6, 0x74, 0xe7, - 0x26, 0xab, 0x57, 0x2f, 0x4a, 0x3a, 0xd4, 0x9b, 0x35, 0xe7, 0xaf, 0xef, 0xd7, 0xcb, 0x4c, 0x3a, - 0x37, 0x53, 0x26, 0x5d, 0x98, 0xf0, 0xf4, 0x52, 0xb1, 0x54, 0x87, 0xbb, 0xa7, 0xe6, 0x42, 0x42, - 0x0d, 0x5c, 0xc0, 0xda, 0xf5, 0xfd, 0xfa, 0x51, 0xd6, 0xb3, 0x10, 0x2b, 0x49, 0x2e, 0x6b, 0x81, - 0xb5, 0x80, 0x76, 0xa3, 0x15, 0x9f, 0x9e, 0x3f, 0x35, 0x2f, 0xbe, 0x8d, 0x4a, 0xcf, 0xa7, 0xee, - 0x6b, 0x69, 0x28, 0x12, 0x57, 0xcf, 0xe0, 0x38, 0x7a, 0x29, 0xa4, 0x7e, 0x8c, 0x4b, 0x21, 0xfd, - 0xce, 0x2c, 0x85, 0x7b, 0xdc, 0x58, 0x3b, 0x33, 0x54, 0xe7, 0x83, 0x21, 0xf7, 0x7f, 0xca, 0x50, - 0xab, 0x4a, 0x77, 0x90, 0x32, 0x6e, 0xbd, 0x1b, 0x04, 0xf8, 0x73, 0x29, 0x38, 0xe2, 0x89, 0xc7, - 0xb6, 0xb4, 0x90, 0x14, 0x9f, 0xb9, 0xbe, 0x5f, 0xbf, 0x35, 0x2c, 0x45, 0x1f, 0xda, 0x0d, 0x48, - 0x72, 0xca, 0x65, 0xb4, 0x66, 0x69, 0xd1, 0xfd, 0x68, 0xd9, 0x8e, 0xdb, 0x8f, 0xcc, 0xf0, 0x7e, - 0xf8, 0xd0, 0xde, 0x52, 0x3f, 0x16, 0x6c, 0x67, 0x70, 0x52, 0xb3, 0x09, 0x27, 0xf5, 0x1b, 0x69, - 0x18, 0x5f, 0xb1, 0xdb, 0x1b, 0x46, 0xeb, 0xbd, 0x05, 0x71, 0xd8, 0x05, 0xf1, 0xc9, 0x14, 0x94, - 0x2f, 0xea, 0xb6, 0x63, 0x5a, 0xba, 0xa6, 0x76, 0xe8, 0x6e, 0xc6, 0xbb, 0x23, 0x99, 0x3a, 0xfc, - 0x1d, 0xc9, 0x47, 0x20, 0x77, 0x55, 0xed, 0xb0, 0x7f, 0x57, 0x94, 0xa1, 0x67, 0x84, 0x21, 0xdf, - 0x11, 0xce, 0x01, 0x73, 0x74, 0xde, 0x9d, 0xdf, 0x4e, 0xc3, 0x44, 0x28, 0xf0, 0x40, 0x4d, 0xc8, - 0x52, 0x8b, 0xce, 0x36, 0xbc, 0xb3, 0x87, 0x88, 0x2b, 0xc8, 0x9e, 0x98, 0xd2, 0xa2, 0x9f, 0x82, - 0x7c, 0x57, 0xdd, 0x65, 0x9e, 0x81, 0xed, 0x6f, 0xe6, 0x0e, 0xc7, 0xc7, 0xdb, 0xbd, 0x0a, 0x3e, - 0x92, 0x3c, 0xd6, 0x55, 0x77, 0xa9, 0x3f, 0xe8, 0xc1, 0x04, 0x81, 0x6a, 0xdb, 0xaa, 0xd1, 0xc6, - 0x7e, 0xf7, 0x73, 0xf1, 0xd0, 0x8d, 0x1c, 0xf5, 0x1a, 0xf1, 0xb1, 0x93, 0xe4, 0xf1, 0xae, 0xba, - 0x3b, 0x4f, 0x01, 0xa4, 0xc5, 0x46, 0xfe, 0x95, 0x57, 0xeb, 0x23, 0x54, 0x62, 0xff, 0x21, 0x05, - 0xe0, 0x49, 0x0c, 0xad, 0x43, 0x25, 0xe4, 0xbe, 0xc4, 0x1d, 0xa3, 0xd8, 0x00, 0xcf, 0xdb, 0xd8, - 0x4e, 0x68, 0xa1, 0x29, 0xf8, 0x30, 0x14, 0xd9, 0x2d, 0x01, 0x85, 0x26, 0xe3, 0xd3, 0xb1, 0xc9, - 0xf8, 0x13, 0x84, 0xd7, 0xf5, 0xfd, 0x3a, 0x62, 0xc3, 0xf1, 0x11, 0x4b, 0x34, 0x45, 0x0f, 0x0c, - 0x42, 0x08, 0x82, 0x63, 0x29, 0xfa, 0x62, 0x0b, 0x7a, 0xf7, 0xcc, 0x34, 0xf4, 0x1d, 0x6c, 0xb9, - 0x7b, 0x64, 0x56, 0x44, 0x35, 0xc8, 0xb3, 0xaf, 0x0a, 0x3a, 0x7b, 0xe2, 0xdf, 0x55, 0x88, 0x32, - 0xa1, 0xba, 0x86, 0x37, 0x6d, 0x5d, 0xcc, 0x82, 0x2c, 0x8a, 0xe8, 0x3c, 0x54, 0x6c, 0xac, 0xf5, - 0x2d, 0xdd, 0xd9, 0x53, 0x34, 0xd3, 0x70, 0x54, 0xcd, 0xe1, 0x4e, 0xfb, 0x96, 0xeb, 0xfb, 0xf5, - 0x63, 0xac, 0xaf, 0x61, 0x0c, 0x49, 0x9e, 0x10, 0xa0, 0x79, 0x06, 0x21, 0x2d, 0xb4, 0xb0, 0xa3, - 0xea, 0x1d, 0x9b, 0x6f, 0x6c, 0x45, 0xd1, 0x37, 0x96, 0xaf, 0x8c, 0xf9, 0x0f, 0xa3, 0xae, 0x41, - 0xc5, 0xec, 0x61, 0x2b, 0xc2, 0x1e, 0x2d, 0x7b, 0x2d, 0x87, 0x31, 0x6e, 0xc0, 0x24, 0x4c, 0x08, - 0x1e, 0xc2, 0x22, 0x9c, 0x0f, 0xdc, 0x39, 0x63, 0x71, 0x63, 0x3a, 0x3c, 0xe4, 0x30, 0x86, 0xe4, - 0xbf, 0x68, 0xc6, 0xa2, 0xcb, 0xa3, 0x90, 0x7b, 0x41, 0xd5, 0x3b, 0xe2, 0x53, 0xab, 0x32, 0x2f, - 0xa1, 0x25, 0xc8, 0xd9, 0x8e, 0xea, 0xf4, 0x59, 0xe8, 0x3d, 0xda, 0x7c, 0x5f, 0xc2, 0x3e, 0x37, - 0x4d, 0xa3, 0xb5, 0x46, 0x09, 0x65, 0xce, 0x00, 0x9d, 0x87, 0x9c, 0x63, 0xee, 0x60, 0x83, 0x0b, - 0xf5, 0x50, 0x2b, 0x9d, 0x26, 0xea, 0x18, 0x35, 0x72, 0xc0, 0x33, 0xca, 0x8a, 0xbd, 0xad, 0x5a, - 0xd8, 0x66, 0xa1, 0x72, 0x73, 0xe9, 0xd0, 0xcb, 0xf1, 0x58, 0xd8, 0x53, 0x30, 0x7e, 0x92, 0x3c, - 0xe1, 0x82, 0xd6, 0x28, 0x24, 0x1c, 0x39, 0x8f, 0xdd, 0x50, 0xe4, 0x7c, 0x1e, 0x2a, 0x7d, 0x63, - 0xd3, 0x34, 0xe8, 0x67, 0x11, 0x79, 0x9a, 0x26, 0x7f, 0x32, 0x35, 0x93, 0xf1, 0xcf, 0x56, 0x18, - 0x43, 0x92, 0x27, 0x5c, 0x10, 0xbf, 0xfd, 0xd8, 0x82, 0xb2, 0x87, 0x45, 0x97, 0x6c, 0x21, 0x76, - 0xc9, 0xde, 0xce, 0x97, 0xec, 0x91, 0x70, 0x2b, 0xde, 0xaa, 0x1d, 0x77, 0x81, 0x84, 0x0c, 0x7d, - 0x30, 0xb0, 0x8d, 0x04, 0xde, 0xc2, 0x50, 0x2b, 0x93, 0x7c, 0x07, 0x59, 0x7c, 0x47, 0x76, 0x90, - 0x8d, 0xd2, 0xc7, 0x5f, 0xad, 0x8f, 0xb8, 0x0b, 0xf6, 0x17, 0xd3, 0x90, 0x5b, 0xb8, 0x42, 0x9f, - 0x51, 0xfe, 0x84, 0x86, 0x0f, 0x3e, 0xeb, 0xf5, 0x01, 0x18, 0x63, 0xb2, 0xb0, 0xd1, 0x59, 0x18, - 0xed, 0x91, 0x1f, 0x3c, 0xd7, 0x78, 0x74, 0x40, 0xa5, 0x29, 0x9e, 0xd8, 0x61, 0x52, 0x54, 0xe9, - 0x8b, 0x19, 0x80, 0x85, 0x2b, 0x57, 0xd6, 0x2d, 0xbd, 0xd7, 0xc1, 0xce, 0x7b, 0xe1, 0xf5, 0xbb, + 0xbf, 0x9a, 0x3a, 0xdc, 0xda, 0x28, 0xbb, 0x4d, 0xd1, 0x05, 0xb2, 0x9a, 0x7a, 0xfe, 0xde, 0x83, + 0x0e, 0x54, 0xd8, 0xcb, 0x35, 0x77, 0x08, 0xbe, 0xd3, 0x93, 0x13, 0xe1, 0xd3, 0x93, 0x67, 0x71, + 0xa7, 0xf3, 0xb4, 0x61, 0x5e, 0x33, 0xd6, 0x09, 0x8d, 0x2b, 0x92, 0x4f, 0xa4, 0xe1, 0xc4, 0xc0, + 0x41, 0x09, 0x37, 0x2f, 0xc3, 0x24, 0xd2, 0x80, 0xfc, 0x82, 0xb0, 0x5a, 0x87, 0x15, 0xc8, 0xaf, + 0x1c, 0x52, 0x20, 0xe3, 0xa2, 0x25, 0x21, 0x8f, 0x7b, 0xe2, 0xe5, 0x21, 0xfa, 0x7f, 0x03, 0xe2, + 0xf8, 0xc8, 0x13, 0x70, 0xbb, 0x4f, 0x81, 0xd4, 0x4d, 0x4d, 0xe7, 0xcf, 0x03, 0xfd, 0x2b, 0xe6, + 0x88, 0x6f, 0xc5, 0x10, 0x94, 0x59, 0x5a, 0x19, 0xbd, 0x68, 0x6a, 0xc9, 0x6c, 0x57, 0x2d, 0x66, + 0x95, 0xd6, 0xe2, 0x14, 0xb7, 0x16, 0x33, 0x8d, 0xd2, 0x5f, 0x8e, 0xc2, 0x98, 0x78, 0xcb, 0xf9, + 0x28, 0x64, 0xb1, 0xb6, 0x6d, 0xf2, 0xdb, 0xee, 0xd2, 0x6c, 0xe4, 0x78, 0x66, 0x39, 0xf6, 0xa2, + 0xb6, 0x6d, 0x5e, 0x1c, 0x91, 0x29, 0x05, 0x7d, 0x03, 0xd6, 0xe9, 0xdb, 0xdb, 0xfc, 0x52, 0xf2, + 0xa9, 0x83, 0x49, 0xcf, 0x13, 0xd4, 0x8b, 0x23, 0x32, 0xa3, 0x21, 0xcd, 0xd2, 0xf7, 0x6b, 0xd9, + 0x24, 0xcd, 0x2e, 0x19, 0x5b, 0xb4, 0x59, 0x42, 0x81, 0x2e, 0x02, 0xd8, 0xd8, 0x11, 0x57, 0x19, + 0x46, 0x29, 0xfd, 0xdd, 0x07, 0xd3, 0xaf, 0x61, 0x87, 0xb9, 0xad, 0x8b, 0x23, 0x72, 0xc1, 0x16, + 0x05, 0xc2, 0x49, 0x37, 0x74, 0x47, 0xd1, 0xb6, 0x55, 0xdd, 0xa0, 0x67, 0xf0, 0xb1, 0x9c, 0x96, + 0x0c, 0xdd, 0x99, 0x27, 0xe8, 0x84, 0x93, 0x2e, 0x0a, 0x44, 0x14, 0xf4, 0xcd, 0x28, 0x7f, 0x64, + 0x15, 0x23, 0x8a, 0x67, 0x08, 0x2a, 0x11, 0x05, 0xa5, 0x41, 0x4f, 0x43, 0x91, 0x1e, 0xb7, 0x2a, + 0x9b, 0x1d, 0x53, 0xdb, 0xe1, 0x2f, 0x4b, 0x66, 0x0e, 0x66, 0xd1, 0x24, 0x04, 0x4d, 0x82, 0x7f, + 0x71, 0x44, 0x86, 0x4d, 0xb7, 0x84, 0x9a, 0x90, 0x67, 0xd7, 0x7e, 0x9d, 0x5d, 0xfe, 0x36, 0xf0, + 0xce, 0x83, 0x39, 0xd1, 0x1b, 0xc0, 0xeb, 0xbb, 0x17, 0x47, 0xe4, 0x31, 0x8d, 0xfd, 0x44, 0x8b, + 0x50, 0xc0, 0x46, 0x8b, 0x77, 0xa7, 0xc8, 0x5f, 0x51, 0x1d, 0xac, 0x17, 0x46, 0x4b, 0x74, 0x26, + 0x8f, 0xf9, 0x6f, 0xf4, 0x04, 0xe4, 0x34, 0xb3, 0xdb, 0xd5, 0x1d, 0xfa, 0xc6, 0xb0, 0x78, 0xf6, + 0x8e, 0x98, 0x8e, 0x50, 0xdc, 0x8b, 0x23, 0x32, 0xa7, 0x22, 0xd3, 0xd3, 0xc2, 0x1d, 0xfd, 0x2a, + 0xb6, 0xc8, 0x60, 0xa6, 0x92, 0x4c, 0xcf, 0x02, 0xc3, 0xa7, 0xc3, 0x29, 0xb4, 0x44, 0xa1, 0x39, + 0xc6, 0xdd, 0x8b, 0x74, 0x37, 0x14, 0x7d, 0x9a, 0x4c, 0x2c, 0x16, 0xdf, 0x81, 0x70, 0x67, 0x2f, + 0x8a, 0x52, 0x19, 0x4a, 0x7e, 0xbd, 0x95, 0xba, 0x2e, 0x21, 0x3d, 0xc4, 0xaf, 0xc2, 0xd8, 0x55, + 0x6c, 0xd9, 0xec, 0x04, 0x9f, 0x12, 0xf2, 0x22, 0x3a, 0x05, 0xe3, 0x54, 0x6e, 0x8a, 0xa8, 0x67, + 0xcf, 0x92, 0x4b, 0x14, 0x78, 0x85, 0x23, 0xd5, 0xa1, 0xd8, 0x3b, 0xdb, 0x73, 0x51, 0xd8, 0xdb, + 0x68, 0xe8, 0x9d, 0xed, 0x71, 0x04, 0xa9, 0x01, 0x95, 0xb0, 0xea, 0xfa, 0xbd, 0x66, 0x21, 0xc2, + 0x6b, 0x16, 0x84, 0xa7, 0xfd, 0x9d, 0xb4, 0x4b, 0xec, 0x6a, 0x2b, 0x59, 0x6e, 0xc4, 0x48, 0x50, + 0xea, 0xe2, 0xd9, 0xda, 0x40, 0x68, 0xe7, 0xfa, 0x9a, 0x66, 0x9e, 0x84, 0x22, 0x9f, 0xfa, 0xd3, + 0x7a, 0x4a, 0xa6, 0x14, 0xe8, 0x38, 0x51, 0x28, 0x55, 0x37, 0x14, 0xbd, 0x25, 0x5e, 0x13, 0xd3, + 0xf2, 0x52, 0x0b, 0x3d, 0x03, 0x15, 0xcd, 0x34, 0x6c, 0x6c, 0xd8, 0x7d, 0x5b, 0xe9, 0xa9, 0x96, + 0xda, 0xf5, 0x1e, 0xdd, 0x45, 0x4f, 0xd3, 0xbc, 0x40, 0x5f, 0xa5, 0xd8, 0xf2, 0x84, 0x16, 0x04, + 0xa0, 0x65, 0x80, 0xab, 0x6a, 0x47, 0x6f, 0xa9, 0x8e, 0x69, 0xd9, 0xfc, 0x71, 0xca, 0x30, 0x66, + 0x57, 0x04, 0xe2, 0x46, 0xaf, 0xa5, 0x3a, 0x98, 0x07, 0x51, 0x3e, 0x7a, 0x74, 0x17, 0x4c, 0xa8, + 0xbd, 0x9e, 0x62, 0x3b, 0xaa, 0x83, 0x95, 0xcd, 0x3d, 0x07, 0xdb, 0xd4, 0x5e, 0x94, 0xe4, 0x71, + 0xb5, 0xd7, 0x5b, 0x23, 0xd0, 0x26, 0x01, 0x4a, 0x2d, 0x77, 0xb6, 0xe9, 0xd2, 0x74, 0x63, 0xbb, + 0x94, 0x17, 0xdb, 0x11, 0x18, 0xbd, 0x5a, 0xc1, 0x64, 0x20, 0x6e, 0xa3, 0xe4, 0xb6, 0xb1, 0xde, + 0xde, 0x66, 0xcf, 0xdb, 0x33, 0x32, 0x2f, 0x91, 0x89, 0xe9, 0x59, 0xe6, 0x55, 0xcc, 0x5f, 0xb6, + 0xb3, 0x82, 0xf4, 0xf7, 0xd3, 0x30, 0x39, 0xb0, 0x7c, 0x09, 0x5f, 0x7a, 0xc1, 0x9f, 0xb7, 0x45, + 0x7e, 0xa3, 0x73, 0x84, 0xaf, 0xda, 0xe2, 0x8f, 0x56, 0x8a, 0x67, 0x6f, 0x1b, 0x22, 0x81, 0x8b, + 0x14, 0x89, 0x0f, 0x9c, 0x93, 0xa0, 0x0d, 0xa8, 0x74, 0x54, 0xdb, 0x51, 0xd8, 0x2a, 0x62, 0xaf, + 0x84, 0x33, 0x07, 0x5a, 0x82, 0x65, 0x55, 0xac, 0x3e, 0xa2, 0xdc, 0x9c, 0x5d, 0xb9, 0x13, 0x80, + 0xa2, 0xe7, 0x60, 0x7a, 0x73, 0xef, 0x25, 0xd5, 0x70, 0x74, 0x83, 0x5e, 0x36, 0x0a, 0xce, 0x51, + 0x7d, 0x08, 0xeb, 0xc5, 0xab, 0x7a, 0x0b, 0x1b, 0x9a, 0x98, 0x9c, 0x29, 0x97, 0x85, 0x3b, 0x79, + 0xb6, 0xf4, 0x1c, 0x94, 0x83, 0xb6, 0x08, 0x95, 0x21, 0xed, 0xec, 0x72, 0x89, 0xa4, 0x9d, 0x5d, + 0xf4, 0x30, 0x8f, 0xc8, 0xd3, 0xf4, 0xb6, 0xdc, 0x30, 0x67, 0xc1, 0xa9, 0xbd, 0xb7, 0x84, 0x92, + 0xe4, 0xae, 0x04, 0xd7, 0x30, 0x84, 0x79, 0x4b, 0xa7, 0x61, 0x22, 0x64, 0xc4, 0x7c, 0xd3, 0x9a, + 0xf2, 0x4f, 0xab, 0x34, 0x01, 0xe3, 0x01, 0x5b, 0x25, 0xfd, 0x51, 0x0e, 0xf2, 0xee, 0x37, 0x0a, + 0x2e, 0x42, 0x01, 0xef, 0x6a, 0xb8, 0xe7, 0x08, 0xab, 0x70, 0x90, 0x11, 0x67, 0x34, 0x8b, 0x02, + 0x9f, 0x98, 0x2b, 0x97, 0x18, 0x3d, 0x16, 0x70, 0xc9, 0xa7, 0xe2, 0x98, 0xf8, 0x7d, 0xf2, 0xe3, + 0x41, 0x9f, 0x7c, 0x47, 0x0c, 0x6d, 0xc8, 0x29, 0x3f, 0x16, 0x70, 0xca, 0x71, 0x0d, 0x07, 0xbc, + 0xf2, 0x52, 0x84, 0x57, 0x8e, 0x1b, 0xfe, 0x10, 0xb7, 0xbc, 0x14, 0xe1, 0x96, 0x67, 0x62, 0xfb, + 0x12, 0xe9, 0x97, 0x1f, 0x0f, 0xfa, 0xe5, 0x38, 0x71, 0x84, 0x1c, 0xf3, 0x72, 0x94, 0x63, 0x3e, + 0x1d, 0xc3, 0x63, 0xa8, 0x67, 0x9e, 0x1f, 0xf0, 0xcc, 0x77, 0xc5, 0xb0, 0x8a, 0x70, 0xcd, 0x4b, + 0x01, 0x9f, 0x08, 0x89, 0x64, 0x13, 0xed, 0x14, 0xd1, 0xf9, 0x41, 0x2f, 0x7f, 0x77, 0x9c, 0xaa, + 0x45, 0xb9, 0xf9, 0x27, 0x43, 0x6e, 0xfe, 0xce, 0xb8, 0x51, 0x85, 0xfc, 0xbc, 0xe7, 0x9d, 0x4f, + 0x13, 0xfb, 0x18, 0x5a, 0x19, 0xc4, 0x96, 0x62, 0xcb, 0x32, 0x2d, 0xee, 0xf8, 0x58, 0x41, 0x9a, + 0x21, 0x16, 0xdb, 0xd3, 0xff, 0x03, 0x3c, 0x39, 0x5d, 0xb4, 0x3e, 0x6d, 0x97, 0xbe, 0x9a, 0xf2, + 0x68, 0xa9, 0x65, 0xf3, 0x5b, 0xfb, 0x02, 0xb7, 0xf6, 0x3e, 0x07, 0x9f, 0x0e, 0x3a, 0xf8, 0x3a, + 0x14, 0x89, 0x4f, 0x09, 0xf9, 0x6e, 0xb5, 0x27, 0x7c, 0x37, 0xba, 0x07, 0x26, 0xa9, 0xfd, 0x65, + 0x61, 0x00, 0x37, 0x24, 0x59, 0x6a, 0x48, 0x26, 0x48, 0x05, 0x93, 0x20, 0x73, 0x14, 0xf7, 0xc3, + 0x94, 0x0f, 0x97, 0xf0, 0xa5, 0xbe, 0x80, 0x39, 0xa9, 0x8a, 0x8b, 0x3d, 0xd7, 0xeb, 0x5d, 0x54, + 0xed, 0x6d, 0x69, 0xc5, 0x13, 0x90, 0x17, 0x17, 0x20, 0xc8, 0x6a, 0x66, 0x8b, 0x8d, 0x7b, 0x5c, + 0xa6, 0xbf, 0x49, 0xac, 0xd0, 0x31, 0xdb, 0xfc, 0x06, 0x24, 0xf9, 0x49, 0xb0, 0xdc, 0xa5, 0x5d, + 0x60, 0x6b, 0x56, 0xfa, 0xbd, 0x94, 0xc7, 0xcf, 0x0b, 0x15, 0xa2, 0xbc, 0x7a, 0xea, 0x66, 0x7a, + 0xf5, 0xf4, 0x5b, 0xf3, 0xea, 0xd2, 0x9b, 0x29, 0x6f, 0x4a, 0x5d, 0x7f, 0x7d, 0x63, 0x22, 0x20, + 0xda, 0xc5, 0x5e, 0x82, 0xb3, 0x9b, 0xba, 0xac, 0x20, 0x42, 0xad, 0x5c, 0x44, 0x82, 0x62, 0xcc, + 0x97, 0xd4, 0x40, 0x0f, 0x51, 0x3f, 0x6f, 0x6e, 0x71, 0xd3, 0x50, 0x8f, 0x49, 0xf4, 0xc8, 0x0c, + 0xdb, 0xe7, 0x5f, 0x0a, 0x81, 0xb0, 0xe1, 0x56, 0x28, 0x90, 0xae, 0xb3, 0xe7, 0x4f, 0xc0, 0xd3, + 0x8b, 0x02, 0x20, 0xb5, 0x00, 0x0d, 0xda, 0x18, 0x74, 0x09, 0x72, 0xf8, 0x2a, 0xbd, 0x8d, 0xca, + 0x92, 0x4d, 0xb7, 0x0e, 0x75, 0xc4, 0xd8, 0x70, 0x9a, 0x55, 0x22, 0xcc, 0xef, 0xed, 0xd7, 0x2b, + 0x8c, 0xe6, 0x3e, 0xb3, 0xab, 0x3b, 0xb8, 0xdb, 0x73, 0xf6, 0x64, 0xce, 0x45, 0xfa, 0x68, 0x9a, + 0xf8, 0xc3, 0x80, 0xfd, 0x89, 0x14, 0xaf, 0x58, 0x34, 0x69, 0x5f, 0x88, 0x94, 0x4c, 0xe4, 0xb7, + 0x01, 0xb4, 0x55, 0x5b, 0xb9, 0xa6, 0x1a, 0x0e, 0x6e, 0x71, 0xb9, 0x17, 0xda, 0xaa, 0xfd, 0x2c, + 0x05, 0x90, 0x78, 0x93, 0x54, 0xf7, 0x6d, 0xdc, 0xa2, 0x13, 0x90, 0x91, 0xc7, 0xda, 0xaa, 0xbd, + 0x61, 0xe3, 0x96, 0x6f, 0xac, 0x63, 0x37, 0x63, 0xac, 0x41, 0x79, 0xe7, 0xc3, 0xf2, 0xfe, 0x78, + 0xda, 0x5b, 0x1d, 0x5e, 0xf8, 0xf0, 0xe3, 0x29, 0x8b, 0xcf, 0xd2, 0x3d, 0x45, 0xd0, 0x09, 0xa0, + 0x0f, 0xc0, 0xa4, 0xbb, 0x2a, 0x95, 0x3e, 0x5d, 0xad, 0x42, 0x0b, 0x0f, 0xb7, 0xb8, 0x2b, 0x57, + 0x83, 0x60, 0x1b, 0xfd, 0x0c, 0x1c, 0x0b, 0xd9, 0x20, 0xb7, 0x81, 0xf4, 0xa1, 0x4c, 0xd1, 0x91, + 0xa0, 0x29, 0x12, 0xfc, 0x3d, 0xe9, 0x65, 0x6e, 0xca, 0xaa, 0xb9, 0x83, 0x84, 0xb0, 0x7e, 0xf7, + 0x16, 0xa5, 0x13, 0xd2, 0x1f, 0xa7, 0x60, 0x22, 0xd4, 0x41, 0xf4, 0x28, 0x8c, 0x32, 0x0f, 0x9c, + 0x3a, 0x30, 0x11, 0x42, 0x25, 0xce, 0xc7, 0xc4, 0x08, 0xd0, 0x1c, 0xe4, 0x31, 0x8f, 0xae, 0xb9, + 0x50, 0xee, 0x8c, 0x09, 0xc2, 0x39, 0xbd, 0x4b, 0x86, 0x16, 0xa0, 0xe0, 0x8a, 0x3e, 0x66, 0xe7, + 0xe6, 0xce, 0x1c, 0x67, 0xe2, 0x11, 0x4a, 0xf3, 0x50, 0xf4, 0x75, 0x8f, 0xbd, 0x05, 0xdc, 0xe5, + 0xdb, 0x2d, 0x16, 0x40, 0xe7, 0xbb, 0xea, 0x2e, 0xdd, 0x69, 0xa1, 0x63, 0x30, 0x46, 0x2a, 0xdb, + 0xfc, 0xb1, 0x54, 0x46, 0xce, 0x75, 0xd5, 0xdd, 0x0b, 0xaa, 0x2d, 0x7d, 0x22, 0x05, 0xe5, 0x60, + 0x3f, 0xd1, 0xbd, 0x80, 0x08, 0xae, 0xda, 0xc6, 0x8a, 0xd1, 0xef, 0x32, 0x1f, 0x29, 0x38, 0x4e, + 0x74, 0xd5, 0xdd, 0xb9, 0x36, 0xbe, 0xd4, 0xef, 0xd2, 0xa6, 0x6d, 0xb4, 0x02, 0x15, 0x81, 0x2c, + 0x92, 0x5d, 0x5c, 0x2a, 0xc7, 0x07, 0xbf, 0x57, 0xc3, 0x11, 0xd8, 0x5e, 0xf7, 0x15, 0xb2, 0xd7, + 0x2d, 0x33, 0x7e, 0xa2, 0x46, 0x7a, 0x08, 0x26, 0x42, 0x23, 0x46, 0x12, 0x8c, 0xf7, 0xfa, 0x9b, + 0xca, 0x0e, 0xde, 0xa3, 0xcf, 0xdf, 0x99, 0xaa, 0x17, 0xe4, 0x62, 0xaf, 0xbf, 0xf9, 0x34, 0xde, + 0xa3, 0xb9, 0x43, 0x49, 0x83, 0x72, 0x70, 0x33, 0x45, 0x1c, 0x87, 0x65, 0xf6, 0x8d, 0x96, 0xf8, + 0xb0, 0x01, 0x2d, 0xa0, 0x73, 0x30, 0x7a, 0xd5, 0x64, 0xda, 0x7c, 0xd0, 0xee, 0xe9, 0x8a, 0xe9, + 0x60, 0xdf, 0x96, 0x8c, 0xd1, 0x48, 0x36, 0x8c, 0x52, 0xbd, 0x8c, 0x3c, 0xa8, 0xb8, 0x02, 0xa0, + 0x3a, 0x8e, 0xa5, 0x6f, 0xf6, 0x3d, 0xf6, 0xd5, 0xd9, 0xc1, 0xb4, 0xfe, 0xec, 0xaa, 0xaa, 0x5b, + 0xcd, 0x5b, 0xb9, 0x66, 0x4f, 0x7b, 0x34, 0x3e, 0xed, 0xf6, 0x71, 0x92, 0xde, 0xc8, 0x42, 0x8e, + 0x6d, 0x37, 0xd1, 0x13, 0xc1, 0xe4, 0x47, 0xf1, 0xec, 0x89, 0x61, 0xdd, 0x67, 0x58, 0xbc, 0xf7, + 0x6e, 0x04, 0x75, 0x57, 0x38, 0xa3, 0xd0, 0x2c, 0xbe, 0xb6, 0x5f, 0x1f, 0xa3, 0xd1, 0xc7, 0xd2, + 0x82, 0x97, 0x5e, 0x18, 0xb6, 0xbb, 0x16, 0xb9, 0x8c, 0xec, 0xa1, 0x73, 0x19, 0x17, 0x61, 0xdc, + 0x17, 0x6e, 0xe9, 0x2d, 0xbe, 0x4f, 0x39, 0x71, 0xd0, 0xa2, 0x5b, 0x5a, 0xe0, 0xfd, 0x2f, 0xba, + 0xe1, 0xd8, 0x52, 0x0b, 0xcd, 0x04, 0x37, 0xd9, 0x34, 0x6a, 0x63, 0xe1, 0x82, 0x6f, 0xdf, 0x4c, + 0xdf, 0xe4, 0xdf, 0x02, 0x05, 0xfa, 0xb0, 0x99, 0xa2, 0xb0, 0xe8, 0x21, 0x4f, 0x00, 0xb4, 0xf2, + 0x6e, 0x98, 0xf0, 0x02, 0x1b, 0x86, 0x92, 0x67, 0x5c, 0x3c, 0x30, 0x45, 0x7c, 0x00, 0xa6, 0xe9, + 0x07, 0xf0, 0xc2, 0xd8, 0x05, 0x8a, 0x8d, 0x48, 0xdd, 0x95, 0x20, 0xc5, 0x9d, 0x50, 0xf6, 0x4c, + 0x28, 0xc5, 0x05, 0x96, 0xfa, 0x70, 0xa1, 0x14, 0xed, 0x38, 0xe4, 0xdd, 0xb0, 0xb3, 0xc8, 0xbe, + 0xac, 0xa7, 0xb2, 0x68, 0xd3, 0x0d, 0x64, 0x2d, 0x6c, 0xf7, 0x3b, 0x0e, 0x67, 0x52, 0xa2, 0x38, + 0x34, 0x90, 0x95, 0x19, 0x9c, 0xe2, 0x9e, 0x82, 0x71, 0x61, 0x55, 0x18, 0xde, 0x38, 0xc5, 0x2b, + 0x09, 0x20, 0x45, 0x3a, 0x0d, 0x95, 0x9e, 0x65, 0xf6, 0x4c, 0x1b, 0x5b, 0x8a, 0xda, 0x6a, 0x59, + 0xd8, 0xb6, 0xab, 0x65, 0xc6, 0x4f, 0xc0, 0xe7, 0x18, 0x58, 0x7a, 0x0f, 0x8c, 0x89, 0x78, 0x7a, + 0x1a, 0x46, 0x9b, 0xae, 0x85, 0xcc, 0xca, 0xac, 0x40, 0xfc, 0xeb, 0x5c, 0xaf, 0xc7, 0xb3, 0x6b, + 0xe4, 0xa7, 0xd4, 0x81, 0x31, 0x3e, 0x61, 0x91, 0x39, 0x95, 0x15, 0x28, 0xf5, 0x54, 0x8b, 0x0c, + 0xc3, 0x9f, 0x59, 0x19, 0xb6, 0x23, 0x5c, 0x55, 0x2d, 0x67, 0x0d, 0x3b, 0x81, 0x04, 0x4b, 0x91, + 0xd2, 0x33, 0x90, 0xf4, 0x18, 0x8c, 0x07, 0x70, 0xbc, 0xef, 0x10, 0xf2, 0x85, 0x4e, 0x0b, 0x6e, + 0x4f, 0xd2, 0x5e, 0x4f, 0xa4, 0x73, 0x50, 0x70, 0xe7, 0x8a, 0x6c, 0x34, 0x84, 0x28, 0xf8, 0x87, + 0x0d, 0x79, 0x91, 0x26, 0x91, 0xcc, 0x6b, 0xfc, 0x13, 0x4d, 0x19, 0x99, 0x15, 0x24, 0xec, 0x33, + 0x4c, 0xcc, 0x9b, 0xa1, 0xc7, 0x61, 0x8c, 0x1b, 0x26, 0xbe, 0x1e, 0x87, 0xa5, 0x8b, 0x56, 0xa9, + 0xa5, 0x12, 0xe9, 0x22, 0x66, 0xb7, 0xbc, 0x66, 0xd2, 0xfe, 0x66, 0x3e, 0x04, 0x79, 0x61, 0x7c, + 0x82, 0x5e, 0x82, 0xb5, 0x70, 0x32, 0xce, 0x4b, 0xf0, 0x46, 0x3c, 0x42, 0xa2, 0x4d, 0xb6, 0xde, + 0x36, 0x70, 0x4b, 0xf1, 0x96, 0x20, 0x7f, 0x30, 0x3b, 0xc1, 0x2a, 0x96, 0xc5, 0xfa, 0x92, 0x1e, + 0x80, 0x1c, 0xeb, 0x6b, 0xa4, 0x89, 0x8b, 0x72, 0xad, 0xdf, 0x49, 0x41, 0x5e, 0xb8, 0x8f, 0x48, + 0xa2, 0xc0, 0x20, 0xd2, 0x37, 0x3a, 0x88, 0x9b, 0x6f, 0x92, 0xee, 0x03, 0x44, 0x35, 0x45, 0xb9, + 0x6a, 0x3a, 0xba, 0xd1, 0x56, 0xd8, 0x5c, 0xf0, 0x77, 0x83, 0xb4, 0xe6, 0x0a, 0xad, 0x58, 0x25, + 0xf0, 0x7b, 0x4e, 0x41, 0xd1, 0x97, 0xe5, 0x42, 0x63, 0x90, 0xb9, 0x84, 0xaf, 0x55, 0x46, 0x50, + 0x11, 0xc6, 0x64, 0x4c, 0x73, 0x04, 0x95, 0xd4, 0xd9, 0x37, 0xc6, 0x60, 0x62, 0xae, 0x39, 0xbf, + 0x34, 0xd7, 0xeb, 0x75, 0x74, 0xfe, 0x9e, 0xee, 0x32, 0x64, 0xe9, 0x3e, 0x39, 0xc1, 0xf9, 0x4e, + 0x2d, 0x49, 0xc2, 0x09, 0xc9, 0x30, 0x4a, 0xb7, 0xd3, 0x28, 0xc9, 0xb1, 0x4f, 0x2d, 0x51, 0x1e, + 0x8a, 0x74, 0x92, 0x2a, 0x5c, 0x82, 0xd3, 0xa0, 0x5a, 0x92, 0xe4, 0x14, 0xfa, 0x19, 0x28, 0x78, + 0xfb, 0xe4, 0xa4, 0x67, 0x44, 0xb5, 0xc4, 0x69, 0x2b, 0xc2, 0xdf, 0xdb, 0x19, 0x24, 0x3d, 0x9a, + 0xa8, 0x25, 0xce, 0xd7, 0xa0, 0xe7, 0x60, 0x4c, 0xec, 0xc1, 0x92, 0x9d, 0xe2, 0xd4, 0x12, 0xa6, + 0x94, 0xc8, 0xf4, 0xb1, 0xad, 0x73, 0x92, 0xa3, 0xaa, 0x5a, 0xa2, 0xbc, 0x19, 0xda, 0x80, 0x1c, + 0x0f, 0x7e, 0x13, 0x9d, 0xf4, 0xd4, 0x92, 0x25, 0x8a, 0x88, 0x90, 0xbd, 0xe4, 0x44, 0xd2, 0xe3, + 0xb9, 0x5a, 0xe2, 0x84, 0x21, 0x52, 0x01, 0x7c, 0xfb, 0xe9, 0xc4, 0xe7, 0x6e, 0xb5, 0xe4, 0x89, + 0x40, 0xf4, 0x41, 0xc8, 0xbb, 0xbb, 0xa6, 0x84, 0x27, 0x69, 0xb5, 0xa4, 0xb9, 0xb8, 0xe6, 0x46, + 0xe2, 0x5b, 0x12, 0xf7, 0xc6, 0xde, 0x92, 0xf0, 0x0e, 0xb9, 0xdd, 0x63, 0xf0, 0xbf, 0x48, 0xc1, + 0xf1, 0xf0, 0x71, 0xb2, 0x6a, 0xec, 0x0d, 0xb9, 0x10, 0x30, 0xe4, 0xb6, 0xc8, 0xe3, 0x90, 0x99, + 0x33, 0xf6, 0x48, 0xb0, 0x41, 0xbf, 0xed, 0xd7, 0xb7, 0x3a, 0x22, 0x4d, 0x47, 0xca, 0x1b, 0x56, + 0x27, 0xfa, 0xd6, 0x48, 0x23, 0xfb, 0xfd, 0xcf, 0xd7, 0x47, 0x9a, 0x3b, 0x11, 0xa3, 0x8a, 0xb9, + 0x2b, 0x90, 0x9f, 0x33, 0xf6, 0xc4, 0x35, 0x81, 0x51, 0x3a, 0xa0, 0xc3, 0x1e, 0xff, 0xbf, 0x5e, + 0x22, 0x9c, 0x7d, 0xdf, 0x07, 0xe6, 0x23, 0xce, 0xb1, 0xd2, 0x90, 0x13, 0xfe, 0xf8, 0x1b, 0x03, + 0xb5, 0xe1, 0xd2, 0x94, 0x2e, 0x40, 0x76, 0xde, 0xd4, 0x69, 0xc8, 0xd3, 0xc2, 0x86, 0xd9, 0x15, + 0x39, 0x4f, 0x5a, 0x40, 0xa7, 0x20, 0xa7, 0x76, 0xcd, 0xbe, 0xe1, 0x88, 0xa8, 0x99, 0xb8, 0x92, + 0xff, 0xb6, 0x5f, 0xcf, 0x2c, 0x19, 0x8e, 0xcc, 0xab, 0x1a, 0xd9, 0xef, 0xbe, 0x5a, 0x4f, 0x49, + 0x4f, 0xc1, 0xd8, 0x02, 0xd6, 0x6e, 0x84, 0xd7, 0x02, 0xd6, 0x42, 0xbc, 0x4e, 0x43, 0x7e, 0xc9, + 0x70, 0xd8, 0x47, 0xc3, 0x6e, 0x83, 0x8c, 0x6e, 0xb0, 0x63, 0x91, 0x50, 0xfb, 0x04, 0x4e, 0x50, + 0x17, 0xb0, 0xe6, 0xa2, 0xb6, 0xb0, 0x16, 0x46, 0x25, 0xec, 0x09, 0x5c, 0x6a, 0x42, 0xe9, 0x8a, + 0xda, 0xe1, 0xe1, 0x1e, 0xb6, 0xd1, 0x7d, 0x50, 0x50, 0x45, 0x81, 0xee, 0xac, 0x4a, 0xcd, 0xf2, + 0x0f, 0xf6, 0xeb, 0xe0, 0x21, 0xc9, 0x1e, 0x42, 0x23, 0xfb, 0xf2, 0x7f, 0x3f, 0x99, 0x92, 0x4c, + 0x18, 0xbb, 0xa0, 0xda, 0xd4, 0xd2, 0x3f, 0x18, 0x48, 0xa4, 0xd0, 0x48, 0xb1, 0x79, 0xe4, 0xfa, + 0x7e, 0x7d, 0x72, 0x4f, 0xed, 0x76, 0x1a, 0x92, 0x57, 0x27, 0xf9, 0xf3, 0x2b, 0xb3, 0xbe, 0xfc, + 0x0a, 0x8d, 0x24, 0x9b, 0x53, 0xd7, 0xf7, 0xeb, 0x13, 0x1e, 0x0d, 0xa9, 0x91, 0xdc, 0xa4, 0x8b, + 0xd4, 0x83, 0x1c, 0x0b, 0x7a, 0x23, 0x4f, 0x08, 0x79, 0xca, 0x27, 0xed, 0xa5, 0x7c, 0x1a, 0x87, + 0x4a, 0x33, 0xf0, 0xb8, 0x8c, 0x51, 0x34, 0xb2, 0x1f, 0x7b, 0xb5, 0x3e, 0x22, 0x59, 0x80, 0xd6, + 0xf4, 0x6e, 0xbf, 0xc3, 0x1e, 0x7e, 0x8b, 0xa3, 0xa6, 0x07, 0x59, 0xbf, 0x69, 0x3a, 0x89, 0x05, + 0x64, 0x13, 0xb3, 0x5c, 0x49, 0xb9, 0x40, 0x58, 0x9c, 0xf1, 0xcd, 0xfd, 0x7a, 0x8a, 0xf6, 0x9e, + 0xca, 0xe8, 0x2e, 0xc8, 0xb1, 0x50, 0x9e, 0xc7, 0x3f, 0x65, 0x41, 0xc3, 0xc6, 0x24, 0xf3, 0x5a, + 0xe9, 0x09, 0x18, 0x5b, 0xb1, 0xdb, 0x0b, 0x64, 0x48, 0xc7, 0x21, 0xdf, 0xb5, 0xdb, 0x8a, 0x2f, + 0x9a, 0x1a, 0xeb, 0xda, 0xed, 0xf5, 0x21, 0x51, 0x18, 0x9f, 0x96, 0xf7, 0x42, 0x6e, 0x7d, 0x97, + 0x92, 0x9f, 0x72, 0xa5, 0x94, 0xf1, 0xf7, 0x91, 0x73, 0x0f, 0x10, 0x7d, 0x24, 0x03, 0xb0, 0xbe, + 0xeb, 0x8e, 0x70, 0xc8, 0x11, 0x1c, 0x92, 0x20, 0xe7, 0xec, 0xba, 0x11, 0x75, 0xa1, 0x09, 0xaf, + 0xed, 0xd7, 0x73, 0xeb, 0xbb, 0x64, 0x7b, 0x21, 0xf3, 0x9a, 0x60, 0x2a, 0x2b, 0x13, 0x4a, 0x65, + 0xb9, 0x09, 0xbc, 0x6c, 0x44, 0x02, 0x6f, 0xd4, 0x77, 0x02, 0x70, 0x0c, 0xc6, 0x2c, 0xf5, 0x9a, + 0x42, 0x66, 0x94, 0x7d, 0x85, 0x34, 0x67, 0xa9, 0xd7, 0x96, 0xcd, 0x36, 0x9a, 0x87, 0x6c, 0xc7, + 0x6c, 0x8b, 0xbc, 0xdb, 0x51, 0x31, 0x28, 0x12, 0x71, 0xf1, 0xdb, 0xc4, 0xcb, 0x66, 0xbb, 0x79, + 0x8c, 0xc8, 0xff, 0x4b, 0x7f, 0x5a, 0x9f, 0x08, 0xc2, 0x6d, 0x99, 0x12, 0xbb, 0xc9, 0xc0, 0xfc, + 0xd0, 0x64, 0x60, 0xe1, 0xa0, 0x64, 0x20, 0x04, 0x93, 0x81, 0x77, 0xd0, 0x33, 0x4d, 0x76, 0x86, + 0x33, 0x3d, 0x10, 0x7c, 0xce, 0x19, 0x7b, 0xf4, 0x14, 0xf5, 0x56, 0x28, 0xb8, 0x17, 0x85, 0xf8, + 0x67, 0x9f, 0x3d, 0x00, 0xd7, 0xb7, 0x8f, 0xa5, 0xa0, 0x1c, 0xec, 0x31, 0xcd, 0xe7, 0xd8, 0x6d, + 0xfe, 0xc1, 0x54, 0x96, 0xf6, 0x24, 0x4a, 0xb1, 0x24, 0x32, 0xe5, 0x21, 0x9d, 0x9f, 0x0b, 0xe9, + 0xfc, 0x94, 0x10, 0x10, 0x7b, 0xbb, 0xc3, 0x54, 0x7d, 0x9a, 0x4b, 0xa7, 0xe4, 0x03, 0xda, 0x9e, + 0xea, 0x53, 0x8d, 0xf8, 0x59, 0x28, 0xfa, 0x6a, 0x23, 0x83, 0xfa, 0x47, 0x22, 0x92, 0x1d, 0x93, + 0xee, 0x84, 0x88, 0x1a, 0x71, 0x84, 0xe0, 0xa1, 0xba, 0x8a, 0x5a, 0x70, 0x91, 0x92, 0x5e, 0xaf, + 0x68, 0x2e, 0xfc, 0xc9, 0xb7, 0x4f, 0x8c, 0xbc, 0xfc, 0xda, 0x89, 0x91, 0xa1, 0xf7, 0x33, 0xa5, + 0xf8, 0x2f, 0xcc, 0xbb, 0x5e, 0xe6, 0xe3, 0xef, 0x87, 0x5b, 0x39, 0x8e, 0xed, 0xa8, 0x3b, 0xba, + 0xd1, 0x16, 0x7f, 0xb9, 0xbb, 0x29, 0xf3, 0xd1, 0x70, 0xe8, 0x8d, 0xbb, 0x9d, 0xb7, 0x7a, 0x69, + 0xac, 0x16, 0xe5, 0x0d, 0xa5, 0xfd, 0x2c, 0xa0, 0x15, 0xbb, 0x3d, 0x6f, 0x61, 0xf6, 0xb1, 0x11, + 0xbe, 0x4f, 0x0a, 0x3e, 0xf6, 0xe1, 0x36, 0xea, 0x96, 0xd9, 0xe0, 0x58, 0xdc, 0xef, 0x46, 0x7b, + 0x39, 0xa2, 0xc0, 0x13, 0xa1, 0x45, 0x00, 0x9a, 0x5e, 0xb1, 0x6d, 0x2f, 0x99, 0x57, 0x0f, 0xf3, + 0x98, 0x77, 0x31, 0x64, 0xd5, 0xc1, 0xb6, 0x98, 0x6b, 0x8f, 0x10, 0x7d, 0x08, 0xa6, 0xba, 0xba, + 0xa1, 0xd8, 0xb8, 0xb3, 0xa5, 0xb4, 0x70, 0x87, 0x7e, 0x8a, 0x85, 0x1f, 0xdc, 0x15, 0x9a, 0xcb, + 0xdc, 0x31, 0xdd, 0x15, 0x3f, 0x67, 0xb3, 0x4b, 0x86, 0x73, 0x7d, 0xbf, 0x5e, 0x63, 0xde, 0x21, + 0x82, 0xa5, 0x24, 0x4f, 0x76, 0x75, 0x63, 0x0d, 0x77, 0xb6, 0x16, 0x5c, 0x18, 0x7a, 0x09, 0x26, + 0x39, 0x86, 0xe9, 0x25, 0x3d, 0x88, 0xed, 0x29, 0x35, 0x57, 0xae, 0xef, 0xd7, 0xab, 0x8c, 0xdb, + 0x00, 0x8a, 0xf4, 0x83, 0xfd, 0xfa, 0xfd, 0x09, 0xfa, 0x34, 0xa7, 0x69, 0xc2, 0x3d, 0x56, 0x5c, + 0x26, 0x1c, 0x42, 0xda, 0xf6, 0x12, 0xf4, 0xa2, 0xed, 0xd1, 0x70, 0xdb, 0x03, 0x28, 0x49, 0xdb, + 0xf6, 0xb9, 0x66, 0x2f, 0x83, 0x2f, 0xda, 0x3e, 0x0a, 0xb9, 0x5e, 0x7f, 0x53, 0x9c, 0xa2, 0x15, + 0x64, 0x5e, 0x42, 0x33, 0xfe, 0x83, 0xb4, 0xe2, 0xd9, 0x92, 0x98, 0x4f, 0x12, 0xab, 0xb8, 0x69, + 0x4e, 0x16, 0xfb, 0xd1, 0xe8, 0xe3, 0xab, 0x19, 0xa8, 0xac, 0xd8, 0xed, 0xc5, 0x96, 0xee, 0xdc, + 0x64, 0xf5, 0xea, 0x45, 0x49, 0x87, 0x7a, 0xb3, 0xe6, 0xfc, 0xf5, 0xfd, 0x7a, 0x99, 0x49, 0xe7, + 0x66, 0xca, 0xa4, 0x0b, 0x13, 0x9e, 0x5e, 0x2a, 0x96, 0xea, 0x70, 0xf7, 0xd4, 0x5c, 0x48, 0xa8, + 0x81, 0x0b, 0x58, 0xbb, 0xbe, 0x5f, 0x3f, 0xca, 0x7a, 0x16, 0x62, 0x25, 0xc9, 0x65, 0x2d, 0xb0, + 0x16, 0xd0, 0x6e, 0xb4, 0xe2, 0xd3, 0xf3, 0xa7, 0xe6, 0xc5, 0xb7, 0x51, 0xe9, 0xf9, 0xd4, 0x7d, + 0x25, 0x0d, 0x45, 0xe2, 0xea, 0x19, 0x1c, 0x47, 0x2f, 0x85, 0xd4, 0x8f, 0x70, 0x29, 0xa4, 0xdf, + 0x99, 0xa5, 0x70, 0x8f, 0x1b, 0x6b, 0x67, 0x86, 0xea, 0x7c, 0x30, 0xe4, 0xfe, 0x4f, 0x19, 0x6a, + 0x55, 0xe9, 0x0e, 0x52, 0xc6, 0xad, 0x77, 0x83, 0x00, 0x7f, 0x2e, 0x05, 0x47, 0x3c, 0xf1, 0xd8, + 0x96, 0x16, 0x92, 0xe2, 0x33, 0xd7, 0xf7, 0xeb, 0xb7, 0x86, 0xa5, 0xe8, 0x43, 0xbb, 0x01, 0x49, + 0x4e, 0xb9, 0x8c, 0xd6, 0x2c, 0x2d, 0xba, 0x1f, 0x2d, 0xdb, 0x71, 0xfb, 0x91, 0x19, 0xde, 0x0f, + 0x1f, 0xda, 0x5b, 0xea, 0xc7, 0x82, 0xed, 0x0c, 0x4e, 0x6a, 0x36, 0xe1, 0xa4, 0x7e, 0x2d, 0x0d, + 0xe3, 0x2b, 0x76, 0x7b, 0xc3, 0x68, 0xfd, 0x64, 0x41, 0x1c, 0x76, 0x41, 0x7c, 0x22, 0x05, 0xe5, + 0x8b, 0xba, 0xed, 0x98, 0x96, 0xae, 0xa9, 0x1d, 0xba, 0x9b, 0xf1, 0xee, 0x48, 0xa6, 0x0e, 0x7f, + 0x47, 0xf2, 0x11, 0xc8, 0x5d, 0x55, 0x3b, 0xec, 0xdf, 0x15, 0x65, 0xe8, 0x19, 0x61, 0xc8, 0x77, + 0x84, 0x73, 0xc0, 0x1c, 0x9d, 0x77, 0xe7, 0xb7, 0xd3, 0x30, 0x11, 0x0a, 0x3c, 0x50, 0x13, 0xb2, + 0xd4, 0xa2, 0xb3, 0x0d, 0xef, 0xec, 0x21, 0xe2, 0x0a, 0xb2, 0x27, 0xa6, 0xb4, 0xe8, 0xa7, 0x20, + 0xdf, 0x55, 0x77, 0x99, 0x67, 0x60, 0xfb, 0x9b, 0xb9, 0xc3, 0xf1, 0xf1, 0x76, 0xaf, 0x82, 0x8f, + 0x24, 0x8f, 0x75, 0xd5, 0x5d, 0xea, 0x0f, 0x7a, 0x30, 0x41, 0xa0, 0xda, 0xb6, 0x6a, 0xb4, 0xb1, + 0xdf, 0xfd, 0x5c, 0x3c, 0x74, 0x23, 0x47, 0xbd, 0x46, 0x7c, 0xec, 0x24, 0x79, 0xbc, 0xab, 0xee, + 0xce, 0x53, 0x00, 0x69, 0xb1, 0x91, 0x7f, 0xe5, 0xd5, 0xfa, 0x08, 0x95, 0xd8, 0x7f, 0x48, 0x01, + 0x78, 0x12, 0x43, 0xeb, 0x50, 0x09, 0xb9, 0x2f, 0x71, 0xc7, 0x28, 0x36, 0xc0, 0xf3, 0x36, 0xb6, + 0x13, 0x5a, 0x68, 0x0a, 0x3e, 0x08, 0x45, 0x76, 0x4b, 0x40, 0xa1, 0xc9, 0xf8, 0x74, 0x6c, 0x32, + 0xfe, 0x04, 0xe1, 0x75, 0x7d, 0xbf, 0x8e, 0xd8, 0x70, 0x7c, 0xc4, 0x12, 0x4d, 0xd1, 0x03, 0x83, + 0x10, 0x82, 0xe0, 0x58, 0x8a, 0xbe, 0xd8, 0x82, 0xde, 0x3d, 0x33, 0x0d, 0x7d, 0x07, 0x5b, 0xee, + 0x1e, 0x99, 0x15, 0x51, 0x0d, 0xf2, 0xec, 0xab, 0x82, 0xce, 0x9e, 0xf8, 0x77, 0x15, 0xa2, 0x4c, + 0xa8, 0xae, 0xe1, 0x4d, 0x5b, 0x17, 0xb3, 0x20, 0x8b, 0x22, 0x3a, 0x0f, 0x15, 0x1b, 0x6b, 0x7d, + 0x4b, 0x77, 0xf6, 0x14, 0xcd, 0x34, 0x1c, 0x55, 0x73, 0xb8, 0xd3, 0xbe, 0xe5, 0xfa, 0x7e, 0xfd, + 0x18, 0xeb, 0x6b, 0x18, 0x43, 0x92, 0x27, 0x04, 0x68, 0x9e, 0x41, 0x48, 0x0b, 0x2d, 0xec, 0xa8, + 0x7a, 0xc7, 0xe6, 0x1b, 0x5b, 0x51, 0xf4, 0x8d, 0xe5, 0xb7, 0xc6, 0xfc, 0x87, 0x51, 0xd7, 0xa0, + 0x62, 0xf6, 0xb0, 0x15, 0x61, 0x8f, 0x96, 0xbd, 0x96, 0xc3, 0x18, 0x37, 0x60, 0x12, 0x26, 0x04, + 0x0f, 0x61, 0x11, 0xce, 0x07, 0xee, 0x9c, 0xb1, 0xb8, 0x31, 0x1d, 0x1e, 0x72, 0x18, 0x43, 0xf2, + 0x5f, 0x34, 0x63, 0xd1, 0xe5, 0x51, 0xc8, 0xbd, 0xa0, 0xea, 0x1d, 0xf1, 0xa9, 0x55, 0x99, 0x97, + 0xd0, 0x12, 0xe4, 0x6c, 0x47, 0x75, 0xfa, 0x2c, 0xf4, 0x1e, 0x6d, 0xbe, 0x27, 0x61, 0x9f, 0x9b, + 0xa6, 0xd1, 0x5a, 0xa3, 0x84, 0x32, 0x67, 0x80, 0xce, 0x43, 0xce, 0x31, 0x77, 0xb0, 0xc1, 0x85, + 0x7a, 0xa8, 0x95, 0x4e, 0x13, 0x75, 0x8c, 0x1a, 0x39, 0xe0, 0x19, 0x65, 0xc5, 0xde, 0x56, 0x2d, + 0x6c, 0xb3, 0x50, 0xb9, 0xb9, 0x74, 0xe8, 0xe5, 0x78, 0x2c, 0xec, 0x29, 0x18, 0x3f, 0x49, 0x9e, + 0x70, 0x41, 0x6b, 0x14, 0x12, 0x8e, 0x9c, 0xc7, 0x6e, 0x28, 0x72, 0x3e, 0x0f, 0x95, 0xbe, 0xb1, + 0x69, 0x1a, 0xf4, 0xb3, 0x88, 0x3c, 0x4d, 0x93, 0x3f, 0x99, 0x9a, 0xc9, 0xf8, 0x67, 0x2b, 0x8c, + 0x21, 0xc9, 0x13, 0x2e, 0x88, 0xdf, 0x7e, 0x6c, 0x41, 0xd9, 0xc3, 0xa2, 0x4b, 0xb6, 0x10, 0xbb, + 0x64, 0x6f, 0xe7, 0x4b, 0xf6, 0x48, 0xb8, 0x15, 0x6f, 0xd5, 0x8e, 0xbb, 0x40, 0x42, 0x86, 0xde, + 0x1f, 0xd8, 0x46, 0x02, 0x6f, 0x61, 0xa8, 0x95, 0x49, 0xbe, 0x83, 0x2c, 0xbe, 0x23, 0x3b, 0xc8, + 0x46, 0xe9, 0x63, 0xaf, 0xd6, 0x47, 0xdc, 0x05, 0xfb, 0x0b, 0x69, 0xc8, 0x2d, 0x5c, 0xa1, 0xcf, + 0x28, 0x7f, 0x4c, 0xc3, 0x07, 0x9f, 0xf5, 0x7a, 0x1f, 0x8c, 0x31, 0x59, 0xd8, 0xe8, 0x2c, 0x8c, + 0xf6, 0xc8, 0x0f, 0x9e, 0x6b, 0x3c, 0x3a, 0xa0, 0xd2, 0x14, 0x4f, 0xec, 0x30, 0x29, 0xaa, 0xf4, + 0x85, 0x0c, 0xc0, 0xc2, 0x95, 0x2b, 0xeb, 0x96, 0xde, 0xeb, 0x60, 0xe7, 0x27, 0xe1, 0xf5, 0xbb, 0x27, 0xbc, 0xf6, 0xcd, 0xf1, 0xd3, 0x50, 0xf4, 0xe6, 0xc8, 0x46, 0x8f, 0x43, 0xde, 0xe1, 0xbf, - 0xf9, 0x54, 0xd7, 0x06, 0xa7, 0x5a, 0xa0, 0xf3, 0xe9, 0x76, 0x29, 0xa4, 0xff, 0x92, 0x06, 0x88, - 0x4b, 0xce, 0xfc, 0x04, 0x04, 0xe0, 0xe7, 0x21, 0xc7, 0x3d, 0x4e, 0xe6, 0x86, 0xa2, 0x55, 0x4e, - 0xed, 0x9b, 0xa5, 0xef, 0xa6, 0x61, 0x6a, 0x43, 0x98, 0xdd, 0xf7, 0x24, 0x8c, 0x2e, 0xc2, 0x18, - 0x36, 0x1c, 0x4b, 0xc7, 0x22, 0x0d, 0x3e, 0x13, 0xd6, 0xd2, 0x08, 0x69, 0xd1, 0x7f, 0x97, 0x20, - 0x6e, 0xcb, 0x71, 0x72, 0x9f, 0x8c, 0x3f, 0x95, 0x81, 0xea, 0x30, 0x2a, 0x34, 0x0f, 0x13, 0x9a, - 0x85, 0x29, 0x40, 0xf1, 0x9f, 0x9c, 0x34, 0x6b, 0xbe, 0x8c, 0x51, 0x10, 0x41, 0x92, 0xcb, 0x02, - 0xc2, 0x1d, 0x72, 0x9b, 0x26, 0xa8, 0xc8, 0x52, 0x21, 0x58, 0x09, 0x83, 0x68, 0x89, 0x7b, 0x64, - 0x2f, 0x2d, 0xe5, 0x67, 0xc0, 0x5c, 0x72, 0xd9, 0x83, 0x52, 0x9f, 0xfc, 0x22, 0x4c, 0xe8, 0x86, - 0xee, 0xe8, 0x6a, 0x47, 0xd9, 0x54, 0x3b, 0xaa, 0xa1, 0xdd, 0xc8, 0x56, 0x84, 0x79, 0x53, 0xde, - 0x6c, 0x88, 0x9d, 0x24, 0x97, 0x39, 0xa4, 0xc9, 0x00, 0x64, 0x46, 0x44, 0x53, 0xd9, 0x1b, 0x0a, - 0xdc, 0x04, 0xb9, 0x6f, 0x46, 0x7e, 0x29, 0x03, 0x93, 0x6e, 0x7e, 0xe6, 0xbd, 0xa9, 0x48, 0x3a, - 0x15, 0x2b, 0x00, 0xcc, 0x80, 0x10, 0xcf, 0x71, 0x03, 0xb3, 0x41, 0x4c, 0x50, 0x81, 0x71, 0x58, - 0xb0, 0x1d, 0xdf, 0x7c, 0xfc, 0x79, 0x06, 0x4a, 0xfe, 0xf9, 0x78, 0xcf, 0xa5, 0xbf, 0x8b, 0x32, - 0x66, 0x73, 0x9e, 0x49, 0xcc, 0xf2, 0xef, 0xa2, 0x84, 0x4c, 0xe2, 0xc0, 0x52, 0x1a, 0x6e, 0x0b, - 0xff, 0x2a, 0x0d, 0x39, 0x7e, 0x2f, 0x5b, 0x1b, 0xd8, 0x45, 0xa4, 0xe2, 0xee, 0x7d, 0x1f, 0xbc, - 0x89, 0x78, 0x25, 0x72, 0x13, 0x51, 0xee, 0xaa, 0xbb, 0x4a, 0xe0, 0x15, 0x53, 0x6a, 0x66, 0xbc, - 0x79, 0xdc, 0xe3, 0x12, 0xac, 0x67, 0xb9, 0x10, 0xef, 0x4e, 0x2e, 0x7a, 0x04, 0x8a, 0x04, 0xc3, - 0xf3, 0x0a, 0x84, 0xfc, 0xa8, 0x97, 0x7c, 0xf0, 0x55, 0x4a, 0x32, 0x74, 0xd5, 0xdd, 0x45, 0x56, - 0x40, 0xcb, 0x80, 0xb6, 0xdd, 0xd4, 0x97, 0xe2, 0x89, 0x90, 0xd0, 0xdf, 0x76, 0x7d, 0xbf, 0x7e, - 0x9c, 0xd1, 0x0f, 0xe2, 0x48, 0xf2, 0xa4, 0x07, 0x14, 0xdc, 0x1e, 0x04, 0x20, 0xe3, 0x52, 0xd8, - 0x9d, 0x10, 0xb6, 0x85, 0xf5, 0x5d, 0x94, 0xf0, 0xea, 0x24, 0xb9, 0x40, 0x0a, 0x0b, 0xe4, 0xb7, - 0x4f, 0xf0, 0xbf, 0x9c, 0x02, 0xe4, 0xf9, 0x1e, 0xf7, 0xbc, 0xfe, 0x83, 0xf4, 0x5d, 0xa2, 0xd8, - 0x19, 0xa5, 0xa2, 0x37, 0x59, 0x1e, 0x9d, 0xd8, 0x64, 0xf9, 0x96, 0xea, 0x7d, 0x9e, 0x7d, 0x4e, - 0x0f, 0xcd, 0x0a, 0x46, 0xd8, 0xe0, 0x7f, 0x97, 0x82, 0xe3, 0x03, 0x8a, 0xe3, 0xf6, 0xeb, 0x0a, - 0x20, 0xcb, 0x57, 0xc9, 0xff, 0x43, 0x51, 0x8a, 0xff, 0xc7, 0xbf, 0x84, 0xfa, 0x37, 0x69, 0x0d, - 0xd8, 0xf8, 0x9b, 0xe7, 0x4d, 0x78, 0x46, 0x31, 0x05, 0xd3, 0xfe, 0xe6, 0xdd, 0x01, 0x9c, 0x87, - 0x92, 0xbf, 0x75, 0xde, 0xf5, 0x5b, 0x0f, 0xea, 0x3a, 0xef, 0x75, 0x80, 0x0e, 0x2d, 0x79, 0xab, - 0x4f, 0xfc, 0xd3, 0xc9, 0xb8, 0xd1, 0xbb, 0x17, 0xd9, 0x42, 0xab, 0x90, 0xf5, 0xf8, 0xff, 0xa7, - 0x20, 0xbb, 0x6a, 0x9a, 0x1d, 0x64, 0xc2, 0xa4, 0x61, 0x3a, 0x0a, 0x51, 0x16, 0xdc, 0x52, 0x78, - 0x6e, 0x84, 0x65, 0x41, 0xe7, 0x0f, 0x27, 0x94, 0xef, 0xef, 0xd7, 0x07, 0x59, 0xc9, 0x13, 0x86, - 0xe9, 0x34, 0x29, 0x64, 0x9d, 0x65, 0x4e, 0x3e, 0x02, 0xe3, 0xc1, 0xc6, 0x58, 0xa6, 0xe8, 0xd9, - 0x43, 0x37, 0x16, 0x64, 0x73, 0x7d, 0xbf, 0x3e, 0xed, 0x2d, 0x02, 0x17, 0x2c, 0xc9, 0xa5, 0x4d, - 0x5f, 0xeb, 0x8d, 0x3c, 0x19, 0xfd, 0x0f, 0x5e, 0xad, 0xa7, 0x9a, 0xe7, 0x87, 0xde, 0x00, 0xb8, - 0xef, 0xc0, 0x2e, 0xec, 0xba, 0x47, 0xfd, 0xc1, 0xbb, 0x00, 0xff, 0x6f, 0x16, 0x6a, 0xa1, 0xbb, - 0x00, 0xf4, 0x1d, 0xf2, 0x90, 0x9b, 0x00, 0x07, 0xff, 0x03, 0xff, 0x21, 0x17, 0x05, 0x0e, 0xbc, - 0x6c, 0x20, 0xed, 0xc0, 0x51, 0x7a, 0x95, 0xd3, 0x33, 0x5b, 0xe2, 0x2b, 0x31, 0x47, 0xdd, 0x04, - 0x5a, 0x8a, 0xff, 0xbf, 0x70, 0x96, 0x0d, 0x7b, 0x0c, 0xc0, 0x6b, 0xd9, 0x7d, 0x70, 0xc3, 0x7b, - 0xca, 0x7a, 0xcf, 0xfe, 0x91, 0x3f, 0x65, 0x23, 0xfb, 0x90, 0xa5, 0x8f, 0xa7, 0xe0, 0xd8, 0x40, - 0x6b, 0x5c, 0xeb, 0x9f, 0x0c, 0x3c, 0x18, 0x4d, 0x25, 0xcb, 0xd1, 0xfb, 0xbf, 0xfc, 0x70, 0x1f, - 0x64, 0x2c, 0xf7, 0xb1, 0x58, 0x2d, 0xaa, 0x43, 0xac, 0x25, 0x99, 0xa0, 0x49, 0x2f, 0xc2, 0x91, - 0x60, 0x4f, 0xc4, 0xb0, 0x9f, 0x83, 0x72, 0x70, 0x7f, 0xc0, 0x83, 0x87, 0xf7, 0x1d, 0xde, 0x27, - 0x8e, 0x07, 0xf6, 0x08, 0xd2, 0xb3, 0x61, 0x51, 0xbb, 0x63, 0xff, 0xc0, 0xe0, 0x75, 0xfb, 0xd8, - 0xa1, 0xfb, 0x5e, 0x63, 0x7d, 0x2d, 0x05, 0x27, 0x83, 0x9c, 0x3d, 0xb3, 0x6b, 0xbf, 0xed, 0xe3, - 0x7a, 0x2b, 0x0a, 0xf1, 0x07, 0x29, 0xb8, 0xfd, 0x80, 0x9e, 0x73, 0xf1, 0x58, 0x30, 0xed, 0xb3, - 0xe7, 0x16, 0x07, 0x0b, 0x25, 0x91, 0x86, 0xfb, 0x1c, 0xd7, 0x9c, 0xdd, 0xc2, 0x2f, 0x1f, 0x4d, - 0x0d, 0xd6, 0xd9, 0xf2, 0xd4, 0xa0, 0x0d, 0x3e, 0xac, 0x36, 0x7d, 0x33, 0x05, 0xa7, 0x83, 0xe3, - 0x88, 0xd8, 0xb5, 0xbd, 0xbb, 0xa7, 0xe2, 0xab, 0x29, 0xb8, 0x27, 0xc9, 0x10, 0xf8, 0x9c, 0x3c, - 0x0f, 0x53, 0x5e, 0x0c, 0x15, 0x9e, 0x92, 0x53, 0x09, 0x76, 0xbe, 0x5c, 0x8d, 0x91, 0xcb, 0xe5, - 0x46, 0x65, 0xff, 0x47, 0x29, 0xbe, 0xae, 0xfc, 0x73, 0xeb, 0x0a, 0x3a, 0x18, 0xe8, 0x1f, 0x52, - 0xd0, 0xbe, 0x60, 0x7f, 0x3c, 0x10, 0xec, 0x47, 0x4c, 0x61, 0xfa, 0x26, 0x59, 0x89, 0x9f, 0x17, - 0x36, 0x32, 0x22, 0xe4, 0xda, 0x81, 0xa9, 0x88, 0x85, 0xe0, 0xbe, 0x23, 0x8d, 0x5f, 0x07, 0x47, - 0x7f, 0xb8, 0x5f, 0x8f, 0x88, 0xe5, 0x64, 0x34, 0xb8, 0x04, 0xa4, 0xff, 0x9c, 0x82, 0x3a, 0xed, - 0x48, 0xc4, 0xe4, 0xfd, 0x6d, 0x16, 0x30, 0xe6, 0xc6, 0x32, 0x72, 0x58, 0x5c, 0xd0, 0x73, 0x90, - 0x63, 0x7a, 0xc9, 0x65, 0x7b, 0x08, 0x85, 0xe6, 0x84, 0x9e, 0x51, 0x5e, 0x10, 0xe3, 0x8a, 0xb6, - 0x04, 0x6f, 0x93, 0xfc, 0xde, 0x82, 0x25, 0xf8, 0x8a, 0x30, 0xca, 0xd1, 0x3d, 0xe7, 0x22, 0xfa, - 0xf0, 0x5b, 0x36, 0xca, 0xfc, 0xfb, 0x40, 0x37, 0xd1, 0xfa, 0xba, 0x1d, 0x8e, 0xb1, 0xbe, 0xef, - 0x3e, 0x99, 0xbb, 0xd6, 0x37, 0x66, 0x08, 0xef, 0x3a, 0xeb, 0x7b, 0x3d, 0x0d, 0xc7, 0x69, 0xc7, - 0xfd, 0x7b, 0x89, 0x77, 0x40, 0xd6, 0x0a, 0x20, 0xdb, 0xd2, 0x94, 0x9b, 0x65, 0x23, 0x2a, 0xb6, - 0xa5, 0x5d, 0x09, 0xb8, 0x52, 0x05, 0x50, 0xcb, 0x76, 0xc2, 0x0d, 0x64, 0x6e, 0xb8, 0x81, 0x96, - 0xed, 0x5c, 0x39, 0xc0, 0x57, 0x67, 0x0f, 0xa3, 0x2d, 0xbf, 0x95, 0x82, 0x5a, 0x94, 0xd0, 0xb9, - 0x76, 0xa8, 0x70, 0x34, 0xb0, 0x03, 0x0e, 0x2b, 0xc8, 0x1d, 0x07, 0xed, 0x03, 0x43, 0xcb, 0xf3, - 0x88, 0x85, 0xdf, 0xfa, 0x02, 0xfd, 0xaa, 0x70, 0x25, 0xae, 0x76, 0x0f, 0x6e, 0x37, 0xde, 0x95, - 0xcb, 0xf2, 0x57, 0x06, 0x8c, 0xf8, 0x8f, 0x7f, 0xe7, 0xf2, 0xc7, 0x29, 0x38, 0x31, 0xa4, 0x4f, - 0x7f, 0x9b, 0xdd, 0xf2, 0xcf, 0x0e, 0x55, 0x91, 0x9b, 0xb5, 0x4d, 0x7a, 0x90, 0x2f, 0x9a, 0xe0, - 0xad, 0x32, 0xdf, 0x76, 0x37, 0xf2, 0x0b, 0x70, 0xcf, 0xc0, 0x2d, 0x91, 0x54, 0xbc, 0x4f, 0x67, - 0x21, 0xbb, 0xad, 0xdb, 0x8e, 0xfb, 0x59, 0x84, 0x50, 0x77, 0x42, 0x54, 0x14, 0x57, 0x42, 0x50, - 0xa1, 0x2c, 0x57, 0x4d, 0xb3, 0xc3, 0x9b, 0x97, 0xe6, 0x61, 0xd2, 0x07, 0xe3, 0xcc, 0x67, 0x21, - 0xdb, 0x33, 0xcd, 0x0e, 0x67, 0x3e, 0x1d, 0x66, 0x4e, 0x70, 0xf9, 0x30, 0x29, 0x9e, 0x34, 0x0d, - 0x88, 0x31, 0x61, 0x1f, 0xec, 0xe0, 0xac, 0xf7, 0x60, 0x2a, 0x00, 0x75, 0x5f, 0x14, 0xe5, 0x02, - 0x9f, 0x7a, 0x1a, 0x38, 0x3f, 0x67, 0xf8, 0xee, 0xdb, 0x71, 0x96, 0x7a, 0x3d, 0x94, 0xae, 0x9e, - 0xfd, 0xc3, 0x92, 0x78, 0x74, 0xaa, 0x00, 0xf8, 0x32, 0xa3, 0x77, 0x85, 0xdb, 0x8a, 0xce, 0x41, - 0xd4, 0xee, 0x8e, 0xc5, 0xe3, 0xc1, 0xea, 0x08, 0xfa, 0x29, 0xff, 0xad, 0xa6, 0x3b, 0x0f, 0xa6, - 0x13, 0xec, 0xef, 0x8a, 0x43, 0x73, 0xb9, 0xff, 0x1d, 0x98, 0x8e, 0xda, 0xa2, 0xa2, 0x07, 0x0e, - 0xe6, 0x30, 0x18, 0x7e, 0xd4, 0xde, 0x77, 0x08, 0x0a, 0xb7, 0xf9, 0x57, 0x52, 0x70, 0xdb, 0x81, - 0xfb, 0x32, 0xf4, 0xd8, 0xc1, 0x6c, 0x0f, 0x08, 0x88, 0x6a, 0x8d, 0x1b, 0x21, 0x75, 0xbb, 0xa6, - 0x04, 0x8e, 0xd7, 0xa3, 0x25, 0x3a, 0xb0, 0x71, 0x18, 0x32, 0xb1, 0x83, 0x41, 0xa2, 0x34, 0x82, - 0x5e, 0x8a, 0x3e, 0x66, 0x3e, 0x13, 0xc9, 0x61, 0xf8, 0x5e, 0xa5, 0xf6, 0x40, 0x72, 0x02, 0xff, - 0xb4, 0x47, 0x05, 0xc1, 0x43, 0xa6, 0xfd, 0x80, 0x48, 0x7f, 0xc8, 0xb4, 0x1f, 0x14, 0x61, 0xf3, - 0x69, 0x3f, 0x30, 0x20, 0x1c, 0x32, 0xed, 0x49, 0xe2, 0xe0, 0x21, 0xd3, 0x9e, 0x28, 0xfe, 0x94, - 0x46, 0xd0, 0x36, 0x8c, 0x07, 0x82, 0x0f, 0x74, 0x3a, 0x92, 0x5d, 0x54, 0x54, 0x58, 0xbb, 0x27, - 0x09, 0xaa, 0x7f, 0xfe, 0x23, 0xbc, 0xef, 0x90, 0xf9, 0x1f, 0x1e, 0x60, 0xd4, 0x1e, 0x48, 0x4e, - 0xe0, 0xb6, 0x7d, 0xcd, 0x3d, 0xf9, 0xf0, 0x21, 0xa0, 0xd9, 0x84, 0x9c, 0x44, 0xcb, 0x67, 0x12, - 0xe3, 0xbb, 0x0d, 0xef, 0x0c, 0x5c, 0x7e, 0x8e, 0x16, 0x5a, 0xa4, 0x2f, 0xab, 0xdd, 0x9b, 0x08, - 0xd7, 0x6d, 0x6c, 0x85, 0xa7, 0xf5, 0x4f, 0x46, 0x92, 0xf9, 0xbc, 0x54, 0xed, 0xf6, 0x03, 0x30, - 0x5c, 0x76, 0x6b, 0xee, 0x39, 0x9d, 0x14, 0x8d, 0xee, 0xf7, 0x4e, 0xb5, 0x53, 0x07, 0xe2, 0x08, - 0xa6, 0x37, 0x3b, 0xf3, 0xfe, 0x37, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4b, 0x66, 0xf0, 0x36, 0x0f, + 0xf9, 0x54, 0xd7, 0x06, 0xa7, 0x5a, 0xa0, 0xf3, 0xe9, 0x76, 0x29, 0xa4, 0xff, 0x9a, 0x06, 0x88, + 0x4b, 0xce, 0xfc, 0x18, 0x04, 0xe0, 0xe7, 0x21, 0xc7, 0x3d, 0x4e, 0xe6, 0x86, 0xa2, 0x55, 0x4e, + 0xed, 0x9b, 0xa5, 0x6f, 0xa7, 0x61, 0x6a, 0x43, 0x98, 0xdd, 0x9f, 0x48, 0x18, 0x5d, 0x84, 0x31, + 0x6c, 0x38, 0x96, 0x8e, 0x45, 0x1a, 0x7c, 0x26, 0xac, 0xa5, 0x11, 0xd2, 0xa2, 0xff, 0x2e, 0x41, + 0xdc, 0x96, 0xe3, 0xe4, 0x3e, 0x19, 0x7f, 0x32, 0x03, 0xd5, 0x61, 0x54, 0x68, 0x1e, 0x26, 0x34, + 0x0b, 0x53, 0x80, 0xe2, 0x3f, 0x39, 0x69, 0xd6, 0x7c, 0x19, 0xa3, 0x20, 0x82, 0x24, 0x97, 0x05, + 0x84, 0x3b, 0xe4, 0x36, 0x4d, 0x50, 0x91, 0xa5, 0x42, 0xb0, 0x12, 0x06, 0xd1, 0x12, 0xf7, 0xc8, + 0x5e, 0x5a, 0xca, 0xcf, 0x80, 0xb9, 0xe4, 0xb2, 0x07, 0xa5, 0x3e, 0xf9, 0x45, 0x98, 0xd0, 0x0d, + 0xdd, 0xd1, 0xd5, 0x8e, 0xb2, 0xa9, 0x76, 0x54, 0x43, 0xbb, 0x91, 0xad, 0x08, 0xf3, 0xa6, 0xbc, + 0xd9, 0x10, 0x3b, 0x49, 0x2e, 0x73, 0x48, 0x93, 0x01, 0xc8, 0x8c, 0x88, 0xa6, 0xb2, 0x37, 0x14, + 0xb8, 0x09, 0x72, 0xdf, 0x8c, 0xfc, 0x62, 0x06, 0x26, 0xdd, 0xfc, 0xcc, 0x4f, 0xa6, 0x22, 0xe9, + 0x54, 0xac, 0x00, 0x30, 0x03, 0x42, 0x3c, 0xc7, 0x0d, 0xcc, 0x06, 0x31, 0x41, 0x05, 0xc6, 0x61, + 0xc1, 0x76, 0x7c, 0xf3, 0xf1, 0xe7, 0x19, 0x28, 0xf9, 0xe7, 0xe3, 0x27, 0x2e, 0xfd, 0x5d, 0x94, + 0x31, 0x9b, 0xf3, 0x4c, 0x62, 0x96, 0x7f, 0x17, 0x25, 0x64, 0x12, 0x07, 0x96, 0xd2, 0x70, 0x5b, + 0xf8, 0x97, 0x69, 0xc8, 0xf1, 0x7b, 0xd9, 0xda, 0xc0, 0x2e, 0x22, 0x15, 0x77, 0xef, 0xfb, 0xe0, + 0x4d, 0xc4, 0x2b, 0x91, 0x9b, 0x88, 0x72, 0x57, 0xdd, 0x55, 0x02, 0xaf, 0x98, 0x52, 0x33, 0xe3, + 0xcd, 0xe3, 0x1e, 0x97, 0x60, 0x3d, 0xcb, 0x85, 0x78, 0x77, 0x72, 0xd1, 0x23, 0x50, 0x24, 0x18, + 0x9e, 0x57, 0x20, 0xe4, 0x47, 0xbd, 0xe4, 0x83, 0xaf, 0x52, 0x92, 0xa1, 0xab, 0xee, 0x2e, 0xb2, + 0x02, 0x5a, 0x06, 0xb4, 0xed, 0xa6, 0xbe, 0x14, 0x4f, 0x84, 0x84, 0xfe, 0xb6, 0xeb, 0xfb, 0xf5, + 0xe3, 0x8c, 0x7e, 0x10, 0x47, 0x92, 0x27, 0x3d, 0xa0, 0xe0, 0xf6, 0x20, 0x00, 0x19, 0x97, 0xc2, + 0xee, 0x84, 0xb0, 0x2d, 0xac, 0xef, 0xa2, 0x84, 0x57, 0x27, 0xc9, 0x05, 0x52, 0x58, 0x20, 0xbf, + 0x7d, 0x82, 0xff, 0xa5, 0x14, 0x20, 0xcf, 0xf7, 0xb8, 0xe7, 0xf5, 0xef, 0xa7, 0xef, 0x12, 0xc5, + 0xce, 0x28, 0x15, 0xbd, 0xc9, 0xf2, 0xe8, 0xc4, 0x26, 0xcb, 0xb7, 0x54, 0xef, 0xf3, 0xec, 0x73, + 0x7a, 0x68, 0x56, 0x30, 0xc2, 0x06, 0xff, 0x9b, 0x14, 0x1c, 0x1f, 0x50, 0x1c, 0xb7, 0x5f, 0x57, + 0x00, 0x59, 0xbe, 0x4a, 0xfe, 0x1f, 0x8a, 0x52, 0xfc, 0x3f, 0xfe, 0x25, 0xd4, 0xbf, 0x49, 0x6b, + 0xc0, 0xc6, 0xdf, 0x3c, 0x6f, 0xc2, 0x33, 0x8a, 0x29, 0x98, 0xf6, 0x37, 0xef, 0x0e, 0xe0, 0x3c, + 0x94, 0xfc, 0xad, 0xf3, 0xae, 0xdf, 0x7a, 0x50, 0xd7, 0x79, 0xaf, 0x03, 0x74, 0x68, 0xc9, 0x5b, + 0x7d, 0xe2, 0x9f, 0x4e, 0xc6, 0x8d, 0xde, 0xbd, 0xc8, 0x16, 0x5a, 0x85, 0xac, 0xc7, 0xff, 0x3f, + 0x05, 0xd9, 0x55, 0xd3, 0xec, 0x20, 0x13, 0x26, 0x0d, 0xd3, 0x51, 0x88, 0xb2, 0xe0, 0x96, 0xc2, + 0x73, 0x23, 0x2c, 0x0b, 0x3a, 0x7f, 0x38, 0xa1, 0x7c, 0x6f, 0xbf, 0x3e, 0xc8, 0x4a, 0x9e, 0x30, + 0x4c, 0xa7, 0x49, 0x21, 0xeb, 0x2c, 0x73, 0xf2, 0x21, 0x18, 0x0f, 0x36, 0xc6, 0x32, 0x45, 0xcf, + 0x1e, 0xba, 0xb1, 0x20, 0x9b, 0xeb, 0xfb, 0xf5, 0x69, 0x6f, 0x11, 0xb8, 0x60, 0x49, 0x2e, 0x6d, + 0xfa, 0x5a, 0x6f, 0xe4, 0xc9, 0xe8, 0xbf, 0xff, 0x6a, 0x3d, 0xd5, 0x3c, 0x3f, 0xf4, 0x06, 0xc0, + 0x7d, 0x07, 0x76, 0x61, 0xd7, 0x3d, 0xea, 0x0f, 0xde, 0x05, 0xf8, 0xee, 0x19, 0xa8, 0x85, 0xee, + 0x02, 0xd0, 0x77, 0xc8, 0x43, 0x6e, 0x02, 0x1c, 0xfc, 0x0f, 0xfc, 0x87, 0x5c, 0x14, 0x38, 0xf0, + 0xb2, 0x81, 0xb4, 0x03, 0x47, 0xe9, 0x55, 0x4e, 0xcf, 0x6c, 0x89, 0xaf, 0xc4, 0x1c, 0x75, 0x13, + 0x68, 0x29, 0xfe, 0xff, 0xc2, 0x59, 0x36, 0xec, 0x31, 0x00, 0xaf, 0x65, 0xf7, 0xc1, 0x0d, 0xef, + 0x29, 0xeb, 0x3d, 0xfb, 0x47, 0xfe, 0x94, 0x8d, 0xec, 0x43, 0x96, 0x7e, 0x35, 0x05, 0xc7, 0x06, + 0x5a, 0xe3, 0x5a, 0xff, 0x64, 0xe0, 0xc1, 0x68, 0x2a, 0x59, 0x8e, 0xde, 0xff, 0xe5, 0x87, 0x46, + 0x44, 0xbf, 0x6a, 0x51, 0xfd, 0x62, 0x0d, 0x06, 0x3a, 0xf6, 0x22, 0x1c, 0x09, 0xf6, 0x4b, 0x08, + 0xe1, 0x39, 0x28, 0x07, 0x77, 0x0b, 0x3c, 0x94, 0x78, 0xcf, 0xe1, 0x3d, 0xe4, 0x78, 0x60, 0xc7, + 0x20, 0x3d, 0x1b, 0x16, 0xbc, 0x2b, 0x89, 0xf7, 0x0d, 0x5e, 0xbe, 0x8f, 0x15, 0x84, 0xef, 0x6d, + 0xd6, 0x57, 0x52, 0x70, 0x32, 0xc8, 0xd9, 0x33, 0xc2, 0xf6, 0xdb, 0x3e, 0xae, 0xb7, 0xa2, 0x1e, + 0xff, 0x39, 0x05, 0xb7, 0x1f, 0xd0, 0x73, 0x2e, 0x1e, 0x0b, 0xa6, 0x7d, 0xd6, 0xdd, 0xe2, 0x60, + 0xa1, 0x32, 0xd2, 0x70, 0x0f, 0xe4, 0x1a, 0xb7, 0x5b, 0xf8, 0x55, 0xa4, 0xa9, 0xc1, 0x3a, 0x5b, + 0x9e, 0x1a, 0xb4, 0xc8, 0x6f, 0x4d, 0xb7, 0xbe, 0x9e, 0x82, 0xd3, 0xc1, 0x51, 0x45, 0xec, 0xe8, + 0xde, 0xdd, 0x13, 0xf3, 0x6f, 0x53, 0x70, 0x4f, 0x92, 0x21, 0xf0, 0x19, 0x7a, 0x1e, 0xa6, 0xbc, + 0xf8, 0x2a, 0x3c, 0x41, 0xa7, 0x12, 0xec, 0x8a, 0xb9, 0x52, 0x23, 0x97, 0xcb, 0xcd, 0x99, 0x89, + 0x3f, 0x4a, 0xf1, 0x35, 0xe7, 0x9f, 0x77, 0x57, 0xec, 0xc1, 0x2d, 0xc1, 0x21, 0xc5, 0xee, 0xdb, + 0x16, 0x8c, 0x07, 0xb6, 0x05, 0x11, 0x13, 0x9a, 0xbe, 0x49, 0x16, 0xe4, 0xe7, 0x85, 0x35, 0x8d, + 0x08, 0xce, 0x76, 0x60, 0x2a, 0x62, 0x91, 0xb8, 0x2f, 0x4e, 0xe3, 0xd7, 0xc8, 0xd1, 0x1f, 0xec, + 0xd7, 0x23, 0xa2, 0x3e, 0x19, 0x0d, 0x2e, 0x0f, 0xe9, 0xbf, 0xa4, 0xa0, 0x4e, 0x3b, 0x12, 0x31, + 0x95, 0x7f, 0x93, 0x05, 0x8c, 0xb9, 0x21, 0x8d, 0x1c, 0x16, 0x17, 0xf4, 0x1c, 0xe4, 0x98, 0x96, + 0x72, 0xd9, 0x1e, 0x42, 0xbd, 0x39, 0xa1, 0x67, 0xb0, 0x17, 0xc4, 0xb8, 0xa2, 0xed, 0xc2, 0xdb, + 0x24, 0xbf, 0xb7, 0x60, 0x17, 0xfe, 0xb5, 0x30, 0xd8, 0xd1, 0x3d, 0xe7, 0x22, 0xfa, 0xe0, 0x5b, + 0x36, 0xd8, 0xfc, 0x4b, 0x42, 0x6f, 0x9b, 0x65, 0x76, 0xbb, 0x1f, 0x63, 0x99, 0xdf, 0x7d, 0x33, + 0xe0, 0x5a, 0xe6, 0x98, 0x21, 0xbc, 0xcb, 0x2d, 0xf3, 0xf5, 0x34, 0x1c, 0xa7, 0xc3, 0xf0, 0xef, + 0x48, 0xde, 0x01, 0xc9, 0x2b, 0x80, 0x6c, 0x4b, 0x53, 0x6e, 0x96, 0xfd, 0xa8, 0xd8, 0x96, 0x76, + 0x25, 0xe0, 0x74, 0x15, 0x40, 0x2d, 0xdb, 0x09, 0x37, 0x90, 0xb9, 0xe1, 0x06, 0x5a, 0xb6, 0x73, + 0xe5, 0x00, 0xaf, 0x9e, 0x3d, 0x8c, 0xee, 0xfc, 0x41, 0x0a, 0x6a, 0x51, 0x42, 0xe7, 0xba, 0xa2, + 0xc2, 0xd1, 0xc0, 0x3e, 0x3a, 0xac, 0x2e, 0x77, 0x1c, 0xb4, 0x9b, 0x0c, 0x2d, 0xdd, 0x23, 0x16, + 0xbe, 0xd9, 0x8b, 0xf7, 0xcb, 0xc2, 0xe9, 0xb8, 0x9a, 0x3f, 0xb8, 0x85, 0x79, 0x57, 0x2e, 0xd9, + 0xdf, 0x18, 0x30, 0xf7, 0xef, 0xb6, 0xdd, 0xd0, 0x1f, 0xa7, 0xe0, 0xc4, 0x90, 0x1e, 0xfe, 0x4d, + 0x76, 0xe7, 0x3f, 0x3b, 0x54, 0x61, 0x6e, 0xd6, 0xd6, 0xeb, 0x41, 0xbe, 0xa0, 0x82, 0xf7, 0xd6, + 0x7c, 0x1b, 0xea, 0xc8, 0x6f, 0xcc, 0x3d, 0x03, 0xb7, 0x44, 0x52, 0xf1, 0x3e, 0x9d, 0x85, 0xec, + 0xb6, 0x6e, 0x3b, 0xee, 0x87, 0x17, 0x42, 0xdd, 0x09, 0x51, 0x51, 0x5c, 0x09, 0x41, 0x85, 0xb2, + 0x5c, 0x35, 0xcd, 0x0e, 0x6f, 0x5e, 0x9a, 0x87, 0x49, 0x1f, 0x8c, 0x33, 0x9f, 0x85, 0x6c, 0xcf, + 0x34, 0x3b, 0x9c, 0xf9, 0x74, 0x98, 0x39, 0xc1, 0xe5, 0xc3, 0xa4, 0x78, 0xd2, 0x34, 0x20, 0xc6, + 0x84, 0x7d, 0x12, 0x84, 0xb3, 0xfe, 0x68, 0x0a, 0xa6, 0x02, 0x60, 0xf7, 0xd1, 0x52, 0x2e, 0xf0, + 0x35, 0xa9, 0x81, 0x23, 0x7a, 0x86, 0xef, 0x3e, 0x4f, 0x67, 0xd9, 0xdd, 0xb7, 0xa0, 0xba, 0x67, + 0xff, 0xb0, 0x24, 0x5e, 0xb9, 0x2a, 0x00, 0xbe, 0x54, 0xec, 0x5d, 0xe1, 0x96, 0xa3, 0x93, 0x1e, + 0xb5, 0xbb, 0x63, 0xf1, 0x78, 0xcc, 0x3b, 0x82, 0x7e, 0xca, 0x7f, 0x8d, 0xea, 0xce, 0x83, 0xe9, + 0x04, 0xfb, 0xbb, 0xe2, 0xd0, 0x5c, 0xee, 0x7f, 0x0b, 0xa6, 0xa3, 0x76, 0xc1, 0xe8, 0x81, 0x83, + 0x39, 0x0c, 0xc6, 0x2d, 0xb5, 0xf7, 0x1c, 0x82, 0xc2, 0x6d, 0xfe, 0x95, 0x14, 0xdc, 0x76, 0xe0, + 0x66, 0x0f, 0x3d, 0x76, 0x30, 0xdb, 0x03, 0x22, 0xa9, 0x5a, 0xe3, 0x46, 0x48, 0xdd, 0xae, 0x29, + 0x81, 0xf3, 0xfc, 0x68, 0x89, 0x0e, 0xec, 0x3f, 0x86, 0x4c, 0xec, 0x60, 0xac, 0x29, 0x8d, 0xa0, + 0x97, 0xa2, 0xcf, 0xb5, 0xcf, 0x44, 0x72, 0x18, 0xbe, 0xe5, 0xa9, 0x3d, 0x90, 0x9c, 0xc0, 0x3f, + 0xed, 0x51, 0xb1, 0xf4, 0x90, 0x69, 0x3f, 0x60, 0xc3, 0x30, 0x64, 0xda, 0x0f, 0x0a, 0xd4, 0xf9, + 0xb4, 0x1f, 0x18, 0x49, 0x0e, 0x99, 0xf6, 0x24, 0x01, 0xf4, 0x90, 0x69, 0x4f, 0x14, 0xb8, 0x4a, + 0x23, 0x68, 0x1b, 0xc6, 0x03, 0x71, 0x0a, 0x3a, 0x1d, 0xc9, 0x2e, 0x2a, 0x80, 0xac, 0xdd, 0x93, + 0x04, 0xd5, 0x3f, 0xff, 0x11, 0xae, 0x79, 0xc8, 0xfc, 0x0f, 0x8f, 0x3e, 0x6a, 0x0f, 0x24, 0x27, + 0x70, 0xdb, 0xbe, 0xe6, 0x1e, 0xb5, 0xf8, 0x10, 0xd0, 0x6c, 0x42, 0x4e, 0xa2, 0xe5, 0x33, 0x89, + 0xf1, 0xdd, 0x86, 0x77, 0x06, 0x6e, 0x5b, 0x47, 0x0b, 0x2d, 0xd2, 0xb5, 0xd5, 0xee, 0x4d, 0x84, + 0xeb, 0x36, 0xb6, 0xc2, 0xcf, 0x11, 0x4e, 0x46, 0x92, 0xf9, 0x9c, 0x56, 0xed, 0xf6, 0x03, 0x30, + 0x5c, 0x76, 0x6b, 0xee, 0xc1, 0xa0, 0x14, 0x8d, 0xee, 0x77, 0x56, 0xb5, 0x53, 0x07, 0xe2, 0x08, + 0xa6, 0x37, 0x3b, 0xd5, 0xff, 0xd7, 0x01, 0x00, 0x00, 0xff, 0xff, 0x6c, 0x4d, 0xac, 0xd7, 0x80, 0x97, 0x00, 0x00, } r := bytes.NewReader(gzipped)