From 4f7565ba7bd986ec14a315f70bc0c160a0cfa6be Mon Sep 17 00:00:00 2001 From: Jae Kwon Date: Thu, 5 Jul 2018 01:18:41 -0700 Subject: [PATCH] first commit --- Gopkg.lock | 6 +- Gopkg.toml | 2 +- abci/cmd/abci-cli/abci-cli.go | 4 +- abci/example/kvstore/kvstore.go | 1 + abci/example/kvstore/persistent_kvstore.go | 2 +- abci/types/types.pb.go | 296 ++++++++++++--------- abci/types/types.proto | 9 +- crypto/merkle/compile.sh | 6 + crypto/merkle/merkle.pb.go | 101 +++++++ crypto/merkle/merkle.proto | 19 ++ crypto/merkle/proof.go | 140 ++++++++++ crypto/merkle/proof_simple_value.go | 79 ++++++ crypto/merkle/simple_proof.go | 51 +++- crypto/merkle/wire.go | 16 ++ docs/app-development.md | 20 +- types/block.go | 5 +- 16 files changed, 597 insertions(+), 160 deletions(-) create mode 100644 crypto/merkle/compile.sh create mode 100644 crypto/merkle/merkle.pb.go create mode 100644 crypto/merkle/merkle.proto create mode 100644 crypto/merkle/proof.go create mode 100644 crypto/merkle/proof_simple_value.go create mode 100644 crypto/merkle/wire.go diff --git a/Gopkg.lock b/Gopkg.lock index 496e8967..627ae3a5 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -91,8 +91,8 @@ "ptypes/duration", "ptypes/timestamp" ] - revision = "925541529c1fa6821df4e44ce2723319eb2be768" - version = "v1.0.0" + revision = "b4deda0973fb4c70b50d226b1af49f3da59f5265" + version = "v1.1.0" [[projects]] branch = "master" @@ -423,6 +423,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "c25289282b94abc7f0c390e592e5e1636b7f26cb4773863ac39cde7fdc7b5bdf" + inputs-digest = "8c5f7f7b1a226e774353514c70f779e97d3311598076f510258b9ddcf87ed1f7" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 18e2767a..32a000bb 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -43,7 +43,7 @@ [[constraint]] name = "github.com/golang/protobuf" - version = "~1.0.0" + version = "~1.1.0" [[constraint]] name = "github.com/gorilla/websocket" diff --git a/abci/cmd/abci-cli/abci-cli.go b/abci/cmd/abci-cli/abci-cli.go index 0e7b908e..e4d4ce82 100644 --- a/abci/cmd/abci-cli/abci-cli.go +++ b/abci/cmd/abci-cli/abci-cli.go @@ -100,7 +100,7 @@ type queryResponse struct { Key []byte Value []byte Height int64 - Proof []byte + Proof []types.ProofOp } func Execute() error { @@ -740,7 +740,7 @@ func printResponse(cmd *cobra.Command, args []string, rsp response) { fmt.Printf("-> value.hex: %X\n", rsp.Query.Value) } if rsp.Query.Proof != nil { - fmt.Printf("-> proof: %X\n", rsp.Query.Proof) + fmt.Printf("-> proof: %#v\n", rsp.Query.Proof) } } } diff --git a/abci/example/kvstore/kvstore.go b/abci/example/kvstore/kvstore.go index e078d87d..27a417b2 100644 --- a/abci/example/kvstore/kvstore.go +++ b/abci/example/kvstore/kvstore.go @@ -102,6 +102,7 @@ func (app *KVStoreApplication) Commit() types.ResponseCommit { } func (app *KVStoreApplication) Query(reqQuery types.RequestQuery) (resQuery types.ResponseQuery) { + // NOTE: This isn't proving anything yet. if reqQuery.Prove { value := app.state.db.Get(prefixKey(reqQuery.Data)) resQuery.Index = -1 // TODO make Proof return index diff --git a/abci/example/kvstore/persistent_kvstore.go b/abci/example/kvstore/persistent_kvstore.go index a9067ac1..b0dc6350 100644 --- a/abci/example/kvstore/persistent_kvstore.go +++ b/abci/example/kvstore/persistent_kvstore.go @@ -168,7 +168,7 @@ func (app *PersistentKVStoreApplication) execValidatorTx(tx []byte) types.Respon } // update - return app.updateValidator(types.Ed25519Validator(pubkey, int64(power))) + return app.updateValidator(types.Ed25519Validator(pubkey, power)) } // add, update, or remove a validator diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index a6b806fe..6b102d05 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -37,6 +37,7 @@ It has these top-level messages: BlockSize TxSize BlockGossip + ProofOp Header Validator SigningValidator @@ -1288,13 +1289,13 @@ func (m *ResponseInitChain) GetValidators() []Validator { type ResponseQuery struct { Code uint32 `protobuf:"varint,1,opt,name=code,proto3" json:"code,omitempty"` // bytes data = 2; // use "value" instead. - Log string `protobuf:"bytes,3,opt,name=log,proto3" json:"log,omitempty"` - Info string `protobuf:"bytes,4,opt,name=info,proto3" json:"info,omitempty"` - Index int64 `protobuf:"varint,5,opt,name=index,proto3" json:"index,omitempty"` - Key []byte `protobuf:"bytes,6,opt,name=key,proto3" json:"key,omitempty"` - Value []byte `protobuf:"bytes,7,opt,name=value,proto3" json:"value,omitempty"` - Proof []byte `protobuf:"bytes,8,opt,name=proof,proto3" json:"proof,omitempty"` - Height int64 `protobuf:"varint,9,opt,name=height,proto3" json:"height,omitempty"` + Log string `protobuf:"bytes,3,opt,name=log,proto3" json:"log,omitempty"` + Info string `protobuf:"bytes,4,opt,name=info,proto3" json:"info,omitempty"` + Index int64 `protobuf:"varint,5,opt,name=index,proto3" json:"index,omitempty"` + Key []byte `protobuf:"bytes,6,opt,name=key,proto3" json:"key,omitempty"` + Value []byte `protobuf:"bytes,7,opt,name=value,proto3" json:"value,omitempty"` + Proof []ProofOp `protobuf:"bytes,8,rep,name=proof" json:"tags,omitempty"` + Height int64 `protobuf:"varint,9,opt,name=height,proto3" json:"height,omitempty"` } func (m *ResponseQuery) Reset() { *m = ResponseQuery{} } @@ -1344,7 +1345,7 @@ func (m *ResponseQuery) GetValue() []byte { return nil } -func (m *ResponseQuery) GetProof() []byte { +func (m *ResponseQuery) GetProof() []ProofOp { if m != nil { return m.Proof } @@ -1678,6 +1679,39 @@ func (m *BlockGossip) GetBlockPartSizeBytes() int32 { return 0 } +// A single Merkle proof operation. +type ProofOp struct { + Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` + Key string `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"` + Data []byte `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` +} + +func (m *ProofOp) Reset() { *m = ProofOp{} } +func (m *ProofOp) String() string { return proto.CompactTextString(m) } +func (*ProofOp) ProtoMessage() {} +func (*ProofOp) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{29} } + +func (m *ProofOp) GetType() string { + if m != nil { + return m.Type + } + return "" +} + +func (m *ProofOp) GetKey() string { + if m != nil { + return m.Key + } + return "" +} + +func (m *ProofOp) GetData() []byte { + if m != nil { + return m.Data + } + return nil +} + // just the minimum the app might need type Header struct { // basics @@ -1698,7 +1732,7 @@ type Header struct { func (m *Header) Reset() { *m = Header{} } func (m *Header) String() string { return proto.CompactTextString(m) } func (*Header) ProtoMessage() {} -func (*Header) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{29} } +func (*Header) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{30} } func (m *Header) GetChainID() string { if m != nil { @@ -1773,7 +1807,7 @@ type Validator struct { func (m *Validator) Reset() { *m = Validator{} } func (m *Validator) String() string { return proto.CompactTextString(m) } func (*Validator) ProtoMessage() {} -func (*Validator) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{30} } +func (*Validator) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{31} } func (m *Validator) GetAddress() []byte { if m != nil { @@ -1805,7 +1839,7 @@ type SigningValidator struct { func (m *SigningValidator) Reset() { *m = SigningValidator{} } func (m *SigningValidator) String() string { return proto.CompactTextString(m) } func (*SigningValidator) ProtoMessage() {} -func (*SigningValidator) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{31} } +func (*SigningValidator) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{32} } func (m *SigningValidator) GetValidator() Validator { if m != nil { @@ -1829,7 +1863,7 @@ type PubKey struct { func (m *PubKey) Reset() { *m = PubKey{} } func (m *PubKey) String() string { return proto.CompactTextString(m) } func (*PubKey) ProtoMessage() {} -func (*PubKey) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{32} } +func (*PubKey) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{33} } func (m *PubKey) GetType() string { if m != nil { @@ -1856,7 +1890,7 @@ type Evidence struct { func (m *Evidence) Reset() { *m = Evidence{} } func (m *Evidence) String() string { return proto.CompactTextString(m) } func (*Evidence) ProtoMessage() {} -func (*Evidence) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{33} } +func (*Evidence) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{34} } func (m *Evidence) GetType() string { if m != nil { @@ -1923,6 +1957,7 @@ func init() { proto.RegisterType((*BlockSize)(nil), "types.BlockSize") proto.RegisterType((*TxSize)(nil), "types.TxSize") proto.RegisterType((*BlockGossip)(nil), "types.BlockGossip") + proto.RegisterType((*ProofOp)(nil), "types.ProofOp") proto.RegisterType((*Header)(nil), "types.Header") proto.RegisterType((*Validator)(nil), "types.Validator") proto.RegisterType((*SigningValidator)(nil), "types.SigningValidator") @@ -2335,121 +2370,122 @@ var _ABCIApplication_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("types/types.proto", fileDescriptorTypes) } var fileDescriptorTypes = []byte{ - // 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, + // 1872 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0xcd, 0x72, 0x1b, 0xc7, + 0x11, 0x26, 0x7e, 0x17, 0xdb, 0xfc, 0x01, 0x34, 0x94, 0x44, 0x08, 0xae, 0x94, 0x54, 0x5b, 0x29, + 0x99, 0x8a, 0x69, 0x22, 0xa1, 0x2d, 0x95, 0x64, 0x3b, 0xae, 0x90, 0xb4, 0x62, 0xb0, 0x9c, 0xc4, + 0xcc, 0x4a, 0x56, 0xaa, 0x72, 0x41, 0x0d, 0xb0, 0xc3, 0xc5, 0x96, 0xb0, 0x3f, 0xde, 0x19, 0xd0, + 0xa0, 0x6e, 0xb9, 0xbb, 0x72, 0xcd, 0x39, 0x2f, 0x90, 0x43, 0x1e, 0x22, 0x95, 0x97, 0x88, 0x0e, + 0x49, 0x4e, 0x79, 0x89, 0xa4, 0xa6, 0x67, 0xf6, 0x97, 0xbb, 0x2a, 0x45, 0x39, 0xe6, 0x42, 0xce, + 0x4c, 0x77, 0xcf, 0x76, 0x37, 0xba, 0xbf, 0xee, 0x1e, 0xb8, 0x21, 0xae, 0x22, 0xc6, 0xc7, 0xf8, + 0xf7, 0x30, 0x8a, 0x43, 0x11, 0x92, 0x0e, 0x6e, 0x46, 0x1f, 0xba, 0x9e, 0x58, 0xac, 0x66, 0x87, + 0xf3, 0xd0, 0x1f, 0xbb, 0xa1, 0x1b, 0x8e, 0x91, 0x3a, 0x5b, 0x5d, 0xe0, 0x0e, 0x37, 0xb8, 0x52, + 0x52, 0xa3, 0x71, 0x8e, 0x5d, 0xb0, 0xc0, 0x61, 0xb1, 0xef, 0x05, 0x62, 0x2c, 0xfc, 0xa5, 0x37, + 0xe3, 0xe3, 0x79, 0xe8, 0xfb, 0x61, 0x90, 0xff, 0x8c, 0xf5, 0x97, 0x36, 0x18, 0x36, 0xfb, 0x76, + 0xc5, 0xb8, 0x20, 0xfb, 0xd0, 0x66, 0xf3, 0x45, 0x38, 0x6c, 0xde, 0x6b, 0xec, 0x6f, 0x1e, 0x91, + 0x43, 0xc5, 0xa7, 0xa9, 0x4f, 0xe7, 0x8b, 0x70, 0xb2, 0x61, 0x23, 0x07, 0xf9, 0x00, 0x3a, 0x17, + 0xcb, 0x15, 0x5f, 0x0c, 0x5b, 0xc8, 0xba, 0x5b, 0x64, 0xfd, 0xb9, 0x24, 0x4d, 0x36, 0x6c, 0xc5, + 0x23, 0xaf, 0xf5, 0x82, 0x8b, 0x70, 0xd8, 0xae, 0xba, 0xf6, 0x2c, 0xb8, 0xc0, 0x6b, 0x25, 0x07, + 0x79, 0x0c, 0xc0, 0x99, 0x98, 0x86, 0x91, 0xf0, 0xc2, 0x60, 0xd8, 0x41, 0xfe, 0xbd, 0x22, 0xff, + 0x33, 0x26, 0xbe, 0x46, 0xf2, 0x64, 0xc3, 0x36, 0x79, 0xb2, 0x91, 0x92, 0x5e, 0xe0, 0x89, 0xe9, + 0x7c, 0x41, 0xbd, 0x60, 0xd8, 0xad, 0x92, 0x3c, 0x0b, 0x3c, 0x71, 0x2a, 0xc9, 0x52, 0xd2, 0x4b, + 0x36, 0xd2, 0x94, 0x6f, 0x57, 0x2c, 0xbe, 0x1a, 0x1a, 0x55, 0xa6, 0xfc, 0x5a, 0x92, 0xa4, 0x29, + 0xc8, 0x43, 0x3e, 0x85, 0xcd, 0x19, 0x73, 0xbd, 0x60, 0x3a, 0x5b, 0x86, 0xf3, 0x97, 0xc3, 0x1e, + 0x8a, 0x0c, 0x8b, 0x22, 0x27, 0x92, 0xe1, 0x44, 0xd2, 0x27, 0x1b, 0x36, 0xcc, 0xd2, 0x1d, 0x39, + 0x82, 0xde, 0x7c, 0xc1, 0xe6, 0x2f, 0xa7, 0x62, 0x3d, 0x34, 0x51, 0xf2, 0x56, 0x51, 0xf2, 0x54, + 0x52, 0x9f, 0xaf, 0x27, 0x1b, 0xb6, 0x31, 0x57, 0x4b, 0x69, 0x97, 0xc3, 0x96, 0xde, 0x25, 0x8b, + 0xa5, 0xd4, 0x6e, 0x95, 0x5d, 0x5f, 0x28, 0x3a, 0xca, 0x99, 0x4e, 0xb2, 0x21, 0x0f, 0xc1, 0x64, + 0x81, 0xa3, 0x15, 0xdd, 0x44, 0xc1, 0xdb, 0xa5, 0x5f, 0x34, 0x70, 0x12, 0x35, 0x7b, 0x4c, 0xaf, + 0xc9, 0x21, 0x74, 0x65, 0x94, 0x78, 0x62, 0xb8, 0x85, 0x32, 0x37, 0x4b, 0x2a, 0x22, 0x6d, 0xb2, + 0x61, 0x6b, 0xae, 0x13, 0x03, 0x3a, 0x97, 0x74, 0xb9, 0x62, 0xd6, 0xfb, 0xb0, 0x99, 0x8b, 0x14, + 0x32, 0x04, 0xc3, 0x67, 0x9c, 0x53, 0x97, 0x0d, 0x1b, 0xf7, 0x1a, 0xfb, 0xa6, 0x9d, 0x6c, 0xad, + 0x1d, 0xd8, 0xca, 0xc7, 0x49, 0x4e, 0x50, 0xc6, 0x82, 0x14, 0xbc, 0x64, 0x31, 0x97, 0x01, 0xa0, + 0x05, 0xf5, 0xd6, 0xfa, 0x04, 0x06, 0xe5, 0x20, 0x20, 0x03, 0x68, 0xbd, 0x64, 0x57, 0x9a, 0x53, + 0x2e, 0xc9, 0x4d, 0xad, 0x10, 0x46, 0xb1, 0x69, 0x6b, 0xed, 0xfe, 0xd9, 0x48, 0x85, 0xd3, 0x38, + 0x20, 0x04, 0xda, 0xc2, 0xf3, 0x95, 0x82, 0x2d, 0x1b, 0xd7, 0xe4, 0x8e, 0xfc, 0x91, 0xa8, 0x17, + 0x4c, 0x3d, 0x47, 0xdf, 0x60, 0xe0, 0xfe, 0xcc, 0x21, 0xc7, 0x30, 0x98, 0x87, 0x01, 0x67, 0x01, + 0x5f, 0xf1, 0x69, 0x44, 0x63, 0xea, 0x73, 0x1d, 0xff, 0x89, 0x63, 0x4f, 0x13, 0xf2, 0x39, 0x52, + 0xed, 0xfe, 0xbc, 0x78, 0x40, 0x1e, 0x01, 0x5c, 0xd2, 0xa5, 0xe7, 0x50, 0x11, 0xc6, 0x7c, 0xd8, + 0xbe, 0xd7, 0xda, 0xdf, 0x3c, 0x1a, 0x68, 0xe1, 0x17, 0x09, 0xe1, 0xa4, 0xfd, 0xd7, 0xd7, 0x77, + 0x37, 0xec, 0x1c, 0x27, 0xb9, 0x0f, 0x7d, 0x1a, 0x45, 0x53, 0x2e, 0xa8, 0x60, 0xd3, 0xd9, 0x95, + 0x60, 0x1c, 0xb3, 0x63, 0xcb, 0xde, 0xa6, 0x51, 0xf4, 0x4c, 0x9e, 0x9e, 0xc8, 0x43, 0xcb, 0x49, + 0x7d, 0x8b, 0x81, 0x2b, 0x2d, 0x74, 0xa8, 0xa0, 0x68, 0xe1, 0x96, 0x8d, 0x6b, 0x79, 0x16, 0x51, + 0xb1, 0xd0, 0xd6, 0xe1, 0x9a, 0xdc, 0x86, 0xee, 0x82, 0x79, 0xee, 0x42, 0xa0, 0x41, 0x2d, 0x5b, + 0xef, 0xa4, 0x33, 0xa3, 0x38, 0xbc, 0x64, 0x98, 0xbb, 0x3d, 0x5b, 0x6d, 0xac, 0xbf, 0x35, 0xe0, + 0xc6, 0xb5, 0x60, 0x97, 0xf7, 0x2e, 0x28, 0x5f, 0x24, 0xdf, 0x92, 0x6b, 0xf2, 0x81, 0xbc, 0x97, + 0x3a, 0x2c, 0xd6, 0x98, 0xb2, 0xad, 0x6d, 0x9d, 0xe0, 0xa1, 0x36, 0x54, 0xb3, 0x90, 0x9f, 0x16, + 0x9c, 0xd3, 0x42, 0xe7, 0x24, 0xb1, 0xfe, 0xcc, 0x73, 0x03, 0x2f, 0x70, 0xdf, 0xe4, 0xa3, 0x09, + 0xdc, 0x9c, 0x5d, 0xbd, 0xa2, 0x81, 0xf0, 0x02, 0x36, 0xbd, 0xe6, 0xe5, 0xbe, 0xbe, 0xe8, 0xe9, + 0xa5, 0xe7, 0xb0, 0x60, 0xce, 0xf4, 0x05, 0xbb, 0xa9, 0x48, 0x7a, 0x35, 0xb7, 0xee, 0xc1, 0x4e, + 0x31, 0x23, 0xc9, 0x0e, 0x34, 0xc5, 0x5a, 0x5b, 0xd6, 0x14, 0x6b, 0xcb, 0x4a, 0xa3, 0x29, 0xcd, + 0xbe, 0x6b, 0x3c, 0x0f, 0xa0, 0x5f, 0x4a, 0xb4, 0x9c, 0x9b, 0x1b, 0x79, 0x37, 0x5b, 0x7d, 0xd8, + 0x2e, 0xe4, 0x97, 0xf5, 0x7d, 0x07, 0x7a, 0x36, 0xe3, 0x91, 0x0c, 0x1f, 0xf2, 0x18, 0x4c, 0xb6, + 0x9e, 0x33, 0x05, 0x8a, 0x8d, 0x12, 0xe4, 0x28, 0x9e, 0xa7, 0x09, 0x5d, 0x62, 0x40, 0xca, 0x4c, + 0x1e, 0x14, 0x00, 0x7d, 0xb7, 0x2c, 0x94, 0x47, 0xf4, 0x83, 0x22, 0xa2, 0xdf, 0x2c, 0xf1, 0x96, + 0x20, 0xfd, 0x41, 0x01, 0xd2, 0xcb, 0x17, 0x17, 0x30, 0xfd, 0x49, 0x05, 0xa6, 0x97, 0xd5, 0xaf, + 0x01, 0xf5, 0x27, 0x15, 0xa0, 0x3e, 0xbc, 0xf6, 0xad, 0x4a, 0x54, 0x3f, 0x28, 0xa2, 0x7a, 0xd9, + 0x9c, 0x12, 0xac, 0x7f, 0x56, 0x05, 0xeb, 0x77, 0x4a, 0x32, 0xb5, 0xb8, 0xfe, 0xd1, 0x35, 0x5c, + 0xbf, 0x5d, 0x12, 0xad, 0x00, 0xf6, 0x27, 0x05, 0x60, 0x87, 0x4a, 0xdb, 0x6a, 0x90, 0xfd, 0xd1, + 0x75, 0x64, 0xdf, 0x2b, 0xff, 0xb4, 0x55, 0xd0, 0x3e, 0x2e, 0x41, 0xfb, 0xad, 0xb2, 0x96, 0xb5, + 0xd8, 0xfe, 0x40, 0xe6, 0x7b, 0x29, 0xd2, 0x24, 0x36, 0xb0, 0x38, 0x0e, 0x63, 0x0d, 0xbe, 0x6a, + 0x63, 0xed, 0x4b, 0x04, 0xca, 0xe2, 0xeb, 0x0d, 0x75, 0x00, 0x83, 0x3e, 0x17, 0x5d, 0xd6, 0x1f, + 0x1a, 0x99, 0x2c, 0x96, 0x82, 0x3c, 0x7a, 0x99, 0x1a, 0xbd, 0x72, 0xe5, 0xa1, 0x59, 0x28, 0x0f, + 0xe4, 0x47, 0x70, 0x63, 0x49, 0xb9, 0x50, 0x7e, 0x99, 0x16, 0xe0, 0xac, 0x2f, 0x09, 0xca, 0x21, + 0x0a, 0xd7, 0x3e, 0x84, 0xdd, 0x1c, 0xaf, 0x84, 0x56, 0x84, 0xae, 0x36, 0x26, 0xef, 0x20, 0xe5, + 0x3e, 0x8e, 0xa2, 0x09, 0xe5, 0x0b, 0xeb, 0x97, 0x99, 0xfd, 0x59, 0xe9, 0x21, 0xd0, 0x9e, 0x87, + 0x8e, 0x32, 0x6b, 0xdb, 0xc6, 0xb5, 0x2c, 0x47, 0xcb, 0xd0, 0xc5, 0xaf, 0x9a, 0xb6, 0x5c, 0x4a, + 0xae, 0x34, 0x53, 0x4c, 0x95, 0x12, 0xd6, 0xef, 0x1b, 0xd9, 0x7d, 0x59, 0x35, 0xaa, 0x2a, 0x2f, + 0x8d, 0xff, 0xa5, 0xbc, 0x34, 0xdf, 0xb6, 0xbc, 0x48, 0x40, 0xdf, 0x2e, 0xa4, 0xc6, 0xbb, 0x1b, + 0x27, 0xc3, 0xc2, 0x0b, 0x1c, 0xb6, 0xc6, 0x54, 0x6f, 0xd9, 0x6a, 0x93, 0xd4, 0xe9, 0x2e, 0x3a, + 0xb8, 0x58, 0xa7, 0x0d, 0x3c, 0x53, 0x1b, 0xf2, 0x19, 0x16, 0x9c, 0xf0, 0x62, 0xd8, 0x43, 0xe5, + 0x77, 0xb4, 0xf2, 0xe7, 0xf2, 0xec, 0xeb, 0xe8, 0xe4, 0xb6, 0x54, 0xfd, 0x5f, 0xaf, 0xef, 0xee, + 0x08, 0xea, 0xf2, 0x83, 0xd0, 0xf7, 0x04, 0xf3, 0x23, 0x71, 0x65, 0x2b, 0xa1, 0x1c, 0xbe, 0x9a, + 0x05, 0x7c, 0x3d, 0x07, 0x72, 0x3d, 0x8b, 0xc9, 0x27, 0xd0, 0x96, 0xd7, 0x0c, 0x1b, 0xfa, 0x53, + 0xaa, 0x3b, 0x3e, 0xfc, 0xea, 0xc5, 0x39, 0xf5, 0xe2, 0xda, 0x4f, 0xa1, 0x8c, 0xf5, 0xef, 0x86, + 0x44, 0xf7, 0x42, 0x76, 0x57, 0xfa, 0x2c, 0x09, 0xe1, 0x66, 0xae, 0x00, 0xbf, 0x9d, 0x1f, 0x7f, + 0x00, 0xe0, 0x52, 0x3e, 0xfd, 0x8e, 0x06, 0x82, 0x39, 0xda, 0x99, 0xa6, 0x4b, 0xf9, 0x6f, 0xf0, + 0x40, 0xf6, 0x29, 0x92, 0xbc, 0xe2, 0xcc, 0x41, 0xaf, 0xb6, 0x6c, 0xc3, 0xa5, 0xfc, 0x1b, 0xce, + 0x9c, 0xd4, 0x2e, 0xe3, 0xbf, 0xb7, 0x8b, 0xec, 0x43, 0xeb, 0x82, 0x31, 0x8d, 0x80, 0x83, 0x54, + 0xf4, 0xec, 0xd1, 0xc7, 0x28, 0xac, 0x42, 0x47, 0xb2, 0x58, 0xbf, 0x6b, 0x66, 0x41, 0x9c, 0x15, + 0xc1, 0xff, 0x2f, 0x1f, 0xfc, 0x03, 0xbb, 0xca, 0x22, 0xe4, 0x92, 0x53, 0xb8, 0x91, 0xa6, 0xd6, + 0x74, 0x15, 0x39, 0x54, 0x76, 0x6b, 0x8d, 0x37, 0xe6, 0xe2, 0x20, 0x15, 0xf8, 0x46, 0xf1, 0x93, + 0x5f, 0xc1, 0x5e, 0x09, 0x0c, 0xd2, 0xab, 0x9a, 0x6f, 0xc4, 0x84, 0x5b, 0x45, 0x4c, 0x48, 0xee, + 0x4b, 0xfc, 0xd1, 0x7a, 0x87, 0x58, 0xff, 0xa1, 0x6c, 0x87, 0xf2, 0x25, 0xa2, 0xea, 0x17, 0xb5, + 0xfe, 0xd8, 0x80, 0x7e, 0x49, 0x19, 0x32, 0x06, 0x50, 0x08, 0xcb, 0xbd, 0x57, 0x4c, 0x83, 0x59, + 0xe2, 0x03, 0x74, 0xd6, 0x33, 0xef, 0x15, 0xb3, 0xcd, 0x59, 0xb2, 0x24, 0xf7, 0xc1, 0x10, 0x6b, + 0xc5, 0x5d, 0x6c, 0x18, 0x9f, 0xaf, 0x91, 0xb5, 0x2b, 0xf0, 0x3f, 0x79, 0x08, 0x5b, 0xea, 0x62, + 0x37, 0xe4, 0xdc, 0x8b, 0x74, 0xd3, 0x42, 0xf2, 0x57, 0x7f, 0x89, 0x14, 0x7b, 0x73, 0x96, 0x6d, + 0xac, 0xdf, 0x82, 0x99, 0x7e, 0x96, 0xbc, 0x07, 0xa6, 0x4f, 0xd7, 0xba, 0x9b, 0x96, 0xba, 0x75, + 0xec, 0x9e, 0x4f, 0xd7, 0xd8, 0x48, 0x93, 0x3d, 0x30, 0x24, 0x51, 0xac, 0x95, 0xbf, 0x3b, 0x76, + 0xd7, 0xa7, 0xeb, 0xe7, 0xeb, 0x94, 0xe0, 0x52, 0x9e, 0xb4, 0xca, 0x3e, 0x5d, 0x7f, 0x49, 0xb9, + 0xf5, 0x39, 0x74, 0x95, 0x92, 0x6f, 0x75, 0xb1, 0x94, 0x6f, 0x16, 0xe4, 0x7f, 0x06, 0x9b, 0x39, + 0xbd, 0xc9, 0x4f, 0xe0, 0x96, 0xb2, 0x30, 0xa2, 0xb1, 0x40, 0x8f, 0x14, 0x2e, 0x24, 0x48, 0x3c, + 0xa7, 0xb1, 0x90, 0x9f, 0x54, 0xcd, 0xff, 0x29, 0x18, 0x1a, 0x27, 0x71, 0xb2, 0xb9, 0x8a, 0x92, + 0x92, 0x8b, 0xeb, 0x04, 0x82, 0x9b, 0xd9, 0xa8, 0x94, 0xfc, 0x8c, 0xad, 0xdc, 0xcf, 0xf8, 0xe7, + 0x26, 0x74, 0x55, 0x77, 0x4e, 0xee, 0xe7, 0x46, 0x21, 0xbc, 0xe8, 0x64, 0xf3, 0xef, 0xaf, 0xef, + 0x1a, 0x58, 0xad, 0xce, 0xbe, 0xc8, 0xe6, 0xa2, 0x0c, 0x75, 0x9b, 0x85, 0xe1, 0x21, 0x19, 0xaf, + 0x5a, 0xb9, 0xf1, 0x6a, 0x0f, 0x8c, 0x60, 0xe5, 0xa3, 0x5f, 0xdb, 0xca, 0xaf, 0xc1, 0xca, 0x97, + 0x7e, 0x7d, 0x0f, 0x4c, 0x11, 0x0a, 0xba, 0x44, 0x92, 0xca, 0xf4, 0x1e, 0x1e, 0x48, 0xe2, 0x7d, + 0xe8, 0xe7, 0x4b, 0xbb, 0x2c, 0xd5, 0xaa, 0x92, 0x6c, 0x67, 0x85, 0x5d, 0x8e, 0x1b, 0xef, 0x43, + 0x3f, 0xab, 0x6a, 0x8a, 0x4f, 0x55, 0x97, 0x9d, 0xec, 0x18, 0x19, 0xef, 0x40, 0x2f, 0x2d, 0xfa, + 0x3d, 0xe4, 0x30, 0xa8, 0xaa, 0xf5, 0x72, 0x4a, 0x8f, 0xe2, 0x30, 0x0a, 0x39, 0x8b, 0x75, 0x37, + 0x57, 0x97, 0xb5, 0x29, 0x9f, 0xe5, 0x81, 0x99, 0x12, 0x65, 0x87, 0x42, 0x1d, 0x27, 0x66, 0x9c, + 0xeb, 0x61, 0x20, 0xd9, 0x92, 0x03, 0x30, 0xa2, 0xd5, 0x6c, 0x9a, 0xfc, 0x0a, 0x59, 0x74, 0x9f, + 0xaf, 0x66, 0x5f, 0xb1, 0xab, 0x64, 0x1c, 0x8a, 0x70, 0x87, 0xb3, 0x57, 0xf8, 0x1d, 0x8b, 0xb5, + 0xff, 0xd4, 0xc6, 0x12, 0x30, 0x28, 0xcf, 0x42, 0xe4, 0x63, 0x30, 0x53, 0xfb, 0x4a, 0x59, 0x56, + 0xd6, 0x39, 0x63, 0x94, 0xfd, 0x12, 0xf7, 0xdc, 0x80, 0x39, 0xd3, 0xcc, 0xb7, 0xa8, 0x57, 0xcf, + 0xee, 0x2b, 0xc2, 0x2f, 0x12, 0xe7, 0x5a, 0x3f, 0x86, 0xae, 0xd2, 0xb1, 0x32, 0xb2, 0xaa, 0xe0, + 0xe0, 0x4f, 0x0d, 0xe8, 0x25, 0xb3, 0x56, 0xa5, 0x50, 0x41, 0xe9, 0xe6, 0xdb, 0x2a, 0x5d, 0x37, + 0xa8, 0x26, 0xb1, 0xd6, 0xce, 0xc5, 0xda, 0x01, 0x10, 0x15, 0x52, 0x97, 0xa1, 0xf0, 0x02, 0x77, + 0xaa, 0xbc, 0xa9, 0x62, 0x6b, 0x80, 0x94, 0x17, 0x48, 0x38, 0x97, 0xe7, 0x47, 0xdf, 0x77, 0xa0, + 0x7f, 0x7c, 0x72, 0x7a, 0x76, 0x1c, 0x45, 0x4b, 0x6f, 0x4e, 0xb1, 0xc5, 0x1b, 0x43, 0x1b, 0x9b, + 0xd8, 0x8a, 0xa7, 0xb0, 0x51, 0xd5, 0x34, 0x45, 0x8e, 0xa0, 0x83, 0xbd, 0x2c, 0xa9, 0x7a, 0x11, + 0x1b, 0x55, 0x0e, 0x55, 0xf2, 0x23, 0xaa, 0xdb, 0xbd, 0xfe, 0x30, 0x36, 0xaa, 0x9a, 0xac, 0xc8, + 0xe7, 0x60, 0x66, 0x5d, 0x68, 0xdd, 0xf3, 0xd8, 0xa8, 0x76, 0xc6, 0x92, 0xf2, 0x59, 0xc1, 0xae, + 0x7b, 0x4c, 0x1a, 0xd5, 0x0e, 0x23, 0xe4, 0x31, 0x18, 0x49, 0xcb, 0x53, 0xfd, 0x80, 0x35, 0xaa, + 0x99, 0x7f, 0xa4, 0x7b, 0x54, 0x7b, 0x59, 0xf5, 0xca, 0x36, 0xaa, 0x1c, 0xd2, 0xc8, 0x43, 0xe8, + 0xea, 0xaa, 0x53, 0xf9, 0x14, 0x35, 0xaa, 0x9e, 0x62, 0xa4, 0x91, 0x59, 0x6b, 0x5d, 0xf7, 0x12, + 0x38, 0xaa, 0x9d, 0x26, 0xc9, 0x31, 0x40, 0xae, 0x55, 0xac, 0x7d, 0xe2, 0x1b, 0xd5, 0x4f, 0x89, + 0xe4, 0x53, 0xe8, 0x65, 0x93, 0x7f, 0xf5, 0xd3, 0xdb, 0xa8, 0x6e, 0x70, 0x9b, 0x75, 0xf1, 0x79, + 0xf6, 0xa3, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x53, 0x66, 0x3c, 0x2d, 0x1a, 0x16, 0x00, 0x00, } diff --git a/abci/types/types.proto b/abci/types/types.proto index b4f4b2aa..2dec6209 100644 --- a/abci/types/types.proto +++ b/abci/types/types.proto @@ -143,7 +143,7 @@ message ResponseQuery { int64 index = 5; bytes key = 6; bytes value = 7; - bytes proof = 8; + repeated ProofOp proof = 8 [(gogoproto.nullable)=false, (gogoproto.jsontag)="tags,omitempty"]; int64 height = 9; } @@ -215,6 +215,13 @@ message BlockGossip { int32 block_part_size_bytes = 1; } +// A single Merkle proof operation. +message ProofOp { + string type = 1; + string key = 2; + bytes data = 3; +} + //---------------------------------------- // Blockchain Types diff --git a/crypto/merkle/compile.sh b/crypto/merkle/compile.sh new file mode 100644 index 00000000..8e4c739f --- /dev/null +++ b/crypto/merkle/compile.sh @@ -0,0 +1,6 @@ +#! /bin/bash + +protoc --gogo_out=. -I $GOPATH/src/ -I . -I $GOPATH/src/github.com/gogo/protobuf/protobuf merkle.proto +echo "--> adding nolint declarations to protobuf generated files" +awk '/package merkle/ { print "//nolint: gas"; print; next }1' merkle.pb.go > merkle.pb.go.new +mv merkle.pb.go.new merkle.pb.go diff --git a/crypto/merkle/merkle.pb.go b/crypto/merkle/merkle.pb.go new file mode 100644 index 00000000..c778530f --- /dev/null +++ b/crypto/merkle/merkle.pb.go @@ -0,0 +1,101 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: merkle.proto + +/* +Package merkle is a generated protocol buffer package. + +It is generated from these files: + merkle.proto + +It has these top-level messages: + ProofOp + Proof +*/ +//nolint: gas +package merkle + +import proto "github.com/gogo/protobuf/proto" +import fmt "fmt" +import math "math" +import _ "github.com/gogo/protobuf/gogoproto" + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + +type ProofOp struct { + Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` + Key string `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"` + Data []byte `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` +} + +func (m *ProofOp) Reset() { *m = ProofOp{} } +func (m *ProofOp) String() string { return proto.CompactTextString(m) } +func (*ProofOp) ProtoMessage() {} +func (*ProofOp) Descriptor() ([]byte, []int) { return fileDescriptorMerkle, []int{0} } + +func (m *ProofOp) GetType() string { + if m != nil { + return m.Type + } + return "" +} + +func (m *ProofOp) GetKey() string { + if m != nil { + return m.Key + } + return "" +} + +func (m *ProofOp) GetData() []byte { + if m != nil { + return m.Data + } + return nil +} + +type Proof struct { + Ops []ProofOp `protobuf:"bytes,1,rep,name=ops" json:"ops"` +} + +func (m *Proof) Reset() { *m = Proof{} } +func (m *Proof) String() string { return proto.CompactTextString(m) } +func (*Proof) ProtoMessage() {} +func (*Proof) Descriptor() ([]byte, []int) { return fileDescriptorMerkle, []int{1} } + +func (m *Proof) GetOps() []ProofOp { + if m != nil { + return m.Ops + } + return nil +} + +func init() { + proto.RegisterType((*ProofOp)(nil), "merkle.ProofOp") + proto.RegisterType((*Proof)(nil), "merkle.Proof") +} + +func init() { proto.RegisterFile("merkle.proto", fileDescriptorMerkle) } + +var fileDescriptorMerkle = []byte{ + // 168 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0xc9, 0x4d, 0x2d, 0xca, + 0xce, 0x49, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x83, 0xf0, 0xa4, 0x74, 0xd3, 0x33, + 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xd3, 0xf3, 0xd3, 0xf3, 0xf5, 0xc1, 0xd2, + 0x49, 0xa5, 0x69, 0x60, 0x1e, 0x98, 0x03, 0x66, 0x41, 0xb4, 0x29, 0x39, 0x73, 0xb1, 0x07, 0x14, + 0xe5, 0xe7, 0xa7, 0xf9, 0x17, 0x08, 0x09, 0x71, 0xb1, 0x94, 0x54, 0x16, 0xa4, 0x4a, 0x30, 0x2a, + 0x30, 0x6a, 0x70, 0x06, 0x81, 0xd9, 0x42, 0x02, 0x5c, 0xcc, 0xd9, 0xa9, 0x95, 0x12, 0x4c, 0x60, + 0x21, 0x10, 0x13, 0xa4, 0x2a, 0x25, 0xb1, 0x24, 0x51, 0x82, 0x59, 0x81, 0x51, 0x83, 0x27, 0x08, + 0xcc, 0x56, 0x32, 0xe0, 0x62, 0x05, 0x1b, 0x22, 0xa4, 0xce, 0xc5, 0x9c, 0x5f, 0x50, 0x2c, 0xc1, + 0xa8, 0xc0, 0xac, 0xc1, 0x6d, 0xc4, 0xaf, 0x07, 0x75, 0x20, 0xd4, 0x02, 0x27, 0x96, 0x13, 0xf7, + 0xe4, 0x19, 0x82, 0x40, 0x2a, 0x92, 0xd8, 0xc0, 0xb6, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, + 0x52, 0x58, 0x00, 0xa7, 0xc4, 0x00, 0x00, 0x00, +} diff --git a/crypto/merkle/merkle.proto b/crypto/merkle/merkle.proto new file mode 100644 index 00000000..053387ff --- /dev/null +++ b/crypto/merkle/merkle.proto @@ -0,0 +1,19 @@ +syntax = "proto3"; +package merkle; + +// For more information on gogo.proto, see: +// https://github.com/gogo/protobuf/blob/master/extensions.md +import "github.com/gogo/protobuf/gogoproto/gogo.proto"; + +//---------------------------------------- +// Message types + +message ProofOp { + string type = 1; + string key = 2; + bytes data = 3; +} + +message Proof { + repeated ProofOp ops = 1 [(gogoproto.nullable)=false]; +} diff --git a/crypto/merkle/proof.go b/crypto/merkle/proof.go new file mode 100644 index 00000000..1947dc41 --- /dev/null +++ b/crypto/merkle/proof.go @@ -0,0 +1,140 @@ +package merkle + +import ( + "bytes" + "reflect" + + "github.com/tendermint/go-amino" + cmn "github.com/tendermint/tmlibs/common" +) + +//---------------------------------------- +// Extension of ProofOp (defined in merkle.proto) + +func (po ProofOp) Bytes() []byte { + bz, err := amino.MarshalBinary(po) + if err != nil { + panic(err) + } + return bz +} + +//---------------------------------------- +// ProofOp gets converted to an instance of ProofOperator: + +type ProofOperator interface { + Run([][]byte) ([][]byte, error) + GetKey() string + ProofOp() ProofOp +} + +//---------------------------------------- +// Operations on a list of ProofOperators + +type ProofOperators []ProofOperator + +func (poz ProofOperators) VerifyValue(root []byte, value []byte, keys ...string) (err error) { + return poz.Verify(root, [][]byte{value}, keys...) +} + +func (poz ProofOperators) Verify(root []byte, args [][]byte, keys ...string) (err error) { + for i, op := range poz { + key := op.GetKey() + if key != "" { + if keys[0] != key { + return cmn.NewError("Key mismatch on operation #%d: expected %+v but %+v", i, []byte(keys[0]), []byte(key)) + } + keys = keys[1:] + } + args, err = op.Run(args) + if err != nil { + return + } + } + if !bytes.Equal(root, args[0]) { + return cmn.NewError("Calculated root hash is invalid: expected %+v but %+v", root, args[0]) + } + return nil +} + +//---------------------------------------- +// ProofRuntime - main entrypoint + +type OpDecoder func(ProofOp) (ProofOperator, error) + +type ProofRuntime struct { + decoders map[string]OpDecoder +} + +func NewProofRuntime() *ProofRuntime { + return &ProofRuntime{ + decoders: make(map[string]OpDecoder), + } +} + +func (prt *ProofRuntime) RegisterAminoOpDecoder(typ string, opType reflect.Type) { + prt.RegisterOpDecoder( + typ, + func(pop ProofOp) (ProofOperator, error) { + newOp := reflect.New(opType).Elem().Interface() + err := cdc.UnmarshalBinary(pop.Data, &newOp) + if err != nil { + return nil, cmn.ErrorWrap(err, "decoding ProofOp.Data") + } + return newOp.(ProofOperator), nil + }, + ) +} + +func (prt *ProofRuntime) RegisterOpDecoder(typ string, dec OpDecoder) { + _, ok := prt.decoders[typ] + if ok { + panic("already registered for type " + typ) + } + prt.decoders[typ] = dec +} + +func (prt *ProofRuntime) Decode(pop ProofOp) (ProofOperator, error) { + decoder := prt.decoders[pop.Type] + if decoder == nil { + return nil, cmn.NewError("unrecognized proof type %v", pop.Type) + } + return decoder(pop) +} + +func (prt *ProofRuntime) DecodeProof(proof *Proof) (poz ProofOperators, err error) { + poz = ProofOperators(nil) + for _, pop := range proof.Ops { + operator, err := prt.Decode(pop) + if err != nil { + return nil, cmn.ErrorWrap(err, "decoding a proof operator") + } + poz = append(poz, operator) + } + return +} + +func (prt *ProofRuntime) VerifyValue(proof *Proof, root []byte, value []byte, keys ...string) (err error) { + return prt.Verify(proof, root, [][]byte{value}, keys...) +} + +func (prt *ProofRuntime) Verify(proof *Proof, root []byte, args [][]byte, keys ...string) (err error) { + poz, err := prt.DecodeProof(proof) + if err != nil { + return cmn.ErrorWrap(err, "decoding proof") + } + return poz.Verify(root, args, keys...) +} + +// DefaultProofRuntime only knows about Simple value +// proofs. +// To use e.g. IAVL proofs, register op-decoders as +// defined in the IAVL package. +func DefaultProofRuntime() (prt *ProofRuntime) { + prt = NewProofRuntime() + prt.RegisterAminoOpDecoder( + ProofOpSimpleValue, + reflect.TypeOf(SimpleValueOp{}), + ) + return +} diff --git a/crypto/merkle/proof_simple_value.go b/crypto/merkle/proof_simple_value.go new file mode 100644 index 00000000..2e1ae2c6 --- /dev/null +++ b/crypto/merkle/proof_simple_value.go @@ -0,0 +1,79 @@ +package merkle + +import ( + "bytes" + "fmt" + + "github.com/tendermint/tendermint/crypto/tmhash" + cmn "github.com/tendermint/tmlibs/common" +) + +const ProofOpSimpleValue = "simple:v" + +// SimpleValueOp takes a key and a single value as argument and +// produces the root hash. The corresponding tree structure is +// the SimpleMap tree. SimpleMap takes a Hasher, and currently +// Tendermint uses aminoHasher. SimpleValueOp should support +// the hash function as used in aminoHasher. TODO support +// additional hash functions here as options/args to this +// operator. +// +// If the produced root hash matches the expected hash, the +// proof is good. +type SimpleValueOp struct { + // encoded in ProofOp.Key, not .Data + key string + + // To encode in ProofOp.Data + Proof *SimpleProof `json:"simple-proof"` +} + +var _ ProofOperator = SimpleValueOp{} + +func NewSimpleValueOp(key string, proof *SimpleProof) SimpleValueOp { + return SimpleValueOp{ + key: key, + Proof: proof, + } +} + +func (op SimpleValueOp) String() string { + return fmt.Sprintf("SimpleValueOp{%v}", op.GetKey()) +} + +func (op SimpleValueOp) Run(args [][]byte) ([][]byte, error) { + if len(args) != 1 { + return nil, cmn.NewError("expected 1 arg, got %v", len(args)) + } + value := args[0] + hasher := tmhash.New() + hasher.Write(value) // does not error + vhash := hasher.Sum(nil) + + // Wrap to hash the KVPair. + hasher = tmhash.New() + encodeByteSlice(hasher, []byte(op.key)) // does not error + encodeByteSlice(hasher, []byte(vhash)) // does not error + kvhash := hasher.Sum(nil) + + if !bytes.Equal(kvhash, op.Proof.LeafHash) { + return nil, cmn.NewError("leaf hash mismatch: want %X got %X", op.Proof.LeafHash, kvhash) + } + + return [][]byte{ + op.Proof.ComputeRootHash(), + }, nil +} + +func (op SimpleValueOp) GetKey() string { + return op.key +} + +func (op SimpleValueOp) ProofOp() ProofOp { + bz := cdc.MustMarshalBinary(op) + return ProofOp{ + Type: ProofOpSimpleValue, + Key: op.key, + Data: bz, + } +} diff --git a/crypto/merkle/simple_proof.go b/crypto/merkle/simple_proof.go index 2541b6d3..dbd19cb6 100644 --- a/crypto/merkle/simple_proof.go +++ b/crypto/merkle/simple_proof.go @@ -3,11 +3,22 @@ package merkle import ( "bytes" "fmt" + + cmn "github.com/tendermint/tmlibs/common" ) -// SimpleProof represents a simple merkle proof. +// SimpleProof represents a simple Merkle proof. +// NOTE: The convention for proofs is to include leaf hashes but to +// exclude the root hash. +// This convention is implemented across IAVL range proofs as well. +// Keep this consistent unless there's a very good reason to change +// everything. This also affects the generalized proof system as +// well. type SimpleProof struct { - Aunts [][]byte `json:"aunts"` // Hashes from leaf's sibling to a root's child. + Total int `json:"total"` // Total number of items. + Index int `json:"index"` // Index of item to prove. + LeafHash []byte `json:"leaf_hash"` // Hash of item value. + Aunts [][]byte `json:"aunts"` // Hashes from leaf's sibling to a root's child. } // SimpleProofsFromHashers computes inclusion proof for given items. @@ -18,7 +29,10 @@ func SimpleProofsFromHashers(items []Hasher) (rootHash []byte, proofs []*SimpleP proofs = make([]*SimpleProof, len(items)) for i, trail := range trails { proofs[i] = &SimpleProof{ - Aunts: trail.FlattenAunts(), + Total: len(items), + Index: i, + LeafHash: trail.Hash, + Aunts: trail.FlattenAunts(), } } return @@ -49,11 +63,32 @@ func SimpleProofsFromMap(m map[string]Hasher) (rootHash []byte, proofs map[strin return } -// Verify that leafHash is a leaf hash of the simple-merkle-tree -// which hashes to rootHash. -func (sp *SimpleProof) Verify(index int, total int, leafHash []byte, rootHash []byte) bool { - computedHash := computeHashFromAunts(index, total, leafHash, sp.Aunts) - return computedHash != nil && bytes.Equal(computedHash, rootHash) +// Verify that the SimpleProof proves the root hash. +func (sp *SimpleProof) Verify(rootHash []byte, index int, total int, leafHash []byte) error { + if sp.Index != index { + return cmn.NewError("invalid index: wanted %v got %v", index, sp.Index) + } + if sp.Total != total { + return cmn.NewError("invalid total: wanted %v got %v", total, sp.Total) + } + if !bytes.Equal(sp.LeafHash, leafHash) { + return cmn.NewError("invalid leaf hash: wanted %X got %X", leafHash, sp.LeafHash) + } + computedHash := sp.ComputeRootHash() + if !bytes.Equal(computedHash, rootHash) { + return cmn.NewError("invalid root hash: wanted %X got %X", rootHash, computedHash) + } + return nil +} + +// Compute the root hash given a leaf hash. Does not verify the result. +func (sp *SimpleProof) ComputeRootHash() []byte { + return computeHashFromAunts( + sp.Index, + sp.Total, + sp.LeafHash, + sp.Aunts, + ) } // String implements the stringer interface for SimpleProof. diff --git a/crypto/merkle/wire.go b/crypto/merkle/wire.go new file mode 100644 index 00000000..8be8e86c --- /dev/null +++ b/crypto/merkle/wire.go @@ -0,0 +1,16 @@ +package merkle + +import ( + "github.com/tendermint/go-amino" +) + +var cdc *amino.Codec + +func init() { + cdc = amino.NewCodec() + RegisterWire(cdc) +} + +func RegisterWire(cdc *amino.Codec) { + // Nothing to do. +} diff --git a/docs/app-development.md b/docs/app-development.md index 32abe215..237ebe3c 100644 --- a/docs/app-development.md +++ b/docs/app-development.md @@ -408,7 +408,7 @@ In go: func (app *KVStoreApplication) Query(reqQuery types.RequestQuery) (resQuery types.ResponseQuery) { if reqQuery.Prove { - value, proof, exists := app.state.Proof(reqQuery.Data) + value, proof, exists := app.state.GetWithProof(reqQuery.Data) resQuery.Index = -1 // TODO make Proof return index resQuery.Key = reqQuery.Data resQuery.Value = value @@ -437,22 +437,20 @@ In Java: ResponseQuery requestQuery(RequestQuery req) { final boolean isProveQuery = req.getProve(); final ResponseQuery.Builder responseBuilder = ResponseQuery.newBuilder(); + byte[] queryData = req.getData().toByteArray(); if (isProveQuery) { - com.app.example.ProofResult proofResult = generateProof(req.getData().toByteArray()); - final byte[] proofAsByteArray = proofResult.getAsByteArray(); - - responseBuilder.setProof(ByteString.copyFrom(proofAsByteArray)); + com.app.example.QueryResultWithProof result = generateQueryResultWithProof(queryData); + responseBuilder.setIndex(result.getLeftIndex()); responseBuilder.setKey(req.getData()); - responseBuilder.setValue(ByteString.copyFrom(proofResult.getData())); + responseBuilder.setValue(result.getValueOrNull(0)); + responseBuilder.setHeight(result.getHeight()); + responseBuilder.setProof(result.getProof()); responseBuilder.setLog(result.getLogValue()); } else { - byte[] queryData = req.getData().toByteArray(); - - final com.app.example.QueryResult result = generateQueryResult(queryData); - + com.app.example.QueryResult result = generateQueryResult(queryData); responseBuilder.setIndex(result.getIndex()); - responseBuilder.setValue(ByteString.copyFrom(result.getValue())); + responseBuilder.setValue(result.getValue()); responseBuilder.setLog(result.getLogValue()); } diff --git a/types/block.go b/types/block.go index 0faa24db..c388dbd7 100644 --- a/types/block.go +++ b/types/block.go @@ -8,9 +8,9 @@ import ( "sync" "time" + "github.com/tendermint/tendermint/crypto/tmhash" cmn "github.com/tendermint/tmlibs/common" "github.com/tendermint/tmlibs/merkle" - "golang.org/x/crypto/ripemd160" ) // Block defines the atomic unit of a Tendermint blockchain. @@ -615,7 +615,7 @@ type hasher struct { } func (h hasher) Hash() []byte { - hasher := ripemd160.New() + hasher := tmhash.New() if h.item != nil && !cmn.IsTypedNil(h.item) && !cmn.IsEmpty(h.item) { bz, err := cdc.MarshalBinaryBare(h.item) if err != nil { @@ -627,7 +627,6 @@ func (h hasher) Hash() []byte { } } return hasher.Sum(nil) - } func aminoHash(item interface{}) []byte {