create new orders for each new identity

JoinMarket-Org · Feb 8, 2016 · f544fd4 · f544fd4
1 parent 6f8ad11
commit f544fd4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/joinmarket/irc.py b/joinmarket/irc.py
@@ -588,7 +588,7 @@ def __init__(self,
         self.reconnect_delay = 30
         self.newnyms = False
         try:
-            self.reconnect_delaty = int(config.get("MESSAGING", "reconnect_delay"))
+            self.reconnect_delay = int(config.get("MESSAGING", "reconnect_delay"))
             self.newnyms = (config.get("MESSAGING", "newnym").lower() == 'true')
             self.tor_ctrl_host = config.get("MESSAGING", "tor_ctrl_host")
             self.tor_ctrl_port = int(config.get("MESSAGING", "tor_ctrl_port"))

diff --git a/joinmarket/maker.py b/joinmarket/maker.py
@@ -213,7 +213,8 @@ def __init__(self, msgchan, wallet):
         self.active_orders = {}
         self.wallet = wallet
         self.nextoid = -1
-        self.orderlist = self.create_my_orders()
+        if not self.msgchan.newnyms:
+            self.orderlist = self.create_my_orders()
         self.wallet_unspent_lock = threading.Lock()
 
     def get_crypto_box_from_nick(self, nick):
@@ -265,6 +266,8 @@ def on_push_tx(self, nick, txhex):
             self.msgchan.send_error(nick, 'Unable to push tx')
 
     def on_welcome(self):
+        if self.msgchan.newnyms:
+            self.orderlist = self.create_my_orders()
         self.msgchan.announce_orders(self.orderlist)
         self.active_orders = {}
 

diff --git a/joinmarket/message_channel.py b/joinmarket/message_channel.py
@@ -29,6 +29,8 @@ def __init__(self):
         self.on_seen_auth = None
         self.on_seen_tx = None
         self.on_push_tx = None
+        # chan-specific attributes
+        self.newnyms = False
 
     def run(self):
         pass