From ced1637d07516794c2942a0d4ba2ac4f2fb4580e Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Wed, 13 Oct 2021 14:44:36 +0200
Subject: [PATCH] joinmarket: share IRC server definitions between jm and
 ob-watcher

Also add server name comments.
---
 modules/joinmarket-ob-watcher.nix | 23 ++-----------------
 modules/joinmarket.nix            | 37 ++++++++++++++++++++-----------
 2 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/modules/joinmarket-ob-watcher.nix b/modules/joinmarket-ob-watcher.nix
index faa485c..7353798 100644
--- a/modules/joinmarket-ob-watcher.nix
+++ b/modules/joinmarket-ob-watcher.nix
@@ -41,14 +41,7 @@ let
   nbPkgs = config.nix-bitcoin.pkgs;
   secretsDir = config.nix-bitcoin.secretsDir;
 
-  inherit (config.services) bitcoind;
-
-  torAddress = config.services.tor.client.socksListenAddress;
-  socks5Settings = with config.services.tor.client.socksListenAddress; ''
-    socks5 = true
-    socks5_host = ${addr}
-    socks5_port = ${toString port}
-  '';
+  inherit (config.services) bitcoind joinmarket;
 
   configFile = builtins.toFile "config" ''
     [BLOCKCHAIN]
@@ -58,19 +51,7 @@ let
     rpc_port = ${toString bitcoind.rpc.port}
     rpc_user = ${bitcoind.rpc.users.joinmarket-ob-watcher.name}
 
-    [MESSAGING:server1]
-    host = darkirc6tqgpnwd3blln3yfv5ckl47eg7llfxkmtovrv7c7iwohhb6ad.onion
-    channel = joinmarket-pit
-    port = 6697
-    usessl = true
-    ${socks5Settings}
-
-    [MESSAGING:server2]
-    host = ncwkrwxpq2ikcngxq3dy2xctuheniggtqeibvgofixpzvrwpa77tozqd.onion
-    channel = joinmarket-pit
-    port = 6667
-    usessl = false
-    ${socks5Settings}
+    ${joinmarket.ircServers}
   '';
 in {
   inherit options;
diff --git a/modules/joinmarket.nix b/modules/joinmarket.nix
index 9ac4d8a..ed74156 100644
--- a/modules/joinmarket.nix
+++ b/modules/joinmarket.nix
@@ -29,6 +29,11 @@ let
     cli = mkOption {
       default = cli;
     };
+    # Used by ./joinmarket-ob-watcher.nix
+    ircServers = mkOption {
+      readOnly = true;
+      default = ircServers;
+    };
     # This option is only used by netns-isolation
     enforceTor = mkOption {
       readOnly = true;
@@ -112,6 +117,24 @@ let
     socks5_port = ${toString torAddress.port}
   '';
 
+  ircServers = ''
+    # irc.darkscience.net
+    [MESSAGING:server1]
+    host = darkirc6tqgpnwd3blln3yfv5ckl47eg7llfxkmtovrv7c7iwohhb6ad.onion
+    channel = joinmarket-pit
+    port = 6697
+    usessl = true
+    ${socks5Settings}
+
+    # irc.hackint.org
+    [MESSAGING:server2]
+    host = ncwkrwxpq2ikcngxq3dy2xctuheniggtqeibvgofixpzvrwpa77tozqd.onion
+    channel = joinmarket-pit
+    port = 6667
+    usessl = false
+    ${socks5Settings}
+  '';
+
   # Based on https://github.com/JoinMarket-Org/joinmarket-clientserver/blob/master/jmclient/jmclient/configure.py
   yg = cfg.yieldgenerator;
   configFile = builtins.toFile "config" ''
@@ -129,19 +152,7 @@ let
     rpc_user = ${bitcoind.rpc.users.privileged.name}
     ${optionalString (cfg.rpcWalletFile != null) "rpc_wallet_file = ${cfg.rpcWalletFile}"}
 
-    [MESSAGING:server1]
-    host = darkirc6tqgpnwd3blln3yfv5ckl47eg7llfxkmtovrv7c7iwohhb6ad.onion
-    channel = joinmarket-pit
-    port = 6697
-    usessl = true
-    ${socks5Settings}
-
-    [MESSAGING:server2]
-    host = ncwkrwxpq2ikcngxq3dy2xctuheniggtqeibvgofixpzvrwpa77tozqd.onion
-    channel = joinmarket-pit
-    port = 6667
-    usessl = false
-    ${socks5Settings}
+    ${ircServers}
 
     [LOGGING]
     console_log_level = INFO