From bf11b1bf1fa0c52fb2cd51e4f4ab0c90a4dd38a0 Mon Sep 17 00:00:00 2001 From: Luke Rhoads <51463884+lukerhoads@users.noreply.github.com> Date: Fri, 24 Sep 2021 09:37:34 -0500 Subject: [PATCH] refactor: Implementing sigs.k8s.io YAML to remove .proto yaml annotations (#9780) ## Description Draft of: #9705 Started off with changing codec `MarshalYaml` function to directly go from JSON to yaml using the new library. Replaced the only usage of UnmarshalYaml per request. --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting)) - [ ] provided a link to the relevant issue or specification - [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#testing) - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [x] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [x] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [x] reviewed state machine logic - [x] reviewed API design and naming - [x] reviewed documentation is accurate - [x] reviewed tests and test coverage - [x] manually tested (if applicable) --- CHANGELOG.md | 2 + client/context.go | 16 +- client/keys/parse.go | 2 +- client/keys/utils.go | 2 +- codec/yaml.go | 13 +- crypto/keys/multisig/keys.pb.go | 31 +- go.mod | 3 +- go.sum | 2 + proto/cosmos/auth/v1beta1/auth.proto | 16 +- proto/cosmos/bank/v1beta1/bank.proto | 4 +- proto/cosmos/bank/v1beta1/genesis.proto | 2 +- proto/cosmos/bank/v1beta1/tx.proto | 4 +- proto/cosmos/base/abci/v1beta1/abci.proto | 10 +- .../capability/v1beta1/capability.proto | 6 +- proto/cosmos/capability/v1beta1/genesis.proto | 2 +- proto/cosmos/crisis/v1beta1/genesis.proto | 2 +- proto/cosmos/crisis/v1beta1/tx.proto | 4 +- proto/cosmos/crypto/multisig/keys.proto | 4 +- .../distribution/v1beta1/distribution.proto | 34 +- .../cosmos/distribution/v1beta1/genesis.proto | 51 +- proto/cosmos/distribution/v1beta1/tx.proto | 10 +- proto/cosmos/evidence/v1beta1/evidence.proto | 2 +- proto/cosmos/genutil/v1beta1/genesis.proto | 3 +- proto/cosmos/gov/v1beta1/genesis.proto | 8 +- proto/cosmos/gov/v1beta1/gov.proto | 37 +- proto/cosmos/gov/v1beta1/tx.proto | 11 +- proto/cosmos/mint/v1beta1/mint.proto | 7 +- proto/cosmos/slashing/v1beta1/genesis.proto | 8 +- proto/cosmos/slashing/v1beta1/slashing.proto | 16 +- proto/cosmos/slashing/v1beta1/tx.proto | 2 +- proto/cosmos/staking/v1beta1/genesis.proto | 5 +- proto/cosmos/staking/v1beta1/staking.proto | 67 +- proto/cosmos/staking/v1beta1/tx.proto | 27 +- proto/cosmos/upgrade/v1beta1/upgrade.proto | 2 +- proto/cosmos/vesting/v1beta1/tx.proto | 12 +- proto/cosmos/vesting/v1beta1/vesting.proto | 17 +- server/tm_cmds.go | 2 +- types/abci.pb.go | 125 +- types/address.go | 6 +- types/address_test.go | 2 +- types/decimal_test.go | 2 +- types/result.go | 2 +- version/command.go | 2 +- x/auth/migrations/legacytx/stdsig_test.go | 11 +- x/auth/migrations/legacytx/stdsign.go | 7 +- x/auth/types/account.go | 14 +- x/auth/types/account_test.go | 4 +- x/auth/types/auth.pb.go | 101 +- x/auth/types/params.go | 2 +- x/auth/vesting/types/period.go | 2 +- x/auth/vesting/types/tx.pb.go | 81 +- x/auth/vesting/types/vesting.pb.go | 89 +- x/auth/vesting/types/vesting_account.go | 22 +- x/bank/types/bank.pb.go | 88 +- x/bank/types/genesis.pb.go | 55 +- x/bank/types/params.go | 14 +- x/bank/types/params_test.go | 15 +- x/bank/types/tx.pb.go | 63 +- x/capability/types/capability.pb.go | 36 +- x/capability/types/genesis.pb.go | 29 +- x/capability/types/types.go | 2 +- x/crisis/types/genesis.pb.go | 22 +- x/crisis/types/tx.pb.go | 33 +- x/distribution/types/distribution.pb.go | 169 +- x/distribution/types/genesis.pb.go | 174 +- x/distribution/types/params.go | 2 +- x/distribution/types/tx.pb.go | 84 +- x/evidence/migrations/v038/types.go | 2 +- x/evidence/types/evidence.go | 2 +- x/evidence/types/evidence.pb.go | 47 +- x/evidence/types/evidence_test.go | 13 +- x/genutil/types/genesis.pb.go | 25 +- x/genutil/types/genesis_state.go | 1 - x/gov/types/deposit.go | 2 +- x/gov/types/genesis.pb.go | 62 +- x/gov/types/gov.pb.go | 212 ++- x/gov/types/msgs.go | 2 +- x/gov/types/params.go | 2 +- x/gov/types/proposal.go | 2 +- x/gov/types/tally.go | 2 +- x/gov/types/tx.pb.go | 96 +- x/gov/types/vote.go | 2 +- x/mint/types/mint.pb.go | 68 +- x/mint/types/params.go | 2 +- x/params/types/proposal/proposal.go | 2 +- x/slashing/types/genesis.pb.go | 66 +- x/slashing/types/slashing.pb.go | 98 +- x/slashing/types/tx.pb.go | 31 +- x/staking/migrations/v040/types.go | 2 +- x/staking/types/commission.go | 2 +- x/staking/types/delegation.go | 2 +- x/staking/types/genesis.pb.go | 72 +- x/staking/types/params.go | 2 +- x/staking/types/staking.pb.go | 1511 ++++++++--------- x/staking/types/tx.pb.go | 136 +- x/staking/types/validator.go | 13 +- x/upgrade/types/upgrade.pb.go | 62 +- 97 files changed, 2046 insertions(+), 2199 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bee78d1cd..d26e8e3a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -103,9 +103,11 @@ Ref: https://keepachangelog.com/en/1.0.0/ * [\#9695](https://github.com/cosmos/cosmos-sdk/pull/9695) ` keys migrate` CLI command now takes no arguments * [\#9246](https://github.com/cosmos/cosmos-sdk/pull/9246) Removed the CLI flag `--setup-config-only` from the `testnet` command and added the subcommand `init-files`. +* [\#9780](https://github.com/cosmos/cosmos-sdk/pull/9780) Use sigs.k8s.io for yaml, which might lead to minor YAML output changes ### Improvements +* [\#9780](https://github.com/cosmos/cosmos-sdk/pull/9780) Remove gogoproto `moretags` YAML annotations and add `sigs.k8s.io/yaml` for YAML marshalling. * (x/bank) [\#10134](https://github.com/cosmos/cosmos-sdk/pull/10134) Add `HasDenomMetadata` function to bank `Keeper` to check if a client coin denom metadata exists in state. * (store) [\#10026](https://github.com/cosmos/cosmos-sdk/pull/10026) Improve CacheKVStore datastructures / algorithms, to no longer take O(N^2) time when interleaving iterators and insertions. * (types) [\#10076](https://github.com/cosmos/cosmos-sdk/pull/10076) Significantly speedup and lower allocations for `Coins.String()`. diff --git a/client/context.go b/client/context.go index 690eec4ef..67096c33a 100644 --- a/client/context.go +++ b/client/context.go @@ -2,13 +2,12 @@ package client import ( "bufio" - "encoding/json" "io" "os" "github.com/spf13/viper" - "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" "github.com/gogo/protobuf/proto" rpcclient "github.com/tendermint/tendermint/rpc/client" @@ -279,16 +278,9 @@ func (ctx Context) PrintObjectLegacy(toPrint interface{}) error { } func (ctx Context) printOutput(out []byte) error { + var err error if ctx.OutputFormat == "text" { - // handle text format by decoding and re-encoding JSON as YAML - var j interface{} - - err := json.Unmarshal(out, &j) - if err != nil { - return err - } - - out, err = yaml.Marshal(j) + out, err = yaml.JSONToYAML(out) if err != nil { return err } @@ -299,7 +291,7 @@ func (ctx Context) printOutput(out []byte) error { writer = os.Stdout } - _, err := writer.Write(out) + _, err = writer.Write(out) if err != nil { return err } diff --git a/client/keys/parse.go b/client/keys/parse.go index b1169d68c..ba3d3c64b 100644 --- a/client/keys/parse.go +++ b/client/keys/parse.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" "github.com/tendermint/tendermint/libs/cli" - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/bech32" diff --git a/client/keys/utils.go b/client/keys/utils.go index 2e144eaf4..8af8221f0 100644 --- a/client/keys/utils.go +++ b/client/keys/utils.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" cryptokeyring "github.com/cosmos/cosmos-sdk/crypto/keyring" ) diff --git a/codec/yaml.go b/codec/yaml.go index fc8b7d3f6..b81d98e1f 100644 --- a/codec/yaml.go +++ b/codec/yaml.go @@ -1,10 +1,8 @@ package codec import ( - "encoding/json" - "github.com/gogo/protobuf/proto" - "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" ) // MarshalYAML marshals toPrint using JSONCodec to leverage specialized MarshalJSON methods @@ -18,12 +16,5 @@ func MarshalYAML(cdc JSONCodec, toPrint proto.Message) ([]byte, error) { return nil, err } - // generate YAML by decoding JSON and re-encoding to YAML - var j interface{} - err = json.Unmarshal(bz, &j) - if err != nil { - return nil, err - } - - return yaml.Marshal(j) + return yaml.JSONToYAML(bz) } diff --git a/crypto/keys/multisig/keys.pb.go b/crypto/keys/multisig/keys.pb.go index 27ccf0fa5..0016efa8a 100644 --- a/crypto/keys/multisig/keys.pb.go +++ b/crypto/keys/multisig/keys.pb.go @@ -28,8 +28,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // which nests multiple public keys and a threshold, // it uses legacy amino address rules. type LegacyAminoPubKey struct { - Threshold uint32 `protobuf:"varint,1,opt,name=threshold,proto3" json:"threshold,omitempty" yaml:"threshold"` - PubKeys []*types.Any `protobuf:"bytes,2,rep,name=public_keys,json=publicKeys,proto3" json:"public_keys,omitempty" yaml:"pubkeys"` + Threshold uint32 `protobuf:"varint,1,opt,name=threshold,proto3" json:"threshold,omitempty"` + PubKeys []*types.Any `protobuf:"bytes,2,rep,name=public_keys,json=publicKeys,proto3" json:"public_keys,omitempty"` } func (m *LegacyAminoPubKey) Reset() { *m = LegacyAminoPubKey{} } @@ -72,25 +72,24 @@ func init() { func init() { proto.RegisterFile("cosmos/crypto/multisig/keys.proto", fileDescriptor_46b57537e097d47d) } var fileDescriptor_46b57537e097d47d = []byte{ - // 287 bytes of a gzipped FileDescriptorProto + // 258 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4c, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0x4f, 0x2e, 0xaa, 0x2c, 0x28, 0xc9, 0xd7, 0xcf, 0x2d, 0xcd, 0x29, 0xc9, 0x2c, 0xce, 0x4c, 0xd7, 0xcf, 0x4e, 0xad, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x83, 0x28, 0xd1, 0x83, 0x28, 0xd1, 0x83, 0x29, 0x91, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x2b, 0xd1, 0x07, 0xb1, 0x20, 0xaa, 0xa5, 0x24, 0xd3, 0xf3, 0xf3, 0xd3, 0x73, 0x52, 0xf5, 0xc1, 0xbc, 0xa4, - 0xd2, 0x34, 0xfd, 0xc4, 0xbc, 0x4a, 0x88, 0x94, 0xd2, 0x62, 0x46, 0x2e, 0x41, 0x9f, 0xd4, 0xf4, - 0xc4, 0xe4, 0x4a, 0xc7, 0xdc, 0xcc, 0xbc, 0xfc, 0x80, 0xd2, 0x24, 0xef, 0xd4, 0x4a, 0x21, 0x23, - 0x2e, 0xce, 0x92, 0x8c, 0xa2, 0xd4, 0xe2, 0x8c, 0xfc, 0x9c, 0x14, 0x09, 0x46, 0x05, 0x46, 0x0d, - 0x5e, 0x27, 0x91, 0x4f, 0xf7, 0xe4, 0x05, 0x2a, 0x13, 0x73, 0x73, 0xac, 0x94, 0xe0, 0x52, 0x4a, - 0x41, 0x08, 0x65, 0x42, 0x21, 0x5c, 0xdc, 0x05, 0xa5, 0x49, 0x39, 0x99, 0xc9, 0xf1, 0x20, 0x77, - 0x4a, 0x30, 0x29, 0x30, 0x6b, 0x70, 0x1b, 0x89, 0xe8, 0x41, 0xac, 0xd6, 0x83, 0x59, 0xad, 0xe7, - 0x98, 0x57, 0xe9, 0x24, 0xfb, 0xe8, 0x9e, 0x3c, 0x3b, 0xc4, 0xaa, 0xe2, 0x4f, 0xf7, 0xe4, 0xf9, - 0x20, 0xc6, 0x16, 0x94, 0x26, 0x81, 0x74, 0x2a, 0x05, 0x71, 0x41, 0xcc, 0x01, 0xc9, 0x5a, 0xb1, - 0x74, 0x2c, 0x90, 0x67, 0x70, 0xf2, 0x3e, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, - 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, - 0x28, 0xc3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0x58, 0xb0, 0x81, - 0x29, 0xdd, 0xe2, 0x94, 0x6c, 0x58, 0x08, 0x82, 0x8c, 0x85, 0x07, 0x63, 0x12, 0x1b, 0xd8, 0x2d, - 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x76, 0x6e, 0xbf, 0x3c, 0x67, 0x01, 0x00, 0x00, + 0xd2, 0x34, 0xfd, 0xc4, 0xbc, 0x4a, 0x88, 0x94, 0x52, 0x35, 0x97, 0xa0, 0x4f, 0x6a, 0x7a, 0x62, + 0x72, 0xa5, 0x63, 0x6e, 0x66, 0x5e, 0x7e, 0x40, 0x69, 0x92, 0x77, 0x6a, 0xa5, 0x90, 0x0c, 0x17, + 0x67, 0x49, 0x46, 0x51, 0x6a, 0x71, 0x46, 0x7e, 0x4e, 0x8a, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x6f, + 0x10, 0x42, 0x40, 0xc8, 0x89, 0x8b, 0xbb, 0xa0, 0x34, 0x29, 0x27, 0x33, 0x39, 0x1e, 0xe4, 0x20, + 0x09, 0x26, 0x05, 0x66, 0x0d, 0x6e, 0x23, 0x11, 0x3d, 0x88, 0x1d, 0x7a, 0x30, 0x3b, 0xf4, 0x1c, + 0xf3, 0x2a, 0x9d, 0xb8, 0x1f, 0xdd, 0x93, 0x67, 0x87, 0x18, 0x5a, 0x1c, 0xc4, 0x05, 0xd1, 0x05, + 0x62, 0x5b, 0xb1, 0x74, 0x2c, 0x90, 0x67, 0x70, 0xf2, 0x3e, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, + 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, + 0x63, 0x39, 0x86, 0x28, 0xc3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, + 0x58, 0x68, 0x80, 0x29, 0xdd, 0xe2, 0x94, 0x6c, 0x58, 0xc0, 0x80, 0xac, 0x87, 0x87, 0x4e, 0x12, + 0x1b, 0xd8, 0x66, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x33, 0x70, 0x72, 0xd8, 0x3e, 0x01, + 0x00, 0x00, } func (m *LegacyAminoPubKey) Marshal() (dAtA []byte, err error) { diff --git a/go.mod b/go.mod index 0155ecc43..d063a3a05 100644 --- a/go.mod +++ b/go.mod @@ -54,7 +54,7 @@ require ( google.golang.org/grpc v1.40.0 google.golang.org/protobuf v1.27.1 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect - gopkg.in/yaml.v2 v2.4.0 + sigs.k8s.io/yaml v1.2.0 ) require ( @@ -118,6 +118,7 @@ require ( golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect golang.org/x/text v0.3.6 // indirect gopkg.in/ini.v1 v1.63.2 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect nhooyr.io/websocket v1.8.6 // indirect ) diff --git a/go.sum b/go.sum index 32b6e7ff8..12c0ac0f3 100644 --- a/go.sum +++ b/go.sum @@ -1303,4 +1303,6 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= +sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= +sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/proto/cosmos/auth/v1beta1/auth.proto b/proto/cosmos/auth/v1beta1/auth.proto index 2c4bba017..a9e1e7e83 100644 --- a/proto/cosmos/auth/v1beta1/auth.proto +++ b/proto/cosmos/auth/v1beta1/auth.proto @@ -19,8 +19,8 @@ message BaseAccount { string address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; google.protobuf.Any pub_key = 2 - [(gogoproto.jsontag) = "public_key,omitempty", (gogoproto.moretags) = "yaml:\"public_key\""]; - uint64 account_number = 3 [(gogoproto.moretags) = "yaml:\"account_number\""]; + [(gogoproto.jsontag) = "public_key,omitempty"]; + uint64 account_number = 3; uint64 sequence = 4; } @@ -30,7 +30,7 @@ message ModuleAccount { option (gogoproto.goproto_stringer) = false; option (cosmos_proto.implements_interface) = "ModuleAccountI"; - BaseAccount base_account = 1 [(gogoproto.embed) = true, (gogoproto.moretags) = "yaml:\"base_account\""]; + BaseAccount base_account = 1 [(gogoproto.embed) = true]; string name = 2; repeated string permissions = 3; } @@ -40,11 +40,11 @@ message Params { option (gogoproto.equal) = true; option (gogoproto.goproto_stringer) = false; - uint64 max_memo_characters = 1 [(gogoproto.moretags) = "yaml:\"max_memo_characters\""]; - uint64 tx_sig_limit = 2 [(gogoproto.moretags) = "yaml:\"tx_sig_limit\""]; - uint64 tx_size_cost_per_byte = 3 [(gogoproto.moretags) = "yaml:\"tx_size_cost_per_byte\""]; + uint64 max_memo_characters = 1; + uint64 tx_sig_limit = 2; + uint64 tx_size_cost_per_byte = 3; uint64 sig_verify_cost_ed25519 = 4 - [(gogoproto.customname) = "SigVerifyCostED25519", (gogoproto.moretags) = "yaml:\"sig_verify_cost_ed25519\""]; + [(gogoproto.customname) = "SigVerifyCostED25519"]; uint64 sig_verify_cost_secp256k1 = 5 - [(gogoproto.customname) = "SigVerifyCostSecp256k1", (gogoproto.moretags) = "yaml:\"sig_verify_cost_secp256k1\""]; + [(gogoproto.customname) = "SigVerifyCostSecp256k1"]; } diff --git a/proto/cosmos/bank/v1beta1/bank.proto b/proto/cosmos/bank/v1beta1/bank.proto index f05a899f0..3ae2074ff 100644 --- a/proto/cosmos/bank/v1beta1/bank.proto +++ b/proto/cosmos/bank/v1beta1/bank.proto @@ -10,8 +10,8 @@ option go_package = "github.com/cosmos/cosmos-sdk/x/bank/types"; // Params defines the parameters for the bank module. message Params { option (gogoproto.goproto_stringer) = false; - repeated SendEnabled send_enabled = 1 [(gogoproto.moretags) = "yaml:\"send_enabled,omitempty\""]; - bool default_send_enabled = 2 [(gogoproto.moretags) = "yaml:\"default_send_enabled,omitempty\""]; + repeated SendEnabled send_enabled = 1; + bool default_send_enabled = 2; } // SendEnabled maps coin denom to a send_enabled status (whether a denom is diff --git a/proto/cosmos/bank/v1beta1/genesis.proto b/proto/cosmos/bank/v1beta1/genesis.proto index 17fc88c46..aa35790b7 100644 --- a/proto/cosmos/bank/v1beta1/genesis.proto +++ b/proto/cosmos/bank/v1beta1/genesis.proto @@ -22,7 +22,7 @@ message GenesisState { [(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", (gogoproto.nullable) = false]; // denom_metadata defines the metadata of the differents coins. - repeated Metadata denom_metadata = 4 [(gogoproto.moretags) = "yaml:\"denom_metadata\"", (gogoproto.nullable) = false]; + repeated Metadata denom_metadata = 4 [(gogoproto.nullable) = false]; } // Balance defines an account address and balance pair used in the bank module's diff --git a/proto/cosmos/bank/v1beta1/tx.proto b/proto/cosmos/bank/v1beta1/tx.proto index be660e8ab..25e0f20cb 100644 --- a/proto/cosmos/bank/v1beta1/tx.proto +++ b/proto/cosmos/bank/v1beta1/tx.proto @@ -22,8 +22,8 @@ message MsgSend { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string from_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"from_address\""]; - string to_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"to_address\""]; + string from_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + string to_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; repeated cosmos.base.v1beta1.Coin amount = 3 [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; } diff --git a/proto/cosmos/base/abci/v1beta1/abci.proto b/proto/cosmos/base/abci/v1beta1/abci.proto index 72da2aacc..8bfeaf8e1 100644 --- a/proto/cosmos/base/abci/v1beta1/abci.proto +++ b/proto/cosmos/base/abci/v1beta1/abci.proto @@ -72,10 +72,10 @@ message Attribute { // GasInfo defines tx execution gas context. message GasInfo { // GasWanted is the maximum units of work we allow this tx to perform. - uint64 gas_wanted = 1 [(gogoproto.moretags) = "yaml:\"gas_wanted\""]; + uint64 gas_wanted = 1; // GasUsed is the amount of gas actually consumed. - uint64 gas_used = 2 [(gogoproto.moretags) = "yaml:\"gas_used\""]; + uint64 gas_used = 2; } // Result is the union of ResponseFormat and ResponseCheckTx. @@ -123,13 +123,13 @@ message SearchTxsResult { option (gogoproto.stringer) = true; // Count of all txs - uint64 total_count = 1 [(gogoproto.moretags) = "yaml:\"total_count\"", (gogoproto.jsontag) = "total_count"]; + uint64 total_count = 1 [(gogoproto.jsontag) = "total_count"]; // Count of txs in current page uint64 count = 2; // Index of current page, start from 1 - uint64 page_number = 3 [(gogoproto.moretags) = "yaml:\"page_number\"", (gogoproto.jsontag) = "page_number"]; + uint64 page_number = 3 [(gogoproto.jsontag) = "page_number"]; // Count of total pages - uint64 page_total = 4 [(gogoproto.moretags) = "yaml:\"page_total\"", (gogoproto.jsontag) = "page_total"]; + uint64 page_total = 4 [(gogoproto.jsontag) = "page_total"]; // Max count txs per page uint64 limit = 5; // List of txs in current page diff --git a/proto/cosmos/capability/v1beta1/capability.proto b/proto/cosmos/capability/v1beta1/capability.proto index b76713e1d..5212b7bef 100644 --- a/proto/cosmos/capability/v1beta1/capability.proto +++ b/proto/cosmos/capability/v1beta1/capability.proto @@ -10,7 +10,7 @@ import "gogoproto/gogo.proto"; message Capability { option (gogoproto.goproto_stringer) = false; - uint64 index = 1 [(gogoproto.moretags) = "yaml:\"index\""]; + uint64 index = 1; } // Owner defines a single capability owner. An owner is defined by the name of @@ -19,8 +19,8 @@ message Owner { option (gogoproto.goproto_stringer) = false; option (gogoproto.goproto_getters) = false; - string module = 1 [(gogoproto.moretags) = "yaml:\"module\""]; - string name = 2 [(gogoproto.moretags) = "yaml:\"name\""]; + string module = 1; + string name = 2; } // CapabilityOwners defines a set of owners of a single Capability. The set of diff --git a/proto/cosmos/capability/v1beta1/genesis.proto b/proto/cosmos/capability/v1beta1/genesis.proto index 05bb0afc4..b5482439c 100644 --- a/proto/cosmos/capability/v1beta1/genesis.proto +++ b/proto/cosmos/capability/v1beta1/genesis.proto @@ -12,7 +12,7 @@ message GenesisOwners { uint64 index = 1; // index_owners are the owners at the given index. - CapabilityOwners index_owners = 2 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"index_owners\""]; + CapabilityOwners index_owners = 2 [(gogoproto.nullable) = false]; } // GenesisState defines the capability module's genesis state. diff --git a/proto/cosmos/crisis/v1beta1/genesis.proto b/proto/cosmos/crisis/v1beta1/genesis.proto index 5b0ff7ec7..245c71462 100644 --- a/proto/cosmos/crisis/v1beta1/genesis.proto +++ b/proto/cosmos/crisis/v1beta1/genesis.proto @@ -11,5 +11,5 @@ message GenesisState { // constant_fee is the fee used to verify the invariant in the crisis // module. cosmos.base.v1beta1.Coin constant_fee = 3 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"constant_fee\""]; + [(gogoproto.nullable) = false]; } diff --git a/proto/cosmos/crisis/v1beta1/tx.proto b/proto/cosmos/crisis/v1beta1/tx.proto index c48b6fe16..06cec8747 100644 --- a/proto/cosmos/crisis/v1beta1/tx.proto +++ b/proto/cosmos/crisis/v1beta1/tx.proto @@ -18,8 +18,8 @@ message MsgVerifyInvariant { option (gogoproto.goproto_getters) = false; string sender = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; - string invariant_module_name = 2 [(gogoproto.moretags) = "yaml:\"invariant_module_name\""]; - string invariant_route = 3 [(gogoproto.moretags) = "yaml:\"invariant_route\""]; + string invariant_module_name = 2; + string invariant_route = 3; } // MsgVerifyInvariantResponse defines the Msg/VerifyInvariant response type. diff --git a/proto/cosmos/crypto/multisig/keys.proto b/proto/cosmos/crypto/multisig/keys.proto index f8398e805..ea3248bc8 100644 --- a/proto/cosmos/crypto/multisig/keys.proto +++ b/proto/cosmos/crypto/multisig/keys.proto @@ -12,7 +12,7 @@ option go_package = "github.com/cosmos/cosmos-sdk/crypto/keys/multisig"; message LegacyAminoPubKey { option (gogoproto.goproto_getters) = false; - uint32 threshold = 1 [(gogoproto.moretags) = "yaml:\"threshold\""]; + uint32 threshold = 1; repeated google.protobuf.Any public_keys = 2 - [(gogoproto.customname) = "PubKeys", (gogoproto.moretags) = "yaml:\"pubkeys\""]; + [(gogoproto.customname) = "PubKeys"]; } diff --git a/proto/cosmos/distribution/v1beta1/distribution.proto b/proto/cosmos/distribution/v1beta1/distribution.proto index 3b005ae63..c5aa94fc4 100644 --- a/proto/cosmos/distribution/v1beta1/distribution.proto +++ b/proto/cosmos/distribution/v1beta1/distribution.proto @@ -13,23 +13,20 @@ message Params { option (gogoproto.goproto_stringer) = false; string community_tax = 1 [ (cosmos_proto.scalar) = "cosmos.Dec", - (gogoproto.moretags) = "yaml:\"community_tax\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; string base_proposer_reward = 2 [ (cosmos_proto.scalar) = "cosmos.Dec", - (gogoproto.moretags) = "yaml:\"base_proposer_reward\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; string bonus_proposer_reward = 3 [ (cosmos_proto.scalar) = "cosmos.Dec", - (gogoproto.moretags) = "yaml:\"bonus_proposer_reward\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; - bool withdraw_addr_enabled = 4 [(gogoproto.moretags) = "yaml:\"withdraw_addr_enabled\""]; + bool withdraw_addr_enabled = 4; } // ValidatorHistoricalRewards represents historical rewards for a validator. @@ -46,11 +43,10 @@ message Params { // + one per validator for the zeroeth period, set on initialization message ValidatorHistoricalRewards { repeated cosmos.base.v1beta1.DecCoin cumulative_reward_ratio = 1 [ - (gogoproto.moretags) = "yaml:\"cumulative_reward_ratio\"", (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins", (gogoproto.nullable) = false ]; - uint32 reference_count = 2 [(gogoproto.moretags) = "yaml:\"reference_count\""]; + uint32 reference_count = 2; } // ValidatorCurrentRewards represents current rewards and current @@ -73,7 +69,6 @@ message ValidatorAccumulatedCommission { // for a validator inexpensive to track, allows simple sanity checks. message ValidatorOutstandingRewards { repeated cosmos.base.v1beta1.DecCoin rewards = 1 [ - (gogoproto.moretags) = "yaml:\"rewards\"", (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins", (gogoproto.nullable) = false ]; @@ -84,7 +79,7 @@ message ValidatorOutstandingRewards { // This is needed to calculate appropriate amount of staking tokens // for delegations which are withdrawn after a slash has occurred. message ValidatorSlashEvent { - uint64 validator_period = 1 [(gogoproto.moretags) = "yaml:\"validator_period\""]; + uint64 validator_period = 1; string fraction = 2 [(cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false]; } @@ -92,15 +87,14 @@ message ValidatorSlashEvent { message ValidatorSlashEvents { option (gogoproto.goproto_stringer) = false; repeated ValidatorSlashEvent validator_slash_events = 1 - [(gogoproto.moretags) = "yaml:\"validator_slash_events\"", (gogoproto.nullable) = false]; + [(gogoproto.nullable) = false]; } // FeePool is the global fee pool for distribution. message FeePool { repeated cosmos.base.v1beta1.DecCoin community_pool = 1 [ (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins", - (gogoproto.moretags) = "yaml:\"community_pool\"" + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins" ]; } @@ -126,14 +120,13 @@ message CommunityPoolSpendProposal { // the delegators within the validator may be left with less than a full token, // thus sdk.Dec is used. message DelegatorStartingInfo { - uint64 previous_period = 1 [(gogoproto.moretags) = "yaml:\"previous_period\""]; + uint64 previous_period = 1; string stake = 2 [ (cosmos_proto.scalar) = "cosmos.Dec", - (gogoproto.moretags) = "yaml:\"stake\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; - uint64 height = 3 [(gogoproto.moretags) = "yaml:\"creation_height\"", (gogoproto.jsontag) = "creation_height"]; + uint64 height = 3 [(gogoproto.jsontag) = "creation_height"]; } // DelegationDelegatorReward represents the properties @@ -143,8 +136,7 @@ message DelegationDelegatorReward { option (gogoproto.goproto_stringer) = true; string validator_address = 1 [ - (cosmos_proto.scalar) = "cosmos.AddressString", - (gogoproto.moretags) = "yaml:\"validator_address\"" + (cosmos_proto.scalar) = "cosmos.AddressString" ]; repeated cosmos.base.v1beta1.DecCoin reward = 2 @@ -157,9 +149,9 @@ message CommunityPoolSpendProposalWithDeposit { option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = true; - string title = 1 [(gogoproto.moretags) = "yaml:\"title\""]; - string description = 2 [(gogoproto.moretags) = "yaml:\"description\""]; - string recipient = 3 [(gogoproto.moretags) = "yaml:\"recipient\""]; - string amount = 4 [(gogoproto.moretags) = "yaml:\"amount\""]; - string deposit = 5 [(gogoproto.moretags) = "yaml:\"deposit\""]; + string title = 1; + string description = 2; + string recipient = 3; + string amount = 4; + string deposit = 5; } diff --git a/proto/cosmos/distribution/v1beta1/genesis.proto b/proto/cosmos/distribution/v1beta1/genesis.proto index 3c07fabfe..488d89e9f 100644 --- a/proto/cosmos/distribution/v1beta1/genesis.proto +++ b/proto/cosmos/distribution/v1beta1/genesis.proto @@ -17,10 +17,10 @@ message DelegatorWithdrawInfo { option (gogoproto.goproto_getters) = false; // delegator_address is the address of the delegator. - string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"delegator_address\""]; + string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // withdraw_address is the address to withdraw the delegation rewards to. - string withdraw_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"withdraw_address\""]; + string withdraw_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; } // ValidatorOutstandingRewardsRecord is used for import/export via genesis json. @@ -29,13 +29,12 @@ message ValidatorOutstandingRewardsRecord { option (gogoproto.goproto_getters) = false; // validator_address is the address of the validator. - string validator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"validator_address\""]; + string validator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // outstanding_rewards represents the oustanding rewards of a validator. repeated cosmos.base.v1beta1.DecCoin outstanding_rewards = 2 [ (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.DecCoins", - (gogoproto.nullable) = false, - (gogoproto.moretags) = "yaml:\"outstanding_rewards\"" + (gogoproto.nullable) = false ]; } @@ -46,11 +45,11 @@ message ValidatorAccumulatedCommissionRecord { option (gogoproto.goproto_getters) = false; // validator_address is the address of the validator. - string validator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"validator_address\""]; + string validator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // accumulated is the accumulated commission of a validator. ValidatorAccumulatedCommission accumulated = 2 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"accumulated\""]; + [(gogoproto.nullable) = false]; } // ValidatorHistoricalRewardsRecord is used for import / export via genesis @@ -60,13 +59,13 @@ message ValidatorHistoricalRewardsRecord { option (gogoproto.goproto_getters) = false; // validator_address is the address of the validator. - string validator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"validator_address\""]; + string validator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // period defines the period the historical rewards apply to. uint64 period = 2; // rewards defines the historical rewards of a validator. - ValidatorHistoricalRewards rewards = 3 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"rewards\""]; + ValidatorHistoricalRewards rewards = 3 [(gogoproto.nullable) = false]; } // ValidatorCurrentRewardsRecord is used for import / export via genesis json. @@ -75,10 +74,10 @@ message ValidatorCurrentRewardsRecord { option (gogoproto.goproto_getters) = false; // validator_address is the address of the validator. - string validator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"validator_address\""]; + string validator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // rewards defines the current rewards of a validator. - ValidatorCurrentRewards rewards = 2 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"rewards\""]; + ValidatorCurrentRewards rewards = 2 [(gogoproto.nullable) = false]; } // DelegatorStartingInfoRecord used for import / export via genesis json. @@ -87,14 +86,14 @@ message DelegatorStartingInfoRecord { option (gogoproto.goproto_getters) = false; // delegator_address is the address of the delegator. - string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"delegator_address\""]; + string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // validator_address is the address of the validator. - string validator_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"validator_address\""]; + string validator_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // starting_info defines the starting info of a delegator. DelegatorStartingInfo starting_info = 3 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"starting_info\""]; + [(gogoproto.nullable) = false]; } // ValidatorSlashEventRecord is used for import / export via genesis json. @@ -103,13 +102,13 @@ message ValidatorSlashEventRecord { option (gogoproto.goproto_getters) = false; // validator_address is the address of the validator. - string validator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"validator_address\""]; + string validator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // height defines the block height at which the slash event occured. uint64 height = 2; // period is the period of the slash event. uint64 period = 3; // validator_slash_event describes the slash event. - ValidatorSlashEvent validator_slash_event = 4 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"event\""]; + ValidatorSlashEvent validator_slash_event = 4 [(gogoproto.nullable) = false]; } // GenesisState defines the distribution module's genesis state. @@ -118,39 +117,39 @@ message GenesisState { option (gogoproto.goproto_getters) = false; // params defines all the paramaters of the module. - Params params = 1 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"params\""]; + Params params = 1 [(gogoproto.nullable) = false]; // fee_pool defines the fee pool at genesis. - FeePool fee_pool = 2 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"fee_pool\""]; + FeePool fee_pool = 2 [(gogoproto.nullable) = false]; // fee_pool defines the delegator withdraw infos at genesis. repeated DelegatorWithdrawInfo delegator_withdraw_infos = 3 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"delegator_withdraw_infos\""]; + [(gogoproto.nullable) = false]; // fee_pool defines the previous proposer at genesis. - string previous_proposer = 4 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"previous_proposer\""]; + string previous_proposer = 4 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // fee_pool defines the outstanding rewards of all validators at genesis. repeated ValidatorOutstandingRewardsRecord outstanding_rewards = 5 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"outstanding_rewards\""]; + [(gogoproto.nullable) = false]; // fee_pool defines the accumulated commisions of all validators at genesis. repeated ValidatorAccumulatedCommissionRecord validator_accumulated_commissions = 6 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"validator_accumulated_commissions\""]; + [(gogoproto.nullable) = false]; // fee_pool defines the historical rewards of all validators at genesis. repeated ValidatorHistoricalRewardsRecord validator_historical_rewards = 7 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"validator_historical_rewards\""]; + [(gogoproto.nullable) = false]; // fee_pool defines the current rewards of all validators at genesis. repeated ValidatorCurrentRewardsRecord validator_current_rewards = 8 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"validator_current_rewards\""]; + [(gogoproto.nullable) = false]; // fee_pool defines the delegator starting infos at genesis. repeated DelegatorStartingInfoRecord delegator_starting_infos = 9 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"delegator_starting_infos\""]; + [(gogoproto.nullable) = false]; // fee_pool defines the validator slash events at genesis. repeated ValidatorSlashEventRecord validator_slash_events = 10 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"validator_slash_events\""]; + [(gogoproto.nullable) = false]; } diff --git a/proto/cosmos/distribution/v1beta1/tx.proto b/proto/cosmos/distribution/v1beta1/tx.proto index 53d09f7e7..327398c1c 100644 --- a/proto/cosmos/distribution/v1beta1/tx.proto +++ b/proto/cosmos/distribution/v1beta1/tx.proto @@ -33,8 +33,8 @@ message MsgSetWithdrawAddress { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"delegator_address\""]; - string withdraw_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"withdraw_address\""]; + string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + string withdraw_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; } // MsgSetWithdrawAddressResponse defines the Msg/SetWithdrawAddress response type. @@ -46,8 +46,8 @@ message MsgWithdrawDelegatorReward { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"delegator_address\""]; - string validator_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"validator_address\""]; + string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + string validator_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; } // MsgWithdrawDelegatorRewardResponse defines the Msg/WithdrawDelegatorReward response type. @@ -59,7 +59,7 @@ message MsgWithdrawValidatorCommission { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string validator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"validator_address\""]; + string validator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; } // MsgWithdrawValidatorCommissionResponse defines the Msg/WithdrawValidatorCommission response type. diff --git a/proto/cosmos/evidence/v1beta1/evidence.proto b/proto/cosmos/evidence/v1beta1/evidence.proto index ea04edc63..83f9ec3d3 100644 --- a/proto/cosmos/evidence/v1beta1/evidence.proto +++ b/proto/cosmos/evidence/v1beta1/evidence.proto @@ -18,5 +18,5 @@ message Equivocation { int64 height = 1; google.protobuf.Timestamp time = 2 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; int64 power = 3; - string consensus_address = 4 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"consensus_address\""]; + string consensus_address = 4 [(cosmos_proto.scalar) = "cosmos.AddressString"]; } \ No newline at end of file diff --git a/proto/cosmos/genutil/v1beta1/genesis.proto b/proto/cosmos/genutil/v1beta1/genesis.proto index a0207793d..6727b98ac 100644 --- a/proto/cosmos/genutil/v1beta1/genesis.proto +++ b/proto/cosmos/genutil/v1beta1/genesis.proto @@ -10,7 +10,6 @@ message GenesisState { // gen_txs defines the genesis transactions. repeated bytes gen_txs = 1 [ (gogoproto.casttype) = "encoding/json.RawMessage", - (gogoproto.jsontag) = "gentxs", - (gogoproto.moretags) = "yaml:\"gentxs\"" + (gogoproto.jsontag) = "gentxs" ]; } diff --git a/proto/cosmos/gov/v1beta1/genesis.proto b/proto/cosmos/gov/v1beta1/genesis.proto index a99950044..bd6de639b 100644 --- a/proto/cosmos/gov/v1beta1/genesis.proto +++ b/proto/cosmos/gov/v1beta1/genesis.proto @@ -10,7 +10,7 @@ option go_package = "github.com/cosmos/cosmos-sdk/x/gov/types"; // GenesisState defines the gov module's genesis state. message GenesisState { // starting_proposal_id is the ID of the starting proposal. - uint64 starting_proposal_id = 1 [(gogoproto.moretags) = "yaml:\"starting_proposal_id\""]; + uint64 starting_proposal_id = 1; // deposits defines all the deposits present at genesis. repeated Deposit deposits = 2 [(gogoproto.castrepeated) = "Deposits", (gogoproto.nullable) = false]; // votes defines all the votes present at genesis. @@ -18,9 +18,9 @@ message GenesisState { // proposals defines all the proposals present at genesis. repeated Proposal proposals = 4 [(gogoproto.castrepeated) = "Proposals", (gogoproto.nullable) = false]; // params defines all the paramaters of related to deposit. - DepositParams deposit_params = 5 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"deposit_params\""]; + DepositParams deposit_params = 5 [(gogoproto.nullable) = false]; // params defines all the paramaters of related to voting. - VotingParams voting_params = 6 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"voting_params\""]; + VotingParams voting_params = 6 [(gogoproto.nullable) = false]; // params defines all the paramaters of related to tally. - TallyParams tally_params = 7 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"tally_params\""]; + TallyParams tally_params = 7 [(gogoproto.nullable) = false]; } diff --git a/proto/cosmos/gov/v1beta1/gov.proto b/proto/cosmos/gov/v1beta1/gov.proto index 91d70472e..c867ecef5 100644 --- a/proto/cosmos/gov/v1beta1/gov.proto +++ b/proto/cosmos/gov/v1beta1/gov.proto @@ -35,8 +35,7 @@ message WeightedVoteOption { string weight = 2 [ (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false, - (gogoproto.moretags) = "yaml:\"weight\"" + (gogoproto.nullable) = false ]; } @@ -57,7 +56,7 @@ message Deposit { option (gogoproto.goproto_getters) = false; option (gogoproto.equal) = false; - uint64 proposal_id = 1 [(gogoproto.moretags) = "yaml:\"proposal_id\""]; + uint64 proposal_id = 1; string depositor = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; repeated cosmos.base.v1beta1.Coin amount = 3 [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; @@ -67,24 +66,23 @@ message Deposit { message Proposal { option (gogoproto.equal) = true; - uint64 proposal_id = 1 [(gogoproto.jsontag) = "id", (gogoproto.moretags) = "yaml:\"id\""]; + uint64 proposal_id = 1 [(gogoproto.jsontag) = "id"]; google.protobuf.Any content = 2 [(cosmos_proto.accepts_interface) = "Content"]; - ProposalStatus status = 3 [(gogoproto.moretags) = "yaml:\"proposal_status\""]; + ProposalStatus status = 3; TallyResult final_tally_result = 4 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"final_tally_result\""]; + [(gogoproto.nullable) = false]; google.protobuf.Timestamp submit_time = 5 - [(gogoproto.stdtime) = true, (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"submit_time\""]; + [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; google.protobuf.Timestamp deposit_end_time = 6 - [(gogoproto.stdtime) = true, (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"deposit_end_time\""]; + [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; repeated cosmos.base.v1beta1.Coin total_deposit = 7 [ (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", - (gogoproto.moretags) = "yaml:\"total_deposit\"" + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" ]; google.protobuf.Timestamp voting_start_time = 8 - [(gogoproto.stdtime) = true, (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"voting_start_time\""]; + [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; google.protobuf.Timestamp voting_end_time = 9 - [(gogoproto.stdtime) = true, (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"voting_end_time\""]; + [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; } // ProposalStatus enumerates the valid statuses of a proposal. @@ -120,8 +118,7 @@ message TallyResult { string no_with_veto = 4 [ (cosmos_proto.scalar) = "cosmos.Int", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", - (gogoproto.nullable) = false, - (gogoproto.moretags) = "yaml:\"no_with_veto\"" + (gogoproto.nullable) = false ]; } @@ -131,7 +128,7 @@ message Vote { option (gogoproto.goproto_stringer) = false; option (gogoproto.equal) = false; - uint64 proposal_id = 1 [(gogoproto.moretags) = "yaml:\"proposal_id\""]; + uint64 proposal_id = 1; string voter = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // Deprecated: Prefer to use `options` instead. This field is set in queries // if and only if `len(options) == 1` and that option has weight 1. In all @@ -146,7 +143,6 @@ message DepositParams { repeated cosmos.base.v1beta1.Coin min_deposit = 1 [ (gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", - (gogoproto.moretags) = "yaml:\"min_deposit\"", (gogoproto.jsontag) = "min_deposit,omitempty" ]; @@ -155,8 +151,7 @@ message DepositParams { google.protobuf.Duration max_deposit_period = 2 [ (gogoproto.nullable) = false, (gogoproto.stdduration) = true, - (gogoproto.jsontag) = "max_deposit_period,omitempty", - (gogoproto.moretags) = "yaml:\"max_deposit_period\"" + (gogoproto.jsontag) = "max_deposit_period,omitempty" ]; } @@ -166,8 +161,7 @@ message VotingParams { google.protobuf.Duration voting_period = 1 [ (gogoproto.nullable) = false, (gogoproto.stdduration) = true, - (gogoproto.jsontag) = "voting_period,omitempty", - (gogoproto.moretags) = "yaml:\"voting_period\"" + (gogoproto.jsontag) = "voting_period,omitempty" ]; } @@ -193,7 +187,6 @@ message TallyParams { bytes veto_threshold = 3 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false, - (gogoproto.jsontag) = "veto_threshold,omitempty", - (gogoproto.moretags) = "yaml:\"veto_threshold\"" + (gogoproto.jsontag) = "veto_threshold,omitempty" ]; } diff --git a/proto/cosmos/gov/v1beta1/tx.proto b/proto/cosmos/gov/v1beta1/tx.proto index c806e2915..50b23684e 100644 --- a/proto/cosmos/gov/v1beta1/tx.proto +++ b/proto/cosmos/gov/v1beta1/tx.proto @@ -35,15 +35,14 @@ message MsgSubmitProposal { google.protobuf.Any content = 1 [(cosmos_proto.accepts_interface) = "Content"]; repeated cosmos.base.v1beta1.Coin initial_deposit = 2 [ (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", - (gogoproto.moretags) = "yaml:\"initial_deposit\"" + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" ]; string proposer = 3 [(cosmos_proto.scalar) = "cosmos.AddressString"]; } // MsgSubmitProposalResponse defines the Msg/SubmitProposal response type. message MsgSubmitProposalResponse { - uint64 proposal_id = 1 [(gogoproto.jsontag) = "proposal_id", (gogoproto.moretags) = "yaml:\"proposal_id\""]; + uint64 proposal_id = 1 [(gogoproto.jsontag) = "proposal_id"]; } // MsgVote defines a message to cast a vote. @@ -53,7 +52,7 @@ message MsgVote { option (gogoproto.stringer) = false; option (gogoproto.goproto_getters) = false; - uint64 proposal_id = 1 [(gogoproto.jsontag) = "proposal_id", (gogoproto.moretags) = "yaml:\"proposal_id\""]; + uint64 proposal_id = 1 [(gogoproto.jsontag) = "proposal_id"]; string voter = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; VoteOption option = 3; } @@ -68,7 +67,7 @@ message MsgVoteWeighted { option (gogoproto.stringer) = false; option (gogoproto.goproto_getters) = false; - uint64 proposal_id = 1 [(gogoproto.moretags) = "yaml:\"proposal_id\""]; + uint64 proposal_id = 1; string voter = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; repeated WeightedVoteOption options = 3 [(gogoproto.nullable) = false]; } @@ -83,7 +82,7 @@ message MsgDeposit { option (gogoproto.stringer) = false; option (gogoproto.goproto_getters) = false; - uint64 proposal_id = 1 [(gogoproto.jsontag) = "proposal_id", (gogoproto.moretags) = "yaml:\"proposal_id\""]; + uint64 proposal_id = 1 [(gogoproto.jsontag) = "proposal_id"]; string depositor = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; repeated cosmos.base.v1beta1.Coin amount = 3 [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; diff --git a/proto/cosmos/mint/v1beta1/mint.proto b/proto/cosmos/mint/v1beta1/mint.proto index 97778873f..f12959083 100644 --- a/proto/cosmos/mint/v1beta1/mint.proto +++ b/proto/cosmos/mint/v1beta1/mint.proto @@ -17,7 +17,6 @@ message Minter { // current annual expected provisions string annual_provisions = 2 [ (cosmos_proto.scalar) = "cosmos.Dec", - (gogoproto.moretags) = "yaml:\"annual_provisions\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; @@ -32,31 +31,27 @@ message Params { // maximum annual change in inflation rate string inflation_rate_change = 2 [ (cosmos_proto.scalar) = "cosmos.Dec", - (gogoproto.moretags) = "yaml:\"inflation_rate_change\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; // maximum inflation rate string inflation_max = 3 [ (cosmos_proto.scalar) = "cosmos.Dec", - (gogoproto.moretags) = "yaml:\"inflation_max\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; // minimum inflation rate string inflation_min = 4 [ (cosmos_proto.scalar) = "cosmos.Dec", - (gogoproto.moretags) = "yaml:\"inflation_min\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; // goal of percent bonded atoms string goal_bonded = 5 [ (cosmos_proto.scalar) = "cosmos.Dec", - (gogoproto.moretags) = "yaml:\"goal_bonded\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; // expected blocks per year - uint64 blocks_per_year = 6 [(gogoproto.moretags) = "yaml:\"blocks_per_year\""]; + uint64 blocks_per_year = 6; } diff --git a/proto/cosmos/slashing/v1beta1/genesis.proto b/proto/cosmos/slashing/v1beta1/genesis.proto index 66a1b2cae..6477e8a70 100644 --- a/proto/cosmos/slashing/v1beta1/genesis.proto +++ b/proto/cosmos/slashing/v1beta1/genesis.proto @@ -15,12 +15,12 @@ message GenesisState { // signing_infos represents a map between validator addresses and their // signing infos. repeated SigningInfo signing_infos = 2 - [(gogoproto.moretags) = "yaml:\"signing_infos\"", (gogoproto.nullable) = false]; + [(gogoproto.nullable) = false]; // missed_blocks represents a map between validator addresses and their // missed blocks. repeated ValidatorMissedBlocks missed_blocks = 3 - [(gogoproto.moretags) = "yaml:\"missed_blocks\"", (gogoproto.nullable) = false]; + [(gogoproto.nullable) = false]; } // SigningInfo stores validator signing info of corresponding address. @@ -29,7 +29,7 @@ message SigningInfo { string address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // validator_signing_info represents the signing info of this validator. ValidatorSigningInfo validator_signing_info = 2 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"validator_signing_info\""]; + [(gogoproto.nullable) = false]; } // ValidatorMissedBlocks contains array of missed blocks of corresponding @@ -39,7 +39,7 @@ message ValidatorMissedBlocks { string address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // missed_blocks is an array of missed blocks by the validator. repeated MissedBlock missed_blocks = 2 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"missed_blocks\""]; + [(gogoproto.nullable) = false]; } // MissedBlock contains height and missed status as boolean. diff --git a/proto/cosmos/slashing/v1beta1/slashing.proto b/proto/cosmos/slashing/v1beta1/slashing.proto index df12e287c..5a8f3b265 100644 --- a/proto/cosmos/slashing/v1beta1/slashing.proto +++ b/proto/cosmos/slashing/v1beta1/slashing.proto @@ -17,42 +17,38 @@ message ValidatorSigningInfo { string address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // Height at which validator was first a candidate OR was unjailed - int64 start_height = 2 [(gogoproto.moretags) = "yaml:\"start_height\""]; + int64 start_height = 2; // Index which is incremented each time the validator was a bonded // in a block and may have signed a precommit or not. This in conjunction with the // `SignedBlocksWindow` param determines the index in the `MissedBlocksBitArray`. - int64 index_offset = 3 [(gogoproto.moretags) = "yaml:\"index_offset\""]; + int64 index_offset = 3; // Timestamp until which the validator is jailed due to liveness downtime. google.protobuf.Timestamp jailed_until = 4 - [(gogoproto.moretags) = "yaml:\"jailed_until\"", (gogoproto.stdtime) = true, (gogoproto.nullable) = false]; + [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; // Whether or not a validator has been tombstoned (killed out of validator set). It is set // once the validator commits an equivocation or for any other configured misbehiavor. bool tombstoned = 5; // A counter kept to avoid unnecessary array reads. // Note that `Sum(MissedBlocksBitArray)` always equals `MissedBlocksCounter`. - int64 missed_blocks_counter = 6 [(gogoproto.moretags) = "yaml:\"missed_blocks_counter\""]; + int64 missed_blocks_counter = 6; } // Params represents the parameters used for by the slashing module. message Params { - int64 signed_blocks_window = 1 [(gogoproto.moretags) = "yaml:\"signed_blocks_window\""]; + int64 signed_blocks_window = 1; bytes min_signed_per_window = 2 [ - (gogoproto.moretags) = "yaml:\"min_signed_per_window\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; google.protobuf.Duration downtime_jail_duration = 3 [ (gogoproto.nullable) = false, - (gogoproto.stdduration) = true, - (gogoproto.moretags) = "yaml:\"downtime_jail_duration\"" + (gogoproto.stdduration) = true ]; bytes slash_fraction_double_sign = 4 [ - (gogoproto.moretags) = "yaml:\"slash_fraction_double_sign\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; bytes slash_fraction_downtime = 5 [ - (gogoproto.moretags) = "yaml:\"slash_fraction_downtime\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; diff --git a/proto/cosmos/slashing/v1beta1/tx.proto b/proto/cosmos/slashing/v1beta1/tx.proto index bf40016ad..c006fd44b 100644 --- a/proto/cosmos/slashing/v1beta1/tx.proto +++ b/proto/cosmos/slashing/v1beta1/tx.proto @@ -20,7 +20,7 @@ message MsgUnjail { option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = true; - string validator_addr = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"address\"", (gogoproto.jsontag) = "address"]; + string validator_addr = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.jsontag) = "address"]; } // MsgUnjailResponse defines the Msg/Unjail response type diff --git a/proto/cosmos/staking/v1beta1/genesis.proto b/proto/cosmos/staking/v1beta1/genesis.proto index d645e4d45..7f2c2e77c 100644 --- a/proto/cosmos/staking/v1beta1/genesis.proto +++ b/proto/cosmos/staking/v1beta1/genesis.proto @@ -16,14 +16,13 @@ message GenesisState { // the previous end block. bytes last_total_power = 2 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", - (gogoproto.moretags) = "yaml:\"last_total_power\"", (gogoproto.nullable) = false ]; // last_validator_powers is a special index that provides a historical list // of the last-block's bonded validators. repeated LastValidatorPower last_validator_powers = 3 - [(gogoproto.moretags) = "yaml:\"last_validator_powers\"", (gogoproto.nullable) = false]; + [(gogoproto.nullable) = false]; // delegations defines the validator set at genesis. repeated Validator validators = 4 [(gogoproto.nullable) = false]; @@ -33,7 +32,7 @@ message GenesisState { // unbonding_delegations defines the unbonding delegations active at genesis. repeated UnbondingDelegation unbonding_delegations = 6 - [(gogoproto.moretags) = "yaml:\"unbonding_delegations\"", (gogoproto.nullable) = false]; + [(gogoproto.nullable) = false]; // redelegations defines the redelegations active at genesis. repeated Redelegation redelegations = 7 [(gogoproto.nullable) = false]; diff --git a/proto/cosmos/staking/v1beta1/staking.proto b/proto/cosmos/staking/v1beta1/staking.proto index 799875721..d5205de93 100644 --- a/proto/cosmos/staking/v1beta1/staking.proto +++ b/proto/cosmos/staking/v1beta1/staking.proto @@ -32,14 +32,12 @@ message CommissionRates { // max_rate defines the maximum commission rate which validator can ever charge, as a fraction. string max_rate = 2 [ (cosmos_proto.scalar) = "cosmos.Dec", - (gogoproto.moretags) = "yaml:\"max_rate\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; // max_change_rate defines the maximum daily increase of the validator commission, as a fraction. string max_change_rate = 3 [ (cosmos_proto.scalar) = "cosmos.Dec", - (gogoproto.moretags) = "yaml:\"max_change_rate\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; @@ -54,7 +52,7 @@ message Commission { CommissionRates commission_rates = 1 [(gogoproto.embed) = true, (gogoproto.nullable) = false]; // update_time is the last time the commission rate was changed. google.protobuf.Timestamp update_time = 2 - [(gogoproto.nullable) = false, (gogoproto.stdtime) = true, (gogoproto.moretags) = "yaml:\"update_time\""]; + [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; } // Description defines a validator description. @@ -69,7 +67,7 @@ message Description { // website defines an optional website link. string website = 3; // security_contact defines an optional email for security contact. - string security_contact = 4 [(gogoproto.moretags) = "yaml:\"security_contact\""]; + string security_contact = 4; // details define other optional details. string details = 5; } @@ -88,10 +86,10 @@ message Validator { option (gogoproto.goproto_getters) = false; // operator_address defines the address of the validator's operator; bech encoded in JSON. - string operator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"operator_address\""]; + string operator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // consensus_pubkey is the consensus public key of the validator, as a Protobuf Any. google.protobuf.Any consensus_pubkey = 2 - [(cosmos_proto.accepts_interface) = "cosmos.crypto.PubKey", (gogoproto.moretags) = "yaml:\"consensus_pubkey\""]; + [(cosmos_proto.accepts_interface) = "cosmos.crypto.PubKey"]; // jailed defined whether the validator has been jailed from bonded status or not. bool jailed = 3; // status is the validator status (bonded/unbonding/unbonded). @@ -101,23 +99,21 @@ message Validator { // delegator_shares defines total shares issued to a validator's delegators. string delegator_shares = 6 [ (cosmos_proto.scalar) = "cosmos.Dec", - (gogoproto.moretags) = "yaml:\"delegator_shares\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; // description defines the description terms for the validator. Description description = 7 [(gogoproto.nullable) = false]; // unbonding_height defines, if unbonding, the height at which this validator has begun unbonding. - int64 unbonding_height = 8 [(gogoproto.moretags) = "yaml:\"unbonding_height\""]; + int64 unbonding_height = 8; // unbonding_time defines, if unbonding, the min time for the validator to complete unbonding. google.protobuf.Timestamp unbonding_time = 9 - [(gogoproto.nullable) = false, (gogoproto.stdtime) = true, (gogoproto.moretags) = "yaml:\"unbonding_time\""]; + [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; // commission defines the commission parameters. Commission commission = 10 [(gogoproto.nullable) = false]; // min_self_delegation is the validator's self declared minimum self delegation. string min_self_delegation = 11 [ (cosmos_proto.scalar) = "cosmos.Int", - (gogoproto.moretags) = "yaml:\"min_self_delegation\"", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false ]; @@ -153,8 +149,8 @@ message DVPair { option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; - string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"delegator_address\""]; - string validator_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"validator_address\""]; + string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + string validator_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; } // DVPairs defines an array of DVPair objects. @@ -171,9 +167,9 @@ message DVVTriplet { option (gogoproto.goproto_getters) = false; option (gogoproto.goproto_stringer) = false; - string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"delegator_address\""]; - string validator_src_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"validator_src_address\""]; - string validator_dst_address = 3 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"validator_dst_address\""]; + string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + string validator_src_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + string validator_dst_address = 3 [(cosmos_proto.scalar) = "cosmos.AddressString"]; } // DVVTriplets defines an array of DVVTriplet objects. @@ -190,9 +186,9 @@ message Delegation { option (gogoproto.goproto_stringer) = false; // delegator_address is the bech32-encoded address of the delegator. - string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"delegator_address\""]; + string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // validator_address is the bech32-encoded address of the validator. - string validator_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"validator_address\""]; + string validator_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // shares define the delegation shares received. string shares = 3 [(cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false]; } @@ -205,9 +201,9 @@ message UnbondingDelegation { option (gogoproto.goproto_stringer) = false; // delegator_address is the bech32-encoded address of the delegator. - string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"delegator_address\""]; + string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // validator_address is the bech32-encoded address of the validator. - string validator_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"validator_address\""]; + string validator_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // entries are the unbonding delegation entries. repeated UnbondingDelegationEntry entries = 3 [(gogoproto.nullable) = false]; // unbonding delegation entries } @@ -218,16 +214,15 @@ message UnbondingDelegationEntry { option (gogoproto.goproto_stringer) = false; // creation_height is the height which the unbonding took place. - int64 creation_height = 1 [(gogoproto.moretags) = "yaml:\"creation_height\""]; + int64 creation_height = 1; // completion_time is the unix time for unbonding completion. google.protobuf.Timestamp completion_time = 2 - [(gogoproto.nullable) = false, (gogoproto.stdtime) = true, (gogoproto.moretags) = "yaml:\"completion_time\""]; + [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; // initial_balance defines the tokens initially scheduled to receive at completion. string initial_balance = 3 [ (cosmos_proto.scalar) = "cosmos.Int", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", - (gogoproto.nullable) = false, - (gogoproto.moretags) = "yaml:\"initial_balance\"" + (gogoproto.nullable) = false ]; // balance defines the tokens to receive at completion. string balance = 4 [(cosmos_proto.scalar) = "cosmos.Int", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.nullable) = false]; @@ -239,16 +234,15 @@ message RedelegationEntry { option (gogoproto.goproto_stringer) = false; // creation_height defines the height which the redelegation took place. - int64 creation_height = 1 [(gogoproto.moretags) = "yaml:\"creation_height\""]; + int64 creation_height = 1; // completion_time defines the unix time for redelegation completion. google.protobuf.Timestamp completion_time = 2 - [(gogoproto.nullable) = false, (gogoproto.stdtime) = true, (gogoproto.moretags) = "yaml:\"completion_time\""]; + [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; // initial_balance defines the initial balance when redelegation started. string initial_balance = 3 [ (cosmos_proto.scalar) = "cosmos.Int", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", - (gogoproto.nullable) = false, - (gogoproto.moretags) = "yaml:\"initial_balance\"" + (gogoproto.nullable) = false ]; // shares_dst is the amount of destination-validator shares created by redelegation. string shares_dst = 4 @@ -263,11 +257,11 @@ message Redelegation { option (gogoproto.goproto_stringer) = false; // delegator_address is the bech32-encoded address of the delegator. - string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"delegator_address\""]; + string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // validator_src_address is the validator redelegation source operator address. - string validator_src_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"validator_src_address\""]; + string validator_src_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // validator_dst_address is the validator redelegation destination operator address. - string validator_dst_address = 3 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"validator_dst_address\""]; + string validator_dst_address = 3 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // entries are the redelegation entries. repeated RedelegationEntry entries = 4 [(gogoproto.nullable) = false]; // redelegation entries } @@ -279,15 +273,15 @@ message Params { // unbonding_time is the time duration of unbonding. google.protobuf.Duration unbonding_time = 1 - [(gogoproto.nullable) = false, (gogoproto.stdduration) = true, (gogoproto.moretags) = "yaml:\"unbonding_time\""]; + [(gogoproto.nullable) = false, (gogoproto.stdduration) = true]; // max_validators is the maximum number of validators. - uint32 max_validators = 2 [(gogoproto.moretags) = "yaml:\"max_validators\""]; + uint32 max_validators = 2; // max_entries is the max entries for either unbonding delegation or redelegation (per pair/trio). - uint32 max_entries = 3 [(gogoproto.moretags) = "yaml:\"max_entries\""]; + uint32 max_entries = 3; // historical_entries is the number of historical entries to persist. - uint32 historical_entries = 4 [(gogoproto.moretags) = "yaml:\"historical_entries\""]; + uint32 historical_entries = 4; // bond_denom defines the bondable coin denomination. - string bond_denom = 5 [(gogoproto.moretags) = "yaml:\"bond_denom\""]; + string bond_denom = 5; } // DelegationResponse is equivalent to Delegation except that it contains a @@ -336,7 +330,6 @@ message Pool { (cosmos_proto.scalar) = "cosmos.Int", (gogoproto.jsontag) = "bonded_tokens", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", - (gogoproto.nullable) = false, - (gogoproto.moretags) = "yaml:\"bonded_tokens\"" + (gogoproto.nullable) = false ]; } diff --git a/proto/cosmos/staking/v1beta1/tx.proto b/proto/cosmos/staking/v1beta1/tx.proto index c2066a273..a97ce7adb 100644 --- a/proto/cosmos/staking/v1beta1/tx.proto +++ b/proto/cosmos/staking/v1beta1/tx.proto @@ -42,11 +42,10 @@ message MsgCreateValidator { string min_self_delegation = 3 [ (cosmos_proto.scalar) = "cosmos.Int", (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", - (gogoproto.moretags) = "yaml:\"min_self_delegation\"", (gogoproto.nullable) = false ]; - string delegator_address = 4 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"delegator_address\""]; - string validator_address = 5 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"validator_address\""]; + string delegator_address = 4 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + string validator_address = 5 [(cosmos_proto.scalar) = "cosmos.AddressString"]; google.protobuf.Any pubkey = 6 [(cosmos_proto.accepts_interface) = "cosmos.crypto.PubKey"]; cosmos.base.v1beta1.Coin value = 7 [(gogoproto.nullable) = false]; } @@ -60,7 +59,7 @@ message MsgEditValidator { option (gogoproto.goproto_getters) = false; Description description = 1 [(gogoproto.nullable) = false]; - string validator_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"address\""]; + string validator_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // We pass a reference to the new commission rate and min self delegation as // it's not mandatory to update. If not updated, the deserialized rate will be @@ -68,13 +67,11 @@ message MsgEditValidator { // REF: #2373 string commission_rate = 3 [ (cosmos_proto.scalar) = "cosmos.Dec", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.moretags) = "yaml:\"commission_rate\"" + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec" ]; string min_self_delegation = 4 [ (cosmos_proto.scalar) = "cosmos.Int", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", - (gogoproto.moretags) = "yaml:\"min_self_delegation\"" + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int" ]; } @@ -87,8 +84,8 @@ message MsgDelegate { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"delegator_address\""]; - string validator_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"validator_address\""]; + string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + string validator_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; cosmos.base.v1beta1.Coin amount = 3 [(gogoproto.nullable) = false]; } @@ -101,9 +98,9 @@ message MsgBeginRedelegate { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"delegator_address\""]; - string validator_src_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"validator_src_address\""]; - string validator_dst_address = 3 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"validator_dst_address\""]; + string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + string validator_src_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + string validator_dst_address = 3 [(cosmos_proto.scalar) = "cosmos.AddressString"]; cosmos.base.v1beta1.Coin amount = 4 [(gogoproto.nullable) = false]; } @@ -118,8 +115,8 @@ message MsgUndelegate { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"delegator_address\""]; - string validator_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"validator_address\""]; + string delegator_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + string validator_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; cosmos.base.v1beta1.Coin amount = 3 [(gogoproto.nullable) = false]; } diff --git a/proto/cosmos/upgrade/v1beta1/upgrade.proto b/proto/cosmos/upgrade/v1beta1/upgrade.proto index 4e1d69aaa..067124a23 100644 --- a/proto/cosmos/upgrade/v1beta1/upgrade.proto +++ b/proto/cosmos/upgrade/v1beta1/upgrade.proto @@ -39,7 +39,7 @@ message Plan { // moved to the IBC module in the sub module 02-client. // If this field is not empty, an error will be thrown. google.protobuf.Any upgraded_client_state = 5 - [deprecated = true, (gogoproto.moretags) = "yaml:\"upgraded_client_state\""]; + [deprecated = true]; } // SoftwareUpgradeProposal is a gov Content type for initiating a software diff --git a/proto/cosmos/vesting/v1beta1/tx.proto b/proto/cosmos/vesting/v1beta1/tx.proto index 72a3c6252..845e70582 100644 --- a/proto/cosmos/vesting/v1beta1/tx.proto +++ b/proto/cosmos/vesting/v1beta1/tx.proto @@ -23,12 +23,12 @@ service Msg { message MsgCreateVestingAccount { option (gogoproto.equal) = true; - string from_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"from_address\""]; - string to_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString", (gogoproto.moretags) = "yaml:\"to_address\""]; + string from_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + string to_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; repeated cosmos.base.v1beta1.Coin amount = 3 [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; - int64 end_time = 4 [(gogoproto.moretags) = "yaml:\"end_time\""]; + int64 end_time = 4; bool delayed = 5; } @@ -41,9 +41,9 @@ message MsgCreateVestingAccountResponse {} message MsgCreatePeriodicVestingAccount { option (gogoproto.equal) = false; - string from_address = 1 [(gogoproto.moretags) = "yaml:\"from_address\""]; - string to_address = 2 [(gogoproto.moretags) = "yaml:\"to_address\""]; - int64 start_time = 3 [(gogoproto.moretags) = "yaml:\"start_time\""]; + string from_address = 1; + string to_address = 2; + int64 start_time = 3; repeated Period vesting_periods = 4 [(gogoproto.nullable) = false]; } diff --git a/proto/cosmos/vesting/v1beta1/vesting.proto b/proto/cosmos/vesting/v1beta1/vesting.proto index 26e786831..f24069e54 100644 --- a/proto/cosmos/vesting/v1beta1/vesting.proto +++ b/proto/cosmos/vesting/v1beta1/vesting.proto @@ -16,20 +16,17 @@ message BaseVestingAccount { cosmos.auth.v1beta1.BaseAccount base_account = 1 [(gogoproto.embed) = true]; repeated cosmos.base.v1beta1.Coin original_vesting = 2 [ (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", - (gogoproto.moretags) = "yaml:\"original_vesting\"" + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" ]; repeated cosmos.base.v1beta1.Coin delegated_free = 3 [ (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", - (gogoproto.moretags) = "yaml:\"delegated_free\"" + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" ]; repeated cosmos.base.v1beta1.Coin delegated_vesting = 4 [ (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", - (gogoproto.moretags) = "yaml:\"delegated_vesting\"" + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" ]; - int64 end_time = 5 [(gogoproto.moretags) = "yaml:\"end_time\""]; + int64 end_time = 5; } // ContinuousVestingAccount implements the VestingAccount interface. It @@ -39,7 +36,7 @@ message ContinuousVestingAccount { option (gogoproto.goproto_stringer) = false; BaseVestingAccount base_vesting_account = 1 [(gogoproto.embed) = true]; - int64 start_time = 2 [(gogoproto.moretags) = "yaml:\"start_time\""]; + int64 start_time = 2; } // DelayedVestingAccount implements the VestingAccount interface. It vests all @@ -68,8 +65,8 @@ message PeriodicVestingAccount { option (gogoproto.goproto_stringer) = false; BaseVestingAccount base_vesting_account = 1 [(gogoproto.embed) = true]; - int64 start_time = 2 [(gogoproto.moretags) = "yaml:\"start_time\""]; - repeated Period vesting_periods = 3 [(gogoproto.moretags) = "yaml:\"vesting_periods\"", (gogoproto.nullable) = false]; + int64 start_time = 2; + repeated Period vesting_periods = 3 [(gogoproto.nullable) = false]; } // PermanentLockedAccount implements the VestingAccount interface. It does diff --git a/server/tm_cmds.go b/server/tm_cmds.go index 35e202abc..9e48c26dd 100644 --- a/server/tm_cmds.go +++ b/server/tm_cmds.go @@ -10,7 +10,7 @@ import ( "github.com/tendermint/tendermint/p2p" pvm "github.com/tendermint/tendermint/privval" tversion "github.com/tendermint/tendermint/version" - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" "github.com/cosmos/cosmos-sdk/client" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" diff --git a/types/abci.pb.go b/types/abci.pb.go index 44b35c353..04174b97e 100644 --- a/types/abci.pb.go +++ b/types/abci.pb.go @@ -262,9 +262,9 @@ func (m *Attribute) GetValue() string { // GasInfo defines tx execution gas context. type GasInfo struct { // GasWanted is the maximum units of work we allow this tx to perform. - GasWanted uint64 `protobuf:"varint,1,opt,name=gas_wanted,json=gasWanted,proto3" json:"gas_wanted,omitempty" yaml:"gas_wanted"` + GasWanted uint64 `protobuf:"varint,1,opt,name=gas_wanted,json=gasWanted,proto3" json:"gas_wanted,omitempty"` // GasUsed is the amount of gas actually consumed. - GasUsed uint64 `protobuf:"varint,2,opt,name=gas_used,json=gasUsed,proto3" json:"gas_used,omitempty" yaml:"gas_used"` + GasUsed uint64 `protobuf:"varint,2,opt,name=gas_used,json=gasUsed,proto3" json:"gas_used,omitempty"` } func (m *GasInfo) Reset() { *m = GasInfo{} } @@ -504,13 +504,13 @@ func (m *TxMsgData) GetData() []*MsgData { // SearchTxsResult defines a structure for querying txs pageable type SearchTxsResult struct { // Count of all txs - TotalCount uint64 `protobuf:"varint,1,opt,name=total_count,json=totalCount,proto3" json:"total_count" yaml:"total_count"` + TotalCount uint64 `protobuf:"varint,1,opt,name=total_count,json=totalCount,proto3" json:"total_count"` // Count of txs in current page Count uint64 `protobuf:"varint,2,opt,name=count,proto3" json:"count,omitempty"` // Index of current page, start from 1 - PageNumber uint64 `protobuf:"varint,3,opt,name=page_number,json=pageNumber,proto3" json:"page_number" yaml:"page_number"` + PageNumber uint64 `protobuf:"varint,3,opt,name=page_number,json=pageNumber,proto3" json:"page_number"` // Count of total pages - PageTotal uint64 `protobuf:"varint,4,opt,name=page_total,json=pageTotal,proto3" json:"page_total" yaml:"page_total"` + PageTotal uint64 `protobuf:"varint,4,opt,name=page_total,json=pageTotal,proto3" json:"page_total"` // Max count txs per page Limit uint64 `protobuf:"varint,5,opt,name=limit,proto3" json:"limit,omitempty"` // List of txs in current page @@ -609,65 +609,62 @@ func init() { } var fileDescriptor_4e37629bc7eb0df8 = []byte{ - // 922 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x55, 0x31, 0x73, 0x1b, 0x45, - 0x14, 0xd6, 0x49, 0xca, 0xc9, 0x7a, 0x72, 0x30, 0x2c, 0x26, 0x39, 0x27, 0xa0, 0x13, 0xe7, 0x64, - 0x46, 0x0d, 0xa7, 0x89, 0x13, 0x18, 0xc6, 0x05, 0x43, 0x2e, 0x10, 0xe2, 0x99, 0x84, 0x62, 0xad, - 0x0c, 0x33, 0x34, 0x9a, 0x95, 0xb4, 0x59, 0x1d, 0xd1, 0xdd, 0x6a, 0x6e, 0x57, 0xb6, 0xd4, 0x51, - 0x52, 0x52, 0xa5, 0xa0, 0xa2, 0xe6, 0x97, 0xa4, 0xc3, 0x65, 0x0a, 0x46, 0x80, 0xdd, 0xa5, 0xf4, - 0x2f, 0x60, 0xf6, 0xed, 0x59, 0x3a, 0x93, 0x91, 0x2b, 0xed, 0xfb, 0xde, 0xdb, 0xb7, 0x6f, 0xbf, - 0xef, 0xd3, 0x1e, 0xec, 0x0e, 0xa4, 0x4a, 0xa4, 0xea, 0xf4, 0x99, 0xe2, 0x1d, 0xd6, 0x1f, 0xc4, - 0x9d, 0xa3, 0x7b, 0x7d, 0xae, 0xd9, 0x3d, 0x0c, 0xc2, 0x49, 0x26, 0xb5, 0x24, 0x9e, 0x2d, 0x0a, - 0x4d, 0x51, 0x88, 0x78, 0x5e, 0x74, 0x6b, 0x5b, 0x48, 0x21, 0xb1, 0xa8, 0x63, 0x56, 0xb6, 0xfe, - 0xd6, 0x6d, 0xcd, 0xd3, 0x21, 0xcf, 0x92, 0x38, 0xd5, 0xb6, 0xa7, 0x9e, 0x4f, 0xb8, 0xca, 0x93, - 0x3b, 0x42, 0x4a, 0x31, 0xe6, 0x1d, 0x8c, 0xfa, 0xd3, 0x17, 0x1d, 0x96, 0xce, 0x6d, 0x2a, 0x78, - 0x55, 0x01, 0xe8, 0xce, 0x28, 0x57, 0x13, 0x99, 0x2a, 0x4e, 0x6e, 0x80, 0x3b, 0xe2, 0xb1, 0x18, - 0x69, 0xcf, 0x69, 0x39, 0xed, 0x0a, 0xcd, 0x23, 0x12, 0x80, 0xab, 0x67, 0x23, 0xa6, 0x46, 0x5e, - 0xb9, 0xe5, 0xb4, 0xeb, 0x11, 0x9c, 0x2e, 0x7c, 0xb7, 0x3b, 0x7b, 0xc2, 0xd4, 0x88, 0xe6, 0x19, - 0xf2, 0x31, 0xd4, 0x07, 0x72, 0xc8, 0xd5, 0x84, 0x0d, 0xb8, 0x57, 0x31, 0x65, 0x74, 0x05, 0x10, - 0x02, 0x55, 0x13, 0x78, 0xd5, 0x96, 0xd3, 0xbe, 0x4e, 0x71, 0x6d, 0xb0, 0x21, 0xd3, 0xcc, 0xbb, - 0x86, 0xc5, 0xb8, 0x26, 0x37, 0xa1, 0x96, 0xb1, 0xe3, 0xde, 0x58, 0x0a, 0xcf, 0x45, 0xd8, 0xcd, - 0xd8, 0xf1, 0x53, 0x29, 0xc8, 0x73, 0xa8, 0x8e, 0xa5, 0x50, 0x5e, 0xad, 0x55, 0x69, 0x37, 0xf6, - 0xda, 0xe1, 0x3a, 0x82, 0xc2, 0x87, 0xd1, 0xa3, 0x83, 0x67, 0x5c, 0x29, 0x26, 0xf8, 0x53, 0x29, - 0xa2, 0x9b, 0xaf, 0x17, 0x7e, 0xe9, 0x8f, 0xbf, 0xfd, 0xad, 0xcb, 0xb8, 0xa2, 0xd8, 0xce, 0xcc, - 0x10, 0xa7, 0x2f, 0xa4, 0xb7, 0x61, 0x67, 0x30, 0x6b, 0xf2, 0x09, 0x80, 0x60, 0xaa, 0x77, 0xcc, - 0x52, 0xcd, 0x87, 0x5e, 0x1d, 0x99, 0xa8, 0x0b, 0xa6, 0x7e, 0x40, 0x80, 0xec, 0xc0, 0x86, 0x49, - 0x4f, 0x15, 0x1f, 0x7a, 0x80, 0xc9, 0x9a, 0x60, 0xea, 0xb9, 0xe2, 0x43, 0x72, 0x07, 0xca, 0x7a, - 0xe6, 0x35, 0x5a, 0x4e, 0xbb, 0xb1, 0xb7, 0x1d, 0x5a, 0xda, 0xc3, 0x0b, 0xda, 0xc3, 0x87, 0xe9, - 0x9c, 0x96, 0xf5, 0xcc, 0x30, 0xa5, 0xe3, 0x84, 0x2b, 0xcd, 0x92, 0x89, 0xb7, 0x69, 0x99, 0x5a, - 0x02, 0xfb, 0xd5, 0x5f, 0x7e, 0xf7, 0x4b, 0xc1, 0x6f, 0x0e, 0xbc, 0x77, 0x79, 0x62, 0x72, 0x1b, - 0xea, 0x89, 0x12, 0xbd, 0x38, 0x1d, 0xf2, 0x19, 0xea, 0x73, 0x9d, 0x6e, 0x24, 0x4a, 0x1c, 0x98, - 0x98, 0xbc, 0x0f, 0x15, 0xc3, 0x19, 0xca, 0x43, 0xcd, 0x92, 0x1c, 0x82, 0xcb, 0x8f, 0x78, 0xaa, - 0x95, 0x57, 0x41, 0xca, 0xee, 0xae, 0xa7, 0xec, 0x50, 0x67, 0x71, 0x2a, 0xbe, 0x35, 0xd5, 0xd1, - 0x76, 0xce, 0xd7, 0x66, 0x01, 0x54, 0x34, 0x6f, 0xb5, 0x5f, 0xfd, 0xf9, 0xaf, 0x96, 0x13, 0x64, - 0xd0, 0x28, 0x64, 0x0d, 0x87, 0xc6, 0x6e, 0x38, 0x53, 0x9d, 0xe2, 0x9a, 0x1c, 0x00, 0x30, 0xad, - 0xb3, 0xb8, 0x3f, 0xd5, 0x5c, 0x79, 0x65, 0x9c, 0x60, 0xf7, 0x0a, 0xd1, 0x2e, 0x6a, 0xa3, 0xaa, - 0x39, 0x9f, 0x16, 0x36, 0xe7, 0x67, 0xde, 0x87, 0xfa, 0xb2, 0xc8, 0xdc, 0xf6, 0x25, 0x9f, 0xe7, - 0x07, 0x9a, 0x25, 0xd9, 0x86, 0x6b, 0x47, 0x6c, 0x3c, 0xe5, 0x39, 0x03, 0x36, 0x08, 0x24, 0xd4, - 0xbe, 0x63, 0xea, 0xc0, 0x88, 0xfa, 0xe0, 0x92, 0xa8, 0x66, 0x67, 0x35, 0xfa, 0xe8, 0x7c, 0xe1, - 0x7f, 0x30, 0x67, 0xc9, 0x78, 0x3f, 0x58, 0xe5, 0x82, 0xa2, 0xd6, 0x61, 0x41, 0xeb, 0x32, 0xee, - 0xf9, 0xf0, 0x7c, 0xe1, 0x6f, 0xad, 0xf6, 0x98, 0x4c, 0xb0, 0x34, 0x40, 0xf0, 0x13, 0xb8, 0x94, - 0xab, 0xe9, 0x58, 0x2f, 0xcd, 0x6d, 0x4e, 0xda, 0xcc, 0xcd, 0xfd, 0xae, 0x48, 0x0f, 0xfe, 0x27, - 0xd2, 0x8d, 0x70, 0xf5, 0x47, 0xb6, 0x0c, 0x59, 0x55, 0x2c, 0x2b, 0x4b, 0x15, 0xd0, 0x22, 0xaf, - 0x1c, 0x20, 0x87, 0x71, 0x32, 0x1d, 0x33, 0x1d, 0xcb, 0x74, 0xf9, 0x1f, 0x7e, 0x6c, 0x47, 0x46, - 0x57, 0x3b, 0xe8, 0xc4, 0x4f, 0xd7, 0xf3, 0x9e, 0xb3, 0x13, 0x6d, 0x98, 0xfe, 0x27, 0x0b, 0xdf, - 0xc1, 0xab, 0x20, 0x61, 0x5f, 0x82, 0x9b, 0xe1, 0x55, 0x70, 0xde, 0xc6, 0x5e, 0x6b, 0x7d, 0x17, - 0x7b, 0x65, 0x9a, 0xd7, 0x07, 0x5f, 0x41, 0xed, 0x99, 0x12, 0xdf, 0x98, 0x1b, 0xef, 0x80, 0xb1, - 0x68, 0xaf, 0x60, 0x8f, 0x5a, 0xa2, 0x44, 0xd7, 0x38, 0xe4, 0x82, 0xa0, 0xf2, 0x8a, 0xa0, 0x5c, - 0xea, 0x27, 0x50, 0xef, 0xce, 0x2e, 0x3a, 0x7c, 0xbe, 0xe4, 0xb1, 0x72, 0xf5, 0x55, 0xf2, 0x0d, - 0x97, 0x3a, 0xfd, 0x59, 0x86, 0xad, 0x43, 0xce, 0xb2, 0xc1, 0xa8, 0x3b, 0x53, 0xb9, 0x30, 0x8f, - 0xa1, 0xa1, 0xa5, 0x66, 0xe3, 0xde, 0x40, 0x4e, 0x53, 0x9d, 0x3b, 0xe1, 0xee, 0xdb, 0x85, 0x5f, - 0x84, 0xcf, 0x17, 0x3e, 0xb1, 0x22, 0x17, 0xc0, 0x80, 0x02, 0x46, 0x8f, 0x4c, 0x60, 0x1c, 0x67, - 0x3b, 0xa0, 0x2f, 0xa8, 0x0d, 0x4c, 0xf7, 0x09, 0x13, 0xbc, 0x97, 0x4e, 0x93, 0x3e, 0xcf, 0xf0, - 0x1d, 0xcc, 0xbb, 0x17, 0xe0, 0x55, 0xf7, 0x02, 0x18, 0x50, 0x30, 0xd1, 0xf7, 0x18, 0x90, 0x08, - 0x30, 0xea, 0xe1, 0x81, 0xf8, 0x6a, 0x56, 0xa3, 0xdd, 0xb7, 0x0b, 0xbf, 0x80, 0xae, 0xcc, 0xbb, - 0xc2, 0x02, 0x5a, 0x37, 0x41, 0xd7, 0xac, 0xcd, 0x84, 0xe3, 0x38, 0x89, 0x35, 0x3e, 0xb0, 0x55, - 0x6a, 0x03, 0xf2, 0x05, 0x54, 0xf4, 0x4c, 0x79, 0x2e, 0xf2, 0x79, 0x67, 0x3d, 0x9f, 0xab, 0xcf, - 0x02, 0x35, 0x1b, 0x2c, 0xa3, 0xd1, 0xd7, 0x6f, 0xfe, 0x6d, 0x96, 0x5e, 0x9f, 0x36, 0x9d, 0x93, - 0xd3, 0xa6, 0xf3, 0xcf, 0x69, 0xd3, 0xf9, 0xf5, 0xac, 0x59, 0x3a, 0x39, 0x6b, 0x96, 0xde, 0x9c, - 0x35, 0x4b, 0x3f, 0x06, 0x22, 0xd6, 0xa3, 0x69, 0x3f, 0x1c, 0xc8, 0xa4, 0x93, 0x7f, 0xe6, 0xec, - 0xcf, 0x67, 0x6a, 0xf8, 0xd2, 0x7e, 0x93, 0xfa, 0x2e, 0xbe, 0x87, 0xf7, 0xff, 0x0b, 0x00, 0x00, - 0xff, 0xff, 0xd8, 0xa9, 0x21, 0xb7, 0x08, 0x07, 0x00, 0x00, + // 874 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x95, 0xbd, 0x6f, 0xdb, 0x46, + 0x14, 0xc0, 0x45, 0x89, 0xa1, 0xcc, 0x27, 0x27, 0x2e, 0x0e, 0x46, 0x42, 0x27, 0xad, 0xa4, 0x2a, + 0x29, 0xa0, 0x25, 0x54, 0xe3, 0xb4, 0x45, 0x91, 0xa1, 0x68, 0xe8, 0x7e, 0xc4, 0x40, 0xd2, 0xe1, + 0xac, 0xa0, 0x40, 0x17, 0xe1, 0x24, 0x5d, 0x4e, 0x6c, 0x44, 0x9e, 0xc0, 0x3b, 0xda, 0xf4, 0xd6, + 0xb1, 0x53, 0xd1, 0x29, 0x43, 0xa7, 0xce, 0xfd, 0x4b, 0x32, 0x7a, 0xcc, 0x50, 0xa8, 0xad, 0xbd, + 0xe5, 0xaf, 0x28, 0xee, 0x1d, 0xf5, 0xe1, 0x04, 0xf2, 0xa4, 0xf7, 0x75, 0xef, 0xde, 0xfb, 0xbd, + 0xa7, 0x23, 0xdc, 0x1d, 0x49, 0x95, 0x48, 0xd5, 0x1b, 0x32, 0xc5, 0x7b, 0x6c, 0x38, 0x8a, 0x7b, + 0xc7, 0x0f, 0x86, 0x5c, 0xb3, 0x07, 0xa8, 0x84, 0xb3, 0x4c, 0x6a, 0x49, 0x02, 0x1b, 0x14, 0x9a, + 0xa0, 0x10, 0xed, 0x65, 0xd0, 0xed, 0x5d, 0x21, 0x85, 0xc4, 0xa0, 0x9e, 0x91, 0x6c, 0xfc, 0xed, + 0x3b, 0x9a, 0xa7, 0x63, 0x9e, 0x25, 0x71, 0xaa, 0x6d, 0x4e, 0x7d, 0x3a, 0xe3, 0xaa, 0x74, 0xee, + 0x09, 0x29, 0xc5, 0x94, 0xf7, 0x50, 0x1b, 0xe6, 0x2f, 0x7a, 0x2c, 0x3d, 0xb5, 0xae, 0xce, 0xab, + 0x1a, 0x40, 0xbf, 0xa0, 0x5c, 0xcd, 0x64, 0xaa, 0x38, 0xb9, 0x09, 0xde, 0x84, 0xc7, 0x62, 0xa2, + 0x03, 0xa7, 0xed, 0x74, 0x6b, 0xb4, 0xd4, 0x48, 0x07, 0x3c, 0x5d, 0x4c, 0x98, 0x9a, 0x04, 0xd5, + 0xb6, 0xd3, 0xf5, 0x23, 0x38, 0x9f, 0xb7, 0xbc, 0x7e, 0xf1, 0x84, 0xa9, 0x09, 0x2d, 0x3d, 0xe4, + 0x43, 0xf0, 0x47, 0x72, 0xcc, 0xd5, 0x8c, 0x8d, 0x78, 0x50, 0x33, 0x61, 0x74, 0x65, 0x20, 0x04, + 0x5c, 0xa3, 0x04, 0x6e, 0xdb, 0xe9, 0x5e, 0xa7, 0x28, 0x1b, 0xdb, 0x98, 0x69, 0x16, 0x5c, 0xc3, + 0x60, 0x94, 0xc9, 0x2d, 0xa8, 0x67, 0xec, 0x64, 0x30, 0x95, 0x22, 0xf0, 0xd0, 0xec, 0x65, 0xec, + 0xe4, 0xa9, 0x14, 0xe4, 0x39, 0xb8, 0x53, 0x29, 0x54, 0x50, 0x6f, 0xd7, 0xba, 0x8d, 0xfd, 0x6e, + 0xb8, 0x09, 0x50, 0xf8, 0x38, 0x3a, 0x38, 0x7c, 0xc6, 0x95, 0x62, 0x82, 0x3f, 0x95, 0x22, 0xba, + 0xf5, 0x7a, 0xde, 0xaa, 0xfc, 0xf5, 0x4f, 0x6b, 0xe7, 0xb2, 0x5d, 0x51, 0x4c, 0x67, 0x6a, 0x88, + 0xd3, 0x17, 0x32, 0xd8, 0xb2, 0x35, 0x18, 0x99, 0x7c, 0x04, 0x20, 0x98, 0x1a, 0x9c, 0xb0, 0x54, + 0xf3, 0x71, 0xe0, 0x23, 0x09, 0x5f, 0x30, 0xf5, 0x23, 0x1a, 0xc8, 0x1e, 0x6c, 0x19, 0x77, 0xae, + 0xf8, 0x38, 0x00, 0x74, 0xd6, 0x05, 0x53, 0xcf, 0x15, 0x1f, 0x93, 0x7b, 0x50, 0xd5, 0x45, 0xd0, + 0x68, 0x3b, 0xdd, 0xc6, 0xfe, 0x6e, 0x68, 0xb1, 0x87, 0x0b, 0xec, 0xe1, 0xe3, 0xf4, 0x94, 0x56, + 0x75, 0x61, 0x48, 0xe9, 0x38, 0xe1, 0x4a, 0xb3, 0x64, 0x16, 0x6c, 0x5b, 0x52, 0x4b, 0xc3, 0x23, + 0xf7, 0xd7, 0x3f, 0x5b, 0x95, 0xce, 0x1f, 0x0e, 0xdc, 0xb8, 0x5c, 0x31, 0xb9, 0x03, 0x7e, 0xa2, + 0xc4, 0x20, 0x4e, 0xc7, 0xbc, 0xc0, 0xf9, 0x5c, 0xa7, 0x5b, 0x89, 0x12, 0x87, 0x46, 0x27, 0x1f, + 0x40, 0xcd, 0x30, 0xc3, 0xf1, 0x50, 0x23, 0x92, 0x23, 0xf0, 0xf8, 0x31, 0x4f, 0xb5, 0x0a, 0x6a, + 0x88, 0xec, 0x93, 0xcd, 0xc8, 0x8e, 0x74, 0x16, 0xa7, 0xe2, 0x5b, 0x13, 0x1d, 0xed, 0x96, 0xbc, + 0xb6, 0xd7, 0x8c, 0x8a, 0x96, 0xa9, 0x1e, 0xb9, 0xbf, 0xfc, 0xdd, 0x76, 0x3a, 0x19, 0x34, 0xd6, + 0xbc, 0x86, 0xa1, 0x59, 0x37, 0xac, 0xc9, 0xa7, 0x28, 0x93, 0x43, 0x00, 0xa6, 0x75, 0x16, 0x0f, + 0x73, 0xcd, 0x55, 0x50, 0xc5, 0x0a, 0xee, 0x5e, 0x31, 0xb4, 0x45, 0x6c, 0xe4, 0x9a, 0xfb, 0xe9, + 0xda, 0xe1, 0xf2, 0xce, 0x87, 0xe0, 0x2f, 0x83, 0x4c, 0xb7, 0x2f, 0xf9, 0x69, 0x79, 0xa1, 0x11, + 0xc9, 0x2e, 0x5c, 0x3b, 0x66, 0xd3, 0x9c, 0x97, 0x04, 0xac, 0xd2, 0x39, 0x80, 0xfa, 0xf7, 0x4c, + 0x1d, 0xbe, 0x3f, 0x54, 0x73, 0xd2, 0xdd, 0x34, 0xd4, 0x2a, 0x3a, 0x17, 0x43, 0xed, 0xfc, 0x0c, + 0x1e, 0xe5, 0x2a, 0x9f, 0xea, 0xe5, 0xc2, 0x9a, 0xd3, 0xdb, 0xe5, 0xc2, 0xbe, 0x0f, 0xfe, 0xb3, + 0x77, 0xc0, 0xdf, 0x0c, 0x57, 0x7f, 0x4e, 0xdb, 0xb5, 0x25, 0x6d, 0x3b, 0x5d, 0x92, 0xc5, 0xb1, + 0xbf, 0x72, 0x80, 0x1c, 0xc5, 0x49, 0x3e, 0x65, 0x3a, 0x96, 0xe9, 0xf2, 0x7f, 0xf9, 0x9d, 0xad, + 0x0e, 0x37, 0xd5, 0xc1, 0xed, 0xfa, 0x78, 0x33, 0xcb, 0xb2, 0xe3, 0x68, 0xcb, 0xe4, 0x3f, 0x9b, + 0xb7, 0x1c, 0x6c, 0x05, 0x21, 0x7c, 0x09, 0x5e, 0x86, 0xad, 0x60, 0xbd, 0x8d, 0xfd, 0xf6, 0xe6, + 0x2c, 0xb6, 0x65, 0x5a, 0xc6, 0x77, 0xbe, 0x82, 0xfa, 0x33, 0x25, 0xbe, 0x31, 0x1d, 0xef, 0x81, + 0x59, 0xbb, 0xc1, 0xda, 0xc8, 0xeb, 0x89, 0x12, 0x7d, 0x33, 0xf5, 0x05, 0xa0, 0xea, 0x0a, 0x50, + 0x39, 0xbe, 0x27, 0xe0, 0xf7, 0x8b, 0x45, 0x86, 0xcf, 0x97, 0x1c, 0x6b, 0x57, 0xb7, 0x52, 0x1e, + 0xb8, 0x94, 0xe9, 0xb7, 0x2a, 0xec, 0x1c, 0x71, 0x96, 0x8d, 0x26, 0xfd, 0x42, 0x95, 0x83, 0xf9, + 0x14, 0x1a, 0x5a, 0x6a, 0x36, 0x1d, 0x8c, 0x64, 0x9e, 0xda, 0xc7, 0xcb, 0x8d, 0x76, 0xde, 0xce, + 0x5b, 0xeb, 0x66, 0x0a, 0xa8, 0x1c, 0x18, 0xd9, 0xec, 0x8b, 0x8d, 0xb5, 0xc3, 0xb6, 0x8a, 0xc9, + 0x33, 0x63, 0x82, 0x0f, 0xd2, 0x3c, 0x19, 0xf2, 0x0c, 0x5f, 0xb1, 0x32, 0xcf, 0x9a, 0x99, 0x82, + 0x51, 0x7e, 0x40, 0x99, 0xdc, 0x07, 0xd4, 0x06, 0x98, 0x1a, 0x5f, 0x37, 0x37, 0xba, 0xf1, 0x76, + 0xde, 0x5a, 0xb3, 0x52, 0xdf, 0xc8, 0x7d, 0x23, 0x9a, 0x6b, 0xa7, 0x71, 0x12, 0x6b, 0x7c, 0xf3, + 0x5c, 0x6a, 0x15, 0xf2, 0x05, 0xd4, 0x74, 0xa1, 0x02, 0x0f, 0x71, 0xdc, 0xdb, 0x8c, 0x63, 0xf5, + 0x52, 0x53, 0x73, 0xc0, 0x02, 0x89, 0xbe, 0x7e, 0xf3, 0x5f, 0xb3, 0xf2, 0xfa, 0xbc, 0xe9, 0x9c, + 0x9d, 0x37, 0x9d, 0x7f, 0xcf, 0x9b, 0xce, 0xef, 0x17, 0xcd, 0xca, 0xd9, 0x45, 0xb3, 0xf2, 0xe6, + 0xa2, 0x59, 0xf9, 0xa9, 0x23, 0x62, 0x3d, 0xc9, 0x87, 0xe1, 0x48, 0x26, 0xbd, 0xf2, 0xcb, 0x63, + 0x7f, 0xee, 0xab, 0xf1, 0x4b, 0xfb, 0x99, 0x18, 0x7a, 0xf8, 0x44, 0x3d, 0xfc, 0x3f, 0x00, 0x00, + 0xff, 0xff, 0x84, 0x62, 0x26, 0x5f, 0x9b, 0x06, 0x00, 0x00, } func (m *TxResponse) Marshal() (dAtA []byte, err error) { diff --git a/types/address.go b/types/address.go index 1a968d5cc..e7486e27a 100644 --- a/types/address.go +++ b/types/address.go @@ -10,7 +10,7 @@ import ( "sync" "github.com/hashicorp/golang-lru/simplelru" - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" "github.com/cosmos/cosmos-sdk/internal/conv" @@ -116,10 +116,6 @@ var _ Address = AccAddress{} var _ Address = ValAddress{} var _ Address = ConsAddress{} -var _ yaml.Marshaler = AccAddress{} -var _ yaml.Marshaler = ValAddress{} -var _ yaml.Marshaler = ConsAddress{} - // ---------------------------------------------------------------------------- // account // ---------------------------------------------------------------------------- diff --git a/types/address_test.go b/types/address_test.go index bc79fd433..251732c03 100644 --- a/types/address_test.go +++ b/types/address_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" diff --git a/types/decimal_test.go b/types/decimal_test.go index 16a1561cb..8529f5bfe 100644 --- a/types/decimal_test.go +++ b/types/decimal_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/stretchr/testify/suite" - "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/types/result.go b/types/result.go index 6a50ecffb..42ed79c53 100644 --- a/types/result.go +++ b/types/result.go @@ -9,7 +9,7 @@ import ( "github.com/gogo/protobuf/proto" - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" abci "github.com/tendermint/tendermint/abci/types" ctypes "github.com/tendermint/tendermint/rpc/core/types" diff --git a/version/command.go b/version/command.go index 4dca92453..6a403cefe 100644 --- a/version/command.go +++ b/version/command.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" "github.com/tendermint/tendermint/libs/cli" - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" ) const flagLong = "long" diff --git a/x/auth/migrations/legacytx/stdsig_test.go b/x/auth/migrations/legacytx/stdsig_test.go index 28d96710e..b64949af1 100644 --- a/x/auth/migrations/legacytx/stdsig_test.go +++ b/x/auth/migrations/legacytx/stdsig_test.go @@ -5,7 +5,6 @@ import ( "testing" "github.com/stretchr/testify/require" - yaml "gopkg.in/yaml.v2" "github.com/cosmos/cosmos-sdk/testutil/testdata" "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" @@ -21,21 +20,21 @@ func TestStdSignatureMarshalYAML(t *testing.T) { }{ { legacytx.StdSignature{}, - "|\n pubkey: \"\"\n signature: \"\"\n", + "pub_key: \"\"\nsignature: \"\"\n", }, { legacytx.StdSignature{PubKey: pk, Signature: []byte("dummySig")}, - fmt.Sprintf("|\n pubkey: %s\n signature: 64756D6D79536967\n", pkStr), + fmt.Sprintf("pub_key: %s\nsignature: 64756D6D79536967\n", pkStr), }, { legacytx.StdSignature{PubKey: pk, Signature: nil}, - fmt.Sprintf("|\n pubkey: %s\n signature: \"\"\n", pkStr), + fmt.Sprintf("pub_key: %s\nsignature: \"\"\n", pkStr), }, } for i, tc := range testCases { - bz, err := yaml.Marshal(tc.sig) + bz2, err := tc.sig.MarshalYAML() require.NoError(t, err) - require.Equal(t, tc.expected, string(bz), "test case #%d", i) + require.Equal(t, tc.expected, bz2.(string), "test case #%d", i) } } diff --git a/x/auth/migrations/legacytx/stdsign.go b/x/auth/migrations/legacytx/stdsign.go index 06e44aace..d22e3786d 100644 --- a/x/auth/migrations/legacytx/stdsign.go +++ b/x/auth/migrations/legacytx/stdsign.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" @@ -106,9 +106,10 @@ func (ss StdSignature) MarshalYAML() (interface{}, error) { pk = ss.PubKey.String() } + bz, err := yaml.Marshal(struct { - PubKey string - Signature string + PubKey string `json:"pub_key"` + Signature string `json:"signature"` }{ pk, fmt.Sprintf("%X", ss.Signature), diff --git a/x/auth/types/account.go b/x/auth/types/account.go index 653f89bca..7fc5c50f3 100644 --- a/x/auth/types/account.go +++ b/x/auth/types/account.go @@ -9,7 +9,7 @@ import ( "github.com/gogo/protobuf/proto" "github.com/tendermint/tendermint/crypto" - "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -237,12 +237,12 @@ func (ma ModuleAccount) Validate() error { } type moduleAccountPretty struct { - Address sdk.AccAddress `json:"address" yaml:"address"` - PubKey string `json:"public_key" yaml:"public_key"` - AccountNumber uint64 `json:"account_number" yaml:"account_number"` - Sequence uint64 `json:"sequence" yaml:"sequence"` - Name string `json:"name" yaml:"name"` - Permissions []string `json:"permissions" yaml:"permissions"` + Address sdk.AccAddress `json:"address"` + PubKey string `json:"public_key"` + AccountNumber uint64 `json:"account_number"` + Sequence uint64 `json:"sequence"` + Name string `json:"name"` + Permissions []string `json:"permissions"` } func (ma ModuleAccount) String() string { diff --git a/x/auth/types/account_test.go b/x/auth/types/account_test.go index 45dc460f6..ad24595c3 100644 --- a/x/auth/types/account_test.go +++ b/x/auth/types/account_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/require" - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" "github.com/cosmos/cosmos-sdk/simapp" @@ -120,7 +120,7 @@ func TestModuleAccountMarshalYAML(t *testing.T) { bs, err := yaml.Marshal(moduleAcc) require.NoError(t, err) - want := "|\n address: cosmos1n7rdpqvgf37ktx30a2sv2kkszk3m7ncmg5drhe\n public_key: \"\"\n account_number: 0\n sequence: 0\n name: test\n permissions:\n - minter\n - burner\n - staking\n" + want := "account_number: 0\naddress: cosmos1n7rdpqvgf37ktx30a2sv2kkszk3m7ncmg5drhe\nname: test\npermissions:\n- minter\n- burner\n- staking\npublic_key: \"\"\nsequence: 0\n" require.Equal(t, want, string(bs)) } diff --git a/x/auth/types/auth.pb.go b/x/auth/types/auth.pb.go index ce5e08174..7391b2188 100644 --- a/x/auth/types/auth.pb.go +++ b/x/auth/types/auth.pb.go @@ -30,8 +30,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // type for additional functionality (e.g. vesting). type BaseAccount struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` - PubKey *types.Any `protobuf:"bytes,2,opt,name=pub_key,json=pubKey,proto3" json:"public_key,omitempty" yaml:"public_key"` - AccountNumber uint64 `protobuf:"varint,3,opt,name=account_number,json=accountNumber,proto3" json:"account_number,omitempty" yaml:"account_number"` + PubKey *types.Any `protobuf:"bytes,2,opt,name=pub_key,json=pubKey,proto3" json:"public_key,omitempty"` + AccountNumber uint64 `protobuf:"varint,3,opt,name=account_number,json=accountNumber,proto3" json:"account_number,omitempty"` Sequence uint64 `protobuf:"varint,4,opt,name=sequence,proto3" json:"sequence,omitempty"` } @@ -69,7 +69,7 @@ var xxx_messageInfo_BaseAccount proto.InternalMessageInfo // ModuleAccount defines an account for modules that holds coins on a pool. type ModuleAccount struct { - *BaseAccount `protobuf:"bytes,1,opt,name=base_account,json=baseAccount,proto3,embedded=base_account" json:"base_account,omitempty" yaml:"base_account"` + *BaseAccount `protobuf:"bytes,1,opt,name=base_account,json=baseAccount,proto3,embedded=base_account" json:"base_account,omitempty"` Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` Permissions []string `protobuf:"bytes,3,rep,name=permissions,proto3" json:"permissions,omitempty"` } @@ -108,11 +108,11 @@ var xxx_messageInfo_ModuleAccount proto.InternalMessageInfo // Params defines the parameters for the auth module. type Params struct { - MaxMemoCharacters uint64 `protobuf:"varint,1,opt,name=max_memo_characters,json=maxMemoCharacters,proto3" json:"max_memo_characters,omitempty" yaml:"max_memo_characters"` - TxSigLimit uint64 `protobuf:"varint,2,opt,name=tx_sig_limit,json=txSigLimit,proto3" json:"tx_sig_limit,omitempty" yaml:"tx_sig_limit"` - TxSizeCostPerByte uint64 `protobuf:"varint,3,opt,name=tx_size_cost_per_byte,json=txSizeCostPerByte,proto3" json:"tx_size_cost_per_byte,omitempty" yaml:"tx_size_cost_per_byte"` - SigVerifyCostED25519 uint64 `protobuf:"varint,4,opt,name=sig_verify_cost_ed25519,json=sigVerifyCostEd25519,proto3" json:"sig_verify_cost_ed25519,omitempty" yaml:"sig_verify_cost_ed25519"` - SigVerifyCostSecp256k1 uint64 `protobuf:"varint,5,opt,name=sig_verify_cost_secp256k1,json=sigVerifyCostSecp256k1,proto3" json:"sig_verify_cost_secp256k1,omitempty" yaml:"sig_verify_cost_secp256k1"` + MaxMemoCharacters uint64 `protobuf:"varint,1,opt,name=max_memo_characters,json=maxMemoCharacters,proto3" json:"max_memo_characters,omitempty"` + TxSigLimit uint64 `protobuf:"varint,2,opt,name=tx_sig_limit,json=txSigLimit,proto3" json:"tx_sig_limit,omitempty"` + TxSizeCostPerByte uint64 `protobuf:"varint,3,opt,name=tx_size_cost_per_byte,json=txSizeCostPerByte,proto3" json:"tx_size_cost_per_byte,omitempty"` + SigVerifyCostED25519 uint64 `protobuf:"varint,4,opt,name=sig_verify_cost_ed25519,json=sigVerifyCostEd25519,proto3" json:"sig_verify_cost_ed25519,omitempty"` + SigVerifyCostSecp256k1 uint64 `protobuf:"varint,5,opt,name=sig_verify_cost_secp256k1,json=sigVerifyCostSecp256k1,proto3" json:"sig_verify_cost_secp256k1,omitempty"` } func (m *Params) Reset() { *m = Params{} } @@ -191,51 +191,46 @@ func init() { func init() { proto.RegisterFile("cosmos/auth/v1beta1/auth.proto", fileDescriptor_7e1f7e915d020d2d) } var fileDescriptor_7e1f7e915d020d2d = []byte{ - // 691 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x54, 0x4f, 0x4f, 0xdb, 0x48, - 0x14, 0x8f, 0x49, 0x96, 0x3f, 0x13, 0x40, 0xc2, 0x04, 0x70, 0xb2, 0x2b, 0xdb, 0xf2, 0x29, 0x2b, - 0x6d, 0x1c, 0x25, 0x2b, 0x56, 0x22, 0x87, 0xd5, 0x62, 0x76, 0x0f, 0x68, 0x17, 0x84, 0x1c, 0x69, - 0x0f, 0x55, 0x25, 0x77, 0xec, 0x0c, 0xc6, 0x22, 0xe3, 0x31, 0x9e, 0x31, 0x8a, 0xf9, 0x04, 0x3d, - 0xf6, 0xd6, 0x1e, 0xf9, 0x10, 0x7c, 0x83, 0x5e, 0x2a, 0x4e, 0xa8, 0xa7, 0x9e, 0xdc, 0x2a, 0x5c, - 0xaa, 0x1e, 0xf3, 0x09, 0xaa, 0xcc, 0x38, 0x21, 0x41, 0xe9, 0x29, 0xf3, 0x7e, 0xbf, 0xdf, 0x7b, - 0xbf, 0x37, 0xef, 0xc5, 0x03, 0x54, 0x8f, 0x50, 0x4c, 0x68, 0x13, 0x26, 0xec, 0xa2, 0x79, 0xdd, - 0x72, 0x11, 0x83, 0x2d, 0x1e, 0x98, 0x51, 0x4c, 0x18, 0x91, 0xb7, 0x05, 0x6f, 0x72, 0x28, 0xe7, - 0x6b, 0x55, 0x01, 0x3a, 0x5c, 0xd2, 0xcc, 0x15, 0x3c, 0xa8, 0x55, 0x7c, 0xe2, 0x13, 0x81, 0x8f, - 0x4f, 0x39, 0x5a, 0xf5, 0x09, 0xf1, 0xfb, 0xa8, 0xc9, 0x23, 0x37, 0x39, 0x6f, 0xc2, 0x30, 0x15, - 0x94, 0xf1, 0x76, 0x09, 0x94, 0x2d, 0x48, 0xd1, 0xa1, 0xe7, 0x91, 0x24, 0x64, 0x72, 0x1b, 0xac, - 0xc0, 0x5e, 0x2f, 0x46, 0x94, 0x2a, 0x92, 0x2e, 0xd5, 0xd7, 0x2c, 0xe5, 0xe3, 0x5d, 0xa3, 0x92, - 0x7b, 0x1c, 0x0a, 0xa6, 0xcb, 0xe2, 0x20, 0xf4, 0xed, 0x89, 0x50, 0x7e, 0x09, 0x56, 0xa2, 0xc4, - 0x75, 0x2e, 0x51, 0xaa, 0x2c, 0xe9, 0x52, 0xbd, 0xdc, 0xae, 0x98, 0xc2, 0xd0, 0x9c, 0x18, 0x9a, - 0x87, 0x61, 0x6a, 0x35, 0xbe, 0x65, 0x5a, 0x25, 0x4a, 0xdc, 0x7e, 0xe0, 0x8d, 0xb5, 0xbf, 0x11, - 0x1c, 0x30, 0x84, 0x23, 0x96, 0x8e, 0x32, 0x6d, 0x2b, 0x85, 0xb8, 0xdf, 0x31, 0x9e, 0x58, 0xc3, - 0x5e, 0x8e, 0x12, 0xf7, 0x5f, 0x94, 0xca, 0x7f, 0x81, 0x4d, 0x28, 0x9a, 0x73, 0xc2, 0x04, 0xbb, - 0x28, 0x56, 0x8a, 0xba, 0x54, 0x2f, 0x59, 0xd5, 0x51, 0xa6, 0xed, 0x88, 0xb4, 0x79, 0xde, 0xb0, - 0x37, 0x72, 0xe0, 0x94, 0xc7, 0x72, 0x0d, 0xac, 0x52, 0x74, 0x95, 0xa0, 0xd0, 0x43, 0x4a, 0x69, - 0x9c, 0x6b, 0x4f, 0xe3, 0x8e, 0xf2, 0xfa, 0x56, 0x2b, 0xbc, 0xbb, 0xd5, 0x0a, 0x5f, 0x6f, 0xb5, - 0xc2, 0xfd, 0x5d, 0x63, 0x35, 0x1f, 0xc4, 0xb1, 0xf1, 0x5e, 0x02, 0x1b, 0x27, 0xa4, 0x97, 0xf4, - 0xa7, 0xb3, 0x79, 0x05, 0xd6, 0x5d, 0x48, 0x91, 0x93, 0x57, 0xe7, 0x03, 0x2a, 0xb7, 0x75, 0x73, - 0xc1, 0x8e, 0xcc, 0x99, 0x99, 0x5a, 0x3f, 0x3f, 0x64, 0x9a, 0x34, 0xca, 0xb4, 0x6d, 0xd1, 0xed, - 0x6c, 0x0d, 0xc3, 0x2e, 0xbb, 0x33, 0xd3, 0x97, 0x41, 0x29, 0x84, 0x18, 0xf1, 0x31, 0xae, 0xd9, - 0xfc, 0x2c, 0xeb, 0xa0, 0x1c, 0xa1, 0x18, 0x07, 0x94, 0x06, 0x24, 0xa4, 0x4a, 0x51, 0x2f, 0xd6, - 0xd7, 0xec, 0x59, 0xa8, 0x53, 0x9b, 0xdc, 0xe1, 0xfe, 0xae, 0xb1, 0x39, 0xd7, 0xf2, 0xb1, 0xf1, - 0xb9, 0x08, 0x96, 0xcf, 0x60, 0x0c, 0x31, 0x95, 0x4f, 0xc1, 0x36, 0x86, 0x03, 0x07, 0x23, 0x4c, - 0x1c, 0xef, 0x02, 0xc6, 0xd0, 0x63, 0x28, 0x16, 0x6b, 0x2e, 0x59, 0xea, 0x28, 0xd3, 0x6a, 0xa2, - 0xbf, 0x05, 0x22, 0xc3, 0xde, 0xc2, 0x70, 0x70, 0x82, 0x30, 0x39, 0x9a, 0x62, 0xf2, 0x01, 0x58, - 0x67, 0x03, 0x87, 0x06, 0xbe, 0xd3, 0x0f, 0x70, 0xc0, 0x78, 0xd3, 0x25, 0x6b, 0xef, 0xe9, 0xa2, - 0xb3, 0xac, 0x61, 0x03, 0x36, 0xe8, 0x06, 0xfe, 0x7f, 0xe3, 0x40, 0xb6, 0xc1, 0x0e, 0x27, 0x6f, - 0x90, 0xe3, 0x11, 0xca, 0x9c, 0x08, 0xc5, 0x8e, 0x9b, 0x32, 0x94, 0xaf, 0x56, 0x1f, 0x65, 0xda, - 0x2f, 0x33, 0x35, 0x9e, 0xcb, 0x0c, 0x7b, 0x6b, 0x5c, 0xec, 0x06, 0x1d, 0x11, 0xca, 0xce, 0x50, - 0x6c, 0xa5, 0x0c, 0xc9, 0x57, 0x60, 0x6f, 0xec, 0x76, 0x8d, 0xe2, 0xe0, 0x3c, 0x15, 0x7a, 0xd4, - 0x6b, 0xef, 0xef, 0xb7, 0x0e, 0xc4, 0xd2, 0xad, 0xce, 0x30, 0xd3, 0x2a, 0xdd, 0xc0, 0xff, 0x9f, - 0x2b, 0xc6, 0xa9, 0xff, 0xfc, 0xcd, 0xf9, 0x51, 0xa6, 0xa9, 0xc2, 0xed, 0x07, 0x05, 0x0c, 0xbb, - 0x42, 0xe7, 0xf2, 0x04, 0x2c, 0xa7, 0xa0, 0xfa, 0x3c, 0x83, 0x22, 0x2f, 0x6a, 0xef, 0xff, 0x71, - 0xd9, 0x52, 0x7e, 0xe2, 0xa6, 0x7f, 0x0e, 0x33, 0x6d, 0x77, 0xce, 0xb4, 0x3b, 0x51, 0x8c, 0x32, - 0x4d, 0x5f, 0x6c, 0x3b, 0x2d, 0x62, 0xd8, 0xbb, 0x74, 0x61, 0x6e, 0x67, 0x35, 0xff, 0xcf, 0x4a, - 0xd6, 0xd1, 0x87, 0xa1, 0x2a, 0x3d, 0x0c, 0x55, 0xe9, 0xcb, 0x50, 0x95, 0xde, 0x3c, 0xaa, 0x85, - 0x87, 0x47, 0xb5, 0xf0, 0xe9, 0x51, 0x2d, 0xbc, 0xf8, 0xd5, 0x0f, 0xd8, 0x45, 0xe2, 0x9a, 0x1e, - 0xc1, 0xf9, 0x2b, 0x91, 0xff, 0x34, 0x68, 0xef, 0xb2, 0x39, 0x10, 0x8f, 0x0e, 0x4b, 0x23, 0x44, - 0xdd, 0x65, 0xfe, 0xa5, 0xfe, 0xfe, 0x3d, 0x00, 0x00, 0xff, 0xff, 0xb5, 0x7f, 0x3f, 0xe6, 0x90, - 0x04, 0x00, 0x00, + // 609 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0x3f, 0x6f, 0xd3, 0x4e, + 0x18, 0x8e, 0xdb, 0xfc, 0xfa, 0xe7, 0xd2, 0x56, 0xea, 0x35, 0xbf, 0xe2, 0x66, 0xb0, 0xad, 0x4a, + 0x48, 0x41, 0x22, 0x0e, 0x09, 0x2a, 0x12, 0xdd, 0xea, 0x82, 0x50, 0x05, 0x85, 0xca, 0x11, 0x0c, + 0x2c, 0xd6, 0xd9, 0x79, 0xeb, 0x9e, 0x9a, 0xf3, 0x19, 0xdf, 0xb9, 0x8a, 0xfb, 0x09, 0x18, 0x19, + 0x19, 0xfb, 0x01, 0x18, 0x3b, 0x33, 0xa3, 0x4e, 0x15, 0x13, 0x53, 0x84, 0xd2, 0x01, 0xc4, 0xa7, + 0x40, 0xb9, 0x73, 0xaa, 0x16, 0x75, 0xf2, 0xbd, 0xcf, 0xf3, 0xdc, 0xf3, 0xfe, 0xf3, 0x21, 0x2b, + 0xe2, 0x82, 0x71, 0xd1, 0x26, 0xb9, 0x3c, 0x6a, 0x9f, 0x74, 0x42, 0x90, 0xa4, 0xa3, 0x02, 0x37, + 0xcd, 0xb8, 0xe4, 0x78, 0x4d, 0xf3, 0xae, 0x82, 0x4a, 0xbe, 0xb1, 0xa1, 0xc1, 0x40, 0x49, 0xda, + 0xa5, 0x42, 0x05, 0x8d, 0x7a, 0xcc, 0x63, 0xae, 0xf1, 0xc9, 0xa9, 0x44, 0x37, 0x62, 0xce, 0xe3, + 0x01, 0xb4, 0x55, 0x14, 0xe6, 0x87, 0x6d, 0x92, 0x14, 0x9a, 0xda, 0xfc, 0x65, 0xa0, 0x9a, 0x47, + 0x04, 0xec, 0x44, 0x11, 0xcf, 0x13, 0x89, 0xbb, 0x68, 0x9e, 0xf4, 0xfb, 0x19, 0x08, 0x61, 0x1a, + 0x8e, 0xd1, 0x5c, 0xf4, 0xcc, 0xef, 0xe7, 0xad, 0x7a, 0x99, 0x63, 0x47, 0x33, 0x3d, 0x99, 0xd1, + 0x24, 0xf6, 0xa7, 0x42, 0xfc, 0x02, 0xcd, 0xa7, 0x79, 0x18, 0x1c, 0x43, 0x61, 0xce, 0x38, 0x46, + 0xb3, 0xd6, 0xad, 0xbb, 0x3a, 0xa1, 0x3b, 0x4d, 0xe8, 0xee, 0x24, 0x85, 0x67, 0xfe, 0x19, 0xd9, + 0xf5, 0x34, 0x0f, 0x07, 0x34, 0x9a, 0x68, 0x1f, 0x72, 0x46, 0x25, 0xb0, 0x54, 0x16, 0xfe, 0x5c, + 0x9a, 0x87, 0x2f, 0xa1, 0xc0, 0xf7, 0xd1, 0x0a, 0xd1, 0x75, 0x04, 0x49, 0xce, 0x42, 0xc8, 0xcc, + 0x59, 0xc7, 0x68, 0x56, 0xfd, 0xe5, 0x12, 0x7d, 0xad, 0x40, 0xdc, 0x40, 0x0b, 0x02, 0x3e, 0xe4, + 0x90, 0x44, 0x60, 0x56, 0x95, 0xe0, 0x3a, 0xde, 0x36, 0x3f, 0x9e, 0xd9, 0x95, 0xcf, 0x67, 0x76, + 0xe5, 0xf7, 0x99, 0x5d, 0xb9, 0x38, 0x6f, 0x2d, 0x94, 0x8d, 0xed, 0x6d, 0x7e, 0x31, 0xd0, 0xf2, + 0x3e, 0xef, 0xe7, 0x83, 0xeb, 0x5e, 0xf7, 0xd0, 0x52, 0x48, 0x04, 0x04, 0xa5, 0xbb, 0x6a, 0xb8, + 0xd6, 0x75, 0xdc, 0x3b, 0x66, 0xee, 0xde, 0x98, 0x91, 0x57, 0xbd, 0x1c, 0xd9, 0x86, 0x5f, 0x0b, + 0x6f, 0x8c, 0x0d, 0xa3, 0x6a, 0x42, 0x18, 0xa8, 0xfe, 0x17, 0x7d, 0x75, 0xc6, 0x0e, 0xaa, 0xa5, + 0x90, 0x31, 0x2a, 0x04, 0xe5, 0x89, 0x30, 0x67, 0x9d, 0xd9, 0xe6, 0xa2, 0x7f, 0x13, 0xda, 0x6e, + 0x4c, 0x8b, 0xbd, 0x38, 0x6f, 0xad, 0xdc, 0xaa, 0x6d, 0x6f, 0xf3, 0xeb, 0x0c, 0x9a, 0x3b, 0x20, + 0x19, 0x61, 0x02, 0xbb, 0x68, 0x8d, 0x91, 0x61, 0xc0, 0x80, 0xf1, 0x20, 0x3a, 0x22, 0x19, 0x89, + 0x24, 0x64, 0x7a, 0x3f, 0x55, 0x7f, 0x95, 0x91, 0xe1, 0x3e, 0x30, 0xbe, 0x7b, 0x4d, 0x60, 0x07, + 0x2d, 0xc9, 0x61, 0x20, 0x68, 0x1c, 0x0c, 0x28, 0xa3, 0x52, 0x15, 0x55, 0xf5, 0x91, 0x1c, 0xf6, + 0x68, 0xfc, 0x6a, 0x82, 0xe0, 0x47, 0xe8, 0x7f, 0xa5, 0x38, 0x85, 0x20, 0xe2, 0x42, 0x06, 0x29, + 0x64, 0x41, 0x58, 0x48, 0x28, 0xe7, 0xbd, 0x3a, 0x91, 0x9e, 0xc2, 0x2e, 0x17, 0xf2, 0x00, 0x32, + 0xaf, 0x90, 0x80, 0xdf, 0xa0, 0x7b, 0x13, 0xc3, 0x13, 0xc8, 0xe8, 0x61, 0xa1, 0x2f, 0x41, 0xbf, + 0xbb, 0xb5, 0xd5, 0x79, 0xaa, 0x57, 0xe0, 0x99, 0xe3, 0x91, 0x5d, 0xef, 0xd1, 0xf8, 0x9d, 0x52, + 0x4c, 0xae, 0x3e, 0x7f, 0xa6, 0x78, 0xbf, 0x2e, 0x6e, 0xa1, 0xfa, 0x16, 0x7e, 0x8b, 0x36, 0xfe, + 0x35, 0x14, 0x10, 0xa5, 0xdd, 0xad, 0x27, 0xc7, 0x1d, 0xf3, 0x3f, 0x65, 0xd9, 0x18, 0x8f, 0xec, + 0xf5, 0x5b, 0x96, 0xbd, 0xa9, 0xc2, 0x5f, 0x17, 0x77, 0xe2, 0xdb, 0x0b, 0xe5, 0xee, 0x0d, 0x6f, + 0xf7, 0xdb, 0xd8, 0x32, 0x2e, 0xc7, 0x96, 0xf1, 0x73, 0x6c, 0x19, 0x9f, 0xae, 0xac, 0xca, 0xe5, + 0x95, 0x55, 0xf9, 0x71, 0x65, 0x55, 0xde, 0x3f, 0x88, 0xa9, 0x3c, 0xca, 0x43, 0x37, 0xe2, 0xac, + 0x7c, 0x3d, 0xe5, 0xa7, 0x25, 0xfa, 0xc7, 0xed, 0xa1, 0x7e, 0x8c, 0xb2, 0x48, 0x41, 0x84, 0x73, + 0xea, 0x0f, 0x7e, 0xfc, 0x37, 0x00, 0x00, 0xff, 0xff, 0x35, 0x25, 0xef, 0x58, 0xa8, 0x03, 0x00, + 0x00, } func (this *Params) Equal(that interface{}) bool { diff --git a/x/auth/types/params.go b/x/auth/types/params.go index 3b9dbe959..537453441 100644 --- a/x/auth/types/params.go +++ b/x/auth/types/params.go @@ -3,7 +3,7 @@ package types import ( "fmt" - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" ) diff --git a/x/auth/vesting/types/period.go b/x/auth/vesting/types/period.go index a3b32fcaf..e78eab31f 100644 --- a/x/auth/vesting/types/period.go +++ b/x/auth/vesting/types/period.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" ) // Periods stores all vesting periods passed as part of a PeriodicVestingAccount diff --git a/x/auth/vesting/types/tx.pb.go b/x/auth/vesting/types/tx.pb.go index 2a2cceaa2..b0662b93a 100644 --- a/x/auth/vesting/types/tx.pb.go +++ b/x/auth/vesting/types/tx.pb.go @@ -34,10 +34,10 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // MsgCreateVestingAccount defines a message that enables creating a vesting // account. type MsgCreateVestingAccount struct { - FromAddress string `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty" yaml:"from_address"` - ToAddress string `protobuf:"bytes,2,opt,name=to_address,json=toAddress,proto3" json:"to_address,omitempty" yaml:"to_address"` + FromAddress string `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty"` + ToAddress string `protobuf:"bytes,2,opt,name=to_address,json=toAddress,proto3" json:"to_address,omitempty"` Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=amount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"amount"` - EndTime int64 `protobuf:"varint,4,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty" yaml:"end_time"` + EndTime int64 `protobuf:"varint,4,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"` Delayed bool `protobuf:"varint,5,opt,name=delayed,proto3" json:"delayed,omitempty"` } @@ -149,9 +149,9 @@ var xxx_messageInfo_MsgCreateVestingAccountResponse proto.InternalMessageInfo // MsgCreateVestingAccount defines a message that enables creating a vesting // account. type MsgCreatePeriodicVestingAccount struct { - FromAddress string `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty" yaml:"from_address"` - ToAddress string `protobuf:"bytes,2,opt,name=to_address,json=toAddress,proto3" json:"to_address,omitempty" yaml:"to_address"` - StartTime int64 `protobuf:"varint,3,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty" yaml:"start_time"` + FromAddress string `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty"` + ToAddress string `protobuf:"bytes,2,opt,name=to_address,json=toAddress,proto3" json:"to_address,omitempty"` + StartTime int64 `protobuf:"varint,3,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"` VestingPeriods []Period `protobuf:"bytes,4,rep,name=vesting_periods,json=vestingPeriods,proto3" json:"vesting_periods"` } @@ -266,42 +266,39 @@ func init() { func init() { proto.RegisterFile("cosmos/vesting/v1beta1/tx.proto", fileDescriptor_5338ca97811f9792) } var fileDescriptor_5338ca97811f9792 = []byte{ - // 559 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x31, 0x6f, 0xd3, 0x4e, - 0x1c, 0xf5, 0xc5, 0xf9, 0xb7, 0xcd, 0xf5, 0x2f, 0x2a, 0xdc, 0x40, 0xdd, 0x08, 0xd9, 0xc1, 0x42, - 0xc2, 0x0c, 0xb1, 0x49, 0xa9, 0x84, 0x94, 0x05, 0xd5, 0x1d, 0x21, 0x12, 0x32, 0x88, 0x81, 0x25, - 0x72, 0xec, 0xc3, 0x3d, 0x51, 0xfb, 0x22, 0xdf, 0xa5, 0x6a, 0x36, 0x3e, 0x02, 0x23, 0x13, 0x42, - 0x62, 0x63, 0xe6, 0x43, 0x74, 0xac, 0x98, 0x98, 0x02, 0x4a, 0x16, 0x46, 0x94, 0x4f, 0x80, 0x7c, - 0x77, 0x4e, 0x03, 0xb2, 0x5b, 0xc1, 0x94, 0xf8, 0xde, 0xfb, 0x3d, 0x3f, 0xbf, 0x77, 0x77, 0xd0, - 0x0c, 0x09, 0x4d, 0x08, 0x75, 0x4f, 0x10, 0x65, 0x38, 0x8d, 0xdd, 0x93, 0xee, 0x10, 0xb1, 0xa0, - 0xeb, 0xb2, 0x53, 0x67, 0x94, 0x11, 0x46, 0xb4, 0x9b, 0x82, 0xe0, 0x48, 0x82, 0x23, 0x09, 0xad, - 0x66, 0x4c, 0x62, 0xc2, 0x29, 0x6e, 0xfe, 0x4f, 0xb0, 0x5b, 0x86, 0x94, 0x1b, 0x06, 0x14, 0x2d, - 0xb5, 0x42, 0x82, 0x53, 0x89, 0xef, 0x0a, 0x7c, 0x20, 0x06, 0xa5, 0xb4, 0x80, 0xee, 0x54, 0x38, - 0x29, 0x5e, 0xcc, 0x59, 0xd6, 0xcf, 0x1a, 0xdc, 0xe9, 0xd3, 0xf8, 0x30, 0x43, 0x01, 0x43, 0x2f, - 0x04, 0x74, 0x10, 0x86, 0x64, 0x9c, 0x32, 0xcd, 0x87, 0xff, 0xbf, 0xca, 0x48, 0x32, 0x08, 0xa2, - 0x28, 0x43, 0x94, 0xea, 0xa0, 0x0d, 0xec, 0x86, 0xe7, 0x2e, 0xa6, 0xe6, 0xf6, 0x24, 0x48, 0x8e, - 0x7b, 0xd6, 0x2a, 0x6a, 0x7d, 0xf9, 0xdc, 0x69, 0x4a, 0x03, 0x07, 0x62, 0xe9, 0x19, 0xcb, 0x70, - 0x1a, 0xfb, 0x9b, 0x39, 0x4d, 0x2e, 0x69, 0x4f, 0x20, 0x64, 0x64, 0xa9, 0x58, 0xe3, 0x8a, 0x9d, - 0xc5, 0xd4, 0xbc, 0x2e, 0x14, 0x2f, 0xb0, 0x6a, 0xbd, 0x06, 0x23, 0x85, 0x5a, 0x08, 0xd7, 0x82, - 0x24, 0xf7, 0xaa, 0xab, 0x6d, 0xd5, 0xde, 0xdc, 0xdb, 0x75, 0xe4, 0x44, 0x9e, 0x57, 0x11, 0xad, - 0x73, 0x48, 0x70, 0xea, 0xdd, 0x3f, 0x9b, 0x9a, 0xca, 0xa7, 0x6f, 0xa6, 0x1d, 0x63, 0x76, 0x34, - 0x1e, 0x3a, 0x21, 0x49, 0x64, 0x5e, 0xf2, 0xa7, 0x43, 0xa3, 0xd7, 0x2e, 0x9b, 0x8c, 0x10, 0xe5, - 0x03, 0xd4, 0x97, 0xd2, 0x9a, 0x03, 0x37, 0x50, 0x1a, 0x0d, 0x18, 0x4e, 0x90, 0x5e, 0x6f, 0x03, - 0x5b, 0xf5, 0xb6, 0x17, 0x53, 0x73, 0x4b, 0x18, 0x2e, 0x10, 0xcb, 0x5f, 0x47, 0x69, 0xf4, 0x1c, - 0x27, 0x48, 0xd3, 0xe1, 0x7a, 0x84, 0x8e, 0x83, 0x09, 0x8a, 0xf4, 0xff, 0xda, 0xc0, 0xde, 0xf0, - 0x8b, 0xc7, 0x5e, 0xfd, 0xc7, 0x07, 0x13, 0x58, 0xb7, 0xa1, 0x59, 0x91, 0xb8, 0x8f, 0xe8, 0x88, - 0xa4, 0x14, 0x59, 0xef, 0x6b, 0x2b, 0x9c, 0xa7, 0x28, 0xc3, 0x24, 0xc2, 0xe1, 0x1f, 0xed, 0xf4, - 0x4a, 0xdb, 0xd9, 0xa9, 0x68, 0xe7, 0xf7, 0x16, 0xf6, 0x4b, 0x5a, 0xb8, 0x51, 0xda, 0xc2, 0x6a, - 0xda, 0xfb, 0x10, 0x52, 0x16, 0x64, 0x4c, 0x44, 0xa1, 0xf2, 0x28, 0x56, 0xa6, 0x2e, 0x30, 0xcb, - 0x6f, 0xf0, 0x07, 0x1e, 0x47, 0x1f, 0x6e, 0xc9, 0x2d, 0x37, 0x18, 0xf1, 0x2f, 0xa1, 0x7a, 0x9d, - 0x97, 0x65, 0x38, 0xe5, 0x47, 0xc1, 0x11, 0x1f, 0xec, 0xd5, 0xf3, 0xc6, 0xfc, 0x6b, 0x12, 0x15, - 0x8b, 0x94, 0x67, 0xa8, 0x58, 0xf7, 0xe0, 0xdd, 0x2b, 0xf2, 0x29, 0xb2, 0xdc, 0xfb, 0x58, 0x83, - 0x6a, 0x9f, 0xc6, 0xda, 0x1b, 0x00, 0x9b, 0xa5, 0xdb, 0xdc, 0xad, 0xf2, 0x51, 0xd1, 0x52, 0xeb, - 0xe1, 0x5f, 0x0e, 0x14, 0x56, 0xb4, 0x77, 0x00, 0xde, 0xba, 0xb4, 0xd3, 0xab, 0x95, 0xcb, 0x07, - 0x5b, 0x8f, 0xfe, 0x71, 0xb0, 0xb0, 0xe6, 0x3d, 0x3e, 0x9b, 0x19, 0xe0, 0x7c, 0x66, 0x80, 0xef, - 0x33, 0x03, 0xbc, 0x9d, 0x1b, 0xca, 0xf9, 0xdc, 0x50, 0xbe, 0xce, 0x0d, 0xe5, 0x65, 0xf7, 0xd2, - 0x03, 0x73, 0xea, 0x06, 0x63, 0x76, 0xb4, 0xbc, 0x64, 0xf8, 0xf9, 0x19, 0xae, 0xf1, 0xbb, 0xe5, - 0xc1, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe3, 0x1b, 0x2d, 0xe5, 0x0d, 0x05, 0x00, 0x00, + // 512 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0xbf, 0x6f, 0xd3, 0x40, + 0x14, 0xc7, 0x7d, 0x71, 0x68, 0x9b, 0x2b, 0x02, 0xc9, 0x8a, 0xc0, 0x89, 0xa8, 0x9d, 0x46, 0x48, + 0x98, 0xa1, 0x36, 0x29, 0x43, 0x25, 0x18, 0x50, 0xd3, 0x11, 0x45, 0x42, 0x06, 0x31, 0xb0, 0x44, + 0x8e, 0xfd, 0x70, 0x4f, 0x60, 0x5f, 0xe4, 0x77, 0xa9, 0xda, 0x8d, 0x3f, 0x81, 0x91, 0x11, 0x89, + 0x8d, 0x85, 0x85, 0x3f, 0xa2, 0x63, 0xc5, 0x02, 0x13, 0xa0, 0x64, 0xe1, 0xcf, 0x40, 0xbe, 0x3b, + 0x47, 0x05, 0x92, 0x46, 0x74, 0x4a, 0x7c, 0xef, 0xfb, 0x7d, 0x3f, 0x3e, 0xf7, 0x8e, 0xba, 0x31, + 0xc7, 0x8c, 0x63, 0x70, 0x04, 0x28, 0x58, 0x9e, 0x06, 0x47, 0xbd, 0x11, 0x88, 0xa8, 0x17, 0x88, + 0x63, 0x7f, 0x5c, 0x70, 0xc1, 0xad, 0x1b, 0x4a, 0xe0, 0x6b, 0x81, 0xaf, 0x05, 0xed, 0x66, 0xca, + 0x53, 0x2e, 0x25, 0x41, 0xf9, 0x4f, 0xa9, 0xdb, 0x8e, 0x4e, 0x37, 0x8a, 0x10, 0xe6, 0xb9, 0x62, + 0xce, 0x72, 0x1d, 0x6f, 0xa9, 0xf8, 0x50, 0x19, 0x75, 0x6a, 0x15, 0xba, 0xbd, 0xa4, 0x93, 0xaa, + 0xb0, 0x54, 0x75, 0x3f, 0xd5, 0xe8, 0xcd, 0x01, 0xa6, 0x07, 0x05, 0x44, 0x02, 0x9e, 0xab, 0xd0, + 0x7e, 0x1c, 0xf3, 0x49, 0x2e, 0xac, 0x87, 0xf4, 0xea, 0xcb, 0x82, 0x67, 0xc3, 0x28, 0x49, 0x0a, + 0x40, 0xb4, 0x49, 0x87, 0x78, 0x8d, 0xbe, 0xfd, 0xe5, 0xf3, 0x4e, 0x53, 0x57, 0xda, 0x57, 0x91, + 0xa7, 0xa2, 0x60, 0x79, 0x1a, 0x6e, 0x96, 0x6a, 0x7d, 0x64, 0xed, 0x51, 0x2a, 0xf8, 0xdc, 0x5a, + 0x5b, 0x61, 0x6d, 0x08, 0x5e, 0x19, 0x63, 0xba, 0x16, 0x65, 0x65, 0x7d, 0xdb, 0xec, 0x98, 0xde, + 0xe6, 0x6e, 0xcb, 0xd7, 0x8e, 0x92, 0x41, 0x85, 0xcb, 0x3f, 0xe0, 0x2c, 0xef, 0xdf, 0x3b, 0xfd, + 0xee, 0x1a, 0x1f, 0x7f, 0xb8, 0x5e, 0xca, 0xc4, 0xe1, 0x64, 0xe4, 0xc7, 0x3c, 0xd3, 0x0c, 0xf4, + 0xcf, 0x0e, 0x26, 0xaf, 0x02, 0x71, 0x32, 0x06, 0x94, 0x06, 0x0c, 0x75, 0x6a, 0xab, 0x45, 0x37, + 0x20, 0x4f, 0x86, 0x82, 0x65, 0x60, 0xd7, 0x3b, 0xc4, 0x33, 0xc3, 0x75, 0xc8, 0x93, 0x67, 0x2c, + 0x03, 0xcb, 0xa6, 0xeb, 0x09, 0xbc, 0x8e, 0x4e, 0x20, 0xb1, 0xaf, 0x74, 0x88, 0xb7, 0x11, 0x56, + 0x9f, 0x0f, 0xea, 0xbf, 0xde, 0xbb, 0xa4, 0xbb, 0x4d, 0xdd, 0x25, 0xc0, 0x42, 0xc0, 0x31, 0xcf, + 0x11, 0xba, 0x5f, 0xc9, 0x39, 0xcd, 0x13, 0x28, 0x18, 0x4f, 0x58, 0xfc, 0x17, 0xdc, 0xed, 0x45, + 0x70, 0xff, 0x44, 0xb8, 0xf5, 0x2f, 0xc2, 0xf3, 0xa0, 0xb6, 0x28, 0x45, 0x11, 0x15, 0x42, 0x4d, + 0x61, 0xca, 0x29, 0x1a, 0xf2, 0x44, 0xce, 0x31, 0xa0, 0xd7, 0xf5, 0x55, 0x0f, 0xc7, 0xb2, 0x05, + 0xb4, 0xeb, 0x12, 0xa8, 0xe3, 0x2f, 0x5e, 0x41, 0x5f, 0x75, 0xda, 0xaf, 0x97, 0x54, 0xc3, 0x6b, + 0x3a, 0xaa, 0x0e, 0x51, 0x0e, 0x6f, 0x74, 0xef, 0xd2, 0x3b, 0x2b, 0x06, 0xab, 0x20, 0xec, 0x7e, + 0xa8, 0x51, 0x73, 0x80, 0xa9, 0xf5, 0x86, 0xd0, 0xe6, 0xc2, 0xf5, 0x0a, 0x96, 0xf5, 0xb1, 0x04, + 0x6f, 0x7b, 0xef, 0x3f, 0x0d, 0x55, 0x2b, 0xd6, 0x3b, 0x42, 0x6f, 0x5d, 0x78, 0x19, 0xab, 0x33, + 0x2f, 0x36, 0xb6, 0x1f, 0x5d, 0xd2, 0x58, 0xb5, 0xd6, 0x7f, 0x7c, 0x3a, 0x75, 0xc8, 0xd9, 0xd4, + 0x21, 0x3f, 0xa7, 0x0e, 0x79, 0x3b, 0x73, 0x8c, 0xb3, 0x99, 0x63, 0x7c, 0x9b, 0x39, 0xc6, 0x8b, + 0xde, 0x85, 0x4b, 0x7d, 0x1c, 0x44, 0x13, 0x71, 0x38, 0x7f, 0xdc, 0x72, 0xc7, 0x47, 0x6b, 0xf2, + 0x4d, 0xdf, 0xff, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x22, 0xee, 0xde, 0x93, 0x85, 0x04, 0x00, 0x00, } func (this *MsgCreateVestingAccount) Equal(that interface{}) bool { diff --git a/x/auth/vesting/types/vesting.pb.go b/x/auth/vesting/types/vesting.pb.go index 783917097..dc2425b1a 100644 --- a/x/auth/vesting/types/vesting.pb.go +++ b/x/auth/vesting/types/vesting.pb.go @@ -30,10 +30,10 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // the necessary fields needed for any vesting account implementation. type BaseVestingAccount struct { *types.BaseAccount `protobuf:"bytes,1,opt,name=base_account,json=baseAccount,proto3,embedded=base_account" json:"base_account,omitempty"` - OriginalVesting github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=original_vesting,json=originalVesting,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"original_vesting" yaml:"original_vesting"` - DelegatedFree github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=delegated_free,json=delegatedFree,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"delegated_free" yaml:"delegated_free"` - DelegatedVesting github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,4,rep,name=delegated_vesting,json=delegatedVesting,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"delegated_vesting" yaml:"delegated_vesting"` - EndTime int64 `protobuf:"varint,5,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty" yaml:"end_time"` + OriginalVesting github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=original_vesting,json=originalVesting,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"original_vesting"` + DelegatedFree github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=delegated_free,json=delegatedFree,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"delegated_free"` + DelegatedVesting github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,4,rep,name=delegated_vesting,json=delegatedVesting,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"delegated_vesting"` + EndTime int64 `protobuf:"varint,5,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty"` } func (m *BaseVestingAccount) Reset() { *m = BaseVestingAccount{} } @@ -72,7 +72,7 @@ var xxx_messageInfo_BaseVestingAccount proto.InternalMessageInfo // continuously vests by unlocking coins linearly with respect to time. type ContinuousVestingAccount struct { *BaseVestingAccount `protobuf:"bytes,1,opt,name=base_vesting_account,json=baseVestingAccount,proto3,embedded=base_vesting_account" json:"base_vesting_account,omitempty"` - StartTime int64 `protobuf:"varint,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty" yaml:"start_time"` + StartTime int64 `protobuf:"varint,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"` } func (m *ContinuousVestingAccount) Reset() { *m = ContinuousVestingAccount{} } @@ -202,8 +202,8 @@ func (m *Period) GetAmount() github_com_cosmos_cosmos_sdk_types.Coins { // periodically vests by unlocking coins during each specified period. type PeriodicVestingAccount struct { *BaseVestingAccount `protobuf:"bytes,1,opt,name=base_vesting_account,json=baseVestingAccount,proto3,embedded=base_vesting_account" json:"base_vesting_account,omitempty"` - StartTime int64 `protobuf:"varint,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty" yaml:"start_time"` - VestingPeriods []Period `protobuf:"bytes,3,rep,name=vesting_periods,json=vestingPeriods,proto3" json:"vesting_periods" yaml:"vesting_periods"` + StartTime int64 `protobuf:"varint,2,opt,name=start_time,json=startTime,proto3" json:"start_time,omitempty"` + VestingPeriods []Period `protobuf:"bytes,3,rep,name=vesting_periods,json=vestingPeriods,proto3" json:"vesting_periods"` } func (m *PeriodicVestingAccount) Reset() { *m = PeriodicVestingAccount{} } @@ -291,46 +291,41 @@ func init() { } var fileDescriptor_89e80273ca606d6e = []byte{ - // 609 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x95, 0x3f, 0x6f, 0xd3, 0x40, - 0x18, 0xc6, 0x7d, 0x4d, 0x08, 0xe5, 0x0a, 0xfd, 0x63, 0xda, 0x60, 0x3a, 0xd8, 0x91, 0xc5, 0x10, - 0x21, 0xe1, 0xd0, 0xc2, 0xd4, 0x0d, 0x17, 0x21, 0x55, 0xed, 0x80, 0x2c, 0xc4, 0xc0, 0x12, 0x9d, - 0xed, 0xc3, 0xb1, 0x1a, 0xdf, 0x45, 0xbe, 0x4b, 0x45, 0x3e, 0x00, 0x08, 0xa9, 0x0b, 0x48, 0x0c, - 0x8c, 0x5d, 0x58, 0xf8, 0x10, 0xcc, 0x1d, 0x23, 0x26, 0xa6, 0x80, 0x92, 0x6f, 0x90, 0x4f, 0x80, - 0x7c, 0x77, 0x76, 0x8a, 0x0b, 0x44, 0x65, 0x00, 0x31, 0x25, 0x77, 0xef, 0xfb, 0x3e, 0xf7, 0x7b, - 0x5f, 0x3f, 0xa7, 0x83, 0xb7, 0x02, 0xca, 0x12, 0xca, 0x5a, 0x47, 0x98, 0xf1, 0x98, 0x44, 0xad, - 0xa3, 0x2d, 0x1f, 0x73, 0xb4, 0x95, 0xaf, 0x9d, 0x5e, 0x4a, 0x39, 0xd5, 0xeb, 0x32, 0xcb, 0xc9, - 0x77, 0x55, 0xd6, 0xe6, 0x7a, 0x44, 0x23, 0x2a, 0x52, 0x5a, 0xd9, 0x3f, 0x99, 0xbd, 0x69, 0x2a, - 0x4d, 0x1f, 0x31, 0x5c, 0x08, 0x06, 0x34, 0x26, 0xa5, 0x38, 0xea, 0xf3, 0x4e, 0x11, 0xcf, 0x16, - 0x32, 0x6e, 0x7f, 0xae, 0x42, 0xdd, 0x45, 0x0c, 0x3f, 0x95, 0xa7, 0x3d, 0x08, 0x02, 0xda, 0x27, - 0x5c, 0xdf, 0x83, 0x57, 0x33, 0xc5, 0x36, 0x92, 0x6b, 0x03, 0x34, 0x40, 0x73, 0x69, 0xbb, 0xe1, - 0x28, 0x36, 0x21, 0xa0, 0xd4, 0x9c, 0xac, 0x5c, 0xd5, 0xb9, 0xd5, 0xe1, 0xc8, 0x02, 0xde, 0x92, - 0x3f, 0xdb, 0xd2, 0xdf, 0x02, 0xb8, 0x4a, 0xd3, 0x38, 0x8a, 0x09, 0xea, 0xb6, 0x55, 0x53, 0xc6, - 0x42, 0xa3, 0xd2, 0x5c, 0xda, 0xbe, 0x99, 0xeb, 0x65, 0xf9, 0x85, 0xde, 0x2e, 0x8d, 0x89, 0xbb, - 0x7f, 0x3a, 0xb2, 0xb4, 0xe9, 0xc8, 0xba, 0x31, 0x40, 0x49, 0x77, 0xc7, 0x2e, 0x0b, 0xd8, 0x1f, - 0xbf, 0x5a, 0xcd, 0x28, 0xe6, 0x9d, 0xbe, 0xef, 0x04, 0x34, 0x69, 0xa9, 0x2e, 0xe5, 0xcf, 0x1d, - 0x16, 0x1e, 0xb6, 0xf8, 0xa0, 0x87, 0x99, 0xd0, 0x62, 0xde, 0x4a, 0x5e, 0xae, 0xba, 0xd4, 0x8f, - 0x01, 0x5c, 0x0e, 0x71, 0x17, 0x47, 0x88, 0xe3, 0xb0, 0xfd, 0x3c, 0xc5, 0xd8, 0xa8, 0xcc, 0x23, - 0xda, 0x53, 0x44, 0x1b, 0x92, 0xe8, 0xc7, 0xf2, 0x8b, 0xf1, 0x5c, 0x2b, 0x8a, 0x1f, 0xa5, 0x18, - 0xeb, 0xef, 0x00, 0x5c, 0x9b, 0xc9, 0xe5, 0x23, 0xaa, 0xce, 0x03, 0x3a, 0x50, 0x40, 0x46, 0x19, - 0xe8, 0x8f, 0x66, 0xb4, 0x5a, 0xd4, 0xe7, 0x43, 0x72, 0xe0, 0x22, 0x26, 0x61, 0x9b, 0xc7, 0x09, - 0x36, 0x2e, 0x35, 0x40, 0xb3, 0xe2, 0x5e, 0x9f, 0x8e, 0xac, 0x15, 0x79, 0x5a, 0x1e, 0xb1, 0xbd, - 0xcb, 0x98, 0x84, 0x4f, 0xe2, 0x04, 0xef, 0x2c, 0xbe, 0x3e, 0xb1, 0xb4, 0xf7, 0x27, 0x96, 0x66, - 0x7f, 0x02, 0xd0, 0xd8, 0xa5, 0x84, 0xc7, 0xa4, 0x4f, 0xfb, 0xac, 0x64, 0x2d, 0x1f, 0xae, 0x0b, - 0x6b, 0x29, 0xca, 0x92, 0xc5, 0x6e, 0x3b, 0x3f, 0xb7, 0xbf, 0x73, 0xde, 0xa4, 0xca, 0x6c, 0xba, - 0x7f, 0xde, 0xbe, 0xf7, 0x21, 0x64, 0x1c, 0xa5, 0x5c, 0xc2, 0x2f, 0x08, 0xf8, 0x8d, 0xe9, 0xc8, - 0x5a, 0x93, 0xf0, 0xb3, 0x98, 0xed, 0x5d, 0x11, 0x8b, 0x52, 0x03, 0x2f, 0x01, 0xdc, 0x78, 0x88, - 0xbb, 0x68, 0x50, 0x4c, 0xe3, 0x2f, 0xd2, 0x9f, 0xe1, 0x38, 0x06, 0xb0, 0xf6, 0x18, 0xa7, 0x31, - 0x0d, 0xf5, 0x3a, 0xac, 0x75, 0x31, 0x89, 0x78, 0x47, 0x1c, 0x55, 0xf1, 0xd4, 0x4a, 0x0f, 0x60, - 0x0d, 0x25, 0x02, 0x61, 0xee, 0x9d, 0xba, 0x9b, 0x19, 0xe6, 0x42, 0xa6, 0x50, 0xd2, 0x3b, 0x55, - 0x41, 0xf3, 0x61, 0x01, 0xd6, 0x25, 0x4d, 0x1c, 0xfc, 0x2f, 0x1f, 0x55, 0x8f, 0xe0, 0x4a, 0x0e, - 0xd5, 0x13, 0xec, 0x4c, 0x5d, 0x75, 0xf3, 0x57, 0x50, 0xb2, 0x45, 0xd7, 0x54, 0xd7, 0xab, 0x2e, - 0xe5, 0x4b, 0x22, 0xb6, 0xb7, 0xac, 0x76, 0x64, 0x3a, 0x3b, 0xf3, 0xd5, 0x5e, 0x01, 0x31, 0xa7, - 0x04, 0x11, 0x4c, 0xf8, 0x01, 0x0d, 0x0e, 0x71, 0xf8, 0x4f, 0xec, 0xe3, 0xee, 0x9f, 0x8e, 0x4d, - 0x30, 0x1c, 0x9b, 0xe0, 0xdb, 0xd8, 0x04, 0x6f, 0x26, 0xa6, 0x36, 0x9c, 0x98, 0xda, 0x97, 0x89, - 0xa9, 0x3d, 0xdb, 0xfa, 0xad, 0x05, 0x5e, 0xa8, 0xe7, 0x42, 0xbd, 0x53, 0xc2, 0x11, 0x7e, 0x4d, - 0x3c, 0x18, 0xf7, 0xbe, 0x07, 0x00, 0x00, 0xff, 0xff, 0x80, 0x00, 0xd5, 0x07, 0xc6, 0x06, 0x00, - 0x00, + // 537 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x54, 0x3f, 0x6f, 0xd3, 0x40, + 0x14, 0xf7, 0x35, 0x21, 0x94, 0x2b, 0xb4, 0xe5, 0x54, 0xa2, 0xb4, 0x12, 0x4e, 0x54, 0x31, 0x44, + 0x48, 0x38, 0xa4, 0x6c, 0xdd, 0x70, 0x11, 0x12, 0x02, 0x24, 0x64, 0x21, 0x06, 0x96, 0xe8, 0x6c, + 0x3f, 0x9c, 0x53, 0xe3, 0xbb, 0xc8, 0x77, 0x8e, 0xda, 0x0f, 0x00, 0x42, 0x62, 0x61, 0x64, 0xec, + 0x86, 0xc4, 0x27, 0xe9, 0x98, 0x91, 0xa9, 0xa0, 0x64, 0x63, 0xe6, 0x03, 0x20, 0xdf, 0x9d, 0xdd, + 0x2a, 0x05, 0xa6, 0xf2, 0x67, 0xb2, 0xdf, 0x9f, 0xfb, 0xfd, 0xf1, 0x7b, 0x3e, 0x7c, 0x2b, 0x12, + 0x32, 0x15, 0xb2, 0x37, 0x01, 0xa9, 0x18, 0x4f, 0x7a, 0x93, 0x7e, 0x08, 0x8a, 0xf6, 0xcb, 0xd8, + 0x1b, 0x67, 0x42, 0x09, 0xd2, 0x34, 0x5d, 0x5e, 0x99, 0xb5, 0x5d, 0x5b, 0x1b, 0x89, 0x48, 0x84, + 0x6e, 0xe9, 0x15, 0x6f, 0xa6, 0x7b, 0xcb, 0xb5, 0x98, 0x21, 0x95, 0x50, 0x01, 0x46, 0x82, 0xf1, + 0x85, 0x3a, 0xcd, 0xd5, 0xb0, 0xaa, 0x17, 0x81, 0xa9, 0x6f, 0x7f, 0xab, 0x61, 0xe2, 0x53, 0x09, + 0x2f, 0x0c, 0xdb, 0xfd, 0x28, 0x12, 0x39, 0x57, 0xe4, 0x11, 0xbe, 0x5a, 0x20, 0x0e, 0xa8, 0x89, + 0x5b, 0xa8, 0x83, 0xba, 0x2b, 0x3b, 0x1d, 0xcf, 0x6a, 0xd3, 0x00, 0x16, 0xcd, 0x2b, 0x8e, 0xdb, + 0x73, 0x7e, 0x7d, 0x7a, 0xd2, 0x46, 0xc1, 0x4a, 0x78, 0x9a, 0x22, 0x13, 0xbc, 0x2e, 0x32, 0x96, + 0x30, 0x4e, 0x47, 0x03, 0xeb, 0xa9, 0xb5, 0xd4, 0xa9, 0x75, 0x57, 0x76, 0x36, 0x4b, 0xb8, 0xa2, + 0xbd, 0x82, 0xdb, 0x13, 0x8c, 0xfb, 0x77, 0x8f, 0x4f, 0xda, 0xce, 0xa7, 0x2f, 0xed, 0x6e, 0xc2, + 0xd4, 0x30, 0x0f, 0xbd, 0x48, 0xa4, 0x3d, 0xeb, 0xc4, 0x3c, 0xee, 0xc8, 0x78, 0xbf, 0xa7, 0x0e, + 0xc7, 0x20, 0xf5, 0x01, 0x19, 0xac, 0x95, 0x24, 0xd6, 0x09, 0xc9, 0xf0, 0x6a, 0x0c, 0x23, 0x48, + 0xa8, 0x82, 0x78, 0xf0, 0x2a, 0x03, 0x68, 0xd5, 0x2e, 0x9e, 0xf5, 0x5a, 0x45, 0xf1, 0x30, 0x03, + 0x20, 0x07, 0xf8, 0xfa, 0x29, 0x67, 0x69, 0xb6, 0x7e, 0xf1, 0xb4, 0xeb, 0x15, 0x4b, 0xe9, 0x76, + 0x13, 0x2f, 0x03, 0x8f, 0x07, 0x8a, 0xa5, 0xd0, 0xba, 0xd4, 0x41, 0xdd, 0x5a, 0x70, 0x19, 0x78, + 0xfc, 0x9c, 0xa5, 0xb0, 0xbb, 0xfc, 0xf6, 0xa8, 0xed, 0x7c, 0x38, 0x6a, 0x3b, 0xdb, 0x1f, 0x11, + 0x6e, 0xed, 0x09, 0xae, 0x18, 0xcf, 0x45, 0x2e, 0x17, 0x46, 0x1e, 0xe2, 0x0d, 0x3d, 0x72, 0x2b, + 0x7b, 0x61, 0xf4, 0xb7, 0xbd, 0x9f, 0xaf, 0xa5, 0x77, 0x7e, 0x79, 0xec, 0x12, 0x90, 0xf0, 0xfc, + 0x5a, 0xdd, 0xc4, 0x58, 0x2a, 0x9a, 0x29, 0xa3, 0x73, 0x49, 0xeb, 0xbc, 0xa2, 0x33, 0x0b, 0x4a, + 0x5f, 0x23, 0x7c, 0xe3, 0x01, 0x8c, 0xe8, 0x61, 0xe5, 0xf0, 0x2f, 0xca, 0x3c, 0xa3, 0xe3, 0x1d, + 0xc2, 0x8d, 0x67, 0x90, 0x31, 0x11, 0x93, 0x26, 0x6e, 0x8c, 0x80, 0x27, 0x6a, 0xa8, 0xa9, 0x6a, + 0x81, 0x8d, 0x48, 0x84, 0x1b, 0x34, 0xd5, 0x12, 0xfe, 0xc0, 0x56, 0x5b, 0xe8, 0xdd, 0xba, 0x56, + 0xf3, 0x1d, 0xe1, 0xa6, 0x51, 0xc3, 0xa2, 0xff, 0x6e, 0x7a, 0xe4, 0x29, 0x5e, 0x2b, 0xd9, 0xc7, + 0x5a, 0xa4, 0xb4, 0x7f, 0x9c, 0xfb, 0x2b, 0x76, 0xe3, 0xc5, 0xaf, 0x17, 0x9f, 0x25, 0x58, 0xb5, + 0x55, 0x93, 0x94, 0x67, 0x86, 0xf0, 0xc6, 0xd8, 0x4e, 0x29, 0x07, 0xae, 0x9e, 0x88, 0x68, 0x1f, + 0xe2, 0x7f, 0xb2, 0x0d, 0xfe, 0xe3, 0xe3, 0x99, 0x8b, 0xa6, 0x33, 0x17, 0x7d, 0x9d, 0xb9, 0xe8, + 0xfd, 0xdc, 0x75, 0xa6, 0x73, 0xd7, 0xf9, 0x3c, 0x77, 0x9d, 0x97, 0xfd, 0xdf, 0x4e, 0xf4, 0xc0, + 0x5e, 0xbf, 0xf6, 0xde, 0xd7, 0x03, 0x0e, 0x1b, 0xfa, 0x02, 0xbe, 0xf7, 0x23, 0x00, 0x00, 0xff, + 0xff, 0xd0, 0x5c, 0x2d, 0x10, 0x16, 0x06, 0x00, 0x00, } func (m *BaseVestingAccount) Marshal() (dAtA []byte, err error) { diff --git a/x/auth/vesting/types/vesting_account.go b/x/auth/vesting/types/vesting_account.go index b4e35835c..62ff4234f 100644 --- a/x/auth/vesting/types/vesting_account.go +++ b/x/auth/vesting/types/vesting_account.go @@ -4,7 +4,7 @@ import ( "errors" "time" - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" @@ -162,18 +162,18 @@ func (bva BaseVestingAccount) Validate() error { } type vestingAccountYAML struct { - Address sdk.AccAddress `json:"address" yaml:"address"` - PubKey string `json:"public_key" yaml:"public_key"` - AccountNumber uint64 `json:"account_number" yaml:"account_number"` - Sequence uint64 `json:"sequence" yaml:"sequence"` - OriginalVesting sdk.Coins `json:"original_vesting" yaml:"original_vesting"` - DelegatedFree sdk.Coins `json:"delegated_free" yaml:"delegated_free"` - DelegatedVesting sdk.Coins `json:"delegated_vesting" yaml:"delegated_vesting"` - EndTime int64 `json:"end_time" yaml:"end_time"` + Address sdk.AccAddress `json:"address"` + PubKey string `json:"public_key"` + AccountNumber uint64 `json:"account_number"` + Sequence uint64 `json:"sequence"` + OriginalVesting sdk.Coins `json:"original_vesting"` + DelegatedFree sdk.Coins `json:"delegated_free"` + DelegatedVesting sdk.Coins `json:"delegated_vesting"` + EndTime int64 `json:"end_time"` // custom fields based on concrete vesting type which can be omitted - StartTime int64 `json:"start_time,omitempty" yaml:"start_time,omitempty"` - VestingPeriods Periods `json:"vesting_periods,omitempty" yaml:"vesting_periods,omitempty"` + StartTime int64 `json:"start_time,omitempty"` + VestingPeriods Periods `json:"vesting_periods,omitempty"` } func (bva BaseVestingAccount) String() string { diff --git a/x/bank/types/bank.pb.go b/x/bank/types/bank.pb.go index 2edce91c0..c720f94a3 100644 --- a/x/bank/types/bank.pb.go +++ b/x/bank/types/bank.pb.go @@ -28,8 +28,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // Params defines the parameters for the bank module. type Params struct { - SendEnabled []*SendEnabled `protobuf:"bytes,1,rep,name=send_enabled,json=sendEnabled,proto3" json:"send_enabled,omitempty" yaml:"send_enabled,omitempty"` - DefaultSendEnabled bool `protobuf:"varint,2,opt,name=default_send_enabled,json=defaultSendEnabled,proto3" json:"default_send_enabled,omitempty" yaml:"default_send_enabled,omitempty"` + SendEnabled []*SendEnabled `protobuf:"bytes,1,rep,name=send_enabled,json=sendEnabled,proto3" json:"send_enabled,omitempty"` + DefaultSendEnabled bool `protobuf:"varint,2,opt,name=default_send_enabled,json=defaultSendEnabled,proto3" json:"default_send_enabled,omitempty"` } func (m *Params) Reset() { *m = Params{} } @@ -445,49 +445,47 @@ func init() { func init() { proto.RegisterFile("cosmos/bank/v1beta1/bank.proto", fileDescriptor_dd052eee12edf988) } var fileDescriptor_dd052eee12edf988 = []byte{ - // 663 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x54, 0xc1, 0x6b, 0x13, 0x4f, - 0x14, 0xce, 0x34, 0x4d, 0xb2, 0x9d, 0xfc, 0x7e, 0x97, 0x31, 0xc8, 0xb6, 0xe0, 0x6e, 0x5c, 0x50, - 0x52, 0xb1, 0x49, 0x5b, 0x3d, 0x05, 0x41, 0x4c, 0x15, 0x8d, 0x20, 0xca, 0x96, 0x22, 0xe8, 0x21, - 0x4c, 0xb2, 0xd3, 0x64, 0xe8, 0xee, 0xcc, 0xb2, 0x33, 0x5b, 0x9a, 0xff, 0x40, 0x3c, 0x79, 0xf4, - 0xd8, 0xa3, 0x7a, 0x2e, 0xf8, 0x2f, 0x14, 0x4f, 0x45, 0x2f, 0x9e, 0xa2, 0xa4, 0x17, 0xcf, 0xfd, - 0x0b, 0x64, 0x66, 0x36, 0x69, 0x0a, 0x51, 0x3c, 0x78, 0xf1, 0x94, 0xf7, 0xde, 0xf7, 0xbd, 0xef, - 0x7d, 0xbc, 0x79, 0x1b, 0xe8, 0xf4, 0xb8, 0x88, 0xb8, 0x68, 0x74, 0x31, 0xdb, 0x6b, 0xec, 0x6f, - 0x74, 0x89, 0xc4, 0x1b, 0x3a, 0xa9, 0xc7, 0x09, 0x97, 0x1c, 0x5d, 0x32, 0x78, 0x5d, 0x97, 0x32, - 0x7c, 0xa5, 0xd2, 0xe7, 0x7d, 0xae, 0xf1, 0x86, 0x8a, 0x0c, 0x75, 0x65, 0xd9, 0x50, 0x3b, 0x06, - 0xc8, 0xfa, 0x0c, 0x74, 0x3e, 0x45, 0x90, 0xe9, 0x94, 0x1e, 0xa7, 0xcc, 0xe0, 0xde, 0x17, 0x00, - 0x8b, 0xcf, 0x70, 0x82, 0x23, 0x81, 0x76, 0xe1, 0x7f, 0x82, 0xb0, 0xa0, 0x43, 0x18, 0xee, 0x86, - 0x24, 0xb0, 0x41, 0x35, 0x5f, 0x2b, 0x6f, 0x56, 0xeb, 0x73, 0x7c, 0xd4, 0xb7, 0x09, 0x0b, 0x1e, - 0x18, 0x5e, 0xeb, 0xea, 0xd9, 0xc8, 0xbd, 0x32, 0xc4, 0x51, 0xd8, 0xf4, 0x66, 0xfb, 0x6f, 0xf2, - 0x88, 0x4a, 0x12, 0xc5, 0x72, 0xe8, 0xf9, 0x65, 0x71, 0xce, 0x47, 0x2f, 0x61, 0x25, 0x20, 0xbb, - 0x38, 0x0d, 0x65, 0xe7, 0xc2, 0xbc, 0x85, 0x2a, 0xa8, 0x59, 0xad, 0xd5, 0xb3, 0x91, 0x7b, 0xcd, - 0xa8, 0xcd, 0x63, 0xcd, 0xaa, 0xa2, 0x8c, 0x30, 0x63, 0xa6, 0xb9, 0xf8, 0xf6, 0xd0, 0xcd, 0x79, - 0x0f, 0x61, 0x79, 0xa6, 0x88, 0x2a, 0xb0, 0x10, 0x10, 0xc6, 0x23, 0x1b, 0x54, 0x41, 0x6d, 0xc9, - 0x37, 0x09, 0xb2, 0x61, 0xe9, 0xc2, 0x68, 0x7f, 0x92, 0x36, 0x2d, 0x25, 0xf2, 0xe3, 0xd0, 0x05, - 0xde, 0x3b, 0x00, 0x0b, 0x6d, 0x16, 0xa7, 0x12, 0x6d, 0xc2, 0x12, 0x0e, 0x82, 0x84, 0x08, 0x61, - 0x54, 0x5a, 0xf6, 0xe7, 0xa3, 0xb5, 0x4a, 0xb6, 0x9b, 0x7b, 0x06, 0xd9, 0x96, 0x09, 0x65, 0x7d, - 0x7f, 0x42, 0x44, 0x18, 0x16, 0xd4, 0xaa, 0x85, 0xbd, 0xa0, 0x57, 0xb9, 0x7c, 0xbe, 0x4a, 0x41, - 0xa6, 0xab, 0xdc, 0xe2, 0x94, 0xb5, 0xd6, 0x8f, 0x47, 0x6e, 0xee, 0xc3, 0x37, 0xb7, 0xd6, 0xa7, - 0x72, 0x90, 0x76, 0xeb, 0x3d, 0x1e, 0x65, 0xef, 0x98, 0xfd, 0xac, 0x89, 0x60, 0xaf, 0x21, 0x87, - 0x31, 0x11, 0xba, 0x41, 0xf8, 0x46, 0xb9, 0x69, 0xbd, 0x32, 0x56, 0x73, 0xde, 0x7b, 0x00, 0x8b, - 0x4f, 0x53, 0xf9, 0x4f, 0x78, 0xfd, 0x08, 0x60, 0x71, 0x3b, 0x8d, 0xe3, 0x70, 0xa8, 0xe6, 0x4a, - 0x2e, 0x71, 0x98, 0x9d, 0xdb, 0xdf, 0x9d, 0xab, 0x95, 0x9b, 0x8f, 0xb3, 0xb9, 0xe0, 0xd3, 0xd1, - 0xda, 0x9d, 0x1b, 0xbf, 0xed, 0x3e, 0x30, 0x9f, 0x63, 0x44, 0xfb, 0x09, 0x96, 0x94, 0x33, 0xd1, - 0xd8, 0x5f, 0xbf, 0xbd, 0x5e, 0x37, 0x5e, 0xdb, 0x36, 0xf0, 0x9e, 0xc3, 0xa5, 0xfb, 0xea, 0x7a, - 0x76, 0x18, 0x95, 0xbf, 0xb8, 0xab, 0x15, 0x68, 0x91, 0x83, 0x98, 0x33, 0xc2, 0xa4, 0x3e, 0xac, - 0xff, 0xfd, 0x69, 0xae, 0x6e, 0x0e, 0x87, 0x14, 0x0b, 0x22, 0xec, 0x7c, 0x35, 0x5f, 0x5b, 0xf2, - 0x27, 0xa9, 0xf7, 0x7a, 0x01, 0x5a, 0x4f, 0x88, 0xc4, 0x01, 0x96, 0x18, 0x55, 0x61, 0x39, 0x20, - 0xa2, 0x97, 0xd0, 0x58, 0x99, 0xc8, 0xe4, 0x67, 0x4b, 0xe8, 0xae, 0x62, 0x30, 0x1e, 0x75, 0x52, - 0x46, 0xe5, 0xe4, 0xd1, 0x9c, 0xb9, 0xdf, 0xea, 0xd4, 0xaf, 0x0f, 0x83, 0x49, 0x28, 0x10, 0x82, - 0x8b, 0x6a, 0xc5, 0x76, 0x5e, 0x6b, 0xeb, 0x58, 0xb9, 0x0b, 0xa8, 0x88, 0x43, 0x3c, 0xb4, 0x17, - 0x75, 0x79, 0x92, 0x2a, 0x36, 0xc3, 0x11, 0xb1, 0x0b, 0x86, 0xad, 0x62, 0x74, 0x19, 0x16, 0xc5, - 0x30, 0xea, 0xf2, 0xd0, 0x2e, 0xea, 0x6a, 0x96, 0xa1, 0x65, 0x98, 0x4f, 0x13, 0x6a, 0x97, 0xf4, - 0xe5, 0x95, 0xc6, 0x23, 0x37, 0xbf, 0xe3, 0xb7, 0x7d, 0x55, 0x43, 0xd7, 0xa1, 0x95, 0x26, 0xb4, - 0x33, 0xc0, 0x62, 0x60, 0x5b, 0x1a, 0x2f, 0x8f, 0x47, 0x6e, 0x69, 0xc7, 0x6f, 0x3f, 0xc2, 0x62, - 0xe0, 0x97, 0xd2, 0x84, 0xaa, 0xa0, 0xb5, 0x75, 0x3c, 0x76, 0xc0, 0xc9, 0xd8, 0x01, 0xdf, 0xc7, - 0x0e, 0x78, 0x73, 0xea, 0xe4, 0x4e, 0x4e, 0x9d, 0xdc, 0xd7, 0x53, 0x27, 0xf7, 0x62, 0xf5, 0x4f, - 0x9e, 0x4f, 0xdf, 0x40, 0xb7, 0xa8, 0xff, 0xe1, 0x6e, 0xfd, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x23, - 0xd8, 0xd4, 0xa8, 0x69, 0x05, 0x00, 0x00, + // 626 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x54, 0x41, 0x6b, 0x13, 0x41, + 0x14, 0xce, 0x34, 0x4d, 0xb2, 0x9d, 0xe8, 0x65, 0x0c, 0x32, 0xed, 0x61, 0x13, 0x72, 0x90, 0x28, + 0x34, 0x49, 0xab, 0xa7, 0x20, 0x88, 0xad, 0xa2, 0x11, 0x44, 0xd9, 0x52, 0x04, 0x2f, 0x61, 0x92, + 0x19, 0x93, 0xa1, 0xbb, 0x33, 0xcb, 0xce, 0x6c, 0x69, 0x7e, 0x80, 0x20, 0x9e, 0x3c, 0x7a, 0xec, + 0x51, 0x3d, 0x17, 0xfc, 0x0b, 0xc5, 0x53, 0xf1, 0xe4, 0xa9, 0x4a, 0x7a, 0xf1, 0x67, 0xc8, 0xcc, + 0xec, 0xa6, 0x29, 0x54, 0xf1, 0xe0, 0xc5, 0xd3, 0xbe, 0xef, 0x7d, 0xef, 0x7d, 0xef, 0xbd, 0x99, + 0x37, 0x0b, 0xfd, 0x91, 0x54, 0x91, 0x54, 0x9d, 0x21, 0x11, 0x7b, 0x9d, 0xfd, 0x8d, 0x21, 0xd3, + 0x64, 0xc3, 0x82, 0x76, 0x9c, 0x48, 0x2d, 0xd1, 0x35, 0xc7, 0xb7, 0xad, 0x2b, 0xe3, 0xd7, 0x6a, + 0x63, 0x39, 0x96, 0x96, 0xef, 0x18, 0xcb, 0x85, 0xae, 0xad, 0xba, 0xd0, 0x81, 0x23, 0xb2, 0x3c, + 0x47, 0x9d, 0x57, 0x51, 0x6c, 0x5e, 0x65, 0x24, 0xb9, 0x70, 0x7c, 0xf3, 0x35, 0x80, 0xe5, 0xe7, + 0x24, 0x21, 0x91, 0x42, 0xdb, 0xf0, 0x8a, 0x62, 0x82, 0x0e, 0x98, 0x20, 0xc3, 0x90, 0x51, 0x0c, + 0x1a, 0xc5, 0x56, 0x75, 0xb3, 0xd1, 0xbe, 0xa4, 0x8f, 0xf6, 0x0e, 0x13, 0xf4, 0xa1, 0x8b, 0x0b, + 0xaa, 0xea, 0x1c, 0xa0, 0x2e, 0xac, 0x51, 0xf6, 0x8a, 0xa4, 0xa1, 0x1e, 0x5c, 0x10, 0x5b, 0x6a, + 0x80, 0x96, 0x17, 0xa0, 0x8c, 0x5b, 0x48, 0xef, 0x2d, 0xbf, 0x3f, 0xac, 0x17, 0x9a, 0x8f, 0x60, + 0x75, 0xc1, 0x89, 0x6a, 0xb0, 0x44, 0x99, 0x90, 0x11, 0x06, 0x0d, 0xd0, 0x5a, 0x09, 0x1c, 0x40, + 0x18, 0x56, 0x2e, 0xea, 0xe5, 0xb0, 0xe7, 0x19, 0x91, 0x9f, 0x87, 0x75, 0xd0, 0xfc, 0x00, 0x60, + 0xa9, 0x2f, 0xe2, 0x54, 0xa3, 0x4d, 0x58, 0x21, 0x94, 0x26, 0x4c, 0x29, 0xa7, 0xb2, 0x85, 0xbf, + 0x1e, 0xad, 0xd7, 0xb2, 0x69, 0xee, 0x3b, 0x66, 0x47, 0x27, 0x5c, 0x8c, 0x83, 0x3c, 0x10, 0x11, + 0x58, 0x32, 0x87, 0xa3, 0xf0, 0x92, 0x1d, 0x7e, 0xf5, 0x7c, 0x78, 0xc5, 0xe6, 0xc3, 0x6f, 0x4b, + 0x2e, 0xb6, 0xba, 0xc7, 0xa7, 0xf5, 0xc2, 0xa7, 0xef, 0xf5, 0xd6, 0x98, 0xeb, 0x49, 0x3a, 0x6c, + 0x8f, 0x64, 0x94, 0x9d, 0x7c, 0xf6, 0x59, 0x57, 0x74, 0xaf, 0xa3, 0xa7, 0x31, 0x53, 0x36, 0x41, + 0x05, 0x4e, 0xb9, 0xe7, 0xbd, 0x71, 0xad, 0x16, 0x9a, 0x1f, 0x01, 0x2c, 0x3f, 0x4b, 0xf5, 0x7f, + 0xd1, 0xeb, 0x67, 0x00, 0xcb, 0x3b, 0x69, 0x1c, 0x87, 0x53, 0x53, 0x57, 0x4b, 0x4d, 0xc2, 0x6c, + 0x41, 0xfe, 0x6d, 0x5d, 0xab, 0xdc, 0x7b, 0x92, 0xd5, 0x05, 0x5f, 0x8e, 0xd6, 0xef, 0xde, 0xfa, + 0x63, 0xf6, 0x81, 0x7b, 0x40, 0x11, 0x1f, 0x27, 0x44, 0x73, 0x29, 0x54, 0x67, 0xbf, 0x7b, 0xa7, + 0xdb, 0x76, 0xbd, 0xf6, 0x31, 0x68, 0xbe, 0x80, 0x2b, 0x0f, 0xcc, 0xf6, 0xec, 0x0a, 0xae, 0x7f, + 0xb3, 0x57, 0x6b, 0xd0, 0x63, 0x07, 0xb1, 0x14, 0x4c, 0x68, 0xbb, 0x58, 0x57, 0x83, 0x39, 0x36, + 0x3b, 0x47, 0x42, 0x4e, 0x14, 0x53, 0xb8, 0xd8, 0x28, 0xb6, 0x56, 0x82, 0x1c, 0x36, 0xdf, 0x2e, + 0x41, 0xef, 0x29, 0xd3, 0x84, 0x12, 0x4d, 0x50, 0x03, 0x56, 0x29, 0x53, 0xa3, 0x84, 0xc7, 0xa6, + 0x89, 0x4c, 0x7e, 0xd1, 0x85, 0xee, 0x99, 0x08, 0x21, 0xa3, 0x41, 0x2a, 0xb8, 0xce, 0x2f, 0xcd, + 0xbf, 0xf4, 0x75, 0xcd, 0xfb, 0x0d, 0x20, 0xcd, 0x4d, 0x85, 0x10, 0x5c, 0x36, 0x47, 0x8c, 0x8b, + 0x56, 0xdb, 0xda, 0xa6, 0x3b, 0xca, 0x55, 0x1c, 0x92, 0x29, 0x5e, 0xb6, 0xee, 0x1c, 0x9a, 0x68, + 0x41, 0x22, 0x86, 0x4b, 0x2e, 0xda, 0xd8, 0xe8, 0x3a, 0x2c, 0xab, 0x69, 0x34, 0x94, 0x21, 0x2e, + 0x5b, 0x6f, 0x86, 0xd0, 0x2a, 0x2c, 0xa6, 0x09, 0xc7, 0x15, 0xbb, 0x79, 0x95, 0xd9, 0x69, 0xbd, + 0xb8, 0x1b, 0xf4, 0x03, 0xe3, 0x43, 0x37, 0xa0, 0x97, 0x26, 0x7c, 0x30, 0x21, 0x6a, 0x82, 0x3d, + 0xcb, 0x57, 0x67, 0xa7, 0xf5, 0xca, 0x6e, 0xd0, 0x7f, 0x4c, 0xd4, 0x24, 0xa8, 0xa4, 0x09, 0x37, + 0xc6, 0xd6, 0xf6, 0xf1, 0xcc, 0x07, 0x27, 0x33, 0x1f, 0xfc, 0x98, 0xf9, 0xe0, 0xdd, 0x99, 0x5f, + 0x38, 0x39, 0xf3, 0x0b, 0xdf, 0xce, 0xfc, 0xc2, 0xcb, 0x9b, 0x7f, 0x73, 0x7d, 0x76, 0x07, 0x86, + 0x65, 0xfb, 0x4f, 0xba, 0xfd, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x5e, 0x80, 0x89, 0x32, 0x1b, 0x05, + 0x00, 0x00, } func (this *SendEnabled) Equal(that interface{}) bool { diff --git a/x/bank/types/genesis.pb.go b/x/bank/types/genesis.pb.go index 99de438ed..1e8ecae3d 100644 --- a/x/bank/types/genesis.pb.go +++ b/x/bank/types/genesis.pb.go @@ -36,7 +36,7 @@ type GenesisState struct { // balances. Otherwise, it will be used to validate that the sum of the balances equals this amount. Supply github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=supply,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"supply"` // denom_metadata defines the metadata of the differents coins. - DenomMetadata []Metadata `protobuf:"bytes,4,rep,name=denom_metadata,json=denomMetadata,proto3" json:"denom_metadata" yaml:"denom_metadata"` + DenomMetadata []Metadata `protobuf:"bytes,4,rep,name=denom_metadata,json=denomMetadata,proto3" json:"denom_metadata"` } func (m *GenesisState) Reset() { *m = GenesisState{} } @@ -150,33 +150,32 @@ func init() { func init() { proto.RegisterFile("cosmos/bank/v1beta1/genesis.proto", fileDescriptor_8f007de11b420c6e) } var fileDescriptor_8f007de11b420c6e = []byte{ - // 412 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x92, 0xb1, 0x6e, 0xda, 0x40, - 0x1c, 0xc6, 0x6d, 0xa0, 0x40, 0x8f, 0xb6, 0x83, 0x4b, 0x25, 0x43, 0x8b, 0x4d, 0x3d, 0xd1, 0x01, - 0xbb, 0xd0, 0xa9, 0x0c, 0x95, 0x6a, 0x86, 0x4e, 0x95, 0x2a, 0xb3, 0x75, 0x41, 0x67, 0xfb, 0xe4, - 0x58, 0x60, 0x9f, 0xe5, 0x3b, 0xa2, 0xf0, 0x06, 0x19, 0xf3, 0x08, 0xcc, 0xcc, 0x79, 0x08, 0x46, - 0x94, 0x2c, 0x99, 0x48, 0x04, 0x4b, 0xe6, 0x3c, 0x41, 0xe4, 0xbb, 0xc3, 0x49, 0x14, 0x94, 0x29, - 0x13, 0xd8, 0xdf, 0xf7, 0xfd, 0xbe, 0xff, 0xfd, 0x7d, 0xe0, 0xab, 0x87, 0x49, 0x84, 0x89, 0xe5, - 0xc2, 0x78, 0x62, 0x1d, 0xf7, 0x5c, 0x44, 0x61, 0xcf, 0x0a, 0x50, 0x8c, 0x48, 0x48, 0xcc, 0x24, - 0xc5, 0x14, 0x2b, 0x1f, 0xb9, 0xc5, 0xcc, 0x2c, 0xa6, 0xb0, 0x34, 0xeb, 0x01, 0x0e, 0x30, 0xd3, - 0xad, 0xec, 0x1f, 0xb7, 0x36, 0xb5, 0x9c, 0x46, 0x50, 0x4e, 0xf3, 0x70, 0x18, 0x3f, 0xd3, 0x1f, - 0xb5, 0x31, 0x2e, 0xd7, 0x1b, 0x5c, 0x1f, 0x73, 0xb0, 0xe8, 0x65, 0x0f, 0xc6, 0x65, 0x01, 0xbc, - 0xfb, 0xc3, 0xe7, 0x1a, 0x51, 0x48, 0x91, 0xf2, 0x13, 0x94, 0x13, 0x98, 0xc2, 0x88, 0xa8, 0x72, - 0x5b, 0xee, 0xd4, 0xfa, 0x9f, 0xcd, 0x03, 0x73, 0x9a, 0xff, 0x98, 0xc5, 0x2e, 0xad, 0x36, 0xba, - 0xe4, 0x88, 0x80, 0xf2, 0x0b, 0x54, 0x5d, 0x38, 0x85, 0xb1, 0x87, 0x88, 0x5a, 0x68, 0x17, 0x3b, - 0xb5, 0xfe, 0x97, 0x83, 0x61, 0x9b, 0x9b, 0x44, 0x3a, 0xcf, 0x28, 0x1e, 0x28, 0x93, 0x59, 0x92, - 0x4c, 0xe7, 0x6a, 0x91, 0xa5, 0x1b, 0x0f, 0x69, 0x82, 0xf2, 0xf4, 0x10, 0x87, 0xb1, 0xfd, 0x3d, - 0x8b, 0x2e, 0xaf, 0xf5, 0x4e, 0x10, 0xd2, 0xa3, 0x99, 0x6b, 0x7a, 0x38, 0x12, 0xe7, 0x12, 0x3f, - 0x5d, 0xe2, 0x4f, 0x2c, 0x3a, 0x4f, 0x10, 0x61, 0x01, 0xe2, 0x08, 0xb4, 0xe2, 0x81, 0x0f, 0x3e, - 0x8a, 0x71, 0x34, 0x8e, 0x10, 0x85, 0x3e, 0xa4, 0x50, 0x2d, 0xb1, 0xb2, 0xd6, 0xc1, 0x51, 0xff, - 0x0a, 0x93, 0xdd, 0xca, 0x0a, 0xef, 0x36, 0xfa, 0xa7, 0x39, 0x8c, 0xa6, 0x03, 0xe3, 0x29, 0xc2, - 0x70, 0xde, 0xb3, 0x17, 0x7b, 0xb7, 0xb1, 0x94, 0x41, 0x45, 0x9c, 0x52, 0xe9, 0x83, 0x0a, 0xf4, - 0xfd, 0x14, 0x11, 0xbe, 0xd1, 0xb7, 0xb6, 0x7a, 0x71, 0xde, 0xad, 0x8b, 0xb2, 0xdf, 0x5c, 0x19, - 0xd1, 0x34, 0x8c, 0x03, 0x67, 0x6f, 0x54, 0x20, 0x78, 0x93, 0x7d, 0xde, 0xfd, 0x1a, 0x5f, 0x75, - 0x11, 0x9c, 0x3c, 0xa8, 0x9e, 0x2e, 0x74, 0xe9, 0x76, 0xa1, 0x4b, 0xf6, 0x70, 0xb5, 0xd5, 0xe4, - 0xf5, 0x56, 0x93, 0x6f, 0xb6, 0x9a, 0x7c, 0xb6, 0xd3, 0xa4, 0xf5, 0x4e, 0x93, 0xae, 0x76, 0x9a, - 0xf4, 0xff, 0xdb, 0x8b, 0xd0, 0x13, 0x7e, 0xdf, 0x18, 0xdb, 0x2d, 0xb3, 0xeb, 0xf4, 0xe3, 0x3e, - 0x00, 0x00, 0xff, 0xff, 0x6c, 0x8e, 0xec, 0xbb, 0xf9, 0x02, 0x00, 0x00, + // 395 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x92, 0x3f, 0x4f, 0xfa, 0x40, + 0x18, 0xc7, 0x5b, 0xe0, 0x07, 0xfc, 0x0e, 0x75, 0xa8, 0x0c, 0x05, 0xb5, 0x45, 0x26, 0x1c, 0x68, + 0x05, 0x27, 0x1d, 0x4c, 0x2c, 0x83, 0x89, 0x89, 0x89, 0x81, 0xcd, 0x85, 0x5c, 0xdb, 0x4b, 0x6d, + 0xa0, 0xbd, 0xa6, 0x77, 0x18, 0x79, 0x07, 0x8e, 0xbe, 0x04, 0x66, 0x66, 0x27, 0x5f, 0x01, 0x23, + 0x71, 0x72, 0x52, 0x03, 0x8b, 0x2f, 0xc3, 0xf4, 0xee, 0xa8, 0x26, 0x12, 0x27, 0xa7, 0xfe, 0xf9, + 0x7e, 0x3f, 0xdf, 0xe7, 0x79, 0xee, 0x1e, 0xb0, 0xef, 0x60, 0x12, 0x60, 0x62, 0xda, 0x30, 0x1c, + 0x98, 0xb7, 0x2d, 0x1b, 0x51, 0xd8, 0x32, 0x3d, 0x14, 0x22, 0xe2, 0x13, 0x23, 0x8a, 0x31, 0xc5, + 0xca, 0x36, 0xb7, 0x18, 0x89, 0xc5, 0x10, 0x96, 0x6a, 0xd9, 0xc3, 0x1e, 0x66, 0xba, 0x99, 0xbc, + 0x71, 0x6b, 0x55, 0x4b, 0xd3, 0x08, 0x4a, 0xd3, 0x1c, 0xec, 0x87, 0x3f, 0xf4, 0x6f, 0xd5, 0x58, + 0x2e, 0xd7, 0x2b, 0x5c, 0xef, 0xf3, 0x60, 0x51, 0x97, 0x7d, 0xd4, 0x9f, 0x32, 0x60, 0xe3, 0x9c, + 0xf7, 0xd5, 0xa3, 0x90, 0x22, 0xe5, 0x18, 0xe4, 0x23, 0x18, 0xc3, 0x80, 0xa8, 0x72, 0x4d, 0x6e, + 0x94, 0xda, 0x3b, 0xc6, 0x9a, 0x3e, 0x8d, 0x2b, 0x66, 0xb1, 0x72, 0xb3, 0x57, 0x5d, 0xea, 0x0a, + 0x40, 0x39, 0x05, 0x45, 0x1b, 0x0e, 0x61, 0xe8, 0x20, 0xa2, 0x66, 0x6a, 0xd9, 0x46, 0xa9, 0xbd, + 0xbb, 0x16, 0xb6, 0xb8, 0x49, 0xd0, 0x29, 0xa3, 0x38, 0x20, 0x4f, 0x46, 0x51, 0x34, 0x1c, 0xab, + 0x59, 0x46, 0x57, 0xbe, 0x68, 0x82, 0x52, 0xba, 0x83, 0xfd, 0xd0, 0x3a, 0x4c, 0xd0, 0xe9, 0x9b, + 0xde, 0xf0, 0x7c, 0x7a, 0x33, 0xb2, 0x0d, 0x07, 0x07, 0x62, 0x2e, 0xf1, 0x68, 0x12, 0x77, 0x60, + 0xd2, 0x71, 0x84, 0x08, 0x03, 0x48, 0x57, 0x44, 0x2b, 0x17, 0x60, 0xcb, 0x45, 0x21, 0x0e, 0xfa, + 0x01, 0xa2, 0xd0, 0x85, 0x14, 0xaa, 0x39, 0x56, 0x6c, 0x6f, 0x6d, 0xab, 0x97, 0xc2, 0x24, 0x7a, + 0xdd, 0x64, 0xe8, 0xea, 0x67, 0x7d, 0x2a, 0x83, 0x82, 0x18, 0x46, 0x69, 0x83, 0x02, 0x74, 0xdd, + 0x18, 0x11, 0x7e, 0x70, 0xff, 0x2d, 0xf5, 0xf9, 0xb1, 0x59, 0x16, 0x99, 0x67, 0x5c, 0xe9, 0xd1, + 0xd8, 0x0f, 0xbd, 0xee, 0xca, 0xa8, 0x40, 0xf0, 0x2f, 0xb9, 0xc5, 0xd5, 0x69, 0xfd, 0xe9, 0xbc, + 0x3c, 0xf9, 0xa4, 0x78, 0x3f, 0xd1, 0xa5, 0x8f, 0x89, 0x2e, 0x59, 0x9d, 0xd9, 0x42, 0x93, 0xe7, + 0x0b, 0x4d, 0x7e, 0x5f, 0x68, 0xf2, 0xc3, 0x52, 0x93, 0xe6, 0x4b, 0x4d, 0x7a, 0x59, 0x6a, 0xd2, + 0xf5, 0xc1, 0xaf, 0xa1, 0x77, 0x7c, 0xad, 0x58, 0xb6, 0x9d, 0x67, 0x5b, 0x73, 0xf4, 0x19, 0x00, + 0x00, 0xff, 0xff, 0x78, 0xd8, 0xf3, 0x7f, 0xe0, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/bank/types/params.go b/x/bank/types/params.go index ed94ead34..414e8ddf5 100644 --- a/x/bank/types/params.go +++ b/x/bank/types/params.go @@ -3,8 +3,9 @@ package types import ( "fmt" - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" + "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" ) @@ -121,7 +122,16 @@ func NewSendEnabled(denom string, sendEnabled bool) *SendEnabled { // String implements stringer insterface func (se SendEnabled) String() string { - out, _ := yaml.Marshal(se) + bz, err := codec.ProtoMarshalJSON(&se, nil) + if err != nil { + panic(err) + } + + out, err := yaml.JSONToYAML(bz) + if err != nil { + panic(err) + } + return string(out) } diff --git a/x/bank/types/params_test.go b/x/bank/types/params_test.go index f6f95d737..d63c8b89c 100644 --- a/x/bank/types/params_test.go +++ b/x/bank/types/params_test.go @@ -91,23 +91,12 @@ func Test_validateParams(t *testing.T) { require.True(t, params.SendEnabledDenom(sdk.DefaultBondDenom)) require.False(t, params.SendEnabledDenom("foodenom2")) - paramYaml := `send_enabled: -- denom: foodenom - enabled: false -- denom: foodenom2 - enabled: false -default_send_enabled: true -` + paramYaml := "default_send_enabled: true\nsend_enabled:\n- denom: foodenom\n- denom: foodenom2\n" require.Equal(t, paramYaml, params.String()) // Ensure proper format of yaml output when false params.DefaultSendEnabled = false - paramYaml = `send_enabled: -- denom: foodenom - enabled: false -- denom: foodenom2 - enabled: false -` + paramYaml = "send_enabled:\n- denom: foodenom\n- denom: foodenom2\n" require.Equal(t, paramYaml, params.String()) params = NewParams(true, SendEnabledParams{ diff --git a/x/bank/types/tx.pb.go b/x/bank/types/tx.pb.go index f9e6a6aab..50e8fb2b9 100644 --- a/x/bank/types/tx.pb.go +++ b/x/bank/types/tx.pb.go @@ -33,8 +33,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // MsgSend represents a message to send coins from one account to another. type MsgSend struct { - FromAddress string `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty" yaml:"from_address"` - ToAddress string `protobuf:"bytes,2,opt,name=to_address,json=toAddress,proto3" json:"to_address,omitempty" yaml:"to_address"` + FromAddress string `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty"` + ToAddress string `protobuf:"bytes,2,opt,name=to_address,json=toAddress,proto3" json:"to_address,omitempty"` Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=amount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"amount"` } @@ -208,36 +208,35 @@ func init() { func init() { proto.RegisterFile("cosmos/bank/v1beta1/tx.proto", fileDescriptor_1d8cb1613481f5b7) } var fileDescriptor_1d8cb1613481f5b7 = []byte{ - // 463 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xbf, 0x6f, 0xd3, 0x40, - 0x1c, 0xc5, 0xed, 0x24, 0x4a, 0xc9, 0xb5, 0x12, 0xaa, 0x1b, 0xa1, 0xd6, 0x54, 0x76, 0xb1, 0x18, - 0xd2, 0x21, 0x67, 0x5a, 0x16, 0x14, 0x26, 0xdc, 0x09, 0x84, 0x85, 0xe4, 0x4e, 0xb0, 0x54, 0xfe, - 0x71, 0x18, 0xab, 0xf5, 0x9d, 0xe5, 0x3b, 0xa3, 0xe6, 0x3f, 0x40, 0x62, 0x61, 0x66, 0xca, 0x8c, - 0x18, 0xf9, 0x23, 0x32, 0x46, 0x4c, 0x4c, 0x01, 0x25, 0x0b, 0x73, 0xfe, 0x02, 0xe4, 0xbb, 0xb3, - 0x13, 0x89, 0x24, 0x9d, 0x12, 0xdf, 0x7b, 0xef, 0x73, 0xef, 0xbe, 0x77, 0xe0, 0x38, 0x24, 0x34, - 0x25, 0xd4, 0x0e, 0x7c, 0x7c, 0x6d, 0x7f, 0x3c, 0x0b, 0x10, 0xf3, 0xcf, 0x6c, 0x76, 0x0b, 0xb3, - 0x9c, 0x30, 0xa2, 0x1d, 0x08, 0x15, 0x96, 0x2a, 0x94, 0xaa, 0xde, 0x8d, 0x49, 0x4c, 0xb8, 0x6e, - 0x97, 0xff, 0x84, 0x55, 0x37, 0x6a, 0x10, 0x45, 0x35, 0x28, 0x24, 0x09, 0xfe, 0x4f, 0x5f, 0xd9, - 0x88, 0x73, 0x85, 0x7e, 0x24, 0xf4, 0x2b, 0x01, 0x96, 0xfb, 0xf2, 0x0f, 0xeb, 0x6b, 0x03, 0xec, - 0xb8, 0x34, 0xbe, 0x44, 0x38, 0xd2, 0x3c, 0xb0, 0xf7, 0x3e, 0x27, 0xe9, 0x95, 0x1f, 0x45, 0x39, - 0xa2, 0xf4, 0x50, 0x3d, 0x51, 0x7b, 0x1d, 0xc7, 0x5e, 0x4c, 0xcd, 0x83, 0xa1, 0x9f, 0xde, 0x0c, - 0xac, 0x55, 0xd5, 0xfa, 0xf9, 0xa3, 0xdf, 0x95, 0xa8, 0x17, 0x62, 0xe9, 0x92, 0xe5, 0x09, 0x8e, - 0xbd, 0xdd, 0xd2, 0x26, 0x97, 0xb4, 0xd7, 0x00, 0x30, 0x52, 0x13, 0x1b, 0x9c, 0xd8, 0x5f, 0x4c, - 0xcd, 0x7d, 0x41, 0x5c, 0x6a, 0x9b, 0x79, 0x1d, 0x46, 0x2a, 0x5a, 0x08, 0xda, 0x7e, 0x4a, 0x0a, - 0xcc, 0x0e, 0x9b, 0x27, 0xcd, 0xde, 0xee, 0xf9, 0x11, 0xac, 0x87, 0x48, 0x51, 0x35, 0x44, 0x78, - 0x41, 0x12, 0xec, 0x3c, 0x19, 0x4f, 0x4d, 0xe5, 0xdb, 0x6f, 0xb3, 0x17, 0x27, 0xec, 0x43, 0x11, - 0xc0, 0x90, 0xa4, 0xf2, 0xe4, 0xf2, 0xa7, 0x4f, 0xa3, 0x6b, 0x9b, 0x0d, 0x33, 0x44, 0x79, 0x80, - 0x7a, 0x12, 0x3d, 0xb8, 0xf7, 0x69, 0x64, 0x2a, 0x7f, 0x47, 0xa6, 0x62, 0xed, 0x83, 0xfb, 0x72, - 0x36, 0x1e, 0xa2, 0x19, 0xc1, 0x14, 0x59, 0x9f, 0x55, 0xb0, 0xe7, 0xd2, 0xd8, 0x2d, 0x6e, 0x58, - 0xc2, 0x87, 0xf6, 0x0c, 0xb4, 0x13, 0x9c, 0x15, 0xac, 0x1c, 0x57, 0x59, 0x49, 0x87, 0x6b, 0xee, - 0x15, 0xbe, 0x2c, 0x2d, 0x4e, 0xab, 0xec, 0xe4, 0x49, 0xbf, 0xf6, 0x1c, 0xec, 0x90, 0x82, 0xf1, - 0x68, 0x83, 0x47, 0x1f, 0xae, 0x8d, 0xbe, 0xe1, 0x1e, 0x99, 0xad, 0x12, 0x83, 0x16, 0x2f, 0xf8, - 0x00, 0x74, 0x57, 0xcb, 0x54, 0x2d, 0xcf, 0xbf, 0xab, 0xa0, 0xe9, 0xd2, 0x58, 0x7b, 0x05, 0x5a, - 0xbc, 0xe4, 0xf1, 0x5a, 0xb2, 0x3c, 0x9b, 0xfe, 0x78, 0x9b, 0x5a, 0x31, 0xb5, 0xb7, 0xa0, 0xb3, - 0x3c, 0xf5, 0xa3, 0x4d, 0x91, 0xda, 0xa2, 0x9f, 0xde, 0x69, 0xa9, 0xd0, 0xce, 0xc5, 0x78, 0x66, - 0xa8, 0x93, 0x99, 0xa1, 0xfe, 0x99, 0x19, 0xea, 0x97, 0xb9, 0xa1, 0x4c, 0xe6, 0x86, 0xf2, 0x6b, - 0x6e, 0x28, 0xef, 0x4e, 0xb7, 0xde, 0xde, 0xad, 0x78, 0xf1, 0xfc, 0x12, 0x83, 0x36, 0x7f, 0xd0, - 0x4f, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xd4, 0x0b, 0x98, 0xec, 0x76, 0x03, 0x00, 0x00, + // 439 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xcb, 0xae, 0xd2, 0x40, + 0x1c, 0xc6, 0x3b, 0x07, 0xc2, 0x91, 0x39, 0x27, 0x31, 0x56, 0x62, 0x38, 0xf5, 0xa4, 0x45, 0xe2, + 0x02, 0x16, 0x4c, 0x05, 0x17, 0x1a, 0x58, 0x59, 0x56, 0x9a, 0x34, 0x26, 0x65, 0xa5, 0x1b, 0xd2, + 0xcb, 0x58, 0x1b, 0xec, 0x4c, 0xd3, 0x99, 0x1a, 0x7c, 0x03, 0x13, 0x37, 0x3e, 0x02, 0x6b, 0xe3, + 0xd2, 0x87, 0x60, 0x49, 0x5c, 0xb9, 0x52, 0x03, 0x1b, 0x57, 0x3e, 0x83, 0xe9, 0x74, 0x5a, 0x49, + 0x44, 0x58, 0xf5, 0xf2, 0x7d, 0xbf, 0x6f, 0xfe, 0x97, 0x81, 0xd7, 0x3e, 0x65, 0x31, 0x65, 0xa6, + 0xe7, 0x92, 0x85, 0xf9, 0x76, 0xe8, 0x61, 0xee, 0x0e, 0x4d, 0xbe, 0x44, 0x49, 0x4a, 0x39, 0x55, + 0x6f, 0x17, 0x2a, 0xca, 0x55, 0x24, 0x55, 0xad, 0x15, 0xd2, 0x90, 0x0a, 0xdd, 0xcc, 0xdf, 0x0a, + 0xab, 0xa6, 0x57, 0x41, 0x0c, 0x57, 0x41, 0x3e, 0x8d, 0xc8, 0x3f, 0xfa, 0xde, 0x41, 0x22, 0xb7, + 0xd0, 0xaf, 0x0a, 0x7d, 0x5e, 0x04, 0xcb, 0x73, 0xc5, 0x47, 0xf7, 0x37, 0x80, 0xe7, 0x36, 0x0b, + 0x67, 0x98, 0x04, 0xea, 0x04, 0x5e, 0xbe, 0x4a, 0x69, 0x3c, 0x77, 0x83, 0x20, 0xc5, 0x8c, 0xb5, + 0x41, 0x07, 0xf4, 0x9a, 0x56, 0xfb, 0xeb, 0x97, 0x41, 0x4b, 0x32, 0x4f, 0x0a, 0x65, 0xc6, 0xd3, + 0x88, 0x84, 0xce, 0x45, 0xee, 0x96, 0xbf, 0xd4, 0x47, 0x10, 0x72, 0x5a, 0xa1, 0x67, 0x27, 0xd0, + 0x26, 0xa7, 0x25, 0xe8, 0xc3, 0x86, 0x1b, 0xd3, 0x8c, 0xf0, 0x76, 0xad, 0x53, 0xeb, 0x5d, 0x8c, + 0xae, 0x50, 0x35, 0x18, 0x86, 0xcb, 0xc1, 0xa0, 0x29, 0x8d, 0x88, 0xf5, 0x60, 0xfd, 0xdd, 0x50, + 0x3e, 0xfd, 0x30, 0x7a, 0x61, 0xc4, 0x5f, 0x67, 0x1e, 0xf2, 0x69, 0x2c, 0xbb, 0x91, 0x8f, 0x01, + 0x0b, 0x16, 0x26, 0x7f, 0x97, 0x60, 0x26, 0x00, 0xe6, 0xc8, 0xe8, 0xf1, 0x8d, 0xf7, 0x2b, 0x43, + 0xf9, 0xb5, 0x32, 0x94, 0xee, 0x2d, 0x78, 0x53, 0xf6, 0xeb, 0x60, 0x96, 0x50, 0xc2, 0x70, 0xf7, + 0x03, 0x80, 0x97, 0x36, 0x0b, 0xed, 0xec, 0x0d, 0x8f, 0xc4, 0x20, 0x1e, 0xc3, 0x46, 0x44, 0x92, + 0x8c, 0xe7, 0x23, 0xc8, 0x4b, 0xd2, 0xd0, 0x81, 0x5d, 0xa1, 0xa7, 0xb9, 0xc5, 0xaa, 0xe7, 0x35, + 0x39, 0xd2, 0xaf, 0x4e, 0xe0, 0x39, 0xcd, 0xb8, 0x40, 0xcf, 0x04, 0x7a, 0xf7, 0x20, 0xfa, 0x5c, + 0x78, 0x24, 0x5b, 0x12, 0xe3, 0xba, 0x28, 0xf0, 0x0e, 0x6c, 0xed, 0x17, 0x53, 0x56, 0x39, 0xfa, + 0x0c, 0x60, 0xcd, 0x66, 0xa1, 0xfa, 0x0c, 0xd6, 0x45, 0x91, 0xd7, 0x07, 0x93, 0x65, 0x6f, 0xda, + 0xfd, 0x63, 0x6a, 0x99, 0xa9, 0xbe, 0x80, 0xcd, 0xbf, 0x5d, 0xdf, 0xfb, 0x1f, 0x52, 0x59, 0xb4, + 0xfe, 0x49, 0x4b, 0x19, 0x6d, 0x4d, 0xd7, 0x5b, 0x1d, 0x6c, 0xb6, 0x3a, 0xf8, 0xb9, 0xd5, 0xc1, + 0xc7, 0x9d, 0xae, 0x6c, 0x76, 0xba, 0xf2, 0x6d, 0xa7, 0x2b, 0x2f, 0xfb, 0x47, 0xb7, 0xb7, 0x2c, + 0x6e, 0xb1, 0x58, 0xa2, 0xd7, 0x10, 0x97, 0xf4, 0xe1, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe8, + 0x6d, 0x23, 0xe3, 0x4a, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/capability/types/capability.pb.go b/x/capability/types/capability.pb.go index 785742bd3..332666df7 100644 --- a/x/capability/types/capability.pb.go +++ b/x/capability/types/capability.pb.go @@ -26,7 +26,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // Capability defines an implementation of an object capability. The index // provided to a Capability must be globally unique. type Capability struct { - Index uint64 `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty" yaml:"index"` + Index uint64 `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty"` } func (m *Capability) Reset() { *m = Capability{} } @@ -71,8 +71,8 @@ func (m *Capability) GetIndex() uint64 { // Owner defines a single capability owner. An owner is defined by the name of // capability and the module name. type Owner struct { - Module string `protobuf:"bytes,1,opt,name=module,proto3" json:"module,omitempty" yaml:"module"` - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty" yaml:"name"` + Module string `protobuf:"bytes,1,opt,name=module,proto3" json:"module,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` } func (m *Owner) Reset() { *m = Owner{} } @@ -164,26 +164,24 @@ func init() { } var fileDescriptor_6308261edd8470a9 = []byte{ - // 299 bytes of a gzipped FileDescriptorProto + // 260 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x4a, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0x4f, 0x4e, 0x2c, 0x48, 0x4c, 0xca, 0xcc, 0xc9, 0x2c, 0xa9, 0xd4, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0x44, 0x12, 0xd2, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x84, 0xa8, 0xd5, 0x43, 0x92, 0x80, 0xaa, 0x95, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0xab, 0xd2, 0x07, - 0xb1, 0x20, 0x1a, 0x94, 0xac, 0xb8, 0xb8, 0x9c, 0xe1, 0x6a, 0x85, 0xd4, 0xb8, 0x58, 0x33, 0xf3, - 0x52, 0x52, 0x2b, 0x24, 0x18, 0x15, 0x18, 0x35, 0x58, 0x9c, 0x04, 0x3e, 0xdd, 0x93, 0xe7, 0xa9, - 0x4c, 0xcc, 0xcd, 0xb1, 0x52, 0x02, 0x0b, 0x2b, 0x05, 0x41, 0xa4, 0xad, 0x58, 0x66, 0x2c, 0x90, - 0x67, 0x50, 0x4a, 0xe4, 0x62, 0xf5, 0x2f, 0xcf, 0x4b, 0x2d, 0x12, 0xd2, 0xe4, 0x62, 0xcb, 0xcd, - 0x4f, 0x29, 0xcd, 0x49, 0x05, 0xeb, 0xe3, 0x74, 0x12, 0xfc, 0x74, 0x4f, 0x9e, 0x17, 0xa2, 0x0f, - 0x22, 0xae, 0x14, 0x04, 0x55, 0x20, 0xa4, 0xcc, 0xc5, 0x92, 0x97, 0x98, 0x9b, 0x2a, 0xc1, 0x04, - 0x56, 0xc8, 0xff, 0xe9, 0x9e, 0x3c, 0x37, 0x44, 0x21, 0x48, 0x54, 0x29, 0x08, 0x2c, 0x69, 0xc5, - 0xd1, 0xb1, 0x40, 0x9e, 0x01, 0x6c, 0x45, 0x10, 0x97, 0x00, 0xc2, 0x79, 0x60, 0xcb, 0x8a, 0x85, - 0xec, 0xb8, 0xd8, 0xf2, 0xc1, 0x2c, 0x09, 0x46, 0x05, 0x66, 0x0d, 0x6e, 0x23, 0x05, 0x3d, 0x9c, - 0x9e, 0xd6, 0x03, 0x6b, 0x71, 0x62, 0x39, 0x71, 0x4f, 0x9e, 0x21, 0x08, 0xaa, 0xcb, 0xc9, 0xf3, - 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, - 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0xf4, 0xd3, 0x33, 0x4b, 0x32, 0x4a, - 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x61, 0x81, 0x0e, 0xa6, 0x74, 0x8b, 0x53, 0xb2, 0xf5, 0x2b, - 0x90, 0x63, 0xa0, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x1c, 0x88, 0xc6, 0x80, 0x00, 0x00, - 0x00, 0xff, 0xff, 0x1d, 0xc9, 0xe6, 0xa8, 0xa3, 0x01, 0x00, 0x00, + 0xb1, 0x20, 0x1a, 0x94, 0x34, 0xb8, 0xb8, 0x9c, 0xe1, 0x6a, 0x85, 0x44, 0xb8, 0x58, 0x33, 0xf3, + 0x52, 0x52, 0x2b, 0x24, 0x18, 0x15, 0x18, 0x35, 0x58, 0x82, 0x20, 0x1c, 0x2b, 0x96, 0x19, 0x0b, + 0xe4, 0x19, 0x94, 0x6c, 0xb9, 0x58, 0xfd, 0xcb, 0xf3, 0x52, 0x8b, 0x84, 0xc4, 0xb8, 0xd8, 0x72, + 0xf3, 0x53, 0x4a, 0x73, 0x52, 0xc1, 0xaa, 0x38, 0x83, 0xa0, 0x3c, 0x21, 0x21, 0x2e, 0x96, 0xbc, + 0xc4, 0xdc, 0x54, 0x09, 0x26, 0xb0, 0x28, 0x98, 0x6d, 0xc5, 0xd1, 0xb1, 0x40, 0x9e, 0x01, 0xac, + 0x3d, 0x88, 0x4b, 0x00, 0x61, 0x11, 0xd8, 0xa0, 0x62, 0x21, 0x3b, 0x2e, 0xb6, 0x7c, 0x30, 0x4b, + 0x82, 0x51, 0x81, 0x59, 0x83, 0xdb, 0x48, 0x41, 0x0f, 0xa7, 0xf3, 0xf5, 0xc0, 0x5a, 0x9c, 0x58, + 0x4e, 0xdc, 0x93, 0x67, 0x08, 0x82, 0xea, 0x72, 0xf2, 0x3c, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, + 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, + 0x63, 0x39, 0x86, 0x28, 0xfd, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, + 0x58, 0xf0, 0x81, 0x29, 0xdd, 0xe2, 0x94, 0x6c, 0xfd, 0x0a, 0xe4, 0xb0, 0x2c, 0xa9, 0x2c, 0x48, + 0x2d, 0x4e, 0x62, 0x03, 0x07, 0x87, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x16, 0x16, 0x9b, 0x7d, + 0x6d, 0x01, 0x00, 0x00, } func (m *Capability) Marshal() (dAtA []byte, err error) { diff --git a/x/capability/types/genesis.pb.go b/x/capability/types/genesis.pb.go index e72c18eda..051e9f260 100644 --- a/x/capability/types/genesis.pb.go +++ b/x/capability/types/genesis.pb.go @@ -28,7 +28,7 @@ type GenesisOwners struct { // index is the index of the capability owner. Index uint64 `protobuf:"varint,1,opt,name=index,proto3" json:"index,omitempty"` // index_owners are the owners at the given index. - IndexOwners CapabilityOwners `protobuf:"bytes,2,opt,name=index_owners,json=indexOwners,proto3" json:"index_owners" yaml:"index_owners"` + IndexOwners CapabilityOwners `protobuf:"bytes,2,opt,name=index_owners,json=indexOwners,proto3" json:"index_owners"` } func (m *GenesisOwners) Reset() { *m = GenesisOwners{} } @@ -144,25 +144,24 @@ func init() { } var fileDescriptor_94922dd16a11c23e = []byte{ - // 281 bytes of a gzipped FileDescriptorProto + // 263 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4f, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0x4f, 0x4e, 0x2c, 0x48, 0x4c, 0xca, 0xcc, 0xc9, 0x2c, 0xa9, 0xd4, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x84, 0x28, 0xd4, 0x43, 0x28, 0xd4, 0x83, 0x2a, 0x94, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0xab, 0xd2, 0x07, 0xb1, 0x20, 0x1a, 0xa4, 0xb4, 0x70, 0x9b, 0x8c, 0x64, - 0x06, 0x58, 0xad, 0xd2, 0x24, 0x46, 0x2e, 0x5e, 0x77, 0x88, 0x75, 0xfe, 0xe5, 0x79, 0xa9, 0x45, - 0xc5, 0x42, 0x22, 0x5c, 0xac, 0x99, 0x79, 0x29, 0xa9, 0x15, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x2c, - 0x41, 0x10, 0x8e, 0x50, 0x36, 0x17, 0x0f, 0x98, 0x11, 0x9f, 0x0f, 0x56, 0x25, 0xc1, 0xa4, 0xc0, - 0xa8, 0xc1, 0x6d, 0xa4, 0xad, 0x87, 0xd3, 0x6d, 0x7a, 0xce, 0x70, 0x21, 0x88, 0xc1, 0x4e, 0xd2, - 0x27, 0xee, 0xc9, 0x33, 0x7c, 0xba, 0x27, 0x2f, 0x5c, 0x99, 0x98, 0x9b, 0x63, 0xa5, 0x84, 0x6c, - 0x9c, 0x52, 0x10, 0x37, 0x98, 0x0b, 0x51, 0xa9, 0x94, 0xc3, 0xc5, 0x03, 0x75, 0x53, 0x70, 0x49, - 0x62, 0x49, 0x2a, 0x0e, 0x27, 0xb9, 0x71, 0xb1, 0xc1, 0x1d, 0xc3, 0xac, 0xc1, 0x6d, 0xa4, 0x81, - 0xc7, 0x31, 0x28, 0x5e, 0x74, 0x62, 0x01, 0xb9, 0x24, 0x08, 0xaa, 0xdb, 0xc9, 0xf3, 0xc4, 0x23, - 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, - 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0xf4, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, - 0x92, 0xf3, 0x73, 0xf5, 0x61, 0x61, 0x0a, 0xa6, 0x74, 0x8b, 0x53, 0xb2, 0xf5, 0x2b, 0x90, 0x03, - 0xb8, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x1c, 0xa8, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xfd, 0xf4, 0xf2, 0x5d, 0xdc, 0x01, 0x00, 0x00, + 0x06, 0x58, 0xad, 0x52, 0x35, 0x17, 0xaf, 0x3b, 0xc4, 0x36, 0xff, 0xf2, 0xbc, 0xd4, 0xa2, 0x62, + 0x21, 0x11, 0x2e, 0xd6, 0xcc, 0xbc, 0x94, 0xd4, 0x0a, 0x09, 0x46, 0x05, 0x46, 0x0d, 0x96, 0x20, + 0x08, 0x47, 0x28, 0x84, 0x8b, 0x07, 0xcc, 0x88, 0xcf, 0x07, 0xab, 0x92, 0x60, 0x52, 0x60, 0xd4, + 0xe0, 0x36, 0xd2, 0xd6, 0xc3, 0xe9, 0x34, 0x3d, 0x67, 0xb8, 0x10, 0xc4, 0x60, 0x27, 0x96, 0x13, + 0xf7, 0xe4, 0x19, 0x82, 0xb8, 0xc1, 0xc6, 0x40, 0x84, 0x94, 0x72, 0xb8, 0x78, 0xa0, 0x96, 0x07, + 0x97, 0x24, 0x96, 0xa4, 0xe2, 0xb0, 0xdb, 0x8d, 0x8b, 0x0d, 0x6e, 0x2b, 0xb3, 0x06, 0xb7, 0x91, + 0x06, 0x1e, 0x5b, 0x51, 0xfc, 0x02, 0xb5, 0x12, 0xaa, 0xdb, 0xc9, 0xf3, 0xc4, 0x23, 0x39, 0xc6, + 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, + 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0xf4, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, + 0x73, 0xf5, 0x61, 0x61, 0x07, 0xa6, 0x74, 0x8b, 0x53, 0xb2, 0xf5, 0x2b, 0x90, 0x03, 0xb2, 0xa4, + 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x1c, 0x78, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x89, + 0xb8, 0x17, 0xfe, 0xc4, 0x01, 0x00, 0x00, } func (m *GenesisOwners) Marshal() (dAtA []byte, err error) { diff --git a/x/capability/types/types.go b/x/capability/types/types.go index 2dcceb8c8..debcb8796 100644 --- a/x/capability/types/types.go +++ b/x/capability/types/types.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) diff --git a/x/crisis/types/genesis.pb.go b/x/crisis/types/genesis.pb.go index 06a870ff7..4356d61e0 100644 --- a/x/crisis/types/genesis.pb.go +++ b/x/crisis/types/genesis.pb.go @@ -28,7 +28,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type GenesisState struct { // constant_fee is the fee used to verify the invariant in the crisis // module. - ConstantFee types.Coin `protobuf:"bytes,3,opt,name=constant_fee,json=constantFee,proto3" json:"constant_fee" yaml:"constant_fee"` + ConstantFee types.Coin `protobuf:"bytes,3,opt,name=constant_fee,json=constantFee,proto3" json:"constant_fee"` } func (m *GenesisState) Reset() { *m = GenesisState{} } @@ -80,22 +80,22 @@ func init() { } var fileDescriptor_7a9c2781aa8a27ae = []byte{ - // 238 bytes of a gzipped FileDescriptorProto + // 225 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4e, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0x4f, 0x2e, 0xca, 0x2c, 0xce, 0x2c, 0xd6, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x85, 0x28, 0xd2, 0x83, 0x28, 0xd2, 0x83, 0x2a, 0x92, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0xab, 0xd0, 0x07, 0xb1, 0x20, 0x8a, 0xa5, 0xe4, 0xa0, 0x26, 0x26, 0x25, 0x16, 0xa7, 0xc2, 0xcd, - 0x4b, 0xce, 0xcf, 0xcc, 0x83, 0xc8, 0x2b, 0x65, 0x72, 0xf1, 0xb8, 0x43, 0x4c, 0x0f, 0x2e, 0x49, - 0x2c, 0x49, 0x15, 0x8a, 0xe4, 0xe2, 0x49, 0xce, 0xcf, 0x2b, 0x2e, 0x49, 0xcc, 0x2b, 0x89, 0x4f, + 0x4b, 0xce, 0xcf, 0xcc, 0x83, 0xc8, 0x2b, 0x05, 0x71, 0xf1, 0xb8, 0x43, 0x4c, 0x0f, 0x2e, 0x49, + 0x2c, 0x49, 0x15, 0x72, 0xe2, 0xe2, 0x49, 0xce, 0xcf, 0x2b, 0x2e, 0x49, 0xcc, 0x2b, 0x89, 0x4f, 0x4b, 0x4d, 0x95, 0x60, 0x56, 0x60, 0xd4, 0xe0, 0x36, 0x92, 0xd4, 0x83, 0xda, 0x09, 0x32, 0x06, - 0x66, 0xa3, 0x9e, 0x73, 0x7e, 0x66, 0x9e, 0x93, 0xf4, 0x89, 0x7b, 0xf2, 0x0c, 0x9f, 0xee, 0xc9, - 0x0b, 0x57, 0x26, 0xe6, 0xe6, 0x58, 0x29, 0x21, 0x6b, 0x56, 0x0a, 0xe2, 0x86, 0x71, 0xdd, 0x52, - 0x53, 0x9d, 0x5c, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, - 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x3b, 0x3d, - 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x1f, 0x16, 0x02, 0x60, 0x4a, 0xb7, 0x38, - 0x25, 0x5b, 0xbf, 0x02, 0x16, 0x1c, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0x87, 0x1b, - 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x2f, 0x43, 0x06, 0xff, 0x2c, 0x01, 0x00, 0x00, + 0x66, 0xa3, 0x9e, 0x73, 0x7e, 0x66, 0x9e, 0x13, 0xcb, 0x89, 0x7b, 0xf2, 0x0c, 0x41, 0xdc, 0x30, + 0x4d, 0x6e, 0xa9, 0xa9, 0x4e, 0xae, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, + 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, + 0xa5, 0x9d, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x0f, 0xf3, 0x2a, 0x98, + 0xd2, 0x2d, 0x4e, 0xc9, 0xd6, 0xaf, 0x80, 0xf9, 0xbb, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, + 0xec, 0x42, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x49, 0xae, 0x6d, 0xf5, 0x15, 0x01, 0x00, + 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/crisis/types/tx.pb.go b/x/crisis/types/tx.pb.go index 7671e1c7f..6f465b972 100644 --- a/x/crisis/types/tx.pb.go +++ b/x/crisis/types/tx.pb.go @@ -32,8 +32,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // MsgVerifyInvariant represents a message to verify a particular invariance. type MsgVerifyInvariant struct { Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"` - InvariantModuleName string `protobuf:"bytes,2,opt,name=invariant_module_name,json=invariantModuleName,proto3" json:"invariant_module_name,omitempty" yaml:"invariant_module_name"` - InvariantRoute string `protobuf:"bytes,3,opt,name=invariant_route,json=invariantRoute,proto3" json:"invariant_route,omitempty" yaml:"invariant_route"` + InvariantModuleName string `protobuf:"bytes,2,opt,name=invariant_module_name,json=invariantModuleName,proto3" json:"invariant_module_name,omitempty"` + InvariantRoute string `protobuf:"bytes,3,opt,name=invariant_route,json=invariantRoute,proto3" json:"invariant_route,omitempty"` } func (m *MsgVerifyInvariant) Reset() { *m = MsgVerifyInvariant{} } @@ -114,29 +114,28 @@ func init() { func init() { proto.RegisterFile("cosmos/crisis/v1beta1/tx.proto", fileDescriptor_61276163172fe867) } var fileDescriptor_61276163172fe867 = []byte{ - // 349 bytes of a gzipped FileDescriptorProto + // 323 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4b, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0x4f, 0x2e, 0xca, 0x2c, 0xce, 0x2c, 0xd6, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x85, 0xc8, 0xeb, 0x41, 0xe4, 0xf5, 0xa0, 0xf2, 0x52, 0x22, 0xe9, 0xf9, 0xe9, 0xf9, 0x60, 0x15, 0xfa, 0x20, 0x16, 0x44, - 0xb1, 0x94, 0x24, 0x44, 0x71, 0x3c, 0x44, 0x02, 0xaa, 0x13, 0xcc, 0x51, 0x7a, 0xcd, 0xc8, 0x25, + 0xb1, 0x94, 0x24, 0x44, 0x71, 0x3c, 0x44, 0x02, 0xaa, 0x13, 0xcc, 0x51, 0x5a, 0xcb, 0xc8, 0x25, 0xe4, 0x5b, 0x9c, 0x1e, 0x96, 0x5a, 0x94, 0x99, 0x56, 0xe9, 0x99, 0x57, 0x96, 0x58, 0x94, 0x99, 0x98, 0x57, 0x22, 0x64, 0xc0, 0xc5, 0x56, 0x9c, 0x9a, 0x97, 0x92, 0x5a, 0x24, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0xe9, 0x24, 0x71, 0x69, 0x8b, 0xae, 0x08, 0x54, 0xa3, 0x63, 0x4a, 0x4a, 0x51, 0x6a, - 0x71, 0x71, 0x70, 0x49, 0x51, 0x66, 0x5e, 0x7a, 0x10, 0x54, 0x9d, 0x50, 0x08, 0x97, 0x68, 0x26, + 0x71, 0x71, 0x70, 0x49, 0x51, 0x66, 0x5e, 0x7a, 0x10, 0x54, 0x9d, 0x90, 0x11, 0x97, 0x68, 0x26, 0x4c, 0x7b, 0x7c, 0x6e, 0x7e, 0x4a, 0x69, 0x4e, 0x6a, 0x7c, 0x5e, 0x62, 0x6e, 0xaa, 0x04, 0x13, - 0xd8, 0x00, 0x85, 0x4f, 0xf7, 0xe4, 0x65, 0x2a, 0x13, 0x73, 0x73, 0xac, 0x94, 0xb0, 0x2a, 0x53, - 0x0a, 0x12, 0x86, 0x8b, 0xfb, 0x82, 0x85, 0xfd, 0x12, 0x73, 0x53, 0x85, 0x9c, 0xb9, 0xf8, 0x11, - 0xca, 0x8b, 0xf2, 0x4b, 0x4b, 0x52, 0x25, 0x98, 0xc1, 0xe6, 0x49, 0x7d, 0xba, 0x27, 0x2f, 0x86, - 0x6e, 0x1e, 0x58, 0x81, 0x52, 0x10, 0x1f, 0x5c, 0x24, 0x08, 0x24, 0x60, 0xc5, 0xd1, 0xb1, 0x40, - 0x9e, 0xe1, 0xc5, 0x02, 0x79, 0x06, 0x25, 0x19, 0x2e, 0x29, 0x4c, 0xcf, 0x06, 0xa5, 0x16, 0x17, - 0xe4, 0xe7, 0x15, 0xa7, 0x1a, 0x95, 0x71, 0x31, 0xfb, 0x16, 0xa7, 0x0b, 0xe5, 0x73, 0xf1, 0xa3, - 0x07, 0x87, 0xa6, 0x1e, 0xd6, 0xe0, 0xd6, 0xc3, 0x34, 0x4c, 0xca, 0x90, 0x68, 0xa5, 0x30, 0x7b, - 0x9d, 0x5c, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, - 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x3b, 0x3d, 0xb3, - 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x1f, 0x96, 0x20, 0xc0, 0x94, 0x6e, 0x71, 0x4a, - 0xb6, 0x7e, 0x05, 0x2c, 0x75, 0x94, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x63, 0xd4, 0x18, - 0x10, 0x00, 0x00, 0xff, 0xff, 0x68, 0x71, 0x76, 0xe3, 0x3b, 0x02, 0x00, 0x00, + 0xc8, 0x80, 0x20, 0x61, 0xb8, 0xa4, 0x2f, 0x58, 0xce, 0x2f, 0x31, 0x37, 0x55, 0x48, 0x9d, 0x8b, + 0x1f, 0xa1, 0xa7, 0x28, 0xbf, 0xb4, 0x24, 0x55, 0x82, 0x19, 0xac, 0x9a, 0x0f, 0x2e, 0x1c, 0x04, + 0x12, 0xb5, 0xe2, 0xe8, 0x58, 0x20, 0xcf, 0xf0, 0x62, 0x81, 0x3c, 0x83, 0x92, 0x0c, 0x97, 0x14, + 0xa6, 0x73, 0x83, 0x52, 0x8b, 0x0b, 0xf2, 0xf3, 0x8a, 0x53, 0x8d, 0xca, 0xb8, 0x98, 0x7d, 0x8b, + 0xd3, 0x85, 0xf2, 0xb9, 0xf8, 0xd1, 0x3d, 0xa4, 0xa9, 0x87, 0x35, 0xc0, 0xf4, 0x30, 0x0d, 0x93, + 0x32, 0x24, 0x5a, 0x29, 0xcc, 0x5e, 0x27, 0xd7, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, + 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, + 0x63, 0x88, 0xd2, 0x4e, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0x45, + 0x29, 0x98, 0xd2, 0x2d, 0x4e, 0xc9, 0xd6, 0xaf, 0x80, 0xc5, 0x6f, 0x49, 0x65, 0x41, 0x6a, 0x71, + 0x12, 0x1b, 0x38, 0x4e, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x16, 0x11, 0x03, 0xd4, 0xfd, + 0x01, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/distribution/types/distribution.pb.go b/x/distribution/types/distribution.pb.go index 063ecca4b..f8c972674 100644 --- a/x/distribution/types/distribution.pb.go +++ b/x/distribution/types/distribution.pb.go @@ -28,10 +28,10 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // Params defines the set of params for the distribution module. type Params struct { - CommunityTax github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=community_tax,json=communityTax,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"community_tax" yaml:"community_tax"` - BaseProposerReward github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=base_proposer_reward,json=baseProposerReward,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"base_proposer_reward" yaml:"base_proposer_reward"` - BonusProposerReward github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=bonus_proposer_reward,json=bonusProposerReward,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"bonus_proposer_reward" yaml:"bonus_proposer_reward"` - WithdrawAddrEnabled bool `protobuf:"varint,4,opt,name=withdraw_addr_enabled,json=withdrawAddrEnabled,proto3" json:"withdraw_addr_enabled,omitempty" yaml:"withdraw_addr_enabled"` + CommunityTax github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=community_tax,json=communityTax,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"community_tax"` + BaseProposerReward github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=base_proposer_reward,json=baseProposerReward,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"base_proposer_reward"` + BonusProposerReward github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=bonus_proposer_reward,json=bonusProposerReward,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"bonus_proposer_reward"` + WithdrawAddrEnabled bool `protobuf:"varint,4,opt,name=withdraw_addr_enabled,json=withdrawAddrEnabled,proto3" json:"withdraw_addr_enabled,omitempty"` } func (m *Params) Reset() { *m = Params{} } @@ -86,8 +86,8 @@ func (m *Params) GetWithdrawAddrEnabled() bool { // read that record) // + one per validator for the zeroeth period, set on initialization type ValidatorHistoricalRewards struct { - CumulativeRewardRatio github_com_cosmos_cosmos_sdk_types.DecCoins `protobuf:"bytes,1,rep,name=cumulative_reward_ratio,json=cumulativeRewardRatio,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.DecCoins" json:"cumulative_reward_ratio" yaml:"cumulative_reward_ratio"` - ReferenceCount uint32 `protobuf:"varint,2,opt,name=reference_count,json=referenceCount,proto3" json:"reference_count,omitempty" yaml:"reference_count"` + CumulativeRewardRatio github_com_cosmos_cosmos_sdk_types.DecCoins `protobuf:"bytes,1,rep,name=cumulative_reward_ratio,json=cumulativeRewardRatio,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.DecCoins" json:"cumulative_reward_ratio"` + ReferenceCount uint32 `protobuf:"varint,2,opt,name=reference_count,json=referenceCount,proto3" json:"reference_count,omitempty"` } func (m *ValidatorHistoricalRewards) Reset() { *m = ValidatorHistoricalRewards{} } @@ -241,7 +241,7 @@ func (m *ValidatorAccumulatedCommission) GetCommission() github_com_cosmos_cosmo // ValidatorOutstandingRewards represents outstanding (un-withdrawn) rewards // for a validator inexpensive to track, allows simple sanity checks. type ValidatorOutstandingRewards struct { - Rewards github_com_cosmos_cosmos_sdk_types.DecCoins `protobuf:"bytes,1,rep,name=rewards,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.DecCoins" json:"rewards" yaml:"rewards"` + Rewards github_com_cosmos_cosmos_sdk_types.DecCoins `protobuf:"bytes,1,rep,name=rewards,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.DecCoins" json:"rewards"` } func (m *ValidatorOutstandingRewards) Reset() { *m = ValidatorOutstandingRewards{} } @@ -289,7 +289,7 @@ func (m *ValidatorOutstandingRewards) GetRewards() github_com_cosmos_cosmos_sdk_ // This is needed to calculate appropriate amount of staking tokens // for delegations which are withdrawn after a slash has occurred. type ValidatorSlashEvent struct { - ValidatorPeriod uint64 `protobuf:"varint,1,opt,name=validator_period,json=validatorPeriod,proto3" json:"validator_period,omitempty" yaml:"validator_period"` + ValidatorPeriod uint64 `protobuf:"varint,1,opt,name=validator_period,json=validatorPeriod,proto3" json:"validator_period,omitempty"` Fraction github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=fraction,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"fraction"` } @@ -335,7 +335,7 @@ func (m *ValidatorSlashEvent) GetValidatorPeriod() uint64 { // ValidatorSlashEvents is a collection of ValidatorSlashEvent messages. type ValidatorSlashEvents struct { - ValidatorSlashEvents []ValidatorSlashEvent `protobuf:"bytes,1,rep,name=validator_slash_events,json=validatorSlashEvents,proto3" json:"validator_slash_events" yaml:"validator_slash_events"` + ValidatorSlashEvents []ValidatorSlashEvent `protobuf:"bytes,1,rep,name=validator_slash_events,json=validatorSlashEvents,proto3" json:"validator_slash_events"` } func (m *ValidatorSlashEvents) Reset() { *m = ValidatorSlashEvents{} } @@ -379,7 +379,7 @@ func (m *ValidatorSlashEvents) GetValidatorSlashEvents() []ValidatorSlashEvent { // FeePool is the global fee pool for distribution. type FeePool struct { - CommunityPool github_com_cosmos_cosmos_sdk_types.DecCoins `protobuf:"bytes,1,rep,name=community_pool,json=communityPool,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.DecCoins" json:"community_pool" yaml:"community_pool"` + CommunityPool github_com_cosmos_cosmos_sdk_types.DecCoins `protobuf:"bytes,1,rep,name=community_pool,json=communityPool,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.DecCoins" json:"community_pool"` } func (m *FeePool) Reset() { *m = FeePool{} } @@ -471,9 +471,9 @@ var xxx_messageInfo_CommunityPoolSpendProposal proto.InternalMessageInfo // the delegators within the validator may be left with less than a full token, // thus sdk.Dec is used. type DelegatorStartingInfo struct { - PreviousPeriod uint64 `protobuf:"varint,1,opt,name=previous_period,json=previousPeriod,proto3" json:"previous_period,omitempty" yaml:"previous_period"` - Stake github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=stake,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"stake" yaml:"stake"` - Height uint64 `protobuf:"varint,3,opt,name=height,proto3" json:"creation_height" yaml:"creation_height"` + PreviousPeriod uint64 `protobuf:"varint,1,opt,name=previous_period,json=previousPeriod,proto3" json:"previous_period,omitempty"` + Stake github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=stake,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"stake"` + Height uint64 `protobuf:"varint,3,opt,name=height,proto3" json:"creation_height"` } func (m *DelegatorStartingInfo) Reset() { *m = DelegatorStartingInfo{} } @@ -526,7 +526,7 @@ func (m *DelegatorStartingInfo) GetHeight() uint64 { // DelegationDelegatorReward represents the properties // of a delegator's delegation reward. type DelegationDelegatorReward struct { - ValidatorAddress string `protobuf:"bytes,1,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty" yaml:"validator_address"` + ValidatorAddress string `protobuf:"bytes,1,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` Reward github_com_cosmos_cosmos_sdk_types.DecCoins `protobuf:"bytes,2,rep,name=reward,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.DecCoins" json:"reward"` } @@ -566,11 +566,11 @@ var xxx_messageInfo_DelegationDelegatorReward proto.InternalMessageInfo // CommunityPoolSpendProposalWithDeposit defines a CommunityPoolSpendProposal // with a deposit type CommunityPoolSpendProposalWithDeposit struct { - Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty" yaml:"title"` - Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty" yaml:"description"` - Recipient string `protobuf:"bytes,3,opt,name=recipient,proto3" json:"recipient,omitempty" yaml:"recipient"` - Amount string `protobuf:"bytes,4,opt,name=amount,proto3" json:"amount,omitempty" yaml:"amount"` - Deposit string `protobuf:"bytes,5,opt,name=deposit,proto3" json:"deposit,omitempty" yaml:"deposit"` + Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"` + Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"` + Recipient string `protobuf:"bytes,3,opt,name=recipient,proto3" json:"recipient,omitempty"` + Amount string `protobuf:"bytes,4,opt,name=amount,proto3" json:"amount,omitempty"` + Deposit string `protobuf:"bytes,5,opt,name=deposit,proto3" json:"deposit,omitempty"` } func (m *CommunityPoolSpendProposalWithDeposit) Reset() { *m = CommunityPoolSpendProposalWithDeposit{} } @@ -626,78 +626,65 @@ func init() { } var fileDescriptor_cd78a31ea281a992 = []byte{ - // 1135 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcd, 0x6f, 0x1b, 0x45, - 0x14, 0xf7, 0xa6, 0x8e, 0x93, 0x4e, 0xf3, 0xd5, 0x89, 0x93, 0x38, 0x4e, 0xf0, 0x46, 0x23, 0xb5, - 0x0a, 0x82, 0x38, 0x4d, 0xcb, 0x01, 0x45, 0x5c, 0x62, 0x27, 0x15, 0x48, 0x95, 0x1a, 0x6d, 0xc2, - 0x87, 0x00, 0xc9, 0x1a, 0xef, 0x4e, 0xec, 0x51, 0xec, 0x1d, 0x33, 0x33, 0x76, 0x92, 0x03, 0x17, - 0x2e, 0x70, 0x41, 0x14, 0x71, 0xe1, 0x00, 0x28, 0x47, 0x04, 0x1c, 0x91, 0xf8, 0x17, 0x7a, 0xac, - 0x38, 0x21, 0x0e, 0x06, 0x25, 0x42, 0x42, 0x1c, 0xcd, 0x3f, 0x80, 0x66, 0x67, 0x76, 0xd7, 0xde, - 0x9a, 0x2a, 0xae, 0xd4, 0x93, 0xbd, 0xef, 0xbd, 0xf9, 0xbd, 0xdf, 0x7b, 0xf3, 0x3e, 0x06, 0x14, - 0x5d, 0x26, 0x9a, 0x4c, 0x6c, 0x7a, 0x54, 0x48, 0x4e, 0xab, 0x6d, 0x49, 0x99, 0xbf, 0xd9, 0xd9, - 0xaa, 0x12, 0x89, 0xb7, 0x06, 0x84, 0xc5, 0x16, 0x67, 0x92, 0xc1, 0x15, 0x6d, 0x5f, 0x1c, 0x50, - 0x19, 0xfb, 0x7c, 0xb6, 0xc6, 0x6a, 0x2c, 0xb0, 0xdb, 0x54, 0xff, 0xf4, 0x91, 0x7c, 0xc1, 0xb8, - 0xa8, 0x62, 0x41, 0x22, 0x68, 0x97, 0x51, 0x03, 0x99, 0x5f, 0xd6, 0xfa, 0x8a, 0x3e, 0x68, 0xf0, - 0x83, 0x0f, 0xf4, 0x49, 0x1a, 0x64, 0xf6, 0x31, 0xc7, 0x4d, 0x01, 0xcf, 0xc0, 0xb4, 0xcb, 0x9a, - 0xcd, 0xb6, 0x4f, 0xe5, 0x59, 0x45, 0xe2, 0xd3, 0x9c, 0xb5, 0x66, 0xad, 0x5f, 0x2f, 0x1d, 0x3e, - 0xee, 0xda, 0xa9, 0xdf, 0xbb, 0xf6, 0xed, 0x1a, 0x95, 0xf5, 0x76, 0xb5, 0xe8, 0xb2, 0xa6, 0x81, - 0x30, 0x3f, 0x1b, 0xc2, 0x3b, 0xde, 0x94, 0x67, 0x2d, 0x22, 0x8a, 0xbb, 0xc4, 0xed, 0x75, 0xed, - 0xec, 0x19, 0x6e, 0x36, 0xb6, 0xd1, 0x00, 0x18, 0xfa, 0xf5, 0xe7, 0x0d, 0x60, 0x3c, 0xef, 0x12, - 0xd7, 0x99, 0x8a, 0xb4, 0x87, 0xf8, 0x14, 0x7e, 0x6e, 0x81, 0xac, 0x22, 0xaf, 0x18, 0xb6, 0x98, - 0x20, 0xbc, 0xc2, 0xc9, 0x09, 0xe6, 0x5e, 0x6e, 0x2c, 0xa0, 0xf0, 0xc1, 0xc8, 0x14, 0x56, 0x34, - 0x85, 0x61, 0x98, 0x49, 0x26, 0x50, 0x19, 0xed, 0x1b, 0x1b, 0x27, 0x30, 0x81, 0x8f, 0x2c, 0xb0, - 0x50, 0x65, 0x7e, 0x5b, 0x3c, 0x45, 0xe8, 0x5a, 0x40, 0xe8, 0xc3, 0x91, 0x09, 0xad, 0x1a, 0x42, - 0xc3, 0x40, 0x93, 0x8c, 0xe6, 0x03, 0xab, 0x04, 0xa5, 0x43, 0xb0, 0x70, 0x42, 0x65, 0xdd, 0xe3, - 0xf8, 0xa4, 0x82, 0x3d, 0x8f, 0x57, 0x88, 0x8f, 0xab, 0x0d, 0xe2, 0xe5, 0xd2, 0x6b, 0xd6, 0xfa, - 0x64, 0x69, 0x2d, 0xf6, 0x31, 0xd4, 0x0c, 0x39, 0xf3, 0xa1, 0x7c, 0xc7, 0xf3, 0xf8, 0x9e, 0x96, - 0x6e, 0xa7, 0xbf, 0x3e, 0xb7, 0x53, 0xe8, 0x8b, 0x31, 0x90, 0x7f, 0x07, 0x37, 0xa8, 0x87, 0x25, - 0xe3, 0x6f, 0x52, 0x21, 0x19, 0xa7, 0x2e, 0x6e, 0x68, 0xcf, 0x02, 0xfe, 0x68, 0x81, 0x25, 0xb7, - 0xdd, 0x6c, 0x37, 0xb0, 0xa4, 0x1d, 0x62, 0x48, 0x57, 0x38, 0x96, 0x94, 0xe5, 0xac, 0xb5, 0x6b, - 0xeb, 0x37, 0xee, 0xae, 0x9a, 0x22, 0x2f, 0xaa, 0x5c, 0x86, 0xc5, 0xaa, 0x62, 0x29, 0x33, 0xea, - 0x97, 0xde, 0x56, 0xd9, 0xea, 0x75, 0xed, 0x82, 0xa9, 0x8b, 0xe1, 0x50, 0xe8, 0x87, 0x3f, 0xec, - 0x57, 0xae, 0x96, 0x4f, 0x85, 0x2a, 0x9c, 0x85, 0x18, 0x48, 0x33, 0x75, 0x14, 0x0c, 0x2c, 0x83, - 0x59, 0x4e, 0x8e, 0x08, 0x27, 0xbe, 0x4b, 0x2a, 0x2e, 0x6b, 0xfb, 0x32, 0xa8, 0xa2, 0xe9, 0x52, - 0xbe, 0xd7, 0xb5, 0x17, 0x35, 0x85, 0x84, 0x01, 0x72, 0x66, 0x22, 0x49, 0x39, 0x10, 0x7c, 0x67, - 0x81, 0xa5, 0x28, 0x23, 0xe5, 0x36, 0xe7, 0xc4, 0x97, 0x61, 0x3a, 0x8e, 0xc1, 0x84, 0xe6, 0x2d, - 0xae, 0x14, 0xfd, 0x3d, 0x15, 0xfd, 0xa8, 0xb1, 0x85, 0x1e, 0xe0, 0x22, 0xc8, 0xb4, 0x08, 0xa7, - 0x4c, 0xb7, 0x42, 0xda, 0x31, 0x5f, 0xe8, 0x2b, 0x0b, 0x14, 0x22, 0x82, 0x3b, 0xae, 0x49, 0x05, - 0xf1, 0xca, 0xac, 0xd9, 0xa4, 0x42, 0x50, 0xe6, 0xc3, 0x8f, 0x00, 0x70, 0xa3, 0xaf, 0x17, 0x47, - 0xb5, 0xcf, 0x09, 0xfa, 0xc6, 0x02, 0x2b, 0x11, 0xab, 0x87, 0x6d, 0x29, 0x24, 0xf6, 0x3d, 0xea, - 0xd7, 0xc2, 0xd4, 0x7d, 0x3c, 0x5a, 0xea, 0xf6, 0x4c, 0xe1, 0xcc, 0x84, 0xb7, 0x16, 0x1c, 0x45, - 0xcf, 0x9b, 0x4c, 0xf4, 0x8b, 0x05, 0xe6, 0x23, 0x7a, 0x07, 0x0d, 0x2c, 0xea, 0x7b, 0x1d, 0xe2, - 0x4b, 0x78, 0x1f, 0xcc, 0x75, 0x42, 0x71, 0xc5, 0xa4, 0x5b, 0x0d, 0xbf, 0x74, 0x69, 0xa5, 0xd7, - 0xb5, 0x97, 0xb4, 0xf7, 0xa4, 0x05, 0x72, 0x66, 0x23, 0xd1, 0x7e, 0x20, 0x81, 0xef, 0x81, 0xc9, - 0x23, 0x8e, 0x5d, 0x35, 0xb1, 0xcd, 0xe4, 0x7a, 0x63, 0xb4, 0x41, 0x91, 0x18, 0x04, 0x11, 0x1a, - 0xfa, 0xc9, 0x02, 0xd9, 0x21, 0xcc, 0x85, 0x9a, 0x9c, 0x8b, 0x31, 0x33, 0xa1, 0x34, 0x15, 0x12, - 0xa8, 0x4c, 0x86, 0xef, 0x14, 0x9f, 0xb1, 0x4f, 0x8a, 0x43, 0x30, 0x4b, 0xb7, 0x4c, 0xd6, 0x5f, - 0x4a, 0xc6, 0xdd, 0x8f, 0x8e, 0x9c, 0x6c, 0x67, 0x08, 0x1f, 0x33, 0x50, 0xbe, 0xb5, 0xc0, 0xc4, - 0x7d, 0x42, 0xf6, 0x19, 0x6b, 0xc0, 0x2f, 0x2d, 0x30, 0x13, 0xaf, 0x82, 0x16, 0x63, 0x8d, 0x2b, - 0xdd, 0xfd, 0x03, 0xc3, 0x62, 0x21, 0xb9, 0x4c, 0x14, 0xc2, 0xc8, 0x25, 0x10, 0x6f, 0x36, 0xc5, - 0x09, 0xfd, 0x65, 0x81, 0x7c, 0xb9, 0x5f, 0x72, 0xd0, 0x22, 0xbe, 0xa7, 0x27, 0x2e, 0x6e, 0xc0, - 0x2c, 0x18, 0x97, 0x54, 0x36, 0x88, 0xde, 0x80, 0x8e, 0xfe, 0x80, 0x6b, 0xe0, 0x86, 0x47, 0x84, - 0xcb, 0x69, 0x2b, 0xbe, 0x60, 0xa7, 0x5f, 0x04, 0x57, 0xc1, 0x75, 0x4e, 0x5c, 0xda, 0xa2, 0xc4, - 0x97, 0x7a, 0x53, 0x38, 0xb1, 0x00, 0xba, 0x20, 0x83, 0x9b, 0xc1, 0x3c, 0x4a, 0x07, 0xf1, 0x2f, - 0x0f, 0x8d, 0x3f, 0x08, 0xfe, 0x8e, 0x69, 0xc4, 0xf5, 0x2b, 0xc4, 0xa8, 0x03, 0x34, 0xd0, 0xdb, - 0x53, 0x9f, 0x9d, 0xdb, 0x29, 0x75, 0x07, 0x7f, 0xab, 0x7b, 0xf8, 0x74, 0x0c, 0x2c, 0xec, 0x92, - 0x06, 0xa9, 0x05, 0xd7, 0x24, 0x31, 0x97, 0xd4, 0xaf, 0xbd, 0xe5, 0x1f, 0x05, 0x53, 0xb2, 0xc5, - 0x49, 0x87, 0x32, 0xb5, 0x8e, 0xfa, 0x2b, 0xbe, 0x6f, 0x4a, 0x26, 0x0c, 0x90, 0x33, 0x13, 0x4a, - 0x4c, 0xbd, 0x57, 0xc1, 0xb8, 0x90, 0xf8, 0x98, 0x98, 0x62, 0x7f, 0x30, 0xf2, 0x56, 0x9c, 0xd2, - 0x8e, 0x02, 0x90, 0xe4, 0x16, 0xd4, 0xd0, 0x70, 0x0f, 0x64, 0xea, 0x84, 0xd6, 0xea, 0x3a, 0xa1, - 0xe9, 0xd2, 0xc6, 0x3f, 0x5d, 0x7b, 0xd6, 0xe5, 0x44, 0xcd, 0x7a, 0xbf, 0xa2, 0x55, 0x31, 0xe5, - 0x84, 0x02, 0x39, 0xe6, 0x30, 0xfa, 0xd7, 0x02, 0xcb, 0x26, 0x13, 0x94, 0xf9, 0x51, 0x4e, 0xcc, - 0x72, 0xc5, 0xe0, 0x66, 0x5c, 0xe6, 0x6a, 0x6d, 0x12, 0x21, 0xcc, 0xf3, 0xe7, 0xb5, 0x5e, 0xd7, - 0xce, 0x25, 0x3b, 0xc1, 0x98, 0x28, 0xca, 0x59, 0x43, 0x79, 0x47, 0x8b, 0x0e, 0x24, 0x57, 0xf3, - 0x2e, 0x9e, 0x27, 0x46, 0x0e, 0x29, 0xc8, 0x44, 0x6f, 0x9a, 0x17, 0x34, 0x89, 0x8d, 0x83, 0xed, - 0x49, 0x53, 0x03, 0x16, 0x3a, 0x1f, 0x03, 0xb7, 0xfe, 0xbf, 0xce, 0xdf, 0xa5, 0xb2, 0xbe, 0x4b, - 0x5a, 0x4c, 0x50, 0x09, 0x6f, 0x0f, 0x94, 0x7c, 0x69, 0x2e, 0xbe, 0x9c, 0x40, 0x8c, 0xc2, 0x26, - 0x78, 0x7d, 0x48, 0x13, 0x94, 0x16, 0x7b, 0x5d, 0x1b, 0x6a, 0xeb, 0x3e, 0x25, 0x1a, 0x6c, 0x8e, - 0xbb, 0x4f, 0x35, 0x47, 0x29, 0xdb, 0xeb, 0xda, 0x73, 0xe1, 0x6c, 0x37, 0x2a, 0xd4, 0xdf, 0x32, - 0x2f, 0xf7, 0xb5, 0x8c, 0x3a, 0x70, 0xb3, 0xd7, 0xb5, 0xa7, 0xf5, 0x01, 0x2d, 0x47, 0x61, 0xe1, - 0xc3, 0x57, 0xc1, 0x84, 0xa7, 0x63, 0xc9, 0x8d, 0x07, 0xb6, 0x30, 0x5e, 0x1c, 0x46, 0x81, 0x9c, - 0xd0, 0x24, 0x4e, 0x51, 0xe9, 0xe1, 0xf7, 0x17, 0x05, 0xeb, 0xf1, 0x45, 0xc1, 0x7a, 0x72, 0x51, - 0xb0, 0xfe, 0xbc, 0x28, 0x58, 0x8f, 0x2e, 0x0b, 0xa9, 0x27, 0x97, 0x85, 0xd4, 0x6f, 0x97, 0x85, - 0xd4, 0xfb, 0x5b, 0xcf, 0xcc, 0xff, 0xe9, 0xe0, 0xa3, 0x3e, 0xb8, 0x8e, 0x6a, 0x26, 0x78, 0x58, - 0xdf, 0xfb, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xd2, 0xb7, 0xb2, 0x68, 0xf8, 0x0b, 0x00, 0x00, + // 922 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xcf, 0x6f, 0x1b, 0xc5, + 0x17, 0xf7, 0x7c, 0xe3, 0x38, 0xe9, 0x6b, 0x9b, 0x7c, 0x99, 0x38, 0xa9, 0xe3, 0x56, 0x76, 0xb4, + 0x12, 0x10, 0x54, 0xc5, 0x69, 0xda, 0x5b, 0xc4, 0x25, 0x76, 0x82, 0xe0, 0xd4, 0x68, 0x83, 0x00, + 0x71, 0x59, 0x8d, 0x77, 0x27, 0xf6, 0x28, 0xbb, 0x33, 0xcb, 0xcc, 0xac, 0x93, 0x9e, 0x39, 0xf0, + 0xe3, 0x84, 0xc4, 0x05, 0x71, 0x40, 0x3d, 0x22, 0xce, 0xbd, 0x70, 0xe4, 0xd6, 0x63, 0xe9, 0x05, + 0xc4, 0x21, 0xa0, 0x44, 0x48, 0x88, 0xbf, 0x02, 0xcd, 0xce, 0x78, 0xd7, 0x81, 0x50, 0xf5, 0x10, + 0x8b, 0x93, 0x3d, 0xef, 0xcd, 0x7e, 0x7e, 0xbc, 0x79, 0xfb, 0x66, 0xa1, 0x13, 0x0a, 0x95, 0x08, + 0xb5, 0x19, 0x31, 0xa5, 0x25, 0xeb, 0x67, 0x9a, 0x09, 0xbe, 0x39, 0xda, 0xea, 0x53, 0x4d, 0xb6, + 0x2e, 0x04, 0x3b, 0xa9, 0x14, 0x5a, 0xe0, 0xdb, 0x76, 0x7f, 0xe7, 0x42, 0xca, 0xed, 0x6f, 0xd6, + 0x07, 0x62, 0x20, 0xf2, 0x7d, 0x9b, 0xe6, 0x9f, 0x7d, 0xa4, 0xd9, 0x72, 0x14, 0x7d, 0xa2, 0x68, + 0x01, 0x1d, 0x0a, 0xe6, 0x20, 0x9b, 0xab, 0x36, 0x1f, 0xd8, 0x07, 0x1d, 0x7e, 0xbe, 0xf0, 0x3e, + 0x99, 0x81, 0xda, 0x3e, 0x91, 0x24, 0x51, 0x98, 0xc0, 0xcd, 0x50, 0x24, 0x49, 0xc6, 0x99, 0x7e, + 0x14, 0x68, 0x72, 0xd2, 0x40, 0x6b, 0x68, 0xfd, 0x5a, 0xf7, 0xcd, 0xa7, 0xa7, 0xed, 0xca, 0x2f, + 0xa7, 0xed, 0xd7, 0x06, 0x4c, 0x0f, 0xb3, 0x7e, 0x27, 0x14, 0x89, 0x83, 0x70, 0x3f, 0x1b, 0x2a, + 0x3a, 0xda, 0xd4, 0x8f, 0x52, 0xaa, 0x3a, 0xbb, 0x34, 0x7c, 0xfe, 0x64, 0x03, 0x1c, 0xc3, 0x2e, + 0x0d, 0xfd, 0x1b, 0x05, 0xe4, 0xbb, 0xe4, 0x04, 0x73, 0xa8, 0x1b, 0x8d, 0x46, 0x48, 0x2a, 0x14, + 0x95, 0x81, 0xa4, 0xc7, 0x44, 0x46, 0x8d, 0xff, 0x5d, 0x01, 0x13, 0x36, 0xc8, 0xfb, 0x0e, 0xd8, + 0xcf, 0x71, 0x71, 0x0a, 0xcb, 0x7d, 0xc1, 0x33, 0xf5, 0x0f, 0xc2, 0x99, 0x2b, 0x20, 0x5c, 0xca, + 0xa1, 0xff, 0xc6, 0x78, 0x1f, 0x96, 0x8f, 0x99, 0x1e, 0x46, 0x92, 0x1c, 0x07, 0x24, 0x8a, 0x64, + 0x40, 0x39, 0xe9, 0xc7, 0x34, 0x6a, 0x54, 0xd7, 0xd0, 0xfa, 0xbc, 0xbf, 0x34, 0x4e, 0xee, 0x44, + 0x91, 0xdc, 0xb3, 0xa9, 0xed, 0xea, 0x57, 0x8f, 0xdb, 0x15, 0xef, 0x47, 0x04, 0xcd, 0xf7, 0x48, + 0xcc, 0x22, 0xa2, 0x85, 0x7c, 0x9b, 0x29, 0x2d, 0x24, 0x0b, 0x49, 0x6c, 0x71, 0x15, 0xfe, 0x0c, + 0xc1, 0xad, 0x30, 0x4b, 0xb2, 0x98, 0x68, 0x36, 0xa2, 0xce, 0x47, 0x20, 0x89, 0x66, 0xa2, 0x81, + 0xd6, 0x66, 0xd6, 0xaf, 0xdf, 0xbf, 0xe3, 0x3a, 0xad, 0x63, 0x0a, 0x31, 0xee, 0x18, 0xa3, 0xb4, + 0x27, 0x18, 0xef, 0x3e, 0x30, 0x5e, 0xbf, 0xfb, 0xb5, 0x7d, 0xf7, 0xe5, 0xbc, 0x9a, 0x67, 0x94, + 0xbf, 0x5c, 0x32, 0x5a, 0x1d, 0xbe, 0xe1, 0xc3, 0xaf, 0xc3, 0xa2, 0xa4, 0x87, 0x54, 0x52, 0x1e, + 0xd2, 0x20, 0x14, 0x19, 0xd7, 0xf9, 0x09, 0xde, 0xf4, 0x17, 0x8a, 0x70, 0xcf, 0x44, 0xbd, 0x6f, + 0x10, 0xdc, 0x2a, 0x3c, 0xf5, 0x32, 0x29, 0x29, 0xd7, 0x63, 0x43, 0x47, 0x30, 0x67, 0x4d, 0xa8, + 0xe9, 0xe9, 0x1f, 0x33, 0xe0, 0x15, 0xa8, 0xa5, 0x54, 0x32, 0x61, 0x5b, 0xad, 0xea, 0xbb, 0x95, + 0xf7, 0x25, 0x82, 0x56, 0x21, 0x70, 0x27, 0x74, 0x76, 0x69, 0xd4, 0x13, 0x49, 0xc2, 0x94, 0x62, + 0x82, 0xe3, 0x8f, 0x00, 0xc2, 0x62, 0x35, 0x3d, 0xa9, 0x13, 0x24, 0xde, 0xe7, 0x08, 0x6e, 0x17, + 0xaa, 0x1e, 0x66, 0x5a, 0x69, 0xc2, 0x23, 0xc6, 0x07, 0xff, 0x45, 0xe9, 0xbc, 0xaf, 0x11, 0x2c, + 0x15, 0x62, 0x0e, 0x62, 0xa2, 0x86, 0x7b, 0x23, 0xca, 0x35, 0x7e, 0x03, 0xfe, 0x3f, 0x1a, 0x87, + 0x03, 0x57, 0x5c, 0x94, 0x17, 0x77, 0xb1, 0x88, 0xef, 0xe7, 0x61, 0xfc, 0x01, 0xcc, 0x1f, 0x4a, + 0x12, 0x9a, 0x49, 0x76, 0x25, 0xaf, 0x7a, 0x81, 0x66, 0x2a, 0x55, 0xbf, 0x44, 0x9c, 0xc2, 0x31, + 0xac, 0x94, 0xea, 0x94, 0x49, 0x04, 0x34, 0xcf, 0xb8, 0x8a, 0xdd, 0xeb, 0xbc, 0x60, 0xcc, 0x76, + 0x2e, 0x81, 0xec, 0x56, 0x8d, 0x64, 0xbf, 0x3e, 0xba, 0x84, 0xcd, 0xbd, 0xc1, 0x1f, 0x23, 0x98, + 0x7b, 0x8b, 0xd2, 0x7d, 0x21, 0x62, 0x7c, 0x02, 0x0b, 0xe5, 0x30, 0x4d, 0x85, 0x88, 0xa7, 0x77, + 0x52, 0xe5, 0xd4, 0x36, 0xcc, 0xde, 0xef, 0x08, 0x9a, 0xbd, 0xc9, 0xc8, 0x41, 0x4a, 0x79, 0x64, + 0xc7, 0x14, 0x89, 0x71, 0x1d, 0x66, 0x35, 0xd3, 0x31, 0xb5, 0xd3, 0xdd, 0xb7, 0x0b, 0xbc, 0x06, + 0xd7, 0x23, 0xaa, 0x42, 0xc9, 0xd2, 0xf2, 0x90, 0xfc, 0xc9, 0x10, 0xbe, 0x03, 0xd7, 0x24, 0x0d, + 0x59, 0xca, 0x28, 0xd7, 0x76, 0x7c, 0xfa, 0x65, 0x00, 0x87, 0x50, 0x23, 0x49, 0x3e, 0x08, 0xaa, + 0xb9, 0xcd, 0xd5, 0x4b, 0x6d, 0xe6, 0x1e, 0xef, 0x39, 0x8f, 0xeb, 0x2f, 0xe1, 0xd1, 0x1a, 0x74, + 0xd0, 0xdb, 0x37, 0x3e, 0x7d, 0xdc, 0xae, 0x98, 0x4a, 0xff, 0x61, 0xaa, 0xfd, 0x03, 0x82, 0xe5, + 0x5d, 0x1a, 0xd3, 0x41, 0x7e, 0x18, 0x9a, 0x48, 0xcd, 0xf8, 0xe0, 0x1d, 0x7e, 0x98, 0x8f, 0xa7, + 0x54, 0xd2, 0x11, 0x13, 0x66, 0xf0, 0x4f, 0x36, 0xe6, 0xc2, 0x38, 0xec, 0xfa, 0xd2, 0x87, 0x59, + 0xa5, 0xc9, 0x11, 0xbd, 0x92, 0xa6, 0xb4, 0x50, 0xf8, 0x2e, 0xd4, 0x86, 0x94, 0x0d, 0x86, 0xb6, + 0x48, 0xd5, 0xee, 0xd2, 0x9f, 0xa7, 0xed, 0xc5, 0x50, 0x52, 0x33, 0x38, 0x79, 0x60, 0x53, 0xbe, + 0xdb, 0xe2, 0xfd, 0x84, 0x60, 0xd5, 0x79, 0x60, 0x82, 0x17, 0x6e, 0xdc, 0x5d, 0xb2, 0x07, 0xaf, + 0x94, 0x3d, 0x6c, 0x2e, 0x13, 0xaa, 0x94, 0xbb, 0x94, 0x1b, 0xcf, 0x9f, 0x6c, 0xd4, 0x1d, 0xf9, + 0x8e, 0xcd, 0x1c, 0x68, 0x69, 0x46, 0x44, 0xf9, 0x52, 0xba, 0x38, 0x66, 0x50, 0x2b, 0xae, 0xd9, + 0x29, 0xb5, 0xa0, 0x23, 0xd8, 0x9e, 0x77, 0x27, 0x84, 0xbc, 0xef, 0x11, 0xbc, 0xfa, 0xef, 0x5d, + 0xf8, 0x3e, 0xd3, 0xc3, 0x5d, 0x9a, 0x0a, 0xc5, 0xf4, 0x94, 0x1a, 0x72, 0x65, 0xa2, 0x21, 0x4d, + 0xca, 0xad, 0x70, 0x03, 0xe6, 0x22, 0x4b, 0xdc, 0x98, 0xcd, 0x13, 0xe3, 0x65, 0xa9, 0xbd, 0xfb, + 0xf0, 0xdb, 0xb3, 0x16, 0x7a, 0x7a, 0xd6, 0x42, 0xcf, 0xce, 0x5a, 0xe8, 0xb7, 0xb3, 0x16, 0xfa, + 0xe2, 0xbc, 0x55, 0x79, 0x76, 0xde, 0xaa, 0xfc, 0x7c, 0xde, 0xaa, 0x7c, 0xb8, 0xf5, 0xc2, 0xc2, + 0x9c, 0x5c, 0xfc, 0xce, 0xcb, 0xeb, 0xd4, 0xaf, 0xe5, 0xdf, 0x5a, 0x0f, 0xfe, 0x0a, 0x00, 0x00, + 0xff, 0xff, 0x68, 0x12, 0x5a, 0x76, 0x0b, 0x0a, 0x00, 0x00, } func (this *Params) Equal(that interface{}) bool { diff --git a/x/distribution/types/genesis.pb.go b/x/distribution/types/genesis.pb.go index 6f9451fe6..a1f2d7ba7 100644 --- a/x/distribution/types/genesis.pb.go +++ b/x/distribution/types/genesis.pb.go @@ -31,9 +31,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // default withdraw addresses. type DelegatorWithdrawInfo struct { // delegator_address is the address of the delegator. - DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty" yaml:"delegator_address"` + DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` // withdraw_address is the address to withdraw the delegation rewards to. - WithdrawAddress string `protobuf:"bytes,2,opt,name=withdraw_address,json=withdrawAddress,proto3" json:"withdraw_address,omitempty" yaml:"withdraw_address"` + WithdrawAddress string `protobuf:"bytes,2,opt,name=withdraw_address,json=withdrawAddress,proto3" json:"withdraw_address,omitempty"` } func (m *DelegatorWithdrawInfo) Reset() { *m = DelegatorWithdrawInfo{} } @@ -72,9 +72,9 @@ var xxx_messageInfo_DelegatorWithdrawInfo proto.InternalMessageInfo // ValidatorOutstandingRewardsRecord is used for import/export via genesis json. type ValidatorOutstandingRewardsRecord struct { // validator_address is the address of the validator. - ValidatorAddress string `protobuf:"bytes,1,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty" yaml:"validator_address"` + ValidatorAddress string `protobuf:"bytes,1,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` // outstanding_rewards represents the oustanding rewards of a validator. - OutstandingRewards github_com_cosmos_cosmos_sdk_types.DecCoins `protobuf:"bytes,2,rep,name=outstanding_rewards,json=outstandingRewards,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.DecCoins" json:"outstanding_rewards" yaml:"outstanding_rewards"` + OutstandingRewards github_com_cosmos_cosmos_sdk_types.DecCoins `protobuf:"bytes,2,rep,name=outstanding_rewards,json=outstandingRewards,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.DecCoins" json:"outstanding_rewards"` } func (m *ValidatorOutstandingRewardsRecord) Reset() { *m = ValidatorOutstandingRewardsRecord{} } @@ -114,9 +114,9 @@ var xxx_messageInfo_ValidatorOutstandingRewardsRecord proto.InternalMessageInfo // json. type ValidatorAccumulatedCommissionRecord struct { // validator_address is the address of the validator. - ValidatorAddress string `protobuf:"bytes,1,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty" yaml:"validator_address"` + ValidatorAddress string `protobuf:"bytes,1,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` // accumulated is the accumulated commission of a validator. - Accumulated ValidatorAccumulatedCommission `protobuf:"bytes,2,opt,name=accumulated,proto3" json:"accumulated" yaml:"accumulated"` + Accumulated ValidatorAccumulatedCommission `protobuf:"bytes,2,opt,name=accumulated,proto3" json:"accumulated"` } func (m *ValidatorAccumulatedCommissionRecord) Reset() { *m = ValidatorAccumulatedCommissionRecord{} } @@ -156,11 +156,11 @@ var xxx_messageInfo_ValidatorAccumulatedCommissionRecord proto.InternalMessageIn // json. type ValidatorHistoricalRewardsRecord struct { // validator_address is the address of the validator. - ValidatorAddress string `protobuf:"bytes,1,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty" yaml:"validator_address"` + ValidatorAddress string `protobuf:"bytes,1,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` // period defines the period the historical rewards apply to. Period uint64 `protobuf:"varint,2,opt,name=period,proto3" json:"period,omitempty"` // rewards defines the historical rewards of a validator. - Rewards ValidatorHistoricalRewards `protobuf:"bytes,3,opt,name=rewards,proto3" json:"rewards" yaml:"rewards"` + Rewards ValidatorHistoricalRewards `protobuf:"bytes,3,opt,name=rewards,proto3" json:"rewards"` } func (m *ValidatorHistoricalRewardsRecord) Reset() { *m = ValidatorHistoricalRewardsRecord{} } @@ -199,9 +199,9 @@ var xxx_messageInfo_ValidatorHistoricalRewardsRecord proto.InternalMessageInfo // ValidatorCurrentRewardsRecord is used for import / export via genesis json. type ValidatorCurrentRewardsRecord struct { // validator_address is the address of the validator. - ValidatorAddress string `protobuf:"bytes,1,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty" yaml:"validator_address"` + ValidatorAddress string `protobuf:"bytes,1,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` // rewards defines the current rewards of a validator. - Rewards ValidatorCurrentRewards `protobuf:"bytes,2,opt,name=rewards,proto3" json:"rewards" yaml:"rewards"` + Rewards ValidatorCurrentRewards `protobuf:"bytes,2,opt,name=rewards,proto3" json:"rewards"` } func (m *ValidatorCurrentRewardsRecord) Reset() { *m = ValidatorCurrentRewardsRecord{} } @@ -240,11 +240,11 @@ var xxx_messageInfo_ValidatorCurrentRewardsRecord proto.InternalMessageInfo // DelegatorStartingInfoRecord used for import / export via genesis json. type DelegatorStartingInfoRecord struct { // delegator_address is the address of the delegator. - DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty" yaml:"delegator_address"` + DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` // validator_address is the address of the validator. - ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty" yaml:"validator_address"` + ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` // starting_info defines the starting info of a delegator. - StartingInfo DelegatorStartingInfo `protobuf:"bytes,3,opt,name=starting_info,json=startingInfo,proto3" json:"starting_info" yaml:"starting_info"` + StartingInfo DelegatorStartingInfo `protobuf:"bytes,3,opt,name=starting_info,json=startingInfo,proto3" json:"starting_info"` } func (m *DelegatorStartingInfoRecord) Reset() { *m = DelegatorStartingInfoRecord{} } @@ -283,13 +283,13 @@ var xxx_messageInfo_DelegatorStartingInfoRecord proto.InternalMessageInfo // ValidatorSlashEventRecord is used for import / export via genesis json. type ValidatorSlashEventRecord struct { // validator_address is the address of the validator. - ValidatorAddress string `protobuf:"bytes,1,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty" yaml:"validator_address"` + ValidatorAddress string `protobuf:"bytes,1,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` // height defines the block height at which the slash event occured. Height uint64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` // period is the period of the slash event. Period uint64 `protobuf:"varint,3,opt,name=period,proto3" json:"period,omitempty"` // validator_slash_event describes the slash event. - ValidatorSlashEvent ValidatorSlashEvent `protobuf:"bytes,4,opt,name=validator_slash_event,json=validatorSlashEvent,proto3" json:"validator_slash_event" yaml:"event"` + ValidatorSlashEvent ValidatorSlashEvent `protobuf:"bytes,4,opt,name=validator_slash_event,json=validatorSlashEvent,proto3" json:"validator_slash_event"` } func (m *ValidatorSlashEventRecord) Reset() { *m = ValidatorSlashEventRecord{} } @@ -328,25 +328,25 @@ var xxx_messageInfo_ValidatorSlashEventRecord proto.InternalMessageInfo // GenesisState defines the distribution module's genesis state. type GenesisState struct { // params defines all the paramaters of the module. - Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params" yaml:"params"` + Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` // fee_pool defines the fee pool at genesis. - FeePool FeePool `protobuf:"bytes,2,opt,name=fee_pool,json=feePool,proto3" json:"fee_pool" yaml:"fee_pool"` + FeePool FeePool `protobuf:"bytes,2,opt,name=fee_pool,json=feePool,proto3" json:"fee_pool"` // fee_pool defines the delegator withdraw infos at genesis. - DelegatorWithdrawInfos []DelegatorWithdrawInfo `protobuf:"bytes,3,rep,name=delegator_withdraw_infos,json=delegatorWithdrawInfos,proto3" json:"delegator_withdraw_infos" yaml:"delegator_withdraw_infos"` + DelegatorWithdrawInfos []DelegatorWithdrawInfo `protobuf:"bytes,3,rep,name=delegator_withdraw_infos,json=delegatorWithdrawInfos,proto3" json:"delegator_withdraw_infos"` // fee_pool defines the previous proposer at genesis. - PreviousProposer string `protobuf:"bytes,4,opt,name=previous_proposer,json=previousProposer,proto3" json:"previous_proposer,omitempty" yaml:"previous_proposer"` + PreviousProposer string `protobuf:"bytes,4,opt,name=previous_proposer,json=previousProposer,proto3" json:"previous_proposer,omitempty"` // fee_pool defines the outstanding rewards of all validators at genesis. - OutstandingRewards []ValidatorOutstandingRewardsRecord `protobuf:"bytes,5,rep,name=outstanding_rewards,json=outstandingRewards,proto3" json:"outstanding_rewards" yaml:"outstanding_rewards"` + OutstandingRewards []ValidatorOutstandingRewardsRecord `protobuf:"bytes,5,rep,name=outstanding_rewards,json=outstandingRewards,proto3" json:"outstanding_rewards"` // fee_pool defines the accumulated commisions of all validators at genesis. - ValidatorAccumulatedCommissions []ValidatorAccumulatedCommissionRecord `protobuf:"bytes,6,rep,name=validator_accumulated_commissions,json=validatorAccumulatedCommissions,proto3" json:"validator_accumulated_commissions" yaml:"validator_accumulated_commissions"` + ValidatorAccumulatedCommissions []ValidatorAccumulatedCommissionRecord `protobuf:"bytes,6,rep,name=validator_accumulated_commissions,json=validatorAccumulatedCommissions,proto3" json:"validator_accumulated_commissions"` // fee_pool defines the historical rewards of all validators at genesis. - ValidatorHistoricalRewards []ValidatorHistoricalRewardsRecord `protobuf:"bytes,7,rep,name=validator_historical_rewards,json=validatorHistoricalRewards,proto3" json:"validator_historical_rewards" yaml:"validator_historical_rewards"` + ValidatorHistoricalRewards []ValidatorHistoricalRewardsRecord `protobuf:"bytes,7,rep,name=validator_historical_rewards,json=validatorHistoricalRewards,proto3" json:"validator_historical_rewards"` // fee_pool defines the current rewards of all validators at genesis. - ValidatorCurrentRewards []ValidatorCurrentRewardsRecord `protobuf:"bytes,8,rep,name=validator_current_rewards,json=validatorCurrentRewards,proto3" json:"validator_current_rewards" yaml:"validator_current_rewards"` + ValidatorCurrentRewards []ValidatorCurrentRewardsRecord `protobuf:"bytes,8,rep,name=validator_current_rewards,json=validatorCurrentRewards,proto3" json:"validator_current_rewards"` // fee_pool defines the delegator starting infos at genesis. - DelegatorStartingInfos []DelegatorStartingInfoRecord `protobuf:"bytes,9,rep,name=delegator_starting_infos,json=delegatorStartingInfos,proto3" json:"delegator_starting_infos" yaml:"delegator_starting_infos"` + DelegatorStartingInfos []DelegatorStartingInfoRecord `protobuf:"bytes,9,rep,name=delegator_starting_infos,json=delegatorStartingInfos,proto3" json:"delegator_starting_infos"` // fee_pool defines the validator slash events at genesis. - ValidatorSlashEvents []ValidatorSlashEventRecord `protobuf:"bytes,10,rep,name=validator_slash_events,json=validatorSlashEvents,proto3" json:"validator_slash_events" yaml:"validator_slash_events"` + ValidatorSlashEvents []ValidatorSlashEventRecord `protobuf:"bytes,10,rep,name=validator_slash_events,json=validatorSlashEvents,proto3" json:"validator_slash_events"` } func (m *GenesisState) Reset() { *m = GenesisState{} } @@ -398,73 +398,63 @@ func init() { } var fileDescriptor_76eed0f9489db580 = []byte{ - // 1048 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcf, 0x6f, 0x1b, 0x45, - 0x14, 0xf6, 0x3a, 0x25, 0x49, 0xc7, 0x29, 0x2d, 0x5b, 0x27, 0x71, 0xdc, 0xd4, 0x9b, 0x6e, 0x8b, - 0x08, 0xaa, 0xba, 0x6e, 0xd2, 0x0a, 0x50, 0x10, 0x48, 0xd9, 0x94, 0x5f, 0xa7, 0x86, 0x8d, 0x04, - 0x88, 0x03, 0xd6, 0x78, 0x77, 0x6c, 0x8f, 0xb0, 0x77, 0xac, 0x99, 0xb1, 0x43, 0xf8, 0x0b, 0x38, - 0x21, 0x04, 0xe2, 0xc4, 0x81, 0x1c, 0x11, 0xe2, 0x46, 0xef, 0x5c, 0x7b, 0xac, 0x38, 0x71, 0x0a, - 0x28, 0xe9, 0x81, 0x73, 0xc4, 0x1f, 0x80, 0x76, 0x66, 0xf6, 0x97, 0xbd, 0x5e, 0x9c, 0x02, 0x39, - 0x25, 0xbb, 0x7e, 0xf3, 0x7d, 0xdf, 0xfb, 0xe6, 0xbd, 0x99, 0xb7, 0xe0, 0x65, 0x97, 0xb0, 0x1e, - 0x61, 0x75, 0x0f, 0x33, 0x4e, 0x71, 0x73, 0xc0, 0x31, 0xf1, 0xeb, 0xc3, 0x8d, 0x26, 0xe2, 0x70, - 0xa3, 0xde, 0x46, 0x3e, 0x62, 0x98, 0x59, 0x7d, 0x4a, 0x38, 0xd1, 0xaf, 0xc9, 0x50, 0x2b, 0x19, - 0x6a, 0xa9, 0xd0, 0x6a, 0xb9, 0x4d, 0xda, 0x44, 0xc4, 0xd5, 0x83, 0xff, 0xe4, 0x92, 0x6a, 0x4d, - 0xa1, 0x37, 0x21, 0x43, 0x11, 0xaa, 0x4b, 0xb0, 0xaf, 0x7e, 0xb7, 0xf2, 0xd8, 0x53, 0x3c, 0x32, - 0x7e, 0x45, 0xc6, 0x37, 0x24, 0x91, 0xd2, 0x23, 0x1e, 0xcc, 0xa7, 0x1a, 0x58, 0x7c, 0x80, 0xba, - 0xa8, 0x0d, 0x39, 0xa1, 0x1f, 0x62, 0xde, 0xf1, 0x28, 0xdc, 0x7f, 0xcf, 0x6f, 0x11, 0x1d, 0x82, - 0x17, 0xbc, 0xf0, 0x87, 0x06, 0xf4, 0x3c, 0x8a, 0x18, 0xab, 0x68, 0x6b, 0xda, 0xfa, 0x45, 0xfb, - 0xfe, 0xe9, 0x91, 0x51, 0x39, 0x80, 0xbd, 0xee, 0x96, 0x39, 0x16, 0x62, 0xfe, 0xfa, 0xe8, 0x4e, - 0x59, 0x51, 0x6c, 0xcb, 0x57, 0x7b, 0x9c, 0x62, 0xbf, 0xed, 0x5c, 0x89, 0x62, 0xd5, 0x7b, 0xfd, - 0x13, 0x70, 0x65, 0x5f, 0x51, 0x46, 0x0c, 0x45, 0xc1, 0x70, 0xef, 0xf4, 0xc8, 0x58, 0x96, 0x0c, - 0xa3, 0x11, 0x93, 0x09, 0x2e, 0x87, 0xa1, 0xea, 0xf5, 0xd6, 0xfc, 0x17, 0x87, 0x46, 0xe1, 0xcf, - 0x43, 0xa3, 0x60, 0xfe, 0x5c, 0x04, 0x37, 0x3e, 0x80, 0x5d, 0xec, 0x05, 0xf4, 0x0f, 0x07, 0x9c, - 0x71, 0xe8, 0x7b, 0xc1, 0x1a, 0xb4, 0x0f, 0xa9, 0xc7, 0x1c, 0xe4, 0x12, 0xea, 0x05, 0x29, 0x0f, - 0xc3, 0xa0, 0xc9, 0x29, 0x8f, 0x85, 0xe4, 0xa4, 0x1c, 0xc5, 0x86, 0x29, 0x1f, 0x6a, 0xe0, 0x2a, - 0x89, 0xf9, 0x1b, 0x54, 0x0a, 0xa8, 0x14, 0xd7, 0x66, 0xd6, 0x4b, 0x9b, 0xab, 0x6a, 0x67, 0xad, - 0x60, 0xe7, 0xc3, 0x22, 0xb1, 0x1e, 0x20, 0x77, 0x87, 0x60, 0xdf, 0x7e, 0xff, 0xf1, 0x91, 0x51, - 0x38, 0x3d, 0x32, 0xaa, 0x52, 0x47, 0x06, 0x8c, 0xf9, 0xe3, 0xef, 0xc6, 0xed, 0x36, 0xe6, 0x9d, - 0x41, 0xd3, 0x72, 0x49, 0x4f, 0x6d, 0xb5, 0xfa, 0x73, 0x87, 0x79, 0x9f, 0xd6, 0xf9, 0x41, 0x1f, - 0xb1, 0x10, 0x91, 0x39, 0x3a, 0x19, 0xf3, 0x22, 0xe1, 0xda, 0x97, 0x45, 0x70, 0x2b, 0x72, 0x6d, - 0xdb, 0x75, 0x07, 0xbd, 0x41, 0x17, 0x72, 0xe4, 0xed, 0x90, 0x5e, 0x0f, 0x33, 0x86, 0x89, 0x7f, - 0x7e, 0xc6, 0x1d, 0x80, 0x12, 0x8c, 0x15, 0x88, 0x32, 0x29, 0x6d, 0xbe, 0x6e, 0xe5, 0x34, 0x97, - 0x95, 0x2f, 0xdd, 0xae, 0x2a, 0x3b, 0x75, 0xa9, 0x2e, 0x81, 0x6e, 0x3a, 0x49, 0xae, 0x84, 0x21, - 0x5f, 0x17, 0xc1, 0x5a, 0x84, 0xfa, 0x2e, 0x66, 0x9c, 0x50, 0xec, 0xc2, 0xee, 0xb9, 0x57, 0xd1, - 0x12, 0x98, 0xed, 0x23, 0x8a, 0x89, 0xf4, 0xe1, 0x82, 0xa3, 0x9e, 0x74, 0x0c, 0xe6, 0xc2, 0x82, - 0x9a, 0x11, 0x06, 0xbd, 0x3a, 0x9d, 0x41, 0x63, 0xa9, 0xd8, 0x4b, 0xca, 0x9c, 0xe7, 0xa5, 0xda, - 0xb0, 0xbe, 0x9c, 0x10, 0x3f, 0x61, 0xca, 0x5f, 0x1a, 0xb8, 0x1e, 0x21, 0xed, 0x0c, 0x28, 0x45, - 0x3e, 0x3f, 0x77, 0x47, 0x5a, 0x71, 0xe6, 0xb2, 0x34, 0xee, 0x4f, 0x97, 0x79, 0x5a, 0xef, 0x59, - 0xd2, 0x7e, 0x5a, 0x04, 0xd7, 0xa2, 0x93, 0x73, 0x8f, 0x43, 0xca, 0xb1, 0xdf, 0x0e, 0x4e, 0xce, - 0x38, 0xe9, 0xff, 0xfb, 0xfc, 0xcc, 0xf4, 0xb5, 0xf8, 0x9f, 0xfa, 0x3a, 0x00, 0x97, 0x98, 0xca, - 0xad, 0x81, 0xfd, 0x16, 0x51, 0x75, 0xb5, 0x99, 0xeb, 0x6e, 0xa6, 0x2d, 0xf6, 0xaa, 0xf2, 0xb6, - 0x2c, 0x65, 0xa5, 0x60, 0x4d, 0x67, 0x81, 0x25, 0x62, 0x13, 0x36, 0x3f, 0x2a, 0x82, 0x95, 0x68, - 0xb7, 0xf6, 0xba, 0x90, 0x75, 0xde, 0x1a, 0x8a, 0x0d, 0x3b, 0xc7, 0x5e, 0xeb, 0x20, 0xdc, 0xee, - 0xf0, 0xb0, 0xd7, 0xe4, 0x53, 0xa2, 0x07, 0x67, 0x52, 0x3d, 0xf8, 0x39, 0x58, 0x8c, 0xf9, 0x58, - 0x20, 0xb8, 0x81, 0x02, 0xc5, 0x95, 0x0b, 0xc2, 0xb9, 0xbb, 0xd3, 0xd5, 0x65, 0x9c, 0xa9, 0x5d, - 0x56, 0xbe, 0x2d, 0xc8, 0x64, 0x04, 0x98, 0xe9, 0x5c, 0x1d, 0x8e, 0x87, 0x26, 0x6c, 0xfb, 0xbe, - 0x04, 0x16, 0xde, 0x91, 0x73, 0xc8, 0x1e, 0x87, 0x1c, 0xe9, 0x0e, 0x98, 0xed, 0x43, 0x0a, 0x7b, - 0xd2, 0x9e, 0xd2, 0xe6, 0xcd, 0x5c, 0x1d, 0xbb, 0x22, 0xd4, 0x5e, 0x54, 0xd4, 0x97, 0x24, 0xb5, - 0x04, 0x30, 0x1d, 0x85, 0xa4, 0x7f, 0x04, 0xe6, 0x5b, 0x08, 0x35, 0xfa, 0x84, 0x74, 0x55, 0xd7, - 0xdd, 0xca, 0x45, 0x7d, 0x1b, 0xa1, 0x5d, 0x42, 0xba, 0xf6, 0xb2, 0x82, 0xbd, 0x2c, 0x61, 0x43, - 0x0c, 0xd3, 0x99, 0x6b, 0xc9, 0x08, 0xfd, 0x5b, 0x0d, 0x54, 0xe2, 0xd6, 0x88, 0x46, 0x80, 0xa0, - 0x54, 0x82, 0xa3, 0x6d, 0x66, 0xfa, 0x12, 0x4c, 0xce, 0x34, 0xf6, 0x4b, 0x8a, 0xd8, 0x18, 0x6d, - 0xbe, 0x34, 0x83, 0xe9, 0x2c, 0x79, 0x59, 0xeb, 0x45, 0xc7, 0xf5, 0x29, 0x1a, 0x62, 0x32, 0x10, - 0xd3, 0x54, 0x9f, 0x30, 0x44, 0xc5, 0xc6, 0xa6, 0xea, 0x6d, 0x2c, 0x24, 0xa7, 0xde, 0xc2, 0xd8, - 0x5d, 0x15, 0xaa, 0x7f, 0x33, 0x61, 0x42, 0x78, 0x4e, 0x64, 0xfd, 0xe6, 0x74, 0xe5, 0x33, 0x69, - 0xc4, 0xb1, 0xcd, 0x7f, 0x9e, 0x21, 0xb2, 0x86, 0x02, 0xfd, 0x17, 0x0d, 0xdc, 0x48, 0xb4, 0x51, - 0x7c, 0x3b, 0x36, 0xdc, 0xe8, 0x46, 0x65, 0x95, 0x59, 0xa1, 0x71, 0xfb, 0x5f, 0xdc, 0xca, 0x4a, - 0xe6, 0x5d, 0x25, 0x73, 0x7d, 0xac, 0x81, 0xb3, 0x99, 0x4d, 0xc7, 0x18, 0xe6, 0xe2, 0x32, 0xfd, - 0x27, 0x0d, 0xac, 0xc6, 0x38, 0x9d, 0xe8, 0xc6, 0x8b, 0x0c, 0x9e, 0x13, 0xe2, 0xdf, 0x78, 0xc6, - 0x1b, 0x53, 0x09, 0xbf, 0xad, 0x84, 0xdf, 0x1c, 0x15, 0x3e, 0x4e, 0x68, 0x3a, 0xd5, 0xe1, 0x44, - 0xb8, 0x60, 0x50, 0x5c, 0x89, 0x57, 0xbb, 0xf2, 0x9a, 0x8a, 0xb4, 0xce, 0x0b, 0xad, 0x5b, 0xcf, - 0x72, 0xc7, 0x29, 0xa1, 0xeb, 0x4a, 0xe8, 0xda, 0xa8, 0xd0, 0x11, 0x2a, 0xd3, 0x59, 0x1e, 0x66, - 0x03, 0xe9, 0xdf, 0xa5, 0x9a, 0x34, 0x75, 0x9e, 0xb3, 0xca, 0x45, 0xa1, 0xf0, 0xb5, 0xb3, 0xdf, - 0x13, 0x4a, 0xdf, 0xc4, 0x56, 0x4d, 0xf3, 0x24, 0x5b, 0x35, 0x89, 0xc2, 0x82, 0x3e, 0x5a, 0xca, - 0x3c, 0x88, 0x59, 0x05, 0x08, 0x6d, 0xaf, 0x9c, 0xf5, 0x24, 0x56, 0xca, 0x5e, 0x54, 0xca, 0xae, - 0x8f, 0x3a, 0x97, 0xe4, 0x30, 0x9d, 0x72, 0xc6, 0x01, 0x9d, 0x98, 0x1f, 0xec, 0x87, 0x3f, 0x1c, - 0xd7, 0xb4, 0xc7, 0xc7, 0x35, 0xed, 0xc9, 0x71, 0x4d, 0xfb, 0xe3, 0xb8, 0xa6, 0x7d, 0x75, 0x52, - 0x2b, 0x3c, 0x39, 0xa9, 0x15, 0x7e, 0x3b, 0xa9, 0x15, 0x3e, 0xde, 0xc8, 0x9d, 0xe2, 0x3f, 0x4b, - 0x7f, 0xfa, 0x89, 0xa1, 0xbe, 0x39, 0x2b, 0xbe, 0xe8, 0xee, 0xfd, 0x1d, 0x00, 0x00, 0xff, 0xff, - 0x35, 0x86, 0xdd, 0xee, 0x9c, 0x0e, 0x00, 0x00, + // 896 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcd, 0x6e, 0xeb, 0x44, + 0x14, 0x8e, 0x93, 0x92, 0x9b, 0x3b, 0xb9, 0x88, 0x8b, 0x6f, 0x6f, 0x71, 0x7b, 0x8b, 0xd3, 0x96, + 0x2e, 0x8a, 0x50, 0x1d, 0x9a, 0x22, 0x40, 0x45, 0x20, 0x25, 0x69, 0xf9, 0x59, 0xb5, 0x4a, 0x10, + 0x95, 0x90, 0x50, 0x34, 0xb1, 0x27, 0xce, 0x40, 0xe2, 0x89, 0x66, 0xc6, 0x6e, 0x91, 0x58, 0x21, + 0x21, 0x75, 0x89, 0x04, 0x0f, 0xd0, 0x25, 0x42, 0x62, 0xc7, 0x33, 0xa0, 0x2e, 0x2b, 0x56, 0x2c, + 0x50, 0x41, 0x29, 0x0b, 0x5e, 0x81, 0x1d, 0xf2, 0x78, 0xfc, 0xa7, 0xba, 0x26, 0x2d, 0xed, 0xaa, + 0x1d, 0xcf, 0xf9, 0xf9, 0xbe, 0x73, 0xbe, 0x9c, 0x33, 0xe0, 0x55, 0x93, 0xb0, 0x31, 0x61, 0x75, + 0x0b, 0x33, 0x4e, 0x71, 0xdf, 0xe5, 0x98, 0x38, 0x75, 0x6f, 0xab, 0x8f, 0x38, 0xdc, 0xaa, 0xdb, + 0xc8, 0x41, 0x0c, 0x33, 0x63, 0x42, 0x09, 0x27, 0xea, 0xb3, 0xc0, 0xd4, 0x48, 0x9a, 0x1a, 0xd2, + 0x74, 0x69, 0xde, 0x26, 0x36, 0x11, 0x76, 0x75, 0xff, 0xbf, 0xc0, 0x65, 0x49, 0x97, 0xd1, 0xfb, + 0x90, 0xa1, 0x28, 0xaa, 0x49, 0xb0, 0x23, 0xef, 0x8d, 0xbc, 0xec, 0xa9, 0x3c, 0x81, 0xfd, 0x62, + 0x60, 0xdf, 0x0b, 0x12, 0x49, 0x3c, 0xe2, 0xb0, 0xf6, 0x93, 0x02, 0x9e, 0xee, 0xa2, 0x11, 0xb2, + 0x21, 0x27, 0xf4, 0x10, 0xf3, 0xa1, 0x45, 0xe1, 0xd1, 0x47, 0xce, 0x80, 0xa8, 0x7b, 0xe0, 0x45, + 0x2b, 0xbc, 0xe8, 0x41, 0xcb, 0xa2, 0x88, 0x31, 0x4d, 0x59, 0x51, 0x36, 0x1e, 0xb6, 0xb4, 0x5f, + 0x7f, 0xde, 0x9c, 0x97, 0x61, 0x9a, 0xc1, 0x4d, 0x97, 0x53, 0xec, 0xd8, 0x9d, 0xc7, 0x91, 0x8b, + 0xfc, 0xae, 0xb6, 0xc1, 0xe3, 0x23, 0x19, 0x36, 0x8a, 0x52, 0xfc, 0x8f, 0x28, 0x2f, 0x84, 0x1e, + 0xf2, 0xf3, 0x4e, 0xe5, 0xe4, 0xb4, 0x56, 0xf8, 0xfb, 0xb4, 0x56, 0x58, 0xfb, 0x47, 0x01, 0xab, + 0x9f, 0xc0, 0x11, 0xb6, 0xfc, 0x1c, 0xfb, 0x2e, 0x67, 0x1c, 0x3a, 0x96, 0xef, 0x83, 0x8e, 0x20, + 0xb5, 0x58, 0x07, 0x99, 0x84, 0x5a, 0x3e, 0x76, 0x2f, 0x34, 0x9a, 0x1d, 0x7b, 0xe4, 0x12, 0x62, + 0xff, 0x5a, 0x01, 0x4f, 0x48, 0x9c, 0xa3, 0x47, 0x83, 0x24, 0x5a, 0x71, 0xa5, 0xb4, 0x51, 0x6d, + 0x2c, 0xcb, 0x36, 0x18, 0x7e, 0x9b, 0xc2, 0x8e, 0x1a, 0xbb, 0xc8, 0x6c, 0x13, 0xec, 0xb4, 0xb6, + 0xcf, 0x2e, 0x6a, 0x85, 0x1f, 0xff, 0xa8, 0xbd, 0x66, 0x63, 0x3e, 0x74, 0xfb, 0x86, 0x49, 0xc6, + 0xb2, 0xf2, 0xf2, 0xcf, 0x26, 0xb3, 0xbe, 0xa8, 0xf3, 0x2f, 0x27, 0x88, 0x85, 0x3e, 0xac, 0xa3, + 0x92, 0x2b, 0x8c, 0x12, 0xdc, 0x7f, 0x57, 0xc0, 0x7a, 0xc4, 0xbd, 0x69, 0x9a, 0xee, 0xd8, 0x1d, + 0x41, 0x8e, 0xac, 0x36, 0x19, 0x8f, 0x31, 0x63, 0x98, 0x38, 0x77, 0x4b, 0xdf, 0x04, 0x55, 0x18, + 0x67, 0x11, 0x5d, 0xab, 0x36, 0xde, 0x31, 0x72, 0xf4, 0x6c, 0xe4, 0xc3, 0x6b, 0xcd, 0xf9, 0x45, + 0xe9, 0x24, 0xa3, 0x26, 0xe8, 0xfd, 0xa5, 0x80, 0x95, 0xc8, 0xff, 0x43, 0xcc, 0x38, 0xa1, 0xd8, + 0x84, 0xa3, 0x7b, 0xe9, 0xec, 0x02, 0x28, 0x4f, 0x10, 0xc5, 0x24, 0x60, 0x35, 0xd7, 0x91, 0x27, + 0xf5, 0x10, 0x3c, 0x08, 0x9b, 0x5c, 0x12, 0x74, 0xdf, 0x9a, 0x8d, 0xee, 0x15, 0xb8, 0x92, 0x6a, + 0x18, 0x2d, 0x41, 0xf3, 0x17, 0x05, 0xbc, 0x1c, 0xf9, 0xb5, 0x5d, 0x4a, 0x91, 0xc3, 0xef, 0x85, + 0xe3, 0xc7, 0x31, 0x97, 0xa0, 0x75, 0x6f, 0xcc, 0xc6, 0x25, 0x8d, 0xe9, 0x7a, 0x22, 0xdf, 0x17, + 0xc1, 0xb3, 0x68, 0x74, 0x74, 0x39, 0xa4, 0x1c, 0x3b, 0xb6, 0x3f, 0x3a, 0x62, 0x1a, 0x77, 0x31, + 0x40, 0x32, 0xab, 0x51, 0xbc, 0x71, 0x35, 0x3e, 0x03, 0xcf, 0x33, 0x89, 0xb1, 0x87, 0x9d, 0x01, + 0x91, 0xfd, 0x6d, 0xe4, 0xd6, 0x24, 0x93, 0x9e, 0xac, 0xc8, 0x23, 0x96, 0xf8, 0x96, 0x28, 0xcb, + 0x49, 0x11, 0x2c, 0x46, 0xb5, 0xec, 0x8e, 0x20, 0x1b, 0xee, 0x79, 0xa2, 0x9c, 0x77, 0xac, 0xdf, + 0x21, 0xc2, 0xf6, 0x90, 0x87, 0xfa, 0x0d, 0x4e, 0x09, 0x5d, 0x97, 0x52, 0xba, 0xfe, 0x1c, 0x3c, + 0x8d, 0xd3, 0x32, 0x1f, 0x54, 0x0f, 0xf9, 0xa8, 0xb4, 0x39, 0x51, 0x85, 0xd7, 0x67, 0x53, 0x46, + 0xcc, 0x46, 0xd6, 0xe0, 0x89, 0x77, 0xf5, 0x2a, 0x51, 0x8a, 0x8b, 0x0a, 0x78, 0xf4, 0x41, 0xb0, + 0x0c, 0xbb, 0x1c, 0x72, 0xa4, 0x36, 0x41, 0x79, 0x02, 0x29, 0x1c, 0x07, 0x94, 0xab, 0x8d, 0x57, + 0x72, 0xf3, 0x1e, 0x08, 0x53, 0x99, 0x4a, 0x3a, 0xaa, 0x7b, 0xa0, 0x32, 0x40, 0xa8, 0x37, 0x21, + 0x64, 0x24, 0x65, 0xbd, 0x9e, 0x1b, 0xe4, 0x7d, 0x84, 0x0e, 0x08, 0x19, 0x85, 0x32, 0x1e, 0x04, + 0x47, 0x95, 0x02, 0x2d, 0x16, 0x67, 0xb4, 0xa0, 0x7c, 0x61, 0xf8, 0xbf, 0xfc, 0xd2, 0xec, 0xca, + 0x48, 0xee, 0x4c, 0x99, 0x64, 0xc1, 0xca, 0xba, 0x14, 0x4a, 0x9e, 0x50, 0xe4, 0x61, 0xe2, 0x8a, + 0x55, 0x3c, 0x21, 0x0c, 0x51, 0xd1, 0x80, 0xdc, 0xde, 0x87, 0x2e, 0x07, 0xd2, 0x43, 0x75, 0xb3, + 0x97, 0xd2, 0x73, 0x02, 0xf5, 0x7b, 0xb3, 0x75, 0xf2, 0xba, 0xcd, 0x29, 0x19, 0x64, 0xec, 0x21, + 0xf5, 0x3b, 0x05, 0xac, 0x26, 0xa4, 0x1b, 0x8f, 0xf0, 0x9e, 0x19, 0x0d, 0x78, 0xa6, 0x95, 0x05, + 0x8a, 0xe6, 0xff, 0x58, 0x12, 0x29, 0x20, 0x35, 0x2f, 0xd7, 0x96, 0xa9, 0xdf, 0x28, 0x60, 0x39, + 0x46, 0x35, 0x8c, 0xc6, 0x70, 0x54, 0x96, 0x07, 0x02, 0xd0, 0xbb, 0xb7, 0x1c, 0xe3, 0x29, 0x30, + 0x4b, 0xde, 0xb5, 0x76, 0xea, 0x57, 0x60, 0x31, 0x86, 0x61, 0x06, 0x13, 0x34, 0xc2, 0x50, 0x11, + 0x18, 0x76, 0x6e, 0x33, 0x7e, 0x53, 0x00, 0x5e, 0xf2, 0xb2, 0x8d, 0xd4, 0xe3, 0xa4, 0x9a, 0x53, + 0x63, 0x8e, 0x69, 0x0f, 0x45, 0xf2, 0xb7, 0x6f, 0x3e, 0xe7, 0x52, 0xa9, 0x63, 0x4d, 0x27, 0x4d, + 0x98, 0x4a, 0xc1, 0x42, 0xe6, 0x60, 0x61, 0x1a, 0x10, 0x79, 0xdf, 0xbc, 0xe9, 0x64, 0x49, 0x65, + 0x9d, 0xcf, 0x98, 0x2f, 0x89, 0x15, 0xd4, 0xda, 0xff, 0x61, 0xaa, 0x2b, 0x67, 0x53, 0x5d, 0x39, + 0x9f, 0xea, 0xca, 0x9f, 0x53, 0x5d, 0xf9, 0xf6, 0x52, 0x2f, 0x9c, 0x5f, 0xea, 0x85, 0xdf, 0x2e, + 0xf5, 0xc2, 0xa7, 0x5b, 0xb9, 0x4f, 0xaf, 0xe3, 0xf4, 0xf3, 0x59, 0xbc, 0xc4, 0xfa, 0x65, 0xf1, + 0x2a, 0xde, 0xfe, 0x37, 0x00, 0x00, 0xff, 0xff, 0x18, 0xd7, 0x00, 0x14, 0xe0, 0x0b, 0x00, 0x00, } func (m *DelegatorWithdrawInfo) Marshal() (dAtA []byte, err error) { diff --git a/x/distribution/types/params.go b/x/distribution/types/params.go index 212b0b99f..a4ea2ddea 100644 --- a/x/distribution/types/params.go +++ b/x/distribution/types/params.go @@ -3,7 +3,7 @@ package types import ( "fmt" - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" diff --git a/x/distribution/types/tx.pb.go b/x/distribution/types/tx.pb.go index 2d91bcbfb..c96668c48 100644 --- a/x/distribution/types/tx.pb.go +++ b/x/distribution/types/tx.pb.go @@ -34,8 +34,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // MsgSetWithdrawAddress sets the withdraw address for // a delegator (or validator self-delegation). type MsgSetWithdrawAddress struct { - DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty" yaml:"delegator_address"` - WithdrawAddress string `protobuf:"bytes,2,opt,name=withdraw_address,json=withdrawAddress,proto3" json:"withdraw_address,omitempty" yaml:"withdraw_address"` + DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` + WithdrawAddress string `protobuf:"bytes,2,opt,name=withdraw_address,json=withdrawAddress,proto3" json:"withdraw_address,omitempty"` } func (m *MsgSetWithdrawAddress) Reset() { *m = MsgSetWithdrawAddress{} } @@ -111,8 +111,8 @@ var xxx_messageInfo_MsgSetWithdrawAddressResponse proto.InternalMessageInfo // MsgWithdrawDelegatorReward represents delegation withdrawal to a delegator // from a single validator. type MsgWithdrawDelegatorReward struct { - DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty" yaml:"delegator_address"` - ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty" yaml:"validator_address"` + DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` + ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` } func (m *MsgWithdrawDelegatorReward) Reset() { *m = MsgWithdrawDelegatorReward{} } @@ -188,7 +188,7 @@ var xxx_messageInfo_MsgWithdrawDelegatorRewardResponse proto.InternalMessageInfo // MsgWithdrawValidatorCommission withdraws the full commission to the validator // address. type MsgWithdrawValidatorCommission struct { - ValidatorAddress string `protobuf:"bytes,1,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty" yaml:"validator_address"` + ValidatorAddress string `protobuf:"bytes,1,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` } func (m *MsgWithdrawValidatorCommission) Reset() { *m = MsgWithdrawValidatorCommission{} } @@ -356,44 +356,42 @@ func init() { } var fileDescriptor_ed4f433d965e58ca = []byte{ - // 584 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0x3f, 0x6f, 0xd3, 0x40, - 0x14, 0xf7, 0xb5, 0xa8, 0xa2, 0xc7, 0x40, 0x63, 0x05, 0x35, 0x75, 0xe1, 0x5c, 0x59, 0x15, 0xca, - 0x52, 0x87, 0xa4, 0x08, 0x44, 0x18, 0x10, 0x09, 0x62, 0x8b, 0x40, 0xa9, 0x04, 0x12, 0x03, 0xd5, - 0x25, 0x77, 0x72, 0x4f, 0xc4, 0xbe, 0xc8, 0x77, 0x69, 0x9a, 0x11, 0x89, 0x81, 0x05, 0x09, 0x89, - 0x0f, 0x40, 0x47, 0xc4, 0xcc, 0xca, 0x9e, 0xb1, 0x62, 0x62, 0x0a, 0x28, 0x61, 0x60, 0x60, 0xea, - 0x27, 0x40, 0xb1, 0xcf, 0x26, 0x69, 0x1c, 0x97, 0x82, 0x60, 0xf2, 0x9f, 0xf7, 0xfb, 0xf7, 0xce, - 0xf7, 0x7c, 0x70, 0xb3, 0xc9, 0x85, 0xcb, 0x45, 0x81, 0x30, 0x21, 0x7d, 0xd6, 0xe8, 0x48, 0xc6, - 0xbd, 0xc2, 0x7e, 0xb1, 0x41, 0x25, 0x2e, 0x16, 0xe4, 0x81, 0xdd, 0xf6, 0xb9, 0xe4, 0xfa, 0x7a, - 0x88, 0xb2, 0x27, 0x51, 0xb6, 0x42, 0x19, 0x59, 0x87, 0x3b, 0x3c, 0xc0, 0x15, 0xc6, 0x77, 0x21, - 0xc5, 0x40, 0x4a, 0xb8, 0x81, 0x05, 0x8d, 0x05, 0x9b, 0x9c, 0x79, 0xaa, 0xbe, 0x16, 0xd6, 0x77, - 0x43, 0xa2, 0xd2, 0x0f, 0x1e, 0xac, 0x6f, 0x00, 0x5e, 0xaa, 0x09, 0x67, 0x87, 0xca, 0xc7, 0x4c, - 0xee, 0x11, 0x1f, 0x77, 0xef, 0x12, 0xe2, 0x53, 0x21, 0x74, 0x0c, 0x33, 0x84, 0xb6, 0xa8, 0x83, - 0x25, 0xf7, 0x77, 0x71, 0xf8, 0x32, 0x07, 0x36, 0x40, 0x7e, 0xb9, 0x72, 0xfd, 0x78, 0x60, 0xe6, - 0x7a, 0xd8, 0x6d, 0x95, 0xad, 0x19, 0x88, 0xf5, 0xe9, 0xc3, 0x56, 0x56, 0x59, 0x28, 0xa9, 0x1d, - 0xe9, 0x33, 0xcf, 0xa9, 0xaf, 0xc4, 0xd8, 0xc8, 0xe2, 0x29, 0x5c, 0xe9, 0x2a, 0xd7, 0xd8, 0x61, - 0x21, 0x70, 0xd8, 0x3e, 0x1e, 0x98, 0xab, 0xa1, 0xc3, 0x49, 0xc4, 0x7c, 0x83, 0x8b, 0xdd, 0xe9, - 0x16, 0xca, 0xe7, 0x5f, 0x1e, 0x9a, 0xda, 0xf7, 0x43, 0x53, 0xb3, 0x4c, 0x78, 0x25, 0xb1, 0xcb, - 0x3a, 0x15, 0x6d, 0xee, 0x09, 0x6a, 0xfd, 0x00, 0xd0, 0xa8, 0x09, 0x27, 0x2a, 0xdf, 0x8b, 0xa2, - 0xd6, 0x69, 0x17, 0xfb, 0xe4, 0x7f, 0x2c, 0x06, 0x86, 0x99, 0x7d, 0xdc, 0x62, 0x64, 0xca, 0x62, - 0xe1, 0xa4, 0xc5, 0x0c, 0x24, 0xc5, 0x22, 0xc6, 0xce, 0xae, 0xc7, 0x26, 0xb4, 0xe6, 0x77, 0x1b, - 0x2f, 0xca, 0x2b, 0x00, 0xd1, 0x04, 0xec, 0x51, 0xa4, 0x57, 0xe5, 0xae, 0xcb, 0x84, 0x60, 0xdc, - 0x4b, 0x4e, 0x0d, 0xfe, 0x51, 0xea, 0x3c, 0xbc, 0x9a, 0x1e, 0x27, 0x4e, 0xfe, 0x11, 0xc0, 0x6c, - 0x4d, 0x38, 0xf7, 0x3b, 0x1e, 0x19, 0x57, 0x3b, 0x1e, 0x93, 0xbd, 0x87, 0x9c, 0xb7, 0xf4, 0x26, - 0x5c, 0xc2, 0x2e, 0xef, 0x78, 0x32, 0x07, 0x36, 0x16, 0xf3, 0x17, 0x4a, 0x6b, 0xb6, 0x4a, 0x31, - 0x9e, 0x9d, 0x68, 0xcc, 0xec, 0x2a, 0x67, 0x5e, 0xe5, 0x5a, 0x7f, 0x60, 0x6a, 0xef, 0xbf, 0x98, - 0x79, 0x87, 0xc9, 0xbd, 0x4e, 0xc3, 0x6e, 0x72, 0x57, 0xcd, 0x8e, 0xba, 0x6c, 0x09, 0xf2, 0xac, - 0x20, 0x7b, 0x6d, 0x2a, 0x02, 0x82, 0xa8, 0x2b, 0x69, 0xfd, 0x06, 0x5c, 0x26, 0xb4, 0xcd, 0x05, - 0x93, 0xdc, 0x57, 0x9f, 0x30, 0x37, 0xb7, 0xe1, 0x5f, 0xd0, 0x89, 0x4e, 0x11, 0xbc, 0x9c, 0x14, - 0x3f, 0xea, 0xaf, 0xd4, 0x3f, 0x07, 0x17, 0x6b, 0xc2, 0xd1, 0x5f, 0x00, 0xa8, 0x27, 0xcc, 0x6e, - 0xc9, 0x4e, 0xf9, 0x89, 0xd8, 0x89, 0x93, 0x60, 0x94, 0xcf, 0xce, 0x89, 0xe2, 0xe8, 0x6f, 0x00, - 0x5c, 0x9d, 0x37, 0x3a, 0x37, 0x4f, 0xd3, 0x9d, 0x43, 0x34, 0xee, 0xfc, 0x21, 0x31, 0x4e, 0xf5, - 0x16, 0xc0, 0xf5, 0xb4, 0xbd, 0x7b, 0xfb, 0x77, 0x0d, 0x12, 0xc8, 0x46, 0xf5, 0x2f, 0xc8, 0x71, - 0xc2, 0xe7, 0x00, 0x66, 0x66, 0xf7, 0x68, 0xf1, 0x34, 0xe9, 0x19, 0x8a, 0x71, 0xeb, 0xcc, 0x94, - 0x28, 0x43, 0xe5, 0xc1, 0xbb, 0x21, 0x02, 0xfd, 0x21, 0x02, 0x47, 0x43, 0x04, 0xbe, 0x0e, 0x11, - 0x78, 0x3d, 0x42, 0xda, 0xd1, 0x08, 0x69, 0x9f, 0x47, 0x48, 0x7b, 0x52, 0x4c, 0xdd, 0xfc, 0x07, - 0xd3, 0x67, 0x59, 0x30, 0x0b, 0x8d, 0xa5, 0xe0, 0x64, 0xd9, 0xfe, 0x19, 0x00, 0x00, 0xff, 0xff, - 0x75, 0x69, 0x34, 0x71, 0xef, 0x06, 0x00, 0x00, + // 551 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x3f, 0x6f, 0xd3, 0x40, + 0x18, 0xc6, 0x7d, 0x14, 0x55, 0xf4, 0x18, 0x68, 0xac, 0x20, 0x52, 0x17, 0x2e, 0x55, 0x54, 0xa1, + 0x2c, 0xb5, 0x49, 0x90, 0x40, 0x94, 0x01, 0x91, 0x50, 0xb6, 0x08, 0x94, 0x4a, 0x20, 0xb1, 0x54, + 0x76, 0xee, 0xe4, 0x9e, 0x88, 0xfd, 0x06, 0xdf, 0xb9, 0x69, 0x47, 0x24, 0x06, 0x46, 0x24, 0x3e, + 0x00, 0x1d, 0x11, 0x12, 0x5b, 0x57, 0xf6, 0x8c, 0x15, 0x13, 0x13, 0xa0, 0x64, 0xe1, 0x63, 0xa0, + 0xd8, 0x67, 0x93, 0x28, 0x4e, 0x4c, 0x29, 0x53, 0xfe, 0xbc, 0xcf, 0xf3, 0xdc, 0xef, 0x55, 0x9e, + 0x8b, 0xf1, 0x66, 0x07, 0x84, 0x07, 0xc2, 0xa2, 0x5c, 0xc8, 0x80, 0x3b, 0xa1, 0xe4, 0xe0, 0x5b, + 0x07, 0x35, 0x87, 0x49, 0xbb, 0x66, 0xc9, 0x43, 0xb3, 0x17, 0x80, 0x04, 0x7d, 0x3d, 0x56, 0x99, + 0x93, 0x2a, 0x53, 0xa9, 0x8c, 0xa2, 0x0b, 0x2e, 0x44, 0x3a, 0x6b, 0xfc, 0x2e, 0xb6, 0x18, 0x44, + 0x05, 0x3b, 0xb6, 0x60, 0x69, 0x60, 0x07, 0xb8, 0xaf, 0xe6, 0x6b, 0xf1, 0x7c, 0x2f, 0x36, 0xaa, + 0xfc, 0xe8, 0x43, 0xe5, 0x33, 0xc2, 0x57, 0x5b, 0xc2, 0xdd, 0x65, 0xf2, 0x39, 0x97, 0xfb, 0x34, + 0xb0, 0xfb, 0x0f, 0x29, 0x0d, 0x98, 0x10, 0xfa, 0x0e, 0x2e, 0x50, 0xd6, 0x65, 0xae, 0x2d, 0x21, + 0xd8, 0xb3, 0xe3, 0x2f, 0x4b, 0x68, 0x03, 0x55, 0x57, 0x1a, 0xa5, 0xaf, 0x27, 0x5b, 0x45, 0x15, + 0xa3, 0xe4, 0xbb, 0x32, 0xe0, 0xbe, 0xdb, 0x5e, 0x4d, 0x2d, 0x49, 0x4c, 0x13, 0xaf, 0xf6, 0x55, + 0x72, 0x9a, 0x72, 0x21, 0x27, 0xe5, 0x4a, 0x7f, 0x9a, 0x65, 0xfb, 0xd2, 0xdb, 0xe3, 0xb2, 0xf6, + 0xeb, 0xb8, 0xac, 0x55, 0xca, 0xf8, 0x46, 0x26, 0x6e, 0x9b, 0x89, 0x1e, 0xf8, 0x82, 0x55, 0x4e, + 0x10, 0x36, 0x5a, 0xc2, 0x4d, 0xc6, 0x8f, 0x12, 0x9e, 0x36, 0xeb, 0xdb, 0x01, 0xfd, 0x5f, 0x5b, + 0xed, 0xe0, 0xc2, 0x81, 0xdd, 0xe5, 0x74, 0x2a, 0x26, 0x6f, 0xad, 0xd5, 0xd4, 0x32, 0xbb, 0xd7, + 0x26, 0xae, 0xcc, 0xa7, 0x4e, 0x97, 0x7b, 0x85, 0xc9, 0x84, 0xea, 0x59, 0x12, 0xd7, 0x04, 0xcf, + 0xe3, 0x42, 0x70, 0xf0, 0xb3, 0xc1, 0xd0, 0x39, 0xc0, 0xaa, 0xf8, 0xe6, 0xe2, 0x23, 0x53, 0xb8, + 0x2f, 0x08, 0x17, 0x5b, 0xc2, 0x7d, 0x1c, 0xfa, 0x74, 0x3c, 0x0d, 0x7d, 0x2e, 0x8f, 0x9e, 0x02, + 0x74, 0xf5, 0x0e, 0x5e, 0xb6, 0x3d, 0x08, 0x7d, 0x59, 0x42, 0x1b, 0x4b, 0xd5, 0xcb, 0xf5, 0x35, + 0x53, 0x51, 0x8c, 0xfb, 0x9a, 0x54, 0xdb, 0x6c, 0x02, 0xf7, 0x1b, 0xb7, 0x06, 0xdf, 0xcb, 0xda, + 0xa7, 0x1f, 0xe5, 0xaa, 0xcb, 0xe5, 0x7e, 0xe8, 0x98, 0x1d, 0xf0, 0x54, 0x5f, 0xd5, 0xcb, 0x96, + 0xa0, 0x2f, 0x2d, 0x79, 0xd4, 0x63, 0x22, 0x32, 0x88, 0xb6, 0x8a, 0xd6, 0xef, 0xe0, 0x15, 0xca, + 0x7a, 0x20, 0xb8, 0x84, 0x20, 0xf7, 0x97, 0xf8, 0x23, 0x9d, 0xd8, 0x94, 0xe0, 0xeb, 0x59, 0xf8, + 0xc9, 0x7e, 0xf5, 0xc1, 0x45, 0xbc, 0xd4, 0x12, 0xae, 0xfe, 0x06, 0x61, 0x3d, 0xe3, 0xbe, 0xd4, + 0xcd, 0x05, 0x17, 0xd7, 0xcc, 0x2c, 0xad, 0xb1, 0x7d, 0x76, 0x4f, 0x82, 0xa3, 0xbf, 0x47, 0xf8, + 0xda, 0xbc, 0x96, 0xdf, 0xcd, 0xcb, 0x9d, 0x63, 0x34, 0x1e, 0xfc, 0xa3, 0x31, 0xa5, 0xfa, 0x80, + 0xf0, 0xfa, 0xa2, 0x7e, 0xde, 0xff, 0xdb, 0x03, 0x32, 0xcc, 0x46, 0xf3, 0x1c, 0xe6, 0x94, 0xf0, + 0x35, 0xc2, 0x85, 0xd9, 0x8e, 0xd6, 0xf2, 0xa2, 0x67, 0x2c, 0xc6, 0xbd, 0x33, 0x5b, 0x12, 0x86, + 0xc6, 0x93, 0x8f, 0x43, 0x82, 0x06, 0x43, 0x82, 0x4e, 0x87, 0x04, 0xfd, 0x1c, 0x12, 0xf4, 0x6e, + 0x44, 0xb4, 0xd3, 0x11, 0xd1, 0xbe, 0x8d, 0x88, 0xf6, 0xa2, 0xb6, 0xb0, 0xfc, 0x87, 0xd3, 0xcf, + 0x8f, 0xe8, 0x2e, 0x38, 0xcb, 0xd1, 0xbf, 0xf9, 0xed, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x2b, + 0xc5, 0x87, 0x39, 0x63, 0x06, 0x00, 0x00, } func (this *MsgSetWithdrawAddressResponse) Equal(that interface{}) bool { diff --git a/x/evidence/migrations/v038/types.go b/x/evidence/migrations/v038/types.go index b42a72f0a..246754cf1 100644 --- a/x/evidence/migrations/v038/types.go +++ b/x/evidence/migrations/v038/types.go @@ -9,7 +9,7 @@ import ( "github.com/tendermint/tendermint/crypto/tmhash" tmbytes "github.com/tendermint/tendermint/libs/bytes" - "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/evidence/types/evidence.go b/x/evidence/types/evidence.go index fca6126ec..70b992a9f 100644 --- a/x/evidence/types/evidence.go +++ b/x/evidence/types/evidence.go @@ -7,7 +7,7 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto/tmhash" tmbytes "github.com/tendermint/tendermint/libs/bytes" - "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/evidence/exported" diff --git a/x/evidence/types/evidence.pb.go b/x/evidence/types/evidence.pb.go index 6f3d617eb..52189e758 100644 --- a/x/evidence/types/evidence.pb.go +++ b/x/evidence/types/evidence.pb.go @@ -34,7 +34,7 @@ type Equivocation struct { Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` Time time.Time `protobuf:"bytes,2,opt,name=time,proto3,stdtime" json:"time"` Power int64 `protobuf:"varint,3,opt,name=power,proto3" json:"power,omitempty"` - ConsensusAddress string `protobuf:"bytes,4,opt,name=consensus_address,json=consensusAddress,proto3" json:"consensus_address,omitempty" yaml:"consensus_address"` + ConsensusAddress string `protobuf:"bytes,4,opt,name=consensus_address,json=consensusAddress,proto3" json:"consensus_address,omitempty"` } func (m *Equivocation) Reset() { *m = Equivocation{} } @@ -78,29 +78,28 @@ func init() { } var fileDescriptor_dd143e71a177f0dd = []byte{ - // 346 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x91, 0x3f, 0x4f, 0x02, 0x31, - 0x18, 0xc6, 0x5b, 0x41, 0xa2, 0x27, 0x83, 0x5e, 0x88, 0x9e, 0x0c, 0x2d, 0x61, 0x30, 0x2c, 0xdc, - 0x05, 0x75, 0x30, 0x6c, 0x92, 0x38, 0xb9, 0xa1, 0x93, 0x0b, 0xb9, 0x3f, 0xb5, 0x34, 0x72, 0xd7, - 0xf3, 0xda, 0x43, 0xf9, 0x06, 0x8e, 0x8c, 0x8e, 0x8c, 0x7e, 0x00, 0x3f, 0x04, 0x23, 0x71, 0x72, - 0x42, 0x73, 0x0c, 0x3a, 0xfb, 0x09, 0x0c, 0xd7, 0x82, 0x83, 0x53, 0xfb, 0x3c, 0xf9, 0xbd, 0xcf, - 0x93, 0xb7, 0x35, 0x8e, 0x7c, 0x2e, 0x42, 0x2e, 0x1c, 0x32, 0x64, 0x01, 0x89, 0x7c, 0xe2, 0x0c, - 0x5b, 0x1e, 0x91, 0x6e, 0x6b, 0x6d, 0xd8, 0x71, 0xc2, 0x25, 0x37, 0x0f, 0x14, 0x67, 0xaf, 0x6d, - 0xcd, 0x55, 0x2b, 0x94, 0x53, 0x9e, 0x33, 0xce, 0xf2, 0xa6, 0xf0, 0x2a, 0xa6, 0x9c, 0xd3, 0x01, - 0x71, 0x72, 0xe5, 0xa5, 0xb7, 0x8e, 0x64, 0x21, 0x11, 0xd2, 0x0d, 0x63, 0x0d, 0x1c, 0xaa, 0xbc, - 0x9e, 0x9a, 0xd4, 0xe1, 0xb9, 0xa8, 0x7f, 0x41, 0xa3, 0x7c, 0x71, 0x9f, 0xb2, 0x21, 0xf7, 0x5d, - 0xc9, 0x78, 0x64, 0xee, 0x1b, 0xa5, 0x3e, 0x61, 0xb4, 0x2f, 0x2d, 0x58, 0x83, 0x8d, 0x42, 0x57, - 0x2b, 0xf3, 0xcc, 0x28, 0x2e, 0x63, 0xad, 0x8d, 0x1a, 0x6c, 0xec, 0x1c, 0x57, 0x6d, 0xd5, 0x69, - 0xaf, 0x3a, 0xed, 0xeb, 0x55, 0x67, 0x67, 0x6b, 0x3a, 0xc7, 0x60, 0xfc, 0x81, 0x61, 0x37, 0x9f, - 0x30, 0x2b, 0xc6, 0x66, 0xcc, 0x1f, 0x48, 0x62, 0x15, 0xf2, 0x40, 0x25, 0x4c, 0xd7, 0xd8, 0xf3, - 0x79, 0x24, 0x48, 0x24, 0x52, 0xd1, 0x73, 0x83, 0x20, 0x21, 0x42, 0x58, 0xc5, 0x1a, 0x6c, 0x6c, - 0x77, 0x4e, 0x7f, 0xe6, 0xd8, 0x1a, 0xb9, 0xe1, 0xa0, 0x5d, 0xff, 0x87, 0xd4, 0xdf, 0x5e, 0x9b, - 0x15, 0xbd, 0xc1, 0xb9, 0xb2, 0xae, 0x64, 0xc2, 0x22, 0xda, 0xdd, 0x5d, 0xb3, 0xda, 0x6f, 0x97, - 0x9f, 0x26, 0x18, 0x3c, 0x4f, 0x30, 0xf8, 0x9e, 0x60, 0xd0, 0xb9, 0x7c, 0xc9, 0x10, 0x9c, 0x66, - 0x08, 0xce, 0x32, 0x04, 0x3f, 0x33, 0x04, 0xc7, 0x0b, 0x04, 0x66, 0x0b, 0x04, 0xde, 0x17, 0x08, - 0xdc, 0x34, 0x29, 0x93, 0xfd, 0xd4, 0xb3, 0x7d, 0x1e, 0xea, 0x07, 0xd2, 0x47, 0x53, 0x04, 0x77, - 0xce, 0xe3, 0xdf, 0x97, 0xc9, 0x51, 0x4c, 0x84, 0x57, 0xca, 0xf7, 0x3e, 0xf9, 0x0d, 0x00, 0x00, - 0xff, 0xff, 0xca, 0x0b, 0xf0, 0x75, 0xd2, 0x01, 0x00, 0x00, + // 333 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0x51, 0xbb, 0x4e, 0xf3, 0x30, + 0x18, 0xb5, 0xff, 0xf6, 0xaf, 0x20, 0x74, 0x80, 0xa8, 0x82, 0xd0, 0xc1, 0xa9, 0x18, 0x50, 0x97, + 0x26, 0x2a, 0x2c, 0x88, 0x8d, 0x4a, 0x9d, 0xd8, 0x0a, 0x13, 0x4b, 0x95, 0x8b, 0x71, 0x2d, 0x48, + 0xbe, 0x10, 0x3b, 0x05, 0xde, 0x80, 0xb1, 0x23, 0x63, 0x47, 0x1e, 0x80, 0x87, 0xa8, 0xc4, 0x52, + 0x31, 0x31, 0x01, 0x4a, 0x17, 0x1e, 0x03, 0xd5, 0x76, 0xcb, 0x64, 0x9f, 0xe3, 0x73, 0xb1, 0xfd, + 0x59, 0x87, 0x11, 0x88, 0x04, 0x84, 0x4f, 0xc7, 0x3c, 0xa6, 0x69, 0x44, 0xfd, 0x71, 0x37, 0xa4, + 0x32, 0xe8, 0xae, 0x09, 0x2f, 0xcb, 0x41, 0x82, 0xbd, 0xa7, 0x75, 0xde, 0x9a, 0x36, 0xba, 0x66, + 0x83, 0x01, 0x03, 0xa5, 0xf1, 0x97, 0x3b, 0x2d, 0x6f, 0xba, 0x0c, 0x80, 0xdd, 0x52, 0x5f, 0xa1, + 0xb0, 0xb8, 0xf6, 0x25, 0x4f, 0xa8, 0x90, 0x41, 0x92, 0x19, 0xc1, 0xbe, 0xce, 0x1b, 0x6a, 0xa7, + 0x09, 0x57, 0xe0, 0xe0, 0x0d, 0x5b, 0xf5, 0xfe, 0x5d, 0xc1, 0xc7, 0x10, 0x05, 0x92, 0x43, 0x6a, + 0xef, 0x5a, 0xb5, 0x11, 0xe5, 0x6c, 0x24, 0x1d, 0xdc, 0xc2, 0xed, 0xca, 0xc0, 0x20, 0xfb, 0xc4, + 0xaa, 0x2e, 0x63, 0x9d, 0x7f, 0x2d, 0xdc, 0xde, 0x3a, 0x6a, 0x7a, 0xba, 0xd3, 0x5b, 0x75, 0x7a, + 0x97, 0xab, 0xce, 0xde, 0xc6, 0xec, 0xd3, 0x45, 0x93, 0x2f, 0x17, 0x0f, 0x94, 0xc3, 0x6e, 0x58, + 0xff, 0x33, 0xb8, 0xa7, 0xb9, 0x53, 0x51, 0x81, 0x1a, 0xd8, 0x7d, 0x6b, 0x27, 0x82, 0x54, 0xd0, + 0x54, 0x14, 0x62, 0x18, 0xc4, 0x71, 0x4e, 0x85, 0x70, 0xaa, 0x2d, 0xdc, 0xde, 0xec, 0x39, 0xef, + 0xaf, 0x9d, 0x86, 0xb9, 0xe5, 0x99, 0x3e, 0xb9, 0x90, 0x39, 0x4f, 0xd9, 0x60, 0x7b, 0x6d, 0x31, + 0xfc, 0x69, 0xfd, 0x69, 0xea, 0xa2, 0xe7, 0xa9, 0x8b, 0x7e, 0xa6, 0x2e, 0xea, 0x9d, 0xbf, 0x94, + 0x04, 0xcf, 0x4a, 0x82, 0xe7, 0x25, 0xc1, 0xdf, 0x25, 0xc1, 0x93, 0x05, 0x41, 0xf3, 0x05, 0x41, + 0x1f, 0x0b, 0x82, 0xae, 0x3a, 0x8c, 0xcb, 0x51, 0x11, 0x7a, 0x11, 0x24, 0xe6, 0x13, 0xcc, 0xd2, + 0x11, 0xf1, 0x8d, 0xff, 0xf0, 0x37, 0x16, 0xf9, 0x98, 0x51, 0x11, 0xd6, 0xd4, 0xdb, 0x8e, 0x7f, + 0x03, 0x00, 0x00, 0xff, 0xff, 0xbe, 0x32, 0xf0, 0x2c, 0xb6, 0x01, 0x00, 0x00, } func (m *Equivocation) Marshal() (dAtA []byte, err error) { diff --git a/x/evidence/types/evidence_test.go b/x/evidence/types/evidence_test.go index c78f0b059..46b88a115 100644 --- a/x/evidence/types/evidence_test.go +++ b/x/evidence/types/evidence_test.go @@ -30,7 +30,18 @@ func TestEquivocation_Valid(t *testing.T) { require.Equal(t, e.Type(), types.TypeEquivocation) require.Equal(t, e.Route(), types.RouteEquivocation) require.Equal(t, e.Hash().String(), "1E10F9267BEA3A9A4AB5302C2C510CC1AFD7C54E232DA5B2E3360DFAFACF7A76") - require.Equal(t, e.String(), "height: 100\ntime: 2006-01-02T15:04:05Z\npower: 1000000\nconsensus_address: cosmosvalcons1vehk7h6lta047h6lta047h6lta047h6l8m4r53\n") + require.Equal(t, e.String(), "consensus_address: cosmosvalcons1vehk7h6lta047h6lta047h6lta047h6l8m4r53\nheight: 100\npower: 1000000\ntime: \"2006-01-02T15:04:05Z\"\n") + require.NoError(t, e.ValidateBasic()) + + require.Equal(t, int64(0), e.GetTotalPower()) + require.Equal(t, e.Power, e.GetValidatorPower()) + require.Equal(t, e.Time, e.GetTime()) + require.Equal(t, e.ConsensusAddress, e.GetConsensusAddress().String()) + require.Equal(t, e.Height, e.GetHeight()) + require.Equal(t, types.TypeEquivocation, e.Type()) + require.Equal(t, types.RouteEquivocation, e.Route()) + require.Equal(t, "1E10F9267BEA3A9A4AB5302C2C510CC1AFD7C54E232DA5B2E3360DFAFACF7A76", e.Hash().String()) + require.Equal(t, "consensus_address: cosmosvalcons1vehk7h6lta047h6lta047h6lta047h6l8m4r53\nheight: 100\npower: 1000000\ntime: \"2006-01-02T15:04:05Z\"\n", e.String()) require.NoError(t, e.ValidateBasic()) } diff --git a/x/genutil/types/genesis.pb.go b/x/genutil/types/genesis.pb.go index 369cd0edf..e1cd6af76 100644 --- a/x/genutil/types/genesis.pb.go +++ b/x/genutil/types/genesis.pb.go @@ -27,7 +27,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // GenesisState defines the raw genesis transaction in JSON. type GenesisState struct { // gen_txs defines the genesis transactions. - GenTxs []encoding_json.RawMessage `protobuf:"bytes,1,rep,name=gen_txs,json=genTxs,proto3,casttype=encoding/json.RawMessage" json:"gentxs" yaml:"gentxs"` + GenTxs []encoding_json.RawMessage `protobuf:"bytes,1,rep,name=gen_txs,json=genTxs,proto3,casttype=encoding/json.RawMessage" json:"gentxs"` } func (m *GenesisState) Reset() { *m = GenesisState{} } @@ -79,22 +79,21 @@ func init() { } var fileDescriptor_31771d25e8d8f90f = []byte{ - // 234 bytes of a gzipped FileDescriptorProto + // 221 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x49, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0x4f, 0x4f, 0xcd, 0x2b, 0x2d, 0xc9, 0xcc, 0xd1, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0x04, 0xf1, 0x53, 0x8b, 0x33, 0x8b, 0xf5, 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, 0x85, 0xc4, 0x20, 0xaa, 0xf4, 0xa0, 0xaa, 0xf4, 0xa0, 0xaa, 0xa4, 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0x4a, - 0xf4, 0x41, 0x2c, 0x88, 0x6a, 0xa5, 0x04, 0x2e, 0x1e, 0x77, 0x88, 0xf6, 0xe0, 0x92, 0xc4, 0x92, - 0x54, 0xa1, 0x00, 0x2e, 0xf6, 0xf4, 0xd4, 0xbc, 0xf8, 0x92, 0x8a, 0x62, 0x09, 0x46, 0x05, 0x66, - 0x0d, 0x1e, 0x27, 0xf3, 0x57, 0xf7, 0xe4, 0xd9, 0xd2, 0x53, 0xf3, 0x4a, 0x2a, 0x8a, 0x3f, 0xdd, - 0x93, 0xe7, 0xad, 0x4c, 0xcc, 0xcd, 0xb1, 0x52, 0x82, 0xf0, 0x95, 0x7e, 0xdd, 0x93, 0x97, 0x48, - 0xcd, 0x4b, 0xce, 0x4f, 0xc9, 0xcc, 0x4b, 0xd7, 0xcf, 0x2a, 0xce, 0xcf, 0xd3, 0x0b, 0x4a, 0x2c, - 0xf7, 0x4d, 0x2d, 0x2e, 0x4e, 0x4c, 0x4f, 0x0d, 0x02, 0x69, 0x0a, 0xa9, 0x28, 0x76, 0x72, 0x3b, - 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, - 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0x9d, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, - 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, 0xd7, 0x20, 0x94, 0x6e, 0x71, 0x4a, 0xb6, 0x7e, 0x05, - 0xdc, 0x9f, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0x07, 0x1b, 0x03, 0x02, 0x00, 0x00, - 0xff, 0xff, 0x6b, 0x84, 0x7a, 0x20, 0x06, 0x01, 0x00, 0x00, + 0xf4, 0x41, 0x2c, 0x88, 0x6a, 0x25, 0x7f, 0x2e, 0x1e, 0x77, 0x88, 0xf6, 0xe0, 0x92, 0xc4, 0x92, + 0x54, 0x21, 0x7b, 0x2e, 0xf6, 0xf4, 0xd4, 0xbc, 0xf8, 0x92, 0x8a, 0x62, 0x09, 0x46, 0x05, 0x66, + 0x0d, 0x1e, 0x27, 0xb5, 0x57, 0xf7, 0xe4, 0xd9, 0xd2, 0x53, 0xf3, 0x4a, 0x2a, 0x8a, 0x7f, 0xdd, + 0x93, 0x97, 0x48, 0xcd, 0x4b, 0xce, 0x4f, 0xc9, 0xcc, 0x4b, 0xd7, 0xcf, 0x2a, 0xce, 0xcf, 0xd3, + 0x0b, 0x4a, 0x2c, 0xf7, 0x4d, 0x2d, 0x2e, 0x4e, 0x4c, 0x4f, 0x0d, 0x02, 0xa9, 0x09, 0xa9, 0x28, + 0x76, 0x72, 0x3b, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, + 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0x9d, 0xf4, 0xcc, + 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, 0x4f, 0x20, 0x94, 0x6e, 0x71, 0x4a, + 0xb6, 0x7e, 0x05, 0xdc, 0x5b, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0xf7, 0x19, 0x03, + 0x02, 0x00, 0x00, 0xff, 0xff, 0xc5, 0xe1, 0x3b, 0x15, 0xf5, 0x00, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/genutil/types/genesis_state.go b/x/genutil/types/genesis_state.go index a7c4cdd8c..657f57a94 100644 --- a/x/genutil/types/genesis_state.go +++ b/x/genutil/types/genesis_state.go @@ -69,7 +69,6 @@ func SetGenesisStateInAppState( // // NOTE: The pubkey input is this machines pubkey. func GenesisStateFromGenDoc(genDoc tmtypes.GenesisDoc) (genesisState map[string]json.RawMessage, err error) { - if err = json.Unmarshal(genDoc.AppState, &genesisState); err != nil { return genesisState, err } diff --git a/x/gov/types/deposit.go b/x/gov/types/deposit.go index e38608873..9cd16f477 100644 --- a/x/gov/types/deposit.go +++ b/x/gov/types/deposit.go @@ -3,7 +3,7 @@ package types import ( "fmt" - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/gov/types/genesis.pb.go b/x/gov/types/genesis.pb.go index 4df93da3d..27f91f1c0 100644 --- a/x/gov/types/genesis.pb.go +++ b/x/gov/types/genesis.pb.go @@ -26,7 +26,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // GenesisState defines the gov module's genesis state. type GenesisState struct { // starting_proposal_id is the ID of the starting proposal. - StartingProposalId uint64 `protobuf:"varint,1,opt,name=starting_proposal_id,json=startingProposalId,proto3" json:"starting_proposal_id,omitempty" yaml:"starting_proposal_id"` + StartingProposalId uint64 `protobuf:"varint,1,opt,name=starting_proposal_id,json=startingProposalId,proto3" json:"starting_proposal_id,omitempty"` // deposits defines all the deposits present at genesis. Deposits Deposits `protobuf:"bytes,2,rep,name=deposits,proto3,castrepeated=Deposits" json:"deposits"` // votes defines all the votes present at genesis. @@ -34,11 +34,11 @@ type GenesisState struct { // proposals defines all the proposals present at genesis. Proposals Proposals `protobuf:"bytes,4,rep,name=proposals,proto3,castrepeated=Proposals" json:"proposals"` // params defines all the paramaters of related to deposit. - DepositParams DepositParams `protobuf:"bytes,5,opt,name=deposit_params,json=depositParams,proto3" json:"deposit_params" yaml:"deposit_params"` + DepositParams DepositParams `protobuf:"bytes,5,opt,name=deposit_params,json=depositParams,proto3" json:"deposit_params"` // params defines all the paramaters of related to voting. - VotingParams VotingParams `protobuf:"bytes,6,opt,name=voting_params,json=votingParams,proto3" json:"voting_params" yaml:"voting_params"` + VotingParams VotingParams `protobuf:"bytes,6,opt,name=voting_params,json=votingParams,proto3" json:"voting_params"` // params defines all the paramaters of related to tally. - TallyParams TallyParams `protobuf:"bytes,7,opt,name=tally_params,json=tallyParams,proto3" json:"tally_params" yaml:"tally_params"` + TallyParams TallyParams `protobuf:"bytes,7,opt,name=tally_params,json=tallyParams,proto3" json:"tally_params"` } func (m *GenesisState) Reset() { *m = GenesisState{} } @@ -130,34 +130,32 @@ func init() { func init() { proto.RegisterFile("cosmos/gov/v1beta1/genesis.proto", fileDescriptor_43cd825e0fa7a627) } var fileDescriptor_43cd825e0fa7a627 = []byte{ - // 430 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x31, 0x6f, 0xd3, 0x40, - 0x14, 0xc7, 0x63, 0x9a, 0x94, 0xf6, 0x92, 0x20, 0x38, 0x82, 0x64, 0x35, 0xc1, 0x36, 0x9e, 0xb2, - 0x60, 0xab, 0x65, 0x43, 0x62, 0xb1, 0x90, 0x50, 0x07, 0xa4, 0x62, 0x10, 0x03, 0x4b, 0x74, 0x89, - 0x4f, 0x87, 0x85, 0xdd, 0x67, 0xf9, 0x1d, 0x16, 0xf9, 0x16, 0x7c, 0x0e, 0x3e, 0x49, 0xc7, 0x8e, - 0x4c, 0x01, 0x25, 0x13, 0x6b, 0x3f, 0x01, 0xf2, 0xdd, 0x19, 0x1c, 0x61, 0x3a, 0x25, 0x7e, 0xf7, - 0xbf, 0xdf, 0xef, 0xdd, 0xd3, 0x23, 0xde, 0x0a, 0x30, 0x07, 0x0c, 0x05, 0x54, 0x61, 0x75, 0xba, - 0xe4, 0x92, 0x9d, 0x86, 0x82, 0x5f, 0x72, 0x4c, 0x31, 0x28, 0x4a, 0x90, 0x40, 0xa9, 0x4e, 0x04, - 0x02, 0xaa, 0xc0, 0x24, 0x4e, 0x26, 0x02, 0x04, 0xa8, 0xe3, 0xb0, 0xfe, 0xa7, 0x93, 0x27, 0xb3, - 0x2e, 0x16, 0x54, 0xfa, 0xd4, 0xff, 0xd5, 0x27, 0xa3, 0x57, 0x9a, 0xfc, 0x56, 0x32, 0xc9, 0xe9, - 0x1b, 0x32, 0x41, 0xc9, 0x4a, 0x99, 0x5e, 0x8a, 0x45, 0x51, 0x42, 0x01, 0xc8, 0xb2, 0x45, 0x9a, - 0xd8, 0x96, 0x67, 0xcd, 0xfb, 0x91, 0x7b, 0xb3, 0x71, 0xa7, 0x6b, 0x96, 0x67, 0xcf, 0xfd, 0xae, - 0x94, 0x1f, 0xd3, 0xa6, 0x7c, 0x61, 0xaa, 0xe7, 0x09, 0x3d, 0x27, 0x47, 0x09, 0x2f, 0x00, 0x53, - 0x89, 0xf6, 0x1d, 0xef, 0x60, 0x3e, 0x3c, 0x9b, 0x06, 0xff, 0xb6, 0x1f, 0xbc, 0xd4, 0x99, 0xe8, - 0xfe, 0xd5, 0xc6, 0xed, 0x7d, 0xfb, 0xe1, 0x1e, 0x99, 0x02, 0xc6, 0x7f, 0xae, 0xd3, 0x17, 0x64, - 0x50, 0x81, 0xe4, 0x68, 0x1f, 0x28, 0x8e, 0xdd, 0xc5, 0x79, 0x0f, 0x92, 0x47, 0x63, 0x03, 0x19, - 0xd4, 0x5f, 0x18, 0xeb, 0x5b, 0xf4, 0x35, 0x39, 0x6e, 0xba, 0x45, 0xbb, 0xaf, 0x10, 0xb3, 0x2e, - 0x44, 0xd3, 0x7c, 0xf4, 0xc0, 0x60, 0x8e, 0x9b, 0x0a, 0xc6, 0x7f, 0x09, 0x54, 0x90, 0x7b, 0xa6, - 0xb3, 0x45, 0xc1, 0x4a, 0x96, 0xa3, 0x3d, 0xf0, 0xac, 0xf9, 0xf0, 0xec, 0xc9, 0x2d, 0xcf, 0xbb, - 0x50, 0xc1, 0xe8, 0x71, 0x0d, 0xbe, 0xd9, 0xb8, 0x8f, 0xf4, 0x30, 0xf7, 0x31, 0x7e, 0x3c, 0x4e, - 0xda, 0x69, 0xba, 0x22, 0xe3, 0x0a, 0xf4, 0xb0, 0xb5, 0xe7, 0x50, 0x79, 0xbc, 0xff, 0x3c, 0xbf, - 0x1e, 0xbf, 0xd6, 0xcc, 0x8c, 0x66, 0xa2, 0x35, 0x7b, 0x10, 0x3f, 0x1e, 0x55, 0xad, 0x2c, 0x5d, - 0x90, 0x91, 0x64, 0x59, 0xb6, 0x6e, 0x1c, 0x77, 0x95, 0xc3, 0xed, 0x72, 0xbc, 0xab, 0x73, 0x46, - 0x31, 0x35, 0x8a, 0x87, 0x5a, 0xd1, 0x46, 0xf8, 0xf1, 0x50, 0xb6, 0x92, 0xd1, 0xd5, 0xd6, 0xb1, - 0xae, 0xb7, 0x8e, 0xf5, 0x73, 0xeb, 0x58, 0x5f, 0x77, 0x4e, 0xef, 0x7a, 0xe7, 0xf4, 0xbe, 0xef, - 0x9c, 0xde, 0x87, 0xb9, 0x48, 0xe5, 0xc7, 0xcf, 0xcb, 0x60, 0x05, 0x79, 0x68, 0xd6, 0x55, 0xff, - 0x3c, 0xc5, 0xe4, 0x53, 0xf8, 0x45, 0xed, 0xae, 0x5c, 0x17, 0x1c, 0x97, 0x87, 0x6a, 0x6d, 0x9f, - 0xfd, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xa4, 0x63, 0x67, 0xf6, 0x22, 0x03, 0x00, 0x00, + // 389 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xc1, 0x6e, 0xda, 0x40, + 0x14, 0x45, 0xed, 0x62, 0x28, 0x0c, 0x50, 0xb5, 0x23, 0x16, 0x16, 0x45, 0xc6, 0xed, 0xca, 0x9b, + 0xda, 0x85, 0xae, 0xbb, 0xb1, 0x2a, 0xb5, 0xa8, 0x6a, 0x85, 0xdc, 0x2a, 0x8b, 0x6c, 0x90, 0xc1, + 0x23, 0xc7, 0x0a, 0xf0, 0x2c, 0xbf, 0x89, 0x15, 0x76, 0xf9, 0x84, 0x7c, 0x47, 0xbe, 0x84, 0x25, + 0xcb, 0xac, 0x92, 0x08, 0x7e, 0x24, 0xf2, 0x8c, 0x9d, 0x38, 0x8a, 0x93, 0x95, 0x3d, 0xf7, 0xde, + 0x39, 0xba, 0xf3, 0xf4, 0x88, 0xb9, 0x00, 0x5c, 0x01, 0x3a, 0x21, 0xa4, 0x4e, 0x3a, 0x9a, 0x33, + 0xee, 0x8f, 0x9c, 0x90, 0xad, 0x19, 0x46, 0x68, 0xc7, 0x09, 0x70, 0xa0, 0x54, 0x26, 0xec, 0x10, + 0x52, 0x3b, 0x4f, 0xf4, 0x7b, 0x21, 0x84, 0x20, 0x6c, 0x27, 0xfb, 0x93, 0xc9, 0xfe, 0xa0, 0x8a, + 0x05, 0xa9, 0x74, 0x3f, 0x5f, 0x68, 0xa4, 0xf3, 0x53, 0x92, 0xff, 0x71, 0x9f, 0x33, 0xfa, 0x95, + 0xf4, 0x90, 0xfb, 0x09, 0x8f, 0xd6, 0xe1, 0x2c, 0x4e, 0x20, 0x06, 0xf4, 0x97, 0xb3, 0x28, 0xd0, + 0x55, 0x53, 0xb5, 0x34, 0x8f, 0x16, 0xde, 0x34, 0xb7, 0x26, 0x01, 0x9d, 0x90, 0x66, 0xc0, 0x62, + 0xc0, 0x88, 0xa3, 0xfe, 0xc6, 0xac, 0x59, 0xed, 0xf1, 0x47, 0xfb, 0x79, 0x3b, 0xfb, 0x87, 0xcc, + 0xb8, 0xef, 0xb7, 0x37, 0x43, 0xe5, 0xea, 0x76, 0xd8, 0xcc, 0x05, 0xf4, 0x1e, 0xae, 0xd3, 0xef, + 0xa4, 0x9e, 0x02, 0x67, 0xa8, 0xd7, 0x04, 0x47, 0xaf, 0xe2, 0x1c, 0x01, 0x67, 0x6e, 0x37, 0x87, + 0xd4, 0xb3, 0x13, 0x7a, 0xf2, 0x16, 0xfd, 0x43, 0x5a, 0x45, 0x65, 0xd4, 0x35, 0x81, 0x18, 0x54, + 0x21, 0x8a, 0xf2, 0xee, 0x87, 0x1c, 0xd3, 0x2a, 0x14, 0xf4, 0x1e, 0x09, 0xf4, 0x2f, 0x79, 0x97, + 0x37, 0x9b, 0xc5, 0x7e, 0xe2, 0xaf, 0x50, 0xaf, 0x9b, 0xaa, 0xd5, 0x1e, 0x7f, 0x7a, 0xe5, 0x79, + 0x53, 0x11, 0x74, 0xb5, 0x0c, 0xec, 0x75, 0x83, 0xb2, 0x48, 0x7f, 0x93, 0x6e, 0x0a, 0x72, 0xb0, + 0x12, 0xd7, 0x10, 0x38, 0xf3, 0x85, 0x57, 0x66, 0x53, 0x2e, 0xd3, 0x3a, 0x69, 0x49, 0xa3, 0xbf, + 0x48, 0x87, 0xfb, 0xcb, 0xe5, 0xa6, 0x60, 0xbd, 0x15, 0xac, 0x61, 0x15, 0xeb, 0x7f, 0x96, 0x7b, + 0x82, 0x6a, 0xf3, 0x92, 0xe4, 0x6e, 0xf7, 0x86, 0xba, 0xdb, 0x1b, 0xea, 0xdd, 0xde, 0x50, 0x2f, + 0x0f, 0x86, 0xb2, 0x3b, 0x18, 0xca, 0xf5, 0xc1, 0x50, 0x8e, 0xad, 0x30, 0xe2, 0x27, 0x67, 0x73, + 0x7b, 0x01, 0x2b, 0x27, 0xdf, 0x22, 0xf9, 0xf9, 0x82, 0xc1, 0xa9, 0x73, 0x2e, 0x56, 0x8a, 0x6f, + 0x62, 0x86, 0xf3, 0x86, 0xd8, 0xa6, 0x6f, 0xf7, 0x01, 0x00, 0x00, 0xff, 0xff, 0x2d, 0x3b, 0x1a, + 0xbf, 0xb9, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/gov/types/gov.pb.go b/x/gov/types/gov.pb.go index 89a0042ae..97330037a 100644 --- a/x/gov/types/gov.pb.go +++ b/x/gov/types/gov.pb.go @@ -124,7 +124,7 @@ func (ProposalStatus) EnumDescriptor() ([]byte, []int) { // WeightedVoteOption defines a unit of vote for vote split. type WeightedVoteOption struct { Option VoteOption `protobuf:"varint,1,opt,name=option,proto3,enum=cosmos.gov.v1beta1.VoteOption" json:"option,omitempty"` - Weight github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=weight,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"weight" yaml:"weight"` + Weight github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=weight,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"weight"` } func (m *WeightedVoteOption) Reset() { *m = WeightedVoteOption{} } @@ -201,7 +201,7 @@ var xxx_messageInfo_TextProposal proto.InternalMessageInfo // Deposit defines an amount deposited by an account address to an active // proposal. type Deposit struct { - ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id,omitempty" yaml:"proposal_id"` + ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id,omitempty"` Depositor string `protobuf:"bytes,2,opt,name=depositor,proto3" json:"depositor,omitempty"` Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=amount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"amount"` } @@ -240,15 +240,15 @@ var xxx_messageInfo_Deposit proto.InternalMessageInfo // Proposal defines the core field members of a governance proposal. type Proposal struct { - ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"id" yaml:"id"` + ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"id"` Content *types1.Any `protobuf:"bytes,2,opt,name=content,proto3" json:"content,omitempty"` - Status ProposalStatus `protobuf:"varint,3,opt,name=status,proto3,enum=cosmos.gov.v1beta1.ProposalStatus" json:"status,omitempty" yaml:"proposal_status"` - FinalTallyResult TallyResult `protobuf:"bytes,4,opt,name=final_tally_result,json=finalTallyResult,proto3" json:"final_tally_result" yaml:"final_tally_result"` - SubmitTime time.Time `protobuf:"bytes,5,opt,name=submit_time,json=submitTime,proto3,stdtime" json:"submit_time" yaml:"submit_time"` - DepositEndTime time.Time `protobuf:"bytes,6,opt,name=deposit_end_time,json=depositEndTime,proto3,stdtime" json:"deposit_end_time" yaml:"deposit_end_time"` - TotalDeposit github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,7,rep,name=total_deposit,json=totalDeposit,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"total_deposit" yaml:"total_deposit"` - VotingStartTime time.Time `protobuf:"bytes,8,opt,name=voting_start_time,json=votingStartTime,proto3,stdtime" json:"voting_start_time" yaml:"voting_start_time"` - VotingEndTime time.Time `protobuf:"bytes,9,opt,name=voting_end_time,json=votingEndTime,proto3,stdtime" json:"voting_end_time" yaml:"voting_end_time"` + Status ProposalStatus `protobuf:"varint,3,opt,name=status,proto3,enum=cosmos.gov.v1beta1.ProposalStatus" json:"status,omitempty"` + FinalTallyResult TallyResult `protobuf:"bytes,4,opt,name=final_tally_result,json=finalTallyResult,proto3" json:"final_tally_result"` + SubmitTime time.Time `protobuf:"bytes,5,opt,name=submit_time,json=submitTime,proto3,stdtime" json:"submit_time"` + DepositEndTime time.Time `protobuf:"bytes,6,opt,name=deposit_end_time,json=depositEndTime,proto3,stdtime" json:"deposit_end_time"` + TotalDeposit github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,7,rep,name=total_deposit,json=totalDeposit,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"total_deposit"` + VotingStartTime time.Time `protobuf:"bytes,8,opt,name=voting_start_time,json=votingStartTime,proto3,stdtime" json:"voting_start_time"` + VotingEndTime time.Time `protobuf:"bytes,9,opt,name=voting_end_time,json=votingEndTime,proto3,stdtime" json:"voting_end_time"` } func (m *Proposal) Reset() { *m = Proposal{} } @@ -288,7 +288,7 @@ type TallyResult struct { Yes github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=yes,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"yes"` Abstain github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=abstain,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"abstain"` No github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=no,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"no"` - NoWithVeto github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=no_with_veto,json=noWithVeto,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"no_with_veto" yaml:"no_with_veto"` + NoWithVeto github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=no_with_veto,json=noWithVeto,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"no_with_veto"` } func (m *TallyResult) Reset() { *m = TallyResult{} } @@ -326,7 +326,7 @@ var xxx_messageInfo_TallyResult proto.InternalMessageInfo // Vote defines a vote on a governance proposal. // A Vote consists of a proposal ID, the voter, and the vote option. type Vote struct { - ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id,omitempty" yaml:"proposal_id"` + ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id,omitempty"` Voter string `protobuf:"bytes,2,opt,name=voter,proto3" json:"voter,omitempty"` // Deprecated: Prefer to use `options` instead. This field is set in queries // if and only if `len(options) == 1` and that option has weight 1. In all @@ -370,10 +370,10 @@ var xxx_messageInfo_Vote proto.InternalMessageInfo // DepositParams defines the params for deposits on governance proposals. type DepositParams struct { // Minimum deposit for a proposal to enter voting period. - MinDeposit github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=min_deposit,json=minDeposit,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"min_deposit,omitempty" yaml:"min_deposit"` + MinDeposit github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=min_deposit,json=minDeposit,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"min_deposit,omitempty"` // Maximum period for Atom holders to deposit on a proposal. Initial value: 2 // months. - MaxDepositPeriod time.Duration `protobuf:"bytes,2,opt,name=max_deposit_period,json=maxDepositPeriod,proto3,stdduration" json:"max_deposit_period,omitempty" yaml:"max_deposit_period"` + MaxDepositPeriod time.Duration `protobuf:"bytes,2,opt,name=max_deposit_period,json=maxDepositPeriod,proto3,stdduration" json:"max_deposit_period,omitempty"` } func (m *DepositParams) Reset() { *m = DepositParams{} } @@ -411,7 +411,7 @@ var xxx_messageInfo_DepositParams proto.InternalMessageInfo // VotingParams defines the params for voting on governance proposals. type VotingParams struct { // Length of the voting period. - VotingPeriod time.Duration `protobuf:"bytes,1,opt,name=voting_period,json=votingPeriod,proto3,stdduration" json:"voting_period,omitempty" yaml:"voting_period"` + VotingPeriod time.Duration `protobuf:"bytes,1,opt,name=voting_period,json=votingPeriod,proto3,stdduration" json:"voting_period,omitempty"` } func (m *VotingParams) Reset() { *m = VotingParams{} } @@ -455,7 +455,7 @@ type TallyParams struct { Threshold github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=threshold,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"threshold,omitempty"` // Minimum value of Veto votes to Total votes ratio for proposal to be // vetoed. Default value: 1/3. - VetoThreshold github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=veto_threshold,json=vetoThreshold,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"veto_threshold,omitempty" yaml:"veto_threshold"` + VetoThreshold github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=veto_threshold,json=vetoThreshold,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"veto_threshold,omitempty"` } func (m *TallyParams) Reset() { *m = TallyParams{} } @@ -507,100 +507,92 @@ func init() { func init() { proto.RegisterFile("cosmos/gov/v1beta1/gov.proto", fileDescriptor_6e82113c1a9a4b7c) } var fileDescriptor_6e82113c1a9a4b7c = []byte{ - // 1487 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0x31, 0x6c, 0xdb, 0x46, - 0x17, 0x16, 0x25, 0x59, 0xb6, 0x4e, 0xb2, 0xcd, 0x9c, 0x1d, 0x5b, 0xd6, 0x9f, 0x9f, 0x54, 0xd9, - 0x22, 0x30, 0x82, 0x58, 0x4e, 0xdc, 0x22, 0x45, 0x9d, 0x2e, 0xa2, 0x45, 0x37, 0x2a, 0x52, 0x49, - 0xa0, 0x14, 0x19, 0x49, 0x07, 0x82, 0x16, 0x2f, 0x32, 0x5b, 0x91, 0xa7, 0x8a, 0x27, 0xc7, 0x46, - 0x97, 0x8c, 0x81, 0x0a, 0x14, 0x19, 0x03, 0x14, 0x02, 0x02, 0x74, 0xeb, 0xda, 0xcc, 0x9d, 0x83, - 0xa2, 0x43, 0x90, 0x29, 0x68, 0x01, 0xa5, 0x71, 0x80, 0x22, 0xcd, 0xe8, 0xa1, 0x5b, 0x81, 0x82, - 0xbc, 0xa3, 0x4d, 0x49, 0x46, 0x1d, 0x35, 0x93, 0xc9, 0x77, 0xdf, 0xfb, 0xbe, 0x77, 0x9f, 0xee, - 0xbd, 0xa3, 0xc1, 0xb9, 0x3a, 0x76, 0x2c, 0xec, 0xac, 0x36, 0xf0, 0xee, 0xea, 0xee, 0xe5, 0x6d, - 0x44, 0xf4, 0xcb, 0xee, 0x73, 0xb6, 0xd5, 0xc6, 0x04, 0x43, 0x48, 0x57, 0xb3, 0x6e, 0x84, 0xad, - 0xa6, 0x05, 0x96, 0xb1, 0xad, 0x3b, 0xe8, 0x28, 0xa5, 0x8e, 0x4d, 0x9b, 0xe6, 0xa4, 0xe7, 0x1b, - 0xb8, 0x81, 0xbd, 0xc7, 0x55, 0xf7, 0x89, 0x45, 0xc5, 0x06, 0xc6, 0x8d, 0x26, 0x5a, 0xf5, 0xde, - 0xb6, 0x3b, 0xb7, 0x57, 0x89, 0x69, 0x21, 0x87, 0xe8, 0x56, 0x8b, 0x01, 0x96, 0x86, 0x01, 0xba, - 0xbd, 0xcf, 0x96, 0x84, 0xe1, 0x25, 0xa3, 0xd3, 0xd6, 0x89, 0x89, 0x7d, 0xc5, 0x25, 0x5a, 0x91, - 0x46, 0x45, 0x59, 0xc9, 0xde, 0x8b, 0xf4, 0x23, 0x07, 0xe0, 0x16, 0x32, 0x1b, 0x3b, 0x04, 0x19, - 0x35, 0x4c, 0x50, 0xa9, 0xe5, 0xe6, 0xc1, 0x2b, 0x20, 0x86, 0xbd, 0xa7, 0x14, 0x97, 0xe1, 0x96, - 0x67, 0xd6, 0x84, 0xec, 0xe8, 0x46, 0xb3, 0xc7, 0x78, 0x95, 0xa1, 0x21, 0x02, 0xb1, 0x3b, 0x1e, - 0x5b, 0x2a, 0x9c, 0xe1, 0x96, 0xe3, 0xf2, 0x67, 0x8f, 0xfb, 0x62, 0xe8, 0xd7, 0xbe, 0x78, 0xbe, - 0x61, 0x92, 0x9d, 0xce, 0x76, 0xb6, 0x8e, 0x2d, 0xa6, 0xcf, 0xfe, 0xac, 0x38, 0xc6, 0x97, 0xab, - 0x64, 0xbf, 0x85, 0x9c, 0x6c, 0x1e, 0xd5, 0x0f, 0xfb, 0xe2, 0xf4, 0xbe, 0x6e, 0x35, 0xd7, 0x25, - 0xca, 0x22, 0x3d, 0x7d, 0xb4, 0x02, 0x98, 0x72, 0x1e, 0xd5, 0x55, 0x46, 0x2e, 0x6d, 0x81, 0x64, - 0x15, 0xed, 0x91, 0x72, 0x1b, 0xb7, 0xb0, 0xa3, 0x37, 0xe1, 0x3c, 0x98, 0x20, 0x26, 0x69, 0x22, - 0xaf, 0xda, 0xb8, 0x4a, 0x5f, 0x60, 0x06, 0x24, 0x0c, 0xe4, 0xd4, 0xdb, 0x26, 0xdd, 0x89, 0x57, - 0x91, 0x1a, 0x0c, 0xad, 0xcf, 0xbe, 0x7a, 0x28, 0x72, 0x3f, 0x3f, 0x5a, 0x99, 0xdc, 0xc0, 0x36, - 0x41, 0x36, 0x91, 0xfe, 0xe4, 0xc0, 0x64, 0x1e, 0xb5, 0xb0, 0x63, 0x12, 0xf8, 0x21, 0x48, 0xb4, - 0x98, 0x80, 0x66, 0x1a, 0x1e, 0x75, 0x54, 0x5e, 0x38, 0xec, 0x8b, 0x90, 0x96, 0x18, 0x58, 0x94, - 0x54, 0xe0, 0xbf, 0x15, 0x0c, 0x78, 0x05, 0xc4, 0x0d, 0xca, 0x81, 0xdb, 0xcc, 0x87, 0xd4, 0xd3, - 0x47, 0x2b, 0xf3, 0x6c, 0x23, 0x39, 0xc3, 0x68, 0x23, 0xc7, 0xa9, 0x90, 0xb6, 0x69, 0x37, 0xd4, - 0x63, 0x28, 0xac, 0x83, 0x98, 0x6e, 0xe1, 0x8e, 0x4d, 0x52, 0x91, 0x4c, 0x64, 0x39, 0xb1, 0xb6, - 0xe4, 0x9b, 0xee, 0x9e, 0xa4, 0x23, 0xd7, 0x37, 0xb0, 0x69, 0xcb, 0x97, 0x5c, 0x5f, 0x7f, 0x78, - 0x2e, 0x2e, 0xbf, 0x81, 0xaf, 0x6e, 0x82, 0xa3, 0x32, 0xea, 0xf5, 0xa9, 0x7b, 0x0f, 0xc5, 0xd0, - 0xab, 0x87, 0x62, 0x48, 0xfa, 0x2b, 0x06, 0xa6, 0x8e, 0x1c, 0xfc, 0xe0, 0xa4, 0xcd, 0xce, 0xbd, - 0xee, 0x8b, 0x61, 0xd3, 0x38, 0xec, 0x8b, 0x71, 0xba, 0xe5, 0xe1, 0x9d, 0x5e, 0x05, 0x93, 0x75, - 0xea, 0x9c, 0xb7, 0xcf, 0xc4, 0xda, 0x7c, 0x96, 0x1e, 0xc5, 0xac, 0x7f, 0x14, 0xb3, 0x39, 0x7b, - 0x5f, 0x4e, 0x04, 0x2c, 0x56, 0xfd, 0x0c, 0x58, 0x03, 0x31, 0x87, 0xe8, 0xa4, 0xe3, 0xa4, 0x22, - 0xde, 0x19, 0x93, 0x4e, 0x3a, 0x63, 0x7e, 0x81, 0x15, 0x0f, 0x29, 0xa7, 0x0f, 0xfb, 0xe2, 0xc2, - 0x90, 0xfd, 0x94, 0x44, 0x52, 0x19, 0x1b, 0x6c, 0x01, 0x78, 0xdb, 0xb4, 0xf5, 0xa6, 0x46, 0xf4, - 0x66, 0x73, 0x5f, 0x6b, 0x23, 0xa7, 0xd3, 0x24, 0xa9, 0xa8, 0x57, 0x9f, 0x78, 0x92, 0x46, 0xd5, - 0xc5, 0xa9, 0x1e, 0x4c, 0x7e, 0xc7, 0x35, 0xf6, 0xb0, 0x2f, 0x2e, 0x51, 0x91, 0x51, 0x22, 0x49, - 0xe5, 0xbd, 0x60, 0x20, 0x09, 0x7e, 0x0e, 0x12, 0x4e, 0x67, 0xdb, 0x32, 0x89, 0xe6, 0x36, 0x6d, - 0x6a, 0xc2, 0x93, 0x4a, 0x8f, 0x58, 0x51, 0xf5, 0x3b, 0x5a, 0x16, 0x98, 0x0a, 0x3b, 0x49, 0x81, - 0x64, 0xe9, 0xfe, 0x73, 0x91, 0x53, 0x01, 0x8d, 0xb8, 0x09, 0xd0, 0x04, 0x3c, 0x3b, 0x22, 0x1a, - 0xb2, 0x0d, 0xaa, 0x10, 0x3b, 0x55, 0xe1, 0x5d, 0xa6, 0xb0, 0x48, 0x15, 0x86, 0x19, 0xa8, 0xcc, - 0x0c, 0x0b, 0x2b, 0xb6, 0xe1, 0x49, 0xdd, 0xe3, 0xc0, 0x34, 0xc1, 0x44, 0x6f, 0x6a, 0x6c, 0x21, - 0x35, 0x79, 0xda, 0x41, 0xbc, 0xc6, 0x74, 0xe6, 0xa9, 0xce, 0x40, 0xb6, 0x34, 0xd6, 0x01, 0x4d, - 0x7a, 0xb9, 0x7e, 0xf3, 0x35, 0xc1, 0x99, 0x5d, 0x4c, 0x4c, 0xbb, 0xe1, 0xfe, 0xbc, 0x6d, 0x66, - 0xec, 0xd4, 0xa9, 0xdb, 0x7e, 0x8f, 0x95, 0x93, 0xa2, 0xe5, 0x8c, 0x50, 0xd0, 0x7d, 0xcf, 0xd2, - 0x78, 0xc5, 0x0d, 0x7b, 0x1b, 0xbf, 0x0d, 0x58, 0xe8, 0xd8, 0xe2, 0xf8, 0xa9, 0x5a, 0x12, 0xd3, - 0x5a, 0x18, 0xd0, 0x1a, 0x74, 0x78, 0x9a, 0x46, 0x99, 0xc1, 0xeb, 0x51, 0x77, 0xde, 0x48, 0x77, - 0x23, 0x20, 0x11, 0x3c, 0x3e, 0x45, 0x10, 0xd9, 0x47, 0x0e, 0x9d, 0x5d, 0xf2, 0xc7, 0x63, 0x4c, - 0xcc, 0x82, 0x4d, 0x02, 0x03, 0xb2, 0x60, 0x13, 0xd5, 0x25, 0x82, 0x35, 0x30, 0xa9, 0x6f, 0x3b, - 0x44, 0x37, 0xd9, 0xcc, 0x7b, 0x4b, 0x4e, 0x9f, 0x0c, 0x5e, 0x07, 0x61, 0x1b, 0x7b, 0xcd, 0xfa, - 0xb6, 0x94, 0x61, 0x1b, 0xc3, 0x0e, 0x48, 0xda, 0x58, 0xbb, 0x63, 0x92, 0x1d, 0x6d, 0x17, 0x11, - 0xec, 0x35, 0x68, 0x5c, 0xae, 0x8c, 0xc7, 0x7b, 0xd8, 0x17, 0xe7, 0xa8, 0xfd, 0x41, 0x2e, 0x69, - 0x48, 0x0e, 0xd8, 0x78, 0xcb, 0x24, 0x3b, 0x35, 0x44, 0x30, 0xfb, 0x09, 0xfe, 0xe6, 0x40, 0xd4, - 0xbd, 0xbe, 0xfe, 0xfb, 0x90, 0xcf, 0x82, 0x89, 0x5d, 0x4c, 0xd0, 0xe9, 0x03, 0x9e, 0xc2, 0xe0, - 0xfa, 0xd1, 0x8d, 0x1a, 0x79, 0x93, 0x1b, 0x55, 0x0e, 0xa7, 0xb8, 0xa3, 0x5b, 0x75, 0x13, 0x4c, - 0xd2, 0x27, 0x27, 0x15, 0xf5, 0x1a, 0xf2, 0xfc, 0x49, 0xc9, 0xa3, 0xd7, 0xb8, 0x1c, 0x75, 0xdd, - 0x54, 0xfd, 0xe4, 0xf5, 0xa9, 0x07, 0xfe, 0xec, 0xff, 0x29, 0x0c, 0xa6, 0x59, 0xab, 0x95, 0xf5, - 0xb6, 0x6e, 0x39, 0xf0, 0x3b, 0x0e, 0x24, 0x2c, 0xd3, 0x3e, 0xea, 0x7c, 0xee, 0xb4, 0xce, 0xd7, - 0x5c, 0xee, 0xd7, 0x7d, 0xf1, 0x6c, 0x20, 0xeb, 0x22, 0xb6, 0x4c, 0x82, 0xac, 0x16, 0xd9, 0x3f, - 0x76, 0x30, 0xb0, 0x3c, 0xde, 0x40, 0x00, 0x96, 0x69, 0xfb, 0xe3, 0xe0, 0x5b, 0x0e, 0x40, 0x4b, - 0xdf, 0xf3, 0x89, 0xb4, 0x16, 0x6a, 0x9b, 0xd8, 0x60, 0x97, 0xce, 0xd2, 0x48, 0x93, 0xe6, 0xd9, - 0xf7, 0x8f, 0xac, 0xb0, 0x22, 0xcf, 0x8d, 0x26, 0x0f, 0xd4, 0xca, 0xc6, 0xfd, 0x28, 0x4a, 0x7a, - 0xe0, 0xb6, 0x31, 0x6f, 0xe9, 0x7b, 0xbe, 0x5d, 0x34, 0xfc, 0x0d, 0x07, 0x92, 0x35, 0xaf, 0xb7, - 0x99, 0x7f, 0x5f, 0x03, 0xd6, 0xeb, 0x7e, 0x6d, 0xdc, 0x69, 0xb5, 0x5d, 0x65, 0xb5, 0x2d, 0x0e, - 0xe4, 0x0d, 0x94, 0x35, 0x3f, 0x30, 0x5a, 0x82, 0x15, 0x25, 0x69, 0x8c, 0x55, 0xf3, 0x5b, 0x98, - 0x4d, 0x14, 0x56, 0xcc, 0x2d, 0x10, 0xfb, 0xaa, 0x83, 0xdb, 0x1d, 0xcb, 0xab, 0x22, 0x29, 0xcb, - 0xe3, 0x7d, 0x86, 0xbd, 0xee, 0x8b, 0x3c, 0xcd, 0x3f, 0xae, 0x46, 0x65, 0x8c, 0xb0, 0x0e, 0xe2, - 0x64, 0xa7, 0x8d, 0x9c, 0x1d, 0xdc, 0xa4, 0x3f, 0x40, 0x92, 0xba, 0x3c, 0x16, 0xfd, 0xdc, 0x11, - 0x45, 0x40, 0xe1, 0x98, 0x17, 0x76, 0x39, 0x30, 0xe3, 0x76, 0xb2, 0x76, 0x2c, 0x15, 0xf1, 0xa4, - 0xea, 0x63, 0x4b, 0xa5, 0x06, 0x79, 0x06, 0xfc, 0x3d, 0xcb, 0xfc, 0x1d, 0x40, 0x48, 0xea, 0xb4, - 0x1b, 0xa8, 0xfa, 0xef, 0x17, 0xfe, 0xe0, 0x00, 0x08, 0x7c, 0x1b, 0x5f, 0x04, 0x8b, 0xb5, 0x52, - 0x55, 0xd1, 0x4a, 0xe5, 0x6a, 0xa1, 0x54, 0xd4, 0x6e, 0x14, 0x2b, 0x65, 0x65, 0xa3, 0xb0, 0x59, - 0x50, 0xf2, 0x7c, 0x28, 0x3d, 0xdb, 0xed, 0x65, 0x12, 0x14, 0xa8, 0xb8, 0x22, 0x50, 0x02, 0xb3, - 0x41, 0xf4, 0x4d, 0xa5, 0xc2, 0x73, 0xe9, 0xe9, 0x6e, 0x2f, 0x13, 0xa7, 0xa8, 0x9b, 0xc8, 0x81, - 0x17, 0xc0, 0x5c, 0x10, 0x93, 0x93, 0x2b, 0xd5, 0x5c, 0xa1, 0xc8, 0x87, 0xd3, 0x67, 0xba, 0xbd, - 0xcc, 0x34, 0xc5, 0xe5, 0xd8, 0x10, 0xce, 0x80, 0x99, 0x20, 0xb6, 0x58, 0xe2, 0x23, 0xe9, 0x64, - 0xb7, 0x97, 0x99, 0xa2, 0xb0, 0x22, 0x86, 0x6b, 0x20, 0x35, 0x88, 0xd0, 0xb6, 0x0a, 0xd5, 0x6b, - 0x5a, 0x4d, 0xa9, 0x96, 0xf8, 0x68, 0x7a, 0xbe, 0xdb, 0xcb, 0xf0, 0x3e, 0xd6, 0x9f, 0x8a, 0xe9, - 0xe8, 0xbd, 0xef, 0x85, 0xd0, 0x85, 0x5f, 0xc2, 0x60, 0x66, 0xf0, 0x83, 0x0b, 0x66, 0xc1, 0xff, - 0xca, 0x6a, 0xa9, 0x5c, 0xaa, 0xe4, 0xae, 0x6b, 0x95, 0x6a, 0xae, 0x7a, 0xa3, 0x32, 0xb4, 0x61, - 0x6f, 0x2b, 0x14, 0x5c, 0x34, 0x9b, 0xf0, 0x2a, 0x10, 0x86, 0xf1, 0x79, 0xa5, 0x5c, 0xaa, 0x14, - 0xaa, 0x5a, 0x59, 0x51, 0x0b, 0xa5, 0x3c, 0xcf, 0xa5, 0x17, 0xbb, 0xbd, 0xcc, 0x1c, 0x4d, 0x19, - 0x68, 0x2a, 0xf8, 0x11, 0xf8, 0xff, 0x70, 0x72, 0xad, 0x54, 0x2d, 0x14, 0x3f, 0xf1, 0x73, 0xc3, - 0xe9, 0x85, 0x6e, 0x2f, 0x03, 0x69, 0x6e, 0x2d, 0xd0, 0x01, 0xf0, 0x22, 0x58, 0x18, 0x4e, 0x2d, - 0xe7, 0x2a, 0x15, 0x25, 0xcf, 0x47, 0xd2, 0x7c, 0xb7, 0x97, 0x49, 0xd2, 0x9c, 0xb2, 0xee, 0x38, - 0xc8, 0x80, 0x97, 0x40, 0x6a, 0x18, 0xad, 0x2a, 0x9f, 0x2a, 0x1b, 0x55, 0x25, 0xcf, 0x47, 0xd3, - 0xb0, 0xdb, 0xcb, 0xcc, 0x50, 0xbc, 0x8a, 0xbe, 0x40, 0x75, 0x82, 0x4e, 0xe4, 0xdf, 0xcc, 0x15, - 0xae, 0x2b, 0x79, 0x7e, 0x22, 0xc8, 0xbf, 0xa9, 0x9b, 0x4d, 0x64, 0x50, 0x3b, 0xe5, 0xe2, 0xe3, - 0x17, 0x42, 0xe8, 0xd9, 0x0b, 0x21, 0x74, 0xf7, 0x40, 0x08, 0x3d, 0x3e, 0x10, 0xb8, 0x27, 0x07, - 0x02, 0xf7, 0xfb, 0x81, 0xc0, 0xdd, 0x7f, 0x29, 0x84, 0x9e, 0xbc, 0x14, 0x42, 0xcf, 0x5e, 0x0a, - 0xa1, 0x5b, 0xff, 0x3e, 0x10, 0xf7, 0xbc, 0x7f, 0x3c, 0xbd, 0xf3, 0xbc, 0x1d, 0xf3, 0x66, 0xc8, - 0xfb, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x08, 0x25, 0x3f, 0x0c, 0x93, 0x0e, 0x00, 0x00, + // 1352 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcf, 0x6f, 0x13, 0xc7, + 0x17, 0xf7, 0xda, 0x8e, 0x93, 0x3c, 0x3b, 0xc9, 0x32, 0xe4, 0x0b, 0x8e, 0xbf, 0x7c, 0xed, 0x95, + 0xbf, 0x12, 0x8d, 0x10, 0x71, 0x20, 0x95, 0x90, 0x1a, 0x7a, 0xb1, 0xe3, 0x4d, 0x6b, 0x14, 0xd9, + 0xd6, 0x7a, 0x71, 0x04, 0x87, 0xae, 0x36, 0xde, 0xc1, 0xd9, 0xd6, 0xbb, 0x63, 0xbc, 0xe3, 0x90, + 0xdc, 0x7a, 0xa9, 0x84, 0x7c, 0xe2, 0xc8, 0xc5, 0x12, 0x6a, 0x6f, 0x3d, 0xf5, 0xc0, 0x3f, 0xd0, + 0x1b, 0xaa, 0x7a, 0xa0, 0x9c, 0x50, 0x0f, 0xa1, 0x04, 0xb5, 0xa2, 0xfc, 0x15, 0xd5, 0xce, 0xcc, + 0x26, 0x1b, 0x27, 0x6a, 0x70, 0xe9, 0x29, 0xbb, 0x33, 0x9f, 0x1f, 0xf3, 0x9e, 0xdf, 0x7b, 0xb3, + 0x81, 0x4b, 0x2d, 0xe2, 0x39, 0xc4, 0x5b, 0x6e, 0x93, 0x9d, 0xe5, 0x9d, 0xeb, 0x5b, 0x98, 0x9a, + 0xd7, 0xfd, 0xe7, 0x42, 0xb7, 0x47, 0x28, 0x41, 0x88, 0xef, 0x16, 0xfc, 0x15, 0xb1, 0x9b, 0xc9, + 0x0a, 0xc6, 0x96, 0xe9, 0xe1, 0x43, 0x4a, 0x8b, 0xd8, 0x2e, 0xe7, 0x64, 0xe6, 0xdb, 0xa4, 0x4d, + 0xd8, 0xe3, 0xb2, 0xff, 0x24, 0x56, 0x73, 0x6d, 0x42, 0xda, 0x1d, 0xbc, 0xcc, 0xde, 0xb6, 0xfa, + 0xf7, 0x96, 0xa9, 0xed, 0x60, 0x8f, 0x9a, 0x4e, 0x57, 0x00, 0x16, 0x46, 0x01, 0xa6, 0xbb, 0x27, + 0xb6, 0xb2, 0xa3, 0x5b, 0x56, 0xbf, 0x67, 0x52, 0x9b, 0x04, 0x8e, 0x0b, 0xfc, 0x44, 0x06, 0x37, + 0x15, 0x47, 0x66, 0x2f, 0xf9, 0x6f, 0x25, 0x40, 0x9b, 0xd8, 0x6e, 0x6f, 0x53, 0x6c, 0x35, 0x09, + 0xc5, 0xb5, 0xae, 0xcf, 0x43, 0x37, 0x20, 0x41, 0xd8, 0x53, 0x5a, 0x52, 0xa4, 0xc5, 0xd9, 0x95, + 0x6c, 0xe1, 0x64, 0xa0, 0x85, 0x23, 0xbc, 0x26, 0xd0, 0x48, 0x87, 0xc4, 0x03, 0xa6, 0x96, 0x8e, + 0x2a, 0xd2, 0xe2, 0x74, 0xe9, 0xd3, 0x67, 0xfb, 0xb9, 0xc8, 0xaf, 0xfb, 0xb9, 0xcb, 0x6d, 0x9b, + 0x6e, 0xf7, 0xb7, 0x0a, 0x2d, 0xe2, 0x08, 0x7f, 0xf1, 0x67, 0xc9, 0xb3, 0xbe, 0x5a, 0xa6, 0x7b, + 0x5d, 0xec, 0x15, 0xca, 0xb8, 0xf5, 0xe2, 0xe9, 0x12, 0x08, 0xa3, 0x32, 0x6e, 0x69, 0x42, 0x2b, + 0xbf, 0x09, 0x29, 0x1d, 0xef, 0xd2, 0x7a, 0x8f, 0x74, 0x89, 0x67, 0x76, 0xd0, 0x3c, 0x4c, 0x50, + 0x9b, 0x76, 0x30, 0x3b, 0xdc, 0xb4, 0xc6, 0x5f, 0x90, 0x02, 0x49, 0x0b, 0x7b, 0xad, 0x9e, 0xcd, + 0x0f, 0xce, 0x0e, 0xa0, 0x85, 0x97, 0x56, 0xe7, 0xde, 0x3e, 0xc9, 0x49, 0x3f, 0x3d, 0x5d, 0x9a, + 0x5c, 0x23, 0x2e, 0xc5, 0x2e, 0xcd, 0xff, 0x22, 0xc1, 0x64, 0x19, 0x77, 0x89, 0x67, 0x53, 0x94, + 0x83, 0x64, 0x57, 0x18, 0x18, 0xb6, 0xc5, 0xa4, 0xe3, 0x1a, 0x04, 0x4b, 0x15, 0x0b, 0xdd, 0x80, + 0x69, 0x8b, 0x63, 0x49, 0x4f, 0x84, 0x97, 0x7e, 0xf1, 0x74, 0x69, 0x5e, 0x1c, 0xb8, 0x68, 0x59, + 0x3d, 0xec, 0x79, 0x0d, 0xda, 0xb3, 0xdd, 0xb6, 0x76, 0x04, 0x45, 0x2d, 0x48, 0x98, 0x0e, 0xe9, + 0xbb, 0x34, 0x1d, 0x53, 0x62, 0x8b, 0xc9, 0x95, 0x85, 0x20, 0x97, 0x7e, 0x81, 0x1c, 0x26, 0x73, + 0x8d, 0xd8, 0x6e, 0xe9, 0x9a, 0x9f, 0xae, 0xef, 0x5f, 0xe5, 0x16, 0xdf, 0x23, 0x5d, 0x3e, 0xc1, + 0xd3, 0x84, 0xf4, 0xea, 0xd4, 0xc3, 0x27, 0xb9, 0xc8, 0xdb, 0x27, 0xb9, 0x48, 0xfe, 0x87, 0x09, + 0x98, 0x3a, 0xcc, 0xd4, 0x47, 0xa7, 0x04, 0x55, 0x4a, 0xbc, 0xdb, 0xcf, 0x45, 0x6d, 0xeb, 0x58, + 0x70, 0x37, 0x61, 0xb2, 0xc5, 0x93, 0xc2, 0x42, 0x4b, 0xae, 0xcc, 0x17, 0x78, 0x51, 0x15, 0x82, + 0xa2, 0x2a, 0x14, 0xdd, 0xbd, 0x52, 0x32, 0x94, 0x3d, 0x2d, 0x60, 0xa0, 0x55, 0x48, 0x78, 0xd4, + 0xa4, 0x7d, 0x2f, 0x1d, 0x63, 0xd5, 0x92, 0x3f, 0xad, 0x5a, 0x82, 0x33, 0x35, 0x18, 0x52, 0x13, + 0x0c, 0xd4, 0x00, 0x74, 0xcf, 0x76, 0xcd, 0x8e, 0x41, 0xcd, 0x4e, 0x67, 0xcf, 0xe8, 0x61, 0xaf, + 0xdf, 0xa1, 0xe9, 0x38, 0x3b, 0x43, 0xee, 0x34, 0x1d, 0xdd, 0xc7, 0x69, 0x0c, 0x56, 0x8a, 0xfb, + 0xf9, 0xd2, 0x64, 0x26, 0x10, 0x5a, 0x47, 0x2a, 0x24, 0xbd, 0xfe, 0x96, 0x63, 0x53, 0xc3, 0xef, + 0xa2, 0xf4, 0x04, 0x53, 0xcb, 0x9c, 0x88, 0x48, 0x0f, 0x5a, 0xac, 0x34, 0xe5, 0x0b, 0x3d, 0x7a, + 0x95, 0x93, 0x34, 0xe0, 0x44, 0x7f, 0x0b, 0x55, 0x41, 0x16, 0x3f, 0xa3, 0x81, 0x5d, 0x8b, 0x6b, + 0x25, 0xc6, 0xd0, 0x9a, 0x15, 0x6c, 0xd5, 0xb5, 0x98, 0x5e, 0x17, 0x66, 0x28, 0xa1, 0x66, 0xc7, + 0x10, 0xeb, 0xe9, 0xc9, 0x7f, 0xbf, 0x20, 0x52, 0xcc, 0x21, 0x28, 0xea, 0x3a, 0x9c, 0xdb, 0x21, + 0xd4, 0x76, 0xdb, 0x86, 0x47, 0xcd, 0x9e, 0x48, 0xc7, 0xd4, 0x18, 0x21, 0xcc, 0x71, 0x7a, 0xc3, + 0x67, 0xb3, 0x18, 0x36, 0x40, 0x2c, 0x1d, 0xa5, 0x64, 0x7a, 0x0c, 0xbd, 0x19, 0x4e, 0x16, 0x19, + 0x59, 0x8d, 0xfb, 0x1d, 0x99, 0xff, 0x33, 0x0a, 0xc9, 0xf0, 0xcf, 0x57, 0x85, 0xd8, 0x1e, 0xf6, + 0x78, 0x77, 0x8f, 0x35, 0x42, 0x2a, 0x2e, 0x0d, 0x8d, 0x90, 0x8a, 0x4b, 0x35, 0x5f, 0x08, 0x35, + 0x61, 0xd2, 0xdc, 0xf2, 0xa8, 0x69, 0xbb, 0xff, 0x60, 0x2c, 0x9d, 0xd4, 0x0c, 0xc4, 0xd0, 0x06, + 0x44, 0x5d, 0xc2, 0x6a, 0xfe, 0x43, 0x25, 0xa3, 0x2e, 0x41, 0x5f, 0x40, 0xca, 0x25, 0xc6, 0x03, + 0x9b, 0x6e, 0x1b, 0x3b, 0x98, 0x12, 0xd6, 0x03, 0x1f, 0xaa, 0x0b, 0x2e, 0xd9, 0xb4, 0xe9, 0x76, + 0x13, 0x53, 0x22, 0x72, 0xfd, 0xbb, 0x04, 0x71, 0x7f, 0x70, 0x9f, 0x3d, 0xef, 0x0a, 0x30, 0xb1, + 0x43, 0x28, 0x3e, 0x7b, 0xd6, 0x71, 0x98, 0x3f, 0x05, 0xc4, 0x9d, 0x11, 0x7b, 0x9f, 0x3b, 0xa3, + 0x14, 0x4d, 0x4b, 0x87, 0xf7, 0xc6, 0x3a, 0x4c, 0xf2, 0x27, 0x2f, 0x1d, 0x67, 0x3d, 0x71, 0xf9, + 0x34, 0xf2, 0xc9, 0x8b, 0x4a, 0x4c, 0x80, 0x80, 0xbc, 0x3a, 0xf5, 0x38, 0x18, 0x83, 0x83, 0x28, + 0xcc, 0x88, 0x2e, 0xa8, 0x9b, 0x3d, 0xd3, 0xf1, 0xd0, 0x37, 0x12, 0x24, 0x1d, 0xdb, 0x3d, 0x6c, + 0x3e, 0xe9, 0xac, 0xe6, 0xab, 0xf8, 0xda, 0xef, 0xf6, 0x73, 0xff, 0x09, 0xb1, 0xae, 0x12, 0xc7, + 0xa6, 0xd8, 0xe9, 0xd2, 0xbd, 0xb1, 0xba, 0x12, 0x1c, 0xdb, 0x0d, 0x7a, 0xf2, 0x3e, 0x20, 0xc7, + 0xdc, 0x0d, 0x04, 0x8d, 0x2e, 0xee, 0xd9, 0xc4, 0x12, 0x53, 0x77, 0xe1, 0x44, 0x13, 0x95, 0xc5, + 0x55, 0x5e, 0x5a, 0x14, 0xa7, 0xb9, 0x74, 0x92, 0x7c, 0x74, 0xa8, 0xc7, 0x7e, 0x8f, 0xc9, 0x8e, + 0xb9, 0x1b, 0x84, 0xce, 0xf6, 0xf3, 0x1e, 0xa4, 0x9a, 0xac, 0xef, 0x44, 0x2a, 0x5a, 0x20, 0xfa, + 0x30, 0x70, 0x97, 0xce, 0x72, 0xff, 0xbf, 0x70, 0xbf, 0x78, 0x8c, 0x37, 0x62, 0x9c, 0xe2, 0x9b, + 0xc2, 0xf4, 0xc7, 0xa0, 0xab, 0x85, 0xe9, 0x5d, 0x48, 0xdc, 0xef, 0x93, 0x5e, 0xdf, 0x61, 0x6e, + 0xa9, 0x52, 0x69, 0xbc, 0x6f, 0x83, 0x77, 0xfb, 0x39, 0x99, 0xf3, 0x8f, 0x5c, 0x35, 0xa1, 0x88, + 0x5a, 0x30, 0x4d, 0xb7, 0x7b, 0xd8, 0xdb, 0x26, 0x1d, 0x9e, 0xca, 0x54, 0x49, 0x1d, 0x5b, 0xfe, + 0xfc, 0xa1, 0x44, 0xc8, 0xe1, 0x48, 0x17, 0xdd, 0x87, 0x59, 0xbf, 0x31, 0x8d, 0x23, 0xa7, 0x18, + 0x73, 0xba, 0x35, 0xb6, 0x53, 0xfa, 0xb8, 0x4e, 0xc8, 0x6e, 0xc6, 0xdf, 0xd1, 0x83, 0x8d, 0x2b, + 0x7f, 0x48, 0x00, 0xa1, 0xcf, 0xb2, 0xab, 0x70, 0xb1, 0x59, 0xd3, 0x55, 0xa3, 0x56, 0xd7, 0x2b, + 0xb5, 0xaa, 0x71, 0xbb, 0xda, 0xa8, 0xab, 0x6b, 0x95, 0xf5, 0x8a, 0x5a, 0x96, 0x23, 0x99, 0xb9, + 0xc1, 0x50, 0x49, 0x72, 0xa0, 0xea, 0x6b, 0xa1, 0x3c, 0xcc, 0x85, 0xd1, 0x77, 0xd4, 0x86, 0x2c, + 0x65, 0x66, 0x06, 0x43, 0x65, 0x9a, 0xa3, 0xee, 0x60, 0x0f, 0x5d, 0x81, 0xf3, 0x61, 0x4c, 0xb1, + 0xd4, 0xd0, 0x8b, 0x95, 0xaa, 0x1c, 0xcd, 0x9c, 0x1b, 0x0c, 0x95, 0x19, 0x8e, 0x2b, 0x8a, 0x71, + 0xa7, 0xc0, 0x6c, 0x18, 0x5b, 0xad, 0xc9, 0xb1, 0x4c, 0x6a, 0x30, 0x54, 0xa6, 0x38, 0xac, 0x4a, + 0xd0, 0x0a, 0xa4, 0x8f, 0x23, 0x8c, 0xcd, 0x8a, 0xfe, 0xb9, 0xd1, 0x54, 0xf5, 0x9a, 0x1c, 0xcf, + 0xcc, 0x0f, 0x86, 0x8a, 0x1c, 0x60, 0x83, 0xb1, 0x94, 0x89, 0x3f, 0xfc, 0x2e, 0x1b, 0xb9, 0xf2, + 0x73, 0x14, 0x66, 0x8f, 0x7f, 0x21, 0xa0, 0x02, 0xfc, 0xb7, 0xae, 0xd5, 0xea, 0xb5, 0x46, 0x71, + 0xc3, 0x68, 0xe8, 0x45, 0xfd, 0x76, 0x63, 0x24, 0x60, 0x16, 0x0a, 0x07, 0x57, 0xed, 0x0e, 0xba, + 0x09, 0xd9, 0x51, 0x7c, 0x59, 0xad, 0xd7, 0x1a, 0x15, 0xdd, 0xa8, 0xab, 0x5a, 0xa5, 0x56, 0x96, + 0xa5, 0xcc, 0xc5, 0xc1, 0x50, 0x39, 0xcf, 0x29, 0xc7, 0x3a, 0x04, 0x7d, 0x02, 0xff, 0x1b, 0x25, + 0x37, 0x6b, 0x7a, 0xa5, 0xfa, 0x59, 0xc0, 0x8d, 0x66, 0x2e, 0x0c, 0x86, 0x0a, 0xe2, 0xdc, 0x66, + 0xa8, 0xce, 0xd1, 0x55, 0xb8, 0x30, 0x4a, 0xad, 0x17, 0x1b, 0x0d, 0xb5, 0x2c, 0xc7, 0x32, 0xf2, + 0x60, 0xa8, 0xa4, 0x38, 0xa7, 0x6e, 0x7a, 0x1e, 0xb6, 0xd0, 0x35, 0x48, 0x8f, 0xa2, 0x35, 0xf5, + 0x96, 0xba, 0xa6, 0xab, 0x65, 0x39, 0x9e, 0x41, 0x83, 0xa1, 0x32, 0x2b, 0xbe, 0x90, 0xf0, 0x97, + 0xb8, 0x45, 0xf1, 0xa9, 0xfa, 0xeb, 0xc5, 0xca, 0x86, 0x5a, 0x96, 0x27, 0xc2, 0xfa, 0xeb, 0xa6, + 0xdd, 0xc1, 0x16, 0x4f, 0x67, 0xa9, 0xfa, 0xec, 0x75, 0x36, 0xf2, 0xf2, 0x75, 0x36, 0xf2, 0xf5, + 0x41, 0x36, 0xf2, 0xec, 0x20, 0x2b, 0x3d, 0x3f, 0xc8, 0x4a, 0xbf, 0x1d, 0x64, 0xa5, 0x47, 0x6f, + 0xb2, 0x91, 0xe7, 0x6f, 0xb2, 0x91, 0x97, 0x6f, 0xb2, 0x91, 0xbb, 0x7f, 0x3f, 0xbf, 0x76, 0xd9, + 0xff, 0x3c, 0xac, 0x6c, 0xb7, 0x12, 0x6c, 0x22, 0x7c, 0xfc, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x8c, 0x21, 0xa9, 0x1b, 0x0e, 0x0d, 0x00, 0x00, } func (this *TextProposal) Equal(that interface{}) bool { diff --git a/x/gov/types/msgs.go b/x/gov/types/msgs.go index d85964345..5ab560ccf 100644 --- a/x/gov/types/msgs.go +++ b/x/gov/types/msgs.go @@ -3,7 +3,7 @@ package types import ( "fmt" - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" "github.com/gogo/protobuf/proto" diff --git a/x/gov/types/params.go b/x/gov/types/params.go index 95621e100..0313076d8 100644 --- a/x/gov/types/params.go +++ b/x/gov/types/params.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" diff --git a/x/gov/types/proposal.go b/x/gov/types/proposal.go index f7d5d9d4d..66e9c28fb 100644 --- a/x/gov/types/proposal.go +++ b/x/gov/types/proposal.go @@ -6,7 +6,7 @@ import ( "time" "github.com/gogo/protobuf/proto" - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/gov/types/tally.go b/x/gov/types/tally.go index 3d5efe51c..247bcecbc 100644 --- a/x/gov/types/tally.go +++ b/x/gov/types/tally.go @@ -1,7 +1,7 @@ package types import ( - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/gov/types/tx.pb.go b/x/gov/types/tx.pb.go index 483eeb198..77dc90080 100644 --- a/x/gov/types/tx.pb.go +++ b/x/gov/types/tx.pb.go @@ -36,7 +36,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // proposal Content. type MsgSubmitProposal struct { Content *types.Any `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"` - InitialDeposit github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=initial_deposit,json=initialDeposit,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"initial_deposit" yaml:"initial_deposit"` + InitialDeposit github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=initial_deposit,json=initialDeposit,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"initial_deposit"` Proposer string `protobuf:"bytes,3,opt,name=proposer,proto3" json:"proposer,omitempty"` } @@ -74,7 +74,7 @@ var xxx_messageInfo_MsgSubmitProposal proto.InternalMessageInfo // MsgSubmitProposalResponse defines the Msg/SubmitProposal response type. type MsgSubmitProposalResponse struct { - ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id" yaml:"proposal_id"` + ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id"` } func (m *MsgSubmitProposalResponse) Reset() { *m = MsgSubmitProposalResponse{} } @@ -119,7 +119,7 @@ func (m *MsgSubmitProposalResponse) GetProposalId() uint64 { // MsgVote defines a message to cast a vote. type MsgVote struct { - ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id" yaml:"proposal_id"` + ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id"` Voter string `protobuf:"bytes,2,opt,name=voter,proto3" json:"voter,omitempty"` Option VoteOption `protobuf:"varint,3,opt,name=option,proto3,enum=cosmos.gov.v1beta1.VoteOption" json:"option,omitempty"` } @@ -195,7 +195,7 @@ var xxx_messageInfo_MsgVoteResponse proto.InternalMessageInfo // MsgVoteWeighted defines a message to cast a vote. type MsgVoteWeighted struct { - ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id,omitempty" yaml:"proposal_id"` + ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id,omitempty"` Voter string `protobuf:"bytes,2,opt,name=voter,proto3" json:"voter,omitempty"` Options []WeightedVoteOption `protobuf:"bytes,3,rep,name=options,proto3" json:"options"` } @@ -271,7 +271,7 @@ var xxx_messageInfo_MsgVoteWeightedResponse proto.InternalMessageInfo // MsgDeposit defines a message to submit a deposit to an existing proposal. type MsgDeposit struct { - ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id" yaml:"proposal_id"` + ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id"` Depositor string `protobuf:"bytes,2,opt,name=depositor,proto3" json:"depositor,omitempty"` Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=amount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"amount"` } @@ -359,50 +359,48 @@ func init() { func init() { proto.RegisterFile("cosmos/gov/v1beta1/tx.proto", fileDescriptor_3c053992595e3dce) } var fileDescriptor_3c053992595e3dce = []byte{ - // 680 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x41, 0x6b, 0x13, 0x41, - 0x14, 0xde, 0x4d, 0x6a, 0x63, 0x27, 0xd2, 0xda, 0x21, 0xd4, 0x24, 0x95, 0xdd, 0x10, 0x69, 0x09, - 0x48, 0x76, 0x6d, 0x94, 0x0a, 0xf5, 0xd4, 0xad, 0x14, 0x15, 0x82, 0xba, 0x05, 0x05, 0x2f, 0x75, - 0x93, 0x9d, 0x4e, 0x17, 0x93, 0x9d, 0x25, 0x33, 0x09, 0xcd, 0x4d, 0xf0, 0xe2, 0x49, 0x3c, 0x7a, - 0xec, 0x55, 0xcf, 0xfd, 0x11, 0x45, 0x2f, 0x45, 0x3c, 0x78, 0x90, 0x28, 0xed, 0x45, 0xc4, 0x53, - 0x7f, 0x81, 0xec, 0xce, 0xcc, 0xb6, 0xb6, 0xdb, 0xb4, 0x42, 0x3d, 0x25, 0xf3, 0xbe, 0xf7, 0xbd, - 0xbc, 0xef, 0x9b, 0xf7, 0x32, 0x60, 0xba, 0x49, 0x68, 0x9b, 0x50, 0x13, 0x93, 0x9e, 0xd9, 0x9b, - 0x6b, 0x20, 0xe6, 0xcc, 0x99, 0x6c, 0xc3, 0x08, 0x3a, 0x84, 0x11, 0x08, 0x39, 0x68, 0x60, 0xd2, - 0x33, 0x04, 0x58, 0xd4, 0x04, 0xa1, 0xe1, 0x50, 0x14, 0x33, 0x9a, 0xc4, 0xf3, 0x39, 0xa7, 0x78, - 0x35, 0xa1, 0x60, 0xc8, 0xe7, 0x68, 0x81, 0xa3, 0xab, 0xd1, 0xc9, 0x14, 0xe5, 0x39, 0x94, 0xc3, - 0x04, 0x13, 0x1e, 0x0f, 0xbf, 0x49, 0x02, 0x26, 0x04, 0xb7, 0x90, 0x19, 0x9d, 0x1a, 0xdd, 0x35, - 0xd3, 0xf1, 0xfb, 0x1c, 0x2a, 0xbf, 0x4f, 0x81, 0xc9, 0x3a, 0xc5, 0x2b, 0xdd, 0x46, 0xdb, 0x63, - 0x8f, 0x3a, 0x24, 0x20, 0xd4, 0x69, 0xc1, 0x3b, 0x20, 0xd3, 0x24, 0x3e, 0x43, 0x3e, 0xcb, 0xab, - 0x25, 0xb5, 0x92, 0xad, 0xe5, 0x0c, 0x5e, 0xc2, 0x90, 0x25, 0x8c, 0x45, 0xbf, 0x6f, 0x65, 0x3f, - 0x6e, 0x55, 0x33, 0x4b, 0x3c, 0xd1, 0x96, 0x0c, 0xf8, 0x46, 0x05, 0x13, 0x9e, 0xef, 0x31, 0xcf, - 0x69, 0xad, 0xba, 0x28, 0x20, 0xd4, 0x63, 0xf9, 0x54, 0x29, 0x5d, 0xc9, 0xd6, 0x0a, 0x86, 0x68, - 0x36, 0xd4, 0x2d, 0xcd, 0x30, 0x96, 0x88, 0xe7, 0x5b, 0x0f, 0xb6, 0x07, 0xba, 0xb2, 0x3f, 0xd0, - 0xa7, 0xfa, 0x4e, 0xbb, 0xb5, 0x50, 0x3e, 0xc2, 0x2f, 0x7f, 0xf8, 0xae, 0x57, 0xb0, 0xc7, 0xd6, - 0xbb, 0x0d, 0xa3, 0x49, 0xda, 0x42, 0xb3, 0xf8, 0xa8, 0x52, 0xf7, 0x85, 0xc9, 0xfa, 0x01, 0xa2, - 0x51, 0x29, 0x6a, 0x8f, 0x0b, 0xf6, 0x5d, 0x4e, 0x86, 0xb7, 0xc0, 0xc5, 0x20, 0x52, 0x86, 0x3a, - 0xf9, 0x74, 0x49, 0xad, 0x8c, 0x59, 0xf9, 0xcf, 0x5b, 0xd5, 0x9c, 0xe8, 0x65, 0xd1, 0x75, 0x3b, - 0x88, 0xd2, 0x15, 0xd6, 0xf1, 0x7c, 0x6c, 0xc7, 0x99, 0x0b, 0x97, 0x5f, 0x6f, 0xea, 0xca, 0xbb, - 0x4d, 0x5d, 0xf9, 0xb9, 0xa9, 0x2b, 0x2f, 0xbf, 0x95, 0x94, 0x72, 0x13, 0x14, 0x8e, 0x59, 0x65, - 0x23, 0x1a, 0x10, 0x9f, 0x22, 0xb8, 0x0c, 0xb2, 0x81, 0x88, 0xad, 0x7a, 0x6e, 0x64, 0xdb, 0x88, - 0x35, 0xf3, 0x6b, 0xa0, 0x1f, 0x0e, 0xef, 0x0f, 0x74, 0xc8, 0x05, 0x1e, 0x0a, 0x96, 0x6d, 0x20, - 0x4f, 0xf7, 0xdd, 0xf2, 0x27, 0x15, 0x64, 0xea, 0x14, 0x3f, 0x21, 0xec, 0xdc, 0x6a, 0x42, 0x03, - 0x5c, 0xe8, 0x11, 0x86, 0x3a, 0xf9, 0xd4, 0x29, 0xea, 0x79, 0x1a, 0x9c, 0x07, 0xa3, 0x24, 0x60, - 0x1e, 0xf1, 0x23, 0xbb, 0xc6, 0x6b, 0x9a, 0x71, 0x7c, 0x86, 0x8d, 0xb0, 0xc3, 0x87, 0x51, 0x96, - 0x2d, 0xb2, 0x13, 0x2c, 0x9b, 0x04, 0x13, 0x42, 0x8c, 0x34, 0xaa, 0xfc, 0x45, 0x8d, 0x63, 0x4f, - 0x91, 0x87, 0xd7, 0x19, 0x72, 0xe1, 0xed, 0x24, 0xa1, 0x53, 0xff, 0x41, 0xd9, 0x32, 0xc8, 0xf0, - 0x5e, 0x69, 0x3e, 0x1d, 0x8d, 0xe4, 0x6c, 0x92, 0x34, 0xd9, 0xd7, 0x81, 0x44, 0x6b, 0x24, 0x9c, - 0x4f, 0x5b, 0x92, 0x13, 0x94, 0x16, 0xc0, 0x95, 0x23, 0xaa, 0x62, 0xc5, 0xaf, 0x52, 0x00, 0xd4, - 0x29, 0x96, 0xe3, 0x78, 0x5e, 0xb7, 0x3a, 0x0f, 0xc6, 0xc4, 0x7a, 0x90, 0xd3, 0xf5, 0x1f, 0xa4, - 0xc2, 0x26, 0x18, 0x75, 0xda, 0xa4, 0xeb, 0x33, 0x61, 0xc1, 0x90, 0xad, 0xbc, 0x11, 0xaa, 0xfe, - 0xa7, 0xdd, 0x13, 0xa5, 0x13, 0x0c, 0xca, 0x01, 0x78, 0x60, 0x82, 0xf4, 0xa6, 0xf6, 0x3b, 0x05, - 0xd2, 0x75, 0x8a, 0xe1, 0x1a, 0x18, 0x3f, 0xf2, 0x1f, 0x34, 0x93, 0x74, 0x33, 0xc7, 0xf6, 0xaf, - 0x58, 0x3d, 0x53, 0x5a, 0xbc, 0xa6, 0xf7, 0xc0, 0x48, 0xb4, 0x5a, 0xd3, 0x27, 0xd0, 0x42, 0xb0, - 0x78, 0x6d, 0x08, 0x18, 0x57, 0x7a, 0x0e, 0x2e, 0xfd, 0x35, 0xc3, 0xc3, 0x48, 0x32, 0xa9, 0x78, - 0xfd, 0x0c, 0x49, 0xf1, 0x2f, 0x3c, 0x06, 0x19, 0x39, 0x33, 0xda, 0x09, 0x3c, 0x81, 0x17, 0x67, - 0x87, 0xe3, 0xb2, 0xa4, 0x65, 0x6d, 0xef, 0x6a, 0xea, 0xce, 0xae, 0xa6, 0xfe, 0xd8, 0xd5, 0xd4, - 0xb7, 0x7b, 0x9a, 0xb2, 0xb3, 0xa7, 0x29, 0x5f, 0xf7, 0x34, 0xe5, 0xd9, 0xf0, 0x2b, 0xde, 0x88, - 0x9e, 0xa2, 0xe8, 0xa2, 0x1b, 0xa3, 0xd1, 0x1b, 0x70, 0xf3, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x6b, 0xb0, 0x7e, 0xf2, 0xf6, 0x06, 0x00, 0x00, + // 648 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xbf, 0x6f, 0xd3, 0x40, + 0x14, 0xb6, 0x93, 0xd2, 0xd0, 0x17, 0xd4, 0x52, 0x2b, 0x12, 0x49, 0x8a, 0xec, 0x28, 0x88, 0x2a, + 0x12, 0x8a, 0xdd, 0x06, 0xd4, 0x01, 0xa6, 0xba, 0x08, 0xc1, 0x10, 0x01, 0xae, 0x04, 0x12, 0x4b, + 0x49, 0xe2, 0xeb, 0xd5, 0xa2, 0xf1, 0xb3, 0x72, 0x97, 0xa8, 0xdd, 0x18, 0x99, 0x10, 0x23, 0x63, + 0x67, 0xe6, 0xb2, 0xf1, 0x07, 0x54, 0x4c, 0x15, 0x13, 0x03, 0x2a, 0xa8, 0x5d, 0x10, 0x82, 0xff, + 0x01, 0xc5, 0x77, 0xe7, 0x42, 0xeb, 0xa6, 0xe5, 0xc7, 0x94, 0xdc, 0x7d, 0xdf, 0xf7, 0xde, 0xfb, + 0xde, 0xbd, 0x3b, 0xc3, 0x4c, 0x07, 0x59, 0x17, 0x99, 0x43, 0x71, 0xe0, 0x0c, 0xe6, 0xdb, 0x84, + 0xb7, 0xe6, 0x1d, 0xbe, 0x61, 0x47, 0x3d, 0xe4, 0x68, 0x18, 0x02, 0xb4, 0x29, 0x0e, 0x6c, 0x09, + 0x96, 0x4d, 0x29, 0x68, 0xb7, 0x18, 0x49, 0x14, 0x1d, 0x0c, 0x42, 0xa1, 0x29, 0x5f, 0x4e, 0x09, + 0x38, 0xd4, 0x0b, 0xb4, 0x24, 0xd0, 0x95, 0x78, 0xe5, 0xc8, 0xf0, 0x02, 0x2a, 0x50, 0xa4, 0x28, + 0xf6, 0x87, 0xff, 0x94, 0x80, 0x22, 0xd2, 0x75, 0xe2, 0xc4, 0xab, 0x76, 0x7f, 0xd5, 0x69, 0x85, + 0x9b, 0x02, 0xaa, 0xbe, 0xcc, 0xc0, 0x74, 0x93, 0xd1, 0xe5, 0x7e, 0xbb, 0x1b, 0xf0, 0x07, 0x3d, + 0x8c, 0x90, 0xb5, 0xd6, 0x8d, 0x5b, 0x90, 0xeb, 0x60, 0xc8, 0x49, 0xc8, 0x8b, 0x7a, 0x45, 0xaf, + 0xe5, 0x1b, 0x05, 0x5b, 0x84, 0xb0, 0x55, 0x08, 0x7b, 0x31, 0xdc, 0x74, 0xf3, 0xef, 0xb7, 0xeb, + 0xb9, 0x25, 0x41, 0xf4, 0x94, 0xc2, 0xe0, 0x30, 0x15, 0x84, 0x01, 0x0f, 0x5a, 0xeb, 0x2b, 0x3e, + 0x89, 0x90, 0x05, 0xbc, 0x98, 0xa9, 0x64, 0x6b, 0xf9, 0x46, 0xc9, 0x96, 0xb5, 0x0e, 0x6d, 0xab, + 0x5e, 0xd8, 0x4b, 0x18, 0x84, 0xee, 0xdc, 0xce, 0x9e, 0xa5, 0xbd, 0xf9, 0x6c, 0xd5, 0x68, 0xc0, + 0xd7, 0xfa, 0x6d, 0xbb, 0x83, 0x5d, 0x69, 0x4c, 0xfe, 0xd4, 0x99, 0xff, 0xcc, 0xe1, 0x9b, 0x11, + 0x61, 0xb1, 0x80, 0x79, 0x93, 0x32, 0xc7, 0x6d, 0x91, 0xc2, 0xb8, 0x01, 0xe7, 0xa3, 0xb8, 0x7c, + 0xd2, 0x2b, 0x66, 0x2b, 0x7a, 0x6d, 0xc2, 0x2d, 0x7e, 0xd8, 0xae, 0x17, 0x64, 0xc6, 0x45, 0xdf, + 0xef, 0x11, 0xc6, 0x96, 0x79, 0x2f, 0x08, 0xa9, 0x97, 0x30, 0x6f, 0x5e, 0x7c, 0xb1, 0x65, 0x69, + 0xaf, 0xb7, 0x2c, 0xed, 0xeb, 0x96, 0xa5, 0x3d, 0xff, 0x54, 0xd1, 0xaa, 0x4d, 0x28, 0x1d, 0xeb, + 0x87, 0x47, 0x58, 0x84, 0x21, 0x23, 0xc6, 0x1c, 0xe4, 0x23, 0xb9, 0xb7, 0x12, 0xf8, 0x71, 0x6f, + 0xc6, 0xdc, 0xa9, 0x6f, 0x7b, 0xd6, 0xaf, 0xdb, 0x1e, 0xa8, 0xc5, 0x3d, 0xbf, 0xfa, 0x56, 0x87, + 0x5c, 0x93, 0xd1, 0x47, 0xc8, 0xff, 0x42, 0x6d, 0xd8, 0x70, 0x6e, 0x80, 0x9c, 0xf4, 0x8a, 0x99, + 0x53, 0x1c, 0x09, 0x9a, 0xb1, 0x00, 0xe3, 0x18, 0xf1, 0x00, 0xc3, 0xb8, 0x05, 0x93, 0x0d, 0xd3, + 0x3e, 0x3e, 0x7c, 0xf6, 0xb0, 0x96, 0xfb, 0x31, 0xcb, 0x93, 0xec, 0x94, 0x36, 0x4c, 0xc3, 0x94, + 0x2c, 0x5b, 0x99, 0xaf, 0xbe, 0xd3, 0x93, 0xbd, 0xc7, 0x24, 0xa0, 0x6b, 0x9c, 0xf8, 0x86, 0x95, + 0x62, 0xe9, 0x9f, 0x1c, 0xdc, 0x81, 0x9c, 0xa8, 0x89, 0x15, 0xb3, 0xf1, 0xd0, 0xcc, 0xa6, 0x59, + 0x50, 0xf9, 0x0f, 0xad, 0xb8, 0x63, 0xc3, 0x09, 0xf2, 0x94, 0x38, 0xc5, 0x51, 0x09, 0x2e, 0x1d, + 0xa9, 0x3e, 0x71, 0xf6, 0x43, 0x07, 0x68, 0x32, 0xaa, 0x46, 0xe9, 0xcf, 0xcf, 0x69, 0x01, 0x26, + 0xe4, 0xa8, 0xe3, 0xe9, 0x4e, 0x0f, 0xa9, 0x46, 0x07, 0xc6, 0x5b, 0x5d, 0xec, 0x87, 0x5c, 0x9a, + 0xfd, 0xaf, 0x37, 0x44, 0x86, 0x4e, 0x69, 0x45, 0x01, 0x8c, 0x43, 0xbb, 0xaa, 0x0b, 0x8d, 0xef, + 0x19, 0xc8, 0x36, 0x19, 0x35, 0x56, 0x61, 0xf2, 0xc8, 0x73, 0x70, 0x35, 0xed, 0x0c, 0x8e, 0xdd, + 0x92, 0x72, 0xfd, 0x4c, 0xb4, 0xe4, 0x32, 0xdd, 0x85, 0xb1, 0xf8, 0x5a, 0xcc, 0x9c, 0x20, 0x1b, + 0x82, 0xe5, 0x2b, 0x23, 0xc0, 0x24, 0xd2, 0x53, 0xb8, 0xf0, 0xdb, 0x54, 0x8e, 0x12, 0x29, 0x52, + 0xf9, 0xda, 0x19, 0x48, 0x49, 0x86, 0x87, 0x90, 0x53, 0xd3, 0x61, 0x9e, 0xa0, 0x93, 0x78, 0x79, + 0x76, 0x34, 0xae, 0x42, 0xba, 0xee, 0xce, 0xbe, 0xa9, 0xef, 0xee, 0x9b, 0xfa, 0x97, 0x7d, 0x53, + 0x7f, 0x75, 0x60, 0x6a, 0xbb, 0x07, 0xa6, 0xf6, 0xf1, 0xc0, 0xd4, 0x9e, 0x8c, 0x3e, 0xe2, 0x8d, + 0xf8, 0xab, 0x10, 0x1f, 0x74, 0x7b, 0x3c, 0x7e, 0x8e, 0xaf, 0xff, 0x0c, 0x00, 0x00, 0xff, 0xff, + 0x8a, 0xac, 0xbf, 0x61, 0x81, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/gov/types/vote.go b/x/gov/types/vote.go index 03d1e5a44..cfe448fc7 100644 --- a/x/gov/types/vote.go +++ b/x/gov/types/vote.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/mint/types/mint.pb.go b/x/mint/types/mint.pb.go index aefb13f0b..a5f33f381 100644 --- a/x/mint/types/mint.pb.go +++ b/x/mint/types/mint.pb.go @@ -30,7 +30,7 @@ type Minter struct { // current annual inflation rate Inflation github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=inflation,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"inflation"` // current annual expected provisions - AnnualProvisions github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=annual_provisions,json=annualProvisions,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"annual_provisions" yaml:"annual_provisions"` + AnnualProvisions github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=annual_provisions,json=annualProvisions,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"annual_provisions"` } func (m *Minter) Reset() { *m = Minter{} } @@ -71,15 +71,15 @@ type Params struct { // type of coin to mint MintDenom string `protobuf:"bytes,1,opt,name=mint_denom,json=mintDenom,proto3" json:"mint_denom,omitempty"` // maximum annual change in inflation rate - InflationRateChange github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=inflation_rate_change,json=inflationRateChange,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"inflation_rate_change" yaml:"inflation_rate_change"` + InflationRateChange github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=inflation_rate_change,json=inflationRateChange,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"inflation_rate_change"` // maximum inflation rate - InflationMax github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=inflation_max,json=inflationMax,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"inflation_max" yaml:"inflation_max"` + InflationMax github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=inflation_max,json=inflationMax,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"inflation_max"` // minimum inflation rate - InflationMin github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,4,opt,name=inflation_min,json=inflationMin,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"inflation_min" yaml:"inflation_min"` + InflationMin github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,4,opt,name=inflation_min,json=inflationMin,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"inflation_min"` // goal of percent bonded atoms - GoalBonded github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=goal_bonded,json=goalBonded,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"goal_bonded" yaml:"goal_bonded"` + GoalBonded github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=goal_bonded,json=goalBonded,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"goal_bonded"` // expected blocks per year - BlocksPerYear uint64 `protobuf:"varint,6,opt,name=blocks_per_year,json=blocksPerYear,proto3" json:"blocks_per_year,omitempty" yaml:"blocks_per_year"` + BlocksPerYear uint64 `protobuf:"varint,6,opt,name=blocks_per_year,json=blocksPerYear,proto3" json:"blocks_per_year,omitempty"` } func (m *Params) Reset() { *m = Params{} } @@ -136,36 +136,32 @@ func init() { func init() { proto.RegisterFile("cosmos/mint/v1beta1/mint.proto", fileDescriptor_2df116d183c1e223) } var fileDescriptor_2df116d183c1e223 = []byte{ - // 460 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xc1, 0x6a, 0x13, 0x41, - 0x1c, 0xc6, 0x77, 0x34, 0x06, 0x32, 0x5a, 0xd4, 0x69, 0x95, 0x35, 0xe8, 0x6e, 0xc9, 0x41, 0xea, - 0xa1, 0x09, 0xc5, 0x5b, 0xf1, 0xb4, 0xcd, 0xb5, 0x10, 0x16, 0x0f, 0x5a, 0x84, 0xe5, 0xbf, 0x9b, - 0x71, 0x3b, 0x74, 0x67, 0x26, 0xcc, 0x4c, 0x4b, 0xf2, 0x00, 0xde, 0x7b, 0xf4, 0xe8, 0x43, 0xf8, - 0x10, 0x3d, 0x16, 0x4f, 0xe2, 0x21, 0x48, 0x72, 0x15, 0x84, 0x3e, 0x81, 0xec, 0xcc, 0x92, 0xc8, - 0x2a, 0x81, 0x85, 0x9e, 0x92, 0xf9, 0x7f, 0xdf, 0xff, 0xfb, 0x7e, 0xb3, 0x30, 0x38, 0xc8, 0xa4, - 0xe6, 0x52, 0x0f, 0x38, 0x13, 0x66, 0x70, 0x71, 0x90, 0x52, 0x03, 0x07, 0xf6, 0xd0, 0x9f, 0x28, - 0x69, 0x24, 0xd9, 0x76, 0x7a, 0xdf, 0x8e, 0x2a, 0xbd, 0xbb, 0x93, 0xcb, 0x5c, 0x5a, 0x7d, 0x50, - 0xfe, 0x73, 0xd6, 0xee, 0x33, 0x67, 0x4d, 0x9c, 0x50, 0xed, 0xd9, 0x43, 0xef, 0x17, 0xc2, 0xed, - 0x63, 0x26, 0x0c, 0x55, 0xe4, 0x04, 0x77, 0x98, 0xf8, 0x58, 0x80, 0x61, 0x52, 0xf8, 0x68, 0x17, - 0xed, 0x75, 0xa2, 0x37, 0x57, 0xf3, 0xd0, 0xfb, 0x31, 0x0f, 0x5f, 0xe6, 0xcc, 0x9c, 0x9e, 0xa7, - 0xfd, 0x4c, 0xf2, 0x6a, 0xbd, 0xfa, 0xd9, 0xd7, 0xe3, 0xb3, 0x81, 0x99, 0x4d, 0xa8, 0xee, 0x0f, - 0x69, 0xf6, 0xed, 0xeb, 0x3e, 0xae, 0xd2, 0x87, 0x34, 0x8b, 0xd7, 0x71, 0xe4, 0x13, 0xc2, 0x8f, - 0x41, 0x88, 0x73, 0x28, 0x4a, 0x88, 0x0b, 0xa6, 0x99, 0x14, 0xda, 0xbf, 0x63, 0x4b, 0xde, 0x35, - 0x2b, 0xb9, 0x99, 0x87, 0xfe, 0x0c, 0x78, 0x71, 0xd8, 0xfb, 0x27, 0xb0, 0x57, 0x03, 0x78, 0xe4, - 0x1c, 0xa3, 0xb5, 0xe1, 0x77, 0x0b, 0xb7, 0x47, 0xa0, 0x80, 0x6b, 0xf2, 0x02, 0xe3, 0xf2, 0xd3, - 0x25, 0x63, 0x2a, 0x24, 0x77, 0xf7, 0x8d, 0x3b, 0xe5, 0x64, 0x58, 0x0e, 0xc8, 0x25, 0xc2, 0x4f, - 0x56, 0xfc, 0x89, 0x02, 0x43, 0x93, 0xec, 0x14, 0x44, 0x4e, 0x2b, 0xea, 0x0f, 0x8d, 0xa9, 0x9f, - 0x3b, 0xea, 0xff, 0x86, 0xd6, 0xc9, 0xb7, 0x57, 0xae, 0x18, 0x0c, 0x3d, 0xb2, 0x1e, 0x32, 0xc3, - 0x5b, 0xeb, 0x65, 0x0e, 0x53, 0xff, 0xae, 0x25, 0x79, 0xdb, 0x98, 0x64, 0xa7, 0x4e, 0xc2, 0x61, - 0x5a, 0x27, 0x78, 0xb0, 0x52, 0x8f, 0x61, 0x5a, 0xab, 0x66, 0xc2, 0x6f, 0xdd, 0x5a, 0x35, 0x13, - 0x1b, 0xaa, 0x99, 0x20, 0x1a, 0xdf, 0xcf, 0x25, 0x14, 0x49, 0x2a, 0xc5, 0x98, 0x8e, 0xfd, 0x7b, - 0xb6, 0x38, 0x6e, 0x5c, 0x4c, 0x5c, 0xf1, 0x5f, 0x51, 0xf5, 0x5a, 0x5c, 0x6a, 0x91, 0x95, 0x48, - 0x84, 0x1f, 0xa6, 0x85, 0xcc, 0xce, 0x74, 0x32, 0xa1, 0x2a, 0x99, 0x51, 0x50, 0x7e, 0x7b, 0x17, - 0xed, 0xb5, 0xa2, 0xee, 0xcd, 0x3c, 0x7c, 0xea, 0xa2, 0x6a, 0x86, 0x5e, 0xbc, 0xe5, 0x26, 0x23, - 0xaa, 0xde, 0x53, 0x50, 0x87, 0xad, 0xcf, 0x5f, 0x42, 0x2f, 0x3a, 0xba, 0x5a, 0x04, 0xe8, 0x7a, - 0x11, 0xa0, 0x9f, 0x8b, 0x00, 0x5d, 0x2e, 0x03, 0xef, 0x7a, 0x19, 0x78, 0xdf, 0x97, 0x81, 0x77, - 0xf2, 0x6a, 0x23, 0xfb, 0xd4, 0x3d, 0x7c, 0x7b, 0x85, 0xb4, 0x6d, 0x1f, 0xeb, 0xeb, 0x3f, 0x01, - 0x00, 0x00, 0xff, 0xff, 0x6f, 0x26, 0xbe, 0x24, 0x14, 0x04, 0x00, 0x00, + // 393 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xc1, 0xaa, 0xda, 0x40, + 0x18, 0x85, 0x93, 0x6a, 0x03, 0x4e, 0x2b, 0x6d, 0xc7, 0x16, 0x52, 0xa1, 0x51, 0x5c, 0x88, 0x5d, + 0x98, 0x20, 0xdd, 0x95, 0xae, 0xd4, 0xad, 0x20, 0xd9, 0x55, 0x28, 0x61, 0x92, 0x4c, 0xe3, 0x60, + 0x32, 0x13, 0x66, 0x46, 0xd1, 0xb7, 0xe8, 0xb2, 0xcb, 0x3e, 0x44, 0x1f, 0xc2, 0x5d, 0xa5, 0xab, + 0xd2, 0x85, 0x5c, 0x74, 0x7b, 0x1f, 0xe2, 0x92, 0x99, 0x10, 0xe1, 0x2e, 0xee, 0x2a, 0xab, 0x64, + 0xce, 0x99, 0xff, 0x3b, 0x27, 0x81, 0x1f, 0x38, 0x11, 0x13, 0x19, 0x13, 0x5e, 0x46, 0xa8, 0xf4, + 0x76, 0x93, 0x10, 0x4b, 0x34, 0x51, 0x07, 0x37, 0xe7, 0x4c, 0x32, 0xd8, 0xd1, 0xbe, 0xab, 0xa4, + 0xd2, 0xef, 0xbe, 0x4d, 0x58, 0xc2, 0x94, 0xef, 0x15, 0x6f, 0xfa, 0x6a, 0xf7, 0xbd, 0xbe, 0x1a, + 0x68, 0xa3, 0x9c, 0x53, 0x87, 0xc1, 0x1f, 0x13, 0x58, 0x0b, 0x42, 0x25, 0xe6, 0x70, 0x05, 0x5a, + 0x84, 0x7e, 0x4f, 0x91, 0x24, 0x8c, 0xda, 0x66, 0xdf, 0x1c, 0xb5, 0xa6, 0x5f, 0x8e, 0xe7, 0x9e, + 0xf1, 0xff, 0xdc, 0x1b, 0x26, 0x44, 0xae, 0xb7, 0xa1, 0x1b, 0xb1, 0xac, 0x1c, 0x2f, 0x1f, 0x63, + 0x11, 0x6f, 0x3c, 0x79, 0xc8, 0xb1, 0x70, 0xe7, 0x38, 0xfa, 0xfb, 0x7b, 0x0c, 0x4a, 0xfa, 0x1c, + 0x47, 0xfe, 0x0d, 0x07, 0x09, 0x78, 0x83, 0x28, 0xdd, 0xa2, 0xb4, 0xe8, 0xb0, 0x23, 0x82, 0x30, + 0x2a, 0xec, 0x67, 0x35, 0x64, 0xbc, 0xd6, 0xd8, 0x65, 0x45, 0x1d, 0xdc, 0x37, 0x80, 0xb5, 0x44, + 0x1c, 0x65, 0x02, 0x7e, 0x00, 0xa0, 0xf8, 0x3b, 0x41, 0x8c, 0x29, 0xcb, 0xf4, 0x27, 0xf9, 0xad, + 0x42, 0x99, 0x17, 0x02, 0xcc, 0xc1, 0xbb, 0xaa, 0x61, 0xc0, 0x91, 0xc4, 0x41, 0xb4, 0x46, 0x34, + 0xc1, 0xb5, 0x14, 0xeb, 0x54, 0x68, 0x1f, 0x49, 0x3c, 0x53, 0x60, 0x88, 0x40, 0xfb, 0x96, 0x98, + 0xa1, 0xbd, 0xdd, 0xa8, 0x21, 0xe9, 0x65, 0x85, 0x5c, 0xa0, 0xfd, 0xa3, 0x08, 0x42, 0xed, 0x66, + 0xbd, 0x11, 0x84, 0xc2, 0x6f, 0xe0, 0x45, 0xc2, 0x50, 0x1a, 0x84, 0x8c, 0xc6, 0x38, 0xb6, 0x9f, + 0xd7, 0x10, 0x00, 0x0a, 0xe0, 0x54, 0xf1, 0xe0, 0x10, 0xbc, 0x0a, 0x53, 0x16, 0x6d, 0x44, 0x90, + 0x63, 0x1e, 0x1c, 0x30, 0xe2, 0xb6, 0xd5, 0x37, 0x47, 0x4d, 0xbf, 0xad, 0xe5, 0x25, 0xe6, 0x5f, + 0x31, 0xe2, 0x9f, 0x9b, 0x3f, 0x7f, 0xf5, 0x8c, 0xe9, 0xec, 0x78, 0x71, 0xcc, 0xd3, 0xc5, 0x31, + 0xef, 0x2e, 0x8e, 0xf9, 0xe3, 0xea, 0x18, 0xa7, 0xab, 0x63, 0xfc, 0xbb, 0x3a, 0xc6, 0xea, 0xe3, + 0x93, 0x4d, 0xf6, 0x7a, 0xb1, 0x54, 0xa1, 0xd0, 0x52, 0xcb, 0xf0, 0xe9, 0x21, 0x00, 0x00, 0xff, + 0xff, 0x83, 0xde, 0x9f, 0x75, 0x74, 0x03, 0x00, 0x00, } func (m *Minter) Marshal() (dAtA []byte, err error) { diff --git a/x/mint/types/params.go b/x/mint/types/params.go index f0f9ef494..c5bf838ac 100644 --- a/x/mint/types/params.go +++ b/x/mint/types/params.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" diff --git a/x/params/types/proposal/proposal.go b/x/params/types/proposal/proposal.go index 3a2f97a77..e1d4ac0d1 100644 --- a/x/params/types/proposal/proposal.go +++ b/x/params/types/proposal/proposal.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" ) diff --git a/x/slashing/types/genesis.pb.go b/x/slashing/types/genesis.pb.go index ce001fc2a..43240e134 100644 --- a/x/slashing/types/genesis.pb.go +++ b/x/slashing/types/genesis.pb.go @@ -30,10 +30,10 @@ type GenesisState struct { Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` // signing_infos represents a map between validator addresses and their // signing infos. - SigningInfos []SigningInfo `protobuf:"bytes,2,rep,name=signing_infos,json=signingInfos,proto3" json:"signing_infos" yaml:"signing_infos"` + SigningInfos []SigningInfo `protobuf:"bytes,2,rep,name=signing_infos,json=signingInfos,proto3" json:"signing_infos"` // missed_blocks represents a map between validator addresses and their // missed blocks. - MissedBlocks []ValidatorMissedBlocks `protobuf:"bytes,3,rep,name=missed_blocks,json=missedBlocks,proto3" json:"missed_blocks" yaml:"missed_blocks"` + MissedBlocks []ValidatorMissedBlocks `protobuf:"bytes,3,rep,name=missed_blocks,json=missedBlocks,proto3" json:"missed_blocks"` } func (m *GenesisState) Reset() { *m = GenesisState{} } @@ -95,7 +95,7 @@ type SigningInfo struct { // address is the validator address. Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // validator_signing_info represents the signing info of this validator. - ValidatorSigningInfo ValidatorSigningInfo `protobuf:"bytes,2,opt,name=validator_signing_info,json=validatorSigningInfo,proto3" json:"validator_signing_info" yaml:"validator_signing_info"` + ValidatorSigningInfo ValidatorSigningInfo `protobuf:"bytes,2,opt,name=validator_signing_info,json=validatorSigningInfo,proto3" json:"validator_signing_info"` } func (m *SigningInfo) Reset() { *m = SigningInfo{} } @@ -151,7 +151,7 @@ type ValidatorMissedBlocks struct { // address is the validator address. Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // missed_blocks is an array of missed blocks by the validator. - MissedBlocks []MissedBlock `protobuf:"bytes,2,rep,name=missed_blocks,json=missedBlocks,proto3" json:"missed_blocks" yaml:"missed_blocks"` + MissedBlocks []MissedBlock `protobuf:"bytes,2,rep,name=missed_blocks,json=missedBlocks,proto3" json:"missed_blocks"` } func (m *ValidatorMissedBlocks) Reset() { *m = ValidatorMissedBlocks{} } @@ -268,36 +268,34 @@ func init() { } var fileDescriptor_1923b9188b635394 = []byte{ - // 450 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0xcf, 0x6e, 0xd3, 0x30, - 0x1c, 0xc7, 0xeb, 0x16, 0x0a, 0xb8, 0xdd, 0xc5, 0x0a, 0x23, 0x4c, 0x90, 0x4e, 0x11, 0x43, 0xbb, - 0x34, 0xd1, 0xca, 0x0d, 0xc4, 0x81, 0x5c, 0x26, 0x0e, 0x48, 0x28, 0x95, 0x38, 0x70, 0xa9, 0x9c, - 0xc6, 0xf3, 0xac, 0x25, 0x76, 0xc9, 0xcf, 0x54, 0xdb, 0x2b, 0x70, 0xe2, 0x35, 0xb8, 0xef, 0x21, - 0x76, 0x42, 0x13, 0x27, 0x4e, 0x13, 0x6a, 0xdf, 0x80, 0x27, 0x40, 0xb3, 0x5d, 0x96, 0x4d, 0x8d, - 0x26, 0x38, 0xb5, 0x56, 0x3e, 0xdf, 0x3f, 0xfe, 0x59, 0x3f, 0xbc, 0x33, 0x55, 0x50, 0x2a, 0x88, - 0xa1, 0xa0, 0x70, 0x28, 0x24, 0x8f, 0xe7, 0x7b, 0x19, 0xd3, 0x74, 0x2f, 0xe6, 0x4c, 0x32, 0x10, - 0x10, 0xcd, 0x2a, 0xa5, 0x15, 0x79, 0x64, 0xb1, 0x68, 0x85, 0x45, 0x0e, 0xdb, 0xf2, 0xb8, 0xe2, - 0xca, 0x30, 0xf1, 0xe5, 0x3f, 0x8b, 0x6f, 0x3d, 0x6f, 0x72, 0xfd, 0xab, 0xb7, 0xdc, 0x63, 0xcb, - 0x4d, 0xac, 0x81, 0xcb, 0x30, 0x87, 0xf0, 0x5b, 0x1b, 0xf7, 0xf7, 0x6d, 0x87, 0xb1, 0xa6, 0x9a, - 0x91, 0xd7, 0xb8, 0x3b, 0xa3, 0x15, 0x2d, 0xc1, 0x47, 0xdb, 0x68, 0xb7, 0x37, 0x1a, 0x44, 0x0d, - 0x9d, 0xa2, 0xf7, 0x06, 0x4b, 0xee, 0x9c, 0x5d, 0x0c, 0x5a, 0xa9, 0x13, 0x11, 0x8e, 0x37, 0x40, - 0x70, 0x29, 0x24, 0x9f, 0x08, 0x79, 0xa0, 0xc0, 0x6f, 0x6f, 0x77, 0x76, 0x7b, 0xa3, 0x67, 0x8d, - 0x2e, 0x63, 0x4b, 0xbf, 0x95, 0x07, 0x2a, 0x79, 0x72, 0x69, 0xf5, 0xfb, 0x62, 0xe0, 0x9d, 0xd0, - 0xb2, 0x78, 0x19, 0x5e, 0x33, 0x0a, 0xd3, 0x3e, 0x5c, 0xa1, 0x40, 0x3e, 0xe1, 0x8d, 0x52, 0x00, - 0xb0, 0x7c, 0x92, 0x15, 0x6a, 0x7a, 0x04, 0x7e, 0xc7, 0x04, 0x45, 0x8d, 0x41, 0x1f, 0x68, 0x21, - 0x72, 0xaa, 0x55, 0xf5, 0xce, 0xc8, 0x12, 0xa3, 0xba, 0x19, 0x79, 0xcd, 0x32, 0x4c, 0xfb, 0x65, - 0x8d, 0x0d, 0xbf, 0x23, 0xdc, 0xab, 0xd5, 0x25, 0x23, 0x7c, 0x8f, 0xe6, 0x79, 0xc5, 0xc0, 0xce, - 0xea, 0x41, 0xe2, 0xff, 0x38, 0x1d, 0x7a, 0x2e, 0xff, 0x8d, 0xfd, 0x32, 0xd6, 0x95, 0x90, 0x3c, - 0x5d, 0x81, 0xe4, 0x0b, 0xc2, 0x9b, 0xf3, 0x55, 0x93, 0x49, 0xfd, 0x86, 0x7e, 0xdb, 0xcc, 0x7b, - 0x78, 0xfb, 0x05, 0xea, 0x23, 0xdb, 0x71, 0xfd, 0x9f, 0xda, 0xfe, 0xeb, 0xad, 0xc3, 0xd4, 0x9b, - 0xaf, 0x11, 0x87, 0xa7, 0x08, 0x3f, 0x5c, 0x3b, 0x96, 0xff, 0xba, 0x1a, 0xbf, 0xf9, 0x22, 0xb7, - 0x3d, 0x7d, 0x2d, 0xf1, 0x9f, 0xde, 0xe1, 0x15, 0xee, 0xd5, 0xa4, 0xc4, 0xc3, 0x77, 0x85, 0xcc, - 0xd9, 0xb1, 0x69, 0xda, 0x49, 0xed, 0x81, 0x6c, 0xe2, 0xae, 0x15, 0x99, 0xb9, 0xde, 0x4f, 0xdd, - 0x29, 0xd9, 0x3f, 0x5b, 0x04, 0xe8, 0x7c, 0x11, 0xa0, 0x5f, 0x8b, 0x00, 0x7d, 0x5d, 0x06, 0xad, - 0xf3, 0x65, 0xd0, 0xfa, 0xb9, 0x0c, 0x5a, 0x1f, 0x87, 0x5c, 0xe8, 0xc3, 0xcf, 0x59, 0x34, 0x55, - 0xa5, 0xdb, 0x11, 0xf7, 0x33, 0x84, 0xfc, 0x28, 0x3e, 0xbe, 0xda, 0x32, 0x7d, 0x32, 0x63, 0x90, - 0x75, 0xcd, 0x02, 0xbd, 0xf8, 0x13, 0x00, 0x00, 0xff, 0xff, 0x71, 0x9a, 0x91, 0x04, 0xdb, 0x03, - 0x00, 0x00, + // 420 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xc1, 0x6e, 0xd4, 0x30, + 0x10, 0x86, 0xe3, 0x2e, 0x2c, 0xe0, 0xb4, 0x17, 0x2b, 0x94, 0xd0, 0x43, 0x5a, 0xad, 0x00, 0xf5, + 0x92, 0x44, 0x5d, 0x8e, 0x88, 0x03, 0xb9, 0x54, 0x1c, 0x50, 0x51, 0x56, 0x42, 0x82, 0x4b, 0xe4, + 0x6c, 0x5c, 0xd7, 0xea, 0xc6, 0x5e, 0x65, 0xcc, 0xaa, 0xbc, 0x05, 0x0f, 0xc0, 0x23, 0x70, 0xe4, + 0x21, 0x7a, 0xac, 0x38, 0x71, 0x42, 0x68, 0xf7, 0x29, 0xb8, 0x21, 0x6c, 0x87, 0x8d, 0x60, 0xa3, + 0x95, 0x38, 0x25, 0x63, 0x7f, 0xf3, 0xcf, 0xcc, 0xef, 0xc1, 0x8f, 0xa7, 0x0a, 0x6a, 0x05, 0x29, + 0xcc, 0x28, 0x5c, 0x08, 0xc9, 0xd3, 0xc5, 0x49, 0xc9, 0x34, 0x3d, 0x49, 0x39, 0x93, 0x0c, 0x04, + 0x24, 0xf3, 0x46, 0x69, 0x45, 0x1e, 0x58, 0x2c, 0x69, 0xb1, 0xc4, 0x61, 0x07, 0x01, 0x57, 0x5c, + 0x19, 0x26, 0xfd, 0xfd, 0x67, 0xf1, 0x83, 0x27, 0x7d, 0xaa, 0x7f, 0xf2, 0x2d, 0xf7, 0xd0, 0x72, + 0x85, 0x15, 0x70, 0x35, 0x4c, 0x30, 0xfa, 0x89, 0xf0, 0xee, 0xa9, 0xed, 0x61, 0xa2, 0xa9, 0x66, + 0xe4, 0x39, 0x1e, 0xce, 0x69, 0x43, 0x6b, 0x08, 0xd1, 0x11, 0x3a, 0xf6, 0xc7, 0x87, 0x49, 0x4f, + 0x4f, 0xc9, 0x6b, 0x83, 0x65, 0xb7, 0xae, 0xbf, 0x1f, 0x7a, 0xb9, 0x4b, 0x22, 0x67, 0x78, 0x0f, + 0x04, 0x97, 0x42, 0xf2, 0x42, 0xc8, 0x73, 0x05, 0xe1, 0xce, 0xd1, 0xe0, 0xd8, 0x1f, 0x3f, 0xea, + 0x55, 0x99, 0x58, 0xfa, 0xa5, 0x3c, 0x57, 0x4e, 0x6a, 0x17, 0xd6, 0x47, 0x40, 0xde, 0xe2, 0xbd, + 0x5a, 0x00, 0xb0, 0xaa, 0x28, 0x67, 0x6a, 0x7a, 0x09, 0xe1, 0xc0, 0x08, 0x26, 0xbd, 0x82, 0x6f, + 0xe8, 0x4c, 0x54, 0x54, 0xab, 0xe6, 0x95, 0x49, 0xcb, 0x4c, 0x56, 0x2b, 0x5d, 0x77, 0xce, 0x46, + 0x9f, 0x11, 0xf6, 0x3b, 0xe5, 0xc9, 0x18, 0xdf, 0xa1, 0x55, 0xd5, 0x30, 0xb0, 0xb3, 0xdf, 0xcb, + 0xc2, 0xaf, 0x5f, 0xe2, 0xc0, 0xd5, 0x79, 0x61, 0x6f, 0x26, 0xba, 0x11, 0x92, 0xe7, 0x2d, 0x48, + 0x04, 0xde, 0x5f, 0xb4, 0x05, 0x8b, 0xee, 0xe4, 0xe1, 0x8e, 0xb1, 0x2f, 0xde, 0xde, 0xe7, 0xbf, + 0x0e, 0x04, 0x8b, 0x0d, 0x77, 0xa3, 0x4f, 0x08, 0xdf, 0xdf, 0x38, 0xdc, 0x7f, 0x35, 0x7e, 0xf6, + 0xb7, 0xaf, 0xdb, 0x1e, 0xaa, 0x53, 0x71, 0xa3, 0x9b, 0xcf, 0xb0, 0xdf, 0x41, 0x48, 0x80, 0x6f, + 0x0b, 0x59, 0xb1, 0x2b, 0xd3, 0xd1, 0x20, 0xb7, 0x01, 0xd9, 0xc7, 0x43, 0x9b, 0x64, 0xec, 0xb9, + 0x9b, 0xbb, 0x28, 0x3b, 0xbd, 0x5e, 0x46, 0xe8, 0x66, 0x19, 0xa1, 0x1f, 0xcb, 0x08, 0x7d, 0x5c, + 0x45, 0xde, 0xcd, 0x2a, 0xf2, 0xbe, 0xad, 0x22, 0xef, 0x5d, 0xcc, 0x85, 0xbe, 0x78, 0x5f, 0x26, + 0x53, 0x55, 0xbb, 0xcd, 0x75, 0x9f, 0x18, 0xaa, 0xcb, 0xf4, 0x6a, 0xbd, 0xfb, 0xfa, 0xc3, 0x9c, + 0x41, 0x39, 0x34, 0x6b, 0xfd, 0xf4, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0xac, 0xc1, 0x45, 0xfe, + 0x71, 0x03, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/slashing/types/slashing.pb.go b/x/slashing/types/slashing.pb.go index 378a212ad..3a0e9448e 100644 --- a/x/slashing/types/slashing.pb.go +++ b/x/slashing/types/slashing.pb.go @@ -35,19 +35,19 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type ValidatorSigningInfo struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // Height at which validator was first a candidate OR was unjailed - StartHeight int64 `protobuf:"varint,2,opt,name=start_height,json=startHeight,proto3" json:"start_height,omitempty" yaml:"start_height"` + StartHeight int64 `protobuf:"varint,2,opt,name=start_height,json=startHeight,proto3" json:"start_height,omitempty"` // Index which is incremented each time the validator was a bonded // in a block and may have signed a precommit or not. This in conjunction with the // `SignedBlocksWindow` param determines the index in the `MissedBlocksBitArray`. - IndexOffset int64 `protobuf:"varint,3,opt,name=index_offset,json=indexOffset,proto3" json:"index_offset,omitempty" yaml:"index_offset"` + IndexOffset int64 `protobuf:"varint,3,opt,name=index_offset,json=indexOffset,proto3" json:"index_offset,omitempty"` // Timestamp until which the validator is jailed due to liveness downtime. - JailedUntil time.Time `protobuf:"bytes,4,opt,name=jailed_until,json=jailedUntil,proto3,stdtime" json:"jailed_until" yaml:"jailed_until"` + JailedUntil time.Time `protobuf:"bytes,4,opt,name=jailed_until,json=jailedUntil,proto3,stdtime" json:"jailed_until"` // Whether or not a validator has been tombstoned (killed out of validator set). It is set // once the validator commits an equivocation or for any other configured misbehiavor. Tombstoned bool `protobuf:"varint,5,opt,name=tombstoned,proto3" json:"tombstoned,omitempty"` // A counter kept to avoid unnecessary array reads. // Note that `Sum(MissedBlocksBitArray)` always equals `MissedBlocksCounter`. - MissedBlocksCounter int64 `protobuf:"varint,6,opt,name=missed_blocks_counter,json=missedBlocksCounter,proto3" json:"missed_blocks_counter,omitempty" yaml:"missed_blocks_counter"` + MissedBlocksCounter int64 `protobuf:"varint,6,opt,name=missed_blocks_counter,json=missedBlocksCounter,proto3" json:"missed_blocks_counter,omitempty"` } func (m *ValidatorSigningInfo) Reset() { *m = ValidatorSigningInfo{} } @@ -126,11 +126,11 @@ func (m *ValidatorSigningInfo) GetMissedBlocksCounter() int64 { // Params represents the parameters used for by the slashing module. type Params struct { - SignedBlocksWindow int64 `protobuf:"varint,1,opt,name=signed_blocks_window,json=signedBlocksWindow,proto3" json:"signed_blocks_window,omitempty" yaml:"signed_blocks_window"` - MinSignedPerWindow github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=min_signed_per_window,json=minSignedPerWindow,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"min_signed_per_window" yaml:"min_signed_per_window"` - DowntimeJailDuration time.Duration `protobuf:"bytes,3,opt,name=downtime_jail_duration,json=downtimeJailDuration,proto3,stdduration" json:"downtime_jail_duration" yaml:"downtime_jail_duration"` - SlashFractionDoubleSign github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,4,opt,name=slash_fraction_double_sign,json=slashFractionDoubleSign,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"slash_fraction_double_sign" yaml:"slash_fraction_double_sign"` - SlashFractionDowntime github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=slash_fraction_downtime,json=slashFractionDowntime,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"slash_fraction_downtime" yaml:"slash_fraction_downtime"` + SignedBlocksWindow int64 `protobuf:"varint,1,opt,name=signed_blocks_window,json=signedBlocksWindow,proto3" json:"signed_blocks_window,omitempty"` + MinSignedPerWindow github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=min_signed_per_window,json=minSignedPerWindow,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"min_signed_per_window"` + DowntimeJailDuration time.Duration `protobuf:"bytes,3,opt,name=downtime_jail_duration,json=downtimeJailDuration,proto3,stdduration" json:"downtime_jail_duration"` + SlashFractionDoubleSign github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,4,opt,name=slash_fraction_double_sign,json=slashFractionDoubleSign,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"slash_fraction_double_sign"` + SlashFractionDowntime github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=slash_fraction_downtime,json=slashFractionDowntime,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"slash_fraction_downtime"` } func (m *Params) Reset() { *m = Params{} } @@ -190,49 +190,43 @@ func init() { } var fileDescriptor_1078e5d96a74cc52 = []byte{ - // 663 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xbf, 0x6f, 0xd3, 0x4e, - 0x14, 0xcf, 0x7d, 0xd3, 0x6f, 0x29, 0x97, 0x4c, 0x6e, 0x4a, 0xdc, 0x00, 0x76, 0xf0, 0x50, 0x85, - 0xa1, 0x8e, 0x5a, 0xb6, 0x6e, 0x98, 0x0a, 0xf1, 0x43, 0x82, 0xe2, 0x14, 0x90, 0x18, 0xb0, 0xce, - 0xf1, 0xc5, 0x39, 0x6a, 0xdf, 0x45, 0xbe, 0x0b, 0x6d, 0xd9, 0xd8, 0x18, 0x3b, 0x76, 0xac, 0x98, - 0xf8, 0x03, 0xf8, 0x23, 0x3a, 0x56, 0x4c, 0x88, 0x21, 0xa0, 0x74, 0x61, 0xee, 0xc6, 0x86, 0x7c, - 0x77, 0x6e, 0xa3, 0x36, 0x45, 0xea, 0x94, 0xbc, 0xcf, 0xe7, 0xf3, 0x3e, 0xef, 0xdd, 0x7b, 0x2f, - 0x81, 0x4b, 0x5d, 0xc6, 0x53, 0xc6, 0xdb, 0x3c, 0x41, 0xbc, 0x4f, 0x68, 0xdc, 0x7e, 0xbf, 0x12, - 0x62, 0x81, 0x56, 0x4e, 0x01, 0x77, 0x90, 0x31, 0xc1, 0x8c, 0xba, 0xd2, 0xb9, 0xa7, 0xb0, 0xd6, - 0x35, 0x6a, 0x31, 0x8b, 0x99, 0xd4, 0xb4, 0xf3, 0x6f, 0x4a, 0xde, 0xb0, 0x62, 0xc6, 0xe2, 0x04, - 0xb7, 0x65, 0x14, 0x0e, 0x7b, 0xed, 0x68, 0x98, 0x21, 0x41, 0x18, 0xd5, 0xbc, 0x7d, 0x9e, 0x17, - 0x24, 0xc5, 0x5c, 0xa0, 0x74, 0xa0, 0x05, 0x8b, 0xaa, 0x5e, 0xa0, 0x9c, 0x75, 0x71, 0x19, 0x38, - 0x9f, 0xcb, 0xb0, 0xf6, 0x0a, 0x25, 0x24, 0x42, 0x82, 0x65, 0x1d, 0x12, 0x53, 0x42, 0xe3, 0xc7, - 0xb4, 0xc7, 0x8c, 0x55, 0x78, 0x0d, 0x45, 0x51, 0x86, 0x39, 0x37, 0x41, 0x13, 0xb4, 0xae, 0x7b, - 0xe6, 0xb7, 0xaf, 0xcb, 0x35, 0x9d, 0x7b, 0x5f, 0x31, 0x1d, 0x91, 0x11, 0x1a, 0xfb, 0x85, 0xd0, - 0x58, 0x83, 0x55, 0x2e, 0x50, 0x26, 0x82, 0x3e, 0x26, 0x71, 0x5f, 0x98, 0xff, 0x35, 0x41, 0xab, - 0xec, 0xd5, 0x4f, 0x46, 0xf6, 0xfc, 0x2e, 0x4a, 0x93, 0x35, 0x67, 0x92, 0x75, 0xfc, 0x8a, 0x0c, - 0x1f, 0xc9, 0x28, 0xcf, 0x25, 0x34, 0xc2, 0x3b, 0x01, 0xeb, 0xf5, 0x38, 0x16, 0x66, 0xf9, 0x7c, - 0xee, 0x24, 0xeb, 0xf8, 0x15, 0x19, 0x3e, 0x97, 0x91, 0xf1, 0x16, 0x56, 0xdf, 0x21, 0x92, 0xe0, - 0x28, 0x18, 0x52, 0x41, 0x12, 0x73, 0xa6, 0x09, 0x5a, 0x95, 0xd5, 0x86, 0xab, 0xe6, 0xe2, 0x16, - 0x73, 0x71, 0x37, 0x8b, 0xb9, 0x78, 0xf6, 0xe1, 0xc8, 0x2e, 0x9d, 0x79, 0x4f, 0x66, 0x3b, 0x7b, - 0x3f, 0x6d, 0xe0, 0x57, 0x14, 0xf4, 0x32, 0x47, 0x0c, 0x0b, 0x42, 0xc1, 0xd2, 0x90, 0x0b, 0x46, - 0x71, 0x64, 0xfe, 0xdf, 0x04, 0xad, 0x39, 0x7f, 0x02, 0x31, 0x36, 0xe1, 0x42, 0x4a, 0x38, 0xc7, - 0x51, 0x10, 0x26, 0xac, 0xbb, 0xc5, 0x83, 0x2e, 0x1b, 0x52, 0x81, 0x33, 0x73, 0x56, 0x3e, 0xa2, - 0x79, 0x32, 0xb2, 0x6f, 0xa9, 0x42, 0x53, 0x65, 0x8e, 0x3f, 0xaf, 0x70, 0x4f, 0xc2, 0x0f, 0x14, - 0xba, 0x36, 0xb7, 0x7f, 0x60, 0x97, 0x7e, 0x1f, 0xd8, 0xc0, 0xf9, 0x33, 0x03, 0x67, 0x37, 0x50, - 0x86, 0x52, 0x6e, 0xbc, 0x80, 0x35, 0x4e, 0x62, 0x7a, 0xe6, 0xb1, 0x4d, 0x68, 0xc4, 0xb6, 0xe5, - 0x8e, 0xca, 0x9e, 0x7d, 0x32, 0xb2, 0x6f, 0xea, 0x51, 0x4f, 0x51, 0x39, 0xbe, 0xa1, 0x60, 0x55, - 0xe8, 0xb5, 0x04, 0x8d, 0x8f, 0x20, 0x6f, 0x9f, 0x06, 0x3a, 0x63, 0x80, 0xb3, 0xc2, 0x34, 0xdf, - 0x5f, 0xd5, 0x7b, 0x96, 0xcf, 0xea, 0xc7, 0xc8, 0x5e, 0x8a, 0x89, 0xe8, 0x0f, 0x43, 0xb7, 0xcb, - 0x52, 0x7d, 0x43, 0xfa, 0x63, 0x99, 0x47, 0x5b, 0x6d, 0xb1, 0x3b, 0xc0, 0xdc, 0x5d, 0xc7, 0xdd, - 0xc9, 0xc7, 0x4e, 0x31, 0x75, 0x7c, 0x23, 0x25, 0xb4, 0x23, 0xe1, 0x0d, 0x9c, 0xe9, 0x1e, 0x3e, - 0xc0, 0x1b, 0x11, 0xdb, 0xa6, 0xf9, 0xe1, 0x06, 0xf9, 0xe4, 0x83, 0xe2, 0xc4, 0xe5, 0x1d, 0x54, - 0x56, 0x17, 0x2f, 0xec, 0x72, 0x5d, 0x0b, 0xbc, 0xbb, 0x7a, 0x95, 0xb7, 0x55, 0xd1, 0xe9, 0x36, - 0xce, 0x7e, 0xbe, 0xd4, 0x5a, 0x41, 0x3e, 0x41, 0x24, 0x29, 0x0c, 0x8c, 0x3d, 0x00, 0x1b, 0xf2, - 0x97, 0x18, 0xf4, 0x32, 0xd4, 0xcd, 0xa1, 0x20, 0x62, 0xc3, 0x30, 0xc1, 0xb2, 0x79, 0x79, 0x4c, - 0x55, 0xaf, 0x73, 0xe5, 0x21, 0xdc, 0xd1, 0x7b, 0xb8, 0xd4, 0xd9, 0xf1, 0xeb, 0x92, 0x7c, 0xa8, - 0xb9, 0x75, 0x49, 0xe5, 0x93, 0x31, 0x3e, 0x01, 0x58, 0xbf, 0x90, 0xa8, 0x5a, 0x97, 0xe7, 0x57, - 0xf5, 0x36, 0xae, 0xdc, 0x8f, 0x75, 0x49, 0x3f, 0xca, 0xd6, 0xf1, 0x17, 0xce, 0x35, 0xa3, 0x70, - 0xef, 0xe9, 0x97, 0xb1, 0x05, 0x0e, 0xc7, 0x16, 0x38, 0x1a, 0x5b, 0xe0, 0xd7, 0xd8, 0x02, 0x7b, - 0xc7, 0x56, 0xe9, 0xe8, 0xd8, 0x2a, 0x7d, 0x3f, 0xb6, 0x4a, 0x6f, 0x96, 0xff, 0x59, 0x7e, 0xe7, - 0xec, 0x9f, 0x50, 0x76, 0x12, 0xce, 0xca, 0xf5, 0xdd, 0xfb, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xad, - 0x9c, 0x12, 0xda, 0x29, 0x05, 0x00, 0x00, + // 576 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x3f, 0x6f, 0xd3, 0x40, + 0x1c, 0x8d, 0x1b, 0x08, 0xe1, 0x92, 0xe9, 0x48, 0x89, 0x9b, 0xc1, 0x0e, 0x1d, 0xaa, 0x2c, 0xb1, + 0x69, 0xd8, 0xd8, 0x08, 0x11, 0x7f, 0x07, 0x2a, 0x87, 0x3f, 0x82, 0xc5, 0x3a, 0xfb, 0xce, 0xce, + 0x11, 0xfb, 0x2e, 0xf2, 0x9d, 0x49, 0xf9, 0x16, 0x1d, 0x3b, 0x76, 0xe4, 0x03, 0x20, 0xf1, 0x15, + 0xba, 0x20, 0x55, 0x4c, 0x88, 0xa1, 0xa0, 0x64, 0xe1, 0x63, 0x20, 0xdf, 0xd9, 0x2d, 0x6a, 0xa5, + 0x4a, 0x9d, 0x12, 0xbf, 0xf7, 0x7e, 0xef, 0xf9, 0xf7, 0xee, 0x0c, 0x76, 0x42, 0x2e, 0x52, 0x2e, + 0x5c, 0x91, 0x20, 0x31, 0xa3, 0x2c, 0x76, 0x3f, 0xed, 0x06, 0x44, 0xa2, 0xdd, 0x33, 0xc0, 0x59, + 0x64, 0x5c, 0x72, 0xd8, 0xd5, 0x3a, 0xe7, 0x0c, 0x2e, 0x75, 0xbd, 0x4e, 0xcc, 0x63, 0xae, 0x34, + 0x6e, 0xf1, 0x4f, 0xcb, 0x7b, 0x56, 0xcc, 0x79, 0x9c, 0x10, 0x57, 0x3d, 0x05, 0x79, 0xe4, 0xe2, + 0x3c, 0x43, 0x92, 0x72, 0x56, 0xf2, 0xf6, 0x45, 0x5e, 0xd2, 0x94, 0x08, 0x89, 0xd2, 0x45, 0x29, + 0xd8, 0xd2, 0x79, 0xbe, 0x76, 0x2e, 0xc3, 0xd5, 0xc3, 0xf6, 0xb7, 0x0d, 0xd0, 0x79, 0x8b, 0x12, + 0x8a, 0x91, 0xe4, 0xd9, 0x94, 0xc6, 0x8c, 0xb2, 0xf8, 0x39, 0x8b, 0x38, 0x1c, 0x81, 0x5b, 0x08, + 0xe3, 0x8c, 0x08, 0x61, 0x1a, 0x7d, 0x63, 0x70, 0x7b, 0x6c, 0xfe, 0xf8, 0x3a, 0xec, 0x94, 0xb3, + 0x8f, 0x34, 0x33, 0x95, 0x19, 0x65, 0xb1, 0x57, 0x09, 0xe1, 0x3d, 0xd0, 0x16, 0x12, 0x65, 0xd2, + 0x9f, 0x11, 0x1a, 0xcf, 0xa4, 0xb9, 0xd1, 0x37, 0x06, 0x75, 0xaf, 0xa5, 0xb0, 0x67, 0x0a, 0x2a, + 0x24, 0x94, 0x61, 0xb2, 0xef, 0xf3, 0x28, 0x12, 0x44, 0x9a, 0x75, 0x2d, 0x51, 0xd8, 0x2b, 0x05, + 0xc1, 0xa7, 0xa0, 0xfd, 0x11, 0xd1, 0x84, 0x60, 0x3f, 0x67, 0x92, 0x26, 0xe6, 0x8d, 0xbe, 0x31, + 0x68, 0x8d, 0x7a, 0x8e, 0xde, 0xd2, 0xa9, 0xb6, 0x74, 0x5e, 0x57, 0x5b, 0x8e, 0x9b, 0xc7, 0xa7, + 0x76, 0xed, 0xe0, 0xb7, 0x6d, 0x78, 0x2d, 0x3d, 0xf9, 0xa6, 0x18, 0x84, 0x16, 0x00, 0x92, 0xa7, + 0x81, 0x90, 0x9c, 0x11, 0x6c, 0xde, 0xec, 0x1b, 0x83, 0xa6, 0xf7, 0x1f, 0x02, 0x47, 0x60, 0x33, + 0xa5, 0x42, 0x10, 0xec, 0x07, 0x09, 0x0f, 0xe7, 0xc2, 0x0f, 0x79, 0xce, 0x24, 0xc9, 0xcc, 0x86, + 0x7a, 0xa9, 0x3b, 0x9a, 0x1c, 0x2b, 0xee, 0xb1, 0xa6, 0x1e, 0x36, 0x0f, 0x8f, 0xec, 0xda, 0xdf, + 0x23, 0xdb, 0xd8, 0xfe, 0x5e, 0x07, 0x8d, 0x3d, 0x94, 0xa1, 0x54, 0xc0, 0xfb, 0xa0, 0x23, 0x68, + 0xcc, 0xce, 0x8d, 0x96, 0x94, 0x61, 0xbe, 0x54, 0xc5, 0xd5, 0x3d, 0xa8, 0x39, 0xed, 0xf3, 0x4e, + 0x31, 0x10, 0x15, 0xd1, 0xcc, 0x2f, 0xa7, 0x16, 0x24, 0xab, 0x46, 0x8a, 0xca, 0xda, 0x63, 0xa7, + 0x58, 0xe8, 0xd7, 0xa9, 0xbd, 0x13, 0x53, 0x39, 0xcb, 0x03, 0x27, 0xe4, 0x69, 0x79, 0x6c, 0xe5, + 0xcf, 0x50, 0xe0, 0xb9, 0x2b, 0x3f, 0x2f, 0x88, 0x70, 0x26, 0x24, 0xf4, 0x60, 0x4a, 0xd9, 0x54, + 0x79, 0xed, 0x91, 0xac, 0x8c, 0x78, 0x0f, 0xee, 0x62, 0xbe, 0x64, 0xc5, 0x5d, 0xf0, 0x8b, 0x56, + 0xfc, 0xea, 0xd6, 0xa8, 0xce, 0x5b, 0xa3, 0xad, 0x4b, 0x85, 0x4e, 0x4a, 0x81, 0xee, 0xf3, 0xb0, + 0xe8, 0xb3, 0x53, 0x59, 0xbc, 0x40, 0x34, 0xa9, 0x78, 0x38, 0x07, 0x3d, 0x75, 0x75, 0xfd, 0x28, + 0x43, 0x61, 0x81, 0xf8, 0x98, 0xe7, 0x41, 0x42, 0xd4, 0x3e, 0xea, 0xbc, 0xae, 0xbf, 0x42, 0x57, + 0x39, 0x3e, 0x29, 0x0d, 0x27, 0xca, 0xaf, 0x58, 0x09, 0x46, 0xa0, 0x7b, 0x29, 0x4c, 0xbf, 0x93, + 0x3a, 0xd2, 0xeb, 0x27, 0x6d, 0x5e, 0x48, 0xd2, 0x66, 0xe3, 0x97, 0x5f, 0x56, 0x96, 0x71, 0xbc, + 0xb2, 0x8c, 0x93, 0x95, 0x65, 0xfc, 0x59, 0x59, 0xc6, 0xc1, 0xda, 0xaa, 0x9d, 0xac, 0xad, 0xda, + 0xcf, 0xb5, 0x55, 0xfb, 0x30, 0xbc, 0xd2, 0x7c, 0xff, 0xfc, 0x93, 0x57, 0x39, 0x41, 0x43, 0x95, + 0xfa, 0xe0, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc7, 0xbe, 0xf2, 0xba, 0x12, 0x04, 0x00, 0x00, } func (this *ValidatorSigningInfo) Equal(that interface{}) bool { diff --git a/x/slashing/types/tx.pb.go b/x/slashing/types/tx.pb.go index 9cc1ad9b1..f2cad6962 100644 --- a/x/slashing/types/tx.pb.go +++ b/x/slashing/types/tx.pb.go @@ -31,7 +31,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // MsgUnjail defines the Msg/Unjail request type type MsgUnjail struct { - ValidatorAddr string `protobuf:"bytes,1,opt,name=validator_addr,json=validatorAddr,proto3" json:"address" yaml:"address"` + ValidatorAddr string `protobuf:"bytes,1,opt,name=validator_addr,json=validatorAddr,proto3" json:"address"` } func (m *MsgUnjail) Reset() { *m = MsgUnjail{} } @@ -112,26 +112,25 @@ func init() { func init() { proto.RegisterFile("cosmos/slashing/v1beta1/tx.proto", fileDescriptor_3c5611c0c4a59d9d) } var fileDescriptor_3c5611c0c4a59d9d = []byte{ - // 292 bytes of a gzipped FileDescriptorProto + // 279 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x48, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0x2f, 0xce, 0x49, 0x2c, 0xce, 0xc8, 0xcc, 0x4b, 0xd7, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x87, 0xa8, 0xd0, 0x83, 0xa9, 0xd0, 0x83, 0xaa, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0xab, 0xd1, 0x07, - 0xb1, 0x20, 0xca, 0xa5, 0x24, 0x21, 0xca, 0xe3, 0x21, 0x12, 0x50, 0xbd, 0x60, 0x8e, 0x52, 0x31, - 0x17, 0xa7, 0x6f, 0x71, 0x7a, 0x68, 0x5e, 0x56, 0x62, 0x66, 0x8e, 0x50, 0x0c, 0x17, 0x5f, 0x59, + 0xb1, 0x20, 0xca, 0xa5, 0x24, 0x21, 0xca, 0xe3, 0x21, 0x12, 0x50, 0xbd, 0x60, 0x8e, 0x52, 0x22, + 0x17, 0xa7, 0x6f, 0x71, 0x7a, 0x68, 0x5e, 0x56, 0x62, 0x66, 0x8e, 0x90, 0x17, 0x17, 0x5f, 0x59, 0x62, 0x4e, 0x66, 0x4a, 0x62, 0x49, 0x7e, 0x51, 0x7c, 0x62, 0x4a, 0x4a, 0x91, 0x04, 0xa3, 0x02, - 0xa3, 0x06, 0xa7, 0x93, 0xe9, 0xab, 0x7b, 0xf2, 0xec, 0x20, 0x7e, 0x6a, 0x71, 0xf1, 0xa7, 0x7b, - 0xf2, 0x7c, 0x95, 0x89, 0xb9, 0x39, 0x56, 0x4a, 0x50, 0x01, 0xa5, 0x4b, 0x5b, 0x74, 0x45, 0xa0, - 0x66, 0x3a, 0x42, 0x84, 0x82, 0x4b, 0x8a, 0x32, 0xf3, 0xd2, 0x83, 0x78, 0xe1, 0x86, 0x81, 0xc4, - 0xad, 0x38, 0x3a, 0x16, 0xc8, 0x33, 0xcc, 0x58, 0x20, 0xcf, 0xa8, 0x24, 0xcc, 0x25, 0x08, 0xb7, - 0x34, 0x28, 0xb5, 0xb8, 0x20, 0x3f, 0xaf, 0x38, 0xd5, 0x28, 0x9e, 0x8b, 0xd9, 0xb7, 0x38, 0x5d, - 0x28, 0x82, 0x8b, 0x0d, 0xea, 0x1a, 0x25, 0x3d, 0x1c, 0xbe, 0xd4, 0x83, 0x6b, 0x96, 0xd2, 0x22, - 0xac, 0x06, 0x66, 0x81, 0x93, 0xf7, 0x8a, 0x47, 0x72, 0x8c, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, - 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, - 0x78, 0x2c, 0xc7, 0x10, 0xa5, 0x9b, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0x0b, - 0x0d, 0x21, 0x28, 0xa5, 0x5b, 0x9c, 0x92, 0xad, 0x5f, 0x81, 0x88, 0x8c, 0x92, 0xca, 0x82, 0xd4, - 0xe2, 0x24, 0x36, 0x70, 0xf0, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa7, 0x21, 0xb9, 0x58, - 0xac, 0x01, 0x00, 0x00, + 0xa3, 0x06, 0xa7, 0x93, 0xf2, 0xab, 0x7b, 0xf2, 0xec, 0x20, 0x7e, 0x6a, 0x71, 0xf1, 0xa5, 0x2d, + 0xba, 0x22, 0x50, 0x13, 0x1c, 0x21, 0x22, 0xc1, 0x25, 0x45, 0x99, 0x79, 0xe9, 0x41, 0xbc, 0x70, + 0xad, 0x20, 0x71, 0x2b, 0x8e, 0x8e, 0x05, 0xf2, 0x0c, 0x33, 0x16, 0xc8, 0x33, 0x2a, 0x09, 0x73, + 0x09, 0xc2, 0xad, 0x08, 0x4a, 0x2d, 0x2e, 0xc8, 0xcf, 0x2b, 0x4e, 0x35, 0x8a, 0xe7, 0x62, 0xf6, + 0x2d, 0x4e, 0x17, 0x8a, 0xe0, 0x62, 0x83, 0xda, 0xad, 0xa4, 0x87, 0xc3, 0x4f, 0x7a, 0x70, 0xcd, + 0x52, 0x5a, 0x84, 0xd5, 0xc0, 0x2c, 0x70, 0xf2, 0x5e, 0xf1, 0x48, 0x8e, 0xf1, 0xc4, 0x23, 0x39, + 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, + 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0x74, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, + 0xf3, 0x73, 0xa1, 0xe1, 0x01, 0xa5, 0x74, 0x8b, 0x53, 0xb2, 0xf5, 0x2b, 0x10, 0x41, 0x5f, 0x52, + 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x0e, 0x2c, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x9f, + 0x32, 0xcd, 0x3e, 0x9a, 0x01, 0x00, 0x00, } func (this *MsgUnjail) Equal(that interface{}) bool { diff --git a/x/staking/migrations/v040/types.go b/x/staking/migrations/v040/types.go index 8964296fa..03a6f1c93 100644 --- a/x/staking/migrations/v040/types.go +++ b/x/staking/migrations/v040/types.go @@ -5,7 +5,7 @@ import ( "strings" "time" - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/staking/types/commission.go b/x/staking/types/commission.go index 54891b5dc..9bc0edf52 100644 --- a/x/staking/types/commission.go +++ b/x/staking/types/commission.go @@ -3,7 +3,7 @@ package types import ( "time" - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/staking/types/delegation.go b/x/staking/types/delegation.go index 84951e0a3..f3412b5f8 100644 --- a/x/staking/types/delegation.go +++ b/x/staking/types/delegation.go @@ -6,7 +6,7 @@ import ( "strings" "time" - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/staking/types/genesis.pb.go b/x/staking/types/genesis.pb.go index 08dc84010..51a94e79d 100644 --- a/x/staking/types/genesis.pb.go +++ b/x/staking/types/genesis.pb.go @@ -31,16 +31,16 @@ type GenesisState struct { Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` // last_total_power tracks the total amounts of bonded tokens recorded during // the previous end block. - LastTotalPower github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=last_total_power,json=lastTotalPower,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"last_total_power" yaml:"last_total_power"` + LastTotalPower github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=last_total_power,json=lastTotalPower,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"last_total_power"` // last_validator_powers is a special index that provides a historical list // of the last-block's bonded validators. - LastValidatorPowers []LastValidatorPower `protobuf:"bytes,3,rep,name=last_validator_powers,json=lastValidatorPowers,proto3" json:"last_validator_powers" yaml:"last_validator_powers"` + LastValidatorPowers []LastValidatorPower `protobuf:"bytes,3,rep,name=last_validator_powers,json=lastValidatorPowers,proto3" json:"last_validator_powers"` // delegations defines the validator set at genesis. Validators []Validator `protobuf:"bytes,4,rep,name=validators,proto3" json:"validators"` // delegations defines the delegations active at genesis. Delegations []Delegation `protobuf:"bytes,5,rep,name=delegations,proto3" json:"delegations"` // unbonding_delegations defines the unbonding delegations active at genesis. - UnbondingDelegations []UnbondingDelegation `protobuf:"bytes,6,rep,name=unbonding_delegations,json=unbondingDelegations,proto3" json:"unbonding_delegations" yaml:"unbonding_delegations"` + UnbondingDelegations []UnbondingDelegation `protobuf:"bytes,6,rep,name=unbonding_delegations,json=unbondingDelegations,proto3" json:"unbonding_delegations"` // redelegations defines the redelegations active at genesis. Redelegations []Redelegation `protobuf:"bytes,7,rep,name=redelegations,proto3" json:"redelegations"` Exported bool `protobuf:"varint,8,opt,name=exported,proto3" json:"exported,omitempty"` @@ -179,40 +179,38 @@ func init() { } var fileDescriptor_9b3dec8894f2831b = []byte{ - // 519 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0xc1, 0x6e, 0xd3, 0x30, - 0x18, 0xc7, 0x63, 0xba, 0x76, 0xc5, 0x1d, 0x08, 0x99, 0x0e, 0x42, 0x85, 0x92, 0x12, 0x55, 0xa8, - 0x02, 0x96, 0x68, 0xe5, 0x36, 0x71, 0x21, 0x42, 0x4c, 0x43, 0x1c, 0xaa, 0x0c, 0x38, 0x70, 0xa9, - 0xdc, 0xc5, 0xca, 0xa2, 0xa5, 0x71, 0x14, 0xbb, 0x63, 0xbb, 0x23, 0xc4, 0x91, 0x47, 0xd8, 0x43, - 0xf0, 0x10, 0x3b, 0x4e, 0x88, 0x03, 0xe2, 0x50, 0xa1, 0xf6, 0xc2, 0x79, 0x4f, 0x80, 0x62, 0x3b, - 0x21, 0xb4, 0x0b, 0xa7, 0xc4, 0x5f, 0x7e, 0xff, 0xff, 0xff, 0xb3, 0xf3, 0x19, 0xf6, 0x0e, 0x28, - 0x9b, 0x50, 0xe6, 0x30, 0x8e, 0x8f, 0xc2, 0x38, 0x70, 0x8e, 0xb7, 0xc7, 0x84, 0xe3, 0x6d, 0x27, - 0x20, 0x31, 0x61, 0x21, 0xb3, 0x93, 0x94, 0x72, 0x8a, 0xee, 0x48, 0xca, 0x56, 0x94, 0xad, 0xa8, - 0x4e, 0x3b, 0xa0, 0x01, 0x15, 0x88, 0x93, 0xbd, 0x49, 0xba, 0x53, 0xe5, 0x99, 0xab, 0x25, 0x75, - 0x4f, 0x52, 0x23, 0x29, 0x57, 0x01, 0x62, 0x61, 0x7d, 0xaf, 0xc3, 0x8d, 0x5d, 0xd9, 0xc0, 0x3e, - 0xc7, 0x9c, 0xa0, 0x67, 0xb0, 0x91, 0xe0, 0x14, 0x4f, 0x98, 0x0e, 0xba, 0xa0, 0xdf, 0x1a, 0x18, - 0xf6, 0xd5, 0x0d, 0xd9, 0x43, 0x41, 0xb9, 0x6b, 0xe7, 0x33, 0x53, 0xf3, 0x94, 0x06, 0x31, 0x78, - 0x2b, 0xc2, 0x8c, 0x8f, 0x38, 0xe5, 0x38, 0x1a, 0x25, 0xf4, 0x03, 0x49, 0xf5, 0x6b, 0x5d, 0xd0, - 0xdf, 0x70, 0xf7, 0x32, 0xee, 0xe7, 0xcc, 0x7c, 0x18, 0x84, 0xfc, 0x70, 0x3a, 0xb6, 0x0f, 0xe8, - 0x44, 0x75, 0xa2, 0x1e, 0x5b, 0xcc, 0x3f, 0x72, 0xf8, 0x69, 0x42, 0x98, 0xbd, 0x17, 0xf3, 0xcb, - 0x99, 0x79, 0xf7, 0x14, 0x4f, 0xa2, 0x1d, 0x6b, 0xd9, 0xcf, 0xf2, 0x6e, 0x66, 0xa5, 0x37, 0x59, - 0x65, 0x98, 0x15, 0xd0, 0x47, 0x00, 0x37, 0x05, 0x75, 0x8c, 0xa3, 0xd0, 0xc7, 0x9c, 0xa6, 0x92, - 0x64, 0x7a, 0xad, 0x5b, 0xeb, 0xb7, 0x06, 0x8f, 0xaa, 0xb6, 0xf0, 0x1a, 0x33, 0xfe, 0x2e, 0xd7, - 0x08, 0x2f, 0xb7, 0x97, 0xb5, 0x79, 0x39, 0x33, 0xef, 0x97, 0xc2, 0x97, 0x6d, 0x2d, 0xef, 0x76, - 0xb4, 0xa2, 0x64, 0x68, 0x17, 0xc2, 0x82, 0x64, 0xfa, 0x9a, 0x88, 0x7e, 0x50, 0x15, 0x5d, 0x88, - 0xd5, 0x01, 0x96, 0xa4, 0xe8, 0x15, 0x6c, 0xf9, 0x24, 0x22, 0x01, 0xe6, 0x21, 0x8d, 0x99, 0x5e, - 0x17, 0x4e, 0x56, 0x95, 0xd3, 0x8b, 0x02, 0x55, 0x56, 0x65, 0x31, 0xfa, 0x04, 0xe0, 0xe6, 0x34, - 0x1e, 0xd3, 0xd8, 0x0f, 0xe3, 0x60, 0x54, 0xb6, 0x6d, 0x08, 0xdb, 0xc7, 0x55, 0xb6, 0x6f, 0x73, - 0x51, 0xc9, 0x7f, 0xe9, 0x70, 0xae, 0xf4, 0xb5, 0xbc, 0xf6, 0x74, 0x55, 0xca, 0xd0, 0x10, 0xde, - 0x48, 0x49, 0x39, 0x7f, 0x5d, 0xe4, 0xf7, 0xaa, 0xf2, 0xbd, 0x12, 0xac, 0x36, 0xf6, 0xaf, 0x01, - 0xea, 0xc0, 0x26, 0x39, 0x49, 0x68, 0xca, 0x89, 0xaf, 0x37, 0xbb, 0xa0, 0xdf, 0xf4, 0x8a, 0xb5, - 0x75, 0x08, 0xd1, 0xea, 0xcf, 0x45, 0x03, 0xb8, 0x8e, 0x7d, 0x3f, 0x25, 0x4c, 0x0e, 0xf7, 0x75, - 0x57, 0xff, 0xf6, 0x75, 0xab, 0xad, 0x1a, 0x78, 0x2e, 0xbf, 0xec, 0xf3, 0x34, 0x8c, 0x03, 0x2f, - 0x07, 0x51, 0x1b, 0xd6, 0xff, 0x8e, 0x71, 0xcd, 0x93, 0x8b, 0x9d, 0xe6, 0xe7, 0x33, 0x53, 0xfb, - 0x7d, 0x66, 0x6a, 0xee, 0xcb, 0xf3, 0xb9, 0x01, 0x2e, 0xe6, 0x06, 0xf8, 0x35, 0x37, 0xc0, 0x97, - 0x85, 0xa1, 0x5d, 0x2c, 0x0c, 0xed, 0xc7, 0xc2, 0xd0, 0xde, 0x3f, 0xf9, 0xef, 0xa4, 0x9f, 0x14, - 0x77, 0x56, 0xcc, 0xfc, 0xb8, 0x21, 0xee, 0xe3, 0xd3, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x89, - 0xb3, 0xaa, 0xf3, 0x26, 0x04, 0x00, 0x00, + // 483 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0x41, 0x6e, 0xd3, 0x40, + 0x14, 0x86, 0x6d, 0x92, 0xa6, 0x61, 0x52, 0x10, 0x1a, 0x52, 0x64, 0xb2, 0x70, 0x42, 0x54, 0xa1, + 0x08, 0xa8, 0xad, 0x86, 0x1d, 0x62, 0x43, 0x84, 0xa8, 0x40, 0x2c, 0x22, 0x17, 0x10, 0x62, 0x13, + 0x4d, 0xea, 0xc1, 0xb5, 0xea, 0x78, 0xac, 0x79, 0x2f, 0xa5, 0xdc, 0x80, 0x25, 0x47, 0xe8, 0x21, + 0x38, 0x44, 0x97, 0x15, 0x2b, 0xc4, 0xa2, 0x42, 0xc9, 0x86, 0x1b, 0xb0, 0x45, 0x9e, 0x99, 0x18, + 0xa3, 0x60, 0x56, 0xc9, 0xe8, 0x7d, 0xff, 0x37, 0xbf, 0xe4, 0x37, 0x64, 0xe7, 0x50, 0xc0, 0x4c, + 0x80, 0x0f, 0xc8, 0x8e, 0xe3, 0x34, 0xf2, 0x4f, 0xf6, 0xa6, 0x1c, 0xd9, 0x9e, 0x1f, 0xf1, 0x94, + 0x43, 0x0c, 0x5e, 0x26, 0x05, 0x0a, 0x7a, 0x4b, 0x53, 0x9e, 0xa1, 0x3c, 0x43, 0x75, 0xda, 0x91, + 0x88, 0x84, 0x42, 0xfc, 0xfc, 0x9f, 0xa6, 0x3b, 0x55, 0xce, 0x55, 0x5a, 0x53, 0xb7, 0x35, 0x35, + 0xd1, 0x71, 0x73, 0x81, 0x3a, 0xf4, 0x7f, 0xd5, 0xc9, 0xd6, 0xbe, 0x2e, 0x70, 0x80, 0x0c, 0x39, + 0x7d, 0x4c, 0x1a, 0x19, 0x93, 0x6c, 0x06, 0x8e, 0xdd, 0xb3, 0x07, 0xad, 0xa1, 0xeb, 0xfd, 0xbb, + 0x90, 0x37, 0x56, 0xd4, 0xa8, 0x7e, 0x7e, 0xd9, 0xb5, 0x02, 0x93, 0xa1, 0x6f, 0xc9, 0x8d, 0x84, + 0x01, 0x4e, 0x50, 0x20, 0x4b, 0x26, 0x99, 0xf8, 0xc0, 0xa5, 0x73, 0xa5, 0x67, 0x0f, 0xb6, 0x46, + 0x5e, 0xce, 0x7d, 0xbf, 0xec, 0xde, 0x8d, 0x62, 0x3c, 0x9a, 0x4f, 0xbd, 0x43, 0x31, 0x33, 0x4d, + 0xcc, 0xcf, 0x2e, 0x84, 0xc7, 0x3e, 0x7e, 0xcc, 0x38, 0x78, 0xcf, 0x53, 0x0c, 0xae, 0xe7, 0x9e, + 0x57, 0xb9, 0x66, 0x9c, 0x5b, 0x68, 0x48, 0xb6, 0x95, 0xf9, 0x84, 0x25, 0x71, 0xc8, 0x50, 0x48, + 0x6d, 0x07, 0xa7, 0xd6, 0xab, 0x0d, 0x5a, 0xc3, 0x7b, 0x55, 0x35, 0x5f, 0x32, 0xc0, 0x37, 0xab, + 0x8c, 0x52, 0x99, 0xca, 0x37, 0x93, 0xb5, 0x09, 0xd0, 0x7d, 0x42, 0x8a, 0x0b, 0xc0, 0xa9, 0x2b, + 0xf5, 0x9d, 0x2a, 0x75, 0x11, 0x36, 0xc6, 0x52, 0x94, 0xbe, 0x20, 0xad, 0x90, 0x27, 0x3c, 0x62, + 0x18, 0x8b, 0x14, 0x9c, 0x0d, 0x65, 0xea, 0x57, 0x99, 0x9e, 0x16, 0xa8, 0x51, 0x95, 0xc3, 0xf4, + 0x3d, 0xd9, 0x9e, 0xa7, 0x53, 0x91, 0x86, 0x71, 0x1a, 0x4d, 0xca, 0xd6, 0x86, 0xb2, 0xde, 0xaf, + 0xb2, 0xbe, 0x5e, 0x85, 0xd6, 0xf4, 0xed, 0xf9, 0xfa, 0x08, 0xe8, 0x98, 0x5c, 0x93, 0xbc, 0xec, + 0xdf, 0x54, 0xfe, 0x9d, 0x2a, 0x7f, 0x50, 0x82, 0x8d, 0xf8, 0x6f, 0x01, 0xed, 0x90, 0x26, 0x3f, + 0xcd, 0x84, 0x44, 0x1e, 0x3a, 0xcd, 0x9e, 0x3d, 0x68, 0x06, 0xc5, 0xb9, 0x7f, 0x44, 0xe8, 0xfa, + 0xb7, 0xa1, 0x43, 0xb2, 0xc9, 0xc2, 0x50, 0x72, 0xd0, 0xfb, 0x77, 0x75, 0xe4, 0x7c, 0xfd, 0xb2, + 0xdb, 0x36, 0x05, 0x9e, 0xe8, 0xc9, 0x01, 0xca, 0x38, 0x8d, 0x82, 0x15, 0x48, 0xdb, 0x64, 0xe3, + 0xcf, 0xa6, 0xd5, 0x02, 0x7d, 0x78, 0xd4, 0xfc, 0x74, 0xd6, 0xb5, 0x7e, 0x9e, 0x75, 0xad, 0xd1, + 0xb3, 0xf3, 0x85, 0x6b, 0x5f, 0x2c, 0x5c, 0xfb, 0xc7, 0xc2, 0xb5, 0x3f, 0x2f, 0x5d, 0xeb, 0x62, + 0xe9, 0x5a, 0xdf, 0x96, 0xae, 0xf5, 0xee, 0xc1, 0x7f, 0x97, 0xf1, 0xb4, 0x78, 0x56, 0x6a, 0x2d, + 0xa7, 0x0d, 0xf5, 0x64, 0x1e, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x73, 0xbd, 0x93, 0xb3, 0xc9, + 0x03, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/staking/types/params.go b/x/staking/types/params.go index 8ccae6b56..60a73d6b6 100644 --- a/x/staking/types/params.go +++ b/x/staking/types/params.go @@ -6,7 +6,7 @@ import ( "strings" "time" - yaml "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/staking/types/staking.pb.go b/x/staking/types/staking.pb.go index fbe9e8414..495d01f1d 100644 --- a/x/staking/types/staking.pb.go +++ b/x/staking/types/staking.pb.go @@ -138,9 +138,9 @@ type CommissionRates struct { // rate is the commission rate charged to delegators, as a fraction. Rate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=rate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"rate"` // max_rate defines the maximum commission rate which validator can ever charge, as a fraction. - MaxRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=max_rate,json=maxRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"max_rate" yaml:"max_rate"` + MaxRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=max_rate,json=maxRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"max_rate"` // max_change_rate defines the maximum daily increase of the validator commission, as a fraction. - MaxChangeRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=max_change_rate,json=maxChangeRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"max_change_rate" yaml:"max_change_rate"` + MaxChangeRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=max_change_rate,json=maxChangeRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"max_change_rate"` } func (m *CommissionRates) Reset() { *m = CommissionRates{} } @@ -180,7 +180,7 @@ type Commission struct { // commission_rates defines the initial commission rates to be used for creating a validator. CommissionRates `protobuf:"bytes,1,opt,name=commission_rates,json=commissionRates,proto3,embedded=commission_rates" json:"commission_rates"` // update_time is the last time the commission rate was changed. - UpdateTime time.Time `protobuf:"bytes,2,opt,name=update_time,json=updateTime,proto3,stdtime" json:"update_time" yaml:"update_time"` + UpdateTime time.Time `protobuf:"bytes,2,opt,name=update_time,json=updateTime,proto3,stdtime" json:"update_time"` } func (m *Commission) Reset() { *m = Commission{} } @@ -231,7 +231,7 @@ type Description struct { // website defines an optional website link. Website string `protobuf:"bytes,3,opt,name=website,proto3" json:"website,omitempty"` // security_contact defines an optional email for security contact. - SecurityContact string `protobuf:"bytes,4,opt,name=security_contact,json=securityContact,proto3" json:"security_contact,omitempty" yaml:"security_contact"` + SecurityContact string `protobuf:"bytes,4,opt,name=security_contact,json=securityContact,proto3" json:"security_contact,omitempty"` // details define other optional details. Details string `protobuf:"bytes,5,opt,name=details,proto3" json:"details,omitempty"` } @@ -313,9 +313,9 @@ func (m *Description) GetDetails() string { // multiplied by exchange rate. type Validator struct { // operator_address defines the address of the validator's operator; bech encoded in JSON. - OperatorAddress string `protobuf:"bytes,1,opt,name=operator_address,json=operatorAddress,proto3" json:"operator_address,omitempty" yaml:"operator_address"` + OperatorAddress string `protobuf:"bytes,1,opt,name=operator_address,json=operatorAddress,proto3" json:"operator_address,omitempty"` // consensus_pubkey is the consensus public key of the validator, as a Protobuf Any. - ConsensusPubkey *types1.Any `protobuf:"bytes,2,opt,name=consensus_pubkey,json=consensusPubkey,proto3" json:"consensus_pubkey,omitempty" yaml:"consensus_pubkey"` + ConsensusPubkey *types1.Any `protobuf:"bytes,2,opt,name=consensus_pubkey,json=consensusPubkey,proto3" json:"consensus_pubkey,omitempty"` // jailed defined whether the validator has been jailed from bonded status or not. Jailed bool `protobuf:"varint,3,opt,name=jailed,proto3" json:"jailed,omitempty"` // status is the validator status (bonded/unbonding/unbonded). @@ -323,17 +323,17 @@ type Validator struct { // tokens define the delegated tokens (incl. self-delegation). Tokens github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,opt,name=tokens,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"tokens"` // delegator_shares defines total shares issued to a validator's delegators. - DelegatorShares github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,6,opt,name=delegator_shares,json=delegatorShares,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"delegator_shares" yaml:"delegator_shares"` + DelegatorShares github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,6,opt,name=delegator_shares,json=delegatorShares,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"delegator_shares"` // description defines the description terms for the validator. Description Description `protobuf:"bytes,7,opt,name=description,proto3" json:"description"` // unbonding_height defines, if unbonding, the height at which this validator has begun unbonding. - UnbondingHeight int64 `protobuf:"varint,8,opt,name=unbonding_height,json=unbondingHeight,proto3" json:"unbonding_height,omitempty" yaml:"unbonding_height"` + UnbondingHeight int64 `protobuf:"varint,8,opt,name=unbonding_height,json=unbondingHeight,proto3" json:"unbonding_height,omitempty"` // unbonding_time defines, if unbonding, the min time for the validator to complete unbonding. - UnbondingTime time.Time `protobuf:"bytes,9,opt,name=unbonding_time,json=unbondingTime,proto3,stdtime" json:"unbonding_time" yaml:"unbonding_time"` + UnbondingTime time.Time `protobuf:"bytes,9,opt,name=unbonding_time,json=unbondingTime,proto3,stdtime" json:"unbonding_time"` // commission defines the commission parameters. Commission Commission `protobuf:"bytes,10,opt,name=commission,proto3" json:"commission"` // min_self_delegation is the validator's self declared minimum self delegation. - MinSelfDelegation github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,11,opt,name=min_self_delegation,json=minSelfDelegation,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"min_self_delegation" yaml:"min_self_delegation"` + MinSelfDelegation github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,11,opt,name=min_self_delegation,json=minSelfDelegation,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"min_self_delegation"` } func (m *Validator) Reset() { *m = Validator{} } @@ -416,8 +416,8 @@ func (m *ValAddresses) GetAddresses() []string { // It is intended to be used as a marshalable pointer. For example, a DVPair can // be used to construct the key to getting an UnbondingDelegation from state. type DVPair struct { - DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty" yaml:"delegator_address"` - ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty" yaml:"validator_address"` + DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` + ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` } func (m *DVPair) Reset() { *m = DVPair{} } @@ -502,9 +502,9 @@ func (m *DVPairs) GetPairs() []DVPair { // example, a DVVTriplet can be used to construct the key to getting a // Redelegation from state. type DVVTriplet struct { - DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty" yaml:"delegator_address"` - ValidatorSrcAddress string `protobuf:"bytes,2,opt,name=validator_src_address,json=validatorSrcAddress,proto3" json:"validator_src_address,omitempty" yaml:"validator_src_address"` - ValidatorDstAddress string `protobuf:"bytes,3,opt,name=validator_dst_address,json=validatorDstAddress,proto3" json:"validator_dst_address,omitempty" yaml:"validator_dst_address"` + DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` + ValidatorSrcAddress string `protobuf:"bytes,2,opt,name=validator_src_address,json=validatorSrcAddress,proto3" json:"validator_src_address,omitempty"` + ValidatorDstAddress string `protobuf:"bytes,3,opt,name=validator_dst_address,json=validatorDstAddress,proto3" json:"validator_dst_address,omitempty"` } func (m *DVVTriplet) Reset() { *m = DVVTriplet{} } @@ -589,9 +589,9 @@ func (m *DVVTriplets) GetTriplets() []DVVTriplet { // validator. type Delegation struct { // delegator_address is the bech32-encoded address of the delegator. - DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty" yaml:"delegator_address"` + DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` // validator_address is the bech32-encoded address of the validator. - ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty" yaml:"validator_address"` + ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` // shares define the delegation shares received. Shares github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=shares,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"shares"` } @@ -632,9 +632,9 @@ var xxx_messageInfo_Delegation proto.InternalMessageInfo // for a single validator in an time-ordered list. type UnbondingDelegation struct { // delegator_address is the bech32-encoded address of the delegator. - DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty" yaml:"delegator_address"` + DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` // validator_address is the bech32-encoded address of the validator. - ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty" yaml:"validator_address"` + ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` // entries are the unbonding delegation entries. Entries []UnbondingDelegationEntry `protobuf:"bytes,3,rep,name=entries,proto3" json:"entries"` } @@ -674,11 +674,11 @@ var xxx_messageInfo_UnbondingDelegation proto.InternalMessageInfo // UnbondingDelegationEntry defines an unbonding object with relevant metadata. type UnbondingDelegationEntry struct { // creation_height is the height which the unbonding took place. - CreationHeight int64 `protobuf:"varint,1,opt,name=creation_height,json=creationHeight,proto3" json:"creation_height,omitempty" yaml:"creation_height"` + CreationHeight int64 `protobuf:"varint,1,opt,name=creation_height,json=creationHeight,proto3" json:"creation_height,omitempty"` // completion_time is the unix time for unbonding completion. - CompletionTime time.Time `protobuf:"bytes,2,opt,name=completion_time,json=completionTime,proto3,stdtime" json:"completion_time" yaml:"completion_time"` + CompletionTime time.Time `protobuf:"bytes,2,opt,name=completion_time,json=completionTime,proto3,stdtime" json:"completion_time"` // initial_balance defines the tokens initially scheduled to receive at completion. - InitialBalance github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=initial_balance,json=initialBalance,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"initial_balance" yaml:"initial_balance"` + InitialBalance github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=initial_balance,json=initialBalance,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"initial_balance"` // balance defines the tokens to receive at completion. Balance github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=balance,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"balance"` } @@ -732,11 +732,11 @@ func (m *UnbondingDelegationEntry) GetCompletionTime() time.Time { // RedelegationEntry defines a redelegation object with relevant metadata. type RedelegationEntry struct { // creation_height defines the height which the redelegation took place. - CreationHeight int64 `protobuf:"varint,1,opt,name=creation_height,json=creationHeight,proto3" json:"creation_height,omitempty" yaml:"creation_height"` + CreationHeight int64 `protobuf:"varint,1,opt,name=creation_height,json=creationHeight,proto3" json:"creation_height,omitempty"` // completion_time defines the unix time for redelegation completion. - CompletionTime time.Time `protobuf:"bytes,2,opt,name=completion_time,json=completionTime,proto3,stdtime" json:"completion_time" yaml:"completion_time"` + CompletionTime time.Time `protobuf:"bytes,2,opt,name=completion_time,json=completionTime,proto3,stdtime" json:"completion_time"` // initial_balance defines the initial balance when redelegation started. - InitialBalance github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=initial_balance,json=initialBalance,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"initial_balance" yaml:"initial_balance"` + InitialBalance github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=initial_balance,json=initialBalance,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"initial_balance"` // shares_dst is the amount of destination-validator shares created by redelegation. SharesDst github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,4,opt,name=shares_dst,json=sharesDst,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"shares_dst"` } @@ -791,11 +791,11 @@ func (m *RedelegationEntry) GetCompletionTime() time.Time { // from a particular source validator to a particular destination validator. type Redelegation struct { // delegator_address is the bech32-encoded address of the delegator. - DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty" yaml:"delegator_address"` + DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` // validator_src_address is the validator redelegation source operator address. - ValidatorSrcAddress string `protobuf:"bytes,2,opt,name=validator_src_address,json=validatorSrcAddress,proto3" json:"validator_src_address,omitempty" yaml:"validator_src_address"` + ValidatorSrcAddress string `protobuf:"bytes,2,opt,name=validator_src_address,json=validatorSrcAddress,proto3" json:"validator_src_address,omitempty"` // validator_dst_address is the validator redelegation destination operator address. - ValidatorDstAddress string `protobuf:"bytes,3,opt,name=validator_dst_address,json=validatorDstAddress,proto3" json:"validator_dst_address,omitempty" yaml:"validator_dst_address"` + ValidatorDstAddress string `protobuf:"bytes,3,opt,name=validator_dst_address,json=validatorDstAddress,proto3" json:"validator_dst_address,omitempty"` // entries are the redelegation entries. Entries []RedelegationEntry `protobuf:"bytes,4,rep,name=entries,proto3" json:"entries"` } @@ -835,15 +835,15 @@ var xxx_messageInfo_Redelegation proto.InternalMessageInfo // Params defines the parameters for the staking module. type Params struct { // unbonding_time is the time duration of unbonding. - UnbondingTime time.Duration `protobuf:"bytes,1,opt,name=unbonding_time,json=unbondingTime,proto3,stdduration" json:"unbonding_time" yaml:"unbonding_time"` + UnbondingTime time.Duration `protobuf:"bytes,1,opt,name=unbonding_time,json=unbondingTime,proto3,stdduration" json:"unbonding_time"` // max_validators is the maximum number of validators. - MaxValidators uint32 `protobuf:"varint,2,opt,name=max_validators,json=maxValidators,proto3" json:"max_validators,omitempty" yaml:"max_validators"` + MaxValidators uint32 `protobuf:"varint,2,opt,name=max_validators,json=maxValidators,proto3" json:"max_validators,omitempty"` // max_entries is the max entries for either unbonding delegation or redelegation (per pair/trio). - MaxEntries uint32 `protobuf:"varint,3,opt,name=max_entries,json=maxEntries,proto3" json:"max_entries,omitempty" yaml:"max_entries"` + MaxEntries uint32 `protobuf:"varint,3,opt,name=max_entries,json=maxEntries,proto3" json:"max_entries,omitempty"` // historical_entries is the number of historical entries to persist. - HistoricalEntries uint32 `protobuf:"varint,4,opt,name=historical_entries,json=historicalEntries,proto3" json:"historical_entries,omitempty" yaml:"historical_entries"` + HistoricalEntries uint32 `protobuf:"varint,4,opt,name=historical_entries,json=historicalEntries,proto3" json:"historical_entries,omitempty"` // bond_denom defines the bondable coin denomination. - BondDenom string `protobuf:"bytes,5,opt,name=bond_denom,json=bondDenom,proto3" json:"bond_denom,omitempty" yaml:"bond_denom"` + BondDenom string `protobuf:"bytes,5,opt,name=bond_denom,json=bondDenom,proto3" json:"bond_denom,omitempty"` } func (m *Params) Reset() { *m = Params{} } @@ -1073,7 +1073,7 @@ func (m *RedelegationResponse) GetEntries() []RedelegationEntryResponse { // denomination. type Pool struct { NotBondedTokens github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=not_bonded_tokens,json=notBondedTokens,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"not_bonded_tokens"` - BondedTokens github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=bonded_tokens,json=bondedTokens,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"bonded_tokens" yaml:"bonded_tokens"` + BondedTokens github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=bonded_tokens,json=bondedTokens,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"bonded_tokens"` } func (m *Pool) Reset() { *m = Pool{} } @@ -1138,123 +1138,110 @@ func init() { } var fileDescriptor_64c30c6cf92913c9 = []byte{ - // 1850 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0x4d, 0x6c, 0x1b, 0xc7, - 0x15, 0xe6, 0x8a, 0x0a, 0x45, 0x3e, 0x4a, 0xa2, 0x34, 0x96, 0x1d, 0x8a, 0x4d, 0xb9, 0xcc, 0x36, - 0x48, 0xd5, 0x22, 0xa1, 0x6a, 0x25, 0x48, 0x5b, 0xa1, 0x40, 0x6b, 0x8a, 0x72, 0x2d, 0xa4, 0x70, - 0x98, 0xa5, 0xac, 0x02, 0x49, 0x11, 0x62, 0xb8, 0x3b, 0xa2, 0x36, 0xe2, 0xee, 0x12, 0x3b, 0x43, - 0x57, 0x3c, 0xf4, 0x07, 0x3d, 0xa5, 0x3a, 0xe5, 0x98, 0x43, 0x0d, 0x18, 0x08, 0x50, 0xa0, 0xe8, - 0xb5, 0xc8, 0xa5, 0x87, 0x5e, 0xd3, 0x9e, 0xdc, 0x9e, 0x9a, 0x22, 0x60, 0x0b, 0xfb, 0x52, 0xf4, - 0x14, 0xf0, 0xd0, 0x73, 0x31, 0x3f, 0xfb, 0xa3, 0xa5, 0x68, 0x5b, 0x49, 0x9a, 0x43, 0xe0, 0x8b, - 0xb4, 0x33, 0xf3, 0xbd, 0xf7, 0xe6, 0xfd, 0xcf, 0x0c, 0xe1, 0x39, 0xcb, 0xa7, 0xae, 0x4f, 0x37, - 0x29, 0xc3, 0xc7, 0x8e, 0xd7, 0xdb, 0xbc, 0x7d, 0xb5, 0x4b, 0x18, 0xbe, 0x1a, 0x8e, 0xeb, 0x83, - 0xc0, 0x67, 0x3e, 0xba, 0x22, 0x51, 0xf5, 0x70, 0x56, 0xa1, 0x2a, 0x6b, 0x3d, 0xbf, 0xe7, 0x0b, - 0xc8, 0x26, 0xff, 0x92, 0xe8, 0xca, 0x7a, 0xcf, 0xf7, 0x7b, 0x7d, 0xb2, 0x29, 0x46, 0xdd, 0xe1, - 0xe1, 0x26, 0xf6, 0x46, 0x6a, 0xa9, 0x9a, 0x5e, 0xb2, 0x87, 0x01, 0x66, 0x8e, 0xef, 0xa9, 0x75, - 0x3d, 0xbd, 0xce, 0x1c, 0x97, 0x50, 0x86, 0xdd, 0x41, 0xc8, 0x5b, 0xee, 0xa4, 0x23, 0x85, 0xaa, - 0x6d, 0x29, 0xde, 0x4a, 0x95, 0x2e, 0xa6, 0x24, 0xd2, 0xc3, 0xf2, 0x9d, 0x90, 0xf7, 0x33, 0x8c, - 0x78, 0x36, 0x09, 0x5c, 0xc7, 0x63, 0x9b, 0x6c, 0x34, 0x20, 0x54, 0xfe, 0x95, 0xab, 0xc6, 0xaf, - 0x35, 0x58, 0xbe, 0xe1, 0x50, 0xe6, 0x07, 0x8e, 0x85, 0xfb, 0x7b, 0xde, 0xa1, 0x8f, 0x5e, 0x81, - 0xdc, 0x11, 0xc1, 0x36, 0x09, 0xca, 0x5a, 0x4d, 0xdb, 0x28, 0x6e, 0x95, 0xeb, 0x31, 0x87, 0xba, - 0xa4, 0xbd, 0x21, 0xd6, 0x1b, 0xf3, 0x1f, 0x8e, 0xf5, 0x8c, 0xa9, 0xd0, 0xe8, 0xfb, 0x90, 0xbb, - 0x8d, 0xfb, 0x94, 0xb0, 0xf2, 0x5c, 0x2d, 0xbb, 0x51, 0xdc, 0x7a, 0xb6, 0x7e, 0xbe, 0xf9, 0xea, - 0x07, 0xb8, 0xef, 0xd8, 0x98, 0xf9, 0x11, 0x03, 0x49, 0x66, 0x7c, 0x34, 0x07, 0xa5, 0x1d, 0xdf, - 0x75, 0x1d, 0x4a, 0x1d, 0xdf, 0x33, 0x31, 0x23, 0x14, 0xb5, 0x60, 0x3e, 0xc0, 0x8c, 0x88, 0xad, - 0x14, 0x1a, 0xdf, 0xe3, 0xf8, 0x7f, 0x8c, 0xf5, 0xe7, 0x7b, 0x0e, 0x3b, 0x1a, 0x76, 0xeb, 0x96, - 0xef, 0x2a, 0x63, 0xa8, 0x7f, 0x2f, 0x52, 0xfb, 0x58, 0xe9, 0xd7, 0x24, 0xd6, 0xdf, 0xfe, 0xf0, - 0x22, 0xa8, 0x3d, 0x34, 0x89, 0x65, 0x0a, 0x4e, 0xe8, 0x6d, 0xc8, 0xbb, 0xf8, 0xa4, 0x23, 0xb8, - 0xce, 0x09, 0xae, 0xaf, 0x5d, 0x8c, 0xeb, 0x64, 0xac, 0x97, 0x46, 0xd8, 0xed, 0x6f, 0x1b, 0x21, - 0x1f, 0x23, 0x25, 0x68, 0xc1, 0xc5, 0x27, 0x7c, 0xfb, 0xe8, 0xe7, 0x50, 0xe2, 0x18, 0xeb, 0x08, - 0x7b, 0x3d, 0x22, 0x45, 0x66, 0x85, 0xc8, 0x83, 0x0b, 0x8b, 0xbc, 0x12, 0x8b, 0x4c, 0xb0, 0x4b, - 0x4b, 0x5e, 0x72, 0xf1, 0xc9, 0x8e, 0x58, 0xe6, 0xf2, 0xb7, 0xf3, 0xef, 0xdd, 0xd5, 0x33, 0xff, - 0xbe, 0xab, 0x6b, 0xc6, 0x5f, 0x35, 0x80, 0xd8, 0xb6, 0xe8, 0x27, 0xb0, 0x62, 0x45, 0x23, 0xc1, - 0x89, 0x2a, 0x6f, 0x7f, 0x7d, 0x96, 0xd7, 0x52, 0x9e, 0x69, 0xe4, 0xb9, 0x0a, 0xf7, 0xc6, 0xba, - 0x66, 0x96, 0xac, 0x94, 0xd3, 0xde, 0x84, 0xe2, 0x70, 0x60, 0x63, 0x46, 0x3a, 0x3c, 0x8e, 0x85, - 0x95, 0x8b, 0x5b, 0x95, 0xba, 0x0c, 0xf2, 0x7a, 0x18, 0xe4, 0xf5, 0xfd, 0x30, 0xc8, 0x1b, 0x55, - 0xce, 0x6b, 0x32, 0xd6, 0x91, 0x54, 0x32, 0x41, 0x6c, 0xbc, 0xfb, 0x4f, 0x5d, 0x33, 0x41, 0xce, - 0x70, 0x82, 0x84, 0x4e, 0x7f, 0xd6, 0xa0, 0xd8, 0x24, 0xd4, 0x0a, 0x9c, 0x01, 0xcf, 0x25, 0x54, - 0x86, 0x05, 0xd7, 0xf7, 0x9c, 0x63, 0x15, 0xb9, 0x05, 0x33, 0x1c, 0xa2, 0x0a, 0xe4, 0x1d, 0x9b, - 0x78, 0xcc, 0x61, 0x23, 0xe9, 0x73, 0x33, 0x1a, 0x73, 0xaa, 0x9f, 0x92, 0x2e, 0x75, 0x42, 0xdf, - 0x98, 0xe1, 0x10, 0x5d, 0x87, 0x15, 0x4a, 0xac, 0x61, 0xe0, 0xb0, 0x51, 0xc7, 0xf2, 0x3d, 0x86, - 0x2d, 0x56, 0x9e, 0x17, 0xee, 0xfb, 0xca, 0x64, 0xac, 0x3f, 0x2d, 0xf7, 0x9a, 0x46, 0x18, 0x66, - 0x29, 0x9c, 0xda, 0x91, 0x33, 0x5c, 0x82, 0x4d, 0x18, 0x76, 0xfa, 0xb4, 0xfc, 0x94, 0x94, 0xa0, - 0x86, 0x09, 0x5d, 0x3e, 0x59, 0x80, 0x42, 0x94, 0x17, 0xe8, 0x2d, 0x58, 0xf1, 0x07, 0x24, 0xe0, - 0xdf, 0x1d, 0x6c, 0xdb, 0x01, 0xa1, 0x54, 0x65, 0xc0, 0x4b, 0xb1, 0xe4, 0x34, 0x82, 0xc7, 0xc2, - 0x9a, 0x72, 0xde, 0x35, 0x39, 0xd5, 0x66, 0x81, 0xe3, 0xf5, 0xcc, 0x52, 0x08, 0x55, 0xd3, 0x88, - 0x71, 0xf7, 0x7b, 0x94, 0x78, 0x74, 0x48, 0x3b, 0x83, 0x61, 0xf7, 0x98, 0x8c, 0x94, 0x97, 0xd6, - 0xa6, 0xbc, 0x74, 0xcd, 0x1b, 0x25, 0xa5, 0xa6, 0xe9, 0x8c, 0xbf, 0xc4, 0x52, 0xad, 0x60, 0x34, - 0x60, 0x7e, 0xbd, 0x35, 0xec, 0xbe, 0x4a, 0x46, 0x3c, 0x2c, 0x14, 0xb4, 0x25, 0x90, 0xe8, 0x0a, - 0xe4, 0xde, 0xc6, 0x4e, 0x9f, 0xd8, 0xc2, 0xd0, 0x79, 0x53, 0x8d, 0xd0, 0x36, 0xe4, 0x28, 0xc3, - 0x6c, 0x48, 0x85, 0x75, 0x97, 0xb7, 0x8c, 0x59, 0x21, 0xd8, 0xf0, 0x3d, 0xbb, 0x2d, 0x90, 0xa6, - 0xa2, 0x40, 0xfb, 0x90, 0x63, 0xfe, 0x31, 0xf1, 0x94, 0x69, 0x2f, 0x54, 0x21, 0xf6, 0x3c, 0x96, - 0x48, 0x9f, 0x3d, 0x8f, 0x99, 0x8a, 0x17, 0xfa, 0x95, 0x06, 0x2b, 0x36, 0xe9, 0x93, 0x9e, 0xb0, - 0x2f, 0x3d, 0xc2, 0x01, 0xa1, 0xe5, 0x9c, 0x10, 0xf0, 0xe3, 0x0b, 0x67, 0xae, 0x32, 0x5c, 0x9a, - 0x5f, 0x3a, 0x75, 0x4b, 0x11, 0xa0, 0x2d, 0xd6, 0xd1, 0xab, 0x50, 0xb4, 0xe3, 0xe8, 0x2e, 0x2f, - 0x08, 0xff, 0x7c, 0x6d, 0x96, 0x6d, 0x12, 0x89, 0xa0, 0xca, 0x6a, 0x92, 0x9a, 0xc7, 0xf2, 0xd0, - 0xeb, 0xfa, 0x9e, 0xed, 0x78, 0xbd, 0xce, 0x11, 0x71, 0x7a, 0x47, 0xac, 0x9c, 0xaf, 0x69, 0x1b, - 0xd9, 0x64, 0x2c, 0xa7, 0x11, 0x86, 0x59, 0x8a, 0xa6, 0x6e, 0x88, 0x19, 0x64, 0xc3, 0x72, 0x8c, - 0x12, 0xd9, 0x5d, 0x78, 0x64, 0x76, 0x3f, 0xab, 0xb2, 0xfb, 0x72, 0x5a, 0x4a, 0x9c, 0xe0, 0x4b, - 0xd1, 0x24, 0x27, 0x43, 0x37, 0x00, 0xe2, 0x9a, 0x52, 0x06, 0x21, 0xc1, 0x78, 0x74, 0x61, 0x52, - 0x8a, 0x27, 0x68, 0xd1, 0xa9, 0x06, 0x97, 0x5c, 0xc7, 0xeb, 0x50, 0xd2, 0x3f, 0xec, 0x28, 0x0b, - 0x73, 0x9e, 0x45, 0xe1, 0xcc, 0x37, 0x2e, 0x16, 0x2d, 0x93, 0xb1, 0x5e, 0x51, 0x65, 0x78, 0x9a, - 0xa5, 0x91, 0x8a, 0xa5, 0x55, 0xd7, 0xf1, 0xda, 0xa4, 0x7f, 0xd8, 0x8c, 0x10, 0xdb, 0x8b, 0xef, - 0xdc, 0xd5, 0x33, 0x2a, 0xe5, 0x33, 0x46, 0x0b, 0x16, 0x0f, 0x70, 0x5f, 0xa5, 0x24, 0xa1, 0xe8, - 0x15, 0x28, 0xe0, 0x70, 0x50, 0xd6, 0x6a, 0xd9, 0x8d, 0x42, 0xa3, 0x3c, 0x33, 0xa5, 0x63, 0xa8, - 0x2c, 0x22, 0xbf, 0xfc, 0xb8, 0xa6, 0x19, 0x1f, 0x6b, 0x90, 0x6b, 0x1e, 0xb4, 0xb0, 0x13, 0x20, - 0x0c, 0xab, 0x71, 0xc0, 0x9d, 0x2d, 0x21, 0x2f, 0x4f, 0xc6, 0x7a, 0x39, 0x1d, 0x93, 0x8f, 0xac, - 0x21, 0x71, 0x3e, 0x84, 0x45, 0x04, 0xc3, 0xea, 0xed, 0xb0, 0x62, 0x45, 0x22, 0xe6, 0xd2, 0x22, - 0xa6, 0x20, 0x0f, 0x11, 0x11, 0x61, 0xd5, 0x7c, 0xca, 0x60, 0xbb, 0xb0, 0x20, 0xb5, 0xa3, 0x68, - 0x1b, 0x9e, 0x1a, 0xf0, 0x0f, 0x61, 0xa7, 0xe2, 0x56, 0x75, 0x66, 0x56, 0x08, 0xbc, 0x8a, 0x0b, - 0x49, 0xc2, 0x8f, 0x19, 0xd0, 0x3c, 0x38, 0xd8, 0x0f, 0x9c, 0x41, 0x9f, 0xb0, 0x2f, 0xc2, 0x52, - 0x7d, 0xb8, 0x1c, 0x9b, 0x81, 0x06, 0x56, 0xca, 0x5a, 0xdf, 0x99, 0x8c, 0xf5, 0x67, 0xd2, 0xd6, - 0x4a, 0xc0, 0x66, 0x8b, 0xba, 0x14, 0xe1, 0xdb, 0x81, 0x75, 0xae, 0x34, 0x9b, 0xb2, 0x48, 0x5a, - 0x76, 0xb6, 0xb4, 0x04, 0xec, 0x71, 0xa4, 0x35, 0x29, 0x3b, 0xdf, 0x45, 0x6d, 0x28, 0xc6, 0xa6, - 0xa5, 0xa8, 0x09, 0x79, 0xa6, 0xbe, 0x95, 0xa7, 0x8c, 0xd9, 0x9e, 0x0a, 0xc9, 0x94, 0xb7, 0x22, - 0x4a, 0xe3, 0x03, 0xee, 0xb0, 0x28, 0x8b, 0xbe, 0x1c, 0xa1, 0xcd, 0x1b, 0x97, 0xea, 0x2b, 0xd9, - 0xcf, 0xe1, 0x68, 0xab, 0x78, 0xa5, 0xbc, 0xf1, 0xc7, 0x39, 0xb8, 0x74, 0x2b, 0x2c, 0xac, 0x5f, - 0x3a, 0x0b, 0xb6, 0x60, 0x81, 0x78, 0x2c, 0x70, 0x84, 0x09, 0x79, 0x6c, 0x7d, 0x6b, 0x56, 0x6c, - 0x9d, 0x63, 0x83, 0x5d, 0x8f, 0x05, 0x23, 0x15, 0x69, 0x21, 0x9b, 0x94, 0xf5, 0x7e, 0x9f, 0x85, - 0xf2, 0x2c, 0x4a, 0xb4, 0x03, 0x25, 0x2b, 0x20, 0x62, 0x22, 0x6c, 0xa7, 0x9a, 0x68, 0xa7, 0x95, - 0xf8, 0xac, 0x9e, 0x02, 0x18, 0xe6, 0x72, 0x38, 0xa3, 0x9a, 0x69, 0x0f, 0xf8, 0xd1, 0x99, 0x07, - 0x39, 0x47, 0x3d, 0xe6, 0x59, 0xd9, 0x50, 0xdd, 0x34, 0x14, 0x72, 0x96, 0x81, 0x6c, 0xa7, 0xcb, - 0xf1, 0xac, 0xe8, 0xa7, 0xbf, 0x80, 0x92, 0xe3, 0x39, 0xcc, 0xc1, 0xfd, 0x4e, 0x17, 0xf7, 0xb1, - 0x67, 0x7d, 0x9a, 0x7b, 0x88, 0x6c, 0x80, 0x4a, 0x6c, 0x8a, 0x5d, 0xba, 0xf9, 0x2d, 0xab, 0xf5, - 0x86, 0x5c, 0x46, 0x07, 0xb0, 0x10, 0x0a, 0x9e, 0xff, 0x1c, 0xce, 0x69, 0x21, 0xb3, 0xc4, 0x01, - 0xfa, 0x77, 0x59, 0x58, 0x35, 0x89, 0xfd, 0xc4, 0x4d, 0x9f, 0xc5, 0x4d, 0x6f, 0x02, 0xc8, 0x42, - 0xc2, 0x1b, 0xc2, 0xa7, 0xf0, 0xd4, 0x74, 0x61, 0x2a, 0x48, 0x7e, 0x4d, 0xca, 0x12, 0xbe, 0xfa, - 0x6d, 0x16, 0x16, 0x93, 0xbe, 0x7a, 0xd2, 0x83, 0x3f, 0x53, 0x0f, 0x46, 0x7b, 0x71, 0x25, 0x9c, - 0x17, 0x95, 0xf0, 0x1b, 0xb3, 0x2a, 0xe1, 0x54, 0x86, 0x3c, 0xbc, 0x04, 0xfe, 0x77, 0x0e, 0x72, - 0x2d, 0x1c, 0x60, 0x97, 0x22, 0x6b, 0xea, 0xe0, 0x2f, 0xdf, 0x0b, 0xd6, 0xa7, 0x72, 0xa0, 0xa9, - 0xde, 0xb6, 0x1e, 0x71, 0xee, 0x7f, 0xef, 0x9c, 0x73, 0xff, 0x0f, 0x60, 0xd9, 0xc5, 0x27, 0x9d, - 0x48, 0x47, 0xe9, 0x9d, 0xa5, 0xc6, 0x7a, 0xcc, 0xe5, 0xec, 0xba, 0x21, 0x5e, 0x3c, 0xa2, 0x8b, - 0x33, 0x45, 0xdf, 0x86, 0x22, 0x47, 0xc4, 0x8d, 0x81, 0x93, 0x5f, 0x89, 0x9f, 0x16, 0x12, 0x8b, - 0x86, 0x09, 0x2e, 0x3e, 0xd9, 0x95, 0x03, 0xf4, 0x23, 0x40, 0x47, 0xd1, 0x3b, 0x58, 0x27, 0x36, - 0x27, 0xa7, 0xff, 0xea, 0x64, 0xac, 0xaf, 0x4b, 0xfa, 0x69, 0x8c, 0x61, 0xae, 0xc6, 0x93, 0x21, - 0xb7, 0x97, 0x01, 0xb8, 0x5e, 0x1d, 0x9b, 0x78, 0xbe, 0xab, 0xae, 0xa6, 0x97, 0x27, 0x63, 0x7d, - 0x55, 0x72, 0x89, 0xd7, 0x0c, 0xb3, 0xc0, 0x07, 0x4d, 0xfe, 0x9d, 0xc8, 0x90, 0xf7, 0x35, 0x40, - 0x71, 0xcb, 0x31, 0x09, 0x1d, 0xf0, 0xbb, 0x34, 0xbf, 0x17, 0x25, 0xee, 0x30, 0xda, 0xc3, 0xef, - 0x45, 0x31, 0x7d, 0x78, 0x2f, 0x4a, 0x64, 0xdc, 0x77, 0xe3, 0x82, 0x3c, 0xa7, 0xfc, 0xa8, 0xd8, - 0x74, 0x31, 0x25, 0x89, 0xbb, 0x95, 0x13, 0x52, 0x4f, 0xd5, 0xdc, 0x8c, 0xf1, 0x91, 0x06, 0xeb, - 0x53, 0x11, 0x15, 0x6d, 0xf6, 0x2d, 0x40, 0x41, 0x62, 0x51, 0xd8, 0x6b, 0xa4, 0x36, 0x7d, 0xe1, - 0x00, 0x5d, 0x0d, 0xa6, 0x6a, 0xfb, 0xff, 0xab, 0xa7, 0xcc, 0x0b, 0x0f, 0xfc, 0x49, 0x83, 0xb5, - 0xe4, 0x66, 0x22, 0xb5, 0x6e, 0xc2, 0x62, 0x72, 0x2f, 0x4a, 0xa1, 0xe7, 0x1e, 0x47, 0x21, 0xa5, - 0xcb, 0x19, 0x7a, 0xf4, 0x7a, 0x9c, 0xbc, 0xf2, 0xdd, 0xf4, 0xea, 0x63, 0xdb, 0x26, 0xdc, 0x53, - 0x3a, 0x89, 0xe7, 0x85, 0x77, 0x7e, 0x33, 0x07, 0xf3, 0x2d, 0xdf, 0xef, 0xa3, 0x9f, 0xc1, 0xaa, - 0xe7, 0xb3, 0x0e, 0x8f, 0x33, 0x62, 0x77, 0xd4, 0x73, 0x89, 0xac, 0xae, 0xaf, 0x5f, 0xcc, 0x64, - 0xff, 0x19, 0xeb, 0xd3, 0xac, 0x52, 0x76, 0x2c, 0x79, 0x3e, 0x6b, 0x88, 0xf5, 0x7d, 0xf9, 0x98, - 0x72, 0xaa, 0xc1, 0xd2, 0x59, 0xd9, 0xb2, 0xe4, 0x92, 0x0b, 0xcb, 0x3e, 0xcb, 0x66, 0x32, 0xd6, - 0xd7, 0xe2, 0x74, 0x8a, 0xa6, 0xd3, 0x3d, 0x6e, 0xb1, 0x9b, 0xd8, 0xcc, 0x76, 0x9e, 0x3b, 0xf7, - 0x93, 0xbb, 0xba, 0xf6, 0xcd, 0x0f, 0x34, 0x80, 0xf8, 0x41, 0x09, 0xbd, 0x00, 0x4f, 0x37, 0x5e, - 0xbb, 0xd9, 0xec, 0xb4, 0xf7, 0xaf, 0xed, 0xdf, 0x6a, 0x77, 0x6e, 0xdd, 0x6c, 0xb7, 0x76, 0x77, - 0xf6, 0xae, 0xef, 0xed, 0x36, 0x57, 0x32, 0x95, 0xd2, 0xe9, 0x9d, 0x5a, 0xf1, 0x96, 0x47, 0x07, - 0xc4, 0x72, 0x0e, 0x1d, 0x62, 0xa3, 0xe7, 0x61, 0xed, 0x2c, 0x9a, 0x8f, 0x76, 0x9b, 0x2b, 0x5a, - 0x65, 0xf1, 0xf4, 0x4e, 0x2d, 0x2f, 0x8f, 0x8d, 0xc4, 0x46, 0x1b, 0x70, 0x79, 0x1a, 0xb7, 0x77, - 0xf3, 0x87, 0x2b, 0x73, 0x95, 0xa5, 0xd3, 0x3b, 0xb5, 0x42, 0x74, 0xbe, 0x44, 0x06, 0xa0, 0x24, - 0x52, 0xf1, 0xcb, 0x56, 0xe0, 0xf4, 0x4e, 0x2d, 0x27, 0xed, 0x59, 0x99, 0x7f, 0xe7, 0xfd, 0x6a, - 0xa6, 0x71, 0xfd, 0xc3, 0xfb, 0x55, 0xed, 0xde, 0xfd, 0xaa, 0xf6, 0xaf, 0xfb, 0x55, 0xed, 0xdd, - 0x07, 0xd5, 0xcc, 0xbd, 0x07, 0xd5, 0xcc, 0xdf, 0x1f, 0x54, 0x33, 0x6f, 0xbc, 0xf0, 0x50, 0x4b, - 0x9e, 0x44, 0xbf, 0x76, 0x08, 0x9b, 0x76, 0x73, 0xa2, 0x62, 0xbf, 0xf4, 0xbf, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x85, 0xf4, 0x54, 0x2e, 0x0c, 0x19, 0x00, 0x00, + // 1636 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0x4f, 0x6c, 0x63, 0x47, + 0x19, 0xf7, 0x73, 0x5c, 0xc7, 0xfe, 0x9c, 0xc4, 0xc9, 0x6c, 0x5a, 0xbc, 0x16, 0xd8, 0xc6, 0x94, + 0x76, 0x8b, 0xba, 0x0e, 0x1b, 0xa4, 0x4a, 0x44, 0x48, 0x68, 0x1d, 0xbb, 0x6c, 0x58, 0xba, 0xb8, + 0x76, 0x36, 0x88, 0x3f, 0xe2, 0x69, 0xfc, 0xde, 0xc4, 0x19, 0xe2, 0x37, 0xcf, 0x7a, 0x33, 0x5e, + 0xe2, 0x03, 0x12, 0x12, 0x97, 0x92, 0x53, 0x8f, 0xbd, 0x44, 0x8a, 0x54, 0x8e, 0x3d, 0x56, 0x5c, + 0x38, 0x70, 0x2d, 0x3d, 0xad, 0x7a, 0xa2, 0x80, 0x02, 0xda, 0xbd, 0x20, 0x4e, 0x1c, 0xb8, 0x82, + 0xd0, 0xfc, 0x79, 0x7f, 0xd6, 0x8e, 0xd3, 0xa4, 0x4a, 0xa5, 0x4a, 0xbd, 0xec, 0xbe, 0x99, 0xf9, + 0xbe, 0xdf, 0x7c, 0xdf, 0xef, 0xfb, 0x93, 0x6f, 0x0c, 0x2f, 0x3a, 0x3e, 0xf7, 0x7c, 0xbe, 0xc1, + 0x05, 0x3e, 0xa4, 0x6c, 0xb0, 0xf1, 0xe8, 0x4e, 0x9f, 0x08, 0x7c, 0x27, 0x5c, 0x37, 0x46, 0x81, + 0x2f, 0x7c, 0xf4, 0x82, 0x96, 0x6a, 0x84, 0xbb, 0x46, 0xaa, 0xbc, 0x3e, 0xf0, 0x07, 0xbe, 0x12, + 0xd9, 0x90, 0x5f, 0x5a, 0xba, 0x7c, 0x73, 0xe0, 0xfb, 0x83, 0x21, 0xd9, 0x50, 0xab, 0xfe, 0x78, + 0x7f, 0x03, 0xb3, 0x89, 0x39, 0xaa, 0x4c, 0x1f, 0xb9, 0xe3, 0x00, 0x0b, 0xea, 0x33, 0x73, 0x5e, + 0x9d, 0x3e, 0x17, 0xd4, 0x23, 0x5c, 0x60, 0x6f, 0x14, 0x62, 0x6b, 0x4b, 0x6c, 0x7d, 0xa9, 0x31, + 0xcb, 0x60, 0x1b, 0x57, 0xfa, 0x98, 0x93, 0xc8, 0x0f, 0xc7, 0xa7, 0x21, 0xf6, 0x97, 0x05, 0x61, + 0x2e, 0x09, 0x3c, 0xca, 0xc4, 0x86, 0x98, 0x8c, 0x08, 0xd7, 0xff, 0xea, 0xd3, 0xfa, 0x6f, 0x2d, + 0x58, 0xb9, 0x47, 0xb9, 0xf0, 0x03, 0xea, 0xe0, 0xe1, 0x0e, 0xdb, 0xf7, 0xd1, 0x6b, 0x90, 0x3d, + 0x20, 0xd8, 0x25, 0x41, 0xc9, 0xaa, 0x59, 0xb7, 0x0a, 0x9b, 0xa5, 0x46, 0x8c, 0xd0, 0xd0, 0xba, + 0xf7, 0xd4, 0x79, 0x33, 0xf3, 0xc1, 0x59, 0x35, 0xd5, 0x35, 0xd2, 0xe8, 0xbb, 0x90, 0x7d, 0x84, + 0x87, 0x9c, 0x88, 0x52, 0xba, 0xb6, 0x70, 0xab, 0xb0, 0xf9, 0xd5, 0xc6, 0xf9, 0xf4, 0x35, 0xf6, + 0xf0, 0x90, 0xba, 0x58, 0xf8, 0x11, 0x80, 0x56, 0xab, 0xbf, 0x97, 0x86, 0xe2, 0xb6, 0xef, 0x79, + 0x94, 0x73, 0xea, 0xb3, 0x2e, 0x16, 0x84, 0xa3, 0x0e, 0x64, 0x02, 0x2c, 0x88, 0x32, 0x25, 0xdf, + 0xfc, 0x8e, 0x94, 0xff, 0xcb, 0x59, 0xf5, 0xa5, 0x01, 0x15, 0x07, 0xe3, 0x7e, 0xc3, 0xf1, 0x3d, + 0x43, 0x86, 0xf9, 0xef, 0x36, 0x77, 0x0f, 0x8d, 0x7f, 0x2d, 0xe2, 0x7c, 0xf4, 0xfe, 0x6d, 0x30, + 0x36, 0xb4, 0x88, 0xd3, 0x55, 0x48, 0xe8, 0x47, 0x90, 0xf3, 0xf0, 0x91, 0xad, 0x50, 0xd3, 0xd7, + 0x80, 0xba, 0xe8, 0xe1, 0x23, 0x69, 0x2b, 0x72, 0xa1, 0x28, 0x81, 0x9d, 0x03, 0xcc, 0x06, 0x44, + 0xe3, 0x2f, 0x5c, 0x03, 0xfe, 0xb2, 0x87, 0x8f, 0xb6, 0x15, 0xa6, 0xbc, 0x65, 0x2b, 0xf7, 0xce, + 0x69, 0x35, 0xf5, 0xcf, 0xd3, 0xaa, 0x55, 0xff, 0x83, 0x05, 0x10, 0xd3, 0x85, 0x7e, 0x06, 0xab, + 0x4e, 0xb4, 0x52, 0xd7, 0x73, 0x13, 0xc0, 0x97, 0xe7, 0x05, 0x62, 0x8a, 0xec, 0x66, 0x4e, 0x1a, + 0xfa, 0xf8, 0xac, 0x6a, 0x75, 0x8b, 0xce, 0x54, 0x1c, 0xda, 0x50, 0x18, 0x8f, 0x5c, 0x2c, 0x88, + 0x2d, 0x53, 0x53, 0x11, 0x57, 0xd8, 0x2c, 0x37, 0x74, 0xde, 0x36, 0xc2, 0xbc, 0x6d, 0xec, 0x86, + 0x79, 0xab, 0xb1, 0xde, 0xfe, 0x7b, 0xd5, 0xea, 0x82, 0x56, 0x94, 0x47, 0x09, 0xeb, 0xdf, 0xb3, + 0xa0, 0xd0, 0x22, 0xdc, 0x09, 0xe8, 0x48, 0x16, 0x02, 0x2a, 0xc1, 0xa2, 0xe7, 0x33, 0x7a, 0x68, + 0xd2, 0x2e, 0xdf, 0x0d, 0x97, 0xa8, 0x0c, 0x39, 0xea, 0x12, 0x26, 0xa8, 0x98, 0xe8, 0x80, 0x75, + 0xa3, 0xb5, 0xd4, 0xfa, 0x25, 0xe9, 0x73, 0x1a, 0x72, 0xdd, 0x0d, 0x97, 0xe8, 0x15, 0x58, 0xe5, + 0xc4, 0x19, 0x07, 0x54, 0x4c, 0x6c, 0xc7, 0x67, 0x02, 0x3b, 0xa2, 0x94, 0x51, 0x22, 0xc5, 0x70, + 0x7f, 0x5b, 0x6f, 0x4b, 0x10, 0x97, 0x08, 0x4c, 0x87, 0xbc, 0xf4, 0x9c, 0x06, 0x31, 0xcb, 0x84, + 0xb9, 0x7f, 0xca, 0x42, 0x3e, 0xca, 0x5b, 0xb4, 0x0d, 0xab, 0xfe, 0x88, 0x04, 0xf2, 0xdb, 0xc6, + 0xae, 0x1b, 0x10, 0xce, 0x4d, 0x86, 0x96, 0x3e, 0x7a, 0xff, 0xf6, 0xba, 0xa1, 0xfb, 0xae, 0x3e, + 0xe9, 0x89, 0x80, 0xb2, 0x41, 0xb7, 0x18, 0x6a, 0x98, 0x6d, 0xf4, 0x63, 0x19, 0x30, 0xc6, 0x09, + 0xe3, 0x63, 0x6e, 0x8f, 0xc6, 0xfd, 0x43, 0x32, 0x31, 0xbc, 0xae, 0xcf, 0xf0, 0x7a, 0x97, 0x4d, + 0x9a, 0xa5, 0x0f, 0x63, 0x68, 0x27, 0x98, 0x8c, 0x84, 0xdf, 0xe8, 0x8c, 0xfb, 0xf7, 0xc9, 0x44, + 0x46, 0xcb, 0xe0, 0x74, 0x14, 0x0c, 0x7a, 0x01, 0xb2, 0xbf, 0xc0, 0x74, 0x48, 0x5c, 0xc5, 0x4a, + 0xae, 0x6b, 0x56, 0x68, 0x0b, 0xb2, 0x5c, 0x60, 0x31, 0xe6, 0x8a, 0x8a, 0x95, 0xcd, 0xfa, 0xbc, + 0xcc, 0x68, 0xfa, 0xcc, 0xed, 0x29, 0xc9, 0xae, 0xd1, 0x40, 0xbb, 0x90, 0x15, 0xfe, 0x21, 0x61, + 0x86, 0xa4, 0x2b, 0x65, 0xf5, 0x0e, 0x13, 0x89, 0xac, 0xde, 0x61, 0xa2, 0x6b, 0xb0, 0xd0, 0x00, + 0x56, 0x5d, 0x32, 0x24, 0x03, 0x45, 0x25, 0x3f, 0xc0, 0x01, 0xe1, 0xa5, 0xec, 0x35, 0x54, 0x4d, + 0x31, 0x42, 0xed, 0x29, 0x50, 0x74, 0x1f, 0x0a, 0x6e, 0x9c, 0x6e, 0xa5, 0x45, 0x45, 0xf4, 0xd7, + 0xe6, 0xf9, 0x9f, 0xc8, 0x4c, 0xd3, 0xa4, 0x92, 0xda, 0x32, 0xb9, 0xc6, 0xac, 0xef, 0x33, 0x97, + 0xb2, 0x81, 0x7d, 0x40, 0xe8, 0xe0, 0x40, 0x94, 0x72, 0x35, 0xeb, 0xd6, 0x42, 0xb7, 0x18, 0xed, + 0xdf, 0x53, 0xdb, 0xe8, 0x3e, 0xac, 0xc4, 0xa2, 0xaa, 0x76, 0xf2, 0x57, 0xa8, 0x9d, 0xe5, 0x48, + 0x57, 0x9e, 0xa2, 0x7b, 0x00, 0x71, 0x61, 0x96, 0x40, 0x01, 0xd5, 0x3f, 0xb9, 0xba, 0x8d, 0x0b, + 0x09, 0x5d, 0x34, 0x84, 0x1b, 0x1e, 0x65, 0x36, 0x27, 0xc3, 0x7d, 0xdb, 0x50, 0x25, 0x21, 0x0b, + 0xd7, 0x10, 0xda, 0x35, 0x8f, 0xb2, 0x1e, 0x19, 0xee, 0xb7, 0x22, 0xd8, 0xad, 0xa5, 0xb7, 0x4e, + 0xab, 0x29, 0x53, 0x4b, 0xa9, 0x7a, 0x07, 0x96, 0xf6, 0xf0, 0xd0, 0x94, 0x01, 0xe1, 0xe8, 0x35, + 0xc8, 0xe3, 0x70, 0x51, 0xb2, 0x6a, 0x0b, 0x17, 0x96, 0x51, 0x2c, 0xaa, 0xab, 0xf3, 0xd7, 0x7f, + 0xab, 0x59, 0xf5, 0xdf, 0x59, 0x90, 0x6d, 0xed, 0x75, 0x30, 0x0d, 0x50, 0x1b, 0xd6, 0xe2, 0x84, + 0xba, 0x6c, 0x6d, 0xc6, 0x39, 0x18, 0x16, 0x67, 0x1b, 0xd6, 0x1e, 0x85, 0xe5, 0x1e, 0xc1, 0xa4, + 0x3f, 0x09, 0x26, 0x52, 0x31, 0xfb, 0x53, 0x8e, 0xb7, 0x61, 0x51, 0x5b, 0xc9, 0xd1, 0x16, 0x3c, + 0x37, 0x92, 0x1f, 0xca, 0xdf, 0xc2, 0x66, 0x65, 0x6e, 0x22, 0x2a, 0x79, 0x13, 0x40, 0xad, 0x52, + 0xff, 0xaf, 0x05, 0xd0, 0xda, 0xdb, 0xdb, 0x0d, 0xe8, 0x68, 0x48, 0xc4, 0x75, 0x79, 0xfc, 0x03, + 0x78, 0x3e, 0xf6, 0x98, 0x07, 0xce, 0xa5, 0xbd, 0xbe, 0x11, 0xa9, 0xf5, 0x02, 0xe7, 0x5c, 0x34, + 0x97, 0x8b, 0x08, 0x6d, 0xe1, 0xd2, 0x68, 0x2d, 0x2e, 0xce, 0xa7, 0xb1, 0x07, 0x85, 0xd8, 0x7d, + 0x8e, 0x5a, 0x90, 0x13, 0xe6, 0xdb, 0xb0, 0x59, 0x9f, 0xcf, 0x66, 0xa8, 0x66, 0x18, 0x8d, 0x34, + 0xeb, 0xff, 0x93, 0xa4, 0x46, 0x19, 0xfb, 0xf9, 0x4a, 0x23, 0xd9, 0x7b, 0x4d, 0x6f, 0xbc, 0x8e, + 0x89, 0xc2, 0x60, 0x4d, 0xb1, 0xfa, 0x9b, 0x34, 0xdc, 0x78, 0x18, 0x76, 0x9b, 0xcf, 0x2d, 0x13, + 0x1d, 0x58, 0x24, 0x4c, 0x04, 0x54, 0x51, 0x21, 0x63, 0xfd, 0xcd, 0x79, 0xb1, 0x3e, 0xc7, 0x97, + 0x36, 0x13, 0xc1, 0xc4, 0x44, 0x3e, 0x84, 0x99, 0x62, 0xe1, 0xaf, 0x69, 0x28, 0xcd, 0xd3, 0x44, + 0x2f, 0x43, 0xd1, 0x09, 0x88, 0xda, 0x08, 0xbb, 0xbe, 0xa5, 0xba, 0xfe, 0x4a, 0xb8, 0x6d, 0x9a, + 0xfe, 0x1b, 0x20, 0x07, 0x28, 0x99, 0x58, 0x52, 0xf4, 0xca, 0x13, 0xd3, 0x4a, 0xac, 0xac, 0xda, + 0x3e, 0x81, 0x22, 0x65, 0x54, 0x50, 0x3c, 0xb4, 0xfb, 0x78, 0x88, 0x99, 0xf3, 0x69, 0x26, 0xcb, + 0xd9, 0x46, 0xbd, 0x62, 0x40, 0x9b, 0x1a, 0x13, 0xed, 0xc1, 0x62, 0x08, 0x9f, 0xb9, 0x06, 0xf8, + 0x10, 0x2c, 0x31, 0x45, 0x7d, 0x9c, 0x86, 0xb5, 0x2e, 0x71, 0xbf, 0x58, 0xb4, 0xfe, 0x14, 0x40, + 0x17, 0x9c, 0xec, 0x83, 0x9f, 0x82, 0xd9, 0xd9, 0x02, 0xce, 0x6b, 0xbc, 0x16, 0x17, 0x09, 0x6e, + 0x3f, 0x4c, 0xc3, 0x52, 0x92, 0xdb, 0x2f, 0xc0, 0xdf, 0x05, 0xb4, 0x13, 0x77, 0x83, 0x8c, 0xea, + 0x06, 0xaf, 0xcc, 0xeb, 0x06, 0x33, 0x59, 0x77, 0x71, 0x1b, 0xf8, 0x8f, 0x05, 0xd9, 0x0e, 0x0e, + 0xb0, 0xc7, 0xd1, 0xf7, 0x67, 0x06, 0x38, 0xfd, 0xaa, 0xba, 0x39, 0x93, 0x73, 0x2d, 0xf3, 0xa8, + 0xd7, 0x29, 0xf7, 0xce, 0x39, 0xf3, 0xdb, 0xd7, 0x61, 0x45, 0x3e, 0x11, 0x23, 0x57, 0x34, 0x89, + 0xcb, 0xea, 0x8d, 0x17, 0xbd, 0x2e, 0x38, 0xaa, 0x42, 0x41, 0x8a, 0xc5, 0x8d, 0x4e, 0xca, 0x80, + 0x87, 0x8f, 0xda, 0x7a, 0x07, 0xdd, 0x06, 0x74, 0x10, 0x3d, 0xda, 0xed, 0x98, 0x02, 0x29, 0xb7, + 0x16, 0x9f, 0x84, 0xe2, 0x5f, 0x01, 0x90, 0x56, 0xd8, 0x2e, 0x61, 0xbe, 0x67, 0xde, 0x38, 0x79, + 0xb9, 0xd3, 0x92, 0x1b, 0x89, 0x1c, 0x7a, 0xd7, 0x02, 0x14, 0x37, 0xbd, 0x2e, 0xe1, 0x23, 0xf9, + 0xb0, 0x90, 0x63, 0x67, 0x62, 0x46, 0xb4, 0x2e, 0x1e, 0x3b, 0x63, 0xfd, 0x70, 0xec, 0x4c, 0xe4, + 0xe4, 0xb7, 0xe3, 0x16, 0x93, 0x36, 0x2c, 0x1a, 0x98, 0x3e, 0xe6, 0x24, 0x31, 0xba, 0xd2, 0x50, + 0x7b, 0xa6, 0x8b, 0xa4, 0xea, 0x1f, 0x5b, 0x70, 0x73, 0x26, 0x9e, 0x91, 0xb1, 0x3f, 0x07, 0x14, + 0x24, 0x0e, 0x15, 0x3b, 0x13, 0x63, 0xf4, 0x95, 0xd3, 0x63, 0x2d, 0x98, 0xe9, 0x56, 0x9f, 0x55, + 0x97, 0xcc, 0xa8, 0x08, 0xfc, 0xd1, 0x82, 0xf5, 0xa4, 0x31, 0x91, 0x5b, 0x0f, 0x60, 0x29, 0x69, + 0x8b, 0x71, 0xe8, 0xc5, 0xcb, 0x38, 0x64, 0x7c, 0x79, 0x46, 0x1f, 0xbd, 0x19, 0x97, 0x8e, 0xfe, + 0xb9, 0xe6, 0xce, 0xa5, 0xb9, 0x09, 0x6d, 0x9a, 0x2e, 0xa1, 0x4c, 0x38, 0x47, 0x64, 0x3a, 0xbe, + 0x3f, 0x44, 0xbf, 0x82, 0x35, 0xe6, 0x0b, 0x5b, 0xe6, 0x19, 0x71, 0x6d, 0xf3, 0x76, 0xd4, 0xfd, + 0xe7, 0xcd, 0xab, 0x51, 0xf6, 0xaf, 0xb3, 0xea, 0x2c, 0xd4, 0x14, 0x8f, 0x45, 0xe6, 0x8b, 0xa6, + 0x3a, 0xdf, 0xd5, 0x2f, 0xcb, 0x00, 0x96, 0x9f, 0xbd, 0x5a, 0xf7, 0xab, 0x37, 0xae, 0x7c, 0xf5, + 0xf2, 0x45, 0xd7, 0x2e, 0xf5, 0x13, 0x77, 0x6e, 0xe5, 0x64, 0x0c, 0xff, 0x7d, 0x5a, 0xb5, 0xbe, + 0xf1, 0x7b, 0x0b, 0x20, 0x7e, 0x44, 0xa3, 0x57, 0xe1, 0x4b, 0xcd, 0x1f, 0x3e, 0x68, 0xd9, 0xbd, + 0xdd, 0xbb, 0xbb, 0x0f, 0x7b, 0xf6, 0xc3, 0x07, 0xbd, 0x4e, 0x7b, 0x7b, 0xe7, 0xf5, 0x9d, 0x76, + 0x6b, 0x35, 0x55, 0x2e, 0x1e, 0x9f, 0xd4, 0x0a, 0x0f, 0x19, 0x1f, 0x11, 0x87, 0xee, 0x53, 0xe2, + 0xa2, 0x97, 0x60, 0xfd, 0x59, 0x69, 0xb9, 0x6a, 0xb7, 0x56, 0xad, 0xf2, 0xd2, 0xf1, 0x49, 0x2d, + 0xa7, 0xe7, 0x13, 0xe2, 0xa2, 0x5b, 0xf0, 0xfc, 0xac, 0xdc, 0xce, 0x83, 0xef, 0xad, 0xa6, 0xcb, + 0xcb, 0xc7, 0x27, 0xb5, 0x7c, 0x34, 0xc8, 0xa0, 0x3a, 0xa0, 0xa4, 0xa4, 0xc1, 0x5b, 0x28, 0xc3, + 0xf1, 0x49, 0x2d, 0xab, 0x69, 0x2b, 0x67, 0xde, 0x7a, 0xb7, 0x92, 0x6a, 0xbe, 0xfe, 0xc1, 0x93, + 0x8a, 0xf5, 0xf8, 0x49, 0xc5, 0xfa, 0xc7, 0x93, 0x8a, 0xf5, 0xf6, 0xd3, 0x4a, 0xea, 0xf1, 0xd3, + 0x4a, 0xea, 0xcf, 0x4f, 0x2b, 0xa9, 0x9f, 0xbc, 0x7a, 0x21, 0x63, 0x47, 0xd1, 0x6f, 0xa9, 0x8a, + 0xbb, 0x7e, 0x56, 0xb5, 0xc5, 0x6f, 0xfd, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x6e, 0xff, 0x65, 0x73, + 0x6a, 0x15, 0x00, 0x00, } func (this *Pool) Description() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet) { @@ -1263,626 +1250,608 @@ func (this *Pool) Description() (desc *github_com_gogo_protobuf_protoc_gen_gogo_ func StakingDescription() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet) { d := &github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet{} var gzipped = []byte{ - // 9896 bytes of a gzipped FileDescriptorSet - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0xbd, 0x6b, 0x70, 0x24, 0xd7, - 0x75, 0x18, 0x8c, 0x9e, 0x07, 0x30, 0x73, 0x30, 0x00, 0x06, 0x17, 0xd8, 0xe5, 0xec, 0xec, 0x12, - 0x00, 0x9b, 0x14, 0xb9, 0x5c, 0x92, 0x58, 0x72, 0xc9, 0x7d, 0xcd, 0x4a, 0xa2, 0x30, 0xc0, 0x2c, - 0x16, 0x5c, 0xbc, 0xd8, 0x00, 0x96, 0x14, 0x65, 0x7b, 0xaa, 0x31, 0x73, 0x31, 0x68, 0x62, 0xa6, - 0xbb, 0xd5, 0xdd, 0xb3, 0x5c, 0x50, 0x9f, 0xfc, 0x51, 0x92, 0xa3, 0x50, 0x1b, 0x27, 0x91, 0xa3, - 0x94, 0x2d, 0xc9, 0x5a, 0x85, 0xb2, 0x1c, 0xc9, 0x96, 0xec, 0x44, 0xb2, 0x68, 0x25, 0x8e, 0x53, - 0x8e, 0x94, 0x2a, 0xc7, 0x92, 0x7e, 0xa4, 0x24, 0xc7, 0x15, 0x5b, 0x2e, 0x65, 0xe5, 0x50, 0x2a, - 0x5b, 0x51, 0x94, 0x58, 0xd9, 0x28, 0xaf, 0x52, 0xa5, 0x2a, 0x75, 0x5f, 0xfd, 0x9a, 0x47, 0x0f, - 0xb0, 0x58, 0x4a, 0x56, 0xe9, 0x17, 0xe6, 0xde, 0x7b, 0xce, 0xb9, 0xe7, 0x9e, 0x7b, 0x5e, 0xf7, - 0xd5, 0x80, 0xcf, 0x5e, 0x80, 0xa9, 0x9a, 0x61, 0xd4, 0xea, 0xf8, 0xa4, 0x69, 0x19, 0x8e, 0xb1, - 0xd9, 0xdc, 0x3a, 0x59, 0xc5, 0x76, 0xc5, 0xd2, 0x4c, 0xc7, 0xb0, 0xa6, 0x69, 0x1d, 0x1a, 0x61, - 0x10, 0xd3, 0x02, 0x42, 0x5e, 0x82, 0xd1, 0x8b, 0x5a, 0x1d, 0xcf, 0xb9, 0x80, 0x6b, 0xd8, 0x41, - 0xe7, 0x20, 0xb1, 0xa5, 0xd5, 0x71, 0x4e, 0x9a, 0x8a, 0x1f, 0x1f, 0x3c, 0x75, 0xdf, 0x74, 0x08, - 0x69, 0x3a, 0x88, 0xb1, 0x4a, 0xaa, 0x15, 0x8a, 0x21, 0x7f, 0x3b, 0x01, 0x63, 0x6d, 0x5a, 0x11, - 0x82, 0x84, 0xae, 0x36, 0x08, 0x45, 0xe9, 0x78, 0x5a, 0xa1, 0xbf, 0x51, 0x0e, 0x06, 0x4c, 0xb5, - 0xb2, 0xa3, 0xd6, 0x70, 0x2e, 0x46, 0xab, 0x45, 0x11, 0x4d, 0x00, 0x54, 0xb1, 0x89, 0xf5, 0x2a, - 0xd6, 0x2b, 0xbb, 0xb9, 0xf8, 0x54, 0xfc, 0x78, 0x5a, 0xf1, 0xd5, 0xa0, 0x87, 0x60, 0xd4, 0x6c, - 0x6e, 0xd6, 0xb5, 0x4a, 0xd9, 0x07, 0x06, 0x53, 0xf1, 0xe3, 0x49, 0x25, 0xcb, 0x1a, 0xe6, 0x3c, - 0xe0, 0x07, 0x60, 0xe4, 0x05, 0xac, 0xee, 0xf8, 0x41, 0x07, 0x29, 0xe8, 0x30, 0xa9, 0xf6, 0x01, - 0xce, 0x42, 0xa6, 0x81, 0x6d, 0x5b, 0xad, 0xe1, 0xb2, 0xb3, 0x6b, 0xe2, 0x5c, 0x82, 0x8e, 0x7e, - 0xaa, 0x65, 0xf4, 0xe1, 0x91, 0x0f, 0x72, 0xac, 0xf5, 0x5d, 0x13, 0xa3, 0x19, 0x48, 0x63, 0xbd, - 0xd9, 0x60, 0x14, 0x92, 0x1d, 0xe4, 0x57, 0xd2, 0x9b, 0x8d, 0x30, 0x95, 0x14, 0x41, 0xe3, 0x24, - 0x06, 0x6c, 0x6c, 0x5d, 0xd5, 0x2a, 0x38, 0xd7, 0x4f, 0x09, 0x3c, 0xd0, 0x42, 0x60, 0x8d, 0xb5, - 0x87, 0x69, 0x08, 0x3c, 0x34, 0x0b, 0x69, 0x7c, 0xcd, 0xc1, 0xba, 0xad, 0x19, 0x7a, 0x6e, 0x80, - 0x12, 0x79, 0x43, 0x9b, 0x59, 0xc4, 0xf5, 0x6a, 0x98, 0x84, 0x87, 0x87, 0xce, 0xc0, 0x80, 0x61, - 0x3a, 0x9a, 0xa1, 0xdb, 0xb9, 0xd4, 0x94, 0x74, 0x7c, 0xf0, 0xd4, 0xb1, 0xb6, 0x8a, 0xb0, 0xc2, - 0x60, 0x14, 0x01, 0x8c, 0x16, 0x20, 0x6b, 0x1b, 0x4d, 0xab, 0x82, 0xcb, 0x15, 0xa3, 0x8a, 0xcb, - 0x9a, 0xbe, 0x65, 0xe4, 0xd2, 0x94, 0xc0, 0x64, 0xeb, 0x40, 0x28, 0xe0, 0xac, 0x51, 0xc5, 0x0b, - 0xfa, 0x96, 0xa1, 0x0c, 0xdb, 0x81, 0x32, 0x3a, 0x0c, 0xfd, 0xf6, 0xae, 0xee, 0xa8, 0xd7, 0x72, - 0x19, 0xaa, 0x21, 0xbc, 0x24, 0xff, 0x5e, 0x3f, 0x8c, 0xf4, 0xa2, 0x62, 0x17, 0x20, 0xb9, 0x45, - 0x46, 0x99, 0x8b, 0xed, 0x45, 0x06, 0x0c, 0x27, 0x28, 0xc4, 0xfe, 0x7d, 0x0a, 0x71, 0x06, 0x06, - 0x75, 0x6c, 0x3b, 0xb8, 0xca, 0x34, 0x22, 0xde, 0xa3, 0x4e, 0x01, 0x43, 0x6a, 0x55, 0xa9, 0xc4, - 0xbe, 0x54, 0xea, 0x59, 0x18, 0x71, 0x59, 0x2a, 0x5b, 0xaa, 0x5e, 0x13, 0xba, 0x79, 0x32, 0x8a, - 0x93, 0xe9, 0x92, 0xc0, 0x53, 0x08, 0x9a, 0x32, 0x8c, 0x03, 0x65, 0x34, 0x07, 0x60, 0xe8, 0xd8, - 0xd8, 0x2a, 0x57, 0x71, 0xa5, 0x9e, 0x4b, 0x75, 0x90, 0xd2, 0x0a, 0x01, 0x69, 0x91, 0x92, 0xc1, - 0x6a, 0x2b, 0x75, 0x74, 0xde, 0x53, 0xb5, 0x81, 0x0e, 0x9a, 0xb2, 0xc4, 0x8c, 0xac, 0x45, 0xdb, - 0x36, 0x60, 0xd8, 0xc2, 0x44, 0xef, 0x71, 0x95, 0x8f, 0x2c, 0x4d, 0x99, 0x98, 0x8e, 0x1c, 0x99, - 0xc2, 0xd1, 0xd8, 0xc0, 0x86, 0x2c, 0x7f, 0x11, 0xdd, 0x0b, 0x6e, 0x45, 0x99, 0xaa, 0x15, 0x50, - 0x2f, 0x94, 0x11, 0x95, 0xcb, 0x6a, 0x03, 0xe7, 0x5f, 0x84, 0xe1, 0xa0, 0x78, 0xd0, 0x38, 0x24, - 0x6d, 0x47, 0xb5, 0x1c, 0xaa, 0x85, 0x49, 0x85, 0x15, 0x50, 0x16, 0xe2, 0x58, 0xaf, 0x52, 0x2f, - 0x97, 0x54, 0xc8, 0x4f, 0xf4, 0x16, 0x6f, 0xc0, 0x71, 0x3a, 0xe0, 0xfb, 0x5b, 0x67, 0x34, 0x40, - 0x39, 0x3c, 0xee, 0xfc, 0x59, 0x18, 0x0a, 0x0c, 0xa0, 0xd7, 0xae, 0xe5, 0xff, 0x0f, 0x0e, 0xb5, - 0x25, 0x8d, 0x9e, 0x85, 0xf1, 0xa6, 0xae, 0xe9, 0x0e, 0xb6, 0x4c, 0x0b, 0x13, 0x8d, 0x65, 0x5d, - 0xe5, 0xfe, 0x6a, 0xa0, 0x83, 0xce, 0x6d, 0xf8, 0xa1, 0x19, 0x15, 0x65, 0xac, 0xd9, 0x5a, 0x79, - 0x22, 0x9d, 0xfa, 0xce, 0x40, 0xf6, 0xa5, 0x97, 0x5e, 0x7a, 0x29, 0x26, 0x7f, 0xb1, 0x1f, 0xc6, - 0xdb, 0xd9, 0x4c, 0x5b, 0xf3, 0x3d, 0x0c, 0xfd, 0x7a, 0xb3, 0xb1, 0x89, 0x2d, 0x2a, 0xa4, 0xa4, - 0xc2, 0x4b, 0x68, 0x06, 0x92, 0x75, 0x75, 0x13, 0xd7, 0x73, 0x89, 0x29, 0xe9, 0xf8, 0xf0, 0xa9, - 0x87, 0x7a, 0xb2, 0xca, 0xe9, 0x45, 0x82, 0xa2, 0x30, 0x4c, 0xf4, 0x66, 0x48, 0x70, 0x17, 0x4d, - 0x28, 0x9c, 0xe8, 0x8d, 0x02, 0xb1, 0x25, 0x85, 0xe2, 0xa1, 0xa3, 0x90, 0x26, 0x7f, 0x99, 0x6e, - 0xf4, 0x53, 0x9e, 0x53, 0xa4, 0x82, 0xe8, 0x05, 0xca, 0x43, 0x8a, 0x9a, 0x49, 0x15, 0x8b, 0xd0, - 0xe6, 0x96, 0x89, 0x62, 0x55, 0xf1, 0x96, 0xda, 0xac, 0x3b, 0xe5, 0xab, 0x6a, 0xbd, 0x89, 0xa9, - 0xc2, 0xa7, 0x95, 0x0c, 0xaf, 0xbc, 0x42, 0xea, 0xd0, 0x24, 0x0c, 0x32, 0xab, 0xd2, 0xf4, 0x2a, - 0xbe, 0x46, 0xbd, 0x67, 0x52, 0x61, 0x86, 0xb6, 0x40, 0x6a, 0x48, 0xf7, 0xcf, 0xdb, 0x86, 0x2e, - 0x54, 0x93, 0x76, 0x41, 0x2a, 0x68, 0xf7, 0x67, 0xc3, 0x8e, 0xfb, 0xee, 0xf6, 0xc3, 0x6b, 0xb1, - 0xa5, 0x07, 0x60, 0x84, 0x42, 0x3c, 0xce, 0xa7, 0x5e, 0xad, 0xe7, 0x46, 0xa7, 0xa4, 0xe3, 0x29, - 0x65, 0x98, 0x55, 0xaf, 0xf0, 0x5a, 0xf9, 0xf3, 0x31, 0x48, 0x50, 0xc7, 0x32, 0x02, 0x83, 0xeb, - 0x6f, 0x5d, 0x2d, 0x95, 0xe7, 0x56, 0x36, 0x8a, 0x8b, 0xa5, 0xac, 0x84, 0x86, 0x01, 0x68, 0xc5, - 0xc5, 0xc5, 0x95, 0x99, 0xf5, 0x6c, 0xcc, 0x2d, 0x2f, 0x2c, 0xaf, 0x9f, 0x79, 0x22, 0x1b, 0x77, - 0x11, 0x36, 0x58, 0x45, 0xc2, 0x0f, 0xf0, 0xf8, 0xa9, 0x6c, 0x12, 0x65, 0x21, 0xc3, 0x08, 0x2c, - 0x3c, 0x5b, 0x9a, 0x3b, 0xf3, 0x44, 0xb6, 0x3f, 0x58, 0xf3, 0xf8, 0xa9, 0xec, 0x00, 0x1a, 0x82, - 0x34, 0xad, 0x29, 0xae, 0xac, 0x2c, 0x66, 0x53, 0x2e, 0xcd, 0xb5, 0x75, 0x65, 0x61, 0x79, 0x3e, - 0x9b, 0x76, 0x69, 0xce, 0x2b, 0x2b, 0x1b, 0xab, 0x59, 0x70, 0x29, 0x2c, 0x95, 0xd6, 0xd6, 0x66, - 0xe6, 0x4b, 0xd9, 0x41, 0x17, 0xa2, 0xf8, 0xd6, 0xf5, 0xd2, 0x5a, 0x36, 0x13, 0x60, 0xeb, 0xf1, - 0x53, 0xd9, 0x21, 0xb7, 0x8b, 0xd2, 0xf2, 0xc6, 0x52, 0x76, 0x18, 0x8d, 0xc2, 0x10, 0xeb, 0x42, - 0x30, 0x31, 0x12, 0xaa, 0x3a, 0xf3, 0x44, 0x36, 0xeb, 0x31, 0xc2, 0xa8, 0x8c, 0x06, 0x2a, 0xce, - 0x3c, 0x91, 0x45, 0xf2, 0x2c, 0x24, 0xa9, 0x1a, 0x22, 0x04, 0xc3, 0x8b, 0x33, 0xc5, 0xd2, 0x62, - 0x79, 0x65, 0x75, 0x7d, 0x61, 0x65, 0x79, 0x66, 0x31, 0x2b, 0x79, 0x75, 0x4a, 0xe9, 0xe9, 0x8d, - 0x05, 0xa5, 0x34, 0x97, 0x8d, 0xf9, 0xeb, 0x56, 0x4b, 0x33, 0xeb, 0xa5, 0xb9, 0x6c, 0x5c, 0xae, - 0xc0, 0x78, 0x3b, 0x87, 0xda, 0xd6, 0x84, 0x7c, 0xba, 0x10, 0xeb, 0xa0, 0x0b, 0x94, 0x56, 0x58, - 0x17, 0xe4, 0x6f, 0xc5, 0x60, 0xac, 0x4d, 0x50, 0x69, 0xdb, 0xc9, 0x93, 0x90, 0x64, 0xba, 0xcc, - 0xc2, 0xec, 0x83, 0x6d, 0xa3, 0x13, 0xd5, 0xec, 0x96, 0x50, 0x4b, 0xf1, 0xfc, 0xa9, 0x46, 0xbc, - 0x43, 0xaa, 0x41, 0x48, 0xb4, 0x28, 0xec, 0xcf, 0xb6, 0x38, 0x7f, 0x16, 0x1f, 0xcf, 0xf4, 0x12, - 0x1f, 0x69, 0xdd, 0xde, 0x82, 0x40, 0xb2, 0x4d, 0x10, 0xb8, 0x00, 0xa3, 0x2d, 0x84, 0x7a, 0x76, - 0xc6, 0xef, 0x91, 0x20, 0xd7, 0x49, 0x38, 0x11, 0x2e, 0x31, 0x16, 0x70, 0x89, 0x17, 0xc2, 0x12, - 0xbc, 0xa7, 0xf3, 0x24, 0xb4, 0xcc, 0xf5, 0x27, 0x25, 0x38, 0xdc, 0x3e, 0xa5, 0x6c, 0xcb, 0xc3, - 0x9b, 0xa1, 0xbf, 0x81, 0x9d, 0x6d, 0x43, 0xa4, 0x55, 0xf7, 0xb7, 0x09, 0xd6, 0xa4, 0x39, 0x3c, - 0xd9, 0x1c, 0xcb, 0x1f, 0xed, 0xe3, 0x9d, 0xf2, 0x42, 0xc6, 0x4d, 0x0b, 0xa7, 0xef, 0x8b, 0xc1, - 0xa1, 0xb6, 0xc4, 0xdb, 0x32, 0x7a, 0x37, 0x80, 0xa6, 0x9b, 0x4d, 0x87, 0xa5, 0x4e, 0xcc, 0x13, - 0xa7, 0x69, 0x0d, 0x75, 0x5e, 0xc4, 0xcb, 0x36, 0x1d, 0xb7, 0x3d, 0x4e, 0xdb, 0x81, 0x55, 0x51, - 0x80, 0x73, 0x1e, 0xa3, 0x09, 0xca, 0xe8, 0x44, 0x87, 0x91, 0xb6, 0x28, 0xe6, 0xa3, 0x90, 0xad, - 0xd4, 0x35, 0xac, 0x3b, 0x65, 0xdb, 0xb1, 0xb0, 0xda, 0xd0, 0xf4, 0x1a, 0x0d, 0x35, 0xa9, 0x42, - 0x72, 0x4b, 0xad, 0xdb, 0x58, 0x19, 0x61, 0xcd, 0x6b, 0xa2, 0x95, 0x60, 0x50, 0x05, 0xb2, 0x7c, - 0x18, 0xfd, 0x01, 0x0c, 0xd6, 0xec, 0x62, 0xc8, 0xbf, 0x94, 0x86, 0x41, 0x5f, 0x02, 0x8e, 0xee, - 0x81, 0xcc, 0xf3, 0xea, 0x55, 0xb5, 0x2c, 0x16, 0x55, 0x4c, 0x12, 0x83, 0xa4, 0x6e, 0x95, 0x2f, - 0xac, 0x1e, 0x85, 0x71, 0x0a, 0x62, 0x34, 0x1d, 0x6c, 0x95, 0x2b, 0x75, 0xd5, 0xb6, 0xa9, 0xd0, - 0x52, 0x14, 0x14, 0x91, 0xb6, 0x15, 0xd2, 0x34, 0x2b, 0x5a, 0xd0, 0x69, 0x18, 0xa3, 0x18, 0x8d, - 0x66, 0xdd, 0xd1, 0xcc, 0x3a, 0x2e, 0x93, 0x65, 0x9e, 0x4d, 0x43, 0x8e, 0xcb, 0xd9, 0x28, 0x81, - 0x58, 0xe2, 0x00, 0x84, 0x23, 0x1b, 0xcd, 0xc1, 0xdd, 0x14, 0xad, 0x86, 0x75, 0x6c, 0xa9, 0x0e, - 0x2e, 0xe3, 0xb7, 0x37, 0xd5, 0xba, 0x5d, 0x56, 0xf5, 0x6a, 0x79, 0x5b, 0xb5, 0xb7, 0x73, 0xe3, - 0x84, 0x40, 0x31, 0x96, 0x93, 0x94, 0x23, 0x04, 0x70, 0x9e, 0xc3, 0x95, 0x28, 0xd8, 0x8c, 0x5e, - 0xbd, 0xa4, 0xda, 0xdb, 0xa8, 0x00, 0x87, 0x29, 0x15, 0xdb, 0xb1, 0x34, 0xbd, 0x56, 0xae, 0x6c, - 0xe3, 0xca, 0x4e, 0xb9, 0xe9, 0x6c, 0x9d, 0xcb, 0x1d, 0xf5, 0xf7, 0x4f, 0x39, 0x5c, 0xa3, 0x30, - 0xb3, 0x04, 0x64, 0xc3, 0xd9, 0x3a, 0x87, 0xd6, 0x20, 0x43, 0x26, 0xa3, 0xa1, 0xbd, 0x88, 0xcb, - 0x5b, 0x86, 0x45, 0x63, 0xe8, 0x70, 0x1b, 0xd7, 0xe4, 0x93, 0xe0, 0xf4, 0x0a, 0x47, 0x58, 0x32, - 0xaa, 0xb8, 0x90, 0x5c, 0x5b, 0x2d, 0x95, 0xe6, 0x94, 0x41, 0x41, 0xe5, 0xa2, 0x61, 0x11, 0x85, - 0xaa, 0x19, 0xae, 0x80, 0x07, 0x99, 0x42, 0xd5, 0x0c, 0x21, 0xde, 0xd3, 0x30, 0x56, 0xa9, 0xb0, - 0x31, 0x6b, 0x95, 0x32, 0x5f, 0x8c, 0xd9, 0xb9, 0x6c, 0x40, 0x58, 0x95, 0xca, 0x3c, 0x03, 0xe0, - 0x3a, 0x6e, 0xa3, 0xf3, 0x70, 0xc8, 0x13, 0x96, 0x1f, 0x71, 0xb4, 0x65, 0x94, 0x61, 0xd4, 0xd3, - 0x30, 0x66, 0xee, 0xb6, 0x22, 0xa2, 0x40, 0x8f, 0xe6, 0x6e, 0x18, 0xed, 0x2c, 0x8c, 0x9b, 0xdb, - 0x66, 0x2b, 0xde, 0x09, 0x3f, 0x1e, 0x32, 0xb7, 0xcd, 0x30, 0xe2, 0x1b, 0xe8, 0xca, 0xdc, 0xc2, - 0x15, 0xd5, 0xc1, 0xd5, 0xdc, 0x5d, 0x7e, 0x70, 0x5f, 0x03, 0x9a, 0x86, 0x6c, 0xa5, 0x52, 0xc6, - 0xba, 0xba, 0x59, 0xc7, 0x65, 0xd5, 0xc2, 0xba, 0x6a, 0xe7, 0x26, 0x29, 0x70, 0xc2, 0xb1, 0x9a, - 0x58, 0x19, 0xae, 0x54, 0x4a, 0xb4, 0x71, 0x86, 0xb6, 0xa1, 0x13, 0x30, 0x6a, 0x6c, 0x3e, 0x5f, - 0x61, 0x1a, 0x59, 0x36, 0x2d, 0xbc, 0xa5, 0x5d, 0xcb, 0xdd, 0x47, 0xc5, 0x3b, 0x42, 0x1a, 0xa8, - 0x3e, 0xae, 0xd2, 0x6a, 0xf4, 0x20, 0x64, 0x2b, 0xf6, 0xb6, 0x6a, 0x99, 0xd4, 0x25, 0xdb, 0xa6, - 0x5a, 0xc1, 0xb9, 0x37, 0x30, 0x50, 0x56, 0xbf, 0x2c, 0xaa, 0x89, 0x45, 0xd8, 0x2f, 0x68, 0x5b, - 0x8e, 0xa0, 0xf8, 0x00, 0xb3, 0x08, 0x5a, 0xc7, 0xa9, 0x1d, 0x87, 0x2c, 0x91, 0x44, 0xa0, 0xe3, - 0xe3, 0x14, 0x6c, 0xd8, 0xdc, 0x36, 0xfd, 0xfd, 0xde, 0x0b, 0x43, 0x04, 0xd2, 0xeb, 0xf4, 0x41, - 0x96, 0xb8, 0x99, 0xdb, 0xbe, 0x1e, 0x9f, 0x80, 0xc3, 0x04, 0xa8, 0x81, 0x1d, 0xb5, 0xaa, 0x3a, - 0xaa, 0x0f, 0xfa, 0x61, 0x0a, 0x4d, 0xc4, 0xbe, 0xc4, 0x1b, 0x03, 0x7c, 0x5a, 0xcd, 0xcd, 0x5d, - 0x57, 0xb1, 0x1e, 0x61, 0x7c, 0x92, 0x3a, 0xa1, 0x5a, 0x77, 0x2c, 0x39, 0x97, 0x0b, 0x90, 0xf1, - 0xeb, 0x3d, 0x4a, 0x03, 0xd3, 0xfc, 0xac, 0x44, 0x92, 0xa0, 0xd9, 0x95, 0x39, 0x92, 0xbe, 0x3c, - 0x57, 0xca, 0xc6, 0x48, 0x1a, 0xb5, 0xb8, 0xb0, 0x5e, 0x2a, 0x2b, 0x1b, 0xcb, 0xeb, 0x0b, 0x4b, - 0xa5, 0x6c, 0xdc, 0x97, 0xd8, 0x3f, 0x95, 0x48, 0xdd, 0x9f, 0x7d, 0x40, 0xfe, 0x5a, 0x0c, 0x86, - 0x83, 0x2b, 0x35, 0xf4, 0x46, 0xb8, 0x4b, 0x6c, 0xab, 0xd8, 0xd8, 0x29, 0xbf, 0xa0, 0x59, 0xd4, - 0x20, 0x1b, 0x2a, 0x0b, 0x8e, 0xae, 0xfe, 0x8c, 0x73, 0xa8, 0x35, 0xec, 0x3c, 0xa3, 0x59, 0xc4, - 0xdc, 0x1a, 0xaa, 0x83, 0x16, 0x61, 0x52, 0x37, 0xca, 0xb6, 0xa3, 0xea, 0x55, 0xd5, 0xaa, 0x96, - 0xbd, 0x0d, 0xad, 0xb2, 0x5a, 0xa9, 0x60, 0xdb, 0x36, 0x58, 0x20, 0x74, 0xa9, 0x1c, 0xd3, 0x8d, - 0x35, 0x0e, 0xec, 0x45, 0x88, 0x19, 0x0e, 0x1a, 0x52, 0xdf, 0x78, 0x27, 0xf5, 0x3d, 0x0a, 0xe9, - 0x86, 0x6a, 0x96, 0xb1, 0xee, 0x58, 0xbb, 0x34, 0x3f, 0x4f, 0x29, 0xa9, 0x86, 0x6a, 0x96, 0x48, - 0xf9, 0x75, 0x59, 0x26, 0x3d, 0x95, 0x48, 0xa5, 0xb2, 0xe9, 0xa7, 0x12, 0xa9, 0x74, 0x16, 0xe4, - 0xd7, 0xe2, 0x90, 0xf1, 0xe7, 0xeb, 0x64, 0xf9, 0x53, 0xa1, 0x11, 0x4b, 0xa2, 0x3e, 0xed, 0xde, - 0xae, 0xd9, 0xfd, 0xf4, 0x2c, 0x09, 0x65, 0x85, 0x7e, 0x96, 0x1c, 0x2b, 0x0c, 0x93, 0xa4, 0x11, - 0x44, 0xd9, 0x30, 0x4b, 0x46, 0x52, 0x0a, 0x2f, 0xa1, 0x79, 0xe8, 0x7f, 0xde, 0xa6, 0xb4, 0xfb, - 0x29, 0xed, 0xfb, 0xba, 0xd3, 0x7e, 0x6a, 0x8d, 0x12, 0x4f, 0x3f, 0xb5, 0x56, 0x5e, 0x5e, 0x51, - 0x96, 0x66, 0x16, 0x15, 0x8e, 0x8e, 0x8e, 0x40, 0xa2, 0xae, 0xbe, 0xb8, 0x1b, 0x0c, 0x7a, 0xb4, - 0xaa, 0xd7, 0x49, 0x38, 0x02, 0x89, 0x17, 0xb0, 0xba, 0x13, 0x0c, 0x35, 0xb4, 0xea, 0x0e, 0x1a, - 0xc3, 0x49, 0x48, 0x52, 0x79, 0x21, 0x00, 0x2e, 0xb1, 0x6c, 0x1f, 0x4a, 0x41, 0x62, 0x76, 0x45, - 0x21, 0x06, 0x91, 0x85, 0x0c, 0xab, 0x2d, 0xaf, 0x2e, 0x94, 0x66, 0x4b, 0xd9, 0x98, 0x7c, 0x1a, - 0xfa, 0x99, 0x10, 0x88, 0xb1, 0xb8, 0x62, 0xc8, 0xf6, 0xf1, 0x22, 0xa7, 0x21, 0x89, 0xd6, 0x8d, - 0xa5, 0x62, 0x49, 0xc9, 0xc6, 0x82, 0x53, 0x9d, 0xc8, 0x26, 0x65, 0x1b, 0x32, 0xfe, 0x3c, 0xfc, - 0xf5, 0x59, 0x8c, 0x7f, 0x41, 0x82, 0x41, 0x5f, 0x5e, 0x4d, 0x12, 0x22, 0xb5, 0x5e, 0x37, 0x5e, - 0x28, 0xab, 0x75, 0x4d, 0xb5, 0xb9, 0x6a, 0x00, 0xad, 0x9a, 0x21, 0x35, 0xbd, 0x4e, 0xdd, 0xeb, - 0x64, 0x22, 0xc9, 0x6c, 0xbf, 0xfc, 0x51, 0x09, 0xb2, 0xe1, 0xc4, 0x36, 0xc4, 0xa6, 0xf4, 0xa3, - 0x64, 0x53, 0xfe, 0x88, 0x04, 0xc3, 0xc1, 0x6c, 0x36, 0xc4, 0xde, 0x3d, 0x3f, 0x52, 0xf6, 0xfe, - 0x22, 0x06, 0x43, 0x81, 0x1c, 0xb6, 0x57, 0xee, 0xde, 0x0e, 0xa3, 0x5a, 0x15, 0x37, 0x4c, 0xc3, - 0xc1, 0x7a, 0x65, 0xb7, 0x5c, 0xc7, 0x57, 0x71, 0x3d, 0x27, 0x53, 0xa7, 0x71, 0xb2, 0x7b, 0x96, - 0x3c, 0xbd, 0xe0, 0xe1, 0x2d, 0x12, 0xb4, 0xc2, 0xd8, 0xc2, 0x5c, 0x69, 0x69, 0x75, 0x65, 0xbd, - 0xb4, 0x3c, 0xfb, 0xd6, 0xf2, 0xc6, 0xf2, 0xe5, 0xe5, 0x95, 0x67, 0x96, 0x95, 0xac, 0x16, 0x02, - 0xbb, 0x83, 0x66, 0xbf, 0x0a, 0xd9, 0x30, 0x53, 0xe8, 0x2e, 0x68, 0xc7, 0x56, 0xb6, 0x0f, 0x8d, - 0xc1, 0xc8, 0xf2, 0x4a, 0x79, 0x6d, 0x61, 0xae, 0x54, 0x2e, 0x5d, 0xbc, 0x58, 0x9a, 0x5d, 0x5f, - 0x63, 0xfb, 0x1e, 0x2e, 0xf4, 0x7a, 0xc0, 0xc0, 0xe5, 0x0f, 0xc7, 0x61, 0xac, 0x0d, 0x27, 0x68, - 0x86, 0xaf, 0x58, 0xd8, 0x22, 0xea, 0x91, 0x5e, 0xb8, 0x9f, 0x26, 0x39, 0xc3, 0xaa, 0x6a, 0x39, - 0x7c, 0x81, 0xf3, 0x20, 0x10, 0x29, 0xe9, 0x8e, 0xb6, 0xa5, 0x61, 0x8b, 0xef, 0x27, 0xb1, 0x65, - 0xcc, 0x88, 0x57, 0xcf, 0xb6, 0x94, 0x1e, 0x06, 0x64, 0x1a, 0xb6, 0xe6, 0x68, 0x57, 0x71, 0x59, - 0xd3, 0xc5, 0xe6, 0x13, 0x59, 0xd6, 0x24, 0x94, 0xac, 0x68, 0x59, 0xd0, 0x1d, 0x17, 0x5a, 0xc7, - 0x35, 0x35, 0x04, 0x4d, 0x9c, 0x79, 0x5c, 0xc9, 0x8a, 0x16, 0x17, 0xfa, 0x1e, 0xc8, 0x54, 0x8d, - 0x26, 0xc9, 0xf5, 0x18, 0x1c, 0x89, 0x1d, 0x92, 0x32, 0xc8, 0xea, 0x5c, 0x10, 0x9e, 0xc5, 0x7b, - 0xbb, 0x5e, 0x19, 0x65, 0x90, 0xd5, 0x31, 0x90, 0x07, 0x60, 0x44, 0xad, 0xd5, 0x2c, 0x42, 0x5c, - 0x10, 0x62, 0xeb, 0x92, 0x61, 0xb7, 0x9a, 0x02, 0xe6, 0x9f, 0x82, 0x94, 0x90, 0x03, 0x09, 0xd5, - 0x44, 0x12, 0x65, 0x93, 0x2d, 0xb6, 0x63, 0xc7, 0xd3, 0x4a, 0x4a, 0x17, 0x8d, 0xf7, 0x40, 0x46, - 0xb3, 0xcb, 0xde, 0x26, 0x7e, 0x6c, 0x2a, 0x76, 0x3c, 0xa5, 0x0c, 0x6a, 0xb6, 0xbb, 0x01, 0x2a, - 0x7f, 0x32, 0x06, 0xc3, 0xc1, 0x43, 0x08, 0x34, 0x07, 0xa9, 0xba, 0x51, 0x51, 0xa9, 0x6a, 0xb1, - 0x13, 0xb0, 0xe3, 0x11, 0xe7, 0x16, 0xd3, 0x8b, 0x1c, 0x5e, 0x71, 0x31, 0xf3, 0xff, 0x56, 0x82, - 0x94, 0xa8, 0x46, 0x87, 0x21, 0x61, 0xaa, 0xce, 0x36, 0x25, 0x97, 0x2c, 0xc6, 0xb2, 0x92, 0x42, - 0xcb, 0xa4, 0xde, 0x36, 0x55, 0x9d, 0xaa, 0x00, 0xaf, 0x27, 0x65, 0x32, 0xaf, 0x75, 0xac, 0x56, - 0xe9, 0xa2, 0xc7, 0x68, 0x34, 0xb0, 0xee, 0xd8, 0x62, 0x5e, 0x79, 0xfd, 0x2c, 0xaf, 0x46, 0x0f, - 0xc1, 0xa8, 0x63, 0xa9, 0x5a, 0x3d, 0x00, 0x9b, 0xa0, 0xb0, 0x59, 0xd1, 0xe0, 0x02, 0x17, 0xe0, - 0x88, 0xa0, 0x5b, 0xc5, 0x8e, 0x5a, 0xd9, 0xc6, 0x55, 0x0f, 0xa9, 0x9f, 0x6e, 0x6e, 0xdc, 0xc5, - 0x01, 0xe6, 0x78, 0xbb, 0xc0, 0x95, 0xbf, 0x26, 0xc1, 0xa8, 0x58, 0xa6, 0x55, 0x5d, 0x61, 0x2d, - 0x01, 0xa8, 0xba, 0x6e, 0x38, 0x7e, 0x71, 0xb5, 0xaa, 0x72, 0x0b, 0xde, 0xf4, 0x8c, 0x8b, 0xa4, - 0xf8, 0x08, 0xe4, 0x1b, 0x00, 0x5e, 0x4b, 0x47, 0xb1, 0x4d, 0xc2, 0x20, 0x3f, 0x61, 0xa2, 0xc7, - 0x94, 0x6c, 0x61, 0x0f, 0xac, 0x8a, 0xac, 0xe7, 0xd0, 0x38, 0x24, 0x37, 0x71, 0x4d, 0xd3, 0xf9, - 0xbe, 0x31, 0x2b, 0x88, 0xed, 0x97, 0x84, 0xbb, 0xfd, 0x52, 0xfc, 0x79, 0x18, 0xab, 0x18, 0x8d, - 0x30, 0xbb, 0xc5, 0x6c, 0x68, 0x73, 0xc1, 0xbe, 0x24, 0x3d, 0xf7, 0x08, 0x07, 0xaa, 0x19, 0x75, - 0x55, 0xaf, 0x4d, 0x1b, 0x56, 0xcd, 0x3b, 0x66, 0x25, 0x19, 0x8f, 0xed, 0x3b, 0x6c, 0x35, 0x37, - 0xff, 0xb7, 0x24, 0xfd, 0x5a, 0x2c, 0x3e, 0xbf, 0x5a, 0xfc, 0x54, 0x2c, 0x3f, 0xcf, 0x10, 0x57, - 0x85, 0x30, 0x14, 0xbc, 0x55, 0xc7, 0x15, 0x32, 0x40, 0xf8, 0xee, 0x43, 0x30, 0x5e, 0x33, 0x6a, - 0x06, 0xa5, 0x74, 0x92, 0xfc, 0xe2, 0xe7, 0xb4, 0x69, 0xb7, 0x36, 0x1f, 0x79, 0xa8, 0x5b, 0x58, - 0x86, 0x31, 0x0e, 0x5c, 0xa6, 0x07, 0x45, 0x6c, 0x19, 0x83, 0xba, 0xee, 0xa1, 0xe5, 0x3e, 0xfb, - 0x6d, 0x1a, 0xbe, 0x95, 0x51, 0x8e, 0x4a, 0xda, 0xd8, 0x4a, 0xa7, 0xa0, 0xc0, 0xa1, 0x00, 0x3d, - 0x66, 0xa4, 0xd8, 0x8a, 0xa0, 0xf8, 0x87, 0x9c, 0xe2, 0x98, 0x8f, 0xe2, 0x1a, 0x47, 0x2d, 0xcc, - 0xc2, 0xd0, 0x5e, 0x68, 0xfd, 0x1b, 0x4e, 0x2b, 0x83, 0xfd, 0x44, 0xe6, 0x61, 0x84, 0x12, 0xa9, - 0x34, 0x6d, 0xc7, 0x68, 0x50, 0x0f, 0xd8, 0x9d, 0xcc, 0x1f, 0x7d, 0x9b, 0x59, 0xcd, 0x30, 0x41, - 0x9b, 0x75, 0xb1, 0x0a, 0x05, 0xa0, 0x67, 0x63, 0x55, 0x5c, 0xa9, 0x47, 0x50, 0xf8, 0x12, 0x67, - 0xc4, 0x85, 0x2f, 0x5c, 0x81, 0x71, 0xf2, 0x9b, 0x3a, 0x28, 0x3f, 0x27, 0xd1, 0x1b, 0x6e, 0xb9, - 0xaf, 0xbd, 0x87, 0x19, 0xe6, 0x98, 0x4b, 0xc0, 0xc7, 0x93, 0x6f, 0x16, 0x6b, 0xd8, 0x71, 0xb0, - 0x65, 0x97, 0xd5, 0x7a, 0x3b, 0xf6, 0x7c, 0x3b, 0x16, 0xb9, 0x0f, 0x7d, 0x2f, 0x38, 0x8b, 0xf3, - 0x0c, 0x73, 0xa6, 0x5e, 0x2f, 0x6c, 0xc0, 0x5d, 0x6d, 0xb4, 0xa2, 0x07, 0x9a, 0x1f, 0xe6, 0x34, - 0xc7, 0x5b, 0x34, 0x83, 0x90, 0x5d, 0x05, 0x51, 0xef, 0xce, 0x65, 0x0f, 0x34, 0x7f, 0x95, 0xd3, - 0x44, 0x1c, 0x57, 0x4c, 0x29, 0xa1, 0xf8, 0x14, 0x8c, 0x5e, 0xc5, 0xd6, 0xa6, 0x61, 0xf3, 0x5d, - 0xa2, 0x1e, 0xc8, 0x7d, 0x84, 0x93, 0x1b, 0xe1, 0x88, 0x74, 0xdb, 0x88, 0xd0, 0x3a, 0x0f, 0xa9, - 0x2d, 0xb5, 0x82, 0x7b, 0x20, 0x71, 0x83, 0x93, 0x18, 0x20, 0xf0, 0x04, 0x75, 0x06, 0x32, 0x35, - 0x83, 0xc7, 0xa8, 0x68, 0xf4, 0x8f, 0x72, 0xf4, 0x41, 0x81, 0xc3, 0x49, 0x98, 0x86, 0xd9, 0xac, - 0x93, 0x00, 0x16, 0x4d, 0xe2, 0x1f, 0x09, 0x12, 0x02, 0x87, 0x93, 0xd8, 0x83, 0x58, 0x5f, 0x11, - 0x24, 0x6c, 0x9f, 0x3c, 0x9f, 0x84, 0x41, 0x43, 0xaf, 0xef, 0x1a, 0x7a, 0x2f, 0x4c, 0x7c, 0x8c, - 0x53, 0x00, 0x8e, 0x42, 0x08, 0x5c, 0x80, 0x74, 0xaf, 0x13, 0xf1, 0x8f, 0xbf, 0x27, 0xcc, 0x43, - 0xcc, 0xc0, 0x3c, 0x8c, 0x08, 0x07, 0xa5, 0x19, 0x7a, 0x0f, 0x24, 0x3e, 0xc1, 0x49, 0x0c, 0xfb, - 0xd0, 0xf8, 0x30, 0x1c, 0x6c, 0x3b, 0x35, 0xdc, 0x0b, 0x91, 0x4f, 0x8a, 0x61, 0x70, 0x14, 0x2e, - 0xca, 0x4d, 0xac, 0x57, 0xb6, 0x7b, 0xa3, 0xf0, 0x1b, 0x42, 0x94, 0x02, 0x87, 0x90, 0x98, 0x85, - 0xa1, 0x86, 0x6a, 0xd9, 0xdb, 0x6a, 0xbd, 0xa7, 0xe9, 0xf8, 0x4d, 0x4e, 0x23, 0xe3, 0x22, 0x71, - 0x89, 0x34, 0xf5, 0xbd, 0x90, 0xf9, 0x94, 0x90, 0x88, 0x0f, 0x8d, 0x9b, 0x9e, 0xed, 0xd0, 0x2d, - 0xb5, 0xbd, 0x50, 0xfb, 0xb4, 0x30, 0x3d, 0x86, 0xbb, 0xe4, 0xa7, 0x78, 0x01, 0xd2, 0xb6, 0xf6, - 0x62, 0x4f, 0x64, 0x7e, 0x4b, 0xcc, 0x34, 0x45, 0x20, 0xc8, 0x6f, 0x85, 0x23, 0x6d, 0xc3, 0x44, - 0x0f, 0xc4, 0x7e, 0x9b, 0x13, 0x3b, 0xdc, 0x26, 0x54, 0x70, 0x97, 0xb0, 0x57, 0x92, 0xff, 0x44, - 0xb8, 0x04, 0x1c, 0xa2, 0xb5, 0x4a, 0x56, 0x0d, 0xb6, 0xba, 0xb5, 0x37, 0xa9, 0xfd, 0x53, 0x21, - 0x35, 0x86, 0x1b, 0x90, 0xda, 0x3a, 0x1c, 0xe6, 0x14, 0xf7, 0x36, 0xaf, 0x9f, 0x11, 0x8e, 0x95, - 0x61, 0x6f, 0x04, 0x67, 0xf7, 0x6d, 0x90, 0x77, 0xc5, 0x29, 0xd2, 0x53, 0xbb, 0xdc, 0x50, 0xcd, - 0x1e, 0x28, 0x7f, 0x96, 0x53, 0x16, 0x1e, 0xdf, 0xcd, 0x6f, 0xed, 0x25, 0xd5, 0x24, 0xc4, 0x9f, - 0x85, 0x9c, 0x20, 0xde, 0xd4, 0x2d, 0x5c, 0x31, 0x6a, 0xba, 0xf6, 0x22, 0xae, 0xf6, 0x40, 0xfa, - 0x77, 0x42, 0x53, 0xb5, 0xe1, 0x43, 0x27, 0x94, 0x17, 0x20, 0xeb, 0xe6, 0x2a, 0x65, 0xad, 0x61, - 0x1a, 0x96, 0x13, 0x41, 0xf1, 0x73, 0x62, 0xa6, 0x5c, 0xbc, 0x05, 0x8a, 0x56, 0x28, 0x01, 0x3b, - 0x67, 0xee, 0x55, 0x25, 0x5f, 0xe5, 0x84, 0x86, 0x3c, 0x2c, 0xee, 0x38, 0x2a, 0x46, 0xc3, 0x54, - 0xad, 0x5e, 0xfc, 0xdf, 0xef, 0x0a, 0xc7, 0xc1, 0x51, 0xb8, 0xe3, 0x20, 0x19, 0x1d, 0x89, 0xf6, - 0x3d, 0x50, 0xf8, 0xbc, 0x70, 0x1c, 0x02, 0x87, 0x93, 0x10, 0x09, 0x43, 0x0f, 0x24, 0xfe, 0x99, - 0x20, 0x21, 0x70, 0x08, 0x89, 0xa7, 0xbd, 0x40, 0x6b, 0xe1, 0x9a, 0x66, 0x3b, 0x16, 0x4b, 0x8a, - 0xbb, 0x93, 0xfa, 0xe7, 0xdf, 0x0b, 0x26, 0x61, 0x8a, 0x0f, 0x95, 0x78, 0x22, 0xbe, 0xc9, 0x4a, - 0xd7, 0x4c, 0xd1, 0x8c, 0xfd, 0x9e, 0xf0, 0x44, 0x3e, 0x34, 0xc2, 0x9b, 0x2f, 0x43, 0x24, 0x62, - 0xaf, 0x90, 0x95, 0x42, 0x0f, 0xe4, 0xfe, 0x45, 0x88, 0xb9, 0x35, 0x81, 0x4b, 0x68, 0xfa, 0xf2, - 0x9f, 0xa6, 0xbe, 0x83, 0x77, 0x7b, 0xd2, 0xce, 0xdf, 0x0f, 0xe5, 0x3f, 0x1b, 0x0c, 0x93, 0xf9, - 0x90, 0x91, 0x50, 0x3e, 0x85, 0xa2, 0x6e, 0x15, 0xe5, 0xde, 0xf5, 0x03, 0x3e, 0xde, 0x60, 0x3a, - 0x55, 0x58, 0x24, 0x4a, 0x1e, 0x4c, 0x7a, 0xa2, 0x89, 0xbd, 0xe7, 0x07, 0xae, 0x9e, 0x07, 0x72, - 0x9e, 0xc2, 0x45, 0x18, 0x0a, 0x24, 0x3c, 0xd1, 0xa4, 0x7e, 0x81, 0x93, 0xca, 0xf8, 0xf3, 0x9d, - 0xc2, 0x69, 0x48, 0x90, 0xe4, 0x25, 0x1a, 0xfd, 0x6f, 0x71, 0x74, 0x0a, 0x5e, 0x78, 0x13, 0xa4, - 0x44, 0xd2, 0x12, 0x8d, 0xfa, 0x5e, 0x8e, 0xea, 0xa2, 0x10, 0x74, 0x91, 0xb0, 0x44, 0xa3, 0xff, - 0x6d, 0x81, 0x2e, 0x50, 0x08, 0x7a, 0xef, 0x22, 0xfc, 0xc2, 0xdf, 0x49, 0xf0, 0xa0, 0x23, 0x64, - 0x77, 0x01, 0x06, 0x78, 0xa6, 0x12, 0x8d, 0xfd, 0x3e, 0xde, 0xb9, 0xc0, 0x28, 0x9c, 0x85, 0x64, - 0x8f, 0x02, 0xff, 0xbb, 0x1c, 0x95, 0xc1, 0x17, 0x66, 0x61, 0xd0, 0x97, 0x9d, 0x44, 0xa3, 0xff, - 0x3d, 0x8e, 0xee, 0xc7, 0x22, 0xac, 0xf3, 0xec, 0x24, 0x9a, 0xc0, 0xdf, 0x17, 0xac, 0x73, 0x0c, - 0x22, 0x36, 0x91, 0x98, 0x44, 0x63, 0xbf, 0x5f, 0x48, 0x5d, 0xa0, 0x14, 0x9e, 0x84, 0xb4, 0x1b, - 0x6c, 0xa2, 0xf1, 0x7f, 0x89, 0xe3, 0x7b, 0x38, 0x44, 0x02, 0xbe, 0x60, 0x17, 0x4d, 0xe2, 0x1f, - 0x08, 0x09, 0xf8, 0xb0, 0x88, 0x19, 0x85, 0x13, 0x98, 0x68, 0x4a, 0x1f, 0x10, 0x66, 0x14, 0xca, - 0x5f, 0xc8, 0x6c, 0x52, 0x9f, 0x1f, 0x4d, 0xe2, 0x1f, 0x8a, 0xd9, 0xa4, 0xf0, 0x84, 0x8d, 0x70, - 0x46, 0x10, 0x4d, 0xe3, 0x57, 0x04, 0x1b, 0xa1, 0x84, 0xa0, 0xb0, 0x0a, 0xa8, 0x35, 0x1b, 0x88, - 0xa6, 0xf7, 0x41, 0x4e, 0x6f, 0xb4, 0x25, 0x19, 0x28, 0x3c, 0x03, 0x87, 0xdb, 0x67, 0x02, 0xd1, - 0x54, 0x3f, 0xf4, 0x83, 0xd0, 0xda, 0xcd, 0x9f, 0x08, 0x14, 0xd6, 0xbd, 0x90, 0xe2, 0xcf, 0x02, - 0xa2, 0xc9, 0x7e, 0xf8, 0x07, 0x41, 0xc7, 0xed, 0x4f, 0x02, 0x0a, 0x33, 0x00, 0x5e, 0x00, 0x8e, - 0xa6, 0xf5, 0x11, 0x4e, 0xcb, 0x87, 0x44, 0x4c, 0x83, 0xc7, 0xdf, 0x68, 0xfc, 0x1b, 0xc2, 0x34, - 0x38, 0x06, 0x31, 0x0d, 0x11, 0x7a, 0xa3, 0xb1, 0x3f, 0x2a, 0x4c, 0x43, 0xa0, 0x10, 0xcd, 0xf6, - 0x45, 0xb7, 0x68, 0x0a, 0x1f, 0x13, 0x9a, 0xed, 0xc3, 0x2a, 0x2c, 0xc3, 0x68, 0x4b, 0x40, 0x8c, - 0x26, 0xf5, 0x6b, 0x9c, 0x54, 0x36, 0x1c, 0x0f, 0xfd, 0xc1, 0x8b, 0x07, 0xc3, 0x68, 0x6a, 0x1f, - 0x0f, 0x05, 0x2f, 0x1e, 0x0b, 0x0b, 0x17, 0x20, 0xa5, 0x37, 0xeb, 0x75, 0x62, 0x3c, 0xa8, 0xfb, - 0x4d, 0xc0, 0xdc, 0x7f, 0xfa, 0x21, 0x97, 0x8e, 0x40, 0x28, 0x9c, 0x86, 0x24, 0x6e, 0x6c, 0xe2, - 0x6a, 0x14, 0xe6, 0x77, 0x7f, 0x28, 0x1c, 0x26, 0x81, 0x2e, 0x3c, 0x09, 0xc0, 0xb6, 0x46, 0xe8, - 0x61, 0x60, 0x04, 0xee, 0x7f, 0xfe, 0x21, 0xbf, 0x7a, 0xe3, 0xa1, 0x78, 0x04, 0xd8, 0x45, 0x9e, - 0xee, 0x04, 0xbe, 0x17, 0x24, 0x40, 0x67, 0xe4, 0x3c, 0x0c, 0x3c, 0x6f, 0x1b, 0xba, 0xa3, 0xd6, - 0xa2, 0xb0, 0xff, 0x0b, 0xc7, 0x16, 0xf0, 0x44, 0x60, 0x0d, 0xc3, 0xc2, 0x8e, 0x5a, 0xb3, 0xa3, - 0x70, 0xff, 0x2b, 0xc7, 0x75, 0x11, 0x08, 0x72, 0x45, 0xb5, 0x9d, 0x5e, 0xc6, 0xfd, 0xd7, 0x02, - 0x59, 0x20, 0x10, 0xa6, 0xc9, 0xef, 0x1d, 0xbc, 0x1b, 0x85, 0xfb, 0x7d, 0xc1, 0x34, 0x87, 0x2f, - 0xbc, 0x09, 0xd2, 0xe4, 0x27, 0xbb, 0x4f, 0x17, 0x81, 0xfc, 0xdf, 0x38, 0xb2, 0x87, 0x41, 0x7a, - 0xb6, 0x9d, 0xaa, 0xa3, 0x45, 0x0b, 0xfb, 0x16, 0x9f, 0x69, 0x01, 0x5f, 0x98, 0x81, 0x41, 0xdb, - 0xa9, 0x56, 0x9b, 0x3c, 0x3f, 0x8d, 0x40, 0xff, 0xef, 0x3f, 0x74, 0xb7, 0x2c, 0x5c, 0x1c, 0x32, - 0xdb, 0x2f, 0xec, 0x38, 0xa6, 0x41, 0x0f, 0x3c, 0xa2, 0x28, 0xfc, 0x80, 0x53, 0xf0, 0xa1, 0x14, - 0x66, 0x21, 0x43, 0xc6, 0x62, 0x61, 0x13, 0xd3, 0xd3, 0xa9, 0x08, 0x12, 0xff, 0x83, 0x0b, 0x20, - 0x80, 0x54, 0xfc, 0xd9, 0x2f, 0xbd, 0x36, 0x21, 0x7d, 0xf5, 0xb5, 0x09, 0xe9, 0x2f, 0x5e, 0x9b, - 0x90, 0xde, 0xff, 0xad, 0x89, 0xbe, 0xaf, 0x7e, 0x6b, 0xa2, 0xef, 0xcf, 0xbe, 0x35, 0xd1, 0xd7, - 0x7e, 0x97, 0x18, 0xe6, 0x8d, 0x79, 0x83, 0xed, 0x0f, 0x3f, 0x27, 0xd7, 0x34, 0x67, 0xbb, 0xb9, - 0x39, 0x5d, 0x31, 0x1a, 0x74, 0x1b, 0xd7, 0xdb, 0xad, 0x75, 0x17, 0x39, 0xf0, 0xdd, 0x18, 0x1c, - 0xa9, 0x18, 0x76, 0xc3, 0xb0, 0xcb, 0x6c, 0xbf, 0x97, 0x15, 0xf8, 0x8e, 0x6f, 0xc6, 0xdf, 0xd4, - 0xc3, 0xa6, 0xef, 0x3a, 0x8c, 0x6b, 0x0d, 0xb3, 0x8e, 0xe9, 0xe6, 0x7c, 0x99, 0x4a, 0xa1, 0xb7, - 0x64, 0xf0, 0xcb, 0xff, 0x3e, 0xc9, 0x36, 0x21, 0x3d, 0xf4, 0x05, 0x81, 0x5d, 0x58, 0x84, 0x51, - 0xb5, 0x52, 0xc1, 0x66, 0x80, 0x64, 0x84, 0x30, 0x05, 0xc1, 0x2c, 0xc7, 0xf4, 0xa8, 0x9d, 0x85, - 0x7e, 0xbb, 0xa2, 0xd6, 0xd5, 0xc8, 0x29, 0xfd, 0x0a, 0x27, 0xc1, 0xc1, 0x8b, 0xe7, 0x3a, 0xcd, - 0xc4, 0x73, 0x13, 0x3e, 0x41, 0x33, 0x89, 0xf1, 0x3f, 0x8f, 0x30, 0xca, 0xfd, 0xec, 0xa6, 0x32, - 0xfc, 0x69, 0x1c, 0x26, 0x78, 0xfb, 0xa6, 0x6a, 0xe3, 0x93, 0x57, 0x1f, 0xdb, 0xc4, 0x8e, 0xfa, - 0xd8, 0xc9, 0x8a, 0xa1, 0xe9, 0x5c, 0xe2, 0x63, 0x5c, 0xfe, 0xa4, 0x7d, 0x9a, 0xb7, 0xe7, 0xdb, - 0x6e, 0xc7, 0xe7, 0x3b, 0xcf, 0x9b, 0xbc, 0x01, 0x89, 0x59, 0x43, 0xd3, 0xd1, 0x38, 0x24, 0xab, - 0x58, 0x37, 0x1a, 0xfc, 0xda, 0x1d, 0x2b, 0xa0, 0xc7, 0xa0, 0x5f, 0x6d, 0x18, 0x4d, 0xdd, 0x61, - 0x87, 0x14, 0xc5, 0x23, 0x5f, 0xba, 0x39, 0xd9, 0xf7, 0xe7, 0x37, 0x27, 0xe3, 0x0b, 0xba, 0xf3, - 0xc7, 0xaf, 0x3e, 0x02, 0x9c, 0xd4, 0x82, 0xee, 0x28, 0x1c, 0xb0, 0x90, 0xf8, 0xce, 0x2b, 0x93, - 0x92, 0xfc, 0x2c, 0x0c, 0xcc, 0xe1, 0xca, 0x7e, 0x28, 0xcf, 0xe1, 0x8a, 0x8f, 0xf2, 0x1c, 0xae, - 0x84, 0x28, 0x9f, 0x85, 0xd4, 0x82, 0xee, 0xb0, 0x4b, 0x93, 0x0f, 0x41, 0x5c, 0xd3, 0xd9, 0x3d, - 0x9c, 0xae, 0xbc, 0x11, 0x28, 0x82, 0x38, 0x87, 0x2b, 0x2e, 0x62, 0x15, 0x57, 0xc2, 0x88, 0xad, - 0x5d, 0x13, 0xa8, 0xe2, 0xdc, 0x9f, 0xfd, 0xc7, 0x89, 0xbe, 0x97, 0x5e, 0x9b, 0xe8, 0xeb, 0x38, - 0xab, 0x72, 0xc7, 0x59, 0xb5, 0xab, 0x3b, 0xec, 0x78, 0xc5, 0x9d, 0xd9, 0xbf, 0xea, 0x07, 0x99, - 0xc3, 0xd8, 0x8e, 0xba, 0xa3, 0xe9, 0x35, 0x77, 0x72, 0xd5, 0xa6, 0xb3, 0xfd, 0x22, 0x9f, 0xdd, - 0xc3, 0x9c, 0x0b, 0x0e, 0xb3, 0xef, 0x09, 0xce, 0x47, 0xa8, 0x91, 0xfc, 0x97, 0x71, 0x40, 0x6b, - 0x8e, 0xba, 0x83, 0x67, 0x9a, 0xce, 0xb6, 0x61, 0x69, 0x2f, 0x32, 0x37, 0x88, 0x01, 0x1a, 0xea, - 0xb5, 0xb2, 0x63, 0xec, 0x60, 0xdd, 0xa6, 0x82, 0x1a, 0x3c, 0x75, 0x64, 0xba, 0x8d, 0xca, 0x4d, - 0x93, 0x49, 0x2e, 0x3e, 0xf4, 0xa9, 0x6f, 0x4e, 0x3e, 0x10, 0x2d, 0x05, 0x0a, 0x4c, 0xf2, 0xf2, - 0x6b, 0xeb, 0x94, 0x30, 0xba, 0x02, 0xec, 0x7e, 0x46, 0xb9, 0xae, 0xd9, 0x0e, 0xbf, 0xe2, 0x7d, - 0x7a, 0xba, 0xfd, 0xd8, 0xa7, 0x5b, 0xd9, 0x9c, 0xbe, 0xa2, 0xd6, 0xb5, 0xaa, 0xea, 0x18, 0x96, - 0x7d, 0xa9, 0x4f, 0x49, 0x53, 0x52, 0x8b, 0x9a, 0xed, 0xa0, 0x75, 0x48, 0x57, 0xb1, 0xbe, 0xcb, - 0xc8, 0xc6, 0x6f, 0x8f, 0x6c, 0x8a, 0x50, 0xa2, 0x54, 0x9f, 0x05, 0xa4, 0xfa, 0xe1, 0xc4, 0x9b, - 0x26, 0x76, 0x35, 0xb3, 0x03, 0xf9, 0x00, 0x65, 0xfa, 0x04, 0x63, 0x54, 0x0d, 0x57, 0xe5, 0xdf, - 0x02, 0xe0, 0xf5, 0x89, 0x4e, 0xc1, 0x80, 0x5a, 0xad, 0x5a, 0xd8, 0xb6, 0xe9, 0xd9, 0x61, 0xba, - 0x98, 0xfb, 0xe3, 0x57, 0x1f, 0x19, 0xe7, 0xf4, 0x67, 0x58, 0x0b, 0x5b, 0x8e, 0x2b, 0x02, 0xb0, - 0x30, 0xfa, 0x95, 0x57, 0x1f, 0x19, 0x0a, 0xf4, 0x55, 0xcc, 0x00, 0x5c, 0x75, 0x89, 0x9e, 0xf8, - 0xa8, 0x04, 0xa3, 0x2d, 0xbc, 0x20, 0x19, 0x26, 0x66, 0x36, 0xd6, 0x2f, 0xad, 0x28, 0x0b, 0xcf, - 0xcd, 0xac, 0x2f, 0xac, 0x2c, 0x97, 0xd9, 0x3b, 0x82, 0xe5, 0xb5, 0xd5, 0xd2, 0xec, 0xc2, 0xc5, - 0x85, 0xd2, 0x5c, 0xb6, 0x0f, 0x4d, 0xc2, 0xd1, 0x36, 0x30, 0x73, 0xa5, 0xc5, 0xd2, 0xfc, 0xcc, - 0x7a, 0x29, 0x2b, 0xa1, 0x7b, 0xe0, 0xee, 0xb6, 0x44, 0x5c, 0x90, 0x58, 0x07, 0x10, 0xa5, 0xe4, - 0x82, 0xc4, 0x8b, 0x17, 0x3b, 0xda, 0xd7, 0xc3, 0x5d, 0x35, 0xeb, 0x9a, 0x6b, 0x48, 0x41, 0x4b, - 0x7b, 0x57, 0x0c, 0x8e, 0x84, 0xe3, 0x90, 0xaa, 0xef, 0x76, 0x78, 0x4a, 0xda, 0xde, 0xb2, 0xe4, - 0x4b, 0x10, 0x9f, 0xd1, 0x77, 0xd1, 0x11, 0x96, 0xa4, 0x97, 0x9b, 0x56, 0x9d, 0xfb, 0xb1, 0x01, - 0x52, 0xde, 0xb0, 0xea, 0xc4, 0xbf, 0x89, 0xd7, 0x03, 0xd2, 0xf1, 0x0c, 0x7f, 0x12, 0x50, 0xc8, - 0x7e, 0xf0, 0x95, 0xc9, 0xbe, 0xcf, 0xbc, 0x32, 0xd9, 0xf7, 0xfd, 0x8f, 0x4d, 0xf6, 0xbd, 0xf4, - 0x8d, 0xa9, 0xbe, 0xe2, 0x4e, 0x78, 0x78, 0x5f, 0x88, 0x0c, 0xd1, 0xa9, 0x19, 0x7d, 0x97, 0x3a, - 0xac, 0x55, 0xe9, 0xb9, 0x24, 0x1d, 0x9c, 0x38, 0x95, 0x9d, 0x08, 0x9f, 0xca, 0x3e, 0x83, 0xeb, - 0xf5, 0xcb, 0xba, 0xf1, 0x02, 0x9d, 0x55, 0x4f, 0x06, 0x1f, 0x88, 0xc1, 0x44, 0x4b, 0x2c, 0xe6, - 0x69, 0x4b, 0xa7, 0x37, 0xb5, 0x05, 0x48, 0xcd, 0x89, 0x6c, 0x28, 0x07, 0x03, 0x36, 0xae, 0x18, - 0x7a, 0x95, 0xf9, 0x80, 0xb8, 0x22, 0x8a, 0x64, 0xd8, 0xba, 0xaa, 0x1b, 0x36, 0xbf, 0xc8, 0xcf, - 0x0a, 0xc5, 0x5f, 0x95, 0xf6, 0x96, 0x84, 0x0c, 0x89, 0x9e, 0xc4, 0x30, 0x1f, 0x8b, 0x3c, 0xa7, - 0xde, 0x21, 0xa3, 0x74, 0x07, 0x11, 0x38, 0xab, 0xee, 0x55, 0x2a, 0xbf, 0x12, 0x83, 0xc9, 0xb0, - 0x54, 0x48, 0x2e, 0x68, 0x3b, 0x6a, 0xc3, 0xec, 0x24, 0x96, 0x0b, 0x90, 0x5e, 0x17, 0x30, 0x7b, - 0x96, 0xcb, 0x8d, 0x3d, 0xca, 0x65, 0xd8, 0xed, 0x4a, 0x08, 0xe6, 0x54, 0x8f, 0x82, 0x71, 0xc7, - 0xb1, 0x2f, 0xc9, 0x7c, 0x2a, 0x01, 0x77, 0xd3, 0x97, 0x5e, 0x56, 0x43, 0xd3, 0x9d, 0x93, 0x15, - 0x6b, 0xd7, 0x74, 0x68, 0x36, 0x68, 0x6c, 0x71, 0xb9, 0x8c, 0x7a, 0xcd, 0xd3, 0xac, 0xb9, 0x83, - 0xe5, 0x6c, 0x41, 0x72, 0x95, 0xe0, 0x11, 0x89, 0x38, 0x86, 0xa3, 0xd6, 0xb9, 0xa4, 0x58, 0x81, - 0xd4, 0xb2, 0xd7, 0x61, 0x31, 0x56, 0xab, 0x89, 0x87, 0x61, 0x75, 0xac, 0x6e, 0xb1, 0x4b, 0xf6, - 0x71, 0x6a, 0x50, 0x29, 0x52, 0x41, 0xef, 0xd3, 0x8f, 0x43, 0x52, 0x6d, 0xb2, 0xfb, 0x21, 0x71, - 0x62, 0x69, 0xb4, 0x20, 0x5f, 0x86, 0x01, 0x7e, 0x4a, 0x8d, 0xb2, 0x10, 0xdf, 0xc1, 0xbb, 0xb4, - 0x9f, 0x8c, 0x42, 0x7e, 0xa2, 0x69, 0x48, 0x52, 0xe6, 0x79, 0x68, 0xc9, 0x4d, 0xb7, 0x70, 0x3f, - 0x4d, 0x99, 0x54, 0x18, 0x98, 0xfc, 0x14, 0xa4, 0xe6, 0x8c, 0x86, 0xa6, 0x1b, 0x41, 0x6a, 0x69, - 0x46, 0x8d, 0xf2, 0x6c, 0x36, 0x79, 0xce, 0xa2, 0xb0, 0x02, 0x3a, 0x0c, 0xfd, 0xec, 0xd1, 0x05, - 0xbf, 0xe3, 0xc2, 0x4b, 0xf2, 0x2c, 0x0c, 0x50, 0xda, 0x2b, 0x26, 0x42, 0xfc, 0xb9, 0x1e, 0x7f, - 0xdd, 0x41, 0x57, 0x57, 0x9c, 0x7c, 0xcc, 0x63, 0x16, 0x41, 0xa2, 0xaa, 0x3a, 0x2a, 0x1f, 0x37, - 0xfd, 0x2d, 0xbf, 0x19, 0x52, 0x9c, 0x08, 0x09, 0x0b, 0x71, 0xc3, 0xb4, 0xf9, 0x2d, 0x95, 0x7c, - 0xa7, 0xa1, 0xac, 0x98, 0xc5, 0x04, 0xc9, 0x68, 0x14, 0x02, 0x5c, 0x54, 0x3a, 0x3a, 0xd5, 0x73, - 0x3e, 0xa7, 0xea, 0x9b, 0x72, 0xdf, 0x4f, 0x36, 0xa5, 0x2d, 0xea, 0xe0, 0x2a, 0xcb, 0xc7, 0x62, - 0x30, 0xe1, 0x6b, 0xbd, 0x8a, 0x2d, 0x5b, 0x33, 0x74, 0x1e, 0xe9, 0x99, 0xb6, 0x20, 0x1f, 0x93, - 0xbc, 0xbd, 0x83, 0xba, 0xbc, 0x09, 0xe2, 0x33, 0xa6, 0x89, 0xf2, 0x90, 0xa2, 0xe5, 0x8a, 0xc1, - 0xf4, 0x25, 0xa1, 0xb8, 0x65, 0xd2, 0x66, 0x1b, 0x5b, 0xce, 0x0b, 0xaa, 0xe5, 0xbe, 0x4b, 0x14, - 0x65, 0xf9, 0x3c, 0xa4, 0x67, 0x0d, 0xdd, 0xc6, 0xba, 0xdd, 0xa4, 0x36, 0xb8, 0x59, 0x37, 0x2a, - 0x3b, 0x9c, 0x02, 0x2b, 0x10, 0x81, 0xab, 0xa6, 0x49, 0x31, 0x13, 0x0a, 0xf9, 0xc9, 0x32, 0xca, - 0xe2, 0x5a, 0x47, 0x11, 0x9d, 0xdf, 0xbb, 0x88, 0xf8, 0x20, 0x5d, 0x19, 0xfd, 0x5f, 0x09, 0x8e, - 0xb5, 0x1a, 0xd4, 0x0e, 0xde, 0xb5, 0xf7, 0x6a, 0x4f, 0xcf, 0x42, 0x7a, 0x95, 0x7e, 0x1c, 0xe0, - 0x32, 0xde, 0x45, 0x79, 0x18, 0xc0, 0xd5, 0x53, 0xa7, 0x4f, 0x3f, 0x76, 0x9e, 0x69, 0xfb, 0xa5, - 0x3e, 0x45, 0x54, 0xa0, 0x09, 0x48, 0xdb, 0xb8, 0x62, 0x9e, 0x3a, 0x7d, 0x66, 0xe7, 0x31, 0xa6, - 0x5e, 0x24, 0x37, 0x72, 0xab, 0x0a, 0x29, 0x32, 0xea, 0xef, 0x7c, 0x6c, 0x52, 0x2a, 0x26, 0x21, - 0x6e, 0x37, 0x1b, 0x77, 0x54, 0x47, 0x3e, 0x9c, 0x84, 0x29, 0x3f, 0x26, 0xf5, 0x54, 0x6e, 0x56, - 0xc2, 0x65, 0x90, 0xf5, 0xc9, 0x80, 0x42, 0x74, 0x48, 0x73, 0xbb, 0x4a, 0x52, 0xfe, 0x1d, 0x09, - 0x32, 0x6e, 0x12, 0xb5, 0x86, 0x1d, 0x74, 0xc1, 0x9f, 0xff, 0x70, 0xb3, 0x39, 0x3a, 0x1d, 0xee, - 0xcb, 0x4b, 0xf6, 0x14, 0x1f, 0x38, 0x3a, 0x4b, 0x15, 0xd1, 0x34, 0x6c, 0xfe, 0x56, 0x2d, 0x02, - 0xd5, 0x05, 0x46, 0x0f, 0x03, 0xa2, 0x1e, 0xae, 0x7c, 0xd5, 0x70, 0x34, 0xbd, 0x56, 0x36, 0x8d, - 0x17, 0xf8, 0x0b, 0xe0, 0xb8, 0x92, 0xa5, 0x2d, 0x57, 0x68, 0xc3, 0x2a, 0xa9, 0x27, 0x4c, 0xa7, - 0x5d, 0x2a, 0x24, 0xac, 0x78, 0x89, 0x1f, 0x71, 0x02, 0xa2, 0x88, 0x2e, 0xc0, 0x80, 0xd9, 0xdc, - 0x2c, 0x0b, 0x8f, 0x31, 0x78, 0xea, 0x58, 0x3b, 0xfb, 0x17, 0xfa, 0xc1, 0x3d, 0x40, 0xbf, 0xd9, - 0xdc, 0x24, 0xda, 0x72, 0x0f, 0x64, 0xda, 0x30, 0x33, 0x78, 0xd5, 0xe3, 0x83, 0x7e, 0x93, 0x82, - 0x8f, 0xa0, 0x6c, 0x5a, 0x9a, 0x61, 0x69, 0xce, 0x2e, 0xcd, 0x6c, 0xe3, 0x4a, 0x56, 0x34, 0xac, - 0xf2, 0x7a, 0x79, 0x07, 0x46, 0xd6, 0xe8, 0xf2, 0xdb, 0xe3, 0xfc, 0xb4, 0xc7, 0x9f, 0x14, 0xcd, - 0x5f, 0x47, 0xce, 0x62, 0x2d, 0x9c, 0x15, 0x9f, 0xee, 0xa8, 0x9d, 0x67, 0xf7, 0xae, 0x9d, 0xc1, - 0x0c, 0xf1, 0xaf, 0x8f, 0x04, 0x8c, 0x93, 0x29, 0xa7, 0xdf, 0x7d, 0xf5, 0xaa, 0x98, 0x51, 0xd9, - 0x44, 0xbe, 0x7b, 0x50, 0xcd, 0x47, 0xb8, 0xd1, 0x7c, 0xa4, 0x09, 0xc9, 0xe7, 0x61, 0x68, 0x55, - 0xb5, 0x9c, 0x35, 0xec, 0x5c, 0xc2, 0x6a, 0x15, 0x5b, 0xc1, 0xa8, 0x3b, 0x24, 0xa2, 0x2e, 0x82, - 0x04, 0x0d, 0xad, 0x2c, 0xea, 0xd0, 0xdf, 0xf2, 0x36, 0x24, 0xe8, 0x75, 0x53, 0x37, 0x22, 0x73, - 0x0c, 0x16, 0x91, 0x89, 0x2f, 0xdd, 0x75, 0xb0, 0x2d, 0xd2, 0x5b, 0x5a, 0x40, 0x4f, 0x88, 0xb8, - 0x1a, 0xef, 0x1e, 0x57, 0xb9, 0x22, 0xf2, 0xe8, 0x5a, 0x87, 0x81, 0x22, 0x71, 0xc5, 0x0b, 0x73, - 0x2e, 0x23, 0x92, 0xc7, 0x08, 0x5a, 0x82, 0x11, 0x53, 0xb5, 0x1c, 0xfa, 0xce, 0x66, 0x9b, 0x8e, - 0x82, 0xeb, 0xfa, 0x64, 0xab, 0xe5, 0x05, 0x06, 0xcb, 0x7b, 0x19, 0x32, 0xfd, 0x95, 0xf2, 0x5f, - 0x26, 0xa0, 0x9f, 0x0b, 0xe3, 0x4d, 0x30, 0xc0, 0xc5, 0xca, 0xb5, 0xf3, 0xee, 0xe9, 0xd6, 0xc0, - 0x34, 0xed, 0x06, 0x10, 0x4e, 0x4f, 0xe0, 0xa0, 0xfb, 0x21, 0x55, 0xd9, 0x56, 0x35, 0xbd, 0xac, - 0x55, 0xf9, 0x76, 0xc5, 0xe0, 0x6b, 0x37, 0x27, 0x07, 0x66, 0x49, 0xdd, 0xc2, 0x9c, 0x32, 0x40, - 0x1b, 0x17, 0xaa, 0x24, 0x13, 0xd8, 0xc6, 0x5a, 0x6d, 0xdb, 0xe1, 0x16, 0xc6, 0x4b, 0xe8, 0x1c, - 0x24, 0x88, 0x42, 0xf0, 0x57, 0x98, 0xf9, 0x96, 0xcd, 0x24, 0x37, 0xd9, 0x2b, 0xa6, 0x48, 0xc7, - 0xef, 0xff, 0xe6, 0xa4, 0xa4, 0x50, 0x0c, 0x34, 0x0b, 0x43, 0x75, 0xd5, 0x76, 0xca, 0x34, 0x82, - 0x91, 0xee, 0x93, 0x7c, 0x25, 0xde, 0x22, 0x10, 0x2e, 0x58, 0xce, 0xfa, 0x20, 0xc1, 0x62, 0x55, - 0x55, 0x74, 0x1c, 0xb2, 0x94, 0x48, 0xc5, 0x68, 0x34, 0x34, 0x87, 0xe5, 0x56, 0xfd, 0x54, 0xee, - 0xc3, 0xa4, 0x7e, 0x96, 0x56, 0xd3, 0x0c, 0xeb, 0x28, 0xa4, 0xe9, 0xbb, 0x2f, 0x0a, 0xc2, 0xee, - 0x38, 0xa7, 0x48, 0x05, 0x6d, 0x7c, 0x00, 0x46, 0x3c, 0xff, 0xc8, 0x40, 0x52, 0x8c, 0x8a, 0x57, - 0x4d, 0x01, 0x1f, 0x85, 0x71, 0x1d, 0x5f, 0xa3, 0xb7, 0xae, 0x03, 0xd0, 0x69, 0x0a, 0x8d, 0x48, - 0xdb, 0x95, 0x20, 0xc6, 0x1b, 0x60, 0xb8, 0x22, 0x84, 0xcf, 0x60, 0x81, 0xc2, 0x0e, 0xb9, 0xb5, - 0x14, 0xec, 0x08, 0xa4, 0x54, 0xd3, 0x64, 0x00, 0x83, 0xdc, 0x3f, 0x9a, 0x26, 0x6d, 0x3a, 0x01, - 0xa3, 0x74, 0x8c, 0x16, 0xb6, 0x9b, 0x75, 0x87, 0x13, 0xc9, 0x50, 0x98, 0x11, 0xd2, 0xa0, 0xb0, - 0x7a, 0x0a, 0x7b, 0x2f, 0x0c, 0xe1, 0xab, 0x5a, 0x15, 0xeb, 0x15, 0xcc, 0xe0, 0x86, 0x28, 0x5c, - 0x46, 0x54, 0x52, 0xa0, 0x07, 0xc1, 0xf5, 0x7b, 0x65, 0xe1, 0x93, 0x87, 0x19, 0x3d, 0x51, 0xcf, - 0x57, 0xe2, 0x72, 0x0e, 0x12, 0x73, 0xaa, 0xa3, 0x92, 0x04, 0xc3, 0xb9, 0xc6, 0x02, 0x4d, 0x46, - 0x21, 0x3f, 0xe5, 0xef, 0xc4, 0x20, 0x71, 0xc5, 0x70, 0x30, 0x7a, 0xdc, 0x97, 0x00, 0x0e, 0xb7, - 0xd3, 0xe7, 0x35, 0xad, 0xa6, 0xe3, 0xea, 0x92, 0x5d, 0xf3, 0x7d, 0xa4, 0xc1, 0x53, 0xa7, 0x58, - 0x40, 0x9d, 0xc6, 0x21, 0x69, 0x19, 0x4d, 0xbd, 0x2a, 0xae, 0x07, 0xd3, 0x02, 0x2a, 0x41, 0xca, - 0xd5, 0x92, 0x44, 0x94, 0x96, 0x8c, 0x10, 0x2d, 0x21, 0x3a, 0xcc, 0x2b, 0x94, 0x81, 0x4d, 0xae, - 0x2c, 0x45, 0x48, 0xbb, 0xce, 0x8b, 0x6b, 0x5b, 0x6f, 0x0a, 0xeb, 0xa1, 0x91, 0x60, 0xe2, 0xce, - 0xbd, 0x2b, 0x3c, 0xa6, 0x71, 0x59, 0xb7, 0x81, 0x4b, 0x2f, 0xa0, 0x56, 0xfc, 0x83, 0x11, 0x03, - 0x74, 0x5c, 0x9e, 0x5a, 0xb1, 0x8f, 0x46, 0x1c, 0x83, 0xb4, 0xad, 0xd5, 0x74, 0xd5, 0x69, 0x5a, - 0x98, 0x6b, 0x9e, 0x57, 0x21, 0x7f, 0x41, 0x82, 0x7e, 0xa6, 0xc9, 0x3e, 0xb9, 0x49, 0xed, 0xe5, - 0x16, 0xeb, 0x24, 0xb7, 0xf8, 0xfe, 0xe5, 0x36, 0x03, 0xe0, 0x32, 0x63, 0xf3, 0x77, 0xfc, 0x6d, - 0x32, 0x06, 0xc6, 0xe2, 0x9a, 0x56, 0xe3, 0x86, 0xea, 0x43, 0x92, 0xff, 0x83, 0x44, 0x92, 0x58, - 0xde, 0x8e, 0x66, 0x60, 0x48, 0xf0, 0x55, 0xde, 0xaa, 0xab, 0x35, 0xae, 0x3b, 0x77, 0x77, 0x64, - 0xee, 0x62, 0x5d, 0xad, 0x29, 0x83, 0x9c, 0x1f, 0x52, 0x68, 0x3f, 0x0f, 0xb1, 0x0e, 0xf3, 0x10, - 0x98, 0xf8, 0xf8, 0xfe, 0x26, 0x3e, 0x30, 0x45, 0x89, 0xf0, 0x14, 0x7d, 0x2e, 0x46, 0x17, 0x33, - 0xa6, 0x61, 0xab, 0xf5, 0xd7, 0xc3, 0x22, 0x8e, 0x42, 0xda, 0x34, 0xea, 0x65, 0xd6, 0xc2, 0xae, - 0xcd, 0xa7, 0x4c, 0xa3, 0xae, 0xb4, 0x4c, 0x7b, 0xf2, 0x80, 0xcc, 0xa5, 0xff, 0x00, 0xa4, 0x36, - 0x10, 0x96, 0x9a, 0x05, 0x19, 0x26, 0x0a, 0x1e, 0xcb, 0x1e, 0x25, 0x32, 0xa0, 0xc1, 0x51, 0x6a, - 0x8d, 0xbd, 0x8c, 0x6d, 0x06, 0xa9, 0x70, 0x38, 0x82, 0xc1, 0x5c, 0x7f, 0xbb, 0x55, 0xb0, 0x5f, - 0x2d, 0x15, 0x0e, 0x27, 0xff, 0xb2, 0x04, 0xb0, 0x48, 0x24, 0x4b, 0xc7, 0x4b, 0xa2, 0x90, 0x4d, - 0x59, 0x28, 0x07, 0x7a, 0x9e, 0xe8, 0x34, 0x69, 0xbc, 0xff, 0x8c, 0xed, 0xe7, 0x7b, 0x16, 0x86, - 0x3c, 0x65, 0xb4, 0xb1, 0x60, 0x66, 0xa2, 0x4b, 0x56, 0xbd, 0x86, 0x1d, 0x25, 0x73, 0xd5, 0x57, - 0x92, 0xff, 0xb5, 0x04, 0x69, 0xca, 0xd3, 0x12, 0x76, 0xd4, 0xc0, 0x1c, 0x4a, 0xfb, 0x9f, 0xc3, - 0xbb, 0x01, 0x18, 0x19, 0x5b, 0x7b, 0x11, 0x73, 0xcd, 0x4a, 0xd3, 0x9a, 0x35, 0xed, 0x45, 0x8c, - 0xce, 0xb8, 0x02, 0x8f, 0x77, 0x17, 0xb8, 0xc8, 0xba, 0xb9, 0xd8, 0xef, 0x82, 0x01, 0xfa, 0xdd, - 0xab, 0x6b, 0x36, 0x4f, 0xa4, 0xfb, 0xf5, 0x66, 0x63, 0xfd, 0x9a, 0x2d, 0x3f, 0x0f, 0x03, 0xeb, - 0xd7, 0xd8, 0xde, 0xc8, 0x51, 0x48, 0x5b, 0x86, 0xc1, 0x63, 0x32, 0xcb, 0x85, 0x52, 0xa4, 0x82, - 0x86, 0x20, 0xb1, 0x1f, 0x10, 0xf3, 0xf6, 0x03, 0xbc, 0x0d, 0x8d, 0x78, 0x4f, 0x1b, 0x1a, 0x27, - 0xfe, 0x54, 0x82, 0x41, 0x9f, 0x7f, 0x40, 0x8f, 0xc1, 0xa1, 0xe2, 0xe2, 0xca, 0xec, 0xe5, 0xf2, - 0xc2, 0x5c, 0xf9, 0xe2, 0xe2, 0xcc, 0xbc, 0xf7, 0x30, 0x2c, 0x7f, 0xf8, 0xfa, 0x8d, 0x29, 0xe4, - 0x83, 0xdd, 0xd0, 0xe9, 0x8e, 0x12, 0x3a, 0x09, 0xe3, 0x41, 0x94, 0x99, 0xe2, 0x5a, 0x69, 0x79, - 0x3d, 0x2b, 0xe5, 0x0f, 0x5d, 0xbf, 0x31, 0x35, 0xea, 0xc3, 0x98, 0xd9, 0xb4, 0xb1, 0xee, 0xb4, - 0x22, 0xcc, 0xae, 0x2c, 0x2d, 0x2d, 0xac, 0x67, 0x63, 0x2d, 0x08, 0xdc, 0x61, 0x3f, 0x08, 0xa3, - 0x41, 0x84, 0xe5, 0x85, 0xc5, 0x6c, 0x3c, 0x8f, 0xae, 0xdf, 0x98, 0x1a, 0xf6, 0x41, 0x2f, 0x6b, - 0xf5, 0x7c, 0xea, 0xe5, 0x8f, 0x4f, 0xf4, 0xfd, 0xc6, 0xaf, 0x4f, 0x48, 0x64, 0x64, 0x43, 0x01, - 0x1f, 0x81, 0x1e, 0x86, 0xbb, 0xd6, 0x16, 0xe6, 0x97, 0x4b, 0x73, 0xe5, 0xa5, 0xb5, 0x79, 0xb1, - 0x07, 0x2d, 0x46, 0x37, 0x72, 0xfd, 0xc6, 0xd4, 0x20, 0x1f, 0x52, 0x27, 0xe8, 0x55, 0xa5, 0x74, - 0x65, 0x65, 0xbd, 0x94, 0x95, 0x18, 0xf4, 0xaa, 0x85, 0xaf, 0x1a, 0x0e, 0xfb, 0x30, 0xde, 0xa3, - 0x70, 0xa4, 0x0d, 0xb4, 0x3b, 0xb0, 0xd1, 0xeb, 0x37, 0xa6, 0x86, 0x56, 0x2d, 0xcc, 0xec, 0x87, - 0x62, 0x4c, 0x43, 0xae, 0x15, 0x63, 0x65, 0x75, 0x65, 0x6d, 0x66, 0x31, 0x3b, 0x95, 0xcf, 0x5e, - 0xbf, 0x31, 0x95, 0x11, 0xce, 0x90, 0x1e, 0x01, 0xb8, 0x23, 0xbb, 0x93, 0x2b, 0x9e, 0x5f, 0x3c, - 0x05, 0xf7, 0x75, 0x38, 0x7d, 0x12, 0xe7, 0x16, 0xfb, 0x3a, 0x7f, 0xea, 0xb8, 0xcf, 0x9e, 0x8f, - 0xd8, 0x7e, 0x8e, 0x5e, 0x3a, 0xed, 0xff, 0x6c, 0x2b, 0xdf, 0x75, 0x71, 0x27, 0xbf, 0x4f, 0x82, - 0xe1, 0x4b, 0x9a, 0xed, 0x18, 0x96, 0x56, 0x51, 0xeb, 0xf4, 0x39, 0xd8, 0x99, 0x5e, 0x7d, 0x6b, - 0xc8, 0xd4, 0x9f, 0x84, 0xfe, 0xab, 0x6a, 0x9d, 0x39, 0xb5, 0x38, 0xfd, 0x7a, 0x4d, 0x87, 0xc3, - 0x20, 0xd7, 0xb5, 0x09, 0x02, 0x0c, 0x4d, 0xfe, 0x7a, 0x0c, 0x46, 0xa8, 0x31, 0xd8, 0xec, 0xbb, - 0x66, 0x64, 0x8d, 0xb5, 0x0a, 0x09, 0x4b, 0x75, 0xf8, 0xa6, 0x61, 0xf1, 0x8d, 0xfc, 0x94, 0xf2, - 0xfe, 0x1e, 0x4e, 0xd9, 0x5a, 0x0f, 0x32, 0x29, 0x25, 0xf4, 0x3c, 0xa4, 0x1a, 0xea, 0xb5, 0x32, - 0xa5, 0xca, 0xd6, 0x31, 0x2b, 0x7b, 0xa3, 0x7a, 0xeb, 0xe6, 0xe4, 0xc8, 0xae, 0xda, 0xa8, 0x17, - 0x64, 0x41, 0x47, 0x0e, 0x75, 0x34, 0xd0, 0x50, 0xaf, 0x11, 0xf6, 0xd1, 0xcf, 0xc3, 0x08, 0x81, - 0xa9, 0x6c, 0xab, 0x7a, 0x0d, 0xb3, 0x2e, 0xe9, 0xf6, 0x68, 0xf1, 0xca, 0x9e, 0xbb, 0x3c, 0xec, - 0x75, 0xe9, 0x23, 0x17, 0xee, 0x79, 0xa8, 0xa1, 0x5e, 0x9b, 0xa5, 0xcd, 0xa4, 0xff, 0x42, 0xea, - 0x83, 0xaf, 0x4c, 0xf6, 0xd1, 0x13, 0xe3, 0xaf, 0x49, 0x00, 0x9e, 0x6c, 0xd1, 0xcf, 0x40, 0xb6, - 0xe2, 0x96, 0x28, 0x25, 0x71, 0xbe, 0xf9, 0x40, 0xa7, 0x59, 0x0b, 0xcd, 0x0c, 0x8b, 0xe2, 0x5f, - 0xbd, 0x39, 0x29, 0x29, 0x23, 0x95, 0xd0, 0xa4, 0xbd, 0x0d, 0x06, 0x9b, 0x66, 0x55, 0x75, 0x70, - 0x99, 0xae, 0xf8, 0x62, 0x91, 0x19, 0xc1, 0x04, 0xa1, 0x75, 0xeb, 0xe6, 0x24, 0x62, 0x83, 0xf4, - 0x21, 0xcb, 0x34, 0x4f, 0x00, 0x56, 0x43, 0x10, 0x7c, 0x63, 0xfa, 0xb2, 0x04, 0x83, 0x73, 0xbe, - 0x2b, 0x9d, 0x39, 0x18, 0x68, 0x18, 0xba, 0xb6, 0xc3, 0x35, 0x37, 0xad, 0x88, 0x22, 0xca, 0x43, - 0x8a, 0xbd, 0xa5, 0x75, 0x76, 0xc5, 0xa6, 0xa9, 0x28, 0x13, 0xac, 0x17, 0xf0, 0xa6, 0xad, 0x89, - 0xb9, 0x51, 0x44, 0x11, 0x5d, 0x84, 0xac, 0x8d, 0x2b, 0x4d, 0x4b, 0x73, 0x76, 0xcb, 0x15, 0x43, - 0x77, 0xd4, 0x8a, 0xc3, 0x5e, 0x65, 0x16, 0x8f, 0xde, 0xba, 0x39, 0x79, 0x17, 0xe3, 0x35, 0x0c, - 0x21, 0x2b, 0x23, 0xa2, 0x6a, 0x96, 0xd5, 0x90, 0x1e, 0xaa, 0xd8, 0x51, 0xb5, 0xba, 0x9d, 0x63, - 0x57, 0x24, 0x44, 0xd1, 0x37, 0x96, 0xef, 0x0f, 0xf8, 0xb7, 0xc0, 0x7e, 0x0e, 0xb2, 0x86, 0x89, - 0xad, 0x40, 0xca, 0xca, 0x2c, 0xe0, 0x71, 0xaf, 0xe7, 0x30, 0x84, 0xdc, 0xf1, 0x7c, 0x74, 0x44, - 0x80, 0x8a, 0x34, 0xd7, 0x21, 0xd3, 0x2f, 0x96, 0x9a, 0x66, 0x73, 0xd3, 0xdb, 0x51, 0x1b, 0x6f, - 0x99, 0xa5, 0x19, 0x7d, 0xd7, 0xdf, 0x6b, 0x18, 0x4f, 0xfe, 0x8a, 0xd7, 0xab, 0xb7, 0xc3, 0x75, - 0x19, 0xef, 0x12, 0xb5, 0xe0, 0xa0, 0xab, 0x14, 0x92, 0x24, 0xae, 0xcf, 0xab, 0x5a, 0x5d, 0x7c, - 0x75, 0x40, 0xe1, 0x25, 0x54, 0x80, 0x7e, 0xdb, 0x51, 0x9d, 0xa6, 0xcd, 0x4f, 0x91, 0xe5, 0x4e, - 0x2a, 0x58, 0x34, 0xf4, 0xea, 0x1a, 0x85, 0x54, 0x38, 0x06, 0x5a, 0x87, 0x7e, 0x7e, 0x3c, 0x9f, - 0xdc, 0xb3, 0x87, 0x68, 0x73, 0x7f, 0x83, 0xd1, 0x42, 0xef, 0x96, 0x20, 0x5b, 0xc5, 0x75, 0x5c, - 0x63, 0x79, 0xda, 0xb6, 0x4a, 0x96, 0x33, 0xf4, 0x0b, 0x81, 0xc5, 0x67, 0xf6, 0x6c, 0xb9, 0x5c, - 0x70, 0x61, 0x7a, 0x61, 0xd3, 0x1d, 0x71, 0x01, 0xd6, 0x68, 0x3b, 0xba, 0x1c, 0xb8, 0xb0, 0xcc, - 0x3f, 0xaa, 0x79, 0x6f, 0x27, 0xd9, 0xf8, 0x0c, 0x41, 0x6c, 0x7f, 0xf8, 0xaf, 0x3b, 0x5f, 0x84, - 0x6c, 0x53, 0xdf, 0x34, 0x74, 0xfa, 0x6e, 0x98, 0x2f, 0x1f, 0xc8, 0xf2, 0x31, 0xee, 0xd7, 0xe5, - 0x30, 0x84, 0xac, 0x8c, 0xb8, 0x55, 0x97, 0xd8, 0x22, 0xa3, 0x0a, 0xc3, 0x1e, 0x14, 0xb5, 0xee, - 0x74, 0xa4, 0x75, 0xdf, 0xc3, 0xad, 0xfb, 0x50, 0xb8, 0x17, 0xcf, 0xc0, 0x87, 0xdc, 0x4a, 0x82, - 0x86, 0x2e, 0x01, 0x78, 0x3e, 0x85, 0x6e, 0x83, 0x0c, 0x76, 0xd6, 0x0a, 0xcf, 0x31, 0x89, 0xe5, - 0xa4, 0x87, 0x8b, 0xae, 0x4b, 0x30, 0xd6, 0xd0, 0xf4, 0xb2, 0x8d, 0xeb, 0x5b, 0x65, 0x2e, 0x61, - 0x42, 0x93, 0x7e, 0xf7, 0xa9, 0xf8, 0xdc, 0xde, 0xb4, 0xe5, 0xd6, 0xcd, 0xc9, 0x3c, 0x77, 0xc3, - 0xad, 0x24, 0xe5, 0x90, 0x2e, 0x8d, 0x36, 0x34, 0x7d, 0x0d, 0xd7, 0xb7, 0xe6, 0x5c, 0x88, 0x42, - 0xe6, 0xe5, 0x57, 0x26, 0xfb, 0xb8, 0xc9, 0xf7, 0xc9, 0xab, 0x74, 0xa7, 0x9e, 0x9b, 0x24, 0xb6, - 0xd1, 0x19, 0x48, 0xab, 0xa2, 0x10, 0x79, 0xe5, 0xc1, 0x03, 0x65, 0x4e, 0xe4, 0xa5, 0x6f, 0x4c, - 0x49, 0xf2, 0x37, 0x24, 0xe8, 0x9f, 0xbb, 0xb2, 0xaa, 0x6a, 0x16, 0x52, 0x61, 0xd4, 0x53, 0xb8, - 0xa0, 0x0b, 0x79, 0xe2, 0xd6, 0xcd, 0xc9, 0x5c, 0x58, 0x27, 0x23, 0x7d, 0x88, 0x67, 0x0f, 0xc2, - 0x89, 0xa8, 0x9d, 0x16, 0xd6, 0x81, 0x2e, 0x5a, 0x40, 0xba, 0x74, 0x11, 0x5e, 0x8e, 0x87, 0x04, - 0x56, 0x82, 0x01, 0x36, 0x3a, 0x1b, 0x15, 0x20, 0x69, 0x92, 0x1f, 0xfc, 0x40, 0x63, 0xa2, 0xa3, - 0x55, 0x50, 0x78, 0x77, 0x03, 0x96, 0xa0, 0x90, 0x34, 0x03, 0xe6, 0xae, 0x5c, 0x59, 0xb7, 0x34, - 0xb3, 0x8e, 0x9d, 0xd7, 0x43, 0x52, 0x75, 0x38, 0xe4, 0x5b, 0xf5, 0x59, 0x95, 0x90, 0xb4, 0xce, - 0xdd, 0xba, 0x39, 0x79, 0x2c, 0x2c, 0x2d, 0x1f, 0x58, 0xe7, 0xae, 0xc6, 0xbc, 0x75, 0xa1, 0x55, - 0x69, 0xdb, 0x5b, 0xd5, 0x76, 0xdc, 0xde, 0xe2, 0x9d, 0x7b, 0xf3, 0x81, 0xf5, 0xd2, 0xdb, 0x9c, - 0xed, 0xb4, 0x9f, 0xa2, 0x35, 0x18, 0xf4, 0x44, 0x6b, 0xa3, 0x39, 0x48, 0x39, 0xfc, 0x37, 0x9f, - 0x29, 0xb9, 0xf3, 0x4c, 0x09, 0x34, 0x3e, 0x5b, 0x2e, 0xa6, 0xfc, 0x79, 0x32, 0x61, 0xae, 0x15, - 0xfd, 0x64, 0xa8, 0x36, 0x09, 0x5c, 0x3c, 0xae, 0xc4, 0x0f, 0x20, 0xb5, 0xe5, 0xb4, 0x42, 0xb3, - 0xf1, 0xfb, 0x31, 0x18, 0xdb, 0x10, 0x8e, 0xf5, 0x27, 0x4e, 0x82, 0xab, 0x30, 0x80, 0x75, 0xc7, - 0xd2, 0xa8, 0x08, 0x89, 0x6e, 0x3d, 0xda, 0x49, 0xb7, 0xda, 0xc8, 0x80, 0x7e, 0x07, 0x4c, 0x1c, - 0x71, 0x70, 0x32, 0x21, 0xe9, 0x7d, 0x3a, 0x0e, 0xb9, 0x4e, 0x98, 0x68, 0x16, 0x46, 0x2a, 0x16, - 0x66, 0x17, 0xe0, 0xfc, 0xfb, 0xac, 0xc5, 0xbc, 0x97, 0xab, 0x87, 0x00, 0x64, 0x65, 0x58, 0xd4, - 0xf0, 0x60, 0x5a, 0x03, 0x92, 0x3a, 0x13, 0x25, 0xa7, 0xf7, 0xe8, 0x7a, 0xcb, 0x95, 0x65, 0x1e, - 0x4d, 0x45, 0x27, 0x41, 0x02, 0x2c, 0x9c, 0x0e, 0x7b, 0xb5, 0x34, 0x9e, 0xfe, 0xff, 0x30, 0xa2, - 0xe9, 0x9a, 0xa3, 0xa9, 0xf5, 0xf2, 0xa6, 0x5a, 0x57, 0xf5, 0xca, 0x7e, 0xd6, 0x21, 0x2c, 0x00, - 0xf2, 0x6e, 0x43, 0xe4, 0xc2, 0xc1, 0x6f, 0x98, 0xb7, 0x17, 0x59, 0x33, 0xba, 0x02, 0x03, 0xa2, - 0xe3, 0xc4, 0x01, 0xe4, 0x69, 0x82, 0x98, 0x2f, 0x81, 0xfe, 0xcd, 0x38, 0x8c, 0x2a, 0xb8, 0xfa, - 0xd3, 0x69, 0xba, 0x9d, 0x69, 0x7a, 0x1b, 0x00, 0x73, 0x24, 0x24, 0x20, 0xec, 0x63, 0xa6, 0x5a, - 0x1d, 0x53, 0x9a, 0xd1, 0x9b, 0xb3, 0x1d, 0xdf, 0x5c, 0x7d, 0x22, 0x0e, 0x19, 0xff, 0x5c, 0xfd, - 0x34, 0x06, 0xdf, 0x56, 0x0c, 0x46, 0x0b, 0x9e, 0x27, 0x4c, 0xf0, 0xaf, 0x37, 0x77, 0xf0, 0x84, - 0x2d, 0x16, 0xd2, 0xdd, 0x05, 0xfe, 0xcf, 0x18, 0xf4, 0xaf, 0xaa, 0x96, 0xda, 0xb0, 0x51, 0xa5, - 0x25, 0xf1, 0x17, 0x9b, 0xcd, 0x2d, 0xdf, 0xe8, 0xe7, 0x7b, 0x5b, 0x11, 0x79, 0xff, 0x07, 0xdb, - 0xe4, 0xfd, 0x6f, 0x81, 0xe1, 0x86, 0x7a, 0xcd, 0x77, 0x66, 0x4a, 0x67, 0x67, 0xa8, 0x78, 0xc4, - 0xa3, 0x12, 0x6c, 0x97, 0xe9, 0x8e, 0xc7, 0x15, 0xff, 0x8d, 0x95, 0x41, 0x02, 0xe1, 0x05, 0x06, - 0x82, 0x7e, 0xd8, 0xdb, 0x5a, 0xf0, 0x35, 0xca, 0x0a, 0x34, 0xd4, 0x6b, 0x25, 0x56, 0x40, 0x8b, - 0x80, 0xb6, 0xdd, 0x7d, 0xb0, 0xb2, 0x27, 0x4e, 0x82, 0x7f, 0xf7, 0xad, 0x9b, 0x93, 0x47, 0x18, - 0x7e, 0x2b, 0x8c, 0xac, 0x8c, 0x7a, 0x95, 0x82, 0xda, 0x13, 0x00, 0x64, 0x5c, 0x65, 0x76, 0xe9, - 0x9f, 0x2d, 0x4d, 0x0f, 0xdd, 0xba, 0x39, 0x39, 0xca, 0xa8, 0x78, 0x6d, 0xb2, 0x92, 0x26, 0x85, - 0x39, 0xf2, 0xdb, 0x67, 0x21, 0x1f, 0x97, 0x00, 0x79, 0x21, 0x47, 0xc1, 0xb6, 0x49, 0xd6, 0xd2, - 0x64, 0x5d, 0xe4, 0x5b, 0xc3, 0x48, 0xdd, 0xd7, 0x45, 0x1e, 0xbe, 0x58, 0x17, 0xf9, 0x2c, 0xee, - 0xbc, 0xe7, 0x90, 0x63, 0x51, 0xf7, 0xda, 0xb9, 0x8a, 0x84, 0x7d, 0x6e, 0x9f, 0xfc, 0x75, 0x09, - 0x8e, 0xb4, 0x68, 0x94, 0xcb, 0xec, 0xcf, 0x01, 0xb2, 0x7c, 0x8d, 0xfc, 0x53, 0x9c, 0x8c, 0xe9, - 0x3d, 0x2b, 0xe8, 0xa8, 0xd5, 0xe2, 0xdb, 0xef, 0x54, 0x4c, 0x61, 0x4f, 0x2c, 0xfe, 0x95, 0x04, - 0xe3, 0x7e, 0x66, 0xdc, 0x61, 0x2d, 0x43, 0xc6, 0xcf, 0x0b, 0x1f, 0xd0, 0x7d, 0xbd, 0x0c, 0x88, - 0x8f, 0x25, 0x80, 0x8f, 0x9e, 0xf6, 0x8c, 0x97, 0xed, 0x9b, 0x3e, 0xd6, 0xb3, 0x6c, 0x04, 0x4f, - 0x61, 0x23, 0x4e, 0xd0, 0xd9, 0xf9, 0x48, 0x0c, 0x12, 0xab, 0x86, 0x51, 0x47, 0xef, 0x84, 0x51, - 0xdd, 0x70, 0xca, 0x44, 0xcf, 0x70, 0xd5, 0xff, 0x9a, 0x21, 0x5d, 0x7c, 0x7a, 0x6f, 0x22, 0xfb, - 0xee, 0xcd, 0xc9, 0x56, 0x52, 0x21, 0x39, 0x8e, 0xe8, 0x86, 0x53, 0xa4, 0xed, 0xfc, 0x79, 0xc3, - 0x75, 0x09, 0x86, 0x82, 0x7d, 0x33, 0x97, 0x8b, 0xf7, 0xdc, 0x77, 0x90, 0xcc, 0xad, 0x9b, 0x93, - 0xe3, 0x9e, 0x39, 0xb9, 0xd5, 0xe1, 0x18, 0x97, 0xd9, 0xf4, 0x31, 0xc3, 0xee, 0xfd, 0x7d, 0xff, - 0x95, 0x49, 0xe9, 0xc4, 0xe7, 0x25, 0x00, 0x6f, 0x43, 0x09, 0x3d, 0x0c, 0x77, 0x15, 0x57, 0x96, - 0xe7, 0xca, 0x6b, 0xeb, 0x33, 0xeb, 0x1b, 0x6b, 0xc1, 0xcb, 0xff, 0xe2, 0xdc, 0xc4, 0x36, 0x71, - 0x45, 0xdb, 0xd2, 0x70, 0x15, 0xdd, 0x0f, 0xe3, 0x41, 0x68, 0x52, 0x2a, 0xcd, 0x65, 0xa5, 0x7c, - 0xe6, 0xfa, 0x8d, 0xa9, 0x14, 0x4b, 0x1b, 0x71, 0x15, 0x1d, 0x87, 0x43, 0xad, 0x70, 0x0b, 0xcb, - 0xf3, 0xd9, 0x58, 0x7e, 0xe8, 0xfa, 0x8d, 0xa9, 0xb4, 0x9b, 0x5f, 0x22, 0x19, 0x90, 0x1f, 0x92, - 0xd3, 0x8b, 0xe7, 0xe1, 0xfa, 0x8d, 0xa9, 0x7e, 0x26, 0xcf, 0x7c, 0xe2, 0xe5, 0x8f, 0x4f, 0xf4, - 0x1d, 0xf8, 0x13, 0x81, 0x4f, 0xa4, 0x3a, 0x1e, 0x87, 0xd4, 0xb0, 0x8e, 0x6d, 0xcd, 0xde, 0xd7, - 0x71, 0x48, 0x4f, 0x47, 0x2c, 0xdd, 0x5e, 0x65, 0xfd, 0x49, 0x12, 0x32, 0xf3, 0x8c, 0x01, 0x32, - 0x47, 0x18, 0xbd, 0x11, 0xfa, 0x4d, 0x1a, 0x8c, 0xdc, 0xa3, 0xd7, 0x0e, 0x86, 0xc2, 0x42, 0x96, - 0x7b, 0xff, 0x8f, 0x05, 0x30, 0x9b, 0x5f, 0x00, 0x62, 0xf7, 0x12, 0xbd, 0x9b, 0x76, 0x99, 0xe2, - 0xc2, 0x9e, 0xb3, 0x2b, 0xbe, 0x5f, 0x16, 0xa6, 0x27, 0xb3, 0xbb, 0x44, 0xeb, 0xa4, 0x86, 0xdd, - 0x28, 0xfc, 0x05, 0x09, 0x0e, 0x51, 0x28, 0x2f, 0xcc, 0x53, 0x48, 0xb1, 0x64, 0x39, 0xd1, 0x69, - 0x08, 0x8b, 0xaa, 0xed, 0xdd, 0x0f, 0x62, 0x77, 0x00, 0xef, 0xe3, 0xe1, 0xf4, 0x98, 0xaf, 0xf3, - 0x30, 0x59, 0x59, 0x19, 0xab, 0xb7, 0x60, 0xda, 0x68, 0x3e, 0x70, 0x09, 0x34, 0xb1, 0xb7, 0xe3, - 0x19, 0xff, 0x85, 0xd0, 0xa7, 0x60, 0xd0, 0xf3, 0x41, 0x36, 0xff, 0x07, 0x44, 0xbd, 0x47, 0x20, - 0x3f, 0x32, 0x7a, 0xaf, 0x04, 0x87, 0xbc, 0x9c, 0xc0, 0x4f, 0x96, 0xfd, 0xa3, 0xa6, 0x87, 0xf6, - 0xb0, 0x9c, 0x0b, 0x0b, 0xa7, 0x2d, 0x5d, 0x59, 0x19, 0x6f, 0xb6, 0xa2, 0x92, 0x85, 0xe4, 0x90, - 0xdf, 0x23, 0xdb, 0x39, 0xf1, 0x2d, 0xd2, 0xde, 0x5d, 0x7a, 0x90, 0x00, 0xfb, 0xe7, 0x31, 0xa6, - 0x61, 0x39, 0xb8, 0x4a, 0x77, 0x59, 0x53, 0x8a, 0x5b, 0x96, 0xb7, 0x01, 0xb5, 0x4e, 0x6e, 0xf0, - 0xb5, 0x93, 0xd4, 0xd3, 0x6b, 0x27, 0x34, 0x0e, 0x49, 0xff, 0x85, 0x51, 0x56, 0x28, 0xa4, 0x5e, - 0xe6, 0xe1, 0xf9, 0xc0, 0x1d, 0xc5, 0x37, 0x63, 0x70, 0xc2, 0x7f, 0xd8, 0xf8, 0xf6, 0x26, 0xb6, - 0x76, 0x5d, 0xbb, 0x36, 0xd5, 0x9a, 0xa6, 0xfb, 0xdf, 0xd4, 0x1c, 0xf1, 0x27, 0x14, 0x14, 0x56, - 0x48, 0x50, 0x7e, 0x59, 0x82, 0xc1, 0x55, 0xb5, 0x86, 0x15, 0xfc, 0xf6, 0x26, 0xb6, 0x9d, 0x36, - 0x6f, 0x16, 0x0e, 0x43, 0xbf, 0xb1, 0xb5, 0x25, 0x6e, 0x48, 0x24, 0x14, 0x5e, 0x22, 0x63, 0xae, - 0x6b, 0x0d, 0x8d, 0x5d, 0x2e, 0x4c, 0x28, 0xac, 0x80, 0x26, 0x61, 0xb0, 0x62, 0x34, 0x75, 0x6e, - 0x8c, 0xb9, 0x84, 0xf8, 0x1c, 0x50, 0x53, 0x67, 0xc6, 0x88, 0x72, 0x30, 0x60, 0xe1, 0xab, 0xd8, - 0xb2, 0xd9, 0x07, 0x50, 0x53, 0x8a, 0x28, 0xca, 0x4f, 0x42, 0x86, 0x71, 0xc2, 0xc3, 0xfb, 0x11, - 0x48, 0xd1, 0x7b, 0x7b, 0x1e, 0x3f, 0x03, 0xa4, 0x7c, 0x99, 0xbd, 0x7c, 0x60, 0xf4, 0x19, 0x4b, - 0xac, 0x50, 0x2c, 0x76, 0x94, 0xf2, 0xf1, 0x68, 0x7f, 0xc2, 0x64, 0xe8, 0x4a, 0xf8, 0x0f, 0x93, - 0x70, 0x88, 0x1f, 0x05, 0xab, 0xa6, 0x76, 0x72, 0xdb, 0x71, 0xc4, 0x4b, 0x1c, 0xe0, 0x59, 0xb6, - 0x6a, 0x6a, 0xf2, 0x2e, 0x24, 0x2e, 0x39, 0x8e, 0x89, 0x4e, 0x40, 0xd2, 0x6a, 0xd6, 0xb1, 0xd8, - 0x5a, 0x73, 0x8f, 0x6e, 0x54, 0x53, 0x9b, 0x26, 0x00, 0x4a, 0xb3, 0x8e, 0x15, 0x06, 0x82, 0x4a, - 0x30, 0xb9, 0xd5, 0xac, 0xd7, 0x77, 0xcb, 0x55, 0x4c, 0xff, 0xa3, 0x9b, 0xfb, 0x3f, 0x51, 0xf0, - 0x35, 0x53, 0x15, 0x5f, 0x56, 0x25, 0x82, 0x39, 0x46, 0xc1, 0xe6, 0x28, 0x94, 0xf8, 0x7f, 0x28, - 0x25, 0x01, 0x23, 0xff, 0x79, 0x0c, 0x52, 0x82, 0x34, 0x7d, 0x8a, 0x80, 0xeb, 0xb8, 0xe2, 0x18, - 0xe2, 0xc0, 0xcd, 0x2d, 0x23, 0x04, 0xf1, 0x1a, 0x9f, 0xbc, 0xf4, 0xa5, 0x3e, 0x85, 0x14, 0x48, - 0x9d, 0xfb, 0x40, 0x84, 0xd4, 0x99, 0x4d, 0x32, 0x9f, 0x09, 0xd3, 0x10, 0x6b, 0xcd, 0x4b, 0x7d, - 0x0a, 0x2d, 0xa1, 0x1c, 0xf4, 0x13, 0x73, 0x72, 0xd8, 0x6c, 0x91, 0x7a, 0x5e, 0x46, 0x87, 0x21, - 0x69, 0xaa, 0x4e, 0x85, 0xdd, 0xdd, 0x24, 0x0d, 0xac, 0x88, 0xce, 0x42, 0x3f, 0xfb, 0x70, 0x40, - 0xf8, 0xdf, 0x25, 0x11, 0x61, 0xb0, 0x2f, 0x34, 0x12, 0xbe, 0x57, 0x55, 0xc7, 0xc1, 0x96, 0x4e, - 0x08, 0x32, 0x70, 0x84, 0x20, 0xb1, 0x69, 0x54, 0x77, 0xf9, 0xbf, 0x70, 0xa2, 0xbf, 0xf9, 0xff, - 0x8c, 0xa1, 0xfa, 0x50, 0xa6, 0x8d, 0xec, 0x3f, 0xd7, 0x65, 0x44, 0x65, 0x91, 0x00, 0x95, 0x60, - 0x4c, 0xad, 0x56, 0x35, 0xf6, 0xdf, 0x94, 0xca, 0x9b, 0x1a, 0x75, 0x2b, 0x36, 0xfd, 0xbf, 0x84, - 0x9d, 0xe6, 0x02, 0x79, 0x08, 0x45, 0x0e, 0x5f, 0x4c, 0xc3, 0x80, 0xc9, 0x98, 0x92, 0x2f, 0xc0, - 0x68, 0x0b, 0xa7, 0x84, 0xbf, 0x1d, 0x4d, 0xaf, 0x8a, 0x57, 0x33, 0xe4, 0x37, 0xa9, 0xa3, 0xdf, - 0x54, 0x65, 0x47, 0x99, 0xf4, 0x77, 0xf1, 0xdd, 0x9d, 0x1f, 0x57, 0x0d, 0xfb, 0x1e, 0x57, 0xa9, - 0xa6, 0x56, 0x4c, 0x53, 0xfa, 0xfc, 0x49, 0xd5, 0x4c, 0xeb, 0x93, 0xaa, 0x1a, 0xd6, 0x45, 0x34, - 0x27, 0x4d, 0xaa, 0xa9, 0xd9, 0x54, 0x1d, 0xbd, 0x6f, 0xbc, 0xda, 0x17, 0x7c, 0xbf, 0xe9, 0x0b, - 0xab, 0xc4, 0xfc, 0xcc, 0xea, 0x82, 0xab, 0xc7, 0x5f, 0x8c, 0xc1, 0x31, 0x9f, 0x1e, 0xfb, 0x80, - 0x5b, 0xd5, 0x39, 0xdf, 0x5e, 0xe3, 0x7b, 0x78, 0x3e, 0x7f, 0x19, 0x12, 0x04, 0x1e, 0x45, 0xfc, - 0x47, 0x97, 0xdc, 0x67, 0xbe, 0xf2, 0x2f, 0xe5, 0xe0, 0xe1, 0x66, 0x60, 0x56, 0x28, 0x91, 0xe2, - 0x7b, 0x7b, 0x97, 0x5f, 0xd6, 0xfb, 0xbc, 0xad, 0x7d, 0x70, 0x62, 0x0c, 0xcb, 0xf0, 0xe5, 0xf3, - 0x1d, 0xdf, 0x48, 0x33, 0x67, 0xda, 0x3d, 0x29, 0xdb, 0x83, 0xa7, 0xee, 0xf4, 0xd0, 0xa4, 0xdb, - 0x0c, 0xde, 0x7e, 0x7a, 0x77, 0x0d, 0x0e, 0x3f, 0x4d, 0xd8, 0xf2, 0x16, 0xef, 0x22, 0x1a, 0x1c, - 0x76, 0xcf, 0x83, 0x25, 0xfe, 0x45, 0x01, 0x96, 0xa2, 0x5f, 0x04, 0xf0, 0x58, 0xe7, 0xcb, 0xd6, - 0xfb, 0xa7, 0x3b, 0x46, 0x99, 0x69, 0x5f, 0x84, 0x51, 0x7c, 0x98, 0xf2, 0xa7, 0x25, 0xb8, 0xab, - 0xa5, 0x6b, 0xee, 0xfe, 0xe7, 0xdb, 0x3c, 0x97, 0xd9, 0x57, 0xa6, 0x34, 0xdf, 0x86, 0xd9, 0x07, - 0x22, 0x99, 0x65, 0x5c, 0x04, 0xb8, 0x7d, 0x16, 0x0e, 0x05, 0x99, 0x15, 0x62, 0x7a, 0x12, 0x86, - 0x83, 0xfb, 0xe7, 0x91, 0x99, 0xc3, 0x50, 0x60, 0x0f, 0x5d, 0x2e, 0x87, 0x67, 0xc0, 0x95, 0x42, - 0x09, 0xd2, 0x2e, 0x28, 0x4f, 0xb6, 0x7b, 0x16, 0x82, 0x87, 0x49, 0x04, 0x3d, 0x15, 0xec, 0xc1, - 0x97, 0x76, 0x1d, 0xd4, 0x30, 0x0e, 0x4c, 0x2d, 0xbe, 0x23, 0xc1, 0x3d, 0x5d, 0xb8, 0xe5, 0xa2, - 0x79, 0x11, 0xc6, 0x7d, 0x7b, 0x1a, 0x22, 0x22, 0x08, 0x55, 0x39, 0x11, 0x9d, 0x0a, 0xbb, 0x8b, - 0xf6, 0xa3, 0x44, 0x5c, 0x9f, 0xfa, 0xe6, 0xe4, 0x58, 0x6b, 0x9b, 0xad, 0x8c, 0xb5, 0xee, 0x3c, - 0x1c, 0xa0, 0x4e, 0xbd, 0x2a, 0xc1, 0x83, 0xc1, 0xa1, 0xb6, 0xc9, 0xa9, 0x7f, 0xfc, 0x66, 0xe8, - 0xeb, 0x12, 0x9c, 0xe8, 0x85, 0x6d, 0x3e, 0x55, 0x9b, 0x30, 0xe6, 0xad, 0x03, 0xc2, 0x33, 0xb5, - 0xa7, 0xd5, 0x05, 0xd3, 0x6c, 0xe4, 0x52, 0xbb, 0x03, 0x53, 0xf2, 0xeb, 0x12, 0xb7, 0x46, 0xbf, - 0x36, 0xb8, 0xf2, 0x0f, 0x6e, 0x7d, 0x47, 0xcb, 0x3f, 0xb0, 0xfd, 0xdd, 0x66, 0x02, 0x63, 0x7b, - 0x9a, 0x40, 0x6f, 0x4d, 0x21, 0x5f, 0xe5, 0xae, 0xb3, 0xcd, 0xe6, 0xe4, 0xdb, 0x60, 0xac, 0x8d, - 0x65, 0x70, 0xf7, 0xb1, 0x07, 0xc3, 0x50, 0x50, 0xab, 0xee, 0xcb, 0xbf, 0x2d, 0xc1, 0x24, 0xed, - 0xb8, 0xcd, 0xf4, 0xfc, 0x38, 0xca, 0xa9, 0xc1, 0x3d, 0x5f, 0x5b, 0x76, 0xb9, 0xc0, 0x16, 0xa0, - 0x9f, 0x69, 0x14, 0x97, 0xd1, 0x3e, 0x54, 0x92, 0x13, 0x90, 0x7f, 0x57, 0x78, 0xda, 0x39, 0x31, - 0xa0, 0xf6, 0x76, 0x7c, 0x7b, 0xf2, 0x39, 0x20, 0x3b, 0xf6, 0x89, 0xe9, 0x6b, 0xc2, 0xe7, 0xb6, - 0xe7, 0x9b, 0x0b, 0xaa, 0x72, 0x60, 0x3e, 0x97, 0x49, 0xed, 0xce, 0x3a, 0xd7, 0x3f, 0x10, 0xce, - 0xd5, 0x1d, 0x53, 0x84, 0x73, 0xfd, 0x71, 0x9b, 0x14, 0xd7, 0xcd, 0x46, 0x0c, 0xe0, 0x6f, 0xa2, - 0x9b, 0xfd, 0x83, 0x18, 0x1c, 0xa1, 0x63, 0xf3, 0x6f, 0xe2, 0x1c, 0xe4, 0x64, 0x20, 0xdb, 0xaa, - 0x94, 0xf7, 0xe8, 0x45, 0xb2, 0xb6, 0x55, 0xb9, 0x12, 0x8a, 0x98, 0xa8, 0x1a, 0xd8, 0xde, 0xa3, - 0x74, 0xe2, 0x51, 0x74, 0xaa, 0xbe, 0x7d, 0xa5, 0x36, 0xca, 0x91, 0x38, 0x00, 0xe5, 0xf8, 0xaa, - 0x04, 0xf9, 0x76, 0x02, 0xe4, 0xca, 0xa0, 0xc1, 0xe1, 0xc0, 0xa1, 0x4f, 0x58, 0x1f, 0x1e, 0xee, - 0x65, 0x53, 0x2d, 0x64, 0xae, 0x87, 0x2c, 0x7c, 0xa7, 0xb3, 0xa1, 0xc9, 0xa0, 0xbe, 0xb7, 0xae, - 0x49, 0x7e, 0x0c, 0xcd, 0xf4, 0xd5, 0x16, 0x9f, 0xff, 0x37, 0x62, 0x3d, 0xf3, 0x5b, 0x12, 0x4c, - 0x74, 0x60, 0xfb, 0xc7, 0x31, 0x90, 0x6f, 0x77, 0xd4, 0x8d, 0x83, 0x5e, 0x2d, 0x3d, 0xc1, 0x0d, - 0x2b, 0xf8, 0x1c, 0xc3, 0xb7, 0x28, 0x6e, 0xf7, 0x9e, 0x53, 0x7e, 0x2b, 0x1c, 0x6d, 0x8b, 0xc5, - 0x79, 0x2b, 0x40, 0x62, 0x5b, 0xb3, 0x1d, 0xce, 0xd6, 0xfd, 0x9d, 0xd8, 0x0a, 0x61, 0x53, 0x1c, - 0x19, 0x41, 0x96, 0x92, 0x5e, 0x35, 0x8c, 0x3a, 0x67, 0x43, 0xbe, 0x0c, 0xa3, 0xbe, 0x3a, 0xde, - 0xc9, 0x19, 0x48, 0x98, 0x06, 0xff, 0x56, 0xc9, 0xe0, 0xa9, 0x63, 0x1d, 0x8f, 0x65, 0x0c, 0xa3, - 0xce, 0x87, 0x4d, 0xe1, 0xe5, 0x71, 0x40, 0x8c, 0x18, 0x3d, 0xa1, 0x11, 0x5d, 0xac, 0xc1, 0x58, - 0xa0, 0x96, 0x77, 0x72, 0x5b, 0xa7, 0x3f, 0xa7, 0xbe, 0x7b, 0x08, 0x92, 0x94, 0x2a, 0xfa, 0x90, - 0x14, 0xf8, 0xcc, 0xd8, 0x74, 0x27, 0x32, 0xed, 0x37, 0x27, 0xf2, 0x27, 0x7b, 0x86, 0xe7, 0x99, - 0xeb, 0x89, 0x77, 0xff, 0xbb, 0x6f, 0x7f, 0x20, 0x76, 0x1f, 0x92, 0x4f, 0x76, 0xd8, 0x31, 0xf1, - 0x19, 0xd9, 0x27, 0x03, 0x1f, 0xc2, 0x78, 0xa4, 0xb7, 0xae, 0x04, 0x67, 0xd3, 0xbd, 0x82, 0x73, - 0xc6, 0x2e, 0x50, 0xc6, 0x4e, 0xa3, 0xc7, 0xa3, 0x19, 0x3b, 0xf9, 0x8e, 0xa0, 0x39, 0xbd, 0x13, - 0xfd, 0x89, 0x04, 0xe3, 0xed, 0xd6, 0xc9, 0xe8, 0x5c, 0x6f, 0x5c, 0xb4, 0x66, 0x42, 0xf9, 0xf3, - 0xfb, 0xc0, 0xe4, 0x43, 0x99, 0xa7, 0x43, 0x99, 0x41, 0x4f, 0xee, 0x63, 0x28, 0x27, 0xfd, 0x07, - 0x37, 0xff, 0x47, 0x82, 0xbb, 0xbb, 0x2e, 0x2e, 0xd1, 0x4c, 0x6f, 0x5c, 0x76, 0x49, 0xf9, 0xf2, - 0xc5, 0xdb, 0x21, 0xc1, 0x47, 0xfc, 0x34, 0x1d, 0xf1, 0x65, 0xb4, 0xb0, 0x9f, 0x11, 0xb7, 0x3d, - 0x1d, 0x43, 0x7f, 0x24, 0x05, 0xae, 0xd9, 0x76, 0x57, 0xa7, 0x96, 0xd5, 0x57, 0x84, 0x61, 0xb4, - 0xe6, 0xe2, 0xf2, 0xb3, 0x74, 0x08, 0x0a, 0x5a, 0xbd, 0xcd, 0x49, 0x3b, 0xf9, 0x8e, 0x60, 0xb0, - 0x78, 0x27, 0xfa, 0x5f, 0x52, 0xfb, 0x7b, 0xaf, 0x67, 0xbb, 0xb2, 0xd8, 0x79, 0x65, 0x99, 0x3f, - 0xb7, 0x77, 0x44, 0x3e, 0xc8, 0x06, 0x1d, 0x64, 0x0d, 0xe1, 0x83, 0x1e, 0x64, 0xdb, 0x49, 0x44, - 0x5f, 0x96, 0x60, 0xbc, 0xdd, 0x52, 0x2a, 0xc2, 0x2c, 0xbb, 0xac, 0x1a, 0x23, 0xcc, 0xb2, 0xdb, - 0xba, 0x4d, 0x7e, 0x23, 0x1d, 0xfc, 0x19, 0xf4, 0x44, 0xa7, 0xc1, 0x77, 0x9d, 0x45, 0x62, 0x8b, - 0x5d, 0x57, 0x20, 0x11, 0xb6, 0xd8, 0xcb, 0xf2, 0x2b, 0xc2, 0x16, 0x7b, 0x5a, 0x00, 0x45, 0xdb, - 0xa2, 0x3b, 0xb2, 0x1e, 0xa7, 0xd1, 0x46, 0x5f, 0x94, 0x60, 0x28, 0x90, 0x60, 0xa3, 0xc7, 0xba, - 0x32, 0xda, 0x6e, 0x35, 0x93, 0x3f, 0xb5, 0x17, 0x14, 0x3e, 0x96, 0x05, 0x3a, 0x96, 0x59, 0x34, - 0xb3, 0x9f, 0xb1, 0x04, 0x0f, 0xc1, 0xbf, 0x2a, 0xc1, 0x58, 0x9b, 0xd4, 0x34, 0xc2, 0x0a, 0x3b, - 0xe7, 0xe0, 0xf9, 0x73, 0x7b, 0x47, 0xe4, 0xa3, 0xba, 0x48, 0x47, 0xf5, 0x16, 0xf4, 0xe6, 0xfd, - 0x8c, 0xca, 0x17, 0x9f, 0x6f, 0x7a, 0xd7, 0xf2, 0x7c, 0xfd, 0xa0, 0x33, 0x7b, 0x64, 0x4c, 0x0c, - 0xe8, 0xec, 0x9e, 0xf1, 0xf8, 0x78, 0x9e, 0xa1, 0xe3, 0x79, 0x1a, 0xad, 0xdc, 0xde, 0x78, 0x5a, - 0xc3, 0xfa, 0xe7, 0x5a, 0x9f, 0x03, 0x77, 0xd7, 0xa2, 0xb6, 0xc9, 0x6a, 0xfe, 0xf1, 0x3d, 0xe1, - 0xf0, 0x41, 0x9d, 0xa3, 0x83, 0x3a, 0x85, 0x1e, 0xed, 0x34, 0x28, 0xdf, 0xdd, 0x4b, 0x4d, 0xdf, - 0x32, 0x4e, 0xbe, 0x83, 0xa5, 0xc0, 0xef, 0x44, 0xef, 0x92, 0xf8, 0x4d, 0xb7, 0xe3, 0x5d, 0xfb, - 0xf5, 0xe5, 0xb1, 0xf9, 0x07, 0x7b, 0x80, 0xe4, 0x7c, 0xdd, 0x47, 0xf9, 0x9a, 0x40, 0xc7, 0x3a, - 0xf1, 0x45, 0x72, 0x59, 0xf4, 0x3e, 0xc9, 0xbd, 0x2a, 0x7b, 0xa2, 0x3b, 0x6d, 0x7f, 0xb2, 0x9b, - 0x7f, 0xa8, 0x27, 0x58, 0xce, 0xc9, 0xfd, 0x94, 0x93, 0x29, 0x34, 0xd1, 0x91, 0x13, 0x96, 0xfa, - 0x1e, 0xf8, 0x0d, 0xb1, 0x23, 0x30, 0xd9, 0xa1, 0x47, 0xe7, 0x5a, 0xc4, 0x39, 0x64, 0x97, 0x57, - 0xf1, 0x91, 0xaf, 0xde, 0x0f, 0xfa, 0x3b, 0xcf, 0xbd, 0x1d, 0x5a, 0xca, 0xbf, 0x98, 0x04, 0xb4, - 0x64, 0xd7, 0x66, 0x2d, 0xcc, 0xfe, 0x5d, 0x2d, 0xb7, 0xf2, 0xd0, 0x7b, 0x4c, 0xe9, 0xb6, 0xde, - 0x63, 0x2e, 0x05, 0x5e, 0x38, 0xc6, 0xf6, 0xf6, 0xf4, 0xba, 0xf7, 0x67, 0x8e, 0xf1, 0x1f, 0xc1, - 0x33, 0xc7, 0xf6, 0xb7, 0xf9, 0x13, 0x77, 0xfe, 0x79, 0x51, 0xf2, 0x40, 0x9f, 0x17, 0x5d, 0x84, - 0x7e, 0xfe, 0x32, 0xba, 0xbf, 0xcb, 0xcb, 0xe8, 0x5c, 0xc7, 0xe7, 0xcf, 0x1c, 0x1b, 0x9d, 0x16, - 0x9f, 0x46, 0x1e, 0xe8, 0xed, 0x9e, 0x35, 0xff, 0x76, 0xb2, 0xb7, 0x03, 0x71, 0x0c, 0xf2, 0xad, - 0xda, 0xe8, 0xfa, 0x84, 0x2f, 0xc5, 0x21, 0xbb, 0x64, 0xd7, 0x4a, 0x55, 0xcd, 0xb9, 0x43, 0xaa, - 0xfa, 0x4c, 0xe7, 0xa7, 0x5c, 0x27, 0x6e, 0xdd, 0x9c, 0x1c, 0x66, 0xb2, 0xde, 0x87, 0x84, 0xdf, - 0x01, 0x23, 0xa1, 0x8f, 0x10, 0x70, 0x7d, 0x55, 0xf6, 0xf3, 0x65, 0x84, 0x10, 0xa9, 0xf0, 0xf3, - 0xea, 0xe1, 0xe0, 0x47, 0x0a, 0xd0, 0x7b, 0x3b, 0x58, 0x0c, 0xd3, 0xd3, 0x2b, 0xaf, 0xdf, 0xa3, - 0x60, 0x6f, 0xa2, 0xf3, 0x90, 0x0b, 0xcf, 0xa4, 0x3b, 0xcd, 0xbf, 0x1c, 0x83, 0xc1, 0x25, 0x5b, - 0xa4, 0x9f, 0xf8, 0x27, 0xe4, 0x09, 0xdf, 0x59, 0xf7, 0x1f, 0x20, 0xc4, 0x7b, 0x33, 0x0e, 0xf1, - 0x6f, 0x10, 0x3c, 0xa1, 0x1d, 0x82, 0x31, 0x9f, 0x5c, 0x3c, 0x79, 0xc5, 0xa9, 0x0f, 0x2f, 0xe2, - 0x9a, 0xa6, 0xbb, 0x99, 0x2e, 0xfe, 0xe9, 0x43, 0xa3, 0xdb, 0x7b, 0x68, 0xe4, 0xcd, 0x57, 0x62, - 0xbf, 0xf3, 0xb5, 0x43, 0xbd, 0x59, 0x68, 0x5e, 0xdc, 0x4d, 0xbe, 0xa5, 0xd6, 0xa7, 0x76, 0xd2, - 0x1e, 0xbe, 0x27, 0x16, 0x7a, 0x50, 0x27, 0x7f, 0x30, 0x06, 0x43, 0x4b, 0x76, 0x6d, 0x43, 0xaf, - 0xfe, 0xd4, 0x6e, 0x42, 0xf3, 0xb0, 0x05, 0x87, 0x02, 0x92, 0xb9, 0x43, 0x53, 0x70, 0xea, 0xc3, - 0x09, 0x88, 0x2f, 0xd9, 0x35, 0xf4, 0x76, 0x18, 0x09, 0x27, 0x54, 0x1d, 0xf3, 0xe4, 0xd6, 0x70, - 0xd7, 0x79, 0x2d, 0xdb, 0x39, 0x34, 0xa2, 0x1d, 0x18, 0x0a, 0x86, 0xc5, 0xe3, 0x5d, 0x88, 0x04, - 0x20, 0xf3, 0x8f, 0xf6, 0x0a, 0xe9, 0x76, 0xf6, 0x33, 0x90, 0x72, 0x9d, 0xf3, 0xbd, 0x5d, 0xb0, - 0x05, 0x50, 0xe7, 0xcc, 0xbf, 0x8d, 0x3b, 0x23, 0xd2, 0x0b, 0xbb, 0xb2, 0x6e, 0xd2, 0x0b, 0xc1, - 0x76, 0x95, 0x5e, 0x27, 0x53, 0xdc, 0x04, 0xf0, 0xd9, 0xcd, 0x1b, 0xba, 0x50, 0xf0, 0xc0, 0xf2, - 0x8f, 0xf4, 0x04, 0xe6, 0x9e, 0xef, 0x1d, 0xf0, 0x42, 0xe5, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, - 0x30, 0x4f, 0xd4, 0xcd, 0x40, 0x9d, 0x00, 0x00, + // 9615 bytes of a gzipped FileDescriptorSet + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x7d, 0x7b, 0x70, 0x24, 0xc7, + 0x79, 0x1f, 0x66, 0x5f, 0xd8, 0xfd, 0xb0, 0x00, 0x16, 0x0d, 0xdc, 0x71, 0x6f, 0x49, 0x02, 0xe0, + 0xf2, 0x71, 0xc7, 0x23, 0x89, 0x23, 0x8f, 0xbc, 0xd7, 0x9e, 0x24, 0x0a, 0x0b, 0xec, 0xe1, 0xc0, + 0xc3, 0x8b, 0x03, 0xe0, 0xf8, 0x90, 0x9d, 0xad, 0xc1, 0x6c, 0x63, 0x31, 0xc4, 0xec, 0xcc, 0x68, + 0x66, 0xf6, 0x78, 0x38, 0x45, 0x29, 0xca, 0x4a, 0x1c, 0x8a, 0xa9, 0x24, 0x72, 0x94, 0x8a, 0x25, + 0x59, 0xa7, 0x50, 0x96, 0x12, 0x39, 0xb2, 0x9c, 0x48, 0x16, 0xa5, 0xf8, 0x91, 0x72, 0xa4, 0x54, + 0x39, 0x96, 0xf4, 0x47, 0x4a, 0x72, 0x52, 0xb1, 0xe5, 0x38, 0x94, 0x42, 0xa9, 0x6c, 0x85, 0x51, + 0x62, 0x25, 0x61, 0xca, 0x49, 0xa9, 0x94, 0x4a, 0xf5, 0x6b, 0x1e, 0xfb, 0x9a, 0x05, 0x88, 0x93, + 0xe9, 0xe8, 0x2f, 0x6c, 0x77, 0x7f, 0xdf, 0xaf, 0xbf, 0xfe, 0xfa, 0xeb, 0xaf, 0xbf, 0x7e, 0x0d, + 0xe0, 0xf3, 0x17, 0x61, 0xba, 0x6e, 0x9a, 0x75, 0x1d, 0x9f, 0xb2, 0x6c, 0xd3, 0x35, 0xb7, 0x9a, + 0xdb, 0xa7, 0x6a, 0xd8, 0x51, 0x6d, 0xcd, 0x72, 0x4d, 0x7b, 0x86, 0xe6, 0xa1, 0x51, 0x46, 0x31, + 0x23, 0x28, 0x8a, 0xcb, 0x30, 0x76, 0x49, 0xd3, 0xf1, 0xbc, 0x47, 0xb8, 0x8e, 0x5d, 0x74, 0x1e, + 0x12, 0xdb, 0x9a, 0x8e, 0xf3, 0xd2, 0x74, 0xfc, 0xc4, 0xd0, 0xe9, 0x7b, 0x66, 0x5a, 0x98, 0x66, + 0xc2, 0x1c, 0x6b, 0x24, 0x5b, 0xa6, 0x1c, 0xc5, 0xef, 0x25, 0x60, 0xbc, 0x43, 0x29, 0x42, 0x90, + 0x30, 0x94, 0x06, 0x41, 0x94, 0x4e, 0x64, 0x64, 0xfa, 0x1b, 0xe5, 0x61, 0xd0, 0x52, 0xd4, 0x5d, + 0xa5, 0x8e, 0xf3, 0x31, 0x9a, 0x2d, 0x92, 0x68, 0x12, 0xa0, 0x86, 0x2d, 0x6c, 0xd4, 0xb0, 0xa1, + 0xee, 0xe5, 0xe3, 0xd3, 0xf1, 0x13, 0x19, 0x39, 0x90, 0x83, 0x1e, 0x80, 0x31, 0xab, 0xb9, 0xa5, + 0x6b, 0x6a, 0x35, 0x40, 0x06, 0xd3, 0xf1, 0x13, 0x49, 0x39, 0xc7, 0x0a, 0xe6, 0x7d, 0xe2, 0xe3, + 0x30, 0xfa, 0x3c, 0x56, 0x76, 0x83, 0xa4, 0x43, 0x94, 0x74, 0x84, 0x64, 0x07, 0x08, 0xe7, 0x20, + 0xdb, 0xc0, 0x8e, 0xa3, 0xd4, 0x71, 0xd5, 0xdd, 0xb3, 0x70, 0x3e, 0x41, 0x5b, 0x3f, 0xdd, 0xd6, + 0xfa, 0xd6, 0x96, 0x0f, 0x71, 0xae, 0x8d, 0x3d, 0x0b, 0xa3, 0x59, 0xc8, 0x60, 0xa3, 0xd9, 0x60, + 0x08, 0xc9, 0x2e, 0xfa, 0xab, 0x18, 0xcd, 0x46, 0x2b, 0x4a, 0x9a, 0xb0, 0x71, 0x88, 0x41, 0x07, + 0xdb, 0xd7, 0x34, 0x15, 0xe7, 0x53, 0x14, 0xe0, 0x78, 0x1b, 0xc0, 0x3a, 0x2b, 0x6f, 0xc5, 0x10, + 0x7c, 0x68, 0x0e, 0x32, 0xf8, 0xba, 0x8b, 0x0d, 0x47, 0x33, 0x8d, 0xfc, 0x20, 0x05, 0xb9, 0xb7, + 0x43, 0x2f, 0x62, 0xbd, 0xd6, 0x0a, 0xe1, 0xf3, 0xa1, 0xb3, 0x30, 0x68, 0x5a, 0xae, 0x66, 0x1a, + 0x4e, 0x3e, 0x3d, 0x2d, 0x9d, 0x18, 0x3a, 0x7d, 0x47, 0x47, 0x43, 0x58, 0x65, 0x34, 0xb2, 0x20, + 0x46, 0x8b, 0x90, 0x73, 0xcc, 0xa6, 0xad, 0xe2, 0xaa, 0x6a, 0xd6, 0x70, 0x55, 0x33, 0xb6, 0xcd, + 0x7c, 0x86, 0x02, 0x4c, 0xb5, 0x37, 0x84, 0x12, 0xce, 0x99, 0x35, 0xbc, 0x68, 0x6c, 0x9b, 0xf2, + 0x88, 0x13, 0x4a, 0xa3, 0xa3, 0x90, 0x72, 0xf6, 0x0c, 0x57, 0xb9, 0x9e, 0xcf, 0x52, 0x0b, 0xe1, + 0xa9, 0xe2, 0x6f, 0xa6, 0x60, 0xb4, 0x1f, 0x13, 0xbb, 0x08, 0xc9, 0x6d, 0xd2, 0xca, 0x7c, 0x6c, + 0x3f, 0x3a, 0x60, 0x3c, 0x61, 0x25, 0xa6, 0x0e, 0xa8, 0xc4, 0x59, 0x18, 0x32, 0xb0, 0xe3, 0xe2, + 0x1a, 0xb3, 0x88, 0x78, 0x9f, 0x36, 0x05, 0x8c, 0xa9, 0xdd, 0xa4, 0x12, 0x07, 0x32, 0xa9, 0xa7, + 0x61, 0xd4, 0x13, 0xa9, 0x6a, 0x2b, 0x46, 0x5d, 0xd8, 0xe6, 0xa9, 0x28, 0x49, 0x66, 0x2a, 0x82, + 0x4f, 0x26, 0x6c, 0xf2, 0x08, 0x0e, 0xa5, 0xd1, 0x3c, 0x80, 0x69, 0x60, 0x73, 0xbb, 0x5a, 0xc3, + 0xaa, 0x9e, 0x4f, 0x77, 0xd1, 0xd2, 0x2a, 0x21, 0x69, 0xd3, 0x92, 0xc9, 0x72, 0x55, 0x1d, 0x5d, + 0xf0, 0x4d, 0x6d, 0xb0, 0x8b, 0xa5, 0x2c, 0xb3, 0x41, 0xd6, 0x66, 0x6d, 0x9b, 0x30, 0x62, 0x63, + 0x62, 0xf7, 0xb8, 0xc6, 0x5b, 0x96, 0xa1, 0x42, 0xcc, 0x44, 0xb6, 0x4c, 0xe6, 0x6c, 0xac, 0x61, + 0xc3, 0x76, 0x30, 0x89, 0xee, 0x06, 0x2f, 0xa3, 0x4a, 0xcd, 0x0a, 0xa8, 0x17, 0xca, 0x8a, 0xcc, + 0x15, 0xa5, 0x81, 0x0b, 0x37, 0x60, 0x24, 0xac, 0x1e, 0x34, 0x01, 0x49, 0xc7, 0x55, 0x6c, 0x97, + 0x5a, 0x61, 0x52, 0x66, 0x09, 0x94, 0x83, 0x38, 0x36, 0x6a, 0xd4, 0xcb, 0x25, 0x65, 0xf2, 0x13, + 0xbd, 0xd3, 0x6f, 0x70, 0x9c, 0x36, 0xf8, 0xbe, 0xf6, 0x1e, 0x0d, 0x21, 0xb7, 0xb6, 0xbb, 0x70, + 0x0e, 0x86, 0x43, 0x0d, 0xe8, 0xb7, 0xea, 0xe2, 0x5f, 0x85, 0x23, 0x1d, 0xa1, 0xd1, 0xd3, 0x30, + 0xd1, 0x34, 0x34, 0xc3, 0xc5, 0xb6, 0x65, 0x63, 0x62, 0xb1, 0xac, 0xaa, 0xfc, 0x9f, 0x0e, 0x76, + 0xb1, 0xb9, 0xcd, 0x20, 0x35, 0x43, 0x91, 0xc7, 0x9b, 0xed, 0x99, 0x27, 0x33, 0xe9, 0xef, 0x0f, + 0xe6, 0x5e, 0x78, 0xe1, 0x85, 0x17, 0x62, 0xc5, 0xaf, 0xa4, 0x60, 0xa2, 0xd3, 0x98, 0xe9, 0x38, + 0x7c, 0x8f, 0x42, 0xca, 0x68, 0x36, 0xb6, 0xb0, 0x4d, 0x95, 0x94, 0x94, 0x79, 0x0a, 0xcd, 0x42, + 0x52, 0x57, 0xb6, 0xb0, 0x9e, 0x4f, 0x4c, 0x4b, 0x27, 0x46, 0x4e, 0x3f, 0xd0, 0xd7, 0xa8, 0x9c, + 0x59, 0x22, 0x2c, 0x32, 0xe3, 0x44, 0xef, 0x80, 0x04, 0x77, 0xd1, 0x04, 0xe1, 0x64, 0x7f, 0x08, + 0x64, 0x2c, 0xc9, 0x94, 0x0f, 0xdd, 0x0e, 0x19, 0xf2, 0x97, 0xd9, 0x46, 0x8a, 0xca, 0x9c, 0x26, + 0x19, 0xc4, 0x2e, 0x50, 0x01, 0xd2, 0x74, 0x98, 0xd4, 0xb0, 0x98, 0xda, 0xbc, 0x34, 0x31, 0xac, + 0x1a, 0xde, 0x56, 0x9a, 0xba, 0x5b, 0xbd, 0xa6, 0xe8, 0x4d, 0x4c, 0x0d, 0x3e, 0x23, 0x67, 0x79, + 0xe6, 0x55, 0x92, 0x87, 0xa6, 0x60, 0x88, 0x8d, 0x2a, 0xcd, 0xa8, 0xe1, 0xeb, 0xd4, 0x7b, 0x26, + 0x65, 0x36, 0xd0, 0x16, 0x49, 0x0e, 0xa9, 0xfe, 0x39, 0xc7, 0x34, 0x84, 0x69, 0xd2, 0x2a, 0x48, + 0x06, 0xad, 0xfe, 0x5c, 0xab, 0xe3, 0xbe, 0xb3, 0x73, 0xf3, 0xda, 0xc6, 0xd2, 0x71, 0x18, 0xa5, + 0x14, 0x8f, 0xf2, 0xae, 0x57, 0xf4, 0xfc, 0xd8, 0xb4, 0x74, 0x22, 0x2d, 0x8f, 0xb0, 0xec, 0x55, + 0x9e, 0x5b, 0xfc, 0x52, 0x0c, 0x12, 0xd4, 0xb1, 0x8c, 0xc2, 0xd0, 0xc6, 0x33, 0x6b, 0x95, 0xea, + 0xfc, 0xea, 0x66, 0x79, 0xa9, 0x92, 0x93, 0xd0, 0x08, 0x00, 0xcd, 0xb8, 0xb4, 0xb4, 0x3a, 0xbb, + 0x91, 0x8b, 0x79, 0xe9, 0xc5, 0x95, 0x8d, 0xb3, 0x8f, 0xe5, 0xe2, 0x1e, 0xc3, 0x26, 0xcb, 0x48, + 0x04, 0x09, 0x1e, 0x3d, 0x9d, 0x4b, 0xa2, 0x1c, 0x64, 0x19, 0xc0, 0xe2, 0xd3, 0x95, 0xf9, 0xb3, + 0x8f, 0xe5, 0x52, 0xe1, 0x9c, 0x47, 0x4f, 0xe7, 0x06, 0xd1, 0x30, 0x64, 0x68, 0x4e, 0x79, 0x75, + 0x75, 0x29, 0x97, 0xf6, 0x30, 0xd7, 0x37, 0xe4, 0xc5, 0x95, 0x85, 0x5c, 0xc6, 0xc3, 0x5c, 0x90, + 0x57, 0x37, 0xd7, 0x72, 0xe0, 0x21, 0x2c, 0x57, 0xd6, 0xd7, 0x67, 0x17, 0x2a, 0xb9, 0x21, 0x8f, + 0xa2, 0xfc, 0xcc, 0x46, 0x65, 0x3d, 0x97, 0x0d, 0x89, 0xf5, 0xe8, 0xe9, 0xdc, 0xb0, 0x57, 0x45, + 0x65, 0x65, 0x73, 0x39, 0x37, 0x82, 0xc6, 0x60, 0x98, 0x55, 0x21, 0x84, 0x18, 0x6d, 0xc9, 0x3a, + 0xfb, 0x58, 0x2e, 0xe7, 0x0b, 0xc2, 0x50, 0xc6, 0x42, 0x19, 0x67, 0x1f, 0xcb, 0xa1, 0xe2, 0x1c, + 0x24, 0xa9, 0x19, 0x22, 0x04, 0x23, 0x4b, 0xb3, 0xe5, 0xca, 0x52, 0x75, 0x75, 0x6d, 0x63, 0x71, + 0x75, 0x65, 0x76, 0x29, 0x27, 0xf9, 0x79, 0x72, 0xe5, 0xc9, 0xcd, 0x45, 0xb9, 0x32, 0x9f, 0x8b, + 0x05, 0xf3, 0xd6, 0x2a, 0xb3, 0x1b, 0x95, 0xf9, 0x5c, 0xbc, 0xa8, 0xc2, 0x44, 0x27, 0x87, 0xda, + 0x71, 0x08, 0x05, 0x6c, 0x21, 0xd6, 0xc5, 0x16, 0x28, 0x56, 0xab, 0x2d, 0x14, 0xbf, 0x1b, 0x83, + 0xf1, 0x0e, 0x93, 0x4a, 0xc7, 0x4a, 0x1e, 0x87, 0x24, 0xb3, 0x65, 0x36, 0xcd, 0xde, 0xdf, 0x71, + 0x76, 0xa2, 0x96, 0xdd, 0x36, 0xd5, 0x52, 0xbe, 0x60, 0xa8, 0x11, 0xef, 0x12, 0x6a, 0x10, 0x88, + 0x36, 0x83, 0xfd, 0xd9, 0x36, 0xe7, 0xcf, 0xe6, 0xc7, 0xb3, 0xfd, 0xcc, 0x8f, 0x34, 0x6f, 0x7f, + 0x93, 0x40, 0xb2, 0xc3, 0x24, 0x70, 0x11, 0xc6, 0xda, 0x80, 0xfa, 0x76, 0xc6, 0xef, 0x97, 0x20, + 0xdf, 0x4d, 0x39, 0x11, 0x2e, 0x31, 0x16, 0x72, 0x89, 0x17, 0x5b, 0x35, 0x78, 0x57, 0xf7, 0x4e, + 0x68, 0xeb, 0xeb, 0x4f, 0x4b, 0x70, 0xb4, 0x73, 0x48, 0xd9, 0x51, 0x86, 0x77, 0x40, 0xaa, 0x81, + 0xdd, 0x1d, 0x53, 0x84, 0x55, 0xf7, 0x75, 0x98, 0xac, 0x49, 0x71, 0x6b, 0x67, 0x73, 0xae, 0xe0, + 0x6c, 0x1f, 0xef, 0x16, 0x17, 0x32, 0x69, 0xda, 0x24, 0xfd, 0x40, 0x0c, 0x8e, 0x74, 0x04, 0xef, + 0x28, 0xe8, 0x9d, 0x00, 0x9a, 0x61, 0x35, 0x5d, 0x16, 0x3a, 0x31, 0x4f, 0x9c, 0xa1, 0x39, 0xd4, + 0x79, 0x11, 0x2f, 0xdb, 0x74, 0xbd, 0xf2, 0x38, 0x2d, 0x07, 0x96, 0x45, 0x09, 0xce, 0xfb, 0x82, + 0x26, 0xa8, 0xa0, 0x93, 0x5d, 0x5a, 0xda, 0x66, 0x98, 0x0f, 0x43, 0x4e, 0xd5, 0x35, 0x6c, 0xb8, + 0x55, 0xc7, 0xb5, 0xb1, 0xd2, 0xd0, 0x8c, 0x3a, 0x9d, 0x6a, 0xd2, 0xa5, 0xe4, 0xb6, 0xa2, 0x3b, + 0x58, 0x1e, 0x65, 0xc5, 0xeb, 0xa2, 0x94, 0x70, 0x50, 0x03, 0xb2, 0x03, 0x1c, 0xa9, 0x10, 0x07, + 0x2b, 0xf6, 0x38, 0x8a, 0xbf, 0x90, 0x81, 0xa1, 0x40, 0x00, 0x8e, 0xee, 0x82, 0xec, 0x73, 0xca, + 0x35, 0xa5, 0x2a, 0x16, 0x55, 0x4c, 0x13, 0x43, 0x24, 0x6f, 0x8d, 0x2f, 0xac, 0x1e, 0x86, 0x09, + 0x4a, 0x62, 0x36, 0x5d, 0x6c, 0x57, 0x55, 0x5d, 0x71, 0x1c, 0xaa, 0xb4, 0x34, 0x25, 0x45, 0xa4, + 0x6c, 0x95, 0x14, 0xcd, 0x89, 0x12, 0x74, 0x06, 0xc6, 0x29, 0x47, 0xa3, 0xa9, 0xbb, 0x9a, 0xa5, + 0xe3, 0x2a, 0x59, 0xe6, 0x39, 0x74, 0xca, 0xf1, 0x24, 0x1b, 0x23, 0x14, 0xcb, 0x9c, 0x80, 0x48, + 0xe4, 0xa0, 0x79, 0xb8, 0x93, 0xb2, 0xd5, 0xb1, 0x81, 0x6d, 0xc5, 0xc5, 0x55, 0xfc, 0xee, 0xa6, + 0xa2, 0x3b, 0x55, 0xc5, 0xa8, 0x55, 0x77, 0x14, 0x67, 0x27, 0x3f, 0x41, 0x00, 0xca, 0xb1, 0xbc, + 0x24, 0x1f, 0x23, 0x84, 0x0b, 0x9c, 0xae, 0x42, 0xc9, 0x66, 0x8d, 0xda, 0x65, 0xc5, 0xd9, 0x41, + 0x25, 0x38, 0x4a, 0x51, 0x1c, 0xd7, 0xd6, 0x8c, 0x7a, 0x55, 0xdd, 0xc1, 0xea, 0x6e, 0xb5, 0xe9, + 0x6e, 0x9f, 0xcf, 0xdf, 0x1e, 0xac, 0x9f, 0x4a, 0xb8, 0x4e, 0x69, 0xe6, 0x08, 0xc9, 0xa6, 0xbb, + 0x7d, 0x1e, 0xad, 0x43, 0x96, 0x74, 0x46, 0x43, 0xbb, 0x81, 0xab, 0xdb, 0xa6, 0x4d, 0xe7, 0xd0, + 0x91, 0x0e, 0xae, 0x29, 0xa0, 0xc1, 0x99, 0x55, 0xce, 0xb0, 0x6c, 0xd6, 0x70, 0x29, 0xb9, 0xbe, + 0x56, 0xa9, 0xcc, 0xcb, 0x43, 0x02, 0xe5, 0x92, 0x69, 0x13, 0x83, 0xaa, 0x9b, 0x9e, 0x82, 0x87, + 0x98, 0x41, 0xd5, 0x4d, 0xa1, 0xde, 0x33, 0x30, 0xae, 0xaa, 0xac, 0xcd, 0x9a, 0x5a, 0xe5, 0x8b, + 0x31, 0x27, 0x9f, 0x0b, 0x29, 0x4b, 0x55, 0x17, 0x18, 0x01, 0xb7, 0x71, 0x07, 0x5d, 0x80, 0x23, + 0xbe, 0xb2, 0x82, 0x8c, 0x63, 0x6d, 0xad, 0x6c, 0x65, 0x3d, 0x03, 0xe3, 0xd6, 0x5e, 0x3b, 0x23, + 0x0a, 0xd5, 0x68, 0xed, 0xb5, 0xb2, 0x9d, 0x83, 0x09, 0x6b, 0xc7, 0x6a, 0xe7, 0x3b, 0x19, 0xe4, + 0x43, 0xd6, 0x8e, 0xd5, 0xca, 0x78, 0x2f, 0x5d, 0x99, 0xdb, 0x58, 0x55, 0x5c, 0x5c, 0xcb, 0xdf, + 0x16, 0x24, 0x0f, 0x14, 0xa0, 0x19, 0xc8, 0xa9, 0x6a, 0x15, 0x1b, 0xca, 0x96, 0x8e, 0xab, 0x8a, + 0x8d, 0x0d, 0xc5, 0xc9, 0x4f, 0x51, 0xe2, 0x84, 0x6b, 0x37, 0xb1, 0x3c, 0xa2, 0xaa, 0x15, 0x5a, + 0x38, 0x4b, 0xcb, 0xd0, 0x49, 0x18, 0x33, 0xb7, 0x9e, 0x53, 0x99, 0x45, 0x56, 0x2d, 0x1b, 0x6f, + 0x6b, 0xd7, 0xf3, 0xf7, 0x50, 0xf5, 0x8e, 0x92, 0x02, 0x6a, 0x8f, 0x6b, 0x34, 0x1b, 0xdd, 0x0f, + 0x39, 0xd5, 0xd9, 0x51, 0x6c, 0x8b, 0xba, 0x64, 0xc7, 0x52, 0x54, 0x9c, 0xbf, 0x97, 0x91, 0xb2, + 0xfc, 0x15, 0x91, 0x4d, 0x46, 0x84, 0xf3, 0xbc, 0xb6, 0xed, 0x0a, 0xc4, 0xe3, 0x6c, 0x44, 0xd0, + 0x3c, 0x8e, 0x76, 0x02, 0x72, 0x44, 0x13, 0xa1, 0x8a, 0x4f, 0x50, 0xb2, 0x11, 0x6b, 0xc7, 0x0a, + 0xd6, 0x7b, 0x37, 0x0c, 0x13, 0x4a, 0xbf, 0xd2, 0xfb, 0x59, 0xe0, 0x66, 0xed, 0x04, 0x6a, 0x7c, + 0x0c, 0x8e, 0x12, 0xa2, 0x06, 0x76, 0x95, 0x9a, 0xe2, 0x2a, 0x01, 0xea, 0x07, 0x29, 0x35, 0x51, + 0xfb, 0x32, 0x2f, 0x0c, 0xc9, 0x69, 0x37, 0xb7, 0xf6, 0x3c, 0xc3, 0x7a, 0x88, 0xc9, 0x49, 0xf2, + 0x84, 0x69, 0xdd, 0xb2, 0xe0, 0xbc, 0x58, 0x82, 0x6c, 0xd0, 0xee, 0x51, 0x06, 0x98, 0xe5, 0xe7, + 0x24, 0x12, 0x04, 0xcd, 0xad, 0xce, 0x93, 0xf0, 0xe5, 0xd9, 0x4a, 0x2e, 0x46, 0xc2, 0xa8, 0xa5, + 0xc5, 0x8d, 0x4a, 0x55, 0xde, 0x5c, 0xd9, 0x58, 0x5c, 0xae, 0xe4, 0xe2, 0x81, 0xc0, 0xfe, 0x89, + 0x44, 0xfa, 0xbe, 0xdc, 0xf1, 0xe2, 0x37, 0x63, 0x30, 0x12, 0x5e, 0xa9, 0xa1, 0xb7, 0xc1, 0x6d, + 0x62, 0x5b, 0xc5, 0xc1, 0x6e, 0xf5, 0x79, 0xcd, 0xa6, 0x03, 0xb2, 0xa1, 0xb0, 0xc9, 0xd1, 0xb3, + 0x9f, 0x09, 0x4e, 0xb5, 0x8e, 0xdd, 0xa7, 0x34, 0x9b, 0x0c, 0xb7, 0x86, 0xe2, 0xa2, 0x25, 0x98, + 0x32, 0xcc, 0xaa, 0xe3, 0x2a, 0x46, 0x4d, 0xb1, 0x6b, 0x55, 0x7f, 0x43, 0xab, 0xaa, 0xa8, 0x2a, + 0x76, 0x1c, 0x93, 0x4d, 0x84, 0x1e, 0xca, 0x1d, 0x86, 0xb9, 0xce, 0x89, 0xfd, 0x19, 0x62, 0x96, + 0x93, 0xb6, 0x98, 0x6f, 0xbc, 0x9b, 0xf9, 0xde, 0x0e, 0x99, 0x86, 0x62, 0x55, 0xb1, 0xe1, 0xda, + 0x7b, 0x34, 0x3e, 0x4f, 0xcb, 0xe9, 0x86, 0x62, 0x55, 0x48, 0xfa, 0x27, 0xb2, 0x4c, 0x7a, 0x22, + 0x91, 0x4e, 0xe7, 0x32, 0x4f, 0x24, 0xd2, 0x99, 0x1c, 0x14, 0x5f, 0x8b, 0x43, 0x36, 0x18, 0xaf, + 0x93, 0xe5, 0x8f, 0x4a, 0x67, 0x2c, 0x89, 0xfa, 0xb4, 0xbb, 0x7b, 0x46, 0xf7, 0x33, 0x73, 0x64, + 0x2a, 0x2b, 0xa5, 0x58, 0x70, 0x2c, 0x33, 0x4e, 0x12, 0x46, 0x10, 0x63, 0xc3, 0x2c, 0x18, 0x49, + 0xcb, 0x3c, 0x85, 0x16, 0x20, 0xf5, 0x9c, 0x43, 0xb1, 0x53, 0x14, 0xfb, 0x9e, 0xde, 0xd8, 0x4f, + 0xac, 0x53, 0xf0, 0xcc, 0x13, 0xeb, 0xd5, 0x95, 0x55, 0x79, 0x79, 0x76, 0x49, 0xe6, 0xec, 0xe8, + 0x18, 0x24, 0x74, 0xe5, 0xc6, 0x5e, 0x78, 0xd2, 0xa3, 0x59, 0xfd, 0x76, 0xc2, 0x31, 0x48, 0x3c, + 0x8f, 0x95, 0xdd, 0xf0, 0x54, 0x43, 0xb3, 0x6e, 0xe1, 0x60, 0x38, 0x05, 0x49, 0xaa, 0x2f, 0x04, + 0xc0, 0x35, 0x96, 0x1b, 0x40, 0x69, 0x48, 0xcc, 0xad, 0xca, 0x64, 0x40, 0xe4, 0x20, 0xcb, 0x72, + 0xab, 0x6b, 0x8b, 0x95, 0xb9, 0x4a, 0x2e, 0x56, 0x3c, 0x03, 0x29, 0xa6, 0x04, 0x32, 0x58, 0x3c, + 0x35, 0xe4, 0x06, 0x78, 0x92, 0x63, 0x48, 0xa2, 0x74, 0x73, 0xb9, 0x5c, 0x91, 0x73, 0xb1, 0x70, + 0x57, 0x27, 0x72, 0xc9, 0xa2, 0x03, 0xd9, 0x60, 0x1c, 0xfe, 0x93, 0x59, 0x8c, 0x7f, 0x59, 0x82, + 0xa1, 0x40, 0x5c, 0x4d, 0x02, 0x22, 0x45, 0xd7, 0xcd, 0xe7, 0xab, 0x8a, 0xae, 0x29, 0x0e, 0x37, + 0x0d, 0xa0, 0x59, 0xb3, 0x24, 0xa7, 0xdf, 0xae, 0xfb, 0x09, 0x0d, 0x91, 0x64, 0x2e, 0x55, 0xfc, + 0xb8, 0x04, 0xb9, 0xd6, 0xc0, 0xb6, 0x45, 0x4c, 0xe9, 0x2f, 0x52, 0xcc, 0xe2, 0xc7, 0x24, 0x18, + 0x09, 0x47, 0xb3, 0x2d, 0xe2, 0xdd, 0xf5, 0x17, 0x2a, 0xde, 0x77, 0x62, 0x30, 0x1c, 0x8a, 0x61, + 0xfb, 0x95, 0xee, 0xdd, 0x30, 0xa6, 0xd5, 0x70, 0xc3, 0x32, 0x5d, 0x6c, 0xa8, 0x7b, 0x55, 0x1d, + 0x5f, 0xc3, 0x7a, 0xbe, 0x48, 0x9d, 0xc6, 0xa9, 0xde, 0x51, 0xf2, 0xcc, 0xa2, 0xcf, 0xb7, 0x44, + 0xd8, 0x4a, 0xe3, 0x8b, 0xf3, 0x95, 0xe5, 0xb5, 0xd5, 0x8d, 0xca, 0xca, 0xdc, 0x33, 0xd5, 0xcd, + 0x95, 0x2b, 0x2b, 0xab, 0x4f, 0xad, 0xc8, 0x39, 0xad, 0x85, 0xec, 0x16, 0x0e, 0xfb, 0x35, 0xc8, + 0xb5, 0x0a, 0x85, 0x6e, 0x83, 0x4e, 0x62, 0xe5, 0x06, 0xd0, 0x38, 0x8c, 0xae, 0xac, 0x56, 0xd7, + 0x17, 0xe7, 0x2b, 0xd5, 0xca, 0xa5, 0x4b, 0x95, 0xb9, 0x8d, 0x75, 0xb6, 0xef, 0xe1, 0x51, 0x6f, + 0x84, 0x06, 0x78, 0xf1, 0xa3, 0x71, 0x18, 0xef, 0x20, 0x09, 0x9a, 0xe5, 0x2b, 0x16, 0xb6, 0x88, + 0x7a, 0xa8, 0x1f, 0xe9, 0x67, 0x48, 0xcc, 0xb0, 0xa6, 0xd8, 0x2e, 0x5f, 0xe0, 0xdc, 0x0f, 0x44, + 0x4b, 0x86, 0xab, 0x6d, 0x6b, 0xd8, 0xe6, 0xfb, 0x49, 0x6c, 0x19, 0x33, 0xea, 0xe7, 0xb3, 0x2d, + 0xa5, 0x07, 0x01, 0x59, 0xa6, 0xa3, 0xb9, 0xda, 0x35, 0x5c, 0xd5, 0x0c, 0xb1, 0xf9, 0x44, 0x96, + 0x35, 0x09, 0x39, 0x27, 0x4a, 0x16, 0x0d, 0xd7, 0xa3, 0x36, 0x70, 0x5d, 0x69, 0xa1, 0x26, 0xce, + 0x3c, 0x2e, 0xe7, 0x44, 0x89, 0x47, 0x7d, 0x17, 0x64, 0x6b, 0x66, 0x93, 0xc4, 0x7a, 0x8c, 0x8e, + 0xcc, 0x1d, 0x92, 0x3c, 0xc4, 0xf2, 0x3c, 0x12, 0x1e, 0xc5, 0xfb, 0xbb, 0x5e, 0x59, 0x79, 0x88, + 0xe5, 0x31, 0x92, 0xe3, 0x30, 0xaa, 0xd4, 0xeb, 0x36, 0x01, 0x17, 0x40, 0x6c, 0x5d, 0x32, 0xe2, + 0x65, 0x53, 0xc2, 0xc2, 0x13, 0x90, 0x16, 0x7a, 0x20, 0x53, 0x35, 0xd1, 0x44, 0xd5, 0x62, 0x8b, + 0xed, 0xd8, 0x89, 0x8c, 0x9c, 0x36, 0x44, 0xe1, 0x5d, 0x90, 0xd5, 0x9c, 0xaa, 0xbf, 0x89, 0x1f, + 0x9b, 0x8e, 0x9d, 0x48, 0xcb, 0x43, 0x9a, 0xe3, 0x6d, 0x80, 0x16, 0x3f, 0x1d, 0x83, 0x91, 0xf0, + 0x21, 0x04, 0x9a, 0x87, 0xb4, 0x6e, 0xaa, 0x0a, 0x35, 0x2d, 0x76, 0x02, 0x76, 0x22, 0xe2, 0xdc, + 0x62, 0x66, 0x89, 0xd3, 0xcb, 0x1e, 0x67, 0xe1, 0xdf, 0x48, 0x90, 0x16, 0xd9, 0xe8, 0x28, 0x24, + 0x2c, 0xc5, 0xdd, 0xa1, 0x70, 0xc9, 0x72, 0x2c, 0x27, 0xc9, 0x34, 0x4d, 0xf2, 0x1d, 0x4b, 0x31, + 0xa8, 0x09, 0xf0, 0x7c, 0x92, 0x26, 0xfd, 0xaa, 0x63, 0xa5, 0x46, 0x17, 0x3d, 0x66, 0xa3, 0x81, + 0x0d, 0xd7, 0x11, 0xfd, 0xca, 0xf3, 0xe7, 0x78, 0x36, 0x7a, 0x00, 0xc6, 0x5c, 0x5b, 0xd1, 0xf4, + 0x10, 0x6d, 0x82, 0xd2, 0xe6, 0x44, 0x81, 0x47, 0x5c, 0x82, 0x63, 0x02, 0xb7, 0x86, 0x5d, 0x45, + 0xdd, 0xc1, 0x35, 0x9f, 0x29, 0x45, 0x37, 0x37, 0x6e, 0xe3, 0x04, 0xf3, 0xbc, 0x5c, 0xf0, 0x16, + 0xbf, 0x29, 0xc1, 0x98, 0x58, 0xa6, 0xd5, 0x3c, 0x65, 0x2d, 0x03, 0x28, 0x86, 0x61, 0xba, 0x41, + 0x75, 0xb5, 0x9b, 0x72, 0x1b, 0xdf, 0xcc, 0xac, 0xc7, 0x24, 0x07, 0x00, 0x0a, 0x0d, 0x00, 0xbf, + 0xa4, 0xab, 0xda, 0xa6, 0x60, 0x88, 0x9f, 0x30, 0xd1, 0x63, 0x4a, 0xb6, 0xb0, 0x07, 0x96, 0x45, + 0xd6, 0x73, 0x68, 0x02, 0x92, 0x5b, 0xb8, 0xae, 0x19, 0x7c, 0xdf, 0x98, 0x25, 0xc4, 0xf6, 0x4b, + 0xc2, 0xdb, 0x7e, 0x29, 0xff, 0x35, 0x18, 0x57, 0xcd, 0x46, 0xab, 0xb8, 0xe5, 0x5c, 0xcb, 0xe6, + 0x82, 0x73, 0x59, 0x7a, 0xf6, 0x21, 0x4e, 0x54, 0x37, 0x75, 0xc5, 0xa8, 0xcf, 0x98, 0x76, 0xdd, + 0x3f, 0x66, 0x25, 0x11, 0x8f, 0x13, 0x38, 0x6c, 0xb5, 0xb6, 0xfe, 0xb7, 0x24, 0xfd, 0x72, 0x2c, + 0xbe, 0xb0, 0x56, 0xfe, 0x4c, 0xac, 0xb0, 0xc0, 0x18, 0xd7, 0x84, 0x32, 0x64, 0xbc, 0xad, 0x63, + 0x95, 0x34, 0x10, 0x5e, 0x7f, 0x00, 0x26, 0xea, 0x66, 0xdd, 0xa4, 0x48, 0xa7, 0xc8, 0x2f, 0x7e, + 0x4e, 0x9b, 0xf1, 0x72, 0x0b, 0x91, 0x87, 0xba, 0xa5, 0x15, 0x18, 0xe7, 0xc4, 0x55, 0x7a, 0x50, + 0xc4, 0x96, 0x31, 0xa8, 0xe7, 0x1e, 0x5a, 0xfe, 0xf3, 0xdf, 0xa3, 0xd3, 0xb7, 0x3c, 0xc6, 0x59, + 0x49, 0x19, 0x5b, 0xe9, 0x94, 0x64, 0x38, 0x12, 0xc2, 0x63, 0x83, 0x14, 0xdb, 0x11, 0x88, 0xbf, + 0xcb, 0x11, 0xc7, 0x03, 0x88, 0xeb, 0x9c, 0xb5, 0x34, 0x07, 0xc3, 0xfb, 0xc1, 0xfa, 0xd7, 0x1c, + 0x2b, 0x8b, 0x83, 0x20, 0x0b, 0x30, 0x4a, 0x41, 0xd4, 0xa6, 0xe3, 0x9a, 0x0d, 0xea, 0x01, 0x7b, + 0xc3, 0xfc, 0xde, 0xf7, 0xd8, 0xa8, 0x19, 0x21, 0x6c, 0x73, 0x1e, 0x57, 0xa9, 0x04, 0xf4, 0x6c, + 0xac, 0x86, 0x55, 0x3d, 0x02, 0xe1, 0xab, 0x5c, 0x10, 0x8f, 0xbe, 0x74, 0x15, 0x26, 0xc8, 0x6f, + 0xea, 0xa0, 0x82, 0x92, 0x44, 0x6f, 0xb8, 0xe5, 0xbf, 0xf9, 0x7e, 0x36, 0x30, 0xc7, 0x3d, 0x80, + 0x80, 0x4c, 0x81, 0x5e, 0xac, 0x63, 0xd7, 0xc5, 0xb6, 0x53, 0x55, 0xf4, 0x4e, 0xe2, 0x05, 0x76, + 0x2c, 0xf2, 0x1f, 0xf9, 0x41, 0xb8, 0x17, 0x17, 0x18, 0xe7, 0xac, 0xae, 0x97, 0x36, 0xe1, 0xb6, + 0x0e, 0x56, 0xd1, 0x07, 0xe6, 0x47, 0x39, 0xe6, 0x44, 0x9b, 0x65, 0x10, 0xd8, 0x35, 0x10, 0xf9, + 0x5e, 0x5f, 0xf6, 0x81, 0xf9, 0x4b, 0x1c, 0x13, 0x71, 0x5e, 0xd1, 0xa5, 0x04, 0xf1, 0x09, 0x18, + 0xbb, 0x86, 0xed, 0x2d, 0xd3, 0xe1, 0xbb, 0x44, 0x7d, 0xc0, 0x7d, 0x8c, 0xc3, 0x8d, 0x72, 0x46, + 0xba, 0x6d, 0x44, 0xb0, 0x2e, 0x40, 0x7a, 0x5b, 0x51, 0x71, 0x1f, 0x10, 0x37, 0x39, 0xc4, 0x20, + 0xa1, 0x27, 0xac, 0xb3, 0x90, 0xad, 0x9b, 0x7c, 0x8e, 0x8a, 0x66, 0xff, 0x38, 0x67, 0x1f, 0x12, + 0x3c, 0x1c, 0xc2, 0x32, 0xad, 0xa6, 0x4e, 0x26, 0xb0, 0x68, 0x88, 0x7f, 0x28, 0x20, 0x04, 0x0f, + 0x87, 0xd8, 0x87, 0x5a, 0x5f, 0x16, 0x10, 0x4e, 0x40, 0x9f, 0x8f, 0xc3, 0x90, 0x69, 0xe8, 0x7b, + 0xa6, 0xd1, 0x8f, 0x10, 0x9f, 0xe0, 0x08, 0xc0, 0x59, 0x08, 0xc0, 0x45, 0xc8, 0xf4, 0xdb, 0x11, + 0xff, 0xe8, 0x07, 0x62, 0x78, 0x88, 0x1e, 0x58, 0x80, 0x51, 0xe1, 0xa0, 0x34, 0xd3, 0xe8, 0x03, + 0xe2, 0x1f, 0x73, 0x88, 0x91, 0x00, 0x1b, 0x6f, 0x86, 0x8b, 0x1d, 0xb7, 0x8e, 0xfb, 0x01, 0xf9, + 0xb4, 0x68, 0x06, 0x67, 0xe1, 0xaa, 0xdc, 0xc2, 0x86, 0xba, 0xd3, 0x1f, 0xc2, 0xaf, 0x08, 0x55, + 0x0a, 0x1e, 0x02, 0x31, 0x07, 0xc3, 0x0d, 0xc5, 0x76, 0x76, 0x14, 0xbd, 0xaf, 0xee, 0xf8, 0x27, + 0x1c, 0x23, 0xeb, 0x31, 0x71, 0x8d, 0x34, 0x8d, 0xfd, 0xc0, 0x7c, 0x46, 0x68, 0x24, 0xc0, 0xc6, + 0x87, 0x9e, 0xe3, 0xd2, 0x2d, 0xb5, 0xfd, 0xa0, 0xfd, 0xaa, 0x18, 0x7a, 0x8c, 0x77, 0x39, 0x88, + 0x78, 0x11, 0x32, 0x8e, 0x76, 0xa3, 0x2f, 0x98, 0xcf, 0x8a, 0x9e, 0xa6, 0x0c, 0x84, 0xf9, 0x19, + 0x38, 0xd6, 0x71, 0x9a, 0xe8, 0x03, 0xec, 0xd7, 0x38, 0xd8, 0xd1, 0x0e, 0x53, 0x05, 0x77, 0x09, + 0xfb, 0x85, 0xfc, 0xa7, 0xc2, 0x25, 0xe0, 0x16, 0xac, 0x35, 0xb2, 0x6a, 0x70, 0x94, 0xed, 0xfd, + 0x69, 0xed, 0x9f, 0x09, 0xad, 0x31, 0xde, 0x90, 0xd6, 0x36, 0xe0, 0x28, 0x47, 0xdc, 0x5f, 0xbf, + 0x7e, 0x4e, 0x38, 0x56, 0xc6, 0xbd, 0x19, 0xee, 0xdd, 0x77, 0x41, 0xc1, 0x53, 0xa7, 0x08, 0x4f, + 0x9d, 0x6a, 0x43, 0xb1, 0xfa, 0x40, 0xfe, 0x3c, 0x47, 0x16, 0x1e, 0xdf, 0x8b, 0x6f, 0x9d, 0x65, + 0xc5, 0x22, 0xe0, 0x4f, 0x43, 0x5e, 0x80, 0x37, 0x0d, 0x1b, 0xab, 0x66, 0xdd, 0xd0, 0x6e, 0xe0, + 0x5a, 0x1f, 0xd0, 0xbf, 0xde, 0xd2, 0x55, 0x9b, 0x01, 0x76, 0x82, 0xbc, 0x08, 0x39, 0x2f, 0x56, + 0xa9, 0x6a, 0x0d, 0xcb, 0xb4, 0xdd, 0x08, 0xc4, 0x2f, 0x88, 0x9e, 0xf2, 0xf8, 0x16, 0x29, 0x5b, + 0xa9, 0x02, 0xec, 0x9c, 0xb9, 0x5f, 0x93, 0x7c, 0x85, 0x03, 0x0d, 0xfb, 0x5c, 0xdc, 0x71, 0xa8, + 0x66, 0xc3, 0x52, 0xec, 0x7e, 0xfc, 0xdf, 0x17, 0x85, 0xe3, 0xe0, 0x2c, 0xdc, 0x71, 0x90, 0x88, + 0x8e, 0xcc, 0xf6, 0x7d, 0x20, 0x7c, 0x49, 0x38, 0x0e, 0xc1, 0xc3, 0x21, 0x44, 0xc0, 0xd0, 0x07, + 0xc4, 0x3f, 0x17, 0x10, 0x82, 0x87, 0x40, 0x3c, 0xe9, 0x4f, 0xb4, 0x36, 0xae, 0x6b, 0x8e, 0x6b, + 0xb3, 0xa0, 0xb8, 0x37, 0xd4, 0x6f, 0xfc, 0x20, 0x1c, 0x84, 0xc9, 0x01, 0x56, 0xe2, 0x89, 0xf8, + 0x26, 0x2b, 0x5d, 0x33, 0x45, 0x0b, 0xf6, 0x9b, 0xc2, 0x13, 0x05, 0xd8, 0x88, 0x6c, 0x81, 0x08, + 0x91, 0xa8, 0x5d, 0x25, 0x2b, 0x85, 0x3e, 0xe0, 0x7e, 0xab, 0x45, 0xb8, 0x75, 0xc1, 0x4b, 0x30, + 0x03, 0xf1, 0x4f, 0xd3, 0xd8, 0xc5, 0x7b, 0x7d, 0x59, 0xe7, 0x6f, 0xb7, 0xc4, 0x3f, 0x9b, 0x8c, + 0x93, 0xf9, 0x90, 0xd1, 0x96, 0x78, 0x0a, 0x45, 0xdd, 0x2a, 0xca, 0xbf, 0xef, 0x0d, 0xde, 0xde, + 0x70, 0x38, 0x55, 0x5a, 0x22, 0x46, 0x1e, 0x0e, 0x7a, 0xa2, 0xc1, 0xde, 0xff, 0x86, 0x67, 0xe7, + 0xa1, 0x98, 0xa7, 0x74, 0x09, 0x86, 0x43, 0x01, 0x4f, 0x34, 0xd4, 0x5f, 0xe7, 0x50, 0xd9, 0x60, + 0xbc, 0x53, 0x3a, 0x03, 0x09, 0x12, 0xbc, 0x44, 0xb3, 0xff, 0x0d, 0xce, 0x4e, 0xc9, 0x4b, 0x6f, + 0x87, 0xb4, 0x08, 0x5a, 0xa2, 0x59, 0x7f, 0x9e, 0xb3, 0x7a, 0x2c, 0x84, 0x5d, 0x04, 0x2c, 0xd1, + 0xec, 0x7f, 0x53, 0xb0, 0x0b, 0x16, 0xc2, 0xde, 0xbf, 0x0a, 0xbf, 0xfc, 0xb7, 0x12, 0x7c, 0xd2, + 0x11, 0xba, 0xbb, 0x08, 0x83, 0x3c, 0x52, 0x89, 0xe6, 0xfe, 0x00, 0xaf, 0x5c, 0x70, 0x94, 0xce, + 0x41, 0xb2, 0x4f, 0x85, 0xff, 0x6d, 0xce, 0xca, 0xe8, 0x4b, 0x73, 0x30, 0x14, 0x88, 0x4e, 0xa2, + 0xd9, 0xff, 0x0e, 0x67, 0x0f, 0x72, 0x11, 0xd1, 0x79, 0x74, 0x12, 0x0d, 0xf0, 0x77, 0x85, 0xe8, + 0x9c, 0x83, 0xa8, 0x4d, 0x04, 0x26, 0xd1, 0xdc, 0x1f, 0x14, 0x5a, 0x17, 0x2c, 0xa5, 0xc7, 0x21, + 0xe3, 0x4d, 0x36, 0xd1, 0xfc, 0xbf, 0xc0, 0xf9, 0x7d, 0x1e, 0xa2, 0x81, 0xc0, 0x64, 0x17, 0x0d, + 0xf1, 0xf7, 0x84, 0x06, 0x02, 0x5c, 0x64, 0x18, 0xb5, 0x06, 0x30, 0xd1, 0x48, 0x1f, 0x12, 0xc3, + 0xa8, 0x25, 0x7e, 0x21, 0xbd, 0x49, 0x7d, 0x7e, 0x34, 0xc4, 0xdf, 0x17, 0xbd, 0x49, 0xe9, 0x89, + 0x18, 0xad, 0x11, 0x41, 0x34, 0xc6, 0x2f, 0x0a, 0x31, 0x5a, 0x02, 0x82, 0xd2, 0x1a, 0xa0, 0xf6, + 0x68, 0x20, 0x1a, 0xef, 0xc3, 0x1c, 0x6f, 0xac, 0x2d, 0x18, 0x28, 0x3d, 0x05, 0x47, 0x3b, 0x47, + 0x02, 0xd1, 0xa8, 0x1f, 0x79, 0xa3, 0x65, 0xed, 0x16, 0x0c, 0x04, 0x4a, 0x1b, 0xfe, 0x94, 0x12, + 0x8c, 0x02, 0xa2, 0x61, 0x3f, 0xfa, 0x46, 0xd8, 0x71, 0x07, 0x83, 0x80, 0xd2, 0x2c, 0x80, 0x3f, + 0x01, 0x47, 0x63, 0x7d, 0x8c, 0x63, 0x05, 0x98, 0xc8, 0xd0, 0xe0, 0xf3, 0x6f, 0x34, 0xff, 0x4d, + 0x31, 0x34, 0x38, 0x07, 0x19, 0x1a, 0x62, 0xea, 0x8d, 0xe6, 0xfe, 0xb8, 0x18, 0x1a, 0x82, 0x85, + 0x58, 0x76, 0x60, 0x76, 0x8b, 0x46, 0xf8, 0x84, 0xb0, 0xec, 0x00, 0x57, 0x69, 0x05, 0xc6, 0xda, + 0x26, 0xc4, 0x68, 0xa8, 0x5f, 0xe6, 0x50, 0xb9, 0xd6, 0xf9, 0x30, 0x38, 0x79, 0xf1, 0xc9, 0x30, + 0x1a, 0xed, 0x93, 0x2d, 0x93, 0x17, 0x9f, 0x0b, 0x4b, 0x17, 0x21, 0x6d, 0x34, 0x75, 0x9d, 0x0c, + 0x1e, 0xd4, 0xfb, 0x26, 0x60, 0xfe, 0x3f, 0xff, 0x88, 0x6b, 0x47, 0x30, 0x94, 0xce, 0x40, 0x12, + 0x37, 0xb6, 0x70, 0x2d, 0x8a, 0xf3, 0xf5, 0x1f, 0x09, 0x87, 0x49, 0xa8, 0x4b, 0x8f, 0x03, 0xb0, + 0xad, 0x11, 0x7a, 0x18, 0x18, 0xc1, 0xfb, 0x5f, 0x7e, 0xc4, 0xaf, 0xde, 0xf8, 0x2c, 0x3e, 0x00, + 0xbb, 0xc8, 0xd3, 0x1b, 0xe0, 0x07, 0x61, 0x00, 0xda, 0x23, 0x17, 0x60, 0xf0, 0x39, 0xc7, 0x34, + 0x5c, 0xa5, 0x1e, 0xc5, 0xfd, 0x5f, 0x39, 0xb7, 0xa0, 0x27, 0x0a, 0x6b, 0x98, 0x36, 0x76, 0x95, + 0xba, 0x13, 0xc5, 0xfb, 0xdf, 0x38, 0xaf, 0xc7, 0x40, 0x98, 0x55, 0xc5, 0x71, 0xfb, 0x69, 0xf7, + 0x9f, 0x09, 0x66, 0xc1, 0x40, 0x84, 0x26, 0xbf, 0x77, 0xf1, 0x5e, 0x14, 0xef, 0x0f, 0x85, 0xd0, + 0x9c, 0xbe, 0xf4, 0x76, 0xc8, 0x90, 0x9f, 0xec, 0x3e, 0x5d, 0x04, 0xf3, 0x7f, 0xe7, 0xcc, 0x3e, + 0x07, 0xa9, 0xd9, 0x71, 0x6b, 0xae, 0x16, 0xad, 0xec, 0xff, 0xc1, 0x7b, 0x5a, 0xd0, 0x97, 0x66, + 0x61, 0xc8, 0x71, 0x6b, 0xb5, 0x26, 0x8f, 0x4f, 0x23, 0xd8, 0xff, 0xe7, 0x8f, 0xbc, 0x2d, 0x0b, + 0x8f, 0x87, 0xf4, 0xf6, 0xf3, 0xbb, 0xae, 0x65, 0xd2, 0x03, 0x8f, 0x28, 0x84, 0x37, 0x38, 0x42, + 0x80, 0xa5, 0x34, 0x07, 0x59, 0xd2, 0x16, 0x1b, 0x5b, 0x98, 0x9e, 0x4e, 0x45, 0x40, 0xfc, 0x2f, + 0xae, 0x80, 0x10, 0x53, 0xf9, 0x67, 0xbf, 0xfa, 0xda, 0xa4, 0xf4, 0x8d, 0xd7, 0x26, 0xa5, 0xef, + 0xbc, 0x36, 0x29, 0x7d, 0xf0, 0xbb, 0x93, 0x03, 0xdf, 0xf8, 0xee, 0xe4, 0xc0, 0x1f, 0x7e, 0x77, + 0x72, 0xa0, 0xf3, 0x2e, 0x31, 0x2c, 0x98, 0x0b, 0x26, 0xdb, 0x1f, 0x7e, 0xb6, 0x58, 0xd7, 0xdc, + 0x9d, 0xe6, 0xd6, 0x8c, 0x6a, 0x36, 0xe8, 0x36, 0xae, 0xbf, 0x5b, 0xeb, 0x2d, 0x72, 0xe0, 0xf5, + 0x18, 0x1c, 0x53, 0x4d, 0xa7, 0x61, 0x3a, 0x55, 0xb6, 0xdf, 0xcb, 0x12, 0x7c, 0xc7, 0x37, 0x1b, + 0x2c, 0xea, 0x63, 0xd3, 0x77, 0x03, 0x26, 0xb4, 0x86, 0xa5, 0x63, 0xba, 0x39, 0x5f, 0xa5, 0x5a, + 0xe8, 0x2f, 0x18, 0xfc, 0xda, 0xbf, 0x4f, 0xb2, 0x4d, 0x48, 0x9f, 0x7d, 0x51, 0x70, 0x97, 0x96, + 0x60, 0x4c, 0x51, 0x55, 0x6c, 0x85, 0x20, 0x23, 0x94, 0x29, 0x00, 0x73, 0x9c, 0xd3, 0x47, 0x3b, + 0x07, 0x29, 0x47, 0x55, 0x74, 0x25, 0xb2, 0x4b, 0xbf, 0xce, 0x21, 0x38, 0x79, 0xf9, 0x7c, 0xb7, + 0x9e, 0x78, 0x76, 0x32, 0xa0, 0x68, 0xa6, 0x31, 0xfe, 0xe7, 0x21, 0x86, 0x9c, 0x62, 0x37, 0x95, + 0xe1, 0x0f, 0xe2, 0x30, 0xc9, 0xcb, 0xb7, 0x14, 0x07, 0x9f, 0xba, 0xf6, 0xc8, 0x16, 0x76, 0x95, + 0x47, 0x4e, 0xa9, 0xa6, 0x66, 0x70, 0x8d, 0x8f, 0x73, 0xfd, 0x93, 0xf2, 0x19, 0x5e, 0x5e, 0xe8, + 0xb8, 0x1d, 0x5f, 0xe8, 0xde, 0x6f, 0xc5, 0x4d, 0x48, 0xcc, 0x99, 0x9a, 0x81, 0x26, 0x20, 0x59, + 0xc3, 0x86, 0xd9, 0xe0, 0xd7, 0xee, 0x58, 0x02, 0x3d, 0x02, 0x29, 0xa5, 0x61, 0x36, 0x0d, 0x97, + 0x1d, 0x52, 0x94, 0x8f, 0x7d, 0xf5, 0xd5, 0xa9, 0x81, 0x3f, 0x7a, 0x75, 0x2a, 0xbe, 0x68, 0xb8, + 0xbf, 0xff, 0xca, 0x43, 0xc0, 0xa1, 0x16, 0x0d, 0x57, 0xe6, 0x84, 0xa5, 0xc4, 0xf7, 0x5f, 0x9e, + 0x92, 0x8a, 0x4f, 0xc3, 0xe0, 0x3c, 0x56, 0x0f, 0x82, 0x3c, 0x8f, 0xd5, 0x00, 0xf2, 0x3c, 0x56, + 0x5b, 0x90, 0xcf, 0x41, 0x7a, 0xd1, 0x70, 0xd9, 0xa5, 0xc9, 0x07, 0x20, 0xae, 0x19, 0xec, 0x1e, + 0x4e, 0x4f, 0xd9, 0x08, 0x15, 0x61, 0x9c, 0xc7, 0xaa, 0xc7, 0x58, 0xc3, 0x6a, 0x2b, 0x63, 0x7b, + 0xd5, 0x84, 0xaa, 0x3c, 0xff, 0x87, 0xff, 0x69, 0x72, 0xe0, 0x85, 0xd7, 0x26, 0x07, 0xba, 0xf6, + 0x6a, 0xb1, 0x6b, 0xaf, 0x3a, 0xb5, 0x5d, 0x76, 0xbc, 0xe2, 0xf5, 0xec, 0x9f, 0xa6, 0xa0, 0xc8, + 0x69, 0x1c, 0x57, 0xd9, 0xd5, 0x8c, 0xba, 0xd7, 0xb9, 0x4a, 0xd3, 0xdd, 0xb9, 0xc1, 0x7b, 0xf7, + 0x28, 0x97, 0x82, 0xd3, 0x1c, 0xb8, 0x83, 0x0b, 0x11, 0x66, 0x54, 0xfc, 0x93, 0x38, 0xa0, 0x75, + 0x57, 0xd9, 0xc5, 0xb3, 0x4d, 0x77, 0xc7, 0xb4, 0xb5, 0x1b, 0xcc, 0x0d, 0x62, 0x80, 0x86, 0x72, + 0xbd, 0xea, 0x9a, 0xbb, 0xd8, 0x70, 0xa8, 0xa2, 0x86, 0x4e, 0x1f, 0x9b, 0xe9, 0x60, 0x72, 0x33, + 0xa4, 0x93, 0xcb, 0x0f, 0x7c, 0xe6, 0xdb, 0x53, 0xc7, 0xa3, 0xb5, 0x40, 0x89, 0x49, 0x5c, 0x7e, + 0x7d, 0x83, 0x02, 0xa3, 0xab, 0xc0, 0xee, 0x67, 0x54, 0x75, 0xcd, 0x71, 0xf9, 0x15, 0xef, 0x33, + 0x33, 0x9d, 0xdb, 0x3e, 0xd3, 0x2e, 0xe6, 0xcc, 0x55, 0x45, 0xd7, 0x6a, 0x8a, 0x6b, 0xda, 0xce, + 0xe5, 0x01, 0x39, 0x43, 0xa1, 0x96, 0x34, 0xc7, 0x45, 0x1b, 0x90, 0xa9, 0x61, 0x63, 0x8f, 0xc1, + 0xc6, 0xdf, 0x1c, 0x6c, 0x9a, 0x20, 0x51, 0xd4, 0xa7, 0x01, 0x29, 0x41, 0x3a, 0xf1, 0xa6, 0x89, + 0x5d, 0xcd, 0xec, 0x02, 0x1f, 0x42, 0xa6, 0x4f, 0x30, 0xc6, 0x94, 0xd6, 0xac, 0xc2, 0x3b, 0x01, + 0xfc, 0x3a, 0xd1, 0x69, 0x18, 0x54, 0x6a, 0x35, 0x1b, 0x3b, 0x0e, 0x3d, 0x3b, 0xcc, 0x94, 0xf3, + 0xbf, 0xff, 0xca, 0x43, 0x13, 0x1c, 0x7f, 0x96, 0x95, 0xb0, 0xe5, 0xb8, 0x2c, 0x08, 0x4b, 0x63, + 0x5f, 0x7f, 0xe5, 0xa1, 0xe1, 0x50, 0x5d, 0xe5, 0x2c, 0xc0, 0x35, 0x0f, 0xf4, 0xe4, 0xc7, 0x25, + 0x18, 0x6b, 0x93, 0x05, 0x15, 0x61, 0x72, 0x76, 0x73, 0xe3, 0xf2, 0xaa, 0xbc, 0xf8, 0xec, 0xec, + 0xc6, 0xe2, 0xea, 0x4a, 0x95, 0xbd, 0x23, 0x58, 0x59, 0x5f, 0xab, 0xcc, 0x2d, 0x5e, 0x5a, 0xac, + 0xcc, 0xe7, 0x06, 0xd0, 0x14, 0xdc, 0xde, 0x81, 0x66, 0xbe, 0xb2, 0x54, 0x59, 0x98, 0xdd, 0xa8, + 0xe4, 0x24, 0x74, 0x17, 0xdc, 0xd9, 0x11, 0xc4, 0x23, 0x89, 0x75, 0x21, 0x91, 0x2b, 0x1e, 0x49, + 0xbc, 0x7c, 0xa9, 0xeb, 0xf8, 0x7a, 0xb0, 0xa7, 0x65, 0x5d, 0xf7, 0x06, 0x52, 0x78, 0xa4, 0xbd, + 0x2f, 0x06, 0xc7, 0x5a, 0xe7, 0x21, 0xc5, 0xd8, 0xeb, 0xf2, 0x94, 0xb4, 0xf3, 0xc8, 0x2a, 0x5e, + 0x86, 0xf8, 0xac, 0xb1, 0x87, 0x8e, 0xb1, 0x20, 0xbd, 0xda, 0xb4, 0x75, 0xee, 0xc7, 0x06, 0x49, + 0x7a, 0xd3, 0xd6, 0x89, 0x7f, 0x13, 0xaf, 0x07, 0xa4, 0x13, 0x59, 0xfe, 0x24, 0xa0, 0x94, 0xfb, + 0xf0, 0xcb, 0x53, 0x03, 0x9f, 0x7b, 0x79, 0x6a, 0xe0, 0x87, 0x9f, 0x98, 0x1a, 0x78, 0xe1, 0x8f, + 0xa7, 0x07, 0xca, 0xbb, 0xad, 0xcd, 0xfb, 0x72, 0xe4, 0x14, 0x9d, 0x9e, 0x35, 0xf6, 0xa8, 0xc3, + 0x5a, 0x93, 0x9e, 0x4d, 0xd2, 0xc6, 0x89, 0x53, 0xd9, 0xc9, 0xd6, 0x53, 0xd9, 0xa7, 0xb0, 0xae, + 0x5f, 0x31, 0xcc, 0xe7, 0x69, 0xaf, 0xfa, 0x3a, 0xf8, 0x50, 0x0c, 0x26, 0xdb, 0xe6, 0x62, 0x1e, + 0xb6, 0x74, 0x7b, 0x53, 0x5b, 0x82, 0xf4, 0xbc, 0x88, 0x86, 0xf2, 0x30, 0xe8, 0x60, 0xd5, 0x34, + 0x6a, 0xcc, 0x07, 0xc4, 0x65, 0x91, 0x24, 0xcd, 0x36, 0x14, 0xc3, 0x74, 0xf8, 0x45, 0x7e, 0x96, + 0x28, 0xff, 0x92, 0xb4, 0xbf, 0x20, 0x64, 0x58, 0xd4, 0x24, 0x9a, 0xf9, 0x48, 0xe4, 0x39, 0xf5, + 0x2e, 0x69, 0xa5, 0xd7, 0x88, 0xd0, 0x59, 0x75, 0xbf, 0x5a, 0xf9, 0xc5, 0x18, 0x4c, 0xb5, 0x6a, + 0x85, 0xc4, 0x82, 0x8e, 0xab, 0x34, 0xac, 0x6e, 0x6a, 0xb9, 0x08, 0x99, 0x0d, 0x41, 0xb3, 0x6f, + 0xbd, 0xdc, 0xdc, 0xa7, 0x5e, 0x46, 0xbc, 0xaa, 0x84, 0x62, 0x4e, 0xf7, 0xa9, 0x18, 0xaf, 0x1d, + 0x07, 0xd2, 0xcc, 0x67, 0x12, 0x70, 0x27, 0x7d, 0xe9, 0x65, 0x37, 0x34, 0xc3, 0x3d, 0xa5, 0xda, + 0x7b, 0x96, 0x4b, 0xa3, 0x41, 0x73, 0x9b, 0xeb, 0x65, 0xcc, 0x2f, 0x9e, 0x61, 0xc5, 0x5d, 0x46, + 0xce, 0x36, 0x24, 0xd7, 0x08, 0x1f, 0xd1, 0x88, 0x6b, 0xba, 0x8a, 0xce, 0x35, 0xc5, 0x12, 0x24, + 0x97, 0xbd, 0x0e, 0x8b, 0xb1, 0x5c, 0x4d, 0x3c, 0x0c, 0xd3, 0xb1, 0xb2, 0xcd, 0x2e, 0xd9, 0xc7, + 0xe9, 0x80, 0x4a, 0x93, 0x0c, 0x7a, 0x9f, 0x7e, 0x02, 0x92, 0x4a, 0x93, 0xdd, 0x0f, 0x89, 0x93, + 0x91, 0x46, 0x13, 0xc5, 0x2b, 0x30, 0xc8, 0x4f, 0xa9, 0x51, 0x0e, 0xe2, 0xbb, 0x78, 0x8f, 0xd6, + 0x93, 0x95, 0xc9, 0x4f, 0x34, 0x03, 0x49, 0x2a, 0x3c, 0x9f, 0x5a, 0xf2, 0x33, 0x6d, 0xd2, 0xcf, + 0x50, 0x21, 0x65, 0x46, 0x56, 0x7c, 0x02, 0xd2, 0xf3, 0x66, 0x43, 0x33, 0xcc, 0x30, 0x5a, 0x86, + 0xa1, 0x51, 0x99, 0xad, 0x26, 0x8f, 0x59, 0x64, 0x96, 0x40, 0x47, 0x21, 0xc5, 0x1e, 0x5d, 0xf0, + 0x3b, 0x2e, 0x3c, 0x55, 0x9c, 0x83, 0x41, 0x8a, 0xbd, 0x6a, 0x21, 0xc4, 0x9f, 0xeb, 0xf1, 0xd7, + 0x1d, 0x74, 0x75, 0xc5, 0xe1, 0x63, 0xbe, 0xb0, 0x08, 0x12, 0x35, 0xc5, 0x55, 0x78, 0xbb, 0xe9, + 0xef, 0xe2, 0x3b, 0x20, 0xcd, 0x41, 0xc8, 0xb4, 0x10, 0x37, 0x2d, 0x87, 0xdf, 0x52, 0x29, 0x74, + 0x6b, 0xca, 0xaa, 0x55, 0x4e, 0x90, 0x88, 0x46, 0x26, 0xc4, 0x65, 0xb9, 0xab, 0x53, 0x3d, 0x1f, + 0x70, 0xaa, 0x81, 0x2e, 0x0f, 0xfc, 0x64, 0x5d, 0xda, 0x66, 0x0e, 0x9e, 0xb1, 0x7c, 0x22, 0x06, + 0x93, 0x81, 0xd2, 0x6b, 0xd8, 0x76, 0x34, 0xd3, 0xe0, 0x33, 0x3d, 0xb3, 0x16, 0x14, 0x10, 0x92, + 0x97, 0x77, 0x31, 0x97, 0xb7, 0x43, 0x7c, 0xd6, 0xb2, 0x50, 0x01, 0xd2, 0x34, 0xad, 0x9a, 0xcc, + 0x5e, 0x12, 0xb2, 0x97, 0x26, 0x65, 0x8e, 0xb9, 0xed, 0x3e, 0xaf, 0xd8, 0xde, 0xbb, 0x44, 0x91, + 0x2e, 0x5e, 0x80, 0xcc, 0x9c, 0x69, 0x38, 0xd8, 0x70, 0x9a, 0x74, 0x0c, 0x6e, 0xe9, 0xa6, 0xba, + 0xcb, 0x11, 0x58, 0x82, 0x28, 0x5c, 0xb1, 0x2c, 0xca, 0x99, 0x90, 0xc9, 0x4f, 0x16, 0x51, 0x96, + 0xd7, 0xbb, 0xaa, 0xe8, 0xc2, 0xfe, 0x55, 0xc4, 0x1b, 0xe9, 0xe9, 0xe8, 0xc7, 0x12, 0xdc, 0xd1, + 0x3e, 0xa0, 0x76, 0xf1, 0x9e, 0xb3, 0xdf, 0xf1, 0xf4, 0x34, 0x64, 0xd6, 0xe8, 0xc7, 0x01, 0xae, + 0xe0, 0x3d, 0x54, 0x80, 0x41, 0x5c, 0x3b, 0x7d, 0xe6, 0xcc, 0x23, 0x17, 0x98, 0xb5, 0x5f, 0x1e, + 0x90, 0x45, 0x06, 0x9a, 0x84, 0x8c, 0x83, 0x55, 0xeb, 0xf4, 0x99, 0xb3, 0xbb, 0x8f, 0x30, 0xf3, + 0x22, 0xb1, 0x91, 0x97, 0x55, 0x4a, 0x93, 0x56, 0x7f, 0xff, 0x13, 0x53, 0x52, 0x39, 0x09, 0x71, + 0xa7, 0xd9, 0xb8, 0xa5, 0x36, 0xf2, 0xd1, 0x24, 0x4c, 0x07, 0x39, 0xa9, 0xa7, 0xf2, 0xa2, 0x12, + 0xae, 0x83, 0x5c, 0x40, 0x07, 0x94, 0xa2, 0x4b, 0x98, 0xdb, 0x53, 0x93, 0xc5, 0x5f, 0x97, 0x20, + 0xeb, 0x05, 0x51, 0xeb, 0xd8, 0x45, 0x17, 0x83, 0xf1, 0x0f, 0x1f, 0x36, 0xb7, 0xcf, 0xb4, 0xd6, + 0xe5, 0x07, 0x7b, 0x72, 0x80, 0x1c, 0x9d, 0xa3, 0x86, 0x68, 0x99, 0x0e, 0x7f, 0xab, 0x16, 0xc1, + 0xea, 0x11, 0xa3, 0x07, 0x01, 0x51, 0x0f, 0x57, 0xbd, 0x66, 0xba, 0x9a, 0x51, 0xaf, 0x5a, 0xe6, + 0xf3, 0xfc, 0x05, 0x70, 0x5c, 0xce, 0xd1, 0x92, 0xab, 0xb4, 0x60, 0x8d, 0xe4, 0x13, 0xa1, 0x33, + 0x1e, 0x0a, 0x99, 0x56, 0xfc, 0xc0, 0x8f, 0x38, 0x01, 0x91, 0x44, 0x17, 0x61, 0xd0, 0x6a, 0x6e, + 0x55, 0x85, 0xc7, 0x18, 0x3a, 0x7d, 0x47, 0xa7, 0xf1, 0x2f, 0xec, 0x83, 0x7b, 0x80, 0x94, 0xd5, + 0xdc, 0x22, 0xd6, 0x72, 0x17, 0x64, 0x3b, 0x08, 0x33, 0x74, 0xcd, 0x97, 0x83, 0x7e, 0x93, 0x82, + 0xb7, 0xa0, 0x6a, 0xd9, 0x9a, 0x69, 0x6b, 0xee, 0x1e, 0x8d, 0x6c, 0xe3, 0x72, 0x4e, 0x14, 0xac, + 0xf1, 0xfc, 0xe2, 0x2e, 0x8c, 0xae, 0xd3, 0xe5, 0xb7, 0x2f, 0xf9, 0x19, 0x5f, 0x3e, 0x29, 0x5a, + 0xbe, 0xae, 0x92, 0xc5, 0xda, 0x24, 0x2b, 0x3f, 0xd9, 0xd5, 0x3a, 0xcf, 0xed, 0xdf, 0x3a, 0xc3, + 0x11, 0xe2, 0x9f, 0x1d, 0x0b, 0x0d, 0x4e, 0x66, 0x9c, 0x41, 0xf7, 0xd5, 0xaf, 0x61, 0x46, 0x45, + 0x13, 0x85, 0xde, 0x93, 0x6a, 0x21, 0xc2, 0x8d, 0x16, 0x22, 0x87, 0x50, 0xf1, 0x02, 0x0c, 0xaf, + 0x29, 0xb6, 0xbb, 0x8e, 0xdd, 0xcb, 0x58, 0xa9, 0x61, 0x3b, 0x3c, 0xeb, 0x0e, 0x8b, 0x59, 0x17, + 0x41, 0x82, 0x4e, 0xad, 0x6c, 0xd6, 0xa1, 0xbf, 0x8b, 0x3b, 0x90, 0xa0, 0xd7, 0x4d, 0xbd, 0x19, + 0x99, 0x73, 0xb0, 0x19, 0x99, 0xf8, 0xd2, 0x3d, 0x17, 0x3b, 0x22, 0xbc, 0xa5, 0x09, 0xf4, 0x98, + 0x98, 0x57, 0xe3, 0xbd, 0xe7, 0x55, 0x6e, 0x88, 0x7c, 0x76, 0xd5, 0x61, 0xb0, 0x4c, 0x5c, 0xf1, + 0xe2, 0xbc, 0x27, 0x88, 0xe4, 0x0b, 0x82, 0x96, 0x61, 0xd4, 0x52, 0x6c, 0x97, 0xbe, 0xb3, 0xd9, + 0xa1, 0xad, 0xe0, 0xb6, 0x3e, 0xd5, 0x3e, 0xf2, 0x42, 0x8d, 0xe5, 0xb5, 0x0c, 0x5b, 0xc1, 0xcc, + 0xe2, 0x9f, 0x24, 0x20, 0xc5, 0x95, 0xf1, 0x76, 0x18, 0xe4, 0x6a, 0xe5, 0xd6, 0x79, 0xe7, 0x4c, + 0xfb, 0xc4, 0x34, 0xe3, 0x4d, 0x20, 0x1c, 0x4f, 0xf0, 0xa0, 0xfb, 0x20, 0xad, 0xee, 0x28, 0x9a, + 0x51, 0xd5, 0x6a, 0x7c, 0xbb, 0x62, 0xe8, 0xb5, 0x57, 0xa7, 0x06, 0xe7, 0x48, 0xde, 0xe2, 0xbc, + 0x3c, 0x48, 0x0b, 0x17, 0x6b, 0x24, 0x12, 0xd8, 0xc1, 0x5a, 0x7d, 0xc7, 0xe5, 0x23, 0x8c, 0xa7, + 0xd0, 0x79, 0x48, 0x10, 0x83, 0xe0, 0xaf, 0x30, 0x0b, 0x6d, 0x9b, 0x49, 0x5e, 0xb0, 0x57, 0x4e, + 0x93, 0x8a, 0x3f, 0xf8, 0xed, 0x29, 0x49, 0xa6, 0x1c, 0x68, 0x0e, 0x86, 0x75, 0xc5, 0x71, 0xab, + 0x74, 0x06, 0x23, 0xd5, 0x27, 0xf9, 0x4a, 0xbc, 0x4d, 0x21, 0x5c, 0xb1, 0x5c, 0xf4, 0x21, 0xc2, + 0xc5, 0xb2, 0x6a, 0xe8, 0x04, 0xe4, 0x28, 0x88, 0x6a, 0x36, 0x1a, 0x9a, 0xcb, 0x62, 0xab, 0x14, + 0xd5, 0xfb, 0x08, 0xc9, 0x9f, 0xa3, 0xd9, 0x34, 0xc2, 0xba, 0x1d, 0x32, 0xf4, 0xdd, 0x17, 0x25, + 0x61, 0x77, 0x9c, 0xd3, 0x24, 0x83, 0x16, 0x1e, 0x87, 0x51, 0xdf, 0x3f, 0x32, 0x92, 0x34, 0x43, + 0xf1, 0xb3, 0x29, 0xe1, 0xc3, 0x30, 0x61, 0xe0, 0xeb, 0xf4, 0xd6, 0x75, 0x88, 0x3a, 0x43, 0xa9, + 0x11, 0x29, 0xbb, 0x1a, 0xe6, 0xb8, 0x17, 0x46, 0x54, 0xa1, 0x7c, 0x46, 0x0b, 0x94, 0x76, 0xd8, + 0xcb, 0xa5, 0x64, 0xc7, 0x20, 0xad, 0x58, 0x16, 0x23, 0x18, 0xe2, 0xfe, 0xd1, 0xb2, 0x68, 0xd1, + 0x49, 0x18, 0xa3, 0x6d, 0xb4, 0xb1, 0xd3, 0xd4, 0x5d, 0x0e, 0x92, 0xa5, 0x34, 0xa3, 0xa4, 0x40, + 0x66, 0xf9, 0x94, 0xf6, 0x6e, 0x18, 0xc6, 0xd7, 0xb4, 0x1a, 0x36, 0x54, 0xcc, 0xe8, 0x86, 0x29, + 0x5d, 0x56, 0x64, 0x52, 0xa2, 0xfb, 0xc1, 0xf3, 0x7b, 0x55, 0xe1, 0x93, 0x47, 0x18, 0x9e, 0xc8, + 0xe7, 0x2b, 0xf1, 0x62, 0x1e, 0x12, 0xf3, 0x8a, 0xab, 0x90, 0x00, 0xc3, 0xbd, 0xce, 0x26, 0x9a, + 0xac, 0x4c, 0x7e, 0x16, 0xbf, 0x1f, 0x83, 0xc4, 0x55, 0xd3, 0xc5, 0xe8, 0xd1, 0x40, 0x00, 0x38, + 0xd2, 0xc9, 0x9e, 0xd7, 0xb5, 0xba, 0x81, 0x6b, 0xcb, 0x4e, 0x3d, 0xf0, 0x91, 0x06, 0xdf, 0x9c, + 0x62, 0x21, 0x73, 0x9a, 0x80, 0xa4, 0x6d, 0x36, 0x8d, 0x9a, 0xb8, 0x1e, 0x4c, 0x13, 0xa8, 0x02, + 0x69, 0xcf, 0x4a, 0x12, 0x51, 0x56, 0x32, 0x4a, 0xac, 0x84, 0xd8, 0x30, 0xcf, 0x90, 0x07, 0xb7, + 0xb8, 0xb1, 0x94, 0x21, 0xe3, 0x39, 0x2f, 0x6e, 0x6d, 0xfd, 0x19, 0xac, 0xcf, 0x46, 0x26, 0x13, + 0xaf, 0xef, 0x3d, 0xe5, 0x31, 0x8b, 0xcb, 0x79, 0x05, 0x5c, 0x7b, 0x21, 0xb3, 0xe2, 0x1f, 0x8c, + 0x18, 0xa4, 0xed, 0xf2, 0xcd, 0x8a, 0x7d, 0x34, 0xe2, 0x0e, 0xc8, 0x38, 0x5a, 0xdd, 0x50, 0xdc, + 0xa6, 0x8d, 0xb9, 0xe5, 0xf9, 0x19, 0xc5, 0x2f, 0x4b, 0x90, 0x62, 0x96, 0x1c, 0xd0, 0x9b, 0xd4, + 0x59, 0x6f, 0xb1, 0x6e, 0x7a, 0x8b, 0x1f, 0x5c, 0x6f, 0xb3, 0x00, 0x9e, 0x30, 0x0e, 0x7f, 0xc7, + 0xdf, 0x21, 0x62, 0x60, 0x22, 0xae, 0x6b, 0x75, 0x3e, 0x50, 0x03, 0x4c, 0xc5, 0xff, 0x28, 0x91, + 0x20, 0x96, 0x97, 0xa3, 0x59, 0x18, 0x16, 0x72, 0x55, 0xb7, 0x75, 0xa5, 0xce, 0x6d, 0xe7, 0xce, + 0xae, 0xc2, 0x5d, 0xd2, 0x95, 0xba, 0x3c, 0xc4, 0xe5, 0x21, 0x89, 0xce, 0xfd, 0x10, 0xeb, 0xd2, + 0x0f, 0xa1, 0x8e, 0x8f, 0x1f, 0xac, 0xe3, 0x43, 0x5d, 0x94, 0x68, 0xed, 0xa2, 0x2f, 0xc4, 0xe8, + 0x62, 0xc6, 0x32, 0x1d, 0x45, 0xff, 0x49, 0x8c, 0x88, 0xdb, 0x21, 0x63, 0x99, 0x7a, 0x95, 0x95, + 0xb0, 0x6b, 0xf3, 0x69, 0xcb, 0xd4, 0xe5, 0xb6, 0x6e, 0x4f, 0x1e, 0xd2, 0x70, 0x49, 0x1d, 0x82, + 0xd6, 0x06, 0x5b, 0xb5, 0x66, 0x43, 0x96, 0xa9, 0x82, 0xcf, 0x65, 0x0f, 0x13, 0x1d, 0xd0, 0xc9, + 0x51, 0x6a, 0x9f, 0x7b, 0x99, 0xd8, 0x8c, 0x52, 0xe6, 0x74, 0x84, 0x83, 0xb9, 0xfe, 0x4e, 0xab, + 0xe0, 0xa0, 0x59, 0xca, 0x9c, 0xae, 0xf8, 0x0f, 0x24, 0x80, 0x25, 0xa2, 0x59, 0xda, 0x5e, 0x32, + 0x0b, 0x39, 0x54, 0x84, 0x6a, 0xa8, 0xe6, 0xc9, 0x6e, 0x9d, 0xc6, 0xeb, 0xcf, 0x3a, 0x41, 0xb9, + 0xe7, 0x60, 0xd8, 0x37, 0x46, 0x07, 0x0b, 0x61, 0x26, 0x7b, 0x44, 0xd5, 0xeb, 0xd8, 0x95, 0xb3, + 0xd7, 0x02, 0xa9, 0xe2, 0xbf, 0x92, 0x20, 0x43, 0x65, 0x5a, 0xc6, 0xae, 0x12, 0xea, 0x43, 0xe9, + 0xe0, 0x7d, 0x78, 0x27, 0x00, 0x83, 0x71, 0xb4, 0x1b, 0x98, 0x5b, 0x56, 0x86, 0xe6, 0xac, 0x6b, + 0x37, 0x30, 0x3a, 0xeb, 0x29, 0x3c, 0xde, 0x5b, 0xe1, 0x22, 0xea, 0xe6, 0x6a, 0xbf, 0x0d, 0x06, + 0xe9, 0x77, 0xaf, 0xae, 0x3b, 0x3c, 0x90, 0x4e, 0x19, 0xcd, 0xc6, 0xc6, 0x75, 0xa7, 0xf8, 0x1c, + 0x0c, 0x6e, 0x5c, 0x67, 0x7b, 0x23, 0xb7, 0x43, 0xc6, 0x36, 0x4d, 0x3e, 0x27, 0xb3, 0x58, 0x28, + 0x4d, 0x32, 0xe8, 0x14, 0x24, 0xf6, 0x03, 0x62, 0xfe, 0x7e, 0x80, 0xbf, 0xa1, 0x11, 0xef, 0x6b, + 0x43, 0xe3, 0xe4, 0x1f, 0x48, 0x30, 0x14, 0xf0, 0x0f, 0xe8, 0x11, 0x38, 0x52, 0x5e, 0x5a, 0x9d, + 0xbb, 0x52, 0x5d, 0x9c, 0xaf, 0x5e, 0x5a, 0x9a, 0x5d, 0xf0, 0x1f, 0x86, 0x15, 0x8e, 0xbe, 0x74, + 0x73, 0x1a, 0x05, 0x68, 0x37, 0x0d, 0xba, 0xa3, 0x84, 0x4e, 0xc1, 0x44, 0x98, 0x65, 0xb6, 0xbc, + 0x5e, 0x59, 0xd9, 0xc8, 0x49, 0x85, 0x23, 0x2f, 0xdd, 0x9c, 0x1e, 0x0b, 0x70, 0xcc, 0x6e, 0x39, + 0xd8, 0x70, 0xdb, 0x19, 0xe6, 0x56, 0x97, 0x97, 0x17, 0x37, 0x72, 0xb1, 0x36, 0x06, 0xee, 0xb0, + 0xef, 0x87, 0xb1, 0x30, 0xc3, 0xca, 0xe2, 0x52, 0x2e, 0x5e, 0x40, 0x2f, 0xdd, 0x9c, 0x1e, 0x09, + 0x50, 0xaf, 0x68, 0x7a, 0x21, 0xfd, 0xe2, 0x27, 0x27, 0x07, 0x7e, 0xe5, 0x53, 0x93, 0x12, 0x69, + 0xd9, 0x70, 0xc8, 0x47, 0xa0, 0x07, 0xe1, 0xb6, 0xf5, 0xc5, 0x85, 0x95, 0xca, 0x7c, 0x75, 0x79, + 0x7d, 0x41, 0xec, 0x41, 0x8b, 0xd6, 0x8d, 0xbe, 0x74, 0x73, 0x7a, 0x88, 0x37, 0xa9, 0x1b, 0xf5, + 0x9a, 0x5c, 0xb9, 0xba, 0xba, 0x51, 0xc9, 0x49, 0x8c, 0x7a, 0xcd, 0xc6, 0xd7, 0x4c, 0x97, 0x7d, + 0x18, 0xef, 0x61, 0x38, 0xd6, 0x81, 0xda, 0x6b, 0xd8, 0xd8, 0x4b, 0x37, 0xa7, 0x87, 0xd7, 0x6c, + 0xcc, 0xc6, 0x0f, 0xe5, 0x98, 0x81, 0x7c, 0x3b, 0xc7, 0xea, 0xda, 0xea, 0xfa, 0xec, 0x52, 0x6e, + 0xba, 0x90, 0x7b, 0xe9, 0xe6, 0x74, 0x56, 0x38, 0x43, 0x7a, 0x04, 0xe0, 0xb5, 0xec, 0x56, 0xae, + 0x78, 0x5e, 0x3f, 0x09, 0xf7, 0x74, 0x39, 0x7d, 0x12, 0xe7, 0x16, 0x07, 0x3a, 0x7f, 0xea, 0xba, + 0xcf, 0x5e, 0x88, 0xd8, 0x7e, 0x8e, 0x5e, 0x3a, 0x1d, 0xfc, 0x6c, 0xab, 0xd0, 0x73, 0x71, 0x57, + 0xfc, 0x80, 0x04, 0x23, 0x97, 0x35, 0xc7, 0x35, 0x6d, 0x4d, 0x55, 0x74, 0xfa, 0x1c, 0xec, 0x6c, + 0xbf, 0xbe, 0xb5, 0x65, 0xa8, 0x3f, 0x0e, 0xa9, 0x6b, 0x8a, 0xce, 0x9c, 0x5a, 0x9c, 0x7e, 0xbd, + 0xa6, 0xcb, 0x61, 0x90, 0xe7, 0xda, 0x04, 0x00, 0x63, 0x2b, 0x7e, 0x36, 0x06, 0xa3, 0x74, 0x30, + 0x38, 0xec, 0xbb, 0x66, 0x64, 0x8d, 0xb5, 0x06, 0x09, 0x5b, 0x71, 0xf9, 0xa6, 0x61, 0xf9, 0x6d, + 0xfc, 0x94, 0xf2, 0xbe, 0x3e, 0x4e, 0xd9, 0xda, 0x0f, 0x32, 0x29, 0x12, 0x7a, 0x0a, 0xd2, 0x0d, + 0xe5, 0x7a, 0x95, 0xa2, 0xc6, 0x0e, 0x01, 0x75, 0xb0, 0xa1, 0x5c, 0x27, 0xb2, 0xa2, 0x1a, 0x8c, + 0x12, 0x60, 0x75, 0x47, 0x31, 0xea, 0x98, 0xe1, 0xc7, 0x0f, 0x01, 0x7f, 0xb8, 0xa1, 0x5c, 0x9f, + 0xa3, 0x98, 0xa4, 0x96, 0x52, 0xfa, 0xc3, 0x2f, 0x4f, 0x0d, 0xd0, 0x43, 0xe0, 0xdf, 0x96, 0x00, + 0x7c, 0x75, 0xa1, 0x9f, 0x81, 0x9c, 0xea, 0xa5, 0x68, 0xf5, 0xe2, 0xc8, 0xf2, 0x78, 0xb7, 0x8e, + 0x68, 0x51, 0x36, 0x9b, 0x98, 0xbf, 0xf1, 0xea, 0x94, 0x24, 0x8f, 0xaa, 0x2d, 0xfd, 0x50, 0x81, + 0xa1, 0xa6, 0x55, 0x53, 0x5c, 0x5c, 0xa5, 0x8b, 0xb8, 0xd8, 0x3e, 0x26, 0x79, 0x60, 0x8c, 0xa4, + 0x28, 0x20, 0xfd, 0x67, 0x25, 0x18, 0x9a, 0x0f, 0xdc, 0xc7, 0xcc, 0xc3, 0x60, 0xc3, 0x34, 0xb4, + 0x5d, 0x6e, 0x76, 0x19, 0x59, 0x24, 0x51, 0x01, 0xd2, 0xec, 0x21, 0xac, 0xbb, 0x27, 0x76, 0x3c, + 0x45, 0x9a, 0x70, 0x3d, 0x8f, 0xb7, 0x1c, 0x4d, 0xe8, 0x5a, 0x16, 0x49, 0xb2, 0x74, 0x71, 0xb0, + 0xda, 0xb4, 0x35, 0x77, 0xaf, 0xaa, 0x9a, 0x86, 0xab, 0xa8, 0x2e, 0x7f, 0x52, 0x39, 0x2a, 0xf2, + 0xe7, 0x58, 0x36, 0x01, 0xa9, 0x61, 0x57, 0xd1, 0x74, 0x27, 0xcf, 0xae, 0x30, 0x88, 0x64, 0x40, + 0xdc, 0xaf, 0xa5, 0x82, 0x5b, 0x54, 0x73, 0x90, 0x33, 0x2d, 0x6c, 0x87, 0x42, 0x4a, 0x66, 0xa1, + 0xdd, 0x0f, 0x29, 0x47, 0x05, 0x87, 0x88, 0x35, 0x9f, 0x21, 0x1d, 0x26, 0xd6, 0x7b, 0x56, 0x73, + 0xcb, 0xdf, 0xd6, 0x9a, 0x68, 0xd3, 0xeb, 0xac, 0xb1, 0x57, 0xce, 0x7f, 0xdd, 0x87, 0xf6, 0xf7, + 0x92, 0xae, 0xe0, 0x3d, 0xd2, 0x5b, 0x1c, 0x67, 0x8d, 0xc2, 0x90, 0x10, 0xf1, 0x39, 0x45, 0xd3, + 0xc5, 0xfb, 0x7e, 0x99, 0xa7, 0x50, 0x09, 0x52, 0x8e, 0xab, 0xb8, 0x4d, 0x87, 0x9f, 0xd7, 0x16, + 0xbb, 0x59, 0x46, 0xd9, 0x34, 0x6a, 0xeb, 0x94, 0x52, 0xe6, 0x1c, 0x68, 0x03, 0x52, 0xfc, 0x20, + 0x3c, 0xb9, 0x6f, 0xab, 0xee, 0x70, 0x53, 0x82, 0x61, 0xa1, 0x3a, 0xe4, 0x6a, 0x58, 0xc7, 0x75, + 0x16, 0x10, 0xed, 0x28, 0x64, 0xdd, 0x90, 0x3a, 0x84, 0x51, 0x33, 0xea, 0xa1, 0xae, 0x53, 0x50, + 0x74, 0x25, 0x74, 0xfd, 0x97, 0x7f, 0xa2, 0xf2, 0xee, 0x6e, 0xed, 0x0f, 0x58, 0xa6, 0xd8, 0x4c, + 0x08, 0x5e, 0x1e, 0xbe, 0x1f, 0x72, 0x4d, 0x63, 0xcb, 0x34, 0xe8, 0x2b, 0x5c, 0x1e, 0x8c, 0xa7, + 0x69, 0x78, 0x33, 0xea, 0xe5, 0x5f, 0x66, 0x51, 0xf9, 0x15, 0x18, 0xf1, 0x49, 0xe9, 0xd8, 0xc9, + 0xec, 0x63, 0xec, 0x0c, 0x7b, 0xbc, 0xa4, 0x14, 0x5d, 0x06, 0xf0, 0x07, 0x26, 0xdd, 0x1e, 0x18, + 0xea, 0xde, 0x87, 0xfe, 0xe8, 0x16, 0xcb, 0x2c, 0x9f, 0x17, 0xe9, 0x30, 0xde, 0xd0, 0x8c, 0xaa, + 0x83, 0xf5, 0xed, 0x2a, 0x57, 0x15, 0x81, 0x1c, 0x3a, 0x84, 0xae, 0x1d, 0x6b, 0x68, 0xc6, 0x3a, + 0xd6, 0xb7, 0xe7, 0x3d, 0xd8, 0x52, 0xf6, 0xc5, 0x97, 0xa7, 0x06, 0xf8, 0x58, 0x1a, 0x28, 0xae, + 0xd1, 0x2d, 0x6a, 0x3e, 0x0c, 0xb0, 0x83, 0xce, 0x42, 0x46, 0x11, 0x89, 0xc8, 0xb3, 0x7e, 0x9f, + 0x94, 0x8d, 0xce, 0x17, 0xfe, 0x78, 0x5a, 0x2a, 0x7e, 0x4a, 0x82, 0xd4, 0xfc, 0xd5, 0x35, 0x45, + 0xb3, 0x51, 0x05, 0xc6, 0x7c, 0x83, 0xea, 0x77, 0x6c, 0xfa, 0x36, 0x28, 0x06, 0x67, 0xa5, 0xdb, + 0xaa, 0xb1, 0x27, 0x4c, 0xeb, 0x7a, 0xb2, 0xa5, 0xe1, 0x15, 0x18, 0x64, 0x52, 0x3a, 0xa8, 0x04, + 0x49, 0x8b, 0xfc, 0xe0, 0x3b, 0xf2, 0x93, 0x5d, 0x0d, 0x91, 0xd2, 0x7b, 0x3b, 0x88, 0x84, 0xa5, + 0xf8, 0x63, 0x09, 0x60, 0xfe, 0xea, 0xd5, 0x0d, 0x5b, 0xb3, 0x74, 0xec, 0x1e, 0x56, 0x8b, 0x97, + 0xe0, 0x48, 0x60, 0x69, 0x62, 0xab, 0x7d, 0xb7, 0x7a, 0xdc, 0x5f, 0x9c, 0xd8, 0x6a, 0x47, 0xb4, + 0x9a, 0xe3, 0x7a, 0x68, 0xf1, 0xbe, 0xd1, 0xe6, 0x1d, 0xb7, 0xb3, 0x1a, 0xd7, 0x61, 0xc8, 0x6f, + 0xbe, 0x83, 0xe6, 0x21, 0xed, 0xf2, 0xdf, 0x5c, 0x9b, 0xc5, 0xee, 0xda, 0x14, 0x6c, 0x5c, 0xa3, + 0x1e, 0x67, 0xf1, 0xff, 0x12, 0xa5, 0x7a, 0x16, 0xfb, 0xd6, 0x32, 0x23, 0xe2, 0x7b, 0xb9, 0x6f, + 0x3c, 0x8c, 0x88, 0x82, 0x63, 0xb5, 0x68, 0xf5, 0xfd, 0x31, 0x18, 0xdf, 0x14, 0xde, 0xe6, 0x2d, + 0xab, 0x89, 0x35, 0x18, 0xc4, 0x86, 0x6b, 0x6b, 0x54, 0x15, 0xa4, 0xaf, 0x1f, 0xee, 0xd6, 0xd7, + 0x1d, 0xda, 0x42, 0x3f, 0xfe, 0x24, 0xf6, 0xb5, 0x39, 0x4c, 0x8b, 0x16, 0xfe, 0x43, 0x0c, 0xf2, + 0xdd, 0x38, 0xd1, 0x71, 0x18, 0x55, 0x6d, 0xcc, 0x6e, 0x3d, 0x85, 0x36, 0xd7, 0x46, 0x44, 0x36, + 0x77, 0xfa, 0xcb, 0x40, 0x02, 0x28, 0x62, 0x58, 0xf4, 0x82, 0xd4, 0x7e, 0x23, 0xa6, 0x11, 0x9f, + 0x99, 0xba, 0x7d, 0x0c, 0xa3, 0x9a, 0xa1, 0xb9, 0x9a, 0xa2, 0x57, 0xb7, 0x14, 0x5d, 0x31, 0xd4, + 0x83, 0x44, 0x96, 0xed, 0x8e, 0x7a, 0x84, 0x83, 0x96, 0x19, 0x26, 0xba, 0x0a, 0x83, 0x02, 0x3e, + 0x71, 0x08, 0xf0, 0x02, 0x2c, 0x10, 0x45, 0x7d, 0x2b, 0x06, 0x63, 0x32, 0xae, 0xfd, 0x74, 0xa9, + 0xf5, 0x5d, 0x00, 0x6c, 0xc0, 0x11, 0x3f, 0x78, 0x00, 0xcd, 0xb6, 0x0f, 0xe0, 0x0c, 0xc3, 0x9b, + 0x77, 0xdc, 0x80, 0x6e, 0xbf, 0x1e, 0x83, 0x6c, 0x50, 0xb7, 0x3f, 0x05, 0xf3, 0x02, 0x5a, 0xf4, + 0xbd, 0x41, 0x82, 0x7f, 0xb6, 0xb6, 0x8b, 0x37, 0x68, 0xb3, 0xba, 0xde, 0x6e, 0xe0, 0x0d, 0x09, + 0x52, 0x6b, 0x8a, 0xad, 0x34, 0x1c, 0xf4, 0x44, 0x5b, 0x00, 0x27, 0x76, 0xd9, 0xda, 0x3e, 0x4e, + 0xce, 0x17, 0xf5, 0xcc, 0xe4, 0x3e, 0xdc, 0x21, 0x7e, 0xbb, 0x17, 0x46, 0xc8, 0x12, 0x31, 0x70, + 0x20, 0x1f, 0xa3, 0xc7, 0x8c, 0x64, 0x8d, 0x17, 0xb8, 0xfa, 0x38, 0x05, 0x43, 0x84, 0xcc, 0x77, + 0x74, 0x84, 0x06, 0x1a, 0xca, 0xf5, 0x0a, 0xcb, 0x41, 0x0f, 0x01, 0xda, 0xf1, 0x16, 0xed, 0x55, + 0x5f, 0x05, 0x84, 0x6e, 0xcc, 0x2f, 0x11, 0xe4, 0x77, 0x02, 0x10, 0x29, 0xaa, 0xec, 0x0a, 0x32, + 0x5b, 0xe3, 0x64, 0x48, 0xce, 0x3c, 0xc9, 0x08, 0xd8, 0xd0, 0x27, 0x25, 0x40, 0xbe, 0xd3, 0x93, + 0xb1, 0x63, 0x91, 0x85, 0x05, 0x09, 0x3b, 0x03, 0x31, 0xa2, 0xd4, 0x3b, 0xec, 0xf4, 0xf9, 0x45, + 0xd8, 0x19, 0xb0, 0xc9, 0x0b, 0xbe, 0x8b, 0x89, 0x45, 0x5d, 0xa7, 0xe5, 0x1d, 0xd4, 0xea, 0x45, + 0x06, 0x8a, 0xdf, 0x92, 0xe0, 0x58, 0x5b, 0x7f, 0x7a, 0xc2, 0xfe, 0x15, 0x40, 0x76, 0xa0, 0x90, + 0x7f, 0x01, 0x90, 0x09, 0xbd, 0x6f, 0xf3, 0x18, 0xb3, 0xdb, 0xbc, 0xd5, 0xad, 0xf2, 0x92, 0xec, + 0x66, 0xf7, 0xbf, 0x94, 0x60, 0x22, 0x28, 0x8c, 0xd7, 0xac, 0x15, 0xc8, 0x06, 0x65, 0xe1, 0x0d, + 0xba, 0xa7, 0x9f, 0x06, 0xf1, 0xb6, 0x84, 0xf8, 0xd1, 0x93, 0xfe, 0xd0, 0x61, 0xdb, 0x35, 0x8f, + 0xf4, 0xad, 0x1b, 0x21, 0x53, 0xeb, 0x10, 0x4a, 0x88, 0x38, 0x22, 0xb1, 0x66, 0x9a, 0x3a, 0x7a, + 0x2f, 0x8c, 0x19, 0xa6, 0x5b, 0x25, 0x76, 0x86, 0x6b, 0xc1, 0x4b, 0xd4, 0x99, 0xf2, 0x93, 0xfb, + 0x53, 0xd9, 0xeb, 0xaf, 0x4e, 0xb5, 0x43, 0xb5, 0xe8, 0x71, 0xd4, 0x30, 0xdd, 0x32, 0x2d, 0xe7, + 0xb7, 0xaa, 0x6d, 0x18, 0x0e, 0x57, 0xcd, 0xfc, 0xd5, 0xf2, 0xbe, 0xab, 0x1e, 0xee, 0x55, 0x6d, + 0x76, 0x2b, 0x50, 0x27, 0xbb, 0x55, 0xf4, 0xc3, 0x97, 0xa7, 0xa4, 0x93, 0x5f, 0x92, 0x00, 0xfc, + 0x45, 0x34, 0x7a, 0x10, 0x6e, 0x2b, 0xaf, 0xae, 0xcc, 0x57, 0xd7, 0x37, 0x66, 0x37, 0x36, 0xd7, + 0xc3, 0x57, 0x8b, 0xc5, 0xae, 0xac, 0x63, 0x61, 0x55, 0xdb, 0xd6, 0x70, 0x0d, 0xdd, 0x07, 0x13, + 0x61, 0x6a, 0x92, 0xaa, 0xcc, 0xe7, 0xa4, 0x42, 0xf6, 0xa5, 0x9b, 0xd3, 0x69, 0x16, 0x9f, 0xe0, + 0x1a, 0x3a, 0x01, 0x47, 0xda, 0xe9, 0x16, 0x57, 0x16, 0x72, 0xb1, 0xc2, 0xf0, 0x4b, 0x37, 0xa7, + 0x33, 0x5e, 0x20, 0x83, 0x8a, 0x80, 0x82, 0x94, 0x1c, 0x2f, 0x5e, 0x80, 0x97, 0x6e, 0x4e, 0xa7, + 0x98, 0xda, 0x0a, 0x89, 0x17, 0x3f, 0x39, 0x39, 0x70, 0xe8, 0x17, 0x90, 0xbf, 0x36, 0xd8, 0x75, + 0xb3, 0xb5, 0x8e, 0x0d, 0xec, 0x68, 0xce, 0x81, 0x36, 0x5b, 0xfb, 0xda, 0xc0, 0xed, 0xf5, 0xe6, + 0xe3, 0xcf, 0x13, 0x90, 0x5d, 0x60, 0x02, 0x90, 0x3e, 0xc2, 0xe8, 0x6d, 0x90, 0xb2, 0xa8, 0xc7, + 0xf7, 0x0e, 0x76, 0xba, 0x8c, 0x07, 0x36, 0x2f, 0x78, 0xb7, 0x8b, 0xd8, 0x2c, 0xf1, 0x34, 0xbf, + 0x5e, 0xc0, 0x6e, 0x3d, 0xf9, 0xf7, 0x78, 0xb2, 0xe5, 0x99, 0xfd, 0x19, 0x1c, 0xbb, 0x8e, 0xb0, + 0x41, 0x60, 0xd8, 0xa5, 0xa4, 0x1a, 0x1c, 0xa1, 0xc8, 0xfe, 0xb4, 0x49, 0xd1, 0x45, 0xfc, 0x7b, + 0xb2, 0x9b, 0x98, 0x4b, 0x8a, 0xe3, 0xdf, 0x30, 0x60, 0xb7, 0x88, 0x98, 0xc8, 0xe3, 0x7a, 0x5b, + 0x89, 0x83, 0x16, 0x42, 0xd7, 0xc4, 0x12, 0xfb, 0xdb, 0xc0, 0x0d, 0x5e, 0x19, 0x7b, 0x02, 0x86, + 0x7c, 0x77, 0xe1, 0xf0, 0x7f, 0x51, 0xd2, 0xff, 0x64, 0x11, 0x64, 0x46, 0xdb, 0x70, 0xc4, 0x9f, + 0x7a, 0x83, 0xa8, 0xec, 0x3f, 0xb9, 0x3c, 0xb0, 0x8f, 0xd0, 0x9f, 0xc3, 0x4f, 0x34, 0xdb, 0x8b, + 0xc8, 0xa2, 0x62, 0x38, 0xe8, 0x1b, 0x9d, 0xbc, 0xf8, 0x18, 0x61, 0xff, 0xce, 0x35, 0x0c, 0xc0, + 0xfe, 0x7b, 0x84, 0x65, 0xda, 0x2e, 0xae, 0xd1, 0x8d, 0xa1, 0xb4, 0xec, 0xa5, 0x8b, 0x3b, 0x80, + 0xda, 0xfb, 0x26, 0xfc, 0xdc, 0x41, 0xea, 0xeb, 0xb9, 0x03, 0x9a, 0x80, 0x64, 0xf0, 0xc6, 0x18, + 0x4b, 0x94, 0xd2, 0x2f, 0xf2, 0x89, 0xf2, 0xd0, 0xc7, 0xf2, 0xb7, 0x63, 0x70, 0x32, 0x78, 0xda, + 0xf0, 0xee, 0x26, 0xb6, 0xf7, 0xbc, 0xa1, 0x67, 0x29, 0x75, 0xcd, 0x08, 0x5e, 0xaa, 0x3f, 0x16, + 0x9c, 0xda, 0x29, 0xad, 0xd0, 0x60, 0xf1, 0x45, 0x09, 0x86, 0xd6, 0x94, 0x3a, 0x96, 0xf1, 0xbb, + 0x9b, 0xd8, 0x71, 0x3b, 0x5c, 0x5a, 0x3e, 0x0a, 0x29, 0x73, 0x7b, 0x5b, 0x1c, 0x91, 0x26, 0x64, + 0x9e, 0x22, 0x6d, 0xd6, 0xb5, 0x86, 0xc6, 0x6e, 0x17, 0x25, 0x64, 0x96, 0x20, 0x11, 0x93, 0x6a, + 0x36, 0x0d, 0x3e, 0xfe, 0xf2, 0x09, 0xf1, 0x3d, 0x90, 0xa6, 0xc1, 0x86, 0x12, 0xca, 0xc3, 0xa0, + 0x8d, 0xaf, 0x61, 0xdb, 0x61, 0x5f, 0x40, 0x4c, 0xcb, 0x22, 0x59, 0x7c, 0x1c, 0xb2, 0x4c, 0x12, + 0x3e, 0xd1, 0x1e, 0x83, 0x34, 0xbd, 0xb8, 0xe3, 0xcb, 0x33, 0x48, 0xd2, 0x57, 0xd8, 0xd5, 0x67, + 0x86, 0xcf, 0x44, 0x62, 0x89, 0x72, 0xb9, 0xab, 0x96, 0x4f, 0x44, 0x0f, 0x79, 0xa6, 0x43, 0x4f, + 0xc3, 0xbf, 0x9b, 0x84, 0x23, 0xfc, 0x2c, 0x48, 0xb1, 0xb4, 0x53, 0x3b, 0xae, 0x2b, 0xae, 0xe2, + 0x03, 0x8f, 0x36, 0x15, 0x4b, 0x2b, 0xee, 0x41, 0xe2, 0xb2, 0xeb, 0x5a, 0xe8, 0x24, 0x24, 0xed, + 0xa6, 0x8e, 0xc5, 0xb6, 0x87, 0xb7, 0x6d, 0xac, 0x58, 0xda, 0x0c, 0x21, 0x90, 0x9b, 0x3a, 0x96, + 0x19, 0x09, 0xaa, 0xc0, 0xd4, 0x76, 0x53, 0xd7, 0xf7, 0xaa, 0x35, 0x4c, 0xff, 0xa5, 0x93, 0xf7, + 0x4f, 0x11, 0xf0, 0x75, 0x4b, 0x11, 0x9f, 0x56, 0x24, 0x8a, 0xb9, 0x83, 0x92, 0xcd, 0x53, 0x2a, + 0xf1, 0x0f, 0x11, 0x2a, 0x82, 0xa6, 0xf8, 0x47, 0x31, 0x48, 0x0b, 0x68, 0x7a, 0x17, 0x19, 0xeb, + 0x58, 0x75, 0x4d, 0xb1, 0x69, 0xef, 0xa5, 0x11, 0x82, 0x78, 0x9d, 0x77, 0x5e, 0xe6, 0xf2, 0x80, + 0x4c, 0x12, 0x24, 0xcf, 0xbb, 0x21, 0x4e, 0xf2, 0xac, 0x26, 0xe9, 0xcf, 0x84, 0x65, 0x8a, 0x75, + 0xd1, 0xe5, 0x01, 0x99, 0xa6, 0x50, 0x1e, 0x52, 0x64, 0x38, 0xb9, 0xac, 0xb7, 0x48, 0x3e, 0x4f, + 0xa3, 0xa3, 0x90, 0xb4, 0x14, 0x57, 0x65, 0x97, 0xb7, 0x48, 0x01, 0x4b, 0xa2, 0x73, 0x90, 0x62, + 0x2f, 0x87, 0x5b, 0xff, 0x5f, 0x0a, 0x51, 0x06, 0xfb, 0x44, 0x1b, 0x91, 0x7b, 0x4d, 0x71, 0x5d, + 0x6c, 0x1b, 0x04, 0x90, 0x91, 0x23, 0x04, 0x89, 0x2d, 0xb3, 0xb6, 0xc7, 0xff, 0x87, 0x0b, 0xfd, + 0xcd, 0xff, 0x69, 0x04, 0xb5, 0x87, 0x2a, 0x2d, 0x64, 0xff, 0xba, 0x2a, 0x2b, 0x32, 0xcb, 0x84, + 0xa8, 0x02, 0xe3, 0x4a, 0xad, 0xa6, 0xb1, 0x7f, 0xa7, 0x52, 0xdd, 0xd2, 0xa8, 0x5b, 0x71, 0xe8, + 0x3f, 0x26, 0xeb, 0xd6, 0x17, 0xc8, 0x67, 0x28, 0x73, 0xfa, 0x72, 0x06, 0x06, 0x2d, 0x26, 0x54, + 0xf1, 0x22, 0x8c, 0xb5, 0x49, 0x4a, 0xe4, 0xdb, 0xd5, 0x8c, 0x9a, 0xb8, 0x36, 0x4f, 0x7e, 0x93, + 0x3c, 0xfa, 0x51, 0x45, 0x76, 0x1c, 0x42, 0x7f, 0x97, 0x7f, 0xae, 0xfb, 0xeb, 0x8a, 0x91, 0xc0, + 0xeb, 0x0a, 0xc5, 0xd2, 0xca, 0x19, 0x8a, 0xcf, 0xdf, 0x54, 0xcc, 0xb6, 0xbf, 0xa9, 0xa8, 0x63, + 0x43, 0x4c, 0xb8, 0xa4, 0x48, 0xb1, 0x34, 0x87, 0x9a, 0xa3, 0xff, 0x91, 0x47, 0xe7, 0x62, 0xe0, + 0x37, 0x7d, 0x62, 0x91, 0x58, 0x98, 0x5d, 0x5b, 0xf4, 0xec, 0xf8, 0x2b, 0x31, 0xb8, 0x23, 0x60, + 0xc7, 0x01, 0xe2, 0x76, 0x73, 0x2e, 0x74, 0xb6, 0xf8, 0x3e, 0xde, 0xcf, 0x5e, 0x81, 0x04, 0xa1, + 0x47, 0x11, 0xff, 0xd2, 0x21, 0xff, 0xb9, 0xaf, 0xff, 0x8b, 0x62, 0xf8, 0x60, 0x25, 0xd4, 0x2b, + 0x14, 0xa4, 0xfc, 0xf3, 0xfd, 0xeb, 0x2f, 0xe7, 0x7f, 0xdf, 0xd2, 0x39, 0x3c, 0x35, 0xb6, 0xea, + 0xf0, 0xc5, 0x0b, 0x5d, 0x1f, 0x49, 0x32, 0x67, 0xda, 0x3b, 0x6e, 0xda, 0x87, 0xa7, 0xee, 0x76, + 0xd3, 0xbc, 0x57, 0x0f, 0xbe, 0xf9, 0x08, 0xec, 0x3a, 0x1c, 0x7d, 0x92, 0x88, 0xe5, 0x2f, 0x7c, + 0xc5, 0x6c, 0x70, 0xd4, 0x3b, 0xa6, 0x92, 0xf8, 0x93, 0x62, 0x16, 0x45, 0x5f, 0x02, 0xf0, 0x45, + 0xe7, 0x0b, 0xc8, 0xfb, 0x66, 0xba, 0xce, 0x32, 0x33, 0x81, 0x19, 0x46, 0x0e, 0x70, 0x16, 0x7f, + 0x55, 0x82, 0xdb, 0xda, 0xaa, 0xe6, 0xee, 0x7f, 0xa1, 0xc3, 0x7d, 0xf9, 0x03, 0x05, 0x42, 0x0b, + 0x1d, 0x84, 0x3d, 0x1e, 0x29, 0x2c, 0x93, 0x22, 0x24, 0xed, 0xd3, 0x70, 0x24, 0x2c, 0xac, 0x50, + 0xd3, 0xe3, 0x30, 0x12, 0xde, 0x52, 0x8d, 0x8c, 0x1c, 0x86, 0x43, 0xfb, 0xa9, 0xc5, 0x6a, 0x6b, + 0x0f, 0x78, 0x5a, 0xa8, 0x40, 0xc6, 0x23, 0xe5, 0xf1, 0x70, 0xdf, 0x4a, 0xf0, 0x39, 0x89, 0xa2, + 0xa7, 0xc3, 0x35, 0x04, 0xc2, 0xae, 0xc3, 0x6a, 0xc6, 0xa1, 0x99, 0xc5, 0xf7, 0x25, 0xb8, 0xab, + 0x87, 0xb4, 0x5c, 0x35, 0x37, 0x60, 0x22, 0xb0, 0xbb, 0x20, 0x66, 0x04, 0x61, 0x2a, 0x27, 0xa3, + 0x23, 0x5d, 0x6f, 0xf9, 0x7c, 0x3b, 0x51, 0xd7, 0x67, 0xbe, 0x3d, 0x35, 0xde, 0x5e, 0xe6, 0xc8, + 0xe3, 0xed, 0x7b, 0x00, 0x87, 0x68, 0x53, 0xaf, 0x48, 0x70, 0x7f, 0xb8, 0xa9, 0x1d, 0x62, 0xe6, + 0xb7, 0x5e, 0x0f, 0x7d, 0x4b, 0x82, 0x93, 0xfd, 0x88, 0xcd, 0xbb, 0x6a, 0x0b, 0xc6, 0xfd, 0xf5, + 0x43, 0x6b, 0x4f, 0x1d, 0x60, 0xf5, 0x80, 0x3c, 0xb4, 0x5b, 0xd0, 0x25, 0x9f, 0x92, 0xf8, 0x68, + 0x0c, 0x5a, 0x83, 0xa7, 0xff, 0xf0, 0x4e, 0x6e, 0xb4, 0xfe, 0x43, 0xdb, 0xb8, 0x1d, 0x3a, 0x30, + 0xb6, 0xaf, 0x0e, 0xf4, 0xd7, 0x14, 0xc5, 0x6b, 0xdc, 0x75, 0x76, 0xd8, 0x26, 0x7c, 0x17, 0x8c, + 0x77, 0x18, 0x19, 0xdc, 0x7d, 0xec, 0x63, 0x60, 0xc8, 0xa8, 0xdd, 0xf6, 0x8b, 0xbf, 0x26, 0xc1, + 0x14, 0xad, 0xb8, 0x43, 0xf7, 0xbc, 0x15, 0xf5, 0xd4, 0xe0, 0x9e, 0xaf, 0xa3, 0xb8, 0x5c, 0x61, + 0x8b, 0x90, 0x62, 0x16, 0xc5, 0x75, 0x74, 0x00, 0x93, 0xe4, 0x00, 0xc5, 0x2f, 0x0a, 0x4f, 0x3b, + 0x2f, 0x1a, 0xd4, 0x79, 0x1c, 0xbf, 0x39, 0xfd, 0x1c, 0xd2, 0x38, 0x0e, 0xa8, 0xe9, 0x9b, 0xc2, + 0xe7, 0x76, 0x96, 0x9b, 0x2b, 0x4a, 0x3d, 0x34, 0x9f, 0xcb, 0xb7, 0x40, 0x6e, 0xa9, 0x73, 0xfd, + 0x1d, 0xe1, 0x5c, 0xbd, 0x36, 0x45, 0x38, 0xd7, 0xb7, 0x5a, 0xa7, 0x78, 0x6e, 0x36, 0xa2, 0x01, + 0x7f, 0x19, 0xdd, 0xec, 0xef, 0xc4, 0xe0, 0x18, 0x6d, 0x5b, 0x70, 0x13, 0xe7, 0x30, 0x3b, 0x03, + 0x39, 0xb6, 0x5a, 0xdd, 0xa7, 0x17, 0xc9, 0x39, 0xb6, 0x7a, 0xb5, 0x65, 0xc6, 0x44, 0xb5, 0xd0, + 0xa6, 0x1f, 0xc5, 0x89, 0x47, 0x9e, 0xde, 0x05, 0xf6, 0x95, 0x3a, 0x18, 0x47, 0xe2, 0x10, 0x8c, + 0xe3, 0x1b, 0x12, 0x14, 0x3a, 0x29, 0x90, 0x1b, 0x83, 0x06, 0x47, 0x43, 0xc7, 0x2f, 0xad, 0xf6, + 0xf0, 0x60, 0x3f, 0x9b, 0x6a, 0x2d, 0xc3, 0xf5, 0x88, 0x8d, 0x6f, 0x75, 0x34, 0x34, 0x15, 0xb6, + 0xf7, 0xf6, 0x35, 0xc9, 0x5b, 0x70, 0x98, 0xbe, 0xd2, 0xe6, 0xf3, 0xff, 0x52, 0xac, 0x67, 0x3e, + 0x2b, 0xc1, 0x64, 0x17, 0xb1, 0xdf, 0x8a, 0x13, 0xf9, 0x4e, 0x57, 0xdb, 0x38, 0xec, 0xd5, 0xd2, + 0x63, 0x7c, 0x60, 0x85, 0xef, 0x63, 0x07, 0x16, 0xc5, 0x9d, 0x1e, 0x74, 0x15, 0x9f, 0x81, 0xdb, + 0x3b, 0x72, 0x71, 0xd9, 0x4a, 0x90, 0xd8, 0xd1, 0x1c, 0x97, 0x8b, 0x75, 0x5f, 0x37, 0xb1, 0x5a, + 0xb8, 0x29, 0x4f, 0x11, 0x41, 0x8e, 0x42, 0xaf, 0x99, 0xa6, 0xce, 0xc5, 0x28, 0x5e, 0x81, 0xb1, + 0x40, 0x1e, 0xaf, 0xe4, 0x2c, 0x24, 0x2c, 0x93, 0x7f, 0xac, 0x60, 0xe8, 0xf4, 0x1d, 0x5d, 0x4f, + 0x4e, 0x4c, 0x53, 0xe7, 0xcd, 0xa6, 0xf4, 0xc5, 0x09, 0x40, 0x0c, 0x8c, 0x1e, 0xa2, 0x88, 0x2a, + 0xd6, 0x61, 0x3c, 0x94, 0xcb, 0x2b, 0x79, 0x53, 0x07, 0x34, 0xa7, 0x5f, 0x3f, 0x02, 0x49, 0x8a, + 0x8a, 0x3e, 0x22, 0x85, 0xbe, 0x33, 0x34, 0xd3, 0x0d, 0xa6, 0xf3, 0xe6, 0x44, 0xe1, 0x54, 0xdf, + 0xf4, 0x3c, 0x72, 0x3d, 0xf9, 0x73, 0xff, 0xf6, 0x7b, 0x1f, 0x8a, 0xdd, 0x83, 0x8a, 0xa7, 0xba, + 0xec, 0x98, 0x04, 0x06, 0xd9, 0xa7, 0x43, 0x2f, 0xe1, 0x1f, 0xea, 0xaf, 0x2a, 0x21, 0xd9, 0x4c, + 0xbf, 0xe4, 0x5c, 0xb0, 0x8b, 0x54, 0xb0, 0x33, 0xe8, 0xd1, 0x68, 0xc1, 0x4e, 0xbd, 0x27, 0x3c, + 0x9c, 0xde, 0x8b, 0xfe, 0x9d, 0x04, 0x13, 0x9d, 0xd6, 0xc9, 0xe8, 0x7c, 0x7f, 0x52, 0xb4, 0x47, + 0x42, 0x85, 0x0b, 0x07, 0xe0, 0xe4, 0x4d, 0x59, 0xa0, 0x4d, 0x99, 0x45, 0x8f, 0x1f, 0xa0, 0x29, + 0xa7, 0x82, 0x07, 0x37, 0xff, 0x47, 0x82, 0x3b, 0x7b, 0x2e, 0x2e, 0xd1, 0x6c, 0x7f, 0x52, 0xf6, + 0x08, 0xf9, 0x0a, 0xe5, 0x37, 0x03, 0xc1, 0x5b, 0xfc, 0x24, 0x6d, 0xf1, 0x15, 0xb4, 0x78, 0x90, + 0x16, 0x77, 0x3c, 0x55, 0x43, 0xbf, 0x17, 0xbe, 0x02, 0xd9, 0xdb, 0x9c, 0xda, 0x56, 0x5f, 0x11, + 0x03, 0xa3, 0x3d, 0x16, 0x2f, 0x3e, 0x4d, 0x9b, 0x20, 0xa3, 0xb5, 0x37, 0xd9, 0x69, 0xa7, 0xde, + 0x13, 0x9e, 0x2c, 0xde, 0x8b, 0xfe, 0x5c, 0xea, 0x7c, 0x97, 0xf1, 0x5c, 0x4f, 0x11, 0xbb, 0xaf, + 0x2c, 0x0b, 0xe7, 0xf7, 0xcf, 0xc8, 0x1b, 0xd9, 0xa0, 0x8d, 0xac, 0x23, 0x7c, 0xd8, 0x8d, 0xec, + 0xd8, 0x89, 0xe8, 0x6b, 0x12, 0x4c, 0x74, 0x5a, 0x4a, 0x45, 0x0c, 0xcb, 0x1e, 0xab, 0xc6, 0x88, + 0x61, 0xd9, 0x6b, 0xdd, 0x56, 0x7c, 0x1b, 0x6d, 0xfc, 0x59, 0xf4, 0x58, 0xb7, 0xc6, 0xf7, 0xec, + 0x45, 0x32, 0x16, 0x7b, 0xae, 0x40, 0x22, 0xc6, 0x62, 0x3f, 0xcb, 0xaf, 0x88, 0xb1, 0xd8, 0xd7, + 0x02, 0x28, 0x7a, 0x2c, 0x7a, 0x2d, 0xeb, 0xb3, 0x1b, 0x1d, 0xf4, 0x15, 0x09, 0x86, 0x43, 0x01, + 0x36, 0x7a, 0xa4, 0xa7, 0xa0, 0x9d, 0x56, 0x33, 0x85, 0xd3, 0xfb, 0x61, 0xe1, 0x6d, 0x59, 0xa4, + 0x6d, 0x99, 0x43, 0xb3, 0x07, 0x69, 0x4b, 0xf8, 0x10, 0xfc, 0x1b, 0x12, 0x8c, 0x77, 0x08, 0x4d, + 0x23, 0x46, 0x61, 0xf7, 0x18, 0xbc, 0x70, 0x7e, 0xff, 0x8c, 0xbc, 0x55, 0x97, 0x68, 0xab, 0xde, + 0x89, 0xde, 0x71, 0x90, 0x56, 0x05, 0xe6, 0xe7, 0x57, 0xfd, 0x0b, 0x72, 0x81, 0x7a, 0xd0, 0xd9, + 0x7d, 0x0a, 0x26, 0x1a, 0x74, 0x6e, 0xdf, 0x7c, 0xbc, 0x3d, 0x4f, 0xd1, 0xf6, 0x3c, 0x89, 0x56, + 0xdf, 0x5c, 0x7b, 0xda, 0xa7, 0xf5, 0x2f, 0xb4, 0xbf, 0x07, 0xec, 0x6d, 0x45, 0x1d, 0x83, 0xd5, + 0xc2, 0xa3, 0xfb, 0xe2, 0xe1, 0x8d, 0x3a, 0x4f, 0x1b, 0x75, 0x1a, 0x3d, 0xdc, 0xad, 0x51, 0x81, + 0x3b, 0x8f, 0x9a, 0xb1, 0x6d, 0x9e, 0x7a, 0x0f, 0x0b, 0x81, 0xdf, 0x8b, 0xde, 0x27, 0xf1, 0x3b, + 0x67, 0x27, 0x7a, 0xd6, 0x1b, 0x88, 0x63, 0x0b, 0xf7, 0xf7, 0x41, 0xc9, 0xe5, 0xba, 0x87, 0xca, + 0x35, 0x89, 0xee, 0xe8, 0x26, 0x17, 0x89, 0x65, 0xd1, 0x07, 0xfc, 0x2b, 0xa3, 0x27, 0x7b, 0x63, + 0x07, 0x83, 0xdd, 0xc2, 0x03, 0x7d, 0xd1, 0x72, 0x49, 0xee, 0xa3, 0x92, 0x4c, 0xa3, 0xc9, 0xae, + 0x92, 0xb0, 0xd0, 0xf7, 0xb0, 0x2f, 0x7e, 0xfc, 0xc6, 0x51, 0x98, 0xea, 0x52, 0xa3, 0x7b, 0x3d, + 0xe2, 0x1c, 0xb2, 0xc7, 0xb3, 0xd8, 0xc8, 0x67, 0xaf, 0x87, 0xfd, 0xa1, 0xd7, 0xfe, 0x0e, 0x2d, + 0x8b, 0x5f, 0x4c, 0x00, 0x5a, 0x76, 0xea, 0x73, 0x36, 0x66, 0xff, 0xaf, 0x92, 0x8f, 0xf2, 0x96, + 0x27, 0x64, 0xd2, 0x9b, 0x7a, 0x42, 0xb6, 0x1c, 0x7a, 0xca, 0x15, 0xdb, 0xdf, 0x43, 0xcd, 0xbe, + 0xdf, 0x73, 0xc5, 0x6f, 0xc9, 0x7b, 0xae, 0xce, 0x57, 0xcb, 0x13, 0x87, 0xf3, 0x26, 0x24, 0xb9, + 0xef, 0x37, 0x21, 0x97, 0x20, 0xc5, 0x9f, 0x4f, 0xa6, 0x0e, 0xf4, 0x7c, 0x92, 0x73, 0xa3, 0x33, + 0xe2, 0x23, 0xa6, 0x83, 0xfd, 0x5d, 0x4d, 0xe6, 0x5f, 0x39, 0xf5, 0xb7, 0x0a, 0xee, 0x80, 0x42, + 0xbb, 0xd9, 0x78, 0x83, 0xf7, 0xc7, 0x31, 0xc8, 0x2d, 0x3b, 0xf5, 0x4a, 0x4d, 0x73, 0x6f, 0x91, + 0x4d, 0x1d, 0xd2, 0x1b, 0x1b, 0x05, 0x46, 0x5b, 0x5e, 0x12, 0x73, 0x3b, 0x3a, 0x7f, 0xe0, 0x17, + 0x0b, 0x23, 0xe1, 0xf7, 0xc4, 0x68, 0xa7, 0xb3, 0xb9, 0x26, 0xf6, 0x55, 0x4d, 0x5f, 0x4f, 0x0f, + 0xfd, 0xde, 0x29, 0x40, 0xbe, 0x55, 0xfd, 0x5e, 0xdf, 0xbc, 0x2a, 0xc1, 0xd0, 0xb2, 0x23, 0x82, + 0x3b, 0xfc, 0x16, 0x7b, 0xf4, 0x74, 0xce, 0xfb, 0x4e, 0x78, 0xbc, 0x3f, 0xcb, 0x14, 0x5f, 0x0b, + 0xf7, 0x1b, 0x7f, 0x04, 0xc6, 0x03, 0xed, 0xf3, 0xda, 0xfd, 0x5b, 0x31, 0xea, 0xe9, 0xca, 0xb8, + 0xae, 0x19, 0x5e, 0x3c, 0x88, 0x7f, 0x1a, 0x9e, 0x8e, 0xf8, 0x3a, 0x4d, 0x1c, 0x54, 0xa7, 0xbb, + 0x74, 0xb8, 0xb7, 0xe8, 0xce, 0xdb, 0xae, 0xea, 0xf0, 0x58, 0x49, 0x3a, 0xf8, 0x63, 0xa5, 0xe2, + 0x77, 0x24, 0x18, 0x5e, 0x76, 0xea, 0x9b, 0x46, 0xed, 0xff, 0x5b, 0x1b, 0xdd, 0x86, 0x23, 0xa1, + 0x16, 0xde, 0x22, 0x55, 0x9e, 0xfe, 0x68, 0x02, 0xe2, 0xcb, 0x4e, 0x1d, 0xbd, 0x1b, 0x46, 0x5b, + 0xa7, 0xf8, 0xae, 0x91, 0x5b, 0xbb, 0x5f, 0xef, 0xbe, 0xba, 0xea, 0x3e, 0x07, 0xa0, 0x5d, 0x18, + 0x0e, 0xfb, 0xff, 0x13, 0x3d, 0x40, 0x42, 0x94, 0x85, 0x87, 0xfb, 0xa5, 0xf4, 0x2a, 0xfb, 0x19, + 0x48, 0x7b, 0x0e, 0xed, 0xee, 0x1e, 0xdc, 0x82, 0xa8, 0x7b, 0x2c, 0xda, 0xc1, 0x75, 0x10, 0xed, + 0xb5, 0xba, 0x8d, 0x5e, 0xda, 0x6b, 0xa1, 0xed, 0xa9, 0xbd, 0x6e, 0x43, 0x6a, 0x0b, 0x20, 0x60, + 0xff, 0xf7, 0xf6, 0x40, 0xf0, 0xc9, 0x0a, 0x0f, 0xf5, 0x45, 0xe6, 0x9d, 0x38, 0x1d, 0x72, 0xe8, + 0xfc, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xe4, 0xd7, 0x37, 0x9d, 0xd3, 0x97, 0x00, 0x00, } r := bytes.NewReader(gzipped) gzipr, err := compress_gzip.NewReader(r) diff --git a/x/staking/types/tx.pb.go b/x/staking/types/tx.pb.go index 01589be03..a4d3ee97e 100644 --- a/x/staking/types/tx.pb.go +++ b/x/staking/types/tx.pb.go @@ -40,9 +40,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MsgCreateValidator struct { Description Description `protobuf:"bytes,1,opt,name=description,proto3" json:"description"` Commission CommissionRates `protobuf:"bytes,2,opt,name=commission,proto3" json:"commission"` - MinSelfDelegation github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=min_self_delegation,json=minSelfDelegation,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"min_self_delegation" yaml:"min_self_delegation"` - DelegatorAddress string `protobuf:"bytes,4,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty" yaml:"delegator_address"` - ValidatorAddress string `protobuf:"bytes,5,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty" yaml:"validator_address"` + MinSelfDelegation github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=min_self_delegation,json=minSelfDelegation,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"min_self_delegation"` + DelegatorAddress string `protobuf:"bytes,4,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` + ValidatorAddress string `protobuf:"bytes,5,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` Pubkey *types.Any `protobuf:"bytes,6,opt,name=pubkey,proto3" json:"pubkey,omitempty"` Value types1.Coin `protobuf:"bytes,7,opt,name=value,proto3" json:"value"` } @@ -120,13 +120,13 @@ var xxx_messageInfo_MsgCreateValidatorResponse proto.InternalMessageInfo // MsgEditValidator defines a SDK message for editing an existing validator. type MsgEditValidator struct { Description Description `protobuf:"bytes,1,opt,name=description,proto3" json:"description"` - ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty" yaml:"address"` + ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` // We pass a reference to the new commission rate and min self delegation as // it's not mandatory to update. If not updated, the deserialized rate will be // zero with no way to distinguish if an update was intended. // REF: #2373 - CommissionRate *github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=commission_rate,json=commissionRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"commission_rate,omitempty" yaml:"commission_rate"` - MinSelfDelegation *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=min_self_delegation,json=minSelfDelegation,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"min_self_delegation,omitempty" yaml:"min_self_delegation"` + CommissionRate *github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=commission_rate,json=commissionRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"commission_rate,omitempty"` + MinSelfDelegation *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=min_self_delegation,json=minSelfDelegation,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"min_self_delegation,omitempty"` } func (m *MsgEditValidator) Reset() { *m = MsgEditValidator{} } @@ -202,8 +202,8 @@ var xxx_messageInfo_MsgEditValidatorResponse proto.InternalMessageInfo // MsgDelegate defines a SDK message for performing a delegation of coins // from a delegator to a validator. type MsgDelegate struct { - DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty" yaml:"delegator_address"` - ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty" yaml:"validator_address"` + DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` + ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` Amount types1.Coin `protobuf:"bytes,3,opt,name=amount,proto3" json:"amount"` } @@ -280,9 +280,9 @@ var xxx_messageInfo_MsgDelegateResponse proto.InternalMessageInfo // MsgBeginRedelegate defines a SDK message for performing a redelegation // of coins from a delegator and source validator to a destination validator. type MsgBeginRedelegate struct { - DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty" yaml:"delegator_address"` - ValidatorSrcAddress string `protobuf:"bytes,2,opt,name=validator_src_address,json=validatorSrcAddress,proto3" json:"validator_src_address,omitempty" yaml:"validator_src_address"` - ValidatorDstAddress string `protobuf:"bytes,3,opt,name=validator_dst_address,json=validatorDstAddress,proto3" json:"validator_dst_address,omitempty" yaml:"validator_dst_address"` + DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` + ValidatorSrcAddress string `protobuf:"bytes,2,opt,name=validator_src_address,json=validatorSrcAddress,proto3" json:"validator_src_address,omitempty"` + ValidatorDstAddress string `protobuf:"bytes,3,opt,name=validator_dst_address,json=validatorDstAddress,proto3" json:"validator_dst_address,omitempty"` Amount types1.Coin `protobuf:"bytes,4,opt,name=amount,proto3" json:"amount"` } @@ -367,8 +367,8 @@ func (m *MsgBeginRedelegateResponse) GetCompletionTime() time.Time { // MsgUndelegate defines a SDK message for performing an undelegation from a // delegate and a validator. type MsgUndelegate struct { - DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty" yaml:"delegator_address"` - ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty" yaml:"validator_address"` + DelegatorAddress string `protobuf:"bytes,1,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty"` + ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` Amount types1.Coin `protobuf:"bytes,3,opt,name=amount,proto3" json:"amount"` } @@ -466,63 +466,59 @@ func init() { func init() { proto.RegisterFile("cosmos/staking/v1beta1/tx.proto", fileDescriptor_0926ef28816b35ab) } var fileDescriptor_0926ef28816b35ab = []byte{ - // 883 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0xcb, 0x6a, 0xc3, 0x46, - 0x14, 0xb5, 0x6c, 0xc7, 0x4d, 0x27, 0xe4, 0xa5, 0x3c, 0x70, 0x44, 0xb0, 0x82, 0xd3, 0x47, 0x48, - 0x1b, 0xb9, 0x49, 0x5b, 0x5a, 0xb2, 0x8b, 0xe3, 0x06, 0x42, 0x30, 0x14, 0xa5, 0x4d, 0x21, 0x14, - 0xcc, 0x48, 0x1a, 0xab, 0xc2, 0x92, 0x46, 0xd1, 0x8c, 0x43, 0x4c, 0xf7, 0xa5, 0x94, 0x2e, 0xb2, - 0x2a, 0xa5, 0xab, 0x7c, 0x44, 0x3f, 0x22, 0x74, 0x15, 0xba, 0x2a, 0x5d, 0xb8, 0x25, 0xd9, 0x74, - 0xed, 0x2f, 0x28, 0x1a, 0x8d, 0x64, 0x59, 0x7e, 0x60, 0x42, 0x93, 0x55, 0x57, 0x36, 0x9a, 0x33, - 0xe7, 0x8c, 0xce, 0xb9, 0xf7, 0x8e, 0x80, 0xac, 0x63, 0xe2, 0x60, 0x52, 0x21, 0x14, 0xb6, 0x2c, - 0xd7, 0xac, 0x5c, 0xef, 0x6b, 0x88, 0xc2, 0xfd, 0x0a, 0xbd, 0x51, 0x3c, 0x1f, 0x53, 0x2c, 0xae, - 0x87, 0x00, 0x85, 0x03, 0x14, 0x0e, 0x90, 0x36, 0x4c, 0x8c, 0x4d, 0x1b, 0x55, 0x18, 0x4a, 0x6b, - 0x37, 0x2b, 0xd0, 0xed, 0x84, 0x5b, 0x24, 0x39, 0xbd, 0x44, 0x2d, 0x07, 0x11, 0x0a, 0x1d, 0x8f, - 0x03, 0x56, 0x4d, 0x6c, 0x62, 0xf6, 0xb7, 0x12, 0xfc, 0xe3, 0x4f, 0x37, 0x42, 0xa5, 0x46, 0xb8, - 0xc0, 0x65, 0xc3, 0xa5, 0x12, 0x3f, 0xa5, 0x06, 0x09, 0x8a, 0x8f, 0xa8, 0x63, 0xcb, 0xe5, 0xeb, - 0x6f, 0x8d, 0x79, 0x8b, 0xe8, 0xd0, 0x0c, 0x55, 0xfe, 0x71, 0x06, 0x88, 0x75, 0x62, 0x1e, 0xfb, - 0x08, 0x52, 0x74, 0x01, 0x6d, 0xcb, 0x80, 0x14, 0xfb, 0xe2, 0x19, 0x98, 0x33, 0x10, 0xd1, 0x7d, - 0xcb, 0xa3, 0x16, 0x76, 0x8b, 0xc2, 0x96, 0xb0, 0x33, 0x77, 0xb0, 0xad, 0x8c, 0x7e, 0x6f, 0xa5, - 0xd6, 0x87, 0x56, 0xf3, 0xf7, 0x5d, 0x39, 0xa3, 0x26, 0x77, 0x8b, 0x75, 0x00, 0x74, 0xec, 0x38, - 0x16, 0x21, 0x01, 0x57, 0x96, 0x71, 0xbd, 0x3b, 0x8e, 0xeb, 0x38, 0x46, 0xaa, 0x90, 0x22, 0xc2, - 0xf9, 0x12, 0x04, 0xe2, 0x0f, 0x02, 0x58, 0x71, 0x2c, 0xb7, 0x41, 0x90, 0xdd, 0x6c, 0x18, 0xc8, - 0x46, 0x26, 0x64, 0x87, 0xcc, 0x6d, 0x09, 0x3b, 0x6f, 0x56, 0x2f, 0x03, 0xfc, 0x9f, 0x5d, 0xf9, - 0x1d, 0xd3, 0xa2, 0xdf, 0xb4, 0x35, 0x45, 0xc7, 0x0e, 0xf7, 0x8d, 0xff, 0xec, 0x11, 0xa3, 0x55, - 0xa1, 0x1d, 0x0f, 0x11, 0xe5, 0xd4, 0xa5, 0xbd, 0xae, 0x2c, 0x75, 0xa0, 0x63, 0x1f, 0x96, 0x47, - 0x50, 0x96, 0x7f, 0xff, 0x75, 0x0f, 0xf0, 0x73, 0x9e, 0xba, 0x54, 0x5d, 0x76, 0x2c, 0xf7, 0x1c, - 0xd9, 0xcd, 0x5a, 0x8c, 0x10, 0x21, 0x58, 0xe6, 0x78, 0xec, 0x37, 0xa0, 0x61, 0xf8, 0x88, 0x90, - 0x62, 0x9e, 0x9d, 0xe4, 0xa3, 0x5e, 0x57, 0x2e, 0x86, 0xdc, 0x43, 0x90, 0x80, 0x79, 0x95, 0x33, - 0x1f, 0x85, 0x8f, 0xce, 0xa9, 0x6f, 0xb9, 0xa6, 0xba, 0x14, 0x63, 0xf9, 0xf3, 0x40, 0xe2, 0x3a, - 0x0a, 0x26, 0x96, 0x98, 0x49, 0x4b, 0x0c, 0x41, 0x26, 0x48, 0xc4, 0xd8, 0x48, 0xe2, 0x04, 0x14, - 0xbc, 0xb6, 0xd6, 0x42, 0x9d, 0x62, 0x81, 0xa5, 0xb3, 0xaa, 0x84, 0xe5, 0xaa, 0x44, 0xe5, 0xaa, - 0x1c, 0xb9, 0x9d, 0x6a, 0xf1, 0xb7, 0x3e, 0xa3, 0xee, 0x77, 0x3c, 0x8a, 0x95, 0xcf, 0xdb, 0xda, - 0x19, 0xea, 0xa8, 0x7c, 0xb7, 0xf8, 0x31, 0x98, 0xb9, 0x86, 0x76, 0x1b, 0x15, 0xdf, 0x60, 0x34, - 0x1b, 0x51, 0xc8, 0x41, 0x8d, 0x26, 0x12, 0xb6, 0xa2, 0x32, 0x09, 0xd1, 0x87, 0xb3, 0xdf, 0xdf, - 0xc9, 0x99, 0x7f, 0xee, 0xe4, 0x4c, 0x79, 0x13, 0x48, 0xc3, 0xd5, 0xa8, 0x22, 0xe2, 0x61, 0x97, - 0xa0, 0xf2, 0x7d, 0x0e, 0x2c, 0xd5, 0x89, 0xf9, 0x99, 0x61, 0xd1, 0x17, 0x2a, 0xd5, 0xaf, 0x46, - 0x79, 0x9d, 0x65, 0x5e, 0xef, 0xf6, 0xba, 0xf2, 0x42, 0xe8, 0xf5, 0x33, 0x1c, 0xfe, 0x16, 0x2c, - 0xf6, 0x4b, 0xb8, 0xe1, 0x43, 0x8a, 0x78, 0xbd, 0xaa, 0x53, 0xd6, 0x6a, 0x0d, 0xe9, 0xbd, 0xae, - 0xbc, 0x1e, 0x1e, 0x20, 0x45, 0x95, 0xac, 0xd3, 0x1a, 0xd2, 0xd5, 0x05, 0x7d, 0xa0, 0x89, 0xc4, - 0xef, 0xc6, 0x74, 0x4c, 0x58, 0xa7, 0x17, 0xaf, 0xd6, 0x2d, 0x89, 0xa0, 0x25, 0x50, 0x4c, 0x27, - 0x19, 0xc7, 0xfc, 0x53, 0x16, 0xcc, 0xd5, 0x89, 0xc9, 0xf7, 0xa1, 0xd1, 0x3d, 0x26, 0xbc, 0x7c, - 0x8f, 0x65, 0xff, 0xd3, 0x1e, 0xfb, 0x04, 0x14, 0xa0, 0x83, 0xdb, 0x2e, 0x65, 0xc1, 0x4f, 0xd1, - 0x1c, 0x1c, 0x9e, 0x30, 0x6d, 0x0d, 0xac, 0x24, 0x7c, 0xe9, 0xfb, 0x95, 0x63, 0x33, 0xbc, 0x8a, - 0x4c, 0xcb, 0x55, 0x91, 0xf1, 0x8a, 0xb6, 0xd9, 0x60, 0xad, 0xef, 0x09, 0xf1, 0xf5, 0x94, 0x75, - 0x9f, 0xf6, 0xba, 0xf2, 0x66, 0xda, 0xba, 0x04, 0x6c, 0xbc, 0xd4, 0x4a, 0x8c, 0x3f, 0xf7, 0xf5, - 0x91, 0x6a, 0x06, 0xa1, 0xb1, 0x5a, 0x6e, 0xbc, 0x5a, 0x02, 0x36, 0x8d, 0x5a, 0x8d, 0xd0, 0xe1, - 0xbc, 0xf2, 0xcf, 0xcd, 0xab, 0xc5, 0xa6, 0x59, 0x2a, 0x97, 0x28, 0x36, 0xb1, 0xce, 0x46, 0x82, - 0x67, 0xa3, 0xa0, 0x35, 0x1a, 0xc1, 0xf7, 0x00, 0x1f, 0x5e, 0xd2, 0xd0, 0xf4, 0xfd, 0x22, 0xfa, - 0x58, 0xa8, 0xce, 0x06, 0x52, 0xb7, 0x7f, 0xc9, 0x02, 0x6b, 0x72, 0xbe, 0x39, 0x58, 0x2e, 0xff, - 0x9c, 0x05, 0xf3, 0x75, 0x62, 0x7e, 0xe9, 0x1a, 0xff, 0xf7, 0x4d, 0x2a, 0x87, 0x26, 0x58, 0x1b, - 0x70, 0xe6, 0x85, 0x22, 0x38, 0xf8, 0x25, 0x0f, 0x72, 0x75, 0x62, 0x8a, 0x57, 0x60, 0x31, 0xfd, - 0x41, 0xb5, 0x3b, 0xee, 0x42, 0x1a, 0xbe, 0xee, 0xa4, 0x83, 0xe9, 0xb1, 0xf1, 0x9b, 0xb4, 0xc0, - 0xfc, 0xe0, 0xb5, 0xb8, 0x33, 0x81, 0x64, 0x00, 0x29, 0x7d, 0x30, 0x2d, 0x32, 0x16, 0xfb, 0x1a, - 0xcc, 0xc6, 0xc3, 0x79, 0x7b, 0xc2, 0xee, 0x08, 0x24, 0xbd, 0x37, 0x05, 0x28, 0x66, 0xbf, 0x02, - 0x8b, 0xe9, 0x51, 0x36, 0xc9, 0xbd, 0x14, 0x76, 0xa2, 0x7b, 0xe3, 0x5a, 0x51, 0x03, 0x20, 0xd1, - 0x37, 0x6f, 0x4f, 0x60, 0xe8, 0xc3, 0xa4, 0xbd, 0xa9, 0x60, 0x91, 0x46, 0xf5, 0xe4, 0xfe, 0xb1, - 0x24, 0x3c, 0x3c, 0x96, 0x84, 0xbf, 0x1f, 0x4b, 0xc2, 0xed, 0x53, 0x29, 0xf3, 0xf0, 0x54, 0xca, - 0xfc, 0xf1, 0x54, 0xca, 0x5c, 0xbe, 0x3f, 0xf1, 0xf2, 0xbd, 0x89, 0xbf, 0xe0, 0xd9, 0x35, 0xac, - 0x15, 0x58, 0x49, 0x7e, 0xf8, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf6, 0x6d, 0xbb, 0x83, 0xa6, - 0x0c, 0x00, 0x00, + // 822 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x56, 0xcd, 0x4e, 0xdb, 0x4a, + 0x14, 0x8e, 0x43, 0xc8, 0xe5, 0x0e, 0xe2, 0x02, 0x06, 0xae, 0x82, 0x75, 0x95, 0xa0, 0x70, 0x7f, + 0xd0, 0xbd, 0x37, 0x4e, 0xa1, 0xaa, 0x5a, 0x55, 0xdd, 0x10, 0x02, 0x12, 0xa2, 0x91, 0x2a, 0xd3, + 0x76, 0x51, 0x55, 0x8a, 0xfc, 0x33, 0x31, 0x56, 0x6c, 0x8f, 0xf1, 0x4c, 0x10, 0x79, 0x83, 0x2e, + 0x59, 0x77, 0xc5, 0x43, 0xd0, 0x4d, 0x9f, 0x00, 0x75, 0x85, 0x58, 0x55, 0x5d, 0x50, 0x04, 0x9b, + 0xbe, 0x44, 0xa5, 0xca, 0xe3, 0xf1, 0xc4, 0xf9, 0xad, 0xa9, 0x60, 0xd3, 0x15, 0x91, 0xcf, 0x77, + 0xbe, 0x33, 0xe7, 0x3b, 0xdf, 0x9c, 0x01, 0x14, 0x74, 0x84, 0x1d, 0x84, 0xcb, 0x98, 0xa8, 0x4d, + 0xcb, 0x35, 0xcb, 0x07, 0xab, 0x1a, 0x24, 0xea, 0x6a, 0x99, 0x1c, 0xca, 0x9e, 0x8f, 0x08, 0x12, + 0x7f, 0x0f, 0x01, 0x32, 0x03, 0xc8, 0x0c, 0x20, 0x2d, 0x9a, 0x08, 0x99, 0x36, 0x2c, 0x53, 0x94, + 0xd6, 0x6a, 0x94, 0x55, 0xb7, 0x1d, 0xa6, 0x48, 0x85, 0xde, 0x10, 0xb1, 0x1c, 0x88, 0x89, 0xea, + 0x78, 0x0c, 0x30, 0x6f, 0x22, 0x13, 0xd1, 0x9f, 0xe5, 0xe0, 0x17, 0xfb, 0xba, 0x18, 0x56, 0xaa, + 0x87, 0x01, 0x56, 0x36, 0x0c, 0xe5, 0xd9, 0x29, 0x35, 0x15, 0x43, 0x7e, 0x44, 0x1d, 0x59, 0x2e, + 0x8b, 0xff, 0x39, 0xa4, 0x8b, 0xe8, 0xd0, 0x14, 0x55, 0x7c, 0x97, 0x01, 0x62, 0x0d, 0x9b, 0x1b, + 0x3e, 0x54, 0x09, 0x7c, 0xa9, 0xda, 0x96, 0xa1, 0x12, 0xe4, 0x8b, 0x3b, 0x60, 0xd2, 0x80, 0x58, + 0xf7, 0x2d, 0x8f, 0x58, 0xc8, 0xcd, 0x09, 0x4b, 0xc2, 0xca, 0xe4, 0xda, 0xb2, 0x3c, 0xb8, 0x6f, + 0xb9, 0xda, 0x81, 0x56, 0x32, 0xa7, 0x17, 0x85, 0x94, 0x12, 0xcf, 0x16, 0x6b, 0x00, 0xe8, 0xc8, + 0x71, 0x2c, 0x8c, 0x03, 0xae, 0x34, 0xe5, 0xfa, 0x67, 0x18, 0xd7, 0x06, 0x47, 0x2a, 0x2a, 0x81, + 0x98, 0xf1, 0xc5, 0x08, 0x44, 0x1b, 0xcc, 0x39, 0x96, 0x5b, 0xc7, 0xd0, 0x6e, 0xd4, 0x0d, 0x68, + 0x43, 0x53, 0xa5, 0x67, 0x1c, 0x5b, 0x12, 0x56, 0x7e, 0xad, 0x3c, 0x09, 0xe0, 0x9f, 0x2e, 0x0a, + 0x7f, 0x9b, 0x16, 0xd9, 0x6b, 0x69, 0xb2, 0x8e, 0x1c, 0x26, 0x1b, 0xfb, 0x53, 0xc2, 0x46, 0xb3, + 0x4c, 0xda, 0x1e, 0xc4, 0xf2, 0xb6, 0x4b, 0xce, 0x4f, 0x4a, 0x80, 0x1d, 0x64, 0xdb, 0x25, 0xca, + 0xac, 0x63, 0xb9, 0xbb, 0xd0, 0x6e, 0x54, 0x39, 0xad, 0xb8, 0x09, 0x66, 0x59, 0x11, 0xe4, 0xd7, + 0x55, 0xc3, 0xf0, 0x21, 0xc6, 0xb9, 0x0c, 0xad, 0x95, 0x3b, 0x3f, 0x29, 0xcd, 0xb3, 0xec, 0xf5, + 0x30, 0xb2, 0x4b, 0x7c, 0xcb, 0x35, 0x95, 0x19, 0x9e, 0xc2, 0xbe, 0x07, 0x34, 0x07, 0x91, 0xba, + 0x9c, 0x66, 0xfc, 0x7b, 0x34, 0x3c, 0x25, 0xa2, 0xd9, 0x02, 0x59, 0xaf, 0xa5, 0x35, 0x61, 0x3b, + 0x97, 0xa5, 0x32, 0xce, 0xcb, 0xa1, 0xaf, 0xe4, 0xc8, 0x57, 0xf2, 0xba, 0xdb, 0xae, 0xe4, 0x3e, + 0x74, 0x18, 0x75, 0xbf, 0xed, 0x11, 0x24, 0x3f, 0x6b, 0x69, 0x3b, 0xb0, 0xad, 0xb0, 0x6c, 0xf1, + 0x01, 0x18, 0x3f, 0x50, 0xed, 0x16, 0xcc, 0xfd, 0x42, 0x69, 0x16, 0xa3, 0x69, 0x04, 0x66, 0x8a, + 0x8d, 0xc2, 0x8a, 0xe6, 0x19, 0xa2, 0x1f, 0x4f, 0xbc, 0x39, 0x2e, 0xa4, 0xbe, 0x1c, 0x17, 0x52, + 0xc5, 0x3f, 0x80, 0xd4, 0x6f, 0x1b, 0x05, 0x62, 0x0f, 0xb9, 0x18, 0x16, 0xbf, 0xa6, 0xc1, 0x4c, + 0x0d, 0x9b, 0x9b, 0x86, 0x45, 0xee, 0xc8, 0x53, 0x03, 0xf5, 0x4c, 0xdf, 0x58, 0x4f, 0x15, 0x4c, + 0x77, 0x9c, 0x55, 0xf7, 0x55, 0x02, 0x99, 0x8f, 0x1e, 0x25, 0xf4, 0x50, 0x15, 0xea, 0x31, 0x0f, + 0x55, 0xa1, 0xae, 0xfc, 0xa6, 0x77, 0x39, 0x58, 0xdc, 0x1b, 0x6c, 0xd7, 0xcc, 0x8d, 0xca, 0x24, + 0xb1, 0x6a, 0x6c, 0x3a, 0x12, 0xc8, 0xf5, 0xca, 0xcf, 0x67, 0x73, 0x21, 0x80, 0xc9, 0x1a, 0x36, + 0x59, 0x1e, 0x1c, 0x6c, 0x70, 0xe1, 0x76, 0x0c, 0x7e, 0xf3, 0x81, 0x3c, 0x04, 0x59, 0xd5, 0x41, + 0x2d, 0x97, 0xd0, 0x39, 0x24, 0x70, 0x26, 0x83, 0xc7, 0x9a, 0x5f, 0x00, 0x73, 0xb1, 0xfe, 0x78, + 0xdf, 0xef, 0xd3, 0x74, 0xd3, 0x55, 0xa0, 0x69, 0xb9, 0x0a, 0x34, 0x6e, 0xb9, 0xfd, 0xa7, 0x60, + 0xa1, 0xd3, 0x3e, 0xf6, 0xf5, 0xc4, 0x12, 0xcc, 0xf1, 0xb4, 0x5d, 0x5f, 0x1f, 0xc8, 0x66, 0x60, + 0xc2, 0xd9, 0xc6, 0x12, 0xb3, 0x55, 0x31, 0xe9, 0xd7, 0x34, 0xf3, 0xa3, 0x9a, 0x36, 0xe9, 0x75, + 0xef, 0xd1, 0x2e, 0x92, 0x56, 0xac, 0xd1, 0x5b, 0xe4, 0xd9, 0x30, 0xb0, 0x61, 0x3d, 0x78, 0xd9, + 0xd8, 0xed, 0x96, 0xfa, 0xd6, 0xd3, 0xf3, 0xe8, 0xd9, 0xab, 0x4c, 0x04, 0xa5, 0x8e, 0x3e, 0x17, + 0x04, 0x7a, 0x63, 0x58, 0x72, 0x10, 0x2e, 0x5e, 0x0a, 0x60, 0xaa, 0x86, 0xcd, 0x17, 0xae, 0xf1, + 0xd3, 0x7a, 0xb4, 0x01, 0x16, 0xba, 0x3a, 0xbc, 0x23, 0x29, 0xd7, 0xde, 0x66, 0xc0, 0x58, 0x0d, + 0x9b, 0xe2, 0x3e, 0x98, 0xee, 0x7d, 0xe2, 0xff, 0x1d, 0xb6, 0x79, 0xfb, 0xf7, 0xba, 0xb4, 0x96, + 0x1c, 0xcb, 0x3b, 0x69, 0x82, 0xa9, 0xee, 0xfd, 0xbf, 0x32, 0x82, 0xa4, 0x0b, 0x29, 0xdd, 0x4b, + 0x8a, 0xe4, 0xc5, 0x5e, 0x83, 0x09, 0xbe, 0xd0, 0x96, 0x47, 0x64, 0x47, 0x20, 0xe9, 0xbf, 0x04, + 0x20, 0xce, 0xbe, 0x0f, 0xa6, 0x7b, 0xd7, 0xc6, 0x28, 0xf5, 0x7a, 0xb0, 0x23, 0xd5, 0x1b, 0x76, + 0xa5, 0x34, 0x00, 0x62, 0xfe, 0xff, 0x6b, 0x04, 0x43, 0x07, 0x26, 0x95, 0x12, 0xc1, 0xa2, 0x1a, + 0x95, 0xad, 0xd3, 0xab, 0xbc, 0x70, 0x76, 0x95, 0x17, 0x2e, 0xaf, 0xf2, 0xc2, 0xd1, 0x75, 0x3e, + 0x75, 0x76, 0x9d, 0x4f, 0x7d, 0xbc, 0xce, 0xa7, 0x5e, 0xfd, 0x3f, 0xf2, 0x49, 0x3a, 0xe4, 0xff, + 0x53, 0xd2, 0xc7, 0x49, 0xcb, 0x52, 0x4b, 0xde, 0xff, 0x16, 0x00, 0x00, 0xff, 0xff, 0x9a, 0xd5, + 0xae, 0x16, 0x38, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/staking/types/validator.go b/x/staking/types/validator.go index ed394acf4..79bd2a4f5 100644 --- a/x/staking/types/validator.go +++ b/x/staking/types/validator.go @@ -9,7 +9,7 @@ import ( abci "github.com/tendermint/tendermint/abci/types" tmprotocrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" - "gopkg.in/yaml.v2" + "sigs.k8s.io/yaml" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -62,7 +62,16 @@ func NewValidator(operator sdk.ValAddress, pubKey cryptotypes.PubKey, descriptio // String implements the Stringer interface for a Validator object. func (v Validator) String() string { - out, _ := yaml.Marshal(v) + bz, err := codec.ProtoMarshalJSON(&v, nil) + if err != nil { + panic(err) + } + + out, err := yaml.JSONToYAML(bz) + if err != nil { + panic(err) + } + return string(out) } diff --git a/x/upgrade/types/upgrade.pb.go b/x/upgrade/types/upgrade.pb.go index f3b0b2d5a..7d496f5bd 100644 --- a/x/upgrade/types/upgrade.pb.go +++ b/x/upgrade/types/upgrade.pb.go @@ -51,7 +51,7 @@ type Plan struct { // Deprecated: UpgradedClientState field has been deprecated. IBC upgrade logic has been // moved to the IBC module in the sub module 02-client. // If this field is not empty, an error will be thrown. - UpgradedClientState *types.Any `protobuf:"bytes,5,opt,name=upgraded_client_state,json=upgradedClientState,proto3" json:"upgraded_client_state,omitempty" yaml:"upgraded_client_state"` // Deprecated: Do not use. + UpgradedClientState *types.Any `protobuf:"bytes,5,opt,name=upgraded_client_state,json=upgradedClientState,proto3" json:"upgraded_client_state,omitempty"` // Deprecated: Do not use. } func (m *Plan) Reset() { *m = Plan{} } @@ -218,36 +218,36 @@ func init() { } var fileDescriptor_ccf2a7d4d7b48dca = []byte{ - // 462 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0x3d, 0x6f, 0xd3, 0x40, - 0x18, 0xf6, 0x51, 0xb7, 0xd0, 0x8b, 0x58, 0x8e, 0x50, 0x4c, 0x54, 0xec, 0xc8, 0x62, 0xc8, 0x00, - 0x67, 0xb5, 0x48, 0x0c, 0xd9, 0x48, 0x07, 0x24, 0x24, 0xa4, 0xca, 0x05, 0x06, 0x96, 0xea, 0x62, - 0x5f, 0x9c, 0x13, 0xe7, 0x3b, 0xcb, 0x77, 0x29, 0xe4, 0x5f, 0x54, 0x62, 0x61, 0xec, 0xcf, 0xc9, - 0xd8, 0x91, 0x29, 0x40, 0xb2, 0x30, 0x33, 0x32, 0xa1, 0xbb, 0xb3, 0x51, 0x04, 0x19, 0x3b, 0xf9, - 0xfd, 0x78, 0xde, 0xe7, 0x79, 0x3f, 0x7c, 0xf0, 0x71, 0x26, 0x55, 0x29, 0x55, 0x32, 0xab, 0x8a, - 0x9a, 0xe4, 0x34, 0xb9, 0x38, 0x1a, 0x53, 0x4d, 0x8e, 0x5a, 0x1f, 0x57, 0xb5, 0xd4, 0x12, 0x1d, - 0x38, 0x14, 0x6e, 0xa3, 0x0d, 0xaa, 0xf7, 0xb0, 0x90, 0xb2, 0xe0, 0x34, 0xb1, 0xa8, 0xf1, 0x6c, - 0x92, 0x10, 0x31, 0x77, 0x25, 0xbd, 0x6e, 0x21, 0x0b, 0x69, 0xcd, 0xc4, 0x58, 0x4d, 0x34, 0xfa, - 0xb7, 0x40, 0xb3, 0x92, 0x2a, 0x4d, 0xca, 0xca, 0x01, 0xe2, 0xdf, 0x00, 0xfa, 0xa7, 0x9c, 0x08, - 0x84, 0xa0, 0x2f, 0x48, 0x49, 0x03, 0xd0, 0x07, 0x83, 0xfd, 0xd4, 0xda, 0x68, 0x08, 0x7d, 0x83, - 0x0f, 0x6e, 0xf5, 0xc1, 0xa0, 0x73, 0xdc, 0xc3, 0x8e, 0x0c, 0xb7, 0x64, 0xf8, 0x4d, 0x4b, 0x36, - 0x82, 0x8b, 0x65, 0xe4, 0x5d, 0x7e, 0x8b, 0x40, 0x00, 0x52, 0x5b, 0x83, 0x0e, 0xe0, 0xde, 0x94, - 0xb2, 0x62, 0xaa, 0x83, 0x9d, 0x3e, 0x18, 0xec, 0xa4, 0x8d, 0x67, 0x74, 0x98, 0x98, 0xc8, 0xc0, - 0x77, 0x3a, 0xc6, 0x46, 0x1c, 0xde, 0x6f, 0x26, 0xcd, 0xcf, 0x33, 0xce, 0xa8, 0xd0, 0xe7, 0x4a, - 0x13, 0x4d, 0x83, 0x5d, 0x2b, 0xdc, 0xfd, 0x4f, 0xf8, 0x85, 0x98, 0x8f, 0xe2, 0x5f, 0xcb, 0xe8, - 0x70, 0x4e, 0x4a, 0x3e, 0x8c, 0xb7, 0x16, 0xc7, 0x01, 0x48, 0xef, 0xb5, 0x99, 0x13, 0x9b, 0x38, - 0x33, 0xf1, 0xe1, 0x9d, 0x2f, 0x57, 0x91, 0xf7, 0xf3, 0x2a, 0x02, 0xf1, 0x67, 0x00, 0x1f, 0x9c, - 0xc9, 0x89, 0xfe, 0x48, 0x6a, 0xfa, 0xd6, 0x21, 0x4f, 0x6b, 0x59, 0x49, 0x45, 0x38, 0xea, 0xc2, - 0x5d, 0xcd, 0x34, 0x6f, 0x17, 0xe2, 0x1c, 0xd4, 0x87, 0x9d, 0x9c, 0xaa, 0xac, 0x66, 0x95, 0x66, - 0x52, 0xd8, 0xc5, 0xec, 0xa7, 0x9b, 0x21, 0xf4, 0x1c, 0xfa, 0x15, 0x27, 0xc2, 0x4e, 0xdd, 0x39, - 0x3e, 0xc4, 0xdb, 0x2f, 0x89, 0xcd, 0xce, 0x47, 0xbe, 0xd9, 0x5a, 0x6a, 0xf1, 0x1b, 0x5d, 0x11, - 0xf8, 0xe8, 0x84, 0x88, 0x8c, 0xf2, 0x1b, 0x6e, 0x6d, 0x43, 0xe2, 0x25, 0xbc, 0xfb, 0x5a, 0xe6, - 0x33, 0x4e, 0xdf, 0xd1, 0x5a, 0x99, 0xae, 0xb7, 0x5d, 0x3f, 0x80, 0xb7, 0x2f, 0x5c, 0xda, 0x92, - 0xf9, 0x69, 0xeb, 0x5a, 0x22, 0x60, 0x88, 0x46, 0xaf, 0x16, 0x3f, 0x42, 0x6f, 0xb1, 0x0a, 0xc1, - 0xf5, 0x2a, 0x04, 0xdf, 0x57, 0x21, 0xb8, 0x5c, 0x87, 0xde, 0xf5, 0x3a, 0xf4, 0xbe, 0xae, 0x43, - 0xef, 0xfd, 0x93, 0x82, 0xe9, 0xe9, 0x6c, 0x8c, 0x33, 0x59, 0x26, 0xcd, 0x7f, 0xef, 0x3e, 0x4f, - 0x55, 0xfe, 0x21, 0xf9, 0xf4, 0xf7, 0x11, 0xe8, 0x79, 0x45, 0xd5, 0x78, 0xcf, 0x9e, 0xf7, 0xd9, - 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2b, 0x67, 0xe1, 0x07, 0x23, 0x03, 0x00, 0x00, + // 450 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x52, 0x3f, 0x6f, 0xd4, 0x30, + 0x14, 0x8f, 0xdb, 0xb4, 0x50, 0x9f, 0x58, 0xcc, 0x51, 0xcc, 0x09, 0x92, 0x53, 0xc5, 0x70, 0x03, + 0x38, 0x6a, 0x91, 0x18, 0xba, 0x71, 0x1d, 0x90, 0x10, 0x48, 0x55, 0x0a, 0x0c, 0x2c, 0x95, 0x2f, + 0xf1, 0xe5, 0x2c, 0x1c, 0x3b, 0x8a, 0x9d, 0xc2, 0x7d, 0x8b, 0x4a, 0x2c, 0x8c, 0xfd, 0x38, 0x37, + 0x76, 0x44, 0x0c, 0xfc, 0xb9, 0x5b, 0xf8, 0x18, 0xc8, 0x76, 0x82, 0x4e, 0x70, 0x23, 0x53, 0xde, + 0x7b, 0xf9, 0xfd, 0x79, 0xcf, 0xef, 0xc1, 0x87, 0x99, 0xd2, 0xa5, 0xd2, 0x49, 0x53, 0x15, 0x35, + 0xcd, 0x59, 0x72, 0x71, 0x38, 0x61, 0x86, 0x1e, 0x76, 0x39, 0xa9, 0x6a, 0x65, 0x14, 0xda, 0xf7, + 0x28, 0xd2, 0x55, 0x5b, 0xd4, 0xe0, 0x5e, 0xa1, 0x54, 0x21, 0x58, 0xe2, 0x50, 0x93, 0x66, 0x9a, + 0x50, 0x39, 0xf7, 0x94, 0x41, 0xbf, 0x50, 0x85, 0x72, 0x61, 0x62, 0xa3, 0xb6, 0x1a, 0xff, 0x4d, + 0x30, 0xbc, 0x64, 0xda, 0xd0, 0xb2, 0xf2, 0x80, 0x83, 0xaf, 0x00, 0x86, 0xa7, 0x82, 0x4a, 0x84, + 0x60, 0x28, 0x69, 0xc9, 0x30, 0x18, 0x82, 0xd1, 0x5e, 0xea, 0x62, 0x74, 0x0c, 0x43, 0x8b, 0xc7, + 0x5b, 0x43, 0x30, 0xea, 0x1d, 0x0d, 0x88, 0x17, 0x23, 0x9d, 0x18, 0x79, 0xdd, 0x89, 0x8d, 0xe1, + 0xe2, 0x5b, 0x1c, 0x5c, 0x7e, 0x8f, 0x01, 0x06, 0xa9, 0xe3, 0xa0, 0x7d, 0xb8, 0x3b, 0x63, 0xbc, + 0x98, 0x19, 0xbc, 0x3d, 0x04, 0xa3, 0xed, 0xb4, 0xcd, 0xac, 0x0f, 0x97, 0x53, 0x85, 0x43, 0xef, + 0x63, 0x63, 0xf4, 0x12, 0xde, 0x69, 0x27, 0xcd, 0xcf, 0x33, 0xc1, 0x99, 0x34, 0xe7, 0xda, 0x50, + 0xc3, 0xf0, 0x8e, 0x33, 0xee, 0xff, 0x63, 0xfc, 0x4c, 0xce, 0xc7, 0x5b, 0x18, 0xa4, 0xb7, 0x3b, + 0xda, 0x89, 0x63, 0x9d, 0x59, 0xd2, 0xf1, 0xcd, 0xcf, 0x57, 0x71, 0xf0, 0xeb, 0x2a, 0x06, 0x07, + 0x9f, 0x00, 0xbc, 0x7b, 0xa6, 0xa6, 0xe6, 0x03, 0xad, 0xd9, 0x1b, 0x8f, 0x3c, 0xad, 0x55, 0xa5, + 0x34, 0x15, 0xa8, 0x0f, 0x77, 0x0c, 0x37, 0xa2, 0x1b, 0xd8, 0x27, 0x68, 0x08, 0x7b, 0x39, 0xd3, + 0x59, 0xcd, 0x2b, 0xc3, 0x95, 0x74, 0x83, 0xef, 0xa5, 0xeb, 0x25, 0xf4, 0x14, 0x86, 0x95, 0xa0, + 0xd2, 0x4d, 0xd5, 0x3b, 0xba, 0x4f, 0x36, 0x6f, 0x8a, 0xd8, 0x37, 0x1d, 0x87, 0xf6, 0x55, 0x52, + 0x87, 0x5f, 0xeb, 0x8a, 0xc2, 0x07, 0x27, 0x54, 0x66, 0x4c, 0xfc, 0xe7, 0xd6, 0xd6, 0x2c, 0x9e, + 0xc3, 0x5b, 0xaf, 0x54, 0xde, 0x08, 0xf6, 0x96, 0xd5, 0xda, 0x76, 0xbd, 0x69, 0xbb, 0x18, 0xde, + 0xb8, 0xf0, 0xbf, 0x9d, 0x58, 0x98, 0x76, 0xa9, 0x13, 0x02, 0x56, 0x68, 0xfc, 0x62, 0xf1, 0x33, + 0x0a, 0x16, 0xcb, 0x08, 0x5c, 0x2f, 0x23, 0xf0, 0x63, 0x19, 0x81, 0xcb, 0x55, 0x14, 0x5c, 0xaf, + 0xa2, 0xe0, 0xcb, 0x2a, 0x0a, 0xde, 0x3d, 0x2a, 0xb8, 0x99, 0x35, 0x13, 0x92, 0xa9, 0x32, 0x69, + 0xef, 0xda, 0x7f, 0x1e, 0xeb, 0xfc, 0x7d, 0xf2, 0xf1, 0xcf, 0x91, 0x9b, 0x79, 0xc5, 0xf4, 0x64, + 0xd7, 0xad, 0xef, 0xc9, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6d, 0x2b, 0xd1, 0x8c, 0x03, 0x03, + 0x00, 0x00, } func (this *Plan) Equal(that interface{}) bool {