Merge branch 'master' of github.com:jedmccaleb/NewCoin

Conflicts:
	src/LedgerEntrySet.h
This commit is contained in:
Arthur Britto
2012-07-26 12:51:59 -07:00
8 changed files with 182 additions and 106 deletions

View File

@@ -21,6 +21,7 @@ public:
static const int TMNEndOfMetadata = 0;
static const int TMNChangedBalance = 1;
static const int TMNDeleteUnfunded = 2;
int mType;
TransactionMetaNodeEntry(int type) : mType(type) { ; }
@@ -68,6 +69,15 @@ public:
virtual int compare(const TransactionMetaNodeEntry&) const;
};
class TMNEUnfunded : public TransactionMetaNodeEntry
{ // node was deleted because it was unfunded
public:
TMNEUnfunded() : TransactionMetaNodeEntry(TMNDeleteUnfunded) { ; }
virtual void addRaw(Serializer&) const;
virtual Json::Value getJson(int) const;
virtual int compare(const TransactionMetaNodeEntry&) const;
};
class TransactionMetaNode
{ // a node that has been affected by a transaction
public:
@@ -117,10 +127,10 @@ public:
void addRaw(Serializer&) const;
void threadNode(const uint256& node, const uint256& previousTransaction, uint32 previousLedger);
bool signedBy(const uint256& node);
bool signedBy(const uint256& node, const STAmount& fee);
bool deleteUnfunded(const uint256& node);
bool adjustBalance(const uint256& node, unsigned flags, const STAmount &amount);
bool adjustBalances(const uint256& node, unsigned flags, const STAmount &firstAmt, const STAmount &secondAmt);
};
#endif