feat: enhance supernode functionality and improve installation script

- Added optional parameters for Lumera binary path and installation mode in Makefile.
- Refactored GetSupernodeStatus to return a pointer type for better handling.
- Improved error handling and logging in health check and download processes.
- Implemented concurrent download attempts from supernodes for efficiency.
- Updated installation script to verify binary installation and handle different modes.
- Enhanced tests to validate supernode status and downloaded files.

Author: mateeullahmalik

Makefile

@@ -61,11 +61,16 @@ CONFIG_FILE3=tests/system/config.test-3.yml
 SETUP_SCRIPT=tests/scripts/setup-supernodes.sh
 
 # Install Lumera
+# Optional: specify lumera binary path to skip download
+LUMERAD_BINARY ?=
+# Optional: specify installation mode (latest-release, latest-tag, or vX.Y.Z)
+INSTALL_MODE ?=latest-tag
+
 install-lumera:
 	@echo "Installing Lumera..."
 	@chmod +x tests/scripts/install-lumera.sh
-	@sudo tests/scripts/install-lumera.sh latest-tag
-
+	@sudo LUMERAD_BINARY="$(LUMERAD_BINARY)" tests/scripts/install-lumera.sh $(INSTALL_MODE)
+	@echo "PtTDUHythfRfXHh63yzyiGDid4TZj2P76Zd,18749999981413" > ~/claims.csv
 # Setup supernode environments
 setup-supernodes:
 	@echo "Setting up all supernode environments..."

p2p/kademlia/bootstrap.go

@@ -3,7 +3,6 @@ package kademlia
 import (
 	"context"
 	"fmt"
-	"os"
 	"strconv"
 	"strings"
 	"sync"
@@ -34,11 +33,6 @@ func (s *DHT) parseNode(extP2P string, selfAddr string) (*Node, error) {
 		return nil, errors.New("empty address")
 	}
 
-	/*if strings.Contains(extP2P, "0.0.0.0") {
-		fmt.Println("skippping node")
-		return nil, errors.New("invalid address")
-	}*/
-
 	if extP2P == selfAddr {
 		return nil, errors.New("self address")
 	}
@@ -61,24 +55,12 @@ func (s *DHT) parseNode(extP2P string, selfAddr string) (*Node, error) {
 			if err != nil {
 				return nil, errors.New("invalid port number")
 			}
-
-			// For system testing, use port+1 if SYSTEM_TEST=true
-			if os.Getenv("SYSTEM_TEST") == "true" {
-				port = uint16(portNum) + 1
-				logtrace.Info(context.Background(), "Using port+1 for system testing", logtrace.Fields{
-					logtrace.FieldModule: "p2p",
-					"original_port":      portNum,
-					"adjusted_port":      port,
-				})
-			} else {
-				// For normal P2P operation, always use the default port
-				port = defaultNetworkPort
-			}
+			port = uint16(portNum)
 		}
 	} else {
 		// No port in the address
 		ip = extP2P
-		port = defaultNetworkPort
+		port = defaultSuperNodeP2PPort
 	}
 
 	if ip == "" {
@@ -170,21 +152,40 @@ func (s *DHT) ConfigureBootstrapNodes(ctx context.Context, bootstrapNodes string
 				continue
 			}
 
-			// Parse the node from the IP address
-			node, err := s.parseNode(latestIP, selfAddress)
+			// Extract IP from the address (remove port if present)
+			var ip string
+			if idx := strings.LastIndex(latestIP, ":"); idx != -1 {
+				ip = latestIP[:idx]
+			} else {
+				ip = latestIP
+			}
+
+			// Use p2p_port from supernode record
+			p2pPort := defaultSuperNodeP2PPort
+			if supernode.P2PPort != "" {
+				if port, err := strconv.ParseUint(supernode.P2PPort, 10, 16); err == nil {
+					p2pPort = int(port)
+				}
+			}
+
+			// Create full address with p2p port for validation
+			fullAddress := fmt.Sprintf("%s:%d", ip, p2pPort)
+
+			// Parse the node from the full address
+			node, err := s.parseNode(fullAddress, selfAddress)
 			if err != nil {
 				logtrace.Warn(ctx, "Skip Bad Bootstrap Address", logtrace.Fields{
 					logtrace.FieldModule: "p2p",
 					logtrace.FieldError:  err.Error(),
-					"address":            latestIP,
+					"address":            fullAddress,
 					"supernode":          supernode.SupernodeAccount,
 				})
 				continue
 			}
 
 			// Store the supernode account as the node ID
 			node.ID = []byte(supernode.SupernodeAccount)
-			mapNodes[latestIP] = node
+			mapNodes[fullAddress] = node
 		}
 
 		// Convert the map to a slice

sdk/action/client.go

@@ -19,17 +19,16 @@ import (
 //
 //go:generate mockery --name=Client --output=testutil/mocks --outpkg=mocks --filename=client_mock.go
 type Client interface {
-	//   - signature: Base64-encoded cryptographic signature of the file's data hash (blake3)
-	//   	1- hash(blake3)  > 2- sign > 3- base64
-	//     The signature must be created by the same account that created the Lumera action.
-	//     It must be a digital signature of the data hash found in the action's CASCADE metadata.
+	// StartCascade initiates a cascade operation with file path, action ID, and signature
+	// signature: Base64-encoded signature of file's blake3 hash by action creator
 	StartCascade(ctx context.Context, filePath string, actionID string, signature string) (string, error)
 	DeleteTask(ctx context.Context, taskID string) error
 	GetTask(ctx context.Context, taskID string) (*task.TaskEntry, bool)
 	SubscribeToEvents(ctx context.Context, eventType event.EventType, handler event.Handler) error
 	SubscribeToAllEvents(ctx context.Context, handler event.Handler) error
-	GetSupernodeStatus(ctx context.Context, supernodeAddress string) (supernodeservice.SupernodeStatusresponse, error)
-	DownloadCascade(ctx context.Context, actionID, outputPath string) (string, error)
+	GetSupernodeStatus(ctx context.Context, supernodeAddress string) (*supernodeservice.SupernodeStatusresponse, error)
+	// DownloadCascade downloads cascade to outputDir, filename determined by action ID
+	DownloadCascade(ctx context.Context, actionID, outputDir string) (string, error)
 }
 
 // ClientImpl implements the Client interface
@@ -152,7 +151,7 @@ func (c *ClientImpl) SubscribeToAllEvents(ctx context.Context, handler event.Han
 }
 
 // GetSupernodeStatus retrieves the status of a specific supernode by its address
-func (c *ClientImpl) GetSupernodeStatus(ctx context.Context, supernodeAddress string) (supernodeservice.SupernodeStatusresponse, error) {
+func (c *ClientImpl) GetSupernodeStatus(ctx context.Context, supernodeAddress string) (*supernodeservice.SupernodeStatusresponse, error) {
 	if supernodeAddress == "" {
 		c.logger.Error(ctx, "Empty supernode address provided")
 		return nil, fmt.Errorf("supernode address cannot be empty")
@@ -205,16 +204,14 @@ func (c *ClientImpl) GetSupernodeStatus(ctx context.Context, supernodeAddress st
 	c.logger.Info(ctx, "Successfully retrieved supernode status", "address", supernodeAddress)
 	return status, nil
 }
-func (c *ClientImpl) DownloadCascade(
-	ctx context.Context,
-	actionID, outputPath string,
-) (string, error) {
+
+func (c *ClientImpl) DownloadCascade(ctx context.Context, actionID, outputDir string) (string, error) {
 
 	if actionID == "" {
 		return "", fmt.Errorf("actionID is empty")
 	}
 
-	taskID, err := c.taskManager.CreateDownloadTask(ctx, actionID, outputPath)
+	taskID, err := c.taskManager.CreateDownloadTask(ctx, actionID, outputDir)
 	if err != nil {
 		return "", fmt.Errorf("create download task: %w", err)
 	}

sdk/adapters/supernodeservice/adapter.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"path/filepath"
 
 	"github.com/LumeraProtocol/supernode/gen/supernode/action/cascade"
 	"github.com/LumeraProtocol/supernode/pkg/net"
@@ -168,12 +169,12 @@ func (a *cascadeAdapter) GetSupernodeStatus(ctx context.Context) (SupernodeStatu
 	resp, err := a.client.HealthCheck(ctx, &cascade.HealthCheckRequest{})
 	if err != nil {
 		a.logger.Error(ctx, "Failed to get supernode status", "error", err)
-		return nil, fmt.Errorf("failed to get supernode status: %w", err)
+		return SupernodeStatusresponse{}, fmt.Errorf("failed to get supernode status: %w", err)
 	}
 
 	a.logger.Debug(ctx, "Supernode status retrieved", "status", resp)
 
-	return resp, nil
+	return *toSdkSupernodeStatus(resp), nil
 }
 
 // CascadeSupernodeDownload downloads a file from a supernode gRPC stream
@@ -190,16 +191,20 @@ func (a *cascadeAdapter) CascadeSupernodeDownload(
 		ActionId: in.ActionID,
 	}, opts...)
 	if err != nil {
-		a.logger.Error(ctx, "failed to create download stream",
-			"action_id", in.ActionID, "error", err)
+		a.logger.Error(ctx, "failed to create download stream", "action_id", in.ActionID, "error", err)
 		return nil, err
 	}
 
 	// 2. Prepare destination file
+	// Create directory structure if it doesn't exist
+	if err := os.MkdirAll(filepath.Dir(in.OutputPath), 0755); err != nil {
+		a.logger.Error(ctx, "failed to create output directory", "path", filepath.Dir(in.OutputPath), "error", err)
+		return nil, fmt.Errorf("create output directory: %w", err)
+	}
+
 	outFile, err := os.Create(in.OutputPath)
 	if err != nil {
-		a.logger.Error(ctx, "failed to create output file",
-			"path", in.OutputPath, "error", err)
+		a.logger.Error(ctx, "failed to create output file", "path", in.OutputPath, "error", err)
 		return nil, fmt.Errorf("create output file: %w", err)
 	}
 	defer outFile.Close()
@@ -223,10 +228,7 @@ func (a *cascadeAdapter) CascadeSupernodeDownload(
 
 		// 3a. Progress / event message
 		case *cascade.DownloadResponse_Event:
-			a.logger.Info(ctx, "supernode event",
-				"event_type", x.Event.EventType,
-				"message", x.Event.Message,
-				"action_id", in.ActionID)
+			a.logger.Info(ctx, "supernode event", "event_type", x.Event.EventType, "message", x.Event.Message, "action_id", in.ActionID)
 
 			if in.EventLogger != nil {
 				in.EventLogger(ctx, toSdkEvent(x.Event.EventType), x.Event.Message, event.EventData{
@@ -249,17 +251,11 @@ func (a *cascadeAdapter) CascadeSupernodeDownload(
 			bytesWritten += int64(len(data))
 			chunkIndex++
 
-			a.logger.Debug(ctx, "received chunk",
-				"chunk_index", chunkIndex,
-				"chunk_size", len(data),
-				"bytes_written", bytesWritten)
+			a.logger.Debug(ctx, "received chunk", "chunk_index", chunkIndex, "chunk_size", len(data), "bytes_written", bytesWritten)
 		}
 	}
 
-	a.logger.Info(ctx, "download complete",
-		"bytes_written", bytesWritten,
-		"path", in.OutputPath,
-		"action_id", in.ActionID)
+	a.logger.Info(ctx, "download complete", "bytes_written", bytesWritten, "path", in.OutputPath, "action_id", in.ActionID)
 
 	return &CascadeSupernodeDownloadResponse{
 		Success:    true,
@@ -299,3 +295,25 @@ func toSdkEvent(e cascade.SupernodeEventType) event.EventType {
 		return event.SupernodeUnknown
 	}
 }
+
+func toSdkSupernodeStatus(resp *cascade.HealthCheckResponse) *SupernodeStatusresponse {
+	result := &SupernodeStatusresponse{
+		TasksInProgress: resp.TasksInProgress,
+	}
+
+	// Convert CPU data
+	if resp.Cpu != nil {
+		result.CPU.Usage = resp.Cpu.Usage
+		result.CPU.Remaining = resp.Cpu.Remaining
+	}
+
+	// Convert Memory data
+	if resp.Memory != nil {
+		result.Memory.Total = resp.Memory.Total
+		result.Memory.Used = resp.Memory.Used
+		result.Memory.Available = resp.Memory.Available
+		result.Memory.UsedPerc = resp.Memory.UsedPerc
+	}
+
+	return result
+}

sdk/adapters/supernodeservice/types.go

@@ -3,7 +3,6 @@ package supernodeservice
 import (
 	"context"
 
-	"github.com/LumeraProtocol/supernode/gen/supernode/action/cascade"
 	"google.golang.org/grpc"
 
 	"github.com/LumeraProtocol/supernode/sdk/event"
@@ -29,7 +28,19 @@ type CascadeSupernodeRegisterResponse struct {
 	TxHash  string
 }
 
-type SupernodeStatusresponse *cascade.HealthCheckResponse
+type SupernodeStatusresponse struct {
+	CPU struct {
+		Usage     string
+		Remaining string
+	}
+	Memory struct {
+		Total     uint64
+		Used      uint64
+		Available uint64
+		UsedPerc  float64
+	}
+	TasksInProgress []string
+}
 type CascadeSupernodeDownloadRequest struct {
 	ActionID    string
 	TaskID      string

sdk/net/client.go

@@ -15,7 +15,7 @@ type SupernodeClient interface {
 	// HealthCheck performs a health check on the supernode
 	HealthCheck(ctx context.Context) (*grpc_health_v1.HealthCheckResponse, error)
 
-	GetSupernodeStatus(ctx context.Context) (supernodeservice.SupernodeStatusresponse, error)
+	GetSupernodeStatus(ctx context.Context) (*supernodeservice.SupernodeStatusresponse, error)
 	// Download downloads the cascade action file
 	Download(ctx context.Context, in *supernodeservice.CascadeSupernodeDownloadRequest, opts ...grpc.CallOption) (*supernodeservice.CascadeSupernodeDownloadResponse, error)
 

sdk/net/impl.go

@@ -129,14 +129,14 @@ func (c *supernodeClient) HealthCheck(ctx context.Context) (*grpc_health_v1.Heal
 	return resp, nil
 }
 
-func (c *supernodeClient) GetSupernodeStatus(ctx context.Context) (supernodeservice.SupernodeStatusresponse, error) {
+func (c *supernodeClient) GetSupernodeStatus(ctx context.Context) (*supernodeservice.SupernodeStatusresponse, error) {
 	resp, err := c.cascadeClient.GetSupernodeStatus(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get supernode status: %w", err)
 	}
 
 	c.logger.Debug(ctx, "Supernode status retrieved successfully")
-	return resp, nil
+	return &resp, nil
 }
 
 // Download downloads the cascade action file