From 59fc003ebdd188fef95d1f6ea41ae0d230c500ca Mon Sep 17 00:00:00 2001 From: nixbitcoin Date: Wed, 13 Oct 2021 11:52:42 +0000 Subject: [PATCH 1/3] joinmarket: 0.9.1 -> 0.9.2 Remove "improve-genwallet" patch --- pkgs/joinmarket/default.nix | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/joinmarket/default.nix b/pkgs/joinmarket/default.nix index 36ec9a7..5d76944 100644 --- a/pkgs/joinmarket/default.nix +++ b/pkgs/joinmarket/default.nix @@ -1,20 +1,10 @@ -{ stdenv, lib, fetchurl, applyPatches, fetchpatch, python3, nbPython3Packages, pkgs }: +{ stdenv, lib, fetchurl, python3, nbPython3Packages, pkgs }: let - version = "0.9.1"; - src = applyPatches { - src = fetchurl { - url = "https://github.com/JoinMarket-Org/joinmarket-clientserver/archive/v${version}.tar.gz"; - sha256 = "0a8jlzi3ll1dw60fwnqs5awmcfxdjynh6i1gfmcc29qhwjpx5djl"; - }; - patches = [ - (fetchpatch { - # https://github.com/JoinMarket-Org/joinmarket-clientserver/pull/999 - name = "improve-genwallet"; - url = "https://patch-diff.githubusercontent.com/raw/JoinMarket-Org/joinmarket-clientserver/pull/999.patch"; - sha256 = "etlbi0yhb4X5EAPUerIIAXU6l7EeB9O2c07QaXxCEAg="; - }) - ]; + version = "0.9.2"; + src = fetchurl { + url = "https://github.com/JoinMarket-Org/joinmarket-clientserver/archive/v${version}.tar.gz"; + sha256 = "0nzhnf2324d0qc9pljcjwpzpvhcclqg0ijvzb1skmn73s4f25akg"; }; runtimePackages = with nbPython3Packages; [ From ced1637d07516794c2942a0d4ba2ac4f2fb4580e Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Wed, 13 Oct 2021 14:44:36 +0200 Subject: [PATCH 2/3] 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 From 3781a85c9bb0b42299134ca783a670ff863bf234 Mon Sep 17 00:00:00 2001 From: nixbitcoin Date: Wed, 13 Oct 2021 14:45:52 +0200 Subject: [PATCH 3/3] joinmarket: enable Agora as a third IRC server --- modules/joinmarket.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/joinmarket.nix b/modules/joinmarket.nix index ed74156..546b234 100644 --- a/modules/joinmarket.nix +++ b/modules/joinmarket.nix @@ -133,6 +133,14 @@ let port = 6667 usessl = false ${socks5Settings} + + # agora.anarplex.net + [MESSAGING:server3] + host = vxecvd6lc4giwtasjhgbrr3eop6pzq6i5rveracktioneunalgqlwfad.onion + channel = joinmarket-pit + port = 6667 + usessl = false + ${socks5Settings} ''; # Based on https://github.com/JoinMarket-Org/joinmarket-clientserver/blob/master/jmclient/jmclient/configure.py