mirror of
https://github.com/XRPLF/rippled.git
synced 2025-11-22 03:55:53 +00:00
Refactor AccountID (RIPD-953):
All AccountID functionality is removed from RippleAddress and
replaced with free functions. The AccountID to string conversion
cache is factored out as an explicit type with an instance in
the Application object. New base58 conversion functions are used,
with no dependence on OpenSSL.
All types and free functions related to AccountID are consolidated
into one header file. Routines to operate on "tokens" are also
introduced and consolidated into a single header file.
A token one of the cryptographic primitives used in Ripple:
Secret Seed
Server Public Key
Server Secret Key
Account ID
Account Public Key
Account Private Key
and these deprecated primitives:
Account Family Seed
Account Family Generator
This commit is contained in:
@@ -29,6 +29,7 @@
|
||||
#include <ripple/json/to_string.h>
|
||||
#include <ripple/protocol/JsonFields.h>
|
||||
#include <ripple/protocol/Indexes.h>
|
||||
#include <ripple/protocol/types.h>
|
||||
|
||||
namespace ripple {
|
||||
|
||||
@@ -586,19 +587,21 @@ MetaView::getForMod (uint256 const& key,
|
||||
}
|
||||
|
||||
bool
|
||||
MetaView::threadTx (RippleAddress const& to,
|
||||
MetaView::threadTx (AccountID const& to,
|
||||
Mods& mods)
|
||||
{
|
||||
auto const sle = getForMod(keylet::account(
|
||||
to.getAccountID()).key, mods);
|
||||
auto const sle = getForMod(
|
||||
keylet::account(to).key, mods);
|
||||
#ifdef META_DEBUG
|
||||
WriteLog (lsTRACE, View) << "Thread to " << threadTo.getAccountID ();
|
||||
WriteLog (lsTRACE, View) <<
|
||||
"Thread to " << toBase58(to);
|
||||
#endif
|
||||
assert(sle);
|
||||
if (! sle)
|
||||
{
|
||||
WriteLog (lsFATAL, View) <<
|
||||
"Threading to non-existent account: " << to.humanAccountID ();
|
||||
assert (false);
|
||||
"Threading to non-existent account: " <<
|
||||
toBase58(to);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -630,21 +633,25 @@ MetaView::threadOwners(std::shared_ptr<
|
||||
SLE const> const& sle, Mods& mods)
|
||||
{
|
||||
// thread new or modified sle to owner or owners
|
||||
if (sle->hasOneOwner())
|
||||
// VFALCO Why not isFieldPresent?
|
||||
if (sle->getType() != ltACCOUNT_ROOT &&
|
||||
sle->getFieldIndex(sfAccount) != -1)
|
||||
{
|
||||
// thread to owner's account
|
||||
#ifdef META_DEBUG
|
||||
WriteLog (lsTRACE, View) << "Thread to single owner";
|
||||
#endif
|
||||
return threadTx (sle->getOwner(), mods);
|
||||
return threadTx (sle->getAccountID(sfAccount), mods);
|
||||
}
|
||||
else if (sle->hasTwoOwners ()) // thread to owner's accounts
|
||||
else if (sle->getType() == ltRIPPLE_STATE)
|
||||
{
|
||||
// thread to owner's accounts
|
||||
#ifdef META_DEBUG
|
||||
WriteLog (lsTRACE, View) << "Thread to two owners";
|
||||
#endif
|
||||
return threadTx(sle->getFirstOwner(), mods) &&
|
||||
threadTx(sle->getSecondOwner(), mods);
|
||||
return
|
||||
threadTx(sle->getFieldAmount(sfLowLimit).getIssuer(), mods) &&
|
||||
threadTx(sle->getFieldAmount(sfHighLimit).getIssuer(), mods);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user