diff --git a/src/AccountState.cpp b/src/AccountState.cpp index ab8fcac229..b48bcbd131 100644 --- a/src/AccountState.cpp +++ b/src/AccountState.cpp @@ -16,11 +16,12 @@ AccountState::AccountState(const NewcoinAddress& naAccountID) : mAccountID(naAcc mLedgerEntry = boost::make_shared(ltACCOUNT_ROOT); mLedgerEntry->setIndex(Ledger::getAccountRootIndex(naAccountID)); + mLedgerEntry->setIFieldAccount(sfAccount, naAccountID.getAccountID()); mValid = true; } -AccountState::AccountState(const SerializedLedgerEntry::pointer& ledgerEntry,const NewcoinAddress& naAccountID) : +AccountState::AccountState(const SerializedLedgerEntry::pointer& ledgerEntry, const NewcoinAddress& naAccountID) : mAccountID(naAccountID), mLedgerEntry(ledgerEntry), mValid(false) { if (!mLedgerEntry) @@ -46,8 +47,6 @@ void AccountState::addJson(Json::Value& val) if (mValid) { - val["Account"] = mAccountID.humanAccountID(); - if (mLedgerEntry->getIFieldPresent(sfEmailHash)) val["UrlGravatar"] = createGravatarUrl(mLedgerEntry->getIFieldH128(sfEmailHash)); } diff --git a/src/LedgerFormats.cpp b/src/LedgerFormats.cpp index c7383016b2..a0f0271d78 100644 --- a/src/LedgerFormats.cpp +++ b/src/LedgerFormats.cpp @@ -7,6 +7,7 @@ LedgerEntryFormat LedgerFormats[]= { { "AccountRoot", ltACCOUNT_ROOT, { { S_FIELD(Flags), STI_UINT32, SOE_FLAGS, 0 }, + { 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 }, diff --git a/src/TransactionEngine.cpp b/src/TransactionEngine.cpp index 579fa47b53..31816e1174 100644 --- a/src/TransactionEngine.cpp +++ b/src/TransactionEngine.cpp @@ -3635,6 +3635,7 @@ TransactionEngineResult TransactionEngine::doPayment(const SerializedTransaction // Create the account. sleDst = entryCreate(ltACCOUNT_ROOT, Ledger::getAccountRootIndex(uDstAccountID)); + sleDst->setIFieldAccount(sfAccount, uDstAccountID); sleDst->setIFieldU32(sfSequence, 1); } else @@ -3929,6 +3930,7 @@ TransactionEngineResult TransactionEngine::doWalletAdd(const SerializedTransacti // Create the account. sleDst = entryCreate(ltACCOUNT_ROOT, Ledger::getAccountRootIndex(uDstAccountID)); + sleDst->setIFieldAccount(sfAccount, uDstAccountID); sleDst->setIFieldU32(sfSequence, 1); sleDst->setIFieldAmount(sfBalance, saAmount); sleDst->setIFieldAccount(sfAuthorizedKey, uAuthKeyID);