Merge pull request #179 from bokobza/master

Removed TumbleBit from Breeze as it will be used as an add on

Breeze/Breeze.sln

 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.15
+VisualStudioVersion = 15.0.26430.16
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{807563C4-7259-434D-B604-A14C3DCF8E30}"
 EndProject
@@ -20,12 +20,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Breeze.Api.Tests", "src\Bre
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Breeze.Wallet", "src\Breeze.Wallet\Breeze.Wallet.csproj", "{D16CD478-9D1E-4C69-91AD-43539E94A215}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Breeze.TumbleBit.Client", "src\Breeze.TumbleBit.Client\Breeze.TumbleBit.Client.csproj", "{2490DD1A-6C14-47F2-A9C6-56761A52E2D9}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TumbleBit", "TumbleBit", "{1B724678-2B73-483E-B981-3A6733C2194E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NTumbleBit", "src\NTumbleBit\NTumbleBit.csproj", "{29E411B1-5687-43EE-A71B-6CCEC2289129}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Breeze.Daemon", "src\Breeze.Daemon\Breeze.Daemon.csproj", "{AAF6163B-1BE2-48CE-9F9F-577C6D7AAB8D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stratis.Bitcoin", "..\StratisBitcoinFullNode\Stratis.Bitcoin\Stratis.Bitcoin.csproj", "{C93CB29F-C0A1-40D6-A4CC-B93C75423ED5}"
@@ -54,14 +48,6 @@ Global
 		{D16CD478-9D1E-4C69-91AD-43539E94A215}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D16CD478-9D1E-4C69-91AD-43539E94A215}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D16CD478-9D1E-4C69-91AD-43539E94A215}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2490DD1A-6C14-47F2-A9C6-56761A52E2D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2490DD1A-6C14-47F2-A9C6-56761A52E2D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2490DD1A-6C14-47F2-A9C6-56761A52E2D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2490DD1A-6C14-47F2-A9C6-56761A52E2D9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{29E411B1-5687-43EE-A71B-6CCEC2289129}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{29E411B1-5687-43EE-A71B-6CCEC2289129}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{29E411B1-5687-43EE-A71B-6CCEC2289129}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{29E411B1-5687-43EE-A71B-6CCEC2289129}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AAF6163B-1BE2-48CE-9F9F-577C6D7AAB8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AAF6163B-1BE2-48CE-9F9F-577C6D7AAB8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AAF6163B-1BE2-48CE-9F9F-577C6D7AAB8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -90,8 +76,6 @@ Global
 		{E7B3E9EB-34E8-4B10-B296-4D5270E314A4} = {807563C4-7259-434D-B604-A14C3DCF8E30}
 		{BD5174B4-DCE8-4594-9A16-B83E56767770} = {807563C4-7259-434D-B604-A14C3DCF8E30}
 		{D16CD478-9D1E-4C69-91AD-43539E94A215} = {807563C4-7259-434D-B604-A14C3DCF8E30}
-		{2490DD1A-6C14-47F2-A9C6-56761A52E2D9} = {807563C4-7259-434D-B604-A14C3DCF8E30}
-		{29E411B1-5687-43EE-A71B-6CCEC2289129} = {1B724678-2B73-483E-B981-3A6733C2194E}
 		{AAF6163B-1BE2-48CE-9F9F-577C6D7AAB8D} = {807563C4-7259-434D-B604-A14C3DCF8E30}
 	EndGlobalSection
 EndGlobal

Breeze/src/Breeze.Api/ApiFeature.cs

@@ -6,7 +6,6 @@ using Microsoft.Extensions.Logging;
 using Stratis.Bitcoin;
 using Stratis.Bitcoin.Builder;
 using Stratis.Bitcoin.Builder.Feature;
-using Stratis.Bitcoin.Logging;
 using Stratis.Bitcoin.Utilities;
 
 namespace Breeze.Api

Breeze/src/Breeze.Api/Controllers/NodeController.cs

 using System;
-using System.ComponentModel.DataAnnotations;
-using Breeze.Api.Models;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
-using NBitcoin;
 using Stratis.Bitcoin.Builder;
-using Stratis.Bitcoin.Notifications;
 
 namespace Breeze.Api.Controllers
 {

Breeze/src/Breeze.Api/Startup.cs

@@ -39,7 +39,7 @@ namespace Breeze.Api
 
                         builder =>
                         {
-							var allowedDomains = new[]{"http://localhost","http://localhost:4200"};
+                            var allowedDomains = new[] { "http://localhost", "http://localhost:4200" };
 
                             builder
                             .WithOrigins(allowedDomains)

Breeze/src/Breeze.Daemon/Breeze.Daemon.csproj

@@ -15,7 +15,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\StratisBitcoinFullNode\Stratis.Bitcoin\Stratis.Bitcoin.csproj" />
     <ProjectReference Include="..\Breeze.Api\Breeze.Api.csproj" />
-    <ProjectReference Include="..\Breeze.TumbleBit.Client\Breeze.TumbleBit.Client.csproj" />
     <ProjectReference Include="..\Breeze.Wallet\Breeze.Wallet.csproj" />
   </ItemGroup>
 

Breeze/src/Breeze.Daemon/Program.cs

 using System;
 using System.Linq;
-using System.Threading;
 using Breeze.Api;
-using Breeze.TumbleBit;
-using Microsoft.Extensions.Logging;
-using Stratis.Bitcoin;
 using Stratis.Bitcoin.Builder;
 using Stratis.Bitcoin.Configuration;
-using Stratis.Bitcoin.Logging;
 using Breeze.Wallet;
 using NBitcoin;
 using NBitcoin.Protocol;
@@ -18,7 +13,6 @@ using Stratis.Bitcoin.Miner;
 using Stratis.Bitcoin.Notifications;
 using Stratis.Bitcoin.Utilities;
 using Stratis.Bitcoin.Wallet;
-using Stratis.Bitcoin.WatchOnlyWallet;
 
 namespace Breeze.Daemon
 {
@@ -92,16 +86,6 @@ namespace Breeze.Daemon
                 }
             }
             
-            // TODO: Add this when TB is enabled
-            //// add the tumbler's settings
-            //var tumblerAddress = args.SingleOrDefault(arg => arg.StartsWith("-tumbler-uri="));
-            //if (!string.IsNullOrEmpty(tumblerAddress))
-            //{
-            //    tumblerAddress = tumblerAddress.Replace("-tumbler-uri=", string.Empty);
-            //    fullNodeBuilder.UseTumbleBit(new Uri(tumblerAddress));
-            //    fullNodeBuilder.UseWatchOnlyWallet();
-            //}
-
             var node = fullNodeBuilder.Build();
 
             //start Full Node - this will also start the API

Breeze/src/Breeze.Wallet/LightWalletFeature.cs

-using System;
-using System.Threading;
+using System.Threading;
 using System.Threading.Tasks;
 using Stratis.Bitcoin.Builder.Feature;
 using Microsoft.Extensions.DependencyInjection;
@@ -8,7 +7,6 @@ using NBitcoin.Protocol;
 using Stratis.Bitcoin;
 using Stratis.Bitcoin.Builder;
 using Stratis.Bitcoin.Connection;
-using Stratis.Bitcoin.Consensus;
 using Stratis.Bitcoin.Consensus.Deployments;
 using Stratis.Bitcoin.Utilities;
 using Stratis.Bitcoin.Wallet;

Breeze/src/Breeze.Wallet/LightWalletSyncManager.cs

 using System;
 using System.Linq;
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using NBitcoin;
-using NBitcoin.JsonConverters;
 using Stratis.Bitcoin;
 using Stratis.Bitcoin.Notifications;
 using Stratis.Bitcoin.Utilities;