Fixed comments

Author: tuananhk13bk

cmd/mpcium-cli/generate-initiator.go

@@ -11,11 +11,13 @@ import (
 	"os/user"
 	"path/filepath"
 	"runtime"
+	"slices"
 	"time"
 
 	"filippo.io/age"
 	"github.com/fystack/mpcium/pkg/common/pathutil"
 	"github.com/fystack/mpcium/pkg/encryption"
+	"github.com/fystack/mpcium/pkg/types"
 	"github.com/urfave/cli/v3"
 )
 
@@ -38,11 +40,18 @@ func generateInitiatorIdentity(ctx context.Context, c *cli.Command) error {
 	algorithm := c.String("algorithm")
 
 	if algorithm == "" {
-		algorithm = "ed25519"
+		algorithm = string(types.KeyTypeEd25519)
 	}
 
-	if algorithm != "ed25519" && algorithm != "p256" {
-		return fmt.Errorf("invalid algorithm: %s. Must be 'ed25519' or 'p256'", algorithm)
+	if !slices.Contains(
+		[]string{string(types.KeyTypeEd25519), string(types.KeyTypeP256)},
+		algorithm,
+	) {
+		return fmt.Errorf("invalid algorithm: %s. Must be %s or %s",
+			algorithm,
+			types.KeyTypeEd25519,
+			types.KeyTypeP256,
+		)
 	}
 
 	// Create output directory if it doesn't exist
@@ -81,9 +90,9 @@ func generateInitiatorIdentity(ctx context.Context, c *cli.Command) error {
 	var keyData encryption.KeyData
 	var err error
 
-	if algorithm == "ed25519" {
+	if algorithm == string(types.KeyTypeEd25519) {
 		keyData, err = generateEd25519Keys()
-	} else {
+	} else if algorithm == string(types.KeyTypeP256) {
 		keyData, err = encryption.GenerateP256Keys()
 	}
 

cmd/mpcium-cli/main.go

@@ -128,11 +128,6 @@ func main() {
 						Value:   "ed25519",
 						Usage:   "Algorithm to use for key generation (ed25519,p256)",
 					},
-					&cli.StringFlag{
-						Name:    "pubkey",
-						Aliases: []string{"p"},
-						Usage:   "Path to PEM file containing P-256 public key (required when algorithm=p256)",
-					},
 				},
 				Action: generateInitiatorIdentity,
 			},

config.yaml.template

@@ -6,7 +6,7 @@ consul:
 mpc_threshold: 2
 environment: development
 badger_password: "F))ysJp?E]ol&I;^"
-event_initiator_algorithm: "p256"  # or "ed25519", default: ed25519
+event_initiator_algorithm: "ed25519"  # or "ed25519", default: ed25519
 event_initiator_pubkey: "event_initiator_pubkey"
 db_path: "."  
 backup_enabled: true

examples/reshare/main.go

@@ -21,6 +21,18 @@ func main() {
 	config.InitViperConfig()
 	logger.Init(environment, true)
 
+	algorithm := viper.GetString("event_initiator_algorithm")
+	if algorithm == "" {
+		algorithm = "ed25519"
+	}
+
+	// Validate algorithm
+	if algorithm != "ed25519" && algorithm != "p256" {
+		logger.Fatal(
+			"Invalid event_initiator_algorithm in config. Must be 'ed25519' or 'p256'",
+			nil,
+		)
+	}
 	natsURL := viper.GetString("nats.url")
 	natsConn, err := nats.Connect(natsURL)
 	if err != nil {
@@ -30,8 +42,9 @@ func main() {
 	defer natsConn.Close()
 
 	mpcClient := client.NewMPCClient(client.Options{
-		NatsConn: natsConn,
-		KeyPath:  "./event_initiator.key",
+		Algorithm: algorithm,
+		NatsConn:  natsConn,
+		KeyPath:   "./event_initiator.key",
 	})
 
 	// 3) Listen for signing results
@@ -46,14 +59,27 @@ func main() {
 	if err != nil {
 		logger.Fatal("Failed to subscribe to OnResharingResult", err)
 	}
+	// Determine key type based on algorithm
+	var keyType types.KeyType
+	switch algorithm {
+	case "ed25519":
+		keyType = types.KeyTypeEd25519
+	case "p256":
+		keyType = types.KeyTypeP256
+	default:
+		logger.Fatal("Unsupported algorithm", nil)
+	}
 
 	resharingMsg := &types.ResharingMessage{
 		SessionID: uuid.NewString(),
 		WalletID:  "506d2d40-483a-49f1-93c8-27dd4fe9740c",
-		NodeIDs:   []string{"c95c340e-5a18-472d-b9b0-5ac68218213a", "ac37e85f-caca-4bee-8a3a-49a0fe35abff"}, // new peer IDs
+		NodeIDs: []string{
+			"c95c340e-5a18-472d-b9b0-5ac68218213a",
+			"ac37e85f-caca-4bee-8a3a-49a0fe35abff",
+		}, // new peer IDs
 
 		NewThreshold: 1, // t+1 <= len(NodeIDs)
-		KeyType:      types.KeyTypeEd25519,
+		KeyType:      keyType,
 	}
 	err = mpcClient.Resharing(resharingMsg)
 	if err != nil {

pkg/encryption/p256.go

@@ -33,9 +33,7 @@ func ParseP256PrivateKey(keyData []byte) (*ecdsa.PrivateKey, error) {
 
 	// Try to parse as hex string
 	keyStr := strings.TrimSpace(string(keyData))
-	if strings.HasPrefix(keyStr, "0x") {
-		keyStr = keyStr[2:]
-	}
+	keyStr = strings.TrimPrefix(keyStr, "0x")
 
 	keyBytes, err := hex.DecodeString(keyStr)
 	if err != nil {
@@ -144,12 +142,7 @@ func ParseP256PublicKeyFromBytes(keyBytes []byte) (*ecdsa.PublicKey, error) {
 
 // ParseP256PublicKeyFromHex parses a P-256 public key from hex string
 func ParseP256PublicKeyFromHex(hexString string) (*ecdsa.PublicKey, error) {
-	// Remove 0x prefix if present
-	if strings.HasPrefix(hexString, "0x") {
-		hexString = hexString[2:]
-	}
-
-	// Decode hex
+	hexString = strings.TrimPrefix(hexString, "0x")
 	keyBytes, err := hex.DecodeString(hexString)
 	if err != nil {
 		return nil, fmt.Errorf("failed to decode hex string: %w", err)
@@ -160,7 +153,6 @@ func ParseP256PublicKeyFromHex(hexString string) (*ecdsa.PublicKey, error) {
 
 // ParseP256PublicKeyFromBase64 parses a P-256 public key from base64 string
 func ParseP256PublicKeyFromBase64(base64String string) (*ecdsa.PublicKey, error) {
-	// Decode base64
 	keyBytes, err := base64.StdEncoding.DecodeString(base64String)
 	if err != nil {
 		return nil, fmt.Errorf("failed to decode base64 string: %w", err)