aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge #7402: [devtools] github-merge get toplevel dir without extra whitespaceWladimir J. van der Laan2016-01-251-1/+1
|\ | | | | | | 5ed2f16 [devtools] github-merge get toplevel dir without extra whitespace (Andrew C)
| * [devtools] github-merge get toplevel dir without extra whitespaceAndrew C2016-01-251-1/+1
| | | | | | | | Fixes a bug in github merge when it runs the tests where the toplevel directory has an extra '\n' appended to the path string. Now it doesn't.
* | Merge #7395: devtools: show pull and commit information in github-mergeWladimir J. van der Laan2016-01-251-0/+12
|\ \ | | | | | | | | | 17b5d38 devtools: show pull and commit information in github-merge (Wladimir J. van der Laan)
| * | devtools: show pull and commit information in github-mergeWladimir J. van der Laan2016-01-221-0/+12
| | | | | | | | | | | | | | | Print the number and title of the pull, as well as the commits to be merged.
* | | Merge #7400: Add achow101's pgp keyWladimir J. van der Laan2016-01-251-0/+52
|\ \ \ | |_|/ |/| | | | | e99edc1 Add achow101's pgp key (Andrew C)
| * | Add achow101's pgp keyAndrew C2016-01-231-0/+52
|/ /
* | Merge #7384: [qt] Peertable: Increase SUBVERSION_COLUMN_WIDTHJonas Schnelli2016-01-231-1/+1
|\ \ | | | | | | | | | faa9011 [qt] Peertable: Increase SUBVERSION_COLUMN_WIDTH (MarcoFalke)
| * | [qt] Peertable: Increase SUBVERSION_COLUMN_WIDTHMarcoFalke2016-01-201-1/+1
| | |
* | | Merge #7236: Use createrawtx locktime parm in txn_cloneWladimir J. van der Laan2016-01-221-14/+3
|\ \ \ | |_|/ |/| | | | | e279038 Use createrawtx locktime parm in txn_clone (Tom Harding)
| * | Use createrawtx locktime parm in txn_cloneTom Harding2015-12-201-14/+3
| | | | | | | | | | | | | | | Streamlines the test and serves as a test of the createrawtransaction locktime parameter.
* | | Merge #7262: Reduce inefficiency of GetAccountAddress()Wladimir J. van der Laan2016-01-221-16/+15
|\ \ \ | | | | | | | | | | | | 2409865 Reduce inefficiency of GetAccountAddress() (Chris Moore)
| * | | Reduce inefficiency of GetAccountAddress()Chris Moore2015-12-281-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | Don't scan the wallet to see if the current key has been used if we're going to make a new key anyway. Stop scanning the wallet as soon as we see that the current key has been used. Don't call isValid() twice on the current key.
* | | | Merge #7056: Save last db readWladimir J. van der Laan2016-01-223-13/+11
|\ \ \ \ | | | | | | | | | | | | | | | 8504867 Save the last unnecessary database read (Alex Morcos)
| * | | | Save the last unnecessary database readAlex Morcos2015-11-183-13/+11
| | | | | | | | | | | | | | | | | | | | It's possible coins with the same hash exist when you create a duplicate coinbase, so previously we were reading from the database to make sure we had the old coins cached so if we were to spend the new ones, the old ones would also be spent. This pull instead just marks the new coins as not fresh if they are from a coinbase, so if they are spent they will be written all the way down to the database anyway overwriting any duplicates.
* | | | | Merge #7177: [qa] Change default block priority size to 0Wladimir J. van der Laan2016-01-227-20/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | fa8e2a6 [qa] Change default block priority size to 0 (MarcoFalke)
| * | | | | [qa] Change default block priority size to 0MarcoFalke2016-01-207-20/+18
| | |_|_|/ | |/| | |
* | | | | Merge #7364: [qt] Windows: Make rpcconsole monospace font largerJonas Schnelli2016-01-221-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | fa6a59d [qt] Windows: Make rpcconsole monospace font larger (MarcoFalke)
| * | | | | [qt] Windows: Make rpcconsole monospace font largerMarcoFalke2016-01-171-0/+4
| | | | | |
* | | | | | Merge #7386: Add option `-permitrbf` to set transaction replacement policyWladimir J. van der Laan2016-01-213-4/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | b768108 Add option `-permitrbf` to set transaction replacement policy (Wladimir J. van der Laan)
| * | | | | | Add option `-permitrbf` to set transaction replacement policyWladimir J. van der Laan2016-01-213-4/+13
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a configuration option `-permitrbf` to set transaction replacement policy for the mempool. Enabling it will enable (opt-in) RBF, disabling it will refuse all conflicting transactions.
* | | | | | Merge #7383: [Qt] rename "amount" to "requested amount" in receive coins tableJonas Schnelli2016-01-213-8/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | df6e8e1 [Qt] rename "amount" to "requested amount" in receive coins table (Jonas Schnelli)
| * | | | | | [Qt] rename "amount" to "requested amount" in receive coins tableJonas Schnelli2016-01-203-8/+4
| | | | | | |
* | | | | | | Merge #7183: Improved readability of ApproximateBestSubsetWladimir J. van der Laan2016-01-201-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 96efcad Improved readability of sorting for coin selection. (Murch)
| * | | | | | | Improved readability of sorting for coin selection.Murch2016-01-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Future proofing added lines
* | | | | | | | Merge #7307: [RPC, Wallet] Move RPC dispatch table registration to wallet/ codeWladimir J. van der Laan2016-01-208-93/+106
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | dd2dc40 [RPC, Wallet] Move RPC dispatch table registration to wallet/ code (Jonas Schnelli)
| * | | | | | | [RPC, Wallet] Move RPC dispatch table registration to wallet/ codeJonas Schnelli2016-01-208-93/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow extending the rpc dispatch table by appending commands when server is not running.
* | | | | | | | Merge #7222: RPC: Indicate which transactions are signaling opt-in RBFWladimir J. van der Laan2016-01-205-0/+199
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | eaa8d27 RPC: indicate which transactions are replaceable (Suhas Daftuar)
| * | | | | | | | RPC: indicate which transactions are replaceableSuhas Daftuar2016-01-195-0/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "bip125-replaceable" output field to listtransactions and gettransaction which indicates if an unconfirmed transaction, or any unconfirmed parent, is signaling opt-in RBF according to BIP 125.
* | | | | | | | | Merge pull request #7378Wladimir J. van der Laan2016-01-204-189/+227
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da6d18b devtools: replace github-merge with python version (Wladimir J. van der Laan)
| * | | | | | | | | devtools: replace github-merge with python versionWladimir J. van der Laan2016-01-204-189/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is meant to be a direct translation of the bash script, with the difference that it retrieves the PR title from github, thus creating pull messages like: Merge #12345: Expose transaction temperature over RPC
* | | | | | | | | | Merge #7350: Banlist updatesWladimir J. van der Laan2016-01-201-24/+30
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8600c9 banlist (bugfix): allow CNode::SweepBanned() to run on interval (Philip Kaufmann) 2977c24 banlist: add more banlist infos to log / add GUI signal (Philip Kaufmann) ce479aa banlist: better handling of banlist in StartNode() (Philip Kaufmann) 57c77fe banlist: update set dirty to be more fine grained (Philip Kaufmann)
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into 20150703_banlist_updatesLuke Dashjr2016-01-15623-14177/+40712
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | banlist (bugfix): allow CNode::SweepBanned() to run on intervalPhilip Kaufmann2015-10-021-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - allows CNode::SweepBanned() to run, even if !CNode::BannedSetIsDirty(), because if nBanUntil is over we want the ban to be disabled for these nodes
| * | | | | | | | | | | banlist: add more banlist infos to log / add GUI signalPhilip Kaufmann2015-10-021-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - to match the peers.dat handling also supply a debug.log entry for how many entries were loaded from banlist.dat and how long it took - add a GUI init message for loading the banlist (same as with peers.dat) - move the same message for peers.dat upwards in the code, to be able to reuse the timing variable nStart and also just log, if our read from peers.dat didn't fail
| * | | | | | | | | | | banlist: better handling of banlist in StartNode()Philip Kaufmann2015-10-021-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - only start working on/with banlist data, if reading in the banlist from disk didn't fail - as CNode::setBannedIsDirty is false (default) when reading fails, we don't need to explicitly set it to false to prevent writing banlist.dat in that case either
| * | | | | | | | | | | banlist: update set dirty to be more fine grainedPhilip Kaufmann2015-10-021-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - move the SetBannedSetDirty(false) call from DumpData() into DumpBanlist() - ensure we only set false, if the write succeeded
* | | | | | | | | | | | Merge #7328: Update README.md website linkWladimir J. van der Laan2016-01-203-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b07b103 Update project URL (BtcDrak)
| * | | | | | | | | | | | Update project URLBtcDrak2016-01-153-3/+3
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge #7060: build: Make networking work inside LXC builder in ↵Wladimir J. van der Laan2016-01-204-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gitian-building.md 3b468a0 gitian: Need `ca-certificates` and `python` for LXC builds (Wladimir J. van der Laan) 99fda26 doc: Make networking work inside builder in gitian-building.md (Wladimir J. van der Laan)
| * | | | | | | | | | | | gitian: Need `ca-certificates` and `python` for LXC buildsWladimir J. van der Laan2016-01-184-1/+7
| | | | | | | | | | | | |
| * | | | | | | | | | | | doc: Make networking work inside builder in gitian-building.mdWladimir J. van der Laan2016-01-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are changes I needed to get gitian building to work with Debian 8.2, which is the version we tell to use. - Set up NAT, so that container can access network beyond host - Remove explicit cgroup setup - these are mounted automatically now
* | | | | | | | | | | | | Merge #7381: [walletdb] Fix syntax error in key parserWladimir J. van der Laan2016-01-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | fa6d4cc [walletdb] Fix syntax error in key parser (MarcoFalke)
| * | | | | | | | | | | | [walletdb] Fix syntax error in key parserMarcoFalke2016-01-201-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #7281: Improve CheckInputs() comment about sig verificationWladimir J. van der Laan2016-01-191-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd83615 Improve CheckInputs() comment about sig verification (Peter Todd)
| * | | | | | | | | | | | Improve CheckInputs() comment about sig verificationPeter Todd2016-01-031-3/+6
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #7164: Do not download transactions during initial ↵Wladimir J. van der Laan2016-01-194-5/+37
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blockchain sync 39a525c Do not download transactions during inital sync (ptschip)
| * | | | | | | | | | | Do not download transactions during inital syncptschip2015-12-154-5/+37
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #7280Wladimir J. van der Laan2016-01-193-0/+52
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | faeda0e [travis] Run contrib/devtools/check-doc.py early (MarcoFalke) fada0c9 [travis] Fail when documentation is outdated (MarcoFalke)
| * | | | | | | | | | | | [travis] Run contrib/devtools/check-doc.py earlyMarcoFalke2016-01-182-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | [travis] Fail when documentation is outdatedMarcoFalke2016-01-043-0/+52
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |