From 151607a9e7e56508114d17c6997cfef6637046f4 Mon Sep 17 00:00:00 2001 From: Iuga Mihai Date: Wed, 19 Jul 2023 12:33:10 +0300 Subject: [PATCH 1/4] extend HeaderDataWithBody --- data/outport/outportBlock.pb.go | 540 ++++++++++++++++++++++---------- data/outport/outportBlock.proto | 39 ++- 2 files changed, 393 insertions(+), 186 deletions(-) diff --git a/data/outport/outportBlock.pb.go b/data/outport/outportBlock.pb.go index 0a1ad0f8..b43853f8 100644 --- a/data/outport/outportBlock.pb.go +++ b/data/outport/outportBlock.pb.go @@ -37,15 +37,16 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type OutportBlock struct { - BlockData *BlockData `protobuf:"bytes,1,opt,name=BlockData,proto3" json:"blockData,omitempty"` - TransactionPool *TransactionPool `protobuf:"bytes,2,opt,name=TransactionPool,proto3" json:"transactionPool,omitempty"` - HeaderGasConsumption *HeaderGasConsumption `protobuf:"bytes,3,opt,name=HeaderGasConsumption,proto3" json:"headerGasConsumption,omitempty"` - AlteredAccounts map[string]*alteredAccount.AlteredAccount `protobuf:"bytes,4,rep,name=AlteredAccounts,proto3" json:"alteredAccounts,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - NotarizedHeadersHashes []string `protobuf:"bytes,5,rep,name=NotarizedHeadersHashes,proto3" json:"notarizedHeadersHashes,omitempty"` - NumberOfShards uint32 `protobuf:"varint,6,opt,name=NumberOfShards,proto3" json:"numberOfShards"` - SignersIndexes []uint64 `protobuf:"varint,7,rep,packed,name=SignersIndexes,proto3" json:"signersIndexes,omitempty"` - HighestFinalBlockNonce uint64 `protobuf:"varint,8,opt,name=HighestFinalBlockNonce,proto3" json:"highestFinalBlockNonce"` - HighestFinalBlockHash []byte `protobuf:"bytes,9,opt,name=HighestFinalBlockHash,proto3" json:"highestFinalBlockHash,omitempty"` + ShardID uint32 `protobuf:"varint,1,opt,name=ShardID,proto3" json:"shardID,omitempty"` + BlockData *BlockData `protobuf:"bytes,2,opt,name=BlockData,proto3" json:"blockData,omitempty"` + TransactionPool *TransactionPool `protobuf:"bytes,3,opt,name=TransactionPool,proto3" json:"transactionPool,omitempty"` + HeaderGasConsumption *HeaderGasConsumption `protobuf:"bytes,4,opt,name=HeaderGasConsumption,proto3" json:"headerGasConsumption,omitempty"` + AlteredAccounts map[string]*alteredAccount.AlteredAccount `protobuf:"bytes,5,rep,name=AlteredAccounts,proto3" json:"alteredAccounts,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + NotarizedHeadersHashes []string `protobuf:"bytes,6,rep,name=NotarizedHeadersHashes,proto3" json:"notarizedHeadersHashes,omitempty"` + NumberOfShards uint32 `protobuf:"varint,7,opt,name=NumberOfShards,proto3" json:"numberOfShards"` + SignersIndexes []uint64 `protobuf:"varint,8,rep,packed,name=SignersIndexes,proto3" json:"signersIndexes,omitempty"` + HighestFinalBlockNonce uint64 `protobuf:"varint,9,opt,name=HighestFinalBlockNonce,proto3" json:"highestFinalBlockNonce"` + HighestFinalBlockHash []byte `protobuf:"bytes,10,opt,name=HighestFinalBlockHash,proto3" json:"highestFinalBlockHash,omitempty"` } func (m *OutportBlock) Reset() { *m = OutportBlock{} } @@ -76,6 +77,13 @@ func (m *OutportBlock) XXX_DiscardUnknown() { var xxx_messageInfo_OutportBlock proto.InternalMessageInfo +func (m *OutportBlock) GetShardID() uint32 { + if m != nil { + return m.ShardID + } + return 0 +} + func (m *OutportBlock) GetBlockData() *BlockData { if m != nil { return m.BlockData @@ -140,10 +148,11 @@ func (m *OutportBlock) GetHighestFinalBlockHash() []byte { } type BlockData struct { - HeaderBytes []byte `protobuf:"bytes,1,opt,name=HeaderBytes,proto3" json:"headerBytes,omitempty"` - HeaderType string `protobuf:"bytes,2,opt,name=HeaderType,proto3" json:"headerType,omitempty"` - HeaderHash []byte `protobuf:"bytes,3,opt,name=HeaderHash,proto3" json:"headerHash,omitempty"` - Body *block.Body `protobuf:"bytes,4,opt,name=Body,proto3" json:"body,omitempty"` + ShardID uint32 `protobuf:"varint,1,opt,name=ShardID,proto3" json:"shardID,omitempty"` + HeaderBytes []byte `protobuf:"bytes,2,opt,name=HeaderBytes,proto3" json:"headerBytes,omitempty"` + HeaderType string `protobuf:"bytes,3,opt,name=HeaderType,proto3" json:"headerType,omitempty"` + HeaderHash []byte `protobuf:"bytes,4,opt,name=HeaderHash,proto3" json:"headerHash,omitempty"` + Body *block.Body `protobuf:"bytes,5,opt,name=Body,proto3" json:"body,omitempty"` } func (m *BlockData) Reset() { *m = BlockData{} } @@ -174,6 +183,13 @@ func (m *BlockData) XXX_DiscardUnknown() { var xxx_messageInfo_BlockData proto.InternalMessageInfo +func (m *BlockData) GetShardID() uint32 { + if m != nil { + return m.ShardID + } + return 0 +} + func (m *BlockData) GetHeaderBytes() []byte { if m != nil { return m.HeaderBytes @@ -801,7 +817,8 @@ func (m *RoundInfo) GetTimestamp() uint64 { } type RoundsInfo struct { - RoundsInfo []*RoundInfo `protobuf:"bytes,1,rep,name=RoundsInfo,proto3" json:"roundsInfo,omitempty"` + ShardID uint32 `protobuf:"varint,1,opt,name=ShardID,proto3" json:"shardID"` + RoundsInfo []*RoundInfo `protobuf:"bytes,2,rep,name=RoundsInfo,proto3" json:"roundsInfo,omitempty"` } func (m *RoundsInfo) Reset() { *m = RoundsInfo{} } @@ -832,6 +849,13 @@ func (m *RoundsInfo) XXX_DiscardUnknown() { var xxx_messageInfo_RoundsInfo proto.InternalMessageInfo +func (m *RoundsInfo) GetShardID() uint32 { + if m != nil { + return m.ShardID + } + return 0 +} + func (m *RoundsInfo) GetRoundsInfo() []*RoundInfo { if m != nil { return m.RoundsInfo @@ -879,8 +903,9 @@ func (m *PubKeys) GetKeys() [][]byte { } type ValidatorsPubKeys struct { - ShardValidatorsPubKeys map[uint32]*PubKeys `protobuf:"bytes,1,rep,name=ShardValidatorsPubKeys,proto3" json:"validatorsPubKeys,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - Epoch uint32 `protobuf:"varint,2,opt,name=Epoch,proto3" json:"epoch"` + ShardID uint32 `protobuf:"varint,1,opt,name=ShardID,proto3" json:"shardID"` + ShardValidatorsPubKeys map[uint32]*PubKeys `protobuf:"bytes,2,rep,name=ShardValidatorsPubKeys,proto3" json:"validatorsPubKeys,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Epoch uint32 `protobuf:"varint,3,opt,name=Epoch,proto3" json:"epoch"` } func (m *ValidatorsPubKeys) Reset() { *m = ValidatorsPubKeys{} } @@ -911,6 +936,13 @@ func (m *ValidatorsPubKeys) XXX_DiscardUnknown() { var xxx_messageInfo_ValidatorsPubKeys proto.InternalMessageInfo +func (m *ValidatorsPubKeys) GetShardID() uint32 { + if m != nil { + return m.ShardID + } + return 0 +} + func (m *ValidatorsPubKeys) GetShardValidatorsPubKeys() map[uint32]*PubKeys { if m != nil { return m.ShardValidatorsPubKeys @@ -981,7 +1013,8 @@ func (m *Accounts) GetAlteredAccounts() map[string]*alteredAccount.AlteredAccoun } type FinalizedBlock struct { - HeaderHash []byte `protobuf:"bytes,1,opt,name=HeaderHash,proto3" json:"headerHash"` + ShardID uint32 `protobuf:"varint,1,opt,name=ShardID,proto3" json:"shardID"` + HeaderHash []byte `protobuf:"bytes,2,opt,name=HeaderHash,proto3" json:"headerHash"` } func (m *FinalizedBlock) Reset() { *m = FinalizedBlock{} } @@ -1012,6 +1045,13 @@ func (m *FinalizedBlock) XXX_DiscardUnknown() { var xxx_messageInfo_FinalizedBlock proto.InternalMessageInfo +func (m *FinalizedBlock) GetShardID() uint32 { + if m != nil { + return m.ShardID + } + return 0 +} + func (m *FinalizedBlock) GetHeaderHash() []byte { if m != nil { return m.HeaderHash @@ -1050,124 +1090,126 @@ func init() { func init() { proto.RegisterFile("outportBlock.proto", fileDescriptor_661b95cef868af95) } var fileDescriptor_661b95cef868af95 = []byte{ - // 1865 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcd, 0x73, 0x1b, 0x49, - 0x15, 0xf7, 0x48, 0xb2, 0x65, 0x3d, 0xc9, 0xb2, 0xd3, 0x71, 0x8c, 0xe2, 0xb0, 0x1a, 0xa3, 0x64, - 0x17, 0x17, 0x21, 0x32, 0x9b, 0x4d, 0x51, 0xa9, 0xa4, 0xb6, 0xd8, 0x8c, 0xf3, 0x65, 0x92, 0x8d, - 0x5d, 0x63, 0xc3, 0xae, 0xb7, 0xa8, 0x82, 0x91, 0xa6, 0x3d, 0x9a, 0x8a, 0x34, 0x2d, 0xa6, 0x5b, - 0x46, 0xe2, 0xc4, 0x89, 0xa5, 0xa8, 0xda, 0x2a, 0x8e, 0xdc, 0xb8, 0x52, 0x1c, 0xb8, 0xf2, 0x2f, - 0x70, 0xa2, 0x72, 0xa2, 0x72, 0x1a, 0x88, 0x73, 0xa1, 0xe6, 0x40, 0x2d, 0x27, 0xae, 0xd4, 0x74, - 0xf7, 0x68, 0x7a, 0x46, 0xe3, 0xc5, 0x5e, 0x48, 0xed, 0x45, 0x9a, 0x7e, 0x1f, 0xbf, 0xd7, 0xef, - 0xf5, 0x7b, 0xaf, 0x3f, 0x00, 0x91, 0x11, 0x1b, 0x12, 0x9f, 0x19, 0x7d, 0xd2, 0x7d, 0xde, 0x1e, - 0xfa, 0x84, 0x11, 0x34, 0xcf, 0xff, 0xd6, 0x6f, 0x38, 0x2e, 0xeb, 0x8d, 0x3a, 0xed, 0x2e, 0x19, - 0x6c, 0x39, 0xc4, 0x21, 0x5b, 0x9c, 0xdc, 0x19, 0x1d, 0xf1, 0x11, 0x1f, 0xf0, 0x2f, 0xa1, 0xb5, - 0xfe, 0xbe, 0x22, 0x3e, 0x18, 0xf5, 0x99, 0x7b, 0x8c, 0x7d, 0x3a, 0xde, 0x1a, 0x8c, 0x6f, 0x74, - 0x7b, 0x96, 0xeb, 0xdd, 0xe8, 0x12, 0x1f, 0xdf, 0x70, 0xc8, 0x96, 0x6d, 0x31, 0x6b, 0xab, 0x13, - 0x99, 0x13, 0xbf, 0x52, 0xfd, 0xde, 0x79, 0xd4, 0x99, 0x6f, 0x79, 0xd4, 0xea, 0x32, 0x97, 0x78, - 0x5b, 0x7d, 0xe2, 0x48, 0x88, 0x9d, 0x2f, 0x0b, 0xa1, 0x7c, 0x4b, 0xa8, 0xc3, 0xf3, 0x40, 0xd1, - 0x81, 0xe5, 0xb3, 0x6d, 0xe2, 0x31, 0xdf, 0xea, 0x32, 0x13, 0xd3, 0x51, 0x9f, 0xe5, 0xd1, 0xbe, - 0x8c, 0xa3, 0x3e, 0xee, 0x62, 0x77, 0xc8, 0xe2, 0x7f, 0x09, 0xb1, 0x7d, 0x3e, 0x88, 0x9f, 0x59, - 0xbe, 0x7d, 0x30, 0x9e, 0x7e, 0x48, 0x90, 0xdd, 0xf3, 0x80, 0x58, 0x7d, 0x86, 0x7d, 0x6c, 0xdf, - 0xeb, 0x76, 0xc9, 0xc8, 0x63, 0x99, 0xa1, 0x00, 0x6c, 0xfd, 0xba, 0x0c, 0xb5, 0x5d, 0x25, 0x9b, - 0xd0, 0x23, 0xa8, 0xf0, 0x8f, 0xfb, 0x16, 0xb3, 0x1a, 0xda, 0x86, 0xb6, 0x59, 0xbd, 0xb9, 0x22, - 0x64, 0xdb, 0x53, 0xba, 0xf1, 0xb5, 0x30, 0xd0, 0x2f, 0x76, 0xe2, 0xe1, 0xb7, 0xc9, 0xc0, 0x65, - 0x78, 0x30, 0x64, 0x13, 0x33, 0xd1, 0x45, 0x3f, 0x86, 0xe5, 0x83, 0x64, 0x89, 0xf6, 0x08, 0xe9, - 0x37, 0x0a, 0x1c, 0x6e, 0x4d, 0xc2, 0x65, 0xb8, 0xc6, 0x5b, 0x61, 0xa0, 0x5f, 0x66, 0x69, 0xa2, - 0x02, 0x9d, 0x45, 0x43, 0x14, 0x56, 0x1f, 0x63, 0xcb, 0xc6, 0xfe, 0x23, 0x8b, 0x6e, 0x13, 0x8f, - 0x8e, 0x06, 0xc3, 0x88, 0xd7, 0x28, 0x72, 0x2b, 0x57, 0xa4, 0x95, 0x3c, 0x11, 0xa3, 0x15, 0x06, - 0x7a, 0xb3, 0x97, 0xc3, 0x51, 0xec, 0xe5, 0x82, 0xa3, 0x9f, 0xc2, 0xf2, 0xbd, 0x54, 0x1c, 0x69, - 0xa3, 0xb4, 0x51, 0xdc, 0xac, 0xde, 0xdc, 0x94, 0xf6, 0xd4, 0x60, 0xb6, 0x33, 0xa2, 0x0f, 0x3c, - 0xe6, 0x4f, 0x84, 0x9f, 0xe9, 0xc5, 0xa0, 0xaa, 0x9f, 0x19, 0x25, 0xf4, 0x23, 0x58, 0x7b, 0x46, - 0x98, 0xe5, 0xbb, 0x3f, 0xc7, 0xb6, 0x98, 0x13, 0x7d, 0x6c, 0xd1, 0x1e, 0xa6, 0x8d, 0xf9, 0x8d, - 0xe2, 0x66, 0xc5, 0xb8, 0x16, 0x06, 0xfa, 0x86, 0x97, 0x2b, 0xa1, 0xc0, 0x9e, 0x82, 0x81, 0xee, - 0x40, 0xfd, 0xd9, 0x68, 0xd0, 0xc1, 0xfe, 0xee, 0xd1, 0x7e, 0xcf, 0xf2, 0x6d, 0xda, 0x58, 0xd8, - 0xd0, 0x36, 0x97, 0x0c, 0x14, 0x06, 0x7a, 0xdd, 0x4b, 0x71, 0xcc, 0x8c, 0x24, 0xba, 0x0f, 0xf5, - 0x7d, 0xd7, 0xf1, 0xb0, 0x4f, 0x77, 0x3c, 0x1b, 0x8f, 0x31, 0x6d, 0x94, 0x37, 0x8a, 0x9b, 0x25, - 0xe3, 0xeb, 0x61, 0xa0, 0x37, 0x68, 0x8a, 0xa3, 0xcc, 0x24, 0xa3, 0x83, 0x4c, 0x58, 0x7b, 0xec, - 0x3a, 0x3d, 0x4c, 0xd9, 0x43, 0xd7, 0xb3, 0xfa, 0x3c, 0x72, 0xcf, 0x88, 0xd7, 0xc5, 0x8d, 0xc5, - 0x0d, 0x6d, 0xb3, 0x64, 0xac, 0x87, 0x81, 0xbe, 0xd6, 0xcb, 0x95, 0x30, 0x4f, 0xd1, 0x44, 0x87, - 0x70, 0x69, 0x86, 0x13, 0x39, 0xdc, 0xa8, 0x6c, 0x68, 0x9b, 0x35, 0xe3, 0x6a, 0x18, 0xe8, 0x7a, - 0x2f, 0x4f, 0x40, 0x99, 0x67, 0x3e, 0xc2, 0xfa, 0x21, 0xac, 0xe6, 0x2d, 0x2b, 0x5a, 0x81, 0xe2, - 0x73, 0x3c, 0xe1, 0x25, 0x53, 0x31, 0xa3, 0x4f, 0x74, 0x1d, 0xe6, 0x8f, 0xad, 0xfe, 0x08, 0xcb, - 0xbc, 0xbf, 0x24, 0x33, 0x24, 0xad, 0x6d, 0x0a, 0x99, 0x3b, 0x85, 0xdb, 0x5a, 0xeb, 0x5f, 0x9a, - 0x52, 0x7c, 0xe8, 0x2e, 0x54, 0xc5, 0x52, 0x19, 0x13, 0x86, 0x29, 0x07, 0xae, 0x19, 0x97, 0xc3, - 0x40, 0xbf, 0xd4, 0x4b, 0xc8, 0xca, 0x7c, 0x55, 0x69, 0x74, 0x1b, 0x40, 0x0c, 0x0f, 0x26, 0x43, - 0x31, 0x81, 0x8a, 0xd1, 0x08, 0x03, 0x7d, 0xb5, 0x37, 0xa5, 0x2a, 0xaa, 0x8a, 0x6c, 0xa2, 0xc9, - 0xe3, 0x55, 0xe4, 0x56, 0x15, 0xcd, 0x4c, 0x90, 0x14, 0x59, 0xf4, 0x1e, 0x94, 0x0c, 0x62, 0x4f, - 0x1a, 0x25, 0xee, 0x6e, 0x35, 0xee, 0x1a, 0xc4, 0x9e, 0x88, 0x6c, 0xea, 0x10, 0x7b, 0xa2, 0xa8, - 0x72, 0xe1, 0xd6, 0xa7, 0x30, 0xd3, 0x27, 0x50, 0x0f, 0x6a, 0x0a, 0x29, 0x72, 0x5d, 0xad, 0xb0, - 0x8c, 0xb4, 0x3a, 0x96, 0x15, 0xc6, 0x33, 0x46, 0xe9, 0x24, 0x6a, 0x94, 0x52, 0xc8, 0xe8, 0x57, - 0x1a, 0xac, 0xee, 0xcf, 0x76, 0x7d, 0xda, 0x28, 0x70, 0x93, 0xdf, 0x39, 0xc5, 0x64, 0x9e, 0x8a, - 0x30, 0xcd, 0x3b, 0x4b, 0xce, 0x3e, 0xa2, 0x4e, 0x21, 0xd7, 0x22, 0x3a, 0x80, 0xb2, 0xc9, 0x9b, - 0x3d, 0x6d, 0x14, 0xb9, 0xf1, 0xab, 0xa7, 0x18, 0x97, 0x52, 0xc2, 0xde, 0xa5, 0x30, 0xd0, 0x2f, - 0x88, 0x4d, 0x42, 0x35, 0x11, 0x43, 0xa1, 0x8f, 0x61, 0xd1, 0x14, 0xdb, 0x50, 0xdc, 0xa8, 0xae, - 0x9d, 0x0a, 0x2b, 0xc4, 0x04, 0xee, 0x5a, 0x18, 0xe8, 0x48, 0x6e, 0x60, 0x2a, 0xf0, 0x14, 0x0d, - 0xfd, 0x04, 0x60, 0xc7, 0x3b, 0xb6, 0xfa, 0xae, 0x7d, 0x30, 0x16, 0xad, 0xa8, 0x7a, 0xf3, 0x9d, - 0x53, 0xb0, 0x13, 0x41, 0x81, 0xce, 0xf3, 0xc9, 0x9d, 0x12, 0xd5, 0x7c, 0x4a, 0x44, 0xd1, 0x77, - 0xa1, 0xf4, 0x94, 0x38, 0x51, 0x43, 0x8a, 0xb0, 0xeb, 0x12, 0xfb, 0x29, 0x71, 0xf8, 0x1e, 0xc4, - 0x53, 0xaa, 0x4f, 0x1c, 0x55, 0x9b, 0xcb, 0xa3, 0x5f, 0x6a, 0x70, 0x6d, 0xbf, 0xdb, 0xc3, 0xf6, - 0xa8, 0x8f, 0xed, 0x07, 0x63, 0xdc, 0x1d, 0x31, 0x6c, 0xef, 0x6f, 0x9b, 0xfb, 0xa2, 0xe5, 0xed, - 0xf9, 0xf8, 0x98, 0x57, 0x19, 0xef, 0x56, 0x15, 0xe3, 0x66, 0x18, 0xe8, 0x6d, 0x7a, 0x06, 0x79, - 0xc5, 0xd0, 0x99, 0xf0, 0xd1, 0x6f, 0x35, 0xf8, 0xd6, 0x8c, 0x60, 0xe2, 0x60, 0x76, 0x3a, 0x8b, - 0x7c, 0x3a, 0xb7, 0xc3, 0x40, 0xbf, 0x45, 0xcf, 0xac, 0xa5, 0x4c, 0xea, 0x1c, 0xb6, 0xd6, 0x9f, - 0xc1, 0x85, 0x99, 0xba, 0xc9, 0x69, 0x61, 0x57, 0xd3, 0x2d, 0x6c, 0x29, 0x5e, 0xdf, 0xf1, 0x8e, - 0x77, 0x44, 0x94, 0xd6, 0xb5, 0xfe, 0x11, 0x5c, 0x3e, 0xb5, 0x28, 0x72, 0x70, 0xaf, 0xa5, 0x71, - 0xe3, 0xb5, 0xdd, 0xdf, 0x36, 0xb3, 0xc0, 0x1f, 0x42, 0x4d, 0x4d, 0xf8, 0x1c, 0xac, 0x6f, 0xa6, - 0xb1, 0x2e, 0x48, 0x2c, 0xa1, 0x95, 0x85, 0x7b, 0x02, 0x4b, 0xa9, 0x44, 0x3f, 0xfb, 0xdc, 0xa4, - 0x9a, 0x0a, 0xf6, 0x14, 0x96, 0x33, 0x99, 0xfd, 0x3f, 0x84, 0xb0, 0xf5, 0xc7, 0x02, 0x94, 0x1f, - 0x62, 0x1c, 0x91, 0xd1, 0xdb, 0x50, 0x7e, 0x64, 0xd1, 0x1f, 0x50, 0x6c, 0x73, 0xa8, 0x92, 0x51, - 0x0d, 0x03, 0xbd, 0xec, 0x08, 0x92, 0x19, 0xf3, 0x50, 0x1f, 0x8a, 0x0f, 0xb1, 0x40, 0xae, 0x19, - 0x9f, 0x84, 0x81, 0xbe, 0x74, 0x84, 0x95, 0xbe, 0xfe, 0x87, 0xbf, 0xe9, 0x0f, 0x06, 0x16, 0xeb, - 0x6d, 0x75, 0x5c, 0xa7, 0xbd, 0xe3, 0xb1, 0xbb, 0xe7, 0x38, 0x3d, 0xb6, 0x0d, 0xd7, 0xd9, 0xf1, - 0xd8, 0xb6, 0x45, 0x19, 0xf6, 0xcd, 0xc8, 0x0c, 0xfa, 0x4c, 0x83, 0xfa, 0x8e, 0xe7, 0x32, 0xd7, - 0xea, 0xef, 0x59, 0xae, 0x1d, 0x59, 0x16, 0xdb, 0x03, 0x8e, 0xf6, 0x7b, 0x37, 0xc5, 0x79, 0x13, - 0x93, 0xc8, 0x18, 0x6f, 0xfd, 0x55, 0x83, 0x05, 0x11, 0x46, 0xb4, 0x0b, 0x55, 0x25, 0x9d, 0xe5, - 0xb9, 0x15, 0xcd, 0x76, 0x23, 0xb1, 0x7f, 0x2a, 0x5b, 0x83, 0xba, 0x7f, 0x2a, 0x72, 0xe8, 0x7b, - 0xd3, 0xb5, 0xc8, 0xa4, 0x81, 0xa4, 0x8a, 0xc6, 0x7b, 0x24, 0x06, 0x6a, 0xe3, 0x8d, 0x57, 0xf0, - 0x0e, 0xd4, 0x45, 0x15, 0xba, 0xc4, 0xdb, 0xf5, 0x6d, 0xec, 0xf3, 0x58, 0xc9, 0x73, 0x15, 0x4e, - 0x71, 0xcc, 0x8c, 0x64, 0xeb, 0xdf, 0x1a, 0x94, 0x65, 0x29, 0x20, 0x02, 0x17, 0x73, 0x0a, 0x4b, - 0x7a, 0xb8, 0x1e, 0xd7, 0xcd, 0xac, 0x84, 0xf1, 0x8d, 0x30, 0xd0, 0xdf, 0xca, 0xd9, 0x89, 0x94, - 0xc9, 0xe6, 0x21, 0x7f, 0xb5, 0x9e, 0x1f, 0x40, 0x59, 0xf6, 0x77, 0xd4, 0x8a, 0x16, 0x97, 0x9f, - 0x41, 0x78, 0x31, 0x19, 0x10, 0x06, 0xfa, 0x02, 0xe3, 0x14, 0x53, 0x72, 0xd0, 0xdb, 0x50, 0x7c, - 0x4a, 0x1c, 0x39, 0x4f, 0x48, 0x36, 0x08, 0xa3, 0x1c, 0x06, 0x7a, 0xb1, 0x4f, 0x1c, 0x33, 0xe2, - 0xb7, 0x3e, 0xd5, 0x00, 0x92, 0x76, 0x80, 0xde, 0x87, 0x05, 0x31, 0x92, 0x51, 0x5c, 0x4e, 0x75, - 0x8c, 0x83, 0xb1, 0xb1, 0x1a, 0x06, 0xfa, 0x8a, 0xd8, 0x54, 0x15, 0x07, 0xa5, 0x52, 0x8e, 0x7f, - 0x85, 0x33, 0xfb, 0xf7, 0x4f, 0x2d, 0xff, 0xd2, 0x82, 0xde, 0x85, 0xea, 0x23, 0x8b, 0xee, 0xf9, - 0xe4, 0xd8, 0xb5, 0xa7, 0x45, 0xbf, 0x1c, 0x06, 0x7a, 0xd5, 0x49, 0xc8, 0xa6, 0x2a, 0x23, 0x55, - 0x4c, 0x7c, 0x34, 0xf2, 0x22, 0x95, 0x42, 0x4a, 0x25, 0x26, 0x9b, 0xaa, 0x0c, 0xba, 0x05, 0xb5, - 0x08, 0x01, 0x7b, 0x56, 0x3f, 0xba, 0x09, 0xf0, 0x85, 0x29, 0x19, 0x2b, 0x61, 0xa0, 0xd7, 0x1c, - 0x85, 0x6e, 0xa6, 0xa4, 0x22, 0x87, 0x3f, 0xb4, 0xc6, 0x9c, 0xe4, 0x8b, 0x9d, 0xaa, 0xc4, 0xf5, - 0xb8, 0xc3, 0x83, 0x14, 0xc7, 0xcc, 0x48, 0xb6, 0x8e, 0xe0, 0xe2, 0x0f, 0xa3, 0x06, 0x69, 0x31, - 0xe2, 0x9b, 0x16, 0x73, 0x3d, 0x87, 0x2f, 0xc1, 0x75, 0xa8, 0xec, 0x8d, 0x3a, 0x7d, 0xb7, 0xfb, - 0x24, 0x6e, 0x96, 0xc6, 0x52, 0x18, 0xe8, 0x95, 0x61, 0x4c, 0x34, 0x13, 0x7e, 0x94, 0x09, 0x42, - 0x95, 0xfb, 0x58, 0x10, 0x99, 0xe0, 0x73, 0x8a, 0x29, 0x39, 0xad, 0xbf, 0x68, 0xb0, 0x32, 0x35, - 0x44, 0x05, 0x31, 0xea, 0xa2, 0xfc, 0xa6, 0xb2, 0x73, 0x9f, 0xdb, 0x58, 0x12, 0x5d, 0x94, 0x0a, - 0x92, 0x19, 0xf3, 0x90, 0x0e, 0xf3, 0x0f, 0x86, 0xa4, 0xdb, 0x93, 0xeb, 0x58, 0x09, 0x03, 0x7d, - 0x1e, 0x47, 0x04, 0x53, 0xd0, 0x91, 0x0f, 0xab, 0x59, 0x6c, 0x5e, 0x1f, 0xe2, 0x9c, 0x16, 0x17, - 0x61, 0x8e, 0x9f, 0xe2, 0x38, 0x78, 0x9c, 0xa3, 0xab, 0x1e, 0x07, 0xf3, 0xb0, 0x5b, 0xbf, 0x2b, - 0x40, 0xc5, 0x24, 0x23, 0x4f, 0xa4, 0xac, 0x0e, 0xf3, 0x7c, 0x20, 0x13, 0x83, 0x4f, 0xd1, 0x8f, - 0x08, 0xa6, 0xa0, 0x47, 0x6b, 0x94, 0xb9, 0x8a, 0x15, 0xf8, 0x55, 0x8c, 0xaf, 0x51, 0xfa, 0x2a, - 0x36, 0x73, 0x01, 0xfb, 0x00, 0x56, 0xf8, 0x62, 0x7d, 0xc4, 0x93, 0x6b, 0x48, 0xa8, 0xcc, 0x8c, - 0x45, 0x51, 0x08, 0x9d, 0x0c, 0xcf, 0x9c, 0x91, 0x4e, 0x02, 0x6d, 0xf3, 0xd4, 0x48, 0x05, 0xda, - 0x8e, 0x03, 0x6d, 0x27, 0x81, 0x9e, 0x3f, 0x25, 0xd0, 0xd7, 0xa1, 0x72, 0xe0, 0x0e, 0x30, 0x65, - 0xd6, 0x60, 0xc8, 0xef, 0xa1, 0x25, 0x91, 0x16, 0x2c, 0x26, 0x9a, 0x09, 0xbf, 0xf5, 0x31, 0x00, - 0xf7, 0x9d, 0xf2, 0x08, 0x7d, 0x5f, 0x1d, 0xc9, 0x1b, 0x43, 0xfc, 0x70, 0x31, 0x8d, 0xa3, 0x38, - 0x78, 0xfa, 0x53, 0x39, 0xf5, 0xe0, 0x99, 0x68, 0xb7, 0xde, 0x85, 0xf2, 0xde, 0xa8, 0xf3, 0x04, - 0x4f, 0x28, 0x7a, 0x07, 0x4a, 0xd1, 0x3f, 0x07, 0xac, 0x89, 0x68, 0x3e, 0xc7, 0x93, 0xd4, 0x99, - 0x33, 0xe2, 0x47, 0xcb, 0x75, 0x21, 0x59, 0xc7, 0x58, 0xfb, 0x33, 0x0d, 0xd6, 0xb8, 0xf3, 0x33, - 0x2c, 0x39, 0xc3, 0x5b, 0xd9, 0xdc, 0x89, 0xf9, 0xed, 0x7c, 0x35, 0x71, 0x7c, 0xd6, 0xc3, 0x40, - 0xbf, 0x72, 0x9c, 0xe5, 0xa9, 0x97, 0xfd, 0x7c, 0xed, 0xff, 0x9a, 0xe9, 0xeb, 0x87, 0x70, 0xe5, - 0x0b, 0x0c, 0xab, 0xa7, 0x9b, 0xa5, 0x2f, 0x3c, 0x2c, 0x49, 0x2d, 0xf5, 0x78, 0xf3, 0xa7, 0x02, - 0x2c, 0x4e, 0xdf, 0x34, 0xce, 0x58, 0x99, 0x77, 0xa0, 0xce, 0x73, 0x2d, 0x49, 0x8a, 0x42, 0xd2, - 0x79, 0x3a, 0x29, 0x8e, 0x99, 0x91, 0x44, 0x83, 0xd9, 0x97, 0x9a, 0x62, 0xea, 0x02, 0x14, 0x93, - 0xff, 0x2f, 0xaf, 0x34, 0x6f, 0xf2, 0x59, 0xe0, 0x03, 0xa8, 0xf3, 0x37, 0x88, 0xa8, 0x19, 0x8b, - 0x8b, 0x45, 0x3b, 0x75, 0x47, 0x17, 0x2f, 0x03, 0xf5, 0x30, 0xd0, 0x21, 0xb9, 0xa3, 0xab, 0x37, - 0x73, 0x63, 0xf4, 0xe2, 0x55, 0x73, 0xee, 0xe5, 0xab, 0xe6, 0xdc, 0xe7, 0xaf, 0x9a, 0xda, 0x2f, - 0x4e, 0x9a, 0xda, 0xef, 0x4f, 0x9a, 0xda, 0x9f, 0x4f, 0x9a, 0xda, 0x8b, 0x93, 0xa6, 0xf6, 0xf2, - 0xa4, 0xa9, 0xfd, 0xfd, 0xa4, 0xa9, 0xfd, 0xe3, 0xa4, 0x39, 0xf7, 0xf9, 0x49, 0x53, 0xfb, 0xcd, - 0xeb, 0xe6, 0xdc, 0x8b, 0xd7, 0xcd, 0xb9, 0x97, 0xaf, 0x9b, 0x73, 0x9f, 0x9c, 0xe7, 0xb4, 0xb6, - 0x25, 0x9f, 0xa5, 0xef, 0xca, 0xff, 0xce, 0x02, 0xf7, 0xec, 0xbd, 0xff, 0x04, 0x00, 0x00, 0xff, - 0xff, 0x3f, 0x86, 0x09, 0x04, 0xb0, 0x16, 0x00, 0x00, + // 1897 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x4f, 0x6c, 0x1b, 0x59, + 0x19, 0xcf, 0xd8, 0x4e, 0x1c, 0x7f, 0x4e, 0x9c, 0xf4, 0x35, 0x0d, 0xd3, 0x94, 0xf5, 0x04, 0xb7, + 0xbb, 0x44, 0x94, 0xda, 0x6c, 0xb6, 0x42, 0x55, 0xab, 0x15, 0x74, 0xd2, 0x7f, 0xa1, 0xdd, 0x26, + 0x9a, 0x04, 0x96, 0xac, 0x90, 0x60, 0xec, 0x79, 0x19, 0x8f, 0x6a, 0xcf, 0x33, 0x33, 0xcf, 0xc1, + 0xe6, 0x02, 0x27, 0x96, 0xcb, 0x4a, 0x1c, 0xb9, 0x21, 0x71, 0x42, 0x1c, 0xb8, 0x72, 0xe0, 0x8e, + 0x38, 0xa1, 0x9e, 0x50, 0x4f, 0x03, 0x4d, 0x2f, 0x68, 0x0e, 0x68, 0x6f, 0x5c, 0xd1, 0xbc, 0xf7, + 0xc6, 0xf3, 0x66, 0x3c, 0x59, 0xd9, 0x0b, 0x2b, 0x2e, 0xf6, 0xcc, 0xf7, 0xe7, 0xf7, 0xbd, 0xf7, + 0xfd, 0x7b, 0xdf, 0x3c, 0x40, 0x64, 0x48, 0x07, 0xc4, 0xa3, 0x7a, 0x8f, 0x74, 0x5e, 0x34, 0x07, + 0x1e, 0xa1, 0x04, 0x2d, 0xb2, 0xbf, 0xad, 0x5b, 0xb6, 0x43, 0xbb, 0xc3, 0x76, 0xb3, 0x43, 0xfa, + 0x2d, 0x9b, 0xd8, 0xa4, 0xc5, 0xc8, 0xed, 0xe1, 0x29, 0x7b, 0x63, 0x2f, 0xec, 0x89, 0x6b, 0x6d, + 0xbd, 0x2f, 0x89, 0xf7, 0x87, 0x3d, 0xea, 0x9c, 0x61, 0xcf, 0x1f, 0xb5, 0xfa, 0xa3, 0x5b, 0x9d, + 0xae, 0xe9, 0xb8, 0xb7, 0x3a, 0xc4, 0xc3, 0xb7, 0x6c, 0xd2, 0xb2, 0x4c, 0x6a, 0xb6, 0xda, 0x91, + 0x39, 0xfe, 0x2b, 0xd4, 0xef, 0xcf, 0xa3, 0x4e, 0x3d, 0xd3, 0xf5, 0xcd, 0x0e, 0x75, 0x88, 0xdb, + 0xea, 0x11, 0x5b, 0x40, 0xec, 0x7f, 0x5e, 0x08, 0xe9, 0x59, 0x40, 0x9d, 0xcc, 0x03, 0xe5, 0xf7, + 0x4d, 0x8f, 0xee, 0x11, 0x97, 0x7a, 0x66, 0x87, 0x1a, 0xd8, 0x1f, 0xf6, 0x68, 0x1e, 0xed, 0xf3, + 0x6c, 0xd4, 0xc3, 0x1d, 0xec, 0x0c, 0x68, 0xfc, 0x2f, 0x20, 0xf6, 0xe6, 0x83, 0xf8, 0x89, 0xe9, + 0x59, 0xc7, 0xa3, 0xc9, 0x83, 0x00, 0x39, 0x98, 0x07, 0xc4, 0xec, 0x51, 0xec, 0x61, 0xeb, 0x7e, + 0xa7, 0x43, 0x86, 0x2e, 0xcd, 0xbc, 0x72, 0xc0, 0xc6, 0x9f, 0xca, 0xb0, 0x72, 0x20, 0x65, 0x13, + 0x6a, 0x41, 0xf9, 0xa8, 0x6b, 0x7a, 0xd6, 0xfe, 0x03, 0x55, 0xd9, 0x56, 0x76, 0x56, 0xf5, 0x2b, + 0x61, 0xa0, 0x5d, 0xf2, 0x39, 0xe9, 0xeb, 0xa4, 0xef, 0x50, 0xdc, 0x1f, 0xd0, 0xb1, 0x11, 0x4b, + 0xa1, 0xc7, 0x50, 0x61, 0x9a, 0x0f, 0x4c, 0x6a, 0xaa, 0x85, 0x6d, 0x65, 0xa7, 0xba, 0xbb, 0xce, + 0xc1, 0x9b, 0x13, 0xba, 0xfe, 0xa5, 0x30, 0xd0, 0x2e, 0xb7, 0xe3, 0x57, 0x09, 0x26, 0xd1, 0x45, + 0x3f, 0x84, 0xb5, 0xe3, 0x24, 0xa6, 0x87, 0x84, 0xf4, 0xd4, 0x22, 0x83, 0xdb, 0x14, 0x70, 0x19, + 0xae, 0xfe, 0x56, 0x18, 0x68, 0x57, 0x69, 0x9a, 0x28, 0x41, 0x67, 0xd1, 0x90, 0x0f, 0x1b, 0x4f, + 0xb0, 0x69, 0x61, 0xef, 0xb1, 0xe9, 0xef, 0x11, 0xd7, 0x1f, 0xf6, 0x07, 0x11, 0x4f, 0x2d, 0x31, + 0x2b, 0xd7, 0x84, 0x95, 0x3c, 0x11, 0xbd, 0x11, 0x06, 0x5a, 0xbd, 0x9b, 0xc3, 0x91, 0xec, 0xe5, + 0x82, 0xa3, 0x1f, 0xc3, 0xda, 0xfd, 0x94, 0xe3, 0x7d, 0x75, 0x71, 0xbb, 0xb8, 0x53, 0xdd, 0xdd, + 0x11, 0xf6, 0x64, 0xef, 0x37, 0x33, 0xa2, 0x0f, 0x5d, 0xea, 0x8d, 0xf9, 0x3e, 0xd3, 0xd1, 0xf3, + 0xe5, 0x7d, 0x66, 0x94, 0xd0, 0x0f, 0x60, 0xf3, 0x39, 0xa1, 0xa6, 0xe7, 0xfc, 0x14, 0x5b, 0x7c, + 0x4d, 0xfe, 0x13, 0xd3, 0xef, 0x62, 0x5f, 0x5d, 0xda, 0x2e, 0xee, 0x54, 0xf4, 0x1b, 0x61, 0xa0, + 0x6d, 0xbb, 0xb9, 0x12, 0x12, 0xec, 0x05, 0x18, 0xe8, 0x2e, 0xd4, 0x9e, 0x0f, 0xfb, 0x6d, 0xec, + 0x1d, 0x9c, 0xb2, 0x14, 0xf0, 0xd5, 0x32, 0xcb, 0x13, 0x14, 0x06, 0x5a, 0xcd, 0x4d, 0x71, 0x8c, + 0x8c, 0x24, 0x7a, 0x00, 0xb5, 0x23, 0xc7, 0x76, 0xb1, 0xe7, 0xef, 0xbb, 0x16, 0x1e, 0x61, 0x5f, + 0x5d, 0xde, 0x2e, 0xee, 0x94, 0xf4, 0x2f, 0x87, 0x81, 0xa6, 0xfa, 0x29, 0x8e, 0xb4, 0x92, 0x8c, + 0x0e, 0x32, 0x60, 0xf3, 0x89, 0x63, 0x77, 0xb1, 0x4f, 0x1f, 0x39, 0xae, 0xd9, 0x63, 0x9e, 0x7b, + 0x4e, 0xdc, 0x0e, 0x56, 0x2b, 0xdb, 0xca, 0x4e, 0x49, 0xdf, 0x0a, 0x03, 0x6d, 0xb3, 0x9b, 0x2b, + 0x61, 0x5c, 0xa0, 0x89, 0x4e, 0xe0, 0xca, 0x14, 0x27, 0xda, 0xb0, 0x0a, 0xdb, 0xca, 0xce, 0x8a, + 0x7e, 0x3d, 0x0c, 0x34, 0xad, 0x9b, 0x27, 0x20, 0xad, 0x33, 0x1f, 0x61, 0xeb, 0x04, 0x36, 0xf2, + 0xc2, 0x8a, 0xd6, 0xa1, 0xf8, 0x02, 0x8f, 0x59, 0x95, 0x55, 0x8c, 0xe8, 0x11, 0xdd, 0x84, 0xc5, + 0x33, 0xb3, 0x37, 0xc4, 0xa2, 0x8c, 0xae, 0x88, 0x0c, 0x49, 0x6b, 0x1b, 0x5c, 0xe6, 0x6e, 0xe1, + 0x8e, 0xd2, 0xf8, 0x6d, 0x41, 0x2a, 0xbe, 0xf9, 0x4b, 0xf7, 0x1e, 0x54, 0x79, 0x6c, 0xf5, 0x31, + 0xc5, 0x3e, 0xb3, 0xba, 0xa2, 0x5f, 0x0d, 0x03, 0xed, 0x4a, 0x37, 0x21, 0x4b, 0x8a, 0xb2, 0x34, + 0xba, 0x03, 0xc0, 0x5f, 0x8f, 0xc7, 0x03, 0xcc, 0x2a, 0xb5, 0xa2, 0xab, 0x61, 0xa0, 0x6d, 0x74, + 0x27, 0x54, 0x49, 0x55, 0x92, 0x4d, 0x34, 0x99, 0x83, 0x4b, 0xcc, 0xaa, 0xa4, 0x99, 0xf1, 0xaa, + 0x24, 0x8b, 0xde, 0x83, 0x92, 0x4e, 0xac, 0xb1, 0xba, 0xc8, 0xfc, 0x53, 0x8d, 0xdb, 0x0c, 0xb1, + 0xc6, 0x3c, 0xfd, 0xda, 0xc4, 0x1a, 0x4b, 0xaa, 0x4c, 0xb8, 0xf1, 0x31, 0x4c, 0x35, 0x16, 0xd4, + 0x85, 0x15, 0x89, 0xe4, 0xab, 0x4a, 0xaa, 0x24, 0x33, 0xd2, 0xf2, 0xbb, 0x28, 0x49, 0x96, 0x62, + 0x52, 0xeb, 0x91, 0xbd, 0x94, 0x42, 0x46, 0xbf, 0x54, 0x60, 0xe3, 0x68, 0xfa, 0x5c, 0x89, 0xbc, + 0x1d, 0x99, 0xfc, 0xc6, 0x05, 0x26, 0xf3, 0x54, 0xb8, 0x69, 0xd6, 0x8a, 0x72, 0x4e, 0x2a, 0x79, + 0x09, 0xb9, 0x16, 0xd1, 0x31, 0x94, 0x0d, 0x76, 0x9c, 0xf8, 0x6a, 0x91, 0x19, 0xbf, 0x7e, 0x81, + 0x71, 0x21, 0xc5, 0xed, 0xb1, 0x24, 0xe2, 0xc7, 0x90, 0x6c, 0x22, 0x86, 0x42, 0xdf, 0x87, 0x65, + 0x83, 0x1f, 0x74, 0xbe, 0x5a, 0x62, 0xb0, 0x37, 0x2e, 0x84, 0xe5, 0x62, 0x1c, 0x77, 0x33, 0x0c, + 0x34, 0x24, 0x8e, 0x48, 0x19, 0x78, 0x82, 0x86, 0x7e, 0x04, 0xb0, 0xef, 0x9e, 0x99, 0x3d, 0xc7, + 0x3a, 0x1e, 0xc5, 0x5d, 0xf3, 0x9d, 0x0b, 0xb0, 0x13, 0x41, 0x8e, 0xce, 0xf2, 0xc9, 0x99, 0x10, + 0xe5, 0x7c, 0x4a, 0x44, 0xd1, 0x37, 0xa1, 0xf4, 0x8c, 0xd8, 0xbc, 0x2f, 0x56, 0x77, 0x6b, 0x02, + 0xfb, 0x19, 0xb1, 0xd9, 0xa1, 0xc5, 0x52, 0xaa, 0x47, 0x6c, 0x59, 0x9b, 0xc9, 0xa3, 0x5f, 0x28, + 0x70, 0xe3, 0xa8, 0xd3, 0xc5, 0xd6, 0xb0, 0x87, 0xad, 0x87, 0x23, 0xdc, 0x19, 0x52, 0x6c, 0x1d, + 0xed, 0x19, 0x47, 0xbc, 0x47, 0x1e, 0x7a, 0xf8, 0x8c, 0x95, 0xa5, 0x5a, 0x66, 0x0d, 0x77, 0x37, + 0x0c, 0xb4, 0xa6, 0x3f, 0x83, 0xbc, 0x64, 0x68, 0x26, 0x7c, 0xf4, 0x6b, 0x05, 0xbe, 0x36, 0x25, + 0x98, 0x6c, 0x30, 0xbb, 0x9c, 0x65, 0xb6, 0x9c, 0x3b, 0x61, 0xa0, 0xdd, 0xf6, 0x67, 0xd6, 0x92, + 0x16, 0x35, 0x87, 0xad, 0xad, 0xe7, 0x70, 0x69, 0xaa, 0x6e, 0x72, 0x7a, 0xde, 0xf5, 0x74, 0xcf, + 0x5b, 0x8d, 0xe3, 0x3b, 0xda, 0x77, 0x4f, 0x89, 0xd4, 0xeb, 0xb6, 0x3e, 0x84, 0xab, 0x17, 0x16, + 0x45, 0x0e, 0xee, 0x8d, 0x34, 0x6e, 0x1c, 0xdb, 0xa3, 0x3d, 0x23, 0x0b, 0xfc, 0x01, 0xac, 0xc8, + 0x09, 0x9f, 0x83, 0xf5, 0xd5, 0x34, 0xd6, 0x25, 0x81, 0xc5, 0xb5, 0xb2, 0x70, 0x4f, 0x61, 0x35, + 0x95, 0xe8, 0xb3, 0xaf, 0x4d, 0xa8, 0xc9, 0x60, 0xcf, 0x60, 0x2d, 0x93, 0xd9, 0xff, 0x85, 0x0b, + 0x1b, 0x7f, 0x28, 0x40, 0xf9, 0x11, 0xc6, 0x11, 0x19, 0xbd, 0x0d, 0xe5, 0xc7, 0xa6, 0xff, 0x5d, + 0x1f, 0x5b, 0x0c, 0xaa, 0xa4, 0x57, 0xc3, 0x40, 0x2b, 0xdb, 0x9c, 0x64, 0xc4, 0x3c, 0xd4, 0x83, + 0xe2, 0x23, 0x8c, 0xc5, 0xd1, 0xf0, 0x51, 0x18, 0x68, 0xab, 0xa7, 0x58, 0xea, 0xeb, 0xbf, 0xff, + 0xbb, 0xf6, 0xb0, 0x6f, 0xd2, 0x6e, 0xab, 0xed, 0xd8, 0xcd, 0x7d, 0x97, 0xde, 0x9b, 0x63, 0x3e, + 0x6d, 0xea, 0x8e, 0xbd, 0xef, 0xd2, 0x3d, 0xd3, 0xa7, 0xd8, 0x33, 0x22, 0x33, 0xe8, 0x13, 0x05, + 0x6a, 0xfb, 0xae, 0x43, 0x1d, 0xb3, 0x77, 0x68, 0x3a, 0x56, 0x64, 0xb9, 0xc8, 0x2c, 0xe3, 0x68, + 0x40, 0x70, 0x52, 0x9c, 0x2f, 0x62, 0x11, 0x19, 0xe3, 0x8d, 0xbf, 0x29, 0xb0, 0xc4, 0xdd, 0x88, + 0x0e, 0xa0, 0x2a, 0xa5, 0x33, 0xf3, 0x59, 0x75, 0x17, 0x4d, 0x77, 0x23, 0x7e, 0x7e, 0x4a, 0x47, + 0x83, 0x7c, 0x7e, 0x4a, 0x72, 0xe8, 0x5b, 0x93, 0x58, 0x64, 0xd2, 0x40, 0x50, 0x79, 0xe3, 0x3d, + 0xe5, 0x2f, 0x72, 0xe3, 0x8d, 0x23, 0x78, 0x17, 0x6a, 0xbc, 0x0a, 0x1d, 0xe2, 0x1e, 0x78, 0x16, + 0xf6, 0x98, 0xaf, 0xc4, 0x20, 0x86, 0x53, 0x1c, 0x23, 0x23, 0xd9, 0xf8, 0xb7, 0x02, 0x65, 0x51, + 0x0a, 0x88, 0xc0, 0xe5, 0x9c, 0xc2, 0x12, 0x3b, 0xdc, 0x8a, 0xeb, 0x66, 0x5a, 0x42, 0xff, 0x4a, + 0x18, 0x68, 0x6f, 0xe5, 0x9c, 0x44, 0xd2, 0x62, 0xf3, 0x90, 0xff, 0xbf, 0x3b, 0x3f, 0x86, 0xb2, + 0xe8, 0xef, 0xa8, 0x11, 0x05, 0x97, 0xcd, 0x20, 0xac, 0x98, 0x74, 0x08, 0x03, 0x6d, 0x89, 0x32, + 0x8a, 0x21, 0x38, 0xe8, 0x6d, 0x28, 0x3e, 0x23, 0xb6, 0x58, 0x27, 0x24, 0x07, 0x84, 0x5e, 0x0e, + 0x03, 0xad, 0xd8, 0x23, 0xb6, 0x11, 0xf1, 0x1b, 0x1f, 0x2b, 0x00, 0x49, 0x3b, 0x40, 0xef, 0xc3, + 0x12, 0x7f, 0x13, 0x5e, 0x5c, 0x4b, 0x75, 0x8c, 0xe3, 0x91, 0xbe, 0x11, 0x06, 0xda, 0x3a, 0x3f, + 0x54, 0xa5, 0x0d, 0x0a, 0xa5, 0x9c, 0xfd, 0x15, 0x66, 0xde, 0xdf, 0xbf, 0x94, 0xfc, 0xaf, 0x1c, + 0xf4, 0x2e, 0x54, 0x1f, 0x9b, 0xfe, 0xa1, 0x47, 0xce, 0x1c, 0x6b, 0x52, 0xf4, 0x6b, 0x61, 0xa0, + 0x55, 0xed, 0x84, 0x6c, 0xc8, 0x32, 0x42, 0xc5, 0xc0, 0xa7, 0x43, 0x37, 0x52, 0x29, 0xa4, 0x54, + 0x62, 0xb2, 0x21, 0xcb, 0xa0, 0xdb, 0xb0, 0x12, 0x21, 0x60, 0xd7, 0xec, 0x45, 0x9f, 0x0e, 0x2c, + 0x30, 0x25, 0x7d, 0x3d, 0x0c, 0xb4, 0x15, 0x5b, 0xa2, 0x1b, 0x29, 0xa9, 0x68, 0xc3, 0x1f, 0x98, + 0x23, 0x46, 0xf2, 0xf8, 0x49, 0x55, 0x62, 0x7a, 0x6c, 0xc3, 0xfd, 0x14, 0xc7, 0xc8, 0x48, 0x36, + 0x4e, 0xe1, 0xf2, 0xf7, 0xa2, 0x06, 0x69, 0x52, 0xe2, 0x19, 0x26, 0x75, 0x5c, 0x9b, 0x85, 0xe0, + 0x26, 0x54, 0x0e, 0x87, 0xed, 0x9e, 0xd3, 0x79, 0x1a, 0x37, 0x4b, 0x7d, 0x35, 0x0c, 0xb4, 0xca, + 0x20, 0x26, 0x1a, 0x09, 0x3f, 0xca, 0x04, 0xae, 0xca, 0xf6, 0x58, 0xe0, 0x99, 0xe0, 0x31, 0x8a, + 0x21, 0x38, 0x8d, 0xbf, 0x2a, 0xb0, 0x3e, 0x31, 0xe4, 0x73, 0x62, 0xd4, 0x45, 0xd3, 0x23, 0x37, + 0xeb, 0xa2, 0x62, 0xe4, 0x4e, 0x06, 0x6d, 0x0d, 0x16, 0x1f, 0x0e, 0x48, 0xa7, 0x2b, 0xe2, 0x58, + 0x09, 0x03, 0x6d, 0x11, 0x47, 0x04, 0x83, 0xd3, 0x91, 0x07, 0x1b, 0x59, 0x6c, 0x56, 0x1f, 0x7c, + 0x4e, 0x8b, 0x8b, 0x30, 0x67, 0x9f, 0x7c, 0x1c, 0x3c, 0xcb, 0xd1, 0x95, 0xc7, 0xc1, 0x3c, 0xec, + 0xc6, 0x6f, 0x0a, 0x50, 0x31, 0xc8, 0xd0, 0xe5, 0x29, 0xab, 0xc1, 0x22, 0x7b, 0x11, 0x89, 0xc1, + 0x96, 0xe8, 0x45, 0x04, 0x83, 0xd3, 0xa3, 0x18, 0x65, 0xbe, 0xdd, 0x0a, 0xec, 0xdb, 0x8d, 0xc5, + 0x28, 0xfd, 0xed, 0x36, 0xf5, 0xc5, 0xf6, 0x6d, 0x58, 0x67, 0xc1, 0xfa, 0x90, 0x25, 0xd7, 0x80, + 0xf8, 0x22, 0x33, 0x96, 0x79, 0x21, 0xb4, 0x33, 0x3c, 0x63, 0x4a, 0x3a, 0x71, 0xb4, 0xc5, 0x52, + 0x23, 0xe5, 0x68, 0x2b, 0x76, 0xb4, 0x95, 0x38, 0x7a, 0xf1, 0x02, 0x47, 0xdf, 0x84, 0xca, 0xb1, + 0xd3, 0xc7, 0x3e, 0x35, 0xfb, 0x03, 0x75, 0x89, 0x6d, 0x95, 0xa5, 0x05, 0x8d, 0x89, 0x46, 0xc2, + 0x6f, 0xfc, 0x0c, 0x80, 0xed, 0xdd, 0x8f, 0x4f, 0xcc, 0x59, 0x62, 0xfd, 0x1d, 0x59, 0x49, 0x4c, + 0xf9, 0xf1, 0x85, 0xc8, 0xc4, 0xdd, 0x7c, 0x3e, 0xf5, 0x26, 0x72, 0xf2, 0x7c, 0x9a, 0x68, 0x37, + 0xde, 0x85, 0xf2, 0xe1, 0xb0, 0xfd, 0x14, 0x8f, 0x7d, 0xf4, 0x0e, 0x94, 0xa2, 0x7f, 0xf6, 0xa5, + 0xb2, 0xc2, 0x9d, 0xfe, 0x02, 0x8f, 0x53, 0xa3, 0x69, 0xc4, 0x6f, 0xfc, 0xb9, 0x00, 0x97, 0x92, + 0x70, 0xc7, 0xda, 0x33, 0xae, 0xfd, 0x13, 0x05, 0x36, 0xd9, 0xf3, 0x14, 0x82, 0xd8, 0xc8, 0xed, + 0x6c, 0x26, 0xc6, 0xfc, 0x66, 0xbe, 0x1a, 0x1f, 0xc6, 0xb5, 0x30, 0xd0, 0xae, 0x9d, 0x65, 0x79, + 0xf2, 0x5d, 0x43, 0xbe, 0x76, 0x12, 0xce, 0x62, 0x7e, 0x38, 0xb7, 0x4e, 0xe0, 0xda, 0x67, 0x18, + 0x96, 0x67, 0xa5, 0xd5, 0xcf, 0x1c, 0xbd, 0x84, 0x96, 0x3c, 0x2c, 0xfd, 0xb1, 0x00, 0xcb, 0x93, + 0x2b, 0x95, 0x19, 0xfd, 0x77, 0x17, 0x6a, 0x2c, 0x73, 0x93, 0x14, 0x2b, 0x24, 0x7d, 0xac, 0x9d, + 0xe2, 0x18, 0x19, 0x49, 0xd4, 0x9f, 0xbe, 0x28, 0x2a, 0xa6, 0x3e, 0xa7, 0x62, 0xf2, 0xff, 0xe4, + 0x92, 0xe8, 0x8b, 0xbc, 0x95, 0xb0, 0xa1, 0xc6, 0xae, 0x40, 0xa2, 0xd6, 0xce, 0x3f, 0x53, 0x66, + 0x74, 0x5f, 0x33, 0x75, 0x31, 0xc0, 0x67, 0xce, 0x5a, 0x18, 0x68, 0x90, 0x5c, 0x0c, 0xc8, 0xd7, + 0x01, 0xfa, 0xf0, 0xe5, 0xeb, 0xfa, 0xc2, 0xab, 0xd7, 0xf5, 0x85, 0x4f, 0x5f, 0xd7, 0x95, 0x9f, + 0x9f, 0xd7, 0x95, 0xdf, 0x9d, 0xd7, 0x95, 0xbf, 0x9c, 0xd7, 0x95, 0x97, 0xe7, 0x75, 0xe5, 0xd5, + 0x79, 0x5d, 0xf9, 0xc7, 0x79, 0x5d, 0xf9, 0xe7, 0x79, 0x7d, 0xe1, 0xd3, 0xf3, 0xba, 0xf2, 0xab, + 0x37, 0xf5, 0x85, 0x97, 0x6f, 0xea, 0x0b, 0xaf, 0xde, 0xd4, 0x17, 0x3e, 0x9a, 0x67, 0x44, 0x6c, + 0x89, 0xdb, 0xf6, 0x7b, 0xe2, 0xbf, 0xbd, 0xc4, 0x1c, 0xf0, 0xde, 0x7f, 0x02, 0x00, 0x00, 0xff, + 0xff, 0xca, 0xf7, 0x70, 0x7a, 0x87, 0x17, 0x00, 0x00, } func (this *OutportBlock) Equal(that interface{}) bool { @@ -1189,6 +1231,9 @@ func (this *OutportBlock) Equal(that interface{}) bool { } else if this == nil { return false } + if this.ShardID != that1.ShardID { + return false + } if !this.BlockData.Equal(that1.BlockData) { return false } @@ -1252,6 +1297,9 @@ func (this *BlockData) Equal(that interface{}) bool { } else if this == nil { return false } + if this.ShardID != that1.ShardID { + return false + } if !bytes.Equal(this.HeaderBytes, that1.HeaderBytes) { return false } @@ -1659,6 +1707,9 @@ func (this *RoundsInfo) Equal(that interface{}) bool { } else if this == nil { return false } + if this.ShardID != that1.ShardID { + return false + } if len(this.RoundsInfo) != len(that1.RoundsInfo) { return false } @@ -1717,6 +1768,9 @@ func (this *ValidatorsPubKeys) Equal(that interface{}) bool { } else if this == nil { return false } + if this.ShardID != that1.ShardID { + return false + } if len(this.ShardValidatorsPubKeys) != len(that1.ShardValidatorsPubKeys) { return false } @@ -1784,6 +1838,9 @@ func (this *FinalizedBlock) Equal(that interface{}) bool { } else if this == nil { return false } + if this.ShardID != that1.ShardID { + return false + } if !bytes.Equal(this.HeaderHash, that1.HeaderHash) { return false } @@ -1793,8 +1850,9 @@ func (this *OutportBlock) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 13) + s := make([]string, 0, 14) s = append(s, "&outport.OutportBlock{") + s = append(s, "ShardID: "+fmt.Sprintf("%#v", this.ShardID)+",\n") if this.BlockData != nil { s = append(s, "BlockData: "+fmt.Sprintf("%#v", this.BlockData)+",\n") } @@ -1829,8 +1887,9 @@ func (this *BlockData) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 8) + s := make([]string, 0, 9) s = append(s, "&outport.BlockData{") + s = append(s, "ShardID: "+fmt.Sprintf("%#v", this.ShardID)+",\n") s = append(s, "HeaderBytes: "+fmt.Sprintf("%#v", this.HeaderBytes)+",\n") s = append(s, "HeaderType: "+fmt.Sprintf("%#v", this.HeaderType)+",\n") s = append(s, "HeaderHash: "+fmt.Sprintf("%#v", this.HeaderHash)+",\n") @@ -2046,8 +2105,9 @@ func (this *RoundsInfo) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 5) + s := make([]string, 0, 6) s = append(s, "&outport.RoundsInfo{") + s = append(s, "ShardID: "+fmt.Sprintf("%#v", this.ShardID)+",\n") if this.RoundsInfo != nil { s = append(s, "RoundsInfo: "+fmt.Sprintf("%#v", this.RoundsInfo)+",\n") } @@ -2068,8 +2128,9 @@ func (this *ValidatorsPubKeys) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 6) + s := make([]string, 0, 7) s = append(s, "&outport.ValidatorsPubKeys{") + s = append(s, "ShardID: "+fmt.Sprintf("%#v", this.ShardID)+",\n") keysForShardValidatorsPubKeys := make([]uint32, 0, len(this.ShardValidatorsPubKeys)) for k, _ := range this.ShardValidatorsPubKeys { keysForShardValidatorsPubKeys = append(keysForShardValidatorsPubKeys, k) @@ -2115,8 +2176,9 @@ func (this *FinalizedBlock) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 5) + s := make([]string, 0, 6) s = append(s, "&outport.FinalizedBlock{") + s = append(s, "ShardID: "+fmt.Sprintf("%#v", this.ShardID)+",\n") s = append(s, "HeaderHash: "+fmt.Sprintf("%#v", this.HeaderHash)+",\n") s = append(s, "}") return strings.Join(s, "") @@ -2154,12 +2216,12 @@ func (m *OutportBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.HighestFinalBlockHash) i = encodeVarintOutportBlock(dAtA, i, uint64(len(m.HighestFinalBlockHash))) i-- - dAtA[i] = 0x4a + dAtA[i] = 0x52 } if m.HighestFinalBlockNonce != 0 { i = encodeVarintOutportBlock(dAtA, i, uint64(m.HighestFinalBlockNonce)) i-- - dAtA[i] = 0x40 + dAtA[i] = 0x48 } if len(m.SignersIndexes) > 0 { dAtA2 := make([]byte, len(m.SignersIndexes)*10) @@ -2177,12 +2239,12 @@ func (m *OutportBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], dAtA2[:j1]) i = encodeVarintOutportBlock(dAtA, i, uint64(j1)) i-- - dAtA[i] = 0x3a + dAtA[i] = 0x42 } if m.NumberOfShards != 0 { i = encodeVarintOutportBlock(dAtA, i, uint64(m.NumberOfShards)) i-- - dAtA[i] = 0x30 + dAtA[i] = 0x38 } if len(m.NotarizedHeadersHashes) > 0 { for iNdEx := len(m.NotarizedHeadersHashes) - 1; iNdEx >= 0; iNdEx-- { @@ -2190,7 +2252,7 @@ func (m *OutportBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.NotarizedHeadersHashes[iNdEx]) i = encodeVarintOutportBlock(dAtA, i, uint64(len(m.NotarizedHeadersHashes[iNdEx]))) i-- - dAtA[i] = 0x2a + dAtA[i] = 0x32 } } if len(m.AlteredAccounts) > 0 { @@ -2221,7 +2283,7 @@ func (m *OutportBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0xa i = encodeVarintOutportBlock(dAtA, i, uint64(baseI-i)) i-- - dAtA[i] = 0x22 + dAtA[i] = 0x2a } } if m.HeaderGasConsumption != nil { @@ -2234,7 +2296,7 @@ func (m *OutportBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintOutportBlock(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x1a + dAtA[i] = 0x22 } if m.TransactionPool != nil { { @@ -2246,7 +2308,7 @@ func (m *OutportBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintOutportBlock(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x12 + dAtA[i] = 0x1a } if m.BlockData != nil { { @@ -2258,7 +2320,12 @@ func (m *OutportBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintOutportBlock(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0xa + dAtA[i] = 0x12 + } + if m.ShardID != 0 { + i = encodeVarintOutportBlock(dAtA, i, uint64(m.ShardID)) + i-- + dAtA[i] = 0x8 } return len(dAtA) - i, nil } @@ -2293,28 +2360,33 @@ func (m *BlockData) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintOutportBlock(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x22 + dAtA[i] = 0x2a } if len(m.HeaderHash) > 0 { i -= len(m.HeaderHash) copy(dAtA[i:], m.HeaderHash) i = encodeVarintOutportBlock(dAtA, i, uint64(len(m.HeaderHash))) i-- - dAtA[i] = 0x1a + dAtA[i] = 0x22 } if len(m.HeaderType) > 0 { i -= len(m.HeaderType) copy(dAtA[i:], m.HeaderType) i = encodeVarintOutportBlock(dAtA, i, uint64(len(m.HeaderType))) i-- - dAtA[i] = 0x12 + dAtA[i] = 0x1a } if len(m.HeaderBytes) > 0 { i -= len(m.HeaderBytes) copy(dAtA[i:], m.HeaderBytes) i = encodeVarintOutportBlock(dAtA, i, uint64(len(m.HeaderBytes))) i-- - dAtA[i] = 0xa + dAtA[i] = 0x12 + } + if m.ShardID != 0 { + i = encodeVarintOutportBlock(dAtA, i, uint64(m.ShardID)) + i-- + dAtA[i] = 0x8 } return len(dAtA) - i, nil } @@ -2993,9 +3065,14 @@ func (m *RoundsInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintOutportBlock(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0xa + dAtA[i] = 0x12 } } + if m.ShardID != 0 { + i = encodeVarintOutportBlock(dAtA, i, uint64(m.ShardID)) + i-- + dAtA[i] = 0x8 + } return len(dAtA) - i, nil } @@ -3054,7 +3131,7 @@ func (m *ValidatorsPubKeys) MarshalToSizedBuffer(dAtA []byte) (int, error) { if m.Epoch != 0 { i = encodeVarintOutportBlock(dAtA, i, uint64(m.Epoch)) i-- - dAtA[i] = 0x10 + dAtA[i] = 0x18 } if len(m.ShardValidatorsPubKeys) > 0 { keysForShardValidatorsPubKeys := make([]uint32, 0, len(m.ShardValidatorsPubKeys)) @@ -3082,9 +3159,14 @@ func (m *ValidatorsPubKeys) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x8 i = encodeVarintOutportBlock(dAtA, i, uint64(baseI-i)) i-- - dAtA[i] = 0xa + dAtA[i] = 0x12 } } + if m.ShardID != 0 { + i = encodeVarintOutportBlock(dAtA, i, uint64(m.ShardID)) + i-- + dAtA[i] = 0x8 + } return len(dAtA) - i, nil } @@ -3177,7 +3259,12 @@ func (m *FinalizedBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.HeaderHash) i = encodeVarintOutportBlock(dAtA, i, uint64(len(m.HeaderHash))) i-- - dAtA[i] = 0xa + dAtA[i] = 0x12 + } + if m.ShardID != 0 { + i = encodeVarintOutportBlock(dAtA, i, uint64(m.ShardID)) + i-- + dAtA[i] = 0x8 } return len(dAtA) - i, nil } @@ -3199,6 +3286,9 @@ func (m *OutportBlock) Size() (n int) { } var l int _ = l + if m.ShardID != 0 { + n += 1 + sovOutportBlock(uint64(m.ShardID)) + } if m.BlockData != nil { l = m.BlockData.Size() n += 1 + l + sovOutportBlock(uint64(l)) @@ -3256,6 +3346,9 @@ func (m *BlockData) Size() (n int) { } var l int _ = l + if m.ShardID != 0 { + n += 1 + sovOutportBlock(uint64(m.ShardID)) + } l = len(m.HeaderBytes) if l > 0 { n += 1 + l + sovOutportBlock(uint64(l)) @@ -3557,6 +3650,9 @@ func (m *RoundsInfo) Size() (n int) { } var l int _ = l + if m.ShardID != 0 { + n += 1 + sovOutportBlock(uint64(m.ShardID)) + } if len(m.RoundsInfo) > 0 { for _, e := range m.RoundsInfo { l = e.Size() @@ -3587,6 +3683,9 @@ func (m *ValidatorsPubKeys) Size() (n int) { } var l int _ = l + if m.ShardID != 0 { + n += 1 + sovOutportBlock(uint64(m.ShardID)) + } if len(m.ShardValidatorsPubKeys) > 0 { for k, v := range m.ShardValidatorsPubKeys { _ = k @@ -3640,6 +3739,9 @@ func (m *FinalizedBlock) Size() (n int) { } var l int _ = l + if m.ShardID != 0 { + n += 1 + sovOutportBlock(uint64(m.ShardID)) + } l = len(m.HeaderHash) if l > 0 { n += 1 + l + sovOutportBlock(uint64(l)) @@ -3668,6 +3770,7 @@ func (this *OutportBlock) String() string { } mapStringForAlteredAccounts += "}" s := strings.Join([]string{`&OutportBlock{`, + `ShardID:` + fmt.Sprintf("%v", this.ShardID) + `,`, `BlockData:` + strings.Replace(this.BlockData.String(), "BlockData", "BlockData", 1) + `,`, `TransactionPool:` + strings.Replace(this.TransactionPool.String(), "TransactionPool", "TransactionPool", 1) + `,`, `HeaderGasConsumption:` + strings.Replace(this.HeaderGasConsumption.String(), "HeaderGasConsumption", "HeaderGasConsumption", 1) + `,`, @@ -3686,6 +3789,7 @@ func (this *BlockData) String() string { return "nil" } s := strings.Join([]string{`&BlockData{`, + `ShardID:` + fmt.Sprintf("%v", this.ShardID) + `,`, `HeaderBytes:` + fmt.Sprintf("%v", this.HeaderBytes) + `,`, `HeaderType:` + fmt.Sprintf("%v", this.HeaderType) + `,`, `HeaderHash:` + fmt.Sprintf("%v", this.HeaderHash) + `,`, @@ -3890,6 +3994,7 @@ func (this *RoundsInfo) String() string { } repeatedStringForRoundsInfo += "}" s := strings.Join([]string{`&RoundsInfo{`, + `ShardID:` + fmt.Sprintf("%v", this.ShardID) + `,`, `RoundsInfo:` + repeatedStringForRoundsInfo + `,`, `}`, }, "") @@ -3920,6 +4025,7 @@ func (this *ValidatorsPubKeys) String() string { } mapStringForShardValidatorsPubKeys += "}" s := strings.Join([]string{`&ValidatorsPubKeys{`, + `ShardID:` + fmt.Sprintf("%v", this.ShardID) + `,`, `ShardValidatorsPubKeys:` + mapStringForShardValidatorsPubKeys + `,`, `Epoch:` + fmt.Sprintf("%v", this.Epoch) + `,`, `}`, @@ -3953,6 +4059,7 @@ func (this *FinalizedBlock) String() string { return "nil" } s := strings.Join([]string{`&FinalizedBlock{`, + `ShardID:` + fmt.Sprintf("%v", this.ShardID) + `,`, `HeaderHash:` + fmt.Sprintf("%v", this.HeaderHash) + `,`, `}`, }, "") @@ -3996,6 +4103,25 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ShardID", wireType) + } + m.ShardID = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOutportBlock + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ShardID |= uint32(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field BlockData", wireType) } @@ -4031,7 +4157,7 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 2: + case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field TransactionPool", wireType) } @@ -4067,7 +4193,7 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 3: + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field HeaderGasConsumption", wireType) } @@ -4103,7 +4229,7 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 4: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field AlteredAccounts", wireType) } @@ -4232,7 +4358,7 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { } m.AlteredAccounts[mapkey] = mapvalue iNdEx = postIndex - case 5: + case 6: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field NotarizedHeadersHashes", wireType) } @@ -4264,7 +4390,7 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { } m.NotarizedHeadersHashes = append(m.NotarizedHeadersHashes, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex - case 6: + case 7: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field NumberOfShards", wireType) } @@ -4283,7 +4409,7 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { break } } - case 7: + case 8: if wireType == 0 { var v uint64 for shift := uint(0); ; shift += 7 { @@ -4359,7 +4485,7 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { } else { return fmt.Errorf("proto: wrong wireType = %d for field SignersIndexes", wireType) } - case 8: + case 9: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field HighestFinalBlockNonce", wireType) } @@ -4378,7 +4504,7 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { break } } - case 9: + case 10: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field HighestFinalBlockHash", wireType) } @@ -4466,6 +4592,25 @@ func (m *BlockData) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ShardID", wireType) + } + m.ShardID = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOutportBlock + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ShardID |= uint32(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field HeaderBytes", wireType) } @@ -4499,7 +4644,7 @@ func (m *BlockData) Unmarshal(dAtA []byte) error { m.HeaderBytes = []byte{} } iNdEx = postIndex - case 2: + case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field HeaderType", wireType) } @@ -4531,7 +4676,7 @@ func (m *BlockData) Unmarshal(dAtA []byte) error { } m.HeaderType = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 3: + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field HeaderHash", wireType) } @@ -4565,7 +4710,7 @@ func (m *BlockData) Unmarshal(dAtA []byte) error { m.HeaderHash = []byte{} } iNdEx = postIndex - case 4: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Body", wireType) } @@ -6691,6 +6836,25 @@ func (m *RoundsInfo) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ShardID", wireType) + } + m.ShardID = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOutportBlock + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ShardID |= uint32(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field RoundsInfo", wireType) } @@ -6863,6 +7027,25 @@ func (m *ValidatorsPubKeys) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ShardID", wireType) + } + m.ShardID = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOutportBlock + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ShardID |= uint32(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ShardValidatorsPubKeys", wireType) } @@ -6977,7 +7160,7 @@ func (m *ValidatorsPubKeys) Unmarshal(dAtA []byte) error { } m.ShardValidatorsPubKeys[mapkey] = mapvalue iNdEx = postIndex - case 2: + case 3: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Epoch", wireType) } @@ -7270,6 +7453,25 @@ func (m *FinalizedBlock) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ShardID", wireType) + } + m.ShardID = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOutportBlock + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ShardID |= uint32(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field HeaderHash", wireType) } diff --git a/data/outport/outportBlock.proto b/data/outport/outportBlock.proto index 5883dc33..4ce0a02d 100644 --- a/data/outport/outportBlock.proto +++ b/data/outport/outportBlock.proto @@ -15,22 +15,24 @@ import "github.com/multiversx/mx-chain-core-go/data/rewardTx/rewardTx.proto"; import "github.com/multiversx/mx-chain-core-go/data/alteredAccount/alteredAccount.proto"; message OutportBlock { - BlockData BlockData = 1 [(gogoproto.jsontag) = "blockData,omitempty"]; - TransactionPool TransactionPool = 2 [(gogoproto.jsontag) = "transactionPool,omitempty"]; - HeaderGasConsumption HeaderGasConsumption = 3 [(gogoproto.jsontag) = "headerGasConsumption,omitempty"]; - map AlteredAccounts = 4 [(gogoproto.jsontag) = "alteredAccounts,omitempty"]; - repeated string NotarizedHeadersHashes = 5 [(gogoproto.jsontag) = "notarizedHeadersHashes,omitempty"]; - uint32 NumberOfShards = 6 [(gogoproto.jsontag) = "numberOfShards"]; - repeated uint64 SignersIndexes = 7 [(gogoproto.jsontag) = "signersIndexes,omitempty"]; - uint64 HighestFinalBlockNonce = 8 [(gogoproto.jsontag) = "highestFinalBlockNonce"]; - bytes HighestFinalBlockHash = 9 [(gogoproto.jsontag) = "highestFinalBlockHash,omitempty"]; + uint32 ShardID = 1 [(gogoproto.jsontag) = "shardID,omitempty"]; + BlockData BlockData = 2 [(gogoproto.jsontag) = "blockData,omitempty"]; + TransactionPool TransactionPool = 3 [(gogoproto.jsontag) = "transactionPool,omitempty"]; + HeaderGasConsumption HeaderGasConsumption = 4 [(gogoproto.jsontag) = "headerGasConsumption,omitempty"]; + map AlteredAccounts = 5 [(gogoproto.jsontag) = "alteredAccounts,omitempty"]; + repeated string NotarizedHeadersHashes = 6 [(gogoproto.jsontag) = "notarizedHeadersHashes,omitempty"]; + uint32 NumberOfShards = 7 [(gogoproto.jsontag) = "numberOfShards"]; + repeated uint64 SignersIndexes = 8 [(gogoproto.jsontag) = "signersIndexes,omitempty"]; + uint64 HighestFinalBlockNonce = 9 [(gogoproto.jsontag) = "highestFinalBlockNonce"]; + bytes HighestFinalBlockHash = 10 [(gogoproto.jsontag) = "highestFinalBlockHash,omitempty"]; } message BlockData { - bytes HeaderBytes = 1 [(gogoproto.jsontag) = "headerBytes,omitempty"]; - string HeaderType = 2 [(gogoproto.jsontag) = "headerType,omitempty"]; - bytes HeaderHash = 3 [(gogoproto.jsontag) = "headerHash,omitempty"]; - Body Body = 4 [(gogoproto.jsontag) = "body,omitempty"]; + uint32 ShardID = 1 [(gogoproto.jsontag) = "shardID,omitempty"]; + bytes HeaderBytes = 2 [(gogoproto.jsontag) = "headerBytes,omitempty"]; + string HeaderType = 3 [(gogoproto.jsontag) = "headerType,omitempty"]; + bytes HeaderHash = 4 [(gogoproto.jsontag) = "headerHash,omitempty"]; + Body Body = 5 [(gogoproto.jsontag) = "body,omitempty"]; } message TransactionPool { @@ -100,7 +102,8 @@ message RoundInfo { } message RoundsInfo { - repeated RoundInfo RoundsInfo = 1 [(gogoproto.jsontag) = "roundsInfo,omitempty"]; + uint32 ShardID = 1 [(gogoproto.jsontag) = "shardID"]; + repeated RoundInfo RoundsInfo = 2 [(gogoproto.jsontag) = "roundsInfo,omitempty"]; } message PubKeys { @@ -108,8 +111,9 @@ message PubKeys { } message ValidatorsPubKeys{ - map ShardValidatorsPubKeys = 1 [(gogoproto.jsontag) = "validatorsPubKeys,omitempty"]; - uint32 Epoch = 2 [(gogoproto.jsontag) = "epoch"]; + uint32 ShardID = 1 [(gogoproto.jsontag) = "shardID"]; + map ShardValidatorsPubKeys = 2 [(gogoproto.jsontag) = "validatorsPubKeys,omitempty"]; + uint32 Epoch = 3 [(gogoproto.jsontag) = "epoch"]; } message Accounts { @@ -119,5 +123,6 @@ message Accounts { } message FinalizedBlock { - bytes HeaderHash = 1 [(gogoproto.jsontag) = "headerHash"]; + uint32 ShardID = 1 [(gogoproto.jsontag) = "shardID"]; + bytes HeaderHash = 2 [(gogoproto.jsontag) = "headerHash"]; } From 30f63c3c1d7e966553bd6d2088fc06601a857c9c Mon Sep 17 00:00:00 2001 From: Iuga Mihai Date: Wed, 19 Jul 2023 12:36:33 +0300 Subject: [PATCH 2/4] Shard structure --- data/outport/outportBlock.pb.go | 424 +++++++++++++++++++++++--------- data/outport/outportBlock.proto | 4 + 2 files changed, 314 insertions(+), 114 deletions(-) diff --git a/data/outport/outportBlock.pb.go b/data/outport/outportBlock.pb.go index b43853f8..6e650d0b 100644 --- a/data/outport/outportBlock.pb.go +++ b/data/outport/outportBlock.pb.go @@ -1059,6 +1059,45 @@ func (m *FinalizedBlock) GetHeaderHash() []byte { return nil } +type Shard struct { + ShardID uint32 `protobuf:"varint,1,opt,name=ShardID,proto3" json:"shardID"` +} + +func (m *Shard) Reset() { *m = Shard{} } +func (*Shard) ProtoMessage() {} +func (*Shard) Descriptor() ([]byte, []int) { + return fileDescriptor_661b95cef868af95, []int{17} +} +func (m *Shard) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Shard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil +} +func (m *Shard) XXX_Merge(src proto.Message) { + xxx_messageInfo_Shard.Merge(m, src) +} +func (m *Shard) XXX_Size() int { + return m.Size() +} +func (m *Shard) XXX_DiscardUnknown() { + xxx_messageInfo_Shard.DiscardUnknown(m) +} + +var xxx_messageInfo_Shard proto.InternalMessageInfo + +func (m *Shard) GetShardID() uint32 { + if m != nil { + return m.ShardID + } + return 0 +} + func init() { proto.RegisterType((*OutportBlock)(nil), "proto.OutportBlock") proto.RegisterMapType((map[string]*alteredAccount.AlteredAccount)(nil), "proto.OutportBlock.AlteredAccountsEntry") @@ -1085,131 +1124,132 @@ func init() { proto.RegisterType((*Accounts)(nil), "proto.Accounts") proto.RegisterMapType((map[string]*alteredAccount.AlteredAccount)(nil), "proto.Accounts.AlteredAccountsEntry") proto.RegisterType((*FinalizedBlock)(nil), "proto.FinalizedBlock") + proto.RegisterType((*Shard)(nil), "proto.Shard") } func init() { proto.RegisterFile("outportBlock.proto", fileDescriptor_661b95cef868af95) } var fileDescriptor_661b95cef868af95 = []byte{ - // 1897 bytes of a gzipped FileDescriptorProto + // 1904 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x4f, 0x6c, 0x1b, 0x59, - 0x19, 0xcf, 0xd8, 0x4e, 0x1c, 0x7f, 0x4e, 0x9c, 0xf4, 0x35, 0x0d, 0xd3, 0x94, 0xf5, 0x04, 0xb7, + 0x19, 0xcf, 0xf8, 0x4f, 0x1c, 0x7f, 0x4e, 0x9c, 0xf4, 0x35, 0x0d, 0xd3, 0x94, 0xf5, 0x04, 0xb7, 0xbb, 0x44, 0x94, 0xda, 0x6c, 0xb6, 0x42, 0x55, 0xab, 0x15, 0x74, 0xd2, 0x7f, 0xa1, 0xdd, 0x26, 0x9a, 0x04, 0x96, 0xac, 0x90, 0x60, 0xec, 0x79, 0x19, 0x8f, 0x6a, 0xcf, 0x33, 0x33, 0xcf, 0xc1, 0xe6, 0x02, 0x27, 0x96, 0xcb, 0x4a, 0x1c, 0xb9, 0x21, 0x71, 0x42, 0x1c, 0xb8, 0x72, 0xe0, 0x8e, 0x38, 0xa1, 0x9e, 0x50, 0x4f, 0x03, 0x4d, 0x2f, 0x68, 0x0e, 0x68, 0x6f, 0x5c, 0xd1, 0xbc, 0xf7, - 0xc6, 0xf3, 0x66, 0x3c, 0x59, 0xd9, 0x0b, 0x2b, 0x2e, 0xf6, 0xcc, 0xf7, 0xe7, 0xf7, 0xbd, 0xf7, - 0xfd, 0x7b, 0xdf, 0x3c, 0x40, 0x64, 0x48, 0x07, 0xc4, 0xa3, 0x7a, 0x8f, 0x74, 0x5e, 0x34, 0x07, - 0x1e, 0xa1, 0x04, 0x2d, 0xb2, 0xbf, 0xad, 0x5b, 0xb6, 0x43, 0xbb, 0xc3, 0x76, 0xb3, 0x43, 0xfa, - 0x2d, 0x9b, 0xd8, 0xa4, 0xc5, 0xc8, 0xed, 0xe1, 0x29, 0x7b, 0x63, 0x2f, 0xec, 0x89, 0x6b, 0x6d, - 0xbd, 0x2f, 0x89, 0xf7, 0x87, 0x3d, 0xea, 0x9c, 0x61, 0xcf, 0x1f, 0xb5, 0xfa, 0xa3, 0x5b, 0x9d, - 0xae, 0xe9, 0xb8, 0xb7, 0x3a, 0xc4, 0xc3, 0xb7, 0x6c, 0xd2, 0xb2, 0x4c, 0x6a, 0xb6, 0xda, 0x91, - 0x39, 0xfe, 0x2b, 0xd4, 0xef, 0xcf, 0xa3, 0x4e, 0x3d, 0xd3, 0xf5, 0xcd, 0x0e, 0x75, 0x88, 0xdb, - 0xea, 0x11, 0x5b, 0x40, 0xec, 0x7f, 0x5e, 0x08, 0xe9, 0x59, 0x40, 0x9d, 0xcc, 0x03, 0xe5, 0xf7, - 0x4d, 0x8f, 0xee, 0x11, 0x97, 0x7a, 0x66, 0x87, 0x1a, 0xd8, 0x1f, 0xf6, 0x68, 0x1e, 0xed, 0xf3, - 0x6c, 0xd4, 0xc3, 0x1d, 0xec, 0x0c, 0x68, 0xfc, 0x2f, 0x20, 0xf6, 0xe6, 0x83, 0xf8, 0x89, 0xe9, - 0x59, 0xc7, 0xa3, 0xc9, 0x83, 0x00, 0x39, 0x98, 0x07, 0xc4, 0xec, 0x51, 0xec, 0x61, 0xeb, 0x7e, - 0xa7, 0x43, 0x86, 0x2e, 0xcd, 0xbc, 0x72, 0xc0, 0xc6, 0x9f, 0xca, 0xb0, 0x72, 0x20, 0x65, 0x13, - 0x6a, 0x41, 0xf9, 0xa8, 0x6b, 0x7a, 0xd6, 0xfe, 0x03, 0x55, 0xd9, 0x56, 0x76, 0x56, 0xf5, 0x2b, - 0x61, 0xa0, 0x5d, 0xf2, 0x39, 0xe9, 0xeb, 0xa4, 0xef, 0x50, 0xdc, 0x1f, 0xd0, 0xb1, 0x11, 0x4b, - 0xa1, 0xc7, 0x50, 0x61, 0x9a, 0x0f, 0x4c, 0x6a, 0xaa, 0x85, 0x6d, 0x65, 0xa7, 0xba, 0xbb, 0xce, - 0xc1, 0x9b, 0x13, 0xba, 0xfe, 0xa5, 0x30, 0xd0, 0x2e, 0xb7, 0xe3, 0x57, 0x09, 0x26, 0xd1, 0x45, - 0x3f, 0x84, 0xb5, 0xe3, 0x24, 0xa6, 0x87, 0x84, 0xf4, 0xd4, 0x22, 0x83, 0xdb, 0x14, 0x70, 0x19, - 0xae, 0xfe, 0x56, 0x18, 0x68, 0x57, 0x69, 0x9a, 0x28, 0x41, 0x67, 0xd1, 0x90, 0x0f, 0x1b, 0x4f, - 0xb0, 0x69, 0x61, 0xef, 0xb1, 0xe9, 0xef, 0x11, 0xd7, 0x1f, 0xf6, 0x07, 0x11, 0x4f, 0x2d, 0x31, - 0x2b, 0xd7, 0x84, 0x95, 0x3c, 0x11, 0xbd, 0x11, 0x06, 0x5a, 0xbd, 0x9b, 0xc3, 0x91, 0xec, 0xe5, - 0x82, 0xa3, 0x1f, 0xc3, 0xda, 0xfd, 0x94, 0xe3, 0x7d, 0x75, 0x71, 0xbb, 0xb8, 0x53, 0xdd, 0xdd, - 0x11, 0xf6, 0x64, 0xef, 0x37, 0x33, 0xa2, 0x0f, 0x5d, 0xea, 0x8d, 0xf9, 0x3e, 0xd3, 0xd1, 0xf3, - 0xe5, 0x7d, 0x66, 0x94, 0xd0, 0x0f, 0x60, 0xf3, 0x39, 0xa1, 0xa6, 0xe7, 0xfc, 0x14, 0x5b, 0x7c, - 0x4d, 0xfe, 0x13, 0xd3, 0xef, 0x62, 0x5f, 0x5d, 0xda, 0x2e, 0xee, 0x54, 0xf4, 0x1b, 0x61, 0xa0, - 0x6d, 0xbb, 0xb9, 0x12, 0x12, 0xec, 0x05, 0x18, 0xe8, 0x2e, 0xd4, 0x9e, 0x0f, 0xfb, 0x6d, 0xec, - 0x1d, 0x9c, 0xb2, 0x14, 0xf0, 0xd5, 0x32, 0xcb, 0x13, 0x14, 0x06, 0x5a, 0xcd, 0x4d, 0x71, 0x8c, - 0x8c, 0x24, 0x7a, 0x00, 0xb5, 0x23, 0xc7, 0x76, 0xb1, 0xe7, 0xef, 0xbb, 0x16, 0x1e, 0x61, 0x5f, - 0x5d, 0xde, 0x2e, 0xee, 0x94, 0xf4, 0x2f, 0x87, 0x81, 0xa6, 0xfa, 0x29, 0x8e, 0xb4, 0x92, 0x8c, - 0x0e, 0x32, 0x60, 0xf3, 0x89, 0x63, 0x77, 0xb1, 0x4f, 0x1f, 0x39, 0xae, 0xd9, 0x63, 0x9e, 0x7b, - 0x4e, 0xdc, 0x0e, 0x56, 0x2b, 0xdb, 0xca, 0x4e, 0x49, 0xdf, 0x0a, 0x03, 0x6d, 0xb3, 0x9b, 0x2b, - 0x61, 0x5c, 0xa0, 0x89, 0x4e, 0xe0, 0xca, 0x14, 0x27, 0xda, 0xb0, 0x0a, 0xdb, 0xca, 0xce, 0x8a, - 0x7e, 0x3d, 0x0c, 0x34, 0xad, 0x9b, 0x27, 0x20, 0xad, 0x33, 0x1f, 0x61, 0xeb, 0x04, 0x36, 0xf2, - 0xc2, 0x8a, 0xd6, 0xa1, 0xf8, 0x02, 0x8f, 0x59, 0x95, 0x55, 0x8c, 0xe8, 0x11, 0xdd, 0x84, 0xc5, - 0x33, 0xb3, 0x37, 0xc4, 0xa2, 0x8c, 0xae, 0x88, 0x0c, 0x49, 0x6b, 0x1b, 0x5c, 0xe6, 0x6e, 0xe1, - 0x8e, 0xd2, 0xf8, 0x6d, 0x41, 0x2a, 0xbe, 0xf9, 0x4b, 0xf7, 0x1e, 0x54, 0x79, 0x6c, 0xf5, 0x31, - 0xc5, 0x3e, 0xb3, 0xba, 0xa2, 0x5f, 0x0d, 0x03, 0xed, 0x4a, 0x37, 0x21, 0x4b, 0x8a, 0xb2, 0x34, - 0xba, 0x03, 0xc0, 0x5f, 0x8f, 0xc7, 0x03, 0xcc, 0x2a, 0xb5, 0xa2, 0xab, 0x61, 0xa0, 0x6d, 0x74, - 0x27, 0x54, 0x49, 0x55, 0x92, 0x4d, 0x34, 0x99, 0x83, 0x4b, 0xcc, 0xaa, 0xa4, 0x99, 0xf1, 0xaa, - 0x24, 0x8b, 0xde, 0x83, 0x92, 0x4e, 0xac, 0xb1, 0xba, 0xc8, 0xfc, 0x53, 0x8d, 0xdb, 0x0c, 0xb1, - 0xc6, 0x3c, 0xfd, 0xda, 0xc4, 0x1a, 0x4b, 0xaa, 0x4c, 0xb8, 0xf1, 0x31, 0x4c, 0x35, 0x16, 0xd4, - 0x85, 0x15, 0x89, 0xe4, 0xab, 0x4a, 0xaa, 0x24, 0x33, 0xd2, 0xf2, 0xbb, 0x28, 0x49, 0x96, 0x62, - 0x52, 0xeb, 0x91, 0xbd, 0x94, 0x42, 0x46, 0xbf, 0x54, 0x60, 0xe3, 0x68, 0xfa, 0x5c, 0x89, 0xbc, - 0x1d, 0x99, 0xfc, 0xc6, 0x05, 0x26, 0xf3, 0x54, 0xb8, 0x69, 0xd6, 0x8a, 0x72, 0x4e, 0x2a, 0x79, - 0x09, 0xb9, 0x16, 0xd1, 0x31, 0x94, 0x0d, 0x76, 0x9c, 0xf8, 0x6a, 0x91, 0x19, 0xbf, 0x7e, 0x81, - 0x71, 0x21, 0xc5, 0xed, 0xb1, 0x24, 0xe2, 0xc7, 0x90, 0x6c, 0x22, 0x86, 0x42, 0xdf, 0x87, 0x65, - 0x83, 0x1f, 0x74, 0xbe, 0x5a, 0x62, 0xb0, 0x37, 0x2e, 0x84, 0xe5, 0x62, 0x1c, 0x77, 0x33, 0x0c, - 0x34, 0x24, 0x8e, 0x48, 0x19, 0x78, 0x82, 0x86, 0x7e, 0x04, 0xb0, 0xef, 0x9e, 0x99, 0x3d, 0xc7, - 0x3a, 0x1e, 0xc5, 0x5d, 0xf3, 0x9d, 0x0b, 0xb0, 0x13, 0x41, 0x8e, 0xce, 0xf2, 0xc9, 0x99, 0x10, - 0xe5, 0x7c, 0x4a, 0x44, 0xd1, 0x37, 0xa1, 0xf4, 0x8c, 0xd8, 0xbc, 0x2f, 0x56, 0x77, 0x6b, 0x02, - 0xfb, 0x19, 0xb1, 0xd9, 0xa1, 0xc5, 0x52, 0xaa, 0x47, 0x6c, 0x59, 0x9b, 0xc9, 0xa3, 0x5f, 0x28, - 0x70, 0xe3, 0xa8, 0xd3, 0xc5, 0xd6, 0xb0, 0x87, 0xad, 0x87, 0x23, 0xdc, 0x19, 0x52, 0x6c, 0x1d, - 0xed, 0x19, 0x47, 0xbc, 0x47, 0x1e, 0x7a, 0xf8, 0x8c, 0x95, 0xa5, 0x5a, 0x66, 0x0d, 0x77, 0x37, - 0x0c, 0xb4, 0xa6, 0x3f, 0x83, 0xbc, 0x64, 0x68, 0x26, 0x7c, 0xf4, 0x6b, 0x05, 0xbe, 0x36, 0x25, - 0x98, 0x6c, 0x30, 0xbb, 0x9c, 0x65, 0xb6, 0x9c, 0x3b, 0x61, 0xa0, 0xdd, 0xf6, 0x67, 0xd6, 0x92, - 0x16, 0x35, 0x87, 0xad, 0xad, 0xe7, 0x70, 0x69, 0xaa, 0x6e, 0x72, 0x7a, 0xde, 0xf5, 0x74, 0xcf, - 0x5b, 0x8d, 0xe3, 0x3b, 0xda, 0x77, 0x4f, 0x89, 0xd4, 0xeb, 0xb6, 0x3e, 0x84, 0xab, 0x17, 0x16, - 0x45, 0x0e, 0xee, 0x8d, 0x34, 0x6e, 0x1c, 0xdb, 0xa3, 0x3d, 0x23, 0x0b, 0xfc, 0x01, 0xac, 0xc8, - 0x09, 0x9f, 0x83, 0xf5, 0xd5, 0x34, 0xd6, 0x25, 0x81, 0xc5, 0xb5, 0xb2, 0x70, 0x4f, 0x61, 0x35, - 0x95, 0xe8, 0xb3, 0xaf, 0x4d, 0xa8, 0xc9, 0x60, 0xcf, 0x60, 0x2d, 0x93, 0xd9, 0xff, 0x85, 0x0b, - 0x1b, 0x7f, 0x28, 0x40, 0xf9, 0x11, 0xc6, 0x11, 0x19, 0xbd, 0x0d, 0xe5, 0xc7, 0xa6, 0xff, 0x5d, - 0x1f, 0x5b, 0x0c, 0xaa, 0xa4, 0x57, 0xc3, 0x40, 0x2b, 0xdb, 0x9c, 0x64, 0xc4, 0x3c, 0xd4, 0x83, - 0xe2, 0x23, 0x8c, 0xc5, 0xd1, 0xf0, 0x51, 0x18, 0x68, 0xab, 0xa7, 0x58, 0xea, 0xeb, 0xbf, 0xff, - 0xbb, 0xf6, 0xb0, 0x6f, 0xd2, 0x6e, 0xab, 0xed, 0xd8, 0xcd, 0x7d, 0x97, 0xde, 0x9b, 0x63, 0x3e, - 0x6d, 0xea, 0x8e, 0xbd, 0xef, 0xd2, 0x3d, 0xd3, 0xa7, 0xd8, 0x33, 0x22, 0x33, 0xe8, 0x13, 0x05, - 0x6a, 0xfb, 0xae, 0x43, 0x1d, 0xb3, 0x77, 0x68, 0x3a, 0x56, 0x64, 0xb9, 0xc8, 0x2c, 0xe3, 0x68, - 0x40, 0x70, 0x52, 0x9c, 0x2f, 0x62, 0x11, 0x19, 0xe3, 0x8d, 0xbf, 0x29, 0xb0, 0xc4, 0xdd, 0x88, - 0x0e, 0xa0, 0x2a, 0xa5, 0x33, 0xf3, 0x59, 0x75, 0x17, 0x4d, 0x77, 0x23, 0x7e, 0x7e, 0x4a, 0x47, - 0x83, 0x7c, 0x7e, 0x4a, 0x72, 0xe8, 0x5b, 0x93, 0x58, 0x64, 0xd2, 0x40, 0x50, 0x79, 0xe3, 0x3d, - 0xe5, 0x2f, 0x72, 0xe3, 0x8d, 0x23, 0x78, 0x17, 0x6a, 0xbc, 0x0a, 0x1d, 0xe2, 0x1e, 0x78, 0x16, - 0xf6, 0x98, 0xaf, 0xc4, 0x20, 0x86, 0x53, 0x1c, 0x23, 0x23, 0xd9, 0xf8, 0xb7, 0x02, 0x65, 0x51, - 0x0a, 0x88, 0xc0, 0xe5, 0x9c, 0xc2, 0x12, 0x3b, 0xdc, 0x8a, 0xeb, 0x66, 0x5a, 0x42, 0xff, 0x4a, - 0x18, 0x68, 0x6f, 0xe5, 0x9c, 0x44, 0xd2, 0x62, 0xf3, 0x90, 0xff, 0xbf, 0x3b, 0x3f, 0x86, 0xb2, - 0xe8, 0xef, 0xa8, 0x11, 0x05, 0x97, 0xcd, 0x20, 0xac, 0x98, 0x74, 0x08, 0x03, 0x6d, 0x89, 0x32, - 0x8a, 0x21, 0x38, 0xe8, 0x6d, 0x28, 0x3e, 0x23, 0xb6, 0x58, 0x27, 0x24, 0x07, 0x84, 0x5e, 0x0e, - 0x03, 0xad, 0xd8, 0x23, 0xb6, 0x11, 0xf1, 0x1b, 0x1f, 0x2b, 0x00, 0x49, 0x3b, 0x40, 0xef, 0xc3, - 0x12, 0x7f, 0x13, 0x5e, 0x5c, 0x4b, 0x75, 0x8c, 0xe3, 0x91, 0xbe, 0x11, 0x06, 0xda, 0x3a, 0x3f, - 0x54, 0xa5, 0x0d, 0x0a, 0xa5, 0x9c, 0xfd, 0x15, 0x66, 0xde, 0xdf, 0xbf, 0x94, 0xfc, 0xaf, 0x1c, - 0xf4, 0x2e, 0x54, 0x1f, 0x9b, 0xfe, 0xa1, 0x47, 0xce, 0x1c, 0x6b, 0x52, 0xf4, 0x6b, 0x61, 0xa0, - 0x55, 0xed, 0x84, 0x6c, 0xc8, 0x32, 0x42, 0xc5, 0xc0, 0xa7, 0x43, 0x37, 0x52, 0x29, 0xa4, 0x54, - 0x62, 0xb2, 0x21, 0xcb, 0xa0, 0xdb, 0xb0, 0x12, 0x21, 0x60, 0xd7, 0xec, 0x45, 0x9f, 0x0e, 0x2c, - 0x30, 0x25, 0x7d, 0x3d, 0x0c, 0xb4, 0x15, 0x5b, 0xa2, 0x1b, 0x29, 0xa9, 0x68, 0xc3, 0x1f, 0x98, - 0x23, 0x46, 0xf2, 0xf8, 0x49, 0x55, 0x62, 0x7a, 0x6c, 0xc3, 0xfd, 0x14, 0xc7, 0xc8, 0x48, 0x36, - 0x4e, 0xe1, 0xf2, 0xf7, 0xa2, 0x06, 0x69, 0x52, 0xe2, 0x19, 0x26, 0x75, 0x5c, 0x9b, 0x85, 0xe0, - 0x26, 0x54, 0x0e, 0x87, 0xed, 0x9e, 0xd3, 0x79, 0x1a, 0x37, 0x4b, 0x7d, 0x35, 0x0c, 0xb4, 0xca, - 0x20, 0x26, 0x1a, 0x09, 0x3f, 0xca, 0x04, 0xae, 0xca, 0xf6, 0x58, 0xe0, 0x99, 0xe0, 0x31, 0x8a, - 0x21, 0x38, 0x8d, 0xbf, 0x2a, 0xb0, 0x3e, 0x31, 0xe4, 0x73, 0x62, 0xd4, 0x45, 0xd3, 0x23, 0x37, - 0xeb, 0xa2, 0x62, 0xe4, 0x4e, 0x06, 0x6d, 0x0d, 0x16, 0x1f, 0x0e, 0x48, 0xa7, 0x2b, 0xe2, 0x58, - 0x09, 0x03, 0x6d, 0x11, 0x47, 0x04, 0x83, 0xd3, 0x91, 0x07, 0x1b, 0x59, 0x6c, 0x56, 0x1f, 0x7c, - 0x4e, 0x8b, 0x8b, 0x30, 0x67, 0x9f, 0x7c, 0x1c, 0x3c, 0xcb, 0xd1, 0x95, 0xc7, 0xc1, 0x3c, 0xec, - 0xc6, 0x6f, 0x0a, 0x50, 0x31, 0xc8, 0xd0, 0xe5, 0x29, 0xab, 0xc1, 0x22, 0x7b, 0x11, 0x89, 0xc1, + 0xc6, 0xf3, 0x66, 0x3c, 0x59, 0x39, 0x0b, 0x2b, 0x2e, 0xf6, 0xcc, 0xf7, 0xe7, 0xf7, 0xbd, 0xf7, + 0xfd, 0x7b, 0xdf, 0x3c, 0x40, 0x64, 0x44, 0x87, 0xc4, 0xa3, 0x7a, 0x9f, 0x74, 0x5f, 0xb4, 0x86, + 0x1e, 0xa1, 0x04, 0x95, 0xd9, 0xdf, 0xe6, 0x2d, 0xdb, 0xa1, 0xbd, 0x51, 0xa7, 0xd5, 0x25, 0x83, + 0xb6, 0x4d, 0x6c, 0xd2, 0x66, 0xe4, 0xce, 0xe8, 0x84, 0xbd, 0xb1, 0x17, 0xf6, 0xc4, 0xb5, 0x36, + 0xdf, 0x97, 0xc4, 0x07, 0xa3, 0x3e, 0x75, 0x4e, 0xb1, 0xe7, 0x8f, 0xdb, 0x83, 0xf1, 0xad, 0x6e, + 0xcf, 0x74, 0xdc, 0x5b, 0x5d, 0xe2, 0xe1, 0x5b, 0x36, 0x69, 0x5b, 0x26, 0x35, 0xdb, 0x9d, 0xc8, + 0x1c, 0xff, 0x15, 0xea, 0xf7, 0x2f, 0xa2, 0x4e, 0x3d, 0xd3, 0xf5, 0xcd, 0x2e, 0x75, 0x88, 0xdb, + 0xee, 0x13, 0x5b, 0x40, 0xec, 0x7d, 0x5e, 0x08, 0xe9, 0x59, 0x40, 0x1d, 0x5f, 0x04, 0xca, 0x1f, + 0x98, 0x1e, 0xdd, 0x25, 0x2e, 0xf5, 0xcc, 0x2e, 0x35, 0xb0, 0x3f, 0xea, 0xd3, 0x3c, 0xda, 0xe7, + 0xd9, 0xa8, 0x87, 0xbb, 0xd8, 0x19, 0xd2, 0xf8, 0x5f, 0x40, 0xec, 0x5e, 0x0c, 0xe2, 0x27, 0xa6, + 0x67, 0x1d, 0x8d, 0xa7, 0x0f, 0x02, 0x64, 0xff, 0x22, 0x20, 0x66, 0x9f, 0x62, 0x0f, 0x5b, 0xf7, + 0xbb, 0x5d, 0x32, 0x72, 0x69, 0xe6, 0x95, 0x03, 0x36, 0xff, 0x54, 0x81, 0xe5, 0x7d, 0x29, 0x9b, + 0x50, 0x1b, 0x2a, 0x87, 0x3d, 0xd3, 0xb3, 0xf6, 0x1e, 0xa8, 0xca, 0x96, 0xb2, 0xbd, 0xa2, 0x5f, + 0x09, 0x03, 0xed, 0x92, 0xcf, 0x49, 0x5f, 0x27, 0x03, 0x87, 0xe2, 0xc1, 0x90, 0x4e, 0x8c, 0x58, + 0x0a, 0x3d, 0x86, 0x2a, 0xd3, 0x7c, 0x60, 0x52, 0x53, 0x2d, 0x6c, 0x29, 0xdb, 0xb5, 0x9d, 0x35, + 0x0e, 0xde, 0x9a, 0xd2, 0xf5, 0x2f, 0x85, 0x81, 0x76, 0xb9, 0x13, 0xbf, 0x4a, 0x30, 0x89, 0x2e, + 0xfa, 0x21, 0xac, 0x1e, 0x25, 0x31, 0x3d, 0x20, 0xa4, 0xaf, 0x16, 0x19, 0xdc, 0x86, 0x80, 0xcb, + 0x70, 0xf5, 0xb7, 0xc2, 0x40, 0xbb, 0x4a, 0xd3, 0x44, 0x09, 0x3a, 0x8b, 0x86, 0x7c, 0x58, 0x7f, + 0x82, 0x4d, 0x0b, 0x7b, 0x8f, 0x4d, 0x7f, 0x97, 0xb8, 0xfe, 0x68, 0x30, 0x8c, 0x78, 0x6a, 0x89, + 0x59, 0xb9, 0x26, 0xac, 0xe4, 0x89, 0xe8, 0xcd, 0x30, 0xd0, 0x1a, 0xbd, 0x1c, 0x8e, 0x64, 0x2f, + 0x17, 0x1c, 0xfd, 0x18, 0x56, 0xef, 0xa7, 0x1c, 0xef, 0xab, 0xe5, 0xad, 0xe2, 0x76, 0x6d, 0x67, + 0x5b, 0xd8, 0x93, 0xbd, 0xdf, 0xca, 0x88, 0x3e, 0x74, 0xa9, 0x37, 0xe1, 0xfb, 0x4c, 0x47, 0xcf, + 0x97, 0xf7, 0x99, 0x51, 0x42, 0x3f, 0x80, 0x8d, 0xe7, 0x84, 0x9a, 0x9e, 0xf3, 0x53, 0x6c, 0xf1, + 0x35, 0xf9, 0x4f, 0x4c, 0xbf, 0x87, 0x7d, 0x75, 0x71, 0xab, 0xb8, 0x5d, 0xd5, 0x6f, 0x84, 0x81, + 0xb6, 0xe5, 0xe6, 0x4a, 0x48, 0xb0, 0xe7, 0x60, 0xa0, 0xbb, 0x50, 0x7f, 0x3e, 0x1a, 0x74, 0xb0, + 0xb7, 0x7f, 0xc2, 0x52, 0xc0, 0x57, 0x2b, 0x2c, 0x4f, 0x50, 0x18, 0x68, 0x75, 0x37, 0xc5, 0x31, + 0x32, 0x92, 0xe8, 0x01, 0xd4, 0x0f, 0x1d, 0xdb, 0xc5, 0x9e, 0xbf, 0xe7, 0x5a, 0x78, 0x8c, 0x7d, + 0x75, 0x69, 0xab, 0xb8, 0x5d, 0xd2, 0xbf, 0x1c, 0x06, 0x9a, 0xea, 0xa7, 0x38, 0xd2, 0x4a, 0x32, + 0x3a, 0xc8, 0x80, 0x8d, 0x27, 0x8e, 0xdd, 0xc3, 0x3e, 0x7d, 0xe4, 0xb8, 0x66, 0x9f, 0x79, 0xee, + 0x39, 0x71, 0xbb, 0x58, 0xad, 0x6e, 0x29, 0xdb, 0x25, 0x7d, 0x33, 0x0c, 0xb4, 0x8d, 0x5e, 0xae, + 0x84, 0x71, 0x8e, 0x26, 0x3a, 0x86, 0x2b, 0x33, 0x9c, 0x68, 0xc3, 0x2a, 0x6c, 0x29, 0xdb, 0xcb, + 0xfa, 0xf5, 0x30, 0xd0, 0xb4, 0x5e, 0x9e, 0x80, 0xb4, 0xce, 0x7c, 0x84, 0xcd, 0x63, 0x58, 0xcf, + 0x0b, 0x2b, 0x5a, 0x83, 0xe2, 0x0b, 0x3c, 0x61, 0x55, 0x56, 0x35, 0xa2, 0x47, 0x74, 0x13, 0xca, + 0xa7, 0x66, 0x7f, 0x84, 0x45, 0x19, 0x5d, 0x11, 0x19, 0x92, 0xd6, 0x36, 0xb8, 0xcc, 0xdd, 0xc2, + 0x1d, 0xa5, 0xf9, 0xdb, 0x82, 0x54, 0x7c, 0x17, 0x2f, 0xdd, 0x7b, 0x50, 0xe3, 0xb1, 0xd5, 0x27, + 0x14, 0xfb, 0xcc, 0xea, 0xb2, 0x7e, 0x35, 0x0c, 0xb4, 0x2b, 0xbd, 0x84, 0x2c, 0x29, 0xca, 0xd2, + 0xe8, 0x0e, 0x00, 0x7f, 0x3d, 0x9a, 0x0c, 0x31, 0xab, 0xd4, 0xaa, 0xae, 0x86, 0x81, 0xb6, 0xde, + 0x9b, 0x52, 0x25, 0x55, 0x49, 0x36, 0xd1, 0x64, 0x0e, 0x2e, 0x31, 0xab, 0x92, 0x66, 0xc6, 0xab, + 0x92, 0x2c, 0x7a, 0x0f, 0x4a, 0x3a, 0xb1, 0x26, 0x6a, 0x99, 0xf9, 0xa7, 0x16, 0xb7, 0x19, 0x62, + 0x4d, 0x78, 0xfa, 0x75, 0x88, 0x35, 0x91, 0x54, 0x99, 0x70, 0xf3, 0x63, 0x98, 0x69, 0x2c, 0xa8, + 0x07, 0xcb, 0x12, 0xc9, 0x57, 0x95, 0x54, 0x49, 0x66, 0xa4, 0xe5, 0x77, 0x51, 0x92, 0x2c, 0xc5, + 0xa4, 0xd6, 0x23, 0x7b, 0x29, 0x85, 0x8c, 0x7e, 0xa9, 0xc0, 0xfa, 0xe1, 0xec, 0xb9, 0x12, 0x79, + 0x3b, 0x32, 0xf9, 0x8d, 0x73, 0x4c, 0xe6, 0xa9, 0x70, 0xd3, 0xac, 0x15, 0xe5, 0x9c, 0x54, 0xf2, + 0x12, 0x72, 0x2d, 0xa2, 0x23, 0xa8, 0x18, 0xec, 0x38, 0xf1, 0xd5, 0x22, 0x33, 0x7e, 0xfd, 0x1c, + 0xe3, 0x42, 0x8a, 0xdb, 0x63, 0x49, 0xc4, 0x8f, 0x21, 0xd9, 0x44, 0x0c, 0x85, 0xbe, 0x0f, 0x4b, + 0x06, 0x3f, 0xe8, 0x7c, 0xb5, 0xc4, 0x60, 0x6f, 0x9c, 0x0b, 0xcb, 0xc5, 0x38, 0xee, 0x46, 0x18, + 0x68, 0x48, 0x1c, 0x91, 0x32, 0xf0, 0x14, 0x0d, 0xfd, 0x08, 0x60, 0xcf, 0x3d, 0x35, 0xfb, 0x8e, + 0x75, 0x34, 0x8e, 0xbb, 0xe6, 0x3b, 0xe7, 0x60, 0x27, 0x82, 0x1c, 0x9d, 0xe5, 0x93, 0x33, 0x25, + 0xca, 0xf9, 0x94, 0x88, 0xa2, 0x6f, 0x42, 0xe9, 0x19, 0xb1, 0x79, 0x5f, 0xac, 0xed, 0xd4, 0x05, + 0xf6, 0x33, 0x62, 0xb3, 0x43, 0x8b, 0xa5, 0x54, 0x9f, 0xd8, 0xb2, 0x36, 0x93, 0x47, 0xbf, 0x50, + 0xe0, 0xc6, 0x61, 0xb7, 0x87, 0xad, 0x51, 0x1f, 0x5b, 0x0f, 0xc7, 0xb8, 0x3b, 0xa2, 0xd8, 0x3a, + 0xdc, 0x35, 0x0e, 0x79, 0x8f, 0x3c, 0xf0, 0xf0, 0x29, 0x2b, 0x4b, 0xb5, 0xc2, 0x1a, 0xee, 0x4e, + 0x18, 0x68, 0x2d, 0x7f, 0x0e, 0x79, 0xc9, 0xd0, 0x5c, 0xf8, 0xe8, 0xd7, 0x0a, 0x7c, 0x6d, 0x46, + 0x30, 0xd9, 0x60, 0x76, 0x39, 0x4b, 0x6c, 0x39, 0x77, 0xc2, 0x40, 0xbb, 0xed, 0xcf, 0xad, 0x25, + 0x2d, 0xea, 0x02, 0xb6, 0x36, 0x9f, 0xc3, 0xa5, 0x99, 0xba, 0xc9, 0xe9, 0x79, 0xd7, 0xd3, 0x3d, + 0x6f, 0x25, 0x8e, 0xef, 0x78, 0xcf, 0x3d, 0x21, 0x52, 0xaf, 0xdb, 0xfc, 0x10, 0xae, 0x9e, 0x5b, + 0x14, 0x39, 0xb8, 0x37, 0xd2, 0xb8, 0x71, 0x6c, 0x0f, 0x77, 0x8d, 0x2c, 0xf0, 0x07, 0xb0, 0x2c, + 0x27, 0x7c, 0x0e, 0xd6, 0x57, 0xd3, 0x58, 0x97, 0x04, 0x16, 0xd7, 0xca, 0xc2, 0x3d, 0x85, 0x95, + 0x54, 0xa2, 0xcf, 0xbf, 0x36, 0xa1, 0x26, 0x83, 0x3d, 0x83, 0xd5, 0x4c, 0x66, 0xff, 0x17, 0x2e, + 0x6c, 0xfe, 0xa1, 0x00, 0x95, 0x47, 0x18, 0x47, 0x64, 0xf4, 0x36, 0x54, 0x1e, 0x9b, 0xfe, 0x77, + 0x7d, 0x6c, 0x31, 0xa8, 0x92, 0x5e, 0x0b, 0x03, 0xad, 0x62, 0x73, 0x92, 0x11, 0xf3, 0x50, 0x1f, + 0x8a, 0x8f, 0x30, 0x16, 0x47, 0xc3, 0x47, 0x61, 0xa0, 0xad, 0x9c, 0x60, 0xa9, 0xaf, 0xff, 0xfe, + 0xef, 0xda, 0xc3, 0x81, 0x49, 0x7b, 0xed, 0x8e, 0x63, 0xb7, 0xf6, 0x5c, 0x7a, 0xef, 0x02, 0xf3, + 0x69, 0x4b, 0x77, 0xec, 0x3d, 0x97, 0xee, 0x9a, 0x3e, 0xc5, 0x9e, 0x11, 0x99, 0x41, 0x9f, 0x28, + 0x50, 0xdf, 0x73, 0x1d, 0xea, 0x98, 0xfd, 0x03, 0xd3, 0xb1, 0x22, 0xcb, 0x45, 0x66, 0x19, 0x47, + 0x03, 0x82, 0x93, 0xe2, 0x7c, 0x11, 0x8b, 0xc8, 0x18, 0x6f, 0xfe, 0x4d, 0x81, 0x45, 0xee, 0x46, + 0xb4, 0x0f, 0x35, 0x29, 0x9d, 0x99, 0xcf, 0x6a, 0x3b, 0x68, 0xb6, 0x1b, 0xf1, 0xf3, 0x53, 0x3a, + 0x1a, 0xe4, 0xf3, 0x53, 0x92, 0x43, 0xdf, 0x9a, 0xc6, 0x22, 0x93, 0x06, 0x82, 0xca, 0x1b, 0xef, + 0x09, 0x7f, 0x91, 0x1b, 0x6f, 0x1c, 0xc1, 0xbb, 0x50, 0xe7, 0x55, 0xe8, 0x10, 0x77, 0xdf, 0xb3, + 0xb0, 0xc7, 0x7c, 0x25, 0x06, 0x31, 0x9c, 0xe2, 0x18, 0x19, 0xc9, 0xe6, 0xbf, 0x15, 0xa8, 0x88, + 0x52, 0x40, 0x04, 0x2e, 0xe7, 0x14, 0x96, 0xd8, 0xe1, 0x66, 0x5c, 0x37, 0xb3, 0x12, 0xfa, 0x57, + 0xc2, 0x40, 0x7b, 0x2b, 0xe7, 0x24, 0x92, 0x16, 0x9b, 0x87, 0xfc, 0xff, 0xdd, 0xf9, 0x11, 0x54, + 0x44, 0x7f, 0x47, 0xcd, 0x28, 0xb8, 0x6c, 0x06, 0x61, 0xc5, 0xa4, 0x43, 0x18, 0x68, 0x8b, 0x94, + 0x51, 0x0c, 0xc1, 0x41, 0x6f, 0x43, 0xf1, 0x19, 0xb1, 0xc5, 0x3a, 0x21, 0x39, 0x20, 0xf4, 0x4a, + 0x18, 0x68, 0xc5, 0x3e, 0xb1, 0x8d, 0x88, 0xdf, 0xfc, 0x58, 0x01, 0x48, 0xda, 0x01, 0x7a, 0x1f, + 0x16, 0xf9, 0x9b, 0xf0, 0xe2, 0x6a, 0xaa, 0x63, 0x1c, 0x8d, 0xf5, 0xf5, 0x30, 0xd0, 0xd6, 0xf8, + 0xa1, 0x2a, 0x6d, 0x50, 0x28, 0xe5, 0xec, 0xaf, 0x30, 0xf7, 0xfe, 0xfe, 0xa5, 0xe4, 0x7f, 0xe5, + 0xa0, 0x77, 0xa1, 0xf6, 0xd8, 0xf4, 0x0f, 0x3c, 0x72, 0xea, 0x58, 0xd3, 0xa2, 0x5f, 0x0d, 0x03, + 0xad, 0x66, 0x27, 0x64, 0x43, 0x96, 0x11, 0x2a, 0x06, 0x3e, 0x19, 0xb9, 0x91, 0x4a, 0x21, 0xa5, + 0x12, 0x93, 0x0d, 0x59, 0x06, 0xdd, 0x86, 0xe5, 0x08, 0x01, 0xbb, 0x66, 0x3f, 0xfa, 0x74, 0x60, + 0x81, 0x29, 0xe9, 0x6b, 0x61, 0xa0, 0x2d, 0xdb, 0x12, 0xdd, 0x48, 0x49, 0x45, 0x1b, 0xfe, 0xc0, + 0x1c, 0x33, 0x92, 0xc7, 0x4f, 0xaa, 0x12, 0xd3, 0x63, 0x1b, 0x1e, 0xa4, 0x38, 0x46, 0x46, 0xb2, + 0x79, 0x02, 0x97, 0xbf, 0x17, 0x35, 0x48, 0x93, 0x12, 0xcf, 0x30, 0xa9, 0xe3, 0xda, 0x2c, 0x04, + 0x37, 0xa1, 0x7a, 0x30, 0xea, 0xf4, 0x9d, 0xee, 0xd3, 0xb8, 0x59, 0xea, 0x2b, 0x61, 0xa0, 0x55, + 0x87, 0x31, 0xd1, 0x48, 0xf8, 0x51, 0x26, 0x70, 0x55, 0xb6, 0xc7, 0x02, 0xcf, 0x04, 0x8f, 0x51, + 0x0c, 0xc1, 0x69, 0xfe, 0x55, 0x81, 0xb5, 0xa9, 0x21, 0x9f, 0x13, 0xa3, 0x2e, 0x9a, 0x1e, 0xb9, + 0x59, 0x17, 0x15, 0x23, 0x77, 0x32, 0x68, 0x6b, 0x50, 0x7e, 0x38, 0x24, 0xdd, 0x9e, 0x88, 0x63, + 0x35, 0x0c, 0xb4, 0x32, 0x8e, 0x08, 0x06, 0xa7, 0x23, 0x0f, 0xd6, 0xb3, 0xd8, 0xac, 0x3e, 0xf8, + 0x9c, 0x16, 0x17, 0x61, 0xce, 0x3e, 0xf9, 0x38, 0x78, 0x9a, 0xa3, 0x2b, 0x8f, 0x83, 0x79, 0xd8, + 0xcd, 0xdf, 0x14, 0xa0, 0x6a, 0x90, 0x91, 0xcb, 0x53, 0x56, 0x83, 0x32, 0x7b, 0x11, 0x89, 0xc1, 0x96, 0xe8, 0x45, 0x04, 0x83, 0xd3, 0xa3, 0x18, 0x65, 0xbe, 0xdd, 0x0a, 0xec, 0xdb, 0x8d, 0xc5, - 0x28, 0xfd, 0xed, 0x36, 0xf5, 0xc5, 0xf6, 0x6d, 0x58, 0x67, 0xc1, 0xfa, 0x90, 0x25, 0xd7, 0x80, - 0xf8, 0x22, 0x33, 0x96, 0x79, 0x21, 0xb4, 0x33, 0x3c, 0x63, 0x4a, 0x3a, 0x71, 0xb4, 0xc5, 0x52, - 0x23, 0xe5, 0x68, 0x2b, 0x76, 0xb4, 0x95, 0x38, 0x7a, 0xf1, 0x02, 0x47, 0xdf, 0x84, 0xca, 0xb1, - 0xd3, 0xc7, 0x3e, 0x35, 0xfb, 0x03, 0x75, 0x89, 0x6d, 0x95, 0xa5, 0x05, 0x8d, 0x89, 0x46, 0xc2, - 0x6f, 0xfc, 0x0c, 0x80, 0xed, 0xdd, 0x8f, 0x4f, 0xcc, 0x59, 0x62, 0xfd, 0x1d, 0x59, 0x49, 0x4c, - 0xf9, 0xf1, 0x85, 0xc8, 0xc4, 0xdd, 0x7c, 0x3e, 0xf5, 0x26, 0x72, 0xf2, 0x7c, 0x9a, 0x68, 0x37, - 0xde, 0x85, 0xf2, 0xe1, 0xb0, 0xfd, 0x14, 0x8f, 0x7d, 0xf4, 0x0e, 0x94, 0xa2, 0x7f, 0xf6, 0xa5, - 0xb2, 0xc2, 0x9d, 0xfe, 0x02, 0x8f, 0x53, 0xa3, 0x69, 0xc4, 0x6f, 0xfc, 0xb9, 0x00, 0x97, 0x92, - 0x70, 0xc7, 0xda, 0x33, 0xae, 0xfd, 0x13, 0x05, 0x36, 0xd9, 0xf3, 0x14, 0x82, 0xd8, 0xc8, 0xed, - 0x6c, 0x26, 0xc6, 0xfc, 0x66, 0xbe, 0x1a, 0x1f, 0xc6, 0xb5, 0x30, 0xd0, 0xae, 0x9d, 0x65, 0x79, - 0xf2, 0x5d, 0x43, 0xbe, 0x76, 0x12, 0xce, 0x62, 0x7e, 0x38, 0xb7, 0x4e, 0xe0, 0xda, 0x67, 0x18, - 0x96, 0x67, 0xa5, 0xd5, 0xcf, 0x1c, 0xbd, 0x84, 0x96, 0x3c, 0x2c, 0xfd, 0xb1, 0x00, 0xcb, 0x93, - 0x2b, 0x95, 0x19, 0xfd, 0x77, 0x17, 0x6a, 0x2c, 0x73, 0x93, 0x14, 0x2b, 0x24, 0x7d, 0xac, 0x9d, - 0xe2, 0x18, 0x19, 0x49, 0xd4, 0x9f, 0xbe, 0x28, 0x2a, 0xa6, 0x3e, 0xa7, 0x62, 0xf2, 0xff, 0xe4, - 0x92, 0xe8, 0x8b, 0xbc, 0x95, 0xb0, 0xa1, 0xc6, 0xae, 0x40, 0xa2, 0xd6, 0xce, 0x3f, 0x53, 0x66, - 0x74, 0x5f, 0x33, 0x75, 0x31, 0xc0, 0x67, 0xce, 0x5a, 0x18, 0x68, 0x90, 0x5c, 0x0c, 0xc8, 0xd7, - 0x01, 0xfa, 0xf0, 0xe5, 0xeb, 0xfa, 0xc2, 0xab, 0xd7, 0xf5, 0x85, 0x4f, 0x5f, 0xd7, 0x95, 0x9f, - 0x9f, 0xd7, 0x95, 0xdf, 0x9d, 0xd7, 0x95, 0xbf, 0x9c, 0xd7, 0x95, 0x97, 0xe7, 0x75, 0xe5, 0xd5, - 0x79, 0x5d, 0xf9, 0xc7, 0x79, 0x5d, 0xf9, 0xe7, 0x79, 0x7d, 0xe1, 0xd3, 0xf3, 0xba, 0xf2, 0xab, - 0x37, 0xf5, 0x85, 0x97, 0x6f, 0xea, 0x0b, 0xaf, 0xde, 0xd4, 0x17, 0x3e, 0x9a, 0x67, 0x44, 0x6c, - 0x89, 0xdb, 0xf6, 0x7b, 0xe2, 0xbf, 0xbd, 0xc4, 0x1c, 0xf0, 0xde, 0x7f, 0x02, 0x00, 0x00, 0xff, - 0xff, 0xca, 0xf7, 0x70, 0x7a, 0x87, 0x17, 0x00, 0x00, + 0x28, 0xfd, 0xed, 0x36, 0xf3, 0xc5, 0xf6, 0x6d, 0x58, 0x63, 0xc1, 0xfa, 0x90, 0x25, 0xd7, 0x90, + 0xf8, 0x22, 0x33, 0x96, 0x78, 0x21, 0x74, 0x32, 0x3c, 0x63, 0x46, 0x3a, 0x71, 0xb4, 0xc5, 0x52, + 0x23, 0xe5, 0x68, 0x2b, 0x76, 0xb4, 0x95, 0x38, 0xba, 0x7c, 0x8e, 0xa3, 0x6f, 0x42, 0xf5, 0xc8, + 0x19, 0x60, 0x9f, 0x9a, 0x83, 0xa1, 0xba, 0xc8, 0xb6, 0xca, 0xd2, 0x82, 0xc6, 0x44, 0x23, 0xe1, + 0x37, 0x7f, 0x06, 0xc0, 0xf6, 0xee, 0xc7, 0x27, 0xe6, 0x3c, 0xb1, 0xfe, 0x8e, 0xac, 0x24, 0xa6, + 0xfc, 0xf8, 0x42, 0x64, 0xea, 0x6e, 0x3e, 0x9f, 0x7a, 0x53, 0x39, 0x79, 0x3e, 0x4d, 0xb4, 0x9b, + 0xef, 0x42, 0xe5, 0x60, 0xd4, 0x79, 0x8a, 0x27, 0x3e, 0x7a, 0x07, 0x4a, 0xd1, 0x3f, 0xfb, 0x52, + 0x59, 0xe6, 0x4e, 0x7f, 0x81, 0x27, 0xa9, 0xd1, 0x34, 0xe2, 0x37, 0xff, 0x5c, 0x80, 0x4b, 0x49, + 0xb8, 0x63, 0xed, 0x39, 0xd7, 0xfe, 0x89, 0x02, 0x1b, 0xec, 0x79, 0x06, 0x41, 0x6c, 0xe4, 0x76, + 0x36, 0x13, 0x63, 0x7e, 0x2b, 0x5f, 0x8d, 0x0f, 0xe3, 0x5a, 0x18, 0x68, 0xd7, 0x4e, 0xb3, 0x3c, + 0xf9, 0xae, 0x21, 0x5f, 0x3b, 0x09, 0x67, 0x31, 0x3f, 0x9c, 0x9b, 0xc7, 0x70, 0xed, 0x33, 0x0c, + 0xcb, 0xb3, 0xd2, 0xca, 0x67, 0x8e, 0x5e, 0x42, 0x4b, 0x1e, 0x96, 0xfe, 0x58, 0x80, 0xa5, 0xe9, + 0x95, 0xca, 0x9c, 0xfe, 0xbb, 0x0b, 0x75, 0x96, 0xb9, 0x49, 0x8a, 0x15, 0x92, 0x3e, 0xd6, 0x49, + 0x71, 0x8c, 0x8c, 0x24, 0x1a, 0xcc, 0x5e, 0x14, 0x15, 0x53, 0x9f, 0x53, 0x31, 0xf9, 0x7f, 0x72, + 0x49, 0xf4, 0x45, 0xde, 0x4a, 0xd8, 0x50, 0x67, 0x57, 0x20, 0x51, 0x6b, 0xe7, 0x9f, 0x29, 0x73, + 0xba, 0xaf, 0x95, 0xba, 0x18, 0xe0, 0x33, 0x67, 0x3d, 0x0c, 0x34, 0x48, 0x2e, 0x06, 0xe4, 0xeb, + 0x80, 0x66, 0x0b, 0xca, 0x4c, 0x75, 0x4e, 0x7c, 0x7d, 0xf4, 0xf2, 0x75, 0x63, 0xe1, 0xd5, 0xeb, + 0xc6, 0xc2, 0xa7, 0xaf, 0x1b, 0xca, 0xcf, 0xcf, 0x1a, 0xca, 0xef, 0xce, 0x1a, 0xca, 0x5f, 0xce, + 0x1a, 0xca, 0xcb, 0xb3, 0x86, 0xf2, 0xea, 0xac, 0xa1, 0xfc, 0xe3, 0xac, 0xa1, 0xfc, 0xf3, 0xac, + 0xb1, 0xf0, 0xe9, 0x59, 0x43, 0xf9, 0xd5, 0x9b, 0xc6, 0xc2, 0xcb, 0x37, 0x8d, 0x85, 0x57, 0x6f, + 0x1a, 0x0b, 0x1f, 0x5d, 0x64, 0xa4, 0x6c, 0x8b, 0xdb, 0xf9, 0x7b, 0xe2, 0xbf, 0xb3, 0xc8, 0x1c, + 0xf6, 0xde, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x25, 0x83, 0x2b, 0xb7, 0x17, 0x00, 0x00, } func (this *OutportBlock) Equal(that interface{}) bool { @@ -1846,6 +1886,30 @@ func (this *FinalizedBlock) Equal(that interface{}) bool { } return true } +func (this *Shard) Equal(that interface{}) bool { + if that == nil { + return this == nil + } + + that1, ok := that.(*Shard) + if !ok { + that2, ok := that.(Shard) + if ok { + that1 = &that2 + } else { + return false + } + } + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + if this.ShardID != that1.ShardID { + return false + } + return true +} func (this *OutportBlock) GoString() string { if this == nil { return "nil" @@ -2183,6 +2247,16 @@ func (this *FinalizedBlock) GoString() string { s = append(s, "}") return strings.Join(s, "") } +func (this *Shard) GoString() string { + if this == nil { + return "nil" + } + s := make([]string, 0, 5) + s = append(s, "&outport.Shard{") + s = append(s, "ShardID: "+fmt.Sprintf("%#v", this.ShardID)+",\n") + s = append(s, "}") + return strings.Join(s, "") +} func valueToGoStringOutportBlock(v interface{}, typ string) string { rv := reflect.ValueOf(v) if rv.IsNil() { @@ -3269,6 +3343,34 @@ func (m *FinalizedBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *Shard) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Shard) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Shard) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.ShardID != 0 { + i = encodeVarintOutportBlock(dAtA, i, uint64(m.ShardID)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + func encodeVarintOutportBlock(dAtA []byte, offset int, v uint64) int { offset -= sovOutportBlock(v) base := offset @@ -3749,6 +3851,18 @@ func (m *FinalizedBlock) Size() (n int) { return n } +func (m *Shard) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.ShardID != 0 { + n += 1 + sovOutportBlock(uint64(m.ShardID)) + } + return n +} + func sovOutportBlock(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -4065,6 +4179,16 @@ func (this *FinalizedBlock) String() string { }, "") return s } +func (this *Shard) String() string { + if this == nil { + return "nil" + } + s := strings.Join([]string{`&Shard{`, + `ShardID:` + fmt.Sprintf("%v", this.ShardID) + `,`, + `}`, + }, "") + return s +} func valueToStringOutportBlock(v interface{}) string { rv := reflect.ValueOf(v) if rv.IsNil() { @@ -7529,6 +7653,78 @@ func (m *FinalizedBlock) Unmarshal(dAtA []byte) error { } return nil } +func (m *Shard) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOutportBlock + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Shard: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Shard: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ShardID", wireType) + } + m.ShardID = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOutportBlock + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ShardID |= uint32(b&0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipOutportBlock(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthOutportBlock + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthOutportBlock + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipOutportBlock(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/data/outport/outportBlock.proto b/data/outport/outportBlock.proto index 4ce0a02d..f4ce621d 100644 --- a/data/outport/outportBlock.proto +++ b/data/outport/outportBlock.proto @@ -126,3 +126,7 @@ message FinalizedBlock { uint32 ShardID = 1 [(gogoproto.jsontag) = "shardID"]; bytes HeaderHash = 2 [(gogoproto.jsontag) = "headerHash"]; } + +message Shard { + uint32 ShardID = 1 [(gogoproto.jsontag) = "shardID"]; +} From ba37de156180b1f74a2ea66adf1b47a7c88ad8cd Mon Sep 17 00:00:00 2001 From: Iuga Mihai Date: Wed, 19 Jul 2023 14:17:00 +0300 Subject: [PATCH 3/4] settings --- data/outport/config.pb.go | 72 +++++++++++++++++++++++++++++++-------- data/outport/config.proto | 3 +- 2 files changed, 59 insertions(+), 16 deletions(-) diff --git a/data/outport/config.pb.go b/data/outport/config.pb.go index 2dd4ffac..3836b1d1 100644 --- a/data/outport/config.pb.go +++ b/data/outport/config.pb.go @@ -26,7 +26,8 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type OutportConfig struct { - IsInImportDBMode bool `protobuf:"varint,1,opt,name=IsInImportDBMode,proto3" json:"isInImportDBMode"` + ShardID uint32 `protobuf:"varint,1,opt,name=ShardID,proto3" json:"shardID"` + IsInImportDBMode bool `protobuf:"varint,2,opt,name=IsInImportDBMode,proto3" json:"isInImportDBMode"` } func (m *OutportConfig) Reset() { *m = OutportConfig{} } @@ -57,6 +58,13 @@ func (m *OutportConfig) XXX_DiscardUnknown() { var xxx_messageInfo_OutportConfig proto.InternalMessageInfo +func (m *OutportConfig) GetShardID() uint32 { + if m != nil { + return m.ShardID + } + return 0 +} + func (m *OutportConfig) GetIsInImportDBMode() bool { if m != nil { return m.IsInImportDBMode @@ -71,22 +79,24 @@ func init() { func init() { proto.RegisterFile("config.proto", fileDescriptor_3eaf2c85e69e9ea4) } var fileDescriptor_3eaf2c85e69e9ea4 = []byte{ - // 232 bytes of a gzipped FileDescriptorProto + // 261 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x49, 0xce, 0xcf, 0x4b, 0xcb, 0x4c, 0xd7, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x05, 0x53, 0x52, 0xba, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0xe9, 0xf9, 0xe9, 0xf9, 0xfa, 0x60, 0xe1, - 0xa4, 0xd2, 0x34, 0x30, 0x0f, 0xcc, 0x01, 0xb3, 0x20, 0xba, 0x94, 0x02, 0xb9, 0x78, 0xfd, 0x4b, - 0x4b, 0x0a, 0xf2, 0x8b, 0x4a, 0x9c, 0xc1, 0x86, 0x09, 0x39, 0x70, 0x09, 0x78, 0x16, 0x7b, 0xe6, - 0x79, 0xe6, 0x82, 0xc4, 0x5c, 0x9c, 0x7c, 0xf3, 0x53, 0x52, 0x25, 0x18, 0x15, 0x18, 0x35, 0x38, - 0x9c, 0x44, 0x5e, 0xdd, 0x93, 0x17, 0xc8, 0x44, 0x93, 0x0b, 0xc2, 0x50, 0xed, 0x54, 0x7a, 0xe1, - 0xa1, 0x1c, 0xc3, 0x8d, 0x87, 0x72, 0x0c, 0x1f, 0x1e, 0xca, 0x31, 0x36, 0x3c, 0x92, 0x63, 0x5c, - 0xf1, 0x48, 0x8e, 0xf1, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x6f, 0x3c, 0x92, 0x63, - 0x7c, 0xf0, 0x48, 0x8e, 0xf1, 0xc5, 0x23, 0x39, 0x86, 0x0f, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, - 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0x6b, 0x24, 0xb7, 0xe7, 0x96, - 0xe6, 0x94, 0x64, 0x96, 0xa5, 0x16, 0x15, 0x57, 0xe8, 0xe7, 0x56, 0xe8, 0x26, 0x67, 0x24, 0x66, - 0xe6, 0xe9, 0x26, 0xe7, 0x17, 0xa5, 0xea, 0xa6, 0xe7, 0xeb, 0xa7, 0x24, 0x96, 0x24, 0xea, 0xe7, - 0x43, 0x9c, 0x6d, 0x0d, 0xa5, 0x93, 0xd8, 0xc0, 0x1e, 0x32, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, - 0xc2, 0x23, 0x6e, 0xa4, 0x16, 0x01, 0x00, 0x00, + 0xa4, 0xd2, 0x34, 0x30, 0x0f, 0xcc, 0x01, 0xb3, 0x20, 0xba, 0x94, 0x2a, 0xb8, 0x78, 0xfd, 0x4b, + 0x4b, 0x0a, 0xf2, 0x8b, 0x4a, 0x9c, 0xc1, 0x86, 0x09, 0xa9, 0x72, 0xb1, 0x07, 0x67, 0x24, 0x16, + 0xa5, 0x78, 0xba, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0xf0, 0x3a, 0x71, 0xbf, 0xba, 0x27, 0xcf, 0x5e, + 0x0c, 0x11, 0x0a, 0x82, 0xc9, 0x09, 0x39, 0x70, 0x09, 0x78, 0x16, 0x7b, 0xe6, 0x79, 0xe6, 0x82, + 0xb4, 0xba, 0x38, 0xf9, 0xe6, 0xa7, 0xa4, 0x4a, 0x30, 0x29, 0x30, 0x6a, 0x70, 0x38, 0x89, 0xbc, + 0xba, 0x27, 0x2f, 0x90, 0x89, 0x26, 0x17, 0x84, 0xa1, 0xda, 0xa9, 0xf4, 0xc2, 0x43, 0x39, 0x86, + 0x1b, 0x0f, 0xe5, 0x18, 0x3e, 0x3c, 0x94, 0x63, 0x6c, 0x78, 0x24, 0xc7, 0xb8, 0xe2, 0x91, 0x1c, + 0xe3, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0xde, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, + 0x1c, 0xe3, 0x8b, 0x47, 0x72, 0x0c, 0x1f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, + 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0xd6, 0x48, 0x5e, 0xcc, 0x2d, 0xcd, 0x29, 0xc9, + 0x2c, 0x4b, 0x2d, 0x2a, 0xae, 0xd0, 0xcf, 0xad, 0xd0, 0x4d, 0xce, 0x48, 0xcc, 0xcc, 0xd3, 0x4d, + 0xce, 0x2f, 0x4a, 0xd5, 0x4d, 0xcf, 0xd7, 0x4f, 0x49, 0x2c, 0x49, 0xd4, 0xcf, 0x87, 0xf8, 0xce, + 0x1a, 0x4a, 0x27, 0xb1, 0x81, 0xfd, 0x6d, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x62, 0x13, 0x75, + 0x71, 0x3d, 0x01, 0x00, 0x00, } func (this *OutportConfig) Equal(that interface{}) bool { @@ -108,6 +118,9 @@ func (this *OutportConfig) Equal(that interface{}) bool { } else if this == nil { return false } + if this.ShardID != that1.ShardID { + return false + } if this.IsInImportDBMode != that1.IsInImportDBMode { return false } @@ -117,8 +130,9 @@ func (this *OutportConfig) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 5) + s := make([]string, 0, 6) s = append(s, "&outport.OutportConfig{") + s = append(s, "ShardID: "+fmt.Sprintf("%#v", this.ShardID)+",\n") s = append(s, "IsInImportDBMode: "+fmt.Sprintf("%#v", this.IsInImportDBMode)+",\n") s = append(s, "}") return strings.Join(s, "") @@ -159,6 +173,11 @@ func (m *OutportConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0 } i-- + dAtA[i] = 0x10 + } + if m.ShardID != 0 { + i = encodeVarintConfig(dAtA, i, uint64(m.ShardID)) + i-- dAtA[i] = 0x8 } return len(dAtA) - i, nil @@ -181,6 +200,9 @@ func (m *OutportConfig) Size() (n int) { } var l int _ = l + if m.ShardID != 0 { + n += 1 + sovConfig(uint64(m.ShardID)) + } if m.IsInImportDBMode { n += 2 } @@ -198,6 +220,7 @@ func (this *OutportConfig) String() string { return "nil" } s := strings.Join([]string{`&OutportConfig{`, + `ShardID:` + fmt.Sprintf("%v", this.ShardID) + `,`, `IsInImportDBMode:` + fmt.Sprintf("%v", this.IsInImportDBMode) + `,`, `}`, }, "") @@ -241,6 +264,25 @@ func (m *OutportConfig) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ShardID", wireType) + } + m.ShardID = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfig + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ShardID |= uint32(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field IsInImportDBMode", wireType) } diff --git a/data/outport/config.proto b/data/outport/config.proto index 2efc39ef..68f70f3f 100644 --- a/data/outport/config.proto +++ b/data/outport/config.proto @@ -8,5 +8,6 @@ option (gogoproto.stable_marshaler_all) = true; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; message OutportConfig { - bool IsInImportDBMode = 1 [(gogoproto.jsontag) = "isInImportDBMode"]; + uint32 ShardID = 1 [(gogoproto.jsontag) = "shardID"]; + bool IsInImportDBMode = 2 [(gogoproto.jsontag) = "isInImportDBMode"]; } From a34bd6d3e3b90b53416a26cfb14f0a2e52604189 Mon Sep 17 00:00:00 2001 From: Iuga Mihai Date: Tue, 25 Jul 2023 13:14:25 +0300 Subject: [PATCH 4/4] fixes after merge --- data/outport/outportBlock.pb.go | 333 ++++++++++++++++++++------------ 1 file changed, 207 insertions(+), 126 deletions(-) diff --git a/data/outport/outportBlock.pb.go b/data/outport/outportBlock.pb.go index 6e650d0b..f7020b56 100644 --- a/data/outport/outportBlock.pb.go +++ b/data/outport/outportBlock.pb.go @@ -148,11 +148,12 @@ func (m *OutportBlock) GetHighestFinalBlockHash() []byte { } type BlockData struct { - ShardID uint32 `protobuf:"varint,1,opt,name=ShardID,proto3" json:"shardID,omitempty"` - HeaderBytes []byte `protobuf:"bytes,2,opt,name=HeaderBytes,proto3" json:"headerBytes,omitempty"` - HeaderType string `protobuf:"bytes,3,opt,name=HeaderType,proto3" json:"headerType,omitempty"` - HeaderHash []byte `protobuf:"bytes,4,opt,name=HeaderHash,proto3" json:"headerHash,omitempty"` - Body *block.Body `protobuf:"bytes,5,opt,name=Body,proto3" json:"body,omitempty"` + ShardID uint32 `protobuf:"varint,1,opt,name=ShardID,proto3" json:"shardID,omitempty"` + HeaderBytes []byte `protobuf:"bytes,2,opt,name=HeaderBytes,proto3" json:"headerBytes,omitempty"` + HeaderType string `protobuf:"bytes,3,opt,name=HeaderType,proto3" json:"headerType,omitempty"` + HeaderHash []byte `protobuf:"bytes,4,opt,name=HeaderHash,proto3" json:"headerHash,omitempty"` + Body *block.Body `protobuf:"bytes,5,opt,name=Body,proto3" json:"body,omitempty"` + IntraShardMiniBlocks []*block.MiniBlock `protobuf:"bytes,6,rep,name=IntraShardMiniBlocks,proto3" json:"intraShardMiniBlocks,omitempty"` } func (m *BlockData) Reset() { *m = BlockData{} } @@ -218,6 +219,13 @@ func (m *BlockData) GetBody() *block.Body { return nil } +func (m *BlockData) GetIntraShardMiniBlocks() []*block.MiniBlock { + if m != nil { + return m.IntraShardMiniBlocks + } + return nil +} + type TransactionPool struct { Transactions map[string]*TxInfo `protobuf:"bytes,1,rep,name=Transactions,proto3" json:"transactions,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` SmartContractResults map[string]*SCRInfo `protobuf:"bytes,2,rep,name=SmartContractResults,proto3" json:"smartContractResults,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` @@ -1130,126 +1138,128 @@ func init() { func init() { proto.RegisterFile("outportBlock.proto", fileDescriptor_661b95cef868af95) } var fileDescriptor_661b95cef868af95 = []byte{ - // 1904 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x4f, 0x6c, 0x1b, 0x59, - 0x19, 0xcf, 0xf8, 0x4f, 0x1c, 0x7f, 0x4e, 0x9c, 0xf4, 0x35, 0x0d, 0xd3, 0x94, 0xf5, 0x04, 0xb7, - 0xbb, 0x44, 0x94, 0xda, 0x6c, 0xb6, 0x42, 0x55, 0xab, 0x15, 0x74, 0xd2, 0x7f, 0xa1, 0xdd, 0x26, - 0x9a, 0x04, 0x96, 0xac, 0x90, 0x60, 0xec, 0x79, 0x19, 0x8f, 0x6a, 0xcf, 0x33, 0x33, 0xcf, 0xc1, - 0xe6, 0x02, 0x27, 0x96, 0xcb, 0x4a, 0x1c, 0xb9, 0x21, 0x71, 0x42, 0x1c, 0xb8, 0x72, 0xe0, 0x8e, - 0x38, 0xa1, 0x9e, 0x50, 0x4f, 0x03, 0x4d, 0x2f, 0x68, 0x0e, 0x68, 0x6f, 0x5c, 0xd1, 0xbc, 0xf7, - 0xc6, 0xf3, 0x66, 0x3c, 0x59, 0x39, 0x0b, 0x2b, 0x2e, 0xf6, 0xcc, 0xf7, 0xe7, 0xf7, 0xbd, 0xf7, - 0xfd, 0x7b, 0xdf, 0x3c, 0x40, 0x64, 0x44, 0x87, 0xc4, 0xa3, 0x7a, 0x9f, 0x74, 0x5f, 0xb4, 0x86, - 0x1e, 0xa1, 0x04, 0x95, 0xd9, 0xdf, 0xe6, 0x2d, 0xdb, 0xa1, 0xbd, 0x51, 0xa7, 0xd5, 0x25, 0x83, - 0xb6, 0x4d, 0x6c, 0xd2, 0x66, 0xe4, 0xce, 0xe8, 0x84, 0xbd, 0xb1, 0x17, 0xf6, 0xc4, 0xb5, 0x36, - 0xdf, 0x97, 0xc4, 0x07, 0xa3, 0x3e, 0x75, 0x4e, 0xb1, 0xe7, 0x8f, 0xdb, 0x83, 0xf1, 0xad, 0x6e, - 0xcf, 0x74, 0xdc, 0x5b, 0x5d, 0xe2, 0xe1, 0x5b, 0x36, 0x69, 0x5b, 0x26, 0x35, 0xdb, 0x9d, 0xc8, - 0x1c, 0xff, 0x15, 0xea, 0xf7, 0x2f, 0xa2, 0x4e, 0x3d, 0xd3, 0xf5, 0xcd, 0x2e, 0x75, 0x88, 0xdb, - 0xee, 0x13, 0x5b, 0x40, 0xec, 0x7d, 0x5e, 0x08, 0xe9, 0x59, 0x40, 0x1d, 0x5f, 0x04, 0xca, 0x1f, - 0x98, 0x1e, 0xdd, 0x25, 0x2e, 0xf5, 0xcc, 0x2e, 0x35, 0xb0, 0x3f, 0xea, 0xd3, 0x3c, 0xda, 0xe7, - 0xd9, 0xa8, 0x87, 0xbb, 0xd8, 0x19, 0xd2, 0xf8, 0x5f, 0x40, 0xec, 0x5e, 0x0c, 0xe2, 0x27, 0xa6, - 0x67, 0x1d, 0x8d, 0xa7, 0x0f, 0x02, 0x64, 0xff, 0x22, 0x20, 0x66, 0x9f, 0x62, 0x0f, 0x5b, 0xf7, - 0xbb, 0x5d, 0x32, 0x72, 0x69, 0xe6, 0x95, 0x03, 0x36, 0xff, 0x54, 0x81, 0xe5, 0x7d, 0x29, 0x9b, - 0x50, 0x1b, 0x2a, 0x87, 0x3d, 0xd3, 0xb3, 0xf6, 0x1e, 0xa8, 0xca, 0x96, 0xb2, 0xbd, 0xa2, 0x5f, - 0x09, 0x03, 0xed, 0x92, 0xcf, 0x49, 0x5f, 0x27, 0x03, 0x87, 0xe2, 0xc1, 0x90, 0x4e, 0x8c, 0x58, - 0x0a, 0x3d, 0x86, 0x2a, 0xd3, 0x7c, 0x60, 0x52, 0x53, 0x2d, 0x6c, 0x29, 0xdb, 0xb5, 0x9d, 0x35, - 0x0e, 0xde, 0x9a, 0xd2, 0xf5, 0x2f, 0x85, 0x81, 0x76, 0xb9, 0x13, 0xbf, 0x4a, 0x30, 0x89, 0x2e, - 0xfa, 0x21, 0xac, 0x1e, 0x25, 0x31, 0x3d, 0x20, 0xa4, 0xaf, 0x16, 0x19, 0xdc, 0x86, 0x80, 0xcb, - 0x70, 0xf5, 0xb7, 0xc2, 0x40, 0xbb, 0x4a, 0xd3, 0x44, 0x09, 0x3a, 0x8b, 0x86, 0x7c, 0x58, 0x7f, - 0x82, 0x4d, 0x0b, 0x7b, 0x8f, 0x4d, 0x7f, 0x97, 0xb8, 0xfe, 0x68, 0x30, 0x8c, 0x78, 0x6a, 0x89, - 0x59, 0xb9, 0x26, 0xac, 0xe4, 0x89, 0xe8, 0xcd, 0x30, 0xd0, 0x1a, 0xbd, 0x1c, 0x8e, 0x64, 0x2f, - 0x17, 0x1c, 0xfd, 0x18, 0x56, 0xef, 0xa7, 0x1c, 0xef, 0xab, 0xe5, 0xad, 0xe2, 0x76, 0x6d, 0x67, - 0x5b, 0xd8, 0x93, 0xbd, 0xdf, 0xca, 0x88, 0x3e, 0x74, 0xa9, 0x37, 0xe1, 0xfb, 0x4c, 0x47, 0xcf, - 0x97, 0xf7, 0x99, 0x51, 0x42, 0x3f, 0x80, 0x8d, 0xe7, 0x84, 0x9a, 0x9e, 0xf3, 0x53, 0x6c, 0xf1, - 0x35, 0xf9, 0x4f, 0x4c, 0xbf, 0x87, 0x7d, 0x75, 0x71, 0xab, 0xb8, 0x5d, 0xd5, 0x6f, 0x84, 0x81, - 0xb6, 0xe5, 0xe6, 0x4a, 0x48, 0xb0, 0xe7, 0x60, 0xa0, 0xbb, 0x50, 0x7f, 0x3e, 0x1a, 0x74, 0xb0, - 0xb7, 0x7f, 0xc2, 0x52, 0xc0, 0x57, 0x2b, 0x2c, 0x4f, 0x50, 0x18, 0x68, 0x75, 0x37, 0xc5, 0x31, - 0x32, 0x92, 0xe8, 0x01, 0xd4, 0x0f, 0x1d, 0xdb, 0xc5, 0x9e, 0xbf, 0xe7, 0x5a, 0x78, 0x8c, 0x7d, - 0x75, 0x69, 0xab, 0xb8, 0x5d, 0xd2, 0xbf, 0x1c, 0x06, 0x9a, 0xea, 0xa7, 0x38, 0xd2, 0x4a, 0x32, - 0x3a, 0xc8, 0x80, 0x8d, 0x27, 0x8e, 0xdd, 0xc3, 0x3e, 0x7d, 0xe4, 0xb8, 0x66, 0x9f, 0x79, 0xee, - 0x39, 0x71, 0xbb, 0x58, 0xad, 0x6e, 0x29, 0xdb, 0x25, 0x7d, 0x33, 0x0c, 0xb4, 0x8d, 0x5e, 0xae, - 0x84, 0x71, 0x8e, 0x26, 0x3a, 0x86, 0x2b, 0x33, 0x9c, 0x68, 0xc3, 0x2a, 0x6c, 0x29, 0xdb, 0xcb, - 0xfa, 0xf5, 0x30, 0xd0, 0xb4, 0x5e, 0x9e, 0x80, 0xb4, 0xce, 0x7c, 0x84, 0xcd, 0x63, 0x58, 0xcf, - 0x0b, 0x2b, 0x5a, 0x83, 0xe2, 0x0b, 0x3c, 0x61, 0x55, 0x56, 0x35, 0xa2, 0x47, 0x74, 0x13, 0xca, - 0xa7, 0x66, 0x7f, 0x84, 0x45, 0x19, 0x5d, 0x11, 0x19, 0x92, 0xd6, 0x36, 0xb8, 0xcc, 0xdd, 0xc2, - 0x1d, 0xa5, 0xf9, 0xdb, 0x82, 0x54, 0x7c, 0x17, 0x2f, 0xdd, 0x7b, 0x50, 0xe3, 0xb1, 0xd5, 0x27, - 0x14, 0xfb, 0xcc, 0xea, 0xb2, 0x7e, 0x35, 0x0c, 0xb4, 0x2b, 0xbd, 0x84, 0x2c, 0x29, 0xca, 0xd2, - 0xe8, 0x0e, 0x00, 0x7f, 0x3d, 0x9a, 0x0c, 0x31, 0xab, 0xd4, 0xaa, 0xae, 0x86, 0x81, 0xb6, 0xde, - 0x9b, 0x52, 0x25, 0x55, 0x49, 0x36, 0xd1, 0x64, 0x0e, 0x2e, 0x31, 0xab, 0x92, 0x66, 0xc6, 0xab, - 0x92, 0x2c, 0x7a, 0x0f, 0x4a, 0x3a, 0xb1, 0x26, 0x6a, 0x99, 0xf9, 0xa7, 0x16, 0xb7, 0x19, 0x62, - 0x4d, 0x78, 0xfa, 0x75, 0x88, 0x35, 0x91, 0x54, 0x99, 0x70, 0xf3, 0x63, 0x98, 0x69, 0x2c, 0xa8, - 0x07, 0xcb, 0x12, 0xc9, 0x57, 0x95, 0x54, 0x49, 0x66, 0xa4, 0xe5, 0x77, 0x51, 0x92, 0x2c, 0xc5, - 0xa4, 0xd6, 0x23, 0x7b, 0x29, 0x85, 0x8c, 0x7e, 0xa9, 0xc0, 0xfa, 0xe1, 0xec, 0xb9, 0x12, 0x79, - 0x3b, 0x32, 0xf9, 0x8d, 0x73, 0x4c, 0xe6, 0xa9, 0x70, 0xd3, 0xac, 0x15, 0xe5, 0x9c, 0x54, 0xf2, - 0x12, 0x72, 0x2d, 0xa2, 0x23, 0xa8, 0x18, 0xec, 0x38, 0xf1, 0xd5, 0x22, 0x33, 0x7e, 0xfd, 0x1c, - 0xe3, 0x42, 0x8a, 0xdb, 0x63, 0x49, 0xc4, 0x8f, 0x21, 0xd9, 0x44, 0x0c, 0x85, 0xbe, 0x0f, 0x4b, - 0x06, 0x3f, 0xe8, 0x7c, 0xb5, 0xc4, 0x60, 0x6f, 0x9c, 0x0b, 0xcb, 0xc5, 0x38, 0xee, 0x46, 0x18, - 0x68, 0x48, 0x1c, 0x91, 0x32, 0xf0, 0x14, 0x0d, 0xfd, 0x08, 0x60, 0xcf, 0x3d, 0x35, 0xfb, 0x8e, - 0x75, 0x34, 0x8e, 0xbb, 0xe6, 0x3b, 0xe7, 0x60, 0x27, 0x82, 0x1c, 0x9d, 0xe5, 0x93, 0x33, 0x25, - 0xca, 0xf9, 0x94, 0x88, 0xa2, 0x6f, 0x42, 0xe9, 0x19, 0xb1, 0x79, 0x5f, 0xac, 0xed, 0xd4, 0x05, - 0xf6, 0x33, 0x62, 0xb3, 0x43, 0x8b, 0xa5, 0x54, 0x9f, 0xd8, 0xb2, 0x36, 0x93, 0x47, 0xbf, 0x50, - 0xe0, 0xc6, 0x61, 0xb7, 0x87, 0xad, 0x51, 0x1f, 0x5b, 0x0f, 0xc7, 0xb8, 0x3b, 0xa2, 0xd8, 0x3a, - 0xdc, 0x35, 0x0e, 0x79, 0x8f, 0x3c, 0xf0, 0xf0, 0x29, 0x2b, 0x4b, 0xb5, 0xc2, 0x1a, 0xee, 0x4e, - 0x18, 0x68, 0x2d, 0x7f, 0x0e, 0x79, 0xc9, 0xd0, 0x5c, 0xf8, 0xe8, 0xd7, 0x0a, 0x7c, 0x6d, 0x46, - 0x30, 0xd9, 0x60, 0x76, 0x39, 0x4b, 0x6c, 0x39, 0x77, 0xc2, 0x40, 0xbb, 0xed, 0xcf, 0xad, 0x25, - 0x2d, 0xea, 0x02, 0xb6, 0x36, 0x9f, 0xc3, 0xa5, 0x99, 0xba, 0xc9, 0xe9, 0x79, 0xd7, 0xd3, 0x3d, - 0x6f, 0x25, 0x8e, 0xef, 0x78, 0xcf, 0x3d, 0x21, 0x52, 0xaf, 0xdb, 0xfc, 0x10, 0xae, 0x9e, 0x5b, - 0x14, 0x39, 0xb8, 0x37, 0xd2, 0xb8, 0x71, 0x6c, 0x0f, 0x77, 0x8d, 0x2c, 0xf0, 0x07, 0xb0, 0x2c, - 0x27, 0x7c, 0x0e, 0xd6, 0x57, 0xd3, 0x58, 0x97, 0x04, 0x16, 0xd7, 0xca, 0xc2, 0x3d, 0x85, 0x95, - 0x54, 0xa2, 0xcf, 0xbf, 0x36, 0xa1, 0x26, 0x83, 0x3d, 0x83, 0xd5, 0x4c, 0x66, 0xff, 0x17, 0x2e, - 0x6c, 0xfe, 0xa1, 0x00, 0x95, 0x47, 0x18, 0x47, 0x64, 0xf4, 0x36, 0x54, 0x1e, 0x9b, 0xfe, 0x77, - 0x7d, 0x6c, 0x31, 0xa8, 0x92, 0x5e, 0x0b, 0x03, 0xad, 0x62, 0x73, 0x92, 0x11, 0xf3, 0x50, 0x1f, - 0x8a, 0x8f, 0x30, 0x16, 0x47, 0xc3, 0x47, 0x61, 0xa0, 0xad, 0x9c, 0x60, 0xa9, 0xaf, 0xff, 0xfe, - 0xef, 0xda, 0xc3, 0x81, 0x49, 0x7b, 0xed, 0x8e, 0x63, 0xb7, 0xf6, 0x5c, 0x7a, 0xef, 0x02, 0xf3, - 0x69, 0x4b, 0x77, 0xec, 0x3d, 0x97, 0xee, 0x9a, 0x3e, 0xc5, 0x9e, 0x11, 0x99, 0x41, 0x9f, 0x28, - 0x50, 0xdf, 0x73, 0x1d, 0xea, 0x98, 0xfd, 0x03, 0xd3, 0xb1, 0x22, 0xcb, 0x45, 0x66, 0x19, 0x47, - 0x03, 0x82, 0x93, 0xe2, 0x7c, 0x11, 0x8b, 0xc8, 0x18, 0x6f, 0xfe, 0x4d, 0x81, 0x45, 0xee, 0x46, - 0xb4, 0x0f, 0x35, 0x29, 0x9d, 0x99, 0xcf, 0x6a, 0x3b, 0x68, 0xb6, 0x1b, 0xf1, 0xf3, 0x53, 0x3a, - 0x1a, 0xe4, 0xf3, 0x53, 0x92, 0x43, 0xdf, 0x9a, 0xc6, 0x22, 0x93, 0x06, 0x82, 0xca, 0x1b, 0xef, - 0x09, 0x7f, 0x91, 0x1b, 0x6f, 0x1c, 0xc1, 0xbb, 0x50, 0xe7, 0x55, 0xe8, 0x10, 0x77, 0xdf, 0xb3, - 0xb0, 0xc7, 0x7c, 0x25, 0x06, 0x31, 0x9c, 0xe2, 0x18, 0x19, 0xc9, 0xe6, 0xbf, 0x15, 0xa8, 0x88, - 0x52, 0x40, 0x04, 0x2e, 0xe7, 0x14, 0x96, 0xd8, 0xe1, 0x66, 0x5c, 0x37, 0xb3, 0x12, 0xfa, 0x57, - 0xc2, 0x40, 0x7b, 0x2b, 0xe7, 0x24, 0x92, 0x16, 0x9b, 0x87, 0xfc, 0xff, 0xdd, 0xf9, 0x11, 0x54, - 0x44, 0x7f, 0x47, 0xcd, 0x28, 0xb8, 0x6c, 0x06, 0x61, 0xc5, 0xa4, 0x43, 0x18, 0x68, 0x8b, 0x94, - 0x51, 0x0c, 0xc1, 0x41, 0x6f, 0x43, 0xf1, 0x19, 0xb1, 0xc5, 0x3a, 0x21, 0x39, 0x20, 0xf4, 0x4a, - 0x18, 0x68, 0xc5, 0x3e, 0xb1, 0x8d, 0x88, 0xdf, 0xfc, 0x58, 0x01, 0x48, 0xda, 0x01, 0x7a, 0x1f, - 0x16, 0xf9, 0x9b, 0xf0, 0xe2, 0x6a, 0xaa, 0x63, 0x1c, 0x8d, 0xf5, 0xf5, 0x30, 0xd0, 0xd6, 0xf8, - 0xa1, 0x2a, 0x6d, 0x50, 0x28, 0xe5, 0xec, 0xaf, 0x30, 0xf7, 0xfe, 0xfe, 0xa5, 0xe4, 0x7f, 0xe5, - 0xa0, 0x77, 0xa1, 0xf6, 0xd8, 0xf4, 0x0f, 0x3c, 0x72, 0xea, 0x58, 0xd3, 0xa2, 0x5f, 0x0d, 0x03, - 0xad, 0x66, 0x27, 0x64, 0x43, 0x96, 0x11, 0x2a, 0x06, 0x3e, 0x19, 0xb9, 0x91, 0x4a, 0x21, 0xa5, - 0x12, 0x93, 0x0d, 0x59, 0x06, 0xdd, 0x86, 0xe5, 0x08, 0x01, 0xbb, 0x66, 0x3f, 0xfa, 0x74, 0x60, - 0x81, 0x29, 0xe9, 0x6b, 0x61, 0xa0, 0x2d, 0xdb, 0x12, 0xdd, 0x48, 0x49, 0x45, 0x1b, 0xfe, 0xc0, - 0x1c, 0x33, 0x92, 0xc7, 0x4f, 0xaa, 0x12, 0xd3, 0x63, 0x1b, 0x1e, 0xa4, 0x38, 0x46, 0x46, 0xb2, - 0x79, 0x02, 0x97, 0xbf, 0x17, 0x35, 0x48, 0x93, 0x12, 0xcf, 0x30, 0xa9, 0xe3, 0xda, 0x2c, 0x04, - 0x37, 0xa1, 0x7a, 0x30, 0xea, 0xf4, 0x9d, 0xee, 0xd3, 0xb8, 0x59, 0xea, 0x2b, 0x61, 0xa0, 0x55, - 0x87, 0x31, 0xd1, 0x48, 0xf8, 0x51, 0x26, 0x70, 0x55, 0xb6, 0xc7, 0x02, 0xcf, 0x04, 0x8f, 0x51, - 0x0c, 0xc1, 0x69, 0xfe, 0x55, 0x81, 0xb5, 0xa9, 0x21, 0x9f, 0x13, 0xa3, 0x2e, 0x9a, 0x1e, 0xb9, - 0x59, 0x17, 0x15, 0x23, 0x77, 0x32, 0x68, 0x6b, 0x50, 0x7e, 0x38, 0x24, 0xdd, 0x9e, 0x88, 0x63, - 0x35, 0x0c, 0xb4, 0x32, 0x8e, 0x08, 0x06, 0xa7, 0x23, 0x0f, 0xd6, 0xb3, 0xd8, 0xac, 0x3e, 0xf8, - 0x9c, 0x16, 0x17, 0x61, 0xce, 0x3e, 0xf9, 0x38, 0x78, 0x9a, 0xa3, 0x2b, 0x8f, 0x83, 0x79, 0xd8, - 0xcd, 0xdf, 0x14, 0xa0, 0x6a, 0x90, 0x91, 0xcb, 0x53, 0x56, 0x83, 0x32, 0x7b, 0x11, 0x89, 0xc1, - 0x96, 0xe8, 0x45, 0x04, 0x83, 0xd3, 0xa3, 0x18, 0x65, 0xbe, 0xdd, 0x0a, 0xec, 0xdb, 0x8d, 0xc5, - 0x28, 0xfd, 0xed, 0x36, 0xf3, 0xc5, 0xf6, 0x6d, 0x58, 0x63, 0xc1, 0xfa, 0x90, 0x25, 0xd7, 0x90, - 0xf8, 0x22, 0x33, 0x96, 0x78, 0x21, 0x74, 0x32, 0x3c, 0x63, 0x46, 0x3a, 0x71, 0xb4, 0xc5, 0x52, - 0x23, 0xe5, 0x68, 0x2b, 0x76, 0xb4, 0x95, 0x38, 0xba, 0x7c, 0x8e, 0xa3, 0x6f, 0x42, 0xf5, 0xc8, - 0x19, 0x60, 0x9f, 0x9a, 0x83, 0xa1, 0xba, 0xc8, 0xb6, 0xca, 0xd2, 0x82, 0xc6, 0x44, 0x23, 0xe1, - 0x37, 0x7f, 0x06, 0xc0, 0xf6, 0xee, 0xc7, 0x27, 0xe6, 0x3c, 0xb1, 0xfe, 0x8e, 0xac, 0x24, 0xa6, - 0xfc, 0xf8, 0x42, 0x64, 0xea, 0x6e, 0x3e, 0x9f, 0x7a, 0x53, 0x39, 0x79, 0x3e, 0x4d, 0xb4, 0x9b, - 0xef, 0x42, 0xe5, 0x60, 0xd4, 0x79, 0x8a, 0x27, 0x3e, 0x7a, 0x07, 0x4a, 0xd1, 0x3f, 0xfb, 0x52, - 0x59, 0xe6, 0x4e, 0x7f, 0x81, 0x27, 0xa9, 0xd1, 0x34, 0xe2, 0x37, 0xff, 0x5c, 0x80, 0x4b, 0x49, - 0xb8, 0x63, 0xed, 0x39, 0xd7, 0xfe, 0x89, 0x02, 0x1b, 0xec, 0x79, 0x06, 0x41, 0x6c, 0xe4, 0x76, - 0x36, 0x13, 0x63, 0x7e, 0x2b, 0x5f, 0x8d, 0x0f, 0xe3, 0x5a, 0x18, 0x68, 0xd7, 0x4e, 0xb3, 0x3c, - 0xf9, 0xae, 0x21, 0x5f, 0x3b, 0x09, 0x67, 0x31, 0x3f, 0x9c, 0x9b, 0xc7, 0x70, 0xed, 0x33, 0x0c, - 0xcb, 0xb3, 0xd2, 0xca, 0x67, 0x8e, 0x5e, 0x42, 0x4b, 0x1e, 0x96, 0xfe, 0x58, 0x80, 0xa5, 0xe9, - 0x95, 0xca, 0x9c, 0xfe, 0xbb, 0x0b, 0x75, 0x96, 0xb9, 0x49, 0x8a, 0x15, 0x92, 0x3e, 0xd6, 0x49, - 0x71, 0x8c, 0x8c, 0x24, 0x1a, 0xcc, 0x5e, 0x14, 0x15, 0x53, 0x9f, 0x53, 0x31, 0xf9, 0x7f, 0x72, - 0x49, 0xf4, 0x45, 0xde, 0x4a, 0xd8, 0x50, 0x67, 0x57, 0x20, 0x51, 0x6b, 0xe7, 0x9f, 0x29, 0x73, - 0xba, 0xaf, 0x95, 0xba, 0x18, 0xe0, 0x33, 0x67, 0x3d, 0x0c, 0x34, 0x48, 0x2e, 0x06, 0xe4, 0xeb, - 0x80, 0x66, 0x0b, 0xca, 0x4c, 0x75, 0x4e, 0x7c, 0x7d, 0xf4, 0xf2, 0x75, 0x63, 0xe1, 0xd5, 0xeb, - 0xc6, 0xc2, 0xa7, 0xaf, 0x1b, 0xca, 0xcf, 0xcf, 0x1a, 0xca, 0xef, 0xce, 0x1a, 0xca, 0x5f, 0xce, - 0x1a, 0xca, 0xcb, 0xb3, 0x86, 0xf2, 0xea, 0xac, 0xa1, 0xfc, 0xe3, 0xac, 0xa1, 0xfc, 0xf3, 0xac, - 0xb1, 0xf0, 0xe9, 0x59, 0x43, 0xf9, 0xd5, 0x9b, 0xc6, 0xc2, 0xcb, 0x37, 0x8d, 0x85, 0x57, 0x6f, - 0x1a, 0x0b, 0x1f, 0x5d, 0x64, 0xa4, 0x6c, 0x8b, 0xdb, 0xf9, 0x7b, 0xe2, 0xbf, 0xb3, 0xc8, 0x1c, - 0xf6, 0xde, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x25, 0x83, 0x2b, 0xb7, 0x17, 0x00, 0x00, + // 1931 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0x4b, 0x70, 0xe3, 0x48, + 0x19, 0x8e, 0xfc, 0x88, 0xe3, 0xdf, 0x89, 0x93, 0xe9, 0xcd, 0x04, 0x4d, 0x86, 0xb5, 0x82, 0x67, + 0x76, 0x49, 0x31, 0x8c, 0xcd, 0xce, 0x4e, 0x51, 0x53, 0x33, 0xb5, 0x05, 0xa3, 0xcc, 0xcb, 0xcc, + 0x23, 0x29, 0x25, 0xb0, 0xcc, 0x16, 0x55, 0x20, 0x5b, 0x1d, 0x59, 0x35, 0xb6, 0xda, 0x48, 0xed, + 0x60, 0x73, 0x81, 0x13, 0xcb, 0x81, 0xad, 0xe2, 0xc8, 0x8d, 0x2b, 0xc5, 0x81, 0x2b, 0x07, 0xee, + 0x14, 0x27, 0x6a, 0x4e, 0xd4, 0x9c, 0x04, 0x93, 0xb9, 0x50, 0x3a, 0x50, 0x7b, 0xe3, 0x4a, 0xa9, + 0xbb, 0x65, 0xb5, 0x64, 0x65, 0xcb, 0x59, 0xd8, 0xe2, 0x12, 0x4b, 0xff, 0xe3, 0xfb, 0xbb, 0xff, + 0x57, 0xff, 0xad, 0x00, 0x22, 0x63, 0x3a, 0x22, 0x1e, 0xd5, 0x07, 0xa4, 0xf7, 0xa2, 0x35, 0xf2, + 0x08, 0x25, 0xa8, 0xcc, 0x7e, 0xb6, 0xaf, 0xdb, 0x0e, 0xed, 0x8f, 0xbb, 0xad, 0x1e, 0x19, 0xb6, + 0x6d, 0x62, 0x93, 0x36, 0x23, 0x77, 0xc7, 0xc7, 0xec, 0x8d, 0xbd, 0xb0, 0x27, 0xae, 0xb5, 0xfd, + 0x81, 0x24, 0x3e, 0x1c, 0x0f, 0xa8, 0x73, 0x82, 0x3d, 0x7f, 0xd2, 0x1e, 0x4e, 0xae, 0xf7, 0xfa, + 0xa6, 0xe3, 0x5e, 0xef, 0x11, 0x0f, 0x5f, 0xb7, 0x49, 0xdb, 0x32, 0xa9, 0xd9, 0xee, 0x46, 0xe6, + 0xf8, 0x5f, 0xa1, 0x7e, 0xf7, 0x3c, 0xea, 0xd4, 0x33, 0x5d, 0xdf, 0xec, 0x51, 0x87, 0xb8, 0xed, + 0x01, 0xb1, 0x05, 0x44, 0xe7, 0xf3, 0x42, 0x48, 0xcf, 0x02, 0xea, 0xf9, 0x79, 0xa0, 0xfc, 0xa1, + 0xe9, 0xd1, 0x3d, 0xe2, 0x52, 0xcf, 0xec, 0x51, 0x03, 0xfb, 0xe3, 0x01, 0xcd, 0xa3, 0x7d, 0x9e, + 0x8d, 0x7a, 0xb8, 0x87, 0x9d, 0x11, 0x8d, 0x7f, 0x05, 0xc4, 0xde, 0xf9, 0x20, 0x7e, 0x62, 0x7a, + 0xd6, 0xd1, 0x64, 0xf6, 0x20, 0x40, 0xf6, 0xcf, 0x03, 0x62, 0x0e, 0x28, 0xf6, 0xb0, 0x75, 0xb7, + 0xd7, 0x23, 0x63, 0x97, 0x66, 0x5e, 0x39, 0x60, 0xf3, 0x4f, 0x15, 0x58, 0xdd, 0x97, 0xb2, 0x09, + 0xb5, 0xa1, 0x72, 0xd8, 0x37, 0x3d, 0xab, 0x73, 0x4f, 0x55, 0x76, 0x94, 0xdd, 0x35, 0xfd, 0x62, + 0x18, 0x68, 0x17, 0x7c, 0x4e, 0xfa, 0x3a, 0x19, 0x3a, 0x14, 0x0f, 0x47, 0x74, 0x6a, 0xc4, 0x52, + 0xe8, 0x21, 0x54, 0x99, 0xe6, 0x3d, 0x93, 0x9a, 0x6a, 0x61, 0x47, 0xd9, 0xad, 0xdd, 0xd8, 0xe0, + 0xe0, 0xad, 0x19, 0x5d, 0xff, 0x52, 0x18, 0x68, 0x6f, 0x75, 0xe3, 0x57, 0x09, 0x26, 0xd1, 0x45, + 0x3f, 0x84, 0xf5, 0xa3, 0x24, 0xa6, 0x07, 0x84, 0x0c, 0xd4, 0x22, 0x83, 0xdb, 0x12, 0x70, 0x19, + 0xae, 0xfe, 0x76, 0x18, 0x68, 0x97, 0x68, 0x9a, 0x28, 0x41, 0x67, 0xd1, 0x90, 0x0f, 0x9b, 0x8f, + 0xb0, 0x69, 0x61, 0xef, 0xa1, 0xe9, 0xef, 0x11, 0xd7, 0x1f, 0x0f, 0x47, 0x11, 0x4f, 0x2d, 0x31, + 0x2b, 0x97, 0x85, 0x95, 0x3c, 0x11, 0xbd, 0x19, 0x06, 0x5a, 0xa3, 0x9f, 0xc3, 0x91, 0xec, 0xe5, + 0x82, 0xa3, 0x1f, 0xc3, 0xfa, 0xdd, 0x94, 0xe3, 0x7d, 0xb5, 0xbc, 0x53, 0xdc, 0xad, 0xdd, 0xd8, + 0x15, 0xf6, 0x64, 0xef, 0xb7, 0x32, 0xa2, 0xf7, 0x5d, 0xea, 0x4d, 0xf9, 0x3e, 0xd3, 0xd1, 0xf3, + 0xe5, 0x7d, 0x66, 0x94, 0xd0, 0x0f, 0x60, 0xeb, 0x19, 0xa1, 0xa6, 0xe7, 0xfc, 0x14, 0x5b, 0x7c, + 0x4d, 0xfe, 0x23, 0xd3, 0xef, 0x63, 0x5f, 0x5d, 0xde, 0x29, 0xee, 0x56, 0xf5, 0xab, 0x61, 0xa0, + 0xed, 0xb8, 0xb9, 0x12, 0x12, 0xec, 0x19, 0x18, 0xe8, 0x36, 0xd4, 0x9f, 0x8d, 0x87, 0x5d, 0xec, + 0xed, 0x1f, 0xb3, 0x14, 0xf0, 0xd5, 0x0a, 0xcb, 0x13, 0x14, 0x06, 0x5a, 0xdd, 0x4d, 0x71, 0x8c, + 0x8c, 0x24, 0xba, 0x07, 0xf5, 0x43, 0xc7, 0x76, 0xb1, 0xe7, 0x77, 0x5c, 0x0b, 0x4f, 0xb0, 0xaf, + 0xae, 0xec, 0x14, 0x77, 0x4b, 0xfa, 0x97, 0xc3, 0x40, 0x53, 0xfd, 0x14, 0x47, 0x5a, 0x49, 0x46, + 0x07, 0x19, 0xb0, 0xf5, 0xc8, 0xb1, 0xfb, 0xd8, 0xa7, 0x0f, 0x1c, 0xd7, 0x1c, 0x30, 0xcf, 0x3d, + 0x23, 0x6e, 0x0f, 0xab, 0xd5, 0x1d, 0x65, 0xb7, 0xa4, 0x6f, 0x87, 0x81, 0xb6, 0xd5, 0xcf, 0x95, + 0x30, 0xce, 0xd0, 0x44, 0xcf, 0xe1, 0xe2, 0x1c, 0x27, 0xda, 0xb0, 0x0a, 0x3b, 0xca, 0xee, 0xaa, + 0x7e, 0x25, 0x0c, 0x34, 0xad, 0x9f, 0x27, 0x20, 0xad, 0x33, 0x1f, 0x61, 0xfb, 0x39, 0x6c, 0xe6, + 0x85, 0x15, 0x6d, 0x40, 0xf1, 0x05, 0x9e, 0xb2, 0x2a, 0xab, 0x1a, 0xd1, 0x23, 0xba, 0x06, 0xe5, + 0x13, 0x73, 0x30, 0xc6, 0xa2, 0x8c, 0x2e, 0x8a, 0x0c, 0x49, 0x6b, 0x1b, 0x5c, 0xe6, 0x76, 0xe1, + 0x96, 0xd2, 0xfc, 0x55, 0x51, 0x2a, 0xbe, 0xf3, 0x97, 0xee, 0x1d, 0xa8, 0xf1, 0xd8, 0xea, 0x53, + 0x8a, 0x7d, 0x66, 0x75, 0x55, 0xbf, 0x14, 0x06, 0xda, 0xc5, 0x7e, 0x42, 0x96, 0x14, 0x65, 0x69, + 0x74, 0x0b, 0x80, 0xbf, 0x1e, 0x4d, 0x47, 0x98, 0x55, 0x6a, 0x55, 0x57, 0xc3, 0x40, 0xdb, 0xec, + 0xcf, 0xa8, 0x92, 0xaa, 0x24, 0x9b, 0x68, 0x32, 0x07, 0x97, 0x98, 0x55, 0x49, 0x33, 0xe3, 0x55, + 0x49, 0x16, 0xbd, 0x0f, 0x25, 0x9d, 0x58, 0x53, 0xb5, 0xcc, 0xfc, 0x53, 0x8b, 0xdb, 0x0c, 0xb1, + 0xa6, 0x3c, 0xfd, 0xba, 0xc4, 0x9a, 0x4a, 0xaa, 0x4c, 0x18, 0xf5, 0x61, 0xb3, 0x13, 0xb5, 0x74, + 0xb6, 0xeb, 0xa7, 0x8e, 0xeb, 0x30, 0x8f, 0xf1, 0x62, 0x48, 0x7a, 0xd5, 0x8c, 0xc1, 0x6b, 0xdd, + 0xc9, 0xd1, 0x90, 0x6b, 0x3d, 0x0f, 0xb1, 0xf9, 0x31, 0xcc, 0xb5, 0x30, 0xd4, 0x87, 0x55, 0x89, + 0xe4, 0xab, 0x4a, 0xaa, 0xf8, 0x33, 0xd2, 0xf2, 0xbb, 0x28, 0x7e, 0x96, 0xcc, 0x52, 0x93, 0x93, + 0x57, 0x91, 0x42, 0x46, 0xbf, 0x54, 0x60, 0xf3, 0x70, 0xfe, 0x04, 0x8b, 0xe2, 0x1a, 0x99, 0xfc, + 0xc6, 0x19, 0x26, 0xf3, 0x54, 0xb8, 0x69, 0xe6, 0x88, 0x9c, 0x33, 0x31, 0xe5, 0x88, 0x3c, 0x75, + 0x74, 0x04, 0x15, 0x83, 0x1d, 0x5c, 0xbe, 0x5a, 0x64, 0xc6, 0xaf, 0x9c, 0x61, 0x5c, 0x48, 0x71, + 0x7b, 0x2c, 0x5d, 0xf9, 0x81, 0x27, 0x9b, 0x88, 0xa1, 0xd0, 0xf7, 0x61, 0xc5, 0xe0, 0x47, 0xaa, + 0xaf, 0x96, 0x18, 0xec, 0xd5, 0x33, 0x61, 0xb9, 0x18, 0xc7, 0xdd, 0x0a, 0x03, 0x0d, 0x89, 0xc3, + 0x58, 0x06, 0x9e, 0xa1, 0xa1, 0x1f, 0x01, 0x74, 0xdc, 0x13, 0x73, 0xe0, 0x58, 0x47, 0x93, 0xb8, + 0x3f, 0xbf, 0x7b, 0x06, 0x76, 0x22, 0xc8, 0xd1, 0x59, 0xe6, 0x3a, 0x33, 0xa2, 0x9c, 0xb9, 0x89, + 0x28, 0xfa, 0x26, 0x94, 0x9e, 0x10, 0x3b, 0x4e, 0xba, 0xba, 0xc0, 0x7e, 0x42, 0x6c, 0x76, 0x3c, + 0xb2, 0xe4, 0x1d, 0x10, 0x5b, 0xd6, 0x66, 0xf2, 0xe8, 0x17, 0x0a, 0x5c, 0x3d, 0xec, 0xf5, 0xb1, + 0x35, 0x1e, 0x60, 0xeb, 0xfe, 0x04, 0xf7, 0xc6, 0x14, 0x5b, 0x87, 0x7b, 0xc6, 0x21, 0xef, 0xc6, + 0x07, 0x1e, 0x3e, 0x61, 0xc9, 0xa7, 0x56, 0x58, 0x6b, 0xbf, 0x11, 0x06, 0x5a, 0xcb, 0x5f, 0x40, + 0x5e, 0x32, 0xb4, 0x10, 0x3e, 0xfa, 0x8d, 0x02, 0x5f, 0x9b, 0x13, 0x4c, 0x36, 0x98, 0x5d, 0xce, + 0x0a, 0x5b, 0xce, 0xad, 0x30, 0xd0, 0x6e, 0xfa, 0x0b, 0x6b, 0x49, 0x8b, 0x3a, 0x87, 0xad, 0xed, + 0x67, 0x70, 0x61, 0xae, 0x6e, 0x72, 0xba, 0xeb, 0x95, 0x74, 0x77, 0x5d, 0x8b, 0xe3, 0x3b, 0xe9, + 0xb8, 0xc7, 0x44, 0xea, 0xaa, 0xdb, 0x1f, 0xc2, 0xa5, 0x33, 0x8b, 0x22, 0x07, 0xf7, 0x6a, 0x1a, + 0x37, 0x8e, 0xed, 0xe1, 0x9e, 0x91, 0x05, 0x7e, 0x0a, 0xab, 0x72, 0xc2, 0xe7, 0x60, 0x7d, 0x35, + 0x8d, 0x75, 0x41, 0x60, 0x71, 0xad, 0x2c, 0xdc, 0x63, 0x58, 0x4b, 0x25, 0xfa, 0xe2, 0x6b, 0x13, + 0x6a, 0x32, 0xd8, 0x13, 0x58, 0xcf, 0x64, 0xf6, 0x7f, 0xe1, 0xc2, 0xe6, 0x1f, 0x0a, 0x50, 0x79, + 0x80, 0x71, 0x44, 0x46, 0xef, 0x40, 0xe5, 0xa1, 0xe9, 0x7f, 0xd7, 0xc7, 0x16, 0x83, 0x2a, 0xe9, + 0xb5, 0x30, 0xd0, 0x2a, 0x36, 0x27, 0x19, 0x31, 0x0f, 0x0d, 0xa0, 0xf8, 0x00, 0x63, 0x71, 0x08, + 0x7d, 0x14, 0x06, 0xda, 0xda, 0x31, 0x96, 0x4e, 0x90, 0xdf, 0xff, 0x5d, 0xbb, 0x3f, 0x34, 0x69, + 0xbf, 0xdd, 0x75, 0xec, 0x56, 0xc7, 0xa5, 0x77, 0xce, 0x31, 0x09, 0xb7, 0x74, 0xc7, 0xee, 0xb8, + 0x74, 0xcf, 0xf4, 0x29, 0xf6, 0x8c, 0xc8, 0x0c, 0xfa, 0x44, 0x81, 0x7a, 0xc7, 0x75, 0xa8, 0x63, + 0x0e, 0x0e, 0x4c, 0xc7, 0x8a, 0x2c, 0x17, 0x99, 0x65, 0x1c, 0x8d, 0x22, 0x4e, 0x8a, 0xf3, 0x45, + 0x2c, 0x22, 0x63, 0xbc, 0xf9, 0x37, 0x05, 0x96, 0xb9, 0x1b, 0xd1, 0x3e, 0xd4, 0xa4, 0x74, 0x66, + 0x3e, 0xab, 0xdd, 0x40, 0xf3, 0xdd, 0x88, 0x9f, 0xd4, 0xd2, 0xd1, 0x20, 0x9f, 0xd4, 0x92, 0x1c, + 0xfa, 0xd6, 0x2c, 0x16, 0x99, 0x34, 0x10, 0x54, 0xde, 0x78, 0x8f, 0xf9, 0x8b, 0xdc, 0x78, 0xe3, + 0x08, 0xde, 0x86, 0x3a, 0xaf, 0x42, 0x87, 0xb8, 0xfb, 0x9e, 0x85, 0x3d, 0xe6, 0x2b, 0x31, 0xf2, + 0xe1, 0x14, 0xc7, 0xc8, 0x48, 0x36, 0xff, 0xad, 0x40, 0x45, 0x94, 0x02, 0x22, 0xf0, 0x56, 0x4e, + 0x61, 0x89, 0x1d, 0x6e, 0xc7, 0x75, 0x33, 0x2f, 0xa1, 0x7f, 0x25, 0x0c, 0xb4, 0xb7, 0x73, 0x4e, + 0x22, 0x69, 0xb1, 0x79, 0xc8, 0xff, 0xdf, 0x9d, 0x1f, 0x41, 0x45, 0xf4, 0x77, 0xd4, 0x8c, 0x82, + 0xcb, 0xa6, 0x1d, 0x56, 0x4c, 0x3a, 0x84, 0x81, 0xb6, 0x4c, 0x19, 0xc5, 0x10, 0x1c, 0xf4, 0x0e, + 0x14, 0x9f, 0x10, 0x5b, 0xac, 0x13, 0x92, 0x03, 0x42, 0xaf, 0x84, 0x81, 0x56, 0x1c, 0x10, 0xdb, + 0x88, 0xf8, 0xcd, 0x8f, 0x15, 0x80, 0xa4, 0x1d, 0xa0, 0x0f, 0x60, 0x99, 0xbf, 0x09, 0x2f, 0xae, + 0xa7, 0x3a, 0xc6, 0xd1, 0x44, 0xdf, 0x0c, 0x03, 0x6d, 0x83, 0x1f, 0xaa, 0xd2, 0x06, 0x85, 0x52, + 0xce, 0xfe, 0x0a, 0x0b, 0xef, 0xef, 0x5f, 0x4a, 0xfe, 0x7d, 0x0a, 0xbd, 0x07, 0xb5, 0x87, 0xa6, + 0x7f, 0xe0, 0x91, 0x13, 0xc7, 0x9a, 0x15, 0xfd, 0x7a, 0x18, 0x68, 0x35, 0x3b, 0x21, 0x1b, 0xb2, + 0x8c, 0x50, 0x31, 0xf0, 0xf1, 0xd8, 0x8d, 0x54, 0x0a, 0x29, 0x95, 0x98, 0x6c, 0xc8, 0x32, 0xe8, + 0x26, 0xac, 0x46, 0x08, 0xd8, 0x35, 0x07, 0xd1, 0x25, 0x85, 0x05, 0xa6, 0xa4, 0x6f, 0x84, 0x81, + 0xb6, 0x6a, 0x4b, 0x74, 0x23, 0x25, 0x15, 0x6d, 0xf8, 0xa9, 0x39, 0x61, 0x24, 0x8f, 0x9f, 0x54, + 0x25, 0xa6, 0xc7, 0x36, 0x3c, 0x4c, 0x71, 0x8c, 0x8c, 0x64, 0xf3, 0x18, 0xde, 0xfa, 0x5e, 0xd4, + 0x20, 0x4d, 0x4a, 0x3c, 0xc3, 0xa4, 0x8e, 0x6b, 0xb3, 0x10, 0x5c, 0x83, 0xea, 0xc1, 0xb8, 0x3b, + 0x70, 0x7a, 0x8f, 0xe3, 0x66, 0xa9, 0xaf, 0x85, 0x81, 0x56, 0x1d, 0xc5, 0x44, 0x23, 0xe1, 0x47, + 0x99, 0xc0, 0x55, 0xd9, 0x1e, 0x0b, 0x3c, 0x13, 0x3c, 0x46, 0x31, 0x04, 0xa7, 0xf9, 0x57, 0x05, + 0x36, 0x66, 0x86, 0x7c, 0x4e, 0x8c, 0xba, 0x68, 0x7a, 0xb8, 0x67, 0x5d, 0x54, 0x0c, 0xf7, 0xc9, + 0x48, 0xaf, 0x41, 0xf9, 0xfe, 0x88, 0xf4, 0xfa, 0x22, 0x8e, 0xd5, 0x30, 0xd0, 0xca, 0x38, 0x22, + 0x18, 0x9c, 0x8e, 0x3c, 0xd8, 0xcc, 0x62, 0xb3, 0xfa, 0xe0, 0x73, 0x5a, 0x5c, 0x84, 0x39, 0xfb, + 0xe4, 0xe3, 0xe0, 0x49, 0x8e, 0xae, 0x3c, 0x0e, 0xe6, 0x61, 0x37, 0x7f, 0x5b, 0x80, 0xaa, 0x41, + 0xc6, 0x2e, 0x4f, 0x59, 0x0d, 0xca, 0xec, 0x45, 0x24, 0x06, 0x5b, 0xa2, 0x17, 0x11, 0x0c, 0x4e, + 0x8f, 0x62, 0x94, 0xb9, 0x25, 0x16, 0xd8, 0x2d, 0x91, 0xc5, 0x28, 0x7d, 0x4b, 0x9c, 0xbb, 0x1b, + 0x7e, 0x1b, 0x36, 0x58, 0xb0, 0x3e, 0x64, 0xc9, 0x35, 0x22, 0xbe, 0xc8, 0x8c, 0x15, 0x5e, 0x08, + 0xdd, 0x0c, 0xcf, 0x98, 0x93, 0x4e, 0x1c, 0x6d, 0xb1, 0xd4, 0x48, 0x39, 0xda, 0x8a, 0x1d, 0x6d, + 0x25, 0x8e, 0x2e, 0x9f, 0xe1, 0xe8, 0x6b, 0x50, 0x3d, 0x72, 0x86, 0xd8, 0xa7, 0xe6, 0x70, 0xa4, + 0x2e, 0xb3, 0xad, 0xb2, 0xb4, 0xa0, 0x31, 0xd1, 0x48, 0xf8, 0xcd, 0x9f, 0x01, 0xb0, 0xbd, 0xfb, + 0xf1, 0x89, 0xb9, 0x48, 0xac, 0xbf, 0x23, 0x2b, 0x89, 0x29, 0x3f, 0xbe, 0xce, 0xcc, 0xdc, 0xcd, + 0xe7, 0x53, 0x6f, 0x26, 0x27, 0xcf, 0xa7, 0x89, 0x76, 0xf3, 0x3d, 0xa8, 0x1c, 0x8c, 0xbb, 0x8f, + 0xf1, 0xd4, 0x47, 0xef, 0x42, 0x29, 0xfa, 0x65, 0x37, 0x95, 0x55, 0xee, 0xf4, 0x17, 0x78, 0x9a, + 0x1a, 0x4d, 0x23, 0x7e, 0xf3, 0xcf, 0x05, 0xb8, 0x90, 0x84, 0x3b, 0xd6, 0x5e, 0x70, 0xed, 0x9f, + 0x28, 0xb0, 0xc5, 0x9e, 0xe7, 0x10, 0xc4, 0x46, 0x6e, 0x66, 0x33, 0x31, 0xe6, 0xb7, 0xf2, 0xd5, + 0xf8, 0x30, 0xae, 0x85, 0x81, 0x76, 0xf9, 0x24, 0xcb, 0x93, 0xbf, 0x6a, 0xe4, 0x6b, 0x27, 0xe1, + 0x2c, 0xe6, 0x87, 0x73, 0xfb, 0x39, 0x5c, 0xfe, 0x0c, 0xc3, 0xf2, 0xac, 0xb4, 0xf6, 0x99, 0xa3, + 0x97, 0xd0, 0x92, 0x87, 0xa5, 0x3f, 0x16, 0x60, 0x65, 0xf6, 0xf1, 0x66, 0x41, 0xff, 0xdd, 0x86, + 0x3a, 0xcb, 0xdc, 0x24, 0xc5, 0x0a, 0x49, 0x1f, 0xeb, 0xa6, 0x38, 0x46, 0x46, 0x12, 0x0d, 0xe7, + 0x3f, 0x49, 0x15, 0x53, 0xd7, 0xa9, 0x98, 0xfc, 0x3f, 0xf9, 0x1c, 0xf5, 0x45, 0x7e, 0xff, 0xb0, + 0xa1, 0xce, 0x3e, 0xb6, 0x44, 0xad, 0x9d, 0x5f, 0x53, 0x16, 0x74, 0x5f, 0x2b, 0xf5, 0x09, 0x82, + 0xcf, 0x9c, 0xf5, 0x30, 0xd0, 0x20, 0xf9, 0x04, 0x21, 0x7f, 0x78, 0x68, 0xb6, 0xa0, 0xcc, 0x54, + 0x17, 0xc4, 0xd7, 0xc7, 0x2f, 0x5f, 0x37, 0x96, 0x5e, 0xbd, 0x6e, 0x2c, 0x7d, 0xfa, 0xba, 0xa1, + 0xfc, 0xfc, 0xb4, 0xa1, 0xfc, 0xee, 0xb4, 0xa1, 0xfc, 0xe5, 0xb4, 0xa1, 0xbc, 0x3c, 0x6d, 0x28, + 0xaf, 0x4e, 0x1b, 0xca, 0x3f, 0x4e, 0x1b, 0xca, 0x3f, 0x4f, 0x1b, 0x4b, 0x9f, 0x9e, 0x36, 0x94, + 0x5f, 0xbf, 0x69, 0x2c, 0xbd, 0x7c, 0xd3, 0x58, 0x7a, 0xf5, 0xa6, 0xb1, 0xf4, 0xd1, 0x79, 0x46, + 0xca, 0xb6, 0xf8, 0x3f, 0xc0, 0x1d, 0xf1, 0xdb, 0x5d, 0x66, 0x0e, 0x7b, 0xff, 0x3f, 0x01, 0x00, + 0x00, 0xff, 0xff, 0xe1, 0x15, 0x1f, 0x1e, 0x21, 0x18, 0x00, 0x00, } func (this *OutportBlock) Equal(that interface{}) bool { @@ -1352,6 +1362,14 @@ func (this *BlockData) Equal(that interface{}) bool { if !this.Body.Equal(that1.Body) { return false } + if len(this.IntraShardMiniBlocks) != len(that1.IntraShardMiniBlocks) { + return false + } + for i := range this.IntraShardMiniBlocks { + if !this.IntraShardMiniBlocks[i].Equal(that1.IntraShardMiniBlocks[i]) { + return false + } + } return true } func (this *TransactionPool) Equal(that interface{}) bool { @@ -1951,7 +1969,7 @@ func (this *BlockData) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 9) + s := make([]string, 0, 10) s = append(s, "&outport.BlockData{") s = append(s, "ShardID: "+fmt.Sprintf("%#v", this.ShardID)+",\n") s = append(s, "HeaderBytes: "+fmt.Sprintf("%#v", this.HeaderBytes)+",\n") @@ -1960,6 +1978,9 @@ func (this *BlockData) GoString() string { if this.Body != nil { s = append(s, "Body: "+fmt.Sprintf("%#v", this.Body)+",\n") } + if this.IntraShardMiniBlocks != nil { + s = append(s, "IntraShardMiniBlocks: "+fmt.Sprintf("%#v", this.IntraShardMiniBlocks)+",\n") + } s = append(s, "}") return strings.Join(s, "") } @@ -2424,6 +2445,20 @@ func (m *BlockData) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.IntraShardMiniBlocks) > 0 { + for iNdEx := len(m.IntraShardMiniBlocks) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.IntraShardMiniBlocks[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintOutportBlock(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x32 + } + } if m.Body != nil { { size, err := m.Body.MarshalToSizedBuffer(dAtA[:i]) @@ -3467,6 +3502,12 @@ func (m *BlockData) Size() (n int) { l = m.Body.Size() n += 1 + l + sovOutportBlock(uint64(l)) } + if len(m.IntraShardMiniBlocks) > 0 { + for _, e := range m.IntraShardMiniBlocks { + l = e.Size() + n += 1 + l + sovOutportBlock(uint64(l)) + } + } return n } @@ -3902,12 +3943,18 @@ func (this *BlockData) String() string { if this == nil { return "nil" } + repeatedStringForIntraShardMiniBlocks := "[]*MiniBlock{" + for _, f := range this.IntraShardMiniBlocks { + repeatedStringForIntraShardMiniBlocks += strings.Replace(fmt.Sprintf("%v", f), "MiniBlock", "block.MiniBlock", 1) + "," + } + repeatedStringForIntraShardMiniBlocks += "}" s := strings.Join([]string{`&BlockData{`, `ShardID:` + fmt.Sprintf("%v", this.ShardID) + `,`, `HeaderBytes:` + fmt.Sprintf("%v", this.HeaderBytes) + `,`, `HeaderType:` + fmt.Sprintf("%v", this.HeaderType) + `,`, `HeaderHash:` + fmt.Sprintf("%v", this.HeaderHash) + `,`, `Body:` + strings.Replace(fmt.Sprintf("%v", this.Body), "Body", "block.Body", 1) + `,`, + `IntraShardMiniBlocks:` + repeatedStringForIntraShardMiniBlocks + `,`, `}`, }, "") return s @@ -4870,6 +4917,40 @@ func (m *BlockData) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field IntraShardMiniBlocks", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOutportBlock + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthOutportBlock + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthOutportBlock + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.IntraShardMiniBlocks = append(m.IntraShardMiniBlocks, &block.MiniBlock{}) + if err := m.IntraShardMiniBlocks[len(m.IntraShardMiniBlocks)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipOutportBlock(dAtA[iNdEx:])