1025440184
This introduces internal types: * CKeyID: reference (hash160) of a key * CScriptID: reference (hash160) of a script * CTxDestination: a boost::variant of the former two CBitcoinAddress is retrofitted to be a Base58 encoding of a CTxDestination. This allows all internal code to only use the internal types, and only have RPC and GUI depend on the base58 code. Furthermore, the header dependencies are a lot saner now. base58.h is at the top (right below rpc and gui) instead of at the bottom. For the rest: wallet -> script -> keystore -> key. Only keystore still requires a forward declaration of CScript. Solving that would require splitting script into two layers.
91 lines
2.6 KiB
C++
91 lines
2.6 KiB
C++
// Copyright (c) 2009-2012 Bitcoin Developers
|
|
// Distributed under the MIT/X11 software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#include "init.h" // for pwalletMain
|
|
#include "bitcoinrpc.h"
|
|
#include "ui_interface.h"
|
|
#include "base58.h"
|
|
|
|
#include <boost/lexical_cast.hpp>
|
|
|
|
#define printf OutputDebugStringF
|
|
|
|
using namespace json_spirit;
|
|
using namespace std;
|
|
|
|
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);
|
|
CKeyID vchAddress = key.GetPubKey().GetID();
|
|
{
|
|
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");
|
|
CKeyID keyID;
|
|
if (!address.GetKeyID(keyID))
|
|
throw JSONRPCError(-3, "Address does not refer to a key");
|
|
CSecret vchSecret;
|
|
bool fCompressed;
|
|
if (!pwalletMain->GetSecret(keyID, vchSecret, fCompressed))
|
|
throw JSONRPCError(-4,"Private key for address " + strAddress + " is not known");
|
|
return CBitcoinSecret(vchSecret, fCompressed).ToString();
|
|
}
|