diff --git a/BTCPayServer.Tests/UnitTest1.cs b/BTCPayServer.Tests/UnitTest1.cs index 59c5c90fe..203039045 100644 --- a/BTCPayServer.Tests/UnitTest1.cs +++ b/BTCPayServer.Tests/UnitTest1.cs @@ -654,7 +654,6 @@ namespace BTCPayServer.Tests var rescan = Assert.IsType(Assert.IsType(walletController.WalletRescan(walletId).Result).Model); Assert.False(rescan.Ok); Assert.True(rescan.IsFullySync); - Assert.True(rescan.IsSegwit); Assert.False(rescan.IsSupportedByCurrency); Assert.False(rescan.IsServerAdmin); diff --git a/BTCPayServer/Controllers/WalletsController.cs b/BTCPayServer/Controllers/WalletsController.cs index ee8813ae9..b61038826 100644 --- a/BTCPayServer/Controllers/WalletsController.cs +++ b/BTCPayServer/Controllers/WalletsController.cs @@ -291,9 +291,6 @@ namespace BTCPayServer.Controllers var vm = new RescanWalletModel(); vm.IsFullySync = _dashboard.IsFullySynched(walletId.CryptoCode, out var unused); - // We need to ensure it is segwit, - // because hardware wallet support need the parent transactions to sign, which NBXplorer don't have. (Nor does a pruned node) - vm.IsSegwit = paymentMethod.DerivationStrategyBase.IsSegwit(); vm.IsServerAdmin = User.Claims.Any(c => c.Type == Policies.CanModifyServerSettings.Key && c.Value == "true"); vm.IsSupportedByCurrency = _dashboard.Get(walletId.CryptoCode)?.Status?.BitcoinStatus?.Capabilities?.CanScanTxoutSet == true; var explorer = ExplorerClientProvider.GetExplorerClient(walletId.CryptoCode); diff --git a/BTCPayServer/Models/WalletViewModels/RescanWalletModel.cs b/BTCPayServer/Models/WalletViewModels/RescanWalletModel.cs index ea2b41d1d..26e855279 100644 --- a/BTCPayServer/Models/WalletViewModels/RescanWalletModel.cs +++ b/BTCPayServer/Models/WalletViewModels/RescanWalletModel.cs @@ -12,8 +12,7 @@ namespace BTCPayServer.Models.WalletViewModels public bool IsServerAdmin { get; set; } public bool IsSupportedByCurrency { get; set; } public bool IsFullySync { get; set; } - public bool IsSegwit { get; set; } - public bool Ok => IsServerAdmin && IsSupportedByCurrency && IsFullySync && IsSegwit; + public bool Ok => IsServerAdmin && IsSupportedByCurrency && IsFullySync; [Range(1000, 10_000)] public int BatchSize { get; set; } = 3000; diff --git a/BTCPayServer/Views/Wallets/WalletRescan.cshtml b/BTCPayServer/Views/Wallets/WalletRescan.cshtml index 8f11b3f3f..d03e6bdc3 100644 --- a/BTCPayServer/Views/Wallets/WalletRescan.cshtml +++ b/BTCPayServer/Views/Wallets/WalletRescan.cshtml @@ -36,14 +36,6 @@ {

This full node do not support rescan of the UTXO set

} - @if (Model.IsSegwit) - { -

This wallet is compatible with segwit

- } - else - { -

This wallet is not compatible with segwit

- } }