aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-18 14:34:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Split projects (#857)

Browse Source
This commit is contained in:
Nicolas Dorier
2019-05-24 18:42:22 +09:00
committed by GitHub
parent d86cc9192e
commit 15dc0d60db
46 changed files with 94 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BTCPayServer/BTCPayNetwork.cs → BTCPayServer.Common/BTCPayNetwork.cs
View File

@@ -3,8 +3,6 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using BTCPayServer.Services.Invoices;
using BTCPayServer.Services.Rates;
using NBitcoin;
using NBXplorer;
@@ -76,7 +74,7 @@ namespace BTCPayServer
return CryptoCode;
}
internal KeyPath GetRootKeyPath()
public KeyPath GetRootKeyPath()
{
return new KeyPath(NBitcoinNetwork.Consensus.SupportSegwit ? "49'" : "44'")
.Derive(CoinType);

2
BTCPayServer/BTCPayNetworkProvider.Bitcoin.cs → BTCPayServer.Common/BTCPayNetworkProvider.Bitcoin.cs
View File

@@ -2,9 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using BTCPayServer.Services.Rates;
using NBitcoin;
using NBitpayClient;
using NBXplorer;
namespace BTCPayServer

0
BTCPayServer/BTCPayNetworkProvider.BitcoinGold.cs → BTCPayServer.Common/BTCPayNetworkProvider.BitcoinGold.cs
View File

1
BTCPayServer/BTCPayNetworkProvider.Bitcoinplus.cs → BTCPayServer.Common/BTCPayNetworkProvider.Bitcoinplus.cs
View File

@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using BTCPayServer.Services.Rates;
using NBitcoin;
using NBXplorer;

1
BTCPayServer/BTCPayNetworkProvider.Bitcore.cs → BTCPayServer.Common/BTCPayNetworkProvider.Bitcore.cs
View File

@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using BTCPayServer.Services.Rates;
using NBitcoin;
using NBXplorer;

0
BTCPayServer/BTCPayNetworkProvider.Dash.cs → BTCPayServer.Common/BTCPayNetworkProvider.Dash.cs
View File

1
BTCPayServer/BTCPayNetworkProvider.Dogecoin.cs → BTCPayServer.Common/BTCPayNetworkProvider.Dogecoin.cs
View File

@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using BTCPayServer.Services.Rates;
using NBitcoin;
using NBXplorer;

1
BTCPayServer/BTCPayNetworkProvider.Feathercoin.cs → BTCPayServer.Common/BTCPayNetworkProvider.Feathercoin.cs
View File

@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using BTCPayServer.Services.Rates;
using NBitcoin;
using NBXplorer;

0
BTCPayServer/BTCPayNetworkProvider.Groestlcoin.cs → BTCPayServer.Common/BTCPayNetworkProvider.Groestlcoin.cs
View File

1
BTCPayServer/BTCPayNetworkProvider.Litecoin.cs → BTCPayServer.Common/BTCPayNetworkProvider.Litecoin.cs
View File

@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using BTCPayServer.Services.Rates;
using NBitcoin;
using NBXplorer;

1
BTCPayServer/BTCPayNetworkProvider.Monacoin.cs → BTCPayServer.Common/BTCPayNetworkProvider.Monacoin.cs
View File

@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using BTCPayServer.Services.Rates;
using NBitcoin;
using NBXplorer;

1
BTCPayServer/BTCPayNetworkProvider.Polis.cs → BTCPayServer.Common/BTCPayNetworkProvider.Polis.cs
View File

@@ -2,7 +2,6 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using BTCPayServer.Services.Rates;
using NBitcoin;
using NBXplorer;

1
BTCPayServer/BTCPayNetworkProvider.Ufo.cs → BTCPayServer.Common/BTCPayNetworkProvider.Ufo.cs
View File

@@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using BTCPayServer.Services.Rates;
using NBitcoin;
using NBXplorer;

1
BTCPayServer/BTCPayNetworkProvider.Viacoin.cs → BTCPayServer.Common/BTCPayNetworkProvider.Viacoin.cs
View File

@@ -2,7 +2,6 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using BTCPayServer.Services.Rates;
using NBitcoin;
using NBXplorer;

3
BTCPayServer/BTCPayNetworkProvider.cs → BTCPayServer.Common/BTCPayNetworkProvider.cs
View File

@@ -3,10 +3,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using BTCPayServer.Services.Rates;
using Microsoft.Extensions.Caching.Memory;
using NBitcoin;
using NBitpayClient;
using NBXplorer;
namespace BTCPayServer

13
BTCPayServer.Common/BTCPayServer.Common.csproj Normal file
View File

@@ -0,0 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.9" />
<PackageReference Include="NBitcoin" Version="4.1.2.32" />
<PackageReference Include="NBXplorer.Client" Version="2.0.0.16" />
</ItemGroup>
</Project>

2
BTCPayServer/CustomThreadPool.cs → BTCPayServer.Common/CustomThreadPool.cs
View File

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
namespace BTCPayServer
{
class CustomThreadPool : IDisposable
public class CustomThreadPool : IDisposable
{
CancellationTokenSource _Cancel = new CancellationTokenSource();
TaskCompletionSource<bool> _Exited;

17
BTCPayServer.Common/Extensions.cs Normal file
View File

@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace BTCPayServer
{
public static class UtilitiesExtensions
{
public static void AddRange<T>(this HashSet<T> hashSet, IEnumerable<T> items)
{
foreach (var item in items)
{
hashSet.Add(item);
}
}
}
}

0
BTCPayServer/Logging/ConsoleLogger.cs → BTCPayServer.Common/Logging/ConsoleLogger.cs
View File

0
BTCPayServer/Logging/Logs.cs → BTCPayServer.Common/Logging/Logs.cs
View File

0
BTCPayServer/MultiValueDictionary.cs → BTCPayServer.Common/MultiValueDictionary.cs
View File

0
BTCPayServer/SynchronizationContextRemover.cs → BTCPayServer.Common/SynchronizationContextRemover.cs
View File

2
BTCPayServer/ZipUtils.cs → BTCPayServer.Common/ZipUtils.cs
View File

@@ -6,7 +6,7 @@ using System.Text;
namespace BTCPayServer
{
class ZipUtils
public class ZipUtils
{
public static byte[] Zip(string unzipped)
{

23
BTCPayServer.Rating/BTCPayServer.Rating.csproj Normal file
View File

@@ -0,0 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
<ItemGroup>
<Folder Include="Providers\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.9" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="DigitalRuby.ExchangeSharp" Version="0.5.3" />
<PackageReference Include="NBitpayClient" Version="1.0.0.34" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BTCPayServer.Common\BTCPayServer.Common.csproj" />
</ItemGroup>
</Project>

0
BTCPayServer/Rating/CurrencyPair.cs → BTCPayServer.Rating/CurrencyPair.cs
View File

0
BTCPayServer/Rating/ExchangeRates.cs → BTCPayServer.Rating/ExchangeRates.cs
View File

5
BTCPayServer/Services/Rates/BackgroundFetcherRateProvider.cs → BTCPayServer.Rating/Providers/BackgroundFetcherRateProvider.cs
View File

@@ -4,10 +4,10 @@ using System.Collections.Generic;
using System.Linq;
using System.Runtime.ExceptionServices;
using System.Threading.Tasks;
using BTCPayServer.Data;
using BTCPayServer.Logging;
using BTCPayServer.Rating;
using System.Threading;
using Microsoft.Extensions.Logging.Abstractions;
using BTCPayServer.Logging;
namespace BTCPayServer.Services.Rates
{
@@ -39,6 +39,7 @@ namespace BTCPayServer.Services.Rates
}
IRateProvider _Inner;
public BackgroundFetcherRateProvider(IRateProvider inner)
{
if (inner == null)

0
BTCPayServer/Services/Rates/BitbankRateProvider.cs → BTCPayServer.Rating/Providers/BitbankRateProvider.cs
View File

1
BTCPayServer/Services/Rates/BitpayRateProvider.cs → BTCPayServer.Rating/Providers/BitpayRateProvider.cs
View File

@@ -4,7 +4,6 @@ using System;
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
using NBitcoin;
using BTCPayServer.Rating;
using System.Threading;

0
BTCPayServer/Services/Rates/ByllsRateProvider.cs → BTCPayServer.Rating/Providers/ByllsRateProvider.cs
View File

0
BTCPayServer/Services/Rates/CachedRateProvider.cs → BTCPayServer.Rating/Providers/CachedRateProvider.cs
View File

0
BTCPayServer/Services/Rates/CoinAverageRateProvider.cs → BTCPayServer.Rating/Providers/CoinAverageRateProvider.cs
View File

0
BTCPayServer/Services/Rates/CoinAverageSettings.cs → BTCPayServer.Rating/Providers/CoinAverageSettings.cs
View File

0
BTCPayServer/Services/Rates/ExchangeSharpRateProvider.cs → BTCPayServer.Rating/Providers/ExchangeSharpRateProvider.cs
View File

0
BTCPayServer/Services/Rates/FallbackRateProvider.cs → BTCPayServer.Rating/Providers/FallbackRateProvider.cs
View File

0
BTCPayServer/Services/Rates/IHasExchangeName.cs → BTCPayServer.Rating/Providers/IHasExchangeName.cs
View File

0
BTCPayServer/Services/Rates/IRateProvider.cs → BTCPayServer.Rating/Providers/IRateProvider.cs
View File

0
BTCPayServer/Services/Rates/KrakenExchangeRateProvider.cs → BTCPayServer.Rating/Providers/KrakenExchangeRateProvider.cs
View File

0
BTCPayServer/Services/Rates/NullRateProvider.cs → BTCPayServer.Rating/Providers/NullRateProvider.cs
View File

0
BTCPayServer/Rating/RateRules.cs → BTCPayServer.Rating/RateRules.cs
View File

0
BTCPayServer/Services/Rates/RateFetcher.cs → BTCPayServer.Rating/Services/RateFetcher.cs
View File

1
BTCPayServer/Services/Rates/RateProviderFactory.cs → BTCPayServer.Rating/Services/RateProviderFactory.cs
View File

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
using BTCPayServer.Rating;
using ExchangeSharp;
using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
namespace BTCPayServer.Services.Rates

1
BTCPayServer.Tests/BTCPayServer.Tests.csproj
View File

@@ -33,6 +33,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BTCPayServer.Rating\BTCPayServer.Rating.csproj" />
<ProjectReference Include="..\BTCPayServer\BTCPayServer.csproj" />
</ItemGroup>

8
BTCPayServer/BTCPayServer.csproj
View File

@@ -38,7 +38,6 @@
<PackageReference Include="BuildBundlerMinifier" Version="2.9.406" />
<PackageReference Include="BundlerMinifier.Core" Version="2.9.406" />
<PackageReference Include="BundlerMinifier.TagHelpers" Version="2.9.406" />
<PackageReference Include="DigitalRuby.ExchangeSharp" Version="0.5.3" />
<PackageReference Include="HtmlSanitizer" Version="4.0.207" />
<PackageReference Include="LedgerWallet" Version="2.0.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
@@ -47,10 +46,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="NBitcoin" Version="4.1.2.32" />
<PackageReference Include="NBitpayClient" Version="1.0.0.34" />
<PackageReference Include="DBriize" Version="1.0.0.4" />
<PackageReference Include="NBXplorer.Client" Version="2.0.0.16" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.2" />
<PackageReference Include="NicolasDorier.CommandLine.Configuration" Version="1.0.0.3" />
@@ -140,6 +137,11 @@
<Folder Include="wwwroot\vendor\u2f" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BTCPayServer.Rating\BTCPayServer.Rating.csproj" />
<ProjectReference Include="..\BTCPayServer.Common\BTCPayServer.Common.csproj" />
</ItemGroup>
<ItemGroup>
<Content Update="Views\Apps\_ViewImports.cshtml">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>

7
BTCPayServer/Extensions.cs
View File

@@ -327,13 +327,6 @@ namespace BTCPayServer
NBitcoin.Extensions.TryAdd(ctx.Items, "IsBitpayAPI", value);
}
public static void AddRange<T>(this HashSet<T> hashSet, IEnumerable<T> items)
{
foreach (var item in items)
{
hashSet.Add(item);
}
}
public static bool GetIsBitpayAPI(this HttpContext ctx)
{
return ctx.Items.TryGetValue("IsBitpayAPI", out object obj) &&

28
btcpayserver.sln
View File

@@ -15,6 +15,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{29290EC7-0
Dockerfile.linuxarm32v7 = Dockerfile.linuxarm32v7
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BTCPayServer.Rating", "BTCPayServer.Rating\BTCPayServer.Rating.csproj", "{6DC77459-D52F-45EE-B3F3-315043D33A1B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BTCPayServer.Common", "BTCPayServer.Common\BTCPayServer.Common.csproj", "{4BE42370-6114-4176-BFB3-37C6B6DA094D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -49,6 +53,30 @@ Global
{B373F439-6E75-4A94-985D-10A0C7C500D0}.Release|x64.Build.0 = Release|Any CPU
{B373F439-6E75-4A94-985D-10A0C7C500D0}.Release|x86.ActiveCfg = Release|Any CPU
{B373F439-6E75-4A94-985D-10A0C7C500D0}.Release|x86.Build.0 = Release|Any CPU
{6DC77459-D52F-45EE-B3F3-315043D33A1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6DC77459-D52F-45EE-B3F3-315043D33A1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6DC77459-D52F-45EE-B3F3-315043D33A1B}.Debug|x64.ActiveCfg = Debug|Any CPU
{6DC77459-D52F-45EE-B3F3-315043D33A1B}.Debug|x64.Build.0 = Debug|Any CPU
{6DC77459-D52F-45EE-B3F3-315043D33A1B}.Debug|x86.ActiveCfg = Debug|Any CPU
{6DC77459-D52F-45EE-B3F3-315043D33A1B}.Debug|x86.Build.0 = Debug|Any CPU
{6DC77459-D52F-45EE-B3F3-315043D33A1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6DC77459-D52F-45EE-B3F3-315043D33A1B}.Release|Any CPU.Build.0 = Release|Any CPU
{6DC77459-D52F-45EE-B3F3-315043D33A1B}.Release|x64.ActiveCfg = Release|Any CPU
{6DC77459-D52F-45EE-B3F3-315043D33A1B}.Release|x64.Build.0 = Release|Any CPU
{6DC77459-D52F-45EE-B3F3-315043D33A1B}.Release|x86.ActiveCfg = Release|Any CPU
{6DC77459-D52F-45EE-B3F3-315043D33A1B}.Release|x86.Build.0 = Release|Any CPU
{4BE42370-6114-4176-BFB3-37C6B6DA094D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4BE42370-6114-4176-BFB3-37C6B6DA094D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4BE42370-6114-4176-BFB3-37C6B6DA094D}.Debug|x64.ActiveCfg = Debug|Any CPU
{4BE42370-6114-4176-BFB3-37C6B6DA094D}.Debug|x64.Build.0 = Debug|Any CPU
{4BE42370-6114-4176-BFB3-37C6B6DA094D}.Debug|x86.ActiveCfg = Debug|Any CPU
{4BE42370-6114-4176-BFB3-37C6B6DA094D}.Debug|x86.Build.0 = Debug|Any CPU
{4BE42370-6114-4176-BFB3-37C6B6DA094D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4BE42370-6114-4176-BFB3-37C6B6DA094D}.Release|Any CPU.Build.0 = Release|Any CPU
{4BE42370-6114-4176-BFB3-37C6B6DA094D}.Release|x64.ActiveCfg = Release|Any CPU
{4BE42370-6114-4176-BFB3-37C6B6DA094D}.Release|x64.Build.0 = Release|Any CPU
{4BE42370-6114-4176-BFB3-37C6B6DA094D}.Release|x86.ActiveCfg = Release|Any CPU
{4BE42370-6114-4176-BFB3-37C6B6DA094D}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE