diff --git a/libraries/plugins/peerplays_sidechain/bitcoin_utils.cpp b/libraries/plugins/peerplays_sidechain/bitcoin_utils.cpp index 53441820..c835b877 100644 --- a/libraries/plugins/peerplays_sidechain/bitcoin_utils.cpp +++ b/libraries/plugins/peerplays_sidechain/bitcoin_utils.cpp @@ -759,7 +759,7 @@ bytes add_signatures_to_unsigned_tx(const bytes &unsigned_tx, const std::vector< return ret; } -std::string get_weighted_multisig_address(const std::vector> &public_keys) { +std::string get_weighted_multisig_address(const std::vector> &public_keys, bitcoin_network network) { std::vector> key_data; for (auto p : public_keys) { fc::ecc::public_key_data kd; @@ -770,7 +770,7 @@ std::string get_weighted_multisig_address(const std::vector> public_keys) { diff --git a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/bitcoin_utils.hpp b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/bitcoin_utils.hpp index c1b4826b..2e5ca0f2 100644 --- a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/bitcoin_utils.hpp +++ b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/bitcoin_utils.hpp @@ -11,11 +11,11 @@ enum bitcoin_network { }; bytes generate_redeem_script(std::vector> key_data); -std::string p2wsh_address_from_redeem_script(const bytes &script, bitcoin_network network = mainnet); +std::string p2wsh_address_from_redeem_script(const bytes &script, bitcoin_network network = testnet); bytes lock_script_for_redeem_script(const bytes &script); bytes lock_script_from_pw_address(const std::string &address); -std::string get_weighted_multisig_address(const std::vector> &public_keys); +std::string get_weighted_multisig_address(const std::vector> &public_keys, bitcoin_network network = testnet); bytes get_weighted_multisig_redeem_script(std::vector> public_keys); std::vector signatures_for_raw_transaction(const bytes &unsigned_tx,