diff --git a/Transaction.cpp b/Transaction.cpp index e3431e4e1..88cab7fc7 100644 --- a/Transaction.cpp +++ b/Transaction.cpp @@ -21,36 +21,36 @@ Transaction::Transaction(TransStatus status, LocalAccount &fromLocalAccount, con assert((fromSeq+1)==fromLocalAccount.mSeqNum); mAccountFrom=fromAccount.GetAddress(); - Sign(fromLocalAccount, fromAccount); + sign(fromLocalAccount, fromAccount); } -bool Transaction::Sign(LocalAccount &fromLocalAccount, const Account &fromAccount) +bool Transaction::sign(LocalAccount &fromLocalAccount, const Account &fromAccount) { if( (mAmount==0) || (mSourceLedger==0) || (mAccountTo==0) ) return false; if((mAccountFrom!=fromLocalAccount.mAddress)||(mAccountFrom!=fromAccount.GetAddress())) return false; - UpdateHash(); + updateHash(); std::vector toSign, Signature; - if(!GetRawUnsigned(toSign, fromAccount)) return false; + if(!getRawUnsigned(toSign, fromAccount)) return false; if(!fromLocalAccount.SignRaw(toSign, Signature)) return false; mSignature=Signature; return true; } -bool Transaction::CheckSign(const Account &fromAccount) const +bool Transaction::checkSign(const Account &fromAccount) const { if(mAccountFrom!=fromAccount.GetAddress()) return false; std::vector toSign; - if(!GetRawUnsigned(toSign, fromAccount)) return false; + if(!getRawUnsigned(toSign, fromAccount)) return false; return fromAccount.CheckSignRaw(toSign, mSignature); } -bool Transaction::GetRawUnsigned(std::vector &raw, const Account &fromAccount) const +bool Transaction::getRawUnsigned(std::vector &raw, const Account &fromAccount) const { raw.clear(); diff --git a/Transaction.h b/Transaction.h index 7068bb09d..779a17f79 100644 --- a/Transaction.h +++ b/Transaction.h @@ -4,6 +4,7 @@ #include "uint256.h" #include "newcoin.pb.h" #include "Hanko.h" +#include "Serializer.h" #include #include #include @@ -46,28 +47,28 @@ public: Transaction(); Transaction(const std::vector rawTransaction); Transaction(const std::string sqlReply); - Transaction(TransStatus Status, LocalAccount &fromLocal, const Account &from, - uint32 fromSeq, const uint160 &to, uint64 amount, uint32 ident, uint32 ledger); + Transaction(TransStatus Status, LocalAccount& fromLocal, const Account& from, + uint32 fromSeq, const uint160& to, uint64 amount, uint32 ident, uint32 ledger); - bool Sign(LocalAccount &fromLocalAccount, const Account &fromAccount); - bool CheckSign(const Account &fromAccount) const; + bool sign(LocalAccount& fromLocalAccount, const Account& fromAccount); + bool checkSign(const Account& fromAccount) const; - bool GetRawUnsigned(std::vector &raw, const Account &from) const; - bool GetRawSigned(std::vector &raw, const Account &from) const; + Serializer::pointer getRawUnsigned(const Account& from) const; + Serializer::pointer getRawSigned(const Account& from) const; - const uint256& GetID() const { return mTransactionID; } - const uint160& GetFromAccount() const { return mAccountFrom; } - const uint160& GetToAccount() const { return mAccountTo; } - uint64 GetAmount() const { return mAmount; } - uint32 GetFromAccountSeq() const { return mFromAccountSeq; } - uint32 GetSourceLedger() const { return mSourceLedger; } - uint32 GetIdent() const { return mIdent; } - const std::vector& GetSignature() const { return mSignature; } - uint32 GetLedger() const { return mInLedger; } - TransStatus GetStatus() const { return mStatus; } + const uint256& getID() const { return mTransactionID; } + const uint160& getFromAccount() const { return mAccountFrom; } + const uint160& getToAccount() const { return mAccountTo; } + uint64 getAmount() const { return mAmount; } + uint32 getFromAccountSeq() const { return mFromAccountSeq; } + uint32 getSourceLedger() const { return mSourceLedger; } + uint32 getIdent() const { return mIdent; } + const std::vector& getSignature() const { return mSignature; } + uint32 getLedger() const { return mInLedger; } + TransStatus getStatus() const { return mStatus; } - void SetStatus(TransStatus st); - void SetLedger(uint32 Ledger); + void setStatus(TransStatus st); + void setLedger(uint32 Ledger); bool operator<(const Transaction &) const; bool operator>(const Transaction &) const;