Merge branch 'develop'

Author: jcnelson

pybitcoin/services/bitcoind.py

@@ -17,6 +17,7 @@
 
 from .blockchain_client import BlockchainClient
 
+
 def create_bitcoind_service_proxy(
     rpc_username, rpc_password, server='127.0.0.1', port=8332, use_https=False):
     """ create a bitcoind service proxy
@@ -26,6 +27,7 @@ def create_bitcoind_service_proxy(
         server, port)
     return AuthServiceProxy(uri)
 
+
 class BitcoindClient(BlockchainClient):
     def __init__(self, rpc_username, rpc_password, use_https=False,
                  server='127.0.0.1', port=8332, version_byte=0):
@@ -35,6 +37,7 @@ def __init__(self, rpc_username, rpc_password, use_https=False,
             rpc_password, use_https=use_https, server=server, port=port)
         self.version_byte = version_byte
 
+
 def format_unspents(unspents):
     return [{
         "transaction_hash": s["txid"],
@@ -46,6 +49,7 @@ def format_unspents(unspents):
         for s in unspents
     ]
 
+
 def get_unspents(address, blockchain_client):
     """ Get the spendable transaction outputs, also known as UTXOs or
         unspent transaction outputs.
@@ -63,17 +67,12 @@ def get_unspents(address, blockchain_client):
     else:
         raise Exception('A BitcoindClient object is required')
 
-    all_unspents = bitcoind.listunspent()
-
-    unspents = []
-    for u in all_unspents:
-        if 'address' not in u:
-            u['address'] = script_hex_to_address(u['scriptPubKey'],
-                                                 version_byte=version_byte)
-        if 'spendable' in u and u['spendable'] is False:
-            continue
-        if u['address'] == address:
-            unspents.append(u)
+    addresses = []
+    addresses.append(str(address))
+    min_confirmations = 0
+    max_confirmation = 2000000000  # just a very large number for max
+    unspents = bitcoind.listunspent(min_confirmations, max_confirmation,
+                                    addresses)
 
     return format_unspents(unspents)
 
@@ -94,6 +93,6 @@ def broadcast_transaction(hex_tx, blockchain_client):
         raise Exception('Invalid HTTP status code from bitcoind.')
 
     if len(resp) > 0:
-        return {'transaction_hash': resp, 'success': True}
+        return {'tx_hash': resp, 'success': True}
     else:
         raise Exception('Invalid response from bitcoind.')

pybitcoin/transactions/network.py

@@ -194,7 +194,7 @@ def sign_all_unsigned_inputs(hex_privkey, unsigned_tx_hex):
         Returns: signed hex transaction
     """
     inputs, outputs, locktime, version = deserialize_transaction(unsigned_tx_hex)
-
+    tx_hex = unsigned_tx_hex
     for index in xrange(0, len(inputs)):
         if len(inputs[index]['script_sig']) == 0:
 

pybitcoin/transactions/outputs.py

@@ -17,7 +17,7 @@ def calculate_change_amount(inputs, send_amount, fee):
     change_amount = total_amount_in - send_amount - fee
     # check to ensure the change amount is a non-negative value and return it
     if change_amount < 0:
-        raise Exception('Not enough inputs for transaction.')
+        raise ValueError('Not enough inputs for transaction (total: %s, to spend: %s, fee: %s).' % (total_amount_in, send_amount, fee))
     return change_amount
 
 def make_pay_to_address_outputs(to_address, send_amount, inputs, change_address,

requirements.txt

@@ -4,4 +4,4 @@ commontools==0.1.0
 utilitybelt>=0.2.1
 python-bitcoinrpc==0.1
 keychain>=0.1.4
-bitcoin>=1.1.39
+bitcoin>=1.1.42

setup.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 """
 pybitcoin
 ==============
@@ -8,7 +9,7 @@
 
 setup(
     name='pybitcoin',
-    version='0.9.8',
+    version='0.9.9',
     url='https://github.com/blockstack/pybitcoin',
     license='MIT',
     author='Blockstack Developers',
@@ -21,10 +22,10 @@
         'requests>=2.4.3',
         'ecdsa>=0.13',
         'commontools==0.1.0',
-        'utilitybelt>=0.2.1',
+        'utilitybelt>=0.2.6',
         'python-bitcoinrpc==0.1',
         'keychain>=0.1.4',
-        'bitcoin>=1.1.39'
+        'bitcoin>=1.1.42'
     ],
     classifiers=[
         'Intended Audience :: Developers',