Add electrum method versions, refactor test exception safety.

Author: evoskuil

include/bitcoin/server/interfaces/electrum.hpp

@@ -44,6 +44,7 @@ struct electrum_methods
         method<"blockchain.scripthash.subscribe", string_t>{ "scripthash" },
         method<"blockchain.scripthash.unsubscribe", string_t>{ "scripthash" },
         method<"blockchain.transaction.broadcast", string_t>{ "raw_tx" },
+        method<"blockchain.transaction.broadcast_package", string_t, optional<true>>{ "raw_txs", "verbose" },
         method<"blockchain.transaction.get", string_t, boolean_t>{ "tx_hash", "verbose" },
         method<"blockchain.transaction.get_merkle", string_t, number_t>{ "tx_hash", "height" },
         method<"blockchain.transaction.id_from_pos", number_t, number_t, optional<false>>{ "height", "tx_pos", "merkle" },
@@ -58,7 +59,8 @@ struct electrum_methods
         method<"server.version", string_t, optional<empty::value>>{ "client_name", "protocol_version" },
 
         /// Mempool methods.
-        method<"mempool.get_fee_histogram">{}
+        method<"mempool.get_fee_histogram">{},
+        method<"mempool.get_info">{}
     };
 
     template <typename... Args>
@@ -80,17 +82,19 @@ struct electrum_methods
     using blockchain_scripthash_subscribe = at<9>;
     using blockchain_scripthash_unsubscribe = at<10>;
     using blockchain_transaction_broadcast = at<11>;
-    using blockchain_transaction_get = at<12>;
-    using blockchain_transaction_get_merkle = at<13>;
-    using blockchain_transaction_id_from_pos = at<14>;
-    using server_add_peer = at<15>;
-    using server_banner = at<16>;
-    using server_donation_address = at<17>;
-    using server_features = at<18>;
-    using server_peers_subscribe = at<19>;
-    using server_ping = at<20>;
-    using server_version = at<21>;
-    using mempool_get_fee_histogram = at<22>;
+    using blockchain_transaction_broadcast_package = at<12>;
+    using blockchain_transaction_get = at<13>;
+    using blockchain_transaction_get_merkle = at<14>;
+    using blockchain_transaction_id_from_pos = at<15>;
+    using server_add_peer = at<16>;
+    using server_banner = at<17>;
+    using server_donation_address = at<18>;
+    using server_features = at<19>;
+    using server_peers_subscribe = at<20>;
+    using server_ping = at<21>;
+    using server_version = at<22>;
+    using mempool_get_fee_histogram = at<23>;
+    using mempool_get_info = at<24>;
 };
 
 } // namespace interface

include/bitcoin/server/parsers/electrum_version.hpp

@@ -31,19 +31,19 @@ enum class version
     /// Invalid version.
     v0_0,
 
-    /// 2011, initial protocol negotiation.
+    /// 2011, initial protocol negotiation (usupported).
     v0_6,
 
-    /// 2012, enhanced protocol negotiation.
+    /// 2012, enhanced protocol negotiation (usupported).
     v0_8,
 
-    /// 2012, added pruning limits and transport indicators.
+    /// 2012, added pruning limits and transport indicators (usupported).
     v0_9,
 
-    /// 2013, baseline for core methods in the official specification.
+    /// 2013, baseline for core methods in official specification (usupported).
     v0_10,
 
-    /// 2014, 1.x series, deprecations of utxo and block number methods.
+    /// 2014, deprecations of utxo and block number methods (minimum).
     v1_0,
 
     /// 2015, updated version response and introduced scripthash methods.
@@ -64,8 +64,14 @@ enum class version
     /// 2020, added scripthash unsubscribe functionality.
     v1_4_2,
 
-    /// 2022, updated response formats and added fee estimation modes.
-    v1_6
+    /// There is no v1.5 release (skipped).
+    //v1_5,
+
+    /// 2022, updated response formats, added fee estimation modes (maximum).
+    v1_6,
+
+    /// Not valid, just defined for out of bounds testing.
+    v1_7
 };
 
 std::string_view version_to_string(version value) NOEXCEPT;

include/bitcoin/server/protocols/protocol_electrum.hpp

@@ -25,6 +25,7 @@
 #include <bitcoin/server/define.hpp>
 #include <bitcoin/server/interfaces/interfaces.hpp>
 #include <bitcoin/server/parsers/parsers.hpp>
+#include <bitcoin/server/protocols/protocol_electrum_version.hpp>
 #include <bitcoin/server/protocols/protocol_rpc.hpp>
 
 namespace libbitcoin {
@@ -91,6 +92,9 @@ class BCS_API protocol_electrum
     void handle_blockchain_transaction_broadcast(const code& ec,
         rpc_interface::blockchain_transaction_broadcast,
         const std::string& raw_tx) NOEXCEPT;
+    void handle_blockchain_transaction_broadcast_package(const code& ec,
+        rpc_interface::blockchain_transaction_broadcast_package,
+        const std::string& raw_txs, bool verbose) NOEXCEPT;
     void handle_blockchain_transaction_get(const code& ec,
         rpc_interface::blockchain_transaction_get, const std::string& tx_hash,
         bool verbose) NOEXCEPT;
@@ -122,6 +126,8 @@ class BCS_API protocol_electrum
     /// Handlers (mempool).
     void handle_mempool_get_fee_histogram(const code& ec,
         rpc_interface::mempool_get_fee_histogram) NOEXCEPT;
+    void handle_mempool_get_info(const code& ec,
+        rpc_interface::mempool_get_info) NOEXCEPT;
 
 protected:
     /// Common implementation for block_header/s.
@@ -131,7 +137,7 @@ class BCS_API protocol_electrum
     /// Notify client of new header.
     void do_header(node::header_t link) NOEXCEPT;
 
-    inline bool is_version(server::electrum::version version) const NOEXCEPT
+    inline bool at_least(server::electrum::version version) const NOEXCEPT
     {
         return channel_->version() >= version;
     }
@@ -142,6 +148,13 @@ class BCS_API protocol_electrum
     }
 
 private:
+    using version_t = protocol_electrum_version;
+    static constexpr electrum::version minimum = version_t::minimum;
+    static constexpr electrum::version maximum = version_t::maximum;
+
+    // Compute server.features.hosts value from config.
+    network::rpc::object_t advertised_hosts() const NOEXCEPT;
+
     // These are thread safe.
     const options_t& options_;
     std::atomic_bool subscribed_{};

include/bitcoin/server/protocols/protocol_electrum_version.hpp

@@ -37,8 +37,8 @@ class BCS_API protocol_electrum_version
     typedef std::shared_ptr<protocol_electrum_version> ptr;
     using rpc_interface = interface::electrum;
 
-    static constexpr electrum::version minimum = electrum::version::v1_4;
-    static constexpr electrum::version maximum = electrum::version::v1_4_2;
+    static constexpr electrum::version minimum = electrum::version::v1_0;
+    static constexpr electrum::version maximum = electrum::version::v1_6;
 
     inline protocol_electrum_version(const auto& session,
         const network::channel::ptr& channel,

src/parsers/electrum_version.cpp

@@ -40,7 +40,8 @@ std::string_view version_to_string(version value) NOEXCEPT
         { version::v1_4,   "1.4" },
         { version::v1_4_1, "1.4.1" },
         { version::v1_4_2, "1.4.2" },
-        { version::v1_6,   "1.6" }
+        { version::v1_6,   "1.6" },
+        { version::v1_7,   "1.7" }
     };
 
     const auto it = map.find(value);
@@ -63,7 +64,8 @@ version version_from_string( const std::string_view& value) NOEXCEPT
         { "1.4",   version::v1_4 },
         { "1.4.1", version::v1_4_1 },
         { "1.4.2", version::v1_4_2 },
-        { "1.6",   version::v1_6 }
+        { "1.6",   version::v1_6 },
+        { "1.7",   version::v1_7 }
     };
 
     const auto it = map.find(value);