LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-27 15:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #631 from jisqyv/jischanges

Browse source 
Updates for merchant.py
This commit is contained in:
ThomasV 2014-03-28 17:19:48 +01:00
commit 4f6ac1d613
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scripts/merchant/merchant.py
View file

@ -167,7 +167,7 @@ if __name__ == '__main__':
wallet = Wallet(storage) wallet = Wallet(storage)
if not storage.file_exists: if not storage.file_exists:
wallet.seed = '' wallet.seed = ''
wallet.create_watching_only_wallet(master_chain,master_public_key) wallet.create_watching_only_wallet(master_public_key,master_chain)
wallet.synchronize = lambda: None # prevent address creation by the wallet wallet.synchronize = lambda: None # prevent address creation by the wallet
wallet.start_threads(network) wallet.start_threads(network)
@ -218,10 +218,10 @@ if __name__ == '__main__':
cur.execute("""UPDATE electrum_payments set paid=0 WHERE expires_at < CURRENT_TIMESTAMP and paid is NULL;""") cur.execute("""UPDATE electrum_payments set paid=0 WHERE expires_at < CURRENT_TIMESTAMP and paid is NULL;""")
# do callback for addresses that received payment or expired # do callback for addresses that received payment or expired
cur.execute("""SELECT address, paid from electrum_payments WHERE paid is not NULL and processed is NULL;""") cur.execute("""SELECT oid, address, paid from electrum_payments WHERE paid is not NULL and processed is NULL;""")
data = cur.fetchall() data = cur.fetchall()
for item in data: for item in data:
address, paid = item oid, address, paid = item
paid = bool(paid) paid = bool(paid)
headers = {'content-type':'application/json'} headers = {'content-type':'application/json'}
data_json = { 'address':address, 'password':cb_password, 'paid':paid } data_json = { 'address':address, 'password':cb_password, 'paid':paid }
@ -230,7 +230,8 @@ if __name__ == '__main__':
req = urllib2.Request(url, data_json, headers) req = urllib2.Request(url, data_json, headers)
try: try:
response_stream = urllib2.urlopen(req) response_stream = urllib2.urlopen(req)
cur.execute("UPDATE electrum_payments SET processed=1 WHERE id=%d;"%(id)) print 'Got Response for %s' % address
cur.execute("UPDATE electrum_payments SET processed=1 WHERE oid=%d;"%(oid))
except urllib2.HTTPError: except urllib2.HTTPError:
print "cannot do callback", data_json print "cannot do callback", data_json
except ValueError, e: except ValueError, e: