More transaction metadata work.

This commit is contained in:
JoelKatz
2012-07-23 23:11:03 -07:00
parent 2ba8527f07
commit 478d567531
2 changed files with 88 additions and 5 deletions

View File

@@ -1,5 +1,8 @@
#include "TransactionMeta.h"
#include <boost/make_shared.hpp>
#include <boost/bind.hpp>
bool TransactionMetaNodeEntry::operator<(const TransactionMetaNodeEntry& e) const
{
if (mType < e.mType) return true;
@@ -28,6 +31,23 @@ bool TransactionMetaNodeEntry::operator>=(const TransactionMetaNodeEntry& e) con
return compare(e) >= 0;
}
TMNEBalance::TMNEBalance(SerializerIterator& sit) : TransactionMetaNodeEntry(TMNChangedBalance)
{
mFlags = sit.get32();
mFirstAmount = * dynamic_cast<STAmount*>(STAmount::deserialize(sit, "FirstAmount").get());
if ((mFlags & TMBTwoAmounts) != 0)
mSecondAmount = * dynamic_cast<STAmount*>(STAmount::deserialize(sit, "SecondAmount").get());
}
void TMNEBalance::addRaw(Serializer& sit) const
{
sit.add8(mType);
sit.add32(mFlags);
mFirstAmount.add(sit);
if ((mFlags & TMBTwoAmounts) != 0)
mSecondAmount.add(sit);
}
void TMNEBalance::adjustFirstAmount(const STAmount& a)
{
mFirstAmount += a;
@@ -68,3 +88,55 @@ Json::Value TMNEBalance::getJson(int p) const
return ret;
}
TransactionMetaNode::TransactionMetaNode(const uint256& node, SerializerIterator& sit) : mNode(node)
{
mNode = sit.get256();
mPreviousTransaction = sit.get256();
mPreviousLedger = sit.get32();
int type;
do
{
type = sit.get8();
if (type == TransactionMetaNodeEntry::TMNChangedBalance)
mEntries.push_back(boost::shared_ptr<TransactionMetaNodeEntry>(new TMNEBalance(sit)));
else if (type != TransactionMetaNodeEntry::TMNEndOfMetadata)
throw std::runtime_error("Unparseable metadata");
} while (type != TransactionMetaNodeEntry::TMNEndOfMetadata);
}
void TransactionMetaNode::addRaw(Serializer& s) const
{
s.add256(mNode);
s.add256(mPreviousTransaction);
s.add32(mPreviousLedger);
for (std::list<TransactionMetaNodeEntry::pointer>::const_iterator it = mEntries.begin(), end = mEntries.end();
it != end; ++it)
(*it)->addRaw(s);
s.add8(TransactionMetaNodeEntry::TMNEndOfMetadata);
}
TransactionMetaSet::TransactionMetaSet(uint32 ledger, const std::vector<unsigned char>& vec) : mLedger(ledger)
{
Serializer s(vec);
SerializerIterator sit(s);
mTransactionID = sit.get256();
do
{
uint256 node = sit.get256();
if (node.isZero())
break;
mNodes.insert(TransactionMetaNode(node, sit));
} while(1);
}
void TransactionMetaSet::addRaw(Serializer& s) const
{
s.add256(mTransactionID);
for (std::set<TransactionMetaNode>::const_iterator it = mNodes.begin(), end = mNodes.end();
it != end; ++it)
it->addRaw(s);
s.add256(uint256());
}