Commit graph

11208 commits

Author SHA1 Message Date
Wladimir J. van der Laan
381917f610
Merge #8347: Trivial: Make CBlockIndex param const in ContextualCheckBlockHeader and ContextualCheckBlock
6f3d616 Trivial: Make CBlockIndex param const in ContextualCheckBlockHeader and ContextualCheckBlock (Jorge Timón)
2016-07-21 14:31:40 +02:00
Wladimir J. van der Laan
04af3cfe8f
Merge #8341: Consensus: Remove calls to error() from ContextualCheckBlock
7821889 Consensus: Remove calls to error() from ContextualCheckBlock (NicolasDorier)
2016-07-21 14:09:27 +02:00
NicolasDorier
7821889bce Consensus: Remove calls to error() from ContextualCheckBlock 2016-07-21 20:57:08 +09:00
Wladimir J. van der Laan
6f4092da80
Merge #8342: Consensus: Trivial transform BOOST_FOREACH into for loop
a3e1984 Consensus: Trivial transform BOOST_FOREACH into for loop (NicolasDorier)
2016-07-21 11:56:33 +02:00
Wladimir J. van der Laan
8e048f40cc
Merge #8378: [Wallet]Move SetMinVersion for FEATURE_HD to SetHDMasterKey
6523fca Move SetMinVersion for FEATURE_HD to SetHDMasterKey (Patrick Strateman)
2016-07-20 11:57:30 +02:00
Wladimir J. van der Laan
c98abf2c70
Merge #8373: Fix OSX non-deterministic dmg
3b3ce25 build: fix non-deterministic biplist (Cory Fields)
2016-07-20 09:10:18 +02:00
Patrick Strateman
6523fcaab2 Move SetMinVersion for FEATURE_HD to SetHDMasterKey 2016-07-19 22:30:17 -07:00
Cory Fields
3b3ce25df6 build: fix non-deterministic biplist
The non-deterministic ordering produced by biplist ends up in the .DS_Store
file that is included in the OSX dmg.
2016-07-19 15:43:07 -04:00
Wladimir J. van der Laan
045106b4f1
Merge #8367: [Wallet] Ensure <0.13 clients can't open HD wallets
a4f137f [Wallet] Ensure <0.13 clients can't open HD wallets (Jonas Schnelli)
2016-07-19 12:13:12 +02:00
Wladimir J. van der Laan
ca7550e128
Merge #8363: Rename "block cost" to "block weight"
2c06bae Rename "block cost" to "block weight" (Suhas Daftuar)
2016-07-19 12:09:15 +02:00
Jonas Schnelli
a4f137f367
[Wallet] Ensure <0.13 clients can't open HD wallets 2016-07-18 22:56:45 +02:00
Suhas Daftuar
2c06bae39e Rename "block cost" to "block weight" 2016-07-18 13:28:26 -04:00
Wladimir J. van der Laan
5e3557b8e3
doc: Clean out release notes
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.
2016-07-18 14:01:11 +02:00
Wladimir J. van der Laan
6c0336c772
build: bump version to 0.13.99
Now that 0.13 branch has been split off, master is 0.13.99 (pre-0.14).
2016-07-18 12:22:18 +02:00
Wladimir J. van der Laan
e4382fbef5
qt: periodic translations update 2016-07-18 12:13:08 +02:00
Wladimir J. van der Laan
03c56f62c2
Merge #8359: mining: Improve -blockmaxcost help message
8cef5bd mining: Improve `-blockmaxcost` help message (Wladimir J. van der Laan)
2016-07-18 12:05:47 +02:00
Wladimir J. van der Laan
8cef5bd58a mining: Improve -blockmaxcost help message
One-word replacement to #8354.
2016-07-18 10:56:25 +02:00
Wladimir J. van der Laan
8cb288a6b3
Merge #8320: Fix 0.12 release notes on block relaying
d6dc1bc Fix 0.12 release notes on block relaying (Krzysztof Jurewicz)
2016-07-18 09:04:47 +02:00
Wladimir J. van der Laan
f5660d381a
Merge #8295: Mining-related fixups for 0.13.0
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)
2016-07-18 08:23:45 +02:00
Wladimir J. van der Laan
238300b398
Merge #8323: Add HD keypath to CKeyMetadata, report metadata in validateaddress
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)
2016-07-18 07:58:33 +02:00
Wladimir J. van der Laan
37303934fe
Merge #8305: Improve handling of unconnecting headers
e91cf4b Add test for handling of unconnecting headers (Suhas Daftuar)
96fa953 Improve handling of unconnecting headers (Suhas Daftuar)
2016-07-18 07:46:12 +02:00
Jorge Timón
6f3d616dc8 Trivial: Make CBlockIndex param const in ContextualCheckBlockHeader and ContextualCheckBlock 2016-07-17 01:43:15 +02:00
NicolasDorier
a3e1984651 Consensus: Trivial transform BOOST_FOREACH into for loop 2016-07-16 11:08:52 +09:00
Jonas Schnelli
7945088d41
[Wallet] comsetic non-code changes for the HD feature 2016-07-15 10:34:08 +02:00
Jonas Schnelli
68d7682b9f
[Wallet] ensure CKeyMetadata.hdMasterKeyID will be cleared during SetNull() 2016-07-15 10:33:25 +02:00
Wladimir J. van der Laan
bc94b87487
Merge #8324: [Wallet] keep HD seed during salvagewallet
b993671 [Wallet] keep HD seed during salvagewallet (Jonas Schnelli)
2016-07-14 11:37:48 +02:00
MarcoFalke
af9b7a9f2f
Merge #8340: [qa] Solve trivial merge conflict in p2p-segwit.py
66668c4 [qa] Solve merge conflict of 4324bd237c (MarcoFalke)
2016-07-14 10:58:37 +02:00
MarcoFalke
66668c420a [qa] Solve merge conflict of 4324bd237c 2016-07-14 10:30:13 +02:00
Wladimir J. van der Laan
ca40ef6029
Merge #8312: Fix mempool DoS vulnerability from malleated transactions
46c9620 Test that unnecessary witnesses can't be used for mempool DoS (Suhas Daftuar)
bb66a11 Fix DoS vulnerability in mempool acceptance (Suhas Daftuar)
2016-07-14 08:21:13 +02:00
Wladimir J. van der Laan
4324bd237c
Merge #8311: Rename CTxinWitness -> CTxInWitness
36ae37a Rename CTxinWitness -> CTxInWitness (Bob McElrath)
2016-07-14 08:18:38 +02:00
Wladimir J. van der Laan
1bc9c8085f
Merge #8271: [bugfix] Do not send witnesses in cmpctblock
252675e Do not send witnesses in cmpctblock (Pieter Wuille)
2016-07-14 08:17:22 +02:00
Suhas Daftuar
e91cf4b210 Add test for handling of unconnecting headers 2016-07-12 13:27:01 -04:00
Suhas Daftuar
96fa95361f Improve handling of unconnecting headers
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.
2016-07-12 13:12:40 -04:00
Wladimir J. van der Laan
4831a16223
qt: periodic translation update
Added languages:
- `bg_BG`: Bulgarian (Bulgaria)
2016-07-12 11:40:33 +02:00
Wladimir J. van der Laan
304eff3c61
Merge #8317: [rpcwallet] Don't use floating point
477777f [rpcwallet] Don't use floating point (MarcoFalke)
2016-07-11 12:51:13 +02:00
Wladimir J. van der Laan
26316ffa7d
Merge #8289: bash-completion: Adapt for 0.12 and 0.13
1ba3db6 bash-completion: Adapt for 0.12 and 0.13 (Christian von Roques)
2016-07-11 11:02:57 +02:00
Jonas Schnelli
b993671921
[Wallet] keep HD seed during salvagewallet 2016-07-09 12:58:03 +02:00
Jonas Schnelli
f70808596f
[QA] extend wallet-hd test to cover HD metadata 2016-07-09 12:12:36 +02:00
Jonas Schnelli
986c223214
[Wallet] print hd masterkeyid in getwalletinfo 2016-07-09 12:12:36 +02:00
Jonas Schnelli
b1c7b244e2
[Wallet] report optional HDKeypath/HDMasterKeyId in validateaddress 2016-07-09 12:12:32 +02:00
Jonas Schnelli
5b95dd2c25
[Wallet] extend CKeyMetadata with HD keypath 2016-07-09 11:52:17 +02:00
Krzysztof Jurewicz
d6dc1bc49b Fix 0.12 release notes on block relaying
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.
2016-07-08 22:26:38 +02:00
Wladimir J. van der Laan
67caef6730
Merge #8314: Fix pkg-config issues for 0.13
b556bed build: fix Windows builds without pkg-config (Cory Fields)
0c928cb build: Fix Qt5PlatformSupport check without pkg-config (Cory Fields)
2016-07-08 15:08:43 +02:00
Wladimir J. van der Laan
2e51590961
Merge #8315: gitian: Don't require sudo for Linux.
099d4b0 gitian: use a wrapped gcc/g++ to avoid the need for a system change (Cory Fields)
2016-07-08 12:02:44 +02:00
MarcoFalke
477777f250 [rpcwallet] Don't use floating point 2016-07-08 12:01:25 +02:00
Wladimir J. van der Laan
ff46dd4a34
Merge #7540: Rename OP_NOP3 to OP_CHECKSEQUENCEVERIFY
18c975c Rename NOP3 to CHECSEQUENCEVERIFY in rpc tests (BtcDrak)
14d0130 Rename OP_NOP3 to OP_CHECKSEQUENCEVERIFY (BtcDrak)
2016-07-08 11:39:10 +02:00
Wladimir J. van der Laan
5077d2c2b6
Merge #8303: [Doc] Update bips.md for CSV softfork.
ab0c35a [Doc] Update bips.md for CSV softfork. (fanquake)
2016-07-08 10:17:26 +02:00
Wladimir J. van der Laan
bb2646aea0
Merge #8309: [qa] Add wallet-hd test
fade505 [qa] Add wallet-hd test (MarcoFalke)
fa9976b [qa] test_framework: Add wrapper for stop_node (MarcoFalke)
2016-07-08 09:58:08 +02:00
Wladimir J. van der Laan
6ae20df823
Merge #8310: build: require boost for bench
cf2ef78 build: require boost for bench (Cory Fields)
2016-07-08 08:37:12 +02:00
Suhas Daftuar
46c9620f11 Test that unnecessary witnesses can't be used for mempool DoS
Check that pre-segwit activation, unnecessary witnesses won't cause
a txid to be permanently rejected.
2016-07-07 21:18:34 -04:00