UASF/bitcoin

Should we track and regularly update from upstream?

Closed this issue · 11 comments

mkwia commented

This would reduce the diff to only UASF code. Please discuss.

bikeangel commented

I was about to write the same thing.
As a user of this repo, the smaller the diff is, the easier it is to rely on it.
All the latest commits to keep track of the core repo begin to be an issue.
It is unexpected.

Deleted user commented

Maybe we can make a UASF Bitcoin core 0.14 branch and regularly merge commits from upstream.
I had to revert PR #15 in order to make 0.3 release. Since we don't know if there will be change in BIP148 before 0.14.1, creating a new branch might be appropriate.

bikeangel commented

Isn't possible to take the last official release sources, Bitcoin Core 0.14.0 ( Tag v0.14.0rc3 if i'm right ), apply the UASF patch and stop there ?

  • 👍1
Deleted user commented

You mean delete the repo, start over and make a "clean" fork?

Deleted user commented

Also the UASF is directly applied on v0.14.0. Not sure what you are referring to.

Diff can be see here bitcoin/bitcoin@ccb47bf...UASF:v0.14.0.uasfsegwit3

bikeangel commented

A clean fork using only the 0.14.0 sources + patch would be great.
Diff url would be bitcoin/bitcoin@v0.14.0...UASF:v0.14.0.uasfsegwit3
But others should probably confirm this.

whitslack commented

Also the UASF is directly applied on v0.14.0.

False. The UASF branch is based at ccb47bf, which is six commits ahead of the v0.14.0 tag.

This caused me some confusion while I was trying to determine the minimal UASF changeset. Also confusing were the cherry-picks from upstream. IMHO, this whole thing needs to be squashed and rebased onto v0.14.0 so it is very clear what it does and does not incorporate from upstream. Further, UASF should not be merging (and should definitely not be cherry-picking) unreleased commits from upstream, as this makes computation of a sensible patch impossible.

  • 👍2
mkwia commented

I suggest that we should;

  • not track individual commits
  • ensure that the UASF branch is based on v0.14.0
  • when a new release is published on bitcoin/bitcoin
    • no longer update UASF on old branches
    • ensure that the current UASF branch is based on the latest full release (not release candidates!)
  • 👍5
h0jeZvgoxFepBQ2C commented

Maybe we should also create a new "0.14_uasf" branch and apply the BIP148 changeset there. I was also a bit confused about the latest changes here, before realizing that they were cherry picked from bitcoin/0.14.

Any thoughts?

quentinlesceller commented

Okay guys, based on the previous answers, we will:

  1. Create a new UASF branch based on v0.14.0 (0.14-BIP148). See PR #18
  2. Not track individual commits.
  3. when a new release is published on bitcoin/bitcoin
    no longer update UASF on current UASF branch
    ensure that the current UASF branch is based on the latest full release (not release candidates!)
  • 👍2
quentinlesceller commented

Closing.