diff --git a/abci/types/application.go b/abci/types/application.go index e20e680918..3739e06b2a 100644 --- a/abci/types/application.go +++ b/abci/types/application.go @@ -3,7 +3,7 @@ package types import ( "context" - "github.com/cometbft/cometbft/crypto/tmhash" + "github.com/cometbft/cometbft/crypto/merkle" ) // Application is an interface that enables any finite, deterministic state machine @@ -96,7 +96,7 @@ func (BaseApplication) ApplySnapshotChunk(req RequestApplySnapshotChunk) Respons func (BaseApplication) PrepareProposal(req RequestPrepareProposal) ResponsePrepareProposal { // we use placeholder values for the hash - req.Txs = append(req.Txs, tmhash.Sum(nil)) + req.Txs = append(req.Txs, merkle.HashFromByteSlices(req.Txs)) return ResponsePrepareProposal{Txs: req.Txs} } diff --git a/blockchain/msgs_test.go b/blockchain/msgs_test.go index 13a81240d0..1a95654946 100644 --- a/blockchain/msgs_test.go +++ b/blockchain/msgs_test.go @@ -97,7 +97,7 @@ func TestBlockchainMessageVectors(t *testing.T) { BlockRequest: &bcproto.BlockRequest{Height: math.MaxInt64}}}, "0a0a08ffffffffffffffff7f"}, {"BlockResponseMessage", &bcproto.Message{Sum: &bcproto.Message_BlockResponse{ - BlockResponse: &bcproto.BlockResponse{Block: bpb}}}, "1a93010a90010a5b0a02080b1803220b088092b8c398feffffff012a0212003a20c4da88e876062aa1543400d50d0eaa0dac88096057949cfb7bca7f3a48c04bf96a20e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855122f0a0b48656c6c6f20576f726c643220c4da88e876062aa1543400d50d0eaa0dac88096057949cfb7bca7f3a48c04bf91a00"}, + BlockResponse: &bcproto.BlockResponse{Block: bpb}}}, "1a700a6e0a5b0a02080b1803220b088092b8c398feffffff012a0212003a20c4da88e876062aa1543400d50d0eaa0dac88096057949cfb7bca7f3a48c04bf96a20e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855120d0a0b48656c6c6f20576f726c641a00"}, {"NoBlockResponseMessage", &bcproto.Message{Sum: &bcproto.Message_NoBlockResponse{ NoBlockResponse: &bcproto.NoBlockResponse{Height: 1}}}, "12020801"}, {"NoBlockResponseMessage", &bcproto.Message{Sum: &bcproto.Message_NoBlockResponse{ diff --git a/consensus/byzantine_test.go b/consensus/byzantine_test.go index 34bfce05ca..83c8eb7561 100644 --- a/consensus/byzantine_test.go +++ b/consensus/byzantine_test.go @@ -464,9 +464,9 @@ func TestByzantineConflictingProposalsWithPartition(t *testing.T) { select { case <-done: case <-tick.C: - for i, reactor := range reactors { + for i := range reactors { t.Logf(fmt.Sprintf("Consensus Reactor %v", i)) - t.Logf(fmt.Sprintf("%v", reactor)) + t.Logf(fmt.Sprintf("round state: %v", css[i].GetRoundState())) } t.Fatalf("Timed out waiting for all validators to commit first block") } diff --git a/pkg/trace/schema/consensus.go b/pkg/trace/schema/consensus.go index d141521621..5ad9a0c007 100644 --- a/pkg/trace/schema/consensus.go +++ b/pkg/trace/schema/consensus.go @@ -163,7 +163,6 @@ func WriteBlockSummary(client trace.Tracer, block *types.Block, size int) { Height: block.Height, UnixMillisecondTimestamp: block.Time.UnixMilli(), TxCount: len(block.Data.Txs), - SquareSize: block.SquareSize, BlockSize: size, Proposer: block.ProposerAddress.String(), LastCommitRound: block.LastCommit.Round, diff --git a/proto/tendermint/store/types.pb.go b/proto/tendermint/store/types.pb.go index 30a52d8987..edc2b96a77 100644 --- a/proto/tendermint/store/types.pb.go +++ b/proto/tendermint/store/types.pb.go @@ -74,6 +74,7 @@ func (m *BlockStoreState) GetHeight() int64 { return 0 } +// TxInfo describes the location of a tx inside a committed block. type TxInfo struct { Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` Index int64 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"` diff --git a/proto/tendermint/types/types.pb.go b/proto/tendermint/types/types.pb.go index 20c97dfd68..ff6a726e09 100644 --- a/proto/tendermint/types/types.pb.go +++ b/proto/tendermint/types/types.pb.go @@ -422,6 +422,8 @@ type Data struct { // This means that the block.AppHash of this block does not include these txs. // NOTE: not all txs here are valid. We're just agreeing on the order first. Txs [][]byte `protobuf:"bytes,1,rep,name=txs,proto3" json:"txs,omitempty"` + // SquareSize is the number of rows or columns in the original data square. + SquareSize uint64 `protobuf:"varint,5,opt,name=square_size,json=squareSize,proto3" json:"square_size,omitempty"` // Hash is the root of a binary Merkle tree where the leaves of the tree are // the row and column roots of an extended data square. Hash is often referred // to as the "data root". @@ -468,6 +470,13 @@ func (m *Data) GetTxs() [][]byte { return nil } +func (m *Data) GetSquareSize() uint64 { + if m != nil { + return m.SquareSize + } + return 0 +} + func (m *Data) GetHash() []byte { if m != nil { return m.Hash @@ -1513,111 +1522,111 @@ func init() { func init() { proto.RegisterFile("tendermint/types/types.proto", fileDescriptor_d3a6e55e2345de56) } var fileDescriptor_d3a6e55e2345de56 = []byte{ - // 1649 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4f, 0x6f, 0x1a, 0xdb, - 0x15, 0xf7, 0xc0, 0x00, 0xc3, 0x01, 0xec, 0xf1, 0xc8, 0x2f, 0x8f, 0x90, 0x67, 0x4c, 0xa9, 0xda, - 0xfa, 0xbd, 0x46, 0x38, 0x75, 0xaa, 0xfe, 0x59, 0x64, 0x61, 0x6c, 0x27, 0xc1, 0x31, 0x18, 0x0d, - 0xc4, 0x51, 0xab, 0x4a, 0xa3, 0x81, 0xb9, 0x86, 0x69, 0x86, 0xb9, 0xa3, 0x99, 0x8b, 0x8d, 0xf3, - 0x09, 0x2a, 0x6f, 0x9a, 0x55, 0x77, 0x5e, 0xa5, 0x8b, 0xee, 0xfb, 0x05, 0xaa, 0xae, 0xb2, 0xcc, - 0xae, 0xdd, 0x34, 0xad, 0x1c, 0xa9, 0xca, 0xc7, 0xa8, 0xee, 0x9f, 0x19, 0x06, 0x03, 0x6d, 0x14, - 0x45, 0xdd, 0x58, 0x73, 0xcf, 0xf9, 0x9d, 0x73, 0xcf, 0xdf, 0x7b, 0x0e, 0x86, 0x6f, 0x08, 0x72, - 0x2d, 0xe4, 0x8f, 0x6c, 0x97, 0xec, 0x90, 0x4b, 0x0f, 0x05, 0xfc, 0x6f, 0xcd, 0xf3, 0x31, 0xc1, - 0x9a, 0x3a, 0xe5, 0xd6, 0x18, 0xbd, 0xb4, 0x31, 0xc0, 0x03, 0xcc, 0x98, 0x3b, 0xf4, 0x8b, 0xe3, - 0x4a, 0x5b, 0x03, 0x8c, 0x07, 0x0e, 0xda, 0x61, 0xa7, 0xde, 0xf8, 0x6c, 0x87, 0xd8, 0x23, 0x14, - 0x10, 0x73, 0xe4, 0x09, 0xc0, 0x66, 0xec, 0x9a, 0xbe, 0x7f, 0xe9, 0x11, 0x4c, 0xb1, 0xf8, 0x4c, - 0xb0, 0xcb, 0x31, 0xf6, 0x39, 0xf2, 0x03, 0x1b, 0xbb, 0x71, 0x3b, 0x4a, 0x95, 0x39, 0x2b, 0xcf, - 0x4d, 0xc7, 0xb6, 0x4c, 0x82, 0x7d, 0x8e, 0xa8, 0xfe, 0x12, 0x0a, 0x6d, 0xd3, 0x27, 0x1d, 0x44, - 0x9e, 0x22, 0xd3, 0x42, 0xbe, 0xb6, 0x01, 0x29, 0x82, 0x89, 0xe9, 0x14, 0xa5, 0x8a, 0xb4, 0x5d, - 0xd0, 0xf9, 0x41, 0xd3, 0x40, 0x1e, 0x9a, 0xc1, 0xb0, 0x98, 0xa8, 0x48, 0xdb, 0x79, 0x9d, 0x7d, - 0x57, 0x87, 0x20, 0x53, 0x51, 0x2a, 0x61, 0xbb, 0x16, 0x9a, 0x84, 0x12, 0xec, 0x40, 0xa9, 0xbd, - 0x4b, 0x82, 0x02, 0x21, 0xc2, 0x0f, 0xda, 0x4f, 0x21, 0xc5, 0xec, 0x2f, 0x26, 0x2b, 0xd2, 0x76, - 0x6e, 0xb7, 0x58, 0x8b, 0x05, 0x8a, 0xfb, 0x57, 0x6b, 0x53, 0x7e, 0x5d, 0x7e, 0xfb, 0x7e, 0x6b, - 0x45, 0xe7, 0xe0, 0xaa, 0x03, 0x99, 0xba, 0x83, 0xfb, 0x2f, 0x1b, 0x07, 0x91, 0x21, 0xd2, 0xd4, - 0x10, 0xad, 0x09, 0x6b, 0x9e, 0xe9, 0x13, 0x23, 0x40, 0xc4, 0x18, 0x32, 0x2f, 0xd8, 0xa5, 0xb9, - 0xdd, 0xad, 0xda, 0xed, 0x3c, 0xd4, 0x66, 0x9c, 0x15, 0xb7, 0x14, 0xbc, 0x38, 0xb1, 0xfa, 0x6f, - 0x19, 0xd2, 0x22, 0x18, 0x8f, 0x20, 0x23, 0xc2, 0xca, 0x2e, 0xcc, 0xed, 0x6e, 0xc6, 0x35, 0x0a, - 0x56, 0x6d, 0x1f, 0xbb, 0x01, 0x72, 0x83, 0x71, 0x20, 0xf4, 0x85, 0x32, 0xda, 0x0f, 0x41, 0xe9, - 0x0f, 0x4d, 0xdb, 0x35, 0x6c, 0x8b, 0x59, 0x94, 0xad, 0xe7, 0x6e, 0xde, 0x6f, 0x65, 0xf6, 0x29, - 0xad, 0x71, 0xa0, 0x67, 0x18, 0xb3, 0x61, 0x69, 0x77, 0x20, 0x3d, 0x44, 0xf6, 0x60, 0x48, 0x58, - 0x58, 0x92, 0xba, 0x38, 0x69, 0xbf, 0x00, 0x99, 0x16, 0x44, 0x51, 0x66, 0x77, 0x97, 0x6a, 0xbc, - 0x5a, 0x6a, 0x61, 0xb5, 0xd4, 0xba, 0x61, 0xb5, 0xd4, 0x15, 0x7a, 0xf1, 0xeb, 0x7f, 0x6e, 0x49, - 0x3a, 0x93, 0xd0, 0xf6, 0xa1, 0xe0, 0x98, 0x01, 0x31, 0x7a, 0x34, 0x6c, 0xf4, 0xfa, 0x14, 0x53, - 0x71, 0x77, 0x3e, 0x20, 0x22, 0xb0, 0xc2, 0xf4, 0x1c, 0x95, 0xe2, 0x24, 0x4b, 0xdb, 0x06, 0x95, - 0x29, 0xe9, 0xe3, 0xd1, 0xc8, 0x26, 0x06, 0x8b, 0x7b, 0x9a, 0xc5, 0x7d, 0x95, 0xd2, 0xf7, 0x19, - 0xf9, 0x29, 0xcd, 0xc0, 0x3d, 0xc8, 0x5a, 0x26, 0x31, 0x39, 0x24, 0xc3, 0x20, 0x0a, 0x25, 0x30, - 0xe6, 0x8f, 0x60, 0x2d, 0xaa, 0xba, 0x80, 0x43, 0x14, 0xae, 0x65, 0x4a, 0x66, 0xc0, 0x07, 0xb0, - 0xe1, 0xa2, 0x09, 0x31, 0x6e, 0xa3, 0xb3, 0x0c, 0xad, 0x51, 0xde, 0xe9, 0xac, 0xc4, 0x0f, 0x60, - 0xb5, 0x1f, 0x06, 0x9f, 0x63, 0x81, 0x61, 0x0b, 0x11, 0x95, 0xc1, 0xee, 0x82, 0x62, 0x7a, 0x1e, - 0x07, 0xe4, 0x18, 0x20, 0x63, 0x7a, 0x1e, 0x63, 0x7d, 0x07, 0xeb, 0xcc, 0x47, 0x1f, 0x05, 0x63, - 0x87, 0x08, 0x25, 0x79, 0x86, 0x59, 0xa3, 0x0c, 0x9d, 0xd3, 0x19, 0xf6, 0xfb, 0x50, 0x40, 0xe7, - 0xb6, 0x85, 0xdc, 0x3e, 0xe2, 0xb8, 0x02, 0xc3, 0xe5, 0x43, 0x22, 0x03, 0x7d, 0x0b, 0xaa, 0xe7, - 0x63, 0x0f, 0x07, 0xc8, 0x37, 0x4c, 0xcb, 0xf2, 0x51, 0x10, 0x14, 0x57, 0xb9, 0xbe, 0x90, 0xbe, - 0xc7, 0xc9, 0xd5, 0x03, 0x90, 0x0f, 0x4c, 0x62, 0x6a, 0x2a, 0x24, 0xc9, 0x24, 0x28, 0x4a, 0x95, - 0xe4, 0x76, 0x5e, 0xa7, 0x9f, 0x51, 0x95, 0xa7, 0xa7, 0x55, 0x7e, 0x24, 0x2b, 0x09, 0x35, 0x79, - 0x24, 0x2b, 0x49, 0x55, 0x3e, 0x92, 0x15, 0x59, 0x4d, 0x1d, 0xc9, 0x4a, 0x4a, 0x4d, 0x57, 0x7f, - 0x2f, 0x81, 0x5c, 0x77, 0x70, 0x4f, 0xfb, 0x1e, 0xe4, 0x5d, 0x73, 0x84, 0x02, 0xcf, 0xec, 0x23, - 0x9a, 0x72, 0xde, 0x22, 0xb9, 0x88, 0xd6, 0xb0, 0xa8, 0x5e, 0x9a, 0x96, 0xb0, 0x8d, 0xe9, 0x37, - 0xf5, 0x2a, 0x18, 0x9a, 0x3e, 0x32, 0xc2, 0x4a, 0x4f, 0xb2, 0x36, 0xce, 0x33, 0xe2, 0xa9, 0xa8, - 0xe4, 0x1f, 0xc3, 0xfa, 0x54, 0x77, 0x08, 0x94, 0x19, 0x50, 0x8d, 0x18, 0x02, 0x5c, 0xfd, 0x98, - 0x00, 0xf9, 0x14, 0x13, 0xa4, 0x3d, 0x04, 0x99, 0x16, 0x19, 0xb3, 0x64, 0x75, 0x51, 0x37, 0x76, - 0xec, 0x81, 0x8b, 0xac, 0x66, 0x30, 0xe8, 0x5e, 0x7a, 0x48, 0x67, 0xe0, 0x58, 0x33, 0x24, 0x66, - 0x9a, 0x61, 0x03, 0x52, 0x3e, 0x1e, 0xbb, 0x16, 0xb3, 0x2f, 0xa5, 0xf3, 0x83, 0x76, 0x08, 0x4a, - 0x54, 0xe3, 0xf2, 0xff, 0xaa, 0xf1, 0x35, 0x5a, 0xe3, 0xb4, 0x03, 0x05, 0x41, 0xcf, 0xf4, 0x44, - 0xa9, 0xd7, 0x21, 0x1b, 0x3d, 0xbd, 0xa2, 0x57, 0x3e, 0xad, 0xdd, 0xa6, 0x62, 0x34, 0x46, 0x51, - 0xe5, 0x46, 0xa9, 0xe7, 0x19, 0x54, 0x23, 0x86, 0xc8, 0xfd, 0x4c, 0x53, 0x18, 0xfc, 0xf9, 0xcc, - 0x30, 0xbf, 0xa6, 0x4d, 0xd1, 0x60, 0xef, 0xe8, 0x37, 0x90, 0x0d, 0xec, 0x81, 0x6b, 0x92, 0xb1, - 0x8f, 0x44, 0xdf, 0x4c, 0x09, 0xd5, 0xbf, 0x48, 0x90, 0xe6, 0x7d, 0x18, 0x8b, 0x9b, 0xb4, 0x38, - 0x6e, 0x89, 0x65, 0x71, 0x4b, 0x7e, 0x7e, 0xdc, 0xf6, 0x00, 0x22, 0x63, 0x82, 0xa2, 0x5c, 0x49, - 0x6e, 0xe7, 0x76, 0xef, 0xcd, 0x2b, 0xe2, 0x26, 0x76, 0xec, 0x81, 0x78, 0x66, 0x62, 0x42, 0xd5, - 0x7f, 0x48, 0x90, 0x8d, 0xf8, 0xda, 0x1e, 0x14, 0x42, 0xbb, 0x8c, 0x33, 0xc7, 0x1c, 0x88, 0xda, - 0xd9, 0x5c, 0x6a, 0xdc, 0x63, 0xc7, 0x1c, 0xe8, 0x39, 0x61, 0x0f, 0x3d, 0x2c, 0xce, 0x43, 0x62, - 0x49, 0x1e, 0x66, 0x12, 0x9f, 0xfc, 0xbc, 0xc4, 0xcf, 0xa4, 0x48, 0xbe, 0x9d, 0xa2, 0x3f, 0x27, - 0x40, 0x69, 0xb3, 0xce, 0x37, 0x9d, 0xff, 0x47, 0x47, 0xdc, 0x83, 0xac, 0x87, 0x1d, 0x83, 0x73, - 0x64, 0xc6, 0x51, 0x3c, 0xec, 0xe8, 0x73, 0x69, 0x4f, 0x7d, 0xa1, 0x76, 0x49, 0x7f, 0x81, 0xa8, - 0x65, 0x6e, 0x47, 0xcd, 0x87, 0x3c, 0x0f, 0x85, 0x98, 0xc4, 0x0f, 0x68, 0x0c, 0xd8, 0x68, 0x97, - 0xe6, 0x37, 0x07, 0x6e, 0x36, 0x47, 0xea, 0x02, 0x47, 0x25, 0xf8, 0xe0, 0x12, 0xcb, 0x40, 0x71, - 0x59, 0x59, 0xea, 0x02, 0x57, 0xfd, 0x83, 0x04, 0x70, 0x4c, 0x23, 0xcb, 0xfc, 0xa5, 0x33, 0x34, - 0x60, 0x26, 0x18, 0x33, 0x37, 0x97, 0x97, 0x25, 0x4d, 0xdc, 0x9f, 0x0f, 0xe2, 0x76, 0xef, 0x43, - 0x61, 0x5a, 0x8c, 0x01, 0x0a, 0x8d, 0x59, 0xa0, 0x24, 0x1a, 0x6d, 0x1d, 0x44, 0xf4, 0xfc, 0x79, - 0xec, 0x54, 0xfd, 0xab, 0x04, 0x59, 0x66, 0x53, 0x13, 0x11, 0x73, 0x26, 0x87, 0xd2, 0xe7, 0xe7, - 0x70, 0x13, 0x80, 0xab, 0x09, 0xec, 0x57, 0x48, 0x54, 0x56, 0x96, 0x51, 0x3a, 0xf6, 0x2b, 0xa4, - 0xfd, 0x2c, 0x0a, 0x78, 0xf2, 0xbf, 0x07, 0x5c, 0xb4, 0x74, 0x18, 0xf6, 0xaf, 0x21, 0xe3, 0x8e, - 0x47, 0x06, 0x1d, 0x68, 0x32, 0xaf, 0x56, 0x77, 0x3c, 0xea, 0x4e, 0x82, 0xea, 0x6f, 0x21, 0xd3, - 0x9d, 0xb0, 0xe5, 0x8e, 0x96, 0xa8, 0x8f, 0xb1, 0xd8, 0x28, 0xf8, 0x98, 0x52, 0x28, 0x81, 0x0d, - 0xd0, 0x45, 0x33, 0xaa, 0xf6, 0x89, 0x6b, 0x63, 0xb8, 0x30, 0xfe, 0x06, 0xf2, 0xec, 0xf5, 0x7c, - 0xe1, 0x9b, 0x9e, 0x87, 0x7c, 0x6d, 0x15, 0x12, 0x64, 0x22, 0x6e, 0x4a, 0x90, 0xc9, 0x74, 0xe6, - 0xb1, 0x97, 0x97, 0x2d, 0xa9, 0xc9, 0x68, 0xe6, 0x35, 0x38, 0x8d, 0x7a, 0x42, 0xfd, 0x0c, 0x5f, - 0xc8, 0xac, 0x9e, 0xa6, 0xc7, 0x86, 0x55, 0x35, 0x20, 0x4d, 0x07, 0x6e, 0x77, 0x32, 0xa7, 0xf7, - 0x3e, 0xa4, 0x7a, 0x0e, 0xee, 0x71, 0x7d, 0xb9, 0xdd, 0x3b, 0x0b, 0xf3, 0xd2, 0xd3, 0x39, 0x68, - 0xf9, 0x05, 0x1f, 0x25, 0x80, 0x0e, 0x35, 0x85, 0x87, 0x2b, 0x8c, 0x08, 0x5f, 0x10, 0x78, 0x44, - 0x1e, 0x01, 0x37, 0xd6, 0x60, 0x0e, 0x87, 0x17, 0x96, 0xe6, 0x2f, 0x6c, 0x35, 0xbb, 0x3c, 0x34, - 0xb9, 0x20, 0xd2, 0x18, 0xcc, 0xed, 0x0a, 0xc9, 0xf9, 0x5d, 0xe1, 0xe7, 0x34, 0x49, 0x17, 0x5c, - 0x7f, 0xb4, 0x81, 0xce, 0xa9, 0xd7, 0xf1, 0x05, 0x57, 0xaf, 0xf8, 0xe2, 0x6b, 0xf1, 0xae, 0x90, - 0x5a, 0xb2, 0x2b, 0xbc, 0x91, 0x40, 0x09, 0x75, 0xf0, 0xba, 0xb8, 0x30, 0x68, 0x29, 0x84, 0xeb, - 0x10, 0x55, 0xab, 0xd3, 0x33, 0xed, 0xe7, 0x19, 0x5f, 0x97, 0x17, 0x81, 0xc0, 0xd1, 0xb8, 0x51, - 0x55, 0xc2, 0x39, 0xf6, 0x4d, 0xaf, 0x08, 0x08, 0xfd, 0xb1, 0xe0, 0xe3, 0x0b, 0xb1, 0xc0, 0x28, - 0x8c, 0xa0, 0xe3, 0x0b, 0x9a, 0x10, 0xe4, 0x5a, 0x8c, 0xc5, 0xed, 0x4d, 0x23, 0xd7, 0xd2, 0xf1, - 0x45, 0x15, 0x81, 0x12, 0xc6, 0x91, 0xbe, 0xba, 0x4c, 0x80, 0xa5, 0x3d, 0xa5, 0xf3, 0x03, 0xdd, - 0xe1, 0x50, 0x34, 0x63, 0xe9, 0x27, 0xc5, 0xb9, 0xd8, 0x42, 0x41, 0x31, 0xc9, 0x1c, 0xe1, 0x07, - 0x7a, 0xbf, 0x83, 0xcc, 0x33, 0x5e, 0xfa, 0x7c, 0x56, 0x28, 0x94, 0x40, 0x4b, 0xff, 0xbb, 0xbf, - 0x49, 0x90, 0x8b, 0x8d, 0x35, 0xed, 0x27, 0xf0, 0x55, 0xfd, 0xf8, 0x64, 0xff, 0x99, 0xd1, 0x38, - 0x30, 0x1e, 0x1f, 0xef, 0x3d, 0x31, 0x9e, 0xb7, 0x9e, 0xb5, 0x4e, 0x5e, 0xb4, 0xd4, 0x95, 0xd2, - 0x9d, 0xab, 0xeb, 0x8a, 0x16, 0xc3, 0x3e, 0x77, 0x5f, 0xba, 0xf8, 0xc2, 0xd5, 0x76, 0x60, 0x63, - 0x56, 0x64, 0xaf, 0xde, 0x39, 0x6c, 0x75, 0x55, 0xa9, 0xf4, 0xd5, 0xd5, 0x75, 0x65, 0x3d, 0x26, - 0xb1, 0xd7, 0x0b, 0x90, 0x4b, 0xe6, 0x05, 0xf6, 0x4f, 0x9a, 0xcd, 0x46, 0x57, 0x4d, 0xcc, 0x09, - 0x88, 0x3d, 0xe3, 0x5b, 0x58, 0x9f, 0x15, 0x68, 0x35, 0x8e, 0xd5, 0x64, 0x49, 0xbb, 0xba, 0xae, - 0xac, 0xc6, 0xd0, 0x2d, 0xdb, 0x29, 0x29, 0xbf, 0x7b, 0x53, 0x5e, 0xf9, 0xd3, 0x1f, 0xcb, 0x12, - 0xf5, 0xac, 0x30, 0x33, 0xda, 0xb4, 0xfb, 0xf0, 0x75, 0xa7, 0xf1, 0xa4, 0x75, 0x78, 0x60, 0x34, - 0x3b, 0x4f, 0x8c, 0xee, 0xaf, 0xda, 0x87, 0x31, 0xef, 0xd6, 0xae, 0xae, 0x2b, 0x39, 0xe1, 0xd2, - 0x32, 0x74, 0x5b, 0x3f, 0x3c, 0x3d, 0xe9, 0x1e, 0xaa, 0x12, 0x47, 0xb7, 0x7d, 0x74, 0x8e, 0x09, - 0x62, 0xe8, 0x07, 0x70, 0x77, 0x01, 0x3a, 0x72, 0x6c, 0xfd, 0xea, 0xba, 0x52, 0x68, 0xfb, 0x88, - 0x3f, 0xfb, 0x4c, 0xa2, 0x06, 0xc5, 0x79, 0x89, 0x93, 0xf6, 0x49, 0x67, 0xef, 0x58, 0xad, 0x94, - 0xd4, 0xab, 0xeb, 0x4a, 0x3e, 0x9c, 0xe1, 0x14, 0x3f, 0xf5, 0xac, 0xde, 0x7c, 0x7b, 0x53, 0x96, - 0xde, 0xdd, 0x94, 0xa5, 0x7f, 0xdd, 0x94, 0xa5, 0xd7, 0x1f, 0xca, 0x2b, 0xef, 0x3e, 0x94, 0x57, - 0xfe, 0xfe, 0xa1, 0xbc, 0xf2, 0xeb, 0x87, 0x03, 0x9b, 0x0c, 0xc7, 0xbd, 0x5a, 0x1f, 0x8f, 0x76, - 0xfa, 0x78, 0x84, 0x48, 0xef, 0x8c, 0x4c, 0x3f, 0xf8, 0xff, 0x02, 0x6e, 0xff, 0x3e, 0xef, 0xa5, - 0x19, 0xfd, 0xe1, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x05, 0x6d, 0xaf, 0x7f, 0x60, 0x10, 0x00, - 0x00, + // 1663 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4f, 0x6f, 0xe3, 0xc6, + 0x15, 0x37, 0x25, 0x4a, 0xa2, 0x9e, 0x24, 0x5b, 0x26, 0x9c, 0x8d, 0x56, 0x9b, 0x95, 0x55, 0x15, + 0x6d, 0x9d, 0x34, 0x90, 0xb7, 0xde, 0xa2, 0x7f, 0x0e, 0x39, 0x58, 0xb6, 0xb3, 0xd1, 0xc6, 0xff, + 0x40, 0x29, 0x1b, 0xb4, 0x28, 0x40, 0x50, 0xe2, 0x58, 0x62, 0x43, 0x71, 0x58, 0xce, 0xc8, 0xf6, + 0xe6, 0x13, 0x14, 0xbe, 0x34, 0xa7, 0xde, 0x7c, 0x4a, 0x0f, 0xbd, 0xf7, 0x0b, 0x14, 0x3d, 0xe5, + 0x98, 0x5b, 0x7b, 0x69, 0x5a, 0x78, 0x81, 0x22, 0x1f, 0xa3, 0x98, 0x37, 0x43, 0x8a, 0xb2, 0xa4, + 0x36, 0x58, 0x04, 0xb9, 0x18, 0x9c, 0xf7, 0x7e, 0xef, 0xcd, 0xfb, 0x3b, 0xef, 0xc9, 0xf0, 0x16, + 0x27, 0x81, 0x4b, 0xa2, 0x89, 0x17, 0xf0, 0x5d, 0xfe, 0x32, 0x24, 0x4c, 0xfe, 0x6d, 0x87, 0x11, + 0xe5, 0xd4, 0xac, 0xce, 0xb8, 0x6d, 0xa4, 0xd7, 0xb7, 0x46, 0x74, 0x44, 0x91, 0xb9, 0x2b, 0xbe, + 0x24, 0xae, 0xbe, 0x3d, 0xa2, 0x74, 0xe4, 0x93, 0x5d, 0x3c, 0x0d, 0xa6, 0x17, 0xbb, 0xdc, 0x9b, + 0x10, 0xc6, 0x9d, 0x49, 0xa8, 0x00, 0x8f, 0x53, 0xd7, 0x0c, 0xa3, 0x97, 0x21, 0xa7, 0x02, 0x4b, + 0x2f, 0x14, 0xbb, 0x91, 0x62, 0x5f, 0x92, 0x88, 0x79, 0x34, 0x48, 0xdb, 0x51, 0x6f, 0x2e, 0x58, + 0x79, 0xe9, 0xf8, 0x9e, 0xeb, 0x70, 0x1a, 0x49, 0x44, 0xeb, 0x97, 0x50, 0x39, 0x77, 0x22, 0xde, + 0x23, 0xfc, 0x03, 0xe2, 0xb8, 0x24, 0x32, 0xb7, 0x20, 0xc7, 0x29, 0x77, 0xfc, 0x9a, 0xd6, 0xd4, + 0x76, 0x2a, 0x96, 0x3c, 0x98, 0x26, 0xe8, 0x63, 0x87, 0x8d, 0x6b, 0x99, 0xa6, 0xb6, 0x53, 0xb6, + 0xf0, 0xbb, 0x35, 0x06, 0x5d, 0x88, 0x0a, 0x09, 0x2f, 0x70, 0xc9, 0x75, 0x2c, 0x81, 0x07, 0x41, + 0x1d, 0xbc, 0xe4, 0x84, 0x29, 0x11, 0x79, 0x30, 0x7f, 0x0a, 0x39, 0xb4, 0xbf, 0x96, 0x6d, 0x6a, + 0x3b, 0xa5, 0xbd, 0x5a, 0x3b, 0x15, 0x28, 0xe9, 0x5f, 0xfb, 0x5c, 0xf0, 0x3b, 0xfa, 0x17, 0x5f, + 0x6d, 0xaf, 0x59, 0x12, 0xdc, 0xf2, 0xa1, 0xd0, 0xf1, 0xe9, 0xf0, 0x93, 0xee, 0x61, 0x62, 0x88, + 0x36, 0x33, 0xc4, 0x3c, 0x81, 0x8d, 0xd0, 0x89, 0xb8, 0xcd, 0x08, 0xb7, 0xc7, 0xe8, 0x05, 0x5e, + 0x5a, 0xda, 0xdb, 0x6e, 0xdf, 0xcf, 0x43, 0x7b, 0xce, 0x59, 0x75, 0x4b, 0x25, 0x4c, 0x13, 0x5b, + 0xff, 0xd1, 0x21, 0xaf, 0x82, 0xf1, 0x1e, 0x14, 0x54, 0x58, 0xf1, 0xc2, 0xd2, 0xde, 0xe3, 0xb4, + 0x46, 0xc5, 0x6a, 0x1f, 0xd0, 0x80, 0x91, 0x80, 0x4d, 0x99, 0xd2, 0x17, 0xcb, 0x98, 0x3f, 0x04, + 0x63, 0x38, 0x76, 0xbc, 0xc0, 0xf6, 0x5c, 0xb4, 0xa8, 0xd8, 0x29, 0xdd, 0x7d, 0xb5, 0x5d, 0x38, + 0x10, 0xb4, 0xee, 0xa1, 0x55, 0x40, 0x66, 0xd7, 0x35, 0x1f, 0x40, 0x7e, 0x4c, 0xbc, 0xd1, 0x98, + 0x63, 0x58, 0xb2, 0x96, 0x3a, 0x99, 0xbf, 0x00, 0x5d, 0x14, 0x44, 0x4d, 0xc7, 0xbb, 0xeb, 0x6d, + 0x59, 0x2d, 0xed, 0xb8, 0x5a, 0xda, 0xfd, 0xb8, 0x5a, 0x3a, 0x86, 0xb8, 0xf8, 0xb3, 0x7f, 0x6d, + 0x6b, 0x16, 0x4a, 0x98, 0x07, 0x50, 0xf1, 0x1d, 0xc6, 0xed, 0x81, 0x08, 0x9b, 0xb8, 0x3e, 0x87, + 0x2a, 0x1e, 0x2e, 0x06, 0x44, 0x05, 0x56, 0x99, 0x5e, 0x12, 0x52, 0x92, 0xe4, 0x9a, 0x3b, 0x50, + 0x45, 0x25, 0x43, 0x3a, 0x99, 0x78, 0xdc, 0xc6, 0xb8, 0xe7, 0x31, 0xee, 0xeb, 0x82, 0x7e, 0x80, + 0xe4, 0x0f, 0x44, 0x06, 0x1e, 0x41, 0xd1, 0x75, 0xb8, 0x23, 0x21, 0x05, 0x84, 0x18, 0x82, 0x80, + 0xcc, 0x1f, 0xc1, 0x46, 0x52, 0x75, 0x4c, 0x42, 0x0c, 0xa9, 0x65, 0x46, 0x46, 0xe0, 0x13, 0xd8, + 0x0a, 0xc8, 0x35, 0xb7, 0xef, 0xa3, 0x8b, 0x88, 0x36, 0x05, 0xef, 0xc5, 0xbc, 0xc4, 0x0f, 0x60, + 0x7d, 0x18, 0x07, 0x5f, 0x62, 0x01, 0xb1, 0x95, 0x84, 0x8a, 0xb0, 0x87, 0x60, 0x38, 0x61, 0x28, + 0x01, 0x25, 0x04, 0x14, 0x9c, 0x30, 0x44, 0xd6, 0x3b, 0xb0, 0x89, 0x3e, 0x46, 0x84, 0x4d, 0x7d, + 0xae, 0x94, 0x94, 0x11, 0xb3, 0x21, 0x18, 0x96, 0xa4, 0x23, 0xf6, 0xfb, 0x50, 0x21, 0x97, 0x9e, + 0x4b, 0x82, 0x21, 0x91, 0xb8, 0x0a, 0xe2, 0xca, 0x31, 0x11, 0x41, 0x6f, 0x43, 0x35, 0x8c, 0x68, + 0x48, 0x19, 0x89, 0x6c, 0xc7, 0x75, 0x23, 0xc2, 0x58, 0x6d, 0x5d, 0xea, 0x8b, 0xe9, 0xfb, 0x92, + 0xdc, 0xb2, 0x41, 0x3f, 0x74, 0xb8, 0x63, 0x56, 0x21, 0xcb, 0xaf, 0x59, 0x4d, 0x6b, 0x66, 0x77, + 0xca, 0x96, 0xf8, 0x34, 0xb7, 0xa1, 0xc4, 0x7e, 0x37, 0x75, 0x22, 0x62, 0x33, 0xef, 0x53, 0x82, + 0xc9, 0xd3, 0x2d, 0x90, 0xa4, 0x9e, 0xf7, 0x29, 0x49, 0xda, 0x20, 0x3f, 0x6b, 0x83, 0xe7, 0xba, + 0x91, 0xa9, 0x66, 0x9f, 0xeb, 0x46, 0xb6, 0xaa, 0x3f, 0xd7, 0x0d, 0xbd, 0x9a, 0x6b, 0xfd, 0x41, + 0x03, 0xbd, 0xe3, 0xd3, 0x81, 0xf9, 0x3d, 0x28, 0x07, 0xce, 0x84, 0xb0, 0xd0, 0x19, 0x12, 0x51, + 0x0d, 0xb2, 0x7b, 0x4a, 0x09, 0xad, 0xeb, 0x0a, 0x8d, 0x22, 0x63, 0x71, 0x87, 0x8b, 0x6f, 0xe1, + 0x30, 0x1b, 0x0b, 0x2b, 0xe2, 0x26, 0xc8, 0x62, 0x87, 0x97, 0x91, 0xf8, 0x42, 0x15, 0xf9, 0x8f, + 0x61, 0x73, 0xa6, 0x3b, 0x06, 0xea, 0x08, 0xac, 0x26, 0x0c, 0x05, 0x6e, 0x7d, 0x9d, 0x01, 0xfd, + 0x05, 0xe5, 0xc4, 0x7c, 0x0a, 0xba, 0xa8, 0x3f, 0xb4, 0x64, 0x7d, 0x59, 0xa3, 0xf6, 0xbc, 0x51, + 0x40, 0xdc, 0x13, 0x36, 0xea, 0xbf, 0x0c, 0x89, 0x85, 0xe0, 0x54, 0x9f, 0x64, 0xe6, 0xfa, 0x64, + 0x0b, 0x72, 0x11, 0x9d, 0x06, 0x2e, 0xda, 0x97, 0xb3, 0xe4, 0xc1, 0x3c, 0x02, 0x23, 0x29, 0x7f, + 0xfd, 0xff, 0x95, 0xff, 0x86, 0x28, 0x7f, 0xd1, 0x9c, 0x8a, 0x60, 0x15, 0x06, 0xaa, 0x0b, 0x3a, + 0x50, 0x4c, 0x5e, 0x65, 0xd5, 0x46, 0xdf, 0xac, 0x13, 0x67, 0x62, 0x22, 0x46, 0x49, 0x51, 0x27, + 0x55, 0x21, 0x73, 0x57, 0x4d, 0x18, 0xaa, 0x2c, 0xe6, 0xfa, 0xc5, 0x96, 0x2f, 0x6b, 0x01, 0xfd, + 0x9a, 0xf5, 0x4b, 0x17, 0x9f, 0xd8, 0xb7, 0xa0, 0xc8, 0xbc, 0x51, 0xe0, 0xf0, 0x69, 0x44, 0x54, + 0x4b, 0xcd, 0x08, 0xad, 0xbf, 0x6a, 0x90, 0x97, 0x2d, 0x9a, 0x8a, 0x9b, 0xb6, 0x3c, 0x6e, 0x99, + 0x55, 0x71, 0xcb, 0xbe, 0x7e, 0xdc, 0xf6, 0x01, 0x12, 0x63, 0x58, 0x4d, 0x6f, 0x66, 0x77, 0x4a, + 0x7b, 0x8f, 0x16, 0x15, 0x49, 0x13, 0x7b, 0xde, 0x48, 0xbd, 0x40, 0x29, 0xa1, 0xd6, 0x3f, 0x35, + 0x28, 0x26, 0x7c, 0x73, 0x1f, 0x2a, 0xb1, 0x5d, 0xf6, 0x85, 0xef, 0x8c, 0x54, 0xed, 0x3c, 0x5e, + 0x69, 0xdc, 0xfb, 0xbe, 0x33, 0xb2, 0x4a, 0xca, 0x1e, 0x71, 0x58, 0x9e, 0x87, 0xcc, 0x8a, 0x3c, + 0xcc, 0x25, 0x3e, 0xfb, 0x7a, 0x89, 0x9f, 0x4b, 0x91, 0x7e, 0x3f, 0x45, 0x7f, 0xc9, 0x80, 0x71, + 0x8e, 0x8f, 0x82, 0xe3, 0x7f, 0x17, 0x1d, 0xf1, 0x08, 0x8a, 0x21, 0xf5, 0x6d, 0xc9, 0xd1, 0x91, + 0x63, 0x84, 0xd4, 0xb7, 0x16, 0xd2, 0x9e, 0xfb, 0x96, 0xda, 0x25, 0xff, 0x2d, 0x44, 0xad, 0x70, + 0x3f, 0x6a, 0x11, 0x94, 0x65, 0x28, 0xd4, 0x90, 0x7e, 0x22, 0x62, 0x80, 0x53, 0x5f, 0x5b, 0x5c, + 0x2a, 0xa4, 0xd9, 0x12, 0x69, 0x29, 0x9c, 0x90, 0x90, 0x33, 0x4d, 0xed, 0x09, 0xb5, 0x55, 0x65, + 0x69, 0x29, 0x5c, 0xeb, 0x8f, 0x1a, 0xc0, 0xb1, 0x88, 0x2c, 0xfa, 0x2b, 0xc6, 0x2b, 0x43, 0x13, + 0xec, 0xb9, 0x9b, 0x1b, 0xab, 0x92, 0xa6, 0xee, 0x2f, 0xb3, 0xb4, 0xdd, 0x07, 0x50, 0x99, 0x15, + 0x23, 0x23, 0xb1, 0x31, 0x4b, 0x94, 0x24, 0x53, 0xaf, 0x47, 0xb8, 0x55, 0xbe, 0x4c, 0x9d, 0x5a, + 0x7f, 0xd3, 0xa0, 0x88, 0x36, 0x9d, 0x10, 0xee, 0xcc, 0xe5, 0x50, 0x7b, 0xfd, 0x1c, 0x3e, 0x06, + 0x90, 0x6a, 0x70, 0xfa, 0xc8, 0xca, 0x2a, 0x22, 0x05, 0x87, 0xcf, 0xcf, 0x92, 0x80, 0x67, 0xff, + 0x77, 0xc0, 0x55, 0x4b, 0xc7, 0x61, 0x7f, 0x13, 0x0a, 0xc1, 0x74, 0x62, 0x8b, 0x59, 0xa7, 0xcb, + 0x6a, 0x0d, 0xa6, 0x93, 0xfe, 0x35, 0x6b, 0xfd, 0x16, 0x0a, 0xfd, 0x6b, 0xdc, 0xfb, 0x44, 0x89, + 0x46, 0x94, 0xaa, 0x65, 0x43, 0x8e, 0x29, 0x43, 0x10, 0x70, 0xb6, 0x2e, 0x9b, 0x51, 0xed, 0x6f, + 0xb8, 0x51, 0xc6, 0xbb, 0xe4, 0x6f, 0xa0, 0x8c, 0xaf, 0xe7, 0xc7, 0x91, 0x13, 0x86, 0x24, 0x32, + 0xd7, 0x21, 0xc3, 0xaf, 0xd5, 0x4d, 0x19, 0x7e, 0x3d, 0x9b, 0x79, 0xf8, 0xf2, 0xe2, 0xfe, 0x9a, + 0x4d, 0x66, 0x5e, 0x57, 0xd2, 0x84, 0x27, 0xc2, 0xcf, 0xf8, 0x85, 0x2c, 0x5a, 0x79, 0x71, 0xec, + 0xba, 0x2d, 0x1b, 0xf2, 0x62, 0xe0, 0xf6, 0xaf, 0x17, 0xf4, 0xbe, 0x0b, 0xb9, 0x81, 0x4f, 0x07, + 0x52, 0x5f, 0x69, 0xef, 0xc1, 0xd2, 0xbc, 0x0c, 0x2c, 0x09, 0x5a, 0x7d, 0xc1, 0xd7, 0x1a, 0x40, + 0x4f, 0x98, 0x22, 0xc3, 0x15, 0x47, 0x44, 0xee, 0x0e, 0x32, 0x22, 0xef, 0x81, 0x34, 0xd6, 0x46, + 0x87, 0xe3, 0x0b, 0xeb, 0x8b, 0x17, 0x9e, 0x9e, 0xf4, 0x65, 0x68, 0x4a, 0x2c, 0xd1, 0xc8, 0x16, + 0x76, 0x85, 0xec, 0xe2, 0xae, 0xf0, 0x73, 0x91, 0xa4, 0x2b, 0xa9, 0x3f, 0x59, 0x4e, 0x17, 0xd4, + 0x5b, 0xf4, 0x4a, 0xaa, 0x37, 0x22, 0xf5, 0xb5, 0x7c, 0x57, 0xc8, 0xad, 0xd8, 0x15, 0x3e, 0xd7, + 0xc0, 0x88, 0x75, 0xc8, 0xba, 0xb8, 0xb2, 0x45, 0x29, 0xc4, 0x9b, 0x92, 0x50, 0x6b, 0x89, 0xb3, + 0xe8, 0xe7, 0x39, 0x5f, 0x57, 0x17, 0x81, 0xc2, 0x89, 0xb8, 0x09, 0x55, 0xca, 0x39, 0xfc, 0x16, + 0x57, 0x30, 0x2e, 0x7e, 0x47, 0x44, 0xf4, 0x4a, 0x2d, 0x30, 0x06, 0x12, 0x2c, 0x7a, 0x25, 0x12, + 0x42, 0x02, 0x17, 0x59, 0xd2, 0xde, 0x3c, 0x09, 0x5c, 0x8b, 0x5e, 0xb5, 0x08, 0x18, 0x71, 0x1c, + 0xc5, 0xab, 0x8b, 0x02, 0x98, 0xf6, 0x9c, 0x25, 0x0f, 0x62, 0xbd, 0x23, 0xc9, 0x8c, 0x15, 0x9f, + 0x02, 0x17, 0x50, 0x97, 0xb0, 0x5a, 0x16, 0x1d, 0x91, 0x07, 0x71, 0xbf, 0x4f, 0x9c, 0x0b, 0x59, + 0xfa, 0x72, 0x56, 0x18, 0x82, 0x20, 0x4a, 0xff, 0x9d, 0xbf, 0x6b, 0x50, 0x4a, 0x8d, 0x35, 0xf3, + 0x27, 0xf0, 0x46, 0xe7, 0xf8, 0xec, 0xe0, 0x43, 0xbb, 0x7b, 0x68, 0xbf, 0x7f, 0xbc, 0xff, 0xcc, + 0xfe, 0xe8, 0xf4, 0xc3, 0xd3, 0xb3, 0x8f, 0x4f, 0xab, 0x6b, 0xf5, 0x07, 0x37, 0xb7, 0x4d, 0x33, + 0x85, 0xfd, 0x28, 0xf8, 0x24, 0xa0, 0x57, 0x81, 0xb9, 0x0b, 0x5b, 0xf3, 0x22, 0xfb, 0x9d, 0xde, + 0xd1, 0x69, 0xbf, 0xaa, 0xd5, 0xdf, 0xb8, 0xb9, 0x6d, 0x6e, 0xa6, 0x24, 0xf6, 0x07, 0x8c, 0x04, + 0x7c, 0x51, 0xe0, 0xe0, 0xec, 0xe4, 0xa4, 0xdb, 0xaf, 0x66, 0x16, 0x04, 0xd4, 0x9e, 0xf1, 0x36, + 0x6c, 0xce, 0x0b, 0x9c, 0x76, 0x8f, 0xab, 0xd9, 0xba, 0x79, 0x73, 0xdb, 0x5c, 0x4f, 0xa1, 0x4f, + 0x3d, 0xbf, 0x6e, 0xfc, 0xfe, 0xf3, 0xc6, 0xda, 0x9f, 0xff, 0xd4, 0xd0, 0x84, 0x67, 0x95, 0xb9, + 0xd1, 0x66, 0xbe, 0x0b, 0x6f, 0xf6, 0xba, 0xcf, 0x4e, 0x8f, 0x0e, 0xed, 0x93, 0xde, 0x33, 0xbb, + 0xff, 0xab, 0xf3, 0xa3, 0x94, 0x77, 0x1b, 0x37, 0xb7, 0xcd, 0x92, 0x72, 0x69, 0x15, 0xfa, 0xdc, + 0x3a, 0x7a, 0x71, 0xd6, 0x3f, 0xaa, 0x6a, 0x12, 0x7d, 0x1e, 0x91, 0x4b, 0xca, 0x09, 0xa2, 0x9f, + 0xc0, 0xc3, 0x25, 0xe8, 0xc4, 0xb1, 0xcd, 0x9b, 0xdb, 0x66, 0xe5, 0x3c, 0x22, 0xf2, 0xd9, 0x47, + 0x89, 0x36, 0xd4, 0x16, 0x25, 0xce, 0xce, 0xcf, 0x7a, 0xfb, 0xc7, 0xd5, 0x66, 0xbd, 0x7a, 0x73, + 0xdb, 0x2c, 0xc7, 0x33, 0x5c, 0xe0, 0x67, 0x9e, 0x75, 0x4e, 0xbe, 0xb8, 0x6b, 0x68, 0x5f, 0xde, + 0x35, 0xb4, 0x7f, 0xdf, 0x35, 0xb4, 0xcf, 0x5e, 0x35, 0xd6, 0xbe, 0x7c, 0xd5, 0x58, 0xfb, 0xc7, + 0xab, 0xc6, 0xda, 0xaf, 0x9f, 0x8e, 0x3c, 0x3e, 0x9e, 0x0e, 0xda, 0x43, 0x3a, 0xd9, 0x1d, 0xd2, + 0x09, 0xe1, 0x83, 0x0b, 0x3e, 0xfb, 0x90, 0xff, 0x26, 0xb8, 0xff, 0xd3, 0x7d, 0x90, 0x47, 0xfa, + 0xd3, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x5c, 0xda, 0x7c, 0x03, 0x7b, 0x10, 0x00, 0x00, } func (m *PartSetHeader) Marshal() (dAtA []byte, err error) { @@ -1893,6 +1902,11 @@ func (m *Data) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x32 } + if m.SquareSize != 0 { + i = encodeVarintTypes(dAtA, i, uint64(m.SquareSize)) + i-- + dAtA[i] = 0x28 + } if len(m.Txs) > 0 { for iNdEx := len(m.Txs) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.Txs[iNdEx]) @@ -2816,6 +2830,9 @@ func (m *Data) Size() (n int) { n += 1 + l + sovTypes(uint64(l)) } } + if m.SquareSize != 0 { + n += 1 + sovTypes(uint64(m.SquareSize)) + } l = len(m.Hash) if l > 0 { n += 1 + l + sovTypes(uint64(l)) @@ -4091,6 +4108,25 @@ func (m *Data) Unmarshal(dAtA []byte) error { m.Txs = append(m.Txs, make([]byte, postIndex-iNdEx)) copy(m.Txs[len(m.Txs)-1], dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 5: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field SquareSize", wireType) + } + m.SquareSize = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.SquareSize |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } case 6: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Hash", wireType) diff --git a/proto/tendermint/types/types.proto b/proto/tendermint/types/types.proto index b5c77f7f2e..dcd23c01d9 100644 --- a/proto/tendermint/types/types.proto +++ b/proto/tendermint/types/types.proto @@ -89,11 +89,13 @@ message Data { // NOTE: not all txs here are valid. We're just agreeing on the order first. repeated bytes txs = 1; - reserved 2, 3, 4, 5; + reserved 2, 3, 4; // field number 2 is reserved for intermediate state roots // field number 3 is reserved for evidence // field number 4 is reserved for blobs - // field number 5 is reserved for square size + + // SquareSize is the number of rows or columns in the original data square. + uint64 square_size = 5; // Hash is the root of a binary Merkle tree where the leaves of the tree are // the row and column roots of an extended data square. Hash is often referred diff --git a/state/execution.go b/state/execution.go index edd9dc014c..56bdc7c742 100644 --- a/state/execution.go +++ b/state/execution.go @@ -12,7 +12,6 @@ import ( "github.com/cometbft/cometbft/libs/log" mempl "github.com/cometbft/cometbft/mempool" cmtstate "github.com/cometbft/cometbft/proto/tendermint/state" - cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cometbft/cometbft/proxy" "github.com/cometbft/cometbft/types" ) @@ -145,10 +144,9 @@ func (blockExec *BlockExecutor) CreateProposalBlock( } // update the block with the response from PrepareProposal - block.Data, _ = types.DataFromProto(&cmtproto.Data{ - Txs: rpp.Txs[:len(rpp.Txs)-1], - Hash: rpp.Txs[len(rpp.Txs)-1], - }) + block.Data.Txs = types.ToTxs(rpp.Txs[:len(rpp.Txs)-1]) + // update the data hash with the one passed back by celestia-app + block.DataHash = rpp.Txs[len(rpp.Txs)-1] var blockDataSize int for _, tx := range block.Txs { @@ -167,7 +165,9 @@ func (blockExec *BlockExecutor) ProcessProposal( ) (bool, error) { // Similar to PrepareProposal, the last transaction provided to Celestia - // in ProcessProposal is the data hash + // in ProcessProposal is the data hash. The data hash needs to be passed to + // the application so that it can be verified against the nodes own construction + // of the data square txs := append(block.Data.Txs.ToSliceOfBytes(), block.DataHash) resp, err := blockExec.proxyApp.ProcessProposalSync(abci.RequestProcessProposal{ diff --git a/test/e2e/tests/block_test.go b/test/e2e/tests/block_test.go index 3086c3c555..199daa3021 100644 --- a/test/e2e/tests/block_test.go +++ b/test/e2e/tests/block_test.go @@ -111,9 +111,5 @@ func TestBlock_SignedData(t *testing.T) { if !bytes.Equal(resp.Commit.BlockID.Hash, resp.Header.Hash()) { t.Fatal("commit is for a different block") } - - if !bytes.Equal(resp.Header.DataHash, resp.Data.Hash()) { - t.Fatal("data does not match header data hash") - } }) } diff --git a/types/block.go b/types/block.go index 60b846978b..82094a4a18 100644 --- a/types/block.go +++ b/types/block.go @@ -1007,26 +1007,21 @@ func CommitFromProto(cp *cmtproto.Commit) (*Commit, error) { //----------------------------------------------------------------------------- -// Data contains all the available Data of the block. -// Data with reserved namespaces (Txs, IntermediateStateRoots, Evidence) and -// Celestia application specific Blobs. +// Data contains all the Txs in a block. type Data struct { // Txs that will be applied by state @ block.Height+1. // NOTE: not all txs here are valid. We're just agreeing on the order first. // This means that block.AppHash does not include these txs. Txs Txs `json:"txs"` - // SquareSize is the size of the square after splitting all the block data - // into shares. The erasure data is discarded after generation, and keeping this - // value avoids unnecessarily regenerating all of the shares when returning - // proofs that some element was included in the block - SquareSize uint64 `json:"square_size"` - // Volatile hash cmtbytes.HexBytes } // Hash returns the hash of the data +// NOTE: for the data hash, Celestia overwrites this one and uses what is +// known as the data availaibility hash which is the merkle root of a square +// encoding of the block func (data *Data) Hash() cmtbytes.HexBytes { if data == nil { return (Txs{}).Hash() @@ -1035,8 +1030,6 @@ func (data *Data) Hash() cmtbytes.HexBytes { data.hash = data.Txs.Hash() // NOTE: leaves of merkle tree are TxIDs } - // this is the expected behavior where `data.hash` was set by celestia-app - // in PrepareProposal return data.hash } @@ -1094,8 +1087,6 @@ func (data *Data) ToProto() cmtproto.Data { tp.Txs = txBzs } - tp.Hash = data.hash - return *tp } @@ -1117,8 +1108,6 @@ func DataFromProto(dp *cmtproto.Data) (Data, error) { data.Txs = Txs{} } - data.hash = dp.Hash - return *data, nil }