AaronFiore/electrum
1
0
Fork 0
Code Activity

simplification: hex encode master_public_key directly

Browse Source
This commit is contained in:
thomasv
2012-10-16 09:24:38 +02:00
parent 486ebf93e2
commit da4b974dfd
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/merchant.py
View File

@@ -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):