[0.20] Backports #20166

pull fanquake wants to merge 10 commits into bitcoin:0.20 from fanquake:more_020_backports changing 11 files +70 −31

fanquake commented at 4:28 AM on October 16, 2020: member
Backports the following PRs to the 0.20 branch:
- #19777 - docs: Correct description for getblockstats's txs field
- #19836 - rpc: Properly deserialize txs with witness before signing
- #20080 - Strip any trailing / in -datadir and -blocksdir paths
- #20082 - [bugfix] random: fixes read buffer to use min rather than max
- #20141 - Avoid the use of abs64 in timedata
- #20146 - net: Send post-verack handshake messages at most once
- #20195 - build: fix mutex detection when building bdb on macOS
- #20298 - macOS deploy: use the new plistlib API
Will add additional commits as they become available.

docs: Correct description for getblockstats's txs field

It does count the coinbase transaction.

Refs #19766

Github-Pull: #19777
Rebased-From: 4148f55dd016f940df50a44cf03d117cdb1dd929

05bd0c220a

Avoid the use of abs64 in timedata

Github-Pull: #20141
Rebased-From: d1292f25f272401da0c58580521c74b1fa03a9ad

ee0082b886

rpc: Properly deserialize txs with witness before signing

Github-Pull: #19836
Rebased-From: cccc7525697e7b8d99b545e34f0f504c78ffdb94

731502a183

rpc: Adjust witness-tx deserialize error message

Github-Pull: #19836
Rebased-From: 33330778230961cfbf2a24de36b5877e395cc596

bdf15d0d5d

fanquake added the label Backport on Oct 16, 2020
fanquake added this to the milestone 0.20.2 on Oct 16, 2020
fanquake cross-referenced this on Oct 16, 2020 from issue docs: Correct description for getblockstats's txs field by shesek
fanquake cross-referenced this on Oct 16, 2020 from issue rpc: Properly deserialize txs with witness before signing by MarcoFalke

net: Send post-verack handshake messages at most once

Github-Pull: #20146
Rebased-From: fa1f6f237d02265af616129402fa2b8a3019dda5

6113b547f4

fanquake cross-referenced this on Oct 19, 2020 from issue net: Send post-verack handshake messages at most once by MarcoFalke

random: fixes read buffer resizing in RandAddSeedPerfmon

+ Replaces std::max with std::min to resize buffer in RandAddSeedPerfmon
+ Documents behavior of RandAddSeedPerfmon

Github-Pull: #20082
Rebased-From: bd5215103eb3985c1622eddea45a040e6173829c

1f67a30e83

fanquake cross-referenced this on Oct 23, 2020 from issue [bugfix] random: fixes read buffer to use min rather than max by EthanHeilman
jnewbery commented at 9:30 AM on October 29, 2020: member

utACK 1f67a30e8374951997af924293c60eff56ae39ed

Manually verified all the cherry picks were the same as master.

build: fix mutex detection when building bdb on macOS

Starting with the Clang shipped with Xcode 12, Apple has enabled
-Werror=implicit-function-declaration by default. This causes bdbs mutex
detection to fail when building on macOS (not cross-compiling):

checking for mutexes... UNIX/fcntl
configure: WARNING: NO SHARED LATCH IMPLEMENTATION FOUND FOR THIS PLATFORM.
configure: error: Unable to find a mutex implementation

as previously emitted warnings are being turned into errors. i.e:

error: implicitly declaring library function 'exit' with type 'void (int) __attribute__((noreturn))' [-Werror,-Wimplicit-function-declaration]

Append -Wno-error=implicit-function-declaration to cflags so that
-Wimplicit-function-declaration returns to being a warning, and the
configure checks will succeed.

Fixes #19411.

Github-Pull: #20195
Rebased-From: d0a829e9632379e42f0be5c554e3b692f0d14a95

314e79581f

fanquake cross-referenced this on Oct 30, 2020 from issue build: fix mutex detection when building bdb on macOS by fanquake
fanquake cross-referenced this on Nov 6, 2020 from issue Backport wtxid orphan fetch to v0.20 by jnewbery

macOS deploy: use the new plistlib API

See https://docs.python.org/3/library/plistlib.html.
The new API was added in 3.4 and old removed in 3.9.

Github-Pull: 20298
Rebased-From: 04a69c200e0d18ae63c7e47898f85d1b4cb5c23d

8ef0dace86

fanquake cross-referenced this on Nov 6, 2020 from issue macOS deploy: use the new plistlib API by jonasschnelli

util: Add StripRedundantLastElementsOfPath function

Co-authored-by: saibato <saibato.naga@pm.me>
Co-authored-by: MarcoFalke <falke.marco@gmail.com>

Github-Pull: 20080
Rebased-From: b19e88230f0e93e95e883e65376963cb9c36f606

09261de6ed

doc: Update data directory path comments

Github-Pull: #20080
Rebased-From: ad5cef5dfdd5802fc187a52e74d940a52f420a51

7566af419f

fanquake cross-referenced this on Nov 6, 2020 from issue Strip any trailing `/` in -datadir and -blocksdir paths by hebasto

MarcoFalke commented at 9:53 AM on November 16, 2020: member

review ACK 7566af419f3e7060152ae062f5a578f543a16a5a 🗡

<details><summary>Show signature and timestamp</summary>

Signature:

python: error while loading shared libraries: libpython3.8.so.1.0: cannot open shared object file: No such file or directory

</details>

MarcoFalke merged this on Nov 18, 2020
MarcoFalke closed this on Nov 18, 2020
MarkLTZ referenced this in commit c61e643b75 on Nov 21, 2020
laanwj cross-referenced this on Nov 23, 2020 from issue Revert "Merge #19606: Backport wtxid relay to v0.20" by MarcoFalke
fanquake deleted the branch on Apr 8, 2021
bitcoin locked this on Aug 16, 2022

Contributors

Labels

Milestone
0.20.2

Linked (view graph)

#19777 docs: Correct description for getblockstats's txs field #19836 rpc: Properly deserialize txs with witness before signing #20080 Strip any trailing `/` in -datadir and -blocksdir paths #20082 [bugfix] random: fixes read buffer to use min rather than max #20141 Avoid the use of abs64 in timedata #20146 net: Send post-verack handshake messages at most once #20195 build: fix mutex detection when building bdb on macOS #20298 macOS deploy: use the new plistlib API #20317 Backport wtxid orphan fetch to v0.20 #20399 Revert "Merge #19606: Backport wtxid relay to v0.20"