Skip to content

Commit e30bb2f

Browse files
author
pedro-at-decenomy
committed
Merge branch 'ESK-develop' of https://github.com/decenomy/DSW 
2 parents c02cf81 + 59da247 commit e30bb2f

38 files changed

Lines changed: 929 additions & 2050 deletions

‎configure.ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
22
AC_PREREQ([2.60])
33
define(_CLIENT_VERSION_MAJOR, 2)
44
define(_CLIENT_VERSION_MINOR, 1)
5-
define(_CLIENT_VERSION_REVISION, 1)
5+
define(_CLIENT_VERSION_REVISION, 2)
66
define(_CLIENT_VERSION_BUILD, 0)
77
define(_CLIENT_VERSION_RC, 0)
88
define(_CLIENT_VERSION_IS_RELEASE, true)

‎contrib/docker/Dockerfile.dsw-windows-x64-builder‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ RUN for host in $HOSTS; \
6969
done \
7070
done
7171

72-
RUN ln -s ${WRAP_DIR}/x86_64-w64-mingw32-windres ${WRAP_DIR}/windres
73-
7472
# Clone the repository
7573
RUN git clone https://github.com/decenomy/DSW.git
7674

‎depends/packages/gmp.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ $(package)_sha256_hash=5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d
1010
define $(package)_set_vars
1111
$(package)_config_opts=--disable-shared
1212
$(package)_config_opts_mingw32=--enable-mingw
13+
$(package)_config_opts_mingw32+=CC_FOR_BUILD=gcc
1314
$(package)_config_opts_linux=--with-pic
1415
endef
1516

‎depends/packages/openssl.mk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ $(package)_config_opts_alpha_linux=linux-generic64
6565
$(package)_config_opts_m68k_linux=linux-generic32
6666
$(package)_config_opts_x86_64_darwin=darwin64-x86_64-cc
6767
$(package)_config_opts_x86_64_mingw32=mingw64
68+
$(package)_config_opts_x86_64_mingw32+=RC=x86_64-w64-mingw32-windres
6869
$(package)_config_opts_i686_mingw32=mingw
6970
endef
7071

‎src/activemasternode.cpp‎

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -48,38 +48,9 @@ void CActiveMasternode::ManageStatus()
4848
if (status != ACTIVE_MASTERNODE_STARTED) {
4949
// Set defaults
5050
status = ACTIVE_MASTERNODE_NOT_CAPABLE;
51-
notCapableReason = "";
52-
53-
if (pwalletMain->IsLocked()) {
54-
notCapableReason = "Wallet is locked.";
55-
LogPrintf("CActiveMasternode::ManageStatus() - not capable: %s\n", notCapableReason);
56-
return;
57-
}
58-
59-
if (pwalletMain->GetAvailableBalance() == 0) {
60-
notCapableReason = "Hot node, waiting for remote activation.";
61-
LogPrintf("CActiveMasternode::ManageStatus() - not capable: %s\n", notCapableReason);
62-
return;
63-
}
64-
65-
if (!GetLocal(service)) {
66-
notCapableReason = "Can't detect external address.";
67-
LogPrintf("CActiveMasternode::ManageStatus() - not capable: %s\n", notCapableReason);
68-
return;
69-
}
70-
71-
// The service needs the correct default port to work properly
72-
if (!CMasternodeBroadcast::CheckDefaultPort(service, errorMessage, "CActiveMasternode::ManageStatus()"))
73-
return;
74-
75-
LogPrintf("CActiveMasternode::ManageStatus() - Checking inbound connection to '%s'\n", service.ToString());
76-
77-
CAddress addr(service, NODE_NETWORK);
78-
if (!g_connman->OpenNetworkConnection(addr, true, nullptr)) {
79-
notCapableReason = "Could not connect to " + service.ToString();
80-
LogPrintf("CActiveMasternode::ManageStatus() - not capable: %s\n", notCapableReason);
81-
return;
82-
}
51+
52+
notCapableReason = "Waiting for start message from controller.";
53+
return;
8354
}
8455

8556
//send to all peers

‎src/chain.cpp‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -246,21 +246,16 @@ uint256 CBlockIndex::GetStakeModifierV2() const
246246

247247
bool ReadBlockFromDisk(CBlock& block, const CBlockIndex* pindex);
248248

249-
CScript* CBlockIndex::GetPaidPayee()
249+
CScript CBlockIndex::GetPaidPayee() const
250250
{
251-
if(paidPayee == nullptr || paidPayee->empty()) {
252-
CBlock block;
253-
if (nHeight <= chainActive.Height() && ReadBlockFromDisk(block, this)) {
254-
auto amount = CMasternode::GetMasternodePayment(nHeight);
255-
auto mnpayee = block.GetPaidPayee(amount);
256-
257-
if(!mnpayee.empty()) {
258-
paidPayee = new CScript(mnpayee);
259-
}
260-
}
251+
CBlock block;
252+
if (nHeight <= chainActive.Height() && ReadBlockFromDisk(block, this)) {
253+
auto amount = CMasternode::GetMasternodePayment(nHeight);
254+
auto paidPayee = block.GetPaidPayee(amount);
255+
return paidPayee;
261256
}
262257

263-
return paidPayee;
258+
return CScript();
264259
}
265260

266261
//! Check whether this block index entry is valid up to the passed validity level.

‎src/chain.h‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,6 @@ class CBlockIndex
231231
//! (memory only) Sequential id assigned to distinguish order in which blocks are received.
232232
uint32_t nSequenceId{0};
233233

234-
//! (memory only) paid masternode.
235-
CScript* paidPayee{nullptr};
236-
237234
CBlockIndex() {}
238235
CBlockIndex(const CBlock& block);
239236

@@ -263,7 +260,7 @@ class CBlockIndex
263260
void SetNewStakeModifier(const uint256& prevoutId); // generates and sets new v2 modifier
264261
uint64_t GetStakeModifierV1() const;
265262
uint256 GetStakeModifierV2() const;
266-
CScript* GetPaidPayee();
263+
CScript GetPaidPayee() const;
267264

268265
//! Check whether this block index entry is valid up to the passed validity level.
269266
bool IsValid(enum BlockStatus nUpTo = BLOCK_VALID_TRANSACTIONS) const;

‎src/chainparams.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ class CMainParams : public CChainParams
207207
consensus.vUpgrades[Consensus::UPGRADE_TIME_PROTOCOL_V2].nActivationHeight = 930101;
208208
consensus.vUpgrades[Consensus::UPGRADE_P2PKH_BLOCK_SIGNATURES].nActivationHeight = 930201;
209209
consensus.vUpgrades[Consensus::UPGRADE_STAKE_MIN_DEPTH_V2].nActivationHeight = 930301;
210-
consensus.vUpgrades[Consensus::UPGRADE_MASTERNODE_RANK_V2].nActivationHeight = 930401;
211210
consensus.vUpgrades[Consensus::UPGRADE_DYNAMIC_REWARDS].nActivationHeight = 2700001;
212211
consensus.vUpgrades[Consensus::UPGRADE_DYNAMIC_COLLATERALS].nActivationHeight = Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
213212
consensus.vUpgrades[Consensus::UPGRADE_POS_V3].nActivationHeight = 2700001;
@@ -218,7 +217,6 @@ class CMainParams : public CChainParams
218217
consensus.vUpgrades[Consensus::UPGRADE_TIME_PROTOCOL_V2].hashActivationBlock = uint256S("6124f4600579296b9dd3973c13b6a24ff84aa0fd06e66b35356cb229eab8a6d1");
219218
consensus.vUpgrades[Consensus::UPGRADE_P2PKH_BLOCK_SIGNATURES].hashActivationBlock = uint256S("aa274bbdbea34da289250e73078a5912e6edf6e93977bd8474be1527993ca09a");
220219
consensus.vUpgrades[Consensus::UPGRADE_STAKE_MIN_DEPTH_V2].hashActivationBlock = uint256S("537221a9b3179f9d95c4d84c6c28321fe7cc1d4a1cf2329e1dde87643ed39187");
221-
consensus.vUpgrades[Consensus::UPGRADE_MASTERNODE_RANK_V2].hashActivationBlock = uint256S("dc97bc8e643eaddf4b0b0726abf437f39ffc7df5eaa646957bf7b03bf817c5dc");
222220
consensus.vUpgrades[Consensus::UPGRADE_DYNAMIC_REWARDS].hashActivationBlock = uint256S("0x0");
223221
consensus.vUpgrades[Consensus::UPGRADE_DYNAMIC_COLLATERALS].hashActivationBlock = uint256S("0x0");
224222
consensus.vUpgrades[Consensus::UPGRADE_POS_V3].hashActivationBlock = uint256S("0x0");
@@ -314,7 +312,6 @@ class CTestNetParams : public CMainParams
314312
consensus.vUpgrades[Consensus::UPGRADE_TIME_PROTOCOL_V2].nActivationHeight = 1641;
315313
consensus.vUpgrades[Consensus::UPGRADE_P2PKH_BLOCK_SIGNATURES].nActivationHeight = 1741;
316314
consensus.vUpgrades[Consensus::UPGRADE_STAKE_MIN_DEPTH_V2].nActivationHeight = 1841;
317-
consensus.vUpgrades[Consensus::UPGRADE_MASTERNODE_RANK_V2].nActivationHeight = 1941;
318315
consensus.vUpgrades[Consensus::UPGRADE_DYNAMIC_REWARDS].nActivationHeight = Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
319316
consensus.vUpgrades[Consensus::UPGRADE_DYNAMIC_COLLATERALS].nActivationHeight = Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
320317
consensus.vUpgrades[Consensus::UPGRADE_POS_V3].nActivationHeight = Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;

‎src/consensus/params.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ enum UpgradeIndex : uint32_t {
3232
UPGRADE_TIME_PROTOCOL_V2,
3333
UPGRADE_P2PKH_BLOCK_SIGNATURES,
3434
UPGRADE_STAKE_MIN_DEPTH_V2,
35-
UPGRADE_MASTERNODE_RANK_V2,
3635
UPGRADE_DYNAMIC_REWARDS,
3736
UPGRADE_DYNAMIC_COLLATERALS,
3837
UPGRADE_POS_V3,

‎src/consensus/upgrades.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
const struct NUInfo NetworkUpgradeInfo[Consensus::MAX_NETWORK_UPGRADES] = {
1717
{
1818
/*.strName =*/ "Base",
19-
/*.strInfo =*/ "Eskacoin network",
19+
/*.strInfo =*/ "Base network",
2020
},
2121
{
2222
/*.strName =*/ "PoS",
@@ -48,10 +48,6 @@ const struct NUInfo NetworkUpgradeInfo[Consensus::MAX_NETWORK_UPGRADES] = {
4848
/*.strName =*/ "Stake_min_depth_v2",
4949
/*.strInfo =*/ "Increases the stake min depth",
5050
},
51-
{
52-
/*.strName =*/ "masternode_rank_v2",
53-
/*.strInfo =*/ "new masternode ranking system",
54-
},
5551
{
5652
/*.strName =*/ "dynamic_rewards",
5753
/*.strInfo =*/ "dynamic reward system",

0 commit comments

Comments
 (0)