.NET 10 support, switch to Sqlite testing

rsafier · web-flow · commit 453fcb16b56a · 2025-09-30T21:15:39.000-04:00
Net10 &amp; sqlite
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -16,11 +16,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.0.x
-    - name: Setup .NET 8.0
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: 8.0.x
+        dotnet-version: 10.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Check code formatting
@@ -33,7 +29,7 @@ jobs:
       run: |
          cdir=`pwd`
          cd LNUnit.Tests
-         dotnet test -f net8.0 --filter FullyQualifiedName~LNUnit.Test --no-build --verbosity normal -l "console;verbosity=detailed" --collect:"XPlat Code Coverage" --logger "trx;LogFileName=test-results.trx" --results-directory $cdir/coverage
+         dotnet test --filter FullyQualifiedName~LNUnit.Test --no-build --verbosity normal -l "console;verbosity=detailed" --collect:"XPlat Code Coverage" --logger "trx;LogFileName=test-results.trx" --results-directory $cdir/coverage
     - name: Test Report
       uses: dorny/test-reporter@v1
       if: success() || failure()    # run this step even if previous step failed
diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml
@@ -14,11 +14,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.0.x
-    - name: Setup .NET 8.0
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: 8.0.x
+        dotnet-version: 10.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -13,16 +13,12 @@ jobs:
 
     runs-on: ubuntu-latest
 
-    steps:
+    steps: 
       - uses: actions/checkout@v4
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 9.0.x
-      - name: Setup .NET 8.0
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: 8.0.x
+          dotnet-version: 10.0.x 
       - name: Restore dependencies
         run: dotnet restore
       - name: Check code formatting
@@ -32,7 +28,7 @@ jobs:
       - name: Build
         run: dotnet build --no-restore
       - name: Test
-        run: dotnet test -f net8.0 --no-build --verbosity normal -l "console;verbosity=detailed" --collect:"XPlat Code Coverage" --logger "trx;LogFileName=test-results.trx" --results-directory ./coverage
+        run: dotnet test --no-build --verbosity normal -l "console;verbosity=detailed" --collect:"XPlat Code Coverage" --logger "trx;LogFileName=test-results.trx" --results-directory ./coverage
       - name: Code Coverage Report
         uses: irongut/CodeCoverageSummary@v1.3.0
         with:
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 nbd
+Copyright (c) 2024-2025 nbd
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/LNBolt.Tests/LNBolt.Tests.csproj b/LNBolt.Tests/LNBolt.Tests.csproj
@@ -15,7 +15,7 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
         <PackageReference Include="NLightning.Bolt11" Version="4.0.0" />
         <PackageReference Include="NUnit" Version="3.14.0" />
-        <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+        <PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
         <PackageReference Include="org.ldk" Version="0.1.5" />
         <PackageReference Include="coverlet.collector" Version="6.0.4">
             <PrivateAssets>all</PrivateAssets>
diff --git a/LNBolt/LNBolt.csproj b/LNBolt/LNBolt.csproj
@@ -6,7 +6,7 @@
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <PackageProjectUrl>https://github.com/rsafier/LNBolt</PackageProjectUrl>
         <PackageId>LNBolt</PackageId>
-        <Version>1.7.8</Version>
+        <Version>1.9.0</Version>
         <Authors>Richard Safier</Authors>
         <PackageDescription>LNBolt - C# BOLT protocol helpers</PackageDescription>
         <RepositoryUrl>https://github.com/rsafier/LNBolt</RepositoryUrl>
@@ -17,7 +17,7 @@
         <PackageReference Include="EndianBinaryIO" Version="1.1.2"/>
         <PackageReference Include="Google.Protobuf" Version="3.32.1" />
         <PackageReference Include="Grpc.Net.Client" Version="2.71.0" />
-        <PackageReference Include="NBitcoin" Version="7.0.50" />
+        <PackageReference Include="NBitcoin" Version="9.0.1" />
         <PackageReference Include="Portable.BouncyCastle" Version="1.9.0"/>
         <PackageReference Include="ServiceStack.Text" Version="8.8.0" />
         <None Include="README.md" Pack="true" PackagePath="\"/>
diff --git a/LNUnit.LND/LNUnit.LND.csproj b/LNUnit.LND/LNUnit.LND.csproj
@@ -5,10 +5,10 @@
         <Nullable>enable</Nullable>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <PackageId>LNUnit.LND</PackageId>
-        <Version>1.8.7</Version>
+        <Version>2.0.0</Version>
         <PackageDescription>LNUnit LND Typed Clients</PackageDescription>
-        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
-        <LangVersion>12.0</LangVersion>
+        <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
+        <LangVersion>13.0</LangVersion>
     </PropertyGroup>
 
     <!--    <ItemGroup>-->
@@ -34,7 +34,7 @@
 
         <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0"/>
 
-        <PackageReference Include="NBitcoin" Version="7.0.50" />
+        <PackageReference Include="NBitcoin" Version="9.0.1" />
 
         <PackageReference Include="Portable.BouncyCastle" Version="1.9.0"/>
 
diff --git a/LNUnit.Tests/AbcLightningFixtureBoltDb.cs b/LNUnit.Tests/AbcLightningFixtureBoltDb.cs
@@ -14,8 +14,8 @@
 namespace LNUnit.Tests;
 
 [Ignore("only local")]
-[TestFixture("boltdb", "custom_lnd", "latest", "/home/lnd/.lnd", false)]
-// [TestFixture("boltdb", "lightninglabs/lnd", "v0.17.5-beta", "/root/.lnd", false)]
+//[TestFixture("boltdb", "custom_lnd", "latest", "/home/lnd/.lnd", false)]
+[TestFixture("boltdb", "lightninglabs/lnd", "v0.19.3-beta", "/root/.lnd", true)]
 public class AbcLightningAbstractTestsBoltDb : LNUnit.Tests.Abstract.AbcLightningAbstractTests
 {
     public AbcLightningAbstractTestsBoltDb(string dbType = "boltdb",
diff --git a/LNUnit.Tests/AbcLightningFixturePostgres.cs b/LNUnit.Tests/AbcLightningFixturePostgres.cs
@@ -2,7 +2,7 @@
 
 namespace LNUnit.Tests.Fixture;
 
-//Ignore("only local")]
+[Ignore("only local")]
 //[TestFixture("postgres", "lightninglabs/lnd", "v0.18.3-beta", "/root/.lnd", true)]
 [TestFixture("postgres", "custom_lnd", "latest", "/home/lnd/.lnd", false)]
 public class AbcLightningAbstractTestsPostgres : LNUnit.Tests.Abstract.AbcLightningAbstractTests
diff --git a/LNUnit.Tests/AbcLightningFixtureSqlite.cs b/LNUnit.Tests/AbcLightningFixtureSqlite.cs
@@ -0,0 +1,33 @@
+
+
+using System.Security.Cryptography;
+using Google.Protobuf;
+// using LNBolt;
+using Lnrpc;
+using LNUnit.LND;
+using NBitcoin;
+using Routerrpc;
+using ServiceStack;
+using ServiceStack.Text;
+using Feature = ServiceStack.Feature;
+
+namespace LNUnit.Tests;
+
+//[Ignore("only local")]
+//[TestFixture("boltdb", "custom_lnd", "latest", "/home/lnd/.lnd", false)]
+[TestFixture("sqlite", "lightninglabs/lnd", "v0.19.3-beta", "/root/.lnd", true)]
+public class AbcLightningAbstractTestsSqlite : LNUnit.Tests.Abstract.AbcLightningAbstractTests
+{
+    public AbcLightningAbstractTestsSqlite(string dbType = "sqlite",
+        string lndImage = "custom_lnd",
+        string tag = "latest",
+        string lndRoot = "/root/.lnd",
+        bool pullImage = false
+    ) : base(dbType, lndImage, tag, lndRoot, pullImage)
+    {
+
+    }
+
+
+
+}
diff --git a/LNUnit.Tests/Abstract/AbcLightningAbstractTests.cs b/LNUnit.Tests/Abstract/AbcLightningAbstractTests.cs
@@ -79,8 +79,8 @@ public async Task OneTimeSetup()
             PostgresFixture.AddDb("carol");
         }
 
-        await _client.CreateDockerImageFromPath("../../../../Docker/lnd", ["custom_lnd", "custom_lnd:latest"]);
-        await _client.CreateDockerImageFromPath("./../../../../Docker/bitcoin/29.0", ["bitcoin:latest", "bitcoin:29.0"]);
+        // await _client.CreateDockerImageFromPath("../../../../Docker/lnd", ["custom_lnd", "custom_lnd:latest"]);
+        // await _client.CreateDockerImageFromPath("./../../../../Docker/bitcoin/29.0", ["bitcoin:latest", "bitcoin:29.0"]);
         await SetupNetwork(_lndImage, _tag, _lndRoot, _pullImage);
     }
 
@@ -110,7 +110,7 @@ public void Dispose()
 
 
     public async Task SetupNetwork(string lndImage = "lightninglabs/lnd", string lndTag = "daily-testing-only",
-        string lndRoot = "/root/.lnd", bool pullLndImage = false, string bitcoinImage = "bitcoin", string bitcoinTag = "29.0",
+        string lndRoot = "/root/.lnd", bool pullLndImage = false, string bitcoinImage = "polarlightning/bitcoind", string bitcoinTag = "29.0",
          bool pullBitcoinImage = false)
     {
         await _client.RemoveContainer("miner");
@@ -120,7 +120,11 @@ public async Task SetupNetwork(string lndImage = "lightninglabs/lnd", string lnd
 
         Builder.AddBitcoinCoreNode(image: bitcoinImage, tag: bitcoinTag, pullImage: pullBitcoinImage);
 
-        if (pullLndImage) await _client.PullImageAndWaitForCompleted(lndImage, lndTag);
+        if (pullLndImage)
+        {
+            await _client.PullImageAndWaitForCompleted(lndImage, lndTag);
+            await _client.PullImageAndWaitForCompleted(bitcoinImage, bitcoinTag);
+        }
 
 
         Builder.AddPolarLNDNode("alice",
@@ -146,7 +150,7 @@ public async Task SetupNetwork(string lndImage = "lightninglabs/lnd", string lnd
                     RemoteName = "bob"
                 }
             ], imageName: lndImage, tagName: lndTag, pullImage: false, acceptKeysend: true, mapTotmp: false,
-            postgresDSN: _dbType == "postgres" ? PostgresFixture.LNDConnectionStrings["alice"] : null, lndkSupport: false, nativeSql: _dbType == "postgres", storeFinalHtlcResolutions: true);
+            postgresDSN: _dbType == "postgres" ? PostgresFixture.LNDConnectionStrings["alice"] : null, lndkSupport: false, nativeSql: _dbType != "boltdb", storeFinalHtlcResolutions: true);
 
         Builder.AddPolarLNDNode("bob",
             [
@@ -157,7 +161,7 @@ public async Task SetupNetwork(string lndImage = "lightninglabs/lnd", string lnd
                     RemoteName = "alice"
                 }
             ], imageName: lndImage, tagName: lndTag, pullImage: false, acceptKeysend: true, mapTotmp: false,
-            postgresDSN: _dbType == "postgres" ? PostgresFixture.LNDConnectionStrings["bob"] : null, lndkSupport: false, nativeSql: _dbType == "postgres");
+            postgresDSN: _dbType == "postgres" ? PostgresFixture.LNDConnectionStrings["bob"] : null, lndkSupport: false, nativeSql: _dbType != "boltdb");
 
         Builder.AddPolarLNDNode("carol",
             [
@@ -186,7 +190,7 @@ public async Task SetupNetwork(string lndImage = "lightninglabs/lnd", string lnd
                     RemoteName = "bob"
                 }
             ], imageName: lndImage, tagName: lndTag, pullImage: false, acceptKeysend: true, mapTotmp: false,
-            postgresDSN: _dbType == "postgres" ? PostgresFixture.LNDConnectionStrings["carol"] : null, lndkSupport: false, nativeSql: _dbType == "postgres");
+            postgresDSN: _dbType == "postgres" ? PostgresFixture.LNDConnectionStrings["carol"] : null, lndkSupport: false, nativeSql: _dbType != "boltdb");
 
         await Builder.Build(lndRoot: lndRoot);
 
@@ -335,66 +339,72 @@ public async Task<bool> IsRunning()
     //
     // }
 
-    private PSBT CreatePsbtOutputTemplate(int numberOfOutputs, string destinationAddress, long amountPerOutputSats, Network network)
-    { 
-        if (numberOfOutputs <= 0 || amountPerOutputSats <= 0)
-            throw new ArgumentException("Number of outputs and amount per output must be greater than zero.");
-            
-        BitcoinAddress address = BitcoinAddress.Create(destinationAddress, network);
-
-        // Create a transaction
-        var tx = NBitcoin.Transaction.Create(network);
-
-        // // Add dummy inputs
-        // tx.Inputs.Add(new TxIn(new OutPoint(uint256.Zero, 0)));
-
-        // Add outputs
-        for (int i = 0; i < numberOfOutputs; i++)
-        {
-            tx.Outputs.Add(new TxOut(Money.Satoshis(amountPerOutputSats), address));
-        }
+    // private PSBT CreatePsbtOutputTemplate(int numberOfOutputs, string destinationAddress, long amountPerOutputSats, Network network)
+    // {
+    //     if (numberOfOutputs <= 0 || amountPerOutputSats <= 0)
+    //         throw new ArgumentException("Number of outputs and amount per output must be greater than zero.");
+    //
+    //     BitcoinAddress address = BitcoinAddress.Create(destinationAddress, network);
+    //
+    //     // Create a transaction
+    //     var tx = NBitcoin.Transaction.Create(network);
+    //
+    //     // // Add dummy inputs
+    //     // tx.Inputs.Add(new TxIn(new OutPoint(uint256.Zero, 0)));
+    //
+    //     // Add outputs
+    //     for (int i = 0; i < numberOfOutputs; i++)
+    //     {
+    //         tx.Outputs.Add(new TxOut(Money.Satoshis(amountPerOutputSats), address));
+    //     }
+    //
+    //     // Create PSBT from the transaction
+    //     return PSBT.FromTransaction(tx, network);
+    // }
 
-        // Create PSBT from the transaction
-        return PSBT.FromTransaction(tx, network);
+    private async Task<string> CreatePsbtOutputTemplateBitcoinRPC(int numberOfOutputs, string destinationAddress, long amountPerOutputSats, Network network)
+    {
+        return await Builder.BitcoinRpcClient.CreateMultiOutputPsbt(destinationAddress, amountPerOutputSats,
+            numberOfOutputs);
     }
-    
-    [TestCase(2,"bcrt1pau9xpav22lr592a2fgldkqy65e42uz5gdgy8et6kgvkrtep5gkeq07uyla",1000,"regtest")]
+
+    [TestCase(2, "bcrt1pau9xpav22lr592a2fgldkqy65e42uz5gdgy8et6kgvkrtep5gkeq07uyla", 1000, "regtest")]
     [Category("PSBT")]
-    public async Task PSBTFlow(int numberOfOutputs, string depositAddress,int  amountPerOutputSats, string network, ulong feeRate=1)
+    public async Task PSBTFlow(int numberOfOutputs, string depositAddress, int amountPerOutputSats, string network, ulong feeRate = 1)
     {
-        var n = Network.GetNetwork(network);
-        var p = CreatePsbtOutputTemplate(numberOfOutputs, depositAddress, amountPerOutputSats, n); 
+        var networkChain = Network.GetNetwork(network);
+        var psbtOutputTemplate = await CreatePsbtOutputTemplateBitcoinRPC(numberOfOutputs, depositAddress, amountPerOutputSats, networkChain);
         //This verifies is fundable, and leases outputs.
         var fundReq = new FundPsbtRequest()
         {
-            Psbt = ByteString.FromBase64(p.ToBase64())
+            Psbt = ByteString.FromBase64(psbtOutputTemplate)
         };
 
         fundReq.SatPerVbyte = feeRate;
-        var node =  Builder.LNDNodePool.GetLNDNodeConnection();
+        var node = Builder.LNDNodePool.GetLNDNodeConnection();
 
         var fundedPsbt = node.WalletKitClient.FundPsbt(fundReq);
-       
+
         //extract txId
-        var psbt = PSBT.Parse(fundedPsbt.FundedPsbt.ToBase64(), n);
+        var psbt = PSBT.Parse(fundedPsbt.FundedPsbt.ToBase64(), networkChain);
         var txIdHexString = psbt.GetGlobalTransaction().GetHash().ToString();
         Console.WriteLine($"LoopStaticInDeposit: Generated funded TX: {txIdHexString}");
-        
+
         //Signs and returns raw tx to transmit
         var finalizedPsbt = node.WalletKitClient.FinalizePsbt(new FinalizePsbtRequest()
         {
             FundedPsbt = fundedPsbt.FundedPsbt
-        });   
+        });
         Console.WriteLine($"LoopStaticInDeposit: Finalized TX: {txIdHexString}");
-        
+
         //Publish
         var publicRes = node.WalletKitClient.PublishTransaction(new Transaction()
         {
             Label = $"Loop Static In Split",
             TxHex = finalizedPsbt.RawFinalTx
-        }); 
+        });
     }
-    
+
     [Test]
     [Category("Payment")]
     [NonParallelizable]
diff --git a/LNUnit.Tests/LNUnit.Tests.csproj b/LNUnit.Tests/LNUnit.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net9.0</TargetFrameworks>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <Version>0.2.2</Version>
@@ -25,7 +25,7 @@
 <!--        <PackageReference Include="NLightning.Bolt11" Version="4.0.0" />-->
         <PackageReference Include="Npgsql" Version="9.0.3" />
         <PackageReference Include="NUnit" Version="3.14.0" />
-        <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+        <PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />
         <PackageReference Include="NUnit.Analyzers" Version="4.10.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/LNUnit.Tests/PsbtMultiOutputBuilderExtensions.cs b/LNUnit.Tests/PsbtMultiOutputBuilderExtensions.cs
diff --git a/LNUnit/LNUnit.csproj b/LNUnit/LNUnit.csproj
diff --git a/LNUnit/Setup/LNUnitBuilder.cs b/LNUnit/Setup/LNUnitBuilder.cs
diff --git a/README.md b/README.md
diff --git a/global.json b/global.json
