aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-09-04Merge pull request #4838Pieter Wuille
1e4f87f Use memcmp for uint256 equality/inequality (Pieter Wuille) 8a41e1e Use boost::unordered_map for mapBlockIndex (Pieter Wuille) 145d5be Introduce BlockMap type for mapBlockIndex (Pieter Wuille) a0dbe43 checkpoints.cpp depends on main, it can use mapBlockIndex directly (Pieter Wuille)
2014-09-04Merge pull request #4783Wladimir J. van der Laan
fbe0fca [Qt] minor watch-only changes (Philip Kaufmann)
2014-09-04Merge pull request #4762Wladimir J. van der Laan
399cdbc contrib/linearize: Add feature to set file's timestamp based on block header time. (Jeff Garzik) 8f5a423 contrib/linearize: split block files based on year-month, not just year (Jeff Garzik) 75400a2 contrib/linearize: Guarantee that output is generated in-order (Jeff Garzik)
2014-09-04contrib/linearize: Add feature to set file's timestamp based on block header ↵Jeff Garzik
time.
2014-09-04Merge pull request #4833Wladimir J. van der Laan
bbda402 net: Remove MilliSleep from StopNode (Wladimir J. van der Laan)
2014-09-04Merge pull request #4790Wladimir J. van der Laan
9189f5f remove useless millisleep (phantomcircuit)
2014-09-04Merge pull request #4842Wladimir J. van der Laan
fb51e28 Added XML syntax highlighting (himynameismartin)
2014-09-04Added XML syntax highlightinghimynameismartin
2014-09-04Use memcmp for uint256 equality/inequalityPieter Wuille
2014-09-04Use boost::unordered_map for mapBlockIndexPieter Wuille
2014-09-04Introduce BlockMap type for mapBlockIndexPieter Wuille
2014-09-04checkpoints.cpp depends on main, it can use mapBlockIndex directlyPieter Wuille
2014-09-03Merge pull request #4808Pieter Wuille
3f6540a Rename IMPLEMENT_SERIALIZE to ADD_SERIALIZE_METHODS (Pieter Wuille) 47eb765 Serializer simplifications after IMPLEMENT_SERIALIZE overhaul (Pieter Wuille)
2014-09-03Merge pull request #4820Pieter Wuille
910526d Use OR of respective block flags for masks (Pieter Wuille)
2014-09-03Merge pull request #4671Wladimir J. van der Laan
550d4fa Remove DNS Seeds run by entities which were never well-established. (Matt Corallo)
2014-09-03net: Remove MilliSleep from StopNodeWladimir J. van der Laan
I don't understand why it would be there in the first place. This looks like voodoo, not programming.
2014-09-03Remove DNS Seeds run by entities which were never well-established.Matt Corallo
2014-09-02remove useless millisleepphantomcircuit
reduces time to service requests improving performance
2014-09-02Use OR of respective block flags for masksPieter Wuille
2014-09-02Merge pull request #4812Pieter Wuille
53efb09 Discover some missing includes (jtimon) 8d5e510 Remove unused function StackString() and class CCoins; (jtimon)
2014-09-02Merge pull request #4810Wladimir J. van der Laan
c0f5d4a Fixing Compiler Error C2466 (ENikS)
2014-09-02Rename IMPLEMENT_SERIALIZE to ADD_SERIALIZE_METHODSPieter Wuille
2014-09-02Discover some missing includesjtimon
2014-09-02Remove unused function StackString() and class CCoins;jtimon
2014-09-01Fixing Compiler Error C2466ENikS
2014-09-01Serializer simplifications after IMPLEMENT_SERIALIZE overhaulPieter Wuille
2014-09-01Merge pull request #4737Pieter Wuille
31e9a83 Use CSizeComputer to avoid counting sizes in SerializationOp (Pieter Wuille) 84881f8 rework overhauled serialization methods to non-static (Kamil Domanski) 5d96b4a remove fields of ser_streamplaceholder (Kamil Domanski) 3d796f8 overhaul serialization code (Kamil Domanski)
2014-09-01Merge pull request #4779Wladimir J. van der Laan
093303a add missing header end comments (Philip Kaufmann)
2014-09-01Merge pull request #4767Wladimir J. van der Laan
b144a74 depends: bump miniupnpc to 1.9.20140701. (Cory Fields) f628127 depends: bump openssl to 1.0.1i (Cory Fields) 9f7f504 build: add -DMINIUPNP_STATICLIB for new version (Cory Fields)
2014-09-01Merge pull request #4780Wladimir J. van der Laan
4d04492 add missing copyright headers (Philip Kaufmann)
2014-09-01Merge pull request #4776Wladimir J. van der Laan
6f5d33b Update translations after update script improvements (Wladimir J. van der Laan) da59f28 Add deeper XML checking to update-translation script (Wladimir J. van der Laan)
2014-09-01Update translations after update script improvementsWladimir J. van der Laan
2014-09-01Add deeper XML checking to update-translation scriptWladimir J. van der Laan
- Catch problems such as mismatched formatting characters. Remove messages that can give problems at runtime. - Also remove unfinished/untranslated messages, they just take up space in the ts and waste parsing time. Fixes #4774.
2014-09-01Merge pull request #4768Wladimir J. van der Laan
2e28031 Perform CVerifyDB on pcoinsdbview instead of pcoinsTip (Wladimir J. van der Laan)
2014-08-31Use CSizeComputer to avoid counting sizes in SerializationOpPieter Wuille
2014-08-31rework overhauled serialization methods to non-staticKamil Domanski
Thanks to Pieter Wuille for most of the work on this commit. I did not fixup the overhaul commit, because a rebase conflicted with "remove fields of ser_streamplaceholder". I prefer not to risk making a mistake while resolving it.
2014-08-31remove fields of ser_streamplaceholderKamil Domanski
The nType and nVersion fields of stream objects are never accessed from outside the class (or perhaps from the inside too, I haven't checked). Thus no need to have them in a placeholder, whose only purpose is to fill the "Stream" template parameter in serialization implementation.
2014-08-31overhaul serialization codeKamil Domanski
The implementation of each class' serialization/deserialization is no longer passed within a macro. The implementation now lies within a template of form: template <typename T, typename Stream, typename Operation> inline static size_t SerializationOp(T thisPtr, Stream& s, Operation ser_action, int nType, int nVersion) { size_t nSerSize = 0; /* CODE */ return nSerSize; } In cases when codepath should depend on whether or not we are just deserializing (old fGetSize, fWrite, fRead flags) an additional clause can be used: bool fRead = boost::is_same<Operation, CSerActionUnserialize>(); The IMPLEMENT_SERIALIZE macro will now be a freestanding clause added within class' body (similiar to Qt's Q_OBJECT) to implement GetSerializeSize, Serialize and Unserialize. These are now wrappers around the "SerializationOp" template.
2014-08-30changed field types in some structures to equivalent unambiguous typesKamil Domanski
Conflicts: src/core.cpp Rebased-By: Wladimir J. van der Laan Github-Pull: #4180
2014-08-30Merge pull request #4789Wladimir J. van der Laan
bac5586 Replace weird characters by normal spaces (Pieter Wuille)
2014-08-30Merge pull request #4781Pieter Wuille
187115c cleanup include of assert.h (Philip Kaufmann)
2014-08-30Replace weird characters by normal spacesPieter Wuille
2014-08-29Merge pull request #4778Jeff Garzik
2014-08-29Merge pull request #4788Jeff Garzik
2014-08-29missing include boost/algorithm/string/replace.hppjtimon
2014-08-29Merge pull request #4599Jeff Garzik
2014-08-29Move CMerkleTx to wallet.cpp/hWladimir J. van der Laan
It is only used by the wallet so it has no place in main.
2014-08-29rpc: Compute number of confirmations of a block from block heightWladimir J. van der Laan
Currently this uses a CMerkleTx, but that makes no sense as we have the CBlockIndex available. As noted by @jgarzik.
2014-08-29build: Remove message about Ubuntu 13.10 when no boost sleep implementation ↵Wladimir J. van der Laan
found It's only confusing people into thinking that they should mess with boost versions, which should not be necessary to get bitcoind to work. If there is a bug in the build system with autodetecting boost it needs to be solved not worked around.
2014-08-29Merge pull request #4777Wladimir J. van der Laan
8bdd287 Fix a few "Uninitialized scalar field" warnings (Wladimir J. van der Laan)