Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Merge branch 'revert-f7aab6a8' into 'feature/libbitcoin-son'

Browse source 
Revert "Back importmulti for bitcoind"

See merge request PBSA/peerplays!155
This commit is contained in:
Davor Hirunda 2022-09-23 23:19:31 +00:00
commit 8fbe62b4cf
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp
View file

@ -78,9 +78,6 @@ public:
virtual bool walletpassphrase(const std::string &passphrase, uint32_t timeout = 60) { virtual bool walletpassphrase(const std::string &passphrase, uint32_t timeout = 60) {
return false; return false;
}; };
void importmulti(const std::vector<multi_params> &address_or_script_array, const bool rescan = true) {};
}; };
class bitcoin_rpc_client : public bitcoin_client_base, public rpc_client { class bitcoin_rpc_client : public bitcoin_client_base, public rpc_client {

2
libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp
View file

@ -1633,7 +1633,7 @@ void sidechain_net_handler_bitcoin::on_changed_objects_cb(const vector<object_id
} }
//! importmulti //! importmulti
bitcoin_client->importmulti(address_or_script_array); // bitcoin_client->importmulti(address_or_script_array);
//! Lock wallet //! Lock wallet
bitcoin_client->walletlock(); bitcoin_client->walletlock();