From 318d8ec71b2d209df1547c1d19eb06979e3a21e3 Mon Sep 17 00:00:00 2001
From: Arthur Britto <ahbritto@gmail.com>
Date: Sat, 2 Jun 2012 14:23:00 -0700
Subject: [PATCH] Add flags for AccountSet to TransactionFormats.

---
 src/TransactionFormats.cpp | 19 ++++++++-----------
 src/TransactionFormats.h   |  3 +++
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/TransactionFormats.cpp b/src/TransactionFormats.cpp
index 6ed309c4d5..09f95d226b 100644
--- a/src/TransactionFormats.cpp
+++ b/src/TransactionFormats.cpp
@@ -18,7 +18,7 @@ TransactionFormat InnerTxnFormats[]=
 		{ S_FIELD(Flags),			STI_UINT32,  SOE_FLAGS,    0 },
 		{ S_FIELD(Generator),		STI_VL,		 SOE_REQUIRED, 0 },
 		{ S_FIELD(PubKey),			STI_VL,		 SOE_REQUIRED, 0 },
-		{ S_FIELD(Signature),		STI_VL,	  SOE_REQUIRED, 0 },
+		{ S_FIELD(Signature),		STI_VL,		 SOE_REQUIRED, 0 },
 		{ S_FIELD(SourceTag),		STI_UINT32,  SOE_IFFLAG,   1 },
 		{ S_FIELD(Extensions),		STI_TL,		 SOE_IFFLAG,   0x02000000 },
 		{ sfInvalid, NULL,			STI_DONE,	 SOE_NEVER,    -1 } }
@@ -38,23 +38,20 @@ TransactionFormat InnerTxnFormats[]=
 		{ S_FIELD(Flags),			STI_UINT32,  SOE_FLAGS,    0 },
 		{ S_FIELD(Target),			STI_ACCOUNT, SOE_REQUIRED, 0 },
 		{ S_FIELD(Amount),			STI_AMOUNT,  SOE_REQUIRED, 0 },
-		{ S_FIELD(Currency),		STI_HASH160, SOE_IFFLAG,   1 },
-		{ S_FIELD(SourceTag),		STI_UINT32,  SOE_IFFLAG,   2 },
-		{ S_FIELD(Destination),		STI_ACCOUNT, SOE_IFFLAG,   4 },
-		{ S_FIELD(Identifier),		STI_VL,		 SOE_IFFLAG,   8 },
+		{ S_FIELD(SourceTag),		STI_UINT32,  SOE_IFFLAG,   1 },
+		{ S_FIELD(Destination),		STI_ACCOUNT, SOE_IFFLAG,   2 },
+		{ S_FIELD(Identifier),		STI_VL,		 SOE_IFFLAG,   4 },
 		{ S_FIELD(Extensions),		STI_TL,		 SOE_IFFLAG,   0x02000000 },
 		{ sfInvalid, NULL,			STI_DONE,	 SOE_NEVER,    -1 } }
 	},
 	{ "Offer", ttOFFER, {
 		{ S_FIELD(Flags),			STI_UINT32,  SOE_FLAGS,    0 },
 		{ S_FIELD(AmountIn),		STI_AMOUNT,  SOE_REQUIRED, 0 },
-		{ S_FIELD(CurrencyIn),		STI_HASH160, SOE_IFFLAG,   2 },
 		{ S_FIELD(AmountOut),		STI_AMOUNT,  SOE_REQUIRED, 0 },
-		{ S_FIELD(CurrencyOut),		STI_HASH160, SOE_IFFLAG,   4 },
-		{ S_FIELD(SourceTag),		STI_UINT32,  SOE_IFFLAG,   8 },
-		{ S_FIELD(Destination),		STI_ACCOUNT, SOE_IFFLAG,   16 },
-		{ S_FIELD(ExpireLedger),	STI_UINT32,  SOE_IFFLAG,   32 },
-		{ S_FIELD(Identifier),		STI_VL,		 SOE_IFFLAG,   64 },
+		{ S_FIELD(SourceTag),		STI_UINT32,  SOE_IFFLAG,   1 },
+		{ S_FIELD(Destination),		STI_ACCOUNT, SOE_IFFLAG,   2 },
+		{ S_FIELD(ExpireLedger),	STI_UINT32,  SOE_IFFLAG,   4 },
+		{ S_FIELD(Identifier),		STI_VL,		 SOE_IFFLAG,   8 },
 		{ S_FIELD(Extensions),		STI_TL,		 SOE_IFFLAG,   0x02000000 },
 		{ sfInvalid, NULL,			STI_DONE,	 SOE_NEVER,    -1 } }
 	},
diff --git a/src/TransactionFormats.h b/src/TransactionFormats.h
index 1297169047..f8e8a34ed2 100644
--- a/src/TransactionFormats.h
+++ b/src/TransactionFormats.h
@@ -37,6 +37,9 @@ const int TransactionMaxLen			= 1048576;
 // Transaction flags.
 const uint32 tfCreateAccount		= 0x00010000;
 
+const uint32 tfUnsetEmailHash		= 0x00010000;
+const uint32 tfUnsetWalletLocator	= 0x00020000;
+
 extern TransactionFormat InnerTxnFormats[];
 extern TransactionFormat* getTxnFormat(TransactionType t);
 #endif