HomePhabricator

[consensus] Pin P2SH activation to block 173805 on mainnet

Description

[consensus] Pin P2SH activation to block 173805 on mainnet

Summary:
Partial backport of PR11389:
https://github.com/bitcoin/bitcoin/pull/11389/commits/18e071841e83044b47aa45c3e98c0796a407d445

Reviewers please also confirm that the rest of the PR is not worth
backporting (it has to do with segwit activation / versionbits), so we
can mark it 'done'.

This is not a totally faithful backport, due to divergence (D1262).

Depends on D3365 due to how the miner_tests build on a weird chain.

Test Plan:
make check
test_runner.py --extended

  • IBD with -checkpoints=0 and -assumevalid=0 on mainnet: OK up to at least height 216000 (2013 January)
  • IBD with -checkpoints=0 and -assumevalid=0 on testnet: OK up to at least height 230000 (2014 May)

Reviewers: jasonbcox, Fabien, #bitcoin_abc, deadalnix

Reviewed By: Fabien, #bitcoin_abc

Differential Revision: https://reviews.bitcoinabc.org/D3366

Details

Provenance
John Newbery <john@johnnewbery.com>Authored on Oct 13 2017, 15:35
Mark Lundeberg <36528214+markblundeberg@users.noreply.github.com>Committed on Jun 22 2019, 05:26
markblundebergPushed on Jun 22 2019, 05:26
Reviewer
Restricted Project
Differential Revision
D3366: [consensus] Pin P2SH activation to block 173805 on mainnet
Parents
rABCa79d870634fc: Merge #8498: Near-Bugfix: Optimization: Minimize the number of times it is…
Branches
Unknown
Tags
Unknown