Merge branch 'master' of github.com:jedmccaleb/NewCoin

src/Amount.cpp

@@ -35,9 +35,7 @@ bool STAmount::currencyFromString(uint160& uDstCurrency, const std::string& sCur
 		s.addZeros(16/8);
 		s.addZeros(24/8);
 
-		SerializerIterator	sit(s);
-
-		uDstCurrency	= sit.get160();
+		s.get160(uDstCurrency, 0);
 	}
 	else
 	{
@@ -57,8 +55,8 @@ std::string STAmount::getCurrencyHuman()
 	}
 	else
 	{
-		uint160	uReserved	= mCurrency;
-		Serializer s(160/20);
+		uint160		uReserved	= mCurrency;
+		Serializer	s(160/8);
 
 		s.add160(mCurrency);
 

src/Avalanche.h

@@ -5,14 +5,13 @@
 #include <set>
 
 #include "Transaction.h"
-#include "Hanko.h"
 
 class DisputedTransaction
 {
 protected:
 	Transaction::pointer mTransaction;
-	std::vector<Hanko::pointer> mNodesIncluding;
-	std::vector<Hanko::pointer> mNodesRejecting;
+//	std::vector<Hanko::pointer> mNodesIncluding;
+//	std::vector<Hanko::pointer> mNodesRejecting;
 	uint64 mTimeTaken; // when we took our position on this transaction
 	bool mOurPosition;
 };

src/Hanko.cpp

@@ -9,3 +9,4 @@ Hanko::Hanko()
 {
 }
 
+// vim:ts=4

src/Hanko.h

@@ -39,7 +39,7 @@ public:
         const CKey& GetPublicKey() const { return mPubKey; }
 
         int UpdateContact(std::vector<unsigned char>& Contact);
-        
+
         bool CheckHashSign(const uint256& hash, const std::vector<unsigned char>& Signature);
         bool CheckPrefixSign(const std::vector<unsigned char>& data, uint64 type,
           const std::vector<unsigned char> &signature);
@@ -62,3 +62,4 @@ public:
 };
 
 #endif
+// vim:ts=4

src/Ledger.h

@@ -177,7 +177,7 @@ public:
 	static int getOfferSkip(const uint256& offerId);
 
 	bool isCompatible(boost::shared_ptr<Ledger> other);
-	bool signLedger(std::vector<unsigned char> &signature, const LocalHanko &hanko);
+//	bool signLedger(std::vector<unsigned char> &signature, const LocalHanko &hanko);
 
 	void addJson(Json::Value&);
 

src/Transaction.h

@@ -12,7 +12,6 @@
 #include "key.h"
 #include "uint256.h"
 #include "../obj/src/newcoin.pb.h"
-#include "Hanko.h"
 #include "Serializer.h"
 #include "SHAMap.h"
 #include "SerializedTransaction.h"