diff --git a/BTCPayServer.Tests/BTCPayServer.Tests.csproj b/BTCPayServer.Tests/BTCPayServer.Tests.csproj
index b717e0bfc..6570a680c 100644
--- a/BTCPayServer.Tests/BTCPayServer.Tests.csproj
+++ b/BTCPayServer.Tests/BTCPayServer.Tests.csproj
@@ -5,6 +5,7 @@
false
NU1701,CA1816,CA1308,CA1810,CA2208
+ 7.2
diff --git a/BTCPayServer.Tests/BTCPayServerTester.cs b/BTCPayServer.Tests/BTCPayServerTester.cs
index 3f0b16985..6501d4b2d 100644
--- a/BTCPayServer.Tests/BTCPayServerTester.cs
+++ b/BTCPayServer.Tests/BTCPayServerTester.cs
@@ -120,7 +120,7 @@ namespace BTCPayServer.Tests
.Build();
_Host.Start();
InvoiceRepository = (InvoiceRepository)_Host.Services.GetService(typeof(InvoiceRepository));
-
+ StoreRepository = (StoreRepository)_Host.Services.GetService(typeof(StoreRepository));
var rateProvider = (BTCPayRateProviderFactory)_Host.Services.GetService(typeof(BTCPayRateProviderFactory));
rateProvider.DirectProviders.Clear();
@@ -152,6 +152,7 @@ namespace BTCPayServer.Tests
internal set;
}
public InvoiceRepository InvoiceRepository { get; private set; }
+ public StoreRepository StoreRepository { get; private set; }
public Uri IntegratedLightning { get; internal set; }
public bool InContainer { get; internal set; }
diff --git a/BTCPayServer.Tests/ChargeTester.cs b/BTCPayServer.Tests/ChargeTester.cs
index 4eb5479bf..18b08582c 100644
--- a/BTCPayServer.Tests/ChargeTester.cs
+++ b/BTCPayServer.Tests/ChargeTester.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Text;
+using BTCPayServer.Payments.Lightning;
using BTCPayServer.Payments.Lightning.Charge;
using BTCPayServer.Payments.Lightning.CLightning;
using NBitcoin;
@@ -15,7 +16,7 @@ namespace BTCPayServer.Tests
{
this._Parent = serverTester;
var url = serverTester.GetEnvironment(environmentName, defaultValue);
- Client = new ChargeClient(new Uri(url), network);
+ Client = (ChargeClient)LightningClientFactory.CreateClient(url, network);
P2PHost = _Parent.GetEnvironment(environmentName + "_HOST", defaultHost);
}
public ChargeClient Client { get; set; }
diff --git a/BTCPayServer.Tests/Lnd/LndMockTester.cs b/BTCPayServer.Tests/Lnd/LndMockTester.cs
new file mode 100644
index 000000000..83ab6efa6
--- /dev/null
+++ b/BTCPayServer.Tests/Lnd/LndMockTester.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using BTCPayServer.Payments.Lightning.Lnd;
+using NBitcoin;
+
+namespace BTCPayServer.Tests.Lnd
+{
+ public class LndMockTester
+ {
+ private ServerTester _Parent;
+
+ public LndMockTester(ServerTester serverTester, string environmentName, string defaultValue, string defaultHost, Network network)
+ {
+ this._Parent = serverTester;
+ var url = serverTester.GetEnvironment(environmentName, defaultValue);
+
+ Swagger = new LndSwaggerClient(new LndRestSettings(new Uri(url)) { AllowInsecure = true });
+ Client = new LndInvoiceClient(Swagger);
+ P2PHost = _Parent.GetEnvironment(environmentName + "_HOST", defaultHost);
+ }
+
+ public LndSwaggerClient Swagger { get; set; }
+ public LndInvoiceClient Client { get; set; }
+ public string P2PHost { get; }
+ }
+}
diff --git a/BTCPayServer.Tests/Lnd/UnitTests.cs b/BTCPayServer.Tests/Lnd/UnitTests.cs
new file mode 100644
index 000000000..40f75b910
--- /dev/null
+++ b/BTCPayServer.Tests/Lnd/UnitTests.cs
@@ -0,0 +1,246 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+using BTCPayServer.Payments.Lightning;
+using BTCPayServer.Payments.Lightning.Lnd;
+using NBitcoin;
+using NBitcoin.RPC;
+using Xunit;
+using Xunit.Abstractions;
+using System.Linq;
+using System.Threading;
+using NBitpayClient;
+using System.Globalization;
+using Xunit.Sdk;
+
+namespace BTCPayServer.Tests.Lnd
+{
+ // this depends for now on `docker-compose up devlnd`
+ public class UnitTests
+ {
+ private readonly ITestOutputHelper output;
+
+ public UnitTests(ITestOutputHelper output)
+ {
+ this.output = output;
+ initializeEnvironment();
+
+ MerchantLnd = new LndSwaggerClient(new LndRestSettings(new Uri("https://127.0.0.1:53280")) { AllowInsecure = true });
+ InvoiceClient = new LndInvoiceClient(MerchantLnd);
+
+ CustomerLnd = new LndSwaggerClient(new LndRestSettings(new Uri("https://127.0.0.1:53281")) { AllowInsecure = true });
+ }
+
+ private LndSwaggerClient MerchantLnd { get; set; }
+ private LndInvoiceClient InvoiceClient { get; set; }
+
+ private LndSwaggerClient CustomerLnd { get; set; }
+
+ [Fact]
+ public async Task GetInfo()
+ {
+ var res = await InvoiceClient.GetInfo();
+ output.WriteLine("Result: " + res.ToJson());
+ }
+
+ [Fact]
+ public async Task CreateInvoice()
+ {
+ var res = await InvoiceClient.CreateInvoice(10000, "Hello world", TimeSpan.FromSeconds(3600));
+ output.WriteLine("Result: " + res.ToJson());
+ }
+
+ [Fact]
+ public async Task GetInvoice()
+ {
+ var createInvoice = await InvoiceClient.CreateInvoice(10000, "Hello world", TimeSpan.FromSeconds(3600));
+ var getInvoice = await InvoiceClient.GetInvoice(createInvoice.Id);
+
+ Assert.Equal(createInvoice.BOLT11, getInvoice.BOLT11);
+ }
+
+ [Fact]
+ public void Play()
+ {
+ var seq = new System.Buffers.ReadOnlySequence(new ReadOnlyMemory(new byte[1000]));
+ var seq2 = seq.Slice(3);
+ var pos = seq2.GetPosition(0);
+ }
+
+ // integration tests
+ [Fact]
+ public async Task TestWaitListenInvoice()
+ {
+ var merchantInvoice = await InvoiceClient.CreateInvoice(10000, "Hello world", TimeSpan.FromSeconds(3600));
+ var merchantInvoice2 = await InvoiceClient.CreateInvoice(10000, "Hello world", TimeSpan.FromSeconds(3600));
+
+ var waitToken = default(CancellationToken);
+ var listener = await InvoiceClient.Listen(waitToken);
+ var waitTask = listener.WaitInvoice(waitToken);
+
+ await EnsureLightningChannelAsync();
+ var payResponse = await CustomerLnd.SendPaymentSyncAsync(new LnrpcSendRequest
+ {
+ Payment_request = merchantInvoice.BOLT11
+ });
+
+ var invoice = await waitTask;
+ Assert.True(invoice.PaidAt.HasValue);
+
+ var waitTask2 = listener.WaitInvoice(waitToken);
+
+ payResponse = await CustomerLnd.SendPaymentSyncAsync(new LnrpcSendRequest
+ {
+ Payment_request = merchantInvoice2.BOLT11
+ });
+
+ invoice = await waitTask2;
+ Assert.True(invoice.PaidAt.HasValue);
+
+ var waitTask3 = listener.WaitInvoice(waitToken);
+ await Task.Delay(100);
+ listener.Dispose();
+ Assert.Throws(() => waitTask3.GetAwaiter().GetResult());
+ }
+
+ [Fact]
+ public async Task CreateLndInvoiceAndPay()
+ {
+ var merchantInvoice = await InvoiceClient.CreateInvoice(10000, "Hello world", TimeSpan.FromSeconds(3600));
+
+ await EnsureLightningChannelAsync();
+
+ await EventuallyAsync(async () =>
+ {
+ var payResponse = await CustomerLnd.SendPaymentSyncAsync(new LnrpcSendRequest
+ {
+ Payment_request = merchantInvoice.BOLT11
+ });
+
+ var invoice = await InvoiceClient.GetInvoice(merchantInvoice.Id);
+ Assert.True(invoice.PaidAt.HasValue);
+ });
+ }
+
+ private async Task EventuallyAsync(Func act)
+ {
+ CancellationTokenSource cts = new CancellationTokenSource(20000);
+ while (true)
+ {
+ try
+ {
+ await act();
+ break;
+ }
+ catch (XunitException) when (!cts.Token.IsCancellationRequested)
+ {
+ await Task.Delay(500);
+ }
+ }
+ }
+
+ public async Task EnsureLightningChannelAsync()
+ {
+ var merchantInfo = await WaitLNSynched();
+ var merchantNodeAddress = new LnrpcLightningAddress
+ {
+ Pubkey = merchantInfo.NodeId,
+ Host = "merchant_lnd:9735"
+ };
+
+ while (true)
+ {
+ // if channel is pending generate blocks until confirmed
+ var pendingResponse = await CustomerLnd.PendingChannelsAsync();
+ if (pendingResponse.Pending_open_channels?
+ .Any(a => a.Channel?.Remote_node_pub == merchantNodeAddress.Pubkey) == true)
+ {
+ ExplorerNode.Generate(1);
+ await WaitLNSynched();
+ continue;
+ }
+
+ // check if channel is established
+ var chanResponse = await CustomerLnd.ListChannelsAsync(null, null, null, null);
+ LnrpcChannel channelToMerchant = null;
+ if (chanResponse != null && chanResponse.Channels != null)
+ {
+ channelToMerchant = chanResponse.Channels
+ .Where(a => a.Remote_pubkey == merchantNodeAddress.Pubkey)
+ .FirstOrDefault();
+ }
+
+ if (channelToMerchant == null)
+ {
+ // create new channel
+ var isConnected = await CustomerLnd.ListPeersAsync();
+ if (isConnected.Peers == null ||
+ !isConnected.Peers.Any(a => a.Pub_key == merchantInfo.NodeId))
+ {
+ var connectResp = await CustomerLnd.ConnectPeerAsync(new LnrpcConnectPeerRequest
+ {
+ Addr = merchantNodeAddress
+ });
+ }
+
+ var addressResponse = await CustomerLnd.NewWitnessAddressAsync();
+ var address = BitcoinAddress.Create(addressResponse.Address, Network.RegTest);
+ await ExplorerNode.SendToAddressAsync(address, Money.Coins(0.2m));
+ ExplorerNode.Generate(1);
+ await WaitLNSynched();
+
+ var channelReq = new LnrpcOpenChannelRequest
+ {
+ Local_funding_amount = 16777215.ToString(CultureInfo.InvariantCulture),
+ Node_pubkey_string = merchantInfo.NodeId
+ };
+ var channelResp = await CustomerLnd.OpenChannelSyncAsync(channelReq);
+ }
+ else
+ {
+ // channel exists, return it
+ ExplorerNode.Generate(1);
+ await WaitLNSynched();
+ return channelToMerchant;
+ }
+ }
+ }
+
+ private async Task WaitLNSynched()
+ {
+ while (true)
+ {
+ var merchantInfo = await InvoiceClient.GetInfo();
+ var blockCount = await ExplorerNode.GetBlockCountAsync();
+ if (merchantInfo.BlockHeight != blockCount)
+ {
+ await Task.Delay(500);
+ }
+ else
+ {
+ return merchantInfo;
+ }
+ }
+ }
+
+
+
+
+ //
+ private void initializeEnvironment()
+ {
+ NetworkProvider = new BTCPayNetworkProvider(NetworkType.Regtest);
+ ExplorerNode = new RPCClient(RPCCredentialString.Parse(GetEnvironment("TESTS_BTCRPCCONNECTION", "server=http://127.0.0.1:43782;ceiwHEbqWI83:DwubwWsoo3")), NetworkProvider.GetNetwork("BTC").NBitcoinNetwork);
+ }
+
+ public BTCPayNetworkProvider NetworkProvider { get; private set; }
+ public RPCClient ExplorerNode { get; set; }
+
+ internal string GetEnvironment(string variable, string defaultValue)
+ {
+ var var = Environment.GetEnvironmentVariable(variable);
+ return String.IsNullOrEmpty(var) ? defaultValue : var;
+ }
+ }
+}
diff --git a/BTCPayServer.Tests/ServerTester.cs b/BTCPayServer.Tests/ServerTester.cs
index 62bf76d4e..d28b51088 100644
--- a/BTCPayServer.Tests/ServerTester.cs
+++ b/BTCPayServer.Tests/ServerTester.cs
@@ -20,6 +20,8 @@ using System.Threading;
using System.Globalization;
using BTCPayServer.Payments.Lightning.CLightning;
using BTCPayServer.Payments.Lightning.Charge;
+using BTCPayServer.Tests.Lnd;
+using BTCPayServer.Payments.Lightning;
namespace BTCPayServer.Tests
{
@@ -47,10 +49,12 @@ namespace BTCPayServer.Tests
LTCExplorerClient = new ExplorerClient(NetworkProvider.GetNetwork("LTC").NBXplorerNetwork, new Uri(GetEnvironment("TESTS_LTCNBXPLORERURL", "http://127.0.0.1:32838/")));
var btc = NetworkProvider.GetNetwork("BTC").NBitcoinNetwork;
- CustomerLightningD = new CLightningRPCClient(new Uri(GetEnvironment("TEST_CUSTOMERLIGHTNINGD", "tcp://127.0.0.1:30992/")), btc);
- MerchantLightningD = new CLightningRPCClient(new Uri(GetEnvironment("TEST_MERCHANTLIGHTNINGD", "tcp://127.0.0.1:30993/")), btc);
+ CustomerLightningD = (CLightningRPCClient)LightningClientFactory.CreateClient(GetEnvironment("TEST_CUSTOMERLIGHTNINGD", "type=clightning;server=tcp://127.0.0.1:30992/"), btc);
+ MerchantLightningD = (CLightningRPCClient)LightningClientFactory.CreateClient(GetEnvironment("TEST_MERCHANTLIGHTNINGD", "type=clightning;server=tcp://127.0.0.1:30993/"), btc);
- MerchantCharge = new ChargeTester(this, "TEST_MERCHANTCHARGE", "http://api-token:foiewnccewuify@127.0.0.1:54938/", "merchant_lightningd", btc);
+ MerchantCharge = new ChargeTester(this, "TEST_MERCHANTCHARGE", "type=charge;server=http://127.0.0.1:54938/;api-token=foiewnccewuify", "merchant_lightningd", btc);
+
+ MerchantLnd = new LndMockTester(this, "TEST_MERCHANTLND", "https://lnd:lnd@127.0.0.1:53280/", "merchant_lnd", btc);
PayTester = new BTCPayServerTester(Path.Combine(_Directory, "pay"))
{
@@ -78,41 +82,54 @@ namespace BTCPayServer.Tests
///
/// Connect a customer LN node to the merchant LN node
///
- public void PrepareLightning()
+ public void PrepareLightning(LightningConnectionType lndBackend)
{
- PrepareLightningAsync().GetAwaiter().GetResult();
+ ILightningInvoiceClient client = MerchantCharge.Client;
+ if (lndBackend == LightningConnectionType.LndREST)
+ client = MerchantLnd.Client;
+
+ PrepareLightningAsync(client).GetAwaiter().GetResult();
}
+ private static readonly string[] SKIPPED_STATES =
+ { "ONCHAIN", "CHANNELD_SHUTTING_DOWN", "CLOSINGD_SIGEXCHANGE", "CLOSINGD_COMPLETE", "FUNDING_SPEND_SEEN" };
+
///
/// Connect a customer LN node to the merchant LN node
///
///
- public async Task PrepareLightningAsync()
+ private async Task PrepareLightningAsync(ILightningInvoiceClient client)
{
+ bool awaitingLocking = false;
while (true)
{
- var skippedStates = new[] { "ONCHAIN", "CHANNELD_SHUTTING_DOWN", "CLOSINGD_SIGEXCHANGE", "CLOSINGD_COMPLETE", "FUNDING_SPEND_SEEN" };
- var channel = (await CustomerLightningD.ListPeersAsync())
+ var merchantInfo = await WaitLNSynched(client, CustomerLightningD, MerchantLightningD);
+
+ var peers = await CustomerLightningD.ListPeersAsync();
+ var filteringToTargetedPeers = peers.Where(a => a.Id == merchantInfo.NodeId);
+ var channel = filteringToTargetedPeers
.SelectMany(p => p.Channels)
- .Where(c => !skippedStates.Contains(c.State ?? ""))
+ .Where(c => !SKIPPED_STATES.Contains(c.State ?? ""))
.FirstOrDefault();
+
switch (channel?.State)
{
case null:
- var merchantInfo = await WaitLNSynched();
- var clightning = new NodeInfo(merchantInfo.Id, MerchantCharge.P2PHost, merchantInfo.Port);
- await CustomerLightningD.ConnectAsync(clightning);
var address = await CustomerLightningD.NewAddressAsync();
- await ExplorerNode.SendToAddressAsync(address, Money.Coins(0.2m));
+ await ExplorerNode.SendToAddressAsync(address, Money.Coins(0.5m));
ExplorerNode.Generate(1);
- await WaitLNSynched();
+ await WaitLNSynched(client, CustomerLightningD, MerchantLightningD);
await Task.Delay(1000);
- await CustomerLightningD.FundChannelAsync(clightning, Money.Satoshis(16777215));
+
+ var merchantNodeInfo = new NodeInfo(merchantInfo.NodeId, merchantInfo.Address, merchantInfo.P2PPort);
+ await CustomerLightningD.ConnectAsync(merchantNodeInfo);
+ await CustomerLightningD.FundChannelAsync(merchantNodeInfo, Money.Satoshis(16777215));
break;
case "CHANNELD_AWAITING_LOCKIN":
- ExplorerNode.Generate(1);
- await WaitLNSynched();
+ ExplorerNode.Generate(awaitingLocking ? 1 : 10);
+ await WaitLNSynched(client, CustomerLightningD, MerchantLightningD);
+ awaitingLocking = true;
break;
case "CHANNELD_NORMAL":
return;
@@ -122,23 +139,29 @@ namespace BTCPayServer.Tests
}
}
- private async Task WaitLNSynched()
+ private async Task WaitLNSynched(params ILightningInvoiceClient[] clients)
{
while (true)
{
- var merchantInfo = await MerchantCharge.Client.GetInfoAsync();
var blockCount = await ExplorerNode.GetBlockCountAsync();
- if (merchantInfo.BlockHeight != blockCount)
- {
- await Task.Delay(1000);
- }
- else
- {
- return merchantInfo;
- }
+ var synching = clients.Select(c => WaitLNSynchedCore(blockCount, c)).ToArray();
+ await Task.WhenAll(synching);
+ if (synching.All(c => c.Result != null))
+ return synching[0].Result;
+ await Task.Delay(1000);
}
}
+ private async Task WaitLNSynchedCore(int blockCount, ILightningInvoiceClient client)
+ {
+ var merchantInfo = await client.GetInfo();
+ if (merchantInfo.BlockHeight == blockCount)
+ {
+ return merchantInfo;
+ }
+ return null;
+ }
+
public void SendLightningPayment(Invoice invoice)
{
SendLightningPaymentAsync(invoice).GetAwaiter().GetResult();
@@ -152,8 +175,10 @@ namespace BTCPayServer.Tests
}
public CLightningRPCClient CustomerLightningD { get; set; }
+
public CLightningRPCClient MerchantLightningD { get; private set; }
public ChargeTester MerchantCharge { get; private set; }
+ public LndMockTester MerchantLnd { get; set; }
internal string GetEnvironment(string variable, string defaultValue)
{
@@ -189,9 +214,14 @@ namespace BTCPayServer.Tests
{
get; set;
}
+ public List Stores { get; internal set; } = new List();
public void Dispose()
{
+ foreach(var store in Stores)
+ {
+ Xunit.Assert.True(PayTester.StoreRepository.DeleteStore(store).GetAwaiter().GetResult());
+ }
if (PayTester != null)
PayTester.Dispose();
}
diff --git a/BTCPayServer.Tests/TestAccount.cs b/BTCPayServer.Tests/TestAccount.cs
index 085d68349..ca156ae73 100644
--- a/BTCPayServer.Tests/TestAccount.cs
+++ b/BTCPayServer.Tests/TestAccount.cs
@@ -65,6 +65,7 @@ namespace BTCPayServer.Tests
var store = this.GetController();
await store.CreateStore(new CreateStoreViewModel() { Name = "Test Store" });
StoreId = store.CreatedStoreId;
+ parent.Stores.Add(StoreId);
}
public BTCPayNetwork SupportedNetwork { get; set; }
@@ -117,7 +118,7 @@ namespace BTCPayServer.Tests
{
get; set;
}
-
+
public void RegisterLightningNode(string cryptoCode, LightningConnectionType connectionType)
{
RegisterLightningNodeAsync(cryptoCode, connectionType).GetAwaiter().GetResult();
@@ -126,15 +127,24 @@ namespace BTCPayServer.Tests
public async Task RegisterLightningNodeAsync(string cryptoCode, LightningConnectionType connectionType)
{
var storeController = this.GetController();
+
+ string connectionString = null;
+ if (connectionType == LightningConnectionType.Charge)
+ connectionString = "type=charge;server=" + parent.MerchantCharge.Client.Uri.AbsoluteUri;
+ else if (connectionType == LightningConnectionType.CLightning)
+ connectionString = "type=clightning;server=" + parent.MerchantLightningD.Address.AbsoluteUri;
+ else if (connectionType == LightningConnectionType.LndREST)
+ connectionString = $"type=lnd-rest;server={parent.MerchantLnd.Swagger.BaseUrl};allowinsecure=true";
+ else
+ throw new NotSupportedException(connectionType.ToString());
+
await storeController.AddLightningNode(StoreId, new LightningNodeViewModel()
{
- Url = connectionType == LightningConnectionType.Charge ? parent.MerchantCharge.Client.Uri.AbsoluteUri :
- connectionType == LightningConnectionType.CLightning ? parent.MerchantLightningD.Address.AbsoluteUri
- : throw new NotSupportedException(connectionType.ToString()),
+ ConnectionString = connectionString,
SkipPortTest = true
}, "save", "BTC");
if (storeController.ModelState.ErrorCount != 0)
Assert.False(true, storeController.ModelState.FirstOrDefault().Value.Errors[0].ErrorMessage);
}
-}
+ }
}
diff --git a/BTCPayServer.Tests/UnitTest1.cs b/BTCPayServer.Tests/UnitTest1.cs
index a01f94d54..217333774 100644
--- a/BTCPayServer.Tests/UnitTest1.cs
+++ b/BTCPayServer.Tests/UnitTest1.cs
@@ -39,6 +39,7 @@ using BTCPayServer.Models;
using BTCPayServer.Rating;
using BTCPayServer.Validation;
using ExchangeSharp;
+using System.Security.Cryptography.X509Certificates;
namespace BTCPayServer.Tests
{
@@ -322,7 +323,7 @@ namespace BTCPayServer.Tests
[Fact]
public void RoundupCurrenciesCorrectly()
{
- foreach(var test in new[]
+ foreach (var test in new[]
{
(0.0005m, "$0.0005 (USD)"),
(0.001m, "$0.001 (USD)"),
@@ -410,14 +411,21 @@ namespace BTCPayServer.Tests
var testResult = storeController.AddLightningNode(user.StoreId, new LightningNodeViewModel()
{
- Url = tester.MerchantCharge.Client.Uri.AbsoluteUri
+ ConnectionString = "type=charge;server=" + tester.MerchantCharge.Client.Uri.AbsoluteUri,
+ SkipPortTest = true // We can't test this as the IP can't be resolved by the test host :(
}, "test", "BTC").GetAwaiter().GetResult();
Assert.DoesNotContain("Error", ((LightningNodeViewModel)Assert.IsType(testResult).Model).StatusMessage, StringComparison.OrdinalIgnoreCase);
Assert.True(storeController.ModelState.IsValid);
Assert.IsType(storeController.AddLightningNode(user.StoreId, new LightningNodeViewModel()
{
- Url = tester.MerchantCharge.Client.Uri.AbsoluteUri
+ ConnectionString = "type=charge;server=" + tester.MerchantCharge.Client.Uri.AbsoluteUri
+ }, "save", "BTC").GetAwaiter().GetResult());
+
+ // Make sure old connection string format does not work
+ Assert.IsType(storeController.AddLightningNode(user.StoreId, new LightningNodeViewModel()
+ {
+ ConnectionString = tester.MerchantCharge.Client.Uri.AbsoluteUri
}, "save", "BTC").GetAwaiter().GetResult());
var storeVm = Assert.IsType(Assert.IsType(storeController.UpdateStore()).Model);
@@ -429,106 +437,148 @@ namespace BTCPayServer.Tests
public void CanParseLightningURL()
{
LightningConnectionString conn = null;
- Assert.True(LightningConnectionString.TryParse("/test/a", out conn));
- Assert.Equal("unix://test/a", conn.ToString());
- Assert.Equal("unix://test/a", conn.ToUri(true).AbsoluteUri);
- Assert.Equal("unix://test/a", conn.ToUri(false).AbsoluteUri);
- Assert.Equal(LightningConnectionType.CLightning, conn.ConnectionType);
-
- Assert.True(LightningConnectionString.TryParse("unix://test/a", out conn));
- Assert.Equal("unix://test/a", conn.ToString());
- Assert.Equal("unix://test/a", conn.ToUri(true).AbsoluteUri);
- Assert.Equal("unix://test/a", conn.ToUri(false).AbsoluteUri);
- Assert.Equal(LightningConnectionType.CLightning, conn.ConnectionType);
-
- Assert.True(LightningConnectionString.TryParse("unix://test/a", out conn));
- Assert.Equal("unix://test/a", conn.ToString());
- Assert.Equal("unix://test/a", conn.ToUri(true).AbsoluteUri);
- Assert.Equal("unix://test/a", conn.ToUri(false).AbsoluteUri);
- Assert.Equal(LightningConnectionType.CLightning, conn.ConnectionType);
-
- Assert.True(LightningConnectionString.TryParse("tcp://test/a", out conn));
- Assert.Equal("tcp://test/a", conn.ToString());
- Assert.Equal("tcp://test/a", conn.ToUri(true).AbsoluteUri);
- Assert.Equal("tcp://test/a", conn.ToUri(false).AbsoluteUri);
- Assert.Equal(LightningConnectionType.CLightning, conn.ConnectionType);
-
- Assert.True(LightningConnectionString.TryParse("http://aaa:bbb@test/a", out conn));
- Assert.Equal("http://aaa:bbb@test/a", conn.ToString());
- Assert.Equal("http://aaa:bbb@test/a", conn.ToUri(true).AbsoluteUri);
- Assert.Equal("http://test/a", conn.ToUri(false).AbsoluteUri);
- Assert.Equal(LightningConnectionType.Charge, conn.ConnectionType);
- Assert.Equal("aaa", conn.Username);
- Assert.Equal("bbb", conn.Password);
-
- Assert.False(LightningConnectionString.TryParse("lol://aaa:bbb@test/a", out conn));
- Assert.False(LightningConnectionString.TryParse("https://test/a", out conn));
- Assert.False(LightningConnectionString.TryParse("unix://dwewoi:dwdwqd@test/a", out conn));
- }
-
- [Fact]
- public void CanSendLightningPayment2()
- {
- using (var tester = ServerTester.Create())
+ Assert.True(LightningConnectionString.TryParse("/test/a", true, out conn));
+ for (int i = 0; i < 2; i++)
{
- tester.Start();
- tester.PrepareLightning();
- var user = tester.NewAccount();
- user.GrantAccess();
- user.RegisterLightningNode("BTC", LightningConnectionType.CLightning);
- user.RegisterDerivationScheme("BTC");
-
- var invoice = user.BitPay.CreateInvoice(new Invoice()
- {
- Price = 0.01m,
- Currency = "USD",
- PosData = "posData",
- OrderId = "orderId",
- ItemDesc = "Some description"
- });
-
- tester.SendLightningPayment(invoice);
-
- Eventually(() =>
- {
- var localInvoice = user.BitPay.GetInvoice(invoice.Id);
- Assert.Equal("complete", localInvoice.Status);
- Assert.Equal("False", localInvoice.ExceptionStatus.ToString());
- });
+ if (i == 1)
+ Assert.True(LightningConnectionString.TryParse(conn.ToString(), false, out conn));
+ Assert.Equal(i == 0, conn.IsLegacy);
+ Assert.Equal("type=clightning;server=unix://test/a", conn.ToString());
+ Assert.Equal("unix://test/a", conn.ToUri(true).AbsoluteUri);
+ Assert.Equal("unix://test/a", conn.ToUri(false).AbsoluteUri);
+ Assert.Equal(LightningConnectionType.CLightning, conn.ConnectionType);
}
+
+ Assert.True(LightningConnectionString.TryParse("unix://test/a", true, out conn));
+ for (int i = 0; i < 2; i++)
+ {
+ if (i == 1)
+ Assert.True(LightningConnectionString.TryParse(conn.ToString(), false, out conn));
+ Assert.Equal("type=clightning;server=unix://test/a", conn.ToString());
+ Assert.Equal("unix://test/a", conn.ToUri(true).AbsoluteUri);
+ Assert.Equal("unix://test/a", conn.ToUri(false).AbsoluteUri);
+ Assert.Equal(LightningConnectionType.CLightning, conn.ConnectionType);
+ }
+
+ Assert.True(LightningConnectionString.TryParse("unix://test/a", true, out conn));
+ for (int i = 0; i < 2; i++)
+ {
+ if (i == 1)
+ Assert.True(LightningConnectionString.TryParse(conn.ToString(), false, out conn));
+ Assert.Equal("type=clightning;server=unix://test/a", conn.ToString());
+ Assert.Equal("unix://test/a", conn.ToUri(true).AbsoluteUri);
+ Assert.Equal("unix://test/a", conn.ToUri(false).AbsoluteUri);
+ Assert.Equal(LightningConnectionType.CLightning, conn.ConnectionType);
+ }
+
+ Assert.True(LightningConnectionString.TryParse("tcp://test/a", true, out conn));
+ for (int i = 0; i < 2; i++)
+ {
+ if (i == 1)
+ Assert.True(LightningConnectionString.TryParse(conn.ToString(), false, out conn));
+ Assert.Equal("type=clightning;server=tcp://test/a", conn.ToString());
+ Assert.Equal("tcp://test/a", conn.ToUri(true).AbsoluteUri);
+ Assert.Equal("tcp://test/a", conn.ToUri(false).AbsoluteUri);
+ Assert.Equal(LightningConnectionType.CLightning, conn.ConnectionType);
+ }
+
+ Assert.True(LightningConnectionString.TryParse("http://aaa:bbb@test/a", true, out conn));
+ for (int i = 0; i < 2; i++)
+ {
+ if (i == 1)
+ Assert.True(LightningConnectionString.TryParse(conn.ToString(), false, out conn));
+ Assert.Equal("type=charge;server=http://aaa:bbb@test/a", conn.ToString());
+ Assert.Equal("http://aaa:bbb@test/a", conn.ToUri(true).AbsoluteUri);
+ Assert.Equal("http://test/a", conn.ToUri(false).AbsoluteUri);
+ Assert.Equal(LightningConnectionType.Charge, conn.ConnectionType);
+ Assert.Equal("aaa", conn.Username);
+ Assert.Equal("bbb", conn.Password);
+ }
+
+ Assert.True(LightningConnectionString.TryParse("http://api-token:bbb@test/a", true, out conn));
+ for (int i = 0; i < 2; i++)
+ {
+ if (i == 1)
+ Assert.True(LightningConnectionString.TryParse(conn.ToString(), false, out conn));
+ Assert.Equal("type=charge;server=http://test/a;api-token=bbb", conn.ToString());
+ }
+
+ Assert.False(LightningConnectionString.TryParse("lol://aaa:bbb@test/a", true, out conn));
+ Assert.False(LightningConnectionString.TryParse("https://test/a", true, out conn));
+ Assert.False(LightningConnectionString.TryParse("unix://dwewoi:dwdwqd@test/a", true, out conn));
+ Assert.False(LightningConnectionString.TryParse("tcp://test/a", false, out conn));
+ Assert.False(LightningConnectionString.TryParse("type=charge;server=http://aaa:bbb@test/a;unk=lol", false, out conn));
+ Assert.False(LightningConnectionString.TryParse("type=charge;server=tcp://aaa:bbb@test/a", false, out conn));
+ Assert.False(LightningConnectionString.TryParse("type=charge", false, out conn));
+ Assert.False(LightningConnectionString.TryParse("type=clightning", false, out conn));
+ Assert.True(LightningConnectionString.TryParse("type=clightning;server=tcp://aaa:bbb@test/a", false, out conn));
+ Assert.True(LightningConnectionString.TryParse("type=clightning;server=/aaa:bbb@test/a", false, out conn));
+ Assert.True(LightningConnectionString.TryParse("type=clightning;server=unix://aaa:bbb@test/a", false, out conn));
+ Assert.False(LightningConnectionString.TryParse("type=clightning;server=wtf://aaa:bbb@test/a", false, out conn));
+
+ var macaroon = "0201036c6e640247030a10b0dbbde28f009f83d330bde05075ca251201301a160a0761646472657373120472656164120577726974651a170a08696e766f6963657312047265616412057772697465000006200ae088692e67cf14e767c3d2a4a67ce489150bf810654ff980e1b7a7e263d5e8";
+
+ var certthumbprint = "c51bb1d402306d0da00e85581b32aa56166bcbab7eb888ff925d7167eb436d06";
+
+ // We get this format from "openssl x509 -noout -fingerprint -sha256 -inform pem -in "
+ var certthumbprint2 = "C5:1B:B1:D4:02:30:6D:0D:A0:0E:85:58:1B:32:AA:56:16:6B:CB:AB:7E:B8:88:FF:92:5D:71:67:EB:43:6D:06";
+
+ var lndUri = $"type=lnd-rest;server=https://lnd:lnd@127.0.0.1:53280/;macaroon={macaroon};certthumbprint={certthumbprint}";
+ var lndUri2 = $"type=lnd-rest;server=https://lnd:lnd@127.0.0.1:53280/;macaroon={macaroon};certthumbprint={certthumbprint2}";
+
+ var certificateHash = new X509Certificate2(Encoders.Hex.DecodeData("2d2d2d2d2d424547494e2043455254494649434154452d2d2d2d2d0a4d494942396a4343415a7967417749424167495156397a62474252724e54716b4e4b55676d72524d377a414b42676771686b6a4f50515144416a41784d5238770a485159445651514b45785a73626d5167595856306232646c626d56795958526c5a43426a5a584a304d51347744415944565151444577564754304e56557a41650a467730784f4441304d6a55794d7a517a4d6a4261467730784f5441324d6a41794d7a517a4d6a42614d444578487a416442674e5642416f54466d78755a4342680a645852765a3256755a584a686447566b49474e6c636e5178446a414d42674e5642414d5442555a50513156544d466b77457759484b6f5a497a6a3043415159490a4b6f5a497a6a304441516344516741454b7557424568564f75707965434157476130766e713262712f59396b41755a78616865646d454553482b753936436d450a397577486b4b2b4a7667547a66385141783550513741357254637155374b57595170303175364f426c5443426b6a414f42674e56485138424166384542414d430a4171517744775944565230544151482f42415577417745422f7a427642674e56485245456144426d6767564754304e565534494a6247396a5957786f62334e300a6877522f4141414268784141414141414141414141414141414141414141414268775373474f69786877514b41457342687753702f717473687754417141724c0a687753702f6d4a72687753702f754f77687753702f714e59687753702f6874436877514b70514157687753702f6c42514d416f4743437147534d343942414d430a413067414d45554349464866716d595a5043647a4a5178386b47586859473834394c31766541364c784d6f7a4f5774356d726835416945413662756e51556c710a6558553070474168776c3041654d726a4d4974394c7652736179756162565a593278343d0a2d2d2d2d2d454e442043455254494649434154452d2d2d2d2d0a"))
+ .GetCertHash(System.Security.Cryptography.HashAlgorithmName.SHA256);
+
+
+ Assert.True(LightningConnectionString.TryParse(lndUri, false, out conn));
+ Assert.True(LightningConnectionString.TryParse(lndUri2, false, out var conn2));
+ Assert.Equal(conn2.ToString(), conn.ToString());
+ Assert.Equal(lndUri, conn.ToString());
+ Assert.Equal(LightningConnectionType.LndREST, conn.ConnectionType);
+ Assert.Equal(macaroon, Encoders.Hex.EncodeData(conn.Macaroon));
+ Assert.Equal(certthumbprint.Replace(":", "", StringComparison.OrdinalIgnoreCase).ToLowerInvariant(), Encoders.Hex.EncodeData(conn.CertificateThumbprint));
+ Assert.True(certificateHash.SequenceEqual(conn.CertificateThumbprint));
+
+ // AllowInsecure can be set to allow http
+ Assert.False(LightningConnectionString.TryParse($"type=lnd-rest;server=http://127.0.0.1:53280/;macaroon={macaroon};allowinsecure=false", false, out conn2));
+ Assert.True(LightningConnectionString.TryParse($"type=lnd-rest;server=http://127.0.0.1:53280/;macaroon={macaroon};allowinsecure=true", false, out conn2));
+ Assert.True(LightningConnectionString.TryParse($"type=lnd-rest;server=http://127.0.0.1:53280/;macaroon={macaroon};allowinsecure=true", false, out conn2));
}
[Fact]
- public void CanSendLightningPayment()
+ public void CanSendLightningPaymentCLightning()
{
+ ProcessLightningPayment(LightningConnectionType.CLightning);
+ }
+
+ [Fact]
+ public void CanSendLightningPaymentCharge()
+ {
+ ProcessLightningPayment(LightningConnectionType.Charge);
+ }
+
+ [Fact]
+ public void CanSendLightningPaymentLnd()
+ {
+ ProcessLightningPayment(LightningConnectionType.LndREST);
+ }
+
+ void ProcessLightningPayment(LightningConnectionType type)
+ {
+ // For easier debugging and testing
+ // LightningLikePaymentHandler.LIGHTNING_TIMEOUT = int.MaxValue;
using (var tester = ServerTester.Create())
{
tester.Start();
- tester.PrepareLightning();
var user = tester.NewAccount();
user.GrantAccess();
- user.RegisterLightningNode("BTC", LightningConnectionType.Charge);
+ user.RegisterLightningNode("BTC", type);
user.RegisterDerivationScheme("BTC");
+
+ tester.PrepareLightning(type);
- var invoice = user.BitPay.CreateInvoice(new Invoice()
- {
- Price = 0.01m,
- Currency = "USD",
- PosData = "posData",
- OrderId = "orderId",
- ItemDesc = "Some description"
- });
-
- tester.SendLightningPayment(invoice);
-
- Eventually(() =>
- {
- var localInvoice = user.BitPay.GetInvoice(invoice.Id);
- Assert.Equal("complete", localInvoice.Status);
- Assert.Equal("False", localInvoice.ExceptionStatus.ToString());
- });
-
+ Task.WaitAll(CanSendLightningPaymentCore(tester, user));
Task.WaitAll(Enumerable.Range(0, 5)
.Select(_ => CanSendLightningPaymentCore(tester, user))
@@ -538,7 +588,10 @@ namespace BTCPayServer.Tests
async Task CanSendLightningPaymentCore(ServerTester tester, TestAccount user)
{
- await Task.Delay(TimeSpan.FromSeconds(RandomUtils.GetUInt32() % 5));
+ // TODO: If this parameter is less than 1 second we start having concurrency problems
+ await Task.Delay(TimeSpan.FromMilliseconds(1000));
+ //
+
var invoice = await user.BitPay.CreateInvoiceAsync(new Invoice()
{
Price = 0.01m,
@@ -1344,8 +1397,9 @@ namespace BTCPayServer.Tests
Assert.NotNull(vm.SelectedAppType);
Assert.Null(vm.Name);
vm.Name = "test";
+ vm.SelectedAppType = AppType.PointOfSale.ToString();
var redirectToAction = Assert.IsType(apps.CreateApp(vm).Result);
- Assert.Equal(nameof(apps.ListApps), redirectToAction.ActionName);
+ Assert.Equal(nameof(apps.UpdatePointOfSale), redirectToAction.ActionName);
var appList = Assert.IsType(Assert.IsType(apps.ListApps().Result).Model);
var appList2 = Assert.IsType(Assert.IsType(apps2.ListApps().Result).Model);
Assert.Single(appList.Apps);
diff --git a/BTCPayServer.Tests/UnitTestPeusa.cs b/BTCPayServer.Tests/UnitTestPeusa.cs
new file mode 100644
index 000000000..14b4e3717
--- /dev/null
+++ b/BTCPayServer.Tests/UnitTestPeusa.cs
@@ -0,0 +1,48 @@
+using System;
+using NBitcoin;
+using Xunit;
+
+namespace BTCPayServer.Tests
+{
+ // Helper class for testing functionality and generating data needed during coding/debuging
+ public class UnitTestPeusa
+ {
+ // Unit test that generates temorary checkout Bitpay page
+ // https://forkbitpay.slack.com/archives/C7M093Z55/p1508293682000217
+
+ // Testnet of Bitpay down
+ //[Fact]
+ //public void BitpayCheckout()
+ //{
+ // var key = new Key(Encoders.Hex.DecodeData("7b70a06f35562873e3dcb46005ed0fe78e1991ad906e56adaaafa40ba861e056"));
+ // var url = new Uri("https://test.bitpay.com/");
+ // var btcpay = new Bitpay(key, url);
+ // var invoice = btcpay.CreateInvoice(new Invoice()
+ // {
+
+ // Price = 5.0,
+ // Currency = "USD",
+ // PosData = "posData",
+ // OrderId = "cdfd8a5f-6928-4c3b-ba9b-ddf438029e73",
+ // ItemDesc = "Hello from the otherside"
+ // }, Facade.Merchant);
+
+ // // go to invoice.Url
+ // Console.WriteLine(invoice.Url);
+ //}
+
+ // Generating Extended public key to use on http://localhost:14142/stores/{storeId}
+ [Fact]
+ public void GeneratePubkey()
+ {
+ var network = Network.RegTest;
+
+ ExtKey masterKey = new ExtKey();
+ Console.WriteLine("Master key : " + masterKey.ToString(network));
+ ExtPubKey masterPubKey = masterKey.Neuter();
+
+ ExtPubKey pubkey = masterPubKey.Derive(0);
+ Console.WriteLine("PubKey " + 0 + " : " + pubkey.ToString(network));
+ }
+ }
+}
diff --git a/BTCPayServer.Tests/docker-compose.yml b/BTCPayServer.Tests/docker-compose.yml
index b12b8c10b..2e093e43e 100644
--- a/BTCPayServer.Tests/docker-compose.yml
+++ b/BTCPayServer.Tests/docker-compose.yml
@@ -17,9 +17,10 @@ services:
TESTS_POSTGRES: User ID=postgres;Host=postgres;Port=5432;Database=btcpayserver
TESTS_PORT: 80
TESTS_HOSTNAME: tests
- TEST_MERCHANTLIGHTNINGD: "/etc/merchant_lightningd_datadir/lightning-rpc"
- TEST_CUSTOMERLIGHTNINGD: "/etc/customer_lightningd_datadir/lightning-rpc"
- TEST_MERCHANTCHARGE: http://api-token:foiewnccewuify@lightning-charged:9112/
+ TEST_MERCHANTLIGHTNINGD: "type=clightning;server=/etc/merchant_lightningd_datadir/lightning-rpc"
+ TEST_CUSTOMERLIGHTNINGD: "type=clightning;server=/etc/customer_lightningd_datadir/lightning-rpc"
+ TEST_MERCHANTCHARGE: "type=charge;server=https://lightning-charged:9112/;api-token=foiewnccewuify;allowinsecure=true"
+ TEST_MERCHANTLND: "type=lnd-rest;server=https://lnd:lnd@127.0.0.1:53280/;allowinsecure=true"
TESTS_INCONTAINER: "true"
expose:
- "80"
@@ -44,9 +45,25 @@ services:
- customer_lightningd
- merchant_lightningd
- lightning-charged
+ - customer_lnd
+ - merchant_lnd
+
+ devlnd:
+ image: nicolasdorier/docker-bitcoin:0.16.0
+ environment:
+ BITCOIN_EXTRA_ARGS: |
+ regtest=1
+ connect=bitcoind:39388
+ links:
+ - nbxplorer
+ - postgres
+ - customer_lnd
+ - merchant_lnd
+
+
nbxplorer:
- image: nicolasdorier/nbxplorer:1.0.2.8
+ image: nicolasdorier/nbxplorer:1.0.2.14
ports:
- "32838:32838"
expose:
@@ -80,8 +97,13 @@ services:
rpcport=43782
port=39388
whitelist=0.0.0.0/0
+ zmqpubrawtx=tcp://0.0.0.0:28332
+ zmqpubrawblock=tcp://0.0.0.0:28332
+ zmqpubrawtxlock=tcp://0.0.0.0:28332
+ zmqpubhashblock=tcp://0.0.0.0:28332
ports:
- "43782:43782"
+ - "28332:28332"
expose:
- "43782" # RPC
- "39388" # P2P
@@ -89,7 +111,7 @@ services:
- "bitcoin_datadir:/data"
customer_lightningd:
- image: nicolasdorier/clightning:0.0.0.20-dev
+ image: nicolasdorier/clightning:v0.6-dev
environment:
EXPOSE_TCP: "true"
LIGHTNINGD_OPT: |
@@ -112,7 +134,7 @@ services:
- bitcoind
lightning-charged:
- image: shesek/lightning-charge:0.3.12
+ image: shesek/lightning-charge:0.3.15
environment:
NETWORK: regtest
API_TOKEN: foiewnccewuify
@@ -131,7 +153,7 @@ services:
- merchant_lightningd
merchant_lightningd:
- image: nicolasdorier/clightning:0.0.0.20-dev
+ image: nicolasdorier/clightning:v0.6-dev
environment:
EXPOSE_TCP: "true"
LIGHTNINGD_OPT: |
@@ -177,8 +199,59 @@ services:
expose:
- "5432"
+ merchant_lnd:
+ image: btcpayserver/lnd:0.4.2.0
+ environment:
+ LND_CHAIN: "btc"
+ LND_ENVIRONMENT: "regtest"
+ LND_EXTRA_ARGS: |
+ restlisten=0.0.0.0:8080
+ bitcoin.node=bitcoind
+ bitcoind.rpchost=bitcoind:43782
+ bitcoind.zmqpath=tcp://bitcoind:28332
+ externalip=merchant_lnd:9735
+ no-macaroons=1
+ debuglevel=debug
+ noencryptwallet=1
+ ports:
+ - "53280:8080"
+ expose:
+ - "9735"
+ volumes:
+ - "merchant_lnd_datadir:/data"
+ - "bitcoin_datadir:/deps/.bitcoin"
+ links:
+ - bitcoind
+
+ customer_lnd:
+ image: btcpayserver/lnd:0.4.2.0
+ environment:
+ LND_CHAIN: "btc"
+ LND_ENVIRONMENT: "regtest"
+ LND_EXTRA_ARGS: |
+ restlisten=0.0.0.0:8080
+ bitcoin.node=bitcoind
+ bitcoind.rpchost=bitcoind:43782
+ bitcoind.zmqpath=tcp://bitcoind:28332
+ externalip=customer_lnd:10009
+ no-macaroons=1
+ debuglevel=debug
+ noencryptwallet=1
+ ports:
+ - "53281:8080"
+ expose:
+ - "8080"
+ - "10009"
+ volumes:
+ - "customer_lnd_datadir:/root/.lnd"
+ - "bitcoin_datadir:/deps/.bitcoin"
+ links:
+ - bitcoind
+
volumes:
bitcoin_datadir:
customer_lightningd_datadir:
merchant_lightningd_datadir:
lightning_charge_datadir:
+ customer_lnd_datadir:
+ merchant_lnd_datadir:
diff --git a/BTCPayServer/BTCPayNetwork.cs b/BTCPayServer/BTCPayNetwork.cs
index bc0be4841..685215e6b 100644
--- a/BTCPayServer/BTCPayNetwork.cs
+++ b/BTCPayServer/BTCPayNetwork.cs
@@ -44,6 +44,8 @@ namespace BTCPayServer
public string CryptoCode { get; internal set; }
public string BlockExplorerLink { get; internal set; }
public string UriScheme { get; internal set; }
+ public Money MinFee { get; internal set; }
+ public string DisplayName { get; set; }
[Obsolete("Should not be needed")]
public bool IsBTC
diff --git a/BTCPayServer/BTCPayNetworkProvider.Bitcoin.cs b/BTCPayServer/BTCPayNetworkProvider.Bitcoin.cs
index 911edff2c..b6752d0e2 100644
--- a/BTCPayServer/BTCPayNetworkProvider.Bitcoin.cs
+++ b/BTCPayServer/BTCPayNetworkProvider.Bitcoin.cs
@@ -17,12 +17,13 @@ namespace BTCPayServer
Add(new BTCPayNetwork()
{
CryptoCode = nbxplorerNetwork.CryptoCode,
+ DisplayName = "Bitcoin",
BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://www.smartbit.com.au/tx/{0}" : "https://testnet.smartbit.com.au/tx/{0}",
NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
NBXplorerNetwork = nbxplorerNetwork,
UriScheme = "bitcoin",
- CryptoImagePath = "imlegacy/bitcoin-symbol.svg",
- LightningImagePath = "imlegacy/btc-lightning.svg",
+ CryptoImagePath = "imlegacy/bitcoin.svg",
+ LightningImagePath = "imlegacy/bitcoin-lightning.svg",
DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("0'") : new KeyPath("1'")
});
diff --git a/BTCPayServer/BTCPayNetworkProvider.BitcoinGold.cs b/BTCPayServer/BTCPayNetworkProvider.BitcoinGold.cs
index c75c3dd18..891483763 100644
--- a/BTCPayServer/BTCPayNetworkProvider.BitcoinGold.cs
+++ b/BTCPayServer/BTCPayNetworkProvider.BitcoinGold.cs
@@ -10,6 +10,7 @@ namespace BTCPayServer
Add(new BTCPayNetwork()
{
CryptoCode = nbxplorerNetwork.CryptoCode,
+ DisplayName = "BGold",
BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://explorer.bitcoingold.org/insight/tx/{0}/" : "https://test-explorer.bitcoingold.org/insight/tx/{0}",
NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
NBXplorerNetwork = nbxplorerNetwork,
@@ -19,8 +20,8 @@ namespace BTCPayServer
"BTG_X = BTG_BTC * BTC_X",
"BTG_BTC = bitfinex(BTG_BTC)",
},
- CryptoImagePath = "imlegacy/btg-symbol.svg",
- LightningImagePath = "imlegacy/btg-symbol.svg",
+ CryptoImagePath = "imlegacy/btg.svg",
+ LightningImagePath = "imlegacy/btg-lightning.svg",
DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("156'") : new KeyPath("1'")
});
diff --git a/BTCPayServer/BTCPayNetworkProvider.Dogecoin.cs b/BTCPayServer/BTCPayNetworkProvider.Dogecoin.cs
index e12ceaff7..d583c20e2 100644
--- a/BTCPayServer/BTCPayNetworkProvider.Dogecoin.cs
+++ b/BTCPayServer/BTCPayNetworkProvider.Dogecoin.cs
@@ -16,6 +16,7 @@ namespace BTCPayServer
Add(new BTCPayNetwork()
{
CryptoCode = nbxplorerNetwork.CryptoCode,
+ DisplayName = "Dogecoin",
BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://dogechain.info/tx/{0}" : "https://dogechain.info/tx/{0}",
NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
NBXplorerNetwork = nbxplorerNetwork,
@@ -27,7 +28,8 @@ namespace BTCPayServer
},
CryptoImagePath = "imlegacy/dogecoin.png",
DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
- CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("3'") : new KeyPath("1'")
+ CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("3'") : new KeyPath("1'"),
+ MinFee = Money.Coins(1m)
});
}
}
diff --git a/BTCPayServer/BTCPayNetworkProvider.Feathercoin.cs b/BTCPayServer/BTCPayNetworkProvider.Feathercoin.cs
index 2f48274b1..8f9642e2f 100644
--- a/BTCPayServer/BTCPayNetworkProvider.Feathercoin.cs
+++ b/BTCPayServer/BTCPayNetworkProvider.Feathercoin.cs
@@ -16,6 +16,7 @@ namespace BTCPayServer
Add(new BTCPayNetwork()
{
CryptoCode = nbxplorerNetwork.CryptoCode,
+ DisplayName = "Feathercoin",
BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://explorer.feathercoin.com/tx/{0}" : "https://explorer.feathercoin.com/tx/{0}",
NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
NBXplorerNetwork = nbxplorerNetwork,
diff --git a/BTCPayServer/BTCPayNetworkProvider.Groestlcoin.cs b/BTCPayServer/BTCPayNetworkProvider.Groestlcoin.cs
new file mode 100644
index 000000000..50ad0cf33
--- /dev/null
+++ b/BTCPayServer/BTCPayNetworkProvider.Groestlcoin.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using NBitcoin;
+
+namespace BTCPayServer
+{
+ public partial class BTCPayNetworkProvider
+ {
+ public void InitGroestlcoin()
+ {
+
+ var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("GRS");
+ Add(new BTCPayNetwork()
+ {
+ CryptoCode = nbxplorerNetwork.CryptoCode,
+ DisplayName = "Groestlcoin",
+ BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://chainz.cryptoid.info/grs/tx.dws?{0}.htm" : "https://chainz.cryptoid.info/grs-test/tx.dws?{0}.htm",
+ NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
+ NBXplorerNetwork = nbxplorerNetwork,
+ UriScheme = "groestlcoin",
+ DefaultRateRules = new[]
+ {
+ "GRS_X = GRS_BTC * BTC_X",
+ "GRS_BTC = bittrex(GRS_BTC)"
+ },
+ CryptoImagePath = "imlegacy/groestlcoin.png",
+ DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
+ CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("17'") : new KeyPath("1'")
+ });
+ }
+ }
+}
diff --git a/BTCPayServer/BTCPayNetworkProvider.Litecoin.cs b/BTCPayServer/BTCPayNetworkProvider.Litecoin.cs
index 42b3de248..c09692f49 100644
--- a/BTCPayServer/BTCPayNetworkProvider.Litecoin.cs
+++ b/BTCPayServer/BTCPayNetworkProvider.Litecoin.cs
@@ -16,12 +16,13 @@ namespace BTCPayServer
Add(new BTCPayNetwork()
{
CryptoCode = nbxplorerNetwork.CryptoCode,
+ DisplayName = "Litecoin",
BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://live.blockcypher.com/ltc/tx/{0}/" : "http://explorer.litecointools.com/tx/{0}",
NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
NBXplorerNetwork = nbxplorerNetwork,
UriScheme = "litecoin",
- CryptoImagePath = "imlegacy/litecoin-symbol.svg",
- LightningImagePath = "imlegacy/ltc-lightning.svg",
+ CryptoImagePath = "imlegacy/litecoin.svg",
+ LightningImagePath = "imlegacy/litecoin-lightning.svg",
DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("2'") : new KeyPath("1'")
});
diff --git a/BTCPayServer/BTCPayNetworkProvider.Monacoin.cs b/BTCPayServer/BTCPayNetworkProvider.Monacoin.cs
index bb086132b..07798cd6e 100644
--- a/BTCPayServer/BTCPayNetworkProvider.Monacoin.cs
+++ b/BTCPayServer/BTCPayNetworkProvider.Monacoin.cs
@@ -16,6 +16,7 @@ namespace BTCPayServer
Add(new BTCPayNetwork()
{
CryptoCode = nbxplorerNetwork.CryptoCode,
+ DisplayName = "Monacoin",
BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://mona.insight.monaco-ex.org/insight/tx/{0}" : "https://testnet-mona.insight.monaco-ex.org/insight/tx/{0}",
NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
NBXplorerNetwork = nbxplorerNetwork,
diff --git a/BTCPayServer/BTCPayNetworkProvider.Polis.cs b/BTCPayServer/BTCPayNetworkProvider.Polis.cs
index 69640dab1..5379477c6 100644
--- a/BTCPayServer/BTCPayNetworkProvider.Polis.cs
+++ b/BTCPayServer/BTCPayNetworkProvider.Polis.cs
@@ -16,6 +16,7 @@ namespace BTCPayServer
Add(new BTCPayNetwork()
{
CryptoCode = nbxplorerNetwork.CryptoCode,
+ DisplayName = "Polis",
BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://insight.polispay.org/tx/{0}" : "https://insight.polispay.org/tx/{0}",
NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
NBXplorerNetwork = nbxplorerNetwork,
diff --git a/BTCPayServer/BTCPayNetworkProvider.Ufo.cs b/BTCPayServer/BTCPayNetworkProvider.Ufo.cs
index 45a3e6d6f..801bd7194 100644
--- a/BTCPayServer/BTCPayNetworkProvider.Ufo.cs
+++ b/BTCPayServer/BTCPayNetworkProvider.Ufo.cs
@@ -16,6 +16,7 @@ namespace BTCPayServer
Add(new BTCPayNetwork()
{
CryptoCode = nbxplorerNetwork.CryptoCode,
+ DisplayName = "Ufo",
BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://chainz.cryptoid.info/ufo/tx.dws?{0}" : "https://chainz.cryptoid.info/ufo/tx.dws?{0}",
NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
NBXplorerNetwork = nbxplorerNetwork,
diff --git a/BTCPayServer/BTCPayNetworkProvider.Viacoin.cs b/BTCPayServer/BTCPayNetworkProvider.Viacoin.cs
new file mode 100644
index 000000000..58103a7cc
--- /dev/null
+++ b/BTCPayServer/BTCPayNetworkProvider.Viacoin.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
+using NBitcoin;
+using NBXplorer;
+
+namespace BTCPayServer
+{
+ public partial class BTCPayNetworkProvider
+ {
+ public void InitViacoin()
+ {
+ var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("VIA");
+ Add(new BTCPayNetwork()
+ {
+ CryptoCode = nbxplorerNetwork.CryptoCode,
+ DisplayName = "Viacoin",
+ BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://explorer.viacoin.org/tx/{0}" : "https://explorer.viacoin.org/tx/{0}",
+ NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
+ NBXplorerNetwork = nbxplorerNetwork,
+ UriScheme = "viacoin",
+ DefaultRateRules = new[]
+ {
+ "VIA_X = VIA_BTC * BTC_X",
+ "VIA_BTC = bittrex(VIA_BTC)"
+ },
+ CryptoImagePath = "imlegacy/viacoin.png",
+ DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
+ CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("14'") : new KeyPath("1'")
+ });
+ }
+ }
+}
diff --git a/BTCPayServer/BTCPayNetworkProvider.cs b/BTCPayServer/BTCPayNetworkProvider.cs
index 5a1c997ce..8c7e8b1e2 100644
--- a/BTCPayServer/BTCPayNetworkProvider.cs
+++ b/BTCPayServer/BTCPayNetworkProvider.cs
@@ -52,7 +52,9 @@ namespace BTCPayServer
InitMonacoin();
InitPolis();
InitFeathercoin();
- InitUfo();
+ InitGroestlcoin();
+ InitViacoin();
+ //InitUfo();
}
///
diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj
index def5d1e8f..5eca11a60 100644
--- a/BTCPayServer/BTCPayServer.csproj
+++ b/BTCPayServer/BTCPayServer.csproj
@@ -2,7 +2,7 @@
Exe
netcoreapp2.1
- 1.0.2.34
+ 1.0.2.78
NU1701,CA1816,CA1308,CA1810,CA2208
@@ -35,19 +35,20 @@
-
+
-
-
+
+
-
+
-
+
+
@@ -111,6 +112,34 @@
+
+
+
+
+
+ $(IncludeRazorContentInPack)
+
+
+ $(IncludeRazorContentInPack)
+
+
+ $(IncludeRazorContentInPack)
+
+
+ $(IncludeRazorContentInPack)
+
+
+ $(IncludeRazorContentInPack)
+
+
+ $(IncludeRazorContentInPack)
+
+
+ $(IncludeRazorContentInPack)
+
+
+ $(IncludeRazorContentInPack)
+
diff --git a/BTCPayServer/Configuration/BTCPayServerOptions.cs b/BTCPayServer/Configuration/BTCPayServerOptions.cs
index 2ed2e665d..31964bcc7 100644
--- a/BTCPayServer/Configuration/BTCPayServerOptions.cs
+++ b/BTCPayServer/Configuration/BTCPayServerOptions.cs
@@ -74,16 +74,40 @@ namespace BTCPayServer.Configuration
setting.ExplorerUri = conf.GetOrDefault($"{net.CryptoCode}.explorer.url", net.NBXplorerNetwork.DefaultSettings.DefaultUrl);
setting.CookieFile = conf.GetOrDefault($"{net.CryptoCode}.explorer.cookiefile", net.NBXplorerNetwork.DefaultSettings.DefaultCookieFile);
NBXplorerConnectionSettings.Add(setting);
- var lightning = conf.GetOrDefault($"{net.CryptoCode}.lightning", string.Empty);
- if(lightning.Length != 0)
{
- if(!LightningConnectionString.TryParse(lightning, out var connectionString, out var error))
+ var lightning = conf.GetOrDefault($"{net.CryptoCode}.lightning", string.Empty);
+ if (lightning.Length != 0)
{
- throw new ConfigException($"Invalid setting {net.CryptoCode}.lightning, you need to pass either " +
- $"the absolute path to the unix socket of a running CLightning instance (eg. /root/.lightning/lightning-rpc), " +
- $"or the url to a charge server with crendetials (eg. https://apitoken@API_TOKEN_SECRET:charge.example.com/)");
+ if (!LightningConnectionString.TryParse(lightning, true, out var connectionString, out var error))
+ {
+ throw new ConfigException($"Invalid setting {net.CryptoCode}.lightning, " + Environment.NewLine +
+ $"If you have a lightning server use: 'type=clightning;server=/root/.lightning/lightning-rpc', " + Environment.NewLine +
+ $"If you have a lightning charge server: 'type=charge;server=https://charge.example.com;api-token=yourapitoken'" + Environment.NewLine +
+ $"If you have a lnd server: 'type=lnd-rest;server=https://lnd:lnd@lnd.example.com;macaroon=abf239...;certthumbprint=2abdf302...'" + Environment.NewLine +
+ $" lnd server: 'type=lnd-rest;server=https://lnd:lnd@lnd.example.com;macaroonfilepath=/root/.lnd/admin.macaroon;certthumbprint=2abdf302...'" + Environment.NewLine +
+ error);
+ }
+ if (connectionString.IsLegacy)
+ {
+ Logs.Configuration.LogWarning($"Setting {net.CryptoCode}.lightning will work but use an deprecated format, please replace it by '{connectionString.ToString()}'");
+ }
+ InternalLightningByCryptoCode.Add(net.CryptoCode, connectionString);
+ }
+ }
+
+ {
+ var lightning = conf.GetOrDefault($"{net.CryptoCode}.external.lnd.grpc", string.Empty);
+ if (lightning.Length != 0)
+ {
+ if (!LightningConnectionString.TryParse(lightning, false, out var connectionString, out var error))
+ {
+ throw new ConfigException($"Invalid setting {net.CryptoCode}.external.lnd.grpc, " + Environment.NewLine +
+ $"lnd server: 'type=lnd-grpc;server=https://lnd.example.com;macaroon=abf239...;certthumbprint=2abdf302...'" + Environment.NewLine +
+ $"lnd server: 'type=lnd-grpc;server=https://lnd.example.com;macaroonfilepath=/root/.lnd/admin.macaroon;certthumbprint=2abdf302...'" + Environment.NewLine +
+ error);
+ }
+ ExternalServicesByCryptoCode.Add(net.CryptoCode, new ExternalLNDGRPC(connectionString));
}
- InternalLightningByCryptoCode.Add(net.CryptoCode, connectionString);
}
}
@@ -97,11 +121,12 @@ namespace BTCPayServer.Configuration
if (!RootPath.StartsWith("/", StringComparison.InvariantCultureIgnoreCase))
RootPath = "/" + RootPath;
var old = conf.GetOrDefault("internallightningnode", null);
- if(old != null)
+ if (old != null)
throw new ConfigException($"internallightningnode should not be used anymore, use btclightning instead");
}
public string RootPath { get; set; }
public Dictionary InternalLightningByCryptoCode { get; set; } = new Dictionary();
+ public ExternalServices ExternalServicesByCryptoCode { get; set; } = new ExternalServices();
public BTCPayNetworkProvider NetworkProvider { get; set; }
public string PostgresConnectionString
@@ -129,4 +154,29 @@ namespace BTCPayServer.Configuration
return builder.ToString();
}
}
+
+ public class ExternalServices : MultiValueDictionary
+ {
+ public IEnumerable GetServices(string cryptoCode) where T : ExternalService
+ {
+ if (!this.TryGetValue(cryptoCode.ToUpperInvariant(), out var services))
+ return Array.Empty();
+ return services.OfType();
+ }
+ }
+
+ public class ExternalService
+ {
+
+ }
+
+ public class ExternalLNDGRPC : ExternalService
+ {
+ public ExternalLNDGRPC(LightningConnectionString connectionString)
+ {
+ ConnectionString = connectionString;
+ }
+
+ public LightningConnectionString ConnectionString { get; set; }
+ }
}
diff --git a/BTCPayServer/Configuration/DefaultConfiguration.cs b/BTCPayServer/Configuration/DefaultConfiguration.cs
index d4bb141a3..d216f86f5 100644
--- a/BTCPayServer/Configuration/DefaultConfiguration.cs
+++ b/BTCPayServer/Configuration/DefaultConfiguration.cs
@@ -27,19 +27,20 @@ namespace BTCPayServer.Configuration
};
app.HelpOption("-? | -h | --help");
app.Option("-n | --network", $"Set the network among (mainnet,testnet,regtest) (default: mainnet)", CommandOptionType.SingleValue);
- app.Option("--testnet | -testnet", $"Use testnet (Deprecated, use --network instead)", CommandOptionType.BoolValue);
- app.Option("--regtest | -regtest", $"Use regtest (Deprecated, use --network instead)", CommandOptionType.BoolValue);
- app.Option("--chains | -c", $"Chains to support comma separated (default: btc, available: {chains})", CommandOptionType.SingleValue);
- app.Option("--postgres", $"Connection string to postgres database (default: sqlite is used)", CommandOptionType.SingleValue);
- app.Option("--externalurl", $"The expected external url of this service, to use if BTCPay is behind a reverse proxy (default: empty, use the incoming HTTP request to figure out)", CommandOptionType.SingleValue);
- app.Option("--bundlejscss", $"Bundle javascript and css files for better performance (default: true)", CommandOptionType.SingleValue);
+ app.Option("--testnet | -testnet", $"Use testnet (deprecated, use --network instead)", CommandOptionType.BoolValue);
+ app.Option("--regtest | -regtest", $"Use regtest (deprecated, use --network instead)", CommandOptionType.BoolValue);
+ app.Option("--chains | -c", $"Chains to support as a comma separated (default: btc; available: {chains})", CommandOptionType.SingleValue);
+ app.Option("--postgres", $"Connection string to a PostgreSQL database (default: SQLite)", CommandOptionType.SingleValue);
+ app.Option("--externalurl", $"The expected external URL of this service, to use if BTCPay is behind a reverse proxy (default: empty, use the incoming HTTP request to figure out)", CommandOptionType.SingleValue);
+ app.Option("--bundlejscss", $"Bundle JavaScript and CSS files for better performance (default: true)", CommandOptionType.SingleValue);
app.Option("--rootpath", "The root path in the URL to access BTCPay (default: /)", CommandOptionType.SingleValue);
foreach (var network in provider.GetAll())
{
var crypto = network.CryptoCode.ToLowerInvariant();
- app.Option($"--{crypto}explorerurl", $"Url of the NBxplorer for {network.CryptoCode} (default: {network.NBXplorerNetwork.DefaultSettings.DefaultUrl})", CommandOptionType.SingleValue);
+ app.Option($"--{crypto}explorerurl", $"URL of the NBXplorer for {network.CryptoCode} (default: {network.NBXplorerNetwork.DefaultSettings.DefaultUrl})", CommandOptionType.SingleValue);
app.Option($"--{crypto}explorercookiefile", $"Path to the cookie file (default: {network.NBXplorerNetwork.DefaultSettings.DefaultCookieFile})", CommandOptionType.SingleValue);
- app.Option($"--{crypto}lightning", $"Easy configuration of lightning for the server adnistrator: Must be a unix socket of CLightning (lightning-rpc) or URL to a charge server (default: empty)", CommandOptionType.SingleValue);
+ app.Option($"--{crypto}lightning", $"Easy configuration of lightning for the server administrator: Must be a UNIX socket of c-lightning (lightning-rpc) or URL to a charge server (default: empty)", CommandOptionType.SingleValue);
+ app.Option($"--{crypto}externallndgrpc", $"The LND gRPC configuration BTCPay will expose to easily connect to the internal lnd wallet from Zap wallet (default: empty)", CommandOptionType.SingleValue);
}
return app;
}
diff --git a/BTCPayServer/Controllers/AppsController.PointOfSale.cs b/BTCPayServer/Controllers/AppsController.PointOfSale.cs
index 22f227a0b..938e79bce 100644
--- a/BTCPayServer/Controllers/AppsController.PointOfSale.cs
+++ b/BTCPayServer/Controllers/AppsController.PointOfSale.cs
@@ -134,7 +134,7 @@ namespace BTCPayServer.Controllers
});
await UpdateAppSettings(app);
StatusMessage = "App updated";
- return RedirectToAction(nameof(UpdatePointOfSale));
+ return RedirectToAction(nameof(ListApps));
}
[HttpGet]
@@ -162,7 +162,8 @@ namespace BTCPayServer.Controllers
using (var ctx = _ContextFactory.CreateContext())
{
return await ctx.Apps
- .Where(us => us.Id == appId && us.AppType == appType.ToString())
+ .Where(us => us.Id == appId &&
+ us.AppType == appType.ToString())
.FirstOrDefaultAsync();
}
}
diff --git a/BTCPayServer/Controllers/AppsController.cs b/BTCPayServer/Controllers/AppsController.cs
index 143f6d92a..e9e54bd8b 100644
--- a/BTCPayServer/Controllers/AppsController.cs
+++ b/BTCPayServer/Controllers/AppsController.cs
@@ -102,9 +102,9 @@ namespace BTCPayServer.Controllers
StatusMessage = "Error: You are not owner of this store";
return RedirectToAction(nameof(ListApps));
}
+ var id = Encoders.Base58.EncodeData(RandomUtils.GetBytes(32));
using (var ctx = _ContextFactory.CreateContext())
{
- var id = Encoders.Base58.EncodeData(RandomUtils.GetBytes(32));
var appData = new AppData() { Id = id };
appData.StoreDataId = selectedStore;
appData.Name = vm.Name;
@@ -113,6 +113,9 @@ namespace BTCPayServer.Controllers
await ctx.SaveChangesAsync();
}
StatusMessage = "App successfully created";
+
+ if (appType == AppType.PointOfSale)
+ return RedirectToAction(nameof(UpdatePointOfSale), new { appId = id });
return RedirectToAction(nameof(ListApps));
}
diff --git a/BTCPayServer/Controllers/HomeController.cs b/BTCPayServer/Controllers/HomeController.cs
index 49e7036f1..80c1328c7 100644
--- a/BTCPayServer/Controllers/HomeController.cs
+++ b/BTCPayServer/Controllers/HomeController.cs
@@ -5,6 +5,7 @@ using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using BTCPayServer.Models;
+using NBitcoin.DataEncoders;
namespace BTCPayServer.Controllers
{
diff --git a/BTCPayServer/Controllers/InvoiceController.PaymentProtocol.cs b/BTCPayServer/Controllers/InvoiceController.PaymentProtocol.cs
index 3966f40d6..198ef9cb3 100644
--- a/BTCPayServer/Controllers/InvoiceController.PaymentProtocol.cs
+++ b/BTCPayServer/Controllers/InvoiceController.PaymentProtocol.cs
@@ -78,7 +78,7 @@ namespace BTCPayServer.Controllers
var wallet = _WalletProvider.GetWallet(network);
if (wallet == null)
return NotFound();
- var payment = PaymentMessage.Load(Request.Body);
+ var payment = PaymentMessage.Load(Request.Body, network.NBitcoinNetwork);
var unused = wallet.BroadcastTransactionsAsync(payment.Transactions);
await _InvoiceRepository.AddRefundsAsync(invoiceId, payment.RefundTo.Select(p => new TxOut(p.Amount, p.Script)).ToArray(), network.NBitcoinNetwork);
return new PaymentAckActionResult(payment.CreateACK(invoiceId + " is currently processing, thanks for your purchase..."));
diff --git a/BTCPayServer/Controllers/InvoiceController.UI.cs b/BTCPayServer/Controllers/InvoiceController.UI.cs
index 0b04d6a36..76ba4f472 100644
--- a/BTCPayServer/Controllers/InvoiceController.UI.cs
+++ b/BTCPayServer/Controllers/InvoiceController.UI.cs
@@ -175,6 +175,7 @@ namespace BTCPayServer.Controllers
[Route("invoice")]
[AcceptMediaTypeConstraint("application/bitcoin-paymentrequest", false)]
[XFrameOptionsAttribute(null)]
+ [ReferrerPolicyAttribute("origin")]
public async Task Checkout(string invoiceId, string id = null, string paymentMethodId = null)
{
//Keep compatibility with Bitpay
@@ -186,6 +187,20 @@ namespace BTCPayServer.Controllers
if (model == null)
return NotFound();
+
+ _CSP.Add(new ConsentSecurityPolicy("script-src", "'unsafe-eval'")); // Needed by Vue
+ if (!string.IsNullOrEmpty(model.CustomCSSLink) &&
+ Uri.TryCreate(model.CustomCSSLink, UriKind.Absolute, out var uri))
+ {
+ _CSP.Clear();
+ }
+
+ if (!string.IsNullOrEmpty(model.CustomLogoLink) &&
+ Uri.TryCreate(model.CustomLogoLink, UriKind.Absolute, out uri))
+ {
+ _CSP.Clear();
+ }
+
return View(nameof(Checkout), model);
}
@@ -233,6 +248,8 @@ namespace BTCPayServer.Controllers
{
CryptoCode = network.CryptoCode,
PaymentMethodId = paymentMethodId.ToString(),
+ PaymentMethodName = GetDisplayName(paymentMethodId, network),
+ CryptoImage = GetImage(paymentMethodId, network),
IsLightning = paymentMethodId.PaymentType == PaymentTypes.LightningLike,
ServerUrl = HttpContext.Request.GetAbsoluteRoot(),
OrderId = invoice.OrderId,
@@ -264,7 +281,6 @@ namespace BTCPayServer.Controllers
TxCount = accounting.TxRequired,
BtcPaid = accounting.Paid.ToString(),
Status = invoice.Status,
- CryptoImage = "/" + GetImage(paymentMethodId, network),
NetworkFee = paymentMethodDetails.GetTxFee(),
IsMultiCurrency = invoice.GetPayments().Select(p => p.GetPaymentMethodId()).Concat(new[] { paymentMethod.GetId() }).Distinct().Count() > 1,
AllowCoinConversion = storeBlob.AllowCoinConversion,
@@ -273,10 +289,14 @@ namespace BTCPayServer.Controllers
.Select(kv => new PaymentModel.AvailableCrypto()
{
PaymentMethodId = kv.GetId().ToString(),
- CryptoImage = "/" + GetImage(kv.GetId(), kv.Network),
+ CryptoCode = kv.GetId().CryptoCode,
+ PaymentMethodName = GetDisplayName(kv.GetId(), kv.Network),
+ IsLightning = kv.GetId().PaymentType == PaymentTypes.LightningLike,
+ CryptoImage = GetImage(kv.GetId(), kv.Network),
Link = Url.Action(nameof(Checkout), new { invoiceId = invoiceId, paymentMethodId = kv.GetId().ToString() })
}).Where(c => c.CryptoImage != "/")
- .ToList()
+ .OrderByDescending(a => a.CryptoCode == "BTC").ThenBy(a => a.PaymentMethodName).ThenBy(a => a.IsLightning ? 1 : 0)
+ .ToList()
};
var expiration = TimeSpan.FromSeconds(model.ExpirationSeconds);
@@ -284,9 +304,17 @@ namespace BTCPayServer.Controllers
return model;
}
+ private string GetDisplayName(PaymentMethodId paymentMethodId, BTCPayNetwork network)
+ {
+ return paymentMethodId.PaymentType == PaymentTypes.BTCLike ?
+ network.DisplayName : network.DisplayName + " (via Lightning)";
+ }
+
private string GetImage(PaymentMethodId paymentMethodId, BTCPayNetwork network)
{
- return (paymentMethodId.PaymentType == PaymentTypes.BTCLike ? Url.Content(network.CryptoImagePath) : Url.Content(network.LightningImagePath));
+ var res = paymentMethodId.PaymentType == PaymentTypes.BTCLike ?
+ Url.Content(network.CryptoImagePath) : Url.Content(network.LightningImagePath);
+ return "/" + res;
}
private string OrderAmountFromInvoice(string cryptoCode, ProductInformation productInformation)
@@ -323,7 +351,7 @@ namespace BTCPayServer.Controllers
provider = (NumberFormatInfo)provider.Clone();
provider.CurrencyDecimalDigits = divisibility;
}
-
+
if (currencyData.Crypto)
return price.ToString("C", provider);
else
@@ -356,7 +384,7 @@ namespace BTCPayServer.Controllers
{
leases.Add(_EventAggregator.Subscribe(async o => await NotifySocket(webSocket, o.InvoiceId, invoiceId)));
leases.Add(_EventAggregator.Subscribe(async o => await NotifySocket(webSocket, o.InvoiceId, invoiceId)));
- leases.Add(_EventAggregator.Subscribe(async o => await NotifySocket(webSocket, o.InvoiceId, invoiceId)));
+ leases.Add(_EventAggregator.Subscribe(async o => await NotifySocket(webSocket, o.Invoice.Id, invoiceId)));
while (true)
{
var message = await webSocket.ReceiveAsync(DummyBuffer, default(CancellationToken));
@@ -535,8 +563,11 @@ namespace BTCPayServer.Controllers
[BitpayAPIConstraint(false)]
public async Task InvalidatePaidInvoice(string invoiceId)
{
+ var invoice = await _InvoiceRepository.GetInvoice(null, invoiceId);
+ if (invoice == null)
+ return NotFound();
await _InvoiceRepository.UpdatePaidInvoiceToInvalid(invoiceId);
- _EventAggregator.Publish(new InvoiceEvent(invoiceId, 1008, "invoice_markedInvalid"));
+ _EventAggregator.Publish(new InvoiceEvent(invoice.EntityToDTO(_NetworkProvider), 1008, "invoice_markedInvalid"));
return RedirectToAction(nameof(ListInvoices));
}
diff --git a/BTCPayServer/Controllers/InvoiceController.cs b/BTCPayServer/Controllers/InvoiceController.cs
index d449aa173..c6310bc6e 100644
--- a/BTCPayServer/Controllers/InvoiceController.cs
+++ b/BTCPayServer/Controllers/InvoiceController.cs
@@ -41,12 +41,14 @@ using NBXplorer;
using BTCPayServer.HostedServices;
using BTCPayServer.Payments;
using BTCPayServer.Rating;
+using BTCPayServer.Security;
namespace BTCPayServer.Controllers
{
public partial class InvoiceController : Controller
{
InvoiceRepository _InvoiceRepository;
+ ContentSecurityPolicies _CSP;
BTCPayRateProviderFactory _RateProvider;
StoreRepository _StoreRepository;
UserManager _UserManager;
@@ -64,6 +66,7 @@ namespace BTCPayServer.Controllers
StoreRepository storeRepository,
EventAggregator eventAggregator,
BTCPayWalletProvider walletProvider,
+ ContentSecurityPolicies csp,
BTCPayNetworkProvider networkProvider)
{
_ServiceProvider = serviceProvider;
@@ -75,11 +78,14 @@ namespace BTCPayServer.Controllers
_EventAggregator = eventAggregator;
_NetworkProvider = networkProvider;
_WalletProvider = walletProvider;
+ _CSP = csp;
}
internal async Task> CreateInvoiceCore(Invoice invoice, StoreData store, string serverUrl)
{
+ InvoiceLogs logs = new InvoiceLogs();
+ logs.Write("Creation of invoice starting");
var entity = new InvoiceEntity
{
InvoiceTime = DateTimeOffset.UtcNow
@@ -115,7 +121,6 @@ namespace BTCPayServer.Controllers
entity.Status = "new";
entity.SpeedPolicy = ParseSpeedPolicy(invoice.TransactionSpeed, store.SpeedPolicy);
-
HashSet currencyPairsToFetch = new HashSet();
var rules = storeBlob.GetRateRules(_NetworkProvider);
@@ -133,6 +138,7 @@ namespace BTCPayServer.Controllers
var rateRules = storeBlob.GetRateRules(_NetworkProvider);
var fetchingByCurrencyPair = _RateProvider.FetchRates(currencyPairsToFetch, rateRules);
+ var fetchingAll = WhenAllFetched(logs, fetchingByCurrencyPair);
var supportedPaymentMethods = store.GetSupportedPaymentMethods(_NetworkProvider)
.Select(c =>
(Handler: (IPaymentMethodHandler)_ServiceProvider.GetService(typeof(IPaymentMethodHandler<>).MakeGenericType(c.GetType())),
@@ -141,65 +147,26 @@ namespace BTCPayServer.Controllers
.Where(c => c.Network != null)
.Select(o =>
(SupportedPaymentMethod: o.SupportedPaymentMethod,
- PaymentMethod: CreatePaymentMethodAsync(fetchingByCurrencyPair, o.Handler, o.SupportedPaymentMethod, o.Network, entity, store)))
+ PaymentMethod: CreatePaymentMethodAsync(fetchingByCurrencyPair, o.Handler, o.SupportedPaymentMethod, o.Network, entity, store, logs)))
.ToList();
-
- List paymentMethodErrors = new List();
List supported = new List();
var paymentMethods = new PaymentMethodDictionary();
-
- foreach(var pair in fetchingByCurrencyPair)
- {
- var rateResult = await pair.Value;
- bool hasError = false;
- if(rateResult.Errors.Count != 0)
- {
- var allRateRuleErrors = string.Join(", ", rateResult.Errors.ToArray());
- paymentMethodErrors.Add($"{pair.Key}: Rate rule error ({allRateRuleErrors})");
- hasError = true;
- }
- if(rateResult.ExchangeExceptions.Count != 0)
- {
- foreach(var ex in rateResult.ExchangeExceptions)
- {
- paymentMethodErrors.Add($"{pair.Key}: Exception reaching exchange {ex.ExchangeName} ({ex.Exception.Message})");
- }
- hasError = true;
- }
- if(hasError)
- {
- paymentMethodErrors.Add($"{pair.Key}: The rule is {rateResult.Rule}");
- paymentMethodErrors.Add($"{pair.Key}: Evaluated rule is {rateResult.EvaluatedRule}");
- }
- }
-
foreach (var o in supportedPaymentMethods)
{
- try
- {
- var paymentMethod = await o.PaymentMethod;
- if (paymentMethod == null)
- throw new PaymentMethodUnavailableException("Payment method unavailable");
- supported.Add(o.SupportedPaymentMethod);
- paymentMethods.Add(paymentMethod);
- }
- catch (PaymentMethodUnavailableException ex)
- {
- paymentMethodErrors.Add($"{o.SupportedPaymentMethod.PaymentId.CryptoCode} ({o.SupportedPaymentMethod.PaymentId.PaymentType}): Payment method unavailable ({ex.Message})");
- }
- catch (Exception ex)
- {
- paymentMethodErrors.Add($"{o.SupportedPaymentMethod.PaymentId.CryptoCode} ({o.SupportedPaymentMethod.PaymentId.PaymentType}): Unexpected exception ({ex.ToString()})");
- }
+ var paymentMethod = await o.PaymentMethod;
+ if (paymentMethod == null)
+ continue;
+ supported.Add(o.SupportedPaymentMethod);
+ paymentMethods.Add(paymentMethod);
}
if (supported.Count == 0)
{
StringBuilder errors = new StringBuilder();
errors.AppendLine("No payment method available for this store");
- foreach (var error in paymentMethodErrors)
+ foreach (var error in logs.ToList())
{
- errors.AppendLine(error);
+ errors.AppendLine(error.ToString());
}
throw new BitpayHttpException(400, errors.ToString());
}
@@ -207,71 +174,108 @@ namespace BTCPayServer.Controllers
entity.SetSupportedPaymentMethods(supported);
entity.SetPaymentMethods(paymentMethods);
entity.PosData = invoice.PosData;
- entity = await _InvoiceRepository.CreateInvoiceAsync(store.Id, entity, paymentMethodErrors, _NetworkProvider);
-
- _EventAggregator.Publish(new Events.InvoiceEvent(entity, 1001, "invoice_created"));
+ entity = await _InvoiceRepository.CreateInvoiceAsync(store.Id, entity, logs, _NetworkProvider);
+ await fetchingAll;
+ _EventAggregator.Publish(new Events.InvoiceEvent(entity.EntityToDTO(_NetworkProvider), 1001, "invoice_created"));
var resp = entity.EntityToDTO(_NetworkProvider);
return new DataWrapper(resp) { Facade = "pos/invoice" };
}
- private async Task CreatePaymentMethodAsync(Dictionary> fetchingByCurrencyPair, IPaymentMethodHandler handler, ISupportedPaymentMethod supportedPaymentMethod, BTCPayNetwork network, InvoiceEntity entity, StoreData store)
+ private Task WhenAllFetched(InvoiceLogs logs, Dictionary> fetchingByCurrencyPair)
{
- var storeBlob = store.GetStoreBlob();
- var rate = await fetchingByCurrencyPair[new CurrencyPair(network.CryptoCode, entity.ProductInformation.Currency)];
- if (rate.Value == null)
- return null;
- PaymentMethod paymentMethod = new PaymentMethod();
- paymentMethod.ParentEntity = entity;
- paymentMethod.Network = network;
- paymentMethod.SetId(supportedPaymentMethod.PaymentId);
- paymentMethod.Rate = rate.Value.Value;
- var paymentDetails = await handler.CreatePaymentMethodDetails(supportedPaymentMethod, paymentMethod, store, network);
- if (storeBlob.NetworkFeeDisabled)
- paymentDetails.SetNoTxFee();
- paymentMethod.SetPaymentMethodDetails(paymentDetails);
-
- Func compare = null;
- CurrencyValue limitValue = null;
- string errorMessage = null;
- if (supportedPaymentMethod.PaymentId.PaymentType == PaymentTypes.LightningLike &&
- storeBlob.LightningMaxValue != null)
+ return Task.WhenAll(fetchingByCurrencyPair.Select(async pair =>
{
- compare = (a, b) => a > b;
- limitValue = storeBlob.LightningMaxValue;
- errorMessage = "The amount of the invoice is too high to be paid with lightning";
- }
- else if (supportedPaymentMethod.PaymentId.PaymentType == PaymentTypes.BTCLike &&
- storeBlob.OnChainMinValue != null)
- {
- compare = (a, b) => a < b;
- limitValue = storeBlob.OnChainMinValue;
- errorMessage = "The amount of the invoice is too low to be paid on chain";
- }
-
- if (compare != null)
- {
- var limitValueRate = await fetchingByCurrencyPair[new CurrencyPair(network.CryptoCode, limitValue.Currency)];
- if (limitValueRate.Value.HasValue)
+ var rateResult = await pair.Value;
+ logs.Write($"{pair.Key}: The rating rule is {rateResult.Rule}");
+ logs.Write($"{pair.Key}: The evaluated rating rule is {rateResult.EvaluatedRule}");
+ if (rateResult.Errors.Count != 0)
{
- var limitValueCrypto = Money.Coins(limitValue.Value / limitValueRate.Value.Value);
- if (compare(paymentMethod.Calculate().Due, limitValueCrypto))
+ var allRateRuleErrors = string.Join(", ", rateResult.Errors.ToArray());
+ logs.Write($"{pair.Key}: Rate rule error ({allRateRuleErrors})");
+ }
+ if (rateResult.ExchangeExceptions.Count != 0)
+ {
+ foreach (var ex in rateResult.ExchangeExceptions)
{
- throw new PaymentMethodUnavailableException(errorMessage);
+ logs.Write($"{pair.Key}: Exception reaching exchange {ex.ExchangeName} ({ex.Exception.Message})");
}
}
- }
- ///////////////
+ }).ToArray());
+ }
+
+ private async Task CreatePaymentMethodAsync(Dictionary> fetchingByCurrencyPair, IPaymentMethodHandler handler, ISupportedPaymentMethod supportedPaymentMethod, BTCPayNetwork network, InvoiceEntity entity, StoreData store, InvoiceLogs logs)
+ {
+ try
+ {
+ var storeBlob = store.GetStoreBlob();
+ var rate = await fetchingByCurrencyPair[new CurrencyPair(network.CryptoCode, entity.ProductInformation.Currency)];
+ if (rate.Value == null)
+ {
+ return null;
+ }
+ PaymentMethod paymentMethod = new PaymentMethod();
+ paymentMethod.ParentEntity = entity;
+ paymentMethod.Network = network;
+ paymentMethod.SetId(supportedPaymentMethod.PaymentId);
+ paymentMethod.Rate = rate.Value.Value;
+ var paymentDetails = await handler.CreatePaymentMethodDetails(supportedPaymentMethod, paymentMethod, store, network);
+ if (storeBlob.NetworkFeeDisabled)
+ paymentDetails.SetNoTxFee();
+ paymentMethod.SetPaymentMethodDetails(paymentDetails);
+
+ Func compare = null;
+ CurrencyValue limitValue = null;
+ string errorMessage = null;
+ if (supportedPaymentMethod.PaymentId.PaymentType == PaymentTypes.LightningLike &&
+ storeBlob.LightningMaxValue != null)
+ {
+ compare = (a, b) => a > b;
+ limitValue = storeBlob.LightningMaxValue;
+ errorMessage = "The amount of the invoice is too high to be paid with lightning";
+ }
+ else if (supportedPaymentMethod.PaymentId.PaymentType == PaymentTypes.BTCLike &&
+ storeBlob.OnChainMinValue != null)
+ {
+ compare = (a, b) => a < b;
+ limitValue = storeBlob.OnChainMinValue;
+ errorMessage = "The amount of the invoice is too low to be paid on chain";
+ }
+
+ if (compare != null)
+ {
+ var limitValueRate = await fetchingByCurrencyPair[new CurrencyPair(network.CryptoCode, limitValue.Currency)];
+ if (limitValueRate.Value.HasValue)
+ {
+ var limitValueCrypto = Money.Coins(limitValue.Value / limitValueRate.Value.Value);
+ if (compare(paymentMethod.Calculate().Due, limitValueCrypto))
+ {
+ logs.Write($"{supportedPaymentMethod.PaymentId.CryptoCode}: {errorMessage}");
+ return null;
+ }
+ }
+ }
+ ///////////////
#pragma warning disable CS0618
- if (paymentMethod.GetId().IsBTCOnChain)
- {
- entity.TxFee = paymentMethod.TxFee;
- entity.Rate = paymentMethod.Rate;
- entity.DepositAddress = paymentMethod.DepositAddress;
- }
+ if (paymentMethod.GetId().IsBTCOnChain)
+ {
+ entity.TxFee = paymentMethod.TxFee;
+ entity.Rate = paymentMethod.Rate;
+ entity.DepositAddress = paymentMethod.DepositAddress;
+ }
#pragma warning restore CS0618
- return paymentMethod;
+ return paymentMethod;
+ }
+ catch (PaymentMethodUnavailableException ex)
+ {
+ logs.Write($"{supportedPaymentMethod.PaymentId.CryptoCode}: Payment method unavailable ({ex.Message})");
+ }
+ catch (Exception ex)
+ {
+ logs.Write($"{supportedPaymentMethod.PaymentId.CryptoCode}: Unexpected exception ({ex.ToString()})");
+ }
+ return null;
}
private SpeedPolicy ParseSpeedPolicy(string transactionSpeed, SpeedPolicy defaultPolicy)
diff --git a/BTCPayServer/Controllers/ServerController.cs b/BTCPayServer/Controllers/ServerController.cs
index 2c10440d0..42374ae15 100644
--- a/BTCPayServer/Controllers/ServerController.cs
+++ b/BTCPayServer/Controllers/ServerController.cs
@@ -1,13 +1,19 @@
-using BTCPayServer.HostedServices;
+using BTCPayServer.Configuration;
+using Microsoft.Extensions.Logging;
+using BTCPayServer.HostedServices;
using BTCPayServer.Models;
using BTCPayServer.Models.ServerViewModels;
+using BTCPayServer.Payments.Lightning;
using BTCPayServer.Services;
using BTCPayServer.Services.Mails;
using BTCPayServer.Services.Rates;
+using BTCPayServer.Services.Stores;
using BTCPayServer.Validations;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc;
+using NBitcoin;
+using NBitcoin.DataEncoders;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
@@ -16,6 +22,8 @@ using System.Net;
using System.Net.Http;
using System.Net.Mail;
using System.Threading.Tasks;
+using Renci.SshNet;
+using BTCPayServer.Logging;
namespace BTCPayServer.Controllers
{
@@ -25,14 +33,23 @@ namespace BTCPayServer.Controllers
private UserManager _UserManager;
SettingsRepository _SettingsRepository;
private BTCPayRateProviderFactory _RateProviderFactory;
+ private StoreRepository _StoreRepository;
+ LightningConfigurationProvider _LnConfigProvider;
+ BTCPayServerOptions _Options;
public ServerController(UserManager userManager,
+ Configuration.BTCPayServerOptions options,
BTCPayRateProviderFactory rateProviderFactory,
- SettingsRepository settingsRepository)
+ SettingsRepository settingsRepository,
+ LightningConfigurationProvider lnConfigProvider,
+ Services.Stores.StoreRepository storeRepository)
{
+ _Options = options;
_UserManager = userManager;
_SettingsRepository = settingsRepository;
_RateProviderFactory = rateProviderFactory;
+ _StoreRepository = storeRepository;
+ _LnConfigProvider = lnConfigProvider;
}
[Route("server/rates")]
@@ -74,7 +91,7 @@ namespace BTCPayServer.Controllers
try
{
var service = GetCoinaverageService(vm, true);
- if(service != null)
+ if (service != null)
await service.TestAuthAsync();
}
catch
@@ -134,6 +151,150 @@ namespace BTCPayServer.Controllers
return View(userVM);
}
+ [Route("server/maintenance")]
+ public IActionResult Maintenance()
+ {
+ MaintenanceViewModel vm = new MaintenanceViewModel();
+ vm.UserName = "btcpayserver";
+ vm.DNSDomain = this.Request.Host.Host;
+ if (IPAddress.TryParse(vm.DNSDomain, out var unused))
+ vm.DNSDomain = null;
+ return View(vm);
+ }
+ [Route("server/maintenance")]
+ [HttpPost]
+ public async Task Maintenance(MaintenanceViewModel vm, string command)
+ {
+ if (!ModelState.IsValid)
+ return View(vm);
+ if (command == "changedomain")
+ {
+ if (string.IsNullOrWhiteSpace(vm.DNSDomain))
+ {
+ ModelState.AddModelError(nameof(vm.DNSDomain), $"Required field");
+ return View(vm);
+ }
+ vm.DNSDomain = vm.DNSDomain.Trim().ToLowerInvariant();
+ if (IPAddress.TryParse(vm.DNSDomain, out var unused))
+ {
+ ModelState.AddModelError(nameof(vm.DNSDomain), $"This should be a domain name");
+ return View(vm);
+ }
+ if (vm.DNSDomain.Equals(this.Request.Host.Host, StringComparison.InvariantCultureIgnoreCase))
+ {
+ ModelState.AddModelError(nameof(vm.DNSDomain), $"The server is already set to use this domain");
+ return View(vm);
+ }
+ var builder = new UriBuilder();
+ using (var client = new HttpClient(new HttpClientHandler()
+ {
+ ServerCertificateCustomValidationCallback = HttpClientHandler.DangerousAcceptAnyServerCertificateValidator
+ }))
+ {
+ try
+ {
+ builder.Scheme = this.Request.Scheme;
+ builder.Host = vm.DNSDomain;
+ if (this.Request.Host.Port != null)
+ builder.Port = this.Request.Host.Port.Value;
+ builder.Path = "runid";
+ builder.Query = $"expected={RunId}";
+ var response = await client.GetAsync(builder.Uri);
+ if (!response.IsSuccessStatusCode)
+ {
+ ModelState.AddModelError(nameof(vm.DNSDomain), $"Invalid host ({vm.DNSDomain} is not pointing to this BTCPay instance)");
+ return View(vm);
+ }
+ }
+ catch (Exception ex)
+ {
+ var messages = new List