pbft WIP(28)

Author: valdok

core/block_crypt.cpp

@@ -3043,7 +3043,7 @@ namespace beam
 			// add everything except the QC
 			auto& d = Cast::Reinterpret<Block::Pbft::HdrData>(m_PoW);
 			hp
-				<< d.m_hvVsNext
+				<< d.m_hvVsBoth
 				<< d.m_Time_ms
 				<< d.m_Flags1;
 

core/block_crypt.h

@@ -1731,7 +1731,7 @@ namespace beam
 			};
 
 			struct HdrData {
-				ECC::Hash::Value m_hvVsNext;
+				ECC::Hash::Value m_hvVsBoth; // hash(prev|next)
 				uintBigFor<uint16_t>::Type m_Time_ms;
 				QC m_QC;
 				uint8_t m_Flags1;

core/proto.cpp

@@ -1034,19 +1034,16 @@ void NodeConnection::Test(const PbftStamp& msg, const Block::SystemState::Full&
     if (!r.IsPbftWhitelistMode())
         ThrowUnexpected();
 
-    Block::Pbft::ValidatorSet vs;
-
-    Deserializer der;
-    der.reset(msg.m_vSer);
-    der & vs;
-
     Merkle::Hash hv;
-    vs.get_Hash(hv);
+    msg.m_ValidatorSet.get_Hash(hv);
+    Merkle::Interpret(hv, msg.m_hvVsNext, true);
 
     const auto& d = Cast::Reinterpret<Block::Pbft::HdrData>(s.m_PoW);
+    if (d.m_hvVsBoth != hv)
+        ThrowUnexpected();
 
     s.get_Hash(hv);
-    if (!state.CheckQuorum(hv, d.m_QC))
+    if (!msg.m_ValidatorSet.CheckQuorum(hv, d.m_QC))
         ThrowUnexpected();
 }
 

core/proto.h

@@ -322,7 +322,8 @@ namespace proto {
     macro(Block::Pbft::Address, Address)
 
 #define BeamNodeMsg_PbftStamp(macro) \
-    macro(ByteBuffer, vSer)
+    macro(Block::Pbft::ValidatorSet, ValidatorSet) \
+    macro(Merkle::Hash, hvVsNext)
 
 #define BeamNodeMsg_PbftPeerAssessment(macro) \
     macro(Block::Pbft::Address, From) \
@@ -634,6 +635,7 @@ namespace proto {
     inline void ZeroInit(Asset::Full& x) { x.Reset(); }
     inline void ZeroInit(HeightPos& x) { ZeroObject(x); }
     inline void ZeroInit(PbftReputationMap&) { }
+    inline void ZeroInit(Block::Pbft::ValidatorSet&) { }
 
     template <typename T> struct InitArg {
         typedef const T& TArg;

node/node.cpp

@@ -1622,9 +1622,7 @@ void Node::Peer::PbftSendStamp()
 	if (m_Tip.m_hh == m_This.m_Processor.m_Cursor.m_hh)
 		return;
 
-	proto::PbftStamp msgStamp;
-	TemporarySwap ts(msgStamp.m_vSer, m_This.m_Validator.m_Stamp.m_vSer);
-	Send(msgStamp);
+	Send(m_This.m_Validator.m_Stamp.m_Msg);
 }
 
 Height Node::Peer::get_MinPeerFork()
@@ -4568,7 +4566,7 @@ void Node::Peer::OnMsg(proto::PbftStamp&& msg)
 
 	// all good
 	v.m_Stamp.m_ID = m_Tip.m_hh;
-	v.m_Stamp.m_vSer = std::move(msg.m_vSer);
+	v.m_Stamp.m_Msg = std::move(msg);
 
 	v.SaveStamp();
 
@@ -5807,17 +5805,11 @@ void Node::Validator::Initialize()
 	p.get_DB().ParamGet(NodeDB::ParamID::PbftStamp, nullptr, nullptr, &buf);
 	if (!buf.empty())
 	{
-		Block::Pbft::State state;
-
 		Deserializer der;
 		der.reset(buf);
-		der & state;
-
-		auto n = der.bytes_left();
-		der & m_Stamp.m_ID;
-
-		buf.resize(buf.size() - n);
-		m_Stamp.m_vSer = std::move(buf);
+		der
+			& m_Stamp.m_ID
+			& m_Stamp.m_Msg;
 	}
 	else
 		ZeroObject(m_Stamp.m_ID);
@@ -6265,15 +6257,11 @@ void Node::Validator::TestBlock(const Block::SystemState::Full& s, const HeightH
 
 		if (d.m_Flags1 != nFlags)
 			Exc::Fail("flags mismatch");
+
+		// save the 
 	}
 	else
 	{
-		Merkle::Hash hv;
-		m_ValidatorSet.get_Hash(hv);
-
-		if (hv != Cast::Reinterpret<Block::Pbft::HdrData>(s.m_PoW).m_hvVsNext)
-			Exc::Fail("vs.next");
-
 		// make sure all fees were added as a block reward
 		struct Walker
 			:public TxKernel::IWalker
@@ -7075,23 +7063,25 @@ void Node::Validator::CheckState(uint32_t iR)
 
 	if (r.m_Pbft.m_Whitelist.m_NumRequired)
 	{
-		Serializer ser;
-
-		// serialize it in a form compatible with basic set
-		ser & m_ValidatorSet.m_mapValidators.size();
-		for (const auto& v : m_ValidatorSet.m_mapValidators)
+		Height h = s.get_Height();
+		if (h > m_Stamp.m_ID.m_Height)
 		{
-			ser
-				& v.m_Key
-				& v.m_Weight;
-		}
+			m_ValidatorSet.get_Hash(m_Stamp.m_Msg.m_hvVsNext);
 
-		ser.swap_buf(m_Stamp.m_vSer);
+			// export our validator set it in a form compatible with basic set
+			m_Stamp.m_Msg.m_ValidatorSet.m_map.clear();
+			for (const auto& vp : m_ValidatorSet.m_mapValidators)
+			{
+				auto w = vp.get_EffectiveWeight();
+				if (w)
+					m_Stamp.m_Msg.m_ValidatorSet.m_map[vp.m_Key] = w;
+			}
 
-		m_Stamp.m_ID.m_Height = s.get_Height();
-		m_Stamp.m_ID.m_Hash = id.m_Hash;
+			m_Stamp.m_ID.m_Height = h;
+			m_Stamp.m_ID.m_Hash = id.m_Hash;
 
-		SaveStamp();
+			SaveStamp();
+		}
 	}
 
 	auto& p = get_ParentObj().m_Processor;
@@ -7271,19 +7261,13 @@ bool Node::Validator::SelectMultisigValidators(Bitmask<Block::Pbft::s_MaxValidat
 
 void Node::Validator::SaveStamp()
 {
-	auto n = m_Stamp.m_vSer.size();
+	Serializer ser;
+	ser
+		& m_Stamp.m_ID
+		& m_Stamp.m_Msg;
 
-	{
-		Serializer ser;
-		ser.swap_buf(m_Stamp.m_vSer);
-		ser & m_Stamp.m_ID;
-		ser.swap_buf(m_Stamp.m_vSer);
-	}
-
-	Blob blob(m_Stamp.m_vSer);
+	Blob blob(ser.buffer().first, (uint32_t) ser.buffer().second);
 	get_ParentObj().m_Processor.get_DB().ParamSet(NodeDB::ParamID::PbftStamp, nullptr, &blob);
-
-	m_Stamp.m_vSer.resize(n);
 }
 
 bool Node::Validator::ShouldSendStamp()

node/node.h

@@ -832,7 +832,7 @@ struct Node
 		struct Stamp
 		{
 			HeightHash m_ID;
-			ByteBuffer  m_vSer;
+			proto::PbftStamp m_Msg;
 		} m_Stamp;
 
 		std::optional<ContractID> m_cid;

node/processor.cpp

@@ -3036,6 +3036,7 @@ bool NodeProcessor::HandleBlockInternal(const HeightHash& id, const Block::Syste
 
 	const auto& r = Rules::get();
 	IPbftHandler* pPbft = nullptr;
+	Merkle::Hash hvVs;
 
 	Deserializer der;
 	der.reset(bufs.m_Perishable);
@@ -3057,6 +3058,8 @@ bool NodeProcessor::HandleBlockInternal(const HeightHash& id, const Block::Syste
 
 			if (bFirstTime)
 				pPbft->TestBlock(s, id, block, true, bTestOnly);
+
+			pPbft->get_Validators().get_Hash(hvVs);
 		}
 	}
 	catch (const std::exception& e) {
@@ -3206,6 +3209,13 @@ bool NodeProcessor::HandleBlockInternal(const HeightHash& id, const Block::Syste
 		if (bOk && pPbft)
 			try
 			{
+				Merkle::Hash hvVsNext;
+				pPbft->get_Validators().get_Hash(hvVsNext);
+				Merkle::Interpret(hvVs, hvVsNext, true);
+
+				if (hvVs != Cast::Reinterpret<Block::Pbft::HdrData>(s.m_PoW).m_hvVsBoth)
+					Exc::Fail("vs.both");
+
 				pPbft->TestBlock(s, id, block, false, bTestOnly);
 			}
 			catch (const std::exception& e) {
@@ -7539,6 +7549,9 @@ bool NodeProcessor::GenerateNewBlock(BlockContext& bc)
 		pPbft = get_PbftHandler();
 		if (!pPbft)
 			return false;
+
+		auto& d = Cast::Reinterpret<Block::Pbft::HdrData>(bc.m_Hdr.m_PoW);
+		pPbft->get_Validators().get_Hash(d.m_hvVsBoth);
 	}
 
 	bool bOk = HandleValidatedTx(bc.m_Block, bic);
@@ -7555,8 +7568,11 @@ bool NodeProcessor::GenerateNewBlock(BlockContext& bc)
 
 	if (Rules::Consensus::Pbft == r.m_Consensus)
 	{
+		Merkle::Hash hvVsNext;
+		pPbft->get_Validators().get_Hash(hvVsNext);
+
 		auto& d = Cast::Reinterpret<Block::Pbft::HdrData>(bc.m_Hdr.m_PoW);
-		pPbft->get_Validators().get_Hash(d.m_hvVsNext);
+		Merkle::Interpret(d.m_hvVsBoth, hvVsNext, true);
 
 		// Assume d.m_Time_ms and the hdr timestamp are already assigned by the caller
 

node/processor.h

@@ -591,7 +591,7 @@ class NodeProcessor
 	// PBFT-specific
 	struct IPbftHandler
 	{
-		virtual const Block::Pbft::State::IValidatorSet& get_Validators() = 0;
+		virtual const Block::Pbft::IValidatorSet& get_Validators() = 0;
 		virtual void OnContractVarChange(const Blob& key, const Blob& val, bool bTemporary) = 0;
 		virtual void OnContractStoreReset() = 0;
 		virtual bool OnContractInvoke(const ContractID&, uint32_t iMethod, const Blob& args, bool bTemporary) = 0;