diff --git a/src/LedgerFormats.cpp b/src/LedgerFormats.cpp index 79744a79e9..ef991c9f62 100644 --- a/src/LedgerFormats.cpp +++ b/src/LedgerFormats.cpp @@ -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 }, diff --git a/src/SerializedObject.h b/src/SerializedObject.h index 3e36c07c9f..c8245d6d9d 100644 --- a/src/SerializedObject.h +++ b/src/SerializedObject.h @@ -68,8 +68,6 @@ enum SOE_Field sfInvoiceID, sfIssuer, sfLastNode, - sfLastReceive, - sfLastSignedSeq, sfLastTxnID, sfLastTxnSeq, sfLedgerHash, diff --git a/src/TransactionEngine.cpp b/src/TransactionEngine.cpp index 455e618f8d..2b690bb422 100644 --- a/src/TransactionEngine.cpp +++ b/src/TransactionEngine.cpp @@ -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);