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

Cleanup, debug, extra JSON info.

Browse Source
This commit is contained in:
JoelKatz
2012-01-17 20:39:41 -08:00
parent 93c7333c58
commit f1052e0706
2 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Transaction.cpp
View File

@@ -1,3 +1,5 @@
#include <cassert>
#include "boost/lexical_cast.hpp"
#include "Application.h"
@@ -16,15 +18,27 @@ Transaction::Transaction() : mTransactionID(0), mAccountFrom(0), mAccountTo(0),
Transaction::Transaction(LocalAccount::pointer fromLocalAccount, const uint160& toAccount, uint64 amount,
uint32 ident, uint32 ledger) :
mAccountTo(toAccount), mAmount(amount), mSourceLedger(ledger), mIdent(ident), mInLedger(0), mStatus(NEW)
mAccountTo(toAccount), mAmount(amount), mSourceLedger(ledger), mIdent(ident), mInLedger(0), mStatus(NEW)
{
mAccountFrom=fromLocalAccount->getAddress();
mFromPubKey=fromLocalAccount->getPublicKey();
mFromAccountSeq=fromLocalAccount->getAcctSeq();
if(!mFromAccountSeq) mStatus=INCOMPLETE;
if(!mFromAccountSeq)
{
#ifdef DEBUG
std::cerr << "Bad source account sequence" << std::endl;
#endif
mStatus=INCOMPLETE;
}
assert(mFromPubKey);
updateFee();
if(!sign(fromLocalAccount)) mStatus=INCOMPLETE;
if(!sign(fromLocalAccount))
{
#ifdef DEBUG
std::cerr << "Unable to sign transaction" << std::endl;
#endif
mStatus=INCOMPLETE;
}
}
Transaction::Transaction(const std::vector<unsigned char> &t, bool validate) : mStatus(INVALID)
@@ -54,15 +68,27 @@ Transaction::Transaction(const std::vector<unsigned char> &t, bool validate) : m
bool Transaction::sign(LocalAccount::pointer fromLocalAccount)
{
CKey::pointer privateKey=fromLocalAccount->getPrivateKey();
if(!privateKey) return false;
if(!privateKey)
{
#ifdef DEBUG
std::cerr << "No private key for signing" << std::endl;
#endif
return false;
}
if( (mAmount==0) || (mSourceLedger==0) || (mAccountTo==0) )
{
#ifdef DEBUG
std::cerr << "Bad amount, source ledger, or destination" << std::endl;
#endif
assert(false);
return false;
}
if(mAccountFrom!=fromLocalAccount->getAddress())
{
#ifdef DEBUG
std::cerr << "Source mismatch" << std::endl;
#endif
assert(false);
return false;
}
@@ -70,6 +96,9 @@ bool Transaction::sign(LocalAccount::pointer fromLocalAccount)
assert(signBuf->getLength()==73+4);
if(!signBuf->makeSignature(mSignature, *privateKey))
{
#ifdef DEBUG
std::cerr << "Failed to make signature" << std::endl;
#endif
assert(false);
return false;
}