Merge pull request #5 from LumeraProtocol/event-change

added go-sdk events, updated supernode to v2.4.10

Author: a-ok123

cascade/cascade.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"time"
+	"path/filepath"
 
 	actiontypes "github.com/LumeraProtocol/lumera/x/action/v1/types"
 	"github.com/LumeraProtocol/sdk-go/blockchain"
@@ -15,8 +16,8 @@ import (
 
 // UploadOptions configures cascade upload
 type UploadOptions struct {
-	Public   bool
-	FileName string
+	ID     string // optional custom ID for the upload
+	Public bool   // whether the uploaded file will be accessible publicly
 }
 
 // UploadOption is a functional option for Upload
@@ -29,32 +30,29 @@ func WithPublic(public bool) UploadOption {
 	}
 }
 
-// WithFileName sets a custom filename
-func WithFileName(name string) UploadOption {
+// WithID sets a custom ID
+func WithID(id string) UploadOption {
 	return func(o *UploadOptions) {
-		o.FileName = name
+		o.ID = id
 	}
 }
-
 // CreateRequestActionMessage builds Cascade metadata and constructs a MsgRequestAction without broadcasting it.
 // Returns the built Cosmos message and the serialized metadata bytes used in the message.
-func (c *Client) CreateRequestActionMessage(ctx context.Context, creator string, filePath string, opts ...UploadOption) (*actiontypes.MsgRequestAction, []byte, error) {
-	// Apply options
-	options := &UploadOptions{Public: false}
-	for _, opt := range opts {
-		opt(options)
+func (c *Client) CreateRequestActionMessage(ctx context.Context, creator string, filePath string, options *UploadOptions) (*actiontypes.MsgRequestAction, []byte, error) {
+	var isPublic bool
+	if options != nil {
+		isPublic = options.Public
 	}
-
 	// Build metadata with SuperNode SDK
-	meta, price, expiration, err := c.snClient.BuildCascadeMetadataFromFile(ctx, filePath, options.Public)
+	meta, price, expiration, err := c.snClient.BuildCascadeMetadataFromFile(ctx, filePath, isPublic)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to build metadata: %w", err)
 	}
 	metaBytes, err := json.Marshal(&meta)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to marshal metadata: %w", err)
 	}
-	c.logf("cascade: built metadata for %s (public=%t price=%s expires=%s)", filePath, options.Public, price, expiration)
+	c.logf("cascade: built metadata for %s (public=%t price=%s expires=%s)", filePath, isPublic, price, expiration)
 
 	// Construct the action message
 	msg := blockchain.NewMsgRequestAction(creator, actiontypes.ActionTypeCascade, string(metaBytes), price, expiration)
@@ -63,7 +61,8 @@ func (c *Client) CreateRequestActionMessage(ctx context.Context, creator string,
 
 // SendRequestActionMessage signs, simulates and broadcasts the provided request message.
 // "memo" can be used to pass an optional filename or idempotency key.
-func (c *Client) SendRequestActionMessage(ctx context.Context, bc *blockchain.Client, msg *actiontypes.MsgRequestAction, memo string) (*types.ActionResult, error) {
+func (c *Client) SendRequestActionMessage(ctx context.Context, bc *blockchain.Client, msg *actiontypes.MsgRequestAction, 
+	memo string, options *UploadOptions) (*types.ActionResult, error) {
 	if bc == nil || msg == nil {
 		return nil, fmt.Errorf("blockchain client and msg are required")
 	}
@@ -73,16 +72,22 @@ func (c *Client) SendRequestActionMessage(ctx context.Context, bc *blockchain.Cl
 		at = actiontypes.ActionType(v)
 	}
 
+	var id string
+	if options != nil {
+		id = options.ID
+	}
+
 	// Request Action transaction
 	taskType := normalizeTaskType(msg.GetActionType())
 	c.emitClientEvent(ctx, sdkEvent.Event{
-		Type:      sdkEvent.SDKActionRegistrationRequested,
+		Type:      sdkEvent.SDKGoActionRegistrationRequested,
 		TaskType:  taskType,
+		TaskID: id,
 		Timestamp: time.Now(),
 		Data: sdkEvent.EventData{
-			sdkEvent.KeyEventType:  taskType,
 			sdkEvent.KeyPrice:      msg.Price,
 			sdkEvent.KeyExpiration: msg.ExpirationTime,
+			sdkEvent.KeyMessage:    "Action registration requested",
 		},
 	})
 
@@ -94,14 +99,15 @@ func (c *Client) SendRequestActionMessage(ctx context.Context, bc *blockchain.Cl
 
 	actionID := ar.ActionID
 	c.emitClientEvent(ctx, sdkEvent.Event{
-		Type:      sdkEvent.SDKActionRegistrationConfirmed,
+		Type:      sdkEvent.SDKGoActionRegistrationConfirmed,
 		ActionID:  actionID,
+		TaskID:    id,
 		TaskType:  taskType,
 		Timestamp: time.Now(),
 		Data: sdkEvent.EventData{
-			sdkEvent.KeyActionID:    actionID,
 			sdkEvent.KeyTxHash:      ar.TxHash,
 			sdkEvent.KeyBlockHeight: ar.Height,
+			sdkEvent.KeyMessage:    "Action registration confirmed",
 		},
 	})
 	c.logf("cascade: request action confirmed action_id=%s height=%d tx=%s", actionID, ar.Height, ar.TxHash)
@@ -144,6 +150,16 @@ func (c *Client) UploadToSupernode(ctx context.Context, actionID string, filePat
 	if err != nil {
 		return "", fmt.Errorf("failed to start cascade: %w", err)
 	}
+	// emit upload started event
+	c.emitClientEvent(ctx, sdkEvent.Event{
+		Type:      sdkEvent.SDKGoUploadStarted,
+		ActionID:  actionID,
+		TaskID:    taskID,
+		Data: sdkEvent.EventData{
+			sdkEvent.KeyMessage: "Cascade upload task started",
+		},
+		Timestamp: time.Now(),
+	})
 
 	// Wait for task completion
 	if task, err := c.tasks.Wait(ctx, taskID); err != nil {
@@ -155,20 +171,28 @@ func (c *Client) UploadToSupernode(ctx context.Context, actionID string, filePat
 }
 
 // Upload provides a one-shot convenience helper that performs:
-// 1) CreateRequestActionMessage 2) SendRequestActionMessage 3) UploadToSupernode
+//   1) CreateRequestActionMessage
+//   2) SendRequestActionMessage
+//   3) UploadToSupernode
 func (c *Client) Upload(ctx context.Context, creator string, bc *blockchain.Client, filePath string, opts ...UploadOption) (*types.CascadeResult, error) {
+
+	// Apply upload options
+	options := &UploadOptions{Public: false}
+	for _, opt := range opts {
+		opt(options)
+	}
+
 	// Build message
-	msg, _, err := c.CreateRequestActionMessage(ctx, creator, filePath, opts...)
+	msg, _, err := c.CreateRequestActionMessage(ctx, creator, filePath, options)
 	if err != nil {
 		return nil, err
 	}
 
+	// extract filename from path
+	fileName := filepath.Base(filePath)
+
 	// Broadcast
-	options := &UploadOptions{Public: false}
-	for _, opt := range opts {
-		opt(options)
-	}
-	ar, err := c.SendRequestActionMessage(ctx, bc, msg, options.FileName)
+	ar, err := c.SendRequestActionMessage(ctx, bc, msg, fileName, options)
 	if err != nil {
 		return nil, fmt.Errorf("request action tx: %w", err)
 	}
@@ -205,14 +229,36 @@ func (c *Client) Download(ctx context.Context, actionID string, outputDir string
 		opt(options)
 	}
 
+	taskType := string(types.ActionTypeCascade)
+	c.logf("cascade: starting download, action=%s dest=%s", actionID, outputDir)
+	c.emitClientEvent(ctx, sdkEvent.Event{
+		Type:      sdkEvent.SDKGoDownloadStarted,
+		ActionID:  actionID,
+		TaskType:  taskType,
+		Data: sdkEvent.EventData{
+			sdkEvent.KeyMessage: "Cascade download task started",
+		},
+		Timestamp: time.Now(),
+	})
+
 	// Create download signature
 	signature, err := c.snClient.GenerateDownloadSignature(ctx, actionID, c.config.Address)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create signature: %w", err)
 	}
 
+	c.logf("cascade: download signature generated, action=%s", actionID)
+	c.emitClientEvent(ctx, sdkEvent.Event{
+		Type:      sdkEvent.SDKGoDownloadSignatureGenerated,
+		ActionID:  actionID,
+		TaskType:  taskType,
+		Data: sdkEvent.EventData{
+			sdkEvent.KeyMessage: "Cascade download signature generated",
+		},
+		Timestamp: time.Now(),
+	})
+
 	// Start download via SuperNode SDK
-	c.logf("cascade: starting download action_id=%s dest=%s", actionID, outputDir)
 	taskID, err := c.snClient.DownloadCascade(ctx, actionID, outputDir, signature)
 	if err != nil {
 		return nil, fmt.Errorf("failed to start download: %w", err)
@@ -223,13 +269,26 @@ func (c *Client) Download(ctx context.Context, actionID string, outputDir string
 	if err != nil {
 		return nil, fmt.Errorf("download failed: %w", err)
 	}
-	c.logf("cascade: download completed action_id=%s task_id=%s", actionID, task.TaskID)
 
-	return &types.DownloadResult{
+	result := &types.DownloadResult{
 		ActionID:   actionID,
 		TaskID:     task.TaskID,
 		OutputPath: outputDir + "/" + actionID,
-	}, nil
+	}
+
+	c.logf("cascade: download completed action_id=%s task_id=%s", actionID, taskID)
+	c.emitClientEvent(ctx, sdkEvent.Event{
+		Type:      sdkEvent.SDKGoDownloadCompleted,
+		ActionID:  actionID,
+		TaskType:  taskType,
+		TaskID:    taskID,
+		Data: sdkEvent.EventData{
+			sdkEvent.KeyMessage: "Cascade download task completed",
+		},
+		Timestamp: time.Now(),
+	})
+
+	return result, nil
 }
 
 func (c *Client) emitClientEvent(ctx context.Context, evt sdkEvent.Event) {

cascade/client.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"sync"
 	"time"
+	"strings"
 
 	"github.com/LumeraProtocol/lumera/x/lumeraid/securekeyx"
 	snsdk "github.com/LumeraProtocol/supernode/v2/sdk/action"
@@ -89,12 +90,8 @@ func (c *Client) Close() error {
 }
 
 func (c *Client) isLocalEventType(t sdkEvent.EventType) bool {
-	switch t {
-	case sdkEvent.SDKActionRegistrationRequested, sdkEvent.SDKActionRegistrationConfirmed:
-		return true
-	default:
-		return false
-	}
+	// EventType format: type:subtype
+	return strings.HasPrefix(string(t), "sdk-go:")
 }
 
 func (c *Client) addLocalSubscriber(t sdkEvent.EventType, handler sdkEvent.Handler) {

cascade/event/types.go

@@ -52,8 +52,12 @@ const (
 	SupernodeUnknown                  EventType = "supernode:unknown"
 	SupernodeFinalizeSimulationFailed EventType = "supernode:finalize_simulation_failed"
 
-	SDKActionRegistrationRequested EventType = "sdk:action_registration_requested"
-	SDKActionRegistrationConfirmed EventType = "sdk:action_registration_confirmed"
+	SDKGoActionRegistrationRequested  EventType = "sdk-go:action_registration_requested"
+	SDKGoActionRegistrationConfirmed  EventType = "sdk-go:action_registration_confirmed"
+	SDKGoUploadStarted                EventType = "sdk-go:upload_started"
+	SDKGoDownloadStarted              EventType = "sdk-go:download_started"
+	SDKGoDownloadCompleted            EventType = "sdk-go:download_completed"
+	SDKGoDownloadSignatureGenerated   EventType = "sdk-go:download_signature_generated"
 )
 
 // EventDataKey identifies metadata entries.

examples/cascade-upload/main.go

@@ -25,7 +25,6 @@ func main() {
 
 	filePath := flag.String("file-path", "", "Path to file to upload (required)")
 	public := flag.Bool("public", true, "Whether upload is public")
-	upFileName := flag.String("file-name", "", "Optional filename override")
 	actionID := flag.String("action-id", "", "Existing action ID to upload bytes for (skips on-chain request)")
 	flag.Parse()
 
@@ -61,6 +60,9 @@ func main() {
 	}
 	defer client.Close() //nolint:errcheck
 
+	opts := []cascade.UploadOption{cascade.WithPublic(*public)}
+	opts = append(opts, cascade.WithID("example-upload-001")) // optional custom ID for action registration tracking
+
 	aid := strings.TrimSpace(*actionID)
 	if aid != "" {
 		fmt.Println("Uploading file bytes to SuperNodes for existing action...")
@@ -83,10 +85,6 @@ func main() {
 	}
 
 	fmt.Println("Uploading file...")
-	opts := []cascade.UploadOption{cascade.WithPublic(*public)}
-	if fn := strings.TrimSpace(*upFileName); fn != "" {
-		opts = append(opts, cascade.WithFileName(fn))
-	}
 	result, err := client.Cascade.Upload(ctx, address, client.Blockchain, *filePath, opts...)
 	if err != nil {
 		log.Fatalf("Upload failed: %v", err)

go.mod

@@ -19,7 +19,7 @@ require (
 	github.com/LumeraProtocol/lumera v1.8.5
 
 	// SuperNode SDK for storage operations
-	github.com/LumeraProtocol/supernode/v2 v2.4.9
+	github.com/LumeraProtocol/supernode/v2 v2.4.10
 	github.com/cometbft/cometbft v0.38.18
 	github.com/cosmos/cosmos-sdk v0.53.0
 

go.sum

@@ -78,8 +78,8 @@ github.com/LumeraProtocol/lumera v1.8.5 h1:VfRm9bEWYehd7Ek6YJFdQBFXH47SCuDO6IFdz
 github.com/LumeraProtocol/lumera v1.8.5/go.mod h1:DcG+PermGhl5uA51VaSA0EC+FXpDVm2XgifmYL9jJvE=
 github.com/LumeraProtocol/rq-go v0.2.1 h1:8B3UzRChLsGMmvZ+UVbJsJj6JZzL9P9iYxbdUwGsQI4=
 github.com/LumeraProtocol/rq-go v0.2.1/go.mod h1:APnKCZRh1Es2Vtrd2w4kCLgAyaL5Bqrkz/BURoRJ+O8=
-github.com/LumeraProtocol/supernode/v2 v2.4.9 h1:OTncBhdIxp2ttUkDAce98NeH1KGDzdR/1UmJ8LmhiZU=
-github.com/LumeraProtocol/supernode/v2 v2.4.9/go.mod h1:zIwd8SoIoBEzw1ErqVlsKW2iAJ6vpwOBCK4nCpl2Kso=
+github.com/LumeraProtocol/supernode/v2 v2.4.10 h1:kM2N7pKw9Y+gQGVLiRaCX8/H+5aSk6n3VvNZ9RBLMZg=
+github.com/LumeraProtocol/supernode/v2 v2.4.10/go.mod h1:zIwd8SoIoBEzw1ErqVlsKW2iAJ6vpwOBCK4nCpl2Kso=
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
 github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw=