zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
11,356 Commits 9 Branches 176 Tags 87 MiB
Commit Graph

11356 Commits

Author SHA1 Message Date
Patrick Strateman ebea65121e
Move SetMinVersion for FEATURE_HD to SetHDMasterKey 
Github-Pull: #8378
Rebased-From: 6523fcaab2
 2016-07-20 11:58:11 +02:00
Wladimir J. van der Laan f0ff08d784
Merge #8379: Remove duplicated name in release notes 
48b9208 Remove duplicated name in release notes (Johnson Lau)
 2016-07-20 11:50:56 +02:00
Johnson Lau 48b92080a7 Remove duplicated name in release notes 2016-07-20 17:48:09 +08:00
Cory Fields 1fe7f40407
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.

Github-Pull: #8373
Rebased-From: 3b3ce25df6
 2016-07-20 09:11:41 +02:00
Wladimir J. van der Laan d6bb231a9f
Merge #8360: doc: Add a few items to release notes 
ded0599 doc: Add a few items to release notes (Wladimir J. van der Laan)
 2016-07-19 12:25:02 +02:00
Wladimir J. van der Laan ec8f5fc8b5
doc: Add list of pulls and authors to release notes 2016-07-19 12:24:03 +02:00
Wladimir J. van der Laan 24f117ef05
Merge #8366: [0.13] [Wallet] Ensure <0.13 clients can't open HD wallets 
3b38a6a [Wallet] Ensure <0.13 clients can't open HD wallets (Jonas Schnelli)
 2016-07-19 12:14:09 +02:00
Suhas Daftuar fca1a415ce
Rename "block cost" to "block weight" 
Github-Pull: #8363
Rebased-From: 2c06bae39e
 2016-07-19 12:10:28 +02:00
Wladimir J. van der Laan ded0599281 doc: Add a few items to release notes 
Do a few TODOs from #7678:

- Removal of internal miner
- `mempool`/`NODE_BLOOM` interaction
- Sorting of `getrawmempool` output
 2016-07-19 12:01:02 +02:00
Wladimir J. van der Laan a07c8a032c
Merge #8361: Some 0.13 release notes about p2p changes 
df85463 Some 0.13 release notes about p2p changes (Pieter Wuille)
 2016-07-19 11:56:52 +02:00
Jonas Schnelli 3b38a6a96a
[Wallet] Ensure <0.13 clients can't open HD wallets 2016-07-18 22:52:49 +02:00
Pieter Wuille df854637b1 Some 0.13 release notes about p2p changes 2016-07-18 16:02:37 +02:00
Wladimir J. van der Laan 37269105c8
build: Release notes update 
Fill in the header, and move items to the appropriate part of the
release notes structure.
 2016-07-18 14:10:51 +02:00
Wladimir J. van der Laan 084d1ddf8f
build: bump version to 0.13.0 2016-07-18 12:24:28 +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
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
Cory Fields 099d4b0b65 gitian: use a wrapped gcc/g++ to avoid the need for a system change 
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.
 2016-07-07 20:13:08 -04:00
MarcoFalke fade505e8b [qa] Add wallet-hd test 2016-07-07 22:19:35 +02:00