cmd/geth: align master code to develop

buddh0 · buddh0 · commit 999cda8e5df9 · 2025-05-29T19:08:51.000+08:00
diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go
@@ -506,10 +506,7 @@ func initNetwork(ctx *cli.Context) error {
 	}
 	if enableSentryNode && ctx.Bool(utils.InitEVNSentryWhitelist.Name) {
 		for i := 0; i < len(sentryConfigs); i++ {
-			// whitelist all sentry nodes + proxyed validator NodeID
-			wlNodeIDs := []enode.ID{nodeIDs[i]}
-			wlNodeIDs = append(wlNodeIDs, sentryNodeIDs...)
-			sentryConfigs[i].Node.P2P.EVNNodeIdsWhitelist = wlNodeIDs
+			sentryConfigs[i].Node.P2P.EVNNodeIdsWhitelist = sentryNodeIDs
 		}
 	}
 	if enableSentryNode && ctx.Bool(utils.InitEVNSentryRegister.Name) {

Original file line number	Diff line number	Diff line change
`@@ -506,10 +506,7 @@ func initNetwork(ctx *cli.Context) error {`
`506`	`506`	`}`
`507`	`507`	`if enableSentryNode && ctx.Bool(utils.InitEVNSentryWhitelist.Name) {`
`508`	`508`	`for i := 0; i < len(sentryConfigs); i++ {`
`509`		`- // whitelist all sentry nodes + proxyed validator NodeID`
`510`		`- wlNodeIDs := []enode.ID{nodeIDs[i]}`
`511`		`- wlNodeIDs = append(wlNodeIDs, sentryNodeIDs...)`
`512`		`- sentryConfigs[i].Node.P2P.EVNNodeIdsWhitelist = wlNodeIDs`
	`509`	`+ sentryConfigs[i].Node.P2P.EVNNodeIdsWhitelist = sentryNodeIDs`
`513`	`510`	`}`
`514`	`511`	`}`
`515`	`512`	`if enableSentryNode && ctx.Bool(utils.InitEVNSentryRegister.Name) {`