Merge 15919, 15897, 15763, 16912, 17001, 16656, 16804 #4555

vijaydasmp · 2021-10-30T12:27:56Z

No description provided.

vijaydasmp · 2021-10-30T12:29:22Z

bitcoin#14987 This is Vlad_staged just picked up the changes required to merge bitcoin#15620, bitcoin#15620 will have to wait , Partial merge of bitcoin#14987 will not work, will wait

dzutto · 2021-11-05T19:36:37Z

@vijaydasmp bitcoin#14987 is backported here: #4567
Feel free to rebase your PR once the backport is in.

dzutto · 2021-11-14T00:35:36Z

FYI - #4567 is checked in.

vijaydasmp · 2021-11-14T08:26:07Z

FYI - #4567 is checked in.

Thanks

PastaPastaPasta · 2021-11-15T19:37:34Z

Please change (Partial) Merge -> partial Merge

src/rpc/blockchain.cpp

PastaPastaPasta · 2021-11-15T19:42:42Z

src/test/crypto_tests.cpp

@@ -21,7 +21,6 @@
 #include <vector>

 #include <boost/test/unit_test.hpp>
-#include <openssl/aes.h>
 #include <openssl/evp.h>


upstream dropped evp.h should we not? (I presume it may be used, but want some clarity)

In our src/test/crypto_tests.cpp at BOOST_AUTO_TEST_CASE(pbkdf2_hmac_sha512_test) we have EVP_sha512 requiring evp.h. upstream doesn't have this testcase

PastaPastaPasta · 2021-11-15T19:43:43Z

doc/bips.md

 * [`BIP 65`](https://github.com/bitcoin/bips/blob/master/bip-0065.mediawiki): The CHECKLOCKTIMEVERIFY softfork was merged in **v0.12.0** ([PR #6351](https://github.com/bitcoin/bitcoin/pull/6351)), and backported to **v0.11.2** and **v0.10.4**. Mempool-only CLTV was added in [PR #6124](https://github.com/bitcoin/bitcoin/pull/6124).
 * [`BIP 66`](https://github.com/bitcoin/bips/blob/master/bip-0066.mediawiki): The strict DER rules and associated version 3 blocks have been implemented since **v0.10.0** ([PR #5713](https://github.com/bitcoin/bitcoin/pull/5713)).
 * [`BIP 68`](https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki): Sequence locks have been implemented as of **v0.12.1**  ([PR #7184](https://github.com/bitcoin/bitcoin/pull/7184)), and have been activated since *block 419328*.
-* [`BIP 70`](https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki) [`71`](https://github.com/bitcoin/bips/blob/master/bip-0071.mediawiki) [`72`](https://github.com/bitcoin/bips/blob/master/bip-0072.mediawiki): Payment Protocol support has been available in Bitcoin Core GUI since **v0.9.0** ([PR #5216](https://github.com/bitcoin/bitcoin/pull/5216)).
+* [`BIP 70`](https://github.com/bitcoin/bips/blob/master/bip-0070.mediawiki) [`71`](https://github.com/bitcoin/bips/blob/master/bip-0071.mediawiki) [`72`](https://github.com/bitcoin/bips/blob/master/bip-0072.mediawiki): Payment Protocol support has been available in Bitcoin Core GUI since **v0.9.0** ([PR #5216](https://github.com/bitcoin/bitcoin/pull/5216)). Support can be optionally disabled at build time since **v0.18.0** ([PR 14451](https://github.com/bitcoin/bitcoin/pull/14451)).


We should probably link our PR here?

PastaPastaPasta · 2021-11-15T19:43:55Z

doc/bips.md

@@ -15,11 +15,11 @@ BIPs that are implemented by Bitcoin Core (up-to-date up to **v0.13.0**):
 * [`BIP 35`](https://github.com/bitcoin/bips/blob/master/bip-0035.mediawiki): The 'mempool' protocol message (and the protocol version bump to 60002) has been implemented since **v0.7.0** ([PR #1641](https://github.com/bitcoin/bitcoin/pull/1641)).
 * [`BIP 37`](https://github.com/bitcoin/bips/blob/master/bip-0037.mediawiki): The bloom filtering for transaction relaying, partial Merkle trees for blocks, and the protocol version bump to 70001 (enabling low-bandwidth SPV clients) has been implemented since **v0.8.0** ([PR #1795](https://github.com/bitcoin/bitcoin/pull/1795)).
 * [`BIP 42`](https://github.com/bitcoin/bips/blob/master/bip-0042.mediawiki): The bug that would have caused the subsidy schedule to resume after block 13440000 was fixed in **v0.9.2** ([PR #3842](https://github.com/bitcoin/bitcoin/pull/3842)).
-* [`BIP 61`](https://github.com/bitcoin/bips/blob/master/bip-0061.mediawiki): The 'reject' protocol message (and the protocol version bump to 70002) was added in **v0.9.0** ([PR #3185](https://github.com/bitcoin/bitcoin/pull/3185)). Starting *v0.16.0*, whether to send reject messages can be configured with the `-enablebip61` option.
+* [`BIP 61`](https://github.com/bitcoin/bips/blob/master/bip-0061.mediawiki): The 'reject' protocol message (and the protocol version bump to 70002) was added in **v0.9.0** ([PR #3185](https://github.com/bitcoin/bitcoin/pull/3185)). Starting **v0.17.0**, whether to send reject messages can be configured with the `-enablebip61` option, and support is deprecated as of **v0.18.0**.


support has not been deprecated

vijaydasmp · 2021-11-17T14:46:58Z

Hello @PastaPastaPasta @UdjinM6 , I have updated the PR , Please have a look

doc/shared-libraries.md

src/wallet/wallet.cpp

…t more clear where OpenSSL is used a34081b Remove unused OpenSSL includes to make it more clear where OpenSSL is used (practicalswift) Pull request description: Remove unused OpenSSL includes to make it more clear where OpenSSL is used. Before this patch: ``` $ git grep '#include <openssl/' -- "*.cpp" "*.h" src/init.cpp:#include <openssl/crypto.h> src/qt/paymentrequestplus.cpp:#include <openssl/x509_vfy.h> src/qt/paymentrequestplus.h:#include <openssl/x509.h> src/qt/paymentserver.cpp:#include <openssl/x509_vfy.h> src/qt/rpcconsole.cpp:#include <openssl/crypto.h> src/qt/test/paymentservertests.cpp:#include <openssl/x509.h> src/qt/test/paymentservertests.cpp:#include <openssl/x509_vfy.h> src/qt/test/test_main.cpp:#include <openssl/ssl.h> src/qt/winshutdownmonitor.cpp:#include <openssl/rand.h> src/random.cpp:#include <openssl/err.h> src/random.cpp:#include <openssl/rand.h> src/random.cpp:#include <openssl/conf.h> src/test/crypto_tests.cpp:#include <openssl/aes.h> src/test/crypto_tests.cpp:#include <openssl/evp.h> ``` After this patch: ``` $ git grep '#include <openssl/' -- "*.cpp" "*.h" src/qt/paymentrequestplus.cpp:#include <openssl/x509_vfy.h> src/qt/paymentrequestplus.h:#include <openssl/x509.h> src/qt/paymentserver.cpp:#include <openssl/x509_vfy.h> src/qt/test/paymentservertests.cpp:#include <openssl/x509.h> src/qt/test/paymentservertests.cpp:#include <openssl/x509_vfy.h> src/qt/test/test_main.cpp:#include <openssl/ssl.h> src/qt/winshutdownmonitor.cpp:#include <openssl/rand.h> src/random.cpp:#include <openssl/err.h> src/random.cpp:#include <openssl/rand.h> src/random.cpp:#include <openssl/conf.h> ``` Removed: * `src/init.cpp:#include <openssl/crypto.h>` (unused since 5ecfa36 (2016)) * `src/qt/rpcconsole.cpp:#include <openssl/crypto.h>` (unused since 5ecfa36 (2016)) * `src/test/crypto_tests.cpp:#include <openssl/aes.h>` (introduced unused in daa3841 (2015)) * `src/test/crypto_tests.cpp:#include <openssl/evp.h>` (introduced unused in daa3841 (2015)) ACKs for commit a34081: MarcoFalke: utACK a34081b real-or-random: utACK a34081b fanquake: utACK a34081b Tree-SHA512: 8ab9699c063f2d0ed2d71738f20ac5c21336585f7f62fd3a4b23199a125ea3224725591d64171347465762181788fac1bc4ce13d8824090bf1a5ac71a66d6538

…ocks_and_test to avoid sending an unconnected one 9f9db39 QA/mininode: Send all headers upfront in send_blocks_and_test to avoid sending an unconnected one (Luke Dashjr) Pull request description: While this doesn't currently trigger any problems, the network protocol does expect headers to be sent connectable in normal circumstances, and if too many are sent out of order will disconnect the peer. ACKs for commit 9f9db3: Tree-SHA512: 25b88718e4ba3d31aed2de7ece23fab9a0737fd6536c5e618ea8eb5a3a217dab0dffaebc4892df7993bcea7efb7c4fb5085fabebe99535b8f7fdde3c19df54ff

PastaPastaPasta · 2021-11-21T02:39:41Z

doc/README_doxygen.md

+
+\section intro_sec Introduction
+
+This is the developer documentation of the reference client for an experimental new digital currency called Bitcoin,


need to dashify this

UdjinM6 · 2021-11-22T18:37:32Z

doc/bips.md

@@ -15,11 +15,11 @@ BIPs that are implemented by Bitcoin Core (up-to-date up to **v0.13.0**):
 * [`BIP 35`](https://github.com/bitcoin/bips/blob/master/bip-0035.mediawiki): The 'mempool' protocol message (and the protocol version bump to 60002) has been implemented since **v0.7.0** ([PR #1641](https://github.com/bitcoin/bitcoin/pull/1641)).
 * [`BIP 37`](https://github.com/bitcoin/bips/blob/master/bip-0037.mediawiki): The bloom filtering for transaction relaying, partial Merkle trees for blocks, and the protocol version bump to 70001 (enabling low-bandwidth SPV clients) has been implemented since **v0.8.0** ([PR #1795](https://github.com/bitcoin/bitcoin/pull/1795)).
 * [`BIP 42`](https://github.com/bitcoin/bips/blob/master/bip-0042.mediawiki): The bug that would have caused the subsidy schedule to resume after block 13440000 was fixed in **v0.9.2** ([PR #3842](https://github.com/bitcoin/bitcoin/pull/3842)).
-* [`BIP 61`](https://github.com/bitcoin/bips/blob/master/bip-0061.mediawiki): The 'reject' protocol message (and the protocol version bump to 70002) was added in **v0.9.0** ([PR #3185](https://github.com/bitcoin/bitcoin/pull/3185)). Starting *v0.16.0*, whether to send reject messages can be configured with the `-enablebip61` option.
+* [`BIP 61`](https://github.com/bitcoin/bips/blob/master/bip-0061.mediawiki): The 'reject' protocol message (and the protocol version bump to 70002) was added in **v0.9.0** ([PR #3185](https://github.com/bitcoin/bitcoin/pull/3185)). Starting **v0.17.0**, whether to send reject messages can be configured with the `-enablebip61` option.


15763: should keep v0.16.0

Suggested change

* [`BIP 61`](https://github.com/bitcoin/bips/blob/master/bip-0061.mediawiki): The 'reject' protocol message (and the protocol version bump to 70002) was added in **v0.9.0** ([PR #3185](https://github.com/bitcoin/bitcoin/pull/3185)). Starting **v0.17.0**, whether to send reject messages can be configured with the `-enablebip61` option.

* [`BIP 61`](https://github.com/bitcoin/bips/blob/master/bip-0061.mediawiki): The 'reject' protocol message (and the protocol version bump to 70002) was added in **v0.9.0** ([PR #3185](https://github.com/bitcoin/bitcoin/pull/3185)). Starting **v0.16.0**, whether to send reject messages can be configured with the `-enablebip61` option.

UdjinM6 · 2021-11-22T18:40:54Z

doc/Doxyfile.in

@@ -989,7 +989,7 @@ FILTER_SOURCE_PATTERNS =
 # (index.html). This can be useful if you have a project on for instance GitHub
 # and want to reuse the introduction page also for the doxygen output.

-USE_MDFILE_AS_MAINPAGE =
+USE_MDFILE_AS_MAINPAGE = doc/README_doxygen.md


16912: missing similar changes for INPUT

implemented the Review comment

65d2f5d Update bips.md for 0.18.0 (Pieter Wuille) Pull request description: Update `doc/bips.md` for changes in 0.17 and 0.18 (BIP 61 deprecated, BIP 70 support optional, BIP 159 connection logic). ACKs for commit 65d2f5: MarcoFalke: ACK 65d2f5d fanquake: utACK 65d2f5d promag: ACK 65d2f5d, referenced pulls match. Tree-SHA512: a261aae196c90d4fab7925e53e61cdd02e39050cb09eb5a89002f2d8304e26782ec4811f77bfc9e92a5b1b675020c324ca91c9a111ccbd3ae90b80821607c7c9

dbdc758 doc: Improve doxygen readme navigation section (Jon Layton) c15ac2c doc: Move doxygen intro to file for USE_MDFILE_AS_MANPAGE (Jon Layton) Pull request description: With `USE_MDFILE_AS_MAINPAGE`, this moves the introductory Doxygen comment to its own file. This makes `bitcoind.cpp` cleaner. It also removes the `\mainpage` header text, which was smaller than the section titles, and improves the Navigation section. ACKs for top commit: promag: ACK dbdc758. Tree-SHA512: 9352baad655877437913b74dc8888a71d1cccf55a837657ee2630fde3f427d0f0339155b7ab3d9e63a9edb9d53512d747eafcb11987a7c26c47a6df2eca93351

fadd6e0 doc: Remove mention of renamed mapBlocksUnlinked (MarcoFalke) Pull request description: This has been renamed to `m_blocks_unlinked`. Instead of adjusting the internal variable name in the help text, explain the debug flag with more general terms. ACKs for top commit: practicalswift: ACK fadd6e0 -- diff looks correct promag: ACK fadd6e0. laanwj: ACK fadd6e0 (as argument help is not translated this doesn't have to wait for the split-off) Tree-SHA512: 8ad64965ab5bbba4b92933a5adcb0c9eda5bdb0cc080840a4a97b12c67f41f9b789fd289df4932d748f5a7eebc7305a000f03ceb968a78c9b5d9f34af61f0b15

6011c9d QA: fix rpc_setban.py race (Jonas Schnelli) Pull request description: The new `rpc_setban.py` test failes regularly on CIs due to a race between injecting the ban and testing the log "on the other side". The problem is, that the test immediately after the `addnode` command on node0 checks for the `dropped (banned)` entry on node1 (without giving some time). Adding a 2 seconds sleep seems to solve the race (I guess there is no better event-driven delay). Example of a failed test: https://bitcoinbuilds.org/index.php?ansilog=bf743910-103f-4b54-9a97-960c471061bd.log#l2906 Top commit has no ACKs. Tree-SHA512: 680f8ea3e5ddb07e93f824f1aeff4a459e25e6c14715a39fc7670e50506d7cf25925348672c5c2d8ba3e1243ccf5effbc2456bcd094fb96868349f8d26e008f1

fae91a0 test: Remove incorrect and unused try-block in assert_debug_log (MarcoFalke) Pull request description: This try block has accidentally been added by me in fa3e9f7. It was unused all the time, but commit 6011c9d added a `return` in the finally block, muting all exceptions. This can be tested by adding an `assert False` after any `with ...assert_debug_log...:` line. ACKs for top commit: laanwj: ACK fae91a0 ryanofsky: utACK fae91a0. I didn't know returning inside a `finally` block would cancel pending exceptions or return values, but I guess this makes sense and is a good thing to be aware of. Tree-SHA512: 47ed0165062060e9af055a3e92f1a529cd41d00476bfad64e3cd141ae084d22f926a343bb1257717e164e15459a59ab66aed198c95d18bf780d8cb0b76aa3298

UdjinM6

utACK

PastaPastaPasta

utACK for merging via merge commit

vijaydasmp force-pushed the bp_19_4 branch 4 times, most recently from cb487cc to 0e4dcca Compare November 12, 2021 12:30

vijaydasmp marked this pull request as ready for review November 14, 2021 18:45

PastaPastaPasta requested changes Nov 15, 2021

View reviewed changes

vijaydasmp force-pushed the bp_19_4 branch from 77180c7 to 638064e Compare November 16, 2021 15:19

vijaydasmp requested review from PastaPastaPasta and UdjinM6 November 16, 2021 15:21

vijaydasmp marked this pull request as draft November 16, 2021 17:57

vijaydasmp marked this pull request as ready for review November 16, 2021 17:59

vijaydasmp marked this pull request as draft November 16, 2021 18:14

vijaydasmp force-pushed the bp_19_4 branch from 638064e to 6f33e63 Compare November 17, 2021 03:53

vijaydasmp marked this pull request as ready for review November 17, 2021 06:14

vijaydasmp changed the title ~~bp_v19_4~~ Merge bitcoin#15530,bitcoin#15919,bitcoin#15897,bitcoin#15763,bitcoin#15765,bitcoin#16912,bitcoin#17001,bitcoin#16656,bitcoin#16804: Nov 17, 2021

UdjinM6 changed the title ~~Merge bitcoin#15530,bitcoin#15919,bitcoin#15897,bitcoin#15763,bitcoin#15765,bitcoin#16912,bitcoin#17001,bitcoin#16656,bitcoin#16804:~~ Merge 15530, 15919, 15897, 15763, 15765, 16912, 17001, 16656, 16804: Nov 17, 2021

vijaydasmp marked this pull request as draft November 19, 2021 14:41

vijaydasmp marked this pull request as ready for review November 19, 2021 14:41

UdjinM6 requested changes Nov 20, 2021

View reviewed changes

doc/shared-libraries.md Outdated Show resolved Hide resolved

src/wallet/wallet.cpp Outdated Show resolved Hide resolved

vijaydasmp force-pushed the bp_19_4 branch from 25d7554 to 4e9648e Compare November 21, 2021 00:22

MarcoFalke added 2 commits November 21, 2021 07:13

vijaydasmp force-pushed the bp_19_4 branch from 4e9648e to 6f07a4c Compare November 21, 2021 01:44

PastaPastaPasta requested changes Nov 21, 2021

View reviewed changes

UdjinM6 changed the title ~~Merge 15530, 15919, 15897, 15763, 15765, 16912, 17001, 16656, 16804:~~ Merge 15919, 15897, 15763, 16912, 17001, 16656, 16804: Nov 21, 2021

UdjinM6 changed the title ~~Merge 15919, 15897, 15763, 16912, 17001, 16656, 16804:~~ Merge 15919, 15897, 15763, 16912, 17001, 16656, 16804 Nov 21, 2021

vijaydasmp force-pushed the bp_19_4 branch from daa5827 to 4a656b4 Compare November 22, 2021 01:09

vijaydasmp requested a review from PastaPastaPasta November 23, 2021 02:07

UdjinM6 requested changes Nov 23, 2021

View reviewed changes

vijaydasmp requested a review from UdjinM6 November 24, 2021 14:03

MarcoFalke and others added 5 commits November 25, 2021 06:38

vijaydasmp force-pushed the bp_19_4 branch from 4a656b4 to 7874e78 Compare November 25, 2021 01:09

UdjinM6 approved these changes Nov 29, 2021

View reviewed changes

UdjinM6 added this to the 18 milestone Nov 29, 2021

PastaPastaPasta approved these changes Nov 30, 2021

View reviewed changes

PastaPastaPasta merged commit d99ea37 into dashpay:develop Nov 30, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge 15919, 15897, 15763, 16912, 17001, 16656, 16804 #4555

Merge 15919, 15897, 15763, 16912, 17001, 16656, 16804 #4555

vijaydasmp commented Oct 30, 2021

vijaydasmp commented Oct 30, 2021 •

edited

Loading

dzutto commented Nov 5, 2021

dzutto commented Nov 14, 2021

vijaydasmp commented Nov 14, 2021

PastaPastaPasta commented Nov 15, 2021

PastaPastaPasta Nov 15, 2021

vijaydasmp Nov 16, 2021

PastaPastaPasta Nov 15, 2021

PastaPastaPasta Nov 15, 2021

vijaydasmp commented Nov 17, 2021

PastaPastaPasta Nov 21, 2021

UdjinM6 Nov 22, 2021

UdjinM6 Nov 22, 2021

vijaydasmp Nov 27, 2021

UdjinM6 left a comment

PastaPastaPasta left a comment


		\section intro_sec Introduction

		This is the developer documentation of the reference client for an experimental new digital currency called Bitcoin,

	* [`BIP 61`](https://github.com/bitcoin/bips/blob/master/bip-0061.mediawiki): The 'reject' protocol message (and the protocol version bump to 70002) was added in v0.9.0 ([PR #3185](https://github.com/bitcoin/bitcoin/pull/3185)). Starting v0.17.0, whether to send reject messages can be configured with the `-enablebip61` option.
	* [`BIP 61`](https://github.com/bitcoin/bips/blob/master/bip-0061.mediawiki): The 'reject' protocol message (and the protocol version bump to 70002) was added in v0.9.0 ([PR #3185](https://github.com/bitcoin/bitcoin/pull/3185)). Starting v0.16.0, whether to send reject messages can be configured with the `-enablebip61` option.

Merge 15919, 15897, 15763, 16912, 17001, 16656, 16804 #4555

Merge 15919, 15897, 15763, 16912, 17001, 16656, 16804 #4555

Conversation

vijaydasmp commented Oct 30, 2021

vijaydasmp commented Oct 30, 2021 • edited Loading

dzutto commented Nov 5, 2021

dzutto commented Nov 14, 2021

vijaydasmp commented Nov 14, 2021

PastaPastaPasta commented Nov 15, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vijaydasmp commented Nov 17, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

UdjinM6 left a comment

Choose a reason for hiding this comment

PastaPastaPasta left a comment

Choose a reason for hiding this comment

vijaydasmp commented Oct 30, 2021 •

edited

Loading