ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'misc'

Browse Source
This commit is contained in:
Arthur Britto
2012-06-04 13:08:59 -07:00
parent 18da3ac8d1 1ec51b6735
commit b186b45c76
3 changed files with 309 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

249
src/RPCServer.cpp
View File

@@ -215,7 +215,7 @@ Json::Value RPCServer::getMasterGenerator(const uint256& uLedger, const NewcoinA
Json::Value RPCServer::authorize(const uint256& uLedger,
const NewcoinAddress& naRegularSeed, const NewcoinAddress& naSrcAccountID,
NewcoinAddress& naAccountPublic, NewcoinAddress& naAccountPrivate,
AccountState::pointer& asSrc,
STAmount& saSrcBalance, uint64 uFee, AccountState::pointer& asSrc,
const NewcoinAddress& naVerifyGenerator)
{
// Source/paying account must exist.
@@ -274,6 +274,17 @@ Json::Value RPCServer::authorize(const uint256& uLedger,
return JSONRPCError(500, "wrong password (changed)");
}
saSrcBalance = asSrc->getBalance();
if (saSrcBalance < uFee)
{
return JSONRPCError(500, "insufficent funds");
}
else
{
saSrcBalance -= uFee;
}
return obj;
}
@@ -366,18 +377,12 @@ Json::Value RPCServer::doAccountEmailSet(Json::Value &params)
NewcoinAddress naAccountPublic;
NewcoinAddress naAccountPrivate;
AccountState::pointer asSrc;
Json::Value obj = authorize(uLedger, naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate, asSrc, naMasterGenerator);
STAmount saSrcBalance = asSrc->getBalance();
STAmount saSrcBalance;
Json::Value obj = authorize(uLedger, naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate,
saSrcBalance, theConfig.FEE_DEFAULT, asSrc, naMasterGenerator);
if (!obj.empty())
{
return obj;
}
else if (saSrcBalance < theConfig.FEE_DEFAULT)
{
return JSONRPCError(500, "insufficent funds");
}
// Hash as per: http://en.gravatar.com/site/implement/hash/
std::string strEmail = 3 == params.size() ? params[2u].asString() : "";
@@ -622,18 +627,12 @@ Json::Value RPCServer::doAccountMessageSet(Json::Value& params) {
NewcoinAddress naAccountPublic;
NewcoinAddress naAccountPrivate;
AccountState::pointer asSrc;
Json::Value obj = authorize(uLedger, naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate, asSrc, naMasterGenerator);
STAmount saSrcBalance = asSrc->getBalance();
STAmount saSrcBalance;
Json::Value obj = authorize(uLedger, naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate,
saSrcBalance, theConfig.FEE_DEFAULT, asSrc, naMasterGenerator);
if (!obj.empty())
{
return obj;
}
else if (saSrcBalance < theConfig.FEE_DEFAULT)
{
return JSONRPCError(500, "insufficent funds");
}
Transaction::pointer trans = Transaction::sharedAccountSet(
naAccountPublic, naAccountPrivate,
@@ -687,18 +686,12 @@ Json::Value RPCServer::doAccountWalletSet(Json::Value& params) {
NewcoinAddress naAccountPublic;
NewcoinAddress naAccountPrivate;
AccountState::pointer asSrc;
Json::Value obj = authorize(uLedger, naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate, asSrc, naMasterGenerator);
STAmount saSrcBalance = asSrc->getBalance();
STAmount saSrcBalance;
Json::Value obj = authorize(uLedger, naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate,
saSrcBalance, theConfig.FEE_DEFAULT, asSrc, naMasterGenerator);
if (!obj.empty())
{
return obj;
}
else if (saSrcBalance < theConfig.FEE_DEFAULT)
{
return JSONRPCError(500, "insufficent funds");
}
std::string strWalletLocator = params.size() == 3 ? params[2u].asString() : "";
uint256 uWalletLocator;
@@ -802,41 +795,34 @@ Json::Value RPCServer::doCreditSet(Json::Value& params)
NewcoinAddress naAccountPublic;
NewcoinAddress naAccountPrivate;
AccountState::pointer asSrc;
Json::Value obj = authorize(uLedger, naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate, asSrc, naMasterGenerator);
STAmount saSrcBalance;
Json::Value obj = authorize(uLedger, naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate,
saSrcBalance, theConfig.FEE_DEFAULT, asSrc, naMasterGenerator);
if (!obj.empty())
return obj;
STAmount saSrcBalance = asSrc->getBalance();
Transaction::pointer trans = Transaction::sharedCreditSet(
naAccountPublic, naAccountPrivate,
naSrcAccountID,
asSrc->getSeq(),
theConfig.FEE_DEFAULT,
0, // YYY No source tag
naDstAccountID,
saLimitAmount,
uAcceptRate);
if (saSrcBalance < theConfig.FEE_DEFAULT)
{
return JSONRPCError(500, "insufficent funds");
}
else
{
Transaction::pointer trans = Transaction::sharedCreditSet(
naAccountPublic, naAccountPrivate,
naSrcAccountID,
asSrc->getSeq(),
theConfig.FEE_DEFAULT,
0, // YYY No source tag
naDstAccountID,
saLimitAmount,
uAcceptRate);
(void) mNetOps->processTransaction(trans);
(void) mNetOps->processTransaction(trans);
obj["transaction"] = trans->getSTransaction()->getJson(0);
obj["status"] = trans->getStatus();
obj["seed"] = naSeed.humanFamilySeed();
obj["srcAccountID"] = naSrcAccountID.humanAccountID();
obj["dstAccountID"] = naDstAccountID.humanAccountID();
obj["limitAmount"] = saLimitAmount.getText();
obj["acceptRate"] = uAcceptRate;
obj["transaction"] = trans->getSTransaction()->getJson(0);
obj["status"] = trans->getStatus();
obj["seed"] = naSeed.humanFamilySeed();
obj["srcAccountID"] = naSrcAccountID.humanAccountID();
obj["dstAccountID"] = naDstAccountID.humanAccountID();
obj["limitAmount"] = saLimitAmount.getText();
obj["acceptRate"] = uAcceptRate;
return obj;
}
return obj;
}
}
@@ -878,18 +864,12 @@ Json::Value RPCServer::doPasswordFund(Json::Value &params)
NewcoinAddress naAccountPublic;
NewcoinAddress naAccountPrivate;
AccountState::pointer asSrc;
Json::Value obj = authorize(uLedger, naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate, asSrc, naMasterGenerator);
STAmount saSrcBalance = asSrc->getBalance();
STAmount saSrcBalance;
Json::Value obj = authorize(uLedger, naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate,
saSrcBalance, theConfig.FEE_DEFAULT, asSrc, naMasterGenerator);
if (!obj.empty())
{
return obj;
}
else if (saSrcBalance < theConfig.FEE_DEFAULT)
{
return JSONRPCError(500, "insufficent funds");
}
// YYY Could verify dst exists and isn't already funded.
@@ -1073,52 +1053,43 @@ Json::Value RPCServer::doSend(Json::Value& params)
NewcoinAddress naAccountPublic;
NewcoinAddress naAccountPrivate;
AccountState::pointer asSrc;
Json::Value obj = authorize(uLedger, naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate, asSrc, naMasterGenerator);
STAmount saSrcBalance;
Json::Value obj = authorize(uLedger, naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate,
saSrcBalance, theConfig.FEE_DEFAULT, asSrc, naMasterGenerator);
if (!obj.empty())
{
return obj;
}
if (params.size() < 6)
saSrcAmount = saDstAmount;
// XXX Confirm saSrcAmount >= saDstAmount.
STAmount saSrcBalance = asSrc->getBalance();
STPathSet spPaths;
Transaction::pointer trans = Transaction::sharedPayment(
naAccountPublic, naAccountPrivate,
naSrcAccountID,
asSrc->getSeq(),
theConfig.FEE_DEFAULT,
0, // YYY No source tag
naDstAccountID,
saDstAmount,
saSrcAmount,
spPaths);
if (saSrcBalance < theConfig.FEE_DEFAULT)
{
return JSONRPCError(500, "insufficent funds");
}
else
{
STPathSet spPaths;
Transaction::pointer trans = Transaction::sharedPayment(
naAccountPublic, naAccountPrivate,
naSrcAccountID,
asSrc->getSeq(),
theConfig.FEE_DEFAULT,
0, // YYY No source tag
naDstAccountID,
saDstAmount,
saSrcAmount,
spPaths);
(void) mNetOps->processTransaction(trans);
(void) mNetOps->processTransaction(trans);
obj["transaction"] = trans->getSTransaction()->getJson(0);
obj["status"] = trans->getStatus();
obj["seed"] = naSeed.humanFamilySeed();
obj["srcAccountID"] = naSrcAccountID.humanAccountID();
obj["dstAccountID"] = naDstAccountID.humanAccountID();
obj["srcAmount"] = saSrcAmount.getText();
obj["srcISO"] = saSrcAmount.getCurrencyHuman();
obj["dstAmount"] = saDstAmount.getText();
obj["dstISO"] = saDstAmount.getCurrencyHuman();
obj["transaction"] = trans->getSTransaction()->getJson(0);
obj["status"] = trans->getStatus();
obj["seed"] = naSeed.humanFamilySeed();
obj["srcAccountID"] = naSrcAccountID.humanAccountID();
obj["dstAccountID"] = naDstAccountID.humanAccountID();
obj["srcAmount"] = saSrcAmount.getText();
obj["srcISO"] = saSrcAmount.getCurrencyHuman();
obj["dstAmount"] = saDstAmount.getText();
obj["dstISO"] = saDstAmount.getCurrencyHuman();
return obj;
}
return obj;
}
}
@@ -1170,49 +1141,39 @@ Json::Value RPCServer::doTransitSet(Json::Value& params)
NewcoinAddress naAccountPublic;
NewcoinAddress naAccountPrivate;
AccountState::pointer asSrc;
Json::Value obj = authorize(uLedger, naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate, asSrc, naMasterGenerator);
STAmount saSrcBalance;
Json::Value obj = authorize(uLedger, naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate,
saSrcBalance, theConfig.FEE_DEFAULT, asSrc, naMasterGenerator);
if (!obj.empty())
{
return obj;
}
STAmount saSrcBalance = asSrc->getBalance();
uTransitRate = 0;
uTransitStart = 0;
uTransitExpire = 0;
if (saSrcBalance < theConfig.FEE_DEFAULT)
{
return JSONRPCError(500, "insufficent funds");
}
else
{
Transaction::pointer trans = Transaction::sharedTransitSet(
naAccountPublic, naAccountPrivate,
naSrcAccountID,
asSrc->getSeq(),
theConfig.FEE_DEFAULT,
0, // YYY No source tag
uTransitRate,
uTransitStart,
uTransitExpire);
Transaction::pointer trans = Transaction::sharedTransitSet(
naAccountPublic, naAccountPrivate,
naSrcAccountID,
asSrc->getSeq(),
theConfig.FEE_DEFAULT,
0, // YYY No source tag
uTransitRate,
uTransitStart,
uTransitExpire);
(void) mNetOps->processTransaction(trans);
(void) mNetOps->processTransaction(trans);
obj["transaction"] = trans->getSTransaction()->getJson(0);
obj["status"] = trans->getStatus();
obj["seed"] = naSeed.humanFamilySeed();
obj["srcAccountID"] = naSrcAccountID.humanAccountID();
obj["transitRate"] = uTransitRate;
obj["transitStart"] = uTransitStart;
obj["transitExpire"] = uTransitExpire;
obj["transaction"] = trans->getSTransaction()->getJson(0);
obj["status"] = trans->getStatus();
obj["seed"] = naSeed.humanFamilySeed();
obj["srcAccountID"] = naSrcAccountID.humanAccountID();
obj["transitRate"] = uTransitRate;
obj["transitStart"] = uTransitStart;
obj["transitExpire"] = uTransitExpire;
return obj;
}
return obj;
}
return "Not implemented.";
}
Json::Value RPCServer::doTx(Json::Value& params)
@@ -1461,18 +1422,14 @@ Json::Value RPCServer::doWalletAdd(Json::Value& params)
NewcoinAddress naAccountPublic;
NewcoinAddress naAccountPrivate;
AccountState::pointer asSrc;
Json::Value obj = authorize(uLedger, naRegularSeed, naSrcAccountID, naAccountPublic, naAccountPrivate, asSrc, naMasterGenerator);
STAmount saSrcBalance;
Json::Value obj = authorize(uLedger, naRegularSeed, naSrcAccountID, naAccountPublic, naAccountPrivate,
saSrcBalance, theConfig.FEE_CREATE, asSrc, naMasterGenerator);
if (!obj.empty())
{
return obj;
}
// XXX Confirm total funds.
STAmount saSrcBalance = asSrc->getBalance();
if (saSrcBalance < theConfig.FEE_CREATE)
if (saSrcBalance < saAmount)
{
return JSONRPCError(500, "insufficent funds");
}
@@ -1673,19 +1630,17 @@ Json::Value RPCServer::doWalletCreate(Json::Value& params)
NewcoinAddress naAccountPublic;
NewcoinAddress naAccountPrivate;
AccountState::pointer asSrc;
Json::Value obj = authorize(uLedger, naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate, asSrc, naMasterGenerator);
STAmount saSrcBalance = asSrc->getBalance();
STAmount saInitialFunds = (params.size() < 4) ? 0 : boost::lexical_cast<uint64>(params[3u].asString());
STAmount saSrcBalance;
Json::Value obj = authorize(uLedger, naSeed, naSrcAccountID, naAccountPublic, naAccountPrivate,
saSrcBalance, theConfig.FEE_CREATE, asSrc, naMasterGenerator);
if (!obj.empty())
{
return obj;
}
else if (saSrcBalance < (saInitialFunds + theConfig.FEE_CREATE))
{
STAmount saInitialFunds = (params.size() < 4) ? 0 : boost::lexical_cast<uint64>(params[3u].asString());
if (saSrcBalance < saInitialFunds)
return JSONRPCError(500, "insufficent funds");
}
Transaction::pointer trans = Transaction::sharedCreate(
naAccountPublic, naAccountPrivate,

2
src/RPCServer.h
View File

@@ -42,7 +42,7 @@ private:
Json::Value getMasterGenerator(const uint256& uLedger, const NewcoinAddress& naRegularSeed, NewcoinAddress& naMasterGenerator);
Json::Value authorize(const uint256& uLedger, const NewcoinAddress& naRegularSeed, const NewcoinAddress& naSrcAccountID,
NewcoinAddress& naAccountPublic, NewcoinAddress& naAccountPrivate,
AccountState::pointer& asSrc,
STAmount& saSrcBalance, uint64 uFee, AccountState::pointer& asSrc,
const NewcoinAddress& naVerifyGenerator);
Json::Value accounts(const uint256& uLedger, const NewcoinAddress& naMasterGenerator);

374
src/TransactionEngine.cpp
View File

@@ -323,8 +323,8 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran
if (!txID)
{
std::cerr << "applyTransaction: invalid transaction id" << std::endl;
mLedger = Ledger::pointer();
return tenINVALID;
result = tenINVALID;
}
//
@@ -336,70 +336,71 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran
// without going to disk. Each transaction also notes a source account id. This is used to verify that the signing key is
// associated with the account.
// XXX This could be a lot cleaner to prevent unnecessary copying.
NewcoinAddress naSigningPubKey = NewcoinAddress::createAccountPublic(txn.peekSigningPubKey());
NewcoinAddress naSigningPubKey;
if (terSUCCESS == result)
naSigningPubKey = NewcoinAddress::createAccountPublic(txn.peekSigningPubKey());
// Consistency: really signed.
if (!txn.checkSign(naSigningPubKey))
if (terSUCCESS == result && !txn.checkSign(naSigningPubKey))
{
std::cerr << "applyTransaction: Invalid transaction: bad signature" << std::endl;
mLedger = Ledger::pointer();
return tenINVALID;
result = tenINVALID;
}
STAmount saCost = theConfig.FEE_DEFAULT;
// Customize behavoir based on transaction type.
switch(txn.getTxnType())
if (terSUCCESS == result)
{
case ttCLAIM:
case ttPASSWORD_SET:
saCost = 0;
break;
switch (txn.getTxnType())
{
case ttCLAIM:
case ttPASSWORD_SET:
saCost = 0;
break;
case ttPAYMENT:
if (txn.getFlags() & tfCreateAccount)
{
saCost = theConfig.FEE_CREATE;
}
break;
case ttPAYMENT:
if (txn.getFlags() & tfCreateAccount)
{
saCost = theConfig.FEE_CREATE;
}
break;
case ttACCOUNT_SET:
case ttCREDIT_SET:
case ttINVOICE:
case ttOFFER:
case ttPASSWORD_FUND:
case ttTRANSIT_SET:
case ttWALLET_ADD:
nothing();
break;
case ttACCOUNT_SET:
case ttCREDIT_SET:
case ttINVOICE:
case ttOFFER:
case ttPASSWORD_FUND:
case ttTRANSIT_SET:
case ttWALLET_ADD:
nothing();
break;
case ttINVALID:
std::cerr << "applyTransaction: Invalid transaction: ttINVALID transaction type" << std::endl;
result = tenINVALID;
break;
case ttINVALID:
std::cerr << "applyTransaction: Invalid transaction: ttINVALID transaction type" << std::endl;
result = tenINVALID;
break;
default:
std::cerr << "applyTransaction: Invalid transaction: unknown transaction type" << std::endl;
result = tenUNKNOWN;
break;
}
if (terSUCCESS != result)
{
mLedger = Ledger::pointer();
return result;
default:
std::cerr << "applyTransaction: Invalid transaction: unknown transaction type" << std::endl;
result = tenUNKNOWN;
break;
}
}
STAmount saPaid = txn.getTransactionFee();
if ((params & tepNO_CHECK_FEE) == tepNONE)
if (terSUCCESS == result && (params & tepNO_CHECK_FEE) == tepNONE)
{
if (saCost)
{
if (saPaid < saCost)
{
std::cerr << "applyTransaction: insufficient fee" << std::endl;
mLedger = Ledger::pointer();
return tenINSUF_FEE_P;
result = tenINSUF_FEE_P;
}
}
else
@@ -408,123 +409,146 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran
{
// Transaction is malformed.
std::cerr << "applyTransaction: fee not allowed" << std::endl;
mLedger = Ledger::pointer();
return tenINSUF_FEE_P;
result = tenINSUF_FEE_P;
}
}
}
// Get source account ID.
uint160 srcAccountID = txn.getSourceAccount().getAccountID();
if (!srcAccountID)
if (terSUCCESS == result && !srcAccountID)
{
std::cerr << "applyTransaction: bad source id" << std::endl;
return tenINVALID;
result = tenINVALID;
}
if (terSUCCESS != result)
{
// Avoid unnecessary locking.
mLedger = Ledger::pointer();
return result;
}
boost::recursive_mutex::scoped_lock sl(mLedger->mLock);
// find source account
// If are only forwarding, due to resource limitations, we might verifying only some transactions, this would be probablistic.
STAmount saSrcBalance;
uint32 t_seq = txn.getSequence();
LedgerStateParms lspRoot = lepNONE;
SLE::pointer sleSrc = mLedger->getAccountRoot(lspRoot, srcAccountID);
if (!sleSrc)
{
std::cerr << str(boost::format("applyTransaction: Delay transaction: source account does not exisit: %s") % txn.getSourceAccount().humanAccountID()) << std::endl;
mLedger = Ledger::pointer();
return terNO_ACCOUNT;
result = terNO_ACCOUNT;
}
else
{
saSrcBalance = sleSrc->getIValueFieldAmount(sfBalance);
}
// Check if account cliamed.
switch (txn.getTxnType())
if (terSUCCESS == result)
{
case ttCLAIM:
if (sleSrc->getIFieldPresent(sfAuthorizedKey))
{
std::cerr << "applyTransaction: Account already claimed." << std::endl;
switch (txn.getTxnType())
{
case ttCLAIM:
if (sleSrc->getIFieldPresent(sfAuthorizedKey))
{
std::cerr << "applyTransaction: Account already claimed." << std::endl;
return tenCLAIMED;
}
break;
result = tenCLAIMED;
}
break;
default:
if (!sleSrc->getIFieldPresent(sfAuthorizedKey))
{
std::cerr << "applyTransaction: Souce is an unclaimed account." << std::endl;
default:
if (!sleSrc->getIFieldPresent(sfAuthorizedKey))
{
std::cerr << "applyTransaction: Souce is an unclaimed account." << std::endl;
return tenUNCLAIMED;
}
break;
result = tenUNCLAIMED;
}
break;
}
}
// Consistency: Check signature
switch (txn.getTxnType())
if (terSUCCESS == result)
{
case ttCLAIM:
// Transaction's signing public key must be for the source account.
// To prove the master private key made this transaction.
if (naSigningPubKey.getAccountID() != srcAccountID)
{
// Signing Pub Key must be for Source Account ID.
std::cerr << "sourceAccountID: " << naSigningPubKey.humanAccountID() << std::endl;
std::cerr << "txn accountID: " << txn.getSourceAccount().humanAccountID() << std::endl;
switch (txn.getTxnType())
{
case ttCLAIM:
// Transaction's signing public key must be for the source account.
// To prove the master private key made this transaction.
if (naSigningPubKey.getAccountID() != srcAccountID)
{
// Signing Pub Key must be for Source Account ID.
std::cerr << "sourceAccountID: " << naSigningPubKey.humanAccountID() << std::endl;
std::cerr << "txn accountID: " << txn.getSourceAccount().humanAccountID() << std::endl;
mLedger = Ledger::pointer();
result = tenBAD_CLAIM_ID;
}
break;
return tenBAD_CLAIM_ID;
}
break;
case ttPASSWORD_SET:
// Transaction's signing public key must be for the source account.
// To prove the master private key made this transaction.
if (naSigningPubKey.getAccountID() != srcAccountID)
{
// Signing Pub Key must be for Source Account ID.
std::cerr << "sourceAccountID: " << naSigningPubKey.humanAccountID() << std::endl;
std::cerr << "txn accountID: " << txn.getSourceAccount().humanAccountID() << std::endl;
case ttPASSWORD_SET:
// Transaction's signing public key must be for the source account.
// To prove the master private key made this transaction.
if (naSigningPubKey.getAccountID() != srcAccountID)
{
// Signing Pub Key must be for Source Account ID.
std::cerr << "sourceAccountID: " << naSigningPubKey.humanAccountID() << std::endl;
std::cerr << "txn accountID: " << txn.getSourceAccount().humanAccountID() << std::endl;
result = tenBAD_SET_ID;
}
break;
mLedger = Ledger::pointer();
default:
// Verify the transaction's signing public key is the key authorized for signing.
if (naSigningPubKey.getAccountID() != sleSrc->getIValueFieldAccount(sfAuthorizedKey).getAccountID())
{
std::cerr << "applyTransaction: Not authorized to use account." << std::endl;
return tenBAD_SET_ID;
}
break;
default:
// Verify the transaction's signing public key is the key authorized for signing.
if (naSigningPubKey.getAccountID() != sleSrc->getIValueFieldAccount(sfAuthorizedKey).getAccountID())
{
std::cerr << "applyTransaction: Not authorized to use account." << std::endl;
mLedger = Ledger::pointer();
return tenBAD_AUTH;
}
break;
result = tenBAD_AUTH;
}
break;
}
}
// deduct the fee, so it's not available during the transaction
// we only write the account back if the transaction succeeds
if (!saCost.isZero())
if (terSUCCESS != result || saCost.isZero())
{
STAmount saSrcBalance = sleSrc->getIValueFieldAmount(sfBalance);
if (saSrcBalance < saPaid)
{
std::cerr
<< str(boost::format("applyTransaction: Delay transaction: insufficent balance: balance=%s paid=%s")
% saSrcBalance
% saPaid)
<< std::endl;
mLedger = Ledger::pointer();
return terINSUF_FEE_B;
}
nothing();
}
else if (saSrcBalance < saPaid)
{
std::cerr
<< str(boost::format("applyTransaction: Delay transaction: insufficent balance: balance=%s paid=%s")
% saSrcBalance
% saPaid)
<< std::endl;
result = terINSUF_FEE_B;
}
else
{
sleSrc->setIFieldAmount(sfBalance, saSrcBalance - saPaid);
}
// Validate sequence
uint32 t_seq = txn.getSequence();
if (saCost)
if (terSUCCESS != result)
{
nothing();
}
else if (saCost)
{
uint32 a_seq = sleSrc->getIFieldU32(sfSequence);
@@ -534,88 +558,97 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran
if (a_seq < t_seq)
{
std::cerr << "applyTransaction: future sequence number" << std::endl;
mLedger = Ledger::pointer();
return terPRE_SEQ;
result = terPRE_SEQ;
}
if (mLedger->hasTransaction(txID))
else if (mLedger->hasTransaction(txID))
{
std::cerr << "applyTransaction: duplicate sequence number" << std::endl;
mLedger = Ledger::pointer();
return terALREADY;
}
std::cerr << "applyTransaction: past sequence number" << std::endl;
mLedger = Ledger::pointer();
return terPAST_SEQ;
result = terALREADY;
}
else
{
std::cerr << "applyTransaction: past sequence number" << std::endl;
result = terPAST_SEQ;
}
}
else
{
sleSrc->setIFieldU32(sfSequence, t_seq);
}
else sleSrc->setIFieldU32(sfSequence, t_seq);
}
else
{
if (t_seq)
{
std::cerr << "applyTransaction: bad sequence for pre-paid transaction" << std::endl;
mLedger = Ledger::pointer();
return terPAST_SEQ;
result = terPAST_SEQ;
}
}
std::vector<AffectedAccount> accounts;
accounts.push_back(std::make_pair(taaMODIFY, sleSrc));
switch(txn.getTxnType())
if (terSUCCESS == result)
{
case ttACCOUNT_SET:
result = doAccountSet(txn, accounts);
break;
accounts.push_back(std::make_pair(taaMODIFY, sleSrc));
case ttCLAIM:
result = doClaim(txn, accounts);
break;
switch(txn.getTxnType())
{
case ttACCOUNT_SET:
result = doAccountSet(txn, accounts);
break;
case ttCREDIT_SET:
result = doCreditSet(txn, accounts, srcAccountID);
break;
case ttCLAIM:
result = doClaim(txn, accounts);
break;
case ttINVALID:
std::cerr << "applyTransaction: invalid type" << std::endl;
result = tenINVALID;
break;
case ttCREDIT_SET:
result = doCreditSet(txn, accounts, srcAccountID);
break;
case ttINVOICE:
result = doInvoice(txn, accounts);
break;
case ttINVALID:
std::cerr << "applyTransaction: invalid type" << std::endl;
result = tenINVALID;
break;
case ttOFFER:
result = doOffer(txn, accounts);
break;
case ttINVOICE:
result = doInvoice(txn, accounts);
break;
case ttPASSWORD_FUND:
result = doPasswordFund(txn, accounts, srcAccountID);
break;
case ttOFFER:
result = doOffer(txn, accounts);
break;
case ttPASSWORD_SET:
result = doPasswordSet(txn, accounts);
break;
case ttPASSWORD_FUND:
result = doPasswordFund(txn, accounts, srcAccountID);
break;
case ttPAYMENT:
result = doPayment(txn, accounts, srcAccountID);
break;
case ttPASSWORD_SET:
result = doPasswordSet(txn, accounts);
break;
case ttTRANSIT_SET:
result = doTransitSet(txn, accounts);
break;
case ttPAYMENT:
result = doPayment(txn, accounts, srcAccountID);
break;
case ttWALLET_ADD:
result = doWalletAdd(txn, accounts);
break;
case ttTRANSIT_SET:
result = doTransitSet(txn, accounts);
break;
default:
result = tenUNKNOWN;
break;
case ttWALLET_ADD:
result = doWalletAdd(txn, accounts);
break;
default:
result = tenUNKNOWN;
break;
}
}
if (result == terSUCCESS)
if (terSUCCESS == result)
{ // Write back the account states and add the transaction to the ledger
// WRITEME: Special case code for changing transaction key
for (std::vector<AffectedAccount>::iterator it = accounts.begin(), end = accounts.end();
@@ -651,7 +684,9 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran
if ((params & tepUPDATE_TOTAL) != tepNONE)
mLedger->destroyCoins(saPaid.getNValue());
}
mLedger = Ledger::pointer();
return result;
}
@@ -840,7 +875,10 @@ TransactionEngineResult TransactionEngine::doPasswordFund(const SerializedTransa
uint160 uDstAccountID = txn.getITFieldAccount(sfDestination);
LedgerStateParms qry = lepNONE;
SLE::pointer sleDst = mLedger->getAccountRoot(qry, uDstAccountID);
SLE::pointer sleSrc = accounts[0].second;
SLE::pointer sleDst = uSrcAccountID == uDstAccountID
? sleSrc
: mLedger->getAccountRoot(qry, uDstAccountID);
if (!sleDst)
{
// Destination account does not exist.