aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Introduce BlockMap type for mapBlockIndexPieter Wuille2014-09-049-26/+27
|
* checkpoints.cpp depends on main, it can use mapBlockIndex directlyPieter Wuille2014-09-043-5/+5
|
* Merge pull request #4808Pieter Wuille2014-09-0313-107/+84
|\ | | | | | | | | 3f6540a Rename IMPLEMENT_SERIALIZE to ADD_SERIALIZE_METHODS (Pieter Wuille) 47eb765 Serializer simplifications after IMPLEMENT_SERIALIZE overhaul (Pieter Wuille)
| * Rename IMPLEMENT_SERIALIZE to ADD_SERIALIZE_METHODSPieter Wuille2014-09-0213-41/+41
| |
| * Serializer simplifications after IMPLEMENT_SERIALIZE overhaulPieter Wuille2014-09-017-66/+43
| |
* | Merge pull request #4820Pieter Wuille2014-09-031-3/+4
|\ \ | | | | | | | | | 910526d Use OR of respective block flags for masks (Pieter Wuille)
| * | Use OR of respective block flags for masksPieter Wuille2014-09-021-3/+4
| | |
* | | Remove DNS Seeds run by entities which were never well-established.Matt Corallo2014-09-031-1/+0
|/ /
* | Merge pull request #4812Pieter Wuille2014-09-026-21/+10
|\ \ | | | | | | | | | | | | 53efb09 Discover some missing includes (jtimon) 8d5e510 Remove unused function StackString() and class CCoins; (jtimon)
| * | Discover some missing includesjtimon2014-09-026-1/+10
| | |
| * | Remove unused function StackString() and class CCoins;jtimon2014-09-021-20/+0
| |/
* / Fixing Compiler Error C2466ENikS2014-09-011-1/+1
|/
* Merge pull request #4737Pieter Wuille2014-09-0113-193/+271
|\ | | | | | | | | | | | | 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)
| * Use CSizeComputer to avoid counting sizes in SerializationOpPieter Wuille2014-08-3113-184/+81
| |
| * rework overhauled serialization methods to non-staticKamil Domanski2014-08-3113-270/+270
| | | | | | | | | | | | | | 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.
| * remove fields of ser_streamplaceholderKamil Domanski2014-08-311-9/+1
| | | | | | | | | | | | | | 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.
| * overhaul serialization codeKamil Domanski2014-08-3113-274/+463
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge pull request #4779Wladimir J. van der Laan2014-09-0141-45/+47
|\ \ | | | | | | | | | 093303a add missing header end comments (Philip Kaufmann)
| * | add missing header end commentsPhilip Kaufmann2014-08-2841-45/+47
| | | | | | | | | | | | | | | | | | - ensures a consistent usage in header files - also add a blank line after the copyright header where missing - also remove orphan new-lines at the end of some files
* | | Merge pull request #4767Wladimir J. van der Laan2014-09-011-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | 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)
| * | | build: add -DMINIUPNP_STATICLIB for new versionCory Fields2014-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libminiupnpc changed their required static define to the much more sane "MINIUPNP_STATICLIB". Sadly, they don't respect the old "STATICLIB" for back-compat. Define them both since the old one didn't seem to be conflicting anywhere. Also go ahead and split out the cppflags so that they can be applied only where they're needed. This will help us to build dll's from our libs without having their import/export declspecs poisoned.
* | | | Merge pull request #4780Wladimir J. van der Laan2014-09-012-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | 4d04492 add missing copyright headers (Philip Kaufmann)
| * | | | add missing copyright headersPhilip Kaufmann2014-08-282-0/+9
| | |/ / | |/| |
* | | | Update translations after update script improvementsWladimir J. van der Laan2014-09-0170-113864/+11706
| | | |
* | | | Merge pull request #4768Wladimir J. van der Laan2014-09-014-5/+5
|\ \ \ \ | |_|_|/ |/| | | | | | | 2e28031 Perform CVerifyDB on pcoinsdbview instead of pcoinsTip (Wladimir J. van der Laan)
| * | | Perform CVerifyDB on pcoinsdbview instead of pcoinsTipWladimir J. van der Laan2014-08-274-5/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bypassing the main coins cache allows more thorough checking with the same memory budget. This has no effect on performance because everything ends up in the child cache created by VerifyDB itself. It has bugged me ever since #4675, which effectively reduced the number of checked blocks to reduce peak memory usage. - Pass the coinsview to use as argument to VerifyDB - This also avoids that the first `pcoinsTip->Flush()` after VerifyDB writes a large slew of unchanged coin records back to the database.
* | | changed field types in some structures to equivalent unambiguous typesKamil Domanski2014-08-302-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core.cpp Rebased-By: Wladimir J. van der Laan Github-Pull: #4180
* | | Merge pull request #4789Wladimir J. van der Laan2014-08-301-3/+3
|\ \ \ | | | | | | | | | | | | bac5586 Replace weird characters by normal spaces (Pieter Wuille)
| * | | Replace weird characters by normal spacesPieter Wuille2014-08-301-3/+3
| | | |
* | | | Merge pull request #4781Pieter Wuille2014-08-302-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | 187115c cleanup include of assert.h (Philip Kaufmann)
| * | | | cleanup include of assert.hPhilip Kaufmann2014-08-282-2/+4
| | |_|/ | |/| |
* | | | Merge pull request #4778Jeff Garzik2014-08-295-163/+162
|\ \ \ \
| * | | | Move CMerkleTx to wallet.cpp/hWladimir J. van der Laan2014-08-294-159/+156
| | | | | | | | | | | | | | | | | | | | It is only used by the wallet so it has no place in main.
| * | | | rpc: Compute number of confirmations of a block from block heightWladimir J. van der Laan2014-08-291-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Currently this uses a CMerkleTx, but that makes no sense as we have the CBlockIndex available. As noted by @jgarzik.
* | | | | missing include boost/algorithm/string/replace.hppjtimon2014-08-291-0/+1
| | | | |
* | | | | Merge pull request #4599Jeff Garzik2014-08-294-20/+18
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Create new signal for notification of new blocks. Use w/ -blocknotifyJeff Garzik2014-08-143-5/+17
| | | | |
| * | | | ui_interface: remove unused NotifyBlocksChanged signalJeff Garzik2014-08-143-15/+1
| | | | |
* | | | | Merge pull request #4777Wladimir J. van der Laan2014-08-296-7/+11
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | 8bdd287 Fix a few "Uninitialized scalar field" warnings (Wladimir J. van der Laan)
| * | | | Fix a few "Uninitialized scalar field" warningsWladimir J. van der Laan2014-08-286-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a few warnings reported by Coverity. None of these is critical, but making sure that class fields are initialized can avoid heisenbugs.
* | | | | Merge pull request #4772Wladimir J. van der Laan2014-08-281-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | 87d9819 fix comments ExtractAddress() -> ExtractDestination() (jtimon)
| * | | | fix comments ExtractAddress() -> ExtractDestination()jtimon2014-08-281-2/+2
| | | | |
* | | | | qt/splashscreen: #include version.hJeff Garzik2014-08-271-0/+1
| |_|/ / |/| | | | | | | | | | | | | | | | | | | Needed to build breakage reported by Arnavion on IRC: qt/splashscreen.cpp: In constructor 'SplashScreen::SplashScreen(const QPixmap&, Qt::WindowFlags, bool)': qt/splashscreen.cpp:33:98: error: 'FormatFullVersion' was not declared in this scope
* | | | Fix build with DEBUG_LOCKORDERWladimir J. van der Laan2014-08-281-0/+3
|/ / / | | | | | | | | | Fixes #4771
* | | Merge pull request #4377Pieter Wuille2014-08-277-65/+53
|\ \ \ | | | | | | | | | | | | | | | | | | | | 654871d replace ComputeMinWork with CheckMinWork (jtimon) b343c1a Move CBlockIndex::GetBlockWork() to pow::GetProofIncrement(nBits) (jtimon) c2c02f3 Move UpdateTime to pow (jtimon)
| * | | replace ComputeMinWork with CheckMinWorkjtimon2014-08-234-21/+19
| | | |
| * | | Move CBlockIndex::GetBlockWork() to pow::GetProofIncrement(nBits)jtimon2014-08-233-11/+19
| | | |
| * | | Move UpdateTime to powjtimon2014-08-236-33/+15
| | | |
* | | | Merge pull request #4764Pieter Wuille2014-08-272-18/+27
|\ \ \ \ | | | | | | | | | | | | | | | 92bb6f2 Bypass reloading blocks from disk (Pieter Wuille)
| * | | | Bypass reloading blocks from diskPieter Wuille2014-08-262-18/+27
| | | | |