Remove net6.0 build, replace by 8.0

MetacoSA · May 20, 2024 · d079d5c · d079d5c
1 parent afefcfc
commit d079d5c
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 50 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -7,62 +7,47 @@ env:
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   net60:
-    name: '6.0'
+    name: '8.0'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '8.0.x'
       - run: ./Build/CI/tests.sh
         env:
           BUILD_ARGS: /p:AdditionalDefineConstants=SECP256K1_VERIFY
-          Framework: net6.0
-  dotnetcore31:
-    name: '3.1'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '6.0.x'
-      - uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '3.1.x'
-      - run: ./Build/CI/tests.sh
-        env:
-          BUILD_ARGS: /p:AdditionalDefineConstants=SECP256K1_VERIFY
-          Framework: netcoreapp3.1
+          Framework: net8.0
   dotnetcore60standard20:
-    name: '6.0 with netstandard2.0'
+    name: '8.0 with netstandard2.0'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '8.0.x'
       - run: ./Build/CI/tests.sh
         env:
           BUILD_ARGS: /p:TargetFrameworkOverride=netstandard2.0
-          Framework: net6.0
+          Framework: net8.0
   dotnetcore60macos:
-    name: '6.0 on Mac-OS'
+    name: '8.0 on Mac-OS'
     runs-on: macOS-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '8.0.x'
       - run: ./Build/CI/tests.sh
         env:
-          Framework: net6.0
+          Framework: net8.0
   dotnetcore60winfx:
-    name: '6.0 on Windows NetFramework472'
+    name: '8.0 on Windows NetFramework472'
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '8.0.x'
       - run: dotnet clean -c Release ./NBitcoin.Tests/NBitcoin.Tests.csproj && dotnet nuget locals all --clear
       - run: dotnet test -c Release -v n ./NBitcoin.Tests/NBitcoin.Tests.csproj --filter "RestClient=RestClient|RPCClient=RPCClient|Protocol=Protocol|Core=Core|UnitTest=UnitTest|Altcoins=Altcoins|PropertyTest=PropertyTest" -p:ParallelizeTestCollections=false -f net472
diff --git a/NBitcoin.Altcoins/NBitcoin.Altcoins.csproj b/NBitcoin.Altcoins/NBitcoin.Altcoins.csproj
@@ -12,7 +12,7 @@
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net472;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
+		<TargetFrameworks>net8.0;net472;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
 		<TargetFrameworks Condition="'$(BuildingInsideVisualStudio)' == 'true'">netstandard2.1</TargetFrameworks>
     <TargetFrameworks Condition="'$(TargetFrameworkOverride)' != ''">$(TargetFrameworkOverride)</TargetFrameworks>
 		<NoWarn>1591;1573;1572;1584;1570;3021</NoWarn>
@@ -22,7 +22,7 @@
 	<ItemGroup>
 		<ProjectReference Include="..\NBitcoin\NBitcoin.csproj" />
 	</ItemGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'net6.0'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'net8.0'">
     <DefineConstants>$(DefineConstants);HAS_SPAN</DefineConstants>
     <RemoveBC>true</RemoveBC>
   </PropertyGroup>

diff --git a/NBitcoin.Bench/NBitcoin.Bench.csproj b/NBitcoin.Bench/NBitcoin.Bench.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <DebugType>pdbonly</DebugType>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>

diff --git a/NBitcoin.Secp256k1/NBitcoin.Secp256k1.csproj b/NBitcoin.Secp256k1/NBitcoin.Secp256k1.csproj
@@ -11,7 +11,7 @@
 		<RepositoryType>git</RepositoryType>
 	</PropertyGroup>
   <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net8.0;netstandard2.1</TargetFrameworks>
     <Version Condition=" '$(Version)' == '' ">3.1.4</Version>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/NBitcoin.Tests/NBitcoin.Tests.csproj b/NBitcoin.Tests/NBitcoin.Tests.csproj
@@ -7,8 +7,8 @@
 		<LangVersion>9.0</LangVersion>
 	</PropertyGroup>
   <PropertyGroup>
-	  <TargetFrameworks>net6.0;netcoreapp3.1;net472</TargetFrameworks>
-	  <TargetFrameworks Condition="'$(BuildingInsideVisualStudio)' == 'true'">net6.0</TargetFrameworks>
+	  <TargetFrameworks>net8.0;netcoreapp3.1;net472</TargetFrameworks>
+	  <TargetFrameworks Condition="'$(BuildingInsideVisualStudio)' == 'true'">net8.0</TargetFrameworks>
 	  <!--<StartupObject>NBitcoin.Tests.Program</StartupObject>-->
 	  <!--<TargetFrameworks Condition="'$(BuildingInsideVisualStudio)' == 'true' And '$(MSBuildRuntimeType)' == 'Core' ">netcoreapp2.1</TargetFrameworks>-->
 	  <!--<NoWarn>CS0618</NoWarn>-->
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' Or '$(TargetFramework)' == 'netcoreapp3.1' ">
     <DefineConstants>$(DefineConstants);NETCORE;NOTRACESOURCE;NOCUSTOMSSLVALIDATION;NOHTTPSERVER</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition=" ('$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'netcoreapp3.1') And ( '$(TargetFrameworkOverride)' != 'netstandard2.0' ) ">
+  <PropertyGroup Condition=" ('$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'netcoreapp3.1') And ( '$(TargetFrameworkOverride)' != 'netstandard2.0' ) ">
     <DefineConstants>$(DefineConstants);NETCORE;HAS_SPAN;NO_BC</DefineConstants>
     <RemoveBC>true</RemoveBC>
   </PropertyGroup>

diff --git a/NBitcoin.Tests/OutputDescriptorTests.cs b/NBitcoin.Tests/OutputDescriptorTests.cs
@@ -411,17 +411,18 @@ private void CheckDescriptorCore(
 						Assert.Equal(spksInferred[0], spks[n]);
 						Assert.Equal(((flags & UNSOLVABLE) == 0), OutputDescriptor.InferFromScript(spksInferred[0], providerInferred, Network.RegTest).IsSolvable());
 
-						var originalKeyOrigins = scriptProvider.KeyOrigins;
-						var inferredKeyOrigins =
-							providerInferred.KeyOrigins;
-						Assert.Equal(originalKeyOrigins, inferredKeyOrigins);
+						AssertSameKeyOrigins(scriptProvider, providerInferred);
 					}
 
 					// Test whether the observed key path is present in the 'paths' variable (which contains expected,
 					// unobserved paths), and then removed it from the set.
 					if (pathIndex != null)
 					{
-						var rootedKPs = scriptProvider.KeyOrigins;
+#if HAS_SPAN
+						var rootedKPs = scriptProvider.TaprootKeyOrigins.Values.Concat(scriptProvider.KeyIdToKeyOrigins.Values);
+#else
+						var rootedKPs = scriptProvider.KeyIdToKeyOrigins.Values;
+#endif
 						foreach (var rootedKP in rootedKPs)
 						{
 							Assert.Contains(pathIndex, p => p.SequenceEqual(rootedKP.KeyPath.Indexes));
@@ -443,6 +444,26 @@ private void CheckDescriptorCore(
 			}
 		}
 
+		private void AssertSameKeyOrigins(FlatSigningRepository expected, FlatSigningRepository actual)
+		{
+#if HAS_SPAN
+			Assert.Equal(expected.TaprootKeyOrigins.Count, actual.TaprootKeyOrigins.Count);
+			foreach (var k in expected.TaprootKeyOrigins)
+			{
+				Assert.True(actual.TaprootKeyOrigins.TryGetValue(k.Key, out var v));
+				Assert.Equal(k.Value.KeyPath, v.KeyPath);
+				Assert.Equal(k.Value.MasterFingerprint, v.MasterFingerprint);
+			}
+#endif
+			Assert.Equal(expected.KeyIdToKeyOrigins.Count, actual.KeyIdToKeyOrigins.Count);
+			foreach (var k in expected.KeyIdToKeyOrigins)
+			{
+				Assert.True(actual.KeyIdToKeyOrigins.TryGetValue(k.Key, out var v));
+				Assert.Equal(k.Value.KeyPath, v.KeyPath);
+				Assert.Equal(k.Value.MasterFingerprint, v.MasterFingerprint);
+			}
+		}
+
 		private void CheckUnparsable(Network network, string prv, string pub, string maybeErrorMsg = null)
 		{
 			var keysPrv = new FlatSigningRepository();

diff --git a/NBitcoin/NBitcoin.csproj b/NBitcoin/NBitcoin.csproj
@@ -20,7 +20,7 @@
 		<EmbedUntrackedSources>true</EmbedUntrackedSources>
 	</PropertyGroup>
 	<PropertyGroup>
-    <TargetFrameworks>net472;netstandard1.3;netstandard1.1;netstandard2.1;netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;netstandard1.3;netstandard1.1;netstandard2.1;netstandard2.0;net8.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(TargetFrameworkOverride)' != ''">$(TargetFrameworkOverride)</TargetFrameworks>
 		<NoWarn>1591;1573;1572;1584;1570;3021</NoWarn>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -33,10 +33,10 @@
 	<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
 		<DefineConstants>$(DefineConstants);CLASSICDOTNET;NO_ARRAY_FILL;NULLABLE_SHIMS;NO_SOCKETASYNC</DefineConstants>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'netstandard2.0'  Or '$(TargetFramework)' == 'net6.0'">
+	<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'netstandard2.0'  Or '$(TargetFramework)' == 'net8.0'">
 		<DefineConstants>$(DefineConstants);NOCUSTOMSSLVALIDATION;NO_NATIVERIPEMD160</DefineConstants>
 	</PropertyGroup>
-	<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'net6.0'">
+	<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'net8.0'">
 		<DefineConstants>$(DefineConstants);NETCORE;HAS_SPAN;NO_BC</DefineConstants>
     <RemoveBC>true</RemoveBC>
 	</PropertyGroup>
@@ -57,7 +57,7 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-		<PackageReference Include="System.Buffers" Version="4.5.0" Condition="'$(TargetFramework)' != 'netstandard2.1' And '$(TargetFramework)' != 'net6.0'" />
+		<PackageReference Include="System.Buffers" Version="4.5.0" Condition="'$(TargetFramework)' != 'netstandard2.1' And '$(TargetFramework)' != 'net8.0'" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.0.0" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">

diff --git a/NBitcoin/Scripting/OutputDescriptor.cs b/NBitcoin/Scripting/OutputDescriptor.cs
@@ -653,7 +653,8 @@ private bool ExpandPkHelper(
 				return false;
 			if (keyOrigin1 != null)
 			{
-				repo.SetKeyOrigin(pubkey1.Hash, keyOrigin1);
+				if (!isTaproot)
+					repo.SetKeyOrigin(pubkey1.Hash, keyOrigin1);
 #if HAS_SPAN
 				repo.SetKeyOrigin(pubkey1.TaprootPubKey, keyOrigin1);
 #endif

diff --git a/NBitcoin/SigningRepository.cs b/NBitcoin/SigningRepository.cs
@@ -169,13 +169,6 @@ public class FlatSigningRepository : ISigningRepository
 		public ConcurrentDictionary<TaprootPubKey, ISecret> TaprootKeysToSecret { get;  }
 #endif
 
-		public RootedKeyPath [] KeyOrigins =>
-			KeyIdToKeyOrigins.Values.ToArray()
-#if HAS_SPAN
-				.Concat(this.TaprootKeyOrigins.Values.ToArray()).ToArray()
-#endif
-			;
-
 		public FlatSigningRepository()
 		{
 			Secrets = new ConcurrentDictionary<KeyId, ISecret>();

diff --git a/NBitcoin/TaprootPubKey.cs b/NBitcoin/TaprootPubKey.cs
@@ -225,6 +225,11 @@ public bool CheckTapTweak(TaprootInternalPubKey internalPubKey, uint256? merkleR
 			TaprootFullPubKey.ComputeTapTweak(internalPubKey, merkleRoot, tweak32);
 			return this.pubkey.CheckIsTweakedWith(internalPubKey.pubkey, tweak32, parity);
 		}
+
+		public string ToHex()
+		{
+			return ToString();
+		}
 #endif
 	}
 }