From 3084962fd653c674285fd081a0738073bb46de3b Mon Sep 17 00:00:00 2001 From: pudongair <744355276@qq.com> Date: Wed, 28 Aug 2024 21:16:06 +0800 Subject: [PATCH 1/3] docs: fix some comments (#2075) chore: fix some comments Signed-off-by: pudongair <744355276@qq.com> --- tests/e2e/steps_multi_consumer_downtime.go | 2 +- tests/integration/expired_client.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/e2e/steps_multi_consumer_downtime.go b/tests/e2e/steps_multi_consumer_downtime.go index 7e73197b8f..02f070a612 100644 --- a/tests/e2e/steps_multi_consumer_downtime.go +++ b/tests/e2e/steps_multi_consumer_downtime.go @@ -1,6 +1,6 @@ package main -// stepsDowntime tests validator jailing and slashing. +// stepsMultiConsumerDowntimeFromConsumer tests validator jailing and slashing. // No slashing should occur for downtime slash initiated from the consumer chain // validators will simply be jailed in those cases // If an infraction is committed on the provider chain then the validator will be slashed diff --git a/tests/integration/expired_client.go b/tests/integration/expired_client.go index 5a55c75079..e5c6099203 100644 --- a/tests/integration/expired_client.go +++ b/tests/integration/expired_client.go @@ -17,7 +17,7 @@ import ( ccv "github.com/cosmos/interchain-security/v5/x/ccv/types" ) -// TestVSCPacketSendWithExpiredClient tests queueing of VSCPackets when the consumer client is expired. +// TestVSCPacketSendExpiredClient tests queueing of VSCPackets when the consumer client is expired. // While the consumer client is expired (or inactive for some reason) all packets will be queued and // and cleared once the consumer client is established. func (s *CCVTestSuite) TestVSCPacketSendExpiredClient() { @@ -203,7 +203,7 @@ func expireClient(s *CCVTestSuite, clientTo ChainType) { checkClientExpired(s, clientTo, true) } -// checkClientIsExpired checks whether the client to `clientTo` is expired +// checkClientExpired checks whether the client to `clientTo` is expired func checkClientExpired(s *CCVTestSuite, clientTo ChainType, expectedExpired bool) { var hostEndpoint *ibctesting.Endpoint var hostChain *ibctesting.TestChain From ccdb89b3602bd450e07e6c54ecdd92985d8def27 Mon Sep 17 00:00:00 2001 From: Philip Offtermatt <57488781+p-offtermatt@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:08:36 +0200 Subject: [PATCH 2/3] fix: Fix inactive vals and min stake handling in ConsumerAdditionProposal conversion (#2181) * Add inactive vals and min stake to Chain struct * Add allow_inactive_vals and min_stake to consumer chain query result * Add inactive vals and min stake to consumer chain getter test * Fix regression * Revert extra logging changes * Remove e2e scenario --- .../ccv/provider/v1/query.proto | 5 + tests/e2e/actions.go | 15 +- x/ccv/provider/keeper/grpc_query.go | 6 + x/ccv/provider/keeper/grpc_query_test.go | 13 + x/ccv/provider/keeper/hooks.go | 2 + x/ccv/provider/keeper/proposal.go | 2 + x/ccv/provider/types/query.pb.go | 333 +++++++++++------- 7 files changed, 246 insertions(+), 130 deletions(-) diff --git a/proto/interchain_security/ccv/provider/v1/query.proto b/proto/interchain_security/ccv/provider/v1/query.proto index 9a8fbf7f42..0ac1baa477 100644 --- a/proto/interchain_security/ccv/provider/v1/query.proto +++ b/proto/interchain_security/ccv/provider/v1/query.proto @@ -187,6 +187,11 @@ message Chain { repeated string allowlist = 7; // Corresponds to a list of provider consensus addresses of validators that CANNOT validate the consumer chain. repeated string denylist = 8; + // Corresponds to the minimal amount of (provider chain) stake required to validate on the consumer chain. + uint64 min_stake = 9; + // Corresponds to whether inactive validators are allowed to validate the consumer chain. + bool allow_inactive_vals = 10; + } message QueryValidatorConsumerAddrRequest { diff --git a/tests/e2e/actions.go b/tests/e2e/actions.go index 1ba117b3cc..088ad19801 100644 --- a/tests/e2e/actions.go +++ b/tests/e2e/actions.go @@ -299,7 +299,9 @@ func (tr Chain) submitConsumerAdditionProposal( "validator_set_cap": %d, "allowlist": %s, "denylist": %s, - "authority": "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn" + "authority": "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn", + "allow_inactive_vals": %t, + "min_stake": "%d" } ], "metadata": "ipfs://CID", @@ -327,6 +329,8 @@ func (tr Chain) submitConsumerAdditionProposal( action.ValidatorSetCap, action.Allowlist, action.Denylist, + action.AllowInactiveVals, + action.MinStake, action.Deposit) //#nosec G204 -- bypass unsafe quoting warning (no production code) @@ -587,13 +591,14 @@ type SubmitConsumerModificationProposalAction struct { ValidatorSetCap uint32 Allowlist []string Denylist []string + AllowInactiveVals bool + MinStake uint64 } func (tr Chain) submitConsumerModificationProposal( action SubmitConsumerModificationProposalAction, verbose bool, ) { - template := ` { @@ -609,8 +614,8 @@ func (tr Chain) submitConsumerModificationProposal( "allowlist": %s, "denylist": %s, "authority": "cosmos10d07y265gmmuvt4z0w9aw880jnsr700j6zn9kn", - "min_stake": "0", - "allow_inactive_vals": false + "min_stake": %d, + "allow_inactive_vals": %t } ], "metadata": "ipfs://CID", @@ -629,6 +634,8 @@ func (tr Chain) submitConsumerModificationProposal( action.Allowlist, action.Denylist, action.Deposit, + action.MinStake, + action.AllowInactiveVals, ) // #nosec G204 -- bypass unsafe quoting warning (no production code) diff --git a/x/ccv/provider/keeper/grpc_query.go b/x/ccv/provider/keeper/grpc_query.go index 415a181096..2635648a6a 100644 --- a/x/ccv/provider/keeper/grpc_query.go +++ b/x/ccv/provider/keeper/grpc_query.go @@ -95,6 +95,10 @@ func (k Keeper) GetConsumerChain(ctx sdk.Context, chainID string) (types.Chain, strDenylist[i] = addr.String() } + allowInactiveVals := k.AllowsInactiveValidators(ctx, chainID) + + minStake, _ := k.GetMinStake(ctx, chainID) + return types.Chain{ ChainId: chainID, ClientId: clientID, @@ -104,6 +108,8 @@ func (k Keeper) GetConsumerChain(ctx sdk.Context, chainID string) (types.Chain, ValidatorsPowerCap: validatorsPowerCap, Allowlist: strAllowlist, Denylist: strDenylist, + AllowInactiveVals: allowInactiveVals, + MinStake: minStake, }, nil } diff --git a/x/ccv/provider/keeper/grpc_query_test.go b/x/ccv/provider/keeper/grpc_query_test.go index 27e6d00155..d0ba94174a 100644 --- a/x/ccv/provider/keeper/grpc_query_test.go +++ b/x/ccv/provider/keeper/grpc_query_test.go @@ -280,6 +280,15 @@ func TestGetConsumerChain(t *testing.T) { {}, } + allowInactiveVals := []bool{true, false, true, false} + + minStakes := []math.Int{ + math.NewInt(0), + math.NewInt(100), + math.NewInt(200), + math.NewInt(300), + } + expectedGetAllOrder := []types.Chain{} for i, chainID := range chainIDs { clientID := fmt.Sprintf("client-%d", len(chainIDs)-i) @@ -289,6 +298,8 @@ func TestGetConsumerChain(t *testing.T) { pk.SetValidatorSetCap(ctx, chainID, validatorSetCaps[i]) pk.SetValidatorsPowerCap(ctx, chainID, validatorPowerCaps[i]) pk.SetMinimumPowerInTopN(ctx, chainID, expectedMinPowerInTopNs[i]) + pk.SetInactiveValidatorsAllowed(ctx, chainID, allowInactiveVals[i]) + pk.SetMinStake(ctx, chainID, minStakes[i].Uint64()) for _, addr := range allowlists[i] { pk.SetAllowlist(ctx, chainID, addr) } @@ -315,6 +326,8 @@ func TestGetConsumerChain(t *testing.T) { ValidatorsPowerCap: validatorPowerCaps[i], Allowlist: strAllowlist, Denylist: strDenylist, + AllowInactiveVals: allowInactiveVals[i], + MinStake: minStakes[i].Uint64(), }) } diff --git a/x/ccv/provider/keeper/hooks.go b/x/ccv/provider/keeper/hooks.go index a72f60080f..3f7f9d21a9 100644 --- a/x/ccv/provider/keeper/hooks.go +++ b/x/ccv/provider/keeper/hooks.go @@ -180,6 +180,8 @@ func (h Hooks) GetConsumerAdditionFromProp( ValidatorSetCap: sdkMsg.ValidatorSetCap, Allowlist: sdkMsg.Allowlist, Denylist: sdkMsg.Denylist, + MinStake: sdkMsg.MinStake, + AllowInactiveVals: sdkMsg.AllowInactiveVals, } return proposal, true } diff --git a/x/ccv/provider/keeper/proposal.go b/x/ccv/provider/keeper/proposal.go index 9c2f620636..f67f597370 100644 --- a/x/ccv/provider/keeper/proposal.go +++ b/x/ccv/provider/keeper/proposal.go @@ -44,6 +44,8 @@ func (k Keeper) HandleConsumerAdditionProposal(ctx sdk.Context, proposal *types. ValidatorSetCap: proposal.ValidatorSetCap, Allowlist: proposal.Allowlist, Denylist: proposal.Denylist, + MinStake: proposal.MinStake, + AllowInactiveVals: proposal.AllowInactiveVals, } return k.HandleLegacyConsumerAdditionProposal(ctx, &p) diff --git a/x/ccv/provider/types/query.pb.go b/x/ccv/provider/types/query.pb.go index bc7866140f..10a78b00c7 100644 --- a/x/ccv/provider/types/query.pb.go +++ b/x/ccv/provider/types/query.pb.go @@ -391,6 +391,10 @@ type Chain struct { Allowlist []string `protobuf:"bytes,7,rep,name=allowlist,proto3" json:"allowlist,omitempty"` // Corresponds to a list of provider consensus addresses of validators that CANNOT validate the consumer chain. Denylist []string `protobuf:"bytes,8,rep,name=denylist,proto3" json:"denylist,omitempty"` + // Corresponds to the minimal amount of (provider chain) stake required to validate on the consumer chain. + MinStake uint64 `protobuf:"varint,9,opt,name=min_stake,json=minStake,proto3" json:"min_stake,omitempty"` + // Corresponds to whether inactive validators are allowed to validate the consumer chain. + AllowInactiveVals bool `protobuf:"varint,10,opt,name=allow_inactive_vals,json=allowInactiveVals,proto3" json:"allow_inactive_vals,omitempty"` } func (m *Chain) Reset() { *m = Chain{} } @@ -482,6 +486,20 @@ func (m *Chain) GetDenylist() []string { return nil } +func (m *Chain) GetMinStake() uint64 { + if m != nil { + return m.MinStake + } + return 0 +} + +func (m *Chain) GetAllowInactiveVals() bool { + if m != nil { + return m.AllowInactiveVals + } + return false +} + type QueryValidatorConsumerAddrRequest struct { // The id of the consumer chain ChainId string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` @@ -1783,133 +1801,136 @@ func init() { } var fileDescriptor_422512d7b7586cd7 = []byte{ - // 2002 bytes of a gzipped FileDescriptorProto + // 2049 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0xcd, 0x6f, 0xdc, 0xc6, - 0x15, 0x17, 0x57, 0xb2, 0x22, 0x8d, 0x62, 0x3b, 0x19, 0xab, 0xb1, 0x4c, 0x29, 0xbb, 0x0a, 0xdd, - 0x0f, 0x59, 0x76, 0x49, 0x49, 0x86, 0x11, 0xc7, 0xae, 0x23, 0x6b, 0x25, 0xd9, 0x59, 0xd8, 0xb1, - 0x15, 0x5a, 0x76, 0x0b, 0xb7, 0x28, 0x3d, 0x22, 0xa7, 0x2b, 0xc2, 0x5c, 0x0e, 0xc5, 0x19, 0xad, - 0xbd, 0x30, 0x72, 0x48, 0x0f, 0x6d, 0x8e, 0x41, 0x3f, 0x80, 0x1e, 0x73, 0xe9, 0xb1, 0x3d, 0xf4, - 0xd0, 0xbf, 0x21, 0xb7, 0xa6, 0xc8, 0xa5, 0xe8, 0xc1, 0x2d, 0xec, 0x1e, 0x8a, 0x02, 0x2d, 0xda, - 0xa0, 0xd7, 0x02, 0x05, 0x87, 0x43, 0x2e, 0xb9, 0xcb, 0xdd, 0x25, 0x77, 0x95, 0xdb, 0x72, 0xe6, - 0xbd, 0xdf, 0xbc, 0xf7, 0xe6, 0xcd, 0x9b, 0xf7, 0x9b, 0x05, 0x9a, 0xed, 0x32, 0xec, 0x9b, 0xfb, - 0xc8, 0x76, 0x0d, 0x8a, 0xcd, 0x43, 0xdf, 0x66, 0x2d, 0xcd, 0x34, 0x9b, 0x9a, 0xe7, 0x93, 0xa6, - 0x6d, 0x61, 0x5f, 0x6b, 0xae, 0x6a, 0x07, 0x87, 0xd8, 0x6f, 0xa9, 0x9e, 0x4f, 0x18, 0x81, 0x67, - 0x33, 0x14, 0x54, 0xd3, 0x6c, 0xaa, 0x91, 0x82, 0xda, 0x5c, 0x95, 0x17, 0xea, 0x84, 0xd4, 0x1d, - 0xac, 0x21, 0xcf, 0xd6, 0x90, 0xeb, 0x12, 0x86, 0x98, 0x4d, 0x5c, 0x1a, 0x42, 0xc8, 0xb3, 0x75, - 0x52, 0x27, 0xfc, 0xa7, 0x16, 0xfc, 0x12, 0xa3, 0x15, 0xa1, 0xc3, 0xbf, 0xf6, 0x0e, 0x7f, 0xa4, - 0x31, 0xbb, 0x81, 0x29, 0x43, 0x0d, 0x4f, 0x08, 0xac, 0xe5, 0x31, 0x35, 0xb6, 0x22, 0xd4, 0x59, - 0xe9, 0xa5, 0xd3, 0x5c, 0xd5, 0xe8, 0x3e, 0xf2, 0xb1, 0x65, 0x98, 0xc4, 0xa5, 0x87, 0x8d, 0x58, - 0xe3, 0x1b, 0x7d, 0x34, 0x9e, 0xd8, 0x3e, 0x16, 0x62, 0x0b, 0x0c, 0xbb, 0x16, 0xf6, 0x1b, 0xb6, - 0xcb, 0x34, 0xd3, 0x6f, 0x79, 0x8c, 0x68, 0x8f, 0x71, 0x2b, 0xf2, 0xf0, 0x8c, 0x49, 0x68, 0x83, - 0x50, 0x23, 0x74, 0x32, 0xfc, 0x08, 0xa7, 0x94, 0xcb, 0x60, 0xfe, 0x83, 0x20, 0x9c, 0x9b, 0x62, - 0xd9, 0x9b, 0xd8, 0xc5, 0xd4, 0xa6, 0x3a, 0x3e, 0x38, 0xc4, 0x94, 0xc1, 0x33, 0x60, 0x2a, 0x5c, - 0xdb, 0xb6, 0xe6, 0xa4, 0x45, 0x69, 0x69, 0x5a, 0x7f, 0x85, 0x7f, 0xd7, 0x2c, 0xe5, 0x19, 0x58, - 0xc8, 0xd6, 0xa4, 0x1e, 0x71, 0x29, 0x86, 0xdf, 0x07, 0xc7, 0xeb, 0xe1, 0x90, 0x41, 0x19, 0x62, - 0x98, 0xeb, 0xcf, 0xac, 0xad, 0xa8, 0xbd, 0x76, 0xac, 0xb9, 0xaa, 0x76, 0x60, 0xdd, 0x0b, 0xf4, - 0xaa, 0x13, 0x9f, 0x3d, 0xaf, 0x8c, 0xe9, 0xaf, 0xd6, 0x13, 0x63, 0xca, 0x02, 0x90, 0x53, 0x8b, - 0x6f, 0x06, 0x70, 0x91, 0xd5, 0x0a, 0xea, 0x70, 0x2a, 0x9a, 0x15, 0x96, 0x55, 0xc1, 0x24, 0x5f, - 0x9e, 0xce, 0x49, 0x8b, 0xe3, 0x4b, 0x33, 0x6b, 0xcb, 0x6a, 0x8e, 0x24, 0x52, 0x39, 0x88, 0x2e, - 0x34, 0x95, 0x73, 0xe0, 0x5b, 0xdd, 0x4b, 0xdc, 0x63, 0xc8, 0x67, 0x3b, 0x3e, 0xf1, 0x08, 0x45, - 0x4e, 0x6c, 0xcd, 0xc7, 0x12, 0x58, 0x1a, 0x2c, 0x2b, 0x6c, 0xfb, 0x01, 0x98, 0xf6, 0xa2, 0x41, - 0x11, 0xb1, 0x77, 0xf3, 0x99, 0x27, 0xc0, 0x37, 0x2c, 0xcb, 0x0e, 0xb2, 0xbb, 0x0d, 0xdd, 0x06, - 0x54, 0x96, 0xc0, 0x37, 0xb3, 0x2c, 0x21, 0x5e, 0x97, 0xd1, 0x3f, 0x91, 0xb2, 0x1d, 0x4c, 0x89, - 0xc6, 0x3b, 0xdd, 0x65, 0xf3, 0xb5, 0x42, 0x36, 0xeb, 0xb8, 0x41, 0x9a, 0xc8, 0xc9, 0x34, 0xf9, - 0x57, 0x25, 0x70, 0x8c, 0xaf, 0xdd, 0x27, 0x17, 0xe1, 0x3c, 0x98, 0x36, 0x1d, 0x1b, 0xbb, 0x2c, - 0x98, 0x2b, 0xf1, 0xb9, 0xa9, 0x70, 0xa0, 0x66, 0xc1, 0x53, 0xe0, 0x18, 0x23, 0x9e, 0x71, 0x67, - 0x6e, 0x7c, 0x51, 0x5a, 0x3a, 0xae, 0x4f, 0x30, 0xe2, 0xdd, 0x81, 0xcb, 0x00, 0x36, 0x6c, 0xd7, - 0xf0, 0xc8, 0x13, 0xec, 0x1b, 0xb6, 0x6b, 0x84, 0x12, 0x13, 0x8b, 0xd2, 0xd2, 0xb8, 0x7e, 0xa2, - 0x61, 0xbb, 0x3b, 0xc1, 0x44, 0xcd, 0xdd, 0x0d, 0x64, 0x57, 0xc0, 0x6c, 0x13, 0x39, 0xb6, 0x85, - 0x18, 0xf1, 0xa9, 0x50, 0x31, 0x91, 0x37, 0x77, 0x8c, 0xe3, 0xc1, 0xf6, 0x1c, 0x57, 0xda, 0x44, - 0x1e, 0x5c, 0x06, 0xaf, 0xc7, 0xa3, 0x06, 0xc5, 0x8c, 0x8b, 0x4f, 0x72, 0xf1, 0x93, 0xf1, 0xc4, - 0x3d, 0xcc, 0x02, 0xd9, 0x05, 0x30, 0x8d, 0x1c, 0x87, 0x3c, 0x71, 0x6c, 0xca, 0xe6, 0x5e, 0x59, - 0x1c, 0x5f, 0x9a, 0xd6, 0xdb, 0x03, 0x50, 0x06, 0x53, 0x16, 0x76, 0x5b, 0x7c, 0x72, 0x8a, 0x4f, - 0xc6, 0xdf, 0xca, 0x4f, 0x25, 0xf0, 0x16, 0xdf, 0xa3, 0x07, 0x11, 0x64, 0x22, 0x09, 0xfc, 0xc1, - 0x47, 0x18, 0x5e, 0x03, 0xaf, 0x45, 0xdb, 0x61, 0x20, 0xcb, 0xf2, 0x31, 0xa5, 0x61, 0xf4, 0xaa, - 0xf0, 0xcb, 0xe7, 0x95, 0x13, 0x2d, 0xd4, 0x70, 0xae, 0x28, 0x62, 0x42, 0xd1, 0x4f, 0x46, 0xb2, - 0x1b, 0xe1, 0xc8, 0x95, 0xa9, 0x8f, 0x3f, 0xad, 0x8c, 0xfd, 0xfd, 0xd3, 0xca, 0x98, 0x72, 0x17, - 0x28, 0xfd, 0x0c, 0x11, 0x79, 0x72, 0x0e, 0xbc, 0x16, 0x55, 0xb7, 0x78, 0xb9, 0xd0, 0xa2, 0x93, - 0x66, 0x42, 0x3e, 0x58, 0xac, 0xdb, 0xb5, 0x9d, 0xc4, 0xe2, 0xf9, 0x5c, 0xeb, 0x5a, 0xab, 0x8f, - 0x6b, 0x1d, 0xeb, 0xf7, 0x73, 0x2d, 0x6d, 0x48, 0xdb, 0xb5, 0xae, 0x48, 0x0a, 0xd7, 0x3a, 0xa2, - 0xa6, 0xcc, 0x83, 0x33, 0x1c, 0x70, 0x77, 0xdf, 0x27, 0x8c, 0x39, 0x98, 0x17, 0xb4, 0xe8, 0xd8, - 0xfd, 0x51, 0x12, 0x85, 0xad, 0x63, 0x56, 0x2c, 0x53, 0x01, 0x33, 0xd4, 0x41, 0x74, 0xdf, 0x68, - 0x60, 0x86, 0x7d, 0xbe, 0xc2, 0xb8, 0x0e, 0xf8, 0xd0, 0xfb, 0xc1, 0x08, 0x5c, 0x03, 0x5f, 0x4b, - 0x08, 0x18, 0x3c, 0x8f, 0x90, 0x6b, 0x62, 0xee, 0xfb, 0xb8, 0x7e, 0xaa, 0x2d, 0xba, 0x11, 0x4d, - 0xc1, 0x1f, 0x82, 0x39, 0x17, 0x3f, 0x65, 0x86, 0x8f, 0x3d, 0x07, 0xbb, 0x36, 0xdd, 0x37, 0x4c, - 0xe4, 0x5a, 0x81, 0xb3, 0x98, 0x1f, 0x99, 0x99, 0x35, 0x59, 0x0d, 0x2f, 0x43, 0x35, 0xba, 0x0c, - 0xd5, 0xdd, 0xe8, 0x32, 0xac, 0x4e, 0x05, 0xd5, 0xf9, 0x93, 0xbf, 0x54, 0x24, 0xfd, 0x8d, 0x00, - 0x45, 0x8f, 0x40, 0x36, 0x23, 0x0c, 0xe5, 0x02, 0x58, 0xe6, 0x2e, 0xe9, 0xb8, 0x6e, 0x53, 0x86, - 0x7d, 0x6c, 0xb5, 0xcf, 0xfd, 0x13, 0xe4, 0x5b, 0x5b, 0xd8, 0x25, 0x8d, 0xb8, 0xf0, 0x6c, 0x83, - 0xf3, 0xb9, 0xa4, 0x45, 0x44, 0xde, 0x00, 0x93, 0x16, 0x1f, 0xe1, 0xb5, 0x7c, 0x5a, 0x17, 0x5f, - 0x4a, 0x59, 0xdc, 0x4e, 0x61, 0x4d, 0xc1, 0x16, 0x2f, 0x21, 0xb5, 0xad, 0x78, 0x99, 0x8f, 0x24, - 0xf0, 0x66, 0x0f, 0x01, 0x81, 0xfc, 0x08, 0x9c, 0xf0, 0x92, 0x73, 0xd1, 0x6d, 0xb1, 0x96, 0xab, - 0xb4, 0xa5, 0x60, 0xc5, 0x15, 0xd6, 0x81, 0xa7, 0xd4, 0xc0, 0xf1, 0x94, 0x18, 0x9c, 0x03, 0x22, - 0x7f, 0xb7, 0xd2, 0xe9, 0xbc, 0x05, 0xcb, 0x00, 0x44, 0x25, 0xb1, 0xb6, 0xc5, 0x37, 0x73, 0x42, - 0x4f, 0x8c, 0x28, 0xb7, 0x81, 0xc6, 0xbd, 0xd9, 0x70, 0x9c, 0x1d, 0x64, 0xfb, 0xf4, 0x01, 0x72, - 0x36, 0x89, 0x1b, 0xa4, 0x5c, 0x35, 0x5d, 0xc1, 0x6b, 0x5b, 0x39, 0xae, 0xf6, 0x5f, 0x4b, 0x60, - 0x25, 0x3f, 0x9c, 0x88, 0xd7, 0x01, 0x78, 0xdd, 0x43, 0xb6, 0x6f, 0x34, 0x91, 0x13, 0x34, 0x31, - 0xfc, 0x18, 0x88, 0x90, 0xdd, 0xc8, 0x17, 0x32, 0x64, 0xfb, 0xed, 0x85, 0xe2, 0x63, 0xe6, 0xb6, - 0x13, 0xe0, 0x84, 0x97, 0x12, 0x51, 0xfe, 0x2b, 0x81, 0xb7, 0x06, 0x6a, 0xc1, 0x1b, 0xbd, 0xce, - 0x66, 0x75, 0xfe, 0xcb, 0xe7, 0x95, 0xd3, 0x61, 0x29, 0xe8, 0x94, 0xe8, 0x2e, 0x77, 0x01, 0x4e, - 0x8f, 0x92, 0x92, 0xc0, 0xe9, 0x94, 0xe8, 0xae, 0x2d, 0x70, 0x1d, 0xbc, 0x1a, 0x4b, 0x3d, 0xc6, - 0x2d, 0x71, 0xc6, 0x16, 0xd4, 0x76, 0x0b, 0xa7, 0x86, 0x2d, 0x9c, 0xba, 0x73, 0xb8, 0xe7, 0xd8, - 0xe6, 0x2d, 0xdc, 0xd2, 0x67, 0x22, 0x8d, 0x5b, 0xb8, 0xa5, 0xcc, 0x02, 0x18, 0xa6, 0x2e, 0xf2, - 0x51, 0xfb, 0xe0, 0x3c, 0x02, 0xa7, 0x52, 0xa3, 0x62, 0x5b, 0x6a, 0x60, 0xd2, 0xe3, 0x23, 0xe2, - 0x66, 0x3e, 0x9f, 0x73, 0x2f, 0x02, 0x15, 0x91, 0xb7, 0x02, 0x40, 0xb9, 0x29, 0x0e, 0x72, 0x2a, - 0x03, 0xee, 0x7a, 0x0c, 0x5b, 0x35, 0x37, 0x2e, 0x8f, 0x79, 0x5a, 0xc7, 0x03, 0x71, 0xc6, 0x07, - 0x01, 0xc5, 0xfd, 0xda, 0x9b, 0xc9, 0xfb, 0xb7, 0x63, 0xa7, 0x70, 0x74, 0xf4, 0xe7, 0x13, 0x17, - 0x71, 0x7a, 0xeb, 0x30, 0x55, 0xae, 0x82, 0x72, 0x6a, 0xc9, 0x42, 0xf6, 0xfe, 0x47, 0x02, 0x8b, - 0x3d, 0xb4, 0xe3, 0x5f, 0x99, 0x97, 0xa9, 0x94, 0xfb, 0x32, 0xed, 0xca, 0x8a, 0x52, 0xc1, 0xac, - 0x80, 0xb3, 0xe0, 0x18, 0x6f, 0x4d, 0x78, 0x3e, 0x8d, 0xeb, 0xe1, 0x07, 0x7c, 0x1b, 0x4c, 0xf8, - 0x41, 0x21, 0x9f, 0xe0, 0x96, 0x9c, 0x0d, 0xf6, 0xf3, 0xcf, 0xcf, 0x2b, 0xf3, 0x21, 0x07, 0xa0, - 0xd6, 0x63, 0xd5, 0x26, 0x5a, 0x03, 0xb1, 0x7d, 0xf5, 0x36, 0xae, 0x23, 0xb3, 0xb5, 0x85, 0x4d, - 0x9d, 0x2b, 0x04, 0x5d, 0x6b, 0xa5, 0x67, 0xc4, 0xc4, 0xc6, 0x60, 0x00, 0xda, 0x31, 0x17, 0x67, - 0x7d, 0x3b, 0x57, 0x7e, 0x0d, 0x8a, 0xa6, 0x9e, 0x00, 0x56, 0x0e, 0x44, 0x35, 0x4a, 0xb7, 0xf3, - 0xb1, 0xec, 0x7b, 0x88, 0xee, 0x12, 0xf1, 0x15, 0x5d, 0xa4, 0x23, 0xee, 0x86, 0x82, 0xc0, 0x6a, - 0x81, 0x25, 0x45, 0x38, 0x2e, 0x00, 0x18, 0x6f, 0x61, 0x94, 0x4a, 0x51, 0x72, 0xc6, 0xa5, 0x23, - 0x2c, 0x9b, 0x16, 0x6f, 0x71, 0xce, 0x67, 0x37, 0x4d, 0x9b, 0xa4, 0xd1, 0xb0, 0x29, 0xb5, 0x89, - 0xab, 0x27, 0x3c, 0xfa, 0xca, 0xfa, 0x38, 0xa5, 0x0e, 0x2e, 0xe4, 0x33, 0x44, 0xf8, 0x19, 0xe5, - 0x94, 0x54, 0x34, 0xa7, 0x14, 0x71, 0x8c, 0xaa, 0x0e, 0x31, 0x1f, 0xd3, 0xfb, 0x2e, 0xb3, 0x9d, - 0x3b, 0xf8, 0x29, 0xdb, 0xf6, 0x88, 0xb9, 0x1f, 0x95, 0xb1, 0x87, 0xa2, 0xf1, 0xcb, 0x96, 0x11, - 0x16, 0x5c, 0x02, 0xa7, 0xf7, 0xf8, 0xbc, 0x71, 0x18, 0x08, 0x18, 0xbc, 0x7f, 0xc1, 0x81, 0x08, - 0x37, 0x6a, 0x42, 0x9f, 0xdd, 0xcb, 0x50, 0x5f, 0xfb, 0x6d, 0x05, 0x1c, 0xe3, 0xe0, 0xf0, 0x85, - 0x04, 0x66, 0xb3, 0xd8, 0x2b, 0xbc, 0x5e, 0x3c, 0x7d, 0xd3, 0x94, 0x59, 0xde, 0x18, 0x01, 0x21, - 0x74, 0x4f, 0xd9, 0xfe, 0xf1, 0x17, 0x7f, 0xfb, 0x79, 0x69, 0x1d, 0x5e, 0x1b, 0xfc, 0x1c, 0x12, - 0x27, 0x9c, 0xa0, 0xc7, 0xda, 0xb3, 0x28, 0x49, 0x3e, 0x84, 0x5f, 0x48, 0xe2, 0x4a, 0x48, 0x67, - 0x31, 0x5c, 0x2f, 0x6e, 0x61, 0x8a, 0x5f, 0xcb, 0xd7, 0x87, 0x07, 0x10, 0x1e, 0xbe, 0xc3, 0x3d, - 0xbc, 0x08, 0x57, 0x0b, 0x78, 0x18, 0x32, 0x6f, 0xf8, 0x51, 0x09, 0xcc, 0xf5, 0xa0, 0xd3, 0x14, - 0xde, 0x1e, 0xd2, 0xb2, 0x4c, 0xe6, 0x2e, 0xbf, 0x7f, 0x44, 0x68, 0xc2, 0xe9, 0xf7, 0xb8, 0xd3, - 0x55, 0x78, 0xbd, 0xa8, 0xd3, 0x06, 0x0d, 0x00, 0x8d, 0x98, 0x14, 0xc3, 0xff, 0x49, 0xe0, 0x74, - 0x36, 0x3b, 0xa7, 0xf0, 0xd6, 0xd0, 0x46, 0x77, 0x3f, 0x03, 0xc8, 0xb7, 0x8f, 0x06, 0x4c, 0x04, - 0xe0, 0x26, 0x0f, 0xc0, 0x06, 0x5c, 0x1f, 0x22, 0x00, 0xc4, 0x4b, 0xf8, 0xff, 0xef, 0x88, 0x26, - 0x65, 0x12, 0x4e, 0x78, 0x23, 0xbf, 0xd5, 0xfd, 0xa8, 0xb3, 0x7c, 0x73, 0x64, 0x1c, 0xe1, 0xf8, - 0x06, 0x77, 0xfc, 0x2a, 0x7c, 0x27, 0xc7, 0xfb, 0x66, 0xfc, 0x6e, 0x90, 0x6a, 0x25, 0x33, 0x5c, - 0x4e, 0x36, 0x39, 0x43, 0xb9, 0x9c, 0x41, 0xa9, 0x87, 0x72, 0x39, 0x8b, 0x11, 0x0f, 0xe7, 0x72, - 0xea, 0x16, 0x83, 0x7f, 0x90, 0x44, 0xa3, 0x9b, 0x22, 0xc3, 0xf0, 0xdd, 0xfc, 0x26, 0x66, 0x71, - 0x6c, 0x79, 0x7d, 0x68, 0x7d, 0xe1, 0xda, 0x65, 0xee, 0xda, 0x1a, 0x5c, 0x19, 0xec, 0x1a, 0x13, - 0x00, 0xe1, 0x13, 0x28, 0xfc, 0x65, 0x09, 0x9c, 0xcd, 0xc1, 0x6e, 0xe1, 0xdd, 0xfc, 0x26, 0xe6, - 0x62, 0xd5, 0xf2, 0xce, 0xd1, 0x01, 0x8a, 0x20, 0xdc, 0xe2, 0x41, 0xd8, 0x86, 0x9b, 0x83, 0x83, - 0xe0, 0xc7, 0x88, 0xed, 0x9c, 0xf6, 0x39, 0xa6, 0x11, 0xb2, 0x75, 0xf8, 0x8f, 0x2e, 0x36, 0x9e, - 0x26, 0x99, 0x14, 0x16, 0xb8, 0x55, 0x7b, 0x50, 0x7e, 0xb9, 0x3a, 0x0a, 0x84, 0xf0, 0xba, 0xca, - 0xbd, 0xfe, 0x0e, 0xbc, 0x32, 0xd8, 0xeb, 0x88, 0xec, 0x1b, 0x9d, 0x17, 0xd8, 0x2f, 0x4a, 0xe2, - 0x3d, 0x38, 0x07, 0xbb, 0x86, 0xbb, 0xf9, 0x8d, 0xce, 0xcf, 0xfd, 0xe5, 0xfb, 0x47, 0x8c, 0x2a, - 0xa2, 0x73, 0x95, 0x47, 0xe7, 0x12, 0xbc, 0x58, 0xb8, 0xbe, 0xdb, 0x16, 0xfc, 0x9d, 0x04, 0x66, - 0x12, 0x04, 0x16, 0xbe, 0x5d, 0x60, 0xbb, 0x92, 0x44, 0x58, 0xbe, 0x5c, 0x5c, 0x51, 0xd8, 0xbf, - 0xc2, 0xed, 0x5f, 0x86, 0x4b, 0x39, 0x76, 0x37, 0x34, 0xf2, 0x67, 0xd1, 0x81, 0xee, 0x4f, 0x65, - 0x8b, 0x1c, 0xe8, 0x5c, 0xec, 0xba, 0xc8, 0x81, 0xce, 0xc7, 0xb2, 0x8b, 0x74, 0x27, 0x24, 0x00, - 0x31, 0x6c, 0xd7, 0x68, 0x93, 0xb4, 0x64, 0xdf, 0xf9, 0xfb, 0x12, 0x38, 0x97, 0x9b, 0x3d, 0xc1, - 0xfb, 0xc3, 0x36, 0x93, 0x7d, 0x09, 0xa0, 0xfc, 0xe0, 0xa8, 0x61, 0x45, 0x98, 0x1e, 0xf2, 0x30, - 0xed, 0x42, 0xbd, 0x70, 0xe7, 0x6a, 0x78, 0xd8, 0x6f, 0x47, 0x4c, 0x7b, 0xd6, 0x49, 0xd9, 0x3e, - 0x84, 0xbf, 0x29, 0x81, 0xaf, 0xe7, 0x61, 0x62, 0x70, 0x67, 0x84, 0xc6, 0x24, 0x93, 0x5d, 0xca, - 0x1f, 0x1c, 0x21, 0xa2, 0x88, 0xd4, 0x23, 0x1e, 0xa9, 0x87, 0xf0, 0x7b, 0x45, 0x22, 0x15, 0x43, - 0x19, 0x01, 0x63, 0x4c, 0x64, 0x55, 0x56, 0xbc, 0xfe, 0xd5, 0xd9, 0x06, 0x27, 0x4e, 0xdc, 0xe6, - 0x28, 0xef, 0x10, 0x51, 0x54, 0xb6, 0x46, 0x03, 0x19, 0xa1, 0xef, 0xcf, 0x3e, 0x59, 0xff, 0x94, - 0xc4, 0x9f, 0x07, 0x59, 0xec, 0x18, 0x16, 0x78, 0x7a, 0xe9, 0xc3, 0xc0, 0xe5, 0x1b, 0xa3, 0xc2, - 0x14, 0xef, 0x00, 0x7b, 0x90, 0xf9, 0xea, 0x77, 0x3f, 0x7b, 0x51, 0x96, 0x3e, 0x7f, 0x51, 0x96, - 0xfe, 0xfa, 0xa2, 0x2c, 0x7d, 0xf2, 0xb2, 0x3c, 0xf6, 0xf9, 0xcb, 0xf2, 0xd8, 0x9f, 0x5e, 0x96, - 0xc7, 0x1e, 0x5e, 0xab, 0xdb, 0x6c, 0xff, 0x70, 0x4f, 0x35, 0x49, 0x43, 0xfc, 0xa1, 0x9d, 0x58, - 0xe5, 0xdb, 0xf1, 0x2a, 0xcd, 0x4b, 0xda, 0xd3, 0x8e, 0x8e, 0xac, 0xe5, 0x61, 0xba, 0x37, 0xc9, - 0xff, 0xc9, 0xb8, 0xf8, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe2, 0x36, 0xa0, 0x9e, 0x70, 0x20, - 0x00, 0x00, + 0x15, 0x17, 0x57, 0x1f, 0x91, 0x46, 0xb1, 0x1d, 0x8f, 0xd5, 0x78, 0x4d, 0x29, 0xbb, 0x0a, 0xdd, + 0x8f, 0xb5, 0xec, 0x92, 0x92, 0x0c, 0x23, 0x8e, 0x5d, 0x47, 0xd6, 0x4a, 0xb2, 0xb3, 0xb0, 0x63, + 0x2b, 0xb4, 0xec, 0x16, 0x6e, 0x51, 0x9a, 0x22, 0xa7, 0x2b, 0x42, 0x5c, 0x0e, 0xc5, 0x19, 0xad, + 0xbd, 0x30, 0x72, 0x48, 0x0f, 0x6d, 0x8e, 0x41, 0x3f, 0xee, 0xb9, 0xf4, 0xd8, 0x1e, 0x7a, 0xe8, + 0xdf, 0x90, 0x5b, 0x53, 0xe4, 0x52, 0xf4, 0xe0, 0x16, 0x72, 0x0b, 0x14, 0x05, 0x5a, 0xb4, 0x46, + 0xaf, 0x05, 0x0a, 0x0e, 0x87, 0x5c, 0x72, 0x97, 0xbb, 0x4b, 0xee, 0x2a, 0xb7, 0xe5, 0xcc, 0x7b, + 0xbf, 0x79, 0xef, 0xcd, 0x9b, 0x37, 0xef, 0x37, 0x0b, 0x14, 0xcb, 0xa1, 0xc8, 0x33, 0xf6, 0x74, + 0xcb, 0xd1, 0x08, 0x32, 0x0e, 0x3d, 0x8b, 0xb6, 0x14, 0xc3, 0x68, 0x2a, 0xae, 0x87, 0x9b, 0x96, + 0x89, 0x3c, 0xa5, 0xb9, 0xa2, 0x1c, 0x1c, 0x22, 0xaf, 0x25, 0xbb, 0x1e, 0xa6, 0x18, 0x9e, 0x4f, + 0x51, 0x90, 0x0d, 0xa3, 0x29, 0x87, 0x0a, 0x72, 0x73, 0x45, 0x5c, 0xa8, 0x63, 0x5c, 0xb7, 0x91, + 0xa2, 0xbb, 0x96, 0xa2, 0x3b, 0x0e, 0xa6, 0x3a, 0xb5, 0xb0, 0x43, 0x02, 0x08, 0x71, 0xae, 0x8e, + 0xeb, 0x98, 0xfd, 0x54, 0xfc, 0x5f, 0x7c, 0xb4, 0xcc, 0x75, 0xd8, 0xd7, 0xee, 0xe1, 0x8f, 0x14, + 0x6a, 0x35, 0x10, 0xa1, 0x7a, 0xc3, 0xe5, 0x02, 0xab, 0x59, 0x4c, 0x8d, 0xac, 0x08, 0x74, 0x96, + 0x7b, 0xe9, 0x34, 0x57, 0x14, 0xb2, 0xa7, 0x7b, 0xc8, 0xd4, 0x0c, 0xec, 0x90, 0xc3, 0x46, 0xa4, + 0xf1, 0x8d, 0x3e, 0x1a, 0x4f, 0x2d, 0x0f, 0x71, 0xb1, 0x05, 0x8a, 0x1c, 0x13, 0x79, 0x0d, 0xcb, + 0xa1, 0x8a, 0xe1, 0xb5, 0x5c, 0x8a, 0x95, 0x7d, 0xd4, 0x0a, 0x3d, 0x3c, 0x67, 0x60, 0xd2, 0xc0, + 0x44, 0x0b, 0x9c, 0x0c, 0x3e, 0x82, 0x29, 0xe9, 0x2a, 0x98, 0xff, 0xd0, 0x0f, 0xe7, 0x06, 0x5f, + 0xf6, 0x36, 0x72, 0x10, 0xb1, 0x88, 0x8a, 0x0e, 0x0e, 0x11, 0xa1, 0xf0, 0x1c, 0x98, 0x0e, 0xd6, + 0xb6, 0xcc, 0xa2, 0xb0, 0x28, 0x54, 0x66, 0xd4, 0xd7, 0xd8, 0x77, 0xcd, 0x94, 0x9e, 0x83, 0x85, + 0x74, 0x4d, 0xe2, 0x62, 0x87, 0x20, 0xf8, 0x7d, 0x70, 0xa2, 0x1e, 0x0c, 0x69, 0x84, 0xea, 0x14, + 0x31, 0xfd, 0xd9, 0xd5, 0x65, 0xb9, 0xd7, 0x8e, 0x35, 0x57, 0xe4, 0x0e, 0xac, 0x07, 0xbe, 0x5e, + 0x75, 0xe2, 0xf3, 0x17, 0xe5, 0x31, 0xf5, 0xf5, 0x7a, 0x6c, 0x4c, 0x5a, 0x00, 0x62, 0x62, 0xf1, + 0x0d, 0x1f, 0x2e, 0xb4, 0x5a, 0xd2, 0x3b, 0x9c, 0x0a, 0x67, 0xb9, 0x65, 0x55, 0x30, 0xc5, 0x96, + 0x27, 0x45, 0x61, 0x71, 0xbc, 0x32, 0xbb, 0xba, 0x24, 0x67, 0x48, 0x22, 0x99, 0x81, 0xa8, 0x5c, + 0x53, 0xba, 0x00, 0xbe, 0xd5, 0xbd, 0xc4, 0x03, 0xaa, 0x7b, 0x74, 0xdb, 0xc3, 0x2e, 0x26, 0xba, + 0x1d, 0x59, 0xf3, 0x89, 0x00, 0x2a, 0x83, 0x65, 0xb9, 0x6d, 0x3f, 0x00, 0x33, 0x6e, 0x38, 0xc8, + 0x23, 0xf6, 0x5e, 0x36, 0xf3, 0x38, 0xf8, 0xba, 0x69, 0x5a, 0x7e, 0x76, 0xb7, 0xa1, 0xdb, 0x80, + 0x52, 0x05, 0x7c, 0x33, 0xcd, 0x12, 0xec, 0x76, 0x19, 0xfd, 0x13, 0x21, 0xdd, 0xc1, 0x84, 0x68, + 0xb4, 0xd3, 0x5d, 0x36, 0xdf, 0xc8, 0x65, 0xb3, 0x8a, 0x1a, 0xb8, 0xa9, 0xdb, 0xa9, 0x26, 0xff, + 0xad, 0x00, 0x26, 0xd9, 0xda, 0x7d, 0x72, 0x11, 0xce, 0x83, 0x19, 0xc3, 0xb6, 0x90, 0x43, 0xfd, + 0xb9, 0x02, 0x9b, 0x9b, 0x0e, 0x06, 0x6a, 0x26, 0x3c, 0x03, 0x26, 0x29, 0x76, 0xb5, 0x7b, 0xc5, + 0xf1, 0x45, 0xa1, 0x72, 0x42, 0x9d, 0xa0, 0xd8, 0xbd, 0x07, 0x97, 0x00, 0x6c, 0x58, 0x8e, 0xe6, + 0xe2, 0xa7, 0xc8, 0xd3, 0x2c, 0x47, 0x0b, 0x24, 0x26, 0x16, 0x85, 0xca, 0xb8, 0x7a, 0xb2, 0x61, + 0x39, 0xdb, 0xfe, 0x44, 0xcd, 0xd9, 0xf1, 0x65, 0x97, 0xc1, 0x5c, 0x53, 0xb7, 0x2d, 0x53, 0xa7, + 0xd8, 0x23, 0x5c, 0xc5, 0xd0, 0xdd, 0xe2, 0x24, 0xc3, 0x83, 0xed, 0x39, 0xa6, 0xb4, 0xa1, 0xbb, + 0x70, 0x09, 0x9c, 0x8e, 0x46, 0x35, 0x82, 0x28, 0x13, 0x9f, 0x62, 0xe2, 0xa7, 0xa2, 0x89, 0x07, + 0x88, 0xfa, 0xb2, 0x0b, 0x60, 0x46, 0xb7, 0x6d, 0xfc, 0xd4, 0xb6, 0x08, 0x2d, 0xbe, 0xb6, 0x38, + 0x5e, 0x99, 0x51, 0xdb, 0x03, 0x50, 0x04, 0xd3, 0x26, 0x72, 0x5a, 0x6c, 0x72, 0x9a, 0x4d, 0x46, + 0xdf, 0xbe, 0xd7, 0xbe, 0x0f, 0x84, 0xea, 0xfb, 0xa8, 0x38, 0xb3, 0x28, 0x54, 0x26, 0xd4, 0xe9, + 0x06, 0xcb, 0xac, 0x7d, 0x04, 0x65, 0x70, 0x86, 0xa1, 0x68, 0x96, 0xa3, 0x1b, 0xd4, 0x6a, 0x22, + 0xad, 0xe9, 0x6f, 0x0f, 0x58, 0x14, 0x2a, 0xd3, 0xea, 0x69, 0x36, 0x55, 0xe3, 0x33, 0x8f, 0xfc, + 0x38, 0xff, 0x54, 0x00, 0x6f, 0xb3, 0x0d, 0x7f, 0x14, 0xda, 0x17, 0xcb, 0x28, 0x6f, 0x70, 0x3d, + 0x80, 0x37, 0xc0, 0x1b, 0xe1, 0xde, 0x6a, 0xba, 0x69, 0x7a, 0x88, 0x90, 0x60, 0x2b, 0xaa, 0xf0, + 0xd5, 0x8b, 0xf2, 0xc9, 0x96, 0xde, 0xb0, 0xaf, 0x49, 0x7c, 0x42, 0x52, 0x4f, 0x85, 0xb2, 0xeb, + 0xc1, 0xc8, 0xb5, 0xe9, 0x4f, 0x3e, 0x2b, 0x8f, 0xfd, 0xfd, 0xb3, 0xf2, 0x98, 0x74, 0x1f, 0x48, + 0xfd, 0x0c, 0xe1, 0x49, 0x77, 0x01, 0xbc, 0x11, 0x96, 0xca, 0x68, 0xb9, 0xc0, 0xa2, 0x53, 0x46, + 0x4c, 0xde, 0x5f, 0xac, 0xdb, 0xb5, 0xed, 0xd8, 0xe2, 0xd9, 0x5c, 0xeb, 0x5a, 0xab, 0x8f, 0x6b, + 0x1d, 0xeb, 0xf7, 0x73, 0x2d, 0x69, 0x48, 0xdb, 0xb5, 0xae, 0x48, 0x72, 0xd7, 0x3a, 0xa2, 0x26, + 0xcd, 0x83, 0x73, 0x0c, 0x70, 0x67, 0xcf, 0xc3, 0x94, 0xda, 0x88, 0x55, 0xc7, 0xf0, 0x0c, 0xff, + 0x41, 0xe0, 0x55, 0xb2, 0x63, 0x96, 0x2f, 0x53, 0x06, 0xb3, 0xc4, 0xd6, 0xc9, 0x9e, 0xd6, 0x40, + 0x14, 0x79, 0x6c, 0x85, 0x71, 0x15, 0xb0, 0xa1, 0x0f, 0xfc, 0x11, 0xb8, 0x0a, 0xbe, 0x16, 0x13, + 0xd0, 0x58, 0xce, 0xe8, 0x8e, 0x81, 0x98, 0xef, 0xe3, 0xea, 0x99, 0xb6, 0xe8, 0x7a, 0x38, 0x05, + 0x7f, 0x08, 0x8a, 0x0e, 0x7a, 0x46, 0x35, 0x0f, 0xb9, 0x36, 0x72, 0x2c, 0xb2, 0xa7, 0x19, 0xba, + 0x63, 0xfa, 0xce, 0x22, 0x76, 0xfe, 0x66, 0x57, 0x45, 0x39, 0xb8, 0x59, 0xe5, 0xf0, 0x66, 0x95, + 0x77, 0xc2, 0x9b, 0xb5, 0x3a, 0xed, 0x97, 0xfa, 0x4f, 0xff, 0x5c, 0x16, 0xd4, 0x37, 0x7d, 0x14, + 0x35, 0x04, 0xd9, 0x08, 0x31, 0xa4, 0x4b, 0x60, 0x89, 0xb9, 0xa4, 0xa2, 0xba, 0x45, 0x28, 0xf2, + 0x90, 0xd9, 0x2e, 0x22, 0x4f, 0x75, 0xcf, 0xdc, 0x44, 0x0e, 0x6e, 0x44, 0x55, 0x6c, 0x0b, 0x5c, + 0xcc, 0x24, 0xcd, 0x23, 0xf2, 0x26, 0x98, 0x32, 0xd9, 0x08, 0xbb, 0x18, 0x66, 0x54, 0xfe, 0x25, + 0x95, 0xf8, 0x55, 0x17, 0x14, 0x28, 0x64, 0xb2, 0x7a, 0x54, 0xdb, 0x8c, 0x96, 0xf9, 0x58, 0x00, + 0x6f, 0xf5, 0x10, 0xe0, 0xc8, 0x4f, 0xc0, 0x49, 0x37, 0x3e, 0x17, 0x5e, 0x3d, 0xab, 0x99, 0xea, + 0x64, 0x02, 0x96, 0xdf, 0x87, 0x1d, 0x78, 0x52, 0x0d, 0x9c, 0x48, 0x88, 0xc1, 0x22, 0xe0, 0xf9, + 0xbb, 0x99, 0x4c, 0xe7, 0x4d, 0x58, 0x02, 0x20, 0xac, 0xaf, 0xb5, 0x4d, 0xb6, 0x99, 0x13, 0x6a, + 0x6c, 0x44, 0xba, 0x0b, 0x14, 0xe6, 0xcd, 0xba, 0x6d, 0x6f, 0xeb, 0x96, 0x47, 0x1e, 0xe9, 0xf6, + 0x06, 0x76, 0xfc, 0x94, 0xab, 0x26, 0xaf, 0x83, 0xda, 0x66, 0x86, 0x3e, 0xe1, 0x57, 0x02, 0x58, + 0xce, 0x0e, 0xc7, 0xe3, 0x75, 0x00, 0x4e, 0xbb, 0xba, 0xe5, 0xf9, 0x35, 0xcb, 0xef, 0x88, 0xd8, + 0x31, 0xe0, 0x21, 0xbb, 0x95, 0x2d, 0x64, 0xba, 0xe5, 0xb5, 0x17, 0x8a, 0x8e, 0x99, 0xd3, 0x4e, + 0x80, 0x93, 0x6e, 0x42, 0x44, 0xfa, 0xaf, 0x00, 0xde, 0x1e, 0xa8, 0x05, 0x6f, 0xf5, 0x3a, 0x9b, + 0xd5, 0xf9, 0x57, 0x2f, 0xca, 0x67, 0x83, 0x52, 0xd0, 0x29, 0xd1, 0x5d, 0xee, 0x7c, 0x9c, 0x1e, + 0x25, 0x25, 0x86, 0xd3, 0x29, 0xd1, 0x5d, 0x5b, 0xe0, 0x1a, 0x78, 0x3d, 0x92, 0xda, 0x47, 0x2d, + 0x7e, 0xc6, 0x16, 0xe4, 0x76, 0x3f, 0x28, 0x07, 0xfd, 0xa0, 0xbc, 0x7d, 0xb8, 0x6b, 0x5b, 0xc6, + 0x1d, 0xd4, 0x52, 0x67, 0x43, 0x8d, 0x3b, 0xa8, 0x25, 0xcd, 0x01, 0x18, 0xa4, 0xae, 0xee, 0xe9, + 0xed, 0x83, 0xf3, 0x04, 0x9c, 0x49, 0x8c, 0xf2, 0x6d, 0xa9, 0x81, 0x29, 0x97, 0x8d, 0xf0, 0x6b, + 0xfe, 0x62, 0xc6, 0xbd, 0xf0, 0x55, 0x78, 0xde, 0x72, 0x00, 0xe9, 0x36, 0x3f, 0xc8, 0x89, 0x0c, + 0xb8, 0xef, 0x52, 0x64, 0xd6, 0x9c, 0xa8, 0x3c, 0x66, 0xe9, 0x43, 0x0f, 0xf8, 0x19, 0x1f, 0x04, + 0x14, 0x35, 0x7f, 0x6f, 0xc5, 0x2f, 0xf3, 0x8e, 0x9d, 0x42, 0xe1, 0xd1, 0x9f, 0x8f, 0xdd, 0xea, + 0xc9, 0xad, 0x43, 0x44, 0xba, 0x0e, 0x4a, 0x89, 0x25, 0x73, 0xd9, 0xfb, 0x1f, 0x01, 0x2c, 0xf6, + 0xd0, 0x8e, 0x7e, 0xa5, 0x5e, 0xa6, 0x42, 0xe6, 0xcb, 0xb4, 0x2b, 0x2b, 0x0a, 0x39, 0xb3, 0x02, + 0xce, 0x81, 0x49, 0xd6, 0xe7, 0xb0, 0x7c, 0x1a, 0x57, 0x83, 0x0f, 0xf8, 0x0e, 0x98, 0xf0, 0xfc, + 0x42, 0x3e, 0xc1, 0x2c, 0x39, 0xef, 0xef, 0xe7, 0x9f, 0x5e, 0x94, 0xe7, 0x03, 0x42, 0x41, 0xcc, + 0x7d, 0xd9, 0xc2, 0x4a, 0x43, 0xa7, 0x7b, 0xf2, 0x5d, 0x54, 0xd7, 0x8d, 0xd6, 0x26, 0x32, 0x54, + 0xa6, 0xe0, 0xb7, 0xc0, 0xe5, 0x9e, 0x11, 0xe3, 0x1b, 0x83, 0x00, 0x68, 0xc7, 0x9c, 0x9f, 0xf5, + 0xad, 0x4c, 0xf9, 0x35, 0x28, 0x9a, 0x6a, 0x0c, 0x58, 0x3a, 0xe0, 0xd5, 0x28, 0xc9, 0x0d, 0x22, + 0xd9, 0xf7, 0x75, 0xb2, 0x83, 0xf9, 0x57, 0x78, 0x91, 0x8e, 0xb8, 0x1b, 0x92, 0x0e, 0x56, 0x72, + 0x2c, 0xc9, 0xc3, 0x71, 0x09, 0xc0, 0x68, 0x0b, 0xc3, 0x54, 0x0a, 0x93, 0x33, 0x2a, 0x1d, 0x41, + 0xd9, 0x34, 0x59, 0x8b, 0x73, 0x31, 0xbd, 0x69, 0xda, 0xc0, 0x8d, 0x86, 0x45, 0x88, 0x85, 0x1d, + 0x35, 0xe6, 0xd1, 0x57, 0xd6, 0xc7, 0x49, 0x75, 0x70, 0x29, 0x9b, 0x21, 0xdc, 0xcf, 0x30, 0xa7, + 0x84, 0xbc, 0x39, 0x25, 0xf1, 0x63, 0x54, 0xb5, 0xb1, 0xb1, 0x4f, 0x1e, 0x3a, 0xd4, 0xb2, 0xef, + 0xa1, 0x67, 0x74, 0xcb, 0xc5, 0xc6, 0x5e, 0x58, 0xc6, 0x1e, 0xf3, 0xc6, 0x2f, 0x5d, 0x86, 0x5b, + 0x70, 0x05, 0x9c, 0xdd, 0x65, 0xf3, 0xda, 0xa1, 0x2f, 0xa0, 0xb1, 0xfe, 0x05, 0xf9, 0x22, 0xcc, + 0xa8, 0x09, 0x75, 0x6e, 0x37, 0x45, 0x7d, 0xf5, 0x37, 0x65, 0x30, 0xc9, 0xc0, 0xe1, 0x91, 0x00, + 0xe6, 0xd2, 0xa8, 0x30, 0xbc, 0x99, 0x3f, 0x7d, 0x93, 0xfc, 0x5b, 0x5c, 0x1f, 0x01, 0x21, 0x70, + 0x4f, 0xda, 0xfa, 0xf1, 0x97, 0x7f, 0xfd, 0x79, 0x61, 0x0d, 0xde, 0x18, 0xfc, 0xb6, 0x12, 0x25, + 0x1c, 0xe7, 0xda, 0xca, 0xf3, 0x30, 0x49, 0x3e, 0x82, 0x5f, 0x0a, 0xfc, 0x4a, 0x48, 0x66, 0x31, + 0x5c, 0xcb, 0x6f, 0x61, 0x82, 0xac, 0x8b, 0x37, 0x87, 0x07, 0xe0, 0x1e, 0xbe, 0xcb, 0x3c, 0xbc, + 0x0c, 0x57, 0x72, 0x78, 0x18, 0xd0, 0x78, 0xf8, 0x71, 0x01, 0x14, 0x7b, 0x70, 0x73, 0x02, 0xef, + 0x0e, 0x69, 0x59, 0xea, 0x33, 0x80, 0xf8, 0xc1, 0x31, 0xa1, 0x71, 0xa7, 0xdf, 0x67, 0x4e, 0x57, + 0xe1, 0xcd, 0xbc, 0x4e, 0xfb, 0x7c, 0xd1, 0xa3, 0x5a, 0xc4, 0xb0, 0xe1, 0xff, 0x04, 0x70, 0x36, + 0x9d, 0xea, 0x13, 0x78, 0x67, 0x68, 0xa3, 0xbb, 0xdf, 0x14, 0xc4, 0xbb, 0xc7, 0x03, 0xc6, 0x03, + 0x70, 0x9b, 0x05, 0x60, 0x1d, 0xae, 0x0d, 0x11, 0x00, 0xec, 0xc6, 0xfc, 0xff, 0x77, 0x48, 0x93, + 0x52, 0x09, 0x27, 0xbc, 0x95, 0xdd, 0xea, 0x7e, 0xd4, 0x59, 0xbc, 0x3d, 0x32, 0x0e, 0x77, 0x7c, + 0x9d, 0x39, 0x7e, 0x1d, 0xbe, 0x9b, 0xe1, 0xb1, 0x34, 0x7a, 0x84, 0x48, 0xb4, 0x92, 0x29, 0x2e, + 0xc7, 0x9b, 0x9c, 0xa1, 0x5c, 0x4e, 0xa1, 0xd4, 0x43, 0xb9, 0x9c, 0xc6, 0x88, 0x87, 0x73, 0x39, + 0x71, 0x8b, 0xc1, 0xdf, 0x0b, 0xbc, 0xd1, 0x4d, 0x90, 0x61, 0xf8, 0x5e, 0x76, 0x13, 0xd3, 0x38, + 0xb6, 0xb8, 0x36, 0xb4, 0x3e, 0x77, 0xed, 0x2a, 0x73, 0x6d, 0x15, 0x2e, 0x0f, 0x76, 0x8d, 0x72, + 0x80, 0xe0, 0x3d, 0x15, 0xfe, 0xb2, 0x00, 0xce, 0x67, 0x60, 0xb7, 0xf0, 0x7e, 0x76, 0x13, 0x33, + 0xb1, 0x6a, 0x71, 0xfb, 0xf8, 0x00, 0x79, 0x10, 0xee, 0xb0, 0x20, 0x6c, 0xc1, 0x8d, 0xc1, 0x41, + 0xf0, 0x22, 0xc4, 0x76, 0x4e, 0x7b, 0x0c, 0x53, 0x0b, 0xd8, 0x3a, 0xfc, 0x47, 0x17, 0x1b, 0x4f, + 0x92, 0x4c, 0x02, 0x73, 0xdc, 0xaa, 0x3d, 0x28, 0xbf, 0x58, 0x1d, 0x05, 0x82, 0x7b, 0x5d, 0x65, + 0x5e, 0x7f, 0x07, 0x5e, 0x1b, 0xec, 0x75, 0x48, 0xf6, 0xb5, 0xce, 0x0b, 0xec, 0x17, 0x05, 0xfe, + 0xb8, 0x9c, 0x81, 0x5d, 0xc3, 0x9d, 0xec, 0x46, 0x67, 0xe7, 0xfe, 0xe2, 0xc3, 0x63, 0x46, 0xe5, + 0xd1, 0xb9, 0xce, 0xa2, 0x73, 0x05, 0x5e, 0xce, 0x5d, 0xdf, 0x2d, 0x13, 0xfe, 0x56, 0x00, 0xb3, + 0x31, 0x02, 0x0b, 0xdf, 0xc9, 0xb1, 0x5d, 0x71, 0x22, 0x2c, 0x5e, 0xcd, 0xaf, 0xc8, 0xed, 0x5f, + 0x66, 0xf6, 0x2f, 0xc1, 0x4a, 0x86, 0xdd, 0x0d, 0x8c, 0xfc, 0x59, 0x78, 0xa0, 0xfb, 0x53, 0xd9, + 0x3c, 0x07, 0x3a, 0x13, 0xbb, 0xce, 0x73, 0xa0, 0xb3, 0xb1, 0xec, 0x3c, 0xdd, 0x09, 0xf6, 0x41, + 0x34, 0xcb, 0xd1, 0xda, 0x24, 0x2d, 0xde, 0x77, 0xfe, 0xae, 0x00, 0x2e, 0x64, 0x66, 0x4f, 0xf0, + 0xe1, 0xb0, 0xcd, 0x64, 0x5f, 0x02, 0x28, 0x3e, 0x3a, 0x6e, 0x58, 0x1e, 0xa6, 0xc7, 0x2c, 0x4c, + 0x3b, 0x50, 0xcd, 0xdd, 0xb9, 0x6a, 0x2e, 0xf2, 0xda, 0x11, 0x53, 0x9e, 0x77, 0x52, 0xb6, 0x8f, + 0xe0, 0xaf, 0x0b, 0xe0, 0xeb, 0x59, 0x98, 0x18, 0xdc, 0x1e, 0xa1, 0x31, 0x49, 0x65, 0x97, 0xe2, + 0x87, 0xc7, 0x88, 0xc8, 0x23, 0xf5, 0x84, 0x45, 0xea, 0x31, 0xfc, 0x5e, 0x9e, 0x48, 0x45, 0x50, + 0x9a, 0xcf, 0x18, 0x63, 0x59, 0x95, 0x16, 0xaf, 0x7f, 0x75, 0xb6, 0xc1, 0xb1, 0x13, 0xb7, 0x31, + 0xca, 0x3b, 0x44, 0x18, 0x95, 0xcd, 0xd1, 0x40, 0x46, 0xe8, 0xfb, 0xd3, 0x4f, 0xd6, 0x3f, 0x05, + 0xfe, 0xe7, 0x41, 0x1a, 0x3b, 0x86, 0x39, 0x9e, 0x5e, 0xfa, 0x30, 0x70, 0xf1, 0xd6, 0xa8, 0x30, + 0xf9, 0x3b, 0xc0, 0x1e, 0x64, 0xbe, 0xfa, 0xdd, 0xcf, 0x8f, 0x4a, 0xc2, 0x17, 0x47, 0x25, 0xe1, + 0x2f, 0x47, 0x25, 0xe1, 0xd3, 0x97, 0xa5, 0xb1, 0x2f, 0x5e, 0x96, 0xc6, 0xfe, 0xf8, 0xb2, 0x34, + 0xf6, 0xf8, 0x46, 0xdd, 0xa2, 0x7b, 0x87, 0xbb, 0xb2, 0x81, 0x1b, 0xfc, 0xdf, 0xf1, 0xd8, 0x2a, + 0xdf, 0x8e, 0x56, 0x69, 0x5e, 0x51, 0x9e, 0x75, 0x74, 0x64, 0x2d, 0x17, 0x91, 0xdd, 0x29, 0xf6, + 0x4f, 0xc6, 0xe5, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x7d, 0x81, 0x96, 0x00, 0xbd, 0x20, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2851,6 +2872,21 @@ func (m *Chain) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.AllowInactiveVals { + i-- + if m.AllowInactiveVals { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x50 + } + if m.MinStake != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.MinStake)) + i-- + dAtA[i] = 0x48 + } if len(m.Denylist) > 0 { for iNdEx := len(m.Denylist) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.Denylist[iNdEx]) @@ -3936,6 +3972,12 @@ func (m *Chain) Size() (n int) { n += 1 + l + sovQuery(uint64(l)) } } + if m.MinStake != 0 { + n += 1 + sovQuery(uint64(m.MinStake)) + } + if m.AllowInactiveVals { + n += 2 + } return n } @@ -5123,6 +5165,45 @@ func (m *Chain) Unmarshal(dAtA []byte) error { } m.Denylist = append(m.Denylist, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex + case 9: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field MinStake", wireType) + } + m.MinStake = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.MinStake |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 10: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field AllowInactiveVals", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.AllowInactiveVals = bool(v != 0) default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) From cc68344cd0f1e8facf331da3bc6b8778d2ca633d Mon Sep 17 00:00:00 2001 From: Philip Offtermatt <57488781+p-offtermatt@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:27:03 +0200 Subject: [PATCH 3/3] docs: Add some info on how to generate new validators (#2170) * Add some info on how to generate new validators * Unify comment styles --- tests/e2e/README.md | 57 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/tests/e2e/README.md b/tests/e2e/README.md index cc74e57834..eb8e660396 100644 --- a/tests/e2e/README.md +++ b/tests/e2e/README.md @@ -187,6 +187,63 @@ which is done in `getChainState`. Typically, this is ultimately done, like actions, by issuing commands to the chain binary inside the docker container. See how this is done e.g. for `getBalance`. +## Defining extra validators + +In `config.go`, you can define extra validators that are not part of the default test configuration, for example +for tests that need more than 3 validators. + +To create a configuration for a new validator, it suffices to add a new `ValidatorConfig`. For example, this is the validator config for alice: + +``` +ValidatorID("alice"): { + Mnemonic: "pave immune ethics wrap gain ceiling always holiday employ earth tumble real ice engage false unable carbon equal fresh sick tattoo nature pupil nuclear", + DelAddress: "cosmos19pe9pg5dv9k5fzgzmsrgnw9rl9asf7ddwhu7lm", + DelAddressOnConsumer: "consumer19pe9pg5dv9k5fzgzmsrgnw9rl9asf7ddtz33vu", + ValoperAddress: "cosmosvaloper19pe9pg5dv9k5fzgzmsrgnw9rl9asf7ddtrgtng", + ValoperAddressOnConsumer: "consumervaloper19pe9pg5dv9k5fzgzmsrgnw9rl9asf7ddy6jwzg", + ValconsAddress: "cosmosvalcons1qmq08eruchr5sf5s3rwz7djpr5a25f7xw4mceq", + ValconsAddressOnConsumer: "consumervalcons1qmq08eruchr5sf5s3rwz7djpr5a25f7xpvpagq", + PrivValidatorKey: `{"address":"06C0F3E47CC5C748269088DC2F36411D3AAA27C6","pub_key":{"type":"tendermint/PubKeyEd25519","value":"RrclQz9bIhkIy/gfL485g3PYMeiIku4qeo495787X10="},"priv_key":{"type":"tendermint/PrivKeyEd25519","value":"uX+ZpDMg89a6gtqs/+MQpCTSqlkZ0nJQJOhLlCJvwvdGtyVDP1siGQjL+B8vjzmDc9gx6IiS7ip6jj3nvztfXQ=="}}`, + NodeKey: `{"priv_key":{"type":"tendermint/PrivKeyEd25519","value":"fjw4/DAhyRPnwKgXns5SV7QfswRSXMWJpHS7TyULDmJ8ofUc5poQP8dgr8bZRbCV5RV8cPqDq3FPdqwpmUbmdA=="}}`, + IpSuffix: "4", + + // consumer chain assigned key + ConsumerMnemonic: "exile install vapor thing little toss immune notable lounge december final easy strike title end program interest quote cloth forget forward job october twenty", + ConsumerDelAddress: "consumer1eeeggku6dzk3mv7wph3zq035rhtd890sh9rl32", + ConsumerDelAddressOnProvider: "cosmos1eeeggku6dzk3mv7wph3zq035rhtd890sjswszd", + ConsumerValoperAddress: "consumervaloper1eeeggku6dzk3mv7wph3zq035rhtd890scaqql7", + ConsumerValoperAddressOnProvider: "cosmosvaloper1eeeggku6dzk3mv7wph3zq035rhtd890shy69w7", + ConsumerValconsAddress: "consumervalcons1muys5jyqk4xd27e208nym85kn0t4zjcfk9q5ce", + ConsumerValconsAddressOnProvider: "cosmosvalcons1muys5jyqk4xd27e208nym85kn0t4zjcfeu63fe", + ConsumerValPubKey: `{"@type":"/cosmos.crypto.ed25519.PubKey","key":"ujY14AgopV907IYgPAk/5x8c9267S4fQf89nyeCPTes="}`, + ConsumerPrivValidatorKey: `{"address":"DF090A4880B54CD57B2A79E64D9E969BD7514B09","pub_key":{"type":"tendermint/PubKeyEd25519","value":"ujY14AgopV907IYgPAk/5x8c9267S4fQf89nyeCPTes="},"priv_key":{"type":"tendermint/PrivKeyEd25519","value":"TRJgf7lkTjs/sj43pyweEOanyV7H7fhnVivOi0A4yjW6NjXgCCilX3TshiA8CT/nHxz3brtLh9B/z2fJ4I9N6w=="}}`, + ConsumerNodeKey: `{"priv_key":{"type":"tendermint/PrivKeyEd25519","value":"F966RL9pi20aXRzEBe4D0xRQJtZt696Xxz44XUON52cFc83FMn1WXJbP6arvA2JPyn2LA3DLKCFHSgALrCGXGA=="}}`, + UseConsumerKey: false, + }, +``` + +Here is a short guide for generating this config for a new validator: +``` +# Commands +interchain-security-pd init bob --home ./bob +cat ./bob/config/priv_validator_key.json # gets you the private key +interchain-security-pd tendermint show-address --home ./bob # returns valcons +interchain-security-pd keys add bob --keyring-backend test --home ./bob --output json # gives mnemonic, account address +interchain-security-pd keys show bob --keyring-backend test --bech=val --home ./bob --output json # returns valoper address +cat ./bob/config/node_key.json # returns the node key +``` + +Fill these values into the `ValidatorConfig` struct in `config.go`. +To get the values for the consumer chain, you can simply run the command in question using the +`interchain-security-cd` binary. +For example, +``` +interchain-security-cd tendermint show-address --home ./bob +``` +will return the validator consensus address on the consumer chain. + +One important note is that the `IPSuffix` field should be unique for each validator. + ## Traces It is possible to dump the test cases (in the form of actions+state checks)