As/test halving + minor bug fixing #342
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…or halving height
…or halving height
… py test for halving chan height
abi87
suggested changes
Oct 29, 2020
src/init.cpp
Outdated
| __func__, __LINE__, Params().GetConsensus().nSubsidyHalvingInterval); | ||
|
|
||
| // the first halving must be at least as the fork2 value, which is 101 in regtest | ||
| if (val <= 100) assert(!"subsidyhalvinginterval must be greater than 100"); |
There was a problem hiding this comment.
Rather than hardcoding value 100, use something like zen::ReplayProtectionFork.getHeight(CBaseChainParams::REGTEST)
src/consensus/params.h
Outdated
| @@ -55,9 +55,6 @@ struct Params { | |||
| */ | |||
| int SubsidySlowStartShift() const { return nSubsidySlowStartInterval / 2; } | |||
| int nSubsidyHalvingInterval; | |||
| int _deprecatedGetLastCommunityRewardBlockHeight() const { | |||
There was a problem hiding this comment.
I wouldn't move this out of consensus/params.h into chainparams.h
| @@ -6891,7 +6897,7 @@ int getCheckBlockAtHeightMinAge() | |||
|
|
|||
| static bool getInitRequireStandard() | |||
| { | |||
| if ( (Params().NetworkIDString() == "regtest") || (Params().NetworkIDString() == "testnet") ) | |||
| if ( (Params().NetworkIDString() == "regtest") || (Params().NetworkIDString() == "test") ) | |||
There was a problem hiding this comment.
This is an actual bug which does not allow accepting non-standard tx in testnet!
Same for changes above
src/main.cpp
Outdated
| if (output.scriptPubKey == Params().GetCommunityFundScriptAtHeight(nHeight, cfType)) { | ||
| BOOST_FOREACH(const CTxOut& output, block.vtx[0].vout) | ||
| { | ||
| if (output.scriptPubKey == refScript) { |
There was a problem hiding this comment.
Since we are going to change this, we may as well aggregate these two ifs together, rather than nesting them
| self.rpc = rpc | ||
|
|
||
| def show_debug_msg(self, msg): | ||
| #print msg |
| @@ -1457,6 +1472,7 @@ def send_message(self, message, pushbuf=False): | |||
| if self.state != "connected" and not pushbuf: | |||
| return | |||
| self.show_debug_msg("Send %s" % repr(message)) | |||
| #print "\n---> Sending %s\n" % repr(message) | |||
| @@ -30,6 +30,7 @@ | |||
| from threading import Thread | |||
| import logging | |||
| import copy | |||
| import time | |||
There was a problem hiding this comment.
Look unused really. If so, remove
abi87
suggested changes
Oct 30, 2020
…and added relevant privkey in comments
cronicc
approved these changes
Nov 9, 2020
abi87
approved these changes
Nov 16, 2020
albertog78
approved these changes
Nov 16, 2020
src/main.cpp
Outdated
| @@ -6855,7 +6859,7 @@ bool getHeadersIsOnMain(const CBlockLocator& locator, const uint256& hashStop, C | |||
|
|
|||
| static int getInitCbhSafeDepth() | |||
| { | |||
| if ( (Params().NetworkIDString() == "regtest") || (Params().NetworkIDString() == "testnet") ) | |||
| if ( (Params().NetworkIDString() == "regtest") || (Params().NetworkIDString() == "test") ) | |||
src/main.cpp
Outdated
| @@ -6873,7 +6877,7 @@ int getCheckBlockAtHeightSafeDepth() | |||
|
|
|||
| static int getInitCbhMinAge() | |||
| { | |||
| if ( (Params().NetworkIDString() == "regtest") || (Params().NetworkIDString() == "testnet") ) | |||
| if ( (Params().NetworkIDString() == "regtest") || (Params().NetworkIDString() == "test") ) | |||
| assert_equal(cb_subsidy, cb_subsidy_pre_halving) | ||
|
|
||
| print "---> Make sure that a block with pre-halving subsidy is rejected." | ||
| block3 = create_block(self.tip, create_coinbase_h(chainHeight+1), self.block_time, get_nBits(chainHeight)) |
There was a problem hiding this comment.
block3 = create_block(self.tip, create_coinbase_h(chainHeight+1, SUBS_HALV_INTERVAL +1 /*force not trigger halving */), self.block_time, get_nBits(chainHeight))
|
To be rebased on top of current development to make a new CI run pass, ready to be merged once CI passes. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added regtest only option for setting halving period; added a new py test for verifying coinbase subsidy amounts and halving height crossing; minor bug fixes