aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-18 06:24:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings, update libs

Browse Source
This commit is contained in:
nicolas.dorier
2018-10-26 18:36:58 +09:00
parent 1ff0a98d30
commit 3921a3ca22
5 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer.Tests/BTCPayServer.Tests.csproj
View File

@@ -9,7 +9,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="xunit" Version="2.4.0" /> <PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0"> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>

4
BTCPayServer/BTCPayServer.csproj
View File

@@ -44,10 +44,10 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.0" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" /> <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />
<PackageReference Include="Microsoft.NetCore.Analyzers" Version="2.6.0" /> <PackageReference Include="Microsoft.NetCore.Analyzers" Version="2.6.0" />
<PackageReference Include="NBitcoin" Version="4.1.1.48" /> <PackageReference Include="NBitcoin" Version="4.1.1.66" />
<PackageReference Include="NBitpayClient" Version="1.0.0.30" /> <PackageReference Include="NBitpayClient" Version="1.0.0.30" />
<PackageReference Include="DBreeze" Version="1.87.0" /> <PackageReference Include="DBreeze" Version="1.87.0" />
<PackageReference Include="NBXplorer.Client" Version="1.0.3" /> <PackageReference Include="NBXplorer.Client" Version="1.0.3.2" />
<PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.2" /> <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.2" />
<PackageReference Include="NicolasDorier.CommandLine.Configuration" Version="1.0.0.3" /> <PackageReference Include="NicolasDorier.CommandLine.Configuration" Version="1.0.0.3" />
<PackageReference Include="NicolasDorier.RateLimits" Version="1.0.0.3" /> <PackageReference Include="NicolasDorier.RateLimits" Version="1.0.0.3" />

2
BTCPayServer/Controllers/StoresController.Changelly.cs
View File

@@ -88,8 +88,6 @@ namespace BTCPayServer.Controllers
vm.StatusMessage = $"Error: {ex.Message}"; vm.StatusMessage = $"Error: {ex.Message}";
return View(vm); return View(vm);
} }
break;
default: default:
return View(vm); return View(vm);
} }

4
BTCPayServer/Controllers/WalletsController.cs
View File

@@ -367,9 +367,8 @@ namespace BTCPayServer.Controllers
throw new HardwareWalletException($"This store is not configured to use this ledger"); throw new HardwareWalletException($"This store is not configured to use this ledger");
} }
TransactionBuilder builder = new TransactionBuilder(); TransactionBuilder builder = network.NBitcoinNetwork.CreateTransactionBuilder();
builder.StandardTransactionPolicy.MinRelayTxFee = summary.Status.BitcoinStatus.MinRelayTxFee; builder.StandardTransactionPolicy.MinRelayTxFee = summary.Status.BitcoinStatus.MinRelayTxFee;
builder.SetConsensusFactory(network.NBitcoinNetwork);
builder.AddCoins(unspentCoins.Select(c => c.Coin).ToArray()); builder.AddCoins(unspentCoins.Select(c => c.Coin).ToArray());
foreach (var element in send) foreach (var element in send)
@@ -392,7 +391,6 @@ namespace BTCPayServer.Controllers
else else
builder.SendEstimatedFees(feeRateValue); builder.SendEstimatedFees(feeRateValue);
} }
builder.Shuffle();
var unsigned = builder.BuildTransaction(false); var unsigned = builder.BuildTransaction(false);
var keypaths = new Dictionary<Script, KeyPath>(); var keypaths = new Dictionary<Script, KeyPath>();

5
BTCPayServer/Payments/Changelly/Changelly.cs
View File

@@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
using System.Net.Http; using System.Net.Http;
@@ -33,7 +34,7 @@ namespace BTCPayServer.Payments.Changelly
var hex = new StringBuilder(array.Length * 2); var hex = new StringBuilder(array.Length * 2);
foreach (var b in array) foreach (var b in array)
{ {
hex.AppendFormat("{0:x2}", b); hex.AppendFormat(CultureInfo.InvariantCulture, "{0:x2}", b);
} }
return hex.ToString(); return hex.ToString();
@@ -102,7 +103,7 @@ namespace BTCPayServer.Payments.Changelly
var result = await PostToApi<string>(message); var result = await PostToApi<string>(message);
return Convert.ToDecimal(result.Result); return Convert.ToDecimal(result.Result, CultureInfo.InvariantCulture);
} }
} }
} }