Merge branch 'master' of gitorious.org:electrum/electrum
This commit is contained in:
commit
1dfae26184
|
@ -163,8 +163,7 @@ if __name__ == '__main__':
|
|||
cmd = 'help'
|
||||
|
||||
# open session
|
||||
if cmd not in ['password', 'mktx', 'history', 'label', 'contacts', 'help', 'validateaddress', 'signmessage', 'verifymessage', 'eval', 'create', 'addresses', 'import']:
|
||||
|
||||
if cmd not in ['password', 'mktx', 'history', 'label', 'contacts', 'help', 'validateaddress', 'signmessage', 'verifymessage', 'eval', 'create', 'addresses', 'import', 'seed']:
|
||||
addresses = wallet.all_addresses()
|
||||
version = wallet.electrum_version
|
||||
interface.start_session(addresses, version)
|
||||
|
|
|
@ -236,6 +236,9 @@ class NativeInterface(PollingInterface):
|
|||
if cmd == 'poll':
|
||||
params = self.session_id
|
||||
|
||||
if cmd == 'address.subscribe':
|
||||
params = [ self.session_id] + params
|
||||
|
||||
if cmd in ['h', 'tx']:
|
||||
str_params = params[0]
|
||||
elif type(params) != type(''):
|
||||
|
@ -369,7 +372,7 @@ class AsynchronousInterface(Interface):
|
|||
self.is_connected = False
|
||||
self.disconnected_event.set()
|
||||
|
||||
def update_wallet(self,cb):
|
||||
def update_wallet(self):
|
||||
self.up_to_date_event.wait()
|
||||
|
||||
def send(self, messages):
|
||||
|
|
|
@ -706,7 +706,7 @@ class Wallet:
|
|||
self.interface.get_history(addr)
|
||||
|
||||
def receive_history_callback(self, addr, data):
|
||||
#print "updating history for", addr, repr(data)
|
||||
#print "updating history for", addr
|
||||
self.history[addr] = data
|
||||
self.synchronize()
|
||||
self.update_tx_history()
|
||||
|
|
Loading…
Reference in New Issue