Browse Source

Merge commit 'refs/merge-requests/2' of git://gitorious.org/electrum/electrum into merge-requests/2

283
ThomasV 13 years ago
parent
commit
7171a4b1b5
  1. 2
      server/README
  2. 8
      server/server.py

2
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 &

8
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:

Loading…
Cancel
Save