Merge branch 'groovy_gluon_7.3RC' into mainnet

BeamMW · May 8, 2023 · 3c8e190 · 3c8e190
2 parents 1b03f16 + 558fd6c
commit 3c8e190
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 1 deletion.
diff --git a/node/node.cpp b/node/node.cpp
@@ -927,6 +927,48 @@ void Node::Processor::FlushDB()
     }
 }
 
+void Node::Processor::OnInvalidBlock(const Block::SystemState::Full& s, const Block::Body& block)
+{
+    if (!get_ParentObj().m_Miner.IsEnabled())
+        return;
+
+    // format path
+    std::string sPath = get_ParentObj().m_Cfg.m_sPathLocal;
+    {
+        for (uint32_t i = (uint32_t) sPath.size(); ; )
+        {
+            if (!i--)
+            {
+                sPath.clear();
+                break;
+            }
+
+            if (('/' == sPath[i]) || ('\\' == sPath[i]))
+            {
+                sPath.resize(i + 1);
+                break;
+            }
+        }
+
+        Merkle::Hash hv;
+        s.get_Hash(hv);
+
+        std::ostringstream os;
+        os << s.m_Height << '-' << hv << ".inv_block";
+        sPath += os.str();
+    }
+
+    std::FStream fs;
+    if (fs.Open(sPath.c_str(), false))
+    {
+        Serializer ser;
+        ser & s;
+        ser & block;
+
+        fs.write(ser.buffer().first, ser.buffer().second);
+    }
+}
+
 Node::Peer* Node::AllocPeer(const beam::io::Address& addr)
 {
     Peer* pPeer = new Peer(*this);

diff --git a/node/node.h b/node/node.h
@@ -238,6 +238,7 @@ struct Node
 		void OnDummy(const CoinID&, Height) override;
 		void InitializeUtxosProgress(uint64_t done, uint64_t total) override;
 		Height get_MaxAutoRollback() override;
+		void OnInvalidBlock(const Block::SystemState::Full&, const Block::Body&) override;
 		void Stop();
 
 		struct MyExecutorMT

diff --git a/node/processor.cpp b/node/processor.cpp
@@ -2940,7 +2940,7 @@ bool NodeProcessor::HandleBlock(const NodeDB::StateID& sid, const Block::SystemS
 			if (s.m_Kernels != ev.m_hvKernels)
 			{
 				LOG_WARNING() << LogSid(m_DB, sid) << " Kernel commitment mismatch";
-				return false;
+				bOk = false;
 			}
 		}
 
@@ -2962,6 +2962,8 @@ bool NodeProcessor::HandleBlock(const NodeDB::StateID& sid, const Block::SystemS
 		{
 			bic.m_Fwd = false;
 			BEAM_VERIFY(HandleValidatedBlock(block, bic));
+
+			OnInvalidBlock(s, block);
 		}
 	}
 
@@ -6553,6 +6555,7 @@ bool NodeProcessor::GenerateNewBlock(BlockContext& bc)
 	if (!bOk)
 	{
 		LOG_WARNING() << "couldn't apply block after cut-through!";
+		OnInvalidBlock(bc.m_Hdr, bc.m_Block);
 		return false; // ?!
 	}
 	GenerateNewHdr(bc, bic);

diff --git a/node/processor.h b/node/processor.h
@@ -554,6 +554,7 @@ class NodeProcessor
 	virtual void InitializeUtxosProgress(uint64_t done, uint64_t total) {}
 	virtual void OnFastSyncSucceeded() {}
 	virtual Height get_MaxAutoRollback();
+	virtual void OnInvalidBlock(const Block::SystemState::Full&, const Block::Body&) {}
 
 	struct MyExecutor
 		:public Executor