From: Emery Hemingway <emery@fuzzlabs.org>
Date: Thu, 7 Nov 2013 20:14:21 +0000 (-0500)
Subject: Merge branch 'mainline_bitcoind' of github.com:luke-jr/electrum-server into mainline_... 
X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=commitdiff_plain;h=6504ac96768449288ac347c62005d6a911d93f69

Merge branch 'mainline_bitcoind' of github.com:luke-jr/electrum-server into mainline_bitcoind
---

6504ac96768449288ac347c62005d6a911d93f69
diff --cc backends/bitcoind/blockchain_processor.py
index 538478d,6fb36fb..cd169af
--- a/backends/bitcoind/blockchain_processor.py
+++ b/backends/bitcoind/blockchain_processor.py
@@@ -762,11 -614,10 +762,10 @@@ class BlockchainProcessor(Processor)
          elif method == 'blockchain.transaction.get':
              try:
                  tx_hash = params[0]
-                 height = params[1]
-                 result = self.bitcoind('getrawtransaction', [tx_hash, 0, height])
+                 result = self.bitcoind('getrawtransaction', [tx_hash, 0])
              except BaseException, e:
 -                error = str(e) + ': ' + tx_hash
 -                print_log("error:", error)
 +                error = str(e) + ': ' + repr(params)
 +                print_log("tx get error:", error)
  
          else:
              error = "unknown method:%s" % method