Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Consensus] Define SPORK_18 #995

Merged
merged 4 commits into from
Oct 24, 2019

Conversation

random-zebra
Copy link

@random-zebra random-zebra commented Sep 6, 2019

This follows #936
It sets the required version for zerocoin PublicSpends via SPORK instead of having it height-based.

When SPORK_18_ZEROCOIN_PUBLICSPEND_V4 is not active (default), the required version is v3 (where old version 1 serials cannot be spent. ref: #891 ).

It also fixes the relative functional test zerocoin_valid_public_spend.py and adds it to the test_runner.

@random-zebra random-zebra added this to the 4.0.0 milestone Sep 6, 2019
@random-zebra random-zebra self-assigned this Sep 6, 2019
@random-zebra random-zebra force-pushed the 2019_rand-schnorr_spork branch 3 times, most recently from 8d04dd7 to fe79f3d Compare September 23, 2019 02:35
@random-zebra
Copy link
Author

Rebased on top of #1000

@random-zebra
Copy link
Author

Rebased.

@random-zebra random-zebra force-pushed the 2019_rand-schnorr_spork branch 2 times, most recently from 449039f to d5b9d90 Compare October 3, 2019 20:06
@random-zebra random-zebra force-pushed the 2019_rand-schnorr_spork branch 4 times, most recently from a25472f to 913139a Compare October 12, 2019 13:05
@random-zebra random-zebra force-pushed the 2019_rand-schnorr_spork branch 3 times, most recently from fcd0600 to 4177ca6 Compare October 22, 2019 21:48
furszy
furszy previously approved these changes Oct 23, 2019
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 4177ca6

@furszy
Copy link

furszy commented Oct 23, 2019

rebase needed.

@random-zebra
Copy link
Author

#975 will generate other conflicts.
So will rebase this one after merging 975.

define SPORK_18_ZEROCOIN_PUBLICSPEND_V4. When such spork is not active, zerocoin publicspend version must be 3. Otherwise must be 4.
@random-zebra
Copy link
Author

Rebased

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 e06f7b6

Copy link

@Warrows Warrows left a comment

Choose a reason for hiding this comment

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

utACK e06f7b6

furszy added a commit that referenced this pull request Oct 24, 2019
e06f7b6 [Tests] Minor optimizations in zerocoin_valid_public_spend test (random-zebra)
cdc18ea [RPC] fix parameters check for spendzerocoin (missing ispublicspend) (random-zebra)
72bc39a [Tests] Add zerocoin_valid_public_spend to testRunner (random-zebra)
26045d3 [Consensus] Set zc PublicSpend version v3/v4 via SPORK (random-zebra)

Pull request description:

  This follows #936
  It sets the required version for zerocoin PublicSpends via SPORK instead of having it height-based.

  When `SPORK_18_ZEROCOIN_PUBLICSPEND_V4` is not active (default), the required version is v3 (where old version 1 serials cannot be spent. ref: #891 ).

  It also fixes the relative functional test `zerocoin_valid_public_spend.py` and adds it to the test_runner.

ACKs for top commit:
  furszy:
    utACK e06f7b6
  Warrows:
    utACK e06f7b6

Tree-SHA512: 07f18e77a91503f5d48dafad32364cc6292ffd1f9a3f9286a78de72dafc98b07342e6abd96eaabe55d20193f10be383c8d5bbac1b33c45712ade8c522e457b3f
@furszy furszy merged commit e06f7b6 into PIVX-Project:master Oct 24, 2019
@random-zebra random-zebra deleted the 2019_rand-schnorr_spork branch September 24, 2020 00:25
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.

None yet

3 participants