Skip to content

Commit 685b6ea

Browse files
author
Alexander Avramenko
committed
Merge branch 'dapsnet'
2 parents c9acbd4 + c782b28 commit 685b6ea

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

csnode/src/transactionsvalidator.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ bool TransactionsValidator::validateCommonAsSource(SolverContext& context, const
128128
payableMaxFees_.insert(std::make_pair(smarts.absolute_address(initTransaction.source()), leftFromMaxFee));
129129
}
130130
}
131+
break;
131132
}
132133
if (!ok) {
133134
cslog() << kLogPrefix << __func__ << ": reject contract emitted transaction, new_state not found in block";

solver/src/solvercore.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -446,12 +446,7 @@ void SolverCore::spawn_next_round(const cs::PublicKeys& nodes, const cs::Packets
446446
const auto lastHashBin = deferredBlock_.hash().to_binary();
447447

448448
std::copy(lastHashBin.cbegin(), lastHashBin.cend(), stage3.blockHash.begin());
449-
if (stage3.sender == 1 && conveyer.currentRoundNumber() > 10) {
450-
stage3.blockSignature = Zero::signature;
451-
}
452-
else {
453-
stage3.blockSignature = cscrypto::generateSignature(private_key, stage3.blockHash.data(), stage3.blockHash.size());
454-
}
449+
stage3.blockSignature = cscrypto::generateSignature(private_key, stage3.blockHash.data(), stage3.blockHash.size());
455450

456451

457452
//pnode->prepareRoundTable(table, poolMetaInfo, stage3);

0 commit comments

Comments
 (0)