Merge pull request #218 from dangershony/nstratis-submodule

Adding NStratis as a git submodule
stratisproject · Jul 12, 2017 · 7e02983 · 7e02983
2 parents 2b6dd50 + 3573e79
commit 7e02983
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 17 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "NStratis"]
+	path = NStratis
+	url = https://github.com/stratisproject/NStratis/
diff --git a/Documentation/getting-started.md b/Documentation/getting-started.md
@@ -13,10 +13,13 @@ Getting started
 git clone https://github.com/stratisproject/StratisBitcoinFullNode.git  
 ```
 
-3. Checkout the master branch
+3. Checkout the master branch and initialize dependencies
 ```
 cd StratisBitcoinFullNode
 git checkout master
+
+git submodule init
+git submodule update
 ```
 
 4. Restore the project packages  

diff --git a/NStratis b/NStratis
diff --git a/README.md b/README.md
@@ -27,16 +27,6 @@ For Proof of Stake support on the Stratis token the node is using [NStratis](htt
 [.NET Core](https://dotnet.github.io/) is an open source cross platform framework and enables the development of applications and services on Windows, macOS and Linux.  
 Join our community on [slack](https://stratisplatform.slack.com).  
 
-Running a FullNode
-------------------
-
-Our full node is currently in alpha.  
-
-To run on the Bitcoin network: ``` Stratis.BitcoinD\dotnet run ```  
-To run on the Stratis network: ``` Stratis.StratisD\dotnet run ```  
-
-See more details [here](https://github.com/stratisproject/StratisBitcoinFullNode/blob/master/Documentation/getting-started.md)
-
 The design
 ----------
 
@@ -74,6 +64,28 @@ What's Next
 We plan to add many more features on top of the Stratis Bitcoin blockchain:
 Sidechains, Private/Permissioned blockchain, Compiled Smart Contracts, NTumbleBit/Breeze wallet and more...
 
+Running a FullNode
+------------------
+
+Our full node is currently in alpha.  
+
+```
+git clone https://github.com/stratisproject/StratisBitcoinFullNode.git  
+cd StratisBitcoinFullNode
+
+git submodule init
+git submodule update
+
+dotnet restore
+dotnet build
+
+```
+
+To run on the Bitcoin network: ``` Stratis.BitcoinD\dotnet run ```  
+To run on the Stratis network: ``` Stratis.StratisD\dotnet run ```  
+
+See more details [here](https://github.com/stratisproject/StratisBitcoinFullNode/blob/master/Documentation/getting-started.md)
+
 Development
 -----------
 Up for some blockchain development?

diff --git a/Stratis.Bitcoin.FullNode.sln b/Stratis.Bitcoin.FullNode.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.14
+VisualStudioVersion = 15.0.26430.15
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "global", "global", "{5B331FD3-D493-46A9-928B-B786FC6F3103}"
 	ProjectSection(SolutionItems) = preProject
@@ -24,6 +24,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stratis.StratisD", "Stratis
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stratis.Bitcoin.Common", "Stratis.Bitcoin.Common\Stratis.Bitcoin.Common.csproj", "{2D21A110-D7DE-474A-A684-A954D2C86C25}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{1B9A916F-DDAC-4675-B424-EDEDC1A58231}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NBitcoin", "NStratis\NBitcoin\NBitcoin.csproj", "{6FAD74ED-D0FD-4167-9B25-54B14AF2D628}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HashLib", "NStratis\Hashing\HashLib\HashLib.csproj", "{28C55453-3698-4A34-AEDF-6325E8330604}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -54,8 +60,20 @@ Global
 		{2D21A110-D7DE-474A-A684-A954D2C86C25}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2D21A110-D7DE-474A-A684-A954D2C86C25}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2D21A110-D7DE-474A-A684-A954D2C86C25}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6FAD74ED-D0FD-4167-9B25-54B14AF2D628}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6FAD74ED-D0FD-4167-9B25-54B14AF2D628}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6FAD74ED-D0FD-4167-9B25-54B14AF2D628}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6FAD74ED-D0FD-4167-9B25-54B14AF2D628}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28C55453-3698-4A34-AEDF-6325E8330604}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28C55453-3698-4A34-AEDF-6325E8330604}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28C55453-3698-4A34-AEDF-6325E8330604}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28C55453-3698-4A34-AEDF-6325E8330604}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{6FAD74ED-D0FD-4167-9B25-54B14AF2D628} = {1B9A916F-DDAC-4675-B424-EDEDC1A58231}
+		{28C55453-3698-4A34-AEDF-6325E8330604} = {1B9A916F-DDAC-4675-B424-EDEDC1A58231}
+	EndGlobalSection
 EndGlobal
diff --git a/Stratis.Bitcoin.IntegrationTests/Stratis.Bitcoin.IntegrationTests.csproj b/Stratis.Bitcoin.IntegrationTests/Stratis.Bitcoin.IntegrationTests.csproj
@@ -27,12 +27,12 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\NStratis\NBitcoin\NBitcoin.csproj" />
     <ProjectReference Include="..\Stratis.Bitcoin\Stratis.Bitcoin.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170618-03" />
-    <PackageReference Include="NStratis" Version="3.0.2.23" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta3-build3705" />
     <PackageReference Include="xunit" Version="2.3.0-beta3-build3705" />
     <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />

diff --git a/Stratis.Bitcoin.Tests/Stratis.Bitcoin.Tests.csproj b/Stratis.Bitcoin.Tests/Stratis.Bitcoin.Tests.csproj
@@ -30,14 +30,14 @@
   <ItemGroup>
     <PackageReference Include="DBreeze" Version="1.85.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170618-03" />
-    <PackageReference Include="NStratis" Version="3.0.2.23" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta3-build3705" />
     <PackageReference Include="xunit" Version="2.3.0-beta3-build3705" />
     <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.500-preview2-1-003177" />
     <PackageReference Include="Moq" Version="4.7.1" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\NStratis\NBitcoin\NBitcoin.csproj" />
     <ProjectReference Include="..\Stratis.Bitcoin\Stratis.Bitcoin.csproj" />
   </ItemGroup>
 

diff --git a/Stratis.Bitcoin/Stratis.Bitcoin.csproj b/Stratis.Bitcoin/Stratis.Bitcoin.csproj
@@ -21,7 +21,6 @@
   <ItemGroup>
     <PackageReference Include="DBreeze" Version="1.85.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
-    <PackageReference Include="NStratis" Version="3.0.2.23" />
     <PackageReference Include="Serilog.Extensions.Logging.File" Version="1.0.1" />
     <PackageReference Include="System.Reactive" Version="3.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.2" />
@@ -41,6 +40,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\NStratis\NBitcoin\NBitcoin.csproj" />
     <ProjectReference Include="..\Stratis.Bitcoin.Common\Stratis.Bitcoin.Common.csproj" />
   </ItemGroup>
 

diff --git a/Stratis.BitcoinD/Stratis.BitcoinD.csproj b/Stratis.BitcoinD/Stratis.BitcoinD.csproj
@@ -18,14 +18,14 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\NStratis\NBitcoin\NBitcoin.csproj" />
     <ProjectReference Include="..\Stratis.Bitcoin\Stratis.Bitcoin.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" />
-    <PackageReference Include="NStratis" Version="3.0.2.23" />
     <PackageReference Include="Serilog.Extensions.Logging.File" Version="1.0.1" />
   </ItemGroup>
 

diff --git a/Stratis.StratisD/Stratis.StratisD.csproj b/Stratis.StratisD/Stratis.StratisD.csproj
@@ -17,14 +17,14 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\NStratis\NBitcoin\NBitcoin.csproj" />
     <ProjectReference Include="..\Stratis.Bitcoin\Stratis.Bitcoin.csproj" />    
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" />
-    <PackageReference Include="NStratis" Version="3.0.2.23" />
     <PackageReference Include="Serilog.Extensions.Logging.File" Version="1.0.1" />	
   </ItemGroup>
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -35,6 +35,11 @@ init:
 before_build:
 - ps: |
       Write-Host "[$env:configuration] STARTED dotnet restore" -foregroundcolor "magenta"
+      
+      # Initialize dependencies
+      git submodule init
+      git submodule update
+
       dotnet restore -v m
       Write-Host "[$env:configuration] FINISHED dotnet restore" -foregroundcolor "magenta"
       if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }