AaronFiore/electrum
1
0
Fork 0
Code Activity

implement MIN_RELAY_TX_FEE

Browse Source
This commit is contained in:
ecdsa
2013-03-24 11:25:17 +01:00
parent 70e82e99ea
commit fc7122008a
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gui/gui_classic.py
View File

@@ -32,6 +32,7 @@ from PyQt4.QtCore import *
import PyQt4.QtCore as QtCore
import PyQt4.QtGui as QtGui
from electrum.interface import DEFAULT_SERVERS
from electrum.bitcoin import MIN_RELAY_TX_FEE
try:
import icons_rc
@@ -795,8 +796,8 @@ class ElectrumWindow(QMainWindow):
self.show_message(str(e))
return
if tx.requires_fee(self.wallet.verifier) and fee == 0:
QMessageBox.warning(self, _('Error'), _("This transaction requires a fee, or it will not be propagated by the network."), _('OK'))
if tx.requires_fee(self.wallet.verifier) and fee < MIN_RELAY_TX_FEE:
QMessageBox.warning(self, _('Error'), _("This transaction requires a higher fee, or it will not be propagated by the network."), _('OK'))
return
self.run_hook('send_tx', tx)

5
gui/gui_gtk.py
View File

@@ -35,6 +35,7 @@ MONOSPACE_FONT = 'Lucida Console' if platform.system() == 'Windows' else 'monosp
from electrum.util import format_satoshis
from electrum.interface import DEFAULT_SERVERS
from electrum.bitcoin import MIN_RELAY_TX_FEE
def numbify(entry, is_int = False):
text = entry.get_text().strip()
@@ -844,8 +845,8 @@ class ElectrumWindow:
self.show_message(str(e))
return
if tx.requires_fee(self.wallet.verifier) and fee == 0:
self.show_message( "This transaction requires a fee, or it will not be propagated by the network." )
if tx.requires_fee(self.wallet.verifier) and fee < MIN_RELAY_TX_FEE:
self.show_message( "This transaction requires a higher fee, or it will not be propagated by the network." )
return