[22.x] Backports #22857

1. 
   fanquake commented at 1:39 am on September 2, 2021: member

   Backports:

   • #22847 - guix/prelude: Override VERSION with FORCE_VERSION
   • #22837 - doc: mention bech32m/BIP350 in doc/descriptors.md

   Theses are both minor enough that they would not require and rc4.

2. doc: mention bech32m/BIP350 in doc/descriptors.md

   Github-Pull: #22837
   Rebased-From: d2a09c83554cec864a27e704cf2a0d513691a567

   0640bf5c82
3. guix/prelude: Override VERSION with FORCE_VERSION

   Previously, if the builder exported $VERSION in their environment (as
   past Gitian-building docs told them to), but their HEAD does not
   actually point to v$VERSION, their build outputs will differ from those
   of other builders.
   
   This is because the contrib/guix/guix-* scripts only ever act on the
   current git worktree, and does not try to check out $VERSION if $VERSION
   is set in the environment.
   
   Setting $VERSION only makes the scripts pretend like the current
   worktree is $VERSION.
   
   This problem was seen in jonatack's attestation for all.SHA256SUMS,
   where only his bitcoin-22.0rc3-osx-signed.dmg differed from everyone
   else's.
   
   Here is my deduced sequence of events:
   
   1. Aug 27th: He guix-builds 22.0rc3 and uploads his attestations up to
      guix.sigs
   
   2. Aug 30th, sometime after POSIX time 1630310848: he pulls the latest
      changes from master in the same worktree where he guix-built 22.0rc3
      and ends up at 7be143a960e2
   
   3. Aug 30th, sometime before POSIX time 1630315907: With his worktree
      still on 7be143a960e2, he guix-codesigns. Normally, this would result
      in outputs going in guix-build-7be143a960e2, but he had
      VERSION=22.0rc3 in his environment, so the guix-* scripts pretended
      like he was building 22.0rc3, and used 22.0rc3's guix-build directory
      to locate un-codesigned outputs and dump codesigned ones.
   
      However, our SOURCE_DATE_EPOCH defaults to the POSIX time of HEAD
      (7be143a960e2), which made all timestamps in the resulting codesigned
      DMG 1630310848, 7be143a960e2's POSIX timestamp. This differs from the
      POSIX timestamp of 22.0rc3, which is 1630348517. Note that the
      windows codesigning procedure does not consider SOURCE_DATE_EPOCH.
   
   We resolve this by only allowing VERSION overrides via the FORCE_VERSION
   environment variable.
   
   Github-Pull: #22847
   Rebased-From: 96cc6bb04f7e173e1f7637b780ac00fc75486671

   303bc8a069
4. fanquake added the label Backport on Sep 2, 2021
5. fanquake added this to the milestone 22.0 on Sep 2, 2021
6. 
   jonatack commented at 9:45 am on September 2, 2021: member

   Maybe backport the getpeerinfo addr_processed and addr_rate_limited helps in https://github.com/bitcoin/bitcoin/pull/22604/files (feel free to ignore).
7. 
   laanwj commented at 2:29 pm on September 8, 2021: member

   ACK 303bc8a0697fda00f21173dc9ae863357adac793 As it is now, this could be merged into 22.0 before final without needing another rc.
8. laanwj referenced this in commit 5dee635326 on Sep 8, 2021
9. laanwj merged this on Sep 8, 2021
10. laanwj closed this on Sep 8, 2021

    ---

11. fanquake deleted the branch on Sep 9, 2021
12. fanquake locked this on Sep 9, 2021

Contributors
fanquake jonatack laanwj

Labels
Backport

Milestone
22.0