Skip to content

feat: migrate to v2 module path #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mateeullahmalik merged 2 commits into from
Aug 19, 2025
Merged

feat: migrate to v2 module path #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9b551e
update V2
mateeullahmalik Aug 19, 2025
6328559
Fixes
mateeullahmalik Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build&release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand Down
14 changes: 7 additions & 7 deletions cmd/sncli/cli/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/sncli/cli/list_grpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
30 changes: 20 additions & 10 deletions cmd/sncli/cli/sn_cmds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
7 changes: 4 additions & 3 deletions cmd/sncli/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
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 => ../..
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 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
Expand Down
2 changes: 0 additions & 2 deletions cmd/sncli/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 v1.7.0 h1:gpnwQMeu8jZPyoSaCTXyk4Ny0obW9P48lbD15UJDPgQ=
github.com/LumeraProtocol/supernode 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=
Expand Down
2 changes: 1 addition & 1 deletion cmd/sncli/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/LumeraProtocol/supernode/cmd/sncli/cli"
"github.com/LumeraProtocol/supernode/v2/cmd/sncli/cli"
)

func main() {
Expand Down
6 changes: 3 additions & 3 deletions docs/packages/net/lumera_grpc.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
9 changes: 5 additions & 4 deletions gen/supernode/action/cascade/service.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions gen/supernode/supernode.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
)
Expand Down
8 changes: 4 additions & 4 deletions p2p/kademlia/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions p2p/kademlia/conn_pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
16 changes: 8 additions & 8 deletions p2p/kademlia/dht.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions p2p/kademlia/fetch_and_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion p2p/kademlia/hashtable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"sync"
"time"

"github.com/LumeraProtocol/supernode/pkg/errors"
"github.com/LumeraProtocol/supernode/v2/pkg/errors"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion p2p/kademlia/helpers/timer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions p2p/kademlia/message.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions p2p/kademlia/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions p2p/kademlia/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions p2p/kademlia/node_activity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions p2p/kademlia/redundant_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions p2p/kademlia/replication.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions p2p/kademlia/rq_symbols.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion p2p/kademlia/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion p2p/kademlia/store/cloud.go/cloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
Loading