diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-09-23 19:34:32 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-09-23 19:37:51 +0200 |
| commit | 5b77244c60f3137647fed1c9510965d48992ccbe (patch) | |
| tree | 743e4e2151f1e970ca9b44e8f39e57456ec80d7b /src/miner.cpp | |
| parent | Merge pull request #6653 (diff) | |
| parent | Avoid duplicate CheckBlock checks (diff) | |
| download | discoin-5b77244c60f3137647fed1c9510965d48992ccbe.tar.xz discoin-5b77244c60f3137647fed1c9510965d48992ccbe.zip | |
Merge pull request #6550
3b33ec8 Avoid duplicate CheckBlock checks (Pieter Wuille)
391dff1 Do not store Merkle branches in the wallet. (Pieter Wuille)
Diffstat (limited to 'src/miner.cpp')
| -rw-r--r-- | src/miner.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index b2a356e52..42c8bb970 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -368,7 +368,7 @@ void IncrementExtraNonce(CBlock* pblock, const CBlockIndex* pindexPrev, unsigned assert(txCoinbase.vin[0].scriptSig.size() <= 100); pblock->vtx[0] = txCoinbase; - pblock->hashMerkleRoot = pblock->BuildMerkleTree(); + pblock->hashMerkleRoot = pblock->ComputeMerkleRoot(); } ////////////////////////////////////////////////////////////////////////////// |