ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jed
2012-09-07 14:23:32 -07:00
parent 8ffb303ab7 ae50e04ad5
commit dcfe92a84b
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/LedgerFormats.cpp
View File

@@ -10,8 +10,6 @@ LedgerEntryFormat LedgerFormats[]=
{ S_FIELD(Account), STI_ACCOUNT, SOE_REQUIRED, 0 },
{ S_FIELD(Sequence), STI_UINT32, SOE_REQUIRED, 0 },
{ S_FIELD(Balance), STI_AMOUNT, SOE_REQUIRED, 0 },
{ S_FIELD(LastReceive), STI_UINT32, SOE_REQUIRED, 0 },
{ S_FIELD(LastSignedSeq), STI_UINT32, SOE_REQUIRED, 0 },
{ S_FIELD(LastTxnID), STI_HASH256, SOE_REQUIRED, 0 },
{ S_FIELD(LastTxnSeq), STI_UINT32, SOE_REQUIRED, 0 },
{ S_FIELD(AuthorizedKey), STI_ACCOUNT, SOE_IFFLAG, 1 },

2
src/SerializedObject.h
View File

@@ -68,8 +68,6 @@ enum SOE_Field
sfInvoiceID,
sfIssuer,
sfLastNode,
sfLastReceive,
sfLastSignedSeq,
sfLastTxnID,
sfLastTxnSeq,
sfLedgerHash,

9
src/TransactionEngine.cpp
View File

@@ -1,7 +1,5 @@
//
// XXX Should make sure all fields and are recognized on a transactions.
// XXX Make sure fee is claimed for failed transactions.
// XXX Might uses an unordered set for vector.
//
#include "TransactionEngine.h"
@@ -1276,7 +1274,6 @@ TER TransactionEngine::applyTransaction(const SerializedTransaction& txn,
if (tesSUCCESS == terResult)
{
mTxnAccount->setIFieldU32(sfLastSignedSeq, mLedger->getLedgerSeq());
entryModify(mTxnAccount);
switch (txn.getTxnType())
@@ -2572,15 +2569,15 @@ TER TransactionEngine::calcNodeAccountRev(const unsigned int uIndex, const PathS
const uint32 uQualityOut = uIndex != uLast ? rippleQualityOut(uCurAccountID, uNxtAccountID, uCurrencyID) : QUALITY_ONE;
// For bPrvAccount
const STAmount saPrvOwed = uIndex && bPrvAccount // Previous account is owed.
const STAmount saPrvOwed = bPrvAccount && uIndex // Previous account is owed.
? rippleOwed(uCurAccountID, uPrvAccountID, uCurrencyID)
: STAmount(uCurrencyID, uCurAccountID);
const STAmount saPrvLimit = uIndex && bPrvAccount // Previous account may owe.
const STAmount saPrvLimit = bPrvAccount && uIndex // Previous account may owe.
? rippleLimit(uCurAccountID, uPrvAccountID, uCurrencyID)
: STAmount(uCurrencyID, uCurAccountID);
const STAmount saNxtOwed = uIndex != uLast && bNxtAccount // Next account is owed.
const STAmount saNxtOwed = bNxtAccount && uIndex != uLast // Next account is owed.
? rippleOwed(uCurAccountID, uNxtAccountID, uCurrencyID)
: STAmount(uCurrencyID, uCurAccountID);