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

[zPIV][Cleanup] Zerocoin Cleanup 5: further main.cpp cleaning #1322

Merged
merged 4 commits into from
Feb 13, 2020

Conversation

random-zebra
Copy link

This removes unneeded checks in AcceptToMemoryPool and cleans up main.cpp file

@random-zebra random-zebra self-assigned this Feb 6, 2020
@random-zebra random-zebra added this to the 4.1.0 milestone Feb 7, 2020
Now that activation height has passed, remove
CheckPublicCoinSpendEnforced and simply reject any non-public zerocoin
spend in AcceptToMemoryPool, without doing any further validation.
Outright reject mints from mempool. Only verify that they are no longer
accepted after Zerocoin_Block_Public_Spend_Enabled
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 80753f9

@furszy
Copy link

furszy commented Feb 13, 2020

Code ACK,

reindex is failing due the MoneyRange fix needed for testnet. Plus, seems that it corrupted my chain data after a bad reindex. We will need to prepare a corruption scenario test.

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.

Full sync, ACK 80753f9.

furszy added a commit that referenced this pull request Feb 13, 2020
…aning

80753f9 [Cleanup] Remove multiple calls to chainActive in main functions (random-zebra)
3ddeeed [zPIV][Cleanup] Remove mapZerocoinspends (random-zebra)
334b760 [zPIV][Cleanup] remove ContextualCheckZerocoinMint (random-zebra)
39116fb [zPIV][Cleanup] Remove non-public zerocoin spend checks in ATMP (random-zebra)

Pull request description:

  This removes unneeded checks in AcceptToMemoryPool and cleans up main.cpp file

ACKs for top commit:
  Fuzzbawls:
    ACK 80753f9
  furszy:
    Full sync, ACK 80753f9.

Tree-SHA512: ee6b56a2e5db188e7bfc83649019a0ccd47dee0eaea3cfbd8c628ca10a0b0b89465c8c01c9d39535aba4374741291c021852d84ab1b5969ef4cf90fb30f257d8
@furszy furszy merged commit 80753f9 into PIVX-Project:master Feb 13, 2020
furszy added a commit that referenced this pull request Feb 18, 2020
… checks

803f5dd [Trivial] Single method ScriptSigToSerializedSpend (random-zebra)
dc0cc41 [Cleanup] Remove CoinSpend dependancy from CTxIn (random-zebra)
935c99c [Cleanup] Remove unused IsSerialKnown function in zpivchain.* (random-zebra)
1493473 [Cleanup] Remove CheckZerocoinMint main function (random-zebra)

Pull request description:

  This is built on top of
  - [x] #1322

  This removes `CheckZerocoinMint` (mints are disabled since block 1,686,229 and we can rely on checkpoints during IBD). Also does some minor cleanup in zpivmodule/zpivchain

ACKs for top commit:
  furszy:
    Looking good, utACK 803f5dd
  Fuzzbawls:
    ACK 803f5dd

Tree-SHA512: 5fe1c835ff95330be32561ca12e1c29cb46404be68f4ca7caf2e3e5c51ff9364ead8bc781284e3c49dc0bd5efac28d3f24a901e92e3cc0d4b7af17b2146eaf50
@random-zebra random-zebra deleted the 2020_Remove_Zerocoin_5 branch September 24, 2020 00:27
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