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

Fix: Uploading coldcard in derivation scheme would forget to remember some data

Browse Source
This commit is contained in:
nicolas.dorier
2019-05-09 16:11:09 +09:00
parent 88390402a4
commit 5a92fe736f
8 changed files with 168 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
BTCPayServer/Data/StoreData.cs
View File

@@ -98,13 +98,29 @@ namespace BTCPayServer.Data
#pragma warning restore CS0618
}
public void SetSupportedPaymentMethod(ISupportedPaymentMethod supportedPaymentMethod)
{
SetSupportedPaymentMethod(null, supportedPaymentMethod);
}
/// <summary>
/// Set or remove a new supported payment method for the store
/// </summary>
/// <param name="paymentMethodId">The paymentMethodId</param>
/// <param name="supportedPaymentMethod">The payment method, or null to remove</param>
public void SetSupportedPaymentMethod(ISupportedPaymentMethod supportedPaymentMethod)
public void SetSupportedPaymentMethod(PaymentMethodId paymentMethodId, ISupportedPaymentMethod supportedPaymentMethod)
{
if (supportedPaymentMethod != null && paymentMethodId != null && paymentMethodId != supportedPaymentMethod.PaymentId)
{
throw new InvalidOperationException("Incoherent arguments, this should never happen");
}
if (supportedPaymentMethod == null && paymentMethodId == null)
throw new ArgumentException($"{nameof(supportedPaymentMethod)} or {nameof(paymentMethodId)} should be specified");
if (supportedPaymentMethod != null && paymentMethodId == null)
{
paymentMethodId = supportedPaymentMethod.PaymentId;
}
#pragma warning disable CS0618
JObject strategies = string.IsNullOrEmpty(DerivationStrategies) ? new JObject() : JObject.Parse(DerivationStrategies);
bool existing = false;
@@ -116,7 +132,7 @@ namespace BTCPayServer.Data
// Legacy stuff which should go away
DerivationStrategy = null;
}
if (stratId == supportedPaymentMethod.PaymentId)
if (stratId == paymentMethodId)
{
if (supportedPaymentMethod == null)
{