diff --git a/data/block/blockV2.go b/data/block/blockV2.go index 4e62e096..727c296d 100644 --- a/data/block/blockV2.go +++ b/data/block/blockV2.go @@ -667,6 +667,11 @@ func (hv2 *HeaderV2) GetPreviousProof() data.HeaderProofHandler { // SetPreviousProof sets the previous proof func (hv2 *HeaderV2) SetPreviousProof(proof data.HeaderProofHandler) { + if check.IfNilReflect(proof) { + hv2.PreviousHeaderProof = nil + return + } + hv2.PreviousHeaderProof = &HeaderProof{ PubKeysBitmap: proof.GetPubKeysBitmap(), AggregatedSignature: proof.GetAggregatedSignature(), diff --git a/data/block/metaBlock.pb.go b/data/block/metaBlock.pb.go index 47176564..f0c36c45 100644 --- a/data/block/metaBlock.pb.go +++ b/data/block/metaBlock.pb.go @@ -145,20 +145,22 @@ func (m *PeerData) GetValueChange() *math_big.Int { // ShardData holds the block information sent by the shards to the metachain type ShardData struct { - HeaderHash []byte `protobuf:"bytes,2,opt,name=HeaderHash,proto3" json:"headerHash,omitempty"` - ShardMiniBlockHeaders []MiniBlockHeader `protobuf:"bytes,3,rep,name=ShardMiniBlockHeaders,proto3" json:"shardMiniBlockHeaders"` - PrevRandSeed []byte `protobuf:"bytes,4,opt,name=PrevRandSeed,proto3" json:"prevRandSeed,omitempty"` - PubKeysBitmap []byte `protobuf:"bytes,5,opt,name=PubKeysBitmap,proto3" json:"pubKeysBitmap,omitempty"` - Signature []byte `protobuf:"bytes,6,opt,name=Signature,proto3" json:"signature,omitempty"` - Round uint64 `protobuf:"varint,8,opt,name=Round,proto3" json:"round"` - PrevHash []byte `protobuf:"bytes,9,opt,name=PrevHash,proto3" json:"prevHash,omitempty"` - Nonce uint64 `protobuf:"varint,10,opt,name=Nonce,proto3" json:"nonce"` - AccumulatedFees *math_big.Int `protobuf:"bytes,12,opt,name=AccumulatedFees,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"accumulatedFees,omitempty"` - DeveloperFees *math_big.Int `protobuf:"bytes,14,opt,name=DeveloperFees,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"developerFees,omitempty"` - NumPendingMiniBlocks uint32 `protobuf:"varint,11,opt,name=NumPendingMiniBlocks,proto3" json:"numPendingMiniBlocks"` - LastIncludedMetaNonce uint64 `protobuf:"varint,13,opt,name=LastIncludedMetaNonce,proto3" json:"lastIncludedMetaNonce"` - ShardID uint32 `protobuf:"varint,1,opt,name=ShardID,proto3" json:"shardID"` - TxCount uint32 `protobuf:"varint,7,opt,name=TxCount,proto3" json:"txCount"` + HeaderHash []byte `protobuf:"bytes,2,opt,name=HeaderHash,proto3" json:"headerHash,omitempty"` + ShardMiniBlockHeaders []MiniBlockHeader `protobuf:"bytes,3,rep,name=ShardMiniBlockHeaders,proto3" json:"shardMiniBlockHeaders"` + PrevRandSeed []byte `protobuf:"bytes,4,opt,name=PrevRandSeed,proto3" json:"prevRandSeed,omitempty"` + PubKeysBitmap []byte `protobuf:"bytes,5,opt,name=PubKeysBitmap,proto3" json:"pubKeysBitmap,omitempty"` + Signature []byte `protobuf:"bytes,6,opt,name=Signature,proto3" json:"signature,omitempty"` + Round uint64 `protobuf:"varint,8,opt,name=Round,proto3" json:"round"` + PrevHash []byte `protobuf:"bytes,9,opt,name=PrevHash,proto3" json:"prevHash,omitempty"` + Nonce uint64 `protobuf:"varint,10,opt,name=Nonce,proto3" json:"nonce"` + AccumulatedFees *math_big.Int `protobuf:"bytes,12,opt,name=AccumulatedFees,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"accumulatedFees,omitempty"` + DeveloperFees *math_big.Int `protobuf:"bytes,14,opt,name=DeveloperFees,proto3,casttypewith=math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster" json:"developerFees,omitempty"` + NumPendingMiniBlocks uint32 `protobuf:"varint,11,opt,name=NumPendingMiniBlocks,proto3" json:"numPendingMiniBlocks"` + LastIncludedMetaNonce uint64 `protobuf:"varint,13,opt,name=LastIncludedMetaNonce,proto3" json:"lastIncludedMetaNonce"` + ShardID uint32 `protobuf:"varint,1,opt,name=ShardID,proto3" json:"shardID"` + TxCount uint32 `protobuf:"varint,7,opt,name=TxCount,proto3" json:"txCount"` + PreviousShardHeaderProof *HeaderProof `protobuf:"bytes,15,opt,name=PreviousShardHeaderProof,proto3" json:"previousHeaderProof,omitempty"` + Epoch uint32 `protobuf:"varint,16,opt,name=Epoch,proto3" json:"epoch,omitempty"` } func (m *ShardData) Reset() { *m = ShardData{} } @@ -287,6 +289,20 @@ func (m *ShardData) GetTxCount() uint32 { return 0 } +func (m *ShardData) GetPreviousShardHeaderProof() *HeaderProof { + if m != nil { + return m.PreviousShardHeaderProof + } + return nil +} + +func (m *ShardData) GetEpoch() uint32 { + if m != nil { + return m.Epoch + } + return 0 +} + // EpochStartShardData hold the last finalized headers hash and state root hash type EpochStartShardData struct { ShardID uint32 `protobuf:"varint,1,opt,name=ShardID,proto3" json:"shardID"` @@ -796,113 +812,116 @@ func init() { func init() { proto.RegisterFile("metaBlock.proto", fileDescriptor_87b91ab531130b2b) } var fileDescriptor_87b91ab531130b2b = []byte{ - // 1692 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x4f, 0x6f, 0xdb, 0xc8, - 0x15, 0x17, 0xed, 0xc8, 0x92, 0x46, 0x96, 0x2d, 0x8d, 0xff, 0x31, 0x4e, 0x22, 0x0a, 0x6e, 0x0b, - 0x18, 0x41, 0x6d, 0x03, 0x2e, 0x02, 0x14, 0x28, 0xda, 0xc2, 0xb2, 0xe3, 0x46, 0x4d, 0xec, 0x08, - 0x94, 0x6b, 0xa0, 0x45, 0x0a, 0x74, 0x44, 0x8e, 0xa5, 0x81, 0x29, 0x0e, 0x4b, 0x0e, 0xed, 0xb8, - 0x87, 0xa2, 0x87, 0xf6, 0x52, 0xa0, 0x40, 0x80, 0x02, 0x7b, 0xdd, 0xcb, 0x2e, 0xb0, 0xd8, 0x2f, - 0xb0, 0xa7, 0x3d, 0xed, 0x25, 0xc7, 0x1c, 0x73, 0xe2, 0x6e, 0x94, 0xc3, 0x2e, 0x78, 0xd9, 0x7c, - 0x84, 0x05, 0x87, 0xa4, 0x38, 0x92, 0xa8, 0xc4, 0x09, 0x20, 0xe4, 0x64, 0xf3, 0xf7, 0xfe, 0xcc, - 0xe3, 0xe3, 0x9b, 0xdf, 0x7b, 0x4f, 0x60, 0xb1, 0x87, 0x19, 0xaa, 0x1b, 0x54, 0x3b, 0xdf, 0xb6, - 0x6c, 0xca, 0x28, 0xcc, 0xf2, 0x3f, 0xeb, 0x5b, 0x1d, 0xc2, 0xba, 0x6e, 0x7b, 0x5b, 0xa3, 0xbd, - 0x9d, 0x0e, 0xed, 0xd0, 0x1d, 0x0e, 0xb7, 0xdd, 0x33, 0xfe, 0xc4, 0x1f, 0xf8, 0x7f, 0xa1, 0xd5, - 0x7a, 0xb1, 0x9d, 0xb8, 0x58, 0x2f, 0xf1, 0x87, 0xd3, 0xdd, 0xf0, 0x71, 0xe3, 0xfb, 0x19, 0x90, - 0x6f, 0x62, 0x6c, 0x1f, 0x20, 0x86, 0xe0, 0x0e, 0xc8, 0xed, 0xe9, 0xba, 0x8d, 0x1d, 0x47, 0x96, - 0x6a, 0xd2, 0xe6, 0x7c, 0x7d, 0xc5, 0xf7, 0x94, 0x0a, 0x0a, 0xa1, 0x5f, 0xd2, 0x1e, 0x61, 0xb8, - 0x67, 0xb1, 0x2b, 0x35, 0xd6, 0x82, 0xf7, 0x40, 0xa1, 0xe9, 0xb6, 0x0d, 0xa2, 0x3d, 0xc4, 0x57, - 0xf2, 0x0c, 0x37, 0x59, 0xf3, 0x3d, 0x65, 0xc9, 0x8a, 0x41, 0xc1, 0x28, 0xd1, 0x84, 0xf7, 0xc0, - 0xdc, 0x9e, 0xc6, 0x08, 0x35, 0xe5, 0xd9, 0x9a, 0xb4, 0xb9, 0xb0, 0x5b, 0x09, 0x83, 0xd9, 0x0e, - 0x02, 0x09, 0x05, 0x75, 0xe0, 0x7b, 0xca, 0x1c, 0xe2, 0xff, 0xab, 0x91, 0x72, 0x70, 0xda, 0x09, - 0xe9, 0xe1, 0x16, 0x43, 0x3d, 0x4b, 0xbe, 0x51, 0x93, 0x36, 0x6f, 0x84, 0xa7, 0xb1, 0x18, 0x14, - 0x4f, 0x1b, 0x68, 0xc2, 0x7f, 0x4b, 0xa0, 0x78, 0x8a, 0x0c, 0x17, 0xef, 0x77, 0x91, 0xd9, 0xc1, - 0x72, 0x96, 0xc7, 0xd9, 0xf6, 0x3d, 0x65, 0xe5, 0x22, 0x81, 0x13, 0xdb, 0x2f, 0xbf, 0x55, 0xee, - 0xf7, 0x10, 0xeb, 0xee, 0xb4, 0x49, 0x67, 0xbb, 0x61, 0xb2, 0xdf, 0x08, 0xd9, 0xee, 0xb9, 0x06, - 0x23, 0x17, 0xd8, 0x76, 0x9e, 0xee, 0xf4, 0x9e, 0x6e, 0x69, 0x5d, 0x44, 0xcc, 0x2d, 0x8d, 0xda, - 0x78, 0xab, 0x43, 0x77, 0x74, 0xc4, 0xd0, 0x76, 0x9d, 0x74, 0x1a, 0x26, 0xdb, 0x47, 0x0e, 0xc3, - 0xb6, 0x2a, 0x1e, 0xbb, 0xf1, 0x63, 0x0e, 0x14, 0x5a, 0x5d, 0x64, 0xeb, 0x3c, 0xd5, 0xbf, 0x06, - 0xe0, 0x01, 0x46, 0x3a, 0xb6, 0x1f, 0x20, 0xa7, 0x1b, 0xa5, 0x4e, 0xf6, 0x3d, 0x65, 0xb9, 0x3b, - 0x40, 0x85, 0xb7, 0x11, 0x74, 0xe1, 0x39, 0x58, 0xe1, 0x6e, 0x8e, 0x88, 0x49, 0x78, 0x6d, 0x84, - 0x32, 0x47, 0x9e, 0xad, 0xcd, 0x6e, 0x16, 0x77, 0x57, 0xa3, 0x5c, 0x8e, 0x88, 0xeb, 0x77, 0x9e, - 0x7b, 0x4a, 0x26, 0x78, 0x67, 0x27, 0xcd, 0x58, 0x4d, 0xf7, 0x09, 0x7f, 0x07, 0xe6, 0x9b, 0x36, - 0xbe, 0x50, 0x91, 0xa9, 0xb7, 0x30, 0xd6, 0x79, 0xd6, 0xe7, 0xeb, 0xeb, 0xbe, 0xa7, 0xac, 0x5a, - 0x02, 0x2e, 0x84, 0x3a, 0xa4, 0x0f, 0xf7, 0x40, 0xa9, 0xe9, 0xb6, 0x1f, 0xe2, 0x2b, 0xa7, 0x4e, - 0x58, 0x0f, 0x59, 0x51, 0xf2, 0x6f, 0xf9, 0x9e, 0xb2, 0x66, 0x89, 0x02, 0xc1, 0xc3, 0xb0, 0x45, - 0xf0, 0xd5, 0x5b, 0xa4, 0x63, 0x22, 0xe6, 0xda, 0x58, 0x9e, 0x4b, 0x6a, 0xcc, 0x89, 0x41, 0xf1, - 0xab, 0x0f, 0x34, 0xa1, 0x02, 0xb2, 0x2a, 0x75, 0x4d, 0x5d, 0xce, 0xf3, 0x42, 0x29, 0xf8, 0x9e, - 0x92, 0xb5, 0x03, 0x40, 0x0d, 0x71, 0xb8, 0x0b, 0xf2, 0x41, 0xa8, 0x3c, 0xff, 0x05, 0xee, 0x76, - 0xd5, 0xf7, 0x14, 0x68, 0x45, 0x98, 0xe0, 0x75, 0xa0, 0x17, 0x38, 0x3d, 0xa6, 0xa6, 0x86, 0x65, - 0x90, 0x38, 0x35, 0x03, 0x40, 0x0d, 0x71, 0xf8, 0x4c, 0x02, 0x8b, 0x7b, 0x9a, 0xe6, 0xf6, 0x5c, - 0x03, 0x31, 0xac, 0x1f, 0x62, 0xec, 0xc8, 0xf3, 0xdc, 0xf9, 0x99, 0xef, 0x29, 0x37, 0xd1, 0xb0, - 0x68, 0x1a, 0x35, 0x37, 0x7a, 0x3c, 0xfc, 0xaf, 0x04, 0x4a, 0x07, 0xf8, 0x02, 0x1b, 0xd4, 0xc2, - 0x36, 0x0f, 0x68, 0x81, 0x07, 0xa4, 0x07, 0xdf, 0x40, 0x17, 0x05, 0xd3, 0x08, 0x67, 0xf8, 0x68, - 0xf8, 0x08, 0x2c, 0x1f, 0xbb, 0xbd, 0x26, 0x36, 0x75, 0x62, 0x76, 0x06, 0xd5, 0xe6, 0xc8, 0xc5, - 0x9a, 0xb4, 0x59, 0x0a, 0x2f, 0x80, 0x99, 0x22, 0x57, 0x53, 0xad, 0xe0, 0x63, 0xb0, 0xf2, 0x08, - 0x39, 0xac, 0x61, 0x6a, 0x86, 0xab, 0x63, 0xfd, 0x08, 0x33, 0x14, 0x7e, 0x9e, 0x12, 0xff, 0x3c, - 0x37, 0x83, 0x72, 0x37, 0xd2, 0x14, 0xd4, 0x74, 0x3b, 0xf8, 0x0b, 0x90, 0xe3, 0xf7, 0xa0, 0x71, - 0xc0, 0x09, 0xb0, 0x54, 0x2f, 0xfa, 0x9e, 0x92, 0x73, 0x42, 0x48, 0x8d, 0x65, 0x81, 0xda, 0xc9, - 0xd3, 0x7d, 0xea, 0x9a, 0x4c, 0xce, 0x25, 0x6a, 0x2c, 0x84, 0xd4, 0x58, 0xb6, 0xf1, 0x9f, 0x2c, - 0x58, 0xba, 0x6f, 0x51, 0xad, 0xdb, 0x62, 0xc8, 0x66, 0xc9, 0xdd, 0xbf, 0xe6, 0x29, 0x0a, 0xc8, - 0x72, 0x6b, 0x5e, 0x9d, 0xa5, 0xb0, 0xd8, 0x70, 0x00, 0xa8, 0x21, 0x9e, 0x94, 0x78, 0x6e, 0x42, - 0x89, 0x0f, 0xca, 0x35, 0x3f, 0xa1, 0x5c, 0x3f, 0x9c, 0x85, 0x76, 0x41, 0x5e, 0xa5, 0x94, 0x71, - 0xbb, 0xd9, 0xe4, 0xf6, 0xd8, 0x11, 0x26, 0xde, 0x9e, 0x58, 0x0f, 0x1e, 0x81, 0x4a, 0x4b, 0xeb, - 0x62, 0xdd, 0x35, 0xb0, 0x3e, 0x30, 0x06, 0xdc, 0x58, 0xf1, 0x3d, 0xe5, 0x96, 0x33, 0x2a, 0x14, - 0xbc, 0x8c, 0x5b, 0xc2, 0x3f, 0x83, 0x95, 0x43, 0x62, 0x3b, 0x2c, 0xae, 0x8b, 0xb8, 0x57, 0x46, - 0x24, 0xf5, 0x33, 0xdf, 0x53, 0x94, 0xb3, 0x34, 0x05, 0xc1, 0x6d, 0xba, 0x87, 0xc0, 0x75, 0x50, - 0x20, 0x87, 0xc4, 0x24, 0x4e, 0x37, 0x2c, 0x90, 0xd0, 0x75, 0x36, 0x71, 0x6d, 0xa4, 0x29, 0x88, - 0xae, 0x53, 0x3d, 0xc0, 0xbf, 0x83, 0xb5, 0xd1, 0x42, 0x8e, 0x09, 0x7c, 0xee, 0xad, 0x04, 0xae, - 0x44, 0x04, 0xbe, 0x66, 0xa5, 0x9b, 0xab, 0x93, 0xfc, 0x6e, 0x7c, 0x95, 0x07, 0x85, 0xfb, 0x1a, - 0x35, 0x69, 0x8f, 0x68, 0x0e, 0x6f, 0x87, 0x27, 0x94, 0x21, 0xa3, 0xe5, 0x5a, 0x96, 0x71, 0x15, - 0x75, 0x7a, 0xde, 0x0e, 0x59, 0x02, 0x4f, 0xa5, 0x1d, 0x0a, 0xc7, 0xc2, 0x4f, 0x24, 0x50, 0xe1, - 0xcf, 0x27, 0xf4, 0x80, 0x38, 0xcc, 0x26, 0x6d, 0x97, 0xe1, 0xa8, 0x04, 0xbb, 0x41, 0x35, 0xb0, - 0x51, 0xe1, 0x34, 0x42, 0x1a, 0x0f, 0x01, 0xfe, 0x5f, 0x02, 0x65, 0x8e, 0x1e, 0xe3, 0x4b, 0xe3, - 0xea, 0x88, 0x98, 0x0c, 0xeb, 0x51, 0x89, 0x77, 0x7c, 0x4f, 0x59, 0x67, 0x23, 0xb2, 0x69, 0x84, - 0x35, 0x16, 0x00, 0x6f, 0x2c, 0x2a, 0xbe, 0x44, 0xb6, 0xee, 0x34, 0xb1, 0x2d, 0xd6, 0x39, 0x6f, - 0x2c, 0xf6, 0xb0, 0x68, 0x2a, 0x8d, 0x65, 0xe4, 0x78, 0xf8, 0x8d, 0x04, 0x6a, 0x11, 0x76, 0x48, - 0xed, 0x66, 0x50, 0xb4, 0x1a, 0x35, 0x5a, 0xae, 0xc3, 0x10, 0x31, 0x51, 0x9b, 0x18, 0x84, 0x5d, - 0x45, 0x17, 0xe6, 0xd2, 0xf7, 0x94, 0xbb, 0xf6, 0x3b, 0x74, 0xa7, 0x11, 0xf4, 0x3b, 0x03, 0x84, - 0xff, 0x04, 0x85, 0x63, 0xaa, 0xe3, 0xa6, 0x4d, 0xb4, 0x78, 0xbc, 0xf8, 0x5b, 0x30, 0x5e, 0x98, - 0x31, 0x38, 0x8d, 0xb0, 0x92, 0x23, 0x61, 0x03, 0x2c, 0x05, 0xe3, 0x45, 0xd2, 0x27, 0x44, 0x4a, - 0x0f, 0x87, 0xe9, 0x71, 0xb1, 0x9a, 0x66, 0x03, 0x9b, 0x00, 0x0e, 0xc3, 0x9c, 0x60, 0xf3, 0xfc, - 0x9d, 0x6a, 0xbe, 0xa7, 0xdc, 0xb6, 0xc6, 0xa4, 0x02, 0x5f, 0xa5, 0xd8, 0x6e, 0x7c, 0x2d, 0x01, - 0x90, 0x40, 0xd0, 0x00, 0xcb, 0x11, 0xa9, 0x21, 0x83, 0xfc, 0x03, 0xeb, 0x31, 0x71, 0x49, 0x9c, - 0xb8, 0xd6, 0x23, 0xe2, 0x4a, 0x69, 0x79, 0xf5, 0xdb, 0x11, 0x79, 0x2d, 0x1b, 0x29, 0xf6, 0x6a, - 0xaa, 0x57, 0xb8, 0x27, 0xb0, 0x16, 0x27, 0x86, 0xe2, 0x6e, 0x39, 0x3e, 0x22, 0xc6, 0xeb, 0x95, - 0xc8, 0x71, 0x01, 0xc7, 0x90, 0x9a, 0x58, 0x6d, 0x7c, 0xba, 0x08, 0x0a, 0x09, 0xf5, 0x0e, 0xda, - 0xa1, 0x34, 0xa1, 0x1d, 0x0e, 0x3a, 0xee, 0xcc, 0xbb, 0x3a, 0xee, 0xec, 0x84, 0x8e, 0xfb, 0x81, - 0x2b, 0xca, 0x5e, 0xb4, 0x1a, 0x34, 0xcc, 0x33, 0x2a, 0x67, 0x79, 0x36, 0xe3, 0x57, 0x4d, 0x72, - 0x38, 0x78, 0x55, 0x27, 0x56, 0x55, 0x13, 0x2b, 0xf8, 0xdb, 0x70, 0x8f, 0xe3, 0x1e, 0xc2, 0x46, - 0xb2, 0x28, 0x6c, 0x55, 0xdc, 0x41, 0x39, 0x72, 0x90, 0xb7, 0x22, 0x45, 0x75, 0x60, 0x32, 0x3c, - 0x65, 0xe7, 0xae, 0x3d, 0x65, 0xff, 0x01, 0x2c, 0x3e, 0xe2, 0x9f, 0x2b, 0x31, 0x0e, 0xeb, 0xed, - 0x4e, 0xc0, 0x4a, 0xc6, 0xb0, 0x48, 0x70, 0x31, 0x6a, 0x35, 0xbe, 0x28, 0x14, 0xde, 0x7b, 0x51, - 0x10, 0x07, 0x7a, 0x70, 0xcd, 0x81, 0x7e, 0x74, 0xbf, 0x29, 0xbe, 0xe7, 0x7e, 0x13, 0x8c, 0x41, - 0xb1, 0xed, 0xbc, 0x30, 0x06, 0x8d, 0xdb, 0xe5, 0x87, 0x6c, 0xe2, 0xe9, 0xa7, 0x74, 0xcd, 0xd1, - 0xe9, 0x09, 0x58, 0x3d, 0x45, 0x06, 0xd1, 0x11, 0xa3, 0x76, 0x8b, 0x21, 0xe6, 0x0c, 0x3c, 0x84, - 0xc3, 0xfc, 0xcf, 0x7d, 0x4f, 0xa9, 0x5d, 0xa4, 0x6a, 0x08, 0xfe, 0x26, 0xf8, 0x80, 0x4f, 0x40, - 0x79, 0x6c, 0x18, 0x29, 0xbf, 0x75, 0x18, 0x91, 0xa3, 0x52, 0x2a, 0xf7, 0x46, 0xa7, 0x90, 0x72, - 0xda, 0x0e, 0xa9, 0x62, 0x0d, 0x13, 0x8b, 0x39, 0x3c, 0xe2, 0x4a, 0x92, 0x63, 0x5b, 0xc0, 0xc5, - 0x1c, 0x8b, 0xfa, 0xf0, 0xb1, 0xc8, 0x41, 0x32, 0xe4, 0x44, 0x50, 0x19, 0xe3, 0x9a, 0x84, 0x62, - 0xf0, 0x00, 0x13, 0x67, 0x57, 0x81, 0xc6, 0x76, 0x40, 0x6e, 0x3f, 0x20, 0xe8, 0xc6, 0x81, 0xbc, - 0x94, 0xfc, 0xcc, 0xa1, 0x85, 0x90, 0xf8, 0x33, 0x47, 0xa4, 0x15, 0x54, 0x79, 0x8b, 0x9e, 0xb1, - 0x4b, 0x64, 0xe3, 0x53, 0x6c, 0x3b, 0x84, 0x9a, 0xf2, 0x72, 0x52, 0xe5, 0xce, 0xb0, 0x48, 0xac, - 0xf2, 0x11, 0xab, 0xd4, 0xf5, 0x70, 0xe5, 0xe3, 0xae, 0x87, 0x9f, 0x4b, 0x60, 0x75, 0x04, 0x6b, - 0x98, 0x21, 0x0b, 0xae, 0xf2, 0xc8, 0x7a, 0x41, 0x69, 0xa1, 0x54, 0x8d, 0x69, 0x04, 0x38, 0x21, - 0x98, 0x94, 0x35, 0x76, 0xed, 0xe3, 0xad, 0xb1, 0xff, 0x93, 0xc0, 0xc2, 0x01, 0xbe, 0x10, 0x93, - 0x25, 0xf3, 0x68, 0xb0, 0xef, 0x29, 0xb2, 0x3e, 0x24, 0x99, 0x46, 0x38, 0x23, 0x87, 0x8b, 0x0b, - 0xe9, 0xcd, 0xc9, 0x0b, 0x29, 0x67, 0x1e, 0xec, 0x60, 0xfb, 0x02, 0xeb, 0xf2, 0xba, 0xc0, 0x3c, - 0x11, 0x36, 0xc4, 0x3c, 0x11, 0x06, 0xff, 0x1a, 0xce, 0x27, 0x84, 0xba, 0x4e, 0x78, 0xa1, 0x9b, - 0x36, 0xa5, 0x67, 0xf2, 0x2d, 0x7e, 0x0d, 0x61, 0x74, 0x0d, 0x05, 0x49, 0x32, 0xb3, 0x8c, 0x98, - 0xa8, 0x69, 0x7e, 0xee, 0x7e, 0x26, 0x01, 0x90, 0xfc, 0xec, 0x07, 0x2b, 0xa0, 0xd4, 0x30, 0x39, - 0x8f, 0x85, 0x40, 0x39, 0x03, 0x97, 0x41, 0x39, 0x50, 0x50, 0x71, 0x27, 0x98, 0xd1, 0x11, 0x47, - 0xa5, 0x40, 0x31, 0x40, 0xff, 0x64, 0x3a, 0x0c, 0x9d, 0x13, 0xb3, 0x53, 0x9e, 0x81, 0xab, 0x00, - 0xf2, 0x56, 0x87, 0x6d, 0x51, 0x75, 0x16, 0x2e, 0x84, 0x27, 0xfc, 0x11, 0x11, 0x03, 0xeb, 0xe5, - 0x1b, 0xb0, 0x0c, 0xe6, 0x43, 0xd3, 0x08, 0xc9, 0xc2, 0x45, 0x50, 0x0c, 0x90, 0x96, 0x81, 0x82, - 0x5d, 0xad, 0x3c, 0x17, 0x03, 0x6a, 0xd0, 0x9e, 0xcf, 0x71, 0x39, 0x57, 0xff, 0xfd, 0x8b, 0x57, - 0xd5, 0xcc, 0xcb, 0x57, 0xd5, 0xcc, 0x9b, 0x57, 0x55, 0xe9, 0x5f, 0xfd, 0xaa, 0xf4, 0x45, 0xbf, - 0x2a, 0x3d, 0xef, 0x57, 0xa5, 0x17, 0xfd, 0xaa, 0xf4, 0xb2, 0x5f, 0x95, 0xbe, 0xeb, 0x57, 0xa5, - 0x1f, 0xfa, 0xd5, 0xcc, 0x9b, 0x7e, 0x55, 0x7a, 0xf6, 0xba, 0x9a, 0x79, 0xf1, 0xba, 0x9a, 0x79, - 0xf9, 0xba, 0x9a, 0xf9, 0x4b, 0x96, 0xff, 0xde, 0xda, 0x9e, 0xe3, 0x89, 0xfa, 0xd5, 0x4f, 0x01, - 0x00, 0x00, 0xff, 0xff, 0x99, 0x53, 0x47, 0xdf, 0xd3, 0x15, 0x00, 0x00, + // 1740 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcf, 0x6f, 0x23, 0x49, + 0x15, 0x76, 0x4f, 0xc6, 0xb1, 0x5d, 0x8e, 0x63, 0xbb, 0xf2, 0xab, 0x27, 0xb3, 0xe3, 0x36, 0x01, + 0xa4, 0xb0, 0x22, 0x89, 0x14, 0xb4, 0x12, 0x12, 0x02, 0x14, 0x27, 0x13, 0xd6, 0xec, 0x24, 0x6b, + 0xb5, 0x43, 0x24, 0xd0, 0x22, 0x51, 0xee, 0xae, 0xd8, 0xa5, 0xb4, 0xbb, 0x7a, 0xbb, 0xab, 0x93, + 0x09, 0x07, 0xc4, 0x01, 0x2e, 0x48, 0x2b, 0xad, 0x84, 0xc4, 0x95, 0x0b, 0x48, 0x88, 0x7f, 0x80, + 0x13, 0x27, 0x2e, 0x7b, 0x9c, 0xe3, 0x9c, 0x1a, 0xc6, 0x73, 0x00, 0xf5, 0x69, 0xff, 0x04, 0x54, + 0xd5, 0xdd, 0xee, 0xb2, 0xdd, 0x9e, 0xc9, 0xae, 0x64, 0xcd, 0x29, 0xe9, 0xef, 0xbd, 0xef, 0xab, + 0xd7, 0xd5, 0xaf, 0xde, 0xab, 0x67, 0x50, 0x1d, 0x62, 0x86, 0x5a, 0x16, 0x35, 0xae, 0xf7, 0x1d, + 0x97, 0x32, 0x0a, 0xf3, 0xe2, 0xcf, 0xf6, 0x5e, 0x9f, 0xb0, 0x81, 0xdf, 0xdb, 0x37, 0xe8, 0xf0, + 0xa0, 0x4f, 0xfb, 0xf4, 0x40, 0xc0, 0x3d, 0xff, 0x4a, 0x3c, 0x89, 0x07, 0xf1, 0x5f, 0xc4, 0xda, + 0x2e, 0xf7, 0x52, 0x89, 0xed, 0x8a, 0x78, 0xb8, 0x3c, 0x8c, 0x1e, 0x77, 0xfe, 0xfb, 0x00, 0x14, + 0x3b, 0x18, 0xbb, 0x27, 0x88, 0x21, 0x78, 0x00, 0x0a, 0x47, 0xa6, 0xe9, 0x62, 0xcf, 0x53, 0x95, + 0xa6, 0xb2, 0xbb, 0xd2, 0xda, 0x08, 0x03, 0xad, 0x8e, 0x22, 0xe8, 0xbb, 0x74, 0x48, 0x18, 0x1e, + 0x3a, 0xec, 0x4e, 0x4f, 0xbc, 0xe0, 0x07, 0xa0, 0xd4, 0xf1, 0x7b, 0x16, 0x31, 0x3e, 0xc2, 0x77, + 0xea, 0x03, 0x41, 0xd9, 0x0a, 0x03, 0x6d, 0xcd, 0x49, 0x40, 0x89, 0x94, 0x7a, 0xc2, 0x0f, 0xc0, + 0xf2, 0x91, 0xc1, 0x08, 0xb5, 0xd5, 0xa5, 0xa6, 0xb2, 0xbb, 0x7a, 0x58, 0x8f, 0x82, 0xd9, 0xe7, + 0x81, 0x44, 0x86, 0x16, 0x08, 0x03, 0x6d, 0x19, 0x89, 0xff, 0xf5, 0xd8, 0x99, 0xaf, 0x76, 0x41, + 0x86, 0xb8, 0xcb, 0xd0, 0xd0, 0x51, 0x1f, 0x36, 0x95, 0xdd, 0x87, 0xd1, 0x6a, 0x2c, 0x01, 0xe5, + 0xd5, 0xc6, 0x9e, 0xf0, 0x77, 0x0a, 0x28, 0x5f, 0x22, 0xcb, 0xc7, 0xc7, 0x03, 0x64, 0xf7, 0xb1, + 0x9a, 0x17, 0x71, 0xf6, 0xc2, 0x40, 0xdb, 0xb8, 0x49, 0xe1, 0x94, 0xfb, 0xf7, 0x7f, 0x6b, 0x4f, + 0x87, 0x88, 0x0d, 0x0e, 0x7a, 0xa4, 0xbf, 0xdf, 0xb6, 0xd9, 0x0f, 0xa4, 0xdd, 0x1e, 0xfa, 0x16, + 0x23, 0x37, 0xd8, 0xf5, 0x9e, 0x1f, 0x0c, 0x9f, 0xef, 0x19, 0x03, 0x44, 0xec, 0x3d, 0x83, 0xba, + 0x78, 0xaf, 0x4f, 0x0f, 0x4c, 0xc4, 0xd0, 0x7e, 0x8b, 0xf4, 0xdb, 0x36, 0x3b, 0x46, 0x1e, 0xc3, + 0xae, 0x2e, 0x2f, 0xbb, 0xf3, 0x59, 0x09, 0x94, 0xba, 0x03, 0xe4, 0x9a, 0x62, 0xab, 0xbf, 0x0f, + 0xc0, 0x87, 0x18, 0x99, 0xd8, 0xfd, 0x10, 0x79, 0x83, 0x78, 0xeb, 0xd4, 0x30, 0xd0, 0xd6, 0x07, + 0x63, 0x54, 0x7a, 0x1b, 0xc9, 0x17, 0x5e, 0x83, 0x0d, 0x21, 0x73, 0x46, 0x6c, 0x22, 0x72, 0x23, + 0xb2, 0x79, 0xea, 0x52, 0x73, 0x69, 0xb7, 0x7c, 0xb8, 0x19, 0xef, 0xe5, 0x94, 0xb9, 0xf5, 0xe4, + 0x8b, 0x40, 0xcb, 0xf1, 0x77, 0xf6, 0xb2, 0xc8, 0x7a, 0xb6, 0x26, 0xfc, 0x11, 0x58, 0xe9, 0xb8, + 0xf8, 0x46, 0x47, 0xb6, 0xd9, 0xc5, 0xd8, 0x14, 0xbb, 0xbe, 0xd2, 0xda, 0x0e, 0x03, 0x6d, 0xd3, + 0x91, 0x70, 0x29, 0xd4, 0x09, 0x7f, 0x78, 0x04, 0x2a, 0x1d, 0xbf, 0xf7, 0x11, 0xbe, 0xf3, 0x5a, + 0x84, 0x0d, 0x91, 0x13, 0x6f, 0xfe, 0xe3, 0x30, 0xd0, 0xb6, 0x1c, 0xd9, 0x20, 0x29, 0x4c, 0x32, + 0xf8, 0x57, 0xef, 0x92, 0xbe, 0x8d, 0x98, 0xef, 0x62, 0x75, 0x39, 0xcd, 0x31, 0x2f, 0x01, 0xe5, + 0xaf, 0x3e, 0xf6, 0x84, 0x1a, 0xc8, 0xeb, 0xd4, 0xb7, 0x4d, 0xb5, 0x28, 0x12, 0xa5, 0x14, 0x06, + 0x5a, 0xde, 0xe5, 0x80, 0x1e, 0xe1, 0xf0, 0x10, 0x14, 0x79, 0xa8, 0x62, 0xff, 0x4b, 0x42, 0x76, + 0x33, 0x0c, 0x34, 0xe8, 0xc4, 0x98, 0xa4, 0x3a, 0xf6, 0xe3, 0xa2, 0xe7, 0xd4, 0x36, 0xb0, 0x0a, + 0x52, 0x51, 0x9b, 0x03, 0x7a, 0x84, 0xc3, 0xcf, 0x15, 0x50, 0x3d, 0x32, 0x0c, 0x7f, 0xe8, 0x5b, + 0x88, 0x61, 0xf3, 0x14, 0x63, 0x4f, 0x5d, 0x11, 0xe2, 0x57, 0x61, 0xa0, 0x3d, 0x42, 0x93, 0xa6, + 0x45, 0xe4, 0xdc, 0xf4, 0xf2, 0xf0, 0x0f, 0x0a, 0xa8, 0x9c, 0xe0, 0x1b, 0x6c, 0x51, 0x07, 0xbb, + 0x22, 0xa0, 0x55, 0x11, 0x90, 0xc9, 0xbf, 0x81, 0x29, 0x1b, 0x16, 0x11, 0xce, 0xe4, 0xd2, 0xf0, + 0x19, 0x58, 0x3f, 0xf7, 0x87, 0x1d, 0x6c, 0x9b, 0xc4, 0xee, 0x8f, 0xb3, 0xcd, 0x53, 0xcb, 0x4d, + 0x65, 0xb7, 0x12, 0x1d, 0x00, 0x3b, 0xc3, 0xae, 0x67, 0xb2, 0xe0, 0xc7, 0x60, 0xe3, 0x19, 0xf2, + 0x58, 0xdb, 0x36, 0x2c, 0xdf, 0xc4, 0xe6, 0x19, 0x66, 0x28, 0xfa, 0x3c, 0x15, 0xf1, 0x79, 0x1e, + 0xf1, 0x74, 0xb7, 0xb2, 0x1c, 0xf4, 0x6c, 0x1e, 0xfc, 0x36, 0x28, 0x88, 0x73, 0xd0, 0x3e, 0x11, + 0x05, 0xb0, 0xd2, 0x2a, 0x87, 0x81, 0x56, 0xf0, 0x22, 0x48, 0x4f, 0x6c, 0xdc, 0xed, 0xe2, 0xf9, + 0x31, 0xf5, 0x6d, 0xa6, 0x16, 0x52, 0x37, 0x16, 0x41, 0x7a, 0x62, 0x83, 0x9f, 0x02, 0x95, 0x67, + 0x0e, 0xa1, 0xbe, 0x27, 0x98, 0xd1, 0xa1, 0xea, 0xb8, 0x94, 0x5e, 0xa9, 0xd5, 0xa6, 0xb2, 0x5b, + 0x3e, 0x84, 0xf1, 0x61, 0x95, 0x2c, 0xad, 0x6f, 0x84, 0x81, 0xf6, 0xc4, 0x89, 0x79, 0x92, 0x41, + 0x4a, 0xc8, 0xb9, 0xb2, 0xf0, 0x3b, 0x20, 0xff, 0xd4, 0xa1, 0xc6, 0x40, 0xad, 0x89, 0xb8, 0xd6, + 0xc2, 0x40, 0xab, 0x62, 0x0e, 0x48, 0xec, 0xc8, 0x63, 0xe7, 0xf7, 0x79, 0xb0, 0x26, 0xfe, 0xeb, + 0x32, 0xe4, 0xb2, 0xb4, 0x32, 0xdd, 0x73, 0x0f, 0xb4, 0x64, 0xa5, 0x92, 0x70, 0x12, 0x47, 0x41, + 0xac, 0x14, 0xeb, 0xa7, 0x07, 0xb0, 0x30, 0xe7, 0x00, 0x8e, 0x0f, 0x53, 0x71, 0xce, 0x61, 0xfa, + 0xfa, 0x35, 0xf2, 0x10, 0x14, 0x75, 0x4a, 0x99, 0xe0, 0x2d, 0xa5, 0x67, 0xdb, 0x8d, 0x31, 0xf9, + 0x6c, 0x27, 0x7e, 0xf0, 0x0c, 0xd4, 0xbb, 0xc6, 0x00, 0x9b, 0xbe, 0x85, 0xcd, 0x31, 0x19, 0x08, + 0xb2, 0x16, 0x06, 0xda, 0x63, 0x6f, 0xda, 0x28, 0xa9, 0xcc, 0x32, 0xe1, 0xcf, 0xc1, 0xc6, 0x29, + 0x71, 0x3d, 0x96, 0x64, 0x6d, 0xd2, 0xc9, 0xe3, 0x12, 0xfa, 0xcd, 0x30, 0xd0, 0xb4, 0xab, 0x2c, + 0x07, 0x49, 0x36, 0x5b, 0x81, 0x4b, 0xf3, 0xf4, 0x3d, 0x25, 0x36, 0xf1, 0x06, 0x51, 0xfa, 0x46, + 0xd2, 0xf9, 0x54, 0xda, 0xca, 0x72, 0x90, 0xa5, 0x33, 0x15, 0xe0, 0xa7, 0x60, 0x6b, 0xfa, 0x98, + 0x25, 0xed, 0x65, 0xf9, 0x8d, 0xed, 0x45, 0x8b, 0xdb, 0xcb, 0x96, 0x93, 0x4d, 0xd7, 0xe7, 0xe9, + 0xee, 0xfc, 0xa3, 0x08, 0x4a, 0x4f, 0x0d, 0x6a, 0xd3, 0x21, 0x31, 0x3c, 0xd1, 0xac, 0x2f, 0x28, + 0x43, 0x56, 0xd7, 0x77, 0x1c, 0xeb, 0x2e, 0xbe, 0x87, 0x88, 0x66, 0xcd, 0x52, 0x78, 0x21, 0xcd, + 0x5a, 0x5a, 0x16, 0xfe, 0x49, 0x01, 0x75, 0xf1, 0x7c, 0x41, 0x4f, 0x88, 0xc7, 0x5c, 0xd2, 0xf3, + 0x19, 0x8e, 0x53, 0x70, 0xc0, 0xb3, 0x81, 0x4d, 0x1b, 0x17, 0x11, 0xd2, 0x6c, 0x08, 0xf0, 0x8f, + 0x0a, 0xa8, 0x09, 0xf4, 0x1c, 0xdf, 0x5a, 0x77, 0x67, 0xc4, 0x66, 0xd8, 0x8c, 0x53, 0xbc, 0x1f, + 0x06, 0xda, 0x36, 0x9b, 0xb2, 0x2d, 0x22, 0xac, 0x99, 0x00, 0x44, 0xdb, 0xd3, 0xf1, 0x2d, 0x72, + 0x4d, 0xaf, 0x83, 0x5d, 0x39, 0xcf, 0x45, 0xdb, 0x73, 0x27, 0x4d, 0x0b, 0x69, 0x7b, 0x53, 0xcb, + 0xc3, 0x7f, 0x29, 0xa0, 0x19, 0x63, 0xa7, 0x94, 0x57, 0x47, 0x46, 0x0d, 0x6a, 0x75, 0x7d, 0x8f, + 0x21, 0x62, 0xa3, 0x1e, 0xb1, 0x08, 0xbb, 0x8b, 0x0f, 0xcc, 0x6d, 0x18, 0x68, 0xef, 0xbb, 0x6f, + 0xf1, 0x5d, 0x44, 0xd0, 0x6f, 0x0d, 0x10, 0xfe, 0x06, 0x94, 0xce, 0xa9, 0x89, 0x3b, 0x2e, 0x31, + 0x92, 0xcb, 0xcf, 0xaf, 0xf8, 0xe5, 0xc7, 0x4e, 0xc0, 0x45, 0x84, 0x95, 0x2e, 0x09, 0xdb, 0x60, + 0x8d, 0xf7, 0x9a, 0xb4, 0x4f, 0xc8, 0x25, 0x3d, 0xba, 0xea, 0xcf, 0x9a, 0xf5, 0x2c, 0x0e, 0xec, + 0x00, 0x38, 0x09, 0x8b, 0x02, 0x5b, 0x14, 0xef, 0xd4, 0x0c, 0x03, 0xed, 0x3d, 0x67, 0xc6, 0x2a, + 0xd5, 0xab, 0x0c, 0xee, 0xce, 0x3f, 0x15, 0x00, 0x52, 0x08, 0x5a, 0x60, 0x3d, 0x2e, 0x6a, 0xc8, + 0x22, 0xbf, 0xc6, 0x66, 0x52, 0xb8, 0x14, 0x51, 0xb8, 0xb6, 0xe3, 0xc2, 0x95, 0xd1, 0xf2, 0x5a, + 0xef, 0xc5, 0xc5, 0x6b, 0xdd, 0xca, 0xe0, 0xeb, 0x99, 0xaa, 0xf0, 0x48, 0xaa, 0x5a, 0xa2, 0x30, + 0x94, 0x0f, 0x6b, 0xc9, 0x12, 0x09, 0xde, 0xaa, 0xc7, 0xc2, 0x25, 0x9c, 0x40, 0x7a, 0xca, 0xda, + 0xf9, 0x73, 0x15, 0x94, 0xd2, 0xd2, 0x3b, 0x6e, 0x87, 0xca, 0x9c, 0x76, 0x38, 0xee, 0xb8, 0x0f, + 0xde, 0xd6, 0x71, 0x97, 0xe6, 0x74, 0xdc, 0xaf, 0x39, 0x40, 0x1d, 0xc5, 0x83, 0x4b, 0xdb, 0xbe, + 0xa2, 0x6a, 0x5e, 0xec, 0x66, 0xf2, 0xaa, 0xe9, 0x1e, 0x8e, 0x5f, 0xd5, 0x4b, 0x5c, 0xf5, 0x94, + 0x05, 0x7f, 0x18, 0x4d, 0x99, 0x42, 0x21, 0x6a, 0x24, 0x55, 0x69, 0xe6, 0x13, 0x02, 0xb5, 0x58, + 0xa0, 0xe8, 0xc4, 0x8e, 0xfa, 0x98, 0x32, 0x39, 0x03, 0x14, 0xee, 0x3d, 0x03, 0xfc, 0x04, 0x54, + 0x9f, 0x89, 0xcf, 0x95, 0x92, 0xa3, 0x7c, 0x7b, 0xc2, 0xab, 0x92, 0x35, 0x69, 0x92, 0x24, 0xa6, + 0x59, 0xb3, 0x63, 0x4c, 0xe9, 0x2b, 0x8f, 0x31, 0xf2, 0xb8, 0x01, 0xee, 0x39, 0x6e, 0x4c, 0x4f, + 0x5f, 0xe5, 0xaf, 0x38, 0x7d, 0xf1, 0x6b, 0x50, 0xc2, 0x5d, 0x91, 0xae, 0x41, 0xb3, 0xbc, 0xe2, + 0x04, 0x27, 0xb9, 0xfd, 0x54, 0xee, 0x79, 0x75, 0xfa, 0x04, 0x6c, 0x5e, 0x22, 0x8b, 0x98, 0x88, + 0x51, 0xb7, 0xcb, 0x10, 0xf3, 0xc6, 0x0a, 0xd1, 0xa8, 0xf1, 0xad, 0x30, 0xd0, 0x9a, 0x37, 0x99, + 0x1e, 0x92, 0xde, 0x1c, 0x0d, 0xf8, 0x09, 0xa8, 0xcd, 0x5c, 0x46, 0x6a, 0x6f, 0xbc, 0x8c, 0xa8, + 0x71, 0x2a, 0xd5, 0x86, 0xd3, 0xb7, 0x90, 0x5a, 0xd6, 0x84, 0xab, 0x63, 0x03, 0x13, 0x87, 0x79, + 0x22, 0xe2, 0x7a, 0xba, 0xc7, 0xae, 0x84, 0xcb, 0x7b, 0x2c, 0xfb, 0xc3, 0x8f, 0xe5, 0x1a, 0xa4, + 0x42, 0x51, 0x08, 0xea, 0x33, 0xb5, 0x26, 0x2d, 0x31, 0x78, 0x8c, 0xc9, 0x77, 0x57, 0xa9, 0x8c, + 0x1d, 0x80, 0xc2, 0x31, 0x2f, 0xd0, 0xed, 0x13, 0x75, 0x2d, 0xfd, 0x11, 0xc6, 0x88, 0x20, 0xf9, + 0x47, 0x98, 0xd8, 0x8b, 0x67, 0x79, 0x97, 0x5e, 0xb1, 0x5b, 0xe4, 0xe2, 0x4b, 0xec, 0x7a, 0x84, + 0xda, 0xea, 0x7a, 0x9a, 0xe5, 0xde, 0xa4, 0x49, 0xce, 0xf2, 0x29, 0x56, 0xe6, 0xf0, 0xba, 0xf1, + 0x6e, 0x87, 0xd7, 0xbf, 0x2a, 0x60, 0x73, 0x0a, 0x6b, 0xdb, 0x51, 0x15, 0xdc, 0x14, 0x91, 0x0d, + 0x79, 0x6a, 0xa1, 0x4c, 0x8f, 0x45, 0x04, 0x38, 0x27, 0x98, 0x8c, 0x21, 0x7b, 0xeb, 0xdd, 0x0d, + 0xd9, 0x9f, 0x29, 0x60, 0xf5, 0x04, 0xdf, 0xc8, 0x9b, 0xa5, 0x8a, 0x68, 0x70, 0x18, 0x68, 0xaa, + 0x39, 0x61, 0x59, 0x44, 0x38, 0x53, 0x8b, 0xcb, 0xe3, 0xf2, 0xa3, 0x37, 0x8c, 0xcb, 0xbc, 0xf2, + 0x60, 0x0f, 0xbb, 0x37, 0xd8, 0x54, 0xb7, 0xa5, 0xca, 0x13, 0x63, 0x13, 0x95, 0x27, 0xc6, 0xe0, + 0x2f, 0xa3, 0xfb, 0xc9, 0xd4, 0xa8, 0xac, 0x3e, 0x9e, 0x3b, 0x5d, 0x8f, 0xef, 0x2c, 0x53, 0x14, + 0x3d, 0x4b, 0xe7, 0xfd, 0xbf, 0x28, 0x00, 0xa4, 0x3f, 0x4a, 0xc2, 0x3a, 0xa8, 0xb4, 0x6d, 0x51, + 0xc7, 0x22, 0xa0, 0x96, 0x83, 0xeb, 0xa0, 0xc6, 0x1d, 0x74, 0xdc, 0xe7, 0x77, 0x74, 0x24, 0x50, + 0x85, 0x3b, 0x72, 0xf4, 0x67, 0xb6, 0xc7, 0xd0, 0x35, 0xb1, 0xfb, 0xb5, 0x07, 0x70, 0x13, 0x40, + 0xd1, 0xea, 0xb0, 0x2b, 0xbb, 0x2e, 0xc1, 0xd5, 0x68, 0x85, 0x9f, 0x22, 0x62, 0x61, 0xb3, 0xf6, + 0x10, 0xd6, 0xc0, 0x4a, 0x44, 0x8d, 0x91, 0x3c, 0xac, 0x82, 0x32, 0x47, 0xba, 0x16, 0xe2, 0xb3, + 0x5a, 0x6d, 0x39, 0x01, 0x74, 0xde, 0x9e, 0xaf, 0x71, 0xad, 0xd0, 0xfa, 0xf1, 0x8b, 0x57, 0x8d, + 0xdc, 0xcb, 0x57, 0x8d, 0xdc, 0x97, 0xaf, 0x1a, 0xca, 0x6f, 0x47, 0x0d, 0xe5, 0x6f, 0xa3, 0x86, + 0xf2, 0xc5, 0xa8, 0xa1, 0xbc, 0x18, 0x35, 0x94, 0x97, 0xa3, 0x86, 0xf2, 0x9f, 0x51, 0x43, 0xf9, + 0xdf, 0xa8, 0x91, 0xfb, 0x72, 0xd4, 0x50, 0x3e, 0x7f, 0xdd, 0xc8, 0xbd, 0x78, 0xdd, 0xc8, 0xbd, + 0x7c, 0xdd, 0xc8, 0xfd, 0x22, 0x2f, 0x7e, 0x0d, 0xee, 0x2d, 0x8b, 0x8d, 0xfa, 0xde, 0xff, 0x03, + 0x00, 0x00, 0xff, 0xff, 0xa1, 0x60, 0x92, 0xd0, 0x71, 0x16, 0x00, 0x00, } func (x PeerAction) String() string { @@ -1023,6 +1042,12 @@ func (this *ShardData) Equal(that interface{}) bool { if this.TxCount != that1.TxCount { return false } + if !this.PreviousShardHeaderProof.Equal(that1.PreviousShardHeaderProof) { + return false + } + if this.Epoch != that1.Epoch { + return false + } return true } func (this *EpochStartShardData) Equal(that interface{}) bool { @@ -1320,7 +1345,7 @@ func (this *ShardData) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 18) + s := make([]string, 0, 20) s = append(s, "&block.ShardData{") s = append(s, "HeaderHash: "+fmt.Sprintf("%#v", this.HeaderHash)+",\n") if this.ShardMiniBlockHeaders != nil { @@ -1342,6 +1367,10 @@ func (this *ShardData) GoString() string { s = append(s, "LastIncludedMetaNonce: "+fmt.Sprintf("%#v", this.LastIncludedMetaNonce)+",\n") s = append(s, "ShardID: "+fmt.Sprintf("%#v", this.ShardID)+",\n") s = append(s, "TxCount: "+fmt.Sprintf("%#v", this.TxCount)+",\n") + if this.PreviousShardHeaderProof != nil { + s = append(s, "PreviousShardHeaderProof: "+fmt.Sprintf("%#v", this.PreviousShardHeaderProof)+",\n") + } + s = append(s, "Epoch: "+fmt.Sprintf("%#v", this.Epoch)+",\n") s = append(s, "}") return strings.Join(s, "") } @@ -1545,6 +1574,25 @@ func (m *ShardData) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.Epoch != 0 { + i = encodeVarintMetaBlock(dAtA, i, uint64(m.Epoch)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x80 + } + if m.PreviousShardHeaderProof != nil { + { + size, err := m.PreviousShardHeaderProof.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintMetaBlock(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x7a + } { __caster := &github_com_multiversx_mx_chain_core_go_data.BigIntCaster{} size := __caster.Size(m.DeveloperFees) @@ -2252,6 +2300,13 @@ func (m *ShardData) Size() (n int) { l = __caster.Size(m.DeveloperFees) n += 1 + l + sovMetaBlock(uint64(l)) } + if m.PreviousShardHeaderProof != nil { + l = m.PreviousShardHeaderProof.Size() + n += 1 + l + sovMetaBlock(uint64(l)) + } + if m.Epoch != 0 { + n += 2 + sovMetaBlock(uint64(m.Epoch)) + } return n } @@ -2525,6 +2580,8 @@ func (this *ShardData) String() string { `AccumulatedFees:` + fmt.Sprintf("%v", this.AccumulatedFees) + `,`, `LastIncludedMetaNonce:` + fmt.Sprintf("%v", this.LastIncludedMetaNonce) + `,`, `DeveloperFees:` + fmt.Sprintf("%v", this.DeveloperFees) + `,`, + `PreviousShardHeaderProof:` + strings.Replace(fmt.Sprintf("%v", this.PreviousShardHeaderProof), "HeaderProof", "HeaderProof", 1) + `,`, + `Epoch:` + fmt.Sprintf("%v", this.Epoch) + `,`, `}`, }, "") return s @@ -3264,6 +3321,61 @@ func (m *ShardData) Unmarshal(dAtA []byte) error { } } iNdEx = postIndex + case 15: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PreviousShardHeaderProof", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMetaBlock + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthMetaBlock + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMetaBlock + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.PreviousShardHeaderProof == nil { + m.PreviousShardHeaderProof = &HeaderProof{} + } + if err := m.PreviousShardHeaderProof.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 16: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Epoch", wireType) + } + m.Epoch = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMetaBlock + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Epoch |= uint32(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipMetaBlock(dAtA[iNdEx:]) diff --git a/data/block/metaBlock.proto b/data/block/metaBlock.proto index 8d50a16b..53c150cd 100644 --- a/data/block/metaBlock.proto +++ b/data/block/metaBlock.proto @@ -37,20 +37,22 @@ message PeerData { // ShardData holds the block information sent by the shards to the metachain message ShardData { - bytes HeaderHash = 2 [(gogoproto.jsontag) = "headerHash,omitempty"]; - repeated MiniBlockHeader ShardMiniBlockHeaders = 3 [(gogoproto.jsontag) = "shardMiniBlockHeaders", (gogoproto.nullable) = false]; - bytes PrevRandSeed = 4 [(gogoproto.jsontag) = "prevRandSeed,omitempty"]; - bytes PubKeysBitmap = 5 [(gogoproto.jsontag) = "pubKeysBitmap,omitempty"]; - bytes Signature = 6 [(gogoproto.jsontag) = "signature,omitempty"]; - uint64 Round = 8 [(gogoproto.jsontag) = "round"]; - bytes PrevHash = 9 [(gogoproto.jsontag) = "prevHash,omitempty"]; - uint64 Nonce = 10 [(gogoproto.jsontag) = "nonce"]; - bytes AccumulatedFees = 12 [(gogoproto.jsontag) = "accumulatedFees,omitempty", (gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"]; - bytes DeveloperFees = 14 [(gogoproto.jsontag) = "developerFees,omitempty", (gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"]; - uint32 NumPendingMiniBlocks = 11 [(gogoproto.jsontag) = "numPendingMiniBlocks"]; - uint64 LastIncludedMetaNonce = 13 [(gogoproto.jsontag) = "lastIncludedMetaNonce"]; - uint32 ShardID = 1 [(gogoproto.jsontag) = "shardID"]; - uint32 TxCount = 7 [(gogoproto.jsontag) = "txCount"]; + bytes HeaderHash = 2 [(gogoproto.jsontag) = "headerHash,omitempty"]; + repeated MiniBlockHeader ShardMiniBlockHeaders = 3 [(gogoproto.jsontag) = "shardMiniBlockHeaders", (gogoproto.nullable) = false]; + bytes PrevRandSeed = 4 [(gogoproto.jsontag) = "prevRandSeed,omitempty"]; + bytes PubKeysBitmap = 5 [(gogoproto.jsontag) = "pubKeysBitmap,omitempty"]; + bytes Signature = 6 [(gogoproto.jsontag) = "signature,omitempty"]; + uint64 Round = 8 [(gogoproto.jsontag) = "round"]; + bytes PrevHash = 9 [(gogoproto.jsontag) = "prevHash,omitempty"]; + uint64 Nonce = 10 [(gogoproto.jsontag) = "nonce"]; + bytes AccumulatedFees = 12 [(gogoproto.jsontag) = "accumulatedFees,omitempty", (gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"]; + bytes DeveloperFees = 14 [(gogoproto.jsontag) = "developerFees,omitempty", (gogoproto.casttypewith) = "math/big.Int;github.com/multiversx/mx-chain-core-go/data.BigIntCaster"]; + uint32 NumPendingMiniBlocks = 11 [(gogoproto.jsontag) = "numPendingMiniBlocks"]; + uint64 LastIncludedMetaNonce = 13 [(gogoproto.jsontag) = "lastIncludedMetaNonce"]; + uint32 ShardID = 1 [(gogoproto.jsontag) = "shardID"]; + uint32 TxCount = 7 [(gogoproto.jsontag) = "txCount"]; + HeaderProof PreviousShardHeaderProof = 15 [(gogoproto.jsontag) = "previousHeaderProof,omitempty"]; + uint32 Epoch = 16 [(gogoproto.jsontag) = "epoch,omitempty"]; } // EpochStartShardData hold the last finalized headers hash and state root hash diff --git a/data/block/shardDataHandler.go b/data/block/shardDataHandler.go index 2599d0c1..d0e7ecfe 100644 --- a/data/block/shardDataHandler.go +++ b/data/block/shardDataHandler.go @@ -3,6 +3,7 @@ package block import ( "math/big" + "github.com/multiversx/mx-chain-core-go/core/check" "github.com/multiversx/mx-chain-core-go/data" ) @@ -202,6 +203,34 @@ func (sd *ShardData) SetTxCount(txCount uint32) error { return nil } +// GetPreviousProof returns the previous shard header proof +func (sd *ShardData) GetPreviousProof() data.HeaderProofHandler { + return sd.PreviousShardHeaderProof +} + +// SetPreviousProof sets the previous shard header proof +func (sd *ShardData) SetPreviousProof(proof data.HeaderProofHandler) error { + if sd == nil { + return data.ErrNilPointerReceiver + } + + if check.IfNilReflect(proof) { + sd.PreviousShardHeaderProof = nil + return nil + } + + sd.PreviousShardHeaderProof = &HeaderProof{ + PubKeysBitmap: proof.GetPubKeysBitmap(), + AggregatedSignature: proof.GetAggregatedSignature(), + HeaderHash: proof.GetHeaderHash(), + HeaderEpoch: proof.GetHeaderEpoch(), + HeaderNonce: proof.GetHeaderNonce(), + HeaderShardId: proof.GetHeaderShardId(), + } + + return nil +} + // ShallowClone creates and returns a shallow clone of shardData func (sd *ShardData) ShallowClone() data.ShardDataHandler { if sd == nil { diff --git a/data/interface.go b/data/interface.go index ad16705a..dffdf419 100644 --- a/data/interface.go +++ b/data/interface.go @@ -175,6 +175,7 @@ type ShardDataHandler interface { GetLastIncludedMetaNonce() uint64 GetShardID() uint32 GetTxCount() uint32 + GetPreviousProof() HeaderProofHandler SetHeaderHash(hash []byte) error SetShardMiniBlockHeaderHandlers(mbHeaderHandlers []MiniBlockHeaderHandler) error @@ -190,6 +191,7 @@ type ShardDataHandler interface { SetLastIncludedMetaNonce(nonce uint64) error SetShardID(shardID uint32) error SetTxCount(txCount uint32) error + SetPreviousProof(proof HeaderProofHandler) error ShallowClone() ShardDataHandler }