ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-29 23:45:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change name of mAccountSeq to make it clear that it's the family

Browse Source 
sequence not the transaction sequence
This commit is contained in:
JoelKatz
2012-01-18 14:17:28 -08:00
parent 0df4957b28
commit e9928ecc20
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Wallet.cpp
View File

@@ -18,9 +18,9 @@
#define CHECK_NEW_FAMILIES 500 #define CHECK_NEW_FAMILIES 500
#endif #endif
LocalAccount::LocalAccount(boost::shared_ptr<LocalAccountFamily> family, int accountSeq) : LocalAccount::LocalAccount(boost::shared_ptr<LocalAccountFamily> family, int familySeq) :
mPublicKey(family->getPublicKey(accountSeq)), mFamily(family), mAccountSeq(accountSeq), mPublicKey(family->getPublicKey(familySeq)), mFamily(family), mAccountFSeq(familySeq),
mLgrBalance(0), mTxnDelta(0), mTxnSeq(0) mLgrBalance(0), mTxnDelta(0), mTxnSeq(0)
{ {
mAcctID=mPublicKey->GetAddress().GetHash160(); mAcctID=mPublicKey->GetAddress().GetHash160();
if(theApp!=NULL) mPublicKey=theApp->getPubKeyCache().store(mAcctID, mPublicKey); if(theApp!=NULL) mPublicKey=theApp->getPubKeyCache().store(mAcctID, mPublicKey);
@@ -33,7 +33,7 @@ std::string LocalAccount::getAccountName() const
std::string LocalAccount::getLocalAccountName() const std::string LocalAccount::getLocalAccountName() const
{ {
return NewcoinAddress(mFamily->getFamily()).GetString() + ":" + boost::lexical_cast<std::string>(mAccountSeq); return NewcoinAddress(mFamily->getFamily()).GetString() + ":" + boost::lexical_cast<std::string>(mAccountFSeq);
} }
LocalAccountFamily::LocalAccountFamily(const uint160& family, const EC_GROUP* group, const EC_POINT* pubKey) : LocalAccountFamily::LocalAccountFamily(const uint160& family, const EC_GROUP* group, const EC_POINT* pubKey) :
@@ -104,13 +104,8 @@ CKey::pointer LocalAccountFamily::getPublicKey(int seq)
CKey::pointer LocalAccountFamily::getPrivateKey(int seq) CKey::pointer LocalAccountFamily::getPrivateKey(int seq)
{ {
if(!mRootPrivateKey) if(!mRootPrivateKey) return CKey::pointer();
{ std::cerr << "PrivKey(" << mFamily.GetHex() << "," << seq << ")" << std::endl;
#ifdef DEBUG
std::cerr << "Cannot get private key from loced family" << std::endl;
#endif
return CKey::pointer();
}
return CKey::pointer(new CKey(mFamily, mRootPrivateKey, seq)); return CKey::pointer(new CKey(mFamily, mRootPrivateKey, seq));
} }
@@ -359,7 +354,7 @@ std::string LocalAccount::getShortName() const
ret=mFamily->getFamily().GetHex(); ret=mFamily->getFamily().GetHex();
ret.append(":"); ret.append(":");
if(mName.empty()) if(mName.empty())
ret.append(boost::lexical_cast<std::string>(mAccountSeq)); ret.append(boost::lexical_cast<std::string>(mAccountFSeq));
else ret.append(mName); else ret.append(mName);
return ret; return ret;
} }
@@ -368,7 +363,7 @@ std::string LocalAccount::getFullName() const
{ {
std::string ret(mFamily->getFamily().GetHex()); std::string ret(mFamily->getFamily().GetHex());
ret.append(":"); ret.append(":");
ret.append(boost::lexical_cast<std::string>(mAccountSeq)); ret.append(boost::lexical_cast<std::string>(mAccountFSeq));
return ret; return ret;
} }
@@ -395,7 +390,7 @@ Json::Value LocalAccount::getJson() const
uint64 eb=getEffectiveBalance(); uint64 eb=getEffectiveBalance();
if(eb!=0) ret["Balance"]=boost::lexical_cast<std::string>(eb); if(eb!=0) ret["Balance"]=boost::lexical_cast<std::string>(eb);
uint32 sq=getAcctSeq(); uint32 sq=getTxnSeq();
if(sq!=0) ret["TxnSeq"]=boost::lexical_cast<std::string>(sq); if(sq!=0) ret["TxnSeq"]=boost::lexical_cast<std::string>(sq);
return ret; return ret;
@@ -403,12 +398,12 @@ Json::Value LocalAccount::getJson() const
bool LocalAccount::isIssued() const bool LocalAccount::isIssued() const
{ {
return mAccountSeq < mFamily->getSeq(); return mAccountFSeq < mFamily->getSeq();
} }
CKey::pointer LocalAccount::getPrivateKey() CKey::pointer LocalAccount::getPrivateKey()
{ {
return mFamily->getPrivateKey(mAccountSeq); return mFamily->getPrivateKey(mAccountFSeq);
} }
void Wallet::getFamilies(std::vector<uint160>& familyIDs) void Wallet::getFamilies(std::vector<uint160>& familyIDs)