CIS out, TX in

Author: jamesob

src/net_processing.cpp

@@ -4210,6 +4210,8 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type,
     }
 
     if (msg_type == NetMsgType::TX) {
+        auto event = g_event_logger->time_event("TX");
+
         if (RejectIncomingTxs(pfrom)) {
             LogDebug(BCLog::NET, "transaction sent in violation of protocol, %s", pfrom.DisconnectMsg(fLogIPs));
             pfrom.fDisconnect = true;
@@ -4250,6 +4252,8 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type,
             }
 
             if (package_to_validate) {
+                event.add_metadata("pkg=1");
+
                 const auto package_result{ProcessNewPackage(m_chainman.ActiveChainstate(), m_mempool, package_to_validate->m_txns, /*test_accept=*/false, /*client_maxfeerate=*/std::nullopt)};
                 LogDebug(BCLog::TXPACKAGES, "package evaluation for %s: %s\n", package_to_validate->ToString(),
                          package_result.m_state.IsValid() ? "package accepted" : "package rejected");
@@ -4269,7 +4273,10 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type,
             pfrom.m_last_tx_time = GetTime<std::chrono::seconds>();
         }
         if (state.IsInvalid()) {
+            event.add_metadata("invalid=1");
+
             if (auto package_to_validate{ProcessInvalidTx(pfrom.GetId(), ptx, state, /*first_time_failure=*/true)}) {
+                event.add_metadata("pkg=1");
                 const auto package_result{ProcessNewPackage(m_chainman.ActiveChainstate(), m_mempool, package_to_validate->m_txns, /*test_accept=*/false, /*client_maxfeerate=*/std::nullopt)};
                 LogDebug(BCLog::TXPACKAGES, "package evaluation for %s: %s\n", package_to_validate->ToString(),
                          package_result.m_state.IsValid() ? "package accepted" : "package rejected");

src/validation.cpp

@@ -2169,13 +2169,8 @@ bool CheckInputScripts(const CTransaction& tx, TxValidationState& state,
 {
     if (tx.IsCoinBase()) return true;
 
-    auto event = g_event_logger->time_event("CIS");
-
     if (pvChecks) {
         pvChecks->reserve(tx.vin.size());
-        event.add_metadata("sync=0");
-    } else {
-        event.add_metadata("sync=1");
     }
 
     // First check if script executions have been cached with the same