Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions csnode/src/blockchain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ bool BlockChain::init(
if (lastSequence_ != 0) {
firstBlockToReadInDatabase = lastSequence_ + 1;
trxIndex_->pinFloor(lastSequence_.load());
emit successfullQuickStartEvent(csdb::Amount(blockRewardIntegral_, blockRewardFraction_), csdb::Amount(miningCoefficientIntegral_, miningCoefficientFraction_), miningOn_, miningOn_, TimeMinStage1_);
emit successfullQuickStartEvent(csdb::Amount(blockRewardIntegral_, blockRewardFraction_), csdb::Amount(miningCoefficientIntegral_, miningCoefficientFraction_), miningOn_, stakingOn_, TimeMinStage1_);
}

csinfo() << "QUICK START! lastSequence_ is " << lastSequence_.load();
Expand Down Expand Up @@ -2349,10 +2349,10 @@ void BlockChain::setMiningCoefficient(csdb::Amount coefficient) {
miningCoefficientFraction_ = coefficient.fraction();
}
void BlockChain::setMiningOn(bool mOn) {
stakingOn_ = mOn;
miningOn_ = mOn;
}
void BlockChain::setStakingOn(bool stOn) {
miningOn_ = stOn;
stakingOn_ = stOn;
}
void BlockChain::setTimeMinStage1(uint32_t timeStage1) {
TimeMinStage1_ = timeStage1;
Expand Down
6 changes: 6 additions & 0 deletions csnode/src/walletscache.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,12 @@ void WalletsCache::Updater::fundConfidantsWalletsWitnReward(const cs::Confidants
auto walletData = getWalletData(confidants[i]);
csdb::Amount reward = rewards[i];
if (reward > Consensus::blockReward || reward < csdb::Amount{ 0 }) {
// a dropped reward makes this node's balances differ from the network's
static uint64_t droppedRewards = 0;
if (droppedRewards++ % 10000 == 0) {
cswarning() << kLogPrefix << "confidant reward " << reward.to_string() << " dropped (local blockReward "
<< Consensus::blockReward.to_string() << "), " << droppedRewards << " dropped so far";
}
reward = csdb::Amount{ 0 };
}

Expand Down
19 changes: 18 additions & 1 deletion tests/csnode/blockchain_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,21 @@ TEST(BlockChain, block_service_info) {
ASSERT_TRUE(BlockChain::isBootstrap(block));
BlockChain::setBootstrap(block, false);
ASSERT_FALSE(BlockChain::isBootstrap(block));
}
}
// mining and staking are toggled independently (special transaction order 37) and
// restored from quick-start caches through these accessors
TEST(BlockChain, MiningAndStakingSettersAreIndependent) {
const csdb::Address genesis = csdb::Address::from_string("0000000000000000000000000000000000000000000000000000000000000001");
const csdb::Address start = csdb::Address::from_string("0000000000000000000000000000000000000000000000000000000000000002");
BlockChain blockChain(genesis, start);

blockChain.setMiningOn(true);
blockChain.setStakingOn(false);
ASSERT_TRUE(blockChain.getMiningOn());
ASSERT_FALSE(blockChain.getStakingOn());

blockChain.setMiningOn(false);
blockChain.setStakingOn(true);
ASSERT_FALSE(blockChain.getMiningOn());
ASSERT_TRUE(blockChain.getStakingOn());
}
Loading