Change gogo/protobuf to anyproto/protobuf

Makefile

@@ -6,7 +6,9 @@ all:
 	@set -e;
 	@git config core.hooksPath .githooks;
 
-proto:
+proto: proto-execute replace-strings
+
+proto-execute:
 	@echo 'Generating protobuf packages (Go)...'
 
 	@$(eval P_ACL_RECORDS_PATH_PB := commonspace/object/acl/aclrecordproto)
@@ -34,8 +36,11 @@ proto:
 deps:
 	go mod download
 	go build -o deps storj.io/drpc/cmd/protoc-gen-go-drpc
-	go build -o deps github.com/gogo/protobuf/protoc-gen-gogofaster
+	go build -o deps github.com/anyproto/protobuf/protoc-gen-gogofaster
 
 test:
 	go test ./... --cover
 
+replace-strings:
+	@echo "Replacing 'github.com/gogo/protobuf' with 'github.com/anyproto/protobuf' in all files recursively..."
+	LC_CTYPE=C LANG=C find . -type f -name "*.go" | xargs sed -i '' "s|github.com/gogo/protobuf|github.com/anyproto/protobuf|g"

commonfile/fileproto/file.pb.go

@@ -5,7 +5,7 @@ package fileproto
 
 import (
 	fmt "fmt"
-	proto "github.com/gogo/protobuf/proto"
+	proto "github.com/anyproto/protobuf/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"

commonfile/fileproto/file_drpc.pb.go

@@ -8,8 +8,8 @@ import (
 	bytes "bytes"
 	context "context"
 	errors "errors"
-	jsonpb "github.com/gogo/protobuf/jsonpb"
-	proto "github.com/gogo/protobuf/proto"
+	jsonpb "github.com/anyproto/protobuf/jsonpb"
+	proto "github.com/anyproto/protobuf/proto"
 	drpc "storj.io/drpc"
 	drpcerr "storj.io/drpc/drpcerr"
 )

commonspace/object/acl/aclrecordproto/aclrecord.pb.go

@@ -5,7 +5,7 @@ package aclrecordproto
 
 import (
 	fmt "fmt"
-	proto "github.com/gogo/protobuf/proto"
+	proto "github.com/anyproto/protobuf/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"

commonspace/object/acl/list/aclrecordbuilder.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 
 	"github.com/anyproto/any-sync/commonspace/object/accountdata"
 	"github.com/anyproto/any-sync/commonspace/object/acl/aclrecordproto"

commonspace/object/acl/list/aclstate.go

@@ -3,7 +3,7 @@ package list
 import (
 	"errors"
 
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 	"go.uber.org/zap"
 
 	"github.com/anyproto/any-sync/app/logger"

commonspace/object/acl/syncacl/response.go

@@ -3,7 +3,7 @@ package syncacl
 import (
 	"fmt"
 
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 
 	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
 	"github.com/anyproto/any-sync/consensus/consensusproto"

commonspace/object/acl/syncacl/syncaclhandler.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 	"go.uber.org/zap"
 	"storj.io/drpc"
 

commonspace/object/acl/syncacl/syncaclhandler_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
 	"github.com/anyproto/any-sync/commonspace/syncstatus"
 	"github.com/anyproto/any-sync/consensus/consensusproto"
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 	"sync"

commonspace/object/tree/objecttree/change.go

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

commonspace/object/tree/objecttree/changebuilder.go

@@ -3,7 +3,7 @@ package objecttree
 import (
 	"errors"
 
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 
 	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
 	"github.com/anyproto/any-sync/util/cidutil"

commonspace/object/tree/objecttree/derivedtree.go

@@ -1,7 +1,7 @@
 package objecttree
 
 import (
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 
 	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
 )

commonspace/object/tree/objecttree/objecttree_test.go

@@ -10,7 +10,7 @@ import (
 
 	"golang.org/x/exp/slices"
 
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 

commonspace/object/tree/synctree/response.go

@@ -3,7 +3,7 @@ package synctree
 import (
 	"fmt"
 
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 
 	"github.com/anyproto/any-sync/commonspace/object/tree/treechangeproto"
 	"github.com/anyproto/any-sync/commonspace/spacesyncproto"

commonspace/object/tree/synctree/synchandler.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 	"go.uber.org/zap"
 	"storj.io/drpc"
 

commonspace/object/tree/synctree/treeremotegetter_test.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 

commonspace/object/tree/treechangeproto/treechange.pb.go

@@ -5,7 +5,7 @@ package treechangeproto
 
 import (
 	fmt "fmt"
-	proto "github.com/gogo/protobuf/proto"
+	proto "github.com/anyproto/protobuf/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"

commonspace/payloads.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 
 	"github.com/anyproto/any-sync/commonspace/object/acl/aclrecordproto"
 	"github.com/anyproto/any-sync/commonspace/object/acl/list"

commonspace/settings/settingsobject.go

@@ -8,7 +8,7 @@ import (
 	"github.com/anyproto/any-sync/commonspace/deletionmanager"
 	"github.com/anyproto/any-sync/util/crypto"
 
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 	"go.uber.org/zap"
 
 	"github.com/anyproto/any-sync/accountservice"

commonspace/settings/settingsstate/changefactory_test.go

@@ -2,7 +2,7 @@ package settingsstate
 
 import (
 	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/exp/slices"
 	"testing"

commonspace/settings/settingsstate/statebuilder.go

@@ -3,7 +3,7 @@ package settingsstate
 import (
 	"github.com/anyproto/any-sync/commonspace/object/tree/objecttree"
 	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 )
 
 type StateBuilder interface {

commonspace/spacesyncproto/spacesync.go

@@ -2,7 +2,7 @@
 package spacesyncproto
 
 import (
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 	"storj.io/drpc"
 )
 

commonspace/spacesyncproto/spacesync.pb.go

@@ -5,7 +5,7 @@ package spacesyncproto
 
 import (
 	fmt "fmt"
-	proto "github.com/gogo/protobuf/proto"
+	proto "github.com/anyproto/protobuf/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"

commonspace/spacesyncproto/spacesync_drpc.pb.go

@@ -8,8 +8,8 @@ import (
 	bytes "bytes"
 	context "context"
 	errors "errors"
-	jsonpb "github.com/gogo/protobuf/jsonpb"
-	proto "github.com/gogo/protobuf/proto"
+	jsonpb "github.com/anyproto/protobuf/jsonpb"
+	proto "github.com/anyproto/protobuf/proto"
 	drpc "storj.io/drpc"
 	drpcerr "storj.io/drpc/drpcerr"
 )

commonspace/sync/objectsync/objectmessages/headupdate.go

@@ -3,7 +3,7 @@ package objectmessages
 import (
 	"fmt"
 
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 
 	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
 )

commonspace/sync/objectsync/objectmessages/request.go

@@ -1,7 +1,7 @@
 package objectmessages
 
 import (
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 
 	"github.com/anyproto/any-sync/commonspace/spacesyncproto"
 )

commonspace/sync/objectsync/synchandler.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	"github.com/cheggaaa/mb/v3"
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 	"storj.io/drpc"
 
 	"github.com/anyproto/any-sync/app"

commonspace/sync/requestmanager.go

@@ -6,7 +6,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 	"go.uber.org/zap"
 	"storj.io/drpc"
 

commonspace/sync/syncdeps/request.go

@@ -1,6 +1,6 @@
 package syncdeps
 
-import "github.com/gogo/protobuf/proto"
+import "github.com/anyproto/protobuf/proto"
 
 type Request interface {
 	PeerId() string

commonspace/sync/syncdeps/syncdeps.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/cheggaaa/mb/v3"
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 	"storj.io/drpc"
 
 	"github.com/anyproto/any-sync/app"

commonspace/sync/synctest/counterrequest.go

@@ -1,7 +1,7 @@
 package synctest
 
 import (
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 
 	"github.com/anyproto/any-sync/commonspace/sync/synctestproto"
 )

commonspace/sync/synctest/counterrequesthandler.go

@@ -3,7 +3,7 @@ package synctest
 import (
 	"context"
 
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 	"golang.org/x/exp/slices"
 
 	"github.com/anyproto/any-sync/commonspace/sync/syncdeps"

commonspace/sync/synctest/countersynchandler.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/cheggaaa/mb/v3"
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 	"storj.io/drpc"
 
 	"github.com/anyproto/any-sync/app"

commonspace/sync/synctest/counterupdate.go

@@ -1,7 +1,7 @@
 package synctest
 
 import (
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 
 	"github.com/anyproto/any-sync/commonspace/sync/synctestproto"
 )

commonspace/sync/synctestproto/helpers.go

@@ -1,6 +1,6 @@
 package synctestproto
 
-import "github.com/gogo/protobuf/proto"
+import "github.com/anyproto/protobuf/proto"
 
 func (c *CounterIncrease) MsgSize() uint64 {
 	if c != nil {

commonspace/sync/synctestproto/synctest.pb.go

@@ -5,7 +5,7 @@ package synctestproto
 
 import (
 	fmt "fmt"
-	proto "github.com/gogo/protobuf/proto"
+	proto "github.com/anyproto/protobuf/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"

commonspace/sync/synctestproto/synctest_drpc.pb.go

@@ -8,8 +8,8 @@ import (
 	bytes "bytes"
 	context "context"
 	errors "errors"
-	jsonpb "github.com/gogo/protobuf/jsonpb"
-	proto "github.com/gogo/protobuf/proto"
+	jsonpb "github.com/anyproto/protobuf/jsonpb"
+	proto "github.com/anyproto/protobuf/proto"
 	drpc "storj.io/drpc"
 	drpcerr "storj.io/drpc/drpcerr"
 )

consensus/consensusproto/consensus.pb.go

@@ -5,7 +5,7 @@ package consensusproto
 
 import (
 	fmt "fmt"
-	proto "github.com/gogo/protobuf/proto"
+	proto "github.com/anyproto/protobuf/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"

consensus/consensusproto/consensus_drpc.pb.go

@@ -8,8 +8,8 @@ import (
 	bytes "bytes"
 	context "context"
 	errors "errors"
-	jsonpb "github.com/gogo/protobuf/jsonpb"
-	proto "github.com/gogo/protobuf/proto"
+	jsonpb "github.com/anyproto/protobuf/jsonpb"
+	proto "github.com/anyproto/protobuf/proto"
 	drpc "storj.io/drpc"
 	drpcerr "storj.io/drpc/drpcerr"
 )

coordinator/coordinatorproto/coordinator.pb.go

@@ -5,7 +5,7 @@ package coordinatorproto
 
 import (
 	fmt "fmt"
-	proto "github.com/gogo/protobuf/proto"
+	proto "github.com/anyproto/protobuf/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"

coordinator/coordinatorproto/coordinator_drpc.pb.go

@@ -8,8 +8,8 @@ import (
 	bytes "bytes"
 	context "context"
 	errors "errors"
-	jsonpb "github.com/gogo/protobuf/jsonpb"
-	proto "github.com/gogo/protobuf/proto"
+	jsonpb "github.com/anyproto/protobuf/jsonpb"
+	proto "github.com/anyproto/protobuf/proto"
 	drpc "storj.io/drpc"
 	drpcerr "storj.io/drpc/drpcerr"
 )

coordinator/coordinatorproto/receipt.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"github.com/anyproto/any-sync/util/crypto"
 	"github.com/anyproto/any-sync/util/strkey"
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 	"time"
 )
 

coordinator/coordinatorproto/receipt_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"crypto/rand"
 	"github.com/anyproto/any-sync/util/crypto"
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 	"github.com/stretchr/testify/require"
 	"testing"
 	"time"

go.mod

@@ -7,13 +7,13 @@ require (
 	github.com/anyproto/go-chash v0.1.0
 	github.com/anyproto/go-slip10 v1.0.0
 	github.com/anyproto/go-slip21 v1.0.0
+	github.com/anyproto/protobuf v1.3.3-0.20240801222536-5596d71a739e
 	github.com/btcsuite/btcd v0.22.1
 	github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce
 	github.com/cespare/xxhash v1.1.0
 	github.com/cheggaaa/mb/v3 v3.0.2
 	github.com/gobwas/glob v0.2.3
 	github.com/goccy/go-graphviz v0.1.2
-	github.com/gogo/protobuf v1.3.2
 	github.com/google/uuid v1.6.0
 	github.com/hashicorp/yamux v0.1.1
 	github.com/huandu/skiplist v1.2.0
@@ -54,6 +54,7 @@ require (
 	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/pprof v0.0.0-20240402174815-29b9bb013b0f // indirect
@@ -100,5 +101,3 @@ require (
 	google.golang.org/protobuf v1.33.0 // indirect
 	lukechampine.com/blake3 v1.2.1 // indirect
 )
-
-replace github.com/gogo/protobuf => github.com/anyproto/protobuf v1.3.3-0.20240715205950-2af411f17dfa

go.sum

@@ -12,8 +12,8 @@ github.com/anyproto/go-slip10 v1.0.0 h1:uAEtSuudR3jJBOfkOXf3bErxVoxbuKwdoJN55M1i
 github.com/anyproto/go-slip10 v1.0.0/go.mod h1:BCmIlM1KB8wX6K4/8pOvxPl9oVKfEvZ5vsmO5rkK6vg=
 github.com/anyproto/go-slip21 v1.0.0 h1:CI7lUqTIwmPOEGVAj4jyNLoICvueh++0U2HoAi3m2ZY=
 github.com/anyproto/go-slip21 v1.0.0/go.mod h1:gbIJt7HAdr5DuT4f2pFTKCBSUWYsm/fysHBNqgsuxT0=
-github.com/anyproto/protobuf v1.3.3-0.20240715205950-2af411f17dfa h1:uQImj4hK8HwkOcxhy/88/+jQpH0n2jX2Iryz6vomhM0=
-github.com/anyproto/protobuf v1.3.3-0.20240715205950-2af411f17dfa/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/anyproto/protobuf v1.3.3-0.20240801222536-5596d71a739e h1:BitG6mK/JctFt57+AJO9A6tF06g8Pun/OUjODB/v8z4=
+github.com/anyproto/protobuf v1.3.3-0.20240801222536-5596d71a739e/go.mod h1:5+PHE01DgsDPkralb8MYmGg2sPQahsqEJ9ue7ciDHKg=
 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=
@@ -77,6 +77,8 @@ github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/goccy/go-graphviz v0.1.2 h1:sWSJ6w13BCm/ZOUTHDVrdvbsxqN8yyzaFcHrH/hQ9Yg=
 github.com/goccy/go-graphviz v0.1.2/go.mod h1:pMYpbAqJT10V8dzV1JN/g/wUlG/0imKPzn3ZsrchGCI=
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=

identityrepo/identityrepoproto/identityrepo.pb.go

@@ -5,7 +5,7 @@ package identityrepoproto
 
 import (
 	fmt "fmt"
-	proto "github.com/gogo/protobuf/proto"
+	proto "github.com/anyproto/protobuf/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"

identityrepo/identityrepoproto/identityrepo_drpc.pb.go

@@ -8,8 +8,8 @@ import (
 	bytes "bytes"
 	context "context"
 	errors "errors"
-	jsonpb "github.com/gogo/protobuf/jsonpb"
-	proto "github.com/gogo/protobuf/proto"
+	jsonpb "github.com/anyproto/protobuf/jsonpb"
+	proto "github.com/anyproto/protobuf/proto"
 	drpc "storj.io/drpc"
 	drpcerr "storj.io/drpc/drpcerr"
 )

nameservice/nameserviceproto/nameservice.pb.go

@@ -5,7 +5,7 @@ package nameserviceproto
 
 import (
 	fmt "fmt"
-	proto "github.com/gogo/protobuf/proto"
+	proto "github.com/anyproto/protobuf/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"

nameservice/nameserviceproto/nameservice_aa.pb.go

@@ -5,7 +5,7 @@ package nameserviceproto
 
 import (
 	fmt "fmt"
-	proto "github.com/gogo/protobuf/proto"
+	proto "github.com/anyproto/protobuf/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"

nameservice/nameserviceproto/nameservice_aa_drpc.pb.go

@@ -8,8 +8,8 @@ import (
 	bytes "bytes"
 	context "context"
 	errors "errors"
-	jsonpb "github.com/gogo/protobuf/jsonpb"
-	proto "github.com/gogo/protobuf/proto"
+	jsonpb "github.com/anyproto/protobuf/jsonpb"
+	proto "github.com/anyproto/protobuf/proto"
 	drpc "storj.io/drpc"
 	drpcerr "storj.io/drpc/drpcerr"
 )

nameservice/nameserviceproto/nameservice_drpc.pb.go

@@ -8,8 +8,8 @@ import (
 	bytes "bytes"
 	context "context"
 	errors "errors"
-	jsonpb "github.com/gogo/protobuf/jsonpb"
-	proto "github.com/gogo/protobuf/proto"
+	jsonpb "github.com/anyproto/protobuf/jsonpb"
+	proto "github.com/anyproto/protobuf/proto"
 	drpc "storj.io/drpc"
 	drpcerr "storj.io/drpc/drpcerr"
 )

net/rpc/limiter/limiterproto/limiter.pb.go

@@ -5,7 +5,7 @@ package limiterproto
 
 import (
 	fmt "fmt"
-	proto "github.com/gogo/protobuf/proto"
+	proto "github.com/anyproto/protobuf/proto"
 	math "math"
 )
 

net/secureservice/handshake/handshakeproto/handshake.pb.go

@@ -5,7 +5,7 @@ package handshakeproto
 
 import (
 	fmt "fmt"
-	proto "github.com/gogo/protobuf/proto"
+	proto "github.com/anyproto/protobuf/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"

net/streampool/encoding.go

@@ -3,7 +3,7 @@ package streampool
 import (
 	"errors"
 
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 	"storj.io/drpc"
 )
 

net/streampool/testservice/testservice.pb.go

@@ -5,7 +5,7 @@ package testservice
 
 import (
 	fmt "fmt"
-	proto "github.com/gogo/protobuf/proto"
+	proto "github.com/anyproto/protobuf/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"

net/streampool/testservice/testservice_drpc.pb.go

@@ -8,8 +8,8 @@ import (
 	bytes "bytes"
 	context "context"
 	errors "errors"
-	jsonpb "github.com/gogo/protobuf/jsonpb"
-	proto "github.com/gogo/protobuf/proto"
+	jsonpb "github.com/anyproto/protobuf/jsonpb"
+	proto "github.com/anyproto/protobuf/proto"
 	drpc "storj.io/drpc"
 	drpcerr "storj.io/drpc/drpcerr"
 )

paymentservice/paymentserviceproto/paymentservice.pb.go

@@ -5,7 +5,7 @@ package paymentserviceproto
 
 import (
 	fmt "fmt"
-	proto "github.com/gogo/protobuf/proto"
+	proto "github.com/anyproto/protobuf/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"

paymentservice/paymentserviceproto/paymentservice_drpc.pb.go

@@ -8,8 +8,8 @@ import (
 	bytes "bytes"
 	context "context"
 	errors "errors"
-	jsonpb "github.com/gogo/protobuf/jsonpb"
-	proto "github.com/gogo/protobuf/proto"
+	jsonpb "github.com/anyproto/protobuf/jsonpb"
+	proto "github.com/anyproto/protobuf/proto"
 	drpc "storj.io/drpc"
 	drpcerr "storj.io/drpc/drpcerr"
 )

paymentservice/paymentserviceproto/paymentservice_tiers.pb.go

@@ -5,7 +5,7 @@ package paymentserviceproto
 
 import (
 	fmt "fmt"
-	proto "github.com/gogo/protobuf/proto"
+	proto "github.com/anyproto/protobuf/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"

util/crypto/aes.go

@@ -7,7 +7,7 @@ import (
 	"crypto/subtle"
 	"fmt"
 	"github.com/anyproto/any-sync/util/crypto/cryptoproto"
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 	mbase "github.com/multiformats/go-multibase"
 )
 

util/crypto/cryptoproto/crypto.pb.go

@@ -5,7 +5,7 @@ package cryptoproto
 
 import (
 	fmt "fmt"
-	proto "github.com/gogo/protobuf/proto"
+	proto "github.com/anyproto/protobuf/proto"
 	io "io"
 	math "math"
 	math_bits "math/bits"

util/crypto/ed25519.go

@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"github.com/anyproto/any-sync/util/crypto/cryptoproto"
 	"github.com/anyproto/any-sync/util/strkey"
-	"github.com/gogo/protobuf/proto"
+	"github.com/anyproto/protobuf/proto"
 	"github.com/libp2p/go-libp2p/core/crypto"
 	"io"
 	"sync"