From 5ead2a707555d922e0251b2f102dd6df0dab6095 Mon Sep 17 00:00:00 2001
From: nixbitcoin <nixbitcoin@i2pmail.org>
Date: Tue, 9 Mar 2021 16:48:25 +0000
Subject: [PATCH] joinmarket: 0.8.1 -> 0.8.2

- add SNICKER to default config
- update package
- ob-watcher: copy vendorized js and css dependencies
- add missing dependency to jmbase
- use cryptography from pinned.nixpkgs-unstable
---
 modules/joinmarket.nix                    | 6 ++++++
 pkgs/joinmarket/default.nix               | 7 ++++---
 pkgs/python-packages/default.nix          | 6 ++++++
 pkgs/python-packages/jmbase/default.nix   | 4 ++--
 pkgs/python-packages/jmdaemon/default.nix | 4 ++--
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/modules/joinmarket.nix b/modules/joinmarket.nix
index e8bc76e..1dcb83a 100644
--- a/modules/joinmarket.nix
+++ b/modules/joinmarket.nix
@@ -87,6 +87,12 @@ let
     minsize = ${toString yg.minsize}
     size_factor = ${toString yg.size_factor}
     gaplimit = 6
+
+    [SNICKER]
+    enabled = false
+    lowest_net_gain = 0
+    servers = cn5lfwvrswicuxn3gjsxoved6l2gu5hdvwy5l3ev7kg6j7lbji2k7hqd.onion,
+    polling_interval_minutes = 60
   '';
 
    # The jm scripts create a 'logs' dir in the working dir,
diff --git a/pkgs/joinmarket/default.nix b/pkgs/joinmarket/default.nix
index f4d7bc9..6a180ee 100644
--- a/pkgs/joinmarket/default.nix
+++ b/pkgs/joinmarket/default.nix
@@ -1,10 +1,10 @@
 { stdenv, lib, fetchurl, python3, nbPython3Packages, pkgs }:
 
 let
-  version = "0.8.1";
+  version = "0.8.2";
   src = fetchurl {
     url = "https://github.com/JoinMarket-Org/joinmarket-clientserver/archive/v${version}.tar.gz";
-    sha256 = "1q3x1x0a78v6apwvbyhl7yh4dgr7xpikd8j07gi3by004ns3789d";
+    sha256 = "0bi1d49kn57b0775cd8gzsc13dbiivvnhrc61d1xb4z1cr3ih8q2";
   };
 
   runtimePackages = with nbPython3Packages; [
@@ -46,7 +46,8 @@ stdenv.mkDerivation {
     chmod +x -R $out/bin
     patchShebangs $out/bin
 
-    # This file must be placed in the same dir as ob-watcher
+    # These files must be placed in the same dir as ob-watcher
     cp scripts/obwatch/orderbook.html $out/bin/orderbook.html
+    cp -r scripts/obwatch/vendor $out/bin/vendor
   '';
 }
diff --git a/pkgs/python-packages/default.nix b/pkgs/python-packages/default.nix
index fdb6ef4..8587bb2 100644
--- a/pkgs/python-packages/default.nix
+++ b/pkgs/python-packages/default.nix
@@ -5,6 +5,8 @@ let
 
   joinmarketPkg = pkg: callPackage pkg { inherit (nbPkgs.joinmarket) version src; };
   clightningPkg = pkg: callPackage pkg { inherit (nbPkgs.pinned) clightning; };
+
+  unstable = (import ../nixpkgs-pinned.nix).nixpkgs-unstable;
 in {
   bencoderpyx = callPackage ./bencoderpyx {};
   coincurve = callPackage ./coincurve {};
@@ -13,6 +15,10 @@ in {
   chromalog = callPackage ./chromalog {};
   txzmq = callPackage ./txzmq {};
 
+  # cryptography 3.3.2, required by joinmarketdaemon
+  cryptography = callPackage "${unstable}/pkgs/development/python-modules/cryptography" {};
+  cryptography_vectors = callPackage "${unstable}/pkgs/development/python-modules/cryptography/vectors.nix" {};
+
   joinmarketbase = joinmarketPkg ./jmbase;
   joinmarketclient = joinmarketPkg ./jmclient;
   joinmarketbitcoin = joinmarketPkg ./jmbitcoin;
diff --git a/pkgs/python-packages/jmbase/default.nix b/pkgs/python-packages/jmbase/default.nix
index d1fdfe6..63d7dfb 100644
--- a/pkgs/python-packages/jmbase/default.nix
+++ b/pkgs/python-packages/jmbase/default.nix
@@ -1,4 +1,4 @@
-{ version, src, lib, buildPythonPackage, fetchurl, future, twisted, service-identity, chromalog }:
+{ version, src, lib, buildPythonPackage, fetchurl, future, twisted, service-identity, chromalog, txtorcon }:
 
 buildPythonPackage rec {
   pname = "joinmarketbase";
@@ -6,7 +6,7 @@ buildPythonPackage rec {
 
   postUnpack = "sourceRoot=$sourceRoot/jmbase";
 
-  propagatedBuildInputs = [ future twisted service-identity chromalog ];
+  propagatedBuildInputs = [ future twisted service-identity chromalog txtorcon ];
 
   meta = with lib; {
     homepage = "https://github.com/Joinmarket-Org/joinmarket-clientserver";
diff --git a/pkgs/python-packages/jmdaemon/default.nix b/pkgs/python-packages/jmdaemon/default.nix
index 0a7493e..5dd5a7c 100644
--- a/pkgs/python-packages/jmdaemon/default.nix
+++ b/pkgs/python-packages/jmdaemon/default.nix
@@ -1,4 +1,4 @@
-{ version, src, lib, buildPythonPackage, fetchurl, future, txtorcon, pyopenssl, libnacl, joinmarketbase }:
+{ version, src, lib, buildPythonPackage, fetchurl, future, txtorcon, cryptography, pyopenssl, libnacl, joinmarketbase }:
 
 buildPythonPackage rec {
   pname = "joinmarketdaemon";
@@ -6,7 +6,7 @@ buildPythonPackage rec {
 
   postUnpack = "sourceRoot=$sourceRoot/jmdaemon";
 
-  propagatedBuildInputs = [ future txtorcon pyopenssl libnacl joinmarketbase ];
+  propagatedBuildInputs = [ future txtorcon cryptography pyopenssl libnacl joinmarketbase ];
 
   meta = with lib; {
     description = "Client library for Bitcoin coinjoins";