Add min fee per byte option and rename min fee option.

Author: evoskuil

data/bn.cfg

@@ -154,8 +154,10 @@ sync_peers = 0
 sync_timeout_seconds = 5
 # The time period for block polling after initial block download, defaults to 1 (0 disables).
 block_poll_seconds = 1
-# The minimum fee required for transaction acceptance, defaults to 1.
-minimum_fee_satoshis = 1
+# The minimum fee per byte required for transaction acceptance, defaults to 1.
+minimum_byte_fee_satoshis = 1
+# The minimum fee required for transaction relay from peers, defaults to 1.
+minimum_relay_fee_satoshis = 1
 # Request that peers relay transactions, defaults to true.
 relay_transactions = true
 # Request transactions on each channel start, defaults to true.

include/bitcoin/node/protocols/protocol_transaction_in.hpp

@@ -58,7 +58,7 @@ class BCN_API protocol_transaction_in
     blockchain::safe_chain& chain_;
     const bool relay_from_peer_;
     const bool refresh_pool_;
-    const uint64_t minimum_fee_;
+    const uint64_t minimum_relay_fee_;
 };
 
 } // namespace node

src/parser.cpp

@@ -401,10 +401,16 @@ options_metadata parser::load_settings()
         "The time period for block polling after initial block download, defaults to 1 (0 disables)."
     )
     (
-        /* Internally this blockchain, but it is conceptually a node setting.*/
-        "node.minimum_fee_satoshis",
-        value<uint64_t>(&configured.chain.minimum_fee_satoshis),
-        "The minimum fee required for transaction acceptance, defaults to 1."
+        /* Internally this is blockchain, but it is conceptually a node setting.*/
+        "node.minimum_byte_fee_satoshis",
+        value<float>(&configured.chain.minimum_byte_fee_satoshis),
+        "The minimum fee per byte required for transaction acceptance, defaults to 1."
+    )
+    (
+        /* Internally this is blockchain, but it is conceptually a node setting.*/
+        "node.minimum_relay_fee_satoshis",
+        value<uint64_t>(&configured.chain.minimum_relay_fee_satoshis),
+        "The minimum fee required for transaction relay from peers, defaults to 1."
     )
     ////(
     ////    /* Internally this blockchain, but it is conceptually a node setting.*/

src/protocols/protocol_transaction_in.cpp

@@ -51,8 +51,8 @@ protocol_transaction_in::protocol_transaction_in(full_node& node,
         node.node_settings().refresh_transactions),
 
     // TODO: move fee_filter to a derived class protocol_transaction_in_70013.
-    minimum_fee_(negotiated_version() >= version::level::bip133 ?
-        node.chain_settings().minimum_fee_satoshis : 0),
+    minimum_relay_fee_(negotiated_version() >= version::level::bip133 ?
+        node.chain_settings().minimum_relay_fee_satoshis : 0),
     CONSTRUCT_TRACK(protocol_transaction_in)
 {
 }
@@ -65,10 +65,11 @@ void protocol_transaction_in::start()
     protocol_events::start(BIND1(handle_stop, _1));
 
     // TODO: move fee_filter to a derived class protocol_transaction_in_70013.
-    if (minimum_fee_ != 0)
+    if (minimum_relay_fee_ != 0)
     {
         // Have the peer filter the transactions it announces to us.
-        SEND2(fee_filter{ minimum_fee_ }, handle_send, _1, fee_filter::command);
+        SEND2(fee_filter{ minimum_relay_fee_ }, handle_send, _1,
+            fee_filter::command);
     }
 
     // TODO: move memory_pool to a derived class protocol_transaction_in_60002.