From b9b551e98b14edb2b6985b5dd5da969d13c3342f Mon Sep 17 00:00:00 2001 From: Matee Ullah Malik Date: Tue, 19 Aug 2025 22:04:34 +0500 Subject: [PATCH 1/2] update V2 --- .github/workflows/build&release.yml | 6 ++-- Makefile | 6 ++-- cmd/sncli/cli/cli.go | 14 ++++----- cmd/sncli/cli/list_grpc.go | 4 +-- cmd/sncli/go.mod | 6 ++-- cmd/sncli/go.sum | 4 +-- cmd/sncli/main.go | 2 +- docs/packages/net/lumera_grpc.md | 6 ++-- gen/supernode/action/cascade/service.pb.go | 9 +++--- gen/supernode/supernode.pb.go | 6 ++-- go.mod | 4 +-- p2p/kademlia/bootstrap.go | 8 ++--- p2p/kademlia/conn_pool.go | 4 +-- p2p/kademlia/dht.go | 16 +++++----- p2p/kademlia/fetch_and_store.go | 6 ++-- p2p/kademlia/hashtable.go | 2 +- p2p/kademlia/helpers/timer.go | 2 +- p2p/kademlia/message.go | 4 +-- p2p/kademlia/network.go | 6 ++-- p2p/kademlia/node.go | 4 +-- p2p/kademlia/node_activity.go | 4 +-- p2p/kademlia/redundant_data.go | 8 ++--- p2p/kademlia/replication.go | 6 ++-- p2p/kademlia/rq_symbols.go | 4 +-- p2p/kademlia/store.go | 2 +- p2p/kademlia/store/cloud.go/cloud.go | 2 +- p2p/kademlia/store/mem/mem.go | 2 +- p2p/kademlia/store/meta/meta.go | 4 +-- p2p/kademlia/store/meta/meta_test.go | 2 +- p2p/kademlia/store/sqlite/meta_worker.go | 6 ++-- p2p/kademlia/store/sqlite/replication.go | 4 +-- p2p/kademlia/store/sqlite/sqlite.go | 6 ++-- p2p/kademlia/store/sqlite/sqlite_test.go | 4 +-- p2p/p2p.go | 18 +++++------ pkg/codec/codec_mock.go | 10 +++++-- pkg/codec/decode.go | 2 +- pkg/codec/raptorq.go | 2 +- pkg/common/blocktracker/block_tracker.go | 2 +- pkg/common/task/state/state.go | 8 ++--- pkg/common/task/task.go | 10 +++---- pkg/common/task/worker.go | 4 +-- pkg/configurer/file.go | 2 +- pkg/dd/client.go | 6 ++-- pkg/dd/dd_server_client.go | 2 +- pkg/dd/image_rareness.go | 6 ++-- pkg/dd/status.go | 6 ++-- pkg/errgroup/errgroup.go | 4 +-- pkg/errors/error_test.go | 2 +- pkg/keyring/keyring.go | 3 +- pkg/lumera/client.go | 12 ++++---- pkg/lumera/interface.go | 12 ++++---- pkg/lumera/lumera_mock.go | 12 ++++---- .../modules/action_msg/action_msg_mock.go | 15 ++++++++++ pkg/lumera/modules/action_msg/impl.go | 4 +-- pkg/lumera/modules/action_msg/interface.go | 4 +-- pkg/lumera/modules/auth/impl.go | 4 +-- pkg/lumera/modules/supernode/impl.go | 2 +- pkg/lumera/modules/tx/helper.go | 2 +- pkg/lumera/modules/tx/impl.go | 4 +-- pkg/net/credentials/alts/conn/aes128gcm.go | 2 +- .../credentials/alts/conn/aes128gcm_test.go | 2 +- .../credentials/alts/conn/aes128gcmrekey.go | 2 +- .../alts/conn/aes128gcmrekey_test.go | 2 +- pkg/net/credentials/alts/conn/common.go | 2 +- pkg/net/credentials/alts/conn/counter_test.go | 2 +- pkg/net/credentials/alts/conn/record.go | 2 +- pkg/net/credentials/alts/conn/record_test.go | 4 +-- pkg/net/credentials/alts/conn/register.go | 2 +- pkg/net/credentials/alts/conn/utils.go | 2 +- .../alts/conn/xchacha20poly1305.go | 2 +- .../alts/conn/xchacha20poly1305_test.go | 2 +- pkg/net/credentials/alts/handshake/common.go | 2 +- .../credentials/alts/handshake/common_test.go | 2 +- .../credentials/alts/handshake/handshake.go | 4 +-- .../alts/handshake/handshake_test.go | 8 ++--- .../alts/testutil/fake_handshaker.go | 2 +- pkg/net/credentials/alts/testutil/testutil.go | 2 +- pkg/net/credentials/lumeratc.go | 6 ++-- pkg/net/grpc/client/client.go | 6 ++-- pkg/net/grpc/grpctest/grpctest.go | 2 +- pkg/net/grpc/internal/leakcheck/leakcheck.go | 4 +-- pkg/net/grpc/mem/buffer_pool.go | 2 +- pkg/net/grpc/server/server.go | 4 +-- pkg/net/grpc/server/server_test.go | 2 +- pkg/net/interceptor.go | 2 +- pkg/random/random.go | 2 +- pkg/raptorq/helper.go | 4 +-- pkg/storage/file_storage_interface.go | 2 +- pkg/storage/files/file.go | 6 ++-- pkg/storage/files/format.go | 2 +- pkg/storage/files/storage.go | 6 ++-- pkg/storage/files/storage_test.go | 2 +- pkg/storage/fs/file.go | 6 ++-- pkg/storage/fs/file_test.go | 2 +- pkg/storage/keyvalue_interface.go | 2 +- pkg/storage/memory/keyvalue.go | 2 +- pkg/storage/memory/keyvalue_test.go | 2 +- pkg/storage/queries/health_check.go | 6 ++-- pkg/storage/queries/ping_history.go | 2 +- pkg/storage/queries/self_healing.go | 6 ++-- pkg/storage/queries/sqlite.go | 4 +-- pkg/storage/queries/storage_challenge.go | 6 ++-- pkg/storage/queries/task_history.go | 4 +-- pkg/testutil/lumera.go | 14 ++++----- pkg/types/healthcheck_challenge.go | 2 +- pkg/types/self_healing.go | 2 +- pkg/types/storage_challenge.go | 4 +-- pkg/types/types.go | 2 +- .../health_check_challenge.go | 2 +- pkg/utils/metrics/metrics.go | 2 +- .../storagechallenge/storage_challenge.go | 2 +- pkg/utils/utils.go | 2 +- proto/dupedetection/dd-server.proto | 2 +- proto/raptorq/raptorq.proto | 2 +- proto/supernode/action/cascade/service.proto | 2 +- proto/supernode/supernode.proto | 2 +- sdk/README.md | 8 ++--- sdk/action/client.go | 14 ++++----- sdk/adapters/lumera/adapter.go | 4 +-- sdk/adapters/supernodeservice/adapter.go | 10 +++---- sdk/adapters/supernodeservice/types.go | 2 +- sdk/adapters/supernodeservice/types_test.go | 4 +-- sdk/event/bus.go | 2 +- sdk/event/types.go | 2 +- sdk/net/client.go | 2 +- sdk/net/factory.go | 6 ++-- sdk/net/impl.go | 12 ++++---- sdk/task/cache.go | 6 ++-- sdk/task/cascade.go | 8 ++--- sdk/task/download.go | 8 ++--- sdk/task/helpers.go | 2 +- sdk/task/manager.go | 10 +++---- sdk/task/task.go | 14 ++++----- sn-manager/README.md | 2 +- sn-manager/cmd/check.go | 6 ++-- sn-manager/cmd/get.go | 6 ++-- sn-manager/cmd/helpers.go | 2 +- sn-manager/cmd/init.go | 6 ++-- sn-manager/cmd/ls-remote.go | 4 +-- sn-manager/cmd/ls.go | 2 +- sn-manager/cmd/start.go | 10 +++---- sn-manager/cmd/use.go | 4 +-- sn-manager/go.mod | 6 ++-- sn-manager/internal/manager/manager.go | 2 +- sn-manager/internal/updater/updater.go | 10 +++---- sn-manager/internal/updater/updater_test.go | 6 ++-- sn-manager/internal/version/manager.go | 2 +- sn-manager/main.go | 2 +- supernode/cmd/config_update.go | 4 +-- supernode/cmd/helpers.go | 6 ++-- supernode/cmd/init.go | 4 +-- supernode/cmd/keys_recover.go | 2 +- supernode/cmd/root.go | 2 +- supernode/cmd/service.go | 4 +-- supernode/cmd/start.go | 30 +++++++++---------- supernode/cmd/supernode.go | 10 +++---- supernode/config/config.go | 2 +- supernode/main.go | 4 +-- .../server/cascade/cascade_action_server.go | 8 ++--- .../cascade/cascade_action_server_mock.go | 2 +- .../cascade/cascade_action_server_test.go | 6 ++-- .../node/action/server/cascade/helper.go | 2 +- supernode/node/supernode/gateway/server.go | 4 +-- supernode/node/supernode/server/server.go | 12 ++++---- .../node/supernode/server/server_test.go | 2 +- .../node/supernode/server/status_server.go | 10 +++---- .../supernode/server/status_server_test.go | 6 ++-- supernode/services/cascade/adaptors/lumera.go | 2 +- .../cascade/adaptors/mocks/p2p_mock.go | 4 +-- .../cascade/adaptors/mocks/rq_mock.go | 2 +- supernode/services/cascade/adaptors/p2p.go | 10 +++---- supernode/services/cascade/adaptors/rq.go | 2 +- supernode/services/cascade/config.go | 2 +- supernode/services/cascade/download.go | 12 ++++---- supernode/services/cascade/helper.go | 12 ++++---- supernode/services/cascade/helper_test.go | 4 +-- supernode/services/cascade/metadata.go | 6 ++-- supernode/services/cascade/metadata_test.go | 4 +-- .../cascade/mocks/cascade_interfaces_mock.go | 2 +- supernode/services/cascade/register.go | 2 +- supernode/services/cascade/register_test.go | 10 +++---- supernode/services/cascade/service.go | 14 ++++----- supernode/services/cascade/service_test.go | 6 ++-- supernode/services/cascade/status.go | 2 +- supernode/services/cascade/status_test.go | 4 +-- supernode/services/cascade/task.go | 6 ++-- .../services/common/base/supernode_service.go | 10 +++---- .../services/common/base/supernode_task.go | 10 +++---- supernode/services/common/storage/handler.go | 12 ++++---- .../services/common/storage/handler_test.go | 2 +- .../services/common/supernode/metrics.go | 2 +- .../services/common/supernode/service.go | 10 +++---- .../services/common/supernode/service_test.go | 2 +- supernode/services/verifier/verifier.go | 6 ++-- supernode/services/verifier/verifier_test.go | 2 +- tests/integration/p2p/p2p_integration_test.go | 16 +++++----- .../securegrpc/secure_connection_test.go | 14 ++++----- tests/system/e2e_cascade_test.go | 14 ++++----- tests/system/go.mod | 9 +++--- tests/system/go.sum | 4 --- tests/system/signature_utils.go | 6 ++-- 201 files changed, 528 insertions(+), 512 deletions(-) diff --git a/.github/workflows/build&release.yml b/.github/workflows/build&release.yml index ce237ecd..b8fc8900 100644 --- a/.github/workflows/build&release.yml +++ b/.github/workflows/build&release.yml @@ -91,9 +91,9 @@ jobs: go build \ -trimpath \ -ldflags="-s -w \ - -X github.com/LumeraProtocol/supernode/supernode/cmd.Version=${{ steps.vars.outputs.version }} \ - -X github.com/LumeraProtocol/supernode/supernode/cmd.GitCommit=${{ steps.vars.outputs.git_commit }} \ - -X github.com/LumeraProtocol/supernode/supernode/cmd.BuildTime=${{ steps.vars.outputs.build_time }}" \ + -X github.com/LumeraProtocol/supernode/v2/supernode/cmd.Version=${{ steps.vars.outputs.version }} \ + -X github.com/LumeraProtocol/supernode/v2/supernode/cmd.GitCommit=${{ steps.vars.outputs.git_commit }} \ + -X github.com/LumeraProtocol/supernode/v2/supernode/cmd.BuildTime=${{ steps.vars.outputs.build_time }}" \ -o release/supernode \ ./supernode diff --git a/Makefile b/Makefile index baa29bc0..3977dc38 100644 --- a/Makefile +++ b/Makefile @@ -9,9 +9,9 @@ GIT_COMMIT ?= $(shell git rev-parse --short HEAD 2>/dev/null || echo "unknown") BUILD_TIME ?= $(shell date -u '+%Y-%m-%d_%H:%M:%S') # Linker flags for version information -LDFLAGS = -X github.com/LumeraProtocol/supernode/supernode/cmd.Version=$(VERSION) \ - -X github.com/LumeraProtocol/supernode/supernode/cmd.GitCommit=$(GIT_COMMIT) \ - -X github.com/LumeraProtocol/supernode/supernode/cmd.BuildTime=$(BUILD_TIME) +LDFLAGS = -X github.com/LumeraProtocol/supernode/v2/supernode/cmd.Version=$(VERSION) \ + -X github.com/LumeraProtocol/supernode/v2/supernode/cmd.GitCommit=$(GIT_COMMIT) \ + -X github.com/LumeraProtocol/supernode/v2/supernode/cmd.BuildTime=$(BUILD_TIME) # Linker flags for sn-manager SN_MANAGER_LDFLAGS = -X main.Version=$(VERSION) \ diff --git a/cmd/sncli/cli/cli.go b/cmd/sncli/cli/cli.go index 85c694d9..2f69d7a6 100644 --- a/cmd/sncli/cli/cli.go +++ b/cmd/sncli/cli/cli.go @@ -2,7 +2,7 @@ package cli import ( "context" - "github.com/LumeraProtocol/supernode/supernode/config" + "github.com/LumeraProtocol/supernode/v2/supernode/config" "log" "os" "path/filepath" @@ -11,12 +11,12 @@ import ( "github.com/BurntSushi/toml" "github.com/spf13/pflag" - snkeyring "github.com/LumeraProtocol/supernode/pkg/keyring" - "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/conn" - "github.com/LumeraProtocol/supernode/sdk/adapters/lumera" - sdkcfg "github.com/LumeraProtocol/supernode/sdk/config" - sdklog "github.com/LumeraProtocol/supernode/sdk/log" - sdknet "github.com/LumeraProtocol/supernode/sdk/net" + snkeyring "github.com/LumeraProtocol/supernode/v2/pkg/keyring" + "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/conn" + "github.com/LumeraProtocol/supernode/v2/sdk/adapters/lumera" + sdkcfg "github.com/LumeraProtocol/supernode/v2/sdk/config" + sdklog "github.com/LumeraProtocol/supernode/v2/sdk/log" + sdknet "github.com/LumeraProtocol/supernode/v2/sdk/net" "github.com/cosmos/cosmos-sdk/crypto/keyring" ) diff --git a/cmd/sncli/cli/list_grpc.go b/cmd/sncli/cli/list_grpc.go index 8ce72777..43ac0916 100644 --- a/cmd/sncli/cli/list_grpc.go +++ b/cmd/sncli/cli/list_grpc.go @@ -10,8 +10,8 @@ import ( "google.golang.org/protobuf/types/descriptorpb" "google.golang.org/protobuf/reflect/protodesc" - grpcclient "github.com/LumeraProtocol/supernode/pkg/net/grpc/client" - "github.com/LumeraProtocol/supernode/pkg/net/credentials" + grpcclient "github.com/LumeraProtocol/supernode/v2/pkg/net/grpc/client" + "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials" ) func (c *CLI) listGRPCMethods() error { diff --git a/cmd/sncli/go.mod b/cmd/sncli/go.mod index 324892a7..e53f2e6a 100644 --- a/cmd/sncli/go.mod +++ b/cmd/sncli/go.mod @@ -1,16 +1,16 @@ -module github.com/LumeraProtocol/supernode/cmd/sncli +module github.com/LumeraProtocol/supernode/v2/cmd/sncli go 1.24.1 replace ( - github.com/LumeraProtocol/supernode/supernode => ../../supernode + github.com/LumeraProtocol/supernode/v2/supernode => ../../supernode github.com/bytedance/sonic => github.com/bytedance/sonic v1.14.0 github.com/bytedance/sonic/loader => github.com/bytedance/sonic/loader v0.3.0 ) require ( github.com/BurntSushi/toml v1.4.0 - github.com/LumeraProtocol/supernode v1.7.0 + github.com/LumeraProtocol/supernode/v2 v1.7.0 github.com/cosmos/cosmos-sdk v0.50.14 github.com/spf13/pflag v1.0.7 google.golang.org/grpc v1.71.0 diff --git a/cmd/sncli/go.sum b/cmd/sncli/go.sum index a1c19026..c0c429b2 100644 --- a/cmd/sncli/go.sum +++ b/cmd/sncli/go.sum @@ -65,8 +65,8 @@ github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwS github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/LumeraProtocol/lumera v1.6.0 h1:5I172U/f1Migt7tRxnywhz5aRKCpBOx/IMgOzhJfTP0= github.com/LumeraProtocol/lumera v1.6.0/go.mod h1:c1M+sjewuCvxw+pznwlspUzenDJI8Y+suKB3RFKS2Wo= -github.com/LumeraProtocol/supernode v1.7.0 h1:gpnwQMeu8jZPyoSaCTXyk4Ny0obW9P48lbD15UJDPgQ= -github.com/LumeraProtocol/supernode v1.7.0/go.mod h1:lQlfCgrwAtpNH5OeXKSbRCFZrp8gKsMuhBxqzz1N+6E= +github.com/LumeraProtocol/supernode/v2 v1.7.0 h1:gpnwQMeu8jZPyoSaCTXyk4Ny0obW9P48lbD15UJDPgQ= +github.com/LumeraProtocol/supernode/v2 v1.7.0/go.mod h1:lQlfCgrwAtpNH5OeXKSbRCFZrp8gKsMuhBxqzz1N+6E= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= diff --git a/cmd/sncli/main.go b/cmd/sncli/main.go index ea5cbc2b..8eac23c6 100644 --- a/cmd/sncli/main.go +++ b/cmd/sncli/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/LumeraProtocol/supernode/cmd/sncli/cli" + "github.com/LumeraProtocol/supernode/v2/cmd/sncli/cli" ) func main() { diff --git a/docs/packages/net/lumera_grpc.md b/docs/packages/net/lumera_grpc.md index 1630f960..7738e297 100644 --- a/docs/packages/net/lumera_grpc.md +++ b/docs/packages/net/lumera_grpc.md @@ -338,9 +338,9 @@ import ( "google.golang.org/grpc/health/grpc_health_v1" "github.com/LumeraProtocol/lumera/x/lumeraid/securekeyx" - "github.com/LumeraProtocol/supernode/pkg/net/credentials" - "github.com/LumeraProtocol/supernode/pkg/net/grpc/client" - "github.com/LumeraProtocol/supernode/pkg/net/grpc/server" + "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials" + "github.com/LumeraProtocol/supernode/v2/pkg/net/grpc/client" + "github.com/LumeraProtocol/supernode/v2/pkg/net/grpc/server" ) func main() { diff --git a/gen/supernode/action/cascade/service.pb.go b/gen/supernode/action/cascade/service.pb.go index 4eca2b5b..42458794 100644 --- a/gen/supernode/action/cascade/service.pb.go +++ b/gen/supernode/action/cascade/service.pb.go @@ -599,11 +599,12 @@ var file_supernode_action_cascade_service_proto_rawDesc = []byte{ 0x73, 0x63, 0x61, 0x64, 0x65, 0x2e, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x63, 0x61, 0x73, 0x63, 0x61, 0x64, 0x65, 0x2e, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x30, 0x01, 0x42, 0x42, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, + 0x30, 0x01, 0x42, 0x45, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x4c, 0x75, 0x6d, 0x65, 0x72, 0x61, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, - 0x73, 0x75, 0x70, 0x65, 0x72, 0x6e, 0x6f, 0x64, 0x65, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x73, 0x75, - 0x70, 0x65, 0x72, 0x6e, 0x6f, 0x64, 0x65, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x63, - 0x61, 0x73, 0x63, 0x61, 0x64, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x75, 0x70, 0x65, 0x72, 0x6e, 0x6f, 0x64, 0x65, 0x2f, 0x76, 0x32, 0x2f, 0x67, 0x65, 0x6e, + 0x2f, 0x73, 0x75, 0x70, 0x65, 0x72, 0x6e, 0x6f, 0x64, 0x65, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x2f, 0x63, 0x61, 0x73, 0x63, 0x61, 0x64, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/gen/supernode/supernode.pb.go b/gen/supernode/supernode.pb.go index 1ace0f23..51027e4b 100644 --- a/gen/supernode/supernode.pb.go +++ b/gen/supernode/supernode.pb.go @@ -796,10 +796,10 @@ var file_supernode_supernode_proto_rawDesc = []byte{ 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x18, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x12, 0x12, 0x10, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x42, - 0x33, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x4c, 0x75, + 0x36, 0x5a, 0x34, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x4c, 0x75, 0x6d, 0x65, 0x72, 0x61, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x73, 0x75, 0x70, - 0x65, 0x72, 0x6e, 0x6f, 0x64, 0x65, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x73, 0x75, 0x70, 0x65, 0x72, - 0x6e, 0x6f, 0x64, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x72, 0x6e, 0x6f, 0x64, 0x65, 0x2f, 0x76, 0x32, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x73, 0x75, + 0x70, 0x65, 0x72, 0x6e, 0x6f, 0x64, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/go.mod b/go.mod index e96a7340..e09b5998 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,9 @@ -module github.com/LumeraProtocol/supernode +module github.com/LumeraProtocol/supernode/v2 go 1.24.1 replace ( - github.com/LumeraProtocol/supernode/supernode => ./supernode + github.com/LumeraProtocol/supernode/v2/supernode => ./supernode github.com/bytedance/sonic => github.com/bytedance/sonic v1.14.0 github.com/bytedance/sonic/loader => github.com/bytedance/sonic/loader v0.3.0 ) diff --git a/p2p/kademlia/bootstrap.go b/p2p/kademlia/bootstrap.go index 8685850a..0f18a5e4 100644 --- a/p2p/kademlia/bootstrap.go +++ b/p2p/kademlia/bootstrap.go @@ -8,11 +8,11 @@ import ( "sync" "time" - "github.com/LumeraProtocol/supernode/pkg/errors" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - ltc "github.com/LumeraProtocol/supernode/pkg/net/credentials" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + ltc "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials" ) const ( diff --git a/p2p/kademlia/conn_pool.go b/p2p/kademlia/conn_pool.go index 5540539b..f571b10a 100644 --- a/p2p/kademlia/conn_pool.go +++ b/p2p/kademlia/conn_pool.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/LumeraProtocol/supernode/pkg/errors" - ltc "github.com/LumeraProtocol/supernode/pkg/net/credentials" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" + ltc "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials" "google.golang.org/grpc/credentials" ) diff --git a/p2p/kademlia/dht.go b/p2p/kademlia/dht.go index 2ab6660b..3103d0a2 100644 --- a/p2p/kademlia/dht.go +++ b/p2p/kademlia/dht.go @@ -15,14 +15,14 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keyring" "github.com/LumeraProtocol/lumera/x/lumeraid/securekeyx" - "github.com/LumeraProtocol/supernode/pkg/errors" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/lumera" - ltc "github.com/LumeraProtocol/supernode/pkg/net/credentials" - "github.com/LumeraProtocol/supernode/pkg/storage" - "github.com/LumeraProtocol/supernode/pkg/storage/memory" - "github.com/LumeraProtocol/supernode/pkg/storage/rqstore" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera" + ltc "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials" + "github.com/LumeraProtocol/supernode/v2/pkg/storage" + "github.com/LumeraProtocol/supernode/v2/pkg/storage/memory" + "github.com/LumeraProtocol/supernode/v2/pkg/storage/rqstore" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" ) const ( diff --git a/p2p/kademlia/fetch_and_store.go b/p2p/kademlia/fetch_and_store.go index 5dcfd695..9803bf3d 100644 --- a/p2p/kademlia/fetch_and_store.go +++ b/p2p/kademlia/fetch_and_store.go @@ -9,9 +9,9 @@ import ( json "github.com/json-iterator/go" - "github.com/LumeraProtocol/supernode/p2p/kademlia/domain" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/p2p/kademlia/domain" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" "github.com/cenkalti/backoff/v4" ) diff --git a/p2p/kademlia/hashtable.go b/p2p/kademlia/hashtable.go index b50483d2..3a28baca 100644 --- a/p2p/kademlia/hashtable.go +++ b/p2p/kademlia/hashtable.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/LumeraProtocol/supernode/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" ) const ( diff --git a/p2p/kademlia/helpers/timer.go b/p2p/kademlia/helpers/timer.go index 71735a71..b172c446 100644 --- a/p2p/kademlia/helpers/timer.go +++ b/p2p/kademlia/helpers/timer.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/LumeraProtocol/supernode/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" ) // StartTimer news a timer for doing the function diff --git a/p2p/kademlia/message.go b/p2p/kademlia/message.go index 43b4578b..3dc67559 100644 --- a/p2p/kademlia/message.go +++ b/p2p/kademlia/message.go @@ -7,8 +7,8 @@ import ( "fmt" "io" - "github.com/LumeraProtocol/supernode/pkg/errors" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" ) const ( diff --git a/p2p/kademlia/network.go b/p2p/kademlia/network.go index 2263a811..50dcca86 100644 --- a/p2p/kademlia/network.go +++ b/p2p/kademlia/network.go @@ -14,13 +14,13 @@ import ( "github.com/btcsuite/btcutil/base58" json "github.com/json-iterator/go" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" "github.com/google/uuid" "go.uber.org/ratelimit" - "github.com/LumeraProtocol/supernode/pkg/errors" - "github.com/LumeraProtocol/supernode/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" "golang.org/x/sync/semaphore" "google.golang.org/grpc/credentials" ) diff --git a/p2p/kademlia/node.go b/p2p/kademlia/node.go index d9208136..e7709d7c 100644 --- a/p2p/kademlia/node.go +++ b/p2p/kademlia/node.go @@ -9,8 +9,8 @@ import ( "strings" "sync" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" ) // Node is the over-the-wire representation of a node diff --git a/p2p/kademlia/node_activity.go b/p2p/kademlia/node_activity.go index b4700667..22d42d1d 100644 --- a/p2p/kademlia/node_activity.go +++ b/p2p/kademlia/node_activity.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" ) // checkNodeActivity keeps track of active nodes - the idea here is to ping nodes periodically and mark them as inactive if they don't respond diff --git a/p2p/kademlia/redundant_data.go b/p2p/kademlia/redundant_data.go index 25adc099..52b10549 100644 --- a/p2p/kademlia/redundant_data.go +++ b/p2p/kademlia/redundant_data.go @@ -6,10 +6,10 @@ import ( "encoding/hex" "time" - "github.com/LumeraProtocol/supernode/p2p/kademlia/domain" - "github.com/LumeraProtocol/supernode/pkg/errors" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/p2p/kademlia/domain" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" ) func (s *DHT) startDisabledKeysCleanupWorker(ctx context.Context) error { diff --git a/p2p/kademlia/replication.go b/p2p/kademlia/replication.go index b0c62652..d2c4b582 100644 --- a/p2p/kademlia/replication.go +++ b/p2p/kademlia/replication.go @@ -8,9 +8,9 @@ import ( "encoding/hex" - "github.com/LumeraProtocol/supernode/p2p/kademlia/domain" - "github.com/LumeraProtocol/supernode/pkg/errors" - "github.com/LumeraProtocol/supernode/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/p2p/kademlia/domain" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" "github.com/cenkalti/backoff/v4" ) diff --git a/p2p/kademlia/rq_symbols.go b/p2p/kademlia/rq_symbols.go index 0352d7de..fbf6563d 100644 --- a/p2p/kademlia/rq_symbols.go +++ b/p2p/kademlia/rq_symbols.go @@ -6,8 +6,8 @@ import ( "sort" "time" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" ) const ( diff --git a/p2p/kademlia/store.go b/p2p/kademlia/store.go index 6febedbf..b27362d2 100644 --- a/p2p/kademlia/store.go +++ b/p2p/kademlia/store.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/LumeraProtocol/supernode/p2p/kademlia/domain" + "github.com/LumeraProtocol/supernode/v2/p2p/kademlia/domain" ) // Store is the interface for implementing the storage mechanism for the DHT diff --git a/p2p/kademlia/store/cloud.go/cloud.go b/p2p/kademlia/store/cloud.go/cloud.go index 365f0542..c33a9716 100644 --- a/p2p/kademlia/store/cloud.go/cloud.go +++ b/p2p/kademlia/store/cloud.go/cloud.go @@ -9,7 +9,7 @@ import ( "path/filepath" "sync" - "github.com/LumeraProtocol/supernode/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" "github.com/google/uuid" ) diff --git a/p2p/kademlia/store/mem/mem.go b/p2p/kademlia/store/mem/mem.go index ebaa4cf8..642bbae7 100644 --- a/p2p/kademlia/store/mem/mem.go +++ b/p2p/kademlia/store/mem/mem.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/LumeraProtocol/supernode/p2p/kademlia/domain" + "github.com/LumeraProtocol/supernode/v2/p2p/kademlia/domain" ) // Store is a simple in-memory key/value store used for unit testing diff --git a/p2p/kademlia/store/meta/meta.go b/p2p/kademlia/store/meta/meta.go index fb1679f6..fa75dc81 100644 --- a/p2p/kademlia/store/meta/meta.go +++ b/p2p/kademlia/store/meta/meta.go @@ -8,9 +8,9 @@ import ( "path" "time" - "github.com/LumeraProtocol/supernode/p2p/kademlia/domain" + "github.com/LumeraProtocol/supernode/v2/p2p/kademlia/domain" - "github.com/LumeraProtocol/supernode/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" "database/sql" diff --git a/p2p/kademlia/store/meta/meta_test.go b/p2p/kademlia/store/meta/meta_test.go index c07ffe31..52661961 100644 --- a/p2p/kademlia/store/meta/meta_test.go +++ b/p2p/kademlia/store/meta/meta_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/LumeraProtocol/supernode/p2p/kademlia/domain" + "github.com/LumeraProtocol/supernode/v2/p2p/kademlia/domain" "github.com/jmoiron/sqlx" _ "github.com/mattn/go-sqlite3" // sqlite3 driver "github.com/stretchr/testify/assert" diff --git a/p2p/kademlia/store/sqlite/meta_worker.go b/p2p/kademlia/store/sqlite/meta_worker.go index d9c7d1ad..637cf1e3 100644 --- a/p2p/kademlia/store/sqlite/meta_worker.go +++ b/p2p/kademlia/store/sqlite/meta_worker.go @@ -11,9 +11,9 @@ import ( "sync" "time" - "github.com/LumeraProtocol/supernode/p2p/kademlia/store/cloud.go" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/p2p/kademlia/store/cloud.go" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" "github.com/jmoiron/sqlx" _ "github.com/mattn/go-sqlite3" ) diff --git a/p2p/kademlia/store/sqlite/replication.go b/p2p/kademlia/store/sqlite/replication.go index c900ea54..efb12ac2 100644 --- a/p2p/kademlia/store/sqlite/replication.go +++ b/p2p/kademlia/store/sqlite/replication.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/LumeraProtocol/supernode/p2p/kademlia/domain" - "github.com/LumeraProtocol/supernode/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/p2p/kademlia/domain" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" "github.com/cenkalti/backoff/v4" "github.com/jmoiron/sqlx" ) diff --git a/p2p/kademlia/store/sqlite/sqlite.go b/p2p/kademlia/store/sqlite/sqlite.go index ec2d8482..c70cdca1 100644 --- a/p2p/kademlia/store/sqlite/sqlite.go +++ b/p2p/kademlia/store/sqlite/sqlite.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "github.com/LumeraProtocol/supernode/p2p/kademlia/store/cloud.go" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/p2p/kademlia/store/cloud.go" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" "github.com/cenkalti/backoff/v4" "github.com/jmoiron/sqlx" diff --git a/p2p/kademlia/store/sqlite/sqlite_test.go b/p2p/kademlia/store/sqlite/sqlite_test.go index 813c9dc2..ae699639 100644 --- a/p2p/kademlia/store/sqlite/sqlite_test.go +++ b/p2p/kademlia/store/sqlite/sqlite_test.go @@ -14,8 +14,8 @@ import ( "testing" "time" - "github.com/LumeraProtocol/supernode/p2p/kademlia/store/cloud.go" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/p2p/kademlia/store/cloud.go" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" "github.com/stretchr/testify/assert" ) diff --git a/p2p/p2p.go b/p2p/p2p.go index d8136105..c3822bbe 100644 --- a/p2p/p2p.go +++ b/p2p/p2p.go @@ -6,15 +6,15 @@ import ( "fmt" "time" - "github.com/LumeraProtocol/supernode/p2p/kademlia" - "github.com/LumeraProtocol/supernode/p2p/kademlia/store/cloud.go" - "github.com/LumeraProtocol/supernode/p2p/kademlia/store/meta" - "github.com/LumeraProtocol/supernode/p2p/kademlia/store/sqlite" - "github.com/LumeraProtocol/supernode/pkg/errors" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/lumera" - "github.com/LumeraProtocol/supernode/pkg/storage/rqstore" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/p2p/kademlia" + "github.com/LumeraProtocol/supernode/v2/p2p/kademlia/store/cloud.go" + "github.com/LumeraProtocol/supernode/v2/p2p/kademlia/store/meta" + "github.com/LumeraProtocol/supernode/v2/p2p/kademlia/store/sqlite" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera" + "github.com/LumeraProtocol/supernode/v2/pkg/storage/rqstore" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" "github.com/btcsuite/btcutil/base58" "github.com/cosmos/cosmos-sdk/crypto/keyring" ) diff --git a/pkg/codec/codec_mock.go b/pkg/codec/codec_mock.go index 5d3caa6f..9c3cf864 100644 --- a/pkg/codec/codec_mock.go +++ b/pkg/codec/codec_mock.go @@ -1,5 +1,10 @@ // Code generated by MockGen. DO NOT EDIT. // Source: codec.go +// +// Generated by this command: +// +// mockgen -destination=codec_mock.go -package=codec -source=codec.go +// // Package codec is a generated GoMock package. package codec @@ -15,6 +20,7 @@ import ( type MockCodec struct { ctrl *gomock.Controller recorder *MockCodecMockRecorder + isgomock struct{} } // MockCodecMockRecorder is the mock recorder for MockCodec. @@ -44,7 +50,7 @@ func (m *MockCodec) Decode(ctx context.Context, req DecodeRequest) (DecodeRespon } // Decode indicates an expected call of Decode. -func (mr *MockCodecMockRecorder) Decode(ctx, req interface{}) *gomock.Call { +func (mr *MockCodecMockRecorder) Decode(ctx, req any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Decode", reflect.TypeOf((*MockCodec)(nil).Decode), ctx, req) } @@ -59,7 +65,7 @@ func (m *MockCodec) Encode(ctx context.Context, req EncodeRequest) (EncodeRespon } // Encode indicates an expected call of Encode. -func (mr *MockCodecMockRecorder) Encode(ctx, req interface{}) *gomock.Call { +func (mr *MockCodecMockRecorder) Encode(ctx, req any) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Encode", reflect.TypeOf((*MockCodec)(nil).Encode), ctx, req) } diff --git a/pkg/codec/decode.go b/pkg/codec/decode.go index 9d82f0fd..7aae541e 100644 --- a/pkg/codec/decode.go +++ b/pkg/codec/decode.go @@ -8,7 +8,7 @@ import ( "path/filepath" raptorq "github.com/LumeraProtocol/rq-go" - "github.com/LumeraProtocol/supernode/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" ) type DecodeRequest struct { diff --git a/pkg/codec/raptorq.go b/pkg/codec/raptorq.go index 198f1103..52de1eab 100644 --- a/pkg/codec/raptorq.go +++ b/pkg/codec/raptorq.go @@ -8,7 +8,7 @@ import ( "path/filepath" raptorq "github.com/LumeraProtocol/rq-go" - "github.com/LumeraProtocol/supernode/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" ) type raptorQ struct { diff --git a/pkg/common/blocktracker/block_tracker.go b/pkg/common/blocktracker/block_tracker.go index 13a5c5fd..00f8c512 100644 --- a/pkg/common/blocktracker/block_tracker.go +++ b/pkg/common/blocktracker/block_tracker.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/LumeraProtocol/supernode/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" ) const ( diff --git a/pkg/common/task/state/state.go b/pkg/common/task/state/state.go index 794f9def..05179a85 100644 --- a/pkg/common/task/state/state.go +++ b/pkg/common/task/state/state.go @@ -7,10 +7,10 @@ import ( "sync" "time" - "github.com/LumeraProtocol/supernode/pkg/errors" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/storage/queries" - "github.com/LumeraProtocol/supernode/pkg/types" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/storage/queries" + "github.com/LumeraProtocol/supernode/v2/pkg/types" ) // State represents a state of the task. diff --git a/pkg/common/task/task.go b/pkg/common/task/task.go index bf46e44b..e4bb062a 100644 --- a/pkg/common/task/task.go +++ b/pkg/common/task/task.go @@ -6,11 +6,11 @@ import ( "context" "sync" - "github.com/LumeraProtocol/supernode/pkg/common/task/state" - "github.com/LumeraProtocol/supernode/pkg/errgroup" - "github.com/LumeraProtocol/supernode/pkg/errors" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/random" + "github.com/LumeraProtocol/supernode/v2/pkg/common/task/state" + "github.com/LumeraProtocol/supernode/v2/pkg/errgroup" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/random" ) // Task represent a worker task. diff --git a/pkg/common/task/worker.go b/pkg/common/task/worker.go index d13ef151..332cb2b3 100644 --- a/pkg/common/task/worker.go +++ b/pkg/common/task/worker.go @@ -4,8 +4,8 @@ import ( "context" "sync" - "github.com/LumeraProtocol/supernode/pkg/errgroup" - "github.com/LumeraProtocol/supernode/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/errgroup" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" ) // Worker represents a pool of the task. diff --git a/pkg/configurer/file.go b/pkg/configurer/file.go index 49fab2bc..38660d89 100644 --- a/pkg/configurer/file.go +++ b/pkg/configurer/file.go @@ -3,7 +3,7 @@ package configurer import ( "path/filepath" - "github.com/LumeraProtocol/supernode/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" "github.com/spf13/viper" ) diff --git a/pkg/dd/client.go b/pkg/dd/client.go index 8ffe4e57..f7b10c80 100644 --- a/pkg/dd/client.go +++ b/pkg/dd/client.go @@ -4,9 +4,9 @@ import ( "context" "time" - "github.com/LumeraProtocol/supernode/pkg/errors" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/random" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/random" "google.golang.org/grpc" "google.golang.org/grpc/encoding/gzip" ) diff --git a/pkg/dd/dd_server_client.go b/pkg/dd/dd_server_client.go index 83098153..5f927805 100644 --- a/pkg/dd/dd_server_client.go +++ b/pkg/dd/dd_server_client.go @@ -1,7 +1,7 @@ package dd import ( - dd "github.com/LumeraProtocol/supernode/gen/dupedetection" + dd "github.com/LumeraProtocol/supernode/v2/gen/dupedetection" ) type ddServerClientImpl struct { diff --git a/pkg/dd/image_rareness.go b/pkg/dd/image_rareness.go index 3399f9a9..d021da1b 100644 --- a/pkg/dd/image_rareness.go +++ b/pkg/dd/image_rareness.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - ddService "github.com/LumeraProtocol/supernode/gen/dupedetection" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/net" + ddService "github.com/LumeraProtocol/supernode/v2/gen/dupedetection" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/net" ) type RarenessScoreRequest struct { diff --git a/pkg/dd/status.go b/pkg/dd/status.go index 1457bc20..fc7f4d30 100644 --- a/pkg/dd/status.go +++ b/pkg/dd/status.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - ddService "github.com/LumeraProtocol/supernode/gen/dupedetection" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/net" + ddService "github.com/LumeraProtocol/supernode/v2/gen/dupedetection" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/net" ) type GetStatusRequest struct { diff --git a/pkg/errgroup/errgroup.go b/pkg/errgroup/errgroup.go index ca2b3fe8..a2e2ab22 100644 --- a/pkg/errgroup/errgroup.go +++ b/pkg/errgroup/errgroup.go @@ -4,8 +4,8 @@ import ( "context" "runtime/debug" - "github.com/LumeraProtocol/supernode/pkg/errors" - "github.com/LumeraProtocol/supernode/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" "golang.org/x/sync/errgroup" ) diff --git a/pkg/errors/error_test.go b/pkg/errors/error_test.go index f5f4daee..aebeedbb 100644 --- a/pkg/errors/error_test.go +++ b/pkg/errors/error_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/LumeraProtocol/supernode/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" "github.com/stretchr/testify/assert" ) diff --git a/pkg/keyring/keyring.go b/pkg/keyring/keyring.go index 30fddfed..88ea5ead 100644 --- a/pkg/keyring/keyring.go +++ b/pkg/keyring/keyring.go @@ -18,7 +18,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/tx/signing" "github.com/cosmos/go-bip39" - "github.com/LumeraProtocol/supernode/supernode/config" + "github.com/LumeraProtocol/supernode/v2/supernode/config" ) const ( @@ -127,7 +127,6 @@ func normaliseBackend(b string) (string, error) { } } - func GenerateMnemonic() (string, error) { entropy, err := bip39.NewEntropy(defaultEntropySize) if err != nil { diff --git a/pkg/lumera/client.go b/pkg/lumera/client.go index 7f684ffe..bac35d68 100644 --- a/pkg/lumera/client.go +++ b/pkg/lumera/client.go @@ -3,12 +3,12 @@ package lumera import ( "context" - "github.com/LumeraProtocol/supernode/pkg/lumera/modules/action" - "github.com/LumeraProtocol/supernode/pkg/lumera/modules/action_msg" - "github.com/LumeraProtocol/supernode/pkg/lumera/modules/auth" - "github.com/LumeraProtocol/supernode/pkg/lumera/modules/node" - "github.com/LumeraProtocol/supernode/pkg/lumera/modules/supernode" - "github.com/LumeraProtocol/supernode/pkg/lumera/modules/tx" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/action" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/action_msg" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/auth" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/node" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/supernode" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/tx" ) type lumeraClient struct { diff --git a/pkg/lumera/interface.go b/pkg/lumera/interface.go index c5b0725d..eba47684 100644 --- a/pkg/lumera/interface.go +++ b/pkg/lumera/interface.go @@ -4,12 +4,12 @@ package lumera import ( "context" - "github.com/LumeraProtocol/supernode/pkg/lumera/modules/action" - "github.com/LumeraProtocol/supernode/pkg/lumera/modules/action_msg" - "github.com/LumeraProtocol/supernode/pkg/lumera/modules/auth" - "github.com/LumeraProtocol/supernode/pkg/lumera/modules/node" - "github.com/LumeraProtocol/supernode/pkg/lumera/modules/supernode" - "github.com/LumeraProtocol/supernode/pkg/lumera/modules/tx" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/action" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/action_msg" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/auth" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/node" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/supernode" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/tx" ) // Client defines the main interface for interacting with Lumera blockchain diff --git a/pkg/lumera/lumera_mock.go b/pkg/lumera/lumera_mock.go index 93cf0724..25d30789 100644 --- a/pkg/lumera/lumera_mock.go +++ b/pkg/lumera/lumera_mock.go @@ -12,12 +12,12 @@ package lumera import ( reflect "reflect" - action "github.com/LumeraProtocol/supernode/pkg/lumera/modules/action" - action_msg "github.com/LumeraProtocol/supernode/pkg/lumera/modules/action_msg" - auth "github.com/LumeraProtocol/supernode/pkg/lumera/modules/auth" - node "github.com/LumeraProtocol/supernode/pkg/lumera/modules/node" - supernode "github.com/LumeraProtocol/supernode/pkg/lumera/modules/supernode" - tx "github.com/LumeraProtocol/supernode/pkg/lumera/modules/tx" + action "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/action" + action_msg "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/action_msg" + auth "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/auth" + node "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/node" + supernode "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/supernode" + tx "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/tx" gomock "go.uber.org/mock/gomock" ) diff --git a/pkg/lumera/modules/action_msg/action_msg_mock.go b/pkg/lumera/modules/action_msg/action_msg_mock.go index 0ac0368f..fbdce84e 100644 --- a/pkg/lumera/modules/action_msg/action_msg_mock.go +++ b/pkg/lumera/modules/action_msg/action_msg_mock.go @@ -55,3 +55,18 @@ func (mr *MockModuleMockRecorder) FinalizeCascadeAction(ctx, actionId, rqIdsIds mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "FinalizeCascadeAction", reflect.TypeOf((*MockModule)(nil).FinalizeCascadeAction), ctx, actionId, rqIdsIds) } + +// RequesAction mocks base method. +func (m *MockModule) RequesAction(ctx context.Context, actionType, metadata, price, expirationTime string) (*tx.BroadcastTxResponse, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "RequesAction", ctx, actionType, metadata, price, expirationTime) + ret0, _ := ret[0].(*tx.BroadcastTxResponse) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// RequesAction indicates an expected call of RequesAction. +func (mr *MockModuleMockRecorder) RequesAction(ctx, actionType, metadata, price, expirationTime any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RequesAction", reflect.TypeOf((*MockModule)(nil).RequesAction), ctx, actionType, metadata, price, expirationTime) +} diff --git a/pkg/lumera/modules/action_msg/impl.go b/pkg/lumera/modules/action_msg/impl.go index 44a07b83..4d5d8df4 100644 --- a/pkg/lumera/modules/action_msg/impl.go +++ b/pkg/lumera/modules/action_msg/impl.go @@ -5,8 +5,8 @@ import ( "fmt" actiontypes "github.com/LumeraProtocol/lumera/x/action/v1/types" - "github.com/LumeraProtocol/supernode/pkg/lumera/modules/auth" - txmod "github.com/LumeraProtocol/supernode/pkg/lumera/modules/tx" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/auth" + txmod "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/tx" "github.com/cosmos/cosmos-sdk/crypto/keyring" "github.com/cosmos/cosmos-sdk/types" sdktx "github.com/cosmos/cosmos-sdk/types/tx" diff --git a/pkg/lumera/modules/action_msg/interface.go b/pkg/lumera/modules/action_msg/interface.go index 8dae1a45..3d073e61 100644 --- a/pkg/lumera/modules/action_msg/interface.go +++ b/pkg/lumera/modules/action_msg/interface.go @@ -4,8 +4,8 @@ package action_msg import ( "context" - "github.com/LumeraProtocol/supernode/pkg/lumera/modules/auth" - "github.com/LumeraProtocol/supernode/pkg/lumera/modules/tx" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/auth" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/tx" "github.com/cosmos/cosmos-sdk/crypto/keyring" sdktx "github.com/cosmos/cosmos-sdk/types/tx" "google.golang.org/grpc" diff --git a/pkg/lumera/modules/auth/impl.go b/pkg/lumera/modules/auth/impl.go index 3eb2e18b..3597d7a9 100644 --- a/pkg/lumera/modules/auth/impl.go +++ b/pkg/lumera/modules/auth/impl.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - lumeracodec "github.com/LumeraProtocol/supernode/pkg/lumera/codec" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + lumeracodec "github.com/LumeraProtocol/supernode/v2/pkg/lumera/codec" "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "google.golang.org/grpc" diff --git a/pkg/lumera/modules/supernode/impl.go b/pkg/lumera/modules/supernode/impl.go index 42917582..3ab38d4f 100644 --- a/pkg/lumera/modules/supernode/impl.go +++ b/pkg/lumera/modules/supernode/impl.go @@ -6,7 +6,7 @@ import ( "sort" "github.com/LumeraProtocol/lumera/x/supernode/v1/types" - "github.com/LumeraProtocol/supernode/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" "google.golang.org/grpc" ) diff --git a/pkg/lumera/modules/tx/helper.go b/pkg/lumera/modules/tx/helper.go index 8249ffbd..886510e7 100644 --- a/pkg/lumera/modules/tx/helper.go +++ b/pkg/lumera/modules/tx/helper.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/LumeraProtocol/supernode/pkg/lumera/modules/auth" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/auth" "github.com/cosmos/cosmos-sdk/crypto/keyring" "github.com/cosmos/cosmos-sdk/types" sdktx "github.com/cosmos/cosmos-sdk/types/tx" diff --git a/pkg/lumera/modules/tx/impl.go b/pkg/lumera/modules/tx/impl.go index 97ee0493..f61b121b 100644 --- a/pkg/lumera/modules/tx/impl.go +++ b/pkg/lumera/modules/tx/impl.go @@ -5,8 +5,8 @@ import ( "fmt" "strconv" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - lumeracodec "github.com/LumeraProtocol/supernode/pkg/lumera/codec" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + lumeracodec "github.com/LumeraProtocol/supernode/v2/pkg/lumera/codec" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/tx" diff --git a/pkg/net/credentials/alts/conn/aes128gcm.go b/pkg/net/credentials/alts/conn/aes128gcm.go index 859996dd..455e8189 100644 --- a/pkg/net/credentials/alts/conn/aes128gcm.go +++ b/pkg/net/credentials/alts/conn/aes128gcm.go @@ -4,7 +4,7 @@ import ( "crypto/aes" "crypto/cipher" - . "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/common" + . "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/common" ) const ( diff --git a/pkg/net/credentials/alts/conn/aes128gcm_test.go b/pkg/net/credentials/alts/conn/aes128gcm_test.go index 5188a0ce..83283267 100644 --- a/pkg/net/credentials/alts/conn/aes128gcm_test.go +++ b/pkg/net/credentials/alts/conn/aes128gcm_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - . "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/common" + . "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/common" ) // cryptoTestVector is struct for a GCM test vector diff --git a/pkg/net/credentials/alts/conn/aes128gcmrekey.go b/pkg/net/credentials/alts/conn/aes128gcmrekey.go index 3d01bc93..f1777bd5 100644 --- a/pkg/net/credentials/alts/conn/aes128gcmrekey.go +++ b/pkg/net/credentials/alts/conn/aes128gcmrekey.go @@ -3,7 +3,7 @@ package conn import ( "crypto/cipher" - . "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/common" + . "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/common" ) const ( diff --git a/pkg/net/credentials/alts/conn/aes128gcmrekey_test.go b/pkg/net/credentials/alts/conn/aes128gcmrekey_test.go index 076dc170..e548209c 100644 --- a/pkg/net/credentials/alts/conn/aes128gcmrekey_test.go +++ b/pkg/net/credentials/alts/conn/aes128gcmrekey_test.go @@ -3,7 +3,7 @@ package conn import ( "testing" - . "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/common" + . "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/common" ) // getGCMCryptoPair outputs a client/server pair on aes128gcmRekey. diff --git a/pkg/net/credentials/alts/conn/common.go b/pkg/net/credentials/alts/conn/common.go index 98bf3158..94b93dcf 100644 --- a/pkg/net/credentials/alts/conn/common.go +++ b/pkg/net/credentials/alts/conn/common.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - altscommon "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/common" + altscommon "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/common" ) const ( diff --git a/pkg/net/credentials/alts/conn/counter_test.go b/pkg/net/credentials/alts/conn/counter_test.go index c5a9c26d..3ba1a4d3 100644 --- a/pkg/net/credentials/alts/conn/counter_test.go +++ b/pkg/net/credentials/alts/conn/counter_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - . "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/common" + . "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/common" ) const ( diff --git a/pkg/net/credentials/alts/conn/record.go b/pkg/net/credentials/alts/conn/record.go index af97d3df..270539d9 100644 --- a/pkg/net/credentials/alts/conn/record.go +++ b/pkg/net/credentials/alts/conn/record.go @@ -8,7 +8,7 @@ import ( "math" "net" - . "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/common" + . "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/common" ) const ( diff --git a/pkg/net/credentials/alts/conn/record_test.go b/pkg/net/credentials/alts/conn/record_test.go index 38ee321a..a2e8ba43 100644 --- a/pkg/net/credentials/alts/conn/record_test.go +++ b/pkg/net/credentials/alts/conn/record_test.go @@ -10,8 +10,8 @@ import ( "reflect" "testing" - . "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/common" - "github.com/LumeraProtocol/supernode/pkg/net/grpc/grpctest" + . "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/common" + "github.com/LumeraProtocol/supernode/v2/pkg/net/grpc/grpctest" ) type s struct { diff --git a/pkg/net/credentials/alts/conn/register.go b/pkg/net/credentials/alts/conn/register.go index a6e8f7c5..d6a4f33f 100644 --- a/pkg/net/credentials/alts/conn/register.go +++ b/pkg/net/credentials/alts/conn/register.go @@ -1,7 +1,7 @@ package conn import ( - . "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/common" + . "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/common" "sync" ) diff --git a/pkg/net/credentials/alts/conn/utils.go b/pkg/net/credentials/alts/conn/utils.go index 133e67d4..a1495223 100644 --- a/pkg/net/credentials/alts/conn/utils.go +++ b/pkg/net/credentials/alts/conn/utils.go @@ -1,7 +1,7 @@ package conn import ( - . "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/common" + . "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/common" ) // NewOutCounter returns an outgoing counter initialized to the starting sequence diff --git a/pkg/net/credentials/alts/conn/xchacha20poly1305.go b/pkg/net/credentials/alts/conn/xchacha20poly1305.go index 6e414596..d2a17486 100644 --- a/pkg/net/credentials/alts/conn/xchacha20poly1305.go +++ b/pkg/net/credentials/alts/conn/xchacha20poly1305.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" "golang.org/x/crypto/chacha20poly1305" - . "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/common" + . "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/common" ) const ( diff --git a/pkg/net/credentials/alts/conn/xchacha20poly1305_test.go b/pkg/net/credentials/alts/conn/xchacha20poly1305_test.go index ee40fb3f..3ba604c6 100644 --- a/pkg/net/credentials/alts/conn/xchacha20poly1305_test.go +++ b/pkg/net/credentials/alts/conn/xchacha20poly1305_test.go @@ -6,7 +6,7 @@ import ( "golang.org/x/crypto/chacha20poly1305" - . "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/common" + . "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/common" ) // getChaCha20Poly1305RekeyCryptoPair outputs a client/server pair on xchacha20poly1305ietfReKey. diff --git a/pkg/net/credentials/alts/handshake/common.go b/pkg/net/credentials/alts/handshake/common.go index bc4f8249..a80372bb 100644 --- a/pkg/net/credentials/alts/handshake/common.go +++ b/pkg/net/credentials/alts/handshake/common.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/credentials" "github.com/LumeraProtocol/lumera/x/lumeraid/securekeyx" - . "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/common" + . "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/common" ) // AuthInfo holds the result of ALTS handshaking diff --git a/pkg/net/credentials/alts/handshake/common_test.go b/pkg/net/credentials/alts/handshake/common_test.go index 735b7a8d..aeef3f70 100644 --- a/pkg/net/credentials/alts/handshake/common_test.go +++ b/pkg/net/credentials/alts/handshake/common_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/LumeraProtocol/lumera/x/lumeraid/securekeyx" - . "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/common" + . "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/common" "github.com/stretchr/testify/assert" ) diff --git a/pkg/net/credentials/alts/handshake/handshake.go b/pkg/net/credentials/alts/handshake/handshake.go index b7b8a9b5..546d58da 100644 --- a/pkg/net/credentials/alts/handshake/handshake.go +++ b/pkg/net/credentials/alts/handshake/handshake.go @@ -11,8 +11,8 @@ import ( "google.golang.org/grpc/credentials" "github.com/LumeraProtocol/lumera/x/lumeraid/securekeyx" - . "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/common" - . "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/conn" + . "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/common" + . "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/conn" ) const ( diff --git a/pkg/net/credentials/alts/handshake/handshake_test.go b/pkg/net/credentials/alts/handshake/handshake_test.go index 5b4db595..bc3369a0 100644 --- a/pkg/net/credentials/alts/handshake/handshake_test.go +++ b/pkg/net/credentials/alts/handshake/handshake_test.go @@ -18,10 +18,10 @@ import ( "github.com/LumeraProtocol/lumera/x/lumeraid/securekeyx" lumeraidtypes "github.com/LumeraProtocol/lumera/x/lumeraid/types" sntypes "github.com/LumeraProtocol/lumera/x/supernode/v1/types" - . "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/common" - "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/conn" - "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/testutil" - . "github.com/LumeraProtocol/supernode/pkg/testutil" + . "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/common" + "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/conn" + "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/testutil" + . "github.com/LumeraProtocol/supernode/v2/pkg/testutil" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" ) diff --git a/pkg/net/credentials/alts/testutil/fake_handshaker.go b/pkg/net/credentials/alts/testutil/fake_handshaker.go index 3995b478..17f23653 100644 --- a/pkg/net/credentials/alts/testutil/fake_handshaker.go +++ b/pkg/net/credentials/alts/testutil/fake_handshaker.go @@ -7,7 +7,7 @@ import ( "time" lumeraidtypes "github.com/LumeraProtocol/lumera/x/lumeraid/types" - . "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/common" + . "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/common" "github.com/cosmos/gogoproto/proto" ) diff --git a/pkg/net/credentials/alts/testutil/testutil.go b/pkg/net/credentials/alts/testutil/testutil.go index 9781c236..c27dd09e 100644 --- a/pkg/net/credentials/alts/testutil/testutil.go +++ b/pkg/net/credentials/alts/testutil/testutil.go @@ -7,7 +7,7 @@ import ( "sync/atomic" "time" - . "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/common" + . "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/common" ) // Stats is used to collect statistics about concurrent handshake calls. diff --git a/pkg/net/credentials/lumeratc.go b/pkg/net/credentials/lumeratc.go index a71c1a05..71e1bc36 100644 --- a/pkg/net/credentials/lumeratc.go +++ b/pkg/net/credentials/lumeratc.go @@ -11,9 +11,9 @@ import ( "google.golang.org/grpc/credentials" "github.com/LumeraProtocol/lumera/x/lumeraid/securekeyx" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - . "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/common" - "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/handshake" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + . "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/common" + "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/handshake" ) const RemoteIdentityKey = "remoteIdentity" diff --git a/pkg/net/grpc/client/client.go b/pkg/net/grpc/client/client.go index 37862f18..dc4f45de 100644 --- a/pkg/net/grpc/client/client.go +++ b/pkg/net/grpc/client/client.go @@ -15,9 +15,9 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/keepalive" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - ltc "github.com/LumeraProtocol/supernode/pkg/net/credentials" - "github.com/LumeraProtocol/supernode/pkg/random" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + ltc "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials" + "github.com/LumeraProtocol/supernode/v2/pkg/random" ) const ( diff --git a/pkg/net/grpc/grpctest/grpctest.go b/pkg/net/grpc/grpctest/grpctest.go index 3ef275ba..6147e6e4 100644 --- a/pkg/net/grpc/grpctest/grpctest.go +++ b/pkg/net/grpc/grpctest/grpctest.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/LumeraProtocol/supernode/pkg/net/grpc/internal/leakcheck" + "github.com/LumeraProtocol/supernode/v2/pkg/net/grpc/internal/leakcheck" ) var lcFailed uint32 diff --git a/pkg/net/grpc/internal/leakcheck/leakcheck.go b/pkg/net/grpc/internal/leakcheck/leakcheck.go index 04e9b336..4fa89969 100644 --- a/pkg/net/grpc/internal/leakcheck/leakcheck.go +++ b/pkg/net/grpc/internal/leakcheck/leakcheck.go @@ -16,8 +16,8 @@ import ( "sync/atomic" "time" - "github.com/LumeraProtocol/supernode/pkg/net/grpc/internal" - "github.com/LumeraProtocol/supernode/pkg/net/grpc/mem" + "github.com/LumeraProtocol/supernode/v2/pkg/net/grpc/internal" + "github.com/LumeraProtocol/supernode/v2/pkg/net/grpc/mem" ) // failTestsOnLeakedBuffers is a special flag that will cause tests to fail if diff --git a/pkg/net/grpc/mem/buffer_pool.go b/pkg/net/grpc/mem/buffer_pool.go index 72d3c906..4c0ef2e6 100644 --- a/pkg/net/grpc/mem/buffer_pool.go +++ b/pkg/net/grpc/mem/buffer_pool.go @@ -4,7 +4,7 @@ import ( "sort" "sync" - "github.com/LumeraProtocol/supernode/pkg/net/grpc/internal" + "github.com/LumeraProtocol/supernode/v2/pkg/net/grpc/internal" ) var bufferPoolingThreshold = 1 << 10 diff --git a/pkg/net/grpc/server/server.go b/pkg/net/grpc/server/server.go index 55d946a2..10a2452c 100644 --- a/pkg/net/grpc/server/server.go +++ b/pkg/net/grpc/server/server.go @@ -16,8 +16,8 @@ import ( "google.golang.org/grpc/keepalive" "google.golang.org/grpc/reflection" - "github.com/LumeraProtocol/supernode/pkg/errors" - "github.com/LumeraProtocol/supernode/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" ) const ( diff --git a/pkg/net/grpc/server/server_test.go b/pkg/net/grpc/server/server_test.go index 8a75e013..4c6067e0 100644 --- a/pkg/net/grpc/server/server_test.go +++ b/pkg/net/grpc/server/server_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/LumeraProtocol/supernode/pkg/testutil" + "github.com/LumeraProtocol/supernode/v2/pkg/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" diff --git a/pkg/net/interceptor.go b/pkg/net/interceptor.go index 4036b2c1..f29d88a1 100644 --- a/pkg/net/interceptor.go +++ b/pkg/net/interceptor.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/metadata" - "github.com/LumeraProtocol/supernode/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" ) // UnaryServerInterceptor injects a correlation ID into the context for gRPC requests diff --git a/pkg/random/random.go b/pkg/random/random.go index e7f5f8b1..fdfe36e5 100644 --- a/pkg/random/random.go +++ b/pkg/random/random.go @@ -6,7 +6,7 @@ import ( "crypto/rand" "math/big" - "github.com/LumeraProtocol/supernode/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" ) // Character sets that you can use when passing into String diff --git a/pkg/raptorq/helper.go b/pkg/raptorq/helper.go index 5a927de8..ea36b1ab 100644 --- a/pkg/raptorq/helper.go +++ b/pkg/raptorq/helper.go @@ -3,8 +3,8 @@ package raptorq import ( "bytes" "context" - "github.com/LumeraProtocol/supernode/pkg/errors" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" "github.com/cosmos/btcutil/base58" "strconv" ) diff --git a/pkg/storage/file_storage_interface.go b/pkg/storage/file_storage_interface.go index faa1b0ca..6585072e 100644 --- a/pkg/storage/file_storage_interface.go +++ b/pkg/storage/file_storage_interface.go @@ -6,7 +6,7 @@ package storage import ( "io" - "github.com/LumeraProtocol/supernode/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" ) var ( diff --git a/pkg/storage/files/file.go b/pkg/storage/files/file.go index 4a78cdd3..1bfc1351 100644 --- a/pkg/storage/files/file.go +++ b/pkg/storage/files/file.go @@ -14,9 +14,9 @@ import ( "sync" "time" - "github.com/LumeraProtocol/supernode/pkg/errors" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/storage" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/storage" "github.com/disintegration/imaging" "github.com/kolesa-team/go-webp/decoder" diff --git a/pkg/storage/files/format.go b/pkg/storage/files/format.go index 5a54fc23..66536d07 100644 --- a/pkg/storage/files/format.go +++ b/pkg/storage/files/format.go @@ -1,7 +1,7 @@ package files import ( - "github.com/LumeraProtocol/supernode/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" ) // ErrUnsupportedFormat means the given image format is not supported. diff --git a/pkg/storage/files/storage.go b/pkg/storage/files/storage.go index 9ce1d4e7..a1c34132 100644 --- a/pkg/storage/files/storage.go +++ b/pkg/storage/files/storage.go @@ -5,9 +5,9 @@ import ( "fmt" "sync/atomic" - "github.com/LumeraProtocol/supernode/pkg/errors" - "github.com/LumeraProtocol/supernode/pkg/random" - "github.com/LumeraProtocol/supernode/pkg/storage" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/random" + "github.com/LumeraProtocol/supernode/v2/pkg/storage" ) // Storage represents a file storage. diff --git a/pkg/storage/files/storage_test.go b/pkg/storage/files/storage_test.go index 43087f95..4e2900d9 100644 --- a/pkg/storage/files/storage_test.go +++ b/pkg/storage/files/storage_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "testing" - "github.com/LumeraProtocol/supernode/pkg/storage/fs" + "github.com/LumeraProtocol/supernode/v2/pkg/storage/fs" "github.com/stretchr/testify/assert" ) diff --git a/pkg/storage/fs/file.go b/pkg/storage/fs/file.go index b400fe4c..7e0ad8f3 100644 --- a/pkg/storage/fs/file.go +++ b/pkg/storage/fs/file.go @@ -5,9 +5,9 @@ import ( "os" "path/filepath" - "github.com/LumeraProtocol/supernode/pkg/errors" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/storage" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/storage" ) const ( diff --git a/pkg/storage/fs/file_test.go b/pkg/storage/fs/file_test.go index 955e590f..36cd4340 100644 --- a/pkg/storage/fs/file_test.go +++ b/pkg/storage/fs/file_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/LumeraProtocol/supernode/pkg/storage" + "github.com/LumeraProtocol/supernode/v2/pkg/storage" "github.com/stretchr/testify/assert" ) diff --git a/pkg/storage/keyvalue_interface.go b/pkg/storage/keyvalue_interface.go index f14bbe09..710030b0 100644 --- a/pkg/storage/keyvalue_interface.go +++ b/pkg/storage/keyvalue_interface.go @@ -5,7 +5,7 @@ package storage import ( "time" - "github.com/LumeraProtocol/supernode/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" ) var ( diff --git a/pkg/storage/memory/keyvalue.go b/pkg/storage/memory/keyvalue.go index f2abfca2..cd30d88f 100644 --- a/pkg/storage/memory/keyvalue.go +++ b/pkg/storage/memory/keyvalue.go @@ -4,7 +4,7 @@ import ( "errors" "time" - "github.com/LumeraProtocol/supernode/pkg/storage" + "github.com/LumeraProtocol/supernode/v2/pkg/storage" cache "github.com/patrickmn/go-cache" ) diff --git a/pkg/storage/memory/keyvalue_test.go b/pkg/storage/memory/keyvalue_test.go index d63deab7..b700b1c8 100644 --- a/pkg/storage/memory/keyvalue_test.go +++ b/pkg/storage/memory/keyvalue_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/LumeraProtocol/supernode/pkg/storage" + "github.com/LumeraProtocol/supernode/v2/pkg/storage" cache "github.com/patrickmn/go-cache" "github.com/stretchr/testify/assert" ) diff --git a/pkg/storage/queries/health_check.go b/pkg/storage/queries/health_check.go index 1a3f4f1c..e76799da 100644 --- a/pkg/storage/queries/health_check.go +++ b/pkg/storage/queries/health_check.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/types" - "github.com/LumeraProtocol/supernode/pkg/utils/metrics" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/types" + "github.com/LumeraProtocol/supernode/v2/pkg/utils/metrics" json "github.com/json-iterator/go" ) diff --git a/pkg/storage/queries/ping_history.go b/pkg/storage/queries/ping_history.go index 84bfc6e0..fc7d8e56 100644 --- a/pkg/storage/queries/ping_history.go +++ b/pkg/storage/queries/ping_history.go @@ -3,7 +3,7 @@ package queries import ( "time" - "github.com/LumeraProtocol/supernode/pkg/types" + "github.com/LumeraProtocol/supernode/v2/pkg/types" ) type PingHistoryQueries interface { diff --git a/pkg/storage/queries/self_healing.go b/pkg/storage/queries/self_healing.go index ccb25673..47145a0b 100644 --- a/pkg/storage/queries/self_healing.go +++ b/pkg/storage/queries/self_healing.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/types" - "github.com/LumeraProtocol/supernode/pkg/utils/metrics" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/types" + "github.com/LumeraProtocol/supernode/v2/pkg/utils/metrics" json "github.com/json-iterator/go" ) diff --git a/pkg/storage/queries/sqlite.go b/pkg/storage/queries/sqlite.go index 10ecce79..80023623 100644 --- a/pkg/storage/queries/sqlite.go +++ b/pkg/storage/queries/sqlite.go @@ -5,8 +5,8 @@ import ( "fmt" "path/filepath" - "github.com/LumeraProtocol/supernode/pkg/configurer" - "github.com/LumeraProtocol/supernode/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/configurer" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" "github.com/jmoiron/sqlx" _ "github.com/mattn/go-sqlite3" //go-sqlite3 ) diff --git a/pkg/storage/queries/storage_challenge.go b/pkg/storage/queries/storage_challenge.go index cc1aa4ee..574e7f4f 100644 --- a/pkg/storage/queries/storage_challenge.go +++ b/pkg/storage/queries/storage_challenge.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/types" - "github.com/LumeraProtocol/supernode/pkg/utils/metrics" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/types" + "github.com/LumeraProtocol/supernode/v2/pkg/utils/metrics" json "github.com/json-iterator/go" ) diff --git a/pkg/storage/queries/task_history.go b/pkg/storage/queries/task_history.go index 181539cc..73a55ef8 100644 --- a/pkg/storage/queries/task_history.go +++ b/pkg/storage/queries/task_history.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/types" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/types" json "github.com/json-iterator/go" ) diff --git a/pkg/testutil/lumera.go b/pkg/testutil/lumera.go index d56ecc49..c179c5fd 100644 --- a/pkg/testutil/lumera.go +++ b/pkg/testutil/lumera.go @@ -5,13 +5,13 @@ import ( "github.com/LumeraProtocol/lumera/x/action/v1/types" supernodeTypes "github.com/LumeraProtocol/lumera/x/supernode/v1/types" - "github.com/LumeraProtocol/supernode/pkg/lumera" - "github.com/LumeraProtocol/supernode/pkg/lumera/modules/action" - "github.com/LumeraProtocol/supernode/pkg/lumera/modules/action_msg" - "github.com/LumeraProtocol/supernode/pkg/lumera/modules/auth" - "github.com/LumeraProtocol/supernode/pkg/lumera/modules/node" - "github.com/LumeraProtocol/supernode/pkg/lumera/modules/supernode" - "github.com/LumeraProtocol/supernode/pkg/lumera/modules/tx" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/action" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/action_msg" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/auth" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/node" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/supernode" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/tx" cmtservice "github.com/cosmos/cosmos-sdk/client/grpc/cmtservice" "github.com/cosmos/cosmos-sdk/crypto/keyring" diff --git a/pkg/types/healthcheck_challenge.go b/pkg/types/healthcheck_challenge.go index 71b208a7..740a9428 100644 --- a/pkg/types/healthcheck_challenge.go +++ b/pkg/types/healthcheck_challenge.go @@ -4,7 +4,7 @@ import ( "encoding/json" "time" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" ) // HealthCheckMessageType represents the type of message sent in the health-check process diff --git a/pkg/types/self_healing.go b/pkg/types/self_healing.go index c30ade41..dfd8db70 100644 --- a/pkg/types/self_healing.go +++ b/pkg/types/self_healing.go @@ -5,7 +5,7 @@ import ( "encoding/json" "time" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" ) // SelfHealingMessageType represents the type of message sent in the self-healing process diff --git a/pkg/types/storage_challenge.go b/pkg/types/storage_challenge.go index 49008480..79f572ac 100644 --- a/pkg/types/storage_challenge.go +++ b/pkg/types/storage_challenge.go @@ -4,8 +4,8 @@ import ( "encoding/json" "time" - "github.com/LumeraProtocol/supernode/pkg/errors" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" ) // MessageType represents the type of message diff --git a/pkg/types/types.go b/pkg/types/types.go index cb44642d..b8bcb32a 100644 --- a/pkg/types/types.go +++ b/pkg/types/types.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/LumeraProtocol/supernode/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" json "github.com/json-iterator/go" ) diff --git a/pkg/utils/healthcheckchallenge/health_check_challenge.go b/pkg/utils/healthcheckchallenge/health_check_challenge.go index 733b7a09..acca1589 100644 --- a/pkg/utils/healthcheckchallenge/health_check_challenge.go +++ b/pkg/utils/healthcheckchallenge/health_check_challenge.go @@ -3,7 +3,7 @@ package storagechallenge import ( "encoding/json" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" ) // HCSummaryStatsRes is the struct for metrics diff --git a/pkg/utils/metrics/metrics.go b/pkg/utils/metrics/metrics.go index f3b5215b..4f03ca81 100644 --- a/pkg/utils/metrics/metrics.go +++ b/pkg/utils/metrics/metrics.go @@ -3,7 +3,7 @@ package metrics import ( "encoding/json" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" ) // Metrics is the struct for metrics diff --git a/pkg/utils/storagechallenge/storage_challenge.go b/pkg/utils/storagechallenge/storage_challenge.go index e44df4ed..50e9b289 100644 --- a/pkg/utils/storagechallenge/storage_challenge.go +++ b/pkg/utils/storagechallenge/storage_challenge.go @@ -3,7 +3,7 @@ package storagechallenge import ( "encoding/json" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" ) // SCSummaryStatsRes is the struct for metrics diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index 6a492eed..541b99a6 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -25,7 +25,7 @@ import ( "lukechampine.com/blake3" - "github.com/LumeraProtocol/supernode/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" "golang.org/x/sync/semaphore" "github.com/klauspost/compress/zstd" diff --git a/proto/dupedetection/dd-server.proto b/proto/dupedetection/dd-server.proto index fad25919..0217aece 100644 --- a/proto/dupedetection/dd-server.proto +++ b/proto/dupedetection/dd-server.proto @@ -4,7 +4,7 @@ syntax = "proto3"; -option go_package = "github.com/LumeraProtocol/supernode/gen/dupedetection"; +option go_package = "github.com/LumeraProtocol/supernode/v2/gen/dupedetection"; package dupedetection; diff --git a/proto/raptorq/raptorq.proto b/proto/raptorq/raptorq.proto index 6ca45e5a..07db9baa 100644 --- a/proto/raptorq/raptorq.proto +++ b/proto/raptorq/raptorq.proto @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. syntax = "proto3"; -option go_package = "github.com/LumeraProtocol/supernode/gen/raptorq"; +option go_package = "github.com/LumeraProtocol/supernode/v2/gen/raptorq"; package raptorq; diff --git a/proto/supernode/action/cascade/service.proto b/proto/supernode/action/cascade/service.proto index ad0bd47e..71f9b6ac 100644 --- a/proto/supernode/action/cascade/service.proto +++ b/proto/supernode/action/cascade/service.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package cascade; -option go_package = "github.com/LumeraProtocol/supernode/gen/supernode/action/cascade"; +option go_package = "github.com/LumeraProtocol/supernode/v2/gen/supernode/action/cascade"; service CascadeService { rpc Register (stream RegisterRequest) returns (stream RegisterResponse); diff --git a/proto/supernode/supernode.proto b/proto/supernode/supernode.proto index d0582156..17081a5f 100644 --- a/proto/supernode/supernode.proto +++ b/proto/supernode/supernode.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package supernode; -option go_package = "github.com/LumeraProtocol/supernode/gen/supernode"; +option go_package = "github.com/LumeraProtocol/supernode/v2/gen/supernode"; import "google/api/annotations.proto"; diff --git a/sdk/README.md b/sdk/README.md index 81ac0edf..c2a94f44 100644 --- a/sdk/README.md +++ b/sdk/README.md @@ -25,7 +25,7 @@ The SDK uses a structured configuration system with two main components: account ```go import ( - "github.com/LumeraProtocol/supernode/sdk/config" + "github.com/LumeraProtocol/supernode/v2/sdk/config" "github.com/cosmos/cosmos-sdk/crypto/keyring" "github.com/LumeraProtocol/lumera/x/lumeraid/securekeyx" ) @@ -105,8 +105,8 @@ The SDK requires a Cosmos SDK keyring containing your cryptographic keys for sig ```go import ( "context" - "github.com/LumeraProtocol/supernode/sdk/action" - "github.com/LumeraProtocol/supernode/sdk/config" + "github.com/LumeraProtocol/supernode/v2/sdk/action" + "github.com/LumeraProtocol/supernode/v2/sdk/config" "github.com/cosmos/cosmos-sdk/crypto/keyring" ) @@ -173,7 +173,7 @@ import ( "bytes" "encoding/base64" "lukechampine.com/blake3" - "github.com/LumeraProtocol/supernode/pkg/keyring" + "github.com/LumeraProtocol/supernode/v2/pkg/keyring" ) // 1. Read the file content diff --git a/sdk/action/client.go b/sdk/action/client.go index 43756305..16242258 100644 --- a/sdk/action/client.go +++ b/sdk/action/client.go @@ -4,13 +4,13 @@ import ( "context" "fmt" - "github.com/LumeraProtocol/supernode/sdk/adapters/lumera" - "github.com/LumeraProtocol/supernode/sdk/adapters/supernodeservice" - "github.com/LumeraProtocol/supernode/sdk/config" - "github.com/LumeraProtocol/supernode/sdk/event" - "github.com/LumeraProtocol/supernode/sdk/log" - "github.com/LumeraProtocol/supernode/sdk/net" - "github.com/LumeraProtocol/supernode/sdk/task" + "github.com/LumeraProtocol/supernode/v2/sdk/adapters/lumera" + "github.com/LumeraProtocol/supernode/v2/sdk/adapters/supernodeservice" + "github.com/LumeraProtocol/supernode/v2/sdk/config" + "github.com/LumeraProtocol/supernode/v2/sdk/event" + "github.com/LumeraProtocol/supernode/v2/sdk/log" + "github.com/LumeraProtocol/supernode/v2/sdk/net" + "github.com/LumeraProtocol/supernode/v2/sdk/task" "github.com/cosmos/cosmos-sdk/crypto/keyring" ) diff --git a/sdk/adapters/lumera/adapter.go b/sdk/adapters/lumera/adapter.go index 8da42756..f77d8213 100644 --- a/sdk/adapters/lumera/adapter.go +++ b/sdk/adapters/lumera/adapter.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "github.com/LumeraProtocol/supernode/sdk/log" + "github.com/LumeraProtocol/supernode/v2/sdk/log" actiontypes "github.com/LumeraProtocol/lumera/x/action/v1/types" sntypes "github.com/LumeraProtocol/lumera/x/supernode/v1/types" - lumeraclient "github.com/LumeraProtocol/supernode/pkg/lumera" + lumeraclient "github.com/LumeraProtocol/supernode/v2/pkg/lumera" "github.com/cosmos/cosmos-sdk/crypto/keyring" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/golang/protobuf/proto" diff --git a/sdk/adapters/supernodeservice/adapter.go b/sdk/adapters/supernodeservice/adapter.go index ea3d97ed..daa52114 100644 --- a/sdk/adapters/supernodeservice/adapter.go +++ b/sdk/adapters/supernodeservice/adapter.go @@ -7,11 +7,11 @@ import ( "os" "path/filepath" - "github.com/LumeraProtocol/supernode/gen/supernode" - "github.com/LumeraProtocol/supernode/gen/supernode/action/cascade" - "github.com/LumeraProtocol/supernode/pkg/net" - "github.com/LumeraProtocol/supernode/sdk/event" - "github.com/LumeraProtocol/supernode/sdk/log" + "github.com/LumeraProtocol/supernode/v2/gen/supernode" + "github.com/LumeraProtocol/supernode/v2/gen/supernode/action/cascade" + "github.com/LumeraProtocol/supernode/v2/pkg/net" + "github.com/LumeraProtocol/supernode/v2/sdk/event" + "github.com/LumeraProtocol/supernode/v2/sdk/log" "google.golang.org/grpc" ) diff --git a/sdk/adapters/supernodeservice/types.go b/sdk/adapters/supernodeservice/types.go index 0b2921b6..cd079603 100644 --- a/sdk/adapters/supernodeservice/types.go +++ b/sdk/adapters/supernodeservice/types.go @@ -5,7 +5,7 @@ import ( "google.golang.org/grpc" - "github.com/LumeraProtocol/supernode/sdk/event" + "github.com/LumeraProtocol/supernode/v2/sdk/event" ) type LoggerFunc func( diff --git a/sdk/adapters/supernodeservice/types_test.go b/sdk/adapters/supernodeservice/types_test.go index 359cac15..6c6ca361 100644 --- a/sdk/adapters/supernodeservice/types_test.go +++ b/sdk/adapters/supernodeservice/types_test.go @@ -3,8 +3,8 @@ package supernodeservice import ( "testing" - "github.com/LumeraProtocol/supernode/gen/supernode/action/cascade" - "github.com/LumeraProtocol/supernode/sdk/event" + "github.com/LumeraProtocol/supernode/v2/gen/supernode/action/cascade" + "github.com/LumeraProtocol/supernode/v2/sdk/event" "github.com/stretchr/testify/require" ) diff --git a/sdk/event/bus.go b/sdk/event/bus.go index 5e4a0889..a81c4c15 100644 --- a/sdk/event/bus.go +++ b/sdk/event/bus.go @@ -5,7 +5,7 @@ import ( "runtime/debug" "sync" - "github.com/LumeraProtocol/supernode/sdk/log" + "github.com/LumeraProtocol/supernode/v2/sdk/log" ) // Handler is a function that processes events diff --git a/sdk/event/types.go b/sdk/event/types.go index ab1010d2..14ae6006 100644 --- a/sdk/event/types.go +++ b/sdk/event/types.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/LumeraProtocol/supernode/sdk/adapters/lumera" + "github.com/LumeraProtocol/supernode/v2/sdk/adapters/lumera" ) // EventType represents the type of event emitted by the system diff --git a/sdk/net/client.go b/sdk/net/client.go index 6366bc5e..dc8950df 100644 --- a/sdk/net/client.go +++ b/sdk/net/client.go @@ -3,7 +3,7 @@ package net import ( "context" - "github.com/LumeraProtocol/supernode/sdk/adapters/supernodeservice" + "github.com/LumeraProtocol/supernode/v2/sdk/adapters/supernodeservice" "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/sdk/net/factory.go b/sdk/net/factory.go index 7df449bf..510d1b6b 100644 --- a/sdk/net/factory.go +++ b/sdk/net/factory.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/LumeraProtocol/lumera/x/lumeraid/securekeyx" - "github.com/LumeraProtocol/supernode/pkg/net/grpc/client" - "github.com/LumeraProtocol/supernode/sdk/adapters/lumera" - "github.com/LumeraProtocol/supernode/sdk/log" + "github.com/LumeraProtocol/supernode/v2/pkg/net/grpc/client" + "github.com/LumeraProtocol/supernode/v2/sdk/adapters/lumera" + "github.com/LumeraProtocol/supernode/v2/sdk/log" "github.com/cosmos/cosmos-sdk/crypto/keyring" ) diff --git a/sdk/net/impl.go b/sdk/net/impl.go index 98b68338..ab0f7b28 100644 --- a/sdk/net/impl.go +++ b/sdk/net/impl.go @@ -5,12 +5,12 @@ import ( "fmt" "github.com/LumeraProtocol/lumera/x/lumeraid/securekeyx" - ltc "github.com/LumeraProtocol/supernode/pkg/net/credentials" - "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/conn" - "github.com/LumeraProtocol/supernode/pkg/net/grpc/client" - "github.com/LumeraProtocol/supernode/sdk/adapters/lumera" - "github.com/LumeraProtocol/supernode/sdk/adapters/supernodeservice" - "github.com/LumeraProtocol/supernode/sdk/log" + ltc "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials" + "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/conn" + "github.com/LumeraProtocol/supernode/v2/pkg/net/grpc/client" + "github.com/LumeraProtocol/supernode/v2/sdk/adapters/lumera" + "github.com/LumeraProtocol/supernode/v2/sdk/adapters/supernodeservice" + "github.com/LumeraProtocol/supernode/v2/sdk/log" "github.com/cosmos/cosmos-sdk/crypto/keyring" "google.golang.org/grpc" diff --git a/sdk/task/cache.go b/sdk/task/cache.go index f541e548..0e144253 100644 --- a/sdk/task/cache.go +++ b/sdk/task/cache.go @@ -6,9 +6,9 @@ import ( "sync" "time" - "github.com/LumeraProtocol/supernode/sdk/event" - eventspkg "github.com/LumeraProtocol/supernode/sdk/event" - "github.com/LumeraProtocol/supernode/sdk/log" + "github.com/LumeraProtocol/supernode/v2/sdk/event" + eventspkg "github.com/LumeraProtocol/supernode/v2/sdk/event" + "github.com/LumeraProtocol/supernode/v2/sdk/log" "github.com/dgraph-io/ristretto/v2" ) diff --git a/sdk/task/cascade.go b/sdk/task/cascade.go index 8dd96fdf..11577ac2 100644 --- a/sdk/task/cascade.go +++ b/sdk/task/cascade.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - "github.com/LumeraProtocol/supernode/sdk/adapters/lumera" - "github.com/LumeraProtocol/supernode/sdk/adapters/supernodeservice" - "github.com/LumeraProtocol/supernode/sdk/event" - "github.com/LumeraProtocol/supernode/sdk/net" + "github.com/LumeraProtocol/supernode/v2/sdk/adapters/lumera" + "github.com/LumeraProtocol/supernode/v2/sdk/adapters/supernodeservice" + "github.com/LumeraProtocol/supernode/v2/sdk/event" + "github.com/LumeraProtocol/supernode/v2/sdk/net" ) const ( diff --git a/sdk/task/download.go b/sdk/task/download.go index 10d01ee9..9d405ddb 100644 --- a/sdk/task/download.go +++ b/sdk/task/download.go @@ -6,10 +6,10 @@ import ( "os" "time" - "github.com/LumeraProtocol/supernode/sdk/adapters/lumera" - "github.com/LumeraProtocol/supernode/sdk/adapters/supernodeservice" - "github.com/LumeraProtocol/supernode/sdk/event" - "github.com/LumeraProtocol/supernode/sdk/net" + "github.com/LumeraProtocol/supernode/v2/sdk/adapters/lumera" + "github.com/LumeraProtocol/supernode/v2/sdk/adapters/supernodeservice" + "github.com/LumeraProtocol/supernode/v2/sdk/event" + "github.com/LumeraProtocol/supernode/v2/sdk/net" ) // timeouts diff --git a/sdk/task/helpers.go b/sdk/task/helpers.go index 301539f8..307b8d03 100644 --- a/sdk/task/helpers.go +++ b/sdk/task/helpers.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/LumeraProtocol/supernode/sdk/adapters/lumera" + "github.com/LumeraProtocol/supernode/v2/sdk/adapters/lumera" ) const maxFileSize = 1 * 1024 * 1024 * 1024 // 1GB limit diff --git a/sdk/task/manager.go b/sdk/task/manager.go index f46478f9..751b90ae 100644 --- a/sdk/task/manager.go +++ b/sdk/task/manager.go @@ -5,11 +5,11 @@ import ( "fmt" "path" - "github.com/LumeraProtocol/supernode/sdk/adapters/lumera" - "github.com/LumeraProtocol/supernode/sdk/config" - "github.com/LumeraProtocol/supernode/sdk/event" - taskstatus "github.com/LumeraProtocol/supernode/sdk/event" - "github.com/LumeraProtocol/supernode/sdk/log" + "github.com/LumeraProtocol/supernode/v2/sdk/adapters/lumera" + "github.com/LumeraProtocol/supernode/v2/sdk/config" + "github.com/LumeraProtocol/supernode/v2/sdk/event" + taskstatus "github.com/LumeraProtocol/supernode/v2/sdk/event" + "github.com/LumeraProtocol/supernode/v2/sdk/log" "github.com/cosmos/cosmos-sdk/crypto/keyring" "github.com/google/uuid" ) diff --git a/sdk/task/task.go b/sdk/task/task.go index 9cb97939..e359c907 100644 --- a/sdk/task/task.go +++ b/sdk/task/task.go @@ -6,13 +6,13 @@ import ( "fmt" "sync" - "github.com/LumeraProtocol/supernode/pkg/errgroup" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/sdk/adapters/lumera" - "github.com/LumeraProtocol/supernode/sdk/config" - "github.com/LumeraProtocol/supernode/sdk/event" - "github.com/LumeraProtocol/supernode/sdk/log" - "github.com/LumeraProtocol/supernode/sdk/net" + "github.com/LumeraProtocol/supernode/v2/pkg/errgroup" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/sdk/adapters/lumera" + "github.com/LumeraProtocol/supernode/v2/sdk/config" + "github.com/LumeraProtocol/supernode/v2/sdk/event" + "github.com/LumeraProtocol/supernode/v2/sdk/log" + "github.com/LumeraProtocol/supernode/v2/sdk/net" "google.golang.org/grpc/health/grpc_health_v1" "github.com/cosmos/cosmos-sdk/crypto/keyring" diff --git a/sn-manager/README.md b/sn-manager/README.md index f721f25b..e9aee086 100644 --- a/sn-manager/README.md +++ b/sn-manager/README.md @@ -7,7 +7,7 @@ SuperNode Process Manager with Automatic Updates Download and install sn-manager: ```bash # Download and extract -curl -L https://github.com/LumeraProtocol/supernode/releases/latest/download/supernode-linux-amd64.tar.gz | tar -xz +curl -L https://github.com/LumeraProtocol/supernode/v2/releases/latest/download/supernode-linux-amd64.tar.gz | tar -xz # Install sn-manager only (supernode will be managed automatically) chmod +x sn-manager diff --git a/sn-manager/cmd/check.go b/sn-manager/cmd/check.go index 151431f0..c38a6c0a 100644 --- a/sn-manager/cmd/check.go +++ b/sn-manager/cmd/check.go @@ -3,9 +3,9 @@ package cmd import ( "fmt" - "github.com/LumeraProtocol/supernode/sn-manager/internal/config" - "github.com/LumeraProtocol/supernode/sn-manager/internal/github" - "github.com/LumeraProtocol/supernode/sn-manager/internal/utils" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/config" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/github" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/utils" "github.com/spf13/cobra" ) diff --git a/sn-manager/cmd/get.go b/sn-manager/cmd/get.go index a73498e2..54d3c214 100644 --- a/sn-manager/cmd/get.go +++ b/sn-manager/cmd/get.go @@ -5,9 +5,9 @@ import ( "os" "path/filepath" - "github.com/LumeraProtocol/supernode/sn-manager/internal/config" - "github.com/LumeraProtocol/supernode/sn-manager/internal/github" - "github.com/LumeraProtocol/supernode/sn-manager/internal/version" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/config" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/github" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/version" "github.com/spf13/cobra" ) diff --git a/sn-manager/cmd/helpers.go b/sn-manager/cmd/helpers.go index 0f2fe1dd..5d1b79c1 100644 --- a/sn-manager/cmd/helpers.go +++ b/sn-manager/cmd/helpers.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/LumeraProtocol/supernode/sn-manager/internal/config" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/config" ) func checkInitialized() error { diff --git a/sn-manager/cmd/init.go b/sn-manager/cmd/init.go index 40c1dbf6..07078fc9 100644 --- a/sn-manager/cmd/init.go +++ b/sn-manager/cmd/init.go @@ -8,9 +8,9 @@ import ( "strconv" "github.com/AlecAivazis/survey/v2" - "github.com/LumeraProtocol/supernode/sn-manager/internal/config" - "github.com/LumeraProtocol/supernode/sn-manager/internal/github" - "github.com/LumeraProtocol/supernode/sn-manager/internal/version" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/config" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/github" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/version" "github.com/spf13/cobra" ) diff --git a/sn-manager/cmd/ls-remote.go b/sn-manager/cmd/ls-remote.go index 7aa81c1e..985b9d45 100644 --- a/sn-manager/cmd/ls-remote.go +++ b/sn-manager/cmd/ls-remote.go @@ -3,8 +3,8 @@ package cmd import ( "fmt" - "github.com/LumeraProtocol/supernode/sn-manager/internal/config" - "github.com/LumeraProtocol/supernode/sn-manager/internal/github" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/config" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/github" "github.com/spf13/cobra" ) diff --git a/sn-manager/cmd/ls.go b/sn-manager/cmd/ls.go index 28c9c199..fb05c177 100644 --- a/sn-manager/cmd/ls.go +++ b/sn-manager/cmd/ls.go @@ -6,7 +6,7 @@ import ( "path/filepath" "sort" - "github.com/LumeraProtocol/supernode/sn-manager/internal/config" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/config" "github.com/spf13/cobra" ) diff --git a/sn-manager/cmd/start.go b/sn-manager/cmd/start.go index babf68c1..a7c3c809 100644 --- a/sn-manager/cmd/start.go +++ b/sn-manager/cmd/start.go @@ -10,11 +10,11 @@ import ( "syscall" "time" - "github.com/LumeraProtocol/supernode/sn-manager/internal/config" - "github.com/LumeraProtocol/supernode/sn-manager/internal/github" - "github.com/LumeraProtocol/supernode/sn-manager/internal/manager" - "github.com/LumeraProtocol/supernode/sn-manager/internal/updater" - "github.com/LumeraProtocol/supernode/sn-manager/internal/version" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/config" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/github" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/manager" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/updater" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/version" "github.com/spf13/cobra" ) diff --git a/sn-manager/cmd/use.go b/sn-manager/cmd/use.go index 86ec83bd..9a9f0b50 100644 --- a/sn-manager/cmd/use.go +++ b/sn-manager/cmd/use.go @@ -4,8 +4,8 @@ import ( "fmt" "path/filepath" - "github.com/LumeraProtocol/supernode/sn-manager/internal/config" - "github.com/LumeraProtocol/supernode/sn-manager/internal/version" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/config" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/version" "github.com/spf13/cobra" ) diff --git a/sn-manager/go.mod b/sn-manager/go.mod index b1726c67..762a2240 100644 --- a/sn-manager/go.mod +++ b/sn-manager/go.mod @@ -1,10 +1,10 @@ -module github.com/LumeraProtocol/supernode/sn-manager +module github.com/LumeraProtocol/supernode/v2/sn-manager go 1.24.1 require ( github.com/AlecAivazis/survey/v2 v2.3.7 - github.com/LumeraProtocol/supernode v0.0.0-00010101000000-000000000000 + github.com/LumeraProtocol/supernode/v2 v0.0.0-00010101000000-000000000000 github.com/golang/mock v1.6.0 github.com/spf13/cobra v1.8.1 github.com/stretchr/testify v1.10.0 @@ -35,4 +35,4 @@ require ( google.golang.org/protobuf v1.36.6 // indirect ) -replace github.com/LumeraProtocol/supernode => ../ +replace github.com/LumeraProtocol/supernode/v2 => ../ diff --git a/sn-manager/internal/manager/manager.go b/sn-manager/internal/manager/manager.go index cafbc06a..016221c4 100644 --- a/sn-manager/internal/manager/manager.go +++ b/sn-manager/internal/manager/manager.go @@ -11,7 +11,7 @@ import ( "syscall" "time" - "github.com/LumeraProtocol/supernode/sn-manager/internal/config" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/config" ) // Manager handles the SuperNode process lifecycle diff --git a/sn-manager/internal/updater/updater.go b/sn-manager/internal/updater/updater.go index 913fb180..0405e961 100644 --- a/sn-manager/internal/updater/updater.go +++ b/sn-manager/internal/updater/updater.go @@ -11,11 +11,11 @@ import ( "strings" "time" - "github.com/LumeraProtocol/supernode/sn-manager/internal/config" - "github.com/LumeraProtocol/supernode/sn-manager/internal/github" - "github.com/LumeraProtocol/supernode/sn-manager/internal/utils" - "github.com/LumeraProtocol/supernode/sn-manager/internal/version" - "github.com/LumeraProtocol/supernode/supernode/node/supernode/gateway" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/config" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/github" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/utils" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/version" + "github.com/LumeraProtocol/supernode/v2/supernode/node/supernode/gateway" ) type AutoUpdater struct { diff --git a/sn-manager/internal/updater/updater_test.go b/sn-manager/internal/updater/updater_test.go index b9874152..0660dc84 100644 --- a/sn-manager/internal/updater/updater_test.go +++ b/sn-manager/internal/updater/updater_test.go @@ -17,9 +17,9 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v3" - "github.com/LumeraProtocol/supernode/sn-manager/internal/config" - "github.com/LumeraProtocol/supernode/sn-manager/internal/github" - "github.com/LumeraProtocol/supernode/sn-manager/internal/version" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/config" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/github" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/version" ) // setupTestEnvironment creates isolated test environment for updater tests diff --git a/sn-manager/internal/version/manager.go b/sn-manager/internal/version/manager.go index 78b8121c..18ae8002 100644 --- a/sn-manager/internal/version/manager.go +++ b/sn-manager/internal/version/manager.go @@ -6,7 +6,7 @@ import ( "path/filepath" "sort" - "github.com/LumeraProtocol/supernode/sn-manager/internal/utils" + "github.com/LumeraProtocol/supernode/v2/sn-manager/internal/utils" ) // Manager handles version storage and symlink management diff --git a/sn-manager/main.go b/sn-manager/main.go index 899cf217..85ffe8f3 100644 --- a/sn-manager/main.go +++ b/sn-manager/main.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/LumeraProtocol/supernode/sn-manager/cmd" + "github.com/LumeraProtocol/supernode/v2/sn-manager/cmd" ) var ( diff --git a/supernode/cmd/config_update.go b/supernode/cmd/config_update.go index 80b56aa0..91807962 100644 --- a/supernode/cmd/config_update.go +++ b/supernode/cmd/config_update.go @@ -6,8 +6,8 @@ import ( "strconv" "github.com/AlecAivazis/survey/v2" - "github.com/LumeraProtocol/supernode/pkg/keyring" - "github.com/LumeraProtocol/supernode/supernode/config" + "github.com/LumeraProtocol/supernode/v2/pkg/keyring" + "github.com/LumeraProtocol/supernode/v2/supernode/config" "github.com/spf13/cobra" cKeyring "github.com/cosmos/cosmos-sdk/crypto/keyring" ) diff --git a/supernode/cmd/helpers.go b/supernode/cmd/helpers.go index 64084ae3..0d51bc45 100644 --- a/supernode/cmd/helpers.go +++ b/supernode/cmd/helpers.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/LumeraProtocol/supernode/p2p" - "github.com/LumeraProtocol/supernode/pkg/keyring" - "github.com/LumeraProtocol/supernode/supernode/config" + "github.com/LumeraProtocol/supernode/v2/p2p" + "github.com/LumeraProtocol/supernode/v2/pkg/keyring" + "github.com/LumeraProtocol/supernode/v2/supernode/config" cKeyring "github.com/cosmos/cosmos-sdk/crypto/keyring" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/supernode/cmd/init.go b/supernode/cmd/init.go index 41f99a92..6412d848 100644 --- a/supernode/cmd/init.go +++ b/supernode/cmd/init.go @@ -13,8 +13,8 @@ import ( "syscall" "github.com/AlecAivazis/survey/v2" - "github.com/LumeraProtocol/supernode/pkg/keyring" - "github.com/LumeraProtocol/supernode/supernode/config" + "github.com/LumeraProtocol/supernode/v2/pkg/keyring" + "github.com/LumeraProtocol/supernode/v2/supernode/config" consmoskeyring "github.com/cosmos/cosmos-sdk/crypto/keyring" "github.com/spf13/cobra" diff --git a/supernode/cmd/keys_recover.go b/supernode/cmd/keys_recover.go index 2b0a83fd..a01ff1e4 100644 --- a/supernode/cmd/keys_recover.go +++ b/supernode/cmd/keys_recover.go @@ -9,7 +9,7 @@ import ( "github.com/AlecAivazis/survey/v2" "github.com/spf13/cobra" - "github.com/LumeraProtocol/supernode/pkg/keyring" + "github.com/LumeraProtocol/supernode/v2/pkg/keyring" ) // keysRecoverCmd represents the recover command for recovering a key from mnemonic diff --git a/supernode/cmd/root.go b/supernode/cmd/root.go index e3a2605a..0f4b157c 100644 --- a/supernode/cmd/root.go +++ b/supernode/cmd/root.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/LumeraProtocol/supernode/supernode/config" + "github.com/LumeraProtocol/supernode/v2/supernode/config" "github.com/spf13/cobra" ) diff --git a/supernode/cmd/service.go b/supernode/cmd/service.go index 3f67b1ce..d4af1269 100644 --- a/supernode/cmd/service.go +++ b/supernode/cmd/service.go @@ -4,8 +4,8 @@ import ( "context" "reflect" - "github.com/LumeraProtocol/supernode/pkg/errgroup" - "github.com/LumeraProtocol/supernode/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/errgroup" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" ) type service interface { diff --git a/supernode/cmd/start.go b/supernode/cmd/start.go index ae533231..4e829ff3 100644 --- a/supernode/cmd/start.go +++ b/supernode/cmd/start.go @@ -8,21 +8,21 @@ import ( "path/filepath" "syscall" - "github.com/LumeraProtocol/supernode/p2p" - "github.com/LumeraProtocol/supernode/p2p/kademlia/store/cloud.go" - "github.com/LumeraProtocol/supernode/p2p/kademlia/store/sqlite" - "github.com/LumeraProtocol/supernode/pkg/codec" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/lumera" - "github.com/LumeraProtocol/supernode/pkg/storage/rqstore" - "github.com/LumeraProtocol/supernode/supernode/config" - "github.com/LumeraProtocol/supernode/supernode/node/action/server/cascade" - "github.com/LumeraProtocol/supernode/supernode/node/supernode/gateway" - "github.com/LumeraProtocol/supernode/supernode/node/supernode/server" - cascadeService "github.com/LumeraProtocol/supernode/supernode/services/cascade" - "github.com/LumeraProtocol/supernode/supernode/services/common" - supernodeService "github.com/LumeraProtocol/supernode/supernode/services/common/supernode" - "github.com/LumeraProtocol/supernode/supernode/services/verifier" + "github.com/LumeraProtocol/supernode/v2/p2p" + "github.com/LumeraProtocol/supernode/v2/p2p/kademlia/store/cloud.go" + "github.com/LumeraProtocol/supernode/v2/p2p/kademlia/store/sqlite" + "github.com/LumeraProtocol/supernode/v2/pkg/codec" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera" + "github.com/LumeraProtocol/supernode/v2/pkg/storage/rqstore" + "github.com/LumeraProtocol/supernode/v2/supernode/config" + "github.com/LumeraProtocol/supernode/v2/supernode/node/action/server/cascade" + "github.com/LumeraProtocol/supernode/v2/supernode/node/supernode/gateway" + "github.com/LumeraProtocol/supernode/v2/supernode/node/supernode/server" + cascadeService "github.com/LumeraProtocol/supernode/v2/supernode/services/cascade" + "github.com/LumeraProtocol/supernode/v2/supernode/services/common" + supernodeService "github.com/LumeraProtocol/supernode/v2/supernode/services/common/supernode" + "github.com/LumeraProtocol/supernode/v2/supernode/services/verifier" cKeyring "github.com/cosmos/cosmos-sdk/crypto/keyring" "github.com/spf13/cobra" diff --git a/supernode/cmd/supernode.go b/supernode/cmd/supernode.go index 8693d4fb..19a65718 100644 --- a/supernode/cmd/supernode.go +++ b/supernode/cmd/supernode.go @@ -5,11 +5,11 @@ import ( "fmt" "os" - "github.com/LumeraProtocol/supernode/p2p" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/lumera" - "github.com/LumeraProtocol/supernode/pkg/storage/rqstore" - "github.com/LumeraProtocol/supernode/supernode/config" + "github.com/LumeraProtocol/supernode/v2/p2p" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera" + "github.com/LumeraProtocol/supernode/v2/pkg/storage/rqstore" + "github.com/LumeraProtocol/supernode/v2/supernode/config" "github.com/cosmos/cosmos-sdk/crypto/keyring" ) diff --git a/supernode/config/config.go b/supernode/config/config.go index b8e73cd7..e3910ac2 100644 --- a/supernode/config/config.go +++ b/supernode/config/config.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/LumeraProtocol/supernode/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" "gopkg.in/yaml.v3" ) diff --git a/supernode/main.go b/supernode/main.go index 45f03fff..ffb2305f 100644 --- a/supernode/main.go +++ b/supernode/main.go @@ -1,8 +1,8 @@ package main import ( - "github.com/LumeraProtocol/supernode/pkg/keyring" - "github.com/LumeraProtocol/supernode/supernode/cmd" + "github.com/LumeraProtocol/supernode/v2/pkg/keyring" + "github.com/LumeraProtocol/supernode/v2/supernode/cmd" ) func main() { diff --git a/supernode/node/action/server/cascade/cascade_action_server.go b/supernode/node/action/server/cascade/cascade_action_server.go index 54b7cd3b..e96fa483 100644 --- a/supernode/node/action/server/cascade/cascade_action_server.go +++ b/supernode/node/action/server/cascade/cascade_action_server.go @@ -6,10 +6,10 @@ import ( "io" "os" - pb "github.com/LumeraProtocol/supernode/gen/supernode/action/cascade" - "github.com/LumeraProtocol/supernode/pkg/errors" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - cascadeService "github.com/LumeraProtocol/supernode/supernode/services/cascade" + pb "github.com/LumeraProtocol/supernode/v2/gen/supernode/action/cascade" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + cascadeService "github.com/LumeraProtocol/supernode/v2/supernode/services/cascade" "google.golang.org/grpc" ) diff --git a/supernode/node/action/server/cascade/cascade_action_server_mock.go b/supernode/node/action/server/cascade/cascade_action_server_mock.go index 1f726157..3113dcb3 100644 --- a/supernode/node/action/server/cascade/cascade_action_server_mock.go +++ b/supernode/node/action/server/cascade/cascade_action_server_mock.go @@ -4,7 +4,7 @@ import ( "context" "io" - pb "github.com/LumeraProtocol/supernode/gen/supernode/action/cascade" + pb "github.com/LumeraProtocol/supernode/v2/gen/supernode/action/cascade" "google.golang.org/grpc/metadata" ) diff --git a/supernode/node/action/server/cascade/cascade_action_server_test.go b/supernode/node/action/server/cascade/cascade_action_server_test.go index 621b6b97..eca121d8 100644 --- a/supernode/node/action/server/cascade/cascade_action_server_test.go +++ b/supernode/node/action/server/cascade/cascade_action_server_test.go @@ -5,9 +5,9 @@ import ( "errors" "testing" - pb "github.com/LumeraProtocol/supernode/gen/supernode/action/cascade" - "github.com/LumeraProtocol/supernode/supernode/services/cascade" - cascademocks "github.com/LumeraProtocol/supernode/supernode/services/cascade/mocks" + pb "github.com/LumeraProtocol/supernode/v2/gen/supernode/action/cascade" + "github.com/LumeraProtocol/supernode/v2/supernode/services/cascade" + cascademocks "github.com/LumeraProtocol/supernode/v2/supernode/services/cascade/mocks" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" diff --git a/supernode/node/action/server/cascade/helper.go b/supernode/node/action/server/cascade/helper.go index 96dbddb2..fba62100 100644 --- a/supernode/node/action/server/cascade/helper.go +++ b/supernode/node/action/server/cascade/helper.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/LumeraProtocol/supernode/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" ) func initializeHasherAndTempFile() (*blake3.Hasher, *os.File, string, error) { diff --git a/supernode/node/supernode/gateway/server.go b/supernode/node/supernode/gateway/server.go index 70036244..5440a7f4 100644 --- a/supernode/node/supernode/gateway/server.go +++ b/supernode/node/supernode/gateway/server.go @@ -10,8 +10,8 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" - pb "github.com/LumeraProtocol/supernode/gen/supernode" - "github.com/LumeraProtocol/supernode/pkg/logtrace" + pb "github.com/LumeraProtocol/supernode/v2/gen/supernode" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" ) // DefaultGatewayPort is an uncommon port for internal gateway use diff --git a/supernode/node/supernode/server/server.go b/supernode/node/supernode/server/server.go index 1672cf01..5796ced6 100644 --- a/supernode/node/supernode/server/server.go +++ b/supernode/node/supernode/server/server.go @@ -12,13 +12,13 @@ import ( healthpb "google.golang.org/grpc/health/grpc_health_v1" "github.com/LumeraProtocol/lumera/x/lumeraid/securekeyx" - "github.com/LumeraProtocol/supernode/pkg/errgroup" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/lumera" + "github.com/LumeraProtocol/supernode/v2/pkg/errgroup" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera" - ltc "github.com/LumeraProtocol/supernode/pkg/net/credentials" - "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/conn" - grpcserver "github.com/LumeraProtocol/supernode/pkg/net/grpc/server" + ltc "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials" + "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/conn" + grpcserver "github.com/LumeraProtocol/supernode/v2/pkg/net/grpc/server" "github.com/cosmos/cosmos-sdk/crypto/keyring" ) diff --git a/supernode/node/supernode/server/server_test.go b/supernode/node/supernode/server/server_test.go index 419a8cc0..7803bcce 100644 --- a/supernode/node/supernode/server/server_test.go +++ b/supernode/node/supernode/server/server_test.go @@ -3,7 +3,7 @@ package server import ( "testing" - "github.com/LumeraProtocol/supernode/pkg/lumera" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera" "github.com/stretchr/testify/assert" gomock "go.uber.org/mock/gomock" diff --git a/supernode/node/supernode/server/status_server.go b/supernode/node/supernode/server/status_server.go index 37f22b37..09122465 100644 --- a/supernode/node/supernode/server/status_server.go +++ b/supernode/node/supernode/server/status_server.go @@ -5,8 +5,8 @@ import ( "google.golang.org/grpc" - pb "github.com/LumeraProtocol/supernode/gen/supernode" - "github.com/LumeraProtocol/supernode/supernode/services/common/supernode" + pb "github.com/LumeraProtocol/supernode/v2/gen/supernode" + "github.com/LumeraProtocol/supernode/v2/supernode/services/common/supernode" ) // SupernodeServer implements the SupernodeService gRPC service @@ -33,17 +33,17 @@ func NewSupernodeServer(statusService *supernode.SupernodeStatusService) *Supern // RegisterService adds a service to the known services list func (s *SupernodeServer) RegisterService(serviceName string, desc *grpc.ServiceDesc) { methods := make([]string, 0, len(desc.Methods)+len(desc.Streams)) - + // Add unary methods for _, method := range desc.Methods { methods = append(methods, method.MethodName) } - + // Add streaming methods for _, stream := range desc.Streams { methods = append(methods, stream.StreamName) } - + s.services = append(s.services, ServiceInfo{ Name: serviceName, Methods: methods, diff --git a/supernode/node/supernode/server/status_server_test.go b/supernode/node/supernode/server/status_server_test.go index 908e0753..7b2808d7 100644 --- a/supernode/node/supernode/server/status_server_test.go +++ b/supernode/node/supernode/server/status_server_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - pb "github.com/LumeraProtocol/supernode/gen/supernode" - "github.com/LumeraProtocol/supernode/supernode/services/common" - "github.com/LumeraProtocol/supernode/supernode/services/common/supernode" + pb "github.com/LumeraProtocol/supernode/v2/gen/supernode" + "github.com/LumeraProtocol/supernode/v2/supernode/services/common" + "github.com/LumeraProtocol/supernode/v2/supernode/services/common/supernode" ) func TestSupernodeServer_GetStatus(t *testing.T) { diff --git a/supernode/services/cascade/adaptors/lumera.go b/supernode/services/cascade/adaptors/lumera.go index fa6d95c4..deeb8ef8 100644 --- a/supernode/services/cascade/adaptors/lumera.go +++ b/supernode/services/cascade/adaptors/lumera.go @@ -5,7 +5,7 @@ import ( actiontypes "github.com/LumeraProtocol/lumera/x/action/v1/types" sntypes "github.com/LumeraProtocol/lumera/x/supernode/v1/types" - "github.com/LumeraProtocol/supernode/pkg/lumera" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera" sdktx "github.com/cosmos/cosmos-sdk/types/tx" ) diff --git a/supernode/services/cascade/adaptors/mocks/p2p_mock.go b/supernode/services/cascade/adaptors/mocks/p2p_mock.go index 2b60d881..4f62a440 100644 --- a/supernode/services/cascade/adaptors/mocks/p2p_mock.go +++ b/supernode/services/cascade/adaptors/mocks/p2p_mock.go @@ -13,8 +13,8 @@ import ( context "context" reflect "reflect" - logtrace "github.com/LumeraProtocol/supernode/pkg/logtrace" - adaptors "github.com/LumeraProtocol/supernode/supernode/services/cascade/adaptors" + logtrace "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + adaptors "github.com/LumeraProtocol/supernode/v2/supernode/services/cascade/adaptors" gomock "go.uber.org/mock/gomock" ) diff --git a/supernode/services/cascade/adaptors/mocks/rq_mock.go b/supernode/services/cascade/adaptors/mocks/rq_mock.go index 37659ccf..4c53c1dd 100644 --- a/supernode/services/cascade/adaptors/mocks/rq_mock.go +++ b/supernode/services/cascade/adaptors/mocks/rq_mock.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - adaptors "github.com/LumeraProtocol/supernode/supernode/services/cascade/adaptors" + adaptors "github.com/LumeraProtocol/supernode/v2/supernode/services/cascade/adaptors" gomock "go.uber.org/mock/gomock" ) diff --git a/supernode/services/cascade/adaptors/p2p.go b/supernode/services/cascade/adaptors/p2p.go index b2e2f719..4063fa54 100644 --- a/supernode/services/cascade/adaptors/p2p.go +++ b/supernode/services/cascade/adaptors/p2p.go @@ -11,11 +11,11 @@ import ( "strings" "time" - "github.com/LumeraProtocol/supernode/p2p" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/storage/rqstore" - "github.com/LumeraProtocol/supernode/pkg/utils" - "github.com/LumeraProtocol/supernode/supernode/services/common/storage" + "github.com/LumeraProtocol/supernode/v2/p2p" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/storage/rqstore" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/supernode/services/common/storage" "github.com/pkg/errors" ) diff --git a/supernode/services/cascade/adaptors/rq.go b/supernode/services/cascade/adaptors/rq.go index 5f4670fc..5f4443cf 100644 --- a/supernode/services/cascade/adaptors/rq.go +++ b/supernode/services/cascade/adaptors/rq.go @@ -3,7 +3,7 @@ package adaptors import ( "context" - "github.com/LumeraProtocol/supernode/pkg/codec" + "github.com/LumeraProtocol/supernode/v2/pkg/codec" ) // CodecService defines the interface for RaptorQ encoding of input data. diff --git a/supernode/services/cascade/config.go b/supernode/services/cascade/config.go index c4e182ac..7a0f1ef2 100644 --- a/supernode/services/cascade/config.go +++ b/supernode/services/cascade/config.go @@ -1,7 +1,7 @@ package cascade import ( - "github.com/LumeraProtocol/supernode/supernode/services/common" + "github.com/LumeraProtocol/supernode/v2/supernode/services/common" ) // Config contains settings for the cascade service diff --git a/supernode/services/cascade/download.go b/supernode/services/cascade/download.go index f9823a00..3121e6ad 100644 --- a/supernode/services/cascade/download.go +++ b/supernode/services/cascade/download.go @@ -8,12 +8,12 @@ import ( "sort" actiontypes "github.com/LumeraProtocol/lumera/x/action/v1/types" - "github.com/LumeraProtocol/supernode/pkg/codec" - "github.com/LumeraProtocol/supernode/pkg/crypto" - "github.com/LumeraProtocol/supernode/pkg/errors" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/utils" - "github.com/LumeraProtocol/supernode/supernode/services/cascade/adaptors" + "github.com/LumeraProtocol/supernode/v2/pkg/codec" + "github.com/LumeraProtocol/supernode/v2/pkg/crypto" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/supernode/services/cascade/adaptors" ) const ( diff --git a/supernode/services/cascade/helper.go b/supernode/services/cascade/helper.go index 7047cb12..5bb9c45c 100644 --- a/supernode/services/cascade/helper.go +++ b/supernode/services/cascade/helper.go @@ -10,12 +10,12 @@ import ( "cosmossdk.io/math" actiontypes "github.com/LumeraProtocol/lumera/x/action/v1/types" - "github.com/LumeraProtocol/supernode/pkg/codec" - "github.com/LumeraProtocol/supernode/pkg/errors" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/lumera/modules/supernode" - "github.com/LumeraProtocol/supernode/pkg/utils" - "github.com/LumeraProtocol/supernode/supernode/services/cascade/adaptors" + "github.com/LumeraProtocol/supernode/v2/pkg/codec" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera/modules/supernode" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/supernode/services/cascade/adaptors" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/golang/protobuf/proto" diff --git a/supernode/services/cascade/helper_test.go b/supernode/services/cascade/helper_test.go index 1f93fac7..b22f5436 100644 --- a/supernode/services/cascade/helper_test.go +++ b/supernode/services/cascade/helper_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "testing" - "github.com/LumeraProtocol/supernode/pkg/codec" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/pkg/codec" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" "github.com/stretchr/testify/assert" ) diff --git a/supernode/services/cascade/metadata.go b/supernode/services/cascade/metadata.go index f1999cc5..5ae67c07 100644 --- a/supernode/services/cascade/metadata.go +++ b/supernode/services/cascade/metadata.go @@ -7,9 +7,9 @@ import ( "strconv" - "github.com/LumeraProtocol/supernode/pkg/codec" - "github.com/LumeraProtocol/supernode/pkg/errors" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/pkg/codec" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" "github.com/cosmos/btcutil/base58" json "github.com/json-iterator/go" ) diff --git a/supernode/services/cascade/metadata_test.go b/supernode/services/cascade/metadata_test.go index a8974bb0..48110d61 100644 --- a/supernode/services/cascade/metadata_test.go +++ b/supernode/services/cascade/metadata_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/LumeraProtocol/supernode/pkg/codec" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/pkg/codec" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" "github.com/cosmos/btcutil/base58" "github.com/stretchr/testify/assert" ) diff --git a/supernode/services/cascade/mocks/cascade_interfaces_mock.go b/supernode/services/cascade/mocks/cascade_interfaces_mock.go index 3552e517..497497c3 100644 --- a/supernode/services/cascade/mocks/cascade_interfaces_mock.go +++ b/supernode/services/cascade/mocks/cascade_interfaces_mock.go @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - cascade "github.com/LumeraProtocol/supernode/supernode/services/cascade" + cascade "github.com/LumeraProtocol/supernode/v2/supernode/services/cascade" gomock "go.uber.org/mock/gomock" ) diff --git a/supernode/services/cascade/register.go b/supernode/services/cascade/register.go index 939fded0..182d69ac 100644 --- a/supernode/services/cascade/register.go +++ b/supernode/services/cascade/register.go @@ -4,7 +4,7 @@ import ( "context" "os" - "github.com/LumeraProtocol/supernode/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" ) // RegisterRequest contains parameters for upload request diff --git a/supernode/services/cascade/register_test.go b/supernode/services/cascade/register_test.go index ab5daed1..2c236c4e 100644 --- a/supernode/services/cascade/register_test.go +++ b/supernode/services/cascade/register_test.go @@ -11,11 +11,11 @@ import ( sdkmath "cosmossdk.io/math" actiontypes "github.com/LumeraProtocol/lumera/x/action/v1/types" sntypes "github.com/LumeraProtocol/lumera/x/supernode/v1/types" - codecpkg "github.com/LumeraProtocol/supernode/pkg/codec" - "github.com/LumeraProtocol/supernode/supernode/services/cascade" - "github.com/LumeraProtocol/supernode/supernode/services/cascade/adaptors" - cascadeadaptormocks "github.com/LumeraProtocol/supernode/supernode/services/cascade/adaptors/mocks" - "github.com/LumeraProtocol/supernode/supernode/services/common" + codecpkg "github.com/LumeraProtocol/supernode/v2/pkg/codec" + "github.com/LumeraProtocol/supernode/v2/supernode/services/cascade" + "github.com/LumeraProtocol/supernode/v2/supernode/services/cascade/adaptors" + cascadeadaptormocks "github.com/LumeraProtocol/supernode/v2/supernode/services/cascade/adaptors/mocks" + "github.com/LumeraProtocol/supernode/v2/supernode/services/common" sdk "github.com/cosmos/cosmos-sdk/types" sdktx "github.com/cosmos/cosmos-sdk/types/tx" "github.com/cosmos/gogoproto/proto" diff --git a/supernode/services/cascade/service.go b/supernode/services/cascade/service.go index 8241b323..66791d87 100644 --- a/supernode/services/cascade/service.go +++ b/supernode/services/cascade/service.go @@ -3,13 +3,13 @@ package cascade import ( "context" - "github.com/LumeraProtocol/supernode/p2p" - "github.com/LumeraProtocol/supernode/pkg/codec" - "github.com/LumeraProtocol/supernode/pkg/lumera" - "github.com/LumeraProtocol/supernode/pkg/storage/rqstore" - "github.com/LumeraProtocol/supernode/supernode/services/cascade/adaptors" - "github.com/LumeraProtocol/supernode/supernode/services/common/base" - "github.com/LumeraProtocol/supernode/supernode/services/common/supernode" + "github.com/LumeraProtocol/supernode/v2/p2p" + "github.com/LumeraProtocol/supernode/v2/pkg/codec" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera" + "github.com/LumeraProtocol/supernode/v2/pkg/storage/rqstore" + "github.com/LumeraProtocol/supernode/v2/supernode/services/cascade/adaptors" + "github.com/LumeraProtocol/supernode/v2/supernode/services/common/base" + "github.com/LumeraProtocol/supernode/v2/supernode/services/common/supernode" ) type CascadeService struct { diff --git a/supernode/services/cascade/service_test.go b/supernode/services/cascade/service_test.go index b4ae93ac..eaa7bf7f 100644 --- a/supernode/services/cascade/service_test.go +++ b/supernode/services/cascade/service_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/LumeraProtocol/supernode/supernode/services/cascade" - cascadeadaptormocks "github.com/LumeraProtocol/supernode/supernode/services/cascade/adaptors/mocks" - "github.com/LumeraProtocol/supernode/supernode/services/common" + "github.com/LumeraProtocol/supernode/v2/supernode/services/cascade" + cascadeadaptormocks "github.com/LumeraProtocol/supernode/v2/supernode/services/cascade/adaptors/mocks" + "github.com/LumeraProtocol/supernode/v2/supernode/services/common" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" ) diff --git a/supernode/services/cascade/status.go b/supernode/services/cascade/status.go index 677e3efb..13cc9f9a 100644 --- a/supernode/services/cascade/status.go +++ b/supernode/services/cascade/status.go @@ -3,7 +3,7 @@ package cascade import ( "context" - "github.com/LumeraProtocol/supernode/supernode/services/common/supernode" + "github.com/LumeraProtocol/supernode/v2/supernode/services/common/supernode" ) // StatusResponse represents the status response for cascade service diff --git a/supernode/services/cascade/status_test.go b/supernode/services/cascade/status_test.go index b12d5bb4..d85f9f8f 100644 --- a/supernode/services/cascade/status_test.go +++ b/supernode/services/cascade/status_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/LumeraProtocol/supernode/supernode/services/common/base" - "github.com/LumeraProtocol/supernode/supernode/services/common/supernode" + "github.com/LumeraProtocol/supernode/v2/supernode/services/common/base" + "github.com/LumeraProtocol/supernode/v2/supernode/services/common/supernode" "github.com/stretchr/testify/assert" ) diff --git a/supernode/services/cascade/task.go b/supernode/services/cascade/task.go index 66fe663f..5dcffa34 100644 --- a/supernode/services/cascade/task.go +++ b/supernode/services/cascade/task.go @@ -3,9 +3,9 @@ package cascade import ( "context" - "github.com/LumeraProtocol/supernode/pkg/storage/files" - "github.com/LumeraProtocol/supernode/supernode/services/common/base" - "github.com/LumeraProtocol/supernode/supernode/services/common/storage" + "github.com/LumeraProtocol/supernode/v2/pkg/storage/files" + "github.com/LumeraProtocol/supernode/v2/supernode/services/common/base" + "github.com/LumeraProtocol/supernode/v2/supernode/services/common/storage" ) // CascadeRegistrationTask is the task for cascade registration diff --git a/supernode/services/common/base/supernode_service.go b/supernode/services/common/base/supernode_service.go index 524fabbe..1d41715b 100644 --- a/supernode/services/common/base/supernode_service.go +++ b/supernode/services/common/base/supernode_service.go @@ -4,11 +4,11 @@ import ( "context" "time" - "github.com/LumeraProtocol/supernode/p2p" - "github.com/LumeraProtocol/supernode/pkg/common/task" - "github.com/LumeraProtocol/supernode/pkg/errgroup" - "github.com/LumeraProtocol/supernode/pkg/errors" - "github.com/LumeraProtocol/supernode/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/p2p" + "github.com/LumeraProtocol/supernode/v2/pkg/common/task" + "github.com/LumeraProtocol/supernode/v2/pkg/errgroup" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" ) // SuperNodeServiceInterface common interface for Services diff --git a/supernode/services/common/base/supernode_task.go b/supernode/services/common/base/supernode_task.go index 3ee80f99..61ad5f1a 100644 --- a/supernode/services/common/base/supernode_task.go +++ b/supernode/services/common/base/supernode_task.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/LumeraProtocol/supernode/pkg/common/task" - "github.com/LumeraProtocol/supernode/pkg/common/task/state" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/storage/files" - "github.com/LumeraProtocol/supernode/supernode/services/common" + "github.com/LumeraProtocol/supernode/v2/pkg/common/task" + "github.com/LumeraProtocol/supernode/v2/pkg/common/task/state" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/storage/files" + "github.com/LumeraProtocol/supernode/v2/supernode/services/common" ) // TaskCleanerFunc pointer to func that removes artefacts diff --git a/supernode/services/common/storage/handler.go b/supernode/services/common/storage/handler.go index 16794fd1..2f7a6a28 100644 --- a/supernode/services/common/storage/handler.go +++ b/supernode/services/common/storage/handler.go @@ -11,12 +11,12 @@ import ( "strings" "time" - "github.com/LumeraProtocol/supernode/p2p" - "github.com/LumeraProtocol/supernode/pkg/errors" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/storage/files" - "github.com/LumeraProtocol/supernode/pkg/storage/rqstore" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/p2p" + "github.com/LumeraProtocol/supernode/v2/pkg/errors" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/storage/files" + "github.com/LumeraProtocol/supernode/v2/pkg/storage/rqstore" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" ) const ( diff --git a/supernode/services/common/storage/handler_test.go b/supernode/services/common/storage/handler_test.go index 4504e407..d418d713 100644 --- a/supernode/services/common/storage/handler_test.go +++ b/supernode/services/common/storage/handler_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/LumeraProtocol/supernode/p2p/mocks" + "github.com/LumeraProtocol/supernode/v2/p2p/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/supernode/services/common/supernode/metrics.go b/supernode/services/common/supernode/metrics.go index 09384948..6c36ab35 100644 --- a/supernode/services/common/supernode/metrics.go +++ b/supernode/services/common/supernode/metrics.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/LumeraProtocol/supernode/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" "github.com/shirou/gopsutil/v3/cpu" "github.com/shirou/gopsutil/v3/disk" "github.com/shirou/gopsutil/v3/mem" diff --git a/supernode/services/common/supernode/service.go b/supernode/services/common/supernode/service.go index 47300243..25703e94 100644 --- a/supernode/services/common/supernode/service.go +++ b/supernode/services/common/supernode/service.go @@ -5,11 +5,11 @@ import ( "fmt" "time" - "github.com/LumeraProtocol/supernode/p2p" - "github.com/LumeraProtocol/supernode/p2p/kademlia" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/lumera" - "github.com/LumeraProtocol/supernode/supernode/config" + "github.com/LumeraProtocol/supernode/v2/p2p" + "github.com/LumeraProtocol/supernode/v2/p2p/kademlia" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera" + "github.com/LumeraProtocol/supernode/v2/supernode/config" ) // Version is the supernode version, set by the main application diff --git a/supernode/services/common/supernode/service_test.go b/supernode/services/common/supernode/service_test.go index 5a3197ca..1969be2f 100644 --- a/supernode/services/common/supernode/service_test.go +++ b/supernode/services/common/supernode/service_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/LumeraProtocol/supernode/supernode/services/common" + "github.com/LumeraProtocol/supernode/v2/supernode/services/common" "github.com/stretchr/testify/assert" ) diff --git a/supernode/services/verifier/verifier.go b/supernode/services/verifier/verifier.go index b857cfc8..c52a5f2f 100644 --- a/supernode/services/verifier/verifier.go +++ b/supernode/services/verifier/verifier.go @@ -6,9 +6,9 @@ import ( "net" sntypes "github.com/LumeraProtocol/lumera/x/supernode/v1/types" - "github.com/LumeraProtocol/supernode/pkg/logtrace" - "github.com/LumeraProtocol/supernode/pkg/lumera" - "github.com/LumeraProtocol/supernode/supernode/config" + "github.com/LumeraProtocol/supernode/v2/pkg/logtrace" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera" + "github.com/LumeraProtocol/supernode/v2/supernode/config" "github.com/cosmos/cosmos-sdk/crypto/keyring" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/supernode/services/verifier/verifier_test.go b/supernode/services/verifier/verifier_test.go index 74972dc6..56fd3fb7 100644 --- a/supernode/services/verifier/verifier_test.go +++ b/supernode/services/verifier/verifier_test.go @@ -5,7 +5,7 @@ import ( "strconv" "testing" - "github.com/LumeraProtocol/supernode/supernode/config" + "github.com/LumeraProtocol/supernode/v2/supernode/config" "github.com/stretchr/testify/assert" ) diff --git a/tests/integration/p2p/p2p_integration_test.go b/tests/integration/p2p/p2p_integration_test.go index c64d396f..267949be 100644 --- a/tests/integration/p2p/p2p_integration_test.go +++ b/tests/integration/p2p/p2p_integration_test.go @@ -14,14 +14,14 @@ import ( "github.com/cosmos/btcutil/base58" "github.com/stretchr/testify/require" - "github.com/LumeraProtocol/supernode/p2p" - "github.com/LumeraProtocol/supernode/p2p/kademlia" - snkeyring "github.com/LumeraProtocol/supernode/pkg/keyring" - ltc "github.com/LumeraProtocol/supernode/pkg/net/credentials" - "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/conn" - "github.com/LumeraProtocol/supernode/pkg/storage/rqstore" - "github.com/LumeraProtocol/supernode/pkg/testutil" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/p2p" + "github.com/LumeraProtocol/supernode/v2/p2p/kademlia" + snkeyring "github.com/LumeraProtocol/supernode/v2/pkg/keyring" + ltc "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials" + "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/conn" + "github.com/LumeraProtocol/supernode/v2/pkg/storage/rqstore" + "github.com/LumeraProtocol/supernode/v2/pkg/testutil" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" ) func TestP2PBasicIntegration(t *testing.T) { diff --git a/tests/integration/securegrpc/secure_connection_test.go b/tests/integration/securegrpc/secure_connection_test.go index 7a44ccb9..c51ab222 100644 --- a/tests/integration/securegrpc/secure_connection_test.go +++ b/tests/integration/securegrpc/secure_connection_test.go @@ -21,13 +21,13 @@ import ( lumeraidmocks "github.com/LumeraProtocol/lumera/x/lumeraid/mocks" "github.com/LumeraProtocol/lumera/x/lumeraid/securekeyx" sntypes "github.com/LumeraProtocol/lumera/x/supernode/v1/types" - pb "github.com/LumeraProtocol/supernode/gen/supernode/tests/integration/securegrpc" - snkeyring "github.com/LumeraProtocol/supernode/pkg/keyring" - ltc "github.com/LumeraProtocol/supernode/pkg/net/credentials" - "github.com/LumeraProtocol/supernode/pkg/net/credentials/alts/conn" - "github.com/LumeraProtocol/supernode/pkg/net/grpc/client" - "github.com/LumeraProtocol/supernode/pkg/net/grpc/server" - "github.com/LumeraProtocol/supernode/pkg/testutil" + pb "github.com/LumeraProtocol/supernode/v2/gen/supernode/tests/integration/securegrpc" + snkeyring "github.com/LumeraProtocol/supernode/v2/pkg/keyring" + ltc "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials" + "github.com/LumeraProtocol/supernode/v2/pkg/net/credentials/alts/conn" + "github.com/LumeraProtocol/supernode/v2/pkg/net/grpc/client" + "github.com/LumeraProtocol/supernode/v2/pkg/net/grpc/server" + "github.com/LumeraProtocol/supernode/v2/pkg/testutil" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" ) diff --git a/tests/system/e2e_cascade_test.go b/tests/system/e2e_cascade_test.go index 7b94f995..e041e592 100644 --- a/tests/system/e2e_cascade_test.go +++ b/tests/system/e2e_cascade_test.go @@ -14,16 +14,16 @@ import ( "testing" "time" - "github.com/LumeraProtocol/supernode/pkg/codec" - "github.com/LumeraProtocol/supernode/pkg/keyring" - "github.com/LumeraProtocol/supernode/pkg/lumera" - "github.com/LumeraProtocol/supernode/supernode/config" + "github.com/LumeraProtocol/supernode/v2/pkg/codec" + "github.com/LumeraProtocol/supernode/v2/pkg/keyring" + "github.com/LumeraProtocol/supernode/v2/pkg/lumera" + "github.com/LumeraProtocol/supernode/v2/supernode/config" - "github.com/LumeraProtocol/supernode/sdk/action" - "github.com/LumeraProtocol/supernode/sdk/event" + "github.com/LumeraProtocol/supernode/v2/sdk/action" + "github.com/LumeraProtocol/supernode/v2/sdk/event" "github.com/LumeraProtocol/lumera/x/action/v1/types" - sdkconfig "github.com/LumeraProtocol/supernode/sdk/config" + sdkconfig "github.com/LumeraProtocol/supernode/v2/sdk/config" "github.com/stretchr/testify/require" "github.com/tidwall/gjson" diff --git a/tests/system/go.mod b/tests/system/go.mod index dc78802a..be7e7182 100644 --- a/tests/system/go.mod +++ b/tests/system/go.mod @@ -1,8 +1,8 @@ -module github.com/LumeraProtocol/supernode/tests/systemtests +module github.com/LumeraProtocol/supernode/v2/tests/systemtests go 1.24.1 -replace github.com/LumeraProtocol/supernode => ../../ +replace github.com/LumeraProtocol/supernode/v2 => ../../ require ( github.com/cosmos/cosmos-proto v1.0.0-beta.5 // indirect @@ -28,12 +28,13 @@ require ( require ( cosmossdk.io/math v1.5.3 github.com/LumeraProtocol/lumera v1.6.0 - github.com/LumeraProtocol/supernode v0.0.0-00010101000000-000000000000 + github.com/LumeraProtocol/supernode/v2 v2.0.0-00010101000000-000000000000 github.com/cometbft/cometbft v0.38.17 github.com/cosmos/btcutil v1.0.5 github.com/tidwall/gjson v1.14.2 github.com/tidwall/sjson v1.2.5 golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 + gopkg.in/yaml.v3 v3.0.1 lukechampine.com/blake3 v1.4.0 ) @@ -94,7 +95,6 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/glog v1.2.4 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/mock v1.6.0 // indirect github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect github.com/google/btree v1.1.3 // indirect github.com/google/flatbuffers v1.12.1 // indirect @@ -169,7 +169,6 @@ require ( google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20250422160041-2d3770c4ea7f // indirect google.golang.org/protobuf v1.36.6 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect gotest.tools/v3 v3.5.2 // indirect nhooyr.io/websocket v1.8.10 // indirect pgregory.net/rapid v1.2.0 // indirect diff --git a/tests/system/go.sum b/tests/system/go.sum index e5e46192..f8d3f9c5 100644 --- a/tests/system/go.sum +++ b/tests/system/go.sum @@ -803,7 +803,6 @@ github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtX github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/zeebo/errs v1.4.0 h1:XNdoD/RRMKP7HD0UhJnIzUy74ISdGGxURlYG8HSWSfM= github.com/zeebo/errs v1.4.0/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4= github.com/zondax/hid v0.9.2 h1:WCJFnEDMiqGF64nlZz28E9qLVZ0KSJ7xpc5DLEyma2U= @@ -889,7 +888,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU= golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -935,7 +933,6 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610= golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1028,7 +1025,6 @@ golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU= golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/tests/system/signature_utils.go b/tests/system/signature_utils.go index 916646ef..61a93125 100644 --- a/tests/system/signature_utils.go +++ b/tests/system/signature_utils.go @@ -7,9 +7,9 @@ import ( "fmt" "io" - "github.com/LumeraProtocol/supernode/pkg/codec" - "github.com/LumeraProtocol/supernode/pkg/keyring" - "github.com/LumeraProtocol/supernode/pkg/utils" + "github.com/LumeraProtocol/supernode/v2/pkg/codec" + "github.com/LumeraProtocol/supernode/v2/pkg/keyring" + "github.com/LumeraProtocol/supernode/v2/pkg/utils" "github.com/cosmos/btcutil/base58" cosmoskeyring "github.com/cosmos/cosmos-sdk/crypto/keyring" "lukechampine.com/blake3" From 632855963908d88be4e294453b47f559403e5c34 Mon Sep 17 00:00:00 2001 From: Matee Ullah Malik Date: Tue, 19 Aug 2025 22:24:59 +0500 Subject: [PATCH 2/2] Fixes --- cmd/sncli/cli/sn_cmds.go | 30 ++++++++++++++++++++---------- cmd/sncli/go.mod | 3 ++- cmd/sncli/go.sum | 2 -- sn-manager/go.mod | 2 +- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/cmd/sncli/cli/sn_cmds.go b/cmd/sncli/cli/sn_cmds.go index bd6dfc00..2360a69b 100644 --- a/cmd/sncli/cli/sn_cmds.go +++ b/cmd/sncli/cli/sn_cmds.go @@ -25,23 +25,33 @@ func (c *CLI) getSupernodeStatus() error { return fmt.Errorf("Get supernode status failed: %v", err) } fmt.Println("Supernode Status:") - fmt.Printf(" CPU Usage: %s, Remaining: %s\n", resp.CPU.Usage, resp.CPU.Remaining) - fmt.Printf(" Memory Total: %d, Used: %d, Available: %d, Used%%: %.2f\n", - resp.Memory.Total, resp.Memory.Used, resp.Memory.Available, resp.Memory.UsedPerc) - - if len(resp.Services) > 0 { - fmt.Println(" Services:") - for _, service := range resp.Services { + fmt.Printf(" Version: %s\n", resp.Version) + fmt.Printf(" Uptime: %d seconds\n", resp.UptimeSeconds) + fmt.Printf(" CPU Usage: %.2f%% (%d cores)\n", resp.Resources.CPU.UsagePercent, resp.Resources.CPU.Cores) + fmt.Printf(" Memory: %.2fGB used / %.2fGB total (%.2f%%)\n", + resp.Resources.Memory.UsedGB, resp.Resources.Memory.TotalGB, resp.Resources.Memory.UsagePercent) + + if len(resp.RunningTasks) > 0 { + fmt.Println(" Running Tasks:") + for _, service := range resp.RunningTasks { fmt.Printf(" - %s (Tasks: %d)\n", service.ServiceName, service.TaskCount) } } - if len(resp.AvailableServices) > 0 { - fmt.Println(" Available Services:") - for _, svc := range resp.AvailableServices { + if len(resp.RegisteredServices) > 0 { + fmt.Println(" Registered Services:") + for _, svc := range resp.RegisteredServices { fmt.Println(" -", svc) } } + fmt.Printf(" Network: %d peers connected\n", resp.Network.PeersCount) + if resp.Rank > 0 { + fmt.Printf(" Rank: %d\n", resp.Rank) + } + if resp.IPAddress != "" { + fmt.Printf(" IP Address: %s\n", resp.IPAddress) + } + return nil } diff --git a/cmd/sncli/go.mod b/cmd/sncli/go.mod index e53f2e6a..d01ee894 100644 --- a/cmd/sncli/go.mod +++ b/cmd/sncli/go.mod @@ -3,6 +3,7 @@ module github.com/LumeraProtocol/supernode/v2/cmd/sncli go 1.24.1 replace ( + github.com/LumeraProtocol/supernode/v2 => ../.. github.com/LumeraProtocol/supernode/v2/supernode => ../../supernode github.com/bytedance/sonic => github.com/bytedance/sonic v1.14.0 github.com/bytedance/sonic/loader => github.com/bytedance/sonic/loader v0.3.0 @@ -10,7 +11,7 @@ replace ( require ( github.com/BurntSushi/toml v1.4.0 - github.com/LumeraProtocol/supernode/v2 v1.7.0 + github.com/LumeraProtocol/supernode/v2 v2.0.0-00010101000000-000000000000 github.com/cosmos/cosmos-sdk v0.50.14 github.com/spf13/pflag v1.0.7 google.golang.org/grpc v1.71.0 diff --git a/cmd/sncli/go.sum b/cmd/sncli/go.sum index c0c429b2..e9023b9b 100644 --- a/cmd/sncli/go.sum +++ b/cmd/sncli/go.sum @@ -65,8 +65,6 @@ github.com/DataDog/zstd v1.5.5/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwS github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/LumeraProtocol/lumera v1.6.0 h1:5I172U/f1Migt7tRxnywhz5aRKCpBOx/IMgOzhJfTP0= github.com/LumeraProtocol/lumera v1.6.0/go.mod h1:c1M+sjewuCvxw+pznwlspUzenDJI8Y+suKB3RFKS2Wo= -github.com/LumeraProtocol/supernode/v2 v1.7.0 h1:gpnwQMeu8jZPyoSaCTXyk4Ny0obW9P48lbD15UJDPgQ= -github.com/LumeraProtocol/supernode/v2 v1.7.0/go.mod h1:lQlfCgrwAtpNH5OeXKSbRCFZrp8gKsMuhBxqzz1N+6E= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= diff --git a/sn-manager/go.mod b/sn-manager/go.mod index 762a2240..de638b50 100644 --- a/sn-manager/go.mod +++ b/sn-manager/go.mod @@ -4,7 +4,7 @@ go 1.24.1 require ( github.com/AlecAivazis/survey/v2 v2.3.7 - github.com/LumeraProtocol/supernode/v2 v0.0.0-00010101000000-000000000000 + github.com/LumeraProtocol/supernode/v2 v2.0.0-00010101000000-000000000000 github.com/golang/mock v1.6.0 github.com/spf13/cobra v1.8.1 github.com/stretchr/testify v1.10.0