Skip to content

Conversation

@random-zebra
Copy link

@random-zebra random-zebra commented Jan 19, 2020

This removes (now unused) code to produce old zerocoin spends and zPOS stakes.
CZPivStake class is replaced with a CLegacyZPivStake (moved in new files zpiv/zpos.*) used exclusively to validate the chain.
This also refactors CStakeInput class, removing the modifier functions (put back in kernel) and cleans up kernel.* files, removing old code and reorganizing them.

This PR is based on top of:

and it will be rebased after their merge. Only last 3 commits are relevant

- move it outside of stakeinput.*
- create a separate file inside zpiv/ folder
- rename the class to CLegacyZPivStake (only used during IBD)
Move it to kernel functions. Refactor kernel.cpp / kernel.h
@random-zebra random-zebra force-pushed the 2020_Remove_Zerocoin_2 branch from 3c79f2d to 4800729 Compare January 28, 2020 14:42
@random-zebra
Copy link
Author

Rebased.

furszy
furszy previously approved these changes Jan 29, 2020
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.

ACK 4800729

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.

Re-acking the PR, release notes added. ACK b77c064

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.

ACK b77c064

random-zebra added a commit that referenced this pull request Jan 31, 2020
b77c064 [Docs] Document zerocoin-related RPC changes for release notes (random-zebra)
4800729 [Core][Cleanup] Remove modifier as member of StakeInput objects (random-zebra)
238ea5f [Core][Cleanup][zPIV] CZPivStake --> CLegacyZPivStake (random-zebra)
f1b21a2 [Core][Cleanup][zPIV] Remove code to produce v2 spends and zPOS stakes (random-zebra)

Pull request description:

  This removes (now unused) code to produce old zerocoin spends and zPOS stakes.
  `CZPivStake` class is replaced with a `CLegacyZPivStake` (moved in new files `zpiv/zpos.*`) used exclusively to validate the chain.
  This also refactors `CStakeInput` class, removing the modifier functions (put back in kernel) and cleans up `kernel.*` files, removing old code and reorganizing them.

  This PR is based on top of:
  - [x] #1259
  - [x] #1290

  and it will be rebased after their merge. Only last **3** commits are relevant

ACKs for top commit:
  furszy:
    Re-acking the PR, release notes added. ACK b77c064
  Fuzzbawls:
    ACK b77c064

Tree-SHA512: cdf937822b435d3d05a8d3000d17340c74f7b7b17da4f1937935cb7bd71fddea9628c35a934c5abeea9ecb40b8daed074a49040479138a28fcd6699f2ca8bb8d
@random-zebra random-zebra merged commit b77c064 into PIVX-Project:master Jan 31, 2020
@random-zebra random-zebra added this to the 4.1.0 milestone Jan 31, 2020
Fuzzbawls added a commit that referenced this pull request Feb 6, 2020
29c02c7 [Cleanup] Remove ZerocoinParams from legacy CoinSpend classes (random-zebra)
a038651 [zPIV][Cleanup] Remove old CoinSpend proofs files (random-zebra)
26f407a [Cleanup][zPIV] Remove Acc Witness (random-zebra)
0052be4 [Cleanup][zPIV] Start removing old/unused zerocoin spend validation code (random-zebra)

Pull request description:

  Based on top of #1291 .

  Old (v2) `CoinSpend` proofs are no longer checked. We can thus remove most of `AccumulatorProofOfKnowledge`, `SerialNumberSignatureOfKnowledge`
  and `CommitmentProofOfKnowledge`.
  We save only the structure and serialize methods (inside `CoinSpend.h`) to be able to parse them from the chain.

ACKs for top commit:
  furszy:
    ACK 29c02c7
  Fuzzbawls:
    ACK 29c02c7

Tree-SHA512: f4198443bf760fb398badff5bb31579bb0feb97677bbd55b23a136c07e35d3150588883ef7645f9f6122a0bbf394180d78012916e9bff41597756666945106ab
furszy added a commit that referenced this pull request Feb 13, 2020
fe39b11 [Docs] Document change to the output of getblock RPC (random-zebra)
9aa29f1 [Cleanup] Remove un-needed modifier checkpoints map (random-zebra)
1504bf9 [Tests] Use V2 stake modifiers on regtest (issue #1309) (random-zebra)
3ad11a7 [RPC] Add stakeModifier to getblock verbose output (random-zebra)

Pull request description:

  Based on top of #1291 .
  Closes #1309

ACKs for top commit:
  Fuzzbawls:
    utACK fe39b11
  furszy:
    utACK fe39b11

Tree-SHA512: 599d558cfff2ed0306984a4375c37cdcd75897a8b04ceae31da955b382328e442676b872a797e7d4fe60993e23e8e660567fee26d561c563d2be76155d1de3cf
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