unconfirmed transactions for jmcorgan

lib/bitcoin.py

@@ -599,9 +599,10 @@ def get_unspent_txouts(source):
                 continue
             elif 'addresses' in scriptpubkey.keys() and "".join(sorted(scriptpubkey['addresses'])) == "".join(sorted(pubkeyhashes)):
                 txid = tx['txid']
-                if txid not in outputs or outputs[txid]['confirmations'] < tx['confirmations']:
-                    coin = {'amount': vout['value'],
-                            'confirmations': tx['confirmations'],
+                confirmations = tx['confirmations'] if 'confirmations' in tx else 0 
+                if txid not in outputs or outputs[txid]['confirmations'] < confirmations:
+                    coin = {'amount': float(vout['value']),
+                            'confirmations': confirmations,
                             'scriptPubKey': scriptpubkey['hex'],
                             'txid': txid,
                             'vout': vout['n']

lib/blockchain/jmcorgan.py

@@ -13,4 +13,31 @@ def check():
     return True
 
 def searchrawtransactions(address):
-    return util.rpc('searchrawtransactions', [address, 1, 0, 9999999])
+    unconfirmed = search_mempool_transactions(address)
+    confirmed = util.rpc('searchrawtransactions', [address, 1, 0, 9999999])
+    return unconfirmed + confirmed
+
+def extract_addresses(tx):
+    addresses = []
+
+    for vout in tx['vout']:
+        if 'addresses' in vout['scriptPubKey']:
+            addresses += vout['scriptPubKey']['addresses']
+
+    for vin in tx['vin']:
+        vin_tx = util.rpc('getrawtransaction', [vin['txid'], 1])
+        vout = vin_tx['vout'][vin['vout']]
+        if 'addresses' in vout['scriptPubKey']:
+            addresses += vout['scriptPubKey']['addresses']
+
+    return addresses
+
+def search_mempool_transactions(address):
+    transactions = []
+
+    for tx_hash in util.rpc('getrawmempool', []):
+        tx = util.rpc('getrawtransaction', [tx_hash, 1])
+        if address in extract_addresses(tx):
+            transactions.append(tx)
+
+    return transactions