From 5d5e6a6762ec01ac4443951148162844b59f6c45 Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Wed, 11 Mar 2020 16:41:31 +0000 Subject: [PATCH] Fix typos/minor errors in comments, and wrap some lines. This minimizes the diff in the example implementation of funding streams in ZIP 207. Signed-off-by: Daira Hopwood --- src/chainparams.cpp | 2 +- src/main.cpp | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index b37fa36bb..2f6cbdbbe 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -328,7 +328,7 @@ public: // a minimum difficulty block can be mined if no block is mined normally within 15 minutes): // // However the median-time-past is 6 blocks behind, and the worst-case time for 7 blocks at a - // 15-minute spacing is ~105 minutes, which is exceeds the limit imposed by the soft fork of + // 15-minute spacing is ~105 minutes, which exceeds the limit imposed by the soft fork of // 90 minutes. // // After Blossom, the minimum difficulty threshold time is changed to 6 times the block target diff --git a/src/main.cpp b/src/main.cpp index e7f70ec6a..d324ced36 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3931,7 +3931,8 @@ bool ContextualCheckBlock( ? pindexPrev->GetMedianTimePast() : block.GetBlockTime(); if (!IsFinalTx(tx, nHeight, nLockTimeCutoff)) { - return state.DoS(10, error("%s: contains a non-final transaction", __func__), REJECT_INVALID, "bad-txns-nonfinal"); + return state.DoS(10, error("%s: contains a non-final transaction", __func__), + REJECT_INVALID, "bad-txns-nonfinal"); } } @@ -3944,15 +3945,16 @@ bool ContextualCheckBlock( CScript expect = CScript() << nHeight; if (block.vtx[0].vin[0].scriptSig.size() < expect.size() || !std::equal(expect.begin(), expect.end(), block.vtx[0].vin[0].scriptSig.begin())) { - return state.DoS(100, error("%s: block height mismatch in coinbase", __func__), REJECT_INVALID, "bad-cb-height"); + return state.DoS(100, error("%s: block height mismatch in coinbase", __func__), + REJECT_INVALID, "bad-cb-height"); } } // Coinbase transaction must include an output sending 20% of - // the block reward to a founders reward script, until the last founders - // reward block is reached, with exception of the genesis block. - // The last founders reward block is defined as the block just before the - // first subsidy halving block, which occurs at halving_interval + slow_start_shift + // the block subsidy to a Founders' Reward script, until the last Founders' + // Reward block is reached, with exception of the genesis block. + // The last Founders' Reward block is defined as the block just before the + // first subsidy halving block, which occurs at halving_interval + slow_start_shift. if ((nHeight > 0) && (nHeight <= consensusParams.GetLastFoundersRewardBlockHeight(nHeight))) { bool found = false; @@ -3966,7 +3968,8 @@ bool ContextualCheckBlock( } if (!found) { - return state.DoS(100, error("%s: founders reward missing", __func__), REJECT_INVALID, "cb-no-founders-reward"); + return state.DoS(100, error("%s: founders reward missing", __func__), + REJECT_INVALID, "cb-no-founders-reward"); } }