diff --git a/core/block/service.go b/core/block/service.go index 9853f87e7..ab488623e 100644 --- a/core/block/service.go +++ b/core/block/service.go @@ -245,13 +245,13 @@ func (s *service) Run() (err error) { func (s *service) initPredefinedBlocks() { ids := []string{ - s.anytype.PredefinedBlocks().Account, - s.anytype.PredefinedBlocks().Archive, + // skip account because it is not a smartblock, it's a threadsDB s.anytype.PredefinedBlocks().Profile, + s.anytype.PredefinedBlocks().Archive, s.anytype.PredefinedBlocks().Home, + s.anytype.PredefinedBlocks().SetPages, s.anytype.PredefinedBlocks().MarketplaceType, s.anytype.PredefinedBlocks().MarketplaceRelation, - s.anytype.PredefinedBlocks().SetPages, } for _, id := range ids { sb, err := s.createSmartBlock(id, &smartblock.InitContext{State: &state.State{}}) diff --git a/docs/proto.md b/docs/proto.md index 3ef9c9b34..af2376f56 100644 --- a/docs/proto.md +++ b/docs/proto.md @@ -12190,6 +12190,7 @@ Precondition: user A and user B opened the same block | File | 7 | | | MarketplaceType | 8 | | | MarketplaceRelation | 9 | | +| Relation | 10 | | @@ -12340,6 +12341,9 @@ Precondition: user A and user B opened the same block | ProfilePage | 2 | | | Archive | 3 | | | Set | 5 | | +| File | 6 | | +| ObjectType | 7 | | +| Relation | 8 | | @@ -13111,8 +13115,10 @@ Relation describe the human-interpreted relation type. It may be something like default dictionary with unique values to choose for select/multiSelect format | | maxCount | [int32](#int32) | | max number of values can be set for this relation. 0 means no limit. 1 means the value can be stored in non-repeated field | | description | [string](#string) | | | -| scope | [Relation.Scope](#anytype.relation.Relation.Scope) | | on-store should be only local | -| creator | [string](#string) | | on-store should be only local | +| scope | [Relation.Scope](#anytype.relation.Relation.Scope) | | on-store fields, injected only locally + +scope from which this relation have been aggregated | +| creator | [string](#string) | | creator profile id | diff --git a/package.json b/package.json index bb702b0d9..cf1415ff2 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,9 @@ "build:protos": "webpack -o ./build/web/commands-web.js ./build/web/pb/protos/service/service_grpc_web_pb.js" }, "dependencies": { - "protobufjs": "^6.8.8", "google-protobuf": "^3.6.1", - "grpc-web": "latest" + "grpc-web": "latest", + "protobufjs": "^6.8.8" }, "devDependencies": { "webpack": "^4.16.5", diff --git a/pb/events.pb.go b/pb/events.pb.go index 31bd4fe30..196b10d53 100644 --- a/pb/events.pb.go +++ b/pb/events.pb.go @@ -38,19 +38,21 @@ const ( SmartBlockType_File SmartBlockType = 7 SmartBlockType_MarketplaceType SmartBlockType = 8 SmartBlockType_MarketplaceRelation SmartBlockType = 9 + SmartBlockType_Relation SmartBlockType = 10 ) var SmartBlockType_name = map[int32]string{ - 0: "Page", - 1: "Home", - 2: "ProfilePage", - 3: "Archive", - 4: "Breadcrumbs", - 5: "Set", - 6: "ObjectType", - 7: "File", - 8: "MarketplaceType", - 9: "MarketplaceRelation", + 0: "Page", + 1: "Home", + 2: "ProfilePage", + 3: "Archive", + 4: "Breadcrumbs", + 5: "Set", + 6: "ObjectType", + 7: "File", + 8: "MarketplaceType", + 9: "MarketplaceRelation", + 10: "Relation", } var SmartBlockType_value = map[string]int32{ @@ -64,6 +66,7 @@ var SmartBlockType_value = map[string]int32{ "File": 7, "MarketplaceType": 8, "MarketplaceRelation": 9, + "Relation": 10, } func (x SmartBlockType) String() string { @@ -6847,221 +6850,221 @@ func init() { func init() { proto.RegisterFile("pb/protos/events.proto", fileDescriptor_a966342d378ae5f5) } var fileDescriptor_a966342d378ae5f5 = []byte{ - // 3413 bytes of a gzipped FileDescriptorProto + // 3417 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0xcb, 0x6f, 0xdc, 0xc6, 0x19, 0xdf, 0x07, 0xf7, 0xf5, 0xad, 0x25, 0x6d, 0xc6, 0xae, 0xcd, 0xd2, 0x8a, 0xec, 0xc8, 0x8f, 0x38, 0xb1, 0xbd, 0x4e, 0x9d, 0xc4, 0x72, 0x9c, 0xd8, 0x8e, 0x2c, 0xd9, 0x58, 0xc5, 0x2f, 0x65, 0xd6, 0x4a, 0x8a, 0xb4, 0x40, 0x41, 0x2d, 0x67, 0x57, 0x8c, 0xb8, 0xe4, 0x82, 0xe4, 0xca, 0x56, - 0x8a, 0x9e, 0x7a, 0x68, 0x11, 0xa0, 0x45, 0x51, 0x14, 0xed, 0xb1, 0x87, 0xb6, 0x28, 0x7a, 0xe9, - 0xa5, 0x08, 0xd0, 0x7f, 0xa0, 0x40, 0x7b, 0xcb, 0xa1, 0x87, 0x1c, 0x03, 0xe7, 0xd2, 0x6b, 0xff, - 0x80, 0x00, 0xc5, 0x3c, 0x48, 0x0e, 0xb9, 0xe4, 0x72, 0x95, 0x26, 0x40, 0x8b, 0xe4, 0xb6, 0x33, - 0xf3, 0xfd, 0x7e, 0xf3, 0xfa, 0xe6, 0x9b, 0xdf, 0x0c, 0x67, 0xe1, 0xe8, 0x68, 0xfb, 0xd2, 0xc8, - 0x75, 0x7c, 0xc7, 0xbb, 0x44, 0xf6, 0x88, 0xed, 0x7b, 0x6d, 0x96, 0x42, 0x35, 0xdd, 0xde, 0xf7, - 0xf7, 0x47, 0x44, 0x3b, 0x3d, 0xda, 0x1d, 0x5c, 0xb2, 0xcc, 0xed, 0x4b, 0xa3, 0xed, 0x4b, 0x43, - 0xc7, 0x20, 0x56, 0x60, 0xce, 0x12, 0xc2, 0x5c, 0x7b, 0x41, 0xb2, 0x72, 0x89, 0xa5, 0xfb, 0xa6, - 0x63, 0x07, 0x86, 0x41, 0x5a, 0x98, 0x2e, 0x0e, 0x1c, 0x67, 0x60, 0x11, 0x5e, 0xba, 0x3d, 0xee, - 0x5f, 0xf2, 0x7c, 0x77, 0xdc, 0xf3, 0x79, 0xe9, 0xf2, 0x3f, 0x09, 0x54, 0x6e, 0xd3, 0x86, 0xa0, - 0xcb, 0x50, 0x1f, 0x12, 0xcf, 0xd3, 0x07, 0xc4, 0x53, 0x8b, 0x27, 0xcb, 0xe7, 0x9a, 0x97, 0x8f, - 0xb6, 0x45, 0xa3, 0xda, 0xcc, 0xa2, 0x7d, 0x9f, 0x17, 0xe3, 0xd0, 0x0e, 0x2d, 0x42, 0xa3, 0xe7, - 0xd8, 0x3e, 0x79, 0xe2, 0x6f, 0x18, 0x6a, 0xe9, 0x64, 0xf1, 0x5c, 0x03, 0x47, 0x19, 0xe8, 0x15, - 0x68, 0x98, 0xb6, 0xe9, 0x9b, 0xba, 0xef, 0xb8, 0x6a, 0xf9, 0x64, 0x31, 0x46, 0xc9, 0xba, 0xd3, - 0x5e, 0xed, 0xf5, 0x9c, 0xb1, 0xed, 0xe3, 0xc8, 0x50, 0xfb, 0x50, 0x85, 0x9a, 0xa8, 0x09, 0xdd, - 0x84, 0xa6, 0xce, 0x2d, 0xba, 0x3b, 0xce, 0x63, 0xb5, 0xc8, 0x38, 0x8e, 0x27, 0x9a, 0x25, 0x38, - 0xda, 0xd4, 0xa4, 0x53, 0xc0, 0x32, 0x02, 0x6d, 0xc0, 0xbc, 0x48, 0xae, 0x13, 0x5f, 0x37, 0x2d, - 0x4f, 0xfd, 0x07, 0x27, 0x59, 0xca, 0x20, 0x11, 0x66, 0x9d, 0x02, 0x4e, 0x00, 0xd1, 0x3d, 0x58, - 0xd8, 0xb6, 0x9c, 0xde, 0x6e, 0x97, 0x84, 0x5c, 0x2d, 0x46, 0x75, 0x32, 0x41, 0x75, 0x8b, 0x5a, - 0xb5, 0xbb, 0x44, 0x26, 0x4b, 0x42, 0x11, 0x86, 0x67, 0x82, 0x2c, 0x2c, 0xe6, 0xcb, 0x53, 0x8f, - 0x32, 0xbe, 0xe5, 0x4c, 0xbe, 0xd0, 0xb2, 0x53, 0xc0, 0x93, 0x70, 0xf4, 0x3d, 0x38, 0x12, 0x65, - 0x7a, 0xbe, 0x6b, 0xf6, 0x38, 0x6d, 0x9d, 0xd1, 0x9e, 0x99, 0x42, 0x1b, 0x19, 0x77, 0x0a, 0x38, - 0x95, 0x04, 0xbd, 0x06, 0x0d, 0x9e, 0x4f, 0x27, 0x62, 0x89, 0x31, 0x7e, 0x3b, 0x9d, 0x91, 0x4f, - 0x43, 0x64, 0x8d, 0xae, 0x40, 0x9d, 0x25, 0x56, 0x0d, 0xee, 0x24, 0xcd, 0xcb, 0x6a, 0x2a, 0x72, - 0xd5, 0x30, 0x3a, 0x05, 0x1c, 0xda, 0xd2, 0xd9, 0x67, 0xbf, 0xd7, 0x89, 0x45, 0x7c, 0x22, 0x3c, - 0xe8, 0x78, 0x2a, 0x94, 0x9b, 0xd0, 0xd9, 0x97, 0x10, 0x68, 0x1d, 0x9a, 0x7d, 0xd3, 0x22, 0xde, - 0xd6, 0xc8, 0x72, 0x74, 0x43, 0x55, 0xa6, 0x4c, 0xd7, 0x9d, 0xc8, 0x8e, 0xb2, 0x48, 0x30, 0x74, - 0x03, 0x1a, 0x43, 0xdd, 0xdd, 0xf5, 0x36, 0xec, 0xbe, 0xa3, 0x56, 0x52, 0xbd, 0x87, 0x73, 0xdc, - 0x0f, 0xac, 0x68, 0xf7, 0x43, 0x08, 0xf5, 0xc1, 0x60, 0x44, 0xef, 0x98, 0xc4, 0x32, 0x3c, 0xb5, - 0xca, 0x48, 0x4e, 0x64, 0x4e, 0x08, 0x37, 0xa3, 0x3e, 0x18, 0x07, 0xa2, 0xef, 0xc2, 0xe1, 0x20, - 0x67, 0x6d, 0xc7, 0xb4, 0x0c, 0x97, 0xd8, 0x1b, 0x86, 0xa7, 0xd6, 0x18, 0xdf, 0xe9, 0x4c, 0x3e, - 0xc9, 0xb6, 0x53, 0xc0, 0x69, 0x14, 0xc8, 0x80, 0x63, 0x41, 0xf6, 0x2d, 0xbd, 0xb7, 0x3b, 0x70, - 0x9d, 0xb1, 0x6d, 0xac, 0x39, 0x96, 0xe3, 0xaa, 0x0d, 0xc6, 0x7e, 0x2e, 0x93, 0x3d, 0x61, 0xdf, - 0x29, 0xe0, 0x2c, 0x2a, 0xb4, 0x06, 0x87, 0x82, 0xa2, 0x47, 0xe4, 0x89, 0xaf, 0x02, 0xa3, 0x7e, - 0x36, 0x93, 0x9a, 0x1a, 0x75, 0x0a, 0x38, 0x06, 0x92, 0x49, 0xe8, 0xac, 0xa9, 0xcd, 0x1c, 0x12, - 0x6a, 0x24, 0x93, 0xd0, 0xb4, 0x4c, 0x72, 0xcf, 0xb4, 0x77, 0xd5, 0xb9, 0x1c, 0x12, 0x6a, 0x24, - 0x93, 0xd0, 0x34, 0x7a, 0x08, 0xad, 0xb0, 0xa7, 0x8e, 0xb3, 0x4b, 0xa7, 0x5c, 0x9d, 0x67, 0x44, - 0xcf, 0x65, 0x8f, 0x96, 0x30, 0xec, 0x14, 0xf0, 0x04, 0x18, 0xdd, 0x81, 0xb9, 0x20, 0x6f, 0xd5, - 0x32, 0x07, 0xb6, 0xba, 0x30, 0xc5, 0xdd, 0x28, 0x1b, 0xb3, 0xea, 0x14, 0x70, 0x1c, 0x86, 0xde, - 0x14, 0x2b, 0x87, 0x06, 0x1c, 0x73, 0x4f, 0x7d, 0x86, 0xb1, 0x2c, 0x66, 0xc7, 0x29, 0x73, 0x2f, - 0x5c, 0x3a, 0x1c, 0x12, 0xfa, 0xc3, 0xba, 0xee, 0xeb, 0x7b, 0x26, 0x79, 0x8c, 0x49, 0xcf, 0x71, - 0x0d, 0xaf, 0x4b, 0x7c, 0x15, 0x4d, 0xf1, 0x87, 0xc0, 0xbc, 0x1d, 0xd9, 0x87, 0xfe, 0x30, 0x49, - 0x85, 0x86, 0xa0, 0xa5, 0x15, 0x6d, 0x8d, 0x0c, 0xdd, 0x27, 0xaa, 0xc6, 0x2a, 0x3a, 0x3f, 0x53, - 0x45, 0x1c, 0xd2, 0x29, 0xe0, 0x29, 0x84, 0x59, 0xd5, 0x6d, 0xd8, 0x1e, 0x71, 0x7d, 0xf5, 0xf8, - 0x01, 0xaa, 0xe3, 0x90, 0xac, 0xea, 0x78, 0x69, 0x56, 0x75, 0x22, 0x9c, 0x2d, 0x1e, 0xa0, 0xba, - 0x30, 0xbc, 0x4d, 0x21, 0x44, 0x3a, 0x1c, 0x8d, 0x95, 0x76, 0x9d, 0xb1, 0xdb, 0x23, 0x74, 0xc6, - 0x4e, 0xb1, 0xaa, 0x9e, 0x9f, 0x5e, 0x55, 0x68, 0xde, 0x29, 0xe0, 0x0c, 0xa2, 0x70, 0x87, 0x09, - 0x4a, 0xde, 0xa1, 0xa5, 0xc4, 0x57, 0x0f, 0x4f, 0xd9, 0x61, 0xc2, 0x0a, 0x84, 0x71, 0xb8, 0xc3, - 0x24, 0x48, 0x26, 0x5c, 0x8e, 0xe6, 0x8b, 0xb1, 0x3a, 0x32, 0x8b, 0xcb, 0x45, 0xf6, 0x13, 0x2e, - 0x17, 0x15, 0xa1, 0x11, 0x1c, 0x4f, 0x8c, 0x21, 0xdf, 0x3e, 0x45, 0x4d, 0x2a, 0xab, 0xe9, 0x42, - 0xde, 0xac, 0xc8, 0x98, 0x4e, 0x01, 0x4f, 0xa3, 0x44, 0x03, 0x50, 0x53, 0x8b, 0xe9, 0xc0, 0x1d, - 0x63, 0xd5, 0xbd, 0x30, 0x5b, 0x75, 0x7c, 0xf0, 0x32, 0xc9, 0xe4, 0x70, 0x14, 0x64, 0xab, 0xdf, - 0xca, 0x09, 0x47, 0x81, 0xa1, 0x1c, 0x8e, 0x82, 0x3c, 0x1a, 0x8e, 0xc6, 0x1e, 0x71, 0x99, 0xf5, - 0x5b, 0x8e, 0x69, 0xab, 0x27, 0x52, 0xc3, 0xd1, 0x96, 0x47, 0x5c, 0x41, 0x49, 0xad, 0x68, 0x38, - 0x8a, 0xc1, 0x62, 0x3c, 0xf7, 0x48, 0xdf, 0x57, 0x4f, 0xe6, 0xf1, 0x50, 0xab, 0x18, 0x0f, 0xcd, - 0xa0, 0xee, 0x17, 0x66, 0x74, 0x89, 0x45, 0x7a, 0x3e, 0xd6, 0xed, 0x01, 0x51, 0x9f, 0x4b, 0x75, - 0x3f, 0x89, 0x4e, 0x32, 0xa6, 0xee, 0x97, 0x46, 0x82, 0xb6, 0x00, 0x85, 0xf9, 0x74, 0x9f, 0xe1, - 0xd4, 0xcb, 0x8c, 0xfa, 0x54, 0x36, 0x75, 0x68, 0xda, 0x29, 0xe0, 0x14, 0x02, 0xf4, 0x02, 0x28, - 0x23, 0xd3, 0x1e, 0xa8, 0x06, 0x23, 0x3a, 0x9c, 0x20, 0xda, 0x34, 0xed, 0x41, 0xa7, 0x80, 0x99, - 0x09, 0x7a, 0x03, 0x60, 0xe4, 0x3a, 0x3d, 0xe2, 0x79, 0x0f, 0xc8, 0x63, 0x95, 0x30, 0x80, 0x96, - 0x04, 0x70, 0x83, 0xf6, 0x03, 0x42, 0x45, 0x96, 0x64, 0x8f, 0x6e, 0xc3, 0x9c, 0x48, 0x89, 0xf0, - 0xd9, 0x4f, 0xdd, 0xd2, 0x02, 0x82, 0x30, 0x60, 0xc6, 0x51, 0x54, 0x74, 0x89, 0x8c, 0x75, 0xc7, - 0x26, 0xea, 0x20, 0x55, 0x74, 0x05, 0x24, 0xd4, 0x84, 0xee, 0x1c, 0x12, 0x02, 0xdd, 0x82, 0x43, - 0xfe, 0x8e, 0x4b, 0x74, 0xa3, 0xeb, 0xeb, 0xfe, 0xd8, 0x53, 0xed, 0xd4, 0xcd, 0x87, 0x17, 0xb6, - 0x1f, 0x31, 0x4b, 0xba, 0xb1, 0xca, 0x98, 0x5b, 0x35, 0xa8, 0xec, 0xe9, 0xd6, 0x98, 0x68, 0x1f, - 0x15, 0xa1, 0x26, 0xa4, 0xb9, 0xf6, 0x00, 0x14, 0x26, 0x27, 0x8f, 0x40, 0xc5, 0xb4, 0x0d, 0xf2, - 0x84, 0x1d, 0x07, 0x2a, 0x98, 0x27, 0xd0, 0x4b, 0x50, 0x13, 0x82, 0x5d, 0x68, 0xcc, 0xac, 0xa3, - 0x46, 0x60, 0xa6, 0xbd, 0x07, 0xb5, 0x40, 0x8d, 0x2f, 0x42, 0x63, 0xe4, 0x3a, 0x54, 0xf4, 0x6d, - 0x18, 0x8c, 0xb6, 0x81, 0xa3, 0x0c, 0xf4, 0x1d, 0xa8, 0x19, 0x42, 0xf1, 0x73, 0xea, 0x63, 0x6d, - 0x7e, 0xa6, 0x6a, 0x07, 0x67, 0xaa, 0x76, 0x97, 0x9d, 0xa9, 0x70, 0x60, 0xa7, 0xfd, 0xe1, 0x06, - 0x54, 0x98, 0x23, 0x68, 0x2f, 0x43, 0x99, 0x6a, 0xd9, 0x0b, 0x50, 0x65, 0xcb, 0x2b, 0x38, 0x5b, - 0x1d, 0x49, 0xb4, 0x8e, 0x19, 0x63, 0x61, 0xa3, 0x7d, 0xaa, 0x88, 0xbe, 0x1e, 0x85, 0xaa, 0xeb, - 0x38, 0x7e, 0xd8, 0x2a, 0x91, 0x92, 0xe8, 0x4a, 0xf9, 0x74, 0xe8, 0x5a, 0xd4, 0x81, 0x32, 0x33, - 0xcf, 0x3d, 0xb2, 0x84, 0x3d, 0x41, 0xe7, 0x41, 0xa1, 0x86, 0x4c, 0x3c, 0xcf, 0x5f, 0x3e, 0x16, - 0x02, 0xbb, 0x43, 0xdd, 0xf5, 0xb9, 0xaf, 0xef, 0x8f, 0x08, 0x66, 0x46, 0xe8, 0x06, 0x34, 0x9d, - 0xed, 0xf7, 0x49, 0xcf, 0xa7, 0x79, 0x9e, 0x5a, 0x61, 0x95, 0x45, 0x53, 0x1f, 0x9e, 0x4c, 0x1f, - 0x86, 0x46, 0x58, 0x06, 0xa0, 0x1f, 0xc0, 0xe1, 0x28, 0xb9, 0x49, 0x5c, 0x6e, 0xa7, 0x56, 0x19, - 0xcf, 0xc5, 0xcc, 0xe3, 0x86, 0xc4, 0x17, 0x82, 0x70, 0x1a, 0x13, 0xba, 0x0a, 0x0d, 0x37, 0x3c, - 0x6e, 0xd5, 0x18, 0xad, 0x36, 0xd9, 0xbc, 0x20, 0x00, 0xe2, 0xc8, 0x58, 0xfb, 0x21, 0x68, 0x41, - 0xf6, 0xbb, 0xa6, 0xbf, 0xf3, 0x0e, 0x75, 0xcf, 0x88, 0x57, 0x83, 0x3a, 0xaf, 0x2e, 0x9c, 0xa9, - 0x30, 0x8d, 0x56, 0xe5, 0x3a, 0xf9, 0x74, 0x9d, 0xca, 0xae, 0x33, 0x24, 0x97, 0x2b, 0x7f, 0x1b, - 0x0e, 0xa7, 0x74, 0x71, 0x6a, 0xad, 0x4b, 0x00, 0xd1, 0x00, 0x88, 0xb3, 0xb9, 0x94, 0xa3, 0xad, - 0x41, 0x53, 0x3a, 0xf3, 0x20, 0x15, 0x6a, 0xcc, 0x59, 0x42, 0xa6, 0x20, 0x49, 0x2b, 0xa1, 0xeb, - 0x60, 0x53, 0xf7, 0x77, 0x58, 0xeb, 0x1b, 0x38, 0x4c, 0x6b, 0xa7, 0xa1, 0x2a, 0x36, 0x39, 0x4d, - 0x9c, 0xf1, 0xe8, 0x71, 0xa4, 0xc8, 0xad, 0x82, 0xb4, 0xf6, 0x7d, 0x68, 0x84, 0x47, 0x23, 0xf4, - 0x10, 0x0e, 0x89, 0xa3, 0x11, 0x0f, 0xb0, 0xd4, 0x78, 0x5e, 0x92, 0x41, 0x92, 0xff, 0xb6, 0xd7, - 0x1c, 0xdb, 0xa7, 0x33, 0x4d, 0xa3, 0x29, 0x3b, 0x5d, 0xb5, 0x99, 0xcb, 0xc4, 0x08, 0xb4, 0x8f, - 0x54, 0x28, 0x77, 0x89, 0xaf, 0xdd, 0x8b, 0x96, 0xf3, 0x3c, 0x94, 0xcc, 0xa0, 0x1f, 0x25, 0xf3, - 0x0b, 0x2d, 0xe0, 0x2d, 0x68, 0x44, 0x07, 0xeb, 0x24, 0xdf, 0xd5, 0xc9, 0x19, 0x9d, 0xd1, 0x8b, - 0x46, 0x50, 0x0f, 0x77, 0xd7, 0x24, 0xeb, 0x0a, 0x94, 0x77, 0xc9, 0xbe, 0x68, 0xe1, 0x99, 0xdc, - 0x1d, 0xbb, 0x7d, 0x97, 0xec, 0x63, 0x8a, 0xd0, 0x8e, 0x43, 0xf9, 0x2e, 0xd9, 0xa7, 0x71, 0x91, - 0x05, 0x4d, 0x41, 0x29, 0x22, 0xe8, 0x06, 0x54, 0xc5, 0xe1, 0x31, 0x59, 0xdf, 0x25, 0xa8, 0xf6, - 0xf9, 0x79, 0x34, 0x67, 0x50, 0x84, 0x99, 0x76, 0x13, 0x9a, 0xf2, 0x91, 0x31, 0xc9, 0x77, 0x12, - 0x9a, 0x3d, 0xe9, 0x50, 0xca, 0x7d, 0x45, 0xce, 0xd2, 0x08, 0x1c, 0x8a, 0xdd, 0x29, 0x24, 0x19, - 0x6e, 0xc3, 0x21, 0x57, 0xbe, 0xb8, 0x28, 0x25, 0xc4, 0x8b, 0xec, 0x1b, 0x32, 0x11, 0x8e, 0xc1, - 0xb4, 0xbb, 0xb0, 0x90, 0x3c, 0x78, 0x26, 0x6b, 0x3a, 0x07, 0x0b, 0xdb, 0x89, 0x63, 0x2e, 0x5f, - 0x22, 0xc9, 0x6c, 0x6d, 0x03, 0x2a, 0xfc, 0x4c, 0x95, 0xa4, 0x78, 0x09, 0x2a, 0x3a, 0x3b, 0xa3, - 0x95, 0x58, 0x64, 0xd4, 0x52, 0x5b, 0xc9, 0xa0, 0x98, 0x1b, 0x6a, 0x7f, 0x56, 0x40, 0x61, 0x27, - 0xd8, 0x24, 0xd5, 0x15, 0x50, 0x7c, 0x7a, 0x1c, 0x2e, 0xe5, 0xdc, 0xff, 0xb0, 0x75, 0xc0, 0xa4, - 0x05, 0xb3, 0x47, 0xaf, 0x41, 0xc5, 0xf3, 0xf7, 0xad, 0xe0, 0x6a, 0xe4, 0xd4, 0x74, 0x60, 0x97, - 0x9a, 0x62, 0x8e, 0xa0, 0x50, 0xb6, 0x8a, 0xc4, 0xa5, 0x48, 0x0e, 0x94, 0x2d, 0x5f, 0xcc, 0x11, - 0xe8, 0x26, 0xd4, 0x7a, 0x3b, 0xa4, 0xb7, 0x4b, 0x0c, 0x71, 0x1b, 0x72, 0x66, 0x3a, 0x78, 0x8d, - 0x1b, 0xe3, 0x00, 0x45, 0xeb, 0xee, 0xb1, 0x21, 0xaf, 0xce, 0x52, 0x37, 0x9b, 0x06, 0xcc, 0x11, - 0xda, 0xa2, 0x18, 0xc1, 0x74, 0x5f, 0xbf, 0x03, 0x15, 0xd6, 0x49, 0x74, 0x5d, 0x2e, 0x9e, 0x97, - 0x4e, 0x3e, 0x99, 0xd1, 0x45, 0x0c, 0x4e, 0xc8, 0xc3, 0x7a, 0x1c, 0xe7, 0x69, 0xce, 0xc2, 0x23, - 0x46, 0x8a, 0xf3, 0x9c, 0x80, 0x9a, 0xe8, 0x7c, 0xbc, 0xc1, 0xf5, 0xc0, 0xe0, 0x59, 0xa8, 0x70, - 0xff, 0x4c, 0xef, 0xcf, 0xaf, 0x8b, 0x50, 0xa6, 0x87, 0xf1, 0xc9, 0xf8, 0x23, 0xe6, 0x3d, 0xcf, - 0x61, 0xd6, 0xcd, 0xbd, 0xd8, 0xb4, 0x6b, 0xb7, 0x83, 0x11, 0x7a, 0x23, 0x3e, 0x42, 0x67, 0xa7, - 0xf6, 0x4c, 0xa2, 0xe1, 0x0d, 0xfb, 0x79, 0x05, 0x14, 0x76, 0x8d, 0x92, 0xe6, 0xc9, 0xc1, 0x7e, - 0x33, 0xad, 0x61, 0x14, 0xdc, 0x96, 0x84, 0x03, 0xf3, 0x64, 0xdd, 0xcf, 0xf7, 0x64, 0x06, 0xa4, - 0x2a, 0x91, 0x75, 0x89, 0x0a, 0xd6, 0x2b, 0xa0, 0x0c, 0xcd, 0x21, 0x11, 0x8e, 0x9c, 0x53, 0xe5, - 0x7d, 0x73, 0x48, 0x30, 0xb3, 0xa7, 0xb8, 0x1d, 0xdd, 0xdb, 0x11, 0x3e, 0x9c, 0x83, 0xeb, 0xe8, - 0xde, 0x0e, 0x66, 0xf6, 0x14, 0x67, 0xeb, 0x43, 0x22, 0x9c, 0x37, 0x07, 0xf7, 0x40, 0xa7, 0xf5, - 0x51, 0x7b, 0x8a, 0xf3, 0xcc, 0x0f, 0x88, 0xb8, 0xac, 0xcb, 0xc1, 0x75, 0xcd, 0x0f, 0x08, 0x66, - 0xf6, 0xd4, 0xe5, 0x29, 0x4b, 0x86, 0x8b, 0x3c, 0x0b, 0x95, 0x77, 0x4d, 0xc3, 0xdf, 0x89, 0x17, - 0x57, 0x62, 0x2b, 0x82, 0x8e, 0xd2, 0x81, 0x56, 0x84, 0x3c, 0xc8, 0x9c, 0x67, 0x1d, 0x14, 0x3a, - 0x5b, 0x07, 0x73, 0x9b, 0x68, 0x92, 0x05, 0xcb, 0x22, 0x28, 0x74, 0x20, 0x33, 0xba, 0xb2, 0x08, - 0x0a, 0x9d, 0x9e, 0xec, 0x52, 0x3a, 0x28, 0xf1, 0xd2, 0x72, 0x50, 0xfa, 0x61, 0x19, 0x14, 0x76, - 0x25, 0x97, 0x74, 0xc8, 0xb7, 0x61, 0xce, 0xd7, 0xdd, 0x01, 0xe1, 0x52, 0x75, 0x23, 0xb8, 0x80, - 0x3e, 0x3f, 0xf5, 0xa2, 0xaf, 0xfd, 0x48, 0x86, 0xe0, 0x38, 0xc3, 0xec, 0x51, 0x97, 0x51, 0xc5, - 0xa2, 0xee, 0x1b, 0xe1, 0x96, 0xab, 0xe4, 0x5c, 0xd9, 0x32, 0x2c, 0xdf, 0xb8, 0xc3, 0xfd, 0xf7, - 0x0c, 0xcc, 0xc5, 0x1a, 0xf6, 0xa5, 0x46, 0x41, 0xb9, 0xb1, 0x9c, 0x67, 0x25, 0x54, 0x0e, 0x17, - 0xe3, 0x61, 0x30, 0x53, 0x28, 0x08, 0xe0, 0xef, 0x2a, 0x50, 0x0f, 0xaf, 0x34, 0x53, 0x54, 0xce, - 0xd8, 0xb5, 0x72, 0x55, 0x4e, 0x80, 0x6f, 0x6f, 0xb9, 0x16, 0xa6, 0x08, 0xda, 0x1b, 0xdf, 0xf4, - 0xc3, 0x61, 0x7f, 0x3e, 0x1f, 0xfa, 0x88, 0x9a, 0x63, 0x8e, 0x42, 0x0f, 0xa1, 0x69, 0x10, 0xaf, - 0xe7, 0x9a, 0x23, 0x76, 0x2f, 0xc2, 0xc7, 0xff, 0x62, 0x3e, 0xc9, 0x7a, 0x04, 0xc2, 0x32, 0x03, - 0xda, 0x80, 0x86, 0x39, 0xd4, 0x07, 0xa4, 0x13, 0x05, 0x91, 0xf3, 0xf9, 0x74, 0x1b, 0x01, 0x04, - 0x47, 0x68, 0xda, 0xb6, 0xbe, 0xbe, 0x67, 0xf6, 0x1c, 0x9b, 0x91, 0x55, 0x67, 0x6d, 0xdb, 0x9d, - 0x08, 0x84, 0x65, 0x06, 0x74, 0x4d, 0x84, 0x61, 0x1e, 0x6b, 0xce, 0xce, 0x30, 0x54, 0x61, 0x28, - 0xa6, 0x6a, 0x72, 0xcb, 0xb5, 0xb2, 0xc3, 0x0d, 0x1b, 0xd5, 0x8c, 0xe2, 0x53, 0xd0, 0x94, 0xc6, - 0x2b, 0xc3, 0xe8, 0x39, 0x68, 0x84, 0xa3, 0x90, 0xcd, 0x23, 0xf5, 0x2d, 0xc3, 0xe8, 0xba, 0x88, - 0x49, 0xaf, 0xc6, 0xdd, 0xfc, 0x44, 0xc2, 0xcd, 0xa9, 0x63, 0x6f, 0xba, 0x84, 0xdd, 0xa4, 0xc9, - 0xc1, 0xe8, 0x93, 0x63, 0x6c, 0x0f, 0xb3, 0xbe, 0xe4, 0x83, 0xc3, 0x23, 0x58, 0x58, 0xd7, 0x7d, - 0x7d, 0x5b, 0xf7, 0x88, 0xb8, 0x9e, 0x4d, 0x63, 0x75, 0x79, 0x91, 0x38, 0x3c, 0x64, 0xb3, 0x0a, - 0xbb, 0x6f, 0x54, 0xfc, 0xff, 0x8e, 0x8a, 0xff, 0x4b, 0x96, 0x8a, 0x5f, 0x89, 0xa9, 0xf8, 0x53, - 0x59, 0x9f, 0x19, 0xad, 0x09, 0x19, 0x7f, 0x2d, 0xbe, 0xa1, 0x9c, 0xce, 0x41, 0xc6, 0x76, 0x94, - 0x6b, 0x71, 0x1d, 0x9f, 0x87, 0x8d, 0x09, 0xf9, 0x37, 0x93, 0x42, 0xfe, 0x6c, 0x0e, 0x7a, 0x42, - 0xc9, 0x5f, 0x8b, 0x2b, 0xf9, 0xbc, 0xda, 0xbf, 0xc6, 0x52, 0xfe, 0x37, 0x19, 0x52, 0xfe, 0xb5, - 0xb8, 0x94, 0x9f, 0xe2, 0x35, 0x5f, 0x95, 0x96, 0xff, 0x55, 0x96, 0x96, 0x5f, 0x89, 0x69, 0xf9, - 0x29, 0x2d, 0x4b, 0x8a, 0xf9, 0x6b, 0x71, 0x31, 0x7f, 0x3a, 0x07, 0x19, 0x53, 0xf3, 0x2b, 0x31, - 0x35, 0x9f, 0x57, 0xa9, 0x24, 0xe7, 0x57, 0x62, 0x72, 0x3e, 0x0f, 0x28, 0xe9, 0xf9, 0x95, 0x98, - 0x9e, 0xcf, 0x03, 0x4a, 0x82, 0x7e, 0x25, 0x26, 0xe8, 0xf3, 0x80, 0xdf, 0x28, 0xfa, 0x83, 0x29, - 0xfa, 0x9f, 0x65, 0x29, 0x7a, 0x9c, 0xae, 0xe8, 0x2f, 0x64, 0x8f, 0x7f, 0xbe, 0xa4, 0x9f, 0x3d, - 0x02, 0x4f, 0x6a, 0xfa, 0xeb, 0x09, 0x4d, 0x7f, 0x26, 0x07, 0xfc, 0x7f, 0x2a, 0xea, 0xff, 0x34, - 0x4d, 0xd4, 0x5f, 0x95, 0x45, 0xfd, 0x94, 0x5d, 0x64, 0x52, 0xd5, 0xdf, 0x88, 0xab, 0xfa, 0x73, - 0x33, 0x60, 0x63, 0xb2, 0x7e, 0x33, 0x4d, 0xd6, 0xb7, 0x67, 0x60, 0xc9, 0xd4, 0xf5, 0x6f, 0x4d, - 0xea, 0xfa, 0x0b, 0x33, 0xf0, 0xa5, 0x0a, 0xfb, 0xcd, 0x34, 0x61, 0x3f, 0x4b, 0xeb, 0x32, 0x95, - 0xfd, 0xeb, 0x31, 0x65, 0xff, 0xfc, 0x2c, 0xc3, 0xf5, 0xf5, 0x93, 0xf6, 0x7f, 0xac, 0x41, 0x3d, - 0xf8, 0x40, 0xae, 0xfd, 0xb6, 0x08, 0xb5, 0xe0, 0x89, 0x41, 0xd2, 0x6f, 0x8f, 0x42, 0x95, 0xda, - 0x84, 0x8f, 0x17, 0x45, 0x0a, 0xdd, 0x00, 0x85, 0xfe, 0x12, 0x4e, 0xf9, 0xe2, 0xf4, 0x0d, 0x55, - 0x7e, 0x7f, 0x80, 0x19, 0x8e, 0xf2, 0x3a, 0xfd, 0xbe, 0x47, 0x7c, 0xe6, 0x90, 0x73, 0x58, 0xa4, - 0x68, 0x6f, 0x2d, 0x73, 0x68, 0xfa, 0xcc, 0xaf, 0xe6, 0x30, 0x4f, 0x68, 0xaf, 0x00, 0x48, 0x0f, - 0x14, 0x66, 0x6c, 0xa3, 0xf6, 0x32, 0x34, 0xa2, 0x87, 0x19, 0x29, 0x20, 0x8f, 0x15, 0x06, 0x20, - 0x9e, 0xd2, 0x6e, 0xc1, 0x7c, 0xe2, 0x75, 0x42, 0x8a, 0xfe, 0x0f, 0x3e, 0x57, 0xdc, 0x15, 0x5f, - 0x23, 0x1a, 0x58, 0xce, 0xd2, 0x1e, 0x43, 0x53, 0x7e, 0x75, 0x70, 0x60, 0x02, 0x74, 0x05, 0xea, - 0x41, 0x52, 0x8c, 0xf0, 0xb4, 0xaf, 0x27, 0xa1, 0xad, 0xf6, 0x23, 0x00, 0xe9, 0xed, 0xd0, 0xac, - 0x73, 0x29, 0x9d, 0xb6, 0xca, 0xb3, 0x9d, 0xb6, 0xe8, 0x34, 0xf9, 0x8e, 0xaf, 0x5b, 0x6c, 0x95, - 0xcd, 0x61, 0x9e, 0xd0, 0x7e, 0x59, 0x84, 0xb9, 0xf8, 0x03, 0x9f, 0xaf, 0xb0, 0x09, 0x67, 0x61, - 0xde, 0x64, 0x95, 0x6c, 0x3a, 0x9e, 0xc9, 0x46, 0x8a, 0xbb, 0x4c, 0x22, 0x57, 0x7b, 0x3f, 0x6c, - 0x93, 0xf8, 0x7e, 0xff, 0x05, 0xda, 0xa4, 0xcc, 0x78, 0x08, 0x7d, 0x3b, 0xac, 0xeb, 0x60, 0xae, - 0x8a, 0x54, 0x5a, 0xd7, 0xd0, 0xd9, 0x23, 0x06, 0xfb, 0x94, 0xdb, 0xc0, 0x41, 0x52, 0xfb, 0x77, - 0x09, 0x94, 0x2d, 0x8f, 0xb8, 0xda, 0xbf, 0x4a, 0xc1, 0x07, 0xf3, 0xab, 0xa0, 0xb0, 0x47, 0x23, - 0xd2, 0x07, 0xfd, 0x62, 0xe2, 0x83, 0x7e, 0xec, 0xc9, 0x6e, 0xf4, 0x41, 0xff, 0x2a, 0x28, 0xec, - 0x99, 0xc8, 0xc1, 0x91, 0x3f, 0x2e, 0x42, 0x23, 0x7a, 0xb2, 0x71, 0x60, 0xbc, 0xfc, 0xf5, 0xb4, - 0x14, 0xff, 0x7a, 0xfa, 0x22, 0x54, 0x5c, 0xf6, 0x9d, 0x93, 0x3b, 0x7a, 0xf2, 0x3b, 0x3d, 0xab, - 0x10, 0x73, 0x13, 0x8d, 0x40, 0x53, 0x7e, 0x90, 0x72, 0xf0, 0x66, 0x9c, 0x16, 0xcf, 0x07, 0x37, - 0x0c, 0x6f, 0xd5, 0x75, 0xf5, 0x7d, 0x71, 0x7a, 0x8f, 0x67, 0x52, 0xdd, 0xb5, 0x69, 0xda, 0x83, - 0xf4, 0x77, 0x14, 0xda, 0x5f, 0x8b, 0x50, 0x13, 0xcf, 0x3b, 0xb4, 0x15, 0x28, 0x3f, 0x20, 0x8f, - 0x69, 0x43, 0xc4, 0x03, 0x8f, 0x89, 0x86, 0xdc, 0x67, 0xbd, 0x10, 0xf6, 0x38, 0x30, 0xd3, 0xae, - 0x41, 0x55, 0xb8, 0xe3, 0xc1, 0xb1, 0x57, 0x41, 0x61, 0xef, 0x48, 0x0e, 0x8e, 0xfc, 0x69, 0x1d, - 0xaa, 0xfc, 0x01, 0x89, 0xf6, 0x79, 0x0d, 0xaa, 0xfc, 0x6d, 0x09, 0xba, 0x01, 0x35, 0x6f, 0x3c, - 0x1c, 0xea, 0xee, 0xbe, 0xe0, 0x39, 0x3d, 0xed, 0x29, 0x4a, 0xbb, 0xcb, 0x6d, 0x71, 0x00, 0x42, - 0xaf, 0x82, 0xd2, 0xd3, 0xfb, 0x64, 0xe2, 0x1a, 0x23, 0x0d, 0xbc, 0xa6, 0xf7, 0x09, 0x66, 0xe6, - 0xe8, 0x4d, 0xa8, 0x8b, 0x69, 0x09, 0x16, 0xfd, 0xf4, 0x7a, 0x83, 0xc9, 0x0c, 0x51, 0xda, 0x5b, - 0x50, 0x13, 0x8d, 0x41, 0x37, 0xa1, 0xea, 0xf1, 0xd7, 0x34, 0x49, 0xd5, 0x97, 0xda, 0x85, 0x7d, - 0xbb, 0xc7, 0x73, 0xb0, 0x80, 0x69, 0x7f, 0x2b, 0x81, 0x42, 0x1b, 0xf7, 0x5f, 0x33, 0xa1, 0x25, - 0x00, 0x4b, 0xf7, 0xfc, 0xcd, 0xb1, 0x65, 0x11, 0xee, 0xed, 0x65, 0x2c, 0xe5, 0xa0, 0x73, 0xb0, - 0xc0, 0x53, 0xde, 0x4e, 0x77, 0xdc, 0xeb, 0x11, 0x62, 0x30, 0xd7, 0xaf, 0xe3, 0x64, 0x36, 0x5a, - 0x85, 0x0a, 0x7b, 0x66, 0x2d, 0x44, 0xdb, 0xf9, 0xdc, 0x91, 0x6d, 0x6f, 0x9a, 0xb6, 0x68, 0x0d, - 0x47, 0x6a, 0x0e, 0x34, 0xc2, 0x3c, 0xba, 0x08, 0x47, 0xa6, 0x6d, 0x9b, 0xf6, 0x40, 0x78, 0x74, - 0x90, 0xa4, 0x71, 0x89, 0xfe, 0x14, 0xed, 0xad, 0x60, 0x91, 0xa2, 0xf9, 0x7d, 0xdd, 0xb4, 0x44, - 0x13, 0x2b, 0x58, 0xa4, 0x28, 0xd3, 0x98, 0xb9, 0x2f, 0x7f, 0x33, 0x5e, 0xc6, 0x41, 0x52, 0x7b, - 0x1a, 0xbd, 0x47, 0x9a, 0x88, 0x7e, 0x48, 0x1c, 0x24, 0x79, 0x04, 0xe0, 0x67, 0xc4, 0x45, 0x59, - 0x4c, 0x96, 0xf9, 0xc3, 0xa2, 0x48, 0x1e, 0x52, 0x99, 0x60, 0x5b, 0xa6, 0xcd, 0x8f, 0xbb, 0x75, - 0x2c, 0x52, 0x89, 0x31, 0xae, 0x4c, 0x8c, 0xb1, 0x28, 0xbf, 0x6d, 0x98, 0x3e, 0x0b, 0xa9, 0x61, - 0x39, 0xcf, 0x41, 0xd7, 0xa1, 0x66, 0x90, 0x3d, 0xb3, 0x47, 0x82, 0x37, 0x2e, 0xa7, 0xa6, 0x8e, - 0xed, 0x3a, 0xb3, 0xc5, 0x01, 0x46, 0xf3, 0xa1, 0xca, 0xb3, 0xc2, 0x2e, 0x15, 0xa5, 0x2e, 0x45, - 0x8d, 0x2e, 0x4d, 0x69, 0x74, 0x39, 0xa7, 0xd1, 0x4a, 0xb2, 0xd1, 0xcb, 0x77, 0x01, 0x22, 0x77, - 0x43, 0x4d, 0xa8, 0x6d, 0xd9, 0xbb, 0xb6, 0xf3, 0xd8, 0x6e, 0x15, 0x68, 0xe2, 0x61, 0xbf, 0x4f, - 0x6b, 0x69, 0x15, 0x69, 0x82, 0xda, 0x99, 0xf6, 0xa0, 0x55, 0x42, 0x00, 0x55, 0x9a, 0x20, 0x46, - 0xab, 0x4c, 0x7f, 0xdf, 0x61, 0xf3, 0xd7, 0x52, 0x96, 0x75, 0xba, 0x55, 0x79, 0x23, 0xc7, 0xf6, - 0xc8, 0x57, 0xf4, 0xef, 0x96, 0xe5, 0x9f, 0x94, 0xa1, 0xc2, 0x02, 0x91, 0xf6, 0x79, 0x29, 0x0c, - 0x99, 0x29, 0xd7, 0xb3, 0xd1, 0x25, 0xca, 0xbc, 0xf4, 0x8e, 0x2e, 0x16, 0xc2, 0xe4, 0xcb, 0x93, - 0xcb, 0xf2, 0xe5, 0xc9, 0xbc, 0xf4, 0x78, 0x2a, 0x8e, 0x88, 0x5d, 0x9a, 0xbc, 0x0e, 0xf5, 0x91, - 0xeb, 0x0c, 0x5c, 0x1a, 0x2b, 0x95, 0xc4, 0x7f, 0x0b, 0xe2, 0xb0, 0x4d, 0x61, 0x86, 0x43, 0x80, - 0xf6, 0x00, 0xea, 0x41, 0x6e, 0x24, 0x7c, 0xc4, 0x51, 0x9c, 0x25, 0xa8, 0x17, 0x18, 0x8e, 0x98, - 0xef, 0x32, 0x66, 0xbf, 0xe9, 0x12, 0x11, 0xe3, 0x24, 0xdc, 0x3a, 0x48, 0x2e, 0x5f, 0x14, 0xda, - 0x7d, 0x0e, 0x1a, 0xeb, 0xae, 0x33, 0x62, 0x8f, 0x8c, 0x5a, 0x05, 0x3a, 0x3b, 0x1b, 0xc3, 0x91, - 0xe3, 0xfa, 0xad, 0x22, 0xfd, 0x7d, 0xfb, 0x09, 0xfb, 0x5d, 0x5a, 0x5e, 0x0d, 0xee, 0x33, 0xea, - 0xa0, 0x3c, 0x70, 0x6c, 0xc2, 0xa7, 0x1b, 0x8f, 0xd9, 0xca, 0x6d, 0x15, 0x69, 0x36, 0xdd, 0x0e, - 0x5a, 0x25, 0x74, 0x08, 0xea, 0x6b, 0xba, 0xdd, 0x23, 0x16, 0x9b, 0xed, 0x06, 0x54, 0x6e, 0xbb, - 0xae, 0xe3, 0xb6, 0x94, 0x17, 0x7f, 0x5f, 0x84, 0xf9, 0xf8, 0x73, 0x34, 0x8a, 0xda, 0xd4, 0x07, - 0x94, 0xac, 0x0e, 0x4a, 0xc7, 0x19, 0x52, 0xc7, 0x59, 0x80, 0xe6, 0x26, 0x7f, 0xd3, 0xc7, 0x8a, - 0x4a, 0xb4, 0x9e, 0x55, 0xb7, 0xb7, 0x63, 0xee, 0x91, 0x56, 0x99, 0x96, 0xde, 0xa2, 0xab, 0xa1, - 0xe7, 0x8e, 0x87, 0xdb, 0x5e, 0x4b, 0x41, 0x35, 0xf6, 0xac, 0xa8, 0x55, 0x41, 0xf3, 0x00, 0xd1, - 0xe3, 0xab, 0x56, 0x95, 0x32, 0xd2, 0x4e, 0xb5, 0x6a, 0xe8, 0x30, 0x2c, 0xdc, 0xd7, 0xdd, 0x5d, - 0xe2, 0x8f, 0x2c, 0xbd, 0x47, 0x58, 0x71, 0x1d, 0x1d, 0x83, 0xc3, 0x52, 0x66, 0x20, 0x63, 0x5b, - 0x8d, 0x5b, 0x8b, 0x7f, 0x7f, 0xba, 0x54, 0xfc, 0xf8, 0xe9, 0x52, 0xf1, 0xd3, 0xa7, 0x4b, 0xc5, - 0x5f, 0x7c, 0xb6, 0x54, 0xf8, 0xf8, 0xb3, 0xa5, 0xc2, 0x27, 0x9f, 0x2d, 0x15, 0xde, 0x2b, 0x8d, - 0xb6, 0xb7, 0xab, 0x4c, 0x76, 0xbd, 0xfc, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x50, 0xbc, 0x87, - 0x0b, 0x21, 0x36, 0x00, 0x00, + 0x8a, 0x9e, 0x7a, 0x68, 0x11, 0xa0, 0x45, 0x51, 0x14, 0xed, 0xb1, 0x87, 0xa2, 0x28, 0x7a, 0xe9, + 0xa1, 0x45, 0x80, 0xfe, 0x03, 0x05, 0xda, 0x5b, 0x0e, 0x3d, 0xe4, 0x18, 0x38, 0x97, 0x5e, 0xfb, + 0x07, 0x04, 0x28, 0xe6, 0x41, 0x72, 0xc8, 0x25, 0x97, 0xab, 0x34, 0x01, 0x5a, 0x24, 0xb7, 0x9d, + 0x99, 0xef, 0xf7, 0x9b, 0xd7, 0x37, 0xdf, 0xfc, 0x66, 0x38, 0x0b, 0x47, 0x47, 0xdb, 0x97, 0x46, + 0xae, 0xe3, 0x3b, 0xde, 0x25, 0xb2, 0x47, 0x6c, 0xdf, 0x6b, 0xb3, 0x14, 0xaa, 0xe9, 0xf6, 0xbe, + 0xbf, 0x3f, 0x22, 0xda, 0xe9, 0xd1, 0xee, 0xe0, 0x92, 0x65, 0x6e, 0x5f, 0x1a, 0x6d, 0x5f, 0x1a, + 0x3a, 0x06, 0xb1, 0x02, 0x73, 0x96, 0x10, 0xe6, 0xda, 0x0b, 0x92, 0x95, 0x4b, 0x2c, 0xdd, 0x37, + 0x1d, 0x3b, 0x30, 0x0c, 0xd2, 0xc2, 0x74, 0x71, 0xe0, 0x38, 0x03, 0x8b, 0xf0, 0xd2, 0xed, 0x71, + 0xff, 0x92, 0xe7, 0xbb, 0xe3, 0x9e, 0xcf, 0x4b, 0x97, 0xff, 0x49, 0xa0, 0x72, 0x9b, 0x36, 0x04, + 0x5d, 0x86, 0xfa, 0x90, 0x78, 0x9e, 0x3e, 0x20, 0x9e, 0x5a, 0x3c, 0x59, 0x3e, 0xd7, 0xbc, 0x7c, + 0xb4, 0x2d, 0x1a, 0xd5, 0x66, 0x16, 0xed, 0xfb, 0xbc, 0x18, 0x87, 0x76, 0x68, 0x11, 0x1a, 0x3d, + 0xc7, 0xf6, 0xc9, 0x13, 0x7f, 0xc3, 0x50, 0x4b, 0x27, 0x8b, 0xe7, 0x1a, 0x38, 0xca, 0x40, 0xaf, + 0x40, 0xc3, 0xb4, 0x4d, 0xdf, 0xd4, 0x7d, 0xc7, 0x55, 0xcb, 0x27, 0x8b, 0x31, 0x4a, 0xd6, 0x9d, + 0xf6, 0x6a, 0xaf, 0xe7, 0x8c, 0x6d, 0x1f, 0x47, 0x86, 0xda, 0x87, 0x2a, 0xd4, 0x44, 0x4d, 0xe8, + 0x26, 0x34, 0x75, 0x6e, 0xd1, 0xdd, 0x71, 0x1e, 0xab, 0x45, 0xc6, 0x71, 0x3c, 0xd1, 0x2c, 0xc1, + 0xd1, 0xa6, 0x26, 0x9d, 0x02, 0x96, 0x11, 0x68, 0x03, 0xe6, 0x45, 0x72, 0x9d, 0xf8, 0xba, 0x69, + 0x79, 0xea, 0x3f, 0x38, 0xc9, 0x52, 0x06, 0x89, 0x30, 0xeb, 0x14, 0x70, 0x02, 0x88, 0xee, 0xc1, + 0xc2, 0xb6, 0xe5, 0xf4, 0x76, 0xbb, 0x24, 0xe4, 0x6a, 0x31, 0xaa, 0x93, 0x09, 0xaa, 0x5b, 0xd4, + 0xaa, 0xdd, 0x25, 0x32, 0x59, 0x12, 0x8a, 0x30, 0x3c, 0x13, 0x64, 0x61, 0x31, 0x5f, 0x9e, 0x7a, + 0x94, 0xf1, 0x2d, 0x67, 0xf2, 0x85, 0x96, 0x9d, 0x02, 0x9e, 0x84, 0xa3, 0xef, 0xc1, 0x91, 0x28, + 0xd3, 0xf3, 0x5d, 0xb3, 0xc7, 0x69, 0xeb, 0x8c, 0xf6, 0xcc, 0x14, 0xda, 0xc8, 0xb8, 0x53, 0xc0, + 0xa9, 0x24, 0xe8, 0x35, 0x68, 0xf0, 0x7c, 0x3a, 0x11, 0x4b, 0x8c, 0xf1, 0xdb, 0xe9, 0x8c, 0x7c, + 0x1a, 0x22, 0x6b, 0x74, 0x05, 0xea, 0x2c, 0xb1, 0x6a, 0x70, 0x27, 0x69, 0x5e, 0x56, 0x53, 0x91, + 0xab, 0x86, 0xd1, 0x29, 0xe0, 0xd0, 0x96, 0xce, 0x3e, 0xfb, 0xbd, 0x4e, 0x2c, 0xe2, 0x13, 0xe1, + 0x41, 0xc7, 0x53, 0xa1, 0xdc, 0x84, 0xce, 0xbe, 0x84, 0x40, 0xeb, 0xd0, 0xec, 0x9b, 0x16, 0xf1, + 0xb6, 0x46, 0x96, 0xa3, 0x1b, 0xaa, 0x32, 0x65, 0xba, 0xee, 0x44, 0x76, 0x94, 0x45, 0x82, 0xa1, + 0x1b, 0xd0, 0x18, 0xea, 0xee, 0xae, 0xb7, 0x61, 0xf7, 0x1d, 0xb5, 0x92, 0xea, 0x3d, 0x9c, 0xe3, + 0x7e, 0x60, 0x45, 0xbb, 0x1f, 0x42, 0xa8, 0x0f, 0x06, 0x23, 0x7a, 0xc7, 0x24, 0x96, 0xe1, 0xa9, + 0x55, 0x46, 0x72, 0x22, 0x73, 0x42, 0xb8, 0x19, 0xf5, 0xc1, 0x38, 0x10, 0x7d, 0x17, 0x0e, 0x07, + 0x39, 0x6b, 0x3b, 0xa6, 0x65, 0xb8, 0xc4, 0xde, 0x30, 0x3c, 0xb5, 0xc6, 0xf8, 0x4e, 0x67, 0xf2, + 0x49, 0xb6, 0x9d, 0x02, 0x4e, 0xa3, 0x40, 0x06, 0x1c, 0x0b, 0xb2, 0x6f, 0xe9, 0xbd, 0xdd, 0x81, + 0xeb, 0x8c, 0x6d, 0x63, 0xcd, 0xb1, 0x1c, 0x57, 0x6d, 0x30, 0xf6, 0x73, 0x99, 0xec, 0x09, 0xfb, + 0x4e, 0x01, 0x67, 0x51, 0xa1, 0x35, 0x38, 0x14, 0x14, 0x3d, 0x22, 0x4f, 0x7c, 0x15, 0x18, 0xf5, + 0xb3, 0x99, 0xd4, 0xd4, 0xa8, 0x53, 0xc0, 0x31, 0x90, 0x4c, 0x42, 0x67, 0x4d, 0x6d, 0xe6, 0x90, + 0x50, 0x23, 0x99, 0x84, 0xa6, 0x65, 0x92, 0x7b, 0xa6, 0xbd, 0xab, 0xce, 0xe5, 0x90, 0x50, 0x23, + 0x99, 0x84, 0xa6, 0xd1, 0x43, 0x68, 0x85, 0x3d, 0x75, 0x9c, 0x5d, 0x3a, 0xe5, 0xea, 0x3c, 0x23, + 0x7a, 0x2e, 0x7b, 0xb4, 0x84, 0x61, 0xa7, 0x80, 0x27, 0xc0, 0xe8, 0x0e, 0xcc, 0x05, 0x79, 0xab, + 0x96, 0x39, 0xb0, 0xd5, 0x85, 0x29, 0xee, 0x46, 0xd9, 0x98, 0x55, 0xa7, 0x80, 0xe3, 0x30, 0xf4, + 0xa6, 0x58, 0x39, 0x34, 0xe0, 0x98, 0x7b, 0xea, 0x33, 0x8c, 0x65, 0x31, 0x3b, 0x4e, 0x99, 0x7b, + 0xe1, 0xd2, 0xe1, 0x90, 0xd0, 0x1f, 0xd6, 0x75, 0x5f, 0xdf, 0x33, 0xc9, 0x63, 0x4c, 0x7a, 0x8e, + 0x6b, 0x78, 0x5d, 0xe2, 0xab, 0x68, 0x8a, 0x3f, 0x04, 0xe6, 0xed, 0xc8, 0x3e, 0xf4, 0x87, 0x49, + 0x2a, 0x34, 0x04, 0x2d, 0xad, 0x68, 0x6b, 0x64, 0xe8, 0x3e, 0x51, 0x35, 0x56, 0xd1, 0xf9, 0x99, + 0x2a, 0xe2, 0x90, 0x4e, 0x01, 0x4f, 0x21, 0xcc, 0xaa, 0x6e, 0xc3, 0xf6, 0x88, 0xeb, 0xab, 0xc7, + 0x0f, 0x50, 0x1d, 0x87, 0x64, 0x55, 0xc7, 0x4b, 0xb3, 0xaa, 0x13, 0xe1, 0x6c, 0xf1, 0x00, 0xd5, + 0x85, 0xe1, 0x6d, 0x0a, 0x21, 0xd2, 0xe1, 0x68, 0xac, 0xb4, 0xeb, 0x8c, 0xdd, 0x1e, 0xa1, 0x33, + 0x76, 0x8a, 0x55, 0xf5, 0xfc, 0xf4, 0xaa, 0x42, 0xf3, 0x4e, 0x01, 0x67, 0x10, 0x85, 0x3b, 0x4c, + 0x50, 0xf2, 0x0e, 0x2d, 0x25, 0xbe, 0x7a, 0x78, 0xca, 0x0e, 0x13, 0x56, 0x20, 0x8c, 0xc3, 0x1d, + 0x26, 0x41, 0x32, 0xe1, 0x72, 0x34, 0x5f, 0x8c, 0xd5, 0x91, 0x59, 0x5c, 0x2e, 0xb2, 0x9f, 0x70, + 0xb9, 0xa8, 0x08, 0x8d, 0xe0, 0x78, 0x62, 0x0c, 0xf9, 0xf6, 0x29, 0x6a, 0x52, 0x59, 0x4d, 0x17, + 0xf2, 0x66, 0x45, 0xc6, 0x74, 0x0a, 0x78, 0x1a, 0x25, 0x1a, 0x80, 0x9a, 0x5a, 0x4c, 0x07, 0xee, + 0x18, 0xab, 0xee, 0x85, 0xd9, 0xaa, 0xe3, 0x83, 0x97, 0x49, 0x26, 0x87, 0xa3, 0x20, 0x5b, 0xfd, + 0x56, 0x4e, 0x38, 0x0a, 0x0c, 0xe5, 0x70, 0x14, 0xe4, 0xd1, 0x70, 0x34, 0xf6, 0x88, 0xcb, 0xac, + 0xdf, 0x72, 0x4c, 0x5b, 0x3d, 0x91, 0x1a, 0x8e, 0xb6, 0x3c, 0xe2, 0x0a, 0x4a, 0x6a, 0x45, 0xc3, + 0x51, 0x0c, 0x16, 0xe3, 0xb9, 0x47, 0xfa, 0xbe, 0x7a, 0x32, 0x8f, 0x87, 0x5a, 0xc5, 0x78, 0x68, + 0x06, 0x75, 0xbf, 0x30, 0xa3, 0x4b, 0x2c, 0xd2, 0xf3, 0xb1, 0x6e, 0x0f, 0x88, 0xfa, 0x5c, 0xaa, + 0xfb, 0x49, 0x74, 0x92, 0x31, 0x75, 0xbf, 0x34, 0x12, 0xb4, 0x05, 0x28, 0xcc, 0xa7, 0xfb, 0x0c, + 0xa7, 0x5e, 0x66, 0xd4, 0xa7, 0xb2, 0xa9, 0x43, 0xd3, 0x4e, 0x01, 0xa7, 0x10, 0xa0, 0x17, 0x40, + 0x19, 0x99, 0xf6, 0x40, 0x35, 0x18, 0xd1, 0xe1, 0x04, 0xd1, 0xa6, 0x69, 0x0f, 0x3a, 0x05, 0xcc, + 0x4c, 0xd0, 0x1b, 0x00, 0x23, 0xd7, 0xe9, 0x11, 0xcf, 0x7b, 0x40, 0x1e, 0xab, 0x84, 0x01, 0xb4, + 0x24, 0x80, 0x1b, 0xb4, 0x1f, 0x10, 0x2a, 0xb2, 0x24, 0x7b, 0x74, 0x1b, 0xe6, 0x44, 0x4a, 0x84, + 0xcf, 0x7e, 0xea, 0x96, 0x16, 0x10, 0x84, 0x01, 0x33, 0x8e, 0xa2, 0xa2, 0x4b, 0x64, 0xac, 0x3b, + 0x36, 0x51, 0x07, 0xa9, 0xa2, 0x2b, 0x20, 0xa1, 0x26, 0x74, 0xe7, 0x90, 0x10, 0xe8, 0x16, 0x1c, + 0xf2, 0x77, 0x5c, 0xa2, 0x1b, 0x5d, 0x5f, 0xf7, 0xc7, 0x9e, 0x6a, 0xa7, 0x6e, 0x3e, 0xbc, 0xb0, + 0xfd, 0x88, 0x59, 0xd2, 0x8d, 0x55, 0xc6, 0xdc, 0xaa, 0x41, 0x65, 0x4f, 0xb7, 0xc6, 0x44, 0xfb, + 0xa8, 0x08, 0x35, 0x21, 0xcd, 0xb5, 0x07, 0xa0, 0x30, 0x39, 0x79, 0x04, 0x2a, 0xa6, 0x6d, 0x90, + 0x27, 0xec, 0x38, 0x50, 0xc1, 0x3c, 0x81, 0x5e, 0x82, 0x9a, 0x10, 0xec, 0x42, 0x63, 0x66, 0x1d, + 0x35, 0x02, 0x33, 0xed, 0x3d, 0xa8, 0x05, 0x6a, 0x7c, 0x11, 0x1a, 0x23, 0xd7, 0xa1, 0xa2, 0x6f, + 0xc3, 0x60, 0xb4, 0x0d, 0x1c, 0x65, 0xa0, 0xef, 0x40, 0xcd, 0x10, 0x8a, 0x9f, 0x53, 0x1f, 0x6b, + 0xf3, 0x33, 0x55, 0x3b, 0x38, 0x53, 0xb5, 0xbb, 0xec, 0x4c, 0x85, 0x03, 0x3b, 0xed, 0xf7, 0x37, + 0xa0, 0xc2, 0x1c, 0x41, 0x7b, 0x19, 0xca, 0x54, 0xcb, 0x5e, 0x80, 0x2a, 0x5b, 0x5e, 0xc1, 0xd9, + 0xea, 0x48, 0xa2, 0x75, 0xcc, 0x18, 0x0b, 0x1b, 0xed, 0x53, 0x45, 0xf4, 0xf5, 0x28, 0x54, 0x5d, + 0xc7, 0xf1, 0xc3, 0x56, 0x89, 0x94, 0x44, 0x57, 0xca, 0xa7, 0x43, 0xd7, 0xa2, 0x0e, 0x94, 0x99, + 0x79, 0xee, 0x91, 0x25, 0xec, 0x09, 0x3a, 0x0f, 0x0a, 0x35, 0x64, 0xe2, 0x79, 0xfe, 0xf2, 0xb1, + 0x10, 0xd8, 0x1d, 0xea, 0xae, 0xcf, 0x7d, 0x7d, 0x7f, 0x44, 0x30, 0x33, 0x42, 0x37, 0xa0, 0xe9, + 0x6c, 0xbf, 0x4f, 0x7a, 0x3e, 0xcd, 0xf3, 0xd4, 0x0a, 0xab, 0x2c, 0x9a, 0xfa, 0xf0, 0x64, 0xfa, + 0x30, 0x34, 0xc2, 0x32, 0x00, 0xfd, 0x00, 0x0e, 0x47, 0xc9, 0x4d, 0xe2, 0x72, 0x3b, 0xb5, 0xca, + 0x78, 0x2e, 0x66, 0x1e, 0x37, 0x24, 0xbe, 0x10, 0x84, 0xd3, 0x98, 0xd0, 0x55, 0x68, 0xb8, 0xe1, + 0x71, 0xab, 0xc6, 0x68, 0xb5, 0xc9, 0xe6, 0x05, 0x01, 0x10, 0x47, 0xc6, 0xda, 0x0f, 0x41, 0x0b, + 0xb2, 0xdf, 0x35, 0xfd, 0x9d, 0x77, 0xa8, 0x7b, 0x46, 0xbc, 0x1a, 0xd4, 0x79, 0x75, 0xe1, 0x4c, + 0x85, 0x69, 0xb4, 0x2a, 0xd7, 0xc9, 0xa7, 0xeb, 0x54, 0x76, 0x9d, 0x21, 0xb9, 0x5c, 0xf9, 0xdb, + 0x70, 0x38, 0xa5, 0x8b, 0x53, 0x6b, 0x5d, 0x02, 0x88, 0x06, 0x40, 0x9c, 0xcd, 0xa5, 0x1c, 0x6d, + 0x0d, 0x9a, 0xd2, 0x99, 0x07, 0xa9, 0x50, 0x63, 0xce, 0x12, 0x32, 0x05, 0x49, 0x5a, 0x09, 0x5d, + 0x07, 0x9b, 0xba, 0xbf, 0xc3, 0x5a, 0xdf, 0xc0, 0x61, 0x5a, 0x3b, 0x0d, 0x55, 0xb1, 0xc9, 0x69, + 0xe2, 0x8c, 0x47, 0x8f, 0x23, 0x45, 0x6e, 0x15, 0xa4, 0xb5, 0xef, 0x43, 0x23, 0x3c, 0x1a, 0xa1, + 0x87, 0x70, 0x48, 0x1c, 0x8d, 0x78, 0x80, 0xa5, 0xc6, 0xf3, 0x92, 0x0c, 0x92, 0xfc, 0xb7, 0xbd, + 0xe6, 0xd8, 0x3e, 0x9d, 0x69, 0x1a, 0x4d, 0xd9, 0xe9, 0xaa, 0xcd, 0x5c, 0x26, 0x46, 0xa0, 0x7d, + 0xa4, 0x42, 0xb9, 0x4b, 0x7c, 0xed, 0x5e, 0xb4, 0x9c, 0xe7, 0xa1, 0x64, 0x06, 0xfd, 0x28, 0x99, + 0x5f, 0x68, 0x01, 0x6f, 0x41, 0x23, 0x3a, 0x58, 0x27, 0xf9, 0xae, 0x4e, 0xce, 0xe8, 0x8c, 0x5e, + 0x34, 0x82, 0x7a, 0xb8, 0xbb, 0x26, 0x59, 0x57, 0xa0, 0xbc, 0x4b, 0xf6, 0x45, 0x0b, 0xcf, 0xe4, + 0xee, 0xd8, 0xed, 0xbb, 0x64, 0x1f, 0x53, 0x84, 0x76, 0x1c, 0xca, 0x77, 0xc9, 0x3e, 0x8d, 0x8b, + 0x2c, 0x68, 0x0a, 0x4a, 0x11, 0x41, 0x37, 0xa0, 0x2a, 0x0e, 0x8f, 0xc9, 0xfa, 0x2e, 0x41, 0xb5, + 0xcf, 0xcf, 0xa3, 0x39, 0x83, 0x22, 0xcc, 0xb4, 0x9b, 0xd0, 0x94, 0x8f, 0x8c, 0x49, 0xbe, 0x93, + 0xd0, 0xec, 0x49, 0x87, 0x52, 0xee, 0x2b, 0x72, 0x96, 0x46, 0xe0, 0x50, 0xec, 0x4e, 0x21, 0xc9, + 0x70, 0x1b, 0x0e, 0xb9, 0xf2, 0xc5, 0x45, 0x29, 0x21, 0x5e, 0x64, 0xdf, 0x90, 0x89, 0x70, 0x0c, + 0xa6, 0xdd, 0x85, 0x85, 0xe4, 0xc1, 0x33, 0x59, 0xd3, 0x39, 0x58, 0xd8, 0x4e, 0x1c, 0x73, 0xf9, + 0x12, 0x49, 0x66, 0x6b, 0x1b, 0x50, 0xe1, 0x67, 0xaa, 0x24, 0xc5, 0x4b, 0x50, 0xd1, 0xd9, 0x19, + 0xad, 0xc4, 0x22, 0xa3, 0x96, 0xda, 0x4a, 0x06, 0xc5, 0xdc, 0x50, 0xfb, 0x93, 0x02, 0x0a, 0x3b, + 0xc1, 0x26, 0xa9, 0xae, 0x80, 0xe2, 0xd3, 0xe3, 0x70, 0x29, 0xe7, 0xfe, 0x87, 0xad, 0x03, 0x26, + 0x2d, 0x98, 0x3d, 0x7a, 0x0d, 0x2a, 0x9e, 0xbf, 0x6f, 0x05, 0x57, 0x23, 0xa7, 0xa6, 0x03, 0xbb, + 0xd4, 0x14, 0x73, 0x04, 0x85, 0xb2, 0x55, 0x24, 0x2e, 0x45, 0x72, 0xa0, 0x6c, 0xf9, 0x62, 0x8e, + 0x40, 0x37, 0xa1, 0xd6, 0xdb, 0x21, 0xbd, 0x5d, 0x62, 0x88, 0xdb, 0x90, 0x33, 0xd3, 0xc1, 0x6b, + 0xdc, 0x18, 0x07, 0x28, 0x5a, 0x77, 0x8f, 0x0d, 0x79, 0x75, 0x96, 0xba, 0xd9, 0x34, 0x60, 0x8e, + 0xd0, 0x16, 0xc5, 0x08, 0xa6, 0xfb, 0xfa, 0x1d, 0xa8, 0xb0, 0x4e, 0xa2, 0xeb, 0x72, 0xf1, 0xbc, + 0x74, 0xf2, 0xc9, 0x8c, 0x2e, 0x62, 0x70, 0x42, 0x1e, 0xd6, 0xe3, 0x38, 0x4f, 0x73, 0x16, 0x1e, + 0x31, 0x52, 0x9c, 0xe7, 0x04, 0xd4, 0x44, 0xe7, 0xe3, 0x0d, 0xae, 0x07, 0x06, 0xcf, 0x42, 0x85, + 0xfb, 0x67, 0x7a, 0x7f, 0x7e, 0x5d, 0x84, 0x32, 0x3d, 0x8c, 0x4f, 0xc6, 0x1f, 0x31, 0xef, 0x79, + 0x0e, 0xb3, 0x6e, 0xee, 0xc5, 0xa6, 0x5d, 0xbb, 0x1d, 0x8c, 0xd0, 0x1b, 0xf1, 0x11, 0x3a, 0x3b, + 0xb5, 0x67, 0x12, 0x0d, 0x6f, 0xd8, 0xcf, 0x2b, 0xa0, 0xb0, 0x6b, 0x94, 0x34, 0x4f, 0x0e, 0xf6, + 0x9b, 0x69, 0x0d, 0xa3, 0xe0, 0xb6, 0x24, 0x1c, 0x98, 0x27, 0xeb, 0x7e, 0xbe, 0x27, 0x33, 0x20, + 0x55, 0x89, 0xac, 0x4b, 0x54, 0xb0, 0x5e, 0x01, 0x65, 0x68, 0x0e, 0x89, 0x70, 0xe4, 0x9c, 0x2a, + 0xef, 0x9b, 0x43, 0x82, 0x99, 0x3d, 0xc5, 0xed, 0xe8, 0xde, 0x8e, 0xf0, 0xe1, 0x1c, 0x5c, 0x47, + 0xf7, 0x76, 0x30, 0xb3, 0xa7, 0x38, 0x5b, 0x1f, 0x12, 0xe1, 0xbc, 0x39, 0xb8, 0x07, 0x3a, 0xad, + 0x8f, 0xda, 0x53, 0x9c, 0x67, 0x7e, 0x40, 0xc4, 0x65, 0x5d, 0x0e, 0xae, 0x6b, 0x7e, 0x40, 0x30, + 0xb3, 0xa7, 0x2e, 0x4f, 0x59, 0x32, 0x5c, 0xe4, 0x59, 0xa8, 0xbc, 0x6b, 0x1a, 0xfe, 0x4e, 0xbc, + 0xb8, 0x12, 0x5b, 0x11, 0x74, 0x94, 0x0e, 0xb4, 0x22, 0xe4, 0x41, 0xe6, 0x3c, 0xeb, 0xa0, 0xd0, + 0xd9, 0x3a, 0x98, 0xdb, 0x44, 0x93, 0x2c, 0x58, 0x16, 0x41, 0xa1, 0x03, 0x99, 0xd1, 0x95, 0x45, + 0x50, 0xe8, 0xf4, 0x64, 0x97, 0xd2, 0x41, 0x89, 0x97, 0x96, 0x83, 0xd2, 0x0f, 0xcb, 0xa0, 0xb0, + 0x2b, 0xb9, 0xa4, 0x43, 0xbe, 0x0d, 0x73, 0xbe, 0xee, 0x0e, 0x08, 0x97, 0xaa, 0x1b, 0xc1, 0x05, + 0xf4, 0xf9, 0xa9, 0x17, 0x7d, 0xed, 0x47, 0x32, 0x04, 0xc7, 0x19, 0x66, 0x8f, 0xba, 0x8c, 0x2a, + 0x16, 0x75, 0xdf, 0x08, 0xb7, 0x5c, 0x25, 0xe7, 0xca, 0x96, 0x61, 0xf9, 0xc6, 0x1d, 0xee, 0xbf, + 0x67, 0x60, 0x2e, 0xd6, 0xb0, 0x2f, 0x35, 0x0a, 0xca, 0x8d, 0xe5, 0x3c, 0x2b, 0xa1, 0x72, 0xb8, + 0x18, 0x0f, 0x83, 0x99, 0x42, 0x41, 0x00, 0x7f, 0x57, 0x81, 0x7a, 0x78, 0xa5, 0x99, 0xa2, 0x72, + 0xc6, 0xae, 0x95, 0xab, 0x72, 0x02, 0x7c, 0x7b, 0xcb, 0xb5, 0x30, 0x45, 0xd0, 0xde, 0xf8, 0xa6, + 0x1f, 0x0e, 0xfb, 0xf3, 0xf9, 0xd0, 0x47, 0xd4, 0x1c, 0x73, 0x14, 0x7a, 0x08, 0x4d, 0x83, 0x78, + 0x3d, 0xd7, 0x1c, 0xb1, 0x7b, 0x11, 0x3e, 0xfe, 0x17, 0xf3, 0x49, 0xd6, 0x23, 0x10, 0x96, 0x19, + 0xd0, 0x06, 0x34, 0xcc, 0xa1, 0x3e, 0x20, 0x9d, 0x28, 0x88, 0x9c, 0xcf, 0xa7, 0xdb, 0x08, 0x20, + 0x38, 0x42, 0xd3, 0xb6, 0xf5, 0xf5, 0x3d, 0xb3, 0xe7, 0xd8, 0x8c, 0xac, 0x3a, 0x6b, 0xdb, 0xee, + 0x44, 0x20, 0x2c, 0x33, 0xa0, 0x6b, 0x22, 0x0c, 0xf3, 0x58, 0x73, 0x76, 0x86, 0xa1, 0x0a, 0x43, + 0x31, 0x55, 0x93, 0x5b, 0xae, 0x95, 0x1d, 0x6e, 0xd8, 0xa8, 0x66, 0x14, 0x9f, 0x82, 0xa6, 0x34, + 0x5e, 0x19, 0x46, 0xcf, 0x41, 0x23, 0x1c, 0x85, 0x6c, 0x1e, 0xa9, 0x6f, 0x19, 0x46, 0xd7, 0x45, + 0x4c, 0x7a, 0x35, 0xee, 0xe6, 0x27, 0x12, 0x6e, 0x4e, 0x1d, 0x7b, 0xd3, 0x25, 0xec, 0x26, 0x4d, + 0x0e, 0x46, 0x9f, 0x1c, 0x63, 0x7b, 0x98, 0xf5, 0x25, 0x1f, 0x1c, 0x1e, 0xc1, 0xc2, 0xba, 0xee, + 0xeb, 0xdb, 0xba, 0x47, 0xc4, 0xf5, 0x6c, 0x1a, 0xab, 0xcb, 0x8b, 0xc4, 0xe1, 0x21, 0x9b, 0x55, + 0xd8, 0x7d, 0xa3, 0xe2, 0xff, 0x77, 0x54, 0xfc, 0x5f, 0xb2, 0x54, 0xfc, 0x4a, 0x4c, 0xc5, 0x9f, + 0xca, 0xfa, 0xcc, 0x68, 0x4d, 0xc8, 0xf8, 0x6b, 0xf1, 0x0d, 0xe5, 0x74, 0x0e, 0x32, 0xb6, 0xa3, + 0x5c, 0x8b, 0xeb, 0xf8, 0x3c, 0x6c, 0x4c, 0xc8, 0xbf, 0x99, 0x14, 0xf2, 0x67, 0x73, 0xd0, 0x13, + 0x4a, 0xfe, 0x5a, 0x5c, 0xc9, 0xe7, 0xd5, 0xfe, 0x35, 0x96, 0xf2, 0xbf, 0xc9, 0x90, 0xf2, 0xaf, + 0xc5, 0xa5, 0xfc, 0x14, 0xaf, 0xf9, 0xaa, 0xb4, 0xfc, 0xaf, 0xb2, 0xb4, 0xfc, 0x4a, 0x4c, 0xcb, + 0x4f, 0x69, 0x59, 0x52, 0xcc, 0x5f, 0x8b, 0x8b, 0xf9, 0xd3, 0x39, 0xc8, 0x98, 0x9a, 0x5f, 0x89, + 0xa9, 0xf9, 0xbc, 0x4a, 0x25, 0x39, 0xbf, 0x12, 0x93, 0xf3, 0x79, 0x40, 0x49, 0xcf, 0xaf, 0xc4, + 0xf4, 0x7c, 0x1e, 0x50, 0x12, 0xf4, 0x2b, 0x31, 0x41, 0x9f, 0x07, 0xfc, 0x46, 0xd1, 0x1f, 0x4c, + 0xd1, 0xff, 0x2c, 0x4b, 0xd1, 0xe3, 0x74, 0x45, 0x7f, 0x21, 0x7b, 0xfc, 0xf3, 0x25, 0xfd, 0xec, + 0x11, 0x78, 0x52, 0xd3, 0x5f, 0x4f, 0x68, 0xfa, 0x33, 0x39, 0xe0, 0xff, 0x53, 0x51, 0xff, 0xc7, + 0x69, 0xa2, 0xfe, 0xaa, 0x2c, 0xea, 0xa7, 0xec, 0x22, 0x93, 0xaa, 0xfe, 0x46, 0x5c, 0xd5, 0x9f, + 0x9b, 0x01, 0x1b, 0x93, 0xf5, 0x9b, 0x69, 0xb2, 0xbe, 0x3d, 0x03, 0x4b, 0xa6, 0xae, 0x7f, 0x6b, + 0x52, 0xd7, 0x5f, 0x98, 0x81, 0x2f, 0x55, 0xd8, 0x6f, 0xa6, 0x09, 0xfb, 0x59, 0x5a, 0x97, 0xa9, + 0xec, 0x5f, 0x8f, 0x29, 0xfb, 0xe7, 0x67, 0x19, 0xae, 0xaf, 0x9f, 0xb4, 0xff, 0x43, 0x0d, 0xea, + 0xc1, 0x07, 0x72, 0xed, 0xb7, 0x45, 0xa8, 0x05, 0x4f, 0x0c, 0x92, 0x7e, 0x7b, 0x14, 0xaa, 0xd4, + 0x26, 0x7c, 0xbc, 0x28, 0x52, 0xe8, 0x06, 0x28, 0xf4, 0x97, 0x70, 0xca, 0x17, 0xa7, 0x6f, 0xa8, + 0xf2, 0xfb, 0x03, 0xcc, 0x70, 0x94, 0xd7, 0xe9, 0xf7, 0x3d, 0xe2, 0x33, 0x87, 0x9c, 0xc3, 0x22, + 0x45, 0x7b, 0x6b, 0x99, 0x43, 0xd3, 0x67, 0x7e, 0x35, 0x87, 0x79, 0x42, 0x7b, 0x05, 0x40, 0x7a, + 0xa0, 0x30, 0x63, 0x1b, 0xb5, 0x97, 0xa1, 0x11, 0x3d, 0xcc, 0x48, 0x01, 0x79, 0xac, 0x30, 0x00, + 0xf1, 0x94, 0x76, 0x0b, 0xe6, 0x13, 0xaf, 0x13, 0x52, 0xf4, 0x7f, 0xf0, 0xb9, 0xe2, 0xae, 0xf8, + 0x1a, 0xd1, 0xc0, 0x72, 0x96, 0xf6, 0x18, 0x9a, 0xf2, 0xab, 0x83, 0x03, 0x13, 0xa0, 0x2b, 0x50, + 0x0f, 0x92, 0x62, 0x84, 0xa7, 0x7d, 0x3d, 0x09, 0x6d, 0xb5, 0x1f, 0x01, 0x48, 0x6f, 0x87, 0x66, + 0x9d, 0x4b, 0xe9, 0xb4, 0x55, 0x9e, 0xed, 0xb4, 0x45, 0xa7, 0xc9, 0x77, 0x7c, 0xdd, 0x62, 0xab, + 0x6c, 0x0e, 0xf3, 0x84, 0xf6, 0xcb, 0x22, 0xcc, 0xc5, 0x1f, 0xf8, 0x7c, 0x85, 0x4d, 0x38, 0x0b, + 0xf3, 0x26, 0xab, 0x64, 0xd3, 0xf1, 0x4c, 0x36, 0x52, 0xdc, 0x65, 0x12, 0xb9, 0xda, 0xfb, 0x61, + 0x9b, 0xc4, 0xf7, 0xfb, 0x2f, 0xd0, 0x26, 0x65, 0xc6, 0x43, 0xe8, 0xdb, 0x61, 0x5d, 0x07, 0x73, + 0x55, 0xa4, 0xd2, 0xba, 0x86, 0xce, 0x1e, 0x31, 0xd8, 0xa7, 0xdc, 0x06, 0x0e, 0x92, 0xda, 0xbf, + 0x4b, 0xa0, 0x6c, 0x79, 0xc4, 0xd5, 0xfe, 0x55, 0x0a, 0x3e, 0x98, 0x5f, 0x05, 0x85, 0x3d, 0x1a, + 0x91, 0x3e, 0xe8, 0x17, 0x13, 0x1f, 0xf4, 0x63, 0x4f, 0x76, 0xa3, 0x0f, 0xfa, 0x57, 0x41, 0x61, + 0xcf, 0x44, 0x0e, 0x8e, 0xfc, 0x71, 0x11, 0x1a, 0xd1, 0x93, 0x8d, 0x03, 0xe3, 0xe5, 0xaf, 0xa7, + 0xa5, 0xf8, 0xd7, 0xd3, 0x17, 0xa1, 0xe2, 0xb2, 0xef, 0x9c, 0xdc, 0xd1, 0x93, 0xdf, 0xe9, 0x59, + 0x85, 0x98, 0x9b, 0x68, 0x04, 0x9a, 0xf2, 0x83, 0x94, 0x83, 0x37, 0xe3, 0xb4, 0x78, 0x3e, 0xb8, + 0x61, 0x78, 0xab, 0xae, 0xab, 0xef, 0x8b, 0xd3, 0x7b, 0x3c, 0x93, 0xea, 0xae, 0x4d, 0xd3, 0x1e, + 0xa4, 0xbf, 0xa3, 0xd0, 0xfe, 0x5a, 0x84, 0x9a, 0x78, 0xde, 0xa1, 0xad, 0x40, 0xf9, 0x01, 0x79, + 0x4c, 0x1b, 0x22, 0x1e, 0x78, 0x4c, 0x34, 0xe4, 0x3e, 0xeb, 0x85, 0xb0, 0xc7, 0x81, 0x99, 0x76, + 0x0d, 0xaa, 0xc2, 0x1d, 0x0f, 0x8e, 0xbd, 0x0a, 0x0a, 0x7b, 0x47, 0x72, 0x70, 0xe4, 0x4f, 0xeb, + 0x50, 0xe5, 0x0f, 0x48, 0xb4, 0xcf, 0x6b, 0x50, 0xe5, 0x6f, 0x4b, 0xd0, 0x0d, 0xa8, 0x79, 0xe3, + 0xe1, 0x50, 0x77, 0xf7, 0x05, 0xcf, 0xe9, 0x69, 0x4f, 0x51, 0xda, 0x5d, 0x6e, 0x8b, 0x03, 0x10, + 0x7a, 0x15, 0x94, 0x9e, 0xde, 0x27, 0x13, 0xd7, 0x18, 0x69, 0xe0, 0x35, 0xbd, 0x4f, 0x30, 0x33, + 0x47, 0x6f, 0x42, 0x5d, 0x4c, 0x4b, 0xb0, 0xe8, 0xa7, 0xd7, 0x1b, 0x4c, 0x66, 0x88, 0xd2, 0xde, + 0x82, 0x9a, 0x68, 0x0c, 0xba, 0x09, 0x55, 0x8f, 0xbf, 0xa6, 0x49, 0xaa, 0xbe, 0xd4, 0x2e, 0xec, + 0xdb, 0x3d, 0x9e, 0x83, 0x05, 0x4c, 0xfb, 0x5b, 0x09, 0x14, 0xda, 0xb8, 0xff, 0x9a, 0x09, 0x2d, + 0x01, 0x58, 0xba, 0xe7, 0x6f, 0x8e, 0x2d, 0x8b, 0x70, 0x6f, 0x2f, 0x63, 0x29, 0x07, 0x9d, 0x83, + 0x05, 0x9e, 0xf2, 0x76, 0xba, 0xe3, 0x5e, 0x8f, 0x10, 0x83, 0xb9, 0x7e, 0x1d, 0x27, 0xb3, 0xd1, + 0x2a, 0x54, 0xd8, 0x33, 0x6b, 0x21, 0xda, 0xce, 0xe7, 0x8e, 0x6c, 0x7b, 0xd3, 0xb4, 0x45, 0x6b, + 0x38, 0x52, 0x73, 0xa0, 0x11, 0xe6, 0xd1, 0x45, 0x38, 0x32, 0x6d, 0xdb, 0xb4, 0x07, 0xc2, 0xa3, + 0x83, 0x24, 0x8d, 0x4b, 0xf4, 0xa7, 0x68, 0x6f, 0x05, 0x8b, 0x14, 0xcd, 0xef, 0xeb, 0xa6, 0x25, + 0x9a, 0x58, 0xc1, 0x22, 0x45, 0x99, 0xc6, 0xcc, 0x7d, 0xf9, 0x9b, 0xf1, 0x32, 0x0e, 0x92, 0xda, + 0xd3, 0xe8, 0x3d, 0xd2, 0x44, 0xf4, 0x43, 0xe2, 0x20, 0xc9, 0x23, 0x00, 0x3f, 0x23, 0x2e, 0xca, + 0x62, 0xb2, 0xcc, 0x1f, 0x16, 0x45, 0xf2, 0x90, 0xca, 0x04, 0xdb, 0x32, 0x6d, 0x7e, 0xdc, 0xad, + 0x63, 0x91, 0x4a, 0x8c, 0x71, 0x65, 0x62, 0x8c, 0x45, 0xf9, 0x6d, 0xc3, 0xf4, 0x59, 0x48, 0x0d, + 0xcb, 0x79, 0x0e, 0xba, 0x0e, 0x35, 0x83, 0xec, 0x99, 0x3d, 0x12, 0xbc, 0x71, 0x39, 0x35, 0x75, + 0x6c, 0xd7, 0x99, 0x2d, 0x0e, 0x30, 0x9a, 0x0f, 0x55, 0x9e, 0x15, 0x76, 0xa9, 0x28, 0x75, 0x29, + 0x6a, 0x74, 0x69, 0x4a, 0xa3, 0xcb, 0x39, 0x8d, 0x56, 0x92, 0x8d, 0x5e, 0xbe, 0x0b, 0x10, 0xb9, + 0x1b, 0x6a, 0x42, 0x6d, 0xcb, 0xde, 0xb5, 0x9d, 0xc7, 0x76, 0xab, 0x40, 0x13, 0x0f, 0xfb, 0x7d, + 0x5a, 0x4b, 0xab, 0x48, 0x13, 0xd4, 0xce, 0xb4, 0x07, 0xad, 0x12, 0x02, 0xa8, 0xd2, 0x04, 0x31, + 0x5a, 0x65, 0xfa, 0xfb, 0x0e, 0x9b, 0xbf, 0x96, 0xb2, 0xac, 0xd3, 0xad, 0xca, 0x1b, 0x39, 0xb6, + 0x47, 0xbe, 0xa2, 0x7f, 0xb7, 0x2c, 0xff, 0xa4, 0x0c, 0x15, 0x16, 0x88, 0xb4, 0xcf, 0x4b, 0x61, + 0xc8, 0x4c, 0xb9, 0x9e, 0x8d, 0x2e, 0x51, 0xe6, 0xa5, 0x77, 0x74, 0xb1, 0x10, 0x26, 0x5f, 0x9e, + 0x5c, 0x96, 0x2f, 0x4f, 0xe6, 0xa5, 0xc7, 0x53, 0x71, 0x44, 0xec, 0xd2, 0xe4, 0x75, 0xa8, 0x8f, + 0x5c, 0x67, 0xe0, 0xd2, 0x58, 0xa9, 0x24, 0xfe, 0x5b, 0x10, 0x87, 0x6d, 0x0a, 0x33, 0x1c, 0x02, + 0xb4, 0x07, 0x50, 0x0f, 0x72, 0x23, 0xe1, 0x23, 0x8e, 0xe2, 0x2c, 0x41, 0xbd, 0xc0, 0x70, 0xc4, + 0x7c, 0x97, 0x31, 0xfb, 0x4d, 0x97, 0x88, 0x18, 0x27, 0xe1, 0xd6, 0x41, 0x72, 0xf9, 0xa2, 0xd0, + 0xee, 0x73, 0xd0, 0x58, 0x77, 0x9d, 0x11, 0x7b, 0x64, 0xd4, 0x2a, 0xd0, 0xd9, 0xd9, 0x18, 0x8e, + 0x1c, 0xd7, 0x6f, 0x15, 0xe9, 0xef, 0xdb, 0x4f, 0xd8, 0xef, 0xd2, 0xf2, 0x6a, 0x70, 0x9f, 0x51, + 0x07, 0xe5, 0x81, 0x63, 0x13, 0x3e, 0xdd, 0x78, 0xcc, 0x56, 0x6e, 0xab, 0x48, 0xb3, 0xe9, 0x76, + 0xd0, 0x2a, 0xa1, 0x43, 0x50, 0x5f, 0xd3, 0xed, 0x1e, 0xb1, 0xd8, 0x6c, 0x37, 0xa0, 0x72, 0xdb, + 0x75, 0x1d, 0xb7, 0xa5, 0xbc, 0xf8, 0xe7, 0x22, 0xcc, 0xc7, 0x9f, 0xa3, 0x51, 0xd4, 0xa6, 0x3e, + 0xa0, 0x64, 0x75, 0x50, 0x3a, 0xce, 0x90, 0x3a, 0xce, 0x02, 0x34, 0x37, 0xf9, 0x9b, 0x3e, 0x56, + 0x54, 0xa2, 0xf5, 0xac, 0xba, 0xbd, 0x1d, 0x73, 0x8f, 0xb4, 0xca, 0xb4, 0xf4, 0x16, 0x5d, 0x0d, + 0x3d, 0x77, 0x3c, 0xdc, 0xf6, 0x5a, 0x0a, 0xaa, 0xb1, 0x67, 0x45, 0xad, 0x0a, 0x9a, 0x07, 0x88, + 0x1e, 0x5f, 0xb5, 0xaa, 0x94, 0x91, 0x76, 0xaa, 0x55, 0x43, 0x87, 0x61, 0xe1, 0xbe, 0xee, 0xee, + 0x12, 0x7f, 0x64, 0xe9, 0x3d, 0xc2, 0x8a, 0xeb, 0xe8, 0x18, 0x1c, 0x96, 0x32, 0x03, 0x19, 0xdb, + 0x6a, 0xd0, 0xf6, 0x87, 0x29, 0xb8, 0xb5, 0xf8, 0xf7, 0xa7, 0x4b, 0xc5, 0x8f, 0x9f, 0x2e, 0x15, + 0x3f, 0x7d, 0xba, 0x54, 0xfc, 0xc5, 0x67, 0x4b, 0x85, 0x8f, 0x3f, 0x5b, 0x2a, 0x7c, 0xf2, 0xd9, + 0x52, 0xe1, 0xbd, 0xd2, 0x68, 0x7b, 0xbb, 0xca, 0x44, 0xd8, 0xcb, 0xff, 0x09, 0x00, 0x00, 0xff, + 0xff, 0x1f, 0x14, 0x60, 0xc9, 0x2f, 0x36, 0x00, 0x00, } func (m *Event) Marshal() (dAtA []byte, err error) { diff --git a/pb/protos/events.proto b/pb/protos/events.proto index 6d880c59d..afb29057c 100644 --- a/pb/protos/events.proto +++ b/pb/protos/events.proto @@ -693,6 +693,7 @@ enum SmartBlockType { MarketplaceType = 8; MarketplaceRelation = 9; + Relation = 10; } message ResponseEvent { diff --git a/pkg/lib/core/smartblock/smartblock.go b/pkg/lib/core/smartblock/smartblock.go index a59ea6191..d89c48895 100644 --- a/pkg/lib/core/smartblock/smartblock.go +++ b/pkg/lib/core/smartblock/smartblock.go @@ -83,8 +83,20 @@ func (sbt SmartBlockType) ToProto() model.ObjectInfoType { return model.ObjectInfo_Set case SmartblockTypeMarketplaceType: return model.ObjectInfo_Set + case SmartblockTypeMarketplaceRelation: + return model.ObjectInfo_Set + case SmartBlockTypeFile: + return model.ObjectInfo_File + case SmartBlockTypeObjectType: + return model.ObjectInfo_ObjectType + case SmartBlockTypeBundledObjectType: + return model.ObjectInfo_ObjectType + case SmartBlockTypeBundledRelation: + return model.ObjectInfo_Relation + case SmartBlockTypeIndexedRelation: + return model.ObjectInfo_Relation default: - return model.ObjectInfo_Page + panic("unknown smartblock type") } } @@ -135,6 +147,18 @@ func SmartBlockTypeToProto(t SmartBlockType) pb.SmartBlockType { return pb.SmartBlockType_Set case SmartBlockTypeObjectType: return pb.SmartBlockType_ObjectType + case SmartBlockTypeBundledObjectType: + return pb.SmartBlockType_ObjectType + case SmartBlockTypeBundledRelation: + return pb.SmartBlockType_Relation + case SmartBlockTypeIndexedRelation: + return pb.SmartBlockType_Relation + case SmartblockTypeMarketplaceRelation: + return pb.SmartBlockType_MarketplaceRelation + case SmartblockTypeMarketplaceType: + return pb.SmartBlockType_MarketplaceType + default: + panic("unknown smartblock type") } return 0 } @@ -153,6 +177,12 @@ func SmartBlockTypeToCore(t pb.SmartBlockType) SmartBlockType { return SmartBlockTypeSet case pb.SmartBlockType_ObjectType: return SmartBlockTypeObjectType + case pb.SmartBlockType_MarketplaceType: + return SmartblockTypeMarketplaceType + case pb.SmartBlockType_MarketplaceRelation: + return SmartblockTypeMarketplaceRelation + default: + panic("unknown smartblock type") } return 0 } diff --git a/pkg/lib/pb/model/localstore.pb.go b/pkg/lib/pb/model/localstore.pb.go index 68279a03e..2b06c297c 100644 --- a/pkg/lib/pb/model/localstore.pb.go +++ b/pkg/lib/pb/model/localstore.pb.go @@ -32,6 +32,9 @@ const ( ObjectInfo_ProfilePage ObjectInfoType = 2 ObjectInfo_Archive ObjectInfoType = 3 ObjectInfo_Set ObjectInfoType = 5 + ObjectInfo_File ObjectInfoType = 6 + ObjectInfo_ObjectType ObjectInfoType = 7 + ObjectInfo_Relation ObjectInfoType = 8 ) var ObjectInfoType_name = map[int32]string{ @@ -40,6 +43,9 @@ var ObjectInfoType_name = map[int32]string{ 2: "ProfilePage", 3: "Archive", 5: "Set", + 6: "File", + 7: "ObjectType", + 8: "Relation", } var ObjectInfoType_value = map[string]int32{ @@ -48,6 +54,9 @@ var ObjectInfoType_value = map[string]int32{ "ProfilePage": 2, "Archive": 3, "Set": 5, + "File": 6, + "ObjectType": 7, + "Relation": 8, } func (x ObjectInfoType) String() string { @@ -494,42 +503,43 @@ func init() { } var fileDescriptor_9c35df71910469a5 = []byte{ - // 551 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0x4f, 0x8b, 0xd3, 0x40, - 0x18, 0xc6, 0x3b, 0x69, 0xbb, 0x69, 0xdf, 0xd0, 0x3f, 0x8c, 0x07, 0xe3, 0xae, 0x84, 0x10, 0x44, - 0xa2, 0x60, 0x82, 0x5d, 0x3d, 0x78, 0x51, 0x76, 0xd9, 0x83, 0x05, 0xa1, 0x4b, 0x56, 0x11, 0xbc, - 0x25, 0xed, 0xb4, 0x1d, 0x37, 0x9b, 0x09, 0xc9, 0x54, 0xe8, 0xc1, 0xa3, 0x17, 0x4f, 0x7e, 0x01, - 0xbf, 0x8f, 0xc7, 0x3d, 0x7a, 0x94, 0xf6, 0x53, 0x78, 0x93, 0xcc, 0x74, 0xda, 0xb4, 0xac, 0x55, - 0xd0, 0x53, 0x9b, 0x77, 0x7e, 0xf3, 0xe4, 0x79, 0x9f, 0xf7, 0x25, 0xe0, 0xa6, 0x97, 0x13, 0x3f, - 0xa6, 0x91, 0x9f, 0x46, 0xfe, 0x15, 0x1b, 0x91, 0xd8, 0x4f, 0x33, 0xc6, 0x59, 0xee, 0xc7, 0x6c, - 0x18, 0xc6, 0x39, 0x67, 0x19, 0xf1, 0x44, 0x05, 0xb7, 0xc2, 0x64, 0xce, 0xe7, 0x29, 0xf1, 0x04, - 0x76, 0x78, 0x77, 0xc2, 0xd8, 0x24, 0x26, 0x12, 0x8f, 0x66, 0x63, 0x3f, 0xe7, 0xd9, 0x6c, 0xc8, - 0x25, 0x7c, 0xf8, 0xa0, 0x24, 0x9b, 0x91, 0x38, 0xe4, 0x94, 0x25, 0x4a, 0x59, 0x3d, 0x4b, 0xd4, - 0xf9, 0xa9, 0x01, 0x0c, 0xa2, 0xf7, 0x64, 0xc8, 0xfb, 0xc9, 0x98, 0xe1, 0x36, 0x68, 0x74, 0x64, - 0x22, 0x1b, 0xb9, 0xcd, 0x40, 0xa3, 0x23, 0x7c, 0x1f, 0xda, 0x4c, 0x9c, 0xbe, 0x9e, 0xa7, 0xe4, - 0x4d, 0x16, 0xe7, 0xa6, 0x66, 0x57, 0xdd, 0x66, 0xb0, 0x53, 0xc5, 0x8f, 0x41, 0x1f, 0x11, 0x1e, - 0xd2, 0x38, 0x37, 0xab, 0x36, 0x72, 0x8d, 0xde, 0x6d, 0x4f, 0x3a, 0xf4, 0x94, 0x43, 0xef, 0x42, - 0x38, 0x0c, 0x14, 0x87, 0x9f, 0x41, 0x53, 0x79, 0xc9, 0xcd, 0x9a, 0xb8, 0x74, 0xe4, 0xa9, 0x2e, - 0xd7, 0x2e, 0x03, 0x85, 0x04, 0x1b, 0x1a, 0x9b, 0xa0, 0xe7, 0x09, 0x4d, 0x53, 0xc2, 0xcd, 0xba, - 0xb0, 0xaa, 0x1e, 0xb1, 0x0b, 0x9d, 0x69, 0x98, 0xf7, 0x93, 0x88, 0xcd, 0x92, 0xd1, 0x2b, 0x9a, - 0x5c, 0xe6, 0xe6, 0x81, 0x8d, 0xdc, 0x46, 0xb0, 0x5b, 0xc6, 0xcf, 0x01, 0x36, 0x3d, 0x98, 0xba, - 0x8d, 0xdc, 0x76, 0xcf, 0xf2, 0xb6, 0x52, 0xf6, 0x36, 0xc1, 0x78, 0x05, 0x15, 0x94, 0x6e, 0x38, - 0x27, 0x50, 0x2b, 0x7e, 0x71, 0x03, 0x6a, 0xe7, 0xe1, 0x84, 0x74, 0x2b, 0xc5, 0xbf, 0x97, 0xec, - 0x8a, 0x74, 0x11, 0xee, 0x80, 0x71, 0x9e, 0xb1, 0x31, 0x8d, 0x89, 0x38, 0xd2, 0xb0, 0x01, 0xfa, - 0x49, 0x36, 0x9c, 0xd2, 0x0f, 0xa4, 0x5b, 0xc5, 0x3a, 0x54, 0x2f, 0x08, 0xef, 0xd6, 0x9d, 0x53, - 0x68, 0xc9, 0x37, 0x9c, 0xad, 0x22, 0x29, 0xa5, 0x88, 0xfe, 0x2e, 0x45, 0x67, 0x00, 0x86, 0xd4, - 0x90, 0x5d, 0x59, 0x00, 0x54, 0x76, 0xd9, 0x3f, 0x2b, 0x44, 0x8a, 0x59, 0x95, 0x2a, 0xd8, 0x06, - 0x83, 0xcd, 0xf8, 0x1a, 0x90, 0xc3, 0x2c, 0x97, 0x9c, 0x8f, 0xd0, 0x29, 0x09, 0x8a, 0xa5, 0x38, - 0x06, 0x7d, 0x25, 0x21, 0x14, 0x8d, 0xde, 0x9d, 0xdf, 0xe6, 0x14, 0x28, 0x12, 0x3f, 0x85, 0x86, - 0x92, 0x15, 0xaf, 0xd9, 0x7b, 0x6b, 0x8d, 0x3a, 0x9f, 0x11, 0xdc, 0xda, 0x1c, 0xbc, 0xa5, 0x7c, - 0x2a, 0x1b, 0xdb, 0x5d, 0xcc, 0x47, 0x50, 0xa3, 0xc9, 0x98, 0x99, 0x9a, 0xc8, 0x69, 0x8f, 0xb4, - 0xc0, 0xf0, 0x13, 0xa8, 0xc7, 0x62, 0x1b, 0xe4, 0x76, 0xde, 0x3c, 0xe8, 0x75, 0xc7, 0x81, 0x84, - 0x9d, 0xaf, 0x08, 0x8e, 0xb6, 0xcd, 0x0c, 0x56, 0x3e, 0xff, 0x8b, 0xa9, 0x17, 0xd0, 0x62, 0x65, - 0x3d, 0xb3, 0xfa, 0xa7, 0x9c, 0xb6, 0x79, 0xe7, 0x13, 0x02, 0x6b, 0x8f, 0xbf, 0x62, 0xe0, 0xff, - 0x68, 0xf1, 0xde, 0x4d, 0x16, 0x9b, 0x3b, 0x3e, 0x4e, 0x1f, 0x7e, 0x5b, 0x58, 0xe8, 0x7a, 0x61, - 0xa1, 0x1f, 0x0b, 0x0b, 0x7d, 0x59, 0x5a, 0x95, 0xeb, 0xa5, 0x55, 0xf9, 0xbe, 0xb4, 0x2a, 0xef, - 0xba, 0xbb, 0x1f, 0xb8, 0xe8, 0x40, 0xac, 0xf2, 0xf1, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd1, - 0xdd, 0xa7, 0xee, 0xfb, 0x04, 0x00, 0x00, + // 572 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0x41, 0x8b, 0xd3, 0x4e, + 0x18, 0xc6, 0x3b, 0x4d, 0x77, 0xd3, 0xbe, 0xf9, 0x6f, 0x1b, 0xe6, 0x7f, 0x30, 0xee, 0x4a, 0x08, + 0x41, 0x24, 0x0a, 0x26, 0xd8, 0xd5, 0x83, 0x17, 0xc5, 0x65, 0x11, 0x0b, 0x42, 0x97, 0xac, 0x22, + 0x78, 0x4b, 0xda, 0x69, 0x3b, 0x6e, 0x36, 0x13, 0x92, 0xa9, 0xd0, 0x83, 0x47, 0x2f, 0x9e, 0xfc, + 0x02, 0x1e, 0xfc, 0x36, 0x1e, 0xf7, 0xe8, 0x51, 0xda, 0x2f, 0x22, 0x99, 0xe9, 0xb4, 0x69, 0x59, + 0xab, 0xa0, 0xa7, 0x76, 0xde, 0xf9, 0xcd, 0xd3, 0xe7, 0x7d, 0xde, 0x97, 0x82, 0x97, 0x5d, 0x8c, + 0x83, 0x84, 0xc6, 0x41, 0x16, 0x07, 0x97, 0x6c, 0x48, 0x92, 0x20, 0xcb, 0x19, 0x67, 0x45, 0x90, + 0xb0, 0x41, 0x94, 0x14, 0x9c, 0xe5, 0xc4, 0x17, 0x15, 0x7c, 0x10, 0xa5, 0x33, 0x3e, 0xcb, 0x88, + 0x2f, 0xb0, 0xc3, 0x5b, 0x63, 0xc6, 0xc6, 0x09, 0x91, 0x78, 0x3c, 0x1d, 0x05, 0x05, 0xcf, 0xa7, + 0x03, 0x2e, 0xe1, 0xc3, 0xbb, 0x15, 0xd9, 0x9c, 0x24, 0x11, 0xa7, 0x2c, 0x55, 0xca, 0xea, 0x2c, + 0x51, 0xf7, 0xab, 0x06, 0xd0, 0x8f, 0xdf, 0x91, 0x01, 0xef, 0xa5, 0x23, 0x86, 0xdb, 0x50, 0xa7, + 0x43, 0x0b, 0x39, 0xc8, 0x6b, 0x85, 0x75, 0x3a, 0xc4, 0x77, 0xa0, 0xcd, 0xc4, 0xed, 0xab, 0x59, + 0x46, 0x5e, 0xe7, 0x49, 0x61, 0xd5, 0x1d, 0xcd, 0x6b, 0x85, 0x5b, 0x55, 0xfc, 0x00, 0xf4, 0x21, + 0xe1, 0x11, 0x4d, 0x0a, 0x4b, 0x73, 0x90, 0x67, 0x74, 0x6f, 0xf8, 0xd2, 0xa1, 0xaf, 0x1c, 0xfa, + 0xe7, 0xc2, 0x61, 0xa8, 0x38, 0xfc, 0x18, 0x5a, 0xca, 0x4b, 0x61, 0x35, 0xc4, 0xa3, 0x23, 0x5f, + 0x75, 0xb9, 0x72, 0x19, 0x2a, 0x24, 0x5c, 0xd3, 0xd8, 0x02, 0xbd, 0x48, 0x69, 0x96, 0x11, 0x6e, + 0xed, 0x09, 0xab, 0xea, 0x88, 0x3d, 0xe8, 0x4c, 0xa2, 0xa2, 0x97, 0xc6, 0x6c, 0x9a, 0x0e, 0x5f, + 0xd2, 0xf4, 0xa2, 0xb0, 0xf6, 0x1d, 0xe4, 0x35, 0xc3, 0xed, 0x32, 0x7e, 0x02, 0xb0, 0xee, 0xc1, + 0xd2, 0x1d, 0xe4, 0xb5, 0xbb, 0xb6, 0xbf, 0x91, 0xb2, 0xbf, 0x0e, 0xc6, 0x2f, 0xa9, 0xb0, 0xf2, + 0xc2, 0xa5, 0xd0, 0x28, 0x3f, 0x71, 0x13, 0x1a, 0x67, 0xd1, 0x98, 0x98, 0xb5, 0xf2, 0xdb, 0x0b, + 0x76, 0x49, 0x4c, 0x84, 0x3b, 0x60, 0x9c, 0xe5, 0x6c, 0x44, 0x13, 0x22, 0xae, 0xea, 0xd8, 0x00, + 0xfd, 0x59, 0x3e, 0x98, 0xd0, 0xf7, 0xc4, 0xd4, 0xb0, 0x0e, 0xda, 0x39, 0xe1, 0xe6, 0x5e, 0xf9, + 0xe0, 0x39, 0x4d, 0x88, 0xb9, 0x8f, 0xdb, 0x6a, 0x08, 0xa5, 0xa4, 0xa9, 0xe3, 0xff, 0xa0, 0xa9, + 0x1a, 0x37, 0x9b, 0xee, 0x09, 0x1c, 0xc8, 0xdb, 0xd3, 0x65, 0x74, 0x95, 0xb4, 0xd1, 0x9f, 0xa5, + 0xed, 0xf6, 0xc1, 0x90, 0x1a, 0xb2, 0x7b, 0x1b, 0x80, 0xca, 0x34, 0x7a, 0xa7, 0xa5, 0x48, 0x39, + 0xd3, 0x4a, 0x05, 0x3b, 0x60, 0xb0, 0x29, 0x5f, 0x01, 0x72, 0xe8, 0xd5, 0x92, 0xfb, 0x01, 0x3a, + 0x15, 0x41, 0xb1, 0x3c, 0xc7, 0xa0, 0x2f, 0x25, 0x84, 0xa2, 0xd1, 0xbd, 0xf9, 0xcb, 0x3c, 0x43, + 0x45, 0xe2, 0x47, 0xd0, 0x54, 0xb2, 0xe2, 0x67, 0x76, 0xbe, 0x5a, 0xa1, 0xee, 0x27, 0x04, 0xff, + 0xaf, 0x2f, 0xde, 0x50, 0x3e, 0x91, 0x8d, 0x6d, 0x2f, 0xf0, 0x7d, 0x68, 0xd0, 0x74, 0xc4, 0xac, + 0xba, 0xc8, 0x69, 0x87, 0xb4, 0xc0, 0xf0, 0x43, 0xd8, 0x4b, 0xc4, 0xd6, 0xc8, 0x2d, 0xbe, 0x7e, + 0x21, 0x56, 0x1d, 0x87, 0x12, 0x76, 0xbf, 0x20, 0x38, 0xda, 0x34, 0xd3, 0x5f, 0xfa, 0xfc, 0x27, + 0xa6, 0x9e, 0xc2, 0x01, 0xab, 0xea, 0x59, 0xda, 0xef, 0x72, 0xda, 0xe4, 0xdd, 0x8f, 0x08, 0xec, + 0x1d, 0xfe, 0xca, 0x81, 0xff, 0xa5, 0xc5, 0xdb, 0xd7, 0x59, 0x6c, 0x6d, 0xf9, 0x38, 0xb9, 0xf7, + 0x6d, 0x6e, 0xa3, 0xab, 0xb9, 0x8d, 0x7e, 0xcc, 0x6d, 0xf4, 0x79, 0x61, 0xd7, 0xae, 0x16, 0x76, + 0xed, 0xfb, 0xc2, 0xae, 0xbd, 0x35, 0xb7, 0xff, 0x08, 0xe3, 0x7d, 0xb1, 0xca, 0xc7, 0x3f, 0x03, + 0x00, 0x00, 0xff, 0xff, 0x81, 0xeb, 0x89, 0x41, 0x23, 0x05, 0x00, 0x00, } func (m *ObjectInfo) Marshal() (dAtA []byte, err error) { diff --git a/pkg/lib/pb/model/protos/localstore.proto b/pkg/lib/pb/model/protos/localstore.proto index 5abb89bf6..af0906572 100644 --- a/pkg/lib/pb/model/protos/localstore.proto +++ b/pkg/lib/pb/model/protos/localstore.proto @@ -22,6 +22,9 @@ message ObjectInfo { Archive = 3; Set = 5; + File = 6; + ObjectType = 7; + Relation = 8; } } diff --git a/pkg/lib/pb/relation/relation.pb.go b/pkg/lib/pb/relation/relation.pb.go index 734ef2795..d782255d4 100644 --- a/pkg/lib/pb/relation/relation.pb.go +++ b/pkg/lib/pb/relation/relation.pb.go @@ -445,8 +445,9 @@ type Relation struct { SelectDict []*RelationOption `protobuf:"bytes,12,rep,name=selectDict,proto3" json:"selectDict,omitempty"` MaxCount int32 `protobuf:"varint,13,opt,name=maxCount,proto3" json:"maxCount,omitempty"` Description string `protobuf:"bytes,14,opt,name=description,proto3" json:"description,omitempty"` - Scope RelationScope `protobuf:"varint,20,opt,name=scope,proto3,enum=anytype.relation.RelationScope" json:"scope,omitempty"` - Creator string `protobuf:"bytes,21,opt,name=creator,proto3" json:"creator,omitempty"` + // on-store fields, injected only locally + Scope RelationScope `protobuf:"varint,20,opt,name=scope,proto3,enum=anytype.relation.RelationScope" json:"scope,omitempty"` + Creator string `protobuf:"bytes,21,opt,name=creator,proto3" json:"creator,omitempty"` } func (m *Relation) Reset() { *m = Relation{} }