tMerge branch 'master' of gitorious.org:electrum/electrum - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 1dfae2618484750a2853ea62f0f5590c8f35c37d
DIR parent 617f8a18ef5556ad425e5ff59a8c2ac4e5a73179
HTML Author: ThomasV <thomasv@gitorious>
Date: Wed, 21 Mar 2012 11:36:07 +0300
Merge branch 'master' of gitorious.org:electrum/electrum
Diffstat:
M client/electrum | 3 +--
M client/interface.py | 5 ++++-
M client/wallet.py | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
---
DIR diff --git a/client/electrum b/client/electrum
t@@ -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)
DIR diff --git a/client/interface.py b/client/interface.py
t@@ -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(''):
t@@ -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):
DIR diff --git a/client/wallet.py b/client/wallet.py
t@@ -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()