From fe1df743ce5b64fb6f7cf83321ca26c0d73805ad Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Sat, 16 Nov 2019 17:22:51 +0900
Subject: [PATCH] bump nbx

---
 BTCPayServer.Common/BTCPayServer.Common.csproj | 2 +-
 BTCPayServer.Tests/docker-compose.yml          | 2 +-
 BTCPayServer/DerivationSchemeSettings.cs       | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/BTCPayServer.Common/BTCPayServer.Common.csproj b/BTCPayServer.Common/BTCPayServer.Common.csproj
index fc5b9c796..0c5a12120 100644
--- a/BTCPayServer.Common/BTCPayServer.Common.csproj
+++ b/BTCPayServer.Common/BTCPayServer.Common.csproj
@@ -5,6 +5,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.9" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
     <FrameworkReference Include="Microsoft.AspNetCore.App" Condition="'$(TargetFramework)' != 'netcoreapp2.1'" />
-    <PackageReference Include="NBXplorer.Client" Version="2.0.0.24" />
+    <PackageReference Include="NBXplorer.Client" Version="2.0.0.26" />
   </ItemGroup>
 </Project>
diff --git a/BTCPayServer.Tests/docker-compose.yml b/BTCPayServer.Tests/docker-compose.yml
index 2b2984de6..7294f666b 100644
--- a/BTCPayServer.Tests/docker-compose.yml
+++ b/BTCPayServer.Tests/docker-compose.yml
@@ -76,7 +76,7 @@ services:
       - customer_lnd
       - merchant_lnd
   nbxplorer:
-    image: nicolasdorier/nbxplorer:2.0.0.63
+    image: nicolasdorier/nbxplorer:2.0.0.66
     restart: unless-stopped
     ports:
       - "32838:32838"
diff --git a/BTCPayServer/DerivationSchemeSettings.cs b/BTCPayServer/DerivationSchemeSettings.cs
index e34994e69..43c319f5e 100644
--- a/BTCPayServer/DerivationSchemeSettings.cs
+++ b/BTCPayServer/DerivationSchemeSettings.cs
@@ -213,13 +213,12 @@ namespace BTCPayServer
         {
             foreach (var accountKey in AccountKeySettings)
             {
-                if (accountKey.AccountKeyPath != null && accountKey.RootFingerprint is HDFingerprint fp)
+                if (accountKey.GetRootedKeyPath() is RootedKeyPath rootedKeyPath)
                 {
                     yield return new NBXplorer.Models.PSBTRebaseKeyRules()
                     {
                         AccountKey = accountKey.AccountKey,
-                        AccountKeyPath = accountKey.AccountKeyPath,
-                        MasterFingerprint = fp
+                        AccountKeyPath = rootedKeyPath
                     };
                 }
             }
@@ -250,7 +249,7 @@ namespace BTCPayServer
         {
             foreach (var rebase in GetPSBTRebaseKeyRules())
             {
-                psbt.RebaseKeyPaths(rebase.AccountKey, rebase.GetRootedKeyPath());
+                psbt.RebaseKeyPaths(rebase.AccountKey, rebase.AccountKeyPath);
             }
         }
     }