misc

Author: valdok

core/treasury.cpp

@@ -461,15 +461,21 @@ namespace beam
 
 			ret.emplace_back();
 			Burst& b = ret.back();
+			b.m_Aid = g.m_Aid;
 
 			b.m_Value = AmountBig::get_Hi(g.m_Value) ?
 				Amount(-1) :
 				AmountBig::get_Lo(g.m_Value);
 
-			b.m_Height = MaxHeight;
+			if (g.m_Data.m_vOutputs.empty())
+				b.m_Height = 0; // allocated for the contract
+			else
+			{
+				b.m_Height = MaxHeight;
 
-			for (size_t i = 0; i < g.m_Data.m_vOutputs.size(); i++)
-				std::setmin(b.m_Height, g.m_Data.m_vOutputs[i]->m_Incubation);
+				for (size_t i = 0; i < g.m_Data.m_vOutputs.size(); i++)
+					std::setmin(b.m_Height, g.m_Data.m_vOutputs[i]->m_Incubation);
+			}
 		}
 
 		return ret;

core/treasury.h

@@ -199,6 +199,7 @@ namespace beam
 			{
 				Height m_Height;
 				Amount m_Value; // rounded to max value in case of overflow
+				Asset::ID m_Aid;
 			};
 
 			std::vector<Burst> get_Bursts() const;

node/processor.cpp

@@ -2837,7 +2837,7 @@ bool NodeProcessor::HandleTreasury(const Blob& blob)
 		for (size_t i = 0; i < vBursts.size(); i++)
 		{
 			const Treasury::Data::Burst& b = vBursts[i];
-			os << "\n\t" << "Height=" << b.m_Height << ", Value=" << AmountBig::Printable(b.m_Value);
+			os << "\n\t" << "Height=" << b.m_Height << ", Aid=" << b.m_Aid << ", Value=" << AmountBig::Printable(b.m_Value);
 		}
 
 		BEAM_LOG_INFO() << os.str();