diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-10 15:23:41 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-11-10 15:32:03 +0100 |
| commit | 77beab70deae8ad821cc069c1ce80fc809c89c33 (patch) | |
| tree | d2d9aa3be7959400c2176d0d6c2e75a4f3925d6f /src/zmq | |
| parent | 503ff6e1ae6932b63892099b4c63e92a9263fed6 (diff) | |
| parent | 87cbdb8b41eee4067023cfa0d9d68722da74a5eb (diff) | |
| download | bitcoin-77beab70deae8ad821cc069c1ce80fc809c89c33.tar.xz | |
Merge pull request #6163
87cbdb8 Globals: Explicit Consensus::Params arg for main: (Jorge Timón)
Diffstat (limited to 'src/zmq')
| -rw-r--r-- | src/zmq/zmqpublishnotifier.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp index 4c3eb8f2d9..ac788843eb 100644 --- a/src/zmq/zmqpublishnotifier.cpp +++ b/src/zmq/zmqpublishnotifier.cpp @@ -2,6 +2,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include "chainparams.h" #include "zmqpublishnotifier.h" #include "main.h" #include "util.h" @@ -142,11 +143,12 @@ bool CZMQPublishRawBlockNotifier::NotifyBlock(const CBlockIndex *pindex) { LogPrint("zmq", "Publish raw block %s\n", pindex->GetBlockHash().GetHex()); + const Consensus::Params& consensusParams = Params().GetConsensus(); CDataStream ss(SER_NETWORK, PROTOCOL_VERSION); { LOCK(cs_main); CBlock block; - if(!ReadBlockFromDisk(block, pindex)) + if(!ReadBlockFromDisk(block, pindex, consensusParams)) { zmqError("Can't read block from disk"); return false; |