Skip to content

Fix/regtest fix #3

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.

Sign up for GitHub

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

Open
thomasluis wants to merge 3 commits into
base: development
Choose a base branch
from
Open

Fix/regtest fix #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
393ccaa
regtest genesis block for 144, 5 created. regtest working
thomasluis Aug 17, 2018
bbafdba
added 200, 9
thomasluis Aug 20, 2018
8e8f0af
Merge commit '3a25a0e83' into fix/regtest-fix
thomasluis Aug 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 6 additions & 16 deletions src/chainparams.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,6 @@ class CTestNetParams : public CMainParams {

vFixedSeeds.clear();
vSeeds.clear();
vSeeds.push_back(CDNSSeedData("anon1", "50.116.31.254"));
vSeeds.push_back(CDNSSeedData("anon2", "45.56.70.130"));
vSeeds.push_back(CDNSSeedData("anon3", "69.164.196.203"));
vSeeds.push_back(CDNSSeedData("anon4", "23.239.30.210"));
vSeeds.push_back(CDNSSeedData("anon5", "45.79.6.196"));
vSeeds.push_back(CDNSSeedData("anon6", "66.228.52.134"));

// guarantees the first 2 characters, when base58 encoded, are "tA"
base58Prefixes[PUBKEY_ADDRESS] = {0x1C,0xCE};
Expand Down Expand Up @@ -267,7 +261,7 @@ class CRegTestParams : public CTestNetParams {
consensus.nMajorityEnforceBlockUpgrade = 750;
consensus.nMajorityRejectBlockOutdated = 950;
consensus.nMajorityWindow = 1000;
consensus.powLimit = uint256S("0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f");
consensus.powLimit = uint256S("0x0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f0f");
consensus.prePowLimit = consensus.powLimit;
consensus.nPowMaxAdjustDown = 0; // Turn off adjustment down
consensus.nPowMaxAdjustUp = 0; // Turn off adjustment up
Expand All @@ -289,13 +283,13 @@ class CRegTestParams : public CTestNetParams {
BOOST_STATIC_ASSERT(equihash_parameters_acceptable(N, K));
nEquihashN = N;
nEquihashK = K;
genesis.nTime = 1482971059;
genesis.nTime = 1532704413;
genesis.nBits = 0x200f0f0f;
genesis.nNonce = uint256S("0x0000000000000000000000000000000000000000000000000000000000000009");
genesis.nSolution = ParseHex("05ffd6ad016271ade20cfce093959c3addb2079629f9f123c52ef920caa316531af5af3f");
genesis.nNonce = uint256S("0x0000000000000000000000000000000000000000000000000000000000000025");
genesis.nSolution = ParseHex("06d18c2e52bace73990bdaa3fd64ff2d6323178f74ddf6db7217671e71ce2ea24f11c59c");
consensus.hashGenesisBlock = genesis.GetHash();
nDefaultPort = 3130;
// assert(consensus.hashGenesisBlock == uint256S("0x0575f78ee8dc057deee78ef691876e3be29833aaee5e189bb0459c087451305a"));
assert(consensus.hashGenesisBlock == uint256S("0x0d7dd7d17fb3790fa94170e32502c1db54e32cc6c6246b3699b677d33bd389a4"));
nPruneAfterHeight = 1000;

vFixedSeeds.clear(); //! Regtest mode doesn't have any fixed seeds.
Expand All @@ -310,7 +304,7 @@ class CRegTestParams : public CTestNetParams {

checkpointData = (Checkpoints::CCheckpointData){
boost::assign::map_list_of
( 0, uint256S("0x0575f78ee8dc057deee78ef691876e3be29833aaee5e189bb0459c087451305a")),
( 0, uint256S("0x0d7dd7d17fb3790fa94170e32502c1db54e32cc6c6246b3699b677d33bd389a4")),
0,
0,
0
Expand Down Expand Up @@ -362,7 +356,3 @@ bool SelectParamsFromCommandLine()
SelectParams(network);
return true;
}




1 change: 1 addition & 0 deletions src/crypto/equihash.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,6 +805,7 @@ template bool Equihash<200,9>::OptimisedSolve(const eh_HashState& base_state,
#endif
template bool Equihash<200,9>::IsValidSolution(const eh_HashState& base_state, std::vector<unsigned char> soln);


// Explicit instantiations for Equihash<96,5>
template int Equihash<96,5>::InitialiseState(eh_HashState& base_state);
#ifdef ENABLE_MINING
Expand Down
4 changes: 2 additions & 2 deletions src/crypto/equihash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,10 @@ inline bool EhBasicSolve(unsigned int n, unsigned int k, const eh_HashState& bas
{
if (n == 96 && k == 3) {
return Eh96_3.BasicSolve(base_state, validBlock, cancelled);
} else if (n == 200 && k == 9) {
return Eh200_9.BasicSolve(base_state, validBlock, cancelled);
} else if (n == 96 && k == 5) {
return Eh96_5.BasicSolve(base_state, validBlock, cancelled);
} else if (n == 200 && k == 9) {
return Eh200_9.BasicSolve(base_state, validBlock, cancelled);
} else if (n == 48 && k == 5) {
return Eh48_5.BasicSolve(base_state, validBlock, cancelled);
} else if (n == 144 && k == 5) {
Expand Down