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

Allow master seed to be used to authorize transactions.

Browse Source
This commit is contained in:
Arthur Britto
2012-06-10 15:45:47 -07:00
parent 90f07cbef6
commit 85d774e7f6
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/TransactionEngine.cpp
View File

@@ -463,6 +463,7 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran
saSrcBalance = sleSrc->getIValueFieldAmount(sfBalance);
}
bool bHaveAuthKey = sleSrc->getIFieldPresent(sfAuthorizedKey);
// Check if account cliamed.
if (terSUCCESS == result)
@@ -470,7 +471,7 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran
switch (txn.getTxnType())
{
case ttCLAIM:
if (sleSrc->getIFieldPresent(sfAuthorizedKey))
if (bHaveAuthKey)
{
std::cerr << "applyTransaction: Account already claimed." << std::endl;
@@ -479,13 +480,7 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran
break;
default:
if (!sleSrc->getIFieldPresent(sfAuthorizedKey))
{
std::cerr << "applyTransaction: Source is an unclaimed account." << std::endl;
result = terUNCLAIMED;
}
nothing();
break;
}
}
@@ -523,18 +518,34 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran
default:
// Verify the transaction's signing public key is the key authorized for signing.
if (naSigningPubKey.getAccountID() != sleSrc->getIValueFieldAccount(sfAuthorizedKey).getAccountID())
if (bHaveAuthKey && naSigningPubKey.getAccountID() == sleSrc->getIValueFieldAccount(sfAuthorizedKey).getAccountID())
{
// Authorized to continue.
nothing();
}
else if (naSigningPubKey.getAccountID() == srcAccountID)
{
// Authorized to continue.
nothing();
}
else if (bHaveAuthKey)
{
std::cerr << "applyTransaction: Delay: Not authorized to use account." << std::endl;
result = terBAD_AUTH;
}
else
{
std::cerr << "applyTransaction: Invalid: Not authorized to use account." << std::endl;
result = tenBAD_AUTH_MASTER;
}
break;
}
}
// deduct the fee, so it's not available during the transaction
// we only write the account back if the transaction succeeds
// Deduct the fee, so it's not available during the transaction.
// Will only write the account back, if the transaction succeeds.
if (terSUCCESS != result || saCost.isZero())
{
nothing();
@@ -542,7 +553,7 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran
else if (saSrcBalance < saPaid)
{
std::cerr
<< str(boost::format("applyTransaction: Delay transaction: insufficent balance: balance=%s paid=%s")
<< str(boost::format("applyTransaction: Delay: insufficent balance: balance=%s paid=%s")
% saSrcBalance.getText()
% saPaid.getText())
<< std::endl;

1
src/TransactionEngine.h
View File

@@ -27,6 +27,7 @@ enum TransactionEngineResult
tenCLAIMED = -200, // Can not claim a previously claimed account.
tenCREATED, // Can't add an already created account.
tenMSG_SET, // Can't change a message key.
tenBAD_AUTH_MASTER, // Auth for unclaimed account needs correct master key.
// Other
tenFAILED = -100, // Something broke horribly