aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* test: don't override BITCOIND and BITCOINCLI if they're setWladimir J. van der Laan2015-12-141-2/+4
| | | | | | 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.
* Merge pull request #7125Wladimir J. van der Laan2015-12-145-36/+47
|\ | | | | | | 5400ef6 Replace trickle nodes with per-node/message Poisson delays (Pieter Wuille)
| * Replace trickle nodes with per-node/message Poisson delaysPieter Wuille2015-12-115-36/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge pull request #7200Wladimir J. van der Laan2015-12-141-1/+2
|\ \ | | | | | | | | | | | | | | | d812daf fix logic for error log (accraze) c611acc wallet: check if tx scriptPubKey is unspendable (accraze) b6915b8 checks for null data transaction before debug.log (accraze)
| * | fix logic for error logaccraze2015-12-121-1/+1
| | |
| * | wallet: check if tx scriptPubKey is unspendableaccraze2015-12-121-1/+1
| | |
| * | checks for null data transaction before debug.logaccraze2015-12-111-1/+2
| |/ | | | | | | | | | | 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
* | Merge pull request #7068Wladimir J. van der Laan2015-12-142-3/+3
|\ \ | | | | | | | | | 979698c [RPC-Tests] add option to run rpc test over QT clients (Jonas Schnelli)
| * | [RPC-Tests] add option to run rpc test over QT clientsJonas Schnelli2015-12-142-3/+3
| | |
* | | Merge pull request #7185Wladimir J. van der Laan2015-12-141-0/+2
|\ \ \ | |/ / |/| | | | | e1030dd Note that reviewers should mention the commit hash of the commits they reviewed. (Patrick Strateman)
| * | Note that reviewers should mention the commit hash of the commits they reviewed.Patrick Strateman2015-12-101-0/+2
| | |
* | | Merge pull request #7206Jonas Schnelli2015-12-141-0/+3
|\ \ \ | |_|/ |/| | | | | daf6466 Add "NODE_BLOOM" to guiutil so that peers don't get UNKNOWN[4] (Matt Corallo)
| * | Add "NODE_BLOOM" to guiutil so that peers don't get UNKNOWN[4]Matt Corallo2015-12-131-0/+3
|/ /
* | Merge pull request #7156Wladimir J. van der Laan2015-12-111-1/+0
|\ \ | | | | | | | | | 6e76587 rpc: remove cs_main lock from `createrawtransaction` (Wladimir J. van der Laan)
| * | rpc: remove cs_main lock from `createrawtransaction`Wladimir J. van der Laan2015-12-021-1/+0
| | | | | | | | | | | | | | | This is a pure utility function that doesn't use main's data structures, so it does not require that lock.
* | | Merge pull request #7181Wladimir J. van der Laan2015-12-115-73/+283
|\ \ \ | | | | | | | | | | | | 9bbe71b net: Add and document network messages in protocol.h (Wladimir J. van der Laan)
| * | | net: Add and document network messages in protocol.hWladimir J. van der Laan2015-12-105-73/+283
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | - 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.
* | | Merge pull request #7197Wladimir J. van der Laan2015-12-111-1/+1
|\ \ \ | |/ / |/| | | | | 00423e1 Set link from http:// to https:// (Suriyaa Kudo)
| * | Set link from http:// to https://Suriyaa Kudo2015-12-101-1/+1
|/ / | | | | For opensource.org/licenses/MIT!
* | Merge pull request #7179Wladimir J. van der Laan2015-12-105-6/+123
|\ \ | | | | | | | | | | | | 2041190 test: Add basic test for `reject` code (Wladimir J. van der Laan) 9fc6ed6 net: Fix sent reject messages for blocks and transactions (Wladimir J. van der Laan)
| * | test: Add basic test for `reject` codeWladimir J. van der Laan2015-12-094-4/+121
| | | | | | | | | | | | | | | Extend P2P test framework to make it possible to expect reject codes for transactions and blocks.
| * | net: Fix sent reject messages for blocks and transactionsWladimir J. van der Laan2015-12-071-2/+2
| | | | | | | | | | | | | | | Ever since we #5913 have been sending invalid reject messages for transactions and blocks.
* | | Merge pull request #7154Wladimir J. van der Laan2015-12-093-7/+15
|\ \ \ | | | | | | | | | | | | a3c3ddb [Qt] add InMempool() info to transaction details (Jonas Schnelli)
| * | | [Qt] add InMempool() info to transaction detailsJonas Schnelli2015-12-023-7/+15
| | | |
* | | | Merge pull request #4906Wladimir J. van der Laan2015-12-082-0/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | fc0f52d Added a test for the pruning of extraneous inputs after ApproximateBestSet (Murch) af9510e Moved set reduction to the end of ApproximateBestSubset to reduce performance impact (Murch) 5c03483 Coinselection prunes extraneous inputs from ApproximateBestSubset (AlSzacrel)
| * | | | Added a test for the pruning of extraneous inputs after ApproximateBestSetMurch2015-12-072-6/+26
| | | | |
| * | | | Moved set reduction to the end of ApproximateBestSubset to reduce ↵Murch2015-12-071-16/+11
| | | | | | | | | | | | | | | | | | | | performance impact
| * | | | Coinselection prunes extraneous inputs from ApproximateBestSubsetAlSzacrel2015-12-061-0/+13
| | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #7180Wladimir J. van der Laan2015-12-081-1/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | e3bc5e0 net: Account for `sendheaders` `verack` messages (Wladimir J. van der Laan)
| * | | | net: Account for `sendheaders` `verack` messagesWladimir J. van der Laan2015-12-071-1/+2
|/ / / / | | | | | | | | | | | | Looks like these were forgotten in #6589.
* | | | Merge pull request #6589Wladimir J. van der Laan2015-12-073-12/+66
|\ \ \ \ | | | | | | | | | | | | | | | ca188c6 log bytes recv/sent per command (Jonas Schnelli)
| * | | | log bytes recv/sent per commandJonas Schnelli2015-12-073-12/+66
| | | | |
* | | | | Merge pull request #7171Wladimir J. van der Laan2015-12-077-32/+2
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | 2f601d2 test: remove necessity to call create_callback_map (Wladimir J. van der Laan)
| * | | | test: remove necessity to call create_callback_mapWladimir J. van der Laan2015-12-047-32/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge pull request #7174Gregory Maxwell2015-12-051-6/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 96918a2 Don't do mempool lookups for "mempool" command without a filter (Matt Corallo)
| * | | | | Don't do mempool lookups for "mempool" command without a filterMatt Corallo2015-12-051-6/+7
| |/ / / /
* | | | | Merge pull request #7170Wladimir J. van der Laan2015-12-051-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | 4c40ec0 tests: Disable Tor interaction (Wladimir J. van der Laan)
| * | | | tests: Disable Tor interactionWladimir J. van der Laan2015-12-041-0/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | This is unnecessary during the current tests (any test for Tor interaction can explicitly enable it) and interferes with the proxy test.
* | | | Merge pull request #7166Wladimir J. van der Laan2015-12-041-0/+6
|\| | | | | | | | | | | | | | | 6aadc75 Disconnect on mempool requests from peers when over the upload limit. (Gregory Maxwell)
| * | | Disconnect on mempool requests from peers when over the upload limit.Gregory Maxwell2015-12-031-0/+6
|/ / / | | | | | | | | | | | | | | | 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.
* | | Merge pull request #7152Wladimir J. van der Laan2015-12-031-1/+1
|\ \ \ | | | | | | | | | | | | b440409 Add missing automake package to deb-based UNIX install instructions. (Matt Bogosian)
| * | | Add missing automake package to deb-based UNIX install instructions.Matt Bogosian2015-12-011-1/+1
| |/ /
* | | Merge pull request #7113Wladimir J. van der Laan2015-12-033-30/+75
|\ \ \ | | | | | | | | | | | | 086ee67 Switch to a more efficient rolling Bloom filter (Pieter Wuille)
| * | | Switch to a more efficient rolling Bloom filterPieter Wuille2015-11-283-30/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For each 'bit' in the filter we really maintain 2 bits, which store either: 0: not set 1-3: set in generation N After (nElements / 2) insertions, we switch to a new generation, and wipe entries which already had the new generation number, effectively switching from the last 1.5 * nElements set to the last 1.0 * nElements set. This is 25% more space efficient than the previous implementation, and can (at peak) store 1.5 times the requested amount of history (though only 1.0 times the requested history is guaranteed). The existing unit tests should be sufficient.
* | | | Merge pull request #7133Wladimir J. van der Laan2015-12-038-166/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa4b0c2 When not filtering blocks, getdata sends more in one test (Pieter Wuille) d41e44c Actually only use filterInventoryKnown with MSG_TX inventory messages. (Gregory Maxwell) b6a0da4 Only use filterInventoryKnown with MSG_TX inventory messages. (Patick Strateman) 6b84935 Rename setInventoryKnown filterInventoryKnown (Patick Strateman) e206724 Remove mruset as it is no longer used. (Gregory Maxwell) ec73ef3 Replace setInventoryKnown with a rolling bloom filter. (Gregory Maxwell)
| * | | | When not filtering blocks, getdata sends more in one testPieter Wuille2015-11-301-1/+1
| | | | |
| * | | | Actually only use filterInventoryKnown with MSG_TX inventory messages.Gregory Maxwell2015-11-301-9/+7
| | | | | | | | | | | | | | | | | | | | Previously this logic could erroneously filter a MSG_BLOCK inventory message.
| * | | | Only use filterInventoryKnown with MSG_TX inventory messages.Patick Strateman2015-11-301-2/+3
| | | | | | | | | | | | | | | | | | | | Previously this logic could erroneously filter a MSG_BLOCK inventory message.
| * | | | Rename setInventoryKnown filterInventoryKnownPatick Strateman2015-11-303-8/+8
| | | | |
| * | | | Remove mruset as it is no longer used.Gregory Maxwell2015-11-305-149/+0
| | | | |