From 40449705621eb967cbeb11e178cd02b740e1ab2d Mon Sep 17 00:00:00 2001 From: Alexander Cristurean Date: Thu, 5 Sep 2024 13:25:04 +0300 Subject: [PATCH 01/14] added state changes in the outport block structure. --- data/outport/outportBlock.pb.go | 508 +++++++++---- data/outport/outportBlock.proto | 12 +- data/stateChange/stateChange.pb.go | 1069 ++++++++++++++++++++++++++++ data/stateChange/stateChange.proto | 24 + 4 files changed, 1463 insertions(+), 150 deletions(-) create mode 100644 data/stateChange/stateChange.pb.go create mode 100644 data/stateChange/stateChange.proto diff --git a/data/outport/outportBlock.pb.go b/data/outport/outportBlock.pb.go index f7020b56..0b54f071 100644 --- a/data/outport/outportBlock.pb.go +++ b/data/outport/outportBlock.pb.go @@ -16,6 +16,7 @@ import ( receipt "github.com/multiversx/mx-chain-core-go/data/receipt" rewardTx "github.com/multiversx/mx-chain-core-go/data/rewardTx" smartContractResult "github.com/multiversx/mx-chain-core-go/data/smartContractResult" + stateChange "github.com/multiversx/mx-chain-core-go/data/stateChange" transaction "github.com/multiversx/mx-chain-core-go/data/transaction" io "io" math "math" @@ -42,11 +43,12 @@ type OutportBlock struct { 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"` + StateChanges map[string]*stateChange.StateChange `protobuf:"bytes,6,rep,name=StateChanges,proto3" json:"stateChanges,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + NotarizedHeadersHashes []string `protobuf:"bytes,7,rep,name=NotarizedHeadersHashes,proto3" json:"notarizedHeadersHashes,omitempty"` + NumberOfShards uint32 `protobuf:"varint,8,opt,name=NumberOfShards,proto3" json:"numberOfShards"` + SignersIndexes []uint64 `protobuf:"varint,9,rep,packed,name=SignersIndexes,proto3" json:"signersIndexes,omitempty"` + HighestFinalBlockNonce uint64 `protobuf:"varint,10,opt,name=HighestFinalBlockNonce,proto3" json:"highestFinalBlockNonce"` + HighestFinalBlockHash []byte `protobuf:"bytes,11,opt,name=HighestFinalBlockHash,proto3" json:"highestFinalBlockHash,omitempty"` } func (m *OutportBlock) Reset() { *m = OutportBlock{} } @@ -112,6 +114,13 @@ func (m *OutportBlock) GetAlteredAccounts() map[string]*alteredAccount.AlteredAc return nil } +func (m *OutportBlock) GetStateChanges() map[string]*stateChange.StateChange { + if m != nil { + return m.StateChanges + } + return nil +} + func (m *OutportBlock) GetNotarizedHeadersHashes() []string { if m != nil { return m.NotarizedHeadersHashes @@ -1109,6 +1118,7 @@ func (m *Shard) GetShardID() uint32 { func init() { proto.RegisterType((*OutportBlock)(nil), "proto.OutportBlock") proto.RegisterMapType((map[string]*alteredAccount.AlteredAccount)(nil), "proto.OutportBlock.AlteredAccountsEntry") + proto.RegisterMapType((map[string]*stateChange.StateChange)(nil), "proto.OutportBlock.StateChangesEntry") proto.RegisterType((*BlockData)(nil), "proto.BlockData") proto.RegisterType((*TransactionPool)(nil), "proto.TransactionPool") proto.RegisterMapType((map[string]*TxInfo)(nil), "proto.TransactionPool.InvalidTxsEntry") @@ -1138,128 +1148,131 @@ func init() { func init() { proto.RegisterFile("outportBlock.proto", fileDescriptor_661b95cef868af95) } var fileDescriptor_661b95cef868af95 = []byte{ - // 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, + // 1980 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcd, 0x93, 0xdb, 0x48, + 0x15, 0x1f, 0xd9, 0x9e, 0xf1, 0xf8, 0xcd, 0x77, 0xef, 0x64, 0x50, 0x26, 0xac, 0x35, 0x38, 0xc9, + 0xe2, 0x22, 0xc4, 0x66, 0xb3, 0x29, 0x2a, 0x95, 0xd4, 0x16, 0x44, 0x93, 0x2f, 0x93, 0x8f, 0x99, + 0x92, 0x07, 0x96, 0x6c, 0x51, 0x05, 0xb2, 0xd5, 0x23, 0xab, 0x62, 0xab, 0x8d, 0xd4, 0x1e, 0x6c, + 0x2e, 0x70, 0x62, 0x39, 0xb0, 0x55, 0x1c, 0xb9, 0x71, 0xa5, 0x38, 0x70, 0xe5, 0x3f, 0xa0, 0x38, + 0x51, 0x39, 0x51, 0x39, 0x09, 0x32, 0xb9, 0x50, 0x3a, 0x50, 0x7b, 0xdb, 0x2b, 0xa5, 0xee, 0x96, + 0xd5, 0x92, 0x35, 0x5b, 0x9e, 0xc0, 0x16, 0x97, 0xb1, 0xf4, 0x3e, 0x7e, 0xaf, 0xdf, 0x47, 0xbf, + 0x7e, 0xad, 0x01, 0x44, 0x46, 0x74, 0x48, 0x3c, 0xaa, 0xf7, 0x49, 0xf7, 0x45, 0x63, 0xe8, 0x11, + 0x4a, 0xd0, 0x22, 0xfb, 0xd9, 0xbd, 0x6e, 0x3b, 0xb4, 0x37, 0xea, 0x34, 0xba, 0x64, 0xd0, 0xb4, + 0x89, 0x4d, 0x9a, 0x8c, 0xdc, 0x19, 0x1d, 0xb3, 0x37, 0xf6, 0xc2, 0x9e, 0xb8, 0xd6, 0xee, 0x87, + 0x92, 0xf8, 0x60, 0xd4, 0xa7, 0xce, 0x09, 0xf6, 0xfc, 0x71, 0x73, 0x30, 0xbe, 0xde, 0xed, 0x99, + 0x8e, 0x7b, 0xbd, 0x4b, 0x3c, 0x7c, 0xdd, 0x26, 0x4d, 0xcb, 0xa4, 0x66, 0xb3, 0x13, 0x99, 0xe3, + 0x7f, 0x85, 0xfa, 0xdd, 0xf3, 0xa8, 0x53, 0xcf, 0x74, 0x7d, 0xb3, 0x4b, 0x1d, 0xe2, 0x36, 0xfb, + 0xc4, 0x16, 0x10, 0xad, 0xb7, 0x85, 0x90, 0x9e, 0x05, 0xd4, 0xf3, 0xf3, 0x40, 0xf9, 0x03, 0xd3, + 0xa3, 0xfb, 0xc4, 0xa5, 0x9e, 0xd9, 0xa5, 0x06, 0xf6, 0x47, 0x7d, 0x9a, 0x47, 0x7b, 0x1b, 0x47, + 0x3d, 0xdc, 0xc5, 0xce, 0x90, 0xc6, 0xbf, 0x02, 0x62, 0xff, 0x7c, 0x10, 0x3f, 0x33, 0x3d, 0xeb, + 0x68, 0x3c, 0x7d, 0x10, 0x20, 0x07, 0xe7, 0x01, 0x31, 0xfb, 0x14, 0x7b, 0xd8, 0xba, 0xdb, 0xed, + 0x92, 0x91, 0x4b, 0x33, 0xaf, 0x6f, 0x13, 0x7e, 0x9f, 0x9a, 0x14, 0xef, 0xf7, 0x4c, 0xd7, 0xc6, + 0xf2, 0x33, 0x87, 0xaa, 0x7d, 0xbe, 0x0c, 0xab, 0x07, 0x52, 0x61, 0xa2, 0x26, 0x94, 0xdb, 0x3d, + 0xd3, 0xb3, 0x5a, 0xf7, 0x54, 0x65, 0x4f, 0xa9, 0xaf, 0xe9, 0x17, 0xc2, 0x40, 0xdb, 0xf2, 0x39, + 0xe9, 0x9b, 0x64, 0xe0, 0x50, 0x3c, 0x18, 0xd2, 0x89, 0x11, 0x4b, 0xa1, 0x87, 0x50, 0x61, 0x9a, + 0xf7, 0x4c, 0x6a, 0xaa, 0x85, 0x3d, 0xa5, 0xbe, 0x72, 0x63, 0x93, 0x83, 0x37, 0xa6, 0x74, 0xfd, + 0x2b, 0x61, 0xa0, 0xbd, 0xd3, 0x89, 0x5f, 0x25, 0x98, 0x44, 0x17, 0xfd, 0x18, 0x36, 0x8e, 0x92, + 0xf2, 0x38, 0x24, 0xa4, 0xaf, 0x16, 0x19, 0xdc, 0x8e, 0x80, 0xcb, 0x70, 0xf5, 0x77, 0xc3, 0x40, + 0xbb, 0x48, 0xd3, 0x44, 0x09, 0x3a, 0x8b, 0x86, 0x7c, 0xd8, 0x7e, 0x84, 0x4d, 0x0b, 0x7b, 0x0f, + 0x4d, 0x7f, 0x9f, 0xb8, 0xfe, 0x68, 0x30, 0x8c, 0x78, 0x6a, 0x89, 0x59, 0xb9, 0x24, 0xac, 0xe4, + 0x89, 0xe8, 0xb5, 0x30, 0xd0, 0xaa, 0xbd, 0x1c, 0x8e, 0x64, 0x2f, 0x17, 0x1c, 0xfd, 0x14, 0x36, + 0xee, 0xa6, 0x72, 0xe8, 0xab, 0x8b, 0x7b, 0xc5, 0xfa, 0xca, 0x8d, 0xba, 0xb0, 0x27, 0x47, 0xbf, + 0x91, 0x11, 0xbd, 0xef, 0x52, 0x6f, 0xc2, 0xfd, 0x4c, 0x17, 0x82, 0x2f, 0xfb, 0x99, 0x51, 0x42, + 0x18, 0x56, 0xdb, 0x49, 0xa2, 0x7d, 0x75, 0x89, 0xd9, 0xbb, 0x9a, 0x67, 0x4f, 0x96, 0xe3, 0xc6, + 0x76, 0xc3, 0x40, 0xdb, 0x91, 0xea, 0x44, 0xb6, 0x94, 0x82, 0x45, 0x3f, 0x82, 0x9d, 0x67, 0x84, + 0x9a, 0x9e, 0xf3, 0x73, 0x6c, 0x71, 0xd7, 0xfd, 0x47, 0xa6, 0xdf, 0xc3, 0xbe, 0x5a, 0xde, 0x2b, + 0xd6, 0x2b, 0xfa, 0x95, 0x30, 0xd0, 0xf6, 0xdc, 0x5c, 0x09, 0x09, 0xf3, 0x0c, 0x0c, 0x74, 0x1b, + 0xd6, 0x9f, 0x8d, 0x06, 0x1d, 0xec, 0x1d, 0x1c, 0xb3, 0x4a, 0xf3, 0xd5, 0x65, 0x56, 0x8e, 0x28, + 0x0c, 0xb4, 0x75, 0x37, 0xc5, 0x31, 0x32, 0x92, 0xe8, 0x1e, 0xac, 0xb7, 0x1d, 0xdb, 0xc5, 0x9e, + 0xdf, 0x72, 0x2d, 0x3c, 0xc6, 0xbe, 0x5a, 0xd9, 0x2b, 0xd6, 0x4b, 0xfa, 0x57, 0xc3, 0x40, 0x53, + 0xfd, 0x14, 0x47, 0x5a, 0x49, 0x46, 0x07, 0x19, 0xb0, 0xf3, 0xc8, 0xb1, 0x7b, 0xd8, 0xa7, 0x0f, + 0x1c, 0xd7, 0xec, 0xb3, 0x80, 0x3d, 0x23, 0x6e, 0x17, 0xab, 0xb0, 0xa7, 0xd4, 0x4b, 0x3c, 0x52, + 0xbd, 0x5c, 0x09, 0xe3, 0x0c, 0x4d, 0xf4, 0x1c, 0x2e, 0xcc, 0x70, 0x22, 0x87, 0xd5, 0x95, 0x3d, + 0xa5, 0xbe, 0xaa, 0x5f, 0x0e, 0x03, 0x4d, 0xeb, 0xe5, 0x09, 0x48, 0xeb, 0xcc, 0x47, 0xd8, 0x7d, + 0x0e, 0xdb, 0x79, 0xd5, 0x83, 0x36, 0xa1, 0xf8, 0x02, 0x4f, 0xd8, 0x66, 0xae, 0x18, 0xd1, 0x23, + 0xba, 0x06, 0x8b, 0x27, 0x66, 0x7f, 0x84, 0xc5, 0x6e, 0xbd, 0x20, 0x0a, 0x23, 0xad, 0x6d, 0x70, + 0x99, 0xdb, 0x85, 0x5b, 0xca, 0x6e, 0x1b, 0xb6, 0x66, 0x0a, 0x25, 0x07, 0xb7, 0x9e, 0xc6, 0x45, + 0x02, 0x57, 0x52, 0x95, 0x40, 0x6b, 0xbf, 0x29, 0x4a, 0x8d, 0xe3, 0xfc, 0x6d, 0xe7, 0x0e, 0xac, + 0xf0, 0x82, 0xd1, 0x27, 0x14, 0xfb, 0xcc, 0xe4, 0xaa, 0x7e, 0x31, 0x0c, 0xb4, 0x0b, 0xbd, 0x84, + 0x2c, 0x29, 0xca, 0xd2, 0xe8, 0x16, 0x00, 0x7f, 0x3d, 0x9a, 0x0c, 0x31, 0xeb, 0x32, 0x15, 0x5d, + 0x0d, 0x03, 0x6d, 0xbb, 0x37, 0xa5, 0x4a, 0xaa, 0x92, 0x6c, 0xa2, 0xc9, 0xb2, 0x56, 0x62, 0x56, + 0x25, 0xcd, 0x4c, 0xaa, 0x24, 0x59, 0xf4, 0x01, 0x94, 0x74, 0x62, 0x4d, 0xd4, 0x45, 0x16, 0x9c, + 0x95, 0xb8, 0x45, 0x12, 0x6b, 0xc2, 0x6b, 0xba, 0x43, 0xac, 0x89, 0xa4, 0xca, 0x84, 0x51, 0x0f, + 0xb6, 0x5b, 0xd1, 0xc9, 0xc6, 0xbc, 0x7e, 0xea, 0xb8, 0x0e, 0x8b, 0x58, 0xbc, 0xa5, 0xe3, 0x3e, + 0x3b, 0x65, 0xf0, 0x3e, 0xe5, 0xe4, 0x68, 0xc8, 0x7d, 0x2a, 0x0f, 0xb1, 0xf6, 0x09, 0xcc, 0xb4, + 0x5f, 0xd4, 0x83, 0x55, 0x89, 0xe4, 0xab, 0x4a, 0xaa, 0x71, 0x65, 0xa4, 0xe5, 0x77, 0xb9, 0x97, + 0x48, 0x0d, 0x3a, 0xd5, 0x4b, 0x64, 0x71, 0xf4, 0x6b, 0x05, 0xb6, 0xdb, 0xb3, 0x07, 0x79, 0x94, + 0xd7, 0xc8, 0xe4, 0xb7, 0xce, 0x30, 0x99, 0xa7, 0xc2, 0x4d, 0xb3, 0x40, 0xe4, 0x8c, 0x06, 0xa9, + 0x40, 0xe4, 0xa9, 0xa3, 0x23, 0x28, 0x1b, 0xec, 0xfc, 0xf6, 0xd5, 0x22, 0x33, 0x7e, 0xf9, 0x0c, + 0xe3, 0x42, 0x8a, 0xdb, 0x63, 0xe5, 0xca, 0xcf, 0x7d, 0xd9, 0x44, 0x0c, 0x85, 0x7e, 0x08, 0xcb, + 0x06, 0x9f, 0x2c, 0x7c, 0xb5, 0xc4, 0x60, 0xaf, 0x9c, 0x09, 0xcb, 0xc5, 0x38, 0xee, 0x4e, 0x18, + 0x68, 0x48, 0xcc, 0x24, 0x32, 0xf0, 0x14, 0x0d, 0xfd, 0x04, 0xa0, 0xe5, 0x9e, 0x98, 0x7d, 0xc7, + 0x3a, 0x1a, 0xc7, 0x67, 0xcb, 0x7b, 0x67, 0x60, 0x27, 0x82, 0x1c, 0x9d, 0x55, 0xae, 0x33, 0x25, + 0xca, 0x95, 0x9b, 0x88, 0xa2, 0x6f, 0x43, 0xe9, 0x09, 0xb1, 0xe3, 0xa2, 0x5b, 0x17, 0xd8, 0x4f, + 0x88, 0xcd, 0x8e, 0x76, 0x56, 0xbc, 0x7d, 0x62, 0xcb, 0xda, 0x4c, 0x1e, 0xfd, 0x4a, 0x81, 0x2b, + 0xed, 0x6e, 0x0f, 0x5b, 0xa3, 0x3e, 0xb6, 0xee, 0x8f, 0x71, 0x77, 0x44, 0xb1, 0xd5, 0xde, 0x37, + 0xda, 0xbc, 0xc5, 0x1f, 0x7a, 0xf8, 0x84, 0x15, 0x9f, 0x38, 0x2f, 0x6e, 0x84, 0x81, 0xd6, 0xf0, + 0xe7, 0x90, 0x97, 0x0c, 0xcd, 0x85, 0x8f, 0x7e, 0xa7, 0xc0, 0x37, 0x66, 0x04, 0x13, 0x07, 0xb3, + 0xcb, 0x59, 0x66, 0xcb, 0xb9, 0x15, 0x06, 0xda, 0x4d, 0x7f, 0x6e, 0x2d, 0x69, 0x51, 0xe7, 0xb0, + 0xb5, 0xfb, 0x0c, 0xb6, 0x66, 0xf6, 0x4d, 0x4e, 0x6b, 0xbd, 0x9c, 0x6e, 0xad, 0x6b, 0x71, 0x7e, + 0xc7, 0x2d, 0xf7, 0x98, 0xc8, 0xad, 0xfa, 0x23, 0xb8, 0x78, 0xe6, 0xa6, 0xc8, 0xc1, 0xbd, 0x92, + 0xc6, 0x8d, 0x73, 0xdb, 0xde, 0x37, 0xb2, 0xc0, 0x4f, 0x61, 0x55, 0x2e, 0xf8, 0x1c, 0xac, 0xaf, + 0xa7, 0xb1, 0xb6, 0x04, 0x16, 0xd7, 0xca, 0xc2, 0x3d, 0x86, 0xb5, 0x54, 0xa1, 0xcf, 0xbf, 0x36, + 0xa1, 0x26, 0x83, 0x3d, 0x81, 0x8d, 0x4c, 0x65, 0xff, 0x17, 0x21, 0xac, 0xfd, 0xa9, 0x00, 0xe5, + 0x07, 0x18, 0x47, 0x64, 0x74, 0x15, 0xca, 0x0f, 0x4d, 0xff, 0xfb, 0x3e, 0xb6, 0x18, 0x54, 0x49, + 0x5f, 0x09, 0x03, 0xad, 0x6c, 0x73, 0x92, 0x11, 0xf3, 0x50, 0x1f, 0x8a, 0x0f, 0x30, 0x16, 0x87, + 0xd0, 0xc7, 0x61, 0xa0, 0xad, 0x1d, 0x63, 0xe9, 0x04, 0xf9, 0xe3, 0x3f, 0xb4, 0xfb, 0x03, 0x93, + 0xf6, 0x9a, 0x1d, 0xc7, 0x6e, 0xb4, 0x5c, 0x7a, 0xe7, 0x1c, 0xf3, 0x7b, 0x43, 0x77, 0xec, 0x96, + 0x4b, 0xf7, 0x4d, 0x9f, 0x62, 0xcf, 0x88, 0xcc, 0xa0, 0x4f, 0x15, 0x58, 0x6f, 0xb9, 0x0e, 0x75, + 0xcc, 0xfe, 0xa1, 0xe9, 0x58, 0x91, 0xe5, 0x22, 0xb3, 0x8c, 0xa3, 0xf9, 0xc6, 0x49, 0x71, 0xbe, + 0x8c, 0x45, 0x64, 0x8c, 0xd7, 0xfe, 0xae, 0xc0, 0x12, 0x0f, 0x23, 0x3a, 0x80, 0x15, 0xa9, 0x9c, + 0x59, 0xcc, 0x92, 0x41, 0x40, 0xe2, 0xf0, 0x93, 0x5a, 0x3a, 0x1a, 0xe4, 0x93, 0x5a, 0x92, 0x43, + 0xdf, 0x99, 0xe6, 0x22, 0x53, 0x06, 0x82, 0xca, 0x1b, 0xef, 0x31, 0x7f, 0x91, 0x1b, 0x6f, 0x9c, + 0xc1, 0xdb, 0xb0, 0xce, 0x77, 0xa1, 0x43, 0xdc, 0x03, 0xcf, 0xc2, 0x1e, 0x8b, 0x95, 0x98, 0x23, + 0x71, 0x8a, 0x63, 0x64, 0x24, 0x6b, 0x9f, 0x2b, 0x50, 0x16, 0x5b, 0x01, 0x11, 0x78, 0x27, 0x67, + 0x63, 0x09, 0x0f, 0x77, 0xe3, 0x7d, 0x33, 0x2b, 0xa1, 0x7f, 0x2d, 0x0c, 0xb4, 0x77, 0x73, 0x4e, + 0x22, 0x69, 0xb1, 0x79, 0xc8, 0xff, 0x5f, 0xcf, 0x8f, 0xa0, 0x2c, 0xfa, 0x3b, 0xaa, 0x45, 0xc9, + 0x65, 0xd3, 0x0e, 0xdb, 0x4c, 0x3a, 0x84, 0x81, 0xb6, 0x44, 0x19, 0xc5, 0x10, 0x1c, 0x74, 0x15, + 0x8a, 0x4f, 0x88, 0x2d, 0xd6, 0x09, 0xc9, 0x01, 0xa1, 0x97, 0xc3, 0x40, 0x2b, 0xf6, 0x89, 0x6d, + 0x44, 0xfc, 0xda, 0x27, 0x0a, 0x40, 0xd2, 0x0e, 0xd0, 0x87, 0xb0, 0xc4, 0xdf, 0x44, 0x14, 0x37, + 0x52, 0x1d, 0xe3, 0x68, 0xac, 0x6f, 0x87, 0x81, 0xb6, 0xc9, 0x0f, 0x55, 0xc9, 0x41, 0xa1, 0x94, + 0xe3, 0x5f, 0x61, 0x6e, 0xff, 0xfe, 0xad, 0xe4, 0xdf, 0x05, 0xd1, 0xfb, 0xb0, 0xf2, 0xd0, 0xf4, + 0x0f, 0x3d, 0x72, 0xe2, 0x58, 0xd3, 0x4d, 0xbf, 0x11, 0x06, 0xda, 0x8a, 0x9d, 0x90, 0x0d, 0x59, + 0x46, 0xa8, 0x18, 0xf8, 0x78, 0xe4, 0x46, 0x2a, 0x85, 0x94, 0x4a, 0x4c, 0x36, 0x64, 0x19, 0x74, + 0x13, 0x56, 0x23, 0x04, 0xec, 0x9a, 0xfd, 0xe8, 0xe6, 0xc3, 0x12, 0x53, 0xd2, 0x37, 0xc3, 0x40, + 0x5b, 0xb5, 0x25, 0xba, 0x91, 0x92, 0x8a, 0x1c, 0x7e, 0x6a, 0x8e, 0x19, 0xc9, 0xe3, 0x27, 0x55, + 0x89, 0xe9, 0x31, 0x87, 0x07, 0x29, 0x8e, 0x91, 0x91, 0xac, 0x1d, 0xc3, 0x3b, 0x3f, 0x88, 0x1a, + 0xa4, 0x49, 0x89, 0x67, 0x98, 0xd4, 0x71, 0x6d, 0x96, 0x82, 0x6b, 0x50, 0x39, 0x1c, 0x75, 0xfa, + 0x4e, 0xf7, 0x71, 0xdc, 0x2c, 0xf5, 0xb5, 0x30, 0xd0, 0x2a, 0xc3, 0x98, 0x68, 0x24, 0xfc, 0xa8, + 0x12, 0xb8, 0x2a, 0xf3, 0xb1, 0xc0, 0x2b, 0xc1, 0x63, 0x14, 0x43, 0x70, 0x6a, 0x7f, 0x53, 0x60, + 0x73, 0x6a, 0xc8, 0xe7, 0xc4, 0xa8, 0x8b, 0xa6, 0x87, 0x7b, 0xd6, 0x45, 0xc5, 0x70, 0x9f, 0x8c, + 0xf4, 0x1a, 0x2c, 0xde, 0x1f, 0x92, 0x6e, 0x4f, 0xe4, 0xb1, 0x12, 0x06, 0xda, 0x22, 0x8e, 0x08, + 0x06, 0xa7, 0x23, 0x0f, 0xb6, 0xb3, 0xd8, 0x6c, 0x7f, 0xf0, 0x39, 0x2d, 0xde, 0x84, 0x39, 0x7e, + 0xf2, 0x71, 0xf0, 0x24, 0x47, 0x57, 0x1e, 0x07, 0xf3, 0xb0, 0x6b, 0xbf, 0x2f, 0x40, 0xc5, 0x20, + 0x23, 0x97, 0x97, 0xac, 0x06, 0x8b, 0xec, 0x45, 0x14, 0x06, 0x5b, 0xa2, 0x17, 0x11, 0x0c, 0x4e, + 0x8f, 0x72, 0x94, 0xb9, 0x7a, 0x16, 0xd8, 0xd5, 0x93, 0xe5, 0x28, 0x7d, 0xf5, 0x9c, 0xb9, 0x70, + 0x7e, 0x17, 0x36, 0x59, 0xb2, 0x3e, 0x62, 0xc5, 0x35, 0x24, 0xbe, 0xa8, 0x8c, 0x65, 0xbe, 0x11, + 0x3a, 0x19, 0x9e, 0x31, 0x23, 0x9d, 0x04, 0xda, 0x62, 0xa5, 0x91, 0x0a, 0xb4, 0x15, 0x07, 0xda, + 0x4a, 0x02, 0xbd, 0x78, 0x46, 0xa0, 0xaf, 0x41, 0xe5, 0xc8, 0x19, 0x60, 0x9f, 0x9a, 0x83, 0xa1, + 0xba, 0xc4, 0x5c, 0x65, 0x65, 0x41, 0x63, 0xa2, 0x91, 0xf0, 0x6b, 0xbf, 0x00, 0x60, 0xbe, 0xfb, + 0xf1, 0x89, 0x39, 0x4f, 0xae, 0xbf, 0x27, 0x2b, 0x89, 0x29, 0x3f, 0xbe, 0xce, 0x4c, 0xc3, 0xcd, + 0xe7, 0x53, 0x6f, 0x2a, 0x27, 0xcf, 0xa7, 0x89, 0x76, 0xed, 0x7d, 0x28, 0x1f, 0x8e, 0x3a, 0x8f, + 0xf1, 0xc4, 0x47, 0xef, 0x41, 0x29, 0xfa, 0x65, 0x37, 0x95, 0x55, 0x1e, 0xf4, 0x17, 0x78, 0x92, + 0x1a, 0x4d, 0x23, 0x7e, 0xed, 0x2f, 0x05, 0xd8, 0x4a, 0xd2, 0x1d, 0x6b, 0xcf, 0xb9, 0xf6, 0x4f, + 0x15, 0xd8, 0x61, 0xcf, 0x33, 0x08, 0xc2, 0x91, 0x9b, 0xd9, 0x4a, 0x8c, 0xf9, 0x8d, 0x7c, 0x35, + 0x3e, 0x8c, 0x6b, 0x61, 0xa0, 0x5d, 0x3a, 0xc9, 0xf2, 0xe4, 0x4f, 0x25, 0xf9, 0xda, 0x49, 0x3a, + 0x8b, 0xf9, 0xe9, 0xdc, 0x7d, 0x0e, 0x97, 0xbe, 0xc0, 0xb0, 0x3c, 0x2b, 0xad, 0x7d, 0xe1, 0xe8, + 0x25, 0xb4, 0xe4, 0x61, 0xe9, 0xcf, 0x05, 0x58, 0x9e, 0x7e, 0x78, 0x9a, 0x33, 0x7e, 0xb7, 0x61, + 0x9d, 0x55, 0x6e, 0x52, 0x62, 0x85, 0xa4, 0x8f, 0x75, 0x52, 0x1c, 0x23, 0x23, 0x89, 0x06, 0xb3, + 0x9f, 0xd3, 0x8a, 0xa9, 0xeb, 0x54, 0x4c, 0xfe, 0x9f, 0x7c, 0x4a, 0xfb, 0x12, 0x3f, 0xaa, 0xd4, + 0x6c, 0x58, 0x67, 0x5f, 0x70, 0xa2, 0xd6, 0xce, 0xaf, 0x29, 0x73, 0x86, 0xaf, 0x91, 0xfa, 0x04, + 0xc1, 0x67, 0xce, 0xf5, 0x30, 0xd0, 0x20, 0xf9, 0x04, 0x21, 0x7f, 0x78, 0xa8, 0x35, 0x60, 0x91, + 0xa9, 0xce, 0x89, 0xaf, 0x8f, 0x5e, 0xbe, 0xae, 0x2e, 0xbc, 0x7a, 0x5d, 0x5d, 0xf8, 0xec, 0x75, + 0x55, 0xf9, 0xe5, 0x69, 0x55, 0xf9, 0xc3, 0x69, 0x55, 0xf9, 0xeb, 0x69, 0x55, 0x79, 0x79, 0x5a, + 0x55, 0x5e, 0x9d, 0x56, 0x95, 0x7f, 0x9e, 0x56, 0x95, 0x7f, 0x9d, 0x56, 0x17, 0x3e, 0x3b, 0xad, + 0x2a, 0xbf, 0x7d, 0x53, 0x5d, 0x78, 0xf9, 0xa6, 0xba, 0xf0, 0xea, 0x4d, 0x75, 0xe1, 0xe3, 0xf3, + 0x8c, 0x94, 0x4d, 0xf1, 0xef, 0x90, 0x3b, 0xe2, 0xb7, 0xb3, 0xc4, 0x02, 0xf6, 0xc1, 0x7f, 0x02, + 0x00, 0x00, 0xff, 0xff, 0xf1, 0x3d, 0xe1, 0x4b, 0x28, 0x19, 0x00, 0x00, } func (this *OutportBlock) Equal(that interface{}) bool { @@ -1301,6 +1314,14 @@ func (this *OutportBlock) Equal(that interface{}) bool { return false } } + if len(this.StateChanges) != len(that1.StateChanges) { + return false + } + for i := range this.StateChanges { + if !this.StateChanges[i].Equal(that1.StateChanges[i]) { + return false + } + } if len(this.NotarizedHeadersHashes) != len(that1.NotarizedHeadersHashes) { return false } @@ -1932,7 +1953,7 @@ func (this *OutportBlock) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 14) + s := make([]string, 0, 15) s = append(s, "&outport.OutportBlock{") s = append(s, "ShardID: "+fmt.Sprintf("%#v", this.ShardID)+",\n") if this.BlockData != nil { @@ -1957,6 +1978,19 @@ func (this *OutportBlock) GoString() string { if this.AlteredAccounts != nil { s = append(s, "AlteredAccounts: "+mapStringForAlteredAccounts+",\n") } + keysForStateChanges := make([]string, 0, len(this.StateChanges)) + for k, _ := range this.StateChanges { + keysForStateChanges = append(keysForStateChanges, k) + } + github_com_gogo_protobuf_sortkeys.Strings(keysForStateChanges) + mapStringForStateChanges := "map[string]*stateChange.StateChange{" + for _, k := range keysForStateChanges { + mapStringForStateChanges += fmt.Sprintf("%#v: %#v,", k, this.StateChanges[k]) + } + mapStringForStateChanges += "}" + if this.StateChanges != nil { + s = append(s, "StateChanges: "+mapStringForStateChanges+",\n") + } s = append(s, "NotarizedHeadersHashes: "+fmt.Sprintf("%#v", this.NotarizedHeadersHashes)+",\n") s = append(s, "NumberOfShards: "+fmt.Sprintf("%#v", this.NumberOfShards)+",\n") s = append(s, "SignersIndexes: "+fmt.Sprintf("%#v", this.SignersIndexes)+",\n") @@ -2311,12 +2345,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] = 0x52 + dAtA[i] = 0x5a } if m.HighestFinalBlockNonce != 0 { i = encodeVarintOutportBlock(dAtA, i, uint64(m.HighestFinalBlockNonce)) i-- - dAtA[i] = 0x48 + dAtA[i] = 0x50 } if len(m.SignersIndexes) > 0 { dAtA2 := make([]byte, len(m.SignersIndexes)*10) @@ -2334,12 +2368,12 @@ func (m *OutportBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], dAtA2[:j1]) i = encodeVarintOutportBlock(dAtA, i, uint64(j1)) i-- - dAtA[i] = 0x42 + dAtA[i] = 0x4a } if m.NumberOfShards != 0 { i = encodeVarintOutportBlock(dAtA, i, uint64(m.NumberOfShards)) i-- - dAtA[i] = 0x38 + dAtA[i] = 0x40 } if len(m.NotarizedHeadersHashes) > 0 { for iNdEx := len(m.NotarizedHeadersHashes) - 1; iNdEx >= 0; iNdEx-- { @@ -2347,6 +2381,37 @@ 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] = 0x3a + } + } + if len(m.StateChanges) > 0 { + keysForStateChanges := make([]string, 0, len(m.StateChanges)) + for k := range m.StateChanges { + keysForStateChanges = append(keysForStateChanges, string(k)) + } + github_com_gogo_protobuf_sortkeys.Strings(keysForStateChanges) + for iNdEx := len(keysForStateChanges) - 1; iNdEx >= 0; iNdEx-- { + v := m.StateChanges[string(keysForStateChanges[iNdEx])] + baseI := i + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintOutportBlock(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + i -= len(keysForStateChanges[iNdEx]) + copy(dAtA[i:], keysForStateChanges[iNdEx]) + i = encodeVarintOutportBlock(dAtA, i, uint64(len(keysForStateChanges[iNdEx]))) + i-- + dAtA[i] = 0xa + i = encodeVarintOutportBlock(dAtA, i, uint64(baseI-i)) + i-- dAtA[i] = 0x32 } } @@ -3118,20 +3183,20 @@ func (m *RoundInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x18 } if len(m.SignersIndexes) > 0 { - dAtA20 := make([]byte, len(m.SignersIndexes)*10) - var j19 int + dAtA21 := make([]byte, len(m.SignersIndexes)*10) + var j20 int for _, num := range m.SignersIndexes { for num >= 1<<7 { - dAtA20[j19] = uint8(uint64(num)&0x7f | 0x80) + dAtA21[j20] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j19++ + j20++ } - dAtA20[j19] = uint8(num) - j19++ + dAtA21[j20] = uint8(num) + j20++ } - i -= j19 - copy(dAtA[i:], dAtA20[:j19]) - i = encodeVarintOutportBlock(dAtA, i, uint64(j19)) + i -= j20 + copy(dAtA[i:], dAtA21[:j20]) + i = encodeVarintOutportBlock(dAtA, i, uint64(j20)) i-- dAtA[i] = 0x12 } @@ -3451,6 +3516,19 @@ func (m *OutportBlock) Size() (n int) { n += mapEntrySize + 1 + sovOutportBlock(uint64(mapEntrySize)) } } + if len(m.StateChanges) > 0 { + for k, v := range m.StateChanges { + _ = k + _ = v + l = 0 + if v != nil { + l = v.Size() + l += 1 + sovOutportBlock(uint64(l)) + } + mapEntrySize := 1 + len(k) + sovOutportBlock(uint64(len(k))) + l + n += mapEntrySize + 1 + sovOutportBlock(uint64(mapEntrySize)) + } + } if len(m.NotarizedHeadersHashes) > 0 { for _, s := range m.NotarizedHeadersHashes { l = len(s) @@ -3924,12 +4002,23 @@ func (this *OutportBlock) String() string { mapStringForAlteredAccounts += fmt.Sprintf("%v: %v,", k, this.AlteredAccounts[k]) } mapStringForAlteredAccounts += "}" + keysForStateChanges := make([]string, 0, len(this.StateChanges)) + for k, _ := range this.StateChanges { + keysForStateChanges = append(keysForStateChanges, k) + } + github_com_gogo_protobuf_sortkeys.Strings(keysForStateChanges) + mapStringForStateChanges := "map[string]*stateChange.StateChange{" + for _, k := range keysForStateChanges { + mapStringForStateChanges += fmt.Sprintf("%v: %v,", k, this.StateChanges[k]) + } + mapStringForStateChanges += "}" 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) + `,`, `AlteredAccounts:` + mapStringForAlteredAccounts + `,`, + `StateChanges:` + mapStringForStateChanges + `,`, `NotarizedHeadersHashes:` + fmt.Sprintf("%v", this.NotarizedHeadersHashes) + `,`, `NumberOfShards:` + fmt.Sprintf("%v", this.NumberOfShards) + `,`, `SignersIndexes:` + fmt.Sprintf("%v", this.SignersIndexes) + `,`, @@ -4530,6 +4619,135 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { m.AlteredAccounts[mapkey] = mapvalue iNdEx = postIndex case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field StateChanges", 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 + } + if m.StateChanges == nil { + m.StateChanges = make(map[string]*stateChange.StateChange) + } + var mapkey string + var mapvalue *stateChange.StateChange + for iNdEx < postIndex { + entryPreIndex := 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) + if fieldNum == 1 { + var stringLenmapkey uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOutportBlock + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLenmapkey |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLenmapkey := int(stringLenmapkey) + if intStringLenmapkey < 0 { + return ErrInvalidLengthOutportBlock + } + postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthOutportBlock + } + if postStringIndexmapkey > l { + return io.ErrUnexpectedEOF + } + mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) + iNdEx = postStringIndexmapkey + } else if fieldNum == 2 { + var mapmsglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOutportBlock + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + mapmsglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if mapmsglen < 0 { + return ErrInvalidLengthOutportBlock + } + postmsgIndex := iNdEx + mapmsglen + if postmsgIndex < 0 { + return ErrInvalidLengthOutportBlock + } + if postmsgIndex > l { + return io.ErrUnexpectedEOF + } + mapvalue = &stateChange.StateChange{} + if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil { + return err + } + iNdEx = postmsgIndex + } else { + iNdEx = entryPreIndex + skippy, err := skipOutportBlock(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthOutportBlock + } + if (iNdEx + skippy) > postIndex { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + m.StateChanges[mapkey] = mapvalue + iNdEx = postIndex + case 7: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field NotarizedHeadersHashes", wireType) } @@ -4561,7 +4779,7 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { } m.NotarizedHeadersHashes = append(m.NotarizedHeadersHashes, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex - case 7: + case 8: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field NumberOfShards", wireType) } @@ -4580,7 +4798,7 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { break } } - case 8: + case 9: if wireType == 0 { var v uint64 for shift := uint(0); ; shift += 7 { @@ -4656,7 +4874,7 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { } else { return fmt.Errorf("proto: wrong wireType = %d for field SignersIndexes", wireType) } - case 9: + case 10: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field HighestFinalBlockNonce", wireType) } @@ -4675,7 +4893,7 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { break } } - case 10: + case 11: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field HighestFinalBlockHash", wireType) } diff --git a/data/outport/outportBlock.proto b/data/outport/outportBlock.proto index dfad100a..bfe095fe 100644 --- a/data/outport/outportBlock.proto +++ b/data/outport/outportBlock.proto @@ -13,6 +13,7 @@ import "github.com/multiversx/mx-chain-core-go/data/smartContractResult/smartCon import "github.com/multiversx/mx-chain-core-go/data/receipt/receipt.proto"; import "github.com/multiversx/mx-chain-core-go/data/rewardTx/rewardTx.proto"; import "github.com/multiversx/mx-chain-core-go/data/alteredAccount/alteredAccount.proto"; +import "github.com/multiversx/mx-chain-core-go/data/stateChange/stateChange.proto"; message OutportBlock { uint32 ShardID = 1 [(gogoproto.jsontag) = "shardID,omitempty"]; @@ -20,11 +21,12 @@ message OutportBlock { 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"]; + map StateChanges = 6 [(gogoproto.jsontag) = "stateChanges,omitempty"]; + repeated string NotarizedHeadersHashes = 7 [(gogoproto.jsontag) = "notarizedHeadersHashes,omitempty"]; + uint32 NumberOfShards = 8 [(gogoproto.jsontag) = "numberOfShards"]; + repeated uint64 SignersIndexes = 9 [(gogoproto.jsontag) = "signersIndexes,omitempty"]; + uint64 HighestFinalBlockNonce = 10 [(gogoproto.jsontag) = "highestFinalBlockNonce"]; + bytes HighestFinalBlockHash = 11 [(gogoproto.jsontag) = "highestFinalBlockHash,omitempty"]; } message BlockData { diff --git a/data/stateChange/stateChange.pb.go b/data/stateChange/stateChange.pb.go new file mode 100644 index 00000000..1673f837 --- /dev/null +++ b/data/stateChange/stateChange.pb.go @@ -0,0 +1,1069 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: stateChange.proto + +package stateChange + +import ( + bytes "bytes" + fmt "fmt" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + io "io" + math "math" + math_bits "math/bits" + reflect "reflect" + strings "strings" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package + +type StateChange struct { + Type string `protobuf:"bytes,1,opt,name=Type,proto3" json:"type"` + Index int32 `protobuf:"varint,2,opt,name=Index,proto3" json:"-"` + TxHash []byte `protobuf:"bytes,3,opt,name=TxHash,proto3" json:"-"` + MainTrieKey []byte `protobuf:"bytes,4,opt,name=MainTrieKey,proto3" json:"-"` + MainTrieVal []byte `protobuf:"bytes,5,opt,name=MainTrieVal,proto3" json:"-"` + Operation string `protobuf:"bytes,6,opt,name=Operation,proto3" json:"operation"` + DataTrieChanges []*DataTrieChange `protobuf:"bytes,7,rep,name=DataTrieChanges,proto3" json:"dataTrieChanges,omitempty"` +} + +func (m *StateChange) Reset() { *m = StateChange{} } +func (*StateChange) ProtoMessage() {} +func (*StateChange) Descriptor() ([]byte, []int) { + return fileDescriptor_8e577663eebb0888, []int{0} +} +func (m *StateChange) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *StateChange) 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 *StateChange) XXX_Merge(src proto.Message) { + xxx_messageInfo_StateChange.Merge(m, src) +} +func (m *StateChange) XXX_Size() int { + return m.Size() +} +func (m *StateChange) XXX_DiscardUnknown() { + xxx_messageInfo_StateChange.DiscardUnknown(m) +} + +var xxx_messageInfo_StateChange proto.InternalMessageInfo + +func (m *StateChange) GetType() string { + if m != nil { + return m.Type + } + return "" +} + +func (m *StateChange) GetIndex() int32 { + if m != nil { + return m.Index + } + return 0 +} + +func (m *StateChange) GetTxHash() []byte { + if m != nil { + return m.TxHash + } + return nil +} + +func (m *StateChange) GetMainTrieKey() []byte { + if m != nil { + return m.MainTrieKey + } + return nil +} + +func (m *StateChange) GetMainTrieVal() []byte { + if m != nil { + return m.MainTrieVal + } + return nil +} + +func (m *StateChange) GetOperation() string { + if m != nil { + return m.Operation + } + return "" +} + +func (m *StateChange) GetDataTrieChanges() []*DataTrieChange { + if m != nil { + return m.DataTrieChanges + } + return nil +} + +type DataTrieChange struct { + Type string `protobuf:"bytes,1,opt,name=Type,proto3" json:"type"` + Key []byte `protobuf:"bytes,2,opt,name=Key,proto3" json:"type"` + Val []byte `protobuf:"bytes,3,opt,name=Val,proto3" json:"type"` +} + +func (m *DataTrieChange) Reset() { *m = DataTrieChange{} } +func (*DataTrieChange) ProtoMessage() {} +func (*DataTrieChange) Descriptor() ([]byte, []int) { + return fileDescriptor_8e577663eebb0888, []int{1} +} +func (m *DataTrieChange) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *DataTrieChange) 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 *DataTrieChange) XXX_Merge(src proto.Message) { + xxx_messageInfo_DataTrieChange.Merge(m, src) +} +func (m *DataTrieChange) XXX_Size() int { + return m.Size() +} +func (m *DataTrieChange) XXX_DiscardUnknown() { + xxx_messageInfo_DataTrieChange.DiscardUnknown(m) +} + +var xxx_messageInfo_DataTrieChange proto.InternalMessageInfo + +func (m *DataTrieChange) GetType() string { + if m != nil { + return m.Type + } + return "" +} + +func (m *DataTrieChange) GetKey() []byte { + if m != nil { + return m.Key + } + return nil +} + +func (m *DataTrieChange) GetVal() []byte { + if m != nil { + return m.Val + } + return nil +} + +func init() { + proto.RegisterType((*StateChange)(nil), "proto.StateChange") + proto.RegisterType((*DataTrieChange)(nil), "proto.DataTrieChange") +} + +func init() { proto.RegisterFile("stateChange.proto", fileDescriptor_8e577663eebb0888) } + +var fileDescriptor_8e577663eebb0888 = []byte{ + // 403 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xcd, 0xea, 0xd3, 0x40, + 0x14, 0xc5, 0x33, 0x4d, 0x53, 0xed, 0xd4, 0x0f, 0x0c, 0x08, 0xb1, 0xda, 0x49, 0xe8, 0xc6, 0x80, + 0xa6, 0x01, 0x5d, 0xba, 0x4b, 0x5d, 0x28, 0x22, 0x42, 0x2c, 0x5d, 0xb8, 0x10, 0xa6, 0xed, 0x34, + 0x09, 0x24, 0x99, 0x90, 0x4c, 0x25, 0x59, 0x08, 0x3e, 0x82, 0x8f, 0xe1, 0x93, 0x88, 0xcb, 0x2e, + 0xbb, 0x0a, 0x76, 0xba, 0x91, 0xac, 0xfa, 0x08, 0x92, 0x89, 0xa5, 0x69, 0x11, 0xfe, 0xab, 0xcc, + 0x3d, 0xbf, 0x7b, 0x2f, 0x39, 0x87, 0x0b, 0x1f, 0x64, 0x0c, 0x33, 0x32, 0xf5, 0x71, 0xec, 0x91, + 0x49, 0x92, 0x52, 0x46, 0x55, 0x45, 0x7c, 0x86, 0x96, 0x17, 0x30, 0x7f, 0xb3, 0x98, 0x2c, 0x69, + 0x64, 0x7b, 0xd4, 0xa3, 0xb6, 0x90, 0x17, 0x9b, 0xb5, 0xa8, 0x44, 0x21, 0x5e, 0xcd, 0xd4, 0xf8, + 0x67, 0x07, 0x0e, 0x3e, 0x9e, 0x77, 0xa9, 0x4f, 0x60, 0x77, 0x56, 0x24, 0x44, 0x03, 0x06, 0x30, + 0xfb, 0xce, 0xed, 0xaa, 0xd4, 0xbb, 0xac, 0x48, 0x88, 0x2b, 0x54, 0xf5, 0x31, 0x54, 0xde, 0xc6, + 0x2b, 0x92, 0x6b, 0x1d, 0x03, 0x98, 0x8a, 0xa3, 0x54, 0xa5, 0x0e, 0x2c, 0xb7, 0xd1, 0xd4, 0x11, + 0xec, 0xcd, 0xf2, 0x37, 0x38, 0xf3, 0x35, 0xd9, 0x00, 0xe6, 0x9d, 0x13, 0xfd, 0x27, 0xaa, 0x4f, + 0xe1, 0xe0, 0x3d, 0x0e, 0xe2, 0x59, 0x1a, 0x90, 0x77, 0xa4, 0xd0, 0xba, 0xed, 0x9e, 0x36, 0x69, + 0x37, 0xce, 0x71, 0xa8, 0x29, 0xff, 0x6d, 0x9c, 0xe3, 0x50, 0x7d, 0x06, 0xfb, 0x1f, 0x12, 0x92, + 0x62, 0x16, 0xd0, 0x58, 0xeb, 0x89, 0x1f, 0xbe, 0x5b, 0x95, 0x7a, 0x9f, 0x9e, 0x44, 0xf7, 0xcc, + 0xd5, 0xcf, 0xf0, 0xfe, 0x6b, 0xcc, 0x70, 0x3d, 0xdb, 0x58, 0xcd, 0xb4, 0x5b, 0x86, 0x6c, 0x0e, + 0x5e, 0x3c, 0x6c, 0x92, 0x98, 0x5c, 0x52, 0x67, 0x54, 0x95, 0xfa, 0xa3, 0xd5, 0xe5, 0xc4, 0x73, + 0x1a, 0x05, 0x8c, 0x44, 0x09, 0x2b, 0xdc, 0xeb, 0x65, 0xe3, 0x35, 0xbc, 0x77, 0x29, 0xdd, 0x10, + 0xe5, 0x10, 0xca, 0x75, 0x0c, 0x1d, 0xe1, 0xee, 0x0c, 0x6b, 0xb1, 0x66, 0xb5, 0x73, 0xf9, 0x9a, + 0xcd, 0x71, 0xe8, 0x7c, 0xdd, 0xee, 0x91, 0xb4, 0xdb, 0x23, 0xe9, 0xb8, 0x47, 0xe0, 0x1b, 0x47, + 0xe0, 0x07, 0x47, 0xe0, 0x17, 0x47, 0x60, 0xcb, 0x11, 0xd8, 0x71, 0x04, 0x7e, 0x73, 0x04, 0xfe, + 0x70, 0x24, 0x1d, 0x39, 0x02, 0xdf, 0x0f, 0x48, 0xda, 0x1e, 0x90, 0xb4, 0x3b, 0x20, 0xe9, 0xd3, + 0xb4, 0x75, 0x19, 0xd1, 0x26, 0x64, 0xc1, 0x17, 0x92, 0x66, 0xb9, 0x1d, 0xe5, 0xd6, 0xd2, 0xc7, + 0x41, 0x6c, 0x2d, 0x69, 0x4a, 0x2c, 0x8f, 0xda, 0xb5, 0x69, 0xbb, 0x75, 0x5f, 0xaf, 0x5a, 0xef, + 0x45, 0x4f, 0x84, 0xf5, 0xf2, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x69, 0xcc, 0x70, 0xa2, 0x81, + 0x02, 0x00, 0x00, +} + +func (this *StateChange) Equal(that interface{}) bool { + if that == nil { + return this == nil + } + + that1, ok := that.(*StateChange) + if !ok { + that2, ok := that.(StateChange) + if ok { + that1 = &that2 + } else { + return false + } + } + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + if this.Type != that1.Type { + return false + } + if this.Index != that1.Index { + return false + } + if !bytes.Equal(this.TxHash, that1.TxHash) { + return false + } + if !bytes.Equal(this.MainTrieKey, that1.MainTrieKey) { + return false + } + if !bytes.Equal(this.MainTrieVal, that1.MainTrieVal) { + return false + } + if this.Operation != that1.Operation { + return false + } + if len(this.DataTrieChanges) != len(that1.DataTrieChanges) { + return false + } + for i := range this.DataTrieChanges { + if !this.DataTrieChanges[i].Equal(that1.DataTrieChanges[i]) { + return false + } + } + return true +} +func (this *DataTrieChange) Equal(that interface{}) bool { + if that == nil { + return this == nil + } + + that1, ok := that.(*DataTrieChange) + if !ok { + that2, ok := that.(DataTrieChange) + if ok { + that1 = &that2 + } else { + return false + } + } + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + if this.Type != that1.Type { + return false + } + if !bytes.Equal(this.Key, that1.Key) { + return false + } + if !bytes.Equal(this.Val, that1.Val) { + return false + } + return true +} +func (this *StateChange) GoString() string { + if this == nil { + return "nil" + } + s := make([]string, 0, 11) + s = append(s, "&stateChange.StateChange{") + s = append(s, "Type: "+fmt.Sprintf("%#v", this.Type)+",\n") + s = append(s, "Index: "+fmt.Sprintf("%#v", this.Index)+",\n") + s = append(s, "TxHash: "+fmt.Sprintf("%#v", this.TxHash)+",\n") + s = append(s, "MainTrieKey: "+fmt.Sprintf("%#v", this.MainTrieKey)+",\n") + s = append(s, "MainTrieVal: "+fmt.Sprintf("%#v", this.MainTrieVal)+",\n") + s = append(s, "Operation: "+fmt.Sprintf("%#v", this.Operation)+",\n") + if this.DataTrieChanges != nil { + s = append(s, "DataTrieChanges: "+fmt.Sprintf("%#v", this.DataTrieChanges)+",\n") + } + s = append(s, "}") + return strings.Join(s, "") +} +func (this *DataTrieChange) GoString() string { + if this == nil { + return "nil" + } + s := make([]string, 0, 7) + s = append(s, "&stateChange.DataTrieChange{") + s = append(s, "Type: "+fmt.Sprintf("%#v", this.Type)+",\n") + s = append(s, "Key: "+fmt.Sprintf("%#v", this.Key)+",\n") + s = append(s, "Val: "+fmt.Sprintf("%#v", this.Val)+",\n") + s = append(s, "}") + return strings.Join(s, "") +} +func valueToGoStringStateChange(v interface{}, typ string) string { + rv := reflect.ValueOf(v) + if rv.IsNil() { + return "nil" + } + pv := reflect.Indirect(rv).Interface() + return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) +} +func (m *StateChange) 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 *StateChange) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *StateChange) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.DataTrieChanges) > 0 { + for iNdEx := len(m.DataTrieChanges) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.DataTrieChanges[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintStateChange(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x3a + } + } + if len(m.Operation) > 0 { + i -= len(m.Operation) + copy(dAtA[i:], m.Operation) + i = encodeVarintStateChange(dAtA, i, uint64(len(m.Operation))) + i-- + dAtA[i] = 0x32 + } + if len(m.MainTrieVal) > 0 { + i -= len(m.MainTrieVal) + copy(dAtA[i:], m.MainTrieVal) + i = encodeVarintStateChange(dAtA, i, uint64(len(m.MainTrieVal))) + i-- + dAtA[i] = 0x2a + } + if len(m.MainTrieKey) > 0 { + i -= len(m.MainTrieKey) + copy(dAtA[i:], m.MainTrieKey) + i = encodeVarintStateChange(dAtA, i, uint64(len(m.MainTrieKey))) + i-- + dAtA[i] = 0x22 + } + if len(m.TxHash) > 0 { + i -= len(m.TxHash) + copy(dAtA[i:], m.TxHash) + i = encodeVarintStateChange(dAtA, i, uint64(len(m.TxHash))) + i-- + dAtA[i] = 0x1a + } + if m.Index != 0 { + i = encodeVarintStateChange(dAtA, i, uint64(m.Index)) + i-- + dAtA[i] = 0x10 + } + if len(m.Type) > 0 { + i -= len(m.Type) + copy(dAtA[i:], m.Type) + i = encodeVarintStateChange(dAtA, i, uint64(len(m.Type))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *DataTrieChange) 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 *DataTrieChange) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *DataTrieChange) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Val) > 0 { + i -= len(m.Val) + copy(dAtA[i:], m.Val) + i = encodeVarintStateChange(dAtA, i, uint64(len(m.Val))) + i-- + dAtA[i] = 0x1a + } + if len(m.Key) > 0 { + i -= len(m.Key) + copy(dAtA[i:], m.Key) + i = encodeVarintStateChange(dAtA, i, uint64(len(m.Key))) + i-- + dAtA[i] = 0x12 + } + if len(m.Type) > 0 { + i -= len(m.Type) + copy(dAtA[i:], m.Type) + i = encodeVarintStateChange(dAtA, i, uint64(len(m.Type))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func encodeVarintStateChange(dAtA []byte, offset int, v uint64) int { + offset -= sovStateChange(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *StateChange) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Type) + if l > 0 { + n += 1 + l + sovStateChange(uint64(l)) + } + if m.Index != 0 { + n += 1 + sovStateChange(uint64(m.Index)) + } + l = len(m.TxHash) + if l > 0 { + n += 1 + l + sovStateChange(uint64(l)) + } + l = len(m.MainTrieKey) + if l > 0 { + n += 1 + l + sovStateChange(uint64(l)) + } + l = len(m.MainTrieVal) + if l > 0 { + n += 1 + l + sovStateChange(uint64(l)) + } + l = len(m.Operation) + if l > 0 { + n += 1 + l + sovStateChange(uint64(l)) + } + if len(m.DataTrieChanges) > 0 { + for _, e := range m.DataTrieChanges { + l = e.Size() + n += 1 + l + sovStateChange(uint64(l)) + } + } + return n +} + +func (m *DataTrieChange) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Type) + if l > 0 { + n += 1 + l + sovStateChange(uint64(l)) + } + l = len(m.Key) + if l > 0 { + n += 1 + l + sovStateChange(uint64(l)) + } + l = len(m.Val) + if l > 0 { + n += 1 + l + sovStateChange(uint64(l)) + } + return n +} + +func sovStateChange(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozStateChange(x uint64) (n int) { + return sovStateChange(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (this *StateChange) String() string { + if this == nil { + return "nil" + } + repeatedStringForDataTrieChanges := "[]*DataTrieChange{" + for _, f := range this.DataTrieChanges { + repeatedStringForDataTrieChanges += strings.Replace(f.String(), "DataTrieChange", "DataTrieChange", 1) + "," + } + repeatedStringForDataTrieChanges += "}" + s := strings.Join([]string{`&StateChange{`, + `Type:` + fmt.Sprintf("%v", this.Type) + `,`, + `Index:` + fmt.Sprintf("%v", this.Index) + `,`, + `TxHash:` + fmt.Sprintf("%v", this.TxHash) + `,`, + `MainTrieKey:` + fmt.Sprintf("%v", this.MainTrieKey) + `,`, + `MainTrieVal:` + fmt.Sprintf("%v", this.MainTrieVal) + `,`, + `Operation:` + fmt.Sprintf("%v", this.Operation) + `,`, + `DataTrieChanges:` + repeatedStringForDataTrieChanges + `,`, + `}`, + }, "") + return s +} +func (this *DataTrieChange) String() string { + if this == nil { + return "nil" + } + s := strings.Join([]string{`&DataTrieChange{`, + `Type:` + fmt.Sprintf("%v", this.Type) + `,`, + `Key:` + fmt.Sprintf("%v", this.Key) + `,`, + `Val:` + fmt.Sprintf("%v", this.Val) + `,`, + `}`, + }, "") + return s +} +func valueToStringStateChange(v interface{}) string { + rv := reflect.ValueOf(v) + if rv.IsNil() { + return "nil" + } + pv := reflect.Indirect(rv).Interface() + return fmt.Sprintf("*%v", pv) +} +func (m *StateChange) 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 ErrIntOverflowStateChange + } + 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: StateChange: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: StateChange: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Type", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStateChange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthStateChange + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthStateChange + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Type = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Index", wireType) + } + m.Index = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStateChange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Index |= int32(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TxHash", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStateChange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthStateChange + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthStateChange + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.TxHash = append(m.TxHash[:0], dAtA[iNdEx:postIndex]...) + if m.TxHash == nil { + m.TxHash = []byte{} + } + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MainTrieKey", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStateChange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthStateChange + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthStateChange + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.MainTrieKey = append(m.MainTrieKey[:0], dAtA[iNdEx:postIndex]...) + if m.MainTrieKey == nil { + m.MainTrieKey = []byte{} + } + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MainTrieVal", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStateChange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthStateChange + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthStateChange + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.MainTrieVal = append(m.MainTrieVal[:0], dAtA[iNdEx:postIndex]...) + if m.MainTrieVal == nil { + m.MainTrieVal = []byte{} + } + iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Operation", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStateChange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthStateChange + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthStateChange + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Operation = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DataTrieChanges", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStateChange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthStateChange + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthStateChange + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.DataTrieChanges = append(m.DataTrieChanges, &DataTrieChange{}) + if err := m.DataTrieChanges[len(m.DataTrieChanges)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipStateChange(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthStateChange + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthStateChange + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *DataTrieChange) 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 ErrIntOverflowStateChange + } + 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: DataTrieChange: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: DataTrieChange: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Type", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStateChange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthStateChange + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthStateChange + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Type = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Key", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStateChange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthStateChange + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthStateChange + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Key = append(m.Key[:0], dAtA[iNdEx:postIndex]...) + if m.Key == nil { + m.Key = []byte{} + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Val", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStateChange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthStateChange + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthStateChange + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Val = append(m.Val[:0], dAtA[iNdEx:postIndex]...) + if m.Val == nil { + m.Val = []byte{} + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipStateChange(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthStateChange + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthStateChange + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipStateChange(dAtA []byte) (n int, err error) { + l := len(dAtA) + iNdEx := 0 + depth := 0 + for iNdEx < l { + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowStateChange + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + wireType := int(wire & 0x7) + switch wireType { + case 0: + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowStateChange + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + iNdEx++ + if dAtA[iNdEx-1] < 0x80 { + break + } + } + case 1: + iNdEx += 8 + case 2: + var length int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowStateChange + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + length |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if length < 0 { + return 0, ErrInvalidLengthStateChange + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupStateChange + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthStateChange + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthStateChange = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowStateChange = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupStateChange = fmt.Errorf("proto: unexpected end of group") +) diff --git a/data/stateChange/stateChange.proto b/data/stateChange/stateChange.proto new file mode 100644 index 00000000..24040fbe --- /dev/null +++ b/data/stateChange/stateChange.proto @@ -0,0 +1,24 @@ +syntax = "proto3"; + +package proto; + +option go_package = "github.com/multiversx/mx-chain-core-go/data/stateChange;stateChange"; +option (gogoproto.stable_marshaler_all) = true; + +import "github.com/gogo/protobuf/gogoproto/gogo.proto"; + +message StateChange { + string Type = 1 [(gogoproto.jsontag) = "type"]; + int32 Index = 2 [(gogoproto.jsontag) = "-"]; + bytes TxHash = 3 [(gogoproto.jsontag) = "-"]; + bytes MainTrieKey = 4 [(gogoproto.jsontag) = "-"]; + bytes MainTrieVal = 5 [(gogoproto.jsontag) = "-"]; + string Operation = 6 [(gogoproto.jsontag) = "operation"]; + repeated DataTrieChange DataTrieChanges = 7 [(gogoproto.jsontag) = "dataTrieChanges,omitempty"]; +} + +message DataTrieChange { + string Type = 1 [(gogoproto.jsontag) = "type"]; + bytes Key = 2 [(gogoproto.jsontag) = "type"]; + bytes Val = 3 [(gogoproto.jsontag) = "type"]; +} \ No newline at end of file From e92c50b7ee56e814e99c5459d0597e57baca9b69 Mon Sep 17 00:00:00 2001 From: Alexander Cristurean Date: Thu, 5 Sep 2024 13:37:48 +0300 Subject: [PATCH 02/14] added setter to state changes. --- data/stateChange/stateChange.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 data/stateChange/stateChange.go diff --git a/data/stateChange/stateChange.go b/data/stateChange/stateChange.go new file mode 100644 index 00000000..236dbb7e --- /dev/null +++ b/data/stateChange/stateChange.go @@ -0,0 +1,13 @@ +//go:generate protoc -I=. -I=$GOPATH/src -I=$GOPATH/src/github.com/multiversx/protobuf/protobuf --gogoslick_out=$GOPATH/src stateChange.proto + +package stateChange + +// SetTxHash will set the tx hash with a provided value +func (sc *StateChange) SetTxHash(txHash []byte) { + sc.TxHash = txHash +} + +// SetIndex will set the index with a provided value +func (sc *StateChange) SetIndex(index int32) { + sc.Index = index +} From 94231b5398d00ad203e0597c6d4df148cf369e6b Mon Sep 17 00:00:00 2001 From: Alexander Cristurean Date: Thu, 5 Sep 2024 14:29:28 +0300 Subject: [PATCH 03/14] added casting to int32 in order to not modify current interface contracts. --- data/stateChange/stateChange.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/stateChange/stateChange.go b/data/stateChange/stateChange.go index 236dbb7e..4d751a08 100644 --- a/data/stateChange/stateChange.go +++ b/data/stateChange/stateChange.go @@ -8,6 +8,6 @@ func (sc *StateChange) SetTxHash(txHash []byte) { } // SetIndex will set the index with a provided value -func (sc *StateChange) SetIndex(index int32) { - sc.Index = index +func (sc *StateChange) SetIndex(index int) { + sc.Index = int32(index) } From 3e9985d6cb804572dd9a50d00cd1c9622255c6b3 Mon Sep 17 00:00:00 2001 From: Alexander Cristurean Date: Thu, 5 Sep 2024 14:43:58 +0300 Subject: [PATCH 04/14] Revert "added casting to int32 in order to not modify current interface contracts." This reverts commit 94231b5398d00ad203e0597c6d4df148cf369e6b. --- data/stateChange/stateChange.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/stateChange/stateChange.go b/data/stateChange/stateChange.go index 4d751a08..236dbb7e 100644 --- a/data/stateChange/stateChange.go +++ b/data/stateChange/stateChange.go @@ -8,6 +8,6 @@ func (sc *StateChange) SetTxHash(txHash []byte) { } // SetIndex will set the index with a provided value -func (sc *StateChange) SetIndex(index int) { - sc.Index = int32(index) +func (sc *StateChange) SetIndex(index int32) { + sc.Index = index } From 4da59a927b441042b1cc55cb1ecea2b4c0e94cfe Mon Sep 17 00:00:00 2001 From: Alexander Cristurean Date: Fri, 6 Sep 2024 12:35:29 +0300 Subject: [PATCH 05/14] add map with value repeated in outport for state changes. --- data/outport/outportBlock.pb.go | 267 +++++++++++++------------- data/outport/outportBlock.proto | 22 +-- data/stateChange/stateChange.pb.go | 295 ++++++++++++++++++++++++++--- data/stateChange/stateChange.proto | 4 + 4 files changed, 415 insertions(+), 173 deletions(-) diff --git a/data/outport/outportBlock.pb.go b/data/outport/outportBlock.pb.go index 0b54f071..33a278c1 100644 --- a/data/outport/outportBlock.pb.go +++ b/data/outport/outportBlock.pb.go @@ -43,7 +43,7 @@ type OutportBlock struct { 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"` - StateChanges map[string]*stateChange.StateChange `protobuf:"bytes,6,rep,name=StateChanges,proto3" json:"stateChanges,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + StateChanges map[string]*stateChange.StateChangesForTx `protobuf:"bytes,6,rep,name=StateChanges,proto3" json:"stateChanges,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` NotarizedHeadersHashes []string `protobuf:"bytes,7,rep,name=NotarizedHeadersHashes,proto3" json:"notarizedHeadersHashes,omitempty"` NumberOfShards uint32 `protobuf:"varint,8,opt,name=NumberOfShards,proto3" json:"numberOfShards"` SignersIndexes []uint64 `protobuf:"varint,9,rep,packed,name=SignersIndexes,proto3" json:"signersIndexes,omitempty"` @@ -114,7 +114,7 @@ func (m *OutportBlock) GetAlteredAccounts() map[string]*alteredAccount.AlteredAc return nil } -func (m *OutportBlock) GetStateChanges() map[string]*stateChange.StateChange { +func (m *OutportBlock) GetStateChanges() map[string]*stateChange.StateChangesForTx { if m != nil { return m.StateChanges } @@ -1118,7 +1118,7 @@ func (m *Shard) GetShardID() uint32 { func init() { proto.RegisterType((*OutportBlock)(nil), "proto.OutportBlock") proto.RegisterMapType((map[string]*alteredAccount.AlteredAccount)(nil), "proto.OutportBlock.AlteredAccountsEntry") - proto.RegisterMapType((map[string]*stateChange.StateChange)(nil), "proto.OutportBlock.StateChangesEntry") + proto.RegisterMapType((map[string]*stateChange.StateChangesForTx)(nil), "proto.OutportBlock.StateChangesEntry") proto.RegisterType((*BlockData)(nil), "proto.BlockData") proto.RegisterType((*TransactionPool)(nil), "proto.TransactionPool") proto.RegisterMapType((map[string]*TxInfo)(nil), "proto.TransactionPool.InvalidTxsEntry") @@ -1148,131 +1148,132 @@ func init() { func init() { proto.RegisterFile("outportBlock.proto", fileDescriptor_661b95cef868af95) } var fileDescriptor_661b95cef868af95 = []byte{ - // 1980 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcd, 0x93, 0xdb, 0x48, - 0x15, 0x1f, 0xd9, 0x9e, 0xf1, 0xf8, 0xcd, 0x77, 0xef, 0x64, 0x50, 0x26, 0xac, 0x35, 0x38, 0xc9, - 0xe2, 0x22, 0xc4, 0x66, 0xb3, 0x29, 0x2a, 0x95, 0xd4, 0x16, 0x44, 0x93, 0x2f, 0x93, 0x8f, 0x99, - 0x92, 0x07, 0x96, 0x6c, 0x51, 0x05, 0xb2, 0xd5, 0x23, 0xab, 0x62, 0xab, 0x8d, 0xd4, 0x1e, 0x6c, - 0x2e, 0x70, 0x62, 0x39, 0xb0, 0x55, 0x1c, 0xb9, 0x71, 0xa5, 0x38, 0x70, 0xe5, 0x3f, 0xa0, 0x38, - 0x51, 0x39, 0x51, 0x39, 0x09, 0x32, 0xb9, 0x50, 0x3a, 0x50, 0x7b, 0xdb, 0x2b, 0xa5, 0xee, 0x96, - 0xd5, 0x92, 0x35, 0x5b, 0x9e, 0xc0, 0x16, 0x97, 0xb1, 0xf4, 0x3e, 0x7e, 0xaf, 0xdf, 0x47, 0xbf, - 0x7e, 0xad, 0x01, 0x44, 0x46, 0x74, 0x48, 0x3c, 0xaa, 0xf7, 0x49, 0xf7, 0x45, 0x63, 0xe8, 0x11, - 0x4a, 0xd0, 0x22, 0xfb, 0xd9, 0xbd, 0x6e, 0x3b, 0xb4, 0x37, 0xea, 0x34, 0xba, 0x64, 0xd0, 0xb4, - 0x89, 0x4d, 0x9a, 0x8c, 0xdc, 0x19, 0x1d, 0xb3, 0x37, 0xf6, 0xc2, 0x9e, 0xb8, 0xd6, 0xee, 0x87, - 0x92, 0xf8, 0x60, 0xd4, 0xa7, 0xce, 0x09, 0xf6, 0xfc, 0x71, 0x73, 0x30, 0xbe, 0xde, 0xed, 0x99, - 0x8e, 0x7b, 0xbd, 0x4b, 0x3c, 0x7c, 0xdd, 0x26, 0x4d, 0xcb, 0xa4, 0x66, 0xb3, 0x13, 0x99, 0xe3, - 0x7f, 0x85, 0xfa, 0xdd, 0xf3, 0xa8, 0x53, 0xcf, 0x74, 0x7d, 0xb3, 0x4b, 0x1d, 0xe2, 0x36, 0xfb, - 0xc4, 0x16, 0x10, 0xad, 0xb7, 0x85, 0x90, 0x9e, 0x05, 0xd4, 0xf3, 0xf3, 0x40, 0xf9, 0x03, 0xd3, - 0xa3, 0xfb, 0xc4, 0xa5, 0x9e, 0xd9, 0xa5, 0x06, 0xf6, 0x47, 0x7d, 0x9a, 0x47, 0x7b, 0x1b, 0x47, - 0x3d, 0xdc, 0xc5, 0xce, 0x90, 0xc6, 0xbf, 0x02, 0x62, 0xff, 0x7c, 0x10, 0x3f, 0x33, 0x3d, 0xeb, - 0x68, 0x3c, 0x7d, 0x10, 0x20, 0x07, 0xe7, 0x01, 0x31, 0xfb, 0x14, 0x7b, 0xd8, 0xba, 0xdb, 0xed, - 0x92, 0x91, 0x4b, 0x33, 0xaf, 0x6f, 0x13, 0x7e, 0x9f, 0x9a, 0x14, 0xef, 0xf7, 0x4c, 0xd7, 0xc6, - 0xf2, 0x33, 0x87, 0xaa, 0x7d, 0xbe, 0x0c, 0xab, 0x07, 0x52, 0x61, 0xa2, 0x26, 0x94, 0xdb, 0x3d, - 0xd3, 0xb3, 0x5a, 0xf7, 0x54, 0x65, 0x4f, 0xa9, 0xaf, 0xe9, 0x17, 0xc2, 0x40, 0xdb, 0xf2, 0x39, - 0xe9, 0x9b, 0x64, 0xe0, 0x50, 0x3c, 0x18, 0xd2, 0x89, 0x11, 0x4b, 0xa1, 0x87, 0x50, 0x61, 0x9a, - 0xf7, 0x4c, 0x6a, 0xaa, 0x85, 0x3d, 0xa5, 0xbe, 0x72, 0x63, 0x93, 0x83, 0x37, 0xa6, 0x74, 0xfd, - 0x2b, 0x61, 0xa0, 0xbd, 0xd3, 0x89, 0x5f, 0x25, 0x98, 0x44, 0x17, 0xfd, 0x18, 0x36, 0x8e, 0x92, - 0xf2, 0x38, 0x24, 0xa4, 0xaf, 0x16, 0x19, 0xdc, 0x8e, 0x80, 0xcb, 0x70, 0xf5, 0x77, 0xc3, 0x40, - 0xbb, 0x48, 0xd3, 0x44, 0x09, 0x3a, 0x8b, 0x86, 0x7c, 0xd8, 0x7e, 0x84, 0x4d, 0x0b, 0x7b, 0x0f, - 0x4d, 0x7f, 0x9f, 0xb8, 0xfe, 0x68, 0x30, 0x8c, 0x78, 0x6a, 0x89, 0x59, 0xb9, 0x24, 0xac, 0xe4, - 0x89, 0xe8, 0xb5, 0x30, 0xd0, 0xaa, 0xbd, 0x1c, 0x8e, 0x64, 0x2f, 0x17, 0x1c, 0xfd, 0x14, 0x36, - 0xee, 0xa6, 0x72, 0xe8, 0xab, 0x8b, 0x7b, 0xc5, 0xfa, 0xca, 0x8d, 0xba, 0xb0, 0x27, 0x47, 0xbf, - 0x91, 0x11, 0xbd, 0xef, 0x52, 0x6f, 0xc2, 0xfd, 0x4c, 0x17, 0x82, 0x2f, 0xfb, 0x99, 0x51, 0x42, - 0x18, 0x56, 0xdb, 0x49, 0xa2, 0x7d, 0x75, 0x89, 0xd9, 0xbb, 0x9a, 0x67, 0x4f, 0x96, 0xe3, 0xc6, - 0x76, 0xc3, 0x40, 0xdb, 0x91, 0xea, 0x44, 0xb6, 0x94, 0x82, 0x45, 0x3f, 0x82, 0x9d, 0x67, 0x84, - 0x9a, 0x9e, 0xf3, 0x73, 0x6c, 0x71, 0xd7, 0xfd, 0x47, 0xa6, 0xdf, 0xc3, 0xbe, 0x5a, 0xde, 0x2b, - 0xd6, 0x2b, 0xfa, 0x95, 0x30, 0xd0, 0xf6, 0xdc, 0x5c, 0x09, 0x09, 0xf3, 0x0c, 0x0c, 0x74, 0x1b, - 0xd6, 0x9f, 0x8d, 0x06, 0x1d, 0xec, 0x1d, 0x1c, 0xb3, 0x4a, 0xf3, 0xd5, 0x65, 0x56, 0x8e, 0x28, - 0x0c, 0xb4, 0x75, 0x37, 0xc5, 0x31, 0x32, 0x92, 0xe8, 0x1e, 0xac, 0xb7, 0x1d, 0xdb, 0xc5, 0x9e, - 0xdf, 0x72, 0x2d, 0x3c, 0xc6, 0xbe, 0x5a, 0xd9, 0x2b, 0xd6, 0x4b, 0xfa, 0x57, 0xc3, 0x40, 0x53, - 0xfd, 0x14, 0x47, 0x5a, 0x49, 0x46, 0x07, 0x19, 0xb0, 0xf3, 0xc8, 0xb1, 0x7b, 0xd8, 0xa7, 0x0f, - 0x1c, 0xd7, 0xec, 0xb3, 0x80, 0x3d, 0x23, 0x6e, 0x17, 0xab, 0xb0, 0xa7, 0xd4, 0x4b, 0x3c, 0x52, - 0xbd, 0x5c, 0x09, 0xe3, 0x0c, 0x4d, 0xf4, 0x1c, 0x2e, 0xcc, 0x70, 0x22, 0x87, 0xd5, 0x95, 0x3d, - 0xa5, 0xbe, 0xaa, 0x5f, 0x0e, 0x03, 0x4d, 0xeb, 0xe5, 0x09, 0x48, 0xeb, 0xcc, 0x47, 0xd8, 0x7d, - 0x0e, 0xdb, 0x79, 0xd5, 0x83, 0x36, 0xa1, 0xf8, 0x02, 0x4f, 0xd8, 0x66, 0xae, 0x18, 0xd1, 0x23, - 0xba, 0x06, 0x8b, 0x27, 0x66, 0x7f, 0x84, 0xc5, 0x6e, 0xbd, 0x20, 0x0a, 0x23, 0xad, 0x6d, 0x70, - 0x99, 0xdb, 0x85, 0x5b, 0xca, 0x6e, 0x1b, 0xb6, 0x66, 0x0a, 0x25, 0x07, 0xb7, 0x9e, 0xc6, 0x45, - 0x02, 0x57, 0x52, 0x95, 0x40, 0x6b, 0xbf, 0x29, 0x4a, 0x8d, 0xe3, 0xfc, 0x6d, 0xe7, 0x0e, 0xac, - 0xf0, 0x82, 0xd1, 0x27, 0x14, 0xfb, 0xcc, 0xe4, 0xaa, 0x7e, 0x31, 0x0c, 0xb4, 0x0b, 0xbd, 0x84, - 0x2c, 0x29, 0xca, 0xd2, 0xe8, 0x16, 0x00, 0x7f, 0x3d, 0x9a, 0x0c, 0x31, 0xeb, 0x32, 0x15, 0x5d, - 0x0d, 0x03, 0x6d, 0xbb, 0x37, 0xa5, 0x4a, 0xaa, 0x92, 0x6c, 0xa2, 0xc9, 0xb2, 0x56, 0x62, 0x56, - 0x25, 0xcd, 0x4c, 0xaa, 0x24, 0x59, 0xf4, 0x01, 0x94, 0x74, 0x62, 0x4d, 0xd4, 0x45, 0x16, 0x9c, - 0x95, 0xb8, 0x45, 0x12, 0x6b, 0xc2, 0x6b, 0xba, 0x43, 0xac, 0x89, 0xa4, 0xca, 0x84, 0x51, 0x0f, - 0xb6, 0x5b, 0xd1, 0xc9, 0xc6, 0xbc, 0x7e, 0xea, 0xb8, 0x0e, 0x8b, 0x58, 0xbc, 0xa5, 0xe3, 0x3e, - 0x3b, 0x65, 0xf0, 0x3e, 0xe5, 0xe4, 0x68, 0xc8, 0x7d, 0x2a, 0x0f, 0xb1, 0xf6, 0x09, 0xcc, 0xb4, - 0x5f, 0xd4, 0x83, 0x55, 0x89, 0xe4, 0xab, 0x4a, 0xaa, 0x71, 0x65, 0xa4, 0xe5, 0x77, 0xb9, 0x97, - 0x48, 0x0d, 0x3a, 0xd5, 0x4b, 0x64, 0x71, 0xf4, 0x6b, 0x05, 0xb6, 0xdb, 0xb3, 0x07, 0x79, 0x94, - 0xd7, 0xc8, 0xe4, 0xb7, 0xce, 0x30, 0x99, 0xa7, 0xc2, 0x4d, 0xb3, 0x40, 0xe4, 0x8c, 0x06, 0xa9, - 0x40, 0xe4, 0xa9, 0xa3, 0x23, 0x28, 0x1b, 0xec, 0xfc, 0xf6, 0xd5, 0x22, 0x33, 0x7e, 0xf9, 0x0c, - 0xe3, 0x42, 0x8a, 0xdb, 0x63, 0xe5, 0xca, 0xcf, 0x7d, 0xd9, 0x44, 0x0c, 0x85, 0x7e, 0x08, 0xcb, - 0x06, 0x9f, 0x2c, 0x7c, 0xb5, 0xc4, 0x60, 0xaf, 0x9c, 0x09, 0xcb, 0xc5, 0x38, 0xee, 0x4e, 0x18, - 0x68, 0x48, 0xcc, 0x24, 0x32, 0xf0, 0x14, 0x0d, 0xfd, 0x04, 0xa0, 0xe5, 0x9e, 0x98, 0x7d, 0xc7, - 0x3a, 0x1a, 0xc7, 0x67, 0xcb, 0x7b, 0x67, 0x60, 0x27, 0x82, 0x1c, 0x9d, 0x55, 0xae, 0x33, 0x25, - 0xca, 0x95, 0x9b, 0x88, 0xa2, 0x6f, 0x43, 0xe9, 0x09, 0xb1, 0xe3, 0xa2, 0x5b, 0x17, 0xd8, 0x4f, - 0x88, 0xcd, 0x8e, 0x76, 0x56, 0xbc, 0x7d, 0x62, 0xcb, 0xda, 0x4c, 0x1e, 0xfd, 0x4a, 0x81, 0x2b, - 0xed, 0x6e, 0x0f, 0x5b, 0xa3, 0x3e, 0xb6, 0xee, 0x8f, 0x71, 0x77, 0x44, 0xb1, 0xd5, 0xde, 0x37, - 0xda, 0xbc, 0xc5, 0x1f, 0x7a, 0xf8, 0x84, 0x15, 0x9f, 0x38, 0x2f, 0x6e, 0x84, 0x81, 0xd6, 0xf0, - 0xe7, 0x90, 0x97, 0x0c, 0xcd, 0x85, 0x8f, 0x7e, 0xa7, 0xc0, 0x37, 0x66, 0x04, 0x13, 0x07, 0xb3, - 0xcb, 0x59, 0x66, 0xcb, 0xb9, 0x15, 0x06, 0xda, 0x4d, 0x7f, 0x6e, 0x2d, 0x69, 0x51, 0xe7, 0xb0, - 0xb5, 0xfb, 0x0c, 0xb6, 0x66, 0xf6, 0x4d, 0x4e, 0x6b, 0xbd, 0x9c, 0x6e, 0xad, 0x6b, 0x71, 0x7e, - 0xc7, 0x2d, 0xf7, 0x98, 0xc8, 0xad, 0xfa, 0x23, 0xb8, 0x78, 0xe6, 0xa6, 0xc8, 0xc1, 0xbd, 0x92, - 0xc6, 0x8d, 0x73, 0xdb, 0xde, 0x37, 0xb2, 0xc0, 0x4f, 0x61, 0x55, 0x2e, 0xf8, 0x1c, 0xac, 0xaf, - 0xa7, 0xb1, 0xb6, 0x04, 0x16, 0xd7, 0xca, 0xc2, 0x3d, 0x86, 0xb5, 0x54, 0xa1, 0xcf, 0xbf, 0x36, - 0xa1, 0x26, 0x83, 0x3d, 0x81, 0x8d, 0x4c, 0x65, 0xff, 0x17, 0x21, 0xac, 0xfd, 0xa9, 0x00, 0xe5, - 0x07, 0x18, 0x47, 0x64, 0x74, 0x15, 0xca, 0x0f, 0x4d, 0xff, 0xfb, 0x3e, 0xb6, 0x18, 0x54, 0x49, - 0x5f, 0x09, 0x03, 0xad, 0x6c, 0x73, 0x92, 0x11, 0xf3, 0x50, 0x1f, 0x8a, 0x0f, 0x30, 0x16, 0x87, - 0xd0, 0xc7, 0x61, 0xa0, 0xad, 0x1d, 0x63, 0xe9, 0x04, 0xf9, 0xe3, 0x3f, 0xb4, 0xfb, 0x03, 0x93, - 0xf6, 0x9a, 0x1d, 0xc7, 0x6e, 0xb4, 0x5c, 0x7a, 0xe7, 0x1c, 0xf3, 0x7b, 0x43, 0x77, 0xec, 0x96, - 0x4b, 0xf7, 0x4d, 0x9f, 0x62, 0xcf, 0x88, 0xcc, 0xa0, 0x4f, 0x15, 0x58, 0x6f, 0xb9, 0x0e, 0x75, - 0xcc, 0xfe, 0xa1, 0xe9, 0x58, 0x91, 0xe5, 0x22, 0xb3, 0x8c, 0xa3, 0xf9, 0xc6, 0x49, 0x71, 0xbe, - 0x8c, 0x45, 0x64, 0x8c, 0xd7, 0xfe, 0xae, 0xc0, 0x12, 0x0f, 0x23, 0x3a, 0x80, 0x15, 0xa9, 0x9c, - 0x59, 0xcc, 0x92, 0x41, 0x40, 0xe2, 0xf0, 0x93, 0x5a, 0x3a, 0x1a, 0xe4, 0x93, 0x5a, 0x92, 0x43, - 0xdf, 0x99, 0xe6, 0x22, 0x53, 0x06, 0x82, 0xca, 0x1b, 0xef, 0x31, 0x7f, 0x91, 0x1b, 0x6f, 0x9c, - 0xc1, 0xdb, 0xb0, 0xce, 0x77, 0xa1, 0x43, 0xdc, 0x03, 0xcf, 0xc2, 0x1e, 0x8b, 0x95, 0x98, 0x23, - 0x71, 0x8a, 0x63, 0x64, 0x24, 0x6b, 0x9f, 0x2b, 0x50, 0x16, 0x5b, 0x01, 0x11, 0x78, 0x27, 0x67, - 0x63, 0x09, 0x0f, 0x77, 0xe3, 0x7d, 0x33, 0x2b, 0xa1, 0x7f, 0x2d, 0x0c, 0xb4, 0x77, 0x73, 0x4e, - 0x22, 0x69, 0xb1, 0x79, 0xc8, 0xff, 0x5f, 0xcf, 0x8f, 0xa0, 0x2c, 0xfa, 0x3b, 0xaa, 0x45, 0xc9, - 0x65, 0xd3, 0x0e, 0xdb, 0x4c, 0x3a, 0x84, 0x81, 0xb6, 0x44, 0x19, 0xc5, 0x10, 0x1c, 0x74, 0x15, - 0x8a, 0x4f, 0x88, 0x2d, 0xd6, 0x09, 0xc9, 0x01, 0xa1, 0x97, 0xc3, 0x40, 0x2b, 0xf6, 0x89, 0x6d, - 0x44, 0xfc, 0xda, 0x27, 0x0a, 0x40, 0xd2, 0x0e, 0xd0, 0x87, 0xb0, 0xc4, 0xdf, 0x44, 0x14, 0x37, - 0x52, 0x1d, 0xe3, 0x68, 0xac, 0x6f, 0x87, 0x81, 0xb6, 0xc9, 0x0f, 0x55, 0xc9, 0x41, 0xa1, 0x94, - 0xe3, 0x5f, 0x61, 0x6e, 0xff, 0xfe, 0xad, 0xe4, 0xdf, 0x05, 0xd1, 0xfb, 0xb0, 0xf2, 0xd0, 0xf4, - 0x0f, 0x3d, 0x72, 0xe2, 0x58, 0xd3, 0x4d, 0xbf, 0x11, 0x06, 0xda, 0x8a, 0x9d, 0x90, 0x0d, 0x59, - 0x46, 0xa8, 0x18, 0xf8, 0x78, 0xe4, 0x46, 0x2a, 0x85, 0x94, 0x4a, 0x4c, 0x36, 0x64, 0x19, 0x74, - 0x13, 0x56, 0x23, 0x04, 0xec, 0x9a, 0xfd, 0xe8, 0xe6, 0xc3, 0x12, 0x53, 0xd2, 0x37, 0xc3, 0x40, - 0x5b, 0xb5, 0x25, 0xba, 0x91, 0x92, 0x8a, 0x1c, 0x7e, 0x6a, 0x8e, 0x19, 0xc9, 0xe3, 0x27, 0x55, - 0x89, 0xe9, 0x31, 0x87, 0x07, 0x29, 0x8e, 0x91, 0x91, 0xac, 0x1d, 0xc3, 0x3b, 0x3f, 0x88, 0x1a, - 0xa4, 0x49, 0x89, 0x67, 0x98, 0xd4, 0x71, 0x6d, 0x96, 0x82, 0x6b, 0x50, 0x39, 0x1c, 0x75, 0xfa, - 0x4e, 0xf7, 0x71, 0xdc, 0x2c, 0xf5, 0xb5, 0x30, 0xd0, 0x2a, 0xc3, 0x98, 0x68, 0x24, 0xfc, 0xa8, - 0x12, 0xb8, 0x2a, 0xf3, 0xb1, 0xc0, 0x2b, 0xc1, 0x63, 0x14, 0x43, 0x70, 0x6a, 0x7f, 0x53, 0x60, - 0x73, 0x6a, 0xc8, 0xe7, 0xc4, 0xa8, 0x8b, 0xa6, 0x87, 0x7b, 0xd6, 0x45, 0xc5, 0x70, 0x9f, 0x8c, - 0xf4, 0x1a, 0x2c, 0xde, 0x1f, 0x92, 0x6e, 0x4f, 0xe4, 0xb1, 0x12, 0x06, 0xda, 0x22, 0x8e, 0x08, - 0x06, 0xa7, 0x23, 0x0f, 0xb6, 0xb3, 0xd8, 0x6c, 0x7f, 0xf0, 0x39, 0x2d, 0xde, 0x84, 0x39, 0x7e, - 0xf2, 0x71, 0xf0, 0x24, 0x47, 0x57, 0x1e, 0x07, 0xf3, 0xb0, 0x6b, 0xbf, 0x2f, 0x40, 0xc5, 0x20, - 0x23, 0x97, 0x97, 0xac, 0x06, 0x8b, 0xec, 0x45, 0x14, 0x06, 0x5b, 0xa2, 0x17, 0x11, 0x0c, 0x4e, - 0x8f, 0x72, 0x94, 0xb9, 0x7a, 0x16, 0xd8, 0xd5, 0x93, 0xe5, 0x28, 0x7d, 0xf5, 0x9c, 0xb9, 0x70, - 0x7e, 0x17, 0x36, 0x59, 0xb2, 0x3e, 0x62, 0xc5, 0x35, 0x24, 0xbe, 0xa8, 0x8c, 0x65, 0xbe, 0x11, - 0x3a, 0x19, 0x9e, 0x31, 0x23, 0x9d, 0x04, 0xda, 0x62, 0xa5, 0x91, 0x0a, 0xb4, 0x15, 0x07, 0xda, - 0x4a, 0x02, 0xbd, 0x78, 0x46, 0xa0, 0xaf, 0x41, 0xe5, 0xc8, 0x19, 0x60, 0x9f, 0x9a, 0x83, 0xa1, - 0xba, 0xc4, 0x5c, 0x65, 0x65, 0x41, 0x63, 0xa2, 0x91, 0xf0, 0x6b, 0xbf, 0x00, 0x60, 0xbe, 0xfb, - 0xf1, 0x89, 0x39, 0x4f, 0xae, 0xbf, 0x27, 0x2b, 0x89, 0x29, 0x3f, 0xbe, 0xce, 0x4c, 0xc3, 0xcd, - 0xe7, 0x53, 0x6f, 0x2a, 0x27, 0xcf, 0xa7, 0x89, 0x76, 0xed, 0x7d, 0x28, 0x1f, 0x8e, 0x3a, 0x8f, - 0xf1, 0xc4, 0x47, 0xef, 0x41, 0x29, 0xfa, 0x65, 0x37, 0x95, 0x55, 0x1e, 0xf4, 0x17, 0x78, 0x92, - 0x1a, 0x4d, 0x23, 0x7e, 0xed, 0x2f, 0x05, 0xd8, 0x4a, 0xd2, 0x1d, 0x6b, 0xcf, 0xb9, 0xf6, 0x4f, - 0x15, 0xd8, 0x61, 0xcf, 0x33, 0x08, 0xc2, 0x91, 0x9b, 0xd9, 0x4a, 0x8c, 0xf9, 0x8d, 0x7c, 0x35, - 0x3e, 0x8c, 0x6b, 0x61, 0xa0, 0x5d, 0x3a, 0xc9, 0xf2, 0xe4, 0x4f, 0x25, 0xf9, 0xda, 0x49, 0x3a, - 0x8b, 0xf9, 0xe9, 0xdc, 0x7d, 0x0e, 0x97, 0xbe, 0xc0, 0xb0, 0x3c, 0x2b, 0xad, 0x7d, 0xe1, 0xe8, - 0x25, 0xb4, 0xe4, 0x61, 0xe9, 0xcf, 0x05, 0x58, 0x9e, 0x7e, 0x78, 0x9a, 0x33, 0x7e, 0xb7, 0x61, - 0x9d, 0x55, 0x6e, 0x52, 0x62, 0x85, 0xa4, 0x8f, 0x75, 0x52, 0x1c, 0x23, 0x23, 0x89, 0x06, 0xb3, - 0x9f, 0xd3, 0x8a, 0xa9, 0xeb, 0x54, 0x4c, 0xfe, 0x9f, 0x7c, 0x4a, 0xfb, 0x12, 0x3f, 0xaa, 0xd4, - 0x6c, 0x58, 0x67, 0x5f, 0x70, 0xa2, 0xd6, 0xce, 0xaf, 0x29, 0x73, 0x86, 0xaf, 0x91, 0xfa, 0x04, - 0xc1, 0x67, 0xce, 0xf5, 0x30, 0xd0, 0x20, 0xf9, 0x04, 0x21, 0x7f, 0x78, 0xa8, 0x35, 0x60, 0x91, - 0xa9, 0xce, 0x89, 0xaf, 0x8f, 0x5e, 0xbe, 0xae, 0x2e, 0xbc, 0x7a, 0x5d, 0x5d, 0xf8, 0xec, 0x75, - 0x55, 0xf9, 0xe5, 0x69, 0x55, 0xf9, 0xc3, 0x69, 0x55, 0xf9, 0xeb, 0x69, 0x55, 0x79, 0x79, 0x5a, - 0x55, 0x5e, 0x9d, 0x56, 0x95, 0x7f, 0x9e, 0x56, 0x95, 0x7f, 0x9d, 0x56, 0x17, 0x3e, 0x3b, 0xad, - 0x2a, 0xbf, 0x7d, 0x53, 0x5d, 0x78, 0xf9, 0xa6, 0xba, 0xf0, 0xea, 0x4d, 0x75, 0xe1, 0xe3, 0xf3, - 0x8c, 0x94, 0x4d, 0xf1, 0xef, 0x90, 0x3b, 0xe2, 0xb7, 0xb3, 0xc4, 0x02, 0xf6, 0xc1, 0x7f, 0x02, - 0x00, 0x00, 0xff, 0xff, 0xf1, 0x3d, 0xe1, 0x4b, 0x28, 0x19, 0x00, 0x00, + // 1987 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcd, 0x6f, 0x1b, 0x5b, + 0x15, 0xcf, 0xd8, 0x4e, 0x1c, 0x1f, 0xe7, 0xf3, 0x36, 0x0d, 0xd3, 0x94, 0xe7, 0x09, 0x6e, 0xfb, + 0x88, 0x28, 0x75, 0x78, 0x7d, 0x15, 0xaa, 0x5a, 0x3d, 0x41, 0x27, 0xfd, 0x32, 0xfd, 0x48, 0x34, + 0x31, 0x3c, 0xf2, 0x84, 0x04, 0x63, 0xcf, 0xcd, 0x78, 0x54, 0x7b, 0xae, 0x99, 0xb9, 0x0e, 0x36, + 0x1b, 0x58, 0xf1, 0x58, 0xf0, 0x24, 0x96, 0xec, 0xd8, 0x22, 0x16, 0x6c, 0xf9, 0x0f, 0x10, 0x2b, + 0xd4, 0x15, 0xea, 0x6a, 0xa0, 0xe9, 0x06, 0xcd, 0x02, 0xbd, 0x1d, 0x2b, 0x24, 0x34, 0xf7, 0xde, + 0xf1, 0xdc, 0x19, 0x4f, 0x9e, 0x9c, 0x42, 0xc5, 0x26, 0x9e, 0x39, 0x1f, 0xbf, 0x73, 0xcf, 0xc7, + 0x3d, 0xf7, 0xdc, 0x09, 0x20, 0x32, 0xa4, 0x03, 0xe2, 0x51, 0xbd, 0x47, 0x3a, 0x2f, 0x1a, 0x03, + 0x8f, 0x50, 0x82, 0xe6, 0xd9, 0xcf, 0xd6, 0x0d, 0xdb, 0xa1, 0xdd, 0x61, 0xbb, 0xd1, 0x21, 0xfd, + 0x5d, 0x9b, 0xd8, 0x64, 0x97, 0x91, 0xdb, 0xc3, 0x63, 0xf6, 0xc6, 0x5e, 0xd8, 0x13, 0xd7, 0xda, + 0xfa, 0x48, 0x12, 0xef, 0x0f, 0x7b, 0xd4, 0x39, 0xc1, 0x9e, 0x3f, 0xda, 0xed, 0x8f, 0x6e, 0x74, + 0xba, 0xa6, 0xe3, 0xde, 0xe8, 0x10, 0x0f, 0xdf, 0xb0, 0xc9, 0xae, 0x65, 0x52, 0x73, 0xb7, 0x1d, + 0x99, 0xe3, 0x7f, 0x85, 0xfa, 0xbd, 0xf3, 0xa8, 0x53, 0xcf, 0x74, 0x7d, 0xb3, 0x43, 0x1d, 0xe2, + 0xee, 0xf6, 0x88, 0x2d, 0x20, 0x9a, 0x6f, 0x0b, 0x21, 0x3d, 0x0b, 0xa8, 0xa3, 0xf3, 0x40, 0xf9, + 0x7d, 0xd3, 0xa3, 0x7b, 0xc4, 0xa5, 0x9e, 0xd9, 0xa1, 0x06, 0xf6, 0x87, 0x3d, 0x9a, 0x47, 0x7b, + 0x1b, 0x47, 0x3d, 0xdc, 0xc1, 0xce, 0x80, 0xc6, 0xbf, 0x02, 0x62, 0xef, 0x7c, 0x10, 0x3f, 0x31, + 0x3d, 0xab, 0x35, 0x9a, 0x3c, 0x08, 0x90, 0xfd, 0xf3, 0x80, 0x98, 0x3d, 0x8a, 0x3d, 0x6c, 0xdd, + 0xeb, 0x74, 0xc8, 0xd0, 0xa5, 0x99, 0xd7, 0xb7, 0x09, 0xbf, 0x4f, 0x4d, 0x8a, 0xf7, 0xba, 0xa6, + 0x6b, 0x63, 0xf9, 0x99, 0x43, 0xd5, 0xff, 0xbd, 0x08, 0x4b, 0xfb, 0x52, 0x61, 0xa2, 0x5d, 0x28, + 0x1f, 0x76, 0x4d, 0xcf, 0x6a, 0xde, 0x57, 0x95, 0x6d, 0x65, 0x67, 0x59, 0xbf, 0x18, 0x06, 0xda, + 0xba, 0xcf, 0x49, 0x5f, 0x27, 0x7d, 0x87, 0xe2, 0xfe, 0x80, 0x8e, 0x8d, 0x58, 0x0a, 0x3d, 0x82, + 0x0a, 0xd3, 0xbc, 0x6f, 0x52, 0x53, 0x2d, 0x6c, 0x2b, 0x3b, 0xd5, 0x9b, 0x6b, 0x1c, 0xbc, 0x31, + 0xa1, 0xeb, 0x5f, 0x0a, 0x03, 0xed, 0x42, 0x3b, 0x7e, 0x95, 0x60, 0x12, 0x5d, 0xf4, 0x43, 0x58, + 0x6d, 0x25, 0xe5, 0x71, 0x40, 0x48, 0x4f, 0x2d, 0x32, 0xb8, 0x4d, 0x01, 0x97, 0xe1, 0xea, 0xef, + 0x85, 0x81, 0x76, 0x89, 0xa6, 0x89, 0x12, 0x74, 0x16, 0x0d, 0xf9, 0xb0, 0xf1, 0x18, 0x9b, 0x16, + 0xf6, 0x1e, 0x99, 0xfe, 0x1e, 0x71, 0xfd, 0x61, 0x7f, 0x10, 0xf1, 0xd4, 0x12, 0xb3, 0x72, 0x59, + 0x58, 0xc9, 0x13, 0xd1, 0xeb, 0x61, 0xa0, 0xd5, 0xba, 0x39, 0x1c, 0xc9, 0x5e, 0x2e, 0x38, 0xfa, + 0x31, 0xac, 0xde, 0x4b, 0xe5, 0xd0, 0x57, 0xe7, 0xb7, 0x8b, 0x3b, 0xd5, 0x9b, 0x3b, 0xc2, 0x9e, + 0x1c, 0xfd, 0x46, 0x46, 0xf4, 0x81, 0x4b, 0xbd, 0x31, 0xf7, 0x33, 0x5d, 0x08, 0xbe, 0xec, 0x67, + 0x46, 0x09, 0x61, 0x58, 0x3a, 0x4c, 0x12, 0xed, 0xab, 0x0b, 0xcc, 0xde, 0xb5, 0x3c, 0x7b, 0xb2, + 0x1c, 0x37, 0xb6, 0x15, 0x06, 0xda, 0xa6, 0x54, 0x27, 0xb2, 0xa5, 0x14, 0x2c, 0xfa, 0x01, 0x6c, + 0x3e, 0x27, 0xd4, 0xf4, 0x9c, 0x9f, 0x62, 0x8b, 0xbb, 0xee, 0x3f, 0x36, 0xfd, 0x2e, 0xf6, 0xd5, + 0xf2, 0x76, 0x71, 0xa7, 0xa2, 0x5f, 0x0d, 0x03, 0x6d, 0xdb, 0xcd, 0x95, 0x90, 0x30, 0xcf, 0xc0, + 0x40, 0x77, 0x60, 0xe5, 0xf9, 0xb0, 0xdf, 0xc6, 0xde, 0xfe, 0x31, 0xab, 0x34, 0x5f, 0x5d, 0x64, + 0xe5, 0x88, 0xc2, 0x40, 0x5b, 0x71, 0x53, 0x1c, 0x23, 0x23, 0x89, 0xee, 0xc3, 0xca, 0xa1, 0x63, + 0xbb, 0xd8, 0xf3, 0x9b, 0xae, 0x85, 0x47, 0xd8, 0x57, 0x2b, 0xdb, 0xc5, 0x9d, 0x92, 0xfe, 0xe5, + 0x30, 0xd0, 0x54, 0x3f, 0xc5, 0x91, 0x56, 0x92, 0xd1, 0x41, 0x06, 0x6c, 0x3e, 0x76, 0xec, 0x2e, + 0xf6, 0xe9, 0x43, 0xc7, 0x35, 0x7b, 0x2c, 0x60, 0xcf, 0x89, 0xdb, 0xc1, 0x2a, 0x6c, 0x2b, 0x3b, + 0x25, 0x1e, 0xa9, 0x6e, 0xae, 0x84, 0x71, 0x86, 0x26, 0x3a, 0x82, 0x8b, 0x53, 0x9c, 0xc8, 0x61, + 0xb5, 0xba, 0xad, 0xec, 0x2c, 0xe9, 0x57, 0xc2, 0x40, 0xd3, 0xba, 0x79, 0x02, 0xd2, 0x3a, 0xf3, + 0x11, 0xb6, 0x8e, 0x60, 0x23, 0xaf, 0x7a, 0xd0, 0x1a, 0x14, 0x5f, 0xe0, 0x31, 0xdb, 0xcc, 0x15, + 0x23, 0x7a, 0x44, 0xd7, 0x61, 0xfe, 0xc4, 0xec, 0x0d, 0xb1, 0xd8, 0xad, 0x17, 0x45, 0x61, 0xa4, + 0xb5, 0x0d, 0x2e, 0x73, 0xa7, 0x70, 0x5b, 0xd9, 0x3a, 0x82, 0xf5, 0xa9, 0x42, 0xc9, 0xc1, 0x6d, + 0xa4, 0x71, 0x55, 0x81, 0x2b, 0xab, 0x3e, 0x24, 0x5e, 0x6b, 0x24, 0x41, 0xd7, 0x7f, 0x55, 0x94, + 0xda, 0xc7, 0xf9, 0x9b, 0xcf, 0x5d, 0xa8, 0xf2, 0xb2, 0xd1, 0xc7, 0x14, 0xfb, 0xcc, 0xf0, 0x92, + 0x7e, 0x29, 0x0c, 0xb4, 0x8b, 0xdd, 0x84, 0x2c, 0x29, 0xca, 0xd2, 0xe8, 0x36, 0x00, 0x7f, 0x6d, + 0x8d, 0x07, 0x98, 0xf5, 0x9a, 0x8a, 0xae, 0x86, 0x81, 0xb6, 0xd1, 0x9d, 0x50, 0x25, 0x55, 0x49, + 0x36, 0xd1, 0x64, 0xb9, 0x2b, 0x31, 0xab, 0x92, 0x66, 0x26, 0x61, 0x92, 0x2c, 0xfa, 0x10, 0x4a, + 0x3a, 0xb1, 0xc6, 0xea, 0x3c, 0x0b, 0x51, 0x35, 0x6e, 0x94, 0xc4, 0x1a, 0xf3, 0xca, 0x6e, 0x13, + 0x6b, 0x2c, 0xa9, 0x32, 0x61, 0xd4, 0x85, 0x8d, 0x66, 0x74, 0xbe, 0x31, 0xaf, 0x9f, 0x39, 0xae, + 0xc3, 0x22, 0x16, 0x6f, 0xec, 0xb8, 0xdb, 0x4e, 0x18, 0xbc, 0x5b, 0x39, 0x39, 0x1a, 0x72, 0xb7, + 0xca, 0x43, 0xac, 0x7f, 0x0a, 0x53, 0x4d, 0x18, 0x75, 0x61, 0x49, 0x22, 0xf9, 0xaa, 0x92, 0x6a, + 0x5f, 0x19, 0x69, 0xf9, 0x5d, 0xee, 0x28, 0x52, 0x9b, 0x4e, 0x75, 0x14, 0x59, 0x1c, 0xfd, 0x52, + 0x81, 0x8d, 0xc3, 0xe9, 0xe3, 0x3c, 0xca, 0x6b, 0x64, 0xf2, 0x1b, 0x67, 0x98, 0xcc, 0x53, 0xe1, + 0xa6, 0x59, 0x20, 0x72, 0x06, 0x84, 0x54, 0x20, 0xf2, 0xd4, 0x51, 0x0b, 0xca, 0x06, 0x3b, 0xc5, + 0x7d, 0xb5, 0xc8, 0x8c, 0x5f, 0x39, 0xc3, 0xb8, 0x90, 0xe2, 0xf6, 0x58, 0xb9, 0xf2, 0xd3, 0x5f, + 0x36, 0x11, 0x43, 0xa1, 0xef, 0xc3, 0xa2, 0xc1, 0xe7, 0x0b, 0x5f, 0x2d, 0x31, 0xd8, 0xab, 0x67, + 0xc2, 0x72, 0x31, 0x8e, 0xbb, 0x19, 0x06, 0x1a, 0x12, 0x93, 0x89, 0x0c, 0x3c, 0x41, 0x43, 0x3f, + 0x02, 0x68, 0xba, 0x27, 0x66, 0xcf, 0xb1, 0x5a, 0xa3, 0xf8, 0x84, 0x79, 0xff, 0x0c, 0xec, 0x44, + 0x90, 0xa3, 0xb3, 0xca, 0x75, 0x26, 0x44, 0xb9, 0x72, 0x13, 0x51, 0xf4, 0x4d, 0x28, 0x3d, 0x25, + 0x76, 0x5c, 0x74, 0x2b, 0x02, 0xfb, 0x29, 0xb1, 0xd9, 0x01, 0xcf, 0x8a, 0xb7, 0x47, 0x6c, 0x59, + 0x9b, 0xc9, 0xa3, 0x5f, 0x28, 0x70, 0xf5, 0xb0, 0xd3, 0xc5, 0xd6, 0xb0, 0x87, 0xad, 0x07, 0x23, + 0xdc, 0x19, 0x52, 0x6c, 0x1d, 0xee, 0x19, 0x87, 0xbc, 0xd1, 0x1f, 0x78, 0xf8, 0x84, 0x15, 0x9f, + 0x38, 0x35, 0x6e, 0x86, 0x81, 0xd6, 0xf0, 0x67, 0x90, 0x97, 0x0c, 0xcd, 0x84, 0x8f, 0x7e, 0xa3, + 0xc0, 0xd7, 0xa6, 0x04, 0x13, 0x07, 0xb3, 0xcb, 0x59, 0x64, 0xcb, 0xb9, 0x1d, 0x06, 0xda, 0x2d, + 0x7f, 0x66, 0x2d, 0x69, 0x51, 0xe7, 0xb0, 0xb5, 0xf5, 0x1c, 0xd6, 0xa7, 0xf6, 0x4d, 0x4e, 0x83, + 0xbd, 0x92, 0x6e, 0xb0, 0xcb, 0x71, 0x7e, 0x47, 0x4d, 0xf7, 0x98, 0xc8, 0x0d, 0xfb, 0x63, 0xb8, + 0x74, 0xe6, 0xa6, 0xc8, 0xc1, 0xbd, 0x9a, 0xc6, 0x8d, 0x73, 0x7b, 0xb8, 0x67, 0x64, 0x81, 0x9f, + 0xc1, 0x92, 0x5c, 0xf0, 0x39, 0x58, 0x5f, 0x4d, 0x63, 0xad, 0x0b, 0x2c, 0xae, 0x95, 0x85, 0x7b, + 0x02, 0xcb, 0xa9, 0x42, 0x9f, 0x7d, 0x6d, 0x42, 0x4d, 0x06, 0x7b, 0x0a, 0xab, 0x99, 0xca, 0xfe, + 0x2f, 0x42, 0x58, 0xff, 0x43, 0x01, 0xca, 0x0f, 0x31, 0x8e, 0xc8, 0xe8, 0x1a, 0x94, 0x1f, 0x99, + 0xfe, 0x77, 0x7d, 0x6c, 0x31, 0xa8, 0x92, 0x5e, 0x0d, 0x03, 0xad, 0x6c, 0x73, 0x92, 0x11, 0xf3, + 0x50, 0x0f, 0x8a, 0x0f, 0x31, 0x16, 0x87, 0xd0, 0x27, 0x61, 0xa0, 0x2d, 0x1f, 0x63, 0xe9, 0x04, + 0xf9, 0xfd, 0xdf, 0xb4, 0x07, 0x7d, 0x93, 0x76, 0x77, 0xdb, 0x8e, 0xdd, 0x68, 0xba, 0xf4, 0xee, + 0x39, 0xa6, 0xf8, 0x86, 0xee, 0xd8, 0x4d, 0x97, 0xee, 0x99, 0x3e, 0xc5, 0x9e, 0x11, 0x99, 0x41, + 0x9f, 0x29, 0xb0, 0xd2, 0x74, 0x1d, 0xea, 0x98, 0xbd, 0x03, 0xd3, 0xb1, 0x22, 0xcb, 0x45, 0x66, + 0x19, 0x47, 0x53, 0x8e, 0x93, 0xe2, 0xbc, 0x8b, 0x45, 0x64, 0x8c, 0xd7, 0xff, 0xaa, 0xc0, 0x02, + 0x0f, 0x23, 0xda, 0x87, 0xaa, 0x54, 0xce, 0x2c, 0x66, 0xd5, 0x9b, 0x68, 0xba, 0x1b, 0xf1, 0x93, + 0x5a, 0x3a, 0x1a, 0xe4, 0x93, 0x5a, 0x92, 0x43, 0xdf, 0x9a, 0xe4, 0x22, 0x53, 0x06, 0x82, 0xca, + 0x1b, 0xef, 0x31, 0x7f, 0x91, 0x1b, 0x6f, 0x9c, 0xc1, 0x3b, 0xb0, 0xc2, 0x77, 0xa1, 0x43, 0xdc, + 0x7d, 0xcf, 0xc2, 0x1e, 0x8b, 0x95, 0x98, 0x26, 0x71, 0x8a, 0x63, 0x64, 0x24, 0xeb, 0xff, 0x52, + 0xa0, 0x2c, 0xb6, 0x02, 0x22, 0x70, 0x21, 0x67, 0x63, 0x09, 0x0f, 0xb7, 0xe2, 0x7d, 0x33, 0x2d, + 0xa1, 0x7f, 0x25, 0x0c, 0xb4, 0xf7, 0x72, 0x4e, 0x22, 0x69, 0xb1, 0x79, 0xc8, 0xff, 0x5f, 0xcf, + 0x5b, 0x50, 0x16, 0xfd, 0x1d, 0xd5, 0xa3, 0xe4, 0xb2, 0x69, 0x87, 0x6d, 0x26, 0x1d, 0xc2, 0x40, + 0x5b, 0xa0, 0x8c, 0x62, 0x08, 0x0e, 0xba, 0x06, 0xc5, 0xa7, 0xc4, 0x16, 0xeb, 0x84, 0xe4, 0x80, + 0xd0, 0xcb, 0x61, 0xa0, 0x15, 0x7b, 0xc4, 0x36, 0x22, 0x7e, 0xfd, 0x53, 0x05, 0x20, 0x69, 0x07, + 0xe8, 0x23, 0x58, 0xe0, 0x6f, 0x22, 0x8a, 0xab, 0xa9, 0x8e, 0xd1, 0x1a, 0xe9, 0x1b, 0x61, 0xa0, + 0xad, 0xf1, 0x43, 0x55, 0x72, 0x50, 0x28, 0xe5, 0xf8, 0x57, 0x98, 0xd9, 0xbf, 0x7f, 0x2a, 0xf9, + 0x37, 0x42, 0xf4, 0x01, 0x54, 0x1f, 0x99, 0xfe, 0x81, 0x47, 0x4e, 0x1c, 0x6b, 0xb2, 0xe9, 0x57, + 0xc3, 0x40, 0xab, 0xda, 0x09, 0xd9, 0x90, 0x65, 0x84, 0x8a, 0x81, 0x8f, 0x87, 0x6e, 0xa4, 0x52, + 0x48, 0xa9, 0xc4, 0x64, 0x43, 0x96, 0x41, 0xb7, 0x60, 0x29, 0x42, 0xc0, 0xae, 0xd9, 0x8b, 0xee, + 0x3f, 0x2c, 0x31, 0x25, 0x7d, 0x2d, 0x0c, 0xb4, 0x25, 0x5b, 0xa2, 0x1b, 0x29, 0xa9, 0xc8, 0xe1, + 0x67, 0xe6, 0x88, 0x91, 0x3c, 0x7e, 0x52, 0x95, 0x98, 0x1e, 0x73, 0xb8, 0x9f, 0xe2, 0x18, 0x19, + 0xc9, 0xfa, 0x31, 0x5c, 0xf8, 0x5e, 0xd4, 0x20, 0x4d, 0x4a, 0x3c, 0xc3, 0xa4, 0x8e, 0x6b, 0xb3, + 0x14, 0x5c, 0x87, 0xca, 0xc1, 0xb0, 0xdd, 0x73, 0x3a, 0x4f, 0xe2, 0x66, 0xa9, 0x2f, 0x87, 0x81, + 0x56, 0x19, 0xc4, 0x44, 0x23, 0xe1, 0x47, 0x95, 0xc0, 0x55, 0x99, 0x8f, 0x05, 0x5e, 0x09, 0x1e, + 0xa3, 0x18, 0x82, 0x53, 0xff, 0x8b, 0x02, 0x6b, 0x13, 0x43, 0x3e, 0x27, 0x46, 0x5d, 0x34, 0x3d, + 0xdc, 0xb3, 0x2e, 0x2a, 0x86, 0xfb, 0x64, 0xa4, 0xd7, 0x60, 0xfe, 0xc1, 0x80, 0x74, 0xba, 0x22, + 0x8f, 0x95, 0x30, 0xd0, 0xe6, 0x71, 0x44, 0x30, 0x38, 0x1d, 0x79, 0xb0, 0x91, 0xc5, 0x66, 0xfb, + 0x83, 0xcf, 0x69, 0xf1, 0x26, 0xcc, 0xf1, 0x93, 0x8f, 0x83, 0x27, 0x39, 0xba, 0xf2, 0x38, 0x98, + 0x87, 0x5d, 0xff, 0x6d, 0x01, 0x2a, 0x06, 0x19, 0xba, 0xbc, 0x64, 0x35, 0x98, 0x67, 0x2f, 0xa2, + 0x30, 0xd8, 0x12, 0xbd, 0x88, 0x60, 0x70, 0x7a, 0x94, 0xa3, 0xcc, 0x05, 0xb4, 0xc0, 0x2e, 0xa0, + 0x2c, 0x47, 0xe9, 0x0b, 0xe8, 0xd4, 0xb5, 0xf3, 0xdb, 0xb0, 0xc6, 0x92, 0xf5, 0x31, 0x2b, 0xae, + 0x01, 0xf1, 0x45, 0x65, 0x2c, 0xf2, 0x8d, 0xd0, 0xce, 0xf0, 0x8c, 0x29, 0xe9, 0x24, 0xd0, 0x16, + 0x2b, 0x8d, 0x54, 0xa0, 0xad, 0x38, 0xd0, 0x56, 0x12, 0xe8, 0xf9, 0x33, 0x02, 0x7d, 0x1d, 0x2a, + 0x2d, 0xa7, 0x8f, 0x7d, 0x6a, 0xf6, 0x07, 0xea, 0x02, 0x73, 0x95, 0x95, 0x05, 0x8d, 0x89, 0x46, + 0xc2, 0xaf, 0xff, 0x0c, 0x80, 0xf9, 0xee, 0xc7, 0x27, 0xe6, 0x2c, 0xb9, 0xfe, 0x8e, 0xac, 0x24, + 0xa6, 0xfc, 0xf8, 0x3a, 0x33, 0x09, 0x37, 0x9f, 0x4f, 0xbd, 0x89, 0x9c, 0x3c, 0x9f, 0x26, 0xda, + 0xf5, 0x0f, 0xa0, 0x7c, 0x30, 0x6c, 0x3f, 0xc1, 0x63, 0x1f, 0xbd, 0x0f, 0xa5, 0xe8, 0x97, 0xdd, + 0x54, 0x96, 0x78, 0xd0, 0x5f, 0xe0, 0x71, 0x6a, 0x34, 0x8d, 0xf8, 0xf5, 0x3f, 0x15, 0x60, 0x3d, + 0x49, 0x77, 0xac, 0x3d, 0xe3, 0xda, 0x3f, 0x53, 0x60, 0x93, 0x3d, 0x4f, 0x21, 0x08, 0x47, 0x6e, + 0x65, 0x2b, 0x31, 0xe6, 0x37, 0xf2, 0xd5, 0xf8, 0x30, 0xae, 0x85, 0x81, 0x76, 0xf9, 0x24, 0xcb, + 0x93, 0x3f, 0x98, 0xe4, 0x6b, 0x27, 0xe9, 0x2c, 0xe6, 0xa7, 0x73, 0xeb, 0x08, 0x2e, 0x7f, 0x81, + 0x61, 0x79, 0x56, 0x5a, 0xfe, 0xc2, 0xd1, 0x4b, 0x68, 0xc9, 0xc3, 0xd2, 0x1f, 0x0b, 0xb0, 0x38, + 0xf9, 0xfc, 0x34, 0x63, 0xfc, 0xee, 0xc0, 0x0a, 0xab, 0xdc, 0xa4, 0xc4, 0x0a, 0x49, 0x1f, 0x6b, + 0xa7, 0x38, 0x46, 0x46, 0x12, 0xf5, 0xa7, 0x3f, 0xaa, 0x15, 0x53, 0xd7, 0xa9, 0x98, 0xfc, 0x3f, + 0xf9, 0xa0, 0xf6, 0x0e, 0x3f, 0xad, 0xd4, 0x6d, 0x58, 0x61, 0xdf, 0x71, 0xa2, 0xd6, 0xce, 0xaf, + 0x29, 0x33, 0x86, 0xaf, 0x91, 0xfa, 0x04, 0xc1, 0x67, 0xce, 0x95, 0x30, 0xd0, 0x20, 0xf9, 0x04, + 0x21, 0x7f, 0x78, 0xa8, 0x37, 0x60, 0x9e, 0xa9, 0xce, 0x88, 0xaf, 0x0f, 0x5f, 0xbe, 0xae, 0xcd, + 0xbd, 0x7a, 0x5d, 0x9b, 0xfb, 0xfc, 0x75, 0x4d, 0xf9, 0xf9, 0x69, 0x4d, 0xf9, 0xdd, 0x69, 0x4d, + 0xf9, 0xf3, 0x69, 0x4d, 0x79, 0x79, 0x5a, 0x53, 0x5e, 0x9d, 0xd6, 0x94, 0xbf, 0x9f, 0xd6, 0x94, + 0x7f, 0x9c, 0xd6, 0xe6, 0x3e, 0x3f, 0xad, 0x29, 0xbf, 0x7e, 0x53, 0x9b, 0x7b, 0xf9, 0xa6, 0x36, + 0xf7, 0xea, 0x4d, 0x6d, 0xee, 0x93, 0xf3, 0x8c, 0x94, 0xbb, 0xe2, 0x9f, 0x22, 0x77, 0xc5, 0x6f, + 0x7b, 0x81, 0x05, 0xec, 0xc3, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xf0, 0x74, 0x8f, 0x10, 0x2e, + 0x19, 0x00, 0x00, } func (this *OutportBlock) Equal(that interface{}) bool { @@ -1983,7 +1984,7 @@ func (this *OutportBlock) GoString() string { keysForStateChanges = append(keysForStateChanges, k) } github_com_gogo_protobuf_sortkeys.Strings(keysForStateChanges) - mapStringForStateChanges := "map[string]*stateChange.StateChange{" + mapStringForStateChanges := "map[string]*stateChange.StateChangesForTx{" for _, k := range keysForStateChanges { mapStringForStateChanges += fmt.Sprintf("%#v: %#v,", k, this.StateChanges[k]) } @@ -4007,7 +4008,7 @@ func (this *OutportBlock) String() string { keysForStateChanges = append(keysForStateChanges, k) } github_com_gogo_protobuf_sortkeys.Strings(keysForStateChanges) - mapStringForStateChanges := "map[string]*stateChange.StateChange{" + mapStringForStateChanges := "map[string]*stateChange.StateChangesForTx{" for _, k := range keysForStateChanges { mapStringForStateChanges += fmt.Sprintf("%v: %v,", k, this.StateChanges[k]) } @@ -4648,10 +4649,10 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.StateChanges == nil { - m.StateChanges = make(map[string]*stateChange.StateChange) + m.StateChanges = make(map[string]*stateChange.StateChangesForTx) } var mapkey string - var mapvalue *stateChange.StateChange + var mapvalue *stateChange.StateChangesForTx for iNdEx < postIndex { entryPreIndex := iNdEx var wire uint64 @@ -4725,7 +4726,7 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { if postmsgIndex > l { return io.ErrUnexpectedEOF } - mapvalue = &stateChange.StateChange{} + mapvalue = &stateChange.StateChangesForTx{} if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil { return err } diff --git a/data/outport/outportBlock.proto b/data/outport/outportBlock.proto index bfe095fe..28a0c6a2 100644 --- a/data/outport/outportBlock.proto +++ b/data/outport/outportBlock.proto @@ -16,17 +16,17 @@ import "github.com/multiversx/mx-chain-core-go/data/alteredAccount/alteredAccoun import "github.com/multiversx/mx-chain-core-go/data/stateChange/stateChange.proto"; message OutportBlock { - 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"]; - map StateChanges = 6 [(gogoproto.jsontag) = "stateChanges,omitempty"]; - repeated string NotarizedHeadersHashes = 7 [(gogoproto.jsontag) = "notarizedHeadersHashes,omitempty"]; - uint32 NumberOfShards = 8 [(gogoproto.jsontag) = "numberOfShards"]; - repeated uint64 SignersIndexes = 9 [(gogoproto.jsontag) = "signersIndexes,omitempty"]; - uint64 HighestFinalBlockNonce = 10 [(gogoproto.jsontag) = "highestFinalBlockNonce"]; - bytes HighestFinalBlockHash = 11 [(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"]; + map StateChanges = 6 [(gogoproto.jsontag) = "stateChanges,omitempty"]; + repeated string NotarizedHeadersHashes = 7 [(gogoproto.jsontag) = "notarizedHeadersHashes,omitempty"]; + uint32 NumberOfShards = 8 [(gogoproto.jsontag) = "numberOfShards"]; + repeated uint64 SignersIndexes = 9 [(gogoproto.jsontag) = "signersIndexes,omitempty"]; + uint64 HighestFinalBlockNonce = 10 [(gogoproto.jsontag) = "highestFinalBlockNonce"]; + bytes HighestFinalBlockHash = 11 [(gogoproto.jsontag) = "highestFinalBlockHash,omitempty"]; } message BlockData { diff --git a/data/stateChange/stateChange.pb.go b/data/stateChange/stateChange.pb.go index 1673f837..9595d7ad 100644 --- a/data/stateChange/stateChange.pb.go +++ b/data/stateChange/stateChange.pb.go @@ -26,6 +26,45 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package +type StateChangesForTx struct { + StateChanges []*StateChange `protobuf:"bytes,1,rep,name=StateChanges,proto3" json:"stateChanges"` +} + +func (m *StateChangesForTx) Reset() { *m = StateChangesForTx{} } +func (*StateChangesForTx) ProtoMessage() {} +func (*StateChangesForTx) Descriptor() ([]byte, []int) { + return fileDescriptor_8e577663eebb0888, []int{0} +} +func (m *StateChangesForTx) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *StateChangesForTx) 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 *StateChangesForTx) XXX_Merge(src proto.Message) { + xxx_messageInfo_StateChangesForTx.Merge(m, src) +} +func (m *StateChangesForTx) XXX_Size() int { + return m.Size() +} +func (m *StateChangesForTx) XXX_DiscardUnknown() { + xxx_messageInfo_StateChangesForTx.DiscardUnknown(m) +} + +var xxx_messageInfo_StateChangesForTx proto.InternalMessageInfo + +func (m *StateChangesForTx) GetStateChanges() []*StateChange { + if m != nil { + return m.StateChanges + } + return nil +} + type StateChange struct { Type string `protobuf:"bytes,1,opt,name=Type,proto3" json:"type"` Index int32 `protobuf:"varint,2,opt,name=Index,proto3" json:"-"` @@ -39,7 +78,7 @@ type StateChange struct { func (m *StateChange) Reset() { *m = StateChange{} } func (*StateChange) ProtoMessage() {} func (*StateChange) Descriptor() ([]byte, []int) { - return fileDescriptor_8e577663eebb0888, []int{0} + return fileDescriptor_8e577663eebb0888, []int{1} } func (m *StateChange) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -122,7 +161,7 @@ type DataTrieChange struct { func (m *DataTrieChange) Reset() { *m = DataTrieChange{} } func (*DataTrieChange) ProtoMessage() {} func (*DataTrieChange) Descriptor() ([]byte, []int) { - return fileDescriptor_8e577663eebb0888, []int{1} + return fileDescriptor_8e577663eebb0888, []int{2} } func (m *DataTrieChange) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -169,6 +208,7 @@ func (m *DataTrieChange) GetVal() []byte { } func init() { + proto.RegisterType((*StateChangesForTx)(nil), "proto.StateChangesForTx") proto.RegisterType((*StateChange)(nil), "proto.StateChange") proto.RegisterType((*DataTrieChange)(nil), "proto.DataTrieChange") } @@ -176,35 +216,66 @@ func init() { func init() { proto.RegisterFile("stateChange.proto", fileDescriptor_8e577663eebb0888) } var fileDescriptor_8e577663eebb0888 = []byte{ - // 403 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xcd, 0xea, 0xd3, 0x40, - 0x14, 0xc5, 0x33, 0x4d, 0x53, 0xed, 0xd4, 0x0f, 0x0c, 0x08, 0xb1, 0xda, 0x49, 0xe8, 0xc6, 0x80, - 0xa6, 0x01, 0x5d, 0xba, 0x4b, 0x5d, 0x28, 0x22, 0x42, 0x2c, 0x5d, 0xb8, 0x10, 0xa6, 0xed, 0x34, - 0x09, 0x24, 0x99, 0x90, 0x4c, 0x25, 0x59, 0x08, 0x3e, 0x82, 0x8f, 0xe1, 0x93, 0x88, 0xcb, 0x2e, - 0xbb, 0x0a, 0x76, 0xba, 0x91, 0xac, 0xfa, 0x08, 0x92, 0x89, 0xa5, 0x69, 0x11, 0xfe, 0xab, 0xcc, - 0x3d, 0xbf, 0x7b, 0x2f, 0x39, 0x87, 0x0b, 0x1f, 0x64, 0x0c, 0x33, 0x32, 0xf5, 0x71, 0xec, 0x91, - 0x49, 0x92, 0x52, 0x46, 0x55, 0x45, 0x7c, 0x86, 0x96, 0x17, 0x30, 0x7f, 0xb3, 0x98, 0x2c, 0x69, - 0x64, 0x7b, 0xd4, 0xa3, 0xb6, 0x90, 0x17, 0x9b, 0xb5, 0xa8, 0x44, 0x21, 0x5e, 0xcd, 0xd4, 0xf8, - 0x67, 0x07, 0x0e, 0x3e, 0x9e, 0x77, 0xa9, 0x4f, 0x60, 0x77, 0x56, 0x24, 0x44, 0x03, 0x06, 0x30, - 0xfb, 0xce, 0xed, 0xaa, 0xd4, 0xbb, 0xac, 0x48, 0x88, 0x2b, 0x54, 0xf5, 0x31, 0x54, 0xde, 0xc6, - 0x2b, 0x92, 0x6b, 0x1d, 0x03, 0x98, 0x8a, 0xa3, 0x54, 0xa5, 0x0e, 0x2c, 0xb7, 0xd1, 0xd4, 0x11, - 0xec, 0xcd, 0xf2, 0x37, 0x38, 0xf3, 0x35, 0xd9, 0x00, 0xe6, 0x9d, 0x13, 0xfd, 0x27, 0xaa, 0x4f, - 0xe1, 0xe0, 0x3d, 0x0e, 0xe2, 0x59, 0x1a, 0x90, 0x77, 0xa4, 0xd0, 0xba, 0xed, 0x9e, 0x36, 0x69, - 0x37, 0xce, 0x71, 0xa8, 0x29, 0xff, 0x6d, 0x9c, 0xe3, 0x50, 0x7d, 0x06, 0xfb, 0x1f, 0x12, 0x92, - 0x62, 0x16, 0xd0, 0x58, 0xeb, 0x89, 0x1f, 0xbe, 0x5b, 0x95, 0x7a, 0x9f, 0x9e, 0x44, 0xf7, 0xcc, - 0xd5, 0xcf, 0xf0, 0xfe, 0x6b, 0xcc, 0x70, 0x3d, 0xdb, 0x58, 0xcd, 0xb4, 0x5b, 0x86, 0x6c, 0x0e, - 0x5e, 0x3c, 0x6c, 0x92, 0x98, 0x5c, 0x52, 0x67, 0x54, 0x95, 0xfa, 0xa3, 0xd5, 0xe5, 0xc4, 0x73, - 0x1a, 0x05, 0x8c, 0x44, 0x09, 0x2b, 0xdc, 0xeb, 0x65, 0xe3, 0x35, 0xbc, 0x77, 0x29, 0xdd, 0x10, - 0xe5, 0x10, 0xca, 0x75, 0x0c, 0x1d, 0xe1, 0xee, 0x0c, 0x6b, 0xb1, 0x66, 0xb5, 0x73, 0xf9, 0x9a, - 0xcd, 0x71, 0xe8, 0x7c, 0xdd, 0xee, 0x91, 0xb4, 0xdb, 0x23, 0xe9, 0xb8, 0x47, 0xe0, 0x1b, 0x47, - 0xe0, 0x07, 0x47, 0xe0, 0x17, 0x47, 0x60, 0xcb, 0x11, 0xd8, 0x71, 0x04, 0x7e, 0x73, 0x04, 0xfe, - 0x70, 0x24, 0x1d, 0x39, 0x02, 0xdf, 0x0f, 0x48, 0xda, 0x1e, 0x90, 0xb4, 0x3b, 0x20, 0xe9, 0xd3, - 0xb4, 0x75, 0x19, 0xd1, 0x26, 0x64, 0xc1, 0x17, 0x92, 0x66, 0xb9, 0x1d, 0xe5, 0xd6, 0xd2, 0xc7, - 0x41, 0x6c, 0x2d, 0x69, 0x4a, 0x2c, 0x8f, 0xda, 0xb5, 0x69, 0xbb, 0x75, 0x5f, 0xaf, 0x5a, 0xef, - 0x45, 0x4f, 0x84, 0xf5, 0xf2, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x69, 0xcc, 0x70, 0xa2, 0x81, - 0x02, 0x00, 0x00, + // 437 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x4f, 0x8b, 0xd3, 0x40, + 0x18, 0xc6, 0x33, 0x6d, 0x53, 0xed, 0xb4, 0xfe, 0xd9, 0x01, 0x21, 0xae, 0xee, 0xa4, 0xf4, 0x62, + 0x41, 0xd3, 0x80, 0x1e, 0xbd, 0x65, 0x45, 0x56, 0x44, 0x84, 0x58, 0x7a, 0x10, 0x14, 0xa6, 0xdd, + 0xd9, 0x24, 0x90, 0x64, 0x42, 0x32, 0x95, 0xe4, 0x20, 0xf8, 0x11, 0xfc, 0x18, 0x7e, 0x12, 0xf1, + 0xd8, 0x63, 0x4f, 0xc1, 0x4e, 0x2f, 0x92, 0xd3, 0x7e, 0x04, 0xc9, 0x74, 0x4b, 0x27, 0x45, 0xf0, + 0x34, 0x33, 0xbf, 0xe7, 0x7d, 0x86, 0xf7, 0x7d, 0x78, 0xe1, 0x49, 0xc6, 0x09, 0xa7, 0xe7, 0x3e, + 0x89, 0x3d, 0x3a, 0x49, 0x52, 0xc6, 0x19, 0xd2, 0xe5, 0x71, 0x6a, 0x79, 0x01, 0xf7, 0x97, 0xf3, + 0xc9, 0x82, 0x45, 0xb6, 0xc7, 0x3c, 0x66, 0x4b, 0x3c, 0x5f, 0x5e, 0xc9, 0x97, 0x7c, 0xc8, 0xdb, + 0xce, 0x35, 0xfa, 0x04, 0x4f, 0x3e, 0x1c, 0xbe, 0xca, 0x5e, 0xb3, 0x74, 0x9a, 0xa3, 0x0b, 0x38, + 0x50, 0xa1, 0x01, 0x86, 0xed, 0x71, 0xff, 0x39, 0xda, 0x59, 0x26, 0x8a, 0xe4, 0xdc, 0xaf, 0x4a, + 0x73, 0xa0, 0xf4, 0x92, 0xb9, 0x0d, 0xe7, 0xe8, 0x67, 0x0b, 0xf6, 0x15, 0x80, 0x1e, 0xc3, 0xce, + 0xb4, 0x48, 0xa8, 0x01, 0x86, 0x60, 0xdc, 0x73, 0x6e, 0x57, 0xa5, 0xd9, 0xe1, 0x45, 0x42, 0x5d, + 0x49, 0xd1, 0x23, 0xa8, 0xbf, 0x89, 0x2f, 0x69, 0x6e, 0xb4, 0x86, 0x60, 0xac, 0x3b, 0x7a, 0x55, + 0x9a, 0xc0, 0x72, 0x77, 0x0c, 0x9d, 0xc1, 0xee, 0x34, 0xbf, 0x20, 0x99, 0x6f, 0xb4, 0x87, 0x60, + 0x3c, 0xd8, 0xab, 0x37, 0x10, 0x3d, 0x81, 0xfd, 0x77, 0x24, 0x88, 0xa7, 0x69, 0x40, 0xdf, 0xd2, + 0xc2, 0xe8, 0xa8, 0x35, 0xaa, 0xa2, 0x16, 0xce, 0x48, 0x68, 0xe8, 0xff, 0x2c, 0x9c, 0x91, 0x10, + 0x3d, 0x85, 0xbd, 0xf7, 0x09, 0x4d, 0x09, 0x0f, 0x58, 0x6c, 0x74, 0x65, 0xc3, 0x77, 0xaa, 0xd2, + 0xec, 0xb1, 0x3d, 0x74, 0x0f, 0x3a, 0xfa, 0x0c, 0xef, 0xbd, 0x22, 0x9c, 0xd4, 0xde, 0x7d, 0x6a, + 0xb7, 0x64, 0x6a, 0x0f, 0x6e, 0x52, 0x6b, 0xaa, 0xce, 0x59, 0x55, 0x9a, 0x0f, 0x2f, 0x9b, 0x8e, + 0x67, 0x2c, 0x0a, 0x38, 0x8d, 0x12, 0x5e, 0xb8, 0xc7, 0x9f, 0x8d, 0xae, 0xe0, 0xdd, 0x26, 0xfa, + 0x4f, 0x94, 0xa7, 0xb0, 0x5d, 0xc7, 0xd0, 0x92, 0xd3, 0x1d, 0xc4, 0x1a, 0xd6, 0x5a, 0x3d, 0x79, + 0xfb, 0x58, 0x9b, 0x91, 0xd0, 0xf9, 0xba, 0xda, 0x60, 0x6d, 0xbd, 0xc1, 0xda, 0xf5, 0x06, 0x83, + 0x6f, 0x02, 0x83, 0x1f, 0x02, 0x83, 0x5f, 0x02, 0x83, 0x95, 0xc0, 0x60, 0x2d, 0x30, 0xf8, 0x2d, + 0x30, 0xf8, 0x23, 0xb0, 0x76, 0x2d, 0x30, 0xf8, 0xbe, 0xc5, 0xda, 0x6a, 0x8b, 0xb5, 0xf5, 0x16, + 0x6b, 0x1f, 0xcf, 0x95, 0xc5, 0x8b, 0x96, 0x21, 0x0f, 0xbe, 0xd0, 0x34, 0xcb, 0xed, 0x28, 0xb7, + 0x16, 0x3e, 0x09, 0x62, 0x6b, 0xc1, 0x52, 0x6a, 0x79, 0xcc, 0xae, 0x87, 0xb6, 0x95, 0x95, 0x79, + 0xa9, 0xdc, 0xe7, 0x5d, 0x19, 0xd6, 0x8b, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc1, 0x74, 0x60, + 0x41, 0xe0, 0x02, 0x00, 0x00, } +func (this *StateChangesForTx) Equal(that interface{}) bool { + if that == nil { + return this == nil + } + + that1, ok := that.(*StateChangesForTx) + if !ok { + that2, ok := that.(StateChangesForTx) + if ok { + that1 = &that2 + } else { + return false + } + } + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + if len(this.StateChanges) != len(that1.StateChanges) { + return false + } + for i := range this.StateChanges { + if !this.StateChanges[i].Equal(that1.StateChanges[i]) { + return false + } + } + return true +} func (this *StateChange) Equal(that interface{}) bool { if that == nil { return this == nil @@ -282,6 +353,18 @@ func (this *DataTrieChange) Equal(that interface{}) bool { } return true } +func (this *StateChangesForTx) GoString() string { + if this == nil { + return "nil" + } + s := make([]string, 0, 5) + s = append(s, "&stateChange.StateChangesForTx{") + if this.StateChanges != nil { + s = append(s, "StateChanges: "+fmt.Sprintf("%#v", this.StateChanges)+",\n") + } + s = append(s, "}") + return strings.Join(s, "") +} func (this *StateChange) GoString() string { if this == nil { return "nil" @@ -320,6 +403,43 @@ func valueToGoStringStateChange(v interface{}, typ string) string { pv := reflect.Indirect(rv).Interface() return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) } +func (m *StateChangesForTx) 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 *StateChangesForTx) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *StateChangesForTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.StateChanges) > 0 { + for iNdEx := len(m.StateChanges) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.StateChanges[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintStateChange(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + func (m *StateChange) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -452,6 +572,21 @@ func encodeVarintStateChange(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } +func (m *StateChangesForTx) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.StateChanges) > 0 { + for _, e := range m.StateChanges { + l = e.Size() + n += 1 + l + sovStateChange(uint64(l)) + } + } + return n +} + func (m *StateChange) Size() (n int) { if m == nil { return 0 @@ -517,6 +652,21 @@ func sovStateChange(x uint64) (n int) { func sozStateChange(x uint64) (n int) { return sovStateChange(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } +func (this *StateChangesForTx) String() string { + if this == nil { + return "nil" + } + repeatedStringForStateChanges := "[]*StateChange{" + for _, f := range this.StateChanges { + repeatedStringForStateChanges += strings.Replace(f.String(), "StateChange", "StateChange", 1) + "," + } + repeatedStringForStateChanges += "}" + s := strings.Join([]string{`&StateChangesForTx{`, + `StateChanges:` + repeatedStringForStateChanges + `,`, + `}`, + }, "") + return s +} func (this *StateChange) String() string { if this == nil { return "nil" @@ -558,6 +708,93 @@ func valueToStringStateChange(v interface{}) string { pv := reflect.Indirect(rv).Interface() return fmt.Sprintf("*%v", pv) } +func (m *StateChangesForTx) 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 ErrIntOverflowStateChange + } + 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: StateChangesForTx: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: StateChangesForTx: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field StateChanges", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStateChange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthStateChange + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthStateChange + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.StateChanges = append(m.StateChanges, &StateChange{}) + if err := m.StateChanges[len(m.StateChanges)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipStateChange(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthStateChange + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthStateChange + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *StateChange) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/data/stateChange/stateChange.proto b/data/stateChange/stateChange.proto index 24040fbe..91d7cc2a 100644 --- a/data/stateChange/stateChange.proto +++ b/data/stateChange/stateChange.proto @@ -7,6 +7,10 @@ option (gogoproto.stable_marshaler_all) = true; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +message StateChangesForTx { + repeated StateChange StateChanges = 1 [(gogoproto.jsontag) = "stateChanges"]; +} + message StateChange { string Type = 1 [(gogoproto.jsontag) = "type"]; int32 Index = 2 [(gogoproto.jsontag) = "-"]; From b2d0f5bf5ae2c71c37fdf925a51400c8476ecb28 Mon Sep 17 00:00:00 2001 From: Alexander Cristurean Date: Fri, 6 Sep 2024 16:45:54 +0300 Subject: [PATCH 06/14] update proto structure for state changes for tx. --- data/outport/outportBlock.pb.go | 438 ++++++++++------------------- data/outport/outportBlock.proto | 2 +- data/stateChange/stateChange.pb.go | 119 ++++++-- data/stateChange/stateChange.proto | 3 +- 4 files changed, 237 insertions(+), 325 deletions(-) diff --git a/data/outport/outportBlock.pb.go b/data/outport/outportBlock.pb.go index 33a278c1..1d25c822 100644 --- a/data/outport/outportBlock.pb.go +++ b/data/outport/outportBlock.pb.go @@ -43,7 +43,7 @@ type OutportBlock struct { 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"` - StateChanges map[string]*stateChange.StateChangesForTx `protobuf:"bytes,6,rep,name=StateChanges,proto3" json:"stateChanges,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + StateChanges *stateChange.StateChangesForTx `protobuf:"bytes,6,opt,name=StateChanges,proto3" json:"stateChanges,omitempty"` NotarizedHeadersHashes []string `protobuf:"bytes,7,rep,name=NotarizedHeadersHashes,proto3" json:"notarizedHeadersHashes,omitempty"` NumberOfShards uint32 `protobuf:"varint,8,opt,name=NumberOfShards,proto3" json:"numberOfShards"` SignersIndexes []uint64 `protobuf:"varint,9,rep,packed,name=SignersIndexes,proto3" json:"signersIndexes,omitempty"` @@ -114,7 +114,7 @@ func (m *OutportBlock) GetAlteredAccounts() map[string]*alteredAccount.AlteredAc return nil } -func (m *OutportBlock) GetStateChanges() map[string]*stateChange.StateChangesForTx { +func (m *OutportBlock) GetStateChanges() *stateChange.StateChangesForTx { if m != nil { return m.StateChanges } @@ -1118,7 +1118,6 @@ func (m *Shard) GetShardID() uint32 { func init() { proto.RegisterType((*OutportBlock)(nil), "proto.OutportBlock") proto.RegisterMapType((map[string]*alteredAccount.AlteredAccount)(nil), "proto.OutportBlock.AlteredAccountsEntry") - proto.RegisterMapType((map[string]*stateChange.StateChangesForTx)(nil), "proto.OutportBlock.StateChangesEntry") proto.RegisterType((*BlockData)(nil), "proto.BlockData") proto.RegisterType((*TransactionPool)(nil), "proto.TransactionPool") proto.RegisterMapType((map[string]*TxInfo)(nil), "proto.TransactionPool.InvalidTxsEntry") @@ -1148,132 +1147,131 @@ func init() { func init() { proto.RegisterFile("outportBlock.proto", fileDescriptor_661b95cef868af95) } var fileDescriptor_661b95cef868af95 = []byte{ - // 1987 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcd, 0x6f, 0x1b, 0x5b, - 0x15, 0xcf, 0xd8, 0x4e, 0x1c, 0x1f, 0xe7, 0xf3, 0x36, 0x0d, 0xd3, 0x94, 0xe7, 0x09, 0x6e, 0xfb, - 0x88, 0x28, 0x75, 0x78, 0x7d, 0x15, 0xaa, 0x5a, 0x3d, 0x41, 0x27, 0xfd, 0x32, 0xfd, 0x48, 0x34, - 0x31, 0x3c, 0xf2, 0x84, 0x04, 0x63, 0xcf, 0xcd, 0x78, 0x54, 0x7b, 0xae, 0x99, 0xb9, 0x0e, 0x36, - 0x1b, 0x58, 0xf1, 0x58, 0xf0, 0x24, 0x96, 0xec, 0xd8, 0x22, 0x16, 0x6c, 0xf9, 0x0f, 0x10, 0x2b, - 0xd4, 0x15, 0xea, 0x6a, 0xa0, 0xe9, 0x06, 0xcd, 0x02, 0xbd, 0x1d, 0x2b, 0x24, 0x34, 0xf7, 0xde, - 0xf1, 0xdc, 0x19, 0x4f, 0x9e, 0x9c, 0x42, 0xc5, 0x26, 0x9e, 0x39, 0x1f, 0xbf, 0x73, 0xcf, 0xc7, - 0x3d, 0xf7, 0xdc, 0x09, 0x20, 0x32, 0xa4, 0x03, 0xe2, 0x51, 0xbd, 0x47, 0x3a, 0x2f, 0x1a, 0x03, - 0x8f, 0x50, 0x82, 0xe6, 0xd9, 0xcf, 0xd6, 0x0d, 0xdb, 0xa1, 0xdd, 0x61, 0xbb, 0xd1, 0x21, 0xfd, - 0x5d, 0x9b, 0xd8, 0x64, 0x97, 0x91, 0xdb, 0xc3, 0x63, 0xf6, 0xc6, 0x5e, 0xd8, 0x13, 0xd7, 0xda, - 0xfa, 0x48, 0x12, 0xef, 0x0f, 0x7b, 0xd4, 0x39, 0xc1, 0x9e, 0x3f, 0xda, 0xed, 0x8f, 0x6e, 0x74, - 0xba, 0xa6, 0xe3, 0xde, 0xe8, 0x10, 0x0f, 0xdf, 0xb0, 0xc9, 0xae, 0x65, 0x52, 0x73, 0xb7, 0x1d, - 0x99, 0xe3, 0x7f, 0x85, 0xfa, 0xbd, 0xf3, 0xa8, 0x53, 0xcf, 0x74, 0x7d, 0xb3, 0x43, 0x1d, 0xe2, - 0xee, 0xf6, 0x88, 0x2d, 0x20, 0x9a, 0x6f, 0x0b, 0x21, 0x3d, 0x0b, 0xa8, 0xa3, 0xf3, 0x40, 0xf9, - 0x7d, 0xd3, 0xa3, 0x7b, 0xc4, 0xa5, 0x9e, 0xd9, 0xa1, 0x06, 0xf6, 0x87, 0x3d, 0x9a, 0x47, 0x7b, - 0x1b, 0x47, 0x3d, 0xdc, 0xc1, 0xce, 0x80, 0xc6, 0xbf, 0x02, 0x62, 0xef, 0x7c, 0x10, 0x3f, 0x31, - 0x3d, 0xab, 0x35, 0x9a, 0x3c, 0x08, 0x90, 0xfd, 0xf3, 0x80, 0x98, 0x3d, 0x8a, 0x3d, 0x6c, 0xdd, - 0xeb, 0x74, 0xc8, 0xd0, 0xa5, 0x99, 0xd7, 0xb7, 0x09, 0xbf, 0x4f, 0x4d, 0x8a, 0xf7, 0xba, 0xa6, - 0x6b, 0x63, 0xf9, 0x99, 0x43, 0xd5, 0xff, 0xbd, 0x08, 0x4b, 0xfb, 0x52, 0x61, 0xa2, 0x5d, 0x28, - 0x1f, 0x76, 0x4d, 0xcf, 0x6a, 0xde, 0x57, 0x95, 0x6d, 0x65, 0x67, 0x59, 0xbf, 0x18, 0x06, 0xda, - 0xba, 0xcf, 0x49, 0x5f, 0x27, 0x7d, 0x87, 0xe2, 0xfe, 0x80, 0x8e, 0x8d, 0x58, 0x0a, 0x3d, 0x82, - 0x0a, 0xd3, 0xbc, 0x6f, 0x52, 0x53, 0x2d, 0x6c, 0x2b, 0x3b, 0xd5, 0x9b, 0x6b, 0x1c, 0xbc, 0x31, - 0xa1, 0xeb, 0x5f, 0x0a, 0x03, 0xed, 0x42, 0x3b, 0x7e, 0x95, 0x60, 0x12, 0x5d, 0xf4, 0x43, 0x58, - 0x6d, 0x25, 0xe5, 0x71, 0x40, 0x48, 0x4f, 0x2d, 0x32, 0xb8, 0x4d, 0x01, 0x97, 0xe1, 0xea, 0xef, - 0x85, 0x81, 0x76, 0x89, 0xa6, 0x89, 0x12, 0x74, 0x16, 0x0d, 0xf9, 0xb0, 0xf1, 0x18, 0x9b, 0x16, - 0xf6, 0x1e, 0x99, 0xfe, 0x1e, 0x71, 0xfd, 0x61, 0x7f, 0x10, 0xf1, 0xd4, 0x12, 0xb3, 0x72, 0x59, - 0x58, 0xc9, 0x13, 0xd1, 0xeb, 0x61, 0xa0, 0xd5, 0xba, 0x39, 0x1c, 0xc9, 0x5e, 0x2e, 0x38, 0xfa, - 0x31, 0xac, 0xde, 0x4b, 0xe5, 0xd0, 0x57, 0xe7, 0xb7, 0x8b, 0x3b, 0xd5, 0x9b, 0x3b, 0xc2, 0x9e, - 0x1c, 0xfd, 0x46, 0x46, 0xf4, 0x81, 0x4b, 0xbd, 0x31, 0xf7, 0x33, 0x5d, 0x08, 0xbe, 0xec, 0x67, - 0x46, 0x09, 0x61, 0x58, 0x3a, 0x4c, 0x12, 0xed, 0xab, 0x0b, 0xcc, 0xde, 0xb5, 0x3c, 0x7b, 0xb2, - 0x1c, 0x37, 0xb6, 0x15, 0x06, 0xda, 0xa6, 0x54, 0x27, 0xb2, 0xa5, 0x14, 0x2c, 0xfa, 0x01, 0x6c, - 0x3e, 0x27, 0xd4, 0xf4, 0x9c, 0x9f, 0x62, 0x8b, 0xbb, 0xee, 0x3f, 0x36, 0xfd, 0x2e, 0xf6, 0xd5, - 0xf2, 0x76, 0x71, 0xa7, 0xa2, 0x5f, 0x0d, 0x03, 0x6d, 0xdb, 0xcd, 0x95, 0x90, 0x30, 0xcf, 0xc0, - 0x40, 0x77, 0x60, 0xe5, 0xf9, 0xb0, 0xdf, 0xc6, 0xde, 0xfe, 0x31, 0xab, 0x34, 0x5f, 0x5d, 0x64, - 0xe5, 0x88, 0xc2, 0x40, 0x5b, 0x71, 0x53, 0x1c, 0x23, 0x23, 0x89, 0xee, 0xc3, 0xca, 0xa1, 0x63, - 0xbb, 0xd8, 0xf3, 0x9b, 0xae, 0x85, 0x47, 0xd8, 0x57, 0x2b, 0xdb, 0xc5, 0x9d, 0x92, 0xfe, 0xe5, - 0x30, 0xd0, 0x54, 0x3f, 0xc5, 0x91, 0x56, 0x92, 0xd1, 0x41, 0x06, 0x6c, 0x3e, 0x76, 0xec, 0x2e, - 0xf6, 0xe9, 0x43, 0xc7, 0x35, 0x7b, 0x2c, 0x60, 0xcf, 0x89, 0xdb, 0xc1, 0x2a, 0x6c, 0x2b, 0x3b, - 0x25, 0x1e, 0xa9, 0x6e, 0xae, 0x84, 0x71, 0x86, 0x26, 0x3a, 0x82, 0x8b, 0x53, 0x9c, 0xc8, 0x61, - 0xb5, 0xba, 0xad, 0xec, 0x2c, 0xe9, 0x57, 0xc2, 0x40, 0xd3, 0xba, 0x79, 0x02, 0xd2, 0x3a, 0xf3, - 0x11, 0xb6, 0x8e, 0x60, 0x23, 0xaf, 0x7a, 0xd0, 0x1a, 0x14, 0x5f, 0xe0, 0x31, 0xdb, 0xcc, 0x15, - 0x23, 0x7a, 0x44, 0xd7, 0x61, 0xfe, 0xc4, 0xec, 0x0d, 0xb1, 0xd8, 0xad, 0x17, 0x45, 0x61, 0xa4, - 0xb5, 0x0d, 0x2e, 0x73, 0xa7, 0x70, 0x5b, 0xd9, 0x3a, 0x82, 0xf5, 0xa9, 0x42, 0xc9, 0xc1, 0x6d, - 0xa4, 0x71, 0x55, 0x81, 0x2b, 0xab, 0x3e, 0x24, 0x5e, 0x6b, 0x24, 0x41, 0xd7, 0x7f, 0x55, 0x94, - 0xda, 0xc7, 0xf9, 0x9b, 0xcf, 0x5d, 0xa8, 0xf2, 0xb2, 0xd1, 0xc7, 0x14, 0xfb, 0xcc, 0xf0, 0x92, - 0x7e, 0x29, 0x0c, 0xb4, 0x8b, 0xdd, 0x84, 0x2c, 0x29, 0xca, 0xd2, 0xe8, 0x36, 0x00, 0x7f, 0x6d, - 0x8d, 0x07, 0x98, 0xf5, 0x9a, 0x8a, 0xae, 0x86, 0x81, 0xb6, 0xd1, 0x9d, 0x50, 0x25, 0x55, 0x49, - 0x36, 0xd1, 0x64, 0xb9, 0x2b, 0x31, 0xab, 0x92, 0x66, 0x26, 0x61, 0x92, 0x2c, 0xfa, 0x10, 0x4a, - 0x3a, 0xb1, 0xc6, 0xea, 0x3c, 0x0b, 0x51, 0x35, 0x6e, 0x94, 0xc4, 0x1a, 0xf3, 0xca, 0x6e, 0x13, - 0x6b, 0x2c, 0xa9, 0x32, 0x61, 0xd4, 0x85, 0x8d, 0x66, 0x74, 0xbe, 0x31, 0xaf, 0x9f, 0x39, 0xae, - 0xc3, 0x22, 0x16, 0x6f, 0xec, 0xb8, 0xdb, 0x4e, 0x18, 0xbc, 0x5b, 0x39, 0x39, 0x1a, 0x72, 0xb7, - 0xca, 0x43, 0xac, 0x7f, 0x0a, 0x53, 0x4d, 0x18, 0x75, 0x61, 0x49, 0x22, 0xf9, 0xaa, 0x92, 0x6a, - 0x5f, 0x19, 0x69, 0xf9, 0x5d, 0xee, 0x28, 0x52, 0x9b, 0x4e, 0x75, 0x14, 0x59, 0x1c, 0xfd, 0x52, - 0x81, 0x8d, 0xc3, 0xe9, 0xe3, 0x3c, 0xca, 0x6b, 0x64, 0xf2, 0x1b, 0x67, 0x98, 0xcc, 0x53, 0xe1, - 0xa6, 0x59, 0x20, 0x72, 0x06, 0x84, 0x54, 0x20, 0xf2, 0xd4, 0x51, 0x0b, 0xca, 0x06, 0x3b, 0xc5, - 0x7d, 0xb5, 0xc8, 0x8c, 0x5f, 0x39, 0xc3, 0xb8, 0x90, 0xe2, 0xf6, 0x58, 0xb9, 0xf2, 0xd3, 0x5f, - 0x36, 0x11, 0x43, 0xa1, 0xef, 0xc3, 0xa2, 0xc1, 0xe7, 0x0b, 0x5f, 0x2d, 0x31, 0xd8, 0xab, 0x67, - 0xc2, 0x72, 0x31, 0x8e, 0xbb, 0x19, 0x06, 0x1a, 0x12, 0x93, 0x89, 0x0c, 0x3c, 0x41, 0x43, 0x3f, - 0x02, 0x68, 0xba, 0x27, 0x66, 0xcf, 0xb1, 0x5a, 0xa3, 0xf8, 0x84, 0x79, 0xff, 0x0c, 0xec, 0x44, - 0x90, 0xa3, 0xb3, 0xca, 0x75, 0x26, 0x44, 0xb9, 0x72, 0x13, 0x51, 0xf4, 0x4d, 0x28, 0x3d, 0x25, - 0x76, 0x5c, 0x74, 0x2b, 0x02, 0xfb, 0x29, 0xb1, 0xd9, 0x01, 0xcf, 0x8a, 0xb7, 0x47, 0x6c, 0x59, - 0x9b, 0xc9, 0xa3, 0x5f, 0x28, 0x70, 0xf5, 0xb0, 0xd3, 0xc5, 0xd6, 0xb0, 0x87, 0xad, 0x07, 0x23, - 0xdc, 0x19, 0x52, 0x6c, 0x1d, 0xee, 0x19, 0x87, 0xbc, 0xd1, 0x1f, 0x78, 0xf8, 0x84, 0x15, 0x9f, - 0x38, 0x35, 0x6e, 0x86, 0x81, 0xd6, 0xf0, 0x67, 0x90, 0x97, 0x0c, 0xcd, 0x84, 0x8f, 0x7e, 0xa3, - 0xc0, 0xd7, 0xa6, 0x04, 0x13, 0x07, 0xb3, 0xcb, 0x59, 0x64, 0xcb, 0xb9, 0x1d, 0x06, 0xda, 0x2d, - 0x7f, 0x66, 0x2d, 0x69, 0x51, 0xe7, 0xb0, 0xb5, 0xf5, 0x1c, 0xd6, 0xa7, 0xf6, 0x4d, 0x4e, 0x83, - 0xbd, 0x92, 0x6e, 0xb0, 0xcb, 0x71, 0x7e, 0x47, 0x4d, 0xf7, 0x98, 0xc8, 0x0d, 0xfb, 0x63, 0xb8, - 0x74, 0xe6, 0xa6, 0xc8, 0xc1, 0xbd, 0x9a, 0xc6, 0x8d, 0x73, 0x7b, 0xb8, 0x67, 0x64, 0x81, 0x9f, - 0xc1, 0x92, 0x5c, 0xf0, 0x39, 0x58, 0x5f, 0x4d, 0x63, 0xad, 0x0b, 0x2c, 0xae, 0x95, 0x85, 0x7b, - 0x02, 0xcb, 0xa9, 0x42, 0x9f, 0x7d, 0x6d, 0x42, 0x4d, 0x06, 0x7b, 0x0a, 0xab, 0x99, 0xca, 0xfe, - 0x2f, 0x42, 0x58, 0xff, 0x43, 0x01, 0xca, 0x0f, 0x31, 0x8e, 0xc8, 0xe8, 0x1a, 0x94, 0x1f, 0x99, - 0xfe, 0x77, 0x7d, 0x6c, 0x31, 0xa8, 0x92, 0x5e, 0x0d, 0x03, 0xad, 0x6c, 0x73, 0x92, 0x11, 0xf3, - 0x50, 0x0f, 0x8a, 0x0f, 0x31, 0x16, 0x87, 0xd0, 0x27, 0x61, 0xa0, 0x2d, 0x1f, 0x63, 0xe9, 0x04, - 0xf9, 0xfd, 0xdf, 0xb4, 0x07, 0x7d, 0x93, 0x76, 0x77, 0xdb, 0x8e, 0xdd, 0x68, 0xba, 0xf4, 0xee, - 0x39, 0xa6, 0xf8, 0x86, 0xee, 0xd8, 0x4d, 0x97, 0xee, 0x99, 0x3e, 0xc5, 0x9e, 0x11, 0x99, 0x41, - 0x9f, 0x29, 0xb0, 0xd2, 0x74, 0x1d, 0xea, 0x98, 0xbd, 0x03, 0xd3, 0xb1, 0x22, 0xcb, 0x45, 0x66, - 0x19, 0x47, 0x53, 0x8e, 0x93, 0xe2, 0xbc, 0x8b, 0x45, 0x64, 0x8c, 0xd7, 0xff, 0xaa, 0xc0, 0x02, - 0x0f, 0x23, 0xda, 0x87, 0xaa, 0x54, 0xce, 0x2c, 0x66, 0xd5, 0x9b, 0x68, 0xba, 0x1b, 0xf1, 0x93, - 0x5a, 0x3a, 0x1a, 0xe4, 0x93, 0x5a, 0x92, 0x43, 0xdf, 0x9a, 0xe4, 0x22, 0x53, 0x06, 0x82, 0xca, - 0x1b, 0xef, 0x31, 0x7f, 0x91, 0x1b, 0x6f, 0x9c, 0xc1, 0x3b, 0xb0, 0xc2, 0x77, 0xa1, 0x43, 0xdc, - 0x7d, 0xcf, 0xc2, 0x1e, 0x8b, 0x95, 0x98, 0x26, 0x71, 0x8a, 0x63, 0x64, 0x24, 0xeb, 0xff, 0x52, - 0xa0, 0x2c, 0xb6, 0x02, 0x22, 0x70, 0x21, 0x67, 0x63, 0x09, 0x0f, 0xb7, 0xe2, 0x7d, 0x33, 0x2d, - 0xa1, 0x7f, 0x25, 0x0c, 0xb4, 0xf7, 0x72, 0x4e, 0x22, 0x69, 0xb1, 0x79, 0xc8, 0xff, 0x5f, 0xcf, - 0x5b, 0x50, 0x16, 0xfd, 0x1d, 0xd5, 0xa3, 0xe4, 0xb2, 0x69, 0x87, 0x6d, 0x26, 0x1d, 0xc2, 0x40, - 0x5b, 0xa0, 0x8c, 0x62, 0x08, 0x0e, 0xba, 0x06, 0xc5, 0xa7, 0xc4, 0x16, 0xeb, 0x84, 0xe4, 0x80, - 0xd0, 0xcb, 0x61, 0xa0, 0x15, 0x7b, 0xc4, 0x36, 0x22, 0x7e, 0xfd, 0x53, 0x05, 0x20, 0x69, 0x07, - 0xe8, 0x23, 0x58, 0xe0, 0x6f, 0x22, 0x8a, 0xab, 0xa9, 0x8e, 0xd1, 0x1a, 0xe9, 0x1b, 0x61, 0xa0, - 0xad, 0xf1, 0x43, 0x55, 0x72, 0x50, 0x28, 0xe5, 0xf8, 0x57, 0x98, 0xd9, 0xbf, 0x7f, 0x2a, 0xf9, - 0x37, 0x42, 0xf4, 0x01, 0x54, 0x1f, 0x99, 0xfe, 0x81, 0x47, 0x4e, 0x1c, 0x6b, 0xb2, 0xe9, 0x57, - 0xc3, 0x40, 0xab, 0xda, 0x09, 0xd9, 0x90, 0x65, 0x84, 0x8a, 0x81, 0x8f, 0x87, 0x6e, 0xa4, 0x52, - 0x48, 0xa9, 0xc4, 0x64, 0x43, 0x96, 0x41, 0xb7, 0x60, 0x29, 0x42, 0xc0, 0xae, 0xd9, 0x8b, 0xee, - 0x3f, 0x2c, 0x31, 0x25, 0x7d, 0x2d, 0x0c, 0xb4, 0x25, 0x5b, 0xa2, 0x1b, 0x29, 0xa9, 0xc8, 0xe1, - 0x67, 0xe6, 0x88, 0x91, 0x3c, 0x7e, 0x52, 0x95, 0x98, 0x1e, 0x73, 0xb8, 0x9f, 0xe2, 0x18, 0x19, - 0xc9, 0xfa, 0x31, 0x5c, 0xf8, 0x5e, 0xd4, 0x20, 0x4d, 0x4a, 0x3c, 0xc3, 0xa4, 0x8e, 0x6b, 0xb3, - 0x14, 0x5c, 0x87, 0xca, 0xc1, 0xb0, 0xdd, 0x73, 0x3a, 0x4f, 0xe2, 0x66, 0xa9, 0x2f, 0x87, 0x81, - 0x56, 0x19, 0xc4, 0x44, 0x23, 0xe1, 0x47, 0x95, 0xc0, 0x55, 0x99, 0x8f, 0x05, 0x5e, 0x09, 0x1e, - 0xa3, 0x18, 0x82, 0x53, 0xff, 0x8b, 0x02, 0x6b, 0x13, 0x43, 0x3e, 0x27, 0x46, 0x5d, 0x34, 0x3d, - 0xdc, 0xb3, 0x2e, 0x2a, 0x86, 0xfb, 0x64, 0xa4, 0xd7, 0x60, 0xfe, 0xc1, 0x80, 0x74, 0xba, 0x22, - 0x8f, 0x95, 0x30, 0xd0, 0xe6, 0x71, 0x44, 0x30, 0x38, 0x1d, 0x79, 0xb0, 0x91, 0xc5, 0x66, 0xfb, - 0x83, 0xcf, 0x69, 0xf1, 0x26, 0xcc, 0xf1, 0x93, 0x8f, 0x83, 0x27, 0x39, 0xba, 0xf2, 0x38, 0x98, - 0x87, 0x5d, 0xff, 0x6d, 0x01, 0x2a, 0x06, 0x19, 0xba, 0xbc, 0x64, 0x35, 0x98, 0x67, 0x2f, 0xa2, - 0x30, 0xd8, 0x12, 0xbd, 0x88, 0x60, 0x70, 0x7a, 0x94, 0xa3, 0xcc, 0x05, 0xb4, 0xc0, 0x2e, 0xa0, - 0x2c, 0x47, 0xe9, 0x0b, 0xe8, 0xd4, 0xb5, 0xf3, 0xdb, 0xb0, 0xc6, 0x92, 0xf5, 0x31, 0x2b, 0xae, - 0x01, 0xf1, 0x45, 0x65, 0x2c, 0xf2, 0x8d, 0xd0, 0xce, 0xf0, 0x8c, 0x29, 0xe9, 0x24, 0xd0, 0x16, - 0x2b, 0x8d, 0x54, 0xa0, 0xad, 0x38, 0xd0, 0x56, 0x12, 0xe8, 0xf9, 0x33, 0x02, 0x7d, 0x1d, 0x2a, - 0x2d, 0xa7, 0x8f, 0x7d, 0x6a, 0xf6, 0x07, 0xea, 0x02, 0x73, 0x95, 0x95, 0x05, 0x8d, 0x89, 0x46, - 0xc2, 0xaf, 0xff, 0x0c, 0x80, 0xf9, 0xee, 0xc7, 0x27, 0xe6, 0x2c, 0xb9, 0xfe, 0x8e, 0xac, 0x24, - 0xa6, 0xfc, 0xf8, 0x3a, 0x33, 0x09, 0x37, 0x9f, 0x4f, 0xbd, 0x89, 0x9c, 0x3c, 0x9f, 0x26, 0xda, - 0xf5, 0x0f, 0xa0, 0x7c, 0x30, 0x6c, 0x3f, 0xc1, 0x63, 0x1f, 0xbd, 0x0f, 0xa5, 0xe8, 0x97, 0xdd, - 0x54, 0x96, 0x78, 0xd0, 0x5f, 0xe0, 0x71, 0x6a, 0x34, 0x8d, 0xf8, 0xf5, 0x3f, 0x15, 0x60, 0x3d, - 0x49, 0x77, 0xac, 0x3d, 0xe3, 0xda, 0x3f, 0x53, 0x60, 0x93, 0x3d, 0x4f, 0x21, 0x08, 0x47, 0x6e, - 0x65, 0x2b, 0x31, 0xe6, 0x37, 0xf2, 0xd5, 0xf8, 0x30, 0xae, 0x85, 0x81, 0x76, 0xf9, 0x24, 0xcb, - 0x93, 0x3f, 0x98, 0xe4, 0x6b, 0x27, 0xe9, 0x2c, 0xe6, 0xa7, 0x73, 0xeb, 0x08, 0x2e, 0x7f, 0x81, - 0x61, 0x79, 0x56, 0x5a, 0xfe, 0xc2, 0xd1, 0x4b, 0x68, 0xc9, 0xc3, 0xd2, 0x1f, 0x0b, 0xb0, 0x38, - 0xf9, 0xfc, 0x34, 0x63, 0xfc, 0xee, 0xc0, 0x0a, 0xab, 0xdc, 0xa4, 0xc4, 0x0a, 0x49, 0x1f, 0x6b, - 0xa7, 0x38, 0x46, 0x46, 0x12, 0xf5, 0xa7, 0x3f, 0xaa, 0x15, 0x53, 0xd7, 0xa9, 0x98, 0xfc, 0x3f, - 0xf9, 0xa0, 0xf6, 0x0e, 0x3f, 0xad, 0xd4, 0x6d, 0x58, 0x61, 0xdf, 0x71, 0xa2, 0xd6, 0xce, 0xaf, - 0x29, 0x33, 0x86, 0xaf, 0x91, 0xfa, 0x04, 0xc1, 0x67, 0xce, 0x95, 0x30, 0xd0, 0x20, 0xf9, 0x04, - 0x21, 0x7f, 0x78, 0xa8, 0x37, 0x60, 0x9e, 0xa9, 0xce, 0x88, 0xaf, 0x0f, 0x5f, 0xbe, 0xae, 0xcd, - 0xbd, 0x7a, 0x5d, 0x9b, 0xfb, 0xfc, 0x75, 0x4d, 0xf9, 0xf9, 0x69, 0x4d, 0xf9, 0xdd, 0x69, 0x4d, - 0xf9, 0xf3, 0x69, 0x4d, 0x79, 0x79, 0x5a, 0x53, 0x5e, 0x9d, 0xd6, 0x94, 0xbf, 0x9f, 0xd6, 0x94, - 0x7f, 0x9c, 0xd6, 0xe6, 0x3e, 0x3f, 0xad, 0x29, 0xbf, 0x7e, 0x53, 0x9b, 0x7b, 0xf9, 0xa6, 0x36, - 0xf7, 0xea, 0x4d, 0x6d, 0xee, 0x93, 0xf3, 0x8c, 0x94, 0xbb, 0xe2, 0x9f, 0x22, 0x77, 0xc5, 0x6f, - 0x7b, 0x81, 0x05, 0xec, 0xc3, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xf0, 0x74, 0x8f, 0x10, 0x2e, - 0x19, 0x00, 0x00, + // 1972 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcd, 0x8f, 0x1b, 0x49, + 0x15, 0x9f, 0xb6, 0x3d, 0xe3, 0xf1, 0xf3, 0x7c, 0xa5, 0x32, 0x19, 0x3a, 0x13, 0xd6, 0x3d, 0x38, + 0xd9, 0x65, 0x44, 0x88, 0xcd, 0x66, 0x23, 0x14, 0x25, 0x5a, 0x41, 0x7a, 0xf2, 0x65, 0xf2, 0x31, + 0xa3, 0x1e, 0xc3, 0x6e, 0x56, 0x48, 0xd0, 0x76, 0xd7, 0xb4, 0x5b, 0xb1, 0xbb, 0x4c, 0x77, 0x79, + 0xb0, 0xb9, 0xc0, 0x89, 0xe5, 0xc0, 0x4a, 0x5c, 0x90, 0xb8, 0x71, 0x45, 0x1c, 0xb8, 0xf2, 0x1f, + 0x20, 0x4e, 0x28, 0x27, 0x94, 0x53, 0x43, 0x26, 0x17, 0xd4, 0x07, 0xb4, 0x37, 0xae, 0xa8, 0xab, + 0xaa, 0xdd, 0xd5, 0xed, 0x9e, 0x95, 0x27, 0x10, 0xed, 0x65, 0xdc, 0xfd, 0x3e, 0x7e, 0xaf, 0xde, + 0x47, 0xbd, 0x7a, 0xd5, 0x03, 0x88, 0x8c, 0xe8, 0x90, 0x78, 0x54, 0xef, 0x93, 0xee, 0xf3, 0xc6, + 0xd0, 0x23, 0x94, 0xa0, 0x45, 0xf6, 0xb3, 0x7d, 0xcd, 0x76, 0x68, 0x6f, 0xd4, 0x69, 0x74, 0xc9, + 0xa0, 0x69, 0x13, 0x9b, 0x34, 0x19, 0xb9, 0x33, 0x3a, 0x62, 0x6f, 0xec, 0x85, 0x3d, 0x71, 0xad, + 0xed, 0x0f, 0x25, 0xf1, 0xc1, 0xa8, 0x4f, 0x9d, 0x63, 0xec, 0xf9, 0xe3, 0xe6, 0x60, 0x7c, 0xad, + 0xdb, 0x33, 0x1d, 0xf7, 0x5a, 0x97, 0x78, 0xf8, 0x9a, 0x4d, 0x9a, 0x96, 0x49, 0xcd, 0x66, 0x27, + 0x32, 0xc7, 0xff, 0x0a, 0xf5, 0x3b, 0x67, 0x51, 0xa7, 0x9e, 0xe9, 0xfa, 0x66, 0x97, 0x3a, 0xc4, + 0x6d, 0xf6, 0x89, 0x2d, 0x20, 0x5a, 0x6f, 0x0a, 0x21, 0x3d, 0x0b, 0xa8, 0x67, 0x67, 0x81, 0xf2, + 0x07, 0xa6, 0x47, 0xf7, 0x88, 0x4b, 0x3d, 0xb3, 0x4b, 0x0d, 0xec, 0x8f, 0xfa, 0x34, 0x8f, 0xf6, + 0x26, 0x8e, 0x7a, 0xb8, 0x8b, 0x9d, 0x21, 0x8d, 0x7f, 0x05, 0xc4, 0xde, 0xd9, 0x20, 0x7e, 0x6a, + 0x7a, 0x56, 0x7b, 0x3c, 0x7d, 0x10, 0x20, 0xfb, 0x67, 0x01, 0x31, 0xfb, 0x14, 0x7b, 0xd8, 0xba, + 0xd3, 0xed, 0x92, 0x91, 0x4b, 0x33, 0xaf, 0x6f, 0x12, 0x7e, 0x9f, 0x9a, 0x14, 0xef, 0xf5, 0x4c, + 0xd7, 0xc6, 0xf2, 0x33, 0x87, 0xaa, 0xff, 0x76, 0x19, 0x56, 0xf6, 0xa5, 0xc2, 0x44, 0x4d, 0x28, + 0x1f, 0xf6, 0x4c, 0xcf, 0x6a, 0xdd, 0x55, 0x95, 0x1d, 0x65, 0x77, 0x55, 0xbf, 0x10, 0x06, 0xda, + 0x39, 0x9f, 0x93, 0xbe, 0x49, 0x06, 0x0e, 0xc5, 0x83, 0x21, 0x9d, 0x18, 0xb1, 0x14, 0x7a, 0x00, + 0x15, 0xa6, 0x79, 0xd7, 0xa4, 0xa6, 0x5a, 0xd8, 0x51, 0x76, 0xab, 0xd7, 0x37, 0x38, 0x78, 0x63, + 0x4a, 0xd7, 0xbf, 0x12, 0x06, 0xda, 0xf9, 0x4e, 0xfc, 0x2a, 0xc1, 0x24, 0xba, 0xe8, 0x47, 0xb0, + 0xde, 0x4e, 0xca, 0xe3, 0x80, 0x90, 0xbe, 0x5a, 0x64, 0x70, 0x5b, 0x02, 0x2e, 0xc3, 0xd5, 0xdf, + 0x09, 0x03, 0xed, 0x22, 0x4d, 0x13, 0x25, 0xe8, 0x2c, 0x1a, 0xf2, 0x61, 0xf3, 0x21, 0x36, 0x2d, + 0xec, 0x3d, 0x30, 0xfd, 0x3d, 0xe2, 0xfa, 0xa3, 0xc1, 0x30, 0xe2, 0xa9, 0x25, 0x66, 0xe5, 0x92, + 0xb0, 0x92, 0x27, 0xa2, 0xd7, 0xc3, 0x40, 0xab, 0xf5, 0x72, 0x38, 0x92, 0xbd, 0x5c, 0x70, 0xf4, + 0x13, 0x58, 0xbf, 0x93, 0xca, 0xa1, 0xaf, 0x2e, 0xee, 0x14, 0x77, 0xab, 0xd7, 0x77, 0x85, 0x3d, + 0x39, 0xfa, 0x8d, 0x8c, 0xe8, 0x3d, 0x97, 0x7a, 0x13, 0xee, 0x67, 0xba, 0x10, 0x7c, 0xd9, 0xcf, + 0x8c, 0x12, 0xfa, 0x18, 0x56, 0x0e, 0x93, 0x44, 0xfb, 0xea, 0x12, 0xf3, 0x4f, 0x15, 0xf6, 0x64, + 0xd6, 0x7d, 0xe2, 0xb5, 0xc7, 0xfa, 0x76, 0x18, 0x68, 0x5b, 0x52, 0x69, 0xc8, 0xe0, 0x29, 0x24, + 0xf4, 0x43, 0xd8, 0x7a, 0x4a, 0xa8, 0xe9, 0x39, 0x3f, 0xc3, 0x16, 0xf7, 0xd6, 0x7f, 0x68, 0xfa, + 0x3d, 0xec, 0xab, 0xe5, 0x9d, 0xe2, 0x6e, 0x45, 0xbf, 0x12, 0x06, 0xda, 0x8e, 0x9b, 0x2b, 0x21, + 0x61, 0x9e, 0x82, 0x81, 0x6e, 0xc1, 0xda, 0xd3, 0xd1, 0xa0, 0x83, 0xbd, 0xfd, 0x23, 0x56, 0x5c, + 0xbe, 0xba, 0xcc, 0x2a, 0x10, 0x85, 0x81, 0xb6, 0xe6, 0xa6, 0x38, 0x46, 0x46, 0x12, 0xdd, 0x85, + 0xb5, 0x43, 0xc7, 0x76, 0xb1, 0xe7, 0xb7, 0x5c, 0x0b, 0x8f, 0xb1, 0xaf, 0x56, 0x76, 0x8a, 0xbb, + 0x25, 0xfd, 0xab, 0x61, 0xa0, 0xa9, 0x7e, 0x8a, 0x23, 0xad, 0x24, 0xa3, 0x83, 0x0c, 0xd8, 0x7a, + 0xe8, 0xd8, 0x3d, 0xec, 0xd3, 0xfb, 0x8e, 0x6b, 0xf6, 0x59, 0x4e, 0x9e, 0x12, 0xb7, 0x8b, 0x55, + 0xd8, 0x51, 0x76, 0x4b, 0x3c, 0x52, 0xbd, 0x5c, 0x09, 0xe3, 0x14, 0x4d, 0xf4, 0x0c, 0x2e, 0xcc, + 0x70, 0x22, 0x87, 0xd5, 0xea, 0x8e, 0xb2, 0xbb, 0xa2, 0x5f, 0x0e, 0x03, 0x4d, 0xeb, 0xe5, 0x09, + 0x48, 0xeb, 0xcc, 0x47, 0xd8, 0x7e, 0x06, 0x9b, 0x79, 0x05, 0x83, 0x36, 0xa0, 0xf8, 0x1c, 0x4f, + 0xd8, 0xfe, 0xad, 0x18, 0xd1, 0x23, 0xba, 0x0a, 0x8b, 0xc7, 0x66, 0x7f, 0x84, 0xc5, 0x06, 0xbd, + 0x20, 0x6a, 0x21, 0xad, 0x6d, 0x70, 0x99, 0x5b, 0x85, 0x9b, 0x4a, 0xfd, 0xd7, 0x45, 0x69, 0x5b, + 0x9f, 0xbd, 0x29, 0xdc, 0x86, 0x2a, 0xcf, 0xad, 0x3e, 0xa1, 0xd8, 0x67, 0x56, 0x57, 0xf4, 0x8b, + 0x61, 0xa0, 0x5d, 0xe8, 0x25, 0x64, 0x49, 0x51, 0x96, 0x46, 0x37, 0x01, 0xf8, 0x6b, 0x7b, 0x32, + 0xc4, 0xac, 0x07, 0x54, 0x74, 0x35, 0x0c, 0xb4, 0xcd, 0xde, 0x94, 0x2a, 0xa9, 0x4a, 0xb2, 0x89, + 0x26, 0x0b, 0x70, 0x89, 0x59, 0x95, 0x34, 0x33, 0x51, 0x95, 0x64, 0xd1, 0x07, 0x50, 0xd2, 0x89, + 0x35, 0x51, 0x17, 0x59, 0x7c, 0xaa, 0x71, 0x03, 0x23, 0xd6, 0x84, 0x97, 0x5f, 0x87, 0x58, 0x13, + 0x49, 0x95, 0x09, 0xa3, 0x1e, 0x6c, 0xb6, 0xa2, 0x73, 0x87, 0x79, 0xfd, 0xc4, 0x71, 0x1d, 0x16, + 0xb1, 0x68, 0xc3, 0x15, 0xa5, 0x2e, 0x38, 0x65, 0xf0, 0x2e, 0xe2, 0xe4, 0x68, 0xc8, 0x5d, 0x24, + 0x0f, 0xb1, 0xfe, 0x29, 0xcc, 0x34, 0x47, 0xd4, 0x83, 0x15, 0x89, 0xe4, 0xab, 0x4a, 0xaa, 0xad, + 0x64, 0xa4, 0xe5, 0x77, 0xd1, 0x56, 0x58, 0x31, 0x4b, 0xed, 0x33, 0xb5, 0xed, 0x65, 0x71, 0xf4, + 0x2b, 0x05, 0x36, 0x0f, 0x67, 0x8f, 0xd9, 0x28, 0xaf, 0x91, 0xc9, 0x6f, 0x9d, 0x62, 0x32, 0x4f, + 0x85, 0x9b, 0x66, 0x81, 0xc8, 0x39, 0xb8, 0x53, 0x81, 0xc8, 0x53, 0x47, 0x6d, 0x28, 0x1b, 0xec, + 0x74, 0xf5, 0xd5, 0x22, 0x33, 0x7e, 0xf9, 0x14, 0xe3, 0x42, 0x8a, 0xdb, 0x63, 0xe5, 0xca, 0x4f, + 0x65, 0xd9, 0x44, 0x0c, 0x85, 0x3e, 0x86, 0x65, 0x83, 0x9f, 0xfb, 0xbe, 0x5a, 0x62, 0xb0, 0x57, + 0x4e, 0x85, 0xe5, 0x62, 0x1c, 0x77, 0x2b, 0x0c, 0x34, 0x24, 0x26, 0x06, 0x19, 0x78, 0x8a, 0x86, + 0x7e, 0x0c, 0xd0, 0x72, 0x8f, 0xcd, 0xbe, 0x63, 0xb5, 0xc7, 0x71, 0xe7, 0x7f, 0xef, 0x14, 0xec, + 0x44, 0x90, 0xa3, 0xb3, 0xca, 0x75, 0xa6, 0x44, 0xb9, 0x72, 0x13, 0x51, 0xf4, 0x6d, 0x28, 0x3d, + 0x26, 0x76, 0x5c, 0x74, 0x6b, 0x02, 0xfb, 0x31, 0xb1, 0xd9, 0xc1, 0xcb, 0x8a, 0xb7, 0x4f, 0x6c, + 0x59, 0x9b, 0xc9, 0xa3, 0x5f, 0x2a, 0x70, 0xe5, 0xb0, 0xdb, 0xc3, 0xd6, 0xa8, 0x8f, 0xad, 0x7b, + 0x63, 0xdc, 0x1d, 0x51, 0x6c, 0x1d, 0xee, 0x19, 0x87, 0xbc, 0x1b, 0x1f, 0x78, 0xf8, 0x98, 0x15, + 0x9f, 0x68, 0xed, 0xd7, 0xc3, 0x40, 0x6b, 0xf8, 0x73, 0xc8, 0x4b, 0x86, 0xe6, 0xc2, 0x47, 0xbf, + 0x53, 0xe0, 0x1b, 0x33, 0x82, 0x89, 0x83, 0xd9, 0xe5, 0x2c, 0xb3, 0xe5, 0xdc, 0x0c, 0x03, 0xed, + 0x86, 0x3f, 0xb7, 0x96, 0xb4, 0xa8, 0x33, 0xd8, 0xda, 0x7e, 0x0a, 0xe7, 0x66, 0xf6, 0x4d, 0x4e, + 0x77, 0xbd, 0x9c, 0xee, 0xae, 0xab, 0x71, 0x7e, 0xc7, 0x2d, 0xf7, 0x88, 0x48, 0x5d, 0x75, 0xfb, + 0x23, 0xb8, 0x78, 0xea, 0xa6, 0xc8, 0xc1, 0xbd, 0x92, 0xc6, 0x8d, 0x73, 0x7b, 0xb8, 0x67, 0x64, + 0x81, 0x9f, 0xc0, 0x8a, 0x5c, 0xf0, 0x39, 0x58, 0x5f, 0x4f, 0x63, 0x9d, 0x13, 0x58, 0x5c, 0x2b, + 0x0b, 0xf7, 0x08, 0x56, 0x53, 0x85, 0x3e, 0xff, 0xda, 0x84, 0x9a, 0x0c, 0xf6, 0x18, 0xd6, 0x33, + 0x95, 0xfd, 0x3f, 0x84, 0xb0, 0xfe, 0xa7, 0x02, 0x94, 0xef, 0x63, 0x1c, 0x91, 0xd1, 0xbb, 0x50, + 0x7e, 0x60, 0xfa, 0xdf, 0xf7, 0xb1, 0xc5, 0xa0, 0x4a, 0x7a, 0x35, 0x0c, 0xb4, 0xb2, 0xcd, 0x49, + 0x46, 0xcc, 0x43, 0x7d, 0x28, 0xde, 0xc7, 0x58, 0x1c, 0x42, 0x9f, 0x84, 0x81, 0xb6, 0x7a, 0x84, + 0xa5, 0x13, 0xe4, 0x8f, 0xff, 0xd0, 0xee, 0x0d, 0x4c, 0xda, 0x6b, 0x76, 0x1c, 0xbb, 0xd1, 0x72, + 0xe9, 0xed, 0x33, 0x4c, 0xd7, 0x0d, 0xdd, 0xb1, 0x5b, 0x2e, 0xdd, 0x33, 0x7d, 0x8a, 0x3d, 0x23, + 0x32, 0x83, 0x3e, 0x53, 0x60, 0xad, 0xe5, 0x3a, 0xd4, 0x31, 0xfb, 0x07, 0xa6, 0x63, 0x45, 0x96, + 0x8b, 0xcc, 0x32, 0x8e, 0x46, 0x11, 0x27, 0xc5, 0x79, 0x1b, 0x8b, 0xc8, 0x18, 0xaf, 0xff, 0x5d, + 0x81, 0x25, 0x1e, 0x46, 0xb4, 0x0f, 0x55, 0xa9, 0x9c, 0x59, 0xcc, 0xaa, 0xd7, 0xd1, 0x6c, 0x37, + 0xe2, 0x27, 0xb5, 0x74, 0x34, 0xc8, 0x27, 0xb5, 0x24, 0x87, 0xbe, 0x33, 0xcd, 0x45, 0xa6, 0x0c, + 0x04, 0x95, 0x37, 0xde, 0x23, 0xfe, 0x22, 0x37, 0xde, 0x38, 0x83, 0xb7, 0x60, 0x8d, 0xef, 0x42, + 0x87, 0xb8, 0xfb, 0x9e, 0x85, 0x3d, 0x16, 0x2b, 0x31, 0xf2, 0xe1, 0x14, 0xc7, 0xc8, 0x48, 0xd6, + 0xff, 0xa3, 0x40, 0x59, 0x6c, 0x05, 0x44, 0xe0, 0x7c, 0xce, 0xc6, 0x12, 0x1e, 0x6e, 0xc7, 0xfb, + 0x66, 0x56, 0x42, 0xff, 0x5a, 0x18, 0x68, 0xef, 0xe4, 0x9c, 0x44, 0xd2, 0x62, 0xf3, 0x90, 0xbf, + 0x5c, 0xcf, 0xdb, 0x50, 0x16, 0xfd, 0x1d, 0xd5, 0xa3, 0xe4, 0xb2, 0x69, 0x87, 0x6d, 0x26, 0x1d, + 0xc2, 0x40, 0x5b, 0xa2, 0x8c, 0x62, 0x08, 0x0e, 0x7a, 0x17, 0x8a, 0x8f, 0x89, 0x2d, 0xd6, 0x09, + 0xc9, 0x01, 0xa1, 0x97, 0xc3, 0x40, 0x2b, 0xf6, 0x89, 0x6d, 0x44, 0xfc, 0xfa, 0xa7, 0x0a, 0x40, + 0xd2, 0x0e, 0xd0, 0x87, 0xb0, 0xc4, 0xdf, 0x44, 0x14, 0xd7, 0x53, 0x1d, 0xa3, 0x3d, 0xd6, 0x37, + 0xc3, 0x40, 0xdb, 0xe0, 0x87, 0xaa, 0xe4, 0xa0, 0x50, 0xca, 0xf1, 0xaf, 0x30, 0xb7, 0x7f, 0xff, + 0x56, 0xf2, 0x6f, 0x6a, 0xe8, 0x7d, 0xa8, 0x3e, 0x30, 0xfd, 0x03, 0x8f, 0x1c, 0x3b, 0xd6, 0x74, + 0xd3, 0xaf, 0x87, 0x81, 0x56, 0xb5, 0x13, 0xb2, 0x21, 0xcb, 0x08, 0x15, 0x03, 0x1f, 0x8d, 0xdc, + 0x48, 0xa5, 0x90, 0x52, 0x89, 0xc9, 0x86, 0x2c, 0x83, 0x6e, 0xc0, 0x4a, 0x84, 0x80, 0x5d, 0xb3, + 0x1f, 0x5d, 0x52, 0x58, 0x62, 0x4a, 0xfa, 0x46, 0x18, 0x68, 0x2b, 0xb6, 0x44, 0x37, 0x52, 0x52, + 0x91, 0xc3, 0x4f, 0xcc, 0x31, 0x23, 0x79, 0xfc, 0xa4, 0x2a, 0x31, 0x3d, 0xe6, 0xf0, 0x20, 0xc5, + 0x31, 0x32, 0x92, 0xf5, 0x23, 0x38, 0xff, 0x83, 0xa8, 0x41, 0x9a, 0x94, 0x78, 0x86, 0x49, 0x1d, + 0xd7, 0x66, 0x29, 0xb8, 0x0a, 0x95, 0x83, 0x51, 0xa7, 0xef, 0x74, 0x1f, 0xc5, 0xcd, 0x52, 0x5f, + 0x0d, 0x03, 0xad, 0x32, 0x8c, 0x89, 0x46, 0xc2, 0x8f, 0x2a, 0x81, 0xab, 0x32, 0x1f, 0x0b, 0xbc, + 0x12, 0x3c, 0x46, 0x31, 0x04, 0xa7, 0xfe, 0x37, 0x05, 0x36, 0xa6, 0x86, 0x7c, 0x4e, 0x8c, 0xba, + 0x68, 0x7a, 0xb8, 0x67, 0x5d, 0x54, 0x0c, 0xf7, 0xc9, 0x48, 0xaf, 0xc1, 0xe2, 0xbd, 0x21, 0xe9, + 0xf6, 0x44, 0x1e, 0x2b, 0x61, 0xa0, 0x2d, 0xe2, 0x88, 0x60, 0x70, 0x3a, 0xf2, 0x60, 0x33, 0x8b, + 0xcd, 0xf6, 0x07, 0x9f, 0xd3, 0xe2, 0x4d, 0x98, 0xe3, 0x27, 0x1f, 0x07, 0x8f, 0x73, 0x74, 0xe5, + 0x71, 0x30, 0x0f, 0xbb, 0xfe, 0xfb, 0x02, 0x54, 0x0c, 0x32, 0x72, 0x79, 0xc9, 0x6a, 0xb0, 0xc8, + 0x5e, 0x44, 0x61, 0xb0, 0x25, 0x7a, 0x11, 0xc1, 0xe0, 0xf4, 0x28, 0x47, 0x99, 0x5b, 0x62, 0x81, + 0xdd, 0x12, 0x59, 0x8e, 0xd2, 0xb7, 0xc4, 0x99, 0xbb, 0xe1, 0x77, 0x61, 0x83, 0x25, 0xeb, 0x23, + 0x56, 0x5c, 0x43, 0xe2, 0x8b, 0xca, 0x58, 0xe6, 0x1b, 0xa1, 0x93, 0xe1, 0x19, 0x33, 0xd2, 0x49, + 0xa0, 0x2d, 0x56, 0x1a, 0xa9, 0x40, 0x5b, 0x71, 0xa0, 0xad, 0x24, 0xd0, 0x8b, 0xa7, 0x04, 0xfa, + 0x2a, 0x54, 0xda, 0xce, 0x00, 0xfb, 0xd4, 0x1c, 0x0c, 0xd9, 0xe5, 0xbe, 0xc4, 0xcb, 0x82, 0xc6, + 0x44, 0x23, 0xe1, 0xd7, 0x7f, 0x0e, 0xc0, 0x7c, 0xf7, 0xe3, 0x13, 0x73, 0x9e, 0x5c, 0x7f, 0x4f, + 0x56, 0x12, 0x53, 0x7e, 0x7c, 0x9d, 0x99, 0x86, 0x9b, 0xcf, 0xa7, 0xde, 0x54, 0x4e, 0x9e, 0x4f, + 0x13, 0xed, 0xfa, 0xfb, 0x50, 0x3e, 0x18, 0x75, 0x1e, 0xe1, 0x89, 0x8f, 0xde, 0x83, 0x52, 0xf4, + 0xcb, 0x6e, 0x2a, 0x2b, 0x3c, 0xe8, 0xcf, 0xf1, 0x24, 0x35, 0x9a, 0x46, 0xfc, 0xfa, 0x5f, 0x0a, + 0x70, 0x2e, 0x49, 0x77, 0xac, 0x3d, 0xe7, 0xda, 0x3f, 0x53, 0x60, 0x8b, 0x3d, 0xcf, 0x20, 0x08, + 0x47, 0x6e, 0x64, 0x2b, 0x31, 0xe6, 0x37, 0xf2, 0xd5, 0xf8, 0x30, 0xae, 0x85, 0x81, 0x76, 0xe9, + 0x38, 0xcb, 0x93, 0xbf, 0x6a, 0xe4, 0x6b, 0x27, 0xe9, 0x2c, 0xe6, 0xa7, 0x73, 0xfb, 0x19, 0x5c, + 0xfa, 0x02, 0xc3, 0xf2, 0xac, 0xb4, 0xfa, 0x85, 0xa3, 0x97, 0xd0, 0x92, 0x87, 0xa5, 0x3f, 0x17, + 0x60, 0x79, 0xfa, 0x59, 0x68, 0xce, 0xf8, 0xdd, 0x82, 0x35, 0x56, 0xb9, 0x49, 0x89, 0x15, 0x92, + 0x3e, 0xd6, 0x49, 0x71, 0x8c, 0x8c, 0x24, 0x1a, 0xcc, 0x7e, 0xec, 0x2a, 0xa6, 0xae, 0x53, 0x31, + 0xf9, 0xff, 0xf2, 0xa1, 0xeb, 0x6d, 0x7e, 0xff, 0xb0, 0x61, 0x8d, 0x7d, 0x6c, 0x89, 0x5a, 0x3b, + 0xbf, 0xa6, 0xcc, 0x19, 0xbe, 0x46, 0xea, 0x13, 0x04, 0x9f, 0x39, 0xd7, 0xc2, 0x40, 0x83, 0xe4, + 0x13, 0x84, 0xfc, 0xe1, 0xa1, 0xde, 0x80, 0x45, 0xa6, 0x3a, 0x27, 0xbe, 0x3e, 0x7a, 0xf1, 0xaa, + 0xb6, 0xf0, 0xf2, 0x55, 0x6d, 0xe1, 0xf3, 0x57, 0x35, 0xe5, 0x17, 0x27, 0x35, 0xe5, 0x0f, 0x27, + 0x35, 0xe5, 0xaf, 0x27, 0x35, 0xe5, 0xc5, 0x49, 0x4d, 0x79, 0x79, 0x52, 0x53, 0xfe, 0x79, 0x52, + 0x53, 0xfe, 0x75, 0x52, 0x5b, 0xf8, 0xfc, 0xa4, 0xa6, 0xfc, 0xe6, 0x75, 0x6d, 0xe1, 0xc5, 0xeb, + 0xda, 0xc2, 0xcb, 0xd7, 0xb5, 0x85, 0x4f, 0xce, 0x32, 0x52, 0x36, 0xc5, 0x3f, 0x2b, 0x6e, 0x8b, + 0xdf, 0xce, 0x12, 0x0b, 0xd8, 0x07, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xb1, 0xba, 0xa6, 0x17, + 0xc6, 0x18, 0x00, 0x00, } func (this *OutportBlock) Equal(that interface{}) bool { @@ -1315,14 +1313,9 @@ func (this *OutportBlock) Equal(that interface{}) bool { return false } } - if len(this.StateChanges) != len(that1.StateChanges) { + if !this.StateChanges.Equal(that1.StateChanges) { return false } - for i := range this.StateChanges { - if !this.StateChanges[i].Equal(that1.StateChanges[i]) { - return false - } - } if len(this.NotarizedHeadersHashes) != len(that1.NotarizedHeadersHashes) { return false } @@ -1979,18 +1972,8 @@ func (this *OutportBlock) GoString() string { if this.AlteredAccounts != nil { s = append(s, "AlteredAccounts: "+mapStringForAlteredAccounts+",\n") } - keysForStateChanges := make([]string, 0, len(this.StateChanges)) - for k, _ := range this.StateChanges { - keysForStateChanges = append(keysForStateChanges, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForStateChanges) - mapStringForStateChanges := "map[string]*stateChange.StateChangesForTx{" - for _, k := range keysForStateChanges { - mapStringForStateChanges += fmt.Sprintf("%#v: %#v,", k, this.StateChanges[k]) - } - mapStringForStateChanges += "}" if this.StateChanges != nil { - s = append(s, "StateChanges: "+mapStringForStateChanges+",\n") + s = append(s, "StateChanges: "+fmt.Sprintf("%#v", this.StateChanges)+",\n") } s = append(s, "NotarizedHeadersHashes: "+fmt.Sprintf("%#v", this.NotarizedHeadersHashes)+",\n") s = append(s, "NumberOfShards: "+fmt.Sprintf("%#v", this.NumberOfShards)+",\n") @@ -2385,36 +2368,17 @@ func (m *OutportBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x3a } } - if len(m.StateChanges) > 0 { - keysForStateChanges := make([]string, 0, len(m.StateChanges)) - for k := range m.StateChanges { - keysForStateChanges = append(keysForStateChanges, string(k)) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForStateChanges) - for iNdEx := len(keysForStateChanges) - 1; iNdEx >= 0; iNdEx-- { - v := m.StateChanges[string(keysForStateChanges[iNdEx])] - baseI := i - if v != nil { - { - size, err := v.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintOutportBlock(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 + if m.StateChanges != nil { + { + size, err := m.StateChanges.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i -= len(keysForStateChanges[iNdEx]) - copy(dAtA[i:], keysForStateChanges[iNdEx]) - i = encodeVarintOutportBlock(dAtA, i, uint64(len(keysForStateChanges[iNdEx]))) - i-- - dAtA[i] = 0xa - i = encodeVarintOutportBlock(dAtA, i, uint64(baseI-i)) - i-- - dAtA[i] = 0x32 + i -= size + i = encodeVarintOutportBlock(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x32 } if len(m.AlteredAccounts) > 0 { keysForAlteredAccounts := make([]string, 0, len(m.AlteredAccounts)) @@ -3517,18 +3481,9 @@ func (m *OutportBlock) Size() (n int) { n += mapEntrySize + 1 + sovOutportBlock(uint64(mapEntrySize)) } } - if len(m.StateChanges) > 0 { - for k, v := range m.StateChanges { - _ = k - _ = v - l = 0 - if v != nil { - l = v.Size() - l += 1 + sovOutportBlock(uint64(l)) - } - mapEntrySize := 1 + len(k) + sovOutportBlock(uint64(len(k))) + l - n += mapEntrySize + 1 + sovOutportBlock(uint64(mapEntrySize)) - } + if m.StateChanges != nil { + l = m.StateChanges.Size() + n += 1 + l + sovOutportBlock(uint64(l)) } if len(m.NotarizedHeadersHashes) > 0 { for _, s := range m.NotarizedHeadersHashes { @@ -4003,23 +3958,13 @@ func (this *OutportBlock) String() string { mapStringForAlteredAccounts += fmt.Sprintf("%v: %v,", k, this.AlteredAccounts[k]) } mapStringForAlteredAccounts += "}" - keysForStateChanges := make([]string, 0, len(this.StateChanges)) - for k, _ := range this.StateChanges { - keysForStateChanges = append(keysForStateChanges, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForStateChanges) - mapStringForStateChanges := "map[string]*stateChange.StateChangesForTx{" - for _, k := range keysForStateChanges { - mapStringForStateChanges += fmt.Sprintf("%v: %v,", k, this.StateChanges[k]) - } - mapStringForStateChanges += "}" 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) + `,`, `AlteredAccounts:` + mapStringForAlteredAccounts + `,`, - `StateChanges:` + mapStringForStateChanges + `,`, + `StateChanges:` + strings.Replace(fmt.Sprintf("%v", this.StateChanges), "StateChangesForTx", "stateChange.StateChangesForTx", 1) + `,`, `NotarizedHeadersHashes:` + fmt.Sprintf("%v", this.NotarizedHeadersHashes) + `,`, `NumberOfShards:` + fmt.Sprintf("%v", this.NumberOfShards) + `,`, `SignersIndexes:` + fmt.Sprintf("%v", this.SignersIndexes) + `,`, @@ -4649,104 +4594,11 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.StateChanges == nil { - m.StateChanges = make(map[string]*stateChange.StateChangesForTx) + m.StateChanges = &stateChange.StateChangesForTx{} } - var mapkey string - var mapvalue *stateChange.StateChangesForTx - for iNdEx < postIndex { - entryPreIndex := 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) - if fieldNum == 1 { - var stringLenmapkey uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOutportBlock - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapkey |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapkey := int(stringLenmapkey) - if intStringLenmapkey < 0 { - return ErrInvalidLengthOutportBlock - } - postStringIndexmapkey := iNdEx + intStringLenmapkey - if postStringIndexmapkey < 0 { - return ErrInvalidLengthOutportBlock - } - if postStringIndexmapkey > l { - return io.ErrUnexpectedEOF - } - mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) - iNdEx = postStringIndexmapkey - } else if fieldNum == 2 { - var mapmsglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOutportBlock - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - mapmsglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if mapmsglen < 0 { - return ErrInvalidLengthOutportBlock - } - postmsgIndex := iNdEx + mapmsglen - if postmsgIndex < 0 { - return ErrInvalidLengthOutportBlock - } - if postmsgIndex > l { - return io.ErrUnexpectedEOF - } - mapvalue = &stateChange.StateChangesForTx{} - if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil { - return err - } - iNdEx = postmsgIndex - } else { - iNdEx = entryPreIndex - skippy, err := skipOutportBlock(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthOutportBlock - } - if (iNdEx + skippy) > postIndex { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } + if err := m.StateChanges.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } - m.StateChanges[mapkey] = mapvalue iNdEx = postIndex case 7: if wireType != 2 { diff --git a/data/outport/outportBlock.proto b/data/outport/outportBlock.proto index 28a0c6a2..faa713d6 100644 --- a/data/outport/outportBlock.proto +++ b/data/outport/outportBlock.proto @@ -21,7 +21,7 @@ message OutportBlock { TransactionPool TransactionPool = 3 [(gogoproto.jsontag) = "transactionPool,omitempty"]; HeaderGasConsumption HeaderGasConsumption = 4 [(gogoproto.jsontag) = "headerGasConsumption,omitempty"]; map AlteredAccounts = 5 [(gogoproto.jsontag) = "alteredAccounts,omitempty"]; - map StateChanges = 6 [(gogoproto.jsontag) = "stateChanges,omitempty"]; + StateChangesForTx StateChanges = 6 [(gogoproto.jsontag) = "stateChanges,omitempty"]; repeated string NotarizedHeadersHashes = 7 [(gogoproto.jsontag) = "notarizedHeadersHashes,omitempty"]; uint32 NumberOfShards = 8 [(gogoproto.jsontag) = "numberOfShards"]; repeated uint64 SignersIndexes = 9 [(gogoproto.jsontag) = "signersIndexes,omitempty"]; diff --git a/data/stateChange/stateChange.pb.go b/data/stateChange/stateChange.pb.go index 9595d7ad..06488320 100644 --- a/data/stateChange/stateChange.pb.go +++ b/data/stateChange/stateChange.pb.go @@ -27,7 +27,8 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type StateChangesForTx struct { - StateChanges []*StateChange `protobuf:"bytes,1,rep,name=StateChanges,proto3" json:"stateChanges"` + TxHash []byte `protobuf:"bytes,1,opt,name=TxHash,proto3" json:"txHash"` + StateChanges []*StateChange `protobuf:"bytes,2,rep,name=StateChanges,proto3" json:"stateChanges"` } func (m *StateChangesForTx) Reset() { *m = StateChangesForTx{} } @@ -58,6 +59,13 @@ func (m *StateChangesForTx) XXX_DiscardUnknown() { var xxx_messageInfo_StateChangesForTx proto.InternalMessageInfo +func (m *StateChangesForTx) GetTxHash() []byte { + if m != nil { + return m.TxHash + } + return nil +} + func (m *StateChangesForTx) GetStateChanges() []*StateChange { if m != nil { return m.StateChanges @@ -216,35 +224,36 @@ func init() { func init() { proto.RegisterFile("stateChange.proto", fileDescriptor_8e577663eebb0888) } var fileDescriptor_8e577663eebb0888 = []byte{ - // 437 bytes of a gzipped FileDescriptorProto + // 452 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x4f, 0x8b, 0xd3, 0x40, 0x18, 0xc6, 0x33, 0x6d, 0x53, 0xed, 0xb4, 0xfe, 0xd9, 0x01, 0x21, 0xae, 0xee, 0xa4, 0xf4, 0x62, - 0x41, 0xd3, 0x80, 0x1e, 0xbd, 0x65, 0x45, 0x56, 0x44, 0x84, 0x58, 0x7a, 0x10, 0x14, 0xa6, 0xdd, - 0xd9, 0x24, 0x90, 0x64, 0x42, 0x32, 0x95, 0xe4, 0x20, 0xf8, 0x11, 0xfc, 0x18, 0x7e, 0x12, 0xf1, - 0xd8, 0x63, 0x4f, 0xc1, 0x4e, 0x2f, 0x92, 0xd3, 0x7e, 0x04, 0xc9, 0x74, 0x4b, 0x27, 0x45, 0xf0, - 0x34, 0x33, 0xbf, 0xe7, 0x7d, 0x86, 0xf7, 0x7d, 0x78, 0xe1, 0x49, 0xc6, 0x09, 0xa7, 0xe7, 0x3e, - 0x89, 0x3d, 0x3a, 0x49, 0x52, 0xc6, 0x19, 0xd2, 0xe5, 0x71, 0x6a, 0x79, 0x01, 0xf7, 0x97, 0xf3, - 0xc9, 0x82, 0x45, 0xb6, 0xc7, 0x3c, 0x66, 0x4b, 0x3c, 0x5f, 0x5e, 0xc9, 0x97, 0x7c, 0xc8, 0xdb, - 0xce, 0x35, 0xfa, 0x04, 0x4f, 0x3e, 0x1c, 0xbe, 0xca, 0x5e, 0xb3, 0x74, 0x9a, 0xa3, 0x0b, 0x38, - 0x50, 0xa1, 0x01, 0x86, 0xed, 0x71, 0xff, 0x39, 0xda, 0x59, 0x26, 0x8a, 0xe4, 0xdc, 0xaf, 0x4a, - 0x73, 0xa0, 0xf4, 0x92, 0xb9, 0x0d, 0xe7, 0xe8, 0x67, 0x0b, 0xf6, 0x15, 0x80, 0x1e, 0xc3, 0xce, - 0xb4, 0x48, 0xa8, 0x01, 0x86, 0x60, 0xdc, 0x73, 0x6e, 0x57, 0xa5, 0xd9, 0xe1, 0x45, 0x42, 0x5d, - 0x49, 0xd1, 0x23, 0xa8, 0xbf, 0x89, 0x2f, 0x69, 0x6e, 0xb4, 0x86, 0x60, 0xac, 0x3b, 0x7a, 0x55, - 0x9a, 0xc0, 0x72, 0x77, 0x0c, 0x9d, 0xc1, 0xee, 0x34, 0xbf, 0x20, 0x99, 0x6f, 0xb4, 0x87, 0x60, - 0x3c, 0xd8, 0xab, 0x37, 0x10, 0x3d, 0x81, 0xfd, 0x77, 0x24, 0x88, 0xa7, 0x69, 0x40, 0xdf, 0xd2, - 0xc2, 0xe8, 0xa8, 0x35, 0xaa, 0xa2, 0x16, 0xce, 0x48, 0x68, 0xe8, 0xff, 0x2c, 0x9c, 0x91, 0x10, - 0x3d, 0x85, 0xbd, 0xf7, 0x09, 0x4d, 0x09, 0x0f, 0x58, 0x6c, 0x74, 0x65, 0xc3, 0x77, 0xaa, 0xd2, - 0xec, 0xb1, 0x3d, 0x74, 0x0f, 0x3a, 0xfa, 0x0c, 0xef, 0xbd, 0x22, 0x9c, 0xd4, 0xde, 0x7d, 0x6a, - 0xb7, 0x64, 0x6a, 0x0f, 0x6e, 0x52, 0x6b, 0xaa, 0xce, 0x59, 0x55, 0x9a, 0x0f, 0x2f, 0x9b, 0x8e, - 0x67, 0x2c, 0x0a, 0x38, 0x8d, 0x12, 0x5e, 0xb8, 0xc7, 0x9f, 0x8d, 0xae, 0xe0, 0xdd, 0x26, 0xfa, - 0x4f, 0x94, 0xa7, 0xb0, 0x5d, 0xc7, 0xd0, 0x92, 0xd3, 0x1d, 0xc4, 0x1a, 0xd6, 0x5a, 0x3d, 0x79, - 0xfb, 0x58, 0x9b, 0x91, 0xd0, 0xf9, 0xba, 0xda, 0x60, 0x6d, 0xbd, 0xc1, 0xda, 0xf5, 0x06, 0x83, - 0x6f, 0x02, 0x83, 0x1f, 0x02, 0x83, 0x5f, 0x02, 0x83, 0x95, 0xc0, 0x60, 0x2d, 0x30, 0xf8, 0x2d, - 0x30, 0xf8, 0x23, 0xb0, 0x76, 0x2d, 0x30, 0xf8, 0xbe, 0xc5, 0xda, 0x6a, 0x8b, 0xb5, 0xf5, 0x16, - 0x6b, 0x1f, 0xcf, 0x95, 0xc5, 0x8b, 0x96, 0x21, 0x0f, 0xbe, 0xd0, 0x34, 0xcb, 0xed, 0x28, 0xb7, - 0x16, 0x3e, 0x09, 0x62, 0x6b, 0xc1, 0x52, 0x6a, 0x79, 0xcc, 0xae, 0x87, 0xb6, 0x95, 0x95, 0x79, - 0xa9, 0xdc, 0xe7, 0x5d, 0x19, 0xd6, 0x8b, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc1, 0x74, 0x60, - 0x41, 0xe0, 0x02, 0x00, 0x00, + 0x41, 0xd3, 0x80, 0x1e, 0xbd, 0x65, 0x45, 0x56, 0x44, 0x84, 0x58, 0x7a, 0xf0, 0x20, 0x4c, 0xbb, + 0xb3, 0x69, 0x20, 0xc9, 0x84, 0x64, 0x2a, 0xc9, 0x41, 0xd0, 0x6f, 0xe0, 0xc7, 0xf0, 0x93, 0x88, + 0xc7, 0x1e, 0x7b, 0x0a, 0x76, 0x7a, 0x91, 0x9c, 0xf6, 0x23, 0x48, 0xa6, 0xad, 0x9d, 0x14, 0x61, + 0x4f, 0x99, 0x79, 0x7e, 0xef, 0xfb, 0xe6, 0x79, 0x1f, 0x06, 0x9e, 0xa4, 0x9c, 0x70, 0x7a, 0x3e, + 0x27, 0x91, 0x47, 0x47, 0x71, 0xc2, 0x38, 0x43, 0xba, 0xfc, 0x9c, 0x5a, 0x9e, 0xcf, 0xe7, 0x8b, + 0xe9, 0x68, 0xc6, 0x42, 0xdb, 0x63, 0x1e, 0xb3, 0xa5, 0x3c, 0x5d, 0x5c, 0xc9, 0x9b, 0xbc, 0xc8, + 0xd3, 0xb6, 0x6b, 0xf0, 0x0d, 0xc0, 0x93, 0x0f, 0x87, 0x59, 0xe9, 0x6b, 0x96, 0x8c, 0x33, 0x34, + 0x80, 0xed, 0x71, 0x76, 0x41, 0xd2, 0xb9, 0x01, 0xfa, 0x60, 0xd8, 0x73, 0x60, 0x59, 0x98, 0x6d, + 0x2e, 0x15, 0x77, 0x47, 0xd0, 0x05, 0xec, 0xa9, 0x8d, 0x46, 0xa3, 0xdf, 0x1c, 0x76, 0x9f, 0xa3, + 0xed, 0xdc, 0x91, 0x82, 0x9c, 0xfb, 0x65, 0x61, 0xf6, 0x14, 0xc3, 0xa9, 0x5b, 0xeb, 0x1c, 0xfc, + 0x6c, 0xc0, 0xae, 0x22, 0xa0, 0xc7, 0xb0, 0x35, 0xce, 0x63, 0x2a, 0xff, 0xdd, 0x71, 0x6e, 0x97, + 0x85, 0xd9, 0xe2, 0x79, 0x4c, 0x5d, 0xa9, 0xa2, 0x47, 0x50, 0x7f, 0x13, 0x5d, 0xd2, 0xcc, 0x68, + 0xf4, 0xc1, 0x50, 0x77, 0xf4, 0xb2, 0x30, 0x81, 0xe5, 0x6e, 0x35, 0x74, 0xf6, 0xcf, 0x78, 0x53, + 0x1a, 0xdf, 0xd1, 0xbd, 0xe7, 0x27, 0xb0, 0xfb, 0x8e, 0xf8, 0xd1, 0x38, 0xf1, 0xe9, 0x5b, 0x9a, + 0x1b, 0x2d, 0xb5, 0x46, 0x25, 0x6a, 0xe1, 0x84, 0x04, 0x86, 0xfe, 0xdf, 0xc2, 0x09, 0x09, 0xd0, + 0x53, 0xd8, 0x79, 0x1f, 0xd3, 0x84, 0x70, 0x9f, 0x45, 0x46, 0x5b, 0x1a, 0xbe, 0x53, 0x16, 0x66, + 0x87, 0xed, 0x45, 0xf7, 0xc0, 0xd1, 0x27, 0x78, 0xef, 0x15, 0xe1, 0xa4, 0xea, 0xdd, 0xa7, 0x76, + 0x4b, 0xa6, 0xf6, 0x60, 0x97, 0x5a, 0x9d, 0x3a, 0x67, 0x65, 0x61, 0x3e, 0xbc, 0xac, 0x77, 0x3c, + 0x63, 0xa1, 0xcf, 0x69, 0x18, 0xf3, 0xdc, 0x3d, 0x1e, 0x36, 0xb8, 0x82, 0x77, 0xeb, 0xd2, 0x0d, + 0x51, 0x9e, 0xc2, 0x66, 0x15, 0x43, 0x43, 0x6e, 0x77, 0x80, 0x95, 0x58, 0xb1, 0x6a, 0xf3, 0xe6, + 0x31, 0x9b, 0x90, 0xc0, 0xf9, 0xb2, 0x5c, 0x63, 0x6d, 0xb5, 0xc6, 0xda, 0xf5, 0x1a, 0x83, 0xaf, + 0x02, 0x83, 0x1f, 0x02, 0x83, 0x5f, 0x02, 0x83, 0xa5, 0xc0, 0x60, 0x25, 0x30, 0xf8, 0x2d, 0x30, + 0xf8, 0x23, 0xb0, 0x76, 0x2d, 0x30, 0xf8, 0xbe, 0xc1, 0xda, 0x72, 0x83, 0xb5, 0xd5, 0x06, 0x6b, + 0x1f, 0xcf, 0x95, 0xd7, 0x19, 0x2e, 0x02, 0xee, 0x7f, 0xa6, 0x49, 0x9a, 0xd9, 0x61, 0x66, 0xcd, + 0xe6, 0xc4, 0x8f, 0xac, 0x19, 0x4b, 0xa8, 0xe5, 0x31, 0xbb, 0x5a, 0xda, 0x56, 0x9e, 0xcc, 0x4b, + 0xe5, 0x3c, 0x6d, 0xcb, 0xb0, 0x5e, 0xfc, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xc0, 0x08, 0xa3, 0x8b, + 0x05, 0x03, 0x00, 0x00, } func (this *StateChangesForTx) Equal(that interface{}) bool { @@ -266,6 +275,9 @@ func (this *StateChangesForTx) Equal(that interface{}) bool { } else if this == nil { return false } + if !bytes.Equal(this.TxHash, that1.TxHash) { + return false + } if len(this.StateChanges) != len(that1.StateChanges) { return false } @@ -357,8 +369,9 @@ func (this *StateChangesForTx) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 5) + s := make([]string, 0, 6) s = append(s, "&stateChange.StateChangesForTx{") + s = append(s, "TxHash: "+fmt.Sprintf("%#v", this.TxHash)+",\n") if this.StateChanges != nil { s = append(s, "StateChanges: "+fmt.Sprintf("%#v", this.StateChanges)+",\n") } @@ -434,9 +447,16 @@ func (m *StateChangesForTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintStateChange(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0xa + dAtA[i] = 0x12 } } + if len(m.TxHash) > 0 { + i -= len(m.TxHash) + copy(dAtA[i:], m.TxHash) + i = encodeVarintStateChange(dAtA, i, uint64(len(m.TxHash))) + i-- + dAtA[i] = 0xa + } return len(dAtA) - i, nil } @@ -578,6 +598,10 @@ func (m *StateChangesForTx) Size() (n int) { } var l int _ = l + l = len(m.TxHash) + if l > 0 { + n += 1 + l + sovStateChange(uint64(l)) + } if len(m.StateChanges) > 0 { for _, e := range m.StateChanges { l = e.Size() @@ -662,6 +686,7 @@ func (this *StateChangesForTx) String() string { } repeatedStringForStateChanges += "}" s := strings.Join([]string{`&StateChangesForTx{`, + `TxHash:` + fmt.Sprintf("%v", this.TxHash) + `,`, `StateChanges:` + repeatedStringForStateChanges + `,`, `}`, }, "") @@ -738,6 +763,40 @@ func (m *StateChangesForTx) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TxHash", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStateChange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthStateChange + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthStateChange + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.TxHash = append(m.TxHash[:0], dAtA[iNdEx:postIndex]...) + if m.TxHash == nil { + m.TxHash = []byte{} + } + iNdEx = postIndex + case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field StateChanges", wireType) } diff --git a/data/stateChange/stateChange.proto b/data/stateChange/stateChange.proto index 91d7cc2a..4a928049 100644 --- a/data/stateChange/stateChange.proto +++ b/data/stateChange/stateChange.proto @@ -8,7 +8,8 @@ option (gogoproto.stable_marshaler_all) = true; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; message StateChangesForTx { - repeated StateChange StateChanges = 1 [(gogoproto.jsontag) = "stateChanges"]; + bytes TxHash = 1 [(gogoproto.jsontag) = "txHash"]; + repeated StateChange StateChanges = 2 [(gogoproto.jsontag) = "stateChanges"]; } message StateChange { From 7e9d1d34a45c1edbbaeed6a0b24f9ad83dd9b28e Mon Sep 17 00:00:00 2001 From: Alexander Cristurean Date: Fri, 6 Sep 2024 16:49:37 +0300 Subject: [PATCH 07/14] update stateChangesForTx to repeated. --- data/outport/outportBlock.pb.go | 262 +++++++++++++++++--------------- data/outport/outportBlock.proto | 2 +- 2 files changed, 138 insertions(+), 126 deletions(-) diff --git a/data/outport/outportBlock.pb.go b/data/outport/outportBlock.pb.go index 1d25c822..8d2374e5 100644 --- a/data/outport/outportBlock.pb.go +++ b/data/outport/outportBlock.pb.go @@ -43,7 +43,7 @@ type OutportBlock struct { 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"` - StateChanges *stateChange.StateChangesForTx `protobuf:"bytes,6,opt,name=StateChanges,proto3" json:"stateChanges,omitempty"` + StateChanges []*stateChange.StateChangesForTx `protobuf:"bytes,6,rep,name=StateChanges,proto3" json:"stateChanges,omitempty"` NotarizedHeadersHashes []string `protobuf:"bytes,7,rep,name=NotarizedHeadersHashes,proto3" json:"notarizedHeadersHashes,omitempty"` NumberOfShards uint32 `protobuf:"varint,8,opt,name=NumberOfShards,proto3" json:"numberOfShards"` SignersIndexes []uint64 `protobuf:"varint,9,rep,packed,name=SignersIndexes,proto3" json:"signersIndexes,omitempty"` @@ -114,7 +114,7 @@ func (m *OutportBlock) GetAlteredAccounts() map[string]*alteredAccount.AlteredAc return nil } -func (m *OutportBlock) GetStateChanges() *stateChange.StateChangesForTx { +func (m *OutportBlock) GetStateChanges() []*stateChange.StateChangesForTx { if m != nil { return m.StateChanges } @@ -1147,7 +1147,7 @@ func init() { func init() { proto.RegisterFile("outportBlock.proto", fileDescriptor_661b95cef868af95) } var fileDescriptor_661b95cef868af95 = []byte{ - // 1972 bytes of a gzipped FileDescriptorProto + // 1971 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcd, 0x8f, 0x1b, 0x49, 0x15, 0x9f, 0xb6, 0x3d, 0xe3, 0xf1, 0xf3, 0x7c, 0xa5, 0x32, 0x19, 0x3a, 0x13, 0xd6, 0x3d, 0x38, 0xd9, 0x65, 0x44, 0x88, 0xcd, 0x66, 0x23, 0x14, 0x25, 0x5a, 0x41, 0x7a, 0xf2, 0x65, 0xf2, 0x31, @@ -1177,101 +1177,101 @@ var fileDescriptor_661b95cef868af95 = []byte{ 0xb0, 0x92, 0x27, 0xa2, 0xd7, 0xc3, 0x40, 0xab, 0xf5, 0x72, 0x38, 0x92, 0xbd, 0x5c, 0x70, 0xf4, 0x13, 0x58, 0xbf, 0x93, 0xca, 0xa1, 0xaf, 0x2e, 0xee, 0x14, 0x77, 0xab, 0xd7, 0x77, 0x85, 0x3d, 0x39, 0xfa, 0x8d, 0x8c, 0xe8, 0x3d, 0x97, 0x7a, 0x13, 0xee, 0x67, 0xba, 0x10, 0x7c, 0xd9, 0xcf, - 0x8c, 0x12, 0xfa, 0x18, 0x56, 0x0e, 0x93, 0x44, 0xfb, 0xea, 0x12, 0xf3, 0x4f, 0x15, 0xf6, 0x64, - 0xd6, 0x7d, 0xe2, 0xb5, 0xc7, 0xfa, 0x76, 0x18, 0x68, 0x5b, 0x52, 0x69, 0xc8, 0xe0, 0x29, 0x24, - 0xf4, 0x43, 0xd8, 0x7a, 0x4a, 0xa8, 0xe9, 0x39, 0x3f, 0xc3, 0x16, 0xf7, 0xd6, 0x7f, 0x68, 0xfa, - 0x3d, 0xec, 0xab, 0xe5, 0x9d, 0xe2, 0x6e, 0x45, 0xbf, 0x12, 0x06, 0xda, 0x8e, 0x9b, 0x2b, 0x21, - 0x61, 0x9e, 0x82, 0x81, 0x6e, 0xc1, 0xda, 0xd3, 0xd1, 0xa0, 0x83, 0xbd, 0xfd, 0x23, 0x56, 0x5c, - 0xbe, 0xba, 0xcc, 0x2a, 0x10, 0x85, 0x81, 0xb6, 0xe6, 0xa6, 0x38, 0x46, 0x46, 0x12, 0xdd, 0x85, - 0xb5, 0x43, 0xc7, 0x76, 0xb1, 0xe7, 0xb7, 0x5c, 0x0b, 0x8f, 0xb1, 0xaf, 0x56, 0x76, 0x8a, 0xbb, - 0x25, 0xfd, 0xab, 0x61, 0xa0, 0xa9, 0x7e, 0x8a, 0x23, 0xad, 0x24, 0xa3, 0x83, 0x0c, 0xd8, 0x7a, - 0xe8, 0xd8, 0x3d, 0xec, 0xd3, 0xfb, 0x8e, 0x6b, 0xf6, 0x59, 0x4e, 0x9e, 0x12, 0xb7, 0x8b, 0x55, - 0xd8, 0x51, 0x76, 0x4b, 0x3c, 0x52, 0xbd, 0x5c, 0x09, 0xe3, 0x14, 0x4d, 0xf4, 0x0c, 0x2e, 0xcc, - 0x70, 0x22, 0x87, 0xd5, 0xea, 0x8e, 0xb2, 0xbb, 0xa2, 0x5f, 0x0e, 0x03, 0x4d, 0xeb, 0xe5, 0x09, - 0x48, 0xeb, 0xcc, 0x47, 0xd8, 0x7e, 0x06, 0x9b, 0x79, 0x05, 0x83, 0x36, 0xa0, 0xf8, 0x1c, 0x4f, - 0xd8, 0xfe, 0xad, 0x18, 0xd1, 0x23, 0xba, 0x0a, 0x8b, 0xc7, 0x66, 0x7f, 0x84, 0xc5, 0x06, 0xbd, - 0x20, 0x6a, 0x21, 0xad, 0x6d, 0x70, 0x99, 0x5b, 0x85, 0x9b, 0x4a, 0xfd, 0xd7, 0x45, 0x69, 0x5b, - 0x9f, 0xbd, 0x29, 0xdc, 0x86, 0x2a, 0xcf, 0xad, 0x3e, 0xa1, 0xd8, 0x67, 0x56, 0x57, 0xf4, 0x8b, - 0x61, 0xa0, 0x5d, 0xe8, 0x25, 0x64, 0x49, 0x51, 0x96, 0x46, 0x37, 0x01, 0xf8, 0x6b, 0x7b, 0x32, - 0xc4, 0xac, 0x07, 0x54, 0x74, 0x35, 0x0c, 0xb4, 0xcd, 0xde, 0x94, 0x2a, 0xa9, 0x4a, 0xb2, 0x89, - 0x26, 0x0b, 0x70, 0x89, 0x59, 0x95, 0x34, 0x33, 0x51, 0x95, 0x64, 0xd1, 0x07, 0x50, 0xd2, 0x89, - 0x35, 0x51, 0x17, 0x59, 0x7c, 0xaa, 0x71, 0x03, 0x23, 0xd6, 0x84, 0x97, 0x5f, 0x87, 0x58, 0x13, - 0x49, 0x95, 0x09, 0xa3, 0x1e, 0x6c, 0xb6, 0xa2, 0x73, 0x87, 0x79, 0xfd, 0xc4, 0x71, 0x1d, 0x16, - 0xb1, 0x68, 0xc3, 0x15, 0xa5, 0x2e, 0x38, 0x65, 0xf0, 0x2e, 0xe2, 0xe4, 0x68, 0xc8, 0x5d, 0x24, - 0x0f, 0xb1, 0xfe, 0x29, 0xcc, 0x34, 0x47, 0xd4, 0x83, 0x15, 0x89, 0xe4, 0xab, 0x4a, 0xaa, 0xad, - 0x64, 0xa4, 0xe5, 0x77, 0xd1, 0x56, 0x58, 0x31, 0x4b, 0xed, 0x33, 0xb5, 0xed, 0x65, 0x71, 0xf4, - 0x2b, 0x05, 0x36, 0x0f, 0x67, 0x8f, 0xd9, 0x28, 0xaf, 0x91, 0xc9, 0x6f, 0x9d, 0x62, 0x32, 0x4f, - 0x85, 0x9b, 0x66, 0x81, 0xc8, 0x39, 0xb8, 0x53, 0x81, 0xc8, 0x53, 0x47, 0x6d, 0x28, 0x1b, 0xec, - 0x74, 0xf5, 0xd5, 0x22, 0x33, 0x7e, 0xf9, 0x14, 0xe3, 0x42, 0x8a, 0xdb, 0x63, 0xe5, 0xca, 0x4f, - 0x65, 0xd9, 0x44, 0x0c, 0x85, 0x3e, 0x86, 0x65, 0x83, 0x9f, 0xfb, 0xbe, 0x5a, 0x62, 0xb0, 0x57, - 0x4e, 0x85, 0xe5, 0x62, 0x1c, 0x77, 0x2b, 0x0c, 0x34, 0x24, 0x26, 0x06, 0x19, 0x78, 0x8a, 0x86, - 0x7e, 0x0c, 0xd0, 0x72, 0x8f, 0xcd, 0xbe, 0x63, 0xb5, 0xc7, 0x71, 0xe7, 0x7f, 0xef, 0x14, 0xec, - 0x44, 0x90, 0xa3, 0xb3, 0xca, 0x75, 0xa6, 0x44, 0xb9, 0x72, 0x13, 0x51, 0xf4, 0x6d, 0x28, 0x3d, - 0x26, 0x76, 0x5c, 0x74, 0x6b, 0x02, 0xfb, 0x31, 0xb1, 0xd9, 0xc1, 0xcb, 0x8a, 0xb7, 0x4f, 0x6c, - 0x59, 0x9b, 0xc9, 0xa3, 0x5f, 0x2a, 0x70, 0xe5, 0xb0, 0xdb, 0xc3, 0xd6, 0xa8, 0x8f, 0xad, 0x7b, - 0x63, 0xdc, 0x1d, 0x51, 0x6c, 0x1d, 0xee, 0x19, 0x87, 0xbc, 0x1b, 0x1f, 0x78, 0xf8, 0x98, 0x15, - 0x9f, 0x68, 0xed, 0xd7, 0xc3, 0x40, 0x6b, 0xf8, 0x73, 0xc8, 0x4b, 0x86, 0xe6, 0xc2, 0x47, 0xbf, - 0x53, 0xe0, 0x1b, 0x33, 0x82, 0x89, 0x83, 0xd9, 0xe5, 0x2c, 0xb3, 0xe5, 0xdc, 0x0c, 0x03, 0xed, - 0x86, 0x3f, 0xb7, 0x96, 0xb4, 0xa8, 0x33, 0xd8, 0xda, 0x7e, 0x0a, 0xe7, 0x66, 0xf6, 0x4d, 0x4e, - 0x77, 0xbd, 0x9c, 0xee, 0xae, 0xab, 0x71, 0x7e, 0xc7, 0x2d, 0xf7, 0x88, 0x48, 0x5d, 0x75, 0xfb, - 0x23, 0xb8, 0x78, 0xea, 0xa6, 0xc8, 0xc1, 0xbd, 0x92, 0xc6, 0x8d, 0x73, 0x7b, 0xb8, 0x67, 0x64, - 0x81, 0x9f, 0xc0, 0x8a, 0x5c, 0xf0, 0x39, 0x58, 0x5f, 0x4f, 0x63, 0x9d, 0x13, 0x58, 0x5c, 0x2b, - 0x0b, 0xf7, 0x08, 0x56, 0x53, 0x85, 0x3e, 0xff, 0xda, 0x84, 0x9a, 0x0c, 0xf6, 0x18, 0xd6, 0x33, - 0x95, 0xfd, 0x3f, 0x84, 0xb0, 0xfe, 0xa7, 0x02, 0x94, 0xef, 0x63, 0x1c, 0x91, 0xd1, 0xbb, 0x50, - 0x7e, 0x60, 0xfa, 0xdf, 0xf7, 0xb1, 0xc5, 0xa0, 0x4a, 0x7a, 0x35, 0x0c, 0xb4, 0xb2, 0xcd, 0x49, - 0x46, 0xcc, 0x43, 0x7d, 0x28, 0xde, 0xc7, 0x58, 0x1c, 0x42, 0x9f, 0x84, 0x81, 0xb6, 0x7a, 0x84, - 0xa5, 0x13, 0xe4, 0x8f, 0xff, 0xd0, 0xee, 0x0d, 0x4c, 0xda, 0x6b, 0x76, 0x1c, 0xbb, 0xd1, 0x72, - 0xe9, 0xed, 0x33, 0x4c, 0xd7, 0x0d, 0xdd, 0xb1, 0x5b, 0x2e, 0xdd, 0x33, 0x7d, 0x8a, 0x3d, 0x23, - 0x32, 0x83, 0x3e, 0x53, 0x60, 0xad, 0xe5, 0x3a, 0xd4, 0x31, 0xfb, 0x07, 0xa6, 0x63, 0x45, 0x96, - 0x8b, 0xcc, 0x32, 0x8e, 0x46, 0x11, 0x27, 0xc5, 0x79, 0x1b, 0x8b, 0xc8, 0x18, 0xaf, 0xff, 0x5d, - 0x81, 0x25, 0x1e, 0x46, 0xb4, 0x0f, 0x55, 0xa9, 0x9c, 0x59, 0xcc, 0xaa, 0xd7, 0xd1, 0x6c, 0x37, - 0xe2, 0x27, 0xb5, 0x74, 0x34, 0xc8, 0x27, 0xb5, 0x24, 0x87, 0xbe, 0x33, 0xcd, 0x45, 0xa6, 0x0c, - 0x04, 0x95, 0x37, 0xde, 0x23, 0xfe, 0x22, 0x37, 0xde, 0x38, 0x83, 0xb7, 0x60, 0x8d, 0xef, 0x42, - 0x87, 0xb8, 0xfb, 0x9e, 0x85, 0x3d, 0x16, 0x2b, 0x31, 0xf2, 0xe1, 0x14, 0xc7, 0xc8, 0x48, 0xd6, - 0xff, 0xa3, 0x40, 0x59, 0x6c, 0x05, 0x44, 0xe0, 0x7c, 0xce, 0xc6, 0x12, 0x1e, 0x6e, 0xc7, 0xfb, - 0x66, 0x56, 0x42, 0xff, 0x5a, 0x18, 0x68, 0xef, 0xe4, 0x9c, 0x44, 0xd2, 0x62, 0xf3, 0x90, 0xbf, - 0x5c, 0xcf, 0xdb, 0x50, 0x16, 0xfd, 0x1d, 0xd5, 0xa3, 0xe4, 0xb2, 0x69, 0x87, 0x6d, 0x26, 0x1d, - 0xc2, 0x40, 0x5b, 0xa2, 0x8c, 0x62, 0x08, 0x0e, 0x7a, 0x17, 0x8a, 0x8f, 0x89, 0x2d, 0xd6, 0x09, - 0xc9, 0x01, 0xa1, 0x97, 0xc3, 0x40, 0x2b, 0xf6, 0x89, 0x6d, 0x44, 0xfc, 0xfa, 0xa7, 0x0a, 0x40, - 0xd2, 0x0e, 0xd0, 0x87, 0xb0, 0xc4, 0xdf, 0x44, 0x14, 0xd7, 0x53, 0x1d, 0xa3, 0x3d, 0xd6, 0x37, - 0xc3, 0x40, 0xdb, 0xe0, 0x87, 0xaa, 0xe4, 0xa0, 0x50, 0xca, 0xf1, 0xaf, 0x30, 0xb7, 0x7f, 0xff, - 0x56, 0xf2, 0x6f, 0x6a, 0xe8, 0x7d, 0xa8, 0x3e, 0x30, 0xfd, 0x03, 0x8f, 0x1c, 0x3b, 0xd6, 0x74, - 0xd3, 0xaf, 0x87, 0x81, 0x56, 0xb5, 0x13, 0xb2, 0x21, 0xcb, 0x08, 0x15, 0x03, 0x1f, 0x8d, 0xdc, - 0x48, 0xa5, 0x90, 0x52, 0x89, 0xc9, 0x86, 0x2c, 0x83, 0x6e, 0xc0, 0x4a, 0x84, 0x80, 0x5d, 0xb3, - 0x1f, 0x5d, 0x52, 0x58, 0x62, 0x4a, 0xfa, 0x46, 0x18, 0x68, 0x2b, 0xb6, 0x44, 0x37, 0x52, 0x52, - 0x91, 0xc3, 0x4f, 0xcc, 0x31, 0x23, 0x79, 0xfc, 0xa4, 0x2a, 0x31, 0x3d, 0xe6, 0xf0, 0x20, 0xc5, - 0x31, 0x32, 0x92, 0xf5, 0x23, 0x38, 0xff, 0x83, 0xa8, 0x41, 0x9a, 0x94, 0x78, 0x86, 0x49, 0x1d, - 0xd7, 0x66, 0x29, 0xb8, 0x0a, 0x95, 0x83, 0x51, 0xa7, 0xef, 0x74, 0x1f, 0xc5, 0xcd, 0x52, 0x5f, - 0x0d, 0x03, 0xad, 0x32, 0x8c, 0x89, 0x46, 0xc2, 0x8f, 0x2a, 0x81, 0xab, 0x32, 0x1f, 0x0b, 0xbc, - 0x12, 0x3c, 0x46, 0x31, 0x04, 0xa7, 0xfe, 0x37, 0x05, 0x36, 0xa6, 0x86, 0x7c, 0x4e, 0x8c, 0xba, - 0x68, 0x7a, 0xb8, 0x67, 0x5d, 0x54, 0x0c, 0xf7, 0xc9, 0x48, 0xaf, 0xc1, 0xe2, 0xbd, 0x21, 0xe9, - 0xf6, 0x44, 0x1e, 0x2b, 0x61, 0xa0, 0x2d, 0xe2, 0x88, 0x60, 0x70, 0x3a, 0xf2, 0x60, 0x33, 0x8b, - 0xcd, 0xf6, 0x07, 0x9f, 0xd3, 0xe2, 0x4d, 0x98, 0xe3, 0x27, 0x1f, 0x07, 0x8f, 0x73, 0x74, 0xe5, - 0x71, 0x30, 0x0f, 0xbb, 0xfe, 0xfb, 0x02, 0x54, 0x0c, 0x32, 0x72, 0x79, 0xc9, 0x6a, 0xb0, 0xc8, - 0x5e, 0x44, 0x61, 0xb0, 0x25, 0x7a, 0x11, 0xc1, 0xe0, 0xf4, 0x28, 0x47, 0x99, 0x5b, 0x62, 0x81, - 0xdd, 0x12, 0x59, 0x8e, 0xd2, 0xb7, 0xc4, 0x99, 0xbb, 0xe1, 0x77, 0x61, 0x83, 0x25, 0xeb, 0x23, - 0x56, 0x5c, 0x43, 0xe2, 0x8b, 0xca, 0x58, 0xe6, 0x1b, 0xa1, 0x93, 0xe1, 0x19, 0x33, 0xd2, 0x49, - 0xa0, 0x2d, 0x56, 0x1a, 0xa9, 0x40, 0x5b, 0x71, 0xa0, 0xad, 0x24, 0xd0, 0x8b, 0xa7, 0x04, 0xfa, - 0x2a, 0x54, 0xda, 0xce, 0x00, 0xfb, 0xd4, 0x1c, 0x0c, 0xd9, 0xe5, 0xbe, 0xc4, 0xcb, 0x82, 0xc6, - 0x44, 0x23, 0xe1, 0xd7, 0x7f, 0x0e, 0xc0, 0x7c, 0xf7, 0xe3, 0x13, 0x73, 0x9e, 0x5c, 0x7f, 0x4f, - 0x56, 0x12, 0x53, 0x7e, 0x7c, 0x9d, 0x99, 0x86, 0x9b, 0xcf, 0xa7, 0xde, 0x54, 0x4e, 0x9e, 0x4f, - 0x13, 0xed, 0xfa, 0xfb, 0x50, 0x3e, 0x18, 0x75, 0x1e, 0xe1, 0x89, 0x8f, 0xde, 0x83, 0x52, 0xf4, - 0xcb, 0x6e, 0x2a, 0x2b, 0x3c, 0xe8, 0xcf, 0xf1, 0x24, 0x35, 0x9a, 0x46, 0xfc, 0xfa, 0x5f, 0x0a, - 0x70, 0x2e, 0x49, 0x77, 0xac, 0x3d, 0xe7, 0xda, 0x3f, 0x53, 0x60, 0x8b, 0x3d, 0xcf, 0x20, 0x08, - 0x47, 0x6e, 0x64, 0x2b, 0x31, 0xe6, 0x37, 0xf2, 0xd5, 0xf8, 0x30, 0xae, 0x85, 0x81, 0x76, 0xe9, - 0x38, 0xcb, 0x93, 0xbf, 0x6a, 0xe4, 0x6b, 0x27, 0xe9, 0x2c, 0xe6, 0xa7, 0x73, 0xfb, 0x19, 0x5c, - 0xfa, 0x02, 0xc3, 0xf2, 0xac, 0xb4, 0xfa, 0x85, 0xa3, 0x97, 0xd0, 0x92, 0x87, 0xa5, 0x3f, 0x17, - 0x60, 0x79, 0xfa, 0x59, 0x68, 0xce, 0xf8, 0xdd, 0x82, 0x35, 0x56, 0xb9, 0x49, 0x89, 0x15, 0x92, - 0x3e, 0xd6, 0x49, 0x71, 0x8c, 0x8c, 0x24, 0x1a, 0xcc, 0x7e, 0xec, 0x2a, 0xa6, 0xae, 0x53, 0x31, - 0xf9, 0xff, 0xf2, 0xa1, 0xeb, 0x6d, 0x7e, 0xff, 0xb0, 0x61, 0x8d, 0x7d, 0x6c, 0x89, 0x5a, 0x3b, - 0xbf, 0xa6, 0xcc, 0x19, 0xbe, 0x46, 0xea, 0x13, 0x04, 0x9f, 0x39, 0xd7, 0xc2, 0x40, 0x83, 0xe4, - 0x13, 0x84, 0xfc, 0xe1, 0xa1, 0xde, 0x80, 0x45, 0xa6, 0x3a, 0x27, 0xbe, 0x3e, 0x7a, 0xf1, 0xaa, - 0xb6, 0xf0, 0xf2, 0x55, 0x6d, 0xe1, 0xf3, 0x57, 0x35, 0xe5, 0x17, 0x27, 0x35, 0xe5, 0x0f, 0x27, - 0x35, 0xe5, 0xaf, 0x27, 0x35, 0xe5, 0xc5, 0x49, 0x4d, 0x79, 0x79, 0x52, 0x53, 0xfe, 0x79, 0x52, - 0x53, 0xfe, 0x75, 0x52, 0x5b, 0xf8, 0xfc, 0xa4, 0xa6, 0xfc, 0xe6, 0x75, 0x6d, 0xe1, 0xc5, 0xeb, - 0xda, 0xc2, 0xcb, 0xd7, 0xb5, 0x85, 0x4f, 0xce, 0x32, 0x52, 0x36, 0xc5, 0x3f, 0x2b, 0x6e, 0x8b, - 0xdf, 0xce, 0x12, 0x0b, 0xd8, 0x07, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xb1, 0xba, 0xa6, 0x17, - 0xc6, 0x18, 0x00, 0x00, + 0x8c, 0x12, 0xfa, 0x18, 0x56, 0x0e, 0x93, 0x44, 0xfb, 0xea, 0x12, 0xb3, 0xa7, 0x0a, 0x7b, 0x32, + 0xeb, 0x3e, 0xf1, 0xda, 0x63, 0x7d, 0x3b, 0x0c, 0xb4, 0x2d, 0xa9, 0x34, 0x64, 0xf0, 0x14, 0x12, + 0xfa, 0x21, 0x6c, 0x3d, 0x25, 0xd4, 0xf4, 0x9c, 0x9f, 0x61, 0x8b, 0x7b, 0xeb, 0x3f, 0x34, 0xfd, + 0x1e, 0xf6, 0xd5, 0xf2, 0x4e, 0x71, 0xb7, 0xa2, 0x5f, 0x09, 0x03, 0x6d, 0xc7, 0xcd, 0x95, 0x90, + 0x30, 0x4f, 0xc1, 0x40, 0xb7, 0x60, 0xed, 0xe9, 0x68, 0xd0, 0xc1, 0xde, 0xfe, 0x11, 0x2b, 0x2e, + 0x5f, 0x5d, 0x66, 0x15, 0x88, 0xc2, 0x40, 0x5b, 0x73, 0x53, 0x1c, 0x23, 0x23, 0x89, 0xee, 0xc2, + 0xda, 0xa1, 0x63, 0xbb, 0xd8, 0xf3, 0x5b, 0xae, 0x85, 0xc7, 0xd8, 0x57, 0x2b, 0x3b, 0xc5, 0xdd, + 0x92, 0xfe, 0xd5, 0x30, 0xd0, 0x54, 0x3f, 0xc5, 0x91, 0x56, 0x92, 0xd1, 0x41, 0x06, 0x6c, 0x3d, + 0x74, 0xec, 0x1e, 0xf6, 0xe9, 0x7d, 0xc7, 0x35, 0xfb, 0x2c, 0x27, 0x4f, 0x89, 0xdb, 0xc5, 0x2a, + 0xec, 0x28, 0xbb, 0x25, 0x1e, 0xa9, 0x5e, 0xae, 0x84, 0x71, 0x8a, 0x26, 0x7a, 0x06, 0x17, 0x66, + 0x38, 0x91, 0xc3, 0x6a, 0x75, 0x47, 0xd9, 0x5d, 0xd1, 0x2f, 0x87, 0x81, 0xa6, 0xf5, 0xf2, 0x04, + 0xa4, 0x75, 0xe6, 0x23, 0x6c, 0x3f, 0x83, 0xcd, 0xbc, 0x82, 0x41, 0x1b, 0x50, 0x7c, 0x8e, 0x27, + 0x6c, 0xff, 0x56, 0x8c, 0xe8, 0x11, 0x5d, 0x85, 0xc5, 0x63, 0xb3, 0x3f, 0xc2, 0x62, 0x83, 0x5e, + 0x10, 0xb5, 0x90, 0xd6, 0x36, 0xb8, 0xcc, 0xad, 0xc2, 0x4d, 0xa5, 0xfe, 0xeb, 0xa2, 0xb4, 0xad, + 0xcf, 0xde, 0x14, 0x6e, 0x43, 0x95, 0xe7, 0x56, 0x9f, 0x50, 0xec, 0x33, 0xab, 0x2b, 0xfa, 0xc5, + 0x30, 0xd0, 0x2e, 0xf4, 0x12, 0xb2, 0xa4, 0x28, 0x4b, 0xa3, 0x9b, 0x00, 0xfc, 0xb5, 0x3d, 0x19, + 0x62, 0xd6, 0x03, 0x2a, 0xba, 0x1a, 0x06, 0xda, 0x66, 0x6f, 0x4a, 0x95, 0x54, 0x25, 0xd9, 0x44, + 0x93, 0x05, 0xb8, 0xc4, 0xac, 0x4a, 0x9a, 0x99, 0xa8, 0x4a, 0xb2, 0xe8, 0x03, 0x28, 0xe9, 0xc4, + 0x9a, 0xa8, 0x8b, 0x2c, 0x3e, 0xd5, 0xb8, 0x81, 0x11, 0x6b, 0xc2, 0xcb, 0xaf, 0x43, 0xac, 0x89, + 0xa4, 0xca, 0x84, 0x51, 0x0f, 0x36, 0x5b, 0xd1, 0xb9, 0xc3, 0xbc, 0x7e, 0xe2, 0xb8, 0x0e, 0x8b, + 0x58, 0xbc, 0xe1, 0xe2, 0x2e, 0x38, 0x65, 0xf0, 0x2e, 0xe2, 0xe4, 0x68, 0xc8, 0x5d, 0x24, 0x0f, + 0xb1, 0xfe, 0x29, 0xcc, 0x34, 0x47, 0xd4, 0x83, 0x15, 0x89, 0xe4, 0xab, 0x4a, 0xaa, 0xad, 0x64, + 0xa4, 0xe5, 0x77, 0xd1, 0x56, 0x58, 0x31, 0x4b, 0xed, 0x33, 0xb5, 0xed, 0x65, 0x71, 0xf4, 0x2b, + 0x05, 0x36, 0x0f, 0x67, 0x8f, 0xd9, 0x28, 0xaf, 0x91, 0xc9, 0x6f, 0x9d, 0x62, 0x32, 0x4f, 0x85, + 0x9b, 0x66, 0x81, 0xc8, 0x39, 0xb8, 0x53, 0x81, 0xc8, 0x53, 0x47, 0x6d, 0x28, 0x1b, 0xec, 0x74, + 0xf5, 0xd5, 0x22, 0x33, 0x7e, 0xf9, 0x14, 0xe3, 0x42, 0x8a, 0xdb, 0x63, 0xe5, 0xca, 0x4f, 0x65, + 0xd9, 0x44, 0x0c, 0x85, 0x3e, 0x86, 0x65, 0x83, 0x9f, 0xfb, 0xbe, 0x5a, 0x62, 0xb0, 0x57, 0x4e, + 0x85, 0xe5, 0x62, 0x1c, 0x77, 0x2b, 0x0c, 0x34, 0x24, 0x26, 0x06, 0x19, 0x78, 0x8a, 0x86, 0x7e, + 0x0c, 0xd0, 0x72, 0x8f, 0xcd, 0xbe, 0x63, 0xb5, 0xc7, 0x71, 0xe7, 0x7f, 0xef, 0x14, 0xec, 0x44, + 0x90, 0xa3, 0xb3, 0xca, 0x75, 0xa6, 0x44, 0xb9, 0x72, 0x13, 0x51, 0xf4, 0x6d, 0x28, 0x3d, 0x26, + 0x76, 0x5c, 0x74, 0x6b, 0x02, 0xfb, 0x31, 0xb1, 0xd9, 0xc1, 0xcb, 0x8a, 0xb7, 0x4f, 0x6c, 0x59, + 0x9b, 0xc9, 0xa3, 0x5f, 0x2a, 0x70, 0xe5, 0xb0, 0xdb, 0xc3, 0xd6, 0xa8, 0x8f, 0xad, 0x7b, 0x63, + 0xdc, 0x1d, 0x51, 0x6c, 0x1d, 0xee, 0x19, 0x87, 0xbc, 0x1b, 0x1f, 0x78, 0xf8, 0x98, 0x15, 0x9f, + 0x68, 0xed, 0xd7, 0xc3, 0x40, 0x6b, 0xf8, 0x73, 0xc8, 0x4b, 0x86, 0xe6, 0xc2, 0x47, 0xbf, 0x53, + 0xe0, 0x1b, 0x33, 0x82, 0x89, 0x83, 0xd9, 0xe5, 0x2c, 0xb3, 0xe5, 0xdc, 0x0c, 0x03, 0xed, 0x86, + 0x3f, 0xb7, 0x96, 0xb4, 0xa8, 0x33, 0xd8, 0xda, 0x7e, 0x0a, 0xe7, 0x66, 0xf6, 0x4d, 0x4e, 0x77, + 0xbd, 0x9c, 0xee, 0xae, 0xab, 0x71, 0x7e, 0xc7, 0x2d, 0xf7, 0x88, 0x48, 0x5d, 0x75, 0xfb, 0x23, + 0xb8, 0x78, 0xea, 0xa6, 0xc8, 0xc1, 0xbd, 0x92, 0xc6, 0x8d, 0x73, 0x7b, 0xb8, 0x67, 0x64, 0x81, + 0x9f, 0xc0, 0x8a, 0x5c, 0xf0, 0x39, 0x58, 0x5f, 0x4f, 0x63, 0x9d, 0x13, 0x58, 0x5c, 0x2b, 0x0b, + 0xf7, 0x08, 0x56, 0x53, 0x85, 0x3e, 0xff, 0xda, 0x84, 0x9a, 0x0c, 0xf6, 0x18, 0xd6, 0x33, 0x95, + 0xfd, 0x3f, 0x84, 0xb0, 0xfe, 0xa7, 0x02, 0x94, 0xef, 0x63, 0x1c, 0x91, 0xd1, 0xbb, 0x50, 0x7e, + 0x60, 0xfa, 0xdf, 0xf7, 0xb1, 0xc5, 0xa0, 0x4a, 0x7a, 0x35, 0x0c, 0xb4, 0xb2, 0xcd, 0x49, 0x46, + 0xcc, 0x43, 0x7d, 0x28, 0xde, 0xc7, 0x58, 0x1c, 0x42, 0x9f, 0x84, 0x81, 0xb6, 0x7a, 0x84, 0xa5, + 0x13, 0xe4, 0x8f, 0xff, 0xd0, 0xee, 0x0d, 0x4c, 0xda, 0x6b, 0x76, 0x1c, 0xbb, 0xd1, 0x72, 0xe9, + 0xed, 0x33, 0x4c, 0xd7, 0x0d, 0xdd, 0xb1, 0x5b, 0x2e, 0xdd, 0x33, 0x7d, 0x8a, 0x3d, 0x23, 0x32, + 0x83, 0x3e, 0x53, 0x60, 0xad, 0xe5, 0x3a, 0xd4, 0x31, 0xfb, 0x07, 0xa6, 0x63, 0x45, 0x96, 0x8b, + 0xcc, 0x32, 0x8e, 0x46, 0x11, 0x27, 0xc5, 0x79, 0x1b, 0x8b, 0xc8, 0x18, 0xaf, 0xff, 0x5d, 0x81, + 0x25, 0x1e, 0x46, 0xb4, 0x0f, 0x55, 0xa9, 0x9c, 0x59, 0xcc, 0xaa, 0xd7, 0xd1, 0x6c, 0x37, 0xe2, + 0x27, 0xb5, 0x74, 0x34, 0xc8, 0x27, 0xb5, 0x24, 0x87, 0xbe, 0x33, 0xcd, 0x45, 0xa6, 0x0c, 0x04, + 0x95, 0x37, 0xde, 0x23, 0xfe, 0x22, 0x37, 0xde, 0x38, 0x83, 0xb7, 0x60, 0x8d, 0xef, 0x42, 0x87, + 0xb8, 0xfb, 0x9e, 0x85, 0x3d, 0x16, 0x2b, 0x31, 0xf2, 0xe1, 0x14, 0xc7, 0xc8, 0x48, 0xd6, 0xff, + 0xa3, 0x40, 0x59, 0x6c, 0x05, 0x44, 0xe0, 0x7c, 0xce, 0xc6, 0x12, 0x1e, 0x6e, 0xc7, 0xfb, 0x66, + 0x56, 0x42, 0xff, 0x5a, 0x18, 0x68, 0xef, 0xe4, 0x9c, 0x44, 0xd2, 0x62, 0xf3, 0x90, 0xbf, 0x5c, + 0xcf, 0xdb, 0x50, 0x16, 0xfd, 0x1d, 0xd5, 0xa3, 0xe4, 0xb2, 0x69, 0x87, 0x6d, 0x26, 0x1d, 0xc2, + 0x40, 0x5b, 0xa2, 0x8c, 0x62, 0x08, 0x0e, 0x7a, 0x17, 0x8a, 0x8f, 0x89, 0x2d, 0xd6, 0x09, 0xc9, + 0x01, 0xa1, 0x97, 0xc3, 0x40, 0x2b, 0xf6, 0x89, 0x6d, 0x44, 0xfc, 0xfa, 0xa7, 0x0a, 0x40, 0xd2, + 0x0e, 0xd0, 0x87, 0xb0, 0xc4, 0xdf, 0x44, 0x14, 0xd7, 0x53, 0x1d, 0xa3, 0x3d, 0xd6, 0x37, 0xc3, + 0x40, 0xdb, 0xe0, 0x87, 0xaa, 0xe4, 0xa0, 0x50, 0xca, 0xf1, 0xaf, 0x30, 0xb7, 0x7f, 0xff, 0x56, + 0xf2, 0x6f, 0x6a, 0xe8, 0x7d, 0xa8, 0x3e, 0x30, 0xfd, 0x03, 0x8f, 0x1c, 0x3b, 0xd6, 0x74, 0xd3, + 0xaf, 0x87, 0x81, 0x56, 0xb5, 0x13, 0xb2, 0x21, 0xcb, 0x08, 0x15, 0x03, 0x1f, 0x8d, 0xdc, 0x48, + 0xa5, 0x90, 0x52, 0x89, 0xc9, 0x86, 0x2c, 0x83, 0x6e, 0xc0, 0x4a, 0x84, 0x80, 0x5d, 0xb3, 0x1f, + 0x5d, 0x52, 0x58, 0x62, 0x4a, 0xfa, 0x46, 0x18, 0x68, 0x2b, 0xb6, 0x44, 0x37, 0x52, 0x52, 0x91, + 0xc3, 0x4f, 0xcc, 0x31, 0x23, 0x79, 0xfc, 0xa4, 0x2a, 0x31, 0x3d, 0xe6, 0xf0, 0x20, 0xc5, 0x31, + 0x32, 0x92, 0xf5, 0x23, 0x38, 0xff, 0x83, 0xa8, 0x41, 0x9a, 0x94, 0x78, 0x86, 0x49, 0x1d, 0xd7, + 0x66, 0x29, 0xb8, 0x0a, 0x95, 0x83, 0x51, 0xa7, 0xef, 0x74, 0x1f, 0xc5, 0xcd, 0x52, 0x5f, 0x0d, + 0x03, 0xad, 0x32, 0x8c, 0x89, 0x46, 0xc2, 0x8f, 0x2a, 0x81, 0xab, 0x32, 0x1f, 0x0b, 0xbc, 0x12, + 0x3c, 0x46, 0x31, 0x04, 0xa7, 0xfe, 0x37, 0x05, 0x36, 0xa6, 0x86, 0x7c, 0x4e, 0x8c, 0xba, 0x68, + 0x7a, 0xb8, 0x67, 0x5d, 0x54, 0x0c, 0xf7, 0xc9, 0x48, 0xaf, 0xc1, 0xe2, 0xbd, 0x21, 0xe9, 0xf6, + 0x44, 0x1e, 0x2b, 0x61, 0xa0, 0x2d, 0xe2, 0x88, 0x60, 0x70, 0x3a, 0xf2, 0x60, 0x33, 0x8b, 0xcd, + 0xf6, 0x07, 0x9f, 0xd3, 0xe2, 0x4d, 0x98, 0xe3, 0x27, 0x1f, 0x07, 0x8f, 0x73, 0x74, 0xe5, 0x71, + 0x30, 0x0f, 0xbb, 0xfe, 0xfb, 0x02, 0x54, 0x0c, 0x32, 0x72, 0x79, 0xc9, 0x6a, 0xb0, 0xc8, 0x5e, + 0x44, 0x61, 0xb0, 0x25, 0x7a, 0x11, 0xc1, 0xe0, 0xf4, 0x28, 0x47, 0x99, 0x5b, 0x62, 0x81, 0xdd, + 0x12, 0x59, 0x8e, 0xd2, 0xb7, 0xc4, 0x99, 0xbb, 0xe1, 0x77, 0x61, 0x83, 0x25, 0xeb, 0x23, 0x56, + 0x5c, 0x43, 0xe2, 0x8b, 0xca, 0x58, 0xe6, 0x1b, 0xa1, 0x93, 0xe1, 0x19, 0x33, 0xd2, 0x49, 0xa0, + 0x2d, 0x56, 0x1a, 0xa9, 0x40, 0x5b, 0x71, 0xa0, 0xad, 0x24, 0xd0, 0x8b, 0xa7, 0x04, 0xfa, 0x2a, + 0x54, 0xda, 0xce, 0x00, 0xfb, 0xd4, 0x1c, 0x0c, 0xd5, 0x25, 0xe6, 0x2a, 0x2b, 0x0b, 0x1a, 0x13, + 0x8d, 0x84, 0x5f, 0xff, 0x39, 0x00, 0xf3, 0xdd, 0x8f, 0x4f, 0xcc, 0x79, 0x72, 0xfd, 0x3d, 0x59, + 0x49, 0x4c, 0xf9, 0xf1, 0x75, 0x66, 0x1a, 0x6e, 0x3e, 0x9f, 0x7a, 0x53, 0x39, 0x79, 0x3e, 0x4d, + 0xb4, 0xeb, 0xef, 0x43, 0xf9, 0x60, 0xd4, 0x79, 0x84, 0x27, 0x3e, 0x7a, 0x0f, 0x4a, 0xd1, 0x2f, + 0xbb, 0xa9, 0xac, 0xf0, 0xa0, 0x3f, 0xc7, 0x93, 0xd4, 0x68, 0x1a, 0xf1, 0xeb, 0x7f, 0x29, 0xc0, + 0xb9, 0x24, 0xdd, 0xb1, 0xf6, 0x9c, 0x6b, 0xff, 0x4c, 0x81, 0x2d, 0xf6, 0x3c, 0x83, 0x20, 0x1c, + 0xb9, 0x91, 0xad, 0xc4, 0x98, 0xdf, 0xc8, 0x57, 0xe3, 0xc3, 0xb8, 0x16, 0x06, 0xda, 0xa5, 0xe3, + 0x2c, 0x4f, 0xfe, 0xaa, 0x91, 0xaf, 0x9d, 0xa4, 0xb3, 0x98, 0x9f, 0xce, 0xed, 0x67, 0x70, 0xe9, + 0x0b, 0x0c, 0xcb, 0xb3, 0xd2, 0xea, 0x17, 0x8e, 0x5e, 0x42, 0x4b, 0x1e, 0x96, 0xfe, 0x5c, 0x80, + 0xe5, 0xe9, 0x67, 0xa1, 0x39, 0xe3, 0x77, 0x0b, 0xd6, 0x58, 0xe5, 0x26, 0x25, 0x56, 0x48, 0xfa, + 0x58, 0x27, 0xc5, 0x31, 0x32, 0x92, 0x68, 0x30, 0xfb, 0xb1, 0xab, 0x98, 0xba, 0x4e, 0xc5, 0xe4, + 0xff, 0xcb, 0x87, 0xae, 0xb7, 0xf9, 0xfd, 0xc3, 0x86, 0x35, 0xf6, 0xb1, 0x25, 0x6a, 0xed, 0xfc, + 0x9a, 0x32, 0x67, 0xf8, 0x1a, 0xa9, 0x4f, 0x10, 0x7c, 0xe6, 0x5c, 0x0b, 0x03, 0x0d, 0x92, 0x4f, + 0x10, 0xf2, 0x87, 0x87, 0x7a, 0x03, 0x16, 0x99, 0xea, 0x9c, 0xf8, 0xfa, 0xe8, 0xc5, 0xab, 0xda, + 0xc2, 0xcb, 0x57, 0xb5, 0x85, 0xcf, 0x5f, 0xd5, 0x94, 0x5f, 0x9c, 0xd4, 0x94, 0x3f, 0x9c, 0xd4, + 0x94, 0xbf, 0x9e, 0xd4, 0x94, 0x17, 0x27, 0x35, 0xe5, 0xe5, 0x49, 0x4d, 0xf9, 0xe7, 0x49, 0x4d, + 0xf9, 0xd7, 0x49, 0x6d, 0xe1, 0xf3, 0x93, 0x9a, 0xf2, 0x9b, 0xd7, 0xb5, 0x85, 0x17, 0xaf, 0x6b, + 0x0b, 0x2f, 0x5f, 0xd7, 0x16, 0x3e, 0x39, 0xcb, 0x48, 0xd9, 0x14, 0xff, 0xac, 0xb8, 0x2d, 0x7e, + 0x3b, 0x4b, 0x2c, 0x60, 0x1f, 0xfc, 0x37, 0x00, 0x00, 0xff, 0xff, 0xe6, 0xe6, 0x68, 0x8a, 0xc6, + 0x18, 0x00, 0x00, } func (this *OutportBlock) Equal(that interface{}) bool { @@ -1313,9 +1313,14 @@ func (this *OutportBlock) Equal(that interface{}) bool { return false } } - if !this.StateChanges.Equal(that1.StateChanges) { + if len(this.StateChanges) != len(that1.StateChanges) { return false } + for i := range this.StateChanges { + if !this.StateChanges[i].Equal(that1.StateChanges[i]) { + return false + } + } if len(this.NotarizedHeadersHashes) != len(that1.NotarizedHeadersHashes) { return false } @@ -2368,17 +2373,19 @@ func (m *OutportBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x3a } } - if m.StateChanges != nil { - { - size, err := m.StateChanges.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if len(m.StateChanges) > 0 { + for iNdEx := len(m.StateChanges) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.StateChanges[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintOutportBlock(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintOutportBlock(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x32 } - i-- - dAtA[i] = 0x32 } if len(m.AlteredAccounts) > 0 { keysForAlteredAccounts := make([]string, 0, len(m.AlteredAccounts)) @@ -3148,20 +3155,20 @@ func (m *RoundInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x18 } if len(m.SignersIndexes) > 0 { - dAtA21 := make([]byte, len(m.SignersIndexes)*10) - var j20 int + dAtA20 := make([]byte, len(m.SignersIndexes)*10) + var j19 int for _, num := range m.SignersIndexes { for num >= 1<<7 { - dAtA21[j20] = uint8(uint64(num)&0x7f | 0x80) + dAtA20[j19] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j20++ + j19++ } - dAtA21[j20] = uint8(num) - j20++ + dAtA20[j19] = uint8(num) + j19++ } - i -= j20 - copy(dAtA[i:], dAtA21[:j20]) - i = encodeVarintOutportBlock(dAtA, i, uint64(j20)) + i -= j19 + copy(dAtA[i:], dAtA20[:j19]) + i = encodeVarintOutportBlock(dAtA, i, uint64(j19)) i-- dAtA[i] = 0x12 } @@ -3481,9 +3488,11 @@ func (m *OutportBlock) Size() (n int) { n += mapEntrySize + 1 + sovOutportBlock(uint64(mapEntrySize)) } } - if m.StateChanges != nil { - l = m.StateChanges.Size() - n += 1 + l + sovOutportBlock(uint64(l)) + if len(m.StateChanges) > 0 { + for _, e := range m.StateChanges { + l = e.Size() + n += 1 + l + sovOutportBlock(uint64(l)) + } } if len(m.NotarizedHeadersHashes) > 0 { for _, s := range m.NotarizedHeadersHashes { @@ -3948,6 +3957,11 @@ func (this *OutportBlock) String() string { if this == nil { return "nil" } + repeatedStringForStateChanges := "[]*StateChangesForTx{" + for _, f := range this.StateChanges { + repeatedStringForStateChanges += strings.Replace(fmt.Sprintf("%v", f), "StateChangesForTx", "stateChange.StateChangesForTx", 1) + "," + } + repeatedStringForStateChanges += "}" keysForAlteredAccounts := make([]string, 0, len(this.AlteredAccounts)) for k, _ := range this.AlteredAccounts { keysForAlteredAccounts = append(keysForAlteredAccounts, k) @@ -3964,7 +3978,7 @@ func (this *OutportBlock) String() string { `TransactionPool:` + strings.Replace(this.TransactionPool.String(), "TransactionPool", "TransactionPool", 1) + `,`, `HeaderGasConsumption:` + strings.Replace(this.HeaderGasConsumption.String(), "HeaderGasConsumption", "HeaderGasConsumption", 1) + `,`, `AlteredAccounts:` + mapStringForAlteredAccounts + `,`, - `StateChanges:` + strings.Replace(fmt.Sprintf("%v", this.StateChanges), "StateChangesForTx", "stateChange.StateChangesForTx", 1) + `,`, + `StateChanges:` + repeatedStringForStateChanges + `,`, `NotarizedHeadersHashes:` + fmt.Sprintf("%v", this.NotarizedHeadersHashes) + `,`, `NumberOfShards:` + fmt.Sprintf("%v", this.NumberOfShards) + `,`, `SignersIndexes:` + fmt.Sprintf("%v", this.SignersIndexes) + `,`, @@ -4593,10 +4607,8 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.StateChanges == nil { - m.StateChanges = &stateChange.StateChangesForTx{} - } - if err := m.StateChanges.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.StateChanges = append(m.StateChanges, &stateChange.StateChangesForTx{}) + if err := m.StateChanges[len(m.StateChanges)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/data/outport/outportBlock.proto b/data/outport/outportBlock.proto index faa713d6..72c51f17 100644 --- a/data/outport/outportBlock.proto +++ b/data/outport/outportBlock.proto @@ -21,7 +21,7 @@ message OutportBlock { TransactionPool TransactionPool = 3 [(gogoproto.jsontag) = "transactionPool,omitempty"]; HeaderGasConsumption HeaderGasConsumption = 4 [(gogoproto.jsontag) = "headerGasConsumption,omitempty"]; map AlteredAccounts = 5 [(gogoproto.jsontag) = "alteredAccounts,omitempty"]; - StateChangesForTx StateChanges = 6 [(gogoproto.jsontag) = "stateChanges,omitempty"]; + repeated StateChangesForTx StateChanges = 6 [(gogoproto.jsontag) = "stateChanges,omitempty"]; repeated string NotarizedHeadersHashes = 7 [(gogoproto.jsontag) = "notarizedHeadersHashes,omitempty"]; uint32 NumberOfShards = 8 [(gogoproto.jsontag) = "numberOfShards"]; repeated uint64 SignersIndexes = 9 [(gogoproto.jsontag) = "signersIndexes,omitempty"]; From bf9158ccaa4e5561ce3038d5cefd04d5dacd5e92 Mon Sep 17 00:00:00 2001 From: Alexander Cristurean Date: Fri, 6 Sep 2024 17:16:43 +0300 Subject: [PATCH 08/14] cosmetic changes. --- data/outport/outportBlock.pb.go | 448 ++++++++++------------------- data/outport/outportBlock.proto | 2 +- data/stateChange/stateChange.pb.go | 119 ++++++-- data/stateChange/stateChange.proto | 3 +- 4 files changed, 248 insertions(+), 324 deletions(-) diff --git a/data/outport/outportBlock.pb.go b/data/outport/outportBlock.pb.go index 33a278c1..8d2374e5 100644 --- a/data/outport/outportBlock.pb.go +++ b/data/outport/outportBlock.pb.go @@ -43,7 +43,7 @@ type OutportBlock struct { 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"` - StateChanges map[string]*stateChange.StateChangesForTx `protobuf:"bytes,6,rep,name=StateChanges,proto3" json:"stateChanges,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + StateChanges []*stateChange.StateChangesForTx `protobuf:"bytes,6,rep,name=StateChanges,proto3" json:"stateChanges,omitempty"` NotarizedHeadersHashes []string `protobuf:"bytes,7,rep,name=NotarizedHeadersHashes,proto3" json:"notarizedHeadersHashes,omitempty"` NumberOfShards uint32 `protobuf:"varint,8,opt,name=NumberOfShards,proto3" json:"numberOfShards"` SignersIndexes []uint64 `protobuf:"varint,9,rep,packed,name=SignersIndexes,proto3" json:"signersIndexes,omitempty"` @@ -114,7 +114,7 @@ func (m *OutportBlock) GetAlteredAccounts() map[string]*alteredAccount.AlteredAc return nil } -func (m *OutportBlock) GetStateChanges() map[string]*stateChange.StateChangesForTx { +func (m *OutportBlock) GetStateChanges() []*stateChange.StateChangesForTx { if m != nil { return m.StateChanges } @@ -1118,7 +1118,6 @@ func (m *Shard) GetShardID() uint32 { func init() { proto.RegisterType((*OutportBlock)(nil), "proto.OutportBlock") proto.RegisterMapType((map[string]*alteredAccount.AlteredAccount)(nil), "proto.OutportBlock.AlteredAccountsEntry") - proto.RegisterMapType((map[string]*stateChange.StateChangesForTx)(nil), "proto.OutportBlock.StateChangesEntry") proto.RegisterType((*BlockData)(nil), "proto.BlockData") proto.RegisterType((*TransactionPool)(nil), "proto.TransactionPool") proto.RegisterMapType((map[string]*TxInfo)(nil), "proto.TransactionPool.InvalidTxsEntry") @@ -1148,132 +1147,131 @@ func init() { func init() { proto.RegisterFile("outportBlock.proto", fileDescriptor_661b95cef868af95) } var fileDescriptor_661b95cef868af95 = []byte{ - // 1987 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcd, 0x6f, 0x1b, 0x5b, - 0x15, 0xcf, 0xd8, 0x4e, 0x1c, 0x1f, 0xe7, 0xf3, 0x36, 0x0d, 0xd3, 0x94, 0xe7, 0x09, 0x6e, 0xfb, - 0x88, 0x28, 0x75, 0x78, 0x7d, 0x15, 0xaa, 0x5a, 0x3d, 0x41, 0x27, 0xfd, 0x32, 0xfd, 0x48, 0x34, - 0x31, 0x3c, 0xf2, 0x84, 0x04, 0x63, 0xcf, 0xcd, 0x78, 0x54, 0x7b, 0xae, 0x99, 0xb9, 0x0e, 0x36, - 0x1b, 0x58, 0xf1, 0x58, 0xf0, 0x24, 0x96, 0xec, 0xd8, 0x22, 0x16, 0x6c, 0xf9, 0x0f, 0x10, 0x2b, - 0xd4, 0x15, 0xea, 0x6a, 0xa0, 0xe9, 0x06, 0xcd, 0x02, 0xbd, 0x1d, 0x2b, 0x24, 0x34, 0xf7, 0xde, - 0xf1, 0xdc, 0x19, 0x4f, 0x9e, 0x9c, 0x42, 0xc5, 0x26, 0x9e, 0x39, 0x1f, 0xbf, 0x73, 0xcf, 0xc7, - 0x3d, 0xf7, 0xdc, 0x09, 0x20, 0x32, 0xa4, 0x03, 0xe2, 0x51, 0xbd, 0x47, 0x3a, 0x2f, 0x1a, 0x03, - 0x8f, 0x50, 0x82, 0xe6, 0xd9, 0xcf, 0xd6, 0x0d, 0xdb, 0xa1, 0xdd, 0x61, 0xbb, 0xd1, 0x21, 0xfd, - 0x5d, 0x9b, 0xd8, 0x64, 0x97, 0x91, 0xdb, 0xc3, 0x63, 0xf6, 0xc6, 0x5e, 0xd8, 0x13, 0xd7, 0xda, - 0xfa, 0x48, 0x12, 0xef, 0x0f, 0x7b, 0xd4, 0x39, 0xc1, 0x9e, 0x3f, 0xda, 0xed, 0x8f, 0x6e, 0x74, - 0xba, 0xa6, 0xe3, 0xde, 0xe8, 0x10, 0x0f, 0xdf, 0xb0, 0xc9, 0xae, 0x65, 0x52, 0x73, 0xb7, 0x1d, - 0x99, 0xe3, 0x7f, 0x85, 0xfa, 0xbd, 0xf3, 0xa8, 0x53, 0xcf, 0x74, 0x7d, 0xb3, 0x43, 0x1d, 0xe2, - 0xee, 0xf6, 0x88, 0x2d, 0x20, 0x9a, 0x6f, 0x0b, 0x21, 0x3d, 0x0b, 0xa8, 0xa3, 0xf3, 0x40, 0xf9, - 0x7d, 0xd3, 0xa3, 0x7b, 0xc4, 0xa5, 0x9e, 0xd9, 0xa1, 0x06, 0xf6, 0x87, 0x3d, 0x9a, 0x47, 0x7b, - 0x1b, 0x47, 0x3d, 0xdc, 0xc1, 0xce, 0x80, 0xc6, 0xbf, 0x02, 0x62, 0xef, 0x7c, 0x10, 0x3f, 0x31, - 0x3d, 0xab, 0x35, 0x9a, 0x3c, 0x08, 0x90, 0xfd, 0xf3, 0x80, 0x98, 0x3d, 0x8a, 0x3d, 0x6c, 0xdd, - 0xeb, 0x74, 0xc8, 0xd0, 0xa5, 0x99, 0xd7, 0xb7, 0x09, 0xbf, 0x4f, 0x4d, 0x8a, 0xf7, 0xba, 0xa6, - 0x6b, 0x63, 0xf9, 0x99, 0x43, 0xd5, 0xff, 0xbd, 0x08, 0x4b, 0xfb, 0x52, 0x61, 0xa2, 0x5d, 0x28, - 0x1f, 0x76, 0x4d, 0xcf, 0x6a, 0xde, 0x57, 0x95, 0x6d, 0x65, 0x67, 0x59, 0xbf, 0x18, 0x06, 0xda, - 0xba, 0xcf, 0x49, 0x5f, 0x27, 0x7d, 0x87, 0xe2, 0xfe, 0x80, 0x8e, 0x8d, 0x58, 0x0a, 0x3d, 0x82, - 0x0a, 0xd3, 0xbc, 0x6f, 0x52, 0x53, 0x2d, 0x6c, 0x2b, 0x3b, 0xd5, 0x9b, 0x6b, 0x1c, 0xbc, 0x31, - 0xa1, 0xeb, 0x5f, 0x0a, 0x03, 0xed, 0x42, 0x3b, 0x7e, 0x95, 0x60, 0x12, 0x5d, 0xf4, 0x43, 0x58, - 0x6d, 0x25, 0xe5, 0x71, 0x40, 0x48, 0x4f, 0x2d, 0x32, 0xb8, 0x4d, 0x01, 0x97, 0xe1, 0xea, 0xef, - 0x85, 0x81, 0x76, 0x89, 0xa6, 0x89, 0x12, 0x74, 0x16, 0x0d, 0xf9, 0xb0, 0xf1, 0x18, 0x9b, 0x16, - 0xf6, 0x1e, 0x99, 0xfe, 0x1e, 0x71, 0xfd, 0x61, 0x7f, 0x10, 0xf1, 0xd4, 0x12, 0xb3, 0x72, 0x59, - 0x58, 0xc9, 0x13, 0xd1, 0xeb, 0x61, 0xa0, 0xd5, 0xba, 0x39, 0x1c, 0xc9, 0x5e, 0x2e, 0x38, 0xfa, - 0x31, 0xac, 0xde, 0x4b, 0xe5, 0xd0, 0x57, 0xe7, 0xb7, 0x8b, 0x3b, 0xd5, 0x9b, 0x3b, 0xc2, 0x9e, - 0x1c, 0xfd, 0x46, 0x46, 0xf4, 0x81, 0x4b, 0xbd, 0x31, 0xf7, 0x33, 0x5d, 0x08, 0xbe, 0xec, 0x67, - 0x46, 0x09, 0x61, 0x58, 0x3a, 0x4c, 0x12, 0xed, 0xab, 0x0b, 0xcc, 0xde, 0xb5, 0x3c, 0x7b, 0xb2, - 0x1c, 0x37, 0xb6, 0x15, 0x06, 0xda, 0xa6, 0x54, 0x27, 0xb2, 0xa5, 0x14, 0x2c, 0xfa, 0x01, 0x6c, - 0x3e, 0x27, 0xd4, 0xf4, 0x9c, 0x9f, 0x62, 0x8b, 0xbb, 0xee, 0x3f, 0x36, 0xfd, 0x2e, 0xf6, 0xd5, - 0xf2, 0x76, 0x71, 0xa7, 0xa2, 0x5f, 0x0d, 0x03, 0x6d, 0xdb, 0xcd, 0x95, 0x90, 0x30, 0xcf, 0xc0, - 0x40, 0x77, 0x60, 0xe5, 0xf9, 0xb0, 0xdf, 0xc6, 0xde, 0xfe, 0x31, 0xab, 0x34, 0x5f, 0x5d, 0x64, - 0xe5, 0x88, 0xc2, 0x40, 0x5b, 0x71, 0x53, 0x1c, 0x23, 0x23, 0x89, 0xee, 0xc3, 0xca, 0xa1, 0x63, - 0xbb, 0xd8, 0xf3, 0x9b, 0xae, 0x85, 0x47, 0xd8, 0x57, 0x2b, 0xdb, 0xc5, 0x9d, 0x92, 0xfe, 0xe5, - 0x30, 0xd0, 0x54, 0x3f, 0xc5, 0x91, 0x56, 0x92, 0xd1, 0x41, 0x06, 0x6c, 0x3e, 0x76, 0xec, 0x2e, - 0xf6, 0xe9, 0x43, 0xc7, 0x35, 0x7b, 0x2c, 0x60, 0xcf, 0x89, 0xdb, 0xc1, 0x2a, 0x6c, 0x2b, 0x3b, - 0x25, 0x1e, 0xa9, 0x6e, 0xae, 0x84, 0x71, 0x86, 0x26, 0x3a, 0x82, 0x8b, 0x53, 0x9c, 0xc8, 0x61, - 0xb5, 0xba, 0xad, 0xec, 0x2c, 0xe9, 0x57, 0xc2, 0x40, 0xd3, 0xba, 0x79, 0x02, 0xd2, 0x3a, 0xf3, - 0x11, 0xb6, 0x8e, 0x60, 0x23, 0xaf, 0x7a, 0xd0, 0x1a, 0x14, 0x5f, 0xe0, 0x31, 0xdb, 0xcc, 0x15, - 0x23, 0x7a, 0x44, 0xd7, 0x61, 0xfe, 0xc4, 0xec, 0x0d, 0xb1, 0xd8, 0xad, 0x17, 0x45, 0x61, 0xa4, - 0xb5, 0x0d, 0x2e, 0x73, 0xa7, 0x70, 0x5b, 0xd9, 0x3a, 0x82, 0xf5, 0xa9, 0x42, 0xc9, 0xc1, 0x6d, - 0xa4, 0x71, 0x55, 0x81, 0x2b, 0xab, 0x3e, 0x24, 0x5e, 0x6b, 0x24, 0x41, 0xd7, 0x7f, 0x55, 0x94, - 0xda, 0xc7, 0xf9, 0x9b, 0xcf, 0x5d, 0xa8, 0xf2, 0xb2, 0xd1, 0xc7, 0x14, 0xfb, 0xcc, 0xf0, 0x92, - 0x7e, 0x29, 0x0c, 0xb4, 0x8b, 0xdd, 0x84, 0x2c, 0x29, 0xca, 0xd2, 0xe8, 0x36, 0x00, 0x7f, 0x6d, - 0x8d, 0x07, 0x98, 0xf5, 0x9a, 0x8a, 0xae, 0x86, 0x81, 0xb6, 0xd1, 0x9d, 0x50, 0x25, 0x55, 0x49, - 0x36, 0xd1, 0x64, 0xb9, 0x2b, 0x31, 0xab, 0x92, 0x66, 0x26, 0x61, 0x92, 0x2c, 0xfa, 0x10, 0x4a, - 0x3a, 0xb1, 0xc6, 0xea, 0x3c, 0x0b, 0x51, 0x35, 0x6e, 0x94, 0xc4, 0x1a, 0xf3, 0xca, 0x6e, 0x13, - 0x6b, 0x2c, 0xa9, 0x32, 0x61, 0xd4, 0x85, 0x8d, 0x66, 0x74, 0xbe, 0x31, 0xaf, 0x9f, 0x39, 0xae, - 0xc3, 0x22, 0x16, 0x6f, 0xec, 0xb8, 0xdb, 0x4e, 0x18, 0xbc, 0x5b, 0x39, 0x39, 0x1a, 0x72, 0xb7, - 0xca, 0x43, 0xac, 0x7f, 0x0a, 0x53, 0x4d, 0x18, 0x75, 0x61, 0x49, 0x22, 0xf9, 0xaa, 0x92, 0x6a, - 0x5f, 0x19, 0x69, 0xf9, 0x5d, 0xee, 0x28, 0x52, 0x9b, 0x4e, 0x75, 0x14, 0x59, 0x1c, 0xfd, 0x52, - 0x81, 0x8d, 0xc3, 0xe9, 0xe3, 0x3c, 0xca, 0x6b, 0x64, 0xf2, 0x1b, 0x67, 0x98, 0xcc, 0x53, 0xe1, - 0xa6, 0x59, 0x20, 0x72, 0x06, 0x84, 0x54, 0x20, 0xf2, 0xd4, 0x51, 0x0b, 0xca, 0x06, 0x3b, 0xc5, - 0x7d, 0xb5, 0xc8, 0x8c, 0x5f, 0x39, 0xc3, 0xb8, 0x90, 0xe2, 0xf6, 0x58, 0xb9, 0xf2, 0xd3, 0x5f, - 0x36, 0x11, 0x43, 0xa1, 0xef, 0xc3, 0xa2, 0xc1, 0xe7, 0x0b, 0x5f, 0x2d, 0x31, 0xd8, 0xab, 0x67, - 0xc2, 0x72, 0x31, 0x8e, 0xbb, 0x19, 0x06, 0x1a, 0x12, 0x93, 0x89, 0x0c, 0x3c, 0x41, 0x43, 0x3f, - 0x02, 0x68, 0xba, 0x27, 0x66, 0xcf, 0xb1, 0x5a, 0xa3, 0xf8, 0x84, 0x79, 0xff, 0x0c, 0xec, 0x44, - 0x90, 0xa3, 0xb3, 0xca, 0x75, 0x26, 0x44, 0xb9, 0x72, 0x13, 0x51, 0xf4, 0x4d, 0x28, 0x3d, 0x25, - 0x76, 0x5c, 0x74, 0x2b, 0x02, 0xfb, 0x29, 0xb1, 0xd9, 0x01, 0xcf, 0x8a, 0xb7, 0x47, 0x6c, 0x59, - 0x9b, 0xc9, 0xa3, 0x5f, 0x28, 0x70, 0xf5, 0xb0, 0xd3, 0xc5, 0xd6, 0xb0, 0x87, 0xad, 0x07, 0x23, - 0xdc, 0x19, 0x52, 0x6c, 0x1d, 0xee, 0x19, 0x87, 0xbc, 0xd1, 0x1f, 0x78, 0xf8, 0x84, 0x15, 0x9f, - 0x38, 0x35, 0x6e, 0x86, 0x81, 0xd6, 0xf0, 0x67, 0x90, 0x97, 0x0c, 0xcd, 0x84, 0x8f, 0x7e, 0xa3, - 0xc0, 0xd7, 0xa6, 0x04, 0x13, 0x07, 0xb3, 0xcb, 0x59, 0x64, 0xcb, 0xb9, 0x1d, 0x06, 0xda, 0x2d, - 0x7f, 0x66, 0x2d, 0x69, 0x51, 0xe7, 0xb0, 0xb5, 0xf5, 0x1c, 0xd6, 0xa7, 0xf6, 0x4d, 0x4e, 0x83, - 0xbd, 0x92, 0x6e, 0xb0, 0xcb, 0x71, 0x7e, 0x47, 0x4d, 0xf7, 0x98, 0xc8, 0x0d, 0xfb, 0x63, 0xb8, - 0x74, 0xe6, 0xa6, 0xc8, 0xc1, 0xbd, 0x9a, 0xc6, 0x8d, 0x73, 0x7b, 0xb8, 0x67, 0x64, 0x81, 0x9f, - 0xc1, 0x92, 0x5c, 0xf0, 0x39, 0x58, 0x5f, 0x4d, 0x63, 0xad, 0x0b, 0x2c, 0xae, 0x95, 0x85, 0x7b, - 0x02, 0xcb, 0xa9, 0x42, 0x9f, 0x7d, 0x6d, 0x42, 0x4d, 0x06, 0x7b, 0x0a, 0xab, 0x99, 0xca, 0xfe, - 0x2f, 0x42, 0x58, 0xff, 0x43, 0x01, 0xca, 0x0f, 0x31, 0x8e, 0xc8, 0xe8, 0x1a, 0x94, 0x1f, 0x99, - 0xfe, 0x77, 0x7d, 0x6c, 0x31, 0xa8, 0x92, 0x5e, 0x0d, 0x03, 0xad, 0x6c, 0x73, 0x92, 0x11, 0xf3, - 0x50, 0x0f, 0x8a, 0x0f, 0x31, 0x16, 0x87, 0xd0, 0x27, 0x61, 0xa0, 0x2d, 0x1f, 0x63, 0xe9, 0x04, - 0xf9, 0xfd, 0xdf, 0xb4, 0x07, 0x7d, 0x93, 0x76, 0x77, 0xdb, 0x8e, 0xdd, 0x68, 0xba, 0xf4, 0xee, - 0x39, 0xa6, 0xf8, 0x86, 0xee, 0xd8, 0x4d, 0x97, 0xee, 0x99, 0x3e, 0xc5, 0x9e, 0x11, 0x99, 0x41, - 0x9f, 0x29, 0xb0, 0xd2, 0x74, 0x1d, 0xea, 0x98, 0xbd, 0x03, 0xd3, 0xb1, 0x22, 0xcb, 0x45, 0x66, - 0x19, 0x47, 0x53, 0x8e, 0x93, 0xe2, 0xbc, 0x8b, 0x45, 0x64, 0x8c, 0xd7, 0xff, 0xaa, 0xc0, 0x02, - 0x0f, 0x23, 0xda, 0x87, 0xaa, 0x54, 0xce, 0x2c, 0x66, 0xd5, 0x9b, 0x68, 0xba, 0x1b, 0xf1, 0x93, - 0x5a, 0x3a, 0x1a, 0xe4, 0x93, 0x5a, 0x92, 0x43, 0xdf, 0x9a, 0xe4, 0x22, 0x53, 0x06, 0x82, 0xca, - 0x1b, 0xef, 0x31, 0x7f, 0x91, 0x1b, 0x6f, 0x9c, 0xc1, 0x3b, 0xb0, 0xc2, 0x77, 0xa1, 0x43, 0xdc, - 0x7d, 0xcf, 0xc2, 0x1e, 0x8b, 0x95, 0x98, 0x26, 0x71, 0x8a, 0x63, 0x64, 0x24, 0xeb, 0xff, 0x52, - 0xa0, 0x2c, 0xb6, 0x02, 0x22, 0x70, 0x21, 0x67, 0x63, 0x09, 0x0f, 0xb7, 0xe2, 0x7d, 0x33, 0x2d, - 0xa1, 0x7f, 0x25, 0x0c, 0xb4, 0xf7, 0x72, 0x4e, 0x22, 0x69, 0xb1, 0x79, 0xc8, 0xff, 0x5f, 0xcf, - 0x5b, 0x50, 0x16, 0xfd, 0x1d, 0xd5, 0xa3, 0xe4, 0xb2, 0x69, 0x87, 0x6d, 0x26, 0x1d, 0xc2, 0x40, - 0x5b, 0xa0, 0x8c, 0x62, 0x08, 0x0e, 0xba, 0x06, 0xc5, 0xa7, 0xc4, 0x16, 0xeb, 0x84, 0xe4, 0x80, - 0xd0, 0xcb, 0x61, 0xa0, 0x15, 0x7b, 0xc4, 0x36, 0x22, 0x7e, 0xfd, 0x53, 0x05, 0x20, 0x69, 0x07, - 0xe8, 0x23, 0x58, 0xe0, 0x6f, 0x22, 0x8a, 0xab, 0xa9, 0x8e, 0xd1, 0x1a, 0xe9, 0x1b, 0x61, 0xa0, - 0xad, 0xf1, 0x43, 0x55, 0x72, 0x50, 0x28, 0xe5, 0xf8, 0x57, 0x98, 0xd9, 0xbf, 0x7f, 0x2a, 0xf9, - 0x37, 0x42, 0xf4, 0x01, 0x54, 0x1f, 0x99, 0xfe, 0x81, 0x47, 0x4e, 0x1c, 0x6b, 0xb2, 0xe9, 0x57, - 0xc3, 0x40, 0xab, 0xda, 0x09, 0xd9, 0x90, 0x65, 0x84, 0x8a, 0x81, 0x8f, 0x87, 0x6e, 0xa4, 0x52, - 0x48, 0xa9, 0xc4, 0x64, 0x43, 0x96, 0x41, 0xb7, 0x60, 0x29, 0x42, 0xc0, 0xae, 0xd9, 0x8b, 0xee, - 0x3f, 0x2c, 0x31, 0x25, 0x7d, 0x2d, 0x0c, 0xb4, 0x25, 0x5b, 0xa2, 0x1b, 0x29, 0xa9, 0xc8, 0xe1, - 0x67, 0xe6, 0x88, 0x91, 0x3c, 0x7e, 0x52, 0x95, 0x98, 0x1e, 0x73, 0xb8, 0x9f, 0xe2, 0x18, 0x19, - 0xc9, 0xfa, 0x31, 0x5c, 0xf8, 0x5e, 0xd4, 0x20, 0x4d, 0x4a, 0x3c, 0xc3, 0xa4, 0x8e, 0x6b, 0xb3, - 0x14, 0x5c, 0x87, 0xca, 0xc1, 0xb0, 0xdd, 0x73, 0x3a, 0x4f, 0xe2, 0x66, 0xa9, 0x2f, 0x87, 0x81, - 0x56, 0x19, 0xc4, 0x44, 0x23, 0xe1, 0x47, 0x95, 0xc0, 0x55, 0x99, 0x8f, 0x05, 0x5e, 0x09, 0x1e, - 0xa3, 0x18, 0x82, 0x53, 0xff, 0x8b, 0x02, 0x6b, 0x13, 0x43, 0x3e, 0x27, 0x46, 0x5d, 0x34, 0x3d, - 0xdc, 0xb3, 0x2e, 0x2a, 0x86, 0xfb, 0x64, 0xa4, 0xd7, 0x60, 0xfe, 0xc1, 0x80, 0x74, 0xba, 0x22, - 0x8f, 0x95, 0x30, 0xd0, 0xe6, 0x71, 0x44, 0x30, 0x38, 0x1d, 0x79, 0xb0, 0x91, 0xc5, 0x66, 0xfb, - 0x83, 0xcf, 0x69, 0xf1, 0x26, 0xcc, 0xf1, 0x93, 0x8f, 0x83, 0x27, 0x39, 0xba, 0xf2, 0x38, 0x98, - 0x87, 0x5d, 0xff, 0x6d, 0x01, 0x2a, 0x06, 0x19, 0xba, 0xbc, 0x64, 0x35, 0x98, 0x67, 0x2f, 0xa2, - 0x30, 0xd8, 0x12, 0xbd, 0x88, 0x60, 0x70, 0x7a, 0x94, 0xa3, 0xcc, 0x05, 0xb4, 0xc0, 0x2e, 0xa0, - 0x2c, 0x47, 0xe9, 0x0b, 0xe8, 0xd4, 0xb5, 0xf3, 0xdb, 0xb0, 0xc6, 0x92, 0xf5, 0x31, 0x2b, 0xae, - 0x01, 0xf1, 0x45, 0x65, 0x2c, 0xf2, 0x8d, 0xd0, 0xce, 0xf0, 0x8c, 0x29, 0xe9, 0x24, 0xd0, 0x16, - 0x2b, 0x8d, 0x54, 0xa0, 0xad, 0x38, 0xd0, 0x56, 0x12, 0xe8, 0xf9, 0x33, 0x02, 0x7d, 0x1d, 0x2a, - 0x2d, 0xa7, 0x8f, 0x7d, 0x6a, 0xf6, 0x07, 0xea, 0x02, 0x73, 0x95, 0x95, 0x05, 0x8d, 0x89, 0x46, - 0xc2, 0xaf, 0xff, 0x0c, 0x80, 0xf9, 0xee, 0xc7, 0x27, 0xe6, 0x2c, 0xb9, 0xfe, 0x8e, 0xac, 0x24, - 0xa6, 0xfc, 0xf8, 0x3a, 0x33, 0x09, 0x37, 0x9f, 0x4f, 0xbd, 0x89, 0x9c, 0x3c, 0x9f, 0x26, 0xda, - 0xf5, 0x0f, 0xa0, 0x7c, 0x30, 0x6c, 0x3f, 0xc1, 0x63, 0x1f, 0xbd, 0x0f, 0xa5, 0xe8, 0x97, 0xdd, - 0x54, 0x96, 0x78, 0xd0, 0x5f, 0xe0, 0x71, 0x6a, 0x34, 0x8d, 0xf8, 0xf5, 0x3f, 0x15, 0x60, 0x3d, - 0x49, 0x77, 0xac, 0x3d, 0xe3, 0xda, 0x3f, 0x53, 0x60, 0x93, 0x3d, 0x4f, 0x21, 0x08, 0x47, 0x6e, - 0x65, 0x2b, 0x31, 0xe6, 0x37, 0xf2, 0xd5, 0xf8, 0x30, 0xae, 0x85, 0x81, 0x76, 0xf9, 0x24, 0xcb, - 0x93, 0x3f, 0x98, 0xe4, 0x6b, 0x27, 0xe9, 0x2c, 0xe6, 0xa7, 0x73, 0xeb, 0x08, 0x2e, 0x7f, 0x81, - 0x61, 0x79, 0x56, 0x5a, 0xfe, 0xc2, 0xd1, 0x4b, 0x68, 0xc9, 0xc3, 0xd2, 0x1f, 0x0b, 0xb0, 0x38, - 0xf9, 0xfc, 0x34, 0x63, 0xfc, 0xee, 0xc0, 0x0a, 0xab, 0xdc, 0xa4, 0xc4, 0x0a, 0x49, 0x1f, 0x6b, - 0xa7, 0x38, 0x46, 0x46, 0x12, 0xf5, 0xa7, 0x3f, 0xaa, 0x15, 0x53, 0xd7, 0xa9, 0x98, 0xfc, 0x3f, - 0xf9, 0xa0, 0xf6, 0x0e, 0x3f, 0xad, 0xd4, 0x6d, 0x58, 0x61, 0xdf, 0x71, 0xa2, 0xd6, 0xce, 0xaf, - 0x29, 0x33, 0x86, 0xaf, 0x91, 0xfa, 0x04, 0xc1, 0x67, 0xce, 0x95, 0x30, 0xd0, 0x20, 0xf9, 0x04, - 0x21, 0x7f, 0x78, 0xa8, 0x37, 0x60, 0x9e, 0xa9, 0xce, 0x88, 0xaf, 0x0f, 0x5f, 0xbe, 0xae, 0xcd, - 0xbd, 0x7a, 0x5d, 0x9b, 0xfb, 0xfc, 0x75, 0x4d, 0xf9, 0xf9, 0x69, 0x4d, 0xf9, 0xdd, 0x69, 0x4d, - 0xf9, 0xf3, 0x69, 0x4d, 0x79, 0x79, 0x5a, 0x53, 0x5e, 0x9d, 0xd6, 0x94, 0xbf, 0x9f, 0xd6, 0x94, - 0x7f, 0x9c, 0xd6, 0xe6, 0x3e, 0x3f, 0xad, 0x29, 0xbf, 0x7e, 0x53, 0x9b, 0x7b, 0xf9, 0xa6, 0x36, - 0xf7, 0xea, 0x4d, 0x6d, 0xee, 0x93, 0xf3, 0x8c, 0x94, 0xbb, 0xe2, 0x9f, 0x22, 0x77, 0xc5, 0x6f, - 0x7b, 0x81, 0x05, 0xec, 0xc3, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xf0, 0x74, 0x8f, 0x10, 0x2e, - 0x19, 0x00, 0x00, + // 1971 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcd, 0x8f, 0x1b, 0x49, + 0x15, 0x9f, 0xb6, 0x3d, 0xe3, 0xf1, 0xf3, 0x7c, 0xa5, 0x32, 0x19, 0x3a, 0x13, 0xd6, 0x3d, 0x38, + 0xd9, 0x65, 0x44, 0x88, 0xcd, 0x66, 0x23, 0x14, 0x25, 0x5a, 0x41, 0x7a, 0xf2, 0x65, 0xf2, 0x31, + 0xa3, 0x1e, 0xc3, 0x6e, 0x56, 0x48, 0xd0, 0x76, 0xd7, 0xb4, 0x5b, 0xb1, 0xbb, 0x4c, 0x77, 0x79, + 0xb0, 0xb9, 0xc0, 0x89, 0xe5, 0xc0, 0x4a, 0x5c, 0x90, 0xb8, 0x71, 0x45, 0x1c, 0xb8, 0xf2, 0x1f, + 0x20, 0x4e, 0x28, 0x27, 0x94, 0x53, 0x43, 0x26, 0x17, 0xd4, 0x07, 0xb4, 0x37, 0xae, 0xa8, 0xab, + 0xaa, 0xdd, 0xd5, 0xed, 0x9e, 0x95, 0x27, 0x10, 0xed, 0x65, 0xdc, 0xfd, 0x3e, 0x7e, 0xaf, 0xde, + 0x47, 0xbd, 0x7a, 0xd5, 0x03, 0x88, 0x8c, 0xe8, 0x90, 0x78, 0x54, 0xef, 0x93, 0xee, 0xf3, 0xc6, + 0xd0, 0x23, 0x94, 0xa0, 0x45, 0xf6, 0xb3, 0x7d, 0xcd, 0x76, 0x68, 0x6f, 0xd4, 0x69, 0x74, 0xc9, + 0xa0, 0x69, 0x13, 0x9b, 0x34, 0x19, 0xb9, 0x33, 0x3a, 0x62, 0x6f, 0xec, 0x85, 0x3d, 0x71, 0xad, + 0xed, 0x0f, 0x25, 0xf1, 0xc1, 0xa8, 0x4f, 0x9d, 0x63, 0xec, 0xf9, 0xe3, 0xe6, 0x60, 0x7c, 0xad, + 0xdb, 0x33, 0x1d, 0xf7, 0x5a, 0x97, 0x78, 0xf8, 0x9a, 0x4d, 0x9a, 0x96, 0x49, 0xcd, 0x66, 0x27, + 0x32, 0xc7, 0xff, 0x0a, 0xf5, 0x3b, 0x67, 0x51, 0xa7, 0x9e, 0xe9, 0xfa, 0x66, 0x97, 0x3a, 0xc4, + 0x6d, 0xf6, 0x89, 0x2d, 0x20, 0x5a, 0x6f, 0x0a, 0x21, 0x3d, 0x0b, 0xa8, 0x67, 0x67, 0x81, 0xf2, + 0x07, 0xa6, 0x47, 0xf7, 0x88, 0x4b, 0x3d, 0xb3, 0x4b, 0x0d, 0xec, 0x8f, 0xfa, 0x34, 0x8f, 0xf6, + 0x26, 0x8e, 0x7a, 0xb8, 0x8b, 0x9d, 0x21, 0x8d, 0x7f, 0x05, 0xc4, 0xde, 0xd9, 0x20, 0x7e, 0x6a, + 0x7a, 0x56, 0x7b, 0x3c, 0x7d, 0x10, 0x20, 0xfb, 0x67, 0x01, 0x31, 0xfb, 0x14, 0x7b, 0xd8, 0xba, + 0xd3, 0xed, 0x92, 0x91, 0x4b, 0x33, 0xaf, 0x6f, 0x12, 0x7e, 0x9f, 0x9a, 0x14, 0xef, 0xf5, 0x4c, + 0xd7, 0xc6, 0xf2, 0x33, 0x87, 0xaa, 0xff, 0x76, 0x19, 0x56, 0xf6, 0xa5, 0xc2, 0x44, 0x4d, 0x28, + 0x1f, 0xf6, 0x4c, 0xcf, 0x6a, 0xdd, 0x55, 0x95, 0x1d, 0x65, 0x77, 0x55, 0xbf, 0x10, 0x06, 0xda, + 0x39, 0x9f, 0x93, 0xbe, 0x49, 0x06, 0x0e, 0xc5, 0x83, 0x21, 0x9d, 0x18, 0xb1, 0x14, 0x7a, 0x00, + 0x15, 0xa6, 0x79, 0xd7, 0xa4, 0xa6, 0x5a, 0xd8, 0x51, 0x76, 0xab, 0xd7, 0x37, 0x38, 0x78, 0x63, + 0x4a, 0xd7, 0xbf, 0x12, 0x06, 0xda, 0xf9, 0x4e, 0xfc, 0x2a, 0xc1, 0x24, 0xba, 0xe8, 0x47, 0xb0, + 0xde, 0x4e, 0xca, 0xe3, 0x80, 0x90, 0xbe, 0x5a, 0x64, 0x70, 0x5b, 0x02, 0x2e, 0xc3, 0xd5, 0xdf, + 0x09, 0x03, 0xed, 0x22, 0x4d, 0x13, 0x25, 0xe8, 0x2c, 0x1a, 0xf2, 0x61, 0xf3, 0x21, 0x36, 0x2d, + 0xec, 0x3d, 0x30, 0xfd, 0x3d, 0xe2, 0xfa, 0xa3, 0xc1, 0x30, 0xe2, 0xa9, 0x25, 0x66, 0xe5, 0x92, + 0xb0, 0x92, 0x27, 0xa2, 0xd7, 0xc3, 0x40, 0xab, 0xf5, 0x72, 0x38, 0x92, 0xbd, 0x5c, 0x70, 0xf4, + 0x13, 0x58, 0xbf, 0x93, 0xca, 0xa1, 0xaf, 0x2e, 0xee, 0x14, 0x77, 0xab, 0xd7, 0x77, 0x85, 0x3d, + 0x39, 0xfa, 0x8d, 0x8c, 0xe8, 0x3d, 0x97, 0x7a, 0x13, 0xee, 0x67, 0xba, 0x10, 0x7c, 0xd9, 0xcf, + 0x8c, 0x12, 0xfa, 0x18, 0x56, 0x0e, 0x93, 0x44, 0xfb, 0xea, 0x12, 0xb3, 0xa7, 0x0a, 0x7b, 0x32, + 0xeb, 0x3e, 0xf1, 0xda, 0x63, 0x7d, 0x3b, 0x0c, 0xb4, 0x2d, 0xa9, 0x34, 0x64, 0xf0, 0x14, 0x12, + 0xfa, 0x21, 0x6c, 0x3d, 0x25, 0xd4, 0xf4, 0x9c, 0x9f, 0x61, 0x8b, 0x7b, 0xeb, 0x3f, 0x34, 0xfd, + 0x1e, 0xf6, 0xd5, 0xf2, 0x4e, 0x71, 0xb7, 0xa2, 0x5f, 0x09, 0x03, 0x6d, 0xc7, 0xcd, 0x95, 0x90, + 0x30, 0x4f, 0xc1, 0x40, 0xb7, 0x60, 0xed, 0xe9, 0x68, 0xd0, 0xc1, 0xde, 0xfe, 0x11, 0x2b, 0x2e, + 0x5f, 0x5d, 0x66, 0x15, 0x88, 0xc2, 0x40, 0x5b, 0x73, 0x53, 0x1c, 0x23, 0x23, 0x89, 0xee, 0xc2, + 0xda, 0xa1, 0x63, 0xbb, 0xd8, 0xf3, 0x5b, 0xae, 0x85, 0xc7, 0xd8, 0x57, 0x2b, 0x3b, 0xc5, 0xdd, + 0x92, 0xfe, 0xd5, 0x30, 0xd0, 0x54, 0x3f, 0xc5, 0x91, 0x56, 0x92, 0xd1, 0x41, 0x06, 0x6c, 0x3d, + 0x74, 0xec, 0x1e, 0xf6, 0xe9, 0x7d, 0xc7, 0x35, 0xfb, 0x2c, 0x27, 0x4f, 0x89, 0xdb, 0xc5, 0x2a, + 0xec, 0x28, 0xbb, 0x25, 0x1e, 0xa9, 0x5e, 0xae, 0x84, 0x71, 0x8a, 0x26, 0x7a, 0x06, 0x17, 0x66, + 0x38, 0x91, 0xc3, 0x6a, 0x75, 0x47, 0xd9, 0x5d, 0xd1, 0x2f, 0x87, 0x81, 0xa6, 0xf5, 0xf2, 0x04, + 0xa4, 0x75, 0xe6, 0x23, 0x6c, 0x3f, 0x83, 0xcd, 0xbc, 0x82, 0x41, 0x1b, 0x50, 0x7c, 0x8e, 0x27, + 0x6c, 0xff, 0x56, 0x8c, 0xe8, 0x11, 0x5d, 0x85, 0xc5, 0x63, 0xb3, 0x3f, 0xc2, 0x62, 0x83, 0x5e, + 0x10, 0xb5, 0x90, 0xd6, 0x36, 0xb8, 0xcc, 0xad, 0xc2, 0x4d, 0xa5, 0xfe, 0xeb, 0xa2, 0xb4, 0xad, + 0xcf, 0xde, 0x14, 0x6e, 0x43, 0x95, 0xe7, 0x56, 0x9f, 0x50, 0xec, 0x33, 0xab, 0x2b, 0xfa, 0xc5, + 0x30, 0xd0, 0x2e, 0xf4, 0x12, 0xb2, 0xa4, 0x28, 0x4b, 0xa3, 0x9b, 0x00, 0xfc, 0xb5, 0x3d, 0x19, + 0x62, 0xd6, 0x03, 0x2a, 0xba, 0x1a, 0x06, 0xda, 0x66, 0x6f, 0x4a, 0x95, 0x54, 0x25, 0xd9, 0x44, + 0x93, 0x05, 0xb8, 0xc4, 0xac, 0x4a, 0x9a, 0x99, 0xa8, 0x4a, 0xb2, 0xe8, 0x03, 0x28, 0xe9, 0xc4, + 0x9a, 0xa8, 0x8b, 0x2c, 0x3e, 0xd5, 0xb8, 0x81, 0x11, 0x6b, 0xc2, 0xcb, 0xaf, 0x43, 0xac, 0x89, + 0xa4, 0xca, 0x84, 0x51, 0x0f, 0x36, 0x5b, 0xd1, 0xb9, 0xc3, 0xbc, 0x7e, 0xe2, 0xb8, 0x0e, 0x8b, + 0x58, 0xbc, 0xe1, 0xe2, 0x2e, 0x38, 0x65, 0xf0, 0x2e, 0xe2, 0xe4, 0x68, 0xc8, 0x5d, 0x24, 0x0f, + 0xb1, 0xfe, 0x29, 0xcc, 0x34, 0x47, 0xd4, 0x83, 0x15, 0x89, 0xe4, 0xab, 0x4a, 0xaa, 0xad, 0x64, + 0xa4, 0xe5, 0x77, 0xd1, 0x56, 0x58, 0x31, 0x4b, 0xed, 0x33, 0xb5, 0xed, 0x65, 0x71, 0xf4, 0x2b, + 0x05, 0x36, 0x0f, 0x67, 0x8f, 0xd9, 0x28, 0xaf, 0x91, 0xc9, 0x6f, 0x9d, 0x62, 0x32, 0x4f, 0x85, + 0x9b, 0x66, 0x81, 0xc8, 0x39, 0xb8, 0x53, 0x81, 0xc8, 0x53, 0x47, 0x6d, 0x28, 0x1b, 0xec, 0x74, + 0xf5, 0xd5, 0x22, 0x33, 0x7e, 0xf9, 0x14, 0xe3, 0x42, 0x8a, 0xdb, 0x63, 0xe5, 0xca, 0x4f, 0x65, + 0xd9, 0x44, 0x0c, 0x85, 0x3e, 0x86, 0x65, 0x83, 0x9f, 0xfb, 0xbe, 0x5a, 0x62, 0xb0, 0x57, 0x4e, + 0x85, 0xe5, 0x62, 0x1c, 0x77, 0x2b, 0x0c, 0x34, 0x24, 0x26, 0x06, 0x19, 0x78, 0x8a, 0x86, 0x7e, + 0x0c, 0xd0, 0x72, 0x8f, 0xcd, 0xbe, 0x63, 0xb5, 0xc7, 0x71, 0xe7, 0x7f, 0xef, 0x14, 0xec, 0x44, + 0x90, 0xa3, 0xb3, 0xca, 0x75, 0xa6, 0x44, 0xb9, 0x72, 0x13, 0x51, 0xf4, 0x6d, 0x28, 0x3d, 0x26, + 0x76, 0x5c, 0x74, 0x6b, 0x02, 0xfb, 0x31, 0xb1, 0xd9, 0xc1, 0xcb, 0x8a, 0xb7, 0x4f, 0x6c, 0x59, + 0x9b, 0xc9, 0xa3, 0x5f, 0x2a, 0x70, 0xe5, 0xb0, 0xdb, 0xc3, 0xd6, 0xa8, 0x8f, 0xad, 0x7b, 0x63, + 0xdc, 0x1d, 0x51, 0x6c, 0x1d, 0xee, 0x19, 0x87, 0xbc, 0x1b, 0x1f, 0x78, 0xf8, 0x98, 0x15, 0x9f, + 0x68, 0xed, 0xd7, 0xc3, 0x40, 0x6b, 0xf8, 0x73, 0xc8, 0x4b, 0x86, 0xe6, 0xc2, 0x47, 0xbf, 0x53, + 0xe0, 0x1b, 0x33, 0x82, 0x89, 0x83, 0xd9, 0xe5, 0x2c, 0xb3, 0xe5, 0xdc, 0x0c, 0x03, 0xed, 0x86, + 0x3f, 0xb7, 0x96, 0xb4, 0xa8, 0x33, 0xd8, 0xda, 0x7e, 0x0a, 0xe7, 0x66, 0xf6, 0x4d, 0x4e, 0x77, + 0xbd, 0x9c, 0xee, 0xae, 0xab, 0x71, 0x7e, 0xc7, 0x2d, 0xf7, 0x88, 0x48, 0x5d, 0x75, 0xfb, 0x23, + 0xb8, 0x78, 0xea, 0xa6, 0xc8, 0xc1, 0xbd, 0x92, 0xc6, 0x8d, 0x73, 0x7b, 0xb8, 0x67, 0x64, 0x81, + 0x9f, 0xc0, 0x8a, 0x5c, 0xf0, 0x39, 0x58, 0x5f, 0x4f, 0x63, 0x9d, 0x13, 0x58, 0x5c, 0x2b, 0x0b, + 0xf7, 0x08, 0x56, 0x53, 0x85, 0x3e, 0xff, 0xda, 0x84, 0x9a, 0x0c, 0xf6, 0x18, 0xd6, 0x33, 0x95, + 0xfd, 0x3f, 0x84, 0xb0, 0xfe, 0xa7, 0x02, 0x94, 0xef, 0x63, 0x1c, 0x91, 0xd1, 0xbb, 0x50, 0x7e, + 0x60, 0xfa, 0xdf, 0xf7, 0xb1, 0xc5, 0xa0, 0x4a, 0x7a, 0x35, 0x0c, 0xb4, 0xb2, 0xcd, 0x49, 0x46, + 0xcc, 0x43, 0x7d, 0x28, 0xde, 0xc7, 0x58, 0x1c, 0x42, 0x9f, 0x84, 0x81, 0xb6, 0x7a, 0x84, 0xa5, + 0x13, 0xe4, 0x8f, 0xff, 0xd0, 0xee, 0x0d, 0x4c, 0xda, 0x6b, 0x76, 0x1c, 0xbb, 0xd1, 0x72, 0xe9, + 0xed, 0x33, 0x4c, 0xd7, 0x0d, 0xdd, 0xb1, 0x5b, 0x2e, 0xdd, 0x33, 0x7d, 0x8a, 0x3d, 0x23, 0x32, + 0x83, 0x3e, 0x53, 0x60, 0xad, 0xe5, 0x3a, 0xd4, 0x31, 0xfb, 0x07, 0xa6, 0x63, 0x45, 0x96, 0x8b, + 0xcc, 0x32, 0x8e, 0x46, 0x11, 0x27, 0xc5, 0x79, 0x1b, 0x8b, 0xc8, 0x18, 0xaf, 0xff, 0x5d, 0x81, + 0x25, 0x1e, 0x46, 0xb4, 0x0f, 0x55, 0xa9, 0x9c, 0x59, 0xcc, 0xaa, 0xd7, 0xd1, 0x6c, 0x37, 0xe2, + 0x27, 0xb5, 0x74, 0x34, 0xc8, 0x27, 0xb5, 0x24, 0x87, 0xbe, 0x33, 0xcd, 0x45, 0xa6, 0x0c, 0x04, + 0x95, 0x37, 0xde, 0x23, 0xfe, 0x22, 0x37, 0xde, 0x38, 0x83, 0xb7, 0x60, 0x8d, 0xef, 0x42, 0x87, + 0xb8, 0xfb, 0x9e, 0x85, 0x3d, 0x16, 0x2b, 0x31, 0xf2, 0xe1, 0x14, 0xc7, 0xc8, 0x48, 0xd6, 0xff, + 0xa3, 0x40, 0x59, 0x6c, 0x05, 0x44, 0xe0, 0x7c, 0xce, 0xc6, 0x12, 0x1e, 0x6e, 0xc7, 0xfb, 0x66, + 0x56, 0x42, 0xff, 0x5a, 0x18, 0x68, 0xef, 0xe4, 0x9c, 0x44, 0xd2, 0x62, 0xf3, 0x90, 0xbf, 0x5c, + 0xcf, 0xdb, 0x50, 0x16, 0xfd, 0x1d, 0xd5, 0xa3, 0xe4, 0xb2, 0x69, 0x87, 0x6d, 0x26, 0x1d, 0xc2, + 0x40, 0x5b, 0xa2, 0x8c, 0x62, 0x08, 0x0e, 0x7a, 0x17, 0x8a, 0x8f, 0x89, 0x2d, 0xd6, 0x09, 0xc9, + 0x01, 0xa1, 0x97, 0xc3, 0x40, 0x2b, 0xf6, 0x89, 0x6d, 0x44, 0xfc, 0xfa, 0xa7, 0x0a, 0x40, 0xd2, + 0x0e, 0xd0, 0x87, 0xb0, 0xc4, 0xdf, 0x44, 0x14, 0xd7, 0x53, 0x1d, 0xa3, 0x3d, 0xd6, 0x37, 0xc3, + 0x40, 0xdb, 0xe0, 0x87, 0xaa, 0xe4, 0xa0, 0x50, 0xca, 0xf1, 0xaf, 0x30, 0xb7, 0x7f, 0xff, 0x56, + 0xf2, 0x6f, 0x6a, 0xe8, 0x7d, 0xa8, 0x3e, 0x30, 0xfd, 0x03, 0x8f, 0x1c, 0x3b, 0xd6, 0x74, 0xd3, + 0xaf, 0x87, 0x81, 0x56, 0xb5, 0x13, 0xb2, 0x21, 0xcb, 0x08, 0x15, 0x03, 0x1f, 0x8d, 0xdc, 0x48, + 0xa5, 0x90, 0x52, 0x89, 0xc9, 0x86, 0x2c, 0x83, 0x6e, 0xc0, 0x4a, 0x84, 0x80, 0x5d, 0xb3, 0x1f, + 0x5d, 0x52, 0x58, 0x62, 0x4a, 0xfa, 0x46, 0x18, 0x68, 0x2b, 0xb6, 0x44, 0x37, 0x52, 0x52, 0x91, + 0xc3, 0x4f, 0xcc, 0x31, 0x23, 0x79, 0xfc, 0xa4, 0x2a, 0x31, 0x3d, 0xe6, 0xf0, 0x20, 0xc5, 0x31, + 0x32, 0x92, 0xf5, 0x23, 0x38, 0xff, 0x83, 0xa8, 0x41, 0x9a, 0x94, 0x78, 0x86, 0x49, 0x1d, 0xd7, + 0x66, 0x29, 0xb8, 0x0a, 0x95, 0x83, 0x51, 0xa7, 0xef, 0x74, 0x1f, 0xc5, 0xcd, 0x52, 0x5f, 0x0d, + 0x03, 0xad, 0x32, 0x8c, 0x89, 0x46, 0xc2, 0x8f, 0x2a, 0x81, 0xab, 0x32, 0x1f, 0x0b, 0xbc, 0x12, + 0x3c, 0x46, 0x31, 0x04, 0xa7, 0xfe, 0x37, 0x05, 0x36, 0xa6, 0x86, 0x7c, 0x4e, 0x8c, 0xba, 0x68, + 0x7a, 0xb8, 0x67, 0x5d, 0x54, 0x0c, 0xf7, 0xc9, 0x48, 0xaf, 0xc1, 0xe2, 0xbd, 0x21, 0xe9, 0xf6, + 0x44, 0x1e, 0x2b, 0x61, 0xa0, 0x2d, 0xe2, 0x88, 0x60, 0x70, 0x3a, 0xf2, 0x60, 0x33, 0x8b, 0xcd, + 0xf6, 0x07, 0x9f, 0xd3, 0xe2, 0x4d, 0x98, 0xe3, 0x27, 0x1f, 0x07, 0x8f, 0x73, 0x74, 0xe5, 0x71, + 0x30, 0x0f, 0xbb, 0xfe, 0xfb, 0x02, 0x54, 0x0c, 0x32, 0x72, 0x79, 0xc9, 0x6a, 0xb0, 0xc8, 0x5e, + 0x44, 0x61, 0xb0, 0x25, 0x7a, 0x11, 0xc1, 0xe0, 0xf4, 0x28, 0x47, 0x99, 0x5b, 0x62, 0x81, 0xdd, + 0x12, 0x59, 0x8e, 0xd2, 0xb7, 0xc4, 0x99, 0xbb, 0xe1, 0x77, 0x61, 0x83, 0x25, 0xeb, 0x23, 0x56, + 0x5c, 0x43, 0xe2, 0x8b, 0xca, 0x58, 0xe6, 0x1b, 0xa1, 0x93, 0xe1, 0x19, 0x33, 0xd2, 0x49, 0xa0, + 0x2d, 0x56, 0x1a, 0xa9, 0x40, 0x5b, 0x71, 0xa0, 0xad, 0x24, 0xd0, 0x8b, 0xa7, 0x04, 0xfa, 0x2a, + 0x54, 0xda, 0xce, 0x00, 0xfb, 0xd4, 0x1c, 0x0c, 0xd5, 0x25, 0xe6, 0x2a, 0x2b, 0x0b, 0x1a, 0x13, + 0x8d, 0x84, 0x5f, 0xff, 0x39, 0x00, 0xf3, 0xdd, 0x8f, 0x4f, 0xcc, 0x79, 0x72, 0xfd, 0x3d, 0x59, + 0x49, 0x4c, 0xf9, 0xf1, 0x75, 0x66, 0x1a, 0x6e, 0x3e, 0x9f, 0x7a, 0x53, 0x39, 0x79, 0x3e, 0x4d, + 0xb4, 0xeb, 0xef, 0x43, 0xf9, 0x60, 0xd4, 0x79, 0x84, 0x27, 0x3e, 0x7a, 0x0f, 0x4a, 0xd1, 0x2f, + 0xbb, 0xa9, 0xac, 0xf0, 0xa0, 0x3f, 0xc7, 0x93, 0xd4, 0x68, 0x1a, 0xf1, 0xeb, 0x7f, 0x29, 0xc0, + 0xb9, 0x24, 0xdd, 0xb1, 0xf6, 0x9c, 0x6b, 0xff, 0x4c, 0x81, 0x2d, 0xf6, 0x3c, 0x83, 0x20, 0x1c, + 0xb9, 0x91, 0xad, 0xc4, 0x98, 0xdf, 0xc8, 0x57, 0xe3, 0xc3, 0xb8, 0x16, 0x06, 0xda, 0xa5, 0xe3, + 0x2c, 0x4f, 0xfe, 0xaa, 0x91, 0xaf, 0x9d, 0xa4, 0xb3, 0x98, 0x9f, 0xce, 0xed, 0x67, 0x70, 0xe9, + 0x0b, 0x0c, 0xcb, 0xb3, 0xd2, 0xea, 0x17, 0x8e, 0x5e, 0x42, 0x4b, 0x1e, 0x96, 0xfe, 0x5c, 0x80, + 0xe5, 0xe9, 0x67, 0xa1, 0x39, 0xe3, 0x77, 0x0b, 0xd6, 0x58, 0xe5, 0x26, 0x25, 0x56, 0x48, 0xfa, + 0x58, 0x27, 0xc5, 0x31, 0x32, 0x92, 0x68, 0x30, 0xfb, 0xb1, 0xab, 0x98, 0xba, 0x4e, 0xc5, 0xe4, + 0xff, 0xcb, 0x87, 0xae, 0xb7, 0xf9, 0xfd, 0xc3, 0x86, 0x35, 0xf6, 0xb1, 0x25, 0x6a, 0xed, 0xfc, + 0x9a, 0x32, 0x67, 0xf8, 0x1a, 0xa9, 0x4f, 0x10, 0x7c, 0xe6, 0x5c, 0x0b, 0x03, 0x0d, 0x92, 0x4f, + 0x10, 0xf2, 0x87, 0x87, 0x7a, 0x03, 0x16, 0x99, 0xea, 0x9c, 0xf8, 0xfa, 0xe8, 0xc5, 0xab, 0xda, + 0xc2, 0xcb, 0x57, 0xb5, 0x85, 0xcf, 0x5f, 0xd5, 0x94, 0x5f, 0x9c, 0xd4, 0x94, 0x3f, 0x9c, 0xd4, + 0x94, 0xbf, 0x9e, 0xd4, 0x94, 0x17, 0x27, 0x35, 0xe5, 0xe5, 0x49, 0x4d, 0xf9, 0xe7, 0x49, 0x4d, + 0xf9, 0xd7, 0x49, 0x6d, 0xe1, 0xf3, 0x93, 0x9a, 0xf2, 0x9b, 0xd7, 0xb5, 0x85, 0x17, 0xaf, 0x6b, + 0x0b, 0x2f, 0x5f, 0xd7, 0x16, 0x3e, 0x39, 0xcb, 0x48, 0xd9, 0x14, 0xff, 0xac, 0xb8, 0x2d, 0x7e, + 0x3b, 0x4b, 0x2c, 0x60, 0x1f, 0xfc, 0x37, 0x00, 0x00, 0xff, 0xff, 0xe6, 0xe6, 0x68, 0x8a, 0xc6, + 0x18, 0x00, 0x00, } func (this *OutportBlock) Equal(that interface{}) bool { @@ -1979,18 +1977,8 @@ func (this *OutportBlock) GoString() string { if this.AlteredAccounts != nil { s = append(s, "AlteredAccounts: "+mapStringForAlteredAccounts+",\n") } - keysForStateChanges := make([]string, 0, len(this.StateChanges)) - for k, _ := range this.StateChanges { - keysForStateChanges = append(keysForStateChanges, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForStateChanges) - mapStringForStateChanges := "map[string]*stateChange.StateChangesForTx{" - for _, k := range keysForStateChanges { - mapStringForStateChanges += fmt.Sprintf("%#v: %#v,", k, this.StateChanges[k]) - } - mapStringForStateChanges += "}" if this.StateChanges != nil { - s = append(s, "StateChanges: "+mapStringForStateChanges+",\n") + s = append(s, "StateChanges: "+fmt.Sprintf("%#v", this.StateChanges)+",\n") } s = append(s, "NotarizedHeadersHashes: "+fmt.Sprintf("%#v", this.NotarizedHeadersHashes)+",\n") s = append(s, "NumberOfShards: "+fmt.Sprintf("%#v", this.NumberOfShards)+",\n") @@ -2386,32 +2374,15 @@ func (m *OutportBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { } } if len(m.StateChanges) > 0 { - keysForStateChanges := make([]string, 0, len(m.StateChanges)) - for k := range m.StateChanges { - keysForStateChanges = append(keysForStateChanges, string(k)) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForStateChanges) - for iNdEx := len(keysForStateChanges) - 1; iNdEx >= 0; iNdEx-- { - v := m.StateChanges[string(keysForStateChanges[iNdEx])] - baseI := i - if v != nil { - { - size, err := v.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintOutportBlock(dAtA, i, uint64(size)) + for iNdEx := len(m.StateChanges) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.StateChanges[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i-- - dAtA[i] = 0x12 + i -= size + i = encodeVarintOutportBlock(dAtA, i, uint64(size)) } - i -= len(keysForStateChanges[iNdEx]) - copy(dAtA[i:], keysForStateChanges[iNdEx]) - i = encodeVarintOutportBlock(dAtA, i, uint64(len(keysForStateChanges[iNdEx]))) - i-- - dAtA[i] = 0xa - i = encodeVarintOutportBlock(dAtA, i, uint64(baseI-i)) i-- dAtA[i] = 0x32 } @@ -3184,20 +3155,20 @@ func (m *RoundInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x18 } if len(m.SignersIndexes) > 0 { - dAtA21 := make([]byte, len(m.SignersIndexes)*10) - var j20 int + dAtA20 := make([]byte, len(m.SignersIndexes)*10) + var j19 int for _, num := range m.SignersIndexes { for num >= 1<<7 { - dAtA21[j20] = uint8(uint64(num)&0x7f | 0x80) + dAtA20[j19] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j20++ + j19++ } - dAtA21[j20] = uint8(num) - j20++ + dAtA20[j19] = uint8(num) + j19++ } - i -= j20 - copy(dAtA[i:], dAtA21[:j20]) - i = encodeVarintOutportBlock(dAtA, i, uint64(j20)) + i -= j19 + copy(dAtA[i:], dAtA20[:j19]) + i = encodeVarintOutportBlock(dAtA, i, uint64(j19)) i-- dAtA[i] = 0x12 } @@ -3518,16 +3489,9 @@ func (m *OutportBlock) Size() (n int) { } } if len(m.StateChanges) > 0 { - for k, v := range m.StateChanges { - _ = k - _ = v - l = 0 - if v != nil { - l = v.Size() - l += 1 + sovOutportBlock(uint64(l)) - } - mapEntrySize := 1 + len(k) + sovOutportBlock(uint64(len(k))) + l - n += mapEntrySize + 1 + sovOutportBlock(uint64(mapEntrySize)) + for _, e := range m.StateChanges { + l = e.Size() + n += 1 + l + sovOutportBlock(uint64(l)) } } if len(m.NotarizedHeadersHashes) > 0 { @@ -3993,6 +3957,11 @@ func (this *OutportBlock) String() string { if this == nil { return "nil" } + repeatedStringForStateChanges := "[]*StateChangesForTx{" + for _, f := range this.StateChanges { + repeatedStringForStateChanges += strings.Replace(fmt.Sprintf("%v", f), "StateChangesForTx", "stateChange.StateChangesForTx", 1) + "," + } + repeatedStringForStateChanges += "}" keysForAlteredAccounts := make([]string, 0, len(this.AlteredAccounts)) for k, _ := range this.AlteredAccounts { keysForAlteredAccounts = append(keysForAlteredAccounts, k) @@ -4003,23 +3972,13 @@ func (this *OutportBlock) String() string { mapStringForAlteredAccounts += fmt.Sprintf("%v: %v,", k, this.AlteredAccounts[k]) } mapStringForAlteredAccounts += "}" - keysForStateChanges := make([]string, 0, len(this.StateChanges)) - for k, _ := range this.StateChanges { - keysForStateChanges = append(keysForStateChanges, k) - } - github_com_gogo_protobuf_sortkeys.Strings(keysForStateChanges) - mapStringForStateChanges := "map[string]*stateChange.StateChangesForTx{" - for _, k := range keysForStateChanges { - mapStringForStateChanges += fmt.Sprintf("%v: %v,", k, this.StateChanges[k]) - } - mapStringForStateChanges += "}" 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) + `,`, `AlteredAccounts:` + mapStringForAlteredAccounts + `,`, - `StateChanges:` + mapStringForStateChanges + `,`, + `StateChanges:` + repeatedStringForStateChanges + `,`, `NotarizedHeadersHashes:` + fmt.Sprintf("%v", this.NotarizedHeadersHashes) + `,`, `NumberOfShards:` + fmt.Sprintf("%v", this.NumberOfShards) + `,`, `SignersIndexes:` + fmt.Sprintf("%v", this.SignersIndexes) + `,`, @@ -4648,105 +4607,10 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.StateChanges == nil { - m.StateChanges = make(map[string]*stateChange.StateChangesForTx) - } - var mapkey string - var mapvalue *stateChange.StateChangesForTx - for iNdEx < postIndex { - entryPreIndex := 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) - if fieldNum == 1 { - var stringLenmapkey uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOutportBlock - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapkey |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapkey := int(stringLenmapkey) - if intStringLenmapkey < 0 { - return ErrInvalidLengthOutportBlock - } - postStringIndexmapkey := iNdEx + intStringLenmapkey - if postStringIndexmapkey < 0 { - return ErrInvalidLengthOutportBlock - } - if postStringIndexmapkey > l { - return io.ErrUnexpectedEOF - } - mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) - iNdEx = postStringIndexmapkey - } else if fieldNum == 2 { - var mapmsglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOutportBlock - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - mapmsglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if mapmsglen < 0 { - return ErrInvalidLengthOutportBlock - } - postmsgIndex := iNdEx + mapmsglen - if postmsgIndex < 0 { - return ErrInvalidLengthOutportBlock - } - if postmsgIndex > l { - return io.ErrUnexpectedEOF - } - mapvalue = &stateChange.StateChangesForTx{} - if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil { - return err - } - iNdEx = postmsgIndex - } else { - iNdEx = entryPreIndex - skippy, err := skipOutportBlock(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthOutportBlock - } - if (iNdEx + skippy) > postIndex { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } + m.StateChanges = append(m.StateChanges, &stateChange.StateChangesForTx{}) + if err := m.StateChanges[len(m.StateChanges)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } - m.StateChanges[mapkey] = mapvalue iNdEx = postIndex case 7: if wireType != 2 { diff --git a/data/outport/outportBlock.proto b/data/outport/outportBlock.proto index 28a0c6a2..72c51f17 100644 --- a/data/outport/outportBlock.proto +++ b/data/outport/outportBlock.proto @@ -21,7 +21,7 @@ message OutportBlock { TransactionPool TransactionPool = 3 [(gogoproto.jsontag) = "transactionPool,omitempty"]; HeaderGasConsumption HeaderGasConsumption = 4 [(gogoproto.jsontag) = "headerGasConsumption,omitempty"]; map AlteredAccounts = 5 [(gogoproto.jsontag) = "alteredAccounts,omitempty"]; - map StateChanges = 6 [(gogoproto.jsontag) = "stateChanges,omitempty"]; + repeated StateChangesForTx StateChanges = 6 [(gogoproto.jsontag) = "stateChanges,omitempty"]; repeated string NotarizedHeadersHashes = 7 [(gogoproto.jsontag) = "notarizedHeadersHashes,omitempty"]; uint32 NumberOfShards = 8 [(gogoproto.jsontag) = "numberOfShards"]; repeated uint64 SignersIndexes = 9 [(gogoproto.jsontag) = "signersIndexes,omitempty"]; diff --git a/data/stateChange/stateChange.pb.go b/data/stateChange/stateChange.pb.go index 9595d7ad..06488320 100644 --- a/data/stateChange/stateChange.pb.go +++ b/data/stateChange/stateChange.pb.go @@ -27,7 +27,8 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type StateChangesForTx struct { - StateChanges []*StateChange `protobuf:"bytes,1,rep,name=StateChanges,proto3" json:"stateChanges"` + TxHash []byte `protobuf:"bytes,1,opt,name=TxHash,proto3" json:"txHash"` + StateChanges []*StateChange `protobuf:"bytes,2,rep,name=StateChanges,proto3" json:"stateChanges"` } func (m *StateChangesForTx) Reset() { *m = StateChangesForTx{} } @@ -58,6 +59,13 @@ func (m *StateChangesForTx) XXX_DiscardUnknown() { var xxx_messageInfo_StateChangesForTx proto.InternalMessageInfo +func (m *StateChangesForTx) GetTxHash() []byte { + if m != nil { + return m.TxHash + } + return nil +} + func (m *StateChangesForTx) GetStateChanges() []*StateChange { if m != nil { return m.StateChanges @@ -216,35 +224,36 @@ func init() { func init() { proto.RegisterFile("stateChange.proto", fileDescriptor_8e577663eebb0888) } var fileDescriptor_8e577663eebb0888 = []byte{ - // 437 bytes of a gzipped FileDescriptorProto + // 452 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x4f, 0x8b, 0xd3, 0x40, 0x18, 0xc6, 0x33, 0x6d, 0x53, 0xed, 0xb4, 0xfe, 0xd9, 0x01, 0x21, 0xae, 0xee, 0xa4, 0xf4, 0x62, - 0x41, 0xd3, 0x80, 0x1e, 0xbd, 0x65, 0x45, 0x56, 0x44, 0x84, 0x58, 0x7a, 0x10, 0x14, 0xa6, 0xdd, - 0xd9, 0x24, 0x90, 0x64, 0x42, 0x32, 0x95, 0xe4, 0x20, 0xf8, 0x11, 0xfc, 0x18, 0x7e, 0x12, 0xf1, - 0xd8, 0x63, 0x4f, 0xc1, 0x4e, 0x2f, 0x92, 0xd3, 0x7e, 0x04, 0xc9, 0x74, 0x4b, 0x27, 0x45, 0xf0, - 0x34, 0x33, 0xbf, 0xe7, 0x7d, 0x86, 0xf7, 0x7d, 0x78, 0xe1, 0x49, 0xc6, 0x09, 0xa7, 0xe7, 0x3e, - 0x89, 0x3d, 0x3a, 0x49, 0x52, 0xc6, 0x19, 0xd2, 0xe5, 0x71, 0x6a, 0x79, 0x01, 0xf7, 0x97, 0xf3, - 0xc9, 0x82, 0x45, 0xb6, 0xc7, 0x3c, 0x66, 0x4b, 0x3c, 0x5f, 0x5e, 0xc9, 0x97, 0x7c, 0xc8, 0xdb, - 0xce, 0x35, 0xfa, 0x04, 0x4f, 0x3e, 0x1c, 0xbe, 0xca, 0x5e, 0xb3, 0x74, 0x9a, 0xa3, 0x0b, 0x38, - 0x50, 0xa1, 0x01, 0x86, 0xed, 0x71, 0xff, 0x39, 0xda, 0x59, 0x26, 0x8a, 0xe4, 0xdc, 0xaf, 0x4a, - 0x73, 0xa0, 0xf4, 0x92, 0xb9, 0x0d, 0xe7, 0xe8, 0x67, 0x0b, 0xf6, 0x15, 0x80, 0x1e, 0xc3, 0xce, - 0xb4, 0x48, 0xa8, 0x01, 0x86, 0x60, 0xdc, 0x73, 0x6e, 0x57, 0xa5, 0xd9, 0xe1, 0x45, 0x42, 0x5d, - 0x49, 0xd1, 0x23, 0xa8, 0xbf, 0x89, 0x2f, 0x69, 0x6e, 0xb4, 0x86, 0x60, 0xac, 0x3b, 0x7a, 0x55, - 0x9a, 0xc0, 0x72, 0x77, 0x0c, 0x9d, 0xc1, 0xee, 0x34, 0xbf, 0x20, 0x99, 0x6f, 0xb4, 0x87, 0x60, - 0x3c, 0xd8, 0xab, 0x37, 0x10, 0x3d, 0x81, 0xfd, 0x77, 0x24, 0x88, 0xa7, 0x69, 0x40, 0xdf, 0xd2, - 0xc2, 0xe8, 0xa8, 0x35, 0xaa, 0xa2, 0x16, 0xce, 0x48, 0x68, 0xe8, 0xff, 0x2c, 0x9c, 0x91, 0x10, - 0x3d, 0x85, 0xbd, 0xf7, 0x09, 0x4d, 0x09, 0x0f, 0x58, 0x6c, 0x74, 0x65, 0xc3, 0x77, 0xaa, 0xd2, - 0xec, 0xb1, 0x3d, 0x74, 0x0f, 0x3a, 0xfa, 0x0c, 0xef, 0xbd, 0x22, 0x9c, 0xd4, 0xde, 0x7d, 0x6a, - 0xb7, 0x64, 0x6a, 0x0f, 0x6e, 0x52, 0x6b, 0xaa, 0xce, 0x59, 0x55, 0x9a, 0x0f, 0x2f, 0x9b, 0x8e, - 0x67, 0x2c, 0x0a, 0x38, 0x8d, 0x12, 0x5e, 0xb8, 0xc7, 0x9f, 0x8d, 0xae, 0xe0, 0xdd, 0x26, 0xfa, - 0x4f, 0x94, 0xa7, 0xb0, 0x5d, 0xc7, 0xd0, 0x92, 0xd3, 0x1d, 0xc4, 0x1a, 0xd6, 0x5a, 0x3d, 0x79, - 0xfb, 0x58, 0x9b, 0x91, 0xd0, 0xf9, 0xba, 0xda, 0x60, 0x6d, 0xbd, 0xc1, 0xda, 0xf5, 0x06, 0x83, - 0x6f, 0x02, 0x83, 0x1f, 0x02, 0x83, 0x5f, 0x02, 0x83, 0x95, 0xc0, 0x60, 0x2d, 0x30, 0xf8, 0x2d, - 0x30, 0xf8, 0x23, 0xb0, 0x76, 0x2d, 0x30, 0xf8, 0xbe, 0xc5, 0xda, 0x6a, 0x8b, 0xb5, 0xf5, 0x16, - 0x6b, 0x1f, 0xcf, 0x95, 0xc5, 0x8b, 0x96, 0x21, 0x0f, 0xbe, 0xd0, 0x34, 0xcb, 0xed, 0x28, 0xb7, - 0x16, 0x3e, 0x09, 0x62, 0x6b, 0xc1, 0x52, 0x6a, 0x79, 0xcc, 0xae, 0x87, 0xb6, 0x95, 0x95, 0x79, - 0xa9, 0xdc, 0xe7, 0x5d, 0x19, 0xd6, 0x8b, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc1, 0x74, 0x60, - 0x41, 0xe0, 0x02, 0x00, 0x00, + 0x41, 0xd3, 0x80, 0x1e, 0xbd, 0x65, 0x45, 0x56, 0x44, 0x84, 0x58, 0x7a, 0xf0, 0x20, 0x4c, 0xbb, + 0xb3, 0x69, 0x20, 0xc9, 0x84, 0x64, 0x2a, 0xc9, 0x41, 0xd0, 0x6f, 0xe0, 0xc7, 0xf0, 0x93, 0x88, + 0xc7, 0x1e, 0x7b, 0x0a, 0x76, 0x7a, 0x91, 0x9c, 0xf6, 0x23, 0x48, 0xa6, 0xad, 0x9d, 0x14, 0x61, + 0x4f, 0x99, 0x79, 0x7e, 0xef, 0xfb, 0xe6, 0x79, 0x1f, 0x06, 0x9e, 0xa4, 0x9c, 0x70, 0x7a, 0x3e, + 0x27, 0x91, 0x47, 0x47, 0x71, 0xc2, 0x38, 0x43, 0xba, 0xfc, 0x9c, 0x5a, 0x9e, 0xcf, 0xe7, 0x8b, + 0xe9, 0x68, 0xc6, 0x42, 0xdb, 0x63, 0x1e, 0xb3, 0xa5, 0x3c, 0x5d, 0x5c, 0xc9, 0x9b, 0xbc, 0xc8, + 0xd3, 0xb6, 0x6b, 0xf0, 0x0d, 0xc0, 0x93, 0x0f, 0x87, 0x59, 0xe9, 0x6b, 0x96, 0x8c, 0x33, 0x34, + 0x80, 0xed, 0x71, 0x76, 0x41, 0xd2, 0xb9, 0x01, 0xfa, 0x60, 0xd8, 0x73, 0x60, 0x59, 0x98, 0x6d, + 0x2e, 0x15, 0x77, 0x47, 0xd0, 0x05, 0xec, 0xa9, 0x8d, 0x46, 0xa3, 0xdf, 0x1c, 0x76, 0x9f, 0xa3, + 0xed, 0xdc, 0x91, 0x82, 0x9c, 0xfb, 0x65, 0x61, 0xf6, 0x14, 0xc3, 0xa9, 0x5b, 0xeb, 0x1c, 0xfc, + 0x6c, 0xc0, 0xae, 0x22, 0xa0, 0xc7, 0xb0, 0x35, 0xce, 0x63, 0x2a, 0xff, 0xdd, 0x71, 0x6e, 0x97, + 0x85, 0xd9, 0xe2, 0x79, 0x4c, 0x5d, 0xa9, 0xa2, 0x47, 0x50, 0x7f, 0x13, 0x5d, 0xd2, 0xcc, 0x68, + 0xf4, 0xc1, 0x50, 0x77, 0xf4, 0xb2, 0x30, 0x81, 0xe5, 0x6e, 0x35, 0x74, 0xf6, 0xcf, 0x78, 0x53, + 0x1a, 0xdf, 0xd1, 0xbd, 0xe7, 0x27, 0xb0, 0xfb, 0x8e, 0xf8, 0xd1, 0x38, 0xf1, 0xe9, 0x5b, 0x9a, + 0x1b, 0x2d, 0xb5, 0x46, 0x25, 0x6a, 0xe1, 0x84, 0x04, 0x86, 0xfe, 0xdf, 0xc2, 0x09, 0x09, 0xd0, + 0x53, 0xd8, 0x79, 0x1f, 0xd3, 0x84, 0x70, 0x9f, 0x45, 0x46, 0x5b, 0x1a, 0xbe, 0x53, 0x16, 0x66, + 0x87, 0xed, 0x45, 0xf7, 0xc0, 0xd1, 0x27, 0x78, 0xef, 0x15, 0xe1, 0xa4, 0xea, 0xdd, 0xa7, 0x76, + 0x4b, 0xa6, 0xf6, 0x60, 0x97, 0x5a, 0x9d, 0x3a, 0x67, 0x65, 0x61, 0x3e, 0xbc, 0xac, 0x77, 0x3c, + 0x63, 0xa1, 0xcf, 0x69, 0x18, 0xf3, 0xdc, 0x3d, 0x1e, 0x36, 0xb8, 0x82, 0x77, 0xeb, 0xd2, 0x0d, + 0x51, 0x9e, 0xc2, 0x66, 0x15, 0x43, 0x43, 0x6e, 0x77, 0x80, 0x95, 0x58, 0xb1, 0x6a, 0xf3, 0xe6, + 0x31, 0x9b, 0x90, 0xc0, 0xf9, 0xb2, 0x5c, 0x63, 0x6d, 0xb5, 0xc6, 0xda, 0xf5, 0x1a, 0x83, 0xaf, + 0x02, 0x83, 0x1f, 0x02, 0x83, 0x5f, 0x02, 0x83, 0xa5, 0xc0, 0x60, 0x25, 0x30, 0xf8, 0x2d, 0x30, + 0xf8, 0x23, 0xb0, 0x76, 0x2d, 0x30, 0xf8, 0xbe, 0xc1, 0xda, 0x72, 0x83, 0xb5, 0xd5, 0x06, 0x6b, + 0x1f, 0xcf, 0x95, 0xd7, 0x19, 0x2e, 0x02, 0xee, 0x7f, 0xa6, 0x49, 0x9a, 0xd9, 0x61, 0x66, 0xcd, + 0xe6, 0xc4, 0x8f, 0xac, 0x19, 0x4b, 0xa8, 0xe5, 0x31, 0xbb, 0x5a, 0xda, 0x56, 0x9e, 0xcc, 0x4b, + 0xe5, 0x3c, 0x6d, 0xcb, 0xb0, 0x5e, 0xfc, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xc0, 0x08, 0xa3, 0x8b, + 0x05, 0x03, 0x00, 0x00, } func (this *StateChangesForTx) Equal(that interface{}) bool { @@ -266,6 +275,9 @@ func (this *StateChangesForTx) Equal(that interface{}) bool { } else if this == nil { return false } + if !bytes.Equal(this.TxHash, that1.TxHash) { + return false + } if len(this.StateChanges) != len(that1.StateChanges) { return false } @@ -357,8 +369,9 @@ func (this *StateChangesForTx) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 5) + s := make([]string, 0, 6) s = append(s, "&stateChange.StateChangesForTx{") + s = append(s, "TxHash: "+fmt.Sprintf("%#v", this.TxHash)+",\n") if this.StateChanges != nil { s = append(s, "StateChanges: "+fmt.Sprintf("%#v", this.StateChanges)+",\n") } @@ -434,9 +447,16 @@ func (m *StateChangesForTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintStateChange(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0xa + dAtA[i] = 0x12 } } + if len(m.TxHash) > 0 { + i -= len(m.TxHash) + copy(dAtA[i:], m.TxHash) + i = encodeVarintStateChange(dAtA, i, uint64(len(m.TxHash))) + i-- + dAtA[i] = 0xa + } return len(dAtA) - i, nil } @@ -578,6 +598,10 @@ func (m *StateChangesForTx) Size() (n int) { } var l int _ = l + l = len(m.TxHash) + if l > 0 { + n += 1 + l + sovStateChange(uint64(l)) + } if len(m.StateChanges) > 0 { for _, e := range m.StateChanges { l = e.Size() @@ -662,6 +686,7 @@ func (this *StateChangesForTx) String() string { } repeatedStringForStateChanges += "}" s := strings.Join([]string{`&StateChangesForTx{`, + `TxHash:` + fmt.Sprintf("%v", this.TxHash) + `,`, `StateChanges:` + repeatedStringForStateChanges + `,`, `}`, }, "") @@ -738,6 +763,40 @@ func (m *StateChangesForTx) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TxHash", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStateChange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthStateChange + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthStateChange + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.TxHash = append(m.TxHash[:0], dAtA[iNdEx:postIndex]...) + if m.TxHash == nil { + m.TxHash = []byte{} + } + iNdEx = postIndex + case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field StateChanges", wireType) } diff --git a/data/stateChange/stateChange.proto b/data/stateChange/stateChange.proto index 91d7cc2a..4a928049 100644 --- a/data/stateChange/stateChange.proto +++ b/data/stateChange/stateChange.proto @@ -8,7 +8,8 @@ option (gogoproto.stable_marshaler_all) = true; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; message StateChangesForTx { - repeated StateChange StateChanges = 1 [(gogoproto.jsontag) = "stateChanges"]; + bytes TxHash = 1 [(gogoproto.jsontag) = "txHash"]; + repeated StateChange StateChanges = 2 [(gogoproto.jsontag) = "stateChanges"]; } message StateChange { From 5781a60b580b1901898192a37d9bccf05802caf9 Mon Sep 17 00:00:00 2001 From: Alexander Cristurean Date: Fri, 6 Sep 2024 17:22:03 +0300 Subject: [PATCH 09/14] Revert "add map with value repeated in outport for state changes." This reverts commit 4da59a92 --- data/outport/outportBlock.pb.go | 447 +++++++++++++++++++---------- data/outport/outportBlock.proto | 22 +- data/stateChange/stateChange.pb.go | 354 ++--------------------- data/stateChange/stateChange.proto | 5 - 4 files changed, 331 insertions(+), 497 deletions(-) diff --git a/data/outport/outportBlock.pb.go b/data/outport/outportBlock.pb.go index 8d2374e5..0b54f071 100644 --- a/data/outport/outportBlock.pb.go +++ b/data/outport/outportBlock.pb.go @@ -43,7 +43,7 @@ type OutportBlock struct { 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"` - StateChanges []*stateChange.StateChangesForTx `protobuf:"bytes,6,rep,name=StateChanges,proto3" json:"stateChanges,omitempty"` + StateChanges map[string]*stateChange.StateChange `protobuf:"bytes,6,rep,name=StateChanges,proto3" json:"stateChanges,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` NotarizedHeadersHashes []string `protobuf:"bytes,7,rep,name=NotarizedHeadersHashes,proto3" json:"notarizedHeadersHashes,omitempty"` NumberOfShards uint32 `protobuf:"varint,8,opt,name=NumberOfShards,proto3" json:"numberOfShards"` SignersIndexes []uint64 `protobuf:"varint,9,rep,packed,name=SignersIndexes,proto3" json:"signersIndexes,omitempty"` @@ -114,7 +114,7 @@ func (m *OutportBlock) GetAlteredAccounts() map[string]*alteredAccount.AlteredAc return nil } -func (m *OutportBlock) GetStateChanges() []*stateChange.StateChangesForTx { +func (m *OutportBlock) GetStateChanges() map[string]*stateChange.StateChange { if m != nil { return m.StateChanges } @@ -1118,6 +1118,7 @@ func (m *Shard) GetShardID() uint32 { func init() { proto.RegisterType((*OutportBlock)(nil), "proto.OutportBlock") proto.RegisterMapType((map[string]*alteredAccount.AlteredAccount)(nil), "proto.OutportBlock.AlteredAccountsEntry") + proto.RegisterMapType((map[string]*stateChange.StateChange)(nil), "proto.OutportBlock.StateChangesEntry") proto.RegisterType((*BlockData)(nil), "proto.BlockData") proto.RegisterType((*TransactionPool)(nil), "proto.TransactionPool") proto.RegisterMapType((map[string]*TxInfo)(nil), "proto.TransactionPool.InvalidTxsEntry") @@ -1147,131 +1148,131 @@ func init() { func init() { proto.RegisterFile("outportBlock.proto", fileDescriptor_661b95cef868af95) } var fileDescriptor_661b95cef868af95 = []byte{ - // 1971 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcd, 0x8f, 0x1b, 0x49, - 0x15, 0x9f, 0xb6, 0x3d, 0xe3, 0xf1, 0xf3, 0x7c, 0xa5, 0x32, 0x19, 0x3a, 0x13, 0xd6, 0x3d, 0x38, - 0xd9, 0x65, 0x44, 0x88, 0xcd, 0x66, 0x23, 0x14, 0x25, 0x5a, 0x41, 0x7a, 0xf2, 0x65, 0xf2, 0x31, - 0xa3, 0x1e, 0xc3, 0x6e, 0x56, 0x48, 0xd0, 0x76, 0xd7, 0xb4, 0x5b, 0xb1, 0xbb, 0x4c, 0x77, 0x79, - 0xb0, 0xb9, 0xc0, 0x89, 0xe5, 0xc0, 0x4a, 0x5c, 0x90, 0xb8, 0x71, 0x45, 0x1c, 0xb8, 0xf2, 0x1f, - 0x20, 0x4e, 0x28, 0x27, 0x94, 0x53, 0x43, 0x26, 0x17, 0xd4, 0x07, 0xb4, 0x37, 0xae, 0xa8, 0xab, - 0xaa, 0xdd, 0xd5, 0xed, 0x9e, 0x95, 0x27, 0x10, 0xed, 0x65, 0xdc, 0xfd, 0x3e, 0x7e, 0xaf, 0xde, - 0x47, 0xbd, 0x7a, 0xd5, 0x03, 0x88, 0x8c, 0xe8, 0x90, 0x78, 0x54, 0xef, 0x93, 0xee, 0xf3, 0xc6, - 0xd0, 0x23, 0x94, 0xa0, 0x45, 0xf6, 0xb3, 0x7d, 0xcd, 0x76, 0x68, 0x6f, 0xd4, 0x69, 0x74, 0xc9, - 0xa0, 0x69, 0x13, 0x9b, 0x34, 0x19, 0xb9, 0x33, 0x3a, 0x62, 0x6f, 0xec, 0x85, 0x3d, 0x71, 0xad, - 0xed, 0x0f, 0x25, 0xf1, 0xc1, 0xa8, 0x4f, 0x9d, 0x63, 0xec, 0xf9, 0xe3, 0xe6, 0x60, 0x7c, 0xad, - 0xdb, 0x33, 0x1d, 0xf7, 0x5a, 0x97, 0x78, 0xf8, 0x9a, 0x4d, 0x9a, 0x96, 0x49, 0xcd, 0x66, 0x27, - 0x32, 0xc7, 0xff, 0x0a, 0xf5, 0x3b, 0x67, 0x51, 0xa7, 0x9e, 0xe9, 0xfa, 0x66, 0x97, 0x3a, 0xc4, - 0x6d, 0xf6, 0x89, 0x2d, 0x20, 0x5a, 0x6f, 0x0a, 0x21, 0x3d, 0x0b, 0xa8, 0x67, 0x67, 0x81, 0xf2, - 0x07, 0xa6, 0x47, 0xf7, 0x88, 0x4b, 0x3d, 0xb3, 0x4b, 0x0d, 0xec, 0x8f, 0xfa, 0x34, 0x8f, 0xf6, - 0x26, 0x8e, 0x7a, 0xb8, 0x8b, 0x9d, 0x21, 0x8d, 0x7f, 0x05, 0xc4, 0xde, 0xd9, 0x20, 0x7e, 0x6a, - 0x7a, 0x56, 0x7b, 0x3c, 0x7d, 0x10, 0x20, 0xfb, 0x67, 0x01, 0x31, 0xfb, 0x14, 0x7b, 0xd8, 0xba, - 0xd3, 0xed, 0x92, 0x91, 0x4b, 0x33, 0xaf, 0x6f, 0x12, 0x7e, 0x9f, 0x9a, 0x14, 0xef, 0xf5, 0x4c, - 0xd7, 0xc6, 0xf2, 0x33, 0x87, 0xaa, 0xff, 0x76, 0x19, 0x56, 0xf6, 0xa5, 0xc2, 0x44, 0x4d, 0x28, - 0x1f, 0xf6, 0x4c, 0xcf, 0x6a, 0xdd, 0x55, 0x95, 0x1d, 0x65, 0x77, 0x55, 0xbf, 0x10, 0x06, 0xda, - 0x39, 0x9f, 0x93, 0xbe, 0x49, 0x06, 0x0e, 0xc5, 0x83, 0x21, 0x9d, 0x18, 0xb1, 0x14, 0x7a, 0x00, - 0x15, 0xa6, 0x79, 0xd7, 0xa4, 0xa6, 0x5a, 0xd8, 0x51, 0x76, 0xab, 0xd7, 0x37, 0x38, 0x78, 0x63, - 0x4a, 0xd7, 0xbf, 0x12, 0x06, 0xda, 0xf9, 0x4e, 0xfc, 0x2a, 0xc1, 0x24, 0xba, 0xe8, 0x47, 0xb0, - 0xde, 0x4e, 0xca, 0xe3, 0x80, 0x90, 0xbe, 0x5a, 0x64, 0x70, 0x5b, 0x02, 0x2e, 0xc3, 0xd5, 0xdf, - 0x09, 0x03, 0xed, 0x22, 0x4d, 0x13, 0x25, 0xe8, 0x2c, 0x1a, 0xf2, 0x61, 0xf3, 0x21, 0x36, 0x2d, - 0xec, 0x3d, 0x30, 0xfd, 0x3d, 0xe2, 0xfa, 0xa3, 0xc1, 0x30, 0xe2, 0xa9, 0x25, 0x66, 0xe5, 0x92, - 0xb0, 0x92, 0x27, 0xa2, 0xd7, 0xc3, 0x40, 0xab, 0xf5, 0x72, 0x38, 0x92, 0xbd, 0x5c, 0x70, 0xf4, - 0x13, 0x58, 0xbf, 0x93, 0xca, 0xa1, 0xaf, 0x2e, 0xee, 0x14, 0x77, 0xab, 0xd7, 0x77, 0x85, 0x3d, - 0x39, 0xfa, 0x8d, 0x8c, 0xe8, 0x3d, 0x97, 0x7a, 0x13, 0xee, 0x67, 0xba, 0x10, 0x7c, 0xd9, 0xcf, - 0x8c, 0x12, 0xfa, 0x18, 0x56, 0x0e, 0x93, 0x44, 0xfb, 0xea, 0x12, 0xb3, 0xa7, 0x0a, 0x7b, 0x32, - 0xeb, 0x3e, 0xf1, 0xda, 0x63, 0x7d, 0x3b, 0x0c, 0xb4, 0x2d, 0xa9, 0x34, 0x64, 0xf0, 0x14, 0x12, - 0xfa, 0x21, 0x6c, 0x3d, 0x25, 0xd4, 0xf4, 0x9c, 0x9f, 0x61, 0x8b, 0x7b, 0xeb, 0x3f, 0x34, 0xfd, - 0x1e, 0xf6, 0xd5, 0xf2, 0x4e, 0x71, 0xb7, 0xa2, 0x5f, 0x09, 0x03, 0x6d, 0xc7, 0xcd, 0x95, 0x90, - 0x30, 0x4f, 0xc1, 0x40, 0xb7, 0x60, 0xed, 0xe9, 0x68, 0xd0, 0xc1, 0xde, 0xfe, 0x11, 0x2b, 0x2e, - 0x5f, 0x5d, 0x66, 0x15, 0x88, 0xc2, 0x40, 0x5b, 0x73, 0x53, 0x1c, 0x23, 0x23, 0x89, 0xee, 0xc2, - 0xda, 0xa1, 0x63, 0xbb, 0xd8, 0xf3, 0x5b, 0xae, 0x85, 0xc7, 0xd8, 0x57, 0x2b, 0x3b, 0xc5, 0xdd, - 0x92, 0xfe, 0xd5, 0x30, 0xd0, 0x54, 0x3f, 0xc5, 0x91, 0x56, 0x92, 0xd1, 0x41, 0x06, 0x6c, 0x3d, - 0x74, 0xec, 0x1e, 0xf6, 0xe9, 0x7d, 0xc7, 0x35, 0xfb, 0x2c, 0x27, 0x4f, 0x89, 0xdb, 0xc5, 0x2a, - 0xec, 0x28, 0xbb, 0x25, 0x1e, 0xa9, 0x5e, 0xae, 0x84, 0x71, 0x8a, 0x26, 0x7a, 0x06, 0x17, 0x66, - 0x38, 0x91, 0xc3, 0x6a, 0x75, 0x47, 0xd9, 0x5d, 0xd1, 0x2f, 0x87, 0x81, 0xa6, 0xf5, 0xf2, 0x04, - 0xa4, 0x75, 0xe6, 0x23, 0x6c, 0x3f, 0x83, 0xcd, 0xbc, 0x82, 0x41, 0x1b, 0x50, 0x7c, 0x8e, 0x27, - 0x6c, 0xff, 0x56, 0x8c, 0xe8, 0x11, 0x5d, 0x85, 0xc5, 0x63, 0xb3, 0x3f, 0xc2, 0x62, 0x83, 0x5e, - 0x10, 0xb5, 0x90, 0xd6, 0x36, 0xb8, 0xcc, 0xad, 0xc2, 0x4d, 0xa5, 0xfe, 0xeb, 0xa2, 0xb4, 0xad, - 0xcf, 0xde, 0x14, 0x6e, 0x43, 0x95, 0xe7, 0x56, 0x9f, 0x50, 0xec, 0x33, 0xab, 0x2b, 0xfa, 0xc5, - 0x30, 0xd0, 0x2e, 0xf4, 0x12, 0xb2, 0xa4, 0x28, 0x4b, 0xa3, 0x9b, 0x00, 0xfc, 0xb5, 0x3d, 0x19, - 0x62, 0xd6, 0x03, 0x2a, 0xba, 0x1a, 0x06, 0xda, 0x66, 0x6f, 0x4a, 0x95, 0x54, 0x25, 0xd9, 0x44, - 0x93, 0x05, 0xb8, 0xc4, 0xac, 0x4a, 0x9a, 0x99, 0xa8, 0x4a, 0xb2, 0xe8, 0x03, 0x28, 0xe9, 0xc4, - 0x9a, 0xa8, 0x8b, 0x2c, 0x3e, 0xd5, 0xb8, 0x81, 0x11, 0x6b, 0xc2, 0xcb, 0xaf, 0x43, 0xac, 0x89, - 0xa4, 0xca, 0x84, 0x51, 0x0f, 0x36, 0x5b, 0xd1, 0xb9, 0xc3, 0xbc, 0x7e, 0xe2, 0xb8, 0x0e, 0x8b, - 0x58, 0xbc, 0xe1, 0xe2, 0x2e, 0x38, 0x65, 0xf0, 0x2e, 0xe2, 0xe4, 0x68, 0xc8, 0x5d, 0x24, 0x0f, - 0xb1, 0xfe, 0x29, 0xcc, 0x34, 0x47, 0xd4, 0x83, 0x15, 0x89, 0xe4, 0xab, 0x4a, 0xaa, 0xad, 0x64, - 0xa4, 0xe5, 0x77, 0xd1, 0x56, 0x58, 0x31, 0x4b, 0xed, 0x33, 0xb5, 0xed, 0x65, 0x71, 0xf4, 0x2b, - 0x05, 0x36, 0x0f, 0x67, 0x8f, 0xd9, 0x28, 0xaf, 0x91, 0xc9, 0x6f, 0x9d, 0x62, 0x32, 0x4f, 0x85, - 0x9b, 0x66, 0x81, 0xc8, 0x39, 0xb8, 0x53, 0x81, 0xc8, 0x53, 0x47, 0x6d, 0x28, 0x1b, 0xec, 0x74, - 0xf5, 0xd5, 0x22, 0x33, 0x7e, 0xf9, 0x14, 0xe3, 0x42, 0x8a, 0xdb, 0x63, 0xe5, 0xca, 0x4f, 0x65, - 0xd9, 0x44, 0x0c, 0x85, 0x3e, 0x86, 0x65, 0x83, 0x9f, 0xfb, 0xbe, 0x5a, 0x62, 0xb0, 0x57, 0x4e, - 0x85, 0xe5, 0x62, 0x1c, 0x77, 0x2b, 0x0c, 0x34, 0x24, 0x26, 0x06, 0x19, 0x78, 0x8a, 0x86, 0x7e, - 0x0c, 0xd0, 0x72, 0x8f, 0xcd, 0xbe, 0x63, 0xb5, 0xc7, 0x71, 0xe7, 0x7f, 0xef, 0x14, 0xec, 0x44, - 0x90, 0xa3, 0xb3, 0xca, 0x75, 0xa6, 0x44, 0xb9, 0x72, 0x13, 0x51, 0xf4, 0x6d, 0x28, 0x3d, 0x26, - 0x76, 0x5c, 0x74, 0x6b, 0x02, 0xfb, 0x31, 0xb1, 0xd9, 0xc1, 0xcb, 0x8a, 0xb7, 0x4f, 0x6c, 0x59, - 0x9b, 0xc9, 0xa3, 0x5f, 0x2a, 0x70, 0xe5, 0xb0, 0xdb, 0xc3, 0xd6, 0xa8, 0x8f, 0xad, 0x7b, 0x63, - 0xdc, 0x1d, 0x51, 0x6c, 0x1d, 0xee, 0x19, 0x87, 0xbc, 0x1b, 0x1f, 0x78, 0xf8, 0x98, 0x15, 0x9f, - 0x68, 0xed, 0xd7, 0xc3, 0x40, 0x6b, 0xf8, 0x73, 0xc8, 0x4b, 0x86, 0xe6, 0xc2, 0x47, 0xbf, 0x53, - 0xe0, 0x1b, 0x33, 0x82, 0x89, 0x83, 0xd9, 0xe5, 0x2c, 0xb3, 0xe5, 0xdc, 0x0c, 0x03, 0xed, 0x86, - 0x3f, 0xb7, 0x96, 0xb4, 0xa8, 0x33, 0xd8, 0xda, 0x7e, 0x0a, 0xe7, 0x66, 0xf6, 0x4d, 0x4e, 0x77, - 0xbd, 0x9c, 0xee, 0xae, 0xab, 0x71, 0x7e, 0xc7, 0x2d, 0xf7, 0x88, 0x48, 0x5d, 0x75, 0xfb, 0x23, - 0xb8, 0x78, 0xea, 0xa6, 0xc8, 0xc1, 0xbd, 0x92, 0xc6, 0x8d, 0x73, 0x7b, 0xb8, 0x67, 0x64, 0x81, - 0x9f, 0xc0, 0x8a, 0x5c, 0xf0, 0x39, 0x58, 0x5f, 0x4f, 0x63, 0x9d, 0x13, 0x58, 0x5c, 0x2b, 0x0b, - 0xf7, 0x08, 0x56, 0x53, 0x85, 0x3e, 0xff, 0xda, 0x84, 0x9a, 0x0c, 0xf6, 0x18, 0xd6, 0x33, 0x95, - 0xfd, 0x3f, 0x84, 0xb0, 0xfe, 0xa7, 0x02, 0x94, 0xef, 0x63, 0x1c, 0x91, 0xd1, 0xbb, 0x50, 0x7e, - 0x60, 0xfa, 0xdf, 0xf7, 0xb1, 0xc5, 0xa0, 0x4a, 0x7a, 0x35, 0x0c, 0xb4, 0xb2, 0xcd, 0x49, 0x46, - 0xcc, 0x43, 0x7d, 0x28, 0xde, 0xc7, 0x58, 0x1c, 0x42, 0x9f, 0x84, 0x81, 0xb6, 0x7a, 0x84, 0xa5, - 0x13, 0xe4, 0x8f, 0xff, 0xd0, 0xee, 0x0d, 0x4c, 0xda, 0x6b, 0x76, 0x1c, 0xbb, 0xd1, 0x72, 0xe9, - 0xed, 0x33, 0x4c, 0xd7, 0x0d, 0xdd, 0xb1, 0x5b, 0x2e, 0xdd, 0x33, 0x7d, 0x8a, 0x3d, 0x23, 0x32, - 0x83, 0x3e, 0x53, 0x60, 0xad, 0xe5, 0x3a, 0xd4, 0x31, 0xfb, 0x07, 0xa6, 0x63, 0x45, 0x96, 0x8b, - 0xcc, 0x32, 0x8e, 0x46, 0x11, 0x27, 0xc5, 0x79, 0x1b, 0x8b, 0xc8, 0x18, 0xaf, 0xff, 0x5d, 0x81, - 0x25, 0x1e, 0x46, 0xb4, 0x0f, 0x55, 0xa9, 0x9c, 0x59, 0xcc, 0xaa, 0xd7, 0xd1, 0x6c, 0x37, 0xe2, - 0x27, 0xb5, 0x74, 0x34, 0xc8, 0x27, 0xb5, 0x24, 0x87, 0xbe, 0x33, 0xcd, 0x45, 0xa6, 0x0c, 0x04, - 0x95, 0x37, 0xde, 0x23, 0xfe, 0x22, 0x37, 0xde, 0x38, 0x83, 0xb7, 0x60, 0x8d, 0xef, 0x42, 0x87, - 0xb8, 0xfb, 0x9e, 0x85, 0x3d, 0x16, 0x2b, 0x31, 0xf2, 0xe1, 0x14, 0xc7, 0xc8, 0x48, 0xd6, 0xff, - 0xa3, 0x40, 0x59, 0x6c, 0x05, 0x44, 0xe0, 0x7c, 0xce, 0xc6, 0x12, 0x1e, 0x6e, 0xc7, 0xfb, 0x66, - 0x56, 0x42, 0xff, 0x5a, 0x18, 0x68, 0xef, 0xe4, 0x9c, 0x44, 0xd2, 0x62, 0xf3, 0x90, 0xbf, 0x5c, - 0xcf, 0xdb, 0x50, 0x16, 0xfd, 0x1d, 0xd5, 0xa3, 0xe4, 0xb2, 0x69, 0x87, 0x6d, 0x26, 0x1d, 0xc2, - 0x40, 0x5b, 0xa2, 0x8c, 0x62, 0x08, 0x0e, 0x7a, 0x17, 0x8a, 0x8f, 0x89, 0x2d, 0xd6, 0x09, 0xc9, - 0x01, 0xa1, 0x97, 0xc3, 0x40, 0x2b, 0xf6, 0x89, 0x6d, 0x44, 0xfc, 0xfa, 0xa7, 0x0a, 0x40, 0xd2, - 0x0e, 0xd0, 0x87, 0xb0, 0xc4, 0xdf, 0x44, 0x14, 0xd7, 0x53, 0x1d, 0xa3, 0x3d, 0xd6, 0x37, 0xc3, - 0x40, 0xdb, 0xe0, 0x87, 0xaa, 0xe4, 0xa0, 0x50, 0xca, 0xf1, 0xaf, 0x30, 0xb7, 0x7f, 0xff, 0x56, - 0xf2, 0x6f, 0x6a, 0xe8, 0x7d, 0xa8, 0x3e, 0x30, 0xfd, 0x03, 0x8f, 0x1c, 0x3b, 0xd6, 0x74, 0xd3, - 0xaf, 0x87, 0x81, 0x56, 0xb5, 0x13, 0xb2, 0x21, 0xcb, 0x08, 0x15, 0x03, 0x1f, 0x8d, 0xdc, 0x48, - 0xa5, 0x90, 0x52, 0x89, 0xc9, 0x86, 0x2c, 0x83, 0x6e, 0xc0, 0x4a, 0x84, 0x80, 0x5d, 0xb3, 0x1f, - 0x5d, 0x52, 0x58, 0x62, 0x4a, 0xfa, 0x46, 0x18, 0x68, 0x2b, 0xb6, 0x44, 0x37, 0x52, 0x52, 0x91, - 0xc3, 0x4f, 0xcc, 0x31, 0x23, 0x79, 0xfc, 0xa4, 0x2a, 0x31, 0x3d, 0xe6, 0xf0, 0x20, 0xc5, 0x31, - 0x32, 0x92, 0xf5, 0x23, 0x38, 0xff, 0x83, 0xa8, 0x41, 0x9a, 0x94, 0x78, 0x86, 0x49, 0x1d, 0xd7, - 0x66, 0x29, 0xb8, 0x0a, 0x95, 0x83, 0x51, 0xa7, 0xef, 0x74, 0x1f, 0xc5, 0xcd, 0x52, 0x5f, 0x0d, - 0x03, 0xad, 0x32, 0x8c, 0x89, 0x46, 0xc2, 0x8f, 0x2a, 0x81, 0xab, 0x32, 0x1f, 0x0b, 0xbc, 0x12, - 0x3c, 0x46, 0x31, 0x04, 0xa7, 0xfe, 0x37, 0x05, 0x36, 0xa6, 0x86, 0x7c, 0x4e, 0x8c, 0xba, 0x68, - 0x7a, 0xb8, 0x67, 0x5d, 0x54, 0x0c, 0xf7, 0xc9, 0x48, 0xaf, 0xc1, 0xe2, 0xbd, 0x21, 0xe9, 0xf6, - 0x44, 0x1e, 0x2b, 0x61, 0xa0, 0x2d, 0xe2, 0x88, 0x60, 0x70, 0x3a, 0xf2, 0x60, 0x33, 0x8b, 0xcd, - 0xf6, 0x07, 0x9f, 0xd3, 0xe2, 0x4d, 0x98, 0xe3, 0x27, 0x1f, 0x07, 0x8f, 0x73, 0x74, 0xe5, 0x71, - 0x30, 0x0f, 0xbb, 0xfe, 0xfb, 0x02, 0x54, 0x0c, 0x32, 0x72, 0x79, 0xc9, 0x6a, 0xb0, 0xc8, 0x5e, - 0x44, 0x61, 0xb0, 0x25, 0x7a, 0x11, 0xc1, 0xe0, 0xf4, 0x28, 0x47, 0x99, 0x5b, 0x62, 0x81, 0xdd, - 0x12, 0x59, 0x8e, 0xd2, 0xb7, 0xc4, 0x99, 0xbb, 0xe1, 0x77, 0x61, 0x83, 0x25, 0xeb, 0x23, 0x56, - 0x5c, 0x43, 0xe2, 0x8b, 0xca, 0x58, 0xe6, 0x1b, 0xa1, 0x93, 0xe1, 0x19, 0x33, 0xd2, 0x49, 0xa0, - 0x2d, 0x56, 0x1a, 0xa9, 0x40, 0x5b, 0x71, 0xa0, 0xad, 0x24, 0xd0, 0x8b, 0xa7, 0x04, 0xfa, 0x2a, - 0x54, 0xda, 0xce, 0x00, 0xfb, 0xd4, 0x1c, 0x0c, 0xd5, 0x25, 0xe6, 0x2a, 0x2b, 0x0b, 0x1a, 0x13, - 0x8d, 0x84, 0x5f, 0xff, 0x39, 0x00, 0xf3, 0xdd, 0x8f, 0x4f, 0xcc, 0x79, 0x72, 0xfd, 0x3d, 0x59, - 0x49, 0x4c, 0xf9, 0xf1, 0x75, 0x66, 0x1a, 0x6e, 0x3e, 0x9f, 0x7a, 0x53, 0x39, 0x79, 0x3e, 0x4d, - 0xb4, 0xeb, 0xef, 0x43, 0xf9, 0x60, 0xd4, 0x79, 0x84, 0x27, 0x3e, 0x7a, 0x0f, 0x4a, 0xd1, 0x2f, - 0xbb, 0xa9, 0xac, 0xf0, 0xa0, 0x3f, 0xc7, 0x93, 0xd4, 0x68, 0x1a, 0xf1, 0xeb, 0x7f, 0x29, 0xc0, - 0xb9, 0x24, 0xdd, 0xb1, 0xf6, 0x9c, 0x6b, 0xff, 0x4c, 0x81, 0x2d, 0xf6, 0x3c, 0x83, 0x20, 0x1c, - 0xb9, 0x91, 0xad, 0xc4, 0x98, 0xdf, 0xc8, 0x57, 0xe3, 0xc3, 0xb8, 0x16, 0x06, 0xda, 0xa5, 0xe3, - 0x2c, 0x4f, 0xfe, 0xaa, 0x91, 0xaf, 0x9d, 0xa4, 0xb3, 0x98, 0x9f, 0xce, 0xed, 0x67, 0x70, 0xe9, - 0x0b, 0x0c, 0xcb, 0xb3, 0xd2, 0xea, 0x17, 0x8e, 0x5e, 0x42, 0x4b, 0x1e, 0x96, 0xfe, 0x5c, 0x80, - 0xe5, 0xe9, 0x67, 0xa1, 0x39, 0xe3, 0x77, 0x0b, 0xd6, 0x58, 0xe5, 0x26, 0x25, 0x56, 0x48, 0xfa, - 0x58, 0x27, 0xc5, 0x31, 0x32, 0x92, 0x68, 0x30, 0xfb, 0xb1, 0xab, 0x98, 0xba, 0x4e, 0xc5, 0xe4, - 0xff, 0xcb, 0x87, 0xae, 0xb7, 0xf9, 0xfd, 0xc3, 0x86, 0x35, 0xf6, 0xb1, 0x25, 0x6a, 0xed, 0xfc, - 0x9a, 0x32, 0x67, 0xf8, 0x1a, 0xa9, 0x4f, 0x10, 0x7c, 0xe6, 0x5c, 0x0b, 0x03, 0x0d, 0x92, 0x4f, - 0x10, 0xf2, 0x87, 0x87, 0x7a, 0x03, 0x16, 0x99, 0xea, 0x9c, 0xf8, 0xfa, 0xe8, 0xc5, 0xab, 0xda, - 0xc2, 0xcb, 0x57, 0xb5, 0x85, 0xcf, 0x5f, 0xd5, 0x94, 0x5f, 0x9c, 0xd4, 0x94, 0x3f, 0x9c, 0xd4, - 0x94, 0xbf, 0x9e, 0xd4, 0x94, 0x17, 0x27, 0x35, 0xe5, 0xe5, 0x49, 0x4d, 0xf9, 0xe7, 0x49, 0x4d, - 0xf9, 0xd7, 0x49, 0x6d, 0xe1, 0xf3, 0x93, 0x9a, 0xf2, 0x9b, 0xd7, 0xb5, 0x85, 0x17, 0xaf, 0x6b, - 0x0b, 0x2f, 0x5f, 0xd7, 0x16, 0x3e, 0x39, 0xcb, 0x48, 0xd9, 0x14, 0xff, 0xac, 0xb8, 0x2d, 0x7e, - 0x3b, 0x4b, 0x2c, 0x60, 0x1f, 0xfc, 0x37, 0x00, 0x00, 0xff, 0xff, 0xe6, 0xe6, 0x68, 0x8a, 0xc6, - 0x18, 0x00, 0x00, + // 1980 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcd, 0x93, 0xdb, 0x48, + 0x15, 0x1f, 0xd9, 0x9e, 0xf1, 0xf8, 0xcd, 0x77, 0xef, 0x64, 0x50, 0x26, 0xac, 0x35, 0x38, 0xc9, + 0xe2, 0x22, 0xc4, 0x66, 0xb3, 0x29, 0x2a, 0x95, 0xd4, 0x16, 0x44, 0x93, 0x2f, 0x93, 0x8f, 0x99, + 0x92, 0x07, 0x96, 0x6c, 0x51, 0x05, 0xb2, 0xd5, 0x23, 0xab, 0x62, 0xab, 0x8d, 0xd4, 0x1e, 0x6c, + 0x2e, 0x70, 0x62, 0x39, 0xb0, 0x55, 0x1c, 0xb9, 0x71, 0xa5, 0x38, 0x70, 0xe5, 0x3f, 0xa0, 0x38, + 0x51, 0x39, 0x51, 0x39, 0x09, 0x32, 0xb9, 0x50, 0x3a, 0x50, 0x7b, 0xdb, 0x2b, 0xa5, 0xee, 0x96, + 0xd5, 0x92, 0x35, 0x5b, 0x9e, 0xc0, 0x16, 0x97, 0xb1, 0xf4, 0x3e, 0x7e, 0xaf, 0xdf, 0x47, 0xbf, + 0x7e, 0xad, 0x01, 0x44, 0x46, 0x74, 0x48, 0x3c, 0xaa, 0xf7, 0x49, 0xf7, 0x45, 0x63, 0xe8, 0x11, + 0x4a, 0xd0, 0x22, 0xfb, 0xd9, 0xbd, 0x6e, 0x3b, 0xb4, 0x37, 0xea, 0x34, 0xba, 0x64, 0xd0, 0xb4, + 0x89, 0x4d, 0x9a, 0x8c, 0xdc, 0x19, 0x1d, 0xb3, 0x37, 0xf6, 0xc2, 0x9e, 0xb8, 0xd6, 0xee, 0x87, + 0x92, 0xf8, 0x60, 0xd4, 0xa7, 0xce, 0x09, 0xf6, 0xfc, 0x71, 0x73, 0x30, 0xbe, 0xde, 0xed, 0x99, + 0x8e, 0x7b, 0xbd, 0x4b, 0x3c, 0x7c, 0xdd, 0x26, 0x4d, 0xcb, 0xa4, 0x66, 0xb3, 0x13, 0x99, 0xe3, + 0x7f, 0x85, 0xfa, 0xdd, 0xf3, 0xa8, 0x53, 0xcf, 0x74, 0x7d, 0xb3, 0x4b, 0x1d, 0xe2, 0x36, 0xfb, + 0xc4, 0x16, 0x10, 0xad, 0xb7, 0x85, 0x90, 0x9e, 0x05, 0xd4, 0xf3, 0xf3, 0x40, 0xf9, 0x03, 0xd3, + 0xa3, 0xfb, 0xc4, 0xa5, 0x9e, 0xd9, 0xa5, 0x06, 0xf6, 0x47, 0x7d, 0x9a, 0x47, 0x7b, 0x1b, 0x47, + 0x3d, 0xdc, 0xc5, 0xce, 0x90, 0xc6, 0xbf, 0x02, 0x62, 0xff, 0x7c, 0x10, 0x3f, 0x33, 0x3d, 0xeb, + 0x68, 0x3c, 0x7d, 0x10, 0x20, 0x07, 0xe7, 0x01, 0x31, 0xfb, 0x14, 0x7b, 0xd8, 0xba, 0xdb, 0xed, + 0x92, 0x91, 0x4b, 0x33, 0xaf, 0x6f, 0x13, 0x7e, 0x9f, 0x9a, 0x14, 0xef, 0xf7, 0x4c, 0xd7, 0xc6, + 0xf2, 0x33, 0x87, 0xaa, 0x7d, 0xbe, 0x0c, 0xab, 0x07, 0x52, 0x61, 0xa2, 0x26, 0x94, 0xdb, 0x3d, + 0xd3, 0xb3, 0x5a, 0xf7, 0x54, 0x65, 0x4f, 0xa9, 0xaf, 0xe9, 0x17, 0xc2, 0x40, 0xdb, 0xf2, 0x39, + 0xe9, 0x9b, 0x64, 0xe0, 0x50, 0x3c, 0x18, 0xd2, 0x89, 0x11, 0x4b, 0xa1, 0x87, 0x50, 0x61, 0x9a, + 0xf7, 0x4c, 0x6a, 0xaa, 0x85, 0x3d, 0xa5, 0xbe, 0x72, 0x63, 0x93, 0x83, 0x37, 0xa6, 0x74, 0xfd, + 0x2b, 0x61, 0xa0, 0xbd, 0xd3, 0x89, 0x5f, 0x25, 0x98, 0x44, 0x17, 0xfd, 0x18, 0x36, 0x8e, 0x92, + 0xf2, 0x38, 0x24, 0xa4, 0xaf, 0x16, 0x19, 0xdc, 0x8e, 0x80, 0xcb, 0x70, 0xf5, 0x77, 0xc3, 0x40, + 0xbb, 0x48, 0xd3, 0x44, 0x09, 0x3a, 0x8b, 0x86, 0x7c, 0xd8, 0x7e, 0x84, 0x4d, 0x0b, 0x7b, 0x0f, + 0x4d, 0x7f, 0x9f, 0xb8, 0xfe, 0x68, 0x30, 0x8c, 0x78, 0x6a, 0x89, 0x59, 0xb9, 0x24, 0xac, 0xe4, + 0x89, 0xe8, 0xb5, 0x30, 0xd0, 0xaa, 0xbd, 0x1c, 0x8e, 0x64, 0x2f, 0x17, 0x1c, 0xfd, 0x14, 0x36, + 0xee, 0xa6, 0x72, 0xe8, 0xab, 0x8b, 0x7b, 0xc5, 0xfa, 0xca, 0x8d, 0xba, 0xb0, 0x27, 0x47, 0xbf, + 0x91, 0x11, 0xbd, 0xef, 0x52, 0x6f, 0xc2, 0xfd, 0x4c, 0x17, 0x82, 0x2f, 0xfb, 0x99, 0x51, 0x42, + 0x18, 0x56, 0xdb, 0x49, 0xa2, 0x7d, 0x75, 0x89, 0xd9, 0xbb, 0x9a, 0x67, 0x4f, 0x96, 0xe3, 0xc6, + 0x76, 0xc3, 0x40, 0xdb, 0x91, 0xea, 0x44, 0xb6, 0x94, 0x82, 0x45, 0x3f, 0x82, 0x9d, 0x67, 0x84, + 0x9a, 0x9e, 0xf3, 0x73, 0x6c, 0x71, 0xd7, 0xfd, 0x47, 0xa6, 0xdf, 0xc3, 0xbe, 0x5a, 0xde, 0x2b, + 0xd6, 0x2b, 0xfa, 0x95, 0x30, 0xd0, 0xf6, 0xdc, 0x5c, 0x09, 0x09, 0xf3, 0x0c, 0x0c, 0x74, 0x1b, + 0xd6, 0x9f, 0x8d, 0x06, 0x1d, 0xec, 0x1d, 0x1c, 0xb3, 0x4a, 0xf3, 0xd5, 0x65, 0x56, 0x8e, 0x28, + 0x0c, 0xb4, 0x75, 0x37, 0xc5, 0x31, 0x32, 0x92, 0xe8, 0x1e, 0xac, 0xb7, 0x1d, 0xdb, 0xc5, 0x9e, + 0xdf, 0x72, 0x2d, 0x3c, 0xc6, 0xbe, 0x5a, 0xd9, 0x2b, 0xd6, 0x4b, 0xfa, 0x57, 0xc3, 0x40, 0x53, + 0xfd, 0x14, 0x47, 0x5a, 0x49, 0x46, 0x07, 0x19, 0xb0, 0xf3, 0xc8, 0xb1, 0x7b, 0xd8, 0xa7, 0x0f, + 0x1c, 0xd7, 0xec, 0xb3, 0x80, 0x3d, 0x23, 0x6e, 0x17, 0xab, 0xb0, 0xa7, 0xd4, 0x4b, 0x3c, 0x52, + 0xbd, 0x5c, 0x09, 0xe3, 0x0c, 0x4d, 0xf4, 0x1c, 0x2e, 0xcc, 0x70, 0x22, 0x87, 0xd5, 0x95, 0x3d, + 0xa5, 0xbe, 0xaa, 0x5f, 0x0e, 0x03, 0x4d, 0xeb, 0xe5, 0x09, 0x48, 0xeb, 0xcc, 0x47, 0xd8, 0x7d, + 0x0e, 0xdb, 0x79, 0xd5, 0x83, 0x36, 0xa1, 0xf8, 0x02, 0x4f, 0xd8, 0x66, 0xae, 0x18, 0xd1, 0x23, + 0xba, 0x06, 0x8b, 0x27, 0x66, 0x7f, 0x84, 0xc5, 0x6e, 0xbd, 0x20, 0x0a, 0x23, 0xad, 0x6d, 0x70, + 0x99, 0xdb, 0x85, 0x5b, 0xca, 0x6e, 0x1b, 0xb6, 0x66, 0x0a, 0x25, 0x07, 0xb7, 0x9e, 0xc6, 0x45, + 0x02, 0x57, 0x52, 0x95, 0x40, 0x6b, 0xbf, 0x29, 0x4a, 0x8d, 0xe3, 0xfc, 0x6d, 0xe7, 0x0e, 0xac, + 0xf0, 0x82, 0xd1, 0x27, 0x14, 0xfb, 0xcc, 0xe4, 0xaa, 0x7e, 0x31, 0x0c, 0xb4, 0x0b, 0xbd, 0x84, + 0x2c, 0x29, 0xca, 0xd2, 0xe8, 0x16, 0x00, 0x7f, 0x3d, 0x9a, 0x0c, 0x31, 0xeb, 0x32, 0x15, 0x5d, + 0x0d, 0x03, 0x6d, 0xbb, 0x37, 0xa5, 0x4a, 0xaa, 0x92, 0x6c, 0xa2, 0xc9, 0xb2, 0x56, 0x62, 0x56, + 0x25, 0xcd, 0x4c, 0xaa, 0x24, 0x59, 0xf4, 0x01, 0x94, 0x74, 0x62, 0x4d, 0xd4, 0x45, 0x16, 0x9c, + 0x95, 0xb8, 0x45, 0x12, 0x6b, 0xc2, 0x6b, 0xba, 0x43, 0xac, 0x89, 0xa4, 0xca, 0x84, 0x51, 0x0f, + 0xb6, 0x5b, 0xd1, 0xc9, 0xc6, 0xbc, 0x7e, 0xea, 0xb8, 0x0e, 0x8b, 0x58, 0xbc, 0xa5, 0xe3, 0x3e, + 0x3b, 0x65, 0xf0, 0x3e, 0xe5, 0xe4, 0x68, 0xc8, 0x7d, 0x2a, 0x0f, 0xb1, 0xf6, 0x09, 0xcc, 0xb4, + 0x5f, 0xd4, 0x83, 0x55, 0x89, 0xe4, 0xab, 0x4a, 0xaa, 0x71, 0x65, 0xa4, 0xe5, 0x77, 0xb9, 0x97, + 0x48, 0x0d, 0x3a, 0xd5, 0x4b, 0x64, 0x71, 0xf4, 0x6b, 0x05, 0xb6, 0xdb, 0xb3, 0x07, 0x79, 0x94, + 0xd7, 0xc8, 0xe4, 0xb7, 0xce, 0x30, 0x99, 0xa7, 0xc2, 0x4d, 0xb3, 0x40, 0xe4, 0x8c, 0x06, 0xa9, + 0x40, 0xe4, 0xa9, 0xa3, 0x23, 0x28, 0x1b, 0xec, 0xfc, 0xf6, 0xd5, 0x22, 0x33, 0x7e, 0xf9, 0x0c, + 0xe3, 0x42, 0x8a, 0xdb, 0x63, 0xe5, 0xca, 0xcf, 0x7d, 0xd9, 0x44, 0x0c, 0x85, 0x7e, 0x08, 0xcb, + 0x06, 0x9f, 0x2c, 0x7c, 0xb5, 0xc4, 0x60, 0xaf, 0x9c, 0x09, 0xcb, 0xc5, 0x38, 0xee, 0x4e, 0x18, + 0x68, 0x48, 0xcc, 0x24, 0x32, 0xf0, 0x14, 0x0d, 0xfd, 0x04, 0xa0, 0xe5, 0x9e, 0x98, 0x7d, 0xc7, + 0x3a, 0x1a, 0xc7, 0x67, 0xcb, 0x7b, 0x67, 0x60, 0x27, 0x82, 0x1c, 0x9d, 0x55, 0xae, 0x33, 0x25, + 0xca, 0x95, 0x9b, 0x88, 0xa2, 0x6f, 0x43, 0xe9, 0x09, 0xb1, 0xe3, 0xa2, 0x5b, 0x17, 0xd8, 0x4f, + 0x88, 0xcd, 0x8e, 0x76, 0x56, 0xbc, 0x7d, 0x62, 0xcb, 0xda, 0x4c, 0x1e, 0xfd, 0x4a, 0x81, 0x2b, + 0xed, 0x6e, 0x0f, 0x5b, 0xa3, 0x3e, 0xb6, 0xee, 0x8f, 0x71, 0x77, 0x44, 0xb1, 0xd5, 0xde, 0x37, + 0xda, 0xbc, 0xc5, 0x1f, 0x7a, 0xf8, 0x84, 0x15, 0x9f, 0x38, 0x2f, 0x6e, 0x84, 0x81, 0xd6, 0xf0, + 0xe7, 0x90, 0x97, 0x0c, 0xcd, 0x85, 0x8f, 0x7e, 0xa7, 0xc0, 0x37, 0x66, 0x04, 0x13, 0x07, 0xb3, + 0xcb, 0x59, 0x66, 0xcb, 0xb9, 0x15, 0x06, 0xda, 0x4d, 0x7f, 0x6e, 0x2d, 0x69, 0x51, 0xe7, 0xb0, + 0xb5, 0xfb, 0x0c, 0xb6, 0x66, 0xf6, 0x4d, 0x4e, 0x6b, 0xbd, 0x9c, 0x6e, 0xad, 0x6b, 0x71, 0x7e, + 0xc7, 0x2d, 0xf7, 0x98, 0xc8, 0xad, 0xfa, 0x23, 0xb8, 0x78, 0xe6, 0xa6, 0xc8, 0xc1, 0xbd, 0x92, + 0xc6, 0x8d, 0x73, 0xdb, 0xde, 0x37, 0xb2, 0xc0, 0x4f, 0x61, 0x55, 0x2e, 0xf8, 0x1c, 0xac, 0xaf, + 0xa7, 0xb1, 0xb6, 0x04, 0x16, 0xd7, 0xca, 0xc2, 0x3d, 0x86, 0xb5, 0x54, 0xa1, 0xcf, 0xbf, 0x36, + 0xa1, 0x26, 0x83, 0x3d, 0x81, 0x8d, 0x4c, 0x65, 0xff, 0x17, 0x21, 0xac, 0xfd, 0xa9, 0x00, 0xe5, + 0x07, 0x18, 0x47, 0x64, 0x74, 0x15, 0xca, 0x0f, 0x4d, 0xff, 0xfb, 0x3e, 0xb6, 0x18, 0x54, 0x49, + 0x5f, 0x09, 0x03, 0xad, 0x6c, 0x73, 0x92, 0x11, 0xf3, 0x50, 0x1f, 0x8a, 0x0f, 0x30, 0x16, 0x87, + 0xd0, 0xc7, 0x61, 0xa0, 0xad, 0x1d, 0x63, 0xe9, 0x04, 0xf9, 0xe3, 0x3f, 0xb4, 0xfb, 0x03, 0x93, + 0xf6, 0x9a, 0x1d, 0xc7, 0x6e, 0xb4, 0x5c, 0x7a, 0xe7, 0x1c, 0xf3, 0x7b, 0x43, 0x77, 0xec, 0x96, + 0x4b, 0xf7, 0x4d, 0x9f, 0x62, 0xcf, 0x88, 0xcc, 0xa0, 0x4f, 0x15, 0x58, 0x6f, 0xb9, 0x0e, 0x75, + 0xcc, 0xfe, 0xa1, 0xe9, 0x58, 0x91, 0xe5, 0x22, 0xb3, 0x8c, 0xa3, 0xf9, 0xc6, 0x49, 0x71, 0xbe, + 0x8c, 0x45, 0x64, 0x8c, 0xd7, 0xfe, 0xae, 0xc0, 0x12, 0x0f, 0x23, 0x3a, 0x80, 0x15, 0xa9, 0x9c, + 0x59, 0xcc, 0x92, 0x41, 0x40, 0xe2, 0xf0, 0x93, 0x5a, 0x3a, 0x1a, 0xe4, 0x93, 0x5a, 0x92, 0x43, + 0xdf, 0x99, 0xe6, 0x22, 0x53, 0x06, 0x82, 0xca, 0x1b, 0xef, 0x31, 0x7f, 0x91, 0x1b, 0x6f, 0x9c, + 0xc1, 0xdb, 0xb0, 0xce, 0x77, 0xa1, 0x43, 0xdc, 0x03, 0xcf, 0xc2, 0x1e, 0x8b, 0x95, 0x98, 0x23, + 0x71, 0x8a, 0x63, 0x64, 0x24, 0x6b, 0x9f, 0x2b, 0x50, 0x16, 0x5b, 0x01, 0x11, 0x78, 0x27, 0x67, + 0x63, 0x09, 0x0f, 0x77, 0xe3, 0x7d, 0x33, 0x2b, 0xa1, 0x7f, 0x2d, 0x0c, 0xb4, 0x77, 0x73, 0x4e, + 0x22, 0x69, 0xb1, 0x79, 0xc8, 0xff, 0x5f, 0xcf, 0x8f, 0xa0, 0x2c, 0xfa, 0x3b, 0xaa, 0x45, 0xc9, + 0x65, 0xd3, 0x0e, 0xdb, 0x4c, 0x3a, 0x84, 0x81, 0xb6, 0x44, 0x19, 0xc5, 0x10, 0x1c, 0x74, 0x15, + 0x8a, 0x4f, 0x88, 0x2d, 0xd6, 0x09, 0xc9, 0x01, 0xa1, 0x97, 0xc3, 0x40, 0x2b, 0xf6, 0x89, 0x6d, + 0x44, 0xfc, 0xda, 0x27, 0x0a, 0x40, 0xd2, 0x0e, 0xd0, 0x87, 0xb0, 0xc4, 0xdf, 0x44, 0x14, 0x37, + 0x52, 0x1d, 0xe3, 0x68, 0xac, 0x6f, 0x87, 0x81, 0xb6, 0xc9, 0x0f, 0x55, 0xc9, 0x41, 0xa1, 0x94, + 0xe3, 0x5f, 0x61, 0x6e, 0xff, 0xfe, 0xad, 0xe4, 0xdf, 0x05, 0xd1, 0xfb, 0xb0, 0xf2, 0xd0, 0xf4, + 0x0f, 0x3d, 0x72, 0xe2, 0x58, 0xd3, 0x4d, 0xbf, 0x11, 0x06, 0xda, 0x8a, 0x9d, 0x90, 0x0d, 0x59, + 0x46, 0xa8, 0x18, 0xf8, 0x78, 0xe4, 0x46, 0x2a, 0x85, 0x94, 0x4a, 0x4c, 0x36, 0x64, 0x19, 0x74, + 0x13, 0x56, 0x23, 0x04, 0xec, 0x9a, 0xfd, 0xe8, 0xe6, 0xc3, 0x12, 0x53, 0xd2, 0x37, 0xc3, 0x40, + 0x5b, 0xb5, 0x25, 0xba, 0x91, 0x92, 0x8a, 0x1c, 0x7e, 0x6a, 0x8e, 0x19, 0xc9, 0xe3, 0x27, 0x55, + 0x89, 0xe9, 0x31, 0x87, 0x07, 0x29, 0x8e, 0x91, 0x91, 0xac, 0x1d, 0xc3, 0x3b, 0x3f, 0x88, 0x1a, + 0xa4, 0x49, 0x89, 0x67, 0x98, 0xd4, 0x71, 0x6d, 0x96, 0x82, 0x6b, 0x50, 0x39, 0x1c, 0x75, 0xfa, + 0x4e, 0xf7, 0x71, 0xdc, 0x2c, 0xf5, 0xb5, 0x30, 0xd0, 0x2a, 0xc3, 0x98, 0x68, 0x24, 0xfc, 0xa8, + 0x12, 0xb8, 0x2a, 0xf3, 0xb1, 0xc0, 0x2b, 0xc1, 0x63, 0x14, 0x43, 0x70, 0x6a, 0x7f, 0x53, 0x60, + 0x73, 0x6a, 0xc8, 0xe7, 0xc4, 0xa8, 0x8b, 0xa6, 0x87, 0x7b, 0xd6, 0x45, 0xc5, 0x70, 0x9f, 0x8c, + 0xf4, 0x1a, 0x2c, 0xde, 0x1f, 0x92, 0x6e, 0x4f, 0xe4, 0xb1, 0x12, 0x06, 0xda, 0x22, 0x8e, 0x08, + 0x06, 0xa7, 0x23, 0x0f, 0xb6, 0xb3, 0xd8, 0x6c, 0x7f, 0xf0, 0x39, 0x2d, 0xde, 0x84, 0x39, 0x7e, + 0xf2, 0x71, 0xf0, 0x24, 0x47, 0x57, 0x1e, 0x07, 0xf3, 0xb0, 0x6b, 0xbf, 0x2f, 0x40, 0xc5, 0x20, + 0x23, 0x97, 0x97, 0xac, 0x06, 0x8b, 0xec, 0x45, 0x14, 0x06, 0x5b, 0xa2, 0x17, 0x11, 0x0c, 0x4e, + 0x8f, 0x72, 0x94, 0xb9, 0x7a, 0x16, 0xd8, 0xd5, 0x93, 0xe5, 0x28, 0x7d, 0xf5, 0x9c, 0xb9, 0x70, + 0x7e, 0x17, 0x36, 0x59, 0xb2, 0x3e, 0x62, 0xc5, 0x35, 0x24, 0xbe, 0xa8, 0x8c, 0x65, 0xbe, 0x11, + 0x3a, 0x19, 0x9e, 0x31, 0x23, 0x9d, 0x04, 0xda, 0x62, 0xa5, 0x91, 0x0a, 0xb4, 0x15, 0x07, 0xda, + 0x4a, 0x02, 0xbd, 0x78, 0x46, 0xa0, 0xaf, 0x41, 0xe5, 0xc8, 0x19, 0x60, 0x9f, 0x9a, 0x83, 0xa1, + 0xba, 0xc4, 0x5c, 0x65, 0x65, 0x41, 0x63, 0xa2, 0x91, 0xf0, 0x6b, 0xbf, 0x00, 0x60, 0xbe, 0xfb, + 0xf1, 0x89, 0x39, 0x4f, 0xae, 0xbf, 0x27, 0x2b, 0x89, 0x29, 0x3f, 0xbe, 0xce, 0x4c, 0xc3, 0xcd, + 0xe7, 0x53, 0x6f, 0x2a, 0x27, 0xcf, 0xa7, 0x89, 0x76, 0xed, 0x7d, 0x28, 0x1f, 0x8e, 0x3a, 0x8f, + 0xf1, 0xc4, 0x47, 0xef, 0x41, 0x29, 0xfa, 0x65, 0x37, 0x95, 0x55, 0x1e, 0xf4, 0x17, 0x78, 0x92, + 0x1a, 0x4d, 0x23, 0x7e, 0xed, 0x2f, 0x05, 0xd8, 0x4a, 0xd2, 0x1d, 0x6b, 0xcf, 0xb9, 0xf6, 0x4f, + 0x15, 0xd8, 0x61, 0xcf, 0x33, 0x08, 0xc2, 0x91, 0x9b, 0xd9, 0x4a, 0x8c, 0xf9, 0x8d, 0x7c, 0x35, + 0x3e, 0x8c, 0x6b, 0x61, 0xa0, 0x5d, 0x3a, 0xc9, 0xf2, 0xe4, 0x4f, 0x25, 0xf9, 0xda, 0x49, 0x3a, + 0x8b, 0xf9, 0xe9, 0xdc, 0x7d, 0x0e, 0x97, 0xbe, 0xc0, 0xb0, 0x3c, 0x2b, 0xad, 0x7d, 0xe1, 0xe8, + 0x25, 0xb4, 0xe4, 0x61, 0xe9, 0xcf, 0x05, 0x58, 0x9e, 0x7e, 0x78, 0x9a, 0x33, 0x7e, 0xb7, 0x61, + 0x9d, 0x55, 0x6e, 0x52, 0x62, 0x85, 0xa4, 0x8f, 0x75, 0x52, 0x1c, 0x23, 0x23, 0x89, 0x06, 0xb3, + 0x9f, 0xd3, 0x8a, 0xa9, 0xeb, 0x54, 0x4c, 0xfe, 0x9f, 0x7c, 0x4a, 0xfb, 0x12, 0x3f, 0xaa, 0xd4, + 0x6c, 0x58, 0x67, 0x5f, 0x70, 0xa2, 0xd6, 0xce, 0xaf, 0x29, 0x73, 0x86, 0xaf, 0x91, 0xfa, 0x04, + 0xc1, 0x67, 0xce, 0xf5, 0x30, 0xd0, 0x20, 0xf9, 0x04, 0x21, 0x7f, 0x78, 0xa8, 0x35, 0x60, 0x91, + 0xa9, 0xce, 0x89, 0xaf, 0x8f, 0x5e, 0xbe, 0xae, 0x2e, 0xbc, 0x7a, 0x5d, 0x5d, 0xf8, 0xec, 0x75, + 0x55, 0xf9, 0xe5, 0x69, 0x55, 0xf9, 0xc3, 0x69, 0x55, 0xf9, 0xeb, 0x69, 0x55, 0x79, 0x79, 0x5a, + 0x55, 0x5e, 0x9d, 0x56, 0x95, 0x7f, 0x9e, 0x56, 0x95, 0x7f, 0x9d, 0x56, 0x17, 0x3e, 0x3b, 0xad, + 0x2a, 0xbf, 0x7d, 0x53, 0x5d, 0x78, 0xf9, 0xa6, 0xba, 0xf0, 0xea, 0x4d, 0x75, 0xe1, 0xe3, 0xf3, + 0x8c, 0x94, 0x4d, 0xf1, 0xef, 0x90, 0x3b, 0xe2, 0xb7, 0xb3, 0xc4, 0x02, 0xf6, 0xc1, 0x7f, 0x02, + 0x00, 0x00, 0xff, 0xff, 0xf1, 0x3d, 0xe1, 0x4b, 0x28, 0x19, 0x00, 0x00, } func (this *OutportBlock) Equal(that interface{}) bool { @@ -1977,8 +1978,18 @@ func (this *OutportBlock) GoString() string { if this.AlteredAccounts != nil { s = append(s, "AlteredAccounts: "+mapStringForAlteredAccounts+",\n") } + keysForStateChanges := make([]string, 0, len(this.StateChanges)) + for k, _ := range this.StateChanges { + keysForStateChanges = append(keysForStateChanges, k) + } + github_com_gogo_protobuf_sortkeys.Strings(keysForStateChanges) + mapStringForStateChanges := "map[string]*stateChange.StateChange{" + for _, k := range keysForStateChanges { + mapStringForStateChanges += fmt.Sprintf("%#v: %#v,", k, this.StateChanges[k]) + } + mapStringForStateChanges += "}" if this.StateChanges != nil { - s = append(s, "StateChanges: "+fmt.Sprintf("%#v", this.StateChanges)+",\n") + s = append(s, "StateChanges: "+mapStringForStateChanges+",\n") } s = append(s, "NotarizedHeadersHashes: "+fmt.Sprintf("%#v", this.NotarizedHeadersHashes)+",\n") s = append(s, "NumberOfShards: "+fmt.Sprintf("%#v", this.NumberOfShards)+",\n") @@ -2374,15 +2385,32 @@ func (m *OutportBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { } } if len(m.StateChanges) > 0 { - for iNdEx := len(m.StateChanges) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.StateChanges[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + keysForStateChanges := make([]string, 0, len(m.StateChanges)) + for k := range m.StateChanges { + keysForStateChanges = append(keysForStateChanges, string(k)) + } + github_com_gogo_protobuf_sortkeys.Strings(keysForStateChanges) + for iNdEx := len(keysForStateChanges) - 1; iNdEx >= 0; iNdEx-- { + v := m.StateChanges[string(keysForStateChanges[iNdEx])] + baseI := i + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintOutportBlock(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintOutportBlock(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x12 } + i -= len(keysForStateChanges[iNdEx]) + copy(dAtA[i:], keysForStateChanges[iNdEx]) + i = encodeVarintOutportBlock(dAtA, i, uint64(len(keysForStateChanges[iNdEx]))) + i-- + dAtA[i] = 0xa + i = encodeVarintOutportBlock(dAtA, i, uint64(baseI-i)) i-- dAtA[i] = 0x32 } @@ -3155,20 +3183,20 @@ func (m *RoundInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x18 } if len(m.SignersIndexes) > 0 { - dAtA20 := make([]byte, len(m.SignersIndexes)*10) - var j19 int + dAtA21 := make([]byte, len(m.SignersIndexes)*10) + var j20 int for _, num := range m.SignersIndexes { for num >= 1<<7 { - dAtA20[j19] = uint8(uint64(num)&0x7f | 0x80) + dAtA21[j20] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j19++ + j20++ } - dAtA20[j19] = uint8(num) - j19++ + dAtA21[j20] = uint8(num) + j20++ } - i -= j19 - copy(dAtA[i:], dAtA20[:j19]) - i = encodeVarintOutportBlock(dAtA, i, uint64(j19)) + i -= j20 + copy(dAtA[i:], dAtA21[:j20]) + i = encodeVarintOutportBlock(dAtA, i, uint64(j20)) i-- dAtA[i] = 0x12 } @@ -3489,9 +3517,16 @@ func (m *OutportBlock) Size() (n int) { } } if len(m.StateChanges) > 0 { - for _, e := range m.StateChanges { - l = e.Size() - n += 1 + l + sovOutportBlock(uint64(l)) + for k, v := range m.StateChanges { + _ = k + _ = v + l = 0 + if v != nil { + l = v.Size() + l += 1 + sovOutportBlock(uint64(l)) + } + mapEntrySize := 1 + len(k) + sovOutportBlock(uint64(len(k))) + l + n += mapEntrySize + 1 + sovOutportBlock(uint64(mapEntrySize)) } } if len(m.NotarizedHeadersHashes) > 0 { @@ -3957,11 +3992,6 @@ func (this *OutportBlock) String() string { if this == nil { return "nil" } - repeatedStringForStateChanges := "[]*StateChangesForTx{" - for _, f := range this.StateChanges { - repeatedStringForStateChanges += strings.Replace(fmt.Sprintf("%v", f), "StateChangesForTx", "stateChange.StateChangesForTx", 1) + "," - } - repeatedStringForStateChanges += "}" keysForAlteredAccounts := make([]string, 0, len(this.AlteredAccounts)) for k, _ := range this.AlteredAccounts { keysForAlteredAccounts = append(keysForAlteredAccounts, k) @@ -3972,13 +4002,23 @@ func (this *OutportBlock) String() string { mapStringForAlteredAccounts += fmt.Sprintf("%v: %v,", k, this.AlteredAccounts[k]) } mapStringForAlteredAccounts += "}" + keysForStateChanges := make([]string, 0, len(this.StateChanges)) + for k, _ := range this.StateChanges { + keysForStateChanges = append(keysForStateChanges, k) + } + github_com_gogo_protobuf_sortkeys.Strings(keysForStateChanges) + mapStringForStateChanges := "map[string]*stateChange.StateChange{" + for _, k := range keysForStateChanges { + mapStringForStateChanges += fmt.Sprintf("%v: %v,", k, this.StateChanges[k]) + } + mapStringForStateChanges += "}" 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) + `,`, `AlteredAccounts:` + mapStringForAlteredAccounts + `,`, - `StateChanges:` + repeatedStringForStateChanges + `,`, + `StateChanges:` + mapStringForStateChanges + `,`, `NotarizedHeadersHashes:` + fmt.Sprintf("%v", this.NotarizedHeadersHashes) + `,`, `NumberOfShards:` + fmt.Sprintf("%v", this.NumberOfShards) + `,`, `SignersIndexes:` + fmt.Sprintf("%v", this.SignersIndexes) + `,`, @@ -4607,10 +4647,105 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.StateChanges = append(m.StateChanges, &stateChange.StateChangesForTx{}) - if err := m.StateChanges[len(m.StateChanges)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + if m.StateChanges == nil { + m.StateChanges = make(map[string]*stateChange.StateChange) + } + var mapkey string + var mapvalue *stateChange.StateChange + for iNdEx < postIndex { + entryPreIndex := 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) + if fieldNum == 1 { + var stringLenmapkey uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOutportBlock + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLenmapkey |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLenmapkey := int(stringLenmapkey) + if intStringLenmapkey < 0 { + return ErrInvalidLengthOutportBlock + } + postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthOutportBlock + } + if postStringIndexmapkey > l { + return io.ErrUnexpectedEOF + } + mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) + iNdEx = postStringIndexmapkey + } else if fieldNum == 2 { + var mapmsglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOutportBlock + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + mapmsglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if mapmsglen < 0 { + return ErrInvalidLengthOutportBlock + } + postmsgIndex := iNdEx + mapmsglen + if postmsgIndex < 0 { + return ErrInvalidLengthOutportBlock + } + if postmsgIndex > l { + return io.ErrUnexpectedEOF + } + mapvalue = &stateChange.StateChange{} + if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil { + return err + } + iNdEx = postmsgIndex + } else { + iNdEx = entryPreIndex + skippy, err := skipOutportBlock(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthOutportBlock + } + if (iNdEx + skippy) > postIndex { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } } + m.StateChanges[mapkey] = mapvalue iNdEx = postIndex case 7: if wireType != 2 { diff --git a/data/outport/outportBlock.proto b/data/outport/outportBlock.proto index 72c51f17..bfe095fe 100644 --- a/data/outport/outportBlock.proto +++ b/data/outport/outportBlock.proto @@ -16,17 +16,17 @@ import "github.com/multiversx/mx-chain-core-go/data/alteredAccount/alteredAccoun import "github.com/multiversx/mx-chain-core-go/data/stateChange/stateChange.proto"; message OutportBlock { - 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 StateChangesForTx StateChanges = 6 [(gogoproto.jsontag) = "stateChanges,omitempty"]; - repeated string NotarizedHeadersHashes = 7 [(gogoproto.jsontag) = "notarizedHeadersHashes,omitempty"]; - uint32 NumberOfShards = 8 [(gogoproto.jsontag) = "numberOfShards"]; - repeated uint64 SignersIndexes = 9 [(gogoproto.jsontag) = "signersIndexes,omitempty"]; - uint64 HighestFinalBlockNonce = 10 [(gogoproto.jsontag) = "highestFinalBlockNonce"]; - bytes HighestFinalBlockHash = 11 [(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"]; + map StateChanges = 6 [(gogoproto.jsontag) = "stateChanges,omitempty"]; + repeated string NotarizedHeadersHashes = 7 [(gogoproto.jsontag) = "notarizedHeadersHashes,omitempty"]; + uint32 NumberOfShards = 8 [(gogoproto.jsontag) = "numberOfShards"]; + repeated uint64 SignersIndexes = 9 [(gogoproto.jsontag) = "signersIndexes,omitempty"]; + uint64 HighestFinalBlockNonce = 10 [(gogoproto.jsontag) = "highestFinalBlockNonce"]; + bytes HighestFinalBlockHash = 11 [(gogoproto.jsontag) = "highestFinalBlockHash,omitempty"]; } message BlockData { diff --git a/data/stateChange/stateChange.pb.go b/data/stateChange/stateChange.pb.go index 06488320..1673f837 100644 --- a/data/stateChange/stateChange.pb.go +++ b/data/stateChange/stateChange.pb.go @@ -26,53 +26,6 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -type StateChangesForTx struct { - TxHash []byte `protobuf:"bytes,1,opt,name=TxHash,proto3" json:"txHash"` - StateChanges []*StateChange `protobuf:"bytes,2,rep,name=StateChanges,proto3" json:"stateChanges"` -} - -func (m *StateChangesForTx) Reset() { *m = StateChangesForTx{} } -func (*StateChangesForTx) ProtoMessage() {} -func (*StateChangesForTx) Descriptor() ([]byte, []int) { - return fileDescriptor_8e577663eebb0888, []int{0} -} -func (m *StateChangesForTx) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *StateChangesForTx) 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 *StateChangesForTx) XXX_Merge(src proto.Message) { - xxx_messageInfo_StateChangesForTx.Merge(m, src) -} -func (m *StateChangesForTx) XXX_Size() int { - return m.Size() -} -func (m *StateChangesForTx) XXX_DiscardUnknown() { - xxx_messageInfo_StateChangesForTx.DiscardUnknown(m) -} - -var xxx_messageInfo_StateChangesForTx proto.InternalMessageInfo - -func (m *StateChangesForTx) GetTxHash() []byte { - if m != nil { - return m.TxHash - } - return nil -} - -func (m *StateChangesForTx) GetStateChanges() []*StateChange { - if m != nil { - return m.StateChanges - } - return nil -} - type StateChange struct { Type string `protobuf:"bytes,1,opt,name=Type,proto3" json:"type"` Index int32 `protobuf:"varint,2,opt,name=Index,proto3" json:"-"` @@ -86,7 +39,7 @@ type StateChange struct { func (m *StateChange) Reset() { *m = StateChange{} } func (*StateChange) ProtoMessage() {} func (*StateChange) Descriptor() ([]byte, []int) { - return fileDescriptor_8e577663eebb0888, []int{1} + return fileDescriptor_8e577663eebb0888, []int{0} } func (m *StateChange) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -169,7 +122,7 @@ type DataTrieChange struct { func (m *DataTrieChange) Reset() { *m = DataTrieChange{} } func (*DataTrieChange) ProtoMessage() {} func (*DataTrieChange) Descriptor() ([]byte, []int) { - return fileDescriptor_8e577663eebb0888, []int{2} + return fileDescriptor_8e577663eebb0888, []int{1} } func (m *DataTrieChange) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -216,7 +169,6 @@ func (m *DataTrieChange) GetVal() []byte { } func init() { - proto.RegisterType((*StateChangesForTx)(nil), "proto.StateChangesForTx") proto.RegisterType((*StateChange)(nil), "proto.StateChange") proto.RegisterType((*DataTrieChange)(nil), "proto.DataTrieChange") } @@ -224,70 +176,35 @@ func init() { func init() { proto.RegisterFile("stateChange.proto", fileDescriptor_8e577663eebb0888) } var fileDescriptor_8e577663eebb0888 = []byte{ - // 452 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x4f, 0x8b, 0xd3, 0x40, - 0x18, 0xc6, 0x33, 0x6d, 0x53, 0xed, 0xb4, 0xfe, 0xd9, 0x01, 0x21, 0xae, 0xee, 0xa4, 0xf4, 0x62, - 0x41, 0xd3, 0x80, 0x1e, 0xbd, 0x65, 0x45, 0x56, 0x44, 0x84, 0x58, 0x7a, 0xf0, 0x20, 0x4c, 0xbb, - 0xb3, 0x69, 0x20, 0xc9, 0x84, 0x64, 0x2a, 0xc9, 0x41, 0xd0, 0x6f, 0xe0, 0xc7, 0xf0, 0x93, 0x88, - 0xc7, 0x1e, 0x7b, 0x0a, 0x76, 0x7a, 0x91, 0x9c, 0xf6, 0x23, 0x48, 0xa6, 0xad, 0x9d, 0x14, 0x61, - 0x4f, 0x99, 0x79, 0x7e, 0xef, 0xfb, 0xe6, 0x79, 0x1f, 0x06, 0x9e, 0xa4, 0x9c, 0x70, 0x7a, 0x3e, - 0x27, 0x91, 0x47, 0x47, 0x71, 0xc2, 0x38, 0x43, 0xba, 0xfc, 0x9c, 0x5a, 0x9e, 0xcf, 0xe7, 0x8b, - 0xe9, 0x68, 0xc6, 0x42, 0xdb, 0x63, 0x1e, 0xb3, 0xa5, 0x3c, 0x5d, 0x5c, 0xc9, 0x9b, 0xbc, 0xc8, - 0xd3, 0xb6, 0x6b, 0xf0, 0x0d, 0xc0, 0x93, 0x0f, 0x87, 0x59, 0xe9, 0x6b, 0x96, 0x8c, 0x33, 0x34, - 0x80, 0xed, 0x71, 0x76, 0x41, 0xd2, 0xb9, 0x01, 0xfa, 0x60, 0xd8, 0x73, 0x60, 0x59, 0x98, 0x6d, - 0x2e, 0x15, 0x77, 0x47, 0xd0, 0x05, 0xec, 0xa9, 0x8d, 0x46, 0xa3, 0xdf, 0x1c, 0x76, 0x9f, 0xa3, - 0xed, 0xdc, 0x91, 0x82, 0x9c, 0xfb, 0x65, 0x61, 0xf6, 0x14, 0xc3, 0xa9, 0x5b, 0xeb, 0x1c, 0xfc, - 0x6c, 0xc0, 0xae, 0x22, 0xa0, 0xc7, 0xb0, 0x35, 0xce, 0x63, 0x2a, 0xff, 0xdd, 0x71, 0x6e, 0x97, - 0x85, 0xd9, 0xe2, 0x79, 0x4c, 0x5d, 0xa9, 0xa2, 0x47, 0x50, 0x7f, 0x13, 0x5d, 0xd2, 0xcc, 0x68, - 0xf4, 0xc1, 0x50, 0x77, 0xf4, 0xb2, 0x30, 0x81, 0xe5, 0x6e, 0x35, 0x74, 0xf6, 0xcf, 0x78, 0x53, - 0x1a, 0xdf, 0xd1, 0xbd, 0xe7, 0x27, 0xb0, 0xfb, 0x8e, 0xf8, 0xd1, 0x38, 0xf1, 0xe9, 0x5b, 0x9a, - 0x1b, 0x2d, 0xb5, 0x46, 0x25, 0x6a, 0xe1, 0x84, 0x04, 0x86, 0xfe, 0xdf, 0xc2, 0x09, 0x09, 0xd0, - 0x53, 0xd8, 0x79, 0x1f, 0xd3, 0x84, 0x70, 0x9f, 0x45, 0x46, 0x5b, 0x1a, 0xbe, 0x53, 0x16, 0x66, - 0x87, 0xed, 0x45, 0xf7, 0xc0, 0xd1, 0x27, 0x78, 0xef, 0x15, 0xe1, 0xa4, 0xea, 0xdd, 0xa7, 0x76, - 0x4b, 0xa6, 0xf6, 0x60, 0x97, 0x5a, 0x9d, 0x3a, 0x67, 0x65, 0x61, 0x3e, 0xbc, 0xac, 0x77, 0x3c, - 0x63, 0xa1, 0xcf, 0x69, 0x18, 0xf3, 0xdc, 0x3d, 0x1e, 0x36, 0xb8, 0x82, 0x77, 0xeb, 0xd2, 0x0d, - 0x51, 0x9e, 0xc2, 0x66, 0x15, 0x43, 0x43, 0x6e, 0x77, 0x80, 0x95, 0x58, 0xb1, 0x6a, 0xf3, 0xe6, - 0x31, 0x9b, 0x90, 0xc0, 0xf9, 0xb2, 0x5c, 0x63, 0x6d, 0xb5, 0xc6, 0xda, 0xf5, 0x1a, 0x83, 0xaf, - 0x02, 0x83, 0x1f, 0x02, 0x83, 0x5f, 0x02, 0x83, 0xa5, 0xc0, 0x60, 0x25, 0x30, 0xf8, 0x2d, 0x30, - 0xf8, 0x23, 0xb0, 0x76, 0x2d, 0x30, 0xf8, 0xbe, 0xc1, 0xda, 0x72, 0x83, 0xb5, 0xd5, 0x06, 0x6b, - 0x1f, 0xcf, 0x95, 0xd7, 0x19, 0x2e, 0x02, 0xee, 0x7f, 0xa6, 0x49, 0x9a, 0xd9, 0x61, 0x66, 0xcd, - 0xe6, 0xc4, 0x8f, 0xac, 0x19, 0x4b, 0xa8, 0xe5, 0x31, 0xbb, 0x5a, 0xda, 0x56, 0x9e, 0xcc, 0x4b, - 0xe5, 0x3c, 0x6d, 0xcb, 0xb0, 0x5e, 0xfc, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xc0, 0x08, 0xa3, 0x8b, - 0x05, 0x03, 0x00, 0x00, + // 403 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xcd, 0xea, 0xd3, 0x40, + 0x14, 0xc5, 0x33, 0x4d, 0x53, 0xed, 0xd4, 0x0f, 0x0c, 0x08, 0xb1, 0xda, 0x49, 0xe8, 0xc6, 0x80, + 0xa6, 0x01, 0x5d, 0xba, 0x4b, 0x5d, 0x28, 0x22, 0x42, 0x2c, 0x5d, 0xb8, 0x10, 0xa6, 0xed, 0x34, + 0x09, 0x24, 0x99, 0x90, 0x4c, 0x25, 0x59, 0x08, 0x3e, 0x82, 0x8f, 0xe1, 0x93, 0x88, 0xcb, 0x2e, + 0xbb, 0x0a, 0x76, 0xba, 0x91, 0xac, 0xfa, 0x08, 0x92, 0x89, 0xa5, 0x69, 0x11, 0xfe, 0xab, 0xcc, + 0x3d, 0xbf, 0x7b, 0x2f, 0x39, 0x87, 0x0b, 0x1f, 0x64, 0x0c, 0x33, 0x32, 0xf5, 0x71, 0xec, 0x91, + 0x49, 0x92, 0x52, 0x46, 0x55, 0x45, 0x7c, 0x86, 0x96, 0x17, 0x30, 0x7f, 0xb3, 0x98, 0x2c, 0x69, + 0x64, 0x7b, 0xd4, 0xa3, 0xb6, 0x90, 0x17, 0x9b, 0xb5, 0xa8, 0x44, 0x21, 0x5e, 0xcd, 0xd4, 0xf8, + 0x67, 0x07, 0x0e, 0x3e, 0x9e, 0x77, 0xa9, 0x4f, 0x60, 0x77, 0x56, 0x24, 0x44, 0x03, 0x06, 0x30, + 0xfb, 0xce, 0xed, 0xaa, 0xd4, 0xbb, 0xac, 0x48, 0x88, 0x2b, 0x54, 0xf5, 0x31, 0x54, 0xde, 0xc6, + 0x2b, 0x92, 0x6b, 0x1d, 0x03, 0x98, 0x8a, 0xa3, 0x54, 0xa5, 0x0e, 0x2c, 0xb7, 0xd1, 0xd4, 0x11, + 0xec, 0xcd, 0xf2, 0x37, 0x38, 0xf3, 0x35, 0xd9, 0x00, 0xe6, 0x9d, 0x13, 0xfd, 0x27, 0xaa, 0x4f, + 0xe1, 0xe0, 0x3d, 0x0e, 0xe2, 0x59, 0x1a, 0x90, 0x77, 0xa4, 0xd0, 0xba, 0xed, 0x9e, 0x36, 0x69, + 0x37, 0xce, 0x71, 0xa8, 0x29, 0xff, 0x6d, 0x9c, 0xe3, 0x50, 0x7d, 0x06, 0xfb, 0x1f, 0x12, 0x92, + 0x62, 0x16, 0xd0, 0x58, 0xeb, 0x89, 0x1f, 0xbe, 0x5b, 0x95, 0x7a, 0x9f, 0x9e, 0x44, 0xf7, 0xcc, + 0xd5, 0xcf, 0xf0, 0xfe, 0x6b, 0xcc, 0x70, 0x3d, 0xdb, 0x58, 0xcd, 0xb4, 0x5b, 0x86, 0x6c, 0x0e, + 0x5e, 0x3c, 0x6c, 0x92, 0x98, 0x5c, 0x52, 0x67, 0x54, 0x95, 0xfa, 0xa3, 0xd5, 0xe5, 0xc4, 0x73, + 0x1a, 0x05, 0x8c, 0x44, 0x09, 0x2b, 0xdc, 0xeb, 0x65, 0xe3, 0x35, 0xbc, 0x77, 0x29, 0xdd, 0x10, + 0xe5, 0x10, 0xca, 0x75, 0x0c, 0x1d, 0xe1, 0xee, 0x0c, 0x6b, 0xb1, 0x66, 0xb5, 0x73, 0xf9, 0x9a, + 0xcd, 0x71, 0xe8, 0x7c, 0xdd, 0xee, 0x91, 0xb4, 0xdb, 0x23, 0xe9, 0xb8, 0x47, 0xe0, 0x1b, 0x47, + 0xe0, 0x07, 0x47, 0xe0, 0x17, 0x47, 0x60, 0xcb, 0x11, 0xd8, 0x71, 0x04, 0x7e, 0x73, 0x04, 0xfe, + 0x70, 0x24, 0x1d, 0x39, 0x02, 0xdf, 0x0f, 0x48, 0xda, 0x1e, 0x90, 0xb4, 0x3b, 0x20, 0xe9, 0xd3, + 0xb4, 0x75, 0x19, 0xd1, 0x26, 0x64, 0xc1, 0x17, 0x92, 0x66, 0xb9, 0x1d, 0xe5, 0xd6, 0xd2, 0xc7, + 0x41, 0x6c, 0x2d, 0x69, 0x4a, 0x2c, 0x8f, 0xda, 0xb5, 0x69, 0xbb, 0x75, 0x5f, 0xaf, 0x5a, 0xef, + 0x45, 0x4f, 0x84, 0xf5, 0xf2, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x69, 0xcc, 0x70, 0xa2, 0x81, + 0x02, 0x00, 0x00, } -func (this *StateChangesForTx) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*StateChangesForTx) - if !ok { - that2, ok := that.(StateChangesForTx) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if !bytes.Equal(this.TxHash, that1.TxHash) { - return false - } - if len(this.StateChanges) != len(that1.StateChanges) { - return false - } - for i := range this.StateChanges { - if !this.StateChanges[i].Equal(that1.StateChanges[i]) { - return false - } - } - return true -} func (this *StateChange) Equal(that interface{}) bool { if that == nil { return this == nil @@ -365,19 +282,6 @@ func (this *DataTrieChange) Equal(that interface{}) bool { } return true } -func (this *StateChangesForTx) GoString() string { - if this == nil { - return "nil" - } - s := make([]string, 0, 6) - s = append(s, "&stateChange.StateChangesForTx{") - s = append(s, "TxHash: "+fmt.Sprintf("%#v", this.TxHash)+",\n") - if this.StateChanges != nil { - s = append(s, "StateChanges: "+fmt.Sprintf("%#v", this.StateChanges)+",\n") - } - s = append(s, "}") - return strings.Join(s, "") -} func (this *StateChange) GoString() string { if this == nil { return "nil" @@ -416,50 +320,6 @@ func valueToGoStringStateChange(v interface{}, typ string) string { pv := reflect.Indirect(rv).Interface() return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) } -func (m *StateChangesForTx) 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 *StateChangesForTx) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *StateChangesForTx) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.StateChanges) > 0 { - for iNdEx := len(m.StateChanges) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.StateChanges[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintStateChange(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if len(m.TxHash) > 0 { - i -= len(m.TxHash) - copy(dAtA[i:], m.TxHash) - i = encodeVarintStateChange(dAtA, i, uint64(len(m.TxHash))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - func (m *StateChange) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -592,25 +452,6 @@ func encodeVarintStateChange(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } -func (m *StateChangesForTx) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.TxHash) - if l > 0 { - n += 1 + l + sovStateChange(uint64(l)) - } - if len(m.StateChanges) > 0 { - for _, e := range m.StateChanges { - l = e.Size() - n += 1 + l + sovStateChange(uint64(l)) - } - } - return n -} - func (m *StateChange) Size() (n int) { if m == nil { return 0 @@ -676,22 +517,6 @@ func sovStateChange(x uint64) (n int) { func sozStateChange(x uint64) (n int) { return sovStateChange(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } -func (this *StateChangesForTx) String() string { - if this == nil { - return "nil" - } - repeatedStringForStateChanges := "[]*StateChange{" - for _, f := range this.StateChanges { - repeatedStringForStateChanges += strings.Replace(f.String(), "StateChange", "StateChange", 1) + "," - } - repeatedStringForStateChanges += "}" - s := strings.Join([]string{`&StateChangesForTx{`, - `TxHash:` + fmt.Sprintf("%v", this.TxHash) + `,`, - `StateChanges:` + repeatedStringForStateChanges + `,`, - `}`, - }, "") - return s -} func (this *StateChange) String() string { if this == nil { return "nil" @@ -733,127 +558,6 @@ func valueToStringStateChange(v interface{}) string { pv := reflect.Indirect(rv).Interface() return fmt.Sprintf("*%v", pv) } -func (m *StateChangesForTx) 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 ErrIntOverflowStateChange - } - 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: StateChangesForTx: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: StateChangesForTx: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TxHash", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStateChange - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthStateChange - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthStateChange - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.TxHash = append(m.TxHash[:0], dAtA[iNdEx:postIndex]...) - if m.TxHash == nil { - m.TxHash = []byte{} - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field StateChanges", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStateChange - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthStateChange - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthStateChange - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.StateChanges = append(m.StateChanges, &StateChange{}) - if err := m.StateChanges[len(m.StateChanges)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipStateChange(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthStateChange - } - if (iNdEx + skippy) < 0 { - return ErrInvalidLengthStateChange - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *StateChange) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/data/stateChange/stateChange.proto b/data/stateChange/stateChange.proto index 4a928049..24040fbe 100644 --- a/data/stateChange/stateChange.proto +++ b/data/stateChange/stateChange.proto @@ -7,11 +7,6 @@ option (gogoproto.stable_marshaler_all) = true; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; -message StateChangesForTx { - bytes TxHash = 1 [(gogoproto.jsontag) = "txHash"]; - repeated StateChange StateChanges = 2 [(gogoproto.jsontag) = "stateChanges"]; -} - message StateChange { string Type = 1 [(gogoproto.jsontag) = "type"]; int32 Index = 2 [(gogoproto.jsontag) = "-"]; From 0afffde1cb6bba2a267fd9c8841f2ce84ea6f658 Mon Sep 17 00:00:00 2001 From: Alexander Cristurean Date: Fri, 6 Sep 2024 17:25:19 +0300 Subject: [PATCH 10/14] revert back to map with nested slice. --- data/outport/outportBlock.pb.go | 266 +++++++++++++------------- data/outport/outportBlock.proto | 2 +- data/stateChange/stateChange.pb.go | 294 ++++++++++++++++++++++++++--- data/stateChange/stateChange.proto | 4 + 4 files changed, 403 insertions(+), 163 deletions(-) diff --git a/data/outport/outportBlock.pb.go b/data/outport/outportBlock.pb.go index 0b54f071..4a021157 100644 --- a/data/outport/outportBlock.pb.go +++ b/data/outport/outportBlock.pb.go @@ -43,7 +43,7 @@ type OutportBlock struct { 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"` - StateChanges map[string]*stateChange.StateChange `protobuf:"bytes,6,rep,name=StateChanges,proto3" json:"stateChanges,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + StateChanges map[string]*stateChange.StateChanges `protobuf:"bytes,6,rep,name=StateChanges,proto3" json:"stateChanges,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` NotarizedHeadersHashes []string `protobuf:"bytes,7,rep,name=NotarizedHeadersHashes,proto3" json:"notarizedHeadersHashes,omitempty"` NumberOfShards uint32 `protobuf:"varint,8,opt,name=NumberOfShards,proto3" json:"numberOfShards"` SignersIndexes []uint64 `protobuf:"varint,9,rep,packed,name=SignersIndexes,proto3" json:"signersIndexes,omitempty"` @@ -114,7 +114,7 @@ func (m *OutportBlock) GetAlteredAccounts() map[string]*alteredAccount.AlteredAc return nil } -func (m *OutportBlock) GetStateChanges() map[string]*stateChange.StateChange { +func (m *OutportBlock) GetStateChanges() map[string]*stateChange.StateChanges { if m != nil { return m.StateChanges } @@ -1118,7 +1118,7 @@ func (m *Shard) GetShardID() uint32 { func init() { proto.RegisterType((*OutportBlock)(nil), "proto.OutportBlock") proto.RegisterMapType((map[string]*alteredAccount.AlteredAccount)(nil), "proto.OutportBlock.AlteredAccountsEntry") - proto.RegisterMapType((map[string]*stateChange.StateChange)(nil), "proto.OutportBlock.StateChangesEntry") + proto.RegisterMapType((map[string]*stateChange.StateChanges)(nil), "proto.OutportBlock.StateChangesEntry") proto.RegisterType((*BlockData)(nil), "proto.BlockData") proto.RegisterType((*TransactionPool)(nil), "proto.TransactionPool") proto.RegisterMapType((map[string]*TxInfo)(nil), "proto.TransactionPool.InvalidTxsEntry") @@ -1148,131 +1148,131 @@ func init() { func init() { proto.RegisterFile("outportBlock.proto", fileDescriptor_661b95cef868af95) } var fileDescriptor_661b95cef868af95 = []byte{ - // 1980 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcd, 0x93, 0xdb, 0x48, - 0x15, 0x1f, 0xd9, 0x9e, 0xf1, 0xf8, 0xcd, 0x77, 0xef, 0x64, 0x50, 0x26, 0xac, 0x35, 0x38, 0xc9, - 0xe2, 0x22, 0xc4, 0x66, 0xb3, 0x29, 0x2a, 0x95, 0xd4, 0x16, 0x44, 0x93, 0x2f, 0x93, 0x8f, 0x99, - 0x92, 0x07, 0x96, 0x6c, 0x51, 0x05, 0xb2, 0xd5, 0x23, 0xab, 0x62, 0xab, 0x8d, 0xd4, 0x1e, 0x6c, - 0x2e, 0x70, 0x62, 0x39, 0xb0, 0x55, 0x1c, 0xb9, 0x71, 0xa5, 0x38, 0x70, 0xe5, 0x3f, 0xa0, 0x38, - 0x51, 0x39, 0x51, 0x39, 0x09, 0x32, 0xb9, 0x50, 0x3a, 0x50, 0x7b, 0xdb, 0x2b, 0xa5, 0xee, 0x96, - 0xd5, 0x92, 0x35, 0x5b, 0x9e, 0xc0, 0x16, 0x97, 0xb1, 0xf4, 0x3e, 0x7e, 0xaf, 0xdf, 0x47, 0xbf, - 0x7e, 0xad, 0x01, 0x44, 0x46, 0x74, 0x48, 0x3c, 0xaa, 0xf7, 0x49, 0xf7, 0x45, 0x63, 0xe8, 0x11, - 0x4a, 0xd0, 0x22, 0xfb, 0xd9, 0xbd, 0x6e, 0x3b, 0xb4, 0x37, 0xea, 0x34, 0xba, 0x64, 0xd0, 0xb4, - 0x89, 0x4d, 0x9a, 0x8c, 0xdc, 0x19, 0x1d, 0xb3, 0x37, 0xf6, 0xc2, 0x9e, 0xb8, 0xd6, 0xee, 0x87, - 0x92, 0xf8, 0x60, 0xd4, 0xa7, 0xce, 0x09, 0xf6, 0xfc, 0x71, 0x73, 0x30, 0xbe, 0xde, 0xed, 0x99, - 0x8e, 0x7b, 0xbd, 0x4b, 0x3c, 0x7c, 0xdd, 0x26, 0x4d, 0xcb, 0xa4, 0x66, 0xb3, 0x13, 0x99, 0xe3, - 0x7f, 0x85, 0xfa, 0xdd, 0xf3, 0xa8, 0x53, 0xcf, 0x74, 0x7d, 0xb3, 0x4b, 0x1d, 0xe2, 0x36, 0xfb, - 0xc4, 0x16, 0x10, 0xad, 0xb7, 0x85, 0x90, 0x9e, 0x05, 0xd4, 0xf3, 0xf3, 0x40, 0xf9, 0x03, 0xd3, - 0xa3, 0xfb, 0xc4, 0xa5, 0x9e, 0xd9, 0xa5, 0x06, 0xf6, 0x47, 0x7d, 0x9a, 0x47, 0x7b, 0x1b, 0x47, - 0x3d, 0xdc, 0xc5, 0xce, 0x90, 0xc6, 0xbf, 0x02, 0x62, 0xff, 0x7c, 0x10, 0x3f, 0x33, 0x3d, 0xeb, - 0x68, 0x3c, 0x7d, 0x10, 0x20, 0x07, 0xe7, 0x01, 0x31, 0xfb, 0x14, 0x7b, 0xd8, 0xba, 0xdb, 0xed, - 0x92, 0x91, 0x4b, 0x33, 0xaf, 0x6f, 0x13, 0x7e, 0x9f, 0x9a, 0x14, 0xef, 0xf7, 0x4c, 0xd7, 0xc6, - 0xf2, 0x33, 0x87, 0xaa, 0x7d, 0xbe, 0x0c, 0xab, 0x07, 0x52, 0x61, 0xa2, 0x26, 0x94, 0xdb, 0x3d, - 0xd3, 0xb3, 0x5a, 0xf7, 0x54, 0x65, 0x4f, 0xa9, 0xaf, 0xe9, 0x17, 0xc2, 0x40, 0xdb, 0xf2, 0x39, - 0xe9, 0x9b, 0x64, 0xe0, 0x50, 0x3c, 0x18, 0xd2, 0x89, 0x11, 0x4b, 0xa1, 0x87, 0x50, 0x61, 0x9a, - 0xf7, 0x4c, 0x6a, 0xaa, 0x85, 0x3d, 0xa5, 0xbe, 0x72, 0x63, 0x93, 0x83, 0x37, 0xa6, 0x74, 0xfd, - 0x2b, 0x61, 0xa0, 0xbd, 0xd3, 0x89, 0x5f, 0x25, 0x98, 0x44, 0x17, 0xfd, 0x18, 0x36, 0x8e, 0x92, - 0xf2, 0x38, 0x24, 0xa4, 0xaf, 0x16, 0x19, 0xdc, 0x8e, 0x80, 0xcb, 0x70, 0xf5, 0x77, 0xc3, 0x40, - 0xbb, 0x48, 0xd3, 0x44, 0x09, 0x3a, 0x8b, 0x86, 0x7c, 0xd8, 0x7e, 0x84, 0x4d, 0x0b, 0x7b, 0x0f, - 0x4d, 0x7f, 0x9f, 0xb8, 0xfe, 0x68, 0x30, 0x8c, 0x78, 0x6a, 0x89, 0x59, 0xb9, 0x24, 0xac, 0xe4, - 0x89, 0xe8, 0xb5, 0x30, 0xd0, 0xaa, 0xbd, 0x1c, 0x8e, 0x64, 0x2f, 0x17, 0x1c, 0xfd, 0x14, 0x36, - 0xee, 0xa6, 0x72, 0xe8, 0xab, 0x8b, 0x7b, 0xc5, 0xfa, 0xca, 0x8d, 0xba, 0xb0, 0x27, 0x47, 0xbf, - 0x91, 0x11, 0xbd, 0xef, 0x52, 0x6f, 0xc2, 0xfd, 0x4c, 0x17, 0x82, 0x2f, 0xfb, 0x99, 0x51, 0x42, - 0x18, 0x56, 0xdb, 0x49, 0xa2, 0x7d, 0x75, 0x89, 0xd9, 0xbb, 0x9a, 0x67, 0x4f, 0x96, 0xe3, 0xc6, - 0x76, 0xc3, 0x40, 0xdb, 0x91, 0xea, 0x44, 0xb6, 0x94, 0x82, 0x45, 0x3f, 0x82, 0x9d, 0x67, 0x84, - 0x9a, 0x9e, 0xf3, 0x73, 0x6c, 0x71, 0xd7, 0xfd, 0x47, 0xa6, 0xdf, 0xc3, 0xbe, 0x5a, 0xde, 0x2b, - 0xd6, 0x2b, 0xfa, 0x95, 0x30, 0xd0, 0xf6, 0xdc, 0x5c, 0x09, 0x09, 0xf3, 0x0c, 0x0c, 0x74, 0x1b, - 0xd6, 0x9f, 0x8d, 0x06, 0x1d, 0xec, 0x1d, 0x1c, 0xb3, 0x4a, 0xf3, 0xd5, 0x65, 0x56, 0x8e, 0x28, - 0x0c, 0xb4, 0x75, 0x37, 0xc5, 0x31, 0x32, 0x92, 0xe8, 0x1e, 0xac, 0xb7, 0x1d, 0xdb, 0xc5, 0x9e, - 0xdf, 0x72, 0x2d, 0x3c, 0xc6, 0xbe, 0x5a, 0xd9, 0x2b, 0xd6, 0x4b, 0xfa, 0x57, 0xc3, 0x40, 0x53, - 0xfd, 0x14, 0x47, 0x5a, 0x49, 0x46, 0x07, 0x19, 0xb0, 0xf3, 0xc8, 0xb1, 0x7b, 0xd8, 0xa7, 0x0f, - 0x1c, 0xd7, 0xec, 0xb3, 0x80, 0x3d, 0x23, 0x6e, 0x17, 0xab, 0xb0, 0xa7, 0xd4, 0x4b, 0x3c, 0x52, - 0xbd, 0x5c, 0x09, 0xe3, 0x0c, 0x4d, 0xf4, 0x1c, 0x2e, 0xcc, 0x70, 0x22, 0x87, 0xd5, 0x95, 0x3d, - 0xa5, 0xbe, 0xaa, 0x5f, 0x0e, 0x03, 0x4d, 0xeb, 0xe5, 0x09, 0x48, 0xeb, 0xcc, 0x47, 0xd8, 0x7d, - 0x0e, 0xdb, 0x79, 0xd5, 0x83, 0x36, 0xa1, 0xf8, 0x02, 0x4f, 0xd8, 0x66, 0xae, 0x18, 0xd1, 0x23, - 0xba, 0x06, 0x8b, 0x27, 0x66, 0x7f, 0x84, 0xc5, 0x6e, 0xbd, 0x20, 0x0a, 0x23, 0xad, 0x6d, 0x70, - 0x99, 0xdb, 0x85, 0x5b, 0xca, 0x6e, 0x1b, 0xb6, 0x66, 0x0a, 0x25, 0x07, 0xb7, 0x9e, 0xc6, 0x45, - 0x02, 0x57, 0x52, 0x95, 0x40, 0x6b, 0xbf, 0x29, 0x4a, 0x8d, 0xe3, 0xfc, 0x6d, 0xe7, 0x0e, 0xac, - 0xf0, 0x82, 0xd1, 0x27, 0x14, 0xfb, 0xcc, 0xe4, 0xaa, 0x7e, 0x31, 0x0c, 0xb4, 0x0b, 0xbd, 0x84, - 0x2c, 0x29, 0xca, 0xd2, 0xe8, 0x16, 0x00, 0x7f, 0x3d, 0x9a, 0x0c, 0x31, 0xeb, 0x32, 0x15, 0x5d, - 0x0d, 0x03, 0x6d, 0xbb, 0x37, 0xa5, 0x4a, 0xaa, 0x92, 0x6c, 0xa2, 0xc9, 0xb2, 0x56, 0x62, 0x56, - 0x25, 0xcd, 0x4c, 0xaa, 0x24, 0x59, 0xf4, 0x01, 0x94, 0x74, 0x62, 0x4d, 0xd4, 0x45, 0x16, 0x9c, - 0x95, 0xb8, 0x45, 0x12, 0x6b, 0xc2, 0x6b, 0xba, 0x43, 0xac, 0x89, 0xa4, 0xca, 0x84, 0x51, 0x0f, - 0xb6, 0x5b, 0xd1, 0xc9, 0xc6, 0xbc, 0x7e, 0xea, 0xb8, 0x0e, 0x8b, 0x58, 0xbc, 0xa5, 0xe3, 0x3e, - 0x3b, 0x65, 0xf0, 0x3e, 0xe5, 0xe4, 0x68, 0xc8, 0x7d, 0x2a, 0x0f, 0xb1, 0xf6, 0x09, 0xcc, 0xb4, - 0x5f, 0xd4, 0x83, 0x55, 0x89, 0xe4, 0xab, 0x4a, 0xaa, 0x71, 0x65, 0xa4, 0xe5, 0x77, 0xb9, 0x97, - 0x48, 0x0d, 0x3a, 0xd5, 0x4b, 0x64, 0x71, 0xf4, 0x6b, 0x05, 0xb6, 0xdb, 0xb3, 0x07, 0x79, 0x94, - 0xd7, 0xc8, 0xe4, 0xb7, 0xce, 0x30, 0x99, 0xa7, 0xc2, 0x4d, 0xb3, 0x40, 0xe4, 0x8c, 0x06, 0xa9, - 0x40, 0xe4, 0xa9, 0xa3, 0x23, 0x28, 0x1b, 0xec, 0xfc, 0xf6, 0xd5, 0x22, 0x33, 0x7e, 0xf9, 0x0c, - 0xe3, 0x42, 0x8a, 0xdb, 0x63, 0xe5, 0xca, 0xcf, 0x7d, 0xd9, 0x44, 0x0c, 0x85, 0x7e, 0x08, 0xcb, - 0x06, 0x9f, 0x2c, 0x7c, 0xb5, 0xc4, 0x60, 0xaf, 0x9c, 0x09, 0xcb, 0xc5, 0x38, 0xee, 0x4e, 0x18, - 0x68, 0x48, 0xcc, 0x24, 0x32, 0xf0, 0x14, 0x0d, 0xfd, 0x04, 0xa0, 0xe5, 0x9e, 0x98, 0x7d, 0xc7, - 0x3a, 0x1a, 0xc7, 0x67, 0xcb, 0x7b, 0x67, 0x60, 0x27, 0x82, 0x1c, 0x9d, 0x55, 0xae, 0x33, 0x25, - 0xca, 0x95, 0x9b, 0x88, 0xa2, 0x6f, 0x43, 0xe9, 0x09, 0xb1, 0xe3, 0xa2, 0x5b, 0x17, 0xd8, 0x4f, - 0x88, 0xcd, 0x8e, 0x76, 0x56, 0xbc, 0x7d, 0x62, 0xcb, 0xda, 0x4c, 0x1e, 0xfd, 0x4a, 0x81, 0x2b, - 0xed, 0x6e, 0x0f, 0x5b, 0xa3, 0x3e, 0xb6, 0xee, 0x8f, 0x71, 0x77, 0x44, 0xb1, 0xd5, 0xde, 0x37, - 0xda, 0xbc, 0xc5, 0x1f, 0x7a, 0xf8, 0x84, 0x15, 0x9f, 0x38, 0x2f, 0x6e, 0x84, 0x81, 0xd6, 0xf0, - 0xe7, 0x90, 0x97, 0x0c, 0xcd, 0x85, 0x8f, 0x7e, 0xa7, 0xc0, 0x37, 0x66, 0x04, 0x13, 0x07, 0xb3, - 0xcb, 0x59, 0x66, 0xcb, 0xb9, 0x15, 0x06, 0xda, 0x4d, 0x7f, 0x6e, 0x2d, 0x69, 0x51, 0xe7, 0xb0, - 0xb5, 0xfb, 0x0c, 0xb6, 0x66, 0xf6, 0x4d, 0x4e, 0x6b, 0xbd, 0x9c, 0x6e, 0xad, 0x6b, 0x71, 0x7e, - 0xc7, 0x2d, 0xf7, 0x98, 0xc8, 0xad, 0xfa, 0x23, 0xb8, 0x78, 0xe6, 0xa6, 0xc8, 0xc1, 0xbd, 0x92, - 0xc6, 0x8d, 0x73, 0xdb, 0xde, 0x37, 0xb2, 0xc0, 0x4f, 0x61, 0x55, 0x2e, 0xf8, 0x1c, 0xac, 0xaf, - 0xa7, 0xb1, 0xb6, 0x04, 0x16, 0xd7, 0xca, 0xc2, 0x3d, 0x86, 0xb5, 0x54, 0xa1, 0xcf, 0xbf, 0x36, - 0xa1, 0x26, 0x83, 0x3d, 0x81, 0x8d, 0x4c, 0x65, 0xff, 0x17, 0x21, 0xac, 0xfd, 0xa9, 0x00, 0xe5, - 0x07, 0x18, 0x47, 0x64, 0x74, 0x15, 0xca, 0x0f, 0x4d, 0xff, 0xfb, 0x3e, 0xb6, 0x18, 0x54, 0x49, - 0x5f, 0x09, 0x03, 0xad, 0x6c, 0x73, 0x92, 0x11, 0xf3, 0x50, 0x1f, 0x8a, 0x0f, 0x30, 0x16, 0x87, - 0xd0, 0xc7, 0x61, 0xa0, 0xad, 0x1d, 0x63, 0xe9, 0x04, 0xf9, 0xe3, 0x3f, 0xb4, 0xfb, 0x03, 0x93, - 0xf6, 0x9a, 0x1d, 0xc7, 0x6e, 0xb4, 0x5c, 0x7a, 0xe7, 0x1c, 0xf3, 0x7b, 0x43, 0x77, 0xec, 0x96, - 0x4b, 0xf7, 0x4d, 0x9f, 0x62, 0xcf, 0x88, 0xcc, 0xa0, 0x4f, 0x15, 0x58, 0x6f, 0xb9, 0x0e, 0x75, - 0xcc, 0xfe, 0xa1, 0xe9, 0x58, 0x91, 0xe5, 0x22, 0xb3, 0x8c, 0xa3, 0xf9, 0xc6, 0x49, 0x71, 0xbe, - 0x8c, 0x45, 0x64, 0x8c, 0xd7, 0xfe, 0xae, 0xc0, 0x12, 0x0f, 0x23, 0x3a, 0x80, 0x15, 0xa9, 0x9c, - 0x59, 0xcc, 0x92, 0x41, 0x40, 0xe2, 0xf0, 0x93, 0x5a, 0x3a, 0x1a, 0xe4, 0x93, 0x5a, 0x92, 0x43, - 0xdf, 0x99, 0xe6, 0x22, 0x53, 0x06, 0x82, 0xca, 0x1b, 0xef, 0x31, 0x7f, 0x91, 0x1b, 0x6f, 0x9c, - 0xc1, 0xdb, 0xb0, 0xce, 0x77, 0xa1, 0x43, 0xdc, 0x03, 0xcf, 0xc2, 0x1e, 0x8b, 0x95, 0x98, 0x23, - 0x71, 0x8a, 0x63, 0x64, 0x24, 0x6b, 0x9f, 0x2b, 0x50, 0x16, 0x5b, 0x01, 0x11, 0x78, 0x27, 0x67, - 0x63, 0x09, 0x0f, 0x77, 0xe3, 0x7d, 0x33, 0x2b, 0xa1, 0x7f, 0x2d, 0x0c, 0xb4, 0x77, 0x73, 0x4e, - 0x22, 0x69, 0xb1, 0x79, 0xc8, 0xff, 0x5f, 0xcf, 0x8f, 0xa0, 0x2c, 0xfa, 0x3b, 0xaa, 0x45, 0xc9, - 0x65, 0xd3, 0x0e, 0xdb, 0x4c, 0x3a, 0x84, 0x81, 0xb6, 0x44, 0x19, 0xc5, 0x10, 0x1c, 0x74, 0x15, - 0x8a, 0x4f, 0x88, 0x2d, 0xd6, 0x09, 0xc9, 0x01, 0xa1, 0x97, 0xc3, 0x40, 0x2b, 0xf6, 0x89, 0x6d, - 0x44, 0xfc, 0xda, 0x27, 0x0a, 0x40, 0xd2, 0x0e, 0xd0, 0x87, 0xb0, 0xc4, 0xdf, 0x44, 0x14, 0x37, - 0x52, 0x1d, 0xe3, 0x68, 0xac, 0x6f, 0x87, 0x81, 0xb6, 0xc9, 0x0f, 0x55, 0xc9, 0x41, 0xa1, 0x94, - 0xe3, 0x5f, 0x61, 0x6e, 0xff, 0xfe, 0xad, 0xe4, 0xdf, 0x05, 0xd1, 0xfb, 0xb0, 0xf2, 0xd0, 0xf4, - 0x0f, 0x3d, 0x72, 0xe2, 0x58, 0xd3, 0x4d, 0xbf, 0x11, 0x06, 0xda, 0x8a, 0x9d, 0x90, 0x0d, 0x59, - 0x46, 0xa8, 0x18, 0xf8, 0x78, 0xe4, 0x46, 0x2a, 0x85, 0x94, 0x4a, 0x4c, 0x36, 0x64, 0x19, 0x74, - 0x13, 0x56, 0x23, 0x04, 0xec, 0x9a, 0xfd, 0xe8, 0xe6, 0xc3, 0x12, 0x53, 0xd2, 0x37, 0xc3, 0x40, - 0x5b, 0xb5, 0x25, 0xba, 0x91, 0x92, 0x8a, 0x1c, 0x7e, 0x6a, 0x8e, 0x19, 0xc9, 0xe3, 0x27, 0x55, - 0x89, 0xe9, 0x31, 0x87, 0x07, 0x29, 0x8e, 0x91, 0x91, 0xac, 0x1d, 0xc3, 0x3b, 0x3f, 0x88, 0x1a, - 0xa4, 0x49, 0x89, 0x67, 0x98, 0xd4, 0x71, 0x6d, 0x96, 0x82, 0x6b, 0x50, 0x39, 0x1c, 0x75, 0xfa, - 0x4e, 0xf7, 0x71, 0xdc, 0x2c, 0xf5, 0xb5, 0x30, 0xd0, 0x2a, 0xc3, 0x98, 0x68, 0x24, 0xfc, 0xa8, - 0x12, 0xb8, 0x2a, 0xf3, 0xb1, 0xc0, 0x2b, 0xc1, 0x63, 0x14, 0x43, 0x70, 0x6a, 0x7f, 0x53, 0x60, - 0x73, 0x6a, 0xc8, 0xe7, 0xc4, 0xa8, 0x8b, 0xa6, 0x87, 0x7b, 0xd6, 0x45, 0xc5, 0x70, 0x9f, 0x8c, - 0xf4, 0x1a, 0x2c, 0xde, 0x1f, 0x92, 0x6e, 0x4f, 0xe4, 0xb1, 0x12, 0x06, 0xda, 0x22, 0x8e, 0x08, - 0x06, 0xa7, 0x23, 0x0f, 0xb6, 0xb3, 0xd8, 0x6c, 0x7f, 0xf0, 0x39, 0x2d, 0xde, 0x84, 0x39, 0x7e, - 0xf2, 0x71, 0xf0, 0x24, 0x47, 0x57, 0x1e, 0x07, 0xf3, 0xb0, 0x6b, 0xbf, 0x2f, 0x40, 0xc5, 0x20, - 0x23, 0x97, 0x97, 0xac, 0x06, 0x8b, 0xec, 0x45, 0x14, 0x06, 0x5b, 0xa2, 0x17, 0x11, 0x0c, 0x4e, - 0x8f, 0x72, 0x94, 0xb9, 0x7a, 0x16, 0xd8, 0xd5, 0x93, 0xe5, 0x28, 0x7d, 0xf5, 0x9c, 0xb9, 0x70, - 0x7e, 0x17, 0x36, 0x59, 0xb2, 0x3e, 0x62, 0xc5, 0x35, 0x24, 0xbe, 0xa8, 0x8c, 0x65, 0xbe, 0x11, - 0x3a, 0x19, 0x9e, 0x31, 0x23, 0x9d, 0x04, 0xda, 0x62, 0xa5, 0x91, 0x0a, 0xb4, 0x15, 0x07, 0xda, - 0x4a, 0x02, 0xbd, 0x78, 0x46, 0xa0, 0xaf, 0x41, 0xe5, 0xc8, 0x19, 0x60, 0x9f, 0x9a, 0x83, 0xa1, - 0xba, 0xc4, 0x5c, 0x65, 0x65, 0x41, 0x63, 0xa2, 0x91, 0xf0, 0x6b, 0xbf, 0x00, 0x60, 0xbe, 0xfb, - 0xf1, 0x89, 0x39, 0x4f, 0xae, 0xbf, 0x27, 0x2b, 0x89, 0x29, 0x3f, 0xbe, 0xce, 0x4c, 0xc3, 0xcd, - 0xe7, 0x53, 0x6f, 0x2a, 0x27, 0xcf, 0xa7, 0x89, 0x76, 0xed, 0x7d, 0x28, 0x1f, 0x8e, 0x3a, 0x8f, - 0xf1, 0xc4, 0x47, 0xef, 0x41, 0x29, 0xfa, 0x65, 0x37, 0x95, 0x55, 0x1e, 0xf4, 0x17, 0x78, 0x92, - 0x1a, 0x4d, 0x23, 0x7e, 0xed, 0x2f, 0x05, 0xd8, 0x4a, 0xd2, 0x1d, 0x6b, 0xcf, 0xb9, 0xf6, 0x4f, - 0x15, 0xd8, 0x61, 0xcf, 0x33, 0x08, 0xc2, 0x91, 0x9b, 0xd9, 0x4a, 0x8c, 0xf9, 0x8d, 0x7c, 0x35, - 0x3e, 0x8c, 0x6b, 0x61, 0xa0, 0x5d, 0x3a, 0xc9, 0xf2, 0xe4, 0x4f, 0x25, 0xf9, 0xda, 0x49, 0x3a, - 0x8b, 0xf9, 0xe9, 0xdc, 0x7d, 0x0e, 0x97, 0xbe, 0xc0, 0xb0, 0x3c, 0x2b, 0xad, 0x7d, 0xe1, 0xe8, - 0x25, 0xb4, 0xe4, 0x61, 0xe9, 0xcf, 0x05, 0x58, 0x9e, 0x7e, 0x78, 0x9a, 0x33, 0x7e, 0xb7, 0x61, - 0x9d, 0x55, 0x6e, 0x52, 0x62, 0x85, 0xa4, 0x8f, 0x75, 0x52, 0x1c, 0x23, 0x23, 0x89, 0x06, 0xb3, - 0x9f, 0xd3, 0x8a, 0xa9, 0xeb, 0x54, 0x4c, 0xfe, 0x9f, 0x7c, 0x4a, 0xfb, 0x12, 0x3f, 0xaa, 0xd4, - 0x6c, 0x58, 0x67, 0x5f, 0x70, 0xa2, 0xd6, 0xce, 0xaf, 0x29, 0x73, 0x86, 0xaf, 0x91, 0xfa, 0x04, - 0xc1, 0x67, 0xce, 0xf5, 0x30, 0xd0, 0x20, 0xf9, 0x04, 0x21, 0x7f, 0x78, 0xa8, 0x35, 0x60, 0x91, - 0xa9, 0xce, 0x89, 0xaf, 0x8f, 0x5e, 0xbe, 0xae, 0x2e, 0xbc, 0x7a, 0x5d, 0x5d, 0xf8, 0xec, 0x75, - 0x55, 0xf9, 0xe5, 0x69, 0x55, 0xf9, 0xc3, 0x69, 0x55, 0xf9, 0xeb, 0x69, 0x55, 0x79, 0x79, 0x5a, - 0x55, 0x5e, 0x9d, 0x56, 0x95, 0x7f, 0x9e, 0x56, 0x95, 0x7f, 0x9d, 0x56, 0x17, 0x3e, 0x3b, 0xad, - 0x2a, 0xbf, 0x7d, 0x53, 0x5d, 0x78, 0xf9, 0xa6, 0xba, 0xf0, 0xea, 0x4d, 0x75, 0xe1, 0xe3, 0xf3, - 0x8c, 0x94, 0x4d, 0xf1, 0xef, 0x90, 0x3b, 0xe2, 0xb7, 0xb3, 0xc4, 0x02, 0xf6, 0xc1, 0x7f, 0x02, - 0x00, 0x00, 0xff, 0xff, 0xf1, 0x3d, 0xe1, 0x4b, 0x28, 0x19, 0x00, 0x00, + // 1984 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcd, 0x73, 0x1b, 0x49, + 0x15, 0xf7, 0x48, 0xb2, 0x65, 0x3d, 0xd9, 0x8e, 0xdd, 0x71, 0xcc, 0xc4, 0x61, 0x35, 0x46, 0x49, + 0x16, 0x43, 0x88, 0xc4, 0x66, 0x53, 0x54, 0x2a, 0xa9, 0x2d, 0xc8, 0x38, 0x5f, 0x22, 0x1f, 0x76, + 0x8d, 0x05, 0x4b, 0xb6, 0xa8, 0x82, 0x91, 0xa6, 0x3d, 0x9a, 0x8a, 0x34, 0x2d, 0x66, 0x5a, 0x46, + 0xe2, 0x02, 0x27, 0x96, 0x03, 0x5b, 0xc5, 0x91, 0x1b, 0x57, 0x8a, 0x03, 0x57, 0xfe, 0x03, 0x8a, + 0x13, 0x95, 0x13, 0x95, 0xd3, 0x40, 0x9c, 0x0b, 0x35, 0x07, 0x6a, 0x6f, 0x70, 0xa4, 0xa6, 0xbb, + 0x47, 0xd3, 0x33, 0x1a, 0x6f, 0xc9, 0x81, 0xad, 0xbd, 0x58, 0x33, 0xef, 0xe3, 0xf7, 0xfa, 0x7d, + 0xf4, 0xeb, 0xd7, 0x63, 0x40, 0x64, 0x44, 0x87, 0xc4, 0xa3, 0x7a, 0x9f, 0x74, 0x5f, 0x34, 0x86, + 0x1e, 0xa1, 0x04, 0x2d, 0xb2, 0x9f, 0xed, 0xeb, 0xb6, 0x43, 0x7b, 0xa3, 0x4e, 0xa3, 0x4b, 0x06, + 0x4d, 0x9b, 0xd8, 0xa4, 0xc9, 0xc8, 0x9d, 0xd1, 0x11, 0x7b, 0x63, 0x2f, 0xec, 0x89, 0x6b, 0x6d, + 0x7f, 0x20, 0x89, 0x0f, 0x46, 0x7d, 0xea, 0x1c, 0x63, 0xcf, 0x1f, 0x37, 0x07, 0xe3, 0xeb, 0xdd, + 0x9e, 0xe9, 0xb8, 0xd7, 0xbb, 0xc4, 0xc3, 0xd7, 0x6d, 0xd2, 0xb4, 0x4c, 0x6a, 0x36, 0x3b, 0x91, + 0x39, 0xfe, 0x57, 0xa8, 0xdf, 0x3d, 0x8b, 0x3a, 0xf5, 0x4c, 0xd7, 0x37, 0xbb, 0xd4, 0x21, 0x6e, + 0xb3, 0x4f, 0x6c, 0x01, 0xd1, 0x7a, 0x5b, 0x08, 0xe9, 0x59, 0x40, 0x3d, 0x3f, 0x0b, 0x94, 0x3f, + 0x30, 0x3d, 0xba, 0x47, 0x5c, 0xea, 0x99, 0x5d, 0x6a, 0x60, 0x7f, 0xd4, 0xa7, 0x79, 0xb4, 0xb7, + 0x71, 0xd4, 0xc3, 0x5d, 0xec, 0x0c, 0x69, 0xfc, 0x2b, 0x20, 0xf6, 0xce, 0x06, 0xf1, 0x53, 0xd3, + 0xb3, 0xda, 0xe3, 0xe9, 0x83, 0x00, 0xd9, 0x3f, 0x0b, 0x88, 0xd9, 0xa7, 0xd8, 0xc3, 0xd6, 0xdd, + 0x6e, 0x97, 0x8c, 0x5c, 0x9a, 0x79, 0x7d, 0x9b, 0xf0, 0xfb, 0xd4, 0xa4, 0x78, 0xaf, 0x67, 0xba, + 0x36, 0x96, 0x9f, 0x39, 0x54, 0xfd, 0x3f, 0xcb, 0xb0, 0xb2, 0x2f, 0x15, 0x26, 0x6a, 0x42, 0xf9, + 0xb0, 0x67, 0x7a, 0x56, 0xeb, 0x9e, 0xaa, 0xec, 0x28, 0xbb, 0xab, 0xfa, 0x85, 0x30, 0xd0, 0x36, + 0x7c, 0x4e, 0xfa, 0x06, 0x19, 0x38, 0x14, 0x0f, 0x86, 0x74, 0x62, 0xc4, 0x52, 0xe8, 0x21, 0x54, + 0x98, 0xe6, 0x3d, 0x93, 0x9a, 0x6a, 0x61, 0x47, 0xd9, 0xad, 0xde, 0x58, 0xe7, 0xe0, 0x8d, 0x29, + 0x5d, 0xff, 0x52, 0x18, 0x68, 0xe7, 0x3b, 0xf1, 0xab, 0x04, 0x93, 0xe8, 0xa2, 0x1f, 0xc1, 0xb9, + 0x76, 0x52, 0x1e, 0x07, 0x84, 0xf4, 0xd5, 0x22, 0x83, 0xdb, 0x12, 0x70, 0x19, 0xae, 0xfe, 0x4e, + 0x18, 0x68, 0x17, 0x69, 0x9a, 0x28, 0x41, 0x67, 0xd1, 0x90, 0x0f, 0x9b, 0x8f, 0xb0, 0x69, 0x61, + 0xef, 0xa1, 0xe9, 0xef, 0x11, 0xd7, 0x1f, 0x0d, 0x86, 0x11, 0x4f, 0x2d, 0x31, 0x2b, 0x97, 0x84, + 0x95, 0x3c, 0x11, 0xbd, 0x1e, 0x06, 0x5a, 0xad, 0x97, 0xc3, 0x91, 0xec, 0xe5, 0x82, 0xa3, 0x9f, + 0xc0, 0xb9, 0xbb, 0xa9, 0x1c, 0xfa, 0xea, 0xe2, 0x4e, 0x71, 0xb7, 0x7a, 0x63, 0x57, 0xd8, 0x93, + 0xa3, 0xdf, 0xc8, 0x88, 0xde, 0x77, 0xa9, 0x37, 0xe1, 0x7e, 0xa6, 0x0b, 0xc1, 0x97, 0xfd, 0xcc, + 0x28, 0x21, 0x0c, 0x2b, 0x87, 0x49, 0xa2, 0x7d, 0x75, 0x89, 0xd9, 0xbb, 0x9a, 0x67, 0x4f, 0x96, + 0xe3, 0xc6, 0xb6, 0xc3, 0x40, 0xdb, 0x92, 0xea, 0x44, 0xb6, 0x94, 0x82, 0x45, 0x3f, 0x84, 0xad, + 0x67, 0x84, 0x9a, 0x9e, 0xf3, 0x33, 0x6c, 0x71, 0xd7, 0xfd, 0x47, 0xa6, 0xdf, 0xc3, 0xbe, 0x5a, + 0xde, 0x29, 0xee, 0x56, 0xf4, 0x2b, 0x61, 0xa0, 0xed, 0xb8, 0xb9, 0x12, 0x12, 0xe6, 0x29, 0x18, + 0xe8, 0x36, 0xac, 0x3d, 0x1b, 0x0d, 0x3a, 0xd8, 0xdb, 0x3f, 0x62, 0x95, 0xe6, 0xab, 0xcb, 0xac, + 0x1c, 0x51, 0x18, 0x68, 0x6b, 0x6e, 0x8a, 0x63, 0x64, 0x24, 0xd1, 0x3d, 0x58, 0x3b, 0x74, 0x6c, + 0x17, 0x7b, 0x7e, 0xcb, 0xb5, 0xf0, 0x18, 0xfb, 0x6a, 0x65, 0xa7, 0xb8, 0x5b, 0xd2, 0xbf, 0x1c, + 0x06, 0x9a, 0xea, 0xa7, 0x38, 0xd2, 0x4a, 0x32, 0x3a, 0xc8, 0x80, 0xad, 0x47, 0x8e, 0xdd, 0xc3, + 0x3e, 0x7d, 0xe0, 0xb8, 0x66, 0x9f, 0x05, 0xec, 0x19, 0x71, 0xbb, 0x58, 0x85, 0x1d, 0x65, 0xb7, + 0xc4, 0x23, 0xd5, 0xcb, 0x95, 0x30, 0x4e, 0xd1, 0x44, 0xcf, 0xe1, 0xc2, 0x0c, 0x27, 0x72, 0x58, + 0xad, 0xee, 0x28, 0xbb, 0x2b, 0xfa, 0xe5, 0x30, 0xd0, 0xb4, 0x5e, 0x9e, 0x80, 0xb4, 0xce, 0x7c, + 0x84, 0xed, 0xe7, 0xb0, 0x99, 0x57, 0x3d, 0x68, 0x1d, 0x8a, 0x2f, 0xf0, 0x84, 0x6d, 0xe6, 0x8a, + 0x11, 0x3d, 0xa2, 0x6b, 0xb0, 0x78, 0x6c, 0xf6, 0x47, 0x58, 0xec, 0xd6, 0x0b, 0xa2, 0x30, 0xd2, + 0xda, 0x06, 0x97, 0xb9, 0x5d, 0xb8, 0xa5, 0x6c, 0xb7, 0x61, 0x63, 0xa6, 0x50, 0x72, 0x70, 0xbf, + 0x96, 0xc6, 0x3d, 0x2f, 0x70, 0x65, 0x55, 0x09, 0xb5, 0xfe, 0xeb, 0xa2, 0xd4, 0x39, 0xce, 0xde, + 0x77, 0xee, 0x40, 0x95, 0x57, 0x8c, 0x3e, 0xa1, 0xd8, 0x67, 0x36, 0x57, 0xf4, 0x8b, 0x61, 0xa0, + 0x5d, 0xe8, 0x25, 0x64, 0x49, 0x51, 0x96, 0x46, 0xb7, 0x00, 0xf8, 0x6b, 0x7b, 0x32, 0xc4, 0xac, + 0xcd, 0x54, 0x74, 0x35, 0x0c, 0xb4, 0xcd, 0xde, 0x94, 0x2a, 0xa9, 0x4a, 0xb2, 0x89, 0x26, 0x4b, + 0x5b, 0x89, 0x59, 0x95, 0x34, 0x33, 0xb9, 0x92, 0x64, 0xd1, 0xfb, 0x50, 0xd2, 0x89, 0x35, 0x51, + 0x17, 0x59, 0x74, 0xaa, 0x71, 0x8f, 0x24, 0xd6, 0x84, 0x17, 0x75, 0x87, 0x58, 0x13, 0x49, 0x95, + 0x09, 0xa3, 0x1e, 0x6c, 0xb6, 0xa2, 0xa3, 0x8d, 0x79, 0xfd, 0xd4, 0x71, 0x1d, 0x16, 0xb1, 0x78, + 0x4f, 0xc7, 0x8d, 0x76, 0xca, 0xe0, 0x8d, 0xca, 0xc9, 0xd1, 0x90, 0x1b, 0x55, 0x1e, 0x62, 0xfd, + 0x63, 0x98, 0xe9, 0xbf, 0xa8, 0x07, 0x2b, 0x12, 0xc9, 0x57, 0x95, 0x54, 0xe7, 0xca, 0x48, 0xcb, + 0xef, 0x72, 0x33, 0x91, 0x3a, 0x74, 0xaa, 0x99, 0xc8, 0xe2, 0xe8, 0x57, 0x0a, 0x6c, 0x1e, 0xce, + 0x9e, 0xe4, 0x51, 0x5e, 0x23, 0x93, 0xdf, 0x3c, 0xc5, 0x64, 0x9e, 0x0a, 0x37, 0xcd, 0x02, 0x91, + 0x33, 0x1b, 0xa4, 0x02, 0x91, 0xa7, 0x8e, 0xda, 0x50, 0x36, 0xd8, 0x01, 0xee, 0xab, 0x45, 0x66, + 0xfc, 0xf2, 0x29, 0xc6, 0x85, 0x14, 0xb7, 0xc7, 0xca, 0x95, 0x1f, 0xfc, 0xb2, 0x89, 0x18, 0x0a, + 0xfd, 0x00, 0x96, 0x0d, 0x3e, 0x5a, 0xf8, 0x6a, 0x89, 0xc1, 0x5e, 0x39, 0x15, 0x96, 0x8b, 0x71, + 0xdc, 0xad, 0x30, 0xd0, 0x90, 0x18, 0x4a, 0x64, 0xe0, 0x29, 0x1a, 0xfa, 0x31, 0x40, 0xcb, 0x3d, + 0x36, 0xfb, 0x8e, 0xd5, 0x1e, 0xc7, 0x87, 0xcb, 0xbb, 0xa7, 0x60, 0x27, 0x82, 0x1c, 0x9d, 0x55, + 0xae, 0x33, 0x25, 0xca, 0x95, 0x9b, 0x88, 0xa2, 0x6f, 0x41, 0xe9, 0x09, 0xb1, 0xe3, 0xa2, 0x5b, + 0x13, 0xd8, 0x4f, 0x88, 0xcd, 0xce, 0x76, 0x56, 0xbc, 0x7d, 0x62, 0xcb, 0xda, 0x4c, 0x1e, 0xfd, + 0x52, 0x81, 0x2b, 0x87, 0xdd, 0x1e, 0xb6, 0x46, 0x7d, 0x6c, 0xdd, 0x1f, 0xe3, 0xee, 0x88, 0x62, + 0xeb, 0x70, 0xcf, 0x38, 0xe4, 0x3d, 0xfe, 0xc0, 0xc3, 0xc7, 0xac, 0xf8, 0xc4, 0x81, 0x71, 0x23, + 0x0c, 0xb4, 0x86, 0x3f, 0x87, 0xbc, 0x64, 0x68, 0x2e, 0x7c, 0xf4, 0x5b, 0x05, 0xbe, 0x3e, 0x23, + 0x98, 0x38, 0x98, 0x5d, 0xce, 0x32, 0x5b, 0xce, 0xad, 0x30, 0xd0, 0x6e, 0xfa, 0x73, 0x6b, 0x49, + 0x8b, 0x3a, 0x83, 0xad, 0xed, 0x67, 0xb0, 0x31, 0xb3, 0x6f, 0x72, 0x7a, 0xeb, 0xe5, 0x74, 0x6f, + 0x5d, 0x8d, 0xf3, 0x3b, 0x6e, 0xb9, 0x47, 0x44, 0xee, 0xd5, 0x1f, 0xc2, 0xc5, 0x53, 0x37, 0x45, + 0x0e, 0xee, 0x95, 0x34, 0x6e, 0x9c, 0xdb, 0xc3, 0x3d, 0x23, 0x0b, 0xfc, 0x14, 0x56, 0xe4, 0x82, + 0xcf, 0xc1, 0xfa, 0x6a, 0x1a, 0x6b, 0x43, 0x60, 0x71, 0xad, 0x2c, 0xdc, 0x63, 0x58, 0x4d, 0x15, + 0xfa, 0xfc, 0x6b, 0x13, 0x6a, 0x32, 0xd8, 0x13, 0x38, 0x97, 0xa9, 0xec, 0xff, 0x21, 0x84, 0xf5, + 0x3f, 0x16, 0xa0, 0xfc, 0x00, 0xe3, 0x88, 0x8c, 0xae, 0x42, 0xf9, 0xa1, 0xe9, 0x7f, 0xcf, 0xc7, + 0x16, 0x83, 0x2a, 0xe9, 0xd5, 0x30, 0xd0, 0xca, 0x36, 0x27, 0x19, 0x31, 0x0f, 0xf5, 0xa1, 0xf8, + 0x00, 0x63, 0x71, 0x08, 0x7d, 0x14, 0x06, 0xda, 0xea, 0x11, 0x96, 0x4e, 0x90, 0x3f, 0xfc, 0x5d, + 0xbb, 0x3f, 0x30, 0x69, 0xaf, 0xd9, 0x71, 0xec, 0x46, 0xcb, 0xa5, 0x77, 0xce, 0x30, 0xc0, 0x37, + 0x74, 0xc7, 0x6e, 0xb9, 0x74, 0xcf, 0xf4, 0x29, 0xf6, 0x8c, 0xc8, 0x0c, 0xfa, 0x44, 0x81, 0xb5, + 0x96, 0xeb, 0x50, 0xc7, 0xec, 0x1f, 0x98, 0x8e, 0x15, 0x59, 0x2e, 0x32, 0xcb, 0x38, 0x1a, 0x70, + 0x9c, 0x14, 0xe7, 0xf3, 0x58, 0x44, 0xc6, 0x78, 0xfd, 0x6f, 0x0a, 0x2c, 0xf1, 0x30, 0xa2, 0x7d, + 0xa8, 0x4a, 0xe5, 0xcc, 0x62, 0x56, 0xbd, 0x81, 0x66, 0xbb, 0x11, 0x3f, 0xa9, 0xa5, 0xa3, 0x41, + 0x3e, 0xa9, 0x25, 0x39, 0xf4, 0xed, 0x69, 0x2e, 0x32, 0x65, 0x20, 0xa8, 0xbc, 0xf1, 0x1e, 0xf1, + 0x17, 0xb9, 0xf1, 0xc6, 0x19, 0xbc, 0x0d, 0x6b, 0x7c, 0x17, 0x3a, 0xc4, 0xdd, 0xf7, 0x2c, 0xec, + 0xb1, 0x58, 0x89, 0x41, 0x12, 0xa7, 0x38, 0x46, 0x46, 0xb2, 0xfe, 0x6f, 0x05, 0xca, 0x62, 0x2b, + 0x20, 0x02, 0xe7, 0x73, 0x36, 0x96, 0xf0, 0x70, 0x3b, 0xde, 0x37, 0xb3, 0x12, 0xfa, 0x57, 0xc2, + 0x40, 0x7b, 0x27, 0xe7, 0x24, 0x92, 0x16, 0x9b, 0x87, 0xfc, 0xc5, 0x7a, 0xde, 0x86, 0xb2, 0xe8, + 0xef, 0xa8, 0x1e, 0x25, 0x97, 0x4d, 0x3b, 0x6c, 0x33, 0xe9, 0x10, 0x06, 0xda, 0x12, 0x65, 0x14, + 0x43, 0x70, 0xd0, 0x55, 0x28, 0x3e, 0x21, 0xb6, 0x58, 0x27, 0x24, 0x07, 0x84, 0x5e, 0x0e, 0x03, + 0xad, 0xd8, 0x27, 0xb6, 0x11, 0xf1, 0xeb, 0x1f, 0x2b, 0x00, 0x49, 0x3b, 0x40, 0x1f, 0xc0, 0x12, + 0x7f, 0x13, 0x51, 0x3c, 0x97, 0xea, 0x18, 0xed, 0xb1, 0xbe, 0x19, 0x06, 0xda, 0x3a, 0x3f, 0x54, + 0x25, 0x07, 0x85, 0x52, 0x8e, 0x7f, 0x85, 0xb9, 0xfd, 0xfb, 0x97, 0x92, 0x7f, 0x19, 0x44, 0xef, + 0x41, 0xf5, 0xa1, 0xe9, 0x1f, 0x78, 0xe4, 0xd8, 0xb1, 0xa6, 0x9b, 0xfe, 0x5c, 0x18, 0x68, 0x55, + 0x3b, 0x21, 0x1b, 0xb2, 0x8c, 0x50, 0x31, 0xf0, 0xd1, 0xc8, 0x8d, 0x54, 0x0a, 0x29, 0x95, 0x98, + 0x6c, 0xc8, 0x32, 0xe8, 0x26, 0xac, 0x44, 0x08, 0xd8, 0x35, 0xfb, 0xd1, 0xd5, 0x87, 0x25, 0xa6, + 0xa4, 0xaf, 0x87, 0x81, 0xb6, 0x62, 0x4b, 0x74, 0x23, 0x25, 0x15, 0x39, 0xfc, 0xd4, 0x1c, 0x33, + 0x92, 0xc7, 0x4f, 0xaa, 0x12, 0xd3, 0x63, 0x0e, 0x0f, 0x52, 0x1c, 0x23, 0x23, 0x59, 0x3f, 0x82, + 0xf3, 0xdf, 0x8f, 0x1a, 0xa4, 0x49, 0x89, 0x67, 0x98, 0xd4, 0x71, 0x6d, 0x96, 0x82, 0x6b, 0x50, + 0x39, 0x18, 0x75, 0xfa, 0x4e, 0xf7, 0x71, 0xdc, 0x2c, 0xf5, 0xd5, 0x30, 0xd0, 0x2a, 0xc3, 0x98, + 0x68, 0x24, 0xfc, 0xa8, 0x12, 0xb8, 0x2a, 0xf3, 0xb1, 0xc0, 0x2b, 0xc1, 0x63, 0x14, 0x43, 0x70, + 0xea, 0x7f, 0x55, 0x60, 0x7d, 0x6a, 0xc8, 0xe7, 0xc4, 0xa8, 0x8b, 0xa6, 0x87, 0x7b, 0xd6, 0x45, + 0xc5, 0x70, 0x9f, 0x8c, 0xf4, 0x1a, 0x2c, 0xde, 0x1f, 0x92, 0x6e, 0x4f, 0xe4, 0xb1, 0x12, 0x06, + 0xda, 0x22, 0x8e, 0x08, 0x06, 0xa7, 0x23, 0x0f, 0x36, 0xb3, 0xd8, 0x6c, 0x7f, 0xf0, 0x39, 0x2d, + 0xde, 0x84, 0x39, 0x7e, 0xf2, 0x71, 0xf0, 0x38, 0x47, 0x57, 0x1e, 0x07, 0xf3, 0xb0, 0xeb, 0xbf, + 0x2b, 0x40, 0xc5, 0x20, 0x23, 0x97, 0x97, 0xac, 0x06, 0x8b, 0xec, 0x45, 0x14, 0x06, 0x5b, 0xa2, + 0x17, 0x11, 0x0c, 0x4e, 0x8f, 0x72, 0x94, 0xb9, 0x7b, 0x16, 0xd8, 0xdd, 0x93, 0xe5, 0x28, 0x7d, + 0xf7, 0x9c, 0xb9, 0x71, 0x7e, 0x07, 0xd6, 0x59, 0xb2, 0x3e, 0x64, 0xc5, 0x35, 0x24, 0xbe, 0xa8, + 0x8c, 0x65, 0xbe, 0x11, 0x3a, 0x19, 0x9e, 0x31, 0x23, 0x9d, 0x04, 0xda, 0x62, 0xa5, 0x91, 0x0a, + 0xb4, 0x15, 0x07, 0xda, 0x4a, 0x02, 0xbd, 0x78, 0x4a, 0xa0, 0xaf, 0x41, 0xa5, 0xed, 0x0c, 0xb0, + 0x4f, 0xcd, 0xc1, 0x50, 0x5d, 0x62, 0xae, 0xb2, 0xb2, 0xa0, 0x31, 0xd1, 0x48, 0xf8, 0xf5, 0x9f, + 0x03, 0x30, 0xdf, 0xfd, 0xf8, 0xc4, 0x9c, 0x27, 0xd7, 0xdf, 0x95, 0x95, 0xc4, 0x94, 0x1f, 0x5f, + 0x67, 0xa6, 0xe1, 0xe6, 0xf3, 0xa9, 0x37, 0x95, 0x93, 0xe7, 0xd3, 0x44, 0xbb, 0xfe, 0x1e, 0x94, + 0x0f, 0x46, 0x9d, 0xc7, 0x78, 0xe2, 0xa3, 0x77, 0xa1, 0x14, 0xfd, 0xb2, 0x9b, 0xca, 0x0a, 0x0f, + 0xfa, 0x0b, 0x3c, 0x49, 0x8d, 0xa6, 0x11, 0xbf, 0xfe, 0xe7, 0x02, 0x6c, 0x24, 0xe9, 0x8e, 0xb5, + 0xe7, 0x5c, 0xfb, 0x27, 0x0a, 0x6c, 0xb1, 0xe7, 0x19, 0x04, 0xe1, 0xc8, 0xcd, 0x6c, 0x25, 0xc6, + 0xfc, 0x46, 0xbe, 0x1a, 0x1f, 0xc6, 0xb5, 0x30, 0xd0, 0x2e, 0x1d, 0x67, 0x79, 0xf2, 0xb7, 0x92, + 0x7c, 0xed, 0x24, 0x9d, 0xc5, 0xfc, 0x74, 0x6e, 0x3f, 0x87, 0x4b, 0x9f, 0x61, 0x58, 0x9e, 0x95, + 0x56, 0x3f, 0x73, 0xf4, 0x12, 0x5a, 0xf2, 0xb0, 0xf4, 0xa7, 0x02, 0x2c, 0x4f, 0xbf, 0x3c, 0xcd, + 0x19, 0xbf, 0xdb, 0xb0, 0xc6, 0x2a, 0x37, 0x29, 0xb1, 0x42, 0xd2, 0xc7, 0x3a, 0x29, 0x8e, 0x91, + 0x91, 0x44, 0x83, 0xd9, 0xef, 0x69, 0xc5, 0xd4, 0x75, 0x2a, 0x26, 0xff, 0x5f, 0xbe, 0xa5, 0x7d, + 0x8e, 0x5f, 0x55, 0xea, 0x36, 0xac, 0xb1, 0x4f, 0x38, 0x51, 0x6b, 0xe7, 0xd7, 0x94, 0x39, 0xc3, + 0xd7, 0x48, 0x7d, 0x82, 0xe0, 0x33, 0xe7, 0x5a, 0x18, 0x68, 0x90, 0x7c, 0x82, 0x90, 0x3f, 0x3c, + 0xd4, 0x1b, 0xb0, 0xc8, 0x54, 0xe7, 0xc4, 0xd7, 0x47, 0x2f, 0x5f, 0xd7, 0x16, 0x5e, 0xbd, 0xae, + 0x2d, 0x7c, 0xfa, 0xba, 0xa6, 0xfc, 0xe2, 0xa4, 0xa6, 0xfc, 0xfe, 0xa4, 0xa6, 0xfc, 0xe5, 0xa4, + 0xa6, 0xbc, 0x3c, 0xa9, 0x29, 0xaf, 0x4e, 0x6a, 0xca, 0x3f, 0x4e, 0x6a, 0xca, 0x3f, 0x4f, 0x6a, + 0x0b, 0x9f, 0x9e, 0xd4, 0x94, 0xdf, 0xbc, 0xa9, 0x2d, 0xbc, 0x7c, 0x53, 0x5b, 0x78, 0xf5, 0xa6, + 0xb6, 0xf0, 0xd1, 0x59, 0x46, 0xca, 0xa6, 0xf8, 0x7f, 0xc8, 0x1d, 0xf1, 0xdb, 0x59, 0x62, 0x01, + 0x7b, 0xff, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xec, 0x77, 0x18, 0x41, 0x29, 0x19, 0x00, 0x00, } func (this *OutportBlock) Equal(that interface{}) bool { @@ -1983,7 +1983,7 @@ func (this *OutportBlock) GoString() string { keysForStateChanges = append(keysForStateChanges, k) } github_com_gogo_protobuf_sortkeys.Strings(keysForStateChanges) - mapStringForStateChanges := "map[string]*stateChange.StateChange{" + mapStringForStateChanges := "map[string]*stateChange.StateChanges{" for _, k := range keysForStateChanges { mapStringForStateChanges += fmt.Sprintf("%#v: %#v,", k, this.StateChanges[k]) } @@ -4007,7 +4007,7 @@ func (this *OutportBlock) String() string { keysForStateChanges = append(keysForStateChanges, k) } github_com_gogo_protobuf_sortkeys.Strings(keysForStateChanges) - mapStringForStateChanges := "map[string]*stateChange.StateChange{" + mapStringForStateChanges := "map[string]*stateChange.StateChanges{" for _, k := range keysForStateChanges { mapStringForStateChanges += fmt.Sprintf("%v: %v,", k, this.StateChanges[k]) } @@ -4648,10 +4648,10 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.StateChanges == nil { - m.StateChanges = make(map[string]*stateChange.StateChange) + m.StateChanges = make(map[string]*stateChange.StateChanges) } var mapkey string - var mapvalue *stateChange.StateChange + var mapvalue *stateChange.StateChanges for iNdEx < postIndex { entryPreIndex := iNdEx var wire uint64 @@ -4725,7 +4725,7 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { if postmsgIndex > l { return io.ErrUnexpectedEOF } - mapvalue = &stateChange.StateChange{} + mapvalue = &stateChange.StateChanges{} if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil { return err } diff --git a/data/outport/outportBlock.proto b/data/outport/outportBlock.proto index bfe095fe..f6274b25 100644 --- a/data/outport/outportBlock.proto +++ b/data/outport/outportBlock.proto @@ -21,7 +21,7 @@ message OutportBlock { TransactionPool TransactionPool = 3 [(gogoproto.jsontag) = "transactionPool,omitempty"]; HeaderGasConsumption HeaderGasConsumption = 4 [(gogoproto.jsontag) = "headerGasConsumption,omitempty"]; map AlteredAccounts = 5 [(gogoproto.jsontag) = "alteredAccounts,omitempty"]; - map StateChanges = 6 [(gogoproto.jsontag) = "stateChanges,omitempty"]; + map StateChanges = 6 [(gogoproto.jsontag) = "stateChanges,omitempty"]; repeated string NotarizedHeadersHashes = 7 [(gogoproto.jsontag) = "notarizedHeadersHashes,omitempty"]; uint32 NumberOfShards = 8 [(gogoproto.jsontag) = "numberOfShards"]; repeated uint64 SignersIndexes = 9 [(gogoproto.jsontag) = "signersIndexes,omitempty"]; diff --git a/data/stateChange/stateChange.pb.go b/data/stateChange/stateChange.pb.go index 1673f837..1ba9676b 100644 --- a/data/stateChange/stateChange.pb.go +++ b/data/stateChange/stateChange.pb.go @@ -26,6 +26,45 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package +type StateChanges struct { + StateChanges []*StateChange `protobuf:"bytes,1,rep,name=StateChanges,proto3" json:"stateChanges"` +} + +func (m *StateChanges) Reset() { *m = StateChanges{} } +func (*StateChanges) ProtoMessage() {} +func (*StateChanges) Descriptor() ([]byte, []int) { + return fileDescriptor_8e577663eebb0888, []int{0} +} +func (m *StateChanges) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *StateChanges) 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 *StateChanges) XXX_Merge(src proto.Message) { + xxx_messageInfo_StateChanges.Merge(m, src) +} +func (m *StateChanges) XXX_Size() int { + return m.Size() +} +func (m *StateChanges) XXX_DiscardUnknown() { + xxx_messageInfo_StateChanges.DiscardUnknown(m) +} + +var xxx_messageInfo_StateChanges proto.InternalMessageInfo + +func (m *StateChanges) GetStateChanges() []*StateChange { + if m != nil { + return m.StateChanges + } + return nil +} + type StateChange struct { Type string `protobuf:"bytes,1,opt,name=Type,proto3" json:"type"` Index int32 `protobuf:"varint,2,opt,name=Index,proto3" json:"-"` @@ -39,7 +78,7 @@ type StateChange struct { func (m *StateChange) Reset() { *m = StateChange{} } func (*StateChange) ProtoMessage() {} func (*StateChange) Descriptor() ([]byte, []int) { - return fileDescriptor_8e577663eebb0888, []int{0} + return fileDescriptor_8e577663eebb0888, []int{1} } func (m *StateChange) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -122,7 +161,7 @@ type DataTrieChange struct { func (m *DataTrieChange) Reset() { *m = DataTrieChange{} } func (*DataTrieChange) ProtoMessage() {} func (*DataTrieChange) Descriptor() ([]byte, []int) { - return fileDescriptor_8e577663eebb0888, []int{1} + return fileDescriptor_8e577663eebb0888, []int{2} } func (m *DataTrieChange) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -169,6 +208,7 @@ func (m *DataTrieChange) GetVal() []byte { } func init() { + proto.RegisterType((*StateChanges)(nil), "proto.StateChanges") proto.RegisterType((*StateChange)(nil), "proto.StateChange") proto.RegisterType((*DataTrieChange)(nil), "proto.DataTrieChange") } @@ -176,35 +216,65 @@ func init() { func init() { proto.RegisterFile("stateChange.proto", fileDescriptor_8e577663eebb0888) } var fileDescriptor_8e577663eebb0888 = []byte{ - // 403 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0xcd, 0xea, 0xd3, 0x40, - 0x14, 0xc5, 0x33, 0x4d, 0x53, 0xed, 0xd4, 0x0f, 0x0c, 0x08, 0xb1, 0xda, 0x49, 0xe8, 0xc6, 0x80, - 0xa6, 0x01, 0x5d, 0xba, 0x4b, 0x5d, 0x28, 0x22, 0x42, 0x2c, 0x5d, 0xb8, 0x10, 0xa6, 0xed, 0x34, - 0x09, 0x24, 0x99, 0x90, 0x4c, 0x25, 0x59, 0x08, 0x3e, 0x82, 0x8f, 0xe1, 0x93, 0x88, 0xcb, 0x2e, - 0xbb, 0x0a, 0x76, 0xba, 0x91, 0xac, 0xfa, 0x08, 0x92, 0x89, 0xa5, 0x69, 0x11, 0xfe, 0xab, 0xcc, - 0x3d, 0xbf, 0x7b, 0x2f, 0x39, 0x87, 0x0b, 0x1f, 0x64, 0x0c, 0x33, 0x32, 0xf5, 0x71, 0xec, 0x91, - 0x49, 0x92, 0x52, 0x46, 0x55, 0x45, 0x7c, 0x86, 0x96, 0x17, 0x30, 0x7f, 0xb3, 0x98, 0x2c, 0x69, - 0x64, 0x7b, 0xd4, 0xa3, 0xb6, 0x90, 0x17, 0x9b, 0xb5, 0xa8, 0x44, 0x21, 0x5e, 0xcd, 0xd4, 0xf8, - 0x67, 0x07, 0x0e, 0x3e, 0x9e, 0x77, 0xa9, 0x4f, 0x60, 0x77, 0x56, 0x24, 0x44, 0x03, 0x06, 0x30, - 0xfb, 0xce, 0xed, 0xaa, 0xd4, 0xbb, 0xac, 0x48, 0x88, 0x2b, 0x54, 0xf5, 0x31, 0x54, 0xde, 0xc6, - 0x2b, 0x92, 0x6b, 0x1d, 0x03, 0x98, 0x8a, 0xa3, 0x54, 0xa5, 0x0e, 0x2c, 0xb7, 0xd1, 0xd4, 0x11, - 0xec, 0xcd, 0xf2, 0x37, 0x38, 0xf3, 0x35, 0xd9, 0x00, 0xe6, 0x9d, 0x13, 0xfd, 0x27, 0xaa, 0x4f, - 0xe1, 0xe0, 0x3d, 0x0e, 0xe2, 0x59, 0x1a, 0x90, 0x77, 0xa4, 0xd0, 0xba, 0xed, 0x9e, 0x36, 0x69, - 0x37, 0xce, 0x71, 0xa8, 0x29, 0xff, 0x6d, 0x9c, 0xe3, 0x50, 0x7d, 0x06, 0xfb, 0x1f, 0x12, 0x92, - 0x62, 0x16, 0xd0, 0x58, 0xeb, 0x89, 0x1f, 0xbe, 0x5b, 0x95, 0x7a, 0x9f, 0x9e, 0x44, 0xf7, 0xcc, - 0xd5, 0xcf, 0xf0, 0xfe, 0x6b, 0xcc, 0x70, 0x3d, 0xdb, 0x58, 0xcd, 0xb4, 0x5b, 0x86, 0x6c, 0x0e, - 0x5e, 0x3c, 0x6c, 0x92, 0x98, 0x5c, 0x52, 0x67, 0x54, 0x95, 0xfa, 0xa3, 0xd5, 0xe5, 0xc4, 0x73, - 0x1a, 0x05, 0x8c, 0x44, 0x09, 0x2b, 0xdc, 0xeb, 0x65, 0xe3, 0x35, 0xbc, 0x77, 0x29, 0xdd, 0x10, - 0xe5, 0x10, 0xca, 0x75, 0x0c, 0x1d, 0xe1, 0xee, 0x0c, 0x6b, 0xb1, 0x66, 0xb5, 0x73, 0xf9, 0x9a, - 0xcd, 0x71, 0xe8, 0x7c, 0xdd, 0xee, 0x91, 0xb4, 0xdb, 0x23, 0xe9, 0xb8, 0x47, 0xe0, 0x1b, 0x47, - 0xe0, 0x07, 0x47, 0xe0, 0x17, 0x47, 0x60, 0xcb, 0x11, 0xd8, 0x71, 0x04, 0x7e, 0x73, 0x04, 0xfe, - 0x70, 0x24, 0x1d, 0x39, 0x02, 0xdf, 0x0f, 0x48, 0xda, 0x1e, 0x90, 0xb4, 0x3b, 0x20, 0xe9, 0xd3, - 0xb4, 0x75, 0x19, 0xd1, 0x26, 0x64, 0xc1, 0x17, 0x92, 0x66, 0xb9, 0x1d, 0xe5, 0xd6, 0xd2, 0xc7, - 0x41, 0x6c, 0x2d, 0x69, 0x4a, 0x2c, 0x8f, 0xda, 0xb5, 0x69, 0xbb, 0x75, 0x5f, 0xaf, 0x5a, 0xef, - 0x45, 0x4f, 0x84, 0xf5, 0xf2, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x69, 0xcc, 0x70, 0xa2, 0x81, - 0x02, 0x00, 0x00, + // 431 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x4f, 0x8b, 0xd3, 0x40, + 0x18, 0xc6, 0x33, 0x6d, 0x53, 0xed, 0xb4, 0xfe, 0x1b, 0x10, 0xe2, 0xea, 0x4e, 0x4a, 0x2f, 0x06, + 0x34, 0x0d, 0xe8, 0xd1, 0x5b, 0xd6, 0xc3, 0x8a, 0x88, 0x10, 0x4b, 0x11, 0x0f, 0xc2, 0xb4, 0x3b, + 0x9b, 0x04, 0x92, 0x4c, 0x48, 0xa6, 0x92, 0x1c, 0x04, 0x3f, 0x82, 0x1f, 0xc3, 0x4f, 0x22, 0x1e, + 0x7b, 0xec, 0x29, 0xd8, 0xe9, 0x45, 0x72, 0xda, 0x8f, 0x20, 0x99, 0x6e, 0xe9, 0x64, 0x11, 0x3c, + 0xcd, 0xbc, 0xcf, 0xef, 0x7d, 0x86, 0x79, 0x1f, 0x5e, 0xf8, 0x20, 0xe7, 0x84, 0xd3, 0xb3, 0x80, + 0x24, 0x3e, 0x9d, 0xa6, 0x19, 0xe3, 0x0c, 0xe9, 0xf2, 0x38, 0xb1, 0xfd, 0x90, 0x07, 0xab, 0xc5, + 0x74, 0xc9, 0x62, 0xc7, 0x67, 0x3e, 0x73, 0xa4, 0xbc, 0x58, 0x5d, 0xca, 0x4a, 0x16, 0xf2, 0xb6, + 0x77, 0x4d, 0x3e, 0xc2, 0xd1, 0x87, 0xe3, 0x53, 0x39, 0x3a, 0x6f, 0xd7, 0x06, 0x18, 0x77, 0xad, + 0xe1, 0x0b, 0xb4, 0xef, 0x9e, 0x2a, 0xc8, 0xbd, 0x5f, 0x57, 0xe6, 0x48, 0xf9, 0x46, 0xee, 0xb5, + 0x9c, 0x93, 0x9f, 0x1d, 0x38, 0x54, 0x04, 0xf4, 0x04, 0xf6, 0x66, 0x65, 0x4a, 0x0d, 0x30, 0x06, + 0xd6, 0xc0, 0xbd, 0x5d, 0x57, 0x66, 0x8f, 0x97, 0x29, 0xf5, 0xa4, 0x8a, 0x1e, 0x43, 0xfd, 0x4d, + 0x72, 0x41, 0x0b, 0xa3, 0x33, 0x06, 0x96, 0xee, 0xea, 0x75, 0x65, 0x02, 0xdb, 0xdb, 0x6b, 0xe8, + 0x14, 0xf6, 0x67, 0xc5, 0x39, 0xc9, 0x03, 0xa3, 0x3b, 0x06, 0xd6, 0xe8, 0x40, 0xaf, 0x45, 0xf4, + 0x14, 0x0e, 0xdf, 0x91, 0x30, 0x99, 0x65, 0x21, 0x7d, 0x4b, 0x4b, 0xa3, 0xa7, 0xf6, 0xa8, 0x44, + 0x6d, 0x9c, 0x93, 0xc8, 0xd0, 0xff, 0xd9, 0x38, 0x27, 0x11, 0x7a, 0x06, 0x07, 0xef, 0x53, 0x9a, + 0x11, 0x1e, 0xb2, 0xc4, 0xe8, 0xcb, 0x0f, 0xdf, 0xa9, 0x2b, 0x73, 0xc0, 0x0e, 0xa2, 0x77, 0xe4, + 0xe8, 0x33, 0xbc, 0xf7, 0x9a, 0x70, 0xd2, 0x78, 0x0f, 0xa9, 0xdd, 0x92, 0xa9, 0x3d, 0xbc, 0x4e, + 0xad, 0x4d, 0xdd, 0xd3, 0xba, 0x32, 0x1f, 0x5d, 0xb4, 0x1d, 0xcf, 0x59, 0x1c, 0x72, 0x1a, 0xa7, + 0xbc, 0xf4, 0x6e, 0x3e, 0x36, 0xb9, 0x84, 0x77, 0xdb, 0xd2, 0x7f, 0xa2, 0x3c, 0x81, 0xdd, 0x26, + 0x86, 0x8e, 0x9c, 0xee, 0x08, 0x1b, 0xb1, 0x61, 0xcd, 0xe4, 0xdd, 0x9b, 0x6c, 0x4e, 0x22, 0xf7, + 0xeb, 0x7a, 0x8b, 0xb5, 0xcd, 0x16, 0x6b, 0x57, 0x5b, 0x0c, 0xbe, 0x09, 0x0c, 0x7e, 0x08, 0x0c, + 0x7e, 0x09, 0x0c, 0xd6, 0x02, 0x83, 0x8d, 0xc0, 0xe0, 0xb7, 0xc0, 0xe0, 0x8f, 0xc0, 0xda, 0x95, + 0xc0, 0xe0, 0xfb, 0x0e, 0x6b, 0xeb, 0x1d, 0xd6, 0x36, 0x3b, 0xac, 0x7d, 0x3a, 0x53, 0x76, 0x2e, + 0x5e, 0x45, 0x3c, 0xfc, 0x42, 0xb3, 0xbc, 0x70, 0xe2, 0xc2, 0x5e, 0x06, 0x24, 0x4c, 0xec, 0x25, + 0xcb, 0xa8, 0xed, 0x33, 0xa7, 0x19, 0xda, 0x51, 0x56, 0xe6, 0x95, 0x72, 0x5f, 0xf4, 0x65, 0x58, + 0x2f, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x1e, 0x16, 0xb7, 0xec, 0xdb, 0x02, 0x00, 0x00, } +func (this *StateChanges) Equal(that interface{}) bool { + if that == nil { + return this == nil + } + + that1, ok := that.(*StateChanges) + if !ok { + that2, ok := that.(StateChanges) + if ok { + that1 = &that2 + } else { + return false + } + } + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + if len(this.StateChanges) != len(that1.StateChanges) { + return false + } + for i := range this.StateChanges { + if !this.StateChanges[i].Equal(that1.StateChanges[i]) { + return false + } + } + return true +} func (this *StateChange) Equal(that interface{}) bool { if that == nil { return this == nil @@ -282,6 +352,18 @@ func (this *DataTrieChange) Equal(that interface{}) bool { } return true } +func (this *StateChanges) GoString() string { + if this == nil { + return "nil" + } + s := make([]string, 0, 5) + s = append(s, "&stateChange.StateChanges{") + if this.StateChanges != nil { + s = append(s, "StateChanges: "+fmt.Sprintf("%#v", this.StateChanges)+",\n") + } + s = append(s, "}") + return strings.Join(s, "") +} func (this *StateChange) GoString() string { if this == nil { return "nil" @@ -320,6 +402,43 @@ func valueToGoStringStateChange(v interface{}, typ string) string { pv := reflect.Indirect(rv).Interface() return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv) } +func (m *StateChanges) 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 *StateChanges) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *StateChanges) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.StateChanges) > 0 { + for iNdEx := len(m.StateChanges) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.StateChanges[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintStateChange(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + func (m *StateChange) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -452,6 +571,21 @@ func encodeVarintStateChange(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } +func (m *StateChanges) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.StateChanges) > 0 { + for _, e := range m.StateChanges { + l = e.Size() + n += 1 + l + sovStateChange(uint64(l)) + } + } + return n +} + func (m *StateChange) Size() (n int) { if m == nil { return 0 @@ -517,6 +651,21 @@ func sovStateChange(x uint64) (n int) { func sozStateChange(x uint64) (n int) { return sovStateChange(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } +func (this *StateChanges) String() string { + if this == nil { + return "nil" + } + repeatedStringForStateChanges := "[]*StateChange{" + for _, f := range this.StateChanges { + repeatedStringForStateChanges += strings.Replace(f.String(), "StateChange", "StateChange", 1) + "," + } + repeatedStringForStateChanges += "}" + s := strings.Join([]string{`&StateChanges{`, + `StateChanges:` + repeatedStringForStateChanges + `,`, + `}`, + }, "") + return s +} func (this *StateChange) String() string { if this == nil { return "nil" @@ -558,6 +707,93 @@ func valueToStringStateChange(v interface{}) string { pv := reflect.Indirect(rv).Interface() return fmt.Sprintf("*%v", pv) } +func (m *StateChanges) 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 ErrIntOverflowStateChange + } + 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: StateChanges: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: StateChanges: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field StateChanges", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStateChange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthStateChange + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthStateChange + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.StateChanges = append(m.StateChanges, &StateChange{}) + if err := m.StateChanges[len(m.StateChanges)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipStateChange(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthStateChange + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthStateChange + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *StateChange) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/data/stateChange/stateChange.proto b/data/stateChange/stateChange.proto index 24040fbe..f7b9adf3 100644 --- a/data/stateChange/stateChange.proto +++ b/data/stateChange/stateChange.proto @@ -7,6 +7,10 @@ option (gogoproto.stable_marshaler_all) = true; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; +message StateChanges { + repeated StateChange StateChanges = 1 [(gogoproto.jsontag) = "stateChanges"]; +} + message StateChange { string Type = 1 [(gogoproto.jsontag) = "type"]; int32 Index = 2 [(gogoproto.jsontag) = "-"]; From 894187a86b01aa526aca2c83dd93508eb9f99ff9 Mon Sep 17 00:00:00 2001 From: Alexander Cristurean Date: Fri, 6 Sep 2024 17:50:48 +0300 Subject: [PATCH 11/14] small format. --- data/outport/outportBlock.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/outport/outportBlock.proto b/data/outport/outportBlock.proto index f6274b25..c398ceba 100644 --- a/data/outport/outportBlock.proto +++ b/data/outport/outportBlock.proto @@ -21,7 +21,7 @@ message OutportBlock { TransactionPool TransactionPool = 3 [(gogoproto.jsontag) = "transactionPool,omitempty"]; HeaderGasConsumption HeaderGasConsumption = 4 [(gogoproto.jsontag) = "headerGasConsumption,omitempty"]; map AlteredAccounts = 5 [(gogoproto.jsontag) = "alteredAccounts,omitempty"]; - map StateChanges = 6 [(gogoproto.jsontag) = "stateChanges,omitempty"]; + map StateChanges = 6 [(gogoproto.jsontag) = "stateChanges,omitempty"]; repeated string NotarizedHeadersHashes = 7 [(gogoproto.jsontag) = "notarizedHeadersHashes,omitempty"]; uint32 NumberOfShards = 8 [(gogoproto.jsontag) = "numberOfShards"]; repeated uint64 SignersIndexes = 9 [(gogoproto.jsontag) = "signersIndexes,omitempty"]; From e1a7a06d4ac412853594f5abfa257a626bb44c4e Mon Sep 17 00:00:00 2001 From: Alexander Cristurean Date: Mon, 9 Sep 2024 13:54:39 +0300 Subject: [PATCH 12/14] added data analysis state changes. --- data/stateChange/stateChange.pb.go | 717 +++++++++++++++++++++++++++-- data/stateChange/stateChange.proto | 13 + 2 files changed, 702 insertions(+), 28 deletions(-) diff --git a/data/stateChange/stateChange.pb.go b/data/stateChange/stateChange.pb.go index 1ba9676b..8b2e6b69 100644 --- a/data/stateChange/stateChange.pb.go +++ b/data/stateChange/stateChange.pb.go @@ -207,43 +207,169 @@ func (m *DataTrieChange) GetVal() []byte { return nil } +type DataAnalysisStateChange struct { + StateChange *StateChange `protobuf:"bytes,1,opt,name=StateChange,proto3" json:"stateChange"` + Operation string `protobuf:"bytes,2,opt,name=Operation,proto3" json:"operation"` + Nonce bool `protobuf:"varint,3,opt,name=Nonce,proto3" json:"nonceChanged"` + Balance bool `protobuf:"varint,4,opt,name=Balance,proto3" json:"balanceChanged"` + CodeHash bool `protobuf:"varint,5,opt,name=CodeHash,proto3" json:"codeHashChanged"` + RootHash bool `protobuf:"varint,6,opt,name=RootHash,proto3" json:"rootHashChanged"` + DeveloperReward bool `protobuf:"varint,7,opt,name=DeveloperReward,proto3" json:"developerRewardChanged"` + OwnerAddress bool `protobuf:"varint,8,opt,name=OwnerAddress,proto3" json:"ownerAddressChanged"` + UserName bool `protobuf:"varint,9,opt,name=UserName,proto3" json:"userNameChanged"` + CodeMetadata bool `protobuf:"varint,10,opt,name=CodeMetadata,proto3" json:"codeMetadataChanged"` +} + +func (m *DataAnalysisStateChange) Reset() { *m = DataAnalysisStateChange{} } +func (*DataAnalysisStateChange) ProtoMessage() {} +func (*DataAnalysisStateChange) Descriptor() ([]byte, []int) { + return fileDescriptor_8e577663eebb0888, []int{3} +} +func (m *DataAnalysisStateChange) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *DataAnalysisStateChange) 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 *DataAnalysisStateChange) XXX_Merge(src proto.Message) { + xxx_messageInfo_DataAnalysisStateChange.Merge(m, src) +} +func (m *DataAnalysisStateChange) XXX_Size() int { + return m.Size() +} +func (m *DataAnalysisStateChange) XXX_DiscardUnknown() { + xxx_messageInfo_DataAnalysisStateChange.DiscardUnknown(m) +} + +var xxx_messageInfo_DataAnalysisStateChange proto.InternalMessageInfo + +func (m *DataAnalysisStateChange) GetStateChange() *StateChange { + if m != nil { + return m.StateChange + } + return nil +} + +func (m *DataAnalysisStateChange) GetOperation() string { + if m != nil { + return m.Operation + } + return "" +} + +func (m *DataAnalysisStateChange) GetNonce() bool { + if m != nil { + return m.Nonce + } + return false +} + +func (m *DataAnalysisStateChange) GetBalance() bool { + if m != nil { + return m.Balance + } + return false +} + +func (m *DataAnalysisStateChange) GetCodeHash() bool { + if m != nil { + return m.CodeHash + } + return false +} + +func (m *DataAnalysisStateChange) GetRootHash() bool { + if m != nil { + return m.RootHash + } + return false +} + +func (m *DataAnalysisStateChange) GetDeveloperReward() bool { + if m != nil { + return m.DeveloperReward + } + return false +} + +func (m *DataAnalysisStateChange) GetOwnerAddress() bool { + if m != nil { + return m.OwnerAddress + } + return false +} + +func (m *DataAnalysisStateChange) GetUserName() bool { + if m != nil { + return m.UserName + } + return false +} + +func (m *DataAnalysisStateChange) GetCodeMetadata() bool { + if m != nil { + return m.CodeMetadata + } + return false +} + func init() { proto.RegisterType((*StateChanges)(nil), "proto.StateChanges") proto.RegisterType((*StateChange)(nil), "proto.StateChange") proto.RegisterType((*DataTrieChange)(nil), "proto.DataTrieChange") + proto.RegisterType((*DataAnalysisStateChange)(nil), "proto.DataAnalysisStateChange") } func init() { proto.RegisterFile("stateChange.proto", fileDescriptor_8e577663eebb0888) } var fileDescriptor_8e577663eebb0888 = []byte{ - // 431 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x4f, 0x8b, 0xd3, 0x40, - 0x18, 0xc6, 0x33, 0x6d, 0x53, 0xed, 0xb4, 0xfe, 0x1b, 0x10, 0xe2, 0xea, 0x4e, 0x4a, 0x2f, 0x06, - 0x34, 0x0d, 0xe8, 0xd1, 0x5b, 0xd6, 0xc3, 0x8a, 0x88, 0x10, 0x4b, 0x11, 0x0f, 0xc2, 0xb4, 0x3b, - 0x9b, 0x04, 0x92, 0x4c, 0x48, 0xa6, 0x92, 0x1c, 0x04, 0x3f, 0x82, 0x1f, 0xc3, 0x4f, 0x22, 0x1e, - 0x7b, 0xec, 0x29, 0xd8, 0xe9, 0x45, 0x72, 0xda, 0x8f, 0x20, 0x99, 0x6e, 0xe9, 0x64, 0x11, 0x3c, - 0xcd, 0xbc, 0xcf, 0xef, 0x7d, 0x86, 0x79, 0x1f, 0x5e, 0xf8, 0x20, 0xe7, 0x84, 0xd3, 0xb3, 0x80, - 0x24, 0x3e, 0x9d, 0xa6, 0x19, 0xe3, 0x0c, 0xe9, 0xf2, 0x38, 0xb1, 0xfd, 0x90, 0x07, 0xab, 0xc5, - 0x74, 0xc9, 0x62, 0xc7, 0x67, 0x3e, 0x73, 0xa4, 0xbc, 0x58, 0x5d, 0xca, 0x4a, 0x16, 0xf2, 0xb6, - 0x77, 0x4d, 0x3e, 0xc2, 0xd1, 0x87, 0xe3, 0x53, 0x39, 0x3a, 0x6f, 0xd7, 0x06, 0x18, 0x77, 0xad, - 0xe1, 0x0b, 0xb4, 0xef, 0x9e, 0x2a, 0xc8, 0xbd, 0x5f, 0x57, 0xe6, 0x48, 0xf9, 0x46, 0xee, 0xb5, - 0x9c, 0x93, 0x9f, 0x1d, 0x38, 0x54, 0x04, 0xf4, 0x04, 0xf6, 0x66, 0x65, 0x4a, 0x0d, 0x30, 0x06, - 0xd6, 0xc0, 0xbd, 0x5d, 0x57, 0x66, 0x8f, 0x97, 0x29, 0xf5, 0xa4, 0x8a, 0x1e, 0x43, 0xfd, 0x4d, - 0x72, 0x41, 0x0b, 0xa3, 0x33, 0x06, 0x96, 0xee, 0xea, 0x75, 0x65, 0x02, 0xdb, 0xdb, 0x6b, 0xe8, - 0x14, 0xf6, 0x67, 0xc5, 0x39, 0xc9, 0x03, 0xa3, 0x3b, 0x06, 0xd6, 0xe8, 0x40, 0xaf, 0x45, 0xf4, - 0x14, 0x0e, 0xdf, 0x91, 0x30, 0x99, 0x65, 0x21, 0x7d, 0x4b, 0x4b, 0xa3, 0xa7, 0xf6, 0xa8, 0x44, - 0x6d, 0x9c, 0x93, 0xc8, 0xd0, 0xff, 0xd9, 0x38, 0x27, 0x11, 0x7a, 0x06, 0x07, 0xef, 0x53, 0x9a, - 0x11, 0x1e, 0xb2, 0xc4, 0xe8, 0xcb, 0x0f, 0xdf, 0xa9, 0x2b, 0x73, 0xc0, 0x0e, 0xa2, 0x77, 0xe4, - 0xe8, 0x33, 0xbc, 0xf7, 0x9a, 0x70, 0xd2, 0x78, 0x0f, 0xa9, 0xdd, 0x92, 0xa9, 0x3d, 0xbc, 0x4e, - 0xad, 0x4d, 0xdd, 0xd3, 0xba, 0x32, 0x1f, 0x5d, 0xb4, 0x1d, 0xcf, 0x59, 0x1c, 0x72, 0x1a, 0xa7, - 0xbc, 0xf4, 0x6e, 0x3e, 0x36, 0xb9, 0x84, 0x77, 0xdb, 0xd2, 0x7f, 0xa2, 0x3c, 0x81, 0xdd, 0x26, - 0x86, 0x8e, 0x9c, 0xee, 0x08, 0x1b, 0xb1, 0x61, 0xcd, 0xe4, 0xdd, 0x9b, 0x6c, 0x4e, 0x22, 0xf7, - 0xeb, 0x7a, 0x8b, 0xb5, 0xcd, 0x16, 0x6b, 0x57, 0x5b, 0x0c, 0xbe, 0x09, 0x0c, 0x7e, 0x08, 0x0c, - 0x7e, 0x09, 0x0c, 0xd6, 0x02, 0x83, 0x8d, 0xc0, 0xe0, 0xb7, 0xc0, 0xe0, 0x8f, 0xc0, 0xda, 0x95, - 0xc0, 0xe0, 0xfb, 0x0e, 0x6b, 0xeb, 0x1d, 0xd6, 0x36, 0x3b, 0xac, 0x7d, 0x3a, 0x53, 0x76, 0x2e, - 0x5e, 0x45, 0x3c, 0xfc, 0x42, 0xb3, 0xbc, 0x70, 0xe2, 0xc2, 0x5e, 0x06, 0x24, 0x4c, 0xec, 0x25, - 0xcb, 0xa8, 0xed, 0x33, 0xa7, 0x19, 0xda, 0x51, 0x56, 0xe6, 0x95, 0x72, 0x5f, 0xf4, 0x65, 0x58, - 0x2f, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x1e, 0x16, 0xb7, 0xec, 0xdb, 0x02, 0x00, 0x00, + // 641 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xcf, 0x6e, 0xd3, 0x3e, + 0x1c, 0xaf, 0xdb, 0xa6, 0x6b, 0xdd, 0xfe, 0xd6, 0x1f, 0x9e, 0x60, 0x61, 0x30, 0xa7, 0xea, 0x01, + 0x2a, 0xb1, 0xae, 0x12, 0x1c, 0x77, 0x5a, 0x37, 0xa4, 0x21, 0xb4, 0x4d, 0x0a, 0x63, 0x42, 0x1c, + 0x90, 0xdc, 0xc6, 0x6b, 0x23, 0x25, 0x71, 0x95, 0xb8, 0x5b, 0x7b, 0x40, 0xe2, 0x11, 0x78, 0x0c, + 0x9e, 0x80, 0x47, 0x40, 0x1c, 0x77, 0xdc, 0x29, 0x62, 0xd9, 0x05, 0xe5, 0xb4, 0x47, 0x40, 0x76, + 0x9a, 0xc6, 0x99, 0x26, 0xed, 0xd4, 0xf8, 0xf3, 0xc7, 0xdf, 0x3f, 0xfe, 0xa8, 0xf0, 0x51, 0xc0, + 0x09, 0xa7, 0x7b, 0x63, 0xe2, 0x8d, 0xe8, 0xf6, 0xc4, 0x67, 0x9c, 0x21, 0x4d, 0xfe, 0x6c, 0x74, + 0x47, 0x36, 0x1f, 0x4f, 0x07, 0xdb, 0x43, 0xe6, 0xf6, 0x46, 0x6c, 0xc4, 0x7a, 0x12, 0x1e, 0x4c, + 0xcf, 0xe4, 0x49, 0x1e, 0xe4, 0x57, 0xe2, 0x6a, 0x7f, 0x82, 0x8d, 0x0f, 0xd9, 0x55, 0x01, 0x3a, + 0xc8, 0x9f, 0x75, 0xd0, 0x2a, 0x75, 0xea, 0xaf, 0x51, 0xa2, 0xde, 0x56, 0xa8, 0xfe, 0xff, 0x71, + 0x68, 0x34, 0x94, 0x36, 0x02, 0x33, 0xe7, 0x6c, 0xff, 0x2a, 0xc2, 0xba, 0x02, 0xa0, 0xe7, 0xb0, + 0x7c, 0x32, 0x9f, 0x50, 0x1d, 0xb4, 0x40, 0xa7, 0xd6, 0xaf, 0xc6, 0xa1, 0x51, 0xe6, 0xf3, 0x09, + 0x35, 0x25, 0x8a, 0x9e, 0x41, 0xed, 0x9d, 0x67, 0xd1, 0x99, 0x5e, 0x6c, 0x81, 0x8e, 0xd6, 0xd7, + 0xe2, 0xd0, 0x00, 0x5d, 0x33, 0xc1, 0xd0, 0x26, 0xac, 0x9c, 0xcc, 0x0e, 0x48, 0x30, 0xd6, 0x4b, + 0x2d, 0xd0, 0x69, 0xa4, 0xec, 0x02, 0x44, 0x2f, 0x61, 0xfd, 0x90, 0xd8, 0xde, 0x89, 0x6f, 0xd3, + 0xf7, 0x74, 0xae, 0x97, 0x55, 0x8d, 0xca, 0xa8, 0xc2, 0x53, 0xe2, 0xe8, 0xda, 0xbd, 0xc2, 0x53, + 0xe2, 0xa0, 0x57, 0xb0, 0x76, 0x3c, 0xa1, 0x3e, 0xe1, 0x36, 0xf3, 0xf4, 0x8a, 0x6c, 0xf8, 0xbf, + 0x38, 0x34, 0x6a, 0x2c, 0x05, 0xcd, 0x8c, 0x47, 0x5f, 0x60, 0x73, 0x9f, 0x70, 0x22, 0xbc, 0xe9, + 0xd6, 0x56, 0xe4, 0xd6, 0x1e, 0x2f, 0xb6, 0x96, 0x67, 0xfb, 0x9b, 0x71, 0x68, 0x3c, 0xb5, 0xf2, + 0x8e, 0x2d, 0xe6, 0xda, 0x9c, 0xba, 0x13, 0x3e, 0x37, 0xef, 0x5e, 0xd6, 0x3e, 0x83, 0xab, 0x79, + 0xe8, 0x81, 0x55, 0x6e, 0xc0, 0x92, 0x58, 0x43, 0x51, 0x4e, 0x97, 0x91, 0x02, 0x14, 0x9c, 0x98, + 0xbc, 0x74, 0x97, 0x3b, 0x25, 0x4e, 0xfb, 0x67, 0x19, 0xae, 0x8b, 0x42, 0xbb, 0x1e, 0x71, 0xe6, + 0x81, 0x1d, 0xa8, 0x8f, 0xf7, 0x36, 0xf7, 0x96, 0xb2, 0xf0, 0xfd, 0xa9, 0x68, 0xc6, 0xa1, 0x51, + 0x57, 0x52, 0x61, 0xe6, 0x32, 0x90, 0xdb, 0x6b, 0xf1, 0x81, 0xbd, 0xbe, 0x80, 0xda, 0x11, 0xf3, + 0x86, 0x54, 0x76, 0x5b, 0x4d, 0xf2, 0xe6, 0x09, 0x20, 0xb9, 0xcc, 0x32, 0x13, 0x1a, 0x6d, 0xc1, + 0x95, 0x3e, 0x71, 0x88, 0x50, 0x96, 0xa5, 0x12, 0xc5, 0xa1, 0xb1, 0x3a, 0x48, 0xa0, 0x54, 0x9b, + 0x4a, 0x50, 0x0f, 0x56, 0xf7, 0x98, 0x45, 0x65, 0x9a, 0x34, 0x29, 0x5f, 0x8b, 0x43, 0xa3, 0x39, + 0x5c, 0x60, 0xa9, 0x7e, 0x29, 0x12, 0x06, 0x93, 0x31, 0x2e, 0x0d, 0x95, 0xcc, 0xe0, 0x2f, 0xb0, + 0xa5, 0x21, 0x15, 0xa1, 0x7d, 0xd8, 0xdc, 0xa7, 0xe7, 0xd4, 0x11, 0x43, 0x99, 0xf4, 0x82, 0xf8, + 0x96, 0xbe, 0x22, 0x7d, 0x1b, 0x71, 0x68, 0x3c, 0xb1, 0xf2, 0x54, 0x6a, 0xbf, 0x6b, 0x41, 0x3b, + 0xb0, 0x71, 0x7c, 0xe1, 0x51, 0x7f, 0xd7, 0xb2, 0x7c, 0x1a, 0x04, 0x7a, 0x55, 0x5e, 0xb1, 0x1e, + 0x87, 0xc6, 0x1a, 0x53, 0xf0, 0xd4, 0x9f, 0x13, 0x8b, 0x9e, 0x3f, 0x06, 0xd4, 0x3f, 0x22, 0x2e, + 0xd5, 0x6b, 0x59, 0xcf, 0xd3, 0x05, 0xb6, 0xec, 0x39, 0x15, 0x89, 0x6a, 0x62, 0xe0, 0x43, 0xca, + 0x89, 0x48, 0xa6, 0x0e, 0xb3, 0x6a, 0x43, 0x05, 0x5f, 0x56, 0x53, 0xc5, 0xfd, 0xaf, 0x97, 0xd7, + 0xb8, 0x70, 0x75, 0x8d, 0x0b, 0xb7, 0xd7, 0x18, 0x7c, 0x8b, 0x30, 0xf8, 0x11, 0x61, 0xf0, 0x3b, + 0xc2, 0xe0, 0x32, 0xc2, 0xe0, 0x2a, 0xc2, 0xe0, 0x4f, 0x84, 0xc1, 0xdf, 0x08, 0x17, 0x6e, 0x23, + 0x0c, 0xbe, 0xdf, 0xe0, 0xc2, 0xe5, 0x0d, 0x2e, 0x5c, 0xdd, 0xe0, 0xc2, 0xe7, 0x3d, 0xe5, 0xcf, + 0xca, 0x9d, 0x3a, 0xdc, 0x3e, 0xa7, 0x7e, 0x30, 0xeb, 0xb9, 0xb3, 0xee, 0x70, 0x4c, 0x6c, 0xaf, + 0x3b, 0x64, 0x3e, 0xed, 0x8e, 0x58, 0x4f, 0x94, 0xe9, 0x29, 0xa9, 0xda, 0x51, 0xbe, 0x07, 0x15, + 0x99, 0xc2, 0x37, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x5e, 0x8f, 0x5c, 0xcc, 0x14, 0x05, 0x00, + 0x00, } func (this *StateChanges) Equal(that interface{}) bool { @@ -352,6 +478,57 @@ func (this *DataTrieChange) Equal(that interface{}) bool { } return true } +func (this *DataAnalysisStateChange) Equal(that interface{}) bool { + if that == nil { + return this == nil + } + + that1, ok := that.(*DataAnalysisStateChange) + if !ok { + that2, ok := that.(DataAnalysisStateChange) + if ok { + that1 = &that2 + } else { + return false + } + } + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + if !this.StateChange.Equal(that1.StateChange) { + return false + } + if this.Operation != that1.Operation { + return false + } + if this.Nonce != that1.Nonce { + return false + } + if this.Balance != that1.Balance { + return false + } + if this.CodeHash != that1.CodeHash { + return false + } + if this.RootHash != that1.RootHash { + return false + } + if this.DeveloperReward != that1.DeveloperReward { + return false + } + if this.OwnerAddress != that1.OwnerAddress { + return false + } + if this.UserName != that1.UserName { + return false + } + if this.CodeMetadata != that1.CodeMetadata { + return false + } + return true +} func (this *StateChanges) GoString() string { if this == nil { return "nil" @@ -394,6 +571,27 @@ func (this *DataTrieChange) GoString() string { s = append(s, "}") return strings.Join(s, "") } +func (this *DataAnalysisStateChange) GoString() string { + if this == nil { + return "nil" + } + s := make([]string, 0, 14) + s = append(s, "&stateChange.DataAnalysisStateChange{") + if this.StateChange != nil { + s = append(s, "StateChange: "+fmt.Sprintf("%#v", this.StateChange)+",\n") + } + s = append(s, "Operation: "+fmt.Sprintf("%#v", this.Operation)+",\n") + s = append(s, "Nonce: "+fmt.Sprintf("%#v", this.Nonce)+",\n") + s = append(s, "Balance: "+fmt.Sprintf("%#v", this.Balance)+",\n") + s = append(s, "CodeHash: "+fmt.Sprintf("%#v", this.CodeHash)+",\n") + s = append(s, "RootHash: "+fmt.Sprintf("%#v", this.RootHash)+",\n") + s = append(s, "DeveloperReward: "+fmt.Sprintf("%#v", this.DeveloperReward)+",\n") + s = append(s, "OwnerAddress: "+fmt.Sprintf("%#v", this.OwnerAddress)+",\n") + s = append(s, "UserName: "+fmt.Sprintf("%#v", this.UserName)+",\n") + s = append(s, "CodeMetadata: "+fmt.Sprintf("%#v", this.CodeMetadata)+",\n") + s = append(s, "}") + return strings.Join(s, "") +} func valueToGoStringStateChange(v interface{}, typ string) string { rv := reflect.ValueOf(v) if rv.IsNil() { @@ -560,6 +758,128 @@ func (m *DataTrieChange) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *DataAnalysisStateChange) 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 *DataAnalysisStateChange) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *DataAnalysisStateChange) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.CodeMetadata { + i-- + if m.CodeMetadata { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x50 + } + if m.UserName { + i-- + if m.UserName { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x48 + } + if m.OwnerAddress { + i-- + if m.OwnerAddress { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x40 + } + if m.DeveloperReward { + i-- + if m.DeveloperReward { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x38 + } + if m.RootHash { + i-- + if m.RootHash { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x30 + } + if m.CodeHash { + i-- + if m.CodeHash { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x28 + } + if m.Balance { + i-- + if m.Balance { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x20 + } + if m.Nonce { + i-- + if m.Nonce { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x18 + } + if len(m.Operation) > 0 { + i -= len(m.Operation) + copy(dAtA[i:], m.Operation) + i = encodeVarintStateChange(dAtA, i, uint64(len(m.Operation))) + i-- + dAtA[i] = 0x12 + } + if m.StateChange != nil { + { + size, err := m.StateChange.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintStateChange(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func encodeVarintStateChange(dAtA []byte, offset int, v uint64) int { offset -= sovStateChange(v) base := offset @@ -645,6 +965,47 @@ func (m *DataTrieChange) Size() (n int) { return n } +func (m *DataAnalysisStateChange) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.StateChange != nil { + l = m.StateChange.Size() + n += 1 + l + sovStateChange(uint64(l)) + } + l = len(m.Operation) + if l > 0 { + n += 1 + l + sovStateChange(uint64(l)) + } + if m.Nonce { + n += 2 + } + if m.Balance { + n += 2 + } + if m.CodeHash { + n += 2 + } + if m.RootHash { + n += 2 + } + if m.DeveloperReward { + n += 2 + } + if m.OwnerAddress { + n += 2 + } + if m.UserName { + n += 2 + } + if m.CodeMetadata { + n += 2 + } + return n +} + func sovStateChange(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -699,6 +1060,25 @@ func (this *DataTrieChange) String() string { }, "") return s } +func (this *DataAnalysisStateChange) String() string { + if this == nil { + return "nil" + } + s := strings.Join([]string{`&DataAnalysisStateChange{`, + `StateChange:` + strings.Replace(this.StateChange.String(), "StateChange", "StateChange", 1) + `,`, + `Operation:` + fmt.Sprintf("%v", this.Operation) + `,`, + `Nonce:` + fmt.Sprintf("%v", this.Nonce) + `,`, + `Balance:` + fmt.Sprintf("%v", this.Balance) + `,`, + `CodeHash:` + fmt.Sprintf("%v", this.CodeHash) + `,`, + `RootHash:` + fmt.Sprintf("%v", this.RootHash) + `,`, + `DeveloperReward:` + fmt.Sprintf("%v", this.DeveloperReward) + `,`, + `OwnerAddress:` + fmt.Sprintf("%v", this.OwnerAddress) + `,`, + `UserName:` + fmt.Sprintf("%v", this.UserName) + `,`, + `CodeMetadata:` + fmt.Sprintf("%v", this.CodeMetadata) + `,`, + `}`, + }, "") + return s +} func valueToStringStateChange(v interface{}) string { rv := reflect.ValueOf(v) if rv.IsNil() { @@ -1219,6 +1599,287 @@ func (m *DataTrieChange) Unmarshal(dAtA []byte) error { } return nil } +func (m *DataAnalysisStateChange) 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 ErrIntOverflowStateChange + } + 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: DataAnalysisStateChange: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: DataAnalysisStateChange: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field StateChange", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStateChange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthStateChange + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthStateChange + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.StateChange == nil { + m.StateChange = &StateChange{} + } + if err := m.StateChange.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Operation", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStateChange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthStateChange + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthStateChange + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Operation = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Nonce", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStateChange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.Nonce = bool(v != 0) + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Balance", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStateChange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.Balance = bool(v != 0) + case 5: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field CodeHash", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStateChange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.CodeHash = bool(v != 0) + case 6: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field RootHash", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStateChange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.RootHash = bool(v != 0) + case 7: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field DeveloperReward", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStateChange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.DeveloperReward = bool(v != 0) + case 8: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field OwnerAddress", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStateChange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.OwnerAddress = bool(v != 0) + case 9: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field UserName", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStateChange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.UserName = bool(v != 0) + case 10: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field CodeMetadata", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowStateChange + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.CodeMetadata = bool(v != 0) + default: + iNdEx = preIndex + skippy, err := skipStateChange(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthStateChange + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthStateChange + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipStateChange(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/data/stateChange/stateChange.proto b/data/stateChange/stateChange.proto index f7b9adf3..e7b48ddc 100644 --- a/data/stateChange/stateChange.proto +++ b/data/stateChange/stateChange.proto @@ -25,4 +25,17 @@ message DataTrieChange { string Type = 1 [(gogoproto.jsontag) = "type"]; bytes Key = 2 [(gogoproto.jsontag) = "type"]; bytes Val = 3 [(gogoproto.jsontag) = "type"]; +} + +message DataAnalysisStateChange { + StateChange StateChange = 1 [(gogoproto.jsontag) = "stateChange"]; + string Operation = 2 [(gogoproto.jsontag) = "operation"]; + bool Nonce = 3 [(gogoproto.jsontag) = "nonceChanged"]; + bool Balance = 4 [(gogoproto.jsontag) = "balanceChanged"]; + bool CodeHash = 5 [(gogoproto.jsontag) = "codeHashChanged"]; + bool RootHash = 6 [(gogoproto.jsontag) = "rootHashChanged"]; + bool DeveloperReward = 7 [(gogoproto.jsontag) = "developerRewardChanged"]; + bool OwnerAddress = 8 [(gogoproto.jsontag) = "ownerAddressChanged"]; + bool UserName = 9 [(gogoproto.jsontag) = "userNameChanged"]; + bool CodeMetadata = 10 [(gogoproto.jsontag) = "codeMetadataChanged"]; } \ No newline at end of file From f95a4e7bfd4257a378e49e5d666f6965cf80a5fd Mon Sep 17 00:00:00 2001 From: Alexander Cristurean Date: Tue, 17 Sep 2024 17:16:20 +0300 Subject: [PATCH 13/14] changed proto structure to keep backwards compatibility. --- data/outport/outportBlock.pb.go | 627 +++++++++++++++-------------- data/outport/outportBlock.proto | 12 +- data/stateChange/stateChange.proto | 2 +- 3 files changed, 321 insertions(+), 320 deletions(-) diff --git a/data/outport/outportBlock.pb.go b/data/outport/outportBlock.pb.go index 4a021157..e13bd827 100644 --- a/data/outport/outportBlock.pb.go +++ b/data/outport/outportBlock.pb.go @@ -43,12 +43,12 @@ type OutportBlock struct { 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"` - StateChanges map[string]*stateChange.StateChanges `protobuf:"bytes,6,rep,name=StateChanges,proto3" json:"stateChanges,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - NotarizedHeadersHashes []string `protobuf:"bytes,7,rep,name=NotarizedHeadersHashes,proto3" json:"notarizedHeadersHashes,omitempty"` - NumberOfShards uint32 `protobuf:"varint,8,opt,name=NumberOfShards,proto3" json:"numberOfShards"` - SignersIndexes []uint64 `protobuf:"varint,9,rep,packed,name=SignersIndexes,proto3" json:"signersIndexes,omitempty"` - HighestFinalBlockNonce uint64 `protobuf:"varint,10,opt,name=HighestFinalBlockNonce,proto3" json:"highestFinalBlockNonce"` - HighestFinalBlockHash []byte `protobuf:"bytes,11,opt,name=HighestFinalBlockHash,proto3" json:"highestFinalBlockHash,omitempty"` + 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"` + StateChanges map[string]*stateChange.StateChanges `protobuf:"bytes,11,rep,name=StateChanges,proto3" json:"stateChanges,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (m *OutportBlock) Reset() { *m = OutportBlock{} } @@ -114,13 +114,6 @@ func (m *OutportBlock) GetAlteredAccounts() map[string]*alteredAccount.AlteredAc return nil } -func (m *OutportBlock) GetStateChanges() map[string]*stateChange.StateChanges { - if m != nil { - return m.StateChanges - } - return nil -} - func (m *OutportBlock) GetNotarizedHeadersHashes() []string { if m != nil { return m.NotarizedHeadersHashes @@ -156,6 +149,13 @@ func (m *OutportBlock) GetHighestFinalBlockHash() []byte { return nil } +func (m *OutportBlock) GetStateChanges() map[string]*stateChange.StateChanges { + if m != nil { + return m.StateChanges + } + return nil +} + 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"` @@ -1148,7 +1148,7 @@ func init() { func init() { proto.RegisterFile("outportBlock.proto", fileDescriptor_661b95cef868af95) } var fileDescriptor_661b95cef868af95 = []byte{ - // 1984 bytes of a gzipped FileDescriptorProto + // 1987 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcd, 0x73, 0x1b, 0x49, 0x15, 0xf7, 0x48, 0xb2, 0x65, 0x3d, 0xd9, 0x8e, 0xdd, 0x71, 0xcc, 0xc4, 0x61, 0x35, 0x46, 0x49, 0x16, 0x43, 0x88, 0xc4, 0x66, 0x53, 0x54, 0x2a, 0xa9, 0x2d, 0xc8, 0x38, 0x5f, 0x22, 0x1f, 0x76, @@ -1178,101 +1178,102 @@ var fileDescriptor_661b95cef868af95 = []byte{ 0x95, 0x3c, 0x11, 0xbd, 0x1e, 0x06, 0x5a, 0xad, 0x97, 0xc3, 0x91, 0xec, 0xe5, 0x82, 0xa3, 0x9f, 0xc0, 0xb9, 0xbb, 0xa9, 0x1c, 0xfa, 0xea, 0xe2, 0x4e, 0x71, 0xb7, 0x7a, 0x63, 0x57, 0xd8, 0x93, 0xa3, 0xdf, 0xc8, 0x88, 0xde, 0x77, 0xa9, 0x37, 0xe1, 0x7e, 0xa6, 0x0b, 0xc1, 0x97, 0xfd, 0xcc, - 0x28, 0x21, 0x0c, 0x2b, 0x87, 0x49, 0xa2, 0x7d, 0x75, 0x89, 0xd9, 0xbb, 0x9a, 0x67, 0x4f, 0x96, - 0xe3, 0xc6, 0xb6, 0xc3, 0x40, 0xdb, 0x92, 0xea, 0x44, 0xb6, 0x94, 0x82, 0x45, 0x3f, 0x84, 0xad, - 0x67, 0x84, 0x9a, 0x9e, 0xf3, 0x33, 0x6c, 0x71, 0xd7, 0xfd, 0x47, 0xa6, 0xdf, 0xc3, 0xbe, 0x5a, - 0xde, 0x29, 0xee, 0x56, 0xf4, 0x2b, 0x61, 0xa0, 0xed, 0xb8, 0xb9, 0x12, 0x12, 0xe6, 0x29, 0x18, - 0xe8, 0x36, 0xac, 0x3d, 0x1b, 0x0d, 0x3a, 0xd8, 0xdb, 0x3f, 0x62, 0x95, 0xe6, 0xab, 0xcb, 0xac, - 0x1c, 0x51, 0x18, 0x68, 0x6b, 0x6e, 0x8a, 0x63, 0x64, 0x24, 0xd1, 0x3d, 0x58, 0x3b, 0x74, 0x6c, - 0x17, 0x7b, 0x7e, 0xcb, 0xb5, 0xf0, 0x18, 0xfb, 0x6a, 0x65, 0xa7, 0xb8, 0x5b, 0xd2, 0xbf, 0x1c, - 0x06, 0x9a, 0xea, 0xa7, 0x38, 0xd2, 0x4a, 0x32, 0x3a, 0xc8, 0x80, 0xad, 0x47, 0x8e, 0xdd, 0xc3, - 0x3e, 0x7d, 0xe0, 0xb8, 0x66, 0x9f, 0x05, 0xec, 0x19, 0x71, 0xbb, 0x58, 0x85, 0x1d, 0x65, 0xb7, - 0xc4, 0x23, 0xd5, 0xcb, 0x95, 0x30, 0x4e, 0xd1, 0x44, 0xcf, 0xe1, 0xc2, 0x0c, 0x27, 0x72, 0x58, - 0xad, 0xee, 0x28, 0xbb, 0x2b, 0xfa, 0xe5, 0x30, 0xd0, 0xb4, 0x5e, 0x9e, 0x80, 0xb4, 0xce, 0x7c, - 0x84, 0xed, 0xe7, 0xb0, 0x99, 0x57, 0x3d, 0x68, 0x1d, 0x8a, 0x2f, 0xf0, 0x84, 0x6d, 0xe6, 0x8a, - 0x11, 0x3d, 0xa2, 0x6b, 0xb0, 0x78, 0x6c, 0xf6, 0x47, 0x58, 0xec, 0xd6, 0x0b, 0xa2, 0x30, 0xd2, - 0xda, 0x06, 0x97, 0xb9, 0x5d, 0xb8, 0xa5, 0x6c, 0xb7, 0x61, 0x63, 0xa6, 0x50, 0x72, 0x70, 0xbf, - 0x96, 0xc6, 0x3d, 0x2f, 0x70, 0x65, 0x55, 0x09, 0xb5, 0xfe, 0xeb, 0xa2, 0xd4, 0x39, 0xce, 0xde, - 0x77, 0xee, 0x40, 0x95, 0x57, 0x8c, 0x3e, 0xa1, 0xd8, 0x67, 0x36, 0x57, 0xf4, 0x8b, 0x61, 0xa0, - 0x5d, 0xe8, 0x25, 0x64, 0x49, 0x51, 0x96, 0x46, 0xb7, 0x00, 0xf8, 0x6b, 0x7b, 0x32, 0xc4, 0xac, - 0xcd, 0x54, 0x74, 0x35, 0x0c, 0xb4, 0xcd, 0xde, 0x94, 0x2a, 0xa9, 0x4a, 0xb2, 0x89, 0x26, 0x4b, - 0x5b, 0x89, 0x59, 0x95, 0x34, 0x33, 0xb9, 0x92, 0x64, 0xd1, 0xfb, 0x50, 0xd2, 0x89, 0x35, 0x51, - 0x17, 0x59, 0x74, 0xaa, 0x71, 0x8f, 0x24, 0xd6, 0x84, 0x17, 0x75, 0x87, 0x58, 0x13, 0x49, 0x95, - 0x09, 0xa3, 0x1e, 0x6c, 0xb6, 0xa2, 0xa3, 0x8d, 0x79, 0xfd, 0xd4, 0x71, 0x1d, 0x16, 0xb1, 0x78, - 0x4f, 0xc7, 0x8d, 0x76, 0xca, 0xe0, 0x8d, 0xca, 0xc9, 0xd1, 0x90, 0x1b, 0x55, 0x1e, 0x62, 0xfd, - 0x63, 0x98, 0xe9, 0xbf, 0xa8, 0x07, 0x2b, 0x12, 0xc9, 0x57, 0x95, 0x54, 0xe7, 0xca, 0x48, 0xcb, - 0xef, 0x72, 0x33, 0x91, 0x3a, 0x74, 0xaa, 0x99, 0xc8, 0xe2, 0xe8, 0x57, 0x0a, 0x6c, 0x1e, 0xce, - 0x9e, 0xe4, 0x51, 0x5e, 0x23, 0x93, 0xdf, 0x3c, 0xc5, 0x64, 0x9e, 0x0a, 0x37, 0xcd, 0x02, 0x91, - 0x33, 0x1b, 0xa4, 0x02, 0x91, 0xa7, 0x8e, 0xda, 0x50, 0x36, 0xd8, 0x01, 0xee, 0xab, 0x45, 0x66, - 0xfc, 0xf2, 0x29, 0xc6, 0x85, 0x14, 0xb7, 0xc7, 0xca, 0x95, 0x1f, 0xfc, 0xb2, 0x89, 0x18, 0x0a, - 0xfd, 0x00, 0x96, 0x0d, 0x3e, 0x5a, 0xf8, 0x6a, 0x89, 0xc1, 0x5e, 0x39, 0x15, 0x96, 0x8b, 0x71, - 0xdc, 0xad, 0x30, 0xd0, 0x90, 0x18, 0x4a, 0x64, 0xe0, 0x29, 0x1a, 0xfa, 0x31, 0x40, 0xcb, 0x3d, - 0x36, 0xfb, 0x8e, 0xd5, 0x1e, 0xc7, 0x87, 0xcb, 0xbb, 0xa7, 0x60, 0x27, 0x82, 0x1c, 0x9d, 0x55, - 0xae, 0x33, 0x25, 0xca, 0x95, 0x9b, 0x88, 0xa2, 0x6f, 0x41, 0xe9, 0x09, 0xb1, 0xe3, 0xa2, 0x5b, - 0x13, 0xd8, 0x4f, 0x88, 0xcd, 0xce, 0x76, 0x56, 0xbc, 0x7d, 0x62, 0xcb, 0xda, 0x4c, 0x1e, 0xfd, - 0x52, 0x81, 0x2b, 0x87, 0xdd, 0x1e, 0xb6, 0x46, 0x7d, 0x6c, 0xdd, 0x1f, 0xe3, 0xee, 0x88, 0x62, - 0xeb, 0x70, 0xcf, 0x38, 0xe4, 0x3d, 0xfe, 0xc0, 0xc3, 0xc7, 0xac, 0xf8, 0xc4, 0x81, 0x71, 0x23, - 0x0c, 0xb4, 0x86, 0x3f, 0x87, 0xbc, 0x64, 0x68, 0x2e, 0x7c, 0xf4, 0x5b, 0x05, 0xbe, 0x3e, 0x23, - 0x98, 0x38, 0x98, 0x5d, 0xce, 0x32, 0x5b, 0xce, 0xad, 0x30, 0xd0, 0x6e, 0xfa, 0x73, 0x6b, 0x49, - 0x8b, 0x3a, 0x83, 0xad, 0xed, 0x67, 0xb0, 0x31, 0xb3, 0x6f, 0x72, 0x7a, 0xeb, 0xe5, 0x74, 0x6f, - 0x5d, 0x8d, 0xf3, 0x3b, 0x6e, 0xb9, 0x47, 0x44, 0xee, 0xd5, 0x1f, 0xc2, 0xc5, 0x53, 0x37, 0x45, - 0x0e, 0xee, 0x95, 0x34, 0x6e, 0x9c, 0xdb, 0xc3, 0x3d, 0x23, 0x0b, 0xfc, 0x14, 0x56, 0xe4, 0x82, - 0xcf, 0xc1, 0xfa, 0x6a, 0x1a, 0x6b, 0x43, 0x60, 0x71, 0xad, 0x2c, 0xdc, 0x63, 0x58, 0x4d, 0x15, - 0xfa, 0xfc, 0x6b, 0x13, 0x6a, 0x32, 0xd8, 0x13, 0x38, 0x97, 0xa9, 0xec, 0xff, 0x21, 0x84, 0xf5, - 0x3f, 0x16, 0xa0, 0xfc, 0x00, 0xe3, 0x88, 0x8c, 0xae, 0x42, 0xf9, 0xa1, 0xe9, 0x7f, 0xcf, 0xc7, - 0x16, 0x83, 0x2a, 0xe9, 0xd5, 0x30, 0xd0, 0xca, 0x36, 0x27, 0x19, 0x31, 0x0f, 0xf5, 0xa1, 0xf8, - 0x00, 0x63, 0x71, 0x08, 0x7d, 0x14, 0x06, 0xda, 0xea, 0x11, 0x96, 0x4e, 0x90, 0x3f, 0xfc, 0x5d, - 0xbb, 0x3f, 0x30, 0x69, 0xaf, 0xd9, 0x71, 0xec, 0x46, 0xcb, 0xa5, 0x77, 0xce, 0x30, 0xc0, 0x37, - 0x74, 0xc7, 0x6e, 0xb9, 0x74, 0xcf, 0xf4, 0x29, 0xf6, 0x8c, 0xc8, 0x0c, 0xfa, 0x44, 0x81, 0xb5, - 0x96, 0xeb, 0x50, 0xc7, 0xec, 0x1f, 0x98, 0x8e, 0x15, 0x59, 0x2e, 0x32, 0xcb, 0x38, 0x1a, 0x70, - 0x9c, 0x14, 0xe7, 0xf3, 0x58, 0x44, 0xc6, 0x78, 0xfd, 0x6f, 0x0a, 0x2c, 0xf1, 0x30, 0xa2, 0x7d, - 0xa8, 0x4a, 0xe5, 0xcc, 0x62, 0x56, 0xbd, 0x81, 0x66, 0xbb, 0x11, 0x3f, 0xa9, 0xa5, 0xa3, 0x41, - 0x3e, 0xa9, 0x25, 0x39, 0xf4, 0xed, 0x69, 0x2e, 0x32, 0x65, 0x20, 0xa8, 0xbc, 0xf1, 0x1e, 0xf1, - 0x17, 0xb9, 0xf1, 0xc6, 0x19, 0xbc, 0x0d, 0x6b, 0x7c, 0x17, 0x3a, 0xc4, 0xdd, 0xf7, 0x2c, 0xec, - 0xb1, 0x58, 0x89, 0x41, 0x12, 0xa7, 0x38, 0x46, 0x46, 0xb2, 0xfe, 0x6f, 0x05, 0xca, 0x62, 0x2b, - 0x20, 0x02, 0xe7, 0x73, 0x36, 0x96, 0xf0, 0x70, 0x3b, 0xde, 0x37, 0xb3, 0x12, 0xfa, 0x57, 0xc2, - 0x40, 0x7b, 0x27, 0xe7, 0x24, 0x92, 0x16, 0x9b, 0x87, 0xfc, 0xc5, 0x7a, 0xde, 0x86, 0xb2, 0xe8, - 0xef, 0xa8, 0x1e, 0x25, 0x97, 0x4d, 0x3b, 0x6c, 0x33, 0xe9, 0x10, 0x06, 0xda, 0x12, 0x65, 0x14, - 0x43, 0x70, 0xd0, 0x55, 0x28, 0x3e, 0x21, 0xb6, 0x58, 0x27, 0x24, 0x07, 0x84, 0x5e, 0x0e, 0x03, - 0xad, 0xd8, 0x27, 0xb6, 0x11, 0xf1, 0xeb, 0x1f, 0x2b, 0x00, 0x49, 0x3b, 0x40, 0x1f, 0xc0, 0x12, - 0x7f, 0x13, 0x51, 0x3c, 0x97, 0xea, 0x18, 0xed, 0xb1, 0xbe, 0x19, 0x06, 0xda, 0x3a, 0x3f, 0x54, - 0x25, 0x07, 0x85, 0x52, 0x8e, 0x7f, 0x85, 0xb9, 0xfd, 0xfb, 0x97, 0x92, 0x7f, 0x19, 0x44, 0xef, - 0x41, 0xf5, 0xa1, 0xe9, 0x1f, 0x78, 0xe4, 0xd8, 0xb1, 0xa6, 0x9b, 0xfe, 0x5c, 0x18, 0x68, 0x55, - 0x3b, 0x21, 0x1b, 0xb2, 0x8c, 0x50, 0x31, 0xf0, 0xd1, 0xc8, 0x8d, 0x54, 0x0a, 0x29, 0x95, 0x98, - 0x6c, 0xc8, 0x32, 0xe8, 0x26, 0xac, 0x44, 0x08, 0xd8, 0x35, 0xfb, 0xd1, 0xd5, 0x87, 0x25, 0xa6, - 0xa4, 0xaf, 0x87, 0x81, 0xb6, 0x62, 0x4b, 0x74, 0x23, 0x25, 0x15, 0x39, 0xfc, 0xd4, 0x1c, 0x33, - 0x92, 0xc7, 0x4f, 0xaa, 0x12, 0xd3, 0x63, 0x0e, 0x0f, 0x52, 0x1c, 0x23, 0x23, 0x59, 0x3f, 0x82, - 0xf3, 0xdf, 0x8f, 0x1a, 0xa4, 0x49, 0x89, 0x67, 0x98, 0xd4, 0x71, 0x6d, 0x96, 0x82, 0x6b, 0x50, - 0x39, 0x18, 0x75, 0xfa, 0x4e, 0xf7, 0x71, 0xdc, 0x2c, 0xf5, 0xd5, 0x30, 0xd0, 0x2a, 0xc3, 0x98, - 0x68, 0x24, 0xfc, 0xa8, 0x12, 0xb8, 0x2a, 0xf3, 0xb1, 0xc0, 0x2b, 0xc1, 0x63, 0x14, 0x43, 0x70, - 0xea, 0x7f, 0x55, 0x60, 0x7d, 0x6a, 0xc8, 0xe7, 0xc4, 0xa8, 0x8b, 0xa6, 0x87, 0x7b, 0xd6, 0x45, - 0xc5, 0x70, 0x9f, 0x8c, 0xf4, 0x1a, 0x2c, 0xde, 0x1f, 0x92, 0x6e, 0x4f, 0xe4, 0xb1, 0x12, 0x06, - 0xda, 0x22, 0x8e, 0x08, 0x06, 0xa7, 0x23, 0x0f, 0x36, 0xb3, 0xd8, 0x6c, 0x7f, 0xf0, 0x39, 0x2d, - 0xde, 0x84, 0x39, 0x7e, 0xf2, 0x71, 0xf0, 0x38, 0x47, 0x57, 0x1e, 0x07, 0xf3, 0xb0, 0xeb, 0xbf, - 0x2b, 0x40, 0xc5, 0x20, 0x23, 0x97, 0x97, 0xac, 0x06, 0x8b, 0xec, 0x45, 0x14, 0x06, 0x5b, 0xa2, - 0x17, 0x11, 0x0c, 0x4e, 0x8f, 0x72, 0x94, 0xb9, 0x7b, 0x16, 0xd8, 0xdd, 0x93, 0xe5, 0x28, 0x7d, - 0xf7, 0x9c, 0xb9, 0x71, 0x7e, 0x07, 0xd6, 0x59, 0xb2, 0x3e, 0x64, 0xc5, 0x35, 0x24, 0xbe, 0xa8, - 0x8c, 0x65, 0xbe, 0x11, 0x3a, 0x19, 0x9e, 0x31, 0x23, 0x9d, 0x04, 0xda, 0x62, 0xa5, 0x91, 0x0a, - 0xb4, 0x15, 0x07, 0xda, 0x4a, 0x02, 0xbd, 0x78, 0x4a, 0xa0, 0xaf, 0x41, 0xa5, 0xed, 0x0c, 0xb0, - 0x4f, 0xcd, 0xc1, 0x50, 0x5d, 0x62, 0xae, 0xb2, 0xb2, 0xa0, 0x31, 0xd1, 0x48, 0xf8, 0xf5, 0x9f, - 0x03, 0x30, 0xdf, 0xfd, 0xf8, 0xc4, 0x9c, 0x27, 0xd7, 0xdf, 0x95, 0x95, 0xc4, 0x94, 0x1f, 0x5f, - 0x67, 0xa6, 0xe1, 0xe6, 0xf3, 0xa9, 0x37, 0x95, 0x93, 0xe7, 0xd3, 0x44, 0xbb, 0xfe, 0x1e, 0x94, - 0x0f, 0x46, 0x9d, 0xc7, 0x78, 0xe2, 0xa3, 0x77, 0xa1, 0x14, 0xfd, 0xb2, 0x9b, 0xca, 0x0a, 0x0f, - 0xfa, 0x0b, 0x3c, 0x49, 0x8d, 0xa6, 0x11, 0xbf, 0xfe, 0xe7, 0x02, 0x6c, 0x24, 0xe9, 0x8e, 0xb5, - 0xe7, 0x5c, 0xfb, 0x27, 0x0a, 0x6c, 0xb1, 0xe7, 0x19, 0x04, 0xe1, 0xc8, 0xcd, 0x6c, 0x25, 0xc6, - 0xfc, 0x46, 0xbe, 0x1a, 0x1f, 0xc6, 0xb5, 0x30, 0xd0, 0x2e, 0x1d, 0x67, 0x79, 0xf2, 0xb7, 0x92, - 0x7c, 0xed, 0x24, 0x9d, 0xc5, 0xfc, 0x74, 0x6e, 0x3f, 0x87, 0x4b, 0x9f, 0x61, 0x58, 0x9e, 0x95, - 0x56, 0x3f, 0x73, 0xf4, 0x12, 0x5a, 0xf2, 0xb0, 0xf4, 0xa7, 0x02, 0x2c, 0x4f, 0xbf, 0x3c, 0xcd, - 0x19, 0xbf, 0xdb, 0xb0, 0xc6, 0x2a, 0x37, 0x29, 0xb1, 0x42, 0xd2, 0xc7, 0x3a, 0x29, 0x8e, 0x91, - 0x91, 0x44, 0x83, 0xd9, 0xef, 0x69, 0xc5, 0xd4, 0x75, 0x2a, 0x26, 0xff, 0x5f, 0xbe, 0xa5, 0x7d, - 0x8e, 0x5f, 0x55, 0xea, 0x36, 0xac, 0xb1, 0x4f, 0x38, 0x51, 0x6b, 0xe7, 0xd7, 0x94, 0x39, 0xc3, - 0xd7, 0x48, 0x7d, 0x82, 0xe0, 0x33, 0xe7, 0x5a, 0x18, 0x68, 0x90, 0x7c, 0x82, 0x90, 0x3f, 0x3c, - 0xd4, 0x1b, 0xb0, 0xc8, 0x54, 0xe7, 0xc4, 0xd7, 0x47, 0x2f, 0x5f, 0xd7, 0x16, 0x5e, 0xbd, 0xae, - 0x2d, 0x7c, 0xfa, 0xba, 0xa6, 0xfc, 0xe2, 0xa4, 0xa6, 0xfc, 0xfe, 0xa4, 0xa6, 0xfc, 0xe5, 0xa4, - 0xa6, 0xbc, 0x3c, 0xa9, 0x29, 0xaf, 0x4e, 0x6a, 0xca, 0x3f, 0x4e, 0x6a, 0xca, 0x3f, 0x4f, 0x6a, - 0x0b, 0x9f, 0x9e, 0xd4, 0x94, 0xdf, 0xbc, 0xa9, 0x2d, 0xbc, 0x7c, 0x53, 0x5b, 0x78, 0xf5, 0xa6, - 0xb6, 0xf0, 0xd1, 0x59, 0x46, 0xca, 0xa6, 0xf8, 0x7f, 0xc8, 0x1d, 0xf1, 0xdb, 0x59, 0x62, 0x01, - 0x7b, 0xff, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xec, 0x77, 0x18, 0x41, 0x29, 0x19, 0x00, 0x00, + 0x28, 0xa1, 0x1f, 0xc2, 0xd6, 0x33, 0x42, 0x4d, 0xcf, 0xf9, 0x19, 0xb6, 0xf8, 0x9a, 0xfc, 0x47, + 0xa6, 0xdf, 0xc3, 0xbe, 0xba, 0xb4, 0x53, 0xdc, 0xad, 0xe8, 0x57, 0xc2, 0x40, 0xdb, 0x71, 0x73, + 0x25, 0x24, 0xd8, 0x53, 0x30, 0xd0, 0x6d, 0x58, 0x7b, 0x36, 0x1a, 0x74, 0xb0, 0xb7, 0x7f, 0xc4, + 0x4a, 0xc0, 0x57, 0xcb, 0xac, 0x4e, 0x50, 0x18, 0x68, 0x6b, 0x6e, 0x8a, 0x63, 0x64, 0x24, 0xd1, + 0x3d, 0x58, 0x3b, 0x74, 0x6c, 0x17, 0x7b, 0x7e, 0xcb, 0xb5, 0xf0, 0x18, 0xfb, 0xea, 0xf2, 0x4e, + 0x71, 0xb7, 0xa4, 0x7f, 0x39, 0x0c, 0x34, 0xd5, 0x4f, 0x71, 0xa4, 0x95, 0x64, 0x74, 0x90, 0x01, + 0x5b, 0x8f, 0x1c, 0xbb, 0x87, 0x7d, 0xfa, 0xc0, 0x71, 0xcd, 0x3e, 0x8b, 0xdc, 0x33, 0xe2, 0x76, + 0xb1, 0x5a, 0xd9, 0x51, 0x76, 0x4b, 0xfa, 0x76, 0x18, 0x68, 0x5b, 0xbd, 0x5c, 0x09, 0xe3, 0x14, + 0x4d, 0xf4, 0x1c, 0x2e, 0xcc, 0x70, 0x22, 0x87, 0x55, 0xd8, 0x51, 0x76, 0x57, 0xf4, 0xcb, 0x61, + 0xa0, 0x69, 0xbd, 0x3c, 0x01, 0x69, 0x9d, 0xf9, 0x08, 0x08, 0xc3, 0xca, 0x61, 0xb2, 0xef, 0x7c, + 0xb5, 0xca, 0xd2, 0x7f, 0x35, 0x2f, 0xfd, 0xb2, 0x1c, 0xcf, 0x3d, 0xf3, 0x45, 0xda, 0xb6, 0x72, + 0x5c, 0x52, 0xb0, 0xdb, 0xcf, 0x61, 0x33, 0xaf, 0x7a, 0xd0, 0x3a, 0x14, 0x5f, 0xe0, 0x09, 0xdb, + 0xcc, 0x15, 0x23, 0x7a, 0x44, 0xd7, 0x60, 0xf1, 0xd8, 0xec, 0x8f, 0xb0, 0xd8, 0xad, 0x17, 0xc4, + 0x4a, 0xd2, 0xda, 0x06, 0x97, 0xb9, 0x5d, 0xb8, 0xa5, 0x6c, 0xb7, 0x61, 0x63, 0x66, 0x65, 0x39, + 0xb8, 0x5f, 0x4b, 0xe3, 0x9e, 0x17, 0xb8, 0xb2, 0xaa, 0x84, 0x5a, 0xff, 0x75, 0x51, 0xea, 0x1c, + 0x67, 0xef, 0x3b, 0x77, 0xa0, 0xca, 0x0b, 0x53, 0x9f, 0x50, 0xec, 0x33, 0x9b, 0x2b, 0xfa, 0xc5, + 0x30, 0xd0, 0x2e, 0xf4, 0x12, 0xb2, 0xa4, 0x28, 0x4b, 0xa3, 0x5b, 0x00, 0xfc, 0xb5, 0x3d, 0x19, + 0x62, 0xd6, 0x66, 0x2a, 0xba, 0x1a, 0x06, 0xda, 0x66, 0x6f, 0x4a, 0x95, 0x54, 0x25, 0xd9, 0x44, + 0x93, 0x55, 0x47, 0x89, 0x59, 0x95, 0x34, 0x33, 0x25, 0x21, 0xc9, 0xa2, 0xf7, 0xa1, 0xa4, 0x13, + 0x6b, 0xa2, 0x2e, 0xb2, 0xe8, 0x54, 0xe3, 0x1e, 0x49, 0xac, 0x09, 0xdf, 0x3b, 0x1d, 0x62, 0x4d, + 0x24, 0x55, 0x26, 0x8c, 0x7a, 0xb0, 0xd9, 0x8a, 0x8e, 0x36, 0xe6, 0xf5, 0x53, 0xc7, 0x75, 0x58, + 0xc4, 0xf8, 0x4e, 0x4e, 0x1a, 0xed, 0x94, 0xc1, 0x1b, 0x95, 0x93, 0xa3, 0x21, 0x37, 0xaa, 0x3c, + 0xc4, 0xfa, 0xc7, 0x30, 0xd3, 0x7f, 0x51, 0x0f, 0x56, 0x24, 0x92, 0xaf, 0x2a, 0xa9, 0xce, 0x95, + 0x91, 0x96, 0xdf, 0xe5, 0xea, 0x95, 0x3a, 0x74, 0xaa, 0x7a, 0x65, 0x71, 0xf4, 0x2b, 0x05, 0x36, + 0x0f, 0x67, 0x4f, 0xf2, 0x28, 0xaf, 0x91, 0xc9, 0x6f, 0x9e, 0x62, 0x32, 0x4f, 0x85, 0x9b, 0x66, + 0x81, 0xc8, 0x99, 0x0d, 0x52, 0x81, 0xc8, 0x53, 0x47, 0x6d, 0x28, 0x1b, 0xec, 0x00, 0xf7, 0xd5, + 0x22, 0x33, 0x7e, 0xf9, 0x14, 0xe3, 0x42, 0x8a, 0xdb, 0x63, 0xe5, 0xca, 0x0f, 0x7e, 0xd9, 0x44, + 0x0c, 0x85, 0x7e, 0x00, 0xcb, 0x06, 0x1f, 0x2d, 0x7c, 0xb5, 0xc4, 0x60, 0xaf, 0x9c, 0x0a, 0xcb, + 0xc5, 0x38, 0xee, 0x56, 0x18, 0x68, 0x48, 0x0c, 0x25, 0x32, 0xf0, 0x14, 0x0d, 0xfd, 0x18, 0xa0, + 0xe5, 0x1e, 0x9b, 0x7d, 0xc7, 0x6a, 0x8f, 0xe3, 0xc3, 0xe5, 0xdd, 0x53, 0xb0, 0x13, 0x41, 0x8e, + 0xce, 0x2a, 0xd7, 0x99, 0x12, 0xe5, 0xca, 0x4d, 0x44, 0xd1, 0xb7, 0xa0, 0xf4, 0x84, 0xd8, 0x71, + 0xd1, 0xad, 0x09, 0xec, 0x27, 0xc4, 0x66, 0x67, 0x3b, 0x2b, 0xde, 0x3e, 0xb1, 0x65, 0x6d, 0x26, + 0x8f, 0x7e, 0xa9, 0xc0, 0x95, 0xc3, 0x6e, 0x0f, 0x5b, 0xa3, 0x3e, 0xb6, 0xee, 0x8f, 0x71, 0x77, + 0x44, 0xb1, 0x75, 0xb8, 0x67, 0x1c, 0xf2, 0xa3, 0xe4, 0xc0, 0xc3, 0xc7, 0xac, 0xf8, 0xd4, 0x32, + 0x3b, 0x97, 0x6e, 0x84, 0x81, 0xd6, 0xf0, 0xe7, 0x90, 0x97, 0x0c, 0xcd, 0x85, 0x8f, 0x7e, 0xab, + 0xc0, 0xd7, 0x67, 0x04, 0x13, 0x07, 0xb3, 0xcb, 0x59, 0x66, 0xcb, 0xb9, 0x15, 0x06, 0xda, 0x4d, + 0x7f, 0x6e, 0x2d, 0x69, 0x51, 0x67, 0xb0, 0xb5, 0xfd, 0x0c, 0x36, 0x66, 0xf6, 0x4d, 0x4e, 0x6f, + 0xbd, 0x9c, 0xee, 0xad, 0xab, 0x71, 0x7e, 0xc7, 0x2d, 0xf7, 0x88, 0xc8, 0xbd, 0xfa, 0x43, 0xb8, + 0x78, 0xea, 0xa6, 0xc8, 0xc1, 0xbd, 0x92, 0xc6, 0x8d, 0x73, 0x7b, 0xb8, 0x67, 0x64, 0x81, 0x9f, + 0xc2, 0x8a, 0x5c, 0xf0, 0x39, 0x58, 0x5f, 0x4d, 0x63, 0x6d, 0x08, 0x2c, 0xae, 0x95, 0x85, 0x7b, + 0x0c, 0xab, 0xa9, 0x42, 0x9f, 0x7f, 0x6d, 0x42, 0x4d, 0x06, 0x7b, 0x02, 0xe7, 0x32, 0x95, 0xfd, + 0x3f, 0x84, 0xb0, 0xfe, 0xc7, 0x02, 0x94, 0x1f, 0x60, 0x1c, 0x91, 0xd1, 0x55, 0x28, 0x3f, 0x34, + 0xfd, 0xef, 0xf9, 0xd8, 0x62, 0x50, 0x25, 0xbd, 0x1a, 0x06, 0x5a, 0xd9, 0xe6, 0x24, 0x23, 0xe6, + 0xa1, 0x3e, 0x14, 0x1f, 0x60, 0x2c, 0x0e, 0xa1, 0x8f, 0xc2, 0x40, 0x5b, 0x3d, 0xc2, 0xd2, 0x09, + 0xf2, 0x87, 0xbf, 0x6b, 0xf7, 0x07, 0x26, 0xed, 0x35, 0x3b, 0x8e, 0xdd, 0x68, 0xb9, 0xf4, 0xce, + 0x19, 0x06, 0xf8, 0x86, 0xee, 0xd8, 0x2d, 0x97, 0xee, 0x99, 0x3e, 0xc5, 0x9e, 0x11, 0x99, 0x41, + 0x9f, 0x28, 0xb0, 0xd6, 0x72, 0x1d, 0xea, 0x98, 0xfd, 0x03, 0xd3, 0xb1, 0x22, 0xcb, 0x45, 0x66, + 0x19, 0x47, 0x73, 0x94, 0x93, 0xe2, 0x7c, 0x1e, 0x8b, 0xc8, 0x18, 0xaf, 0xff, 0x4d, 0x81, 0x25, + 0x1e, 0x46, 0xb4, 0x0f, 0x55, 0xa9, 0x9c, 0x59, 0xcc, 0xaa, 0x37, 0xd0, 0x6c, 0x37, 0xe2, 0x27, + 0xb5, 0x74, 0x34, 0xc8, 0x27, 0xb5, 0x24, 0x87, 0xbe, 0x3d, 0xcd, 0x45, 0xa6, 0x0c, 0x04, 0x95, + 0x37, 0xde, 0x23, 0xfe, 0x22, 0x37, 0xde, 0x38, 0x83, 0xb7, 0x61, 0x8d, 0xef, 0x42, 0x87, 0xb8, + 0xfb, 0x9e, 0x85, 0x3d, 0x16, 0x2b, 0x31, 0xaf, 0xe2, 0x14, 0xc7, 0xc8, 0x48, 0xd6, 0xff, 0xad, + 0x40, 0x59, 0x6c, 0x05, 0x44, 0xe0, 0x7c, 0xce, 0xc6, 0x12, 0x1e, 0x6e, 0xc7, 0xfb, 0x66, 0x56, + 0x42, 0xff, 0x4a, 0x18, 0x68, 0xef, 0xe4, 0x9c, 0x44, 0xd2, 0x62, 0xf3, 0x90, 0xbf, 0x58, 0xcf, + 0xdb, 0x50, 0x16, 0xfd, 0x1d, 0xd5, 0xa3, 0xe4, 0xb2, 0x69, 0x87, 0x6d, 0x26, 0x1d, 0xc2, 0x40, + 0x5b, 0xa2, 0x8c, 0x62, 0x08, 0x0e, 0xba, 0x0a, 0xc5, 0x27, 0xc4, 0x16, 0xeb, 0x84, 0xe4, 0x80, + 0xd0, 0xcb, 0x61, 0xa0, 0x15, 0xfb, 0xc4, 0x36, 0x22, 0x7e, 0xfd, 0x63, 0x05, 0x20, 0x69, 0x07, + 0xe8, 0x03, 0x58, 0xe2, 0x6f, 0x22, 0x8a, 0xe7, 0x52, 0x1d, 0xa3, 0x3d, 0xd6, 0x37, 0xc3, 0x40, + 0x5b, 0xe7, 0x87, 0xaa, 0xe4, 0xa0, 0x50, 0xca, 0xf1, 0xaf, 0x30, 0xb7, 0x7f, 0xff, 0x52, 0xf2, + 0x2f, 0x83, 0xe8, 0x3d, 0xa8, 0x3e, 0x34, 0xfd, 0x03, 0x8f, 0x1c, 0x3b, 0xd6, 0x74, 0xd3, 0x9f, + 0x0b, 0x03, 0xad, 0x6a, 0x27, 0x64, 0x43, 0x96, 0x11, 0x2a, 0x06, 0x3e, 0x1a, 0xb9, 0x91, 0x4a, + 0x21, 0xa5, 0x12, 0x93, 0x0d, 0x59, 0x06, 0xdd, 0x84, 0x95, 0x08, 0x01, 0xbb, 0x66, 0x3f, 0xba, + 0x61, 0xb1, 0xc4, 0x94, 0xf4, 0xf5, 0x30, 0xd0, 0x56, 0x6c, 0x89, 0x6e, 0xa4, 0xa4, 0x22, 0x87, + 0x9f, 0x9a, 0x63, 0x46, 0xf2, 0xf8, 0x49, 0x55, 0x62, 0x7a, 0xcc, 0xe1, 0x41, 0x8a, 0x63, 0x64, + 0x24, 0xeb, 0x47, 0x70, 0xfe, 0xfb, 0x51, 0x83, 0x34, 0x29, 0xf1, 0x0c, 0x93, 0x3a, 0xae, 0xcd, + 0x52, 0x70, 0x0d, 0x2a, 0x07, 0xa3, 0x4e, 0xdf, 0xe9, 0x3e, 0x8e, 0x9b, 0xa5, 0xbe, 0x1a, 0x06, + 0x5a, 0x65, 0x18, 0x13, 0x8d, 0x84, 0x1f, 0x55, 0x02, 0x57, 0x65, 0x3e, 0x16, 0x78, 0x25, 0x78, + 0x8c, 0x62, 0x08, 0x4e, 0xfd, 0xaf, 0x0a, 0xac, 0x4f, 0x0d, 0xf9, 0x9c, 0x18, 0x75, 0xd1, 0xf4, + 0x70, 0xcf, 0xba, 0xa8, 0x18, 0xee, 0x93, 0x91, 0x5e, 0x83, 0xc5, 0xfb, 0x43, 0xd2, 0xed, 0x89, + 0x3c, 0x56, 0xc2, 0x40, 0x5b, 0xc4, 0x11, 0xc1, 0xe0, 0x74, 0xe4, 0xc1, 0x66, 0x16, 0x9b, 0xed, + 0x0f, 0x3e, 0xa7, 0xc5, 0x9b, 0x30, 0xc7, 0x4f, 0x3e, 0x0e, 0x1e, 0xe7, 0xe8, 0xca, 0xe3, 0x60, + 0x1e, 0x76, 0xfd, 0x77, 0x05, 0xa8, 0x18, 0x64, 0xe4, 0xf2, 0x92, 0xd5, 0x60, 0x91, 0xbd, 0x88, + 0xc2, 0x60, 0x4b, 0xf4, 0x22, 0x82, 0xc1, 0xe9, 0x51, 0x8e, 0x32, 0x57, 0xdc, 0x02, 0xbb, 0xe2, + 0xb2, 0x1c, 0xa5, 0xaf, 0xb8, 0x33, 0x17, 0xdb, 0xef, 0xc0, 0x3a, 0x4b, 0xd6, 0x87, 0xac, 0xb8, + 0x86, 0xc4, 0x17, 0x95, 0xb1, 0xcc, 0x37, 0x42, 0x27, 0xc3, 0x33, 0x66, 0xa4, 0x93, 0x40, 0x5b, + 0xac, 0x34, 0x52, 0x81, 0xb6, 0xe2, 0x40, 0x5b, 0x49, 0xa0, 0x17, 0x4f, 0x09, 0xf4, 0x35, 0xa8, + 0xb4, 0x9d, 0x01, 0xf6, 0xa9, 0x39, 0x18, 0xaa, 0x4b, 0xcc, 0x55, 0x56, 0x16, 0x34, 0x26, 0x1a, + 0x09, 0xbf, 0xfe, 0x73, 0x00, 0xe6, 0xbb, 0x1f, 0x9f, 0x98, 0xf3, 0xe4, 0xfa, 0xbb, 0xb2, 0x92, + 0x98, 0xf2, 0xe3, 0xeb, 0xcc, 0x34, 0xdc, 0x7c, 0x3e, 0xf5, 0xa6, 0x72, 0xf2, 0x7c, 0x9a, 0x68, + 0xd7, 0xdf, 0x83, 0xf2, 0xc1, 0xa8, 0xf3, 0x18, 0x4f, 0x7c, 0xf4, 0x2e, 0x94, 0xa2, 0x5f, 0x76, + 0x53, 0x59, 0xe1, 0x41, 0x7f, 0x81, 0x27, 0xa9, 0xd1, 0x34, 0xe2, 0xd7, 0xff, 0x5c, 0x80, 0x8d, + 0x24, 0xdd, 0xb1, 0xf6, 0x9c, 0x6b, 0xff, 0x44, 0x81, 0x2d, 0xf6, 0x3c, 0x83, 0x20, 0x1c, 0xb9, + 0x99, 0xad, 0xc4, 0x98, 0xdf, 0xc8, 0x57, 0xe3, 0xc3, 0xb8, 0x16, 0x06, 0xda, 0xa5, 0xe3, 0x2c, + 0x4f, 0xfe, 0x24, 0x93, 0xaf, 0x9d, 0xa4, 0xb3, 0x98, 0x9f, 0xce, 0xed, 0xe7, 0x70, 0xe9, 0x33, + 0x0c, 0xcb, 0xb3, 0xd2, 0xea, 0x67, 0x8e, 0x5e, 0x42, 0x4b, 0x1e, 0x96, 0xfe, 0x54, 0x80, 0xe5, + 0xe9, 0x97, 0xa7, 0x39, 0xe3, 0x77, 0x1b, 0xd6, 0x58, 0xe5, 0x26, 0x25, 0x56, 0x48, 0xfa, 0x58, + 0x27, 0xc5, 0x31, 0x32, 0x92, 0x68, 0x30, 0xfb, 0x3d, 0xad, 0x98, 0xba, 0x4e, 0xc5, 0xe4, 0xff, + 0xcb, 0xb7, 0xb4, 0xcf, 0xf1, 0xab, 0x4a, 0xdd, 0x86, 0x35, 0xf6, 0xa5, 0x28, 0x6a, 0xed, 0xfc, + 0x9a, 0x32, 0x67, 0xf8, 0x1a, 0xa9, 0x4f, 0x10, 0x7c, 0xe6, 0x5c, 0x0b, 0x03, 0x0d, 0x92, 0x4f, + 0x10, 0xf2, 0x87, 0x87, 0x7a, 0x03, 0x16, 0x99, 0xea, 0x9c, 0xf8, 0xfa, 0xe8, 0xe5, 0xeb, 0xda, + 0xc2, 0xab, 0xd7, 0xb5, 0x85, 0x4f, 0x5f, 0xd7, 0x94, 0x5f, 0x9c, 0xd4, 0x94, 0xdf, 0x9f, 0xd4, + 0x94, 0xbf, 0x9c, 0xd4, 0x94, 0x97, 0x27, 0x35, 0xe5, 0xd5, 0x49, 0x4d, 0xf9, 0xc7, 0x49, 0x4d, + 0xf9, 0xe7, 0x49, 0x6d, 0xe1, 0xd3, 0x93, 0x9a, 0xf2, 0x9b, 0x37, 0xb5, 0x85, 0x97, 0x6f, 0x6a, + 0x0b, 0xaf, 0xde, 0xd4, 0x16, 0x3e, 0x3a, 0xcb, 0x48, 0xd9, 0x14, 0xff, 0x0f, 0xb9, 0x23, 0x7e, + 0x3b, 0x4b, 0x2c, 0x60, 0xef, 0xff, 0x37, 0x00, 0x00, 0xff, 0xff, 0xdb, 0x5a, 0xbb, 0xcb, 0x29, + 0x19, 0x00, 0x00, } func (this *OutportBlock) Equal(that interface{}) bool { @@ -1314,14 +1315,6 @@ func (this *OutportBlock) Equal(that interface{}) bool { return false } } - if len(this.StateChanges) != len(that1.StateChanges) { - return false - } - for i := range this.StateChanges { - if !this.StateChanges[i].Equal(that1.StateChanges[i]) { - return false - } - } if len(this.NotarizedHeadersHashes) != len(that1.NotarizedHeadersHashes) { return false } @@ -1347,6 +1340,14 @@ func (this *OutportBlock) Equal(that interface{}) bool { if !bytes.Equal(this.HighestFinalBlockHash, that1.HighestFinalBlockHash) { return false } + if len(this.StateChanges) != len(that1.StateChanges) { + return false + } + for i := range this.StateChanges { + if !this.StateChanges[i].Equal(that1.StateChanges[i]) { + return false + } + } return true } func (this *BlockData) Equal(that interface{}) bool { @@ -1978,6 +1979,11 @@ func (this *OutportBlock) GoString() string { if this.AlteredAccounts != nil { s = append(s, "AlteredAccounts: "+mapStringForAlteredAccounts+",\n") } + s = append(s, "NotarizedHeadersHashes: "+fmt.Sprintf("%#v", this.NotarizedHeadersHashes)+",\n") + s = append(s, "NumberOfShards: "+fmt.Sprintf("%#v", this.NumberOfShards)+",\n") + s = append(s, "SignersIndexes: "+fmt.Sprintf("%#v", this.SignersIndexes)+",\n") + s = append(s, "HighestFinalBlockNonce: "+fmt.Sprintf("%#v", this.HighestFinalBlockNonce)+",\n") + s = append(s, "HighestFinalBlockHash: "+fmt.Sprintf("%#v", this.HighestFinalBlockHash)+",\n") keysForStateChanges := make([]string, 0, len(this.StateChanges)) for k, _ := range this.StateChanges { keysForStateChanges = append(keysForStateChanges, k) @@ -1991,11 +1997,6 @@ func (this *OutportBlock) GoString() string { if this.StateChanges != nil { s = append(s, "StateChanges: "+mapStringForStateChanges+",\n") } - s = append(s, "NotarizedHeadersHashes: "+fmt.Sprintf("%#v", this.NotarizedHeadersHashes)+",\n") - s = append(s, "NumberOfShards: "+fmt.Sprintf("%#v", this.NumberOfShards)+",\n") - s = append(s, "SignersIndexes: "+fmt.Sprintf("%#v", this.SignersIndexes)+",\n") - s = append(s, "HighestFinalBlockNonce: "+fmt.Sprintf("%#v", this.HighestFinalBlockNonce)+",\n") - s = append(s, "HighestFinalBlockHash: "+fmt.Sprintf("%#v", this.HighestFinalBlockHash)+",\n") s = append(s, "}") return strings.Join(s, "") } @@ -2340,50 +2341,6 @@ func (m *OutportBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.HighestFinalBlockHash) > 0 { - i -= len(m.HighestFinalBlockHash) - copy(dAtA[i:], m.HighestFinalBlockHash) - i = encodeVarintOutportBlock(dAtA, i, uint64(len(m.HighestFinalBlockHash))) - i-- - dAtA[i] = 0x5a - } - if m.HighestFinalBlockNonce != 0 { - i = encodeVarintOutportBlock(dAtA, i, uint64(m.HighestFinalBlockNonce)) - i-- - dAtA[i] = 0x50 - } - if len(m.SignersIndexes) > 0 { - dAtA2 := make([]byte, len(m.SignersIndexes)*10) - var j1 int - for _, num := range m.SignersIndexes { - for num >= 1<<7 { - dAtA2[j1] = uint8(uint64(num)&0x7f | 0x80) - num >>= 7 - j1++ - } - dAtA2[j1] = uint8(num) - j1++ - } - i -= j1 - copy(dAtA[i:], dAtA2[:j1]) - i = encodeVarintOutportBlock(dAtA, i, uint64(j1)) - i-- - dAtA[i] = 0x4a - } - if m.NumberOfShards != 0 { - i = encodeVarintOutportBlock(dAtA, i, uint64(m.NumberOfShards)) - i-- - dAtA[i] = 0x40 - } - if len(m.NotarizedHeadersHashes) > 0 { - for iNdEx := len(m.NotarizedHeadersHashes) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.NotarizedHeadersHashes[iNdEx]) - copy(dAtA[i:], m.NotarizedHeadersHashes[iNdEx]) - i = encodeVarintOutportBlock(dAtA, i, uint64(len(m.NotarizedHeadersHashes[iNdEx]))) - i-- - dAtA[i] = 0x3a - } - } if len(m.StateChanges) > 0 { keysForStateChanges := make([]string, 0, len(m.StateChanges)) for k := range m.StateChanges { @@ -2412,6 +2369,50 @@ func (m *OutportBlock) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0xa i = encodeVarintOutportBlock(dAtA, i, uint64(baseI-i)) i-- + dAtA[i] = 0x5a + } + } + if len(m.HighestFinalBlockHash) > 0 { + i -= len(m.HighestFinalBlockHash) + copy(dAtA[i:], m.HighestFinalBlockHash) + i = encodeVarintOutportBlock(dAtA, i, uint64(len(m.HighestFinalBlockHash))) + i-- + dAtA[i] = 0x52 + } + if m.HighestFinalBlockNonce != 0 { + i = encodeVarintOutportBlock(dAtA, i, uint64(m.HighestFinalBlockNonce)) + i-- + dAtA[i] = 0x48 + } + if len(m.SignersIndexes) > 0 { + dAtA3 := make([]byte, len(m.SignersIndexes)*10) + var j2 int + for _, num := range m.SignersIndexes { + for num >= 1<<7 { + dAtA3[j2] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j2++ + } + dAtA3[j2] = uint8(num) + j2++ + } + i -= j2 + copy(dAtA[i:], dAtA3[:j2]) + i = encodeVarintOutportBlock(dAtA, i, uint64(j2)) + i-- + dAtA[i] = 0x42 + } + if m.NumberOfShards != 0 { + i = encodeVarintOutportBlock(dAtA, i, uint64(m.NumberOfShards)) + i-- + dAtA[i] = 0x38 + } + if len(m.NotarizedHeadersHashes) > 0 { + for iNdEx := len(m.NotarizedHeadersHashes) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.NotarizedHeadersHashes[iNdEx]) + copy(dAtA[i:], m.NotarizedHeadersHashes[iNdEx]) + i = encodeVarintOutportBlock(dAtA, i, uint64(len(m.NotarizedHeadersHashes[iNdEx]))) + i-- dAtA[i] = 0x32 } } @@ -3516,19 +3517,6 @@ func (m *OutportBlock) Size() (n int) { n += mapEntrySize + 1 + sovOutportBlock(uint64(mapEntrySize)) } } - if len(m.StateChanges) > 0 { - for k, v := range m.StateChanges { - _ = k - _ = v - l = 0 - if v != nil { - l = v.Size() - l += 1 + sovOutportBlock(uint64(l)) - } - mapEntrySize := 1 + len(k) + sovOutportBlock(uint64(len(k))) + l - n += mapEntrySize + 1 + sovOutportBlock(uint64(mapEntrySize)) - } - } if len(m.NotarizedHeadersHashes) > 0 { for _, s := range m.NotarizedHeadersHashes { l = len(s) @@ -3552,6 +3540,19 @@ func (m *OutportBlock) Size() (n int) { if l > 0 { n += 1 + l + sovOutportBlock(uint64(l)) } + if len(m.StateChanges) > 0 { + for k, v := range m.StateChanges { + _ = k + _ = v + l = 0 + if v != nil { + l = v.Size() + l += 1 + sovOutportBlock(uint64(l)) + } + mapEntrySize := 1 + len(k) + sovOutportBlock(uint64(len(k))) + l + n += mapEntrySize + 1 + sovOutportBlock(uint64(mapEntrySize)) + } + } return n } @@ -4018,12 +4019,12 @@ func (this *OutportBlock) String() string { `TransactionPool:` + strings.Replace(this.TransactionPool.String(), "TransactionPool", "TransactionPool", 1) + `,`, `HeaderGasConsumption:` + strings.Replace(this.HeaderGasConsumption.String(), "HeaderGasConsumption", "HeaderGasConsumption", 1) + `,`, `AlteredAccounts:` + mapStringForAlteredAccounts + `,`, - `StateChanges:` + mapStringForStateChanges + `,`, `NotarizedHeadersHashes:` + fmt.Sprintf("%v", this.NotarizedHeadersHashes) + `,`, `NumberOfShards:` + fmt.Sprintf("%v", this.NumberOfShards) + `,`, `SignersIndexes:` + fmt.Sprintf("%v", this.SignersIndexes) + `,`, `HighestFinalBlockNonce:` + fmt.Sprintf("%v", this.HighestFinalBlockNonce) + `,`, `HighestFinalBlockHash:` + fmt.Sprintf("%v", this.HighestFinalBlockHash) + `,`, + `StateChanges:` + mapStringForStateChanges + `,`, `}`, }, "") return s @@ -4619,135 +4620,6 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { m.AlteredAccounts[mapkey] = mapvalue iNdEx = postIndex case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field StateChanges", 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 - } - if m.StateChanges == nil { - m.StateChanges = make(map[string]*stateChange.StateChanges) - } - var mapkey string - var mapvalue *stateChange.StateChanges - for iNdEx < postIndex { - entryPreIndex := 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) - if fieldNum == 1 { - var stringLenmapkey uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOutportBlock - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapkey |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapkey := int(stringLenmapkey) - if intStringLenmapkey < 0 { - return ErrInvalidLengthOutportBlock - } - postStringIndexmapkey := iNdEx + intStringLenmapkey - if postStringIndexmapkey < 0 { - return ErrInvalidLengthOutportBlock - } - if postStringIndexmapkey > l { - return io.ErrUnexpectedEOF - } - mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) - iNdEx = postStringIndexmapkey - } else if fieldNum == 2 { - var mapmsglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowOutportBlock - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - mapmsglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if mapmsglen < 0 { - return ErrInvalidLengthOutportBlock - } - postmsgIndex := iNdEx + mapmsglen - if postmsgIndex < 0 { - return ErrInvalidLengthOutportBlock - } - if postmsgIndex > l { - return io.ErrUnexpectedEOF - } - mapvalue = &stateChange.StateChanges{} - if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil { - return err - } - iNdEx = postmsgIndex - } else { - iNdEx = entryPreIndex - skippy, err := skipOutportBlock(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthOutportBlock - } - if (iNdEx + skippy) > postIndex { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - m.StateChanges[mapkey] = mapvalue - iNdEx = postIndex - case 7: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field NotarizedHeadersHashes", wireType) } @@ -4779,7 +4651,7 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { } m.NotarizedHeadersHashes = append(m.NotarizedHeadersHashes, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex - case 8: + case 7: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field NumberOfShards", wireType) } @@ -4798,7 +4670,7 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { break } } - case 9: + case 8: if wireType == 0 { var v uint64 for shift := uint(0); ; shift += 7 { @@ -4874,7 +4746,7 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { } else { return fmt.Errorf("proto: wrong wireType = %d for field SignersIndexes", wireType) } - case 10: + case 9: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field HighestFinalBlockNonce", wireType) } @@ -4893,7 +4765,7 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { break } } - case 11: + case 10: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field HighestFinalBlockHash", wireType) } @@ -4927,6 +4799,135 @@ func (m *OutportBlock) Unmarshal(dAtA []byte) error { m.HighestFinalBlockHash = []byte{} } iNdEx = postIndex + case 11: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field StateChanges", 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 + } + if m.StateChanges == nil { + m.StateChanges = make(map[string]*stateChange.StateChanges) + } + var mapkey string + var mapvalue *stateChange.StateChanges + for iNdEx < postIndex { + entryPreIndex := 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) + if fieldNum == 1 { + var stringLenmapkey uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOutportBlock + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLenmapkey |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLenmapkey := int(stringLenmapkey) + if intStringLenmapkey < 0 { + return ErrInvalidLengthOutportBlock + } + postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthOutportBlock + } + if postStringIndexmapkey > l { + return io.ErrUnexpectedEOF + } + mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) + iNdEx = postStringIndexmapkey + } else if fieldNum == 2 { + var mapmsglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowOutportBlock + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + mapmsglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if mapmsglen < 0 { + return ErrInvalidLengthOutportBlock + } + postmsgIndex := iNdEx + mapmsglen + if postmsgIndex < 0 { + return ErrInvalidLengthOutportBlock + } + if postmsgIndex > l { + return io.ErrUnexpectedEOF + } + mapvalue = &stateChange.StateChanges{} + if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil { + return err + } + iNdEx = postmsgIndex + } else { + iNdEx = entryPreIndex + skippy, err := skipOutportBlock(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthOutportBlock + } + if (iNdEx + skippy) > postIndex { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + m.StateChanges[mapkey] = mapvalue + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipOutportBlock(dAtA[iNdEx:]) diff --git a/data/outport/outportBlock.proto b/data/outport/outportBlock.proto index c398ceba..69a00ad3 100644 --- a/data/outport/outportBlock.proto +++ b/data/outport/outportBlock.proto @@ -21,12 +21,12 @@ message OutportBlock { TransactionPool TransactionPool = 3 [(gogoproto.jsontag) = "transactionPool,omitempty"]; HeaderGasConsumption HeaderGasConsumption = 4 [(gogoproto.jsontag) = "headerGasConsumption,omitempty"]; map AlteredAccounts = 5 [(gogoproto.jsontag) = "alteredAccounts,omitempty"]; - map StateChanges = 6 [(gogoproto.jsontag) = "stateChanges,omitempty"]; - repeated string NotarizedHeadersHashes = 7 [(gogoproto.jsontag) = "notarizedHeadersHashes,omitempty"]; - uint32 NumberOfShards = 8 [(gogoproto.jsontag) = "numberOfShards"]; - repeated uint64 SignersIndexes = 9 [(gogoproto.jsontag) = "signersIndexes,omitempty"]; - uint64 HighestFinalBlockNonce = 10 [(gogoproto.jsontag) = "highestFinalBlockNonce"]; - bytes HighestFinalBlockHash = 11 [(gogoproto.jsontag) = "highestFinalBlockHash,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"]; + map StateChanges = 11 [(gogoproto.jsontag) = "stateChanges,omitempty"]; } message BlockData { diff --git a/data/stateChange/stateChange.proto b/data/stateChange/stateChange.proto index e7b48ddc..32ada30c 100644 --- a/data/stateChange/stateChange.proto +++ b/data/stateChange/stateChange.proto @@ -38,4 +38,4 @@ message DataAnalysisStateChange { bool OwnerAddress = 8 [(gogoproto.jsontag) = "ownerAddressChanged"]; bool UserName = 9 [(gogoproto.jsontag) = "userNameChanged"]; bool CodeMetadata = 10 [(gogoproto.jsontag) = "codeMetadataChanged"]; -} \ No newline at end of file +} From b9e28fbed67c14dcd4fea18f62454ded306e0fa3 Mon Sep 17 00:00:00 2001 From: Alexander Cristurean Date: Wed, 18 Sep 2024 12:33:35 +0300 Subject: [PATCH 14/14] added missing tags. --- data/stateChange/stateChange.pb.go | 97 +++++++++++++++--------------- data/stateChange/stateChange.proto | 12 ++-- 2 files changed, 55 insertions(+), 54 deletions(-) diff --git a/data/stateChange/stateChange.pb.go b/data/stateChange/stateChange.pb.go index 8b2e6b69..a32608d2 100644 --- a/data/stateChange/stateChange.pb.go +++ b/data/stateChange/stateChange.pb.go @@ -67,10 +67,10 @@ func (m *StateChanges) GetStateChanges() []*StateChange { type StateChange struct { Type string `protobuf:"bytes,1,opt,name=Type,proto3" json:"type"` - Index int32 `protobuf:"varint,2,opt,name=Index,proto3" json:"-"` - TxHash []byte `protobuf:"bytes,3,opt,name=TxHash,proto3" json:"-"` - MainTrieKey []byte `protobuf:"bytes,4,opt,name=MainTrieKey,proto3" json:"-"` - MainTrieVal []byte `protobuf:"bytes,5,opt,name=MainTrieVal,proto3" json:"-"` + Index int32 `protobuf:"varint,2,opt,name=Index,proto3" json:"index"` + TxHash []byte `protobuf:"bytes,3,opt,name=TxHash,proto3" json:"txHash"` + MainTrieKey []byte `protobuf:"bytes,4,opt,name=MainTrieKey,proto3" json:"mainTrieKey"` + MainTrieVal []byte `protobuf:"bytes,5,opt,name=MainTrieVal,proto3" json:"mainTrieVal"` Operation string `protobuf:"bytes,6,opt,name=Operation,proto3" json:"operation"` DataTrieChanges []*DataTrieChange `protobuf:"bytes,7,rep,name=DataTrieChanges,proto3" json:"dataTrieChanges,omitempty"` } @@ -154,8 +154,8 @@ func (m *StateChange) GetDataTrieChanges() []*DataTrieChange { type DataTrieChange struct { Type string `protobuf:"bytes,1,opt,name=Type,proto3" json:"type"` - Key []byte `protobuf:"bytes,2,opt,name=Key,proto3" json:"type"` - Val []byte `protobuf:"bytes,3,opt,name=Val,proto3" json:"type"` + Key []byte `protobuf:"bytes,2,opt,name=Key,proto3" json:"key"` + Val []byte `protobuf:"bytes,3,opt,name=Val,proto3" json:"val"` } func (m *DataTrieChange) Reset() { *m = DataTrieChange{} } @@ -328,48 +328,49 @@ func init() { func init() { proto.RegisterFile("stateChange.proto", fileDescriptor_8e577663eebb0888) } var fileDescriptor_8e577663eebb0888 = []byte{ - // 641 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xcf, 0x6e, 0xd3, 0x3e, - 0x1c, 0xaf, 0xdb, 0xa6, 0x6b, 0xdd, 0xfe, 0xd6, 0x1f, 0x9e, 0x60, 0x61, 0x30, 0xa7, 0xea, 0x01, - 0x2a, 0xb1, 0xae, 0x12, 0x1c, 0x77, 0x5a, 0x37, 0xa4, 0x21, 0xb4, 0x4d, 0x0a, 0x63, 0x42, 0x1c, - 0x90, 0xdc, 0xc6, 0x6b, 0x23, 0x25, 0x71, 0x95, 0xb8, 0x5b, 0x7b, 0x40, 0xe2, 0x11, 0x78, 0x0c, - 0x9e, 0x80, 0x47, 0x40, 0x1c, 0x77, 0xdc, 0x29, 0x62, 0xd9, 0x05, 0xe5, 0xb4, 0x47, 0x40, 0x76, - 0x9a, 0xc6, 0x99, 0x26, 0xed, 0xd4, 0xf8, 0xf3, 0xc7, 0xdf, 0x3f, 0xfe, 0xa8, 0xf0, 0x51, 0xc0, - 0x09, 0xa7, 0x7b, 0x63, 0xe2, 0x8d, 0xe8, 0xf6, 0xc4, 0x67, 0x9c, 0x21, 0x4d, 0xfe, 0x6c, 0x74, - 0x47, 0x36, 0x1f, 0x4f, 0x07, 0xdb, 0x43, 0xe6, 0xf6, 0x46, 0x6c, 0xc4, 0x7a, 0x12, 0x1e, 0x4c, - 0xcf, 0xe4, 0x49, 0x1e, 0xe4, 0x57, 0xe2, 0x6a, 0x7f, 0x82, 0x8d, 0x0f, 0xd9, 0x55, 0x01, 0x3a, - 0xc8, 0x9f, 0x75, 0xd0, 0x2a, 0x75, 0xea, 0xaf, 0x51, 0xa2, 0xde, 0x56, 0xa8, 0xfe, 0xff, 0x71, - 0x68, 0x34, 0x94, 0x36, 0x02, 0x33, 0xe7, 0x6c, 0xff, 0x2a, 0xc2, 0xba, 0x02, 0xa0, 0xe7, 0xb0, - 0x7c, 0x32, 0x9f, 0x50, 0x1d, 0xb4, 0x40, 0xa7, 0xd6, 0xaf, 0xc6, 0xa1, 0x51, 0xe6, 0xf3, 0x09, - 0x35, 0x25, 0x8a, 0x9e, 0x41, 0xed, 0x9d, 0x67, 0xd1, 0x99, 0x5e, 0x6c, 0x81, 0x8e, 0xd6, 0xd7, - 0xe2, 0xd0, 0x00, 0x5d, 0x33, 0xc1, 0xd0, 0x26, 0xac, 0x9c, 0xcc, 0x0e, 0x48, 0x30, 0xd6, 0x4b, - 0x2d, 0xd0, 0x69, 0xa4, 0xec, 0x02, 0x44, 0x2f, 0x61, 0xfd, 0x90, 0xd8, 0xde, 0x89, 0x6f, 0xd3, - 0xf7, 0x74, 0xae, 0x97, 0x55, 0x8d, 0xca, 0xa8, 0xc2, 0x53, 0xe2, 0xe8, 0xda, 0xbd, 0xc2, 0x53, - 0xe2, 0xa0, 0x57, 0xb0, 0x76, 0x3c, 0xa1, 0x3e, 0xe1, 0x36, 0xf3, 0xf4, 0x8a, 0x6c, 0xf8, 0xbf, - 0x38, 0x34, 0x6a, 0x2c, 0x05, 0xcd, 0x8c, 0x47, 0x5f, 0x60, 0x73, 0x9f, 0x70, 0x22, 0xbc, 0xe9, - 0xd6, 0x56, 0xe4, 0xd6, 0x1e, 0x2f, 0xb6, 0x96, 0x67, 0xfb, 0x9b, 0x71, 0x68, 0x3c, 0xb5, 0xf2, - 0x8e, 0x2d, 0xe6, 0xda, 0x9c, 0xba, 0x13, 0x3e, 0x37, 0xef, 0x5e, 0xd6, 0x3e, 0x83, 0xab, 0x79, - 0xe8, 0x81, 0x55, 0x6e, 0xc0, 0x92, 0x58, 0x43, 0x51, 0x4e, 0x97, 0x91, 0x02, 0x14, 0x9c, 0x98, - 0xbc, 0x74, 0x97, 0x3b, 0x25, 0x4e, 0xfb, 0x67, 0x19, 0xae, 0x8b, 0x42, 0xbb, 0x1e, 0x71, 0xe6, - 0x81, 0x1d, 0xa8, 0x8f, 0xf7, 0x36, 0xf7, 0x96, 0xb2, 0xf0, 0xfd, 0xa9, 0x68, 0xc6, 0xa1, 0x51, - 0x57, 0x52, 0x61, 0xe6, 0x32, 0x90, 0xdb, 0x6b, 0xf1, 0x81, 0xbd, 0xbe, 0x80, 0xda, 0x11, 0xf3, - 0x86, 0x54, 0x76, 0x5b, 0x4d, 0xf2, 0xe6, 0x09, 0x20, 0xb9, 0xcc, 0x32, 0x13, 0x1a, 0x6d, 0xc1, - 0x95, 0x3e, 0x71, 0x88, 0x50, 0x96, 0xa5, 0x12, 0xc5, 0xa1, 0xb1, 0x3a, 0x48, 0xa0, 0x54, 0x9b, - 0x4a, 0x50, 0x0f, 0x56, 0xf7, 0x98, 0x45, 0x65, 0x9a, 0x34, 0x29, 0x5f, 0x8b, 0x43, 0xa3, 0x39, - 0x5c, 0x60, 0xa9, 0x7e, 0x29, 0x12, 0x06, 0x93, 0x31, 0x2e, 0x0d, 0x95, 0xcc, 0xe0, 0x2f, 0xb0, - 0xa5, 0x21, 0x15, 0xa1, 0x7d, 0xd8, 0xdc, 0xa7, 0xe7, 0xd4, 0x11, 0x43, 0x99, 0xf4, 0x82, 0xf8, - 0x96, 0xbe, 0x22, 0x7d, 0x1b, 0x71, 0x68, 0x3c, 0xb1, 0xf2, 0x54, 0x6a, 0xbf, 0x6b, 0x41, 0x3b, - 0xb0, 0x71, 0x7c, 0xe1, 0x51, 0x7f, 0xd7, 0xb2, 0x7c, 0x1a, 0x04, 0x7a, 0x55, 0x5e, 0xb1, 0x1e, - 0x87, 0xc6, 0x1a, 0x53, 0xf0, 0xd4, 0x9f, 0x13, 0x8b, 0x9e, 0x3f, 0x06, 0xd4, 0x3f, 0x22, 0x2e, - 0xd5, 0x6b, 0x59, 0xcf, 0xd3, 0x05, 0xb6, 0xec, 0x39, 0x15, 0x89, 0x6a, 0x62, 0xe0, 0x43, 0xca, - 0x89, 0x48, 0xa6, 0x0e, 0xb3, 0x6a, 0x43, 0x05, 0x5f, 0x56, 0x53, 0xc5, 0xfd, 0xaf, 0x97, 0xd7, - 0xb8, 0x70, 0x75, 0x8d, 0x0b, 0xb7, 0xd7, 0x18, 0x7c, 0x8b, 0x30, 0xf8, 0x11, 0x61, 0xf0, 0x3b, - 0xc2, 0xe0, 0x32, 0xc2, 0xe0, 0x2a, 0xc2, 0xe0, 0x4f, 0x84, 0xc1, 0xdf, 0x08, 0x17, 0x6e, 0x23, - 0x0c, 0xbe, 0xdf, 0xe0, 0xc2, 0xe5, 0x0d, 0x2e, 0x5c, 0xdd, 0xe0, 0xc2, 0xe7, 0x3d, 0xe5, 0xcf, - 0xca, 0x9d, 0x3a, 0xdc, 0x3e, 0xa7, 0x7e, 0x30, 0xeb, 0xb9, 0xb3, 0xee, 0x70, 0x4c, 0x6c, 0xaf, - 0x3b, 0x64, 0x3e, 0xed, 0x8e, 0x58, 0x4f, 0x94, 0xe9, 0x29, 0xa9, 0xda, 0x51, 0xbe, 0x07, 0x15, - 0x99, 0xc2, 0x37, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x5e, 0x8f, 0x5c, 0xcc, 0x14, 0x05, 0x00, - 0x00, + // 664 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0xcf, 0x6e, 0xd3, 0x4c, + 0x14, 0xc5, 0xe3, 0x24, 0xce, 0x9f, 0x49, 0xbe, 0xe6, 0x63, 0x2a, 0xa8, 0x5b, 0xc1, 0x38, 0xca, + 0x02, 0x45, 0xa2, 0x69, 0x04, 0x2c, 0xbb, 0xaa, 0x5b, 0xa4, 0x22, 0xd4, 0x56, 0x1a, 0x4a, 0x85, + 0x58, 0x20, 0x4d, 0xe2, 0x21, 0xb1, 0xb0, 0x3d, 0x91, 0xed, 0xb4, 0xc9, 0x02, 0x89, 0x47, 0xe0, + 0x31, 0x78, 0x02, 0x9e, 0x81, 0x65, 0x97, 0x5d, 0x59, 0xc4, 0xd9, 0x20, 0xaf, 0xfa, 0x08, 0x68, + 0xc6, 0x71, 0x3c, 0x2e, 0x48, 0x5d, 0xc5, 0xfe, 0xdd, 0x73, 0xe6, 0xde, 0x39, 0xbe, 0x0a, 0x78, + 0xe0, 0x07, 0x24, 0xa0, 0x87, 0x63, 0xe2, 0x8e, 0xe8, 0xde, 0xc4, 0x63, 0x01, 0x83, 0xaa, 0xf8, + 0xd9, 0xe9, 0x8d, 0xac, 0x60, 0x3c, 0x1d, 0xec, 0x0d, 0x99, 0xd3, 0x1f, 0xb1, 0x11, 0xeb, 0x0b, + 0x3c, 0x98, 0x7e, 0x12, 0x6f, 0xe2, 0x45, 0x3c, 0x25, 0xae, 0xce, 0x7b, 0xd0, 0x7c, 0x9b, 0x1d, + 0xe5, 0xc3, 0xe3, 0xfc, 0xbb, 0xa6, 0xb4, 0x4b, 0xdd, 0xc6, 0x0b, 0x98, 0xa8, 0xf7, 0xa4, 0x92, + 0xf1, 0x7f, 0x1c, 0xea, 0x4d, 0x69, 0x0c, 0x1f, 0xe7, 0x9c, 0x9d, 0x65, 0x11, 0x34, 0x24, 0x00, + 0x1f, 0x83, 0xf2, 0xf9, 0x7c, 0x42, 0x35, 0xa5, 0xad, 0x74, 0xeb, 0x46, 0x2d, 0x0e, 0xf5, 0x72, + 0x30, 0x9f, 0x50, 0x2c, 0x28, 0xd4, 0x81, 0xfa, 0xda, 0x35, 0xe9, 0x4c, 0x2b, 0xb6, 0x95, 0xae, + 0x6a, 0xd4, 0xe3, 0x50, 0x57, 0x2d, 0x0e, 0x70, 0xc2, 0x61, 0x07, 0x54, 0xce, 0x67, 0xc7, 0xc4, + 0x1f, 0x6b, 0xa5, 0xb6, 0xd2, 0x6d, 0x1a, 0x20, 0x0e, 0xf5, 0x4a, 0x20, 0x08, 0x5e, 0x55, 0xe0, + 0x73, 0xd0, 0x38, 0x21, 0x96, 0x7b, 0xee, 0x59, 0xf4, 0x0d, 0x9d, 0x6b, 0x65, 0x21, 0x6c, 0xc5, + 0xa1, 0xde, 0x70, 0x32, 0x8c, 0x65, 0x8d, 0x6c, 0xb9, 0x20, 0xb6, 0xa6, 0xfe, 0x6d, 0xb9, 0x20, + 0x36, 0x96, 0x35, 0xf0, 0x19, 0xa8, 0x9f, 0x4d, 0xa8, 0x47, 0x02, 0x8b, 0xb9, 0x5a, 0x45, 0xdc, + 0xe6, 0xbf, 0x38, 0xd4, 0xeb, 0x2c, 0x85, 0x38, 0xab, 0xc3, 0x8f, 0xa0, 0x75, 0x44, 0x02, 0xc2, + 0xbd, 0x69, 0xa4, 0x55, 0x11, 0xe9, 0xc3, 0x55, 0xa4, 0xf9, 0xaa, 0xf1, 0x24, 0x0e, 0xf5, 0x6d, + 0x33, 0xef, 0xd8, 0x65, 0x8e, 0x15, 0x50, 0x67, 0x12, 0xcc, 0xf1, 0xdd, 0xc3, 0x3a, 0x26, 0xd8, + 0xc8, 0xa3, 0x7b, 0x72, 0xde, 0x06, 0x25, 0x1e, 0x4d, 0x51, 0xdc, 0xb3, 0x1a, 0x87, 0x7a, 0xe9, + 0x33, 0x9d, 0x63, 0xce, 0x78, 0x89, 0x47, 0x50, 0xca, 0x4a, 0x97, 0xc4, 0xc6, 0x9c, 0x75, 0x7e, + 0x94, 0xc1, 0x16, 0x6f, 0x73, 0xe0, 0x12, 0x7b, 0xee, 0x5b, 0xbe, 0xfc, 0x5d, 0x5f, 0xe5, 0x3e, + 0xb3, 0x68, 0xfb, 0xef, 0x85, 0x11, 0xa9, 0x4a, 0x0b, 0x83, 0x73, 0xeb, 0x91, 0x4b, 0xb5, 0x78, + 0x4f, 0xaa, 0x4f, 0x81, 0x7a, 0xca, 0xdc, 0x21, 0x15, 0xc3, 0xd6, 0x92, 0x55, 0x74, 0x39, 0x48, + 0x0e, 0x33, 0x71, 0x52, 0x86, 0xbb, 0xa0, 0x6a, 0x10, 0x9b, 0x70, 0x65, 0x59, 0x28, 0x61, 0x1c, + 0xea, 0x1b, 0x83, 0x04, 0xa5, 0xda, 0x54, 0x02, 0xfb, 0xa0, 0x76, 0xc8, 0x4c, 0x2a, 0x96, 0x4c, + 0x15, 0xf2, 0xcd, 0x38, 0xd4, 0x5b, 0xc3, 0x15, 0x4b, 0xf5, 0x6b, 0x11, 0x37, 0x60, 0xc6, 0x02, + 0x61, 0xa8, 0x64, 0x06, 0x6f, 0xc5, 0xd6, 0x86, 0x54, 0x04, 0x8f, 0x40, 0xeb, 0x88, 0x5e, 0x52, + 0x9b, 0x5f, 0x0a, 0xd3, 0x2b, 0xe2, 0x99, 0x5a, 0x55, 0xf8, 0x76, 0xe2, 0x50, 0x7f, 0x64, 0xe6, + 0x4b, 0xa9, 0xfd, 0xae, 0x05, 0xee, 0x83, 0xe6, 0xd9, 0x95, 0x4b, 0xbd, 0x03, 0xd3, 0xf4, 0xa8, + 0xef, 0x6b, 0x35, 0x71, 0xc4, 0x56, 0x1c, 0xea, 0x9b, 0x4c, 0xe2, 0xa9, 0x3f, 0x27, 0xe6, 0x33, + 0xbf, 0xf3, 0xa9, 0x77, 0x4a, 0x1c, 0xaa, 0xd5, 0xb3, 0x99, 0xa7, 0x2b, 0xb6, 0x9e, 0x39, 0x15, + 0xf1, 0x6e, 0xfc, 0xc2, 0x27, 0x34, 0x20, 0x7c, 0x2f, 0x35, 0x90, 0x75, 0x1b, 0x4a, 0x7c, 0xdd, + 0x4d, 0x16, 0x1b, 0x5f, 0xae, 0x17, 0xa8, 0x70, 0xb3, 0x40, 0x85, 0xdb, 0x05, 0x52, 0xbe, 0x46, + 0x48, 0xf9, 0x1e, 0x21, 0xe5, 0x67, 0x84, 0x94, 0xeb, 0x08, 0x29, 0x37, 0x11, 0x52, 0x7e, 0x45, + 0x48, 0xf9, 0x1d, 0xa1, 0xc2, 0x6d, 0x84, 0x94, 0x6f, 0x4b, 0x54, 0xb8, 0x5e, 0xa2, 0xc2, 0xcd, + 0x12, 0x15, 0x3e, 0x1c, 0x4a, 0xff, 0x63, 0xce, 0xd4, 0x0e, 0xac, 0x4b, 0xea, 0xf9, 0xb3, 0xbe, + 0x33, 0xeb, 0x0d, 0xc7, 0xc4, 0x72, 0x7b, 0x43, 0xe6, 0xd1, 0xde, 0x88, 0xf5, 0x79, 0x9b, 0xbe, + 0xb4, 0x55, 0xfb, 0xd2, 0xf3, 0xa0, 0x22, 0xb6, 0xf0, 0xe5, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x5b, 0x6a, 0xb7, 0x74, 0x2f, 0x05, 0x00, 0x00, } func (this *StateChanges) Equal(that interface{}) bool { diff --git a/data/stateChange/stateChange.proto b/data/stateChange/stateChange.proto index 32ada30c..243d6cd6 100644 --- a/data/stateChange/stateChange.proto +++ b/data/stateChange/stateChange.proto @@ -13,18 +13,18 @@ message StateChanges { message StateChange { string Type = 1 [(gogoproto.jsontag) = "type"]; - int32 Index = 2 [(gogoproto.jsontag) = "-"]; - bytes TxHash = 3 [(gogoproto.jsontag) = "-"]; - bytes MainTrieKey = 4 [(gogoproto.jsontag) = "-"]; - bytes MainTrieVal = 5 [(gogoproto.jsontag) = "-"]; + int32 Index = 2 [(gogoproto.jsontag) = "index"]; + bytes TxHash = 3 [(gogoproto.jsontag) = "txHash"]; + bytes MainTrieKey = 4 [(gogoproto.jsontag) = "mainTrieKey"]; + bytes MainTrieVal = 5 [(gogoproto.jsontag) = "mainTrieVal"]; string Operation = 6 [(gogoproto.jsontag) = "operation"]; repeated DataTrieChange DataTrieChanges = 7 [(gogoproto.jsontag) = "dataTrieChanges,omitempty"]; } message DataTrieChange { string Type = 1 [(gogoproto.jsontag) = "type"]; - bytes Key = 2 [(gogoproto.jsontag) = "type"]; - bytes Val = 3 [(gogoproto.jsontag) = "type"]; + bytes Key = 2 [(gogoproto.jsontag) = "key"]; + bytes Val = 3 [(gogoproto.jsontag) = "val"]; } message DataAnalysisStateChange {