11360 Commits

Author SHA1 Message Date
MarcoFalke
94688d8e43
Merge #8866: [0.13] Backports
5e0dd9e [Doc] Update bips.md for Segregated Witness (fanquake)
d6c83b9 [qa] Fix race condition in sendheaders.py (Suhas Daftuar)
b73f065 [qa] Another attempt to fix race condition in p2p-compactblocks.py (Suhas Daftuar)
b987348 Bugfix: Trivial: RPC: getblockchaininfo help: pruneheight is the lowest, not highest, block (Luke Dashjr)
cbc3fe5 test: Explicitly set encoding to utf8 when opening text files (Wladimir J. van der Laan)
0bee740 [qa] util: Move wait_bitcoinds() into stop_nodes() (MarcoFalke)
794b007 [qa] Add getinfo smoke tests and rework versionbits test (MarcoFalke)
1f60d45 [qa] mininode: Only allow named args in wait_until (MarcoFalke)
624a007 [qa] Fix race condition in p2p-compactblocks test (Suhas Daftuar)
3e4abb5 Fix nulldummy.py test (Johnson Lau)
31ab2f8 test: Avoid ConnectionResetErrors during RPC tests (Wladimir J. van der Laan)
eb18cc1 bitcoin-util-test.py should fail if the output file is empty (jnewbery)
d87227d [qa] nulldummy: Don't run unused code (MarcoFalke)
1dd1783 [qa] blockstore: Switch to dumb dbm (MarcoFalke)
83ad563 [rpc] throw JSONRPCError when utxo set can not be read (MarcoFalke)
6288659 [Wallet] remove "unused" ThreadFlushWalletDB from removeprunedfunds (Jonas Schnelli)
2a8bca4 Add bitcoin-tx JSON tests (jnewbery)
9bbe66e [qa] Split up slow RPC calls to avoid pruning test timeouts (Suhas Daftuar)
375437c Ping regularly in p2p-segwit.py to keep connection alive (Johnson Lau)
2016-10-11 11:55:28 +02:00
fanquake
5e0dd9e07c [Doc] Update bips.md for Segregated Witness
Github-Pull: #8891
Rebased-From: ef28d8a899aeb4487ef7fbfbfca9c0f2b60bdaf6
2016-10-08 21:29:31 +02:00
Suhas Daftuar
d6c83b95cf [qa] Fix race condition in sendheaders.py
Also de-duplicates code that has been moved to mininode

Github-Pull: #8882
Rebased-From: b55d9411e7e1aa36ddabba3b942f2e1c736c1bd9
2016-10-06 21:00:42 +02:00
Suhas Daftuar
b73f0653f3 [qa] Another attempt to fix race condition in p2p-compactblocks.py
sync_with_ping() only guarantees that the node has processed messages
it's received from the peer, not that block announcements from the node have
made it back to the peer.  Replace sync_with_ping() with an explicit check that
the node's tip has been announced.

Github-Pull: #8882
Rebased-From: 6976db2f4687d575e1b4bee5aaf1d93a794f23c3
2016-10-05 11:19:17 +02:00
Luke Dashjr
b987348435 Bugfix: Trivial: RPC: getblockchaininfo help: pruneheight is the lowest, not highest, block
Github-Pull: #8884
Rebased-From: a78e5428acb862bfb47e6faff39f4889f5c73269
2016-10-05 11:18:49 +02:00
Wladimir J. van der Laan
cbc3fe59c4 test: Explicitly set encoding to utf8 when opening text files
These are text files but their encoding does not depend on the locale.
Not all of them require utf8 but it is better to fix it at something
to remove potential unpredictability.

This is necessary on FreeBSD where no locale is set by default,
and apparently Python defaults not only the terminal encoding to the locale
but that of every text file. So without LOCALE environment it defaults text
file encoding to ASCII. This causes problems with e.g. `bitcoin.conf`.

Luckily the locale doesn't affect the default encoding for str.encode() and
bytes.decode() on Python 3, so this is the only change necessary.

Github-Pull: #8840
Rebased-From: 30930e847e2483c7c8163cc581b392bc288250e9
2016-10-03 11:54:29 +02:00
MarcoFalke
0bee740845 [qa] util: Move wait_bitcoinds() into stop_nodes()
Github-Pull: #8860
Rebased-From: fa7c35c4ec630838178b4674288da33561a66f08
2016-10-03 11:31:36 +02:00
MarcoFalke
794b007896 [qa] Add getinfo smoke tests and rework versionbits test
Github-Pull: #8780
Rebased-From: fa6e71b27d00766897f3e69775d450924a58a153
2016-10-03 11:31:18 +02:00
MarcoFalke
1f60d45504 [qa] mininode: Only allow named args in wait_until
Github-Pull: #8857
Rebased-From: fa666094cf5b9ac4a7c1732a7ffa001afffcd938
2016-10-03 10:59:49 +02:00
Suhas Daftuar
624a007f47 [qa] Fix race condition in p2p-compactblocks test
Also fix a bug in the sync_with_ping() helper function

Github-Pull: #8854
Rebased-From: b5fd666984fdb7125cb809c773b36034f32128cc
2016-10-03 10:57:40 +02:00
Johnson Lau
3e4abb5025 Fix nulldummy.py test
Github-Pull: #8841
Rebased-From: 46a4774d2bb9cc863e43507212ef989fa10d56d4
2016-10-03 10:57:22 +02:00
Wladimir J. van der Laan
31ab2f862a test: Avoid ConnectionResetErrors during RPC tests
This is necessary on FreeBSD and MacOSX, at least.

See https://github.com/bitcoin/bitcoin/pull/8834#issuecomment-250450213

Github-Pull: #8839
Rebased-From: 1d28faf9e94fcf240ece7336d61ec297b064bc37
2016-10-03 10:57:04 +02:00
jnewbery
eb18cc1272 bitcoin-util-test.py should fail if the output file is empty
Github-Pull: #8836
Rebased-From: da9469770847df56e67e629986129a087b5bd7a5
2016-10-03 10:56:41 +02:00
MarcoFalke
d87227d6d2 [qa] nulldummy: Don't run unused code
Github-Pull: #8835
Rebased-From: fa156c604e7d86d84f7731b05d7530bc91d2736b
2016-10-03 10:56:27 +02:00
MarcoFalke
1dd1783873 [qa] blockstore: Switch to dumb dbm
Github-Pull: #8834
Rebased-From: fa9cd25ed0587078e3218965606c79ebf8138d53
2016-10-03 10:56:12 +02:00
MarcoFalke
83ad563ade [rpc] throw JSONRPCError when utxo set can not be read
Github-Pull: #8832
Rebased-From: fa05cfdf256f3bc13b89ea80231e342f4302d204
2016-10-03 10:55:51 +02:00
Jonas Schnelli
62886598db [Wallet] remove "unused" ThreadFlushWalletDB from removeprunedfunds
Github-Pull: #8765
Rebased-From: c6f5ca822f1308983431bf1b3c91f8aaccff51a0
2016-10-03 10:55:31 +02:00
jnewbery
2a8bca465d Add bitcoin-tx JSON tests
Github-Pull: #8829
Rebased-From: 54e5d7c1b81e1b76f5789abfa2cb1f5963cd9d72
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: a0f8482f3e9b07e37c3f1b6fa09683b448810955
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: 0637b02fce04c800acc6747687c91c9b22f642e5
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: 482f852da65457eb2fbea6b259e7568133fb81c4
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: 157254a4bfdfc4ca3ad5bf2d84e82f290bd0c7f2)
2016-09-26 16:49:14 +02:00
Suhas Daftuar
fb8706ebd7 Add p2p test for BIP 152 (compact blocks)
Github-Pull: #8418
Rebased-From: 45c7ddd109465e03551f5b39c2e650c243b4a078
2016-09-26 16:47:11 +02:00
Suhas Daftuar
f6be478b0a Add support for compactblocks to mininode
Github-Pull: #8418
Rebased-From: 9a22a6c0891256f02f4906c1c13fb22a9722ec7c
2016-09-26 16:47:09 +02:00
Suhas Daftuar
4295a7aea5 Tests: refactor compact size serialization in mininode
Github-Pull: #8418
Rebased-From: a8689fdf8e10300b73750161a73a23467ecd1efe
2016-09-26 16:47:06 +02:00
Pieter Wuille
ff893aa557 Implement SipHash in Python
Github-Pull: #8418
Rebased-From: 9c8593d2b4e25ef628172ceadbedf0ef078d01ef
2016-09-26 16:46:56 +02:00
Suhas Daftuar
198494ce53 Allow changing BIP9 parameters on regtest
Github-Pull: #8418
Rebased-From: 56c87e92110f05d7452f1e85bf755246ffc77206
2016-09-26 16:46:19 +02:00
Jonas Schnelli
23feab1f38 Remove maxuploadtargets recommended minimum
Github-Pull: #8712
Rebased-From: 1b6bcdd3aa379a50c960e23d7c55db8294e76f7f
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: 86c3f8db0bf64693313a81d5fe92ef603499030a
2016-09-26 16:43:10 +02:00
instagibbs
b394a96396 Add basic test for IsStandard witness transaction blinding
Github-Pull: #8525
Rebased-From: ca10a03addf70421893791c2c499e82fc494d60b
2016-09-26 16:42:27 +02:00
Pieter Wuille
1672225670 Do not store witness txn in rejection cache
Github-Pull: #8525
Rebased-From: 34521e4d7d176109dedf52ec8ef2b5052b9a30f3
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: 12a721b45e16124f48ea85f96079feec18e948ca
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: 0766d1cac38d7ea27a6323d7ca206154b2686f9b
2016-09-21 02:43:47 +00:00
isle2983
a60d7cc97d [copyright] Add missing copyright headers
Github-Pull: #8676
Rebased-From: 783e930e68a312bc7654d833053cceead18dd688
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: 4677b197f7aa8d35bfc20a5961c3e1c41bb7de39
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: 37a7fe9e440b83e2364d5498931253937abe9294
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: b4fb51271905f9ef39e5c2bc7e8c15e7489394a1
2016-09-21 02:43:47 +00:00
MarcoFalke
e34374e252 [qa] wallet: Check legacy wallet as well
Github-Pull: #8716
Rebased-From: fa644d0053ca40740b9e7b8982ff6c5d5640e4af
2016-09-21 02:43:47 +00:00
fanquake
d31ac725cf Specify Protobuf version 2 in paymentrequest.proto
Github-Pull: #8742
Rebased-From: c4084c208509c42f796ebaa3eaded5f1cd40c506
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: dad932c241a3fe9ef8e4dc36596381666ab4f879
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: b16a7f609fdb2efa9a8a1b82f09748b95b5ae4f6
2016-09-21 02:43:47 +00:00
MarcoFalke
da94272e3c [qa] walletbackup: Sync blocks inside the loop
Github-Pull: #8724
Rebased-From: fad41f308f5e0e0650e3eed96c8c8575b3f7c33e
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: d9c99c3058c90f4f7075cf5c495b8dcd2e7519a7
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: 323a5fe06af43d3922a435e696d6c52acc6fade1
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: 14675610245e951f2b922a0eaad6eb7d011ae87e
2016-09-21 02:43:47 +00:00
MarcoFalke
752fbae697 contrib: Make fix-copyright-headers.py more portable
Github-Pull: #8607
Rebased-From: fafe7b3432d5117e3f207eafe2fca1f9637b24f6
2016-09-21 02:43:47 +00:00
MarcoFalke
486650ae6a [doc] Fix typos in comments, doxygen: Fix comment syntax
Github-Pull: #8607
Rebased-From: fa27c0a2c4545a579bf339e816c3fa785252b7dc
2016-09-21 02:43:47 +00:00
MarcoFalke
c18a9ca788 [qa] pull-tester: Don't mute zmq ImportError
Github-Pull: #8607
Rebased-From: fabfd5dae28cbe26e71d50dbfb6feab03673f27a
2016-09-21 02:43:47 +00:00