Merge pull request #85 from anytypeio/GO-1227-add-custom-timestamps

nodeconf update interval config

.github/dependabot.yml

@@ -10,5 +10,5 @@ updates:
     schedule:
       interval: "weekly"
     ignore:
-      - dependency-name: "github.com/anyproto/go-chash"
+      - dependency-name: "github.com/anytypeio/go-chash"
       

.github/workflows/coverage.yml

@@ -7,7 +7,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     env:
-      GOPRIVATE: github.com/anyproto
+      GOPRIVATE: github.com/anytypeio
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3

LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 Any Association
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
-OR OTHER DEALINGS IN THE SOFTWARE.

Makefile

@@ -1,5 +1,5 @@
 .PHONY: proto test deps
-export GOPRIVATE=github.com/anyproto
+export GOPRIVATE=github.com/anytypeio
 export PATH:=deps:$(PATH)
 
 proto:
@@ -8,8 +8,8 @@ proto:
 	@$(eval P_ACL_RECORDS_PATH_PB := commonspace/object/acl/aclrecordproto)
 	@$(eval P_TREE_CHANGES_PATH_PB := commonspace/object/tree/treechangeproto)
 	@$(eval P_CRYPTO_PATH_PB := util/crypto/cryptoproto)
-	@$(eval P_ACL_RECORDS := M$(P_ACL_RECORDS_PATH_PB)/protos/aclrecord.proto=github.com/anyproto/any-sync/$(P_ACL_RECORDS_PATH_PB))
-	@$(eval P_TREE_CHANGES := M$(P_TREE_CHANGES_PATH_PB)/protos/treechange.proto=github.com/anyproto/any-sync/$(P_TREE_CHANGES_PATH_PB))
+	@$(eval P_ACL_RECORDS := M$(P_ACL_RECORDS_PATH_PB)/protos/aclrecord.proto=github.com/anytypeio/any-sync/$(P_ACL_RECORDS_PATH_PB))
+	@$(eval P_TREE_CHANGES := M$(P_TREE_CHANGES_PATH_PB)/protos/treechange.proto=github.com/anytypeio/any-sync/$(P_TREE_CHANGES_PATH_PB))
 
 	protoc --gogofaster_out=:. $(P_ACL_RECORDS_PATH_PB)/protos/*.proto
 	protoc --gogofaster_out=:. $(P_TREE_CHANGES_PATH_PB)/protos/*.proto

accountservice/accountservice.go

@@ -1,9 +1,9 @@
-//go:generate mockgen -destination mock_accountservice/mock_accountservice.go github.com/anyproto/any-sync/accountservice Service
+//go:generate mockgen -destination mock_accountservice/mock_accountservice.go github.com/anytypeio/any-sync/accountservice Service
 package accountservice
 
 import (
-	"github.com/anyproto/any-sync/app"
-	"github.com/anyproto/any-sync/commonspace/object/accountdata"
+	"github.com/anytypeio/any-sync/app"
+	"github.com/anytypeio/any-sync/commonspace/object/accountdata"
 )
 
 const CName = "common.accountservice"

accountservice/mock_accountservice/helper.go

@@ -1,8 +1,8 @@
 package mock_accountservice
 
 import (
-	"github.com/anyproto/any-sync/accountservice"
-	"github.com/anyproto/any-sync/commonspace/object/accountdata"
+	"github.com/anytypeio/any-sync/accountservice"
+	"github.com/anytypeio/any-sync/commonspace/object/accountdata"
 	"github.com/golang/mock/gomock"
 )
 

accountservice/mock_accountservice/mock_accountservice.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/anyproto/any-sync/accountservice (interfaces: Service)
+// Source: github.com/anytypeio/any-sync/accountservice (interfaces: Service)
 
 // Package mock_accountservice is a generated GoMock package.
 package mock_accountservice
@@ -7,8 +7,8 @@ package mock_accountservice
 import (
 	reflect "reflect"
 
-	app "github.com/anyproto/any-sync/app"
-	accountdata "github.com/anyproto/any-sync/commonspace/object/accountdata"
+	app "github.com/anytypeio/any-sync/app"
+	accountdata "github.com/anytypeio/any-sync/commonspace/object/accountdata"
 	gomock "github.com/golang/mock/gomock"
 )
 

app/app.go

@@ -4,11 +4,10 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/anyproto/any-sync/app/logger"
+	"github.com/anytypeio/any-sync/app/logger"
 	"go.uber.org/zap"
 	"os"
 	"runtime"
-	"runtime/debug"
 	"strings"
 	"sync"
 	"time"
@@ -16,8 +15,8 @@ import (
 
 var (
 	// values of this vars will be defined while compilation
-	AppName, GitCommit, GitBranch, GitState, GitSummary, BuildDate string
-	name                                                           string
+	GitCommit, GitBranch, GitState, GitSummary, BuildDate string
+	name                                                  string
 )
 
 var (
@@ -55,12 +54,11 @@ type ComponentStatable interface {
 // App is the central part of the application
 // It contains and manages all components
 type App struct {
-	components     []Component
-	mu             sync.RWMutex
-	startStat      Stat
-	stopStat       Stat
-	deviceState    int
-	anySyncVersion string
+	components  []Component
+	mu          sync.RWMutex
+	startStat   Stat
+	stopStat    Stat
+	deviceState int
 }
 
 // Name returns app name
@@ -68,10 +66,6 @@ func (app *App) Name() string {
 	return name
 }
 
-func (app *App) AppName() string {
-	return AppName
-}
-
 // Version return app version
 func (app *App) Version() string {
 	return GitSummary
@@ -263,7 +257,7 @@ func (app *App) Close(ctx context.Context) error {
 		case <-time.After(StopWarningAfter):
 			statLogger(app.stopStat, log).
 				With(zap.String("in_progress", currentComponentStopping)).
-				Warn("components close in progress")
+			 	Warn("components close in progress")
 		}
 	}()
 	go func() {
@@ -317,20 +311,3 @@ func (app *App) SetDeviceState(state int) {
 		}
 	}
 }
-
-var onceVersion sync.Once
-
-func (app *App) AnySyncVersion() string {
-	onceVersion.Do(func() {
-		info, ok := debug.ReadBuildInfo()
-		if ok {
-			for _, mod := range info.Deps {
-				if mod.Path == "github.com/anyproto/any-sync" {
-					app.anySyncVersion = mod.Version
-					break
-				}
-			}
-		}
-	})
-	return app.anySyncVersion
-}

app/ldiff/diff.go

@@ -1,7 +1,7 @@
 // Package ldiff provides a container of elements with fixed id and changeable content.
 // Diff can calculate the difference with another diff container (you can make it remote) with minimum hops and traffic.
 //
-//go:generate mockgen -destination mock_ldiff/mock_ldiff.go github.com/anyproto/any-sync/app/ldiff Diff,Remote
+//go:generate mockgen -destination mock_ldiff/mock_ldiff.go github.com/anytypeio/any-sync/app/ldiff Diff,Remote
 package ldiff
 
 import (

app/ldiff/diff_test.go

@@ -3,9 +3,9 @@ package ldiff
 import (
 	"context"
 	"fmt"
-	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"gopkg.in/mgo.v2/bson"
 	"math"
 	"sort"
 	"testing"
@@ -44,7 +44,7 @@ func TestDiff_Diff(t *testing.T) {
 		d2 := New(16, 16)
 		for i := 0; i < 1000; i++ {
 			id := fmt.Sprint(i)
-			head := uuid.NewString()
+			head := bson.NewObjectId().Hex()
 			d1.Set(Element{
 				Id:   id,
 				Head: head,
@@ -92,7 +92,7 @@ func TestDiff_Diff(t *testing.T) {
 		for i := 0; i < 10; i++ {
 			d2.Set(Element{
 				Id:   fmt.Sprint(i),
-				Head: uuid.NewString(),
+				Head: bson.NewObjectId().Hex(),
 			})
 		}
 
@@ -108,7 +108,7 @@ func TestDiff_Diff(t *testing.T) {
 		for i := 0; i < 10; i++ {
 			d2.Set(Element{
 				Id:   fmt.Sprint(i),
-				Head: uuid.NewString(),
+				Head: bson.NewObjectId().Hex(),
 			})
 		}
 		var cancel func()
@@ -123,7 +123,7 @@ func BenchmarkDiff_Ranges(b *testing.B) {
 	d := New(16, 16)
 	for i := 0; i < 10000; i++ {
 		id := fmt.Sprint(i)
-		head := uuid.NewString()
+		head := bson.NewObjectId().Hex()
 		d.Set(Element{
 			Id:   id,
 			Head: head,

app/ldiff/mock_ldiff/mock_ldiff.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/anyproto/any-sync/app/ldiff (interfaces: Diff,Remote)
+// Source: github.com/anytypeio/any-sync/app/ldiff (interfaces: Diff,Remote)
 
 // Package mock_ldiff is a generated GoMock package.
 package mock_ldiff
@@ -8,7 +8,7 @@ import (
 	context "context"
 	reflect "reflect"
 
-	ldiff "github.com/anyproto/any-sync/app/ldiff"
+	ldiff "github.com/anytypeio/any-sync/app/ldiff"
 	gomock "github.com/golang/mock/gomock"
 )
 

app/logger/config.go

@@ -7,7 +7,7 @@ import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 
-	"github.com/anyproto/any-sync/util/slice"
+	"github.com/anytypeio/any-sync/util/slice"
 )
 
 type LogFormat int

app/ocache/ocache.go

@@ -3,7 +3,7 @@ package ocache
 import (
 	"context"
 	"errors"
-	"github.com/anyproto/any-sync/app/logger"
+	"github.com/anytypeio/any-sync/app/logger"
 	"go.uber.org/zap"
 	"sync"
 	"time"

commonfile/fileblockstore/fileblockstore.go

@@ -2,8 +2,8 @@ package fileblockstore
 
 import (
 	"context"
-	"github.com/anyproto/any-sync/app/logger"
-	"github.com/anyproto/any-sync/commonfile/fileproto/fileprotoerr"
+	"github.com/anytypeio/any-sync/app/logger"
+	"github.com/anytypeio/any-sync/commonfile/fileproto/fileprotoerr"
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 )

commonfile/fileproto/fileprotoerr/fileprotoerr.go

@@ -2,8 +2,8 @@ package fileprotoerr
 
 import (
 	"fmt"
-	"github.com/anyproto/any-sync/commonfile/fileproto"
-	"github.com/anyproto/any-sync/net/rpc/rpcerr"
+	"github.com/anytypeio/any-sync/commonfile/fileproto"
+	"github.com/anytypeio/any-sync/net/rpc/rpcerr"
 )
 
 var (

commonfile/fileservice/blockservice.go

@@ -2,7 +2,7 @@ package fileservice
 
 import (
 	"context"
-	"github.com/anyproto/any-sync/commonfile/fileblockstore"
+	"github.com/anytypeio/any-sync/commonfile/fileblockstore"
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-blockservice"
 	"github.com/ipfs/go-cid"

commonfile/fileservice/fileservice.go

@@ -3,9 +3,9 @@ package fileservice
 import (
 	"context"
 	"fmt"
-	"github.com/anyproto/any-sync/app"
-	"github.com/anyproto/any-sync/app/logger"
-	"github.com/anyproto/any-sync/commonfile/fileblockstore"
+	"github.com/anytypeio/any-sync/app"
+	"github.com/anytypeio/any-sync/app/logger"
+	"github.com/anytypeio/any-sync/commonfile/fileblockstore"
 	"github.com/ipfs/go-cid"
 	chunker "github.com/ipfs/go-ipfs-chunker"
 	ipld "github.com/ipfs/go-ipld-format"

commonspace/commongetter.go

@@ -2,9 +2,9 @@ package commonspace
 
 import (
 	"context"
-	"github.com/anyproto/any-sync/commonspace/object/syncobjectgetter"
-	"github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
-	"github.com/anyproto/any-sync/commonspace/object/treemanager"
+	"github.com/anytypeio/any-sync/commonspace/object/syncobjectgetter"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/objecttree"
+	"github.com/anytypeio/any-sync/commonspace/object/treemanager"
 	"sync/atomic"
 )
 

commonspace/commonstorage.go

@@ -1,8 +1,8 @@
 package commonspace
 
 import (
-	"github.com/anyproto/any-sync/commonspace/object/tree/treestorage"
-	"github.com/anyproto/any-sync/commonspace/spacestorage"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treestorage"
+	"github.com/anytypeio/any-sync/commonspace/spacestorage"
 )
 
 type commonStorage struct {

commonspace/credentialprovider/credentialprovider.go

@@ -1,9 +1,9 @@
-//go:generate mockgen -destination mock_credentialprovider/mock_credentialprovider.go github.com/anyproto/any-sync/commonspace/credentialprovider CredentialProvider
+//go:generate mockgen -destination mock_credentialprovider/mock_credentialprovider.go github.com/anytypeio/any-sync/commonspace/credentialprovider CredentialProvider
 package credentialprovider
 
 import (
 	"context"
-	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
+	"github.com/anytypeio/any-sync/commonspace/spacesyncproto"
 )
 
 const CName = "common.commonspace.credentialprovider"

commonspace/credentialprovider/mock_credentialprovider/mock_credentialprovider.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/anyproto/any-sync/commonspace/credentialprovider (interfaces: CredentialProvider)
+// Source: github.com/anytypeio/any-sync/commonspace/credentialprovider (interfaces: CredentialProvider)
 
 // Package mock_credentialprovider is a generated GoMock package.
 package mock_credentialprovider
@@ -8,7 +8,7 @@ import (
 	context "context"
 	reflect "reflect"
 
-	spacesyncproto "github.com/anyproto/any-sync/commonspace/spacesyncproto"
+	spacesyncproto "github.com/anytypeio/any-sync/commonspace/spacesyncproto"
 	gomock "github.com/golang/mock/gomock"
 )
 

commonspace/deletion_test.go

@@ -1,271 +0,0 @@
-package commonspace
-
-import (
-	"context"
-	"fmt"
-	"github.com/anyproto/any-sync/commonspace/object/accountdata"
-	"github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treestorage"
-	"github.com/anyproto/any-sync/commonspace/settings"
-	"github.com/anyproto/any-sync/commonspace/settings/settingsstate"
-	"github.com/anyproto/any-sync/commonspace/spacestorage"
-	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
-	"github.com/anyproto/any-sync/util/crypto"
-	"github.com/stretchr/testify/require"
-	"math/rand"
-	"testing"
-	"time"
-)
-
-func addIncorrectSnapshot(settingsObject settings.SettingsObject, acc *accountdata.AccountKeys, partialIds map[string]struct{}, newId string) (err error) {
-	factory := settingsstate.NewChangeFactory()
-	bytes, err := factory.CreateObjectDeleteChange(newId, &settingsstate.State{DeletedIds: partialIds}, true)
-	if err != nil {
-		return
-	}
-	ch, err := settingsObject.PrepareChange(objecttree.SignableChangeContent{
-		Data:        bytes,
-		Key:         acc.SignKey,
-		IsSnapshot:  true,
-		IsEncrypted: false,
-		Timestamp:   time.Now().Unix(),
-	})
-	if err != nil {
-		return
-	}
-	res, err := settingsObject.AddRawChanges(context.Background(), objecttree.RawChangesPayload{
-		NewHeads:   []string{ch.Id},
-		RawChanges: []*treechangeproto.RawTreeChangeWithId{ch},
-	})
-	if err != nil {
-		return
-	}
-	if res.Mode != objecttree.Rebuild {
-		return fmt.Errorf("incorrect mode: %d", res.Mode)
-	}
-	return
-}
-
-func TestSpaceDeleteIds(t *testing.T) {
-	fx := newFixture(t)
-	acc := fx.account.Account()
-	rk := crypto.NewAES()
-	ctx := context.Background()
-	totalObjs := 1500
-
-	// creating space
-	sp, err := fx.spaceService.CreateSpace(ctx, SpaceCreatePayload{
-		SigningKey:     acc.SignKey,
-		SpaceType:      "type",
-		ReadKey:        rk.Bytes(),
-		ReplicationKey: 10,
-		MasterKey:      acc.PeerKey,
-	})
-	require.NoError(t, err)
-	require.NotNil(t, sp)
-
-	// initializing space
-	spc, err := fx.spaceService.NewSpace(ctx, sp)
-	require.NoError(t, err)
-	require.NotNil(t, spc)
-	// adding space to tree manager
-	fx.treeManager.space = spc
-	err = spc.Init(ctx)
-	require.NoError(t, err)
-
-	var ids []string
-	for i := 0; i < totalObjs; i++ {
-		// creating a tree
-		bytes := make([]byte, 32)
-		rand.Read(bytes)
-		doc, err := spc.CreateTree(ctx, objecttree.ObjectTreeCreatePayload{
-			PrivKey:     acc.SignKey,
-			ChangeType:  "some",
-			SpaceId:     spc.Id(),
-			IsEncrypted: false,
-			Seed:        bytes,
-			Timestamp:   time.Now().Unix(),
-		})
-		require.NoError(t, err)
-		tr, err := spc.PutTree(ctx, doc, nil)
-		require.NoError(t, err)
-		ids = append(ids, tr.Id())
-		tr.Close()
-	}
-	// deleting trees
-	for _, id := range ids {
-		err = spc.DeleteTree(ctx, id)
-		require.NoError(t, err)
-	}
-	time.Sleep(3 * time.Second)
-	spc.Close()
-	require.Equal(t, len(ids), len(fx.treeManager.deletedIds))
-}
-
-func createTree(t *testing.T, ctx context.Context, spc Space, acc *accountdata.AccountKeys) string {
-	bytes := make([]byte, 32)
-	rand.Read(bytes)
-	doc, err := spc.CreateTree(ctx, objecttree.ObjectTreeCreatePayload{
-		PrivKey:     acc.SignKey,
-		ChangeType:  "some",
-		SpaceId:     spc.Id(),
-		IsEncrypted: false,
-		Seed:        bytes,
-		Timestamp:   time.Now().Unix(),
-	})
-	require.NoError(t, err)
-	tr, err := spc.PutTree(ctx, doc, nil)
-	require.NoError(t, err)
-	tr.Close()
-	return tr.Id()
-}
-
-func TestSpaceDeleteIdsIncorrectSnapshot(t *testing.T) {
-	fx := newFixture(t)
-	acc := fx.account.Account()
-	rk := crypto.NewAES()
-	ctx := context.Background()
-	totalObjs := 1500
-	partialObjs := 300
-
-	// creating space
-	sp, err := fx.spaceService.CreateSpace(ctx, SpaceCreatePayload{
-		SigningKey:     acc.SignKey,
-		SpaceType:      "type",
-		ReadKey:        rk.Bytes(),
-		ReplicationKey: 10,
-		MasterKey:      acc.PeerKey,
-	})
-	require.NoError(t, err)
-	require.NotNil(t, sp)
-
-	// initializing space
-	spc, err := fx.spaceService.NewSpace(ctx, sp)
-	require.NoError(t, err)
-	require.NotNil(t, spc)
-	// adding space to tree manager
-	fx.treeManager.space = spc
-	err = spc.Init(ctx)
-	require.NoError(t, err)
-
-	settingsObject := spc.(*space).settingsObject
-	var ids []string
-	for i := 0; i < totalObjs; i++ {
-		id := createTree(t, ctx, spc, acc)
-		ids = append(ids, id)
-	}
-	// copying storage, so we will have all the trees locally
-	inmemory := spc.Storage().(*commonStorage).SpaceStorage.(*spacestorage.InMemorySpaceStorage)
-	storageCopy := inmemory.CopyStorage()
-	treesCopy := inmemory.AllTrees()
-
-	// deleting trees
-	for _, id := range ids {
-		err = spc.DeleteTree(ctx, id)
-		require.NoError(t, err)
-	}
-	mapIds := map[string]struct{}{}
-	for _, id := range ids[:partialObjs] {
-		mapIds[id] = struct{}{}
-	}
-	// adding snapshot that breaks the state
-	err = addIncorrectSnapshot(settingsObject, acc, mapIds, ids[partialObjs])
-	require.NoError(t, err)
-	// copying the contents of the settings tree
-	treesCopy[settingsObject.Id()] = settingsObject.Storage()
-	storageCopy.SetTrees(treesCopy)
-	spc.Close()
-	time.Sleep(100 * time.Millisecond)
-	// now we replace the storage, so the trees are back, but the settings object says that they are deleted
-	fx.storageProvider.(*spacestorage.InMemorySpaceStorageProvider).SetStorage(storageCopy)
-
-	spc, err = fx.spaceService.NewSpace(ctx, sp)
-	require.NoError(t, err)
-	require.NotNil(t, spc)
-	fx.treeManager.space = spc
-	fx.treeManager.deletedIds = nil
-	err = spc.Init(ctx)
-	require.NoError(t, err)
-
-	// waiting until everything is deleted
-	time.Sleep(3 * time.Second)
-	require.Equal(t, len(ids), len(fx.treeManager.deletedIds))
-
-	// checking that new snapshot will contain all the changes
-	settingsObject = spc.(*space).settingsObject
-	settings.DoSnapshot = func(treeLen int) bool {
-		return true
-	}
-	id := createTree(t, ctx, spc, acc)
-	err = spc.DeleteTree(ctx, id)
-	require.NoError(t, err)
-	delIds := settingsObject.Root().Model.(*spacesyncproto.SettingsData).Snapshot.DeletedIds
-	require.Equal(t, totalObjs+1, len(delIds))
-}
-
-func TestSpaceDeleteIdsMarkDeleted(t *testing.T) {
-	fx := newFixture(t)
-	acc := fx.account.Account()
-	rk := crypto.NewAES()
-	ctx := context.Background()
-	totalObjs := 1500
-
-	// creating space
-	sp, err := fx.spaceService.CreateSpace(ctx, SpaceCreatePayload{
-		SigningKey:     acc.SignKey,
-		SpaceType:      "type",
-		ReadKey:        rk.Bytes(),
-		ReplicationKey: 10,
-		MasterKey:      acc.PeerKey,
-	})
-	require.NoError(t, err)
-	require.NotNil(t, sp)
-
-	// initializing space
-	spc, err := fx.spaceService.NewSpace(ctx, sp)
-	require.NoError(t, err)
-	require.NotNil(t, spc)
-	// adding space to tree manager
-	fx.treeManager.space = spc
-	err = spc.Init(ctx)
-	require.NoError(t, err)
-
-	settingsObject := spc.(*space).settingsObject
-	var ids []string
-	for i := 0; i < totalObjs; i++ {
-		id := createTree(t, ctx, spc, acc)
-		ids = append(ids, id)
-	}
-	// copying storage, so we will have the same contents, except for empty trees
-	inmemory := spc.Storage().(*commonStorage).SpaceStorage.(*spacestorage.InMemorySpaceStorage)
-	storageCopy := inmemory.CopyStorage()
-
-	// deleting trees, this will prepare the document to have all the deletion changes
-	for _, id := range ids {
-		err = spc.DeleteTree(ctx, id)
-		require.NoError(t, err)
-	}
-	treesMap := map[string]treestorage.TreeStorage{}
-	// copying the contents of the settings tree
-	treesMap[settingsObject.Id()] = settingsObject.Storage()
-	storageCopy.SetTrees(treesMap)
-	spc.Close()
-	time.Sleep(100 * time.Millisecond)
-	// now we replace the storage, so the trees are back, but the settings object says that they are deleted
-	fx.storageProvider.(*spacestorage.InMemorySpaceStorageProvider).SetStorage(storageCopy)
-
-	spc, err = fx.spaceService.NewSpace(ctx, sp)
-	require.NoError(t, err)
-	require.NotNil(t, spc)
-	fx.treeManager.space = spc
-	fx.treeManager.deletedIds = nil
-	fx.treeManager.markedIds = nil
-	err = spc.Init(ctx)
-	require.NoError(t, err)
-
-	// waiting until everything is deleted
-	time.Sleep(3 * time.Second)
-	require.Equal(t, len(ids), len(fx.treeManager.markedIds))
-	require.Zero(t, len(fx.treeManager.deletedIds))
-}

commonspace/headsync/diffsyncer.go

@@ -3,17 +3,18 @@ package headsync
 import (
 	"context"
 	"fmt"
-	"github.com/anyproto/any-sync/app/ldiff"
-	"github.com/anyproto/any-sync/app/logger"
-	"github.com/anyproto/any-sync/commonspace/credentialprovider"
-	"github.com/anyproto/any-sync/commonspace/object/treemanager"
-	"github.com/anyproto/any-sync/commonspace/peermanager"
-	"github.com/anyproto/any-sync/commonspace/settings/settingsstate"
-	"github.com/anyproto/any-sync/commonspace/spacestorage"
-	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
-	"github.com/anyproto/any-sync/commonspace/syncstatus"
-	"github.com/anyproto/any-sync/net/peer"
-	"github.com/anyproto/any-sync/net/rpc/rpcerr"
+	"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/treemanager"
+	"github.com/anytypeio/any-sync/commonspace/peermanager"
+	"github.com/anytypeio/any-sync/commonspace/settings/settingsstate"
+	"github.com/anytypeio/any-sync/commonspace/spacestorage"
+	"github.com/anytypeio/any-sync/commonspace/spacesyncproto"
+	"github.com/anytypeio/any-sync/commonspace/syncstatus"
+	"github.com/anytypeio/any-sync/net/peer"
+	"github.com/anytypeio/any-sync/net/rpc/rpcerr"
 	"go.uber.org/zap"
 	"time"
 )
@@ -23,7 +24,6 @@ type DiffSyncer interface {
 	RemoveObjects(ids []string)
 	UpdateHeads(id string, heads []string)
 	Init(deletionState settingsstate.ObjectDeletionState)
-	Close() error
 }
 
 func newDiffSyncer(
@@ -39,7 +39,7 @@ func newDiffSyncer(
 	return &diffSyncer{
 		diff:               diff,
 		spaceId:            spaceId,
-		treeManager:        cache,
+		cache:              cache,
 		storage:            storage,
 		peerManager:        peerManager,
 		clientFactory:      clientFactory,
@@ -53,20 +53,18 @@ type diffSyncer struct {
 	spaceId            string
 	diff               ldiff.Diff
 	peerManager        peermanager.PeerManager
-	treeManager        treemanager.TreeManager
+	cache              treemanager.TreeManager
 	storage            spacestorage.SpaceStorage
 	clientFactory      spacesyncproto.ClientFactory
 	log                logger.CtxLogger
 	deletionState      settingsstate.ObjectDeletionState
 	credentialProvider credentialprovider.CredentialProvider
 	syncStatus         syncstatus.StatusUpdater
-	treeSyncer         treemanager.TreeSyncer
 }
 
 func (d *diffSyncer) Init(deletionState settingsstate.ObjectDeletionState) {
 	d.deletionState = deletionState
 	d.deletionState.AddObserver(d.RemoveObjects)
-	d.treeSyncer = d.treeManager.NewTreeSyncer(d.spaceId, d.treeManager)
 }
 
 func (d *diffSyncer) RemoveObjects(ids []string) {
@@ -126,7 +124,7 @@ func (d *diffSyncer) syncWithPeer(ctx context.Context, p peer.Peer) (err error)
 	if err != nil && err != spacesyncproto.ErrSpaceMissing {
 		if err == spacesyncproto.ErrSpaceIsDeleted {
 			d.log.Debug("got space deleted while syncing")
-			d.treeSyncer.SyncAll(ctx, p.Id(), []string{d.storage.SpaceSettingsId()}, nil)
+			d.syncTrees(ctx, p.Id(), []string{d.storage.SpaceSettingsId()})
 		}
 		d.syncStatus.SetNodesOnline(p.Id(), false)
 		return fmt.Errorf("diff error: %v", err)
@@ -139,24 +137,45 @@ func (d *diffSyncer) syncWithPeer(ctx context.Context, p peer.Peer) (err error)
 
 	totalLen := len(newIds) + len(changedIds) + len(removedIds)
 	// not syncing ids which were removed through settings document
-	missingIds := d.deletionState.Filter(newIds)
-	existingIds := append(d.deletionState.Filter(removedIds), d.deletionState.Filter(changedIds)...)
+	filteredIds := d.deletionState.FilterJoin(newIds, changedIds, removedIds)
 
-	d.syncStatus.RemoveAllExcept(p.Id(), existingIds, stateCounter)
+	d.syncStatus.RemoveAllExcept(p.Id(), filteredIds, stateCounter)
+
+	d.syncTrees(ctx, p.Id(), filteredIds)
 
-	err = d.treeSyncer.SyncAll(ctx, p.Id(), existingIds, missingIds)
-	if err != nil {
-		return err
-	}
 	d.log.Info("sync done:", zap.Int("newIds", len(newIds)),
 		zap.Int("changedIds", len(changedIds)),
 		zap.Int("removedIds", len(removedIds)),
-		zap.Int("already deleted ids", totalLen-len(existingIds)-len(missingIds)),
+		zap.Int("already deleted ids", totalLen-len(filteredIds)),
 		zap.String("peerId", p.Id()),
 	)
 	return
 }
 
+func (d *diffSyncer) syncTrees(ctx context.Context, peerId string, trees []string) {
+	for _, tId := range trees {
+		tree, err := d.cache.GetTree(ctx, d.spaceId, tId)
+		if err != nil {
+			d.log.InfoCtx(ctx, "can't load tree", zap.Error(err))
+			continue
+		}
+		syncTree, ok := tree.(synctree.SyncTree)
+		if !ok {
+			d.log.InfoCtx(ctx, "not a sync tree", zap.String("objectId", tId))
+			continue
+		}
+		// the idea why we call it directly is that if we try to get it from cache
+		// it may be already there (i.e. loaded)
+		// and build func will not be called, thus we won't sync the tree
+		// therefore we just do it manually
+		if err = syncTree.SyncWithPeer(ctx, peerId); err != nil {
+			d.log.WarnCtx(ctx, "synctree.SyncWithPeer error", zap.Error(err), zap.String("treeId", tId))
+		} else {
+			d.log.DebugCtx(ctx, "success synctree.SyncWithPeer", zap.String("treeId", tId))
+		}
+	}
+}
+
 func (d *diffSyncer) sendPushSpaceRequest(ctx context.Context, peerId string, cl spacesyncproto.DRPCSpaceSyncClient) (err error) {
 	aclStorage, err := d.storage.AclStorage()
 	if err != nil {
@@ -219,7 +238,3 @@ func (d *diffSyncer) subscribe(ctx context.Context, peerId string) (err error) {
 		Payload: payload,
 	})
 }
-
-func (d *diffSyncer) Close() error {
-	return d.treeSyncer.Close()
-}

commonspace/headsync/diffsyncer_test.go

@@ -4,22 +4,22 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"github.com/anyproto/any-sync/app/ldiff"
-	"github.com/anyproto/any-sync/app/ldiff/mock_ldiff"
-	"github.com/anyproto/any-sync/app/logger"
-	"github.com/anyproto/any-sync/commonspace/credentialprovider/mock_credentialprovider"
-	"github.com/anyproto/any-sync/commonspace/object/acl/aclrecordproto"
-	"github.com/anyproto/any-sync/commonspace/object/acl/liststorage/mock_liststorage"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	mock_treestorage "github.com/anyproto/any-sync/commonspace/object/tree/treestorage/mock_treestorage"
-	"github.com/anyproto/any-sync/commonspace/object/treemanager/mock_treemanager"
-	"github.com/anyproto/any-sync/commonspace/peermanager/mock_peermanager"
-	"github.com/anyproto/any-sync/commonspace/settings/settingsstate/mock_settingsstate"
-	"github.com/anyproto/any-sync/commonspace/spacestorage/mock_spacestorage"
-	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
-	"github.com/anyproto/any-sync/commonspace/spacesyncproto/mock_spacesyncproto"
-	"github.com/anyproto/any-sync/commonspace/syncstatus"
-	"github.com/anyproto/any-sync/net/peer"
+	"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"
+	mock_treestorage "github.com/anytypeio/any-sync/commonspace/object/tree/treestorage/mock_treestorage"
+	"github.com/anytypeio/any-sync/commonspace/object/treemanager/mock_treemanager"
+	"github.com/anytypeio/any-sync/commonspace/peermanager/mock_peermanager"
+	"github.com/anytypeio/any-sync/commonspace/settings/settingsstate/mock_settingsstate"
+	"github.com/anytypeio/any-sync/commonspace/spacestorage/mock_spacestorage"
+	"github.com/anytypeio/any-sync/commonspace/spacesyncproto"
+	"github.com/anytypeio/any-sync/commonspace/spacesyncproto/mock_spacesyncproto"
+	"github.com/anytypeio/any-sync/commonspace/syncstatus"
+	"github.com/anytypeio/any-sync/net/peer"
 	"github.com/golang/mock/gomock"
 	"github.com/libp2p/go-libp2p/core/sec"
 	"github.com/stretchr/testify/require"
@@ -51,10 +51,6 @@ func (p pushSpaceRequestMatcher) String() string {
 
 type mockPeer struct{}
 
-func (m mockPeer) Addr() string {
-	return ""
-}
-
 func (m mockPeer) TryClose(objectTTL time.Duration) (res bool, err error) {
 	return true, m.Close()
 }
@@ -119,7 +115,6 @@ func TestDiffSyncer_Sync(t *testing.T) {
 	factory := spacesyncproto.ClientFactoryFunc(func(cc drpc.Conn) spacesyncproto.DRPCSpaceSyncClient {
 		return clientMock
 	})
-	treeSyncerMock := mock_treemanager.NewMockTreeSyncer(ctrl)
 	credentialProvider := mock_credentialprovider.NewMockCredentialProvider(ctrl)
 	delState := mock_settingsstate.NewMockObjectDeletionState(ctrl)
 	spaceId := "spaceId"
@@ -127,21 +122,21 @@ func TestDiffSyncer_Sync(t *testing.T) {
 	l := logger.NewNamed(spaceId)
 	diffSyncer := newDiffSyncer(spaceId, diffMock, peerManagerMock, cacheMock, stMock, factory, syncstatus.NewNoOpSyncStatus(), credentialProvider, l)
 	delState.EXPECT().AddObserver(gomock.Any())
-	cacheMock.EXPECT().NewTreeSyncer(spaceId, gomock.Any()).Return(treeSyncerMock)
 	diffSyncer.Init(delState)
 
 	t.Run("diff syncer sync", func(t *testing.T) {
-		mPeer := mockPeer{}
 		peerManagerMock.EXPECT().
 			GetResponsiblePeers(gomock.Any()).
-			Return([]peer.Peer{mPeer}, nil)
+			Return([]peer.Peer{mockPeer{}}, nil)
 		diffMock.EXPECT().
 			Diff(gomock.Any(), gomock.Eq(NewRemoteDiff(spaceId, clientMock))).
 			Return([]string{"new"}, []string{"changed"}, nil, nil)
-		delState.EXPECT().Filter([]string{"new"}).Return([]string{"new"}).Times(1)
-		delState.EXPECT().Filter([]string{"changed"}).Return([]string{"changed"}).Times(1)
-		delState.EXPECT().Filter(nil).Return(nil).Times(1)
-		treeSyncerMock.EXPECT().SyncAll(gomock.Any(), mPeer.Id(), []string{"changed"}, []string{"new"}).Return(nil)
+		delState.EXPECT().FilterJoin(gomock.Any()).Return([]string{"new", "changed"})
+		for _, arg := range []string{"new", "changed"} {
+			cacheMock.EXPECT().
+				GetTree(gomock.Any(), spaceId, arg).
+				Return(nil, nil)
+		}
 		require.NoError(t, diffSyncer.Sync(ctx))
 	})
 
@@ -228,15 +223,16 @@ func TestDiffSyncer_Sync(t *testing.T) {
 	})
 
 	t.Run("diff syncer sync space is deleted error", func(t *testing.T) {
-		mPeer := mockPeer{}
 		peerManagerMock.EXPECT().
 			GetResponsiblePeers(gomock.Any()).
-			Return([]peer.Peer{mPeer}, nil)
+			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")
-		treeSyncerMock.EXPECT().SyncAll(gomock.Any(), mPeer.Id(), []string{"settingsId"}, nil).Return(nil)
+		cacheMock.EXPECT().
+			GetTree(gomock.Any(), spaceId, "settingsId").
+			Return(nil, nil)
 
 		require.NoError(t, diffSyncer.Sync(ctx))
 	})

commonspace/headsync/headsync.go

@@ -1,20 +1,20 @@
-//go:generate mockgen -destination mock_headsync/mock_headsync.go github.com/anyproto/any-sync/commonspace/headsync DiffSyncer
+//go:generate mockgen -destination mock_headsync/mock_headsync.go github.com/anytypeio/any-sync/commonspace/headsync DiffSyncer
 package headsync
 
 import (
 	"context"
-	"github.com/anyproto/any-sync/app/ldiff"
-	"github.com/anyproto/any-sync/app/logger"
-	"github.com/anyproto/any-sync/commonspace/credentialprovider"
-	"github.com/anyproto/any-sync/commonspace/object/treemanager"
-	"github.com/anyproto/any-sync/commonspace/peermanager"
-	"github.com/anyproto/any-sync/commonspace/settings/settingsstate"
-	"github.com/anyproto/any-sync/commonspace/spacestorage"
-	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
-	"github.com/anyproto/any-sync/commonspace/syncstatus"
-	"github.com/anyproto/any-sync/net/peer"
-	"github.com/anyproto/any-sync/nodeconf"
-	"github.com/anyproto/any-sync/util/periodicsync"
+	"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/treemanager"
+	"github.com/anytypeio/any-sync/commonspace/peermanager"
+	"github.com/anytypeio/any-sync/commonspace/settings/settingsstate"
+	"github.com/anytypeio/any-sync/commonspace/spacestorage"
+	"github.com/anytypeio/any-sync/commonspace/spacesyncproto"
+	"github.com/anytypeio/any-sync/commonspace/syncstatus"
+	"github.com/anytypeio/any-sync/net/peer"
+	"github.com/anytypeio/any-sync/nodeconf"
+	"github.com/anytypeio/any-sync/util/periodicsync"
 	"go.uber.org/zap"
 	"golang.org/x/exp/slices"
 	"strings"
@@ -136,7 +136,7 @@ func (d *headSync) RemoveObjects(ids []string) {
 
 func (d *headSync) Close() (err error) {
 	d.periodicSync.Close()
-	return d.syncer.Close()
+	return nil
 }
 
 func (d *headSync) fillDiff(objectIds []string) {

commonspace/headsync/headsync_test.go

@@ -1,14 +1,14 @@
 package headsync
 
 import (
-	"github.com/anyproto/any-sync/app/ldiff"
-	"github.com/anyproto/any-sync/app/ldiff/mock_ldiff"
-	"github.com/anyproto/any-sync/app/logger"
-	"github.com/anyproto/any-sync/commonspace/headsync/mock_headsync"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treestorage/mock_treestorage"
-	"github.com/anyproto/any-sync/commonspace/settings/settingsstate/mock_settingsstate"
-	"github.com/anyproto/any-sync/commonspace/spacestorage/mock_spacestorage"
-	"github.com/anyproto/any-sync/util/periodicsync/mock_periodicsync"
+	"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/headsync/mock_headsync"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treestorage/mock_treestorage"
+	"github.com/anytypeio/any-sync/commonspace/settings/settingsstate/mock_settingsstate"
+	"github.com/anytypeio/any-sync/commonspace/spacestorage/mock_spacestorage"
+	"github.com/anytypeio/any-sync/util/periodicsync/mock_periodicsync"
 	"github.com/golang/mock/gomock"
 	"testing"
 )
@@ -65,7 +65,6 @@ func TestDiffService(t *testing.T) {
 
 	t.Run("close", func(t *testing.T) {
 		pSyncMock.EXPECT().Close()
-		syncer.EXPECT().Close()
 		service.Close()
 	})
 }

commonspace/headsync/mock_headsync/mock_headsync.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/anyproto/any-sync/commonspace/headsync (interfaces: DiffSyncer)
+// Source: github.com/anytypeio/any-sync/commonspace/headsync (interfaces: DiffSyncer)
 
 // Package mock_headsync is a generated GoMock package.
 package mock_headsync
@@ -8,7 +8,7 @@ import (
 	context "context"
 	reflect "reflect"
 
-	settingsstate "github.com/anyproto/any-sync/commonspace/settings/settingsstate"
+	settingsstate "github.com/anytypeio/any-sync/commonspace/settings/settingsstate"
 	gomock "github.com/golang/mock/gomock"
 )
 
@@ -35,20 +35,6 @@ func (m *MockDiffSyncer) EXPECT() *MockDiffSyncerMockRecorder {
 	return m.recorder
 }
 
-// Close mocks base method.
-func (m *MockDiffSyncer) Close() error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Close")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// Close indicates an expected call of Close.
-func (mr *MockDiffSyncerMockRecorder) Close() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockDiffSyncer)(nil).Close))
-}
-
 // Init mocks base method.
 func (m *MockDiffSyncer) Init(arg0 settingsstate.ObjectDeletionState) {
 	m.ctrl.T.Helper()

commonspace/headsync/remotediff.go

@@ -2,8 +2,8 @@ package headsync
 
 import (
 	"context"
-	"github.com/anyproto/any-sync/app/ldiff"
-	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
+	"github.com/anytypeio/any-sync/app/ldiff"
+	"github.com/anytypeio/any-sync/commonspace/spacesyncproto"
 )
 
 type Client interface {

commonspace/headsync/remotediff_test.go

@@ -3,8 +3,8 @@ package headsync
 import (
 	"context"
 	"fmt"
-	"github.com/anyproto/any-sync/app/ldiff"
-	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
+	"github.com/anytypeio/any-sync/app/ldiff"
+	"github.com/anytypeio/any-sync/commonspace/spacesyncproto"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"testing"

commonspace/object/accountdata/accountdata.go

@@ -2,7 +2,7 @@ package accountdata
 
 import (
 	"crypto/rand"
-	"github.com/anyproto/any-sync/util/crypto"
+	"github.com/anytypeio/any-sync/util/crypto"
 )
 
 type AccountKeys struct {

commonspace/object/acl/list/aclrecordbuilder.go

@@ -1,9 +1,9 @@
 package list
 
 import (
-	"github.com/anyproto/any-sync/commonspace/object/acl/aclrecordproto"
-	"github.com/anyproto/any-sync/util/cidutil"
-	"github.com/anyproto/any-sync/util/crypto"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto"
+	"github.com/anytypeio/any-sync/util/cidutil"
+	"github.com/anytypeio/any-sync/util/crypto"
 	"github.com/gogo/protobuf/proto"
 	"time"
 )

commonspace/object/acl/list/aclstate.go

@@ -3,9 +3,9 @@ package list
 import (
 	"errors"
 	"fmt"
-	"github.com/anyproto/any-sync/app/logger"
-	"github.com/anyproto/any-sync/commonspace/object/acl/aclrecordproto"
-	"github.com/anyproto/any-sync/util/crypto"
+	"github.com/anytypeio/any-sync/app/logger"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto"
+	"github.com/anytypeio/any-sync/util/crypto"
 	"github.com/gogo/protobuf/proto"
 	"go.uber.org/zap"
 )

commonspace/object/acl/list/aclstatebuilder.go

@@ -1,8 +1,8 @@
 package list
 
 import (
-	"github.com/anyproto/any-sync/commonspace/object/accountdata"
-	"github.com/anyproto/any-sync/util/crypto"
+	"github.com/anytypeio/any-sync/commonspace/object/accountdata"
+	"github.com/anytypeio/any-sync/util/crypto"
 )
 
 type aclStateBuilder struct {

commonspace/object/acl/list/list.go

@@ -1,14 +1,14 @@
-//go:generate mockgen -destination mock_list/mock_list.go github.com/anyproto/any-sync/commonspace/object/acl/list AclList
+//go:generate mockgen -destination mock_list/mock_list.go github.com/anytypeio/any-sync/commonspace/object/acl/list AclList
 package list
 
 import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/anyproto/any-sync/commonspace/object/accountdata"
-	"github.com/anyproto/any-sync/commonspace/object/acl/aclrecordproto"
-	"github.com/anyproto/any-sync/commonspace/object/acl/liststorage"
-	"github.com/anyproto/any-sync/util/crypto"
+	"github.com/anytypeio/any-sync/commonspace/object/accountdata"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/liststorage"
+	"github.com/anytypeio/any-sync/util/crypto"
 	"sync"
 )
 

commonspace/object/acl/list/list_test.go

@@ -2,7 +2,7 @@ package list
 
 import (
 	"fmt"
-	"github.com/anyproto/any-sync/commonspace/object/accountdata"
+	"github.com/anytypeio/any-sync/commonspace/object/accountdata"
 	"github.com/stretchr/testify/require"
 	"testing"
 )

commonspace/object/acl/list/listutils.go

@@ -1,10 +1,10 @@
 package list
 
 import (
-	"github.com/anyproto/any-sync/commonspace/object/accountdata"
-	"github.com/anyproto/any-sync/commonspace/object/acl/aclrecordproto"
-	"github.com/anyproto/any-sync/commonspace/object/acl/liststorage"
-	"github.com/anyproto/any-sync/util/crypto"
+	"github.com/anytypeio/any-sync/commonspace/object/accountdata"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/liststorage"
+	"github.com/anytypeio/any-sync/util/crypto"
 )
 
 func NewTestDerivedAcl(spaceId string, keys *accountdata.AccountKeys) (AclList, error) {

commonspace/object/acl/list/mock_list/mock_list.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/anyproto/any-sync/commonspace/object/acl/list (interfaces: AclList)
+// Source: github.com/anytypeio/any-sync/commonspace/object/acl/list (interfaces: AclList)
 
 // Package mock_list is a generated GoMock package.
 package mock_list
@@ -7,9 +7,9 @@ package mock_list
 import (
 	reflect "reflect"
 
-	aclrecordproto "github.com/anyproto/any-sync/commonspace/object/acl/aclrecordproto"
-	list "github.com/anyproto/any-sync/commonspace/object/acl/list"
-	crypto "github.com/anyproto/any-sync/util/crypto"
+	aclrecordproto "github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto"
+	list "github.com/anytypeio/any-sync/commonspace/object/acl/list"
+	crypto "github.com/anytypeio/any-sync/util/crypto"
 	gomock "github.com/golang/mock/gomock"
 )
 

commonspace/object/acl/list/models.go

@@ -1,8 +1,8 @@
 package list
 
 import (
-	"github.com/anyproto/any-sync/commonspace/object/acl/aclrecordproto"
-	"github.com/anyproto/any-sync/util/crypto"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto"
+	"github.com/anytypeio/any-sync/util/crypto"
 )
 
 type AclRecord struct {

commonspace/object/acl/liststorage/inmemory.go

@@ -3,7 +3,7 @@ package liststorage
 import (
 	"context"
 	"fmt"
-	"github.com/anyproto/any-sync/commonspace/object/acl/aclrecordproto"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto"
 	"sync"
 )
 

commonspace/object/acl/liststorage/liststorage.go

@@ -1,10 +1,10 @@
-//go:generate mockgen -destination mock_liststorage/mock_liststorage.go github.com/anyproto/any-sync/commonspace/object/acl/liststorage ListStorage
+//go:generate mockgen -destination mock_liststorage/mock_liststorage.go github.com/anytypeio/any-sync/commonspace/object/acl/liststorage ListStorage
 package liststorage
 
 import (
 	"context"
 	"errors"
-	"github.com/anyproto/any-sync/commonspace/object/acl/aclrecordproto"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto"
 )
 
 var (

commonspace/object/acl/liststorage/mock_liststorage/mock_liststorage.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/anyproto/any-sync/commonspace/object/acl/liststorage (interfaces: ListStorage)
+// Source: github.com/anytypeio/any-sync/commonspace/object/acl/liststorage (interfaces: ListStorage)
 
 // Package mock_liststorage is a generated GoMock package.
 package mock_liststorage
@@ -8,7 +8,7 @@ import (
 	context "context"
 	reflect "reflect"
 
-	aclrecordproto "github.com/anyproto/any-sync/commonspace/object/acl/aclrecordproto"
+	aclrecordproto "github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto"
 	gomock "github.com/golang/mock/gomock"
 )
 

commonspace/object/acl/syncacl/syncacl.go

@@ -1,9 +1,9 @@
 package syncacl
 
 import (
-	"github.com/anyproto/any-sync/commonspace/object/acl/list"
-	"github.com/anyproto/any-sync/commonspace/objectsync"
-	"github.com/anyproto/any-sync/commonspace/objectsync/synchandler"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/list"
+	"github.com/anytypeio/any-sync/commonspace/objectsync"
+	"github.com/anytypeio/any-sync/commonspace/objectsync/synchandler"
 )
 
 type SyncAcl struct {

commonspace/object/acl/syncacl/syncaclhandler.go

@@ -3,9 +3,9 @@ package syncacl
 import (
 	"context"
 	"fmt"
-	"github.com/anyproto/any-sync/commonspace/object/acl/aclrecordproto"
-	"github.com/anyproto/any-sync/commonspace/object/acl/list"
-	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/list"
+	"github.com/anytypeio/any-sync/commonspace/spacesyncproto"
 )
 
 type syncAclHandler struct {

commonspace/object/syncobjectgetter/syncobjectgetter.go

@@ -2,7 +2,7 @@ package syncobjectgetter
 
 import (
 	"context"
-	"github.com/anyproto/any-sync/commonspace/objectsync/synchandler"
+	"github.com/anytypeio/any-sync/commonspace/objectsync/synchandler"
 )
 
 type SyncObject interface {

commonspace/object/tree/exporter/treeexporter.go

@@ -1,11 +1,11 @@
 package exporter
 
 import (
-	"github.com/anyproto/any-sync/commonspace/object/acl/liststorage"
-	"github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treestorage"
-	"github.com/anyproto/any-sync/util/crypto"
+	"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/util/crypto"
 )
 
 type DataConverter interface {

commonspace/object/tree/exporter/treeimport.go

@@ -1,10 +1,10 @@
 package exporter
 
 import (
-	"github.com/anyproto/any-sync/commonspace/object/acl/list"
-	"github.com/anyproto/any-sync/commonspace/object/acl/liststorage"
-	"github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treestorage"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/list"
+	"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/treestorage"
 )
 
 type TreeImportParams struct {

commonspace/object/tree/objecttree/change.go

@@ -2,8 +2,8 @@ package objecttree
 
 import (
 	"errors"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	"github.com/anyproto/any-sync/util/crypto"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
+	"github.com/anytypeio/any-sync/util/crypto"
 	"github.com/gogo/protobuf/proto"
 )
 

commonspace/object/tree/objecttree/changebuilder.go

@@ -2,9 +2,9 @@ package objecttree
 
 import (
 	"errors"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	"github.com/anyproto/any-sync/util/cidutil"
-	"github.com/anyproto/any-sync/util/crypto"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
+	"github.com/anytypeio/any-sync/util/cidutil"
+	"github.com/anytypeio/any-sync/util/crypto"
 	"github.com/gogo/protobuf/proto"
 )
 

commonspace/object/tree/objecttree/historytree.go

@@ -14,47 +14,34 @@ type historyTree struct {
 	*objectTree
 }
 
-func (h *historyTree) rebuildFromStorage(params HistoryTreeParams) (err error) {
-	err = h.rebuild(params)
-	if err != nil {
-		return
-	}
-	h.aclList.RLock()
-	defer h.aclList.RUnlock()
-	state := h.aclList.AclState()
-
-	return h.readKeysFromAclState(state)
-}
-
-func (h *historyTree) rebuild(params HistoryTreeParams) (err error) {
-	var (
-		beforeId = params.BeforeId
-		include  = params.IncludeBeforeId
-		full     = params.BuildFullTree
-	)
-	h.treeBuilder.Reset()
-	if full {
-		h.tree, err = h.treeBuilder.BuildFull()
-		return
-	}
-	if beforeId == h.Id() && !include {
+func (h *historyTree) rebuildFromStorage(beforeId string, include bool) (err error) {
+	ot := h.objectTree
+	ot.treeBuilder.Reset()
+	if beforeId == ot.Id() && !include {
 		return ErrLoadBeforeRoot
 	}
 
 	heads := []string{beforeId}
 	if beforeId == "" {
-		heads, err = h.treeStorage.Heads()
+		heads, err = ot.treeStorage.Heads()
 		if err != nil {
 			return
 		}
 	} else if !include {
-		beforeChange, err := h.treeBuilder.loadChange(beforeId)
+		beforeChange, err := ot.treeBuilder.loadChange(beforeId)
 		if err != nil {
 			return err
 		}
 		heads = beforeChange.PreviousIds
 	}
 
-	h.tree, err = h.treeBuilder.build(heads, nil, nil)
-	return
+	ot.tree, err = ot.treeBuilder.build(heads, nil, nil)
+	if err != nil {
+		return
+	}
+	ot.aclList.RLock()
+	defer ot.aclList.RUnlock()
+	state := ot.aclList.AclState()
+
+	return ot.readKeysFromAclState(state)
 }

commonspace/object/tree/objecttree/mock_objecttree/mock_objecttree.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/anyproto/any-sync/commonspace/object/tree/objecttree (interfaces: ObjectTree)
+// Source: github.com/anytypeio/any-sync/commonspace/object/tree/objecttree (interfaces: ObjectTree)
 
 // Package mock_objecttree is a generated GoMock package.
 package mock_objecttree
@@ -9,10 +9,10 @@ import (
 	reflect "reflect"
 	time "time"
 
-	list "github.com/anyproto/any-sync/commonspace/object/acl/list"
-	objecttree "github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
-	treechangeproto "github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	treestorage "github.com/anyproto/any-sync/commonspace/object/tree/treestorage"
+	list "github.com/anytypeio/any-sync/commonspace/object/acl/list"
+	objecttree "github.com/anytypeio/any-sync/commonspace/object/tree/objecttree"
+	treechangeproto "github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
+	treestorage "github.com/anytypeio/any-sync/commonspace/object/tree/treestorage"
 	gomock "github.com/golang/mock/gomock"
 )
 

commonspace/object/tree/objecttree/objecttree.go

@@ -1,18 +1,18 @@
-//go:generate mockgen -destination mock_objecttree/mock_objecttree.go github.com/anyproto/any-sync/commonspace/object/tree/objecttree ObjectTree
+//go:generate mockgen -destination mock_objecttree/mock_objecttree.go github.com/anytypeio/any-sync/commonspace/object/tree/objecttree ObjectTree
 package objecttree
 
 import (
 	"context"
 	"errors"
-	"github.com/anyproto/any-sync/util/crypto"
+	"github.com/anytypeio/any-sync/util/crypto"
 	"sync"
 	"time"
 
-	"github.com/anyproto/any-sync/commonspace/object/acl/aclrecordproto"
-	"github.com/anyproto/any-sync/commonspace/object/acl/list"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treestorage"
-	"github.com/anyproto/any-sync/util/slice"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/list"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treestorage"
+	"github.com/anytypeio/any-sync/util/slice"
 )
 
 type RWLocker interface {
@@ -116,25 +116,13 @@ type objectTree struct {
 }
 
 func (ot *objectTree) rebuildFromStorage(theirHeads []string, newChanges []*Change) (err error) {
-	oldTree := ot.tree
 	ot.treeBuilder.Reset()
+
 	ot.tree, err = ot.treeBuilder.Build(theirHeads, newChanges)
 	if err != nil {
 		return
 	}
 
-	// in case there are new heads
-	if theirHeads != nil && oldTree != nil {
-		// checking that old root is still in tree
-		rootCh, rootExists := ot.tree.attached[oldTree.RootId()]
-
-		// checking the case where theirHeads were actually below prevHeads
-		// so if we did load some extra data in the tree, let's reduce it to old root
-		if slice.UnsortedEquals(oldTree.headIds, ot.tree.headIds) && rootExists && ot.tree.RootId() != oldTree.RootId() {
-			ot.tree.makeRootAndRemove(rootCh)
-		}
-	}
-
 	// during building the tree we may have marked some changes as possible roots,
 	// but obviously they are not roots, because of the way how we construct the tree
 	ot.tree.clearPossibleRoots()
@@ -199,7 +187,7 @@ func (ot *objectTree) AddContent(ctx context.Context, content SignableChangeCont
 		panic(err)
 	}
 
-	err = ot.treeStorage.AddRawChangesSetHeads([]*treechangeproto.RawTreeChangeWithId{rawChange}, []string{objChange.Id})
+	err = ot.treeStorage.TransactionAdd([]*treechangeproto.RawTreeChangeWithId{rawChange}, []string{objChange.Id})
 	if err != nil {
 		return
 	}
@@ -296,11 +284,7 @@ func (ot *objectTree) AddRawChanges(ctx context.Context, changesPayload RawChang
 		addResult.Mode = Rebuild
 	}
 
-	err = ot.treeStorage.AddRawChangesSetHeads(addResult.Added, addResult.Heads)
-	if err != nil {
-		// rolling back all changes made to inmemory state
-		ot.rebuildFromStorage(nil, nil)
-	}
+	err = ot.treeStorage.TransactionAdd(addResult.Added, addResult.Heads)
 	return
 }
 
@@ -363,7 +347,7 @@ func (ot *objectTree) addRawChanges(ctx context.Context, changesPayload RawChang
 	}
 
 	// checks if we need to go to database
-	snapshotNotInTree := func(ch *Change) bool {
+	isOldSnapshot := func(ch *Change) bool {
 		if ch.SnapshotId == ot.tree.RootId() {
 			return false
 		}
@@ -378,12 +362,26 @@ func (ot *objectTree) addRawChanges(ctx context.Context, changesPayload RawChang
 
 	shouldRebuildFromStorage := false
 	// checking if we have some changes with different snapshot and then rebuilding
-	for _, ch := range ot.newChangesBuf {
-		if snapshotNotInTree(ch) {
+	for idx, ch := range ot.newChangesBuf {
+		if isOldSnapshot(ch) {
+			var exists bool
+			// checking if it exists in the storage, if yes, then at some point it was added to the tree
+			// thus we don't need to look at this change
+			exists, err = ot.treeStorage.HasChange(ctx, ch.Id)
+			if err != nil {
+				return
+			}
+			if exists {
+				// marking as nil to delete after
+				ot.newChangesBuf[idx] = nil
+				continue
+			}
+			// we haven't seen the change, and it refers to old snapshot, so we should rebuild
 			shouldRebuildFromStorage = true
-			break
 		}
 	}
+	// discarding all previously seen changes
+	ot.newChangesBuf = slice.DiscardFromSlice(ot.newChangesBuf, func(ch *Change) bool { return ch == nil })
 
 	if shouldRebuildFromStorage {
 		err = ot.rebuildFromStorage(changesPayload.NewHeads, ot.newChangesBuf)
@@ -551,8 +549,22 @@ func (ot *objectTree) IterateFrom(id string, convert ChangeConvertFunc, iterate
 }
 
 func (ot *objectTree) HasChanges(chs ...string) bool {
+	hasChange := func(s string) bool {
+		_, attachedExists := ot.tree.attached[s]
+		if attachedExists {
+			return attachedExists
+		}
+
+		has, err := ot.treeStorage.HasChange(context.Background(), s)
+		if err != nil {
+			return false
+		}
+
+		return has
+	}
+
 	for _, ch := range chs {
-		if _, attachedExists := ot.tree.attached[ch]; !attachedExists {
+		if !hasChange(ch) {
 			return false
 		}
 	}

commonspace/object/tree/objecttree/objecttree_test.go

@@ -2,11 +2,10 @@ package objecttree
 
 import (
 	"context"
-	"fmt"
-	"github.com/anyproto/any-sync/commonspace/object/accountdata"
-	"github.com/anyproto/any-sync/commonspace/object/acl/list"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treestorage"
+	"github.com/anytypeio/any-sync/commonspace/object/accountdata"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/list"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treestorage"
 	"github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -65,7 +64,7 @@ func prepareContext(
 	treeStorage := changeCreator.CreateNewTreeStorage("0", aclList.Head().Id)
 	if additionalChanges != nil {
 		payload := additionalChanges(changeCreator)
-		err := treeStorage.AddRawChangesSetHeads(payload.RawChanges, payload.NewHeads)
+		err := treeStorage.TransactionAdd(payload.RawChanges, payload.NewHeads)
 		require.NoError(t, err)
 	}
 	objTree, err := objTreeBuilder(treeStorage, aclList)
@@ -422,99 +421,6 @@ func TestObjectTree(t *testing.T) {
 		})
 	})
 
-	t.Run("rollback when add to storage returns error", func(t *testing.T) {
-		ctx := prepareTreeContext(t, aclList)
-		changeCreator := ctx.changeCreator
-		objTree := ctx.objTree
-		store := ctx.treeStorage.(*treestorage.InMemoryTreeStorage)
-		addErr := fmt.Errorf("error saving")
-		store.SetReturnErrorOnAdd(addErr)
-
-		rawChanges := []*treechangeproto.RawTreeChangeWithId{
-			changeCreator.CreateRaw("1", aclList.Head().Id, "0", true, "0"),
-		}
-		payload := RawChangesPayload{
-			NewHeads:   []string{"1"},
-			RawChanges: rawChanges,
-		}
-		_, err := objTree.AddRawChanges(context.Background(), payload)
-		require.Error(t, err, addErr)
-		require.Equal(t, "0", objTree.Root().Id)
-	})
-
-	t.Run("their heads before common snapshot", func(t *testing.T) {
-		// checking that adding old changes did not affect the tree
-		ctx := prepareTreeContext(t, aclList)
-		changeCreator := ctx.changeCreator
-		objTree := ctx.objTree
-
-		rawChanges := []*treechangeproto.RawTreeChangeWithId{
-			changeCreator.CreateRaw("1", aclList.Head().Id, "0", true, "0"),
-			changeCreator.CreateRaw("2", aclList.Head().Id, "1", false, "1"),
-			changeCreator.CreateRaw("3", aclList.Head().Id, "1", true, "2"),
-			changeCreator.CreateRaw("4", aclList.Head().Id, "1", false, "2"),
-			changeCreator.CreateRaw("5", aclList.Head().Id, "1", false, "1"),
-			changeCreator.CreateRaw("6", aclList.Head().Id, "1", true, "3", "4", "5"),
-		}
-		payload := RawChangesPayload{
-			NewHeads:   []string{rawChanges[len(rawChanges)-1].Id},
-			RawChanges: rawChanges,
-		}
-		_, err := objTree.AddRawChanges(context.Background(), payload)
-		require.NoError(t, err, "adding changes should be without error")
-		require.Equal(t, "6", objTree.Root().Id)
-
-		rawChangesPrevious := []*treechangeproto.RawTreeChangeWithId{
-			changeCreator.CreateRaw("1", aclList.Head().Id, "0", true, "0"),
-		}
-		payload = RawChangesPayload{
-			NewHeads:   []string{"1"},
-			RawChanges: rawChangesPrevious,
-		}
-		_, err = objTree.AddRawChanges(context.Background(), payload)
-		require.NoError(t, err, "adding changes should be without error")
-		require.Equal(t, "6", objTree.Root().Id)
-	})
-
-	t.Run("stored changes will not break the pipeline if heads were not updated", func(t *testing.T) {
-		ctx := prepareTreeContext(t, aclList)
-		changeCreator := ctx.changeCreator
-		objTree := ctx.objTree
-		store := ctx.treeStorage.(*treestorage.InMemoryTreeStorage)
-
-		rawChanges := []*treechangeproto.RawTreeChangeWithId{
-			changeCreator.CreateRaw("1", aclList.Head().Id, "0", true, "0"),
-		}
-		payload := RawChangesPayload{
-			NewHeads:   []string{rawChanges[len(rawChanges)-1].Id},
-			RawChanges: rawChanges,
-		}
-		_, err := objTree.AddRawChanges(context.Background(), payload)
-		require.NoError(t, err, "adding changes should be without error")
-		require.Equal(t, "1", objTree.Root().Id)
-
-		// creating changes to save in the storage
-		// to imitate the condition where all changes are in the storage
-		// but the head was not updated
-		storageChanges := []*treechangeproto.RawTreeChangeWithId{
-			changeCreator.CreateRaw("2", aclList.Head().Id, "1", false, "1"),
-			changeCreator.CreateRaw("3", aclList.Head().Id, "1", true, "2"),
-			changeCreator.CreateRaw("4", aclList.Head().Id, "1", false, "2"),
-			changeCreator.CreateRaw("5", aclList.Head().Id, "1", false, "1"),
-			changeCreator.CreateRaw("6", aclList.Head().Id, "1", true, "3", "4", "5"),
-		}
-		store.AddRawChangesSetHeads(storageChanges, []string{"1"})
-
-		// updating with subset of those changes to see that everything will still work
-		payload = RawChangesPayload{
-			NewHeads:   []string{"6"},
-			RawChanges: storageChanges,
-		}
-		_, err = objTree.AddRawChanges(context.Background(), payload)
-		require.NoError(t, err, "adding changes should be without error")
-		require.Equal(t, "6", objTree.Root().Id)
-	})
-
 	t.Run("changes from tree after common snapshot complex", func(t *testing.T) {
 		ctx := prepareTreeContext(t, aclList)
 		changeCreator := ctx.changeCreator
@@ -748,7 +654,7 @@ func TestObjectTree(t *testing.T) {
 			changeCreator.CreateRaw("5", aclList.Head().Id, "0", false, "1"),
 			changeCreator.CreateRaw("6", aclList.Head().Id, "0", false, "3", "4", "5"),
 		}
-		deps.treeStorage.AddRawChangesSetHeads(rawChanges, []string{"6"})
+		deps.treeStorage.TransactionAdd(rawChanges, []string{"6"})
 		hTree, err := buildHistoryTree(deps, HistoryTreeParams{
 			BeforeId:        "6",
 			IncludeBeforeId: false,
@@ -768,37 +674,6 @@ func TestObjectTree(t *testing.T) {
 		assert.Equal(t, "0", hTree.Root().Id)
 	})
 
-	t.Run("test history tree build full", func(t *testing.T) {
-		changeCreator, deps := prepareHistoryTreeDeps(aclList)
-
-		// sequence of snapshots: 5->1->0
-		rawChanges := []*treechangeproto.RawTreeChangeWithId{
-			changeCreator.CreateRaw("1", aclList.Head().Id, "0", true, "0"),
-			changeCreator.CreateRaw("2", aclList.Head().Id, "1", false, "1"),
-			changeCreator.CreateRaw("3", aclList.Head().Id, "1", true, "2"),
-			changeCreator.CreateRaw("4", aclList.Head().Id, "1", false, "2"),
-			changeCreator.CreateRaw("5", aclList.Head().Id, "1", true, "3", "4"),
-			changeCreator.CreateRaw("6", aclList.Head().Id, "5", false, "5"),
-		}
-		deps.treeStorage.AddRawChangesSetHeads(rawChanges, []string{"6"})
-		hTree, err := buildHistoryTree(deps, HistoryTreeParams{
-			BuildFullTree: true,
-		})
-		require.NoError(t, err)
-		// check tree heads
-		assert.Equal(t, []string{"6"}, hTree.Heads())
-
-		// check tree iterate
-		var iterChangesId []string
-		err = hTree.IterateFrom(hTree.Root().Id, nil, func(change *Change) bool {
-			iterChangesId = append(iterChangesId, change.Id)
-			return true
-		})
-		require.NoError(t, err, "iterate should be without error")
-		assert.Equal(t, []string{"0", "1", "2", "3", "4", "5", "6"}, iterChangesId)
-		assert.Equal(t, "0", hTree.Root().Id)
-	})
-
 	t.Run("test history tree include", func(t *testing.T) {
 		changeCreator, deps := prepareHistoryTreeDeps(aclList)
 
@@ -810,7 +685,7 @@ func TestObjectTree(t *testing.T) {
 			changeCreator.CreateRaw("5", aclList.Head().Id, "0", false, "1"),
 			changeCreator.CreateRaw("6", aclList.Head().Id, "0", false, "3", "4", "5"),
 		}
-		deps.treeStorage.AddRawChangesSetHeads(rawChanges, []string{"6"})
+		deps.treeStorage.TransactionAdd(rawChanges, []string{"6"})
 		hTree, err := buildHistoryTree(deps, HistoryTreeParams{
 			BeforeId:        "6",
 			IncludeBeforeId: true,

commonspace/object/tree/objecttree/objecttreefactory.go

@@ -1,10 +1,10 @@
 package objecttree
 
 import (
-	"github.com/anyproto/any-sync/commonspace/object/acl/list"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treestorage"
-	"github.com/anyproto/any-sync/util/crypto"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/list"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treestorage"
+	"github.com/anytypeio/any-sync/util/crypto"
 )
 
 type ObjectTreeCreatePayload struct {
@@ -22,7 +22,6 @@ type HistoryTreeParams struct {
 	AclList         list.AclList
 	BeforeId        string
 	IncludeBeforeId bool
-	BuildFullTree   bool
 }
 
 type objectTreeDeps struct {
@@ -231,7 +230,7 @@ func buildHistoryTree(deps objectTreeDeps, params HistoryTreeParams) (ht History
 	}
 
 	hTree := &historyTree{objectTree: objTree}
-	err = hTree.rebuildFromStorage(params)
+	err = hTree.rebuildFromStorage(params.BeforeId, params.IncludeBeforeId)
 	if err != nil {
 		return nil, err
 	}

commonspace/object/tree/objecttree/objecttreevalidator.go

@@ -3,10 +3,10 @@ package objecttree
 import (
 	"context"
 	"fmt"
-	"github.com/anyproto/any-sync/commonspace/object/acl/aclrecordproto"
-	"github.com/anyproto/any-sync/commonspace/object/acl/list"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treestorage"
-	"github.com/anyproto/any-sync/util/slice"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/list"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treestorage"
+	"github.com/anytypeio/any-sync/util/slice"
 )
 
 type ObjectTreeValidator interface {

commonspace/object/tree/objecttree/rawloader.go

@@ -2,9 +2,9 @@ package objecttree
 
 import (
 	"context"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treestorage"
-	"github.com/anyproto/any-sync/util/slice"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treestorage"
+	"github.com/anytypeio/any-sync/util/slice"
 	"time"
 )
 

commonspace/object/tree/objecttree/signablecontent.go

@@ -1,7 +1,7 @@
 package objecttree
 
 import (
-	"github.com/anyproto/any-sync/util/crypto"
+	"github.com/anytypeio/any-sync/util/crypto"
 )
 
 // SignableChangeContent is a payload to be passed when we are creating change

commonspace/object/tree/objecttree/testutils.go

@@ -2,9 +2,9 @@ package objecttree
 
 import (
 	"fmt"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treestorage"
-	"github.com/anyproto/any-sync/util/crypto"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treestorage"
+	"github.com/anytypeio/any-sync/util/crypto"
 	libcrypto "github.com/libp2p/go-libp2p/core/crypto"
 )
 

commonspace/object/tree/objecttree/treebuilder.go

@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/anyproto/any-sync/app/logger"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treestorage"
-	"github.com/anyproto/any-sync/util/slice"
+	"github.com/anytypeio/any-sync/app/logger"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treestorage"
+	"github.com/anytypeio/any-sync/util/slice"
 	"go.uber.org/zap"
 )
 
@@ -51,22 +51,6 @@ func (tb *treeBuilder) Build(theirHeads []string, newChanges []*Change) (*Tree,
 	return tb.build(heads, theirHeads, newChanges)
 }
 
-func (tb *treeBuilder) BuildFull() (*Tree, error) {
-	defer func() {
-		tb.cache = make(map[string]*Change)
-	}()
-	tb.cache = make(map[string]*Change)
-	heads, err := tb.treeStorage.Heads()
-	if err != nil {
-		return nil, err
-	}
-	err = tb.buildTree(heads, tb.treeStorage.Id())
-	if err != nil {
-		return nil, err
-	}
-	return tb.tree, nil
-}
-
 func (tb *treeBuilder) build(heads []string, theirHeads []string, newChanges []*Change) (*Tree, error) {
 	defer func() {
 		tb.cache = make(map[string]*Change)
@@ -121,8 +105,8 @@ func (tb *treeBuilder) buildTree(heads []string, breakpoint string) (err error)
 	if err != nil {
 		return
 	}
-	changes := tb.dfs(heads, breakpoint)
 	tb.tree.AddFast(ch)
+	changes := tb.dfs(heads, breakpoint)
 	tb.tree.AddFast(changes...)
 	return
 }

commonspace/object/tree/objecttree/util.go

@@ -2,7 +2,7 @@ package objecttree
 
 import (
 	"fmt"
-	"github.com/anyproto/any-sync/util/crypto"
+	"github.com/anytypeio/any-sync/util/crypto"
 	"math/rand"
 )
 

commonspace/object/tree/synctree/mock_synctree/mock_synctree.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/anyproto/any-sync/commonspace/object/tree/synctree (interfaces: SyncTree,ReceiveQueue,HeadNotifiable)
+// Source: github.com/anytypeio/any-sync/commonspace/object/tree/synctree (interfaces: SyncTree,ReceiveQueue,HeadNotifiable)
 
 // Package mock_synctree is a generated GoMock package.
 package mock_synctree
@@ -9,12 +9,12 @@ import (
 	reflect "reflect"
 	time "time"
 
-	list "github.com/anyproto/any-sync/commonspace/object/acl/list"
-	objecttree "github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
-	updatelistener "github.com/anyproto/any-sync/commonspace/object/tree/synctree/updatelistener"
-	treechangeproto "github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	treestorage "github.com/anyproto/any-sync/commonspace/object/tree/treestorage"
-	spacesyncproto "github.com/anyproto/any-sync/commonspace/spacesyncproto"
+	list "github.com/anytypeio/any-sync/commonspace/object/acl/list"
+	objecttree "github.com/anytypeio/any-sync/commonspace/object/tree/objecttree"
+	updatelistener "github.com/anytypeio/any-sync/commonspace/object/tree/synctree/updatelistener"
+	treechangeproto "github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
+	treestorage "github.com/anytypeio/any-sync/commonspace/object/tree/treestorage"
+	spacesyncproto "github.com/anytypeio/any-sync/commonspace/spacesyncproto"
 	gomock "github.com/golang/mock/gomock"
 )
 

commonspace/object/tree/synctree/receivequeue.go

@@ -2,7 +2,7 @@ package synctree
 
 import (
 	"errors"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
 	"sync"
 )
 

commonspace/object/tree/synctree/syncprotocol_test.go

@@ -2,12 +2,12 @@ package synctree
 
 import (
 	"context"
-	"github.com/anyproto/any-sync/commonspace/object/accountdata"
-	"github.com/anyproto/any-sync/commonspace/object/acl/list"
-	"github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treestorage"
-	"github.com/anyproto/any-sync/util/slice"
+	"github.com/anytypeio/any-sync/commonspace/object/accountdata"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/list"
+	"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/util/slice"
 	"github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/require"
 	"math/rand"
@@ -112,7 +112,7 @@ func testTreeMerge(t *testing.T, levels, perLevel int, hasData bool, isSnapshot
 	}
 	// generating initial tree
 	initialRes := genChanges(changeCreator, params)
-	err = storage.AddRawChangesSetHeads(initialRes.changes, initialRes.heads)
+	err = storage.TransactionAdd(initialRes.changes, initialRes.heads)
 	require.NoError(t, err)
 	deps := fixtureDeps{
 		aclList:     aclList,
@@ -183,179 +183,3 @@ func testTreeMerge(t *testing.T, levels, perLevel int, hasData bool, isSnapshot
 		}
 	}
 }
-
-func TestTreeStorageHasExtraChanges(t *testing.T) {
-	var (
-		rnd      = rand.New(rand.NewSource(time.Now().Unix()))
-		levels   = 20
-		perLevel = 40
-	)
-
-	// simulating cases where one peer has some extra changes saved in storage
-	// and checking that this will not break the sync
-	t.Run("tree storage has extra simple", func(t *testing.T) {
-		testTreeStorageHasExtra(t, levels, perLevel, false, func() bool {
-			return false
-		})
-		testTreeStorageHasExtra(t, levels, perLevel, false, func() bool {
-			return rnd.Intn(10) > 5
-		})
-		testTreeStorageHasExtra(t, levels, perLevel, true, func() bool {
-			return false
-		})
-		testTreeStorageHasExtra(t, levels, perLevel, true, func() bool {
-			return rnd.Intn(10) > 5
-		})
-	})
-	t.Run("tree storage has extra three parts", func(t *testing.T) {
-		testTreeStorageHasExtraThreeParts(t, levels, perLevel, false, func() bool {
-			return false
-		})
-		testTreeStorageHasExtraThreeParts(t, levels, perLevel, false, func() bool {
-			return rnd.Intn(10) > 5
-		})
-		testTreeStorageHasExtraThreeParts(t, levels, perLevel, true, func() bool {
-			return false
-		})
-		testTreeStorageHasExtraThreeParts(t, levels, perLevel, true, func() bool {
-			return rnd.Intn(10) > 5
-		})
-	})
-}
-
-func testTreeStorageHasExtra(t *testing.T, levels, perLevel int, hasData bool, isSnapshot func() bool) {
-	treeId := "treeId"
-	spaceId := "spaceId"
-	keys, err := accountdata.NewRandom()
-	require.NoError(t, err)
-	aclList, err := list.NewTestDerivedAcl(spaceId, keys)
-	storage := createStorage(treeId, aclList)
-	changeCreator := objecttree.NewMockChangeCreator()
-	builder := objecttree.BuildTestableTree
-	if hasData {
-		builder = objecttree.BuildEmptyDataTestableTree
-	}
-	params := genParams{
-		prefix:     "peer1",
-		aclId:      aclList.Id(),
-		startIdx:   0,
-		levels:     levels,
-		perLevel:   perLevel,
-		snapshotId: treeId,
-		prevHeads:  []string{treeId},
-		isSnapshot: isSnapshot,
-		hasData:    hasData,
-	}
-	deps := fixtureDeps{
-		aclList:     aclList,
-		initStorage: storage.(*treestorage.InMemoryTreeStorage),
-		connectionMap: map[string][]string{
-			"peer1": []string{"peer2"},
-			"peer2": []string{"peer1"},
-		},
-		treeBuilder: builder,
-	}
-	fx := newProtocolFixture(t, spaceId, deps)
-
-	// generating initial tree
-	initialRes := genChanges(changeCreator, params)
-	fx.run(t)
-
-	// adding some changes to store, but without updating heads
-	store := fx.handlers["peer1"].tree().Storage().(*treestorage.InMemoryTreeStorage)
-	oldHeads, _ := store.Heads()
-	store.AddRawChangesSetHeads(initialRes.changes, oldHeads)
-
-	// sending those changes to other peer
-	fx.handlers["peer2"].sendRawChanges(context.Background(), objecttree.RawChangesPayload{
-		NewHeads:   initialRes.heads,
-		RawChanges: initialRes.changes,
-	})
-	time.Sleep(50 * time.Millisecond)
-
-	// here we want that the saved changes in storage should not affect the sync protocol
-	firstHeads := fx.handlers["peer1"].tree().Heads()
-	secondHeads := fx.handlers["peer2"].tree().Heads()
-	require.True(t, slice.UnsortedEquals(firstHeads, secondHeads))
-	require.True(t, slice.UnsortedEquals(initialRes.heads, firstHeads))
-}
-
-func testTreeStorageHasExtraThreeParts(t *testing.T, levels, perLevel int, hasData bool, isSnapshot func() bool) {
-	treeId := "treeId"
-	spaceId := "spaceId"
-	keys, err := accountdata.NewRandom()
-	require.NoError(t, err)
-	aclList, err := list.NewTestDerivedAcl(spaceId, keys)
-	storage := createStorage(treeId, aclList)
-	changeCreator := objecttree.NewMockChangeCreator()
-	builder := objecttree.BuildTestableTree
-	if hasData {
-		builder = objecttree.BuildEmptyDataTestableTree
-	}
-	params := genParams{
-		prefix:     "peer1",
-		aclId:      aclList.Id(),
-		startIdx:   0,
-		levels:     levels,
-		perLevel:   perLevel,
-		snapshotId: treeId,
-		prevHeads:  []string{treeId},
-		isSnapshot: isSnapshot,
-		hasData:    hasData,
-	}
-	deps := fixtureDeps{
-		aclList:     aclList,
-		initStorage: storage.(*treestorage.InMemoryTreeStorage),
-		connectionMap: map[string][]string{
-			"peer1": []string{"peer2"},
-			"peer2": []string{"peer1"},
-		},
-		treeBuilder: builder,
-	}
-	fx := newProtocolFixture(t, spaceId, deps)
-
-	// generating parts
-	firstPart := genChanges(changeCreator, params)
-	params.startIdx = levels
-	params.snapshotId = firstPart.snapshotId
-	params.prevHeads = firstPart.heads
-	secondPart := genChanges(changeCreator, params)
-	params.startIdx = levels * 2
-	params.snapshotId = secondPart.snapshotId
-	params.prevHeads = secondPart.heads
-	thirdPart := genChanges(changeCreator, params)
-
-	// adding part1 to first peer and saving part2 and part3 in its storage
-	res, _ := fx.handlers["peer1"].tree().AddRawChanges(context.Background(), objecttree.RawChangesPayload{
-		NewHeads:   firstPart.heads,
-		RawChanges: firstPart.changes,
-	})
-	require.True(t, slice.UnsortedEquals(res.Heads, firstPart.heads))
-	store := fx.handlers["peer1"].tree().Storage().(*treestorage.InMemoryTreeStorage)
-	oldHeads, _ := store.Heads()
-	store.AddRawChangesSetHeads(secondPart.changes, oldHeads)
-	store.AddRawChangesSetHeads(thirdPart.changes, oldHeads)
-
-	var peer2Initial []*treechangeproto.RawTreeChangeWithId
-	peer2Initial = append(peer2Initial, firstPart.changes...)
-	peer2Initial = append(peer2Initial, secondPart.changes...)
-
-	// adding part1 and part2 to second peer
-	res, _ = fx.handlers["peer2"].tree().AddRawChanges(context.Background(), objecttree.RawChangesPayload{
-		NewHeads:   secondPart.heads,
-		RawChanges: peer2Initial,
-	})
-	require.True(t, slice.UnsortedEquals(res.Heads, secondPart.heads))
-	fx.run(t)
-
-	// sending part3 changes to other peer
-	fx.handlers["peer2"].sendRawChanges(context.Background(), objecttree.RawChangesPayload{
-		NewHeads:   thirdPart.heads,
-		RawChanges: thirdPart.changes,
-	})
-	time.Sleep(50 * time.Millisecond)
-	firstHeads := fx.handlers["peer1"].tree().Heads()
-	secondHeads := fx.handlers["peer2"].tree().Heads()
-	require.True(t, slice.UnsortedEquals(firstHeads, secondHeads))
-	require.True(t, slice.UnsortedEquals(thirdPart.heads, firstHeads))
-}

commonspace/object/tree/synctree/synctree.go

@@ -1,4 +1,4 @@
-//go:generate mockgen -destination mock_synctree/mock_synctree.go github.com/anyproto/any-sync/commonspace/object/tree/synctree SyncTree,ReceiveQueue,HeadNotifiable
+//go:generate mockgen -destination mock_synctree/mock_synctree.go github.com/anytypeio/any-sync/commonspace/object/tree/synctree SyncTree,ReceiveQueue,HeadNotifiable
 package synctree
 
 import (
@@ -6,17 +6,17 @@ import (
 	"errors"
 	"time"
 
-	"github.com/anyproto/any-sync/app/logger"
-	"github.com/anyproto/any-sync/commonspace/object/acl/list"
-	"github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
-	"github.com/anyproto/any-sync/commonspace/object/tree/synctree/updatelistener"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treestorage"
-	"github.com/anyproto/any-sync/commonspace/objectsync"
-	"github.com/anyproto/any-sync/commonspace/objectsync/synchandler"
-	"github.com/anyproto/any-sync/commonspace/spacestorage"
-	"github.com/anyproto/any-sync/commonspace/syncstatus"
-	"github.com/anyproto/any-sync/net/peer"
-	"github.com/anyproto/any-sync/nodeconf"
+	"github.com/anytypeio/any-sync/app/logger"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/list"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/objecttree"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/synctree/updatelistener"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treestorage"
+	"github.com/anytypeio/any-sync/commonspace/objectsync"
+	"github.com/anytypeio/any-sync/commonspace/objectsync/synchandler"
+	"github.com/anytypeio/any-sync/commonspace/spacestorage"
+	"github.com/anytypeio/any-sync/commonspace/syncstatus"
+	"github.com/anytypeio/any-sync/net/peer"
+	"github.com/anytypeio/any-sync/nodeconf"
 	"go.uber.org/zap"
 )
 
@@ -76,15 +76,12 @@ type BuildDeps struct {
 }
 
 func BuildSyncTreeOrGetRemote(ctx context.Context, id string, deps BuildDeps) (t SyncTree, err error) {
-	var (
-		remoteGetter = treeRemoteGetter{treeId: id, deps: deps}
-		isRemote     bool
-	)
-	deps.TreeStorage, isRemote, err = remoteGetter.getTree(ctx)
+	remoteGetter := treeRemoteGetter{treeId: id, deps: deps}
+	deps.TreeStorage, err = remoteGetter.getTree(ctx)
 	if err != nil {
 		return
 	}
-	return buildSyncTree(ctx, isRemote, deps)
+	return buildSyncTree(ctx, true, deps)
 }
 
 func PutSyncTree(ctx context.Context, payload treestorage.TreeStorageCreatePayload, deps BuildDeps) (t SyncTree, err error) {
@@ -95,7 +92,7 @@ func PutSyncTree(ctx context.Context, payload treestorage.TreeStorageCreatePaylo
 	return buildSyncTree(ctx, true, deps)
 }
 
-func buildSyncTree(ctx context.Context, sendUpdate bool, deps BuildDeps) (t SyncTree, err error) {
+func buildSyncTree(ctx context.Context, isFirstBuild bool, deps BuildDeps) (t SyncTree, err error) {
 	objTree, err := deps.BuildObjectTree(deps.TreeStorage, deps.AclList)
 	if err != nil {
 		return
@@ -116,7 +113,7 @@ func buildSyncTree(ctx context.Context, sendUpdate bool, deps BuildDeps) (t Sync
 	syncTree.afterBuild()
 	syncTree.Unlock()
 
-	if sendUpdate {
+	if isFirstBuild {
 		headUpdate := syncTree.syncClient.CreateHeadUpdate(t, nil)
 		// send to everybody, because everybody should know that the node or client got new tree
 		syncTree.syncClient.Broadcast(ctx, headUpdate)

commonspace/object/tree/synctree/synctree_test.go

@@ -2,15 +2,15 @@ package synctree
 
 import (
 	"context"
-	"github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
-	"github.com/anyproto/any-sync/commonspace/object/tree/objecttree/mock_objecttree"
-	"github.com/anyproto/any-sync/commonspace/object/tree/synctree/updatelistener"
-	"github.com/anyproto/any-sync/commonspace/object/tree/synctree/updatelistener/mock_updatelistener"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	"github.com/anyproto/any-sync/commonspace/objectsync"
-	"github.com/anyproto/any-sync/commonspace/objectsync/mock_objectsync"
-	"github.com/anyproto/any-sync/commonspace/syncstatus"
-	"github.com/anyproto/any-sync/nodeconf"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/objecttree"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/objecttree/mock_objecttree"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/synctree/updatelistener"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/synctree/updatelistener/mock_updatelistener"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
+	"github.com/anytypeio/any-sync/commonspace/objectsync"
+	"github.com/anytypeio/any-sync/commonspace/objectsync/mock_objectsync"
+	"github.com/anytypeio/any-sync/commonspace/syncstatus"
+	"github.com/anytypeio/any-sync/nodeconf"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 	"testing"

commonspace/object/tree/synctree/synctreehandler.go

@@ -2,13 +2,13 @@ package synctree
 
 import (
 	"context"
-	"github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	"github.com/anyproto/any-sync/commonspace/objectsync"
-	"github.com/anyproto/any-sync/commonspace/objectsync/synchandler"
-	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
-	"github.com/anyproto/any-sync/commonspace/syncstatus"
-	"github.com/anyproto/any-sync/util/slice"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/objecttree"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
+	"github.com/anytypeio/any-sync/commonspace/objectsync"
+	"github.com/anytypeio/any-sync/commonspace/objectsync/synchandler"
+	"github.com/anytypeio/any-sync/commonspace/spacesyncproto"
+	"github.com/anytypeio/any-sync/commonspace/syncstatus"
+	"github.com/anytypeio/any-sync/util/slice"
 	"github.com/gogo/protobuf/proto"
 	"go.uber.org/zap"
 	"sync"
@@ -93,7 +93,7 @@ func (s *syncTreeHandler) handleHeadUpdate(
 
 	defer func() {
 		if err != nil {
-			log.ErrorCtx(ctx, "head update finished with error", zap.Error(err))
+			log.With(zap.Error(err)).Debug("head update finished with error")
 		} else if fullRequest != nil {
 			cnt := fullRequest.Content.GetFullSyncRequest()
 			log = log.With(zap.Strings("request heads", cnt.Heads), zap.Int("len(request changes)", len(cnt.Changes)))
@@ -168,7 +168,7 @@ func (s *syncTreeHandler) handleFullSyncRequest(
 
 	defer func() {
 		if err != nil {
-			log.ErrorCtx(ctx, "full sync request finished with error", zap.Error(err))
+			log.With(zap.Error(err)).DebugCtx(ctx, "full sync request finished with error")
 			s.syncClient.SendWithReply(ctx, senderId, treeId, treechangeproto.WrapError(treechangeproto.ErrFullSync, header), replyId)
 			return
 		} else if fullResponse != nil {
@@ -212,7 +212,7 @@ func (s *syncTreeHandler) handleFullSyncResponse(
 
 	defer func() {
 		if err != nil {
-			log.ErrorCtx(ctx, "full sync response failed", zap.Error(err))
+			log.With(zap.Error(err)).DebugCtx(ctx, "full sync response failed")
 		} else {
 			log.DebugCtx(ctx, "full sync response succeeded")
 		}

commonspace/object/tree/synctree/synctreehandler_test.go

@@ -3,16 +3,16 @@ package synctree
 import (
 	"context"
 	"fmt"
-	"github.com/anyproto/any-sync/commonspace/objectsync"
-	"github.com/anyproto/any-sync/commonspace/objectsync/mock_objectsync"
+	"github.com/anytypeio/any-sync/commonspace/objectsync"
+	"github.com/anytypeio/any-sync/commonspace/objectsync/mock_objectsync"
 	"sync"
 	"testing"
 
-	"github.com/anyproto/any-sync/app/logger"
-	"github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
-	"github.com/anyproto/any-sync/commonspace/object/tree/objecttree/mock_objecttree"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	"github.com/anyproto/any-sync/commonspace/syncstatus"
+	"github.com/anytypeio/any-sync/app/logger"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/objecttree"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/objecttree/mock_objecttree"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
+	"github.com/anytypeio/any-sync/commonspace/syncstatus"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"

commonspace/object/tree/synctree/treeremotegetter.go

@@ -3,12 +3,12 @@ package synctree
 import (
 	"context"
 	"fmt"
-	"github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treestorage"
-	"github.com/anyproto/any-sync/commonspace/spacestorage"
-	"github.com/anyproto/any-sync/net/peer"
-	"github.com/anyproto/any-sync/net/rpc/rpcerr"
+	"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/spacestorage"
+	"github.com/anytypeio/any-sync/net/peer"
+	"github.com/anytypeio/any-sync/net/rpc/rpcerr"
 	"github.com/gogo/protobuf/proto"
 	"go.uber.org/zap"
 	"time"
@@ -90,11 +90,12 @@ Loop:
 	}
 }
 
-func (t treeRemoteGetter) getTree(ctx context.Context) (treeStorage treestorage.TreeStorage, isRemote bool, err error) {
+func (t treeRemoteGetter) getTree(ctx context.Context) (treeStorage treestorage.TreeStorage, err error) {
 	treeStorage, err = t.deps.SpaceStorage.TreeStorage(t.treeId)
 	if err == nil {
 		return
 	}
+
 	if err != nil && err != treestorage.ErrUnknownTreeId {
 		return
 	}
@@ -108,7 +109,6 @@ func (t treeRemoteGetter) getTree(ctx context.Context) (treeStorage treestorage.
 		return
 	}
 
-	isRemote = true
 	resp, err := t.treeRequestLoop(ctx, t.deps.WaitTreeRemoteSync)
 	if err != nil {
 		return
@@ -139,6 +139,5 @@ func (t treeRemoteGetter) getTree(ctx context.Context) (treeStorage treestorage.
 		return
 	}
 	// now we are sure that we can save it to the storage
-	treeStorage, err = t.deps.SpaceStorage.CreateTreeStorage(payload)
-	return
+	return t.deps.SpaceStorage.CreateTreeStorage(payload)
 }

commonspace/object/tree/synctree/updatelistener/mock_updatelistener/mock_updatelistener.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/anyproto/any-sync/commonspace/object/tree/synctree/updatelistener (interfaces: UpdateListener)
+// Source: github.com/anytypeio/any-sync/commonspace/object/tree/synctree/updatelistener (interfaces: UpdateListener)
 
 // Package mock_updatelistener is a generated GoMock package.
 package mock_updatelistener
@@ -7,7 +7,7 @@ package mock_updatelistener
 import (
 	reflect "reflect"
 
-	objecttree "github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
+	objecttree "github.com/anytypeio/any-sync/commonspace/object/tree/objecttree"
 	gomock "github.com/golang/mock/gomock"
 )
 

commonspace/object/tree/synctree/updatelistener/updatelistener.go

@@ -1,8 +1,8 @@
-//go:generate mockgen -destination mock_updatelistener/mock_updatelistener.go github.com/anyproto/any-sync/commonspace/object/tree/synctree/updatelistener UpdateListener
+//go:generate mockgen -destination mock_updatelistener/mock_updatelistener.go github.com/anytypeio/any-sync/commonspace/object/tree/synctree/updatelistener UpdateListener
 package updatelistener
 
 import (
-	"github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/objecttree"
 )
 
 type UpdateListener interface {

commonspace/object/tree/synctree/utils_test.go

@@ -3,15 +3,15 @@ package synctree
 import (
 	"context"
 	"fmt"
-	"github.com/anyproto/any-sync/commonspace/object/acl/list"
-	"github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treestorage"
-	"github.com/anyproto/any-sync/commonspace/objectsync"
-	"github.com/anyproto/any-sync/commonspace/objectsync/synchandler"
-	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
-	"github.com/anyproto/any-sync/commonspace/syncstatus"
-	"github.com/anyproto/any-sync/net/peer"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/list"
+	"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/objectsync"
+	"github.com/anytypeio/any-sync/commonspace/objectsync/synchandler"
+	"github.com/anytypeio/any-sync/commonspace/spacesyncproto"
+	"github.com/anytypeio/any-sync/commonspace/syncstatus"
+	"github.com/anytypeio/any-sync/net/peer"
 	"github.com/cheggaaa/mb/v3"
 	"github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/require"

commonspace/object/tree/treechangeproto/errors.go

@@ -2,7 +2,7 @@ package treechangeproto
 
 import (
 	"errors"
-	"github.com/anyproto/any-sync/net/rpc/rpcerr"
+	"github.com/anytypeio/any-sync/net/rpc/rpcerr"
 )
 
 var (

commonspace/object/tree/treechangeproto/treechange.go

@@ -1,6 +1,6 @@
 package treechangeproto
 
-import "github.com/anyproto/any-sync/net/rpc/rpcerr"
+import "github.com/anytypeio/any-sync/net/rpc/rpcerr"
 
 func WrapHeadUpdate(update *TreeHeadUpdate, rootChange *RawTreeChangeWithId) *TreeSyncMessage {
 	return &TreeSyncMessage{

commonspace/object/tree/treestorage/inmemory.go

@@ -3,8 +3,8 @@ package treestorage
 import (
 	"context"
 	"fmt"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	"github.com/anyproto/any-sync/util/slice"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
+	"github.com/anytypeio/any-sync/util/slice"
 	"sync"
 )
 
@@ -13,21 +13,13 @@ type InMemoryTreeStorage struct {
 	root    *treechangeproto.RawTreeChangeWithId
 	heads   []string
 	Changes map[string]*treechangeproto.RawTreeChangeWithId
-	addErr  error
 
 	sync.RWMutex
 }
 
-func (t *InMemoryTreeStorage) SetReturnErrorOnAdd(err error) {
-	t.addErr = err
-}
-
-func (t *InMemoryTreeStorage) AddRawChangesSetHeads(changes []*treechangeproto.RawTreeChangeWithId, heads []string) error {
+func (t *InMemoryTreeStorage) TransactionAdd(changes []*treechangeproto.RawTreeChangeWithId, heads []string) error {
 	t.RLock()
 	defer t.RUnlock()
-	if t.addErr != nil {
-		return t.addErr
-	}
 
 	for _, ch := range changes {
 		t.Changes[ch.Id] = ch

commonspace/object/tree/treestorage/mock_treestorage/mock_treestorage.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/anyproto/any-sync/commonspace/object/tree/treestorage (interfaces: TreeStorage)
+// Source: github.com/anytypeio/any-sync/commonspace/object/tree/treestorage (interfaces: TreeStorage)
 
 // Package mock_treestorage is a generated GoMock package.
 package mock_treestorage
@@ -8,7 +8,7 @@ import (
 	context "context"
 	reflect "reflect"
 
-	treechangeproto "github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
+	treechangeproto "github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
 	gomock "github.com/golang/mock/gomock"
 )
 
@@ -49,20 +49,6 @@ func (mr *MockTreeStorageMockRecorder) AddRawChange(arg0 interface{}) *gomock.Ca
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddRawChange", reflect.TypeOf((*MockTreeStorage)(nil).AddRawChange), arg0)
 }
 
-// AddRawChangesSetHeads mocks base method.
-func (m *MockTreeStorage) AddRawChangesSetHeads(arg0 []*treechangeproto.RawTreeChangeWithId, arg1 []string) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "AddRawChangesSetHeads", arg0, arg1)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// AddRawChangesSetHeads indicates an expected call of AddRawChangesSetHeads.
-func (mr *MockTreeStorageMockRecorder) AddRawChangesSetHeads(arg0, arg1 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddRawChangesSetHeads", reflect.TypeOf((*MockTreeStorage)(nil).AddRawChangesSetHeads), arg0, arg1)
-}
-
 // Delete mocks base method.
 func (m *MockTreeStorage) Delete() error {
 	m.ctrl.T.Helper()
@@ -164,3 +150,17 @@ func (mr *MockTreeStorageMockRecorder) SetHeads(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetHeads", reflect.TypeOf((*MockTreeStorage)(nil).SetHeads), arg0)
 }
+
+// TransactionAdd mocks base method.
+func (m *MockTreeStorage) TransactionAdd(arg0 []*treechangeproto.RawTreeChangeWithId, arg1 []string) error {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "TransactionAdd", arg0, arg1)
+	ret0, _ := ret[0].(error)
+	return ret0
+}
+
+// TransactionAdd indicates an expected call of TransactionAdd.
+func (mr *MockTreeStorageMockRecorder) TransactionAdd(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TransactionAdd", reflect.TypeOf((*MockTreeStorage)(nil).TransactionAdd), arg0, arg1)
+}

commonspace/object/tree/treestorage/treestorage.go

@@ -1,10 +1,10 @@
-//go:generate mockgen -destination mock_treestorage/mock_treestorage.go github.com/anyproto/any-sync/commonspace/object/tree/treestorage TreeStorage
+//go:generate mockgen -destination mock_treestorage/mock_treestorage.go github.com/anytypeio/any-sync/commonspace/object/tree/treestorage TreeStorage
 package treestorage
 
 import (
 	"context"
 	"errors"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
 )
 
 var (
@@ -31,7 +31,7 @@ type TreeStorage interface {
 	Heads() ([]string, error)
 	SetHeads(heads []string) error
 	AddRawChange(change *treechangeproto.RawTreeChangeWithId) error
-	AddRawChangesSetHeads(changes []*treechangeproto.RawTreeChangeWithId, heads []string) error
+	TransactionAdd(changes []*treechangeproto.RawTreeChangeWithId, heads []string) error
 
 	GetRawChange(ctx context.Context, id string) (*treechangeproto.RawTreeChangeWithId, error)
 	HasChange(ctx context.Context, id string) (bool, error)

commonspace/object/treemanager/mock_treemanager/mock_treemanager.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/anyproto/any-sync/commonspace/object/treemanager (interfaces: TreeManager,TreeSyncer)
+// Source: github.com/anytypeio/any-sync/commonspace/object/treemanager (interfaces: TreeManager)
 
 // Package mock_treemanager is a generated GoMock package.
 package mock_treemanager
@@ -8,9 +8,8 @@ import (
 	context "context"
 	reflect "reflect"
 
-	app "github.com/anyproto/any-sync/app"
-	objecttree "github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
-	treemanager "github.com/anyproto/any-sync/commonspace/object/treemanager"
+	app "github.com/anytypeio/any-sync/app"
+	objecttree "github.com/anytypeio/any-sync/commonspace/object/tree/objecttree"
 	gomock "github.com/golang/mock/gomock"
 )
 
@@ -94,20 +93,6 @@ func (mr *MockTreeManagerMockRecorder) Init(arg0 interface{}) *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockTreeManager)(nil).Init), arg0)
 }
 
-// MarkTreeDeleted mocks base method.
-func (m *MockTreeManager) MarkTreeDeleted(arg0 context.Context, arg1, arg2 string) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "MarkTreeDeleted", arg0, arg1, arg2)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// MarkTreeDeleted indicates an expected call of MarkTreeDeleted.
-func (mr *MockTreeManagerMockRecorder) MarkTreeDeleted(arg0, arg1, arg2 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MarkTreeDeleted", reflect.TypeOf((*MockTreeManager)(nil).MarkTreeDeleted), arg0, arg1, arg2)
-}
-
 // Name mocks base method.
 func (m *MockTreeManager) Name() string {
 	m.ctrl.T.Helper()
@@ -122,20 +107,6 @@ func (mr *MockTreeManagerMockRecorder) Name() *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Name", reflect.TypeOf((*MockTreeManager)(nil).Name))
 }
 
-// NewTreeSyncer mocks base method.
-func (m *MockTreeManager) NewTreeSyncer(arg0 string, arg1 treemanager.TreeManager) treemanager.TreeSyncer {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "NewTreeSyncer", arg0, arg1)
-	ret0, _ := ret[0].(treemanager.TreeSyncer)
-	return ret0
-}
-
-// NewTreeSyncer indicates an expected call of NewTreeSyncer.
-func (mr *MockTreeManagerMockRecorder) NewTreeSyncer(arg0, arg1 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewTreeSyncer", reflect.TypeOf((*MockTreeManager)(nil).NewTreeSyncer), arg0, arg1)
-}
-
 // Run mocks base method.
 func (m *MockTreeManager) Run(arg0 context.Context) error {
 	m.ctrl.T.Helper()
@@ -149,66 +120,3 @@ func (mr *MockTreeManagerMockRecorder) Run(arg0 interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Run", reflect.TypeOf((*MockTreeManager)(nil).Run), arg0)
 }
-
-// MockTreeSyncer is a mock of TreeSyncer interface.
-type MockTreeSyncer struct {
-	ctrl     *gomock.Controller
-	recorder *MockTreeSyncerMockRecorder
-}
-
-// MockTreeSyncerMockRecorder is the mock recorder for MockTreeSyncer.
-type MockTreeSyncerMockRecorder struct {
-	mock *MockTreeSyncer
-}
-
-// NewMockTreeSyncer creates a new mock instance.
-func NewMockTreeSyncer(ctrl *gomock.Controller) *MockTreeSyncer {
-	mock := &MockTreeSyncer{ctrl: ctrl}
-	mock.recorder = &MockTreeSyncerMockRecorder{mock}
-	return mock
-}
-
-// EXPECT returns an object that allows the caller to indicate expected use.
-func (m *MockTreeSyncer) EXPECT() *MockTreeSyncerMockRecorder {
-	return m.recorder
-}
-
-// Close mocks base method.
-func (m *MockTreeSyncer) Close() error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Close")
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// Close indicates an expected call of Close.
-func (mr *MockTreeSyncerMockRecorder) Close() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Close", reflect.TypeOf((*MockTreeSyncer)(nil).Close))
-}
-
-// Init mocks base method.
-func (m *MockTreeSyncer) Init() {
-	m.ctrl.T.Helper()
-	m.ctrl.Call(m, "Init")
-}
-
-// Init indicates an expected call of Init.
-func (mr *MockTreeSyncerMockRecorder) Init() *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Init", reflect.TypeOf((*MockTreeSyncer)(nil).Init))
-}
-
-// SyncAll mocks base method.
-func (m *MockTreeSyncer) SyncAll(arg0 context.Context, arg1 string, arg2, arg3 []string) error {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "SyncAll", arg0, arg1, arg2, arg3)
-	ret0, _ := ret[0].(error)
-	return ret0
-}
-
-// SyncAll indicates an expected call of SyncAll.
-func (mr *MockTreeSyncerMockRecorder) SyncAll(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncAll", reflect.TypeOf((*MockTreeSyncer)(nil).SyncAll), arg0, arg1, arg2, arg3)
-}

commonspace/object/treemanager/treemanager.go

@@ -1,10 +1,10 @@
-//go:generate mockgen -destination mock_treemanager/mock_treemanager.go github.com/anyproto/any-sync/commonspace/object/treemanager TreeManager,TreeSyncer
+//go:generate mockgen -destination mock_treemanager/mock_treemanager.go github.com/anytypeio/any-sync/commonspace/object/treemanager TreeManager
 package treemanager
 
 import (
 	"context"
-	"github.com/anyproto/any-sync/app"
-	"github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
+	"github.com/anytypeio/any-sync/app"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/objecttree"
 )
 
 const CName = "common.object.treemanager"
@@ -12,13 +12,5 @@ const CName = "common.object.treemanager"
 type TreeManager interface {
 	app.ComponentRunnable
 	GetTree(ctx context.Context, spaceId, treeId string) (objecttree.ObjectTree, error)
-	MarkTreeDeleted(ctx context.Context, spaceId, treeId string) error
 	DeleteTree(ctx context.Context, spaceId, treeId string) error
-	NewTreeSyncer(spaceId string, treeManager TreeManager) TreeSyncer
-}
-
-type TreeSyncer interface {
-	Init()
-	SyncAll(ctx context.Context, peerId string, existing, missing []string) error
-	Close() error
 }

commonspace/objectsync/mock_objectsync/mock_objectsync.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/anyproto/any-sync/commonspace/objectsync (interfaces: SyncClient)
+// Source: github.com/anytypeio/any-sync/commonspace/objectsync (interfaces: SyncClient)
 
 // Package mock_objectsync is a generated GoMock package.
 package mock_objectsync
@@ -8,10 +8,10 @@ import (
 	context "context"
 	reflect "reflect"
 
-	objecttree "github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
-	treechangeproto "github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	objectsync "github.com/anyproto/any-sync/commonspace/objectsync"
-	spacesyncproto "github.com/anyproto/any-sync/commonspace/spacesyncproto"
+	objecttree "github.com/anytypeio/any-sync/commonspace/object/tree/objecttree"
+	treechangeproto "github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
+	objectsync "github.com/anytypeio/any-sync/commonspace/objectsync"
+	spacesyncproto "github.com/anytypeio/any-sync/commonspace/spacesyncproto"
 	gomock "github.com/golang/mock/gomock"
 )
 

commonspace/objectsync/msgpool.go

@@ -3,9 +3,9 @@ package objectsync
 import (
 	"context"
 	"fmt"
-	"github.com/anyproto/any-sync/commonspace/objectsync/synchandler"
-	"github.com/anyproto/any-sync/commonspace/peermanager"
-	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
+	"github.com/anytypeio/any-sync/commonspace/objectsync/synchandler"
+	"github.com/anytypeio/any-sync/commonspace/peermanager"
+	"github.com/anytypeio/any-sync/commonspace/spacesyncproto"
 	"go.uber.org/zap"
 	"strconv"
 	"strings"
@@ -53,11 +53,9 @@ func newMessagePool(peerManager peermanager.PeerManager, messageHandler MessageH
 
 func (s *messagePool) SendSync(ctx context.Context, peerId string, msg *spacesyncproto.ObjectSyncMessage) (reply *spacesyncproto.ObjectSyncMessage, err error) {
 	s.updateLastUsage()
-	if _, ok := ctx.Deadline(); !ok {
-		var cancel context.CancelFunc
-		ctx, cancel = context.WithTimeout(ctx, time.Minute)
-		defer cancel()
-	}
+	var cancel context.CancelFunc
+	ctx, cancel = context.WithTimeout(ctx, time.Second*10)
+	defer cancel()
 	newCounter := s.counter.Add(1)
 	msg.RequestId = genReplyKey(peerId, msg.ObjectId, newCounter)
 	log.InfoCtx(ctx, "mpool sendSync", zap.String("requestId", msg.RequestId))
@@ -105,7 +103,6 @@ func (s *messagePool) HandleMessage(ctx context.Context, senderId string, msg *s
 			return
 		}
 		log.WarnCtx(ctx, "reply id does not exist", zap.String("replyId", msg.ReplyId))
-		return
 	}
 	return s.messageHandler(ctx, senderId, msg)
 }

commonspace/objectsync/objectsync.go

@@ -1,21 +1,20 @@
-//go:generate mockgen -destination mock_objectsync/mock_objectsync.go github.com/anyproto/any-sync/commonspace/objectsync SyncClient
+//go:generate mockgen -destination mock_objectsync/mock_objectsync.go github.com/anytypeio/any-sync/commonspace/objectsync SyncClient
 package objectsync
 
 import (
 	"context"
-	"fmt"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
 	"github.com/gogo/protobuf/proto"
 	"sync/atomic"
 	"time"
 
-	"github.com/anyproto/any-sync/app/logger"
-	"github.com/anyproto/any-sync/commonspace/object/syncobjectgetter"
-	"github.com/anyproto/any-sync/commonspace/objectsync/synchandler"
-	"github.com/anyproto/any-sync/commonspace/peermanager"
-	"github.com/anyproto/any-sync/commonspace/spacestorage"
-	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
-	"github.com/anyproto/any-sync/nodeconf"
+	"github.com/anytypeio/any-sync/app/logger"
+	"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"
 	"golang.org/x/exp/slices"
 )
@@ -88,68 +87,50 @@ func (s *objectSync) handleMessage(ctx context.Context, senderId string, msg *sp
 		log = log.With(zap.Bool("isDeleted", true))
 		// 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() {
-			s.unmarshallSendError(ctx, msg, spacesyncproto.ErrUnexpected, senderId, msg.ObjectId)
-			return fmt.Errorf("can't perform operation with object, space is deleted")
+			return s.unmarshallSendError(ctx, msg, spacesyncproto.ErrSpaceIsDeleted, senderId, msg.ObjectId)
 		}
 	}
 	log.DebugCtx(ctx, "handling message")
 	hasTree, err := s.spaceStorage.HasTree(msg.ObjectId)
 	if err != nil {
-		s.unmarshallSendError(ctx, msg, spacesyncproto.ErrUnexpected, senderId, msg.ObjectId)
-		return fmt.Errorf("falied to execute get operation on storage has tree: %w", err)
+		return s.unmarshallSendError(ctx, msg, spacesyncproto.ErrUnexpected, senderId, msg.ObjectId)
 	}
 	// in this case we will try to get it from remote, unless the sender also sent us the same request :-)
 	if !hasTree {
 		treeMsg := &treechangeproto.TreeSyncMessage{}
 		err = proto.Unmarshal(msg.Payload, treeMsg)
 		if err != nil {
-			s.sendError(ctx, nil, spacesyncproto.ErrUnexpected, senderId, msg.ObjectId, msg.RequestId)
-			return fmt.Errorf("failed to unmarshall tree sync message: %w", err)
+			return s.sendError(ctx, nil, spacesyncproto.ErrUnexpected, senderId, msg.ObjectId, msg.RequestId)
 		}
 		// this means that we don't have the tree locally and therefore can't return it
 		if s.isEmptyFullSyncRequest(treeMsg) {
-			err = treechangeproto.ErrGetTree
-			s.sendError(ctx, nil, treechangeproto.ErrGetTree, senderId, msg.ObjectId, msg.RequestId)
-			return fmt.Errorf("failed to get tree from storage on full sync: %w", err)
+			return s.sendError(ctx, nil, treechangeproto.ErrGetTree, senderId, msg.ObjectId, msg.RequestId)
 		}
 	}
 	obj, err := s.objectGetter.GetObject(ctx, msg.ObjectId)
 	if err != nil {
-		// TODO: write tests for object sync https://linear.app/anytype/issue/GO-1299/write-tests-for-commonspaceobjectsync
-		s.unmarshallSendError(ctx, msg, spacesyncproto.ErrUnexpected, senderId, msg.ObjectId)
-		return fmt.Errorf("failed to get object from cache: %w", err)
+		log.DebugCtx(ctx, "failed to get object")
+		return s.unmarshallSendError(ctx, msg, err, msg.ObjectId, senderId)
 	}
-	// TODO: unmarshall earlier
-	err = obj.HandleMessage(ctx, senderId, msg)
-	if err != nil {
-		s.unmarshallSendError(ctx, msg, spacesyncproto.ErrUnexpected, senderId, msg.ObjectId)
-		return fmt.Errorf("failed to handle message: %w", err)
-	}
-	return
+	return obj.HandleMessage(ctx, senderId, msg)
 }
 
 func (s *objectSync) SyncClient() SyncClient {
 	return s.syncClient
 }
 
-func (s *objectSync) unmarshallSendError(ctx context.Context, msg *spacesyncproto.ObjectSyncMessage, respErr error, senderId, objectId string) {
+func (s *objectSync) unmarshallSendError(ctx context.Context, msg *spacesyncproto.ObjectSyncMessage, respErr error, senderId, objectId string) (err error) {
 	unmarshalled := &treechangeproto.TreeSyncMessage{}
-	err := proto.Unmarshal(msg.Payload, unmarshalled)
+	err = proto.Unmarshal(msg.Payload, unmarshalled)
 	if err != nil {
 		return
 	}
-	s.sendError(ctx, unmarshalled.RootChange, respErr, senderId, objectId, msg.RequestId)
+	return s.sendError(ctx, unmarshalled.RootChange, respErr, senderId, objectId, msg.RequestId)
 }
 
-func (s *objectSync) sendError(ctx context.Context, root *treechangeproto.RawTreeChangeWithId, respErr error, senderId, objectId, replyId string) {
-	// we don't send errors if have no reply id, this can lead to bugs and also nobody needs this error
-	if replyId == "" {
-		return
-	}
+func (s *objectSync) sendError(ctx context.Context, root *treechangeproto.RawTreeChangeWithId, respErr error, senderId, objectId, replyId string) (err error) {
 	resp := treechangeproto.WrapError(respErr, root)
-	if err := s.syncClient.SendWithReply(ctx, senderId, objectId, resp, replyId); err != nil {
-		log.InfoCtx(ctx, "failed to send error to client")
-	}
+	return s.syncClient.SendWithReply(ctx, senderId, objectId, resp, replyId)
 }
 
 func (s *objectSync) isEmptyFullSyncRequest(msg *treechangeproto.TreeSyncMessage) bool {

commonspace/objectsync/requestfactory.go

@@ -2,9 +2,9 @@ package objectsync
 
 import (
 	"fmt"
-	"github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	"github.com/anyproto/any-sync/util/slice"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/objecttree"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
+	"github.com/anytypeio/any-sync/util/slice"
 )
 
 type RequestFactory interface {

commonspace/objectsync/syncclient.go

@@ -2,8 +2,8 @@ package objectsync
 
 import (
 	"context"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
+	"github.com/anytypeio/any-sync/commonspace/spacesyncproto"
 	"go.uber.org/zap"
 )
 

commonspace/objectsync/synchandler/synchhandler.go

@@ -2,7 +2,7 @@ package synchandler
 
 import (
 	"context"
-	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
+	"github.com/anytypeio/any-sync/commonspace/spacesyncproto"
 )
 
 type SyncHandler interface {

commonspace/payloads.go

@@ -2,14 +2,14 @@ package commonspace
 
 import (
 	"errors"
-	"github.com/anyproto/any-sync/commonspace/object/acl/aclrecordproto"
-	"github.com/anyproto/any-sync/commonspace/object/acl/list"
-	"github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	"github.com/anyproto/any-sync/commonspace/spacestorage"
-	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
-	"github.com/anyproto/any-sync/util/cidutil"
-	"github.com/anyproto/any-sync/util/crypto"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/list"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/objecttree"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
+	"github.com/anytypeio/any-sync/commonspace/spacestorage"
+	"github.com/anytypeio/any-sync/commonspace/spacesyncproto"
+	"github.com/anytypeio/any-sync/util/cidutil"
+	"github.com/anytypeio/any-sync/util/crypto"
 	"github.com/gogo/protobuf/proto"
 	"hash/fnv"
 	"math/rand"

commonspace/payloads_test.go

@@ -2,14 +2,14 @@ package commonspace
 
 import (
 	"fmt"
-	"github.com/anyproto/any-sync/commonspace/object/accountdata"
-	"github.com/anyproto/any-sync/commonspace/object/acl/aclrecordproto"
-	"github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	"github.com/anyproto/any-sync/commonspace/spacestorage"
-	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
-	"github.com/anyproto/any-sync/util/cidutil"
-	"github.com/anyproto/any-sync/util/crypto"
+	"github.com/anytypeio/any-sync/commonspace/object/accountdata"
+	"github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/objecttree"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
+	"github.com/anytypeio/any-sync/commonspace/spacestorage"
+	"github.com/anytypeio/any-sync/commonspace/spacesyncproto"
+	"github.com/anytypeio/any-sync/util/cidutil"
+	"github.com/anytypeio/any-sync/util/crypto"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"math/rand"

commonspace/peermanager/mock_peermanager/mock_peermanager.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/anyproto/any-sync/commonspace/peermanager (interfaces: PeerManager)
+// Source: github.com/anytypeio/any-sync/commonspace/peermanager (interfaces: PeerManager)
 
 // Package mock_peermanager is a generated GoMock package.
 package mock_peermanager
@@ -8,8 +8,8 @@ import (
 	context "context"
 	reflect "reflect"
 
-	spacesyncproto "github.com/anyproto/any-sync/commonspace/spacesyncproto"
-	peer "github.com/anyproto/any-sync/net/peer"
+	spacesyncproto "github.com/anytypeio/any-sync/commonspace/spacesyncproto"
+	peer "github.com/anytypeio/any-sync/net/peer"
 	gomock "github.com/golang/mock/gomock"
 )
 

commonspace/peermanager/peermanager.go

@@ -1,11 +1,11 @@
-//go:generate mockgen -destination mock_peermanager/mock_peermanager.go github.com/anyproto/any-sync/commonspace/peermanager PeerManager
+//go:generate mockgen -destination mock_peermanager/mock_peermanager.go github.com/anytypeio/any-sync/commonspace/peermanager PeerManager
 package peermanager
 
 import (
 	"context"
-	"github.com/anyproto/any-sync/app"
-	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
-	"github.com/anyproto/any-sync/net/peer"
+	"github.com/anytypeio/any-sync/app"
+	"github.com/anytypeio/any-sync/commonspace/spacesyncproto"
+	"github.com/anytypeio/any-sync/net/peer"
 )
 
 const CName = "common.commonspace.peermanager"

commonspace/settings/deleter.go

@@ -2,10 +2,9 @@ package settings
 
 import (
 	"context"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treestorage"
-	"github.com/anyproto/any-sync/commonspace/object/treemanager"
-	"github.com/anyproto/any-sync/commonspace/settings/settingsstate"
-	"github.com/anyproto/any-sync/commonspace/spacestorage"
+	"github.com/anytypeio/any-sync/commonspace/object/treemanager"
+	"github.com/anytypeio/any-sync/commonspace/settings/settingsstate"
+	"github.com/anytypeio/any-sync/commonspace/spacestorage"
 	"go.uber.org/zap"
 )
 
@@ -24,40 +23,17 @@ func newDeleter(st spacestorage.SpaceStorage, state settingsstate.ObjectDeletion
 }
 
 func (d *deleter) Delete() {
-	var (
-		allQueued = d.state.GetQueued()
-		spaceId   = d.st.Id()
-	)
+	allQueued := d.state.GetQueued()
 	for _, id := range allQueued {
-		log := log.With(zap.String("treeId", id), zap.String("spaceId", spaceId))
-		shouldDelete, err := d.tryMarkDeleted(spaceId, id)
-		if !shouldDelete {
-			if err != nil {
-				log.Error("failed to mark object as deleted", zap.Error(err))
-				continue
-			}
-		} else {
-			err = d.getter.DeleteTree(context.Background(), spaceId, id)
-			if err != nil && err != spacestorage.ErrTreeStorageAlreadyDeleted {
-				log.Error("failed to delete object", zap.Error(err))
-				continue
-			}
+		err := d.getter.DeleteTree(context.Background(), d.st.Id(), id)
+		if err != nil && err != spacestorage.ErrTreeStorageAlreadyDeleted {
+			log.With(zap.String("id", id), zap.Error(err)).Error("failed to delete object")
+			continue
 		}
 		err = d.state.Delete(id)
 		if err != nil {
-			log.Error("failed to mark object as deleted", zap.Error(err))
+			log.With(zap.String("id", id), zap.Error(err)).Error("failed to mark object as deleted")
 		}
-		log.Debug("object successfully deleted", zap.Error(err))
+		log.With(zap.String("id", id), zap.Error(err)).Debug("object successfully deleted")
 	}
 }
-
-func (d *deleter) tryMarkDeleted(spaceId, treeId string) (bool, error) {
-	_, err := d.st.TreeStorage(treeId)
-	if err == nil {
-		return true, nil
-	}
-	if err != treestorage.ErrUnknownTreeId {
-		return false, err
-	}
-	return false, d.getter.MarkTreeDeleted(context.Background(), spaceId, treeId)
-}

commonspace/settings/deleter_test.go

@@ -2,10 +2,10 @@ package settings
 
 import (
 	"fmt"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treestorage"
-	"github.com/anyproto/any-sync/commonspace/object/treemanager/mock_treemanager"
-	"github.com/anyproto/any-sync/commonspace/settings/settingsstate/mock_settingsstate"
-	"github.com/anyproto/any-sync/commonspace/spacestorage/mock_spacestorage"
+	"github.com/anytypeio/any-sync/commonspace/object/treemanager/mock_treemanager"
+	"github.com/anytypeio/any-sync/commonspace/settings/settingsstate/mock_settingsstate"
+	"github.com/anytypeio/any-sync/commonspace/spacestorage"
+	"github.com/anytypeio/any-sync/commonspace/spacestorage/mock_spacestorage"
 	"github.com/golang/mock/gomock"
 	"testing"
 )
@@ -18,46 +18,23 @@ func TestDeleter_Delete(t *testing.T) {
 
 	deleter := newDeleter(st, delState, treeManager)
 
-	t.Run("deleter delete mark deleted success", func(t *testing.T) {
+	t.Run("deleter delete queued", func(t *testing.T) {
 		id := "id"
 		spaceId := "spaceId"
 		delState.EXPECT().GetQueued().Return([]string{id})
 		st.EXPECT().Id().Return(spaceId)
-		st.EXPECT().TreeStorage(id).Return(nil, treestorage.ErrUnknownTreeId)
-		treeManager.EXPECT().MarkTreeDeleted(gomock.Any(), spaceId, id).Return(nil)
+		treeManager.EXPECT().DeleteTree(gomock.Any(), spaceId, id).Return(nil)
 		delState.EXPECT().Delete(id).Return(nil)
 
 		deleter.Delete()
 	})
 
-	t.Run("deleter delete mark deleted other error", func(t *testing.T) {
+	t.Run("deleter delete already deleted", func(t *testing.T) {
 		id := "id"
 		spaceId := "spaceId"
 		delState.EXPECT().GetQueued().Return([]string{id})
 		st.EXPECT().Id().Return(spaceId)
-		st.EXPECT().TreeStorage(id).Return(nil, fmt.Errorf("unknown error"))
-
-		deleter.Delete()
-	})
-
-	t.Run("deleter delete mark deleted fail", func(t *testing.T) {
-		id := "id"
-		spaceId := "spaceId"
-		delState.EXPECT().GetQueued().Return([]string{id})
-		st.EXPECT().Id().Return(spaceId)
-		st.EXPECT().TreeStorage(id).Return(nil, treestorage.ErrUnknownTreeId)
-		treeManager.EXPECT().MarkTreeDeleted(gomock.Any(), spaceId, id).Return(fmt.Errorf("mark error"))
-
-		deleter.Delete()
-	})
-	//treeManager.EXPECT().DeleteTree(gomock.Any(), spaceId, id).Return(spacestorage.ErrTreeStorageAlreadyDeleted)
-	t.Run("deleter delete success", func(t *testing.T) {
-		id := "id"
-		spaceId := "spaceId"
-		delState.EXPECT().GetQueued().Return([]string{id})
-		st.EXPECT().Id().Return(spaceId)
-		st.EXPECT().TreeStorage(id).Return(nil, nil)
-		treeManager.EXPECT().DeleteTree(gomock.Any(), spaceId, id).Return(nil)
+		treeManager.EXPECT().DeleteTree(gomock.Any(), spaceId, id).Return(spacestorage.ErrTreeStorageAlreadyDeleted)
 		delState.EXPECT().Delete(id).Return(nil)
 
 		deleter.Delete()
@@ -68,7 +45,6 @@ func TestDeleter_Delete(t *testing.T) {
 		spaceId := "spaceId"
 		delState.EXPECT().GetQueued().Return([]string{id})
 		st.EXPECT().Id().Return(spaceId)
-		st.EXPECT().TreeStorage(id).Return(nil, nil)
 		treeManager.EXPECT().DeleteTree(gomock.Any(), spaceId, id).Return(fmt.Errorf("some error"))
 
 		deleter.Delete()

commonspace/settings/deletionmanager.go

@@ -2,8 +2,9 @@ package settings
 
 import (
 	"context"
-	"github.com/anyproto/any-sync/commonspace/object/treemanager"
-	"github.com/anyproto/any-sync/commonspace/settings/settingsstate"
+	"github.com/anytypeio/any-sync/commonspace/object/treemanager"
+	"github.com/anytypeio/any-sync/commonspace/settings/settingsstate"
+	"github.com/anytypeio/any-sync/util/slice"
 	"go.uber.org/zap"
 )
 
@@ -46,20 +47,22 @@ type deletionManager struct {
 
 func (d *deletionManager) UpdateState(ctx context.Context, state *settingsstate.State) error {
 	log := log.With(zap.String("spaceId", d.spaceId))
-	d.deletionState.Add(state.DeletedIds)
+	err := d.deletionState.Add(state.DeletedIds)
+	if err != nil {
+		log.Debug("failed to add deleted ids to deletion state")
+	}
 	if state.DeleterId == "" {
 		return nil
 	}
-	// we should delete space
 	log.Debug("deleting space")
 	if d.isResponsible {
-		mapIds := map[string]struct{}{}
-		for _, id := range d.provider.AllIds() {
-			if id != d.settingsId {
-				mapIds[id] = struct{}{}
-			}
+		allIds := slice.DiscardFromSlice(d.provider.AllIds(), func(id string) bool {
+			return id == d.settingsId
+		})
+		err := d.deletionState.Add(allIds)
+		if err != nil {
+			log.Debug("failed to add all ids to deletion state")
 		}
-		d.deletionState.Add(mapIds)
 	}
 	d.onSpaceDelete()
 	return nil

commonspace/settings/deletionmanager_test.go

@@ -2,10 +2,10 @@ package settings
 
 import (
 	"context"
-	"github.com/anyproto/any-sync/commonspace/object/treemanager/mock_treemanager"
-	"github.com/anyproto/any-sync/commonspace/settings/mock_settings"
-	"github.com/anyproto/any-sync/commonspace/settings/settingsstate"
-	"github.com/anyproto/any-sync/commonspace/settings/settingsstate/mock_settingsstate"
+	"github.com/anytypeio/any-sync/commonspace/object/treemanager/mock_treemanager"
+	"github.com/anytypeio/any-sync/commonspace/settings/mock_settings"
+	"github.com/anytypeio/any-sync/commonspace/settings/settingsstate"
+	"github.com/anytypeio/any-sync/commonspace/settings/settingsstate/mock_settingsstate"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 	"testing"
@@ -19,7 +19,7 @@ func TestDeletionManager_UpdateState_NotResponsible(t *testing.T) {
 	spaceId := "spaceId"
 	settingsId := "settingsId"
 	state := &settingsstate.State{
-		DeletedIds: map[string]struct{}{"id": {}},
+		DeletedIds: []string{"id"},
 		DeleterId:  "deleterId",
 	}
 	deleted := false
@@ -29,7 +29,7 @@ func TestDeletionManager_UpdateState_NotResponsible(t *testing.T) {
 	delState := mock_settingsstate.NewMockObjectDeletionState(ctrl)
 	treeManager := mock_treemanager.NewMockTreeManager(ctrl)
 
-	delState.EXPECT().Add(state.DeletedIds)
+	delState.EXPECT().Add(state.DeletedIds).Return(nil)
 
 	delManager := newDeletionManager(spaceId,
 		settingsId,
@@ -51,7 +51,7 @@ func TestDeletionManager_UpdateState_Responsible(t *testing.T) {
 	spaceId := "spaceId"
 	settingsId := "settingsId"
 	state := &settingsstate.State{
-		DeletedIds: map[string]struct{}{"id": struct{}{}},
+		DeletedIds: []string{"id"},
 		DeleterId:  "deleterId",
 	}
 	deleted := false
@@ -62,9 +62,9 @@ func TestDeletionManager_UpdateState_Responsible(t *testing.T) {
 	treeManager := mock_treemanager.NewMockTreeManager(ctrl)
 	provider := mock_settings.NewMockSpaceIdsProvider(ctrl)
 
-	delState.EXPECT().Add(state.DeletedIds)
+	delState.EXPECT().Add(state.DeletedIds).Return(nil)
 	provider.EXPECT().AllIds().Return([]string{"id", "otherId", settingsId})
-	delState.EXPECT().Add(map[string]struct{}{"id": {}, "otherId": {}})
+	delState.EXPECT().Add([]string{"id", "otherId"}).Return(nil)
 	delManager := newDeletionManager(spaceId,
 		settingsId,
 		true,

commonspace/settings/mock_settings/mock_settings.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/anyproto/any-sync/commonspace/settings (interfaces: DeletionManager,Deleter,SpaceIdsProvider)
+// Source: github.com/anytypeio/any-sync/commonspace/settings (interfaces: DeletionManager,Deleter,SpaceIdsProvider)
 
 // Package mock_settings is a generated GoMock package.
 package mock_settings
@@ -8,7 +8,7 @@ import (
 	context "context"
 	reflect "reflect"
 
-	settingsstate "github.com/anyproto/any-sync/commonspace/settings/settingsstate"
+	settingsstate "github.com/anytypeio/any-sync/commonspace/settings/settingsstate"
 	gomock "github.com/golang/mock/gomock"
 )
 

commonspace/settings/settings.go

@@ -1,23 +1,23 @@
-//go:generate mockgen -destination mock_settings/mock_settings.go github.com/anyproto/any-sync/commonspace/settings DeletionManager,Deleter,SpaceIdsProvider
+//go:generate mockgen -destination mock_settings/mock_settings.go github.com/anytypeio/any-sync/commonspace/settings DeletionManager,Deleter,SpaceIdsProvider
 package settings
 
 import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/anyproto/any-sync/util/crypto"
+	"github.com/anytypeio/any-sync/util/crypto"
 
-	"github.com/anyproto/any-sync/accountservice"
-	"github.com/anyproto/any-sync/app/logger"
-	"github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
-	"github.com/anyproto/any-sync/commonspace/object/tree/synctree"
-	"github.com/anyproto/any-sync/commonspace/object/tree/synctree/updatelistener"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	"github.com/anyproto/any-sync/commonspace/object/treemanager"
-	"github.com/anyproto/any-sync/commonspace/settings/settingsstate"
-	"github.com/anyproto/any-sync/commonspace/spacestorage"
-	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
-	"github.com/anyproto/any-sync/nodeconf"
+	"github.com/anytypeio/any-sync/accountservice"
+	"github.com/anytypeio/any-sync/app/logger"
+	"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"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
+	"github.com/anytypeio/any-sync/commonspace/object/treemanager"
+	"github.com/anytypeio/any-sync/commonspace/settings/settingsstate"
+	"github.com/anytypeio/any-sync/commonspace/spacestorage"
+	"github.com/anytypeio/any-sync/commonspace/spacesyncproto"
+	"github.com/anytypeio/any-sync/nodeconf"
 	"github.com/gogo/protobuf/proto"
 	"go.uber.org/zap"
 	"golang.org/x/exp/slices"
@@ -40,16 +40,7 @@ var (
 	ErrCantDeleteSpace = errors.New("not able to delete space")
 )
 
-var (
-	DoSnapshot       = objecttree.DoSnapshot
-	buildHistoryTree = func(objTree objecttree.ObjectTree) (objecttree.ReadableObjectTree, error) {
-		return objecttree.BuildHistoryTree(objecttree.HistoryTreeParams{
-			TreeStorage:   objTree.Storage(),
-			AclList:       objTree.AclList(),
-			BuildFullTree: true,
-		})
-	}
-)
+var doSnapshot = objecttree.DoSnapshot
 
 type BuildTreeFunc func(ctx context.Context, id string, listener updatelistener.UpdateListener) (t synctree.SyncTree, err error)
 
@@ -175,33 +166,8 @@ func (s *settingsObject) Init(ctx context.Context) (err error) {
 	if err != nil {
 		return
 	}
-	// TODO: remove this check when everybody updates
-	if err = s.checkHistoryState(ctx); err != nil {
-		return
-	}
-	s.loop.Run()
-	return
-}
 
-func (s *settingsObject) checkHistoryState(ctx context.Context) (err error) {
-	historyTree, err := buildHistoryTree(s.SyncTree)
-	if err != nil {
-		return
-	}
-	fullState, err := s.builder.Build(historyTree, nil)
-	if err != nil {
-		return
-	}
-	if len(fullState.DeletedIds) != len(s.state.DeletedIds) {
-		log.WarnCtx(ctx, "state does not have all deleted ids",
-			zap.Int("fullstate ids", len(fullState.DeletedIds)),
-			zap.Int("state ids", len(fullState.DeletedIds)))
-		s.state = fullState
-		err = s.deletionManager.UpdateState(context.Background(), s.state)
-		if err != nil {
-			return
-		}
-	}
+	s.loop.Run()
 	return
 }
 
@@ -255,7 +221,7 @@ func (s *settingsObject) DeleteObject(id string) (err error) {
 		err = ErrDeleteSelf
 		return
 	}
-	if s.state.Exists(id) {
+	if s.deletionState.Exists(id) {
 		err = ErrAlreadyDeleted
 		return nil
 	}
@@ -264,7 +230,7 @@ func (s *settingsObject) DeleteObject(id string) (err error) {
 		err = ErrObjDoesNotExist
 		return
 	}
-	isSnapshot := DoSnapshot(s.Len())
+	isSnapshot := doSnapshot(s.Len())
 	res, err := s.changeFactory.CreateObjectDeleteChange(id, s.state, isSnapshot)
 	if err != nil {
 		return
@@ -283,7 +249,7 @@ func (s *settingsObject) verifyDeleteSpace(raw *treechangeproto.RawTreeChangeWit
 
 func (s *settingsObject) addContent(data []byte, isSnapshot bool) (err error) {
 	accountData := s.account.Account()
-	res, err := s.AddContent(context.Background(), objecttree.SignableChangeContent{
+	_, err = s.AddContent(context.Background(), objecttree.SignableChangeContent{
 		Data:        data,
 		Key:         accountData.SignKey,
 		IsSnapshot:  isSnapshot,
@@ -292,11 +258,8 @@ func (s *settingsObject) addContent(data []byte, isSnapshot bool) (err error) {
 	if err != nil {
 		return
 	}
-	if res.Mode == objecttree.Rebuild {
-		s.Rebuild(s)
-	} else {
-		s.Update(s)
-	}
+
+	s.Update(s)
 	return
 }
 

commonspace/settings/settings_test.go

@@ -2,19 +2,18 @@ package settings
 
 import (
 	"context"
-	"github.com/anyproto/any-sync/accountservice/mock_accountservice"
-	"github.com/anyproto/any-sync/commonspace/object/accountdata"
-	"github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
-	"github.com/anyproto/any-sync/commonspace/object/tree/objecttree/mock_objecttree"
-	"github.com/anyproto/any-sync/commonspace/object/tree/synctree"
-	"github.com/anyproto/any-sync/commonspace/object/tree/synctree/mock_synctree"
-	"github.com/anyproto/any-sync/commonspace/object/tree/synctree/updatelistener"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	"github.com/anyproto/any-sync/commonspace/object/treemanager/mock_treemanager"
-	"github.com/anyproto/any-sync/commonspace/settings/mock_settings"
-	"github.com/anyproto/any-sync/commonspace/settings/settingsstate"
-	"github.com/anyproto/any-sync/commonspace/settings/settingsstate/mock_settingsstate"
-	"github.com/anyproto/any-sync/commonspace/spacestorage/mock_spacestorage"
+	"github.com/anytypeio/any-sync/accountservice/mock_accountservice"
+	"github.com/anytypeio/any-sync/commonspace/object/accountdata"
+	"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/mock_synctree"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/synctree/updatelistener"
+	"github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto"
+	"github.com/anytypeio/any-sync/commonspace/object/treemanager/mock_treemanager"
+	"github.com/anytypeio/any-sync/commonspace/settings/mock_settings"
+	"github.com/anytypeio/any-sync/commonspace/settings/settingsstate"
+	"github.com/anytypeio/any-sync/commonspace/settings/settingsstate/mock_settingsstate"
+	"github.com/anytypeio/any-sync/commonspace/spacestorage/mock_spacestorage"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 	"sync"
@@ -53,7 +52,6 @@ type settingsFixture struct {
 	changeFactory   *mock_settingsstate.MockChangeFactory
 	deleter         *mock_settings.MockDeleter
 	syncTree        *mock_synctree.MockSyncTree
-	historyTree     *mock_objecttree.MockObjectTree
 	delState        *mock_settingsstate.MockObjectDeletionState
 	account         *mock_accountservice.MockService
 }
@@ -71,7 +69,6 @@ func newSettingsFixture(t *testing.T) *settingsFixture {
 	stateBuilder := mock_settingsstate.NewMockStateBuilder(ctrl)
 	changeFactory := mock_settingsstate.NewMockChangeFactory(ctrl)
 	syncTree := mock_synctree.NewMockSyncTree(ctrl)
-	historyTree := mock_objecttree.NewMockObjectTree(ctrl)
 	del := mock_settings.NewMockDeleter(ctrl)
 
 	delState.EXPECT().AddObserver(gomock.Any())
@@ -80,9 +77,6 @@ func newSettingsFixture(t *testing.T) *settingsFixture {
 		require.Equal(t, objectId, id)
 		return newTestObjMock(syncTree), nil
 	})
-	buildHistoryTree = func(objTree objecttree.ObjectTree) (objecttree.ReadableObjectTree, error) {
-		return historyTree, nil
-	}
 
 	deps := Deps{
 		BuildFunc:     buildFunc,
@@ -110,48 +104,45 @@ func newSettingsFixture(t *testing.T) *settingsFixture {
 		syncTree:        syncTree,
 		account:         acc,
 		delState:        delState,
-		historyTree:     historyTree,
 	}
 }
 
-func (fx *settingsFixture) init(t *testing.T) {
-	fx.spaceStorage.EXPECT().SpaceSettingsId().Return(fx.docId)
-	fx.deleter.EXPECT().Delete()
-	fx.stateBuilder.EXPECT().Build(fx.historyTree, nil).Return(&settingsstate.State{}, nil)
-	fx.doc.state = &settingsstate.State{}
-
-	err := fx.doc.Init(context.Background())
-	require.NoError(t, err)
-}
-
-func (fx *settingsFixture) stop(t *testing.T) {
-	fx.syncTree.EXPECT().Close().Return(nil)
-
-	err := fx.doc.Close()
-	require.NoError(t, err)
+func (fx *settingsFixture) stop() {
 	fx.ctrl.Finish()
 }
 
 func TestSettingsObject_Init(t *testing.T) {
 	fx := newSettingsFixture(t)
-	defer fx.stop(t)
+	defer fx.stop()
 
-	fx.init(t)
+	fx.spaceStorage.EXPECT().SpaceSettingsId().Return(fx.docId)
+	fx.deleter.EXPECT().Delete()
+	fx.syncTree.EXPECT().Close().Return(nil)
+
+	err := fx.doc.Init(context.Background())
+	require.NoError(t, err)
+	err = fx.doc.Close()
+	require.NoError(t, err)
 }
 
 func TestSettingsObject_DeleteObject_NoSnapshot(t *testing.T) {
 	fx := newSettingsFixture(t)
-	defer fx.stop(t)
+	defer fx.stop()
 
-	fx.init(t)
+	fx.spaceStorage.EXPECT().SpaceSettingsId().Return(fx.docId)
+	fx.deleter.EXPECT().Delete()
+
+	err := fx.doc.Init(context.Background())
+	require.NoError(t, err)
 
 	delId := "delId"
-	DoSnapshot = func(len int) bool {
+	doSnapshot = func(len int) bool {
 		return false
 	}
 
 	fx.syncTree.EXPECT().Id().Return("syncId")
 	fx.syncTree.EXPECT().Len().Return(10)
+	fx.delState.EXPECT().Exists(delId).Return(false)
 	fx.spaceStorage.EXPECT().TreeStorage(delId).Return(nil, nil)
 	res := []byte("settingsData")
 	fx.doc.state = &settingsstate.State{LastIteratedId: "someId"}
@@ -171,20 +162,30 @@ func TestSettingsObject_DeleteObject_NoSnapshot(t *testing.T) {
 	fx.deletionManager.EXPECT().UpdateState(gomock.Any(), fx.doc.state).Return(nil)
 	err = fx.doc.DeleteObject(delId)
 	require.NoError(t, err)
+
+	fx.syncTree.EXPECT().Close().Return(nil)
+	err = fx.doc.Close()
+	require.NoError(t, err)
 }
 
 func TestSettingsObject_DeleteObject_WithSnapshot(t *testing.T) {
 	fx := newSettingsFixture(t)
-	defer fx.stop(t)
+	defer fx.stop()
+
+	fx.spaceStorage.EXPECT().SpaceSettingsId().Return(fx.docId)
+	fx.deleter.EXPECT().Delete()
+
+	err := fx.doc.Init(context.Background())
+	require.NoError(t, err)
 
-	fx.init(t)
 	delId := "delId"
-	DoSnapshot = func(len int) bool {
+	doSnapshot = func(len int) bool {
 		return true
 	}
 
 	fx.syncTree.EXPECT().Id().Return("syncId")
 	fx.syncTree.EXPECT().Len().Return(10)
+	fx.delState.EXPECT().Exists(delId).Return(false)
 	fx.spaceStorage.EXPECT().TreeStorage(delId).Return(nil, nil)
 	res := []byte("settingsData")
 	fx.doc.state = &settingsstate.State{LastIteratedId: "someId"}
@@ -198,19 +199,27 @@ func TestSettingsObject_DeleteObject_WithSnapshot(t *testing.T) {
 		Key:         accountData.SignKey,
 		IsSnapshot:  true,
 		IsEncrypted: false,
-	}).Return(objecttree.AddResult{Mode: objecttree.Rebuild}, nil)
+	}).Return(objecttree.AddResult{}, nil)
 
-	fx.stateBuilder.EXPECT().Build(fx.doc, nil).Return(fx.doc.state, nil)
+	fx.stateBuilder.EXPECT().Build(fx.doc, fx.doc.state).Return(fx.doc.state, nil)
 	fx.deletionManager.EXPECT().UpdateState(gomock.Any(), fx.doc.state).Return(nil)
 	err = fx.doc.DeleteObject(delId)
 	require.NoError(t, err)
+
+	fx.syncTree.EXPECT().Close().Return(nil)
+	err = fx.doc.Close()
+	require.NoError(t, err)
 }
 
 func TestSettingsObject_Rebuild(t *testing.T) {
 	fx := newSettingsFixture(t)
-	defer fx.stop(t)
+	defer fx.stop()
 
-	fx.init(t)
+	fx.spaceStorage.EXPECT().SpaceSettingsId().Return(fx.docId)
+	fx.deleter.EXPECT().Delete()
+
+	err := fx.doc.Init(context.Background())
+	require.NoError(t, err)
 	time.Sleep(100 * time.Millisecond)
 
 	newSt := &settingsstate.State{}
@@ -223,9 +232,13 @@ func TestSettingsObject_Rebuild(t *testing.T) {
 
 func TestSettingsObject_Update(t *testing.T) {
 	fx := newSettingsFixture(t)
-	defer fx.stop(t)
+	defer fx.stop()
 
-	fx.init(t)
+	fx.spaceStorage.EXPECT().SpaceSettingsId().Return(fx.docId)
+	fx.deleter.EXPECT().Delete()
+
+	err := fx.doc.Init(context.Background())
+	require.NoError(t, err)
 	time.Sleep(100 * time.Millisecond)
 
 	fx.doc.state = &settingsstate.State{}
@@ -237,9 +250,13 @@ func TestSettingsObject_Update(t *testing.T) {
 
 func TestSettingsObject_DeleteSpace(t *testing.T) {
 	fx := newSettingsFixture(t)
-	defer fx.stop(t)
+	defer fx.stop()
 
-	fx.init(t)
+	fx.spaceStorage.EXPECT().SpaceSettingsId().Return(fx.docId)
+	fx.deleter.EXPECT().Delete()
+
+	err := fx.doc.Init(context.Background())
+	require.NoError(t, err)
 	time.Sleep(100 * time.Millisecond)
 
 	deleterId := "delId"
@@ -258,15 +275,19 @@ func TestSettingsObject_DeleteSpace(t *testing.T) {
 		Heads: []string{rawCh.Id},
 	}, nil)
 
-	err := fx.doc.DeleteSpace(context.Background(), rawCh)
+	err = fx.doc.DeleteSpace(context.Background(), rawCh)
 	require.NoError(t, err)
 }
 
 func TestSettingsObject_DeleteSpaceIncorrectChange(t *testing.T) {
 	fx := newSettingsFixture(t)
-	defer fx.stop(t)
+	defer fx.stop()
 
-	fx.init(t)
+	fx.spaceStorage.EXPECT().SpaceSettingsId().Return(fx.docId)
+	fx.deleter.EXPECT().Delete()
+
+	err := fx.doc.Init(context.Background())
+	require.NoError(t, err)
 	time.Sleep(100 * time.Millisecond)
 
 	t.Run("incorrect change type", func(t *testing.T) {
@@ -278,7 +299,7 @@ func TestSettingsObject_DeleteSpaceIncorrectChange(t *testing.T) {
 		delChange, _ := changeFactory.CreateObjectDeleteChange("otherId", &settingsstate.State{}, false)
 
 		fx.syncTree.EXPECT().UnpackChange(rawCh).Return(delChange, nil)
-		err := fx.doc.DeleteSpace(context.Background(), rawCh)
+		err = fx.doc.DeleteSpace(context.Background(), rawCh)
 		require.NotNil(t, err)
 	})
 
@@ -291,7 +312,7 @@ func TestSettingsObject_DeleteSpaceIncorrectChange(t *testing.T) {
 		delChange, _ := changeFactory.CreateSpaceDeleteChange("", &settingsstate.State{}, false)
 
 		fx.syncTree.EXPECT().UnpackChange(rawCh).Return(delChange, nil)
-		err := fx.doc.DeleteSpace(context.Background(), rawCh)
+		err = fx.doc.DeleteSpace(context.Background(), rawCh)
 		require.NotNil(t, err)
 	})
 }

commonspace/settings/settingsstate/changefactory.go

@@ -1,7 +1,7 @@
 package settingsstate
 
 import (
-	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
+	"github.com/anytypeio/any-sync/commonspace/spacesyncproto"
 )
 
 type ChangeFactory interface {
@@ -50,7 +50,7 @@ func (c *changeFactory) CreateSpaceDeleteChange(peerId string, state *State, isS
 
 func (c *changeFactory) makeSnapshot(state *State, objectId, deleterPeer string) *spacesyncproto.SpaceSettingsSnapshot {
 	var (
-		deletedIds = make([]string, 0, len(state.DeletedIds)+1)
+		deletedIds = state.DeletedIds
 		deleterId  = state.DeleterId
 	)
 	if objectId != "" {
@@ -59,9 +59,6 @@ func (c *changeFactory) makeSnapshot(state *State, objectId, deleterPeer string)
 	if deleterPeer != "" {
 		deleterId = deleterPeer
 	}
-	for id := range state.DeletedIds {
-		deletedIds = append(deletedIds, id)
-	}
 	return &spacesyncproto.SpaceSettingsSnapshot{
 		DeletedIds:    deletedIds,
 		DeleterPeerId: deleterId,

commonspace/settings/settingsstate/changefactory_test.go

@@ -1,17 +1,16 @@
 package settingsstate
 
 import (
-	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
+	"github.com/anytypeio/any-sync/commonspace/spacesyncproto"
 	"github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/slices"
 	"testing"
 )
 
 func TestChangeFactory_CreateObjectDeleteChange(t *testing.T) {
 	factory := NewChangeFactory()
 	state := &State{
-		DeletedIds: map[string]struct{}{"1": {}, "2": {}},
+		DeletedIds: []string{"1", "2"},
 		DeleterId:  "del",
 	}
 	marshalled, err := factory.CreateObjectDeleteChange("3", state, false)
@@ -27,7 +26,6 @@ func TestChangeFactory_CreateObjectDeleteChange(t *testing.T) {
 	data = &spacesyncproto.SettingsData{}
 	err = proto.Unmarshal(marshalled, data)
 	require.NoError(t, err)
-	slices.Sort(data.Snapshot.DeletedIds)
 	require.Equal(t, &spacesyncproto.SpaceSettingsSnapshot{
 		DeletedIds:    []string{"1", "2", "3"},
 		DeleterPeerId: "del",
@@ -38,7 +36,7 @@ func TestChangeFactory_CreateObjectDeleteChange(t *testing.T) {
 func TestChangeFactory_CreateSpaceDeleteChange(t *testing.T) {
 	factory := NewChangeFactory()
 	state := &State{
-		DeletedIds: map[string]struct{}{"1": {}, "2": {}},
+		DeletedIds: []string{"1", "2"},
 	}
 	marshalled, err := factory.CreateSpaceDeleteChange("del", state, false)
 	require.NoError(t, err)
@@ -53,7 +51,6 @@ func TestChangeFactory_CreateSpaceDeleteChange(t *testing.T) {
 	data = &spacesyncproto.SettingsData{}
 	err = proto.Unmarshal(marshalled, data)
 	require.NoError(t, err)
-	slices.Sort(data.Snapshot.DeletedIds)
 	require.Equal(t, &spacesyncproto.SpaceSettingsSnapshot{
 		DeletedIds:    []string{"1", "2"},
 		DeleterPeerId: "del",

commonspace/settings/settingsstate/deletionstate.go

@@ -1,10 +1,8 @@
-//go:generate mockgen -destination mock_settingsstate/mock_settingsstate.go github.com/anyproto/any-sync/commonspace/settings/settingsstate ObjectDeletionState,StateBuilder,ChangeFactory
+//go:generate mockgen -destination mock_settingsstate/mock_settingsstate.go github.com/anytypeio/any-sync/commonspace/settings/settingsstate ObjectDeletionState,StateBuilder,ChangeFactory
 package settingsstate
 
 import (
-	"github.com/anyproto/any-sync/app/logger"
-	"github.com/anyproto/any-sync/commonspace/spacestorage"
-	"go.uber.org/zap"
+	"github.com/anytypeio/any-sync/commonspace/spacestorage"
 	"sync"
 )
 
@@ -12,25 +10,23 @@ type StateUpdateObserver func(ids []string)
 
 type ObjectDeletionState interface {
 	AddObserver(observer StateUpdateObserver)
-	Add(ids map[string]struct{})
+	Add(ids []string) (err error)
 	GetQueued() (ids []string)
 	Delete(id string) (err error)
 	Exists(id string) bool
-	Filter(ids []string) (filtered []string)
+	FilterJoin(ids ...[]string) (filtered []string)
 }
 
 type objectDeletionState struct {
 	sync.RWMutex
-	log                  logger.CtxLogger
 	queued               map[string]struct{}
 	deleted              map[string]struct{}
 	stateUpdateObservers []StateUpdateObserver
 	storage              spacestorage.SpaceStorage
 }
 
-func NewObjectDeletionState(log logger.CtxLogger, storage spacestorage.SpaceStorage) ObjectDeletionState {
+func NewObjectDeletionState(storage spacestorage.SpaceStorage) ObjectDeletionState {
 	return &objectDeletionState{
-		log:     log,
 		queued:  map[string]struct{}{},
 		deleted: map[string]struct{}{},
 		storage: storage,
@@ -43,17 +39,19 @@ func (st *objectDeletionState) AddObserver(observer StateUpdateObserver) {
 	st.stateUpdateObservers = append(st.stateUpdateObservers, observer)
 }
 
-func (st *objectDeletionState) Add(ids map[string]struct{}) {
-	var added []string
+func (st *objectDeletionState) Add(ids []string) (err error) {
 	st.Lock()
 	defer func() {
 		st.Unlock()
+		if err != nil {
+			return
+		}
 		for _, ob := range st.stateUpdateObservers {
-			ob(added)
+			ob(ids)
 		}
 	}()
 
-	for id := range ids {
+	for _, id := range ids {
 		if _, exists := st.deleted[id]; exists {
 			continue
 		}
@@ -62,10 +60,9 @@ func (st *objectDeletionState) Add(ids map[string]struct{}) {
 		}
 
 		var status string
-		status, err := st.storage.TreeDeletedStatus(id)
+		status, err = st.storage.TreeDeletedStatus(id)
 		if err != nil {
-			st.log.Warn("failed to get deleted status", zap.String("treeId", id), zap.Error(err))
-			continue
+			return
 		}
 
 		switch status {
@@ -74,15 +71,14 @@ func (st *objectDeletionState) Add(ids map[string]struct{}) {
 		case spacestorage.TreeDeletedStatusDeleted:
 			st.deleted[id] = struct{}{}
 		default:
-			err := st.storage.SetTreeDeletedStatus(id, spacestorage.TreeDeletedStatusQueued)
-			if err != nil {
-				st.log.Warn("failed to set deleted status", zap.String("treeId", id), zap.Error(err))
-				continue
-			}
 			st.queued[id] = struct{}{}
+			err = st.storage.SetTreeDeletedStatus(id, spacestorage.TreeDeletedStatusQueued)
+			if err != nil {
+				return
+			}
 		}
-		added = append(added, id)
 	}
+	return
 }
 
 func (st *objectDeletionState) GetQueued() (ids []string) {
@@ -113,14 +109,19 @@ func (st *objectDeletionState) Exists(id string) bool {
 	return st.exists(id)
 }
 
-func (st *objectDeletionState) Filter(ids []string) (filtered []string) {
+func (st *objectDeletionState) FilterJoin(ids ...[]string) (filtered []string) {
 	st.RLock()
 	defer st.RUnlock()
-	for _, id := range ids {
-		if !st.exists(id) {
-			filtered = append(filtered, id)
+	filter := func(ids []string) {
+		for _, id := range ids {
+			if !st.exists(id) {
+				filtered = append(filtered, id)
+			}
 		}
 	}
+	for _, arr := range ids {
+		filter(arr)
+	}
 	return
 }
 

commonspace/settings/settingsstate/deletionstate_test.go

@@ -1,9 +1,8 @@
 package settingsstate
 
 import (
-	"github.com/anyproto/any-sync/app/logger"
-	"github.com/anyproto/any-sync/commonspace/spacestorage"
-	"github.com/anyproto/any-sync/commonspace/spacestorage/mock_spacestorage"
+	"github.com/anytypeio/any-sync/commonspace/spacestorage"
+	"github.com/anytypeio/any-sync/commonspace/spacestorage/mock_spacestorage"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 	"sort"
@@ -19,7 +18,7 @@ type fixture struct {
 func newFixture(t *testing.T) *fixture {
 	ctrl := gomock.NewController(t)
 	spaceStorage := mock_spacestorage.NewMockSpaceStorage(ctrl)
-	delState := NewObjectDeletionState(logger.NewNamed("test"), spaceStorage).(*objectDeletionState)
+	delState := NewObjectDeletionState(spaceStorage).(*objectDeletionState)
 	return &fixture{
 		ctrl:         ctrl,
 		delState:     delState,
@@ -38,7 +37,8 @@ func TestDeletionState_Add(t *testing.T) {
 		id := "newId"
 		fx.spaceStorage.EXPECT().TreeDeletedStatus(id).Return("", nil)
 		fx.spaceStorage.EXPECT().SetTreeDeletedStatus(id, spacestorage.TreeDeletedStatusQueued).Return(nil)
-		fx.delState.Add(map[string]struct{}{id: {}})
+		err := fx.delState.Add([]string{id})
+		require.NoError(t, err)
 		require.Contains(t, fx.delState.queued, id)
 	})
 
@@ -47,7 +47,8 @@ func TestDeletionState_Add(t *testing.T) {
 		defer fx.stop()
 		id := "newId"
 		fx.spaceStorage.EXPECT().TreeDeletedStatus(id).Return(spacestorage.TreeDeletedStatusQueued, nil)
-		fx.delState.Add(map[string]struct{}{id: {}})
+		err := fx.delState.Add([]string{id})
+		require.NoError(t, err)
 		require.Contains(t, fx.delState.queued, id)
 	})
 
@@ -56,7 +57,8 @@ func TestDeletionState_Add(t *testing.T) {
 		defer fx.stop()
 		id := "newId"
 		fx.spaceStorage.EXPECT().TreeDeletedStatus(id).Return(spacestorage.TreeDeletedStatusDeleted, nil)
-		fx.delState.Add(map[string]struct{}{id: {}})
+		err := fx.delState.Add([]string{id})
+		require.NoError(t, err)
 		require.Contains(t, fx.delState.deleted, id)
 	})
 }
@@ -80,8 +82,8 @@ func TestDeletionState_FilterJoin(t *testing.T) {
 	fx.delState.queued["id1"] = struct{}{}
 	fx.delState.queued["id2"] = struct{}{}
 
-	filtered := fx.delState.Filter([]string{"id3", "id2"})
-	require.Equal(t, []string{"id3"}, filtered)
+	filtered := fx.delState.FilterJoin([]string{"id1"}, []string{"id3", "id2"}, []string{"id4"})
+	require.Equal(t, []string{"id3", "id4"}, filtered)
 }
 
 func TestDeletionState_AddObserver(t *testing.T) {
@@ -96,7 +98,8 @@ func TestDeletionState_AddObserver(t *testing.T) {
 	id := "newId"
 	fx.spaceStorage.EXPECT().TreeDeletedStatus(id).Return("", nil)
 	fx.spaceStorage.EXPECT().SetTreeDeletedStatus(id, spacestorage.TreeDeletedStatusQueued).Return(nil)
-	fx.delState.Add(map[string]struct{}{id: {}})
+	err := fx.delState.Add([]string{id})
+	require.NoError(t, err)
 	require.Contains(t, fx.delState.queued, id)
 	require.Equal(t, []string{id}, queued)
 }

commonspace/settings/settingsstate/mock_settingsstate/mock_settingsstate.go

@@ -1,5 +1,5 @@
 // Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/anyproto/any-sync/commonspace/settings/settingsstate (interfaces: ObjectDeletionState,StateBuilder,ChangeFactory)
+// Source: github.com/anytypeio/any-sync/commonspace/settings/settingsstate (interfaces: ObjectDeletionState,StateBuilder,ChangeFactory)
 
 // Package mock_settingsstate is a generated GoMock package.
 package mock_settingsstate
@@ -7,8 +7,8 @@ package mock_settingsstate
 import (
 	reflect "reflect"
 
-	objecttree "github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
-	settingsstate "github.com/anyproto/any-sync/commonspace/settings/settingsstate"
+	objecttree "github.com/anytypeio/any-sync/commonspace/object/tree/objecttree"
+	settingsstate "github.com/anytypeio/any-sync/commonspace/settings/settingsstate"
 	gomock "github.com/golang/mock/gomock"
 )
 
@@ -36,9 +36,11 @@ func (m *MockObjectDeletionState) EXPECT() *MockObjectDeletionStateMockRecorder
 }
 
 // Add mocks base method.
-func (m *MockObjectDeletionState) Add(arg0 map[string]struct{}) {
+func (m *MockObjectDeletionState) Add(arg0 []string) error {
 	m.ctrl.T.Helper()
-	m.ctrl.Call(m, "Add", arg0)
+	ret := m.ctrl.Call(m, "Add", arg0)
+	ret0, _ := ret[0].(error)
+	return ret0
 }
 
 // Add indicates an expected call of Add.
@@ -87,18 +89,22 @@ func (mr *MockObjectDeletionStateMockRecorder) Exists(arg0 interface{}) *gomock.
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exists", reflect.TypeOf((*MockObjectDeletionState)(nil).Exists), arg0)
 }
 
-// Filter mocks base method.
-func (m *MockObjectDeletionState) Filter(arg0 []string) []string {
+// FilterJoin mocks base method.
+func (m *MockObjectDeletionState) FilterJoin(arg0 ...[]string) []string {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "Filter", arg0)
+	varargs := []interface{}{}
+	for _, a := range arg0 {
+		varargs = append(varargs, a)
+	}
+	ret := m.ctrl.Call(m, "FilterJoin", varargs...)
 	ret0, _ := ret[0].([]string)
 	return ret0
 }
 
-// Filter indicates an expected call of Filter.
-func (mr *MockObjectDeletionStateMockRecorder) Filter(arg0 interface{}) *gomock.Call {
+// FilterJoin indicates an expected call of FilterJoin.
+func (mr *MockObjectDeletionStateMockRecorder) FilterJoin(arg0 ...interface{}) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Filter", reflect.TypeOf((*MockObjectDeletionState)(nil).Filter), arg0)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FilterJoin", reflect.TypeOf((*MockObjectDeletionState)(nil).FilterJoin), arg0...)
 }
 
 // GetQueued mocks base method.
@@ -139,7 +145,7 @@ func (m *MockStateBuilder) EXPECT() *MockStateBuilderMockRecorder {
 }
 
 // Build mocks base method.
-func (m *MockStateBuilder) Build(arg0 objecttree.ReadableObjectTree, arg1 *settingsstate.State) (*settingsstate.State, error) {
+func (m *MockStateBuilder) Build(arg0 objecttree.ObjectTree, arg1 *settingsstate.State) (*settingsstate.State, error) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "Build", arg0, arg1)
 	ret0, _ := ret[0].(*settingsstate.State)

commonspace/settings/settingsstate/settingsstate.go

@@ -1,28 +1,7 @@
 package settingsstate
 
-import "github.com/anyproto/any-sync/commonspace/spacesyncproto"
-
 type State struct {
-	DeletedIds     map[string]struct{}
+	DeletedIds     []string
 	DeleterId      string
 	LastIteratedId string
 }
-
-func NewState() *State {
-	return &State{DeletedIds: map[string]struct{}{}}
-}
-
-func NewStateFromSnapshot(snapshot *spacesyncproto.SpaceSettingsSnapshot, lastIteratedId string) *State {
-	st := NewState()
-	for _, id := range snapshot.DeletedIds {
-		st.DeletedIds[id] = struct{}{}
-	}
-	st.DeleterId = snapshot.DeleterPeerId
-	st.LastIteratedId = lastIteratedId
-	return st
-}
-
-func (s *State) Exists(id string) bool {
-	_, exists := s.DeletedIds[id]
-	return exists
-}