Skip to content

Commit b74d8e7

Browse files
xiaolin1579xiaolin1579
committed
Revert "Update nuggets dependencies"
This reverts commit 6eb7ea3.
1 parent 6eb7ea3 commit b74d8e7

File tree

2 files changed

+38
-32
lines changed

2 files changed

+38
-32
lines changed

‎src/Miningcore/Blockchain/Bitcoin/BitcoinJob.cs‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -753,13 +753,16 @@ protected virtual Money CreateFounderOutputs(Transaction tx, Money reward)
753753

754754
protected virtual Money CreateMinerFundOutputs(Transaction tx, Money reward)
755755
{
756+
var payeeReward = minerFundParameters.MinimumValue;
757+
756758
if (!string.IsNullOrEmpty(minerFundParameters.Addresses?.FirstOrDefault()))
757759
{
758760
var payeeAddress = BitcoinUtils.AddressToDestination(minerFundParameters.Addresses[0], network);
759-
var payeeReward = minerFundParameters.MinimumValue;
760761
tx.Outputs.Add(payeeReward, payeeAddress);
761-
reward -= payeeReward;
762762
}
763+
764+
reward -= payeeReward;
765+
763766
return reward;
764767
}
765768

@@ -772,13 +775,16 @@ protected virtual Money CreateMinerFundOutputs(Transaction tx, Money reward)
772775

773776
protected virtual Money CreateMinerDevFundOutputs(Transaction tx, Money reward)
774777
{
778+
var payeeReward = minerDevFundParameters.MinimumValue;
779+
775780
if (!string.IsNullOrEmpty(minerDevFundParameters.Addresses?.FirstOrDefault()))
776781
{
777782
var payeeAddress = BitcoinUtils.AddressToDestination(minerDevFundParameters.Addresses[0], network);
778-
var payeeReward = minerDevFundParameters.MinimumValue;
779783
tx.Outputs.Add(payeeReward, payeeAddress);
780-
reward -= payeeReward;
781784
}
785+
786+
reward -= payeeReward;
787+
782788
return reward;
783789
}
784790

@@ -909,7 +915,7 @@ public void Init(BlockTemplate blockTemplate, string jobId,
909915
if(coin.HasMasterNodes)
910916
{
911917
masterNodeParameters = BlockTemplate.Extra.SafeExtensionDataAs<MasterNodeBlockTemplateExtra>();
912-
918+
913919
if(coin.HasSmartNodes)
914920
{
915921
if(masterNodeParameters.Extra?.ContainsKey("smartnode") == true)
@@ -1055,4 +1061,4 @@ public virtual (Share Share, string BlockHex) ProcessShare(StratumConnection wor
10551061
}
10561062

10571063
#endregion // API-Surface
1058-
}
1064+
}

‎src/Miningcore/Miningcore.csproj‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -42,54 +42,54 @@
4242

4343
<ItemGroup>
4444
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
45-
<PackageReference Include="Autofac" Version="8.2.0" />
45+
<PackageReference Include="Autofac" Version="8.1.0" />
4646
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
47-
<PackageReference Include="blake3" Version="0.5.1" />
47+
<PackageReference Include="blake3" Version="0.5.1" />
4848
<PackageReference Include="CircularBuffer" Version="1.4.0" />
4949
<PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
5050
<PrivateAssets>all</PrivateAssets>
5151
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5252
</PackageReference>
53-
<PackageReference Include="Isopoh.Cryptography.Argon2" Version="1.3.0" />
53+
<PackageReference Include="Isopoh.Cryptography.Argon2" Version="1.3.0" />
5454
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" />
55-
<PackageReference Include="Newtonsoft.Json.Schema" Version="4.0.1" />
56-
<PackageReference Include="Npgsql" Version="9.0.3" />
57-
<PackageReference Include="NSwag.AspNetCore" Version="14.3.0" />
58-
<PackageReference Include="NSwag.CodeGeneration.CSharp" Version="14.3.0" />
59-
<PackageReference Include="NSwag.MSBuild" Version="14.3.0">
55+
<PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.15" />
56+
<PackageReference Include="Npgsql" Version="7.0.1" />
57+
<PackageReference Include="NSwag.AspNetCore" Version="14.0.2" />
58+
<PackageReference Include="NSwag.CodeGeneration.CSharp" Version="14.0.2" />
59+
<PackageReference Include="NSwag.MSBuild" Version="14.0.2">
6060
<PrivateAssets>all</PrivateAssets>
6161
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6262
</PackageReference>
63-
<PackageReference Include="NLog.Extensions.Hosting" Version="5.3.8" />
63+
<PackageReference Include="NLog.Extensions.Hosting" Version="5.2.1" />
6464
<PackageReference Include="AutoMapper" Version="12.0.1" />
65-
<PackageReference Include="Dapper" Version="2.1.35" />
66-
<PackageReference Include="FluentValidation" Version="11.11.0" />
65+
<PackageReference Include="Dapper" Version="2.1.15" />
66+
<PackageReference Include="FluentValidation" Version="11.5.1" />
6767
<PackageReference Include="FluentValidation.AspNetCore" Version="11.3.0" />
68-
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.11.0" />
69-
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
68+
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.5.1" />
69+
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
7070
<PackageReference Include="MailKit" Version="3.5.0" />
7171
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.0.2" />
72-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
73-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
72+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
73+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
7474
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
75-
<PackageReference Include="NBitcoin" Version="7.0.42" />
76-
<PackageReference Include="NBitcoin.Altcoins" Version="3.0.28" />
75+
<PackageReference Include="NBitcoin" Version="7.0.32" />
76+
<PackageReference Include="NBitcoin.Altcoins" Version="3.0.21" />
7777
<PackageReference Include="NBitcoin.Zcash" Version="3.0.0" />
78-
<PackageReference Include="NBitcoin.Secp256k1" Version="3.1.6" />
7978
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
80-
<PackageReference Include="NLog" Version="5.4.0" />
81-
<PackageReference Include="NLog.Extensions.Logging" Version="5.4.0" />
82-
<PackageReference Include="Polly" Version="8.3.1" />
79+
<PackageReference Include="NLog" Version="5.2.8" />
80+
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
81+
<PackageReference Include="Polly" Version="7.2.3" />
8382
<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
8483
<PackageReference Include="prometheus-net.AspNetCore" Version="8.1.0" />
8584
<PackageReference Include="prometheus-net" Version="8.2.0" />
86-
<PackageReference Include="protobuf-net" Version="3.2.30" />
85+
<PackageReference Include="protobuf-net" Version="3.1.33" />
86+
<PackageReference Include="SHA3.Net" Version="1.1.0" />
8787
<PackageReference Include="System.Diagnostics.Process" Version="4.3.0" />
8888
<PackageReference Include="System.Reactive" Version="6.0.0" />
89-
<PackageReference Include="Grpc.AspNetCore" Version="2.66.0" />
90-
<PackageReference Include="Google.Protobuf" Version="3.27.0" />
91-
<PackageReference Include="Grpc.Net.Client" Version="2.66.0" />
92-
<PackageReference Include="Grpc.Tools" Version="2.66.0">
89+
<PackageReference Include="Grpc.AspNetCore" Version="2.57.0" />
90+
<PackageReference Include="Google.Protobuf" Version="3.24.2" />
91+
<PackageReference Include="Grpc.Net.Client" Version="2.57.0" />
92+
<PackageReference Include="Grpc.Tools" Version="2.57.0">
9393
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
9494
<PrivateAssets>all</PrivateAssets>
9595
</PackageReference>

0 commit comments

Comments
 (0)