mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-01-18 21:32:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

bump nbx

Browse Source
This commit is contained in:
nicolas.dorier 2019-11-16 17:22:51 +09:00
parent c83bcd259d
commit fe1df743ce
No known key found for this signature in database
GPG Key ID: 6618763EF09186FE
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer.Common/BTCPayServer.Common.csproj
View File

@ -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>

2
BTCPayServer.Tests/docker-compose.yml
View File

@ -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"

7
BTCPayServer/DerivationSchemeSettings.cs
View File

@ -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);
}
}
}