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

Wallet.cpp

@@ -1,3 +1,4 @@
+#define WIN32_LEAN_AND_MEAN 
 
 #include <string>
 
@@ -8,6 +9,7 @@
 #include "boost/lexical_cast.hpp"
 #include "boost/interprocess/sync/scoped_lock.hpp"
 
+
 #include "Wallet.h"
 #include "Ledger.h"
 #include "NewcoinAddress.h"

newcoin.sln

@@ -6,8 +6,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "newcoin", "newcoin.vcxproj"
 		{3E283F37-A4ED-41B7-A3E6-A2D89D131A30} = {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "application", "..\kc\mm2\application\application.vcxproj", "{A3B4F294-D8FB-4A6A-8FF6-3919B8C6D928}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libprotobuf", "..\protobuf-2.4.1\vsprojects\libprotobuf.vcxproj", "{3E283F37-A4ED-41B7-A3E6-A2D89D131A30}"
 EndProject
 Global
@@ -26,14 +24,6 @@ Global
 		{19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Release|Win32.Build.0 = Release|Win32
 		{19465545-42EE-42FA-9CC8-F8975F8F1CC7}.ReleaseD|Win32.ActiveCfg = Release|Win32
 		{19465545-42EE-42FA-9CC8-F8975F8F1CC7}.ReleaseD|Win32.Build.0 = Release|Win32
-		{A3B4F294-D8FB-4A6A-8FF6-3919B8C6D928}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A3B4F294-D8FB-4A6A-8FF6-3919B8C6D928}.Debug|Win32.Build.0 = Debug|Win32
-		{A3B4F294-D8FB-4A6A-8FF6-3919B8C6D928}.FlashDebug|Win32.ActiveCfg = Debug|Win32
-		{A3B4F294-D8FB-4A6A-8FF6-3919B8C6D928}.FlashDebug|Win32.Build.0 = Debug|Win32
-		{A3B4F294-D8FB-4A6A-8FF6-3919B8C6D928}.Release|Win32.ActiveCfg = Release|Win32
-		{A3B4F294-D8FB-4A6A-8FF6-3919B8C6D928}.Release|Win32.Build.0 = Release|Win32
-		{A3B4F294-D8FB-4A6A-8FF6-3919B8C6D928}.ReleaseD|Win32.ActiveCfg = ReleaseD|Win32
-		{A3B4F294-D8FB-4A6A-8FF6-3919B8C6D928}.ReleaseD|Win32.Build.0 = ReleaseD|Win32
 		{3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Debug|Win32.Build.0 = Debug|Win32
 		{3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.FlashDebug|Win32.ActiveCfg = Debug|Win32

newcoin.vcxproj

@@ -95,25 +95,35 @@
     <ClCompile Include="database\database.cpp" />
     <ClCompile Include="database\sqlite3.c" />
     <ClCompile Include="database\SqliteDatabase.cpp" />
+    <ClCompile Include="DBInit.cpp" />
     <ClCompile Include="DeterministicKeys.cpp" />
+    <ClCompile Include="HashedObject.cpp" />
+    <ClCompile Include="json\json_reader.cpp" />
+    <ClCompile Include="json\json_value.cpp" />
+    <ClCompile Include="json\json_writer.cpp" />
     <ClCompile Include="KnownNodeList.cpp" />
     <ClCompile Include="Ledger.cpp" />
     <ClCompile Include="LedgerHistory.cpp" />
     <ClCompile Include="LedgerMaster.cpp" />
+    <ClCompile Include="LocalTransaction.cpp" />
+    <ClCompile Include="NetworkOPs.cpp" />
     <ClCompile Include="newcoin.pb.cc" />
     <ClCompile Include="NewcoinAddress.cpp" />
     <ClCompile Include="PackedMessage.cpp" />
     <ClCompile Include="PeerDoor.cpp" />
     <ClCompile Include="Peer.cpp" />
+    <ClCompile Include="PubKeyCache.cpp" />
     <ClCompile Include="RequestParser.cpp" />
     <ClCompile Include="rpc.cpp" />
     <ClCompile Include="RPCServer.cpp" />
     <ClCompile Include="RPCDoor.cpp" />
+    <ClCompile Include="Serializer.cpp" />
     <ClCompile Include="SHAMap.cpp" />
     <ClCompile Include="SHAMapDiff.cpp" />
     <ClCompile Include="SHAMapNodes.cpp" />
     <ClCompile Include="test.cpp" />
     <ClCompile Include="TimingService.cpp" />
+    <ClCompile Include="Transaction.cpp" />
     <ClCompile Include="UniqueNodeList.cpp" />
     <ClCompile Include="util\pugixml.cpp" />
     <ClCompile Include="Wallet.cpp" />

newcoin.vcxproj.filters

@@ -75,15 +75,6 @@
     <ClCompile Include="rpc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="json\json_spirit_reader.cpp">
-      <Filter>Source Files\json</Filter>
-    </ClCompile>
-    <ClCompile Include="json\json_spirit_value.cpp">
-      <Filter>Source Files\json</Filter>
-    </ClCompile>
-    <ClCompile Include="json\json_spirit_writer.cpp">
-      <Filter>Source Files\json</Filter>
-    </ClCompile>
     <ClCompile Include="BitcoinUtil.cpp">
       <Filter>Header Files\util</Filter>
     </ClCompile>
@@ -135,6 +126,36 @@
     <ClCompile Include="SHAMapNodes.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Serializer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Transaction.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="json\json_reader.cpp">
+      <Filter>Source Files\json</Filter>
+    </ClCompile>
+    <ClCompile Include="json\json_value.cpp">
+      <Filter>Source Files\json</Filter>
+    </ClCompile>
+    <ClCompile Include="json\json_writer.cpp">
+      <Filter>Source Files\json</Filter>
+    </ClCompile>
+    <ClCompile Include="LocalTransaction.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="PubKeyCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="HashedObject.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="NetworkOPs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DBInit.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="test.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -182,33 +203,6 @@
     <ClInclude Include="PeerDoor.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="json\json_spirit.h">
-      <Filter>Header Files\json</Filter>
-    </ClInclude>
-    <ClInclude Include="json\json_spirit_error_position.h">
-      <Filter>Header Files\json</Filter>
-    </ClInclude>
-    <ClInclude Include="json\json_spirit_reader.h">
-      <Filter>Header Files\json</Filter>
-    </ClInclude>
-    <ClInclude Include="json\json_spirit_reader_template.h">
-      <Filter>Header Files\json</Filter>
-    </ClInclude>
-    <ClInclude Include="json\json_spirit_stream_reader.h">
-      <Filter>Header Files\json</Filter>
-    </ClInclude>
-    <ClInclude Include="json\json_spirit_utils.h">
-      <Filter>Header Files\json</Filter>
-    </ClInclude>
-    <ClInclude Include="json\json_spirit_value.h">
-      <Filter>Header Files\json</Filter>
-    </ClInclude>
-    <ClInclude Include="json\json_spirit_writer.h">
-      <Filter>Header Files\json</Filter>
-    </ClInclude>
-    <ClInclude Include="json\json_spirit_writer_template.h">
-      <Filter>Header Files\json</Filter>
-    </ClInclude>
     <ClInclude Include="CallRPC.h">
       <Filter>Header Files</Filter>
     </ClInclude>