Skip to content

Conversation

@furszy
Copy link

@furszy furszy commented Apr 8, 2021

Since v5 activation, #1700 is active and there is no need to continue checking for the v5 NU enforcement during the coinstake generation in the mining process. This PR removes the extra validations and script conversion inside the wallet.

@furszy furszy self-assigned this Apr 8, 2021
Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

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

This is not taking into account regtest net.
v5 network upgrade is not active by default there.
If we remove the conversion to P2PK inputs, the block validity checks will fail before v5 NU enforcement.

We first need to relax the rules about the block signature (always accepting P2PKH coinstake outs), which is done inside #2295.
With that change, all the tests would be passing here.

So, imo either rebase this PR on top of #2295, or simply add these 3 commits there.

@random-zebra random-zebra added Block Generation Mining/Staking related issues Refactoring Wallet labels Apr 8, 2021
@random-zebra random-zebra added this to the 6.0.0 milestone Apr 8, 2021
@furszy
Copy link
Author

furszy commented Apr 8, 2021

Yeah, i did this one with my head on #2295.
Which needs to get merged first so we can have all the tests passing here.

@furszy furszy force-pushed the 2021_wallet_cleanup branch from 7af40e5 to 12648c6 Compare April 9, 2021 21:06
random-zebra
random-zebra previously approved these changes Apr 10, 2021
Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

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

utACK 12648c6af92c0ce62d96a55b27e805783171debc

@random-zebra random-zebra dismissed their stale review April 24, 2021 10:17

Needs rebase

@furszy furszy force-pushed the 2021_wallet_cleanup branch from 12648c6 to 50ee79d Compare April 24, 2021 11:04
@furszy
Copy link
Author

furszy commented Apr 24, 2021

Done, rebased on master.

Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

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

re-utACK 50ee79d after rebase

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 50ee79d

@furszy furszy merged commit d350b4b into PIVX-Project:master May 1, 2021
@furszy furszy deleted the 2021_wallet_cleanup branch May 27, 2023 01:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Block Generation Mining/Staking related issues Refactoring Wallet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants