ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove FirstLedgerSequence and mark it deprecated

Browse Source
This commit is contained in:
JoelKatz
2012-12-28 19:46:01 -08:00
parent 76213bc985
commit 3c9be6f549
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/cpp/ripple/Ledger.cpp
View File

@@ -647,6 +647,14 @@ Json::Value Ledger::getJson(int options)
} }
ledger["accountState"] = state; ledger["accountState"] = state;
} }
if (mAccountStateMap && ((options & LEDGER_JSON_HISTORY) != 0))
{
SLE::pointer hashIndex = getSLE(getLedgerHashIndex());
if (hashIndex)
ledger["previousHashes"] = hashIndex->getJson(0);
else
ledger["previousHashes"] = "missing";
}
ledger["seqNum"] = boost::lexical_cast<std::string>(mLedgerSeq); ledger["seqNum"] = boost::lexical_cast<std::string>(mLedgerSeq);
return ledger; return ledger;
} }
@@ -1112,7 +1120,6 @@ void Ledger::updateSkipList()
if (!skipList) if (!skipList)
{ {
skipList = boost::make_shared<SLE>(ltLEDGER_HASHES, hash); skipList = boost::make_shared<SLE>(ltLEDGER_HASHES, hash);
skipList->setFieldU32(sfFirstLedgerSequence, prevIndex);
} }
else else
hashes = skipList->getFieldV256(sfHashes).peekValue(); hashes = skipList->getFieldV256(sfHashes).peekValue();
@@ -1135,7 +1142,6 @@ void Ledger::updateSkipList()
if (!skipList) if (!skipList)
{ {
skipList = boost::make_shared<SLE>(ltLEDGER_HASHES, hash); skipList = boost::make_shared<SLE>(ltLEDGER_HASHES, hash);
skipList->setFieldU32(sfFirstLedgerSequence, prevIndex);
} }
else else
hashes = skipList->getFieldV256(sfHashes).peekValue(); hashes = skipList->getFieldV256(sfHashes).peekValue();

2
src/cpp/ripple/LedgerFormats.cpp
View File

@@ -96,7 +96,7 @@ static bool LEFInit()
; ;
DECLARE_LEF(LedgerHashes, ltLEDGER_HASHES) DECLARE_LEF(LedgerHashes, ltLEDGER_HASHES)
<< SOElement(sfFirstLedgerSequence, SOE_OPTIONAL) << SOElement(sfFirstLedgerSequence, SOE_OPTIONAL) // Remove if we do a ledger restart
<< SOElement(sfLastLedgerSequence, SOE_OPTIONAL) << SOElement(sfLastLedgerSequence, SOE_OPTIONAL)
<< SOElement(sfHashes, SOE_REQUIRED) << SOElement(sfHashes, SOE_REQUIRED)
; ;

2
src/cpp/ripple/SerializeProto.h
View File

@@ -56,7 +56,7 @@
FIELD(BondAmount, UINT32, 23) FIELD(BondAmount, UINT32, 23)
FIELD(LoadFee, UINT32, 24) FIELD(LoadFee, UINT32, 24)
FIELD(OfferSequence, UINT32, 25) FIELD(OfferSequence, UINT32, 25)
FIELD(FirstLedgerSequence, UINT32, 26) FIELD(FirstLedgerSequence, UINT32, 26) // Deprecated: do not use
FIELD(LastLedgerSequence, UINT32, 27) FIELD(LastLedgerSequence, UINT32, 27)
FIELD(TransactionIndex, UINT32, 28) FIELD(TransactionIndex, UINT32, 28)
FIELD(OperationLimit, UINT32, 29) FIELD(OperationLimit, UINT32, 29)