diff --git a/src/hash.cpp b/src/hash.cpp index 1ece8c5a7922d..ee6e80095b7ae 100644 --- a/src/hash.cpp +++ b/src/hash.cpp @@ -75,7 +75,7 @@ unsigned int MurmurHash3(unsigned int nHashSeed, Span vData void BIP32Hash(const ChainCode &chainCode, unsigned int nChild, unsigned char header, const unsigned char data[32], unsigned char output[64]) { unsigned char num[4]; - WriteBE32(num, nChild); + WriteBE32(num, nChild); CHMAC_SHA512(chainCode.begin(), chainCode.size()).Write(&header, 1).Write(data, 32).Write(num, 4).Finalize(output); } diff --git a/src/outputtype.cpp b/src/outputtype.cpp index 566e5ec55acf4..e14ad9f9074c6 100644 --- a/src/outputtype.cpp +++ b/src/outputtype.cpp @@ -51,7 +51,7 @@ CTxDestination GetDestinationForKey(const CPubKey& key, OutputType type) { switch (type) { case OutputType::LEGACY: return PKHash(key); - case OutputType::P2SH_SEGWIT: + case OutputType::P2SH_SEGWIT: case OutputType::BECH32: { if (!key.IsCompressed()) return PKHash(key); CTxDestination witdest = WitnessV0KeyHash(key); @@ -102,6 +102,7 @@ CTxDestination AddAndGetDestinationForScript(FillableSigningProvider& keystore, } } case OutputType::BECH32M: + case OutputType::UNKNOWN: {} // This function should not be used for BECH32M or UNKNOWN, so let it assert } // no default case, so the compiler can warn about missing cases assert(false); diff --git a/src/validation.cpp b/src/validation.cpp index 34103d18bc1b5..84c3d0275424c 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -192,7 +192,7 @@ std::optional> CalculatePrevHeights( } // namespace std::optional CalculateLockPointsAtTip( - CBlockIndex* tip, + CBlockIndex* tip, const CCoinsView& coins_view, const CTransaction& tx) { @@ -202,7 +202,7 @@ std::optional CalculateLockPointsAtTip( if (!prev_heights.has_value()) return std::nullopt; CBlockIndex next_tip; - next_tip.pprev = tip; + next_tip.pprev = tip; // When SequenceLocks() is called within ConnectBlock(), the height // of the block *being* evaluated is what is used. // Thus if we want to know if a transaction can be part of the