X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=server.py;h=e3d53a547b1a4a77fee0066eef15ed444f8f1da7;hb=46018f1ac5fd1df758cecc8dd12be738d6d3e07b;hp=da51e73c3f3735e0e06ab74b1c98eef3cc0145b6;hpb=79ebad5560166b4ee7940b7f5d82c9baee8fded7;p=electrum-server.git

diff --git a/server.py b/server.py
index da51e73..e3d53a5 100644
--- a/server.py
+++ b/server.py
@@ -24,7 +24,7 @@ Todo:
 
 import time, socket, operator, thread, ast, sys
 import psycopg2, binascii
-import bitcoinrpc
+import bitcoin
 
 from Abe.abe import hash_to_address, decode_check_address
 from Abe.DataStore import DataStore as Datastore_class
@@ -271,8 +271,8 @@ class MyStore(Datastore_class):
 
 
 def send_tx(tx):
-    import bitcoinrpc
-    conn = bitcoinrpc.connect_to_local()
+    import bitcoin
+    conn = bitcoin.connect_to_local()
     try:
         v = conn.importtransaction(tx)
     except:
@@ -394,7 +394,7 @@ ds = BCDataStream.BCDataStream()
 
 def memorypool_update(store):
 
-    conn = bitcoinrpc.connect_to_local()
+    conn = bitcoin.connect_to_local()
     try:
         v = conn.getmemorypool()
     except: