format tables nicely fixed-width with headers+borders via texttable.py.

joinmarket/__init__.py

@@ -16,9 +16,10 @@
 from .slowaes import decryptData, encryptData
 from .taker import Taker, OrderbookWatch, CoinJoinTX
 from .wallet import AbstractWallet, BitcoinCoreInterface, Wallet, \
-    BitcoinCoreWallet
+    BitcoinCoreWallet, create_wallet_file
 from .configure import load_program_config, jm_single, get_p2pk_vbyte, \
-    get_network, jm_single, get_network, validate_address
+    get_network, jm_single, get_network, validate_address, \
+    get_blockchain_interface_instance
 from .blockchaininterface import BlockrInterface, BlockchainInterface
 # Set default logging handler to avoid "No handler found" warnings.
 

joinmarket/blockchaininterface.py

@@ -22,7 +22,7 @@
 import subprocess
 
 from joinmarket.jsonrpc import JsonRpcConnectionError, JsonRpcError
-from joinmarket.configure import get_p2pk_vbyte, jm_single
+from joinmarket.configure import get_p2pk_vbyte, jm_single, get_network
 from joinmarket.support import get_log, chunks
 
 log = get_log()
@@ -112,13 +112,13 @@ def query_utxo_set(self, txouts):
         otherwise returns value in satoshis, address and output script
         """
         # address and output script contain the same information btw
-    
+
     @abc.abstractmethod
     def estimate_fee_per_kb(self, N):
         '''Use the blockchain interface to 
         get an estimate of the transaction fee per kb
         required for inclusion in the next N blocks.
-	'''
+        '''
 
 
 class BlockrInterface(BlockchainInterface):
@@ -128,10 +128,22 @@ def __init__(self, testnet=False):
         super(BlockrInterface, self).__init__()
 
         # see bci.py in bitcoin module
-        self.network = 'testnet' if testnet else 'btc'
-        self.blockr_domain = 'tbtc' if testnet else 'btc'
+        #self.network = 'testnet' if testnet else 'btc'
+        #self.blockr_domain = 'tbtc' if testnet else 'btc'
         self.last_sync_unspent = 0
 
+    def network_for_blockr_push(self):
+        if get_network() == 'testnet':
+            return 'testnet'
+        else:
+            return 'btc'
+
+    def blockr_domain(self):
+        if get_network() == 'testnet':
+            return 'tbtc'
+        else:
+            return 'btc'
+
     def sync_addresses(self, wallet):
         log.debug('downloading wallet history')
         # sets Wallet internal indexes to be at the next unused address
@@ -140,14 +152,14 @@ def sync_addresses(self, wallet):
                 unused_addr_count = 0
                 last_used_addr = ''
                 while (unused_addr_count < wallet.gaplimit or
-                           not is_index_ahead_of_cache(
-                                   wallet, mix_depth, forchange)):
+                       not is_index_ahead_of_cache(
+                           wallet, mix_depth, forchange)):
                     addrs = [wallet.get_new_addr(mix_depth, forchange)
                              for _ in range(self.BLOCKR_MAX_ADDR_REQ_COUNT)]
 
                     # TODO send a pull request to pybitcointools
                     # because this surely should be possible with a function from it
-                    blockr_url = 'https://' + self.blockr_domain
+                    blockr_url = 'https://' + self.blockr_domain()
                     blockr_url += '.blockr.io/api/v1/address/txs/'
 
                     res = btc.make_request(blockr_url + ','.join(addrs))
@@ -162,18 +174,18 @@ def sync_addresses(self, wallet):
                     wallet.index[mix_depth][forchange] = 0
                 else:
                     wallet.index[mix_depth][forchange] = wallet.addr_cache[
-                                                             last_used_addr][
-                                                             2] + 1
+                        last_used_addr][
+                            2] + 1
 
     def sync_unspent(self, wallet):
         # finds utxos in the wallet
         st = time.time()
         # dont refresh unspent dict more often than 10 minutes
-        rate_limit_time = 10 * 60
+        rate_limit_time = 5 * 6
         if st - self.last_sync_unspent < rate_limit_time:
             log.debug(
-                    'blockr sync_unspent() happened too recently (%dsec), skipping'
-                    % (st - self.last_sync_unspent))
+                'blockr sync_unspent() happened too recently (%dsec), skipping'
+                % (st - self.last_sync_unspent))
             return
         wallet.unspent = {}
 
@@ -191,8 +203,8 @@ def sync_unspent(self, wallet):
             # unspent() doesnt tell you which address, you get a bunch of utxos
             # but dont know which privkey to sign with
 
-            blockr_url = 'https://' + self.blockr_domain + \
-                         '.blockr.io/api/v1/address/unspent/'
+            blockr_url = 'https://' + self.blockr_domain() + \
+                '.blockr.io/api/v1/address/unspent/'
             res = btc.make_request(blockr_url + ','.join(req))
             data = json.loads(res)['data']
             if 'unspent' in data:
@@ -250,8 +262,8 @@ def run(self):
                     random.shuffle(self.output_addresses
                                    )  # seriously weird bug with blockr.io
                     data = json.loads(
-                            btc.make_request(blockr_url + ','.join(
-                                    self.output_addresses
+                        btc.make_request(blockr_url + ','.join(
+                            self.output_addresses
                             ) + '?unconfirmed=1'))['data']
 
                     shared_txid = None
@@ -266,12 +278,12 @@ def run(self):
                     if len(shared_txid) == 0:
                         continue
                     time.sleep(
-                            2
-                    )  # here for some race condition bullshit with blockr.io
+                        2
+                        )  # here for some race condition bullshit with blockr.io
                     blockr_url = 'https://' + self.blockr_domain
                     blockr_url += '.blockr.io/api/v1/tx/raw/'
                     data = json.loads(btc.make_request(blockr_url + ','.join(
-                            shared_txid)))['data']
+                        shared_txid)))['data']
                     if not isinstance(data, list):
                         data = [data]
                     for txinfo in data:
@@ -285,7 +297,7 @@ def run(self):
                             break
 
                 self.unconfirmfun(
-                        btc.deserialize(unconfirmed_txhex), unconfirmed_txid)
+                    btc.deserialize(unconfirmed_txhex), unconfirmed_txid)
 
                 st = int(time.time())
                 confirmed_txid = None
@@ -300,7 +312,7 @@ def run(self):
                     blockr_url = 'https://' + self.blockr_domain
                     blockr_url += '.blockr.io/api/v1/address/txs/'
                     data = json.loads(btc.make_request(blockr_url + ','.join(
-                            self.output_addresses)))['data']
+                        self.output_addresses)))['data']
                     shared_txid = None
                     for addrtxs in data:
                         txs = set(str(txdata['tx'])
@@ -315,8 +327,8 @@ def run(self):
                     blockr_url = 'https://' + self.blockr_domain
                     blockr_url += '.blockr.io/api/v1/tx/raw/'
                     data = json.loads(
-                            btc.make_request(
-                                    blockr_url + ','.join(shared_txid)))['data']
+                        btc.make_request(
+                            blockr_url + ','.join(shared_txid)))['data']
                     if not isinstance(data, list):
                         data = [data]
                     for txinfo in data:
@@ -329,13 +341,13 @@ def run(self):
                             confirmed_txhex = str(txinfo['tx']['hex'])
                             break
                 self.confirmfun(
-                        btc.deserialize(confirmed_txhex), confirmed_txid, 1)
+                    btc.deserialize(confirmed_txhex), confirmed_txid, 1)
 
-        NotifyThread(self.blockr_domain, txd, unconfirmfun, confirmfun, timeoutfun).start()
+        NotifyThread(self.blockr_domain(), txd, unconfirmfun, confirmfun, timeoutfun).start()
 
     def pushtx(self, txhex):
         try:
-            json_str = btc.blockr_pushtx(txhex, self.network)
+            json_str = btc.blockr_pushtx(txhex, self.network_for_blockr_push())
             data = json.loads(json_str)
             if data['status'] != 'success':
                 log.debug(data)
@@ -358,9 +370,9 @@ def query_utxo_set(self, txout):
             txids = [txids]
         data = []
         for ids in txids:
-            blockr_url = 'https://' + self.blockr_domain + '.blockr.io/api/v1/tx/info/'
+            blockr_url = 'https://' + self.blockr_domain() + '.blockr.io/api/v1/tx/info/'
             blockr_data = json.loads(
-                    btc.make_request(blockr_url + ','.join(ids)))['data']
+                btc.make_request(blockr_url + ','.join(ids)))['data']
             if not isinstance(blockr_data, list):
                 blockr_data = [blockr_data]
             data += blockr_data
@@ -372,7 +384,7 @@ def query_utxo_set(self, txout):
                 result.append(None)
             else:
                 result.append({'value': int(Decimal(vout['amount']) * Decimal(
-                        '1e8')),
+                    '1e8')),
                                'address': vout['address'],
                                'script': vout['extras']['script']})
         return result
@@ -381,14 +393,14 @@ def estimate_fee_per_kb(self, N):
         bcypher_fee_estimate_url = 'https://api.blockcypher.com/v1/btc/main'
         bcypher_data = json.loads(btc.make_request(bcypher_fee_estimate_url))
         log.debug("Got blockcypher result: "+pprint.pformat(bcypher_data))
-	if N<=2:
-	    fee_per_kb = bcypher_data["high_fee_per_kb"]
-	elif N <=4:
-	    fee_per_kb = bcypher_data["medium_fee_per_kb"]
-	else:
-	    fee_per_kb = bcypher_data["low_fee_per_kb"]
-	    
-	return fee_per_kb
+        if N<=2:
+            fee_per_kb = bcypher_data["high_fee_per_kb"]
+        elif N <=4:
+            fee_per_kb = bcypher_data["medium_fee_per_kb"]
+        else:
+            fee_per_kb = bcypher_data["low_fee_per_kb"]
+
+        return fee_per_kb
 
 def bitcoincore_timeout_callback(uc_called, txout_set, txnotify_fun_list,
                                  timeoutfun):
@@ -411,7 +423,7 @@ def __init__(self, request, client_address, base_server):
         self.btcinterface = base_server.btcinterface
         self.base_server = base_server
         BaseHTTPServer.BaseHTTPRequestHandler.__init__(
-                self, request, client_address, base_server)
+            self, request, client_address, base_server)
 
     def do_HEAD(self):
         pages = ('/walletnotify?', '/alertnotify?')
@@ -562,7 +574,7 @@ def add_watchonly_addresses(self, addr_list, wallet_name):
         for addr in addr_list:
             self.rpc('importaddress', [addr, wallet_name, False])
         if jm_single().config.get(
-                "BLOCKCHAIN", "blockchain_source") != 'regtest':
+            "BLOCKCHAIN", "blockchain_source") != 'regtest':
             print('restart Bitcoin Core with -rescan if you\'re '
                   'recovering an existing wallet from backup seed')
             print(' otherwise just restart this joinmarket script')
@@ -616,16 +628,16 @@ def sync_addresses(self, wallet):
                 breakloop = False
                 while not breakloop:
                     if unused_addr_count >= wallet.gaplimit and \
-                            is_index_ahead_of_cache(wallet, mix_depth,
-                                                    forchange):
+                       is_index_ahead_of_cache(wallet, mix_depth,
+                                               forchange):
                         break
                     mix_change_addrs = [
                         wallet.get_new_addr(mix_depth, forchange)
                         for _ in range(addr_req_count)]
                     for mc_addr in mix_change_addrs:
                         if mc_addr not in imported_addr_list:
                             too_few_addr_mix_change.append(
-                                    (mix_depth, forchange))
+                                (mix_depth, forchange))
                             breakloop = True
                             break
                         if mc_addr in used_addr_list:
@@ -733,12 +745,12 @@ def query_utxo_set(self, txout):
 
     def estimate_fee_per_kb(self, N):
         estimate = Decimal(1e8)*Decimal(self.rpc('estimatefee', [N]))
-	if estimate < 0:
-	    #This occurs when Core has insufficient data to estimate.
-	    #TODO anything better than a hardcoded default?
-	    return 30000 
+        if estimate < 0:
+            #This occurs when Core has insufficient data to estimate.
+            #TODO anything better than a hardcoded default?
+            return 30000 
         else:
-	    return estimate    
+            return estimate    
 
 # class for regtest chain access
 # running on local daemon. Only
@@ -831,7 +843,7 @@ def get_received_by_addr(self, addresses, query_params):
             self.rpc('importaddress', [address, 'watchonly'])
             res.append({'address': address,
                         'balance': int(Decimal(1e8) * Decimal(
-                                self.rpc('getreceivedbyaddress', [address])))})
+                            self.rpc('getreceivedbyaddress', [address])))})
         return {'data': res}
 
 # todo: won't run anyways

joinmarket/configure.py

@@ -118,8 +118,7 @@ def jm_single():
 socks5_port = 9050
 #for tor
 #host = 6dvj6v5imhny3anf.onion
-#onion / i2p have their own ports on CGAN
-#port = 6698
+#port = 6697
 #usessl = true
 #socks5 = true