Skip to content

Commit

Permalink
v3.2.0
Browse files Browse the repository at this point in the history
Block, MN & DEV Reward will Update as well as MN Collateral will change after 920,000
  • Loading branch information
cryptodev0755 committed Mar 1, 2023
1 parent 9c1b3b2 commit 6db80b6
Show file tree
Hide file tree
Showing 20 changed files with 329 additions and 86 deletions.
103 changes: 65 additions & 38 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -306,65 +306,92 @@
</tr>
<tr>
<td class="xl65" style="width: 120px; text-align: center;">900001</td>
<td class="xl65" style="width: 120px; text-align: center;">1000000</td>
<td class="xl65" style="width: 120px; text-align: center;">920000</td>
<td class="xl65" style="width: 180px; text-align: center;">30000.00</td>
<td class="xl65" style="width: 120px; text-align: center;">30.0</td>
<td class="xl65" style="width: 120px; text-align: center;">29</td>
<td class="xl66" style="width: 120px; text-align: center;">0.50</td>
<td class="xl66" style="width: 120px; text-align: center;">0.50</td>
</tr>
<tr>
<td class="xl65" style="width: 120px; text-align: center;">920001</td>
<td class="xl65" style="width: 120px; text-align: center;">-</td>
<td class="xl65" style="width: 180px; text-align: center;">30000.00</td>
<td class="xl65" style="width: 120px; text-align: center;">4000001.0</td>
<td class="xl65" style="width: 120px; text-align: center;">0.0</td>
<td class="xl66" style="width: 120px; text-align: center;">1</td>
<td class="xl66" style="width: 120px; text-align: center;">4000000</td>
</tr>
<tr>
<td class="xl65" style="width: 120px; text-align: center;">920002</td>
<td class="xl65" style="width: 120px; text-align: center;">1000000</td>
<td class="xl65" style="width: 180px; text-align: center;">100000.00</td>
<td class="xl65" style="width: 120px; text-align: center;">2.5</td>
<td class="xl65" style="width: 120px; text-align: center;">2.0</td>
<td class="xl66" style="width: 120px; text-align: center;">0.25</td>
<td class="xl66" style="width: 120px; text-align: center;">0.25</td>
<tr>
<td class="xl65" style="width: 120px; text-align: center;">1000001</td>
<td class="xl65" style="width: 120px; text-align: center;">1020000</td>
<td class="xl65" style="width: 180px; text-align: center;">150000.00</td>
<td class="xl65" style="width: 120px; text-align: center;">8.0</td>
<td class="xl65" style="width: 120px; text-align: center;">4.0</td>
<td class="xl66" style="width: 120px; text-align: center;">2.0</td>
<td class="xl66" style="width: 120px; text-align: center;">2.0</td>
</tr>
<tr>
<td class="xl65" style="width: 120px; text-align: center;">1020001</td>
<td class="xl65" style="width: 120px; text-align: center;">1050000</td>
<td class="xl65" style="width: 180px; text-align: center;">40000.00</td>
<td class="xl65" style="width: 120px; text-align: center;">55.0</td>
<td class="xl65" style="width: 120px; text-align: center;">54</td>
<td class="xl66" style="width: 120px; text-align: center;">0.50</td>
<td class="xl66" style="width: 120px; text-align: center;">0.50</td>
<td class="xl65" style="width: 180px; text-align: center;">150000.00</td>
<td class="xl65" style="width: 120px; text-align: center;">7.0</td>
<td class="xl65" style="width: 120px; text-align: center;">3.0</td>
<td class="xl66" style="width: 120px; text-align: center;">2.0</td>
<td class="xl66" style="width: 120px; text-align: center;">2.0</td>
</tr>
<tr>
<td class="xl65" style="width: 120px; text-align: center;">1050001</td>
<td class="xl65" style="width: 120px; text-align: center;">1200000</td>
<td class="xl65" style="width: 180px; text-align: center;">40000.00</td>
<td class="xl65" style="width: 120px; text-align: center;">40.0</td>
<td class="xl65" style="width: 120px; text-align: center;">39</td>
<td class="xl66" style="width: 120px; text-align: center;">0.50</td>
<td class="xl66" style="width: 120px; text-align: center;">0.50</td>
<td class="xl65" style="width: 120px; text-align: center;">1100000</td>
<td class="xl65" style="width: 180px; text-align: center;">150000.00</td>
<td class="xl65" style="width: 120px; text-align: center;">6.0</td>
<td class="xl65" style="width: 120px; text-align: center;">3.5</td>
<td class="xl66" style="width: 120px; text-align: center;">1.25</td>
<td class="xl66" style="width: 120px; text-align: center;">1.25</td>
</tr>
<tr>
<td class="xl65" style="width: 120px; text-align: center;">1200001</td>
<td class="xl65" style="width: 120px; text-align: center;">1100001</td>
<td class="xl65" style="width: 120px; text-align: center;">1150000</td>
<td class="xl65" style="width: 180px; text-align: center;">150000.00</td>
<td class="xl65" style="width: 120px; text-align: center;">4.0</td>
<td class="xl65" style="width: 120px; text-align: center;">2.0</td>
<td class="xl66" style="width: 120px; text-align: center;">1.0</td>
<td class="xl66" style="width: 120px; text-align: center;">1.0</td>
</tr>
<tr>
<td class="xl65" style="width: 120px; text-align: center;">1150001</td>
<td class="xl65" style="width: 120px; text-align: center;">1300000</td>
<td class="xl65" style="width: 180px; text-align: center;">40000.00</td>
<td class="xl65" style="width: 120px; text-align: center;">30.0</td>
<td class="xl65" style="width: 120px; text-align: center;">29</td>
<td class="xl66" style="width: 120px; text-align: center;">0.50</td>
<td class="xl66" style="width: 120px; text-align: center;">0.50</td>
<td class="xl65" style="width: 180px; text-align: center;">200000.00</td>
<td class="xl65" style="width: 120px; text-align: center;">10.0</td>
<td class="xl65" style="width: 120px; text-align: center;">6.0</td>
<td class="xl66" style="width: 120px; text-align: center;">2.0</td>
<td class="xl66" style="width: 120px; text-align: center;">2.0</td>
</tr>
<tr>
<td class="xl65" style="width: 120px; text-align: center;">1300001</td>
<td class="xl65" style="width: 120px; text-align: center;">1400000</td>
<td class="xl65" style="width: 180px; text-align: center;">40000.00</td>
<td class="xl65" style="width: 120px; text-align: center;">20.0</td>
<td class="xl65" style="width: 120px; text-align: center;">19</td>
<td class="xl66" style="width: 120px; text-align: center;">0.50</td>
<td class="xl66" style="width: 120px; text-align: center;">0.50</td>
<td class="xl65" style="width: 180px; text-align: center;">300000.00</td>
<td class="xl65" style="width: 120px; text-align: center;">11.0</td>
<td class="xl65" style="width: 120px; text-align: center;">7.0</td>
<td class="xl66" style="width: 120px; text-align: center;">2.0</td>
<td class="xl66" style="width: 120px; text-align: center;">2.0</td>
</tr>
<tr>
<td class="xl65" style="width: 120px; text-align: center;">1400001</td>
<td class="xl65" style="width: 120px; text-align: center;">1500000</td>
<td class="xl65" style="width: 180px; text-align: center;">40000.00</td>
<td class="xl65" style="width: 120px; text-align: center;">10.0</td>
<td class="xl65" style="width: 120px; text-align: center;">9</td>
<td class="xl66" style="width: 120px; text-align: center;">0.50</td>
<td class="xl66" style="width: 120px; text-align: center;">0.50</td>
</tr>
<tr>
<td class="xl65" style="width: 120px; text-align: center;">1500001</td>
<td class="xl65" style="width: 120px; text-align: center;">INFINITY</td>
<td class="xl65" style="width: 180px; text-align: center;">80000.00</td>
<td class="xl65" style="width: 120px; text-align: center;">70.0</td>
<td class="xl65" style="width: 120px; text-align: center;">69.0</td>
<td class="xl66" style="width: 120px; text-align: center;">0.50</td>
<td class="xl66" style="width: 120px; text-align: center;">0.50</td>
<td class="xl65" style="width: 120px; text-align: center;">INFINITE</td>
<td class="xl65" style="width: 180px; text-align: center;">400000.00</td>
<td class="xl65" style="width: 120px; text-align: center;">15.0</td>
<td class="xl65" style="width: 120px; text-align: center;">9.5</td>
<td class="xl66" style="width: 120px; text-align: center;">3.5</td>
<td class="xl66" style="width: 120px; text-align: center;">2.0</td>
</tr>
</tr>
</tbody>
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 3)
define(_CLIENT_VERSION_MINOR, 1)
define(_CLIENT_VERSION_MINOR, 2)
define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_RC, 0)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"requests":[{"kind":"cache","version":2},{"kind":"cmakeFiles","version":1},{"kind":"codemodel","version":2},{"kind":"toolchains","version":1}]}
68 changes: 68 additions & 0 deletions out/build/x64-Debug/CMakeCache.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
# This is the CMakeCache file.
# For build in directory: f:/Workspace/Working/Coin source code/nodetrade/MNX-Main-v300-26122022-0611PM/out/build/x64-Debug
# It was generated by CMake: C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe
# You can edit this file to change values found and used by cmake.
# If you do not want to change any of the values, simply exit the editor.
# If you do want to change a value, simply edit, save, and exit the editor.
# The syntax for the file is as follows:
# KEY:TYPE=VALUE
# KEY is the name of a variable in the cache.
# TYPE is a hint to GUIs for the type of VALUE, DO NOT EDIT TYPE!.
# VALUE is the current value for the KEY.

########################
# EXTERNAL cache entries
########################

//Path to a program.
CARGO_PROGRAM:FILEPATH=CARGO_PROGRAM-NOTFOUND

//Path to a program.
CCACHE_PROGRAM:FILEPATH=CCACHE_PROGRAM-NOTFOUND

//No help, variable specified on the command line.
CMAKE_BUILD_TYPE:STRING=Debug

//No help, variable specified on the command line.
CMAKE_INSTALL_PREFIX:PATH=F:/Workspace/Working/Coin source code/nodetrade/MNX-Main-v300-26122022-0611PM/out/install/x64-Debug

//No help, variable specified on the command line.
CMAKE_MAKE_PROGRAM:UNINITIALIZED=C:\PROGRAM FILES (X86)\MICROSOFT VISUAL STUDIO\2019\COMMUNITY\COMMON7\IDE\COMMONEXTENSIONS\MICROSOFT\CMAKE\Ninja\ninja.exe


########################
# INTERNAL cache entries
########################

//This is the directory where this CMakeCache.txt was created
CMAKE_CACHEFILE_DIR:INTERNAL=f:/Workspace/Working/Coin source code/nodetrade/MNX-Main-v300-26122022-0611PM/out/build/x64-Debug
//Major version of cmake used to create the current loaded cache
CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3
//Minor version of cmake used to create the current loaded cache
CMAKE_CACHE_MINOR_VERSION:INTERNAL=20
//Patch version of cmake used to create the current loaded cache
CMAKE_CACHE_PATCH_VERSION:INTERNAL=21032501
//Path to CMake executable.
CMAKE_COMMAND:INTERNAL=C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cmake.exe
//Path to cpack program executable.
CMAKE_CPACK_COMMAND:INTERNAL=C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/cpack.exe
//Path to ctest program executable.
CMAKE_CTEST_COMMAND:INTERNAL=C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin/ctest.exe
//Name of external makefile project generator.
CMAKE_EXTRA_GENERATOR:INTERNAL=
//Name of generator.
CMAKE_GENERATOR:INTERNAL=Ninja
//Generator instance identifier.
CMAKE_GENERATOR_INSTANCE:INTERNAL=
//Name of generator platform.
CMAKE_GENERATOR_PLATFORM:INTERNAL=
//Name of generator toolset.
CMAKE_GENERATOR_TOOLSET:INTERNAL=
//Source directory with the top level CMakeLists.txt file for this
// project
CMAKE_HOME_DIRECTORY:INTERNAL=F:/Workspace/Working/Coin source code/nodetrade/MNX-Main-v300-26122022-0611PM
//number of local generators
CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=1
//Path to CMake installation.
CMAKE_ROOT:INTERNAL=C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/share/cmake-3.20

1 change: 1 addition & 0 deletions out/build/x64-Debug/CMakeFiles/cmake.check_cache
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# This file is generated by cmake for dependency checking of the CMakeCache.txt file
1 change: 1 addition & 0 deletions out/build/x64-Debug/VSInheritEnvironments.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
msvc_x64_x64
12 changes: 10 additions & 2 deletions src/chainparams.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,20 @@ static MapCheckpoints mapCheckpoints = {
{817000, uint256S("795ba02ab94430efc18a6739937448e8f6f4456c1762c805e1f700b82cca90fa")},
{817500, uint256S("e17d8dc831f9414cda59fc76595c65ff21a0027107c1e16c7e3bd0adc08cd832")},
{817705, uint256S("c6df5cc1a7c7a5ff8afcada178c55584d3ecb90edacfed715363c6c87629a62e")},
{825500, uint256S("421cc7267d5c87227c7d3b40f17bcd526b81388cdc7ca2dec45cbe97ecaa83ef")},
{836900, uint256S("1f9881ec2e2a0411c2be8746b27ba67ce110186ecdcbbd198ab290341f13549b")},
{848525, uint256S("bf55395a6f798f9fa9267d1f5aafc5e08977a90390148a978a77b10860f8694d")},
{871536, uint256S("e6795064ad8c68903b04e95fa21b01fc9e809bc7b3c79b54766357f93e8d5f43")},
{885800, uint256S("66babf9ffcb64c2dc460544d5ca3da8d039a1d4e77c183ffa4bf7bd957c96e8b")},
{904506, uint256S("cad701193b47a5b1e7a0733779227f067b6fd297b3c06814a4f8028ae2ef9245")},
{906240, uint256S("760d75cda3f3a28dc8f1e027d7cabd7adf5275c3855b7e5a85e29845bf5645bb")},
{907254, uint256S("b87fde7b757a23f4633e9790a1c00ca329769645d44b4159cae46b68e94f5f04")},
};

static const CCheckpointData data = {
&mapCheckpoints,
1672133445, // * UNIX timestamp of last checkpoint block
1699036, // * total number of transactions between genesis and last checkpoint
1677645540, // * UNIX timestamp of last checkpoint block
1885486, // * total number of transactions between genesis and last checkpoint
// (the tx=... number in the UpdateTip debug.log lines)
2000 // * estimated number of transactions per day after checkpoint
};
Expand Down
6 changes: 4 additions & 2 deletions src/chainparams.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,11 @@ class CChainParams
{
if (nHeight <= 659999) {
return "MguaoUcTtDYXy4Sv7TcQe4Dzqb9QArZwpW";
} else if (nHeight <= 920000) {
return "Mrf9DwWRzZUAwxWKcUWzjRg7tb5rKPwuYm";
} else {
return "McnVVAyRsEhcDwWWx5esGfdmTh97n3AVsD";
}

return "Mrf9DwWRzZUAwxWKcUWzjRg7tb5rKPwuYm";
}

void UpdateNetworkUpgradeParameters(Consensus::UpgradeIndex idx, int nActivationHeight);
Expand Down
14 changes: 10 additions & 4 deletions src/consensus/params.h
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,18 @@ struct Params {
nMNCollateral = 15000;
} else if (nHeight <= 900000) {
nMNCollateral = 20000;
} else if (nHeight <= 1000000) {
} else if (nHeight <= 920001) {
nMNCollateral = 30000;
} else if (nHeight <= 1500000) {
nMNCollateral = 40000;
} else if (nHeight <= 1000000) {
nMNCollateral = 100000;
} else if (nHeight <= 1150000) {
nMNCollateral = 150000;
} else if (nHeight <= 1300000) {
nMNCollateral = 200000;
} else if (nHeight <= 1400000) {
nMNCollateral = 300000;
} else {
nMNCollateral = 80000;
nMNCollateral = 400000;
}

return nMNCollateral * COIN;
Expand Down
9 changes: 7 additions & 2 deletions src/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1065,8 +1065,13 @@ bool AppInitParameterInteraction()
if (gArgs.IsArgSet("-checklevel"))
return UIError(strprintf(_("Error: Unsupported argument %s found. Checklevel must be level 4."), "-checklevel"));
// Exit early if -masternode=1 and -listen=0
if (gArgs.GetBoolArg("-masternode", DEFAULT_MASTERNODE) && !gArgs.GetBoolArg("-listen", DEFAULT_LISTEN))
return UIError(strprintf(_("Error: %s must be true if %s is set."), "-listen", "-masternode"));
/*if (gArgs.GetBoolArg("-masternode", DEFAULT_MASTERNODE) && !gArgs.GetBoolArg("-listen", DEFAULT_LISTEN))
return UIError(strprintf(_("Error: %s must be true if %s is set."), "-listen", "-masternode"));*/

if (gArgs.GetBoolArg("-masternode", false) && GetListenPort() != Params().GetDefaultPort())
return UIError(strprintf(_("Error: Invalid port %d for running a masternode."), GetListenPort()) + "\n\n" +
strprintf(_("Masternodes are required to run on port %d for %s-net"), Params().GetDefaultPort(), Params().NetworkIDString()));

if (gArgs.GetBoolArg("-benchmark", false))
UIWarning(strprintf(_("Warning: Unsupported argument %s ignored, use %s"), "-benchmark", "-debug=bench."));

Expand Down
6 changes: 3 additions & 3 deletions src/masternode-payments.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ bool IsBlockPayeeValid(const CBlock& block, const CBlockIndex* pindexPrev)
return true;
}

if (nBlockHeight == 850000 || nBlockHeight == 900000 || nBlockHeight == 1000000 || nBlockHeight == 1500000) {
if (nBlockHeight == 850000 || nBlockHeight == 900000 || nBlockHeight == 920001 || nBlockHeight == 1000000 || nBlockHeight == 1150000 || nBlockHeight == 1300000 || nBlockHeight == 1400000) {
std::vector<std::pair<int64_t, MasternodeRef>> vMasternodeRanks = mnodeman.GetMasternodeRanks(nBlockHeight);

for (int pos = 0; pos < (int)vMasternodeRanks.size(); pos++) {
Expand All @@ -246,13 +246,13 @@ bool IsBlockPayeeValid(const CBlock& block, const CBlockIndex* pindexPrev)
return true;
}

if (nBlockHeight == 849999 || nBlockHeight == 899999 || nBlockHeight == 999999 || nBlockHeight == 1499999) {
if (nBlockHeight == 849999 || nBlockHeight == 899999 || nBlockHeight == 920000 || nBlockHeight == 999999 || nBlockHeight == 1149999 || nBlockHeight == 1299999 || nBlockHeight == 1399999) {
SporkId nSporkID = sporkManager.GetSporkIDByName("SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT");
int64_t nValue = 4070908801;
sporkManager.UpdateSpork(nSporkID, nValue);
}

if (nBlockHeight == 850201 || nBlockHeight == 900201 || nBlockHeight == 1000201 || nBlockHeight == 1500201) {
if (nBlockHeight == 850201 || nBlockHeight == 900201 || nBlockHeight == 920202 || nBlockHeight == 1000201 || nBlockHeight == 1150201 || nBlockHeight == 1300201 || nBlockHeight == 1400201) {
SporkId nSporkID = sporkManager.GetSporkIDByName("SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT");
int64_t nValue = 1600250400;
sporkManager.UpdateSpork(nSporkID, nValue);
Expand Down

0 comments on commit 6db80b6

Please sign in to comment.