mirror of
https://github.com/XRPLF/rippled.git
synced 2025-12-06 17:27:55 +00:00
Rework AccountState to fit new model.
This commit is contained in:
@@ -1,42 +1,32 @@
|
||||
|
||||
#include <boost/lexical_cast.hpp>
|
||||
|
||||
#include "AccountState.h"
|
||||
|
||||
#include <boost/lexical_cast.hpp>
|
||||
#include <boost/make_shared.hpp>
|
||||
|
||||
#include "Ledger.h"
|
||||
#include "Serializer.h"
|
||||
|
||||
AccountState::AccountState(const std::vector<unsigned char>& v)
|
||||
AccountState::AccountState(const NewcoinAddress& id) : mAccountID(id), mValid(false)
|
||||
{
|
||||
Serializer s(v);
|
||||
mValid=false;
|
||||
uint160 acct160 = mAccountID.getAccountID();
|
||||
|
||||
if(!s.get160(acct160, 0)) { assert(false); return; }
|
||||
if(!s.get64(mBalance, 20)) { assert(false); return; }
|
||||
if(!s.get32(mAccountSeq, 28)) { assert(false); return; }
|
||||
mValid=true;
|
||||
if (!id.IsValid()) return;
|
||||
mLedgerEntry = boost::make_shared<SerializedLedgerEntry>(ltACCOUNT_ROOT);
|
||||
mLedgerEntry->setIndex(Ledger::getAccountRootIndex(id));
|
||||
mLedgerEntry->setIFieldAccount(sfAccount, id);
|
||||
mValid = true;
|
||||
}
|
||||
|
||||
AccountState::AccountState(const NewcoinAddress& id) : mAccountID(id), mBalance(0), mAccountSeq(0), mValid(true)
|
||||
{ ; }
|
||||
|
||||
std::vector<unsigned char> AccountState::getRaw() const
|
||||
{ // 20-byte acct ID, 8-byte balance, 4-byte sequence
|
||||
Serializer s(32);
|
||||
s.add160(mAccountID.getAccountID());
|
||||
s.add64(mBalance);
|
||||
s.add32(mAccountSeq);
|
||||
return s.getData();
|
||||
AccountState::AccountState(SerializedLedgerEntry::pointer ledgerEntry) : mLedgerEntry(ledgerEntry), mValid(false)
|
||||
{
|
||||
if (!mLedgerEntry) return;
|
||||
if (mLedgerEntry->getType()!=ltACCOUNT_ROOT) return;
|
||||
mAccountID = mLedgerEntry->getValueFieldAccount(sfAccount);
|
||||
if (mAccountID.IsValid()) mValid = true;
|
||||
}
|
||||
|
||||
void AccountState::addJson(Json::Value& val)
|
||||
{
|
||||
Json::Value as(Json::objectValue);
|
||||
|
||||
as["AccountID"]=mAccountID.humanAccountID();
|
||||
as["Balance"]=boost::lexical_cast<std::string>(mBalance);
|
||||
as["SendSequence"]=mAccountSeq;
|
||||
if(!mValid) as["Invalid"]=true;
|
||||
|
||||
val[mAccountID.humanAccountID()]=as;
|
||||
val = mLedgerEntry->getJson(0);
|
||||
if(!mValid) val["Invalid"]=true;
|
||||
}
|
||||
// vim:ts=4
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
#ifndef __ACCOUNTSTATE__
|
||||
#define __ACCOUNTSTATE__
|
||||
|
||||
// An account's state in one or more accepted ledgers
|
||||
// An account's state
|
||||
// Used to track information about a local account
|
||||
|
||||
#include <vector>
|
||||
|
||||
@@ -10,8 +11,8 @@
|
||||
#include "../json/value.h"
|
||||
|
||||
#include "types.h"
|
||||
#include "uint256.h"
|
||||
#include "NewcoinAddress.h"
|
||||
#include "SerializedLedger.h"
|
||||
|
||||
class AccountState
|
||||
{
|
||||
@@ -20,37 +21,20 @@ public:
|
||||
|
||||
private:
|
||||
NewcoinAddress mAccountID;
|
||||
uint64 mBalance;
|
||||
uint32 mAccountSeq;
|
||||
SerializedLedgerEntry::pointer mLedgerEntry;
|
||||
bool mValid;
|
||||
|
||||
public:
|
||||
AccountState(const NewcoinAddress& mAccountID); // new account
|
||||
AccountState(const std::vector<unsigned char>&); // raw form
|
||||
AccountState(const NewcoinAddress& AccountID); // For new accounts
|
||||
AccountState(SerializedLedgerEntry::pointer ledgerEntry); // For accounts in a ledger
|
||||
|
||||
const NewcoinAddress& getAccountID() const { return mAccountID; }
|
||||
uint64 getBalance() const { return mBalance; }
|
||||
uint32 getSeq() const { return mAccountSeq; }
|
||||
uint64 getBalance() const { return mLedgerEntry->getIFieldU64(sfBalance); }
|
||||
uint32 getSeq() const { return mLedgerEntry->getIFieldU32(sfSequence); }
|
||||
|
||||
void credit(const uint64& a)
|
||||
{
|
||||
mBalance+=a;
|
||||
if(!mAccountSeq) mAccountSeq=1; // an account with non-0 balance cannot have 0 sequence
|
||||
}
|
||||
void charge(const uint64& a)
|
||||
{
|
||||
assert(mBalance>=a);
|
||||
mBalance-=a;
|
||||
}
|
||||
void incSeq()
|
||||
{
|
||||
mAccountSeq++;
|
||||
}
|
||||
void decSeq()
|
||||
{
|
||||
assert(mAccountSeq!=0);
|
||||
mAccountSeq--;
|
||||
}
|
||||
SerializedLedgerEntry::pointer getSLE() { return mLedgerEntry; }
|
||||
const SerializedLedgerEntry& peekSLE() const { return *mLedgerEntry; }
|
||||
SerializedLedgerEntry& peekSLE() { return *mLedgerEntry; }
|
||||
|
||||
std::vector<unsigned char> getRaw() const;
|
||||
void addJson(Json::Value& value);
|
||||
|
||||
Reference in New Issue
Block a user