Explorar o código

bin/genev: DEP-0007: add network profiles to net setting section of the toml configs

oars hai 1 ano
pai
achega
4092cf7231

+ 10 - 16
bin/genev/genevd/genev_config.toml

@@ -21,27 +21,21 @@ rpc_disabled_methods = ["p2p.get_info"]
 
 ## net settings
 [net]
-## P2P accept addresses
-#inbound = ["tcp://127.0.0.1:28881"]
-
 ## Connection slots
 outbound_connections = 8
 
+# Prefered transports for outbound connections
+active_profiles = ["tcp+tls"]
+
+[net.profiles."tcp+tls"]
+## P2P accept addresses
+#inbound = ["tcp+tls://127.0.0.1:28881"]
+
 ## P2P external addresses
-#external_addr = ["tls://127.0.0.1:28881"]
+#external_addr = ["tcp+tls://127.0.0.1:28881"]
 
 ## Peers to connect to
-#peers = ["tls://127.0.0.1:28881"]
+#peers = ["tcp+tls://127.0.0.1:28881"]
 
 ## Seed nodes to connect to
-seeds = ["tls://lilith0.dark.fi:28881", "tls://lilith1.dark.fi:28881"]
-
-# Prefered transports for outbound connections
-#transports = ["tls", "tcp"]
-
-## these are the default configuration for the p2p network
-#manual_attempt_limit=0
-#seed_query_timeout_seconds=8
-#connect_timeout_seconds=10
-#channel_handshake_seconds=4
-#channel_heartbeat_seconds=10
+#seeds = []

+ 7 - 13
bin/genev/script/genevd_a.toml

@@ -14,15 +14,19 @@ rpc_disabled_methods = ["p2p.get_info"]
 
 ## net settings
 [net]
-## P2P accept addresses
-inbound = ["tcp://127.0.0.1:28882"]
-
 ## Connection slots
 outbound_connections = 4
 
 ## Inbound connection slots
 inbound_connections = 4
 
+# Prefered transports for outbound connections
+active_profiles = ["tcp"]
+
+[net.profiles."tcp"]
+## P2P accept addresses
+inbound = ["tcp://127.0.0.1:28882"]
+
 ## P2P external addresses
 external_addrs = ["tcp://127.0.0.1:28882"]
 
@@ -31,13 +35,3 @@ external_addrs = ["tcp://127.0.0.1:28882"]
 
 ## Seed nodes to connect to
 seeds = ["tcp://127.0.0.1:28881"]
-
-# Prefered transports for outbound connections
-allowed_transports = ["tcp"]
-
-## these are the default configuration for the p2p network
-#manual_attempt_limit=0
-#seed_query_timeout_seconds=8
-#connect_timeout_seconds=10
-#channel_handshake_seconds=4
-#channel_heartbeat_seconds=10

+ 7 - 13
bin/genev/script/genevd_b.toml

@@ -14,15 +14,19 @@ rpc_disabled_methods = ["p2p.get_info"]
 
 ## net settings
 [net]
-## P2P accept addresses
-inbound = ["tcp://127.0.0.1:28883"]
-
 ## Connection slots
 outbound_connections = 4
 
 ## Inbound connection slots
 inbound_connections = 4
 
+# Prefered transports for outbound connections
+active_profiles = ["tcp"]
+
+[net.profiles."tcp"]
+## P2P accept addresses
+inbound = ["tcp://127.0.0.1:28883"]
+
 ## P2P external addresses
 external_addrs = ["tcp://127.0.0.1:28883"]
 
@@ -31,13 +35,3 @@ external_addrs = ["tcp://127.0.0.1:28883"]
 
 ## Seed nodes to connect to
 seeds = ["tcp://127.0.0.1:28881"]
-
-# Prefered transports for outbound connections
-allowed_transports = ["tcp"]
-
-## these are the default configuration for the p2p network
-#manual_attempt_limit=0
-#seed_query_timeout_seconds=8
-#connect_timeout_seconds=10
-#channel_handshake_seconds=4
-#channel_heartbeat_seconds=10

+ 7 - 13
bin/genev/script/genevd_c.toml

@@ -14,15 +14,19 @@ rpc_disabled_methods = ["p2p.get_info"]
 
 ## net settings
 [net]
-## P2P accept addresses
-inbound = ["tcp://127.0.0.1:28884"]
-
 ## Connection slots
 outbound_connections = 4
 
 ## Inbound connection slots
 # inbound_connections = 4
 
+# Prefered transports for outbound connections
+active_profiles = ["tcp"]
+
+[net.profiles."tcp"]
+## P2P accept addresses
+inbound = ["tcp://127.0.0.1:28884"]
+
 ## P2P external addresses
 external_addrs = ["tcp://127.0.0.1:28884"]
 
@@ -31,13 +35,3 @@ external_addrs = ["tcp://127.0.0.1:28884"]
 
 ## Seed nodes to connect to
 seeds = ["tcp://127.0.0.1:28881"]
-
-# Prefered transports for outbound connections
-allowed_transports = ["tcp"]
-
-## these are the default configuration for the p2p network
-#manual_attempt_limit=0
-#seed_query_timeout_seconds=8
-#connect_timeout_seconds=10
-#channel_handshake_seconds=4
-#channel_heartbeat_seconds=10

+ 7 - 13
bin/genev/script/genevd_d.toml

@@ -14,15 +14,19 @@ rpc_disabled_methods = ["p2p.get_info"]
 
 ## net settings
 [net]
-## P2P accept addresses
-inbound = ["tcp://127.0.0.1:28885"]
-
 ## Connection slots
 outbound_connections = 4
 
 ## Inbound connection slots
 # inbound_connections = 4
 
+# Prefered transports for outbound connections
+active_profiles = ["tcp"]
+
+[net.profiles."tcp"]
+## P2P accept addresses
+inbound = ["tcp://127.0.0.1:28885"]
+
 ## P2P external addresses
 external_addrs = ["tcp://127.0.0.1:28885"]
 
@@ -31,13 +35,3 @@ external_addrs = ["tcp://127.0.0.1:28885"]
 
 ## Seed nodes to connect to
 seeds = ["tcp://127.0.0.1:28881"]
-
-# Prefered transports for outbound connections
-allowed_transports = ["tcp"]
-
-## these are the default configuration for the p2p network
-#manual_attempt_limit=0
-#seed_query_timeout_seconds=8
-#connect_timeout_seconds=10
-#channel_handshake_seconds=4
-#channel_heartbeat_seconds=10

+ 7 - 13
bin/genev/script/genevd_seed.toml

@@ -14,15 +14,19 @@ rpc_disabled_methods = ["p2p.get_info"]
 
 ## net settings
 [net]
-## P2P accept addresses
-inbound = ["tcp://127.0.0.1:28881"]
-
 ## Connection slots
 # outbound_connections=8
 
 ## Inbound connection slots
 inbound_connections = 4
 
+# Prefered transports for outbound connections
+active_profiles = ["tcp"]
+
+[net.profiles."tcp"]
+## P2P accept addresses
+inbound = ["tcp://127.0.0.1:28881"]
+
 ## P2P external addresses
 # external_addr = ["tls://127.0.0.1:28881"]
 
@@ -31,13 +35,3 @@ inbound_connections = 4
 
 ## Seed nodes to connect to
 # seeds=["tls://lilith0.dark.fi:28881", "tls://lilith1.dark.fi:28881"]
-
-# Prefered transports for outbound connections
-allowed_transports = ["tcp"]
-
-## these are the default configuration for the p2p network
-#manual_attempt_limit=0
-#seed_query_timeout_seconds=8
-#connect_timeout_seconds=10
-#channel_handshake_seconds=4
-#channel_heartbeat_seconds=10