From 42121385467c9cfcf9f88411c8e35db0743fb5a5 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Mon, 27 Feb 2023 22:50:11 +0100 Subject: [PATCH 01/19] Update coordinator proto --- .../coordinatorproto/coordinator.pb.go | 850 +++++++++++++++++- .../coordinatorproto/coordinator_drpc.pb.go | 82 +- .../coordinatorproto/protos/coordinator.proto | 33 + 3 files changed, 937 insertions(+), 28 deletions(-) diff --git a/coordinator/coordinatorproto/coordinator.pb.go b/coordinator/coordinatorproto/coordinator.pb.go index fdd764ad..172ffe8a 100644 --- a/coordinator/coordinatorproto/coordinator.pb.go +++ b/coordinator/coordinatorproto/coordinator.pb.go @@ -22,6 +22,34 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package +type SpaceStatus int32 + +const ( + SpaceStatus_SpaceStatusCreated SpaceStatus = 0 + SpaceStatus_SpaceStatusPendingDeletion SpaceStatus = 1 + SpaceStatus_SpaceStatusDeleted SpaceStatus = 2 +) + +var SpaceStatus_name = map[int32]string{ + 0: "SpaceStatusCreated", + 1: "SpaceStatusPendingDeletion", + 2: "SpaceStatusDeleted", +} + +var SpaceStatus_value = map[string]int32{ + "SpaceStatusCreated": 0, + "SpaceStatusPendingDeletion": 1, + "SpaceStatusDeleted": 2, +} + +func (x SpaceStatus) String() string { + return proto.EnumName(SpaceStatus_name, int32(x)) +} + +func (SpaceStatus) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_d94f6f99586adae2, []int{0} +} + type SpaceSignRequest struct { SpaceId string `protobuf:"bytes,1,opt,name=spaceId,proto3" json:"spaceId,omitempty"` } @@ -344,13 +372,214 @@ func (m *FileLimitCheckResponse) GetLimit() uint64 { return 0 } +// SpaceStatusCheckRequest contains the spaceId of requested space +type SpaceStatusCheckRequest struct { + SpaceId string `protobuf:"bytes,1,opt,name=spaceId,proto3" json:"spaceId,omitempty"` +} + +func (m *SpaceStatusCheckRequest) Reset() { *m = SpaceStatusCheckRequest{} } +func (m *SpaceStatusCheckRequest) String() string { return proto.CompactTextString(m) } +func (*SpaceStatusCheckRequest) ProtoMessage() {} +func (*SpaceStatusCheckRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_d94f6f99586adae2, []int{6} +} +func (m *SpaceStatusCheckRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *SpaceStatusCheckRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_SpaceStatusCheckRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *SpaceStatusCheckRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SpaceStatusCheckRequest.Merge(m, src) +} +func (m *SpaceStatusCheckRequest) XXX_Size() int { + return m.Size() +} +func (m *SpaceStatusCheckRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SpaceStatusCheckRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_SpaceStatusCheckRequest proto.InternalMessageInfo + +func (m *SpaceStatusCheckRequest) GetSpaceId() string { + if m != nil { + return m.SpaceId + } + return "" +} + +// SpaceStatusCheckResponse contains the status and deletion timestamp if needed +type SpaceStatusCheckResponse struct { + Status SpaceStatus `protobuf:"varint,1,opt,name=status,proto3,enum=coordinator.SpaceStatus" json:"status,omitempty"` + DeletionTimestamp int64 `protobuf:"varint,2,opt,name=deletionTimestamp,proto3" json:"deletionTimestamp,omitempty"` +} + +func (m *SpaceStatusCheckResponse) Reset() { *m = SpaceStatusCheckResponse{} } +func (m *SpaceStatusCheckResponse) String() string { return proto.CompactTextString(m) } +func (*SpaceStatusCheckResponse) ProtoMessage() {} +func (*SpaceStatusCheckResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_d94f6f99586adae2, []int{7} +} +func (m *SpaceStatusCheckResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *SpaceStatusCheckResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_SpaceStatusCheckResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *SpaceStatusCheckResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SpaceStatusCheckResponse.Merge(m, src) +} +func (m *SpaceStatusCheckResponse) XXX_Size() int { + return m.Size() +} +func (m *SpaceStatusCheckResponse) XXX_DiscardUnknown() { + xxx_messageInfo_SpaceStatusCheckResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_SpaceStatusCheckResponse proto.InternalMessageInfo + +func (m *SpaceStatusCheckResponse) GetStatus() SpaceStatus { + if m != nil { + return m.Status + } + return SpaceStatus_SpaceStatusCreated +} + +func (m *SpaceStatusCheckResponse) GetDeletionTimestamp() int64 { + if m != nil { + return m.DeletionTimestamp + } + return 0 +} + +// SpaceStatusChangeRequest contains the deletionChange if we want to delete space, or it is empty otherwise +type SpaceStatusChangeRequest struct { + SpaceId string `protobuf:"bytes,1,opt,name=spaceId,proto3" json:"spaceId,omitempty"` + DeletionChangeId string `protobuf:"bytes,2,opt,name=deletionChangeId,proto3" json:"deletionChangeId,omitempty"` + DeletionChangePayload []byte `protobuf:"bytes,3,opt,name=deletionChangePayload,proto3" json:"deletionChangePayload,omitempty"` +} + +func (m *SpaceStatusChangeRequest) Reset() { *m = SpaceStatusChangeRequest{} } +func (m *SpaceStatusChangeRequest) String() string { return proto.CompactTextString(m) } +func (*SpaceStatusChangeRequest) ProtoMessage() {} +func (*SpaceStatusChangeRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_d94f6f99586adae2, []int{8} +} +func (m *SpaceStatusChangeRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *SpaceStatusChangeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_SpaceStatusChangeRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *SpaceStatusChangeRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SpaceStatusChangeRequest.Merge(m, src) +} +func (m *SpaceStatusChangeRequest) XXX_Size() int { + return m.Size() +} +func (m *SpaceStatusChangeRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SpaceStatusChangeRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_SpaceStatusChangeRequest proto.InternalMessageInfo + +func (m *SpaceStatusChangeRequest) GetSpaceId() string { + if m != nil { + return m.SpaceId + } + return "" +} + +func (m *SpaceStatusChangeRequest) GetDeletionChangeId() string { + if m != nil { + return m.DeletionChangeId + } + return "" +} + +func (m *SpaceStatusChangeRequest) GetDeletionChangePayload() []byte { + if m != nil { + return m.DeletionChangePayload + } + return nil +} + +// SpaceStatusChangeResponse is always empty, you should check error in case something was wrong +type SpaceStatusChangeResponse struct { +} + +func (m *SpaceStatusChangeResponse) Reset() { *m = SpaceStatusChangeResponse{} } +func (m *SpaceStatusChangeResponse) String() string { return proto.CompactTextString(m) } +func (*SpaceStatusChangeResponse) ProtoMessage() {} +func (*SpaceStatusChangeResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_d94f6f99586adae2, []int{9} +} +func (m *SpaceStatusChangeResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *SpaceStatusChangeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_SpaceStatusChangeResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *SpaceStatusChangeResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SpaceStatusChangeResponse.Merge(m, src) +} +func (m *SpaceStatusChangeResponse) XXX_Size() int { + return m.Size() +} +func (m *SpaceStatusChangeResponse) XXX_DiscardUnknown() { + xxx_messageInfo_SpaceStatusChangeResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_SpaceStatusChangeResponse proto.InternalMessageInfo + func init() { + proto.RegisterEnum("coordinator.SpaceStatus", SpaceStatus_name, SpaceStatus_value) proto.RegisterType((*SpaceSignRequest)(nil), "coordinator.SpaceSignRequest") proto.RegisterType((*SpaceSignResponse)(nil), "coordinator.SpaceSignResponse") proto.RegisterType((*SpaceReceiptWithSignature)(nil), "coordinator.SpaceReceiptWithSignature") proto.RegisterType((*SpaceReceipt)(nil), "coordinator.SpaceReceipt") proto.RegisterType((*FileLimitCheckRequest)(nil), "coordinator.FileLimitCheckRequest") proto.RegisterType((*FileLimitCheckResponse)(nil), "coordinator.FileLimitCheckResponse") + proto.RegisterType((*SpaceStatusCheckRequest)(nil), "coordinator.SpaceStatusCheckRequest") + proto.RegisterType((*SpaceStatusCheckResponse)(nil), "coordinator.SpaceStatusCheckResponse") + proto.RegisterType((*SpaceStatusChangeRequest)(nil), "coordinator.SpaceStatusChangeRequest") + proto.RegisterType((*SpaceStatusChangeResponse)(nil), "coordinator.SpaceStatusChangeResponse") } func init() { @@ -358,33 +587,44 @@ func init() { } var fileDescriptor_d94f6f99586adae2 = []byte{ - // 409 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0xdd, 0x6a, 0xe2, 0x40, - 0x14, 0x76, 0x5c, 0x7f, 0xc8, 0x51, 0xf6, 0x67, 0x76, 0x57, 0xb2, 0xe2, 0x0e, 0x92, 0x85, 0xc5, - 0x8b, 0x45, 0x17, 0x97, 0xdd, 0xeb, 0xa5, 0x42, 0xc1, 0x52, 0x4a, 0x19, 0x91, 0xd2, 0xf6, 0x2a, - 0x4d, 0x86, 0x3a, 0x98, 0x66, 0xd2, 0x64, 0x2c, 0xf8, 0x16, 0x7d, 0x98, 0x5e, 0xf6, 0x01, 0x7a, - 0xe9, 0x65, 0x2f, 0x8b, 0xbe, 0x48, 0xc9, 0xc4, 0xe8, 0x68, 0xa3, 0x37, 0x49, 0xce, 0x77, 0xbe, - 0xef, 0x9c, 0x6f, 0x72, 0xce, 0xc0, 0x5f, 0x47, 0x88, 0xd0, 0xe5, 0xbe, 0x2d, 0x45, 0xd8, 0xd1, - 0xbe, 0x83, 0x50, 0x48, 0xd1, 0x51, 0xcf, 0x48, 0xc7, 0xdb, 0x0a, 0xc2, 0x15, 0x0d, 0xb2, 0x7e, - 0xc1, 0xc7, 0x41, 0x60, 0x3b, 0x6c, 0xc0, 0xaf, 0x7d, 0xca, 0x6e, 0x27, 0x2c, 0x92, 0xd8, 0x84, - 0x72, 0x14, 0x63, 0x7d, 0xd7, 0x44, 0x4d, 0xd4, 0x32, 0x68, 0x1a, 0x5a, 0x43, 0xf8, 0xa4, 0xb1, - 0xa3, 0x40, 0xf8, 0x11, 0xc3, 0xff, 0xa1, 0x1c, 0x32, 0x87, 0xf1, 0x40, 0x2a, 0x7a, 0xa5, 0xfb, - 0xb3, 0xad, 0x37, 0x55, 0x02, 0x9a, 0x10, 0xce, 0xb8, 0x1c, 0xc5, 0x5a, 0x5b, 0x4e, 0x42, 0x46, - 0x53, 0x99, 0x35, 0x86, 0x6f, 0x3b, 0x59, 0xf8, 0x37, 0x7c, 0x8e, 0xb4, 0xe4, 0xa9, 0x3d, 0xf5, - 0x84, 0x9d, 0x38, 0xab, 0xd2, 0xac, 0x14, 0x6e, 0x80, 0x11, 0xa5, 0x72, 0x33, 0xaf, 0x78, 0x6b, - 0xc0, 0x7a, 0x44, 0x50, 0xd5, 0xbb, 0xed, 0x3e, 0x2e, 0xae, 0x41, 0x29, 0x60, 0x2c, 0xec, 0xbb, - 0xaa, 0x8a, 0x41, 0x97, 0x11, 0x6e, 0xc1, 0x07, 0xdb, 0x71, 0xc4, 0xc4, 0x97, 0x7d, 0x97, 0xf9, - 0x92, 0xcb, 0xa9, 0xf9, 0x4e, 0xb5, 0xd9, 0x86, 0x63, 0xf3, 0x8e, 0xf0, 0x65, 0x28, 0xbc, 0x13, - 0xe1, 0xb2, 0x15, 0xbb, 0x90, 0x98, 0xcf, 0x48, 0x61, 0x02, 0x70, 0x67, 0x7b, 0xdc, 0x1d, 0xfa, - 0x92, 0x7b, 0x66, 0xb1, 0x89, 0x5a, 0x05, 0xaa, 0x21, 0xd6, 0x25, 0x7c, 0x3d, 0xe4, 0x1e, 0x3b, - 0xe6, 0x37, 0x5c, 0xf6, 0x46, 0xcc, 0x19, 0xa7, 0x53, 0xcb, 0x30, 0x85, 0xb2, 0x4d, 0x69, 0x07, - 0xce, 0x6f, 0xce, 0xb7, 0x0d, 0xb5, 0xed, 0xe2, 0xcb, 0x21, 0x7f, 0x81, 0xa2, 0x17, 0xa3, 0xaa, - 0x66, 0x81, 0x26, 0x41, 0xf7, 0x01, 0x41, 0xa5, 0xb7, 0x9e, 0x35, 0x3e, 0x02, 0x63, 0xb5, 0x1f, - 0xf8, 0xfb, 0xdb, 0x35, 0xd0, 0xb6, 0xac, 0x4e, 0x76, 0xa5, 0x97, 0x1d, 0xcf, 0xe1, 0xfd, 0xa6, - 0x17, 0x6c, 0x6d, 0x28, 0x32, 0xff, 0x42, 0xfd, 0xc7, 0x5e, 0x4e, 0x52, 0xfa, 0xe0, 0xdf, 0xd3, - 0x9c, 0xa0, 0xd9, 0x9c, 0xa0, 0x97, 0x39, 0x41, 0xf7, 0x0b, 0x92, 0x9b, 0x2d, 0x48, 0xee, 0x79, - 0x41, 0x72, 0x17, 0x8d, 0x7d, 0x57, 0xea, 0xaa, 0xa4, 0x5e, 0x7f, 0x5e, 0x03, 0x00, 0x00, 0xff, - 0xff, 0x77, 0x20, 0x0a, 0xe9, 0x79, 0x03, 0x00, 0x00, + // 581 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xc1, 0x6e, 0xd3, 0x40, + 0x10, 0x8d, 0xd3, 0x36, 0x55, 0x26, 0x55, 0x49, 0x17, 0x1a, 0x4c, 0x28, 0x56, 0x65, 0xa0, 0x8a, + 0xaa, 0x2a, 0xad, 0x52, 0xe0, 0x8c, 0x28, 0x42, 0x0a, 0x42, 0xa8, 0x72, 0xa9, 0x10, 0x20, 0x84, + 0xb6, 0xf6, 0x28, 0x5d, 0xd5, 0xd9, 0x35, 0xf6, 0x06, 0xa9, 0x7c, 0x05, 0x27, 0xbe, 0x86, 0x0f, + 0xe0, 0xd8, 0x23, 0x47, 0x94, 0x7c, 0x05, 0x37, 0x94, 0xb5, 0x9d, 0xac, 0x13, 0x3b, 0xb9, 0x24, + 0xde, 0x37, 0xef, 0xcd, 0xcc, 0xee, 0xbc, 0x5d, 0x78, 0xea, 0x0a, 0x11, 0x7a, 0x8c, 0x53, 0x29, + 0xc2, 0x43, 0xed, 0x3b, 0x08, 0x85, 0x14, 0x87, 0xea, 0x37, 0xd2, 0xf1, 0xb6, 0x82, 0x48, 0x4d, + 0x83, 0xec, 0x03, 0xa8, 0x9f, 0x05, 0xd4, 0xc5, 0x33, 0xd6, 0xe3, 0x0e, 0x7e, 0x1d, 0x60, 0x24, + 0x89, 0x09, 0xeb, 0xd1, 0x18, 0xeb, 0x7a, 0xa6, 0xb1, 0x6b, 0xb4, 0xaa, 0x4e, 0xba, 0xb4, 0xcf, + 0x61, 0x4b, 0x63, 0x47, 0x81, 0xe0, 0x11, 0x92, 0xe7, 0xb0, 0x1e, 0xa2, 0x8b, 0x2c, 0x90, 0x8a, + 0x5e, 0xeb, 0xec, 0xb5, 0xf5, 0xa2, 0x4a, 0xe0, 0xc4, 0x84, 0xf7, 0x4c, 0x5e, 0x8e, 0xb5, 0x54, + 0x0e, 0x42, 0x74, 0x52, 0x99, 0x7d, 0x05, 0xf7, 0x0a, 0x59, 0xe4, 0x08, 0x6e, 0x47, 0x5a, 0xf0, + 0x94, 0x5e, 0xfb, 0x82, 0xc6, 0x9d, 0x6d, 0x38, 0x79, 0x21, 0xb2, 0x03, 0xd5, 0x28, 0x95, 0x9b, + 0x65, 0xc5, 0x9b, 0x02, 0xf6, 0x2f, 0x03, 0x36, 0xf4, 0x6a, 0xc5, 0xdb, 0x25, 0x0d, 0xa8, 0x04, + 0x88, 0x61, 0xd7, 0x53, 0x59, 0xaa, 0x4e, 0xb2, 0x22, 0x2d, 0xb8, 0x45, 0x5d, 0x57, 0x0c, 0xb8, + 0xec, 0x7a, 0xc8, 0x25, 0x93, 0xd7, 0xe6, 0x8a, 0x2a, 0x33, 0x0b, 0x8f, 0x9b, 0x77, 0x05, 0x97, + 0xa1, 0xf0, 0xdf, 0x0a, 0x0f, 0x27, 0xec, 0xd5, 0xb8, 0xf9, 0x9c, 0x10, 0xb1, 0x00, 0xbe, 0x51, + 0x9f, 0x79, 0xe7, 0x5c, 0x32, 0xdf, 0x5c, 0xdb, 0x35, 0x5a, 0xab, 0x8e, 0x86, 0xd8, 0x9f, 0x60, + 0xfb, 0x15, 0xf3, 0xf1, 0x0d, 0xeb, 0x33, 0x79, 0x72, 0x89, 0xee, 0x55, 0x3a, 0xb5, 0x9c, 0xa6, + 0x8c, 0xfc, 0xa6, 0xb4, 0x0d, 0x97, 0xb3, 0xf3, 0x6d, 0x43, 0x63, 0x36, 0x79, 0x32, 0xe4, 0x3b, + 0xb0, 0xe6, 0x8f, 0x51, 0x95, 0x73, 0xd5, 0x89, 0x17, 0xf6, 0x31, 0xdc, 0x8d, 0xfd, 0x20, 0xa9, + 0x1c, 0x44, 0x99, 0x76, 0x8a, 0x4d, 0xf4, 0x1d, 0xcc, 0x79, 0x51, 0x52, 0xe6, 0x08, 0x2a, 0x91, + 0x82, 0x95, 0x68, 0xb3, 0x63, 0xce, 0x5b, 0x29, 0x96, 0x39, 0x09, 0x8f, 0x1c, 0xc0, 0x96, 0x87, + 0x3e, 0x4a, 0x26, 0xf8, 0x3b, 0xd6, 0xc7, 0x48, 0xd2, 0x7e, 0xa0, 0xb6, 0xb5, 0xe2, 0xcc, 0x07, + 0xec, 0x9f, 0xc6, 0x4c, 0x71, 0xca, 0x7b, 0xb8, 0xb4, 0x65, 0xb2, 0x0f, 0xf5, 0x34, 0x57, 0x2c, + 0x99, 0x1c, 0xdd, 0x1c, 0x4e, 0x9e, 0xc0, 0x76, 0x16, 0x4b, 0x1d, 0x1b, 0x5b, 0x24, 0x3f, 0x68, + 0xdf, 0x4f, 0xae, 0x40, 0xb6, 0xaf, 0xf8, 0x54, 0xf6, 0x3f, 0x43, 0x4d, 0x0b, 0x92, 0x06, 0x10, + 0x9d, 0x1b, 0x22, 0x95, 0xe8, 0xd5, 0x4b, 0xc4, 0x82, 0xa6, 0x86, 0x9f, 0x22, 0xf7, 0x18, 0xef, + 0xbd, 0x4c, 0xca, 0xd5, 0x8d, 0x19, 0x9d, 0x0a, 0xa0, 0x57, 0x2f, 0x77, 0xfe, 0x95, 0xa1, 0x76, + 0x32, 0x3d, 0x66, 0xf2, 0x1a, 0xaa, 0x93, 0x5b, 0x4e, 0x1e, 0xe4, 0x4c, 0x60, 0xfa, 0x56, 0x34, + 0xad, 0xa2, 0x70, 0x32, 0xd0, 0x0f, 0xb0, 0x99, 0x75, 0x14, 0xb1, 0x33, 0x8a, 0x5c, 0x2f, 0x37, + 0x1f, 0x2e, 0xe4, 0x24, 0xa9, 0xbf, 0xa4, 0x4f, 0xd7, 0xd4, 0x47, 0xe4, 0x51, 0x91, 0x5f, 0x32, + 0xe9, 0x1f, 0x2f, 0x61, 0x25, 0x05, 0x2e, 0xd2, 0xd7, 0x4e, 0x9b, 0x09, 0x59, 0xa0, 0xd5, 0xbc, + 0xd4, 0xdc, 0x5b, 0x46, 0x8b, 0x6b, 0xbc, 0x78, 0xf6, 0x7b, 0x68, 0x19, 0x37, 0x43, 0xcb, 0xf8, + 0x3b, 0xb4, 0x8c, 0x1f, 0x23, 0xab, 0x74, 0x33, 0xb2, 0x4a, 0x7f, 0x46, 0x56, 0xe9, 0xe3, 0xce, + 0xa2, 0xd7, 0xfd, 0xa2, 0xa2, 0xfe, 0x8e, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x24, 0x81, 0xc7, + 0xec, 0x04, 0x06, 0x00, 0x00, } func (m *SpaceSignRequest) Marshal() (dAtA []byte, err error) { @@ -610,6 +850,136 @@ func (m *FileLimitCheckResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } +func (m *SpaceStatusCheckRequest) 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 *SpaceStatusCheckRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SpaceStatusCheckRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.SpaceId) > 0 { + i -= len(m.SpaceId) + copy(dAtA[i:], m.SpaceId) + i = encodeVarintCoordinator(dAtA, i, uint64(len(m.SpaceId))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *SpaceStatusCheckResponse) 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 *SpaceStatusCheckResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SpaceStatusCheckResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.DeletionTimestamp != 0 { + i = encodeVarintCoordinator(dAtA, i, uint64(m.DeletionTimestamp)) + i-- + dAtA[i] = 0x10 + } + if m.Status != 0 { + i = encodeVarintCoordinator(dAtA, i, uint64(m.Status)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func (m *SpaceStatusChangeRequest) 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 *SpaceStatusChangeRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SpaceStatusChangeRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.DeletionChangePayload) > 0 { + i -= len(m.DeletionChangePayload) + copy(dAtA[i:], m.DeletionChangePayload) + i = encodeVarintCoordinator(dAtA, i, uint64(len(m.DeletionChangePayload))) + i-- + dAtA[i] = 0x1a + } + if len(m.DeletionChangeId) > 0 { + i -= len(m.DeletionChangeId) + copy(dAtA[i:], m.DeletionChangeId) + i = encodeVarintCoordinator(dAtA, i, uint64(len(m.DeletionChangeId))) + i-- + dAtA[i] = 0x12 + } + if len(m.SpaceId) > 0 { + i -= len(m.SpaceId) + copy(dAtA[i:], m.SpaceId) + i = encodeVarintCoordinator(dAtA, i, uint64(len(m.SpaceId))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *SpaceStatusChangeResponse) 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 *SpaceStatusChangeResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SpaceStatusChangeResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + func encodeVarintCoordinator(dAtA []byte, offset int, v uint64) int { offset -= sovCoordinator(v) base := offset @@ -721,6 +1091,64 @@ func (m *FileLimitCheckResponse) Size() (n int) { return n } +func (m *SpaceStatusCheckRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.SpaceId) + if l > 0 { + n += 1 + l + sovCoordinator(uint64(l)) + } + return n +} + +func (m *SpaceStatusCheckResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Status != 0 { + n += 1 + sovCoordinator(uint64(m.Status)) + } + if m.DeletionTimestamp != 0 { + n += 1 + sovCoordinator(uint64(m.DeletionTimestamp)) + } + return n +} + +func (m *SpaceStatusChangeRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.SpaceId) + if l > 0 { + n += 1 + l + sovCoordinator(uint64(l)) + } + l = len(m.DeletionChangeId) + if l > 0 { + n += 1 + l + sovCoordinator(uint64(l)) + } + l = len(m.DeletionChangePayload) + if l > 0 { + n += 1 + l + sovCoordinator(uint64(l)) + } + return n +} + +func (m *SpaceStatusChangeResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + func sovCoordinator(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -1399,6 +1827,374 @@ func (m *FileLimitCheckResponse) Unmarshal(dAtA []byte) error { } return nil } +func (m *SpaceStatusCheckRequest) 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 ErrIntOverflowCoordinator + } + 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: SpaceStatusCheckRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: SpaceStatusCheckRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SpaceId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCoordinator + } + 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 ErrInvalidLengthCoordinator + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCoordinator + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.SpaceId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipCoordinator(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthCoordinator + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *SpaceStatusCheckResponse) 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 ErrIntOverflowCoordinator + } + 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: SpaceStatusCheckResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: SpaceStatusCheckResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType) + } + m.Status = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCoordinator + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Status |= SpaceStatus(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field DeletionTimestamp", wireType) + } + m.DeletionTimestamp = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCoordinator + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.DeletionTimestamp |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipCoordinator(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthCoordinator + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *SpaceStatusChangeRequest) 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 ErrIntOverflowCoordinator + } + 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: SpaceStatusChangeRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: SpaceStatusChangeRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SpaceId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCoordinator + } + 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 ErrInvalidLengthCoordinator + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCoordinator + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.SpaceId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DeletionChangeId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCoordinator + } + 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 ErrInvalidLengthCoordinator + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCoordinator + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.DeletionChangeId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DeletionChangePayload", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCoordinator + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthCoordinator + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthCoordinator + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.DeletionChangePayload = append(m.DeletionChangePayload[:0], dAtA[iNdEx:postIndex]...) + if m.DeletionChangePayload == nil { + m.DeletionChangePayload = []byte{} + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipCoordinator(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthCoordinator + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *SpaceStatusChangeResponse) 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 ErrIntOverflowCoordinator + } + 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: SpaceStatusChangeResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: SpaceStatusChangeResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipCoordinator(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthCoordinator + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipCoordinator(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/coordinator/coordinatorproto/coordinator_drpc.pb.go b/coordinator/coordinatorproto/coordinator_drpc.pb.go index 67f72ef7..3fd4e199 100644 --- a/coordinator/coordinatorproto/coordinator_drpc.pb.go +++ b/coordinator/coordinatorproto/coordinator_drpc.pb.go @@ -42,6 +42,8 @@ type DRPCCoordinatorClient interface { SpaceSign(ctx context.Context, in *SpaceSignRequest) (*SpaceSignResponse, error) FileLimitCheck(ctx context.Context, in *FileLimitCheckRequest) (*FileLimitCheckResponse, error) + SpaceStatusCheck(ctx context.Context, in *SpaceStatusCheckRequest) (*SpaceStatusCheckResponse, error) + SpaceStatusChange(ctx context.Context, in *SpaceStatusChangeRequest) (*SpaceStatusChangeResponse, error) } type drpcCoordinatorClient struct { @@ -72,9 +74,29 @@ func (c *drpcCoordinatorClient) FileLimitCheck(ctx context.Context, in *FileLimi return out, nil } +func (c *drpcCoordinatorClient) SpaceStatusCheck(ctx context.Context, in *SpaceStatusCheckRequest) (*SpaceStatusCheckResponse, error) { + out := new(SpaceStatusCheckResponse) + err := c.cc.Invoke(ctx, "/coordinator.Coordinator/SpaceStatusCheck", drpcEncoding_File_coordinator_coordinatorproto_protos_coordinator_proto{}, in, out) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *drpcCoordinatorClient) SpaceStatusChange(ctx context.Context, in *SpaceStatusChangeRequest) (*SpaceStatusChangeResponse, error) { + out := new(SpaceStatusChangeResponse) + err := c.cc.Invoke(ctx, "/coordinator.Coordinator/SpaceStatusChange", drpcEncoding_File_coordinator_coordinatorproto_protos_coordinator_proto{}, in, out) + if err != nil { + return nil, err + } + return out, nil +} + type DRPCCoordinatorServer interface { SpaceSign(context.Context, *SpaceSignRequest) (*SpaceSignResponse, error) FileLimitCheck(context.Context, *FileLimitCheckRequest) (*FileLimitCheckResponse, error) + SpaceStatusCheck(context.Context, *SpaceStatusCheckRequest) (*SpaceStatusCheckResponse, error) + SpaceStatusChange(context.Context, *SpaceStatusChangeRequest) (*SpaceStatusChangeResponse, error) } type DRPCCoordinatorUnimplementedServer struct{} @@ -87,9 +109,17 @@ func (s *DRPCCoordinatorUnimplementedServer) FileLimitCheck(context.Context, *Fi return nil, drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented) } +func (s *DRPCCoordinatorUnimplementedServer) SpaceStatusCheck(context.Context, *SpaceStatusCheckRequest) (*SpaceStatusCheckResponse, error) { + return nil, drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented) +} + +func (s *DRPCCoordinatorUnimplementedServer) SpaceStatusChange(context.Context, *SpaceStatusChangeRequest) (*SpaceStatusChangeResponse, error) { + return nil, drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented) +} + type DRPCCoordinatorDescription struct{} -func (DRPCCoordinatorDescription) NumMethods() int { return 2 } +func (DRPCCoordinatorDescription) NumMethods() int { return 4 } func (DRPCCoordinatorDescription) Method(n int) (string, drpc.Encoding, drpc.Receiver, interface{}, bool) { switch n { @@ -111,6 +141,24 @@ func (DRPCCoordinatorDescription) Method(n int) (string, drpc.Encoding, drpc.Rec in1.(*FileLimitCheckRequest), ) }, DRPCCoordinatorServer.FileLimitCheck, true + case 2: + return "/coordinator.Coordinator/SpaceStatusCheck", drpcEncoding_File_coordinator_coordinatorproto_protos_coordinator_proto{}, + func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { + return srv.(DRPCCoordinatorServer). + SpaceStatusCheck( + ctx, + in1.(*SpaceStatusCheckRequest), + ) + }, DRPCCoordinatorServer.SpaceStatusCheck, true + case 3: + return "/coordinator.Coordinator/SpaceStatusChange", drpcEncoding_File_coordinator_coordinatorproto_protos_coordinator_proto{}, + func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { + return srv.(DRPCCoordinatorServer). + SpaceStatusChange( + ctx, + in1.(*SpaceStatusChangeRequest), + ) + }, DRPCCoordinatorServer.SpaceStatusChange, true default: return "", nil, nil, nil, false } @@ -151,3 +199,35 @@ func (x *drpcCoordinator_FileLimitCheckStream) SendAndClose(m *FileLimitCheckRes } return x.CloseSend() } + +type DRPCCoordinator_SpaceStatusCheckStream interface { + drpc.Stream + SendAndClose(*SpaceStatusCheckResponse) error +} + +type drpcCoordinator_SpaceStatusCheckStream struct { + drpc.Stream +} + +func (x *drpcCoordinator_SpaceStatusCheckStream) SendAndClose(m *SpaceStatusCheckResponse) error { + if err := x.MsgSend(m, drpcEncoding_File_coordinator_coordinatorproto_protos_coordinator_proto{}); err != nil { + return err + } + return x.CloseSend() +} + +type DRPCCoordinator_SpaceStatusChangeStream interface { + drpc.Stream + SendAndClose(*SpaceStatusChangeResponse) error +} + +type drpcCoordinator_SpaceStatusChangeStream struct { + drpc.Stream +} + +func (x *drpcCoordinator_SpaceStatusChangeStream) SendAndClose(m *SpaceStatusChangeResponse) error { + if err := x.MsgSend(m, drpcEncoding_File_coordinator_coordinatorproto_protos_coordinator_proto{}); err != nil { + return err + } + return x.CloseSend() +} diff --git a/coordinator/coordinatorproto/protos/coordinator.proto b/coordinator/coordinatorproto/protos/coordinator.proto index b7e539bb..13267fd8 100644 --- a/coordinator/coordinatorproto/protos/coordinator.proto +++ b/coordinator/coordinatorproto/protos/coordinator.proto @@ -12,12 +12,24 @@ service Coordinator { // - if a handshake identity matches a given identity // - if a requester contains in nodeconf list rpc FileLimitCheck(FileLimitCheckRequest) returns (FileLimitCheckResponse); + + // SpaceStatusCheck checks the status of space and tells if it is deleted or not + rpc SpaceStatusCheck(SpaceStatusCheckRequest) returns (SpaceStatusCheckResponse); + + // SpaceStatusChange changes the status of space + rpc SpaceStatusChange(SpaceStatusChangeRequest) returns (SpaceStatusChangeResponse); } message SpaceSignRequest { string spaceId = 1; } +enum SpaceStatus { + SpaceStatusCreated = 0; + SpaceStatusPendingDeletion = 1; + SpaceStatusDeleted = 2; +} + message SpaceSignResponse { SpaceReceiptWithSignature receipt = 1; } @@ -53,3 +65,24 @@ message FileLimitCheckRequest { message FileLimitCheckResponse { uint64 limit = 1; } + +// SpaceStatusCheckRequest contains the spaceId of requested space +message SpaceStatusCheckRequest { + string spaceId = 1; +} + +// SpaceStatusCheckResponse contains the status and deletion timestamp if needed +message SpaceStatusCheckResponse { + SpaceStatus status = 1; + int64 deletionTimestamp = 2; +} + +// SpaceStatusChangeRequest contains the deletionChange if we want to delete space, or it is empty otherwise +message SpaceStatusChangeRequest { + string spaceId = 1; + string deletionChangeId = 2; + bytes deletionChangePayload = 3; +} + +// SpaceStatusChangeResponse is always empty, you should check error in case something was wrong +message SpaceStatusChangeResponse {} From 00c344112ed95dccca42b390eecabb28017eff45 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Wed, 1 Mar 2023 22:06:37 +0100 Subject: [PATCH 02/19] Export VerifyDeleteChange --- commonspace/settings/settings.go | 37 ++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/commonspace/settings/settings.go b/commonspace/settings/settings.go index 0cb4591d..8d9bb3c8 100644 --- a/commonspace/settings/settings.go +++ b/commonspace/settings/settings.go @@ -7,6 +7,7 @@ import ( "fmt" "github.com/anytypeio/any-sync/accountservice" "github.com/anytypeio/any-sync/app/logger" + "github.com/anytypeio/any-sync/commonspace/object/keychain" "github.com/anytypeio/any-sync/commonspace/object/tree/objecttree" "github.com/anytypeio/any-sync/commonspace/object/tree/synctree" "github.com/anytypeio/any-sync/commonspace/object/tree/synctree/updatelistener" @@ -242,17 +243,7 @@ func (s *settingsObject) verifyDeleteSpace(raw *treechangeproto.RawTreeChangeWit if err != nil { return } - content := &spacesyncproto.SettingsData{} - err = proto.Unmarshal(data, content) - if err != nil { - return - } - if len(content.GetContent()) != 1 || - content.GetContent()[0].GetSpaceDelete() == nil || - content.GetContent()[0].GetSpaceDelete().GetDeleterPeerId() == "" { - return fmt.Errorf("incorrect delete change payload") - } - return + return verifyDeleteContent(data, "") } func (s *settingsObject) addContent(data []byte) (err error) { @@ -271,3 +262,27 @@ func (s *settingsObject) addContent(data []byte) (err error) { s.Update(s) return } + +func VerifyDeleteChange(raw *treechangeproto.RawTreeChangeWithId, peerId string) (err error) { + changeBuilder := objecttree.NewChangeBuilder(keychain.NewKeychain(), nil) + res, err := changeBuilder.Unmarshall(raw, true) + if err != nil { + return + } + return verifyDeleteContent(res.Data, peerId) +} + +func verifyDeleteContent(data []byte, peerId string) (err error) { + content := &spacesyncproto.SettingsData{} + err = proto.Unmarshal(data, content) + if err != nil { + return + } + if len(content.GetContent()) != 1 || + content.GetContent()[0].GetSpaceDelete() == nil || + (peerId == "" && content.GetContent()[0].GetSpaceDelete().GetDeleterPeerId() == "") || + (peerId != "" && content.GetContent()[0].GetSpaceDelete().GetDeleterPeerId() != peerId) { + return fmt.Errorf("incorrect delete change payload") + } + return +} From eae4f0a57dc866e2d833d9507758ed6912c1cfd5 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Wed, 1 Mar 2023 22:12:07 +0100 Subject: [PATCH 03/19] Change verify export --- commonspace/settings/settings.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/commonspace/settings/settings.go b/commonspace/settings/settings.go index 8d9bb3c8..920b385b 100644 --- a/commonspace/settings/settings.go +++ b/commonspace/settings/settings.go @@ -263,12 +263,15 @@ func (s *settingsObject) addContent(data []byte) (err error) { return } -func VerifyDeleteChange(raw *treechangeproto.RawTreeChangeWithId, peerId string) (err error) { +func VerifyDeleteChange(raw *treechangeproto.RawTreeChangeWithId, identity []byte, peerId string) (err error) { changeBuilder := objecttree.NewChangeBuilder(keychain.NewKeychain(), nil) res, err := changeBuilder.Unmarshall(raw, true) if err != nil { return } + if res.Identity != string(identity) { + return fmt.Errorf("incorrect identity") + } return verifyDeleteContent(res.Data, peerId) } From 3758e9cdf3c5d252381e1c8ee9153d887d7e6855 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Thu, 2 Mar 2023 12:18:12 +0100 Subject: [PATCH 04/19] Add header to coordinator proto --- .../coordinatorproto/coordinator.pb.go | 130 +++++++++++++----- .../coordinatorproto/protos/coordinator.proto | 1 + 2 files changed, 93 insertions(+), 38 deletions(-) diff --git a/coordinator/coordinatorproto/coordinator.pb.go b/coordinator/coordinatorproto/coordinator.pb.go index 172ffe8a..d0785154 100644 --- a/coordinator/coordinatorproto/coordinator.pb.go +++ b/coordinator/coordinatorproto/coordinator.pb.go @@ -52,6 +52,7 @@ func (SpaceStatus) EnumDescriptor() ([]byte, []int) { type SpaceSignRequest struct { SpaceId string `protobuf:"bytes,1,opt,name=spaceId,proto3" json:"spaceId,omitempty"` + Header []byte `protobuf:"bytes,2,opt,name=header,proto3" json:"header,omitempty"` } func (m *SpaceSignRequest) Reset() { *m = SpaceSignRequest{} } @@ -94,6 +95,13 @@ func (m *SpaceSignRequest) GetSpaceId() string { return "" } +func (m *SpaceSignRequest) GetHeader() []byte { + if m != nil { + return m.Header + } + return nil +} + type SpaceSignResponse struct { Receipt *SpaceReceiptWithSignature `protobuf:"bytes,1,opt,name=receipt,proto3" json:"receipt,omitempty"` } @@ -587,44 +595,45 @@ func init() { } var fileDescriptor_d94f6f99586adae2 = []byte{ - // 581 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xc1, 0x6e, 0xd3, 0x40, - 0x10, 0x8d, 0xd3, 0x36, 0x55, 0x26, 0x55, 0x49, 0x17, 0x1a, 0x4c, 0x28, 0x56, 0x65, 0xa0, 0x8a, - 0xaa, 0x2a, 0xad, 0x52, 0xe0, 0x8c, 0x28, 0x42, 0x0a, 0x42, 0xa8, 0x72, 0xa9, 0x10, 0x20, 0x84, - 0xb6, 0xf6, 0x28, 0x5d, 0xd5, 0xd9, 0x35, 0xf6, 0x06, 0xa9, 0x7c, 0x05, 0x27, 0xbe, 0x86, 0x0f, - 0xe0, 0xd8, 0x23, 0x47, 0x94, 0x7c, 0x05, 0x37, 0x94, 0xb5, 0x9d, 0xac, 0x13, 0x3b, 0xb9, 0x24, - 0xde, 0x37, 0xef, 0xcd, 0xcc, 0xee, 0xbc, 0x5d, 0x78, 0xea, 0x0a, 0x11, 0x7a, 0x8c, 0x53, 0x29, - 0xc2, 0x43, 0xed, 0x3b, 0x08, 0x85, 0x14, 0x87, 0xea, 0x37, 0xd2, 0xf1, 0xb6, 0x82, 0x48, 0x4d, - 0x83, 0xec, 0x03, 0xa8, 0x9f, 0x05, 0xd4, 0xc5, 0x33, 0xd6, 0xe3, 0x0e, 0x7e, 0x1d, 0x60, 0x24, - 0x89, 0x09, 0xeb, 0xd1, 0x18, 0xeb, 0x7a, 0xa6, 0xb1, 0x6b, 0xb4, 0xaa, 0x4e, 0xba, 0xb4, 0xcf, - 0x61, 0x4b, 0x63, 0x47, 0x81, 0xe0, 0x11, 0x92, 0xe7, 0xb0, 0x1e, 0xa2, 0x8b, 0x2c, 0x90, 0x8a, - 0x5e, 0xeb, 0xec, 0xb5, 0xf5, 0xa2, 0x4a, 0xe0, 0xc4, 0x84, 0xf7, 0x4c, 0x5e, 0x8e, 0xb5, 0x54, - 0x0e, 0x42, 0x74, 0x52, 0x99, 0x7d, 0x05, 0xf7, 0x0a, 0x59, 0xe4, 0x08, 0x6e, 0x47, 0x5a, 0xf0, - 0x94, 0x5e, 0xfb, 0x82, 0xc6, 0x9d, 0x6d, 0x38, 0x79, 0x21, 0xb2, 0x03, 0xd5, 0x28, 0x95, 0x9b, - 0x65, 0xc5, 0x9b, 0x02, 0xf6, 0x2f, 0x03, 0x36, 0xf4, 0x6a, 0xc5, 0xdb, 0x25, 0x0d, 0xa8, 0x04, - 0x88, 0x61, 0xd7, 0x53, 0x59, 0xaa, 0x4e, 0xb2, 0x22, 0x2d, 0xb8, 0x45, 0x5d, 0x57, 0x0c, 0xb8, - 0xec, 0x7a, 0xc8, 0x25, 0x93, 0xd7, 0xe6, 0x8a, 0x2a, 0x33, 0x0b, 0x8f, 0x9b, 0x77, 0x05, 0x97, - 0xa1, 0xf0, 0xdf, 0x0a, 0x0f, 0x27, 0xec, 0xd5, 0xb8, 0xf9, 0x9c, 0x10, 0xb1, 0x00, 0xbe, 0x51, - 0x9f, 0x79, 0xe7, 0x5c, 0x32, 0xdf, 0x5c, 0xdb, 0x35, 0x5a, 0xab, 0x8e, 0x86, 0xd8, 0x9f, 0x60, - 0xfb, 0x15, 0xf3, 0xf1, 0x0d, 0xeb, 0x33, 0x79, 0x72, 0x89, 0xee, 0x55, 0x3a, 0xb5, 0x9c, 0xa6, - 0x8c, 0xfc, 0xa6, 0xb4, 0x0d, 0x97, 0xb3, 0xf3, 0x6d, 0x43, 0x63, 0x36, 0x79, 0x32, 0xe4, 0x3b, - 0xb0, 0xe6, 0x8f, 0x51, 0x95, 0x73, 0xd5, 0x89, 0x17, 0xf6, 0x31, 0xdc, 0x8d, 0xfd, 0x20, 0xa9, - 0x1c, 0x44, 0x99, 0x76, 0x8a, 0x4d, 0xf4, 0x1d, 0xcc, 0x79, 0x51, 0x52, 0xe6, 0x08, 0x2a, 0x91, - 0x82, 0x95, 0x68, 0xb3, 0x63, 0xce, 0x5b, 0x29, 0x96, 0x39, 0x09, 0x8f, 0x1c, 0xc0, 0x96, 0x87, - 0x3e, 0x4a, 0x26, 0xf8, 0x3b, 0xd6, 0xc7, 0x48, 0xd2, 0x7e, 0xa0, 0xb6, 0xb5, 0xe2, 0xcc, 0x07, - 0xec, 0x9f, 0xc6, 0x4c, 0x71, 0xca, 0x7b, 0xb8, 0xb4, 0x65, 0xb2, 0x0f, 0xf5, 0x34, 0x57, 0x2c, - 0x99, 0x1c, 0xdd, 0x1c, 0x4e, 0x9e, 0xc0, 0x76, 0x16, 0x4b, 0x1d, 0x1b, 0x5b, 0x24, 0x3f, 0x68, - 0xdf, 0x4f, 0xae, 0x40, 0xb6, 0xaf, 0xf8, 0x54, 0xf6, 0x3f, 0x43, 0x4d, 0x0b, 0x92, 0x06, 0x10, - 0x9d, 0x1b, 0x22, 0x95, 0xe8, 0xd5, 0x4b, 0xc4, 0x82, 0xa6, 0x86, 0x9f, 0x22, 0xf7, 0x18, 0xef, - 0xbd, 0x4c, 0xca, 0xd5, 0x8d, 0x19, 0x9d, 0x0a, 0xa0, 0x57, 0x2f, 0x77, 0xfe, 0x95, 0xa1, 0x76, - 0x32, 0x3d, 0x66, 0xf2, 0x1a, 0xaa, 0x93, 0x5b, 0x4e, 0x1e, 0xe4, 0x4c, 0x60, 0xfa, 0x56, 0x34, - 0xad, 0xa2, 0x70, 0x32, 0xd0, 0x0f, 0xb0, 0x99, 0x75, 0x14, 0xb1, 0x33, 0x8a, 0x5c, 0x2f, 0x37, - 0x1f, 0x2e, 0xe4, 0x24, 0xa9, 0xbf, 0xa4, 0x4f, 0xd7, 0xd4, 0x47, 0xe4, 0x51, 0x91, 0x5f, 0x32, - 0xe9, 0x1f, 0x2f, 0x61, 0x25, 0x05, 0x2e, 0xd2, 0xd7, 0x4e, 0x9b, 0x09, 0x59, 0xa0, 0xd5, 0xbc, - 0xd4, 0xdc, 0x5b, 0x46, 0x8b, 0x6b, 0xbc, 0x78, 0xf6, 0x7b, 0x68, 0x19, 0x37, 0x43, 0xcb, 0xf8, - 0x3b, 0xb4, 0x8c, 0x1f, 0x23, 0xab, 0x74, 0x33, 0xb2, 0x4a, 0x7f, 0x46, 0x56, 0xe9, 0xe3, 0xce, - 0xa2, 0xd7, 0xfd, 0xa2, 0xa2, 0xfe, 0x8e, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x24, 0x81, 0xc7, - 0xec, 0x04, 0x06, 0x00, 0x00, + // 593 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xcd, 0x6e, 0xd3, 0x40, + 0x10, 0x8e, 0xd3, 0x3f, 0x65, 0x12, 0x95, 0x74, 0xa1, 0xc1, 0x84, 0x62, 0x45, 0x06, 0xaa, 0xa8, + 0x42, 0x69, 0x95, 0x02, 0x67, 0x44, 0x2b, 0xa4, 0x20, 0x84, 0x2a, 0x97, 0x0a, 0x01, 0x42, 0x68, + 0x6b, 0x8f, 0x92, 0x55, 0x1d, 0xaf, 0xb1, 0x37, 0x48, 0xe5, 0x29, 0x38, 0xf1, 0x34, 0x3c, 0x00, + 0xc7, 0x1e, 0x39, 0xa2, 0xe4, 0x29, 0xb8, 0xa1, 0xac, 0xd7, 0xc9, 0x3a, 0x71, 0x92, 0x4b, 0xe2, + 0xfd, 0x66, 0xbe, 0x99, 0xd9, 0x99, 0x6f, 0x07, 0x9e, 0xb9, 0x9c, 0x47, 0x1e, 0x0b, 0xa8, 0xe0, + 0xd1, 0xa1, 0xf6, 0x1d, 0x46, 0x5c, 0xf0, 0x43, 0xf9, 0x1b, 0xeb, 0x78, 0x4b, 0x42, 0xa4, 0xac, + 0x41, 0xf6, 0x29, 0x54, 0xcf, 0x43, 0xea, 0xe2, 0x39, 0xeb, 0x06, 0x0e, 0x7e, 0x1d, 0x60, 0x2c, + 0x88, 0x09, 0x5b, 0xf1, 0x18, 0xeb, 0x78, 0xa6, 0xd1, 0x30, 0x9a, 0x25, 0x27, 0x3d, 0x92, 0x1a, + 0x6c, 0xf6, 0x90, 0x7a, 0x18, 0x99, 0xc5, 0x86, 0xd1, 0xac, 0x38, 0xea, 0x64, 0x5f, 0xc0, 0x8e, + 0x16, 0x25, 0x0e, 0x79, 0x10, 0x23, 0x79, 0x01, 0x5b, 0x11, 0xba, 0xc8, 0x42, 0x21, 0xc3, 0x94, + 0xdb, 0xfb, 0x2d, 0xbd, 0x18, 0x49, 0x70, 0x12, 0x87, 0xf7, 0x4c, 0xf4, 0xc6, 0x5c, 0x2a, 0x06, + 0x11, 0x3a, 0x29, 0xcd, 0xbe, 0x82, 0x7b, 0x0b, 0xbd, 0xc8, 0x11, 0xdc, 0x8e, 0x35, 0xe3, 0x19, + 0xbd, 0xf6, 0x39, 0x4d, 0x2a, 0xae, 0x38, 0x79, 0x26, 0xb2, 0x07, 0xa5, 0x38, 0xa5, 0xab, 0x0b, + 0x4c, 0x01, 0xfb, 0x97, 0x01, 0x15, 0x3d, 0xdb, 0xf2, 0x36, 0x84, 0x88, 0x51, 0xc7, 0x93, 0x51, + 0x4a, 0x8e, 0x3a, 0x91, 0x26, 0xdc, 0xa2, 0xae, 0xcb, 0x07, 0x81, 0xe8, 0x78, 0x18, 0x08, 0x26, + 0xae, 0xcd, 0x35, 0x99, 0x66, 0x16, 0x1e, 0x17, 0xef, 0xf2, 0x40, 0x44, 0xdc, 0x7f, 0xcb, 0x3d, + 0x9c, 0x78, 0xaf, 0x27, 0xc5, 0xe7, 0x98, 0x88, 0x05, 0xf0, 0x8d, 0xfa, 0xcc, 0xbb, 0x08, 0x04, + 0xf3, 0xcd, 0x8d, 0x86, 0xd1, 0x5c, 0x77, 0x34, 0xc4, 0xfe, 0x04, 0xbb, 0xaf, 0x98, 0x8f, 0x6f, + 0x58, 0x9f, 0x89, 0x93, 0x1e, 0xba, 0x57, 0xe9, 0x34, 0x73, 0x8a, 0x32, 0xf2, 0x8b, 0xd2, 0x2e, + 0x5c, 0xcc, 0x5c, 0xd8, 0x6e, 0x41, 0x6d, 0x36, 0xb8, 0x1a, 0xf2, 0x1d, 0xd8, 0xf0, 0xc7, 0xa8, + 0x8c, 0xb9, 0xee, 0x24, 0x07, 0xfb, 0x18, 0xee, 0x26, 0x7a, 0x10, 0x54, 0x0c, 0xe2, 0x4c, 0x39, + 0x0b, 0xbb, 0x6a, 0x7f, 0x07, 0x73, 0x9e, 0xa4, 0xd2, 0x1c, 0xc1, 0x66, 0x2c, 0x61, 0x49, 0xda, + 0x6e, 0x9b, 0xf3, 0x52, 0x4a, 0x68, 0x8e, 0xf2, 0x23, 0x4f, 0x60, 0xc7, 0x43, 0x1f, 0x05, 0xe3, + 0xc1, 0x3b, 0xd6, 0xc7, 0x58, 0xd0, 0x7e, 0x28, 0xaf, 0xb5, 0xe6, 0xcc, 0x1b, 0xec, 0x9f, 0xc6, + 0x4c, 0x72, 0x1a, 0x74, 0x71, 0xf5, 0x7b, 0x38, 0x80, 0x6a, 0x1a, 0x2b, 0xa1, 0x4c, 0x5a, 0x37, + 0x87, 0x93, 0xa7, 0xb0, 0x9b, 0xc5, 0x52, 0xc5, 0x26, 0x12, 0xc9, 0x37, 0xda, 0xf7, 0xd5, 0x13, + 0xc8, 0xd6, 0x95, 0x74, 0xe5, 0xe0, 0x33, 0x94, 0x35, 0x23, 0xa9, 0x01, 0xd1, 0x7d, 0x23, 0xa4, + 0x02, 0xbd, 0x6a, 0x81, 0x58, 0x50, 0xd7, 0xf0, 0x33, 0x0c, 0x3c, 0x16, 0x74, 0x4f, 0x55, 0xba, + 0xaa, 0x31, 0xc3, 0x93, 0x06, 0xf4, 0xaa, 0xc5, 0xf6, 0xbf, 0x22, 0x94, 0x4f, 0xa6, 0x6d, 0x26, + 0xaf, 0xa1, 0x34, 0x79, 0xe5, 0xe4, 0x41, 0xce, 0x04, 0xa6, 0x3b, 0xa4, 0x6e, 0x2d, 0x32, 0xab, + 0x81, 0x7e, 0x80, 0xed, 0xac, 0xa2, 0x88, 0x9d, 0x61, 0xe4, 0x6a, 0xb9, 0xfe, 0x70, 0xa9, 0x8f, + 0x0a, 0xfd, 0x25, 0x5d, 0x69, 0x53, 0x1d, 0x91, 0x47, 0x8b, 0xf4, 0x92, 0x09, 0xff, 0x78, 0x85, + 0x97, 0x4a, 0x70, 0x99, 0x6e, 0x3b, 0x6d, 0x26, 0x64, 0x09, 0x57, 0xd3, 0x52, 0x7d, 0x7f, 0x95, + 0x5b, 0x92, 0xe3, 0xe5, 0xf3, 0xdf, 0x43, 0xcb, 0xb8, 0x19, 0x5a, 0xc6, 0xdf, 0xa1, 0x65, 0xfc, + 0x18, 0x59, 0x85, 0x9b, 0x91, 0x55, 0xf8, 0x33, 0xb2, 0x0a, 0x1f, 0xf7, 0x96, 0x6d, 0xfd, 0xcb, + 0x4d, 0xf9, 0x77, 0xfc, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x4f, 0x1b, 0x0c, 0x45, 0x1c, 0x06, 0x00, + 0x00, } func (m *SpaceSignRequest) Marshal() (dAtA []byte, err error) { @@ -647,6 +656,13 @@ func (m *SpaceSignRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.Header) > 0 { + i -= len(m.Header) + copy(dAtA[i:], m.Header) + i = encodeVarintCoordinator(dAtA, i, uint64(len(m.Header))) + i-- + dAtA[i] = 0x12 + } if len(m.SpaceId) > 0 { i -= len(m.SpaceId) copy(dAtA[i:], m.SpaceId) @@ -1001,6 +1017,10 @@ func (m *SpaceSignRequest) Size() (n int) { if l > 0 { n += 1 + l + sovCoordinator(uint64(l)) } + l = len(m.Header) + if l > 0 { + n += 1 + l + sovCoordinator(uint64(l)) + } return n } @@ -1216,6 +1236,40 @@ func (m *SpaceSignRequest) Unmarshal(dAtA []byte) error { } m.SpaceId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Header", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCoordinator + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthCoordinator + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthCoordinator + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Header = append(m.Header[:0], dAtA[iNdEx:postIndex]...) + if m.Header == nil { + m.Header = []byte{} + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipCoordinator(dAtA[iNdEx:]) diff --git a/coordinator/coordinatorproto/protos/coordinator.proto b/coordinator/coordinatorproto/protos/coordinator.proto index 13267fd8..4343b143 100644 --- a/coordinator/coordinatorproto/protos/coordinator.proto +++ b/coordinator/coordinatorproto/protos/coordinator.proto @@ -22,6 +22,7 @@ service Coordinator { message SpaceSignRequest { string spaceId = 1; + bytes header = 2; } enum SpaceStatus { From 31b3fed274705be954dd51f68377fe66a54fc68e Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Thu, 2 Mar 2023 13:23:43 +0100 Subject: [PATCH 05/19] Add space header validation --- commonspace/spacestorage/spacestorage.go | 41 ++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/commonspace/spacestorage/spacestorage.go b/commonspace/spacestorage/spacestorage.go index 1562d6b1..b19a4768 100644 --- a/commonspace/spacestorage/spacestorage.go +++ b/commonspace/spacestorage/spacestorage.go @@ -7,16 +7,22 @@ import ( "github.com/anytypeio/any-sync/app" "github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto" "github.com/anytypeio/any-sync/commonspace/object/acl/liststorage" + "github.com/anytypeio/any-sync/commonspace/object/tree/objecttree" "github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto" "github.com/anytypeio/any-sync/commonspace/object/tree/treestorage" "github.com/anytypeio/any-sync/commonspace/spacesyncproto" + "github.com/anytypeio/any-sync/util/cidutil" + "github.com/anytypeio/any-sync/util/keys/asymmetric/signingkey" + "github.com/gogo/protobuf/proto" + "strings" ) const CName = "common.commonspace.spacestorage" var ( - ErrSpaceStorageExists = errors.New("space storage exists") - ErrSpaceStorageMissing = errors.New("space storage missing") + ErrSpaceStorageExists = errors.New("space storage exists") + ErrSpaceStorageMissing = errors.New("space storage missing") + ErrIncorrectSpaceHeader = errors.New("incorrect space header") ErrTreeStorageAlreadyDeleted = errors.New("tree storage already deleted") ) @@ -63,3 +69,34 @@ func ValidateSpaceStorageCreatePayload(payload SpaceStorageCreatePayload) (err e // TODO: add proper validation return nil } + +func ValidateSpaceHeader(spaceId string, header []byte) (err error) { + split := strings.Split(spaceId, ".") + if len(split) != 2 { + return ErrIncorrectSpaceHeader + } + if !cidutil.VerifyCid(header, split[0]) { + err = objecttree.ErrIncorrectCid + return + } + raw := &spacesyncproto.RawSpaceHeader{} + err = proto.Unmarshal(header, raw) + if err != nil { + return + } + payload := &spacesyncproto.SpaceHeader{} + err = proto.Unmarshal(raw.SpaceHeader, raw) + if err != nil { + return + } + key, err := signingkey.NewSigningEd25519PubKeyFromBytes(payload.Identity) + if err != nil { + return + } + res, err := key.Verify(raw.SpaceHeader, raw.Signature) + if err != nil || !res { + err = ErrIncorrectSpaceHeader + return + } + return +} From 1ed8f162aed4d38c0c46e232eae4fa09fed57a6a Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Thu, 2 Mar 2023 13:27:08 +0100 Subject: [PATCH 06/19] Update space header validation --- commonspace/spacestorage/spacestorage.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/commonspace/spacestorage/spacestorage.go b/commonspace/spacestorage/spacestorage.go index b19a4768..9b0008fc 100644 --- a/commonspace/spacestorage/spacestorage.go +++ b/commonspace/spacestorage/spacestorage.go @@ -2,6 +2,7 @@ package spacestorage import ( + "bytes" "context" "errors" "github.com/anytypeio/any-sync/app" @@ -70,7 +71,7 @@ func ValidateSpaceStorageCreatePayload(payload SpaceStorageCreatePayload) (err e return nil } -func ValidateSpaceHeader(spaceId string, header []byte) (err error) { +func ValidateSpaceHeader(spaceId string, header, identity []byte) (err error) { split := strings.Split(spaceId, ".") if len(split) != 2 { return ErrIncorrectSpaceHeader @@ -89,6 +90,10 @@ func ValidateSpaceHeader(spaceId string, header []byte) (err error) { if err != nil { return } + if identity != nil && !bytes.Equal(identity, payload.Identity) { + err = ErrIncorrectSpaceHeader + return + } key, err := signingkey.NewSigningEd25519PubKeyFromBytes(payload.Identity) if err != nil { return From 9979a820d34257f6a9322123f2262373de549ff7 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Thu, 2 Mar 2023 14:19:32 +0100 Subject: [PATCH 07/19] Update coordinator proto --- .../coordinatorproto/coordinator.pb.go | 87 ++++++++++--------- .../coordinatorproto/protos/coordinator.proto | 3 +- 2 files changed, 47 insertions(+), 43 deletions(-) diff --git a/coordinator/coordinatorproto/coordinator.pb.go b/coordinator/coordinatorproto/coordinator.pb.go index d0785154..4e7e5d6f 100644 --- a/coordinator/coordinatorproto/coordinator.pb.go +++ b/coordinator/coordinatorproto/coordinator.pb.go @@ -27,19 +27,22 @@ type SpaceStatus int32 const ( SpaceStatus_SpaceStatusCreated SpaceStatus = 0 SpaceStatus_SpaceStatusPendingDeletion SpaceStatus = 1 - SpaceStatus_SpaceStatusDeleted SpaceStatus = 2 + SpaceStatus_SpaceStatusDeletionStarted SpaceStatus = 2 + SpaceStatus_SpaceStatusDeleted SpaceStatus = 3 ) var SpaceStatus_name = map[int32]string{ 0: "SpaceStatusCreated", 1: "SpaceStatusPendingDeletion", - 2: "SpaceStatusDeleted", + 2: "SpaceStatusDeletionStarted", + 3: "SpaceStatusDeleted", } var SpaceStatus_value = map[string]int32{ "SpaceStatusCreated": 0, "SpaceStatusPendingDeletion": 1, - "SpaceStatusDeleted": 2, + "SpaceStatusDeletionStarted": 2, + "SpaceStatusDeleted": 3, } func (x SpaceStatus) String() string { @@ -595,45 +598,45 @@ func init() { } var fileDescriptor_d94f6f99586adae2 = []byte{ - // 593 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0x8e, 0xd3, 0x3f, 0x65, 0x12, 0x95, 0x74, 0xa1, 0xc1, 0x84, 0x62, 0x45, 0x06, 0xaa, 0xa8, - 0x42, 0x69, 0x95, 0x02, 0x67, 0x44, 0x2b, 0xa4, 0x20, 0x84, 0x2a, 0x97, 0x0a, 0x01, 0x42, 0x68, - 0x6b, 0x8f, 0x92, 0x55, 0x1d, 0xaf, 0xb1, 0x37, 0x48, 0xe5, 0x29, 0x38, 0xf1, 0x34, 0x3c, 0x00, - 0xc7, 0x1e, 0x39, 0xa2, 0xe4, 0x29, 0xb8, 0xa1, 0xac, 0xd7, 0xc9, 0x3a, 0x71, 0x92, 0x4b, 0xe2, - 0xfd, 0x66, 0xbe, 0x99, 0xd9, 0x99, 0x6f, 0x07, 0x9e, 0xb9, 0x9c, 0x47, 0x1e, 0x0b, 0xa8, 0xe0, - 0xd1, 0xa1, 0xf6, 0x1d, 0x46, 0x5c, 0xf0, 0x43, 0xf9, 0x1b, 0xeb, 0x78, 0x4b, 0x42, 0xa4, 0xac, - 0x41, 0xf6, 0x29, 0x54, 0xcf, 0x43, 0xea, 0xe2, 0x39, 0xeb, 0x06, 0x0e, 0x7e, 0x1d, 0x60, 0x2c, - 0x88, 0x09, 0x5b, 0xf1, 0x18, 0xeb, 0x78, 0xa6, 0xd1, 0x30, 0x9a, 0x25, 0x27, 0x3d, 0x92, 0x1a, - 0x6c, 0xf6, 0x90, 0x7a, 0x18, 0x99, 0xc5, 0x86, 0xd1, 0xac, 0x38, 0xea, 0x64, 0x5f, 0xc0, 0x8e, - 0x16, 0x25, 0x0e, 0x79, 0x10, 0x23, 0x79, 0x01, 0x5b, 0x11, 0xba, 0xc8, 0x42, 0x21, 0xc3, 0x94, - 0xdb, 0xfb, 0x2d, 0xbd, 0x18, 0x49, 0x70, 0x12, 0x87, 0xf7, 0x4c, 0xf4, 0xc6, 0x5c, 0x2a, 0x06, - 0x11, 0x3a, 0x29, 0xcd, 0xbe, 0x82, 0x7b, 0x0b, 0xbd, 0xc8, 0x11, 0xdc, 0x8e, 0x35, 0xe3, 0x19, - 0xbd, 0xf6, 0x39, 0x4d, 0x2a, 0xae, 0x38, 0x79, 0x26, 0xb2, 0x07, 0xa5, 0x38, 0xa5, 0xab, 0x0b, - 0x4c, 0x01, 0xfb, 0x97, 0x01, 0x15, 0x3d, 0xdb, 0xf2, 0x36, 0x84, 0x88, 0x51, 0xc7, 0x93, 0x51, - 0x4a, 0x8e, 0x3a, 0x91, 0x26, 0xdc, 0xa2, 0xae, 0xcb, 0x07, 0x81, 0xe8, 0x78, 0x18, 0x08, 0x26, - 0xae, 0xcd, 0x35, 0x99, 0x66, 0x16, 0x1e, 0x17, 0xef, 0xf2, 0x40, 0x44, 0xdc, 0x7f, 0xcb, 0x3d, - 0x9c, 0x78, 0xaf, 0x27, 0xc5, 0xe7, 0x98, 0x88, 0x05, 0xf0, 0x8d, 0xfa, 0xcc, 0xbb, 0x08, 0x04, - 0xf3, 0xcd, 0x8d, 0x86, 0xd1, 0x5c, 0x77, 0x34, 0xc4, 0xfe, 0x04, 0xbb, 0xaf, 0x98, 0x8f, 0x6f, - 0x58, 0x9f, 0x89, 0x93, 0x1e, 0xba, 0x57, 0xe9, 0x34, 0x73, 0x8a, 0x32, 0xf2, 0x8b, 0xd2, 0x2e, - 0x5c, 0xcc, 0x5c, 0xd8, 0x6e, 0x41, 0x6d, 0x36, 0xb8, 0x1a, 0xf2, 0x1d, 0xd8, 0xf0, 0xc7, 0xa8, - 0x8c, 0xb9, 0xee, 0x24, 0x07, 0xfb, 0x18, 0xee, 0x26, 0x7a, 0x10, 0x54, 0x0c, 0xe2, 0x4c, 0x39, - 0x0b, 0xbb, 0x6a, 0x7f, 0x07, 0x73, 0x9e, 0xa4, 0xd2, 0x1c, 0xc1, 0x66, 0x2c, 0x61, 0x49, 0xda, - 0x6e, 0x9b, 0xf3, 0x52, 0x4a, 0x68, 0x8e, 0xf2, 0x23, 0x4f, 0x60, 0xc7, 0x43, 0x1f, 0x05, 0xe3, - 0xc1, 0x3b, 0xd6, 0xc7, 0x58, 0xd0, 0x7e, 0x28, 0xaf, 0xb5, 0xe6, 0xcc, 0x1b, 0xec, 0x9f, 0xc6, - 0x4c, 0x72, 0x1a, 0x74, 0x71, 0xf5, 0x7b, 0x38, 0x80, 0x6a, 0x1a, 0x2b, 0xa1, 0x4c, 0x5a, 0x37, - 0x87, 0x93, 0xa7, 0xb0, 0x9b, 0xc5, 0x52, 0xc5, 0x26, 0x12, 0xc9, 0x37, 0xda, 0xf7, 0xd5, 0x13, - 0xc8, 0xd6, 0x95, 0x74, 0xe5, 0xe0, 0x33, 0x94, 0x35, 0x23, 0xa9, 0x01, 0xd1, 0x7d, 0x23, 0xa4, - 0x02, 0xbd, 0x6a, 0x81, 0x58, 0x50, 0xd7, 0xf0, 0x33, 0x0c, 0x3c, 0x16, 0x74, 0x4f, 0x55, 0xba, - 0xaa, 0x31, 0xc3, 0x93, 0x06, 0xf4, 0xaa, 0xc5, 0xf6, 0xbf, 0x22, 0x94, 0x4f, 0xa6, 0x6d, 0x26, - 0xaf, 0xa1, 0x34, 0x79, 0xe5, 0xe4, 0x41, 0xce, 0x04, 0xa6, 0x3b, 0xa4, 0x6e, 0x2d, 0x32, 0xab, - 0x81, 0x7e, 0x80, 0xed, 0xac, 0xa2, 0x88, 0x9d, 0x61, 0xe4, 0x6a, 0xb9, 0xfe, 0x70, 0xa9, 0x8f, - 0x0a, 0xfd, 0x25, 0x5d, 0x69, 0x53, 0x1d, 0x91, 0x47, 0x8b, 0xf4, 0x92, 0x09, 0xff, 0x78, 0x85, - 0x97, 0x4a, 0x70, 0x99, 0x6e, 0x3b, 0x6d, 0x26, 0x64, 0x09, 0x57, 0xd3, 0x52, 0x7d, 0x7f, 0x95, - 0x5b, 0x92, 0xe3, 0xe5, 0xf3, 0xdf, 0x43, 0xcb, 0xb8, 0x19, 0x5a, 0xc6, 0xdf, 0xa1, 0x65, 0xfc, - 0x18, 0x59, 0x85, 0x9b, 0x91, 0x55, 0xf8, 0x33, 0xb2, 0x0a, 0x1f, 0xf7, 0x96, 0x6d, 0xfd, 0xcb, - 0x4d, 0xf9, 0x77, 0xfc, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x4f, 0x1b, 0x0c, 0x45, 0x1c, 0x06, 0x00, - 0x00, + // 604 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0x41, 0x6f, 0x12, 0x41, + 0x14, 0x66, 0x81, 0xd2, 0xf0, 0x20, 0x95, 0x8e, 0x16, 0x57, 0xac, 0x1b, 0xb2, 0x6a, 0x43, 0x1a, + 0x43, 0x1b, 0xaa, 0x9e, 0x8d, 0x6d, 0x4c, 0x30, 0xc6, 0x34, 0x8b, 0x8d, 0x51, 0x0f, 0x66, 0xba, + 0xfb, 0x02, 0x93, 0x2e, 0x3b, 0xeb, 0xee, 0x60, 0x52, 0x13, 0xff, 0x83, 0x27, 0x7f, 0x8d, 0x3f, + 0xc0, 0x63, 0x8f, 0x1e, 0x0d, 0xfc, 0x0a, 0x6f, 0x86, 0xd9, 0x5d, 0x98, 0x85, 0x05, 0x2e, 0xc0, + 0x7c, 0xdf, 0xfb, 0xde, 0x7b, 0x33, 0xef, 0x9b, 0x01, 0x9e, 0xd9, 0x9c, 0x07, 0x0e, 0xf3, 0xa8, + 0xe0, 0xc1, 0x91, 0xf2, 0xdb, 0x0f, 0xb8, 0xe0, 0x47, 0xf2, 0x33, 0x54, 0xf1, 0xb6, 0x84, 0x48, + 0x45, 0x81, 0xcc, 0x33, 0xa8, 0xf5, 0x7c, 0x6a, 0x63, 0x8f, 0xf5, 0x3d, 0x0b, 0xbf, 0x8c, 0x30, + 0x14, 0x44, 0x87, 0xed, 0x70, 0x8a, 0x75, 0x1d, 0x5d, 0x6b, 0x6a, 0xad, 0xb2, 0x95, 0x2c, 0x49, + 0x1d, 0x4a, 0x03, 0xa4, 0x0e, 0x06, 0x7a, 0xbe, 0xa9, 0xb5, 0xaa, 0x56, 0xbc, 0x32, 0x2f, 0x60, + 0x57, 0xc9, 0x12, 0xfa, 0xdc, 0x0b, 0x91, 0xbc, 0x80, 0xed, 0x00, 0x6d, 0x64, 0xbe, 0x90, 0x69, + 0x2a, 0x9d, 0x83, 0xb6, 0xda, 0x8c, 0x14, 0x58, 0x51, 0xc0, 0x7b, 0x26, 0x06, 0x53, 0x2d, 0x15, + 0xa3, 0x00, 0xad, 0x44, 0x66, 0x5e, 0xc1, 0xbd, 0x95, 0x51, 0xe4, 0x18, 0x6e, 0x87, 0x0a, 0x79, + 0x4e, 0xaf, 0x5d, 0x4e, 0xa3, 0x8e, 0xab, 0x56, 0x16, 0x45, 0xf6, 0xa1, 0x1c, 0x26, 0xf2, 0x78, + 0x03, 0x73, 0xc0, 0xfc, 0xa5, 0x41, 0x55, 0xad, 0xb6, 0xfe, 0x18, 0x7c, 0xc4, 0xa0, 0xeb, 0xc8, + 0x2c, 0x65, 0x2b, 0x5e, 0x91, 0x16, 0xdc, 0xa2, 0xb6, 0xcd, 0x47, 0x9e, 0xe8, 0x3a, 0xe8, 0x09, + 0x26, 0xae, 0xf5, 0x82, 0x2c, 0xb3, 0x08, 0x4f, 0x9b, 0xb7, 0xb9, 0x27, 0x02, 0xee, 0xbe, 0xe5, + 0x0e, 0xce, 0xa2, 0x8b, 0x51, 0xf3, 0x19, 0x14, 0x31, 0x00, 0xbe, 0x52, 0x97, 0x39, 0x17, 0x9e, + 0x60, 0xae, 0xbe, 0xd5, 0xd4, 0x5a, 0x45, 0x4b, 0x41, 0xcc, 0x4f, 0xb0, 0xf7, 0x8a, 0xb9, 0xf8, + 0x86, 0x0d, 0x99, 0x38, 0x1d, 0xa0, 0x7d, 0x95, 0x4c, 0x33, 0xa3, 0x29, 0x2d, 0xbb, 0x29, 0x65, + 0xc3, 0xf9, 0xd4, 0x86, 0xcd, 0x36, 0xd4, 0x17, 0x93, 0xc7, 0x43, 0xbe, 0x03, 0x5b, 0xee, 0x14, + 0x95, 0x39, 0x8b, 0x56, 0xb4, 0x30, 0x4f, 0xe0, 0x6e, 0xe4, 0x07, 0x41, 0xc5, 0x28, 0x4c, 0xb5, + 0xb3, 0xf2, 0x54, 0xcd, 0x6f, 0xa0, 0x2f, 0x8b, 0xe2, 0x32, 0xc7, 0x50, 0x0a, 0x25, 0x2c, 0x45, + 0x3b, 0x1d, 0x7d, 0xd9, 0x4a, 0x91, 0xcc, 0x8a, 0xe3, 0xc8, 0x13, 0xd8, 0x75, 0xd0, 0x45, 0xc1, + 0xb8, 0xf7, 0x8e, 0x0d, 0x31, 0x14, 0x74, 0xe8, 0xcb, 0x6d, 0x15, 0xac, 0x65, 0xc2, 0xfc, 0xa9, + 0x2d, 0x14, 0xa7, 0x5e, 0x1f, 0x37, 0xdf, 0x87, 0x43, 0xa8, 0x25, 0xb9, 0x22, 0xc9, 0xec, 0xe8, + 0x96, 0x70, 0xf2, 0x14, 0xf6, 0xd2, 0x58, 0xe2, 0xd8, 0xc8, 0x22, 0xd9, 0xa4, 0x79, 0x3f, 0xbe, + 0x02, 0xe9, 0xbe, 0xa2, 0x53, 0x39, 0xfc, 0x0e, 0x15, 0x85, 0x24, 0x75, 0x20, 0x6a, 0x6c, 0x80, + 0x54, 0xa0, 0x53, 0xcb, 0x11, 0x03, 0x1a, 0x0a, 0x7e, 0x8e, 0x9e, 0xc3, 0xbc, 0xfe, 0x59, 0x5c, + 0xae, 0xa6, 0x2d, 0xf0, 0x09, 0xd1, 0x13, 0x34, 0x98, 0xea, 0xf3, 0x0b, 0x79, 0x25, 0x8f, 0x4e, + 0xad, 0xd0, 0xf9, 0x97, 0x87, 0xca, 0xe9, 0x7c, 0x0c, 0xe4, 0x35, 0x94, 0x67, 0xaf, 0x00, 0x79, + 0x90, 0x31, 0xa1, 0xf9, 0x1b, 0xd3, 0x30, 0x56, 0xd1, 0xf1, 0xc0, 0x3f, 0xc0, 0x4e, 0xda, 0x71, + 0xc4, 0x4c, 0x29, 0x32, 0xbd, 0xde, 0x78, 0xb8, 0x36, 0x26, 0x4e, 0xfd, 0x39, 0x79, 0xf2, 0xe6, + 0x3e, 0x23, 0x8f, 0x56, 0xf9, 0x29, 0x95, 0xfe, 0xf1, 0x86, 0xa8, 0xb8, 0xc0, 0x65, 0xf2, 0x1a, + 0x2a, 0x33, 0x23, 0x6b, 0xb4, 0x8a, 0xd7, 0x1a, 0x07, 0x9b, 0xc2, 0xa2, 0x1a, 0x2f, 0x9f, 0xff, + 0x1e, 0x1b, 0xda, 0xcd, 0xd8, 0xd0, 0xfe, 0x8e, 0x0d, 0xed, 0xc7, 0xc4, 0xc8, 0xdd, 0x4c, 0x8c, + 0xdc, 0x9f, 0x89, 0x91, 0xfb, 0xb8, 0xbf, 0xee, 0x5f, 0xe1, 0xb2, 0x24, 0xbf, 0x4e, 0xfe, 0x07, + 0x00, 0x00, 0xff, 0xff, 0x9a, 0xc2, 0x98, 0x37, 0x3c, 0x06, 0x00, 0x00, } func (m *SpaceSignRequest) Marshal() (dAtA []byte, err error) { diff --git a/coordinator/coordinatorproto/protos/coordinator.proto b/coordinator/coordinatorproto/protos/coordinator.proto index 4343b143..3d8a6959 100644 --- a/coordinator/coordinatorproto/protos/coordinator.proto +++ b/coordinator/coordinatorproto/protos/coordinator.proto @@ -28,7 +28,8 @@ message SpaceSignRequest { enum SpaceStatus { SpaceStatusCreated = 0; SpaceStatusPendingDeletion = 1; - SpaceStatusDeleted = 2; + SpaceStatusDeletionStarted = 2; + SpaceStatusDeleted = 3; } message SpaceSignResponse { From fcb936bca95a612f8058c248a3fab3947217c8ce Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Thu, 2 Mar 2023 19:55:27 +0100 Subject: [PATCH 08/19] Update coordinator client --- .../coordinatorclient/coordinatorclient.go | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/coordinator/coordinatorclient/coordinatorclient.go b/coordinator/coordinatorclient/coordinatorclient.go index faac5483..03852795 100644 --- a/coordinator/coordinatorclient/coordinatorclient.go +++ b/coordinator/coordinatorclient/coordinatorclient.go @@ -4,6 +4,7 @@ package coordinatorclient import ( "context" "github.com/anytypeio/any-sync/app" + "github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto" "github.com/anytypeio/any-sync/coordinator/coordinatorproto" "github.com/anytypeio/any-sync/net/pool" "github.com/anytypeio/any-sync/nodeconf" @@ -16,7 +17,9 @@ func New() CoordinatorClient { } type CoordinatorClient interface { - SpaceSign(ctx context.Context, spaceId string) (receipt *coordinatorproto.SpaceReceiptWithSignature, err error) + ChangeStatus(ctx context.Context, spaceId string, deleteRaw *treechangeproto.RawTreeChangeWithId) (err error) + StatusCheck(ctx context.Context, spaceId string) (status *coordinatorproto.SpaceStatusCheckResponse, err error) + SpaceSign(ctx context.Context, spaceId string, spaceHeader []byte) (receipt *coordinatorproto.SpaceReceiptWithSignature, err error) FileLimitCheck(ctx context.Context, spaceId string, identity []byte) (limit uint64, err error) app.Component } @@ -26,6 +29,29 @@ type coordinatorClient struct { nodeConf nodeconf.Service } +func (c *coordinatorClient) ChangeStatus(ctx context.Context, spaceId string, deleteRaw *treechangeproto.RawTreeChangeWithId) (err error) { + cl, err := c.client(ctx) + if err != nil { + return + } + _, err = cl.SpaceStatusChange(ctx, &coordinatorproto.SpaceStatusChangeRequest{ + SpaceId: spaceId, + DeletionChangeId: deleteRaw.Id, + DeletionChangePayload: deleteRaw.RawChange, + }) + return +} + +func (c *coordinatorClient) StatusCheck(ctx context.Context, spaceId string) (response *coordinatorproto.SpaceStatusCheckResponse, err error) { + cl, err := c.client(ctx) + if err != nil { + return + } + return cl.SpaceStatusCheck(ctx, &coordinatorproto.SpaceStatusCheckRequest{ + SpaceId: spaceId, + }) +} + func (c *coordinatorClient) Init(a *app.App) (err error) { c.pool = a.MustComponent(pool.CName).(pool.Service).NewPool(CName) c.nodeConf = a.MustComponent(nodeconf.CName).(nodeconf.Service) @@ -36,13 +62,14 @@ func (c *coordinatorClient) Name() (name string) { return CName } -func (c *coordinatorClient) SpaceSign(ctx context.Context, spaceId string) (receipt *coordinatorproto.SpaceReceiptWithSignature, err error) { +func (c *coordinatorClient) SpaceSign(ctx context.Context, spaceId string, spaceHeader []byte) (receipt *coordinatorproto.SpaceReceiptWithSignature, err error) { cl, err := c.client(ctx) if err != nil { return } resp, err := cl.SpaceSign(ctx, &coordinatorproto.SpaceSignRequest{ SpaceId: spaceId, + Header: spaceHeader, }) if err != nil { return From 6e5d0442516d120baa54057d3fd2e4bca9b36a0b Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Thu, 2 Mar 2023 20:54:52 +0100 Subject: [PATCH 09/19] Update metrics to convert dots --- app/ocache/metrics.go | 9 ++++++++- app/ocache/metrics_test.go | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 app/ocache/metrics_test.go diff --git a/app/ocache/metrics.go b/app/ocache/metrics.go index b5fe9aa4..b520dff2 100644 --- a/app/ocache/metrics.go +++ b/app/ocache/metrics.go @@ -1,11 +1,18 @@ package ocache -import "github.com/prometheus/client_golang/prometheus" +import ( + "github.com/prometheus/client_golang/prometheus" + "strings" +) func WithPrometheus(reg *prometheus.Registry, namespace, subsystem string) Option { if subsystem == "" { subsystem = "cache" } + nameSplit := strings.Split(namespace, ".") + subSplit := strings.Split(subsystem, ".") + namespace = strings.Join(nameSplit, "_") + subsystem = strings.Join(subSplit, "_") if reg == nil { return nil } diff --git a/app/ocache/metrics_test.go b/app/ocache/metrics_test.go new file mode 100644 index 00000000..e14d670d --- /dev/null +++ b/app/ocache/metrics_test.go @@ -0,0 +1,19 @@ +package ocache + +import ( + "context" + "github.com/prometheus/client_golang/prometheus" + "github.com/stretchr/testify/require" + "strings" + "testing" +) + +func TestWithPrometheus_MetricsConvertsDots(t *testing.T) { + opt := WithPrometheus(prometheus.NewRegistry(), "some.name", "some.system") + cache := New(func(ctx context.Context, id string) (value Object, err error) { + return &testObject{}, nil + }, opt).(*oCache) + _, err := cache.Get(context.Background(), "id") + require.NoError(t, err) + require.True(t, strings.Contains(cache.metrics.hit.Desc().String(), "some_name_some_system_hit")) +} From 5218eea8add9e692085d4c4b780f0f3f4d4ae697 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Thu, 2 Mar 2023 21:08:14 +0100 Subject: [PATCH 10/19] Fix change builder with no root --- commonspace/object/tree/objecttree/changebuilder.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/commonspace/object/tree/objecttree/changebuilder.go b/commonspace/object/tree/objecttree/changebuilder.go index f23648b0..29a1a500 100644 --- a/commonspace/object/tree/objecttree/changebuilder.go +++ b/commonspace/object/tree/objecttree/changebuilder.go @@ -220,7 +220,7 @@ func (c *changeBuilder) Build(payload BuilderContent) (ch *Change, rawIdChange * } func (c *changeBuilder) Marshall(ch *Change) (raw *treechangeproto.RawTreeChangeWithId, err error) { - if ch.Id == c.rootChange.Id { + if c.isRoot(ch.Id) { return c.rootChange, nil } treeChange := &treechangeproto.TreeChange{ @@ -255,7 +255,7 @@ func (c *changeBuilder) Marshall(ch *Change) (raw *treechangeproto.RawTreeChange } func (c *changeBuilder) unmarshallRawChange(raw *treechangeproto.RawTreeChange, id string) (ch *Change, err error) { - if c.rootChange.Id == id { + if c.isRoot(id) { unmarshalled := &treechangeproto.RootChange{} err = proto.Unmarshal(raw.Payload, unmarshalled) if err != nil { @@ -274,3 +274,10 @@ func (c *changeBuilder) unmarshallRawChange(raw *treechangeproto.RawTreeChange, ch = NewChange(id, unmarshalled, raw.Signature) return } + +func (c *changeBuilder) isRoot(id string) bool { + if c.rootChange != nil { + return c.rootChange.Id == id + } + return false +} From 897c50e8e69da0c3c1d0e73663c885ee8edd3885 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Thu, 2 Mar 2023 22:04:37 +0100 Subject: [PATCH 11/19] Add credential provider --- .../credentialprovider/credentialprovider.go | 48 ++++++ .../mock_credentialprovider.go | 80 +++++++++ commonspace/headsync/diffsyncer.go | 45 +++-- commonspace/headsync/diffsyncer_test.go | 16 +- commonspace/headsync/headsync.go | 4 +- commonspace/spaceservice.go | 5 +- .../spacesyncproto/protos/spacesync.proto | 1 + commonspace/spacesyncproto/spacesync.pb.go | 162 ++++++++++++------ .../mock_coordinatorclient.go | 38 +++- nodeconf/mock_nodeconf/mock_nodeconf.go | 14 ++ 10 files changed, 332 insertions(+), 81 deletions(-) create mode 100644 commonspace/credentialprovider/credentialprovider.go create mode 100644 commonspace/credentialprovider/mock_credentialprovider/mock_credentialprovider.go diff --git a/commonspace/credentialprovider/credentialprovider.go b/commonspace/credentialprovider/credentialprovider.go new file mode 100644 index 00000000..04641be9 --- /dev/null +++ b/commonspace/credentialprovider/credentialprovider.go @@ -0,0 +1,48 @@ +//go:generate mockgen -destination mock_credentialprovider/mock_credentialprovider.go github.com/anytypeio/any-sync/commonspace/credentialprovider CredentialProvider +package credentialprovider + +import ( + "context" + "github.com/anytypeio/any-sync/app" + "github.com/anytypeio/any-sync/commonspace/spacesyncproto" + "github.com/anytypeio/any-sync/coordinator/coordinatorclient" + "github.com/anytypeio/any-sync/nodeconf" + "github.com/gogo/protobuf/proto" +) + +const CName = "common.commonspace.credentialprovider" + +func New() CredentialProvider { + return &credentialProvider{} +} + +type CredentialProvider interface { + app.Component + GetCredential(ctx context.Context, spaceHeader *spacesyncproto.RawSpaceHeaderWithId) ([]byte, error) +} + +type credentialProvider struct { + conf nodeconf.Service + client coordinatorclient.CoordinatorClient +} + +func (c *credentialProvider) Init(a *app.App) (err error) { + c.conf = a.MustComponent(nodeconf.CName).(nodeconf.Service) + c.client = a.MustComponent(coordinatorclient.CName).(coordinatorclient.CoordinatorClient) + return +} + +func (c *credentialProvider) Name() (name string) { + return CName +} + +func (c *credentialProvider) GetCredential(ctx context.Context, spaceHeader *spacesyncproto.RawSpaceHeaderWithId) ([]byte, error) { + if c.conf.GetLast().IsResponsible(spaceHeader.Id) { + return nil, nil + } + receipt, err := c.client.SpaceSign(ctx, spaceHeader.Id, spaceHeader.RawHeader) + if err != nil { + return nil, err + } + return proto.Marshal(receipt) +} diff --git a/commonspace/credentialprovider/mock_credentialprovider/mock_credentialprovider.go b/commonspace/credentialprovider/mock_credentialprovider/mock_credentialprovider.go new file mode 100644 index 00000000..8a39d925 --- /dev/null +++ b/commonspace/credentialprovider/mock_credentialprovider/mock_credentialprovider.go @@ -0,0 +1,80 @@ +// Code generated by MockGen. DO NOT EDIT. +// Source: github.com/anytypeio/any-sync/commonspace/credentialprovider (interfaces: CredentialProvider) + +// Package mock_credentialprovider is a generated GoMock package. +package mock_credentialprovider + +import ( + context "context" + reflect "reflect" + + app "github.com/anytypeio/any-sync/app" + spacesyncproto "github.com/anytypeio/any-sync/commonspace/spacesyncproto" + gomock "github.com/golang/mock/gomock" +) + +// MockCredentialProvider is a mock of CredentialProvider interface. +type MockCredentialProvider struct { + ctrl *gomock.Controller + recorder *MockCredentialProviderMockRecorder +} + +// MockCredentialProviderMockRecorder is the mock recorder for MockCredentialProvider. +type MockCredentialProviderMockRecorder struct { + mock *MockCredentialProvider +} + +// NewMockCredentialProvider creates a new mock instance. +func NewMockCredentialProvider(ctrl *gomock.Controller) *MockCredentialProvider { + mock := &MockCredentialProvider{ctrl: ctrl} + mock.recorder = &MockCredentialProviderMockRecorder{mock} + return mock +} + +// EXPECT returns an object that allows the caller to indicate expected use. +func (m *MockCredentialProvider) EXPECT() *MockCredentialProviderMockRecorder { + return m.recorder +} + +// GetCredential mocks base method. +func (m *MockCredentialProvider) GetCredential(arg0 context.Context, arg1 *spacesyncproto.RawSpaceHeaderWithId) ([]byte, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetCredential", arg0, arg1) + ret0, _ := ret[0].([]byte) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// GetCredential indicates an expected call of GetCredential. +func (mr *MockCredentialProviderMockRecorder) GetCredential(arg0, arg1 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCredential", reflect.TypeOf((*MockCredentialProvider)(nil).GetCredential), arg0, arg1) +} + +// Init mocks base method. +func (m *MockCredentialProvider) Init(arg0 *app.App) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Init", arg0) + ret0, _ := ret[0].(error) + return ret0 +} + +// Init indicates an expected call of Init. +func (mr *MockCredentialProviderMockRecorder) Init(arg0 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockCredentialProvider)(nil).Init), arg0) +} + +// Name mocks base method. +func (m *MockCredentialProvider) Name() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "Name") + ret0, _ := ret[0].(string) + return ret0 +} + +// Name indicates an expected call of Name. +func (mr *MockCredentialProviderMockRecorder) Name() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Name", reflect.TypeOf((*MockCredentialProvider)(nil).Name)) +} diff --git a/commonspace/headsync/diffsyncer.go b/commonspace/headsync/diffsyncer.go index 141509d4..3f3f3f82 100644 --- a/commonspace/headsync/diffsyncer.go +++ b/commonspace/headsync/diffsyncer.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/anytypeio/any-sync/app/ldiff" "github.com/anytypeio/any-sync/app/logger" + "github.com/anytypeio/any-sync/commonspace/credentialprovider" "github.com/anytypeio/any-sync/commonspace/object/tree/synctree" "github.com/anytypeio/any-sync/commonspace/object/treegetter" "github.com/anytypeio/any-sync/commonspace/peermanager" @@ -33,29 +34,32 @@ func newDiffSyncer( storage spacestorage.SpaceStorage, clientFactory spacesyncproto.ClientFactory, syncStatus syncstatus.StatusUpdater, + credentialProvider credentialprovider.CredentialProvider, log logger.CtxLogger) DiffSyncer { return &diffSyncer{ - diff: diff, - spaceId: spaceId, - cache: cache, - storage: storage, - peerManager: peerManager, - clientFactory: clientFactory, - log: log, - syncStatus: syncStatus, + diff: diff, + spaceId: spaceId, + cache: cache, + storage: storage, + peerManager: peerManager, + clientFactory: clientFactory, + credentialProvider: credentialProvider, + log: log, + syncStatus: syncStatus, } } type diffSyncer struct { - spaceId string - diff ldiff.Diff - peerManager peermanager.PeerManager - cache treegetter.TreeGetter - storage spacestorage.SpaceStorage - clientFactory spacesyncproto.ClientFactory - log logger.CtxLogger - deletionState settingsstate.ObjectDeletionState - syncStatus syncstatus.StatusUpdater + spaceId string + diff ldiff.Diff + peerManager peermanager.PeerManager + cache treegetter.TreeGetter + storage spacestorage.SpaceStorage + clientFactory spacesyncproto.ClientFactory + log logger.CtxLogger + deletionState settingsstate.ObjectDeletionState + credentialProvider credentialprovider.CredentialProvider + syncStatus syncstatus.StatusUpdater } func (d *diffSyncer) Init(deletionState settingsstate.ObjectDeletionState) { @@ -192,6 +196,10 @@ func (d *diffSyncer) sendPushSpaceRequest(ctx context.Context, peerId string, cl return } + cred, err := d.credentialProvider.GetCredential(ctx, header) + if err != nil { + return + } spacePayload := &spacesyncproto.SpacePayload{ SpaceHeader: header, AclPayload: root.Payload, @@ -200,7 +208,8 @@ func (d *diffSyncer) sendPushSpaceRequest(ctx context.Context, peerId string, cl SpaceSettingsPayloadId: spaceSettingsRoot.Id, } _, err = cl.SpacePush(ctx, &spacesyncproto.SpacePushRequest{ - Payload: spacePayload, + Payload: spacePayload, + Credential: cred, }) if err != nil { return diff --git a/commonspace/headsync/diffsyncer_test.go b/commonspace/headsync/diffsyncer_test.go index f5d776c4..e73eb55a 100644 --- a/commonspace/headsync/diffsyncer_test.go +++ b/commonspace/headsync/diffsyncer_test.go @@ -1,11 +1,13 @@ package headsync import ( + "bytes" "context" "fmt" "github.com/anytypeio/any-sync/app/ldiff" "github.com/anytypeio/any-sync/app/ldiff/mock_ldiff" "github.com/anytypeio/any-sync/app/logger" + "github.com/anytypeio/any-sync/commonspace/credentialprovider/mock_credentialprovider" "github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto" "github.com/anytypeio/any-sync/commonspace/object/acl/liststorage/mock_liststorage" "github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto" @@ -30,6 +32,7 @@ type pushSpaceRequestMatcher struct { spaceId string aclRootId string settingsId string + credential []byte spaceHeader *spacesyncproto.RawSpaceHeaderWithId } @@ -39,7 +42,7 @@ func (p pushSpaceRequestMatcher) Matches(x interface{}) bool { return false } - return res.Payload.AclPayloadId == p.aclRootId && res.Payload.SpaceHeader == p.spaceHeader && res.Payload.SpaceSettingsPayloadId == p.settingsId + return res.Payload.AclPayloadId == p.aclRootId && res.Payload.SpaceHeader == p.spaceHeader && res.Payload.SpaceSettingsPayloadId == p.settingsId && bytes.Equal(p.credential, res.Credential) } func (p pushSpaceRequestMatcher) String() string { @@ -83,11 +86,13 @@ func newPushSpaceRequestMatcher( spaceId string, aclRootId string, settingsId string, + credential []byte, spaceHeader *spacesyncproto.RawSpaceHeaderWithId) *pushSpaceRequestMatcher { return &pushSpaceRequestMatcher{ spaceId: spaceId, aclRootId: aclRootId, settingsId: settingsId, + credential: credential, spaceHeader: spaceHeader, } } @@ -106,11 +111,12 @@ func TestDiffSyncer_Sync(t *testing.T) { factory := spacesyncproto.ClientFactoryFunc(func(cc drpc.Conn) spacesyncproto.DRPCSpaceSyncClient { return clientMock }) + credentialProvider := mock_credentialprovider.NewMockCredentialProvider(ctrl) delState := mock_settingsstate.NewMockObjectDeletionState(ctrl) spaceId := "spaceId" aclRootId := "aclRootId" l := logger.NewNamed(spaceId) - diffSyncer := newDiffSyncer(spaceId, diffMock, peerManagerMock, cacheMock, stMock, factory, syncstatus.NewNoOpSyncStatus(), l) + diffSyncer := newDiffSyncer(spaceId, diffMock, peerManagerMock, cacheMock, stMock, factory, syncstatus.NewNoOpSyncStatus(), credentialProvider, l) delState.EXPECT().AddObserver(gomock.Any()) diffSyncer.Init(delState) @@ -172,6 +178,7 @@ func TestDiffSyncer_Sync(t *testing.T) { } spaceHeader := &spacesyncproto.RawSpaceHeaderWithId{} spaceSettingsId := "spaceSettingsId" + credential := []byte("credential") peerManagerMock.EXPECT(). GetResponsiblePeers(gomock.Any()). @@ -189,8 +196,11 @@ func TestDiffSyncer_Sync(t *testing.T) { aclStorageMock.EXPECT(). Root(). Return(aclRoot, nil) + credentialProvider.EXPECT(). + GetCredential(gomock.Any(), spaceHeader). + Return(credential, nil) clientMock.EXPECT(). - SpacePush(gomock.Any(), newPushSpaceRequestMatcher(spaceId, aclRootId, settingsId, spaceHeader)). + SpacePush(gomock.Any(), newPushSpaceRequestMatcher(spaceId, aclRootId, settingsId, credential, spaceHeader)). Return(nil, nil) peerManagerMock.EXPECT().SendPeer(gomock.Any(), "mockId", gomock.Any()) diff --git a/commonspace/headsync/headsync.go b/commonspace/headsync/headsync.go index 98e20c20..08d6d9e3 100644 --- a/commonspace/headsync/headsync.go +++ b/commonspace/headsync/headsync.go @@ -5,6 +5,7 @@ import ( "context" "github.com/anytypeio/any-sync/app/ldiff" "github.com/anytypeio/any-sync/app/logger" + "github.com/anytypeio/any-sync/commonspace/credentialprovider" "github.com/anytypeio/any-sync/commonspace/object/treegetter" "github.com/anytypeio/any-sync/commonspace/peermanager" "github.com/anytypeio/any-sync/commonspace/settings/settingsstate" @@ -60,12 +61,13 @@ func NewHeadSync( peerManager peermanager.PeerManager, cache treegetter.TreeGetter, syncStatus syncstatus.StatusUpdater, + credentialProvider credentialprovider.CredentialProvider, log logger.CtxLogger) HeadSync { diff := ldiff.New(16, 16) l := log.With(zap.String("spaceId", spaceId)) factory := spacesyncproto.ClientFactoryFunc(spacesyncproto.NewDRPCSpaceSyncClient) - syncer := newDiffSyncer(spaceId, diff, peerManager, cache, storage, factory, syncStatus, l) + syncer := newDiffSyncer(spaceId, diff, peerManager, cache, storage, factory, syncStatus, credentialProvider, l) sync := func(ctx context.Context) (err error) { // for clients cancelling the sync process if spaceIsDeleted.Load() && !configuration.IsResponsible(spaceId) { diff --git a/commonspace/spaceservice.go b/commonspace/spaceservice.go index 8cf79947..42de938a 100644 --- a/commonspace/spaceservice.go +++ b/commonspace/spaceservice.go @@ -5,6 +5,7 @@ import ( "github.com/anytypeio/any-sync/accountservice" "github.com/anytypeio/any-sync/app" "github.com/anytypeio/any-sync/app/logger" + "github.com/anytypeio/any-sync/commonspace/credentialprovider" "github.com/anytypeio/any-sync/commonspace/headsync" "github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto" "github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto" @@ -45,6 +46,7 @@ type spaceService struct { configurationService nodeconf.Service storageProvider spacestorage.SpaceStorageProvider peermanagerProvider peermanager.PeerManagerProvider + credentialProvider credentialprovider.CredentialProvider treeGetter treegetter.TreeGetter pool pool.Pool } @@ -56,6 +58,7 @@ func (s *spaceService) Init(a *app.App) (err error) { s.configurationService = a.MustComponent(nodeconf.CName).(nodeconf.Service) s.treeGetter = a.MustComponent(treegetter.CName).(treegetter.TreeGetter) s.peermanagerProvider = a.MustComponent(peermanager.CName).(peermanager.PeerManagerProvider) + s.credentialProvider = a.MustComponent(credentialprovider.CName).(credentialprovider.CredentialProvider) s.pool = a.MustComponent(pool.CName).(pool.Pool) return nil } @@ -139,7 +142,7 @@ func (s *spaceService) NewSpace(ctx context.Context, id string) (Space, error) { return nil, err } - headSync := headsync.NewHeadSync(id, spaceIsDeleted, s.config.SyncPeriod, lastConfiguration, st, peerManager, getter, syncStatus, log) + headSync := headsync.NewHeadSync(id, spaceIsDeleted, s.config.SyncPeriod, lastConfiguration, st, peerManager, getter, syncStatus, s.credentialProvider, log) objectSync := objectsync.NewObjectSync(id, spaceIsDeleted, lastConfiguration, peerManager, getter) sp := &space{ id: id, diff --git a/commonspace/spacesyncproto/protos/spacesync.proto b/commonspace/spacesyncproto/protos/spacesync.proto index 06f2bf9f..48b44e0f 100644 --- a/commonspace/spacesyncproto/protos/spacesync.proto +++ b/commonspace/spacesyncproto/protos/spacesync.proto @@ -66,6 +66,7 @@ message ObjectSyncMessage { // SpacePushRequest is a request to add space on a node containing only one acl record message SpacePushRequest { SpacePayload payload = 1; + bytes Credential = 2; } // SpacePushResponse is an empty response diff --git a/commonspace/spacesyncproto/spacesync.pb.go b/commonspace/spacesyncproto/spacesync.pb.go index 5ef50a67..8fb1a914 100644 --- a/commonspace/spacesyncproto/spacesync.pb.go +++ b/commonspace/spacesyncproto/spacesync.pb.go @@ -437,7 +437,8 @@ func (m *ObjectSyncMessage) GetObjectId() string { // SpacePushRequest is a request to add space on a node containing only one acl record type SpacePushRequest struct { - Payload *SpacePayload `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"` + Payload *SpacePayload `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"` + Credential []byte `protobuf:"bytes,2,opt,name=Credential,proto3" json:"Credential,omitempty"` } func (m *SpacePushRequest) Reset() { *m = SpacePushRequest{} } @@ -480,6 +481,13 @@ func (m *SpacePushRequest) GetPayload() *SpacePayload { return nil } +func (m *SpacePushRequest) GetCredential() []byte { + if m != nil { + return m.Credential + } + return nil +} + // SpacePushResponse is an empty response type SpacePushResponse struct { } @@ -1232,21 +1240,21 @@ func init() { } var fileDescriptor_80e49f1f4ac27799 = []byte{ - // 1019 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x4b, 0x6f, 0xdb, 0x46, + // 1030 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x4b, 0x6f, 0xdb, 0x46, 0x10, 0x16, 0xe9, 0xa7, 0xc6, 0xb2, 0xcc, 0x6c, 0x9c, 0x44, 0x55, 0x0c, 0x45, 0x58, 0x14, 0x85, - 0x91, 0x43, 0x1e, 0x72, 0x51, 0x20, 0x69, 0x7b, 0x48, 0x6c, 0xa5, 0x11, 0x8a, 0xd4, 0xc6, 0xaa, + 0x91, 0x43, 0x1e, 0x72, 0x51, 0x20, 0x69, 0x7b, 0x48, 0x64, 0xa7, 0x11, 0x8a, 0xd4, 0xc6, 0xaa, 0x41, 0x81, 0x02, 0x39, 0xac, 0xc9, 0xb1, 0xc4, 0x96, 0x22, 0x59, 0xee, 0xaa, 0xb6, 0x8e, 0x3d, 0xf5, 0xda, 0x73, 0x7b, 0xea, 0x7f, 0xe8, 0x8f, 0xe8, 0x31, 0xc7, 0x1e, 0x0b, 0xfb, 0x8f, 0x14, - 0xbb, 0x5c, 0x3e, 0x24, 0x51, 0x39, 0xf4, 0x22, 0x73, 0xbf, 0x99, 0xf9, 0xe6, 0xb5, 0x3b, 0x63, - 0x78, 0xea, 0x46, 0x93, 0x49, 0x14, 0x8a, 0x98, 0xbb, 0xf8, 0x58, 0xff, 0x8a, 0x59, 0xe8, 0xc6, - 0x49, 0x24, 0xa3, 0xc7, 0xfa, 0x57, 0x14, 0xe8, 0x23, 0x0d, 0x90, 0x7a, 0x0e, 0xd0, 0x01, 0xec, - 0xbe, 0x46, 0xee, 0x0d, 0x67, 0xa1, 0xcb, 0x78, 0x38, 0x42, 0x42, 0x60, 0xfd, 0x22, 0x89, 0x26, - 0x2d, 0xab, 0x6b, 0x1d, 0xae, 0x33, 0xfd, 0x4d, 0x9a, 0x60, 0xcb, 0xa8, 0x65, 0x6b, 0xc4, 0x96, - 0x11, 0xd9, 0x87, 0x8d, 0xc0, 0x9f, 0xf8, 0xb2, 0xb5, 0xd6, 0xb5, 0x0e, 0x77, 0x59, 0x7a, 0xa0, - 0x57, 0xd0, 0xcc, 0xa9, 0x50, 0x4c, 0x03, 0xa9, 0xb8, 0xc6, 0x5c, 0x8c, 0x35, 0x57, 0x83, 0xe9, - 0x6f, 0xf2, 0x05, 0x6c, 0x63, 0x80, 0x13, 0x0c, 0xa5, 0x68, 0xd9, 0xdd, 0xb5, 0xc3, 0x9d, 0x5e, - 0xf7, 0x51, 0x11, 0xdf, 0x3c, 0x41, 0x3f, 0x55, 0x64, 0xb9, 0x85, 0xf2, 0xec, 0x46, 0xd3, 0x30, + 0xbb, 0x5c, 0x3e, 0x24, 0x51, 0x01, 0x7a, 0x91, 0xb9, 0xdf, 0xcc, 0x7c, 0xf3, 0xda, 0x9d, 0x31, + 0x3c, 0x75, 0xa3, 0xc9, 0x24, 0x0a, 0x45, 0xcc, 0x5d, 0x7c, 0xac, 0x7f, 0xc5, 0x2c, 0x74, 0xe3, + 0x24, 0x92, 0xd1, 0x63, 0xfd, 0x2b, 0x0a, 0xf4, 0x91, 0x06, 0x48, 0x3d, 0x07, 0xe8, 0x00, 0x76, + 0x5f, 0x23, 0xf7, 0x86, 0xb3, 0xd0, 0x65, 0x3c, 0x1c, 0x21, 0x21, 0xb0, 0x7e, 0x91, 0x44, 0x93, + 0x96, 0xd5, 0xb5, 0x0e, 0xd7, 0x99, 0xfe, 0x26, 0x4d, 0xb0, 0x65, 0xd4, 0xb2, 0x35, 0x62, 0xcb, + 0x88, 0xec, 0xc3, 0x46, 0xe0, 0x4f, 0x7c, 0xd9, 0x5a, 0xeb, 0x5a, 0x87, 0xbb, 0x2c, 0x3d, 0xd0, + 0x2b, 0x68, 0xe6, 0x54, 0x28, 0xa6, 0x81, 0x54, 0x5c, 0x63, 0x2e, 0xc6, 0x9a, 0xab, 0xc1, 0xf4, + 0x37, 0xf9, 0x02, 0xb6, 0x31, 0xc0, 0x09, 0x86, 0x52, 0xb4, 0xec, 0xee, 0xda, 0xe1, 0x4e, 0xaf, + 0xfb, 0xa8, 0x88, 0x6f, 0x9e, 0xe0, 0x24, 0x55, 0x64, 0xb9, 0x85, 0xf2, 0xec, 0x46, 0xd3, 0x30, 0xf7, 0xac, 0x0f, 0xf4, 0x73, 0xb8, 0x53, 0x69, 0xa8, 0x02, 0xf7, 0x3d, 0xed, 0xbe, 0xce, 0x6c, 0xdf, 0xd3, 0x01, 0x21, 0xf7, 0x74, 0x2a, 0x75, 0xa6, 0xbf, 0xe9, 0x3b, 0xd8, 0x2b, 0x8c, 0x7f, 0x9a, 0xa2, 0x90, 0xa4, 0x05, 0x5b, 0x3a, 0xa4, 0x41, 0x66, 0x9b, 0x1d, 0xc9, 0x13, 0xd8, 0x4c, @@ -1256,47 +1264,48 @@ var fileDescriptor_80e49f1f4ac27799 = []byte{ 0x42, 0xf0, 0x11, 0x7e, 0x20, 0xd4, 0x03, 0xa8, 0x27, 0x69, 0x3e, 0x83, 0x2c, 0xe1, 0x02, 0x50, 0x76, 0x09, 0xc6, 0xc1, 0x6c, 0xe0, 0xe9, 0x52, 0xd6, 0x59, 0x76, 0x54, 0x92, 0x98, 0xcf, 0x82, 0x88, 0x7b, 0xad, 0x75, 0xdd, 0xb7, 0xec, 0x48, 0xda, 0xb0, 0x1d, 0xe9, 0x00, 0x06, 0x5e, 0x6b, - 0x43, 0x1b, 0xe5, 0x67, 0xda, 0x07, 0x67, 0xa8, 0x1c, 0x9f, 0x4d, 0xc5, 0x38, 0x2b, 0xe3, 0xd3, - 0x82, 0x49, 0xc5, 0xb6, 0xd3, 0xbb, 0x57, 0x4a, 0x33, 0xd5, 0x4e, 0xc5, 0xb9, 0x0b, 0x7a, 0x1b, - 0x6e, 0x95, 0x68, 0xd2, 0x72, 0x51, 0x9a, 0x73, 0x07, 0x41, 0xc6, 0xbd, 0xd0, 0x59, 0xfa, 0x2a, - 0x37, 0x54, 0x3a, 0xa6, 0xce, 0xff, 0x23, 0x80, 0x5f, 0x6c, 0x68, 0x94, 0x25, 0xe4, 0x05, 0xec, - 0x68, 0x1b, 0xd5, 0x16, 0x4c, 0x0c, 0xcf, 0x83, 0x12, 0x0f, 0xe3, 0x97, 0xc3, 0x42, 0xe1, 0x3b, - 0x5f, 0x8e, 0x07, 0x1e, 0x2b, 0xdb, 0x90, 0x0e, 0x00, 0x77, 0x03, 0x43, 0xa8, 0x5b, 0xd1, 0x60, - 0x25, 0x84, 0x50, 0x68, 0x14, 0xa7, 0xbc, 0x21, 0x73, 0x18, 0xe9, 0xc1, 0xbe, 0xa6, 0x1c, 0xa2, - 0x94, 0x7e, 0x38, 0x12, 0x67, 0x73, 0x2d, 0xaa, 0x94, 0x91, 0xcf, 0xe0, 0x6e, 0x15, 0x9e, 0x77, - 0x6f, 0x85, 0x94, 0xfe, 0x69, 0xc1, 0x4e, 0x29, 0x25, 0xd5, 0x77, 0xdf, 0xc3, 0x50, 0xfa, 0x72, - 0x66, 0x9e, 0x72, 0x7e, 0x56, 0xb7, 0x4c, 0xfa, 0x13, 0x14, 0x92, 0x4f, 0x62, 0x9d, 0xda, 0x1a, - 0x2b, 0x00, 0x25, 0xd5, 0x3e, 0xbe, 0x9d, 0xc5, 0x68, 0xd2, 0x2a, 0x00, 0xf2, 0x09, 0x34, 0xd5, - 0xa5, 0xf3, 0x5d, 0x2e, 0xfd, 0x28, 0xfc, 0x1a, 0x67, 0x3a, 0x9b, 0x75, 0xb6, 0x80, 0xaa, 0x57, - 0x2b, 0x10, 0xd3, 0xa8, 0x1b, 0x4c, 0x7f, 0xd3, 0x33, 0x68, 0xce, 0x17, 0x9e, 0x74, 0x97, 0x1b, - 0xd5, 0x98, 0xef, 0x83, 0x8a, 0xc6, 0x1f, 0x85, 0x5c, 0x4e, 0x13, 0x34, 0x6d, 0x28, 0x00, 0x7a, - 0x02, 0xfb, 0x55, 0xad, 0xd4, 0xef, 0x88, 0x5f, 0xce, 0xb1, 0x16, 0x80, 0xb9, 0x87, 0x76, 0x7e, - 0x0f, 0x7f, 0xb7, 0x60, 0x7f, 0x58, 0x2e, 0xeb, 0x71, 0x14, 0x4a, 0x35, 0x8a, 0xbe, 0x84, 0x46, - 0xfa, 0x58, 0x4e, 0x30, 0x40, 0x89, 0x15, 0x17, 0xf2, 0xb4, 0x24, 0x7e, 0x5d, 0x63, 0x73, 0xea, - 0xe4, 0xb9, 0xc9, 0xce, 0x58, 0xdb, 0xda, 0xfa, 0xee, 0xe2, 0x75, 0xce, 0x8d, 0xcb, 0xca, 0x2f, - 0xb7, 0x60, 0xe3, 0x67, 0x1e, 0x4c, 0x91, 0x76, 0xa0, 0x51, 0x76, 0xb2, 0xf4, 0x88, 0x8e, 0x4c, - 0xdf, 0x8d, 0xf8, 0x63, 0xd8, 0xf5, 0xf4, 0x57, 0x72, 0x86, 0x98, 0xe4, 0x13, 0x66, 0x1e, 0xa4, - 0xef, 0xe0, 0xce, 0x5c, 0xc2, 0xc3, 0x90, 0xc7, 0x62, 0x1c, 0x49, 0x75, 0xed, 0x53, 0x4d, 0x6f, - 0xe0, 0xa5, 0x83, 0xae, 0xce, 0x4a, 0xc8, 0x32, 0xbd, 0x5d, 0x45, 0xff, 0xab, 0x05, 0x8d, 0x8c, - 0xfa, 0x84, 0x4b, 0x4e, 0x9e, 0xc1, 0x96, 0x9b, 0xd6, 0xd4, 0x0c, 0xcf, 0x07, 0x8b, 0x55, 0x58, - 0x28, 0x3d, 0xcb, 0xf4, 0xd5, 0xee, 0x11, 0x26, 0x3a, 0x53, 0xc1, 0xee, 0x2a, 0xdb, 0x2c, 0x0b, - 0x96, 0x5b, 0xd0, 0x1f, 0xcd, 0x88, 0x19, 0x4e, 0xcf, 0x85, 0x9b, 0xf8, 0xb1, 0xba, 0x9e, 0xea, - 0x6d, 0x98, 0x81, 0x9b, 0xa5, 0x98, 0x9f, 0xc9, 0x73, 0xd8, 0xe4, 0xae, 0xd2, 0xd2, 0xce, 0x9a, - 0x3d, 0xba, 0xe4, 0xac, 0xc4, 0xf4, 0x42, 0x6b, 0x32, 0x63, 0xf1, 0xf0, 0x12, 0xb6, 0xfb, 0x49, - 0x72, 0x1c, 0x79, 0x28, 0x48, 0x13, 0xe0, 0x6d, 0x88, 0x57, 0x31, 0xba, 0x12, 0x3d, 0xa7, 0x46, - 0x1c, 0x33, 0xa2, 0xde, 0xf8, 0x42, 0xf8, 0xe1, 0xc8, 0xb1, 0xc8, 0x9e, 0x69, 0x5c, 0xff, 0xca, - 0x17, 0x52, 0x38, 0x36, 0xb9, 0x0d, 0x7b, 0x1a, 0xf8, 0x26, 0x92, 0x83, 0xf0, 0x98, 0xbb, 0x63, - 0x74, 0xd6, 0x08, 0x81, 0xa6, 0x06, 0x07, 0x22, 0x6d, 0xb0, 0xe7, 0xac, 0x2b, 0xcb, 0x7e, 0x92, - 0x44, 0xc9, 0xe9, 0xc5, 0x85, 0x40, 0xe9, 0x78, 0x0f, 0x9f, 0xc1, 0xbd, 0x15, 0xb1, 0x91, 0x5d, - 0xa8, 0x1b, 0xf4, 0x1c, 0x9d, 0x9a, 0x32, 0x7d, 0x1b, 0x8a, 0x1c, 0xb0, 0x7a, 0x7f, 0xd9, 0x50, - 0x4f, 0x6d, 0x67, 0xa1, 0x4b, 0x8e, 0x61, 0x3b, 0x5b, 0x65, 0xa4, 0x5d, 0xb9, 0xdf, 0xf4, 0x24, - 0x6f, 0xdf, 0xaf, 0xde, 0x7d, 0xe9, 0x04, 0x7f, 0x65, 0x18, 0xd5, 0x3e, 0x20, 0xf7, 0x97, 0xa6, - 0x77, 0xb1, 0x6c, 0xda, 0x07, 0xd5, 0xc2, 0x25, 0x9e, 0x20, 0xa8, 0xe2, 0xc9, 0x17, 0x4b, 0x15, - 0x4f, 0x69, 0xa3, 0x30, 0x70, 0x8a, 0x1d, 0x3c, 0x94, 0x09, 0xf2, 0x09, 0x39, 0x58, 0x7a, 0xc3, - 0xa5, 0x05, 0xdd, 0xfe, 0xa0, 0xf4, 0xd0, 0x7a, 0x62, 0xbd, 0xfc, 0xf4, 0xef, 0xeb, 0x8e, 0xf5, - 0xfe, 0xba, 0x63, 0xfd, 0x7b, 0xdd, 0xb1, 0x7e, 0xbb, 0xe9, 0xd4, 0xde, 0xdf, 0x74, 0x6a, 0xff, - 0xdc, 0x74, 0x6a, 0xdf, 0xb7, 0x57, 0xff, 0x6b, 0x77, 0xbe, 0xa9, 0xff, 0x1c, 0xfd, 0x17, 0x00, - 0x00, 0xff, 0xff, 0xa1, 0xe4, 0x04, 0x3d, 0xff, 0x09, 0x00, 0x00, + 0x43, 0x1b, 0xe5, 0x67, 0x8a, 0xe0, 0x0c, 0x95, 0xe3, 0xb3, 0xa9, 0x18, 0x67, 0x65, 0x7c, 0x5a, + 0x30, 0xa9, 0xd8, 0x76, 0x7a, 0xf7, 0x4a, 0x69, 0xa6, 0xda, 0xa9, 0xb8, 0x70, 0xd1, 0x01, 0xe8, + 0x27, 0xe8, 0x61, 0x28, 0x7d, 0x1e, 0xe8, 0xa8, 0x1b, 0xac, 0x84, 0xd0, 0xdb, 0x70, 0xab, 0xe4, + 0x26, 0x2d, 0x27, 0xa5, 0xb9, 0xef, 0x20, 0xc8, 0x7c, 0x2f, 0x74, 0x9e, 0xbe, 0xca, 0x0d, 0x95, + 0x8e, 0xe9, 0xc3, 0xff, 0x0f, 0x90, 0xfe, 0x62, 0x43, 0xa3, 0x2c, 0x21, 0x2f, 0x60, 0x47, 0xdb, + 0xa8, 0xb6, 0x61, 0x62, 0x78, 0x1e, 0x94, 0x78, 0x18, 0xbf, 0x1c, 0x16, 0x0a, 0xdf, 0xf9, 0x72, + 0x3c, 0xf0, 0x58, 0xd9, 0x46, 0x25, 0xcd, 0xdd, 0xc0, 0x10, 0x66, 0x49, 0x17, 0x08, 0xa1, 0xd0, + 0x28, 0x4e, 0x79, 0xc3, 0xe6, 0x30, 0xd2, 0x83, 0x7d, 0x4d, 0x39, 0x44, 0x29, 0xfd, 0x70, 0x24, + 0xce, 0xe6, 0x5a, 0x58, 0x29, 0x23, 0x9f, 0xc1, 0xdd, 0x2a, 0x3c, 0xef, 0xee, 0x0a, 0x29, 0xfd, + 0xd3, 0x82, 0x9d, 0x52, 0x4a, 0xea, 0x5e, 0xf8, 0xba, 0x41, 0x72, 0x66, 0x9e, 0x7a, 0x7e, 0x56, + 0xb7, 0x50, 0xfa, 0x13, 0x14, 0x92, 0x4f, 0x62, 0x9d, 0xda, 0x1a, 0x2b, 0x00, 0x25, 0xd5, 0x3e, + 0xbe, 0x9d, 0xc5, 0x68, 0xd2, 0x2a, 0x00, 0xf2, 0x09, 0x34, 0xd5, 0xa5, 0xf4, 0x5d, 0x2e, 0xfd, + 0x28, 0xfc, 0x1a, 0x67, 0x3a, 0x9b, 0x75, 0xb6, 0x80, 0xaa, 0x57, 0x2d, 0x10, 0xd3, 0xa8, 0x1b, + 0x4c, 0x7f, 0xd3, 0x33, 0x68, 0xce, 0x17, 0x9e, 0x74, 0x97, 0x1b, 0xd5, 0x98, 0xef, 0x83, 0x8a, + 0xc6, 0x1f, 0x85, 0x5c, 0x4e, 0x13, 0x34, 0x6d, 0x28, 0x00, 0x7a, 0x0c, 0xfb, 0x55, 0xad, 0xd4, + 0xef, 0x8c, 0x5f, 0xce, 0xb1, 0x16, 0x80, 0xb9, 0x87, 0x76, 0x7e, 0x0f, 0x7f, 0xb7, 0x60, 0x7f, + 0x58, 0x2e, 0x6b, 0x3f, 0x0a, 0xa5, 0x1a, 0x55, 0x5f, 0x42, 0x23, 0x7d, 0x4c, 0xc7, 0x18, 0xa0, + 0xc4, 0x8a, 0x0b, 0x79, 0x5a, 0x12, 0xbf, 0xae, 0xb1, 0x39, 0x75, 0xf2, 0xdc, 0x64, 0x67, 0xac, + 0x6d, 0x6d, 0x7d, 0x77, 0xf1, 0x3a, 0xe7, 0xc6, 0x65, 0xe5, 0x97, 0x5b, 0xb0, 0xf1, 0x33, 0x0f, + 0xa6, 0x48, 0x3b, 0xd0, 0x28, 0x3b, 0x59, 0x7a, 0x44, 0x47, 0xa6, 0xef, 0x46, 0xfc, 0x31, 0xec, + 0x7a, 0xfa, 0x2b, 0x39, 0x43, 0x4c, 0xf2, 0x09, 0x34, 0x0f, 0xd2, 0x77, 0x70, 0x67, 0x2e, 0xe1, + 0x61, 0xc8, 0x63, 0x31, 0x8e, 0xa4, 0xba, 0xf6, 0xa9, 0xa6, 0x37, 0xf0, 0xd2, 0x41, 0x58, 0x67, + 0x25, 0x64, 0x99, 0xde, 0xae, 0xa2, 0xff, 0xd5, 0x82, 0x46, 0x46, 0x7d, 0xcc, 0x25, 0x27, 0xcf, + 0x60, 0xcb, 0x4d, 0x6b, 0x6a, 0x86, 0xeb, 0x83, 0xc5, 0x2a, 0x2c, 0x94, 0x9e, 0x65, 0xfa, 0x6a, + 0x37, 0x09, 0x13, 0x9d, 0xa9, 0x60, 0x77, 0x95, 0x6d, 0x96, 0x05, 0xcb, 0x2d, 0xe8, 0x8f, 0x66, + 0xc4, 0x0c, 0xa7, 0xe7, 0xc2, 0x4d, 0xfc, 0x58, 0x5d, 0x4f, 0xf5, 0x36, 0xcc, 0x40, 0xce, 0x52, + 0xcc, 0xcf, 0xe4, 0x39, 0x6c, 0x72, 0x57, 0x69, 0x69, 0x67, 0xcd, 0x1e, 0x5d, 0x72, 0x56, 0x62, + 0x7a, 0xa1, 0x35, 0x99, 0xb1, 0x78, 0x78, 0x09, 0xdb, 0x27, 0x49, 0xd2, 0x8f, 0x3c, 0x14, 0xa4, + 0x09, 0xf0, 0x36, 0xc4, 0xab, 0x18, 0x5d, 0x89, 0x9e, 0x53, 0x23, 0x8e, 0x19, 0x51, 0x6f, 0x7c, + 0x21, 0xfc, 0x70, 0xe4, 0x58, 0x64, 0xcf, 0x34, 0xee, 0xe4, 0xca, 0x17, 0x52, 0x38, 0x36, 0xb9, + 0x0d, 0x7b, 0x1a, 0xf8, 0x26, 0x92, 0x83, 0xb0, 0xcf, 0xdd, 0x31, 0x3a, 0x6b, 0x84, 0x40, 0x53, + 0x83, 0x03, 0x91, 0x36, 0xd8, 0x73, 0xd6, 0x95, 0xe5, 0x49, 0x92, 0x44, 0xc9, 0xe9, 0xc5, 0x85, + 0x40, 0xe9, 0x78, 0x0f, 0x9f, 0xc1, 0xbd, 0x15, 0xb1, 0x91, 0x5d, 0xa8, 0x1b, 0xf4, 0x1c, 0x9d, + 0x9a, 0x32, 0x7d, 0x1b, 0x8a, 0x1c, 0xb0, 0x7a, 0x7f, 0xd9, 0x50, 0x4f, 0x6d, 0x67, 0xa1, 0x4b, + 0xfa, 0xb0, 0x9d, 0xad, 0x3a, 0xd2, 0xae, 0xdc, 0x7f, 0x7a, 0x92, 0xb7, 0xef, 0x57, 0xef, 0xc6, + 0x74, 0x82, 0xbf, 0x32, 0x8c, 0x6a, 0x1f, 0x90, 0xfb, 0x4b, 0xd3, 0xbb, 0x58, 0x46, 0xed, 0x83, + 0x6a, 0xe1, 0x12, 0x4f, 0x10, 0x54, 0xf1, 0xe4, 0x8b, 0xa5, 0x8a, 0xa7, 0xb4, 0x51, 0x18, 0x38, + 0xc5, 0x8e, 0x1e, 0xca, 0x04, 0xf9, 0x84, 0x1c, 0x2c, 0xbd, 0xe1, 0xd2, 0x02, 0x6f, 0x7f, 0x50, + 0x7a, 0x68, 0x3d, 0xb1, 0x5e, 0x7e, 0xfa, 0xf7, 0x75, 0xc7, 0x7a, 0x7f, 0xdd, 0xb1, 0xfe, 0xbd, + 0xee, 0x58, 0xbf, 0xdd, 0x74, 0x6a, 0xef, 0x6f, 0x3a, 0xb5, 0x7f, 0x6e, 0x3a, 0xb5, 0xef, 0xdb, + 0xab, 0xff, 0xf5, 0x3b, 0xdf, 0xd4, 0x7f, 0x8e, 0xfe, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x0b, 0x96, + 0xb3, 0xaa, 0x1f, 0x0a, 0x00, 0x00, } func (m *HeadSyncRange) Marshal() (dAtA []byte, err error) { @@ -1582,6 +1591,13 @@ func (m *SpacePushRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.Credential) > 0 { + i -= len(m.Credential) + copy(dAtA[i:], m.Credential) + i = encodeVarintSpacesync(dAtA, i, uint64(len(m.Credential))) + i-- + dAtA[i] = 0x12 + } if m.Payload != nil { { size, err := m.Payload.MarshalToSizedBuffer(dAtA[:i]) @@ -2276,6 +2292,10 @@ func (m *SpacePushRequest) Size() (n int) { l = m.Payload.Size() n += 1 + l + sovSpacesync(uint64(l)) } + l = len(m.Credential) + if l > 0 { + n += 1 + l + sovSpacesync(uint64(l)) + } return n } @@ -3363,6 +3383,40 @@ func (m *SpacePushRequest) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Credential", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowSpacesync + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthSpacesync + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthSpacesync + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Credential = append(m.Credential[:0], dAtA[iNdEx:postIndex]...) + if m.Credential == nil { + m.Credential = []byte{} + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipSpacesync(dAtA[iNdEx:]) diff --git a/coordinator/coordinatorclient/mock_coordinatorclient/mock_coordinatorclient.go b/coordinator/coordinatorclient/mock_coordinatorclient/mock_coordinatorclient.go index aa246870..b6b6931e 100644 --- a/coordinator/coordinatorclient/mock_coordinatorclient/mock_coordinatorclient.go +++ b/coordinator/coordinatorclient/mock_coordinatorclient/mock_coordinatorclient.go @@ -9,6 +9,7 @@ import ( reflect "reflect" app "github.com/anytypeio/any-sync/app" + treechangeproto "github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto" coordinatorproto "github.com/anytypeio/any-sync/coordinator/coordinatorproto" gomock "github.com/golang/mock/gomock" ) @@ -36,6 +37,20 @@ func (m *MockCoordinatorClient) EXPECT() *MockCoordinatorClientMockRecorder { return m.recorder } +// ChangeStatus mocks base method. +func (m *MockCoordinatorClient) ChangeStatus(arg0 context.Context, arg1 string, arg2 *treechangeproto.RawTreeChangeWithId) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "ChangeStatus", arg0, arg1, arg2) + ret0, _ := ret[0].(error) + return ret0 +} + +// ChangeStatus indicates an expected call of ChangeStatus. +func (mr *MockCoordinatorClientMockRecorder) ChangeStatus(arg0, arg1, arg2 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ChangeStatus", reflect.TypeOf((*MockCoordinatorClient)(nil).ChangeStatus), arg0, arg1, arg2) +} + // FileLimitCheck mocks base method. func (m *MockCoordinatorClient) FileLimitCheck(arg0 context.Context, arg1 string, arg2 []byte) (uint64, error) { m.ctrl.T.Helper() @@ -80,16 +95,31 @@ func (mr *MockCoordinatorClientMockRecorder) Name() *gomock.Call { } // SpaceSign mocks base method. -func (m *MockCoordinatorClient) SpaceSign(arg0 context.Context, arg1 string) (*coordinatorproto.SpaceReceiptWithSignature, error) { +func (m *MockCoordinatorClient) SpaceSign(arg0 context.Context, arg1 string, arg2 []byte) (*coordinatorproto.SpaceReceiptWithSignature, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SpaceSign", arg0, arg1) + ret := m.ctrl.Call(m, "SpaceSign", arg0, arg1, arg2) ret0, _ := ret[0].(*coordinatorproto.SpaceReceiptWithSignature) ret1, _ := ret[1].(error) return ret0, ret1 } // SpaceSign indicates an expected call of SpaceSign. -func (mr *MockCoordinatorClientMockRecorder) SpaceSign(arg0, arg1 interface{}) *gomock.Call { +func (mr *MockCoordinatorClientMockRecorder) SpaceSign(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SpaceSign", reflect.TypeOf((*MockCoordinatorClient)(nil).SpaceSign), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SpaceSign", reflect.TypeOf((*MockCoordinatorClient)(nil).SpaceSign), arg0, arg1, arg2) +} + +// StatusCheck mocks base method. +func (m *MockCoordinatorClient) StatusCheck(arg0 context.Context, arg1 string) (*coordinatorproto.SpaceStatusCheckResponse, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "StatusCheck", arg0, arg1) + ret0, _ := ret[0].(*coordinatorproto.SpaceStatusCheckResponse) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// StatusCheck indicates an expected call of StatusCheck. +func (mr *MockCoordinatorClientMockRecorder) StatusCheck(arg0, arg1 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StatusCheck", reflect.TypeOf((*MockCoordinatorClient)(nil).StatusCheck), arg0, arg1) } diff --git a/nodeconf/mock_nodeconf/mock_nodeconf.go b/nodeconf/mock_nodeconf/mock_nodeconf.go index a403da04..b8b2e800 100644 --- a/nodeconf/mock_nodeconf/mock_nodeconf.go +++ b/nodeconf/mock_nodeconf/mock_nodeconf.go @@ -157,6 +157,20 @@ func (mr *MockConfigurationMockRecorder) ConsensusPeers() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ConsensusPeers", reflect.TypeOf((*MockConfiguration)(nil).ConsensusPeers)) } +// CoordinatorPeers mocks base method. +func (m *MockConfiguration) CoordinatorPeers() []string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "CoordinatorPeers") + ret0, _ := ret[0].([]string) + return ret0 +} + +// CoordinatorPeers indicates an expected call of CoordinatorPeers. +func (mr *MockConfigurationMockRecorder) CoordinatorPeers() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CoordinatorPeers", reflect.TypeOf((*MockConfiguration)(nil).CoordinatorPeers)) +} + // FilePeers mocks base method. func (m *MockConfiguration) FilePeers() []string { m.ctrl.T.Helper() From cda401356d726a46aa7258986915137c17a03a44 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Thu, 2 Mar 2023 22:40:56 +0100 Subject: [PATCH 12/19] Simplify cred provider logic --- .../credentialprovider/credentialprovider.go | 20 ++++++++----- .../mock_credentialprovider.go | 29 ------------------- commonspace/spaceservice.go | 7 ++++- 3 files changed, 18 insertions(+), 38 deletions(-) diff --git a/commonspace/credentialprovider/credentialprovider.go b/commonspace/credentialprovider/credentialprovider.go index 04641be9..14f7f653 100644 --- a/commonspace/credentialprovider/credentialprovider.go +++ b/commonspace/credentialprovider/credentialprovider.go @@ -6,28 +6,35 @@ import ( "github.com/anytypeio/any-sync/app" "github.com/anytypeio/any-sync/commonspace/spacesyncproto" "github.com/anytypeio/any-sync/coordinator/coordinatorclient" - "github.com/anytypeio/any-sync/nodeconf" "github.com/gogo/protobuf/proto" ) const CName = "common.commonspace.credentialprovider" -func New() CredentialProvider { +func New() app.Component { return &credentialProvider{} } +func NewNoOp() CredentialProvider { + return &noOpProvider{} +} + type CredentialProvider interface { - app.Component GetCredential(ctx context.Context, spaceHeader *spacesyncproto.RawSpaceHeaderWithId) ([]byte, error) } +type noOpProvider struct { +} + +func (n noOpProvider) GetCredential(ctx context.Context, spaceHeader *spacesyncproto.RawSpaceHeaderWithId) ([]byte, error) { + return nil, nil +} + type credentialProvider struct { - conf nodeconf.Service client coordinatorclient.CoordinatorClient } func (c *credentialProvider) Init(a *app.App) (err error) { - c.conf = a.MustComponent(nodeconf.CName).(nodeconf.Service) c.client = a.MustComponent(coordinatorclient.CName).(coordinatorclient.CoordinatorClient) return } @@ -37,9 +44,6 @@ func (c *credentialProvider) Name() (name string) { } func (c *credentialProvider) GetCredential(ctx context.Context, spaceHeader *spacesyncproto.RawSpaceHeaderWithId) ([]byte, error) { - if c.conf.GetLast().IsResponsible(spaceHeader.Id) { - return nil, nil - } receipt, err := c.client.SpaceSign(ctx, spaceHeader.Id, spaceHeader.RawHeader) if err != nil { return nil, err diff --git a/commonspace/credentialprovider/mock_credentialprovider/mock_credentialprovider.go b/commonspace/credentialprovider/mock_credentialprovider/mock_credentialprovider.go index 8a39d925..daa3ccab 100644 --- a/commonspace/credentialprovider/mock_credentialprovider/mock_credentialprovider.go +++ b/commonspace/credentialprovider/mock_credentialprovider/mock_credentialprovider.go @@ -8,7 +8,6 @@ import ( context "context" reflect "reflect" - app "github.com/anytypeio/any-sync/app" spacesyncproto "github.com/anytypeio/any-sync/commonspace/spacesyncproto" gomock "github.com/golang/mock/gomock" ) @@ -50,31 +49,3 @@ func (mr *MockCredentialProviderMockRecorder) GetCredential(arg0, arg1 interface mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetCredential", reflect.TypeOf((*MockCredentialProvider)(nil).GetCredential), arg0, arg1) } - -// Init mocks base method. -func (m *MockCredentialProvider) Init(arg0 *app.App) error { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Init", arg0) - ret0, _ := ret[0].(error) - return ret0 -} - -// Init indicates an expected call of Init. -func (mr *MockCredentialProviderMockRecorder) Init(arg0 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockCredentialProvider)(nil).Init), arg0) -} - -// Name mocks base method. -func (m *MockCredentialProvider) Name() string { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Name") - ret0, _ := ret[0].(string) - return ret0 -} - -// Name indicates an expected call of Name. -func (mr *MockCredentialProviderMockRecorder) Name() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Name", reflect.TypeOf((*MockCredentialProvider)(nil).Name)) -} diff --git a/commonspace/spaceservice.go b/commonspace/spaceservice.go index 42de938a..d10fb35b 100644 --- a/commonspace/spaceservice.go +++ b/commonspace/spaceservice.go @@ -58,7 +58,12 @@ func (s *spaceService) Init(a *app.App) (err error) { s.configurationService = a.MustComponent(nodeconf.CName).(nodeconf.Service) s.treeGetter = a.MustComponent(treegetter.CName).(treegetter.TreeGetter) s.peermanagerProvider = a.MustComponent(peermanager.CName).(peermanager.PeerManagerProvider) - s.credentialProvider = a.MustComponent(credentialprovider.CName).(credentialprovider.CredentialProvider) + credProvider := a.Component(credentialprovider.CName) + if credProvider != nil { + s.credentialProvider = credProvider.(credentialprovider.CredentialProvider) + } else { + s.credentialProvider = credentialprovider.NewNoOp() + } s.pool = a.MustComponent(pool.CName).(pool.Pool) return nil } From 3f48831e8bd37c1cf2756ac2f8a08b923dd7635d Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Thu, 2 Mar 2023 23:28:46 +0100 Subject: [PATCH 13/19] Fix spacestorage --- commonspace/spacestorage/spacestorage.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commonspace/spacestorage/spacestorage.go b/commonspace/spacestorage/spacestorage.go index 9b0008fc..ff24d316 100644 --- a/commonspace/spacestorage/spacestorage.go +++ b/commonspace/spacestorage/spacestorage.go @@ -86,7 +86,7 @@ func ValidateSpaceHeader(spaceId string, header, identity []byte) (err error) { return } payload := &spacesyncproto.SpaceHeader{} - err = proto.Unmarshal(raw.SpaceHeader, raw) + err = proto.Unmarshal(raw.SpaceHeader, payload) if err != nil { return } From 3ea11abb56e91092f27e757eded3bc2702a66304 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Fri, 3 Mar 2023 23:10:05 +0100 Subject: [PATCH 14/19] Update status method --- .../coordinatorclient/coordinatorclient.go | 21 +- .../coordinatorproto/coordinator.pb.go | 433 ++++++++++++++---- .../coordinatorproto/protos/coordinator.proto | 16 +- 3 files changed, 363 insertions(+), 107 deletions(-) diff --git a/coordinator/coordinatorclient/coordinatorclient.go b/coordinator/coordinatorclient/coordinatorclient.go index 03852795..627bba1b 100644 --- a/coordinator/coordinatorclient/coordinatorclient.go +++ b/coordinator/coordinatorclient/coordinatorclient.go @@ -17,8 +17,8 @@ func New() CoordinatorClient { } type CoordinatorClient interface { - ChangeStatus(ctx context.Context, spaceId string, deleteRaw *treechangeproto.RawTreeChangeWithId) (err error) - StatusCheck(ctx context.Context, spaceId string) (status *coordinatorproto.SpaceStatusCheckResponse, err error) + ChangeStatus(ctx context.Context, spaceId string, deleteRaw *treechangeproto.RawTreeChangeWithId) (status *coordinatorproto.SpaceStatusPayload, err error) + StatusCheck(ctx context.Context, spaceId string) (status *coordinatorproto.SpaceStatusPayload, err error) SpaceSign(ctx context.Context, spaceId string, spaceHeader []byte) (receipt *coordinatorproto.SpaceReceiptWithSignature, err error) FileLimitCheck(ctx context.Context, spaceId string, identity []byte) (limit uint64, err error) app.Component @@ -29,27 +29,36 @@ type coordinatorClient struct { nodeConf nodeconf.Service } -func (c *coordinatorClient) ChangeStatus(ctx context.Context, spaceId string, deleteRaw *treechangeproto.RawTreeChangeWithId) (err error) { +func (c *coordinatorClient) ChangeStatus(ctx context.Context, spaceId string, deleteRaw *treechangeproto.RawTreeChangeWithId) (status *coordinatorproto.SpaceStatusPayload, err error) { cl, err := c.client(ctx) if err != nil { return } - _, err = cl.SpaceStatusChange(ctx, &coordinatorproto.SpaceStatusChangeRequest{ + resp, err := cl.SpaceStatusChange(ctx, &coordinatorproto.SpaceStatusChangeRequest{ SpaceId: spaceId, DeletionChangeId: deleteRaw.Id, DeletionChangePayload: deleteRaw.RawChange, }) + if err != nil { + return + } + status = resp.Payload return } -func (c *coordinatorClient) StatusCheck(ctx context.Context, spaceId string) (response *coordinatorproto.SpaceStatusCheckResponse, err error) { +func (c *coordinatorClient) StatusCheck(ctx context.Context, spaceId string) (status *coordinatorproto.SpaceStatusPayload, err error) { cl, err := c.client(ctx) if err != nil { return } - return cl.SpaceStatusCheck(ctx, &coordinatorproto.SpaceStatusCheckRequest{ + resp, err := cl.SpaceStatusCheck(ctx, &coordinatorproto.SpaceStatusCheckRequest{ SpaceId: spaceId, }) + if err != nil { + return + } + status = resp.Payload + return } func (c *coordinatorClient) Init(a *app.App) (err error) { diff --git a/coordinator/coordinatorproto/coordinator.pb.go b/coordinator/coordinatorproto/coordinator.pb.go index 4e7e5d6f..b638938c 100644 --- a/coordinator/coordinatorproto/coordinator.pb.go +++ b/coordinator/coordinatorproto/coordinator.pb.go @@ -105,6 +105,58 @@ func (m *SpaceSignRequest) GetHeader() []byte { return nil } +type SpaceStatusPayload struct { + Status SpaceStatus `protobuf:"varint,1,opt,name=status,proto3,enum=coordinator.SpaceStatus" json:"status,omitempty"` + DeletionTimestamp int64 `protobuf:"varint,2,opt,name=deletionTimestamp,proto3" json:"deletionTimestamp,omitempty"` +} + +func (m *SpaceStatusPayload) Reset() { *m = SpaceStatusPayload{} } +func (m *SpaceStatusPayload) String() string { return proto.CompactTextString(m) } +func (*SpaceStatusPayload) ProtoMessage() {} +func (*SpaceStatusPayload) Descriptor() ([]byte, []int) { + return fileDescriptor_d94f6f99586adae2, []int{1} +} +func (m *SpaceStatusPayload) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *SpaceStatusPayload) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_SpaceStatusPayload.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *SpaceStatusPayload) XXX_Merge(src proto.Message) { + xxx_messageInfo_SpaceStatusPayload.Merge(m, src) +} +func (m *SpaceStatusPayload) XXX_Size() int { + return m.Size() +} +func (m *SpaceStatusPayload) XXX_DiscardUnknown() { + xxx_messageInfo_SpaceStatusPayload.DiscardUnknown(m) +} + +var xxx_messageInfo_SpaceStatusPayload proto.InternalMessageInfo + +func (m *SpaceStatusPayload) GetStatus() SpaceStatus { + if m != nil { + return m.Status + } + return SpaceStatus_SpaceStatusCreated +} + +func (m *SpaceStatusPayload) GetDeletionTimestamp() int64 { + if m != nil { + return m.DeletionTimestamp + } + return 0 +} + type SpaceSignResponse struct { Receipt *SpaceReceiptWithSignature `protobuf:"bytes,1,opt,name=receipt,proto3" json:"receipt,omitempty"` } @@ -113,7 +165,7 @@ func (m *SpaceSignResponse) Reset() { *m = SpaceSignResponse{} } func (m *SpaceSignResponse) String() string { return proto.CompactTextString(m) } func (*SpaceSignResponse) ProtoMessage() {} func (*SpaceSignResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d94f6f99586adae2, []int{1} + return fileDescriptor_d94f6f99586adae2, []int{2} } func (m *SpaceSignResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -159,7 +211,7 @@ func (m *SpaceReceiptWithSignature) Reset() { *m = SpaceReceiptWithSigna func (m *SpaceReceiptWithSignature) String() string { return proto.CompactTextString(m) } func (*SpaceReceiptWithSignature) ProtoMessage() {} func (*SpaceReceiptWithSignature) Descriptor() ([]byte, []int) { - return fileDescriptor_d94f6f99586adae2, []int{2} + return fileDescriptor_d94f6f99586adae2, []int{3} } func (m *SpaceReceiptWithSignature) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -220,7 +272,7 @@ func (m *SpaceReceipt) Reset() { *m = SpaceReceipt{} } func (m *SpaceReceipt) String() string { return proto.CompactTextString(m) } func (*SpaceReceipt) ProtoMessage() {} func (*SpaceReceipt) Descriptor() ([]byte, []int) { - return fileDescriptor_d94f6f99586adae2, []int{3} + return fileDescriptor_d94f6f99586adae2, []int{4} } func (m *SpaceReceipt) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -295,7 +347,7 @@ func (m *FileLimitCheckRequest) Reset() { *m = FileLimitCheckRequest{} } func (m *FileLimitCheckRequest) String() string { return proto.CompactTextString(m) } func (*FileLimitCheckRequest) ProtoMessage() {} func (*FileLimitCheckRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_d94f6f99586adae2, []int{4} + return fileDescriptor_d94f6f99586adae2, []int{5} } func (m *FileLimitCheckRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -347,7 +399,7 @@ func (m *FileLimitCheckResponse) Reset() { *m = FileLimitCheckResponse{} func (m *FileLimitCheckResponse) String() string { return proto.CompactTextString(m) } func (*FileLimitCheckResponse) ProtoMessage() {} func (*FileLimitCheckResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d94f6f99586adae2, []int{5} + return fileDescriptor_d94f6f99586adae2, []int{6} } func (m *FileLimitCheckResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -392,7 +444,7 @@ func (m *SpaceStatusCheckRequest) Reset() { *m = SpaceStatusCheckRequest func (m *SpaceStatusCheckRequest) String() string { return proto.CompactTextString(m) } func (*SpaceStatusCheckRequest) ProtoMessage() {} func (*SpaceStatusCheckRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_d94f6f99586adae2, []int{6} + return fileDescriptor_d94f6f99586adae2, []int{7} } func (m *SpaceStatusCheckRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -428,17 +480,16 @@ func (m *SpaceStatusCheckRequest) GetSpaceId() string { return "" } -// SpaceStatusCheckResponse contains the status and deletion timestamp if needed +// SpaceStatusCheckResponse contains the current status of space type SpaceStatusCheckResponse struct { - Status SpaceStatus `protobuf:"varint,1,opt,name=status,proto3,enum=coordinator.SpaceStatus" json:"status,omitempty"` - DeletionTimestamp int64 `protobuf:"varint,2,opt,name=deletionTimestamp,proto3" json:"deletionTimestamp,omitempty"` + Payload *SpaceStatusPayload `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"` } func (m *SpaceStatusCheckResponse) Reset() { *m = SpaceStatusCheckResponse{} } func (m *SpaceStatusCheckResponse) String() string { return proto.CompactTextString(m) } func (*SpaceStatusCheckResponse) ProtoMessage() {} func (*SpaceStatusCheckResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d94f6f99586adae2, []int{7} + return fileDescriptor_d94f6f99586adae2, []int{8} } func (m *SpaceStatusCheckResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -467,18 +518,11 @@ func (m *SpaceStatusCheckResponse) XXX_DiscardUnknown() { var xxx_messageInfo_SpaceStatusCheckResponse proto.InternalMessageInfo -func (m *SpaceStatusCheckResponse) GetStatus() SpaceStatus { +func (m *SpaceStatusCheckResponse) GetPayload() *SpaceStatusPayload { if m != nil { - return m.Status + return m.Payload } - return SpaceStatus_SpaceStatusCreated -} - -func (m *SpaceStatusCheckResponse) GetDeletionTimestamp() int64 { - if m != nil { - return m.DeletionTimestamp - } - return 0 + return nil } // SpaceStatusChangeRequest contains the deletionChange if we want to delete space, or it is empty otherwise @@ -492,7 +536,7 @@ func (m *SpaceStatusChangeRequest) Reset() { *m = SpaceStatusChangeReque func (m *SpaceStatusChangeRequest) String() string { return proto.CompactTextString(m) } func (*SpaceStatusChangeRequest) ProtoMessage() {} func (*SpaceStatusChangeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_d94f6f99586adae2, []int{8} + return fileDescriptor_d94f6f99586adae2, []int{9} } func (m *SpaceStatusChangeRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -542,15 +586,16 @@ func (m *SpaceStatusChangeRequest) GetDeletionChangePayload() []byte { return nil } -// SpaceStatusChangeResponse is always empty, you should check error in case something was wrong +// SpaceStatusChangeResponse contains changed status of space type SpaceStatusChangeResponse struct { + Payload *SpaceStatusPayload `protobuf:"bytes,1,opt,name=payload,proto3" json:"payload,omitempty"` } func (m *SpaceStatusChangeResponse) Reset() { *m = SpaceStatusChangeResponse{} } func (m *SpaceStatusChangeResponse) String() string { return proto.CompactTextString(m) } func (*SpaceStatusChangeResponse) ProtoMessage() {} func (*SpaceStatusChangeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d94f6f99586adae2, []int{9} + return fileDescriptor_d94f6f99586adae2, []int{10} } func (m *SpaceStatusChangeResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -579,9 +624,17 @@ func (m *SpaceStatusChangeResponse) XXX_DiscardUnknown() { var xxx_messageInfo_SpaceStatusChangeResponse proto.InternalMessageInfo +func (m *SpaceStatusChangeResponse) GetPayload() *SpaceStatusPayload { + if m != nil { + return m.Payload + } + return nil +} + func init() { proto.RegisterEnum("coordinator.SpaceStatus", SpaceStatus_name, SpaceStatus_value) proto.RegisterType((*SpaceSignRequest)(nil), "coordinator.SpaceSignRequest") + proto.RegisterType((*SpaceStatusPayload)(nil), "coordinator.SpaceStatusPayload") proto.RegisterType((*SpaceSignResponse)(nil), "coordinator.SpaceSignResponse") proto.RegisterType((*SpaceReceiptWithSignature)(nil), "coordinator.SpaceReceiptWithSignature") proto.RegisterType((*SpaceReceipt)(nil), "coordinator.SpaceReceipt") @@ -598,45 +651,47 @@ func init() { } var fileDescriptor_d94f6f99586adae2 = []byte{ - // 604 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0x41, 0x6f, 0x12, 0x41, - 0x14, 0x66, 0x81, 0xd2, 0xf0, 0x20, 0x95, 0x8e, 0x16, 0x57, 0xac, 0x1b, 0xb2, 0x6a, 0x43, 0x1a, - 0x43, 0x1b, 0xaa, 0x9e, 0x8d, 0x6d, 0x4c, 0x30, 0xc6, 0x34, 0x8b, 0x8d, 0x51, 0x0f, 0x66, 0xba, - 0xfb, 0x02, 0x93, 0x2e, 0x3b, 0xeb, 0xee, 0x60, 0x52, 0x13, 0xff, 0x83, 0x27, 0x7f, 0x8d, 0x3f, - 0xc0, 0x63, 0x8f, 0x1e, 0x0d, 0xfc, 0x0a, 0x6f, 0x86, 0xd9, 0x5d, 0x98, 0x85, 0x05, 0x2e, 0xc0, - 0x7c, 0xdf, 0xfb, 0xde, 0x7b, 0x33, 0xef, 0x9b, 0x01, 0x9e, 0xd9, 0x9c, 0x07, 0x0e, 0xf3, 0xa8, - 0xe0, 0xc1, 0x91, 0xf2, 0xdb, 0x0f, 0xb8, 0xe0, 0x47, 0xf2, 0x33, 0x54, 0xf1, 0xb6, 0x84, 0x48, - 0x45, 0x81, 0xcc, 0x33, 0xa8, 0xf5, 0x7c, 0x6a, 0x63, 0x8f, 0xf5, 0x3d, 0x0b, 0xbf, 0x8c, 0x30, - 0x14, 0x44, 0x87, 0xed, 0x70, 0x8a, 0x75, 0x1d, 0x5d, 0x6b, 0x6a, 0xad, 0xb2, 0x95, 0x2c, 0x49, - 0x1d, 0x4a, 0x03, 0xa4, 0x0e, 0x06, 0x7a, 0xbe, 0xa9, 0xb5, 0xaa, 0x56, 0xbc, 0x32, 0x2f, 0x60, - 0x57, 0xc9, 0x12, 0xfa, 0xdc, 0x0b, 0x91, 0xbc, 0x80, 0xed, 0x00, 0x6d, 0x64, 0xbe, 0x90, 0x69, - 0x2a, 0x9d, 0x83, 0xb6, 0xda, 0x8c, 0x14, 0x58, 0x51, 0xc0, 0x7b, 0x26, 0x06, 0x53, 0x2d, 0x15, - 0xa3, 0x00, 0xad, 0x44, 0x66, 0x5e, 0xc1, 0xbd, 0x95, 0x51, 0xe4, 0x18, 0x6e, 0x87, 0x0a, 0x79, - 0x4e, 0xaf, 0x5d, 0x4e, 0xa3, 0x8e, 0xab, 0x56, 0x16, 0x45, 0xf6, 0xa1, 0x1c, 0x26, 0xf2, 0x78, - 0x03, 0x73, 0xc0, 0xfc, 0xa5, 0x41, 0x55, 0xad, 0xb6, 0xfe, 0x18, 0x7c, 0xc4, 0xa0, 0xeb, 0xc8, - 0x2c, 0x65, 0x2b, 0x5e, 0x91, 0x16, 0xdc, 0xa2, 0xb6, 0xcd, 0x47, 0x9e, 0xe8, 0x3a, 0xe8, 0x09, - 0x26, 0xae, 0xf5, 0x82, 0x2c, 0xb3, 0x08, 0x4f, 0x9b, 0xb7, 0xb9, 0x27, 0x02, 0xee, 0xbe, 0xe5, - 0x0e, 0xce, 0xa2, 0x8b, 0x51, 0xf3, 0x19, 0x14, 0x31, 0x00, 0xbe, 0x52, 0x97, 0x39, 0x17, 0x9e, - 0x60, 0xae, 0xbe, 0xd5, 0xd4, 0x5a, 0x45, 0x4b, 0x41, 0xcc, 0x4f, 0xb0, 0xf7, 0x8a, 0xb9, 0xf8, - 0x86, 0x0d, 0x99, 0x38, 0x1d, 0xa0, 0x7d, 0x95, 0x4c, 0x33, 0xa3, 0x29, 0x2d, 0xbb, 0x29, 0x65, - 0xc3, 0xf9, 0xd4, 0x86, 0xcd, 0x36, 0xd4, 0x17, 0x93, 0xc7, 0x43, 0xbe, 0x03, 0x5b, 0xee, 0x14, - 0x95, 0x39, 0x8b, 0x56, 0xb4, 0x30, 0x4f, 0xe0, 0x6e, 0xe4, 0x07, 0x41, 0xc5, 0x28, 0x4c, 0xb5, - 0xb3, 0xf2, 0x54, 0xcd, 0x6f, 0xa0, 0x2f, 0x8b, 0xe2, 0x32, 0xc7, 0x50, 0x0a, 0x25, 0x2c, 0x45, - 0x3b, 0x1d, 0x7d, 0xd9, 0x4a, 0x91, 0xcc, 0x8a, 0xe3, 0xc8, 0x13, 0xd8, 0x75, 0xd0, 0x45, 0xc1, - 0xb8, 0xf7, 0x8e, 0x0d, 0x31, 0x14, 0x74, 0xe8, 0xcb, 0x6d, 0x15, 0xac, 0x65, 0xc2, 0xfc, 0xa9, - 0x2d, 0x14, 0xa7, 0x5e, 0x1f, 0x37, 0xdf, 0x87, 0x43, 0xa8, 0x25, 0xb9, 0x22, 0xc9, 0xec, 0xe8, - 0x96, 0x70, 0xf2, 0x14, 0xf6, 0xd2, 0x58, 0xe2, 0xd8, 0xc8, 0x22, 0xd9, 0xa4, 0x79, 0x3f, 0xbe, - 0x02, 0xe9, 0xbe, 0xa2, 0x53, 0x39, 0xfc, 0x0e, 0x15, 0x85, 0x24, 0x75, 0x20, 0x6a, 0x6c, 0x80, - 0x54, 0xa0, 0x53, 0xcb, 0x11, 0x03, 0x1a, 0x0a, 0x7e, 0x8e, 0x9e, 0xc3, 0xbc, 0xfe, 0x59, 0x5c, - 0xae, 0xa6, 0x2d, 0xf0, 0x09, 0xd1, 0x13, 0x34, 0x98, 0xea, 0xf3, 0x0b, 0x79, 0x25, 0x8f, 0x4e, - 0xad, 0xd0, 0xf9, 0x97, 0x87, 0xca, 0xe9, 0x7c, 0x0c, 0xe4, 0x35, 0x94, 0x67, 0xaf, 0x00, 0x79, - 0x90, 0x31, 0xa1, 0xf9, 0x1b, 0xd3, 0x30, 0x56, 0xd1, 0xf1, 0xc0, 0x3f, 0xc0, 0x4e, 0xda, 0x71, - 0xc4, 0x4c, 0x29, 0x32, 0xbd, 0xde, 0x78, 0xb8, 0x36, 0x26, 0x4e, 0xfd, 0x39, 0x79, 0xf2, 0xe6, - 0x3e, 0x23, 0x8f, 0x56, 0xf9, 0x29, 0x95, 0xfe, 0xf1, 0x86, 0xa8, 0xb8, 0xc0, 0x65, 0xf2, 0x1a, - 0x2a, 0x33, 0x23, 0x6b, 0xb4, 0x8a, 0xd7, 0x1a, 0x07, 0x9b, 0xc2, 0xa2, 0x1a, 0x2f, 0x9f, 0xff, - 0x1e, 0x1b, 0xda, 0xcd, 0xd8, 0xd0, 0xfe, 0x8e, 0x0d, 0xed, 0xc7, 0xc4, 0xc8, 0xdd, 0x4c, 0x8c, - 0xdc, 0x9f, 0x89, 0x91, 0xfb, 0xb8, 0xbf, 0xee, 0x5f, 0xe1, 0xb2, 0x24, 0xbf, 0x4e, 0xfe, 0x07, - 0x00, 0x00, 0xff, 0xff, 0x9a, 0xc2, 0x98, 0x37, 0x3c, 0x06, 0x00, 0x00, + // 630 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcd, 0x6e, 0x13, 0x3d, + 0x14, 0xcd, 0xa4, 0x7f, 0xca, 0x4d, 0xd5, 0x2f, 0xf5, 0x47, 0xcb, 0x10, 0x95, 0xa1, 0x32, 0x50, + 0x45, 0x15, 0x6a, 0xab, 0x14, 0x90, 0xd8, 0x21, 0x5a, 0x21, 0x15, 0x21, 0x84, 0x5c, 0x02, 0x02, + 0x16, 0xc8, 0x1d, 0x5b, 0x89, 0xd5, 0xc9, 0x78, 0x98, 0x71, 0x90, 0xba, 0xe0, 0x1d, 0x58, 0xf1, + 0x34, 0x3c, 0x00, 0xcb, 0x2e, 0x59, 0xa2, 0xe4, 0x29, 0xd8, 0xa1, 0x78, 0x3c, 0x89, 0x27, 0x99, + 0x24, 0x0b, 0x36, 0x49, 0x7c, 0xce, 0xbd, 0xe7, 0x1e, 0x5f, 0x5f, 0x3b, 0xf0, 0xc8, 0x97, 0x32, + 0x66, 0x22, 0xa4, 0x4a, 0xc6, 0x87, 0xd6, 0xef, 0x28, 0x96, 0x4a, 0x1e, 0xea, 0xcf, 0xc4, 0xc6, + 0x0f, 0x34, 0x84, 0xaa, 0x16, 0x84, 0x4f, 0xa1, 0x76, 0x1e, 0x51, 0x9f, 0x9f, 0x8b, 0x76, 0x48, + 0xf8, 0xe7, 0x1e, 0x4f, 0x14, 0x72, 0x61, 0x2d, 0x19, 0x62, 0x67, 0xcc, 0x75, 0x76, 0x9d, 0x46, + 0x85, 0x64, 0x4b, 0xb4, 0x0d, 0xab, 0x1d, 0x4e, 0x19, 0x8f, 0xdd, 0xf2, 0xae, 0xd3, 0x58, 0x27, + 0x66, 0x85, 0x15, 0xa0, 0x54, 0x45, 0x51, 0xd5, 0x4b, 0x5e, 0xd3, 0xab, 0x40, 0x52, 0x86, 0x8e, + 0x60, 0x35, 0xd1, 0x80, 0x96, 0xd9, 0x68, 0xba, 0x07, 0xb6, 0x19, 0x2b, 0x81, 0x98, 0x38, 0xf4, + 0x00, 0x36, 0x19, 0x0f, 0xb8, 0x12, 0x32, 0x7c, 0x23, 0xba, 0x3c, 0x51, 0xb4, 0x1b, 0xe9, 0x52, + 0x4b, 0x64, 0x9a, 0xc0, 0x2d, 0xd8, 0xb4, 0xbc, 0x27, 0x91, 0x0c, 0x13, 0x8e, 0x9e, 0xc2, 0x5a, + 0xcc, 0x7d, 0x2e, 0x22, 0xa5, 0xab, 0x56, 0x9b, 0x7b, 0xd3, 0x55, 0x49, 0x1a, 0xf0, 0x4e, 0xa8, + 0xce, 0x30, 0x97, 0xaa, 0x5e, 0xcc, 0x49, 0x96, 0x86, 0x2f, 0xe1, 0xd6, 0xcc, 0x28, 0x74, 0x04, + 0xff, 0x27, 0x16, 0x69, 0xb6, 0xaa, 0x4b, 0xad, 0x93, 0x22, 0x0a, 0xed, 0x40, 0x25, 0xc9, 0xd2, + 0x4d, 0xdb, 0xc6, 0x00, 0xfe, 0xe1, 0xc0, 0xba, 0x5d, 0x6d, 0x7e, 0xf3, 0x23, 0xce, 0xe3, 0x33, + 0xa6, 0x55, 0x2a, 0xc4, 0xac, 0x50, 0x03, 0xfe, 0xa3, 0xbe, 0x2f, 0x7b, 0xa1, 0x3a, 0x63, 0x3c, + 0x54, 0x42, 0x5d, 0xb9, 0x4b, 0xba, 0xcc, 0x24, 0x3c, 0x34, 0xef, 0xcb, 0x50, 0xc5, 0x32, 0x78, + 0x25, 0x19, 0x1f, 0x45, 0x2f, 0xa7, 0xe6, 0x0b, 0x28, 0xe4, 0x01, 0x7c, 0xa1, 0x81, 0x60, 0xad, + 0x50, 0x89, 0xc0, 0x5d, 0xd9, 0x75, 0x1a, 0xcb, 0xc4, 0x42, 0xf0, 0x47, 0xd8, 0x7a, 0x2e, 0x02, + 0xfe, 0x52, 0x74, 0x85, 0x3a, 0xe9, 0x70, 0xff, 0x32, 0x9b, 0xa1, 0x02, 0x53, 0x4e, 0xb1, 0x29, + 0x6b, 0xc3, 0xe5, 0xdc, 0x86, 0xf1, 0x01, 0x6c, 0x4f, 0x8a, 0x9b, 0x43, 0xbe, 0x01, 0x2b, 0xc1, + 0x10, 0xd5, 0x9a, 0xcb, 0x24, 0x5d, 0xe0, 0x63, 0xb8, 0x69, 0x0d, 0x55, 0xce, 0xce, 0xcc, 0xae, + 0xe2, 0x16, 0xb8, 0xd3, 0x49, 0xa6, 0xcc, 0x13, 0x58, 0x8b, 0xac, 0x03, 0xae, 0x36, 0xef, 0xcc, + 0x9a, 0x60, 0x73, 0xd8, 0x24, 0x8b, 0xc7, 0xdf, 0x9d, 0x09, 0x5d, 0x1a, 0xb6, 0xf9, 0xe2, 0x0b, + 0xb6, 0x0f, 0xb5, 0x6c, 0xce, 0xd3, 0x94, 0x51, 0x57, 0xa6, 0x70, 0xf4, 0x10, 0xb6, 0xf2, 0x58, + 0x36, 0x8c, 0xe9, 0xe9, 0x17, 0x93, 0xf8, 0xad, 0x99, 0xee, 0xbc, 0xaf, 0x7f, 0xde, 0xf0, 0xfe, + 0x57, 0xa8, 0x5a, 0x34, 0xda, 0xce, 0xbd, 0x08, 0x27, 0x31, 0xa7, 0x8a, 0xb3, 0x5a, 0x09, 0x79, + 0x50, 0xb7, 0x55, 0x78, 0xc8, 0x44, 0xd8, 0x3e, 0x35, 0x4e, 0x6b, 0xce, 0x04, 0x9f, 0x11, 0xe7, + 0x8a, 0xc6, 0xc3, 0xfc, 0xf2, 0x84, 0xae, 0xe6, 0x39, 0xab, 0x2d, 0x35, 0xff, 0x94, 0xa1, 0x7a, + 0x32, 0xb6, 0x8a, 0x5e, 0x40, 0x65, 0xf4, 0x36, 0xa0, 0xdb, 0x05, 0xbb, 0x18, 0xbf, 0x77, 0x75, + 0x6f, 0x16, 0x6d, 0xba, 0xf2, 0x1e, 0x36, 0xf2, 0x73, 0x88, 0x70, 0x2e, 0xa3, 0xf0, 0x06, 0xd4, + 0xef, 0xce, 0x8d, 0x31, 0xd2, 0x9f, 0xb2, 0xe7, 0x77, 0x3c, 0x7d, 0xe8, 0xde, 0xac, 0x9e, 0xe7, + 0xe4, 0xef, 0x2f, 0x88, 0x32, 0x05, 0x2e, 0xb2, 0x37, 0xd2, 0x3a, 0x6e, 0x34, 0x27, 0xd7, 0x1a, + 0xd3, 0xfa, 0xde, 0xa2, 0xb0, 0xb4, 0xc6, 0xb3, 0xc7, 0x3f, 0xfb, 0x9e, 0x73, 0xdd, 0xf7, 0x9c, + 0xdf, 0x7d, 0xcf, 0xf9, 0x36, 0xf0, 0x4a, 0xd7, 0x03, 0xaf, 0xf4, 0x6b, 0xe0, 0x95, 0x3e, 0xec, + 0xcc, 0xfb, 0x87, 0xba, 0x58, 0xd5, 0x5f, 0xc7, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xf7, 0x70, + 0x9d, 0x63, 0xc8, 0x06, 0x00, 0x00, } func (m *SpaceSignRequest) Marshal() (dAtA []byte, err error) { @@ -676,6 +731,39 @@ func (m *SpaceSignRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *SpaceStatusPayload) 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 *SpaceStatusPayload) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SpaceStatusPayload) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.DeletionTimestamp != 0 { + i = encodeVarintCoordinator(dAtA, i, uint64(m.DeletionTimestamp)) + i-- + dAtA[i] = 0x10 + } + if m.Status != 0 { + i = encodeVarintCoordinator(dAtA, i, uint64(m.Status)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + func (m *SpaceSignResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -919,15 +1007,17 @@ func (m *SpaceStatusCheckResponse) MarshalToSizedBuffer(dAtA []byte) (int, error _ = i var l int _ = l - if m.DeletionTimestamp != 0 { - i = encodeVarintCoordinator(dAtA, i, uint64(m.DeletionTimestamp)) + if m.Payload != nil { + { + size, err := m.Payload.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintCoordinator(dAtA, i, uint64(size)) + } i-- - dAtA[i] = 0x10 - } - if m.Status != 0 { - i = encodeVarintCoordinator(dAtA, i, uint64(m.Status)) - i-- - dAtA[i] = 0x8 + dAtA[i] = 0xa } return len(dAtA) - i, nil } @@ -996,6 +1086,18 @@ func (m *SpaceStatusChangeResponse) MarshalToSizedBuffer(dAtA []byte) (int, erro _ = i var l int _ = l + if m.Payload != nil { + { + size, err := m.Payload.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintCoordinator(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } return len(dAtA) - i, nil } @@ -1027,6 +1129,21 @@ func (m *SpaceSignRequest) Size() (n int) { return n } +func (m *SpaceStatusPayload) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Status != 0 { + n += 1 + sovCoordinator(uint64(m.Status)) + } + if m.DeletionTimestamp != 0 { + n += 1 + sovCoordinator(uint64(m.DeletionTimestamp)) + } + return n +} + func (m *SpaceSignResponse) Size() (n int) { if m == nil { return 0 @@ -1133,11 +1250,9 @@ func (m *SpaceStatusCheckResponse) Size() (n int) { } var l int _ = l - if m.Status != 0 { - n += 1 + sovCoordinator(uint64(m.Status)) - } - if m.DeletionTimestamp != 0 { - n += 1 + sovCoordinator(uint64(m.DeletionTimestamp)) + if m.Payload != nil { + l = m.Payload.Size() + n += 1 + l + sovCoordinator(uint64(l)) } return n } @@ -1169,6 +1284,10 @@ func (m *SpaceStatusChangeResponse) Size() (n int) { } var l int _ = l + if m.Payload != nil { + l = m.Payload.Size() + n += 1 + l + sovCoordinator(uint64(l)) + } return n } @@ -1294,6 +1413,94 @@ func (m *SpaceSignRequest) Unmarshal(dAtA []byte) error { } return nil } +func (m *SpaceStatusPayload) 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 ErrIntOverflowCoordinator + } + 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: SpaceStatusPayload: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: SpaceStatusPayload: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType) + } + m.Status = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCoordinator + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Status |= SpaceStatus(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field DeletionTimestamp", wireType) + } + m.DeletionTimestamp = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCoordinator + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.DeletionTimestamp |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipCoordinator(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthCoordinator + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *SpaceSignResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -1996,10 +2203,10 @@ func (m *SpaceStatusCheckResponse) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType) + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Payload", wireType) } - m.Status = 0 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowCoordinator @@ -2009,30 +2216,28 @@ func (m *SpaceStatusCheckResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Status |= SpaceStatus(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DeletionTimestamp", wireType) + if msglen < 0 { + return ErrInvalidLengthCoordinator } - m.DeletionTimestamp = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCoordinator - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.DeletionTimestamp |= int64(b&0x7F) << shift - if b < 0x80 { - break - } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCoordinator } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Payload == nil { + m.Payload = &SpaceStatusPayload{} + } + if err := m.Payload.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipCoordinator(dAtA[iNdEx:]) @@ -2231,6 +2436,42 @@ func (m *SpaceStatusChangeResponse) Unmarshal(dAtA []byte) error { return fmt.Errorf("proto: SpaceStatusChangeResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Payload", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCoordinator + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthCoordinator + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCoordinator + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Payload == nil { + m.Payload = &SpaceStatusPayload{} + } + if err := m.Payload.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipCoordinator(dAtA[iNdEx:]) diff --git a/coordinator/coordinatorproto/protos/coordinator.proto b/coordinator/coordinatorproto/protos/coordinator.proto index 3d8a6959..4e2c2777 100644 --- a/coordinator/coordinatorproto/protos/coordinator.proto +++ b/coordinator/coordinatorproto/protos/coordinator.proto @@ -32,6 +32,11 @@ enum SpaceStatus { SpaceStatusDeleted = 3; } +message SpaceStatusPayload { + SpaceStatus status = 1; + int64 deletionTimestamp = 2; +} + message SpaceSignResponse { SpaceReceiptWithSignature receipt = 1; } @@ -73,10 +78,9 @@ message SpaceStatusCheckRequest { string spaceId = 1; } -// SpaceStatusCheckResponse contains the status and deletion timestamp if needed +// SpaceStatusCheckResponse contains the current status of space message SpaceStatusCheckResponse { - SpaceStatus status = 1; - int64 deletionTimestamp = 2; + SpaceStatusPayload payload = 1; } // SpaceStatusChangeRequest contains the deletionChange if we want to delete space, or it is empty otherwise @@ -86,5 +90,7 @@ message SpaceStatusChangeRequest { bytes deletionChangePayload = 3; } -// SpaceStatusChangeResponse is always empty, you should check error in case something was wrong -message SpaceStatusChangeResponse {} +// SpaceStatusChangeResponse contains changed status of space +message SpaceStatusChangeResponse { + SpaceStatusPayload payload = 1; +} From 3895dc8e1446aaa3d268ab9c27d86c697eab1d53 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Sat, 4 Mar 2023 12:10:32 +0100 Subject: [PATCH 15/19] Add errors to coordinator proto --- .../coordinatorproto/coordinator.pb.go | 126 ++++++++++++------ coordinator/coordinatorproto/errors.go | 16 +++ .../coordinatorproto/protos/coordinator.proto | 9 ++ 3 files changed, 109 insertions(+), 42 deletions(-) create mode 100644 coordinator/coordinatorproto/errors.go diff --git a/coordinator/coordinatorproto/coordinator.pb.go b/coordinator/coordinatorproto/coordinator.pb.go index b638938c..d35c7b8a 100644 --- a/coordinator/coordinatorproto/coordinator.pb.go +++ b/coordinator/coordinatorproto/coordinator.pb.go @@ -22,6 +22,43 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package +type ErrorCodes int32 + +const ( + ErrorCodes_Unexpected ErrorCodes = 0 + ErrorCodes_SpaceDeleted ErrorCodes = 1 + ErrorCodes_SpaceDeletionPending ErrorCodes = 2 + ErrorCodes_SpaceCreated ErrorCodes = 3 + ErrorCodes_SpaceNotExists ErrorCodes = 4 + ErrorCodes_ErrorOffset ErrorCodes = 300 +) + +var ErrorCodes_name = map[int32]string{ + 0: "Unexpected", + 1: "SpaceDeleted", + 2: "SpaceDeletionPending", + 3: "SpaceCreated", + 4: "SpaceNotExists", + 300: "ErrorOffset", +} + +var ErrorCodes_value = map[string]int32{ + "Unexpected": 0, + "SpaceDeleted": 1, + "SpaceDeletionPending": 2, + "SpaceCreated": 3, + "SpaceNotExists": 4, + "ErrorOffset": 300, +} + +func (x ErrorCodes) String() string { + return proto.EnumName(ErrorCodes_name, int32(x)) +} + +func (ErrorCodes) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_d94f6f99586adae2, []int{0} +} + type SpaceStatus int32 const ( @@ -50,7 +87,7 @@ func (x SpaceStatus) String() string { } func (SpaceStatus) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_d94f6f99586adae2, []int{0} + return fileDescriptor_d94f6f99586adae2, []int{1} } type SpaceSignRequest struct { @@ -632,6 +669,7 @@ func (m *SpaceStatusChangeResponse) GetPayload() *SpaceStatusPayload { } func init() { + proto.RegisterEnum("coordinator.ErrorCodes", ErrorCodes_name, ErrorCodes_value) proto.RegisterEnum("coordinator.SpaceStatus", SpaceStatus_name, SpaceStatus_value) proto.RegisterType((*SpaceSignRequest)(nil), "coordinator.SpaceSignRequest") proto.RegisterType((*SpaceStatusPayload)(nil), "coordinator.SpaceStatusPayload") @@ -651,47 +689,51 @@ func init() { } var fileDescriptor_d94f6f99586adae2 = []byte{ - // 630 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcd, 0x6e, 0x13, 0x3d, - 0x14, 0xcd, 0xa4, 0x7f, 0xca, 0x4d, 0xd5, 0x2f, 0xf5, 0x47, 0xcb, 0x10, 0x95, 0xa1, 0x32, 0x50, - 0x45, 0x15, 0x6a, 0xab, 0x14, 0x90, 0xd8, 0x21, 0x5a, 0x21, 0x15, 0x21, 0x84, 0x5c, 0x02, 0x02, - 0x16, 0xc8, 0x1d, 0x5b, 0x89, 0xd5, 0xc9, 0x78, 0x98, 0x71, 0x90, 0xba, 0xe0, 0x1d, 0x58, 0xf1, - 0x34, 0x3c, 0x00, 0xcb, 0x2e, 0x59, 0xa2, 0xe4, 0x29, 0xd8, 0xa1, 0x78, 0x3c, 0x89, 0x27, 0x99, - 0x24, 0x0b, 0x36, 0x49, 0x7c, 0xce, 0xbd, 0xe7, 0x1e, 0x5f, 0x5f, 0x3b, 0xf0, 0xc8, 0x97, 0x32, - 0x66, 0x22, 0xa4, 0x4a, 0xc6, 0x87, 0xd6, 0xef, 0x28, 0x96, 0x4a, 0x1e, 0xea, 0xcf, 0xc4, 0xc6, - 0x0f, 0x34, 0x84, 0xaa, 0x16, 0x84, 0x4f, 0xa1, 0x76, 0x1e, 0x51, 0x9f, 0x9f, 0x8b, 0x76, 0x48, - 0xf8, 0xe7, 0x1e, 0x4f, 0x14, 0x72, 0x61, 0x2d, 0x19, 0x62, 0x67, 0xcc, 0x75, 0x76, 0x9d, 0x46, - 0x85, 0x64, 0x4b, 0xb4, 0x0d, 0xab, 0x1d, 0x4e, 0x19, 0x8f, 0xdd, 0xf2, 0xae, 0xd3, 0x58, 0x27, - 0x66, 0x85, 0x15, 0xa0, 0x54, 0x45, 0x51, 0xd5, 0x4b, 0x5e, 0xd3, 0xab, 0x40, 0x52, 0x86, 0x8e, - 0x60, 0x35, 0xd1, 0x80, 0x96, 0xd9, 0x68, 0xba, 0x07, 0xb6, 0x19, 0x2b, 0x81, 0x98, 0x38, 0xf4, - 0x00, 0x36, 0x19, 0x0f, 0xb8, 0x12, 0x32, 0x7c, 0x23, 0xba, 0x3c, 0x51, 0xb4, 0x1b, 0xe9, 0x52, - 0x4b, 0x64, 0x9a, 0xc0, 0x2d, 0xd8, 0xb4, 0xbc, 0x27, 0x91, 0x0c, 0x13, 0x8e, 0x9e, 0xc2, 0x5a, - 0xcc, 0x7d, 0x2e, 0x22, 0xa5, 0xab, 0x56, 0x9b, 0x7b, 0xd3, 0x55, 0x49, 0x1a, 0xf0, 0x4e, 0xa8, - 0xce, 0x30, 0x97, 0xaa, 0x5e, 0xcc, 0x49, 0x96, 0x86, 0x2f, 0xe1, 0xd6, 0xcc, 0x28, 0x74, 0x04, - 0xff, 0x27, 0x16, 0x69, 0xb6, 0xaa, 0x4b, 0xad, 0x93, 0x22, 0x0a, 0xed, 0x40, 0x25, 0xc9, 0xd2, - 0x4d, 0xdb, 0xc6, 0x00, 0xfe, 0xe1, 0xc0, 0xba, 0x5d, 0x6d, 0x7e, 0xf3, 0x23, 0xce, 0xe3, 0x33, - 0xa6, 0x55, 0x2a, 0xc4, 0xac, 0x50, 0x03, 0xfe, 0xa3, 0xbe, 0x2f, 0x7b, 0xa1, 0x3a, 0x63, 0x3c, - 0x54, 0x42, 0x5d, 0xb9, 0x4b, 0xba, 0xcc, 0x24, 0x3c, 0x34, 0xef, 0xcb, 0x50, 0xc5, 0x32, 0x78, - 0x25, 0x19, 0x1f, 0x45, 0x2f, 0xa7, 0xe6, 0x0b, 0x28, 0xe4, 0x01, 0x7c, 0xa1, 0x81, 0x60, 0xad, - 0x50, 0x89, 0xc0, 0x5d, 0xd9, 0x75, 0x1a, 0xcb, 0xc4, 0x42, 0xf0, 0x47, 0xd8, 0x7a, 0x2e, 0x02, - 0xfe, 0x52, 0x74, 0x85, 0x3a, 0xe9, 0x70, 0xff, 0x32, 0x9b, 0xa1, 0x02, 0x53, 0x4e, 0xb1, 0x29, - 0x6b, 0xc3, 0xe5, 0xdc, 0x86, 0xf1, 0x01, 0x6c, 0x4f, 0x8a, 0x9b, 0x43, 0xbe, 0x01, 0x2b, 0xc1, - 0x10, 0xd5, 0x9a, 0xcb, 0x24, 0x5d, 0xe0, 0x63, 0xb8, 0x69, 0x0d, 0x55, 0xce, 0xce, 0xcc, 0xae, - 0xe2, 0x16, 0xb8, 0xd3, 0x49, 0xa6, 0xcc, 0x13, 0x58, 0x8b, 0xac, 0x03, 0xae, 0x36, 0xef, 0xcc, - 0x9a, 0x60, 0x73, 0xd8, 0x24, 0x8b, 0xc7, 0xdf, 0x9d, 0x09, 0x5d, 0x1a, 0xb6, 0xf9, 0xe2, 0x0b, - 0xb6, 0x0f, 0xb5, 0x6c, 0xce, 0xd3, 0x94, 0x51, 0x57, 0xa6, 0x70, 0xf4, 0x10, 0xb6, 0xf2, 0x58, - 0x36, 0x8c, 0xe9, 0xe9, 0x17, 0x93, 0xf8, 0xad, 0x99, 0xee, 0xbc, 0xaf, 0x7f, 0xde, 0xf0, 0xfe, - 0x57, 0xa8, 0x5a, 0x34, 0xda, 0xce, 0xbd, 0x08, 0x27, 0x31, 0xa7, 0x8a, 0xb3, 0x5a, 0x09, 0x79, - 0x50, 0xb7, 0x55, 0x78, 0xc8, 0x44, 0xd8, 0x3e, 0x35, 0x4e, 0x6b, 0xce, 0x04, 0x9f, 0x11, 0xe7, - 0x8a, 0xc6, 0xc3, 0xfc, 0xf2, 0x84, 0xae, 0xe6, 0x39, 0xab, 0x2d, 0x35, 0xff, 0x94, 0xa1, 0x7a, - 0x32, 0xb6, 0x8a, 0x5e, 0x40, 0x65, 0xf4, 0x36, 0xa0, 0xdb, 0x05, 0xbb, 0x18, 0xbf, 0x77, 0x75, - 0x6f, 0x16, 0x6d, 0xba, 0xf2, 0x1e, 0x36, 0xf2, 0x73, 0x88, 0x70, 0x2e, 0xa3, 0xf0, 0x06, 0xd4, - 0xef, 0xce, 0x8d, 0x31, 0xd2, 0x9f, 0xb2, 0xe7, 0x77, 0x3c, 0x7d, 0xe8, 0xde, 0xac, 0x9e, 0xe7, - 0xe4, 0xef, 0x2f, 0x88, 0x32, 0x05, 0x2e, 0xb2, 0x37, 0xd2, 0x3a, 0x6e, 0x34, 0x27, 0xd7, 0x1a, - 0xd3, 0xfa, 0xde, 0xa2, 0xb0, 0xb4, 0xc6, 0xb3, 0xc7, 0x3f, 0xfb, 0x9e, 0x73, 0xdd, 0xf7, 0x9c, - 0xdf, 0x7d, 0xcf, 0xf9, 0x36, 0xf0, 0x4a, 0xd7, 0x03, 0xaf, 0xf4, 0x6b, 0xe0, 0x95, 0x3e, 0xec, - 0xcc, 0xfb, 0x87, 0xba, 0x58, 0xd5, 0x5f, 0xc7, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xf7, 0x70, - 0x9d, 0x63, 0xc8, 0x06, 0x00, 0x00, + // 704 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4d, 0x4f, 0x13, 0x4f, + 0x18, 0xef, 0xb6, 0x05, 0xd2, 0xa7, 0xa4, 0xff, 0x65, 0xfe, 0x80, 0x6b, 0x83, 0x2b, 0x59, 0x95, + 0x34, 0xc4, 0x00, 0x29, 0x6a, 0xe2, 0xcd, 0x58, 0x30, 0xc1, 0x18, 0x24, 0x8b, 0xd5, 0xa8, 0x07, + 0xb3, 0xec, 0x3e, 0xc0, 0x84, 0x65, 0x67, 0xdd, 0x99, 0x1a, 0x38, 0x98, 0xf8, 0x11, 0x3c, 0xf9, + 0x29, 0xfc, 0x08, 0x7e, 0x00, 0x8f, 0x1c, 0x3d, 0x1a, 0xf8, 0x14, 0xde, 0xcc, 0xbe, 0x4c, 0x3b, + 0xdb, 0x6e, 0xcb, 0xc1, 0x0b, 0x74, 0x7e, 0xcf, 0xcb, 0xef, 0xf7, 0xbc, 0xcc, 0x2c, 0x3c, 0x74, + 0x19, 0x8b, 0x3c, 0x1a, 0x38, 0x82, 0x45, 0xeb, 0xca, 0xef, 0x30, 0x62, 0x82, 0xad, 0x27, 0x7f, + 0xb9, 0x8a, 0xaf, 0x25, 0x10, 0xa9, 0x2b, 0x90, 0xb5, 0x05, 0xfa, 0x7e, 0xe8, 0xb8, 0xb8, 0x4f, + 0x8f, 0x02, 0x1b, 0x3f, 0xf6, 0x90, 0x0b, 0x62, 0xc0, 0x0c, 0x8f, 0xb1, 0x1d, 0xcf, 0xd0, 0x96, + 0xb5, 0x56, 0xcd, 0x96, 0x47, 0xb2, 0x08, 0xd3, 0xc7, 0xe8, 0x78, 0x18, 0x19, 0xe5, 0x65, 0xad, + 0x35, 0x6b, 0x67, 0x27, 0x4b, 0x00, 0x49, 0xb3, 0x08, 0x47, 0xf4, 0xf8, 0x9e, 0x73, 0xee, 0x33, + 0xc7, 0x23, 0x1b, 0x30, 0xcd, 0x13, 0x20, 0x49, 0xd3, 0x68, 0x1b, 0x6b, 0xaa, 0x18, 0x25, 0xc0, + 0xce, 0xfc, 0xc8, 0x7d, 0x98, 0xf3, 0xd0, 0x47, 0x41, 0x59, 0xf0, 0x8a, 0x9e, 0x22, 0x17, 0xce, + 0x69, 0x98, 0x50, 0x55, 0xec, 0x51, 0x83, 0xd5, 0x85, 0x39, 0x45, 0x3b, 0x0f, 0x59, 0xc0, 0x91, + 0x3c, 0x81, 0x99, 0x08, 0x5d, 0xa4, 0xa1, 0x48, 0x58, 0xeb, 0xed, 0x95, 0x51, 0x56, 0x3b, 0x75, + 0x78, 0x43, 0xc5, 0x71, 0x1c, 0xeb, 0x88, 0x5e, 0x84, 0xb6, 0x0c, 0xb3, 0x4e, 0xe0, 0xe6, 0x58, + 0x2f, 0xb2, 0x01, 0xff, 0x73, 0xc5, 0x98, 0x95, 0x9a, 0x50, 0xcd, 0xda, 0x45, 0x26, 0xb2, 0x04, + 0x35, 0x2e, 0xc3, 0xb3, 0xb6, 0x0d, 0x00, 0xeb, 0x87, 0x06, 0xb3, 0x2a, 0xdb, 0xe4, 0xe6, 0x87, + 0x88, 0xd1, 0x8e, 0x97, 0x64, 0xa9, 0xd9, 0xd9, 0x89, 0xb4, 0xe0, 0x3f, 0xc7, 0x75, 0x59, 0x2f, + 0x10, 0x3b, 0x1e, 0x06, 0x82, 0x8a, 0x73, 0xa3, 0x92, 0xd0, 0x0c, 0xc3, 0xb1, 0x78, 0x97, 0x05, + 0x22, 0x62, 0xfe, 0x2e, 0xf3, 0xb0, 0xef, 0x5d, 0x4d, 0xc5, 0x17, 0x98, 0x88, 0x09, 0xf0, 0xc9, + 0xf1, 0xa9, 0xd7, 0x0d, 0x04, 0xf5, 0x8d, 0xa9, 0x65, 0xad, 0x55, 0xb5, 0x15, 0xc4, 0x7a, 0x0f, + 0x0b, 0xcf, 0xa8, 0x8f, 0x2f, 0xe8, 0x29, 0x15, 0x9d, 0x63, 0x74, 0x4f, 0xe4, 0x0e, 0x15, 0x88, + 0xd2, 0x8a, 0x45, 0x29, 0x05, 0x97, 0x73, 0x05, 0x5b, 0x6b, 0xb0, 0x38, 0x9c, 0x3c, 0x1b, 0xf2, + 0x3c, 0x4c, 0xf9, 0x31, 0x9a, 0xe4, 0xac, 0xda, 0xe9, 0xc1, 0xda, 0x84, 0x1b, 0xca, 0x52, 0xe5, + 0xe4, 0x8c, 0xed, 0xaa, 0xd5, 0x05, 0x63, 0x34, 0x28, 0xa3, 0x79, 0x0c, 0x33, 0xa1, 0x32, 0xe0, + 0x7a, 0xfb, 0xf6, 0xb8, 0x0d, 0xce, 0x86, 0x6d, 0x4b, 0x7f, 0xeb, 0x9b, 0x36, 0x94, 0xd7, 0x09, + 0x8e, 0xf0, 0xfa, 0x0b, 0xb6, 0x0a, 0xba, 0xdc, 0xf3, 0x34, 0xa4, 0xdf, 0x95, 0x11, 0x9c, 0x3c, + 0x80, 0x85, 0x3c, 0x26, 0x97, 0x31, 0x9d, 0x7e, 0xb1, 0xd1, 0x7a, 0x9d, 0x6d, 0x77, 0x5e, 0xd7, + 0x3f, 0x17, 0xbc, 0xfa, 0x45, 0x03, 0xd8, 0x8e, 0x22, 0x16, 0x75, 0x98, 0x87, 0x9c, 0x34, 0x00, + 0xba, 0x01, 0x9e, 0x85, 0xe8, 0x0a, 0xf4, 0xf4, 0x12, 0xd1, 0xb3, 0x35, 0xdf, 0x8a, 0x45, 0xa1, + 0xa7, 0x6b, 0xc4, 0x80, 0xf9, 0x01, 0x42, 0x59, 0xb0, 0x87, 0x81, 0x47, 0x83, 0x23, 0xbd, 0xdc, + 0xf7, 0xed, 0x44, 0xe8, 0xc4, 0xbe, 0x15, 0x42, 0xa0, 0x91, 0x20, 0xbb, 0x4c, 0x6c, 0x9f, 0x51, + 0x2e, 0xb8, 0x5e, 0x25, 0x3a, 0xd4, 0x13, 0xbe, 0x97, 0x87, 0x87, 0x1c, 0x85, 0xfe, 0xbd, 0xbc, + 0xfa, 0x19, 0xea, 0x8a, 0x42, 0xb2, 0x98, 0x7b, 0x94, 0x64, 0xb2, 0x12, 0x31, 0xa1, 0xa9, 0x16, + 0x92, 0xd2, 0x4a, 0x15, 0xba, 0x36, 0x64, 0x97, 0x86, 0x7d, 0xe1, 0x44, 0x71, 0x7c, 0x79, 0x28, + 0xaf, 0x2c, 0xa8, 0xd2, 0xfe, 0x53, 0x86, 0x7a, 0x67, 0xd0, 0x2d, 0xf2, 0x1c, 0x6a, 0xfd, 0xe7, + 0x89, 0xdc, 0x2a, 0x68, 0xe4, 0xe0, 0xc9, 0x6d, 0x9a, 0xe3, 0xcc, 0xd9, 0x60, 0xde, 0x42, 0x23, + 0x7f, 0x15, 0x88, 0x95, 0x8b, 0x28, 0xbc, 0x84, 0xcd, 0x3b, 0x13, 0x7d, 0xb2, 0xd4, 0x1f, 0xe4, + 0x17, 0x60, 0x70, 0x01, 0xc8, 0xdd, 0x71, 0x63, 0xcf, 0xa5, 0xbf, 0x77, 0x8d, 0x57, 0x46, 0x70, + 0x20, 0x9f, 0x69, 0x65, 0xe3, 0xc8, 0x84, 0x58, 0xe5, 0xa6, 0x34, 0x57, 0xae, 0x73, 0x4b, 0x39, + 0x9e, 0x3e, 0xfa, 0x79, 0x69, 0x6a, 0x17, 0x97, 0xa6, 0xf6, 0xfb, 0xd2, 0xd4, 0xbe, 0x5e, 0x99, + 0xa5, 0x8b, 0x2b, 0xb3, 0xf4, 0xeb, 0xca, 0x2c, 0xbd, 0x5b, 0x9a, 0xf4, 0x91, 0x3c, 0x98, 0x4e, + 0xfe, 0x6d, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xe4, 0x76, 0x96, 0x0f, 0x4b, 0x07, 0x00, 0x00, } func (m *SpaceSignRequest) Marshal() (dAtA []byte, err error) { diff --git a/coordinator/coordinatorproto/errors.go b/coordinator/coordinatorproto/errors.go new file mode 100644 index 00000000..1fb41a2c --- /dev/null +++ b/coordinator/coordinatorproto/errors.go @@ -0,0 +1,16 @@ +package coordinatorproto + +import ( + "errors" + "github.com/anytypeio/any-sync/net/rpc/rpcerr" +) + +var ( + errGroup = rpcerr.ErrGroup(ErrorCodes_ErrorOffset) + + ErrUnexpected = errGroup.Register(errors.New("unexpected error"), uint64(ErrorCodes_Unexpected)) + ErrSpaceIsCreated = errGroup.Register(errors.New("space is missing"), uint64(ErrorCodes_SpaceCreated)) + ErrSpaceIsDeleted = errGroup.Register(errors.New("space is deleted"), uint64(ErrorCodes_SpaceDeleted)) + ErrSpaceDeletionPending = errGroup.Register(errors.New("space is set out for deletion"), uint64(ErrorCodes_SpaceDeletionPending)) + ErrSpaceNotExists = errGroup.Register(errors.New("space not exists"), uint64(ErrorCodes_SpaceNotExists)) +) diff --git a/coordinator/coordinatorproto/protos/coordinator.proto b/coordinator/coordinatorproto/protos/coordinator.proto index 4e2c2777..b828740c 100644 --- a/coordinator/coordinatorproto/protos/coordinator.proto +++ b/coordinator/coordinatorproto/protos/coordinator.proto @@ -25,6 +25,15 @@ message SpaceSignRequest { bytes header = 2; } +enum ErrorCodes { + Unexpected = 0; + SpaceDeleted = 1; + SpaceDeletionPending = 2; + SpaceCreated = 3; + SpaceNotExists = 4; + ErrorOffset = 300; +} + enum SpaceStatus { SpaceStatusCreated = 0; SpaceStatusPendingDeletion = 1; From 58f01da459ab9679ce7679b5f39aaa9165e34c28 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Mon, 6 Mar 2023 09:31:27 +0100 Subject: [PATCH 16/19] Add safe access in case no delete change provided --- coordinator/coordinatorclient/coordinatorclient.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coordinator/coordinatorclient/coordinatorclient.go b/coordinator/coordinatorclient/coordinatorclient.go index 627bba1b..9ebdcb9b 100644 --- a/coordinator/coordinatorclient/coordinatorclient.go +++ b/coordinator/coordinatorclient/coordinatorclient.go @@ -36,8 +36,8 @@ func (c *coordinatorClient) ChangeStatus(ctx context.Context, spaceId string, de } resp, err := cl.SpaceStatusChange(ctx, &coordinatorproto.SpaceStatusChangeRequest{ SpaceId: spaceId, - DeletionChangeId: deleteRaw.Id, - DeletionChangePayload: deleteRaw.RawChange, + DeletionChangeId: deleteRaw.GetId(), + DeletionChangePayload: deleteRaw.GetRawChange(), }) if err != nil { return From e1f6dad499d41ad0816b33cda12ec9b4540e2f0d Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Mon, 6 Mar 2023 09:41:45 +0100 Subject: [PATCH 17/19] Add error unwrapping --- coordinator/coordinatorclient/coordinatorclient.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/coordinator/coordinatorclient/coordinatorclient.go b/coordinator/coordinatorclient/coordinatorclient.go index 9ebdcb9b..7e490268 100644 --- a/coordinator/coordinatorclient/coordinatorclient.go +++ b/coordinator/coordinatorclient/coordinatorclient.go @@ -7,6 +7,7 @@ import ( "github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto" "github.com/anytypeio/any-sync/coordinator/coordinatorproto" "github.com/anytypeio/any-sync/net/pool" + "github.com/anytypeio/any-sync/net/rpc/rpcerr" "github.com/anytypeio/any-sync/nodeconf" ) @@ -40,6 +41,7 @@ func (c *coordinatorClient) ChangeStatus(ctx context.Context, spaceId string, de DeletionChangePayload: deleteRaw.GetRawChange(), }) if err != nil { + err = rpcerr.Unwrap(err) return } status = resp.Payload @@ -55,6 +57,7 @@ func (c *coordinatorClient) StatusCheck(ctx context.Context, spaceId string) (st SpaceId: spaceId, }) if err != nil { + err = rpcerr.Unwrap(err) return } status = resp.Payload @@ -81,6 +84,7 @@ func (c *coordinatorClient) SpaceSign(ctx context.Context, spaceId string, space Header: spaceHeader, }) if err != nil { + err = rpcerr.Unwrap(err) return } return resp.Receipt, nil @@ -96,6 +100,7 @@ func (c *coordinatorClient) FileLimitCheck(ctx context.Context, spaceId string, SpaceId: spaceId, }) if err != nil { + err = rpcerr.Unwrap(err) return } return resp.Limit, nil From 998f631ee82d6ace33d43ca759954d342905efbc Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Mon, 6 Mar 2023 11:08:27 +0100 Subject: [PATCH 18/19] Update diffsyncer to directly sync settings tree --- commonspace/headsync/diffsyncer.go | 4 ++++ commonspace/headsync/diffsyncer_test.go | 17 ++++++++++++++++- commonspace/objectsync/objectsync.go | 12 +++++++++--- commonspace/spaceservice.go | 2 +- 4 files changed, 30 insertions(+), 5 deletions(-) diff --git a/commonspace/headsync/diffsyncer.go b/commonspace/headsync/diffsyncer.go index 3f3f3f82..0e7d9e3f 100644 --- a/commonspace/headsync/diffsyncer.go +++ b/commonspace/headsync/diffsyncer.go @@ -121,6 +121,10 @@ func (d *diffSyncer) syncWithPeer(ctx context.Context, p peer.Peer) (err error) newIds, changedIds, removedIds, err := d.diff.Diff(ctx, rdiff) err = rpcerr.Unwrap(err) if err != nil && err != spacesyncproto.ErrSpaceMissing { + if err == spacesyncproto.ErrSpaceIsDeleted { + d.log.Debug("got space deleted while syncing") + d.syncTrees(ctx, p.Id(), []string{d.storage.SpaceSettingsId()}) + } d.syncStatus.SetNodesOnline(p.Id(), false) return fmt.Errorf("diff error: %v", err) } diff --git a/commonspace/headsync/diffsyncer_test.go b/commonspace/headsync/diffsyncer_test.go index e73eb55a..f9622ca6 100644 --- a/commonspace/headsync/diffsyncer_test.go +++ b/commonspace/headsync/diffsyncer_test.go @@ -207,7 +207,7 @@ func TestDiffSyncer_Sync(t *testing.T) { require.NoError(t, diffSyncer.Sync(ctx)) }) - t.Run("diff syncer sync other error", func(t *testing.T) { + t.Run("diff syncer sync unexpected", func(t *testing.T) { peerManagerMock.EXPECT(). GetResponsiblePeers(gomock.Any()). Return([]peer.Peer{mockPeer{}}, nil) @@ -217,4 +217,19 @@ func TestDiffSyncer_Sync(t *testing.T) { require.NoError(t, diffSyncer.Sync(ctx)) }) + + t.Run("diff syncer sync space is deleted error", func(t *testing.T) { + peerManagerMock.EXPECT(). + GetResponsiblePeers(gomock.Any()). + Return([]peer.Peer{mockPeer{}}, nil) + diffMock.EXPECT(). + Diff(gomock.Any(), gomock.Eq(NewRemoteDiff(spaceId, clientMock))). + Return(nil, nil, nil, spacesyncproto.ErrSpaceIsDeleted) + stMock.EXPECT().SpaceSettingsId().Return("settingsId") + cacheMock.EXPECT(). + GetTree(gomock.Any(), spaceId, "settingsId"). + Return(nil, nil) + + require.NoError(t, diffSyncer.Sync(ctx)) + }) } diff --git a/commonspace/objectsync/objectsync.go b/commonspace/objectsync/objectsync.go index a1f17b49..7c72e635 100644 --- a/commonspace/objectsync/objectsync.go +++ b/commonspace/objectsync/objectsync.go @@ -7,6 +7,7 @@ import ( "github.com/anytypeio/any-sync/commonspace/object/syncobjectgetter" "github.com/anytypeio/any-sync/commonspace/objectsync/synchandler" "github.com/anytypeio/any-sync/commonspace/peermanager" + "github.com/anytypeio/any-sync/commonspace/spacestorage" "github.com/anytypeio/any-sync/commonspace/spacesyncproto" "github.com/anytypeio/any-sync/nodeconf" "go.uber.org/zap" @@ -32,6 +33,7 @@ type objectSync struct { messagePool MessagePool objectGetter syncobjectgetter.SyncObjectGetter configuration nodeconf.Configuration + spaceStorage spacestorage.SpaceStorage syncCtx context.Context cancelSync context.CancelFunc @@ -43,13 +45,15 @@ func NewObjectSync( spaceIsDeleted *atomic.Bool, configuration nodeconf.Configuration, peerManager peermanager.PeerManager, - objectGetter syncobjectgetter.SyncObjectGetter) ObjectSync { + objectGetter syncobjectgetter.SyncObjectGetter, + storage spacestorage.SpaceStorage) ObjectSync { syncCtx, cancel := context.WithCancel(context.Background()) os := newObjectSync( spaceId, spaceIsDeleted, configuration, objectGetter, + storage, syncCtx, cancel) msgPool := newMessagePool(peerManager, os.handleMessage) @@ -62,11 +66,13 @@ func newObjectSync( spaceIsDeleted *atomic.Bool, configuration nodeconf.Configuration, objectGetter syncobjectgetter.SyncObjectGetter, + spaceStorage spacestorage.SpaceStorage, syncCtx context.Context, cancel context.CancelFunc, ) *objectSync { return &objectSync{ objectGetter: objectGetter, + spaceStorage: spaceStorage, spaceId: spaceId, syncCtx: syncCtx, cancelSync: cancel, @@ -95,8 +101,8 @@ func (s *objectSync) handleMessage(ctx context.Context, senderId string, msg *sp log := log.With(zap.String("objectId", msg.ObjectId), zap.String("replyId", msg.ReplyId)) if s.spaceIsDeleted.Load() { log = log.With(zap.Bool("isDeleted", true)) - // preventing sync with other clients - if !slices.Contains(s.configuration.NodeIds(s.spaceId), senderId) { + // preventing sync with other clients if they are not just syncing the settings tree + if !slices.Contains(s.configuration.NodeIds(s.spaceId), senderId) && msg.ObjectId != s.spaceStorage.SpaceSettingsId() { return spacesyncproto.ErrSpaceIsDeleted } } diff --git a/commonspace/spaceservice.go b/commonspace/spaceservice.go index d10fb35b..89e9283b 100644 --- a/commonspace/spaceservice.go +++ b/commonspace/spaceservice.go @@ -148,7 +148,7 @@ func (s *spaceService) NewSpace(ctx context.Context, id string) (Space, error) { } headSync := headsync.NewHeadSync(id, spaceIsDeleted, s.config.SyncPeriod, lastConfiguration, st, peerManager, getter, syncStatus, s.credentialProvider, log) - objectSync := objectsync.NewObjectSync(id, spaceIsDeleted, lastConfiguration, peerManager, getter) + objectSync := objectsync.NewObjectSync(id, spaceIsDeleted, lastConfiguration, peerManager, getter, st) sp := &space{ id: id, objectSync: objectSync, From 61cd658ab08f97742cd32d86d5edcb1c72209180 Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Mon, 6 Mar 2023 14:29:07 +0100 Subject: [PATCH 19/19] Add todo --- commonspace/headsync/diffsyncer.go | 1 + 1 file changed, 1 insertion(+) diff --git a/commonspace/headsync/diffsyncer.go b/commonspace/headsync/diffsyncer.go index 0e7d9e3f..9d3434c1 100644 --- a/commonspace/headsync/diffsyncer.go +++ b/commonspace/headsync/diffsyncer.go @@ -90,6 +90,7 @@ func (d *diffSyncer) UpdateHeads(id string, heads []string) { } func (d *diffSyncer) Sync(ctx context.Context) error { + // TODO: split diffsyncer into components st := time.Now() // diffing with responsible peers according to configuration peers, err := d.peerManager.GetResponsiblePeers(ctx)