aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-02-12Merge #7184: Implement SequenceLocks functions for BIP 68Wladimir J. van der Laan
b043c4b fix sdaftuar's nits again (Alex Morcos) a51c79b Bug fix to RPC test (Alex Morcos) da6ad5f Add RPC test exercising BIP68 (mempool only) (Suhas Daftuar) c6c2f0f Implement SequenceLocks functions (Alex Morcos)
2016-02-12Merge #7520: LibreSSL doesn't define OPENSSL_VERSION, use ↵Wladimir J. van der Laan
LIBRESSL_VERSION_TEXT instead a0a17b3 LibreSSL doesn't define OPENSSL_VERSION, use LIBRESSL_VERSION_TEXT instead (Pavel Janík)
2016-02-12LibreSSL doesn't define OPENSSL_VERSION, use LIBRESSL_VERSION_TEXT insteadPavel Janík
2016-02-11fix sdaftuar's nits againAlex Morcos
it boggles the mind why these nits can't be delivered on a more timely basis
2016-02-10Bug fix to RPC testAlex Morcos
2016-02-10Add RPC test exercising BIP68 (mempool only)Suhas Daftuar
2016-02-10Implement SequenceLocks functionsAlex Morcos
SequenceLocks functions are used to evaluate sequence lock times or heights per BIP 68. The majority of this code is copied from maaku in #6312 Further credit: btcdrak, sipa, NicolasDorier
2016-02-10Merge #7500: Correctly report high-S violationsWladimir J. van der Laan
9d95187 Correctly report high-S violations (Pieter Wuille)
2016-02-10Merge #7502: Update the wallet best block marker when pruningWladimir J. van der Laan
e4eebb6 Update the wallet best block marker when pruning (Pieter Wuille)
2016-02-10Merge #7491: wallet: Ignore MarkConflict if block hash is not knownWladimir J. van der Laan
40e7b61 wallet: Ignore MarkConflict if block hash is not known (Wladimir J. van der Laan)
2016-02-10Update the wallet best block marker when pruningPieter Wuille
2016-02-10Correctly report high-S violationsPieter Wuille
2016-02-10Merge #7490: tests: Remove May15 testWladimir J. van der Laan
acf5983 tests: Remove May15 test (Wladimir J. van der Laan)
2016-02-09wallet: Ignore MarkConflict if block hash is not knownWladimir J. van der Laan
If number of conflict confirms cannot be determined, this means that the block is still unknown or not yet part of the main chain, for example during a reindex. Do nothing in that case, instead of crash with an assertion. Fixes #7234.
2016-02-09tests: Remove May15 testWladimir J. van der Laan
This test is no longer relevant. It was introduced in 8c222dca4f961ad13ec64d690134a40d09b20813 to check the switch to 1MB blocks after the BDB too-many-locks issue back in 2013. The switching code has been long since removed. It also needs a specific data file that is hard to find. I've verified in #6320 that it still passes, however I think there is zero reason to keep it. Closes #6320.
2016-02-09Merge #7480: Changed getnetworkhps value to double to avoid overflow.Wladimir J. van der Laan
993d089 Changed getnetworkhps value to double to avoid overflow. (instagibbs)
2016-02-09Merge #7482: [P2P] Ensure headers count is correctWladimir J. van der Laan
301bc7b Update nQueuedValidatedHeaders after peer disconnection (Suhas Daftuar)
2016-02-09Merge #7472: rpc: Add WWW-Authenticate header to 401 responseWladimir J. van der Laan
7c06fbd rpc: Add WWW-Authenticate header to 401 response (Wladimir J. van der Laan)
2016-02-08Update nQueuedValidatedHeaders after peer disconnectionSuhas Daftuar
2016-02-08Changed getnetworkhps value to double to avoid overflow.instagibbs
2016-02-08Merge #7465: [doc] Update release-process.mdWladimir J. van der Laan
fa616c2 [doc] Update release-process.md (MarcoFalke)
2016-02-08rpc: Add WWW-Authenticate header to 401 responseWladimir J. van der Laan
A WWW-Authenticate header must be present in the 401 response to make clients know that they can authenticate, and how. WWW-Authenticate: Basic realm="jsonrpc" Fixes #7462.
2016-02-05Merge #7459: Consensus: Decouple pow.o from util.oWladimir J. van der Laan
f3757a0 Consensus: Decouple pow.cpp from util.h (Jorge Timón)
2016-02-05Merge #7468: [rpc-tests] Change solve() to use rehashWladimir J. van der Laan
7689041 [rpc-tests] Change solve() to use rehash (mrbandrews)
2016-02-05Merge #7469: net.h fix spelling: misbeha{b,v}ingWladimir J. van der Laan
0830552 Fix spelling: misbeha{b,v}ing (Matt)
2016-02-04Fix spelling: misbeha{b,v}ingMatt
2016-02-04[rpc-tests] Change solve() to use rehashmrbandrews
2016-02-04Consensus: Decouple pow.cpp from util.hJorge Timón
2016-02-04Merge #7349: Build against system UniValue when availableWladimir J. van der Laan
42407ed build-unix: Update UniValue build conditions (Luke Dashjr) cdcad9f LDADD dependency order shuffling (Luke Dashjr) 62f7f2e Bugfix: Always include univalue in DIST_SUBDIRS (Luke Dashjr) 2356515 Change default configure option --with-system-univalue to "no" (Luke Dashjr) 5d3b29b doc: Add UniValue to build instructions (Luke Dashjr) ab22705 Build against system UniValue when available (Luke Dashjr) 2adf7e2 Bugfix: The var is LIBUNIVALUE,not LIBBITCOIN_UNIVALUE (Luke Dashjr)
2016-02-04Merge #6480: include the chaintip blockindex in the SyncTransaction signal, ↵Wladimir J. van der Laan
add signal UpdateTip() 7d0bf0b include the chaintip *blockIndex in the SyncTransaction signal (Jonas Schnelli)
2016-02-04Merge #7070: Move maxTxFee out of mempoolWladimir J. van der Laan
fad6244 ATMP: make nAbsurdFee const (MarcoFalke) fa762d0 [wallet.h] Remove main.h include (MarcoFalke) fa79db2 Move maxTxFee out of mempool (MarcoFalke)
2016-02-04Merge #7192: Unify product name to as few places as possibleWladimir J. van der Laan
027fdb8 When/if the copyright line does not mention Bitcoin Core developers, add a second line to copyrights in -version, About dialog, and splash screen (Luke Dashjr) cc2095e Rewrite FormatParagraph to handle newlines within input strings correctly (Luke Dashjr) cddffaf Bugfix: Include COPYRIGHT_HOLDERS_SUBSTITUTION in Makefile substitutions so it gets passed to extract-strings correctly (Luke Dashjr) 29598e4 Move PACKAGE_URL to configure.ac (Luke Dashjr) 78ec83d splashscreen: Resize text to fit exactly (Luke Dashjr) 3cae140 Bugfix: Actually use _COPYRIGHT_HOLDERS_SUBSTITUTION everywhere (Luke Dashjr) 4d5a3df Bugfix: gitian-descriptors: Add missing python-setuptools requirement for OS X (biplist module) (Luke Dashjr) e4ab5e5 Bugfix: Correct copyright year in Mac DMG background image (Luke Dashjr) 917b1d0 Set copyright holders displayed in notices separately from the package name (Luke Dashjr) c39a6ff Travis & gitian-osx: Use depends for ds_store and mac_alias modules (Luke Dashjr) 902ccde depends: Add mac_alias to depends (Luke Dashjr) 82a2d98 depends: Add ds_store to depends (Cory Fields) de619a3 depends: Pass PYTHONPATH along to configure (Cory Fields) e611b6e macdeploy: Use rsvg-convert rather than cairosvg (Luke Dashjr) 63bcdc5 More complicated package name substitution for Mac deployment (Luke Dashjr) 1a6c67c Parameterise 2009 in translatable copyright strings (Luke Dashjr) d5f4683 Unify package name to as few places as possible without major changes (Luke Dashjr)
2016-02-04Merge #7458: [Net] peers.dat, banlist.dat recreated when missingWladimir J. van der Laan
c77c662 peers.dat, banlist.dat recreated when missing (kirkalx)
2016-02-04[doc] Update release-process.mdMarcoFalke
2016-02-04peers.dat, banlist.dat recreated when missingkirkalx
2016-02-03Merge #7225: Eliminate unnecessary call to CheckBlockWladimir J. van der Laan
dbb89dc Eliminate unnecessary call to CheckBlock (Suhas Daftuar)
2016-02-03ATMP: make nAbsurdFee constMarcoFalke
2016-02-03[wallet.h] Remove main.h includeMarcoFalke
2016-02-03Merge #7444: Improve block validity/ConnectBlock() commentsWladimir J. van der Laan
2f19905 Improve block validity/ConnectBlock() comments (Peter Todd)
2016-02-03Merge #7431: Rename permitrbf to mempoolreplacement and provide minimal ↵Wladimir J. van der Laan
string-list forward compatibility (needs 0.12 backport) b922fbe Rename replacebyfee=opt-in to mempoolreplacement=fee (Luke Dashjr) 3b66e54 Simplify check for replacebyfee=opt-in (Luke Dashjr) d65dee9 Accept replacebyfee=opt-in for turning on opt-in RBF (Luke Dashjr) 77b55a0 Rename permitrbf to replacebyfee (Luke Dashjr)
2016-02-03Merge branch 'master' into single_prodnameLuke Dashjr
2016-02-03When/if the copyright line does not mention Bitcoin Core developers, add a ↵Luke Dashjr
second line to copyrights in -version, About dialog, and splash screen
2016-02-03Rewrite FormatParagraph to handle newlines within input strings correctlyLuke Dashjr
2016-02-02Move maxTxFee out of mempoolMarcoFalke
Also, remove default values in CMerkleTx::AcceptToMemoryPool()
2016-02-02Merge #7091: Consensus build packageWladimir J. van der Laan
cf82d05 Build: Consensus: Make libbitcoinconsensus_la_SOURCES fully dynamic and dependend on both crypto and consensus packages (Jorge Timón) 4feadec Build: Libconsensus: Move libconsensus-ready files to the consensus package (Jorge Timón) a3d5eec Build: Consensus: Move consensus files from common to its own module/package (Jorge Timón)
2016-02-02Merge #7084: mempool: Replace maxFeeRate of 10000*minRelayTxFee with maxTxFeeWladimir J. van der Laan
fa1193e [doxygen] Actually display comment (MarcoFalke) fa331db mempool: Replace maxFeeRate of 10000*minRelayTxFee with maxTxFee (MarcoFalke)
2016-02-02Merge #7311: MOVEONLY: Move non-consensus functions out of powWladimir J. van der Laan
e867561 MOVEONLY: non-consensus: from pow to chain: (Jorge Timón)
2016-02-02[doxygen] Actually display commentMarcoFalke
2016-02-02Merge #7453: [0.13] Missing patches from 0.12Wladimir J. van der Laan
1e05727 Decide eviction group ties based on time. (Gregory Maxwell) 1e9613a Do not absolutely protect local peers from eviction. (Gregory Maxwell) 5d74309 Get rid of inaccurate ScriptSigArgsExpected (Pieter Wuille)
2016-02-01Rename replacebyfee=opt-in to mempoolreplacement=feeLuke Dashjr