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

Bump NBX (#3607)

Browse Source
This commit is contained in:
Nicolas Dorier
2022-04-05 14:46:42 +09:00
committed by GitHub
parent 05ec398346
commit 13952a4b79
9 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BTCPayServer.Client/Models/OnChainWalletTransactionData.cs
View File

@@ -21,9 +21,9 @@ namespace BTCPayServer.Client.Models
[JsonConverter(typeof(UInt256JsonConverter))] [JsonConverter(typeof(UInt256JsonConverter))]
public uint256 BlockHash { get; set; } public uint256 BlockHash { get; set; }
public int? BlockHeight { get; set; } public long? BlockHeight { get; set; }
public int Confirmations { get; set; } public long Confirmations { get; set; }
[JsonConverter(typeof(DateTimeToUnixTimeConverter))] [JsonConverter(typeof(DateTimeToUnixTimeConverter))]
public DateTimeOffset Timestamp { get; set; } public DateTimeOffset Timestamp { get; set; }

2
BTCPayServer.Client/Models/OnChainWalletUTXOData.cs
View File

@@ -21,6 +21,6 @@ namespace BTCPayServer.Client.Models
[JsonConverter(typeof(KeyPathJsonConverter))] [JsonConverter(typeof(KeyPathJsonConverter))]
public KeyPath KeyPath { get; set; } public KeyPath KeyPath { get; set; }
public string Address { get; set; } public string Address { get; set; }
public int Confirmations { get; set; } public long Confirmations { get; set; }
} }
} }

4
BTCPayServer.Common/BTCPayServer.Common.csproj
View File

@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="../Build/Version.csproj" Condition="Exists('../Build/Version.csproj')" /> <Import Project="../Build/Version.csproj" Condition="Exists('../Build/Version.csproj')" />
<Import Project="../Build/Common.csproj" /> <Import Project="../Build/Common.csproj" />
<ItemGroup> <ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" /> <FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="NBXplorer.Client" Version="4.1.3" /> <PackageReference Include="NBXplorer.Client" Version="4.2.0" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(Altcoins)' != 'true'"> <ItemGroup Condition="'$(Altcoins)' != 'true'">
<Compile Remove="Altcoins\**\*.cs"></Compile> <Compile Remove="Altcoins\**\*.cs"></Compile>

3
BTCPayServer.Tests/docker-compose.altcoins.yml
View File

@@ -89,7 +89,7 @@ services:
expose: expose:
- "4444" - "4444"
nbxplorer: nbxplorer:
image: nicolasdorier/nbxplorer:2.2.18 image: nicolasdorier/nbxplorer:2.3.6
restart: unless-stopped restart: unless-stopped
ports: ports:
- "32838:32838" - "32838:32838"
@@ -114,6 +114,7 @@ services:
NBXPLORER_MINGAPSIZE: 5 NBXPLORER_MINGAPSIZE: 5
NBXPLORER_MAXGAPSIZE: 10 NBXPLORER_MAXGAPSIZE: 10
NBXPLORER_VERBOSE: 1 NBXPLORER_VERBOSE: 1
NBXPLORER_POSTGRES: User ID=postgres;Include Error Detail=true;Host=postgres;Port=5432;Database=nbxplorer
NBXPLORER_NOAUTH: 1 NBXPLORER_NOAUTH: 1
NBXPLORER_EXPOSERPC: 1 NBXPLORER_EXPOSERPC: 1
links: links:

3
BTCPayServer.Tests/docker-compose.yml
View File

@@ -86,7 +86,7 @@ services:
expose: expose:
- "4444" - "4444"
nbxplorer: nbxplorer:
image: nicolasdorier/nbxplorer:2.2.18 image: nicolasdorier/nbxplorer:2.3.6
restart: unless-stopped restart: unless-stopped
ports: ports:
- "32838:32838" - "32838:32838"
@@ -103,6 +103,7 @@ services:
NBXPLORER_MINGAPSIZE: 5 NBXPLORER_MINGAPSIZE: 5
NBXPLORER_MAXGAPSIZE: 10 NBXPLORER_MAXGAPSIZE: 10
NBXPLORER_VERBOSE: 1 NBXPLORER_VERBOSE: 1
NBXPLORER_POSTGRES: User ID=postgres;Include Error Detail=true;Host=postgres;Port=5432;Database=nbxplorer
NBXPLORER_EXPOSERPC: 1 NBXPLORER_EXPOSERPC: 1
NBXPLORER_NOAUTH: 1 NBXPLORER_NOAUTH: 1
links: links:

2
BTCPayServer/Models/WalletViewModels/WalletSendModel.cs
View File

@@ -74,7 +74,7 @@ namespace BTCPayServer.Models.WalletViewModels
public decimal Amount { get; set; } public decimal Amount { get; set; }
public string Outpoint { get; set; } public string Outpoint { get; set; }
public string Link { get; set; } public string Link { get; set; }
public int Confirmations { get; set; } public long Confirmations { get; set; }
} }
} }
} }

2
BTCPayServer/Payments/Bitcoin/BitcoinLikePaymentData.cs
View File

@@ -32,7 +32,7 @@ namespace BTCPayServer.Payments.Bitcoin
public OutPoint Outpoint { get; set; } public OutPoint Outpoint { get; set; }
[JsonIgnore] [JsonIgnore]
public TxOut Output { get; set; } public TxOut Output { get; set; }
public int ConfirmationCount { get; set; } public long ConfirmationCount { get; set; }
public bool RBF { get; set; } public bool RBF { get; set; }
public BitcoinAddress Address { get; set; } public BitcoinAddress Address { get; set; }
[JsonConverter(typeof(NBitcoin.JsonConverters.KeyPathJsonConverter))] [JsonConverter(typeof(NBitcoin.JsonConverters.KeyPathJsonConverter))]

2
BTCPayServer/Services/Wallets/BTCPayWallet.cs
View File

@@ -24,7 +24,7 @@ namespace BTCPayServer.Services.Wallets
public KeyPath KeyPath { get; set; } public KeyPath KeyPath { get; set; }
public IMoney Value { get; set; } public IMoney Value { get; set; }
public Coin Coin { get; set; } public Coin Coin { get; set; }
public int Confirmations { get; set; } public long Confirmations { get; set; }
} }
public class NetworkCoins public class NetworkCoins
{ {

2
BTCPayServer/Views/Shared/Bitcoin/ViewBitcoinLikePaymentData.cshtml
View File

@@ -16,7 +16,7 @@
m.Crypto = payment.GetPaymentMethodId().CryptoCode; m.Crypto = payment.GetPaymentMethodId().CryptoCode;
m.DepositAddress = onChainPaymentData.GetDestination(); m.DepositAddress = onChainPaymentData.GetDestination();
int confirmationCount = onChainPaymentData.ConfirmationCount; long confirmationCount = onChainPaymentData.ConfirmationCount;
var network = payment.Network as BTCPayNetwork; var network = payment.Network as BTCPayNetwork;
if (confirmationCount >= network.MaxTrackedConfirmation) if (confirmationCount >= network.MaxTrackedConfirmation)
{ {