From d4c0653c64e35a7a80dad4a62ebc0668987f1a5e Mon Sep 17 00:00:00 2001
From: nixbitcoin <nixbitcoin@i2pmail.org>
Date: Sun, 18 Oct 2020 15:41:45 +0000
Subject: [PATCH] joinmarket: 0.7.0 -> 0.7.2

---
 pkgs/joinmarket/default.nix                   | 10 +++---
 pkgs/joinmarket/genwallet/genwallet.py        | 36 -------------------
 pkgs/joinmarket/python-bitcointx/default.nix  |  4 +--
 .../joinmarket/python-bitcointx/get-sha256.sh |  2 +-
 4 files changed, 7 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/joinmarket/genwallet/genwallet.py

diff --git a/pkgs/joinmarket/default.nix b/pkgs/joinmarket/default.nix
index fcaaedb..1f0a05c 100644
--- a/pkgs/joinmarket/default.nix
+++ b/pkgs/joinmarket/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, python3, pkgs }:
 
 let
-  version = "0.7.0";
+  version = "0.7.2";
   src = fetchurl {
     url = "https://github.com/JoinMarket-Org/joinmarket-clientserver/archive/v${version}.tar.gz";
-    sha256 = "0ha73n3y5lykyj3pl97a619sxd2zz0lb32s5c61wm0l1h47v9l1g";
+    sha256 = "03gvs20d2cfzy9x82l6v4c69w0j9mr4p9zj2hpymnb6xs1yq6dr1";
   };
 
   python = python3.override {
@@ -32,13 +32,11 @@ let
     joinmarketdaemon
   ];
 
-  genwallet = pkgs.writeScriptBin "genwallet" (builtins.readFile ./genwallet/genwallet.py);
-
   pythonEnv = python.withPackages (_: runtimePackages);
 in
 stdenv.mkDerivation {
   pname = "joinmarket";
-  inherit version src genwallet;
+  inherit version src;
 
   buildInputs = [ pythonEnv ];
 
@@ -59,7 +57,7 @@ stdenv.mkDerivation {
     cpBin tumbler.py
     cpBin wallet-tool.py
     cpBin yg-privacyenhanced.py
-    cp $genwallet/bin/genwallet $out/bin/jm-genwallet
+    cpBin genwallet.py
 
     chmod +x -R $out/bin
     patchShebangs $out/bin
diff --git a/pkgs/joinmarket/genwallet/genwallet.py b/pkgs/joinmarket/genwallet/genwallet.py
deleted file mode 100644
index 51de87f..0000000
--- a/pkgs/joinmarket/genwallet/genwallet.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-Prototype: demonstrate you can automatically generate a wallet
-"""
-
-import sys
-import os
-from optparse import OptionParser
-from jmclient import load_program_config, add_base_options, SegwitLegacyWallet, create_wallet, jm_single
-from jmbase.support import get_log, jmprint
-
-log = get_log()
-
-def main():
-    parser = OptionParser(
-    usage='usage: %prog [options] wallet_file_name password',
-    description='Create a wallet with the given wallet name and password.')
-    add_base_options(parser)
-    (options, args) = parser.parse_args()
-    if options.wallet_password_stdin:
-        stdin = sys.stdin.read()
-        password = stdin.encode("utf-8")
-    else:
-        assert len(args) > 1, "must provide password via stdin (see --help), or as second argument."
-        password = args[1].encode("utf-8")
-    load_program_config(config_path=options.datadir)
-    wallet_root_path = os.path.join(jm_single().datadir, "wallets")
-    wallet_name = os.path.join(wallet_root_path, args[0])
-    wallet = create_wallet(wallet_name, password, 4, SegwitLegacyWallet)
-    jmprint("recovery_seed:{}"
-         .format(wallet.get_mnemonic_words()[0]), "important")
-    wallet.close()
-
-if __name__ == "__main__":
-    main()
diff --git a/pkgs/joinmarket/python-bitcointx/default.nix b/pkgs/joinmarket/python-bitcointx/default.nix
index 213f5d8..a886773 100644
--- a/pkgs/joinmarket/python-bitcointx/default.nix
+++ b/pkgs/joinmarket/python-bitcointx/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "python-bitcointx";
-  version = "1.1.1";
+  version = "1.1.1.post0";
 
   src = fetchurl {
     url = "https://github.com/Simplexum/${pname}/archive/${pname}-v${version}.tar.gz";
-    sha256 = "35edd694473517508367338888633954eaa91b2622b3caada8fd3030ddcacba2";
+    sha256 = "d12593b09785a7a4ce08cb1928815c2366e9f6e4fab317267462857bf83904b0";
   };
 
   patchPhase = ''
diff --git a/pkgs/joinmarket/python-bitcointx/get-sha256.sh b/pkgs/joinmarket/python-bitcointx/get-sha256.sh
index 34ab4c1..669fcff 100755
--- a/pkgs/joinmarket/python-bitcointx/get-sha256.sh
+++ b/pkgs/joinmarket/python-bitcointx/get-sha256.sh
@@ -9,7 +9,7 @@ cd $TMPDIR
 echo "Fetching latest release"
 git clone https://github.com/simplexum/python-bitcointx 2> /dev/null
 cd python-bitcointx
-latest=$(git describe --tags `git rev-list --tags --max-count=1`)
+latest=python-bitcointx-v1.1.1.post0
 echo "Latest release is ${latest}"
 
 # GPG verification