[0.19] Backports

fanquake commented at 3:22 am on May 20, 2020: member

Backports the following to the 0.19 branch:

#17946 - Fix GBT: Restore “!segwit” and “csv” to “rules” key
#18160 - gui: Avoid Wallet::GetBalance in WalletModel::pollBalanceChanged
#18425 - releases: Update with new Windows code signing certificate
#18676 - build: Check libevent minimum version in configure script
#19097 - qt: Add missing QPainterPath include (as per #19510)
#18640 - appveyor: Remove clcache
#19444 - test: Remove cached directories and associated script blocks from appveyor config
#19612 - lint: fix shellcheck URL in CI install
#18001 - Updated appveyor job to checkout a specific vcpkg commit ID

Closes: #19510.

Update with new Windows code signing certificate

Github-Pull: #18425
Rebased-From: 3e0df92bf216e1dce05ca9bf14049f2e42783c30

0d0dd6ae96

build: Set libevent minimum version to 2.0.21

Github-Pull: #18676
Rebased-From: b68e71796792a9da9daa0a4e759d284d15595230

e422f65aee

Bugfix: Include "csv","!segwit" in "rules"

They have been missing since buried deployments were merged

Github-Pull: #17946
Rebased-From: 2abe8cc3b760219cfa434e4c96e9f8d3611d0037

bde6a5a676

QA: feature_segwit: Check that template "rules" includes "!segwit" as appropriate

Github-Pull: #17946
Rebased-From : 412d5fe8791c417bf46fc55a5bb8d59be98a33db

0d87a5b4e2

fanquake added the label Backport on May 20, 2020

fanquake added this to the milestone 0.19.2 on May 20, 2020

promag commented at 9:20 am on May 20, 2020: member

Do you want to include #18542 here?

gui: Avoid Wallet::GetBalance in WalletModel::pollBalanceChanged

Github-Pull: #18160
Rebased-From: 0933a37078e1ce3a3d70983c3e7f4b3ac6c3fa37

30a28146ac

fanquake commented at 1:02 pm on June 9, 2020: member

Do you want to include #18542 here?

Thanks. I’ve pulled in d3cfe0d6a472c748142b96c33de866478cca5545 from that PR.

luke-jr changes_requested

luke-jr commented at 4:09 am on June 11, 2020: member

#19185 is a clean merge of the original commit. No need for an ugly re-commit as here.

Should remove the commits here, and reopen #19185 instead

promag commented at 4:21 pm on June 29, 2020: member

#19300 was merged.

Add missing QPainterPath include

This is needed to compile with Qt 5.15.

Github-Pull: #19097
Rebased-From: 79b0a69e09c1a912122e6431ea3c530cc292c690

b7e16a82c9

test: remove Cirrus CI FreeBSD job

This has been removed from the master branch, and always seems to fail
at the installing packages phase. i.e:
```bash
pkg install -y autoconf automake boost-libs git gmake libevent libtool pkgconf python3 ccache
Updating FreeBSD repository catalogue...
Fetching meta.txz: . done
pkg: repository meta /var/db/pkg/FreeBSD.meta has wrong version 2
repository FreeBSD has no meta file, using default settings
Fetching packagesite.txz: .......... done
pkg: repository meta /var/db/pkg/FreeBSD.meta has wrong version 2
pkg: Repository FreeBSD load error: meta cannot be loaded No error: 0
Unable to open created repository FreeBSD
Unable to update repository FreeBSD
Error updating repositories!

Exit status: 3
```

Github-Pull: #19224
Rebased-From: e7f06f9b0e84a65812d24ff6efa4bc2d3d818590

f8f7d91b80

lint: fix shellcheck URL in CI install

This is causing the tests to fail for backports etc.

Github-Pull: #19612
Rebased-From: 7ee4769cd4be0975254b218134d057c2bb443509

d70f700021

Remove cached directories and associated script blocks from appveyor CI configuration.

Github-Pull: #19444
Rebased-From: 961e667600441c35845fcb36b120500c813cd3ed

8c0a9595ec

appveyor: Remove clcache

Github-Pull: #18640
Rebased-From: fac0c8db9f634ea7231fb0b6dc139ae0bda4a051

1fd9cd2cb4

Updated appveyor job to checkout a specific vcpkg commit ID.

Github-Pull: #18001
Rebased-From: 2bcc70531ac88e29a7d59a1ab8c787c55e7f88f5

be951470be

jnewbery commented at 8:41 am on August 11, 2020: member

ACK be951470bea132b4cbe1823cd564bf14aaf0ea7e

I ran range-diff for each of the individual commits to verify that they were unchanged, and did a quick scan over each commit.

The only ones that were slightly unclean cherry picks were the appveyor commits.

MarcoFalke commented at 9:07 am on August 11, 2020: member

cherry-pick ACK be951470bea132b4cbe1823cd564bf14aaf0ea7e 🌎

Signature:

 0-----BEGIN PGP SIGNED MESSAGE-----
 1Hash: SHA512
 2
 3cherry-pick ACK be951470bea132b4cbe1823cd564bf14aaf0ea7e 🌎
 4-----BEGIN PGP SIGNATURE-----
 5
 6iQGzBAEBCgAdFiEE+rVPoUahrI9sLGYTzit1aX5ppUgFAlwqrYAACgkQzit1aX5p
 7pUhiqAv+LLwsV4mNGsaTSOa3q9mT14B/bWuib9+CFffg8lBvedHfjs/B/jRRkbDt
 8R8zCFOZPJHed/8M3ICUYHi04FJkO5y4Bh8TzIY8087SPM6sDatE/MWXSCe5f9Ttt
 9aFTfYx19As/yaE4cMJZD+/3pwHVObZuQ4nzu9TZYbtUBRoJj912QP5Yq+gBZXxwt
10M10O6pwz7e5IXwGCPeIIlhMLgiqmom7pJIsijZi3PaGeH+oR8sBnxB99B4dVwiJl
11+E7VQSVldHNjoNcSftvp41deDc1L79hFn3au4ws2Zq6y1BXlgAxLOqBmkGSS6y1H
12Qvq+YrtQM/pGblgRuXUD3Nb3qbehk7mVPka+RlI3diyj1yB6YbG0YAjDxvDmkQgp
13VBqW7loKrAnxO6VRpaZ8+SGZyWwCQQQEii25WKvRZm4xR/5AoJgHv4PU1hK89jei
14lzayyDZVUqbWS8PDD4zhes28m1u5iZaTKgALYFegyxnRl5YHuwSfACuLjQT2CMYM
15wpMzwC5O
16=AqoC
17-----END PGP SIGNATURE-----

Timestamp of file with hash 85457e8568a50d11680719483b91ec171c3e108883edca3d38bbae169190b69a -

in .appveyor.yml:27 in be951470be

47-      c:\tools\vcpkg\vcpkg integrate install
48+      Write-Host "vcpkg installing packages: $env:PACKAGES"
49+      cd c:\tools\vcpkg
50+      $env:GIT_REDIRECT_STDERR = '2>&1' # git is writing non-errors to STDERR when doing git pull. Send to STDOUT instead.
51+      git pull origin master > $null
52+      git checkout $env:VCPKG_COMMIT_ID

MarcoFalke commented at 9:08 am on August 11, 2020:

Any reason to check out the same commit twice?

You can avoid the conflicts by cherry-picking in the correct order:

0$ git log -3 --oneline 
1a51ffbe92c (HEAD) Remove cached directories and associated script blocks from appveyor CI configuration.
26646b5f891 appveyor: Remove clcache
3bd95892b0d Updated appveyor job to checkout a specific vcpkg commit ID.

MarcoFalke merged this on Aug 11, 2020

MarcoFalke closed this on Aug 11, 2020

MarcoFalke commented at 10:01 am on August 11, 2020: member

#19300 was merged.

This wasn’t included here, but I went ahead and merged this to make the ci green on the other backport pulls

fanquake deleted the branch on Aug 11, 2020

MarkLTZ referenced this in commit 53e070ab7a on Nov 7, 2020

DrahtBot locked this on Feb 15, 2022

[0.19] Backports #19025