electrum

commit 3ee61c4c6ea23133395663da27b8bbe9a93d74bb
parent 57af8d1d390aec0e104ccf8385801866ac1bac91
Author: ThomasV <thomasv@electrum.org>
Date:   Tue,  2 Feb 2016 19:56:34 +0100

define wallet.dummy_address method

Diffstat:
M
gui/qt/main_window.py
 | 
4
+---
M
lib/wallet.py
 | 
6
++++--
M
plugins/trustedcoin/trustedcoin.py
 | 
4
++--

3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
@@ -275,8 +275,6 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
         self.update_recently_visited(wallet.storage.path)
         self.import_old_contacts()
         # address used to create a dummy transaction and estimate transaction fee
-        a = self.wallet.addresses(False)
-        self.dummy_address = a[0] if a else None
         self.accounts_expanded = self.wallet.storage.get('accounts_expanded',{})
         self.current_account = self.wallet.storage.get("current_account", None)
         self.history_list.update()
@@ -1095,7 +1093,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
         else:
             fee = self.fee_e.get_amount() if freeze_fee else None
             if not outputs:
-                addr = self.payto_e.payto_address if self.payto_e.payto_address else self.dummy_address
+                addr = self.payto_e.payto_address if self.payto_e.payto_address else self.wallet.dummy_address()
                 outputs = [(TYPE_ADDRESS, addr, amount)]
             try:
                 tx = self.wallet.make_unsigned_transaction(self.get_coins(), outputs, self.config, fee)
diff --git a/lib/wallet.py b/lib/wallet.py
@@ -654,12 +654,14 @@ class Abstract_Wallet(PrintError):
                 continue
         return coins
 
+    def dummy_address(self):
+        return self.addresses(False)[0]
+
     def get_max_amount(self, config, inputs, fee):
         sendable = sum(map(lambda x:x['value'], inputs))
         for i in inputs:
             self.add_input_info(i)
-        addr = self.addresses(False)[0]
-        output = (TYPE_ADDRESS, addr, sendable)
+        output = (TYPE_ADDRESS, self.dummy_address(), sendable)
         dummy_tx = Transaction.from_io(inputs, [output])
         if fee is None:
             fee = self.estimate_fee(config, dummy_tx.estimated_size())
diff --git a/plugins/trustedcoin/trustedcoin.py b/plugins/trustedcoin/trustedcoin.py
@@ -211,7 +211,7 @@ class Wallet_2fa(Multisig_Wallet):
         sendable = sum(map(lambda x:x['value'], inputs))
         for i in inputs:
             self.add_input_info(i)
-        dummy_address = self.addresses(False)[0]
+        dummy_address = self.dummy_address()
         xf = self.extra_fee()
         if xf and sendable >= xf:
             billing_address = self.billing_info['billing_address']
@@ -219,7 +219,7 @@ class Wallet_2fa(Multisig_Wallet):
             outputs = [(TYPE_ADDRESS, dummy_address, sendable),
                        (TYPE_ADDRESS, billing_address, xf)]
         else:
-            outputs = [(TYPE_ADDRESS, dummy_addr, sendable)]
+            outputs = [(TYPE_ADDRESS, dummy_address, sendable)]
 
         dummy_tx = Transaction.from_io(inputs, outputs)
         if fee is None: