Move serialization and error code stuff into ripple_data

2025-11-29 07:25:51 +00:00 · 2013-06-03 18:34:32 -07:00
parent 045c3cc01f
commit 3fafde063f
39 changed files with 245 additions and 263 deletions
--- a/modules/ripple_data/format/ripple_FieldNames.cpp
+++ b/modules/ripple_data/format/ripple_FieldNames.cpp
@@ -14,7 +14,7 @@ SField sfIndex(STI_HASH256, 258, "index");

 #define FIELD(name, type, index) SField sf##name(FIELD_CODE(STI_##type, index), STI_##type, index, #name);
 #define TYPE(name, type, index)
-#include "modules/ripple_data/types/ripple_SerializeDeclarations.h"
+#include "../format/ripple_SerializeDeclarations.h"
 #undef FIELD
 #undef TYPE

@@ -65,7 +65,7 @@ SField::ref SField::getField(int code)

 #define FIELD(name, type, index)
 #define TYPE(name, type, index) case STI_##type:
-#include "modules/ripple_data/types/ripple_SerializeDeclarations.h"
+#include "../format/ripple_SerializeDeclarations.h"
 #undef FIELD
 #undef TYPE

--- a/modules/ripple_data/format/ripple_FieldNames.h
+++ b/modules/ripple_data/format/ripple_FieldNames.h
@@ -1,10 +1,7 @@
 #ifndef RIPPLE_FIELDNAMES_H
 #define RIPPLE_FIELDNAMES_H

-#include <string>
-
-#include <boost/thread/mutex.hpp>
-
+// VFALCO: TODO, lose the macro.
 #define FIELD_CODE(type, index) ((static_cast<int>(type) << 16) | index)

 enum SerializedTypeID
@@ -16,7 +13,7 @@ enum SerializedTypeID

 #define TYPE(name, field, value) STI_##field = value,
 #define FIELD(name, field, value)
-#include "modules/ripple_data/types/ripple_SerializeDeclarations.h"
+#include "../format/ripple_SerializeDeclarations.h"
 #undef TYPE
 #undef FIELD

@@ -48,13 +45,6 @@ public:
 	static const int sMD_Always			= 0x10; // value when node containing it is affected at all
 	static const int sMD_Default		= sMD_ChangeOrig | sMD_ChangeNew | sMD_DeleteFinal | sMD_Create;

-protected:
-	static std::map<int, ptr>	codeToField;
-	static boost::mutex			mapMutex;
-	static int 					num;
-
-	SField(SerializedTypeID id, int val);
-
 public:

 	const int				fieldCode;		// (type<<16)|index
@@ -120,13 +110,21 @@ public:
 	bool operator!=(const SField& f) const { return fieldCode != f.fieldCode; }

 	static int compare(SField::ref f1, SField::ref f2);
+
+    // VFALCO: TODO, make these private
+protected:
+	static std::map<int, ptr>	codeToField;
+	static boost::mutex			mapMutex;
+	static int 					num;
+
+	SField(SerializedTypeID id, int val);
 };

 extern SField sfInvalid, sfGeneric, sfLedgerEntry, sfTransaction, sfValidation;

 #define FIELD(name, type, index) extern SField sf##name;
 #define TYPE(name, type, index)
-#include "modules/ripple_data/types/ripple_SerializeDeclarations.h"
+#include "../format/ripple_SerializeDeclarations.h"
 #undef FIELD
 #undef TYPE

--- a/modules/ripple_data/format/ripple_LedgerFormat.cpp
+++ b/modules/ripple_data/format/ripple_LedgerFormat.cpp
@@ -1,6 +1,9 @@

-std::map<int, LedgerEntryFormat*> LedgerEntryFormat::byType;
-std::map<std::string, LedgerEntryFormat*> LedgerEntryFormat::byName;
+std::map <int, LedgerEntryFormat*> LedgerEntryFormat::byType;
+
+std::map <std::string, LedgerEntryFormat*> LedgerEntryFormat::byName;
+
+// VFALCO: TODO, surely we can think of a better way than macros?

 #define LEF_BASE											\
 	<< SOElement(sfLedgerIndex,				SOE_OPTIONAL)	\
--- a/modules/ripple_data/format/ripple_LedgerFormat.h
+++ b/modules/ripple_data/format/ripple_LedgerFormat.h
@@ -1,7 +1,5 @@
-#ifndef __LEDGERFORMATS__
-#define __LEDGERFORMATS__
-
-#include "SerializedObject.h"
+#ifndef RIPPLE_LEDGERFORMAT_H
+#define RIPPLE_LEDGERFORMAT_H

 // Used as the type of a transaction or the type of a ledger entry.
 enum LedgerEntryType
--- a/modules/ripple_data/format/ripple_RippleAddress.cpp
+++ b/modules/ripple_data/format/ripple_RippleAddress.cpp
--- a/modules/ripple_data/format/ripple_RippleAddress.h
+++ b/modules/ripple_data/format/ripple_RippleAddress.h
--- a/modules/ripple_data/format/ripple_SerializeDeclarations.h
+++ b/modules/ripple_data/format/ripple_SerializeDeclarations.h
--- a/modules/ripple_data/format/ripple_SerializedObject.cpp
+++ b/modules/ripple_data/format/ripple_SerializedObject.cpp
--- a/modules/ripple_data/format/ripple_SerializedObject.h
+++ b/modules/ripple_data/format/ripple_SerializedObject.h
@@ -1,11 +1,5 @@
-#ifndef __SERIALIZEDOBJECT__
-#define __SERIALIZEDOBJECT__
-
-#include <vector>
-
-#include <boost/ptr_container/ptr_vector.hpp>
-
-#include "SerializedTypes.h"
+#ifndef RIPPLE_SERIALIZEDOBJECT_H
+#define RIPPLE_SERIALIZEDOBJECT_H

 DEFINE_INSTANCE(SerializedObject);
 DEFINE_INSTANCE(SerializedArray);
--- a/modules/ripple_data/format/ripple_SerializedTypes.cpp
+++ b/modules/ripple_data/format/ripple_SerializedTypes.cpp
--- a/modules/ripple_data/format/ripple_SerializedTypes.h
+++ b/modules/ripple_data/format/ripple_SerializedTypes.h
@@ -1,9 +1,8 @@
-#ifndef __SERIALIZEDTYPES__
-#define __SERIALIZEDTYPES__
-
-#include <vector>
-#include <string>
+#ifndef RIPPLE_SERIALIZEDTYPES_H
+#define RIPPLE_SERIALIZEDTYPES_H

+// VFALCO: TODO, fix this restriction on copy assignment.
+//
 // CAUTION: Do not create a vector (or similar container) of any object derived from
 // SerializedType. Use Boost ptr_* containers. The copy assignment operator of
 // SerializedType has semantics that will cause contained types to change their names
--- a/modules/ripple_data/format/ripple_Serializer.cpp
+++ b/modules/ripple_data/format/ripple_Serializer.cpp
--- a/modules/ripple_data/format/ripple_Serializer.h
+++ b/modules/ripple_data/format/ripple_Serializer.h
--- a/modules/ripple_data/format/ripple_TER.cpp
+++ b/modules/ripple_data/format/ripple_TER.cpp
--- a/modules/ripple_data/format/ripple_TER.h
+++ b/modules/ripple_data/format/ripple_TER.h
@@ -1,8 +1,12 @@
-#ifndef _TRANSACTION_ERR_
-#define _TRANSACTION_ERR_
-
-#include <string>
+#ifndef RIPPLE_TER_H
+#define RIPPLE_TER_H

+// VFALCO: TODO do not use auto-incrementing. Explicitly assign each
+//              constant so there is no possibility of someone coming in
+//              and screwing it up.
+//
+// VFALCO: TODO, consider renaming TER to TxErr or TxResult for clarity.
+//
 enum TER	// aka TransactionEngineResult
 {
 	// Note: Range is stable.  Exact numbers are currently unstable.  Use tokens.
@@ -13,7 +17,7 @@ enum TER	// aka TransactionEngineResult
 	// - Not forwarded
 	// - No fee check
 	telLOCAL_ERROR	= -399,
-	telBAD_DOMAIN,
+	telBAD_DOMAIN, // VFALCO: TODO, should read "telBAD_DOMAIN = -398," etc...
 	telBAD_PATH_COUNT,
 	telBAD_PUBLIC_KEY,
 	telFAILED_PROCESSING,
@@ -139,6 +143,7 @@ enum TER	// aka TransactionEngineResult
 	tecUNFUNDED					= 129,	// Deprecated, old ambiguous unfunded.
 };

+// VFALCO: TODO, change these to normal functions.
 #define isTelLocal(x)		((x) >= telLOCAL_ERROR && (x) < temMALFORMED)
 #define isTemMalformed(x)	((x) >= temMALFORMED && (x) < tefFAILURE)
 #define isTefFailure(x)		((x) >= tefFAILURE && (x) < terRETRY)
@@ -146,9 +151,10 @@ enum TER	// aka TransactionEngineResult
 #define isTesSuccess(x)		((x) == tesSUCCESS)
 #define isTecClaim(x)		((x) >= tecCLAIM)

-bool transResultInfo(TER terCode, std::string& strToken, std::string& strHuman);
-std::string transToken(TER terCode);
-std::string transHuman(TER terCode);
+// VFALCO: TODO, group these into a shell class along with the defines above.
+extern bool transResultInfo (TER terCode, std::string& strToken, std::string& strHuman);
+extern std::string transToken (TER terCode);
+extern std::string transHuman (TER terCode);

 #endif
 // vim:ts=4
--- a/modules/ripple_data/format/ripple_TransactionFormat.cpp
+++ b/modules/ripple_data/format/ripple_TransactionFormat.cpp
@@ -1,7 +1,9 @@

 std::map<int, TransactionFormat*> TransactionFormat::byType;
+
 std::map<std::string, TransactionFormat*> TransactionFormat::byName;

+// VFALCO: TODO, surely we can think of a better way than to use macros??
 #define TF_BASE												\
 		<< SOElement(sfTransactionType,		SOE_REQUIRED)	\
 		<< SOElement(sfFlags,				SOE_OPTIONAL)	\
--- a/modules/ripple_data/format/ripple_TransactionFormat.h
+++ b/modules/ripple_data/format/ripple_TransactionFormat.h
@@ -1,8 +1,5 @@
-#ifndef __TRANSACTIONFORMATS__
-#define __TRANSACTIONFORMATS__
-
-#include "SerializedObject.h"
-#include "LedgerFormats.h"
+#ifndef RIPPLE_TRANSACTIONFORMAT_H
+#define RIPPLE_TRANSACTIONFORMAT_H

 enum TransactionType
 {
--- a/modules/ripple_data/ripple_data.cpp
+++ b/modules/ripple_data/ripple_data.cpp
@@ -22,45 +22,30 @@
    @ingroup ripple_data
 */

-// RippleAddress
 #include <algorithm>
 #include <cassert>
 #include <iostream>
+#include <map>
+#include <vector>
+
 #include <boost/format.hpp>
 #include <boost/functional/hash.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/unordered_map.hpp>
-
-// FieldNames
-#include <map>
 #include <boost/thread/mutex.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/foreach.hpp>

-// CKeyECIES, CKeyDeterministic
 #include <openssl/ec.h>
 #include <openssl/bn.h>
 #include <openssl/ecdsa.h>
 #include <openssl/pem.h>
 #include <openssl/hmac.h>
 #include <openssl/rand.h>
-#include <vector>
-#include <cassert>
-
-// CKeyDeterministic
 #include <openssl/err.h>
 #include <boost/test/unit_test.hpp>

-
-#include "ripple_data.h"
-
-
-
-#include "crypto/ripple_Base58.h" // for RippleAddress
-#include "crypto/ripple_CKey.h" // needs RippleAddress VFALCO: TODO, remove this dependency cycle
-#include "crypto/ripple_RFC1751.h"
-
 // VFALCO: TODO, fix these warnings!
 #ifdef _MSC_VER
 //#pragma warning (push) // Causes spurious C4503 "decorated name exceeds maximum length"
@@ -68,6 +53,12 @@
 //#pragma warning (disable: 4244) // conversion, possible loss of data
 #endif

+#include "ripple_data.h"
+
+#include "crypto/ripple_Base58.h" // for RippleAddress
+#include "crypto/ripple_CKey.h" // needs RippleAddress VFALCO: TODO, remove this dependency cycle
+#include "crypto/ripple_RFC1751.h"
+
 #include "crypto/ripple_CBigNum.cpp"
 #include "crypto/ripple_CKey.cpp"
 #include "crypto/ripple_CKeyDeterministic.cpp"
@@ -76,9 +67,14 @@
 #include "crypto/ripple_Base58Data.cpp"
 #include "crypto/ripple_RFC1751.cpp"

-#include "types/ripple_FieldNames.cpp"
-#include "types/ripple_RippleAddress.cpp"
-#include "types/ripple_Serializer.cpp"
+#include "format/ripple_FieldNames.cpp"
+#include "format/ripple_LedgerFormat.cpp"
+#include "format/ripple_RippleAddress.cpp"
+#include "format/ripple_SerializedTypes.cpp"
+#include "format/ripple_Serializer.cpp"
+#include "format/ripple_SerializedObject.cpp"
+#include "format/ripple_TER.cpp"
+#include "format/ripple_TransactionFormat.cpp"

 // VFALCO: TODO Fix this for SConstruct
 #ifdef _MSC_VER
--- a/modules/ripple_data/ripple_data.h
+++ b/modules/ripple_data/ripple_data.h
@@ -32,30 +32,24 @@
 #ifndef RIPPLE_DATA_H
 #define RIPPLE_DATA_H

-// Base58Data
-#include <string>
-#include <algorithm>
-#include <boost/functional/hash.hpp>
-
-// CBigNum
-#include <stdexcept>
-#include <vector>
-#include <openssl/bn.h>
-
-// CKey
-#include <stdexcept>
-#include <vector>
 #include <cassert>
+#include <algorithm>
+#include <list>
+#include <stdexcept>
+#include <string>
+#include <stdexcept>
+#include <vector>
+
+#include <boost/functional/hash.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/ptr_container/ptr_vector.hpp> // VFALCO: NOTE, this looks like junk
+
+#include <openssl/bn.h>
 #include <openssl/ec.h>
 #include <openssl/ecdsa.h>
 #include <openssl/obj_mac.h>
-#include <boost/shared_ptr.hpp>

-// Serializer
-#include <vector>
-#include <string>
-#include <list>
-#include <boost/shared_ptr.hpp>
+//------------------------------------------------------------------------------

 // VFALCO: TODO, try to reduce these dependencies
 #include "../ripple_basics/ripple_basics.h"
@@ -64,11 +58,14 @@
 #include "crypto/ripple_Base58.h" // VFALCO: TODO, Can be moved to .cpp if we clean up setAlphabet stuff
 #include "crypto/ripple_Base58Data.h"

-#include "types/ripple_FieldNames.h"
-#include "types/ripple_RippleAddress.h"
-#include "types/ripple_Serializer.h" // needs CKey
-
-#include "src/cpp/ripple/SerializedTypes.h"
+#include "format/ripple_FieldNames.h"
+#include "format/ripple_RippleAddress.h"
+#include "format/ripple_Serializer.h" // needs CKey
+#include "format/ripple_TER.h"
+#include "format/ripple_SerializedTypes.h" // needs Serializer, TER
+#include "format/ripple_SerializedObject.h"
+#include "format/ripple_LedgerFormat.h" // needs SOTemplate from SerializedObject
+#include "format/ripple_TransactionFormat.h"

 // VFALCO: TODO, resolve the location of this file
 #include "ripple.pb.h"
--- a/modules/ripple_ledger/ripple_ledger.h
+++ b/modules/ripple_ledger/ripple_ledger.h
@@ -34,6 +34,4 @@

 #include "modules/ripple_basics/ripple_basics.h"

-#include "../ripple_data/ripple_data.h"
-
 #endif
--- a/modules/ripple_main/ripple_main.cpp
+++ b/modules/ripple_main/ripple_main.cpp
@@ -133,7 +133,6 @@
 #include "src/cpp/ripple/LedgerAcquire.h"
 #include "src/cpp/ripple/LedgerConsensus.h"
 #include "src/cpp/ripple/LedgerEntrySet.h"
-#include "src/cpp/ripple/LedgerFormats.h"
 #include "src/cpp/ripple/LedgerHistory.h"
 #include "src/cpp/ripple/LedgerMaster.h"
 #include "src/cpp/ripple/LedgerProposal.h"
@@ -168,14 +167,10 @@
 #include "src/cpp/ripple/SHAMapSync.h"
 #include "src/cpp/ripple/SNTPClient.h"
 #include "src/cpp/ripple/SerializedLedger.h"
-#include "src/cpp/ripple/SerializedObject.h"
 #include "src/cpp/ripple/SerializedTransaction.h"
-#include "src/cpp/ripple/SerializedTypes.h"
 #include "src/cpp/ripple/SerializedValidation.h"
 #include "src/cpp/ripple/Transaction.h"
 #include "src/cpp/ripple/TransactionEngine.h"
-#include "src/cpp/ripple/TransactionErr.h"
-#include "src/cpp/ripple/TransactionFormats.h"
 #include "src/cpp/ripple/TransactionMaster.h"
 #include "src/cpp/ripple/TransactionMeta.h"
 #include "src/cpp/ripple/TransactionQueue.h"
@@ -233,7 +228,6 @@ static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength)
 #include "src/cpp/ripple/LedgerAcquire.cpp"
 #include "src/cpp/ripple/LedgerConsensus.cpp"
 #include "src/cpp/ripple/LedgerEntrySet.cpp"
-#include "src/cpp/ripple/LedgerFormats.cpp" // no log
 #include "src/cpp/ripple/LedgerHistory.cpp" // no log
 #include "src/cpp/ripple/LedgerMaster.cpp"
 #include "src/cpp/ripple/LedgerProposal.cpp" // no log
@@ -268,9 +262,7 @@ static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength)
 #include "src/cpp/ripple/RPCSub.cpp"
 #include "src/cpp/ripple/ScriptData.cpp" // no log
 #include "src/cpp/ripple/SerializedLedger.cpp"
-#include "src/cpp/ripple/SerializedObject.cpp"
 #include "src/cpp/ripple/SerializedTransaction.cpp"
-#include "src/cpp/ripple/SerializedTypes.cpp"
 #include "src/cpp/ripple/SerializedValidation.cpp"
 #include "src/cpp/ripple/SHAMap.cpp"
 #include "src/cpp/ripple/SHAMapDiff.cpp" // no log
@@ -281,8 +273,6 @@ static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength)
 #include "src/cpp/ripple/TransactionAcquire.cpp"
 #include "src/cpp/ripple/TransactionCheck.cpp"
 #include "src/cpp/ripple/TransactionEngine.cpp"
-#include "src/cpp/ripple/TransactionErr.cpp" // no log
-#include "src/cpp/ripple/TransactionFormats.cpp" // no log
 #include "src/cpp/ripple/TransactionMaster.cpp" // no log
 #include "src/cpp/ripple/TransactionMeta.cpp"
 #include "src/cpp/ripple/TransactionQueue.cpp" // no log
--- a/newcoin.vcxproj
+++ b/newcoin.vcxproj
@@ -279,25 +279,55 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
+    <ClCompile Include="modules\ripple_data\format\ripple_FieldNames.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_data\format\ripple_LedgerFormat.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_data\format\ripple_RippleAddress.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_data\format\ripple_SerializedObject.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_data\format\ripple_SerializedTypes.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_data\format\ripple_Serializer.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_data\format\ripple_TER.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_data\format\ripple_TransactionFormat.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="modules\ripple_data\ripple_data.cpp" />
-    <ClCompile Include="modules\ripple_data\types\ripple_FieldNames.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="modules\ripple_data\types\ripple_RippleAddress.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="modules\ripple_data\types\ripple_Serializer.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
    <ClCompile Include="modules\ripple_db\ripple_db.cpp" />
    <ClCompile Include="modules\ripple_json\json\json_reader.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -1058,24 +1088,12 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\SerializedObject.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
    <ClCompile Include="src\cpp\ripple\SerializedTransaction.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\SerializedTypes.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
    <ClCompile Include="src\cpp\ripple\SerializedValidation.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1142,12 +1160,6 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\TransactionErr.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
    <ClCompile Include="src\cpp\ripple\TransactionFormats.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1277,11 +1289,16 @@
    <ClInclude Include="modules\ripple_data\crypto\ripple_CBigNum.h" />
    <ClInclude Include="modules\ripple_data\crypto\ripple_CKey.h" />
    <ClInclude Include="modules\ripple_data\crypto\ripple_RFC1751.h" />
+    <ClInclude Include="modules\ripple_data\format\ripple_FieldNames.h" />
+    <ClInclude Include="modules\ripple_data\format\ripple_LedgerFormat.h" />
+    <ClInclude Include="modules\ripple_data\format\ripple_RippleAddress.h" />
+    <ClInclude Include="modules\ripple_data\format\ripple_SerializeDeclarations.h" />
+    <ClInclude Include="modules\ripple_data\format\ripple_SerializedObject.h" />
+    <ClInclude Include="modules\ripple_data\format\ripple_SerializedTypes.h" />
+    <ClInclude Include="modules\ripple_data\format\ripple_Serializer.h" />
+    <ClInclude Include="modules\ripple_data\format\ripple_TER.h" />
+    <ClInclude Include="modules\ripple_data\format\ripple_TransactionFormat.h" />
    <ClInclude Include="modules\ripple_data\ripple_data.h" />
-    <ClInclude Include="modules\ripple_data\types\ripple_FieldNames.h" />
-    <ClInclude Include="modules\ripple_data\types\ripple_RippleAddress.h" />
-    <ClInclude Include="modules\ripple_data\types\ripple_SerializeDeclarations.h" />
-    <ClInclude Include="modules\ripple_data\types\ripple_Serializer.h" />
    <ClInclude Include="modules\ripple_db\ripple_db.h" />
    <ClInclude Include="modules\ripple_json\json\json.h" />
    <ClInclude Include="modules\ripple_json\json\json_autolink.h" />
@@ -1672,9 +1689,7 @@
    <ClInclude Include="src\cpp\ripple\RPCSub.h" />
    <ClInclude Include="src\cpp\ripple\ScriptData.h" />
    <ClInclude Include="src\cpp\ripple\SerializedLedger.h" />
-    <ClInclude Include="src\cpp\ripple\SerializedObject.h" />
    <ClInclude Include="src\cpp\ripple\SerializedTransaction.h" />
-    <ClInclude Include="src\cpp\ripple\SerializedTypes.h" />
    <ClInclude Include="src\cpp\ripple\SerializedValidation.h" />
    <ClInclude Include="src\cpp\ripple\SHAMap.h" />
    <ClInclude Include="src\cpp\ripple\SHAMapSync.h" />
@@ -1682,7 +1697,6 @@
    <ClInclude Include="src\cpp\ripple\ripple_IHashRouter.h" />
    <ClInclude Include="src\cpp\ripple\Transaction.h" />
    <ClInclude Include="src\cpp\ripple\TransactionEngine.h" />
-    <ClInclude Include="src\cpp\ripple\TransactionErr.h" />
    <ClInclude Include="src\cpp\ripple\TransactionFormats.h" />
    <ClInclude Include="src\cpp\ripple\TransactionMaster.h" />
    <ClInclude Include="src\cpp\ripple\TransactionMeta.h" />
--- a/newcoin.vcxproj.filters
+++ b/newcoin.vcxproj.filters
@@ -79,9 +79,6 @@
    <Filter Include="1. Modules\ripple_data\crypto">
      <UniqueIdentifier>{095d33d8-dbf7-44d0-a675-6722b02bb3be}</UniqueIdentifier>
    </Filter>
-    <Filter Include="1. Modules\ripple_data\types">
-      <UniqueIdentifier>{2f3572a9-2882-4656-ab93-82b7761c9e3d}</UniqueIdentifier>
-    </Filter>
    <Filter Include="1. Modules\ripple_data\protobuf">
      <UniqueIdentifier>{9f8ed40a-9f16-42fe-82fd-caf72d3d6a2b}</UniqueIdentifier>
    </Filter>
@@ -112,9 +109,6 @@
    <Filter Include="1. Modules\ripple_main\_unfactored\contracts">
      <UniqueIdentifier>{c7f863ce-204b-4a15-b236-24fe1e3430e5}</UniqueIdentifier>
    </Filter>
-    <Filter Include="1. Modules\ripple_main\_unfactored\processing">
-      <UniqueIdentifier>{c441b367-d096-401f-a3f0-5ac24290d7b7}</UniqueIdentifier>
-    </Filter>
    <Filter Include="1. Modules\ripple_main\_unfactored\rpc">
      <UniqueIdentifier>{3f351c55-360d-40bc-a136-4944ce572efd}</UniqueIdentifier>
    </Filter>
@@ -142,6 +136,12 @@
    <Filter Include="1. Modules\ripple_main\_unfactored\containers">
      <UniqueIdentifier>{6a33d317-620f-4cf0-88a9-2d943b4c00a1}</UniqueIdentifier>
    </Filter>
+    <Filter Include="1. Modules\ripple_data\format">
+      <UniqueIdentifier>{2f3572a9-2882-4656-ab93-82b7761c9e3d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="1. Modules\ripple_main\_unfactored\ledger">
+      <UniqueIdentifier>{c441b367-d096-401f-a3f0-5ac24290d7b7}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="src\cpp\database\sqlite3.c">
@@ -429,9 +429,6 @@
    <ClCompile Include="src\cpp\ripple\TransactionEngine.cpp">
      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\TransactionErr.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
-    </ClCompile>
    <ClCompile Include="src\cpp\ripple\TransactionFormats.cpp">
      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
    </ClCompile>
@@ -474,15 +471,9 @@
    <ClCompile Include="src\cpp\ripple\SerializedLedger.cpp">
      <Filter>1. Modules\ripple_main\_unfactored\serialization</Filter>
    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\SerializedObject.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\serialization</Filter>
-    </ClCompile>
    <ClCompile Include="src\cpp\ripple\SerializedTransaction.cpp">
      <Filter>1. Modules\ripple_main\_unfactored\serialization</Filter>
    </ClCompile>
-    <ClCompile Include="src\cpp\ripple\SerializedTypes.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\serialization</Filter>
-    </ClCompile>
    <ClCompile Include="src\cpp\ripple\SerializedValidation.cpp">
      <Filter>1. Modules\ripple_main\_unfactored\serialization</Filter>
    </ClCompile>
@@ -639,24 +630,12 @@
    <ClCompile Include="modules\ripple_data\crypto\ripple_RFC1751.cpp">
      <Filter>1. Modules\ripple_data\crypto</Filter>
    </ClCompile>
-    <ClCompile Include="modules\ripple_data\types\ripple_RippleAddress.cpp">
-      <Filter>1. Modules\ripple_data\types</Filter>
-    </ClCompile>
-    <ClCompile Include="modules\ripple_data\types\ripple_FieldNames.cpp">
-      <Filter>1. Modules\ripple_data\types</Filter>
-    </ClCompile>
    <ClCompile Include="modules\ripple_data\crypto\ripple_CKey.cpp">
      <Filter>1. Modules\ripple_data\crypto</Filter>
    </ClCompile>
-    <ClCompile Include="modules\ripple_data\types\ripple_Serializer.cpp">
-      <Filter>1. Modules\ripple_data\types</Filter>
-    </ClCompile>
    <ClCompile Include="modules\ripple_data\crypto\ripple_CKeyECIES.cpp">
      <Filter>1. Modules\ripple_data\crypto</Filter>
    </ClCompile>
-    <ClCompile Include="modules\ripple_data\crypto\ripple_CKeyDeterministic.cpp">
-      <Filter>1. Modules\ripple_data\types</Filter>
-    </ClCompile>
    <ClCompile Include="modules\ripple_basics\utility\ripple_InstanceCounter.cpp">
      <Filter>1. Modules\ripple_basics\utility</Filter>
    </ClCompile>
@@ -733,64 +712,64 @@
      <Filter>1. Modules\ripple_main\refactored</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\AcceptedLedger.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\AccountItems.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\AccountState.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\Ledger.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\LedgerAcquire.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\LedgerConsensus.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\LedgerEntrySet.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\LedgerFormats.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\LedgerHistory.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\LedgerMaster.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\LedgerProposal.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\LedgerTiming.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\NicknameState.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\Offer.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\OrderBook.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\OrderBookDB.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\Pathfinder.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\PFRequest.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\RippleCalc.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\RippleState.cpp">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClCompile>
    <ClCompile Include="src\cpp\ripple\SHAMap.cpp">
      <Filter>1. Modules\ripple_main\_unfactored\containers</Filter>
@@ -807,6 +786,33 @@
    <ClCompile Include="src\cpp\ripple\ripple_HashValue.cpp">
      <Filter>1. Modules\ripple_main\refactored</Filter>
    </ClCompile>
+    <ClCompile Include="modules\ripple_data\crypto\ripple_CKeyDeterministic.cpp">
+      <Filter>1. Modules\ripple_data\crypto</Filter>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_data\format\ripple_FieldNames.cpp">
+      <Filter>1. Modules\ripple_data\format</Filter>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_data\format\ripple_LedgerFormat.cpp">
+      <Filter>1. Modules\ripple_data\format</Filter>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_data\format\ripple_RippleAddress.cpp">
+      <Filter>1. Modules\ripple_data\format</Filter>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_data\format\ripple_SerializedObject.cpp">
+      <Filter>1. Modules\ripple_data\format</Filter>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_data\format\ripple_SerializedTypes.cpp">
+      <Filter>1. Modules\ripple_data\format</Filter>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_data\format\ripple_Serializer.cpp">
+      <Filter>1. Modules\ripple_data\format</Filter>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_data\format\ripple_TER.cpp">
+      <Filter>1. Modules\ripple_data\format</Filter>
+    </ClCompile>
+    <ClCompile Include="modules\ripple_data\format\ripple_TransactionFormat.cpp">
+      <Filter>1. Modules\ripple_data\format</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="database\sqlite3ext.h">
@@ -1085,9 +1091,6 @@
    <ClInclude Include="src\cpp\ripple\TransactionEngine.h">
      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\TransactionErr.h">
-      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
-    </ClInclude>
    <ClInclude Include="src\cpp\ripple\TransactionFormats.h">
      <Filter>1. Modules\ripple_main\_unfactored\transactions</Filter>
    </ClInclude>
@@ -1130,15 +1133,9 @@
    <ClInclude Include="src\cpp\ripple\SerializedLedger.h">
      <Filter>1. Modules\ripple_main\_unfactored\serialization</Filter>
    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\SerializedObject.h">
-      <Filter>1. Modules\ripple_main\_unfactored\serialization</Filter>
-    </ClInclude>
    <ClInclude Include="src\cpp\ripple\SerializedTransaction.h">
      <Filter>1. Modules\ripple_main\_unfactored\serialization</Filter>
    </ClInclude>
-    <ClInclude Include="src\cpp\ripple\SerializedTypes.h">
-      <Filter>1. Modules\ripple_main\_unfactored\serialization</Filter>
-    </ClInclude>
    <ClInclude Include="src\cpp\ripple\SerializedValidation.h">
      <Filter>1. Modules\ripple_main\_unfactored\serialization</Filter>
    </ClInclude>
@@ -1331,21 +1328,9 @@
    <ClInclude Include="modules\ripple_data\crypto\ripple_RFC1751.h">
      <Filter>1. Modules\ripple_data\crypto</Filter>
    </ClInclude>
-    <ClInclude Include="modules\ripple_data\types\ripple_RippleAddress.h">
-      <Filter>1. Modules\ripple_data\types</Filter>
-    </ClInclude>
-    <ClInclude Include="modules\ripple_data\types\ripple_FieldNames.h">
-      <Filter>1. Modules\ripple_data\types</Filter>
-    </ClInclude>
-    <ClInclude Include="modules\ripple_data\types\ripple_SerializeDeclarations.h">
-      <Filter>1. Modules\ripple_data\types</Filter>
-    </ClInclude>
    <ClInclude Include="modules\ripple_data\crypto\ripple_CKey.h">
      <Filter>1. Modules\ripple_data\crypto</Filter>
    </ClInclude>
-    <ClInclude Include="modules\ripple_data\types\ripple_Serializer.h">
-      <Filter>1. Modules\ripple_data\types</Filter>
-    </ClInclude>
    <ClInclude Include="modules\ripple_basics\utility\ripple_ScopedLock.h">
      <Filter>1. Modules\ripple_basics\utility</Filter>
    </ClInclude>
@@ -1422,64 +1407,64 @@
      <Filter>1. Modules\ripple_main\refactored</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\AcceptedLedger.h">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\AccountItems.h">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\AccountState.h">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\Ledger.h">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\LedgerAcquire.h">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\LedgerConsensus.h">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\LedgerEntrySet.h">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\LedgerFormats.h">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\LedgerHistory.h">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\LedgerMaster.h">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\LedgerProposal.h">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\LedgerTiming.h">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\NicknameState.h">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\Offer.h">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\OrderBook.h">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\OrderBookDB.h">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\Pathfinder.h">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\PFRequest.h">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\RippleCalc.h">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\RippleState.h">
-      <Filter>1. Modules\ripple_main\_unfactored\processing</Filter>
+      <Filter>1. Modules\ripple_main\_unfactored\ledger</Filter>
    </ClInclude>
    <ClInclude Include="src\cpp\ripple\SHAMap.h">
      <Filter>1. Modules\ripple_main\_unfactored\containers</Filter>
@@ -1490,6 +1475,33 @@
    <ClInclude Include="src\cpp\ripple\ripple_HashValue.h">
      <Filter>1. Modules\ripple_main\refactored</Filter>
    </ClInclude>
+    <ClInclude Include="modules\ripple_data\format\ripple_FieldNames.h">
+      <Filter>1. Modules\ripple_data\format</Filter>
+    </ClInclude>
+    <ClInclude Include="modules\ripple_data\format\ripple_LedgerFormat.h">
+      <Filter>1. Modules\ripple_data\format</Filter>
+    </ClInclude>
+    <ClInclude Include="modules\ripple_data\format\ripple_RippleAddress.h">
+      <Filter>1. Modules\ripple_data\format</Filter>
+    </ClInclude>
+    <ClInclude Include="modules\ripple_data\format\ripple_SerializeDeclarations.h">
+      <Filter>1. Modules\ripple_data\format</Filter>
+    </ClInclude>
+    <ClInclude Include="modules\ripple_data\format\ripple_SerializedObject.h">
+      <Filter>1. Modules\ripple_data\format</Filter>
+    </ClInclude>
+    <ClInclude Include="modules\ripple_data\format\ripple_SerializedTypes.h">
+      <Filter>1. Modules\ripple_data\format</Filter>
+    </ClInclude>
+    <ClInclude Include="modules\ripple_data\format\ripple_Serializer.h">
+      <Filter>1. Modules\ripple_data\format</Filter>
+    </ClInclude>
+    <ClInclude Include="modules\ripple_data\format\ripple_TER.h">
+      <Filter>1. Modules\ripple_data\format</Filter>
+    </ClInclude>
+    <ClInclude Include="modules\ripple_data\format\ripple_TransactionFormat.h">
+      <Filter>1. Modules\ripple_data\format</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <None Include="SConstruct" />
--- a/src/cpp/ripple/Amount.cpp
+++ b/src/cpp/ripple/Amount.cpp
@@ -10,7 +10,6 @@
 #include <boost/test/unit_test.hpp>

 #include "Config.h"
-#include "SerializedTypes.h"

 SETUP_LOG (STAmount)

--- a/src/cpp/ripple/AmountRound.cpp
+++ b/src/cpp/ripple/AmountRound.cpp
@@ -1,8 +1,6 @@

 #include <boost/test/unit_test.hpp>

-#include "SerializedTypes.h"
-
 // CAUTION: This is early code and is *NOT* ready for real use yet.

 static void canonicalizeRound(bool isNative, uint64& value, int& offset, bool roundUp)
--- a/src/cpp/ripple/Config.h
+++ b/src/cpp/ripple/Config.h
@@ -7,7 +7,6 @@
 #include <boost/filesystem.hpp>

 #include "ParseSection.h"
-#include "SerializedTypes.h"

 #define ENABLE_INSECURE				0				// 1, to enable unnecessary features.

--- a/src/cpp/ripple/Ledger.h
+++ b/src/cpp/ripple/Ledger.h
@@ -39,6 +39,11 @@ DEFINE_INSTANCE(Ledger);

 class SqliteStatement;

+// VFALCO: TODO, figure out exactly how this thing works.
+//         It seems like some ledger database is stored as a global, static in the
+//         class. But then what is the meaning of a Ledger object? Is this
+//         really two classes in one? StoreOfAllLedgers + SingleLedgerObject?
+//
 class Ledger : public boost::enable_shared_from_this<Ledger>, public IS_INSTANCE(Ledger)
 { // The basic Ledger structure, can be opened, closed, or synching
    // VFALCO: TODO, eliminate the need for friends
--- a/src/cpp/ripple/LedgerEntrySet.h
+++ b/src/cpp/ripple/LedgerEntrySet.h
@@ -6,7 +6,6 @@
 #include "SerializedLedger.h"
 #include "TransactionMeta.h"
 #include "Ledger.h"
-#include "TransactionErr.h"

 DEFINE_INSTANCE(LedgerEntrySetEntry);
 DEFINE_INSTANCE(LedgerEntrySet);
--- a/src/cpp/ripple/PFRequest.cpp
+++ b/src/cpp/ripple/PFRequest.cpp
@@ -6,7 +6,6 @@
 #include "Application.h"
 #include "Pathfinder.h"
 #include "RippleCalc.h"
-#include "LedgerFormats.h"

 SETUP_LOG (PFRequest)

--- a/src/cpp/ripple/PFRequest.h
+++ b/src/cpp/ripple/PFRequest.h
@@ -9,7 +9,6 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>

-#include "SerializedTypes.h"
 #include "Pathfinder.h"

 // A pathfinding request submitted by a client
--- a/src/cpp/ripple/Pathfinder.h
+++ b/src/cpp/ripple/Pathfinder.h
@@ -3,7 +3,6 @@

 #include <boost/shared_ptr.hpp>

-#include "SerializedTypes.h"
 #include "RippleCalc.h"
 #include "OrderBookDB.h"
 #include "AccountItems.h"
--- a/src/cpp/ripple/RPCHandler.h
+++ b/src/cpp/ripple/RPCHandler.h
@@ -3,7 +3,6 @@

 #include <boost/unordered_set.hpp>

-#include "SerializedTypes.h"
 #include "Ledger.h"
 #include "NetworkOPs.h"

--- a/src/cpp/ripple/SerializedLedger.h
+++ b/src/cpp/ripple/SerializedLedger.h
@@ -1,9 +1,6 @@
 #ifndef __SERIALIZEDLEDGER__
 #define __SERIALIZEDLEDGER__

-#include "SerializedObject.h"
-#include "LedgerFormats.h"
-
 DEFINE_INSTANCE(SerializedLedgerEntry);

 // VFALCO: TODO, rename this to SerializedLedger
--- a/src/cpp/ripple/SerializedTransaction.h
+++ b/src/cpp/ripple/SerializedTransaction.h
@@ -1,12 +1,7 @@
 #ifndef __SERIALIZEDTRANSACTION__
 #define __SERIALIZEDTRANSACTION__

-#include <vector>
-
-#include <boost/shared_ptr.hpp>
-
-#include "SerializedObject.h"
-#include "TransactionFormats.h"
+// VFALCO: TODO, eliminate these macros

 #define TXN_SQL_NEW			'N'
 #define TXN_SQL_CONFLICT	'C'
--- a/src/cpp/ripple/SerializedValidation.h
+++ b/src/cpp/ripple/SerializedValidation.h
@@ -1,8 +1,6 @@
 #ifndef __VALIDATION__
 #define __VALIDATION__

-#include "SerializedObject.h"
-
 DEFINE_INSTANCE(SerializedValidation);

 class SerializedValidation : public STObject, private IS_INSTANCE(SerializedValidation)
--- a/src/cpp/ripple/Transaction.h
+++ b/src/cpp/ripple/Transaction.h
@@ -13,7 +13,6 @@

 #include "SHAMap.h"
 #include "SerializedTransaction.h"
-#include "TransactionErr.h"

 class Database;

--- a/src/cpp/ripple/TransactionEngine.h
+++ b/src/cpp/ripple/TransactionEngine.h
@@ -11,7 +11,6 @@
 #include "SerializedTransaction.h"
 #include "SerializedLedger.h"
 #include "LedgerEntrySet.h"
-#include "TransactionErr.h"


 DEFINE_INSTANCE(TransactionEngine);
--- a/src/cpp/ripple/TransactionMeta.h
+++ b/src/cpp/ripple/TransactionMeta.h
@@ -6,10 +6,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>

-#include "SerializedTypes.h"
-#include "SerializedObject.h"
 #include "SerializedLedger.h"
-#include "TransactionErr.h"

 class TransactionMetaSet
 {
--- a/src/cpp/ripple/Transactor.h
+++ b/src/cpp/ripple/Transactor.h
@@ -1,10 +1,7 @@
 #ifndef __TRANSACTOR__
 #define __TRANSACTOR__

-#include <boost/shared_ptr.hpp>
-
 #include "SerializedTransaction.h"
-#include "TransactionErr.h"
 #include "TransactionEngine.h"

 class Transactor