aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-09-25Merge pull request #5264Wladimir J. van der Laan
af3208b Resolve issue 3166. These changes decode valid SIGHASH types on signatures in assembly (asm) representations of scriptSig scripts. This squashed commit incorporates substantial helpful feedback from jtimon, laanwj, and sipa. (mruddy)
2015-09-25Merge pull request #6619Wladimir J. van der Laan
42cf089 depends: bump ccache to 3.2.3 (fanquake) 888c595 depends: bump miniupnpc to 1.9.20150730 (fanquake)
2015-09-25Merge pull request #6721Wladimir J. van der Laan
da47fe0 Add java-libbitcoinconsensus as example to documentation (dexX7)
2015-09-24Add java-libbitcoinconsensus as example to documentationdexX7
java-libbitcoinconsensus is a wrapper around libbitcoinconsensus, which uses JNA to demonstrate a potential integration in Java.
2015-09-24Merge pull request #6664Wladimir J. van der Laan
51ff777 [trivial] Fix rpc message "help generate" (MarcoFalke) 4c3cab1 [trivial] init cleanup (MarcoFalke)
2015-09-24Merge pull request #6600Wladimir J. van der Laan
b0beae8 Drop "with minimal dependencies" from description (Zak Wilcox) 5e5e00b Split bitcoin-tx into its own package (Zak Wilcox) 05179f7 Include bitcoin-tx binary on Debian/Ubuntu (Zak Wilcox)
2015-09-24Merge pull request #6715Wladimir J. van der Laan
60de0d5 Fix mempool package tracking edge case (Suhas Daftuar) 598b25d Add test showing bug in mempool packages (Suhas Daftuar)
2015-09-23Fix mempool package tracking edge caseSuhas Daftuar
CalculateMemPoolAncestors was always looping over a transaction's inputs to find in-mempool parents. When adding a new transaction, this is the correct behavior, but when removing a transaction, we want to use the ancestor set that would be calculated by walking mapLinks (which should in general be the same set, except during a reorg when the mempool is in an inconsistent state, and the mapLinks-based calculation would be the correct one).
2015-09-23Add test showing bug in mempool packagesSuhas Daftuar
2015-09-23Merge pull request #6550Wladimir J. van der Laan
3b33ec8 Avoid duplicate CheckBlock checks (Pieter Wuille) 391dff1 Do not store Merkle branches in the wallet. (Pieter Wuille)
2015-09-23Merge pull request #6653Wladimir J. van der Laan
4dee609 Rename rpcconsole.ui => debugwindow.ui (MarcoFalke) 0d0a2d6 [Qt] Raise debug window when requested (MarcoFalke)
2015-09-23Merge pull request #6645Wladimir J. van der Laan
77c6072 Enable wallet key imports without rescan in pruned mode. (Gregory Maxwell)
2015-09-23Merge pull request #6688Wladimir J. van der Laan
131c23d Fix locking in GetTransaction. (Alex Morcos)
2015-09-23Merge pull request #6148Wladimir J. van der Laan
ae6f957 Enable block relay when pruning (Suhas Daftuar) 0da6ae2 Do not inv old or missing blocks when pruning (Suhas Daftuar)
2015-09-23Merge pull request #6646Wladimir J. van der Laan
6ecaec3 [Trivial] [logging] Rm extraneous cleansubver in serveral debug messages. (Gregory Maxwell)
2015-09-23Rename rpcconsole.ui => debugwindow.uiMarcoFalke
2015-09-23[Qt] Raise debug window when requestedMarcoFalke
* Raise the debug window when hidden behind other windows * Switch to the debug window when on another virtual desktop * Show the debug window when minimized This change is a conceptual copy of 5ffaaba and 382e9e2
2015-09-22Avoid duplicate CheckBlock checksPieter Wuille
2015-09-22Do not store Merkle branches in the wallet.Pieter Wuille
Assume that when a wallet transaction has a valid block hash and transaction position in it, the transaction is actually there. We're already trusting wallet data in a much more fundamental way anyway. To prevent backward compatibility issues, a new record is used for storing the block locator in the wallet. Old wallets will see a wallet file synchronized up to the genesis block, and rescan automatically.
2015-09-22Merge pull request #6315Wladimir J. van der Laan
7aac6db [QT] dump banlist to disk in case of ban/unban over QT (Jonas Schnelli) 7f90ea7 [QA] adabt QT_NO_KEYWORDS for QT ban implementation (Jonas Schnelli) 07f70b2 [QA] fix netbase tests because of new CSubNet::ToString() output (Jonas Schnelli) 4ed0510 [Qt] call DumpBanlist() when baning unbaning nodes (Philip Kaufmann) be89292 [Qt] reenabling hotkeys for ban context menu, use different words (Jonas Schnelli) b1189cf [Qt] adapt QT ban option to banlist.dat changes (Jonas Schnelli) 65abe91 [Qt] add sorting for bantable (Philip Kaufmann) 51654de [Qt] bantable polish (Philip Kaufmann) cdd72cd [Qt] simplify ban list signal handling (Philip Kaufmann) 43c1f5b [Qt] remove unused timer-code from banlistmodel.cpp (Jonas Schnelli) e2b8028 net: Fix CIDR notation in ToString() (Wladimir J. van der Laan) 9e521c1 [Qt] polish ban table (Philip Kaufmann) 607809f net: use CIDR notation in CSubNet::ToString() (Jonas Schnelli) 53caec6 [Qt] bantable overhaul (Jonas Schnelli) f0bcbc4 [Qt] bantable fix timestamp 64bit issue (Jonas Schnelli) 6135309 [Qt] banlist, UI optimizing and better signal handling (Jonas Schnelli) 770ca79 [Qt] add context menu with unban option to ban table (Jonas Schnelli) 5f42132 [Qt] add ui signal for banlist changes (Jonas Schnelli) ad204df [Qt] add banlist table below peers table (Jonas Schnelli) 50f0908 [Qt] add ban functions to peers window (Jonas Schnelli)
2015-09-22Merge pull request #6652Wladimir J. van der Laan
a09db7c [trivial] Minor format fixes (MarcoFalke) 0574ede doc: update release-notes and bips.md for BIP111 (Wladimir J. van der Laan)
2015-09-22[trivial] Minor format fixesMarcoFalke
2015-09-22Merge pull request #6647Wladimir J. van der Laan
1c1b1b3 [uacomment] Sanitize per BIP-0014 (MarcoFalke)
2015-09-22Merge pull request #6694Wladimir J. van der Laan
24cb7c7 [QT] fix thin space word wrap line brake issue (Jonas Schnelli)
2015-09-22Merge pull request #6709Wladimir J. van der Laan
99ee4a6 Fix spelling of Qt (Diego Viola)
2015-09-22Fix spelling of QtDiego Viola
2015-09-21Merge pull request #6667Wladimir J. van der Laan
2eb3183 [doc] Merge doc/assets-attribution.md into contrib/debian/copyright (MarcoFalke) 9be08b7 Update contrib/debian/copyright (MarcoFalke)
2015-09-21Merge pull request #6668Wladimir J. van der Laan
9b1cdd7 [trivial] Remove obsolete pixmaps (MarcoFalke) d1acf93 [qt] [trivial] share/qt/make_spinner.py => src/qt/res/movies/makespinner.sh (MarcoFalke)
2015-09-21Merge pull request #6671Wladimir J. van der Laan
0186228 Update trusted-git-root to the most recent unsigned commit (Matt Corallo)
2015-09-21Merge pull request #6695Wladimir J. van der Laan
ddf98d1 Make RPC tests cope with server-side timeout between requests (Wladimir J. van der Laan) 2190ea6 rpc: Split option -rpctimeout into -rpcservertimeout and -rpcclienttimeout (Wladimir J. van der Laan) 8b2d6ed http: Disable libevent debug logging, if not explicitly enabled (Wladimir J. van der Laan) 5ce43da init: Ignore SIGPIPE (Wladimir J. van der Laan)
2015-09-21Make RPC tests cope with server-side timeout between requestsWladimir J. van der Laan
Python's httplib does not graciously handle disconnections from the http server, resulting in BadStatusLine errors. See https://bugs.python.org/issue3566 "httplib persistent connections violate MUST in RFC2616 sec 8.1.4." This was fixed in Python 3.5. Work around it for now.
2015-09-21rpc: Split option -rpctimeout into -rpcservertimeout and -rpcclienttimeoutWladimir J. van der Laan
The two timeouts for the server and client, are essentially different: - In the case of the server it should be a lower value to avoid clients clogging up connection slots - In the case of the client it should be a high value to accomedate slow responses from the server, for example for slow queries or when the lock is contended Split the options into `-rpcservertimeout` and `-rpcclienttimeout` with respective defaults of 30 and 900.
2015-09-21Merge pull request #6654Wladimir J. van der Laan
5add7a7 Track transaction packages in CTxMemPoolEntry (Suhas Daftuar) 34628a1 TxMemPool: Change mapTx to a boost::multi_index_container (Ashley Holman)
2015-09-21http: Disable libevent debug logging, if not explicitly enabledWladimir J. van der Laan
Add a option "-debug=libevent" to enable libevent debugging for troubleshooting. Libevent logging is redirected to our own log.
2015-09-20[QT] dump banlist to disk in case of ban/unban over QTJonas Schnelli
2015-09-19Track transaction packages in CTxMemPoolEntrySuhas Daftuar
Associate with each CTxMemPoolEntry all the size/fees of descendant mempool transactions. Sort mempool by max(feerate of entry, feerate of descendants). Update statistics on-the-fly as transactions enter or leave the mempool. Also add ancestor and descendant limiting, so that transactions can be rejected if the number or size of unconfirmed ancestors exceeds a target, or if adding a transaction would cause some other mempool entry to have too many (or too large) a set of unconfirmed in- mempool descendants.
2015-09-19TxMemPool: Change mapTx to a boost::multi_index_containerAshley Holman
Indexes on: - Tx Hash - Fee Rate (fee-per-kb)
2015-09-18[doc] Merge doc/assets-attribution.md into contrib/debian/copyrightMarcoFalke
Even though the SVG source files are never used in the QT client, their authors are mentioned in contrib/debian/copyright due to simplicity.
2015-09-18Merge pull request #6692Wladimir J. van der Laan
3802ae7 devtools: don't push if signing fails in github-merge (Wladimir J. van der Laan)
2015-09-18init: Ignore SIGPIPEWladimir J. van der Laan
Ignore SIGPIPE on all non-win32 OSes, otherwise an unexpectedly disconnecting RPC client will terminate the application. This problem was introduced with the libhttp-based RPC server. Fixes #6660.
2015-09-18[QT] fix thin space word wrap line brake issueJonas Schnelli
The thin space QT html hack results in cut-off chars/nums after a line break. Avoid word wrap line breaks by using a smaller font and a line break before each alternative value)
2015-09-18devtools: don't push if signing fails in github-mergeWladimir J. van der Laan
If a problem happens with gpg, exit prematurely so that it doesn't push the branch upstream.
2015-09-18Merge pull request #6422Wladimir J. van der Laan
c73a8ea Clarifying offline build process using gbuild --url and noting it is not done automatically. (Midnight Magic)
2015-09-17Fix locking in GetTransaction.Alex Morcos
GetTransaction needs to lock cs_main until ReadBlockFromDisk completes, the data inside CBlockIndex's can change since pruning. This lock was held by all calls to GetTransaction except rest_tx.
2015-09-17Clarifying offline build process using gbuild --url and noting it is notMidnight Magic
done automatically. At some point along the line, fully offline builds were no longer happening when strictly following the release-process.md instructions. We should ensure that users who might want to torify or build offline need to take extra steps to remain offline. Also, corrections to build process: including gverify examples for new builders.
2015-09-17Temporarily disable ZMQ tests in bitcoin test suiteJeff Garzik
2015-09-17Merge pull request #6685Jeff Garzik
2015-09-17fix rpc-tests.shJonas Schnelli
`${testScripts[@]}` now does split up `testscript --agument` in two elements pushed to the array (`testscript` and `--agument`).
2015-09-17Merge pull request #6684Jeff Garzik
Fixes #6682
2015-09-17depends: fix platform specific packages variableJonas Schnelli
prefix instead of postfix