feat: genesis enpoint validate and working toml

Author: Benzbeeb

models/weaveinit/run_l1_node.go

@@ -636,13 +636,15 @@ type GenesisEndpointInput struct {
 	utils.TextInput
 	state    *RunL1NodeState
 	question string
+	err      error
 }
 
 func NewGenesisEndpointInput(state *RunL1NodeState) *GenesisEndpointInput {
 	return &GenesisEndpointInput{
 		TextInput: utils.NewTextInput(),
 		state:     state,
 		question:  "Please specify the endpoint to fetch genesis.json",
+		err:       nil,
 	}
 }
 
@@ -658,9 +660,13 @@ func (m *GenesisEndpointInput) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	input, cmd, done := m.TextInput.Update(msg)
 	if done {
 		m.state.genesisEndpoint = input.Text
-		m.state.weave.PushPreviousResponse(styles.RenderPreviousResponse(styles.DotsSeparator, m.GetQuestion(), []string{"endpoint"}, input.Text))
-		newLoader := NewInitializingAppLoading(m.state)
-		return newLoader, newLoader.Init()
+		dns := utils.CleanString(input.Text)
+		m.err = utils.ValidateURL(dns)
+		if m.err == nil {
+			m.state.weave.PushPreviousResponse(styles.RenderPreviousResponse(styles.DotsSeparator, m.GetQuestion(), []string{"endpoint"}, dns))
+			newLoader := NewInitializingAppLoading(m.state)
+			return newLoader, newLoader.Init()
+		}
 	}
 	m.TextInput = input
 	return m, cmd
@@ -671,6 +677,9 @@ func (m *GenesisEndpointInput) View() string {
 	if !m.state.existingApp {
 		preText += styles.RenderPrompt("There is no config/genesis.json available. You will need to enter the required information to proceed.\n", []string{"config/genesis.json"}, styles.Information)
 	}
+	if m.IsEntered && m.err != nil {
+		return m.state.weave.Render() + preText + styles.RenderPrompt(m.GetQuestion(), []string{"endpoint"}, styles.Question) + m.TextInput.ViewErr(m.err)
+	}
 	return m.state.weave.Render() + preText + styles.RenderPrompt(m.GetQuestion(), []string{"endpoint"}, styles.Question) + m.TextInput.View()
 }
 

utils/toml.go

@@ -8,14 +8,14 @@ import (
 )
 
 // Utility function to clean the string by trimming spaces and removing ^M characters
-func cleanString(input string) string {
+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 {
-	value = cleanString(value)
+	value = CleanString(value)
 	// Open the TOML file for reading
 	file, err := os.Open(filePath)
 	if err != nil {
@@ -83,15 +83,27 @@ func getSectionName(header string) string {
 	return strings.Trim(header, "[]")
 }
 
-// shouldModifyField checks if the current line should be modified.
+// shouldModifyField checks if the current line should be modified by splitting and trimming the key and value.
 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
+	trimmedLine := strings.TrimSpace(line)
+
+	// Check if the line contains the '=' delimiter
+	if !strings.Contains(trimmedLine, "=") {
+		// No '=' found, so we don't need to modify this line
+		return false
+	}
+
+	// Split the line by '=' into key and value pair
+	parts := strings.SplitN(trimmedLine, "=", 2)
+	key := strings.TrimSpace(parts[0])
+
+	// Check if the key matches the target field
+	if key != field {
+		return false
 	}
 
-	// If we are in the target section and the line starts with the field, modify it
-	if inTargetSection && strings.HasPrefix(strings.TrimSpace(line), field) {
+	// If we are at the top-level or in the target section, return true
+	if currentSection == "" || inTargetSection {
 		return true
 	}
 

utils/validate.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"math/big"
 	"net"
+	"net/url"
 	"regexp"
 	"strings"
 
@@ -147,6 +148,18 @@ func ValidateMnemonic(mnemonic string) error {
 	return nil
 }
 
+// Function to validate if a string is a valid URL and return an error if invalid
+func ValidateURL(str string) error {
+	u, err := url.Parse(str)
+	if err != nil {
+		return fmt.Errorf("invalid URL format: %v", err)
+	}
+	if u.Scheme == "" || u.Host == "" {
+		return fmt.Errorf("URL is missing scheme or host")
+	}
+	return nil
+}
+
 // IsValidDNS checks if a given string is a valid DNS name
 func IsValidDNS(dns string) bool {
 	// Regular expression for validating DNS names