diff --git a/abci/types/application.go b/abci/types/application.go index c0407c4eaa..c7ca96e8f0 100644 --- a/abci/types/application.go +++ b/abci/types/application.go @@ -2,7 +2,6 @@ package types import ( "context" - "encoding/binary" "github.com/cometbft/cometbft/crypto/tmhash" ) @@ -96,10 +95,8 @@ func (BaseApplication) ApplySnapshotChunk(req RequestApplySnapshotChunk) Respons } func (BaseApplication) PrepareProposal(req RequestPrepareProposal) ResponsePrepareProposal { - // we use placeholder values for the hash and square size - squareSizeBytes := make([]byte, 8) - binary.BigEndian.PutUint64(squareSizeBytes, 0) - req.Txs = append(req.Txs, tmhash.Sum(nil), squareSizeBytes) + // we use placeholder values for the hash + req.Txs = append(req.Txs, tmhash.Sum(nil)) return ResponsePrepareProposal{Txs: req.Txs} } diff --git a/proto/tendermint/types/types.pb.go b/proto/tendermint/types/types.pb.go index 6f95c767a8..20c97dfd68 100644 --- a/proto/tendermint/types/types.pb.go +++ b/proto/tendermint/types/types.pb.go @@ -5,12 +5,12 @@ package types import ( fmt "fmt" + crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" + version "github.com/cometbft/cometbft/proto/tendermint/version" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" - version "github.com/cometbft/cometbft/proto/tendermint/version" io "io" math "math" math_bits "math/bits" @@ -422,8 +422,6 @@ 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". @@ -470,13 +468,6 @@ 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 @@ -1522,111 +1513,111 @@ func init() { func init() { proto.RegisterFile("tendermint/types/types.proto", fileDescriptor_d3a6e55e2345de56) } var fileDescriptor_d3a6e55e2345de56 = []byte{ - // 1661 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, 0x9b, 0x26, 0x9c, 0x8d, 0x56, 0x9b, 0x95, 0x55, 0x15, - 0x6d, 0x9d, 0x34, 0x90, 0xb7, 0x4e, 0xd1, 0xb4, 0x87, 0x1c, 0x2c, 0xdb, 0xd9, 0x68, 0xe3, 0x7f, - 0xa5, 0x94, 0x0d, 0x5a, 0x14, 0x20, 0x28, 0x73, 0x56, 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, 0xec, 0x02, 0x45, 0x3e, 0x46, 0x31, 0x6f, 0x86, 0x14, 0x65, 0x49, - 0x6d, 0xb0, 0x08, 0x72, 0x31, 0x38, 0xef, 0xfd, 0xde, 0x9b, 0xf7, 0x77, 0xde, 0x93, 0xe1, 0x0d, - 0x4e, 0x42, 0x8f, 0xc4, 0x13, 0x3f, 0xe4, 0xbb, 0xfc, 0x79, 0x44, 0x98, 0xfc, 0xdb, 0x89, 0x62, - 0xca, 0xa9, 0x65, 0xce, 0xb8, 0x1d, 0xa4, 0x37, 0xb6, 0x46, 0x74, 0x44, 0x91, 0xb9, 0x2b, 0xbe, - 0x24, 0xae, 0xb1, 0x3d, 0xa2, 0x74, 0x14, 0x90, 0x5d, 0x3c, 0x0d, 0xa7, 0xcf, 0x76, 0xb9, 0x3f, - 0x21, 0x8c, 0xbb, 0x93, 0x48, 0x01, 0x1e, 0x66, 0xae, 0xb9, 0x88, 0x9f, 0x47, 0x9c, 0x0a, 0x2c, - 0x7d, 0xa6, 0xd8, 0xcd, 0x0c, 0xfb, 0x92, 0xc4, 0xcc, 0xa7, 0x61, 0xd6, 0x8e, 0x46, 0x6b, 0xc1, - 0xca, 0x4b, 0x37, 0xf0, 0x3d, 0x97, 0xd3, 0x58, 0x22, 0xda, 0xbf, 0x80, 0xda, 0xb9, 0x1b, 0xf3, - 0x3e, 0xe1, 0x1f, 0x10, 0xd7, 0x23, 0xb1, 0xb5, 0x05, 0x05, 0x4e, 0xb9, 0x1b, 0xd4, 0xb5, 0x96, - 0xb6, 0x53, 0xb3, 0xe5, 0xc1, 0xb2, 0x40, 0x1f, 0xbb, 0x6c, 0x5c, 0xcf, 0xb5, 0xb4, 0x9d, 0xaa, - 0x8d, 0xdf, 0xed, 0x31, 0xe8, 0x42, 0x54, 0x48, 0xf8, 0xa1, 0x47, 0xae, 0x13, 0x09, 0x3c, 0x08, - 0xea, 0xf0, 0x39, 0x27, 0x4c, 0x89, 0xc8, 0x83, 0xf5, 0x53, 0x28, 0xa0, 0xfd, 0xf5, 0x7c, 0x4b, - 0xdb, 0xa9, 0xec, 0xd5, 0x3b, 0x99, 0x40, 0x49, 0xff, 0x3a, 0xe7, 0x82, 0xdf, 0xd5, 0xbf, 0xf8, - 0x6a, 0x7b, 0xcd, 0x96, 0xe0, 0x76, 0x00, 0xa5, 0x6e, 0x40, 0x2f, 0x3e, 0xe9, 0x1d, 0xa6, 0x86, - 0x68, 0x33, 0x43, 0xac, 0x13, 0xd8, 0x88, 0xdc, 0x98, 0x3b, 0x8c, 0x70, 0x67, 0x8c, 0x5e, 0xe0, - 0xa5, 0x95, 0xbd, 0xed, 0xce, 0xdd, 0x3c, 0x74, 0xe6, 0x9c, 0x55, 0xb7, 0xd4, 0xa2, 0x2c, 0xb1, - 0xfd, 0x1f, 0x1d, 0x8a, 0x2a, 0x18, 0xef, 0x41, 0x49, 0x85, 0x15, 0x2f, 0xac, 0xec, 0x3d, 0xcc, - 0x6a, 0x54, 0xac, 0xce, 0x01, 0x0d, 0x19, 0x09, 0xd9, 0x94, 0x29, 0x7d, 0x89, 0x8c, 0xf5, 0x43, - 0x30, 0x2e, 0xc6, 0xae, 0x1f, 0x3a, 0xbe, 0x87, 0x16, 0x95, 0xbb, 0x95, 0x17, 0x5f, 0x6d, 0x97, - 0x0e, 0x04, 0xad, 0x77, 0x68, 0x97, 0x90, 0xd9, 0xf3, 0xac, 0x7b, 0x50, 0x1c, 0x13, 0x7f, 0x34, - 0xe6, 0x18, 0x96, 0xbc, 0xad, 0x4e, 0xd6, 0xcf, 0x41, 0x17, 0x05, 0x51, 0xd7, 0xf1, 0xee, 0x46, - 0x47, 0x56, 0x4b, 0x27, 0xa9, 0x96, 0xce, 0x20, 0xa9, 0x96, 0xae, 0x21, 0x2e, 0xfe, 0xec, 0x5f, - 0xdb, 0x9a, 0x8d, 0x12, 0xd6, 0x01, 0xd4, 0x02, 0x97, 0x71, 0x67, 0x28, 0xc2, 0x26, 0xae, 0x2f, - 0xa0, 0x8a, 0xfb, 0x8b, 0x01, 0x51, 0x81, 0x55, 0xa6, 0x57, 0x84, 0x94, 0x24, 0x79, 0xd6, 0x0e, - 0x98, 0xa8, 0xe4, 0x82, 0x4e, 0x26, 0x3e, 0x77, 0x30, 0xee, 0x45, 0x8c, 0xfb, 0xba, 0xa0, 0x1f, - 0x20, 0xf9, 0x03, 0x91, 0x81, 0x07, 0x50, 0xf6, 0x5c, 0xee, 0x4a, 0x48, 0x09, 0x21, 0x86, 0x20, - 0x20, 0xf3, 0x47, 0xb0, 0x91, 0x56, 0x1d, 0x93, 0x10, 0x43, 0x6a, 0x99, 0x91, 0x11, 0xf8, 0x08, - 0xb6, 0x42, 0x72, 0xcd, 0x9d, 0xbb, 0xe8, 0x32, 0xa2, 0x2d, 0xc1, 0x7b, 0x3a, 0x2f, 0xf1, 0x03, - 0x58, 0xbf, 0x48, 0x82, 0x2f, 0xb1, 0x80, 0xd8, 0x5a, 0x4a, 0x45, 0xd8, 0x7d, 0x30, 0xdc, 0x28, - 0x92, 0x80, 0x0a, 0x02, 0x4a, 0x6e, 0x14, 0x21, 0xeb, 0x2d, 0xd8, 0x44, 0x1f, 0x63, 0xc2, 0xa6, - 0x01, 0x57, 0x4a, 0xaa, 0x88, 0xd9, 0x10, 0x0c, 0x5b, 0xd2, 0x11, 0xfb, 0x7d, 0xa8, 0x91, 0x4b, - 0xdf, 0x23, 0xe1, 0x05, 0x91, 0xb8, 0x1a, 0xe2, 0xaa, 0x09, 0x11, 0x41, 0x6f, 0x82, 0x19, 0xc5, - 0x34, 0xa2, 0x8c, 0xc4, 0x8e, 0xeb, 0x79, 0x31, 0x61, 0xac, 0xbe, 0x2e, 0xf5, 0x25, 0xf4, 0x7d, - 0x49, 0x6e, 0x3b, 0xa0, 0x1f, 0xba, 0xdc, 0xb5, 0x4c, 0xc8, 0xf3, 0x6b, 0x56, 0xd7, 0x5a, 0xf9, - 0x9d, 0xaa, 0x2d, 0x3e, 0xad, 0x6d, 0xa8, 0xb0, 0xdf, 0x4d, 0xdd, 0x98, 0x38, 0xcc, 0xff, 0x94, - 0x60, 0xf2, 0x74, 0x1b, 0x24, 0xa9, 0xef, 0x7f, 0x4a, 0xd2, 0x36, 0x28, 0xce, 0xda, 0xe0, 0x89, - 0x6e, 0xe4, 0xcc, 0xfc, 0x13, 0xdd, 0xc8, 0x9b, 0xfa, 0x13, 0xdd, 0xd0, 0xcd, 0x42, 0xfb, 0x0f, - 0x1a, 0xe8, 0xdd, 0x80, 0x0e, 0xad, 0xef, 0x41, 0x35, 0x74, 0x27, 0x84, 0x45, 0xee, 0x05, 0x11, - 0xd5, 0x20, 0xbb, 0xa7, 0x92, 0xd2, 0x7a, 0x9e, 0xd0, 0x28, 0x32, 0x96, 0x74, 0xb8, 0xf8, 0x16, - 0x0e, 0xb3, 0xb1, 0xb0, 0x22, 0x69, 0x82, 0x3c, 0x76, 0x78, 0x15, 0x89, 0x4f, 0x55, 0x91, 0xff, - 0x18, 0x36, 0x67, 0xba, 0x13, 0xa0, 0x8e, 0x40, 0x33, 0x65, 0x28, 0x70, 0xfb, 0xeb, 0x1c, 0xe8, - 0x4f, 0x29, 0x27, 0xd6, 0x3b, 0xa0, 0x8b, 0xfa, 0x43, 0x4b, 0xd6, 0x97, 0x35, 0x6a, 0xdf, 0x1f, - 0x85, 0xc4, 0x3b, 0x61, 0xa3, 0xc1, 0xf3, 0x88, 0xd8, 0x08, 0xce, 0xf4, 0x49, 0x6e, 0xae, 0x4f, - 0xb6, 0xa0, 0x10, 0xd3, 0x69, 0xe8, 0xa1, 0x7d, 0x05, 0x5b, 0x1e, 0xac, 0x23, 0x30, 0xd2, 0xf2, - 0xd7, 0xff, 0x5f, 0xf9, 0x6f, 0x88, 0xf2, 0x17, 0xcd, 0xa9, 0x08, 0x76, 0x69, 0xa8, 0xba, 0xa0, - 0x0b, 0xe5, 0xf4, 0x55, 0x56, 0x6d, 0xf4, 0xcd, 0x3a, 0x71, 0x26, 0x26, 0x62, 0x94, 0x16, 0x75, - 0x5a, 0x15, 0x32, 0x77, 0x66, 0xca, 0x50, 0x65, 0x31, 0xd7, 0x2f, 0x8e, 0x7c, 0x59, 0x4b, 0xe8, - 0xd7, 0xac, 0x5f, 0x7a, 0xf8, 0xc4, 0xbe, 0x01, 0x65, 0xe6, 0x8f, 0x42, 0x97, 0x4f, 0x63, 0xa2, - 0x5a, 0x6a, 0x46, 0x68, 0xff, 0x55, 0x83, 0xa2, 0x6c, 0xd1, 0x4c, 0xdc, 0xb4, 0xe5, 0x71, 0xcb, - 0xad, 0x8a, 0x5b, 0xfe, 0xd5, 0xe3, 0xb6, 0x0f, 0x90, 0x1a, 0xc3, 0xea, 0x7a, 0x2b, 0xbf, 0x53, - 0xd9, 0x7b, 0xb0, 0xa8, 0x48, 0x9a, 0xd8, 0xf7, 0x47, 0xea, 0x05, 0xca, 0x08, 0xb5, 0xff, 0xa9, - 0x41, 0x39, 0xe5, 0x5b, 0xfb, 0x50, 0x4b, 0xec, 0x72, 0x9e, 0x05, 0xee, 0x48, 0xd5, 0xce, 0xc3, - 0x95, 0xc6, 0xbd, 0x1f, 0xb8, 0x23, 0xbb, 0xa2, 0xec, 0x11, 0x87, 0xe5, 0x79, 0xc8, 0xad, 0xc8, - 0xc3, 0x5c, 0xe2, 0xf3, 0xaf, 0x96, 0xf8, 0xb9, 0x14, 0xe9, 0x77, 0x53, 0xf4, 0x97, 0x1c, 0x18, - 0xe7, 0xf8, 0x28, 0xb8, 0xc1, 0x77, 0xd1, 0x11, 0x0f, 0xa0, 0x1c, 0xd1, 0xc0, 0x91, 0x1c, 0x1d, - 0x39, 0x46, 0x44, 0x03, 0x7b, 0x21, 0xed, 0x85, 0x6f, 0xa9, 0x5d, 0x8a, 0xdf, 0x42, 0xd4, 0x4a, - 0x77, 0xa3, 0x16, 0x43, 0x55, 0x86, 0x42, 0x0d, 0xe9, 0x47, 0x22, 0x06, 0x38, 0xf5, 0xb5, 0xc5, - 0xa5, 0x42, 0x9a, 0x2d, 0x91, 0xb6, 0xc2, 0x09, 0x09, 0x39, 0xd3, 0xd4, 0x9e, 0x50, 0x5f, 0x55, - 0x96, 0xb6, 0xc2, 0xb5, 0xff, 0xa8, 0x01, 0x1c, 0x8b, 0xc8, 0xa2, 0xbf, 0x62, 0xbc, 0x32, 0x34, - 0xc1, 0x99, 0xbb, 0xb9, 0xb9, 0x2a, 0x69, 0xea, 0xfe, 0x2a, 0xcb, 0xda, 0x7d, 0x00, 0xb5, 0x59, - 0x31, 0x32, 0x92, 0x18, 0xb3, 0x44, 0x49, 0x3a, 0xf5, 0xfa, 0x84, 0xdb, 0xd5, 0xcb, 0xcc, 0xa9, - 0xfd, 0x37, 0x0d, 0xca, 0x68, 0xd3, 0x09, 0xe1, 0xee, 0x5c, 0x0e, 0xb5, 0x57, 0xcf, 0xe1, 0x43, - 0x00, 0xa9, 0x06, 0xa7, 0x8f, 0xac, 0xac, 0x32, 0x52, 0x70, 0xf8, 0xfc, 0x2c, 0x0d, 0x78, 0xfe, - 0x7f, 0x07, 0x5c, 0xb5, 0x74, 0x12, 0xf6, 0xd7, 0xa1, 0x14, 0x4e, 0x27, 0x8e, 0x98, 0x75, 0xba, - 0xac, 0xd6, 0x70, 0x3a, 0x19, 0x5c, 0xb3, 0xf6, 0x6f, 0xa1, 0x34, 0xb8, 0xc6, 0xbd, 0x4f, 0x94, - 0x68, 0x4c, 0xa9, 0x5a, 0x36, 0xe4, 0x98, 0x32, 0x04, 0x01, 0x67, 0xeb, 0xb2, 0x19, 0xd5, 0xf9, - 0x86, 0x1b, 0x65, 0xb2, 0x4b, 0xfe, 0x06, 0xaa, 0xf8, 0x7a, 0x7e, 0x1c, 0xbb, 0x51, 0x44, 0x62, - 0x6b, 0x1d, 0x72, 0xfc, 0x5a, 0xdd, 0x94, 0xe3, 0xd7, 0xb3, 0x99, 0x87, 0x2f, 0x2f, 0xee, 0xaf, - 0xf9, 0x74, 0xe6, 0xf5, 0x24, 0x4d, 0x78, 0x22, 0xfc, 0x4c, 0x5e, 0xc8, 0xb2, 0x5d, 0x14, 0xc7, - 0x9e, 0xd7, 0x76, 0xa0, 0x28, 0x06, 0xee, 0xe0, 0x7a, 0x41, 0xef, 0xdb, 0x50, 0x18, 0x06, 0x74, - 0x28, 0xf5, 0x55, 0xf6, 0xee, 0x2d, 0xcd, 0xcb, 0xd0, 0x96, 0xa0, 0xd5, 0x17, 0x7c, 0xad, 0x01, - 0xf4, 0x85, 0x29, 0x32, 0x5c, 0x49, 0x44, 0xe4, 0xee, 0x20, 0x23, 0xf2, 0x1e, 0x48, 0x63, 0x1d, - 0x74, 0x38, 0xb9, 0xb0, 0xb1, 0x78, 0xe1, 0xe9, 0xc9, 0x40, 0x86, 0xa6, 0xc2, 0x52, 0x8d, 0x6c, - 0x61, 0x57, 0xc8, 0x2f, 0xee, 0x0a, 0xef, 0x8a, 0x24, 0x5d, 0x49, 0xfd, 0xe9, 0x72, 0xba, 0xa0, - 0xde, 0xa6, 0x57, 0x52, 0xbd, 0x11, 0xab, 0xaf, 0xe5, 0xbb, 0x42, 0x61, 0xc5, 0xae, 0xf0, 0xb9, - 0x06, 0x46, 0xa2, 0x43, 0xd6, 0xc5, 0x95, 0x23, 0x4a, 0x21, 0xd9, 0x94, 0x84, 0x5a, 0x5b, 0x9c, - 0x45, 0x3f, 0xcf, 0xf9, 0xba, 0xba, 0x08, 0x14, 0x4e, 0xc4, 0x4d, 0xa8, 0x52, 0xce, 0xe1, 0xb7, - 0xb8, 0x82, 0x71, 0xf1, 0x3b, 0x22, 0xa6, 0x57, 0x6a, 0x81, 0x31, 0x90, 0x60, 0xd3, 0x2b, 0x91, - 0x10, 0x12, 0x7a, 0xc8, 0x92, 0xf6, 0x16, 0x49, 0xe8, 0xd9, 0xf4, 0xaa, 0x4d, 0xc0, 0x48, 0xe2, - 0x28, 0x5e, 0x5d, 0x14, 0xc0, 0xb4, 0x17, 0x6c, 0x79, 0x10, 0xeb, 0x1d, 0x49, 0x67, 0xac, 0xf8, - 0x14, 0xb8, 0x90, 0x7a, 0x84, 0xd5, 0xf3, 0xe8, 0x88, 0x3c, 0x88, 0xfb, 0x03, 0xe2, 0x3e, 0x93, - 0xa5, 0x2f, 0x67, 0x85, 0x21, 0x08, 0xa2, 0xf4, 0xdf, 0xfa, 0xbb, 0x06, 0x95, 0xcc, 0x58, 0xb3, - 0x7e, 0x02, 0xaf, 0x75, 0x8f, 0xcf, 0x0e, 0x3e, 0x74, 0x7a, 0x87, 0xce, 0xfb, 0xc7, 0xfb, 0x8f, - 0x9d, 0x8f, 0x4e, 0x3f, 0x3c, 0x3d, 0xfb, 0xf8, 0xd4, 0x5c, 0x6b, 0xdc, 0xbb, 0xb9, 0x6d, 0x59, - 0x19, 0xec, 0x47, 0xe1, 0x27, 0x21, 0xbd, 0x0a, 0xad, 0x5d, 0xd8, 0x9a, 0x17, 0xd9, 0xef, 0xf6, - 0x8f, 0x4e, 0x07, 0xa6, 0xd6, 0x78, 0xed, 0xe6, 0xb6, 0xb5, 0x99, 0x91, 0xd8, 0x1f, 0x32, 0x12, - 0xf2, 0x45, 0x81, 0x83, 0xb3, 0x93, 0x93, 0xde, 0xc0, 0xcc, 0x2d, 0x08, 0xa8, 0x3d, 0xe3, 0x4d, - 0xd8, 0x9c, 0x17, 0x38, 0xed, 0x1d, 0x9b, 0xf9, 0x86, 0x75, 0x73, 0xdb, 0x5a, 0xcf, 0xa0, 0x4f, - 0xfd, 0xa0, 0x61, 0xfc, 0xfe, 0xf3, 0xe6, 0xda, 0x9f, 0xff, 0xd4, 0xd4, 0x84, 0x67, 0xb5, 0xb9, - 0xd1, 0x66, 0xbd, 0x0d, 0xaf, 0xf7, 0x7b, 0x8f, 0x4f, 0x8f, 0x0e, 0x9d, 0x93, 0xfe, 0x63, 0x67, - 0xf0, 0xab, 0xf3, 0xa3, 0x8c, 0x77, 0x1b, 0x37, 0xb7, 0xad, 0x8a, 0x72, 0x69, 0x15, 0xfa, 0xdc, - 0x3e, 0x7a, 0x7a, 0x36, 0x38, 0x32, 0x35, 0x89, 0x3e, 0x8f, 0xc9, 0x25, 0xe5, 0x04, 0xd1, 0x8f, - 0xe0, 0xfe, 0x12, 0x74, 0xea, 0xd8, 0xe6, 0xcd, 0x6d, 0xab, 0x76, 0x1e, 0x13, 0xf9, 0xec, 0xa3, - 0x44, 0x07, 0xea, 0x8b, 0x12, 0x67, 0xe7, 0x67, 0xfd, 0xfd, 0x63, 0xb3, 0xd5, 0x30, 0x6f, 0x6e, - 0x5b, 0xd5, 0x64, 0x86, 0x0b, 0xfc, 0xcc, 0xb3, 0xee, 0x2f, 0xbf, 0x78, 0xd1, 0xd4, 0xbe, 0x7c, - 0xd1, 0xd4, 0xfe, 0xfd, 0xa2, 0xa9, 0x7d, 0xf6, 0xb2, 0xb9, 0xf6, 0xe5, 0xcb, 0xe6, 0xda, 0x3f, - 0x5e, 0x36, 0xd7, 0x7e, 0xfd, 0xee, 0xc8, 0xe7, 0xe3, 0xe9, 0xb0, 0x73, 0x41, 0x27, 0xbb, 0xd9, - 0x9f, 0xe8, 0xb3, 0x4f, 0xf9, 0xaf, 0x82, 0xbb, 0x3f, 0xdf, 0x87, 0x45, 0xa4, 0xbf, 0xf3, 0xdf, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xea, 0x3f, 0x8f, 0x46, 0x7f, 0x10, 0x00, 0x00, + // 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, } func (m *PartSetHeader) Marshal() (dAtA []byte, err error) { @@ -1902,11 +1893,6 @@ 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]) @@ -2830,9 +2816,6 @@ 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)) @@ -4108,25 +4091,6 @@ 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 4aba965106..b5c77f7f2e 100644 --- a/proto/tendermint/types/types.proto +++ b/proto/tendermint/types/types.proto @@ -89,13 +89,11 @@ 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; + reserved 2, 3, 4, 5; // field number 2 is reserved for intermediate state roots // field number 3 is reserved for evidence // field number 4 is reserved for blobs - - // SquareSize is the number of rows or columns in the original data square. - uint64 square_size = 5; + // field number 5 is reserved for square size // 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 96e07b454d..02786fc6bf 100644 --- a/state/execution.go +++ b/state/execution.go @@ -1,7 +1,6 @@ package state import ( - "encoding/binary" "errors" "fmt" "time" @@ -136,25 +135,19 @@ func (blockExec *BlockExecutor) CreateProposalBlock( panic(err) } - // Celestia passes the data root back as the second to last transaction - // and the big endian encoding of the square size as the last transaction. - if len(rpp.Txs) < 2 { - panic("state machine returned an invalid prepare proposal response: expected at least 2 transactions") + // Celestia passes the data root back as the last transaction + if len(rpp.Txs) < 1 { + panic("state machine returned an invalid prepare proposal response: expected at least 1 transaction") } - if len(rpp.Txs[len(rpp.Txs)-2]) != tmhash.Size { - panic(fmt.Sprintf("state machine returned an invalid prepare proposal response: expected second to last transaction to be a hash, got %d bytes", len(rpp.Txs[len(rpp.Txs)-2]))) - } - - if len(rpp.Txs[len(rpp.Txs)-1]) != 8 { - panic("state machine returned an invalid prepare proposal response: expected last transaction to be a uint64 (square size)") + if len(rpp.Txs[len(rpp.Txs)-1]) != tmhash.Size { + panic(fmt.Sprintf("state machine returned an invalid prepare proposal response: expected last transaction to be a hash, got %d bytes", len(rpp.Txs[len(rpp.Txs)-2]))) } // update the block with the response from PrepareProposal block.Data, _ = types.DataFromProto(&cmtproto.Data{ - SquareSize: binary.BigEndian.Uint64(rpp.Txs[len(rpp.Txs)-1]), - Txs: rpp.Txs[:len(rpp.Txs)-2], - Hash: rpp.Txs[len(rpp.Txs)-2], + Txs: rpp.Txs[:len(rpp.Txs)-1], + Hash: rpp.Txs[len(rpp.Txs)-1], }) var blockDataSize int @@ -173,11 +166,9 @@ func (blockExec *BlockExecutor) ProcessProposal( state State, ) (bool, error) { - // Similar to PrepareProposal, the last two transactions provided to Celestia - // in ProcessProposal are the data hash and square size respectively - squareSizeBytes := make([]byte, 8) - binary.BigEndian.PutUint64(squareSizeBytes, block.Data.SquareSize) - txs := append(block.Data.Txs.ToSliceOfBytes(), block.DataHash, squareSizeBytes) + // Similar to PrepareProposal, the last transaction provided to Celestia + // in ProcessProposal is the data hash + txs := append(block.Data.Txs.ToSliceOfBytes(), block.DataHash) resp, err := blockExec.proxyApp.ProcessProposalSync(abci.RequestProcessProposal{ Hash: block.Header.Hash(), diff --git a/types/block.go b/types/block.go index 68c4aeb1f3..65cef983c2 100644 --- a/types/block.go +++ b/types/block.go @@ -1090,8 +1090,6 @@ func (data *Data) ToProto() cmtproto.Data { tp.Txs = txBzs } - tp.SquareSize = data.SquareSize - tp.Hash = data.hash return *tp @@ -1115,7 +1113,6 @@ func DataFromProto(dp *cmtproto.Data) (Data, error) { data.Txs = Txs{} } - data.SquareSize = dp.SquareSize data.hash = dp.Hash return *data, nil