aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Move SetMinVersion for FEATURE_HD to SetHDMasterKeyPatrick Strateman2016-07-191-3/+3
|
* Merge #8367: [Wallet] Ensure <0.13 clients can't open HD walletsWladimir J. van der Laan2016-07-192-1/+5
|\ | | | | | | a4f137f [Wallet] Ensure <0.13 clients can't open HD wallets (Jonas Schnelli)
| * [Wallet] Ensure <0.13 clients can't open HD walletsJonas Schnelli2016-07-182-1/+5
| |
* | Merge #8363: Rename "block cost" to "block weight"Wladimir J. van der Laan2016-07-1918-69/+69
|\ \ | |/ |/| | | 2c06bae Rename "block cost" to "block weight" (Suhas Daftuar)
| * Rename "block cost" to "block weight"Suhas Daftuar2016-07-1818-69/+69
|/
* doc: Clean out release notesWladimir J. van der Laan2016-07-181-137/+8
| | | | | | Now that 0.13 has branched, release notes for 0.13 should be maintained there, and the release notes file on master is for 0.14 release notes.
* build: bump version to 0.13.99Wladimir J. van der Laan2016-07-185-5/+5
| | | | Now that 0.13 branch has been split off, master is 0.13.99 (pre-0.14).
* qt: periodic translations updateWladimir J. van der Laan2016-07-1810-31/+153
|
* Merge #8359: mining: Improve `-blockmaxcost` help messageWladimir J. van der Laan2016-07-181-1/+1
|\ | | | | | | 8cef5bd mining: Improve `-blockmaxcost` help message (Wladimir J. van der Laan)
| * mining: Improve `-blockmaxcost` help messageWladimir J. van der Laan2016-07-181-1/+1
|/ | | | One-word replacement to #8354.
* Merge #8320: Fix 0.12 release notes on block relayingWladimir J. van der Laan2016-07-181-4/+8
|\ | | | | | | d6dc1bc Fix 0.12 release notes on block relaying (Krzysztof Jurewicz)
| * Fix 0.12 release notes on block relayingKrzysztof Jurewicz2016-07-081-4/+8
| | | | | | | | | | | | The previous information about block relaying in pruned mode suggested that blocks are relayed only to nodes that support BIP 130, which is not true.
* | Merge #8295: Mining-related fixups for 0.13.0Wladimir J. van der Laan2016-07-185-89/+36
|\ \ | | | | | | | | | | | | | | | | | | | | | c1d61fb Add warning if -blockminsize is used. (Suhas Daftuar) 27362dd Remove -blockminsize option (Suhas Daftuar) d2e46e1 Remove addScoreTxs() (Suhas Daftuar) 6dd4bc2 Exclude witness transactions in addPackageTxs() pre-segwit activation (Suhas Daftuar) f15c2cd CreateNewBlock: add support for size-accounting to addPackageTxs (Suhas Daftuar)
| * | Add warning if -blockminsize is used.Suhas Daftuar2016-07-052-1/+4
| | |
| * | Remove -blockminsize optionSuhas Daftuar2016-06-304-10/+3
| | |
| * | Remove addScoreTxs()Suhas Daftuar2016-06-302-64/+2
| | |
| * | Exclude witness transactions in addPackageTxs() pre-segwit activationSuhas Daftuar2016-06-302-6/+14
| | |
| * | CreateNewBlock: add support for size-accounting to addPackageTxsSuhas Daftuar2016-06-272-11/+16
| | | | | | | | | | | | | | | Includes a change to not continue to use size-accounting in addScoreTxs or addPackageTxs just because addPriorityTxs() is used.
* | | Merge #8323: Add HD keypath to CKeyMetadata, report metadata in validateaddressWladimir J. van der Laan2016-07-186-7/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7945088 [Wallet] comsetic non-code changes for the HD feature (Jonas Schnelli) 68d7682 [Wallet] ensure CKeyMetadata.hdMasterKeyID will be cleared during SetNull() (Jonas Schnelli) f708085 [QA] extend wallet-hd test to cover HD metadata (Jonas Schnelli) 986c223 [Wallet] print hd masterkeyid in getwalletinfo (Jonas Schnelli) b1c7b24 [Wallet] report optional HDKeypath/HDMasterKeyId in validateaddress (Jonas Schnelli) 5b95dd2 [Wallet] extend CKeyMetadata with HD keypath (Jonas Schnelli)
| * | | [Wallet] comsetic non-code changes for the HD featureJonas Schnelli2016-07-154-9/+9
| | | |
| * | | [Wallet] ensure CKeyMetadata.hdMasterKeyID will be cleared during SetNull()Jonas Schnelli2016-07-151-2/+2
| | | |
| * | | [QA] extend wallet-hd test to cover HD metadataJonas Schnelli2016-07-091-0/+10
| | | |
| * | | [Wallet] print hd masterkeyid in getwalletinfoJonas Schnelli2016-07-092-0/+5
| | | |
| * | | [Wallet] report optional HDKeypath/HDMasterKeyId in validateaddressJonas Schnelli2016-07-091-0/+8
| | | |
| * | | [Wallet] extend CKeyMetadata with HD keypathJonas Schnelli2016-07-092-1/+14
| | |/ | |/|
* | | Merge #8305: Improve handling of unconnecting headersWladimir J. van der Laan2016-07-183-1/+145
|\ \ \ | | | | | | | | | | | | | | | | e91cf4b Add test for handling of unconnecting headers (Suhas Daftuar) 96fa953 Improve handling of unconnecting headers (Suhas Daftuar)
| * | | Add test for handling of unconnecting headersSuhas Daftuar2016-07-121-0/+105
| | | |
| * | | Improve handling of unconnecting headersSuhas Daftuar2016-07-122-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When processing a headers message that looks like a block announcement, send peer a getheaders if the headers message won't connect. Apply DoS points after too many consecutive unconnecting headers messages.
* | | | Merge #8324: [Wallet] keep HD seed during salvagewalletWladimir J. van der Laan2016-07-142-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | b993671 [Wallet] keep HD seed during salvagewallet (Jonas Schnelli)
| * | | | [Wallet] keep HD seed during salvagewalletJonas Schnelli2016-07-092-2/+2
| | |/ / | |/| |
* | | | Merge #8340: [qa] Solve trivial merge conflict in p2p-segwit.pyMarcoFalke2016-07-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | 66668c4 [qa] Solve merge conflict of 4324bd237c3147fc153ba5046c211f03e8ac956a (MarcoFalke)
| * | | | [qa] Solve merge conflict of 4324bd237c3147fc153ba5046c211f03e8ac956aMarcoFalke2016-07-141-1/+1
|/ / / /
* | | | Merge #8312: Fix mempool DoS vulnerability from malleated transactionsWladimir J. van der Laan2016-07-142-8/+56
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 46c9620 Test that unnecessary witnesses can't be used for mempool DoS (Suhas Daftuar) bb66a11 Fix DoS vulnerability in mempool acceptance (Suhas Daftuar)
| * | | | Test that unnecessary witnesses can't be used for mempool DoSSuhas Daftuar2016-07-071-3/+51
| | | | | | | | | | | | | | | | | | | | | | | | | Check that pre-segwit activation, unnecessary witnesses won't cause a txid to be permanently rejected.
| * | | | Fix DoS vulnerability in mempool acceptanceSuhas Daftuar2016-07-071-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves the IsStandard check to happen after the premature-witness check, so that adding a witness to a transaction can't prevent mempool acceptance. Note that this doesn't address the broader category of potential mempool DoS issues that affect transactions after segwit activation.
* | | | | Merge #8311: Rename CTxinWitness -> CTxInWitnessWladimir J. van der Laan2016-07-146-40/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 36ae37a Rename CTxinWitness -> CTxInWitness (Bob McElrath)
| * | | | | Rename CTxinWitness -> CTxInWitnessBob McElrath2016-07-066-40/+40
| |/ / / /
* | | | | Merge #8271: [bugfix] Do not send witnesses in cmpctblockWladimir J. van der Laan2016-07-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 252675e Do not send witnesses in cmpctblock (Pieter Wuille)
| * | | | | Do not send witnesses in cmpctblockPieter Wuille2016-06-261-1/+1
| | |_|_|/ | |/| | |
* | | | | qt: periodic translation updateWladimir J. van der Laan2016-07-1254-422/+574
| | | | | | | | | | | | | | | | | | | | | | | | | Added languages: - `bg_BG`: Bulgarian (Bulgaria)
* | | | | Merge #8317: [rpcwallet] Don't use floating pointWladimir J. van der Laan2016-07-111-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 477777f [rpcwallet] Don't use floating point (MarcoFalke)
| * | | | | [rpcwallet] Don't use floating pointMarcoFalke2016-07-081-3/+3
| | | | | |
* | | | | | Merge #8289: bash-completion: Adapt for 0.12 and 0.13Wladimir J. van der Laan2016-07-115-100/+224
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | 1ba3db6 bash-completion: Adapt for 0.12 and 0.13 (Christian von Roques)
| * | | | | bash-completion: Adapt for 0.12 and 0.13Christian von Roques2016-07-075-100/+224
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * separate completion for bitcoind and bitcoin-cli * remove RPC support from bitcoind completion * add completion for bitcoin-tx and bitcoin-qt * rely on autoloading of completions
* | | | | Merge #8314: Fix pkg-config issues for 0.13Wladimir J. van der Laan2016-07-082-13/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b556bed build: fix Windows builds without pkg-config (Cory Fields) 0c928cb build: Fix Qt5PlatformSupport check without pkg-config (Cory Fields)
| * | | | | build: fix Windows builds without pkg-configCory Fields2016-07-071-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - guard PKG_PROG_PKG_CONFIG with an m4_ifdef. If not building for windows, require it - add nops as necessary in case the ifdef reduces the if/then to nothing - AC_SUBST some missing _LIBS. These were split out over time, but not all were properly substituted. They continued to work if pkg-config is installed because it does the AC_SUBST itself
| * | | | | build: Fix Qt5PlatformSupport check without pkg-configCory Fields2016-07-071-4/+16
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The non-pkg-config case can't use pkg-config to check the version. Also, make sure that the check is properly guarded in the case of missing pkg-config macros.
* | | | | Merge #8315: gitian: Don't require sudo for Linux.Wladimir J. van der Laan2016-07-081-6/+34
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | 099d4b0 gitian: use a wrapped gcc/g++ to avoid the need for a system change (Cory Fields)
| * | | | gitian: use a wrapped gcc/g++ to avoid the need for a system changeCory Fields2016-07-071-6/+34
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | C_INCLUDE_PATH and CPLUS_INCLUDE_PATH work globally as though -isystem was used for each invocation. Since that changes the build results, force a rebuild of x86 depends by adding the value to $HOST_ID_SALT.
* | | | Merge #7540: Rename OP_NOP3 to OP_CHECKSEQUENCEVERIFYWladimir J. van der Laan2016-07-089-68/+71
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 18c975c Rename NOP3 to CHECSEQUENCEVERIFY in rpc tests (BtcDrak) 14d0130 Rename OP_NOP3 to OP_CHECKSEQUENCEVERIFY (BtcDrak)