Merge DeStream-Blockchain with solution Stratis.Bitcoin.FullNode

- modify projects "DeStream"

Sources/DeStream.Bitcoin.Cli/Program.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
+using DeStream.Stratis.Bitcoin.Configuration;
 using NBitcoin;
 
 using Newtonsoft.Json;
@@ -116,10 +117,7 @@ namespace DeStream.Bitcoin.Cli
 
                         DeStreamNodeSettings nodeSettings = new DeStreamNodeSettings(network, args:options);
 
-                        var rpcSettings = new RpcSettings();
-
-                        // read the values from the configuration file
-                        rpcSettings.Load(nodeSettings);
+                        var rpcSettings = new RpcSettings(nodeSettings);
 
                         // Find the binding to 127.0.0.1 or the first available. The logic in RPC settings ensures there will be at least 1.
                         System.Net.IPEndPoint nodeEndPoint = rpcSettings.Bind.FirstOrDefault(b => b.Address.ToString() == "127.0.0.1") ?? rpcSettings.Bind[0];

Sources/DeStream.BreezeD/DeStream.BreezeD.csproj

@@ -5,7 +5,7 @@
     <AssemblyName>DeStream.BreezeD</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>DeStream.BreezeD</PackageId>
-    <RuntimeFrameworkVersion>2.0.0</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion>2.1.1</RuntimeFrameworkVersion>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>

Sources/DeStream.DeStreamD/DeStream.DeStreamD.csproj

@@ -5,7 +5,7 @@
     <AssemblyName>DeStream.DeStreamD</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>DeStream.DeStreamD</PackageId>
-    <RuntimeFrameworkVersion>2.0.0</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion>2.1.1</RuntimeFrameworkVersion>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
@@ -25,6 +25,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
     <PackageReference Include="NLog" Version="4.5.6" />
     <PackageReference Include="NLog.Extensions.Logging" Version="1.0.0" />
+    <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
   </ItemGroup>
 
   <ItemGroup>

Sources/DeStream.Stratis.Bitcoin/Configuration/NodeSettings.cs

@@ -20,7 +20,7 @@ namespace DeStream.Stratis.Bitcoin.Configuration
         /// <summary>
         /// Returns default data root directory name
         /// </summary>
-        protected override string DataRootDirName
+        protected string DataRootDirName
         {
             get { return "DeStreamNode"; }
         }
@@ -33,7 +33,7 @@ namespace DeStream.Stratis.Bitcoin.Configuration
         /// <param name="agent">The nodes user agent that will be shared with peers.</param>
         public DeStreamNodeSettings(Network innerNetwork = null, ProtocolVersion protocolVersion = SupportedProtocolVersion, 
             string agent = "DeStream", string[] args = null, bool loadConfiguration = true) 
-            : base (innerNetwork, protocolVersion, agent, args, loadConfiguration)
+            : base (innerNetwork, protocolVersion, agent, args)
         {            
         }
     }