aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-02-22 22:54:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug: Importing seed with Is hot wallet checked was not working (#2966)

Browse Source
This commit is contained in:
Nicolas Dorier
2021-10-12 18:37:13 +09:00
committed by GitHub
parent b5ebd14589
commit 75776687bc
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
BTCPayServer.Tests/SeleniumTests.cs
View File

@@ -781,6 +781,26 @@ namespace BTCPayServer.Tests
}
}
[Fact(Timeout = TestTimeout)]
public async Task CanImportMnemonic()
{
using (var s = SeleniumTester.Create())
{
await s.StartAsync();
s.RegisterNewUser(true);
foreach (var isHotwallet in new[] { false, true })
{
var (storeName, storeId) = s.CreateNewStore();
s.GenerateWallet(privkeys: isHotwallet, seed: "melody lizard phrase voice unique car opinion merge degree evil swift cargo");
s.GoToWallet(s.WalletId, WalletsNavPages.Settings);
if (isHotwallet)
Assert.Contains("View seed", s.Driver.PageSource);
else
Assert.DoesNotContain("View seed", s.Driver.PageSource);
}
}
}
[Fact(Timeout = TestTimeout)]
public async Task CanManageWallet()
{

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

@@ -163,7 +163,7 @@ namespace BTCPayServer.Controllers
store.SetSupportedPaymentMethod(paymentMethodId, strategy);
storeBlob.SetExcluded(paymentMethodId, false);
storeBlob.Hints.Wallet = false;
storeBlob.PayJoinEnabled = vm.IsHotWallet && vm.SetupRequest.PayJoinEnabled;
storeBlob.PayJoinEnabled = strategy.IsHotWallet && !(vm.SetupRequest?.PayJoinEnabled is false);
store.SetStoreBlob(storeBlob);
}
catch

1
BTCPayServer/Views/Stores/ImportWallet/ConfirmAddresses.cshtml
View File

@@ -49,7 +49,6 @@
<form method="post" asp-controller="Stores" asp-action="UpdateWallet" asp-route-storeId="@Model.StoreId" asp-route-cryptoCode="@Model.CryptoCode">
<input asp-for="Config" type="hidden"/>
<input asp-for="Confirmation" type="hidden"/>
<input asp-for="DerivationScheme" type="hidden"/>
<input asp-for="AccountKey" type="hidden" />
<input asp-for="RootFingerprint" type="hidden" />
<input asp-for="KeyPath" type="hidden" />