diff --git a/deploy/cointoss.nsi b/deploy/cointoss.nsi
index 9e32d62bbd..1f3656ba7d 100644
--- a/deploy/cointoss.nsi
+++ b/deploy/cointoss.nsi
@@ -21,10 +21,10 @@ Page instfiles
; The stuff to install
Section "" ;No components page, name is not important
- ; Set output path to the installation directory.
- SetOutPath $INSTDIR
+ ; Set output path to the installation directory.
+ SetOutPath $INSTDIR
- ; Put file there
+ ; Put file there
File ..\Release\newcoin.exe
File ..\*.dll
File "start CoinToss.bat"
@@ -32,6 +32,8 @@ Section "" ;No components page, name is not important
File validators.txt
File /r /x .git ..\..\nc-client\*.*
+ CreateDirectory $INSTDIR\db
+
SectionEnd ; end the section
diff --git a/newcoin.sln b/newcoin.sln
index ad70dac84e..bae4207cc2 100644
--- a/newcoin.sln
+++ b/newcoin.sln
@@ -11,27 +11,39 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
FlashDebug|Win32 = FlashDebug|Win32
+ FlashDebug|x64 = FlashDebug|x64
Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
ReleaseD|Win32 = ReleaseD|Win32
+ ReleaseD|x64 = ReleaseD|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Debug|Win32.ActiveCfg = Debug|Win32
{19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Debug|Win32.Build.0 = Debug|Win32
+ {19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Debug|x64.ActiveCfg = Debug|Win32
{19465545-42EE-42FA-9CC8-F8975F8F1CC7}.FlashDebug|Win32.ActiveCfg = Debug|Win32
{19465545-42EE-42FA-9CC8-F8975F8F1CC7}.FlashDebug|Win32.Build.0 = Debug|Win32
+ {19465545-42EE-42FA-9CC8-F8975F8F1CC7}.FlashDebug|x64.ActiveCfg = Debug|Win32
{19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Release|Win32.ActiveCfg = Release|Win32
{19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Release|Win32.Build.0 = Release|Win32
+ {19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Release|x64.ActiveCfg = Release|Win32
{19465545-42EE-42FA-9CC8-F8975F8F1CC7}.ReleaseD|Win32.ActiveCfg = Release|Win32
{19465545-42EE-42FA-9CC8-F8975F8F1CC7}.ReleaseD|Win32.Build.0 = Release|Win32
+ {19465545-42EE-42FA-9CC8-F8975F8F1CC7}.ReleaseD|x64.ActiveCfg = Release|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}.Debug|x64.ActiveCfg = Debug|Win32
{3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.FlashDebug|Win32.ActiveCfg = Debug|Win32
{3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.FlashDebug|Win32.Build.0 = Debug|Win32
+ {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.FlashDebug|x64.ActiveCfg = Debug|Win32
{3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Release|Win32.ActiveCfg = Release|Win32
{3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Release|Win32.Build.0 = Release|Win32
+ {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.Release|x64.ActiveCfg = Release|Win32
{3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.ReleaseD|Win32.ActiveCfg = Release|Win32
{3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.ReleaseD|Win32.Build.0 = Release|Win32
+ {3E283F37-A4ED-41B7-A3E6-A2D89D131A30}.ReleaseD|x64.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/newcoin.vcxproj b/newcoin.vcxproj
index ea76caa586..e9790d155a 100644
--- a/newcoin.vcxproj
+++ b/newcoin.vcxproj
@@ -153,6 +153,15 @@
+
+
+
+
+
+
+
+
+
@@ -233,14 +242,12 @@
-
-
Designer
+
-
Document
@@ -248,11 +255,7 @@
obj\src\newcoin.pb.h
-
- Designer
-
-
diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters
index 0d25cfe28b..7de6413e29 100644
--- a/newcoin.vcxproj.filters
+++ b/newcoin.vcxproj.filters
@@ -25,18 +25,12 @@
{77d2a621-b503-4ce4-aee8-ef0b337c4ee2}
-
- {209ce0bd-b197-4cb2-ad50-f8f43bcd1e03}
-
-
- {46b84833-f245-4c3d-94b8-472efdb3a040}
-
-
- {b27b04b8-1c6e-4b20-9364-f18d4682dc00}
-
{60c3631e-8855-4a61-bdd3-9892d96242d5}
+
+ {92775c5f-dc9f-4a97-a9a6-6d4bd4e424b4}
+
@@ -243,6 +237,33 @@
Source Files
+
+ Source Files
+
+
+ Source Files\websocketpp
+
+
+ Source Files\websocketpp
+
+
+ Source Files\websocketpp
+
+
+ Source Files\websocketpp
+
+
+ Source Files\websocketpp
+
+
+ Source Files\websocketpp
+
+
+ Source Files\websocketpp
+
+
+ Source Files\websocketpp
+
@@ -475,23 +496,17 @@
-
-
-
html
-
-
- tests\client2
-
+
diff --git a/src/RPCServer.cpp b/src/RPCServer.cpp
index 958b72f801..aec64305d2 100644
--- a/src/RPCServer.cpp
+++ b/src/RPCServer.cpp
@@ -2020,7 +2020,7 @@ Json::Value RPCServer::doCommand(const std::string& command, Json::Value& params
{ "password_set", &RPCServer::doPasswordSet, 2, 3, true,optNetwork },
{ "peers", &RPCServer::doPeers, 0, 0, true },
{ "send", &RPCServer::doSend, 3, 7, false, optCurrent },
- { "server_info", &RPCServer::doServerInfo, 0, 0, true },
+ { "server_info", &RPCServer::doServerInfo, 0, 0, false },
{ "stop", &RPCServer::doStop, 0, 0, true },
{ "transit_set", &RPCServer::doTransitSet, 5, 5, true, optCurrent },
{ "tx", &RPCServer::doTx, 1, 1, true },