Add non-encrypted changes and settings document logic

client/clientspace/clientcache/treecache.go

@@ -101,3 +101,16 @@ func (c *treeCache) GetDocument(ctx context.Context, spaceId, id string) (doc te
 func (c *treeCache) GetTree(ctx context.Context, spaceId, id string) (tr tree.ObjectTree, err error) {
 	return c.GetDocument(ctx, spaceId, id)
 }
+
+func (c *treeCache) DeleteTree(ctx context.Context, spaceId, treeId string) (err error) {
+	tr, err := c.GetTree(ctx, spaceId, treeId)
+	if err != nil {
+		return
+	}
+	err = tr.Delete()
+	if err != nil {
+		return
+	}
+	_, err = c.cache.Remove(treeId)
+	return
+}

common/commonspace/commongetter.go

@@ -3,6 +3,7 @@ package commonspace
 import (
 	"context"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/objectgetter"
+	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settingsdocument"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncacl"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter"
 )
@@ -11,13 +12,15 @@ type commonSpaceGetter struct {
 	spaceId    string
 	aclList    *syncacl.SyncACL
 	treeGetter treegetter.TreeGetter
+	settings   settingsdocument.SettingsDocument
 }
 
-func newCommonSpaceGetter(spaceId string, aclList *syncacl.SyncACL, treeGetter treegetter.TreeGetter) objectgetter.ObjectGetter {
+func newCommonSpaceGetter(spaceId string, aclList *syncacl.SyncACL, treeGetter treegetter.TreeGetter, settings settingsdocument.SettingsDocument) objectgetter.ObjectGetter {
 	return &commonSpaceGetter{
 		spaceId:    spaceId,
 		aclList:    aclList,
 		treeGetter: treeGetter,
+		settings:   settings,
 	}
 }
 
@@ -26,6 +29,10 @@ func (c *commonSpaceGetter) GetObject(ctx context.Context, objectId string) (obj
 		obj = c.aclList
 		return
 	}
+	if c.settings.ID() == objectId {
+		obj = c.settings.(objectgetter.Object)
+		return
+	}
 	t, err := c.treeGetter.GetTree(ctx, c.spaceId, objectId)
 	if err != nil {
 		return

common/commonspace/settingsdocument/provider.go

@@ -0,0 +1,45 @@
+package settingsdocument
+
+import (
+	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto"
+	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree"
+	"github.com/gogo/protobuf/proto"
+)
+
+type deletedIdsProvider interface {
+	ProvideIds(tr tree.ObjectTree, startId string) (ids []string, lastId string, err error)
+}
+
+type provider struct{}
+
+func (p *provider) convert(decrypted []byte) (res any, err error) {
+	deleteChange := &spacesyncproto.SettingsData{}
+	err = proto.Unmarshal(decrypted, deleteChange)
+	if err != nil {
+		return nil, err
+	}
+	return deleteChange, nil
+}
+
+func (p *provider) ProvideIds(tr tree.ObjectTree, startId string) (ids []string, lastId string, err error) {
+	processChange := func(change *tree.Change) bool {
+		// ignoring first change if startId is not ""
+		if change.Id == startId {
+			return true
+		}
+		deleteChange := change.Model.(*spacesyncproto.SettingsData)
+		for _, cnt := range deleteChange.Content {
+			if cnt.GetObjectDelete() != nil {
+				ids = append(ids, cnt.GetObjectDelete().GetId())
+			}
+		}
+		lastId = change.Id
+		return true
+	}
+	if startId == "" {
+		err = tr.IterateFrom(tr.ID(), p.convert, processChange)
+	} else {
+		err = tr.IterateFrom(startId, p.convert, processChange)
+	}
+	return
+}

common/commonspace/settingsdocument/settingsdocument.go

@@ -0,0 +1,136 @@
+package settingsdocument
+
+import (
+	"context"
+	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/account"
+	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto"
+	spacestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage"
+	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/synctree/updatelistener"
+	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/treegetter"
+	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/tree"
+)
+
+type DeletionState int
+
+const (
+	DeletionStateQueued DeletionState = iota
+	DeletionStateDeleted
+)
+
+type SettingsDocument interface {
+	tree.ObjectTree
+	DeleteObject(id string) (err error)
+}
+
+type BuildTreeFunc func(ctx context.Context, id string, listener updatelistener.UpdateListener) (t tree.ObjectTree, err error)
+
+type Deps struct {
+	BuildFunc  BuildTreeFunc
+	Account    account.Service
+	TreeGetter treegetter.TreeGetter
+	Store      spacestorage.SpaceStorage
+	prov       deletedIdsProvider
+}
+
+type settingsDocument struct {
+	tree.ObjectTree
+	account       account.Service
+	spaceId       string
+	deletionState map[string]DeletionState
+	treeGetter    treegetter.TreeGetter
+	store         spacestorage.SpaceStorage
+	lastChangeId  string
+	prov          deletedIdsProvider
+}
+
+func NewSettingsDocument(ctx context.Context, deps Deps, spaceId string) (doc SettingsDocument, err error) {
+	s := &settingsDocument{
+		account:       deps.Account,
+		spaceId:       spaceId,
+		deletionState: map[string]DeletionState{},
+		treeGetter:    deps.TreeGetter,
+		store:         deps.Store,
+	}
+	s.ObjectTree, err = deps.BuildFunc(ctx, deps.Store.SpaceSettingsId(), s)
+	if err != nil {
+		return
+	}
+	// this is needed mainly for testing
+	if deps.prov == nil {
+		s.prov = &provider{}
+	}
+	doc = s
+	return
+}
+
+func (s *settingsDocument) Update(tr tree.ObjectTree) {
+	ids, lastId, err := s.prov.ProvideIds(tr, s.lastChangeId)
+	if err != nil {
+		return
+	}
+	s.lastChangeId = lastId
+	s.toBeDeleted(ids)
+}
+
+func (s *settingsDocument) Rebuild(tr tree.ObjectTree) {
+	ids, lastId, err := s.prov.ProvideIds(tr, "")
+	if err != nil {
+		return
+	}
+	s.lastChangeId = lastId
+	s.toBeDeleted(ids)
+}
+
+func (s *settingsDocument) Init() {
+	s.Lock()
+	defer s.Unlock()
+	s.Rebuild(s)
+}
+
+func (s *settingsDocument) toBeDeleted(ids []string) {
+	for _, id := range ids {
+		if state, exists := s.deletionState[id]; exists && state == DeletionStateDeleted {
+			continue
+		}
+		// if not already deleted
+		if _, err := s.store.TreeStorage(id); err == nil {
+			s.deletionState[id] = DeletionStateQueued
+			err := s.treeGetter.DeleteTree(context.Background(), s.spaceId, id)
+			if err != nil {
+				// TODO: some errors may tell us that the tree is actually deleted, so we should have more checks here
+				// TODO: add logging
+				continue
+			}
+		}
+		s.deletionState[id] = DeletionStateDeleted
+	}
+}
+
+func (s *settingsDocument) DeleteObject(id string) (err error) {
+	content := &spacesyncproto.SpaceSettingsContent_ObjectDelete{
+		ObjectDelete: &spacesyncproto.ObjectDelete{Id: id},
+	}
+	change := &spacesyncproto.SettingsData{
+		Content: []*spacesyncproto.SpaceSettingsContent{
+			{content},
+		},
+		Snapshot: nil,
+	}
+	res, err := change.Marshal()
+	if err != nil {
+		return
+	}
+	s.Lock()
+	defer s.Unlock()
+	_, err = s.AddContent(context.Background(), tree.SignableChangeContent{
+		Data:        res,
+		Key:         s.account.Account().SignKey,
+		Identity:    s.account.Account().Identity,
+		IsSnapshot:  false,
+		IsEncrypted: false,
+	})
+	if err == nil {
+		s.Update(s)
+	}
+	return
+}

common/commonspace/settingsservice/service.go

@@ -1,22 +0,0 @@
-package settingsservice
-
-import (
-	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/account"
-)
-
-type Service interface {
-}
-
-const deletionChangeType = "space.deletionlist"
-
-type service struct {
-	account account.Service
-}
-
-func New() Service {
-	return nil
-}
-
-type DeletedDocumentNotifiable interface {
-	NotifyDeleted(id string)
-}

common/commonspace/space.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/account"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/diffservice"
+	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settingsdocument"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncacl"
@@ -82,13 +83,14 @@ type space struct {
 
 	rpc *rpcHandler
 
-	syncService   syncservice.SyncService
+	syncService      syncservice.SyncService
-	diffService   diffservice.DiffService
+	diffService      diffservice.DiffService
-	storage       storage.SpaceStorage
+	storage          storage.SpaceStorage
-	cache         treegetter.TreeGetter
+	cache            treegetter.TreeGetter
-	account       account.Service
+	account          account.Service
-	aclList       *syncacl.SyncACL
+	aclList          *syncacl.SyncACL
-	configuration nodeconf.Configuration
+	configuration    nodeconf.Configuration
+	settingsDocument settingsdocument.SettingsDocument
 
 	isClosed atomic.Bool
 }
@@ -142,8 +144,18 @@ func (s *space) Init(ctx context.Context) (err error) {
 		return
 	}
 
+	deps := settingsdocument.Deps{
+		BuildFunc:  s.BuildTree,
+		Account:    s.account,
+		TreeGetter: s.cache,
+		Store:      s.storage,
+	}
+	s.settingsDocument, err = settingsdocument.NewSettingsDocument(context.Background(), deps, s.id)
+	if err != nil {
+		return
+	}
 	s.aclList = syncacl.NewSyncACL(aclList, s.syncService.StreamPool())
-	objectGetter := newCommonSpaceGetter(s.id, s.aclList, s.cache)
+	objectGetter := newCommonSpaceGetter(s.id, s.aclList, s.cache, s.settingsDocument)
 	s.syncService.Init(objectGetter)
 	s.diffService.Init(initialIds)
 	return nil
@@ -231,6 +243,9 @@ func (s *space) Close() error {
 	if err := s.syncService.Close(); err != nil {
 		mError.Add(err)
 	}
+	if err := s.settingsDocument.Close(); err != nil {
+		mError.Add(err)
+	}
 	if err := s.aclList.Close(); err != nil {
 		mError.Add(err)
 	}

common/commonspace/spacesyncproto/protos/spacesync.proto

@@ -106,3 +106,23 @@ message RawSpaceHeaderWithId {
     bytes rawHeader = 1;
     string id = 2;
 }
+
+message SpaceSettingsContent {
+    oneof value {
+        ObjectDelete objectDelete = 1;
+    }
+}
+
+message ObjectDelete {
+    string id = 1;
+}
+
+message SpaceSettingsSnapshot {
+    repeated string deletedIds = 1;
+}
+
+message SettingsData {
+    repeated SpaceSettingsContent content = 1;
+    SpaceSettingsSnapshot snapshot = 2;
+}
+

common/commonspace/spacesyncproto/spacesync.pb.go

@@ -824,6 +824,219 @@ func (m *RawSpaceHeaderWithId) GetId() string {
 	return ""
 }
 
+type SpaceSettingsContent struct {
+	// Types that are valid to be assigned to Value:
+	//
+	//	*SpaceSettingsContent_ObjectDelete
+	Value isSpaceSettingsContent_Value `protobuf_oneof:"value"`
+}
+
+func (m *SpaceSettingsContent) Reset()         { *m = SpaceSettingsContent{} }
+func (m *SpaceSettingsContent) String() string { return proto.CompactTextString(m) }
+func (*SpaceSettingsContent) ProtoMessage()    {}
+func (*SpaceSettingsContent) Descriptor() ([]byte, []int) {
+	return fileDescriptor_80e49f1f4ac27799, []int{14}
+}
+func (m *SpaceSettingsContent) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *SpaceSettingsContent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_SpaceSettingsContent.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 *SpaceSettingsContent) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpaceSettingsContent.Merge(m, src)
+}
+func (m *SpaceSettingsContent) XXX_Size() int {
+	return m.Size()
+}
+func (m *SpaceSettingsContent) XXX_DiscardUnknown() {
+	xxx_messageInfo_SpaceSettingsContent.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SpaceSettingsContent proto.InternalMessageInfo
+
+type isSpaceSettingsContent_Value interface {
+	isSpaceSettingsContent_Value()
+	MarshalTo([]byte) (int, error)
+	Size() int
+}
+
+type SpaceSettingsContent_ObjectDelete struct {
+	ObjectDelete *ObjectDelete `protobuf:"bytes,1,opt,name=objectDelete,proto3,oneof" json:"objectDelete,omitempty"`
+}
+
+func (*SpaceSettingsContent_ObjectDelete) isSpaceSettingsContent_Value() {}
+
+func (m *SpaceSettingsContent) GetValue() isSpaceSettingsContent_Value {
+	if m != nil {
+		return m.Value
+	}
+	return nil
+}
+
+func (m *SpaceSettingsContent) GetObjectDelete() *ObjectDelete {
+	if x, ok := m.GetValue().(*SpaceSettingsContent_ObjectDelete); ok {
+		return x.ObjectDelete
+	}
+	return nil
+}
+
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*SpaceSettingsContent) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
+		(*SpaceSettingsContent_ObjectDelete)(nil),
+	}
+}
+
+type ObjectDelete struct {
+	Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+}
+
+func (m *ObjectDelete) Reset()         { *m = ObjectDelete{} }
+func (m *ObjectDelete) String() string { return proto.CompactTextString(m) }
+func (*ObjectDelete) ProtoMessage()    {}
+func (*ObjectDelete) Descriptor() ([]byte, []int) {
+	return fileDescriptor_80e49f1f4ac27799, []int{15}
+}
+func (m *ObjectDelete) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *ObjectDelete) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_ObjectDelete.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 *ObjectDelete) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ObjectDelete.Merge(m, src)
+}
+func (m *ObjectDelete) XXX_Size() int {
+	return m.Size()
+}
+func (m *ObjectDelete) XXX_DiscardUnknown() {
+	xxx_messageInfo_ObjectDelete.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ObjectDelete proto.InternalMessageInfo
+
+func (m *ObjectDelete) GetId() string {
+	if m != nil {
+		return m.Id
+	}
+	return ""
+}
+
+type SpaceSettingsSnapshot struct {
+	DeletedIds []string `protobuf:"bytes,1,rep,name=deletedIds,proto3" json:"deletedIds,omitempty"`
+}
+
+func (m *SpaceSettingsSnapshot) Reset()         { *m = SpaceSettingsSnapshot{} }
+func (m *SpaceSettingsSnapshot) String() string { return proto.CompactTextString(m) }
+func (*SpaceSettingsSnapshot) ProtoMessage()    {}
+func (*SpaceSettingsSnapshot) Descriptor() ([]byte, []int) {
+	return fileDescriptor_80e49f1f4ac27799, []int{16}
+}
+func (m *SpaceSettingsSnapshot) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *SpaceSettingsSnapshot) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_SpaceSettingsSnapshot.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 *SpaceSettingsSnapshot) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SpaceSettingsSnapshot.Merge(m, src)
+}
+func (m *SpaceSettingsSnapshot) XXX_Size() int {
+	return m.Size()
+}
+func (m *SpaceSettingsSnapshot) XXX_DiscardUnknown() {
+	xxx_messageInfo_SpaceSettingsSnapshot.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SpaceSettingsSnapshot proto.InternalMessageInfo
+
+func (m *SpaceSettingsSnapshot) GetDeletedIds() []string {
+	if m != nil {
+		return m.DeletedIds
+	}
+	return nil
+}
+
+type SettingsData struct {
+	Content  []*SpaceSettingsContent `protobuf:"bytes,1,rep,name=content,proto3" json:"content,omitempty"`
+	Snapshot *SpaceSettingsSnapshot  `protobuf:"bytes,2,opt,name=snapshot,proto3" json:"snapshot,omitempty"`
+}
+
+func (m *SettingsData) Reset()         { *m = SettingsData{} }
+func (m *SettingsData) String() string { return proto.CompactTextString(m) }
+func (*SettingsData) ProtoMessage()    {}
+func (*SettingsData) Descriptor() ([]byte, []int) {
+	return fileDescriptor_80e49f1f4ac27799, []int{17}
+}
+func (m *SettingsData) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *SettingsData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_SettingsData.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 *SettingsData) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SettingsData.Merge(m, src)
+}
+func (m *SettingsData) XXX_Size() int {
+	return m.Size()
+}
+func (m *SettingsData) XXX_DiscardUnknown() {
+	xxx_messageInfo_SettingsData.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SettingsData proto.InternalMessageInfo
+
+func (m *SettingsData) GetContent() []*SpaceSettingsContent {
+	if m != nil {
+		return m.Content
+	}
+	return nil
+}
+
+func (m *SettingsData) GetSnapshot() *SpaceSettingsSnapshot {
+	if m != nil {
+		return m.Snapshot
+	}
+	return nil
+}
+
 func init() {
 	proto.RegisterEnum("anySpace.ErrCodes", ErrCodes_name, ErrCodes_value)
 	proto.RegisterType((*HeadSyncRange)(nil), "anySpace.HeadSyncRange")
@@ -840,6 +1053,10 @@ func init() {
 	proto.RegisterType((*SpaceHeader)(nil), "anySpace.SpaceHeader")
 	proto.RegisterType((*RawSpaceHeader)(nil), "anySpace.RawSpaceHeader")
 	proto.RegisterType((*RawSpaceHeaderWithId)(nil), "anySpace.RawSpaceHeaderWithId")
+	proto.RegisterType((*SpaceSettingsContent)(nil), "anySpace.SpaceSettingsContent")
+	proto.RegisterType((*ObjectDelete)(nil), "anySpace.ObjectDelete")
+	proto.RegisterType((*SpaceSettingsSnapshot)(nil), "anySpace.SpaceSettingsSnapshot")
+	proto.RegisterType((*SettingsData)(nil), "anySpace.SettingsData")
 }
 
 func init() {
@@ -847,55 +1064,62 @@ func init() {
 }
 
 var fileDescriptor_80e49f1f4ac27799 = []byte{
-	// 770 bytes of a gzipped FileDescriptorProto
+	// 882 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xcd, 0x4e, 0x23, 0x47,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0x4f, 0x6f, 0x1b, 0x45,
-	0x10, 0xf6, 0x0c, 0x06, 0xec, 0xb2, 0x31, 0xa6, 0x43, 0xc8, 0xc4, 0x89, 0x26, 0xd6, 0x1c, 0x22,
+	0x14, 0xf7, 0x6e, 0x9c, 0xc4, 0x7e, 0xd9, 0xba, 0xee, 0x90, 0x96, 0xc5, 0x45, 0x4b, 0x34, 0x07,
-	0x2b, 0x07, 0x20, 0x4e, 0x94, 0x0b, 0x97, 0xfc, 0x60, 0x14, 0x2b, 0x22, 0xa0, 0x76, 0xa2, 0x48,
+	0x14, 0x71, 0x48, 0x8a, 0x41, 0x80, 0x54, 0x0e, 0xd0, 0xda, 0x55, 0x2d, 0x54, 0x12, 0x8d, 0x41,
-	0x51, 0x2e, 0xcd, 0x4c, 0x63, 0x4f, 0x34, 0x7f, 0x3b, 0xdd, 0x16, 0xcc, 0x61, 0xa5, 0x7d, 0x84,
+	0x48, 0x08, 0x0e, 0xd3, 0xdd, 0x89, 0xbd, 0x68, 0xbd, 0xb3, 0xec, 0x8c, 0x49, 0x7d, 0x40, 0xe2,
-	0x7d, 0x82, 0x95, 0xf6, 0x6d, 0xf6, 0xc8, 0x71, 0x8f, 0x2b, 0x78, 0x91, 0x55, 0x97, 0xe7, 0xd7,
+	0xc2, 0x9d, 0x4f, 0x80, 0xc4, 0xb7, 0xe1, 0xd8, 0x23, 0x47, 0x94, 0x7c, 0x11, 0x34, 0x6f, 0xff,
-	0x0c, 0x48, 0x7b, 0x19, 0x4f, 0x7d, 0x55, 0xf5, 0x55, 0xd5, 0xd7, 0x5d, 0x63, 0xf8, 0xde, 0x0e,
+	0x3b, 0x9b, 0x4a, 0x5c, 0xd6, 0xf3, 0xfe, 0xfd, 0xde, 0x9f, 0x79, 0xf3, 0x93, 0xe1, 0x43, 0x5f,
-	0x7d, 0x3f, 0x0c, 0x44, 0xc4, 0x6c, 0x7e, 0x84, 0x4f, 0x91, 0x04, 0x76, 0x14, 0x87, 0x32, 0x3c,
+	0xae, 0x56, 0x32, 0x56, 0x09, 0xf7, 0xc5, 0x29, 0x7e, 0xd5, 0x26, 0xf6, 0x93, 0x54, 0x6a, 0x79,
-	0xc2, 0xa7, 0x28, 0xd0, 0x43, 0x04, 0x48, 0x8b, 0x05, 0xc9, 0x4c, 0x61, 0xd6, 0x14, 0x76, 0x7e,
+	0x8a, 0x5f, 0x55, 0x69, 0x4f, 0x50, 0x41, 0x7a, 0x3c, 0xde, 0xcc, 0x8d, 0x8e, 0xce, 0xe0, 0xce,
-	0xe7, 0xcc, 0x99, 0x25, 0x81, 0x4d, 0x59, 0x30, 0xe7, 0x84, 0x40, 0xf3, 0x3a, 0x0e, 0x7d, 0x43,
+	0x73, 0xc1, 0x83, 0xf9, 0x26, 0xf6, 0x19, 0x8f, 0x17, 0x82, 0x10, 0xe8, 0x5e, 0xa4, 0x72, 0xe5,
-	0x1b, 0x6a, 0xa3, 0x26, 0xc5, 0x77, 0xd2, 0x03, 0x5d, 0x86, 0x86, 0x8e, 0x88, 0x2e, 0x43, 0xb2,
+	0x5a, 0x47, 0xd6, 0x71, 0x97, 0xe1, 0x99, 0x0c, 0xc0, 0xd6, 0xd2, 0xb5, 0x51, 0x63, 0x6b, 0x49,
-	0x0f, 0x9b, 0x9e, 0xeb, 0xbb, 0xd2, 0xd8, 0x18, 0x6a, 0xa3, 0x1d, 0xba, 0x32, 0xac, 0x1b, 0xe8,
+	0x0e, 0x61, 0x37, 0x0a, 0x57, 0xa1, 0x76, 0x77, 0x8e, 0xac, 0xe3, 0x3b, 0x2c, 0x13, 0xe8, 0x25,
-	0xe5, 0x54, 0x5c, 0x2c, 0x3d, 0xa9, 0xb8, 0x16, 0x4c, 0x2c, 0x90, 0xab, 0x4b, 0xf1, 0x9d, 0x9c,
+	0x0c, 0x4a, 0x28, 0xa1, 0xd6, 0x91, 0x36, 0x58, 0x4b, 0xae, 0x96, 0x88, 0xe5, 0x30, 0x3c, 0x93,
-	0x40, 0x8b, 0x7b, 0xdc, 0xe7, 0x81, 0x14, 0x86, 0x3e, 0xdc, 0x18, 0x75, 0xc6, 0xdf, 0x1c, 0x66,
+	0xc7, 0xd0, 0x13, 0x91, 0x58, 0x89, 0x58, 0x2b, 0xd7, 0x3e, 0xda, 0x39, 0x3e, 0x18, 0xbf, 0x77,
-	0xdd, 0x1c, 0x56, 0xf3, 0x27, 0xab, 0x38, 0x9a, 0x27, 0xa8, 0xc2, 0x76, 0xb8, 0x0c, 0xf2, 0xc2,
+	0x52, 0x54, 0x73, 0xd2, 0x8c, 0x9f, 0x66, 0x7e, 0xac, 0x0c, 0x30, 0x89, 0x7d, 0xb9, 0x8e, 0xcb,
-	0x68, 0x58, 0x27, 0xf0, 0x79, 0x6d, 0xa2, 0xea, 0xdb, 0x75, 0xb0, 0x7a, 0x9b, 0xea, 0xae, 0x83,
+	0xc4, 0x28, 0xd0, 0xc7, 0x70, 0xbf, 0x35, 0xd0, 0xd4, 0x1d, 0x06, 0x98, 0xbd, 0xcf, 0xec, 0x30,
-	0xfd, 0x70, 0xe6, 0xe0, 0x24, 0x6d, 0x8a, 0xef, 0xd6, 0x7f, 0xb0, 0x5b, 0x24, 0xbf, 0x58, 0x72,
+	0xc0, 0x7a, 0x04, 0x0f, 0xb0, 0x93, 0x3e, 0xc3, 0x33, 0xfd, 0x01, 0xee, 0x56, 0xc1, 0x3f, 0xaf,
-	0x21, 0x89, 0x01, 0xdb, 0x28, 0xd8, 0x34, 0xcb, 0xcd, 0x4c, 0x72, 0x04, 0x5b, 0xb1, 0x52, 0x29,
+	0x85, 0xd2, 0xc4, 0x85, 0x7d, 0x1c, 0xd8, 0xac, 0x88, 0x2d, 0x44, 0x72, 0x0a, 0x7b, 0xa9, 0x99,
-	0x6b, 0xfd, 0x8b, 0x9a, 0xd6, 0x95, 0x9f, 0xa6, 0x61, 0xd6, 0x19, 0xf4, 0x4b, 0xad, 0x45, 0x61,
+	0x52, 0x51, 0xfa, 0xdb, 0x2d, 0xa5, 0x1b, 0x3b, 0xcb, 0xdd, 0xe8, 0x33, 0x18, 0xd6, 0x4a, 0x4b,
-	0x20, 0x38, 0x19, 0xc3, 0x76, 0x8c, 0x6d, 0x0a, 0x43, 0x43, 0x16, 0xe3, 0x29, 0x01, 0x68, 0x16,
+	0x64, 0xac, 0x04, 0x19, 0xc3, 0x7e, 0x8a, 0x65, 0x2a, 0xd7, 0x42, 0x14, 0xf7, 0xb6, 0x01, 0xb0,
-	0x68, 0xbd, 0x84, 0xbd, 0x8b, 0xab, 0xff, 0xb9, 0x2d, 0x95, 0xf3, 0x9c, 0x0b, 0xc1, 0xe6, 0xfc,
+	0xc2, 0x91, 0xfe, 0x0a, 0xf7, 0xce, 0x5e, 0xfe, 0x24, 0x7c, 0x6d, 0x8c, 0x2f, 0x84, 0x52, 0x7c,
-	0x99, 0x3e, 0x0d, 0x55, 0x22, 0xf2, 0x92, 0x69, 0x36, 0x6b, 0x66, 0x2a, 0x4f, 0xc4, 0x12, 0x2f,
+	0x21, 0xde, 0x50, 0xa7, 0x6b, 0x52, 0x24, 0xd1, 0x66, 0x56, 0xf4, 0x5a, 0x88, 0xc6, 0x92, 0xf0,
-	0x64, 0x0e, 0x6a, 0xd8, 0xa5, 0x99, 0x49, 0x06, 0xd0, 0x0a, 0xb1, 0xc4, 0xd4, 0x31, 0x9a, 0x98,
+	0x4d, 0x24, 0x79, 0x80, 0x33, 0x74, 0x58, 0x21, 0x92, 0x11, 0xf4, 0x24, 0xa6, 0x98, 0x05, 0x6e,
-	0x94, 0xdb, 0xd6, 0x29, 0xf4, 0x2f, 0x97, 0x62, 0x81, 0x3d, 0x66, 0x2a, 0x1d, 0x17, 0x4c, 0xaa,
+	0x17, 0x83, 0x4a, 0x99, 0x4e, 0x60, 0x78, 0xbe, 0x56, 0x4b, 0xac, 0xb1, 0x98, 0xd2, 0xa3, 0x0a,
-	0x7a, 0x67, 0x7c, 0x50, 0x8c, 0x81, 0xcf, 0xcb, 0x95, 0x37, 0xaf, 0x60, 0x7d, 0x06, 0x7b, 0x25,
+	0xc9, 0x64, 0x3f, 0x18, 0x3f, 0xa8, 0xda, 0xc0, 0xef, 0x79, 0x66, 0x2d, 0x33, 0xd0, 0xb7, 0xe0,
-	0x96, 0x95, 0x1a, 0x96, 0xa5, 0xa8, 0x3d, 0xaf, 0x42, 0xbd, 0x76, 0x6e, 0xd6, 0x44, 0x25, 0xe6,
+	0x5e, 0x0d, 0x25, 0x9b, 0x06, 0xa5, 0x06, 0x3a, 0x8a, 0x1a, 0xd0, 0x5b, 0xf7, 0x46, 0xa7, 0x26,
-	0x31, 0xa9, 0x8c, 0x9f, 0x5e, 0xff, 0x95, 0x0e, 0xdd, 0xb2, 0x87, 0xfc, 0x0c, 0x1d, 0x54, 0x4c,
+	0xb0, 0xf4, 0xc9, 0xc7, 0xf8, 0xff, 0xf3, 0xff, 0x66, 0x83, 0x53, 0xb7, 0x90, 0x2f, 0xe0, 0x00,
-	0xa9, 0xce, 0xe3, 0x94, 0xc6, 0x2c, 0x68, 0x28, 0xbb, 0x99, 0x15, 0xfe, 0x7f, 0x5c, 0xb9, 0x98,
+	0x27, 0x66, 0xa6, 0x2e, 0xd2, 0x1c, 0xc6, 0xab, 0x60, 0x18, 0xbf, 0x9c, 0x57, 0xf6, 0xef, 0x42,
-	0x3a, 0xb4, 0x9c, 0x42, 0x4c, 0x00, 0x66, 0x7b, 0x29, 0x1f, 0x6a, 0xdd, 0xa5, 0x25, 0x84, 0x58,
+	0xbd, 0x9c, 0x05, 0xac, 0x1e, 0x42, 0x3c, 0x00, 0xee, 0x47, 0x39, 0x1e, 0xce, 0xda, 0x61, 0x35,
-	0xd0, 0x2d, 0xac, 0xe9, 0x4a, 0xf3, 0x36, 0xad, 0x60, 0x64, 0x0c, 0xfb, 0x48, 0x39, 0xe3, 0x52,
+	0x0d, 0xa1, 0xe0, 0x54, 0xd2, 0x2c, 0x9b, 0x79, 0x9f, 0x35, 0x74, 0x64, 0x0c, 0x87, 0x08, 0x39,
-	0xba, 0xc1, 0x5c, 0x64, 0x6c, 0x4d, 0x64, 0xab, 0xf5, 0x91, 0x9f, 0xe0, 0xa0, 0x0e, 0x9f, 0x3a,
+	0x17, 0x5a, 0x87, 0xf1, 0x42, 0x15, 0x68, 0x5d, 0x44, 0x6b, 0xb5, 0x91, 0x4f, 0xe0, 0x41, 0x9b,
-	0xc6, 0x26, 0x56, 0x78, 0xc2, 0x6b, 0xbd, 0xd5, 0xa0, 0x53, 0x1a, 0x49, 0x1d, 0xba, 0xeb, 0xf0,
+	0x7e, 0x16, 0xb8, 0xbb, 0x98, 0xe1, 0x16, 0x2b, 0xfd, 0xcb, 0x82, 0x83, 0x5a, 0x4b, 0xe6, 0xd2,
-	0x40, 0xba, 0x32, 0x49, 0xb7, 0x34, 0xb7, 0xc9, 0xd7, 0xd0, 0x96, 0xae, 0xcf, 0x85, 0x64, 0x7e,
+	0xc3, 0x40, 0xc4, 0x3a, 0xd4, 0x9b, 0xfc, 0x95, 0x96, 0x32, 0x79, 0x17, 0xfa, 0x3a, 0x5c, 0x09,
-	0x84, 0xa3, 0x6d, 0xd0, 0x02, 0x50, 0x5e, 0xac, 0xf1, 0x57, 0x12, 0xf1, 0x74, 0xac, 0x02, 0x20,
+	0xa5, 0xf9, 0x2a, 0xc1, 0xd6, 0x76, 0x58, 0xa5, 0x30, 0x56, 0xcc, 0xf1, 0xcd, 0x26, 0x11, 0x79,
-	0xdf, 0x42, 0x4f, 0xdd, 0x38, 0xd7, 0x66, 0xd2, 0x0d, 0x83, 0x3f, 0x78, 0x82, 0xd3, 0x34, 0xe9,
+	0x5b, 0x95, 0x82, 0xbc, 0x0f, 0x03, 0xb3, 0x71, 0xa1, 0xcf, 0x75, 0x28, 0xe3, 0xaf, 0xc4, 0x06,
-	0x1a, 0xaa, 0x36, 0x52, 0x70, 0xbe, 0xea, 0xba, 0x4b, 0xf1, 0xdd, 0xba, 0x84, 0x5e, 0x55, 0x78,
+	0xbb, 0xe9, 0xb2, 0x2d, 0xad, 0x79, 0x91, 0x4a, 0x88, 0xac, 0x6a, 0x87, 0xe1, 0x99, 0x9e, 0xc3,
-	0x32, 0x7c, 0x7c, 0x4e, 0xdd, 0xea, 0x39, 0xa8, 0x6e, 0xdc, 0x79, 0xc0, 0xe4, 0x32, 0xe6, 0xe9,
+	0xa0, 0x39, 0x78, 0x72, 0x74, 0xf3, 0x9e, 0x9c, 0xe6, 0x3d, 0x98, 0x6a, 0xc2, 0x45, 0xcc, 0xf5,
-	0x31, 0x14, 0x80, 0x75, 0x0a, 0xfb, 0x75, 0x47, 0xa9, 0xb2, 0x62, 0x76, 0x53, 0x61, 0x2d, 0x80,
+	0x3a, 0x15, 0xf9, 0x35, 0x54, 0x0a, 0x3a, 0x81, 0xc3, 0xb6, 0xab, 0x34, 0x51, 0x29, 0xbf, 0x6c,
-	0xf4, 0x16, 0xea, 0xd9, 0x2d, 0xfc, 0xee, 0x4f, 0x68, 0x4d, 0xe2, 0xf8, 0xb7, 0xd0, 0xe1, 0x82,
+	0xa0, 0x56, 0x8a, 0x7c, 0x0b, 0xed, 0x72, 0x0b, 0x7f, 0x84, 0xc3, 0x79, 0x7d, 0xaa, 0x4f, 0x65,
-	0xf4, 0x00, 0xfe, 0x0e, 0xf8, 0x6d, 0xc4, 0x6d, 0xc9, 0x9d, 0x7e, 0x83, 0xf4, 0xd3, 0x9b, 0x75,
+	0xac, 0x0d, 0xcb, 0x7c, 0x0e, 0x4e, 0xf6, 0x50, 0x26, 0x22, 0x12, 0x5a, 0xdc, 0xdc, 0xc6, 0xb3,
-	0xee, 0x0a, 0xe1, 0x06, 0xf3, 0xbe, 0x46, 0x76, 0x53, 0xa1, 0x27, 0xb7, 0xae, 0x90, 0xa2, 0xaf,
+	0x9a, 0xf5, 0x79, 0x87, 0x35, 0xbc, 0x9f, 0xec, 0xc3, 0xee, 0x2f, 0x3c, 0x5a, 0x0b, 0xea, 0x81,
-	0x2b, 0x60, 0x12, 0xc7, 0x61, 0x7c, 0x71, 0x7d, 0x2d, 0xb8, 0xec, 0x3b, 0xe3, 0x37, 0x3a, 0x6c,
+	0x53, 0x77, 0xbc, 0xf1, 0x08, 0x3e, 0x85, 0xfb, 0x8d, 0xf4, 0xf3, 0x98, 0x27, 0x6a, 0x29, 0xb5,
-	0x62, 0x08, 0xf9, 0x05, 0x5a, 0xd9, 0xe2, 0x93, 0x2f, 0xeb, 0x3e, 0x06, 0xb8, 0x16, 0x83, 0x41,
+	0xd9, 0xc1, 0x00, 0x43, 0x82, 0x59, 0x90, 0x51, 0x4a, 0x9f, 0xd5, 0x34, 0xf4, 0x77, 0x0b, 0x9c,
-	0xed, 0x77, 0x62, 0xb5, 0x0d, 0xa7, 0xd0, 0xce, 0x77, 0x8b, 0x94, 0x02, 0xd7, 0xd7, 0x76, 0xf0,
+	0x22, 0x68, 0xc2, 0x35, 0x27, 0x9f, 0xc1, 0xbe, 0x9f, 0xd5, 0x9e, 0x13, 0x90, 0xb7, 0xf5, 0x72,
-	0x55, 0xad, 0xaf, 0xcc, 0x92, 0x2e, 0x5a, 0x95, 0xa5, 0xba, 0xa1, 0x55, 0x96, 0xf5, 0xcd, 0x3c,
+	0xb6, 0x3a, 0x64, 0x85, 0xbb, 0x21, 0x6f, 0x95, 0xa7, 0xc5, 0xc1, 0x34, 0xc8, 0xbb, 0xb5, 0x3a,
-	0x83, 0xad, 0x99, 0x8c, 0x39, 0xf3, 0x49, 0x29, 0xec, 0xd1, 0xe7, 0x6b, 0xf0, 0x9c, 0x73, 0xa4,
+	0x56, 0x06, 0x7c, 0xf0, 0x35, 0xf4, 0xa6, 0x69, 0xfa, 0x54, 0x06, 0x42, 0x91, 0x01, 0xc0, 0xb7,
-	0x1d, 0x6b, 0xbf, 0xfe, 0xf8, 0xee, 0xde, 0xd4, 0xee, 0xee, 0x4d, 0xed, 0xc3, 0xbd, 0xa9, 0xbd,
+	0xb1, 0x78, 0x95, 0x08, 0x5f, 0x8b, 0x60, 0xd8, 0x21, 0xc3, 0xfc, 0x65, 0xbe, 0x08, 0x95, 0x0a,
-	0x7e, 0x30, 0x1b, 0x77, 0x0f, 0x66, 0xe3, 0xfd, 0x83, 0xd9, 0xf8, 0x77, 0xf0, 0xf4, 0x5f, 0xde,
+	0xe3, 0xc5, 0xd0, 0x22, 0x77, 0xf3, 0x45, 0x9d, 0xbe, 0x0a, 0x95, 0x56, 0x43, 0xdb, 0x28, 0xa6,
-	0xd5, 0x16, 0xfe, 0xfc, 0xf0, 0x31, 0x00, 0x00, 0xff, 0xff, 0xaa, 0x60, 0x9b, 0x89, 0x17, 0x07,
+	0x69, 0x2a, 0xd3, 0xb3, 0x8b, 0x0b, 0x25, 0xf4, 0x30, 0x18, 0xff, 0x69, 0xc3, 0x2e, 0xba, 0x90,
+	0x2f, 0xa1, 0x57, 0x10, 0x27, 0x79, 0xa7, 0x8d, 0x4c, 0x91, 0x56, 0x46, 0xa3, 0x56, 0x9e, 0xcd,
+	0xd8, 0x64, 0x02, 0xfd, 0x92, 0x9b, 0x48, 0xcd, 0x71, 0x9b, 0xf6, 0x46, 0x0f, 0x5b, 0x6d, 0x75,
+	0x94, 0x9c, 0xa8, 0x9a, 0x28, 0x4d, 0x86, 0x6b, 0xa2, 0x6c, 0x33, 0xdb, 0x33, 0xd8, 0x9b, 0xeb,
+	0x54, 0xf0, 0x15, 0x79, 0xb8, 0xbd, 0x44, 0x35, 0xfa, 0x1f, 0xbd, 0xc9, 0x78, 0x6c, 0x3d, 0xb2,
+	0x9e, 0x7c, 0xfc, 0xf7, 0x95, 0x67, 0xbd, 0xbe, 0xf2, 0xac, 0x7f, 0xaf, 0x3c, 0xeb, 0x8f, 0x6b,
+	0xaf, 0xf3, 0xfa, 0xda, 0xeb, 0xfc, 0x73, 0xed, 0x75, 0xbe, 0x1f, 0xdd, 0xfe, 0x97, 0xe1, 0xe5,
+	0x1e, 0xfe, 0x7c, 0xf4, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x86, 0xe7, 0xfa, 0x57, 0x08,
 	0x00, 0x00,
 }
 
@@ -1469,6 +1693,170 @@ func (m *RawSpaceHeaderWithId) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	return len(dAtA) - i, nil
 }
 
+func (m *SpaceSettingsContent) 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 *SpaceSettingsContent) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *SpaceSettingsContent) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if m.Value != nil {
+		{
+			size := m.Value.Size()
+			i -= size
+			if _, err := m.Value.MarshalTo(dAtA[i:]); err != nil {
+				return 0, err
+			}
+		}
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *SpaceSettingsContent_ObjectDelete) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *SpaceSettingsContent_ObjectDelete) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	if m.ObjectDelete != nil {
+		{
+			size, err := m.ObjectDelete.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintSpacesync(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+func (m *ObjectDelete) 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 *ObjectDelete) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *ObjectDelete) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if len(m.Id) > 0 {
+		i -= len(m.Id)
+		copy(dAtA[i:], m.Id)
+		i = encodeVarintSpacesync(dAtA, i, uint64(len(m.Id)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *SpaceSettingsSnapshot) 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 *SpaceSettingsSnapshot) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *SpaceSettingsSnapshot) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if len(m.DeletedIds) > 0 {
+		for iNdEx := len(m.DeletedIds) - 1; iNdEx >= 0; iNdEx-- {
+			i -= len(m.DeletedIds[iNdEx])
+			copy(dAtA[i:], m.DeletedIds[iNdEx])
+			i = encodeVarintSpacesync(dAtA, i, uint64(len(m.DeletedIds[iNdEx])))
+			i--
+			dAtA[i] = 0xa
+		}
+	}
+	return len(dAtA) - i, nil
+}
+
+func (m *SettingsData) 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 *SettingsData) MarshalTo(dAtA []byte) (int, error) {
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *SettingsData) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
+	_ = i
+	var l int
+	_ = l
+	if m.Snapshot != nil {
+		{
+			size, err := m.Snapshot.MarshalToSizedBuffer(dAtA[:i])
+			if err != nil {
+				return 0, err
+			}
+			i -= size
+			i = encodeVarintSpacesync(dAtA, i, uint64(size))
+		}
+		i--
+		dAtA[i] = 0x12
+	}
+	if len(m.Content) > 0 {
+		for iNdEx := len(m.Content) - 1; iNdEx >= 0; iNdEx-- {
+			{
+				size, err := m.Content[iNdEx].MarshalToSizedBuffer(dAtA[:i])
+				if err != nil {
+					return 0, err
+				}
+				i -= size
+				i = encodeVarintSpacesync(dAtA, i, uint64(size))
+			}
+			i--
+			dAtA[i] = 0xa
+		}
+	}
+	return len(dAtA) - i, nil
+}
+
 func encodeVarintSpacesync(dAtA []byte, offset int, v uint64) int {
 	offset -= sovSpacesync(v)
 	base := offset
@@ -1734,6 +2122,77 @@ func (m *RawSpaceHeaderWithId) Size() (n int) {
 	return n
 }
 
+func (m *SpaceSettingsContent) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if m.Value != nil {
+		n += m.Value.Size()
+	}
+	return n
+}
+
+func (m *SpaceSettingsContent_ObjectDelete) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if m.ObjectDelete != nil {
+		l = m.ObjectDelete.Size()
+		n += 1 + l + sovSpacesync(uint64(l))
+	}
+	return n
+}
+func (m *ObjectDelete) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.Id)
+	if l > 0 {
+		n += 1 + l + sovSpacesync(uint64(l))
+	}
+	return n
+}
+
+func (m *SpaceSettingsSnapshot) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if len(m.DeletedIds) > 0 {
+		for _, s := range m.DeletedIds {
+			l = len(s)
+			n += 1 + l + sovSpacesync(uint64(l))
+		}
+	}
+	return n
+}
+
+func (m *SettingsData) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if len(m.Content) > 0 {
+		for _, e := range m.Content {
+			l = e.Size()
+			n += 1 + l + sovSpacesync(uint64(l))
+		}
+	}
+	if m.Snapshot != nil {
+		l = m.Snapshot.Size()
+		n += 1 + l + sovSpacesync(uint64(l))
+	}
+	return n
+}
+
 func sovSpacesync(x uint64) (n int) {
 	return (math_bits.Len64(x|1) + 6) / 7
 }
@@ -3422,6 +3881,375 @@ func (m *RawSpaceHeaderWithId) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
+func (m *SpaceSettingsContent) 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 ErrIntOverflowSpacesync
+			}
+			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: SpaceSettingsContent: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: SpaceSettingsContent: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ObjectDelete", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSpacesync
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthSpacesync
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthSpacesync
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			v := &ObjectDelete{}
+			if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			m.Value = &SpaceSettingsContent_ObjectDelete{v}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipSpacesync(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthSpacesync
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *ObjectDelete) 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 ErrIntOverflowSpacesync
+			}
+			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: ObjectDelete: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: ObjectDelete: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSpacesync
+				}
+				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 ErrInvalidLengthSpacesync
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthSpacesync
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Id = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipSpacesync(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthSpacesync
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *SpaceSettingsSnapshot) 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 ErrIntOverflowSpacesync
+			}
+			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: SpaceSettingsSnapshot: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: SpaceSettingsSnapshot: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field DeletedIds", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSpacesync
+				}
+				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 ErrInvalidLengthSpacesync
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthSpacesync
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.DeletedIds = append(m.DeletedIds, string(dAtA[iNdEx:postIndex]))
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipSpacesync(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthSpacesync
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *SettingsData) 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 ErrIntOverflowSpacesync
+			}
+			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: SettingsData: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: SettingsData: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Content", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSpacesync
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthSpacesync
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthSpacesync
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Content = append(m.Content, &SpaceSettingsContent{})
+			if err := m.Content[len(m.Content)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		case 2:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Snapshot", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowSpacesync
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthSpacesync
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthSpacesync
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Snapshot == nil {
+				m.Snapshot = &SpaceSettingsSnapshot{}
+			}
+			if err := m.Snapshot.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipSpacesync(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
+				return ErrInvalidLengthSpacesync
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
 func skipSpacesync(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0

common/commonspace/synctree/synctree.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/diffservice"
-	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/settingsservice"
 	spacestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/storage"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncservice/synchandler"
@@ -28,11 +27,10 @@ var (
 type SyncTree struct {
 	tree.ObjectTree
 	synchandler.SyncHandler
-	syncClient        SyncClient
+	syncClient SyncClient
-	listener          updatelistener.UpdateListener
+	listener   updatelistener.UpdateListener
-	deletedNotifiable settingsservice.DeletedDocumentNotifiable
+	isClosed   bool
-	isClosed          bool
+	isDeleted  bool
-	isDeleted         bool
 }
 
 var log = logger.NewNamed("commonspace.synctree").Sugar()
@@ -43,27 +41,25 @@ var buildObjectTree = tree.BuildObjectTree
 var createSyncClient = newSyncClient
 
 type CreateDeps struct {
-	SpaceId           string
+	SpaceId        string
-	Payload           tree.ObjectTreeCreatePayload
+	Payload        tree.ObjectTreeCreatePayload
-	Configuration     nodeconf.Configuration
+	Configuration  nodeconf.Configuration
-	HeadNotifiable    diffservice.HeadNotifiable
+	HeadNotifiable diffservice.HeadNotifiable
-	StreamPool        syncservice.StreamPool
+	StreamPool     syncservice.StreamPool
-	Listener          updatelistener.UpdateListener
+	Listener       updatelistener.UpdateListener
-	AclList           list.ACLList
+	AclList        list.ACLList
-	CreateStorage     storage.TreeStorageCreatorFunc
+	CreateStorage  storage.TreeStorageCreatorFunc
-	DeletedNotifiable settingsservice.DeletedDocumentNotifiable
 }
 
 type BuildDeps struct {
-	SpaceId           string
+	SpaceId        string
-	StreamPool        syncservice.StreamPool
+	StreamPool     syncservice.StreamPool
-	Configuration     nodeconf.Configuration
+	Configuration  nodeconf.Configuration
-	HeadNotifiable    diffservice.HeadNotifiable
+	HeadNotifiable diffservice.HeadNotifiable
-	Listener          updatelistener.UpdateListener
+	Listener       updatelistener.UpdateListener
-	AclList           list.ACLList
+	AclList        list.ACLList
-	SpaceStorage      spacestorage.SpaceStorage
+	SpaceStorage   spacestorage.SpaceStorage
-	TreeStorage       storage.TreeStorage
+	TreeStorage    storage.TreeStorage
-	DeletedNotifiable settingsservice.DeletedDocumentNotifiable
 }
 
 func DeriveSyncTree(ctx context.Context, deps CreateDeps) (t tree.ObjectTree, err error) {
@@ -78,10 +74,9 @@ func DeriveSyncTree(ctx context.Context, deps CreateDeps) (t tree.ObjectTree, er
 		sharedFactory,
 		deps.Configuration)
 	syncTree := &SyncTree{
-		ObjectTree:        t,
+		ObjectTree: t,
-		syncClient:        syncClient,
+		syncClient: syncClient,
-		listener:          deps.Listener,
+		listener:   deps.Listener,
-		deletedNotifiable: deps.DeletedNotifiable,
 	}
 	syncHandler := newSyncTreeHandler(syncTree, syncClient)
 	syncTree.SyncHandler = syncHandler
@@ -104,10 +99,9 @@ func CreateSyncTree(ctx context.Context, deps CreateDeps) (t tree.ObjectTree, er
 		GetRequestFactory(),
 		deps.Configuration)
 	syncTree := &SyncTree{
-		ObjectTree:        t,
+		ObjectTree: t,
-		syncClient:        syncClient,
+		syncClient: syncClient,
-		listener:          deps.Listener,
+		listener:   deps.Listener,
-		deletedNotifiable: deps.DeletedNotifiable,
 	}
 	syncHandler := newSyncTreeHandler(syncTree, syncClient)
 	syncTree.SyncHandler = syncHandler
@@ -185,10 +179,9 @@ func buildSyncTree(ctx context.Context, isFirstBuild bool, deps BuildDeps) (t tr
 		GetRequestFactory(),
 		deps.Configuration)
 	syncTree := &SyncTree{
-		ObjectTree:        t,
+		ObjectTree: t,
-		syncClient:        syncClient,
+		syncClient: syncClient,
-		listener:          deps.Listener,
+		listener:   deps.Listener,
-		deletedNotifiable: deps.DeletedNotifiable,
 	}
 	syncHandler := newSyncTreeHandler(syncTree, syncClient)
 	syncTree.SyncHandler = syncHandler
@@ -206,6 +199,20 @@ func buildSyncTree(ctx context.Context, isFirstBuild bool, deps BuildDeps) (t tr
 	return
 }
 
+func (s *SyncTree) IterateFrom(id string, convert tree.ChangeConvertFunc, iterate tree.ChangeIterateFunc) (err error) {
+	if err = s.checkAlive(); err != nil {
+		return
+	}
+	return s.ObjectTree.IterateFrom(id, convert, iterate)
+}
+
+func (s *SyncTree) Iterate(convert tree.ChangeConvertFunc, iterate tree.ChangeIterateFunc) (err error) {
+	if err = s.checkAlive(); err != nil {
+		return
+	}
+	return s.ObjectTree.Iterate(convert, iterate)
+}
+
 func (s *SyncTree) AddContent(ctx context.Context, content tree.SignableChangeContent) (res tree.AddResult, err error) {
 	if err = s.checkAlive(); err != nil {
 		return
@@ -247,12 +254,7 @@ func (s *SyncTree) AddRawChanges(ctx context.Context, changes ...*treechangeprot
 func (s *SyncTree) Delete() (err error) {
 	log.With("id", s.ID()).Debug("deleting sync tree")
 	s.Lock()
-	defer func() {
+	defer s.Unlock()
-		s.Unlock()
-		if err == nil {
-			s.deletedNotifiable.NotifyDeleted(s.ID())
-		}
-	}()
 	if err = s.checkAlive(); err != nil {
 		return
 	}
@@ -261,7 +263,6 @@ func (s *SyncTree) Delete() (err error) {
 		return
 	}
 	s.isDeleted = true
-
 	return
 }
 

common/commonspace/treegetter/treegetter.go

@@ -15,4 +15,5 @@ var ErrSpaceNotFound = errors.New("space not found")
 type TreeGetter interface {
 	app.ComponentRunnable
 	GetTree(ctx context.Context, spaceId, treeId string) (tree.ObjectTree, error)
+	DeleteTree(ctx context.Context, spaceId, treeId string) error
 }

common/pkg/acl/tree/changebuilder.go

@@ -155,12 +155,15 @@ func (c *changeBuilder) BuildContent(payload BuilderContent) (ch *Change, rawIdC
 		Identity:           payload.Identity,
 		IsSnapshot:         payload.IsSnapshot,
 	}
-
+	if payload.ReadKey != nil {
-	encrypted, err := payload.ReadKey.Encrypt(payload.Content)
+		encrypted, err := payload.ReadKey.Encrypt(payload.Content)
-	if err != nil {
+		if err != nil {
-		return
+			return
+		}
+		change.ChangesData = encrypted
+	} else {
+		change.ChangesData = payload.Content
 	}
-	change.ChangesData = encrypted
 
 	marshalledChange, err := proto.Marshal(change)
 	if err != nil {

common/pkg/acl/tree/objecttree.go

@@ -5,7 +5,7 @@ import (
 	"context"
 	"errors"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/common"
-	list2 "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/list"
+	list "github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/list"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/storage"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/pkg/acl/treechangeproto"
 	"github.com/anytypeio/go-anytype-infrastructure-experiments/common/util/keys/symmetric"
@@ -67,7 +67,7 @@ type objectTree struct {
 	validator       ObjectTreeValidator
 	rawChangeLoader *rawChangeLoader
 	treeBuilder     *treeBuilder
-	aclList         list2.ACLList
+	aclList         list.ACLList
 
 	id   string
 	root *treechangeproto.RawTreeChangeWithId
@@ -92,13 +92,13 @@ type objectTreeDeps struct {
 	treeStorage     storage.TreeStorage
 	validator       ObjectTreeValidator
 	rawChangeLoader *rawChangeLoader
-	aclList         list2.ACLList
+	aclList         list.ACLList
 }
 
 func defaultObjectTreeDeps(
 	rootChange *treechangeproto.RawTreeChangeWithId,
 	treeStorage storage.TreeStorage,
-	aclList list2.ACLList) objectTreeDeps {
+	aclList list.ACLList) objectTreeDeps {
 
 	keychain := common.NewKeychain()
 	changeBuilder := NewChangeBuilder(keychain, rootChange)
@@ -187,16 +187,23 @@ func (ot *objectTree) prepareBuilderContent(content SignableChangeContent) (cnt
 	ot.aclList.RLock()
 	defer ot.aclList.RUnlock()
 
-	state := ot.aclList.ACLState() // special method for own keys
+	var (
-	readKey, err := state.CurrentReadKey()
+		state       = ot.aclList.ACLState() // special method for own keys
-	if err != nil {
+		readKey     *symmetric.Key
-		return
+		readKeyHash uint64
+	)
+	if content.IsEncrypted {
+		readKeyHash = state.CurrentReadKeyHash()
+		readKey, err = state.CurrentReadKey()
+		if err != nil {
+			return
+		}
 	}
 	cnt = BuilderContent{
 		TreeHeadIds:        ot.tree.Heads(),
 		AclHeadId:          ot.aclList.Head().Id,
 		SnapshotBaseId:     ot.tree.RootId(),
-		CurrentReadKeyHash: state.CurrentReadKeyHash(),
+		CurrentReadKeyHash: readKeyHash,
 		Identity:           content.Identity,
 		IsSnapshot:         content.IsSnapshot,
 		SigningKey:         content.Key,
@@ -440,9 +447,25 @@ func (ot *objectTree) IterateFrom(id string, convert ChangeConvertFunc, iterate
 		ot.tree.Iterate(id, iterate)
 		return
 	}
+	decrypt := func(c *Change) (decrypted []byte, err error) {
+		// the change is not encrypted
+		if c.ReadKeyHash == 0 {
+			decrypted = c.Data
+			return
+		}
+		readKey, exists := ot.keys[c.ReadKeyHash]
+		if !exists {
+			err = list.ErrNoReadKey
+			return
+		}
+
+		decrypted, err = readKey.Decrypt(c.Data)
+		return
+	}
 
 	ot.tree.Iterate(ot.tree.RootId(), func(c *Change) (isContinue bool) {
 		var model any
+		// if already saved as a model
 		if c.Model != nil {
 			return iterate(c)
 		}
@@ -450,14 +473,9 @@ func (ot *objectTree) IterateFrom(id string, convert ChangeConvertFunc, iterate
 		if c.Id == ot.id {
 			return iterate(c)
 		}
-		readKey, exists := ot.keys[c.ReadKeyHash]
-		if !exists {
-			err = list2.ErrNoReadKey
-			return false
-		}
 
 		var decrypted []byte
-		decrypted, err = readKey.Decrypt(c.Data)
+		decrypted, err = decrypt(c)
 		if err != nil {
 			return false
 		}

common/pkg/acl/tree/objecttreefactory.go

@@ -14,10 +14,11 @@ import (
 )
 
 type ObjectTreeCreatePayload struct {
-	SignKey    signingkey.PrivKey
+	SignKey     signingkey.PrivKey
-	ChangeType string
+	ChangeType  string
-	SpaceId    string
+	SpaceId     string
-	Identity   []byte
+	Identity    []byte
+	IsEncrypted bool
 }
 
 func BuildObjectTree(treeStorage storage2.TreeStorage, aclList list.ACLList) (ObjectTree, error) {

common/pkg/acl/tree/signablecontent.go

@@ -5,8 +5,9 @@ import (
 )
 
 type SignableChangeContent struct {
-	Data       []byte
+	Data        []byte
-	Key        signingkey.PrivKey
+	Key         signingkey.PrivKey
-	Identity   []byte
+	Identity    []byte
-	IsSnapshot bool
+	IsSnapshot  bool
+	IsEncrypted bool
 }

node/nodespace/nodecache/treecache.go

@@ -70,3 +70,16 @@ func (c *treeCache) GetTree(ctx context.Context, spaceId, id string) (tr tree.Ob
 	tr = value.(tree.ObjectTree)
 	return
 }
+
+func (c *treeCache) DeleteTree(ctx context.Context, spaceId, treeId string) (err error) {
+	tr, err := c.GetTree(ctx, spaceId, treeId)
+	if err != nil {
+		return
+	}
+	err = tr.Delete()
+	if err != nil {
+		return
+	}
+	_, err = c.cache.Remove(treeId)
+	return
+}