aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge #9532: Remove unused variablesWladimir J. van der Laan2017-02-078-11/+2
|\
| * Remove unused int64_t nSinceLastSeenpracticalswift2017-01-131-3/+0
| * Remove unused Python variablespracticalswift2017-01-137-8/+2
* | Merge #9604: [Trivial] add comment about setting peer as HB peer.Wladimir J. van der Laan2017-02-071-1/+9
|\ \
| * | [Trivial] add comment about setting peer as HB peer.John Newbery2017-01-201-1/+9
* | | Merge #9227: Make nWalletDBUpdated atomic to avoid a potential race.Wladimir J. van der Laan2017-02-065-33/+43
|\ \ \
| * | | Make nWalletDBUpdated atomic to avoid a potential race.Patrick Strateman2016-12-215-33/+43
* | | | Merge #9378: [trivial] Add documentation for CWalletTx::fFromMe member.Wladimir J. van der Laan2017-02-061-0/+5
|\ \ \ \
| * | | | Add documentation for CWalletTx::fFromMe member.Russell Yanofsky2016-12-151-0/+5
* | | | | Merge #9650: Better handle invalid parameters to signrawtransactionWladimir J. van der Laan2017-02-063-4/+36
|\ \ \ \ \
| * | | | | [qa] test signrawtransaction merge with missing inputsMatt Corallo2017-02-021-0/+16
| * | | | | [qa] Add second input to signrawtransaction test caseMatt Corallo2017-02-021-3/+5
| * | | | | [qa] Test that decoderawtransaction throws with extra data appendedMatt Corallo2017-02-021-0/+10
| * | | | | Better handle invalid parameters to signrawtransactionMatt Corallo2017-02-021-1/+3
| * | | | | Fail in DecodeHexTx if there is extra data at the endMatt Corallo2017-02-021-0/+2
* | | | | | Merge #9659: Net: Turn some methods and params/variables constWladimir J. van der Laan2017-02-065-19/+19
|\ \ \ \ \ \
| * | | | | | Net: pass interruptMsgProc as const where possibleJorge Timón2017-01-312-6/+6
| * | | | | | Net: Make CNetMsgMaker more constJorge Timón2017-01-312-7/+7
| * | | | | | Net: CConnman: Make some methods constJorge Timón2017-01-312-6/+6
* | | | | | | Merge #9651: Fix typosWladimir J. van der Laan2017-02-067-9/+9
|\ \ \ \ \ \ \
| * | | | | | | Fix typospracticalswift2017-01-297-9/+9
* | | | | | | | Merge #9673: Set correct metadata on bumpfee wallet transactionsWladimir J. van der Laan2017-02-062-0/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | [wallet] Set correct metadata on bumpfee wallet transactionsRussell Yanofsky2017-02-022-0/+14
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge #9691: Init ECC context for test_bitcoin_fuzzy.Wladimir J. van der Laan2017-02-061-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Init ECC context for test_bitcoin_fuzzy.Gregory Maxwell2017-02-051-0/+2
* | | | | | | | | Merge #9578: Add missing mempool lock for CalculateMemPoolAncestorsPieter Wuille2017-02-051-0/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add missing mempool lock for CalculateMemPoolAncestorsMatt Corallo2017-01-201-0/+2
* | | | | | | | | Merge #9671: Fix super-unlikely race introduced in 236618061a445d2cb11e72Wladimir J. van der Laan2017-02-041-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix super-unlikely race introduced in 236618061a445d2cb11e72Matt Corallo2017-02-021-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge #9609: net: fix remaining net assertionsWladimir J. van der Laan2017-02-044-111/+102
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | net: log an error rather than asserting if send version is misusedCory Fields2017-02-022-19/+29
| * | | | | | | | | net: Disallow sending messages until the version handshake is completeCory Fields2017-02-022-3/+7
| * | | | | | | | | net: don't run callbacks on nodes that haven't completed the version handshakeCory Fields2017-02-022-57/+25
| * | | | | | | | | net: deserialize the entire version message locallyCory Fields2017-02-022-29/+36
| * | | | | | | | | Dont deserialize nVersion into CNode, should fix #9212Matt Corallo2017-02-021-6/+8
| |/ / / / / / / /
* | | | | | | | | Merge #9679: Access WorkQueue::running only within the cs lockWladimir J. van der Laan2017-02-041-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Access WorkQueue::running only within the cs lock.Matt Corallo2017-02-031-1/+1
|/ / / / / / / /
* | | | | | | | Merge #9654: Add jtimon pgp keys for commit sigs and future gitian buildsWladimir J. van der Laan2017-02-021-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Contrib: Add jtimon pgp keys for commit sigs and future gitian buildsJorge Timón2017-01-311-0/+0
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge #9656: Check verify-commits on pushes to masterWladimir J. van der Laan2017-02-022-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Test that pushes to bitcoin/bitcoin are signed per verify-commitsMatt Corallo2017-02-011-0/+3
| * | | | | | | | Require merge commits merge branches on top of other merge commitsMatt Corallo2017-02-011-1/+2
* | | | | | | | | Merge #9556: Remove redundant semicolonsWladimir J. van der Laan2017-02-023-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove redundant semicolonspracticalswift2017-01-143-4/+4
* | | | | | | | | | Merge #9580: Fix various minor linearization script issuesWladimir J. van der Laan2017-02-023-18/+41
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix various minor linearization script issuesDouglas Roark2017-01-253-18/+41
* | | | | | | | | | | Merge #9663: [RPC] clarify listunspent amount descriptionWladimir J. van der Laan2017-02-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | clarify listunspent amount descriptionGregory Sanders2017-02-011-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge #9625: Increase minimum debug.log size to 10MB after shrink.Wladimir J. van der Laan2017-02-012-3/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Increase minimum debug.log size to 10MB after shrink.Alex Morcos2017-01-242-3/+10