Skip to content

Conversation

@PeterL73
Copy link

@PeterL73 PeterL73 commented Oct 8, 2022

use the requiredMasternodePayment of the new block
in CMasternodeBlockPayees::IsTransactionValid [masternode-payments.cpp]

@PeterL73 PeterL73 force-pushed the 2022-new-block-reward-bugfix branch from 7dacfcd to 3b5b9e1 Compare October 9, 2022 05:17
@Fuzzbawls Fuzzbawls added the Bug label Oct 31, 2022
@Fuzzbawls Fuzzbawls added this to the 5.5.0 milestone Oct 31, 2022
@PeterL73 PeterL73 force-pushed the 2022-new-block-reward-bugfix branch from 3b5b9e1 to a50ba7e Compare October 31, 2022 18:16
Copy link
Member

@Liquid369 Liquid369 left a comment

Choose a reason for hiding this comment

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

Straightforward adjustment.
uTACK a50ba7e

See no issue in using the height from the caller because then will get more accurate at the time.

Copy link

@DeanSparrow DeanSparrow left a comment

Choose a reason for hiding this comment

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

utACK a50ba7e

PeterL73 added a commit to PeterL73/PIVX that referenced this pull request Nov 11, 2022
add testnet checkpoints
- 925056 (lastblock before v5.5)
- 925057 (firstblock after v5.5)
- 925063 (added to circumvent failure on last (default 6) blocks verification due to PIVX-Project#2772)
add -rewindblockindextolastcheckpoint option
add RewindBlockIndexToLastCheckpoint to init Step 7: load block chain
modify RewindBlockIndexToLastCheckpoint
- check if rewind is needed
- use targetHeight instead of targetHash
- add progress indicator
on rewind
- clearWitnessCaches
- zap all transactions from wallet
- rescan wallet transactions
- restore wallet transaction metadata after rescan (unless -zapwallettxes=2)
add functional test
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 a50ba7e

@Fuzzbawls Fuzzbawls added the Needs Backport Placeholder tag for anything needing a backport to prior version branches label Nov 18, 2022
@Fuzzbawls Fuzzbawls merged commit 9be813c into PIVX-Project:master Nov 19, 2022
Fuzzbawls pushed a commit to Fuzzbawls/PIVX that referenced this pull request Nov 22, 2022
@Fuzzbawls Fuzzbawls mentioned this pull request Nov 22, 2022
@Fuzzbawls Fuzzbawls removed the Needs Backport Placeholder tag for anything needing a backport to prior version branches label Dec 11, 2022
Fuzzbawls added a commit that referenced this pull request Dec 12, 2022
c0f6055 [Consensus] Bump v5.5 activation height for mainnet (Fuzzbawls)
200b908 [Consensus] Set v5.5 activation height for mainnet (Fuzzbawls)
dc31cef Add functional test for scantxoutset (PeterL73)
b452fb6 Remove commented out code (PeterL73)
3fc2e6b Backport scantxoutset and descriptors from BitCoin Core v0.17.2 (PeterL73)
8f5f52d Remove semicolon and add "verbose" back to vRPCConvertParams. (tecnovert)
ba310d1 Test for hex strings and remove stray newline from rpc_named_arguments. (tecnovert)
2b244ba Fix missing help text and add backwards compatibility. (tecnovert)
cce6951 rpc: Backport getblock verbosity (tecnovert)
fd719a2 add include_delegated to vRPCConvertParams (PeterL73)
d285af0 use block height from caller (PeterL73)

Pull request description:

  Backports the following PRs to the `5.5` branch:
  #2772
  #2774
  #2779
  #2780
  #2781
  #2784

Top commit has no ACKs.

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

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants