From c1ed491bd781dffa48c256b8d3d7c890ac954efc Mon Sep 17 00:00:00 2001
From: Adam Gibson <ekaggata@gmail.com>
Date: Sun, 20 Aug 2017 21:24:35 +0300
Subject: [PATCH] bugfix privkey export

---
 jmdaemon/jmdaemon/daemon_protocol.py | 2 --
 scripts/joinmarket-qt.py             | 8 ++++----
 test/ygrunner.py                     | 1 -
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/jmdaemon/jmdaemon/daemon_protocol.py b/jmdaemon/jmdaemon/daemon_protocol.py
index 99c7dfb..08bd253 100644
--- a/jmdaemon/jmdaemon/daemon_protocol.py
+++ b/jmdaemon/jmdaemon/daemon_protocol.py
@@ -180,11 +180,9 @@ class JMDaemonServerProtocol(amp.AMP, OrderbookWatch):
     @JMSetup.responder
     def on_JM_SETUP(self, role, initdata):
         assert self.jm_state == 0
-        #TODO consider MAKER role implementation here
         self.role = role
         self.crypto_boxes = {}
         self.kp = init_keypair()
-        print("Received setup command")
         d = self.callRemote(JMSetupDone)
         self.defaultCallbacks(d)
         #Request orderbook here, on explicit setup request from client,
diff --git a/scripts/joinmarket-qt.py b/scripts/joinmarket-qt.py
index 6ee46c9..528d094 100644
--- a/scripts/joinmarket-qt.py
+++ b/scripts/joinmarket-qt.py
@@ -1251,10 +1251,10 @@ class JMMainWindow(QMainWindow):
                 transaction.writerow(["address", "private_key"])
                 for addr, pk in private_keys.items():
                     #sanity check
-                    if not btc.privtoaddr(
-                            btc.from_wif_privkey(pk,
-                                                 vbyte=get_p2pk_vbyte()),
-                            magicbyte=get_p2pk_vbyte()) == addr:
+                    if not addr == btc.pubkey_to_p2sh_p2wpkh_address(
+                                    btc.privkey_to_pubkey(
+                                        btc.from_wif_privkey(pk, vbyte=111)
+                                    ), get_p2sh_vbyte()):
                         JMQtMessageBox(None, "Failed to create privkey export -" +\
                                        " critical error in key parsing.",
                                        mbtype='crit')
diff --git a/test/ygrunner.py b/test/ygrunner.py
index b213670..52db181 100644
--- a/test/ygrunner.py
+++ b/test/ygrunner.py
@@ -86,7 +86,6 @@ def test_start_ygs(setup_ygrunner, num_ygs, wallet_structures, mean_amt,
         start_reactor(jm_single().config.get("DAEMON", "daemon_host"),
                       jm_single().config.getint("DAEMON", "daemon_port"),
                       clientfactory, daemon=daemon, rs=rs)
-        time.sleep(2)  #give it a chance
 
 @pytest.fixture(scope="module")
 def setup_ygrunner():