app: Use relayFee setting

Make relayFee a field of the blockchain and set that field on initiation
and changing.

Author: JoeGruffins

decred/decred/dcr/dcrdata.py

@@ -424,7 +424,14 @@ class DcrdataBlockchain:
     DcrdataBlockchain implements the Blockchain API from tinydecred.api.
     """
 
-    def __init__(self, db, netParams, datapath, skipConnect=False):
+    def __init__(
+        self,
+        db,
+        netParams,
+        datapath,
+        skipConnect=False,
+        relayFee=txscript.DefaultRelayFeePerKb,
+    ):
         """
         Args:
             db (database.Bucket | database.KeyValueDatabase | filepath):
@@ -451,6 +458,7 @@ def __init__(self, db, netParams, datapath, skipConnect=False):
         self.subsidyCache = txscript.SubsidyCache(netParams)
         self.addrSubscribers = {}
         self.blockSubscribers = []
+        self.relayFee = relayFee
         if not skipConnect:
             self.connect()
 
@@ -859,15 +867,6 @@ def updateTip(self):
             log.error("failed to retrieve tip from blockchain: %s" % formatTraceback(e))
             raise DecredError("no tip data retrieved")
 
-    def relayFee(self):
-        """
-        Return the current transaction fee.
-
-        Returns:
-            int: Atoms per kB of encoded transaction.
-        """
-        return txscript.DefaultRelayFeePerKb
-
     def saveBlockHeader(self, header):
         """
         Save the block header to the database.
@@ -1016,7 +1015,7 @@ def sendOutputs(self, outputs, keysource, utxosource, feeRate=None):
         changeScriptVersion = txscript.DefaultScriptVersion
         changeScriptSize = txscript.P2PKHPkScriptSize
 
-        relayFeePerKb = feeRate * 1e3 if feeRate else self.relayFee()
+        relayFeePerKb = feeRate * 1e3 if feeRate else self.relayFee
         for (i, txout) in enumerate(outputs):
             checkOutput(txout, relayFeePerKb)
 
@@ -1225,7 +1224,7 @@ def purchaseTickets(self, keysource, utxosource, req):
 
         ticketFeeIncrement = req.ticketFee
         if ticketFeeIncrement == 0:
-            ticketFeeIncrement = self.relayFee()
+            ticketFeeIncrement = self.relayFee
 
         # Make sure that we have enough funds. Calculate different
         # ticket required amounts depending on whether or not a
@@ -1290,7 +1289,7 @@ def purchaseTickets(self, keysource, utxosource, req):
 
         txFeeIncrement = req.txFee
         if txFeeIncrement == 0:
-            txFeeIncrement = self.relayFee()
+            txFeeIncrement = self.relayFee
 
         # Send the split transaction.
         # sendOutputs takes the fee rate in atoms/byte
@@ -1407,7 +1406,7 @@ def revokeTicket(self, tx, keysource, redeemScript):
             MsgTx: the signed revocation.
         """
 
-        revocation = txscript.makeRevocation(tx, self.relayFee())
+        revocation = txscript.makeRevocation(tx, self.relayFee)
 
         signedScript = txscript.signTxOutput(
             self.netParams,

tinywallet/tinywallet/app.py

@@ -115,6 +115,7 @@ def __init__(self, qApp):
             self.cfg.netParams,
             self.settings[DB.dcrdata].decode(),
             skipConnect=True,
+            relayFee=self.settings[DB.relayFee],
         )
         chains.registerChain("dcr", self.dcrdata)
 

tinywallet/tinywallet/screens.py

@@ -1142,6 +1142,7 @@ def relayFeeChangeClicked(self, e=None):
             self.relayFeeField.setText(str(app.settings[DB.relayFee]))
             return
 
+        self.blockchain.relayFee = fee
         app.settings[DB.relayFee] = fee
         log.info(f"relay fee changed to {fee}")
         app.appWindow.showSuccess("fee changed")