Merge pull request #560 from CoiniumServ/develop

0.2.2-beta bugfix release
bonesoul · Oct 13, 2014 · 7af08cb · 7af08cb
2 parents baf1248 + 2ff95a0
commit 7af08cb
Show file tree

Hide file tree

Showing 48 changed files with 204 additions and 105 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
 [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
+	url = https://github.com/CoiniumServ/csredis.git
diff --git 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.30723.0
+VisualStudioVersion = 12.0.30501.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{02E410C9-83C5-4D63-8902-5AD041EBEB6C}"
 	ProjectSection(SolutionItems) = preProject
@@ -24,8 +24,6 @@ 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
@@ -109,24 +107,6 @@ 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
diff --git a/src/CoiniumServ/Banning/BanManager.cs b/src/CoiniumServ/Banning/BanManager.cs
@@ -31,7 +31,7 @@
 using CoiniumServ.Server.Mining.Getwork;
 using CoiniumServ.Server.Mining.Stratum.Sockets;
 using CoiniumServ.Shares;
-using CoiniumServ.Utils.Helpers.Time;
+using CoiniumServ.Utils.Helpers;
 using Serilog;
 
 namespace CoiniumServ.Banning

diff --git a/src/CoiniumServ/Blocks/BlockProcessor.cs b/src/CoiniumServ/Blocks/BlockProcessor.cs
@@ -23,7 +23,6 @@
 
 using System.Diagnostics;
 using System.Linq;
-using System.Threading;
 using CoiniumServ.Daemon;
 using CoiniumServ.Daemon.Errors;
 using CoiniumServ.Daemon.Exceptions;

diff --git a/src/CoiniumServ/Coin/Coinbase/Serializers.cs b/src/CoiniumServ/Coin/Coinbase/Serializers.cs
@@ -26,7 +26,7 @@
 using System.Text;
 using CoiniumServ.Jobs;
 using CoiniumServ.Utils.Extensions;
-using CoiniumServ.Utils.Helpers.Arrays;
+using CoiniumServ.Utils.Helpers;
 using Gibbed.IO;
 
 namespace CoiniumServ.Coin.Coinbase

diff --git a/src/CoiniumServ/Coin/Config/CoinOptions.cs b/src/CoiniumServ/Coin/Config/CoinOptions.cs
@@ -37,6 +37,8 @@ public class CoinOptions:ICoinOptions
 
         public bool TxMessageSupported { get; private set; }
 
+        public bool SubmitBlockSupported { get; set; }
+
         public bool Valid { get; private set; }
 
         public CoinOptions(dynamic config)
@@ -47,6 +49,7 @@ public CoinOptions(dynamic config)
                 BlockTemplateModeRequired = config.blockTemplateModeRequired is NullExceptionPreventer ? false : config.blockTemplateModeRequired;
                 UseDefaultAccount = config.useDefaultAccount is NullExceptionPreventer ? false : config.useDefaultAccount;
                 TxMessageSupported = config.txMessageSupported is NullExceptionPreventer ? false : config.txMessageSupported;
+                SubmitBlockSupported = true; // setting true by default, but will be actually checked in NetworkInfo.cs to see if the coin supports it.
                 Valid = true;
             }
             catch (Exception e)

diff --git a/src/CoiniumServ/Coin/Config/ICoinOptions.cs b/src/CoiniumServ/Coin/Config/ICoinOptions.cs
@@ -48,5 +48,10 @@ public interface ICoinOptions:IConfig
         /// Does the coin uses TxMessages.
         /// </summary>
         bool TxMessageSupported { get; }
+
+        /// <summary>
+        /// Does the coin daemon support submitblock call?
+        /// </summary>
+        bool SubmitBlockSupported { get; set; }
     }
 }
diff --git a/src/CoiniumServ/CoiniumServ.csproj b/src/CoiniumServ/CoiniumServ.csproj
@@ -46,6 +46,10 @@
     <ApplicationIcon>Coinium.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="AustinHarris.JsonRpc, Version=1.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\build\packages\AustinHarris.JsonRpc.1.0.4.22\lib\net40\AustinHarris.JsonRpc.dll</HintPath>
+    </Reference>
     <Reference Include="BouncyCastle.Crypto, Version=1.7.4137.9688, Culture=neutral, PublicKeyToken=a4292a325f69b123, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\build\packages\BouncyCastle.1.7.0\lib\Net40-Client\BouncyCastle.Crypto.dll</HintPath>
@@ -54,9 +58,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\build\packages\CryptSharpOfficial.2.0.0.0\lib\CryptSharp.dll</HintPath>
     </Reference>
-    <Reference Include="Dapper, Version=1.34.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Dapper, Version=1.35.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\build\packages\Dapper.1.34\lib\net45\Dapper.dll</HintPath>
+      <HintPath>..\..\build\packages\Dapper.1.35\lib\net45\Dapper.dll</HintPath>
     </Reference>
     <Reference Include="FluentMigrator, Version=1.3.0.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -82,9 +86,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\build\packages\JsonFx.2.0.1209.2802\lib\net40\JsonFx.dll</HintPath>
     </Reference>
-    <Reference Include="Metrics, Version=0.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Metrics, Version=0.2.5.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\build\packages\Metrics.NET.0.2.0\lib\net45\Metrics.dll</HintPath>
+      <HintPath>..\..\build\packages\Metrics.NET.0.2.5\lib\net45\Metrics.dll</HintPath>
     </Reference>
     <Reference Include="MySql.Data, Version=6.9.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -102,9 +106,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\build\packages\Nancy.Hosting.Self.0.23.2\lib\net40\Nancy.Hosting.Self.dll</HintPath>
     </Reference>
-    <Reference Include="Nancy.Metrics, Version=0.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Nancy.Metrics, Version=0.2.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\build\packages\NancyFx.Metrics.0.2.0\lib\net45\Nancy.Metrics.dll</HintPath>
+      <HintPath>..\..\build\packages\Nancy.Metrics.0.2.1\lib\net45\Nancy.Metrics.dll</HintPath>
     </Reference>
     <Reference Include="Nancy.ViewEngines.Razor, Version=0.23.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -116,11 +120,11 @@
     </Reference>
     <Reference Include="Serilog, Version=1.4.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\build\packages\Serilog.1.4.10\lib\net45\Serilog.dll</HintPath>
+      <HintPath>..\..\build\packages\Serilog.1.4.12\lib\net45\Serilog.dll</HintPath>
     </Reference>
     <Reference Include="Serilog.FullNetFx, Version=1.4.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\build\packages\Serilog.1.4.10\lib\net45\Serilog.FullNetFx.dll</HintPath>
+      <HintPath>..\..\build\packages\Serilog.1.4.12\lib\net45\Serilog.FullNetFx.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -147,7 +151,7 @@
     <Compile Include="Coin\Config\CoinOptions.cs" />
     <Compile Include="Coin\Config\IBlockExplorerOptions.cs" />
     <Compile Include="Coin\Config\ICoinOptions.cs" />
-    <Compile Include="Coin\Helpers\Hashrate.cs" />
+    <Compile Include="Utils\Helpers\Humanize.cs" />
     <Compile Include="Configuration\IJsonConfigReader.cs" />
     <Compile Include="Daemon\Converters\DifficultyConverter.cs" />
     <Compile Include="Daemon\Converters\TimeConverter.cs" />
@@ -368,14 +372,14 @@
     <Compile Include="Transactions\TxOut.cs" />
     <Compile Include="Container\Context\ApplicationContext.cs" />
     <Compile Include="Configuration\JsonConfigReader.cs" />
-    <Compile Include="Utils\Helpers\Validation\Enforce.cs" />
+    <Compile Include="Utils\Helpers\Enforce.cs" />
     <Compile Include="Server\Mining\Service\Services.cs" />
     <Compile Include="Utils\Extensions\ArrayExtensions.cs" />
     <Compile Include="Utils\Extensions\EnumerableExtensions.cs" />
-    <Compile Include="Utils\Helpers\Arrays\ArrayHelpers.cs" />
-    <Compile Include="Utils\Helpers\IO\FileHelpers.cs" />
-    <Compile Include="Utils\Helpers\Misc\Range.cs" />
-    <Compile Include="Utils\Helpers\Time\TimeHelpers.cs" />
+    <Compile Include="Utils\Helpers\ArrayHelpers.cs" />
+    <Compile Include="Utils\Helpers\FileHelpers.cs" />
+    <Compile Include="Utils\Helpers\Range.cs" />
+    <Compile Include="Utils\Helpers\TimeHelpers.cs" />
     <Compile Include="Utils\Buffers\IRingBuffer.cs" />
     <Compile Include="Logging\ILogConfig.cs" />
     <Compile Include="Logging\ILogTarget.cs" />
@@ -400,7 +404,7 @@
     <Compile Include="Coin\Address\Exceptions\AddressFormatException.cs" />
     <Compile Include="Coin\Address\Exceptions\InvalidWalletAddressException.cs" />
     <Compile Include="Transactions\GenerationTransaction.cs" />
-    <Compile Include="Coin\Helpers\Amount.cs" />
+    <Compile Include="Utils\Helpers\Amount.cs" />
     <Compile Include="Container\Bootstrapper.cs" />
     <Compile Include="Configuration\IConfig.cs" />
     <Compile Include="Container\Registries\ClassRegistry.cs" />
@@ -507,6 +511,18 @@
     <None Include="config\coins\infinitecoin.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="config\coins\mooncoin.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="config\coins\noblecoin.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="config\coins\usde.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="config\coins\viacoin.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="config\software-example.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -953,10 +969,6 @@
       <Project>{d35e185e-a7e1-41e1-846c-21944f56074f}</Project>
       <Name>CSRedis</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\deps\json-rpc\Json-Rpc\AustinHarris.JsonRpc.csproj">
-      <Project>{24fc1a2a-0bc3-43a7-9bfe-b628c2c4a307}</Project>
-      <Name>AustinHarris.JsonRpc</Name>
-    </ProjectReference>
     <ProjectReference Include="..\libCoiniumServ\libCoiniumServ.csproj">
       <Project>{f908636c-bc75-4b93-a774-e4878f3d39af}</Project>
       <Name>libCoiniumServ</Name>

diff --git a/src/CoiniumServ/Configuration/ConfigManager.cs b/src/CoiniumServ/Configuration/ConfigManager.cs
@@ -37,7 +37,7 @@
 using CoiniumServ.Server.Web;
 using CoiniumServ.Server.Web.Config;
 using CoiniumServ.Statistics;
-using CoiniumServ.Utils.Helpers.IO;
+using CoiniumServ.Utils.Helpers;
 using CoiniumServ.Utils.Platform;
 using libCoiniumServ.Versions;
 using Serilog;

diff --git a/src/CoiniumServ/Configuration/JsonConfigReader.cs b/src/CoiniumServ/Configuration/JsonConfigReader.cs
@@ -24,7 +24,7 @@
 using System;
 using System.IO;
 using System.Text.RegularExpressions;
-using CoiniumServ.Utils.Helpers.IO;
+using CoiniumServ.Utils.Helpers;
 using JsonConfig;
 using Newtonsoft.Json;
 using Serilog;

diff --git a/src/CoiniumServ/Cryptology/Merkle/MerkleTree.cs b/src/CoiniumServ/Cryptology/Merkle/MerkleTree.cs
@@ -24,7 +24,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using CoiniumServ.Utils.Extensions;
-using CoiniumServ.Utils.Helpers.Misc;
+using CoiniumServ.Utils.Helpers;
 
 namespace CoiniumServ.Cryptology.Merkle
 {

diff --git a/src/CoiniumServ/Daemon/Converters/TimeConverter.cs b/src/CoiniumServ/Daemon/Converters/TimeConverter.cs
@@ -23,7 +23,7 @@
 
 using System;
 using System.Globalization;
-using CoiniumServ.Utils.Helpers.Time;
+using CoiniumServ.Utils.Helpers;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 

diff --git a/src/CoiniumServ/Daemon/DaemonClient.cs b/src/CoiniumServ/Daemon/DaemonClient.cs
@@ -271,13 +271,13 @@ public BlockTemplate GetBlockTemplate(bool modeRequired = false)
         /// <returns></returns>
         public BlockTemplate GetBlockTemplate(string blockHex)
         {
-            var submission = new Dictionary<string, object>
+            var data = new Dictionary<string, object>
             {
                 {"mode", "submit"},
                 {"data", blockHex}
             };
 
-            return MakeRequest<BlockTemplate>("getblocktemplate", submission);
+            return MakeRequest<BlockTemplate>("getblocktemplate", data);
         }
 
         /// <summary>

diff --git a/src/CoiniumServ/Jobs/Job.cs b/src/CoiniumServ/Jobs/Job.cs
@@ -33,7 +33,7 @@
 using CoiniumServ.Transactions;
 using CoiniumServ.Transactions.Utils;
 using CoiniumServ.Utils.Extensions;
-using CoiniumServ.Utils.Helpers.Time;
+using CoiniumServ.Utils.Helpers;
 using CoiniumServ.Utils.Numerics;
 using Gibbed.IO;
 

diff --git a/src/CoiniumServ/Jobs/Tracker/JobTracker.cs b/src/CoiniumServ/Jobs/Tracker/JobTracker.cs
@@ -26,7 +26,7 @@
 using System.Linq;
 using System.Threading;
 using CoiniumServ.Pools;
-using CoiniumServ.Utils.Helpers.Time;
+using CoiniumServ.Utils.Helpers;
 using Serilog;
 
 namespace CoiniumServ.Jobs.Tracker

diff --git a/src/CoiniumServ/Logging/LogManager.cs b/src/CoiniumServ/Logging/LogManager.cs
@@ -24,7 +24,7 @@
 using System;
 using System.IO;
 using System.Linq;
-using CoiniumServ.Utils.Helpers.IO;
+using CoiniumServ.Utils.Helpers;
 using Serilog;
 using Serilog.Core;
 using Serilog.Events;