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 into serialize

Browse Source 
Conflicts:
	src/LedgerFormats.cpp
	src/SerializedLedger.cpp
	src/Version.h

Merge with master
This commit is contained in:
JoelKatz
2012-09-28 19:22:30 -07:00
parent ebf3aeee64 40b5189209
commit cfa0f129d9
9 changed files with 85 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/SerializedLedger.cpp
View File

@@ -118,12 +118,12 @@ NewcoinAddress SerializedLedgerEntry::getOwner()
NewcoinAddress SerializedLedgerEntry::getFirstOwner()
{
return getValueFieldAccount(sfLowID);
return NewcoinAddress::createAccountID(getIValueFieldAmount(sfLowLimit).getIssuer());
}
NewcoinAddress SerializedLedgerEntry::getSecondOwner()
{
return getValueFieldAccount(sfHighID);
return NewcoinAddress::createAccountID(getIValueFieldAmount(sfHighLimit).getIssuer());
}
std::vector<uint256> SerializedLedgerEntry::getOwners()
@@ -134,12 +134,21 @@ std::vector<uint256> SerializedLedgerEntry::getOwners()
for (int i = 0, fields = getCount(); i < fields; ++i)
{
int fc = getFieldSType(i).fieldCode;
if ((fc == sfAccount.fieldCode) || (fc == sfLowID.fieldCode) || (fc == sfHighID.fieldCode))
if ((fc == sfAccount.fieldCode) || (fc == sfOwner.fieldCode))
{
const STAccount* entry = dynamic_cast<const STAccount *>(peekAtPIndex(i));
if ((entry != NULL) && entry->getValueH160(account))
owners.push_back(Ledger::getAccountRootIndex(account));
}
if ((fc == sfLowLimit.fieldCode) || (fs == sfHighLimit.fieldCode))
{
const STAmount* entry = dynamic_cast<const STAmount *>(peekAtPIndex(i));
if ((entry != NULL))
{
uint160 issuer = entry->getIssuer();
if (issuer.isNonZero())
owners.push_back(Ledger::getAccountRootIndex(issuer));
}
}
return owners;