ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Format fixes. Transaction fee functions.

Browse Source
This commit is contained in:
JoelKatz
2012-03-22 20:50:34 -07:00
parent 2af323086f
commit 4ac2aefe48
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/SerializedTransaction.cpp
View File

@@ -7,8 +7,9 @@ SerializedTransaction::SerializedTransaction(TransactionType type)
if(mFormat==NULL) throw(std::runtime_error("invalid transaction type"));
mMiddleTxn.giveObject(new STUInt32("Magic", TransactionMagic));
mMiddleTxn.giveObject(new STVariableLength("Signature")); // signature
mMiddleTxn.giveObject(new STVariableLength("SigningAccount"));
mMiddleTxn.giveObject(new STUInt8("Type", static_cast<unsigned char>(type)));
mMiddleTxn.giveObject(new STUInt64("Fee"));
mInnerTxn=STObject(mFormat->elements, "InnerTransaction");
}
@@ -25,12 +26,13 @@ SerializedTransaction::SerializedTransaction(SerializerIterator& sit, int length
throw(std::runtime_error("Transaction has invalid magic"));
mMiddleTxn.giveObject(new STUInt32("Magic", TransactionMagic));
mMiddleTxn.giveObject(new STVariableLength("Signature", sit.getVL()));
mMiddleTxn.giveObject(new STVariableLength("SigningAccount", sit.getVL()));
int type=sit.get32();
mMiddleTxn.giveObject(new STUInt32("Type", type));
mFormat=getFormat(static_cast<TransactionType>(type));
if(!mFormat) throw(std::runtime_error("Transaction has invalid type"));
mMiddleTxn.giveObject(new STUInt64("Fee", sit.get64()));
mInnerTxn=STObject(mFormat->elements, sit, "InnerTransaction");
}
@@ -112,3 +114,17 @@ void SerializedTransaction::setVersion(uint32 ver)
if(!v) throw(std::runtime_error("corrupt transaction"));
v->setValue(ver);
}
uint64 SerializedTransaction::getTransactionFee() const
{
const STUInt64* v=dynamic_cast<const STUInt64*>(mMiddleTxn.peekAtP(3));
if(!v) throw(std::runtime_error("corrupt transaction"));
return v->getValue();
}
void SerializedTransaction::setTransactionFee(uint64 fee)
{
STUInt64* v=dynamic_cast<STUInt64*>(mMiddleTxn.getAtP(3));
if(!v) throw(std::runtime_error("corrupt transaction"));
v->setValue(fee);
}

2
src/SerializedTransaction.h
View File

@@ -35,7 +35,7 @@ public:
// middle transaction functions
uint32 getVersion() const;
void setVersion(uint32);
int getTransactionType() const;
TransactionType getTxnType() const { return type; }
uint64 getTransactionFee() const;
void setTransactionFee(uint64);