aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | Merge pull request #6075Wladimir J. van der Laan2015-04-291-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Add additional script edge condition tests.Dave Collins2015-04-281-0/+18
| | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #6032Wladimir J. van der Laan2015-04-291-3/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | QA: add --noshutdown option to prevent stopping nodesdexX72015-04-231-5/+10
| * | | | | | | | | | | | | | | | | | | QA: stop nodes after RPC tests, even with --nocleanupdexX72015-04-201-2/+4
| | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #5511Wladimir J. van der Laan2015-04-291-5/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | [Wallet] sort pending wallet transactions before reacceptingdexX72015-03-211-5/+14
* | | | | | | | | | | | | | | | | | | | Merge pull request #6074Wladimir J. van der Laan2015-04-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Correct the PUSHDATA4 minimal encoding test.Dave Collins2015-04-271-1/+1
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #6076Wladimir J. van der Laan2015-04-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | wallet: fix boost::get usage with boost 1.58Cory Fields2015-04-281-1/+1
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #5918Pieter Wuille2015-04-284-4/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Use equivalent PoW for non-main-chain requestsPieter Wuille2015-04-224-4/+49
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #6054Pieter Wuille2015-04-281-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | use const reference as param in ConnectThroughProxy/Socks5Philip Kaufmann2015-04-281-2/+2
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge pull request #5971Wladimir J. van der Laan2015-04-281-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | replace absolute sleep with conditional waitpstratem2015-04-271-2/+8
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #5662Wladimir J. van der Laan2015-04-281-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Change download logic to allow calling getheaders/getdata on inbound peersSuhas Daftuar2015-04-021-3/+3
* | | | | | | | | | | | | | | | | | Merge pull request #5199Wladimir J. van der Laan2015-04-289-5/+238
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Remove broken+useless lock/unlock log printsMatt Corallo2015-04-241-5/+0
| * | | | | | | | | | | | | | | | | | Add merkle blocks testMatt Corallo2015-04-232-0/+91
| * | | | | | | | | | | | | | | | | | Add RPC call to generate and verify merkle blocksMatt Corallo2015-04-234-0/+119
| * | | | | | | | | | | | | | | | | | Add CMerkleBlock constructor for tx set + block and an empty oneMatt Corallo2015-04-232-0/+28
* | | | | | | | | | | | | | | | | | | qt: translation updateWladimir J. van der Laan2015-04-2872-3383/+9812
| |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #5696Wladimir J. van der Laan2015-04-2612-16/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Consensus: Create consensus/consensus.h with some constantsjtimon2015-04-2012-16/+34
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #6033Wladimir J. van der Laan2015-04-241-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | FreeBSD, OpenBSD thread renaming.sinetek2015-04-211-4/+6
| | |_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #6028Wladimir J. van der Laan2015-04-245-13/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | nLastTry is only used for addrman entriesPieter Wuille2015-04-195-13/+10
| | |_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #6036Wladimir J. van der Laan2015-04-244-4/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | add rpc test for listunspents support for zero value txoutsJonas Schnelli2015-04-211-0/+27
| * | | | | | | | | | | | | | | | | Show zero value txouts in listunspent.Gregory Maxwell2015-04-203-4/+4
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #5863Wladimir J. van der Laan2015-04-247-37/+744
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add block pruning functionalitymrbandrews2015-04-227-37/+744
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #6039Wladimir J. van der Laan2015-04-231-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | tests: Error when setgenerate is used on regtestWladimir J. van der Laan2015-04-211-0/+2
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #6052Wladimir J. van der Laan2015-04-232-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fix and enable bip32 unit testJonas Schnelli2015-04-232-0/+2
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #5911Wladimir J. van der Laan2015-04-209-79/+436
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | rpc-tests: Add proxy testWladimir J. van der Laan2015-04-203-0/+307
| * | | | | | | | | | | | | | | privacy: Stream isolation for TorWladimir J. van der Laan2015-04-176-79/+129
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #6029Wladimir J. van der Laan2015-04-201-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Cap nAttempts penalty at 8 and switch to pow instead of a division loop.Gregory Maxwell2015-04-191-3/+2
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #6010Wladimir J. van der Laan2015-04-201-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Set nSequenceId when a block is fully linkedSuhas Daftuar2015-04-141-4/+5
* | | | | | | | | | | | | | | | Merge pull request #6004Wladimir J. van der Laan2015-04-2039-115/+128
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | trivial string change in wallet.cpp (the -> that)Philip Kaufmann2015-04-201-1/+1
| * | | | | | | | | | | | | | | | Add operator names to DNS Seed listMichael Ford2015-04-201-5/+5