net test

2023-06-12 20:17:48 +02:00
47 changed files with 622 additions and 984 deletions
@@ -61,7 +61,6 @@ type App struct {
 	startStat      Stat
 	stopStat       Stat
 	deviceState    int
-	versionName    string
 	anySyncVersion string
 }

@@ -79,19 +78,6 @@ func (app *App) Version() string {
 	return GitSummary
 }

-// SetVersionName sets the custom application version
-func (app *App) SetVersionName(v string) {
-	app.versionName = v
-}
-
-// VersionName returns a string with the settled app version or auto-generated version if it didn't set
-func (app *App) VersionName() string {
-	if app.versionName != "" {
-		return app.versionName
-	}
-	return AppName + ":" + GitSummary + "/any-sync:" + app.AnySyncVersion()
-}
-
 type Stat struct {
 	SpentMsPerComp map[string]int64
 	SpentMsTotal   int64
@@ -262,15 +248,6 @@ func (app *App) Start(ctx context.Context) (err error) {
 	return
 }

-// IterateComponents iterates over all registered components. It's safe for concurrent use.
-func (app *App) IterateComponents(fn func(Component)) {
-	app.mu.RLock()
-	defer app.mu.RUnlock()
-	for _, s := range app.components {
-		fn(s)
-	}
-}
-
 func stackAllGoroutines() []byte {
 	buf := make([]byte, 1024)
 	for {
@@ -55,21 +55,6 @@ func TestAppServiceRegistry(t *testing.T) {
 	})
 }

-func TestApp_IterateComponents(t *testing.T) {
-	app := new(App)
-
-	app.Register(newTestService(testTypeRunnable, "c1", nil, nil))
-	app.Register(newTestService(testTypeRunnable, "r1", nil, nil))
-	app.Register(newTestService(testTypeComponent, "s1", nil, nil))
-
-	var got []string
-	app.IterateComponents(func(s Component) {
-		got = append(got, s.Name())
-	})
-
-	assert.ElementsMatch(t, []string{"c1", "r1", "s1"}, got)
-}
-
 func TestAppStart(t *testing.T) {
 	t.Run("SuccessStartStop", func(t *testing.T) {
 		app := new(App)
@@ -2,10 +2,9 @@ package ocache

 import (
 	"context"
+	"go.uber.org/zap"
 	"sync"
 	"time"
-
-	"go.uber.org/zap"
 )

 type entryState int
@@ -26,7 +25,6 @@ type entry struct {
 	value     Object
 	close     chan struct{}
 	mx        sync.Mutex
-	cancel    context.CancelFunc
 }

 func newEntry(id string, value Object, state entryState) *entry {
@@ -51,20 +49,6 @@ func (e *entry) isClosing() bool {
 	return e.state == entryStateClosed || e.state == entryStateClosing
 }

-func (e *entry) setCancel(cancel context.CancelFunc) {
-	e.mx.Lock()
-	defer e.mx.Unlock()
-	e.cancel = cancel
-}
-
-func (e *entry) cancelLoad() {
-	e.mx.Lock()
-	defer e.mx.Unlock()
-	if e.cancel != nil {
-		e.cancel()
-	}
-}
-
 func (e *entry) waitLoad(ctx context.Context, id string) (value Object, err error) {
 	select {
 	case <-ctx.Done():
@@ -3,11 +3,10 @@ package ocache
 import (
 	"context"
 	"errors"
-	"sync"
-	"time"
-
 	"github.com/anyproto/any-sync/app/logger"
 	"go.uber.org/zap"
+	"sync"
+	"time"
 )

 var (
@@ -158,10 +157,7 @@ func (c *oCache) Pick(ctx context.Context, id string) (value Object, err error)

 func (c *oCache) load(ctx context.Context, id string, e *entry) {
 	defer close(e.load)
-	ctx, cancel := context.WithCancel(ctx)
-	e.setCancel(cancel)
 	value, err := c.loadFunc(ctx, id)
-	cancel()

 	c.mu.Lock()
 	defer c.mu.Unlock()
@@ -319,7 +315,6 @@ func (c *oCache) Close() (err error) {
 	close(c.closeCh)
 	var toClose []*entry
 	for _, e := range c.data {
-		e.cancelLoad()
 		toClose = append(toClose, e)
 	}
 	c.mu.Unlock()
@@ -386,25 +386,6 @@ func Test_OCache_Remove(t *testing.T) {
 	})
 }

-func TestOCacheCancelWhenRemove(t *testing.T) {
-	c := New(func(ctx context.Context, id string) (value Object, err error) {
-		select {
-		case <-ctx.Done():
-			return nil, ctx.Err()
-		}
-	}, WithTTL(time.Millisecond*10))
-	stopLoad := make(chan struct{})
-	var err error
-	go func() {
-		_, err = c.Get(context.TODO(), "id")
-		stopLoad <- struct{}{}
-	}()
-	time.Sleep(time.Millisecond * 10)
-	c.Close()
-	<-stopLoad
-	require.Equal(t, context.Canceled, err)
-}
-
 func TestOCacheFuzzy(t *testing.T) {
 	t.Run("test many objects gc, get and remove simultaneously, close after", func(t *testing.T) {
 		tryCloseIds := make(map[string]bool)
@@ -2,11 +2,10 @@ package objecttree

 import (
 	"context"
-	"time"
-
 	"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"
+	"time"
 )

 type rawChangeLoader struct {
@@ -23,7 +22,6 @@ type rawCacheEntry struct {
 	change    *Change
 	rawChange *treechangeproto.RawTreeChangeWithId
 	position  int
-	removed   bool
 }

 func newStorageLoader(treeStorage treestorage.TreeStorage, changeBuilder ChangeBuilder) *rawChangeLoader {
@@ -128,6 +126,7 @@ func (r *rawChangeLoader) loadFromStorage(commonSnapshot string, heads, breakpoi
 		if err != nil {
 			continue
 		}
+		entry.position = -1
 		r.cache[b] = entry
 		existingBreakpoints = append(existingBreakpoints, b)
 	}
@@ -136,7 +135,8 @@ func (r *rawChangeLoader) loadFromStorage(commonSnapshot string, heads, breakpoi
 	dfs := func(
 		commonSnapshot string,
 		heads []string,
-		shouldVisit func(entry rawCacheEntry, mapExists bool) bool,
+		startCounter int,
+		shouldVisit func(counter int, mapExists bool) bool,
 		visit func(entry rawCacheEntry) rawCacheEntry) bool {

 		// resetting stack
@@ -150,7 +150,7 @@ func (r *rawChangeLoader) loadFromStorage(commonSnapshot string, heads, breakpoi
 			r.idStack = r.idStack[:len(r.idStack)-1]

 			entry, exists := r.cache[id]
-			if !shouldVisit(entry, exists) {
+			if !shouldVisit(entry.position, exists) {
 				continue
 			}
 			if id == commonSnapshot {
@@ -159,6 +159,7 @@ func (r *rawChangeLoader) loadFromStorage(commonSnapshot string, heads, breakpoi
 			}
 			if !exists {
 				entry, err = r.loadEntry(id)
+				entry.position = -1
 				if err != nil {
 					continue
 				}
@@ -173,7 +174,7 @@ func (r *rawChangeLoader) loadFromStorage(commonSnapshot string, heads, breakpoi
 					break
 				}
 				prevEntry, exists := r.cache[prev]
-				if !shouldVisit(prevEntry, exists) {
+				if !shouldVisit(prevEntry.position, exists) {
 					continue
 				}
 				r.idStack = append(r.idStack, prev)
@@ -186,8 +187,8 @@ func (r *rawChangeLoader) loadFromStorage(commonSnapshot string, heads, breakpoi
 	r.idStack = append(r.idStack, heads...)
 	var buffer []*treechangeproto.RawTreeChangeWithId

-	rootVisited := dfs(commonSnapshot, heads,
-		func(_ rawCacheEntry, mapExists bool) bool {
+	rootVisited := dfs(commonSnapshot, heads, 0,
+		func(counter int, mapExists bool) bool {
 			return !mapExists
 		},
 		func(entry rawCacheEntry) rawCacheEntry {
@@ -212,13 +213,11 @@ func (r *rawChangeLoader) loadFromStorage(commonSnapshot string, heads, breakpoi
 	}

 	// marking all visited as nil
-	dfs(commonSnapshot, existingBreakpoints,
-		func(entry rawCacheEntry, mapExists bool) bool {
-			// only going through already loaded changes
-			return mapExists && !entry.removed
+	dfs(commonSnapshot, existingBreakpoints, len(buffer),
+		func(counter int, mapExists bool) bool {
+			return !mapExists || counter < len(buffer)
 		},
 		func(entry rawCacheEntry) rawCacheEntry {
-			entry.removed = true
 			if entry.position != -1 {
 				buffer[entry.position] = nil
 			}
@@ -249,7 +248,6 @@ func (r *rawChangeLoader) loadEntry(id string) (entry rawCacheEntry, err error)
 	entry = rawCacheEntry{
 		change:    change,
 		rawChange: rawChange,
-		position:  -1,
 	}
 	return
 }
@@ -2,10 +2,6 @@ package synctree

 import (
 	"context"
-	"math/rand"
-	"testing"
-	"time"
-
 	"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"
@@ -14,6 +10,9 @@ import (
 	"github.com/anyproto/any-sync/util/slice"
 	"github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/require"
+	"math/rand"
+	"testing"
+	"time"
 )

 func TestEmptyClientGetsFullHistory(t *testing.T) {
@@ -59,18 +59,19 @@ type ResponsiblePeersGetter interface {
 }

 type BuildDeps struct {
-	SpaceId         string
-	SyncClient      SyncClient
-	Configuration   nodeconf.NodeConf
-	HeadNotifiable  HeadNotifiable
-	Listener        updatelistener.UpdateListener
-	AclList         list.AclList
-	SpaceStorage    spacestorage.SpaceStorage
-	TreeStorage     treestorage.TreeStorage
-	OnClose         func(id string)
-	SyncStatus      syncstatus.StatusUpdater
-	PeerGetter      ResponsiblePeersGetter
-	BuildObjectTree objecttree.BuildObjectTreeFunc
+	SpaceId            string
+	SyncClient         SyncClient
+	Configuration      nodeconf.NodeConf
+	HeadNotifiable     HeadNotifiable
+	Listener           updatelistener.UpdateListener
+	AclList            list.AclList
+	SpaceStorage       spacestorage.SpaceStorage
+	TreeStorage        treestorage.TreeStorage
+	OnClose            func(id string)
+	SyncStatus         syncstatus.StatusUpdater
+	PeerGetter         ResponsiblePeersGetter
+	BuildObjectTree    objecttree.BuildObjectTreeFunc
+	WaitTreeRemoteSync bool
 }

 func BuildSyncTreeOrGetRemote(ctx context.Context, id string, deps BuildDeps) (t SyncTree, err error) {
@@ -205,27 +206,18 @@ func (s *syncTree) Delete() (err error) {
 }

 func (s *syncTree) TryClose(objectTTL time.Duration) (bool, error) {
-	if !s.TryLock() {
-		return false, nil
-	}
-	log.Debug("closing sync tree", zap.String("id", s.Id()))
-	return true, s.close()
+	return true, s.Close()
 }

 func (s *syncTree) Close() (err error) {
 	log.Debug("closing sync tree", zap.String("id", s.Id()))
-	s.Lock()
-	return s.close()
-}
-
-func (s *syncTree) close() (err error) {
-	defer s.Unlock()
 	defer func() {
 		log.Debug("closed sync tree", zap.Error(err), zap.String("id", s.Id()))
 	}()
+	s.Lock()
+	defer s.Unlock()
 	if s.isClosed {
-		err = ErrSyncTreeClosed
-		return
+		return ErrSyncTreeClosed
 	}
 	s.onClose(s.Id())
 	s.isClosed = true
@@ -3,21 +3,18 @@ package synctree
 import (
 	"context"
 	"errors"
-	"sync"
-
 	"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/synchandler"
 	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
 	"github.com/anyproto/any-sync/commonspace/syncstatus"
-	"github.com/anyproto/any-sync/util/slice"
 	"github.com/gogo/protobuf/proto"
+	"sync"
 )

 var (
 	ErrMessageIsRequest    = errors.New("message is request")
 	ErrMessageIsNotRequest = errors.New("message is not request")
-	ErrMoreThanOneRequest  = errors.New("more than one request for same peer")
 )

 type syncTreeHandler struct {
@@ -25,23 +22,21 @@ type syncTreeHandler struct {
 	syncClient   SyncClient
 	syncProtocol TreeSyncProtocol
 	syncStatus   syncstatus.StatusUpdater
+	handlerLock  sync.Mutex
 	spaceId      string
-
-	handlerLock     sync.Mutex
-	pendingRequests map[string]struct{}
-	heads           []string
+	queue        ReceiveQueue
 }

 const maxQueueSize = 5

 func newSyncTreeHandler(spaceId string, objTree objecttree.ObjectTree, syncClient SyncClient, syncStatus syncstatus.StatusUpdater) synchandler.SyncHandler {
 	return &syncTreeHandler{
-		objTree:         objTree,
-		syncProtocol:    newTreeSyncProtocol(spaceId, objTree, syncClient),
-		syncClient:      syncClient,
-		syncStatus:      syncStatus,
-		spaceId:         spaceId,
-		pendingRequests: make(map[string]struct{}),
+		objTree:      objTree,
+		syncProtocol: newTreeSyncProtocol(spaceId, objTree, syncClient),
+		syncClient:   syncClient,
+		syncStatus:   syncStatus,
+		spaceId:      spaceId,
+		queue:        newReceiveQueue(maxQueueSize),
 	}
 }

@@ -53,35 +48,17 @@ func (s *syncTreeHandler) HandleRequest(ctx context.Context, senderId string, re
 	}
 	fullSyncRequest := unmarshalled.GetContent().GetFullSyncRequest()
 	if fullSyncRequest == nil {
-		return nil, ErrMessageIsNotRequest
+		err = ErrMessageIsNotRequest
+		return
 	}
-	// setting pending requests
-	s.handlerLock.Lock()
-	_, exists := s.pendingRequests[senderId]
-	if exists {
-		s.handlerLock.Unlock()
-		return nil, ErrMoreThanOneRequest
-	}
-	s.pendingRequests[senderId] = struct{}{}
-	s.handlerLock.Unlock()
-
-	response, err = s.handleRequest(ctx, senderId, fullSyncRequest)
-
-	// removing pending requests
-	s.handlerLock.Lock()
-	delete(s.pendingRequests, senderId)
-	s.handlerLock.Unlock()
-	return
-}
-
-func (s *syncTreeHandler) handleRequest(ctx context.Context, senderId string, fullSyncRequest *treechangeproto.TreeFullSyncRequest) (response *spacesyncproto.ObjectSyncMessage, err error) {
+	s.syncStatus.HeadsReceive(senderId, request.ObjectId, treechangeproto.GetHeads(unmarshalled))
 	s.objTree.Lock()
 	defer s.objTree.Unlock()
 	treeResp, err := s.syncProtocol.FullSyncRequest(ctx, senderId, fullSyncRequest)
 	if err != nil {
 		return
 	}
-	response, err = MarshallTreeMessage(treeResp, s.spaceId, s.objTree.Id(), "")
+	response, err = MarshallTreeMessage(treeResp, s.spaceId, request.ObjectId, "")
 	return
 }

@@ -91,41 +68,28 @@ func (s *syncTreeHandler) HandleMessage(ctx context.Context, senderId string, ms
 	if err != nil {
 		return
 	}
-	heads := treechangeproto.GetHeads(unmarshalled)
-	s.syncStatus.HeadsReceive(senderId, msg.ObjectId, heads)
-	s.handlerLock.Lock()
-	// if the update has same heads then returning not to hang on a lock
-	if unmarshalled.GetContent().GetHeadUpdate() != nil && slice.UnsortedEquals(heads, s.heads) {
-		s.handlerLock.Unlock()
+	s.syncStatus.HeadsReceive(senderId, msg.ObjectId, treechangeproto.GetHeads(unmarshalled))
+
+	queueFull := s.queue.AddMessage(senderId, unmarshalled, msg.RequestId)
+	if queueFull {
 		return
 	}
-	s.handlerLock.Unlock()
-	return s.handleMessage(ctx, unmarshalled, senderId)
+
+	return s.handleMessage(ctx, senderId)
 }

-func (s *syncTreeHandler) handleMessage(ctx context.Context, msg *treechangeproto.TreeSyncMessage, senderId string) (err error) {
+func (s *syncTreeHandler) handleMessage(ctx context.Context, senderId string) (err error) {
 	s.objTree.Lock()
 	defer s.objTree.Unlock()
-	var (
-		copyHeads = make([]string, 0, len(s.objTree.Heads()))
-		treeId    = s.objTree.Id()
-		content   = msg.GetContent()
-	)
+	msg, _, err := s.queue.GetMessage(senderId)
+	if err != nil {
+		return
+	}

-	// getting old heads
-	copyHeads = append(copyHeads, s.objTree.Heads()...)
-	defer func() {
-		// checking if something changed
-		if !slice.UnsortedEquals(copyHeads, s.objTree.Heads()) {
-			s.handlerLock.Lock()
-			defer s.handlerLock.Unlock()
-			s.heads = s.heads[:0]
-			for _, h := range s.objTree.Heads() {
-				s.heads = append(s.heads, h)
-			}
-		}
-	}()
+	defer s.queue.ClearQueue(senderId)

+	treeId := s.objTree.Id()
+	content := msg.GetContent()
 	switch {
 	case content.GetHeadUpdate() != nil:
 		var syncReq *treechangeproto.TreeSyncMessage
@@ -2,15 +2,15 @@ package synctree

 import (
 	"context"
+	"github.com/anyproto/any-sync/commonspace/object/tree/synctree/mock_synctree"
+	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
+	"github.com/stretchr/testify/require"
 	"sync"
 	"testing"

 	"github.com/anyproto/any-sync/commonspace/object/tree/objecttree/mock_objecttree"
-	"github.com/anyproto/any-sync/commonspace/object/tree/synctree/mock_synctree"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
 	"github.com/anyproto/any-sync/commonspace/syncstatus"
 	"github.com/golang/mock/gomock"
-	"github.com/stretchr/testify/require"
 )

 type testObjTreeMock struct {
@@ -52,6 +52,7 @@ type syncHandlerFixture struct {
 	ctrl             *gomock.Controller
 	syncClientMock   *mock_synctree.MockSyncClient
 	objectTreeMock   *testObjTreeMock
+	receiveQueueMock ReceiveQueue
 	syncProtocolMock *mock_synctree.MockTreeSyncProtocol
 	spaceId          string
 	senderId         string
@@ -66,18 +67,20 @@ func newSyncHandlerFixture(t *testing.T) *syncHandlerFixture {
 	syncClientMock := mock_synctree.NewMockSyncClient(ctrl)
 	syncProtocolMock := mock_synctree.NewMockTreeSyncProtocol(ctrl)
 	spaceId := "spaceId"
+	receiveQueue := newReceiveQueue(5)

 	syncHandler := &syncTreeHandler{
-		objTree:         objectTreeMock,
-		syncClient:      syncClientMock,
-		syncProtocol:    syncProtocolMock,
-		spaceId:         spaceId,
-		syncStatus:      syncstatus.NewNoOpSyncStatus(),
-		pendingRequests: map[string]struct{}{},
+		objTree:      objectTreeMock,
+		syncClient:   syncClientMock,
+		syncProtocol: syncProtocolMock,
+		spaceId:      spaceId,
+		queue:        receiveQueue,
+		syncStatus:   syncstatus.NewNoOpSyncStatus(),
 	}
 	return &syncHandlerFixture{
 		ctrl:             ctrl,
 		objectTreeMock:   objectTreeMock,
+		receiveQueueMock: receiveQueue,
 		syncProtocolMock: syncProtocolMock,
 		syncClientMock:   syncClientMock,
 		syncHandler:      syncHandler,
@@ -94,68 +97,38 @@ func (fx *syncHandlerFixture) stop() {
 func TestSyncTreeHandler_HandleMessage(t *testing.T) {
 	ctx := context.Background()

-	t.Run("handle head update message, heads not equal, request returned", func(t *testing.T) {
+	t.Run("handle head update message", func(t *testing.T) {
 		fx := newSyncHandlerFixture(t)
 		defer fx.stop()
 		treeId := "treeId"
 		chWithId := &treechangeproto.RawTreeChangeWithId{}
-		headUpdate := &treechangeproto.TreeHeadUpdate{
-			Heads: []string{"h3"},
-		}
+		headUpdate := &treechangeproto.TreeHeadUpdate{}
 		treeMsg := treechangeproto.WrapHeadUpdate(headUpdate, chWithId)
 		objectMsg, _ := MarshallTreeMessage(treeMsg, "spaceId", treeId, "")

 		syncReq := &treechangeproto.TreeSyncMessage{}
-		fx.syncHandler.heads = []string{"h2"}
 		fx.objectTreeMock.EXPECT().Id().AnyTimes().Return(fx.treeId)
-		fx.objectTreeMock.EXPECT().Heads().Times(2).Return([]string{"h2"})
-		fx.objectTreeMock.EXPECT().Heads().Times(2).Return([]string{"h3"})
 		fx.syncProtocolMock.EXPECT().HeadUpdate(ctx, fx.senderId, gomock.Any()).Return(syncReq, nil)
 		fx.syncClientMock.EXPECT().QueueRequest(fx.senderId, fx.treeId, syncReq).Return(nil)

 		err := fx.syncHandler.HandleMessage(ctx, fx.senderId, objectMsg)
 		require.NoError(t, err)
-		require.Equal(t, []string{"h3"}, fx.syncHandler.heads)
 	})

-	t.Run("handle head update message, heads equal", func(t *testing.T) {
+	t.Run("handle head update message, empty sync request", func(t *testing.T) {
 		fx := newSyncHandlerFixture(t)
 		defer fx.stop()
 		treeId := "treeId"
 		chWithId := &treechangeproto.RawTreeChangeWithId{}
-		headUpdate := &treechangeproto.TreeHeadUpdate{
-			Heads: []string{"h1"},
-		}
+		headUpdate := &treechangeproto.TreeHeadUpdate{}
 		treeMsg := treechangeproto.WrapHeadUpdate(headUpdate, chWithId)
 		objectMsg, _ := MarshallTreeMessage(treeMsg, "spaceId", treeId, "")

-		fx.syncHandler.heads = []string{"h1"}
 		fx.objectTreeMock.EXPECT().Id().AnyTimes().Return(fx.treeId)
-
-		err := fx.syncHandler.HandleMessage(ctx, fx.senderId, objectMsg)
-		require.NoError(t, err)
-	})
-
-	t.Run("handle head update message, empty sync request returned", func(t *testing.T) {
-		fx := newSyncHandlerFixture(t)
-		defer fx.stop()
-		treeId := "treeId"
-		chWithId := &treechangeproto.RawTreeChangeWithId{}
-		headUpdate := &treechangeproto.TreeHeadUpdate{
-			Heads: []string{"h3"},
-		}
-		treeMsg := treechangeproto.WrapHeadUpdate(headUpdate, chWithId)
-		objectMsg, _ := MarshallTreeMessage(treeMsg, "spaceId", treeId, "")
-
-		fx.syncHandler.heads = []string{"h2"}
-		fx.objectTreeMock.EXPECT().Id().AnyTimes().Return(fx.treeId)
-		fx.objectTreeMock.EXPECT().Heads().Times(2).Return([]string{"h2"})
-		fx.objectTreeMock.EXPECT().Heads().Times(2).Return([]string{"h3"})
 		fx.syncProtocolMock.EXPECT().HeadUpdate(ctx, fx.senderId, gomock.Any()).Return(nil, nil)

 		err := fx.syncHandler.HandleMessage(ctx, fx.senderId, objectMsg)
 		require.NoError(t, err)
-		require.Equal(t, []string{"h3"}, fx.syncHandler.heads)
 	})

 	t.Run("handle full sync request returns error", func(t *testing.T) {
@@ -163,15 +136,11 @@ func TestSyncTreeHandler_HandleMessage(t *testing.T) {
 		defer fx.stop()
 		treeId := "treeId"
 		chWithId := &treechangeproto.RawTreeChangeWithId{}
-		fullRequest := &treechangeproto.TreeFullSyncRequest{
-			Heads: []string{"h3"},
-		}
+		fullRequest := &treechangeproto.TreeFullSyncRequest{}
 		treeMsg := treechangeproto.WrapFullRequest(fullRequest, chWithId)
 		objectMsg, _ := MarshallTreeMessage(treeMsg, "spaceId", treeId, "")

-		fx.syncHandler.heads = []string{"h2"}
 		fx.objectTreeMock.EXPECT().Id().AnyTimes().Return(fx.treeId)
-		fx.objectTreeMock.EXPECT().Heads().Times(3).Return([]string{"h2"})

 		err := fx.syncHandler.HandleMessage(ctx, fx.senderId, objectMsg)
 		require.Equal(t, err, ErrMessageIsRequest)
@@ -182,16 +151,11 @@ func TestSyncTreeHandler_HandleMessage(t *testing.T) {
 		defer fx.stop()
 		treeId := "treeId"
 		chWithId := &treechangeproto.RawTreeChangeWithId{}
-		fullSyncResponse := &treechangeproto.TreeFullSyncResponse{
-			Heads: []string{"h3"},
-		}
+		fullSyncResponse := &treechangeproto.TreeFullSyncResponse{}
 		treeMsg := treechangeproto.WrapFullResponse(fullSyncResponse, chWithId)
 		objectMsg, _ := MarshallTreeMessage(treeMsg, "spaceId", treeId, "")

-		fx.syncHandler.heads = []string{"h2"}
 		fx.objectTreeMock.EXPECT().Id().AnyTimes().Return(fx.treeId)
-		fx.objectTreeMock.EXPECT().Heads().Times(2).Return([]string{"h2"})
-		fx.objectTreeMock.EXPECT().Heads().Times(2).Return([]string{"h3"})
 		fx.syncProtocolMock.EXPECT().FullSyncResponse(ctx, fx.senderId, gomock.Any()).Return(nil)

 		err := fx.syncHandler.HandleMessage(ctx, fx.senderId, objectMsg)
@@ -220,6 +184,24 @@ func TestSyncTreeHandler_HandleRequest(t *testing.T) {
 		require.NotNil(t, res)
 	})

+	t.Run("handle request", func(t *testing.T) {
+		fx := newSyncHandlerFixture(t)
+		defer fx.stop()
+		treeId := "treeId"
+		chWithId := &treechangeproto.RawTreeChangeWithId{}
+		fullRequest := &treechangeproto.TreeFullSyncRequest{}
+		treeMsg := treechangeproto.WrapFullRequest(fullRequest, chWithId)
+		objectMsg, _ := MarshallTreeMessage(treeMsg, "spaceId", treeId, "")
+
+		syncResp := &treechangeproto.TreeSyncMessage{}
+		fx.objectTreeMock.EXPECT().Id().AnyTimes().Return(fx.treeId)
+		fx.syncProtocolMock.EXPECT().FullSyncRequest(ctx, fx.senderId, gomock.Any()).Return(syncResp, nil)
+
+		res, err := fx.syncHandler.HandleRequest(ctx, fx.senderId, objectMsg)
+		require.NoError(t, err)
+		require.NotNil(t, res)
+	})
+
 	t.Run("handle other message", func(t *testing.T) {
 		fx := newSyncHandlerFixture(t)
 		defer fx.stop()
@@ -2,19 +2,16 @@ package synctree

 import (
 	"context"
-	"errors"
-
+	"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/gogo/protobuf/proto"
 	"go.uber.org/zap"
-)
-
-var (
-	ErrNoResponsiblePeers = errors.New("no responsible peers")
+	"time"
 )

 type treeRemoteGetter struct {
@@ -39,7 +36,7 @@ func (t treeRemoteGetter) getPeers(ctx context.Context) (peerIds []string, err e
 		return
 	}
 	if len(respPeers) == 0 {
-		err = ErrNoResponsiblePeers
+		err = fmt.Errorf("no responsible peers")
 		return
 	}
 	for _, p := range respPeers {
@@ -60,13 +57,37 @@ func (t treeRemoteGetter) treeRequest(ctx context.Context, peerId string) (msg *
 	return
 }

-func (t treeRemoteGetter) treeRequestLoop(ctx context.Context) (msg *treechangeproto.TreeSyncMessage, err error) {
-	availablePeers, err := t.getPeers(ctx)
-	if err != nil {
-		return
+func (t treeRemoteGetter) treeRequestLoop(ctx context.Context, wait bool) (msg *treechangeproto.TreeSyncMessage, err error) {
+	peerIdx := 0
+Loop:
+	for {
+		select {
+		case <-ctx.Done():
+			return nil, fmt.Errorf("waiting for object %s interrupted, context closed", t.treeId)
+		default:
+			break
+		}
+		availablePeers, err := t.getPeers(ctx)
+		if err != nil {
+			if !wait {
+				return nil, err
+			}
+			select {
+			// wait for peers to connect
+			case <-time.After(1 * time.Second):
+				continue Loop
+			case <-ctx.Done():
+				return nil, fmt.Errorf("waiting for object %s interrupted, context closed", t.treeId)
+			}
+		}
+
+		peerIdx = peerIdx % len(availablePeers)
+		msg, err = t.treeRequest(ctx, availablePeers[peerIdx])
+		if err == nil || !wait {
+			return msg, err
+		}
+		peerIdx++
 	}
-	// in future we will try to load from different peers
-	return t.treeRequest(ctx, availablePeers[0])
 }

 func (t treeRemoteGetter) getTree(ctx context.Context) (treeStorage treestorage.TreeStorage, isRemote bool, err error) {
@@ -88,15 +109,22 @@ func (t treeRemoteGetter) getTree(ctx context.Context) (treeStorage treestorage.
 	}

 	isRemote = true
-	resp, err := t.treeRequestLoop(ctx)
+	resp, err := t.treeRequestLoop(ctx, t.deps.WaitTreeRemoteSync)
 	if err != nil {
 		return
 	}
-	fullSyncResp := resp.GetContent().GetFullSyncResponse()
-	if fullSyncResp == nil {
+	switch {
+	case resp.GetContent().GetErrorResponse() != nil:
+		errResp := resp.GetContent().GetErrorResponse()
+		err = rpcerr.Err(errResp.ErrCode)
+		return
+	case resp.GetContent().GetFullSyncResponse() == nil:
 		err = treechangeproto.ErrUnexpected
 		return
+	default:
+		break
 	}
+	fullSyncResp := resp.GetContent().GetFullSyncResponse()

 	payload := treestorage.TreeStorageCreatePayload{
 		RootRawChange: resp.RootChange,
@@ -1,87 +0,0 @@
-package synctree
-
-import (
-	"context"
-	"fmt"
-	"testing"
-
-	"github.com/anyproto/any-sync/commonspace/object/tree/synctree/mock_synctree"
-	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
-	"github.com/anyproto/any-sync/commonspace/peermanager/mock_peermanager"
-	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
-	"github.com/anyproto/any-sync/net/peer"
-	"github.com/anyproto/any-sync/net/peer/mock_peer"
-	"github.com/gogo/protobuf/proto"
-	"github.com/golang/mock/gomock"
-	"github.com/stretchr/testify/require"
-)
-
-type treeRemoteGetterFixture struct {
-	ctrl *gomock.Controller
-
-	treeGetter     treeRemoteGetter
-	syncClientMock *mock_synctree.MockSyncClient
-	peerGetterMock *mock_peermanager.MockPeerManager
-}
-
-func newTreeRemoteGetterFixture(t *testing.T) *treeRemoteGetterFixture {
-	ctrl := gomock.NewController(t)
-	syncClientMock := mock_synctree.NewMockSyncClient(ctrl)
-	peerGetterMock := mock_peermanager.NewMockPeerManager(ctrl)
-	treeGetter := treeRemoteGetter{
-		deps: BuildDeps{
-			SyncClient: syncClientMock,
-			PeerGetter: peerGetterMock,
-		},
-		treeId: "treeId",
-	}
-	return &treeRemoteGetterFixture{
-		ctrl:           ctrl,
-		treeGetter:     treeGetter,
-		syncClientMock: syncClientMock,
-		peerGetterMock: peerGetterMock,
-	}
-}
-
-func (fx *treeRemoteGetterFixture) stop() {
-	fx.ctrl.Finish()
-}
-
-func TestTreeRemoteGetter(t *testing.T) {
-	ctx := context.Background()
-	peerId := "peerId"
-	treeRequest := &treechangeproto.TreeSyncMessage{}
-	treeResponse := &treechangeproto.TreeSyncMessage{
-		RootChange: &treechangeproto.RawTreeChangeWithId{Id: "id"},
-	}
-	marshalled, _ := proto.Marshal(treeResponse)
-	objectResponse := &spacesyncproto.ObjectSyncMessage{
-		Payload: marshalled,
-	}
-
-	t.Run("request works", func(t *testing.T) {
-		fx := newTreeRemoteGetterFixture(t)
-		defer fx.stop()
-		mockPeer := mock_peer.NewMockPeer(fx.ctrl)
-		mockPeer.EXPECT().Id().AnyTimes().Return(peerId)
-		fx.peerGetterMock.EXPECT().GetResponsiblePeers(ctx).Return([]peer.Peer{mockPeer}, nil)
-		fx.syncClientMock.EXPECT().CreateNewTreeRequest().Return(treeRequest)
-		fx.syncClientMock.EXPECT().SendRequest(ctx, peerId, fx.treeGetter.treeId, treeRequest).Return(objectResponse, nil)
-		resp, err := fx.treeGetter.treeRequestLoop(ctx)
-		require.NoError(t, err)
-		require.Equal(t, "id", resp.RootChange.Id)
-	})
-
-	t.Run("request fails", func(t *testing.T) {
-		fx := newTreeRemoteGetterFixture(t)
-		defer fx.stop()
-		treeRequest := &treechangeproto.TreeSyncMessage{}
-		mockPeer := mock_peer.NewMockPeer(fx.ctrl)
-		mockPeer.EXPECT().Id().AnyTimes().Return(peerId)
-		fx.peerGetterMock.EXPECT().GetResponsiblePeers(ctx).Return([]peer.Peer{mockPeer}, nil)
-		fx.syncClientMock.EXPECT().CreateNewTreeRequest().Return(treeRequest)
-		fx.syncClientMock.EXPECT().SendRequest(ctx, peerId, fx.treeGetter.treeId, treeRequest).AnyTimes().Return(nil, fmt.Errorf("some"))
-		_, err := fx.treeGetter.treeRequestLoop(ctx)
-		require.Error(t, err)
-	})
-}
@@ -2,7 +2,6 @@ package synctree

 import (
 	"context"
-
 	"github.com/anyproto/any-sync/app/logger"
 	"github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
 	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
@@ -4,9 +4,6 @@ package objectsync
 import (
 	"context"
 	"fmt"
-	"sync/atomic"
-	"time"
-
 	"github.com/anyproto/any-sync/app"
 	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
 	"github.com/anyproto/any-sync/commonspace/object/treemanager"
@@ -16,6 +13,8 @@ import (
 	"github.com/anyproto/any-sync/util/multiqueue"
 	"github.com/cheggaaa/mb/v3"
 	"github.com/gogo/protobuf/proto"
+	"sync/atomic"
+	"time"

 	"github.com/anyproto/any-sync/app/logger"
 	"github.com/anyproto/any-sync/commonspace/object/syncobjectgetter"
@@ -80,7 +79,7 @@ func (s *objectSync) Init(a *app.App) (err error) {
 	}
 	s.spaceIsDeleted = sharedData.SpaceIsDeleted
 	s.spaceId = sharedData.SpaceId
-	s.handleQueue = multiqueue.New[HandleMessage](s.processHandleMessage, 30)
+	s.handleQueue = multiqueue.New[HandleMessage](s.processHandleMessage, 100)
 	return nil
 }

@@ -4,8 +4,6 @@ package objecttreebuilder
 import (
 	"context"
 	"errors"
-	"sync/atomic"
-
 	"github.com/anyproto/any-sync/app"
 	"github.com/anyproto/any-sync/app/logger"
 	"github.com/anyproto/any-sync/commonspace/headsync"
@@ -24,11 +22,13 @@ import (
 	"github.com/anyproto/any-sync/commonspace/syncstatus"
 	"github.com/anyproto/any-sync/nodeconf"
 	"go.uber.org/zap"
+	"sync/atomic"
 )

 type BuildTreeOpts struct {
-	Listener    updatelistener.UpdateListener
-	TreeBuilder objecttree.BuildObjectTreeFunc
+	Listener           updatelistener.UpdateListener
+	WaitTreeRemoteSync bool
+	TreeBuilder        objecttree.BuildObjectTreeFunc
 }

 const CName = "common.commonspace.objecttreebuilder"
@@ -110,17 +110,18 @@ func (t *treeBuilder) BuildTree(ctx context.Context, id string, opts BuildTreeOp
 		treeBuilder = t.builder
 	}
 	deps := synctree.BuildDeps{
-		SpaceId:         t.spaceId,
-		SyncClient:      t.syncClient,
-		Configuration:   t.configuration,
-		HeadNotifiable:  t.headsNotifiable,
-		Listener:        opts.Listener,
-		AclList:         t.aclList,
-		SpaceStorage:    t.spaceStorage,
-		OnClose:         t.onClose,
-		SyncStatus:      t.syncStatus,
-		PeerGetter:      t.peerManager,
-		BuildObjectTree: treeBuilder,
+		SpaceId:            t.spaceId,
+		SyncClient:         t.syncClient,
+		Configuration:      t.configuration,
+		HeadNotifiable:     t.headsNotifiable,
+		Listener:           opts.Listener,
+		AclList:            t.aclList,
+		SpaceStorage:       t.spaceStorage,
+		OnClose:            t.onClose,
+		SyncStatus:         t.syncStatus,
+		WaitTreeRemoteSync: opts.WaitTreeRemoteSync,
+		PeerGetter:         t.peerManager,
+		BuildObjectTree:    treeBuilder,
 	}
 	t.treesUsed.Add(1)
 	t.log.Debug("incrementing counter", zap.String("id", id), zap.Int32("trees", t.treesUsed.Load()))
@@ -2,18 +2,16 @@ package requestmanager

 import (
 	"context"
-	"sync"
-
 	"github.com/anyproto/any-sync/app"
 	"github.com/anyproto/any-sync/app/logger"
 	"github.com/anyproto/any-sync/commonspace/objectsync"
 	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
 	"github.com/anyproto/any-sync/net/peer"
 	"github.com/anyproto/any-sync/net/pool"
-	"github.com/anyproto/any-sync/net/rpc/rpcerr"
 	"github.com/anyproto/any-sync/net/streampool"
 	"go.uber.org/zap"
 	"storj.io/drpc"
+	"sync"
 )

 const CName = "common.commonspace.requestmanager"
@@ -124,6 +122,5 @@ func (r *requestManager) doRequest(ctx context.Context, peerId string, msg *spac
 		resp, err = cl.ObjectSync(ctx, msg)
 		return err
 	})
-	err = rpcerr.Unwrap(err)
 	return
 }
@@ -2,8 +2,6 @@ package settings

 import (
 	"context"
-	"sync/atomic"
-
 	"github.com/anyproto/any-sync/accountservice"
 	"github.com/anyproto/any-sync/app"
 	"github.com/anyproto/any-sync/commonspace/deletionstate"
@@ -18,6 +16,7 @@ import (
 	"github.com/anyproto/any-sync/commonspace/spacestorage"
 	"github.com/anyproto/any-sync/nodeconf"
 	"go.uber.org/zap"
+	"sync/atomic"
 )

 const CName = "common.commonspace.settings"
@@ -62,7 +61,8 @@ func (s *settings) Init(a *app.App) (err error) {
 	deps := Deps{
 		BuildFunc: func(ctx context.Context, id string, listener updatelistener.UpdateListener) (t synctree.SyncTree, err error) {
 			res, err := s.treeBuilder.BuildTree(ctx, id, objecttreebuilder.BuildTreeOpts{
-				Listener: listener,
+				Listener:           listener,
+				WaitTreeRemoteSync: false,
 				// space settings document should not have empty data
 				TreeBuilder: objecttree.BuildObjectTree,
 			})
@@ -22,28 +22,29 @@ require (
 	github.com/ipfs/go-ipfs-blockstore v1.3.1
 	github.com/ipfs/go-ipfs-chunker v0.0.6
 	github.com/ipfs/go-ipfs-exchange-interface v0.2.1
-	github.com/ipfs/go-ipld-format v0.5.0
-	github.com/ipfs/go-merkledag v0.11.0
+	github.com/ipfs/go-ipld-format v0.4.0
+	github.com/ipfs/go-merkledag v0.10.0
 	github.com/ipfs/go-unixfs v0.4.6
-	github.com/libp2p/go-libp2p v0.28.1
+	github.com/libp2p/go-libp2p v0.27.5
 	github.com/mr-tron/base58 v1.2.0
 	github.com/multiformats/go-multibase v0.2.0
-	github.com/multiformats/go-multihash v0.2.3
-	github.com/prometheus/client_golang v1.16.0
+	github.com/multiformats/go-multihash v0.2.2
+	github.com/prometheus/client_golang v1.15.1
 	github.com/stretchr/testify v1.8.4
 	github.com/tyler-smith/go-bip39 v1.1.0
 	github.com/zeebo/blake3 v0.2.3
 	go.uber.org/atomic v1.11.0
 	go.uber.org/zap v1.24.0
-	golang.org/x/crypto v0.10.0
+	golang.org/x/crypto v0.9.0
 	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
-	golang.org/x/net v0.11.0
+	golang.org/x/net v0.10.0
 	gopkg.in/yaml.v3 v3.0.1
 	storj.io/drpc v0.0.33
 )

 require (
 	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
+	github.com/benbjohnson/clock v1.3.5 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3 // indirect
@@ -55,7 +56,9 @@ require (
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/huin/goupnp v1.2.0 // indirect
 	github.com/ipfs/bbloom v0.0.4 // indirect
 	github.com/ipfs/go-bitfield v1.1.0 // indirect
 	github.com/ipfs/go-datastore v0.6.0 // indirect
@@ -63,7 +66,8 @@ require (
 	github.com/ipfs/go-ipfs-files v0.2.0 // indirect
 	github.com/ipfs/go-ipfs-posinfo v0.0.1 // indirect
 	github.com/ipfs/go-ipfs-util v0.0.2 // indirect
-	github.com/ipfs/go-ipld-legacy v0.2.1 // indirect
+	github.com/ipfs/go-ipld-cbor v0.0.6 // indirect
+	github.com/ipfs/go-ipld-legacy v0.1.1 // indirect
 	github.com/ipfs/go-log v1.0.5 // indirect
 	github.com/ipfs/go-log/v2 v2.5.1 // indirect
 	github.com/ipfs/go-metrics-interface v0.0.1 // indirect
@@ -72,26 +76,31 @@ require (
 	github.com/ipld/go-ipld-prime v0.20.0 // indirect
 	github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
 	github.com/jbenet/goprocess v0.1.4 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
+	github.com/klauspost/compress v1.16.5 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
-	github.com/minio/sha256-simd v1.0.1 // indirect
+	github.com/miekg/dns v1.1.54 // indirect
+	github.com/minio/sha256-simd v1.0.0 // indirect
 	github.com/multiformats/go-base32 v0.1.0 // indirect
 	github.com/multiformats/go-base36 v0.2.0 // indirect
 	github.com/multiformats/go-multiaddr v0.9.0 // indirect
 	github.com/multiformats/go-multicodec v0.9.0 // indirect
 	github.com/multiformats/go-multistream v0.4.1 // indirect
 	github.com/multiformats/go-varint v0.0.7 // indirect
+	github.com/onsi/ginkgo/v2 v2.9.7 // indirect
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e // indirect
 	github.com/prometheus/client_model v0.4.0 // indirect
 	github.com/prometheus/common v0.44.0 // indirect
-	github.com/prometheus/procfs v0.10.1 // indirect
+	github.com/prometheus/procfs v0.10.0 // indirect
 	github.com/quic-go/quic-go v0.35.1 // indirect
+	github.com/quic-go/webtransport-go v0.5.3 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
+	github.com/whyrusleeping/cbor-gen v0.0.0-20200123233031-1cdf64d27158 // indirect
 	github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f // indirect
 	github.com/zeebo/errs v1.3.0 // indirect
 	go.opentelemetry.io/otel v1.7.0 // indirect
@@ -99,8 +108,9 @@ require (
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/image v0.6.0 // indirect
 	golang.org/x/sync v0.2.0 // indirect
-	golang.org/x/sys v0.9.0 // indirect
+	golang.org/x/sys v0.8.0 // indirect
 	golang.org/x/tools v0.9.3 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	google.golang.org/protobuf v1.30.0 // indirect
 	lukechampine.com/blake3 v1.2.1 // indirect
 )
@@ -13,6 +13,7 @@ github.com/anyproto/go-slip21 v1.0.0 h1:CI7lUqTIwmPOEGVAj4jyNLoICvueh++0U2HoAi3m
 github.com/anyproto/go-slip21 v1.0.0/go.mod h1:gbIJt7HAdr5DuT4f2pFTKCBSUWYsm/fysHBNqgsuxT0=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o=
+github.com/benbjohnson/clock v1.3.5/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
@@ -37,6 +38,7 @@ github.com/flynn/noise v1.0.0 h1:DlTHqmzmvcEiKj+4RYo/imoswx/4r6iBlCMfVtrMXpQ=
 github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8=
 github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk=
+github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
 github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -59,16 +61,20 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
 github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 h1:hR7/MlvK23p6+lIw9SN1TigNLn9ZnF3W4SYRKq2gAHs=
+github.com/google/pprof v0.0.0-20230602150820-91b7bce49751/go.mod h1:Jh3hGz2jkYak8qXPD19ryItVnUgpgeqzdkY/D0EaeuA=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gxed/hashland/keccakpg v0.0.1/go.mod h1:kRzw3HkwxFU1mpmPP8v1WyQzwdGfmKFJ6tItnhQ67kU=
 github.com/gxed/hashland/murmur3 v0.0.1/go.mod h1:KjXop02n4/ckmZSnY2+HKcLud/tcmvhST0bie/0lS48=
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
@@ -80,18 +86,24 @@ github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0Jr
 github.com/huandu/skiplist v1.2.0 h1:gox56QD77HzSC0w+Ws3MH3iie755GBJU1OER3h5VsYw=
 github.com/huandu/skiplist v1.2.0/go.mod h1:7v3iFjLcSAzO4fN5B8dvebvo/qsfumiLiDXMrPiHF9w=
 github.com/huin/goupnp v1.2.0 h1:uOKW26NG1hsSSbXIZ1IR7XP9Gjd1U8pnLaCMgntmkmY=
+github.com/huin/goupnp v1.2.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8=
 github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
 github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
 github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
 github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
 github.com/ipfs/go-bitswap v0.11.0 h1:j1WVvhDX1yhG32NTC9xfxnqycqYIlhzEzLXG/cU1HyQ=
 github.com/ipfs/go-block-format v0.0.2/go.mod h1:AWR46JfpcObNfg3ok2JHDUfdiHRgWhJgCQF+KIgOPJY=
+github.com/ipfs/go-block-format v0.0.3/go.mod h1:4LmD4ZUw0mhO+JSKdpWwrzATiEfM7WWgQ8H5l6P8MVk=
 github.com/ipfs/go-block-format v0.1.2 h1:GAjkfhVx1f4YTODS6Esrj1wt2HhrtwTnhEr+DyPUaJo=
 github.com/ipfs/go-block-format v0.1.2/go.mod h1:mACVcrxarQKstUU3Yf/RdwbC4DzPV6++rO2a3d+a/KE=
 github.com/ipfs/go-blockservice v0.5.2 h1:in9Bc+QcXwd1apOVM7Un9t8tixPKdaHQFdLSUM1Xgk8=
 github.com/ipfs/go-blockservice v0.5.2/go.mod h1:VpMblFEqG67A/H2sHKAemeH9vlURVavlysbdUI632yk=
 github.com/ipfs/go-cid v0.0.1/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
+github.com/ipfs/go-cid v0.0.2/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
+github.com/ipfs/go-cid v0.0.3/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
+github.com/ipfs/go-cid v0.0.4/go.mod h1:4LLaPOQwmk5z9LBgQnpkivrx8BJjUyGwTXCd5Xfj6+M=
 github.com/ipfs/go-cid v0.0.5/go.mod h1:plgt+Y5MnOey4vO4UlUazGqdbEXuFYitED67FexhXog=
+github.com/ipfs/go-cid v0.0.7/go.mod h1:6Ux9z5e+HpkQdckYoX1PG/6xqKspzlEIR5SDmgqgC/I=
 github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s=
 github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk=
 github.com/ipfs/go-datastore v0.5.0/go.mod h1:9zhEApYMTl17C8YDp7JmU7sQZi2/wqiYh73hakZ90Bk=
@@ -120,18 +132,21 @@ github.com/ipfs/go-ipfs-routing v0.3.0 h1:9W/W3N+g+y4ZDeffSgqhgo7BsBSJwPMcyssET9
 github.com/ipfs/go-ipfs-util v0.0.1/go.mod h1:spsl5z8KUnrve+73pOhSVZND1SIxPW5RyBCNzQxlJBc=
 github.com/ipfs/go-ipfs-util v0.0.2 h1:59Sswnk1MFaiq+VcaknX7aYEyGyGDAA73ilhEK2POp8=
 github.com/ipfs/go-ipfs-util v0.0.2/go.mod h1:CbPtkWJzjLdEcezDns2XYaehFVNXG9zrdrtMecczcsQ=
+github.com/ipfs/go-ipld-cbor v0.0.6 h1:pYuWHyvSpIsOOLw4Jy7NbBkCyzLDcl64Bf/LZW7eBQ0=
+github.com/ipfs/go-ipld-cbor v0.0.6/go.mod h1:ssdxxaLJPXH7OjF5V4NSjBbcfh+evoR4ukuru0oPXMA=
 github.com/ipfs/go-ipld-format v0.0.1/go.mod h1:kyJtbkDALmFHv3QR6et67i35QzO3S0dCDnkOJhcZkms=
-github.com/ipfs/go-ipld-format v0.5.0 h1:WyEle9K96MSrvr47zZHKKcDxJ/vlpET6PSiQsAFO+Ds=
-github.com/ipfs/go-ipld-format v0.5.0/go.mod h1:ImdZqJQaEouMjCvqCe0ORUS+uoBmf7Hf+EO/jh+nk3M=
-github.com/ipfs/go-ipld-legacy v0.2.1 h1:mDFtrBpmU7b//LzLSypVrXsD8QxkEWxu5qVxN99/+tk=
-github.com/ipfs/go-ipld-legacy v0.2.1/go.mod h1:782MOUghNzMO2DER0FlBR94mllfdCJCkTtDtPM51otM=
+github.com/ipfs/go-ipld-format v0.2.0/go.mod h1:3l3C1uKoadTPbeNfrDi+xMInYKlx2Cvg1BuydPSdzQs=
+github.com/ipfs/go-ipld-format v0.4.0 h1:yqJSaJftjmjc9jEOFYlpkwOLVKv68OD27jFLlSghBlQ=
+github.com/ipfs/go-ipld-format v0.4.0/go.mod h1:co/SdBE8h99968X0hViiw1MNlh6fvxxnHpvVLnH7jSM=
+github.com/ipfs/go-ipld-legacy v0.1.1 h1:BvD8PEuqwBHLTKqlGFTHSwrwFOMkVESEvwIYwR2cdcc=
+github.com/ipfs/go-ipld-legacy v0.1.1/go.mod h1:8AyKFCjgRPsQFf15ZQgDB8Din4DML/fOmKZkkFkrIEg=
 github.com/ipfs/go-log v1.0.5 h1:2dOuUCB1Z7uoczMWgAyDck5JLb72zHzrMnGnCNNbvY8=
 github.com/ipfs/go-log v1.0.5/go.mod h1:j0b8ZoR+7+R99LD9jZ6+AJsrzkPbSXbZfGakb5JPtIo=
 github.com/ipfs/go-log/v2 v2.1.3/go.mod h1:/8d0SH3Su5Ooc31QlL1WysJhvyOTDCjcCZ9Axpmri6g=
 github.com/ipfs/go-log/v2 v2.5.1 h1:1XdUzF7048prq4aBjDQQ4SL5RxftpRGdXhNRwKSAlcY=
 github.com/ipfs/go-log/v2 v2.5.1/go.mod h1:prSpmC1Gpllc9UYWxDiZDreBYw7zp4Iqp1kOLU9U5UI=
-github.com/ipfs/go-merkledag v0.11.0 h1:DgzwK5hprESOzS4O1t/wi6JDpyVQdvm9Bs59N/jqfBY=
-github.com/ipfs/go-merkledag v0.11.0/go.mod h1:Q4f/1ezvBiJV0YCIXvt51W/9/kqJGH4I1LsA7+djsM4=
+github.com/ipfs/go-merkledag v0.10.0 h1:IUQhj/kzTZfam4e+LnaEpoiZ9vZF6ldimVlby+6OXL4=
+github.com/ipfs/go-merkledag v0.10.0/go.mod h1:zkVav8KiYlmbzUzNM6kENzkdP5+qR7+2mCwxkQ6GIj8=
 github.com/ipfs/go-metrics-interface v0.0.1 h1:j+cpbjYvu4R8zbleSs36gvB7jR+wsL2fGD6n0jO4kdg=
 github.com/ipfs/go-metrics-interface v0.0.1/go.mod h1:6s6euYU4zowdslK0GKHmqaIZ3j/b/tL7HTWtJ4VPgWY=
 github.com/ipfs/go-peertaskqueue v0.8.0 h1:JyNO144tfu9bx6Hpo119zvbEL9iQ760FHOiJYsUjqaU=
@@ -141,6 +156,7 @@ github.com/ipfs/go-verifcid v0.0.1 h1:m2HI7zIuR5TFyQ1b79Da5N9dnnCP1vcu2QqawmWlK2
 github.com/ipfs/go-verifcid v0.0.1/go.mod h1:5Hrva5KBeIog4A+UpqlaIU+DEstipcJYQQZc0g37pY0=
 github.com/ipld/go-codec-dagpb v1.6.0 h1:9nYazfyu9B1p3NAgfVdpRco3Fs2nFC72DqVsMj6rOcc=
 github.com/ipld/go-codec-dagpb v1.6.0/go.mod h1:ANzFhfP2uMJxRBr8CE+WQWs5UsNa0pYtmKZ+agnUw9s=
+github.com/ipld/go-ipld-prime v0.9.1-0.20210324083106-dc342a9917db/go.mod h1:KvBLMr4PX1gWptgkzRjVZCrLmSGcZCb/jioOQwCqZN8=
 github.com/ipld/go-ipld-prime v0.20.0 h1:Ud3VwE9ClxpO2LkCYP7vWPc0Fo+dYdYzgxUJZ3uRG4g=
 github.com/ipld/go-ipld-prime v0.20.0/go.mod h1:PzqZ/ZR981eKbgdr3y2DJYeD/8bgMawdGVlJDE8kK+M=
 github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
@@ -149,30 +165,36 @@ github.com/jbenet/go-temp-err-catcher v0.1.0 h1:zpb3ZH6wIE8Shj2sKS+khgRvf7T7RABo
 github.com/jbenet/go-temp-err-catcher v0.1.0/go.mod h1:0kJRvmDZXNMIiJirNPEYfhpPwbGVtZVWC34vc5WLsDk=
 github.com/jbenet/goprocess v0.1.4 h1:DRGOFReOMqqDNXwW70QkacFW0YN9QnwLV0Vqk+3oU0o=
 github.com/jbenet/goprocess v0.1.4/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4=
-github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE=
+github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI=
+github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c=
-github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
-github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
+github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
 github.com/koron/go-ssdp v0.0.4 h1:1IDwrghSKYM7yLf7XCzbByg2sJ/JcNOZRXS2jczTwz0=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM=
 github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8=
 github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg=
 github.com/libp2p/go-cidranger v1.1.0 h1:ewPN8EZ0dd1LSnrtuwd4709PXVcITVeuwbag38yPW7c=
-github.com/libp2p/go-libp2p v0.28.1 h1:YurK+ZAI6cKfASLJBVFkpVBdl3wGhFi6fusOt725ii8=
-github.com/libp2p/go-libp2p v0.28.1/go.mod h1:s3Xabc9LSwOcnv9UD4nORnXKTsWkPMkIMB/JIGXVnzk=
+github.com/libp2p/go-libp2p v0.27.5 h1:KwA7pXKXpz8hG6Cr1fMA7UkgleogcwQj0sxl5qquWRg=
+github.com/libp2p/go-libp2p v0.27.5/go.mod h1:oMfQGTb9CHnrOuSM6yMmyK2lXz3qIhnkn2+oK3B1Y2g=
 github.com/libp2p/go-libp2p-asn-util v0.3.0 h1:gMDcMyYiZKkocGXDQ5nsUQyquC9+H+iLEQHwOCZ7s8s=
 github.com/libp2p/go-libp2p-record v0.2.0 h1:oiNUOCWno2BFuxt3my4i1frNrt7PerzB3queqa1NkQ0=
 github.com/libp2p/go-libp2p-testing v0.12.0 h1:EPvBb4kKMWO29qP4mZGyhVzUyR25dvfUIK5WDu6iPUA=
 github.com/libp2p/go-msgio v0.3.0 h1:mf3Z8B1xcFN314sWX+2vOTShIE0Mmn2TXn3YCUQGNj0=
-github.com/libp2p/go-nat v0.2.0 h1:Tyz+bUFAYqGyJ/ppPPymMGbIgNRH+WqC5QrT5fKrrGk=
+github.com/libp2p/go-nat v0.1.0 h1:MfVsH6DLcpa04Xr+p8hmVRG4juse0s3J8HyNWYHffXg=
 github.com/libp2p/go-netroute v0.2.1 h1:V8kVrpD8GK0Riv15/7VN6RbUQ3URNZVosw7H2v9tksU=
 github.com/libp2p/go-yamux/v4 v4.0.0 h1:+Y80dV2Yx/kv7Y7JKu0LECyVdMXm1VUoko+VQ9rBfZQ=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
@@ -181,18 +203,21 @@ github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/miekg/dns v1.1.54 h1:5jon9mWcb0sFJGpnI99tOMhCPyJ+RPVz5b63MQG0VWI=
+github.com/miekg/dns v1.1.54/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY=
 github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
 github.com/minio/sha256-simd v0.0.0-20190131020904-2d45a736cd16/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U=
 github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
-github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
-github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
+github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g=
+github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM=
 github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8=
+github.com/mr-tron/base58 v1.1.2/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
 github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/multiformats/go-base32 v0.0.3/go.mod h1:pLiuGC8y0QR3Ue4Zug5UzK9LjgbkL8NSQj0zQ5Nz/AA=
 github.com/multiformats/go-base32 v0.1.0 h1:pVx9xoSPqEIQG8o+UbAe7DNi51oej1NtK+aGkbLYxPE=
 github.com/multiformats/go-base32 v0.1.0/go.mod h1:Kj3tFY6zNr+ABYMqeUNeGvkIC/UYgtWibDcT0rExnbI=
+github.com/multiformats/go-base36 v0.1.0/go.mod h1:kFGE83c6s80PklsHO9sRn2NCoffoRdUUOENyW/Vv6sM=
 github.com/multiformats/go-base36 v0.2.0 h1:lFsAbNOGeKtuKozrtBsAkSVhv1p9D0/qedU9rQyccr0=
 github.com/multiformats/go-base36 v0.2.0/go.mod h1:qvnKE++v+2MWCfePClUEjE78Z7P2a1UV0xHgWc0hkp4=
 github.com/multiformats/go-multiaddr v0.9.0 h1:3h4V1LHIk5w4hJHekMKWALPXErDfz/sggzwC/NcqbDQ=
@@ -200,22 +225,27 @@ github.com/multiformats/go-multiaddr v0.9.0/go.mod h1:mI67Lb1EeTOYb8GQfL/7wpIZwc
 github.com/multiformats/go-multiaddr-dns v0.3.1 h1:QgQgR+LQVt3NPTjbrLLpsaT2ufAA2y0Mkk+QRVJbW3A=
 github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E=
 github.com/multiformats/go-multibase v0.0.1/go.mod h1:bja2MqRZ3ggyXtZSEDKpl0uO/gviWFaSteVbWT51qgs=
+github.com/multiformats/go-multibase v0.0.3/go.mod h1:5+1R4eQrT3PkYZ24C3W2Ue2tPwIdYQD509ZjSb5y9Oc=
 github.com/multiformats/go-multibase v0.2.0 h1:isdYCVLvksgWlMW9OZRYJEa9pZETFivncJHmHnnd87g=
 github.com/multiformats/go-multibase v0.2.0/go.mod h1:bFBZX4lKCA/2lyOFSAoKH5SS6oPyjtnzK/XTFDPkNuk=
 github.com/multiformats/go-multicodec v0.9.0 h1:pb/dlPnzee/Sxv/j4PmkDRxCOi3hXTz3IbPKOXWJkmg=
 github.com/multiformats/go-multicodec v0.9.0/go.mod h1:L3QTQvMIaVBkXOXXtVmYE+LI16i14xuaojr/H7Ai54k=
 github.com/multiformats/go-multihash v0.0.1/go.mod h1:w/5tugSrLEbWqlcgJabL3oHFKTwfvkofsjW2Qa1ct4U=
+github.com/multiformats/go-multihash v0.0.10/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
 github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
-github.com/multiformats/go-multihash v0.2.3 h1:7Lyc8XfX/IY2jWb/gI7JP+o7JEq9hOa7BFvVU9RSh+U=
-github.com/multiformats/go-multihash v0.2.3/go.mod h1:dXgKXCXjBzdscBLk9JkjINiEsCKRVch90MdaGiKsvSM=
+github.com/multiformats/go-multihash v0.0.14/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
+github.com/multiformats/go-multihash v0.0.15/go.mod h1:D6aZrWNLFTV/ynMpKsNtB40mJzmCl4jb1alC0OvHiHg=
+github.com/multiformats/go-multihash v0.2.2 h1:Uu7LWs/PmWby1gkj1S1DXx3zyd3aVabA4FiMKn/2tAc=
+github.com/multiformats/go-multihash v0.2.2/go.mod h1:dXgKXCXjBzdscBLk9JkjINiEsCKRVch90MdaGiKsvSM=
 github.com/multiformats/go-multistream v0.4.1 h1:rFy0Iiyn3YT0asivDUIR05leAdwZq3de4741sbiSdfo=
 github.com/multiformats/go-multistream v0.4.1/go.mod h1:Mz5eykRVAjJWckE2U78c6xqdtyNUEhKSM0Lwar2p77Q=
 github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
+github.com/multiformats/go-varint v0.0.6/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
 github.com/multiformats/go-varint v0.0.7 h1:sWSGR+f/eu5ABZA2ZpYKBILXTTs9JWpdEM/nEGOHFS8=
 github.com/multiformats/go-varint v0.0.7/go.mod h1:r8PUYw/fD/SjBCiKOoDlGF6QawOELpZAu9eioSos/OU=
 github.com/nfnt/resize v0.0.0-20160724205520-891127d8d1b5 h1:BvoENQQU+fZ9uukda/RzCAL/191HHwJA5b13R6diVlY=
-github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo/v2 v2.9.7 h1:06xGQy5www2oN160RtEZoTvnP2sPhEfePYmCDc2szss=
+github.com/onsi/ginkgo/v2 v2.9.7/go.mod h1:cxrmXWykAwTwhQsJOPfdIDiJ+l2RYq7U8hFU+M/1uw0=
 github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -223,26 +253,32 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/polydawn/refmt v0.0.0-20190221155625-df39d6c2d992/go.mod h1:uIp+gprXxxrWSjjklXD+mN4wed/tMfjMMmN/9+JsA9o=
+github.com/polydawn/refmt v0.0.0-20190807091052-3d65705ee9f1/go.mod h1:uIp+gprXxxrWSjjklXD+mN4wed/tMfjMMmN/9+JsA9o=
 github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e h1:ZOcivgkkFRnjfoTcGsDq3UQYiBmekwLA+qg0OjyB/ls=
 github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e/go.mod h1:uIp+gprXxxrWSjjklXD+mN4wed/tMfjMMmN/9+JsA9o=
-github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8=
-github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc=
+github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI=
+github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk=
 github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY=
 github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
 github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
 github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
-github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg=
-github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
+github.com/prometheus/procfs v0.10.0 h1:UkG7GPYkO4UZyLnyXjaWYcgOSONqwdBqFUT95ugmt6I=
+github.com/prometheus/procfs v0.10.0/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
 github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
 github.com/quic-go/qtls-go1-19 v0.3.2 h1:tFxjCFcTQzK+oMxG6Zcvp4Dq8dx4yD3dDiIiyc86Z5U=
 github.com/quic-go/qtls-go1-20 v0.2.2 h1:WLOPx6OY/hxtTxKV1Zrq20FtXtDEkeY00CGQm8GEa3E=
 github.com/quic-go/quic-go v0.35.1 h1:b0kzj6b/cQAf05cT0CkQubHM31wiA+xH3IBkxP62poo=
 github.com/quic-go/quic-go v0.35.1/go.mod h1:+4CVgVppm0FNjpG3UcX8Joi/frKOH7/ciD5yGcwOO1g=
 github.com/quic-go/webtransport-go v0.5.3 h1:5XMlzemqB4qmOlgIus5zB45AcZ2kCgCy2EptUrfOPWU=
+github.com/quic-go/webtransport-go v0.5.3/go.mod h1:OhmmgJIzTTqXK5xvtuX0oBpLV2GkLWNDA+UeTGJXErU=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa/go.mod h1:2RVY1rIf+2J2o/IM9+vPq9RzmHDSseB7FoXiSNIUsoU=
 github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
@@ -256,7 +292,11 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl
 github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8=
 github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U=
 github.com/warpfork/go-testmark v0.11.0 h1:J6LnV8KpceDvo7spaNU4+DauH2n1x+6RaO2rJrmpQ9U=
+github.com/warpfork/go-wish v0.0.0-20180510122957-5ad1f5abf436/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw=
 github.com/warpfork/go-wish v0.0.0-20200122115046-b9ea61034e4a h1:G++j5e0OC488te356JvdhaM8YS6nMsjLAYF7JxCv07w=
+github.com/warpfork/go-wish v0.0.0-20200122115046-b9ea61034e4a/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw=
+github.com/whyrusleeping/cbor-gen v0.0.0-20200123233031-1cdf64d27158 h1:WXhVOwj2USAXB5oMDwRl3piOux2XMV9TANaYxXHdkoE=
+github.com/whyrusleeping/cbor-gen v0.0.0-20200123233031-1cdf64d27158/go.mod h1:Xj/M2wWU+QdTdRbu/L/1dIZY8/Wb2K9pAhtroQuxJJI=
 github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f h1:jQa4QT2UP9WYv2nzyawpKMOCl+Z/jW7djv2/J50lj9E=
 github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f/go.mod h1:p9UJB6dDgdPgMJZs7UjUOdulKyRr9fqkS+6JKAInPy8=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -297,9 +337,10 @@ golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM=
-golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
+golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
+golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
 golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=
 golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
 golang.org/x/image v0.6.0 h1:bR8b5okrPI3g/gyZakLZHeWxAR8Dn5CyxXv1hLH5g/4=
@@ -321,8 +362,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.11.0 h1:Gi2tvZIJyBtO9SDr1q9h5hEQCp/4L2RQ+ar0qjx2oNU=
-golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ=
+golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -335,19 +376,23 @@ golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190219092855-153ac476189d/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
-golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@@ -356,9 +401,10 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58=
+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -374,6 +420,7 @@ golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
@@ -2,10 +2,8 @@ package metric

 import (
 	"github.com/prometheus/client_golang/prometheus"
-	"go.uber.org/zap"
 	"storj.io/drpc"
 	"time"
-	"unicode/utf8"
 )

 type prometheusDRPC struct {
@@ -16,11 +14,7 @@ type prometheusDRPC struct {
 func (ph *prometheusDRPC) HandleRPC(stream drpc.Stream, rpc string) (err error) {
 	st := time.Now()
 	defer func() {
-		if utf8.ValidString(rpc) {
-			ph.SummaryVec.WithLabelValues(rpc).Observe(time.Since(st).Seconds())
-		} else {
-			log.WarnCtx(stream.Context(), "invalid rpc string", zap.String("rpc", rpc))
-		}
+		ph.SummaryVec.WithLabelValues(rpc).Observe(time.Since(st).Seconds())
 	}()
 	return ph.Handler.HandleRPC(stream, rpc)
 }
@@ -31,10 +31,6 @@ func PeerId(val string) zap.Field {
 	return zap.String("peerId", val)
 }

-func PeerVersion(val string) zap.Field {
-	return zap.String("peerVersion", val)
-}
-
 func Identity(val string) zap.Field {
 	return zap.String("identity", val)
 }
@@ -65,5 +61,5 @@ func (m *metric) RequestLog(ctx context.Context, rpc string, fields ...zap.Field
 	if ak != nil {
 		acc = ak.Account()
 	}
-	m.rpcLog.Info("", append(fields, m.appField, PeerId(peerId), Identity(acc), Method(rpc), PeerVersion(peer.CtxPeerClientVersion(ctx)))...)
+	m.rpcLog.Info("", append(fields, m.appField, PeerId(peerId), Identity(acc), Method(rpc))...)
 }
@@ -21,7 +21,13 @@ func NewTimeout(conn net.Conn, timeout time.Duration) *TimeoutConn {
 	return &TimeoutConn{conn, timeout}
 }

-func (c *TimeoutConn) Write(p []byte) (n int, err error) {
+func (c *TimeoutConn) Write(p []byte) (n int, retErr error) {
+	log.Debug("start write", zap.Int("n", len(p)))
+	defer func() {
+		if retErr != nil {
+			log.Debug("conn write error", zap.Int("n", n), zap.Error(retErr))
+		}
+	}()
 	for {
 		if c.timeout != 0 {
 			if e := c.Conn.SetWriteDeadline(time.Now().Add(c.timeout)); e != nil {
@@ -47,6 +53,7 @@ func (c *TimeoutConn) Write(p []byte) (n int, err error) {
 			}
 			log.Debug("connection timed out", zap.String("remoteAddr", c.RemoteAddr().String()))
 		}
+		log.Debug("conn write", zap.Int("n", n))
 		return n, err
 	}
 }
@@ -14,7 +14,6 @@ const (
 	contextKeyPeerId contextKey = iota
 	contextKeyIdentity
 	contextKeyPeerAddr
-	contextKeyPeerClientVersion
 )

 var (
@@ -51,19 +50,6 @@ func CtxWithPeerAddr(ctx context.Context, addr string) context.Context {
 	return context.WithValue(ctx, contextKeyPeerAddr, addr)
 }

-// CtxPeerClientVersion returns peer client version
-func CtxPeerClientVersion(ctx context.Context) string {
-	if p, ok := ctx.Value(contextKeyPeerClientVersion).(string); ok {
-		return p
-	}
-	return ""
-}
-
-// CtxWithClientVersion sets peer clientVersion to the context
-func CtxWithClientVersion(ctx context.Context, addr string) context.Context {
-	return context.WithValue(ctx, contextKeyPeerClientVersion, addr)
-}
-
 // CtxIdentity returns identity from context
 func CtxIdentity(ctx context.Context) ([]byte, error) {
 	if identity, ok := ctx.Value(contextKeyIdentity).([]byte); ok {
@@ -1,18 +0,0 @@
-package peer
-
-import (
-	"time"
-)
-
-type limiter struct {
-	startThreshold int
-	slowDownStep   time.Duration
-}
-
-func (l limiter) wait(count int) <-chan time.Time {
-	if count > l.startThreshold {
-		wait := l.slowDownStep * time.Duration(count-l.startThreshold)
-		return time.After(wait)
-	}
-	return nil
-}
@@ -19,7 +19,6 @@ import (
 	"storj.io/drpc/drpcstream"
 	"storj.io/drpc/drpcwire"
 	"sync"
-	"sync/atomic"
 	"time"
 )

@@ -36,15 +35,7 @@ func NewPeer(mc transport.MultiConn, ctrl connCtrl) (p Peer, err error) {
 		active:    map[*subConn]struct{}{},
 		MultiConn: mc,
 		ctrl:      ctrl,
-		limiter: limiter{
-			// start throttling after 10 sub conns
-			startThreshold: 10,
-			slowDownStep:   time.Millisecond * 100,
-		},
-		subConnRelease: make(chan drpc.Conn),
-		created:        time.Now(),
 	}
-	pr.acceptCtx, pr.acceptCtxCancel = context.WithCancel(context.Background())
 	if pr.id, err = CtxPeerId(ctx); err != nil {
 		return
 	}
@@ -78,22 +69,11 @@ type peer struct {
 	ctrl connCtrl

 	// drpc conn pool
-	// outgoing
-	inactive         []*subConn
-	active           map[*subConn]struct{}
-	subConnRelease   chan drpc.Conn
-	openingWaitCount atomic.Int32
-
-	incomingCount atomic.Int32
-	acceptCtx     context.Context
-
-	acceptCtxCancel context.CancelFunc
-
-	limiter limiter
+	inactive []*subConn
+	active   map[*subConn]struct{}

 	mu sync.Mutex

-	created time.Time
 	transport.MultiConn
 }

@@ -104,20 +84,7 @@ func (p *peer) Id() string {
 func (p *peer) AcquireDrpcConn(ctx context.Context) (drpc.Conn, error) {
 	p.mu.Lock()
 	if len(p.inactive) == 0 {
-		wait := p.limiter.wait(len(p.active) + int(p.openingWaitCount.Load()))
 		p.mu.Unlock()
-		if wait != nil {
-			p.openingWaitCount.Add(1)
-			defer p.openingWaitCount.Add(-1)
-			// throttle new connection opening
-			select {
-			case <-ctx.Done():
-				return nil, ctx.Err()
-			case dconn := <-p.subConnRelease:
-				return dconn, nil
-			case <-wait:
-			}
-		}
 		dconn, err := p.openDrpcConn(ctx)
 		if err != nil {
 			return nil, err
@@ -140,21 +107,6 @@ func (p *peer) AcquireDrpcConn(ctx context.Context) (drpc.Conn, error) {
 }

 func (p *peer) ReleaseDrpcConn(conn drpc.Conn) {
-	// do nothing if it's closed connection
-	select {
-	case <-conn.Closed():
-		return
-	default:
-	}
-
-	// try to send this connection to acquire if anyone is waiting for it
-	select {
-	case p.subConnRelease <- conn:
-		return
-	default:
-	}
-
-	// return to pool
 	p.mu.Lock()
 	defer p.mu.Unlock()
 	sc, ok := conn.(*subConn)
@@ -207,21 +159,12 @@ func (p *peer) acceptLoop() {
 		}
 	}()
 	for {
-		if wait := p.limiter.wait(int(p.incomingCount.Load())); wait != nil {
-			select {
-			case <-wait:
-			case <-p.acceptCtx.Done():
-				return
-			}
-		}
 		conn, err := p.Accept()
 		if err != nil {
 			exitErr = err
 			return
 		}
 		go func() {
-			p.incomingCount.Add(1)
-			defer p.incomingCount.Add(-1)
 			serveErr := p.serve(conn)
 			if serveErr != io.EOF && serveErr != transport.ErrConnClosed {
 				log.InfoCtx(p.Context(), "serve connection error", zap.Error(serveErr))
@@ -247,14 +190,14 @@ func (p *peer) serve(conn net.Conn) (err error) {
 }

 func (p *peer) TryClose(objectTTL time.Duration) (res bool, err error) {
-	aliveCount := p.gc(objectTTL)
-	if aliveCount == 0 && p.created.Add(time.Minute).Before(time.Now()) {
-		return true, p.Close()
+	p.gc(objectTTL)
+	if time.Now().Sub(p.LastUsage()) < objectTTL {
+		return false, nil
 	}
-	return false, nil
+	return true, p.Close()
 }

-func (p *peer) gc(ttl time.Duration) (aliveCount int) {
+func (p *peer) gc(ttl time.Duration) {
 	p.mu.Lock()
 	defer p.mu.Unlock()
 	minLastUsage := time.Now().Add(-ttl)
@@ -295,7 +238,6 @@ func (p *peer) gc(ttl time.Duration) (aliveCount int) {
 			continue
 		}
 	}
-	return len(p.active) + len(p.inactive)
 }

 func (p *peer) Close() (err error) {
@@ -12,8 +12,6 @@ import (
 	"io"
 	"net"
 	_ "net/http/pprof"
-	"storj.io/drpc"
-	"storj.io/drpc/drpcconn"
 	"testing"
 	"time"
 )
@@ -21,86 +19,32 @@ import (
 var ctx = context.Background()

 func TestPeer_AcquireDrpcConn(t *testing.T) {
-	t.Run("generic", func(t *testing.T) {
-		fx := newFixture(t, "p1")
-		defer fx.finish()
-		in, out := net.Pipe()
-		go func() {
-			handshake.IncomingProtoHandshake(ctx, out, defaultProtoChecker)
-		}()
-		defer out.Close()
-		fx.mc.EXPECT().Open(gomock.Any()).Return(in, nil)
-		dc, err := fx.AcquireDrpcConn(ctx)
-		require.NoError(t, err)
-		assert.NotEmpty(t, dc)
-		defer dc.Close()
-
-		assert.Len(t, fx.active, 1)
-		assert.Len(t, fx.inactive, 0)
-
-		fx.ReleaseDrpcConn(dc)
-
-		assert.Len(t, fx.active, 0)
-		assert.Len(t, fx.inactive, 1)
-
-		dc, err = fx.AcquireDrpcConn(ctx)
-		require.NoError(t, err)
-		assert.NotEmpty(t, dc)
-		assert.Len(t, fx.active, 1)
-		assert.Len(t, fx.inactive, 0)
-	})
-	t.Run("closed sub conn", func(t *testing.T) {
-		fx := newFixture(t, "p1")
-		defer fx.finish()
-
-		closedIn, _ := net.Pipe()
-		dc := drpcconn.New(closedIn)
-		fx.ReleaseDrpcConn(&subConn{Conn: dc})
-		dc.Close()
-
-		in, out := net.Pipe()
-		go func() {
-			handshake.IncomingProtoHandshake(ctx, out, defaultProtoChecker)
-		}()
-		defer out.Close()
-		fx.mc.EXPECT().Open(gomock.Any()).Return(in, nil)
-		_, err := fx.AcquireDrpcConn(ctx)
-		require.NoError(t, err)
-	})
-}
-
-func TestPeer_DrpcConn_OpenThrottling(t *testing.T) {
 	fx := newFixture(t, "p1")
 	defer fx.finish()
-
-	acquire := func() (func(), drpc.Conn, error) {
-		in, out := net.Pipe()
-		go func() {
-			_, err := handshake.IncomingProtoHandshake(ctx, out, defaultProtoChecker)
-			require.NoError(t, err)
-		}()
-
-		fx.mc.EXPECT().Open(gomock.Any()).Return(in, nil)
-		dconn, err := fx.AcquireDrpcConn(ctx)
-		return func() { out.Close() }, dconn, err
-	}
-
-	var conCount = fx.limiter.startThreshold + 3
-	var conns []drpc.Conn
-	for i := 0; i < conCount; i++ {
-		cc, dc, err := acquire()
-		require.NoError(t, err)
-		defer cc()
-		conns = append(conns, dc)
-	}
-
+	in, out := net.Pipe()
 	go func() {
-		time.Sleep(fx.limiter.slowDownStep)
-		fx.ReleaseDrpcConn(conns[0])
-		conns = conns[1:]
+		handshake.IncomingProtoHandshake(ctx, out, defaultProtoChecker)
 	}()
-	_, err := fx.AcquireDrpcConn(ctx)
+	defer out.Close()
+	fx.mc.EXPECT().Open(gomock.Any()).Return(in, nil)
+	dc, err := fx.AcquireDrpcConn(ctx)
 	require.NoError(t, err)
+	assert.NotEmpty(t, dc)
+	defer dc.Close()
+
+	assert.Len(t, fx.active, 1)
+	assert.Len(t, fx.inactive, 0)
+
+	fx.ReleaseDrpcConn(dc)
+
+	assert.Len(t, fx.active, 0)
+	assert.Len(t, fx.inactive, 1)
+
+	dc, err = fx.AcquireDrpcConn(ctx)
+	require.NoError(t, err)
+	assert.NotEmpty(t, dc)
+	assert.Len(t, fx.active, 1)
+	assert.Len(t, fx.inactive, 0)
 }

 func TestPeerAccept(t *testing.T) {
@@ -119,30 +63,12 @@ func TestPeerAccept(t *testing.T) {
 	assert.NoError(t, <-outHandshakeCh)
 }

-func TestPeer_DrpcConn_AcceptThrottling(t *testing.T) {
-	fx := newFixture(t, "p1")
-	defer fx.finish()
-
-	var conCount = fx.limiter.startThreshold + 3
-	for i := 0; i < conCount; i++ {
-		in, out := net.Pipe()
-		defer out.Close()
-
-		var outHandshakeCh = make(chan error)
-		go func() {
-			outHandshakeCh <- handshake.OutgoingProtoHandshake(ctx, out, handshakeproto.ProtoType_DRPC)
-		}()
-		fx.acceptCh <- acceptedConn{conn: in}
-		cn := <-fx.testCtrl.serveConn
-		assert.Equal(t, in, cn)
-		assert.NoError(t, <-outHandshakeCh)
-	}
-}
-
 func TestPeer_TryClose(t *testing.T) {
-	t.Run("not close in first minute", func(t *testing.T) {
+	t.Run("ttl", func(t *testing.T) {
 		fx := newFixture(t, "p1")
 		defer fx.finish()
+		lu := time.Now()
+		fx.mc.EXPECT().LastUsage().Return(lu)
 		res, err := fx.TryClose(time.Second)
 		require.NoError(t, err)
 		assert.False(t, res)
@@ -150,7 +76,8 @@ func TestPeer_TryClose(t *testing.T) {
 	t.Run("close", func(t *testing.T) {
 		fx := newFixture(t, "p1")
 		defer fx.finish()
-		fx.peer.created = fx.peer.created.Add(-time.Minute * 2)
+		lu := time.Now().Add(-time.Second * 2)
+		fx.mc.EXPECT().LastUsage().Return(lu)
 		res, err := fx.TryClose(time.Second)
 		require.NoError(t, err)
 		assert.True(t, res)
@@ -158,7 +85,8 @@ func TestPeer_TryClose(t *testing.T) {
 	t.Run("gc", func(t *testing.T) {
 		fx := newFixture(t, "p1")
 		defer fx.finish()
-		//now := time.Now()
+		now := time.Now()
+		fx.mc.EXPECT().LastUsage().Return(now.Add(time.Millisecond * 100))

 		// make one inactive
 		in, out := net.Pipe()
@@ -49,8 +49,8 @@ func (p *poolService) Init(a *app.App) (err error) {
 			return p.dialer.Dial(ctx, id)
 		},
 		ocache.WithLogger(log.Sugar()),
-		ocache.WithGCPeriod(time.Minute/2),
-		ocache.WithTTL(time.Minute),
+		ocache.WithGCPeriod(time.Minute),
+		ocache.WithTTL(time.Minute*5),
 		ocache.WithPrometheus(p.metricReg, "netpool", "outgoing"),
 	)
 	p.pool.incoming = ocache.New(
@@ -58,8 +58,8 @@ func (p *poolService) Init(a *app.App) (err error) {
 			return nil, ocache.ErrNotExists
 		},
 		ocache.WithLogger(log.Sugar()),
-		ocache.WithGCPeriod(time.Minute/2),
-		ocache.WithTTL(time.Minute),
+		ocache.WithGCPeriod(time.Minute),
+		ocache.WithTTL(time.Minute*5),
 		ocache.WithPrometheus(p.metricReg, "netpool", "incoming"),
 	)
 	return nil
@@ -1,29 +0,0 @@
-package multiconntest
-
-import (
-	"context"
-	"github.com/anyproto/any-sync/net/connutil"
-	"github.com/anyproto/any-sync/net/transport"
-	yamux2 "github.com/anyproto/any-sync/net/transport/yamux"
-	"github.com/hashicorp/yamux"
-	"net"
-)
-
-func MultiConnPair(peerServCtx, peerClientCtx context.Context) (serv, client transport.MultiConn) {
-	sc, cc := net.Pipe()
-	var servConn = make(chan transport.MultiConn, 1)
-	go func() {
-		sess, err := yamux.Server(sc, yamux.DefaultConfig())
-		if err != nil {
-			panic(err)
-		}
-		servConn <- yamux2.NewMultiConn(peerServCtx, connutil.NewLastUsageConn(sc), "", sess)
-	}()
-	sess, err := yamux.Client(cc, yamux.DefaultConfig())
-	if err != nil {
-		panic(err)
-	}
-	client = yamux2.NewMultiConn(peerClientCtx, connutil.NewLastUsageConn(cc), "", sess)
-	serv = <-servConn
-	return
-}
@@ -2,11 +2,29 @@ package rpctest

 import (
 	"context"
+	"github.com/anyproto/any-sync/net/connutil"
 	"github.com/anyproto/any-sync/net/peer"
-	"github.com/anyproto/any-sync/net/rpc/rpctest/multiconntest"
 	"github.com/anyproto/any-sync/net/transport"
+	yamux2 "github.com/anyproto/any-sync/net/transport/yamux"
+	"github.com/hashicorp/yamux"
+	"net"
 )

 func MultiConnPair(peerIdServ, peerIdClient string) (serv, client transport.MultiConn) {
-	return multiconntest.MultiConnPair(peer.CtxWithPeerId(context.Background(), peerIdServ), peer.CtxWithPeerId(context.Background(), peerIdClient))
+	sc, cc := net.Pipe()
+	var servConn = make(chan transport.MultiConn, 1)
+	go func() {
+		sess, err := yamux.Server(sc, yamux.DefaultConfig())
+		if err != nil {
+			panic(err)
+		}
+		servConn <- yamux2.NewMultiConn(peer.CtxWithPeerId(context.Background(), peerIdServ), connutil.NewLastUsageConn(sc), "", sess)
+	}()
+	sess, err := yamux.Client(cc, yamux.DefaultConfig())
+	if err != nil {
+		panic(err)
+	}
+	client = yamux2.NewMultiConn(peer.CtxWithPeerId(context.Background(), peerIdClient), connutil.NewLastUsageConn(cc), "", sess)
+	serv = <-servConn
+	return
 }
@@ -8,13 +8,9 @@ import (
 	"go.uber.org/zap"
 )

-func newNoVerifyChecker(protoVersion uint32, clientVersion string) handshake.CredentialChecker {
+func newNoVerifyChecker(protoVersion uint32) handshake.CredentialChecker {
 	return &noVerifyChecker{
-		cred: &handshakeproto.Credentials{
-			Type:          handshakeproto.CredentialsType_SkipVerify,
-			Version:       protoVersion,
-			ClientVersion: clientVersion,
-		},
+		cred: &handshakeproto.Credentials{Type: handshakeproto.CredentialsType_SkipVerify, Version: protoVersion},
 	}
 }

@@ -26,29 +22,23 @@ func (n noVerifyChecker) MakeCredentials(remotePeerId string) *handshakeproto.Cr
 	return n.cred
 }

-func (n noVerifyChecker) CheckCredential(remotePeerId string, cred *handshakeproto.Credentials) (result handshake.Result, err error) {
+func (n noVerifyChecker) CheckCredential(remotePeerId string, cred *handshakeproto.Credentials) (identity []byte, err error) {
 	if cred.Version != n.cred.Version {
-		err = handshake.ErrIncompatibleVersion
-		return
+		return nil, handshake.ErrIncompatibleVersion
 	}
-	return handshake.Result{
-		ProtoVersion:  cred.Version,
-		ClientVersion: cred.ClientVersion,
-	}, nil
+	return nil, nil
 }

-func newPeerSignVerifier(protoVersion uint32, clientVersion string, account *accountdata.AccountKeys) handshake.CredentialChecker {
+func newPeerSignVerifier(protoVersion uint32, account *accountdata.AccountKeys) handshake.CredentialChecker {
 	return &peerSignVerifier{
-		protoVersion:  protoVersion,
-		clientVersion: clientVersion,
-		account:       account,
+		protoVersion: protoVersion,
+		account:      account,
 	}
 }

 type peerSignVerifier struct {
-	protoVersion  uint32
-	clientVersion string
-	account       *accountdata.AccountKeys
+	protoVersion uint32
+	account      *accountdata.AccountKeys
 }

 func (p *peerSignVerifier) MakeCredentials(remotePeerId string) *handshakeproto.Credentials {
@@ -64,43 +54,33 @@ func (p *peerSignVerifier) MakeCredentials(remotePeerId string) *handshakeproto.
 	}
 	payload, _ := msg.Marshal()
 	return &handshakeproto.Credentials{
-		Type:          handshakeproto.CredentialsType_SignedPeerIds,
-		Payload:       payload,
-		Version:       p.protoVersion,
-		ClientVersion: p.clientVersion,
+		Type:    handshakeproto.CredentialsType_SignedPeerIds,
+		Payload: payload,
+		Version: p.protoVersion,
 	}
 }

-func (p *peerSignVerifier) CheckCredential(remotePeerId string, cred *handshakeproto.Credentials) (result handshake.Result, err error) {
+func (p *peerSignVerifier) CheckCredential(remotePeerId string, cred *handshakeproto.Credentials) (identity []byte, err error) {
 	if cred.Version != p.protoVersion {
-		err = handshake.ErrIncompatibleVersion
-		return
+		return nil, handshake.ErrIncompatibleVersion
 	}
 	if cred.Type != handshakeproto.CredentialsType_SignedPeerIds {
-		err = handshake.ErrSkipVerifyNotAllowed
-		return
+		return nil, handshake.ErrSkipVerifyNotAllowed
 	}
 	var msg = &handshakeproto.PayloadSignedPeerIds{}
 	if err = msg.Unmarshal(cred.Payload); err != nil {
-		err = handshake.ErrUnexpectedPayload
-		return
+		return nil, handshake.ErrUnexpectedPayload
 	}
 	pubKey, err := crypto.UnmarshalEd25519PublicKeyProto(msg.Identity)
 	if err != nil {
-		err = handshake.ErrInvalidCredentials
-		return
+		return nil, handshake.ErrInvalidCredentials
 	}
 	ok, err := pubKey.Verify([]byte((remotePeerId + p.account.PeerId)), msg.Sign)
 	if err != nil {
-		return
+		return nil, err
 	}
 	if !ok {
-		err = handshake.ErrInvalidCredentials
-		return
+		return nil, handshake.ErrInvalidCredentials
 	}
-	return handshake.Result{
-		Identity:      msg.Identity,
-		ProtoVersion:  cred.Version,
-		ClientVersion: cred.ClientVersion,
-	}, nil
+	return msg.Identity, nil
 }
@@ -15,21 +15,21 @@ func TestPeerSignVerifier_CheckCredential(t *testing.T) {
 	identity1, _ := a1.SignKey.GetPublic().Marshall()
 	identity2, _ := a2.SignKey.GetPublic().Marshall()

-	cc1 := newPeerSignVerifier(0, "test:v1", a1)
-	cc2 := newPeerSignVerifier(0, "test:v1", a2)
+	cc1 := newPeerSignVerifier(0, a1)
+	cc2 := newPeerSignVerifier(0, a2)

 	c1 := a2.PeerId
 	c2 := a1.PeerId

 	cr1 := cc1.MakeCredentials(c1)
 	cr2 := cc2.MakeCredentials(c2)
-	res, err := cc1.CheckCredential(c1, cr2)
+	id1, err := cc1.CheckCredential(c1, cr2)
 	assert.NoError(t, err)
-	assert.Equal(t, identity2, res.Identity)
+	assert.Equal(t, identity2, id1)

-	res2, err := cc2.CheckCredential(c2, cr1)
+	id2, err := cc2.CheckCredential(c2, cr1)
 	assert.NoError(t, err)
-	assert.Equal(t, identity1, res2.Identity)
+	assert.Equal(t, identity1, id2)

 	_, err = cc1.CheckCredential(c1, cr1)
 	assert.EqualError(t, err, handshake.ErrInvalidCredentials.Error())
@@ -40,8 +40,8 @@ func TestIncompatibleVersion(t *testing.T) {
 	a2 := newTestAccData(t)
 	_, _ = a1.SignKey.GetPublic().Marshall()

-	cc1 := newPeerSignVerifier(0, "test:v1", a1)
-	cc2 := newPeerSignVerifier(1, "test:v1", a2)
+	cc1 := newPeerSignVerifier(0, a1)
+	cc2 := newPeerSignVerifier(1, a2)

 	c1 := a2.PeerId
 	c2 := a1.PeerId
@@ -6,31 +6,30 @@ import (
 	"io"
 )

-func OutgoingHandshake(ctx context.Context, conn io.ReadWriteCloser, peerId string, cc CredentialChecker) (result Result, err error) {
+func OutgoingHandshake(ctx context.Context, conn io.ReadWriteCloser, peerId string, cc CredentialChecker) (identity []byte, err error) {
 	if ctx == nil {
 		ctx = context.Background()
 	}
 	h := newHandshake()
 	done := make(chan struct{})
 	var (
-		res    Result
-		resErr error
+		resIdentity []byte
+		resErr      error
 	)
 	go func() {
 		defer close(done)
-		res, resErr = outgoingHandshake(h, conn, peerId, cc)
+		resIdentity, resErr = outgoingHandshake(h, conn, peerId, cc)
 	}()
 	select {
 	case <-done:
-		return res, resErr
+		return resIdentity, resErr
 	case <-ctx.Done():
 		_ = conn.Close()
-		err = ctx.Err()
-		return
+		return nil, ctx.Err()
 	}
 }

-func outgoingHandshake(h *handshake, conn io.ReadWriteCloser, peerId string, cc CredentialChecker) (result Result, err error) {
+func outgoingHandshake(h *handshake, conn io.ReadWriteCloser, peerId string, cc CredentialChecker) (identity []byte, err error) {
 	defer h.release()
 	h.conn = conn
 	localCred := cc.MakeCredentials(peerId)
@@ -45,62 +44,58 @@ func outgoingHandshake(h *handshake, conn io.ReadWriteCloser, peerId string, cc
 	}
 	if msg.ack != nil {
 		if msg.ack.Error == handshakeproto.Error_InvalidCredentials {
-			err = ErrPeerDeclinedCredentials
-			return
+			return nil, ErrPeerDeclinedCredentials
 		}
-		err = HandshakeError{e: msg.ack.Error}
-		return
+		return nil, HandshakeError{e: msg.ack.Error}
 	}

-	if result, err = cc.CheckCredential(peerId, msg.cred); err != nil {
+	if identity, err = cc.CheckCredential(peerId, msg.cred); err != nil {
 		h.tryWriteErrAndClose(err)
 		return
 	}

 	if err = h.writeAck(handshakeproto.Error_Null); err != nil {
 		h.tryWriteErrAndClose(err)
-		return
+		return nil, err
 	}

 	msg, err = h.readMsg(msgTypeAck)
 	if err != nil {
 		h.tryWriteErrAndClose(err)
-		return
+		return nil, err
 	}
 	if msg.ack.Error == handshakeproto.Error_Null {
-		return result, nil
+		return identity, nil
 	} else {
 		_ = h.conn.Close()
-		err = HandshakeError{e: msg.ack.Error}
-		return
+		return nil, HandshakeError{e: msg.ack.Error}
 	}
 }

-func IncomingHandshake(ctx context.Context, conn io.ReadWriteCloser, peerId string, cc CredentialChecker) (result Result, err error) {
+func IncomingHandshake(ctx context.Context, conn io.ReadWriteCloser, peerId string, cc CredentialChecker) (identity []byte, err error) {
 	if ctx == nil {
 		ctx = context.Background()
 	}
 	h := newHandshake()
 	done := make(chan struct{})
 	var (
-		res      Result
-		resError error
+		resIdentity []byte
+		resError    error
 	)
 	go func() {
 		defer close(done)
-		res, resError = incomingHandshake(h, conn, peerId, cc)
+		resIdentity, resError = incomingHandshake(h, conn, peerId, cc)
 	}()
 	select {
 	case <-done:
-		return res, resError
+		return resIdentity, resError
 	case <-ctx.Done():
 		_ = conn.Close()
-		err = ctx.Err()
-		return
+		return nil, ctx.Err()
 	}
 }

-func incomingHandshake(h *handshake, conn io.ReadWriteCloser, peerId string, cc CredentialChecker) (result Result, err error) {
+func incomingHandshake(h *handshake, conn io.ReadWriteCloser, peerId string, cc CredentialChecker) (identity []byte, err error) {
 	defer h.release()
 	h.conn = conn

@@ -109,32 +104,30 @@ func incomingHandshake(h *handshake, conn io.ReadWriteCloser, peerId string, cc
 		h.tryWriteErrAndClose(err)
 		return
 	}
-	if result, err = cc.CheckCredential(peerId, msg.cred); err != nil {
+	if identity, err = cc.CheckCredential(peerId, msg.cred); err != nil {
 		h.tryWriteErrAndClose(err)
 		return
 	}

 	if err = h.writeCredentials(cc.MakeCredentials(peerId)); err != nil {
 		h.tryWriteErrAndClose(err)
-		return
+		return nil, err
 	}

 	msg, err = h.readMsg(msgTypeAck)
 	if err != nil {
 		h.tryWriteErrAndClose(err)
-		return
+		return nil, err
 	}
 	if msg.ack.Error != handshakeproto.Error_Null {
 		if msg.ack.Error == handshakeproto.Error_InvalidCredentials {
-			err = ErrPeerDeclinedCredentials
-			return
+			return nil, ErrPeerDeclinedCredentials
 		}
-		err = HandshakeError{e: msg.ack.Error}
-		return
+		return nil, HandshakeError{e: msg.ack.Error}
 	}
 	if err = h.writeAck(handshakeproto.Error_Null); err != nil {
 		h.tryWriteErrAndClose(err)
-		return
+		return nil, err
 	}
 	return
 }
@@ -15,19 +15,15 @@ import (
 )

 var noVerifyChecker = &testCredChecker{
-	makeCred: &handshakeproto.Credentials{Type: handshakeproto.CredentialsType_SkipVerify, ClientVersion: "test:v1.0"},
-	checkCred: func(peerId string, cred *handshakeproto.Credentials) (res Result, err error) {
-		return Result{
-			Identity:      []byte("identity"),
-			ProtoVersion:  cred.Version,
-			ClientVersion: cred.ClientVersion,
-		}, nil
+	makeCred: &handshakeproto.Credentials{Type: handshakeproto.CredentialsType_SkipVerify},
+	checkCred: func(peerId string, cred *handshakeproto.Credentials) (identity []byte, err error) {
+		return []byte("identity"), nil
 	},
 }

 type handshakeRes struct {
-	res Result
-	err error
+	identity []byte
+	err      error
 }

 func TestOutgoingHandshake(t *testing.T) {
@@ -36,7 +32,7 @@ func TestOutgoingHandshake(t *testing.T) {
 		var handshakeResCh = make(chan handshakeRes, 1)
 		go func() {
 			identity, err := OutgoingHandshake(nil, c1, "", noVerifyChecker)
-			handshakeResCh <- handshakeRes{res: identity, err: err}
+			handshakeResCh <- handshakeRes{identity: identity, err: err}
 		}()
 		h := newHandshake()
 		h.conn = c2
@@ -54,7 +50,7 @@ func TestOutgoingHandshake(t *testing.T) {
 		// send ack
 		require.NoError(t, h.writeAck(handshakeproto.Error_Null))
 		res := <-handshakeResCh
-		assert.NotEmpty(t, res.res)
+		assert.NotEmpty(t, res.identity)
 		assert.NoError(t, res.err)
 	})
 	t.Run("write cred err", func(t *testing.T) {
@@ -62,7 +58,7 @@ func TestOutgoingHandshake(t *testing.T) {
 		var handshakeResCh = make(chan handshakeRes, 1)
 		go func() {
 			identity, err := OutgoingHandshake(nil, c1, "", noVerifyChecker)
-			handshakeResCh <- handshakeRes{res: identity, err: err}
+			handshakeResCh <- handshakeRes{identity: identity, err: err}
 		}()
 		_ = c2.Close()
 		res := <-handshakeResCh
@@ -73,7 +69,7 @@ func TestOutgoingHandshake(t *testing.T) {
 		var handshakeResCh = make(chan handshakeRes, 1)
 		go func() {
 			identity, err := OutgoingHandshake(nil, c1, "", noVerifyChecker)
-			handshakeResCh <- handshakeRes{res: identity, err: err}
+			handshakeResCh <- handshakeRes{identity: identity, err: err}
 		}()
 		h := newHandshake()
 		h.conn = c2
@@ -89,7 +85,7 @@ func TestOutgoingHandshake(t *testing.T) {
 		var handshakeResCh = make(chan handshakeRes, 1)
 		go func() {
 			identity, err := OutgoingHandshake(nil, c1, "", noVerifyChecker)
-			handshakeResCh <- handshakeRes{res: identity, err: err}
+			handshakeResCh <- handshakeRes{identity: identity, err: err}
 		}()
 		h := newHandshake()
 		h.conn = c2
@@ -105,7 +101,7 @@ func TestOutgoingHandshake(t *testing.T) {
 		var handshakeResCh = make(chan handshakeRes, 1)
 		go func() {
 			identity, err := OutgoingHandshake(nil, c1, "", &testCredChecker{makeCred: noVerifyChecker.makeCred, checkErr: ErrInvalidCredentials})
-			handshakeResCh <- handshakeRes{res: identity, err: err}
+			handshakeResCh <- handshakeRes{identity: identity, err: err}
 		}()
 		h := newHandshake()
 		h.conn = c2
@@ -124,7 +120,7 @@ func TestOutgoingHandshake(t *testing.T) {
 		var handshakeResCh = make(chan handshakeRes, 1)
 		go func() {
 			identity, err := OutgoingHandshake(nil, c1, "", noVerifyChecker)
-			handshakeResCh <- handshakeRes{res: identity, err: err}
+			handshakeResCh <- handshakeRes{identity: identity, err: err}
 		}()
 		h := newHandshake()
 		h.conn = c2
@@ -142,7 +138,7 @@ func TestOutgoingHandshake(t *testing.T) {
 		var handshakeResCh = make(chan handshakeRes, 1)
 		go func() {
 			identity, err := OutgoingHandshake(nil, c1, "", noVerifyChecker)
-			handshakeResCh <- handshakeRes{res: identity, err: err}
+			handshakeResCh <- handshakeRes{identity: identity, err: err}
 		}()
 		h := newHandshake()
 		h.conn = c2
@@ -163,7 +159,7 @@ func TestOutgoingHandshake(t *testing.T) {
 		var handshakeResCh = make(chan handshakeRes, 1)
 		go func() {
 			identity, err := OutgoingHandshake(nil, c1, "", noVerifyChecker)
-			handshakeResCh <- handshakeRes{res: identity, err: err}
+			handshakeResCh <- handshakeRes{identity: identity, err: err}
 		}()
 		h := newHandshake()
 		h.conn = c2
@@ -176,7 +172,9 @@ func TestOutgoingHandshake(t *testing.T) {
 		_, err = h.readMsg(msgTypeAck)
 		require.NoError(t, err)
 		// write cred instead ack
-		_ = h.writeCredentials(noVerifyChecker.MakeCredentials(""))
+		require.NoError(t, h.writeCredentials(noVerifyChecker.MakeCredentials("")))
+		_, err = h.readMsg(msgTypeAck)
+		require.Error(t, err)
 		res := <-handshakeResCh
 		require.Error(t, res.err)
 	})
@@ -185,7 +183,7 @@ func TestOutgoingHandshake(t *testing.T) {
 		var handshakeResCh = make(chan handshakeRes, 1)
 		go func() {
 			identity, err := OutgoingHandshake(nil, c1, "", noVerifyChecker)
-			handshakeResCh <- handshakeRes{res: identity, err: err}
+			handshakeResCh <- handshakeRes{identity: identity, err: err}
 		}()
 		h := newHandshake()
 		h.conn = c2
@@ -213,7 +211,7 @@ func TestOutgoingHandshake(t *testing.T) {
 		var handshakeResCh = make(chan handshakeRes, 1)
 		go func() {
 			identity, err := OutgoingHandshake(ctx, c1, "", noVerifyChecker)
-			handshakeResCh <- handshakeRes{res: identity, err: err}
+			handshakeResCh <- handshakeRes{identity: identity, err: err}
 		}()
 		h := newHandshake()
 		h.conn = c2
@@ -236,7 +234,7 @@ func TestIncomingHandshake(t *testing.T) {
 		var handshakeResCh = make(chan handshakeRes, 1)
 		go func() {
 			identity, err := IncomingHandshake(nil, c1, "", noVerifyChecker)
-			handshakeResCh <- handshakeRes{res: identity, err: err}
+			handshakeResCh <- handshakeRes{identity: identity, err: err}
 		}()
 		h := newHandshake()
 		h.conn = c2
@@ -254,7 +252,7 @@ func TestIncomingHandshake(t *testing.T) {
 		require.NoError(t, err)
 		assert.Equal(t, handshakeproto.Error_Null, msg.ack.Error)
 		res := <-handshakeResCh
-		assert.NotEmpty(t, res.res)
+		assert.NotEmpty(t, res.identity)
 		require.NoError(t, res.err)
 	})
 	t.Run("write cred err", func(t *testing.T) {
@@ -262,7 +260,7 @@ func TestIncomingHandshake(t *testing.T) {
 		var handshakeResCh = make(chan handshakeRes, 1)
 		go func() {
 			identity, err := IncomingHandshake(nil, c1, "", noVerifyChecker)
-			handshakeResCh <- handshakeRes{res: identity, err: err}
+			handshakeResCh <- handshakeRes{identity: identity, err: err}
 		}()
 		_ = c2.Close()
 		res := <-handshakeResCh
@@ -273,7 +271,7 @@ func TestIncomingHandshake(t *testing.T) {
 		var handshakeResCh = make(chan handshakeRes, 1)
 		go func() {
 			identity, err := IncomingHandshake(nil, c1, "", noVerifyChecker)
-			handshakeResCh <- handshakeRes{res: identity, err: err}
+			handshakeResCh <- handshakeRes{identity: identity, err: err}
 		}()
 		h := newHandshake()
 		h.conn = c2
@@ -288,7 +286,7 @@ func TestIncomingHandshake(t *testing.T) {
 		var handshakeResCh = make(chan handshakeRes, 1)
 		go func() {
 			identity, err := IncomingHandshake(nil, c1, "", noVerifyChecker)
-			handshakeResCh <- handshakeRes{res: identity, err: err}
+			handshakeResCh <- handshakeRes{identity: identity, err: err}
 		}()
 		h := newHandshake()
 		h.conn = c2
@@ -302,7 +300,7 @@ func TestIncomingHandshake(t *testing.T) {
 		var handshakeResCh = make(chan handshakeRes, 1)
 		go func() {
 			identity, err := IncomingHandshake(nil, c1, "", &testCredChecker{makeCred: noVerifyChecker.makeCred, checkErr: ErrInvalidCredentials})
-			handshakeResCh <- handshakeRes{res: identity, err: err}
+			handshakeResCh <- handshakeRes{identity: identity, err: err}
 		}()
 		h := newHandshake()
 		h.conn = c2
@@ -322,7 +320,7 @@ func TestIncomingHandshake(t *testing.T) {
 		var handshakeResCh = make(chan handshakeRes, 1)
 		go func() {
 			identity, err := IncomingHandshake(nil, c1, "", &testCredChecker{makeCred: noVerifyChecker.makeCred, checkErr: ErrIncompatibleVersion})
-			handshakeResCh <- handshakeRes{res: identity, err: err}
+			handshakeResCh <- handshakeRes{identity: identity, err: err}
 		}()
 		h := newHandshake()
 		h.conn = c2
@@ -342,7 +340,7 @@ func TestIncomingHandshake(t *testing.T) {
 		var handshakeResCh = make(chan handshakeRes, 1)
 		go func() {
 			identity, err := IncomingHandshake(nil, c1, "", noVerifyChecker)
-			handshakeResCh <- handshakeRes{res: identity, err: err}
+			handshakeResCh <- handshakeRes{identity: identity, err: err}
 		}()
 		h := newHandshake()
 		h.conn = c2
@@ -352,7 +350,7 @@ func TestIncomingHandshake(t *testing.T) {
 		_, err := h.readMsg(msgTypeCred)
 		require.NoError(t, err)
 		// write cred instead ack
-		_ = h.writeCredentials(noVerifyChecker.MakeCredentials(""))
+		require.NoError(t, h.writeCredentials(noVerifyChecker.MakeCredentials("")))
 		// expect EOF
 		_, err = h.readMsg(msgTypeAck)
 		require.Error(t, err)
@@ -364,7 +362,7 @@ func TestIncomingHandshake(t *testing.T) {
 		var handshakeResCh = make(chan handshakeRes, 1)
 		go func() {
 			identity, err := IncomingHandshake(nil, c1, "", noVerifyChecker)
-			handshakeResCh <- handshakeRes{res: identity, err: err}
+			handshakeResCh <- handshakeRes{identity: identity, err: err}
 		}()
 		h := newHandshake()
 		h.conn = c2
@@ -383,7 +381,7 @@ func TestIncomingHandshake(t *testing.T) {
 		var handshakeResCh = make(chan handshakeRes, 1)
 		go func() {
 			identity, err := IncomingHandshake(nil, c1, "", noVerifyChecker)
-			handshakeResCh <- handshakeRes{res: identity, err: err}
+			handshakeResCh <- handshakeRes{identity: identity, err: err}
 		}()
 		h := newHandshake()
 		h.conn = c2
@@ -405,7 +403,7 @@ func TestIncomingHandshake(t *testing.T) {
 		var handshakeResCh = make(chan handshakeRes, 1)
 		go func() {
 			identity, err := IncomingHandshake(nil, c1, "", noVerifyChecker)
-			handshakeResCh <- handshakeRes{res: identity, err: err}
+			handshakeResCh <- handshakeRes{identity: identity, err: err}
 		}()
 		h := newHandshake()
 		h.conn = c2
@@ -427,7 +425,7 @@ func TestIncomingHandshake(t *testing.T) {
 		var handshakeResCh = make(chan handshakeRes, 1)
 		go func() {
 			identity, err := IncomingHandshake(nil, c1, "", noVerifyChecker)
-			handshakeResCh <- handshakeRes{res: identity, err: err}
+			handshakeResCh <- handshakeRes{identity: identity, err: err}
 		}()
 		h := newHandshake()
 		h.conn = c2
@@ -450,7 +448,7 @@ func TestIncomingHandshake(t *testing.T) {
 		var handshakeResCh = make(chan handshakeRes, 1)
 		go func() {
 			identity, err := IncomingHandshake(ctx, c1, "", noVerifyChecker)
-			handshakeResCh <- handshakeRes{res: identity, err: err}
+			handshakeResCh <- handshakeRes{identity: identity, err: err}
 		}()
 		h := newHandshake()
 		h.conn = c2
@@ -474,7 +472,7 @@ func TestNotAHandshakeMessage(t *testing.T) {
 	var handshakeResCh = make(chan handshakeRes, 1)
 	go func() {
 		identity, err := IncomingHandshake(nil, c1, "", noVerifyChecker)
-		handshakeResCh <- handshakeRes{res: identity, err: err}
+		handshakeResCh <- handshakeRes{identity: identity, err: err}
 	}()
 	h := newHandshake()
 	h.conn = c2
@@ -493,20 +491,20 @@ func TestEndToEnd(t *testing.T) {
 	st := time.Now()
 	go func() {
 		identity, err := OutgoingHandshake(nil, c1, "", noVerifyChecker)
-		outResCh <- handshakeRes{res: identity, err: err}
+		outResCh <- handshakeRes{identity: identity, err: err}
 	}()
 	go func() {
 		identity, err := IncomingHandshake(nil, c2, "", noVerifyChecker)
-		inResCh <- handshakeRes{res: identity, err: err}
+		inResCh <- handshakeRes{identity: identity, err: err}
 	}()

 	outRes := <-outResCh
 	assert.NoError(t, outRes.err)
-	assert.NotEmpty(t, outRes.res)
+	assert.NotEmpty(t, outRes.identity)

 	inRes := <-inResCh
 	assert.NoError(t, inRes.err)
-	assert.NotEmpty(t, inRes.res)
+	assert.NotEmpty(t, inRes.identity)
 	t.Log("dur", time.Since(st))
 }

@@ -550,7 +548,7 @@ func BenchmarkHandshake(b *testing.B) {

 type testCredChecker struct {
 	makeCred  *handshakeproto.Credentials
-	checkCred func(peerId string, cred *handshakeproto.Credentials) (res Result, err error)
+	checkCred func(peerId string, cred *handshakeproto.Credentials) (identity []byte, err error)
 	checkErr  error
 }

@@ -558,15 +556,14 @@ func (t *testCredChecker) MakeCredentials(peerId string) *handshakeproto.Credent
 	return t.makeCred
 }

-func (t *testCredChecker) CheckCredential(peerId string, cred *handshakeproto.Credentials) (res Result, err error) {
+func (t *testCredChecker) CheckCredential(peerId string, cred *handshakeproto.Credentials) (identity []byte, err error) {
 	if t.checkErr != nil {
-		err = t.checkErr
-		return
+		return nil, t.checkErr
 	}
 	if t.checkCred != nil {
 		return t.checkCred(peerId, cred)
 	}
-	return
+	return nil, nil
 }

 func newConnPair(t require.TestingT) (sc1, sc2 *secConn) {
@@ -64,13 +64,7 @@ var handshakePool = &sync.Pool{New: func() any {

 type CredentialChecker interface {
 	MakeCredentials(remotePeerId string) *handshakeproto.Credentials
-	CheckCredential(remotePeerId string, cred *handshakeproto.Credentials) (result Result, err error)
-}
-
-type Result struct {
-	Identity      []byte
-	ProtoVersion  uint32
-	ClientVersion string
+	CheckCredential(remotePeerId string, cred *handshakeproto.Credentials) (identity []byte, err error)
 }

 func newHandshake() *handshake {
@@ -115,10 +115,9 @@ func (ProtoType) EnumDescriptor() ([]byte, []int) {
 }

 type Credentials struct {
-	Type          CredentialsType `protobuf:"varint,1,opt,name=type,proto3,enum=anyHandshake.CredentialsType" json:"type,omitempty"`
-	Payload       []byte          `protobuf:"bytes,2,opt,name=payload,proto3" json:"payload,omitempty"`
-	Version       uint32          `protobuf:"varint,3,opt,name=version,proto3" json:"version,omitempty"`
-	ClientVersion string          `protobuf:"bytes,4,opt,name=clientVersion,proto3" json:"clientVersion,omitempty"`
+	Type    CredentialsType `protobuf:"varint,1,opt,name=type,proto3,enum=anyHandshake.CredentialsType" json:"type,omitempty"`
+	Payload []byte          `protobuf:"bytes,2,opt,name=payload,proto3" json:"payload,omitempty"`
+	Version uint32          `protobuf:"varint,3,opt,name=version,proto3" json:"version,omitempty"`
 }

 func (m *Credentials) Reset()         { *m = Credentials{} }
@@ -175,13 +174,6 @@ func (m *Credentials) GetVersion() uint32 {
 	return 0
 }

-func (m *Credentials) GetClientVersion() string {
-	if m != nil {
-		return m.ClientVersion
-	}
-	return ""
-}
-
 type PayloadSignedPeerIds struct {
 	// account identity
 	Identity []byte `protobuf:"bytes,1,opt,name=identity,proto3" json:"identity,omitempty"`
@@ -339,36 +331,35 @@ func init() {
 }

 var fileDescriptor_60283fc75f020893 = []byte{
-	// 457 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0x4d, 0x6f, 0xd3, 0x40,
-	0x10, 0xf5, 0x36, 0x71, 0x3f, 0x86, 0xa4, 0x6c, 0xb7, 0x29, 0xb5, 0x90, 0xb0, 0xa2, 0x88, 0x43,
-	0x88, 0x44, 0xc2, 0x97, 0xb8, 0x87, 0xa6, 0x88, 0x5c, 0xaa, 0xc8, 0x85, 0x1e, 0xb8, 0x6d, 0xbd,
-	0x43, 0xbb, 0xca, 0xb2, 0xb6, 0xd6, 0xdb, 0x50, 0xff, 0x0b, 0xce, 0xfc, 0x0a, 0x7e, 0x06, 0xc7,
-	0x1e, 0x39, 0xa2, 0xe4, 0x8f, 0x20, 0x6f, 0x9c, 0xc6, 0xe1, 0xc4, 0xc5, 0xde, 0x99, 0xf7, 0x66,
-	0xe7, 0xbd, 0x67, 0xc3, 0x50, 0xa3, 0x1d, 0x64, 0x18, 0xdf, 0x18, 0xcc, 0xd0, 0xcc, 0x64, 0x8c,
-	0x83, 0x6b, 0xae, 0x45, 0x76, 0xcd, 0xa7, 0x95, 0x53, 0x6a, 0x12, 0x9b, 0x0c, 0xdc, 0x33, 0x5b,
-	0x77, 0xfb, 0xae, 0xc1, 0x1a, 0x5c, 0xe7, 0x1f, 0x56, 0xbd, 0xce, 0x0f, 0x02, 0x0f, 0x4e, 0x0c,
-	0x0a, 0xd4, 0x56, 0x72, 0x95, 0xb1, 0x97, 0x50, 0xb7, 0x79, 0x8a, 0x01, 0x69, 0x93, 0xee, 0xfe,
-	0xab, 0x27, 0xfd, 0x2a, 0xb9, 0x5f, 0x21, 0x7e, 0xcc, 0x53, 0x8c, 0x1c, 0x95, 0x05, 0xb0, 0x93,
-	0xf2, 0x5c, 0x25, 0x5c, 0x04, 0x5b, 0x6d, 0xd2, 0x6d, 0x44, 0xab, 0xb2, 0x40, 0x66, 0x68, 0x32,
-	0x99, 0xe8, 0xa0, 0xd6, 0x26, 0xdd, 0x66, 0xb4, 0x2a, 0xd9, 0x53, 0x68, 0xc6, 0x4a, 0xa2, 0xb6,
-	0x17, 0x25, 0x5e, 0x6f, 0x93, 0xee, 0x5e, 0xb4, 0xd9, 0xec, 0xbc, 0x87, 0xd6, 0x64, 0x79, 0xd5,
-	0xb9, 0xbc, 0xd2, 0x28, 0x26, 0x88, 0x66, 0x2c, 0x32, 0xf6, 0x18, 0x76, 0xa5, 0x13, 0x62, 0x73,
-	0x27, 0xb4, 0x11, 0xdd, 0xd7, 0x8c, 0x41, 0x3d, 0x93, 0x57, 0xba, 0x94, 0xe2, 0xce, 0x9d, 0x17,
-	0x50, 0x1b, 0xc6, 0x53, 0xf6, 0x0c, 0x7c, 0x34, 0x26, 0x31, 0xa5, 0xb9, 0xc3, 0x4d, 0x73, 0xa7,
-	0x05, 0x14, 0x2d, 0x19, 0x9d, 0xb7, 0xe0, 0x4f, 0x5c, 0x5a, 0xcf, 0xc1, 0x77, 0xb1, 0x95, 0x33,
-	0xc7, 0x9b, 0x33, 0x8e, 0xe3, 0xa2, 0x58, 0xb2, 0x7a, 0x6f, 0xe0, 0xe1, 0x3f, 0x21, 0xb1, 0x7d,
-	0x80, 0xf3, 0xa9, 0x4c, 0x2f, 0xd0, 0xc8, 0x2f, 0x39, 0xf5, 0xd8, 0x01, 0x34, 0x37, 0xdc, 0x50,
-	0xd2, 0xfb, 0x49, 0xc0, 0x77, 0xeb, 0xd9, 0x2e, 0xd4, 0xcf, 0x6e, 0x94, 0xa2, 0x5e, 0x31, 0xf6,
-	0x49, 0xe3, 0x6d, 0x8a, 0xb1, 0x45, 0x41, 0x09, 0x7b, 0x04, 0x6c, 0xac, 0x67, 0x5c, 0x49, 0x51,
-	0x59, 0x40, 0xb7, 0xd8, 0x11, 0x1c, 0xac, 0x79, 0x65, 0x5a, 0xb4, 0xc6, 0x02, 0x68, 0xad, 0xb7,
-	0x9e, 0x25, 0x76, 0xa8, 0x54, 0xf2, 0x0d, 0x05, 0xad, 0xb3, 0x16, 0xd0, 0x11, 0x72, 0xa1, 0xa4,
-	0xc6, 0xd3, 0xdb, 0x18, 0x51, 0xa0, 0xa0, 0x3e, 0x3b, 0x86, 0xc3, 0xb1, 0x8e, 0x93, 0xaf, 0x29,
-	0xb7, 0xf2, 0x52, 0x61, 0xf9, 0x05, 0xe8, 0x76, 0x71, 0x7f, 0x15, 0x70, 0x8e, 0xe9, 0x4e, 0xef,
-	0x08, 0xf6, 0xee, 0xcd, 0x17, 0xaa, 0x47, 0xd1, 0xe4, 0x84, 0x7a, 0xef, 0x46, 0xbf, 0xe6, 0x21,
-	0xb9, 0x9b, 0x87, 0xe4, 0xcf, 0x3c, 0x24, 0xdf, 0x17, 0xa1, 0x77, 0xb7, 0x08, 0xbd, 0xdf, 0x8b,
-	0xd0, 0xfb, 0xdc, 0xfb, 0xff, 0x3f, 0xf7, 0x72, 0xdb, 0xbd, 0x5e, 0xff, 0x0d, 0x00, 0x00, 0xff,
-	0xff, 0xe2, 0xfa, 0x40, 0x67, 0xee, 0x02, 0x00, 0x00,
+	// 439 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xcf, 0x6e, 0xd3, 0x40,
+	0x10, 0xc6, 0xbd, 0x4d, 0xdc, 0x96, 0x21, 0x2d, 0xdb, 0x6d, 0x4a, 0x2d, 0x24, 0xac, 0x28, 0xa7,
+	0x10, 0x89, 0x84, 0x7f, 0xe2, 0x1e, 0x9a, 0x22, 0x72, 0xa9, 0x22, 0x17, 0x7a, 0xe0, 0xb6, 0xf5,
+	0x0e, 0xed, 0x2a, 0xcb, 0xda, 0xda, 0xdd, 0x86, 0xfa, 0x2d, 0x78, 0x14, 0x1e, 0x83, 0x63, 0x8f,
+	0x1c, 0x51, 0xf2, 0x22, 0xc8, 0x9b, 0xa4, 0x71, 0x38, 0xf5, 0x62, 0xef, 0xcc, 0xfc, 0xc6, 0xdf,
+	0x7c, 0xe3, 0x85, 0x81, 0x46, 0xd7, 0xb7, 0x98, 0xde, 0x18, 0xb4, 0x68, 0xa6, 0x32, 0xc5, 0xfe,
+	0x35, 0xd7, 0xc2, 0x5e, 0xf3, 0x49, 0xe5, 0x94, 0x9b, 0xcc, 0x65, 0x7d, 0xff, 0xb4, 0xeb, 0x6c,
+	0xcf, 0x27, 0x58, 0x83, 0xeb, 0xe2, 0xd3, 0x2a, 0xd7, 0x76, 0xf0, 0xf8, 0xc4, 0xa0, 0x40, 0xed,
+	0x24, 0x57, 0x96, 0xbd, 0x86, 0xba, 0x2b, 0x72, 0x8c, 0x48, 0x8b, 0x74, 0xf6, 0xdf, 0x3c, 0xef,
+	0x55, 0xd9, 0x5e, 0x05, 0xfc, 0x5c, 0xe4, 0x98, 0x78, 0x94, 0x45, 0xb0, 0x93, 0xf3, 0x42, 0x65,
+	0x5c, 0x44, 0x5b, 0x2d, 0xd2, 0x69, 0x24, 0xab, 0xb0, 0xac, 0x4c, 0xd1, 0x58, 0x99, 0xe9, 0xa8,
+	0xd6, 0x22, 0x9d, 0xbd, 0x64, 0x15, 0xb6, 0x3f, 0x42, 0x73, 0xbc, 0x80, 0xce, 0xe5, 0x95, 0x46,
+	0x31, 0x46, 0x34, 0x23, 0x61, 0xd9, 0x33, 0xd8, 0x95, 0x5e, 0xc2, 0x15, 0x7e, 0x84, 0x46, 0x72,
+	0x1f, 0x33, 0x06, 0x75, 0x2b, 0xaf, 0xf4, 0x52, 0xc4, 0x9f, 0xdb, 0xaf, 0xa0, 0x36, 0x48, 0x27,
+	0xec, 0x05, 0x84, 0x68, 0x4c, 0x66, 0x96, 0x63, 0x1f, 0x6e, 0x8e, 0x7d, 0x5a, 0x96, 0x92, 0x05,
+	0xd1, 0x7e, 0x0f, 0xe1, 0xd8, 0xaf, 0xe1, 0x25, 0x84, 0x7e, 0x1f, 0xcb, 0x9e, 0xe3, 0xcd, 0x1e,
+	0xcf, 0x78, 0x93, 0x0b, 0xaa, 0xfb, 0x0e, 0x9e, 0xfc, 0x67, 0x9f, 0xed, 0x03, 0x9c, 0x4f, 0x64,
+	0x7e, 0x81, 0x46, 0x7e, 0x2b, 0x68, 0xc0, 0x0e, 0x60, 0x6f, 0xc3, 0x0d, 0x25, 0xdd, 0x5f, 0x04,
+	0x42, 0x2f, 0xcf, 0x76, 0xa1, 0x7e, 0x76, 0xa3, 0x14, 0x0d, 0xca, 0xb6, 0x2f, 0x1a, 0x6f, 0x73,
+	0x4c, 0x1d, 0x0a, 0x4a, 0xd8, 0x53, 0x60, 0x23, 0x3d, 0xe5, 0x4a, 0x8a, 0x8a, 0x00, 0xdd, 0x62,
+	0x47, 0x70, 0xb0, 0xe6, 0x96, 0xdb, 0xa2, 0x35, 0x16, 0x41, 0x73, 0xad, 0x7a, 0x96, 0xb9, 0x81,
+	0x52, 0xd9, 0x0f, 0x14, 0xb4, 0xce, 0x9a, 0x40, 0x87, 0xc8, 0x85, 0x92, 0x1a, 0x4f, 0x6f, 0x53,
+	0x44, 0x81, 0x82, 0x86, 0xec, 0x18, 0x0e, 0x47, 0x3a, 0xcd, 0xbe, 0xe7, 0xdc, 0xc9, 0x4b, 0x85,
+	0x17, 0x8b, 0x3f, 0x40, 0xb7, 0xcb, 0xef, 0x57, 0x0b, 0xde, 0x31, 0xdd, 0xe9, 0x1e, 0xc1, 0xa3,
+	0x7b, 0xf3, 0xe5, 0xd4, 0xc3, 0x64, 0x7c, 0x42, 0x83, 0x0f, 0xc3, 0xdf, 0xb3, 0x98, 0xdc, 0xcd,
+	0x62, 0xf2, 0x77, 0x16, 0x93, 0x9f, 0xf3, 0x38, 0xb8, 0x9b, 0xc7, 0xc1, 0x9f, 0x79, 0x1c, 0x7c,
+	0xed, 0x3e, 0xfc, 0x4a, 0x5e, 0x6e, 0xfb, 0xd7, 0xdb, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x53,
+	0x32, 0xf7, 0x79, 0xc7, 0x02, 0x00, 0x00,
 }

 func (m *Credentials) Marshal() (dAtA []byte, err error) {
@@ -391,13 +382,6 @@ func (m *Credentials) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if len(m.ClientVersion) > 0 {
-		i -= len(m.ClientVersion)
-		copy(dAtA[i:], m.ClientVersion)
-		i = encodeVarintHandshake(dAtA, i, uint64(len(m.ClientVersion)))
-		i--
-		dAtA[i] = 0x22
-	}
 	if m.Version != 0 {
 		i = encodeVarintHandshake(dAtA, i, uint64(m.Version))
 		i--
@@ -538,10 +522,6 @@ func (m *Credentials) Size() (n int) {
 	if m.Version != 0 {
 		n += 1 + sovHandshake(uint64(m.Version))
 	}
-	l = len(m.ClientVersion)
-	if l > 0 {
-		n += 1 + l + sovHandshake(uint64(l))
-	}
 	return n
 }

@@ -693,38 +673,6 @@ func (m *Credentials) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
-		case 4:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ClientVersion", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowHandshake
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthHandshake
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthHandshake
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.ClientVersion = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipHandshake(dAtA[iNdEx:])
@@ -39,7 +39,6 @@ message Credentials {
    CredentialsType type = 1;
    bytes payload = 2;
    uint32 version = 3;
-    string clientVersion = 4;
 }

 enum CredentialsType {
@@ -11,20 +11,19 @@ type ProtoChecker struct {
 	AllowedProtoTypes []handshakeproto.ProtoType
 }

-func OutgoingProtoHandshake(ctx context.Context, conn net.Conn, pt handshakeproto.ProtoType) error {
+func OutgoingProtoHandshake(ctx context.Context, conn net.Conn, pt handshakeproto.ProtoType) (err error) {
 	if ctx == nil {
 		ctx = context.Background()
 	}
 	h := newHandshake()
 	done := make(chan struct{})
-	var err error
 	go func() {
 		defer close(done)
 		err = outgoingProtoHandshake(h, conn, pt)
 	}()
 	select {
 	case <-done:
-		return err
+		return
 	case <-ctx.Done():
 		_ = conn.Close()
 		return ctx.Err()
@@ -55,23 +54,19 @@ func outgoingProtoHandshake(h *handshake, conn net.Conn, pt handshakeproto.Proto
 	return HandshakeError{e: msg.ack.Error}
 }

-func IncomingProtoHandshake(ctx context.Context, conn net.Conn, pt ProtoChecker) (handshakeproto.ProtoType, error) {
+func IncomingProtoHandshake(ctx context.Context, conn net.Conn, pt ProtoChecker) (protoType handshakeproto.ProtoType, err error) {
 	if ctx == nil {
 		ctx = context.Background()
 	}
 	h := newHandshake()
 	done := make(chan struct{})
-	var (
-		protoType handshakeproto.ProtoType
-		err       error
-	)
 	go func() {
 		defer close(done)
 		protoType, err = incomingProtoHandshake(h, conn, pt)
 	}()
 	select {
 	case <-done:
-		return protoType, err
+		return
 	case <-ctx.Done():
 		_ = conn.Close()
 		return 0, ctx.Err()
@@ -64,8 +64,8 @@ func (s *secureService) Init(a *app.App) (err error) {
 	if s.key, err = crypto.UnmarshalEd25519PrivateKey(peerKey); err != nil {
 		return
 	}
-	s.noVerifyChecker = newNoVerifyChecker(s.protoVersion, a.VersionName())
-	s.peerSignVerifier = newPeerSignVerifier(s.protoVersion, a.VersionName(), account.Account())
+	s.noVerifyChecker = newNoVerifyChecker(s.protoVersion)
+	s.peerSignVerifier = newPeerSignVerifier(s.protoVersion, account.Account())

 	s.nodeconf = a.MustComponent(nodeconf.CName).(nodeconf.Service)

@@ -99,14 +99,13 @@ func (s *secureService) SecureInbound(ctx context.Context, conn net.Conn) (cctx
 }

 func (s *secureService) HandshakeInbound(ctx context.Context, conn io.ReadWriteCloser, peerId string) (cctx context.Context, err error) {
-	res, err := handshake.IncomingHandshake(ctx, conn, peerId, s.inboundChecker)
+	identity, err := handshake.IncomingHandshake(ctx, conn, peerId, s.inboundChecker)
 	if err != nil {
 		return nil, err
 	}
 	cctx = context.Background()
 	cctx = peer.CtxWithPeerId(cctx, peerId)
-	cctx = peer.CtxWithIdentity(cctx, res.Identity)
-	cctx = peer.CtxWithClientVersion(cctx, res.ClientVersion)
+	cctx = peer.CtxWithIdentity(cctx, identity)
 	return
 }

@@ -123,14 +122,13 @@ func (s *secureService) SecureOutbound(ctx context.Context, conn net.Conn) (cctx
 	} else {
 		checker = s.noVerifyChecker
 	}
-	res, err := handshake.OutgoingHandshake(ctx, sc, sc.RemotePeer().String(), checker)
+	identity, err := handshake.OutgoingHandshake(ctx, sc, sc.RemotePeer().String(), checker)
 	if err != nil {
 		return nil, err
 	}
 	cctx = context.Background()
 	cctx = peer.CtxWithPeerId(cctx, sc.RemotePeer().String())
-	cctx = peer.CtxWithIdentity(cctx, res.Identity)
-	cctx = peer.CtxWithClientVersion(cctx, res.ClientVersion)
+	cctx = peer.CtxWithIdentity(cctx, identity)
 	return cctx, nil
 }

@@ -2,12 +2,11 @@ package streampool

 import (
 	"context"
-	"sync/atomic"
-
 	"github.com/anyproto/any-sync/app/logger"
 	"github.com/cheggaaa/mb/v3"
 	"go.uber.org/zap"
 	"storj.io/drpc"
+	"sync/atomic"
 )

 type stream struct {
@@ -23,7 +22,7 @@ type stream struct {
 }

 func (sr *stream) write(msg drpc.Message) (err error) {
-	return sr.queue.TryAdd(msg)
+	return sr.queue.Add(sr.stream.Context(), msg)
 }

 func (sr *stream) readLoop() error {
@@ -2,19 +2,18 @@ package streampool

 import (
 	"fmt"
-	"sort"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-
 	"github.com/anyproto/any-sync/net/peer"
 	"github.com/anyproto/any-sync/net/rpc/rpctest"
 	"github.com/anyproto/any-sync/net/streampool/testservice"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/net/context"
+	"sort"
 	"storj.io/drpc"
+	"sync"
+	"sync/atomic"
+	"testing"
+	"time"
 )

 var ctx = context.Background()
@@ -8,6 +8,7 @@ import (
 	context "context"
 	net "net"
 	reflect "reflect"
+	time "time"

 	transport "github.com/anyproto/any-sync/net/transport"
 	gomock "github.com/golang/mock/gomock"
@@ -157,6 +158,20 @@ func (mr *MockMultiConnMockRecorder) IsClosed() *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsClosed", reflect.TypeOf((*MockMultiConn)(nil).IsClosed))
 }

+// LastUsage mocks base method.
+func (m *MockMultiConn) LastUsage() time.Time {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "LastUsage")
+	ret0, _ := ret[0].(time.Time)
+	return ret0
+}
+
+// LastUsage indicates an expected call of LastUsage.
+func (mr *MockMultiConnMockRecorder) LastUsage() *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LastUsage", reflect.TypeOf((*MockMultiConn)(nil).LastUsage))
+}
+
 // Open mocks base method.
 func (m *MockMultiConn) Open(arg0 context.Context) (net.Conn, error) {
 	m.ctrl.T.Helper()
@@ -5,6 +5,7 @@ import (
 	"context"
 	"errors"
 	"net"
+	"time"
 )

 var (
@@ -28,6 +29,8 @@ type MultiConn interface {
 	Accept() (conn net.Conn, err error)
 	// Open opens new sub connection
 	Open(ctx context.Context) (conn net.Conn, err error)
+	// LastUsage returns the time of the last connection activity
+	LastUsage() time.Time
 	// Addr returns remote peer address
 	Addr() string
 	// IsClosed returns true when connection is closed
@@ -5,8 +5,7 @@ type configGetter interface {
 }

 type Config struct {
-	ListenAddrs        []string `yaml:"listenAddrs"`
-	WriteTimeoutSec    int      `yaml:"writeTimeoutSec"`
-	DialTimeoutSec     int      `yaml:"dialTimeoutSec"`
-	KeepAlivePeriodSec int      `yaml:"keepAlivePeriodSec"`
+	ListenAddrs     []string `yaml:"listenAddrs"`
+	WriteTimeoutSec int      `yaml:"writeTimeoutSec"`
+	DialTimeoutSec  int      `yaml:"dialTimeoutSec"`
 }
@@ -3,16 +3,13 @@ package yamux
 import (
 	"context"
 	"github.com/anyproto/any-sync/net/connutil"
-	"github.com/anyproto/any-sync/net/peer"
 	"github.com/anyproto/any-sync/net/transport"
 	"github.com/hashicorp/yamux"
-	"io"
 	"net"
 	"time"
 )

 func NewMultiConn(cctx context.Context, luConn *connutil.LastUsageConn, addr string, sess *yamux.Session) transport.MultiConn {
-	cctx = peer.CtxWithPeerAddr(cctx, sess.RemoteAddr().String())
 	return &yamuxConn{
 		ctx:     cctx,
 		luConn:  luConn,
@@ -32,6 +29,7 @@ func (y *yamuxConn) Open(ctx context.Context) (conn net.Conn, err error) {
 	if conn, err = y.Session.Open(); err != nil {
 		return
 	}
+	//conn = connutil.NewTimeout(conn, time.Second*10)
 	return
 }

@@ -49,10 +47,11 @@ func (y *yamuxConn) Addr() string {

 func (y *yamuxConn) Accept() (conn net.Conn, err error) {
 	if conn, err = y.Session.Accept(); err != nil {
-		if err == yamux.ErrSessionShutdown || err == io.EOF {
+		if err == yamux.ErrSessionShutdown {
 			err = transport.ErrConnClosed
 		}
 		return
 	}
+	//conn = connutil.NewTimeout(conn, time.Second*10)
 	return
 }
@@ -51,16 +51,8 @@ func (y *yamuxTransport) Init(a *app.App) (err error) {
 	if y.conf.WriteTimeoutSec <= 0 {
 		y.conf.WriteTimeoutSec = 10
 	}
-
 	y.yamuxConf = yamux.DefaultConfig()
-	if y.conf.KeepAlivePeriodSec < 0 {
-		y.yamuxConf.EnableKeepAlive = false
-	} else {
-		y.yamuxConf.EnableKeepAlive = true
-		if y.conf.KeepAlivePeriodSec != 0 {
-			y.yamuxConf.KeepAliveInterval = time.Duration(y.conf.KeepAlivePeriodSec) * time.Second
-		}
-	}
+	y.yamuxConf.EnableKeepAlive = false
 	y.yamuxConf.StreamOpenTimeout = time.Duration(y.conf.DialTimeoutSec) * time.Second
 	y.yamuxConf.ConnectionWriteTimeout = time.Duration(y.conf.WriteTimeoutSec) * time.Second
 	y.listCtx, y.listCtxCancel = context.WithCancel(context.Background())
@@ -30,12 +30,8 @@ func TestYamuxTransport_Dial(t *testing.T) {

 	mcC, err := fxC.Dial(ctx, fxS.addr)
 	require.NoError(t, err)
-	var mcS transport.MultiConn
-	select {
-	case mcS = <-fxS.accepter.mcs:
-	case <-time.After(time.Second * 5):
-		require.True(t, false, "timeout")
-	}
+	require.Len(t, fxS.accepter.mcs, 1)
+	mcS := <-fxS.accepter.mcs

 	var (
 		sData     string
@@ -73,11 +69,11 @@ func TestYamuxTransport_Dial(t *testing.T) {
 // no deadline - 69100 rps
 // common write deadline - 66700 rps
 // subconn write deadline - 67100 rps
-func TestWriteBenchReuse(t *testing.T) {
+func TestWriteBench(t *testing.T) {
 	t.Skip()
 	var (
 		numSubConn = 10
-		numWrites  = 10000
+		numWrites  = 100000
 	)

 	fxS := newFixture(t)
@@ -128,63 +124,6 @@ func TestWriteBenchReuse(t *testing.T) {
 	t.Logf("%.2f req per sec", float64(numWrites*numSubConn)/dur.Seconds())
 }

-func TestWriteBenchNew(t *testing.T) {
-	t.Skip()
-	var (
-		numSubConn = 10
-		numWrites  = 10000
-	)
-
-	fxS := newFixture(t)
-	defer fxS.finish(t)
-	fxC := newFixture(t)
-	defer fxC.finish(t)
-
-	mcC, err := fxC.Dial(ctx, fxS.addr)
-	require.NoError(t, err)
-	mcS := <-fxS.accepter.mcs
-
-	go func() {
-		for i := 0; i < numSubConn; i++ {
-			require.NoError(t, err)
-			go func() {
-				var b = make([]byte, 1024)
-				for {
-					conn, _ := mcS.Accept()
-					n, _ := conn.Read(b)
-					if n > 0 {
-						conn.Write(b[:n])
-					} else {
-						_ = conn.Close()
-						break
-					}
-					conn.Close()
-				}
-			}()
-		}
-	}()
-
-	var wg sync.WaitGroup
-	wg.Add(numSubConn)
-	st := time.Now()
-	for i := 0; i < numSubConn; i++ {
-		go func() {
-			defer wg.Done()
-			for j := 0; j < numWrites; j++ {
-				sc, err := mcC.Open(ctx)
-				require.NoError(t, err)
-				var b = []byte("some data some data some data some data some data some data some data some data some data")
-				sc.Write(b)
-				sc.Read(b)
-				sc.Close()
-			}
-		}()
-	}
-	wg.Wait()
-	dur := time.Since(st)
-	t.Logf("%.2f req per sec", float64(numWrites*numSubConn)/dur.Seconds())
-}
-
 type fixture struct {
 	*yamuxTransport
 	a            *app.App
@@ -0,0 +1,114 @@
+package nettest
+
+import (
+	"context"
+	"github.com/anyproto/any-sync/app"
+	"github.com/anyproto/any-sync/app/logger"
+	"github.com/anyproto/any-sync/coordinator/coordinatorclient"
+	"github.com/anyproto/any-sync/coordinator/coordinatorproto"
+	"github.com/anyproto/any-sync/coordinator/nodeconfsource"
+	"github.com/anyproto/any-sync/net/peerservice"
+	"github.com/anyproto/any-sync/net/pool"
+	"github.com/anyproto/any-sync/net/rpc"
+	"github.com/anyproto/any-sync/net/rpc/server"
+	"github.com/anyproto/any-sync/net/secureservice"
+	"github.com/anyproto/any-sync/net/transport/yamux"
+	"github.com/anyproto/any-sync/nodeconf"
+	"github.com/anyproto/any-sync/nodeconf/nodeconfstore"
+	"github.com/anyproto/any-sync/testutil/accounttest"
+	"github.com/stretchr/testify/require"
+	"go.uber.org/zap"
+	"net/http"
+	_ "net/http/pprof"
+	"testing"
+	"time"
+)
+
+var ctx = context.Background()
+
+func init() {
+	go http.ListenAndServe(":6061", nil)
+}
+
+func TestNet(t *testing.T) {
+	l := logger.NewNamed("test")
+	pl := pool.New()
+	a := new(app.App)
+	a.Register(&accounttest.AccountTestService{}).
+		Register(pl).
+		Register(peerservice.New()).
+		Register(yamux.New()).
+		Register(nodeconf.New()).
+		Register(nodeconfstore.New()).
+		Register(nodeconfsource.New()).
+		Register(server.New()).
+		Register(secureservice.New()).
+		Register(coordinatorclient.New()).
+		Register(&testConfig{})
+	require.NoError(t, a.Start(ctx))
+	defer a.Close(ctx)
+
+	p, err := pl.Get(ctx, "12D3KooWB4hmEo7YAdWzAaFpjyk4npkcwrPm2kRigsWu3MP9Xdmg")
+	require.NoError(t, err)
+
+	for i := 0; i < 1000000; i++ {
+		dc, err := p.AcquireDrpcConn(ctx)
+		require.NoError(t, err)
+		cl := coordinatorproto.NewDRPCCoordinatorClient(dc)
+		time.Sleep(time.Second)
+		res, err := cl.NetworkConfiguration(ctx, &coordinatorproto.NetworkConfigurationRequest{})
+		if err != nil {
+			l.Warn("req error", zap.Error(err))
+		} else {
+
+			l.Info("req success", zap.String("nid", res.NetworkId))
+		}
+		p.ReleaseDrpcConn(dc)
+	}
+
+}
+
+type testConfig struct {
+}
+
+func (t *testConfig) GetDrpc() rpc.Config {
+	return rpc.Config{
+		Stream: rpc.StreamConfig{
+			MaxMsgSizeMb: 1,
+		},
+	}
+}
+
+func (t *testConfig) GetNodeConfStorePath() string {
+	return "/tmp"
+}
+
+func (t *testConfig) GetNodeConf() nodeconf.Configuration {
+	return nodeconf.Configuration{
+		Id:        "",
+		NetworkId: "",
+		Nodes: []nodeconf.Node{
+			{
+				PeerId:    "12D3KooWB4hmEo7YAdWzAaFpjyk4npkcwrPm2kRigsWu3MP9Xdmg",
+				Addresses: []string{"ec2-3-65-13-48.eu-central-1.compute.amazonaws.com:443"},
+				Types:     []nodeconf.NodeType{nodeconf.NodeTypeTree},
+			},
+		},
+		CreationTime: time.Now(),
+	}
+}
+
+func (t *testConfig) GetYamux() yamux.Config {
+	return yamux.Config{
+		WriteTimeoutSec: 10,
+		DialTimeoutSec:  10,
+	}
+}
+
+func (t *testConfig) Init(a *app.App) (err error) {
+	return nil
+}
+
+func (t *testConfig) Name() (name string) {
+	return "config"
+}