Skip to content

[qa] Send segwit-encoded blocktxn messages in p2p-compactblocks#8922

Merged
laanwj merged 2 commits intobitcoin:masterfrom
TheBlueMatt:segwitcb
Oct 17, 2016
Merged

[qa] Send segwit-encoded blocktxn messages in p2p-compactblocks#8922
laanwj merged 2 commits intobitcoin:masterfrom
TheBlueMatt:segwitcb

Conversation

@TheBlueMatt
Copy link
Contributor

@TheBlueMatt TheBlueMatt commented Oct 14, 2016

Test with segwit blocktxn messages, since that was missed in #8904, in accordance with the updates to the BIP at bitcoin/bips#462.

@fanquake fanquake added the Tests label Oct 14, 2016
@sdaftuar
Copy link
Member

sdaftuar commented Oct 15, 2016

utACK, good catch on the missing test case.

If you add an additional commit that sets block.nVersion=4 in the build_block_on_tip() function, then I believe this would address the outstanding issue in #8916: #8916 (comment)

@TheBlueMatt
Copy link
Contributor Author

TheBlueMatt commented Oct 15, 2016

Hmm, wasn't targeting this for backport, though I suppose it doesn't really matter... I'll add that commit.

On October 14, 2016 8:00:43 PM EDT, Suhas Daftuar [email protected] wrote:

utACK, good catch on the missing test case.

If you add an additional commit that sets block.nVersion=4 in the
build_block_on_tip() function, then I believe this would address the
outstanding issue in #8916:
#8916 (comment)

You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub:
#8922 (comment)

@TheBlueMatt
[qa] Build v4 blocks in p2p-compactblocktests
a4ad37d 
This fixes an issue in backporting to 0.13 as 0.13 enforces SF
activation by block version lockin instead of through a hard-coded
block height.
@TheBlueMatt
Copy link
Contributor Author

TheBlueMatt commented Oct 15, 2016

@sdaftuar ok, that should do it, I believe...I suppose this should get a "Needs Backport" tag now.

@btcdrak
Copy link
Contributor

btcdrak commented Oct 16, 2016

utACK a4ad37d

@maflcko maflcko added this to the 0.13.1 milestone Oct 16, 2016
@maflcko
Copy link
Member

maflcko commented Oct 16, 2016

utACK a4ad37d

@TheBlueMatt TheBlueMatt mentioned this pull request Oct 16, 2016
Merged
@laanwj laanwj merged commit a4ad37d into bitcoin:master Oct 17, 2016
laanwj added a commit that referenced this pull request Oct 17, 2016
@laanwj
Merge #8922: [qa] Send segwit-encoded blocktxn messages in p2p-compac…
0329511 
…tblocks

a4ad37d [qa] Build v4 blocks in p2p-compactblocktests (Matt Corallo)
032e883 [qa] Send segwit-encoded blocktxn messages in p2p-compactblocks (Matt Corallo)
@laanwj
Copy link
Member

laanwj commented Oct 17, 2016

Backported in #8916

@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

Tests

Projects

None yet

Milestone

0.13.1

Development

Successfully merging this pull request may close these issues.

6 participants

@TheBlueMatt @sdaftuar @btcdrak @maflcko @laanwj @fanquake