diff --git a/.gitmodules b/.gitmodules
index 8fdebd0c2..60a8f52ae 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
[submodule "deps/csredis"]
path = deps/csredis
url = https://github.com/CoiniumServ/csredis.git
+[submodule "deps/json-rpc"]
+ path = deps/json-rpc
+ url = https://github.com/CoiniumServ/JSON-RPC.NET.git
diff --git a/build/CoiniumServ.sln b/build/CoiniumServ.sln
index 12145daa3..b2c3815e8 100644
--- a/build/CoiniumServ.sln
+++ b/build/CoiniumServ.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
+VisualStudioVersion = 12.0.30723.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{02E410C9-83C5-4D63-8902-5AD041EBEB6C}"
ProjectSection(SolutionItems) = preProject
@@ -24,6 +24,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSRedis", "..\deps\csredis\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libCoiniumServ", "..\src\libCoiniumServ\libCoiniumServ.csproj", "{F908636C-BC75-4B93-A774-E4878F3D39AF}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AustinHarris.JsonRpc", "..\deps\json-rpc\Json-Rpc\AustinHarris.JsonRpc.csproj", "{24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -107,6 +109,24 @@ Global
{F908636C-BC75-4B93-A774-E4878F3D39AF}.Testing|Mixed Platforms.ActiveCfg = Release|Any CPU
{F908636C-BC75-4B93-A774-E4878F3D39AF}.Testing|Mixed Platforms.Build.0 = Release|Any CPU
{F908636C-BC75-4B93-A774-E4878F3D39AF}.Testing|x86.ActiveCfg = Release|Any CPU
+ {24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+ {24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Debug|Mixed Platforms.Build.0 = Debug|x86
+ {24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Debug|x86.ActiveCfg = Debug|x86
+ {24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Debug|x86.Build.0 = Debug|x86
+ {24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Release|Any CPU.Build.0 = Release|Any CPU
+ {24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Release|Mixed Platforms.ActiveCfg = Release|x86
+ {24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Release|Mixed Platforms.Build.0 = Release|x86
+ {24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Release|x86.ActiveCfg = Release|x86
+ {24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Release|x86.Build.0 = Release|x86
+ {24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Testing|Any CPU.ActiveCfg = Release|Any CPU
+ {24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Testing|Any CPU.Build.0 = Release|Any CPU
+ {24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Testing|Mixed Platforms.ActiveCfg = Release|x86
+ {24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Testing|Mixed Platforms.Build.0 = Release|x86
+ {24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Testing|x86.ActiveCfg = Release|x86
+ {24FC1A2A-0BC3-43A7-9BFE-B628C2C4A307}.Testing|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/deps/json-rpc b/deps/json-rpc
new file mode 160000
index 000000000..6669face8
--- /dev/null
+++ b/deps/json-rpc
@@ -0,0 +1 @@
+Subproject commit 6669face8648d2a22ce369bb466834d95a556827
diff --git a/src/CoiniumServ/CoiniumServ.csproj b/src/CoiniumServ/CoiniumServ.csproj
index adbd3a4ff..5d54d42f7 100644
--- a/src/CoiniumServ/CoiniumServ.csproj
+++ b/src/CoiniumServ/CoiniumServ.csproj
@@ -46,10 +46,6 @@
Coinium.ico
-
- False
- ..\..\build\packages\AustinHarris.JsonRpc.1.0.4.18\lib\net40\AustinHarris.JsonRpc.dll
-
False
..\..\build\packages\BouncyCastle.1.7.0\lib\Net40-Client\BouncyCastle.Crypto.dll
@@ -957,6 +953,10 @@
{d35e185e-a7e1-41e1-846c-21944f56074f}
CSRedis
+
+ {24fc1a2a-0bc3-43a7-9bfe-b628c2c4a307}
+ AustinHarris.JsonRpc
+
{f908636c-bc75-4b93-a774-e4878f3d39af}
libCoiniumServ
diff --git a/src/CoiniumServ/Server/Mining/Stratum/StratumService.cs b/src/CoiniumServ/Server/Mining/Stratum/StratumService.cs
index ca0064712..c90db5c7f 100644
--- a/src/CoiniumServ/Server/Mining/Stratum/StratumService.cs
+++ b/src/CoiniumServ/Server/Mining/Stratum/StratumService.cs
@@ -49,7 +49,7 @@ public StratumService(IPoolConfig poolConfig, IShareManager shareManager):
/// software signature
/// optional parameter supplied by miners whom wants to reconnect and continue their old session
[JsonRpcMethod("mining.subscribe")]
- public SubscribeResponse SubscribeMiner(string signature, string sessionId = null)
+ public SubscribeResponse SubscribeMiner(string signature = null, string sessionId = null)
{
var context = (StratumContext) JsonRpcContext.Current().Value;
diff --git a/src/CoiniumServ/packages.config b/src/CoiniumServ/packages.config
index a57cc1660..6a3f6cdd8 100644
--- a/src/CoiniumServ/packages.config
+++ b/src/CoiniumServ/packages.config
@@ -1,6 +1,5 @@
-
diff --git a/src/Tests/CoiniumServ.Tests.csproj b/src/Tests/CoiniumServ.Tests.csproj
index 1ba3f8c9a..34ed1ef34 100644
--- a/src/Tests/CoiniumServ.Tests.csproj
+++ b/src/Tests/CoiniumServ.Tests.csproj
@@ -35,10 +35,6 @@
false
-
- False
- ..\..\build\packages\AustinHarris.JsonRpc.1.0.4.18\lib\net40\AustinHarris.JsonRpc.dll
-
False
..\..\build\packages\BouncyCastle.1.7.0\lib\Net40-Client\BouncyCastle.Crypto.dll
@@ -106,6 +102,10 @@
+
+ {24fc1a2a-0bc3-43a7-9bfe-b628c2c4a307}
+ AustinHarris.JsonRpc
+
{5fca1e48-0751-4625-9532-cb804df55db5}
CoiniumServ
diff --git a/src/Tests/packages.config b/src/Tests/packages.config
index 112bb5372..644a0e4c5 100644
--- a/src/Tests/packages.config
+++ b/src/Tests/packages.config
@@ -1,6 +1,5 @@
-