@@ -138,6 +138,7 @@ BITCOIN_CORE_H = \ | |||
utilmoneystr.h \ | |||
utilstrencodings.h \ | |||
utiltime.h \ | |||
validationinterface.h \ | |||
version.h \ | |||
wallet/crypter.h \ | |||
wallet/walletdb.h \ | |||
@@ -191,6 +192,7 @@ libbitcoin_server_a_SOURCES = \ | |||
timedata.cpp \ | |||
txdb.cpp \ | |||
txmempool.cpp \ | |||
validationinterface.cpp \ | |||
$(JSON_H) \ | |||
$(BITCOIN_CORE_H) | |||
@@ -5,9 +5,9 @@ | |||
#include "main.h" | |||
#include "arith_uint256.h" | |||
#include "addrman.h" | |||
#include "alert.h" | |||
#include "arith_uint256.h" | |||
#include "chainparams.h" | |||
#include "checkpoints.h" | |||
#include "checkqueue.h" | |||
@@ -21,6 +21,7 @@ | |||
#include "undo.h" | |||
#include "util.h" | |||
#include "utilmoneystr.h" | |||
#include "validationinterface.h" | |||
#include <sstream> | |||
@@ -156,68 +157,6 @@ namespace { | |||
set<int> setDirtyFileInfo; | |||
} // anon namespace | |||
////////////////////////////////////////////////////////////////////////////// | |||
// | |||
// dispatching functions | |||
// | |||
// These functions dispatch to one or all registered wallets | |||
namespace { | |||
struct CMainSignals { | |||
/** Notifies listeners of updated transaction data (transaction, and optionally the block it is found in. */ | |||
boost::signals2::signal<void (const CTransaction &, const CBlock *)> SyncTransaction; | |||
/** Notifies listeners of an erased transaction (currently disabled, requires transaction replacement). */ | |||
boost::signals2::signal<void (const uint256 &)> EraseTransaction; | |||
/** Notifies listeners of an updated transaction without new data (for now: a coinbase potentially becoming visible). */ | |||
boost::signals2::signal<void (const uint256 &)> UpdatedTransaction; | |||
/** Notifies listeners of a new active block chain. */ | |||
boost::signals2::signal<void (const CBlockLocator &)> SetBestChain; | |||
/** Notifies listeners about an inventory item being seen on the network. */ | |||
boost::signals2::signal<void (const uint256 &)> Inventory; | |||
/** Tells listeners to broadcast their data. */ | |||
boost::signals2::signal<void ()> Broadcast; | |||
/** Notifies listeners of a block validation result */ | |||
boost::signals2::signal<void (const CBlock&, const CValidationState&)> BlockChecked; | |||
} g_signals; | |||
} // anon namespace | |||
void RegisterValidationInterface(CValidationInterface* pwalletIn) { | |||
g_signals.SyncTransaction.connect(boost::bind(&CValidationInterface::SyncTransaction, pwalletIn, _1, _2)); | |||
g_signals.EraseTransaction.connect(boost::bind(&CValidationInterface::EraseFromWallet, pwalletIn, _1)); | |||
g_signals.UpdatedTransaction.connect(boost::bind(&CValidationInterface::UpdatedTransaction, pwalletIn, _1)); | |||
g_signals.SetBestChain.connect(boost::bind(&CValidationInterface::SetBestChain, pwalletIn, _1)); | |||
g_signals.Inventory.connect(boost::bind(&CValidationInterface::Inventory, pwalletIn, _1)); | |||
g_signals.Broadcast.connect(boost::bind(&CValidationInterface::ResendWalletTransactions, pwalletIn)); | |||
g_signals.BlockChecked.connect(boost::bind(&CValidationInterface::BlockChecked, pwalletIn, _1, _2)); | |||
} | |||
void UnregisterValidationInterface(CValidationInterface* pwalletIn) { | |||
g_signals.BlockChecked.disconnect(boost::bind(&CValidationInterface::BlockChecked, pwalletIn, _1, _2)); | |||
g_signals.Broadcast.disconnect(boost::bind(&CValidationInterface::ResendWalletTransactions, pwalletIn)); | |||
g_signals.Inventory.disconnect(boost::bind(&CValidationInterface::Inventory, pwalletIn, _1)); | |||
g_signals.SetBestChain.disconnect(boost::bind(&CValidationInterface::SetBestChain, pwalletIn, _1)); | |||
g_signals.UpdatedTransaction.disconnect(boost::bind(&CValidationInterface::UpdatedTransaction, pwalletIn, _1)); | |||
g_signals.EraseTransaction.disconnect(boost::bind(&CValidationInterface::EraseFromWallet, pwalletIn, _1)); | |||
g_signals.SyncTransaction.disconnect(boost::bind(&CValidationInterface::SyncTransaction, pwalletIn, _1, _2)); | |||
} | |||
void UnregisterAllValidationInterfaces() { | |||
g_signals.BlockChecked.disconnect_all_slots(); | |||
g_signals.Broadcast.disconnect_all_slots(); | |||
g_signals.Inventory.disconnect_all_slots(); | |||
g_signals.SetBestChain.disconnect_all_slots(); | |||
g_signals.UpdatedTransaction.disconnect_all_slots(); | |||
g_signals.EraseTransaction.disconnect_all_slots(); | |||
g_signals.SyncTransaction.disconnect_all_slots(); | |||
} | |||
void SyncWithWallets(const CTransaction &tx, const CBlock *pblock) { | |||
g_signals.SyncTransaction(tx, pblock); | |||
} | |||
////////////////////////////////////////////////////////////////////////////// | |||
// | |||
// Registration of network node signals. | |||
@@ -1897,7 +1836,7 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin | |||
// Watch for changes to the previous coinbase transaction. | |||
static uint256 hashPrevBestCoinBase; | |||
g_signals.UpdatedTransaction(hashPrevBestCoinBase); | |||
GetMainSignals().UpdatedTransaction(hashPrevBestCoinBase); | |||
hashPrevBestCoinBase = block.vtx[0].GetHash(); | |||
int64_t nTime4 = GetTimeMicros(); nTimeCallbacks += nTime4 - nTime3; | |||
@@ -1956,7 +1895,7 @@ bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode) { | |||
return state.Abort("Failed to write to coin database"); | |||
// Update best block in wallet (so we can detect restored wallets). | |||
if (mode != FLUSH_STATE_IF_NEEDED) { | |||
g_signals.SetBestChain(chainActive.GetLocator()); | |||
GetMainSignals().SetBestChain(chainActive.GetLocator()); | |||
} | |||
nLastWrite = GetTimeMicros(); | |||
} | |||
@@ -2080,7 +2019,7 @@ bool static ConnectTip(CValidationState &state, CBlockIndex *pindexNew, CBlock * | |||
CCoinsViewCache view(pcoinsTip); | |||
CInv inv(MSG_BLOCK, pindexNew->GetBlockHash()); | |||
bool rv = ConnectBlock(*pblock, state, pindexNew, view); | |||
g_signals.BlockChecked(*pblock, state); | |||
GetMainSignals().BlockChecked(*pblock, state); | |||
if (!rv) { | |||
if (state.IsInvalid()) | |||
InvalidBlockFound(pindexNew, state); | |||
@@ -3471,7 +3410,7 @@ void static ProcessGetData(CNode* pfrom) | |||
} | |||
// Track requests for our stuff. | |||
g_signals.Inventory(inv.hash); | |||
GetMainSignals().Inventory(inv.hash); | |||
if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK) | |||
break; | |||
@@ -3765,7 +3704,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv, | |||
} | |||
// Track requests for our stuff | |||
g_signals.Inventory(inv.hash); | |||
GetMainSignals().Inventory(inv.hash); | |||
if (pfrom->nSendSize > (SendBufferSize() * 2)) { | |||
Misbehaving(pfrom->GetId(), 50); | |||
@@ -4536,7 +4475,7 @@ bool SendMessages(CNode* pto, bool fSendTrickle) | |||
// transactions become unconfirmed and spams other nodes. | |||
if (!fReindex && !fImporting && !IsInitialBlockDownload()) | |||
{ | |||
g_signals.Broadcast(); | |||
GetMainSignals().Broadcast(); | |||
} | |||
// |
@@ -133,15 +133,6 @@ extern CBlockIndex *pindexBestHeader; | |||
/** Minimum disk space required - used in CheckDiskSpace() */ | |||
static const uint64_t nMinDiskSpace = 52428800; | |||
/** Register a wallet to receive updates from core */ | |||
void RegisterValidationInterface(CValidationInterface* pwalletIn); | |||
/** Unregister a wallet from core */ | |||
void UnregisterValidationInterface(CValidationInterface* pwalletIn); | |||
/** Unregister all wallets from core */ | |||
void UnregisterAllValidationInterfaces(); | |||
/** Push an updated transaction to all registered wallets */ | |||
void SyncWithWallets(const CTransaction& tx, const CBlock* pblock = NULL); | |||
/** Register with a network node to receive its signals */ | |||
void RegisterNodeSignals(CNodeSignals& nodeSignals); | |||
/** Unregister a network node */ | |||
@@ -152,7 +143,7 @@ void UnregisterNodeSignals(CNodeSignals& nodeSignals); | |||
* block is made active. Note that it does not, however, guarantee that the | |||
* specific block passed to it has been checked for validity! | |||
* | |||
* @param[out] state This may be set to an Error state if any error occurred processing it, including during validation/connection/etc of otherwise unrelated blocks during reorganisation; or it may be set to an Invalid state if pblock is itself invalid (but this is not guaranteed even when the block is checked). If you want to *possibly* get feedback on whether pblock is valid, you must also install a CValidationInterface - this will have its BlockChecked method called whenever *any* block completes validation. | |||
* @param[out] state This may be set to an Error state if any error occurred processing it, including during validation/connection/etc of otherwise unrelated blocks during reorganisation; or it may be set to an Invalid state if pblock is itself invalid (but this is not guaranteed even when the block is checked). If you want to *possibly* get feedback on whether pblock is valid, you must also install a CValidationInterface (see validationinterface.h) - this will have its BlockChecked method called whenever *any* block completes validation. | |||
* @param[in] pfrom The node which we are receiving the block from; it is added to mapBlockSource and may be penalised if the block is invalid. | |||
* @param[in] pblock The block we want to process. | |||
* @param[out] dbp If pblock is stored to disk (or already there), this will be set to its location. | |||
@@ -512,19 +503,4 @@ extern CCoinsViewCache *pcoinsTip; | |||
/** Global variable that points to the active block tree (protected by cs_main) */ | |||
extern CBlockTreeDB *pblocktree; | |||
class CValidationInterface { | |||
protected: | |||
virtual void SyncTransaction(const CTransaction &tx, const CBlock *pblock) {}; | |||
virtual void EraseFromWallet(const uint256 &hash) {}; | |||
virtual void SetBestChain(const CBlockLocator &locator) {}; | |||
virtual void UpdatedTransaction(const uint256 &hash) {}; | |||
virtual void Inventory(const uint256 &hash) {}; | |||
virtual void ResendWalletTransactions() {}; | |||
virtual void BlockChecked(const CBlock&, const CValidationState&) {}; | |||
friend void ::RegisterValidationInterface(CValidationInterface*); | |||
friend void ::UnregisterValidationInterface(CValidationInterface*); | |||
friend void ::UnregisterAllValidationInterfaces(); | |||
}; | |||
#endif // BITCOIN_MAIN_H |
@@ -0,0 +1,47 @@ | |||
// Copyright (c) 2009-2010 Satoshi Nakamoto | |||
// Copyright (c) 2009-2014 The Bitcoin Core developers | |||
// Distributed under the MIT software license, see the accompanying | |||
// file COPYING or http://www.opensource.org/licenses/mit-license.php. | |||
#include "validationinterface.h" | |||
static CMainSignals g_signals; | |||
CMainSignals& GetMainSignals() | |||
{ | |||
return g_signals; | |||
} | |||
void RegisterValidationInterface(CValidationInterface* pwalletIn) { | |||
g_signals.SyncTransaction.connect(boost::bind(&CValidationInterface::SyncTransaction, pwalletIn, _1, _2)); | |||
g_signals.EraseTransaction.connect(boost::bind(&CValidationInterface::EraseFromWallet, pwalletIn, _1)); | |||
g_signals.UpdatedTransaction.connect(boost::bind(&CValidationInterface::UpdatedTransaction, pwalletIn, _1)); | |||
g_signals.SetBestChain.connect(boost::bind(&CValidationInterface::SetBestChain, pwalletIn, _1)); | |||
g_signals.Inventory.connect(boost::bind(&CValidationInterface::Inventory, pwalletIn, _1)); | |||
g_signals.Broadcast.connect(boost::bind(&CValidationInterface::ResendWalletTransactions, pwalletIn)); | |||
g_signals.BlockChecked.connect(boost::bind(&CValidationInterface::BlockChecked, pwalletIn, _1, _2)); | |||
} | |||
void UnregisterValidationInterface(CValidationInterface* pwalletIn) { | |||
g_signals.BlockChecked.disconnect(boost::bind(&CValidationInterface::BlockChecked, pwalletIn, _1, _2)); | |||
g_signals.Broadcast.disconnect(boost::bind(&CValidationInterface::ResendWalletTransactions, pwalletIn)); | |||
g_signals.Inventory.disconnect(boost::bind(&CValidationInterface::Inventory, pwalletIn, _1)); | |||
g_signals.SetBestChain.disconnect(boost::bind(&CValidationInterface::SetBestChain, pwalletIn, _1)); | |||
g_signals.UpdatedTransaction.disconnect(boost::bind(&CValidationInterface::UpdatedTransaction, pwalletIn, _1)); | |||
g_signals.EraseTransaction.disconnect(boost::bind(&CValidationInterface::EraseFromWallet, pwalletIn, _1)); | |||
g_signals.SyncTransaction.disconnect(boost::bind(&CValidationInterface::SyncTransaction, pwalletIn, _1, _2)); | |||
} | |||
void UnregisterAllValidationInterfaces() { | |||
g_signals.BlockChecked.disconnect_all_slots(); | |||
g_signals.Broadcast.disconnect_all_slots(); | |||
g_signals.Inventory.disconnect_all_slots(); | |||
g_signals.SetBestChain.disconnect_all_slots(); | |||
g_signals.UpdatedTransaction.disconnect_all_slots(); | |||
g_signals.EraseTransaction.disconnect_all_slots(); | |||
g_signals.SyncTransaction.disconnect_all_slots(); | |||
} | |||
void SyncWithWallets(const CTransaction &tx, const CBlock *pblock) { | |||
g_signals.SyncTransaction(tx, pblock); | |||
} |
@@ -0,0 +1,62 @@ | |||
// Copyright (c) 2009-2010 Satoshi Nakamoto | |||
// Copyright (c) 2009-2014 The Bitcoin Core developers | |||
// Distributed under the MIT software license, see the accompanying | |||
// file COPYING or http://www.opensource.org/licenses/mit-license.php. | |||
#ifndef BITCOIN_VALIDATIONINTERFACE_H | |||
#define BITCOIN_VALIDATIONINTERFACE_H | |||
#include <boost/signals2/signal.hpp> | |||
class CBlock; | |||
class CBlockLocator; | |||
class CTransaction; | |||
class CValidationInterface; | |||
class CValidationState; | |||
class uint256; | |||
// These functions dispatch to one or all registered wallets | |||
/** Register a wallet to receive updates from core */ | |||
void RegisterValidationInterface(CValidationInterface* pwalletIn); | |||
/** Unregister a wallet from core */ | |||
void UnregisterValidationInterface(CValidationInterface* pwalletIn); | |||
/** Unregister all wallets from core */ | |||
void UnregisterAllValidationInterfaces(); | |||
/** Push an updated transaction to all registered wallets */ | |||
void SyncWithWallets(const CTransaction& tx, const CBlock* pblock = NULL); | |||
class CValidationInterface { | |||
protected: | |||
virtual void SyncTransaction(const CTransaction &tx, const CBlock *pblock) {}; | |||
virtual void EraseFromWallet(const uint256 &hash) {}; | |||
virtual void SetBestChain(const CBlockLocator &locator) {}; | |||
virtual void UpdatedTransaction(const uint256 &hash) {}; | |||
virtual void Inventory(const uint256 &hash) {}; | |||
virtual void ResendWalletTransactions() {}; | |||
virtual void BlockChecked(const CBlock&, const CValidationState&) {}; | |||
friend void ::RegisterValidationInterface(CValidationInterface*); | |||
friend void ::UnregisterValidationInterface(CValidationInterface*); | |||
friend void ::UnregisterAllValidationInterfaces(); | |||
}; | |||
struct CMainSignals { | |||
/** Notifies listeners of updated transaction data (transaction, and optionally the block it is found in. */ | |||
boost::signals2::signal<void (const CTransaction &, const CBlock *)> SyncTransaction; | |||
/** Notifies listeners of an erased transaction (currently disabled, requires transaction replacement). */ | |||
boost::signals2::signal<void (const uint256 &)> EraseTransaction; | |||
/** Notifies listeners of an updated transaction without new data (for now: a coinbase potentially becoming visible). */ | |||
boost::signals2::signal<void (const uint256 &)> UpdatedTransaction; | |||
/** Notifies listeners of a new active block chain. */ | |||
boost::signals2::signal<void (const CBlockLocator &)> SetBestChain; | |||
/** Notifies listeners about an inventory item being seen on the network. */ | |||
boost::signals2::signal<void (const uint256 &)> Inventory; | |||
/** Tells listeners to broadcast their data. */ | |||
boost::signals2::signal<void ()> Broadcast; | |||
/** Notifies listeners of a block validation result */ | |||
boost::signals2::signal<void (const CBlock&, const CValidationState&)> BlockChecked; | |||
}; | |||
CMainSignals& GetMainSignals(); | |||
#endif // BITCOIN_VALIDATIONINTERFACE_H |
@@ -7,12 +7,13 @@ | |||
#define BITCOIN_WALLET_H | |||
#include "amount.h" | |||
#include "primitives/block.h" | |||
#include "primitives/transaction.h" | |||
#include "key.h" | |||
#include "keystore.h" | |||
#include "main.h" | |||
#include "primitives/block.h" | |||
#include "primitives/transaction.h" | |||
#include "ui_interface.h" | |||
#include "validationinterface.h" | |||
#include "wallet/crypter.h" | |||
#include "wallet/wallet_ismine.h" | |||
#include "wallet/walletdb.h" |