diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-02-04 17:02:57 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-02-04 17:03:09 +0100 |
| commit | d2228384de3a870803697a6cc95467b97e9a37a5 (patch) | |
| tree | 23fb8038aa7e37d344617dbaccfbf8c5cf05b389 /src/zmq | |
| parent | 4f4dc5ef7295e85531127cd08a822291e548b2f0 (diff) | |
| parent | 7d0bf0bb4652fad052d5bf3ca3bf883754b46ead (diff) | |
| download | bitcoin-d2228384de3a870803697a6cc95467b97e9a37a5.tar.xz | |
Merge #6480: include the chaintip blockindex in the SyncTransaction signal, add signal UpdateTip()
7d0bf0b include the chaintip *blockIndex in the SyncTransaction signal (Jonas Schnelli)
Diffstat (limited to 'src/zmq')
| -rw-r--r-- | src/zmq/zmqnotificationinterface.cpp | 2 | ||||
| -rw-r--r-- | src/zmq/zmqnotificationinterface.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp index be2aec7d15..c8adcf8462 100644 --- a/src/zmq/zmqnotificationinterface.cpp +++ b/src/zmq/zmqnotificationinterface.cpp @@ -142,7 +142,7 @@ void CZMQNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindex) } } -void CZMQNotificationInterface::SyncTransaction(const CTransaction &tx, const CBlock *pblock) +void CZMQNotificationInterface::SyncTransaction(const CTransaction& tx, const CBlockIndex* pindex, const CBlock* pblock) { for (std::list<CZMQAbstractNotifier*>::iterator i = notifiers.begin(); i!=notifiers.end(); ) { diff --git a/src/zmq/zmqnotificationinterface.h b/src/zmq/zmqnotificationinterface.h index 3ccfaf341d..7b52e7775b 100644 --- a/src/zmq/zmqnotificationinterface.h +++ b/src/zmq/zmqnotificationinterface.h @@ -24,7 +24,7 @@ protected: void Shutdown(); // CValidationInterface - void SyncTransaction(const CTransaction &tx, const CBlock *pblock); + void SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, const CBlock* pblock); void UpdatedBlockTip(const CBlockIndex *pindex); private: |