sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-27 21:12:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5219 from PastaPastaPasta/v19.x-bp-rc.2

Browse Source 
backport: backport minor changes into v19.x and version bump
This commit is contained in:
PastaPastaPasta 2023-02-22 12:40:29 -06:00 committed by GitHub
commit fa5a9674e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -2,7 +2,7 @@ AC_PREREQ([2.69])
define(_CLIENT_VERSION_MAJOR, 19) define(_CLIENT_VERSION_MAJOR, 19)
define(_CLIENT_VERSION_MINOR, 0) define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_RC, 1) define(_CLIENT_VERSION_RC, 2)
define(_CLIENT_VERSION_IS_RELEASE, false) define(_CLIENT_VERSION_IS_RELEASE, false)
define(_COPYRIGHT_YEAR, 2023) define(_COPYRIGHT_YEAR, 2023)
define(_COPYRIGHT_HOLDERS,[The %s developers]) define(_COPYRIGHT_HOLDERS,[The %s developers])

6
src/chainparams.cpp
View File

@ -248,8 +248,8 @@ public:
// Deployment of Deployment of Basic BLS, AssetLocks, EHF // Deployment of Deployment of Basic BLS, AssetLocks, EHF
consensus.vDeployments[Consensus::DEPLOYMENT_V19].bit = 8; consensus.vDeployments[Consensus::DEPLOYMENT_V19].bit = 8;
consensus.vDeployments[Consensus::DEPLOYMENT_V19].nStartTime = 19999999999; // TODO: To be determined later consensus.vDeployments[Consensus::DEPLOYMENT_V19].nStartTime = 1680220800; // Fri, Mar 31, 2023 0:00:00
consensus.vDeployments[Consensus::DEPLOYMENT_V19].nTimeout = 999999999999ULL; consensus.vDeployments[Consensus::DEPLOYMENT_V19].nTimeout = 1711843200; // Sun, Mar 31, 2024 00:00:00
consensus.vDeployments[Consensus::DEPLOYMENT_V19].nWindowSize = 4032; consensus.vDeployments[Consensus::DEPLOYMENT_V19].nWindowSize = 4032;
consensus.vDeployments[Consensus::DEPLOYMENT_V19].nThresholdStart = 3226; // 80% of 4032 consensus.vDeployments[Consensus::DEPLOYMENT_V19].nThresholdStart = 3226; // 80% of 4032
consensus.vDeployments[Consensus::DEPLOYMENT_V19].nThresholdMin = 2420; // 60% of 4032 consensus.vDeployments[Consensus::DEPLOYMENT_V19].nThresholdMin = 2420; // 60% of 4032
@ -486,7 +486,7 @@ public:
// Deployment of Deployment of Basic BLS, AssetLocks, EHF // Deployment of Deployment of Basic BLS, AssetLocks, EHF
consensus.vDeployments[Consensus::DEPLOYMENT_V19].bit = 8; consensus.vDeployments[Consensus::DEPLOYMENT_V19].bit = 8;
consensus.vDeployments[Consensus::DEPLOYMENT_V19].nStartTime = 19999999999; // TODO: To be determined later consensus.vDeployments[Consensus::DEPLOYMENT_V19].nStartTime = 1677024000; // Wed, Feb 22, 2023 0:00:00
consensus.vDeployments[Consensus::DEPLOYMENT_V19].nTimeout = 999999999999ULL; consensus.vDeployments[Consensus::DEPLOYMENT_V19].nTimeout = 999999999999ULL;
consensus.vDeployments[Consensus::DEPLOYMENT_V19].nWindowSize = 100; consensus.vDeployments[Consensus::DEPLOYMENT_V19].nWindowSize = 100;
consensus.vDeployments[Consensus::DEPLOYMENT_V19].nThresholdStart = 80; // 80% of 100 consensus.vDeployments[Consensus::DEPLOYMENT_V19].nThresholdStart = 80; // 80% of 100

9
src/rpc/evo.cpp
View File

@ -665,13 +665,13 @@ static UniValue protx_register_common_wrapper(const JSONRPCRequest& request,
} }
ptx.platformNodeID.SetHex(request.params[paramIdx + 6].get_str()); ptx.platformNodeID.SetHex(request.params[paramIdx + 6].get_str());
int32_t requestedPlatformP2PPort = ParseInt32V(request.params[paramIdx + 7].get_str(), "platformP2PPort"); int32_t requestedPlatformP2PPort = ParseInt32V(request.params[paramIdx + 7], "platformP2PPort");
if (!ValidatePlatformPort(requestedPlatformP2PPort)) { if (!ValidatePlatformPort(requestedPlatformP2PPort)) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "platformP2PPort must be a valid port [1-65535]"); throw JSONRPCError(RPC_INVALID_PARAMETER, "platformP2PPort must be a valid port [1-65535]");
} }
ptx.platformP2PPort = static_cast<uint16_t>(requestedPlatformP2PPort); ptx.platformP2PPort = static_cast<uint16_t>(requestedPlatformP2PPort);
int32_t requestedPlatformHTTPPort = ParseInt32V(request.params[paramIdx + 8].get_str(), "platformHTTPPort"); int32_t requestedPlatformHTTPPort = ParseInt32V(request.params[paramIdx + 8], "platformHTTPPort");
if (!ValidatePlatformPort(requestedPlatformHTTPPort)) { if (!ValidatePlatformPort(requestedPlatformHTTPPort)) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "platformHTTPPort must be a valid port [1-65535]"); throw JSONRPCError(RPC_INVALID_PARAMETER, "platformHTTPPort must be a valid port [1-65535]");
} }
@ -899,13 +899,13 @@ static UniValue protx_update_service_common_wrapper(const JSONRPCRequest& reques
} }
ptx.platformNodeID.SetHex(request.params[paramIdx].get_str()); ptx.platformNodeID.SetHex(request.params[paramIdx].get_str());
int32_t requestedPlatformP2PPort = ParseInt32V(request.params[paramIdx + 1].get_str(), "platformP2PPort"); int32_t requestedPlatformP2PPort = ParseInt32V(request.params[paramIdx + 1], "platformP2PPort");
if (!ValidatePlatformPort(requestedPlatformP2PPort)) { if (!ValidatePlatformPort(requestedPlatformP2PPort)) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "platformP2PPort must be a valid port [1-65535]"); throw JSONRPCError(RPC_INVALID_PARAMETER, "platformP2PPort must be a valid port [1-65535]");
} }
ptx.platformP2PPort = static_cast<uint16_t>(requestedPlatformP2PPort); ptx.platformP2PPort = static_cast<uint16_t>(requestedPlatformP2PPort);
int32_t requestedPlatformHTTPPort = ParseInt32V(request.params[paramIdx + 2].get_str(), "platformHTTPPort"); int32_t requestedPlatformHTTPPort = ParseInt32V(request.params[paramIdx + 2], "platformHTTPPort");
if (!ValidatePlatformPort(requestedPlatformHTTPPort)) { if (!ValidatePlatformPort(requestedPlatformHTTPPort)) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "platformHTTPPort must be a valid port [1-65535]"); throw JSONRPCError(RPC_INVALID_PARAMETER, "platformHTTPPort must be a valid port [1-65535]");
} }
@ -1478,6 +1478,7 @@ static UniValue protx_diff(const JSONRPCRequest& request)
" update_service - Create and send ProUpServTx to network\n" " update_service - Create and send ProUpServTx to network\n"
" update_service_hpmn - Create and send ProUpServTx to network for a HPMN\n" " update_service_hpmn - Create and send ProUpServTx to network for a HPMN\n"
" update_registrar - Create and send ProUpRegTx to network\n" " update_registrar - Create and send ProUpRegTx to network\n"
" update_registrar_legacy - Create ProUpRegTx by parsing BLS using the legacy scheme, then send it to network\n"
" revoke - Create and send ProUpRevTx to network\n" " revoke - Create and send ProUpRevTx to network\n"
#endif #endif
" diff - Calculate a diff and a proof between two masternode lists\n", " diff - Calculate a diff and a proof between two masternode lists\n",