diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2015-08-11 21:03:31 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2015-09-22 18:51:07 +0200 |
| commit | 391dff16fe9ace90fc0f3308a5c63c453370e713 (patch) | |
| tree | 3337a40ad6bca7c57560c45d091bb9ebfd6523cf /src/main.cpp | |
| parent | e59d2a80f9167031521d882394a08b02fa9d0343 (diff) | |
| download | bitcoin-391dff16fe9ace90fc0f3308a5c63c453370e713.tar.xz | |
Do not store Merkle branches in the wallet.
Assume that when a wallet transaction has a valid block hash and transaction position
in it, the transaction is actually there. We're already trusting wallet data in a
much more fundamental way anyway.
To prevent backward compatibility issues, a new record is used for storing the
block locator in the wallet. Old wallets will see a wallet file synchronized up
to the genesis block, and rescan automatically.
Diffstat (limited to 'src/main.cpp')
| -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 2a24d38e52..1e0194e2cd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2595,7 +2595,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo // Check the merkle root. if (fCheckMerkleRoot) { bool mutated; - uint256 hashMerkleRoot2 = block.BuildMerkleTree(&mutated); + uint256 hashMerkleRoot2 = block.ComputeMerkleRoot(&mutated); if (block.hashMerkleRoot != hashMerkleRoot2) return state.DoS(100, error("CheckBlock(): hashMerkleRoot mismatch"), REJECT_INVALID, "bad-txnmrklroot", true); |