show address if coins were received at a change address
authorThomasV <thomasv@gitorious>
Sat, 19 May 2012 09:01:45 +0000 (11:01 +0200)
committerThomasV <thomasv@gitorious>
Sat, 19 May 2012 09:01:45 +0000 (11:01 +0200)
lib/wallet.py

index 6efcdf4..6c0eb8d 100644 (file)
@@ -766,11 +766,21 @@ class Wallet:
             else:
                 for o_addr in tx['outputs']:
                     if self.is_mine(o_addr) and not self.is_change(o_addr):
-                        dest_label = self.labels.get(o_addr)
-                        if dest_label:
-                            default_label = 'at: ' + dest_label
-                        else:
-                            default_label = 'at: ' + o_addr
+                        break
+                else:
+                    for o_addr in tx['outputs']:
+                        if self.is_mine(o_addr):
+                            break
+                    else:
+                        o_addr = None
+
+                if o_addr:
+                    dest_label = self.labels.get(o_addr)
+                    if dest_label:
+                        default_label = 'at: ' + dest_label
+                    else:
+                        default_label = 'at: ' + o_addr
+
             tx['default_label'] = default_label
 
     def mktx(self, to_address, amount, label, password, fee=None, change_addr=None, from_addr= None):