From 0f80dff0882eb8bea88f7ee9ebaca87f92544e58 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Mon, 25 Jun 2012 09:11:47 -0700 Subject: [PATCH] Use new hash prefixes. --- src/SerializedTransaction.cpp | 6 ++++-- src/TransactionFormats.h | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SerializedTransaction.cpp b/src/SerializedTransaction.cpp index 16334e89d0..bab0a4a9f5 100644 --- a/src/SerializedTransaction.cpp +++ b/src/SerializedTransaction.cpp @@ -1,8 +1,9 @@ #include "SerializedTransaction.h" -#include "Application.h" +#include "Application.h" #include "Log.h" +#include "HashPrefixes.h" SerializedTransaction::SerializedTransaction(TransactionType type) : mType(type) { @@ -126,7 +127,7 @@ bool SerializedTransaction::isEquivalent(const SerializedType& t) const uint256 SerializedTransaction::getSigningHash() const { Serializer s; - s.add32(TransactionMagic); + s.add32(sHP_TransactionSign); mMiddleTxn.add(s); mInnerTxn.add(s); return s.getSHA512Half(); @@ -135,6 +136,7 @@ uint256 SerializedTransaction::getSigningHash() const uint256 SerializedTransaction::getTransactionID() const { // perhaps we should cache this Serializer s; + s.add32(sHP_TransactionID); mSignature.add(s); mMiddleTxn.add(s); mInnerTxn.add(s); diff --git a/src/TransactionFormats.h b/src/TransactionFormats.h index 3f053521f2..d8c8fc38df 100644 --- a/src/TransactionFormats.h +++ b/src/TransactionFormats.h @@ -26,8 +26,6 @@ struct TransactionFormat SOElement elements[16]; }; -const int32 TransactionMagic = 0x54584E00; // 'TXN' - const int TransactionISigningPubKey = 0; const int TransactionISourceID = 1; const int TransactionISequence = 2;