config: enable hybrid mode by default

cmd/algocfg/profileCommand.go

@@ -62,6 +62,7 @@
 	participation = configUpdater{
 		description: "Participate in consensus or simply ensure chain health by validating blocks.",
 		updateFunc: func(cfg config.Local) config.Local {
+			cfg.EnableP2PHybridMode = false
 			return cfg
 		},
 	}
@@ -75,6 +76,7 @@
 			cfg.EnableLedgerService = true
 			cfg.EnableBlockService = true
 			cfg.NetAddress = ":4160"
+			cfg.EnableP2PHybridMode = false
 			return cfg
 		},
 	}
@@ -87,6 +89,7 @@
 			cfg.EnableBlockService = true
 			cfg.NetAddress = ":4160"
 			cfg.EnableGossipService = false
+			cfg.EnableP2PHybridMode = false
 			return cfg
 		},
 	}

config/config_test.go

@@ -633,6 +633,7 @@ func TestLocal_IsGossipServer(t *testing.T) {
 	require.False(t, cfg.IsHybridServer())
 
 	cfg.EnableP2P = true
+	cfg.EnableP2PHybridMode = false
 	cfg.NetAddress = ":4160"
 	require.True(t, cfg.IsGossipServer())
 	require.False(t, cfg.IsWsGossipServer())

config/localTemplate.go

@@ -620,7 +620,7 @@ type Local struct {
 
 	// EnableP2PHybridMode turns on both websockets and P2P networking.
 	// Enabling this setting also requires PublicAddress to be set.
-	EnableP2PHybridMode bool `version[34]:"false"`
+	EnableP2PHybridMode bool `version[34]:"false" version[36]:"true"`
 
 	// P2PHybridNetAddress sets the listen address used for P2P networking, if hybrid mode is set.
 	P2PHybridNetAddress string `version[34]:""`

config/local_defaults.go

@@ -76,7 +76,7 @@ var defaultLocal = Local{
 	EnableNetDevMetrics:                        false,
 	EnableOutgoingNetworkMessageFiltering:      true,
 	EnableP2P:                                  false,
-	EnableP2PHybridMode:                        false,
+	EnableP2PHybridMode:                        true,
 	EnablePingHandler:                          true,
 	EnablePrivateNetworkAccessHeader:           false,
 	EnableProcessBlockStats:                    false,

installer/config.json.example

@@ -55,7 +55,7 @@
     "EnableNetDevMetrics": false,
     "EnableOutgoingNetworkMessageFiltering": true,
     "EnableP2P": false,
-    "EnableP2PHybridMode": false,
+    "EnableP2PHybridMode": true,
     "EnablePingHandler": true,
     "EnablePrivateNetworkAccessHeader": false,
     "EnableProcessBlockStats": false,

netdeploy/network.go

@@ -71,6 +71,23 @@
 	}
 }
 
+// OverrideHybridMode turns off the mode
+func OverrideHybridMode(template *NetworkTemplate) {
+	for i := range template.Nodes {
+		jsonOverride := template.Nodes[i].ConfigJSONOverride
+		if jsonOverride == "" {
+			jsonOverride = `{"EnableP2PHybridMode": false}`
+		} else {
+			result := make(map[string]interface{})
+			_ = json.Unmarshal([]byte(jsonOverride), &result) // jsonOverride is presumable a valid json
+			result["EnableP2PHybridMode"] = false
+			data, _ := json.Marshal(result)
+			jsonOverride = string(data)
+		}
+		template.Nodes[i].ConfigJSONOverride = jsonOverride
+	}
+}
+
 // OverrideConsensusVersion changes the protocol version of a template.
 func OverrideConsensusVersion(ver protocol.ConsensusVersion) TemplateOverride {
 	return func(template *NetworkTemplate) {

node/node_test.go

@@ -100,6 +100,7 @@ func setupFullNodes(t *testing.T, proto protocol.ConsensusVersion, customConsens
 
 	configHook := func(ni nodeInfo, cfg config.Local) (nodeInfo, config.Local) {
 		cfg.NetAddress = ni.wsNetAddr()
+		cfg.P2PHybridNetAddress = ni.p2pNetAddr() // since EnableP2PHybridMode is on by default
 		return ni, cfg
 	}
 
@@ -239,11 +240,11 @@ func setupFullNodesEx(
 		}
 
 		cfg, err := config.LoadConfigFromDisk(rootDirectory)
-		phonebook := phonebookHook(nodeInfos, i)
 		require.NoError(t, err)
+		phonebook := phonebookHook(nodeInfos, i)
 		node, err := MakeFull(logging.Base().With("net", fmt.Sprintf("node%d", i)), rootDirectory, cfg, phonebook, g)
-		nodes[i] = node
 		require.NoError(t, err)
+		nodes[i] = node
 	}
 
 	return nodes, wallets
@@ -999,6 +1000,7 @@ func TestNodeP2PRelays(t *testing.T) {
 	configHook := func(ni nodeInfo, cfg config.Local) (nodeInfo, config.Local) {
 		cfg = config.GetDefaultLocal()
 		cfg.BaseLoggerDebugLevel = uint32(logging.Debug)
+		cfg.EnableP2PHybridMode = false
 		cfg.EnableP2P = true
 		cfg.NetAddress = ""
 		cfg.EnableDHTProviders = true

test/e2e-go/cli/algoh/expect/algohTimeoutTest.exp

@@ -30,6 +30,10 @@ if { [catch {
 
     ::Algoh::CreateNetwork $NETWORK_NAME $NETWORK_TEMPLATE $TEST_ROOT_DIR
 
+    exec -- cat "$TEST_ROOT_DIR/Primary/config.json" | jq {. |= . + {"PublicAddress": "abc", "P2PHybridNetAddress": ":4190"}} > $TEST_ROOT_DIR/Primary/config.json.new
+    exec rm $TEST_ROOT_DIR/Primary/config.json
+    exec mv $TEST_ROOT_DIR/Primary/config.json.new $TEST_ROOT_DIR/Primary/config.json
+
     ::Algoh::StartNode $TEST_PRIMARY_NODE_DIR
 
     puts "Successfully started node"

test/e2e-go/cli/goal/expect/catchpointCatchupTest.exp

@@ -64,7 +64,7 @@ if { [catch {
     ::AlgorandGoal::CreateNetwork $NETWORK_NAME $NETWORK_TEMPLATE $TEST_ALGO_DIR $TEST_ROOT_DIR
 
     # Update the Primary Node configuration
-    exec -- cat "$TEST_ROOT_DIR/Primary/config.json" | jq {. |= . + {"MaxAcctLookback": 2, "CatchpointInterval": 4,"EnableRequestLogger":true,"Archival":true}} > $TEST_ROOT_DIR/Primary/config.json.new
+    exec -- cat "$TEST_ROOT_DIR/Primary/config.json" | jq {. |= . + {"MaxAcctLookback": 2, "CatchpointInterval": 4,"EnableRequestLogger":true,"Archival":true,"PublicAddress":"abc","P2PHybridNetAddress":":4190"}} > $TEST_ROOT_DIR/Primary/config.json.new
     exec rm $TEST_ROOT_DIR/Primary/config.json
     exec mv $TEST_ROOT_DIR/Primary/config.json.new $TEST_ROOT_DIR/Primary/config.json
 

test/e2e-go/cli/goal/expect/goalExpectCommon.exp

@@ -269,6 +269,14 @@ proc ::AlgorandGoal::CreateNetwork { NETWORK_NAME NETWORK_TEMPLATE TEST_ALGO_DIR
        puts "ERROR in CreateNetwork: $EXCEPTION"
        exit 1
     }
+
+    # Update the Primary Node configuration for TwoNodes50Each/ThreeNodesEvenDist templates in order to satisfy hybrid mode defaults
+    set RELAY_NAME ""
+    if {[string match "*TwoNodes50Each*" $NETWORK_TEMPLATE] || [string match "*ThreeNodesEvenDist*" $NETWORK_TEMPLATE]} {
+        exec -- cat "$TEST_ROOT_DIR/Primary/config.json" | jq {. |= . + {"PublicAddress": "abc", "P2PHybridNetAddress": ":4190"}} > $TEST_ROOT_DIR/Primary/config.json.new
+        exec rm $TEST_ROOT_DIR/Primary/config.json
+        exec mv $TEST_ROOT_DIR/Primary/config.json.new $TEST_ROOT_DIR/Primary/config.json
+    }
 }
 
 # Start the network

test/framework/fixtures/libgoalFixture.go

@@ -133,7 +133,7 @@ func (f *LibGoalFixture) setup(test TestingTB, testName string, templateFile str
 	kmdConfOverride := netdeploy.OverrideKmdConfig(netdeploy.TemplateKMDConfig{SessionLifetimeSecs: 300})
 	// copy overrides to prevent caller's data from being modified
 	extraOverrides := append([]netdeploy.TemplateOverride(nil), overrides...)
-	extraOverrides = append(extraOverrides, kmdConfOverride)
+	extraOverrides = append(extraOverrides, kmdConfOverride, netdeploy.OverrideHybridMode)
 
 	network, err := netdeploy.CreateNetworkFromTemplate("test", f.rootDir, file, f.binDir, importKeys, f.nodeExitWithError, f.consensus, extraOverrides...)
 	f.failOnError(err, "CreateNetworkFromTemplate failed: %v")

test/scripts/e2e_client_runner.py

@@ -451,12 +451,14 @@ def main():
     primaryDataDir = os.path.join(netdir, 'Primary')
 
     # Set EnableDeveloperAPI to true for both nodes
+    # and disable the hybrid mode since it is irrelevant for the tests
     for dataDir in (nodeDataDir, primaryDataDir):
         configFile = os.path.join(dataDir, 'config.json')
         with open(configFile, 'r') as f:
             configOptions = json.load(f)
 
         configOptions['EnableDeveloperAPI'] = True
+        configOptions['EnableP2PHybridMode'] = False
 
         with open(configFile, 'w') as f:
             json.dump(configOptions, f)

test/testdata/configs/config-v36.json

@@ -55,7 +55,7 @@
     "EnableNetDevMetrics": false,
     "EnableOutgoingNetworkMessageFiltering": true,
     "EnableP2P": false,
-    "EnableP2PHybridMode": false,
+    "EnableP2PHybridMode": true,
     "EnablePingHandler": true,
     "EnablePrivateNetworkAccessHeader": false,
     "EnableProcessBlockStats": false,