Merge pull request #357 from raedah/develop

yieldgen order filling fixes and dynamic txfee contributions
JoinMarket-Org · Dec 16, 2015 · e0f7c59 · e0f7c59
2 parents 67043a2 + abdf16d
commit e0f7c59
Show file tree

Hide file tree

Showing 3 changed files with 169 additions and 162 deletions.
diff --git a/yield-generator-basic.py b/yield-generator-basic.py
@@ -4,6 +4,7 @@
 import datetime
 import os
 import time
+import sys
 
 from joinmarket import Maker, IRCMessageChannel
 from joinmarket import BlockrInterface
@@ -73,7 +74,7 @@ def create_my_orders(self):
         mix_balance = self.wallet.get_balance_by_mixdepth()
         if len([b for m, b in mix_balance.iteritems() if b > 0]) == 0:
             log.debug('do not have any coins left')
-            return []
+            sys.exit(0)
 
         # print mix_balance
         max_mix = max(mix_balance, key=mix_balance.get)