From 13952a4b79e6150108666a2ec5961d58dd09f7fc Mon Sep 17 00:00:00 2001 From: Nicolas Dorier Date: Tue, 5 Apr 2022 14:46:42 +0900 Subject: [PATCH] Bump NBX (#3607) --- BTCPayServer.Client/Models/OnChainWalletTransactionData.cs | 4 ++-- BTCPayServer.Client/Models/OnChainWalletUTXOData.cs | 2 +- BTCPayServer.Common/BTCPayServer.Common.csproj | 4 ++-- BTCPayServer.Tests/docker-compose.altcoins.yml | 3 ++- BTCPayServer.Tests/docker-compose.yml | 3 ++- BTCPayServer/Models/WalletViewModels/WalletSendModel.cs | 2 +- BTCPayServer/Payments/Bitcoin/BitcoinLikePaymentData.cs | 2 +- BTCPayServer/Services/Wallets/BTCPayWallet.cs | 2 +- .../Views/Shared/Bitcoin/ViewBitcoinLikePaymentData.cshtml | 2 +- 9 files changed, 13 insertions(+), 11 deletions(-) diff --git a/BTCPayServer.Client/Models/OnChainWalletTransactionData.cs b/BTCPayServer.Client/Models/OnChainWalletTransactionData.cs index ed8aa7a1d..e3b21be4d 100644 --- a/BTCPayServer.Client/Models/OnChainWalletTransactionData.cs +++ b/BTCPayServer.Client/Models/OnChainWalletTransactionData.cs @@ -21,9 +21,9 @@ namespace BTCPayServer.Client.Models [JsonConverter(typeof(UInt256JsonConverter))] 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))] public DateTimeOffset Timestamp { get; set; } diff --git a/BTCPayServer.Client/Models/OnChainWalletUTXOData.cs b/BTCPayServer.Client/Models/OnChainWalletUTXOData.cs index 3122488f8..e50db0537 100644 --- a/BTCPayServer.Client/Models/OnChainWalletUTXOData.cs +++ b/BTCPayServer.Client/Models/OnChainWalletUTXOData.cs @@ -21,6 +21,6 @@ namespace BTCPayServer.Client.Models [JsonConverter(typeof(KeyPathJsonConverter))] public KeyPath KeyPath { get; set; } public string Address { get; set; } - public int Confirmations { get; set; } + public long Confirmations { get; set; } } } diff --git a/BTCPayServer.Common/BTCPayServer.Common.csproj b/BTCPayServer.Common/BTCPayServer.Common.csproj index 014111c2e..9838d056f 100644 --- a/BTCPayServer.Common/BTCPayServer.Common.csproj +++ b/BTCPayServer.Common/BTCPayServer.Common.csproj @@ -1,10 +1,10 @@ - + - + diff --git a/BTCPayServer.Tests/docker-compose.altcoins.yml b/BTCPayServer.Tests/docker-compose.altcoins.yml index dc73f8f7e..2f3c96d6f 100644 --- a/BTCPayServer.Tests/docker-compose.altcoins.yml +++ b/BTCPayServer.Tests/docker-compose.altcoins.yml @@ -89,7 +89,7 @@ services: expose: - "4444" nbxplorer: - image: nicolasdorier/nbxplorer:2.2.18 + image: nicolasdorier/nbxplorer:2.3.6 restart: unless-stopped ports: - "32838:32838" @@ -114,6 +114,7 @@ services: NBXPLORER_MINGAPSIZE: 5 NBXPLORER_MAXGAPSIZE: 10 NBXPLORER_VERBOSE: 1 + NBXPLORER_POSTGRES: User ID=postgres;Include Error Detail=true;Host=postgres;Port=5432;Database=nbxplorer NBXPLORER_NOAUTH: 1 NBXPLORER_EXPOSERPC: 1 links: diff --git a/BTCPayServer.Tests/docker-compose.yml b/BTCPayServer.Tests/docker-compose.yml index e6b1502aa..832ef4e85 100644 --- a/BTCPayServer.Tests/docker-compose.yml +++ b/BTCPayServer.Tests/docker-compose.yml @@ -86,7 +86,7 @@ services: expose: - "4444" nbxplorer: - image: nicolasdorier/nbxplorer:2.2.18 + image: nicolasdorier/nbxplorer:2.3.6 restart: unless-stopped ports: - "32838:32838" @@ -103,6 +103,7 @@ services: NBXPLORER_MINGAPSIZE: 5 NBXPLORER_MAXGAPSIZE: 10 NBXPLORER_VERBOSE: 1 + NBXPLORER_POSTGRES: User ID=postgres;Include Error Detail=true;Host=postgres;Port=5432;Database=nbxplorer NBXPLORER_EXPOSERPC: 1 NBXPLORER_NOAUTH: 1 links: diff --git a/BTCPayServer/Models/WalletViewModels/WalletSendModel.cs b/BTCPayServer/Models/WalletViewModels/WalletSendModel.cs index 5e8b60423..534486a2b 100644 --- a/BTCPayServer/Models/WalletViewModels/WalletSendModel.cs +++ b/BTCPayServer/Models/WalletViewModels/WalletSendModel.cs @@ -74,7 +74,7 @@ namespace BTCPayServer.Models.WalletViewModels public decimal Amount { get; set; } public string Outpoint { get; set; } public string Link { get; set; } - public int Confirmations { get; set; } + public long Confirmations { get; set; } } } } diff --git a/BTCPayServer/Payments/Bitcoin/BitcoinLikePaymentData.cs b/BTCPayServer/Payments/Bitcoin/BitcoinLikePaymentData.cs index 0f7a1c7f8..7558ab39b 100644 --- a/BTCPayServer/Payments/Bitcoin/BitcoinLikePaymentData.cs +++ b/BTCPayServer/Payments/Bitcoin/BitcoinLikePaymentData.cs @@ -32,7 +32,7 @@ namespace BTCPayServer.Payments.Bitcoin public OutPoint Outpoint { get; set; } [JsonIgnore] public TxOut Output { get; set; } - public int ConfirmationCount { get; set; } + public long ConfirmationCount { get; set; } public bool RBF { get; set; } public BitcoinAddress Address { get; set; } [JsonConverter(typeof(NBitcoin.JsonConverters.KeyPathJsonConverter))] diff --git a/BTCPayServer/Services/Wallets/BTCPayWallet.cs b/BTCPayServer/Services/Wallets/BTCPayWallet.cs index 14c797371..96dbcf351 100644 --- a/BTCPayServer/Services/Wallets/BTCPayWallet.cs +++ b/BTCPayServer/Services/Wallets/BTCPayWallet.cs @@ -24,7 +24,7 @@ namespace BTCPayServer.Services.Wallets public KeyPath KeyPath { get; set; } public IMoney Value { get; set; } public Coin Coin { get; set; } - public int Confirmations { get; set; } + public long Confirmations { get; set; } } public class NetworkCoins { diff --git a/BTCPayServer/Views/Shared/Bitcoin/ViewBitcoinLikePaymentData.cshtml b/BTCPayServer/Views/Shared/Bitcoin/ViewBitcoinLikePaymentData.cshtml index 754b959eb..9ebb473a1 100644 --- a/BTCPayServer/Views/Shared/Bitcoin/ViewBitcoinLikePaymentData.cshtml +++ b/BTCPayServer/Views/Shared/Bitcoin/ViewBitcoinLikePaymentData.cshtml @@ -16,7 +16,7 @@ m.Crypto = payment.GetPaymentMethodId().CryptoCode; m.DepositAddress = onChainPaymentData.GetDestination(); - int confirmationCount = onChainPaymentData.ConfirmationCount; + long confirmationCount = onChainPaymentData.ConfirmationCount; var network = payment.Network as BTCPayNetwork; if (confirmationCount >= network.MaxTrackedConfirmation) {