Skip to content

Conversation

@fanquake
Copy link
Member

@fanquake fanquake commented Sep 2, 2021

Backports:

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

sipa and others added 2 commits September 2, 2021 09:37
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 7be143a

3. Aug 30th, sometime before POSIX time 1630315907: With his worktree
   still on 7be143a, 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
   (7be143a), which made all timestamps in the resulting codesigned
   DMG 1630310848, 7be143a'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: bitcoin#22847
Rebased-From: 96cc6bb
@jonatack
Copy link
Member

jonatack commented Sep 2, 2021

Maybe backport the getpeerinfo addr_processed and addr_rate_limited helps in https://github.com/bitcoin/bitcoin/pull/22604/files (feel free to ignore).

@laanwj
Copy link
Member

laanwj commented Sep 8, 2021

ACK 303bc8a
As it is now, this could be merged into 22.0 before final without needing another rc.

@laanwj laanwj merged commit 03f1422 into bitcoin:22.x Sep 8, 2021
@fanquake fanquake deleted the more_22_x_backports branch September 9, 2021 00:07
@bitcoin bitcoin locked and limited conversation to collaborators Sep 9, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants