aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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)
2014-08-28cleanup include of assert.hPhilip Kaufmann
2014-08-28add missing copyright headersPhilip Kaufmann
2014-08-28add missing header end commentsPhilip Kaufmann
- 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
2014-08-28Merge pull request #4772Wladimir J. van der Laan
87d9819 fix comments ExtractAddress() -> ExtractDestination() (jtimon)
2014-08-28Merge pull request #4766Wladimir J. van der Laan
5a0823a Add travis build:passing/failing indicator. (randy-waterhouse)
2014-08-28Fix a few "Uninitialized scalar field" warningsWladimir J. van der Laan
Fix a few warnings reported by Coverity. None of these is critical, but making sure that class fields are initialized can avoid heisenbugs.
2014-08-28Add travis build:passing/failing indicator.randy-waterhouse
2014-08-27qt/splashscreen: #include version.hJeff Garzik
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
2014-08-28fix comments ExtractAddress() -> ExtractDestination()jtimon
2014-08-28Fix build with DEBUG_LOCKORDERWladimir J. van der Laan
Fixes #4771
2014-08-27Merge pull request #4377Pieter Wuille
654871d replace ComputeMinWork with CheckMinWork (jtimon) b343c1a Move CBlockIndex::GetBlockWork() to pow::GetProofIncrement(nBits) (jtimon) c2c02f3 Move UpdateTime to pow (jtimon)
2014-08-27Merge pull request #4764Pieter Wuille
92bb6f2 Bypass reloading blocks from disk (Pieter Wuille)
2014-08-27Revert "Add a getutxos command to the p2p protocol. It allows querying of ↵Wladimir J. van der Laan
the UTXO set" This reverts commit da2ec100f3681176f60dec6dc675fc64147ade3a.
2014-08-27Merge pull request #4752Wladimir J. van der Laan
df7565d depends: add sensible download timeout/retry values (Cory Fields) c897b1e depends: add a fallback path in case package sources go missing (Cory Fields)
2014-08-27depends: add sensible download timeout/retry valuesCory Fields
2014-08-27Perform CVerifyDB on pcoinsdbview instead of pcoinsTipWladimir J. van der Laan
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.
2014-08-27depends: bump miniupnpc to 1.9.20140701.Cory Fields
This is the forward-port of a9c6eef915ee264ccf4169d5e8769a6be1fa101a
2014-08-26depends: bump openssl to 1.0.1iCory Fields
This is the forward-port of bba01750226745d6666d587cabe57c321fde0875.
2014-08-26build: add -DMINIUPNP_STATICLIB for new versionCory Fields
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.
2014-08-26qt: Add null check in setClientModel(0)Wladimir J. van der Laan
Don't clear tray icon menu if it was never created. Necessary precaution after #4649.
2014-08-26Merge pull request #4673Wladimir J. van der Laan
1c5f0af [Qt] Add column Watch-only to transactions list (Cozz Lovan) 939ed97 Add boolean HaveWatchonly and signal NotifyWatchonlyChanged (Cozz Lovan)
2014-08-26Merge pull request #4649Wladimir J. van der Laan
b197bf3 [Qt] disable tray interactions when client model set to 0 (Philip Kaufmann) 314fbd9 [Qt] use BitcoinGUI::DEFAULT_WALLET constant in bitcoin.cpp (Philip Kaufmann) 8ca6a16 [Qt] ensure all class attributes are init to 0 (Philip Kaufmann)
2014-08-26Merge pull request #4748Pieter Wuille
ad49c25 Split up util.cpp/h (Wladimir J. van der Laan) f841aa2 Move `COIN` and `CENT` to core.h (Wladimir J. van der Laan) 6e5fd00 Move `*Version()` functions to version.h/cpp (Wladimir J. van der Laan) b4aa769 Move `S_I*` constants and `MSG_NOSIGNAL` to compat.h (Wladimir J. van der Laan) af8297c Move functions in wallet.h to implementation file (Wladimir J. van der Laan) 651480c move functions in main and net to implementation files (Wladimir J. van der Laan) 610a8c0 Move SetThreadPriority implementation to util.cpp instead of the header (Wladimir J. van der Laan) f780e65 Remove unused function `ByteReverse` from util.h (Wladimir J. van der Laan) 121d6ad Remove unused `alignup` function from util.h (Wladimir J. van der Laan) d1e26d4 Move CMedianFilter to timedata.cpp (Wladimir J. van der Laan)
2014-08-26Merge pull request #4763Pieter Wuille
aa41ac2 Test IsPushOnly() with invalid push (Peter Todd)
2014-08-26Merge pull request #4561Pieter Wuille
d0867ac Use const CCoinsView's at some places. (Daniel Kraft) a3dc587 Make appropriate getter-routines "const" in CCoinsView. (Daniel Kraft) ffb4c21 Mark LevelDB "Read" and "Exists" functions as const. (Daniel Kraft)
2014-08-26Split up util.cpp/hWladimir J. van der Laan
Split up util.cpp/h into: - string utilities (hex, base32, base64): no internal dependencies, no dependency on boost (apart from foreach) - money utilities (parsesmoney, formatmoney) - time utilities (gettime*, sleep, format date): - and the rest (logging, argument parsing, config file parsing) The latter is basically the environment and OS handling, and is stripped of all utility functions, so we may want to rename it to something else than util.cpp/h for clarity (Matt suggested osinterface). Breaks dependency of sha256.cpp on all the things pulled in by util.