go/consensus/cometbft/config: Move allow duplicate IP config

Author: martintomazic

.changelog/6551.cfg.md

@@ -0,0 +1,15 @@
+go/consensus/cometbft/config: Move allow duplicate IP config
+
+Allowing multiple P2P connections from the same IP is useful in local
+sentry-like setups where multiple nodes run behind the same IP address.
+The option is therefore no longer a debug option and no longer requires
+the unsafe `--debug.dont_blame_oasis` flag.
+
+This is a breaking configuration change. The following configuration
+option has been removed:
+
+- `consensus.debug.allow_duplicate_ip`.
+
+The following configuration option has been added:
+
+- `consensus.p2p.allow_duplicate_ip`.

docs/development-setup/deploying-a-runtime.md

@@ -334,7 +334,7 @@ oasis-node \
   --runtime.supported $RUNTIME_ID \
   --runtime.paths $RUNTIME_ID=$RUNTIME_BINARY \
   --consensus.cometbft.debug.addr_book_lenient \
-  --consensus.cometbft.debug.allow_duplicate_ip \
+  --consensus.cometbft.p2p.allow_duplicate_ip \
   --consensus.cometbft.p2p.seed $SEED_NODE_ADDRESS \
   --debug.dont_blame_oasis \
   --debug.allow_test_keys

go/consensus/cometbft/config/config.go

@@ -90,6 +90,9 @@ type P2PConfig struct {
 	DisablePeerExchange bool `yaml:"disable_peer_exchange"`
 	// CometBFT max timeout when redialing a persistent peer (default: unlimited).
 	PersistentPeersMaxDialPeriod time.Duration `yaml:"persistent_peers_max_dial_period"`
+
+	// Allow multiple P2P connections from the same IP.
+	AllowDuplicateIP bool `yaml:"allow_duplicate_ip"`
 }
 
 // SubmissionConfig is the transaction submission configuration.
@@ -171,8 +174,6 @@ type SupplementarySanityConfig struct {
 type DebugConfig struct {
 	// Allow non-routable addresses in P2P address book.
 	P2PAddrBookLenient bool `yaml:"addr_book_lenient,omitempty"`
-	// Allow multiple P2P connections from the same IP.
-	P2PAllowDuplicateIP bool `yaml:"allow_duplicate_ip,omitempty"`
 
 	// Enable automatic recovery from corrupted WAL during replay (UNSAFE).
 	UnsafeReplayRecoverCorruptedWAL bool `yaml:"unsafe_replay_recover_corrupted_wal,omitempty"`

go/consensus/cometbft/full/full.go

@@ -630,7 +630,7 @@ func (t *fullService) lazyInit() error { // nolint: gocyclo
 	cometConfig.P2P.UnconditionalPeerIDs = strings.Join(unconditionalPeers, ",")
 	cometConfig.P2P.Seeds = strings.Join(seeds, ",")
 	cometConfig.P2P.AddrBookStrict = !(config.GlobalConfig.Consensus.Debug.P2PAddrBookLenient && cmflags.DebugDontBlameOasis())
-	cometConfig.P2P.AllowDuplicateIP = config.GlobalConfig.Consensus.Debug.P2PAllowDuplicateIP && cmflags.DebugDontBlameOasis()
+	cometConfig.P2P.AllowDuplicateIP = config.GlobalConfig.Consensus.P2P.AllowDuplicateIP
 	cometConfig.RPC.ListenAddress = ""
 
 	if len(sentryUpstreamAddrs) > 0 {

go/consensus/cometbft/seed/seed.go

@@ -173,7 +173,7 @@ func New(dataDir string, identity *identity.Identity, doc *genesis.Document) (*S
 	p2pCfg.SendRate = config.GlobalConfig.Consensus.P2P.SendRate
 	p2pCfg.RecvRate = config.GlobalConfig.Consensus.P2P.RecvRate
 	p2pCfg.AddrBookStrict = !(config.GlobalConfig.Consensus.Debug.P2PAddrBookLenient && cmflags.DebugDontBlameOasis())
-	p2pCfg.AllowDuplicateIP = config.GlobalConfig.Consensus.Debug.P2PAllowDuplicateIP && cmflags.DebugDontBlameOasis()
+	p2pCfg.AllowDuplicateIP = config.GlobalConfig.Consensus.P2P.AllowDuplicateIP
 
 	nodeKey := &cmtp2p.NodeKey{PrivKey: crypto.SignerToCometBFT(identity.P2PSigner)}
 

go/oasis-test-runner/oasis/byzantine.go

@@ -65,7 +65,7 @@ func (worker *Byzantine) ModifyConfig() error {
 	worker.Config.Consensus.ListenAddress = allInterfacesAddr + ":" + strconv.Itoa(int(worker.consensusPort))
 	worker.Config.Consensus.ExternalAddress = localhostAddr + ":" + strconv.Itoa(int(worker.consensusPort))
 
-	worker.Config.Consensus.Debug.P2PAllowDuplicateIP = true
+	worker.Config.Consensus.P2P.AllowDuplicateIP = true
 	worker.Config.Consensus.Debug.P2PAddrBookLenient = true
 
 	worker.Config.P2P.Port = worker.p2pPort

go/oasis-test-runner/oasis/network.go

@@ -680,7 +680,7 @@ func (net *Network) startOasisNode(
 		}
 
 		cfg.Consensus.Debug.P2PAddrBookLenient = true
-		cfg.Consensus.Debug.P2PAllowDuplicateIP = true
+		cfg.Consensus.P2P.AllowDuplicateIP = true
 		cfg.Consensus.UpgradeStopDelay = 10 * time.Second
 
 		extraArgs = extraArgs.debugAllowDebugEnclaves()