add some more setters/getters/deserializers for client use

src/BuyMessage.h

@@ -26,8 +26,11 @@ class BuyMessage {
 
 		~BuyMessage() { /*delete contract;*/ delete escrow; }
 
-		//BuyMessage(const string& s, const BankParameters *bankP)
-		//	: coinPrime(bankP), contract(), escrow() {loadString(*this, s);}
+		BuyMessage(const string& s, const BankParameters *params) {
+			// need to set params for Coin contained in message
+			loadGZString(make_nvp("BuyMessage", *this), s); 
+			coinPrime.setParameters(params);
+		}
 
 		/*! check contents (verify coin and escrow) */
 		bool check(const VEPublicKey* pk, const int stat, const ZZ& R) const;

src/Buyer.cpp

@@ -117,7 +117,12 @@ VECiphertext Buyer::makeEscrow() {
 
 void Buyer::makeCoin(Wallet& w, const ZZ& R) {	
 	// get coin from wallet
-	coin = w.nextCoin(R);
+	setCoin( w.nextCoin(R) );
+}
+
+void Buyer::setCoin(const Coin& c)
+{	
+	coin = c;
 	endorsement = coin.getEndorsement();
 	coin.unendorse();
 }

src/Buyer.h

@@ -62,6 +62,7 @@ class Buyer {
 		bool canAbortLocally() {return !inProgress; };
 
 		// setters
+		void setCoin(const Coin& coin);
 		void setTimeout() { timeout =time(NULL) + timeoutLength; }
 		void setSecurity(const int newstat) {stat = newstat;}
 		void setVEPublicKey(const VEPublicKey* newpk) {pk = newpk;}

src/Coin.h

@@ -60,16 +60,18 @@ class Coin {
 		ZZ getSPrime() const;
 		ZZ getTPrime() const;
 
+		void setParameters(const BankParameters* p) { parameters = p; }
+
 		hash_t hash() const;
 
 	private:
 		int stat, lx, coinDenom;
-		const BankParameters *parameters;
+		const BankParameters *parameters; // NOT serialized
 		int walletSize; // this is W
 		int coinIndex; // this is J
-		ZZ sk_u, s, t;
+		ZZ sk_u, s, t; // NOT serialized
 		ZZ R;
-		hashalg_t hashAlg;
+		hashalg_t hashAlg; // XXX NOT serialized (??)
 		ZZ B, C, D; // B is commitment to sk_u, C to s, and D to t
 		ZZ S, T; // S = g^(1/(s+J)), T = g^(1/(t+J))
 		vector<ZZ> endorsement; // this is x1, x2, r_y

src/FEContract.cpp

@@ -15,8 +15,7 @@ bool FEContract::checkTimeout(int timeoutTolerance) const {
 bool FEContract::checkEncAlgB(const cipher_t& encAlgR) const {
 	if(encAlgB != encAlgR)
 		throw CashException(CashException::CE_FE_ERROR,
-			"[FEContract::checkEncAlgB] Malformed contract (responder encryption "
-			"algorithm does not match)");
+							"[FEContract::checkEncAlgB] Malformed contract (responder encryption algorithm %s does not match %s)", encAlgR.c_str(), encAlgB.c_str());
 	return true;
 }
 

src/FEInitiator.h

@@ -99,6 +99,7 @@ class FEInitiator {
 		void setRegularPublicKey(const VEPublicKey* newpk) {regularPK = newpk;}
 		void setSignatureKey(Signature::Key* newsignKey = NULL)
 		{ delete signKey; signKey = newsignKey ? new Signature::Key(*newsignKey) : NULL; }
+		void setExchangeType(int et) { exchangeType = et; }
 
 		void reset();
 

src/FESetupMessage.h

@@ -28,6 +28,12 @@ class FESetupMessage {
 
 		/*! destructor */
         ~FESetupMessage() { delete signPK; }
+
+		FESetupMessage(const string& s, const BankParameters *params) {
+			// need to set params for Coin contained in message
+			loadGZString(make_nvp("FESetupMessage", *this), s); 
+			coinPrime.setParameters(params);
+		}
 
 		/*! check contents (verify coin and escrow) */
 		bool check(const VEPublicKey* pk, const int stat, const ZZ& R) const;

src/UserWithdrawTool.h

@@ -56,6 +56,7 @@ class UserWithdrawTool {
 
 		ZZ getUserPublicKey() const { return userPublicKey; }
 		int getDenomination() const { return coinDenom; }
+		bool isVerified() const { return verified; }
 
 	private:
 		/*! creates and stores CLBlindRecipient that interacts with

src/Wallet.cpp

@@ -57,10 +57,17 @@ Coin Wallet::nextCoin(const ZZ &rValue) {
 }
 
 Coin* Wallet::newCoin(const ZZ &rValue, int coinIndex) {
-	return new Coin(params, walletSize, coinIndex, sk_u, s, t, signature, stat, 
+	return new Coin(params, walletSize, coinIndex, 
+					sk_u, s, t, signature, stat, 
 					lx, rValue, coinDenom, hashAlg);
 }
 
+void Wallet::newCoin(Coin& coin, const ZZ &rValue, int coinIndex) {
+	coin = Coin(params, walletSize, coinIndex,
+				sk_u, s, t, signature, stat,
+				lx, rValue, coinDenom, hashAlg);
+}
+
 bool Wallet::replaceCoin(ZZ &index) {
 	// check that 0 <= indexArg < walletSize
 	if(index < 0 || index >= walletSize) {

src/Wallet.h

@@ -27,9 +27,18 @@ class Wallet {
 
 		/*! returns a coin for a given index */
 		Coin* newCoin(const ZZ &R, int coinIndex);
+		void newCoin(Coin& coin, const ZZ &R, int coinIndex);
 
 		bool replaceCoin(ZZ &index);
 
+		// some accessors
+		int getWalletSize() const { return walletSize; }
+		int getNumCoinsUsed() const { return numCoinsUsed; }
+		int getNumCoinsLeft() const { return walletSize - numCoinsUsed; }
+		int getDenomination() const { return coinDenom; }
+		int getRemainingValue() const { return getNumCoinsLeft() * coinDenom; }
+		bool empty() const { return (walletSize == numCoinsUsed); }
+
 	private:
 		ZZ sk_u, s, t;
 		int walletSize;