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

11343 Commits

Author SHA1 Message Date
jnewbery 2a8bca465d Add bitcoin-tx JSON tests 
Github-Pull: #8829
Rebased-From: 54e5d7c1b8
 2016-10-03 10:55:07 +02:00
Suhas Daftuar 9bbe66e592 [qa] Split up slow RPC calls to avoid pruning test timeouts 
Github-Pull: #8827
Rebased-From: a0f8482f3e
 2016-10-03 10:54:51 +02:00
Johnson Lau 375437c26b Ping regularly in p2p-segwit.py to keep connection alive 
This pings regularly while building a big block in p2p-segwit.py, to prevent timeout

Github-Pull: #8803
Rebased-From: 0637b02fce
 2016-10-03 10:54:20 +02:00
Wladimir J. van der Laan a916677ace
Merge #8815: Backports for 0.13.1 
9dfa0c8 Implement NULLDUMMY softfork (Johnson Lau)
cef633c Fix broken sendcmpct test in p2p-compactblocks.py (Suhas Daftuar)
fb8706e Add p2p test for BIP 152 (compact blocks) (Suhas Daftuar)
f6be478 Add support for compactblocks to mininode (Suhas Daftuar)
4295a7a Tests: refactor compact size serialization in mininode (Suhas Daftuar)
ff893aa Implement SipHash in Python (Pieter Wuille)
198494c Allow changing BIP9 parameters on regtest (Suhas Daftuar)
23feab1 Remove maxuploadtargets recommended minimum (Jonas Schnelli)
a5ec248 Remove createwitnessaddress (Johnson Lau)
b394a96 Add basic test for IsStandard witness transaction blinding (instagibbs)
1672225 Do not store witness txn in rejection cache (Pieter Wuille)
 2016-09-27 15:10:32 +02:00
Johnson Lau 9dfa0c8d90 Implement NULLDUMMY softfork 
Github-Pull: #8636
Rebased-From: 482f852da6
 2016-09-26 16:50:39 +02:00
Suhas Daftuar cef633ce63 Fix broken sendcmpct test in p2p-compactblocks.py 
Python lambda use was incorrect.

sendcmpct messages need to be synchronized with RPC calls to generate().

Headers need to be synced (eg with getheaders) for cmpctblock announcements
to start.

Last test omitted sending a sendcmpct message.

Github-Pull: #8739
Rebased-From: 157254a4bf)
 2016-09-26 16:49:14 +02:00
Suhas Daftuar fb8706ebd7 Add p2p test for BIP 152 (compact blocks) 
Github-Pull: #8418
Rebased-From: 45c7ddd109
 2016-09-26 16:47:11 +02:00
Suhas Daftuar f6be478b0a Add support for compactblocks to mininode 
Github-Pull: #8418
Rebased-From: 9a22a6c089
 2016-09-26 16:47:09 +02:00
Suhas Daftuar 4295a7aea5 Tests: refactor compact size serialization in mininode 
Github-Pull: #8418
Rebased-From: a8689fdf8e
 2016-09-26 16:47:06 +02:00
Pieter Wuille ff893aa557 Implement SipHash in Python 
Github-Pull: #8418
Rebased-From: 9c8593d2b4
 2016-09-26 16:46:56 +02:00
Suhas Daftuar 198494ce53 Allow changing BIP9 parameters on regtest 
Github-Pull: #8418
Rebased-From: 56c87e9211
 2016-09-26 16:46:19 +02:00
Jonas Schnelli 23feab1f38 Remove maxuploadtargets recommended minimum 
Github-Pull: #8712
Rebased-From: 1b6bcdd3aa
 2016-09-26 16:43:28 +02:00
Johnson Lau a5ec248323 Remove createwitnessaddress 
This RPC command is unsafe as it will return an address even if the script is invalid.

Github-Pull: #8699
Rebased-From: 86c3f8db0b
 2016-09-26 16:43:10 +02:00
instagibbs b394a96396 Add basic test for IsStandard witness transaction blinding 
Github-Pull: #8525
Rebased-From: ca10a03add
 2016-09-26 16:42:27 +02:00
Pieter Wuille 1672225670 Do not store witness txn in rejection cache 
Github-Pull: #8525
Rebased-From: 34521e4d7d
 2016-09-26 16:42:12 +02:00
Wladimir J. van der Laan 254e990ce5
Merge #8772: [0.13] Backports 
b70b4a2 Trivial: Fix typo (Marty Jones)
702fd2e [copyright] add MIT license headers to .sh scripts where missing (isle2983)
a60d7cc [copyright] Add missing copyright headers (isle2983)
ea2a6be [copyright] add MIT License copyright header to remaining Python files (isle2983)
9a903f9 [copyright] add MIT License copyright header to zmq_sub.py (isle2983)
084cae9 UndoReadFromDisk works on undo files (rev), not on block files. (Pavel Janík)
e34374e [qa] wallet: Check legacy wallet as well (MarcoFalke)
d31ac72 Specify Protobuf version 2 in paymentrequest.proto (fanquake)
5e15fce Minor change in section name (Anders Øyvind Urke-Sætre)
0e2c6bd [Doc] Target protobuf 2.6 in OS X build notes. (Michael Ford)
da94272 [qa] walletbackup: Sync blocks inside the loop (MarcoFalke)
42ea51a net: No longer send local address in addrMe (Wladimir J. van der Laan)
ea51b0f Berkeley DB v6 compatibility fix (Alexey Vesnin)
0a35573 [doc] - clarify statement about parallel jobs in rpc-tests.py (isle2983)
752fbae contrib: Make fix-copyright-headers.py more portable (MarcoFalke)
486650a [doc] Fix typos in comments, doxygen: Fix comment syntax (MarcoFalke)
c18a9ca [qa] pull-tester: Don't mute zmq ImportError (MarcoFalke)
9556745 init: Fix typo in help message for -whitelistforcerelay (Wladimir J. van der Laan)
4f84082 Set jonasschnellis dns-seeder filter flag (Jonas Schnelli)
863ae74 [doc] Update git-subtree-check.sh README (MarcoFalke)
c493f43 Trivial: Fix two VarInt examples in serialize.h (Christian Barcenas)
cb07f19 CDB: fix debug output (crowning-)
75d5484 Add copyright header to wallet_text_fixture.cpp (Wladimir J. van der Laan)
305d8ac Use __func__ to get function name for output printing (MarcoFalke)
464dedd [Wallet] Trivial cleanup of HD wallet changes (Jonas Schnelli)
b17a3f9 document return value of networkhashps for getmininginfo RPC endpoint (Jameson Lopp)
a27cdd8 [qa] abandonconflict: Use assert_equal (MarcoFalke)
befe654 various typos (leijurv)
4e5fc31 Fix a type error that would not compile on Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn) (Jeremy Rubin)
156e305 Corrected JSON typo on setban of net.cpp (Sev)
fa5b249 Bugfix: Allow building libbitcoinconsensus without any univalue (Luke Dashjr)
8b0bdd3 configure: Allow building bench_bitcoin by itself (Luke Dashjr)
749c8a5 [doc] typos, READMEs, comments (Justin Camarena)
fc34928 Do diskspace check before import thread is started (Pieter Wuille)
3b354d2 Add extra message to avoid a long 'Loading banlist' (Pieter Wuille)
30eac2d Use a signal to continue init after genesis activation (Pieter Wuille)
9b00979 Update README.md (Chris Stewart)
8bb1efd [qa] Rework hd wallet dump test (MarcoFalke)
a7aa3cc Enable size accounting in mining unit tests (Suhas Daftuar)
bea02dc [qa]: enable rpcbind_test (whythat)
e111904 [qa]: add parsing for '<host>:<port>' argument form to rpc_url() (whythat)
69d1cd2 net: Ignore `notfound` P2P messages (Wladimir J. van der Laan)
f70be14 [QA] Add walletdump RPC test (including HD- & encryption-tests) (Jonas Schnelli)
1f21d16 prepend license statement to indirectmap (Kaz Wesley)
03b0196 Fix obvious assignment/equality error in test (Jeremy Rubin)
8a7d7ff update name of file bitcoin.qrc (Gaurav Rana)
147003c Add configure check for -latomic (Anthony Towns)
091cdeb Clear witness with vin/vout in CWallet::CreateTransaction() (Suhas Daftuar)
8e03382 [Qt][CoinControl] fix UI bug that could result in paying unexpected fee (Jonas Schnelli)
6b07362 Fix SIGHASH_SINGLE bug in test_framework SignatureHash (Johnson Lau)
a114a02 p2psegwit.py transaction is rejected due to premature witness not size (instagibbs)
3606b6b Update p2p-segwit.py to reflect correct AskFor behavior (instagibbs)
733760a Update btcdrak signing key (BtcDrak)
c6a6291 add witness address to address book (instagibbs)
 2016-09-26 16:22:51 +02:00
Marty Jones b70b4a24e6 Trivial: Fix typo 
Github-Pull: #8762
Rebased-From: 12a721b45e
 2016-09-21 02:43:47 +00:00
isle2983 702fd2ee21 [copyright] add MIT license headers to .sh scripts where missing 
Years are set according to 'git log' history

Github-Pull: #8700
Rebased-From: 0766d1cac3
 2016-09-21 02:43:47 +00:00
isle2983 a60d7cc97d [copyright] Add missing copyright headers 
Github-Pull: #8676
Rebased-From: 783e930e68
 2016-09-21 02:43:47 +00:00
isle2983 ea2a6bef85 [copyright] add MIT License copyright header to remaining Python files 
Github-Pull: #8702
Rebased-From: 4677b197f7
 2016-09-21 02:43:47 +00:00
isle2983 9a903f9f00 [copyright] add MIT License copyright header to zmq_sub.py 
Github-Pull: #8701
Rebased-From: 37a7fe9e44
 2016-09-21 02:43:47 +00:00
Pavel Janík 084cae9ca5 UndoReadFromDisk works on undo files (rev), not on block files. 
Github-Pull: #8737
Rebased-From: b4fb512719
 2016-09-21 02:43:47 +00:00
MarcoFalke e34374e252 [qa] wallet: Check legacy wallet as well 
Github-Pull: #8716
Rebased-From: fa644d0053
 2016-09-21 02:43:47 +00:00
fanquake d31ac725cf Specify Protobuf version 2 in paymentrequest.proto 
Github-Pull: #8742
Rebased-From: c4084c2085
 2016-09-21 02:43:47 +00:00
Anders Øyvind Urke-Sætre 5e15fce30c Minor change in section name 
Changed 'build' to 'create', as the section name have changed in newer versions of release-process.md

Github-Pull: #8720
Rebased-From: dad932c241
 2016-09-21 02:43:47 +00:00
Michael Ford 0e2c6bdf78 [Doc] Target protobuf 2.6 in OS X build notes. 
Homebrew now installs Protobuf version 3 by default, which doesn't currently compile. Install Protobuf 2.6.x from the versions tap instead.

Github-Pull: #8754
Rebased-From: b16a7f609f
 2016-09-21 02:43:47 +00:00
MarcoFalke da94272e3c [qa] walletbackup: Sync blocks inside the loop 
Github-Pull: #8724
Rebased-From: fad41f308f
 2016-09-21 02:43:47 +00:00
Wladimir J. van der Laan 42ea51a65f net: No longer send local address in addrMe 
After #8594 the addrFrom sent by a node is not used anymore at all,
so don't bother sending it.

Also mitigates the privacy issue in (#8616). It doesn't completely solve
the issue as GetLocalAddress is also called in AdvertiseLocal, but at
least when advertising addresses it stands out less as *our* address.

Github-Pull: #8740
Rebased-From: d9c99c3058
 2016-09-21 02:43:47 +00:00
Alexey Vesnin ea51b0f5dd Berkeley DB v6 compatibility fix 
Fixes building error looking like this:
CXX wallet/libbitcoin_wallet_a-db.o
wallet/db.cpp: In member function ‘void CDBEnv::EnvShutdown()’:
wallet/db.cpp:46:16: error: call of overloaded ‘DbEnv(int)’ is ambiguous
DbEnv(0).remove(strPath.c_str(), 0);
^
wallet/db.cpp:46:16: note: candidates are:
In file included from wallet/db.h:21:0,
from wallet/db.cpp:6:
/usr/include/db_cxx.h:916:2: note: DbEnv::DbEnv(const DbEnv&)
DbEnv(const DbEnv &);
^
/usr/include/db_cxx.h:518:2: note: DbEnv::DbEnv(DB_ENV)
DbEnv(DB_ENV *dbenv);
^
/usr/include/db_cxx.h:516:2: note: DbEnv::DbEnv(u_int32_t)
DbEnv(u_int32_t flags);
^
Makefile:5780: recipe for target 'wallet/libbitcoin_wallet_a-db.o' failed
make[2]: ** [wallet/libbitcoin_wallet_a-db.o] Error 1

Github-Pull: #8626
Rebased-From: 323a5fe06a
 2016-09-21 02:43:47 +00:00
isle2983 0a35573534 [doc] - clarify statement about parallel jobs in rpc-tests.py 
Github-Pull: #8625
Rebased-From: 1467561024
 2016-09-21 02:43:47 +00:00
MarcoFalke 752fbae697 contrib: Make fix-copyright-headers.py more portable 
Github-Pull: #8607
Rebased-From: fafe7b3432
 2016-09-21 02:43:47 +00:00
MarcoFalke 486650ae6a [doc] Fix typos in comments, doxygen: Fix comment syntax 
Github-Pull: #8607
Rebased-From: fa27c0a2c4
 2016-09-21 02:43:47 +00:00
MarcoFalke c18a9ca788 [qa] pull-tester: Don't mute zmq ImportError 
Github-Pull: #8607
Rebased-From: fabfd5dae2
 2016-09-21 02:43:47 +00:00
Wladimir J. van der Laan 9556745dc2 init: Fix typo in help message for -whitelistforcerelay 
Reported by pryds on Transifex in the Danish translation.

Github-Pull: #8607
Rebased-From: 67a55025a1
 2016-09-21 02:43:47 +00:00
Jonas Schnelli 4f84082a74 Set jonasschnellis dns-seeder filter flag 
Github-Pull: #8573
Rebased-From: 40a95cfd8f
 2016-09-21 02:43:47 +00:00
MarcoFalke 863ae74a1f [doc] Update git-subtree-check.sh README 
Github-Pull: #8545
Rebased-From: fa3d974009
 2016-09-21 02:43:47 +00:00
Christian Barcenas c493f43621 Trivial: Fix two VarInt examples in serialize.h 
Github-Pull: #8560
Rebased-From: 7bd5ff4623
 2016-09-21 02:43:47 +00:00
crowning- cb07f19e90 CDB: fix debug output 
It doesn't really help to clear a variable before printing it to the debug log.

Github-Pull: #8539
Rebased-From: fab2e26d20
 2016-09-21 02:43:47 +00:00
Wladimir J. van der Laan 75d548475d Add copyright header to wallet_text_fixture.cpp 
I created the file but forgot to add this header.

Github-Pull: #8558
Rebased-From: 653bb3d640
 2016-09-21 02:43:47 +00:00
MarcoFalke 305d8ac90b Use __func__ to get function name for output printing 
Github-Pull: #8548
Rebased-From: fa785d1211
 2016-09-21 02:43:47 +00:00
Jonas Schnelli 464dedd6ab [Wallet] Trivial cleanup of HD wallet changes 
Github-Pull: #8443
Rebased-From: 7e5d94df1f
 2016-09-21 02:43:47 +00:00
Jameson Lopp b17a3f9e5a document return value of networkhashps for getmininginfo RPC endpoint 
Github-Pull: #8461
Rebased-From: 65f4532f13
 2016-09-21 02:43:47 +00:00
MarcoFalke a27cdd8edf [qa] abandonconflict: Use assert_equal 
Github-Pull: #8531
Rebased-From: fa64306520
 2016-09-21 02:43:47 +00:00
leijurv befe654f0f various typos 
Github-Pull: #8505
Rebased-From: 1aacfc2da5
 2016-09-21 02:43:47 +00:00
Jeremy Rubin 4e5fc31ae6 Fix a type error that would not compile on Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn) 
Github-Pull: #8513
Rebased-From: 8194a6e525
 2016-09-21 02:43:47 +00:00
Sev 156e305dc1 Corrected JSON typo on setban of net.cpp 
Github-Pull: #8512
Rebased-From: 6ffd996b8e
 2016-09-21 02:43:47 +00:00
Luke Dashjr fa5b2498ca Bugfix: Allow building libbitcoinconsensus without any univalue 
Github-Pull: #8293
Rebased-From: 8a270b25fc
 2016-09-21 02:43:47 +00:00
Luke Dashjr 8b0bdd3923 configure: Allow building bench_bitcoin by itself 
Github-Pull: #8492
Rebased-From: 216d796ce0
 2016-09-21 02:43:47 +00:00
Justin Camarena 749c8a5655 [doc] typos, READMEs, comments 
Just a quick run through some docs and fixing some text errors.

Github-Pull: #8503
Rebased-From: e11f9a2f02
 2016-09-21 02:43:47 +00:00
Pieter Wuille fc349288cb Do diskspace check before import thread is started 
Github-Pull: #8392
Rebased-From: 9d4eb9ad99
 2016-09-21 02:43:47 +00:00