From eefbeeb5c5b130db9699bb3a3b8e09a9ea85b8ae Mon Sep 17 00:00:00 2001 From: ThanhNhann Date: Wed, 13 Dec 2023 18:34:24 +0700 Subject: [PATCH 1/9] add QueryAllPairsValConAddrByConsumerChainID --- .../ccv/provider/v1/query.proto | 25 + .../e2e/tracehandler_testdata/changeover.json | 17 + .../consumer-double-sign.json | 15 + .../consumer-misbehaviour.json | 13 + .../e2e/tracehandler_testdata/democracy.json | 30 + .../democracyRewardsSteps.json | 30 + .../e2e/tracehandler_testdata/happyPath.json | 59 ++ .../multipleConsumers.json | 101 +++ .../e2e/tracehandler_testdata/shorthappy.json | 42 + .../tracehandler_testdata/slashThrottle.json | 30 + x/ccv/provider/client/cli/query.go | 28 + x/ccv/provider/keeper/grpc_query.go | 21 + x/ccv/provider/types/query.pb.go | 780 ++++++++++++++++-- x/ccv/provider/types/query.pb.gw.go | 83 ++ 14 files changed, 1199 insertions(+), 75 deletions(-) diff --git a/proto/interchain_security/ccv/provider/v1/query.proto b/proto/interchain_security/ccv/provider/v1/query.proto index 05071a354c..a9bc7badc1 100644 --- a/proto/interchain_security/ccv/provider/v1/query.proto +++ b/proto/interchain_security/ccv/provider/v1/query.proto @@ -82,6 +82,15 @@ service Query { option (google.api.http).get = "/interchain_security/ccv/provider/proposed_consumer_chains"; } + + // QueryAllPairsValConAddrByConsumerChainID returns a list of pair valconsensus address + // between provider and consumer chain + rpc QueryAllPairsValConAddrByConsumerChainID ( + QueryAllPairsValConAddrByConsumerChainIDRequest) + returns (QueryAllPairsValConAddrByConsumerChainIDResponse) { + option (google.api.http).get = + "/interchain_security/ccv/provider/consumer_chain_id"; + } } message QueryConsumerGenesisRequest { string chain_id = 1; } @@ -171,3 +180,19 @@ message ProposedChain { string chainID = 1; uint64 proposalID = 2; } + +message QueryAllPairsValConAddrByConsumerChainIDRequest { + // The id of the consumer chain + string chain_id = 1; +} + +message QueryAllPairsValConAddrByConsumerChainIDResponse { + repeated PairValConAddrProviderAndConsumer pair_val_con_addr = 1; +} + +message PairValConAddrProviderAndConsumer { + // The consensus address of the validator on the provider chain + string provider_address = 1 [ (gogoproto.moretags) = "yaml:\"address\"" ]; + // The consensus address of the validator on the consumer chain + string consumer_address = 2 [ (gogoproto.moretags) = "yaml:\"address\"" ]; +} diff --git a/tests/e2e/tracehandler_testdata/changeover.json b/tests/e2e/tracehandler_testdata/changeover.json index cafe8aa69e..c3e914e010 100644 --- a/tests/e2e/tracehandler_testdata/changeover.json +++ b/tests/e2e/tracehandler_testdata/changeover.json @@ -17,6 +17,7 @@ "ValBalances": { "alice": 9500000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -42,6 +43,7 @@ "State": { "sover": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 0, @@ -91,6 +93,7 @@ "bob": 9500000000, "carol": 9500000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -137,6 +140,7 @@ "State": { "sover": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -178,6 +182,7 @@ "State": { "sover": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -232,6 +237,7 @@ "alice": 9489999999, "bob": 9500000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -281,6 +287,7 @@ "alice": 9500000000, "bob": 9500000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -335,6 +342,7 @@ "State": { "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 500, "bob": 500, @@ -353,6 +361,7 @@ }, "sover": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 500, "bob": 500, @@ -407,6 +416,7 @@ "ValBalances": { "bob": 0 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -432,6 +442,7 @@ "State": { "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -450,6 +461,7 @@ }, "sover": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 500, "bob": 500, @@ -479,6 +491,7 @@ "State": { "sover": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -510,6 +523,7 @@ "ValBalances": { "bob": 100 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -535,6 +549,7 @@ "State": { "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 510, "bob": 500, @@ -553,6 +568,7 @@ }, "sover": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -582,6 +598,7 @@ "State": { "sover": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 510, "bob": 500, diff --git a/tests/e2e/tracehandler_testdata/consumer-double-sign.json b/tests/e2e/tracehandler_testdata/consumer-double-sign.json index d6d1fc7086..75a8312e1f 100644 --- a/tests/e2e/tracehandler_testdata/consumer-double-sign.json +++ b/tests/e2e/tracehandler_testdata/consumer-double-sign.json @@ -30,6 +30,7 @@ "bob": 9500000000, "carol": 9500000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -64,6 +65,9 @@ "alice": 9489999999, "bob": 9500000000 }, + "ProposedConsumerChains": [ + "consu" + ], "ValPowers": null, "StakedTokens": null, "Params": null, @@ -104,6 +108,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -147,6 +152,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -188,6 +194,7 @@ "alice": 9500000000, "bob": 9500000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -246,6 +253,7 @@ "bob": 10000000000, "carol": 10000000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -264,6 +272,7 @@ "bob": 9500000000, "carol": 9500000000 }, + "ProposedConsumerChains": [], "ValPowers": null, "StakedTokens": null, "Params": null, @@ -310,6 +319,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 500, "bob": 500, @@ -328,6 +338,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 500, "bob": 500, @@ -358,6 +369,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 500, "bob": 500, @@ -376,6 +388,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 500, "bob": 0, @@ -409,6 +422,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 500, "bob": 0, @@ -427,6 +441,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 500, "bob": 0, diff --git a/tests/e2e/tracehandler_testdata/consumer-misbehaviour.json b/tests/e2e/tracehandler_testdata/consumer-misbehaviour.json index 028637934f..ca529a0063 100644 --- a/tests/e2e/tracehandler_testdata/consumer-misbehaviour.json +++ b/tests/e2e/tracehandler_testdata/consumer-misbehaviour.json @@ -24,6 +24,7 @@ "alice": 9500000000, "bob": 9980000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -58,6 +59,7 @@ "alice": 9489999999, "bob": 9980000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -98,6 +100,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -136,6 +139,7 @@ "alice": 9500000000, "bob": 9980000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -182,6 +186,7 @@ "ValBalances": { "alice": 10000000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -199,6 +204,7 @@ "alice": 9500000000, "bob": 9980000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -247,6 +253,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 500, "bob": 20 @@ -264,6 +271,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 20 @@ -292,6 +300,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 20 @@ -332,6 +341,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 20 @@ -349,6 +359,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 20 @@ -380,6 +391,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 20 @@ -397,6 +409,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 0, "bob": 20 diff --git a/tests/e2e/tracehandler_testdata/democracy.json b/tests/e2e/tracehandler_testdata/democracy.json index 3a9ab84a96..873839afba 100644 --- a/tests/e2e/tracehandler_testdata/democracy.json +++ b/tests/e2e/tracehandler_testdata/democracy.json @@ -30,6 +30,7 @@ "bob": 9500000000, "carol": 9500000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -64,6 +65,9 @@ "alice": 9489999999, "bob": 9500000000 }, + "ProposedConsumerChains": [ + "democ" + ], "ValPowers": null, "StakedTokens": null, "Params": null, @@ -104,6 +108,7 @@ "State": { "democ": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -147,6 +152,7 @@ "State": { "democ": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -188,6 +194,7 @@ "alice": 9500000000, "bob": 9500000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -246,6 +253,7 @@ "bob": 10000000000, "carol": 10000000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -264,6 +272,7 @@ "bob": 9500000000, "carol": 9500000000 }, + "ProposedConsumerChains": [], "ValPowers": null, "StakedTokens": null, "Params": null, @@ -326,6 +335,7 @@ "State": { "democ": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 500, "bob": 500, @@ -344,6 +354,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -376,6 +387,7 @@ "alice": 10000000000, "bob": 10000000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -401,6 +413,7 @@ "State": { "democ": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -433,6 +446,7 @@ "alice": 9999999999, "bob": 10000000001 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -463,6 +477,7 @@ "State": { "democ": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": { "alice": 100000000, @@ -499,6 +514,7 @@ "State": { "democ": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -544,6 +560,7 @@ "alice": 9889999998, "bob": 9960000001 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": [ @@ -595,6 +612,7 @@ "alice": 9899999999, "bob": 9960000001 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": [ @@ -637,6 +655,7 @@ "State": { "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -669,6 +688,7 @@ "State": { "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -702,6 +722,7 @@ "State": { "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -729,6 +750,7 @@ "State": { "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -760,6 +782,7 @@ "State": { "democ": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -778,6 +801,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -807,6 +831,7 @@ "State": { "democ": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -825,6 +850,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 0, @@ -854,6 +880,7 @@ "State": { "democ": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 0, @@ -881,6 +908,7 @@ "State": { "democ": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 0, @@ -899,6 +927,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -928,6 +957,7 @@ "State": { "democ": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, diff --git a/tests/e2e/tracehandler_testdata/democracyRewardsSteps.json b/tests/e2e/tracehandler_testdata/democracyRewardsSteps.json index 74df5293b9..1c51cc47ce 100644 --- a/tests/e2e/tracehandler_testdata/democracyRewardsSteps.json +++ b/tests/e2e/tracehandler_testdata/democracyRewardsSteps.json @@ -30,6 +30,7 @@ "bob": 9500000000, "carol": 9500000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -64,6 +65,9 @@ "alice": 9489999999, "bob": 9500000000 }, + "ProposedConsumerChains": [ + "democ" + ], "ValPowers": null, "StakedTokens": null, "Params": null, @@ -104,6 +108,7 @@ "State": { "democ": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -147,6 +152,7 @@ "State": { "democ": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -188,6 +194,7 @@ "alice": 9500000000, "bob": 9500000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -246,6 +253,7 @@ "bob": 10000000000, "carol": 10000000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -264,6 +272,7 @@ "bob": 9500000000, "carol": 9500000000 }, + "ProposedConsumerChains": [], "ValPowers": null, "StakedTokens": null, "Params": null, @@ -326,6 +335,7 @@ "State": { "democ": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 500, "bob": 500, @@ -344,6 +354,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -376,6 +387,7 @@ "alice": 10000000000, "bob": 10000000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -401,6 +413,7 @@ "State": { "democ": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -433,6 +446,7 @@ "alice": 9999999999, "bob": 10000000001 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -463,6 +477,7 @@ "State": { "democ": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": { "alice": 100000000, @@ -499,6 +514,7 @@ "State": { "democ": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -544,6 +560,7 @@ "alice": 9889999998, "bob": 9960000001 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": [ @@ -595,6 +612,7 @@ "alice": 9899999999, "bob": 9960000001 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": [ @@ -637,6 +655,7 @@ "State": { "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -669,6 +688,7 @@ "State": { "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -702,6 +722,7 @@ "State": { "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -729,6 +750,7 @@ "State": { "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -760,6 +782,7 @@ "State": { "democ": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -778,6 +801,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -807,6 +831,7 @@ "State": { "democ": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -825,6 +850,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 0, @@ -854,6 +880,7 @@ "State": { "democ": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 0, @@ -881,6 +908,7 @@ "State": { "democ": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 0, @@ -899,6 +927,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -928,6 +957,7 @@ "State": { "democ": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, diff --git a/tests/e2e/tracehandler_testdata/happyPath.json b/tests/e2e/tracehandler_testdata/happyPath.json index 7c26f5c274..e01940c96d 100644 --- a/tests/e2e/tracehandler_testdata/happyPath.json +++ b/tests/e2e/tracehandler_testdata/happyPath.json @@ -30,6 +30,7 @@ "bob": 9500000000, "carol": 9500000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -64,6 +65,9 @@ "alice": 9489999999, "bob": 9500000000 }, + "ProposedConsumerChains": [ + "consu" + ], "ValPowers": null, "StakedTokens": null, "Params": null, @@ -104,6 +108,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -147,6 +152,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -188,6 +194,7 @@ "alice": 9500000000, "bob": 9500000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -246,6 +253,7 @@ "bob": 10000000000, "carol": 10000000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -264,6 +272,7 @@ "bob": 9500000000, "carol": 9500000000 }, + "ProposedConsumerChains": [], "ValPowers": null, "StakedTokens": null, "Params": null, @@ -312,6 +321,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 500, "bob": 500, @@ -330,6 +340,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -362,6 +373,7 @@ "alice": 10000000000, "bob": 10000000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -387,6 +399,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -419,6 +432,7 @@ "alice": 9999999999, "bob": 10000000001 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -446,6 +460,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -470,6 +485,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -499,6 +515,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -523,6 +540,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -552,6 +570,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -570,6 +589,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 510, "bob": 500, @@ -599,6 +619,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 510, "bob": 500, @@ -628,6 +649,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 510, "bob": 500, @@ -646,6 +668,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -675,6 +698,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -704,6 +728,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -722,6 +747,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 510, "bob": 500, @@ -751,6 +777,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 510, "bob": 500, @@ -781,6 +808,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 510, "bob": 500, @@ -799,6 +827,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 60, "bob": 500, @@ -828,6 +857,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 60, "bob": 500, @@ -855,6 +885,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 60, "bob": 500, @@ -873,6 +904,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 60, "bob": 500, @@ -902,6 +934,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 60, "bob": 500, @@ -920,6 +953,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 60, "bob": 500, @@ -950,6 +984,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 60, "bob": 500, @@ -968,6 +1003,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -997,6 +1033,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1024,6 +1061,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1042,6 +1080,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1071,6 +1110,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "carol": 501 @@ -1088,6 +1128,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 0, @@ -1117,6 +1158,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 0, @@ -1144,6 +1186,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 0, @@ -1162,6 +1205,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1191,6 +1235,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1218,6 +1263,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1236,6 +1282,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1265,6 +1312,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1292,6 +1340,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1310,6 +1359,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1339,6 +1389,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1366,6 +1417,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1384,6 +1436,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1413,6 +1466,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1431,6 +1485,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1468,6 +1523,7 @@ "ValBalances": { "bob": 9489999999 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -1515,6 +1571,7 @@ "ValBalances": { "bob": 9500000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -1555,6 +1612,7 @@ "ValBalances": { "bob": 9489999999 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -1602,6 +1660,7 @@ "ValBalances": { "bob": 9500000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, diff --git a/tests/e2e/tracehandler_testdata/multipleConsumers.json b/tests/e2e/tracehandler_testdata/multipleConsumers.json index a6b31d15e8..e767922fba 100644 --- a/tests/e2e/tracehandler_testdata/multipleConsumers.json +++ b/tests/e2e/tracehandler_testdata/multipleConsumers.json @@ -30,6 +30,7 @@ "bob": 9500000000, "carol": 9500000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -64,6 +65,9 @@ "alice": 9489999999, "bob": 9500000000 }, + "ProposedConsumerChains": [ + "consu" + ], "ValPowers": null, "StakedTokens": null, "Params": null, @@ -104,6 +108,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -147,6 +152,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -188,6 +194,7 @@ "alice": 9500000000, "bob": 9500000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -246,6 +253,7 @@ "bob": 10000000000, "carol": 10000000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -264,6 +272,7 @@ "bob": 9500000000, "carol": 9500000000 }, + "ProposedConsumerChains": [], "ValPowers": null, "StakedTokens": null, "Params": null, @@ -321,6 +330,9 @@ "alice": 9489999999, "bob": 9500000000 }, + "ProposedConsumerChains": [ + "densu" + ], "ValPowers": null, "StakedTokens": null, "Params": null, @@ -361,6 +373,7 @@ "State": { "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -404,6 +417,7 @@ "State": { "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -445,6 +459,7 @@ "alice": 9500000000, "bob": 9500000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -503,6 +518,7 @@ "bob": 10000000000, "carol": 10000000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -521,6 +537,7 @@ "bob": 9500000000, "carol": 9500000000 }, + "ProposedConsumerChains": [], "ValPowers": null, "StakedTokens": null, "Params": null, @@ -569,6 +586,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 500, "bob": 500, @@ -587,6 +605,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 500, "bob": 500, @@ -605,6 +624,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -634,6 +654,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -652,6 +673,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 500, "bob": 500, @@ -670,6 +692,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -699,6 +722,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -717,6 +741,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -735,6 +760,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -764,6 +790,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -782,6 +809,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -800,6 +828,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 510, "bob": 500, @@ -829,6 +858,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 510, "bob": 500, @@ -847,6 +877,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -865,6 +896,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 510, "bob": 500, @@ -894,6 +926,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 510, "bob": 500, @@ -912,6 +945,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 510, "bob": 500, @@ -930,6 +964,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 510, "bob": 500, @@ -960,6 +995,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 510, "bob": 500, @@ -978,6 +1014,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 510, "bob": 500, @@ -996,6 +1033,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1025,6 +1063,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1043,6 +1082,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 510, "bob": 500, @@ -1061,6 +1101,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1090,6 +1131,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1108,6 +1150,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1126,6 +1169,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1153,6 +1197,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1171,6 +1216,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1189,6 +1235,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1218,6 +1265,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1236,6 +1284,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1254,6 +1303,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 0, @@ -1283,6 +1333,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 0, @@ -1301,6 +1352,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1330,6 +1382,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 0, @@ -1348,6 +1401,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 0, @@ -1375,6 +1429,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 0, @@ -1393,6 +1448,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 0, @@ -1411,6 +1467,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1440,6 +1497,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1458,6 +1516,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 0, @@ -1476,6 +1535,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1505,6 +1565,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1523,6 +1584,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1541,6 +1603,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1568,6 +1631,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1586,6 +1650,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1604,6 +1669,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1633,6 +1699,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1651,6 +1718,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1669,6 +1737,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1698,6 +1767,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1716,6 +1786,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1734,6 +1805,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1761,6 +1833,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1779,6 +1852,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1797,6 +1871,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1826,6 +1901,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1844,6 +1920,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1862,6 +1939,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1891,6 +1969,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1909,6 +1988,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1927,6 +2007,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1954,6 +2035,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1972,6 +2054,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1990,6 +2073,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -2019,6 +2103,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -2037,6 +2122,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -2055,6 +2141,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -2084,6 +2171,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -2102,6 +2190,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -2120,6 +2209,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -2147,6 +2237,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -2165,6 +2256,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -2183,6 +2275,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -2212,6 +2305,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -2230,6 +2324,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -2248,6 +2343,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -2277,6 +2373,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -2295,6 +2392,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -2313,6 +2411,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -2342,6 +2441,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -2360,6 +2460,7 @@ }, "densu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, diff --git a/tests/e2e/tracehandler_testdata/shorthappy.json b/tests/e2e/tracehandler_testdata/shorthappy.json index 85e96aeed1..76acd0d0e1 100644 --- a/tests/e2e/tracehandler_testdata/shorthappy.json +++ b/tests/e2e/tracehandler_testdata/shorthappy.json @@ -30,6 +30,7 @@ "bob": 9500000000, "carol": 9500000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -64,6 +65,9 @@ "alice": 9489999999, "bob": 9500000000 }, + "ProposedConsumerChains": [ + "consu" + ], "ValPowers": null, "StakedTokens": null, "Params": null, @@ -104,6 +108,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -147,6 +152,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -188,6 +194,7 @@ "alice": 9500000000, "bob": 9500000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -246,6 +253,7 @@ "bob": 10000000000, "carol": 10000000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -264,6 +272,7 @@ "bob": 9500000000, "carol": 9500000000 }, + "ProposedConsumerChains": [], "ValPowers": null, "StakedTokens": null, "Params": null, @@ -312,6 +321,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 500, "bob": 500, @@ -330,6 +340,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -362,6 +373,7 @@ "alice": 10000000000, "bob": 10000000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -387,6 +399,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -419,6 +432,7 @@ "alice": 9999999999, "bob": 10000000001 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -444,6 +458,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -462,6 +477,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 510, "bob": 500, @@ -491,6 +507,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 510, "bob": 500, @@ -521,6 +538,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 510, "bob": 500, @@ -539,6 +557,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -568,6 +587,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -595,6 +615,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -613,6 +634,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -642,6 +664,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "carol": 501 @@ -659,6 +682,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 0, @@ -688,6 +712,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 0, @@ -715,6 +740,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 0, @@ -733,6 +759,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -762,6 +789,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -789,6 +817,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -807,6 +836,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -836,6 +866,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -863,6 +894,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -881,6 +913,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -910,6 +943,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -937,6 +971,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -955,6 +990,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -984,6 +1020,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1002,6 +1039,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 509, "bob": 500, @@ -1039,6 +1077,7 @@ "ValBalances": { "bob": 9489999999 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -1086,6 +1125,7 @@ "ValBalances": { "bob": 9500000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -1126,6 +1166,7 @@ "ValBalances": { "bob": 9489999999 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -1173,6 +1214,7 @@ "ValBalances": { "bob": 9500000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, diff --git a/tests/e2e/tracehandler_testdata/slashThrottle.json b/tests/e2e/tracehandler_testdata/slashThrottle.json index dbca351d49..1daf90ac0d 100644 --- a/tests/e2e/tracehandler_testdata/slashThrottle.json +++ b/tests/e2e/tracehandler_testdata/slashThrottle.json @@ -30,6 +30,7 @@ "bob": 9500000000, "carol": 9500000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -64,6 +65,9 @@ "alice": 9489999999, "bob": 9500000000 }, + "ProposedConsumerChains": [ + "consu" + ], "ValPowers": null, "StakedTokens": null, "Params": null, @@ -104,6 +108,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -147,6 +152,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -188,6 +194,7 @@ "alice": 9500000000, "bob": 9500000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -246,6 +253,7 @@ "bob": 10000000000, "carol": 10000000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -264,6 +272,7 @@ "bob": 9500000000, "carol": 9500000000 }, + "ProposedConsumerChains": [], "ValPowers": null, "StakedTokens": null, "Params": null, @@ -312,6 +321,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 500, "bob": 500, @@ -330,6 +340,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -362,6 +373,7 @@ "alice": 10000000000, "bob": 10000000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -387,6 +399,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -419,6 +432,7 @@ "alice": 9999999999, "bob": 10000000001 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -442,6 +456,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -460,6 +475,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -489,6 +505,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -507,6 +524,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 0, @@ -534,6 +552,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 500, @@ -552,6 +571,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 0, @@ -581,6 +601,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 0, @@ -599,6 +620,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 0, @@ -626,6 +648,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 0, @@ -644,6 +667,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 0, @@ -670,6 +694,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -684,6 +709,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 0, @@ -713,6 +739,7 @@ "State": { "consu": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -727,6 +754,7 @@ }, "provi": { "ValBalances": null, + "ProposedConsumerChains": null, "ValPowers": { "alice": 511, "bob": 0, @@ -759,6 +787,7 @@ "ValBalances": { "bob": 9489999999 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, @@ -806,6 +835,7 @@ "ValBalances": { "bob": 9500000000 }, + "ProposedConsumerChains": null, "ValPowers": null, "StakedTokens": null, "Params": null, diff --git a/x/ccv/provider/client/cli/query.go b/x/ccv/provider/client/cli/query.go index 2b1d0e1dee..da2c76c42e 100644 --- a/x/ccv/provider/client/cli/query.go +++ b/x/ccv/provider/client/cli/query.go @@ -33,6 +33,7 @@ func NewQueryCmd() *cobra.Command { cmd.AddCommand(CmdThrottleState()) cmd.AddCommand(CmdRegisteredConsumerRewardDenoms()) cmd.AddCommand(CmdProposedConsumerChains()) + cmd.AddCommand(CmdAllPairsValConAddrByConsumerChainID()) return cmd } @@ -347,3 +348,30 @@ $ %s query provider registered-consumer-reward-denoms return cmd } + +func CmdAllPairsValConAddrByConsumerChainID() *cobra.Command { + cmd := &cobra.Command{ + Use: "All-pairs-valconsensus-address", + Short: "Query all pairs of valconsensus address by consumer chainId.", + Args: cobra.ExactArgs(1), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + queryClient := types.NewQueryClient(clientCtx) + + req := types.QueryAllPairsValConAddrByConsumerChainIDRequest{ChainId: args[0]} + res, err := queryClient.QueryAllPairsValConAddrByConsumerChainID(cmd.Context(), &req) + if err != nil { + return err + } + + return clientCtx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} diff --git a/x/ccv/provider/keeper/grpc_query.go b/x/ccv/provider/keeper/grpc_query.go index d1f111e38e..5d8ed8b5bc 100644 --- a/x/ccv/provider/keeper/grpc_query.go +++ b/x/ccv/provider/keeper/grpc_query.go @@ -182,3 +182,24 @@ func (k Keeper) QueryProposedConsumerChainIDs(goCtx context.Context, req *types. ProposedChains: chains, }, nil } + +func (k Keeper) QueryAllPairsValConAddrByConsumerChainID(goCtx context.Context, req *types.QueryAllPairsValConAddrByConsumerChainIDRequest) (*types.QueryAllPairsValConAddrByConsumerChainIDResponse, error) { + if req == nil { + return nil, status.Error(codes.InvalidArgument, "empty request") + } + + // list of pairs valconsensus addr + pairValConAddrs := []*types.PairValConAddrProviderAndConsumer{} + + ctx := sdk.UnwrapSDKContext(goCtx) + validatorConsumerAddrs := k.GetAllValidatorsByConsumerAddr(ctx, &req.ChainId) + for _, data := range validatorConsumerAddrs { + pairValConAddrs = append(pairValConAddrs, &types.PairValConAddrProviderAndConsumer{ + ProviderAddress: string(data.ProviderAddr), + ConsumerAddress: string(data.ConsumerAddr), + }) + } + return &types.QueryAllPairsValConAddrByConsumerChainIDResponse{ + PairValConAddr: pairValConAddrs, + }, nil +} diff --git a/x/ccv/provider/types/query.pb.go b/x/ccv/provider/types/query.pb.go index f5f9852846..a0495bc2de 100644 --- a/x/ccv/provider/types/query.pb.go +++ b/x/ccv/provider/types/query.pb.go @@ -913,6 +913,157 @@ func (m *ProposedChain) GetProposalID() uint64 { return 0 } +type QueryAllPairsValConAddrByConsumerChainIDRequest struct { + // The id of the consumer chain + ChainId string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` +} + +func (m *QueryAllPairsValConAddrByConsumerChainIDRequest) Reset() { + *m = QueryAllPairsValConAddrByConsumerChainIDRequest{} +} +func (m *QueryAllPairsValConAddrByConsumerChainIDRequest) String() string { + return proto.CompactTextString(m) +} +func (*QueryAllPairsValConAddrByConsumerChainIDRequest) ProtoMessage() {} +func (*QueryAllPairsValConAddrByConsumerChainIDRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_422512d7b7586cd7, []int{20} +} +func (m *QueryAllPairsValConAddrByConsumerChainIDRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllPairsValConAddrByConsumerChainIDRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllPairsValConAddrByConsumerChainIDRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QueryAllPairsValConAddrByConsumerChainIDRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllPairsValConAddrByConsumerChainIDRequest.Merge(m, src) +} +func (m *QueryAllPairsValConAddrByConsumerChainIDRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryAllPairsValConAddrByConsumerChainIDRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllPairsValConAddrByConsumerChainIDRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllPairsValConAddrByConsumerChainIDRequest proto.InternalMessageInfo + +func (m *QueryAllPairsValConAddrByConsumerChainIDRequest) GetChainId() string { + if m != nil { + return m.ChainId + } + return "" +} + +type QueryAllPairsValConAddrByConsumerChainIDResponse struct { + PairValConAddr []*PairValConAddrProviderAndConsumer `protobuf:"bytes,1,rep,name=pair_val_con_addr,json=pairValConAddr,proto3" json:"pair_val_con_addr,omitempty"` +} + +func (m *QueryAllPairsValConAddrByConsumerChainIDResponse) Reset() { + *m = QueryAllPairsValConAddrByConsumerChainIDResponse{} +} +func (m *QueryAllPairsValConAddrByConsumerChainIDResponse) String() string { + return proto.CompactTextString(m) +} +func (*QueryAllPairsValConAddrByConsumerChainIDResponse) ProtoMessage() {} +func (*QueryAllPairsValConAddrByConsumerChainIDResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_422512d7b7586cd7, []int{21} +} +func (m *QueryAllPairsValConAddrByConsumerChainIDResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryAllPairsValConAddrByConsumerChainIDResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryAllPairsValConAddrByConsumerChainIDResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QueryAllPairsValConAddrByConsumerChainIDResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryAllPairsValConAddrByConsumerChainIDResponse.Merge(m, src) +} +func (m *QueryAllPairsValConAddrByConsumerChainIDResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryAllPairsValConAddrByConsumerChainIDResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryAllPairsValConAddrByConsumerChainIDResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryAllPairsValConAddrByConsumerChainIDResponse proto.InternalMessageInfo + +func (m *QueryAllPairsValConAddrByConsumerChainIDResponse) GetPairValConAddr() []*PairValConAddrProviderAndConsumer { + if m != nil { + return m.PairValConAddr + } + return nil +} + +type PairValConAddrProviderAndConsumer struct { + // The consensus address of the validator on the provider chain + ProviderAddress string `protobuf:"bytes,1,opt,name=provider_address,json=providerAddress,proto3" json:"provider_address,omitempty" yaml:"address"` + // The consensus address of the validator on the consumer chain + ConsumerAddress string `protobuf:"bytes,2,opt,name=consumer_address,json=consumerAddress,proto3" json:"consumer_address,omitempty" yaml:"address"` +} + +func (m *PairValConAddrProviderAndConsumer) Reset() { *m = PairValConAddrProviderAndConsumer{} } +func (m *PairValConAddrProviderAndConsumer) String() string { return proto.CompactTextString(m) } +func (*PairValConAddrProviderAndConsumer) ProtoMessage() {} +func (*PairValConAddrProviderAndConsumer) Descriptor() ([]byte, []int) { + return fileDescriptor_422512d7b7586cd7, []int{22} +} +func (m *PairValConAddrProviderAndConsumer) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *PairValConAddrProviderAndConsumer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_PairValConAddrProviderAndConsumer.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *PairValConAddrProviderAndConsumer) XXX_Merge(src proto.Message) { + xxx_messageInfo_PairValConAddrProviderAndConsumer.Merge(m, src) +} +func (m *PairValConAddrProviderAndConsumer) XXX_Size() int { + return m.Size() +} +func (m *PairValConAddrProviderAndConsumer) XXX_DiscardUnknown() { + xxx_messageInfo_PairValConAddrProviderAndConsumer.DiscardUnknown(m) +} + +var xxx_messageInfo_PairValConAddrProviderAndConsumer proto.InternalMessageInfo + +func (m *PairValConAddrProviderAndConsumer) GetProviderAddress() string { + if m != nil { + return m.ProviderAddress + } + return "" +} + +func (m *PairValConAddrProviderAndConsumer) GetConsumerAddress() string { + if m != nil { + return m.ConsumerAddress + } + return "" +} + func init() { proto.RegisterType((*QueryConsumerGenesisRequest)(nil), "interchain_security.ccv.provider.v1.QueryConsumerGenesisRequest") proto.RegisterType((*QueryConsumerGenesisResponse)(nil), "interchain_security.ccv.provider.v1.QueryConsumerGenesisResponse") @@ -934,6 +1085,9 @@ func init() { proto.RegisterType((*QueryProposedChainIDsRequest)(nil), "interchain_security.ccv.provider.v1.QueryProposedChainIDsRequest") proto.RegisterType((*QueryProposedChainIDsResponse)(nil), "interchain_security.ccv.provider.v1.QueryProposedChainIDsResponse") proto.RegisterType((*ProposedChain)(nil), "interchain_security.ccv.provider.v1.ProposedChain") + proto.RegisterType((*QueryAllPairsValConAddrByConsumerChainIDRequest)(nil), "interchain_security.ccv.provider.v1.QueryAllPairsValConAddrByConsumerChainIDRequest") + proto.RegisterType((*QueryAllPairsValConAddrByConsumerChainIDResponse)(nil), "interchain_security.ccv.provider.v1.QueryAllPairsValConAddrByConsumerChainIDResponse") + proto.RegisterType((*PairValConAddrProviderAndConsumer)(nil), "interchain_security.ccv.provider.v1.PairValConAddrProviderAndConsumer") } func init() { @@ -941,81 +1095,88 @@ func init() { } var fileDescriptor_422512d7b7586cd7 = []byte{ - // 1170 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcf, 0x6f, 0x1b, 0xc5, - 0x17, 0xf7, 0x26, 0x6d, 0xbe, 0xc9, 0xe4, 0xdb, 0x1f, 0x4c, 0x4b, 0x71, 0x37, 0xc1, 0x2e, 0x5b, - 0x01, 0x69, 0x81, 0xdd, 0xc4, 0xb9, 0xb4, 0x81, 0x34, 0xb1, 0xe3, 0x10, 0xac, 0xb6, 0x6a, 0xd8, - 0x56, 0x20, 0x01, 0x62, 0xd9, 0xec, 0x0e, 0xf6, 0x4a, 0xeb, 0x9d, 0xed, 0xcc, 0xd8, 0x69, 0x54, - 0x71, 0x28, 0x48, 0xd0, 0x63, 0x25, 0xc4, 0xbd, 0x7f, 0x4e, 0x6f, 0x14, 0xf5, 0xc2, 0xa9, 0xa0, - 0x84, 0x03, 0xe2, 0x84, 0xb8, 0x23, 0xa1, 0x9d, 0x9d, 0x5d, 0xaf, 0xed, 0x8d, 0xbd, 0x76, 0x72, - 0xb3, 0x67, 0xde, 0xfb, 0xbc, 0xcf, 0xe7, 0xf9, 0xcd, 0x7b, 0xcf, 0x40, 0x73, 0x3c, 0x86, 0x88, - 0xd5, 0x30, 0x1d, 0xcf, 0xa0, 0xc8, 0x6a, 0x11, 0x87, 0xed, 0x69, 0x96, 0xd5, 0xd6, 0x7c, 0x82, - 0xdb, 0x8e, 0x8d, 0x88, 0xd6, 0x5e, 0xd2, 0xee, 0xb7, 0x10, 0xd9, 0x53, 0x7d, 0x82, 0x19, 0x86, - 0x97, 0x53, 0x1c, 0x54, 0xcb, 0x6a, 0xab, 0x91, 0x83, 0xda, 0x5e, 0x92, 0xe7, 0xeb, 0x18, 0xd7, - 0x5d, 0xa4, 0x99, 0xbe, 0xa3, 0x99, 0x9e, 0x87, 0x99, 0xc9, 0x1c, 0xec, 0xd1, 0x10, 0x42, 0x3e, - 0x5f, 0xc7, 0x75, 0xcc, 0x3f, 0x6a, 0xc1, 0x27, 0x71, 0x5a, 0x14, 0x3e, 0xfc, 0xdb, 0x4e, 0xeb, - 0x6b, 0x8d, 0x39, 0x4d, 0x44, 0x99, 0xd9, 0xf4, 0x85, 0x41, 0x29, 0x0b, 0xd5, 0x98, 0x45, 0xe8, - 0xb3, 0x78, 0x98, 0x4f, 0x7b, 0x49, 0xa3, 0x0d, 0x93, 0x20, 0xdb, 0xb0, 0xb0, 0x47, 0x5b, 0xcd, - 0xd8, 0xe3, 0xcd, 0x01, 0x1e, 0xbb, 0x0e, 0x41, 0xa1, 0x99, 0x72, 0x0d, 0xcc, 0x7d, 0x1c, 0x64, - 0x65, 0x43, 0x78, 0x6f, 0x21, 0x0f, 0x51, 0x87, 0xea, 0xe8, 0x7e, 0x0b, 0x51, 0x06, 0x2f, 0x82, - 0xe9, 0x10, 0xc2, 0xb1, 0xf3, 0xd2, 0x25, 0x69, 0x61, 0x46, 0xff, 0x1f, 0xff, 0x5e, 0xb3, 0x95, - 0x87, 0x60, 0x3e, 0xdd, 0x93, 0xfa, 0xd8, 0xa3, 0x08, 0x7e, 0x0e, 0x4e, 0xd5, 0xc3, 0x23, 0x83, - 0x32, 0x93, 0x21, 0xee, 0x3f, 0x5b, 0x5a, 0x54, 0x0f, 0x4b, 0x7c, 0x7b, 0x49, 0xed, 0xc1, 0xba, - 0x1b, 0xf8, 0x55, 0x4e, 0x3c, 0x7b, 0x59, 0xcc, 0xe9, 0xff, 0xaf, 0x27, 0xce, 0x94, 0x79, 0x20, - 0x77, 0x05, 0xdf, 0x08, 0xe0, 0x22, 0xd6, 0x8a, 0xd9, 0x23, 0x2a, 0xba, 0x15, 0xcc, 0x2a, 0x60, - 0x8a, 0x87, 0xa7, 0x79, 0xe9, 0xd2, 0xe4, 0xc2, 0x6c, 0xe9, 0xaa, 0x9a, 0xa1, 0x16, 0x54, 0x0e, - 0xa2, 0x0b, 0x4f, 0xe5, 0x0a, 0x78, 0xbb, 0x3f, 0xc4, 0x5d, 0x66, 0x12, 0xb6, 0x4d, 0xb0, 0x8f, - 0xa9, 0xe9, 0xc6, 0x6c, 0x1e, 0x4b, 0x60, 0x61, 0xb8, 0xad, 0xe0, 0xf6, 0x05, 0x98, 0xf1, 0xa3, - 0x43, 0x91, 0xb1, 0x1b, 0xd9, 0xe8, 0x09, 0xf0, 0xb2, 0x6d, 0x3b, 0x41, 0x91, 0x76, 0xa0, 0x3b, - 0x80, 0xca, 0x02, 0x78, 0x2b, 0x8d, 0x09, 0xf6, 0xfb, 0x48, 0x7f, 0x2f, 0xa5, 0x0b, 0xec, 0x32, - 0x8d, 0x7f, 0xe9, 0x3e, 0xce, 0xab, 0x23, 0x71, 0xd6, 0x51, 0x13, 0xb7, 0x4d, 0x37, 0x95, 0xf2, - 0x1a, 0x38, 0xc9, 0x43, 0x0f, 0x28, 0x45, 0x38, 0x07, 0x66, 0x2c, 0xd7, 0x41, 0x1e, 0x0b, 0xee, - 0x26, 0xf8, 0xdd, 0x74, 0x78, 0x50, 0xb3, 0x95, 0x1f, 0x24, 0xf0, 0x06, 0x57, 0xf2, 0x89, 0xe9, - 0x3a, 0xb6, 0xc9, 0x30, 0x49, 0xa4, 0x8a, 0x0c, 0x2f, 0x74, 0xb8, 0x0a, 0xce, 0x46, 0xa4, 0x0d, - 0xd3, 0xb6, 0x09, 0xa2, 0x34, 0x0c, 0x52, 0x81, 0xff, 0xbc, 0x2c, 0x9e, 0xde, 0x33, 0x9b, 0xee, - 0x8a, 0x22, 0x2e, 0x14, 0xfd, 0x4c, 0x64, 0x5b, 0x0e, 0x4f, 0x56, 0xa6, 0x1f, 0x3f, 0x2d, 0xe6, - 0xfe, 0x7c, 0x5a, 0xcc, 0x29, 0x77, 0x80, 0x32, 0x88, 0x88, 0xc8, 0xe6, 0x15, 0x70, 0x36, 0x7a, - 0xca, 0x71, 0xb8, 0x90, 0xd1, 0x19, 0x2b, 0x61, 0x1f, 0x04, 0xeb, 0x97, 0xb6, 0x9d, 0x08, 0x9e, - 0x4d, 0x5a, 0x5f, 0xac, 0x01, 0xd2, 0x7a, 0xe2, 0x0f, 0x92, 0xd6, 0x4d, 0xa4, 0x23, 0xad, 0x2f, - 0x93, 0x42, 0x5a, 0x4f, 0xd6, 0x94, 0x39, 0x70, 0x91, 0x03, 0xde, 0x6b, 0x10, 0xcc, 0x98, 0x8b, - 0xf8, 0xb3, 0x8f, 0x8a, 0xf3, 0x17, 0x49, 0x3c, 0xff, 0x9e, 0x5b, 0x11, 0xa6, 0x08, 0x66, 0xa9, - 0x6b, 0xd2, 0x86, 0xd1, 0x44, 0x0c, 0x11, 0x1e, 0x61, 0x52, 0x07, 0xfc, 0xe8, 0x76, 0x70, 0x02, - 0x4b, 0xe0, 0xd5, 0x84, 0x81, 0x61, 0xba, 0x2e, 0xde, 0x35, 0x3d, 0x0b, 0x71, 0xed, 0x93, 0xfa, - 0xb9, 0x8e, 0x69, 0x39, 0xba, 0x82, 0x5f, 0x82, 0xbc, 0x87, 0x1e, 0x30, 0x83, 0x20, 0xdf, 0x45, - 0x9e, 0x43, 0x1b, 0x86, 0x65, 0x7a, 0x76, 0x20, 0x16, 0xe5, 0x27, 0x79, 0xcd, 0xcb, 0x6a, 0xd8, - 0xf9, 0xd5, 0xa8, 0xf3, 0xab, 0xf7, 0xa2, 0xce, 0x5f, 0x99, 0x0e, 0x7a, 0xd8, 0x93, 0xdf, 0x8a, - 0x92, 0x7e, 0x21, 0x40, 0xd1, 0x23, 0x90, 0x8d, 0x08, 0x43, 0x79, 0x17, 0x5c, 0xe5, 0x92, 0x74, - 0x54, 0x77, 0x28, 0x43, 0x04, 0xd9, 0x9d, 0xd7, 0xb1, 0x6b, 0x12, 0xbb, 0x8a, 0x3c, 0xdc, 0x8c, - 0x9f, 0xe7, 0x26, 0x78, 0x27, 0x93, 0xb5, 0xc8, 0xc8, 0x05, 0x30, 0x65, 0xf3, 0x13, 0xde, 0xf1, - 0x66, 0x74, 0xf1, 0x4d, 0x29, 0x88, 0x1e, 0x1e, 0xbe, 0x3c, 0x64, 0xf3, 0x97, 0x56, 0xab, 0xc6, - 0x61, 0x1e, 0x49, 0xe0, 0xf5, 0x43, 0x0c, 0x04, 0xf2, 0x57, 0xe0, 0xb4, 0x9f, 0xbc, 0x8b, 0x7a, - 0x6a, 0x29, 0x53, 0x03, 0xe8, 0x82, 0x15, 0x8d, 0xbe, 0x07, 0x4f, 0xa9, 0x81, 0x53, 0x5d, 0x66, - 0x30, 0x0f, 0x44, 0xfd, 0x56, 0xbb, 0xcb, 0xb9, 0x0a, 0x0b, 0x00, 0x44, 0x8d, 0xa3, 0x56, 0xe5, - 0x3f, 0xe6, 0x09, 0x3d, 0x71, 0x52, 0xfa, 0xee, 0x15, 0x70, 0x92, 0xcb, 0x81, 0xfb, 0x12, 0x38, - 0x9f, 0x36, 0xbd, 0xe0, 0x7a, 0x26, 0xde, 0x03, 0x46, 0xa6, 0x5c, 0x3e, 0x02, 0x42, 0x98, 0x54, - 0x65, 0xf3, 0xdb, 0x17, 0x7f, 0xfc, 0x38, 0xb1, 0x06, 0x57, 0x87, 0x6f, 0x35, 0xf1, 0xf3, 0x15, - 0xe3, 0x51, 0x7b, 0x18, 0xbd, 0xf5, 0x6f, 0xe0, 0x0b, 0x09, 0x9c, 0x4b, 0x99, 0x83, 0x70, 0x6d, - 0x74, 0x86, 0x5d, 0xf3, 0x55, 0x5e, 0x1f, 0x1f, 0x40, 0x28, 0xbc, 0xce, 0x15, 0x2e, 0xc3, 0xa5, - 0x11, 0x14, 0x86, 0x93, 0x17, 0x3e, 0x9a, 0x00, 0xf9, 0x43, 0xc6, 0x29, 0x85, 0xb7, 0xc6, 0x64, - 0x96, 0x3a, 0xb9, 0xe5, 0xdb, 0xc7, 0x84, 0x26, 0x44, 0x7f, 0xc4, 0x45, 0x57, 0xe0, 0xfa, 0xa8, - 0xa2, 0x83, 0x05, 0x8a, 0x30, 0x23, 0x1e, 0x8a, 0xf0, 0x5f, 0x09, 0xbc, 0x96, 0x3e, 0x9d, 0x29, - 0xbc, 0x39, 0x36, 0xe9, 0xfe, 0x35, 0x40, 0xbe, 0x75, 0x3c, 0x60, 0x22, 0x01, 0x5b, 0x3c, 0x01, - 0x65, 0xb8, 0x36, 0x46, 0x02, 0xb0, 0x9f, 0xd0, 0xff, 0x77, 0x34, 0x00, 0x52, 0x47, 0x29, 0xfc, - 0x30, 0x3b, 0xeb, 0x41, 0x4b, 0x81, 0xbc, 0x75, 0x64, 0x1c, 0x21, 0xbc, 0xcc, 0x85, 0xbf, 0x0f, - 0xaf, 0x67, 0xf8, 0x9b, 0x12, 0x01, 0x19, 0x5d, 0x93, 0x39, 0x45, 0x72, 0x72, 0xc4, 0x8e, 0x25, - 0x39, 0x65, 0x59, 0x18, 0x4b, 0x72, 0xda, 0xac, 0x1f, 0x4f, 0x72, 0xd7, 0x76, 0x00, 0x7f, 0x96, - 0x00, 0xec, 0x1f, 0xf3, 0xf0, 0x46, 0x76, 0x8a, 0x69, 0xdb, 0x83, 0xbc, 0x36, 0xb6, 0xbf, 0x90, - 0x76, 0x8d, 0x4b, 0x2b, 0xc1, 0xc5, 0xe1, 0xd2, 0x98, 0x00, 0x08, 0xff, 0x02, 0xc1, 0x9f, 0x26, - 0xc0, 0xe5, 0x0c, 0x73, 0x1b, 0xde, 0xc9, 0x4e, 0x31, 0xd3, 0xbe, 0x20, 0x6f, 0x1f, 0x1f, 0xa0, - 0x48, 0xc2, 0x4d, 0x9e, 0x84, 0x4d, 0xb8, 0x31, 0x3c, 0x09, 0x24, 0x46, 0xec, 0xd4, 0x34, 0xe1, - 0x98, 0x46, 0xb8, 0x87, 0xc0, 0xbf, 0xfa, 0xf6, 0x8c, 0x64, 0x33, 0xa9, 0x55, 0x29, 0x1c, 0x61, - 0xaa, 0x1e, 0xb2, 0xcc, 0xc8, 0x95, 0xa3, 0x40, 0x08, 0xd5, 0x15, 0xae, 0xfa, 0x03, 0xb8, 0x32, - 0x5c, 0x75, 0xb4, 0xc6, 0x18, 0x3d, 0x03, 0xac, 0xf2, 0xe9, 0xb3, 0xfd, 0x82, 0xf4, 0x7c, 0xbf, - 0x20, 0xfd, 0xbe, 0x5f, 0x90, 0x9e, 0x1c, 0x14, 0x72, 0xcf, 0x0f, 0x0a, 0xb9, 0x5f, 0x0f, 0x0a, - 0xb9, 0xcf, 0x56, 0xeb, 0x0e, 0x6b, 0xb4, 0x76, 0x54, 0x0b, 0x37, 0x35, 0x0b, 0xd3, 0x26, 0xa6, - 0x89, 0x30, 0xef, 0xc5, 0x61, 0xda, 0xcb, 0xda, 0x83, 0x9e, 0x32, 0xdb, 0xf3, 0x11, 0xdd, 0x99, - 0xe2, 0x8b, 0xe7, 0xf2, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc2, 0x02, 0x37, 0x01, 0x0c, 0x11, - 0x00, 0x00, + // 1285 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcf, 0x73, 0xdb, 0x44, + 0x14, 0xb6, 0x92, 0xb6, 0x24, 0x5b, 0xfa, 0x83, 0x6d, 0x29, 0xae, 0x5a, 0xec, 0x56, 0x1d, 0x20, + 0x2d, 0x20, 0x25, 0xce, 0x30, 0xd3, 0x1f, 0xa4, 0xa9, 0x1d, 0xb7, 0xc5, 0xd3, 0x74, 0x1a, 0xd4, + 0x50, 0x66, 0x80, 0x41, 0x6c, 0xa4, 0xc5, 0xd6, 0x8c, 0xac, 0x55, 0x76, 0x65, 0xa7, 0x99, 0x0e, + 0x87, 0x72, 0x80, 0x1e, 0x3b, 0x03, 0x5c, 0x38, 0x95, 0x03, 0xff, 0x4b, 0x6f, 0x94, 0xe9, 0x85, + 0x53, 0x61, 0x12, 0x0e, 0x0c, 0x27, 0x86, 0x3b, 0x33, 0x8c, 0x56, 0x2b, 0xd9, 0xb2, 0x15, 0x5b, + 0x76, 0x72, 0xb3, 0x77, 0xf7, 0x7d, 0xef, 0xfb, 0x9e, 0xde, 0x3e, 0x7d, 0x02, 0x9a, 0xed, 0xfa, + 0x98, 0x9a, 0x0d, 0x64, 0xbb, 0x06, 0xc3, 0x66, 0x8b, 0xda, 0xfe, 0xa6, 0x66, 0x9a, 0x6d, 0xcd, + 0xa3, 0xa4, 0x6d, 0x5b, 0x98, 0x6a, 0xed, 0x39, 0x6d, 0xbd, 0x85, 0xe9, 0xa6, 0xea, 0x51, 0xe2, + 0x13, 0x78, 0x2e, 0x25, 0x40, 0x35, 0xcd, 0xb6, 0x1a, 0x05, 0xa8, 0xed, 0x39, 0xf9, 0x74, 0x9d, + 0x90, 0xba, 0x83, 0x35, 0xe4, 0xd9, 0x1a, 0x72, 0x5d, 0xe2, 0x23, 0xdf, 0x26, 0x2e, 0x0b, 0x21, + 0xe4, 0xe3, 0x75, 0x52, 0x27, 0xfc, 0xa7, 0x16, 0xfc, 0x12, 0xab, 0x45, 0x11, 0xc3, 0xff, 0xad, + 0xb5, 0xbe, 0xd4, 0x7c, 0xbb, 0x89, 0x99, 0x8f, 0x9a, 0x9e, 0x38, 0x50, 0xca, 0x42, 0x35, 0x66, + 0x11, 0xc6, 0xcc, 0xee, 0x14, 0xd3, 0x9e, 0xd3, 0x58, 0x03, 0x51, 0x6c, 0x19, 0x26, 0x71, 0x59, + 0xab, 0x19, 0x47, 0xbc, 0x31, 0x20, 0x62, 0xc3, 0xa6, 0x38, 0x3c, 0xa6, 0x5c, 0x04, 0xa7, 0x3e, + 0x0c, 0xaa, 0xb2, 0x24, 0xa2, 0x6f, 0x62, 0x17, 0x33, 0x9b, 0xe9, 0x78, 0xbd, 0x85, 0x99, 0x0f, + 0x4f, 0x82, 0xa9, 0x10, 0xc2, 0xb6, 0xf2, 0xd2, 0x19, 0x69, 0x66, 0x5a, 0x7f, 0x89, 0xff, 0xaf, + 0x59, 0xca, 0x03, 0x70, 0x3a, 0x3d, 0x92, 0x79, 0xc4, 0x65, 0x18, 0x7e, 0x0a, 0x0e, 0xd5, 0xc3, + 0x25, 0x83, 0xf9, 0xc8, 0xc7, 0x3c, 0xfe, 0x60, 0x69, 0x56, 0xdd, 0xa9, 0xf0, 0xed, 0x39, 0xb5, + 0x07, 0xeb, 0x6e, 0x10, 0x57, 0xd9, 0xf7, 0xf4, 0x45, 0x31, 0xa7, 0xbf, 0x5c, 0xef, 0x5a, 0x53, + 0x4e, 0x03, 0x39, 0x91, 0x7c, 0x29, 0x80, 0x8b, 0x58, 0x2b, 0xa8, 0x47, 0x54, 0xb4, 0x2b, 0x98, + 0x55, 0xc0, 0x01, 0x9e, 0x9e, 0xe5, 0xa5, 0x33, 0x93, 0x33, 0x07, 0x4b, 0x17, 0xd4, 0x0c, 0xbd, + 0xa0, 0x72, 0x10, 0x5d, 0x44, 0x2a, 0xe7, 0xc1, 0x5b, 0xfd, 0x29, 0xee, 0xfa, 0x88, 0xfa, 0x2b, + 0x94, 0x78, 0x84, 0x21, 0x27, 0x66, 0xf3, 0x48, 0x02, 0x33, 0xc3, 0xcf, 0x0a, 0x6e, 0x9f, 0x81, + 0x69, 0x2f, 0x5a, 0x14, 0x15, 0xbb, 0x9a, 0x8d, 0x9e, 0x00, 0x2f, 0x5b, 0x96, 0x1d, 0x34, 0x69, + 0x07, 0xba, 0x03, 0xa8, 0xcc, 0x80, 0x37, 0xd3, 0x98, 0x10, 0xaf, 0x8f, 0xf4, 0x37, 0x52, 0xba, + 0xc0, 0xc4, 0xd1, 0xf8, 0x49, 0xf7, 0x71, 0x5e, 0x18, 0x89, 0xb3, 0x8e, 0x9b, 0xa4, 0x8d, 0x9c, + 0x54, 0xca, 0x8b, 0x60, 0x3f, 0x4f, 0x3d, 0xa0, 0x15, 0xe1, 0x29, 0x30, 0x6d, 0x3a, 0x36, 0x76, + 0xfd, 0x60, 0x6f, 0x82, 0xef, 0x4d, 0x85, 0x0b, 0x35, 0x4b, 0xf9, 0x56, 0x02, 0x67, 0xb9, 0x92, + 0x7b, 0xc8, 0xb1, 0x2d, 0xe4, 0x13, 0xda, 0x55, 0x2a, 0x3a, 0xbc, 0xd1, 0xe1, 0x02, 0x38, 0x1a, + 0x91, 0x36, 0x90, 0x65, 0x51, 0xcc, 0x58, 0x98, 0xa4, 0x02, 0xff, 0x7d, 0x51, 0x3c, 0xbc, 0x89, + 0x9a, 0xce, 0x65, 0x45, 0x6c, 0x28, 0xfa, 0x91, 0xe8, 0x6c, 0x39, 0x5c, 0xb9, 0x3c, 0xf5, 0xe8, + 0x49, 0x31, 0xf7, 0xd7, 0x93, 0x62, 0x4e, 0xb9, 0x03, 0x94, 0x41, 0x44, 0x44, 0x35, 0xcf, 0x83, + 0xa3, 0xd1, 0x55, 0x8e, 0xd3, 0x85, 0x8c, 0x8e, 0x98, 0x5d, 0xe7, 0x83, 0x64, 0xfd, 0xd2, 0x56, + 0xba, 0x92, 0x67, 0x93, 0xd6, 0x97, 0x6b, 0x80, 0xb4, 0x9e, 0xfc, 0x83, 0xa4, 0x25, 0x89, 0x74, + 0xa4, 0xf5, 0x55, 0x52, 0x48, 0xeb, 0xa9, 0x9a, 0x72, 0x0a, 0x9c, 0xe4, 0x80, 0xab, 0x0d, 0x4a, + 0x7c, 0xdf, 0xc1, 0xfc, 0xda, 0x47, 0xcd, 0xf9, 0xab, 0x24, 0xae, 0x7f, 0xcf, 0xae, 0x48, 0x53, + 0x04, 0x07, 0x99, 0x83, 0x58, 0xc3, 0x68, 0x62, 0x1f, 0x53, 0x9e, 0x61, 0x52, 0x07, 0x7c, 0xe9, + 0x76, 0xb0, 0x02, 0x4b, 0xe0, 0xd5, 0xae, 0x03, 0x06, 0x72, 0x1c, 0xb2, 0x81, 0x5c, 0x13, 0x73, + 0xed, 0x93, 0xfa, 0xb1, 0xce, 0xd1, 0x72, 0xb4, 0x05, 0x3f, 0x07, 0x79, 0x17, 0xdf, 0xf7, 0x0d, + 0x8a, 0x3d, 0x07, 0xbb, 0x36, 0x6b, 0x18, 0x26, 0x72, 0xad, 0x40, 0x2c, 0xce, 0x4f, 0xf2, 0x9e, + 0x97, 0xd5, 0x70, 0xf2, 0xab, 0xd1, 0xe4, 0x57, 0x57, 0xa3, 0xc9, 0x5f, 0x99, 0x0a, 0x66, 0xd8, + 0xe3, 0xdf, 0x8b, 0x92, 0x7e, 0x22, 0x40, 0xd1, 0x23, 0x90, 0xa5, 0x08, 0x43, 0x79, 0x07, 0x5c, + 0xe0, 0x92, 0x74, 0x5c, 0xb7, 0x99, 0x8f, 0x29, 0xb6, 0x3a, 0xb7, 0x63, 0x03, 0x51, 0xab, 0x8a, + 0x5d, 0xd2, 0x8c, 0xaf, 0xe7, 0x75, 0xf0, 0x76, 0xa6, 0xd3, 0xa2, 0x22, 0x27, 0xc0, 0x01, 0x8b, + 0xaf, 0xf0, 0x89, 0x37, 0xad, 0x8b, 0x7f, 0x4a, 0x41, 0xcc, 0xf0, 0xf0, 0xe6, 0x61, 0x8b, 0xdf, + 0xb4, 0x5a, 0x35, 0x4e, 0xf3, 0x50, 0x02, 0xaf, 0xef, 0x70, 0x40, 0x20, 0x7f, 0x01, 0x0e, 0x7b, + 0xdd, 0x7b, 0xd1, 0x4c, 0x2d, 0x65, 0x1a, 0x00, 0x09, 0x58, 0x31, 0xe8, 0x7b, 0xf0, 0x94, 0x1a, + 0x38, 0x94, 0x38, 0x06, 0xf3, 0x40, 0xf4, 0x6f, 0x35, 0xd9, 0xce, 0x55, 0x58, 0x00, 0x20, 0x1a, + 0x1c, 0xb5, 0x2a, 0x7f, 0x98, 0xfb, 0xf4, 0xae, 0x15, 0x65, 0x19, 0x68, 0x5c, 0x4d, 0xd9, 0x71, + 0x56, 0x90, 0x4d, 0xd9, 0x3d, 0xe4, 0x2c, 0x11, 0x37, 0x68, 0xb9, 0x4a, 0x72, 0xce, 0xd5, 0xaa, + 0x19, 0x5e, 0x80, 0x3f, 0x4b, 0x60, 0x36, 0x3b, 0x9c, 0xa8, 0xd7, 0x3a, 0x78, 0xc5, 0x43, 0x36, + 0x35, 0xda, 0xc8, 0x09, 0xde, 0xd8, 0xfc, 0x1a, 0x88, 0x92, 0xdd, 0xc8, 0x56, 0x32, 0x64, 0xd3, + 0x4e, 0xa2, 0xf8, 0x9a, 0xb9, 0x9d, 0x06, 0x38, 0xec, 0x25, 0x8e, 0x28, 0x3f, 0x49, 0xe0, 0xec, + 0xd0, 0xa8, 0xd4, 0x29, 0x27, 0x65, 0x9e, 0x72, 0xbb, 0x9c, 0x24, 0xa5, 0x1f, 0x8f, 0x81, 0xfd, + 0xbc, 0x96, 0x70, 0x4b, 0x02, 0xc7, 0xd3, 0x7c, 0x05, 0xbc, 0x96, 0xa9, 0x3c, 0x03, 0xcc, 0x8c, + 0x5c, 0xde, 0x05, 0x42, 0xf8, 0xf8, 0x94, 0xeb, 0x5f, 0x3f, 0xff, 0xf3, 0xbb, 0x89, 0x45, 0xb8, + 0x30, 0xdc, 0x6f, 0xc6, 0xe5, 0x10, 0xc6, 0x45, 0x7b, 0x10, 0x35, 0xd2, 0x57, 0xf0, 0xb9, 0x04, + 0x8e, 0xa5, 0x38, 0x14, 0xb8, 0x38, 0x3a, 0xc3, 0x84, 0xf3, 0x91, 0xaf, 0x8d, 0x0f, 0x20, 0x14, + 0x5e, 0xe2, 0x0a, 0xe7, 0xe1, 0xdc, 0x08, 0x0a, 0x43, 0x4f, 0x04, 0x1f, 0x4e, 0x80, 0xfc, 0x0e, + 0x46, 0x87, 0xc1, 0xe5, 0x31, 0x99, 0xa5, 0x7a, 0x2a, 0xf9, 0xf6, 0x1e, 0xa1, 0x09, 0xd1, 0x1f, + 0x70, 0xd1, 0x15, 0x78, 0x6d, 0x54, 0xd1, 0x81, 0xb5, 0xa5, 0xbe, 0x11, 0xdb, 0x15, 0xf8, 0x9f, + 0x04, 0x5e, 0x4b, 0xf7, 0x4d, 0x0c, 0xde, 0x1a, 0x9b, 0x74, 0xbf, 0x41, 0x93, 0x97, 0xf7, 0x06, + 0x4c, 0x14, 0xe0, 0x26, 0x2f, 0x40, 0x19, 0x2e, 0x8e, 0x51, 0x00, 0xe2, 0x75, 0xe9, 0xff, 0x27, + 0x7a, 0x35, 0xa7, 0x9a, 0x1c, 0x78, 0x23, 0x3b, 0xeb, 0x41, 0x76, 0x4d, 0xbe, 0xb9, 0x6b, 0x1c, + 0x21, 0xbc, 0xcc, 0x85, 0x5f, 0x81, 0x97, 0x32, 0x7c, 0x40, 0x46, 0x40, 0x46, 0x62, 0xd2, 0xa5, + 0x48, 0xee, 0x36, 0x3f, 0x63, 0x49, 0x4e, 0xb1, 0x71, 0x63, 0x49, 0x4e, 0x73, 0x61, 0xe3, 0x49, + 0x4e, 0xbc, 0x1b, 0xe0, 0x2f, 0x12, 0x80, 0xfd, 0x06, 0x0c, 0x5e, 0xcd, 0x4e, 0x31, 0xcd, 0xd7, + 0xc9, 0x8b, 0x63, 0xc7, 0x0b, 0x69, 0x17, 0xb9, 0xb4, 0x12, 0x9c, 0x1d, 0x2e, 0xcd, 0x17, 0x00, + 0xe1, 0xc7, 0x29, 0xfc, 0x61, 0x02, 0x9c, 0xcb, 0xe0, 0xa8, 0xe0, 0x9d, 0xec, 0x14, 0x33, 0x39, + 0x39, 0x79, 0x65, 0xef, 0x00, 0x45, 0x11, 0x6e, 0xf1, 0x22, 0x5c, 0x87, 0x4b, 0xc3, 0x8b, 0x40, + 0x63, 0xc4, 0x4e, 0x4f, 0x53, 0x8e, 0x69, 0x84, 0x0e, 0x11, 0xfe, 0xdd, 0xe7, 0x00, 0x93, 0xc6, + 0x86, 0xc1, 0x11, 0xde, 0xaa, 0x3b, 0xd8, 0x4c, 0xb9, 0xb2, 0x1b, 0x08, 0xa1, 0xba, 0xc2, 0x55, + 0xbf, 0x0f, 0x2f, 0x0f, 0x57, 0x1d, 0x19, 0x4c, 0xa3, 0xf7, 0x05, 0xf6, 0xfd, 0x84, 0xf8, 0x52, + 0xcf, 0xe0, 0xe8, 0xe0, 0x6a, 0x76, 0xd2, 0xd9, 0xfd, 0xa6, 0xfc, 0xd1, 0x1e, 0xa3, 0x8a, 0xea, + 0x5c, 0xe1, 0xd5, 0x79, 0x0f, 0xce, 0x8f, 0x3c, 0xdf, 0x6d, 0xab, 0xf2, 0xf1, 0xd3, 0xad, 0x82, + 0xf4, 0x6c, 0xab, 0x20, 0xfd, 0xb1, 0x55, 0x90, 0x1e, 0x6f, 0x17, 0x72, 0xcf, 0xb6, 0x0b, 0xb9, + 0xdf, 0xb6, 0x0b, 0xb9, 0x4f, 0x16, 0xea, 0xb6, 0xdf, 0x68, 0xad, 0xa9, 0x26, 0x69, 0x6a, 0x26, + 0x61, 0x4d, 0xc2, 0xba, 0xf0, 0xdf, 0x8d, 0xf1, 0xdb, 0xf3, 0xda, 0xfd, 0x9e, 0xdb, 0xb7, 0xe9, + 0x61, 0xb6, 0x76, 0x80, 0x7f, 0x29, 0xcd, 0xff, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x56, 0xba, 0x85, + 0x15, 0xbd, 0x13, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1055,6 +1216,9 @@ type QueryClient interface { // QueryProposedConsumerChainIDs returns the chain IDs of the proposed consumer chain addition proposals // that are still in the voting period QueryProposedConsumerChainIDs(ctx context.Context, in *QueryProposedChainIDsRequest, opts ...grpc.CallOption) (*QueryProposedChainIDsResponse, error) + // QueryAllPairsValConAddrByConsumerChainID returns a list of pair valconsensus address + // between provider and consumer chain + QueryAllPairsValConAddrByConsumerChainID(ctx context.Context, in *QueryAllPairsValConAddrByConsumerChainIDRequest, opts ...grpc.CallOption) (*QueryAllPairsValConAddrByConsumerChainIDResponse, error) } type queryClient struct { @@ -1146,6 +1310,15 @@ func (c *queryClient) QueryProposedConsumerChainIDs(ctx context.Context, in *Que return out, nil } +func (c *queryClient) QueryAllPairsValConAddrByConsumerChainID(ctx context.Context, in *QueryAllPairsValConAddrByConsumerChainIDRequest, opts ...grpc.CallOption) (*QueryAllPairsValConAddrByConsumerChainIDResponse, error) { + out := new(QueryAllPairsValConAddrByConsumerChainIDResponse) + err := c.cc.Invoke(ctx, "/interchain_security.ccv.provider.v1.Query/QueryAllPairsValConAddrByConsumerChainID", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // QueryServer is the server API for Query service. type QueryServer interface { // ConsumerGenesis queries the genesis state needed to start a consumer chain @@ -1173,6 +1346,9 @@ type QueryServer interface { // QueryProposedConsumerChainIDs returns the chain IDs of the proposed consumer chain addition proposals // that are still in the voting period QueryProposedConsumerChainIDs(context.Context, *QueryProposedChainIDsRequest) (*QueryProposedChainIDsResponse, error) + // QueryAllPairsValConAddrByConsumerChainID returns a list of pair valconsensus address + // between provider and consumer chain + QueryAllPairsValConAddrByConsumerChainID(context.Context, *QueryAllPairsValConAddrByConsumerChainIDRequest) (*QueryAllPairsValConAddrByConsumerChainIDResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. @@ -1206,6 +1382,9 @@ func (*UnimplementedQueryServer) QueryRegisteredConsumerRewardDenoms(ctx context func (*UnimplementedQueryServer) QueryProposedConsumerChainIDs(ctx context.Context, req *QueryProposedChainIDsRequest) (*QueryProposedChainIDsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method QueryProposedConsumerChainIDs not implemented") } +func (*UnimplementedQueryServer) QueryAllPairsValConAddrByConsumerChainID(ctx context.Context, req *QueryAllPairsValConAddrByConsumerChainIDRequest) (*QueryAllPairsValConAddrByConsumerChainIDResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method QueryAllPairsValConAddrByConsumerChainID not implemented") +} func RegisterQueryServer(s grpc1.Server, srv QueryServer) { s.RegisterService(&_Query_serviceDesc, srv) @@ -1373,6 +1552,24 @@ func _Query_QueryProposedConsumerChainIDs_Handler(srv interface{}, ctx context.C return interceptor(ctx, in, info, handler) } +func _Query_QueryAllPairsValConAddrByConsumerChainID_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryAllPairsValConAddrByConsumerChainIDRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(QueryServer).QueryAllPairsValConAddrByConsumerChainID(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/interchain_security.ccv.provider.v1.Query/QueryAllPairsValConAddrByConsumerChainID", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(QueryServer).QueryAllPairsValConAddrByConsumerChainID(ctx, req.(*QueryAllPairsValConAddrByConsumerChainIDRequest)) + } + return interceptor(ctx, in, info, handler) +} + var _Query_serviceDesc = grpc.ServiceDesc{ ServiceName: "interchain_security.ccv.provider.v1.Query", HandlerType: (*QueryServer)(nil), @@ -1413,6 +1610,10 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "QueryProposedConsumerChainIDs", Handler: _Query_QueryProposedConsumerChainIDs_Handler, }, + { + MethodName: "QueryAllPairsValConAddrByConsumerChainID", + Handler: _Query_QueryAllPairsValConAddrByConsumerChainID_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "interchain_security/ccv/provider/v1/query.proto", @@ -2042,6 +2243,110 @@ func (m *ProposedChain) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *QueryAllPairsValConAddrByConsumerChainIDRequest) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *QueryAllPairsValConAddrByConsumerChainIDRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryAllPairsValConAddrByConsumerChainIDRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.ChainId) > 0 { + i -= len(m.ChainId) + copy(dAtA[i:], m.ChainId) + i = encodeVarintQuery(dAtA, i, uint64(len(m.ChainId))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *QueryAllPairsValConAddrByConsumerChainIDResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *QueryAllPairsValConAddrByConsumerChainIDResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *QueryAllPairsValConAddrByConsumerChainIDResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.PairValConAddr) > 0 { + for iNdEx := len(m.PairValConAddr) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.PairValConAddr[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + +func (m *PairValConAddrProviderAndConsumer) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *PairValConAddrProviderAndConsumer) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *PairValConAddrProviderAndConsumer) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.ConsumerAddress) > 0 { + i -= len(m.ConsumerAddress) + copy(dAtA[i:], m.ConsumerAddress) + i = encodeVarintQuery(dAtA, i, uint64(len(m.ConsumerAddress))) + i-- + dAtA[i] = 0x12 + } + if len(m.ProviderAddress) > 0 { + i -= len(m.ProviderAddress) + copy(dAtA[i:], m.ProviderAddress) + i = encodeVarintQuery(dAtA, i, uint64(len(m.ProviderAddress))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { offset -= sovQuery(v) base := offset @@ -2312,6 +2617,51 @@ func (m *ProposedChain) Size() (n int) { return n } +func (m *QueryAllPairsValConAddrByConsumerChainIDRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.ChainId) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + +func (m *QueryAllPairsValConAddrByConsumerChainIDResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.PairValConAddr) > 0 { + for _, e := range m.PairValConAddr { + l = e.Size() + n += 1 + l + sovQuery(uint64(l)) + } + } + return n +} + +func (m *PairValConAddrProviderAndConsumer) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.ProviderAddress) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.ConsumerAddress) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + func sovQuery(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -3933,6 +4283,286 @@ func (m *ProposedChain) Unmarshal(dAtA []byte) error { } return nil } +func (m *QueryAllPairsValConAddrByConsumerChainIDRequest) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryAllPairsValConAddrByConsumerChainIDRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryAllPairsValConAddrByConsumerChainIDRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ChainId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *QueryAllPairsValConAddrByConsumerChainIDResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: QueryAllPairsValConAddrByConsumerChainIDResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: QueryAllPairsValConAddrByConsumerChainIDResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PairValConAddr", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.PairValConAddr = append(m.PairValConAddr, &PairValConAddrProviderAndConsumer{}) + if err := m.PairValConAddr[len(m.PairValConAddr)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *PairValConAddrProviderAndConsumer) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: PairValConAddrProviderAndConsumer: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: PairValConAddrProviderAndConsumer: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProviderAddress", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ProviderAddress = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ConsumerAddress", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ConsumerAddress = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipQuery(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/x/ccv/provider/types/query.pb.gw.go b/x/ccv/provider/types/query.pb.gw.go index f16dc6181d..a3ded021ed 100644 --- a/x/ccv/provider/types/query.pb.gw.go +++ b/x/ccv/provider/types/query.pb.gw.go @@ -267,6 +267,42 @@ func local_request_Query_QueryProposedConsumerChainIDs_0(ctx context.Context, ma } +var ( + filter_Query_QueryAllPairsValConAddrByConsumerChainID_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) + +func request_Query_QueryAllPairsValConAddrByConsumerChainID_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllPairsValConAddrByConsumerChainIDRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_QueryAllPairsValConAddrByConsumerChainID_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.QueryAllPairsValConAddrByConsumerChainID(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_QueryAllPairsValConAddrByConsumerChainID_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryAllPairsValConAddrByConsumerChainIDRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_QueryAllPairsValConAddrByConsumerChainID_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.QueryAllPairsValConAddrByConsumerChainID(ctx, &protoReq) + return msg, metadata, err + +} + // RegisterQueryHandlerServer registers the http handlers for service Query to "mux". // UnaryRPC :call QueryServer directly. // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906. @@ -480,6 +516,29 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) + mux.Handle("GET", pattern_Query_QueryAllPairsValConAddrByConsumerChainID_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + var stream runtime.ServerTransportStream + ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateIncomingContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := local_request_Query_QueryAllPairsValConAddrByConsumerChainID_0(rctx, inboundMarshaler, server, req, pathParams) + md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_QueryAllPairsValConAddrByConsumerChainID_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } @@ -701,6 +760,26 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) + mux.Handle("GET", pattern_Query_QueryAllPairsValConAddrByConsumerChainID_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + ctx, cancel := context.WithCancel(req.Context()) + defer cancel() + inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) + rctx, err := runtime.AnnotateContext(ctx, mux, req) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + resp, md, err := request_Query_QueryAllPairsValConAddrByConsumerChainID_0(rctx, inboundMarshaler, client, req, pathParams) + ctx = runtime.NewServerMetadataContext(ctx, md) + if err != nil { + runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) + return + } + + forward_Query_QueryAllPairsValConAddrByConsumerChainID_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + + }) + return nil } @@ -722,6 +801,8 @@ var ( pattern_Query_QueryRegisteredConsumerRewardDenoms_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"interchain_security", "ccv", "provider", "registered_consumer_reward_denoms"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_QueryProposedConsumerChainIDs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"interchain_security", "ccv", "provider", "proposed_consumer_chains"}, "", runtime.AssumeColonVerbOpt(false))) + + pattern_Query_QueryAllPairsValConAddrByConsumerChainID_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"interchain_security", "ccv", "provider", "consumer_chain_id"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( @@ -742,4 +823,6 @@ var ( forward_Query_QueryRegisteredConsumerRewardDenoms_0 = runtime.ForwardResponseMessage forward_Query_QueryProposedConsumerChainIDs_0 = runtime.ForwardResponseMessage + + forward_Query_QueryAllPairsValConAddrByConsumerChainID_0 = runtime.ForwardResponseMessage ) From d25fa28e001df63ab11badbd9f584ebf462b485e Mon Sep 17 00:00:00 2001 From: Du Nguyen Date: Wed, 13 Dec 2023 19:56:01 +0700 Subject: [PATCH 2/9] Lint --- x/ccv/provider/keeper/grpc_query.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/ccv/provider/keeper/grpc_query.go b/x/ccv/provider/keeper/grpc_query.go index 5d8ed8b5bc..3a3e4eed4f 100644 --- a/x/ccv/provider/keeper/grpc_query.go +++ b/x/ccv/provider/keeper/grpc_query.go @@ -199,7 +199,7 @@ func (k Keeper) QueryAllPairsValConAddrByConsumerChainID(goCtx context.Context, ConsumerAddress: string(data.ConsumerAddr), }) } - return &types.QueryAllPairsValConAddrByConsumerChainIDResponse{ + return &types.QueryAllPairsValConAddrByConsumerChainIDResponse{ PairValConAddr: pairValConAddrs, }, nil } From a5647a8a7d244f9ca7f0fac8a7028c914ec79c16 Mon Sep 17 00:00:00 2001 From: ThanhNhann Date: Wed, 13 Dec 2023 22:07:10 +0700 Subject: [PATCH 3/9] add pubkey in PairValConAddrProviderAndConsumer struct --- .../ccv/provider/v1/query.proto | 2 + x/ccv/provider/keeper/grpc_query.go | 2 + x/ccv/provider/types/query.pb.go | 230 +++++++++++------- 3 files changed, 151 insertions(+), 83 deletions(-) diff --git a/proto/interchain_security/ccv/provider/v1/query.proto b/proto/interchain_security/ccv/provider/v1/query.proto index a9bc7badc1..58f1b88335 100644 --- a/proto/interchain_security/ccv/provider/v1/query.proto +++ b/proto/interchain_security/ccv/provider/v1/query.proto @@ -9,6 +9,7 @@ import "google/protobuf/timestamp.proto"; import "interchain_security/ccv/provider/v1/provider.proto"; import "interchain_security/ccv/v1/shared_consumer.proto"; import "interchain_security/ccv/v1/wire.proto"; +import "tendermint/crypto/keys.proto"; service Query { // ConsumerGenesis queries the genesis state needed to start a consumer chain @@ -195,4 +196,5 @@ message PairValConAddrProviderAndConsumer { string provider_address = 1 [ (gogoproto.moretags) = "yaml:\"address\"" ]; // The consensus address of the validator on the consumer chain string consumer_address = 2 [ (gogoproto.moretags) = "yaml:\"address\"" ]; + tendermint.crypto.PublicKey consumer_key = 3; } diff --git a/x/ccv/provider/keeper/grpc_query.go b/x/ccv/provider/keeper/grpc_query.go index 3a3e4eed4f..68b400890f 100644 --- a/x/ccv/provider/keeper/grpc_query.go +++ b/x/ccv/provider/keeper/grpc_query.go @@ -194,9 +194,11 @@ func (k Keeper) QueryAllPairsValConAddrByConsumerChainID(goCtx context.Context, ctx := sdk.UnwrapSDKContext(goCtx) validatorConsumerAddrs := k.GetAllValidatorsByConsumerAddr(ctx, &req.ChainId) for _, data := range validatorConsumerAddrs { + pubKey, _, _ := k.GetKeyAssignmentReplacement(ctx, req.ChainId, types.ProviderConsAddress{Address: data.ConsumerAddr}) pairValConAddrs = append(pairValConAddrs, &types.PairValConAddrProviderAndConsumer{ ProviderAddress: string(data.ProviderAddr), ConsumerAddress: string(data.ConsumerAddr), + ConsumerKey: &pubKey, }) } return &types.QueryAllPairsValConAddrByConsumerChainIDResponse{ diff --git a/x/ccv/provider/types/query.pb.go b/x/ccv/provider/types/query.pb.go index a0495bc2de..43d9afd887 100644 --- a/x/ccv/provider/types/query.pb.go +++ b/x/ccv/provider/types/query.pb.go @@ -6,6 +6,7 @@ package types import ( context "context" fmt "fmt" + crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" @@ -1014,7 +1015,8 @@ type PairValConAddrProviderAndConsumer struct { // The consensus address of the validator on the provider chain ProviderAddress string `protobuf:"bytes,1,opt,name=provider_address,json=providerAddress,proto3" json:"provider_address,omitempty" yaml:"address"` // The consensus address of the validator on the consumer chain - ConsumerAddress string `protobuf:"bytes,2,opt,name=consumer_address,json=consumerAddress,proto3" json:"consumer_address,omitempty" yaml:"address"` + ConsumerAddress string `protobuf:"bytes,2,opt,name=consumer_address,json=consumerAddress,proto3" json:"consumer_address,omitempty" yaml:"address"` + ConsumerKey *crypto.PublicKey `protobuf:"bytes,3,opt,name=consumer_key,json=consumerKey,proto3" json:"consumer_key,omitempty"` } func (m *PairValConAddrProviderAndConsumer) Reset() { *m = PairValConAddrProviderAndConsumer{} } @@ -1064,6 +1066,13 @@ func (m *PairValConAddrProviderAndConsumer) GetConsumerAddress() string { return "" } +func (m *PairValConAddrProviderAndConsumer) GetConsumerKey() *crypto.PublicKey { + if m != nil { + return m.ConsumerKey + } + return nil +} + func init() { proto.RegisterType((*QueryConsumerGenesisRequest)(nil), "interchain_security.ccv.provider.v1.QueryConsumerGenesisRequest") proto.RegisterType((*QueryConsumerGenesisResponse)(nil), "interchain_security.ccv.provider.v1.QueryConsumerGenesisResponse") @@ -1095,88 +1104,91 @@ func init() { } var fileDescriptor_422512d7b7586cd7 = []byte{ - // 1285 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcf, 0x73, 0xdb, 0x44, - 0x14, 0xb6, 0x92, 0xb6, 0x24, 0x5b, 0xfa, 0x83, 0x6d, 0x29, 0xae, 0x5a, 0xec, 0x56, 0x1d, 0x20, - 0x2d, 0x20, 0x25, 0xce, 0x30, 0xd3, 0x1f, 0xa4, 0xa9, 0x1d, 0xb7, 0xc5, 0xd3, 0x74, 0x1a, 0xd4, - 0x50, 0x66, 0x80, 0x41, 0x6c, 0xa4, 0xc5, 0xd6, 0x8c, 0xac, 0x55, 0x76, 0x65, 0xa7, 0x99, 0x0e, - 0x87, 0x72, 0x80, 0x1e, 0x3b, 0x03, 0x5c, 0x38, 0x95, 0x03, 0xff, 0x4b, 0x6f, 0x94, 0xe9, 0x85, - 0x53, 0x61, 0x12, 0x0e, 0x0c, 0x27, 0x86, 0x3b, 0x33, 0x8c, 0x56, 0x2b, 0xd9, 0xb2, 0x15, 0x5b, - 0x76, 0x72, 0xb3, 0x77, 0xf7, 0x7d, 0xef, 0xfb, 0x9e, 0xde, 0x3e, 0x7d, 0x02, 0x9a, 0xed, 0xfa, - 0x98, 0x9a, 0x0d, 0x64, 0xbb, 0x06, 0xc3, 0x66, 0x8b, 0xda, 0xfe, 0xa6, 0x66, 0x9a, 0x6d, 0xcd, - 0xa3, 0xa4, 0x6d, 0x5b, 0x98, 0x6a, 0xed, 0x39, 0x6d, 0xbd, 0x85, 0xe9, 0xa6, 0xea, 0x51, 0xe2, - 0x13, 0x78, 0x2e, 0x25, 0x40, 0x35, 0xcd, 0xb6, 0x1a, 0x05, 0xa8, 0xed, 0x39, 0xf9, 0x74, 0x9d, - 0x90, 0xba, 0x83, 0x35, 0xe4, 0xd9, 0x1a, 0x72, 0x5d, 0xe2, 0x23, 0xdf, 0x26, 0x2e, 0x0b, 0x21, - 0xe4, 0xe3, 0x75, 0x52, 0x27, 0xfc, 0xa7, 0x16, 0xfc, 0x12, 0xab, 0x45, 0x11, 0xc3, 0xff, 0xad, - 0xb5, 0xbe, 0xd4, 0x7c, 0xbb, 0x89, 0x99, 0x8f, 0x9a, 0x9e, 0x38, 0x50, 0xca, 0x42, 0x35, 0x66, - 0x11, 0xc6, 0xcc, 0xee, 0x14, 0xd3, 0x9e, 0xd3, 0x58, 0x03, 0x51, 0x6c, 0x19, 0x26, 0x71, 0x59, - 0xab, 0x19, 0x47, 0xbc, 0x31, 0x20, 0x62, 0xc3, 0xa6, 0x38, 0x3c, 0xa6, 0x5c, 0x04, 0xa7, 0x3e, - 0x0c, 0xaa, 0xb2, 0x24, 0xa2, 0x6f, 0x62, 0x17, 0x33, 0x9b, 0xe9, 0x78, 0xbd, 0x85, 0x99, 0x0f, - 0x4f, 0x82, 0xa9, 0x10, 0xc2, 0xb6, 0xf2, 0xd2, 0x19, 0x69, 0x66, 0x5a, 0x7f, 0x89, 0xff, 0xaf, - 0x59, 0xca, 0x03, 0x70, 0x3a, 0x3d, 0x92, 0x79, 0xc4, 0x65, 0x18, 0x7e, 0x0a, 0x0e, 0xd5, 0xc3, - 0x25, 0x83, 0xf9, 0xc8, 0xc7, 0x3c, 0xfe, 0x60, 0x69, 0x56, 0xdd, 0xa9, 0xf0, 0xed, 0x39, 0xb5, - 0x07, 0xeb, 0x6e, 0x10, 0x57, 0xd9, 0xf7, 0xf4, 0x45, 0x31, 0xa7, 0xbf, 0x5c, 0xef, 0x5a, 0x53, - 0x4e, 0x03, 0x39, 0x91, 0x7c, 0x29, 0x80, 0x8b, 0x58, 0x2b, 0xa8, 0x47, 0x54, 0xb4, 0x2b, 0x98, - 0x55, 0xc0, 0x01, 0x9e, 0x9e, 0xe5, 0xa5, 0x33, 0x93, 0x33, 0x07, 0x4b, 0x17, 0xd4, 0x0c, 0xbd, - 0xa0, 0x72, 0x10, 0x5d, 0x44, 0x2a, 0xe7, 0xc1, 0x5b, 0xfd, 0x29, 0xee, 0xfa, 0x88, 0xfa, 0x2b, - 0x94, 0x78, 0x84, 0x21, 0x27, 0x66, 0xf3, 0x48, 0x02, 0x33, 0xc3, 0xcf, 0x0a, 0x6e, 0x9f, 0x81, - 0x69, 0x2f, 0x5a, 0x14, 0x15, 0xbb, 0x9a, 0x8d, 0x9e, 0x00, 0x2f, 0x5b, 0x96, 0x1d, 0x34, 0x69, - 0x07, 0xba, 0x03, 0xa8, 0xcc, 0x80, 0x37, 0xd3, 0x98, 0x10, 0xaf, 0x8f, 0xf4, 0x37, 0x52, 0xba, - 0xc0, 0xc4, 0xd1, 0xf8, 0x49, 0xf7, 0x71, 0x5e, 0x18, 0x89, 0xb3, 0x8e, 0x9b, 0xa4, 0x8d, 0x9c, - 0x54, 0xca, 0x8b, 0x60, 0x3f, 0x4f, 0x3d, 0xa0, 0x15, 0xe1, 0x29, 0x30, 0x6d, 0x3a, 0x36, 0x76, - 0xfd, 0x60, 0x6f, 0x82, 0xef, 0x4d, 0x85, 0x0b, 0x35, 0x4b, 0xf9, 0x56, 0x02, 0x67, 0xb9, 0x92, - 0x7b, 0xc8, 0xb1, 0x2d, 0xe4, 0x13, 0xda, 0x55, 0x2a, 0x3a, 0xbc, 0xd1, 0xe1, 0x02, 0x38, 0x1a, - 0x91, 0x36, 0x90, 0x65, 0x51, 0xcc, 0x58, 0x98, 0xa4, 0x02, 0xff, 0x7d, 0x51, 0x3c, 0xbc, 0x89, - 0x9a, 0xce, 0x65, 0x45, 0x6c, 0x28, 0xfa, 0x91, 0xe8, 0x6c, 0x39, 0x5c, 0xb9, 0x3c, 0xf5, 0xe8, - 0x49, 0x31, 0xf7, 0xd7, 0x93, 0x62, 0x4e, 0xb9, 0x03, 0x94, 0x41, 0x44, 0x44, 0x35, 0xcf, 0x83, - 0xa3, 0xd1, 0x55, 0x8e, 0xd3, 0x85, 0x8c, 0x8e, 0x98, 0x5d, 0xe7, 0x83, 0x64, 0xfd, 0xd2, 0x56, - 0xba, 0x92, 0x67, 0x93, 0xd6, 0x97, 0x6b, 0x80, 0xb4, 0x9e, 0xfc, 0x83, 0xa4, 0x25, 0x89, 0x74, - 0xa4, 0xf5, 0x55, 0x52, 0x48, 0xeb, 0xa9, 0x9a, 0x72, 0x0a, 0x9c, 0xe4, 0x80, 0xab, 0x0d, 0x4a, - 0x7c, 0xdf, 0xc1, 0xfc, 0xda, 0x47, 0xcd, 0xf9, 0xab, 0x24, 0xae, 0x7f, 0xcf, 0xae, 0x48, 0x53, - 0x04, 0x07, 0x99, 0x83, 0x58, 0xc3, 0x68, 0x62, 0x1f, 0x53, 0x9e, 0x61, 0x52, 0x07, 0x7c, 0xe9, - 0x76, 0xb0, 0x02, 0x4b, 0xe0, 0xd5, 0xae, 0x03, 0x06, 0x72, 0x1c, 0xb2, 0x81, 0x5c, 0x13, 0x73, - 0xed, 0x93, 0xfa, 0xb1, 0xce, 0xd1, 0x72, 0xb4, 0x05, 0x3f, 0x07, 0x79, 0x17, 0xdf, 0xf7, 0x0d, - 0x8a, 0x3d, 0x07, 0xbb, 0x36, 0x6b, 0x18, 0x26, 0x72, 0xad, 0x40, 0x2c, 0xce, 0x4f, 0xf2, 0x9e, - 0x97, 0xd5, 0x70, 0xf2, 0xab, 0xd1, 0xe4, 0x57, 0x57, 0xa3, 0xc9, 0x5f, 0x99, 0x0a, 0x66, 0xd8, - 0xe3, 0xdf, 0x8b, 0x92, 0x7e, 0x22, 0x40, 0xd1, 0x23, 0x90, 0xa5, 0x08, 0x43, 0x79, 0x07, 0x5c, - 0xe0, 0x92, 0x74, 0x5c, 0xb7, 0x99, 0x8f, 0x29, 0xb6, 0x3a, 0xb7, 0x63, 0x03, 0x51, 0xab, 0x8a, - 0x5d, 0xd2, 0x8c, 0xaf, 0xe7, 0x75, 0xf0, 0x76, 0xa6, 0xd3, 0xa2, 0x22, 0x27, 0xc0, 0x01, 0x8b, - 0xaf, 0xf0, 0x89, 0x37, 0xad, 0x8b, 0x7f, 0x4a, 0x41, 0xcc, 0xf0, 0xf0, 0xe6, 0x61, 0x8b, 0xdf, - 0xb4, 0x5a, 0x35, 0x4e, 0xf3, 0x50, 0x02, 0xaf, 0xef, 0x70, 0x40, 0x20, 0x7f, 0x01, 0x0e, 0x7b, - 0xdd, 0x7b, 0xd1, 0x4c, 0x2d, 0x65, 0x1a, 0x00, 0x09, 0x58, 0x31, 0xe8, 0x7b, 0xf0, 0x94, 0x1a, - 0x38, 0x94, 0x38, 0x06, 0xf3, 0x40, 0xf4, 0x6f, 0x35, 0xd9, 0xce, 0x55, 0x58, 0x00, 0x20, 0x1a, - 0x1c, 0xb5, 0x2a, 0x7f, 0x98, 0xfb, 0xf4, 0xae, 0x15, 0x65, 0x19, 0x68, 0x5c, 0x4d, 0xd9, 0x71, - 0x56, 0x90, 0x4d, 0xd9, 0x3d, 0xe4, 0x2c, 0x11, 0x37, 0x68, 0xb9, 0x4a, 0x72, 0xce, 0xd5, 0xaa, - 0x19, 0x5e, 0x80, 0x3f, 0x4b, 0x60, 0x36, 0x3b, 0x9c, 0xa8, 0xd7, 0x3a, 0x78, 0xc5, 0x43, 0x36, - 0x35, 0xda, 0xc8, 0x09, 0xde, 0xd8, 0xfc, 0x1a, 0x88, 0x92, 0xdd, 0xc8, 0x56, 0x32, 0x64, 0xd3, - 0x4e, 0xa2, 0xf8, 0x9a, 0xb9, 0x9d, 0x06, 0x38, 0xec, 0x25, 0x8e, 0x28, 0x3f, 0x49, 0xe0, 0xec, - 0xd0, 0xa8, 0xd4, 0x29, 0x27, 0x65, 0x9e, 0x72, 0xbb, 0x9c, 0x24, 0xa5, 0x1f, 0x8f, 0x81, 0xfd, - 0xbc, 0x96, 0x70, 0x4b, 0x02, 0xc7, 0xd3, 0x7c, 0x05, 0xbc, 0x96, 0xa9, 0x3c, 0x03, 0xcc, 0x8c, - 0x5c, 0xde, 0x05, 0x42, 0xf8, 0xf8, 0x94, 0xeb, 0x5f, 0x3f, 0xff, 0xf3, 0xbb, 0x89, 0x45, 0xb8, - 0x30, 0xdc, 0x6f, 0xc6, 0xe5, 0x10, 0xc6, 0x45, 0x7b, 0x10, 0x35, 0xd2, 0x57, 0xf0, 0xb9, 0x04, - 0x8e, 0xa5, 0x38, 0x14, 0xb8, 0x38, 0x3a, 0xc3, 0x84, 0xf3, 0x91, 0xaf, 0x8d, 0x0f, 0x20, 0x14, - 0x5e, 0xe2, 0x0a, 0xe7, 0xe1, 0xdc, 0x08, 0x0a, 0x43, 0x4f, 0x04, 0x1f, 0x4e, 0x80, 0xfc, 0x0e, - 0x46, 0x87, 0xc1, 0xe5, 0x31, 0x99, 0xa5, 0x7a, 0x2a, 0xf9, 0xf6, 0x1e, 0xa1, 0x09, 0xd1, 0x1f, - 0x70, 0xd1, 0x15, 0x78, 0x6d, 0x54, 0xd1, 0x81, 0xb5, 0xa5, 0xbe, 0x11, 0xdb, 0x15, 0xf8, 0x9f, - 0x04, 0x5e, 0x4b, 0xf7, 0x4d, 0x0c, 0xde, 0x1a, 0x9b, 0x74, 0xbf, 0x41, 0x93, 0x97, 0xf7, 0x06, - 0x4c, 0x14, 0xe0, 0x26, 0x2f, 0x40, 0x19, 0x2e, 0x8e, 0x51, 0x00, 0xe2, 0x75, 0xe9, 0xff, 0x27, - 0x7a, 0x35, 0xa7, 0x9a, 0x1c, 0x78, 0x23, 0x3b, 0xeb, 0x41, 0x76, 0x4d, 0xbe, 0xb9, 0x6b, 0x1c, - 0x21, 0xbc, 0xcc, 0x85, 0x5f, 0x81, 0x97, 0x32, 0x7c, 0x40, 0x46, 0x40, 0x46, 0x62, 0xd2, 0xa5, - 0x48, 0xee, 0x36, 0x3f, 0x63, 0x49, 0x4e, 0xb1, 0x71, 0x63, 0x49, 0x4e, 0x73, 0x61, 0xe3, 0x49, - 0x4e, 0xbc, 0x1b, 0xe0, 0x2f, 0x12, 0x80, 0xfd, 0x06, 0x0c, 0x5e, 0xcd, 0x4e, 0x31, 0xcd, 0xd7, - 0xc9, 0x8b, 0x63, 0xc7, 0x0b, 0x69, 0x17, 0xb9, 0xb4, 0x12, 0x9c, 0x1d, 0x2e, 0xcd, 0x17, 0x00, - 0xe1, 0xc7, 0x29, 0xfc, 0x61, 0x02, 0x9c, 0xcb, 0xe0, 0xa8, 0xe0, 0x9d, 0xec, 0x14, 0x33, 0x39, - 0x39, 0x79, 0x65, 0xef, 0x00, 0x45, 0x11, 0x6e, 0xf1, 0x22, 0x5c, 0x87, 0x4b, 0xc3, 0x8b, 0x40, - 0x63, 0xc4, 0x4e, 0x4f, 0x53, 0x8e, 0x69, 0x84, 0x0e, 0x11, 0xfe, 0xdd, 0xe7, 0x00, 0x93, 0xc6, - 0x86, 0xc1, 0x11, 0xde, 0xaa, 0x3b, 0xd8, 0x4c, 0xb9, 0xb2, 0x1b, 0x08, 0xa1, 0xba, 0xc2, 0x55, - 0xbf, 0x0f, 0x2f, 0x0f, 0x57, 0x1d, 0x19, 0x4c, 0xa3, 0xf7, 0x05, 0xf6, 0xfd, 0x84, 0xf8, 0x52, - 0xcf, 0xe0, 0xe8, 0xe0, 0x6a, 0x76, 0xd2, 0xd9, 0xfd, 0xa6, 0xfc, 0xd1, 0x1e, 0xa3, 0x8a, 0xea, - 0x5c, 0xe1, 0xd5, 0x79, 0x0f, 0xce, 0x8f, 0x3c, 0xdf, 0x6d, 0xab, 0xf2, 0xf1, 0xd3, 0xad, 0x82, - 0xf4, 0x6c, 0xab, 0x20, 0xfd, 0xb1, 0x55, 0x90, 0x1e, 0x6f, 0x17, 0x72, 0xcf, 0xb6, 0x0b, 0xb9, - 0xdf, 0xb6, 0x0b, 0xb9, 0x4f, 0x16, 0xea, 0xb6, 0xdf, 0x68, 0xad, 0xa9, 0x26, 0x69, 0x6a, 0x26, - 0x61, 0x4d, 0xc2, 0xba, 0xf0, 0xdf, 0x8d, 0xf1, 0xdb, 0xf3, 0xda, 0xfd, 0x9e, 0xdb, 0xb7, 0xe9, - 0x61, 0xb6, 0x76, 0x80, 0x7f, 0x29, 0xcd, 0xff, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x56, 0xba, 0x85, - 0x15, 0xbd, 0x13, 0x00, 0x00, + // 1336 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcf, 0x6f, 0xdc, 0x44, + 0x14, 0x8e, 0x93, 0xb6, 0x24, 0x93, 0xfe, 0x62, 0x5a, 0x4a, 0xea, 0x86, 0xdd, 0xd6, 0x15, 0x90, + 0x16, 0xb0, 0x93, 0x8d, 0x90, 0xfa, 0x83, 0x34, 0xdd, 0x4d, 0xda, 0x12, 0xa5, 0x55, 0x83, 0x5b, + 0x8a, 0x04, 0x08, 0x33, 0xb1, 0x87, 0x8d, 0x55, 0xaf, 0xc7, 0x9d, 0x99, 0xdd, 0x76, 0x55, 0x71, + 0x28, 0x07, 0xe8, 0xb1, 0x12, 0x70, 0xe1, 0xd4, 0x0b, 0xff, 0x4b, 0x6f, 0x14, 0xf5, 0xc2, 0xa9, + 0xa0, 0x84, 0x03, 0xe2, 0x84, 0xb8, 0x23, 0x21, 0x8f, 0xc7, 0xde, 0xf5, 0xae, 0xb3, 0xeb, 0xdd, + 0xe4, 0xb6, 0x3b, 0xf3, 0xde, 0xf7, 0xde, 0xf7, 0xe6, 0xcd, 0x9b, 0xcf, 0xc0, 0x70, 0x7d, 0x8e, + 0xa9, 0xbd, 0x81, 0x5c, 0xdf, 0x62, 0xd8, 0xae, 0x53, 0x97, 0x37, 0x0d, 0xdb, 0x6e, 0x18, 0x01, + 0x25, 0x0d, 0xd7, 0xc1, 0xd4, 0x68, 0xcc, 0x19, 0xf7, 0xea, 0x98, 0x36, 0xf5, 0x80, 0x12, 0x4e, + 0xe0, 0xe9, 0x0c, 0x07, 0xdd, 0xb6, 0x1b, 0x7a, 0xec, 0xa0, 0x37, 0xe6, 0xd4, 0xe9, 0x2a, 0x21, + 0x55, 0x0f, 0x1b, 0x28, 0x70, 0x0d, 0xe4, 0xfb, 0x84, 0x23, 0xee, 0x12, 0x9f, 0x45, 0x10, 0xea, + 0xd1, 0x2a, 0xa9, 0x12, 0xf1, 0xd3, 0x08, 0x7f, 0xc9, 0xd5, 0xa2, 0xf4, 0x11, 0xff, 0xd6, 0xeb, + 0x5f, 0x19, 0xdc, 0xad, 0x61, 0xc6, 0x51, 0x2d, 0x90, 0x06, 0xa5, 0x3c, 0xa9, 0x26, 0x59, 0x44, + 0x3e, 0xb3, 0xdb, 0xf9, 0x34, 0xe6, 0x0c, 0xb6, 0x81, 0x28, 0x76, 0x2c, 0x9b, 0xf8, 0xac, 0x5e, + 0x4b, 0x3c, 0xde, 0xec, 0xe1, 0x71, 0xdf, 0xa5, 0x58, 0x9a, 0x4d, 0x73, 0xec, 0x3b, 0x98, 0xd6, + 0x5c, 0x9f, 0x1b, 0x36, 0x6d, 0x06, 0x9c, 0x18, 0x77, 0x71, 0x53, 0x32, 0xd4, 0xce, 0x81, 0x13, + 0x1f, 0x85, 0x35, 0x5b, 0x92, 0xd8, 0xd7, 0xb0, 0x8f, 0x99, 0xcb, 0x4c, 0x7c, 0xaf, 0x8e, 0x19, + 0x87, 0xc7, 0xc1, 0x78, 0x14, 0xc0, 0x75, 0xa6, 0x94, 0x93, 0xca, 0xcc, 0x84, 0xf9, 0x8a, 0xf8, + 0xbf, 0xe2, 0x68, 0x0f, 0xc1, 0x74, 0xb6, 0x27, 0x0b, 0x88, 0xcf, 0x30, 0xfc, 0x0c, 0x1c, 0xa8, + 0x46, 0x4b, 0x16, 0xe3, 0x88, 0x63, 0xe1, 0x3f, 0x59, 0x9a, 0xd5, 0xb7, 0x3b, 0x96, 0xc6, 0x9c, + 0xde, 0x81, 0x75, 0x2b, 0xf4, 0xab, 0xec, 0x79, 0xf6, 0xb2, 0x38, 0x62, 0xee, 0xaf, 0xb6, 0xad, + 0x69, 0xd3, 0x40, 0x4d, 0x05, 0x5f, 0x0a, 0xe1, 0xe2, 0xac, 0x35, 0xd4, 0x41, 0x2a, 0xde, 0x95, + 0x99, 0x55, 0xc0, 0x3e, 0x11, 0x9e, 0x4d, 0x29, 0x27, 0xc7, 0x66, 0x26, 0x4b, 0x67, 0xf5, 0x1c, + 0x9d, 0xa2, 0x0b, 0x10, 0x53, 0x7a, 0x6a, 0x67, 0xc0, 0xdb, 0xdd, 0x21, 0x6e, 0x71, 0x44, 0xf9, + 0x1a, 0x25, 0x01, 0x61, 0xc8, 0x4b, 0xb2, 0x79, 0xac, 0x80, 0x99, 0xfe, 0xb6, 0x32, 0xb7, 0xcf, + 0xc1, 0x44, 0x10, 0x2f, 0xca, 0x8a, 0x5d, 0xca, 0x97, 0x9e, 0x04, 0x2f, 0x3b, 0x8e, 0x1b, 0xb6, + 0x70, 0x0b, 0xba, 0x05, 0xa8, 0xcd, 0x80, 0xb7, 0xb2, 0x32, 0x21, 0x41, 0x57, 0xd2, 0xdf, 0x2a, + 0xd9, 0x04, 0x53, 0xa6, 0xc9, 0x49, 0x77, 0xe5, 0xbc, 0x30, 0x50, 0xce, 0x26, 0xae, 0x91, 0x06, + 0xf2, 0x32, 0x53, 0x5e, 0x04, 0x7b, 0x45, 0xe8, 0x1e, 0xad, 0x08, 0x4f, 0x80, 0x09, 0xdb, 0x73, + 0xb1, 0xcf, 0xc3, 0xbd, 0x51, 0xb1, 0x37, 0x1e, 0x2d, 0xac, 0x38, 0xda, 0x77, 0x0a, 0x38, 0x25, + 0x98, 0xdc, 0x41, 0x9e, 0xeb, 0x20, 0x4e, 0x68, 0x5b, 0xa9, 0x68, 0xff, 0x46, 0x87, 0x0b, 0xe0, + 0x70, 0x9c, 0xb4, 0x85, 0x1c, 0x87, 0x62, 0xc6, 0xa2, 0x20, 0x15, 0xf8, 0xef, 0xcb, 0xe2, 0xc1, + 0x26, 0xaa, 0x79, 0x17, 0x34, 0xb9, 0xa1, 0x99, 0x87, 0x62, 0xdb, 0x72, 0xb4, 0x72, 0x61, 0xfc, + 0xf1, 0xd3, 0xe2, 0xc8, 0x5f, 0x4f, 0x8b, 0x23, 0xda, 0x4d, 0xa0, 0xf5, 0x4a, 0x44, 0x56, 0xf3, + 0x0c, 0x38, 0x1c, 0x5f, 0xf4, 0x24, 0x5c, 0x94, 0xd1, 0x21, 0xbb, 0xcd, 0x3e, 0x0c, 0xd6, 0x4d, + 0x6d, 0xad, 0x2d, 0x78, 0x3e, 0x6a, 0x5d, 0xb1, 0x7a, 0x50, 0xeb, 0x88, 0xdf, 0x8b, 0x5a, 0x3a, + 0x91, 0x16, 0xb5, 0xae, 0x4a, 0x4a, 0x6a, 0x1d, 0x55, 0xd3, 0x4e, 0x80, 0xe3, 0x02, 0xf0, 0xf6, + 0x06, 0x25, 0x9c, 0x7b, 0x58, 0x5c, 0xfb, 0xb8, 0x39, 0x7f, 0x55, 0xe4, 0xf5, 0xef, 0xd8, 0x95, + 0x61, 0x8a, 0x60, 0x92, 0x79, 0x88, 0x6d, 0x58, 0x35, 0xcc, 0x31, 0x15, 0x11, 0xc6, 0x4c, 0x20, + 0x96, 0x6e, 0x84, 0x2b, 0xb0, 0x04, 0x5e, 0x6b, 0x33, 0xb0, 0x90, 0xe7, 0x91, 0xfb, 0xc8, 0xb7, + 0xb1, 0xe0, 0x3e, 0x66, 0x1e, 0x69, 0x99, 0x96, 0xe3, 0x2d, 0xf8, 0x05, 0x98, 0xf2, 0xf1, 0x03, + 0x6e, 0x51, 0x1c, 0x78, 0xd8, 0x77, 0xd9, 0x86, 0x65, 0x23, 0xdf, 0x09, 0xc9, 0xe2, 0xa9, 0x31, + 0xd1, 0xf3, 0xaa, 0x1e, 0xbd, 0x0b, 0x7a, 0xfc, 0x2e, 0xe8, 0xb7, 0xe3, 0x77, 0xa1, 0x32, 0x1e, + 0xce, 0xb0, 0x27, 0xbf, 0x17, 0x15, 0xf3, 0x58, 0x88, 0x62, 0xc6, 0x20, 0x4b, 0x31, 0x86, 0xf6, + 0x2e, 0x38, 0x2b, 0x28, 0x99, 0xb8, 0xea, 0x32, 0x8e, 0x29, 0x76, 0x5a, 0xb7, 0xe3, 0x3e, 0xa2, + 0xce, 0x32, 0xf6, 0x49, 0x2d, 0xb9, 0x9e, 0x57, 0xc0, 0x3b, 0xb9, 0xac, 0x65, 0x45, 0x8e, 0x81, + 0x7d, 0x8e, 0x58, 0x11, 0x13, 0x6f, 0xc2, 0x94, 0xff, 0xb4, 0x82, 0x9c, 0xe1, 0xd1, 0xcd, 0xc3, + 0x8e, 0xb8, 0x69, 0x2b, 0xcb, 0x49, 0x98, 0x47, 0x0a, 0x78, 0x63, 0x1b, 0x03, 0x89, 0xfc, 0x25, + 0x38, 0x18, 0xb4, 0xef, 0xc5, 0x33, 0xb5, 0x94, 0x6b, 0x00, 0xa4, 0x60, 0xe5, 0xa0, 0xef, 0xc0, + 0xd3, 0x56, 0xc0, 0x81, 0x94, 0x19, 0x9c, 0x02, 0xb2, 0x7f, 0x97, 0xd3, 0xed, 0xbc, 0x0c, 0x0b, + 0x00, 0xc4, 0x83, 0x63, 0x65, 0x59, 0x1c, 0xe6, 0x1e, 0xb3, 0x6d, 0x45, 0xbb, 0x0e, 0x0c, 0xc1, + 0xa6, 0xec, 0x79, 0x6b, 0xc8, 0xa5, 0xec, 0x0e, 0xf2, 0x96, 0x88, 0x1f, 0xb6, 0x5c, 0x25, 0x3d, + 0xe7, 0x56, 0x96, 0x73, 0x3c, 0x80, 0x3f, 0x2b, 0x60, 0x36, 0x3f, 0x9c, 0xac, 0xd7, 0x3d, 0xf0, + 0x6a, 0x80, 0x5c, 0x6a, 0x35, 0x90, 0x17, 0xbe, 0xe7, 0xe2, 0x1a, 0xc8, 0x92, 0x5d, 0xcd, 0x57, + 0x32, 0xe4, 0xd2, 0x56, 0xa0, 0xe4, 0x9a, 0xf9, 0xad, 0x06, 0x38, 0x18, 0xa4, 0x4c, 0xb4, 0x4d, + 0x05, 0x9c, 0xea, 0xeb, 0x95, 0x39, 0xe5, 0x94, 0xdc, 0x53, 0x6e, 0x87, 0x93, 0x04, 0x2e, 0x82, + 0xfd, 0x89, 0xfb, 0x5d, 0xdc, 0x94, 0x37, 0x6a, 0x5a, 0x6f, 0x69, 0x17, 0x3d, 0xd2, 0x2e, 0xfa, + 0x5a, 0x7d, 0xdd, 0x73, 0xed, 0x55, 0xdc, 0x34, 0x27, 0x63, 0x8f, 0x55, 0xdc, 0x2c, 0xfd, 0x74, + 0x04, 0xec, 0x15, 0x87, 0x01, 0x37, 0x15, 0x70, 0x34, 0x4b, 0x98, 0xc0, 0xcb, 0xb9, 0xea, 0xdb, + 0x43, 0x0d, 0xa9, 0xe5, 0x1d, 0x20, 0x44, 0xe7, 0xaf, 0x5d, 0xf9, 0xe6, 0xc5, 0x9f, 0xdf, 0x8f, + 0x2e, 0xc2, 0x85, 0xfe, 0x72, 0x36, 0x29, 0x88, 0x54, 0x3e, 0xc6, 0xc3, 0xb8, 0x13, 0xbf, 0x86, + 0x2f, 0x14, 0x70, 0x24, 0x43, 0xe2, 0xc0, 0xc5, 0xc1, 0x33, 0x4c, 0x49, 0x27, 0xf5, 0xf2, 0xf0, + 0x00, 0x92, 0xe1, 0x79, 0xc1, 0x70, 0x1e, 0xce, 0x0d, 0xc0, 0x30, 0x12, 0x55, 0xf0, 0xd1, 0x28, + 0x98, 0xda, 0x46, 0x29, 0x31, 0x78, 0x7d, 0xc8, 0xcc, 0x32, 0x45, 0x99, 0x7a, 0x63, 0x97, 0xd0, + 0x24, 0xe9, 0x0f, 0x05, 0xe9, 0x0a, 0xbc, 0x3c, 0x28, 0xe9, 0x50, 0x1b, 0x53, 0x6e, 0x25, 0x7a, + 0x07, 0xfe, 0xa7, 0x80, 0xd7, 0xb3, 0x85, 0x17, 0x83, 0xab, 0x43, 0x27, 0xdd, 0xad, 0xf0, 0xd4, + 0xeb, 0xbb, 0x03, 0x26, 0x0b, 0x70, 0x4d, 0x14, 0xa0, 0x0c, 0x17, 0x87, 0x28, 0x00, 0x09, 0xda, + 0xf8, 0xff, 0x13, 0xbf, 0xed, 0x99, 0x2a, 0x09, 0x5e, 0xcd, 0x9f, 0x75, 0x2f, 0xbd, 0xa7, 0x5e, + 0xdb, 0x31, 0x8e, 0x24, 0x5e, 0x16, 0xc4, 0x2f, 0xc2, 0xf3, 0x39, 0xbe, 0x4f, 0x63, 0x20, 0x2b, + 0x35, 0x2a, 0x33, 0x28, 0xb7, 0xab, 0xa7, 0xa1, 0x28, 0x67, 0xe8, 0xc0, 0xa1, 0x28, 0x67, 0xc9, + 0xb8, 0xe1, 0x28, 0xa7, 0x1e, 0x17, 0xf8, 0x8b, 0x02, 0x60, 0xb7, 0x82, 0x83, 0x97, 0xf2, 0xa7, + 0x98, 0x25, 0x0c, 0xd5, 0xc5, 0xa1, 0xfd, 0x25, 0xb5, 0x73, 0x82, 0x5a, 0x09, 0xce, 0xf6, 0xa7, + 0xc6, 0x25, 0x40, 0xf4, 0x75, 0x0b, 0x7f, 0x1c, 0x05, 0xa7, 0x73, 0x48, 0x32, 0x78, 0x33, 0x7f, + 0x8a, 0xb9, 0xa4, 0xa0, 0xba, 0xb6, 0x7b, 0x80, 0xb2, 0x08, 0xab, 0xa2, 0x08, 0x57, 0xe0, 0x52, + 0xff, 0x22, 0xd0, 0x04, 0xb1, 0xd5, 0xd3, 0x54, 0x60, 0x5a, 0x91, 0xc4, 0x84, 0x7f, 0x77, 0x49, + 0xc8, 0xb4, 0x32, 0x62, 0x70, 0x80, 0x57, 0x75, 0x1b, 0x9d, 0xaa, 0x56, 0x76, 0x02, 0x21, 0x59, + 0x57, 0x04, 0xeb, 0x0f, 0xe0, 0x85, 0xfe, 0xac, 0x63, 0x85, 0x6a, 0x75, 0x3e, 0x60, 0x3f, 0x8c, + 0xca, 0x4f, 0xfd, 0x1c, 0x92, 0x10, 0xde, 0xce, 0x9f, 0x74, 0x7e, 0xc1, 0xaa, 0x7e, 0xbc, 0xcb, + 0xa8, 0xb2, 0x3a, 0x17, 0x45, 0x75, 0xde, 0x87, 0xf3, 0x03, 0xcf, 0x77, 0xd7, 0xa9, 0x7c, 0xf2, + 0x6c, 0xb3, 0xa0, 0x3c, 0xdf, 0x2c, 0x28, 0x7f, 0x6c, 0x16, 0x94, 0x27, 0x5b, 0x85, 0x91, 0xe7, + 0x5b, 0x85, 0x91, 0xdf, 0xb6, 0x0a, 0x23, 0x9f, 0x2e, 0x54, 0x5d, 0xbe, 0x51, 0x5f, 0xd7, 0x6d, + 0x52, 0x33, 0x6c, 0xc2, 0x6a, 0x84, 0xb5, 0xe1, 0xbf, 0x97, 0xe0, 0x37, 0xe6, 0x8d, 0x07, 0x1d, + 0xb7, 0xaf, 0x19, 0x60, 0xb6, 0xbe, 0x4f, 0x7c, 0x6a, 0xcd, 0xff, 0x1f, 0x00, 0x00, 0xff, 0xff, + 0x6d, 0xa5, 0x22, 0x70, 0x1c, 0x14, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2330,6 +2342,18 @@ func (m *PairValConAddrProviderAndConsumer) MarshalToSizedBuffer(dAtA []byte) (i _ = i var l int _ = l + if m.ConsumerKey != nil { + { + size, err := m.ConsumerKey.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } if len(m.ConsumerAddress) > 0 { i -= len(m.ConsumerAddress) copy(dAtA[i:], m.ConsumerAddress) @@ -2659,6 +2683,10 @@ func (m *PairValConAddrProviderAndConsumer) Size() (n int) { if l > 0 { n += 1 + l + sovQuery(uint64(l)) } + if m.ConsumerKey != nil { + l = m.ConsumerKey.Size() + n += 1 + l + sovQuery(uint64(l)) + } return n } @@ -4542,6 +4570,42 @@ func (m *PairValConAddrProviderAndConsumer) Unmarshal(dAtA []byte) error { } m.ConsumerAddress = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ConsumerKey", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.ConsumerKey == nil { + m.ConsumerKey = &crypto.PublicKey{} + } + if err := m.ConsumerKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) From cee0c53b3b7be1aed388e77b8beaf18ab93e0cd8 Mon Sep 17 00:00:00 2001 From: ThanhNhann Date: Sun, 17 Dec 2023 00:16:34 +0700 Subject: [PATCH 4/9] add test TestQueryAllPairsValConAddrByConsumerChainID --- x/ccv/provider/keeper/grpc_query.go | 6 ++- x/ccv/provider/keeper/grpc_query_test.go | 56 ++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 x/ccv/provider/keeper/grpc_query_test.go diff --git a/x/ccv/provider/keeper/grpc_query.go b/x/ccv/provider/keeper/grpc_query.go index 68b400890f..888da43c5d 100644 --- a/x/ccv/provider/keeper/grpc_query.go +++ b/x/ccv/provider/keeper/grpc_query.go @@ -188,13 +188,17 @@ func (k Keeper) QueryAllPairsValConAddrByConsumerChainID(goCtx context.Context, return nil, status.Error(codes.InvalidArgument, "empty request") } + if req.ChainId == "" { + return nil, status.Error(codes.InvalidArgument, "empty chainId") + } + // list of pairs valconsensus addr pairValConAddrs := []*types.PairValConAddrProviderAndConsumer{} ctx := sdk.UnwrapSDKContext(goCtx) validatorConsumerAddrs := k.GetAllValidatorsByConsumerAddr(ctx, &req.ChainId) for _, data := range validatorConsumerAddrs { - pubKey, _, _ := k.GetKeyAssignmentReplacement(ctx, req.ChainId, types.ProviderConsAddress{Address: data.ConsumerAddr}) + pubKey, _, _ := k.GetKeyAssignmentReplacement(ctx, req.ChainId, types.ProviderConsAddress{Address: data.ProviderAddr}) pairValConAddrs = append(pairValConAddrs, &types.PairValConAddrProviderAndConsumer{ ProviderAddress: string(data.ProviderAddr), ConsumerAddress: string(data.ConsumerAddr), diff --git a/x/ccv/provider/keeper/grpc_query_test.go b/x/ccv/provider/keeper/grpc_query_test.go new file mode 100644 index 0000000000..2e824a613e --- /dev/null +++ b/x/ccv/provider/keeper/grpc_query_test.go @@ -0,0 +1,56 @@ +package keeper_test + +import ( + "testing" + + "github.com/stretchr/testify/require" + + cryptotestutil "github.com/cosmos/interchain-security/v3/testutil/crypto" + testkeeper "github.com/cosmos/interchain-security/v3/testutil/keeper" + "github.com/cosmos/interchain-security/v3/x/ccv/provider/types" +) + +func TestQueryAllPairsValConAddrByConsumerChainID(t *testing.T) { + chainID := consumer + providerAddr := types.NewProviderConsAddress([]byte("providerAddr")) + consumerAddr := types.NewConsumerConsAddress([]byte("consumerAddr")) + + consumerKey := cryptotestutil.NewCryptoIdentityFromIntSeed(1).TMProtoCryptoPublicKey() + + pk, ctx, ctrl, _ := testkeeper.GetProviderKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t)) + defer ctrl.Finish() + + pk.SetValidatorByConsumerAddr(ctx, chainID, consumerAddr, providerAddr) + pk.SetValidatorConsumerPubKey(ctx, chainID, providerAddr, consumerKey) + pk.SetKeyAssignmentReplacement(ctx, chainID, providerAddr, consumerKey, 100) + + consumerPubKey, found := pk.GetValidatorConsumerPubKey(ctx, chainID, providerAddr) + require.True(t, found, "consumer pubkey not found") + require.NotEmpty(t, consumerPubKey, "consumer pubkey is empty") + require.Equal(t, consumerPubKey, consumerKey) + + // Request is nil + _, err := pk.QueryAllPairsValConAddrByConsumerChainID(ctx, nil) + require.Error(t, err) + + // Request with chainId is empty + _, err = pk.QueryAllPairsValConAddrByConsumerChainID(ctx, &types.QueryAllPairsValConAddrByConsumerChainIDRequest{}) + require.Error(t, err) + + // Request with chainId is invalid + response, err := pk.QueryAllPairsValConAddrByConsumerChainID(ctx, &types.QueryAllPairsValConAddrByConsumerChainIDRequest{ChainId: "invalidChainId"}) + require.NoError(t, err) + require.Equal(t, []*types.PairValConAddrProviderAndConsumer{}, response.PairValConAddr) + + // Request is valid + response, err = pk.QueryAllPairsValConAddrByConsumerChainID(ctx, &types.QueryAllPairsValConAddrByConsumerChainIDRequest{ChainId: chainID}) + require.NoError(t, err) + + expectedResult := types.PairValConAddrProviderAndConsumer{ + ProviderAddress: "providerAddr", + ConsumerAddress: "consumerAddr", + ConsumerKey: &consumerKey, + } + require.Equal(t, &consumerKey, response.PairValConAddr[0].ConsumerKey) + require.Equal(t, &expectedResult, response.PairValConAddr[0]) +} From 0871c2bf760acd3ec09466ea6df36261835ebbdb Mon Sep 17 00:00:00 2001 From: ThanhNhann Date: Sun, 17 Dec 2023 00:42:08 +0700 Subject: [PATCH 5/9] add doc --- docs/docs/features/key-assignment.md | 8 ++++++++ x/ccv/provider/client/cli/query.go | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/docs/features/key-assignment.md b/docs/docs/features/key-assignment.md index a44ed8a32a..3f566f4022 100644 --- a/docs/docs/features/key-assignment.md +++ b/docs/docs/features/key-assignment.md @@ -65,6 +65,14 @@ gaiad query provider validator-provider-key consumervalcons1 You must use a `valcons` address. You can obtain it by querying your node on the consumer `consumerd tendermint show-address` +OR + +```bash +gaiad query provider vall-pairs-valconsensus-address +``` + +You just need to use the `chainId` of consumer to query all pairs valconsensus address with `consumer-pub-key` for each of pair + ## Changing a key To change your key, simply repeat all of the steps listed above. Take note that your old key will be remembered for at least the unbonding period of the consumer chain so any slashes can be correctly applied diff --git a/x/ccv/provider/client/cli/query.go b/x/ccv/provider/client/cli/query.go index da2c76c42e..4b7560c35e 100644 --- a/x/ccv/provider/client/cli/query.go +++ b/x/ccv/provider/client/cli/query.go @@ -351,7 +351,7 @@ $ %s query provider registered-consumer-reward-denoms func CmdAllPairsValConAddrByConsumerChainID() *cobra.Command { cmd := &cobra.Command{ - Use: "All-pairs-valconsensus-address", + Use: "all-pairs-valconsensus-address", Short: "Query all pairs of valconsensus address by consumer chainId.", Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { From 70042c90a4209068efd6790723671efbf9145794 Mon Sep 17 00:00:00 2001 From: Nguyen Thanh Nhan | Decentrio Date: Tue, 19 Dec 2023 19:14:48 +0700 Subject: [PATCH 6/9] Update docs/docs/features/key-assignment.md Co-authored-by: MSalopek --- docs/docs/features/key-assignment.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/features/key-assignment.md b/docs/docs/features/key-assignment.md index 3f566f4022..7ac7d02f48 100644 --- a/docs/docs/features/key-assignment.md +++ b/docs/docs/features/key-assignment.md @@ -68,7 +68,7 @@ You must use a `valcons` address. You can obtain it by querying your node on the OR ```bash -gaiad query provider vall-pairs-valconsensus-address +gaiad query provider all-pairs-valconsensus-address ``` You just need to use the `chainId` of consumer to query all pairs valconsensus address with `consumer-pub-key` for each of pair From f1f992d34d051559af3d2219b5ec63162a048bab Mon Sep 17 00:00:00 2001 From: ThanhNhann Date: Thu, 4 Jan 2024 00:25:05 +0700 Subject: [PATCH 7/9] add changelog --- .changelog/unreleased/improvements/1503-query-key-assignment.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 .changelog/unreleased/improvements/1503-query-key-assignment.md diff --git a/.changelog/unreleased/improvements/1503-query-key-assignment.md b/.changelog/unreleased/improvements/1503-query-key-assignment.md new file mode 100644 index 0000000000..62b505ec01 --- /dev/null +++ b/.changelog/unreleased/improvements/1503-query-key-assignment.md @@ -0,0 +1 @@ +- Add `QueryAllPairsValConAddrByConsumerChainID` method to get list of all pairs `valConsensus` address by `Consummer chainID`. ([\#1503](https://github.com/cosmos/interchain-security/pull/1503)) \ No newline at end of file From e1dd2edf63a39a752ad83ce01d14c157361fbc9d Mon Sep 17 00:00:00 2001 From: ThanhNhann Date: Fri, 5 Jan 2024 13:33:02 +0700 Subject: [PATCH 8/9] update with Marius Poke's suggestions --- .../improvements/{ => provider}/1503-query-key-assignment.md | 0 x/ccv/provider/keeper/grpc_query.go | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) rename .changelog/unreleased/improvements/{ => provider}/1503-query-key-assignment.md (100%) diff --git a/.changelog/unreleased/improvements/1503-query-key-assignment.md b/.changelog/unreleased/improvements/provider/1503-query-key-assignment.md similarity index 100% rename from .changelog/unreleased/improvements/1503-query-key-assignment.md rename to .changelog/unreleased/improvements/provider/1503-query-key-assignment.md diff --git a/x/ccv/provider/keeper/grpc_query.go b/x/ccv/provider/keeper/grpc_query.go index 888da43c5d..64f109b4a8 100644 --- a/x/ccv/provider/keeper/grpc_query.go +++ b/x/ccv/provider/keeper/grpc_query.go @@ -198,13 +198,15 @@ func (k Keeper) QueryAllPairsValConAddrByConsumerChainID(goCtx context.Context, ctx := sdk.UnwrapSDKContext(goCtx) validatorConsumerAddrs := k.GetAllValidatorsByConsumerAddr(ctx, &req.ChainId) for _, data := range validatorConsumerAddrs { - pubKey, _, _ := k.GetKeyAssignmentReplacement(ctx, req.ChainId, types.ProviderConsAddress{Address: data.ProviderAddr}) + providerAddr := types.NewProviderConsAddress(data.ProviderAddr) + pubKey, _ := k.GetValidatorConsumerPubKey(ctx, req.ChainId, providerAddr) pairValConAddrs = append(pairValConAddrs, &types.PairValConAddrProviderAndConsumer{ ProviderAddress: string(data.ProviderAddr), ConsumerAddress: string(data.ConsumerAddr), ConsumerKey: &pubKey, }) } + return &types.QueryAllPairsValConAddrByConsumerChainIDResponse{ PairValConAddr: pairValConAddrs, }, nil From 22b2926e70b373e1aafdca92a1c50439a240b36c Mon Sep 17 00:00:00 2001 From: ThanhNhann Date: Fri, 5 Jan 2024 17:11:17 +0700 Subject: [PATCH 9/9] update logic get data --- x/ccv/provider/keeper/grpc_query.go | 14 ++++++++------ x/ccv/provider/keeper/grpc_query_test.go | 9 +++++---- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/x/ccv/provider/keeper/grpc_query.go b/x/ccv/provider/keeper/grpc_query.go index 64f109b4a8..58f753ae17 100644 --- a/x/ccv/provider/keeper/grpc_query.go +++ b/x/ccv/provider/keeper/grpc_query.go @@ -196,14 +196,16 @@ func (k Keeper) QueryAllPairsValConAddrByConsumerChainID(goCtx context.Context, pairValConAddrs := []*types.PairValConAddrProviderAndConsumer{} ctx := sdk.UnwrapSDKContext(goCtx) - validatorConsumerAddrs := k.GetAllValidatorsByConsumerAddr(ctx, &req.ChainId) - for _, data := range validatorConsumerAddrs { - providerAddr := types.NewProviderConsAddress(data.ProviderAddr) - pubKey, _ := k.GetValidatorConsumerPubKey(ctx, req.ChainId, providerAddr) + validatorConsumerPubKeys := k.GetAllValidatorConsumerPubKeys(ctx, &req.ChainId) + for _, data := range validatorConsumerPubKeys { + consumerAddr, err := ccvtypes.TMCryptoPublicKeyToConsAddr(*data.ConsumerKey) + if err != nil { + return nil, err + } pairValConAddrs = append(pairValConAddrs, &types.PairValConAddrProviderAndConsumer{ ProviderAddress: string(data.ProviderAddr), - ConsumerAddress: string(data.ConsumerAddr), - ConsumerKey: &pubKey, + ConsumerAddress: string(consumerAddr), + ConsumerKey: data.ConsumerKey, }) } diff --git a/x/ccv/provider/keeper/grpc_query_test.go b/x/ccv/provider/keeper/grpc_query_test.go index 2e824a613e..3246e1fc35 100644 --- a/x/ccv/provider/keeper/grpc_query_test.go +++ b/x/ccv/provider/keeper/grpc_query_test.go @@ -8,19 +8,20 @@ import ( cryptotestutil "github.com/cosmos/interchain-security/v3/testutil/crypto" testkeeper "github.com/cosmos/interchain-security/v3/testutil/keeper" "github.com/cosmos/interchain-security/v3/x/ccv/provider/types" + ccvtypes "github.com/cosmos/interchain-security/v3/x/ccv/types" ) func TestQueryAllPairsValConAddrByConsumerChainID(t *testing.T) { chainID := consumer providerAddr := types.NewProviderConsAddress([]byte("providerAddr")) - consumerAddr := types.NewConsumerConsAddress([]byte("consumerAddr")) consumerKey := cryptotestutil.NewCryptoIdentityFromIntSeed(1).TMProtoCryptoPublicKey() + consumerAddr, err := ccvtypes.TMCryptoPublicKeyToConsAddr(consumerKey) + require.NoError(t, err) pk, ctx, ctrl, _ := testkeeper.GetProviderKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t)) defer ctrl.Finish() - pk.SetValidatorByConsumerAddr(ctx, chainID, consumerAddr, providerAddr) pk.SetValidatorConsumerPubKey(ctx, chainID, providerAddr, consumerKey) pk.SetKeyAssignmentReplacement(ctx, chainID, providerAddr, consumerKey, 100) @@ -30,7 +31,7 @@ func TestQueryAllPairsValConAddrByConsumerChainID(t *testing.T) { require.Equal(t, consumerPubKey, consumerKey) // Request is nil - _, err := pk.QueryAllPairsValConAddrByConsumerChainID(ctx, nil) + _, err = pk.QueryAllPairsValConAddrByConsumerChainID(ctx, nil) require.Error(t, err) // Request with chainId is empty @@ -48,7 +49,7 @@ func TestQueryAllPairsValConAddrByConsumerChainID(t *testing.T) { expectedResult := types.PairValConAddrProviderAndConsumer{ ProviderAddress: "providerAddr", - ConsumerAddress: "consumerAddr", + ConsumerAddress: string(consumerAddr), ConsumerKey: &consumerKey, } require.Equal(t, &consumerKey, response.PairValConAddr[0].ConsumerKey)