diff --git a/Makefile b/Makefile index a714689710..48753c5247 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,9 @@ OUTPUT?=build/tendermint BUILD_TAGS?=tendermint +IMAGE := ghcr.io/tendermint/docker-build-proto:latest +DOCKER_PROTO_BUILDER := docker run -v $(shell pwd):/workspace --workdir /workspace $(IMAGE) + # If building a release, please checkout the version tag to get the correct version setting ifneq ($(shell git symbolic-ref -q --short HEAD),) VERSION := unreleased-$(shell git symbolic-ref -q --short HEAD)-$(shell git rev-parse HEAD) @@ -13,7 +16,6 @@ endif LD_FLAGS = -X github.com/tendermint/tendermint/version.TMCoreSemVer=$(VERSION) BUILD_FLAGS = -mod=readonly -ldflags "$(LD_FLAGS)" HTTPS_GIT := https://github.com/tendermint/tendermint.git -DOCKER_BUF := docker run -v $(shell pwd):/workspace --workdir /workspace bufbuild/buf CGO_ENABLED ?= 0 # handle nostrip @@ -74,30 +76,29 @@ install: ### Protobuf ### ############################################################################### -proto-all: proto-gen proto-lint proto-check-breaking +proto-all: proto-lint proto-check-breaking .PHONY: proto-all proto-gen: - @docker pull -q tendermintdev/docker-build-proto @echo "Generating Protobuf files" - @docker run -v $(shell pwd):/workspace --workdir /workspace tendermintdev/docker-build-proto sh ./scripts/protocgen.sh + @$(DOCKER_PROTO_BUILDER) buf generate --template=./buf.gen.yaml --config ./buf.yaml .PHONY: proto-gen proto-lint: - @$(DOCKER_BUF) check lint --error-format=json + @$(DOCKER_PROTO_BUILDER) buf lint --error-format=json --config ./buf.yaml .PHONY: proto-lint proto-format: @echo "Formatting Protobuf files" - docker run -v $(shell pwd):/workspace --workdir /workspace tendermintdev/docker-build-proto find ./ -not -path "./third_party/*" -name *.proto -exec clang-format -i {} \; + @$(DOCKER_PROTO_BUILDER) find . -name '*.proto' -path "./proto/*" -exec clang-format -i {} \; .PHONY: proto-format proto-check-breaking: - @$(DOCKER_BUF) check breaking --against-input .git#branch=master + @$(DOCKER_PROTO_BUILDER) buf breaking --against .git --config ./buf.yaml .PHONY: proto-check-breaking proto-check-breaking-ci: - @$(DOCKER_BUF) check breaking --against-input $(HTTPS_GIT)#branch=master + @$(DOCKER_PROTO_BUILDER) buf breaking --against $(HTTPS_GIT) --config ./buf.yaml .PHONY: proto-check-breaking-ci ############################################################################### diff --git a/abci/types/application.go b/abci/types/application.go index a24ba83d82..7f1517c872 100644 --- a/abci/types/application.go +++ b/abci/types/application.go @@ -98,7 +98,7 @@ func (BaseApplication) ApplySnapshotChunk(req RequestApplySnapshotChunk) Respons } func (BaseApplication) PreprocessTxs(req RequestPreprocessTxs) ResponsePreprocessTxs { - return ResponsePreprocessTxs{} + return ResponsePreprocessTxs{Txs: req.Txs} } //------------------------------------------------------- diff --git a/abci/types/types.pb.go b/abci/types/types.pb.go index 576a2c8168..7215e34d94 100644 --- a/abci/types/types.pb.go +++ b/abci/types/types.pb.go @@ -2882,10 +2882,11 @@ func (m *EventAttribute) GetIndex() bool { // // One usage is indexing transaction results. type TxResult struct { - Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` - Index uint32 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` - Tx []byte `protobuf:"bytes,3,opt,name=tx,proto3" json:"tx,omitempty"` - Result ResponseDeliverTx `protobuf:"bytes,4,opt,name=result,proto3" json:"result"` + Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` + Index uint32 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` + Tx []byte `protobuf:"bytes,3,opt,name=tx,proto3" json:"tx,omitempty"` + Result ResponseDeliverTx `protobuf:"bytes,4,opt,name=result,proto3" json:"result"` + OriginalHash []byte `protobuf:"bytes,5,opt,name=original_hash,json=originalHash,proto3" json:"original_hash,omitempty"` } func (m *TxResult) Reset() { *m = TxResult{} } @@ -2949,6 +2950,13 @@ func (m *TxResult) GetResult() ResponseDeliverTx { return ResponseDeliverTx{} } +func (m *TxResult) GetOriginalHash() []byte { + if m != nil { + return m.OriginalHash + } + return nil +} + // Validator type Validator struct { Address []byte `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` @@ -3323,184 +3331,186 @@ func init() { func init() { proto.RegisterFile("tendermint/abci/types.proto", fileDescriptor_252557cfdd89a31a) } var fileDescriptor_252557cfdd89a31a = []byte{ - // 2831 bytes of a gzipped FileDescriptorProto + // 2850 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4b, 0x77, 0x23, 0xc5, - 0x15, 0xd6, 0x5b, 0xea, 0x6b, 0xeb, 0xe1, 0x9a, 0x61, 0x10, 0xcd, 0x60, 0x0f, 0xcd, 0x81, 0x0c, - 0x03, 0xd8, 0xc1, 0x1c, 0x26, 0x10, 0x48, 0xc0, 0x12, 0x1a, 0x64, 0x6c, 0x2c, 0xa7, 0xad, 0x19, - 0xf2, 0x62, 0x9a, 0x96, 0xba, 0x2c, 0x35, 0x23, 0x75, 0x37, 0xdd, 0x25, 0x63, 0xb3, 0xcc, 0x63, - 0x43, 0x36, 0x2c, 0xb3, 0xe1, 0x6f, 0xe4, 0x64, 0x95, 0x4d, 0x36, 0x9c, 0x93, 0x0d, 0xcb, 0xac, - 0x48, 0x32, 0xb3, 0xcb, 0x1f, 0xc8, 0x2a, 0x27, 0x39, 0xf5, 0xe8, 0x97, 0xa4, 0x96, 0x64, 0xc8, - 0x2e, 0xbb, 0xaa, 0xdb, 0xf7, 0xde, 0x56, 0xdd, 0xae, 0xfa, 0xee, 0x77, 0x6f, 0x09, 0x9e, 0x24, - 0xd8, 0x32, 0xb0, 0x3b, 0x36, 0x2d, 0xb2, 0xa3, 0xf7, 0xfa, 0xe6, 0x0e, 0xb9, 0x70, 0xb0, 0xb7, - 0xed, 0xb8, 0x36, 0xb1, 0x51, 0x35, 0x7c, 0xb8, 0x4d, 0x1f, 0xca, 0x4f, 0x45, 0xb4, 0xfb, 0xee, - 0x85, 0x43, 0xec, 0x1d, 0xc7, 0xb5, 0xed, 0x53, 0xae, 0x2f, 0x5f, 0x8f, 0x3c, 0x66, 0x7e, 0xa2, - 0xde, 0x62, 0x4f, 0x85, 0xf1, 0x03, 0x7c, 0xe1, 0x3f, 0x7d, 0x6a, 0xc6, 0xd6, 0xd1, 0x5d, 0x7d, - 0xec, 0x3f, 0xde, 0x1a, 0xd8, 0xf6, 0x60, 0x84, 0x77, 0xd8, 0xac, 0x37, 0x39, 0xdd, 0x21, 0xe6, - 0x18, 0x7b, 0x44, 0x1f, 0x3b, 0x42, 0xe1, 0xea, 0xc0, 0x1e, 0xd8, 0x6c, 0xb8, 0x43, 0x47, 0x5c, - 0xaa, 0xfc, 0xa3, 0x04, 0x45, 0x15, 0x7f, 0x32, 0xc1, 0x1e, 0x41, 0xbb, 0x90, 0xc3, 0xfd, 0xa1, - 0x5d, 0x4f, 0xdf, 0x48, 0xdf, 0x5c, 0xdb, 0xbd, 0xbe, 0x3d, 0xb5, 0xb8, 0x6d, 0xa1, 0xd7, 0xea, - 0x0f, 0xed, 0x76, 0x4a, 0x65, 0xba, 0xe8, 0x55, 0xc8, 0x9f, 0x8e, 0x26, 0xde, 0xb0, 0x9e, 0x61, - 0x46, 0x4f, 0x25, 0x19, 0xdd, 0xa1, 0x4a, 0xed, 0x94, 0xca, 0xb5, 0xe9, 0xab, 0x4c, 0xeb, 0xd4, - 0xae, 0x67, 0x17, 0xbf, 0x6a, 0xdf, 0x3a, 0x65, 0xaf, 0xa2, 0xba, 0xa8, 0x01, 0xe0, 0x61, 0xa2, - 0xd9, 0x0e, 0x31, 0x6d, 0xab, 0x9e, 0x63, 0x96, 0x4f, 0x27, 0x59, 0x9e, 0x60, 0xd2, 0x61, 0x8a, - 0xed, 0x94, 0x2a, 0x79, 0xfe, 0x84, 0xfa, 0x30, 0x2d, 0x93, 0x68, 0xfd, 0xa1, 0x6e, 0x5a, 0xf5, - 0xfc, 0x62, 0x1f, 0xfb, 0x96, 0x49, 0x9a, 0x54, 0x91, 0xfa, 0x30, 0xfd, 0x09, 0x5d, 0xf2, 0x27, - 0x13, 0xec, 0x5e, 0xd4, 0x0b, 0x8b, 0x97, 0xfc, 0x13, 0xaa, 0x44, 0x97, 0xcc, 0xb4, 0x51, 0x0b, - 0xd6, 0x7a, 0x78, 0x60, 0x5a, 0x5a, 0x6f, 0x64, 0xf7, 0x1f, 0xd4, 0x8b, 0xcc, 0x58, 0x49, 0x32, - 0x6e, 0x50, 0xd5, 0x06, 0xd5, 0x6c, 0xa7, 0x54, 0xe8, 0x05, 0x33, 0xf4, 0x26, 0x94, 0xfa, 0x43, - 0xdc, 0x7f, 0xa0, 0x91, 0xf3, 0x7a, 0x89, 0xf9, 0xd8, 0x4a, 0xf2, 0xd1, 0xa4, 0x7a, 0xdd, 0xf3, - 0x76, 0x4a, 0x2d, 0xf6, 0xf9, 0x90, 0xae, 0xdf, 0xc0, 0x23, 0xf3, 0x0c, 0xbb, 0xd4, 0x5e, 0x5a, - 0xbc, 0xfe, 0x77, 0xb8, 0x26, 0xf3, 0x20, 0x19, 0xfe, 0x04, 0xbd, 0x05, 0x12, 0xb6, 0x0c, 0xb1, - 0x0c, 0x60, 0x2e, 0x6e, 0x24, 0xee, 0x15, 0xcb, 0xf0, 0x17, 0x51, 0xc2, 0x62, 0x8c, 0x5e, 0x83, - 0x42, 0xdf, 0x1e, 0x8f, 0x4d, 0x52, 0x5f, 0x63, 0xd6, 0x9b, 0x89, 0x0b, 0x60, 0x5a, 0xed, 0x94, - 0x2a, 0xf4, 0xd1, 0x11, 0x54, 0x46, 0xa6, 0x47, 0x34, 0xcf, 0xd2, 0x1d, 0x6f, 0x68, 0x13, 0xaf, - 0xbe, 0xce, 0x3c, 0x3c, 0x9b, 0xe4, 0xe1, 0xd0, 0xf4, 0xc8, 0x89, 0xaf, 0xdc, 0x4e, 0xa9, 0xe5, - 0x51, 0x54, 0x40, 0xfd, 0xd9, 0xa7, 0xa7, 0xd8, 0x0d, 0x1c, 0xd6, 0xcb, 0x8b, 0xfd, 0x75, 0xa8, - 0xb6, 0x6f, 0x4f, 0xfd, 0xd9, 0x51, 0x01, 0xfa, 0x05, 0x5c, 0x19, 0xd9, 0xba, 0x11, 0xb8, 0xd3, - 0xfa, 0xc3, 0x89, 0xf5, 0xa0, 0x5e, 0x61, 0x4e, 0x9f, 0x4f, 0xfc, 0x91, 0xb6, 0x6e, 0xf8, 0x2e, - 0x9a, 0xd4, 0xa0, 0x9d, 0x52, 0x37, 0x46, 0xd3, 0x42, 0x74, 0x1f, 0xae, 0xea, 0x8e, 0x33, 0xba, - 0x98, 0xf6, 0x5e, 0x65, 0xde, 0x6f, 0x25, 0x79, 0xdf, 0xa3, 0x36, 0xd3, 0xee, 0x91, 0x3e, 0x23, - 0xa5, 0xc1, 0x70, 0x5c, 0xec, 0xb8, 0x76, 0x1f, 0x7b, 0x9e, 0x46, 0xce, 0xbd, 0x7a, 0x6d, 0x71, - 0x30, 0x8e, 0x03, 0xed, 0xee, 0x39, 0x0b, 0xae, 0x13, 0x15, 0x34, 0x8a, 0x90, 0x3f, 0xd3, 0x47, - 0x13, 0xac, 0x7c, 0x0f, 0xd6, 0x22, 0xd0, 0x81, 0xea, 0x50, 0x1c, 0x63, 0xcf, 0xd3, 0x07, 0x98, - 0x21, 0x8d, 0xa4, 0xfa, 0x53, 0xa5, 0x02, 0xeb, 0x51, 0xb8, 0x50, 0xc6, 0x81, 0x21, 0x05, 0x02, - 0x6a, 0x78, 0x86, 0x5d, 0x8f, 0x9e, 0x7e, 0x61, 0x28, 0xa6, 0xe8, 0x19, 0x28, 0xb3, 0xed, 0xa8, - 0xf9, 0xcf, 0x29, 0x1a, 0xe5, 0xd4, 0x75, 0x26, 0xbc, 0x27, 0x94, 0xb6, 0x60, 0xcd, 0xd9, 0x75, - 0x02, 0x95, 0x2c, 0x53, 0x01, 0x67, 0xd7, 0x11, 0x0a, 0xca, 0x0f, 0xa1, 0x36, 0x8d, 0x1e, 0xa8, - 0x06, 0xd9, 0x07, 0xf8, 0x42, 0xbc, 0x8f, 0x0e, 0xd1, 0x55, 0xb1, 0x2c, 0xf6, 0x0e, 0x49, 0x15, - 0x6b, 0xfc, 0x4b, 0x26, 0x30, 0x0e, 0x60, 0x03, 0xbd, 0x06, 0x39, 0x8a, 0xc2, 0x02, 0x50, 0xe5, - 0x6d, 0x0e, 0xd1, 0xdb, 0x3e, 0x44, 0x6f, 0x77, 0x7d, 0x88, 0x6e, 0x94, 0xbe, 0xfa, 0x66, 0x2b, - 0xf5, 0xc5, 0xdf, 0xb6, 0xd2, 0x2a, 0xb3, 0x40, 0x4f, 0xd0, 0x53, 0xae, 0x9b, 0x96, 0x66, 0x1a, - 0xe2, 0x3d, 0x45, 0x36, 0xdf, 0x37, 0xd0, 0x01, 0xd4, 0xfa, 0xb6, 0xe5, 0x61, 0xcb, 0x9b, 0x78, - 0x1a, 0x4f, 0x01, 0x02, 0x46, 0x67, 0x4f, 0x61, 0xd3, 0x57, 0x3c, 0x66, 0x7a, 0x6a, 0xb5, 0x1f, - 0x17, 0xa0, 0x3b, 0x00, 0x67, 0xfa, 0xc8, 0x34, 0x74, 0x62, 0xbb, 0x5e, 0x3d, 0x77, 0x23, 0x3b, - 0xd7, 0xcd, 0x3d, 0x5f, 0xe5, 0xae, 0x63, 0xe8, 0x04, 0x37, 0x72, 0xf4, 0xd7, 0xaa, 0x11, 0x4b, - 0xf4, 0x1c, 0x54, 0x75, 0xc7, 0xd1, 0x3c, 0xa2, 0x13, 0xac, 0xf5, 0x2e, 0x08, 0xf6, 0x18, 0xb8, - 0xae, 0xab, 0x65, 0xdd, 0x71, 0x4e, 0xa8, 0xb4, 0x41, 0x85, 0xe8, 0x59, 0xa8, 0x50, 0x20, 0x35, - 0xf5, 0x91, 0x36, 0xc4, 0xe6, 0x60, 0x48, 0x18, 0x88, 0x66, 0xd5, 0xb2, 0x90, 0xb6, 0x99, 0x50, - 0x31, 0x82, 0x8d, 0xc0, 0x40, 0x14, 0x21, 0xc8, 0x19, 0x3a, 0xd1, 0x59, 0x20, 0xd7, 0x55, 0x36, - 0xa6, 0x32, 0x47, 0x27, 0x43, 0x11, 0x1e, 0x36, 0x46, 0xd7, 0xa0, 0x20, 0xdc, 0x66, 0x99, 0x5b, - 0x31, 0xa3, 0xdf, 0xcc, 0x71, 0xed, 0x33, 0xcc, 0xb2, 0x46, 0x49, 0xe5, 0x13, 0xe5, 0x37, 0x19, - 0xd8, 0x98, 0x81, 0x5b, 0xea, 0x77, 0xa8, 0x7b, 0x43, 0xff, 0x5d, 0x74, 0x8c, 0x6e, 0x53, 0xbf, - 0xba, 0x81, 0x5d, 0x91, 0xe6, 0xea, 0xd1, 0x10, 0xf1, 0x14, 0xde, 0x66, 0xcf, 0x45, 0x68, 0x84, - 0x36, 0xea, 0x40, 0x6d, 0xa4, 0x7b, 0x44, 0xe3, 0xf0, 0xa5, 0x45, 0x52, 0xde, 0x2c, 0x68, 0x1f, - 0xea, 0x3e, 0xe0, 0xd1, 0xcd, 0x2e, 0x1c, 0x55, 0x46, 0x31, 0x29, 0x52, 0xe1, 0x6a, 0xef, 0xe2, - 0x33, 0xdd, 0x22, 0xa6, 0x85, 0xb5, 0x99, 0x2f, 0xf7, 0xc4, 0x8c, 0xd3, 0xd6, 0x99, 0x69, 0x60, - 0xab, 0xef, 0x7f, 0xb2, 0x2b, 0x81, 0x71, 0xf0, 0x49, 0x3d, 0x45, 0x85, 0x4a, 0x3c, 0x61, 0xa0, - 0x0a, 0x64, 0xc8, 0xb9, 0x08, 0x40, 0x86, 0x9c, 0xa3, 0xef, 0x43, 0x8e, 0x2e, 0x92, 0x2d, 0xbe, - 0x32, 0x27, 0x5b, 0x0b, 0xbb, 0xee, 0x85, 0x83, 0x55, 0xa6, 0xa9, 0x28, 0xc1, 0x69, 0x08, 0x92, - 0xc8, 0xb4, 0x57, 0xe5, 0x79, 0xa8, 0x4e, 0x65, 0x89, 0xc8, 0xf7, 0x4b, 0x47, 0xbf, 0x9f, 0x52, - 0x85, 0x72, 0x2c, 0x25, 0x28, 0xd7, 0xe0, 0xea, 0x3c, 0x84, 0x57, 0x86, 0x81, 0x3c, 0x86, 0xd4, - 0xe8, 0x55, 0x28, 0x05, 0x10, 0xcf, 0x4f, 0xe3, 0x6c, 0xac, 0x7c, 0x65, 0x35, 0x50, 0xa5, 0xc7, - 0x90, 0x6e, 0x6b, 0xb6, 0x1f, 0x32, 0xec, 0x87, 0x17, 0x75, 0xc7, 0x69, 0xeb, 0xde, 0x50, 0xf9, - 0x08, 0xea, 0x49, 0xf0, 0x3d, 0xb5, 0x8c, 0x5c, 0xb0, 0x0d, 0xaf, 0x41, 0xe1, 0xd4, 0x76, 0xc7, - 0x3a, 0x61, 0xce, 0xca, 0xaa, 0x98, 0xd1, 0xed, 0xc9, 0xa1, 0x3c, 0xcb, 0xc4, 0x7c, 0xa2, 0x68, - 0xf0, 0x44, 0x22, 0x84, 0x53, 0x13, 0xd3, 0x32, 0x30, 0x8f, 0x67, 0x59, 0xe5, 0x93, 0xd0, 0x11, - 0xff, 0xb1, 0x7c, 0x42, 0x5f, 0xeb, 0xb1, 0xb5, 0x32, 0xff, 0x92, 0x2a, 0x66, 0xca, 0xcd, 0x20, - 0x58, 0x31, 0x24, 0xa7, 0x98, 0x47, 0xd1, 0x3f, 0x7d, 0x23, 0x7b, 0x73, 0x5d, 0xa5, 0x43, 0xe5, - 0x0f, 0x12, 0x94, 0x54, 0xec, 0x39, 0x14, 0x3d, 0x50, 0x03, 0x24, 0x7c, 0xde, 0xc7, 0x9c, 0x86, - 0xa5, 0x13, 0x69, 0x0c, 0xd7, 0x6e, 0xf9, 0x9a, 0x94, 0x43, 0x04, 0x66, 0xe8, 0x15, 0x41, 0x35, - 0x93, 0x59, 0xa3, 0x30, 0x8f, 0x72, 0xcd, 0xdb, 0x3e, 0xd7, 0xcc, 0x26, 0xd2, 0x06, 0x6e, 0x35, - 0x45, 0x36, 0x5f, 0x11, 0x64, 0x33, 0xb7, 0xe4, 0x65, 0x31, 0xb6, 0xd9, 0x8c, 0xb1, 0xcd, 0xfc, - 0x92, 0x65, 0x26, 0xd0, 0xcd, 0x66, 0x8c, 0x6e, 0x16, 0x96, 0x38, 0x49, 0xe0, 0x9b, 0xb7, 0x7d, - 0xbe, 0x59, 0x5c, 0xb2, 0xec, 0x29, 0xc2, 0x79, 0x27, 0x4e, 0x38, 0x39, 0x59, 0x7c, 0x26, 0xd1, - 0x3a, 0x91, 0x71, 0xfe, 0x28, 0xc2, 0x38, 0xa5, 0x44, 0xba, 0xc7, 0x9d, 0xcc, 0xa1, 0x9c, 0xcd, - 0x18, 0xe5, 0x84, 0x25, 0x31, 0x48, 0xe0, 0x9c, 0x6f, 0x47, 0x39, 0xe7, 0x5a, 0x22, 0x6d, 0x15, - 0x9b, 0x66, 0x1e, 0xe9, 0x7c, 0x3d, 0x20, 0x9d, 0xeb, 0x89, 0xac, 0x59, 0xac, 0x61, 0x9a, 0x75, - 0x76, 0x66, 0x58, 0x27, 0x67, 0x89, 0xcf, 0x25, 0xba, 0x58, 0x42, 0x3b, 0x3b, 0x33, 0xb4, 0xb3, - 0xb2, 0xc4, 0xe1, 0x12, 0xde, 0xf9, 0xcb, 0xf9, 0xbc, 0x33, 0x99, 0x19, 0x8a, 0x9f, 0xb9, 0x1a, - 0xf1, 0xd4, 0x12, 0x88, 0x27, 0xa7, 0x87, 0x2f, 0x24, 0xba, 0x5f, 0x99, 0x79, 0x76, 0x66, 0x98, - 0xe7, 0xc6, 0x92, 0x78, 0xac, 0x4a, 0x3d, 0x9f, 0xa7, 0x19, 0x7e, 0x0a, 0x89, 0x28, 0x4a, 0x62, - 0xd7, 0xb5, 0x5d, 0xc1, 0xea, 0xf8, 0x44, 0xb9, 0x49, 0x39, 0x47, 0x88, 0x3a, 0x0b, 0x68, 0x2a, - 0xcb, 0x46, 0x11, 0xa4, 0x51, 0xfe, 0x98, 0x0e, 0x6d, 0x59, 0x9a, 0x8e, 0xf2, 0x15, 0x49, 0xf0, - 0x95, 0x08, 0x7b, 0xcd, 0xc4, 0xd9, 0xeb, 0x16, 0xac, 0xd1, 0x2c, 0x33, 0x45, 0x4c, 0x75, 0xc7, - 0x27, 0xa6, 0xe8, 0x16, 0x6c, 0x30, 0x1a, 0xc1, 0x39, 0xae, 0x48, 0x2d, 0x39, 0x96, 0x21, 0xab, - 0xf4, 0x01, 0xdf, 0xed, 0x3c, 0xc7, 0xbc, 0x04, 0x57, 0x22, 0xba, 0x41, 0xf6, 0xe2, 0x6c, 0xac, - 0x16, 0x68, 0xef, 0x89, 0x34, 0xf6, 0x7e, 0x18, 0xa0, 0x90, 0xf4, 0x22, 0xc8, 0xf5, 0x6d, 0x03, - 0x8b, 0xdc, 0xc2, 0xc6, 0x34, 0x29, 0x8c, 0xec, 0x81, 0xc8, 0x20, 0x74, 0x48, 0xb5, 0x02, 0x58, - 0x95, 0x38, 0x6a, 0x2a, 0x7f, 0x4e, 0x87, 0xfe, 0x42, 0x1e, 0x3c, 0x8f, 0xb2, 0xa6, 0xff, 0x37, - 0x94, 0x35, 0xf3, 0xad, 0x29, 0x6b, 0x34, 0xb7, 0x67, 0xe3, 0xb9, 0xfd, 0x5f, 0xe9, 0xf0, 0x0b, - 0x07, 0x04, 0xf4, 0xdb, 0x45, 0x24, 0x4c, 0xd4, 0x79, 0xf6, 0xbd, 0x44, 0xa2, 0x16, 0x65, 0x45, - 0x81, 0xbd, 0x37, 0x5e, 0x56, 0x14, 0x79, 0xea, 0x66, 0x13, 0xf4, 0x1a, 0x48, 0xac, 0x7f, 0xa4, - 0xd9, 0x8e, 0x27, 0x10, 0xfc, 0xc9, 0xe8, 0x5a, 0x79, 0x9b, 0x68, 0xfb, 0x98, 0xea, 0x74, 0x1c, - 0x4f, 0x2d, 0x39, 0x62, 0x14, 0xe1, 0x20, 0x52, 0x8c, 0x0a, 0x5f, 0x07, 0x89, 0xfe, 0x7a, 0xcf, - 0xd1, 0xfb, 0x98, 0xa1, 0xb1, 0xa4, 0x86, 0x02, 0xe5, 0x3e, 0xa0, 0xd9, 0x7c, 0x80, 0xda, 0x50, - 0xc0, 0x67, 0xd8, 0x22, 0x9c, 0x13, 0xac, 0xed, 0x5e, 0x9b, 0xc3, 0x33, 0xb1, 0x45, 0x1a, 0x75, - 0x1a, 0xe4, 0x7f, 0x7e, 0xb3, 0x55, 0xe3, 0xda, 0x2f, 0xda, 0x63, 0x93, 0xe0, 0xb1, 0x43, 0x2e, - 0x54, 0x61, 0xaf, 0xfc, 0x3a, 0x43, 0x49, 0x5f, 0x2c, 0x57, 0xcc, 0x8d, 0xad, 0x7f, 0x80, 0x32, - 0x11, 0xc2, 0xbf, 0x5a, 0xbc, 0x37, 0x01, 0x06, 0xba, 0xa7, 0x7d, 0xaa, 0x5b, 0x04, 0x1b, 0x22, - 0xe8, 0x11, 0x09, 0x92, 0xa1, 0x44, 0x67, 0x13, 0x0f, 0x1b, 0xa2, 0xf6, 0x08, 0xe6, 0x91, 0x75, - 0x16, 0xbf, 0xdb, 0x3a, 0xe3, 0x51, 0x2e, 0x4d, 0x47, 0xf9, 0xb7, 0x99, 0xf0, 0x94, 0x84, 0xfc, - 0xf8, 0xff, 0x2f, 0x0e, 0xbf, 0x63, 0x45, 0x73, 0x3c, 0x69, 0xa3, 0x13, 0xd8, 0x08, 0x4e, 0xa9, - 0x36, 0x61, 0xa7, 0xd7, 0xdf, 0x77, 0xab, 0x1e, 0xf3, 0xda, 0x59, 0x5c, 0xec, 0xa1, 0x9f, 0xc2, - 0xe3, 0x53, 0x08, 0x14, 0xb8, 0xce, 0xac, 0x08, 0x44, 0x8f, 0xc5, 0x81, 0xc8, 0xf7, 0x1c, 0xc6, - 0x2a, 0xfb, 0x1d, 0xcf, 0xc6, 0x3e, 0xad, 0xc3, 0xa2, 0x14, 0x64, 0xee, 0xd7, 0x7f, 0x06, 0xca, - 0x2e, 0x26, 0xba, 0x69, 0x69, 0xb1, 0x4a, 0x77, 0x9d, 0x0b, 0x45, 0xfd, 0x7c, 0x0c, 0x8f, 0xcd, - 0xa5, 0x22, 0xe8, 0x07, 0x20, 0x85, 0x2c, 0x26, 0x9d, 0x50, 0x34, 0x06, 0x85, 0x50, 0xa8, 0xab, - 0xfc, 0x29, 0x1d, 0xba, 0x8c, 0x97, 0x56, 0x2d, 0x28, 0xb8, 0xd8, 0x9b, 0x8c, 0x78, 0xb1, 0x53, - 0xd9, 0x7d, 0x69, 0x35, 0x12, 0x43, 0xa5, 0x93, 0x11, 0x51, 0x85, 0xb1, 0x72, 0x1f, 0x0a, 0x5c, - 0x82, 0xd6, 0xa0, 0x78, 0xf7, 0xe8, 0xe0, 0xa8, 0xf3, 0xc1, 0x51, 0x2d, 0x85, 0x00, 0x0a, 0x7b, - 0xcd, 0x66, 0xeb, 0xb8, 0x5b, 0x4b, 0x23, 0x09, 0xf2, 0x7b, 0x8d, 0x8e, 0xda, 0xad, 0x65, 0xa8, - 0x58, 0x6d, 0xbd, 0xd7, 0x6a, 0x76, 0x6b, 0x59, 0xb4, 0x01, 0x65, 0x3e, 0xd6, 0xee, 0x74, 0xd4, - 0xf7, 0xf7, 0xba, 0xb5, 0x5c, 0x44, 0x74, 0xd2, 0x3a, 0x7a, 0xa7, 0xa5, 0xd6, 0xf2, 0xca, 0xcb, - 0xb4, 0x9a, 0x4a, 0xa0, 0x3d, 0x61, 0xdd, 0x94, 0x8e, 0xd4, 0x4d, 0xca, 0xef, 0x33, 0x20, 0x27, - 0x73, 0x19, 0xf4, 0xde, 0xd4, 0xc2, 0x77, 0x2f, 0x41, 0x84, 0xa6, 0x56, 0x8f, 0x9e, 0x85, 0x8a, - 0x8b, 0x4f, 0x31, 0xe9, 0x0f, 0x39, 0xb7, 0xe2, 0x89, 0xad, 0xac, 0x96, 0x85, 0x94, 0x19, 0x79, - 0x5c, 0xed, 0x63, 0xdc, 0x27, 0x1a, 0x2f, 0xe1, 0xf8, 0xa6, 0x93, 0xa8, 0x1a, 0x95, 0x9e, 0x70, - 0xa1, 0xf2, 0xd1, 0xa5, 0x62, 0x29, 0x41, 0x5e, 0x6d, 0x75, 0xd5, 0x9f, 0xd5, 0xb2, 0x08, 0x41, - 0x85, 0x0d, 0xb5, 0x93, 0xa3, 0xbd, 0xe3, 0x93, 0x76, 0x87, 0xc6, 0xf2, 0x0a, 0x54, 0xfd, 0x58, - 0xfa, 0xc2, 0xbc, 0xa2, 0x87, 0xbb, 0x61, 0x49, 0xed, 0x88, 0x6e, 0x43, 0x49, 0x10, 0x27, 0xff, - 0xac, 0xc9, 0xb3, 0xdd, 0x93, 0xf7, 0x85, 0x86, 0x1a, 0xe8, 0x2a, 0xff, 0x49, 0x43, 0x75, 0xea, - 0x0c, 0xa2, 0x5d, 0xc8, 0xf3, 0x12, 0x20, 0xe9, 0x8a, 0x82, 0x41, 0x88, 0x38, 0xb0, 0x5c, 0x15, - 0xbd, 0x09, 0x25, 0x2c, 0xba, 0x20, 0xf3, 0xce, 0x3a, 0x7f, 0xbf, 0xdf, 0x27, 0x11, 0xa6, 0x81, - 0x05, 0x7a, 0x0b, 0xa4, 0x00, 0x4c, 0x44, 0xdd, 0xf9, 0xf4, 0xac, 0x79, 0x00, 0x43, 0xc2, 0x3e, - 0xb4, 0x41, 0xaf, 0x87, 0xb4, 0x2f, 0x37, 0x5b, 0x78, 0x08, 0x73, 0xae, 0x20, 0x8c, 0x7d, 0x7d, - 0xa5, 0x09, 0x6b, 0x91, 0xf5, 0xa0, 0x27, 0x41, 0x1a, 0xeb, 0xe7, 0xa2, 0xbb, 0xc6, 0xfb, 0x23, - 0xa5, 0xb1, 0x7e, 0xce, 0x1b, 0x6b, 0x8f, 0x43, 0x91, 0x3e, 0x1c, 0xe8, 0x3c, 0xc8, 0x59, 0xb5, - 0x30, 0xd6, 0xcf, 0xdf, 0xd5, 0x3d, 0xe5, 0x43, 0xa8, 0xc4, 0x3b, 0x4b, 0x74, 0xb3, 0xbb, 0xf6, - 0xc4, 0x32, 0x98, 0x8f, 0xbc, 0xca, 0x27, 0xe8, 0x55, 0xc8, 0x9f, 0xd9, 0x1c, 0x0f, 0xe7, 0xa3, - 0xc2, 0x3d, 0x9b, 0xe0, 0x48, 0x67, 0x8a, 0x6b, 0x2b, 0x9f, 0x41, 0x9e, 0xe1, 0x1b, 0xc5, 0x2a, - 0xd6, 0x23, 0x12, 0x94, 0x97, 0x8e, 0xd1, 0x87, 0x00, 0x3a, 0x21, 0xae, 0xd9, 0x9b, 0x84, 0x8e, - 0xb7, 0xe6, 0xe3, 0xe3, 0x9e, 0xaf, 0xd7, 0xb8, 0x2e, 0x80, 0xf2, 0x6a, 0x68, 0x1a, 0x01, 0xcb, - 0x88, 0x43, 0xe5, 0x08, 0x2a, 0x71, 0xdb, 0x68, 0xb7, 0x76, 0x7d, 0x4e, 0xb7, 0x36, 0xa0, 0x55, - 0x01, 0x29, 0xcb, 0xf2, 0x7e, 0x20, 0x9b, 0x28, 0x9f, 0xa7, 0xa1, 0xd4, 0x3d, 0x17, 0x27, 0x27, - 0xa1, 0x15, 0x15, 0x9a, 0x66, 0xa2, 0x8d, 0x17, 0xde, 0xdb, 0xca, 0x06, 0x1d, 0xb3, 0xb7, 0x03, - 0x6c, 0xc8, 0xad, 0x5a, 0xf0, 0xfa, 0xad, 0x43, 0x81, 0x87, 0x6f, 0x80, 0x14, 0xec, 0x2a, 0x5a, - 0x3b, 0xe8, 0x86, 0xe1, 0x62, 0xcf, 0x13, 0x6b, 0xf3, 0xa7, 0xac, 0xb3, 0x69, 0x7f, 0x2a, 0x5a, - 0x3b, 0x59, 0x95, 0x4f, 0x14, 0x03, 0xaa, 0x53, 0x99, 0x11, 0xbd, 0x01, 0x45, 0x67, 0xd2, 0xd3, - 0xfc, 0xf0, 0x4c, 0x1d, 0x1e, 0x9f, 0x47, 0x4e, 0x7a, 0x23, 0xb3, 0x7f, 0x80, 0x2f, 0xfc, 0x1f, - 0xe3, 0x4c, 0x7a, 0x07, 0x3c, 0x8a, 0xfc, 0x2d, 0x99, 0xe8, 0x5b, 0xce, 0xa0, 0xe4, 0x6f, 0x0a, - 0xf4, 0xe3, 0xe8, 0x39, 0x49, 0xcf, 0x1e, 0xf3, 0x78, 0xb6, 0x16, 0xee, 0x23, 0xc7, 0xe4, 0x16, - 0x6c, 0x78, 0xe6, 0xc0, 0xc2, 0x86, 0x16, 0x56, 0x2f, 0xec, 0x6d, 0x25, 0xb5, 0xca, 0x1f, 0x1c, - 0xfa, 0xa5, 0x8b, 0xf2, 0xef, 0x34, 0x94, 0xfc, 0x03, 0x8b, 0x5e, 0x8e, 0xec, 0xbb, 0xca, 0x9c, - 0xe6, 0x8e, 0xaf, 0x18, 0x36, 0x27, 0xe3, 0xbf, 0x35, 0x73, 0xf9, 0xdf, 0x9a, 0xd4, 0x65, 0xf6, - 0xdb, 0xfd, 0xb9, 0x4b, 0xb7, 0xfb, 0x5f, 0x04, 0x44, 0x6c, 0xa2, 0x8f, 0xb4, 0x33, 0x9b, 0x98, - 0xd6, 0x40, 0xe3, 0xc1, 0xe6, 0xa4, 0xad, 0xc6, 0x9e, 0xdc, 0x63, 0x0f, 0x8e, 0x59, 0xdc, 0x7f, - 0x95, 0x86, 0x52, 0x90, 0x7e, 0x2f, 0xdb, 0x6b, 0xbc, 0x06, 0x05, 0x91, 0x61, 0x78, 0xb3, 0x51, - 0xcc, 0x82, 0xb6, 0x77, 0x2e, 0xd2, 0xf6, 0x96, 0x29, 0x74, 0x13, 0x9d, 0x71, 0x10, 0x5e, 0x40, - 0x06, 0xf3, 0x5b, 0xaf, 0xc3, 0x5a, 0xa4, 0xed, 0x4b, 0x4f, 0xde, 0x51, 0xeb, 0x83, 0x5a, 0x4a, - 0x2e, 0x7e, 0xfe, 0xe5, 0x8d, 0xec, 0x11, 0xfe, 0x94, 0xee, 0x59, 0xb5, 0xd5, 0x6c, 0xb7, 0x9a, - 0x07, 0xb5, 0xb4, 0xbc, 0xf6, 0xf9, 0x97, 0x37, 0x8a, 0x2a, 0x66, 0x3d, 0xa1, 0x5b, 0x6d, 0x58, - 0x8f, 0x7e, 0x95, 0x78, 0x92, 0x42, 0x50, 0x79, 0xe7, 0xee, 0xf1, 0xe1, 0x7e, 0x73, 0xaf, 0xdb, - 0xd2, 0xee, 0x75, 0xba, 0xad, 0x5a, 0x1a, 0x3d, 0x0e, 0x57, 0x0e, 0xf7, 0xdf, 0x6d, 0x77, 0xb5, - 0xe6, 0xe1, 0x7e, 0xeb, 0xa8, 0xab, 0xed, 0x75, 0xbb, 0x7b, 0xcd, 0x83, 0x5a, 0x66, 0xf7, 0x11, - 0x40, 0x75, 0xaf, 0xd1, 0xdc, 0xa7, 0x09, 0xd6, 0xec, 0xeb, 0xa2, 0xe7, 0x96, 0x63, 0xf5, 0xfb, - 0xc2, 0xfb, 0x6b, 0x79, 0x71, 0xcb, 0x11, 0xdd, 0x81, 0x3c, 0x2b, 0xed, 0xd1, 0xe2, 0x0b, 0x6d, - 0x79, 0x49, 0x0f, 0x92, 0xfe, 0x18, 0x76, 0x3c, 0x16, 0xde, 0x70, 0xcb, 0x8b, 0x5b, 0x92, 0x48, - 0x05, 0x29, 0xac, 0xcd, 0x97, 0xdf, 0x78, 0xcb, 0x2b, 0xb4, 0x29, 0xa9, 0xcf, 0xb0, 0xf2, 0x58, - 0x7e, 0x03, 0x2c, 0xaf, 0x00, 0x60, 0xe8, 0x10, 0x8a, 0x7e, 0x4d, 0xb7, 0xec, 0x4e, 0x5a, 0x5e, - 0xda, 0x42, 0xa4, 0x9f, 0x80, 0xd7, 0xde, 0x8b, 0x2f, 0xd8, 0xe5, 0x25, 0xfd, 0x50, 0xb4, 0x0f, - 0x05, 0x41, 0xa7, 0x97, 0xdc, 0x33, 0xcb, 0xcb, 0x5a, 0x82, 0x34, 0x68, 0x61, 0x53, 0x63, 0xf9, - 0xdf, 0x06, 0xe4, 0x15, 0x5a, 0xbd, 0xe8, 0x2e, 0x40, 0xa4, 0xd2, 0x5e, 0xe1, 0xff, 0x00, 0xf2, - 0x2a, 0x2d, 0x5c, 0xd4, 0x81, 0x52, 0x50, 0x51, 0x2d, 0xbd, 0x9d, 0x97, 0x97, 0xf7, 0x52, 0xd1, - 0x7d, 0x28, 0xc7, 0x4b, 0x89, 0xd5, 0xee, 0xdc, 0xe5, 0x15, 0x9b, 0xa4, 0xd4, 0x7f, 0xbc, 0xae, - 0x58, 0xed, 0x0e, 0x5e, 0x5e, 0xb1, 0x67, 0x8a, 0x3e, 0x86, 0x8d, 0x59, 0xde, 0xbf, 0xfa, 0x95, - 0xbc, 0x7c, 0x89, 0x2e, 0x2a, 0x1a, 0x03, 0x9a, 0x53, 0x2f, 0x5c, 0xe2, 0x86, 0x5e, 0xbe, 0x4c, - 0x53, 0x95, 0x86, 0x2e, 0x4e, 0xc2, 0x57, 0xbb, 0xb1, 0x97, 0x57, 0x6c, 0xaf, 0x36, 0x5a, 0x5f, - 0x3d, 0xdc, 0x4c, 0x7f, 0xfd, 0x70, 0x33, 0xfd, 0xf7, 0x87, 0x9b, 0xe9, 0x2f, 0x1e, 0x6d, 0xa6, - 0xbe, 0x7e, 0xb4, 0x99, 0xfa, 0xeb, 0xa3, 0xcd, 0xd4, 0xcf, 0x5f, 0x18, 0x98, 0x64, 0x38, 0xe9, - 0x6d, 0xf7, 0xed, 0xf1, 0x4e, 0xf4, 0xef, 0x49, 0xf3, 0xfe, 0x32, 0xd5, 0x2b, 0xb0, 0x44, 0xf8, - 0xca, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x83, 0x24, 0x58, 0xdc, 0x52, 0x25, 0x00, 0x00, + 0xf5, 0xd7, 0xfb, 0x71, 0x6d, 0x3d, 0x5c, 0x33, 0x0c, 0xa2, 0x19, 0xec, 0xa1, 0xe7, 0xc0, 0x7f, + 0x18, 0xc0, 0xfe, 0x63, 0x0e, 0x13, 0x08, 0x24, 0x60, 0x09, 0x0d, 0x32, 0x36, 0x96, 0xd3, 0xd6, + 0x0c, 0x79, 0x31, 0x4d, 0x49, 0x2a, 0x4b, 0xcd, 0x48, 0xdd, 0x4d, 0x77, 0xc9, 0xd8, 0x2c, 0xf3, + 0xd8, 0x90, 0x0d, 0xcb, 0x6c, 0xf8, 0x0c, 0xd9, 0xe5, 0x64, 0x95, 0x4d, 0x36, 0x9c, 0x93, 0x0d, + 0xcb, 0xac, 0x48, 0xc2, 0xec, 0xf2, 0x05, 0xb2, 0xca, 0x49, 0x4e, 0x3d, 0xfa, 0x25, 0xa9, 0x25, + 0x19, 0xb2, 0xcb, 0xae, 0xea, 0xf6, 0xbd, 0xb7, 0x55, 0xb7, 0xab, 0x7e, 0xf7, 0x77, 0x6f, 0x09, + 0x9e, 0xa4, 0xc4, 0xec, 0x13, 0x67, 0x6c, 0x98, 0x74, 0x07, 0x77, 0x7b, 0xc6, 0x0e, 0xbd, 0xb0, + 0x89, 0xbb, 0x6d, 0x3b, 0x16, 0xb5, 0x50, 0x25, 0x78, 0xb8, 0xcd, 0x1e, 0x2a, 0x4f, 0x85, 0xb4, + 0x7b, 0xce, 0x85, 0x4d, 0xad, 0x1d, 0xdb, 0xb1, 0xac, 0x53, 0xa1, 0xaf, 0x5c, 0x0f, 0x3d, 0xe6, + 0x7e, 0xc2, 0xde, 0x22, 0x4f, 0xa5, 0xf1, 0x43, 0x72, 0xe1, 0x3d, 0x7d, 0x6a, 0xc6, 0xd6, 0xc6, + 0x0e, 0x1e, 0x7b, 0x8f, 0xb7, 0x06, 0x96, 0x35, 0x18, 0x91, 0x1d, 0x3e, 0xeb, 0x4e, 0x4e, 0x77, + 0xa8, 0x31, 0x26, 0x2e, 0xc5, 0x63, 0x5b, 0x2a, 0x5c, 0x1d, 0x58, 0x03, 0x8b, 0x0f, 0x77, 0xd8, + 0x48, 0x48, 0xd5, 0xbf, 0x17, 0x20, 0xaf, 0x91, 0x8f, 0x27, 0xc4, 0xa5, 0x68, 0x17, 0x32, 0xa4, + 0x37, 0xb4, 0x6a, 0xc9, 0x1b, 0xc9, 0x5b, 0x6b, 0xbb, 0xd7, 0xb7, 0xa7, 0x16, 0xb7, 0x2d, 0xf5, + 0x9a, 0xbd, 0xa1, 0xd5, 0x4a, 0x68, 0x5c, 0x17, 0xbd, 0x02, 0xd9, 0xd3, 0xd1, 0xc4, 0x1d, 0xd6, + 0x52, 0xdc, 0xe8, 0xa9, 0x38, 0xa3, 0xbb, 0x4c, 0xa9, 0x95, 0xd0, 0x84, 0x36, 0x7b, 0x95, 0x61, + 0x9e, 0x5a, 0xb5, 0xf4, 0xe2, 0x57, 0xed, 0x9b, 0xa7, 0xfc, 0x55, 0x4c, 0x17, 0xd5, 0x01, 0x5c, + 0x42, 0x75, 0xcb, 0xa6, 0x86, 0x65, 0xd6, 0x32, 0xdc, 0xf2, 0xe9, 0x38, 0xcb, 0x13, 0x42, 0xdb, + 0x5c, 0xb1, 0x95, 0xd0, 0x8a, 0xae, 0x37, 0x61, 0x3e, 0x0c, 0xd3, 0xa0, 0x7a, 0x6f, 0x88, 0x0d, + 0xb3, 0x96, 0x5d, 0xec, 0x63, 0xdf, 0x34, 0x68, 0x83, 0x29, 0x32, 0x1f, 0x86, 0x37, 0x61, 0x4b, + 0xfe, 0x78, 0x42, 0x9c, 0x8b, 0x5a, 0x6e, 0xf1, 0x92, 0x7f, 0xc4, 0x94, 0xd8, 0x92, 0xb9, 0x36, + 0x6a, 0xc2, 0x5a, 0x97, 0x0c, 0x0c, 0x53, 0xef, 0x8e, 0xac, 0xde, 0xc3, 0x5a, 0x9e, 0x1b, 0xab, + 0x71, 0xc6, 0x75, 0xa6, 0x5a, 0x67, 0x9a, 0xad, 0x84, 0x06, 0x5d, 0x7f, 0x86, 0xde, 0x80, 0x42, + 0x6f, 0x48, 0x7a, 0x0f, 0x75, 0x7a, 0x5e, 0x2b, 0x70, 0x1f, 0x5b, 0x71, 0x3e, 0x1a, 0x4c, 0xaf, + 0x73, 0xde, 0x4a, 0x68, 0xf9, 0x9e, 0x18, 0xb2, 0xf5, 0xf7, 0xc9, 0xc8, 0x38, 0x23, 0x0e, 0xb3, + 0x2f, 0x2e, 0x5e, 0xff, 0xdb, 0x42, 0x93, 0x7b, 0x28, 0xf6, 0xbd, 0x09, 0x7a, 0x13, 0x8a, 0xc4, + 0xec, 0xcb, 0x65, 0x00, 0x77, 0x71, 0x23, 0x76, 0xaf, 0x98, 0x7d, 0x6f, 0x11, 0x05, 0x22, 0xc7, + 0xe8, 0x55, 0xc8, 0xf5, 0xac, 0xf1, 0xd8, 0xa0, 0xb5, 0x35, 0x6e, 0xbd, 0x19, 0xbb, 0x00, 0xae, + 0xd5, 0x4a, 0x68, 0x52, 0x1f, 0x1d, 0x41, 0x79, 0x64, 0xb8, 0x54, 0x77, 0x4d, 0x6c, 0xbb, 0x43, + 0x8b, 0xba, 0xb5, 0x75, 0xee, 0xe1, 0x99, 0x38, 0x0f, 0x87, 0x86, 0x4b, 0x4f, 0x3c, 0xe5, 0x56, + 0x42, 0x2b, 0x8d, 0xc2, 0x02, 0xe6, 0xcf, 0x3a, 0x3d, 0x25, 0x8e, 0xef, 0xb0, 0x56, 0x5a, 0xec, + 0xaf, 0xcd, 0xb4, 0x3d, 0x7b, 0xe6, 0xcf, 0x0a, 0x0b, 0xd0, 0xcf, 0xe0, 0xca, 0xc8, 0xc2, 0x7d, + 0xdf, 0x9d, 0xde, 0x1b, 0x4e, 0xcc, 0x87, 0xb5, 0x32, 0x77, 0xfa, 0x5c, 0xec, 0x8f, 0xb4, 0x70, + 0xdf, 0x73, 0xd1, 0x60, 0x06, 0xad, 0x84, 0xb6, 0x31, 0x9a, 0x16, 0xa2, 0x07, 0x70, 0x15, 0xdb, + 0xf6, 0xe8, 0x62, 0xda, 0x7b, 0x85, 0x7b, 0xbf, 0x1d, 0xe7, 0x7d, 0x8f, 0xd9, 0x4c, 0xbb, 0x47, + 0x78, 0x46, 0xca, 0x82, 0x61, 0x3b, 0xc4, 0x76, 0xac, 0x1e, 0x71, 0x5d, 0x9d, 0x9e, 0xbb, 0xb5, + 0xea, 0xe2, 0x60, 0x1c, 0xfb, 0xda, 0x9d, 0x73, 0x1e, 0x5c, 0x3b, 0x2c, 0xa8, 0xe7, 0x21, 0x7b, + 0x86, 0x47, 0x13, 0xa2, 0xfe, 0x1f, 0xac, 0x85, 0xa0, 0x03, 0xd5, 0x20, 0x3f, 0x26, 0xae, 0x8b, + 0x07, 0x84, 0x23, 0x4d, 0x51, 0xf3, 0xa6, 0x6a, 0x19, 0xd6, 0xc3, 0x70, 0xa1, 0x8e, 0x7d, 0x43, + 0x06, 0x04, 0xcc, 0xf0, 0x8c, 0x38, 0x2e, 0x3b, 0xfd, 0xd2, 0x50, 0x4e, 0xd1, 0x4d, 0x28, 0xf1, + 0xed, 0xa8, 0x7b, 0xcf, 0x19, 0x1a, 0x65, 0xb4, 0x75, 0x2e, 0xbc, 0x2f, 0x95, 0xb6, 0x60, 0xcd, + 0xde, 0xb5, 0x7d, 0x95, 0x34, 0x57, 0x01, 0x7b, 0xd7, 0x96, 0x0a, 0xea, 0xf7, 0xa1, 0x3a, 0x8d, + 0x1e, 0xa8, 0x0a, 0xe9, 0x87, 0xe4, 0x42, 0xbe, 0x8f, 0x0d, 0xd1, 0x55, 0xb9, 0x2c, 0xfe, 0x8e, + 0xa2, 0x26, 0xd7, 0xf8, 0xe7, 0x94, 0x6f, 0xec, 0xc3, 0x06, 0x7a, 0x15, 0x32, 0x0c, 0x85, 0x25, + 0xa0, 0x2a, 0xdb, 0x02, 0xa2, 0xb7, 0x3d, 0x88, 0xde, 0xee, 0x78, 0x10, 0x5d, 0x2f, 0x7c, 0xf9, + 0xf5, 0x56, 0xe2, 0xf3, 0xbf, 0x6e, 0x25, 0x35, 0x6e, 0x81, 0x9e, 0x60, 0xa7, 0x1c, 0x1b, 0xa6, + 0x6e, 0xf4, 0xe5, 0x7b, 0xf2, 0x7c, 0xbe, 0xdf, 0x47, 0x07, 0x50, 0xed, 0x59, 0xa6, 0x4b, 0x4c, + 0x77, 0xe2, 0xea, 0x22, 0x05, 0x48, 0x18, 0x9d, 0x3d, 0x85, 0x0d, 0x4f, 0xf1, 0x98, 0xeb, 0x69, + 0x95, 0x5e, 0x54, 0x80, 0xee, 0x02, 0x9c, 0xe1, 0x91, 0xd1, 0xc7, 0xd4, 0x72, 0xdc, 0x5a, 0xe6, + 0x46, 0x7a, 0xae, 0x9b, 0xfb, 0x9e, 0xca, 0x3d, 0xbb, 0x8f, 0x29, 0xa9, 0x67, 0xd8, 0xaf, 0xd5, + 0x42, 0x96, 0xe8, 0x59, 0xa8, 0x60, 0xdb, 0xd6, 0x5d, 0x8a, 0x29, 0xd1, 0xbb, 0x17, 0x94, 0xb8, + 0x1c, 0x5c, 0xd7, 0xb5, 0x12, 0xb6, 0xed, 0x13, 0x26, 0xad, 0x33, 0x21, 0x7a, 0x06, 0xca, 0x0c, + 0x48, 0x0d, 0x3c, 0xd2, 0x87, 0xc4, 0x18, 0x0c, 0x29, 0x07, 0xd1, 0xb4, 0x56, 0x92, 0xd2, 0x16, + 0x17, 0xaa, 0x7d, 0x7f, 0x23, 0x70, 0x10, 0x45, 0x08, 0x32, 0x7d, 0x4c, 0x31, 0x0f, 0xe4, 0xba, + 0xc6, 0xc7, 0x4c, 0x66, 0x63, 0x3a, 0x94, 0xe1, 0xe1, 0x63, 0x74, 0x0d, 0x72, 0xd2, 0x6d, 0x9a, + 0xbb, 0x95, 0x33, 0xf6, 0xcd, 0x6c, 0xc7, 0x3a, 0x23, 0x3c, 0x6b, 0x14, 0x34, 0x31, 0x51, 0x7f, + 0x95, 0x82, 0x8d, 0x19, 0xb8, 0x65, 0x7e, 0x87, 0xd8, 0x1d, 0x7a, 0xef, 0x62, 0x63, 0x74, 0x87, + 0xf9, 0xc5, 0x7d, 0xe2, 0xc8, 0x34, 0x57, 0x0b, 0x87, 0x48, 0xa4, 0xf0, 0x16, 0x7f, 0x2e, 0x43, + 0x23, 0xb5, 0x51, 0x1b, 0xaa, 0x23, 0xec, 0x52, 0x5d, 0xc0, 0x97, 0x1e, 0x4a, 0x79, 0xb3, 0xa0, + 0x7d, 0x88, 0x3d, 0xc0, 0x63, 0x9b, 0x5d, 0x3a, 0x2a, 0x8f, 0x22, 0x52, 0xa4, 0xc1, 0xd5, 0xee, + 0xc5, 0xa7, 0xd8, 0xa4, 0x86, 0x49, 0xf4, 0x99, 0x2f, 0xf7, 0xc4, 0x8c, 0xd3, 0xe6, 0x99, 0xd1, + 0x27, 0x66, 0xcf, 0xfb, 0x64, 0x57, 0x7c, 0x63, 0xff, 0x93, 0xba, 0xaa, 0x06, 0xe5, 0x68, 0xc2, + 0x40, 0x65, 0x48, 0xd1, 0x73, 0x19, 0x80, 0x14, 0x3d, 0x47, 0xff, 0x0f, 0x19, 0xb6, 0x48, 0xbe, + 0xf8, 0xf2, 0x9c, 0x6c, 0x2d, 0xed, 0x3a, 0x17, 0x36, 0xd1, 0xb8, 0xa6, 0xaa, 0xfa, 0xa7, 0xc1, + 0x4f, 0x22, 0xd3, 0x5e, 0xd5, 0xe7, 0xa0, 0x32, 0x95, 0x25, 0x42, 0xdf, 0x2f, 0x19, 0xfe, 0x7e, + 0x6a, 0x05, 0x4a, 0x91, 0x94, 0xa0, 0x5e, 0x83, 0xab, 0xf3, 0x10, 0x5e, 0x1d, 0xfa, 0xf2, 0x08, + 0x52, 0xa3, 0x57, 0xa0, 0xe0, 0x43, 0xbc, 0x38, 0x8d, 0xb3, 0xb1, 0xf2, 0x94, 0x35, 0x5f, 0x95, + 0x1d, 0x43, 0xb6, 0xad, 0xf9, 0x7e, 0x48, 0xf1, 0x1f, 0x9e, 0xc7, 0xb6, 0xdd, 0xc2, 0xee, 0x50, + 0xfd, 0x10, 0x6a, 0x71, 0xf0, 0x3d, 0xb5, 0x8c, 0x8c, 0xbf, 0x0d, 0xaf, 0x41, 0xee, 0xd4, 0x72, + 0xc6, 0x98, 0x72, 0x67, 0x25, 0x4d, 0xce, 0xd8, 0xf6, 0x14, 0x50, 0x9e, 0xe6, 0x62, 0x31, 0x51, + 0x75, 0x78, 0x22, 0x16, 0xc2, 0x99, 0x89, 0x61, 0xf6, 0x89, 0x88, 0x67, 0x49, 0x13, 0x93, 0xc0, + 0x91, 0xf8, 0xb1, 0x62, 0xc2, 0x5e, 0xeb, 0xf2, 0xb5, 0x72, 0xff, 0x45, 0x4d, 0xce, 0xd4, 0x5b, + 0x7e, 0xb0, 0x22, 0x48, 0xce, 0x30, 0x8f, 0xa1, 0x7f, 0xf2, 0x46, 0xfa, 0xd6, 0xba, 0xc6, 0x86, + 0xea, 0xef, 0x8b, 0x50, 0xd0, 0x88, 0x6b, 0x33, 0xf4, 0x40, 0x75, 0x28, 0x92, 0xf3, 0x1e, 0x11, + 0x34, 0x2c, 0x19, 0x4b, 0x63, 0x84, 0x76, 0xd3, 0xd3, 0x64, 0x1c, 0xc2, 0x37, 0x43, 0x2f, 0x4b, + 0xaa, 0x19, 0xcf, 0x1a, 0xa5, 0x79, 0x98, 0x6b, 0xde, 0xf1, 0xb8, 0x66, 0x3a, 0x96, 0x36, 0x08, + 0xab, 0x29, 0xb2, 0xf9, 0xb2, 0x24, 0x9b, 0x99, 0x25, 0x2f, 0x8b, 0xb0, 0xcd, 0x46, 0x84, 0x6d, + 0x66, 0x97, 0x2c, 0x33, 0x86, 0x6e, 0x36, 0x22, 0x74, 0x33, 0xb7, 0xc4, 0x49, 0x0c, 0xdf, 0xbc, + 0xe3, 0xf1, 0xcd, 0xfc, 0x92, 0x65, 0x4f, 0x11, 0xce, 0xbb, 0x51, 0xc2, 0x29, 0xc8, 0xe2, 0xcd, + 0x58, 0xeb, 0x58, 0xc6, 0xf9, 0x83, 0x10, 0xe3, 0x2c, 0xc6, 0xd2, 0x3d, 0xe1, 0x64, 0x0e, 0xe5, + 0x6c, 0x44, 0x28, 0x27, 0x2c, 0x89, 0x41, 0x0c, 0xe7, 0x7c, 0x2b, 0xcc, 0x39, 0xd7, 0x62, 0x69, + 0xab, 0xdc, 0x34, 0xf3, 0x48, 0xe7, 0x6b, 0x3e, 0xe9, 0x5c, 0x8f, 0x65, 0xcd, 0x72, 0x0d, 0xd3, + 0xac, 0xb3, 0x3d, 0xc3, 0x3a, 0x05, 0x4b, 0x7c, 0x36, 0xd6, 0xc5, 0x12, 0xda, 0xd9, 0x9e, 0xa1, + 0x9d, 0xe5, 0x25, 0x0e, 0x97, 0xf0, 0xce, 0x9f, 0xcf, 0xe7, 0x9d, 0xf1, 0xcc, 0x50, 0xfe, 0xcc, + 0xd5, 0x88, 0xa7, 0x1e, 0x43, 0x3c, 0x05, 0x3d, 0x7c, 0x3e, 0xd6, 0xfd, 0xca, 0xcc, 0xb3, 0x3d, + 0xc3, 0x3c, 0x37, 0x96, 0xc4, 0x63, 0x55, 0xea, 0xf9, 0x1c, 0xcb, 0xf0, 0x53, 0x48, 0xc4, 0x50, + 0x92, 0x38, 0x8e, 0xe5, 0x48, 0x56, 0x27, 0x26, 0xea, 0x2d, 0xc6, 0x39, 0x02, 0xd4, 0x59, 0x40, + 0x53, 0x79, 0x36, 0x0a, 0x21, 0x8d, 0xfa, 0x87, 0x64, 0x60, 0xcb, 0xd3, 0x74, 0x98, 0xaf, 0x14, + 0x25, 0x5f, 0x09, 0xb1, 0xd7, 0x54, 0x94, 0xbd, 0x6e, 0xc1, 0x1a, 0xcb, 0x32, 0x53, 0xc4, 0x14, + 0xdb, 0x1e, 0x31, 0x45, 0xb7, 0x61, 0x83, 0xd3, 0x08, 0xc1, 0x71, 0x65, 0x6a, 0xc9, 0xf0, 0x0c, + 0x59, 0x61, 0x0f, 0xc4, 0x6e, 0x17, 0x39, 0xe6, 0x45, 0xb8, 0x12, 0xd2, 0xf5, 0xb3, 0x97, 0x60, + 0x63, 0x55, 0x5f, 0x7b, 0x4f, 0xa6, 0xb1, 0xf7, 0x82, 0x00, 0x05, 0xa4, 0x17, 0x41, 0xa6, 0x67, + 0xf5, 0x89, 0xcc, 0x2d, 0x7c, 0xcc, 0x92, 0xc2, 0xc8, 0x1a, 0xc8, 0x0c, 0xc2, 0x86, 0x4c, 0xcb, + 0x87, 0xd5, 0xa2, 0x40, 0x4d, 0xf5, 0x4f, 0xc9, 0xc0, 0x5f, 0xc0, 0x83, 0xe7, 0x51, 0xd6, 0xe4, + 0x7f, 0x87, 0xb2, 0xa6, 0xbe, 0x35, 0x65, 0x0d, 0xe7, 0xf6, 0x74, 0x34, 0xb7, 0xff, 0x33, 0x19, + 0x7c, 0x61, 0x9f, 0x80, 0x7e, 0xbb, 0x88, 0x04, 0x89, 0x3a, 0xcb, 0xbf, 0x97, 0x4c, 0xd4, 0xb2, + 0xac, 0xc8, 0xf1, 0xf7, 0x46, 0xcb, 0x8a, 0xbc, 0x48, 0xdd, 0x7c, 0x82, 0x5e, 0x85, 0x22, 0xef, + 0x1f, 0xe9, 0x96, 0xed, 0x4a, 0x04, 0x7f, 0x32, 0xbc, 0x56, 0xd1, 0x26, 0xda, 0x3e, 0x66, 0x3a, + 0x6d, 0xdb, 0xd5, 0x0a, 0xb6, 0x1c, 0x85, 0x38, 0x48, 0x31, 0x42, 0x85, 0xaf, 0x43, 0x91, 0xfd, + 0x7a, 0xd7, 0xc6, 0x3d, 0xc2, 0xd1, 0xb8, 0xa8, 0x05, 0x02, 0xf5, 0x01, 0xa0, 0xd9, 0x7c, 0x80, + 0x5a, 0x90, 0x23, 0x67, 0xc4, 0xa4, 0x82, 0x13, 0xac, 0xed, 0x5e, 0x9b, 0xc3, 0x33, 0x89, 0x49, + 0xeb, 0x35, 0x16, 0xe4, 0x7f, 0x7c, 0xbd, 0x55, 0x15, 0xda, 0x2f, 0x58, 0x63, 0x83, 0x92, 0xb1, + 0x4d, 0x2f, 0x34, 0x69, 0xaf, 0xfe, 0x32, 0xc5, 0x48, 0x5f, 0x24, 0x57, 0xcc, 0x8d, 0xad, 0x77, + 0x80, 0x52, 0x21, 0xc2, 0xbf, 0x5a, 0xbc, 0x37, 0x01, 0x06, 0xd8, 0xd5, 0x3f, 0xc1, 0x26, 0x25, + 0x7d, 0x19, 0xf4, 0x90, 0x04, 0x29, 0x50, 0x60, 0xb3, 0x89, 0x4b, 0xfa, 0xb2, 0xf6, 0xf0, 0xe7, + 0xa1, 0x75, 0xe6, 0xbf, 0xdb, 0x3a, 0xa3, 0x51, 0x2e, 0x4c, 0x47, 0xf9, 0xd7, 0xa9, 0xe0, 0x94, + 0x04, 0xfc, 0xf8, 0x7f, 0x2f, 0x0e, 0xbf, 0xe1, 0x45, 0x73, 0x34, 0x69, 0xa3, 0x13, 0xd8, 0xf0, + 0x4f, 0xa9, 0x3e, 0xe1, 0xa7, 0xd7, 0xdb, 0x77, 0xab, 0x1e, 0xf3, 0xea, 0x59, 0x54, 0xec, 0xa2, + 0x1f, 0xc3, 0xe3, 0x53, 0x08, 0xe4, 0xbb, 0x4e, 0xad, 0x08, 0x44, 0x8f, 0x45, 0x81, 0xc8, 0xf3, + 0x1c, 0xc4, 0x2a, 0xfd, 0x1d, 0xcf, 0xc6, 0x3e, 0xab, 0xc3, 0xc2, 0x14, 0x64, 0xee, 0xd7, 0xbf, + 0x09, 0x25, 0x87, 0x50, 0x6c, 0x98, 0x7a, 0xa4, 0xd2, 0x5d, 0x17, 0x42, 0x59, 0x3f, 0x1f, 0xc3, + 0x63, 0x73, 0xa9, 0x08, 0xfa, 0x1e, 0x14, 0x03, 0x16, 0x93, 0x8c, 0x29, 0x1a, 0xfd, 0x42, 0x28, + 0xd0, 0x55, 0xff, 0x98, 0x0c, 0x5c, 0x46, 0x4b, 0xab, 0x26, 0xe4, 0x1c, 0xe2, 0x4e, 0x46, 0xa2, + 0xd8, 0x29, 0xef, 0xbe, 0xb8, 0x1a, 0x89, 0x61, 0xd2, 0xc9, 0x88, 0x6a, 0xd2, 0x58, 0x7d, 0x00, + 0x39, 0x21, 0x41, 0x6b, 0x90, 0xbf, 0x77, 0x74, 0x70, 0xd4, 0x7e, 0xff, 0xa8, 0x9a, 0x40, 0x00, + 0xb9, 0xbd, 0x46, 0xa3, 0x79, 0xdc, 0xa9, 0x26, 0x51, 0x11, 0xb2, 0x7b, 0xf5, 0xb6, 0xd6, 0xa9, + 0xa6, 0x98, 0x58, 0x6b, 0xbe, 0xdb, 0x6c, 0x74, 0xaa, 0x69, 0xb4, 0x01, 0x25, 0x31, 0xd6, 0xef, + 0xb6, 0xb5, 0xf7, 0xf6, 0x3a, 0xd5, 0x4c, 0x48, 0x74, 0xd2, 0x3c, 0x7a, 0xbb, 0xa9, 0x55, 0xb3, + 0xea, 0x4b, 0xac, 0x9a, 0x8a, 0xa1, 0x3d, 0x41, 0xdd, 0x94, 0x0c, 0xd5, 0x4d, 0xea, 0x6f, 0x53, + 0xa0, 0xc4, 0x73, 0x19, 0xf4, 0xee, 0xd4, 0xc2, 0x77, 0x2f, 0x41, 0x84, 0xa6, 0x56, 0x8f, 0x9e, + 0x81, 0xb2, 0x43, 0x4e, 0x09, 0xed, 0x0d, 0x05, 0xb7, 0x12, 0x89, 0xad, 0xa4, 0x95, 0xa4, 0x94, + 0x1b, 0xb9, 0x42, 0xed, 0x23, 0xd2, 0xa3, 0xba, 0x28, 0xe1, 0xc4, 0xa6, 0x2b, 0x32, 0x35, 0x26, + 0x3d, 0x11, 0x42, 0xf5, 0xc3, 0x4b, 0xc5, 0xb2, 0x08, 0x59, 0xad, 0xd9, 0xd1, 0x7e, 0x52, 0x4d, + 0x23, 0x04, 0x65, 0x3e, 0xd4, 0x4f, 0x8e, 0xf6, 0x8e, 0x4f, 0x5a, 0x6d, 0x16, 0xcb, 0x2b, 0x50, + 0xf1, 0x62, 0xe9, 0x09, 0xb3, 0x2a, 0x0e, 0x76, 0xc3, 0x92, 0xda, 0x11, 0xdd, 0x81, 0x82, 0x24, + 0x4e, 0xde, 0x59, 0x53, 0x66, 0xbb, 0x27, 0xef, 0x49, 0x0d, 0xcd, 0xd7, 0x55, 0xff, 0x9d, 0x84, + 0xca, 0xd4, 0x19, 0x44, 0xbb, 0x90, 0x15, 0x25, 0x40, 0xdc, 0x15, 0x05, 0x87, 0x10, 0x79, 0x60, + 0x85, 0x2a, 0x7a, 0x03, 0x0a, 0x44, 0x76, 0x41, 0xe6, 0x9d, 0x75, 0xf1, 0x7e, 0xaf, 0x4f, 0x22, + 0x4d, 0x7d, 0x0b, 0xf4, 0x26, 0x14, 0x7d, 0x30, 0x91, 0x75, 0xe7, 0xd3, 0xb3, 0xe6, 0x3e, 0x0c, + 0x49, 0xfb, 0xc0, 0x06, 0xbd, 0x16, 0xd0, 0xbe, 0xcc, 0x6c, 0xe1, 0x21, 0xcd, 0x85, 0x82, 0x34, + 0xf6, 0xf4, 0xd5, 0x06, 0xac, 0x85, 0xd6, 0x83, 0x9e, 0x84, 0xe2, 0x18, 0x9f, 0xcb, 0xee, 0x9a, + 0xe8, 0x8f, 0x14, 0xc6, 0xf8, 0x5c, 0x34, 0xd6, 0x1e, 0x87, 0x3c, 0x7b, 0x38, 0xc0, 0x22, 0xc8, + 0x69, 0x2d, 0x37, 0xc6, 0xe7, 0xef, 0x60, 0x57, 0xfd, 0x00, 0xca, 0xd1, 0xce, 0x12, 0xdb, 0xec, + 0x8e, 0x35, 0x31, 0xfb, 0xdc, 0x47, 0x56, 0x13, 0x13, 0xf4, 0x0a, 0x64, 0xcf, 0x2c, 0x81, 0x87, + 0xf3, 0x51, 0xe1, 0xbe, 0x45, 0x49, 0xa8, 0x33, 0x25, 0xb4, 0xd5, 0x4f, 0x21, 0xcb, 0xf1, 0x8d, + 0x61, 0x15, 0xef, 0x11, 0x49, 0xca, 0xcb, 0xc6, 0xe8, 0x03, 0x00, 0x4c, 0xa9, 0x63, 0x74, 0x27, + 0x81, 0xe3, 0xad, 0xf9, 0xf8, 0xb8, 0xe7, 0xe9, 0xd5, 0xaf, 0x4b, 0xa0, 0xbc, 0x1a, 0x98, 0x86, + 0xc0, 0x32, 0xe4, 0x50, 0x3d, 0x82, 0x72, 0xd4, 0x36, 0xdc, 0xad, 0x5d, 0x9f, 0xd3, 0xad, 0xf5, + 0x69, 0x95, 0x4f, 0xca, 0xd2, 0xa2, 0x1f, 0xc8, 0x27, 0xea, 0xef, 0x92, 0x50, 0xe8, 0x9c, 0xcb, + 0x93, 0x13, 0xd3, 0x8a, 0x0a, 0x4c, 0x53, 0xe1, 0xc6, 0x8b, 0xe8, 0x6d, 0xa5, 0xfd, 0x8e, 0xd9, + 0x5b, 0x3e, 0x36, 0x64, 0x56, 0x2d, 0x78, 0xbd, 0xd6, 0xa1, 0x44, 0x84, 0x9b, 0x50, 0xb2, 0x1c, + 0x63, 0x60, 0x98, 0x78, 0x14, 0x66, 0xf0, 0xeb, 0x9e, 0x90, 0x13, 0xd5, 0xd7, 0xa1, 0xe8, 0x6f, + 0x3d, 0x56, 0x60, 0xe0, 0x7e, 0xdf, 0x21, 0xae, 0x2b, 0x03, 0xe0, 0x4d, 0x79, 0xfb, 0xd3, 0xfa, + 0x44, 0xf6, 0x7f, 0xd2, 0x9a, 0x98, 0xa8, 0x7d, 0xa8, 0x4c, 0xa5, 0x4f, 0xf4, 0x3a, 0xe4, 0xed, + 0x49, 0x57, 0xf7, 0x62, 0x38, 0x75, 0xc2, 0x3c, 0xb2, 0x39, 0xe9, 0x8e, 0x8c, 0xde, 0x01, 0xb9, + 0xf0, 0x7e, 0xb1, 0x3d, 0xe9, 0x1e, 0x88, 0x50, 0x8b, 0xb7, 0xa4, 0xc2, 0x6f, 0x39, 0x83, 0x82, + 0xb7, 0x73, 0xd0, 0x0f, 0xc3, 0x87, 0x29, 0x39, 0x8b, 0x05, 0xd1, 0x94, 0x2e, 0xdd, 0x87, 0xce, + 0xd2, 0x6d, 0xd8, 0x70, 0x8d, 0x81, 0x49, 0xfa, 0x7a, 0x50, 0xe2, 0xf0, 0xb7, 0x15, 0xb4, 0x8a, + 0x78, 0x70, 0xe8, 0xd5, 0x37, 0xea, 0xbf, 0x92, 0x50, 0xf0, 0x4e, 0x35, 0x7a, 0x29, 0xb4, 0x39, + 0xcb, 0x73, 0x3a, 0x40, 0x9e, 0x62, 0xd0, 0xc1, 0x8c, 0xfe, 0xd6, 0xd4, 0xe5, 0x7f, 0x6b, 0x5c, + 0x2b, 0xda, 0xbb, 0x13, 0xc8, 0x5c, 0xfa, 0x4e, 0xe0, 0x05, 0x40, 0xd4, 0xa2, 0x78, 0xa4, 0x9f, + 0x59, 0xd4, 0x30, 0x07, 0xba, 0x08, 0xb6, 0x60, 0x76, 0x55, 0xfe, 0xe4, 0x3e, 0x7f, 0x70, 0xcc, + 0xe3, 0xfe, 0x8b, 0x24, 0x14, 0xfc, 0x1c, 0x7d, 0xd9, 0x86, 0xe4, 0x35, 0xc8, 0xc9, 0x34, 0x24, + 0x3a, 0x92, 0x72, 0xe6, 0xf7, 0xc6, 0x33, 0xa1, 0xde, 0xb8, 0xc2, 0xf0, 0x9d, 0x62, 0x4e, 0x54, + 0xc4, 0x1e, 0xf5, 0xe7, 0xb7, 0x5f, 0x83, 0xb5, 0x50, 0x6f, 0x98, 0x1d, 0xcf, 0xa3, 0xe6, 0xfb, + 0xd5, 0x84, 0x92, 0xff, 0xec, 0x8b, 0x1b, 0xe9, 0x23, 0xf2, 0x09, 0xdb, 0xb3, 0x5a, 0xb3, 0xd1, + 0x6a, 0x36, 0x0e, 0xaa, 0x49, 0x65, 0xed, 0xb3, 0x2f, 0x6e, 0xe4, 0x35, 0xc2, 0x1b, 0x47, 0xb7, + 0x5b, 0xb0, 0x1e, 0xfe, 0x2a, 0xd1, 0x4c, 0x86, 0xa0, 0xfc, 0xf6, 0xbd, 0xe3, 0xc3, 0xfd, 0xc6, + 0x5e, 0xa7, 0xa9, 0xdf, 0x6f, 0x77, 0x9a, 0xd5, 0x24, 0x7a, 0x1c, 0xae, 0x1c, 0xee, 0xbf, 0xd3, + 0xea, 0xe8, 0x8d, 0xc3, 0xfd, 0xe6, 0x51, 0x47, 0xdf, 0xeb, 0x74, 0xf6, 0x1a, 0x07, 0xd5, 0xd4, + 0xee, 0x23, 0x80, 0xca, 0x5e, 0xbd, 0xb1, 0xcf, 0xb2, 0xb0, 0xd1, 0xc3, 0xb2, 0x31, 0x97, 0xe1, + 0x45, 0xfe, 0xc2, 0x4b, 0x6e, 0x65, 0x71, 0x5f, 0x12, 0xdd, 0x85, 0x2c, 0xaf, 0xff, 0xd1, 0xe2, + 0x5b, 0x6f, 0x65, 0x49, 0xa3, 0x92, 0xfd, 0x18, 0x7e, 0x3c, 0x16, 0x5e, 0x83, 0x2b, 0x8b, 0xfb, + 0x96, 0x48, 0x83, 0x62, 0x50, 0xc0, 0x2f, 0xbf, 0x16, 0x57, 0x56, 0xe8, 0x65, 0x32, 0x9f, 0x41, + 0x79, 0xb2, 0xfc, 0x9a, 0x58, 0x59, 0x01, 0xe5, 0xd0, 0x21, 0xe4, 0xbd, 0xc2, 0x6f, 0xd9, 0xc5, + 0xb5, 0xb2, 0xb4, 0xcf, 0xc8, 0x3e, 0x81, 0x28, 0xd0, 0x17, 0xdf, 0xc2, 0x2b, 0x4b, 0x9a, 0xa6, + 0x68, 0x1f, 0x72, 0x92, 0x73, 0x2f, 0xb9, 0x8c, 0x56, 0x96, 0xf5, 0x0d, 0x59, 0xd0, 0x82, 0xce, + 0xc7, 0xf2, 0xff, 0x16, 0x28, 0x2b, 0xf4, 0x83, 0xd1, 0x3d, 0x80, 0x50, 0x39, 0xbe, 0xc2, 0x9f, + 0x06, 0x94, 0x55, 0xfa, 0xbc, 0xa8, 0x0d, 0x05, 0xbf, 0xec, 0x5a, 0x7a, 0x85, 0xaf, 0x2c, 0x6f, + 0xb8, 0xa2, 0x07, 0x50, 0x8a, 0xd6, 0x1b, 0xab, 0x5d, 0xcc, 0x2b, 0x2b, 0x76, 0x52, 0x99, 0xff, + 0x68, 0xf1, 0xb1, 0xda, 0x45, 0xbd, 0xb2, 0x62, 0x63, 0x15, 0x7d, 0x04, 0x1b, 0xb3, 0xc5, 0xc1, + 0xea, 0xf7, 0xf6, 0xca, 0x25, 0x5a, 0xad, 0x68, 0x0c, 0x68, 0x4e, 0x51, 0x71, 0x89, 0x6b, 0x7c, + 0xe5, 0x32, 0x9d, 0x57, 0x16, 0xba, 0x28, 0x53, 0x5f, 0xed, 0x5a, 0x5f, 0x59, 0xb1, 0x07, 0x5b, + 0x6f, 0x7e, 0xf9, 0xcd, 0x66, 0xf2, 0xab, 0x6f, 0x36, 0x93, 0x7f, 0xfb, 0x66, 0x33, 0xf9, 0xf9, + 0xa3, 0xcd, 0xc4, 0x57, 0x8f, 0x36, 0x13, 0x7f, 0x79, 0xb4, 0x99, 0xf8, 0xe9, 0xf3, 0x03, 0x83, + 0x0e, 0x27, 0xdd, 0xed, 0x9e, 0x35, 0xde, 0x09, 0xff, 0x87, 0x69, 0xde, 0xff, 0xaa, 0xba, 0x39, + 0x9e, 0x08, 0x5f, 0xfe, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x89, 0x25, 0x0e, 0x77, 0x25, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -6567,6 +6577,13 @@ func (m *TxResult) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.OriginalHash) > 0 { + i -= len(m.OriginalHash) + copy(dAtA[i:], m.OriginalHash) + i = encodeVarintTypes(dAtA, i, uint64(len(m.OriginalHash))) + i-- + dAtA[i] = 0x2a + } { size, err := m.Result.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -7999,6 +8016,10 @@ func (m *TxResult) Size() (n int) { } l = m.Result.Size() n += 1 + l + sovTypes(uint64(l)) + l = len(m.OriginalHash) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } return n } @@ -14280,6 +14301,40 @@ func (m *TxResult) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field OriginalHash", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.OriginalHash = append(m.OriginalHash[:0], dAtA[iNdEx:postIndex]...) + if m.OriginalHash == nil { + m.OriginalHash = []byte{} + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) diff --git a/proto/tendermint/abci/types.proto b/proto/tendermint/abci/types.proto index 17952a5369..c902922e36 100644 --- a/proto/tendermint/abci/types.proto +++ b/proto/tendermint/abci/types.proto @@ -228,7 +228,7 @@ message ResponseDeliverTx { int64 gas_wanted = 5 [json_name = "gas_wanted"]; int64 gas_used = 6 [json_name = "gas_used"]; repeated Event events = 7 - [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"]; // nondeterministic + [(gogoproto.nullable) = false, (gogoproto.jsontag) = "events,omitempty"]; // nondeterministic string codespace = 8; } @@ -334,10 +334,11 @@ message EventAttribute { // // One usage is indexing transaction results. message TxResult { - int64 height = 1; - uint32 index = 2; - bytes tx = 3; - ResponseDeliverTx result = 4 [(gogoproto.nullable) = false]; + int64 height = 1; + uint32 index = 2; + bytes tx = 3; + ResponseDeliverTx result = 4 [(gogoproto.nullable) = false]; + bytes original_hash = 5; } //---------------------------------------- diff --git a/proto/tendermint/da/data_availability_header.proto b/proto/tendermint/da/data_availability_header.proto index 4cdd00feb2..3e82c6084b 100644 --- a/proto/tendermint/da/data_availability_header.proto +++ b/proto/tendermint/da/data_availability_header.proto @@ -14,8 +14,8 @@ option go_package = "github.com/tendermint/tendermint/proto/tendermint/da"; // Note that currently we list row and column roots in separate fields // (different from the spec). message DataAvailabilityHeader { - // RowRoot_j = root((M_{j,1} || M_{j,2} || ... || M_{j,2k} )) - repeated bytes row_roots = 1; - // ColumnRoot_j = root((M_{1,j} || M_{2,j} || ... || M_{2k,j} )) - repeated bytes column_roots = 2; - } \ No newline at end of file + // RowRoot_j = root((M_{j,1} || M_{j,2} || ... || M_{j,2k} )) + repeated bytes row_roots = 1; + // ColumnRoot_j = root((M_{1,j} || M_{2,j} || ... || M_{2k,j} )) + repeated bytes column_roots = 2; +} \ No newline at end of file diff --git a/proto/tendermint/types/block.proto b/proto/tendermint/types/block.proto index bf4b35664f..d395501f5f 100644 --- a/proto/tendermint/types/block.proto +++ b/proto/tendermint/types/block.proto @@ -7,7 +7,7 @@ import "gogoproto/gogo.proto"; import "tendermint/types/types.proto"; message Block { - Header header = 1 [(gogoproto.nullable) = false]; - Data data = 2 [(gogoproto.nullable) = false]; - Commit last_commit = 4; + Header header = 1 [(gogoproto.nullable) = false]; + Data data = 2 [(gogoproto.nullable) = false]; + Commit last_commit = 4; } diff --git a/proto/tendermint/types/types.proto b/proto/tendermint/types/types.proto index 332389a192..79b5898420 100644 --- a/proto/tendermint/types/types.proto +++ b/proto/tendermint/types/types.proto @@ -89,8 +89,8 @@ message Data { repeated bytes txs = 1; IntermediateStateRoots intermediate_state_roots = 2 [(gogoproto.nullable) = false]; - EvidenceList evidence = 3 [(gogoproto.nullable) = false]; - Messages messages = 4 [(gogoproto.nullable) = false]; + EvidenceList evidence = 3 [(gogoproto.nullable) = false]; + Messages messages = 4 [(gogoproto.nullable) = false]; } // DuplicateVoteEvidence contains evidence of a validator signed two conflicting votes. @@ -170,10 +170,10 @@ message Vote { // Commit contains the evidence that a block was committed by a set of validators. message Commit { - int64 height = 1; - int32 round = 2; - BlockID block_id = 3 [(gogoproto.nullable) = false, (gogoproto.customname) = "BlockID"]; - repeated CommitSig signatures = 4 [(gogoproto.nullable) = false]; + int64 height = 1; + int32 round = 2; + BlockID block_id = 3 [(gogoproto.nullable) = false, (gogoproto.customname) = "BlockID"]; + repeated CommitSig signatures = 4 [(gogoproto.nullable) = false]; } // CommitSig is a part of the Vote included in a Commit. @@ -225,5 +225,5 @@ message TxProof { // transactions message MalleatedTx { bytes original_tx_hash = 1; - bytes tx = 2; + bytes tx = 2; } diff --git a/state/execution.go b/state/execution.go index acc59a01a3..f93065b034 100644 --- a/state/execution.go +++ b/state/execution.go @@ -548,11 +548,22 @@ func fireEvents( } for i, tx := range block.Data.Txs { + var txHash []byte + var rawTx []byte + if originalHash, malleatedTx, ismalleated := types.UnwrapMalleatedTx(tx); ismalleated { + txHash = originalHash + rawTx = malleatedTx + } else { + txHash = tx.Hash() + rawTx = tx + } + if err := eventBus.PublishEventTx(types.EventDataTx{TxResult: abci.TxResult{ - Height: block.Height, - Index: uint32(i), - Tx: tx, - Result: *(abciResponses.DeliverTxs[i]), + Height: block.Height, + Index: uint32(i), + Tx: rawTx, + Result: *(abciResponses.DeliverTxs[i]), + OriginalHash: txHash, }}); err != nil { logger.Error("failed publishing event TX", "err", err) } diff --git a/state/txindex/kv/kv.go b/state/txindex/kv/kv.go index 9ee1f9466f..fd5064ab9d 100644 --- a/state/txindex/kv/kv.go +++ b/state/txindex/kv/kv.go @@ -12,6 +12,7 @@ import ( dbm "github.com/tendermint/tm-db" abci "github.com/tendermint/tendermint/abci/types" + "github.com/tendermint/tendermint/crypto/tmhash" "github.com/tendermint/tendermint/libs/pubsub/query" "github.com/tendermint/tendermint/state/indexer" "github.com/tendermint/tendermint/state/txindex" @@ -69,26 +70,7 @@ func (txi *TxIndex) AddBatch(b *txindex.Batch) error { defer storeBatch.Close() for _, result := range b.Ops { - hash := types.Tx(result.Tx).Hash() - - // index tx by events - err := txi.indexEvents(result, hash, storeBatch) - if err != nil { - return err - } - - // index by height (always) - err = storeBatch.Set(keyForHeight(result), hash) - if err != nil { - return err - } - - rawBytes, err := proto.Marshal(result) - if err != nil { - return err - } - // index by hash (always) - err = storeBatch.Set(hash, rawBytes) + err := txi.indexResult(storeBatch, result) if err != nil { return err } @@ -105,26 +87,7 @@ func (txi *TxIndex) Index(result *abci.TxResult) error { b := txi.store.NewBatch() defer b.Close() - hash := types.Tx(result.Tx).Hash() - - // index tx by events - err := txi.indexEvents(result, hash, b) - if err != nil { - return err - } - - // index by height (always) - err = b.Set(keyForHeight(result), hash) - if err != nil { - return err - } - - rawBytes, err := proto.Marshal(result) - if err != nil { - return err - } - // index by hash (always) - err = b.Set(hash, rawBytes) + err := txi.indexResult(b, result) if err != nil { return err } @@ -158,6 +121,39 @@ func (txi *TxIndex) indexEvents(result *abci.TxResult, hash []byte, store dbm.Ba return nil } +func (txi *TxIndex) indexResult(batch dbm.Batch, result *abci.TxResult) error { + var hash []byte + if len(result.OriginalHash) == tmhash.Size { + hash = result.OriginalHash + } else { + hash = types.Tx(result.Tx).Hash() + } + + rawBytes, err := proto.Marshal(result) + if err != nil { + return err + } + + // index tx by events + err = txi.indexEvents(result, hash, batch) + if err != nil { + return err + } + + // index by height (always) + err = batch.Set(keyForHeight(result), hash) + if err != nil { + return err + } + + // index by hash (always) + err = batch.Set(hash, rawBytes) + if err != nil { + return err + } + return nil +} + // Search performs a search using the given query. // // It breaks the query into conditions (like "tx.height > 5"). For each diff --git a/state/txindex/kv/kv_test.go b/state/txindex/kv/kv_test.go index 9b15c1971c..1707d89732 100644 --- a/state/txindex/kv/kv_test.go +++ b/state/txindex/kv/kv_test.go @@ -66,6 +66,51 @@ func TestTxIndex(t *testing.T) { assert.True(t, proto.Equal(txResult2, loadedTxResult2)) } +func TestMalleatedTxIndex(t *testing.T) { + type test struct { + tx types.Tx + originalHash []byte + expectedTx []byte + } + originalTx1 := types.Tx([]byte("ORIGINAL_TX")) + malleatedTx1 := types.Tx([]byte("MALLEATED_TX")) + + tests := []test{ + // we expect to get the malleated tx returned when searching using the original hash + { + tx: malleatedTx1, + originalHash: originalTx1.Hash(), + expectedTx: malleatedTx1, + }, + } + + indexer := NewTxIndex(db.NewMemDB()) + + for i, tt := range tests { + + txResult := &abci.TxResult{ + Height: int64(i), + Index: 0, + Tx: tt.tx, + Result: abci.ResponseDeliverTx{ + Data: []byte{0}, + Code: abci.CodeTypeOK, Log: "", Events: nil, + }, + OriginalHash: tt.originalHash, + } + batch := txindex.NewBatch(1) + if err := batch.Add(txResult); err != nil { + t.Error(err) + } + err := indexer.AddBatch(batch) + require.NoError(t, err) + + loadedTxResult, err := indexer.Get(tt.originalHash) + require.NoError(t, err) + assert.Equal(t, tt.expectedTx, loadedTxResult.Tx) + } +} + func TestTxSearch(t *testing.T) { indexer := NewTxIndex(db.NewMemDB()) diff --git a/types/event_bus.go b/types/event_bus.go index 31a9332111..3235fff698 100644 --- a/types/event_bus.go +++ b/types/event_bus.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/tendermint/tendermint/abci/types" + "github.com/tendermint/tendermint/crypto/tmhash" "github.com/tendermint/tendermint/libs/log" tmpubsub "github.com/tendermint/tendermint/libs/pubsub" "github.com/tendermint/tendermint/libs/service" @@ -178,9 +179,8 @@ func (b *EventBus) PublishEventTx(data EventDataTx) error { ctx := context.Background() var txHash []byte - if originalHash, malleated, ismalleated := UnwrapMalleatedTx(data.Tx); ismalleated { - txHash = originalHash - data.Tx = malleated + if len(data.OriginalHash) == tmhash.Size { + txHash = data.OriginalHash } else { txHash = Tx(data.Tx).Hash() } diff --git a/types/event_bus_test.go b/types/event_bus_test.go index 14feb471c8..56433b621b 100644 --- a/types/event_bus_test.go +++ b/types/event_bus_test.go @@ -77,8 +77,6 @@ func TestEventBusPublishEventMalleatedTx(t *testing.T) { tx := Tx("foo") malleatedTx := Tx("foo-malleated") - wrappedMalleatedTx, err := WrapMalleatedTx(tx.Hash(), malleatedTx) - require.NoError(t, err) result := abci.ResponseDeliverTx{ Data: []byte("bar"), @@ -104,10 +102,11 @@ func TestEventBusPublishEventMalleatedTx(t *testing.T) { }() err = eventBus.PublishEventTx(EventDataTx{abci.TxResult{ - Height: 1, - Index: 0, - Tx: wrappedMalleatedTx, - Result: result, + Height: 1, + Index: 0, + Tx: malleatedTx, + Result: result, + OriginalHash: tx.Hash(), }}) assert.NoError(t, err)