diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2015-11-28 22:24:10 +0100 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2015-11-28 22:27:38 +0100 |
| commit | 61457c29d735b77182b5fbd45e86d7e3db343857 (patch) | |
| tree | 12ef26e009f3bab19c7b4d9f8e643db2ccd8a5f0 /src/chainparams.cpp | |
| parent | 8d26289c9a7c77c7e5cecaafebe0231cb4d69fbe (diff) | |
| parent | eece63fa72566068cb2a1bf85c95a72a5ba59bc9 (diff) | |
Merge pull request #6508
eece63f Switch blocks to a constant-space Merkle root/branch algorithm. (Pieter Wuille)
ee60e56 Add merkle.{h,cpp}, generic merkle root/branch algorithm (Pieter Wuille)
Diffstat (limited to 'src/chainparams.cpp')
| -rw-r--r-- | src/chainparams.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 5d6d1ef9d8..a46866a2be 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -4,6 +4,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "chainparams.h" +#include "consensus/merkle.h" #include "tinyformat.h" #include "util.h" @@ -32,7 +33,7 @@ static CBlock CreateGenesisBlock(const char* pszTimestamp, const CScript& genesi genesis.nVersion = nVersion; genesis.vtx.push_back(txNew); genesis.hashPrevBlock.SetNull(); - genesis.hashMerkleRoot = genesis.ComputeMerkleRoot(); + genesis.hashMerkleRoot = BlockMerkleRoot(genesis); return genesis; } |