461e49fee2
This simplifies fixing the wallet-returns-stale-info issue as we can now hold cs_wallet across an entire block instead of only per-tx (though we only actually do so in the next commit). This change also removes the NOT_IN_BLOCK constant in favor of only passing the CBlockIndex* parameter to SyncTransactions when a new block is being connected, instead of also when a block is being disconnected. This change adds a parameter to BlockConnectedDisconnected which lists the transactions which were removed from mempool due to confliction as a result of this operation. While its somewhat of a shame to make block-validation-logic generate a list of mempool changes to be included in its generated callbacks, fixing this isnt too hard. Further in this change-set, CValidationInterface starts listening to mempool directly, placing it in the middle and giving it a bit of logic to know how to route notifications from block-validation, mempool, etc (though not listening for conflicted-removals yet).
182 lines
5.4 KiB
C++
182 lines
5.4 KiB
C++
// Copyright (c) 2015-2016 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 "zmqnotificationinterface.h"
|
|
#include "zmqpublishnotifier.h"
|
|
|
|
#include "version.h"
|
|
#include "validation.h"
|
|
#include "streams.h"
|
|
#include "util.h"
|
|
|
|
void zmqError(const char *str)
|
|
{
|
|
LogPrint(BCLog::ZMQ, "zmq: Error: %s, errno=%s\n", str, zmq_strerror(errno));
|
|
}
|
|
|
|
CZMQNotificationInterface::CZMQNotificationInterface() : pcontext(NULL)
|
|
{
|
|
}
|
|
|
|
CZMQNotificationInterface::~CZMQNotificationInterface()
|
|
{
|
|
Shutdown();
|
|
|
|
for (std::list<CZMQAbstractNotifier*>::iterator i=notifiers.begin(); i!=notifiers.end(); ++i)
|
|
{
|
|
delete *i;
|
|
}
|
|
}
|
|
|
|
CZMQNotificationInterface* CZMQNotificationInterface::Create()
|
|
{
|
|
CZMQNotificationInterface* notificationInterface = NULL;
|
|
std::map<std::string, CZMQNotifierFactory> factories;
|
|
std::list<CZMQAbstractNotifier*> notifiers;
|
|
|
|
factories["pubhashblock"] = CZMQAbstractNotifier::Create<CZMQPublishHashBlockNotifier>;
|
|
factories["pubhashtx"] = CZMQAbstractNotifier::Create<CZMQPublishHashTransactionNotifier>;
|
|
factories["pubrawblock"] = CZMQAbstractNotifier::Create<CZMQPublishRawBlockNotifier>;
|
|
factories["pubrawtx"] = CZMQAbstractNotifier::Create<CZMQPublishRawTransactionNotifier>;
|
|
|
|
for (std::map<std::string, CZMQNotifierFactory>::const_iterator i=factories.begin(); i!=factories.end(); ++i)
|
|
{
|
|
std::string arg("-zmq" + i->first);
|
|
if (IsArgSet(arg))
|
|
{
|
|
CZMQNotifierFactory factory = i->second;
|
|
std::string address = GetArg(arg, "");
|
|
CZMQAbstractNotifier *notifier = factory();
|
|
notifier->SetType(i->first);
|
|
notifier->SetAddress(address);
|
|
notifiers.push_back(notifier);
|
|
}
|
|
}
|
|
|
|
if (!notifiers.empty())
|
|
{
|
|
notificationInterface = new CZMQNotificationInterface();
|
|
notificationInterface->notifiers = notifiers;
|
|
|
|
if (!notificationInterface->Initialize())
|
|
{
|
|
delete notificationInterface;
|
|
notificationInterface = NULL;
|
|
}
|
|
}
|
|
|
|
return notificationInterface;
|
|
}
|
|
|
|
// Called at startup to conditionally set up ZMQ socket(s)
|
|
bool CZMQNotificationInterface::Initialize()
|
|
{
|
|
LogPrint(BCLog::ZMQ, "zmq: Initialize notification interface\n");
|
|
assert(!pcontext);
|
|
|
|
pcontext = zmq_init(1);
|
|
|
|
if (!pcontext)
|
|
{
|
|
zmqError("Unable to initialize context");
|
|
return false;
|
|
}
|
|
|
|
std::list<CZMQAbstractNotifier*>::iterator i=notifiers.begin();
|
|
for (; i!=notifiers.end(); ++i)
|
|
{
|
|
CZMQAbstractNotifier *notifier = *i;
|
|
if (notifier->Initialize(pcontext))
|
|
{
|
|
LogPrint(BCLog::ZMQ, " Notifier %s ready (address = %s)\n", notifier->GetType(), notifier->GetAddress());
|
|
}
|
|
else
|
|
{
|
|
LogPrint(BCLog::ZMQ, " Notifier %s failed (address = %s)\n", notifier->GetType(), notifier->GetAddress());
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (i!=notifiers.end())
|
|
{
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
// Called during shutdown sequence
|
|
void CZMQNotificationInterface::Shutdown()
|
|
{
|
|
LogPrint(BCLog::ZMQ, "zmq: Shutdown notification interface\n");
|
|
if (pcontext)
|
|
{
|
|
for (std::list<CZMQAbstractNotifier*>::iterator i=notifiers.begin(); i!=notifiers.end(); ++i)
|
|
{
|
|
CZMQAbstractNotifier *notifier = *i;
|
|
LogPrint(BCLog::ZMQ, " Shutdown notifier %s at %s\n", notifier->GetType(), notifier->GetAddress());
|
|
notifier->Shutdown();
|
|
}
|
|
zmq_ctx_destroy(pcontext);
|
|
|
|
pcontext = 0;
|
|
}
|
|
}
|
|
|
|
void CZMQNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, const CBlockIndex *pindexFork, bool fInitialDownload)
|
|
{
|
|
if (fInitialDownload || pindexNew == pindexFork) // In IBD or blocks were disconnected without any new ones
|
|
return;
|
|
|
|
for (std::list<CZMQAbstractNotifier*>::iterator i = notifiers.begin(); i!=notifiers.end(); )
|
|
{
|
|
CZMQAbstractNotifier *notifier = *i;
|
|
if (notifier->NotifyBlock(pindexNew))
|
|
{
|
|
i++;
|
|
}
|
|
else
|
|
{
|
|
notifier->Shutdown();
|
|
i = notifiers.erase(i);
|
|
}
|
|
}
|
|
}
|
|
|
|
void CZMQNotificationInterface::TransactionAddedToMempool(const CTransactionRef& ptx)
|
|
{
|
|
// Used by BlockConnected and BlockDisconnected as well, because they're
|
|
// all the same external callback.
|
|
const CTransaction& tx = *ptx;
|
|
|
|
for (std::list<CZMQAbstractNotifier*>::iterator i = notifiers.begin(); i!=notifiers.end(); )
|
|
{
|
|
CZMQAbstractNotifier *notifier = *i;
|
|
if (notifier->NotifyTransaction(tx))
|
|
{
|
|
i++;
|
|
}
|
|
else
|
|
{
|
|
notifier->Shutdown();
|
|
i = notifiers.erase(i);
|
|
}
|
|
}
|
|
}
|
|
|
|
void CZMQNotificationInterface::BlockConnected(const std::shared_ptr<const CBlock>& pblock, const CBlockIndex* pindexConnected, const std::vector<CTransactionRef>& vtxConflicted)
|
|
{
|
|
for (const CTransactionRef& ptx : pblock->vtx) {
|
|
// Do a normal notify for each transaction added in the block
|
|
TransactionAddedToMempool(ptx);
|
|
}
|
|
}
|
|
|
|
void CZMQNotificationInterface::BlockDisconnected(const std::shared_ptr<const CBlock>& pblock)
|
|
{
|
|
for (const CTransactionRef& ptx : pblock->vtx) {
|
|
// Do a normal notify for each transaction removed in block disconnection
|
|
TransactionAddedToMempool(ptx);
|
|
}
|
|
}
|