Browse Source

minor fixes

283
thomasv 11 years ago
parent
commit
74735bd64e
  1. 9
      lib/verifier.py
  2. 2
      lib/wallet.py

9
lib/verifier.py

@ -27,12 +27,13 @@ from bitcoin import *
class TxVerifier(threading.Thread): class TxVerifier(threading.Thread):
""" Simple Payment Verification """ """ Simple Payment Verification """
def __init__(self, interface, blockchain, storage): def __init__(self, network, storage):
threading.Thread.__init__(self) threading.Thread.__init__(self)
self.daemon = True self.daemon = True
self.storage = storage self.storage = storage
self.blockchain = blockchain self.network = network
self.interface = interface self.blockchain = network.blockchain
self.interface = network.interface
self.transactions = {} # requested verifications (with height sent by the requestor) self.transactions = {} # requested verifications (with height sent by the requestor)
self.interface.register_channel('txverifier') self.interface.register_channel('txverifier')
self.verified_tx = storage.get('verified_tx3',{}) # height, timestamp of verified transactions self.verified_tx = storage.get('verified_tx3',{}) # height, timestamp of verified transactions
@ -143,7 +144,7 @@ class TxVerifier(threading.Thread):
self.verified_tx[tx_hash] = (tx_height, timestamp, pos) self.verified_tx[tx_hash] = (tx_height, timestamp, pos)
print_error("verified %s"%tx_hash) print_error("verified %s"%tx_hash)
self.storage.put('verified_tx3', self.verified_tx, True) self.storage.put('verified_tx3', self.verified_tx, True)
self.interface.trigger_callback('updated') self.network.trigger_callback('updated')
def hash_merkle_root(self, merkle_s, target_hash, pos): def hash_merkle_root(self, merkle_s, target_hash, pos):

2
lib/wallet.py

@ -1351,7 +1351,7 @@ class Wallet:
from verifier import TxVerifier from verifier import TxVerifier
self.network = network self.network = network
self.interface = network.interface self.interface = network.interface
self.verifier = TxVerifier(self.interface, network.blockchain, self.storage) self.verifier = TxVerifier(self.network, self.storage)
self.verifier.start() self.verifier.start()
self.set_verifier(self.verifier) self.set_verifier(self.verifier)
self.synchronizer = WalletSynchronizer(self) self.synchronizer = WalletSynchronizer(self)

Loading…
Cancel
Save