diff --git a/src/chainparams.cpp b/src/chainparams.cpp --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -322,7 +322,7 @@ "000000000005b07ecf85563034d13efd81c1a29e47e22b20f4fc6919d5b09cd6"); // August 1, 2017 hard fork - consensus.uahfHeight = 1155876; + consensus.uahfHeight = 1155875; // November 13, 2017 hard fork consensus.daaHeight = 1188697; @@ -392,8 +392,8 @@ {546, uint256S("000000002a936ca763904c3c35fce2f3556c559c0214345" "d31b1bcebf76acb70")}, // UAHF fork block. - {1155876, uint256S("00000000000e38fef93ed9582a7df43815d5c2ba9fd" - "37ef70c9a0ea4a285b8f5")}, + {1155875, uint256S("00000000f17c850672894b9a75b63a1e72830bbd5f4" + "c8889b5c1a80e7faef138")}, // Nov, 13. DAA activation block. {1188697, uint256S("0000000000170ed0918077bde7b4d36cc4c91be69fa" "09211f748240dabe047fb")}, diff --git a/src/validation.cpp b/src/validation.cpp --- a/src/validation.cpp +++ b/src/validation.cpp @@ -1390,8 +1390,9 @@ static void InvalidChainFound(CBlockIndex *pindexNew) { if (!pindexBestInvalid || - pindexNew->nChainWork > pindexBestInvalid->nChainWork) + pindexNew->nChainWork > pindexBestInvalid->nChainWork) { pindexBestInvalid = pindexNew; + } LogPrintf( "%s: invalid block=%s height=%d log2_work=%.8g date=%s\n", __func__, @@ -2113,7 +2114,7 @@ // FIXME: This should be called with pindex->pprev, to match the result // given to AcceptToMemoryPoolWorker: https://reviews.bitcoinabc.org/T288 - uint32_t flags = GetBlockScriptFlags(pindex, config); + const uint32_t flags = GetBlockScriptFlags(pindex, config); int64_t nTime2 = GetTimeMicros(); nTimeForks += nTime2 - nTime1; @@ -2762,8 +2763,9 @@ if (state.IsInvalid()) { InvalidBlockFound(pindexNew, state); } - return error("ConnectTip(): ConnectBlock %s failed", - pindexNew->GetBlockHash().ToString()); + return error("ConnectTip(): ConnectBlock %s failed (%s)", + pindexNew->GetBlockHash().ToString(), + FormatStateMessage(state)); } nTime3 = GetTimeMicros(); nTimeConnectTotal += nTime3 - nTime2;