aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-12-18[Depends] Bump Boost, miniupnpc, ccache & zeromqfanquake
Bring dependencies up to date with master: [depends] Boost 1.59.0 [depends] miniupnpc 1.9.20151026 [depends] native ccache 3.2.4 [depends] zeromq 4.0.7 [depends] Latest config.guess & config.sub [depends] Fix miniupnpc compilation on osx Github-Pull: #6980 Rebased-From: 9e940fa4c650dd31c39dbc8ed4038e131c19d59c 17ad964c2ff8f9be62a6826012b565843d3d72ba 26f8ea5342994bc3dcc22163b86f086328b50769 10d3c77644d894338a02b05f64ba822f3a516401 23a3c47f95c9c7c1778c488be6ea9ebbef2311ea e0769e1928f892fb16f851991d8e09a90587a1f4
2015-12-17test: don't override BITCOIND and BITCOINCLI if they're setWladimir J. van der Laan
In rpc-tests.py, don't override BITCOIND and BITCOINCLI if they're already set. Makes it possible to run the tests with either another tree or the GUI. Github-Pull: #7209 Rebased-From: 83cdcbdca41583a5a754a89f45b04b56cd0df627
2015-12-17Removed offline testnet DNSSeed 'alexykot.me'.Elias Rohrer
Github-Pull: #7216 Rebased-From: e18378e53fb71c39236db35ab2d560b43602b1be
2015-12-14Replace trickle nodes with per-node/message Poisson delaysPieter Wuille
We used to have a trickle node, a node which was chosen in each iteration of the send loop that was privileged and allowed to send out queued up non-time critical messages. Since the removal of the fixed sleeps in the network code, this resulted in fast and attackable treatment of such broadcasts. This pull request changes the 3 remaining trickle use cases by random delays: * Local address broadcast (while also removing the the wiping of the seen filter) * Address relay * Inv relay (for transactions; blocks are always relayed immediately) The code is based on older commits by Patrick Strateman. Github-Pull: #7125 Rebased-From: 5400ef6bcb9d243b2b21697775aa6491115420f3
2015-12-14Checks for null data transaction before issuing error to debug.logaccraze
CWalletTx::GetAmounts could not find output address for null data transactions, thus issuing an error in debug.log. This change checks to see if the transaction is OP_RETURN before issuing error. resolves #6142 Github-Pull: #7200 Rebased-From: b6915b82398d2e1d1f888b3816adfaf06d9a450e c611acc38a95d336a824b632823aa1b652e570df d812daf967ba4173bfa1c37eeb4ab7a0ccc4df25
2015-12-14Add "NODE_BLOOM" to guiutil so that peers don't get UNKNOWN[4]Matt Corallo
Rebased-From: daf6466330d9d3e4d9034fd316cded192d2a7d67 Github-Pull: #7206
2015-12-11net: Add and document network messages in protocol.hWladimir J. van der Laan
- Avoids string typos (by making the compiler check) - Makes it easier to grep for handling/generation of a certain message type - Refer directly to documentation by following the symbol in IDE - Move list of valid message types to protocol.cpp: protocol.cpp is a more appropriate place for this, and having the array there makes it easier to keep things consistent. Github-Pull: #7181 Rebased-From: 9bbe71b641e2fc985daf127988a14a67c99da50a
2015-12-10net: Fix sent reject messages for blocks and transactionsWladimir J. van der Laan
Ever since we #5913 have been sending invalid reject messages for transactions and blocks. test: Add basic test for `reject` code Extend P2P test framework to make it possible to expect reject codes for transactions and blocks. Github-Pull: #7179 Rebased-From: 9fc6ed6003da42f035309240c715ce0fd063ec03 20411903d7b356ebb174df2daad1dcd5d6117f79
2015-12-08Coinselection prunes extraneous inputs from ApproximateBestSubsetAlSzacrel
This is a combination of 3 commits. - Coinselection prunes extraneous inputs from ApproximateBestSubset A further pass over the available inputs has been added to ApproximateBestSubset after a candidate set has been found. It will prune any extraneous inputs in the selected subset, in order to decrease the number of input and the resulting change. - Moved set reduction to the end of ApproximateBestSubset to reduce performance impact - Added a test for the pruning of extraneous inputs after ApproximateBestSet Github-Pull: #4906 Rebased-From: 5c03483e26ab414d22ef192691b2336c1bb3cb02 af9510e0374443b093d633a91c4f1f8bf5071292 fc0f52d78085b6ef97d6821fc7592326c2d9b495
2015-12-07test: remove necessity to call create_callback_mapWladimir J. van der Laan
Remove necessity to call create_callback_map (as well as the function itself) from the Python P2P test framework. Invoke the appropriate methods directly. - Easy to forget to call it and wonder why it doesn't work - Simplifies the code - This makes it easier to handle new messages in subclasses Github-Pull: #7171 Rebased-From: 2f601d215da1683ae99ab9973219044c32fa2093
2015-12-07Don't do mempool lookups for "mempool" command without a filterMatt Corallo
Github-Pull: #7174 Rebased-From: 96918a2f0990a8207d7631b8de73af8ae5d24aeb
2015-12-04Replace setInventoryKnown with a rolling bloom filter.Gregory Maxwell
Github-Pull: #7133 Rebased-From: ec73ef37eccfeda76de55c4ff93ea54d4e69e1ec e20672479ef7f2048c2e27494397641d47a4d88d 6b849350ab074a7ccb80ecbef387f59e1271ded6 b6a0da45db8d534e7a77d1cebe382cd5d83ba9b8 d41e44c9accb3df84e0abbc602cc76b72754d382 aa4b0c26b0a94ca6164c441aae723e118554d214
2015-12-04Disconnect on mempool requests from peers when over the upload limit.Gregory Maxwell
Mempool requests use a fair amount of bandwidth when the mempool is large, disconnecting peers using them follows the same logic as disconnecting peers fetching historical blocks. Rebased-From: 6aadc7557823b7673b8f661b3d41cf867e2936a3 Github-Pull: #7166
2015-12-03Add missing automake package to deb-based UNIX install instructions.Matt Bogosian
Rebased-From: b4404090259be4e34ef5dba33e47a41e7d9acc03 Github-Pull: #7152
2015-12-03Bump version to 0.12.0Wladimir J. van der Laan
Bump version from 0.11.99 to 0.12.0 so that we don't forget to do this when rc1 is released.
2015-12-03Merge pull request #7158Wladimir J. van der Laan
fab8347 [qt] Use tr() instead of _() (MarcoFalke)
2015-12-02[qt] Use tr() instead of _()MarcoFalke
Also, `make translate`
2015-12-02Merge pull request #7157Wladimir J. van der Laan
fabd10a Fix typo in wallet.cpp (MarcoFalke) fad2460 Update contrib/devtools/README.md (MarcoFalke) 5e151a8 PartitionCheck: remove useless spaces (paveljanik) fad0088 TRIVIAL: Chainparams: Remove unused CBaseUnitTestParams (Jorge Timón) 74f7341 Update miner.cpp: Fix typo in comment (antonio-fr) e69bad1 [trivial] Fix typo in peertablemodel.cpp (MarcoFalke) 8a03727 Fix various typos (paveljanik)
2015-12-02Fix typo in wallet.cppMarcoFalke
2015-12-02Update contrib/devtools/README.mdMarcoFalke
* Fix order * Update subtree check
2015-12-02PartitionCheck: remove useless spacespaveljanik
2015-12-02TRIVIAL: Chainparams: Remove unused CBaseUnitTestParamsJorge Timón
2015-12-02Update miner.cpp: Fix typo in commentantonio-fr
2015-12-02[trivial] Fix typo in peertablemodel.cppMarcoFalke
2015-12-02Fix various typospaveljanik
2015-12-02Merge pull request #7128Wladimir J. van der Laan
02354c9 Constrain rpcport default values to a single location in code (Luke Dashjr)
2015-12-02qt: Final translation update before 0.12 forkWladimir J. van der Laan
- Add new translations (finally, after a long time) - update-translation script was not considering new translations - oops - fixed this, also remove (nearly) empty translations - Update translation process, it was still describing the old repository structure
2015-12-02Merge pull request #6216Wladimir J. van der Laan
db6047d Take the training wheels off anti-fee-sniping (Peter Todd)
2015-12-02Merge pull request #7147Wladimir J. van der Laan
9827091 Squashed 'src/univalue/' changes from 5839ac3..2740c4f (MarcoFalke)
2015-12-02Merge pull request #7146Wladimir J. van der Laan
1812de9 Name union to prevent compiler warning (Pavel Janík)
2015-12-02Merge pull request #7118Wladimir J. van der Laan
b212f94 Describe maxmempool and mempoolminfee in the getmempoolinfo RPC help. (Pavel Janík)
2015-12-02Merge pull request #7155Wladimir J. van der Laan
092e9ad Remove old replace-by-fee tests (Peter Todd)
2015-12-02Merge commit '982709199f1b4e9e35211c419a81938f9f1dd4ed' into bitcoinMarcoFalke
2015-12-02Squashed 'src/univalue/' changes from 5839ac3..2740c4fMarcoFalke
2740c4f Merge branch '2015_11_escape_plan' into bitcoin 7482163 Add new testcase to Makefile.am 46098ee Version 1.0.1. ccf3575 parser: Ensure multiple values cannot follow each other eb6cd64 Omit Obj/Arr open token from jsonTokenIsValue() test bfef9e2 Makefile.am: list recently added test data, fail{35,36}.json 3e319f3 parser: Tighten array, object syntax checks. c74185c parser: transform C++ variables into bitmask f2568bc Prefer C++ STL vector .at() for accessing object values. 8eafa26 travis: run parallel 'make distcheck' fd448da test: Improve tester diagnostics. Add failing test case from #15 2158205 Use internal, locale-independent isspace(), isdigit() implementations. 2ab9ad4 travis: Make 'make distcheck' for more comprehensive checks. 3339191 Escape all control characters git-subtree-dir: src/univalue git-subtree-split: 2740c4f71242086a7eb3dc32f812546ba9fad913
2015-12-02Remove old replace-by-fee testsPeter Todd
Made redundant by tests in qa/rpc-tests/replace-by-fee.py
2015-12-02Merge pull request #7144Wladimir J. van der Laan
8f0d79e test: Disable scheduler test manythreads (Wladimir J. van der Laan)
2015-12-02Merge pull request #6872Wladimir J. van der Laan
dd5862c Flush coins cache also after transaction processing (Pieter Wuille) bde953e Uncache input txn in utxo cache if a tx is not accepted to mempool (Matt Corallo) 97bf377 Add CCoinsViewCache::HaveCoinsInCache to check if a tx is cached (Matt Corallo) 677aa3d Discard txn cache entries that were loaded for removed mempool txn (Matt Corallo) b2e74bd Get the set of now-uncacheable-txn from CTxMemPool::TrimToSize (Matt Corallo) 74d0f90 Add method to remove a tx from CCoinsViewCache if it is unchanged (Matt Corallo)
2015-12-02Merge pull request #7040Jonas Schnelli
b171c69 [doc] Update OS X build notes for new qt5 configure (Michael Ford)
2015-12-02Name union to prevent compiler warningPavel Janík
2015-12-01Flush coins cache also after transaction processingPieter Wuille
2015-12-01Uncache input txn in utxo cache if a tx is not accepted to mempoolMatt Corallo
2015-12-01Add CCoinsViewCache::HaveCoinsInCache to check if a tx is cachedMatt Corallo
2015-12-01Discard txn cache entries that were loaded for removed mempool txnMatt Corallo
2015-12-01Get the set of now-uncacheable-txn from CTxMemPool::TrimToSizeMatt Corallo
2015-12-01Add method to remove a tx from CCoinsViewCache if it is unchangedMatt Corallo
2015-12-01Merge pull request #6898Pieter Wuille
553cad9 Rewrite CreateNewBlock (Alex Morcos) 5f12263 Expose FormatStateMessage (Alex Morcos) 1f09287 Make accessing mempool parents and children public (Alex Morcos) 7230187 Add TxPriority class and comparator (Alex Morcos) f3fe836 Add a score index to the mempool. (Alex Morcos) c49d5bc Store the total sig op count of a tx. (Alex Morcos)
2015-12-01Rewrite CreateNewBlockAlex Morcos
Use the score index on the mempool to only add sorted txs in order. Remove much of the validation while building the block, relying on mempool to be consistent and only contain txs that can be mined. The mempool is assumed to be consistent as far as not containing txs which spend non-existent outputs or double spends, and scripts are valid. Finality of txs is still checked (except not coinbase maturity, assumed in mempool). Still TestBlockValidity in case mempool consistency breaks and return error state if an invalid block was created. Unit tests are modified to realize that invalid blocks can now be constructed if the mempool breaks its consistency assumptions and also updated to have the right fees, since the cached value is now used for block construction. Conflicts: src/miner.cpp
2015-12-01Expose FormatStateMessageAlex Morcos
2015-12-01Make accessing mempool parents and children publicAlex Morcos
2015-12-01Add TxPriority class and comparatorAlex Morcos