diff --git a/BTCPayServer.Tests/ServerTester.cs b/BTCPayServer.Tests/ServerTester.cs index fd961584d..ae2ef2373 100644 --- a/BTCPayServer.Tests/ServerTester.cs +++ b/BTCPayServer.Tests/ServerTester.cs @@ -213,43 +213,6 @@ namespace BTCPayServer.Tests } } - /// - /// Simulating callback from NBXplorer. NBXplorer can't reach the host during tests as it is not running on localhost. - /// - /// - public void SimulateCallback(BitcoinAddress address = null) - { - if (!FakeCallback) //The callback of NBXplorer should work - return; - - var req = new MockHttpRequest(PayTester.ServerUri); - var controller = PayTester.GetController(); - if (address != null) - { - - var match = new TransactionMatch(); - match.Outputs.Add(new KeyPathInformation() { ScriptPubKey = address.ScriptPubKey }); - var content = new StringContent(new NBXplorer.Serializer(Network).ToString(match), new UTF8Encoding(false), "application/json"); - var uri = controller.GetCallbackUriAsync().GetAwaiter().GetResult(); - - HttpRequestMessage message = new HttpRequestMessage(); - message.Method = HttpMethod.Post; - message.RequestUri = uri; - message.Content = content; - - _Http.SendAsync(message).GetAwaiter().GetResult(); - } - else - { - - var uri = controller.GetCallbackBlockUriAsync().GetAwaiter().GetResult(); - HttpRequestMessage message = new HttpRequestMessage(); - message.Method = HttpMethod.Post; - message.RequestUri = uri; - _Http.SendAsync(message).GetAwaiter().GetResult(); - } - } - public BTCPayServerTester PayTester { diff --git a/BTCPayServer.Tests/UnitTest1.cs b/BTCPayServer.Tests/UnitTest1.cs index 37f46c318..dcdf5e85b 100644 --- a/BTCPayServer.Tests/UnitTest1.cs +++ b/BTCPayServer.Tests/UnitTest1.cs @@ -119,7 +119,6 @@ namespace BTCPayServer.Tests Eventually(() => { - tester.SimulateCallback(url.Address); var localInvoice = user.BitPay.GetInvoice(invoice.Id, Facade.Merchant); Assert.Equal("paid", localInvoice.Status); Assert.True(localInvoice.Refundable); @@ -193,7 +192,6 @@ namespace BTCPayServer.Tests BitcoinUrlBuilder url = new BitcoinUrlBuilder(invoice.PaymentUrls.BIP21); tester.ExplorerNode.SendToAddress(url.Address, url.Amount); Thread.Sleep(5000); - tester.SimulateCallback(url.Address); callbackServer.ProcessNextRequest((ctx) => { var ipn = new StreamReader(ctx.Request.Body).ReadToEnd(); @@ -253,7 +251,6 @@ namespace BTCPayServer.Tests Eventually(() => { - tester.SimulateCallback(invoiceAddress); invoice = user.BitPay.GetInvoice(invoice.Id); Assert.Equal(payment1, invoice.BtcPaid); invoiceAddress = BitcoinAddress.Create(invoice.BitcoinAddress, tester.Network); @@ -274,7 +271,6 @@ namespace BTCPayServer.Tests var test = tester.ExplorerClient.Sync(user.DerivationScheme, null); Eventually(() => { - tester.SimulateCallback(invoiceAddress); invoice = user.BitPay.GetInvoice(invoice.Id); Assert.Equal(payment2, invoice.BtcPaid); }); @@ -366,7 +362,6 @@ namespace BTCPayServer.Tests Eventually(() => { - tester.SimulateCallback(invoiceAddress); var localInvoice = user.BitPay.GetInvoice(invoice.Id, Facade.Merchant); Assert.Equal("new", localInvoice.Status); Assert.Equal(firstPayment, localInvoice.BtcPaid); @@ -389,7 +384,6 @@ namespace BTCPayServer.Tests Eventually(() => { - tester.SimulateCallback(invoiceAddress); var localInvoice = user.BitPay.GetInvoice(invoice.Id, Facade.Merchant); Assert.Equal("paid", localInvoice.Status); Assert.Equal(firstPayment + secondPayment, localInvoice.BtcPaid); @@ -403,7 +397,6 @@ namespace BTCPayServer.Tests Eventually(() => { - tester.SimulateCallback(); var localInvoice = user.BitPay.GetInvoice(invoice.Id, Facade.Merchant); Assert.Equal("confirmed", localInvoice.Status); }); @@ -412,7 +405,6 @@ namespace BTCPayServer.Tests Eventually(() => { - tester.SimulateCallback(); var localInvoice = user.BitPay.GetInvoice(invoice.Id, Facade.Merchant); Assert.Equal("complete", localInvoice.Status); Assert.NotEqual(0.0, localInvoice.Rate); @@ -435,7 +427,6 @@ namespace BTCPayServer.Tests Eventually(() => { - tester.SimulateCallback(invoiceAddress); var localInvoice = user.BitPay.GetInvoice(invoice.Id, Facade.Merchant); Assert.Equal("paid", localInvoice.Status); Assert.Equal(Money.Zero, localInvoice.BtcDue); @@ -446,7 +437,6 @@ namespace BTCPayServer.Tests Eventually(() => { - tester.SimulateCallback(); var localInvoice = user.BitPay.GetInvoice(invoice.Id, Facade.Merchant); Assert.Equal("confirmed", localInvoice.Status); Assert.Equal(Money.Zero, localInvoice.BtcDue); diff --git a/BTCPayServer.Tests/docker-compose.yml b/BTCPayServer.Tests/docker-compose.yml index 4b52e0002..a248a5559 100644 --- a/BTCPayServer.Tests/docker-compose.yml +++ b/BTCPayServer.Tests/docker-compose.yml @@ -42,7 +42,7 @@ services: # - eclair2 nbxplorer: - image: nicolasdorier/nbxplorer:1.0.0.34 + image: nicolasdorier/nbxplorer:1.0.0.35 ports: - "32838:32838" expose: diff --git a/BTCPayServer/BTCPayServer.csproj b/BTCPayServer/BTCPayServer.csproj index e8e4dea5d..352a433d1 100644 --- a/BTCPayServer/BTCPayServer.csproj +++ b/BTCPayServer/BTCPayServer.csproj @@ -21,10 +21,10 @@ - + - + diff --git a/BTCPayServer/CompositeDisposable.cs b/BTCPayServer/CompositeDisposable.cs deleted file mode 100644 index 0fd71df21..000000000 --- a/BTCPayServer/CompositeDisposable.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace BTCPayServer -{ - public class CompositeDisposable : IDisposable - { - List _Disposables = new List(); - public void Add(IDisposable disposable) { _Disposables.Add(disposable); } - public void Dispose() - { - foreach (var d in _Disposables) - d.Dispose(); - _Disposables.Clear(); - } - } -} diff --git a/BTCPayServer/Controllers/CallbackController.cs b/BTCPayServer/Controllers/CallbackController.cs deleted file mode 100644 index 031361851..000000000 --- a/BTCPayServer/Controllers/CallbackController.cs +++ /dev/null @@ -1,143 +0,0 @@ -using BTCPayServer.Logging; -using BTCPayServer.Services.Invoices; -using BTCPayServer.Services; -using BTCPayServer.Services.Wallets; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using NBitcoin; -using NBXplorer; -using Microsoft.Extensions.Logging; -using NBXplorer.DerivationStrategy; -using NBXplorer.Models; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using BTCPayServer.Configuration; -using BTCPayServer.Events; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Hosting.Server.Features; -using Microsoft.AspNetCore.Hosting.Server; - -namespace BTCPayServer.Controllers -{ - public class CallbackController : Controller - { - public class CallbackSettings - { - public string Token - { - get; set; - } - } - SettingsRepository _Settings; - Network _Network; - ExplorerClient _Explorer; - BTCPayServerOptions _Options; - EventAggregator _EventAggregator; - IServer _Server; - public CallbackController(SettingsRepository repo, - ExplorerClient explorer, - EventAggregator eventAggregator, - BTCPayServerOptions options, - IServer server, - BTCPayNetworkProvider networkProvider) - { - _Settings = repo; - _Network = networkProvider.GetNetwork("BTC").NBitcoinNetwork; - _Explorer = explorer; - _Options = options; - _EventAggregator = eventAggregator; - _Server = server; - } - - [Route("callbacks/transactions")] - [HttpPost] - public async Task NewTransaction(string token) - { - await AssertToken(token); - //We don't want to register all the json converter at MVC level, so we parse here - var serializer = new NBXplorer.Serializer(_Network); - var content = await new StreamReader(Request.Body, new UTF8Encoding(false), false, 1024, true).ReadToEndAsync(); - var match = serializer.ToObject(content); - - foreach (var output in match.Outputs) - { - var evt = new TxOutReceivedEvent(); - evt.ScriptPubKey = output.ScriptPubKey; - evt.Address = output.ScriptPubKey.GetDestinationAddress(_Network); - _EventAggregator.Publish(evt); - } - } - - [Route("callbacks/blocks")] - [HttpPost] - public async Task NewBlock(string token) - { - await AssertToken(token); - _EventAggregator.Publish(new Events.NewBlockEvent()); - } - - private async Task AssertToken(string token) - { - var callback = await _Settings.GetSettingAsync(); - if (await GetToken() != token) - throw new BTCPayServer.BitpayHttpException(400, "invalid-callback-token"); - } - - public async Task GetCallbackUriAsync() - { - string token = await GetToken(); - return BuildCallbackUri("callbacks/transactions?token=" + token); - } - - public async Task RegisterCallbackUriAsync(DerivationStrategyBase derivationScheme) - { - var uri = await GetCallbackUriAsync(); - await _Explorer.SubscribeToWalletAsync(uri, derivationScheme); - } - - private async Task GetToken() - { - var callback = await _Settings.GetSettingAsync(); - if (callback == null) - { - callback = new CallbackSettings() { Token = Guid.NewGuid().ToString() }; - await _Settings.UpdateSetting(callback); - } - var token = callback.Token; - return token; - } - - public async Task GetCallbackBlockUriAsync() - { - string token = await GetToken(); - return BuildCallbackUri("callbacks/blocks?token=" + token); - } - - private Uri BuildCallbackUri(string callbackPath) - { - var address = _Server.Features.Get().Addresses - .Select(c => new Uri(TransformToRoutable(c))) - .First(); - var baseUrl = _Options.InternalUrl == null ? address.AbsoluteUri : _Options.InternalUrl.AbsoluteUri; - baseUrl = baseUrl.WithTrailingSlash(); - return new Uri(baseUrl + callbackPath); - } - - private string TransformToRoutable(string host) - { - if (host.StartsWith("http://0.0.0.0")) - host = host.Replace("http://0.0.0.0", "http://127.0.0.1"); - return host; - } - - public async Task RegisterCallbackBlockUriAsync(Uri uri) - { - await _Explorer.SubscribeToBlocksAsync(uri); - return uri; - } - } -} diff --git a/BTCPayServer/Controllers/InvoiceController.UI.cs b/BTCPayServer/Controllers/InvoiceController.UI.cs index 3df4a45d5..19b536fbb 100644 --- a/BTCPayServer/Controllers/InvoiceController.UI.cs +++ b/BTCPayServer/Controllers/InvoiceController.UI.cs @@ -19,6 +19,7 @@ using BTCPayServer.Services.Rates; using System.Net.WebSockets; using System.Threading; using BTCPayServer.Events; +using NBXplorer; namespace BTCPayServer.Controllers { diff --git a/BTCPayServer/Controllers/StoresController.cs b/BTCPayServer/Controllers/StoresController.cs index 61d471d64..f8ca445f3 100644 --- a/BTCPayServer/Controllers/StoresController.cs +++ b/BTCPayServer/Controllers/StoresController.cs @@ -30,7 +30,6 @@ namespace BTCPayServer.Controllers public StoresController( StoreRepository repo, TokenRepository tokenRepo, - CallbackController callbackController, UserManager userManager, AccessTokenController tokenController, BTCPayWallet wallet, @@ -44,11 +43,9 @@ namespace BTCPayServer.Controllers _Wallet = wallet; _Env = env; _NetworkProvider = networkProvider; - _CallbackController = callbackController; } BTCPayNetworkProvider _NetworkProvider; - CallbackController _CallbackController; BTCPayWallet _Wallet; AccessTokenController _TokenController; StoreRepository _Repo; @@ -203,7 +200,6 @@ namespace BTCPayServer.Controllers { var strategy = ParseDerivationStrategy(model.DerivationScheme, model.DerivationSchemeFormat, _NetworkProvider.BTC); await _Wallet.TrackAsync(strategy); - await _CallbackController.RegisterCallbackUriAsync(strategy.DerivationStrategyBase); model.DerivationScheme = strategy.ToString(); } store.DerivationStrategy = model.DerivationScheme; diff --git a/BTCPayServer/Hosting/BTCPayServerServices.cs b/BTCPayServer/Hosting/BTCPayServerServices.cs index 052985c00..3eb09d381 100644 --- a/BTCPayServer/Hosting/BTCPayServerServices.cs +++ b/BTCPayServer/Hosting/BTCPayServerServices.cs @@ -168,11 +168,9 @@ namespace BTCPayServer.Hosting services.TryAddSingleton(); services.AddSingleton(); - services.TryAddSingleton(); services.TryAddScoped(); services.TryAddSingleton(); services.AddTransient(); - services.AddTransient(); services.AddTransient(); // Add application services. services.AddTransient(); @@ -204,10 +202,6 @@ namespace BTCPayServer.Hosting }); } - - - var initialize = app.ApplicationServices.GetService(); - initialize.Init(); app.UseMiddleware(); return app; } diff --git a/BTCPayServer/Initializer.cs b/BTCPayServer/Initializer.cs deleted file mode 100644 index 862289fb0..000000000 --- a/BTCPayServer/Initializer.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using Microsoft.Extensions.Logging; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using BTCPayServer.Controllers; -using BTCPayServer.Logging; -using BTCPayServer.Events; - -namespace BTCPayServer -{ - public class Initializer - { - EventAggregator _Aggregator; - CallbackController _CallbackController; - public Initializer(EventAggregator aggregator, - CallbackController callbackController - ) - { - _Aggregator = aggregator; - _CallbackController = callbackController; - } - public void Init() - { - _Aggregator.Subscribe(async (s, evt) => - { - if (evt.NewState == NBXplorerState.Ready) - { - s.Unsubscribe(); - try - { - var callback = await _CallbackController.GetCallbackBlockUriAsync(); - await _CallbackController.RegisterCallbackBlockUriAsync(callback); - Logs.PayServer.LogInformation($"Registering block callback to " + callback); - } - catch (Exception ex) - { - Logs.PayServer.LogError(ex, "Could not register block callback"); - s.Resubscribe(); - } - } - }); - } - } -} diff --git a/BTCPayServer/Services/Invoices/InvoiceNotificationManager.cs b/BTCPayServer/Services/Invoices/InvoiceNotificationManager.cs index 16c977452..2fc725f57 100644 --- a/BTCPayServer/Services/Invoices/InvoiceNotificationManager.cs +++ b/BTCPayServer/Services/Invoices/InvoiceNotificationManager.cs @@ -17,6 +17,7 @@ using Newtonsoft.Json; using System.Collections.Concurrent; using Microsoft.Extensions.Hosting; using BTCPayServer.Events; +using NBXplorer; namespace BTCPayServer.Services.Invoices {