mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-06-17 20:32:33 +02:00
fe4a655042
Gets rid of `MainFrameRepaint` in favor of specific update functions that tell the UI exactly what changed. This improves the efficiency of various handlers. Also fixes problems with mined transactions not showing up until restart. The following notifications were added: - `NotifyBlocksChanged`: Block chain changed - `NotifyKeyStoreStatusChanged`: Wallet status (encrypted, locked) changed. - `NotifyAddressBookChanged`: Address book entry changed. - `NotifyTransactionChanged`: Wallet transaction added, removed or updated. - `NotifyNumConnectionsChanged`: Number of connections changed. - `NotifyAlertChanged`: New, updated or cancelled alert. As this finally makes it possible for the UI to know when a new alert arrived, it can be shown as OS notification. These notifications could also be useful for RPC clients. However, currently, they are ignored in bitcoind (in noui.cpp). Also brings back polling with timer for numBlocks in ClientModel. This value updates so frequently during initial download that the number of signals clogs the UI thread and causes heavy CPU usage. And after initial block download, the value changes so rarely that a delay of half a second until the UI updates is unnoticable.
96 lines
2.7 KiB
C++
96 lines
2.7 KiB
C++
// Copyright (c) 2009-2012 Bitcoin Developers
|
|
// Distributed under the MIT/X11 software license, see the accompanying
|
|
// file license.txt or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#include "init.h" // for pwalletMain
|
|
#include "bitcoinrpc.h"
|
|
#include "ui_interface.h"
|
|
|
|
#include <boost/lexical_cast.hpp>
|
|
|
|
#include "json/json_spirit_reader_template.h"
|
|
#include "json/json_spirit_writer_template.h"
|
|
#include "json/json_spirit_utils.h"
|
|
|
|
#define printf OutputDebugStringF
|
|
|
|
// using namespace boost::asio;
|
|
using namespace json_spirit;
|
|
using namespace std;
|
|
|
|
extern Object JSONRPCError(int code, const string& message);
|
|
|
|
class CTxDump
|
|
{
|
|
public:
|
|
CBlockIndex *pindex;
|
|
int64 nValue;
|
|
bool fSpent;
|
|
CWalletTx* ptx;
|
|
int nOut;
|
|
CTxDump(CWalletTx* ptx = NULL, int nOut = -1)
|
|
{
|
|
pindex = NULL;
|
|
nValue = 0;
|
|
fSpent = false;
|
|
this->ptx = ptx;
|
|
this->nOut = nOut;
|
|
}
|
|
};
|
|
|
|
Value importprivkey(const Array& params, bool fHelp)
|
|
{
|
|
if (fHelp || params.size() < 1 || params.size() > 2)
|
|
throw runtime_error(
|
|
"importprivkey <bitcoinprivkey> [label]\n"
|
|
"Adds a private key (as returned by dumpprivkey) to your wallet.");
|
|
|
|
string strSecret = params[0].get_str();
|
|
string strLabel = "";
|
|
if (params.size() > 1)
|
|
strLabel = params[1].get_str();
|
|
CBitcoinSecret vchSecret;
|
|
bool fGood = vchSecret.SetString(strSecret);
|
|
|
|
if (!fGood) throw JSONRPCError(-5,"Invalid private key");
|
|
|
|
CKey key;
|
|
bool fCompressed;
|
|
CSecret secret = vchSecret.GetSecret(fCompressed);
|
|
key.SetSecret(secret, fCompressed);
|
|
CBitcoinAddress vchAddress = CBitcoinAddress(key.GetPubKey());
|
|
|
|
{
|
|
LOCK2(cs_main, pwalletMain->cs_wallet);
|
|
|
|
pwalletMain->MarkDirty();
|
|
pwalletMain->SetAddressBookName(vchAddress, strLabel);
|
|
|
|
if (!pwalletMain->AddKey(key))
|
|
throw JSONRPCError(-4,"Error adding key to wallet");
|
|
|
|
pwalletMain->ScanForWalletTransactions(pindexGenesisBlock, true);
|
|
pwalletMain->ReacceptWalletTransactions();
|
|
}
|
|
|
|
return Value::null;
|
|
}
|
|
|
|
Value dumpprivkey(const Array& params, bool fHelp)
|
|
{
|
|
if (fHelp || params.size() != 1)
|
|
throw runtime_error(
|
|
"dumpprivkey <bitcoinaddress>\n"
|
|
"Reveals the private key corresponding to <bitcoinaddress>.");
|
|
|
|
string strAddress = params[0].get_str();
|
|
CBitcoinAddress address;
|
|
if (!address.SetString(strAddress))
|
|
throw JSONRPCError(-5, "Invalid Bitcoin address");
|
|
CSecret vchSecret;
|
|
bool fCompressed;
|
|
if (!pwalletMain->GetSecret(address, vchSecret, fCompressed))
|
|
throw JSONRPCError(-4,"Private key for address " + strAddress + " is not known");
|
|
return CBitcoinSecret(vchSecret, fCompressed).ToString();
|
|
}
|