[0.20] Fix GBT: Restore "!segwit" and "csv" to "rules" key #19019

1. 
   luke-jr commented at 6:46 PM on May 19, 2020: member

   Original branch merges cleanly (no rebase needed)

   See also #17946

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

   They have been missing since buried deployments were merged

   2abe8cc3b7
3. QA: feature_segwit: Check that template "rules" includes "!segwit" as appropriate 412d5fe879
4. MarcoFalke added this to the milestone 0.20.0 on May 19, 2020
5. MarcoFalke added the label Mining on May 19, 2020
6. MarcoFalke added the label RPC/REST/ZMQ on May 19, 2020
7. MarcoFalke added the label Backport on May 19, 2020
8. 
   jnewbery commented at 9:02 PM on May 19, 2020: member

   utACK 412d5fe8791c417bf46fc55a5bb8d59be98a33db

9. 
   fanquake commented at 12:13 AM on May 20, 2020: member

   These commits are missing the Github-Pull and Rebased-From metadata that we normally add to backports.

10. 
    MarcoFalke commented at 12:40 AM on May 20, 2020: member

    The commit were written before the branch (and are located on top of a common ancestor of master+0.20) , so I think the script doesn't need the metadata.

11. 
    luke-jr commented at 1:31 AM on May 20, 2020: member

    @fanquake This isn't a backport per se; it's the original branch, exactly the same commits just merged into master.

12. 
    kcalvinalvin commented at 9:45 AM on May 20, 2020: contributor

    Appveyor is failing a test because the commit that fixed the error isn't included in this branch.

    This commit is included in the 0.20 branch.

    All tests passed on my local machine when git cherry-picked the commit to this branch.

13. 
    MarcoFalke commented at 12:21 PM on May 26, 2020: member

    This is a two-line code fix with a two-line test. The risk of breaking something is low, so I think this can go into final without another rc. Thoughts?

14. laanwj removed this from the milestone 0.20.0 on May 26, 2020
15. laanwj added this to the milestone 0.20.1 on May 26, 2020
16. 
    laanwj commented at 12:59 PM on May 26, 2020: member

    I would strongly prefer not to include any code change (no matter how minor) to the binaries in -final that is not in any rc. As this is not a regression in 0.20, I think this can wait until 0.20.1. (unless, of course, there happens to be need another rc for 0.20.0 then it can go in anyway)

17. MarcoFalke merged this on Jun 2, 2020
18. MarcoFalke closed this on Jun 2, 2020

    ---

19. Platinumwrist referenced this in commit 05e2740d92 on Oct 25, 2020
20. DrahtBot locked this on Feb 15, 2022

Contributors

luke-jrjnewberyfanquakeMarcoFalkekcalvinalvinlaanwj

Milestone
0.20.1