aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-11-28Merge pull request #7106Gregory Maxwell
a9f3d3d Fix and improve relay from whitelisted peers (Pieter Wuille)
2015-11-28Merge pull request #6508Pieter Wuille
eece63f Switch blocks to a constant-space Merkle root/branch algorithm. (Pieter Wuille) ee60e56 Add merkle.{h,cpp}, generic merkle root/branch algorithm (Pieter Wuille)
2015-11-28Merge pull request #6961Pieter Wuille
fa41d4c [qt] Move GUI related HelpMessage() part downstream (MarcoFalke) faf93f3 [trivial] Reuse translation and cleanup DEFAULT_* values (MarcoFalke) 3307bdb Bugfix: Omit wallet-related options from -help when wallet is not supported (Luke Dashjr) b966aa8 Constrain constant values to a single location in code (Luke Dashjr)
2015-11-28[qt] Move GUI related HelpMessage() part downstreamMarcoFalke
2015-11-28[trivial] Reuse translation and cleanup DEFAULT_* valuesMarcoFalke
* DEFAULT_DISABLE_SAFEMODE = false * Use DEFAULT_* constants for extern bools
2015-11-28Bugfix: Omit wallet-related options from -help when wallet is not supportedLuke Dashjr
2015-11-28Constrain constant values to a single location in codeLuke Dashjr
2015-11-28Merge pull request #6942Pieter Wuille
e482a7f Fix CCoins serialization documentation (Peter Josling)
2015-11-28Merge pull request #7003Pieter Wuille
b8c06ef doc: Add non-style-related development guidelines (Wladimir J. van der Laan)
2015-11-27Merge pull request #7117Wladimir J. van der Laan
a64d7b4 Print correct minimum mempool size in MB (paveljanik)
2015-11-27Print correct minimum mempool size in MBpaveljanik
2015-11-27Switch blocks to a constant-space Merkle root/branch algorithm.Pieter Wuille
This switches the Merkle tree logic for blocks to one that runs in constant (small) space. The old code is moved to tests, and a new test is added that for various combinations of block sizes, transaction positions to compute a branch for, and mutations: * Verifies that the old code and new code agree for the Merkle root. * Verifies that the old code and new code agree for the Merkle branch. * Verifies that the computed Merkle branch is valid. * Verifies that mutations don't change the Merkle root. * Verifies that mutations are correctly detected.
2015-11-27Add merkle.{h,cpp}, generic merkle root/branch algorithmPieter Wuille
2015-11-27Merge pull request #7078Wladimir J. van der Laan
c434940 uint256::GetCheapHash bigendian compatibility (daniel)
2015-11-27Merge pull request #7114Wladimir J. van der Laan
9b63758 util: Don't set strMiscWarning on every exception (Wladimir J. van der Laan)
2015-11-27Merge pull request #7090Wladimir J. van der Laan
cde857f Connect to Tor hidden services by default (Peter Todd)
2015-11-27Merge pull request #7095Wladimir J. van der Laan
4ec3561 Replace scriptnum_test's normative ScriptNum implementation (Wladimir J. van der Laan)
2015-11-27Merge pull request #7083Wladimir J. van der Laan
faf12bc OpenSSL 1.1.0: Fix text variant of the version number (MarcoFalke)
2015-11-27Merge pull request #6780Wladimir J. van der Laan
a46f87f Initialize logging before we do parameter interaction (Jonas Schnelli) df66147 Move -blocksonly parameter interaction to the new ParameterInteraction() function (Jonas Schnelli) 68354e7 [QT] Call inits parameter interaction before we create the options model (Jonas Schnelli) 411b05a Refactor parameter interaction, call it before AppInit2() (Jonas Schnelli)
2015-11-27util: Don't set strMiscWarning on every exceptionWladimir J. van der Laan
Fixes #6809 - run-of-the-mill exceptions should not get into strMiscWarning (which is reported by `getinfo`).
2015-11-27Merge pull request #7053Wladimir J. van der Laan
2e29e7e Globals: Remove a bunch of Params() calls from main.cpp: (Jorge Timón)
2015-11-27Initialize logging before we do parameter interactionJonas Schnelli
2015-11-27Move -blocksonly parameter interaction to the new ParameterInteraction() ↵Jonas Schnelli
function
2015-11-27[QT] Call inits parameter interaction before we create the options modelJonas Schnelli
2015-11-27Refactor parameter interaction, call it before AppInit2()Jonas Schnelli
2015-11-27Merge pull request #6871Wladimir J. van der Laan
63b5840 Fix usage of local python-bitcoinlib (Peter Todd) 16a2f93 Fix incorrect locking of mempool during RBF replacement (Peter Todd) 97203f5 Port test to rpc-test framework (Suhas Daftuar) 20367d8 Add test for max replacement limit (Suhas Daftuar) 73d9040 Improve RBF replacement criteria (Suhas Daftuar) b272ecf Reject replacements that add new unconfirmed inputs (Peter Todd) fc8c19a Prevent low feerate txs from (directly) replacing high feerate txs (Peter Todd) 0137e6f Add tests for transaction replacement (Peter Todd) 5891f87 Add opt-in full-RBF to mempool (Peter Todd)
2015-11-27Merge pull request #6134Wladimir J. van der Laan
e304432 Pass reference to estimateSmartFee and cleanup whitespace (Suhas Daftuar) 56106a3 Expose RPC calls for estimatesmart functions (Alex Morcos) e93a236 add estimateSmartFee to the unit test (Alex Morcos) 6303051 EstimateSmart functions consider mempool min fee (Alex Morcos) f22ac4a Increase success threshold for fee estimation to 95% (Alex Morcos) 4fe2823 Change wallet and GUI code to use new smart fee estimation calls. (Alex Morcos) 22eca7d Add smart fee estimation functions (Alex Morcos)
2015-11-27Merge pull request #5967Wladimir J. van der Laan
072e2f8 Alter assumptions in CCoinsViewCache::BatchWrite (Alex Morcos)
2015-11-27Merge pull request #7058Wladimir J. van der Laan
ffacd27 zmq: prepend zmq to debug messages (Daniel Cousens) 14075b1 init: add zmq to debug categories (Daniel Cousens) cdcd816 init: amend ZMQ flag names (Daniel Cousens)
2015-11-26Fix and improve relay from whitelisted peersPieter Wuille
This makes sure that retransmits by a whitelisted peer also actually result in a retransmit. Further, this changes the logic to never relay in case we would assign a DoS score, as we expect to get DoS banned ourselves as a result.
2015-11-26Merge pull request #7069Wladimir J. van der Laan
fa472f3 [trivial] Fix -maxmempool InitError (MarcoFalke)
2015-11-26Connect to Tor hidden services by defaultPeter Todd
Adds 127.0.0.1:9050 for the .onion proxy if we can succesfully connect to the control port. Natural followup to creating hidden services automatically.
2015-11-26Merge pull request #7087Wladimir J. van der Laan
9cf6688 Document both the peerbloomfilters and enforcenodebloom options. (Patick Strateman) 0f4dc53 Add enforcenodebloom option. (Patick Strateman) b3caa9b Move bloom filter filtering logic outside of command "switch" (giant if/else). (Patick Strateman)
2015-11-25Replace scriptnum_test's normative ScriptNum implementationWladimir J. van der Laan
Compare against the scriptnum from Bitcoin Core 0.10 instead of OpenSSL. Closes #7086.
2015-11-25Merge pull request #7088Wladimir J. van der Laan
5ad5463 Squashed 'src/secp256k1/' changes from 2bfb82b..6c527ec (MarcoFalke)
2015-11-25Merge pull request #7092Wladimir J. van der Laan
392d3c5 build: Set osx permissions in the dmg to make Gatekeeper happy (Cory Fields)
2015-11-25uint256::GetCheapHash bigendian compatibilitydaniel
2015-11-25Merge pull request #7006Jonas Schnelli
f71bfef add UI help for -resetguisettings (Jonas Schnelli) ae98388 [Qt] add startup option to reset Qt settings (Jonas Schnelli)
2015-11-24build: Set osx permissions in the dmg to make Gatekeeper happyCory Fields
2015-11-24Merge pull request #7075Wladimir J. van der Laan
4846543 Move time data log print to 'net' category to reduce log noise (tulip)
2015-11-24Pass reference to estimateSmartFee and cleanup whitespaceSuhas Daftuar
2015-11-24[trivial] Fix -maxmempool InitErrorMarcoFalke
2015-11-24Document both the peerbloomfilters and enforcenodebloom options.Patick Strateman
2015-11-24Add enforcenodebloom option.Patick Strateman
Previously peers which implement a protocol version less than NO_BLOOM_VERSION would not be disconnected for sending a filter command, regardless of the peerbloomfilter option. Many node operators do not wish to provide expensive bloom filtering for SPV clients, previously they had to cherry pick the commit which enabled the disconnect logic. The default should remain false until a sufficient percent of SPV clients have updated.
2015-11-24Merge pull request #7066Wladimir J. van der Laan
5c2fd38 Add missing "blocktime" description to listtransactions help, fix formatting. (Pavel Janík)
2015-11-24Move bloom filter filtering logic outside of command "switch" (giant if/else).Patick Strateman
Moving this logic outside of the "switch" makes it far simpler to enable the forced disconnect by a parameter.
2015-11-24Merge pull request #7045Wladimir J. van der Laan
2aa49ce Bugfix: Use unique autostart filenames on Linux for testnet/regtest (Luke Dashjr)
2015-11-24Merge pull request #7042Wladimir J. van der Laan
70899d7 [doc][trivial] Update Debian control description (fanquake) 2fcb849 [doc][trivial] Remove source forge from Debian watch. (fanquake)
2015-11-24Merge pull request #7052Wladimir J. van der Laan
a0953cd [qa] python-bitcoinrpc is no longer a subtree (MarcoFalke)
2015-11-24Merge commit '5ad54630935d1f340666de7bc9ffef9b8a1df296' into HEADMarcoFalke