aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge #8700: [copyright] add MIT license headers to .sh scripts where missingWladimir J. van der Laan2016-09-2011-0/+41
|\ | | | | | | 0766d1c [copyright] add MIT license headers to .sh scripts where missing (isle2983)
| * [copyright] add MIT license headers to .sh scripts where missingisle29832016-09-1111-0/+41
| | | | | | | | Years are set according to 'git log' history
* | Merge #8676: Add missing copyright headersWladimir J. van der Laan2016-09-199-0/+28
|\ \ | | | | | | | | | 783e930 [copyright] Add missing copyright headers (isle2983)
| * | [copyright] Add missing copyright headersisle29832016-09-119-0/+28
| | |
* | | Merge #8688: Move static global randomizer seeds into CConnmanWladimir J. van der Laan2016-09-197-24/+34
|\ \ \ | | | | | | | | | | | | d9ff591 Move static global randomizer seeds into CConnman (Pieter Wuille)
| * | | Move static global randomizer seeds into CConnmanPieter Wuille2016-09-197-24/+34
| | | |
* | | | Merge #8702: [copyright] add MIT License copyright header to remaining ↵Wladimir J. van der Laan2016-09-193-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Python files 4677b19 [copyright] add MIT License copyright header to remaining Python files (isle2983)
| * | | | [copyright] add MIT License copyright header to remaining Python filesisle29832016-09-113-0/+9
| | |_|/ | |/| |
* | | | Merge #8701: [copyright] add MIT License copyright header to zmq_sub.pyWladimir J. van der Laan2016-09-191-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | 37a7fe9 [copyright] add MIT License copyright header to zmq_sub.py (isle2983)
| * | | | [copyright] add MIT License copyright header to zmq_sub.pyisle29832016-09-111-0/+3
| |/ / /
* | | | Merge #8737: Trivial: UndoReadFromDisk works on undo files (rev), not on ↵Wladimir J. van der Laan2016-09-191-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | block files. b4fb512 UndoReadFromDisk works on undo files (rev), not on block files. (Pavel Janík)
| * | | | UndoReadFromDisk works on undo files (rev), not on block files.Pavel Janík2016-09-151-1/+1
| | | | |
* | | | | Merge #8750: [qa] Refactor RPCTestHandler to prevent TimeoutExpiredWladimir J. van der Laan2016-09-191-4/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | dddd04f [qa] Refactor RPCTestHandler to prevent TimeoutExpired (MarcoFalke)
| * | | | | [qa] Refactor RPCTestHandler to prevent TimeoutExpiredMarcoFalke2016-09-171-4/+10
| | | | | |
* | | | | | Merge #8707: net: fix maxuploadtarget settingWladimir J. van der Laan2016-09-193-3/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | f3552da net: fix maxuploadtarget setting (Cory Fields)
| * | | | | | net: fix maxuploadtarget settingCory Fields2016-09-143-3/+14
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was broken by 63cafa6329e1a. Note that while this fixes the settings, it doesn't fix the actual usage of -maxuploadtarget completely, as there is currently a bug in the nOptimisticBytesWritten accounting that causes a delayed response if the target is reached. That bug will be addressed separately.
* | | | | | Merge #8716: [qa] wallet: Check legacy wallet as wellWladimir J. van der Laan2016-09-191-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | fa644d0 [qa] wallet: Check legacy wallet as well (MarcoFalke)
| * | | | | | [qa] wallet: Check legacy wallet as wellMarcoFalke2016-09-141-2/+3
| | | | | | |
* | | | | | | Merge #8742: Specify Protobuf version 2 in paymentrequest.protoWladimir J. van der Laan2016-09-191-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c4084c2 Specify Protobuf version 2 in paymentrequest.proto (fanquake)
| * | | | | | | Specify Protobuf version 2 in paymentrequest.protofanquake2016-09-161-0/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge #8720: Minor change in section nameWladimir J. van der Laan2016-09-191-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | dad932c Minor change in section name (Anders Øyvind Urke-Sætre)
| * | | | | | Minor change in section nameAnders Øyvind Urke-Sætre2016-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed 'build' to 'create', as the section name have changed in newer versions of release-process.md
* | | | | | | Merge #8754: [Doc] Target protobuf 2.6 in OS X build notes.Wladimir J. van der Laan2016-09-191-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b16a7f6 [Doc] Target protobuf 2.6 in OS X build notes. (Michael Ford)
| * | | | | | | [Doc] Target protobuf 2.6 in OS X build notes.Michael Ford2016-09-181-1/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | Homebrew now installs Protobuf version 3 by default, which doesn't currently compile. Install Protobuf 2.6.x from the versions tap instead.
* | | | | | | Merge #8494: [init, wallet] ParameterInteraction() iff wallet enabledWladimir J. van der Laan2016-09-191-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fa5d276 [init] ParameterInteraction() iff wallet enabled (MarcoFalke)
| * | | | | | | [init] ParameterInteraction() iff wallet enabledMarcoFalke2016-08-101-1/+1
| | | | | | | |
* | | | | | | | Merge #8724: [qa] walletbackup: Sync blocks inside the loopMarcoFalke2016-09-191-3/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | fad41f3 [qa] walletbackup: Sync blocks inside the loop (MarcoFalke)
| * | | | | | | | [qa] walletbackup: Sync blocks inside the loopMarcoFalke2016-09-141-3/+4
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge #8740: net: No longer send local address in addrMeWladimir J. van der Laan2016-09-191-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | d9c99c3 net: No longer send local address in addrMe (Wladimir J. van der Laan)
| * | | | | | | net: No longer send local address in addrMeWladimir J. van der Laan2016-09-151-1/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After #8594 the addrFrom sent by a node is not used anymore at all, so don't bother sending it. Also mitigates the privacy issue in (#8616). It doesn't completely solve the issue as GetLocalAddress is also called in AdvertiseLocal, but at least when advertising addresses it stands out less as *our* address.
* | | | | | | Merge #8713: [qa] create_cache: Delete temp dir when doneMarcoFalke2016-09-161-2/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | fa27d99 [qa] create_cache: Delete temp dir when done (MarcoFalke)
| * | | | | | [qa] create_cache: Delete temp dir when doneMarcoFalke2016-09-131-2/+8
| | |_|/ / / | |/| | | |
* | | | | | Merge #8714: [qa] gitignore: Remove unused linesMarcoFalke2016-09-141-3/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | 1111ddb gitignore: Remove unused lines (MarcoFalke)
| * | | | | gitignore: Remove unused linesMarcoFalke2016-09-131-3/+0
| |/ / / /
* | | | | Merge #8715: net: only delete CConnman if it's been createdWladimir J. van der Laan2016-09-142-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 36fa01f net: only delete CConnman if it's been created (Cory Fields)
| * | | | | net: only delete CConnman if it's been createdCory Fields2016-09-132-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of (for example) an already-running bitcoind, the shutdown sequence begins before CConnman has been created, leading to a null-pointer dereference when g_connman->Stop() is called. Instead, Just let the CConnman dtor take care of stopping.
* | | | | Merge #8712: Remove maxuploadtargets recommended minimumJonas Schnelli2016-09-142-6/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | 1b6bcdd Remove maxuploadtargets recommended minimum (Jonas Schnelli)
| * | | | Remove maxuploadtargets recommended minimumJonas Schnelli2016-09-132-6/+1
|/ / / /
* | | | Merge #8693: add witness address to address bookWladimir J. van der Laan2016-09-131-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | 62ffbbd add witness address to address book (instagibbs)
| * | | | add witness address to address bookinstagibbs2016-09-091-0/+2
| | | | |
* | | | | Merge #8699: Remove createwitnessaddress RPC commandWladimir J. van der Laan2016-09-131-38/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 86c3f8d Remove createwitnessaddress (Johnson Lau)
| * | | | | Remove createwitnessaddressJohnson Lau2016-09-131-38/+0
| | |_|/ / | |/| | | | | | | | | | | | | This RPC command is unsafe as it will return an address even if the script is invalid.
* | | | | Merge #8652: [qa]: remove root test directory for RPC testsMarcoFalke2016-09-132-4/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c62cc4e fix path for bak file (whythat) 438e94d remove root test directory for RPC tests (whythat)
| * | | | | fix path for bak filewhythat2016-09-051-3/+3
| | | | | |
| * | | | | remove root test directory for RPC testswhythat2016-09-051-1/+4
| | | | | |
* | | | | | Merge #8601: Add option to opt into full-RBF when sending funds (rebase, ↵Wladimir J. van der Laan2016-09-132-3/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | original by petertodd) 86726d8 Rename `-optintofullrbf` option to `-walletrbf` (Wladimir J. van der Laan) 05fa823 wallet: Add BIP125 comment for MAXINT-1/-2 behavior (Wladimir J. van der Laan) 152f45b Add option to opt into full-RBF when sending funds (Peter Todd)
| * | | | | | Rename `-optintofullrbf` option to `-walletrbf`Wladimir J. van der Laan2016-09-132-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it clear that this is a wallet option.
| * | | | | | wallet: Add BIP125 comment for MAXINT-1/-2 behaviorWladimir J. van der Laan2016-08-261-0/+6
| | | | | | |
| * | | | | | Add option to opt into full-RBF when sending fundsPeter Todd2016-08-262-3/+9
| | | | | | |
* | | | | | | Merge #8697: fix op order to append first alertWladimir J. van der Laan2016-09-131-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1d635ae fix op order to append first alert (rodasmith)