Merge pull request #629 from evoskuil/master

Parse [node] fee settings and use in electrum.

Author: evoskuil

src/parser.cpp

@@ -1250,6 +1250,16 @@ options_metadata parser::load_settings() THROWS
     ////    value<bool>(&configured.node.headers_first),
     ////    "Obtain current header chain before obtaining associated blocks, defaults to 'true'."
     ////)
+    (
+        "node.minimum_free_rate",
+        value<float>(&configured.node.minimum_free_rate),
+        "Minimum fee rate for non-conflicting tx acceptance, defaults to '0.0'."
+    )
+    (
+        "node.minimum_bump_rate",
+        value<float>(&configured.node.minimum_bump_rate),
+        "Minimum fee rate increment for conflicting tx acceptance, defaults to '0.0'."
+    )
     (
         "node.allowed_deviation",
         value<float>(&configured.node.allowed_deviation),

src/protocols/protocol_electrum.cpp

@@ -321,8 +321,8 @@ void protocol_electrum::handle_blockchain_relay_fee(const code& ec,
     if (stopped(ec))
         return;
 
-    // TODO: implement from [node] config, removed in protocol 1.6.
-    send_result(0.00000001, 70, BIND(complete, _1));
+    // TODO: deprecated in 1.4.2, removed in 1.6.
+    send_result(node_settings().minimum_free_rate, 42, BIND(complete, _1));
 }
 
 void protocol_electrum::handle_blockchain_scripthash_get_balance(const code& ec,