feat: replace toml

Author: Benzbeeb

utils/toml.go

@@ -1,7 +1,99 @@
 package utils
 
+import (
+	"bufio"
+	"fmt"
+	"os"
+	"strings"
+)
+
+// Utility function to clean the string by trimming spaces and removing ^M characters
+func cleanString(input string) string {
+	return strings.TrimSpace(strings.ReplaceAll(input, "\r", ""))
+}
+
+// UpdateTomlValue updates a TOML file based on the provided key and value.
+// The key can be a field in a section (e.g., "api.enable") or a top-level field (e.g., "minimum-gas-prices").
 func UpdateTomlValue(filePath, key, value string) error {
-	// TODO: Implement this function
+	value = cleanString(value)
+	// Open the TOML file for reading
+	file, err := os.Open(filePath)
+	if err != nil {
+		return fmt.Errorf("error opening file: %w", err)
+	}
+	defer file.Close()
+
+	// Determine if the key has a section (e.g., "api.enable") or is a top-level field (e.g., "minimum-gas-prices")
+	var section, field string
+	parts := strings.SplitN(key, ".", 2)
+	if len(parts) == 2 {
+		section = parts[0] // e.g., "api"
+		field = parts[1]   // e.g., "enable"
+	} else {
+		field = key // e.g., "minimum-gas-prices"
+	}
+
+	// Slice to store updated file lines
+	var updatedLines []string
+	var currentSection string
+	inTargetSection := false
+
+	// Read the file line by line
+	scanner := bufio.NewScanner(file)
+	for scanner.Scan() {
+		line := scanner.Text()
+		trimmedLine := strings.TrimSpace(line)
+
+		// Check if the line is a section header (e.g., [api])
+		if isSectionHeader(trimmedLine) {
+			currentSection = getSectionName(trimmedLine)
+			inTargetSection = (currentSection == section)
+		}
+
+		// Modify the field if it's in the correct section or at the top-level
+		if shouldModifyField(inTargetSection, currentSection, field, trimmedLine) {
+			line = fmt.Sprintf(`%s = "%s"`, field, value)
+		}
+
+		// Add the line to the updated content
+		updatedLines = append(updatedLines, line)
+	}
+
+	// Check for any scanner errors
+	if err := scanner.Err(); err != nil {
+		return fmt.Errorf("error reading file: %w", err)
+	}
+
+	// Write the modified lines back to the file
+	err = os.WriteFile(filePath, []byte(strings.Join(updatedLines, "\n")), 0644)
+	if err != nil {
+		return fmt.Errorf("error writing to file: %w", err)
+	}
 
 	return nil
 }
+
+// isSectionHeader checks if a line is a section header (e.g., [api]).
+func isSectionHeader(line string) bool {
+	return strings.HasPrefix(line, "[") && strings.HasSuffix(line, "]")
+}
+
+// getSectionName extracts the section name from a section header (e.g., [api] -> api).
+func getSectionName(header string) string {
+	return strings.Trim(header, "[]")
+}
+
+// shouldModifyField checks if the current line should be modified.
+func shouldModifyField(inTargetSection bool, currentSection, field, line string) bool {
+	// If there is no section (top-level), and the line starts with the field, modify it
+	if currentSection == "" && strings.HasPrefix(strings.TrimSpace(line), field) {
+		return true
+	}
+
+	// If we are in the target section and the line starts with the field, modify it
+	if inTargetSection && strings.HasPrefix(strings.TrimSpace(line), field) {
+		return true
+	}
+
+	return false
+}

utils/validate.go

@@ -147,10 +147,21 @@ func ValidateMnemonic(mnemonic string) error {
 	return nil
 }
 
-// IsValidPeerOrSeed checks if each address in a comma-separated list is valid
-// It allows empty strings and returns an error with detailed reasons if any address is invalid
+// IsValidDNS checks if a given string is a valid DNS name
+func IsValidDNS(dns string) bool {
+	// Regular expression for validating DNS names
+	dnsRegex := `^([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$`
+	re := regexp.MustCompile(dnsRegex)
+
+	// Validate DNS name
+	return re.MatchString(dns)
+}
+
+// IsValidPeerOrSeed checks if each address in a comma-separated list is valid.
+// It allows empty strings and returns an error with detailed reasons if any address is invalid.
+// It accepts both IP addresses and DNS names.
 func IsValidPeerOrSeed(addresses string) error {
-	// Compile the regular expression once
+	// Compile the regular expression for node ID
 	nodeIDRegex, err := regexp.Compile(`^[a-f0-9]{40}$`)
 	if err != nil {
 		return fmt.Errorf("failed to compile nodeID regex: %v", err)
@@ -172,7 +183,7 @@ func IsValidPeerOrSeed(addresses string) error {
 
 		parts := strings.Split(address, "@")
 		if len(parts) != 2 {
-			invalidAddresses = append(invalidAddresses, fmt.Sprintf("'%s': must be in format nodeID@ip:port", address))
+			invalidAddresses = append(invalidAddresses, fmt.Sprintf("'%s': must be in format nodeID@ip_or_dns:port", address))
 			continue
 		}
 
@@ -185,16 +196,16 @@ func IsValidPeerOrSeed(addresses string) error {
 			continue
 		}
 
-		// Split address into IP and optional port
+		// Split peer address into host (IP or DNS) and port
 		host, port, err := net.SplitHostPort(peerAddr)
 		if err != nil && !strings.Contains(err.Error(), "missing port in address") {
-			invalidAddresses = append(invalidAddresses, fmt.Sprintf("'%s': invalid address (IP:Port format required)", address))
+			invalidAddresses = append(invalidAddresses, fmt.Sprintf("'%s': invalid address (IP:Port or DNS:Port format required)", address))
 			continue
 		}
 
-		// Validate IP (host part)
-		if net.ParseIP(host) == nil {
-			invalidAddresses = append(invalidAddresses, fmt.Sprintf("'%s': invalid IP address", address))
+		// Validate host (can be IP or DNS)
+		if net.ParseIP(host) == nil && !IsValidDNS(host) {
+			invalidAddresses = append(invalidAddresses, fmt.Sprintf("'%s': invalid IP or DNS name", address))
 			continue
 		}
 
@@ -207,10 +218,9 @@ func IsValidPeerOrSeed(addresses string) error {
 		}
 	}
 
-	// TODO add in error that id need to bbe 40 chars
+	// If there are any invalid addresses, return an error with detailed messages
 	if len(invalidAddresses) > 0 {
-		// Return an error with detailed messages
-		return errors.New("invalid peer/seed addresses:" + strings.Join(invalidAddresses, ","))
+		return errors.New("invalid peer/seed addresses: " + strings.Join(invalidAddresses, ", "))
 	}
 
 	return nil