Wladimir J. van der Laan
30a87c0747
Merge #8407 : [Qt] Add dbcache migration path
...
893f379
[Qt] Add dbcache migration path (Jonas Schnelli)
2016-07-28 11:28:42 +02:00
Jonas Schnelli
893f379ba0
[Qt] Add dbcache migration path
2016-07-28 10:57:24 +02:00
Wladimir J. van der Laan
64d660a43f
Merge #8348 : Trivial: Segwit: Don't call IsWitnessEnabled from ContextualCheckBlock
...
38c4c8b
Trivial: Segwit: Don't call IsWitnessEnabled from ContextualCheckBlock (Jorge Timón)
2016-07-28 09:51:04 +02:00
Wladimir J. van der Laan
c24b50ec16
Merge #8414 : prepend license statement to indirectmap.h
...
d3af342
prepend license statement to indirectmap (Kaz Wesley)
2016-07-28 09:34:00 +02:00
Kaz Wesley
d3af342276
prepend license statement to indirectmap
...
Add statement about MIT licensing to indirectmap.h. I forgot the license
preamble when I originally wrote the file.
2016-07-27 16:27:07 -07:00
Wladimir J. van der Laan
4d4970fe53
Merge #8206 : [Wallet] Add HD xpriv to dumpwallet
...
77c912d
[Wallet] add HD xpriv to dumpwallet (Jonas Schnelli)
2016-07-27 15:25:34 +02:00
Jonas Schnelli
77c912d21c
[Wallet] add HD xpriv to dumpwallet
2016-07-27 15:19:23 +02:00
Wladimir J. van der Laan
beadffae6d
Merge #8358 : [doc] gbuild: Set memory explicitly (default is too low)
...
faa5931
[doc] gbuild: Set memory explicitly (default is too low) (MarcoFalke)
2016-07-26 14:40:25 +02:00
Wladimir J. van der Laan
4b1a4d8810
Merge #8381 : Make witness v0 outputs non-standard
...
c59c434
qa: Add test for standardness of segwit v0 outputs (Suhas Daftuar)
1ffaff2
Make witness v0 outputs non-standard before segwit activation (Johnson Lau)
2016-07-26 14:24:11 +02:00
Wladimir J. van der Laan
618c9dd8c6
Merge #8365 : Treat high-sigop transactions as larger rather than rejecting them
...
ab942c1
Treat high-sigop transactions as larger rather than rejecting them (Pieter Wuille)
2016-07-26 11:27:30 +02:00
Wladimir J. van der Laan
517eee3e8f
Merge #8362 : Scale legacy sigop count in CreateNewBlock
...
682aa0f
Scale legacy sigop count in CreateNewBlock (Suhas Daftuar)
2016-07-25 18:08:09 +02:00
Wladimir J. van der Laan
99c0ac2fd9
Merge #8396 : remove outdated legacy code from key.h
...
cc021ef
remove outdated legacy code (lizhi)
2016-07-25 12:51:03 +02:00
lizhi
cc021ef486
remove outdated legacy code
...
CheckSignatureElement is not used,it be replaced by eccrypto::CheckSignatureElement.
2016-07-24 10:49:07 +08:00
Suhas Daftuar
c59c434b7d
qa: Add test for standardness of segwit v0 outputs
2016-07-23 00:01:02 +08:00
Jonas Schnelli
0df9ea42b8
Merge #8390 : [Wallet] Correct hdmasterkeyid/masterkeyid name confusion
...
b50e1ac
[Wallet] Correct hdmasterkeyid/masterkeyid name confusion (Jonas Schnelli)
2016-07-22 11:45:44 +02:00
Johnson Lau
1ffaff2f74
Make witness v0 outputs non-standard before segwit activation
2016-07-22 06:35:07 +00:00
Jonas Schnelli
b50e1ac298
[Wallet] Correct hdmasterkeyid/masterkeyid name confusion
2016-07-21 21:58:12 +02:00
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
Pieter Wuille
ab942c15bd
Treat high-sigop transactions as larger rather than rejecting them
2016-07-19 12:31:49 +02: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
Suhas Daftuar
682aa0f289
Scale legacy sigop count in CreateNewBlock
2016-07-18 12:42:41 -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
MarcoFalke
faa59318db
[doc] gbuild: Set memory explicitly (default is too low)
2016-07-18 10:55:14 +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
38c4c8b701
Trivial: Segwit: Don't call IsWitnessEnabled from ContextualCheckBlock
2016-07-17 02:41:58 +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