From a29f9b40a6a6885e92dd2bb98d0d7dad7212fea9 Mon Sep 17 00:00:00 2001 From: oars Date: Fri, 14 Mar 2025 14:35:49 +0300 Subject: [PATCH] darkirc, darkfid, taud, damd configs: change boolean transport_mixing field to mixed_transport list --- bin/darkfid/darkfid_config.toml | 15 +++++++++------ bin/darkirc/config/darkirc-clearnet.toml | 4 ++-- bin/darkirc/config/darkirc-mixed.toml | 6 +++--- bin/darkirc/config/darkirc-tor.toml | 4 ++-- bin/darkirc/darkirc_config.toml | 7 +++---- bin/tau/taud/taud_config.toml | 7 +++---- contrib/localnet/taud-four-nodes/seed.toml | 7 +++---- .../localnet/taud-four-nodes/taud_full_node1.toml | 7 +++---- .../localnet/taud-four-nodes/taud_full_node2.toml | 7 +++---- .../localnet/taud-four-nodes/taud_full_node3.toml | 7 +++---- .../localnet/taud-four-nodes/taud_full_node4.toml | 7 +++---- script/research/dam/damd/damd_config.toml | 5 +++-- .../generic-node/generic_node_config.toml | 5 +++-- 13 files changed, 43 insertions(+), 45 deletions(-) diff --git a/bin/darkfid/darkfid_config.toml b/bin/darkfid/darkfid_config.toml index a1805462d..b66ca576c 100644 --- a/bin/darkfid/darkfid_config.toml +++ b/bin/darkfid/darkfid_config.toml @@ -106,8 +106,9 @@ seeds = ["tcp+tls://lilith0.dark.fi:8342", "tcp+tls://lilith1.dark.fi:8342"] # Whitelisted network transports for outbound connections allowed_transports = ["tcp+tls"] -# Allow transport mixing (e.g. Tor would be allowed to connect to `tcp://`) -#transport_mixing = false +# Transports you want to be mixed (e.g. Tor would be allowed to connect to `tcp://` +# if tcp is added to mixed_transports and tor is added to allowed_transports) +#mixed_transports = [] # Tor Socks5 proxy #tor_socks5_proxy = "socks5://127.0.0.1:9050" @@ -237,8 +238,9 @@ seeds = ["tcp+tls://lilith0.dark.fi:8442", "tcp+tls://lilith1.dark.fi:8442"] # Whitelisted network transports for outbound connections allowed_transports = ["tcp+tls"] -# Allow transport mixing (e.g. Tor would be allowed to connect to `tcp://`) -#transport_mixing = false +# Transports you want to be mixed (e.g. Tor would be allowed to connect to `tcp://` +# if tcp is added to mixed_transports and tor is added to allowed_transports) +#mixed_transports = [] # Tor Socks5 proxy #tor_socks5_proxy = "socks5://127.0.0.1:9050" @@ -369,8 +371,9 @@ hostlist = "~/.local/share/darkfi/darkfid/localnet/p2p_hostlist.tsv" # Whitelisted network transports for outbound connections #allowed_transports = ["tcp+tls"] -# Allow transport mixing (e.g. Tor would be allowed to connect to `tcp://`) -#transport_mixing = false +# Transports you want to be mixed (e.g. Tor would be allowed to connect to `tcp://` +# if tcp is added to mixed_transports and tor is added to allowed_transports) +#mixed_transports = [] # Tor Socks5 proxy #tor_socks5_proxy = "socks5://127.0.0.1:9050" diff --git a/bin/darkirc/config/darkirc-clearnet.toml b/bin/darkirc/config/darkirc-clearnet.toml index f3e6e296a..9b58eb988 100644 --- a/bin/darkirc/config/darkirc-clearnet.toml +++ b/bin/darkirc/config/darkirc-clearnet.toml @@ -35,5 +35,5 @@ outbound_connections = 8 ## Inbound connection slots inbound_connections = 64 -## Enable transport mixing -transport_mixing = false +## Transports to be mixed +mixed_transports = [] diff --git a/bin/darkirc/config/darkirc-mixed.toml b/bin/darkirc/config/darkirc-mixed.toml index 8ef3ca3fd..4859fec9d 100644 --- a/bin/darkirc/config/darkirc-mixed.toml +++ b/bin/darkirc/config/darkirc-mixed.toml @@ -24,7 +24,7 @@ channel_heartbeat_interval = 90 outbound_peer_discovery_cooloff_time = 60 ## Whitelisted transports for outbound connections -allowed_transports = ["tcp+tls", "tor"] +allowed_transports = ["tcp+tls", "tor", "tor+tls"] ## Addresses we want to advertise to peers external_addrs = ["tcp+tls://MY_IP_V4:26661", "tcp+tls://MY_IP_V6:26661", "tcp+tls://my.resolveable.address:26661", "tor://youraddress.onion:25551"] @@ -45,5 +45,5 @@ outbound_connections = 8 ## Inbound connection slots inbound_connections = 64 -## Enable transport mixing -transport_mixing = true +## Transports to be mixed +mixed_transports = ["tcp", "tcp+tls"] diff --git a/bin/darkirc/config/darkirc-tor.toml b/bin/darkirc/config/darkirc-tor.toml index c8b3108f8..6aa5f7e32 100644 --- a/bin/darkirc/config/darkirc-tor.toml +++ b/bin/darkirc/config/darkirc-tor.toml @@ -44,5 +44,5 @@ outbound_connections = 8 ## Inbound connection slots inbound_connections = 64 -## Enable transport mixing -transport_mixing = false +## Transports to be mixed +mixed_transports = [] diff --git a/bin/darkirc/darkirc_config.toml b/bin/darkirc/darkirc_config.toml index 25cf6e3d4..fe2e9473b 100644 --- a/bin/darkirc/darkirc_config.toml +++ b/bin/darkirc/darkirc_config.toml @@ -94,10 +94,9 @@ allowed_transports = ["tcp+tls"] #allowed_transports = ["tor"] #allowed_transports = ["tor", "tor+tls"] -# Enable transport mixing -# Allows mixing transports, e.g. tor+tls:// connecting to tcp+tls:// -# By default this is not allowed. -transport_mixing = false +# Transports you want to be mixed (e.g. Tor would be allowed to connect to `tcp://` +# if tcp is added to mixed_transports and tor is added to allowed_transports) +mixed_transports = [] # Tor Socks5 proxy #tor_socks5_proxy = "socks5://127.0.0.1:9050" diff --git a/bin/tau/taud/taud_config.toml b/bin/tau/taud/taud_config.toml index 01c94f05e..2e7871f20 100644 --- a/bin/tau/taud/taud_config.toml +++ b/bin/tau/taud/taud_config.toml @@ -95,10 +95,9 @@ allowed_transports = ["tcp+tls"] #allowed_transports = ["tor"] #allowed_transports = ["tor", "tor+tls"] -# Enable transport mixing -# Allows mixing transports, e.g. tor+tls:// connecting to tcp+tls:// -# By default this is not allowed. -transport_mixing = false +# Transports you want to be mixed (e.g. Tor would be allowed to connect to `tcp://` +# if tcp is added to mixed_transports and tor is added to allowed_transports) +mixed_transports = [] # Tor Socks5 proxy #tor_socks5_proxy = "socks5://127.0.0.1:9050" diff --git a/contrib/localnet/taud-four-nodes/seed.toml b/contrib/localnet/taud-four-nodes/seed.toml index 0bd95d4fe..5b767d12a 100644 --- a/contrib/localnet/taud-four-nodes/seed.toml +++ b/contrib/localnet/taud-four-nodes/seed.toml @@ -90,10 +90,9 @@ inbound_connections = 8 allowed_transports = ["tcp"] #allowed_transports = ["tor"] -# Enable transport mixing -# Allows mixing transports, e.g. tor+tls:// connecting to tcp+tls:// -# By default this is not allowed. -transport_mixing = false +# Transports you want to be mixed (e.g. Tor would be allowed to connect to `tcp://` +# if tcp is added to mixed_transports and tor is added to allowed_transports) +mixed_transports = [] localnet = true diff --git a/contrib/localnet/taud-four-nodes/taud_full_node1.toml b/contrib/localnet/taud-four-nodes/taud_full_node1.toml index 24cc6b3e0..2b2ddfa8e 100644 --- a/contrib/localnet/taud-four-nodes/taud_full_node1.toml +++ b/contrib/localnet/taud-four-nodes/taud_full_node1.toml @@ -85,10 +85,9 @@ seeds = ["tcp://127.0.0.1:23331"] allowed_transports = ["tcp"] #allowed_transports = ["tor"] -# Enable transport mixing -# Allows mixing transports, e.g. tor+tls:// connecting to tcp+tls:// -# By default this is not allowed. -transport_mixing = false +# Transports you want to be mixed (e.g. Tor would be allowed to connect to `tcp://` +# if tcp is added to mixed_transports and tor is added to allowed_transports) +mixed_transports = [] localnet = true diff --git a/contrib/localnet/taud-four-nodes/taud_full_node2.toml b/contrib/localnet/taud-four-nodes/taud_full_node2.toml index b9a7af362..c2d849fc0 100644 --- a/contrib/localnet/taud-four-nodes/taud_full_node2.toml +++ b/contrib/localnet/taud-four-nodes/taud_full_node2.toml @@ -85,10 +85,9 @@ seeds = ["tcp://127.0.0.1:23331"] allowed_transports = ["tcp"] #allowed_transports = ["tor"] -# Enable transport mixing -# Allows mixing transports, e.g. tor+tls:// connecting to tcp+tls:// -# By default this is not allowed. -transport_mixing = false +# Transports you want to be mixed (e.g. Tor would be allowed to connect to `tcp://` +# if tcp is added to mixed_transports and tor is added to allowed_transports) +mixed_transports = [] localnet = true diff --git a/contrib/localnet/taud-four-nodes/taud_full_node3.toml b/contrib/localnet/taud-four-nodes/taud_full_node3.toml index 1b11996ff..7cd4f3327 100644 --- a/contrib/localnet/taud-four-nodes/taud_full_node3.toml +++ b/contrib/localnet/taud-four-nodes/taud_full_node3.toml @@ -85,10 +85,9 @@ seeds = ["tcp://127.0.0.1:23331"] allowed_transports = ["tcp"] #allowed_transports = ["tor"] -# Enable transport mixing -# Allows mixing transports, e.g. tor+tls:// connecting to tcp+tls:// -# By default this is not allowed. -transport_mixing = false +# Transports you want to be mixed (e.g. Tor would be allowed to connect to `tcp://` +# if tcp is added to mixed_transports and tor is added to allowed_transports) +mixed_transports = [] localnet = true diff --git a/contrib/localnet/taud-four-nodes/taud_full_node4.toml b/contrib/localnet/taud-four-nodes/taud_full_node4.toml index b9486b919..0b923f2cf 100644 --- a/contrib/localnet/taud-four-nodes/taud_full_node4.toml +++ b/contrib/localnet/taud-four-nodes/taud_full_node4.toml @@ -85,10 +85,9 @@ seeds = ["tcp://127.0.0.1:23331"] allowed_transports = ["tcp"] #allowed_transports = ["tor"] -# Enable transport mixing -# Allows mixing transports, e.g. tor+tls:// connecting to tcp+tls:// -# By default this is not allowed. -transport_mixing = false +# Transports you want to be mixed (e.g. Tor would be allowed to connect to `tcp://` +# if tcp is added to mixed_transports and tor is added to allowed_transports) +mixed_transports = [] localnet = true diff --git a/script/research/dam/damd/damd_config.toml b/script/research/dam/damd/damd_config.toml index eacb62f3c..41517f50e 100644 --- a/script/research/dam/damd/damd_config.toml +++ b/script/research/dam/damd/damd_config.toml @@ -39,8 +39,9 @@ hostlist = "~/.local/share/darkfi/damd/p2p_hostlist.tsv" # Whitelisted network transports for outbound connections #allowed_transports = ["tcp+tls"] -# Allow transport mixing (e.g. Tor would be allowed to connect to `tcp://`) -#transport_mixing = true +# Transports you want to be mixed (e.g. Tor would be allowed to connect to `tcp://` +# if tcp is added to mixed_transports and tor is added to allowed_transports) +#mixed_transports = [] # Outbound connection slots number, this many connections will be # attempted. (This does not include manual connections) diff --git a/script/research/generic-node/generic_node_config.toml b/script/research/generic-node/generic_node_config.toml index 6c84c85a2..c31233e60 100644 --- a/script/research/generic-node/generic_node_config.toml +++ b/script/research/generic-node/generic_node_config.toml @@ -25,8 +25,9 @@ inbound = ["tcp+tls://0.0.0.0:38967"] # Whitelisted network transports for outbound connections #allowed_transports = ["tcp+tls"] -# Allow transport mixing (e.g. Tor would be allowed to connect to `tcp://`) -#transport_mixing = true +# Transports you want to be mixed (e.g. Tor would be allowed to connect to `tcp://` +# if tcp is added to mixed_transports and tor is added to allowed_transports) +#mixed_transports = [] # Outbound connection slots number, this many connections will be # attempted. (This does not include manual connections)