partial merge #13697, #18591, #19387, #18468: update constructors to match c++20 draft spec #4036

kwvg · 2021-03-10T05:54:47Z

Overview

As part of #4025, component pull requests that are required by TorV3 logic are being broken down into branches wherever feasable. This PR deals with implementation of Span.

Partial merge of Support output descriptors in scantxoutset bitcoin/bitcoin#13697 ("Support output descriptors in scantxoutset" by sipa)
- Only 29943a9 was cherry-picked for advancing span.h. The rest are not relevant in regards to partial #8149 and merge #19845, #19954: Complete the BIP155 implementation and upgrade to TORv3 #4025 and have been skipped.
Partial merge of Add C++17 build to Travis bitcoin/bitcoin#18591 ("Add C++17 build to Travis" by sipa)
- c31cbe7 cannot be cherry-picked as it presumes a CI build structure different from Dash Core. Not relevant for partial #8149 and merge #19845, #19954: Complete the BIP155 implementation and upgrade to TORv3 #4025.
Merge of span: update constructors to match c++20 draft spec and add lifetimebound attribute bitcoin/bitcoin#19387 ("span: update constructors to match c++20 draft spec and add lifetimebound attribute" by theuni)
- ~~e3e7446 has been cherry-picked as 278a71c in partial merge #13815: Add [[nodiscard]] to all {Decode,Parse}[...](...) functions returning bool #4035, completing the merge~~
Mostly merged Span improvements bitcoin/bitcoin#18468 ("Span improvements" by sipa)
- 2676aea was not merged. Not relevant to partial #8149 and merge #19845, #19954: Complete the BIP155 implementation and upgrade to TORv3 #4025

~~EDIT: DO NOT MERGE THIS UNTIL #4035 IS MERGED. THE PR WILL BE REBASED ON TOP OF THAT AND THEN e8782af WILL BE ADDED, THEN IT IS FIT FOR MERGE~~ Resolved with 1be361a

UdjinM6 · 2021-03-10T16:36:03Z

Neither PR title nor description mention the merge of 18388 and the partial merge of 18468. Looks good otherwise imo.

kwvg · 2021-03-10T17:19:49Z

Must have forgotten, bitcoin#18388 is a partial merge as segwit specific logic wasn't merged in (source). I didn't touch bitcoin#18469 so I'm not sure about mentioning it.

UdjinM6 · 2021-03-10T17:22:45Z

~~18469~~ 18468 🙈

UdjinM6

utACK

xdustinface

Looks good overall but also gave me a bit of the partially thing feeling like mentioned in the other PR 😄

utACK

UdjinM6

one nit, LGTM otherwise

configure.ac

UdjinM6

👍

utACK (compiles with and without --enable-c++17 locally with no issues)

EDIT: remote build (on ubuntu) with --enable-c++17 fails though, #4055 should fix it

PastaPastaPasta

utACK, however please squash all the related (from the same PR) commits together

bitcoin@29943a9

PastaPastaPasta · 2021-04-22T21:31:27Z

imo let's mark 18591 and 18388 as not-partial merges. The excluded changes in both are things we aren't really going to go back to later, otherwise looks good

bitcoin@7cbfebb bitcoin@0fbde48 bitcoin@7829685

bitcoin@2b0fcff

bitcoin@1f790a1 bitcoin@bb3d38f bitcoin@ab303a1 bitcoin@26acc8d

…pec and add lifetimebound attribute bitcoin@62733fe bitcoin@1d58cc7 bitcoin@e3e7446

PastaPastaPasta

utACK

UdjinM6

utACK

xdustinface

utACK

kwvg changed the title ~~Spans~~ partial merge #13697, #18591, #19387: update constructors to match c++20 draft spec Mar 10, 2021

This was referenced Mar 10, 2021

partial merge #13815: Add [[nodiscard]] to all {Decode,Parse}[...](...) functions returning bool #4035

Merged

partial #8149 and merge #19845, #19954: Complete the BIP155 implementation and upgrade to TORv3 #4025

Closed

kwvg changed the title ~~partial merge #13697, #18591, #19387: update constructors to match c++20 draft spec~~ partial merge #13697, #18591, #19387, #18468: update constructors to match c++20 draft spec Mar 10, 2021

UdjinM6 added this to the 17 milestone Mar 10, 2021

UdjinM6 previously approved these changes Mar 10, 2021

View reviewed changes

UdjinM6 requested review from PastaPastaPasta and xdustinface March 10, 2021 23:49

xdustinface previously approved these changes Mar 12, 2021

View reviewed changes

kwvg dismissed stale reviews from xdustinface and UdjinM6 via be1929d March 23, 2021 04:22

kwvg force-pushed the spans branch 2 times, most recently from 17f15e4 to 1be361a Compare March 23, 2021 04:24

kwvg requested review from xdustinface and UdjinM6 March 23, 2021 04:25

UdjinM6 reviewed Mar 23, 2021

View reviewed changes

configure.ac Outdated Show resolved Hide resolved

kwvg force-pushed the spans branch from 1be361a to 768ee4e Compare March 23, 2021 12:21

UdjinM6 previously approved these changes Mar 23, 2021

View reviewed changes

UdjinM6 mentioned this pull request Mar 23, 2021

bls|ci: Fix C++17 build, add it to CI #4055

Merged

PastaPastaPasta modified the milestones: 17, 17.1 Mar 23, 2021

PastaPastaPasta previously approved these changes Apr 13, 2021

View reviewed changes

Partial bitcoin#13697: Support output descriptors in scantxoutset

10f923b

bitcoin@29943a9

kwvg dismissed stale reviews from PastaPastaPasta and UdjinM6 via 1e79621 April 18, 2021 12:58

kwvg force-pushed the spans branch from 768ee4e to 1e79621 Compare April 18, 2021 12:58

kwvg added 4 commits April 23, 2021 20:02

Merge bitcoin#18591: Add C++17 build to Travis

de0af7b

bitcoin@7cbfebb bitcoin@0fbde48 bitcoin@7829685

Merge bitcoin#18388: Make VerifyWitnessProgram use a Span stack

9304ba2

bitcoin@2b0fcff

Partial bitcoin#18468: Span improvements

ec2eec0

bitcoin@1f790a1 bitcoin@bb3d38f bitcoin@ab303a1 bitcoin@26acc8d

Merge bitcoin#19387: span: update constructors to match c++20 draft s…

5667698

…pec and add lifetimebound attribute bitcoin@62733fe bitcoin@1d58cc7 bitcoin@e3e7446

kwvg force-pushed the spans branch from 1e79621 to 5667698 Compare April 23, 2021 14:32

kwvg requested a review from PastaPastaPasta April 23, 2021 14:33

PastaPastaPasta approved these changes Apr 23, 2021

View reviewed changes

PastaPastaPasta requested a review from UdjinM6 April 23, 2021 19:01

UdjinM6 approved these changes Apr 24, 2021

View reviewed changes

xdustinface approved these changes Apr 26, 2021

View reviewed changes

UdjinM6 merged commit bf01ed7 into dashpay:develop Apr 27, 2021

kwvg deleted the spans branch July 18, 2023 11:38

kwvg mentioned this pull request Sep 9, 2023

backport: merge bitcoin#19326, #20464, #23451, #20852, #20355, #22050, #23115, #23409, #18468, #23413, partial bitcoin#21560, #23438 (auxiliary backports: part 11) #5574

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

partial merge #13697, #18591, #19387, #18468: update constructors to match c++20 draft spec #4036

partial merge #13697, #18591, #19387, #18468: update constructors to match c++20 draft spec #4036

kwvg commented Mar 10, 2021 •

edited

UdjinM6 commented Mar 10, 2021 •

edited

kwvg commented Mar 10, 2021 •

edited

UdjinM6 commented Mar 10, 2021

UdjinM6 left a comment

xdustinface left a comment

UdjinM6 left a comment

UdjinM6 left a comment •

edited

PastaPastaPasta left a comment

PastaPastaPasta commented Apr 22, 2021 •

edited

PastaPastaPasta left a comment

UdjinM6 left a comment

xdustinface left a comment

partial merge #13697, #18591, #19387, #18468: update constructors to match c++20 draft spec #4036

partial merge #13697, #18591, #19387, #18468: update constructors to match c++20 draft spec #4036

Conversation

kwvg commented Mar 10, 2021 • edited

Overview

Contents

UdjinM6 commented Mar 10, 2021 • edited

kwvg commented Mar 10, 2021 • edited

UdjinM6 commented Mar 10, 2021

UdjinM6 left a comment

Choose a reason for hiding this comment

xdustinface left a comment

Choose a reason for hiding this comment

UdjinM6 left a comment

Choose a reason for hiding this comment

UdjinM6 left a comment • edited

Choose a reason for hiding this comment

PastaPastaPasta left a comment

Choose a reason for hiding this comment

PastaPastaPasta commented Apr 22, 2021 • edited

PastaPastaPasta left a comment

Choose a reason for hiding this comment

UdjinM6 left a comment

Choose a reason for hiding this comment

xdustinface left a comment

Choose a reason for hiding this comment

kwvg commented Mar 10, 2021 •

edited

UdjinM6 commented Mar 10, 2021 •

edited

kwvg commented Mar 10, 2021 •

edited

UdjinM6 left a comment •

edited

PastaPastaPasta commented Apr 22, 2021 •

edited