diff --git a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp index 9f4df6f3..f2577a28 100644 --- a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp +++ b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp @@ -23,18 +23,16 @@ public: class bitcoin_rpc_client { public: - enum class multi_type - { + enum class multi_type { script, address }; - struct multi_params - { - multi_params(multi_type _type, const std::string& _address_or_script, const std::string& _label = "") - : type{_type} - , address_or_script{_address_or_script} - , label{_label} - {} + struct multi_params { + multi_params(multi_type _type, const std::string &_address_or_script, const std::string &_label = "") : + type{_type}, + address_or_script{_address_or_script}, + label{_label} { + } multi_type type; std::string address_or_script; @@ -61,7 +59,7 @@ public: std::string gettransaction(const std::string &txid, const bool include_watch_only = false); std::string getblockchaininfo(); void importaddress(const std::string &address_or_script, const std::string &label = "", const bool rescan = true, const bool p2sh = false); - void importmulti(const std::vector& address_or_script_array, const bool rescan = true); + void importmulti(const std::vector &address_or_script_array, const bool rescan = true); std::vector listunspent(const uint32_t minconf = 1, const uint32_t maxconf = 9999999); std::vector listunspent_by_address_and_amount(const std::string &address, double transfer_amount, const uint32_t minconf = 1, const uint32_t maxconf = 9999999); std::string loadwallet(const std::string &filename); diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp index cd0d97fb..407686e5 100644 --- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp +++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp @@ -572,12 +572,12 @@ void bitcoin_rpc_client::importaddress(const std::string &address_or_script, con } } -void bitcoin_rpc_client::importmulti(const std::vector& address_or_script_array, const bool rescan) { +void bitcoin_rpc_client::importmulti(const std::vector &address_or_script_array, const bool rescan) { std::string body = std::string("{\"jsonrpc\": \"1.0\", \"id\":\"importmulti\", " "\"method\": \"importmulti\", \"params\": ["); std::string argument_1 = "["; - for(const auto& param : address_or_script_array) { + for (const auto ¶m : address_or_script_array) { argument_1 += "{\"scriptPubKey\": "; if (param.type == multi_type::address) argument_1 += "{\"address\": \"" + param.address_or_script + "\"}"; @@ -1981,7 +1981,7 @@ void sidechain_net_handler_bitcoin::on_changed_objects_cb(const vectorimportmulti(address_or_script_array); }