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

11187 Commits

Author SHA1 Message Date
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
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
Suhas Daftuar bb66a11396 Fix DoS vulnerability in mempool acceptance 
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.
 2016-07-07 15:49:26 -04:00
Jonas Schnelli 0cca2feb35
Merge #8304: [travis] Update SDK_URL 
fa6ad56 [travis] Update SDK_URL (MarcoFalke)
 2016-07-07 20:44:29 +02:00
Cory Fields b556beda26 build: fix Windows builds without pkg-config 
- 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
 2016-07-07 14:18:12 -04:00
Cory Fields 0c928cb13c build: Fix Qt5PlatformSupport check without pkg-config 
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.
 2016-07-07 14:15:17 -04:00
Christian von Roques 1ba3db6a8e bash-completion: Adapt for 0.12 and 0.13 
* 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
 2016-07-07 07:52:59 -04:00
MarcoFalke fa9976b853 [qa] test_framework: Add wrapper for stop_node 2016-07-07 10:28:42 +02:00
Bob McElrath 36ae37a9f9 Rename CTxinWitness -> CTxInWitness 2016-07-06 19:46:46 -04:00
Cory Fields cf2ef786a1 build: require boost for bench 2016-07-06 17:31:54 -04:00
Jonas Schnelli 91abb77970
Merge #8288: qt: Network-specific example address 
4f44cb6 qt: Network-specific example address (Wladimir J. van der Laan)
 2016-07-06 15:45:17 +02:00
Wladimir J. van der Laan b978701ba1
qt: periodic translations update 2016-07-06 07:59:07 +02:00
Wladimir J. van der Laan 396f9d6296
Merge #8273: Bump `-dbcache` default to 300MiB 
efd1d83 doc: Mention dbcache increase in release notes (Wladimir J. van der Laan)
32cab91 Bump `-dbcache` default to 300MiB (Wladimir J. van der Laan)
 2016-07-06 07:46:47 +02:00
Wladimir J. van der Laan efd1d8339a doc: Mention dbcache increase in release notes 2016-07-06 07:45:23 +02:00
Wladimir J. van der Laan 32cab91278 Bump `-dbcache` default to 300MiB 
Also cap the allocation for the leveldb-specific cache for the UTXO set
to 8MiB.
This avoids that the extra cache memory goes to the much less effective
leveldb cache instead of our application-level cache.
 2016-07-06 07:44:51 +02:00
Wladimir J. van der Laan 042c323922
Merge #8275: Remove bad chain alert partition check 
ab8be98 Remove bad chain alert partition check (BtcDrak)
 2016-07-06 07:35:54 +02:00
Wladimir J. van der Laan aef381161f
Merge #8298: wallet: Revert input selection post-pruning 
20f3cd7 wallet: Revert input selection post-pruning (Wladimir J. van der Laan)
 2016-07-06 07:21:40 +02:00
Wladimir J. van der Laan 005d3b6430
Merge #8306: Revert "net: Avoid duplicate getheaders requests." PR #8054 
4fbdc43 Revert "net: Avoid duplicate getheaders requests." PR #8054 (Gregory Maxwell)
 2016-07-06 07:16:33 +02:00
Suhas Daftuar c1d61fbd08 Add warning if -blockminsize is used. 2016-07-05 19:57:45 -04:00
Gregory Maxwell 4fbdc4365b Revert "net: Avoid duplicate getheaders requests." PR #8054 
This reverts commit f93c2a1b7e.

This can cause synchronization to get stuck.
 2016-07-05 20:45:14 +00:00
fanquake ab0c35a290
[Doc] Update bips.md for CSV softfork. 2016-07-05 10:27:01 +08:00