From bc07d066476908b8e5696672061f29e0f28f1507 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Tue, 5 Jun 2018 23:37:15 -0700 Subject: [PATCH 1/6] update changelog, version, spec --- CHANGELOG.md | 19 ++++++-- specification.md | 114 +++++++++++++++++++++++++++++++++++++-------- version/version.go | 6 +-- 3 files changed, 113 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f966c3433..2584353d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,10 +6,23 @@ BREAKING CHANGES: -- [types] Added `type` field to `Evidence` (opaque bytes indicating kind of fraud) -- [types] Added `time` field to `Evidence` (note that this is the timestamp of the block which was double-signed, not the time the evidence was received) +- [example/dummy] Remove. See example/kvstore +- [types] Upgrade many messages: + - RequestInitChain takes all fields from a Genesis file + - RequestBeginBlock provides a list of all validators and whether or not + they signed + - Header: remove some fields, add proposer + - BlockID, PartSetHeader: remove + - Validator: includes address + - PubKey: new message with `type` and `data` + - Evidence: add type and more fields -TODO +FEATURES: + +- [types] Add some fields + - ResponseInitChain includes ConsensusParams and Validators + - ResponseBeginBlock includes tags + - ResponseEndBlock includes tags ## 0.10.3 (April 9, 2018) diff --git a/specification.md b/specification.md index e3d86c0a4..3d8a905c1 100644 --- a/specification.md +++ b/specification.md @@ -50,11 +50,13 @@ connection. They may be referred to as the `DeliverTx state`, the See below for more details on the message types and how they are used. +## Request/Response Messages + ### Echo -- **Arguments**: +- **Request**: - `Message (string)`: A string to echo back -- **Returns**: +- **Response**: - `Message (string)`: The input string - **Usage**: - Echo a string to test an abci client/server implementation @@ -70,9 +72,9 @@ See below for more details on the message types and how they are used. ### Info -- **Arguments**: +- **Request**: - `Version (string)`: The Tendermint version -- **Returns**: +- **Response**: - `Data (string)`: Some arbitrary information - `Version (Version)`: Version information - `LastBlockHeight (int64)`: Latest block for which the app has @@ -88,10 +90,10 @@ See below for more details on the message types and how they are used. ### SetOption -- **Arguments**: +- **Request**: - `Key (string)`: Key to set - `Value (string)`: Value to set for key -- **Returns**: +- **Response**: - `Code (uint32)`: Response code - `Log (string)`: The output of the application's logger. May be non-deterministic. @@ -105,15 +107,19 @@ See below for more details on the message types and how they are used. ### InitChain -- **Arguments**: +- **Request**: - `Validators ([]Validator)`: Initial genesis validators - `AppStateBytes ([]byte)`: Serialized initial application state +- **Response**: + - `ConsensusParams (ConsensusParams)`: Initial + consensus-critical parameters. + - `Validators ([]Validator)`: Initial validator set. - **Usage**: - Called once upon genesis. ### Query -- **Arguments**: +- **Request**: - `Data ([]byte)`: Raw query bytes. Can be used with or in lieu of Path. - `Path (string)`: Path of request, like an HTTP GET path. Can be @@ -128,7 +134,7 @@ See below for more details on the message types and how they are used. application's Merkle root hash, which represents the state as it was after committing the block at Height-1 - `Prove (bool)`: Return Merkle proof with response if possible -- **Returns**: +- **Response**: - `Code (uint32)`: Response code. - `Log (string)`: The output of the application's logger. May be non-deterministic. @@ -148,26 +154,28 @@ See below for more details on the message types and how they are used. ### BeginBlock -- **Arguments**: +- **Request**: - `Hash ([]byte)`: The block's hash. This can be derived from the block header. - `Header (struct{})`: The block header - - `AbsentValidators ([]int32)`: List of indices of validators not - included in the LastCommit + - `Validators ([]SigningValidator)`: List of validators in the current validator + set and whether or not they signed a vote in the LastCommit - `ByzantineValidators ([]Evidence)`: List of evidence of validators that acted maliciously +- **Response**: + - `Tags ([]cmn.KVPair)`: Key-Value tags for filtering and indexing - **Usage**: - Signals the beginning of a new block. Called prior to any DeliverTxs. - The header is expected to at least contain the Height. - - The `AbsentValidators` and `ByzantineValidators` can be used to + - The `Validators` and `ByzantineValidators` can be used to determine rewards and punishments for the validators. ### CheckTx -- **Arguments**: +- **Request**: - `Tx ([]byte)`: The request transaction bytes -- **Returns**: +- **Response**: - `Code (uint32)`: Response code - `Data ([]byte)`: Result bytes, if any. - `Log (string)`: The output of the application's logger. May @@ -201,9 +209,9 @@ See below for more details on the message types and how they are used. ### DeliverTx -- **Arguments**: +- **Request**: - `Tx ([]byte)`: The request transaction bytes. -- **Returns**: +- **Response**: - `Code (uint32)`: Response code. - `Data ([]byte)`: Result bytes, if any. - `Log (string)`: The output of the application's logger. May @@ -224,13 +232,14 @@ See below for more details on the message types and how they are used. ### EndBlock -- **Arguments**: +- **Request**: - `Height (int64)`: Height of the block just executed. -- **Returns**: +- **Response**: - `ValidatorUpdates ([]Validator)`: Changes to validator set (set voting power to 0 to remove). - `ConsensusParamUpdates (ConsensusParams)`: Changes to consensus-critical time, size, and other parameters. + - `Tags ([]cmn.KVPair)`: Key-Value tags for filtering and indexing - **Usage**: - Signals the end of a block. - Called prior to each Commit, after all transactions. @@ -239,7 +248,7 @@ See below for more details on the message types and how they are used. ### Commit -- **Returns**: +- **Response**: - `Data ([]byte)`: The Merkle root hash - **Usage**: - Persist the application state. @@ -247,3 +256,68 @@ See below for more details on the message types and how they are used. - It's critical that all application instances return the same hash. If not, they will not be able to agree on the next block, because the hash is included in the next block! + +## Data Messages + +### Header + +- **Fields**: + - `ChainID (string)`: ID of the blockchain + - `Height (int64)`: Height of the block in the chain + - `Time (int64)`: Unix time of the block + - `NumTxs (int32)`: Number of transactions in the block + - `TotalTxs (int64)`: Total number of transactions in the blockchain until + now + - `LastBlockHash ([]byte)`: Hash of the previous (parent) block + - `AppHash ([]byte)`: Data returned by the last call to `Commit` - typically the + Merkle root of the application state after executing the previous block's + transactions + - `Proposer (Validator)`: Original proposer for the block +- **Usage**: + - Provided in RequestBeginBlock + - Provides important context about the current state of the blockchain - + especially height and time. + - Provides the proposer of the current block, for use in proposer-based + reward mechanisms. + +### Validator + +- **Fields**: + - `Address ([]byte)`: Address of the validator (hash of the public key) + - `PubKey (PubKey)`: Public key of the validator + - `Power (int64)`: Voting power of the validator +- **Usage**: + - Provides all identifying information about the validator + +### SigningValidator + +- **Fields**: + - `Validator (Validator)`: A validator + - `SignedLastBlock (bool)`: Indicated whether or not the validator signed + the last block +- **Usage**: + - Indicates whether a validator signed the last block, allowing for rewards + based on validator availability + +### PubKey + +- **Fields**: + - `Type (string)`: Type of the public key. A simple string like `"ed25519"`. + In the future, may indicate a serialization algorithm to parse the `Data`, + for instance `"amino"`. + - `Data ([]byte)`: Public key data. For a simple public key, it's just the + raw bytes. If the `Type` indicates an encoding algorithm, this is the + encoded public key. +- **Usage**: + - A generic and extensible typed public key + +### Evidence + +- **Fields**: + - `Type (string)`: Type of the evidence. A hierarchical path like + "duplicate/vote". + - `Validator (Validator`: The offending validator + - `Height (int64)`: Height when the offense was committed + - `Time (int64)`: Unix time of the block at height `Height` + - `TotalVotingPower (int64)`: Total voting power of the validator set at + height `Height` diff --git a/version/version.go b/version/version.go index 7313f5eef..e813a01cc 100644 --- a/version/version.go +++ b/version/version.go @@ -3,7 +3,7 @@ package version // NOTE: we should probably be versioning the ABCI and the abci-cli separately const Maj = "0" -const Min = "10" -const Fix = "4" +const Min = "11" +const Fix = "0" -const Version = "0.10.4-dev" +const Version = "0.11.0" From 8fa7c493bc0f458a725bf3e50b3b1a8046cbeb1b Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Wed, 6 Jun 2018 00:01:38 -0700 Subject: [PATCH 2/6] add val_set_hash to header --- specification.md | 1 + types/types.pb.go | 241 ++++++++++++++++++++++++---------------------- types/types.proto | 5 +- 3 files changed, 129 insertions(+), 118 deletions(-) diff --git a/specification.md b/specification.md index 3d8a905c1..2b0179f15 100644 --- a/specification.md +++ b/specification.md @@ -269,6 +269,7 @@ See below for more details on the message types and how they are used. - `TotalTxs (int64)`: Total number of transactions in the blockchain until now - `LastBlockHash ([]byte)`: Hash of the previous (parent) block + - `ValSetHash ([]byte)`: Hash of the validator set for this block - `AppHash ([]byte)`: Data returned by the last call to `Commit` - typically the Merkle root of the application state after executing the previous block's transactions diff --git a/types/types.pb.go b/types/types.pb.go index 369cfde18..72de6b53c 100644 --- a/types/types.pb.go +++ b/types/types.pb.go @@ -1689,9 +1689,10 @@ type Header struct { TotalTxs int64 `protobuf:"varint,5,opt,name=total_txs,json=totalTxs,proto3" json:"total_txs,omitempty"` // hashes LastBlockHash []byte `protobuf:"bytes,6,opt,name=last_block_hash,json=lastBlockHash,proto3" json:"last_block_hash,omitempty"` - AppHash []byte `protobuf:"bytes,7,opt,name=app_hash,json=appHash,proto3" json:"app_hash,omitempty"` + ValSetHash []byte `protobuf:"bytes,7,opt,name=val_set_hash,json=valSetHash,proto3" json:"val_set_hash,omitempty"` + AppHash []byte `protobuf:"bytes,8,opt,name=app_hash,json=appHash,proto3" json:"app_hash,omitempty"` // consensus - Proposer Validator `protobuf:"bytes,8,opt,name=proposer" json:"proposer"` + Proposer Validator `protobuf:"bytes,9,opt,name=proposer" json:"proposer"` } func (m *Header) Reset() { *m = Header{} } @@ -1741,6 +1742,13 @@ func (m *Header) GetLastBlockHash() []byte { return nil } +func (m *Header) GetValSetHash() []byte { + if m != nil { + return m.ValSetHash + } + return nil +} + func (m *Header) GetAppHash() []byte { if m != nil { return m.AppHash @@ -2327,120 +2335,121 @@ var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("types/types.proto", fileDescriptorTypes) } var fileDescriptorTypes = []byte{ - // 1832 bytes of a gzipped FileDescriptorProto + // 1849 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0x4b, 0x6f, 0x1b, 0xc9, - 0x11, 0x16, 0xdf, 0x9c, 0xd2, 0x83, 0x74, 0xcb, 0xb6, 0x68, 0x2e, 0x02, 0x1b, 0x83, 0xc0, 0x91, + 0x11, 0x16, 0xdf, 0x9c, 0xd2, 0x83, 0x74, 0xcb, 0xb6, 0x68, 0x2e, 0x02, 0x0b, 0x83, 0xc0, 0x91, 0xb3, 0x5a, 0x31, 0xd1, 0xae, 0x0d, 0x7b, 0x37, 0x59, 0x44, 0xd2, 0x3a, 0x4b, 0x61, 0xf3, 0x50, - 0xc6, 0x5e, 0x07, 0xc8, 0x85, 0x68, 0x72, 0x5a, 0xc3, 0x81, 0x39, 0x8f, 0x9d, 0x6e, 0x6a, 0x29, - 0xdf, 0x72, 0x0c, 0xb0, 0xc8, 0x35, 0xe7, 0xfc, 0x81, 0xdc, 0xf2, 0x17, 0x82, 0xfc, 0x89, 0xf8, - 0x90, 0xe4, 0x94, 0x3f, 0x91, 0xa0, 0xaa, 0xe7, 0xad, 0xa1, 0xa1, 0x6c, 0x8e, 0xb9, 0x48, 0x5d, - 0x5d, 0x55, 0x3d, 0x5d, 0xc5, 0xaa, 0xaf, 0xaa, 0x1a, 0x6e, 0xa9, 0xab, 0x50, 0xc8, 0x11, 0xfd, - 0x3d, 0x0c, 0xa3, 0x40, 0x05, 0xac, 0x45, 0xc4, 0xf0, 0x03, 0xc7, 0x55, 0xf3, 0xe5, 0xf4, 0x70, - 0x16, 0x78, 0x23, 0x27, 0x70, 0x82, 0x11, 0x71, 0xa7, 0xcb, 0x0b, 0xa2, 0x88, 0xa0, 0x95, 0xd6, - 0x1a, 0x8e, 0x72, 0xe2, 0x4a, 0xf8, 0xb6, 0x88, 0x3c, 0xd7, 0x57, 0x23, 0xe5, 0x2d, 0xdc, 0xa9, - 0x1c, 0xcd, 0x02, 0xcf, 0x0b, 0xfc, 0xfc, 0x67, 0xcc, 0xbf, 0x34, 0xa1, 0x63, 0x89, 0xaf, 0x96, - 0x42, 0x2a, 0xb6, 0x0f, 0x4d, 0x31, 0x9b, 0x07, 0x83, 0xfa, 0x83, 0xda, 0xfe, 0xe6, 0x11, 0x3b, - 0xd4, 0x72, 0x31, 0xf7, 0xf9, 0x6c, 0x1e, 0x8c, 0x37, 0x2c, 0x92, 0x60, 0xef, 0x43, 0xeb, 0x62, - 0xb1, 0x94, 0xf3, 0x41, 0x83, 0x44, 0x77, 0x8b, 0xa2, 0x3f, 0x45, 0xd6, 0x78, 0xc3, 0xd2, 0x32, - 0x78, 0xac, 0xeb, 0x5f, 0x04, 0x83, 0x66, 0xd5, 0xb1, 0x67, 0xfe, 0x05, 0x1d, 0x8b, 0x12, 0xec, - 0x29, 0x80, 0x14, 0x6a, 0x12, 0x84, 0xca, 0x0d, 0xfc, 0x41, 0x8b, 0xe4, 0xf7, 0x8a, 0xf2, 0x2f, - 0x84, 0xfa, 0x25, 0xb1, 0xc7, 0x1b, 0x96, 0x21, 0x13, 0x02, 0x35, 0x5d, 0xdf, 0x55, 0x93, 0xd9, - 0x9c, 0xbb, 0xfe, 0xa0, 0x5d, 0xa5, 0x79, 0xe6, 0xbb, 0xea, 0x14, 0xd9, 0xa8, 0xe9, 0x26, 0x04, - 0x9a, 0xf2, 0xd5, 0x52, 0x44, 0x57, 0x83, 0x4e, 0x95, 0x29, 0xbf, 0x42, 0x16, 0x9a, 0x42, 0x32, - 0xec, 0x13, 0xd8, 0x9c, 0x0a, 0xc7, 0xf5, 0x27, 0xd3, 0x45, 0x30, 0x7b, 0x3d, 0xe8, 0x92, 0xca, - 0xa0, 0xa8, 0x72, 0x82, 0x02, 0x27, 0xc8, 0x1f, 0x6f, 0x58, 0x30, 0x4d, 0x29, 0x76, 0x04, 0xdd, - 0xd9, 0x5c, 0xcc, 0x5e, 0x4f, 0xd4, 0x6a, 0x60, 0x90, 0xe6, 0x9d, 0xa2, 0xe6, 0x29, 0x72, 0x5f, - 0xae, 0xc6, 0x1b, 0x56, 0x67, 0xa6, 0x97, 0x68, 0x97, 0x2d, 0x16, 0xee, 0xa5, 0x88, 0x50, 0x6b, - 0xb7, 0xca, 0xae, 0xcf, 0x34, 0x9f, 0xf4, 0x0c, 0x3b, 0x21, 0xd8, 0x63, 0x30, 0x84, 0x6f, 0xc7, - 0x17, 0xdd, 0x24, 0xc5, 0xbb, 0xa5, 0x5f, 0xd4, 0xb7, 0x93, 0x6b, 0x76, 0x45, 0xbc, 0x66, 0x87, - 0xd0, 0xc6, 0x28, 0x71, 0xd5, 0x60, 0x8b, 0x74, 0x6e, 0x97, 0xae, 0x48, 0xbc, 0xf1, 0x86, 0x15, - 0x4b, 0x9d, 0x74, 0xa0, 0x75, 0xc9, 0x17, 0x4b, 0x61, 0x7e, 0x0f, 0x36, 0x73, 0x91, 0xc2, 0x06, - 0xd0, 0xf1, 0x84, 0x94, 0xdc, 0x11, 0x83, 0xda, 0x83, 0xda, 0xbe, 0x61, 0x25, 0xa4, 0xb9, 0x03, - 0x5b, 0xf9, 0x38, 0xc9, 0x29, 0x62, 0x2c, 0xa0, 0xe2, 0xa5, 0x88, 0x24, 0x06, 0x40, 0xac, 0x18, - 0x93, 0xe6, 0xc7, 0xd0, 0x2f, 0x07, 0x01, 0xeb, 0x43, 0xe3, 0xb5, 0xb8, 0x8a, 0x25, 0x71, 0xc9, - 0x6e, 0xc7, 0x17, 0xa2, 0x28, 0x36, 0xac, 0xf8, 0x76, 0xff, 0xac, 0xa5, 0xca, 0x69, 0x1c, 0x30, - 0x06, 0x4d, 0xe5, 0x7a, 0xfa, 0x82, 0x0d, 0x8b, 0xd6, 0xec, 0x1e, 0xfe, 0x48, 0xdc, 0xf5, 0x27, - 0xae, 0x1d, 0x9f, 0xd0, 0x21, 0xfa, 0xcc, 0x66, 0xc7, 0xd0, 0x9f, 0x05, 0xbe, 0x14, 0xbe, 0x5c, - 0xca, 0x49, 0xc8, 0x23, 0xee, 0xc9, 0x38, 0xfe, 0x13, 0xc7, 0x9e, 0x26, 0xec, 0x73, 0xe2, 0x5a, - 0xbd, 0x59, 0x71, 0x83, 0x3d, 0x01, 0xb8, 0xe4, 0x0b, 0xd7, 0xe6, 0x2a, 0x88, 0xe4, 0xa0, 0xf9, - 0xa0, 0xb1, 0xbf, 0x79, 0xd4, 0x8f, 0x95, 0x5f, 0x25, 0x8c, 0x93, 0xe6, 0x5f, 0xdf, 0xde, 0xdf, - 0xb0, 0x72, 0x92, 0xec, 0x21, 0xf4, 0x78, 0x18, 0x4e, 0xa4, 0xe2, 0x4a, 0x4c, 0xa6, 0x57, 0x4a, - 0x48, 0xca, 0x8e, 0x2d, 0x6b, 0x9b, 0x87, 0xe1, 0x0b, 0xdc, 0x3d, 0xc1, 0x4d, 0xd3, 0x4e, 0x7d, - 0x4b, 0x81, 0x8b, 0x16, 0xda, 0x5c, 0x71, 0xb2, 0x70, 0xcb, 0xa2, 0x35, 0xee, 0x85, 0x5c, 0xcd, - 0x63, 0xeb, 0x68, 0xcd, 0xee, 0x42, 0x7b, 0x2e, 0x5c, 0x67, 0xae, 0xc8, 0xa0, 0x86, 0x15, 0x53, - 0xe8, 0xcc, 0x30, 0x0a, 0x2e, 0x05, 0xe5, 0x6e, 0xd7, 0xd2, 0x84, 0xf9, 0xb7, 0x1a, 0xdc, 0xba, - 0x16, 0xec, 0x78, 0xee, 0x9c, 0xcb, 0x79, 0xf2, 0x2d, 0x5c, 0xb3, 0xf7, 0xf1, 0x5c, 0x6e, 0x8b, - 0x28, 0xc6, 0x94, 0xed, 0xd8, 0xd6, 0x31, 0x6d, 0xc6, 0x86, 0xc6, 0x22, 0xec, 0xc7, 0x05, 0xe7, - 0x34, 0xc8, 0x39, 0x49, 0xac, 0xbf, 0x70, 0x1d, 0xdf, 0xf5, 0x9d, 0x77, 0xf9, 0x68, 0x0c, 0xb7, - 0xa7, 0x57, 0x6f, 0xb8, 0xaf, 0x5c, 0x5f, 0x4c, 0xae, 0x79, 0xb9, 0x17, 0x1f, 0xf4, 0xfc, 0xd2, - 0xb5, 0x85, 0x3f, 0x13, 0xf1, 0x01, 0xbb, 0xa9, 0x4a, 0x7a, 0xb4, 0x34, 0x1f, 0xc0, 0x4e, 0x31, - 0x23, 0xd9, 0x0e, 0xd4, 0xd5, 0x2a, 0xb6, 0xac, 0xae, 0x56, 0xa6, 0x99, 0x46, 0x53, 0x9a, 0x7d, - 0xd7, 0x64, 0x1e, 0x41, 0xaf, 0x94, 0x68, 0x39, 0x37, 0xd7, 0xf2, 0x6e, 0x36, 0x7b, 0xb0, 0x5d, - 0xc8, 0x2f, 0xf3, 0x9b, 0x16, 0x74, 0x2d, 0x21, 0x43, 0x0c, 0x1f, 0xf6, 0x14, 0x0c, 0xb1, 0x9a, - 0x09, 0x0d, 0x8a, 0xb5, 0x12, 0xe4, 0x68, 0x99, 0xe7, 0x09, 0x1f, 0x31, 0x20, 0x15, 0x66, 0x8f, - 0x0a, 0x80, 0xbe, 0x5b, 0x56, 0xca, 0x23, 0xfa, 0x41, 0x11, 0xd1, 0x6f, 0x97, 0x64, 0x4b, 0x90, - 0xfe, 0xa8, 0x00, 0xe9, 0xe5, 0x83, 0x0b, 0x98, 0xfe, 0xac, 0x02, 0xd3, 0xcb, 0xd7, 0x5f, 0x03, - 0xea, 0xcf, 0x2a, 0x40, 0x7d, 0x70, 0xed, 0x5b, 0x95, 0xa8, 0x7e, 0x50, 0x44, 0xf5, 0xb2, 0x39, - 0x25, 0x58, 0xff, 0x51, 0x15, 0xac, 0xdf, 0x2b, 0xe9, 0xac, 0xc5, 0xf5, 0x0f, 0xaf, 0xe1, 0xfa, - 0xdd, 0x92, 0x6a, 0x05, 0xb0, 0x3f, 0x2b, 0x00, 0x3b, 0x54, 0xda, 0xb6, 0x06, 0xd9, 0x9f, 0x5c, - 0x47, 0xf6, 0xbd, 0xf2, 0x4f, 0x5b, 0x05, 0xed, 0xa3, 0x12, 0xb4, 0xdf, 0x29, 0xdf, 0x72, 0x2d, - 0xb6, 0x3f, 0xc2, 0x7c, 0x2f, 0x45, 0x1a, 0x62, 0x83, 0x88, 0xa2, 0x20, 0x8a, 0xc1, 0x57, 0x13, - 0xe6, 0x3e, 0x22, 0x50, 0x16, 0x5f, 0xef, 0xa8, 0x03, 0x14, 0xf4, 0xb9, 0xe8, 0x32, 0xff, 0x50, - 0xcb, 0x74, 0xa9, 0x14, 0xe4, 0xd1, 0xcb, 0x88, 0xd1, 0x2b, 0x57, 0x1e, 0xea, 0x85, 0xf2, 0xc0, - 0xbe, 0x0f, 0xb7, 0x16, 0x5c, 0x2a, 0xed, 0x97, 0x49, 0x01, 0xce, 0x7a, 0xc8, 0xd0, 0x0e, 0xd1, - 0xb8, 0xf6, 0x01, 0xec, 0xe6, 0x64, 0x11, 0x5a, 0x09, 0xba, 0x9a, 0x94, 0xbc, 0xfd, 0x54, 0xfa, - 0x38, 0x0c, 0xc7, 0x5c, 0xce, 0xcd, 0x9f, 0x67, 0xf6, 0x67, 0xa5, 0x87, 0x41, 0x73, 0x16, 0xd8, - 0xda, 0xac, 0x6d, 0x8b, 0xd6, 0x58, 0x8e, 0x16, 0x81, 0x43, 0x5f, 0x35, 0x2c, 0x5c, 0xa2, 0x54, - 0x9a, 0x29, 0x86, 0x4e, 0x09, 0xf3, 0xf7, 0xb5, 0xec, 0xbc, 0xac, 0x1a, 0x55, 0x95, 0x97, 0xda, - 0xff, 0x52, 0x5e, 0xea, 0x37, 0x2d, 0x2f, 0xe6, 0x9f, 0x6b, 0xd9, 0x6f, 0x91, 0x16, 0x8e, 0x6f, - 0x67, 0x1c, 0x86, 0x85, 0xeb, 0xdb, 0x62, 0x45, 0xa9, 0xde, 0xb0, 0x34, 0x91, 0xd4, 0xe9, 0x36, - 0x39, 0xb8, 0x58, 0xa7, 0x3b, 0xb4, 0xa7, 0x89, 0xb8, 0xe0, 0x04, 0x17, 0x94, 0x83, 0x5b, 0x96, - 0x26, 0x72, 0xb8, 0x69, 0x14, 0x70, 0xf3, 0x1c, 0xd8, 0xf5, 0xec, 0x64, 0x1f, 0x43, 0x53, 0x71, - 0x07, 0x9d, 0x87, 0xf6, 0xef, 0x1c, 0xea, 0xae, 0xf7, 0xf0, 0x8b, 0x57, 0xe7, 0xdc, 0x8d, 0x4e, - 0xee, 0xa2, 0xf5, 0xff, 0x7a, 0x7b, 0x7f, 0x07, 0x65, 0x0e, 0x02, 0xcf, 0x55, 0xc2, 0x0b, 0xd5, - 0x95, 0x45, 0x3a, 0xe6, 0xbf, 0x6b, 0x88, 0xda, 0x85, 0xac, 0xad, 0xf4, 0x45, 0x12, 0x9a, 0xf5, - 0x5c, 0x61, 0xbd, 0x99, 0x7f, 0xbe, 0x03, 0xe0, 0x70, 0x39, 0xf9, 0x9a, 0xfb, 0x4a, 0xd8, 0xb1, - 0x93, 0x0c, 0x87, 0xcb, 0x5f, 0xd3, 0x06, 0xf6, 0x1f, 0xc8, 0x5e, 0x4a, 0x61, 0x93, 0xb7, 0x1a, - 0x56, 0xc7, 0xe1, 0xf2, 0x4b, 0x29, 0xec, 0xd4, 0xae, 0xce, 0x7f, 0x6f, 0x17, 0xdb, 0x87, 0xc6, - 0x85, 0x10, 0x31, 0xb2, 0xf5, 0x53, 0xd5, 0xb3, 0x27, 0x1f, 0x91, 0xb2, 0x0e, 0x09, 0x14, 0x31, - 0x7f, 0x5b, 0xcf, 0x82, 0x33, 0x2b, 0x6e, 0xff, 0x5f, 0x3e, 0xf8, 0x07, 0x75, 0x8b, 0x45, 0x28, - 0x65, 0xa7, 0x70, 0x2b, 0x4d, 0x99, 0xc9, 0x32, 0xb4, 0x39, 0x76, 0x61, 0xb5, 0x77, 0xe6, 0x58, - 0x3f, 0x55, 0xf8, 0x52, 0xcb, 0xb3, 0x5f, 0xc0, 0x5e, 0x29, 0xc9, 0xd3, 0xa3, 0xea, 0xef, 0xcc, - 0xf5, 0x3b, 0xc5, 0x5c, 0x4f, 0xce, 0x4b, 0xfc, 0xd1, 0xf8, 0x16, 0xb1, 0xfe, 0x5d, 0x6c, 0x73, - 0xf2, 0xd0, 0x5f, 0xf5, 0x8b, 0x9a, 0x7f, 0xac, 0x41, 0xaf, 0x74, 0x19, 0x36, 0x02, 0xd0, 0xc8, - 0x29, 0xdd, 0x37, 0x22, 0x06, 0xa9, 0xc4, 0x07, 0xe4, 0xac, 0x17, 0xee, 0x1b, 0x61, 0x19, 0xd3, - 0x64, 0xc9, 0x1e, 0x42, 0x47, 0xad, 0xb4, 0x74, 0xb1, 0x11, 0x7c, 0xb9, 0x22, 0xd1, 0xb6, 0xa2, - 0xff, 0xec, 0x31, 0x6c, 0xe9, 0x83, 0x9d, 0x40, 0x4a, 0x37, 0x8c, 0x9b, 0x11, 0x96, 0x3f, 0xfa, - 0x73, 0xe2, 0x58, 0x9b, 0xd3, 0x8c, 0x30, 0x7f, 0x03, 0x46, 0xfa, 0x59, 0xf6, 0x1e, 0x18, 0x1e, - 0x5f, 0xc5, 0x5d, 0x32, 0xde, 0xad, 0x65, 0x75, 0x3d, 0xbe, 0xa2, 0x06, 0x99, 0xed, 0x41, 0x07, - 0x99, 0x6a, 0xa5, 0xfd, 0xdd, 0xb2, 0xda, 0x1e, 0x5f, 0xbd, 0x5c, 0xa5, 0x0c, 0x87, 0xcb, 0xa4, - 0x05, 0xf6, 0xf8, 0xea, 0x73, 0x2e, 0xcd, 0x4f, 0xa1, 0xad, 0x2f, 0x79, 0xa3, 0x83, 0x51, 0xbf, - 0x5e, 0xd0, 0xff, 0x09, 0x6c, 0xe6, 0xee, 0xcd, 0x7e, 0x08, 0x77, 0xb4, 0x85, 0x21, 0x8f, 0x14, - 0x79, 0xa4, 0x70, 0x20, 0x23, 0xe6, 0x39, 0x8f, 0x14, 0x7e, 0x52, 0x37, 0xf5, 0xbf, 0xab, 0x43, - 0x5b, 0x37, 0xcc, 0xec, 0x61, 0x6e, 0x3a, 0xa1, 0xaa, 0x78, 0xb2, 0xf9, 0xf7, 0xb7, 0xf7, 0x3b, - 0x54, 0x40, 0xce, 0x3e, 0xcb, 0x46, 0x95, 0x0c, 0x30, 0xeb, 0x85, 0x7e, 0x3e, 0x99, 0x78, 0x1a, - 0xb9, 0x89, 0x67, 0x0f, 0x3a, 0xfe, 0xd2, 0x23, 0x97, 0x34, 0xb5, 0x4b, 0xfc, 0xa5, 0x87, 0x2e, - 0x79, 0x0f, 0x0c, 0x15, 0x28, 0xbe, 0x20, 0x96, 0x4e, 0xd2, 0x2e, 0x6d, 0x20, 0xf3, 0x21, 0xf4, - 0xf2, 0xd5, 0x16, 0xab, 0xa7, 0x06, 0xf7, 0xed, 0xac, 0xd6, 0xe2, 0x04, 0x70, 0x0f, 0xba, 0x69, - 0x79, 0xd5, 0x48, 0xdf, 0xe1, 0xba, 0xaa, 0xe2, 0x3c, 0x1c, 0x46, 0x41, 0x18, 0x48, 0x11, 0xa5, - 0x49, 0x59, 0x9d, 0x47, 0xa9, 0x9c, 0xe9, 0x82, 0x91, 0x32, 0xb1, 0x17, 0xe0, 0xb6, 0x1d, 0x09, - 0x29, 0xe3, 0xb6, 0x3b, 0x21, 0xd9, 0x01, 0x74, 0xc2, 0xe5, 0x74, 0x82, 0x25, 0xa7, 0x18, 0x6f, - 0xe7, 0xcb, 0xe9, 0x17, 0xe2, 0x2a, 0x19, 0x3c, 0x42, 0xa2, 0xa8, 0xe8, 0x04, 0x5f, 0x8b, 0x28, - 0x76, 0x8b, 0x26, 0x4c, 0x05, 0xfd, 0xf2, 0xd4, 0xc1, 0x3e, 0x02, 0x23, 0x4d, 0xe9, 0x52, 0xdc, - 0x97, 0xef, 0x9c, 0x09, 0x62, 0x67, 0x22, 0x5d, 0xc7, 0x17, 0xf6, 0x24, 0x73, 0x19, 0xdd, 0xab, - 0x6b, 0xf5, 0x34, 0xe3, 0x67, 0x89, 0xcf, 0xcc, 0x1f, 0x40, 0x5b, 0xdf, 0x91, 0x7e, 0xab, 0xab, - 0x30, 0x69, 0x9b, 0x68, 0x5d, 0x99, 0xa0, 0x7f, 0xaa, 0x41, 0x37, 0x99, 0x6a, 0x2a, 0x95, 0x0a, - 0x97, 0xae, 0xdf, 0xf4, 0xd2, 0xeb, 0x46, 0xc2, 0x24, 0x84, 0x9a, 0xb9, 0x10, 0x3a, 0x00, 0xa6, - 0x23, 0xe5, 0x32, 0x50, 0xae, 0xef, 0x4c, 0xb4, 0x37, 0x75, 0xc8, 0xf4, 0x89, 0xf3, 0x8a, 0x18, - 0xe7, 0xb8, 0x7f, 0xf4, 0x4d, 0x0b, 0x7a, 0xc7, 0x27, 0xa7, 0x67, 0xc7, 0x61, 0xb8, 0x70, 0x67, - 0x9c, 0x9a, 0xa9, 0x11, 0x34, 0xa9, 0x5d, 0xac, 0x78, 0x74, 0x1a, 0x56, 0xcd, 0x2d, 0xec, 0x08, - 0x5a, 0xd4, 0x35, 0xb2, 0xaa, 0xb7, 0xa7, 0x61, 0xe5, 0xf8, 0x82, 0x1f, 0xd1, 0x7d, 0xe5, 0xf5, - 0x27, 0xa8, 0x61, 0xd5, 0x0c, 0xc3, 0x3e, 0x05, 0x23, 0xeb, 0xf7, 0xd6, 0x3d, 0x44, 0x0d, 0xd7, - 0x4e, 0x33, 0xa8, 0x9f, 0x95, 0xd0, 0x75, 0xcf, 0x36, 0xc3, 0xb5, 0x6d, 0x3f, 0x7b, 0x0a, 0x9d, - 0xa4, 0x09, 0xa9, 0x7e, 0x2a, 0x1a, 0xae, 0x99, 0x34, 0xd0, 0x3d, 0xba, 0x91, 0xab, 0x7a, 0xcf, - 0x1a, 0x56, 0x8e, 0x43, 0xec, 0x31, 0xb4, 0xe3, 0x3a, 0x50, 0xf9, 0xe8, 0x33, 0xac, 0x9e, 0x17, - 0xd0, 0xc8, 0xac, 0x89, 0x5d, 0xf7, 0xe6, 0x36, 0x5c, 0x3b, 0xb7, 0xb1, 0x63, 0x80, 0x5c, 0xf3, - 0xb6, 0xf6, 0x31, 0x6d, 0xb8, 0x7e, 0x1e, 0x63, 0x9f, 0x40, 0x37, 0x9b, 0xb1, 0xab, 0x1f, 0xb9, - 0x86, 0xeb, 0x46, 0xa4, 0x69, 0x9b, 0x1e, 0x42, 0x3f, 0xfc, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x76, 0x56, 0x8a, 0x69, 0x84, 0x15, 0x00, 0x00, + 0x46, 0x5e, 0x07, 0xc8, 0x85, 0x68, 0x72, 0x5a, 0xc3, 0x81, 0xc9, 0x99, 0xd9, 0xe9, 0xa6, 0x96, + 0xf2, 0x2d, 0xf7, 0x45, 0xae, 0x39, 0xe7, 0x1c, 0x20, 0xb7, 0xfc, 0x85, 0x20, 0x7f, 0x22, 0x3e, + 0x24, 0x39, 0xe5, 0x4f, 0x24, 0xa8, 0xea, 0x79, 0x73, 0x68, 0x28, 0x9b, 0x63, 0x2e, 0x52, 0x57, + 0x57, 0x55, 0x4f, 0x57, 0xb1, 0xea, 0xab, 0xaa, 0x86, 0x3b, 0xea, 0x26, 0x10, 0x72, 0x40, 0x7f, + 0x8f, 0x82, 0xd0, 0x57, 0x3e, 0x6b, 0x10, 0xd1, 0xff, 0xc0, 0x71, 0xd5, 0x74, 0x31, 0x3e, 0x9a, + 0xf8, 0xf3, 0x81, 0xe3, 0x3b, 0xfe, 0x80, 0xb8, 0xe3, 0xc5, 0x15, 0x51, 0x44, 0xd0, 0x4a, 0x6b, + 0xf5, 0x07, 0x19, 0x71, 0x25, 0x3c, 0x5b, 0x84, 0x73, 0xd7, 0x53, 0x03, 0x35, 0x9f, 0xb9, 0x63, + 0x39, 0x98, 0xf8, 0xf3, 0xb9, 0xef, 0x65, 0x3f, 0x63, 0xfe, 0xa5, 0x0e, 0x2d, 0x4b, 0x7c, 0xb5, + 0x10, 0x52, 0xb1, 0x03, 0xa8, 0x8b, 0xc9, 0xd4, 0xef, 0x55, 0xf7, 0x2b, 0x07, 0x9b, 0xc7, 0xec, + 0x48, 0xcb, 0x45, 0xdc, 0x17, 0x93, 0xa9, 0x3f, 0xdc, 0xb0, 0x48, 0x82, 0xbd, 0x0f, 0x8d, 0xab, + 0xd9, 0x42, 0x4e, 0x7b, 0x35, 0x12, 0xdd, 0xcd, 0x8b, 0xfe, 0x14, 0x59, 0xc3, 0x0d, 0x4b, 0xcb, + 0xe0, 0xb1, 0xae, 0x77, 0xe5, 0xf7, 0xea, 0x65, 0xc7, 0x9e, 0x7b, 0x57, 0x74, 0x2c, 0x4a, 0xb0, + 0x67, 0x00, 0x52, 0xa8, 0x91, 0x1f, 0x28, 0xd7, 0xf7, 0x7a, 0x0d, 0x92, 0xdf, 0xcb, 0xcb, 0x5f, + 0x0a, 0xf5, 0x4b, 0x62, 0x0f, 0x37, 0x2c, 0x43, 0xc6, 0x04, 0x6a, 0xba, 0x9e, 0xab, 0x46, 0x93, + 0x29, 0x77, 0xbd, 0x5e, 0xb3, 0x4c, 0xf3, 0xdc, 0x73, 0xd5, 0x19, 0xb2, 0x51, 0xd3, 0x8d, 0x09, + 0x34, 0xe5, 0xab, 0x85, 0x08, 0x6f, 0x7a, 0xad, 0x32, 0x53, 0x7e, 0x85, 0x2c, 0x34, 0x85, 0x64, + 0xd8, 0x27, 0xb0, 0x39, 0x16, 0x8e, 0xeb, 0x8d, 0xc6, 0x33, 0x7f, 0xf2, 0xba, 0xd7, 0x26, 0x95, + 0x5e, 0x5e, 0xe5, 0x14, 0x05, 0x4e, 0x91, 0x3f, 0xdc, 0xb0, 0x60, 0x9c, 0x50, 0xec, 0x18, 0xda, + 0x93, 0xa9, 0x98, 0xbc, 0x1e, 0xa9, 0x65, 0xcf, 0x20, 0xcd, 0x7b, 0x79, 0xcd, 0x33, 0xe4, 0xbe, + 0x5c, 0x0e, 0x37, 0xac, 0xd6, 0x44, 0x2f, 0xd1, 0x2e, 0x5b, 0xcc, 0xdc, 0x6b, 0x11, 0xa2, 0xd6, + 0x6e, 0x99, 0x5d, 0x9f, 0x69, 0x3e, 0xe9, 0x19, 0x76, 0x4c, 0xb0, 0x27, 0x60, 0x08, 0xcf, 0x8e, + 0x2e, 0xba, 0x49, 0x8a, 0xf7, 0x0b, 0xbf, 0xa8, 0x67, 0xc7, 0xd7, 0x6c, 0x8b, 0x68, 0xcd, 0x8e, + 0xa0, 0x89, 0x51, 0xe2, 0xaa, 0xde, 0x16, 0xe9, 0xdc, 0x2d, 0x5c, 0x91, 0x78, 0xc3, 0x0d, 0x2b, + 0x92, 0x3a, 0x6d, 0x41, 0xe3, 0x9a, 0xcf, 0x16, 0xc2, 0xfc, 0x1e, 0x6c, 0x66, 0x22, 0x85, 0xf5, + 0xa0, 0x35, 0x17, 0x52, 0x72, 0x47, 0xf4, 0x2a, 0xfb, 0x95, 0x03, 0xc3, 0x8a, 0x49, 0x73, 0x07, + 0xb6, 0xb2, 0x71, 0x92, 0x51, 0xc4, 0x58, 0x40, 0xc5, 0x6b, 0x11, 0x4a, 0x0c, 0x80, 0x48, 0x31, + 0x22, 0xcd, 0x8f, 0xa1, 0x5b, 0x0c, 0x02, 0xd6, 0x85, 0xda, 0x6b, 0x71, 0x13, 0x49, 0xe2, 0x92, + 0xdd, 0x8d, 0x2e, 0x44, 0x51, 0x6c, 0x58, 0xd1, 0xed, 0xfe, 0x59, 0x49, 0x94, 0x93, 0x38, 0x60, + 0x0c, 0xea, 0xca, 0x9d, 0xeb, 0x0b, 0xd6, 0x2c, 0x5a, 0xb3, 0x07, 0xf8, 0x23, 0x71, 0xd7, 0x1b, + 0xb9, 0x76, 0x74, 0x42, 0x8b, 0xe8, 0x73, 0x9b, 0x9d, 0x40, 0x77, 0xe2, 0x7b, 0x52, 0x78, 0x72, + 0x21, 0x47, 0x01, 0x0f, 0xf9, 0x5c, 0x46, 0xf1, 0x1f, 0x3b, 0xf6, 0x2c, 0x66, 0x5f, 0x10, 0xd7, + 0xea, 0x4c, 0xf2, 0x1b, 0xec, 0x29, 0xc0, 0x35, 0x9f, 0xb9, 0x36, 0x57, 0x7e, 0x28, 0x7b, 0xf5, + 0xfd, 0xda, 0xc1, 0xe6, 0x71, 0x37, 0x52, 0x7e, 0x15, 0x33, 0x4e, 0xeb, 0x7f, 0x7d, 0xfb, 0x70, + 0xc3, 0xca, 0x48, 0xb2, 0x47, 0xd0, 0xe1, 0x41, 0x30, 0x92, 0x8a, 0x2b, 0x31, 0x1a, 0xdf, 0x28, + 0x21, 0x29, 0x3b, 0xb6, 0xac, 0x6d, 0x1e, 0x04, 0x97, 0xb8, 0x7b, 0x8a, 0x9b, 0xa6, 0x9d, 0xf8, + 0x96, 0x02, 0x17, 0x2d, 0xb4, 0xb9, 0xe2, 0x64, 0xe1, 0x96, 0x45, 0x6b, 0xdc, 0x0b, 0xb8, 0x9a, + 0x46, 0xd6, 0xd1, 0x9a, 0xdd, 0x87, 0xe6, 0x54, 0xb8, 0xce, 0x54, 0x91, 0x41, 0x35, 0x2b, 0xa2, + 0xd0, 0x99, 0x41, 0xe8, 0x5f, 0x0b, 0xca, 0xdd, 0xb6, 0xa5, 0x09, 0xf3, 0x6f, 0x15, 0xb8, 0xb3, + 0x12, 0xec, 0x78, 0xee, 0x94, 0xcb, 0x69, 0xfc, 0x2d, 0x5c, 0xb3, 0xf7, 0xf1, 0x5c, 0x6e, 0x8b, + 0x30, 0xc2, 0x94, 0xed, 0xc8, 0xd6, 0x21, 0x6d, 0x46, 0x86, 0x46, 0x22, 0xec, 0xc7, 0x39, 0xe7, + 0xd4, 0xc8, 0x39, 0x71, 0xac, 0x5f, 0xba, 0x8e, 0xe7, 0x7a, 0xce, 0xbb, 0x7c, 0x34, 0x84, 0xbb, + 0xe3, 0x9b, 0x37, 0xdc, 0x53, 0xae, 0x27, 0x46, 0x2b, 0x5e, 0xee, 0x44, 0x07, 0xbd, 0xb8, 0x76, + 0x6d, 0xe1, 0x4d, 0x44, 0x74, 0xc0, 0x6e, 0xa2, 0x92, 0x1c, 0x2d, 0xcd, 0x7d, 0xd8, 0xc9, 0x67, + 0x24, 0xdb, 0x81, 0xaa, 0x5a, 0x46, 0x96, 0x55, 0xd5, 0xd2, 0x34, 0x93, 0x68, 0x4a, 0xb2, 0x6f, + 0x45, 0xe6, 0x31, 0x74, 0x0a, 0x89, 0x96, 0x71, 0x73, 0x25, 0xeb, 0x66, 0xb3, 0x03, 0xdb, 0xb9, + 0xfc, 0x32, 0xbf, 0x69, 0x40, 0xdb, 0x12, 0x32, 0xc0, 0xf0, 0x61, 0xcf, 0xc0, 0x10, 0xcb, 0x89, + 0xd0, 0xa0, 0x58, 0x29, 0x40, 0x8e, 0x96, 0x79, 0x11, 0xf3, 0x11, 0x03, 0x12, 0x61, 0xf6, 0x38, + 0x07, 0xe8, 0xbb, 0x45, 0xa5, 0x2c, 0xa2, 0x1f, 0xe6, 0x11, 0xfd, 0x6e, 0x41, 0xb6, 0x00, 0xe9, + 0x8f, 0x73, 0x90, 0x5e, 0x3c, 0x38, 0x87, 0xe9, 0xcf, 0x4b, 0x30, 0xbd, 0x78, 0xfd, 0x35, 0xa0, + 0xfe, 0xbc, 0x04, 0xd4, 0x7b, 0x2b, 0xdf, 0x2a, 0x45, 0xf5, 0xc3, 0x3c, 0xaa, 0x17, 0xcd, 0x29, + 0xc0, 0xfa, 0x8f, 0xca, 0x60, 0xfd, 0x41, 0x41, 0x67, 0x2d, 0xae, 0x7f, 0xb8, 0x82, 0xeb, 0xf7, + 0x0b, 0xaa, 0x25, 0xc0, 0xfe, 0x3c, 0x07, 0xec, 0x50, 0x6a, 0xdb, 0x1a, 0x64, 0x7f, 0xba, 0x8a, + 0xec, 0x7b, 0xc5, 0x9f, 0xb6, 0x0c, 0xda, 0x07, 0x05, 0x68, 0xbf, 0x57, 0xbc, 0xe5, 0x5a, 0x6c, + 0x7f, 0x8c, 0xf9, 0x5e, 0x88, 0x34, 0xc4, 0x06, 0x11, 0x86, 0x7e, 0x18, 0x81, 0xaf, 0x26, 0xcc, + 0x03, 0x44, 0xa0, 0x34, 0xbe, 0xde, 0x51, 0x07, 0x28, 0xe8, 0x33, 0xd1, 0x65, 0xfe, 0xbe, 0x92, + 0xea, 0x52, 0x29, 0xc8, 0xa2, 0x97, 0x11, 0xa1, 0x57, 0xa6, 0x3c, 0x54, 0x73, 0xe5, 0x81, 0x7d, + 0x1f, 0xee, 0xcc, 0xb8, 0x54, 0xda, 0x2f, 0xa3, 0x1c, 0x9c, 0x75, 0x90, 0xa1, 0x1d, 0xa2, 0x71, + 0xed, 0x03, 0xd8, 0xcd, 0xc8, 0x22, 0xb4, 0x12, 0x74, 0xd5, 0x29, 0x79, 0xbb, 0x89, 0xf4, 0x49, + 0x10, 0x0c, 0xb9, 0x9c, 0x9a, 0x3f, 0x4f, 0xed, 0x4f, 0x4b, 0x0f, 0x83, 0xfa, 0xc4, 0xb7, 0xb5, + 0x59, 0xdb, 0x16, 0xad, 0xb1, 0x1c, 0xcd, 0x7c, 0x87, 0xbe, 0x6a, 0x58, 0xb8, 0x44, 0xa9, 0x24, + 0x53, 0x0c, 0x9d, 0x12, 0xe6, 0xef, 0x2a, 0xe9, 0x79, 0x69, 0x35, 0x2a, 0x2b, 0x2f, 0x95, 0xff, + 0xa5, 0xbc, 0x54, 0x6f, 0x5b, 0x5e, 0xcc, 0x3f, 0x57, 0xd2, 0xdf, 0x22, 0x29, 0x1c, 0xdf, 0xce, + 0x38, 0x0c, 0x0b, 0xd7, 0xb3, 0xc5, 0x92, 0x52, 0xbd, 0x66, 0x69, 0x22, 0xae, 0xd3, 0x4d, 0x72, + 0x70, 0xbe, 0x4e, 0xb7, 0x68, 0x4f, 0x13, 0x51, 0xc1, 0xf1, 0xaf, 0x28, 0x07, 0xb7, 0x2c, 0x4d, + 0x64, 0x70, 0xd3, 0xc8, 0xe1, 0xe6, 0x05, 0xb0, 0xd5, 0xec, 0x64, 0x1f, 0x43, 0x5d, 0x71, 0x07, + 0x9d, 0x87, 0xf6, 0xef, 0x1c, 0xe9, 0xae, 0xf7, 0xe8, 0x8b, 0x57, 0x17, 0xdc, 0x0d, 0x4f, 0xef, + 0xa3, 0xf5, 0xff, 0x7a, 0xfb, 0x70, 0x07, 0x65, 0x0e, 0xfd, 0xb9, 0xab, 0xc4, 0x3c, 0x50, 0x37, + 0x16, 0xe9, 0x98, 0xff, 0xae, 0x20, 0x6a, 0xe7, 0xb2, 0xb6, 0xd4, 0x17, 0x71, 0x68, 0x56, 0x33, + 0x85, 0xf5, 0x76, 0xfe, 0xf9, 0x0e, 0x80, 0xc3, 0xe5, 0xe8, 0x6b, 0xee, 0x29, 0x61, 0x47, 0x4e, + 0x32, 0x1c, 0x2e, 0x7f, 0x4d, 0x1b, 0xd8, 0x7f, 0x20, 0x7b, 0x21, 0x85, 0x4d, 0xde, 0xaa, 0x59, + 0x2d, 0x87, 0xcb, 0x2f, 0xa5, 0xb0, 0x13, 0xbb, 0x5a, 0xff, 0xbd, 0x5d, 0xec, 0x00, 0x6a, 0x57, + 0x42, 0x44, 0xc8, 0xd6, 0x4d, 0x54, 0xcf, 0x9f, 0x7e, 0x44, 0xca, 0x3a, 0x24, 0x50, 0xc4, 0xfc, + 0x6d, 0x35, 0x0d, 0xce, 0xb4, 0xb8, 0xfd, 0x7f, 0xf9, 0xe0, 0x1f, 0xd4, 0x2d, 0xe6, 0xa1, 0x94, + 0x9d, 0xc1, 0x9d, 0x24, 0x65, 0x46, 0x8b, 0xc0, 0xe6, 0xd8, 0x85, 0x55, 0xde, 0x99, 0x63, 0xdd, + 0x44, 0xe1, 0x4b, 0x2d, 0xcf, 0x7e, 0x01, 0x7b, 0x85, 0x24, 0x4f, 0x8e, 0xaa, 0xbe, 0x33, 0xd7, + 0xef, 0xe5, 0x73, 0x3d, 0x3e, 0x2f, 0xf6, 0x47, 0xed, 0x5b, 0xc4, 0xfa, 0x77, 0xb1, 0xcd, 0xc9, + 0x42, 0x7f, 0xd9, 0x2f, 0x6a, 0xfe, 0xa1, 0x02, 0x9d, 0xc2, 0x65, 0xd8, 0x00, 0x40, 0x23, 0xa7, + 0x74, 0xdf, 0x88, 0x08, 0xa4, 0x62, 0x1f, 0x90, 0xb3, 0x2e, 0xdd, 0x37, 0xc2, 0x32, 0xc6, 0xf1, + 0x92, 0x3d, 0x82, 0x96, 0x5a, 0x6a, 0xe9, 0x7c, 0x23, 0xf8, 0x72, 0x49, 0xa2, 0x4d, 0x45, 0xff, + 0xd9, 0x13, 0xd8, 0xd2, 0x07, 0x3b, 0xbe, 0x94, 0x6e, 0x10, 0x35, 0x23, 0x2c, 0x7b, 0xf4, 0xe7, + 0xc4, 0xb1, 0x36, 0xc7, 0x29, 0x61, 0xfe, 0x06, 0x8c, 0xe4, 0xb3, 0xec, 0x3d, 0x30, 0xe6, 0x7c, + 0x19, 0x75, 0xc9, 0x78, 0xb7, 0x86, 0xd5, 0x9e, 0xf3, 0x25, 0x35, 0xc8, 0x6c, 0x0f, 0x5a, 0xc8, + 0x54, 0x4b, 0xed, 0xef, 0x86, 0xd5, 0x9c, 0xf3, 0xe5, 0xcb, 0x65, 0xc2, 0x70, 0xb8, 0x8c, 0x5b, + 0xe0, 0x39, 0x5f, 0x7e, 0xce, 0xa5, 0xf9, 0x29, 0x34, 0xf5, 0x25, 0x6f, 0x75, 0x30, 0xea, 0x57, + 0x73, 0xfa, 0x3f, 0x81, 0xcd, 0xcc, 0xbd, 0xd9, 0x0f, 0xe1, 0x9e, 0xb6, 0x30, 0xe0, 0xa1, 0x22, + 0x8f, 0xe4, 0x0e, 0x64, 0xc4, 0xbc, 0xe0, 0xa1, 0xc2, 0x4f, 0xea, 0xa6, 0xfe, 0x8f, 0x55, 0x68, + 0xea, 0x86, 0x99, 0x3d, 0xca, 0x4c, 0x27, 0x54, 0x15, 0x4f, 0x37, 0xff, 0xfe, 0xf6, 0x61, 0x8b, + 0x0a, 0xc8, 0xf9, 0x67, 0xe9, 0xa8, 0x92, 0x02, 0x66, 0x35, 0xd7, 0xcf, 0xc7, 0x13, 0x4f, 0x2d, + 0x33, 0xf1, 0xec, 0x41, 0xcb, 0x5b, 0xcc, 0xc9, 0x25, 0x75, 0xed, 0x12, 0x6f, 0x31, 0x47, 0x97, + 0xbc, 0x07, 0x86, 0xf2, 0x15, 0x9f, 0x11, 0x4b, 0x27, 0x69, 0x9b, 0x36, 0x90, 0xf9, 0x08, 0x3a, + 0xd9, 0x6a, 0x8b, 0xd5, 0x53, 0x83, 0xfb, 0x76, 0x5a, 0x6b, 0x71, 0x02, 0xd8, 0x87, 0xad, 0x6b, + 0x3e, 0x1b, 0x61, 0x0b, 0x48, 0x42, 0x1a, 0xed, 0xb1, 0xf8, 0x5c, 0x0a, 0x45, 0x12, 0x0f, 0xa0, + 0x9d, 0x14, 0x60, 0x8d, 0xfa, 0x2d, 0xae, 0xeb, 0x2e, 0x4e, 0xcc, 0x41, 0xe8, 0x07, 0xbe, 0x14, + 0x61, 0xd4, 0x59, 0xad, 0xcb, 0xb4, 0x44, 0xce, 0x74, 0xc1, 0x48, 0x98, 0xd8, 0x2d, 0x70, 0xdb, + 0x0e, 0x85, 0x94, 0x51, 0x63, 0x1e, 0x93, 0xec, 0x10, 0x5a, 0xc1, 0x62, 0x3c, 0xc2, 0xa2, 0x94, + 0x8f, 0xc8, 0x8b, 0xc5, 0xf8, 0x0b, 0x71, 0x13, 0x8f, 0x26, 0x01, 0x51, 0x54, 0x96, 0xfc, 0xaf, + 0x45, 0x18, 0x39, 0x4e, 0x13, 0xa6, 0x82, 0x6e, 0x71, 0x2e, 0x61, 0x1f, 0x81, 0x91, 0x24, 0x7d, + 0x21, 0x33, 0x8a, 0x77, 0x4e, 0x05, 0xb1, 0x77, 0x91, 0xae, 0xe3, 0x09, 0x7b, 0x94, 0x3a, 0x95, + 0xee, 0xd5, 0xb6, 0x3a, 0x9a, 0xf1, 0xb3, 0xd8, 0xab, 0xe6, 0x0f, 0xa0, 0xa9, 0xef, 0x48, 0xbf, + 0xe6, 0x4d, 0x10, 0x37, 0x56, 0xb4, 0x2e, 0x4d, 0xe1, 0x3f, 0x55, 0xa0, 0x1d, 0xcf, 0x3d, 0xa5, + 0x4a, 0xb9, 0x4b, 0x57, 0x6f, 0x7b, 0xe9, 0x75, 0x43, 0x63, 0x1c, 0x64, 0xf5, 0x4c, 0x90, 0x1d, + 0x02, 0xd3, 0xb1, 0x74, 0xed, 0x2b, 0xd7, 0x73, 0x46, 0xda, 0x9b, 0x3a, 0xa8, 0xba, 0xc4, 0x79, + 0x45, 0x8c, 0x0b, 0xdc, 0x3f, 0xfe, 0xa6, 0x01, 0x9d, 0x93, 0xd3, 0xb3, 0xf3, 0x93, 0x20, 0x98, + 0xb9, 0x13, 0x4e, 0xed, 0xd6, 0x00, 0xea, 0xd4, 0x50, 0x96, 0x3c, 0x4b, 0xf5, 0xcb, 0x26, 0x1b, + 0x76, 0x0c, 0x0d, 0xea, 0x2b, 0x59, 0xd9, 0xeb, 0x54, 0xbf, 0x74, 0xc0, 0xc1, 0x8f, 0xe8, 0xce, + 0x73, 0xf5, 0x91, 0xaa, 0x5f, 0x36, 0xe5, 0xb0, 0x4f, 0xc1, 0x48, 0x3b, 0xc2, 0x75, 0x4f, 0x55, + 0xfd, 0xb5, 0xf3, 0x0e, 0xea, 0xa7, 0x45, 0x76, 0xdd, 0xc3, 0x4e, 0x7f, 0xed, 0x60, 0xc0, 0x9e, + 0x41, 0x2b, 0x6e, 0x53, 0xca, 0x1f, 0x93, 0xfa, 0x6b, 0x66, 0x11, 0x74, 0x8f, 0x6e, 0xf5, 0xca, + 0x5e, 0xbc, 0xfa, 0xa5, 0x03, 0x13, 0x7b, 0x02, 0xcd, 0xa8, 0x52, 0x94, 0x3e, 0x0b, 0xf5, 0xcb, + 0x27, 0x0a, 0x34, 0x32, 0x6d, 0x73, 0xd7, 0xbd, 0xca, 0xf5, 0xd7, 0x4e, 0x76, 0xec, 0x04, 0x20, + 0xd3, 0xde, 0xad, 0x7d, 0x6e, 0xeb, 0xaf, 0x9f, 0xd8, 0xd8, 0x27, 0xd0, 0x4e, 0xa7, 0xf0, 0xf2, + 0x67, 0xb0, 0xfe, 0xba, 0x21, 0x6a, 0xdc, 0xa4, 0xa7, 0xd2, 0x0f, 0xff, 0x13, 0x00, 0x00, 0xff, + 0xff, 0x11, 0x05, 0x99, 0x2e, 0xa6, 0x15, 0x00, 0x00, } diff --git a/types/types.proto b/types/types.proto index 3d247266b..a1c553751 100644 --- a/types/types.proto +++ b/types/types.proto @@ -231,10 +231,11 @@ message Header { // hashes bytes last_block_hash = 6; - bytes app_hash = 7; + bytes val_set_hash = 7; + bytes app_hash = 8; // consensus - Validator proposer = 8 [(gogoproto.nullable)=false]; + Validator proposer = 9 [(gogoproto.nullable)=false]; } // Validator From 72330e660975a03f6bf4503fbf2a506ea6cb0468 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Wed, 6 Jun 2018 00:17:18 -0700 Subject: [PATCH 3/6] val_set_hash -> validators_hash --- specification.md | 2 +- types/types.pb.go | 244 +++++++++++++++++++++++----------------------- types/types.proto | 2 +- 3 files changed, 124 insertions(+), 124 deletions(-) diff --git a/specification.md b/specification.md index 2b0179f15..25b9d7d0e 100644 --- a/specification.md +++ b/specification.md @@ -269,7 +269,7 @@ See below for more details on the message types and how they are used. - `TotalTxs (int64)`: Total number of transactions in the blockchain until now - `LastBlockHash ([]byte)`: Hash of the previous (parent) block - - `ValSetHash ([]byte)`: Hash of the validator set for this block + - `ValidatorsHash ([]byte)`: Hash of the validator set for this block - `AppHash ([]byte)`: Data returned by the last call to `Commit` - typically the Merkle root of the application state after executing the previous block's transactions diff --git a/types/types.pb.go b/types/types.pb.go index 72de6b53c..a6b806fe6 100644 --- a/types/types.pb.go +++ b/types/types.pb.go @@ -1688,9 +1688,9 @@ type Header struct { NumTxs int32 `protobuf:"varint,4,opt,name=num_txs,json=numTxs,proto3" json:"num_txs,omitempty"` TotalTxs int64 `protobuf:"varint,5,opt,name=total_txs,json=totalTxs,proto3" json:"total_txs,omitempty"` // hashes - LastBlockHash []byte `protobuf:"bytes,6,opt,name=last_block_hash,json=lastBlockHash,proto3" json:"last_block_hash,omitempty"` - ValSetHash []byte `protobuf:"bytes,7,opt,name=val_set_hash,json=valSetHash,proto3" json:"val_set_hash,omitempty"` - AppHash []byte `protobuf:"bytes,8,opt,name=app_hash,json=appHash,proto3" json:"app_hash,omitempty"` + LastBlockHash []byte `protobuf:"bytes,6,opt,name=last_block_hash,json=lastBlockHash,proto3" json:"last_block_hash,omitempty"` + ValidatorsHash []byte `protobuf:"bytes,7,opt,name=validators_hash,json=validatorsHash,proto3" json:"validators_hash,omitempty"` + AppHash []byte `protobuf:"bytes,8,opt,name=app_hash,json=appHash,proto3" json:"app_hash,omitempty"` // consensus Proposer Validator `protobuf:"bytes,9,opt,name=proposer" json:"proposer"` } @@ -1742,9 +1742,9 @@ func (m *Header) GetLastBlockHash() []byte { return nil } -func (m *Header) GetValSetHash() []byte { +func (m *Header) GetValidatorsHash() []byte { if m != nil { - return m.ValSetHash + return m.ValidatorsHash } return nil } @@ -2335,121 +2335,121 @@ var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("types/types.proto", fileDescriptorTypes) } var fileDescriptorTypes = []byte{ - // 1849 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0x4b, 0x6f, 0x1b, 0xc9, - 0x11, 0x16, 0xdf, 0x9c, 0xd2, 0x83, 0x74, 0xcb, 0xb6, 0x68, 0x2e, 0x02, 0x0b, 0x83, 0xc0, 0x91, - 0xb3, 0x5a, 0x31, 0xd1, 0xae, 0x0d, 0x7b, 0x37, 0x59, 0x44, 0xd2, 0x3a, 0x4b, 0x61, 0xf3, 0x50, - 0x46, 0x5e, 0x07, 0xc8, 0x85, 0x68, 0x72, 0x5a, 0xc3, 0x81, 0xc9, 0x99, 0xd9, 0xe9, 0xa6, 0x96, - 0xf2, 0x2d, 0xf7, 0x45, 0xae, 0x39, 0xe7, 0x1c, 0x20, 0xb7, 0xfc, 0x85, 0x20, 0x7f, 0x22, 0x3e, - 0x24, 0x39, 0xe5, 0x4f, 0x24, 0xa8, 0xea, 0x79, 0x73, 0x68, 0x28, 0x9b, 0x63, 0x2e, 0x52, 0x57, - 0x57, 0x55, 0x4f, 0x57, 0xb1, 0xea, 0xab, 0xaa, 0x86, 0x3b, 0xea, 0x26, 0x10, 0x72, 0x40, 0x7f, - 0x8f, 0x82, 0xd0, 0x57, 0x3e, 0x6b, 0x10, 0xd1, 0xff, 0xc0, 0x71, 0xd5, 0x74, 0x31, 0x3e, 0x9a, - 0xf8, 0xf3, 0x81, 0xe3, 0x3b, 0xfe, 0x80, 0xb8, 0xe3, 0xc5, 0x15, 0x51, 0x44, 0xd0, 0x4a, 0x6b, - 0xf5, 0x07, 0x19, 0x71, 0x25, 0x3c, 0x5b, 0x84, 0x73, 0xd7, 0x53, 0x03, 0x35, 0x9f, 0xb9, 0x63, - 0x39, 0x98, 0xf8, 0xf3, 0xb9, 0xef, 0x65, 0x3f, 0x63, 0xfe, 0xa5, 0x0e, 0x2d, 0x4b, 0x7c, 0xb5, - 0x10, 0x52, 0xb1, 0x03, 0xa8, 0x8b, 0xc9, 0xd4, 0xef, 0x55, 0xf7, 0x2b, 0x07, 0x9b, 0xc7, 0xec, - 0x48, 0xcb, 0x45, 0xdc, 0x17, 0x93, 0xa9, 0x3f, 0xdc, 0xb0, 0x48, 0x82, 0xbd, 0x0f, 0x8d, 0xab, - 0xd9, 0x42, 0x4e, 0x7b, 0x35, 0x12, 0xdd, 0xcd, 0x8b, 0xfe, 0x14, 0x59, 0xc3, 0x0d, 0x4b, 0xcb, - 0xe0, 0xb1, 0xae, 0x77, 0xe5, 0xf7, 0xea, 0x65, 0xc7, 0x9e, 0x7b, 0x57, 0x74, 0x2c, 0x4a, 0xb0, - 0x67, 0x00, 0x52, 0xa8, 0x91, 0x1f, 0x28, 0xd7, 0xf7, 0x7a, 0x0d, 0x92, 0xdf, 0xcb, 0xcb, 0x5f, - 0x0a, 0xf5, 0x4b, 0x62, 0x0f, 0x37, 0x2c, 0x43, 0xc6, 0x04, 0x6a, 0xba, 0x9e, 0xab, 0x46, 0x93, - 0x29, 0x77, 0xbd, 0x5e, 0xb3, 0x4c, 0xf3, 0xdc, 0x73, 0xd5, 0x19, 0xb2, 0x51, 0xd3, 0x8d, 0x09, - 0x34, 0xe5, 0xab, 0x85, 0x08, 0x6f, 0x7a, 0xad, 0x32, 0x53, 0x7e, 0x85, 0x2c, 0x34, 0x85, 0x64, - 0xd8, 0x27, 0xb0, 0x39, 0x16, 0x8e, 0xeb, 0x8d, 0xc6, 0x33, 0x7f, 0xf2, 0xba, 0xd7, 0x26, 0x95, - 0x5e, 0x5e, 0xe5, 0x14, 0x05, 0x4e, 0x91, 0x3f, 0xdc, 0xb0, 0x60, 0x9c, 0x50, 0xec, 0x18, 0xda, - 0x93, 0xa9, 0x98, 0xbc, 0x1e, 0xa9, 0x65, 0xcf, 0x20, 0xcd, 0x7b, 0x79, 0xcd, 0x33, 0xe4, 0xbe, - 0x5c, 0x0e, 0x37, 0xac, 0xd6, 0x44, 0x2f, 0xd1, 0x2e, 0x5b, 0xcc, 0xdc, 0x6b, 0x11, 0xa2, 0xd6, - 0x6e, 0x99, 0x5d, 0x9f, 0x69, 0x3e, 0xe9, 0x19, 0x76, 0x4c, 0xb0, 0x27, 0x60, 0x08, 0xcf, 0x8e, - 0x2e, 0xba, 0x49, 0x8a, 0xf7, 0x0b, 0xbf, 0xa8, 0x67, 0xc7, 0xd7, 0x6c, 0x8b, 0x68, 0xcd, 0x8e, - 0xa0, 0x89, 0x51, 0xe2, 0xaa, 0xde, 0x16, 0xe9, 0xdc, 0x2d, 0x5c, 0x91, 0x78, 0xc3, 0x0d, 0x2b, - 0x92, 0x3a, 0x6d, 0x41, 0xe3, 0x9a, 0xcf, 0x16, 0xc2, 0xfc, 0x1e, 0x6c, 0x66, 0x22, 0x85, 0xf5, - 0xa0, 0x35, 0x17, 0x52, 0x72, 0x47, 0xf4, 0x2a, 0xfb, 0x95, 0x03, 0xc3, 0x8a, 0x49, 0x73, 0x07, - 0xb6, 0xb2, 0x71, 0x92, 0x51, 0xc4, 0x58, 0x40, 0xc5, 0x6b, 0x11, 0x4a, 0x0c, 0x80, 0x48, 0x31, - 0x22, 0xcd, 0x8f, 0xa1, 0x5b, 0x0c, 0x02, 0xd6, 0x85, 0xda, 0x6b, 0x71, 0x13, 0x49, 0xe2, 0x92, - 0xdd, 0x8d, 0x2e, 0x44, 0x51, 0x6c, 0x58, 0xd1, 0xed, 0xfe, 0x59, 0x49, 0x94, 0x93, 0x38, 0x60, - 0x0c, 0xea, 0xca, 0x9d, 0xeb, 0x0b, 0xd6, 0x2c, 0x5a, 0xb3, 0x07, 0xf8, 0x23, 0x71, 0xd7, 0x1b, - 0xb9, 0x76, 0x74, 0x42, 0x8b, 0xe8, 0x73, 0x9b, 0x9d, 0x40, 0x77, 0xe2, 0x7b, 0x52, 0x78, 0x72, - 0x21, 0x47, 0x01, 0x0f, 0xf9, 0x5c, 0x46, 0xf1, 0x1f, 0x3b, 0xf6, 0x2c, 0x66, 0x5f, 0x10, 0xd7, - 0xea, 0x4c, 0xf2, 0x1b, 0xec, 0x29, 0xc0, 0x35, 0x9f, 0xb9, 0x36, 0x57, 0x7e, 0x28, 0x7b, 0xf5, - 0xfd, 0xda, 0xc1, 0xe6, 0x71, 0x37, 0x52, 0x7e, 0x15, 0x33, 0x4e, 0xeb, 0x7f, 0x7d, 0xfb, 0x70, - 0xc3, 0xca, 0x48, 0xb2, 0x47, 0xd0, 0xe1, 0x41, 0x30, 0x92, 0x8a, 0x2b, 0x31, 0x1a, 0xdf, 0x28, - 0x21, 0x29, 0x3b, 0xb6, 0xac, 0x6d, 0x1e, 0x04, 0x97, 0xb8, 0x7b, 0x8a, 0x9b, 0xa6, 0x9d, 0xf8, - 0x96, 0x02, 0x17, 0x2d, 0xb4, 0xb9, 0xe2, 0x64, 0xe1, 0x96, 0x45, 0x6b, 0xdc, 0x0b, 0xb8, 0x9a, - 0x46, 0xd6, 0xd1, 0x9a, 0xdd, 0x87, 0xe6, 0x54, 0xb8, 0xce, 0x54, 0x91, 0x41, 0x35, 0x2b, 0xa2, - 0xd0, 0x99, 0x41, 0xe8, 0x5f, 0x0b, 0xca, 0xdd, 0xb6, 0xa5, 0x09, 0xf3, 0x6f, 0x15, 0xb8, 0xb3, - 0x12, 0xec, 0x78, 0xee, 0x94, 0xcb, 0x69, 0xfc, 0x2d, 0x5c, 0xb3, 0xf7, 0xf1, 0x5c, 0x6e, 0x8b, - 0x30, 0xc2, 0x94, 0xed, 0xc8, 0xd6, 0x21, 0x6d, 0x46, 0x86, 0x46, 0x22, 0xec, 0xc7, 0x39, 0xe7, - 0xd4, 0xc8, 0x39, 0x71, 0xac, 0x5f, 0xba, 0x8e, 0xe7, 0x7a, 0xce, 0xbb, 0x7c, 0x34, 0x84, 0xbb, - 0xe3, 0x9b, 0x37, 0xdc, 0x53, 0xae, 0x27, 0x46, 0x2b, 0x5e, 0xee, 0x44, 0x07, 0xbd, 0xb8, 0x76, - 0x6d, 0xe1, 0x4d, 0x44, 0x74, 0xc0, 0x6e, 0xa2, 0x92, 0x1c, 0x2d, 0xcd, 0x7d, 0xd8, 0xc9, 0x67, - 0x24, 0xdb, 0x81, 0xaa, 0x5a, 0x46, 0x96, 0x55, 0xd5, 0xd2, 0x34, 0x93, 0x68, 0x4a, 0xb2, 0x6f, - 0x45, 0xe6, 0x31, 0x74, 0x0a, 0x89, 0x96, 0x71, 0x73, 0x25, 0xeb, 0x66, 0xb3, 0x03, 0xdb, 0xb9, - 0xfc, 0x32, 0xbf, 0x69, 0x40, 0xdb, 0x12, 0x32, 0xc0, 0xf0, 0x61, 0xcf, 0xc0, 0x10, 0xcb, 0x89, - 0xd0, 0xa0, 0x58, 0x29, 0x40, 0x8e, 0x96, 0x79, 0x11, 0xf3, 0x11, 0x03, 0x12, 0x61, 0xf6, 0x38, - 0x07, 0xe8, 0xbb, 0x45, 0xa5, 0x2c, 0xa2, 0x1f, 0xe6, 0x11, 0xfd, 0x6e, 0x41, 0xb6, 0x00, 0xe9, - 0x8f, 0x73, 0x90, 0x5e, 0x3c, 0x38, 0x87, 0xe9, 0xcf, 0x4b, 0x30, 0xbd, 0x78, 0xfd, 0x35, 0xa0, - 0xfe, 0xbc, 0x04, 0xd4, 0x7b, 0x2b, 0xdf, 0x2a, 0x45, 0xf5, 0xc3, 0x3c, 0xaa, 0x17, 0xcd, 0x29, - 0xc0, 0xfa, 0x8f, 0xca, 0x60, 0xfd, 0x41, 0x41, 0x67, 0x2d, 0xae, 0x7f, 0xb8, 0x82, 0xeb, 0xf7, - 0x0b, 0xaa, 0x25, 0xc0, 0xfe, 0x3c, 0x07, 0xec, 0x50, 0x6a, 0xdb, 0x1a, 0x64, 0x7f, 0xba, 0x8a, - 0xec, 0x7b, 0xc5, 0x9f, 0xb6, 0x0c, 0xda, 0x07, 0x05, 0x68, 0xbf, 0x57, 0xbc, 0xe5, 0x5a, 0x6c, - 0x7f, 0x8c, 0xf9, 0x5e, 0x88, 0x34, 0xc4, 0x06, 0x11, 0x86, 0x7e, 0x18, 0x81, 0xaf, 0x26, 0xcc, - 0x03, 0x44, 0xa0, 0x34, 0xbe, 0xde, 0x51, 0x07, 0x28, 0xe8, 0x33, 0xd1, 0x65, 0xfe, 0xbe, 0x92, - 0xea, 0x52, 0x29, 0xc8, 0xa2, 0x97, 0x11, 0xa1, 0x57, 0xa6, 0x3c, 0x54, 0x73, 0xe5, 0x81, 0x7d, - 0x1f, 0xee, 0xcc, 0xb8, 0x54, 0xda, 0x2f, 0xa3, 0x1c, 0x9c, 0x75, 0x90, 0xa1, 0x1d, 0xa2, 0x71, - 0xed, 0x03, 0xd8, 0xcd, 0xc8, 0x22, 0xb4, 0x12, 0x74, 0xd5, 0x29, 0x79, 0xbb, 0x89, 0xf4, 0x49, - 0x10, 0x0c, 0xb9, 0x9c, 0x9a, 0x3f, 0x4f, 0xed, 0x4f, 0x4b, 0x0f, 0x83, 0xfa, 0xc4, 0xb7, 0xb5, - 0x59, 0xdb, 0x16, 0xad, 0xb1, 0x1c, 0xcd, 0x7c, 0x87, 0xbe, 0x6a, 0x58, 0xb8, 0x44, 0xa9, 0x24, - 0x53, 0x0c, 0x9d, 0x12, 0xe6, 0xef, 0x2a, 0xe9, 0x79, 0x69, 0x35, 0x2a, 0x2b, 0x2f, 0x95, 0xff, - 0xa5, 0xbc, 0x54, 0x6f, 0x5b, 0x5e, 0xcc, 0x3f, 0x57, 0xd2, 0xdf, 0x22, 0x29, 0x1c, 0xdf, 0xce, - 0x38, 0x0c, 0x0b, 0xd7, 0xb3, 0xc5, 0x92, 0x52, 0xbd, 0x66, 0x69, 0x22, 0xae, 0xd3, 0x4d, 0x72, - 0x70, 0xbe, 0x4e, 0xb7, 0x68, 0x4f, 0x13, 0x51, 0xc1, 0xf1, 0xaf, 0x28, 0x07, 0xb7, 0x2c, 0x4d, - 0x64, 0x70, 0xd3, 0xc8, 0xe1, 0xe6, 0x05, 0xb0, 0xd5, 0xec, 0x64, 0x1f, 0x43, 0x5d, 0x71, 0x07, - 0x9d, 0x87, 0xf6, 0xef, 0x1c, 0xe9, 0xae, 0xf7, 0xe8, 0x8b, 0x57, 0x17, 0xdc, 0x0d, 0x4f, 0xef, - 0xa3, 0xf5, 0xff, 0x7a, 0xfb, 0x70, 0x07, 0x65, 0x0e, 0xfd, 0xb9, 0xab, 0xc4, 0x3c, 0x50, 0x37, - 0x16, 0xe9, 0x98, 0xff, 0xae, 0x20, 0x6a, 0xe7, 0xb2, 0xb6, 0xd4, 0x17, 0x71, 0x68, 0x56, 0x33, - 0x85, 0xf5, 0x76, 0xfe, 0xf9, 0x0e, 0x80, 0xc3, 0xe5, 0xe8, 0x6b, 0xee, 0x29, 0x61, 0x47, 0x4e, - 0x32, 0x1c, 0x2e, 0x7f, 0x4d, 0x1b, 0xd8, 0x7f, 0x20, 0x7b, 0x21, 0x85, 0x4d, 0xde, 0xaa, 0x59, - 0x2d, 0x87, 0xcb, 0x2f, 0xa5, 0xb0, 0x13, 0xbb, 0x5a, 0xff, 0xbd, 0x5d, 0xec, 0x00, 0x6a, 0x57, - 0x42, 0x44, 0xc8, 0xd6, 0x4d, 0x54, 0xcf, 0x9f, 0x7e, 0x44, 0xca, 0x3a, 0x24, 0x50, 0xc4, 0xfc, - 0x6d, 0x35, 0x0d, 0xce, 0xb4, 0xb8, 0xfd, 0x7f, 0xf9, 0xe0, 0x1f, 0xd4, 0x2d, 0xe6, 0xa1, 0x94, - 0x9d, 0xc1, 0x9d, 0x24, 0x65, 0x46, 0x8b, 0xc0, 0xe6, 0xd8, 0x85, 0x55, 0xde, 0x99, 0x63, 0xdd, - 0x44, 0xe1, 0x4b, 0x2d, 0xcf, 0x7e, 0x01, 0x7b, 0x85, 0x24, 0x4f, 0x8e, 0xaa, 0xbe, 0x33, 0xd7, - 0xef, 0xe5, 0x73, 0x3d, 0x3e, 0x2f, 0xf6, 0x47, 0xed, 0x5b, 0xc4, 0xfa, 0x77, 0xb1, 0xcd, 0xc9, - 0x42, 0x7f, 0xd9, 0x2f, 0x6a, 0xfe, 0xa1, 0x02, 0x9d, 0xc2, 0x65, 0xd8, 0x00, 0x40, 0x23, 0xa7, - 0x74, 0xdf, 0x88, 0x08, 0xa4, 0x62, 0x1f, 0x90, 0xb3, 0x2e, 0xdd, 0x37, 0xc2, 0x32, 0xc6, 0xf1, - 0x92, 0x3d, 0x82, 0x96, 0x5a, 0x6a, 0xe9, 0x7c, 0x23, 0xf8, 0x72, 0x49, 0xa2, 0x4d, 0x45, 0xff, - 0xd9, 0x13, 0xd8, 0xd2, 0x07, 0x3b, 0xbe, 0x94, 0x6e, 0x10, 0x35, 0x23, 0x2c, 0x7b, 0xf4, 0xe7, - 0xc4, 0xb1, 0x36, 0xc7, 0x29, 0x61, 0xfe, 0x06, 0x8c, 0xe4, 0xb3, 0xec, 0x3d, 0x30, 0xe6, 0x7c, - 0x19, 0x75, 0xc9, 0x78, 0xb7, 0x86, 0xd5, 0x9e, 0xf3, 0x25, 0x35, 0xc8, 0x6c, 0x0f, 0x5a, 0xc8, - 0x54, 0x4b, 0xed, 0xef, 0x86, 0xd5, 0x9c, 0xf3, 0xe5, 0xcb, 0x65, 0xc2, 0x70, 0xb8, 0x8c, 0x5b, - 0xe0, 0x39, 0x5f, 0x7e, 0xce, 0xa5, 0xf9, 0x29, 0x34, 0xf5, 0x25, 0x6f, 0x75, 0x30, 0xea, 0x57, - 0x73, 0xfa, 0x3f, 0x81, 0xcd, 0xcc, 0xbd, 0xd9, 0x0f, 0xe1, 0x9e, 0xb6, 0x30, 0xe0, 0xa1, 0x22, - 0x8f, 0xe4, 0x0e, 0x64, 0xc4, 0xbc, 0xe0, 0xa1, 0xc2, 0x4f, 0xea, 0xa6, 0xfe, 0x8f, 0x55, 0x68, - 0xea, 0x86, 0x99, 0x3d, 0xca, 0x4c, 0x27, 0x54, 0x15, 0x4f, 0x37, 0xff, 0xfe, 0xf6, 0x61, 0x8b, - 0x0a, 0xc8, 0xf9, 0x67, 0xe9, 0xa8, 0x92, 0x02, 0x66, 0x35, 0xd7, 0xcf, 0xc7, 0x13, 0x4f, 0x2d, - 0x33, 0xf1, 0xec, 0x41, 0xcb, 0x5b, 0xcc, 0xc9, 0x25, 0x75, 0xed, 0x12, 0x6f, 0x31, 0x47, 0x97, - 0xbc, 0x07, 0x86, 0xf2, 0x15, 0x9f, 0x11, 0x4b, 0x27, 0x69, 0x9b, 0x36, 0x90, 0xf9, 0x08, 0x3a, - 0xd9, 0x6a, 0x8b, 0xd5, 0x53, 0x83, 0xfb, 0x76, 0x5a, 0x6b, 0x71, 0x02, 0xd8, 0x87, 0xad, 0x6b, - 0x3e, 0x1b, 0x61, 0x0b, 0x48, 0x42, 0x1a, 0xed, 0xb1, 0xf8, 0x5c, 0x0a, 0x45, 0x12, 0x0f, 0xa0, - 0x9d, 0x14, 0x60, 0x8d, 0xfa, 0x2d, 0xae, 0xeb, 0x2e, 0x4e, 0xcc, 0x41, 0xe8, 0x07, 0xbe, 0x14, - 0x61, 0xd4, 0x59, 0xad, 0xcb, 0xb4, 0x44, 0xce, 0x74, 0xc1, 0x48, 0x98, 0xd8, 0x2d, 0x70, 0xdb, - 0x0e, 0x85, 0x94, 0x51, 0x63, 0x1e, 0x93, 0xec, 0x10, 0x5a, 0xc1, 0x62, 0x3c, 0xc2, 0xa2, 0x94, - 0x8f, 0xc8, 0x8b, 0xc5, 0xf8, 0x0b, 0x71, 0x13, 0x8f, 0x26, 0x01, 0x51, 0x54, 0x96, 0xfc, 0xaf, - 0x45, 0x18, 0x39, 0x4e, 0x13, 0xa6, 0x82, 0x6e, 0x71, 0x2e, 0x61, 0x1f, 0x81, 0x91, 0x24, 0x7d, - 0x21, 0x33, 0x8a, 0x77, 0x4e, 0x05, 0xb1, 0x77, 0x91, 0xae, 0xe3, 0x09, 0x7b, 0x94, 0x3a, 0x95, - 0xee, 0xd5, 0xb6, 0x3a, 0x9a, 0xf1, 0xb3, 0xd8, 0xab, 0xe6, 0x0f, 0xa0, 0xa9, 0xef, 0x48, 0xbf, - 0xe6, 0x4d, 0x10, 0x37, 0x56, 0xb4, 0x2e, 0x4d, 0xe1, 0x3f, 0x55, 0xa0, 0x1d, 0xcf, 0x3d, 0xa5, - 0x4a, 0xb9, 0x4b, 0x57, 0x6f, 0x7b, 0xe9, 0x75, 0x43, 0x63, 0x1c, 0x64, 0xf5, 0x4c, 0x90, 0x1d, - 0x02, 0xd3, 0xb1, 0x74, 0xed, 0x2b, 0xd7, 0x73, 0x46, 0xda, 0x9b, 0x3a, 0xa8, 0xba, 0xc4, 0x79, - 0x45, 0x8c, 0x0b, 0xdc, 0x3f, 0xfe, 0xa6, 0x01, 0x9d, 0x93, 0xd3, 0xb3, 0xf3, 0x93, 0x20, 0x98, - 0xb9, 0x13, 0x4e, 0xed, 0xd6, 0x00, 0xea, 0xd4, 0x50, 0x96, 0x3c, 0x4b, 0xf5, 0xcb, 0x26, 0x1b, - 0x76, 0x0c, 0x0d, 0xea, 0x2b, 0x59, 0xd9, 0xeb, 0x54, 0xbf, 0x74, 0xc0, 0xc1, 0x8f, 0xe8, 0xce, - 0x73, 0xf5, 0x91, 0xaa, 0x5f, 0x36, 0xe5, 0xb0, 0x4f, 0xc1, 0x48, 0x3b, 0xc2, 0x75, 0x4f, 0x55, - 0xfd, 0xb5, 0xf3, 0x0e, 0xea, 0xa7, 0x45, 0x76, 0xdd, 0xc3, 0x4e, 0x7f, 0xed, 0x60, 0xc0, 0x9e, - 0x41, 0x2b, 0x6e, 0x53, 0xca, 0x1f, 0x93, 0xfa, 0x6b, 0x66, 0x11, 0x74, 0x8f, 0x6e, 0xf5, 0xca, - 0x5e, 0xbc, 0xfa, 0xa5, 0x03, 0x13, 0x7b, 0x02, 0xcd, 0xa8, 0x52, 0x94, 0x3e, 0x0b, 0xf5, 0xcb, - 0x27, 0x0a, 0x34, 0x32, 0x6d, 0x73, 0xd7, 0xbd, 0xca, 0xf5, 0xd7, 0x4e, 0x76, 0xec, 0x04, 0x20, - 0xd3, 0xde, 0xad, 0x7d, 0x6e, 0xeb, 0xaf, 0x9f, 0xd8, 0xd8, 0x27, 0xd0, 0x4e, 0xa7, 0xf0, 0xf2, - 0x67, 0xb0, 0xfe, 0xba, 0x21, 0x6a, 0xdc, 0xa4, 0xa7, 0xd2, 0x0f, 0xff, 0x13, 0x00, 0x00, 0xff, - 0xff, 0x11, 0x05, 0x99, 0x2e, 0xa6, 0x15, 0x00, 0x00, + // 1846 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0xcd, 0x6e, 0x1b, 0xc9, + 0x11, 0x16, 0xff, 0x39, 0xa5, 0x1f, 0xd2, 0x2d, 0xdb, 0xa2, 0xb9, 0x08, 0x6c, 0x0c, 0x02, 0xaf, + 0x9c, 0xd5, 0x8a, 0x89, 0x76, 0x6d, 0xd8, 0xbb, 0xc9, 0x22, 0x92, 0xd6, 0x59, 0x0a, 0x9b, 0x1f, + 0x65, 0xec, 0x75, 0x80, 0x5c, 0x88, 0x26, 0xa7, 0x45, 0x0e, 0x4c, 0xce, 0xcc, 0x4e, 0x37, 0xb5, + 0x94, 0x6f, 0xb9, 0x2f, 0x72, 0xcd, 0x39, 0x2f, 0x90, 0x43, 0x80, 0xbc, 0x42, 0x90, 0x97, 0x88, + 0x0f, 0x49, 0x4e, 0x79, 0x89, 0x04, 0x55, 0xdd, 0xf3, 0xab, 0xa1, 0xe1, 0x38, 0xc7, 0xbd, 0x48, + 0x5d, 0x5d, 0x55, 0x3d, 0x5d, 0xc5, 0xaa, 0xaf, 0xaa, 0x1a, 0x6e, 0xa8, 0xab, 0x50, 0xc8, 0x01, + 0xfd, 0x3d, 0x0c, 0xa3, 0x40, 0x05, 0xac, 0x41, 0x44, 0xff, 0xc3, 0xa9, 0xa7, 0x66, 0xcb, 0xf1, + 0xe1, 0x24, 0x58, 0x0c, 0xa6, 0xc1, 0x34, 0x18, 0x10, 0x77, 0xbc, 0xbc, 0x20, 0x8a, 0x08, 0x5a, + 0x69, 0xad, 0xfe, 0x20, 0x23, 0xae, 0x84, 0xef, 0x8a, 0x68, 0xe1, 0xf9, 0x6a, 0xa0, 0x16, 0x73, + 0x6f, 0x2c, 0x07, 0x93, 0x60, 0xb1, 0x08, 0xfc, 0xec, 0x67, 0xec, 0xbf, 0xd6, 0xa1, 0xe5, 0x88, + 0xaf, 0x97, 0x42, 0x2a, 0xb6, 0x0f, 0x75, 0x31, 0x99, 0x05, 0xbd, 0xea, 0xbd, 0xca, 0xfe, 0xe6, + 0x11, 0x3b, 0xd4, 0x72, 0x86, 0xfb, 0x74, 0x32, 0x0b, 0x86, 0x1b, 0x0e, 0x49, 0xb0, 0x0f, 0xa0, + 0x71, 0x31, 0x5f, 0xca, 0x59, 0xaf, 0x46, 0xa2, 0xbb, 0x79, 0xd1, 0x9f, 0x21, 0x6b, 0xb8, 0xe1, + 0x68, 0x19, 0x3c, 0xd6, 0xf3, 0x2f, 0x82, 0x5e, 0xbd, 0xec, 0xd8, 0x33, 0xff, 0x82, 0x8e, 0x45, + 0x09, 0xf6, 0x18, 0x40, 0x0a, 0x35, 0x0a, 0x42, 0xe5, 0x05, 0x7e, 0xaf, 0x41, 0xf2, 0x7b, 0x79, + 0xf9, 0x67, 0x42, 0xfd, 0x8a, 0xd8, 0xc3, 0x0d, 0xc7, 0x92, 0x31, 0x81, 0x9a, 0x9e, 0xef, 0xa9, + 0xd1, 0x64, 0xc6, 0x3d, 0xbf, 0xd7, 0x2c, 0xd3, 0x3c, 0xf3, 0x3d, 0x75, 0x8a, 0x6c, 0xd4, 0xf4, + 0x62, 0x02, 0x4d, 0xf9, 0x7a, 0x29, 0xa2, 0xab, 0x5e, 0xab, 0xcc, 0x94, 0x5f, 0x23, 0x0b, 0x4d, + 0x21, 0x19, 0xf6, 0x29, 0x6c, 0x8e, 0xc5, 0xd4, 0xf3, 0x47, 0xe3, 0x79, 0x30, 0x79, 0xd9, 0x6b, + 0x93, 0x4a, 0x2f, 0xaf, 0x72, 0x82, 0x02, 0x27, 0xc8, 0x1f, 0x6e, 0x38, 0x30, 0x4e, 0x28, 0x76, + 0x04, 0xed, 0xc9, 0x4c, 0x4c, 0x5e, 0x8e, 0xd4, 0xaa, 0x67, 0x91, 0xe6, 0xad, 0xbc, 0xe6, 0x29, + 0x72, 0x9f, 0xaf, 0x86, 0x1b, 0x4e, 0x6b, 0xa2, 0x97, 0x68, 0x97, 0x2b, 0xe6, 0xde, 0xa5, 0x88, + 0x50, 0x6b, 0xb7, 0xcc, 0xae, 0xcf, 0x35, 0x9f, 0xf4, 0x2c, 0x37, 0x26, 0xd8, 0x43, 0xb0, 0x84, + 0xef, 0x9a, 0x8b, 0x6e, 0x92, 0xe2, 0xed, 0xc2, 0x2f, 0xea, 0xbb, 0xf1, 0x35, 0xdb, 0xc2, 0xac, + 0xd9, 0x21, 0x34, 0x31, 0x4a, 0x3c, 0xd5, 0xdb, 0x22, 0x9d, 0x9b, 0x85, 0x2b, 0x12, 0x6f, 0xb8, + 0xe1, 0x18, 0xa9, 0x93, 0x16, 0x34, 0x2e, 0xf9, 0x7c, 0x29, 0xec, 0xf7, 0x61, 0x33, 0x13, 0x29, + 0xac, 0x07, 0xad, 0x85, 0x90, 0x92, 0x4f, 0x45, 0xaf, 0x72, 0xaf, 0xb2, 0x6f, 0x39, 0x31, 0x69, + 0xef, 0xc0, 0x56, 0x36, 0x4e, 0x32, 0x8a, 0x18, 0x0b, 0xa8, 0x78, 0x29, 0x22, 0x89, 0x01, 0x60, + 0x14, 0x0d, 0x69, 0x7f, 0x02, 0xdd, 0x62, 0x10, 0xb0, 0x2e, 0xd4, 0x5e, 0x8a, 0x2b, 0x23, 0x89, + 0x4b, 0x76, 0xd3, 0x5c, 0x88, 0xa2, 0xd8, 0x72, 0xcc, 0xed, 0xfe, 0x55, 0x49, 0x94, 0x93, 0x38, + 0x60, 0x0c, 0xea, 0xca, 0x5b, 0xe8, 0x0b, 0xd6, 0x1c, 0x5a, 0xb3, 0x3b, 0xf8, 0x23, 0x71, 0xcf, + 0x1f, 0x79, 0xae, 0x39, 0xa1, 0x45, 0xf4, 0x99, 0xcb, 0x8e, 0xa1, 0x3b, 0x09, 0x7c, 0x29, 0x7c, + 0xb9, 0x94, 0xa3, 0x90, 0x47, 0x7c, 0x21, 0x4d, 0xfc, 0xc7, 0x8e, 0x3d, 0x8d, 0xd9, 0xe7, 0xc4, + 0x75, 0x3a, 0x93, 0xfc, 0x06, 0x7b, 0x04, 0x70, 0xc9, 0xe7, 0x9e, 0xcb, 0x55, 0x10, 0xc9, 0x5e, + 0xfd, 0x5e, 0x6d, 0x7f, 0xf3, 0xa8, 0x6b, 0x94, 0x5f, 0xc4, 0x8c, 0x93, 0xfa, 0xdf, 0x5e, 0xdf, + 0xdd, 0x70, 0x32, 0x92, 0xec, 0x3e, 0x74, 0x78, 0x18, 0x8e, 0xa4, 0xe2, 0x4a, 0x8c, 0xc6, 0x57, + 0x4a, 0x48, 0xca, 0x8e, 0x2d, 0x67, 0x9b, 0x87, 0xe1, 0x33, 0xdc, 0x3d, 0xc1, 0x4d, 0xdb, 0x4d, + 0x7c, 0x4b, 0x81, 0x8b, 0x16, 0xba, 0x5c, 0x71, 0xb2, 0x70, 0xcb, 0xa1, 0x35, 0xee, 0x85, 0x5c, + 0xcd, 0x8c, 0x75, 0xb4, 0x66, 0xb7, 0xa1, 0x39, 0x13, 0xde, 0x74, 0xa6, 0xc8, 0xa0, 0x9a, 0x63, + 0x28, 0x74, 0x66, 0x18, 0x05, 0x97, 0x82, 0x72, 0xb7, 0xed, 0x68, 0xc2, 0xfe, 0x7b, 0x05, 0x6e, + 0x5c, 0x0b, 0x76, 0x3c, 0x77, 0xc6, 0xe5, 0x2c, 0xfe, 0x16, 0xae, 0xd9, 0x07, 0x78, 0x2e, 0x77, + 0x45, 0x64, 0x30, 0x65, 0xdb, 0xd8, 0x3a, 0xa4, 0x4d, 0x63, 0xa8, 0x11, 0x61, 0x3f, 0xc9, 0x39, + 0xa7, 0x46, 0xce, 0x89, 0x63, 0xfd, 0x99, 0x37, 0xf5, 0x3d, 0x7f, 0xfa, 0x26, 0x1f, 0x0d, 0xe1, + 0xe6, 0xf8, 0xea, 0x15, 0xf7, 0x95, 0xe7, 0x8b, 0xd1, 0x35, 0x2f, 0x77, 0xcc, 0x41, 0x4f, 0x2f, + 0x3d, 0x57, 0xf8, 0x13, 0x61, 0x0e, 0xd8, 0x4d, 0x54, 0x92, 0xa3, 0xa5, 0x7d, 0x0f, 0x76, 0xf2, + 0x19, 0xc9, 0x76, 0xa0, 0xaa, 0x56, 0xc6, 0xb2, 0xaa, 0x5a, 0xd9, 0x76, 0x12, 0x4d, 0x49, 0xf6, + 0x5d, 0x93, 0x79, 0x00, 0x9d, 0x42, 0xa2, 0x65, 0xdc, 0x5c, 0xc9, 0xba, 0xd9, 0xee, 0xc0, 0x76, + 0x2e, 0xbf, 0xec, 0x6f, 0x1b, 0xd0, 0x76, 0x84, 0x0c, 0x31, 0x7c, 0xd8, 0x63, 0xb0, 0xc4, 0x6a, + 0x22, 0x34, 0x28, 0x56, 0x0a, 0x90, 0xa3, 0x65, 0x9e, 0xc6, 0x7c, 0xc4, 0x80, 0x44, 0x98, 0x3d, + 0xc8, 0x01, 0xfa, 0x6e, 0x51, 0x29, 0x8b, 0xe8, 0x07, 0x79, 0x44, 0xbf, 0x59, 0x90, 0x2d, 0x40, + 0xfa, 0x83, 0x1c, 0xa4, 0x17, 0x0f, 0xce, 0x61, 0xfa, 0x93, 0x12, 0x4c, 0x2f, 0x5e, 0x7f, 0x0d, + 0xa8, 0x3f, 0x29, 0x01, 0xf5, 0xde, 0xb5, 0x6f, 0x95, 0xa2, 0xfa, 0x41, 0x1e, 0xd5, 0x8b, 0xe6, + 0x14, 0x60, 0xfd, 0xc7, 0x65, 0xb0, 0x7e, 0xa7, 0xa0, 0xb3, 0x16, 0xd7, 0x3f, 0xba, 0x86, 0xeb, + 0xb7, 0x0b, 0xaa, 0x25, 0xc0, 0xfe, 0x24, 0x07, 0xec, 0x50, 0x6a, 0xdb, 0x1a, 0x64, 0x7f, 0x74, + 0x1d, 0xd9, 0xf7, 0x8a, 0x3f, 0x6d, 0x19, 0xb4, 0x0f, 0x0a, 0xd0, 0x7e, 0xab, 0x78, 0xcb, 0xb5, + 0xd8, 0xfe, 0x00, 0xf3, 0xbd, 0x10, 0x69, 0x88, 0x0d, 0x22, 0x8a, 0x82, 0xc8, 0x80, 0xaf, 0x26, + 0xec, 0x7d, 0x44, 0xa0, 0x34, 0xbe, 0xde, 0x50, 0x07, 0x28, 0xe8, 0x33, 0xd1, 0x65, 0xff, 0xa1, + 0x92, 0xea, 0x52, 0x29, 0xc8, 0xa2, 0x97, 0x65, 0xd0, 0x2b, 0x53, 0x1e, 0xaa, 0xb9, 0xf2, 0xc0, + 0x7e, 0x00, 0x37, 0xe6, 0x5c, 0x2a, 0xed, 0x97, 0x51, 0x0e, 0xce, 0x3a, 0xc8, 0xd0, 0x0e, 0xd1, + 0xb8, 0xf6, 0x21, 0xec, 0x66, 0x64, 0x11, 0x5a, 0x09, 0xba, 0xea, 0x94, 0xbc, 0xdd, 0x44, 0xfa, + 0x38, 0x0c, 0x87, 0x5c, 0xce, 0xec, 0x5f, 0xa4, 0xf6, 0xa7, 0xa5, 0x87, 0x41, 0x7d, 0x12, 0xb8, + 0xda, 0xac, 0x6d, 0x87, 0xd6, 0x58, 0x8e, 0xe6, 0xc1, 0x94, 0xbe, 0x6a, 0x39, 0xb8, 0x44, 0xa9, + 0x24, 0x53, 0x2c, 0x9d, 0x12, 0xf6, 0xef, 0x2b, 0xe9, 0x79, 0x69, 0x35, 0x2a, 0x2b, 0x2f, 0x95, + 0xff, 0xa7, 0xbc, 0x54, 0xdf, 0xb6, 0xbc, 0xd8, 0x7f, 0xa9, 0xa4, 0xbf, 0x45, 0x52, 0x38, 0xde, + 0xcd, 0x38, 0x0c, 0x0b, 0xcf, 0x77, 0xc5, 0x8a, 0x52, 0xbd, 0xe6, 0x68, 0x22, 0xae, 0xd3, 0x4d, + 0x72, 0x70, 0xbe, 0x4e, 0xb7, 0x68, 0x4f, 0x13, 0xa6, 0xe0, 0x04, 0x17, 0x94, 0x83, 0x5b, 0x8e, + 0x26, 0x32, 0xb8, 0x69, 0xe5, 0x70, 0xf3, 0x1c, 0xd8, 0xf5, 0xec, 0x64, 0x9f, 0x40, 0x5d, 0xf1, + 0x29, 0x3a, 0x0f, 0xed, 0xdf, 0x39, 0xd4, 0x5d, 0xef, 0xe1, 0x97, 0x2f, 0xce, 0xb9, 0x17, 0x9d, + 0xdc, 0x46, 0xeb, 0xff, 0xfd, 0xfa, 0xee, 0x0e, 0xca, 0x1c, 0x04, 0x0b, 0x4f, 0x89, 0x45, 0xa8, + 0xae, 0x1c, 0xd2, 0xb1, 0xff, 0x53, 0x41, 0xd4, 0xce, 0x65, 0x6d, 0xa9, 0x2f, 0xe2, 0xd0, 0xac, + 0x66, 0x0a, 0xeb, 0xdb, 0xf9, 0xe7, 0x7b, 0x00, 0x53, 0x2e, 0x47, 0xdf, 0x70, 0x5f, 0x09, 0xd7, + 0x38, 0xc9, 0x9a, 0x72, 0xf9, 0x1b, 0xda, 0xc0, 0xfe, 0x03, 0xd9, 0x4b, 0x29, 0x5c, 0xf2, 0x56, + 0xcd, 0x69, 0x4d, 0xb9, 0xfc, 0x4a, 0x0a, 0x37, 0xb1, 0xab, 0xf5, 0xbf, 0xdb, 0xc5, 0xf6, 0xa1, + 0x76, 0x21, 0x84, 0x41, 0xb6, 0x6e, 0xa2, 0x7a, 0xf6, 0xe8, 0x63, 0x52, 0xd6, 0x21, 0x81, 0x22, + 0xf6, 0xef, 0xaa, 0x69, 0x70, 0xa6, 0xc5, 0xed, 0xbb, 0xe5, 0x83, 0x7f, 0x52, 0xb7, 0x98, 0x87, + 0x52, 0x76, 0x0a, 0x37, 0x92, 0x94, 0x19, 0x2d, 0x43, 0x97, 0x63, 0x17, 0x56, 0x79, 0x63, 0x8e, + 0x75, 0x13, 0x85, 0xaf, 0xb4, 0x3c, 0xfb, 0x25, 0xec, 0x15, 0x92, 0x3c, 0x39, 0xaa, 0xfa, 0xc6, + 0x5c, 0xbf, 0x95, 0xcf, 0xf5, 0xf8, 0xbc, 0xd8, 0x1f, 0xb5, 0x77, 0x88, 0xf5, 0xef, 0x63, 0x9b, + 0x93, 0x85, 0xfe, 0xb2, 0x5f, 0xd4, 0xfe, 0x63, 0x05, 0x3a, 0x85, 0xcb, 0xb0, 0x01, 0x80, 0x46, + 0x4e, 0xe9, 0xbd, 0x12, 0x06, 0xa4, 0x62, 0x1f, 0x90, 0xb3, 0x9e, 0x79, 0xaf, 0x84, 0x63, 0x8d, + 0xe3, 0x25, 0xbb, 0x0f, 0x2d, 0xb5, 0xd2, 0xd2, 0xf9, 0x46, 0xf0, 0xf9, 0x8a, 0x44, 0x9b, 0x8a, + 0xfe, 0xb3, 0x87, 0xb0, 0xa5, 0x0f, 0x9e, 0x06, 0x52, 0x7a, 0xa1, 0x69, 0x46, 0x58, 0xf6, 0xe8, + 0x2f, 0x88, 0xe3, 0x6c, 0x8e, 0x53, 0xc2, 0xfe, 0x2d, 0x58, 0xc9, 0x67, 0xd9, 0x7b, 0x60, 0x2d, + 0xf8, 0xca, 0x74, 0xc9, 0x78, 0xb7, 0x86, 0xd3, 0x5e, 0xf0, 0x15, 0x35, 0xc8, 0x6c, 0x0f, 0x5a, + 0xc8, 0x54, 0x2b, 0xed, 0xef, 0x86, 0xd3, 0x5c, 0xf0, 0xd5, 0xf3, 0x55, 0xc2, 0x98, 0x72, 0x19, + 0xb7, 0xc0, 0x0b, 0xbe, 0xfa, 0x82, 0x4b, 0xfb, 0x33, 0x68, 0xea, 0x4b, 0xbe, 0xd5, 0xc1, 0xa8, + 0x5f, 0xcd, 0xe9, 0xff, 0x14, 0x36, 0x33, 0xf7, 0x66, 0x3f, 0x82, 0x5b, 0xda, 0xc2, 0x90, 0x47, + 0x8a, 0x3c, 0x92, 0x3b, 0x90, 0x11, 0xf3, 0x9c, 0x47, 0x0a, 0x3f, 0xa9, 0x9b, 0xfa, 0x3f, 0x57, + 0xa1, 0xa9, 0x1b, 0x66, 0x76, 0x3f, 0x33, 0x9d, 0x50, 0x55, 0x3c, 0xd9, 0xfc, 0xc7, 0xeb, 0xbb, + 0x2d, 0x2a, 0x20, 0x67, 0x9f, 0xa7, 0xa3, 0x4a, 0x0a, 0x98, 0xd5, 0x5c, 0x3f, 0x1f, 0x4f, 0x3c, + 0xb5, 0xcc, 0xc4, 0xb3, 0x07, 0x2d, 0x7f, 0xb9, 0x20, 0x97, 0xd4, 0xb5, 0x4b, 0xfc, 0xe5, 0x02, + 0x5d, 0xf2, 0x1e, 0x58, 0x2a, 0x50, 0x7c, 0x4e, 0x2c, 0x9d, 0xa4, 0x6d, 0xda, 0x40, 0xe6, 0x7d, + 0xe8, 0x64, 0xab, 0x2d, 0x56, 0x4f, 0x0d, 0xee, 0xdb, 0x69, 0xad, 0xc5, 0x09, 0xe0, 0x7d, 0xe8, + 0xa4, 0x85, 0x46, 0xcb, 0x69, 0xc0, 0xdf, 0x49, 0xb7, 0x49, 0xf0, 0x0e, 0xb4, 0x93, 0x3a, 0xac, + 0xc1, 0xbf, 0xc5, 0x75, 0xf9, 0xc5, 0xc1, 0x39, 0x8c, 0x82, 0x30, 0x90, 0x22, 0x32, 0x0d, 0xd6, + 0xba, 0x84, 0x4b, 0xe4, 0x6c, 0x0f, 0xac, 0x84, 0x89, 0x4d, 0x03, 0x77, 0xdd, 0x48, 0x48, 0x69, + 0xfa, 0xf3, 0x98, 0x64, 0x07, 0xd0, 0x0a, 0x97, 0xe3, 0x11, 0xd6, 0xa6, 0x7c, 0x60, 0x9e, 0x2f, + 0xc7, 0x5f, 0x8a, 0xab, 0x78, 0x42, 0x09, 0x89, 0xa2, 0xea, 0x14, 0x7c, 0x23, 0x22, 0xe3, 0x3f, + 0x4d, 0xd8, 0x0a, 0xba, 0xc5, 0xf1, 0x84, 0x7d, 0x0c, 0x56, 0x62, 0x5f, 0x21, 0x41, 0x8a, 0x77, + 0x4e, 0x05, 0xb1, 0x85, 0x91, 0xde, 0xd4, 0x17, 0xee, 0x28, 0xf5, 0x2d, 0xdd, 0xab, 0xed, 0x74, + 0x34, 0xe3, 0xe7, 0xb1, 0x73, 0xed, 0x1f, 0x42, 0x53, 0xdf, 0x91, 0x7e, 0xd4, 0xab, 0x30, 0xee, + 0xaf, 0x68, 0x5d, 0x9a, 0xc9, 0x7f, 0xaa, 0x40, 0x3b, 0x1e, 0x7f, 0x4a, 0x95, 0x72, 0x97, 0xae, + 0xbe, 0xed, 0xa5, 0xd7, 0xcd, 0x8e, 0x71, 0xac, 0xd5, 0x33, 0xb1, 0x76, 0x00, 0x4c, 0x87, 0xd4, + 0x65, 0xa0, 0x3c, 0x7f, 0x3a, 0xd2, 0xde, 0xd4, 0xb1, 0xd5, 0x25, 0xce, 0x0b, 0x62, 0x9c, 0xe3, + 0xfe, 0xd1, 0xb7, 0x0d, 0xe8, 0x1c, 0x9f, 0x9c, 0x9e, 0x1d, 0x87, 0xe1, 0xdc, 0x9b, 0x70, 0xea, + 0xba, 0x06, 0x50, 0xa7, 0xbe, 0xb2, 0xe4, 0x75, 0xaa, 0x5f, 0x36, 0xe0, 0xb0, 0x23, 0x68, 0x50, + 0x7b, 0xc9, 0xca, 0x1e, 0xa9, 0xfa, 0xa5, 0x73, 0x0e, 0x7e, 0x44, 0x37, 0xa0, 0xd7, 0xdf, 0xaa, + 0xfa, 0x65, 0xc3, 0x0e, 0xfb, 0x0c, 0xac, 0xb4, 0x31, 0x5c, 0xf7, 0x62, 0xd5, 0x5f, 0x3b, 0xf6, + 0xa0, 0x7e, 0x5a, 0x6b, 0xd7, 0xbd, 0xef, 0xf4, 0xd7, 0xce, 0x07, 0xec, 0x31, 0xb4, 0xe2, 0x6e, + 0xa5, 0xfc, 0x4d, 0xa9, 0xbf, 0x66, 0x24, 0x41, 0xf7, 0xe8, 0x8e, 0xaf, 0xec, 0xe1, 0xab, 0x5f, + 0x3a, 0x37, 0xb1, 0x87, 0xd0, 0x34, 0x05, 0xa3, 0xf4, 0x75, 0xa8, 0x5f, 0x3e, 0x58, 0xa0, 0x91, + 0x69, 0xb7, 0xbb, 0xee, 0x71, 0xae, 0xbf, 0x76, 0xc0, 0x63, 0xc7, 0x00, 0x99, 0x2e, 0x6f, 0xed, + 0xab, 0x5b, 0x7f, 0xfd, 0xe0, 0xc6, 0x3e, 0x85, 0x76, 0x3a, 0x8c, 0x97, 0xbf, 0x86, 0xf5, 0xd7, + 0xcd, 0x52, 0xe3, 0x26, 0xbd, 0x98, 0x7e, 0xf4, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe5, 0xf3, + 0xb2, 0x34, 0xad, 0x15, 0x00, 0x00, } diff --git a/types/types.proto b/types/types.proto index a1c553751..b4f4b2aa6 100644 --- a/types/types.proto +++ b/types/types.proto @@ -231,7 +231,7 @@ message Header { // hashes bytes last_block_hash = 6; - bytes val_set_hash = 7; + bytes validators_hash = 7; bytes app_hash = 8; // consensus From 3f6da94d55a60c165389e4935e8f9ec192179916 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Wed, 6 Jun 2018 12:52:11 -0700 Subject: [PATCH 4/6] update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1823812ea..7d1c4b2e5 100644 --- a/Makefile +++ b/Makefile @@ -171,4 +171,4 @@ devdoc_clean: # To avoid unintended conflicts with file names, always add to .PHONY # unless there is a reason not to. # https://www.gnu.org/software/make/manual/html_node/Phony-Targets.html -.PHONY: check protoc build dist install check_tools get_tools get_protoc update_tools get_vendor_deps test test_race test_integrations fmt metalinter metalinter_all docker_build docker_run docker_run_rm devdoc_init devdoc devdoc_save devdoc_clean +.PHONY: check protoc build dist install check_tools get_tools get_protoc update_tools get_vendor_deps test test_race fmt metalinter metalinter_all docker_build docker_run docker_run_rm devdoc_init devdoc devdoc_save devdoc_clean From 084f2e5b8c40d58f61b314c2729405db3e3ce686 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Wed, 6 Jun 2018 13:17:11 -0700 Subject: [PATCH 5/6] update readme --- README.md | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index e6051cc34..6de9f7069 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,8 @@ Blockchains are systems for multi-master state machine replication. **ABCI** is an interface that defines the boundary between the replication engine (the blockchain), and the state machine (the application). -By using a socket protocol, we enable a consensus engine running in one process -to manage an application state running in another. - -For background information on ABCI, motivations, and tendermint, please visit [the documentation](http://tendermint.readthedocs.io/en/master/). -The two guides to focus on are the `Application Development Guide` and `Using ABCI-CLI`. +Using a socket protocol, a consensus engine running in one process +can manage an application state running in another. Previously, the ABCI was referred to as TMSP. @@ -17,8 +14,19 @@ The community has provided a number of addtional implementations, see the [Tende ## Specification -The [primary specification](https://github.com/tendermint/abci/blob/master/types/types.proto) -is made using Protocol Buffers. To build it, run +A detailed description of the ABCI methods and message types is contained in: + +- [A prose specification](specification.md) +- [A protobuf file](https://github.com/tendermint/abci/blob/master/types/types.proto) +- [A Go interface](https://github.com/tendermint/abci/blob/master/types/application.go). + +For more background information on ABCI, motivations, and tendermint, please visit [the documentation](http://tendermint.readthedocs.io/en/master/). +The two guides to focus on are the `Application Development Guide` and `Using ABCI-CLI`. + + +## Protocl Buffers + +To compile the protobuf file, run: ``` make protoc @@ -28,12 +36,10 @@ See `protoc --help` and [the Protocol Buffers site](https://developers.google.co for details on compiling for other languages. Note we also include a [GRPC](http://www.grpc.io/docs) service definition. -For the specification as an interface in Go, see the -[types/application.go file](https://github.com/tendermint/abci/blob/master/types/application.go). - -See the [spec file](specification.rst) for a detailed description of the message types. +## Install ABCI-CLI -## Install +The `abci-cli` is a simple tool for debugging ABCI servers and running some +example apps. To install it: ``` go get github.com/tendermint/abci From aaeeb768088c1e2edaccb2bc64f68a2a52c46a16 Mon Sep 17 00:00:00 2001 From: Ethan Buchman Date: Wed, 6 Jun 2018 13:22:57 -0700 Subject: [PATCH 6/6] date in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2584353d9..84c571630 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## 0.11.0 -*TBD* +*June 6, 2018* BREAKING CHANGES: