Merge petertodd#268: Update getrawtransaction to work with block hash argument

af9e5c4 Update getrawtransaction to work with block hash argument (kafka2000)

Pull request description:

  The current implementation of getrawtransaction doesn't allow to provide the block hash. This PR is meant to fill this gap.

Top commit has no ACKs.

Tree-SHA512: 28af9c5304f0a087931e3a271544d7d7f6f8c0283a4af9b5b908406b2293b44f84c39508659ba9d96e42a6ebcd3b082df05880d3f31d5771fd87f701902fc13a

Author: petertodd

bitcoin/rpc.py

@@ -566,24 +566,30 @@ def getrawmempool(self, verbose=False):
             r = [lx(txid) for txid in r]
             return r
 
-    def getrawtransaction(self, txid, verbose=False):
+    def getrawtransaction(self, txid, verbose=False, block_hash=None):
         """Return transaction with hash txid
 
         Raises IndexError if transaction not found.
 
         verbose - If true a dict is returned instead with additional
         information on the transaction.
 
+        block_hash - Hash of the block containing the transaction
+        (required when transaction not currently indexed by Bitcoin Core)
+
         Note that if all txouts are spent and the transaction index is not
         enabled the transaction may not be available.
         """
         try:
-            r = self._call('getrawtransaction', b2lx(txid), 1 if verbose else 0)
+            if block_hash is None:
+                r = self._call('getrawtransaction', b2lx(txid), 1 if verbose else 0)
+            else:
+                r = self._call('getrawtransaction', b2lx(txid), 1 if verbose else 0, b2lx(block_hash))
         except InvalidAddressOrKeyError as ex:
             raise IndexError('%s.getrawtransaction(): %s (%d)' %
                     (self.__class__.__name__, ex.error['message'], ex.error['code']))
         if verbose:
-            r['tx'] = CTransaction.deserialize(unhexlify_str(r['hex']))
+            r['tx'] = CTransaction.deserialize(unhexlify(r['hex']))
             del r['hex']
             del r['txid']
             del r['version']
@@ -592,8 +598,7 @@ def getrawtransaction(self, txid, verbose=False):
             del r['vout']
             r['blockhash'] = lx(r['blockhash']) if 'blockhash' in r else None
         else:
-            r = CTransaction.deserialize(unhexlify_str(r))
-
+            r = CTransaction.deserialize(unhexlify(r))
         return r
 
     def getreceivedbyaddress(self, addr, minconf=1):