Apply pre-commit (#997)

Author: Warchant

.clang-format

@@ -1,3 +1,3 @@
 BasedOnStyle: Google
 BinPackArguments: false
-BinPackParameters: false
+BinPackParameters: false

.clang-tidy

@@ -159,4 +159,3 @@ CheckOptions:
   - key:             cert-msc32-c.DisallowedSeedTypes
     value:           'time_t,std::time_t'
 ...
-

.github/workflows/doxygen.yml

@@ -30,4 +30,4 @@ jobs:
         uses: JamesIves/[email protected]
         with:
           branch: docs
-          folder: build/docs/html 
+          folder: build/docs/html

.github/workflows/fuzz.yml

@@ -62,4 +62,4 @@ jobs:
         with:
           commit_changes: Update corpus ${{ github.sha }}
           branch: master
-          repository: ${{ github.workspace }}/fuzz-corpus
+          repository: ${{ github.workspace }}/fuzz-corpus

CONTRIBUTING.md

@@ -10,7 +10,7 @@
 
 ### Requirements for Pull-Requests
 
-A Pull-Request can be merged into `master` only if: 
+A Pull-Request can be merged into `master` only if:
 
 1. Code is formatted with `clang-format`.
 2. Continuous Integration system is green (all checks passed).

LICENSE.md

@@ -160,4 +160,4 @@ This License, the documents related to it and any agreement that incorporates an
 
 **"Source Code"** means, as it pertains to a Covered Work or a Program, those statements in a computer language which, when processed by a compiler, assembler or interpreter, become executable by a computer and includes, without limitation, all comments, notes, flow charts, decision tables, argument lists and other human readable references relating to the operation, purpose, compilation, assembly or interpretation thereof.
 
-**"Special Conditions"** means Chapter II (Special Conditions) of this License.
+**"Special Conditions"** means Chapter II (Special Conditions) of this License.

benchmark/CMakeLists.txt

@@ -18,4 +18,4 @@ addbenchmark(progpow progpow.cpp)
 addbenchmark(keccakf800 keccakf800.cpp)
 addbenchmark(stateless_validation stateless_validation.cpp)
 addbenchmark(cache cache.cpp)
-addbenchmark(mempool mempool.cpp)
+addbenchmark(mempool mempool.cpp)

benchmark/cache.cpp

@@ -39,7 +39,6 @@ static void ThirdPartyLRUCacheWithMutex(benchmark::State& state) {
   }
 }
 
-
 static void ThirdPartyLRUCacheWithoutMutex(benchmark::State& state) {
   srand(0);
   lru11::Cache<int, std::shared_ptr<int>, lru11::NullLock> cache(SIZE);

benchmark/mempool.cpp

@@ -6,14 +6,14 @@
 #include <benchmark/benchmark.h>
 
 #include <veriblock/pop/mempool.hpp>
+#include <veriblock/pop/mock_miner.hpp>
 #include <veriblock/pop/storage/adaptors/block_provider_impl.hpp>
 #include <veriblock/pop/storage/adaptors/inmem_storage_impl.hpp>
 #include <veriblock/pop/storage/adaptors/payloads_provider_impl.hpp>
-#include <veriblock/pop/mock_miner.hpp>
 
 using namespace altintegration;
 
-struct MempoolFixture: public benchmark::Fixture {
+struct MempoolFixture : public benchmark::Fixture {
   MempoolFixture() {
     auto BTCgenesis = GetRegTestBtcBlock();
     auto VBKgenesis = GetRegTestVbkBlock();
@@ -31,14 +31,13 @@ struct MempoolFixture: public benchmark::Fixture {
 
   void SetUp(const ::benchmark::State&) {
     // generate 100 vbk blocks
-    for(int i = 0; i < 100; i++) {
+    for (int i = 0; i < 100; i++) {
       auto block = popminer.mineVbkBlocks(1);
       assert(mempool.submit(block->getHeader(), false, val_state));
     }
   }
 
-  void TearDown(const ::benchmark::State&) {
-  }
+  void TearDown(const ::benchmark::State&) {}
 
   AltChainParamsRegTest altparam{};
   VbkChainParamsRegTest vbkparam{};
@@ -58,13 +57,14 @@ struct MempoolFixture: public benchmark::Fixture {
   ValidationState val_state;
 };
 
-BENCHMARK_DEFINE_F(MempoolFixture, Mempool_generatePopData)(benchmark::State& state) {
-    for (auto _ : state) {
-      auto pop_data = mempool.generatePopData();
-      (void)pop_data;
-    }
+BENCHMARK_DEFINE_F(MempoolFixture, Mempool_generatePopData)
+(benchmark::State& state) {
+  for (auto _ : state) {
+    auto pop_data = mempool.generatePopData();
+    (void)pop_data;
+  }
 }
 
 BENCHMARK_REGISTER_F(MempoolFixture, Mempool_generatePopData);
 // Run the benchmark
-BENCHMARK_MAIN();
+BENCHMARK_MAIN();

benchmark/progpow.cpp

@@ -29,7 +29,9 @@ static void ProgpowEpochUnCached(benchmark::State& state) {
   }
 }
 
-BENCHMARK(ProgpowEpochCached)->Unit(benchmark::kMillisecond);;
-BENCHMARK(ProgpowEpochUnCached)->Unit(benchmark::kMillisecond);;
+BENCHMARK(ProgpowEpochCached)->Unit(benchmark::kMillisecond);
+;
+BENCHMARK(ProgpowEpochUnCached)->Unit(benchmark::kMillisecond);
+;
 // Run the benchmark
 BENCHMARK_MAIN();

benchmark/vbk_sig.cpp

@@ -22,11 +22,13 @@ static auto defaultSignatureVbk =
     "3044022008d07afee77324d0bced6f3bce19892d0413981e83e68401cd83d1e1ed3bc37c022005273429062dcf623ccd04c8d9c9e601e7fc45b5db32900c9b0ffda2dbc8f452"_unhex;
 
 static void VerifySecp256k1Sig(benchmark::State& state) {
-  auto privateKey = altintegration::secp256k1::privateKeyFromVbk(defaultPrivateKeyVbk);
+  auto privateKey =
+      altintegration::secp256k1::privateKeyFromVbk(defaultPrivateKeyVbk);
   auto publicKey = altintegration::secp256k1::derivePublicKey(privateKey);
 
   for (auto _ : state) {
-    altintegration::secp256k1::verify(defaultMsg, defaultSignatureVbk, publicKey);
+    altintegration::secp256k1::verify(
+        defaultMsg, defaultSignatureVbk, publicKey);
   }
 }
 // Register the function as a benchmark

bindings/CMakeLists.txt

@@ -1 +1 @@
-add_subdirectory(go)
+add_subdirectory(go)

cmake/asan.cmake

@@ -14,4 +14,3 @@ function(enable_asan_on_target target)
         set(ENV{ASAN_OPTIONS} detect_container_overflow=0:verbosity=1:debug=1:detect_leaks=1:check_initialization_order=1:alloc_dealloc_mismatch=true:use_odr_indicator=true)
     endif()
 endfunction()
-

cmake/backward.cmake

@@ -28,7 +28,7 @@ endif()
 FetchContent_Declare(
         backward
         GIT_REPOSITORY https://github.com/bombela/backward-cpp.git
-        GIT_TAG        74184aad55777f0c04227edd56c3dea84b6a272f
+        GIT_TAG        f30744bcf726ea3735df7ecf9e9de9ddac540283
         GIT_PROGRESS   TRUE
         GIT_SHALLOW    TRUE
         USES_TERMINAL_DOWNLOAD TRUE

cmake/leveldb.cmake

@@ -28,4 +28,4 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 endif()
 
 
-add_compile_definitions(WITH_LEVELDB)
+add_compile_definitions(WITH_LEVELDB)

cmake/lib.pc.in

@@ -6,4 +6,4 @@ Description: Libraries for leveraging VeriBlock Proof-Of-Proof blockchain techno
 Version: @PROJECT_VERSION@
 URL: https://github.com/VeriBlock/alt-integration-cpp
 Libs: -L${libdir} -l@LIB_NAME@ @VBK_DEPENDENCIES_LIBS@ -lstdc++ -lm @SANITIZERS_LIBS@
-Cflags: -I${includedir} @SANITIZERS_CFLAGS@ @ADDITIONAL_CFLAGS@
+Cflags: -I${includedir} @SANITIZERS_CFLAGS@ @ADDITIONAL_CFLAGS@

cmake/rocksdb.cmake

@@ -55,4 +55,4 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
     target_add_flag(rocksdb /wd4242)
 endif()
 
-add_compile_definitions(WITH_ROCKSDB)
+add_compile_definitions(WITH_ROCKSDB)

cmake/ubsan.cmake

@@ -11,4 +11,3 @@ function(enable_ubsan_on_target target)
         set(ENV{UBSAN_OPTIONS} print_stacktrace=1)
     endif()
 endfunction()
-

docs/build.md

@@ -15,7 +15,7 @@ $ mkdir build
 $ cd build
 
 # build static library in release mode
-$ cmake .. -DCMAKE_BUILD_TYPE=Release -DSHARED=OFF 
+$ cmake .. -DCMAKE_BUILD_TYPE=Release -DSHARED=OFF
 $ make -j
 
 # install it in your OS globally

docs/description.md

@@ -10,7 +10,7 @@
 - altintegration::VTB - Cryptographic proof of VeriBlock block header publication in Bitcoin.
 - altintegration::VbkBlock - VeriBlock block header.
 - Payloads - ATV, VTB, VbkBlock sometimes can be referred to as "payloads".
-- altintegration::PopData - contains a list of VTBs, a list of ATVs, and a list of VBK blocks, called "Context". 
+- altintegration::PopData - contains a list of VTBs, a list of ATVs, and a list of VBK blocks, called "Context".
 - APM - Altchain PoP Miner.
 - VPM - VeriBlock PoP Miner.
 - Security Providing Chain (SP Chain) - blockchain, which stores endorsements and is used for providing security for SI chain.
@@ -31,14 +31,14 @@
 
 ![Network Topology](./img/topology.png)
 
-PoP security is built around "endorsing" blocks. 
+PoP security is built around "endorsing" blocks.
 When miners want to increase likelyhood of finalizing a block, they "endorse" it and blocks after it by creating "endorsing transaction" in SP chain.
 
 In example above, we see 3 chains (top-down): Bitcoin, VeriBlock, Altchain.
 
 In Altchain, we want to finalize block A100, then:
 1. APM creates altintegration::VbkTx, which contains altintegration::PublicationData - an entity, which contains Endorsed Block header, and Payout Information - for rewarding APM for this endorsement.
-2. This VBK TX is sent to VeriBlock. 
+2. This VBK TX is sent to VeriBlock.
 3. VBK POW miners create block V54 - this block will include this VBK TX from step above.
 4. APM builds cryptographic proof that endorsement of Altchain block is added to main chain. This proof is named ATV (Altchain to VeriBlock publication) and includes: VBK TX, Context (VBK blocks connecting V54 to V51 - V52..V53), Block Of Proof (V54), Merkle Path which proves that VBK TX is really inside V54.
 5. Then all this data is sent to Altchain, and added to PoP MemPool.
@@ -51,12 +51,12 @@ Continuing this example, VPM does exactly the same algorithm but with VBK blocks
 
 @note Endorsement Settlement Interval for VeriBlock is 400 blocks, PoP Payout Delay is also 400 blocks.
 
-Block V54 contains proof for A100, and B16 contains proof for block V56. 
+Block V54 contains proof for A100, and B16 contains proof for block V56.
 Since V56 is after V54, and V56 is finalized, we finalize all previous blocks, including V54, thus
 Altchain transitively inherits security of Bitcoin.
 
 @note We count endorsements, whose according blocks of proof **are on main chains** of according blockchains. An endorsement whose block of proof is not on the main chain of SP chain is not eligible for PoP Payout.
 
-You can also notice that VTBs and VBK blocks are sent to Altchain. 
+You can also notice that VTBs and VBK blocks are sent to Altchain.
 This is needed to communicate Bitcoin and VeriBlock consensus information to Altchain.
 APM implementation continuously submits VBK blocks and VTBs found on VeriBlock network to Altchain, so it is important to have at least 1 APM running continuously for the whole network.

docs/families/btc/integration_10_fr.md

@@ -134,7 +134,7 @@ Add additional failure codes.
 +{
 +    AssertLockHeld(cs_main);
 +    CBlockIndex* bestCandidate = m_chain.Tip();
- 
+
 -        // Find the best candidate header.
 -        {
 -            std::set<CBlockIndex*, CBlockIndexWorkComparator>::reverse_iterator it = setBlockIndexCandidates.rbegin();
@@ -277,7 +277,7 @@ Add additional failure codes.
 [method CChainState::ActivateBestChain](https://github.com/VeriBlock/vbk-ri-btc/blob/master/src/validation.cpp#L2856)
 ```cpp
                  ConnectTrace connectTrace(mempool); // Destructed before cs_main is unlocked
- 
+
 -                if (pindexMostWork == nullptr) {
 -                    pindexMostWork = FindMostWorkChain();
 +                if (pblock && pindexBestChain == nullptr) {
@@ -297,13 +297,13 @@ Add additional failure codes.
 +                if (pindexBestChain == nullptr) {
 +                    pindexBestChain = FindBestChain();
                  }
- 
+
                  // Whether we have anything to do at all.
 -                if (pindexMostWork == nullptr || pindexMostWork == m_chain.Tip()) {
 +                if (pindexBestChain == nullptr || pindexBestChain == m_chain.Tip()) {
                      break;
                  }
- 
+
 +                assert(pindexBestChain);
 +                // if pindexBestHeader is a direct successor of pindexBestChain, pindexBestHeader is still best.
 +                // otherwise pindexBestChain is new best pindexBestHeader
@@ -352,7 +352,7 @@ Add additional failure codes.
 ```cpp
          InvalidChainFound(to_mark_failed);
      }
- 
+
 +    PruneBlockIndexCandidates();
 +
      // Only notify about a new block tip if the active chain was modified.
@@ -377,7 +377,7 @@ Add additional failure codes.
 [method CChainState::ResetBlockFailureFlags](https://github.com/VeriBlock/vbk-ri-btc/blob/master/src/validation.cpp#L3162)
 ```cpp
      }
- 
+
 +    PruneBlockIndexCandidates();
 +
      // Remove the invalidity flag from all ancestors too.
@@ -475,4 +475,4 @@ Pop fork resolution test: [https://github.com/VeriBlock/vbk-ri-btc/blob/master/s
 -  vbk/test/unit/pop_reward_tests.cpp
 +  vbk/test/unit/pop_reward_tests.cpp \
 +  vbk/test/unit/forkresolution_tests.cpp
-```
+```

docs/families/btc/integration_11_p2p.md

@@ -95,20 +95,20 @@ P2P source: [https://github.com/VeriBlock/vbk-ri-btc/blob/master/src/vbk/p2p_syn
  {
      if (count == 0)
          return;
- 
+
      vBlocks.reserve(vBlocks.size() + count);
 -    CNodeState *state = State(nodeid);
 -    assert(state != nullptr);
 -
 -    // Make sure pindexBestKnownBlock is up to date, we'll need it.
 -    ProcessBlockAvailability(nodeid);
- 
+
 -    if (state->pindexBestKnownBlock == nullptr || state->pindexBestKnownBlock->nChainWork < ::ChainActive().Tip()->nChainWork || state->pindexBestKnownBlock->nChainWork < nMinimumChainWork) {
 +    if (bestBlock == nullptr || bestBlock->nChainWork < nMinimumChainWork) {
          // This peer has nothing interesting.
          return;
      }
- 
+
 -    if (state->pindexLastCommonBlock == nullptr) {
 +    assert(lastCommonBlockOut);
 +
@@ -118,15 +118,15 @@ P2P source: [https://github.com/VeriBlock/vbk-ri-btc/blob/master/src/vbk/p2p_syn
 -        state->pindexLastCommonBlock = ::ChainActive()[std::min(state->pindexBestKnownBlock->nHeight, ::ChainActive().Height())];
 +        *lastCommonBlockOut = ::ChainActive()[std::min(bestBlock->nHeight, ::ChainActive().Height())];
      }
- 
+
      // If the peer reorganized, our previous pindexLastCommonBlock may not be an ancestor
      // of its current tip anymore. Go back enough to fix that.
 -    state->pindexLastCommonBlock = LastCommonAncestor(state->pindexLastCommonBlock, state->pindexBestKnownBlock);
 -    if (state->pindexLastCommonBlock == state->pindexBestKnownBlock)
 +    *lastCommonBlockOut = LastCommonAncestor(*lastCommonBlockOut, bestBlock);
 +    if (*lastCommonBlockOut == bestBlock)
          return;
- 
+
      std::vector<const CBlockIndex*> vToFetch;
 -    const CBlockIndex *pindexWalk = state->pindexLastCommonBlock;
 +    const CBlockIndex *pindexWalk = *lastCommonBlockOut;
@@ -248,15 +248,15 @@ P2P source: [https://github.com/VeriBlock/vbk-ri-btc/blob/master/src/vbk/p2p_syn
 [method PeerLogicValidation::FinalizeNode](https://github.com/VeriBlock/vbk-ri-btc/blob/master/src/net_processing.cpp#L799)
 ```cpp
      assert(g_outbound_peers_with_protect_from_disconnect >= 0);
- 
+
      mapNodeState.erase(nodeid);
 +    // VeriBlock
 +    VeriBlock::p2p::erasePopDataNodeState(nodeid);
 ```
 [method ProcessMessage](https://github.com/VeriBlock/vbk-ri-btc/blob/master/src/net_processing.cpp#L1919)
 ```cpp
      }
- 
+
 +    // VeriBlock: if POP is not enabled, ignore POP-related P2P calls
 +    int tipHeight = ChainActive().Height();
 +    if (Params().isPopActive(tipHeight)) {
@@ -265,15 +265,15 @@ P2P source: [https://github.com/VeriBlock/vbk-ri-btc/blob/master/src/vbk/p2p_syn
 +            return pop_res;
 +        }
 +    }
- 
+
      if (!(pfrom->GetLocalServices() & NODE_BLOOM) &&
                (strCommand == NetMsgType::FILTERLOAD ||
 ```
  [method PeerLogicValidation::SendMessages](https://github.com/VeriBlock/vbk-ri-btc/blob/master/src/net_processing.cpp#L3596)
 ```cpp
          if (!vInv.empty())
              connman->PushMessage(pto, msgMaker.Make(NetMsgType::INV, vInv));
- 
+
 +        // VeriBlock offer Pop Data
 +        {
 +            VeriBlock::p2p::offerPopData<altintegration::ATV>(pto, connman, msgMaker);
@@ -313,4 +313,4 @@ libbitcoin_server_a_SOURCES = \
 +  vbk/p2p_sync.hpp \
 +  vbk/p2p_sync.cpp \
    rpc/blockchain.cpp \
-```
+```