aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6906Wladimir J. van der Laan2015-10-311-1/+6
|\ | | | | | | 30d9662 Reject invalid pubkeys when reading ckey items from the wallet. (Gregory Maxwell)
| * Reject invalid pubkeys when reading ckey items from the wallet.Gregory Maxwell2015-10-291-1/+6
| | | | | | | | | | This makes the behavior more consistent with key objects and will reject some corrupted pubkeys (e.g. zero length).
* | Merge pull request #6896Wladimir J. van der Laan2015-10-311-1/+1
|\ \ | |/ |/| | | e9e6163 Make -checkmempool=1 not fail through int32 overflow (Pieter Wuille)
| * Make -checkmempool=1 not fail through int32 overflowPieter Wuille2015-10-281-1/+1
| |
* | Merge pull request #6863Wladimir J. van der Laan2015-10-291-3/+7
|\ \ | | | | | | | | | 0be387a unittest: fix test for null tx input (Daniel Kraft)
| * | unittest: fix test for null tx inputDaniel Kraft2015-10-271-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the unittest that is meant to catch a transaction that is invalid because it has a null input. The old test failed not because of that but because it was considered a coinbase with too large script. This is already checked with a different test, though. The new test is *not* a coinbase since it has two inputs, but one of them is null. This really checks the corresponding code path in CheckTransaction.
* | | Merge pull request #6899Wladimir J. van der Laan2015-10-291-1/+1
|\ \ \ | | | | | | | | | | | | a83f3c2 Add explicit shared_ptr constructor due to C++11 error (Bob McElrath)
| * | | Add explicit shared_ptr constructor due to C++11 errorBob McElrath2015-10-281-1/+1
| |/ /
* | | Merge pull request #6870Wladimir J. van der Laan2015-10-292-15/+14
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 040c0ea Init: Cleanup error and warning strings (MarcoFalke) 6782f58 [trivial] Latest config.guess (MarcoFalke) bf68191 [trivial] rpcnet: fix typo (MarcoFalke) 95f4291 [trivial] Rewrite help text for feature enabled by default (MarcoFalke)
| * | Init: Cleanup error and warning stringsMarcoFalke2015-10-281-13/+12
| | | | | | | | | | | | Also update doc/translation_strings_policy.md
| * | [trivial] rpcnet: fix typoMarcoFalke2015-10-231-2/+2
| | |
* | | Merge pull request #6891Pieter Wuille2015-10-284-5/+5
|\ \ \ | | | | | | | | | | | | ad5aae1 constify missing catch cases (Philip Kaufmann)
| * | | constify missing catch casesPhilip Kaufmann2015-10-274-5/+5
| | |/ | |/| | | | | | | - ensure all missing catch cases are constant where possible
* | | Merge pull request #6892Pieter Wuille2015-10-284-15/+18
|\ \ \ | | | | | | | | | | | | 214de7e [Trivial] ensure minimal header conventions (Philip Kaufmann)
| * | | [Trivial] ensure minimal header conventionsPhilip Kaufmann2015-10-274-15/+18
| |/ / | | | | | | | | | | | | | | | - ensure header namespaces and end comments are correct - add missing header end comments - ensure minimal formatting (add newlines etc.)
* | | Merge pull request #6776Pieter Wuille2015-10-283-6/+12
|\ \ \ | | | | | | | | | | | | ab1f560 Support -checkmempool=N, which runs checks on average once every N transactions (Pieter Wuille)
| * | | Support -checkmempool=N, which runs checks on average once every N transactionsPieter Wuille2015-10-203-6/+12
| | | |
* | | | Fix chainstate serialized_size computationPieter Wuille2015-10-281-1/+1
| |/ / |/| |
* | | Merge pull request #6464Wladimir J. van der Laan2015-10-271-0/+1
|\ \ \ | | | | | | | | | | | | 2d8c49d Clean up tx prioritization when conflict mined (Casey Rodarmor)
| * | | Clean up tx prioritization when conflict minedCasey Rodarmor2015-08-031-0/+1
| | | |
* | | | Merge pull request #6889Wladimir J. van der Laan2015-10-272-3/+9
|\ \ \ \ | | | | | | | | | | | | | | | 0d699fc fix locking issue with new mempool limiting (Jonas Schnelli)
| * | | | fix locking issue with new mempool limitingJonas Schnelli2015-10-262-3/+9
| | | | | | | | | | | | | | | | | | | | Current master crashes on OSX with an exception: "boost: mutex lock failed in pthread_mutex_lock: Invalid argument"
* | | | | Merge pull request #6881Wladimir J. van der Laan2015-10-265-3/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 7bbc7c3 Add option for microsecond precision in debug.log (Suhas Daftuar)
| * | | | | Add option for microsecond precision in debug.logSuhas Daftuar2015-10-265-3/+22
| | | | | |
* | | | | | Merge pull request #6622Wladimir J. van der Laan2015-10-265-0/+144
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 17a073a Add RPC test for -maxuploadtarget (Suhas Daftuar) 872fee3 Introduce -maxuploadtarget (Jonas Schnelli)
| * | | | | | Introduce -maxuploadtargetJonas Schnelli2015-10-265-0/+144
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * -maxuploadtarget can be set in MiB * if <limit> - ( time-left-in-24h-cycle / 600 * MAX_BLOCK_SIZE ) has reach, stop serve blocks older than one week and filtered blocks * no action if limit has reached, no guarantee that the target will not be surpassed * add outbound limit informations to rpc getnettotals
* | | | | | Merge pull request #6888Wladimir J. van der Laan2015-10-261-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 143d173 Use BOOST_CHECK_MESSAGE() rather than BOOST_CHECK() in alerts_tests.cpp and initialize strMiscWarning before calling PartitionCheck()." (Eric Lombrozo)
| * | | | | | Use BOOST_CHECK_MESSAGE() rather than BOOST_CHECK() in alerts_tests.cpp and ↵Eric Lombrozo2015-10-251-1/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | initialize strMiscWarning before calling PartitionCheck()."
* | | | | | Merge pull request #6566Wladimir J. van der Laan2015-10-266-10/+58
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | dea8d21 Enable policy enforcing GetMedianTimePast as the end point of lock-time constraints (Mark Friedenbach) 9d55050 Add rules--presently disabled--for using GetMedianTimePast as endpoint for lock-time calculations (Mark Friedenbach)
| * | | | | | Enable policy enforcing GetMedianTimePast as the end point of lock-time ↵Mark Friedenbach2015-10-232-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | constraints Transactions are not allowed in the memory pool or selected for inclusion in a block until their lock times exceed chainActive.Tip()->GetMedianTimePast(). However blocks including transactions which are only mature under the old rules are still accepted; this is *not* the soft-fork required to actually rely on the new constraint in production.
| * | | | | | Add rules--presently disabled--for using GetMedianTimePast as endpoint for ↵Mark Friedenbach2015-10-235-7/+54
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lock-time calculations The lock-time code currently uses CBlock::nTime as the cutoff point for time based locked transactions. This has the unfortunate outcome of creating a perverse incentive for miners to lie about the time of a block in order to collect more fees by including transactions that by wall clock determination have not yet matured. By using CBlockIndex::GetMedianTimePast from the prior block instead, the self-interested miner no longer gains from generating blocks with fraudulent timestamps. Users can compensate for this change by simply adding an hour (3600 seconds) to their time-based lock times. If enforced, this would be a soft-fork change. This commit only adds the functionality on an unexecuted code path, without changing the behaviour of Bitcoin Core.
* | | | | | Merge pull request #6877Wladimir J. van der Laan2015-10-261-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 10e2eae rpc: Add maxmempool and effective min fee to getmempoolinfo (Wladimir J. van der Laan)
| * | | | | | rpc: Add maxmempool and effective min fee to getmempoolinfoWladimir J. van der Laan2015-10-261-0/+3
| | | | | | |
* | | | | | | Remove coverage and test related files, when cleaning updexX72015-10-231-2/+14
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now there were quite a few leftovers, and only the coverage related files in `src/` were cleaned, while the ones in the other dirs remained. `qa/tmp/` is related to the BitcoinJ tests, and `cache/` is related to RPC tests.
* | | | | | Merge pull request #6873Jeff Garzik2015-10-237-89/+85
|\ \ \ \ \ \
| * | | | | | leveldbwrapper file rename to dbwrapper.*Jeff Garzik2015-10-226-9/+9
| | | | | | |
| * | | | | | leveldbwrapper symbol rename: Remove "Level" from class, etc. namesJeff Garzik2015-10-225-65/+65
| | | | | | |
| * | | | | | leveldbwrapper: Remove unused .Prev(), .SeekToLast() methodsJeff Garzik2015-10-222-18/+14
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Also, trim trailing whitespace.
* | | | | | Merge pull request #6856Wladimir J. van der Laan2015-10-232-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | d3b09f6 Do not allow blockfile pruning during reindex. (Alex Morcos)
| * | | | | | Do not allow blockfile pruning during reindex.Alex Morcos2015-10-192-2/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Also clarify startup message.
* | | | | | Merge pull request #6351Wladimir J. van der Laan2015-10-234-5/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 65ef372 Add BIP65 to getblockchaininfo softforks list (Peter Todd) cde7ab2 Add RPC tests for the CHECKLOCKTIMEVERIFY (BIP65) soft-fork (Peter Todd) 287f54f Add CHECKLOCKTIMEVERIFY (BIP65) soft-fork logic (Peter Todd)
| * | | | | | Add BIP65 to getblockchaininfo softforks listPeter Todd2015-10-081-0/+1
| | | | | | |
| * | | | | | Add CHECKLOCKTIMEVERIFY (BIP65) soft-fork logicPeter Todd2015-10-083-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on the earlier BIP66 soft-fork logic implemented by Pieter Wuille's 5a47811da5158df763aa2fca09ce646ee0c51e7b
* | | | | | | Merge pull request #5936Wladimir J. van der Laan2015-10-232-4/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 212bcca Add optional locktime to createrawtransaction (Tom Harding)
| * | | | | | | Add optional locktime to createrawtransactionTom Harding2015-08-102-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A non-zero locktime also causes input sequences to be set to non-max, activating the locktime.
* | | | | | | | Merge pull request #6818Wladimir J. van der Laan2015-10-233-5/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | b48da5c script: Remove magic numbers (David Hill)
| * | | | | | | | script: Remove magic numbersDavid Hill2015-10-153-5/+12
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds two new constants, MAX_OPS_PER_SCRIPT and MAX_PUBKEYS_PER_MULTISIG.
* | | | | | | | Merge pull request #6867Wladimir J. van der Laan2015-10-233-1/+21
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | a4e28b3 Set TCP_NODELAY on P2P sockets. (Gregory Maxwell)
| * | | | | | | Set TCP_NODELAY on P2P sockets.Gregory Maxwell2015-10-223-1/+21
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nagle appears to be a significant contributor to latency now that the static sleeps are gone. Most of our messages are relatively large compared to IP + TCP so I do not expect this to create enormous overhead. This may also reduce traffic burstyness somewhat.
* | | | | | | Merge pull request #6848Wladimir J. van der Laan2015-10-222-0/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c6824f8 Add DERSIG transaction test cases (J Ross Nicoll)