From 0da51ba0279ca00793238c9943e12c82b0050c44 Mon Sep 17 00:00:00 2001 From: thomasv Date: Wed, 11 Jan 2012 17:41:38 +0100 Subject: [PATCH 1/6] fix blocks variable name --- client/electrum.py | 4 ++-- client/gui.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/electrum.py b/client/electrum.py index 6b1b34eb..3c5210cc 100755 --- a/client/electrum.py +++ b/client/electrum.py @@ -490,7 +490,7 @@ class Wallet: 'fee':self.fee, 'host':self.interface.host, 'port':self.interface.port, - 'blocks':self.blocks, + 'blocks':self.interface.blocks, 'seed':self.seed, 'addresses':self.addresses, 'change_addresses':self.change_addresses, @@ -520,7 +520,7 @@ class Wallet: self.fee = int( d.get('fee') ) self.interface.host = d.get('host') self.interface.set_port( d.get('port') ) - self.blocks = d.get('blocks') + self.interface.blocks = d.get('blocks') self.seed = d.get('seed') self.addresses = d.get('addresses') self.change_addresses = d.get('change_addresses') diff --git a/client/gui.py b/client/gui.py index c0fa62c6..7b431df0 100644 --- a/client/gui.py +++ b/client/gui.py @@ -910,10 +910,10 @@ class BitcoinGUI: c, u = self.wallet.get_balance() if self.is_connected: self.status_image.set_from_stock(gtk.STOCK_YES, gtk.ICON_SIZE_MENU) - self.network_button.set_tooltip_text("Connected to %s.\n%d blocks\nresponse time: %f"%(self.wallet.interface.host, self.wallet.blocks, self.wallet.interface.rtime)) + self.network_button.set_tooltip_text("Connected to %s.\n%d blocks\nresponse time: %f"%(self.wallet.interface.host, self.wallet.interface.blocks, self.wallet.interface.rtime)) else: self.status_image.set_from_stock(gtk.STOCK_NO, gtk.ICON_SIZE_MENU) - self.network_button.set_tooltip_text("Trying to contact %s.\n%d blocks"%(self.wallet.interface.host, self.wallet.blocks)) + self.network_button.set_tooltip_text("Trying to contact %s.\n%d blocks"%(self.wallet.interface.host, self.wallet.interface.blocks)) text = "Balance: %s "%( format_satoshis(c) ) if u: text += "[+ %s unconfirmed]"%( format_satoshis(u) ) if self.error: text = self.error @@ -950,7 +950,7 @@ class BitcoinGUI: for tx in self.wallet.get_tx_history(): tx_hash = tx['tx_hash'] if tx['height']: - conf = self.wallet.blocks - tx['height'] + 1 + conf = self.wallet.interface.blocks - tx['height'] + 1 time_str = datetime.datetime.fromtimestamp( tx['nTime']).isoformat(' ')[:-3] conf_icon = gtk.STOCK_APPLY else: @@ -1035,7 +1035,7 @@ class BitcoinGUI: image = gtk.Image() image.set_from_stock(gtk.STOCK_NETWORK, gtk.ICON_SIZE_DIALOG) if self.is_connected: - status = "Connected to %s.\n%d blocks\nresponse time: %f"%(wallet.interface.host, wallet.blocks, wallet.interface.rtime) + status = "Connected to %s.\n%d blocks\nresponse time: %f"%(wallet.interface.host, wallet.interface.blocks, wallet.interface.rtime) else: status = "Not connected" From e13ae1e67be79fb4eb4ccfb2409b1ee751772b99 Mon Sep 17 00:00:00 2001 From: thomasv Date: Wed, 11 Jan 2012 18:06:37 +0100 Subject: [PATCH 2/6] fix: set_port --- client/gui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/gui.py b/client/gui.py index 7b431df0..f8414fb4 100644 --- a/client/gui.py +++ b/client/gui.py @@ -276,7 +276,7 @@ def run_settings_dialog(wallet, is_create, is_recovery, parent): if is_create: wallet.interface.host = host - wallet.interface.port = port + wallet.interface.set_port( port ) if is_recovery: wallet.seed = seed wallet.gap_limit = gap From 4007004de66db73df9598e8d37645b7434ce100f Mon Sep 17 00:00:00 2001 From: thomasv Date: Wed, 11 Jan 2012 18:30:39 +0100 Subject: [PATCH 3/6] fix: all_addresses --- client/electrum.py | 4 ++-- client/gui.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/electrum.py b/client/electrum.py index 3c5210cc..fec013ee 100755 --- a/client/electrum.py +++ b/client/electrum.py @@ -282,9 +282,9 @@ class Interface: out = ast.literal_eval( self.request( repr ( ('new_session', repr( ( version, addresses)) )))) self.session_id, self.message = out - def update_session(self): + def update_session(self, addresses): if self.use_http(): - out = self.http_json_server.session.update(self.session_id, self.all_addresses()) + out = self.http_json_server.session.update(self.session_id, addresses) else: out = self.request( repr ( ('update_session', repr((self.session_id, self.all_addresses()))))) return out diff --git a/client/gui.py b/client/gui.py index f8414fb4..7beaf32a 100644 --- a/client/gui.py +++ b/client/gui.py @@ -507,7 +507,7 @@ class BitcoinGUI: while True: try: if self.is_connected and self.update_session: - self.wallet.interface.update_session() + self.wallet.interface.update_session( self.wallet.all_addresses() ) self.update_session = False if time.time() - get_servers_time > 5*60: From 95a3ab2dad6671d8a5eee67ba2fdab7839919834 Mon Sep 17 00:00:00 2001 From: thomasv Date: Wed, 11 Jan 2012 18:31:21 +0100 Subject: [PATCH 4/6] fix: all_addresses --- client/gui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/gui.py b/client/gui.py index 7beaf32a..9963202a 100644 --- a/client/gui.py +++ b/client/gui.py @@ -516,7 +516,7 @@ class BitcoinGUI: self.period = 15 if self.wallet.interface.use_http() else 5 if self.wallet.update(): - self.wallet.interface.update_session() + self.wallet.interface.update_session( self.wallet.all_addresses() ) gobject.idle_add( self.update_history_tab ) gobject.idle_add( self.update_receiving_tab ) # addressbook too... From fc3b80c873227039d428e6658f0326b11b330ffd Mon Sep 17 00:00:00 2001 From: thomasv Date: Wed, 11 Jan 2012 18:32:07 +0100 Subject: [PATCH 5/6] fix: addresses --- client/electrum.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/electrum.py b/client/electrum.py index fec013ee..3aadf0b5 100755 --- a/client/electrum.py +++ b/client/electrum.py @@ -286,7 +286,7 @@ class Interface: if self.use_http(): out = self.http_json_server.session.update(self.session_id, addresses) else: - out = self.request( repr ( ('update_session', repr((self.session_id, self.all_addresses()))))) + out = self.request( repr ( ('update_session', repr((self.session_id, addresses))))) return out def get_servers(self): From 98f606a25ef60ff0c322f2c6cda1368bfebe7f16 Mon Sep 17 00:00:00 2001 From: thomasv Date: Wed, 11 Jan 2012 18:40:09 +0100 Subject: [PATCH 6/6] minor fix --- client/electrum.py | 1 + 1 file changed, 1 insertion(+) diff --git a/client/electrum.py b/client/electrum.py index 3aadf0b5..3b544fbf 100755 --- a/client/electrum.py +++ b/client/electrum.py @@ -253,6 +253,7 @@ class Interface: def send_tx(self, data): if self.use_http(): out = self.http_json_server.blockchain.transaction.broadcast(data) + out = out.get("result") else: out = self.request( repr ( ('tx', data ))) return out