aboutsummaryrefslogtreecommitdiff
path: root/src/merkleblock.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headers to 2018DrahtBot2018-07-271-1/+1
|
* Increment MIT Licence copyright header year on files modified in 2017Akira Takizawa2018-01-031-1/+1
|
* scripted-diff: Replace #include "" with #include <> (ryanofsky)MeshCollider2017-11-161-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -BEGIN VERIFY SCRIPT- for f in \ src/*.cpp \ src/*.h \ src/bench/*.cpp \ src/bench/*.h \ src/compat/*.cpp \ src/compat/*.h \ src/consensus/*.cpp \ src/consensus/*.h \ src/crypto/*.cpp \ src/crypto/*.h \ src/crypto/ctaes/*.h \ src/policy/*.cpp \ src/policy/*.h \ src/primitives/*.cpp \ src/primitives/*.h \ src/qt/*.cpp \ src/qt/*.h \ src/qt/test/*.cpp \ src/qt/test/*.h \ src/rpc/*.cpp \ src/rpc/*.h \ src/script/*.cpp \ src/script/*.h \ src/support/*.cpp \ src/support/*.h \ src/support/allocators/*.h \ src/test/*.cpp \ src/test/*.h \ src/wallet/*.cpp \ src/wallet/*.h \ src/wallet/test/*.cpp \ src/wallet/test/*.h \ src/zmq/*.cpp \ src/zmq/*.h do base=${f%/*}/ relbase=${base#src/} sed -i "s:#include \"\(.*\)\"\(.*\):if test -e \$base'\\1'; then echo \"#include <\"\$relbase\"\\1>\\2\"; else echo \"#include <\\1>\\2\"; fi:e" $f done -END VERIFY SCRIPT-
* Consolidate CMerkleBlock constructor into a single methodJames O'Beirne2017-09-201-28/+7
| | | | Incorporates feedback suggested by @sipa, @promag, @TheBlueMatt.
* Merge #9980: Fix mem access violation merkleblockPieter Wuille2017-07-171-0/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 8276e70de Adding assert to avoid a memory access violation inside of PartialMerkleTree::CalcHash() (Chris Stewart) Pull request description: Fixing a possible memory access violation in CPartialMerkleTree::CalcHash(). This can happen if we some how a merkle tree with zero txids. I don't think this can happen in practice as we only send merkle block messages on the p2p network as of now -- we cannot receive them. This was found with #8469, specifically using this [generator](https://github.com/Christewart/bitcoin/blob/rapidcheck/src/test/gen/merkleblock_gen.h#L52-L77) which will cause a memory access violation on [this test case](https://github.com/Christewart/bitcoin/blob/rapidcheck/src/test/merkleblock_properties.cpp#L48). Tree-SHA512: b95904ec45ea3f082c7722161d93ee06b24c706fbffa909a6e995ed14788aed2830f91b626da6f0347660c45874a0735dab61c9440b59c949c690af4165c83fb
| * Adding assert to avoid a memory access violation inside of ↵Chris Stewart2017-07-121-0/+3
| | | | | | | | | | | | | | | | | | | | PartialMerkleTree::CalcHash() Adding comment to assert in PartialMerkleTree::CalcHash() Adding comment on CMerkleBlock indicating it calls something that contains an assert Removing EOL whitespace
* | Remove confusing MAX_BLOCK_BASE_SIZE.Gregory Maxwell2017-07-141-1/+1
|/ | | | | | | | | | | | | | | | | | Some people keep thinking that MAX_BLOCK_BASE_SIZE is a separate size limit from the weight limit when it fact it is superfluous, and used in early tests before the witness data has been validated or just to compute worst case sizes. The size checks that use it would not behave any differently consensus wise if they were eliminated completely. Its correct value is not independently settable but is a function of the weight limit and weight formula. This patch just eliminates it and uses the scale factor as required to compute the worse case constants. It also moves the weight factor out of primitives into consensus, which is a more logical place for it.
* Trivial: remove extra character from commentCryptAxe2017-05-011-1/+1
|
* Refactor: Remove using namespace <xxx> from src/*.cpp.Karl-Johan Alm2017-01-271-7/+5
|
* Increment MIT Licence copyright header year on files modified in 2016isle29832016-12-311-1/+1
| | | | | | Edited via: $ contrib/devtools/copyright_header.py update .
* Make CBlock::vtx a vector of shared_ptr<CTransaction>Pieter Wuille2016-11-191-3/+3
|
* BIP141: Other consensus critical limits, and BIP145Pieter Wuille2016-06-221-1/+1
| | | | Includes changes by Suhas Daftuar, Luke-jr, and mruddy.
* Add importprunedfunds rpc callinstagibbs2016-03-231-6/+8
|
* Bump copyright headers to 2015MarcoFalke2015-12-131-1/+1
|
* typofixes (found by misspell_fixer)Veres Lajos2015-08-101-1/+1
|
* Bugfix: Grammar fixesCorinne Dashjr2015-05-011-2/+2
|
* Merge pull request #5199Wladimir J. van der Laan2015-04-281-0/+23
|\ | | | | | | | | | | | | 1ec900a Remove broken+useless lock/unlock log prints (Matt Corallo) 352ed22 Add merkle blocks test (Matt Corallo) 59ed61b Add RPC call to generate and verify merkle blocks (Matt Corallo) 30da90d Add CMerkleBlock constructor for tx set + block and an empty one (Matt Corallo)
| * Add CMerkleBlock constructor for tx set + block and an empty oneMatt Corallo2015-04-231-0/+23
| |
* | Consensus: Create consensus/consensus.h with some constantsjtimon2015-04-201-1/+1
|/
* Replace direct use of 0 with SetNull and IsNullWladimir J. van der Laan2015-01-051-9/+9
| | | | | | Replace x=0 with .SetNull(), x==0 with IsNull(), x!=0 with !IsNull(). Replace uses of uint256(0) with uint256().
* Merge pull request #5349Wladimir J. van der Laan2015-01-021-2/+8
|\ | | | | | | 0125988 Implement test for merkle tree malleability in CPartialMerkleTree (Pieter Wuille)
| * Implement test for merkle tree malleability in CPartialMerkleTreePieter Wuille2014-12-111-2/+8
| | | | | | | | | | | | This is a check that is mentioned in BIP 37, but never implemented in the reference code. As Bitcoin Core so far never decodes partial merkle trees, this is not a problem. But perhaps others use the code as a reference.
* | Added "Core" to copyright headerssandakersmann2014-12-191-1/+1
|/ | | | | Github-Pull: #5494 Rebased-From: 15de949bb9277e442302bdd8dee299a8d6deee60
* Move CMerkleBlock and CPartialMerkleTree to their own fileMatt Corallo2014-12-051-0/+152