diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-07-14 08:16:23 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-07-14 08:17:22 +0200 |
| commit | 1bc9c8085f715944e964eb79a630d8636f293704 (patch) | |
| tree | 759eabd06e11193ebe0aebf87e0ba0aa08ee4873 | |
| parent | 4831a16223dbb42da3091e616c47eeb01f53f73b (diff) | |
| parent | 252675efc69ec0638d96a69fbc349a612cd1e2b7 (diff) | |
| download | bitcoin-1bc9c8085f715944e964eb79a630d8636f293704.tar.xz | |
Merge #8271: [bugfix] Do not send witnesses in cmpctblock
252675e Do not send witnesses in cmpctblock (Pieter Wuille)
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index b86bbda1b8..4bbda4cafe 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6469,7 +6469,7 @@ bool SendMessages(CNode* pto) CBlock block; assert(ReadBlockFromDisk(block, pBestIndex, consensusParams)); CBlockHeaderAndShortTxIDs cmpctblock(block); - pto->PushMessage(NetMsgType::CMPCTBLOCK, cmpctblock); + pto->PushMessageWithFlag(SERIALIZE_TRANSACTION_NO_WITNESS, NetMsgType::CMPCTBLOCK, cmpctblock); state.pindexBestHeaderSent = pBestIndex; } else if (state.fPreferHeaders) { if (vHeaders.size() > 1) { |