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

Bugfixes.

Browse Source
This commit is contained in:
JoelKatz
2012-05-13 18:51:43 -07:00
parent 59f811a095
commit e217f30bfd
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/SerializedTransaction.cpp
View File

@@ -8,6 +8,7 @@ SerializedTransaction::SerializedTransaction(TransactionType type) : mType(type)
mMiddleTxn.giveObject(new STUInt32("Magic", TransactionMagic)); mMiddleTxn.giveObject(new STUInt32("Magic", TransactionMagic));
mMiddleTxn.giveObject(new STVariableLength("SigningPubKey")); mMiddleTxn.giveObject(new STVariableLength("SigningPubKey"));
mMiddleTxn.giveObject(new STAccount("SourceAccount"));
mMiddleTxn.giveObject(new STUInt32("Sequence")); mMiddleTxn.giveObject(new STUInt32("Sequence"));
mMiddleTxn.giveObject(new STUInt8("Type", static_cast<unsigned char>(type))); mMiddleTxn.giveObject(new STUInt8("Type", static_cast<unsigned char>(type)));
mMiddleTxn.giveObject(new STUInt64("Fee")); mMiddleTxn.giveObject(new STUInt64("Fee"));
@@ -29,6 +30,7 @@ SerializedTransaction::SerializedTransaction(SerializerIterator& sit, int length
mMiddleTxn.giveObject(new STUInt32("Magic", TransactionMagic)); mMiddleTxn.giveObject(new STUInt32("Magic", TransactionMagic));
mMiddleTxn.giveObject(new STVariableLength("SigningPubKey", sit.getVL())); mMiddleTxn.giveObject(new STVariableLength("SigningPubKey", sit.getVL()));
mMiddleTxn.giveObject(new STAccount("SourceAccount", sit.getVL()));
mMiddleTxn.giveObject(new STUInt32("Sequence", sit.get32())); mMiddleTxn.giveObject(new STUInt32("Sequence", sit.get32()));
mType = static_cast<TransactionType>(sit.get32()); mType = static_cast<TransactionType>(sit.get32());
@@ -224,10 +226,9 @@ const NewcoinAddress& SerializedTransaction::setSourceAccount(const NewcoinAddre
{ {
mSourceAccount = naSource; mSourceAccount = naSource;
STHash160* v = dynamic_cast<STHash160*>(mMiddleTxn.getPIndex(TransactionISourceID)); STAccount* v = dynamic_cast<STAccount*>(mMiddleTxn.getPIndex(TransactionISourceID));
if (!v) throw std::runtime_error("corrupt transaction"); if (!v) throw std::runtime_error("corrupt transaction");
v->setValue(mSourceAccount.getAccountID()); v->setValueNCA(mSourceAccount);
return mSourceAccount; return mSourceAccount;
} }

1
src/Transaction.cpp
View File

@@ -27,7 +27,6 @@ Transaction::Transaction(const NewcoinAddress& naPublicKey, const NewcoinAddress
mTransaction->setSourceAccount(mAccountFrom); mTransaction->setSourceAccount(mAccountFrom);
mTransaction->setSequence(iSeq); mTransaction->setSequence(iSeq);
assert(mTransaction->getSequence() != 0);
mTransaction->setTransactionFee(100); // for now mTransaction->setTransactionFee(100); // for now