Fix build: resolve copyright header errors in dbwrapper.cpp, deploymentstatus.cpp, and httpserver.h

- Add missing comment markers (//) to DigiByte copyright lines

Author: JaredTate

bitcoin-v26.2-for-digibyte

@@ -0,0 +1 @@
+Subproject commit 47a73921b8599e9e883c3ad3bf18919a88bf4437

src/addrdb.cpp

@@ -26,8 +26,8 @@
 #include <util/translation.h>
 
 CBanEntry::CBanEntry(const UniValue& json)
-    : nVersion(json["version"].get_int()), nCreateTime(json["ban_created"].get_int64()),
-      nBanUntil(json["banned_until"].get_int64())
+    : nVersion(json["version"].getInt<int>()), nCreateTime(json["ban_created"].getInt<int64_t>()),
+      nBanUntil(json["banned_until"].getInt<int64_t>())
 {
 }
 
@@ -109,13 +109,13 @@ bool SerializeFileDB(const std::string& prefix, const fs::path& path, const Data
 {
     // Generate random temporary filename
     uint16_t randv = 0;
-    GetRandBytes((unsigned char*)&randv, sizeof(randv));
+    GetRandBytes({(unsigned char*)&randv, sizeof(randv)});
     std::string tmpfn = strprintf("%s.%04x", prefix, randv);
 
     // open temp output file, and associate with CAutoFile
-    fs::path pathTmp = gArgs.GetDataDirNet() / tmpfn;
+    fs::path pathTmp = gArgs.GetDataDirNet() / fs::u8path(tmpfn);
     FILE *file = fsbridge::fopen(pathTmp, "wb");
-    CAutoFile fileout(file, SER_DISK, version);
+    CAutoFile fileout(file, version);
     if (fileout.IsNull()) {
         fileout.fclose();
         remove(pathTmp);
@@ -148,7 +148,7 @@ template <typename Stream, typename Data>
 bool DeserializeDB(Stream& stream, Data& data, bool fCheckSum = true)
 {
     try {
-        CHashVerifier<Stream> verifier(&stream);
+        HashVerifier<Stream> verifier(stream);
         // de-serialize file header (network specific magic number) and ..
         unsigned char pchMsgTmp[4];
         verifier >> pchMsgTmp;
@@ -180,7 +180,7 @@ bool DeserializeFileDB(const fs::path& path, Data& data, int version)
 {
     // open input file, and associate with CAutoFile
     FILE* file = fsbridge::fopen(path, "rb");
-    CAutoFile filein(file, SER_DISK, version);
+    CAutoFile filein(file, version);
     if (filein.IsNull()) {
         LogPrintf("Missing or invalid file %s\n", path.string());
         return false;

src/addrdb.h

@@ -25,52 +25,6 @@ class CDataStream;
 class DataStream;
 class NetGroupManager;
 
-class CBanEntry
-{
-public:
-    static const int CURRENT_VERSION=1;
-    int nVersion;
-    int64_t nCreateTime;
-    int64_t nBanUntil;
-
-    CBanEntry()
-    {
-        SetNull();
-    }
-
-    explicit CBanEntry(int64_t nCreateTimeIn)
-    {
-        SetNull();
-        nCreateTime = nCreateTimeIn;
-    }
-
-    /**
-     * Create a ban entry from JSON.
-     * @param[in] json A JSON representation of a ban entry, as created by `ToJson()`.
-     * @throw std::runtime_error if the JSON does not have the expected fields.
-     */
-    explicit CBanEntry(const UniValue& json);
-
-    SERIALIZE_METHODS(CBanEntry, obj)
-    {
-        uint8_t ban_reason = 2; //! For backward compatibility
-        READWRITE(obj.nVersion, obj.nCreateTime, obj.nBanUntil, ban_reason);
-    }
-
-    void SetNull()
-    {
-        nVersion = CBanEntry::CURRENT_VERSION;
-        nCreateTime = 0;
-        nBanUntil = 0;
-    }
-
-    /**
-     * Generate a JSON representation of this ban entry.
-     * @return JSON suitable for passing to the `CBanEntry(const UniValue&)` constructor.
-     */
-    UniValue ToJson() const;
-};
-
 /** Access to the (IP) address database (peers.dat) */
 /** Only used by tests. */
 void ReadFromStream(AddrMan& addr, DataStream& ssPeers);

src/banman.cpp

@@ -34,7 +34,8 @@ void BanMan::LoadBanlist()
     if (m_client_interface) m_client_interface->InitMessage(_("Loading banlist…").translated);
 
     const auto start{SteadyClock::now()};
-    if (m_ban_db.Read(m_banned)) {
+    bool dirty = false;
+    if (m_ban_db.Read(m_banned, dirty)) {
         SweepBanned(); // sweep out unused entries
 
         LogPrint(BCLog::NET, "Loaded %d banned node addresses/subnets  %dms\n", m_banned.size(),

src/chain.h

@@ -212,10 +212,6 @@ class CBlockIndex
     //! DigiByte: Track last block per algorithm for multi-algo mining
     CBlockIndex *lastAlgoBlocks[NUM_ALGOS_IMPL];
 
-    /**
-     * Default constructor (no header):
-     */
-    CBlockIndex();
 
     /**
      * Full constructor that copies fields from a block header.

src/dbwrapper.cpp

@@ -1,7 +1,7 @@
 
 // Copyright (c) 2012-2019 The Bitcoin Core developers
 // Copyright (c) 2014-2019 The Bitcoin Core developers
-Copyright (c) 2014-2019 The DigiByte Core developers
+// Copyright (c) 2014-2019 The DigiByte Core developers
 
 // Copyright (c) 2012-2022 The Bitcoin Core developers
 
@@ -158,9 +158,6 @@ static leveldb::Options GetOptions(size_t nCacheSize)
 }
 
 
-CDBWrapper::CDBWrapper(const fs::path& path, size_t nCacheSize, bool fMemory, bool fWipe, bool obfuscate)
-    : m_name{path.stem().string()}
-
 struct CDBBatch::WriteBatchImpl {
     leveldb::WriteBatch batch;
 };
@@ -172,7 +169,6 @@ CDBBatch::CDBBatch(const CDBWrapper& _parent)
 CDBBatch::~CDBBatch() = default;
 
 void CDBBatch::Clear()
-
 {
     m_impl_batch->batch.Clear();
     size_estimate = 0;
@@ -342,10 +338,6 @@ const unsigned int CDBWrapper::OBFUSCATE_KEY_NUM_BYTES = 8;
 std::vector<unsigned char> CDBWrapper::CreateObfuscateKey() const
 {
     std::vector<uint8_t> ret(OBFUSCATE_KEY_NUM_BYTES);
-
-    GetRandBytes(ret.data(), OBFUSCATE_KEY_NUM_BYTES);
-    return ret;
-
     GetRandBytes(ret);
     return ret;
 }

src/deploymentstatus.cpp

@@ -1,9 +1,9 @@
 
 // Copyright (c) 2020 The Bitcoin Core developers
-Copyright (c) 2020 The DigiByte Core developers
+// Copyright (c) 2020 The DigiByte Core developers
 
 // Copyright (c) 2020-2022 The Bitcoin Core developers
-Copyright (c) 2020-2022 The DigiByte Core developers
+// Copyright (c) 2020-2022 The DigiByte Core developers
 
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.

src/httpserver.h

@@ -1,10 +1,10 @@
 
 // Copyright (c) 2015-2020 The Bitcoin Core developers
 // Copyright (c) 2014-2020 The Bitcoin Core developers
-Copyright (c) 2014-2020 The DigiByte Core developers
+// Copyright (c) 2014-2020 The DigiByte Core developers
 
 // Copyright (c) 2015-2022 The Bitcoin Core developers
-Copyright (c) 2015-2022 The DigiByte Core developers
+// Copyright (c) 2015-2022 The DigiByte Core developers
 
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.