move darkirc tmux session to contrib

bin/darkirc/script/tmux_session/darkirc_full_node1.toml

@@ -1,48 +0,0 @@
-## JSON-RPC listen URL
-rpc_listen = "tcp://127.0.0.1:8890"
-
-## IRC listen URL
-irc_listen = "tcp://127.0.0.1:22022"
-
-## Sets Datastore Path
-datastore = "/tmp/darkirc_test/darkirc1"
-
-## List of channels to autojoin for new client connections
-autojoin = ["#dev", "#test"]
-
-## P2P net settings
-[net]
-## Connection slots
-outbound_connections = 8
-
-## Inbound connection slots
-inbound_connections = 8
-
-inbound = ["tcp://127.0.0.1:25552"]
-
-external_addrs = ["tcp://127.0.0.1:25552"]
-
-# peers = []
-
-## Seed nodes to connect to 
-seeds = ["tcp://127.0.0.1:25551"]
-
-# Prefered transports for outbound connections
-allowed_transports = ["tcp"]
-
-localnet = true
-hostlist = "/tmp/darkirc_test/darkirc1-host.tsv"
-advertise = true
-#
-# [channel."#dev"]
-# topic = "DarkFi Development HQ"
-
-[channel."#test"]
-secret = "HoLfk8vXBvNsBZ73e2xRPBZ9vEbnF9FVi4fDdyU9AZLU"
-
-[crypto]
-#dm_chacha_public = "BmUo88RJ5TyR7gUWnr6Mk7tqZE5xPuCqJdJV8KWzsagh"
-dm_chacha_secret = "Bwdhe48rKsqFwGUquQSSGZZS5NQP1szrdJUhyDE77Br6"
-
-[contact."node2"]
-dm_chacha_public = "ACaVU2uf4n2cheRHFP7RB9PASLweBJNdp5QJ4PGwVz67"

bin/darkirc/script/tmux_session/darkirc_full_node2.toml

@@ -1,48 +0,0 @@
-## JSON-RPC listen URL
-rpc_listen = "tcp://127.0.0.1:8891"
-
-## IRC listen URL
-irc_listen = "tcp://127.0.0.1:22023"
-
-## Sets Datastore Path
-datastore = "/tmp/darkirc_test/darkirc2"
-
-## List of channels to autojoin for new client connections
-autojoin = ["#dev", "#test"]
-
-## P2P net settings
-[net]
-## Connection slots
-outbound_connections = 8
-
-## Inbound connection slots
-# inbound_connections = 8
-
-# inbound = ["tcp://127.0.0.1:25553"]
-
-# external_addrs = ["tcp://127.0.0.1:25553"]
-
-# peers = ["tcp://127.0.0.1:25552"]
-
-## Seed nodes to connect to 
-seeds = ["tcp://127.0.0.1:25551"]
-
-# Prefered transports for outbound connections
-allowed_transports = ["tcp"]
-
-localnet = true
-hostlist = "/tmp/darkirc_test/darkirc2-host.tsv"
-# advertise = true
-#
-# [channel."#dev"]
-# topic = "DarkFi Development HQ"
-
-[channel."#test"]
-secret = "HoLfk8vXBvNsBZ73e2xRPBZ9vEbnF9FVi4fDdyU9AZLU"
-
-[crypto]
-#dm_chacha_public = "ACaVU2uf4n2cheRHFP7RB9PASLweBJNdp5QJ4PGwVz67"
-dm_chacha_secret = "JwsF8D2xvr9ff3Z5j1rhUCBL8odhdZR7qvR2qJ1ZV6P"
-
-[contact."node1"]
-dm_chacha_public = "BmUo88RJ5TyR7gUWnr6Mk7tqZE5xPuCqJdJV8KWzsagh"

bin/darkirc/script/tmux_session/darkirc_full_node3.toml

@@ -1,41 +0,0 @@
-## JSON-RPC listen URL
-rpc_listen = "tcp://127.0.0.1:8892"
-
-## IRC listen URL
-irc_listen = "tcp://127.0.0.1:22024"
-
-## Sets Datastore Path
-datastore = "/tmp/darkirc_test/darkirc3"
-
-## List of channels to autojoin for new client connections
-autojoin = ["#dev", "#test"]
-
-## P2P net settings
-[net]
-## Connection slots
-outbound_connections = 8
-
-## Inbound connection slots
-# inbound_connections = 8
-
-# inbound = ["tcp://127.0.0.1:25554"]
-
-# external_addrs = ["tcp://127.0.0.1:25554"]
-
-# peers = ["tcp://127.0.0.1:25552"]
-
-## Seed nodes to connect to 
-seeds = ["tcp://127.0.0.1:25551"]
-
-# Prefered transports for outbound connections
-allowed_transports = ["tcp"]
-
-localnet = true
-hostlist = "/tmp/darkirc_test/darkirc3-host.tsv"
-# advertise = true
-#
-# [channel."#dev"]
-# topic = "DarkFi Development HQ"
-
-[channel."#test"]
-secret = "HoLfk8vXBvNsBZ73e2xRPBZ9vEbnF9FVi4fDdyU9AZLU"

bin/darkirc/script/tmux_session/darkirc_full_node4.toml

@@ -1,41 +0,0 @@
-## JSON-RPC listen URL
-rpc_listen = "tcp://127.0.0.1:8893"
-
-## IRC listen URL
-irc_listen = "tcp://127.0.0.1:22025"
-
-## Sets Datastore Path
-datastore = "/tmp/darkirc_test/darkirc4"
-
-## List of channels to autojoin for new client connections
-autojoin = ["#dev", "#test"]
-
-## P2P net settings
-[net]
-## Connection slots
-outbound_connections = 8
-
-## Inbound connection slots
-# inbound_connections = 8
-
-# inbound = ["tcp://127.0.0.1:25555"]
-
-# external_addrs = ["tcp://127.0.0.1:25555"]
-
-# peers = ["tcp://127.0.0.1:25554"]
-
-## Seed nodes to connect to
-seeds = ["tcp://127.0.0.1:25551"]
-
-# Prefered transports for outbound connections
-allowed_transports = ["tcp"]
-
-localnet = true
-hostlist = "/tmp/darkirc_test/darkirc4-host.tsv"
-# advertise = true
-#
-# [channel."#dev"]
-# topic = "DarkFi Development HQ"
-
-[channel."#test"]
-secret = "HoLfk8vXBvNsBZ73e2xRPBZ9vEbnF9FVi4fDdyU9AZLU"

bin/darkirc/script/tmux_session/seed.toml

@@ -1,43 +0,0 @@
-## JSON-RPC listen URL
-rpc_listen="tcp://127.0.0.1:8888"
-
-## IRC listen URL
-irc_listen="tcp://127.0.0.1:22020"
-
-## Sets Datastore Path
-datastore = "/tmp/darkirc_test/darkirc_seed"
-
-## List of channels to autojoin for new client connections
-autojoin = ["#dev"]
-
-## TLS certificate path if IRC acceptor uses TLS (optional)
-#irc_tls_cert = "/etc/letsencrypt/darkirc/fullchain.pem"
-
-## TLS secret key path if IRC acceptor uses TLS (optional)
-#irc_tls_secret = "/etc/letsencrypt/darkirc/privkey.pem"
-
-## P2P net settings
-[net]
-## Outbound connection slots
-# outbound_connections = 8
-
-## Inbound connection slots
-inbound_connections = 8
-
-## P2P accept addresses
-inbound = ["tcp://127.0.0.1:25551"]
-
-# Prefered transports for outbound connections
-allowed_transports = ["tcp"]
-
-localnet = true
-hostlist = "/tmp/darkirc_test/darkirc-seed-host.tsv"
-
-## Seed nodes to connect to 
-# seeds = ["tcp://127.0.0.1:25551", "tls://lilith1.dark.fi:25551"]
-#
-# [channel."#dev"]
-# topic = "DarkFi Development HQ"
-
-# [channel."#test1"]
-# secret = "HoLfk8vXBvNsBZ73e2xRPBZ9vEbnF9FVi4fDdyU9AZLU"

bin/darkirc/script/tmux_session/tmux_sessions.sh

@@ -1,30 +0,0 @@
-#!/bin/sh
-# Start a tmux session of four darkirc nodes, and optionally four weechat clients.
-set -e
-
-tmux new-session -s "darkirc" -n "darkirc" -d
-tmux send-keys "../../../../darkirc --config seed.toml --skip-dag-sync" Enter && sleep 1
-tmux split-window -h
-tmux send-keys "../../../../darkirc --config darkirc_full_node1.toml --skip-dag-sync" Enter && sleep 1
-tmux split-window -h
-tmux send-keys "../../../../darkirc --config darkirc_full_node2.toml" Enter
-tmux select-pane -t 0
-tmux split-window -v
-tmux send-keys "../../../../darkirc --config darkirc_full_node3.toml" Enter
-tmux select-pane -t 2
-tmux split-window -v
-tmux send-keys "../../../../darkirc --config darkirc_full_node4.toml" Enter
-
-if [ -z "$1" ]; then
-	tmux new-window -t "darkirc:1" -n "weechat"
-	tmux send-keys "weechat -t -r '/server add darkirc_a 127.0.0.1/22022 -notls;/connect darkirc_a;/set irc.server_default.nicks Alice'" Enter
-	tmux split-window -v
-	tmux send-keys "weechat -t -r '/server add darkirc_b 127.0.0.1/22023 -notls;/connect darkirc_b;/set irc.server_default.nicks Bob'" Enter
-	tmux split-window -h
-	tmux send-keys "weechat -t -r '/server add darkirc_c 127.0.0.1/22024 -notls;/connect darkirc_c;/set irc.server_default.nicks Charlie'" Enter
-	tmux select-pane -t 0
-	tmux split-window -h
-	tmux send-keys "weechat -t -r '/server add darkirc_d 127.0.0.1/22025 -notls;/connect darkirc_d;/set irc.server_default.nicks Dave'" Enter
-fi
-
-tmux attach

contrib/localnet/darkirc-four-nodes/darkirc_full_node1.toml

@@ -10,10 +10,18 @@ datastore = "/tmp/darkirc_test/darkirc1"
 ## List of channels to autojoin for new client connections
 autojoin = ["#dev", "#test"]
 
+# Log to file. Off by default.
+#log = "/tmp/darkirc1.log"
+# Set log level. 1 is info (default), 2 is debug, 3 is trace
+#verbose = 2
+
 ## P2P net settings
 [net]
 ## Connection slots
-outbound_connections = 3
+outbound_connections = 8
+
+## Inbound connection slots
+inbound_connections = 8
 
 inbound = ["tcp://127.0.0.1:25552"]
 
@@ -28,6 +36,8 @@ seeds = ["tcp://127.0.0.1:25551"]
 allowed_transports = ["tcp"]
 
 localnet = true
+hostlist = "/tmp/darkirc_test/darkirc1-host.tsv"
+
 #
 # [channel."#dev"]
 # topic = "DarkFi Development HQ"
@@ -35,8 +45,9 @@ localnet = true
 [channel."#test"]
 secret = "HoLfk8vXBvNsBZ73e2xRPBZ9vEbnF9FVi4fDdyU9AZLU"
 
-[secret_key."FCFYzvZ98gAncGNadFp35pTAJSuoJKZFddsi12PnREwp"]
+[crypto]
+#dm_chacha_public = "BmUo88RJ5TyR7gUWnr6Mk7tqZE5xPuCqJdJV8KWzsagh"
+dm_chacha_secret = "Bwdhe48rKsqFwGUquQSSGZZS5NQP1szrdJUhyDE77Br6"
 
 [contact."node2"]
-## contact public key
-public_key = "D6UzKA6qCG5Mep16i6pJYkUCQcnp46E1jPBsUhyJiXhb"
+dm_chacha_public = "ACaVU2uf4n2cheRHFP7RB9PASLweBJNdp5QJ4PGwVz67"

contrib/localnet/darkirc-four-nodes/darkirc_full_node2.toml

@@ -10,14 +10,22 @@ datastore = "/tmp/darkirc_test/darkirc2"
 ## List of channels to autojoin for new client connections
 autojoin = ["#dev", "#test"]
 
+# Log to file. Off by default.
+#log = "/tmp/darkirc2.log"
+# Set log level. 1 is info (default), 2 is debug, 3 is trace
+#verbose = 2
+
 ## P2P net settings
 [net]
 ## Connection slots
-outbound_connections = 3
+outbound_connections = 8
+
+## Inbound connection slots
+# inbound_connections = 8
 
-inbound = ["tcp://127.0.0.1:25553"]
+# inbound = ["tcp://127.0.0.1:25553"]
 
-external_addrs = ["tcp://127.0.0.1:25553"]
+# external_addrs = ["tcp://127.0.0.1:25553"]
 
 # peers = ["tcp://127.0.0.1:25552"]
 
@@ -28,6 +36,8 @@ seeds = ["tcp://127.0.0.1:25551"]
 allowed_transports = ["tcp"]
 
 localnet = true
+hostlist = "/tmp/darkirc_test/darkirc2-host.tsv"
+
 #
 # [channel."#dev"]
 # topic = "DarkFi Development HQ"
@@ -35,8 +45,9 @@ localnet = true
 [channel."#test"]
 secret = "HoLfk8vXBvNsBZ73e2xRPBZ9vEbnF9FVi4fDdyU9AZLU"
 
-[secret_key."GnS3vqKQtCnbJJcFMsUfTJc7w3B1E49MgZ8jKiksumYh"]
+[crypto]
+#dm_chacha_public = "ACaVU2uf4n2cheRHFP7RB9PASLweBJNdp5QJ4PGwVz67"
+dm_chacha_secret = "JwsF8D2xvr9ff3Z5j1rhUCBL8odhdZR7qvR2qJ1ZV6P"
 
 [contact."node1"]
-## contact public key
-public_key = "9sfMEVLphJ4dTX3SEvm6NBhTbWDqfsxu7R2bo88CtV8g"
+dm_chacha_public = "BmUo88RJ5TyR7gUWnr6Mk7tqZE5xPuCqJdJV8KWzsagh"

contrib/localnet/darkirc-four-nodes/darkirc_full_node3.toml

@@ -10,14 +10,22 @@ datastore = "/tmp/darkirc_test/darkirc3"
 ## List of channels to autojoin for new client connections
 autojoin = ["#dev", "#test"]
 
+# Log to file. Off by default.
+#log = "/tmp/darkirc3.log"
+# Set log level. 1 is info (default), 2 is debug, 3 is trace
+#verbose = 2
+
 ## P2P net settings
 [net]
 ## Connection slots
-outbound_connections = 3
+outbound_connections = 8
+
+## Inbound connection slots
+# inbound_connections = 8
 
-inbound = ["tcp://127.0.0.1:25554"]
+# inbound = ["tcp://127.0.0.1:25554"]
 
-external_addrs = ["tcp://127.0.0.1:25554"]
+# external_addrs = ["tcp://127.0.0.1:25554"]
 
 # peers = ["tcp://127.0.0.1:25552"]
 
@@ -28,6 +36,8 @@ seeds = ["tcp://127.0.0.1:25551"]
 allowed_transports = ["tcp"]
 
 localnet = true
+hostlist = "/tmp/darkirc_test/darkirc3-host.tsv"
+
 #
 # [channel."#dev"]
 # topic = "DarkFi Development HQ"

contrib/localnet/darkirc-four-nodes/darkirc_full_node4.toml

@@ -10,14 +10,22 @@ datastore = "/tmp/darkirc_test/darkirc4"
 ## List of channels to autojoin for new client connections
 autojoin = ["#dev", "#test"]
 
+# Log to file. Off by default.
+#log = "/tmp/darkirc4.log"
+# Set log level. 1 is info (default), 2 is debug, 3 is trace
+#verbose = 2
+
 ## P2P net settings
 [net]
 ## Connection slots
-outbound_connections = 3
+outbound_connections = 8
+
+## Inbound connection slots
+# inbound_connections = 8
 
-inbound = ["tcp://127.0.0.1:25555"]
+# inbound = ["tcp://127.0.0.1:25555"]
 
-external_addrs = ["tcp://127.0.0.1:25555"]
+# external_addrs = ["tcp://127.0.0.1:25555"]
 
 # peers = ["tcp://127.0.0.1:25554"]
 
@@ -28,6 +36,8 @@ seeds = ["tcp://127.0.0.1:25551"]
 allowed_transports = ["tcp"]
 
 localnet = true
+hostlist = "/tmp/darkirc_test/darkirc4-host.tsv"
+
 #
 # [channel."#dev"]
 # topic = "DarkFi Development HQ"

contrib/localnet/darkirc-four-nodes/seed.toml

@@ -1,8 +1,8 @@
 ## JSON-RPC listen URL
-# rpc_listen="tcp://127.0.0.1:8888"
+rpc_listen="tcp://127.0.0.1:8888"
 
 ## IRC listen URL
-# irc_listen="tcp://127.0.0.1:22020"
+irc_listen="tcp://127.0.0.1:22020"
 
 ## Sets Datastore Path
 datastore = "/tmp/darkirc_test/darkirc_seed"
@@ -16,18 +16,27 @@ autojoin = ["#dev"]
 ## TLS secret key path if IRC acceptor uses TLS (optional)
 #irc_tls_secret = "/etc/letsencrypt/darkirc/privkey.pem"
 
+# Log to file. Off by default.
+#log = "/tmp/darkirc0.log"
+# Set log level. 1 is info (default), 2 is debug, 3 is trace
+#verbose = 2
+
 ## P2P net settings
 [net]
-## Connection slots
-# outbound_connections=8
+## Outbound connection slots
+# outbound_connections = 8
+
+## Inbound connection slots
+inbound_connections = 8
 
 ## P2P accept addresses
 inbound = ["tcp://127.0.0.1:25551"]
 
 # Prefered transports for outbound connections
-outbound_transports = ["tcp"]
+allowed_transports = ["tcp"]
 
 localnet = true
+hostlist = "/tmp/darkirc_test/darkirc-seed-host.tsv"
 
 ## Seed nodes to connect to 
 # seeds = ["tcp://127.0.0.1:25551", "tls://lilith1.dark.fi:25551"]

contrib/localnet/darkirc-four-nodes/tmux_sessions.sh

@@ -3,28 +3,28 @@
 set -e
 
 tmux new-session -s "darkirc" -n "darkirc" -d
-tmux send-keys "../../../../darkirc --config seed.toml" Enter && sleep 1
+tmux send-keys "../../../darkirc --config seed.toml --skip-dag-sync" Enter && sleep 1
 tmux split-window -h
-tmux send-keys "../../../../darkirc --config darkirc_full_node1.toml" Enter && sleep 1
+tmux send-keys "../../../darkirc --config darkirc_full_node1.toml --skip-dag-sync" Enter && sleep 1
 tmux split-window -h
-tmux send-keys "../../../../darkirc --config darkirc_full_node2.toml" Enter
+tmux send-keys "../../../darkirc --config darkirc_full_node2.toml" Enter
 tmux select-pane -t 0
 tmux split-window -v
-tmux send-keys "../../../../darkirc --config darkirc_full_node3.toml" Enter
+tmux send-keys "../../../darkirc --config darkirc_full_node3.toml" Enter
 tmux select-pane -t 2
 tmux split-window -v
-tmux send-keys "../../../../darkirc --config darkirc_full_node4.toml" Enter
+tmux send-keys "../../../darkirc --config darkirc_full_node4.toml" Enter
 
 if [ -z "$1" ]; then
 	tmux new-window -t "darkirc:1" -n "weechat"
-	tmux send-keys "weechat -t -r '/server add darkirc_a 127.0.0.1/22022 -notls;/connect darkirc_a;/nick Alice'" Enter
+	tmux send-keys "weechat -t -r '/server add darkirc_a 127.0.0.1/22022 -notls;/connect darkirc_a;/set irc.server_default.nicks Alice'" Enter
 	tmux split-window -v
-	tmux send-keys "weechat -t -r '/server add darkirc_b 127.0.0.1/22023 -notls;/connect darkirc_b;/nick Bob'" Enter
+	tmux send-keys "weechat -t -r '/server add darkirc_b 127.0.0.1/22023 -notls;/connect darkirc_b;/set irc.server_default.nicks Bob'" Enter
 	tmux split-window -h
-	tmux send-keys "weechat -t -r '/server add darkirc_c 127.0.0.1/22024 -notls;/connect darkirc_c;/nick Charlie'" Enter
+	tmux send-keys "weechat -t -r '/server add darkirc_c 127.0.0.1/22024 -notls;/connect darkirc_c;/set irc.server_default.nicks Charlie'" Enter
 	tmux select-pane -t 0
 	tmux split-window -h
-	tmux send-keys "weechat -t -r '/server add darkirc_d 127.0.0.1/22025 -notls;/connect darkirc_d;/nick Dave'" Enter
+	tmux send-keys "weechat -t -r '/server add darkirc_d 127.0.0.1/22025 -notls;/connect darkirc_d;/set irc.server_default.nicks Dave'" Enter
 fi
 
 tmux attach