Trivial comment correction.
This commit is contained in:
parent
90fc879492
commit
f9b10b866e
|
@ -44,6 +44,8 @@ std::set<FundingStreamElement> GetActiveFundingStreamElements(
|
||||||
{
|
{
|
||||||
std::set<std::pair<FundingStreamAddress, CAmount>> requiredElements;
|
std::set<std::pair<FundingStreamAddress, CAmount>> requiredElements;
|
||||||
for (int idx = Consensus::FIRST_FUNDING_STREAM; idx < Consensus::MAX_FUNDING_STREAMS; idx++) {
|
for (int idx = Consensus::FIRST_FUNDING_STREAM; idx < Consensus::MAX_FUNDING_STREAMS; idx++) {
|
||||||
|
// The following indexed access is safe as Consensus::MAX_FUNDING_STREAMS is used
|
||||||
|
// in the definition of vFundingStreams.
|
||||||
auto fs = params.vFundingStreams[idx];
|
auto fs = params.vFundingStreams[idx];
|
||||||
// Funding period is [startHeight, endHeight)
|
// Funding period is [startHeight, endHeight)
|
||||||
if (fs && nHeight >= fs.get().GetStartHeight() && nHeight < fs.get().GetEndHeight()) {
|
if (fs && nHeight >= fs.get().GetStartHeight() && nHeight < fs.get().GetEndHeight()) {
|
||||||
|
|
|
@ -24,7 +24,6 @@ namespace Consensus {
|
||||||
// floor((height - SlowStartShift) / PreBlossomHalvingInterval), if not IsBlossomActivated(height)
|
// floor((height - SlowStartShift) / PreBlossomHalvingInterval), if not IsBlossomActivated(height)
|
||||||
// floor((BlossomActivationHeight - SlowStartShift) / PreBlossomHalvingInterval + (height - BlossomActivationHeight) / PostBlossomHalvingInterval), otherwise
|
// floor((BlossomActivationHeight - SlowStartShift) / PreBlossomHalvingInterval + (height - BlossomActivationHeight) / PostBlossomHalvingInterval), otherwise
|
||||||
if (NetworkUpgradeActive(nHeight, Consensus::UPGRADE_BLOSSOM)) {
|
if (NetworkUpgradeActive(nHeight, Consensus::UPGRADE_BLOSSOM)) {
|
||||||
|
|
||||||
int64_t blossomActivationHeight = vUpgrades[Consensus::UPGRADE_BLOSSOM].nActivationHeight;
|
int64_t blossomActivationHeight = vUpgrades[Consensus::UPGRADE_BLOSSOM].nActivationHeight;
|
||||||
// Ideally we would say:
|
// Ideally we would say:
|
||||||
// halvings = (blossomActivationHeight - consensusParams.SubsidySlowStartShift()) / consensusParams.nPreBlossomSubsidyHalvingInterval
|
// halvings = (blossomActivationHeight - consensusParams.SubsidySlowStartShift()) / consensusParams.nPreBlossomSubsidyHalvingInterval
|
||||||
|
|
|
@ -906,7 +906,7 @@ bool ContextualCheckTransaction(
|
||||||
// From Canopy onward, coinbase transaction must include outputs corresponding to the
|
// From Canopy onward, coinbase transaction must include outputs corresponding to the
|
||||||
// ZIP 207 consensus funding streams active at the current block height. To avoid
|
// ZIP 207 consensus funding streams active at the current block height. To avoid
|
||||||
// double-decrypting, we detect any shielded funding streams during the Heartwood
|
// double-decrypting, we detect any shielded funding streams during the Heartwood
|
||||||
// consensus check. If Canopy is not yet active, requiredStreams will be empty.
|
// consensus check. If Canopy is not yet active, fundingStreamElements will be empty.
|
||||||
std::set<Consensus::FundingStreamElement> fundingStreamElements;
|
std::set<Consensus::FundingStreamElement> fundingStreamElements;
|
||||||
if (canopyActive) {
|
if (canopyActive) {
|
||||||
fundingStreamElements = Consensus::GetActiveFundingStreamElements(
|
fundingStreamElements = Consensus::GetActiveFundingStreamElements(
|
||||||
|
|
Loading…
Reference in New Issue