Skip to content

cmd/geth: config staticnodes for fullnode when init-network #3462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
allformless merged 1 commit into from
Nov 26, 2025
Merged

cmd/geth: config staticnodes for fullnode when init-network #3462

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions cmd/geth/chaincmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ func createPorts(ipStr string, port int, size int) []int {
}

// Create config for node i in the cluster
func createNodeConfig(baseConfig gethConfig, ip string, port int, enodes []*enode.Node, index int, staticConnect bool) gethConfig {
func createNodeConfig(baseConfig gethConfig, prefix string, ip string, port int, enodes []*enode.Node, index int) gethConfig {
baseConfig.Node.HTTPHost = ip
baseConfig.Node.P2P.ListenAddr = fmt.Sprintf(":%d", port)
connectEnodes := make([]*enode.Node, 0, len(enodes)-1)
Expand All @@ -467,9 +467,10 @@ func createNodeConfig(baseConfig gethConfig, ip string, port int, enodes []*enod
connectEnodes = append(connectEnodes, enodes[j])
}
// Set the P2P connections between this node and the other nodes
if staticConnect {
baseConfig.Node.P2P.StaticNodes = connectEnodes
} else {
baseConfig.Node.P2P.StaticNodes = connectEnodes
if prefix == "fullnode" {
// Fullnodes may reside in different regions than the `enodes`.
// StaticNodes cannot connect to them directly, but can still discover them.
baseConfig.Node.P2P.BootstrapNodes = connectEnodes
}
return baseConfig
Expand Down Expand Up @@ -544,7 +545,7 @@ func initNetwork(ctx *cli.Context) error {
connectOneExtraEnodes = true
}

configs, enodes, accounts, err := createConfigs(config, initDir, "node", ips, ports, sentryEnodes, connectOneExtraEnodes, true)
configs, enodes, accounts, err := createConfigs(config, initDir, "node", ips, ports, sentryEnodes, connectOneExtraEnodes)
if err != nil {
utils.Fatalf("Failed to create node configs: %v", err)
}
Expand Down Expand Up @@ -625,7 +626,7 @@ func createSentryNodeConfigs(ctx *cli.Context, baseConfig gethConfig, initDir st
if err != nil {
utils.Fatalf("Failed to parse ports: %v", err)
}
configs, enodes, _, err := createConfigs(baseConfig, initDir, "sentry", ips, ports, nil, false, true)
configs, enodes, _, err := createConfigs(baseConfig, initDir, "sentry", ips, ports, nil, false)
if err != nil {
utils.Fatalf("Failed to create config: %v", err)
}
Expand All @@ -648,7 +649,7 @@ func createAndSaveFullNodeConfigs(ctx *cli.Context, inGenesisFile *os.File, base
utils.Fatalf("Failed to parse ports: %v", err)
}

configs, enodes, _, err := createConfigs(baseConfig, initDir, "fullnode", ips, ports, extraEnodes, false, false)
configs, enodes, _, err := createConfigs(baseConfig, initDir, "fullnode", ips, ports, extraEnodes, false)
if err != nil {
utils.Fatalf("Failed to create config: %v", err)
}
Expand All @@ -663,7 +664,7 @@ func createAndSaveFullNodeConfigs(ctx *cli.Context, inGenesisFile *os.File, base
return configs, enodes, nil
}

func createConfigs(base gethConfig, initDir string, prefix string, ips []string, ports []int, extraEnodes []*enode.Node, connectOneExtraEnodes bool, staticConnect bool) ([]gethConfig, []*enode.Node, [][]common.Address, error) {
func createConfigs(base gethConfig, initDir string, prefix string, ips []string, ports []int, extraEnodes []*enode.Node, connectOneExtraEnodes bool) ([]gethConfig, []*enode.Node, [][]common.Address, error) {
if len(ips) != len(ports) {
return nil, nil, nil, errors.New("mismatch of size and length of ports")
}
Expand Down Expand Up @@ -694,7 +695,7 @@ func createConfigs(base gethConfig, initDir string, prefix string, ips []string,
allEnodes = []*enode.Node{enodes[i], extraEnodes[i]}
index = 0
}
configs[i] = createNodeConfig(base, ips[i], ports[i], allEnodes, index, staticConnect)
configs[i] = createNodeConfig(base, prefix, ips[i], ports[i], allEnodes, index)
}
return configs, enodes, accounts, nil
}
Expand Down