Merge JoinMarket-Org/joinmarket-clientserver#1033: Add configurable miner fee randomization factor

df5f241f29 Add configurable miner fee randomization factor (Kristaps Kaupe)

Pull request description:

  Defaults to previously hardcoded 0.2 (+/- 20%).

  Resolves #1009.

  What I don't like is that we now have `tx_fees` and `tx_fees_factor` under `[POLICY]` and `txfee` and `txfee_factor` under `[YIELDGENERATOR]`, which may be confusing, but I don't see a good solution to that (apart from getting rid of yg txfee configs).

Top commit has no ACKs.

Tree-SHA512: 0c7fddf5209a74fa8d0dc2b195b1125b819e48db3c6aa8543a0c305a8ad19a5e02ada916e36325acbbd3a9114a33c0183ee49772ab37769de0f538113e506d5c

jmclient/jmclient/blockchaininterface.py

@@ -152,9 +152,13 @@ class ElectrumWalletInterface(BlockchainInterface): #pragma: no cover
         return result
 
     def estimate_fee_per_kb(self, N):
+        tx_fees_factor = float(jm_single().config.get('POLICY',
+            'tx_fees_factor'))
         if super().fee_per_kb_has_been_manually_set(N):
             # use a floor of 1000 to not run into node relay problems
-            return int(max(1000, random.uniform(N * float(0.8), N * float(1.2))))
+            return int(max(1000,
+                random.uniform(N * float(1 - tx_fees_factor),
+                N * float(1 + tx_fees_factor))))
         fee = self.wallet.network.synchronous_get(('blockchain.estimatefee', [N]
                                                   ))
         fee_per_kb_sat = int(float(fee) * 100000000)
@@ -432,15 +436,20 @@ class BitcoinCoreInterface(BlockchainInterface):
         mempoolminfee_in_sat_randomized = random.uniform(
             mempoolminfee_in_sat, mempoolminfee_in_sat * float(1.2))
 
+        tx_fees_factor = float(jm_single().config.get('POLICY',
+            'tx_fees_factor'))
         if super().fee_per_kb_has_been_manually_set(N):
-            N_res = random.uniform(N * float(0.8), N * float(1.2))
+            N_res = random.uniform(N * float(1 - tx_fees_factor),
+                N * float(1 + tx_fees_factor))
             if N_res < mempoolminfee_in_sat:
                 log.info("Using this mempool min fee as tx feerate: " +
                     btc.fee_per_kb_to_str(mempoolminfee_in_sat) + ".")
                 return int(mempoolminfee_in_sat_randomized)
             else:
-                log.info("Using this manually set tx feerate (randomized " +
+                msg = "Using this manually set tx feerate"
-                    "for privacy): " + btc.fee_per_kb_to_str(N_res) + ".")
+                if tx_fees_factor != 0:
+                    msg = msg + " (randomized for privacy)"
+                log.info(msg + ": " + btc.fee_per_kb_to_str(N_res) + ".")
                 return int(N_res)
 
         # Special bitcoin core case: sometimes the highest priority
@@ -460,8 +469,9 @@ class BitcoinCoreInterface(BlockchainInterface):
             # the 'feerate' key is found and contains a positive value:
             if estimate and estimate > 0:
                 estimate_in_sat = btc.btc_to_sat(estimate)
-                retval = random.uniform(estimate_in_sat * float(0.8),
+                retval = random.uniform(
-                    estimate_in_sat * float(1.2))
+                    estimate_in_sat * float(1 - tx_fees_factor),
+                    estimate_in_sat * float(1 + tx_fees_factor))
                 break
         else:  # cannot get a valid estimate after `tries` tries:
             retval = 10000
@@ -474,9 +484,11 @@ class BitcoinCoreInterface(BlockchainInterface):
                 btc.fee_per_kb_to_str(mempoolminfee_in_sat) + ".")
             return int(mempoolminfee_in_sat_randomized)
         else:
-            log.info("Using bitcoin network feerate for " + str(N) +
+            msg = "Using bitcoin network feerate for " + str(N) + \
-                " block confirmation target (randomized for privacy): " +
+                " block confirmation target"
-                btc.fee_per_kb_to_str(retval))
+            if tx_fees_factor != 0:
+                msg = msg + " (randomized for privacy)"
+            log.info(msg + ": " + btc.fee_per_kb_to_str(retval))
             return int(retval)
 
     def get_current_block_height(self):

jmclient/jmclient/configure.py

@@ -206,11 +206,14 @@ merge_algorithm = default
 # be interpreted as the fee in satoshi per kB that you wish to use
 # example: N=30000 will use 30000 sat/kB as a fee, while N=5
 # will use the estimate from your selected blockchain source
-# Note that there will be a 20% variation around any manually chosen
-# values, so if you set N=10000, it might use any value between
-# 8000 and 12000 for your transactions.
 tx_fees = 3
 
+# Transaction fee rate variance factor, 0.2 means 20% variation around
+# any manually chosen values, so if you set tx_fees=10000 and
+# tx_fees_factor=0.2, it might use any value between 8000 and 12000 for
+# your transactions.
+tx_fees_factor = 0.2
+
 # For users getting transaction fee estimates over an API,
 # place a sanity check limit on the satoshis-per-kB to be paid.
 # This limit is also applied to users using Core, even though