aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5135Gavin Andresen2014-10-272-6/+6
|\ | | | | | | | | | | a31e8ba Make CBlockIndex* returned by GetDepthInMainChain const. (Daniel Kraft) Signed-off-by: Gavin Andresen <[email protected]>
| * Make CBlockIndex* returned by GetDepthInMainChain const.Daniel Kraft2014-10-242-6/+6
| | | | | | | | | | | | Make the CBlockIndex* (optionally) returned by GetDepthInMainChain const. This prevents accidental modification. The result is for reading its properties rather than modifying it.
* | Merge pull request #5139Gavin Andresen2014-10-271-4/+7
|\ \ | | | | | | | | | | | | | | | 9f87325 Start with tidier cache directories (Gavin Andresen) Signed-off-by: Gavin Andresen <[email protected]>
| * | Start with tidier cache directoriesGavin Andresen2014-10-241-4/+7
| | | | | | | | | | | | Remove more files from the cached, 200-block-chain data directories.
* | | Merge pull request #5121Wladimir J. van der Laan2014-10-2722-23/+34
|\ \ \ | | | | | | | | | | | | 214091d Update license in pull-tester and rpc-tests (Michael Ford)
| * | | Update license in pull-tester and rpc-testsMichael Ford2014-10-2322-23/+34
| | | | | | | | | | | | | | | | Add missing copyright/license header where necessary
* | | | Merge pull request #5112Wladimir J. van der Laan2014-10-271-4/+6
|\ \ \ \ | | | | | | | | | | | | | | | 071473c Build util and common before building server (jtimon)
| * | | | Build util and common before building serverjtimon2014-10-271-4/+6
|/ / / /
* | | | Merge pull request #5086Wladimir J. van der Laan2014-10-275-10/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 1723862 build: fix libtool's refusal to link static libs into a dll (Cory Fields) 28d412f build: quit abusing LIBS for Windows builds. (Cory Fields)
| * | | | build: fix libtool's refusal to link static libs into a dllCory Fields2014-10-141-1/+14
| | | | |
| * | | | build: quit abusing LIBS for Windows builds.Cory Fields2014-10-135-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to the INCLUDES changes in 6b099402b40, split out LIBS into individual entries for more fine-grained control. Also add MINIUPNPC_LIBS which was missing before, and hook it up to executables.
* | | | | Merge pull request #5119Pieter Wuille2014-10-2716-553/+589
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | fa73619 boost: split stream classes out of serialize.h (Cory Fields)
| * | | | | boost: split stream classes out of serialize.hCory Fields2014-10-2216-553/+589
| | |/ / / | |/| | | | | | | | | | | | | serialization now has no dependencies.
* | | | | Merge pull request #5115Wladimir J. van der Laan2014-10-272-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 33dfbf5 rpc: Fix leveldb iterator leak, and flush before `gettxoutsetinfo` (Wladimir J. van der Laan)
| * | | | | rpc: Fix leveldb iterator leak, and flush before `gettxoutsetinfo`Wladimir J. van der Laan2014-10-212-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an iterator leak resulting in bitcoind: db/version_set.cc:789: leveldb::VersionSet::~VersionSet(): Assertion `dummy_versions_.next_ == &dummy_versions_' failed." exception on shutdown. Also make sure to flush pcoinsTip before calling GetStats() to make sure we apply them to the current height.
* | | | | | Merge pull request #5134Wladimir J. van der Laan2014-10-271-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 6261e6e getblockhash: throw JSONRPCError (not runtime_error) (dexX7)
| * | | | | | getblockhash: throw JSONRPCError (not runtime_error)dexX72014-10-241-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #5093Pieter Wuille2014-10-2540-282/+602
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 4b0e2d7 Squashed 'src/leveldb/' changes from 7924331..7d41e6f (Pieter Wuille)
| * \ \ \ \ \ Merge src/leveldb changes for LevelDB 1.18.Pieter Wuille2014-10-1640-282/+602
| |\ \ \ \ \ \
| | * | | | | | Squashed 'src/leveldb/' changes from 7924331..7d41e6fPieter Wuille2014-10-1640-282/+602
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d41e6f Merge upstream LevelDB 1.18 803d692 Release 1.18 git-subtree-dir: src/leveldb git-subtree-split: 7d41e6f89ff04ce9e6a742932924796f69c6e23d
* | | | | | | | Merge pull request #5131Wladimir J. van der Laan2014-10-253-119/+130
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24f5c94 Update comments in addrman to be doxygen compatible (Michael Ford) c772f4c Add doc/doxygen to .gitignore (Michael Ford)
| * | | | | | | | Update comments in addrman to be doxygen compatibleMichael Ford2014-10-242-119/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also correct the file license
| * | | | | | | | Add doc/doxygen to .gitignoreMichael Ford2014-10-241-0/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #5117Wladimir J. van der Laan2014-10-251-1/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | 7014f38 [Qt] Remove CAmount from BitcoinAmountField Q_PROPERTY (Cozz Lovan)
| * | | | | | | [Qt] Remove CAmount from BitcoinAmountField Q_PROPERTYCozz Lovan2014-10-241-1/+3
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #5132Gavin Andresen2014-10-248-135/+211
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2290ed0 Work around #5113. (Daniel Kraft) dcb9846 Extend getchaintips RPC test. (Daniel Kraft) Signed-off-by: Gavin Andresen <[email protected]>
| * | | | | | | Work around #5113.Daniel Kraft2014-10-242-3/+7
| | | | | | | |
| * | | | | | | Extend getchaintips RPC test.Daniel Kraft2014-10-247-135/+207
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Add the capability to simulate network splits to the RPC test framework and use it to do more extensive testing of 'getchaintips'.
* | | | | | | Merge pull request #5137Gavin Andresen2014-10-241-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ec01243 --tracerpc option for regression tests (Gavin Andresen)
| * | | | | | | --tracerpc option for regression testsGavin Andresen2014-10-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run tests with --tracerpc and all RPC calls will dump to the console. Very helpful for debugging.
* | | | | | | | Merge pull request #5133 from laanwj/2014_10_regtest_fixed_seedsGavin Andresen2014-10-241-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Clear vFixedSeeds for regtest network
| * | | | | | | Clear vFixedSeeds for regtest networkWladimir J. van der Laan2014-10-241-0/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It shouldn't inherit these from testnet. (seems to be already done for unit test network but forgotten here...) Fixes #5127.
* | | | | | | Merge pull request #5116Wladimir J. van der Laan2014-10-241-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | a6a3f14 openssl version bump (Dominyk Tiller)
| * | | | | | openssl version bumpDominyk Tiller2014-10-211-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bumps the OpenSSL version to the latest release, and kills SSL2. (SSL3 was already killed here, so I'm not sure why SSL2 was left around?) No other changes.
* | | | | | Merge pull request #5128Gavin Andresen2014-10-231-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a757c5 fix build with libc++ after 85c579e (Cory Fields) Signed-off-by: Gavin Andresen <[email protected]>
| * | | | | | fix build with libc++ after 85c579eCory Fields2014-10-231-0/+1
|/ / / / / /
* | | | | | qt: remove monitoreddatamapperWladimir J. van der Laan2014-10-235-80/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We haven't used the viewModified signal in ages, so we can use a normal QDataWidgetMapper.
* | | | | | doc: release notes update for `rpcallowip` syntax changeWladimir J. van der Laan2014-10-231-11/+35
| |_|_|/ / |/| | | |
* | | | | Merge pull request #4981Wladimir J. van der Laan2014-10-2234-177/+192
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85c579e script: add a slew of includes all around and drop includes from script.h (Cory Fields) db8eb54 script: move ToString and ValueString out of the header (Cory Fields) e9ca428 script: add ToByteVector() for converting anything with begin/end (Cory Fields) 066e2a1 script: move CScriptID to standard.h and add a ctor for creating them from CScripts (Cory Fields)
| * | | | | script: add a slew of includes all around and drop includes from script.hCory Fields2014-10-1718-7/+31
| | | | | | | | | | | | | | | | | | | | | | | | Lots of files ended up with indirect includes from script.h.
| * | | | | script: move ToString and ValueString out of the headerCory Fields2014-10-172-29/+34
| | | | | |
| * | | | | script: add ToByteVector() for converting anything with begin/endCory Fields2014-10-179-108/+91
| | | | | | | | | | | | | | | | | | | | | | | | This should move to a util header once their dependencies are cleaned up.
| * | | | | script: move CScriptID to standard.h and add a ctor for creating them from ↵Cory Fields2014-10-1717-34/+37
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CScripts This allows for a reversal of the current behavior. This: CScript foo; CScriptID bar(foo.GetID()); Becomes: CScript foo; CScriptID bar(foo); This way, CScript is no longer dependent on CScriptID or Hash();
* | | | | Merge pull request #4988Wladimir J. van der Laan2014-10-221-38/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7b2bb96 Replace some function names with __func__ (Pieter Wuille) ed6d1a2 Keep information about all block files in memory (Pieter Wuille)
| * | | | | Replace some function names with __func__Pieter Wuille2014-10-211-2/+2
| | | | | |
| * | | | | Keep information about all block files in memoryPieter Wuille2014-10-061-37/+39
| | | | | |
* | | | | | Merge pull request #5108Wladimir J. van der Laan2014-10-225-24/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a873823 CAutoFile: Explicit Get() and remove unused methods (Wladimir J. van der Laan) fef24ca Add IsNull() to class CAutoFile and remove operator ! (Ruben Dario Ponticeli)
| * | | | | | CAutoFile: Explicit Get() and remove unused methodsWladimir J. van der Laan2014-10-225-18/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add documentation to some methods.
| * | | | | | Add IsNull() to class CAutoFile and remove operator !Ruben Dario Ponticeli2014-10-203-7/+7
| | | | | | |
* | | | | | | Merge pull request #5110Wladimir J. van der Laan2014-10-222-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a3c26c2 Fixes for missing boost tuple.hpp header include. (randy-waterhouse)