Chore/updgrade dotnet8

.vscode/launch.json

@@ -0,0 +1,26 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            // Use IntelliSense to find out which attributes exist for C# debugging
+            // Use hover for the description of the existing attributes
+            // For further information visit https://github.com/dotnet/vscode-csharp/blob/main/debugger-launchjson.md
+            "name": ".NET Core Launch (console)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            // If you have changed target frameworks, make sure to update the program path.
+            "program": "${workspaceFolder}/LnProxyApi.App.Tests/bin/Debug/net8.0/LnProxyApi.App.Tests.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/LnProxyApi.App.Tests",
+            // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
+            "console": "internalConsole",
+            "stopAtEntry": false
+        },
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach"
+        }
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,41 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/LnProxyApi.App.Tests/LnProxyApi.App.Tests.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary;ForceNoAlign"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "publish",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "publish",
+                "${workspaceFolder}/LnProxyApi.App.Tests/LnProxyApi.App.Tests.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary;ForceNoAlign"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "watch",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "watch",
+                "run",
+                "--project",
+                "${workspaceFolder}/LnProxyApi.App.Tests/LnProxyApi.App.Tests.csproj"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}

LnProxyApi.App.Tests/HelpersTests.cs

@@ -5,11 +5,6 @@ namespace LnProxyApi.App.Tests;
 
 public class LnProxyTests
 {
-    [SetUp]
-    public void Setup()
-    {
-
-    }
 
     [Test]
     public void HexStringHelperTest()

LnProxyApi.App.Tests/LnProxyApi.App.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 

LnProxyApi.App.Tests/LnProxyValidationTests.cs

@@ -14,8 +14,9 @@ public class InvoiceValidationTests
         public void Setup()
         {
             var configuration = new Mock<IConfiguration>().Object;
+            var lndGrpcClientService = new Mock<LnGrpcClientService>(configuration).Object;
             var logger = new Mock<ILogger<LightningService>>().Object;
-            lightningService = new LightningService(configuration, logger);
+            lightningService = new LightningService(logger, lndGrpcClientService);
         }
 
         [Test]

LnProxyApi.App/Controllers/LnProxyController.cs

@@ -9,12 +9,12 @@ namespace LnProxyApi.Controllers;
 [ApiController]
 public class LnProxyController : ControllerBase
 {
-    private readonly IConfiguration _configuration;
     private readonly ILogger<LnProxyController> _logger;
+    private readonly LightningService _lightningService;
 
-    public LnProxyController(IConfiguration configuration, ILogger<LnProxyController> logger)
+    public LnProxyController(ILogger<LnProxyController> logger, LightningService lightningService)
     {
-        _configuration = configuration;
+        _lightningService = lightningService;
         _logger = logger;
     }
 
@@ -31,10 +31,10 @@ public IActionResult Post([FromBody] LnProxyModel request)
                 return BadRequest(ModelState);
             }
 
-            var lightningService = new LightningService(_configuration, _logger);
+
             _logger.LogInformation($"Creating proxy request invoice {request.Invoice}: {@request}");
 
-            AddHoldInvoiceResp response = lightningService.CreateHodlInvoice(
+            AddHoldInvoiceResp response = _lightningService.CreateHodlInvoice(
                 request.Invoice,
                 request.Description,
                 request.DescriptionHash,

LnProxyApi.App/LnProxyApi.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

LnProxyApi.App/Program.cs

@@ -1,8 +1,12 @@
+using LnProxyApi.LndGrpc.Services;
+
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
 
 builder.Services.AddControllers();
+builder.Services.AddSingleton<LnGrpcClientService>();
+builder.Services.AddSingleton<LightningService>();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();

LnProxyApi.App/Services/LightningService.cs

@@ -29,21 +29,21 @@ public class LightningService
             { Invoice.Types.InvoiceState.Open, "OPEN" }
         };
 
-        private LnGrpcClientService lnGrpcService;
-        private readonly ILogger _logger;
+        private LnGrpcClientService _lnGrpcService;
+        private readonly ILogger <LightningService> _logger;
 
-        public LightningService(IConfiguration configuration, ILogger logger)
+        public LightningService(ILogger <LightningService> logger, LnGrpcClientService lnGrpcService)
         {
             _logger = logger;
-            lnGrpcService = new LnGrpcClientService(configuration);
+            _lnGrpcService = lnGrpcService;
         }
 
 
         private PayReq DecodePayRequest(string invoice)
         {
             try
             {
-                var client = lnGrpcService.GetLightningClient();
+                var client = _lnGrpcService.GetLightningClient();
                 var payReq = new PayReqString
                 {
                     PayReq = invoice,
@@ -61,7 +61,7 @@ private PayReq DecodePayRequest(string invoice)
 
         private async Task SettleAndPayInvoice(PayReq originalInvoice, string request, long feeLimitMsat)
         {
-            var routerClient = lnGrpcService.GetRouterClient();
+            var routerClient = _lnGrpcService.GetRouterClient();
             var estimateFee = EstimateRouteFee(originalInvoice).Result;
             var req = new SendPaymentRequest()
             {
@@ -76,7 +76,7 @@ private async Task SettleAndPayInvoice(PayReq originalInvoice, string request, l
             await foreach (var payment in call.ResponseStream.ReadAllAsync())
             {
                 try
-                {	var invoiceClient = lnGrpcService.GetInvoiceClient();
+                {	var invoiceClient = _lnGrpcService.GetInvoiceClient();
                     if (payment.Status == Payment.Types.PaymentStatus.Failed)
                     {  
 						var cancel = new CancelInvoiceMsg()
@@ -118,7 +118,7 @@ private async Task SettleAndPayInvoice(PayReq originalInvoice, string request, l
 
         public async Task SubscribeToHodlInvoice(ByteString rHash, PayReq originalInvoice, string originalRequest, long feeLimitMsat)
         {
-            var invoiceClient = lnGrpcService.GetInvoiceClient();
+            var invoiceClient = _lnGrpcService.GetInvoiceClient();
 
             var sub = new SubscribeSingleInvoiceRequest() { RHash = rHash };
             var call = invoiceClient.SubscribeSingleInvoice(sub);
@@ -168,7 +168,7 @@ private async Task<RouteFeeResponse> EstimateRouteFee(PayReq payReqFromInvoice)
         {
             try
             {
-                var client = lnGrpcService.GetRouterClient();
+                var client = _lnGrpcService.GetRouterClient();
                 var route = new RouteFeeRequest()
                 {   
                     AmtSat = payReqFromInvoice.NumSatoshis,
@@ -271,7 +271,7 @@ public AddHoldInvoiceResp CreateHodlInvoice(string payRequestString, string? pay
 
                 ValidateInvoice(payReqFromInvoice, hodlInvoice);
 
-                var invoiceResponse = lnGrpcService.GetInvoiceClient().AddHoldInvoice(hodlInvoice);
+                var invoiceResponse = _lnGrpcService.GetInvoiceClient().AddHoldInvoice(hodlInvoice);
                 _logger.LogInformation($"Created hodl invoice: {@invoiceResponse}");
                 _ = SubscribeToHodlInvoice(hodlInvoice.Hash, payReqFromInvoice, payRequestString, feeBudgetMsat);
                 return invoiceResponse;

LnProxyApi.sln

@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.002.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LnProxyApi", "LnProxyApi.App\LnProxyApi.csproj", "{462E9C37-8A3A-4D1F-9829-D81CB85FCE4D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LnProxyApi.App.Tests", "LnProxyApi.App.Tests\LnProxyApi.App.Tests.csproj", "{83AEB476-275E-4FA0-9622-011BC9776FC9}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{462E9C37-8A3A-4D1F-9829-D81CB85FCE4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{462E9C37-8A3A-4D1F-9829-D81CB85FCE4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{462E9C37-8A3A-4D1F-9829-D81CB85FCE4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{462E9C37-8A3A-4D1F-9829-D81CB85FCE4D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83AEB476-275E-4FA0-9622-011BC9776FC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83AEB476-275E-4FA0-9622-011BC9776FC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83AEB476-275E-4FA0-9622-011BC9776FC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83AEB476-275E-4FA0-9622-011BC9776FC9}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {DF2CF7F5-C638-4A2E-B4CE-C3AE4D27F7A8}
+	EndGlobalSection
+EndGlobal