From b02b169277c345e16d82955f02bb80309a95c74b Mon Sep 17 00:00:00 2001 From: Ovidiu Constantin Date: Wed, 23 Nov 2011 15:06:07 +0200 Subject: [PATCH] Ok, *really* fix to use the correct bitcoinrpc module. --- server/README | 2 +- server/server.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/README b/server/README index c3b5b532..17042b4d 100644 --- a/server/README +++ b/server/README @@ -22,7 +22,7 @@ INSTALL 2. install bitcoin-abe : https://github.com/jtobey/bitcoin-abe -3. download bitcoin-python: https://github.com/toomanysecrets0/bitcoin-python +3. download bitcoin-python: https://github.com/laanwj/bitcoin-python patch it with bitcoinrpc_connection.py.diff 4. launch the server: nohup python -u server.py > /var/log/electrum.log & diff --git a/server/server.py b/server/server.py index 7ccee47b..d0aa41d6 100755 --- a/server/server.py +++ b/server/server.py @@ -24,7 +24,7 @@ Todo: import time, socket, operator, thread, ast, sys,re import psycopg2, binascii -import bitcoin +import bitcoinrpc from Abe.abe import hash_to_address, decode_check_address from Abe.DataStore import DataStore as Datastore_class @@ -278,8 +278,8 @@ class MyStore(Datastore_class): def send_tx(tx): - import bitcoin - conn = bitcoin.connect_to_local() + import bitcoinrpc + conn = bitcoinrpc.connect_to_local() try: v = conn.importtransaction(tx) except: @@ -401,7 +401,7 @@ ds = BCDataStream.BCDataStream() def memorypool_update(store): - conn = bitcoin.connect_to_local() + conn = bitcoinrpc.connect_to_local() try: v = conn.getmemorypool() except: