[0.18.2] Backports

fanquake commented at 2:03 am on August 15, 2019: member

Backports some commits to the 0.18 branch:

#16596 - rpc: Fix getblocktemplate CLI example
#16615 - doc: Fix typos in COPYRIGHT
#16291 - gui: Stop translating PACKAGE_NAME (without the make translate commit)
#16578 - Do not pass in command line arguments to QApplication
#16051 - depends: add patch to common dependencies
#16090 - Add vertical spacer
#15651 - torcontrol: Use the default/standard network port for Tor hidden services, even if the internal port is set differently
#15650 - Handle the result of posix_fallocate system call
#16646 - Bugfix: QA: Run tests with UPnP disabled
#16212 - addrdb: Remove temporary files created in SerializeFileDB. Fixes non-determinism in unit tests.
#16512 - rpc: Shuffle inputs and outputs after joining psbts
#16870 - build: update boost macros to latest upstream for improved error reporting
#16982 - build: Factor out qt translations from build system
#17095 - util: Filter control characters out of log messages

fanquake added the label Backport on Aug 15, 2019

fanquake added this to the milestone 0.18.2 on Aug 15, 2019

luke-jr commented at 8:31 pm on August 23, 2019: member

Suggest adding luke-jr/bitcoin 20190823-0.18-backports branch in. That adds:

#16051 - depends: add patch to common dependencies
Part of #15758 to make #16079 cleaner:
- test: Check that wallet txs not in the mempool are untrusted
- test: Add reorg test to wallet_balance
#16079 - wallet_balance.py: Prevent edge cases
#16090 - Add vertical spacer
#16144 - wallet: do not encrypt wallets with disabled private keys
#15651 - torcontrol: Use the default/standard network port for Tor hidden services, even if the internal port is set differently
#15650 - Handle the result of posix_fallocate system call
#16646 - Bugfix: QA: Run tests with UPnP disabled
#16212 - addrdb: Remove temporary files created in SerializeFileDB. Fixes non-determinism in unit tests.

fanquake force-pushed on Aug 24, 2019

fanquake commented at 1:33 am on August 24, 2019: member

Rebased on 0.18 and added a bunch of the suggested commits, will take a look at the remaining later.

fanquake commented at 1:59 am on September 19, 2019: member

Added #16512. Note that in the first commit the header include has been changed from #include <rpc/rawtransaction_util.h> to #include <rpc/rawtransaction.h>.

fanquake commented at 2:17 am on September 21, 2019: member

Added #16870. Note that the commit differs in that the boost_base.m4 includes additional changes to update it to the latest upstream, which was updated in master as part of 2620e24b83d16bf0f2bfe360dee1e98b4be59ca5.

doc: Fix typos in COPYRIGHT

Fixed a couple of typos

Github-Pull: #16615
Rebased-From: 36f7697cf6c129cabff2a698a52115829cd0d1fb

1cc06a1b67

rpc: Fix getblocktemplate CLI example (#16594)

Github-Pull: #16596
Rebased-From: 14f7eec3bdb15a9a75f8686c0a3e879aa8ceef47

7bd8f4e432

build: Stop translating PACKAGE_NAME

Github-Pull: #16291
Rebased-From: fa5e9f157e568b7fbbea1482b393181f0733f2ba

a44e18f20b

scripted-diff: Avoid passing PACKAGE_NAME for translation

-BEGIN VERIFY SCRIPT-
sed -i --regexp-extended -e 's/\<\w+(::\w+)?\(PACKAGE_NAME\)/PACKAGE_NAME/g' $(git grep -l --extended-regexp '\<\w+(::\w+)?\(PACKAGE_NAME\)' src)
-END VERIFY SCRIPT-

Github-Pull: #16291
Rebased-From: fabe87d2c923ab3a70b8cde2666a4d1cda8b22fb

87908e9c98

util: No translation of `Bitcoin Core` in the copyright

Github-Pull: #16291
Rebased-From: fa64b947bb3075ff8737656706b941af691908ab

9d389d09ed

Give QApplication dummy arguments

QApplication takes the command line arguments and parses them itself
for some built in command line arguments that it has. We don't want
any of those built in arguments, so instead give it dummy arguments.

Github-Pull: #16578
Rebased-From: a2714a5c69f0b0506689af04c3e785f71ee0915d

56815e9e12

depends: add patch to common dependencies

Github-Pull: #16051
Rebased-From: 4de3c15671fea211c22b14c64ec9ac2524fcfca9

d764141b01

Add vertical spacer

Github-Pull: #16090
Rebased-From: 36b0a2f2a6b49008c4f37866a9e3ab702eb34eda

1d12e52db0

Bugfix: QA: Run tests with UPnP disabled

Needed for builds configured with --enable-upnp-default

Github-Pull: #16646
Rebased-From: b168dd30cf71ac176e271bc610b0b1a79ceaf075

9fe8d283e0

torcontrol: Use the default/standard network port for Tor hidden services, even if the internal port is set differently

Currently, the hidden service is published on the same port as the public listening port.
But if a non-standard port is configured, this can be used to guess (pretty reliably) that the public IP and the hidden service are the same node.

Github-Pull: #15651
Rebased-From: 8a2656702b4b5d53d1b8343c3215302e4305a038

f792b25d14

Handle the result of posix_fallocate system call

Github-Pull: #15650
Rebased-From: 5d35ae3326624da3fe5dcb4047c9a7cec6665cab

c52dd120fd

addrdb: Remove temporary files created in SerializeFileDB. Fixes non-determinism in unit tests.

Github-Pull: #16212
Rebased-From: d9753383b9e1b61d19d98bcd1d66607f398c7e9f

1175410be5

Shuffle inputs and outputs after joining psbts

Github-Pull: #16512
Rebased-From: 6f405a1d3b38395e35571b68aae55cae50e0762a

eb07d22b2d

Test that joinpsbts randomly shuffles the inputs

Github-Pull: #16512
Rebased-From: c0b5d9710322a614a50ab5da081558cf6a38ad2a

b12defc3bc

fanquake force-pushed on Sep 23, 2019

build: update boost macros to latest upstream

Fixes: #16803

I opened an [upstream PR](https://github.com/autoconf-archive/autoconf-archive/pull/197) to improve the Boost error reporting, so pull the latest macros.

Github-Pull: #16870
Rebased-From: bb99c4e684bbd3053ecf7a789049b11b29260189

3b8af5f383

build: Factor out qt translations from build system

Move qt translations to a separate make include file.
This makes it easier to auto-generate this list from tooling
(see bitcoin-core/bitcoin-maintainer-tools#36).

Github-Pull: #16982
Rebased-From: 4320bfc0c0d88633c84146f8d640f5b6e4596244

ac30fc4f59

fanquake force-pushed on Oct 1, 2019

MarcoFalke commented at 9:04 pm on October 11, 2019: member

What is the status of this?

fanquake commented at 1:57 pm on October 12, 2019: member

@MarcoFalke There’s a fair few commits in here. I’d like it to get some review and be merged rather than add any more changes.

util: Filter control characters out of log messages

Belts and suspenders: make sure outgoing log messages don't contain
potentially suspicious characters, such as terminal control codes.

This escapes control characters except newline ('\n') in C syntax.
It escapes instead of removes them to still allow for troubleshooting
issues where they accidentally end up in strings.

Github-Pull: #17095
Rebased-From: d7820a1250070f3640246ae497e049bee0b3516f

0b18ea6f57

laanwj commented at 3:41 pm on November 25, 2019: member

ACK 0b18ea6f570e24c9719c10eb6e125da743409c58

I repeated the cherry-picks here and resolved the conflicts in pretty much the same way.

laanwj merged this on Nov 25, 2019

laanwj referenced this in commit 29d70264fb on Nov 25, 2019

laanwj closed this on Nov 25, 2019

fanquake deleted the branch on Nov 25, 2019

DrahtBot locked this on Dec 16, 2021

[0.18.2] Backports #16617