Skip to content

Conversation

@random-zebra
Copy link

As per title:

  • first commit introduces UPGRADE_V5_2 params (with NO_ACTIVATION_HEIGHT for now).
  • second commit sets the g_IsV6Active flag (used to guard the new P2CS rules) based on 5.2 enforcement, and renames it to g_newP2CSRules.

@random-zebra random-zebra added Needs Backport Placeholder tag for anything needing a backport to prior version branches Consensus labels Jun 18, 2021
@random-zebra random-zebra added this to the 5.2.0 milestone Jun 18, 2021
@random-zebra random-zebra self-assigned this Jun 18, 2021
furszy
furszy previously approved these changes Jun 18, 2021
Copy link

@furszy furszy left a comment

Choose a reason for hiding this comment

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

utACK caad3fb57fa8d7e4b33405be21dee8fa3659932c

@random-zebra
Copy link
Author

Fixed couple comments

Copy link

@furszy furszy left a comment

Choose a reason for hiding this comment

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

utACK c85dc14

@random-zebra random-zebra removed the Needs Backport Placeholder tag for anything needing a backport to prior version branches label Jun 18, 2021
Copy link
Collaborator

@Fuzzbawls Fuzzbawls left a comment

Choose a reason for hiding this comment

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

utACK c85dc14

@furszy furszy merged commit 69e59c7 into PIVX-Project:master Jun 19, 2021
random-zebra added a commit to random-zebra/PIVX that referenced this pull request Jun 19, 2021
random-zebra added a commit to random-zebra/PIVX that referenced this pull request Jun 19, 2021
>>> Backports caad3fb57fa8d7e4b33405be21dee8fa3659932c (PIVX-Project#2428)
furszy added a commit that referenced this pull request Jun 20, 2021
62bf095 [Consensus] use v5.2 params to guard new cold-staking rules (random-zebra)
5358c50 [Refactor] Move stack check inside CheckColdStake (random-zebra)
7bec531 [Consensus] Introduce V5.2 network-upgrade params (random-zebra)
fecbb4a [Script] Strict test for IsPayToColdStaking (random-zebra)
84ed2d4 [Script] Strict checks for OP_CHECKCOLDSTAKEVERIFY (random-zebra)
9531fb8 [Tests] Proof of concept for P2CS vulnerability (random-zebra)

Pull request description:

  Backports #2258 and #2428

ACKs for top commit:
  furszy:
    re code-ACK 62bf095
  Fuzzbawls:
    utACK 62bf095

Tree-SHA512: 97e155f9fd84e8362f1a07ab1dd91216378f451dc3a0e756e543dfa31e37a8d53e3ffd90e2e8d67ee5e4d3a7f0fbcbd6118eaaaea7677c9682cea4c8f5e941bf
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants