mirror of
https://github.com/Xahau/xahaud.git
synced 2025-12-06 17:27:52 +00:00
Reformatting using AStyle
This commit is contained in:
Vinnie Falco
@@ -1,95 +1,96 @@
|
||||
|
||||
DECLARE_INSTANCE(Transaction);
|
||||
DECLARE_INSTANCE (Transaction);
|
||||
|
||||
Transaction::Transaction(SerializedTransaction::ref sit, bool bValidate)
|
||||
: mInLedger(0), mStatus(INVALID), mResult(temUNCERTAIN), mTransaction(sit)
|
||||
Transaction::Transaction (SerializedTransaction::ref sit, bool bValidate)
|
||||
: mInLedger (0), mStatus (INVALID), mResult (temUNCERTAIN), mTransaction (sit)
|
||||
{
|
||||
try
|
||||
{
|
||||
mFromPubKey.setAccountPublic(mTransaction->getSigningPubKey());
|
||||
mTransactionID = mTransaction->getTransactionID();
|
||||
mAccountFrom = mTransaction->getSourceAccount();
|
||||
}
|
||||
catch(...)
|
||||
{
|
||||
return;
|
||||
}
|
||||
try
|
||||
{
|
||||
mFromPubKey.setAccountPublic (mTransaction->getSigningPubKey ());
|
||||
mTransactionID = mTransaction->getTransactionID ();
|
||||
mAccountFrom = mTransaction->getSourceAccount ();
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (!bValidate || checkSign())
|
||||
mStatus = NEW;
|
||||
if (!bValidate || checkSign ())
|
||||
mStatus = NEW;
|
||||
}
|
||||
|
||||
Transaction::pointer Transaction::sharedTransaction(Blob const& vucTransaction, bool bValidate)
|
||||
Transaction::pointer Transaction::sharedTransaction (Blob const& vucTransaction, bool bValidate)
|
||||
{
|
||||
try
|
||||
{
|
||||
Serializer s(vucTransaction);
|
||||
SerializerIterator sit(s);
|
||||
try
|
||||
{
|
||||
Serializer s (vucTransaction);
|
||||
SerializerIterator sit (s);
|
||||
|
||||
SerializedTransaction::pointer st = boost::make_shared<SerializedTransaction>(boost::ref(sit));
|
||||
SerializedTransaction::pointer st = boost::make_shared<SerializedTransaction> (boost::ref (sit));
|
||||
|
||||
return boost::make_shared<Transaction>(st, bValidate);
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
Log(lsWARNING) << "Exception constructing transaction";
|
||||
return boost::shared_ptr<Transaction>();
|
||||
}
|
||||
return boost::make_shared<Transaction> (st, bValidate);
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
Log (lsWARNING) << "Exception constructing transaction";
|
||||
return boost::shared_ptr<Transaction> ();
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// Generic transaction construction
|
||||
//
|
||||
|
||||
Transaction::Transaction(
|
||||
TransactionType ttKind,
|
||||
const RippleAddress& naPublicKey,
|
||||
const RippleAddress& naSourceAccount,
|
||||
uint32 uSeq,
|
||||
const STAmount& saFee,
|
||||
uint32 uSourceTag) :
|
||||
mAccountFrom(naSourceAccount), mFromPubKey(naPublicKey), mInLedger(0), mStatus(NEW), mResult(temUNCERTAIN)
|
||||
Transaction::Transaction (
|
||||
TransactionType ttKind,
|
||||
const RippleAddress& naPublicKey,
|
||||
const RippleAddress& naSourceAccount,
|
||||
uint32 uSeq,
|
||||
const STAmount& saFee,
|
||||
uint32 uSourceTag) :
|
||||
mAccountFrom (naSourceAccount), mFromPubKey (naPublicKey), mInLedger (0), mStatus (NEW), mResult (temUNCERTAIN)
|
||||
{
|
||||
assert(mFromPubKey.isValid());
|
||||
assert (mFromPubKey.isValid ());
|
||||
|
||||
mTransaction = boost::make_shared<SerializedTransaction>(ttKind);
|
||||
mTransaction = boost::make_shared<SerializedTransaction> (ttKind);
|
||||
|
||||
// Log(lsINFO) << str(boost::format("Transaction: account: %s") % naSourceAccount.humanAccountID());
|
||||
// Log(lsINFO) << str(boost::format("Transaction: mAccountFrom: %s") % mAccountFrom.humanAccountID());
|
||||
// Log(lsINFO) << str(boost::format("Transaction: account: %s") % naSourceAccount.humanAccountID());
|
||||
// Log(lsINFO) << str(boost::format("Transaction: mAccountFrom: %s") % mAccountFrom.humanAccountID());
|
||||
|
||||
mTransaction->setSigningPubKey(mFromPubKey);
|
||||
mTransaction->setSourceAccount(mAccountFrom);
|
||||
mTransaction->setSequence(uSeq);
|
||||
mTransaction->setTransactionFee(saFee);
|
||||
mTransaction->setSigningPubKey (mFromPubKey);
|
||||
mTransaction->setSourceAccount (mAccountFrom);
|
||||
mTransaction->setSequence (uSeq);
|
||||
mTransaction->setTransactionFee (saFee);
|
||||
|
||||
if (uSourceTag)
|
||||
{
|
||||
mTransaction->makeFieldPresent(sfSourceTag);
|
||||
mTransaction->setFieldU32(sfSourceTag, uSourceTag);
|
||||
}
|
||||
if (uSourceTag)
|
||||
{
|
||||
mTransaction->makeFieldPresent (sfSourceTag);
|
||||
mTransaction->setFieldU32 (sfSourceTag, uSourceTag);
|
||||
}
|
||||
}
|
||||
|
||||
bool Transaction::sign(const RippleAddress& naAccountPrivate)
|
||||
bool Transaction::sign (const RippleAddress& naAccountPrivate)
|
||||
{
|
||||
bool bResult = true;
|
||||
bool bResult = true;
|
||||
|
||||
if (!naAccountPrivate.isValid())
|
||||
{
|
||||
Log(lsWARNING) << "No private key for signing";
|
||||
bResult = false;
|
||||
}
|
||||
getSTransaction()->sign(naAccountPrivate);
|
||||
if (!naAccountPrivate.isValid ())
|
||||
{
|
||||
Log (lsWARNING) << "No private key for signing";
|
||||
bResult = false;
|
||||
}
|
||||
|
||||
if (bResult)
|
||||
{
|
||||
updateID();
|
||||
}
|
||||
else
|
||||
{
|
||||
mStatus = INCOMPLETE;
|
||||
}
|
||||
getSTransaction ()->sign (naAccountPrivate);
|
||||
|
||||
return bResult;
|
||||
if (bResult)
|
||||
{
|
||||
updateID ();
|
||||
}
|
||||
else
|
||||
{
|
||||
mStatus = INCOMPLETE;
|
||||
}
|
||||
|
||||
return bResult;
|
||||
}
|
||||
|
||||
|
||||
@@ -100,223 +101,300 @@ bool Transaction::sign(const RippleAddress& naAccountPrivate)
|
||||
// Misc.
|
||||
//
|
||||
|
||||
bool Transaction::checkSign() const
|
||||
bool Transaction::checkSign () const
|
||||
{
|
||||
if (!mFromPubKey.isValid())
|
||||
{
|
||||
Log(lsWARNING) << "Transaction has bad source public key";
|
||||
return false;
|
||||
}
|
||||
return mTransaction->checkSign(mFromPubKey);
|
||||
if (!mFromPubKey.isValid ())
|
||||
{
|
||||
Log (lsWARNING) << "Transaction has bad source public key";
|
||||
return false;
|
||||
}
|
||||
|
||||
return mTransaction->checkSign (mFromPubKey);
|
||||
}
|
||||
|
||||
void Transaction::setStatus(TransStatus ts, uint32 lseq)
|
||||
void Transaction::setStatus (TransStatus ts, uint32 lseq)
|
||||
{
|
||||
mStatus = ts;
|
||||
mInLedger = lseq;
|
||||
mStatus = ts;
|
||||
mInLedger = lseq;
|
||||
}
|
||||
|
||||
void Transaction::save()
|
||||
void Transaction::save ()
|
||||
{
|
||||
if ((mStatus == INVALID) || (mStatus == REMOVED))
|
||||
return;
|
||||
if ((mStatus == INVALID) || (mStatus == REMOVED))
|
||||
return;
|
||||
|
||||
char status;
|
||||
switch (mStatus)
|
||||
{
|
||||
case NEW: status = TXN_SQL_NEW; break;
|
||||
case INCLUDED: status = TXN_SQL_INCLUDED; break;
|
||||
case CONFLICTED: status = TXN_SQL_CONFLICT; break;
|
||||
case COMMITTED: status = TXN_SQL_VALIDATED; break;
|
||||
case HELD: status = TXN_SQL_HELD; break;
|
||||
default: status = TXN_SQL_UNKNOWN;
|
||||
}
|
||||
char status;
|
||||
|
||||
Database *db = theApp->getTxnDB()->getDB();
|
||||
ScopedLock dbLock(theApp->getTxnDB()->getDBLock());
|
||||
db->executeSQL(mTransaction->getSQLInsertReplaceHeader() + mTransaction->getSQL(getLedger(), status) + ";");
|
||||
switch (mStatus)
|
||||
{
|
||||
case NEW:
|
||||
status = TXN_SQL_NEW;
|
||||
break;
|
||||
|
||||
case INCLUDED:
|
||||
status = TXN_SQL_INCLUDED;
|
||||
break;
|
||||
|
||||
case CONFLICTED:
|
||||
status = TXN_SQL_CONFLICT;
|
||||
break;
|
||||
|
||||
case COMMITTED:
|
||||
status = TXN_SQL_VALIDATED;
|
||||
break;
|
||||
|
||||
case HELD:
|
||||
status = TXN_SQL_HELD;
|
||||
break;
|
||||
|
||||
default:
|
||||
status = TXN_SQL_UNKNOWN;
|
||||
}
|
||||
|
||||
Database* db = theApp->getTxnDB ()->getDB ();
|
||||
ScopedLock dbLock (theApp->getTxnDB ()->getDBLock ());
|
||||
db->executeSQL (mTransaction->getSQLInsertReplaceHeader () + mTransaction->getSQL (getLedger (), status) + ";");
|
||||
}
|
||||
|
||||
Transaction::pointer Transaction::transactionFromSQL(Database* db, bool bValidate)
|
||||
Transaction::pointer Transaction::transactionFromSQL (Database* db, bool bValidate)
|
||||
{
|
||||
Serializer rawTxn;
|
||||
std::string status;
|
||||
uint32 inLedger;
|
||||
Serializer rawTxn;
|
||||
std::string status;
|
||||
uint32 inLedger;
|
||||
|
||||
int txSize = 2048;
|
||||
rawTxn.resize(txSize);
|
||||
int txSize = 2048;
|
||||
rawTxn.resize (txSize);
|
||||
|
||||
db->getStr("Status", status);
|
||||
inLedger = db->getInt("LedgerSeq");
|
||||
txSize = db->getBinary("RawTxn", &*rawTxn.begin(), rawTxn.getLength());
|
||||
if (txSize > rawTxn.getLength())
|
||||
{
|
||||
rawTxn.resize(txSize);
|
||||
db->getBinary("RawTxn", &*rawTxn.begin(), rawTxn.getLength());
|
||||
}
|
||||
db->getStr ("Status", status);
|
||||
inLedger = db->getInt ("LedgerSeq");
|
||||
txSize = db->getBinary ("RawTxn", &*rawTxn.begin (), rawTxn.getLength ());
|
||||
|
||||
rawTxn.resize(txSize);
|
||||
if (txSize > rawTxn.getLength ())
|
||||
{
|
||||
rawTxn.resize (txSize);
|
||||
db->getBinary ("RawTxn", &*rawTxn.begin (), rawTxn.getLength ());
|
||||
}
|
||||
|
||||
SerializerIterator it(rawTxn);
|
||||
SerializedTransaction::pointer txn = boost::make_shared<SerializedTransaction>(boost::ref(it));
|
||||
Transaction::pointer tr = boost::make_shared<Transaction>(txn, bValidate);
|
||||
rawTxn.resize (txSize);
|
||||
|
||||
TransStatus st(INVALID);
|
||||
switch (status[0])
|
||||
{
|
||||
case TXN_SQL_NEW: st = NEW; break;
|
||||
case TXN_SQL_CONFLICT: st = CONFLICTED; break;
|
||||
case TXN_SQL_HELD: st = HELD; break;
|
||||
case TXN_SQL_VALIDATED: st = COMMITTED; break;
|
||||
case TXN_SQL_INCLUDED: st = INCLUDED; break;
|
||||
case TXN_SQL_UNKNOWN: break;
|
||||
default: assert(false);
|
||||
}
|
||||
tr->setStatus(st);
|
||||
tr->setLedger(inLedger);
|
||||
return tr;
|
||||
SerializerIterator it (rawTxn);
|
||||
SerializedTransaction::pointer txn = boost::make_shared<SerializedTransaction> (boost::ref (it));
|
||||
Transaction::pointer tr = boost::make_shared<Transaction> (txn, bValidate);
|
||||
|
||||
TransStatus st (INVALID);
|
||||
|
||||
switch (status[0])
|
||||
{
|
||||
case TXN_SQL_NEW:
|
||||
st = NEW;
|
||||
break;
|
||||
|
||||
case TXN_SQL_CONFLICT:
|
||||
st = CONFLICTED;
|
||||
break;
|
||||
|
||||
case TXN_SQL_HELD:
|
||||
st = HELD;
|
||||
break;
|
||||
|
||||
case TXN_SQL_VALIDATED:
|
||||
st = COMMITTED;
|
||||
break;
|
||||
|
||||
case TXN_SQL_INCLUDED:
|
||||
st = INCLUDED;
|
||||
break;
|
||||
|
||||
case TXN_SQL_UNKNOWN:
|
||||
break;
|
||||
|
||||
default:
|
||||
assert (false);
|
||||
}
|
||||
|
||||
tr->setStatus (st);
|
||||
tr->setLedger (inLedger);
|
||||
return tr;
|
||||
}
|
||||
|
||||
// DAVID: would you rather duplicate this code or keep the lock longer?
|
||||
Transaction::pointer Transaction::transactionFromSQL(const std::string& sql)
|
||||
Transaction::pointer Transaction::transactionFromSQL (const std::string& sql)
|
||||
{
|
||||
Serializer rawTxn;
|
||||
std::string status;
|
||||
uint32 inLedger;
|
||||
Serializer rawTxn;
|
||||
std::string status;
|
||||
uint32 inLedger;
|
||||
|
||||
int txSize = 2048;
|
||||
rawTxn.resize(txSize);
|
||||
int txSize = 2048;
|
||||
rawTxn.resize (txSize);
|
||||
|
||||
{
|
||||
ScopedLock sl(theApp->getTxnDB()->getDBLock());
|
||||
Database* db = theApp->getTxnDB()->getDB();
|
||||
{
|
||||
ScopedLock sl (theApp->getTxnDB ()->getDBLock ());
|
||||
Database* db = theApp->getTxnDB ()->getDB ();
|
||||
|
||||
if (!db->executeSQL(sql, true) || !db->startIterRows())
|
||||
return Transaction::pointer();
|
||||
if (!db->executeSQL (sql, true) || !db->startIterRows ())
|
||||
return Transaction::pointer ();
|
||||
|
||||
db->getStr("Status", status);
|
||||
inLedger = db->getInt("LedgerSeq");
|
||||
txSize = db->getBinary("RawTxn", &*rawTxn.begin(), rawTxn.getLength());
|
||||
if (txSize > rawTxn.getLength())
|
||||
{
|
||||
rawTxn.resize(txSize);
|
||||
db->getBinary("RawTxn", &*rawTxn.begin(), rawTxn.getLength());
|
||||
}
|
||||
db->endIterRows();
|
||||
}
|
||||
rawTxn.resize(txSize);
|
||||
db->getStr ("Status", status);
|
||||
inLedger = db->getInt ("LedgerSeq");
|
||||
txSize = db->getBinary ("RawTxn", &*rawTxn.begin (), rawTxn.getLength ());
|
||||
|
||||
SerializerIterator it(rawTxn);
|
||||
SerializedTransaction::pointer txn = boost::make_shared<SerializedTransaction>(boost::ref(it));
|
||||
Transaction::pointer tr = boost::make_shared<Transaction>(txn, true);
|
||||
if (txSize > rawTxn.getLength ())
|
||||
{
|
||||
rawTxn.resize (txSize);
|
||||
db->getBinary ("RawTxn", &*rawTxn.begin (), rawTxn.getLength ());
|
||||
}
|
||||
|
||||
TransStatus st(INVALID);
|
||||
switch (status[0])
|
||||
{
|
||||
case TXN_SQL_NEW: st = NEW; break;
|
||||
case TXN_SQL_CONFLICT: st = CONFLICTED; break;
|
||||
case TXN_SQL_HELD: st = HELD; break;
|
||||
case TXN_SQL_VALIDATED: st = COMMITTED; break;
|
||||
case TXN_SQL_INCLUDED: st = INCLUDED; break;
|
||||
case TXN_SQL_UNKNOWN: break;
|
||||
default: assert(false);
|
||||
}
|
||||
tr->setStatus(st);
|
||||
tr->setLedger(inLedger);
|
||||
return tr;
|
||||
db->endIterRows ();
|
||||
}
|
||||
rawTxn.resize (txSize);
|
||||
|
||||
SerializerIterator it (rawTxn);
|
||||
SerializedTransaction::pointer txn = boost::make_shared<SerializedTransaction> (boost::ref (it));
|
||||
Transaction::pointer tr = boost::make_shared<Transaction> (txn, true);
|
||||
|
||||
TransStatus st (INVALID);
|
||||
|
||||
switch (status[0])
|
||||
{
|
||||
case TXN_SQL_NEW:
|
||||
st = NEW;
|
||||
break;
|
||||
|
||||
case TXN_SQL_CONFLICT:
|
||||
st = CONFLICTED;
|
||||
break;
|
||||
|
||||
case TXN_SQL_HELD:
|
||||
st = HELD;
|
||||
break;
|
||||
|
||||
case TXN_SQL_VALIDATED:
|
||||
st = COMMITTED;
|
||||
break;
|
||||
|
||||
case TXN_SQL_INCLUDED:
|
||||
st = INCLUDED;
|
||||
break;
|
||||
|
||||
case TXN_SQL_UNKNOWN:
|
||||
break;
|
||||
|
||||
default:
|
||||
assert (false);
|
||||
}
|
||||
|
||||
tr->setStatus (st);
|
||||
tr->setLedger (inLedger);
|
||||
return tr;
|
||||
}
|
||||
|
||||
|
||||
Transaction::pointer Transaction::load(uint256 const& id)
|
||||
Transaction::pointer Transaction::load (uint256 const& id)
|
||||
{
|
||||
std::string sql = "SELECT LedgerSeq,Status,RawTxn FROM Transactions WHERE TransID='";
|
||||
sql.append(id.GetHex());
|
||||
sql.append("';");
|
||||
return transactionFromSQL(sql);
|
||||
std::string sql = "SELECT LedgerSeq,Status,RawTxn FROM Transactions WHERE TransID='";
|
||||
sql.append (id.GetHex ());
|
||||
sql.append ("';");
|
||||
return transactionFromSQL (sql);
|
||||
}
|
||||
|
||||
bool Transaction::convertToTransactions(uint32 firstLedgerSeq, uint32 secondLedgerSeq,
|
||||
bool checkFirstTransactions, bool checkSecondTransactions, const SHAMap::Delta& inMap,
|
||||
std::map<uint256, std::pair<Transaction::pointer, Transaction::pointer> >& outMap)
|
||||
{ // convert a straight SHAMap payload difference to a transaction difference table
|
||||
// return value: true=ledgers are valid, false=a ledger is invalid
|
||||
SHAMap::Delta::const_iterator it;
|
||||
for(it = inMap.begin(); it != inMap.end(); ++it)
|
||||
{
|
||||
uint256 const& id = it->first;
|
||||
SHAMapItem::ref first = it->second.first;
|
||||
SHAMapItem::ref second = it->second.second;
|
||||
bool Transaction::convertToTransactions (uint32 firstLedgerSeq, uint32 secondLedgerSeq,
|
||||
bool checkFirstTransactions, bool checkSecondTransactions, const SHAMap::Delta& inMap,
|
||||
std::map<uint256, std::pair<Transaction::pointer, Transaction::pointer> >& outMap)
|
||||
{
|
||||
// convert a straight SHAMap payload difference to a transaction difference table
|
||||
// return value: true=ledgers are valid, false=a ledger is invalid
|
||||
SHAMap::Delta::const_iterator it;
|
||||
|
||||
Transaction::pointer firstTrans, secondTrans;
|
||||
if (!!first)
|
||||
{ // transaction in our table
|
||||
firstTrans = sharedTransaction(first->getData(), checkFirstTransactions);
|
||||
if ((firstTrans->getStatus() == INVALID) || (firstTrans->getID() != id ))
|
||||
{
|
||||
firstTrans->setStatus(INVALID, firstLedgerSeq);
|
||||
return false;
|
||||
}
|
||||
else firstTrans->setStatus(INCLUDED, firstLedgerSeq);
|
||||
}
|
||||
for (it = inMap.begin (); it != inMap.end (); ++it)
|
||||
{
|
||||
uint256 const& id = it->first;
|
||||
SHAMapItem::ref first = it->second.first;
|
||||
SHAMapItem::ref second = it->second.second;
|
||||
|
||||
if (!!second)
|
||||
{ // transaction in other table
|
||||
secondTrans = sharedTransaction(second->getData(), checkSecondTransactions);
|
||||
if ((secondTrans->getStatus() == INVALID) || (secondTrans->getID() != id))
|
||||
{
|
||||
secondTrans->setStatus(INVALID, secondLedgerSeq);
|
||||
return false;
|
||||
}
|
||||
else secondTrans->setStatus(INCLUDED, secondLedgerSeq);
|
||||
}
|
||||
assert(firstTrans || secondTrans);
|
||||
if(firstTrans && secondTrans && (firstTrans->getStatus() != INVALID) && (secondTrans->getStatus() != INVALID))
|
||||
return false; // one or the other SHAMap is structurally invalid or a miracle has happened
|
||||
Transaction::pointer firstTrans, secondTrans;
|
||||
|
||||
outMap[id] = std::pair<Transaction::pointer, Transaction::pointer>(firstTrans, secondTrans);
|
||||
}
|
||||
return true;
|
||||
if (!!first)
|
||||
{
|
||||
// transaction in our table
|
||||
firstTrans = sharedTransaction (first->getData (), checkFirstTransactions);
|
||||
|
||||
if ((firstTrans->getStatus () == INVALID) || (firstTrans->getID () != id ))
|
||||
{
|
||||
firstTrans->setStatus (INVALID, firstLedgerSeq);
|
||||
return false;
|
||||
}
|
||||
else firstTrans->setStatus (INCLUDED, firstLedgerSeq);
|
||||
}
|
||||
|
||||
if (!!second)
|
||||
{
|
||||
// transaction in other table
|
||||
secondTrans = sharedTransaction (second->getData (), checkSecondTransactions);
|
||||
|
||||
if ((secondTrans->getStatus () == INVALID) || (secondTrans->getID () != id))
|
||||
{
|
||||
secondTrans->setStatus (INVALID, secondLedgerSeq);
|
||||
return false;
|
||||
}
|
||||
else secondTrans->setStatus (INCLUDED, secondLedgerSeq);
|
||||
}
|
||||
|
||||
assert (firstTrans || secondTrans);
|
||||
|
||||
if (firstTrans && secondTrans && (firstTrans->getStatus () != INVALID) && (secondTrans->getStatus () != INVALID))
|
||||
return false; // one or the other SHAMap is structurally invalid or a miracle has happened
|
||||
|
||||
outMap[id] = std::pair<Transaction::pointer, Transaction::pointer> (firstTrans, secondTrans);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
// options 1 to include the date of the transaction
|
||||
Json::Value Transaction::getJson(int options, bool binary) const
|
||||
Json::Value Transaction::getJson (int options, bool binary) const
|
||||
{
|
||||
Json::Value ret(mTransaction->getJson(0, binary));
|
||||
Json::Value ret (mTransaction->getJson (0, binary));
|
||||
|
||||
if (mInLedger)
|
||||
{
|
||||
ret["inLedger"] = mInLedger; // Deprecated.
|
||||
ret["ledger_index"] = mInLedger;
|
||||
if (mInLedger)
|
||||
{
|
||||
ret["inLedger"] = mInLedger; // Deprecated.
|
||||
ret["ledger_index"] = mInLedger;
|
||||
|
||||
if (options == 1)
|
||||
{
|
||||
Ledger::pointer ledger=theApp->getLedgerMaster().getLedgerBySeq(mInLedger);
|
||||
if (ledger)
|
||||
ret["date"] = ledger->getCloseTimeNC();
|
||||
}
|
||||
}
|
||||
if (options == 1)
|
||||
{
|
||||
Ledger::pointer ledger = theApp->getLedgerMaster ().getLedgerBySeq (mInLedger);
|
||||
|
||||
return ret;
|
||||
if (ledger)
|
||||
ret["date"] = ledger->getCloseTimeNC ();
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
//
|
||||
// Obsolete
|
||||
//
|
||||
|
||||
static bool isHex(char j)
|
||||
static bool isHex (char j)
|
||||
{
|
||||
if ((j >= '0') && (j <= '9')) return true;
|
||||
if ((j >= 'A') && (j <= 'F')) return true;
|
||||
if ((j >= 'a') && (j <= 'f')) return true;
|
||||
return false;
|
||||
if ((j >= '0') && (j <= '9')) return true;
|
||||
|
||||
if ((j >= 'A') && (j <= 'F')) return true;
|
||||
|
||||
if ((j >= 'a') && (j <= 'f')) return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool Transaction::isHexTxID(const std::string& txid)
|
||||
bool Transaction::isHexTxID (const std::string& txid)
|
||||
{
|
||||
if (txid.size() != 64) return false;
|
||||
for (int i = 0; i < 64; ++i)
|
||||
if (!isHex(txid[i])) return false;
|
||||
return true;
|
||||
if (txid.size () != 64) return false;
|
||||
|
||||
for (int i = 0; i < 64; ++i)
|
||||
if (!isHex (txid[i])) return false;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
// vim:ts=4
|
||||
|
||||
Reference in New Issue
Block a user