From 7ed3d94a70d2111d3c12e411b093f64c65341215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=BCseyin=20Uslu?= Date: Sat, 4 Oct 2014 17:32:41 +0300 Subject: [PATCH 1/2] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fb4564815..c60d4d4cb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ![Screenshot](http://coinium.org/assets/images/logo/coinium-icon-48.png) CoiniumServ +# ![Screenshot](http://blog.coinium.org/assets/images/logo/coinium-icon-48.png) CoiniumServ [![Build Status](https://travis-ci.org/CoiniumServ/CoiniumServ.svg?branch=develop)](https://travis-ci.org/CoiniumServ/CoiniumServ) [![Build status](https://ci.appveyor.com/api/projects/status/3x349ig9dt14943t)](https://ci.appveyor.com/project/raistlinthewiz/coiniumserv) [![Documentation Status](https://readthedocs.org/projects/coiniumserv/badge/?version=latest)](https://readthedocs.org/projects/coiniumserv/?badge=latest) [![Stories in In Progress](https://badge.waffle.io/CoiniumServ/CoiniumServ.png?label=in%20progress&title=In%20Progress)](http://waffle.io/CoiniumServ/CoiniumServ) [![Project Stats](https://www.openhub.net/p/CoiniumServ/widgets/project_thin_badge.gif)](https://www.openhub.net/p/CoiniumServ) [CoiniumServ](http://www.coiniumserv.com) is a high performance, extremely efficient, platform-agnostic, easy to setup pool server implementation. It features stratum and vanilla services, reward, payment, share processors, vardiff & ban managers, user-friendly embedded web-server & front-end and a full-stack API. From 0fa33d6df28b4efe7fb8ba36992479bdbafd766d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=BCseyin=20Uslu?= Date: Sun, 5 Oct 2014 01:25:58 +0300 Subject: [PATCH 2/2] Removed json-rpc nuget package and added it as a gitsubmodule as it did have an outstanding bug which we got fixed and waiting for PR to be merged (https://github.com/Astn/JSON-RPC.NET/issues/28). StratumService.cs:SubscribeMiner() does now have correctly set all parameters as optional. --- .gitmodules | 3 +++ build/CoiniumServ.sln | 22 ++++++++++++++++++- deps/json-rpc | 1 + src/CoiniumServ/CoiniumServ.csproj | 8 +++---- .../Server/Mining/Stratum/StratumService.cs | 2 +- src/CoiniumServ/packages.config | 1 - src/Tests/CoiniumServ.Tests.csproj | 8 +++---- src/Tests/packages.config | 1 - 8 files changed, 34 insertions(+), 12 deletions(-) create mode 160000 deps/json-rpc 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 @@  -