Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@laanwj
Copy link
Member

@laanwj laanwj commented Oct 13, 2016

Remaining backports for 0.13.1.

Trivial cherry-picks, except minor conflict in #8393:

error: could not apply 6aa28ab... Use cmpctblock type 2 for segwit-enabled transfer

This conflict is due to CConnMan changes.

jl2012 and others added 12 commits October 13, 2016 20:01
…n disconnection

75ead758 turned these into crashes in the event of a handshake failure, most
notably when a peer does not offer the expected services.

There are likely other cases that these assertions will find as well.

Github-Pull: bitcoin#8862
Rebased-From: 905bc68
Also improve tx printing

Github-Pull: bitcoin#8393
Rebased-From: f5b9b8f
Contains version negotiation logic by Matt Corallo and bugfixes by
Suhas Daftuar.

Github-Pull: bitcoin#8393
Rebased-From: 6aa28ab
Contains version negotiation logic by Matt Corallo and bugfixes by
Suhas Daftuar.

Github-Pull: bitcoin#8393
Rebased-From: 6aa28ab
@maflcko maflcko added this to the 0.13.1 milestone Oct 13, 2016
absolute_indexes = self.test_node.last_getblocktxn.block_txn_request.to_absolute()
assert(test_node.last_getblocktxn is not None)
absolute_indexes = test_node.last_getblocktxn.block_txn_request.to_absolute()
assert_equal(absolute_indexes, [0]) # should be a coinbase request
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assertion failed: [6, 7, 8, 9, 10] != [0]

on travis

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks to be a bug in the test where the block manufactured in the test is of a too-low version, due to soft-fork activations in the regtest chain. Only seems to manifest itself in the 0.13 branch because we hardcoded the soft-fork activation points in master to be at block heights that are slightly higher than the test, I believe.

Quick fix would be to explicitly set the block versions generated in this test to be version 4, I think, haven't tried yet...

@TheBlueMatt
Copy link
Contributor

#8922 (built on the now-merged #8904) should fix the above test failures.

TheBlueMatt and others added 9 commits October 17, 2016 13:15
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.

Github-Pull: bitcoin#8916
Rebased-From: a4ad37d
…uncompressed keys for segwit scripts

Github-Pull: bitcoin#8499
Rebased-From: 4c0c25a
@laanwj
Copy link
Member Author

laanwj commented Oct 17, 2016

Added #8922 and #8499 - all applied cleanly except 9260085 in the tests which also imported faaec13 (trivial cleanup though)

@laanwj laanwj merged commit 9777fe1 into bitcoin:0.13 Oct 17, 2016
laanwj added a commit that referenced this pull request Oct 17, 2016
9777fe1 remove redundant tests in p2p-segwit.py (Johnson Lau)
fef7b46 test segwit uncompressed key fixes (Johnson Lau)
4ec21e8 Fix ismine and addwitnessaddress: no uncompressed keys in segwit (Pieter Wuille)
908fced [qa] Add tests for uncompressed pubkeys in segwit (Suhas Daftuar)
b4b8527 Make test framework produce lowS signatures (Johnson Lau)
821f3e6 Require compressed keys in segwit as policy and disable signing with uncompressed keys for segwit scripts (Johnson Lau)
540413d Add standard limits for P2WSH with tests (Johnson Lau)
9bb2a02 [qa] Build v4 blocks in p2p-compactblocktests (Matt Corallo)
df5069b [qa] Send segwit-encoded blocktxn messages in p2p-compactblocks (Matt Corallo)
bcf3806 Update bitcoin-tx to output witness data. (jonnynewbs)
cc6f551 [qa] Fix compact block shortids for a test case (Dagur Valberg Johannsson)
4bb9ce8 Use cmpctblock type 2 for segwit-enabled transfer (Matt Corallo)
890ac25 Fix overly-prescriptive p2p-segwit test for new fetch logic (Matt Corallo)
fe1975a Use cmpctblock type 2 for segwit-enabled transfer (Pieter Wuille)
611cc50 [qa] Fix bug in mininode witness deserialization (Suhas Daftuar)
61e282b [qa] Add support for compactblocks v2 to mininode (Suhas Daftuar)
e47299a [qa] Update p2p-compactblocks.py for compactblocks v2 (Suhas Daftuar)
7a34a46 Add NULLDUMMY verify flag in bitcoinconsensus.h (Johnson Lau)
7ae6242 net: fix a few cases where messages were sent rather than dropped upon disconnection (Cory Fields)
3e80ab7 Add policy: null signature for failed CHECK(MULTI)SIG (Johnson Lau)
0027672 Make non-minimal OP_IF/NOTIF argument non-standard for P2WSH (Johnson Lau)
@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.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants