compute merkle root from reduced list

[electrum-nvc.git] / scripts / merchant.py

diff --git a/scripts/merchant.py b/scripts/merchant.py
index 32e68ac..4e8cfd3 100644 (file)
--- a/scripts/merchant.py
+++ b/scripts/merchant.py
@@ -21,7 +21,7 @@ import time, thread, sys, socket, os
 import urllib2,json
 import MySQLdb as mdb
 import Queue
-from electrum import Wallet, TcpStratumInterface
+from electrum import Wallet, Interface
 
 import ConfigParser
 config = ConfigParser.ConfigParser()
@@ -33,7 +33,6 @@ db_password = config.get('db','password')
 db_name = config.get('db','name')
 
 electrum_server = config.get('electrum','server')
-mpk = config.get('electrum','mpk')
 
 my_password = config.get('main','password')
 my_host = config.get('main','host')
@@ -44,7 +43,7 @@ cb_expired = config.get('callback','expired')
 cb_password = config.get('callback','password')
 
 wallet = Wallet()
-wallet.master_public_key = mpk.decode('hex')
+wallet.master_public_key = config.get('electrum','mpk')
 
 
 
@@ -114,7 +113,7 @@ def process_request(i, amount, confirmations, expires_in, password):
     return addr
 
 def get_mpk():
-    return wallet.master_public_key.encode('hex')
+    return wallet.master_public_key
 
 
 def server_thread(conn):
@@ -157,8 +156,7 @@ if __name__ == '__main__':
     print "using database", db_name
     conn = mdb.connect(db_instance, db_user, db_password, db_name);
 
-    i = TcpStratumInterface(electrum_server, 50001)
-    i.init_socket()
+    i = Interface({'server':"%s:%d:t"%(electrum_server, 50001)})
     i.start()