From 3f0c87588eef3c767a3ef2c66742a7cd09a35af1 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Fri, 28 Sep 2012 19:12:07 -0700
Subject: [PATCH] Small changes to support new transaction serialization code.

---
 src/Transaction.cpp       | 9 ++-------
 src/TransactionEngine.cpp | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/Transaction.cpp b/src/Transaction.cpp
index 526f433bf1..863e8e834c 100644
--- a/src/Transaction.cpp
+++ b/src/Transaction.cpp
@@ -18,7 +18,7 @@ Transaction::Transaction(const SerializedTransaction::pointer& sit, bool bValida
 {
 	try
 	{
-		mFromPubKey.setAccountPublic(mTransaction->peekSigningPubKey());
+		mFromPubKey.setAccountPublic(mTransaction->getSigningPubKey());
 		mTransactionID	= mTransaction->getTransactionID();
 		mAccountFrom	= mTransaction->getSourceAccount();
 	}
@@ -92,12 +92,7 @@ bool Transaction::sign(const NewcoinAddress& naAccountPrivate)
 		Log(lsWARNING) << "No private key for signing";
 		bResult	= false;
 	}
-	else if (!getSTransaction()->sign(naAccountPrivate))
-	{
-		Log(lsWARNING) << "Failed to make signature";
-		assert(false);
-		bResult	= false;
-	}
+	getSTransaction()->sign(naAccountPrivate);
 
 	if (bResult)
 	{
diff --git a/src/TransactionEngine.cpp b/src/TransactionEngine.cpp
index 3dc45c7c15..55f252dda6 100644
--- a/src/TransactionEngine.cpp
+++ b/src/TransactionEngine.cpp
@@ -105,7 +105,7 @@ TER TransactionEngine::applyTransaction(const SerializedTransaction& txn, Transa
 	NewcoinAddress	naSigningPubKey;
 
 	if (tesSUCCESS == terResult)
-		naSigningPubKey	= NewcoinAddress::createAccountPublic(txn.peekSigningPubKey());
+		naSigningPubKey	= NewcoinAddress::createAccountPublic(txn.setSigningPubKey());
 
 	// Consistency: really signed.
 	if ((tesSUCCESS == terResult) && !isSetBit(params, tapNO_CHECK_SIGN) && !txn.checkSign(naSigningPubKey))