mirror of
https://github.com/XRPLF/rippled.git
synced 2025-12-06 17:27:55 +00:00
This should complete the code to build the transaction meta data based on
the ledger entry set.
This commit is contained in:
@@ -311,46 +311,88 @@ void LedgerEntrySet::calcRawMeta(Serializer& s, Ledger::pointer& origLedger)
|
||||
case taaMODIFY:
|
||||
nType = TMNModifiedNode;
|
||||
break;
|
||||
|
||||
case taaDELETE:
|
||||
nType = TMNDeletedNode;
|
||||
break;
|
||||
|
||||
case taaCREATE:
|
||||
nType = TMNCreatedNode;
|
||||
break;
|
||||
|
||||
default:
|
||||
// ignore these
|
||||
break;
|
||||
}
|
||||
if (nType != TMNEndOfMetadata)
|
||||
|
||||
if (nType == TMNEndOfMetadata)
|
||||
continue;
|
||||
|
||||
SLE::pointer origNode = origLedger->getSLE(it->first);
|
||||
SLE::pointer curNode = it->second.mEntry;
|
||||
TransactionMetaNode &metaNode = mSet.getAffectedNode(it->first, nType);
|
||||
|
||||
if (nType == TMNDeletedNode)
|
||||
{
|
||||
SLE::pointer origNode = origLedger->getSLE(it->first);
|
||||
SLE::pointer curNode = it->second.mEntry;
|
||||
TransactionMetaNode &metaNode = mSet.getAffectedNode(it->first, nType);
|
||||
threadOwners(metaNode, origNode, origLedger, newMod);
|
||||
|
||||
if (nType == TMNDeletedNode)
|
||||
{
|
||||
threadOwners(metaNode, origNode, origLedger, newMod);
|
||||
if (origNode->getIFieldPresent(sfAmount))
|
||||
{ // node has an amount, covers ripple state nodes
|
||||
STAmount amount = origNode->getIValueFieldAmount(sfAmount);
|
||||
if (amount.isNonZero())
|
||||
metaNode.addAmount(TMSPrevBalance, amount);
|
||||
amount = curNode->getIValueFieldAmount(sfAmount);
|
||||
if (amount.isNonZero())
|
||||
metaNode.addAmount(TMSFinalBalance, amount);
|
||||
|
||||
if (origNode->getType() == ltOFFER)
|
||||
{ // check for non-zero balances
|
||||
// WRITEME
|
||||
}
|
||||
}
|
||||
|
||||
if ((nType == TMNCreatedNode) || (nType == TMNModifiedNode))
|
||||
{
|
||||
if (nType == TMNCreatedNode) // if created, thread to owner(s)
|
||||
threadOwners(metaNode, curNode, origLedger, newMod);
|
||||
|
||||
if (curNode->isThreadedType()) // always thread to self
|
||||
threadTx(metaNode, curNode, origLedger, newMod);
|
||||
|
||||
if (nType == TMNModifiedNode)
|
||||
if (origNode->getType() == ltRIPPLE_STATE)
|
||||
{
|
||||
// analyze changes WRITEME
|
||||
metaNode.addAccount(TMSLowID, origNode->getIValueFieldAccount(sfLowID));
|
||||
metaNode.addAccount(TMSHighID, origNode->getIValueFieldAccount(sfHighID));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (origNode->getType() == ltOFFER)
|
||||
{ // check for non-zero balances
|
||||
STAmount amount = origNode->getIValueFieldAmount(sfTakerPays);
|
||||
if (amount.isNonZero())
|
||||
metaNode.addAmount(TMSFinalTakerPays, amount);
|
||||
amount = origNode->getIValueFieldAmount(sfTakerGets);
|
||||
if (amount.isNonZero())
|
||||
metaNode.addAmount(TMSFinalTakerGets, amount);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (nType == TMNCreatedNode) // if created, thread to owner(s)
|
||||
threadOwners(metaNode, curNode, origLedger, newMod);
|
||||
|
||||
if ((nType == TMNCreatedNode) || (nType == TMNModifiedNode))
|
||||
{
|
||||
if (curNode->isThreadedType()) // always thread to self
|
||||
threadTx(metaNode, curNode, origLedger, newMod);
|
||||
}
|
||||
|
||||
if (nType == TMNModifiedNode)
|
||||
{
|
||||
if (origNode->getIFieldPresent(sfAmount))
|
||||
{ // node has an amount, covers account root nodes and ripple nodes
|
||||
STAmount amount = origNode->getIValueFieldAmount(sfAmount);
|
||||
if (amount != curNode->getIValueFieldAmount(sfAmount))
|
||||
metaNode.addAmount(TMSPrevBalance, amount);
|
||||
}
|
||||
|
||||
if (origNode->getType() == ltOFFER)
|
||||
{
|
||||
STAmount amount = origNode->getIValueFieldAmount(sfTakerPays);
|
||||
if (amount != curNode->getIValueFieldAmount(sfTakerPays))
|
||||
metaNode.addAmount(TMSPrevTakerPays, amount);
|
||||
amount = origNode->getIValueFieldAmount(sfTakerGets);
|
||||
if (amount != curNode->getIValueFieldAmount(sfTakerGets))
|
||||
metaNode.addAmount(TMSPrevTakerGets, amount);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -65,13 +65,13 @@ Json::Value TMNEThread::getJson(int) const
|
||||
|
||||
TMNEAmount::TMNEAmount(int type, SerializerIterator& sit) : TransactionMetaNodeEntry(type)
|
||||
{
|
||||
mPrevAmount = *dynamic_cast<STAmount*>(STAmount::deserialize(sit, NULL).get()); // Ouch
|
||||
mAmount = *dynamic_cast<STAmount*>(STAmount::deserialize(sit, NULL).get()); // Ouch
|
||||
}
|
||||
|
||||
void TMNEAmount::addRaw(Serializer& s) const
|
||||
{
|
||||
s.add8(mType);
|
||||
mPrevAmount.add(s);
|
||||
mAmount.add(s);
|
||||
}
|
||||
|
||||
Json::Value TMNEAmount::getJson(int v) const
|
||||
@@ -79,11 +79,12 @@ Json::Value TMNEAmount::getJson(int v) const
|
||||
Json::Value outer(Json::objectValue);
|
||||
switch (mType)
|
||||
{
|
||||
case TMSPrevBalance: outer["prev_balance"] = mPrevAmount.getJson(v); break;
|
||||
case TMSPrevTakerPays: outer["prev_taker_pays"] = mPrevAmount.getJson(v); break;
|
||||
case TMSPrevTakerGets: outer["prev_taker_gets"] = mPrevAmount.getJson(v); break;
|
||||
case TMSFinalTakerPays: outer["final_taker_pays"] = mPrevAmount.getJson(v); break;
|
||||
case TMSFinalTakerGets: outer["final_taker_gets"] = mPrevAmount.getJson(v); break;
|
||||
case TMSPrevBalance: outer["prev_balance"] = mAmount.getJson(v); break;
|
||||
case TMSFinalBalance: outer["final_balance"] = mAmount.getJson(v); break;
|
||||
case TMSPrevTakerPays: outer["prev_taker_pays"] = mAmount.getJson(v); break;
|
||||
case TMSPrevTakerGets: outer["prev_taker_gets"] = mAmount.getJson(v); break;
|
||||
case TMSFinalTakerPays: outer["final_taker_pays"] = mAmount.getJson(v); break;
|
||||
case TMSFinalTakerGets: outer["final_taker_gets"] = mAmount.getJson(v); break;
|
||||
default: assert(false);
|
||||
}
|
||||
return outer;
|
||||
@@ -96,19 +97,28 @@ int TMNEAmount::compare(const TransactionMetaNodeEntry& e) const
|
||||
}
|
||||
|
||||
TMNEAccount::TMNEAccount(int type, SerializerIterator& sit)
|
||||
: TransactionMetaNodeEntry(type), mPrevAccount(sit.get256())
|
||||
: TransactionMetaNodeEntry(type), mAccount(STAccount(sit.getVL()).getValueNCA())
|
||||
{ ; }
|
||||
|
||||
void TMNEAccount::addRaw(Serializer& sit) const
|
||||
{
|
||||
sit.add8(mType);
|
||||
sit.add256(mPrevAccount);
|
||||
|
||||
STAccount sta;
|
||||
sta.setValueNCA(mAccount);
|
||||
sta.add(sit);
|
||||
}
|
||||
|
||||
Json::Value TMNEAccount::getJson(int) const
|
||||
{
|
||||
Json::Value outer(Json::objectValue);
|
||||
outer["prev_account"] = mPrevAccount.GetHex();
|
||||
switch (mType)
|
||||
{
|
||||
case TMSPrevAccount: outer["prev_account"] = mAccount.humanAccountID(); break;
|
||||
case TMSLowID: outer["lowID"] = mAccount.humanAccountID(); break;
|
||||
case TMSHighID: outer["highID"] = mAccount.humanAccountID(); break;
|
||||
default: assert(false);
|
||||
}
|
||||
return outer;
|
||||
}
|
||||
|
||||
@@ -149,6 +159,11 @@ TransactionMetaNode::TransactionMetaNode(int type, const uint256& node, Serializ
|
||||
|
||||
void TransactionMetaNode::addRaw(Serializer& s)
|
||||
{
|
||||
if (mEntries.empty())
|
||||
{ // ack, an empty node
|
||||
assert(false);
|
||||
return;
|
||||
}
|
||||
s.add8(mType);
|
||||
s.add256(mNode);
|
||||
mEntries.sort();
|
||||
@@ -193,6 +208,34 @@ bool TransactionMetaNode::thread(const uint256& prevTx, uint32 prevLgr)
|
||||
return true;
|
||||
}
|
||||
|
||||
bool TransactionMetaNode::addAmount(int nodeType, const STAmount& amount)
|
||||
{
|
||||
for (boost::ptr_vector<TransactionMetaNodeEntry>::iterator it = mEntries.begin(), end = mEntries.end();
|
||||
it != end; ++it)
|
||||
if (it->getType() == nodeType)
|
||||
{
|
||||
TMNEAmount* a = dynamic_cast<TMNEAmount *>(&*it);
|
||||
assert(a && (a->getAmount() == amount));
|
||||
return false;
|
||||
}
|
||||
addNode(new TMNEAmount(nodeType, amount));
|
||||
return true;
|
||||
}
|
||||
|
||||
bool TransactionMetaNode::addAccount(int nodeType, const NewcoinAddress& account)
|
||||
{
|
||||
for (boost::ptr_vector<TransactionMetaNodeEntry>::iterator it = mEntries.begin(), end = mEntries.end();
|
||||
it != end; ++it)
|
||||
if (it->getType() == nodeType)
|
||||
{
|
||||
TMNEAccount* a = dynamic_cast<TMNEAccount *>(&*it);
|
||||
assert(a && (a->getAccount() == account));
|
||||
return false;
|
||||
}
|
||||
addNode(new TMNEAccount(nodeType, account));
|
||||
return true;
|
||||
}
|
||||
|
||||
Json::Value TransactionMetaNode::getJson(int v) const
|
||||
{
|
||||
Json::Value ret = Json::objectValue;
|
||||
|
||||
@@ -24,13 +24,16 @@ static const int TMSThread = 0x01; // Holds previous TxID and LgrSeq for thre
|
||||
|
||||
// sub record types - containing an amount
|
||||
static const int TMSPrevBalance = 0x11; // Balances prior to the transaction
|
||||
static const int TMSPrevTakerPays = 0x12;
|
||||
static const int TMSPrevTakerGets = 0x13;
|
||||
static const int TMSFinalTakerPays = 0x14; // Balances at node deletion time
|
||||
static const int TMSFinalTakerGets = 0x15;
|
||||
static const int TMSFinalBalance = 0x12; // deleted with non-zero balance
|
||||
static const int TMSPrevTakerPays = 0x13;
|
||||
static const int TMSPrevTakerGets = 0x14;
|
||||
static const int TMSFinalTakerPays = 0x15; // Balances at node deletion time
|
||||
static const int TMSFinalTakerGets = 0x16;
|
||||
|
||||
// sub record types - containing an account (for example, for when a nickname is transferred)
|
||||
static const int TMSPrevAccount = 0x20;
|
||||
static const int TMSPrevAccount = 0x20;
|
||||
static const int TMSLowID = 0x21;
|
||||
static const int TMSHighID = 0x22;
|
||||
|
||||
|
||||
class TransactionMetaNodeEntry
|
||||
@@ -85,16 +88,17 @@ protected:
|
||||
class TMNEAmount : public TransactionMetaNodeEntry
|
||||
{ // a transaction affected the balance of a node
|
||||
protected:
|
||||
STAmount mPrevAmount;
|
||||
STAmount mAmount;
|
||||
|
||||
public:
|
||||
TMNEAmount(int type) : TransactionMetaNodeEntry(type) { ; }
|
||||
TMNEAmount(int type, const STAmount &a) : TransactionMetaNodeEntry(type), mAmount(a) { ; }
|
||||
|
||||
TMNEAmount(int type, SerializerIterator&);
|
||||
virtual void addRaw(Serializer&) const;
|
||||
|
||||
const STAmount& getAmount() const { return mPrevAmount; }
|
||||
void setAmount(const STAmount& a) { mPrevAmount = a; }
|
||||
const STAmount& getAmount() const { return mAmount; }
|
||||
void setAmount(const STAmount& a) { mAmount = a; }
|
||||
|
||||
virtual Json::Value getJson(int) const;
|
||||
|
||||
@@ -106,14 +110,17 @@ protected:
|
||||
class TMNEAccount : public TransactionMetaNodeEntry
|
||||
{ // node was deleted because it was unfunded
|
||||
protected:
|
||||
uint256 mPrevAccount;
|
||||
NewcoinAddress mAccount;
|
||||
|
||||
public:
|
||||
TMNEAccount(int type, uint256 prev) : TransactionMetaNodeEntry(type), mPrevAccount(prev) { ; }
|
||||
TMNEAccount(int type, const NewcoinAddress& acct) : TransactionMetaNodeEntry(type), mAccount(acct) { ; }
|
||||
TMNEAccount(int type, SerializerIterator&);
|
||||
virtual void addRaw(Serializer&) const;
|
||||
virtual Json::Value getJson(int) const;
|
||||
|
||||
const NewcoinAddress& getAccount() const { return mAccount; }
|
||||
void setAccount(const NewcoinAddress& a) { mAccount = a; }
|
||||
|
||||
protected:
|
||||
virtual TransactionMetaNodeEntry* duplicate(void) const { return new TMNEAccount(*this); }
|
||||
virtual int compare(const TransactionMetaNodeEntry&) const;
|
||||
@@ -152,6 +159,8 @@ public:
|
||||
void addRaw(Serializer&);
|
||||
Json::Value getJson(int) const;
|
||||
|
||||
bool addAmount(int nodeType, const STAmount& amount);
|
||||
bool addAccount(int nodeType, const NewcoinAddress& account);
|
||||
TMNEAmount* findAmount(int nodeType);
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user