aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* instance of 'mem pool' to 'mempool'S. Matthew English2016-10-272-2/+2
| | | | there was only one instance of 'mem pool' and not 'mempool', so I changed it to conform to the others
* rpc: Remove invalid explanation from wallet fee messageWladimir J. van der Laan2016-10-261-1/+1
|
* Merge #8515: A few mempool removal optimizationsWladimir J. van der Laan2016-10-257-50/+51
|\ | | | | | | | | | | | | 0334430 Add some missing includes (Pieter Wuille) 4100499 Return shared_ptr<CTransaction> from mempool removes (Pieter Wuille) 51f2783 Make removed and conflicted arguments optional to remove (Pieter Wuille) f48211b Bypass removeRecursive in removeForReorg (Pieter Wuille)
| * Add some missing includesPieter Wuille2016-10-211-0/+4
| |
| * Return shared_ptr<CTransaction> from mempool removesPieter Wuille2016-10-215-15/+15
| |
| * Make removed and conflicted arguments optional to removePieter Wuille2016-10-217-35/+31
| |
| * Bypass removeRecursive in removeForReorgPieter Wuille2016-10-211-7/+8
| |
* | Merge #9008: [net] Remove assert(nMaxInbound > 0)Wladimir J. van der Laan2016-10-251-1/+0
|\ \ | | | | | | | | | fa1c3c2 [net] Remove assert(nMaxInbound > 0) (MarcoFalke)
| * | [net] Remove assert(nMaxInbound > 0)MarcoFalke2016-10-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | nMaxInbound might very well be 0 or -1, if the user prefers to keep a small number of maxconnections. Note: nMaxInbound of -1 means that the user set maxconnections to 8 or less, but we still want to keep an additional slot for the feeler connection.
* | | Merge #9002: Make connect=0 disable automatic outbound connections.Wladimir J. van der Laan2016-10-252-5/+6
|\ \ \ | |/ / |/| | | | | 515e264 Make connect=0 disable automatic outbound connections. (Gregory Maxwell)
| * | Make connect=0 disable automatic outbound connections.Gregory Maxwell2016-10-252-5/+6
| |/ | | | | | | | | Otherwise it just responds to this obvious bit of configuration by trying to connect to "0" in a loop.
* | Merge #8995: Add missing cs_main lock to ::GETBLOCKTXN processingWladimir J. van der Laan2016-10-241-0/+2
|\ \ | | | | | | | | | dfe7906 Add missing cs_main lock to ::GETBLOCKTXN processing (Matt Corallo)
| * | Add missing cs_main lock to ::GETBLOCKTXN processingMatt Corallo2016-10-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Note that this is not a major issue as, in order for the missing lock to cause issues, you have to receive a GETBLOCKTXN message while reindexing, adding a block header via RPC, etc, which results in either a table rehash or an insert into the bucket which you are currently looking at.
* | | Fix doxygen comment: the transaction is returned in txOutPavel Janík2016-10-211-1/+1
| |/ |/|
* | Merge #8982: Eliminating Inconsistencies in Textual OutputMarcoFalke2016-10-211-3/+3
|\ \ | |/ |/| | | 3a286ab Eliminating Inconsistencies in Textual Output (S. Matthew English)
| * Eliminating Inconsistencies in Textual OutputS. Matthew English2016-10-201-3/+3
| | | | | | There were discrepancies between usage of "block chain" and "blockchain", I've changed them to the latter. The reason for this was that Wikipedia when describing this data structure writes "A blockchain — *originally block chain*", so it seemed the more appropriate term.
* | Merge #8968: Don't hold cs_main when calling ProcessNewBlock from a cmpctblockWladimir J. van der Laan2016-10-211-21/+26
|\ \ | | | | | | | | | 72ca7d9 Don't hold cs_main when calling ProcessNewBlock from a cmpctblock (Matt Corallo)
| * | Don't hold cs_main when calling ProcessNewBlock from a cmpctblockMatt Corallo2016-10-181-21/+26
| | |
* | | Merge #8975: Chainparams: Trivial: In AppInit2(), s/Params()/chainparams/Wladimir J. van der Laan2016-10-211-4/+4
|\ \ \ | | | | | | | | | | | | 6f2f639 Chainparams: Trivial: In AppInit2(), s/Params()/chainparams/ (Jorge Timón)
| * | | Chainparams: Trivial: In AppInit2(), s/Params()/chainparams/Jorge Timón2016-10-191-4/+4
| | | |
* | | | Merge #8990: moveonly: move `coincontrol` to `src/wallet`Wladimir J. van der Laan2016-10-215-7/+7
|\ \ \ \ | | | | | | | | | | | | | | | 1ae5839 moveonly: move `coincontrol` to `src/wallet` (Wladimir J. van der Laan)
| * | | | moveonly: move `coincontrol` to `src/wallet`Wladimir J. van der Laan2016-10-215-7/+7
| | | | |
* | | | | Merge #8985: Use pindexBestHeader instead of setBlockIndexCandidates for ↵Jonas Schnelli2016-10-214-12/+9
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | NotifyHeaderTip() 3154d6e [Qt] use NotifyHeaderTip's height and date for the progress update (Jonas Schnelli) 0a261b6 Use pindexBestHeader instead of setBlockIndexCandidates for NotifyHeaderTip() (Jonas Schnelli)
| * | | | [Qt] use NotifyHeaderTip's height and date for the progress updateJonas Schnelli2016-10-203-9/+7
| | | | |
| * | | | Use pindexBestHeader instead of setBlockIndexCandidates for NotifyHeaderTip()Jonas Schnelli2016-10-201-3/+2
| | |_|/ | |/| |
* / | | RPC: importmulti: Avoid using boost::variant::operator!=, which is only in ↵Luke Dashjr2016-10-201-4/+4
|/ / / | | | | | | | | | newer boost versions
* | | Merge #7551: Add importmulti RPC callWladimir J. van der Laan2016-10-205-0/+436
|\ \ \ | |/ / |/| | | | | | | | 215caba Add consistency check to RPC call importmulti (Pedro Branco) cb08fdb Add importmulti rpc call (Pedro Branco)
| * | Add consistency check to RPC call importmultiPedro Branco2016-10-191-8/+40
| | |
| * | Add importmulti rpc callPedro Branco2016-10-195-0/+404
| | |
* | | Merge #8928: Fix init segfault where InitLoadWallet() calls ATMP before genesisWladimir J. van der Laan2016-10-192-2/+7
|\ \ \ | | | | | | | | | | | | 37aefff Fix init segfault where InitLoadWallet() calls ATMP before genesis (Matt Corallo)
| * | | Fix init segfault where InitLoadWallet() calls ATMP before genesisMatt Corallo2016-10-152-2/+7
| | | |
* | | | Merge #8927: Add script tests for FindAndDelete in pre-segwit and segwit scriptsWladimir J. van der Laan2016-10-193-2/+51
|\ \ \ \ | | | | | | | | | | | | | | | acf853d Add script tests for FindAndDelete in pre-segwit and segwit scripts (Johnson Lau)
| * | | | Add script tests for FindAndDelete in pre-segwit and segwit scriptsJohnson Lau2016-10-163-2/+51
| |/ / /
* | | | Merge #8774: Qt refactors to better abstract wallet accessJonas Schnelli2016-10-195-6/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 178cd88 Qt/splash: Specifically keep track of which wallet(s) we are connected to for later disconnecting (Luke Dashjr) 1880aeb Qt: Get the private key for signing messages via WalletModel (Luke Dashjr)
| * | | | Qt/splash: Specifically keep track of which wallet(s) we are connected to ↵Luke Dashjr2016-10-042-5/+12
| | | | | | | | | | | | | | | | | | | | for later disconnecting
| * | | | Qt: Get the private key for signing messages via WalletModelLuke Dashjr2016-10-043-1/+7
| | | | |
* | | | | Merge #7948: RPC: augment getblockchaininfo bip9_softforks dataWladimir J. van der Laan2016-10-196-44/+112
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | fc14609 RPC: augment getblockchaininfo bip9_softforks data (mruddy)
| * | | | RPC: augment getblockchaininfo bip9_softforks datamruddy2016-10-196-44/+112
| | | | |
* | | | | [RPC] pass HTTP basic authentication username to the JSONRequest objectJonas Schnelli2016-10-193-5/+10
| | | | |
* | | | | [RPC] Give RPC commands more information about the RPC requestJonas Schnelli2016-10-1913-547/+558
| | | | |
* | | | | rpc: Change JSONRPCRequest to JSONRPCRequestObjWladimir J. van der Laan2016-10-193-4/+4
|/ / / / | | | | | | | | | | | | This is more consistent with `JSONRPCReplyObj`.
* | | | Merge #8972: [Qt] make warnings label selectable (jonasschnelli)Wladimir J. van der Laan2016-10-191-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | ef0c9ee [Qt] make warnings label selectable (Jonas Schnelli)
| * | | | [Qt] make warnings label selectableJonas Schnelli2016-10-191-1/+4
| | | | |
* | | | | Merge #8951: RPC/Mining: getblocktemplate: Update and fix formatting of helpWladimir J. van der Laan2016-10-191-30/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 59daa58 RPC/Mining: getblocktemplate: Update and fix formatting of help (Luke Dashjr)
| * | | | | RPC/Mining: getblocktemplate: Update and fix formatting of helpLuke Dashjr2016-10-191-30/+36
| | | | | |
* | | | | | Merge #8949: Be more agressive in getting connections to peers with relevant ↵Wladimir J. van der Laan2016-10-191-3/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | services. 4630479 Make dnsseed's definition of acute need include relevant services. (Gregory Maxwell) 9583477 Be more aggressive in connecting to peers with relevant services. (Gregory Maxwell)
| * | | | | | Make dnsseed's definition of acute need include relevant services.Gregory Maxwell2016-10-191-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We normally prefer to connect to peers offering the relevant services. If we're not connected to enough peers with relevant services, we probably don't know about them and could use dnsseed's help.
| * | | | | | Be more aggressive in connecting to peers with relevant services.Gregory Maxwell2016-10-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only allow skipping relevant services until there are four outbound connections up. This avoids quickly filling up with peers lacking the relevant services when addrman has few or none of them.
* | | | | | | Merge #8936: Report NodeId in misbehaving debugWladimir J. van der Laan2016-10-191-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a1919ad Report NodeId in misbehaving debug (R E Broadley)
| * | | | | | | Report NodeId in misbehaving debugR E Broadley2016-10-181-2/+2
| | |_|_|_|/ / | |/| | | | |