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

Update c-ligthning and some packages

Browse Source
This commit is contained in:
nicolas.dorier
2019-08-17 15:14:31 +09:00
parent 63df6ac5eb
commit 6ea15411b6
9 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BTCPayServer.Common/BTCPayServer.Common.csproj
View File

@@ -4,7 +4,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.9" /> <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.9" />
<PackageReference Include="NBitcoin" Version="4.1.2.38" /> <PackageReference Include="NBitcoin" Version="4.2.4" />
<PackageReference Include="NBXplorer.Client" Version="2.0.0.18" /> <PackageReference Include="NBXplorer.Client" Version="2.0.0.19" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
BTCPayServer.Tests/BTCPayServer.Tests.csproj
View File

@@ -10,9 +10,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="Selenium.WebDriver" Version="3.141.0" /> <PackageReference Include="Selenium.WebDriver" Version="3.141.0" />
<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="74.0.3729.6" /> <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="76.0.3809.6801" />
<PackageReference Include="xunit" Version="2.4.1" /> <PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1"> <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>

4
BTCPayServer.Tests/UnitTest1.cs
View File

@@ -758,7 +758,7 @@ namespace BTCPayServer.Tests
rescan.GapLimit = 100; rescan.GapLimit = 100;
// Sending a coin // Sending a coin
var txId = tester.ExplorerNode.SendToAddress(btcDerivationScheme.Derive(new KeyPath("0/90")).ScriptPubKey, Money.Coins(1.0m)); var txId = tester.ExplorerNode.SendToAddress(btcDerivationScheme.GetDerivation(new KeyPath("0/90")).ScriptPubKey, Money.Coins(1.0m));
tester.ExplorerNode.Generate(1); tester.ExplorerNode.Generate(1);
var transactions = Assert.IsType<ListTransactionsViewModel>(Assert.IsType<ViewResult>(walletController.WalletTransactions(walletId).Result).Model); var transactions = Assert.IsType<ListTransactionsViewModel>(Assert.IsType<ViewResult>(walletController.WalletTransactions(walletId).Result).Model);
Assert.Empty(transactions.Transactions); Assert.Empty(transactions.Transactions);
@@ -2791,7 +2791,7 @@ donation:
Assert.Equal("Coldcard Import 0x60d1af8b", settings.Label); Assert.Equal("Coldcard Import 0x60d1af8b", settings.Label);
Assert.Equal("49'/0'/0'", settings.AccountKeySettings[0].AccountKeyPath.ToString()); Assert.Equal("49'/0'/0'", settings.AccountKeySettings[0].AccountKeyPath.ToString());
Assert.Equal("ypub6WWc2gWwHbdnAAyJDnR4SPL1phRh7REqrPBfZeizaQ1EmTshieRXJC3Z5YoU4wkcdKHEjQGkh6AYEzCQC1Kz3DNaWSwdc1pc8416hAjzqyD", settings.AccountOriginal); Assert.Equal("ypub6WWc2gWwHbdnAAyJDnR4SPL1phRh7REqrPBfZeizaQ1EmTshieRXJC3Z5YoU4wkcdKHEjQGkh6AYEzCQC1Kz3DNaWSwdc1pc8416hAjzqyD", settings.AccountOriginal);
Assert.Equal(root.Derive(new KeyPath("m/49'/0'/0'")).Neuter().PubKey.WitHash.ScriptPubKey.Hash.ScriptPubKey, settings.AccountDerivation.Derive(new KeyPath()).ScriptPubKey); Assert.Equal(root.Derive(new KeyPath("m/49'/0'/0'")).Neuter().PubKey.WitHash.ScriptPubKey.Hash.ScriptPubKey, settings.AccountDerivation.GetDerivation().ScriptPubKey);
var testnet = new BTCPayNetworkProvider(NetworkType.Testnet).GetNetwork<BTCPayNetwork>("BTC"); var testnet = new BTCPayNetworkProvider(NetworkType.Testnet).GetNetwork<BTCPayNetwork>("BTC");

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

@@ -119,7 +119,7 @@ services:
- "bitcoin_datadir:/data" - "bitcoin_datadir:/data"
customer_lightningd: customer_lightningd:
image: btcpayserver/lightning:v0.7.0-1-dev image: btcpayserver/lightning:v0.7.2-dev
stop_signal: SIGKILL stop_signal: SIGKILL
restart: unless-stopped restart: unless-stopped
environment: environment:
@@ -166,7 +166,7 @@ services:
- merchant_lightningd - merchant_lightningd
merchant_lightningd: merchant_lightningd:
image: btcpayserver/lightning:v0.7.0-1-dev image: btcpayserver/lightning:v0.7.2-dev
stop_signal: SIGKILL stop_signal: SIGKILL
environment: environment:
EXPOSE_TCP: "true" EXPOSE_TCP: "true"

2
BTCPayServer/BTCPayServer.csproj
View File

@@ -30,7 +30,7 @@
<EmbeddedResource Include="Currencies.txt" /> <EmbeddedResource Include="Currencies.txt" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.23" /> <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.1" />
<PackageReference Include="BuildBundlerMinifier" Version="2.9.406" /> <PackageReference Include="BuildBundlerMinifier" Version="2.9.406" />
<PackageReference Include="BundlerMinifier.Core" Version="2.9.406" /> <PackageReference Include="BundlerMinifier.Core" Version="2.9.406" />
<PackageReference Include="BundlerMinifier.TagHelpers" Version="2.9.406" /> <PackageReference Include="BundlerMinifier.TagHelpers" Version="2.9.406" />

2
BTCPayServer/Controllers/ManageController.2FA.cs
View File

@@ -105,7 +105,7 @@ namespace BTCPayServer.Controllers
} }
// Strip spaces and hypens // Strip spaces and hypens
var verificationCode = model.Code.Replace(" ", string.Empty).Replace("-", string.Empty); var verificationCode = model.Code.Replace(" ", string.Empty, StringComparison.OrdinalIgnoreCase).Replace("-", string.Empty, StringComparison.OrdinalIgnoreCase);
var is2faTokenValid = await _userManager.VerifyTwoFactorTokenAsync( var is2faTokenValid = await _userManager.VerifyTwoFactorTokenAsync(
user, _userManager.Options.Tokens.AuthenticatorTokenProvider, verificationCode); user, _userManager.Options.Tokens.AuthenticatorTokenProvider, verificationCode);

5
BTCPayServer/Controllers/StoresController.BTCLike.cs
View File

@@ -330,14 +330,15 @@ namespace BTCPayServer.Controllers
private IActionResult ShowAddresses(DerivationSchemeViewModel vm, DerivationSchemeSettings strategy) private IActionResult ShowAddresses(DerivationSchemeViewModel vm, DerivationSchemeSettings strategy)
{ {
vm.DerivationScheme = strategy.AccountDerivation.ToString(); vm.DerivationScheme = strategy.AccountDerivation.ToString();
var deposit = new NBXplorer.KeyPathTemplates(null).GetKeyPathTemplate(DerivationFeature.Deposit);
if (!string.IsNullOrEmpty(vm.DerivationScheme)) if (!string.IsNullOrEmpty(vm.DerivationScheme))
{ {
var line = strategy.AccountDerivation.GetLineFor(DerivationFeature.Deposit); var line = strategy.AccountDerivation.GetLineFor(deposit);
for (int i = 0; i < 10; i++) for (int i = 0; i < 10; i++)
{ {
var address = line.Derive((uint)i); var address = line.Derive((uint)i);
vm.AddressSamples.Add((DerivationStrategyBase.GetKeyPath(DerivationFeature.Deposit).Derive((uint)i).ToString(), address.ScriptPubKey.GetDestinationAddress(strategy.Network.NBitcoinNetwork).ToString())); vm.AddressSamples.Add((deposit.GetKeyPath((uint)i).ToString(), address.ScriptPubKey.GetDestinationAddress(strategy.Network.NBitcoinNetwork).ToString()));
} }
} }
vm.Confirmation = true; vm.Confirmation = true;

4
BTCPayServer/DerivationSchemeParser.cs
View File

@@ -159,7 +159,7 @@ namespace BTCPayServer
var firstKeyPath = new KeyPath("0/0"); var firstKeyPath = new KeyPath("0/0");
if (HintScriptPubKey == null) if (HintScriptPubKey == null)
return result; return result;
if (HintScriptPubKey == result.Derive(firstKeyPath).ScriptPubKey) if (HintScriptPubKey == result.GetDerivation(firstKeyPath).ScriptPubKey)
return result; return result;
if (result is MultisigDerivationStrategy) if (result is MultisigDerivationStrategy)
@@ -170,7 +170,7 @@ namespace BTCPayServer
foreach (var labels in ItemCombinations(hintLabels.ToList())) foreach (var labels in ItemCombinations(hintLabels.ToList()))
{ {
var hinted = facto.Parse(resultNoLabels + '-' + string.Join('-', labels.Select(l => $"[{l}]").ToArray())); var hinted = facto.Parse(resultNoLabels + '-' + string.Join('-', labels.Select(l => $"[{l}]").ToArray()));
if (HintScriptPubKey == hinted.Derive(firstKeyPath).ScriptPubKey) if (HintScriptPubKey == hinted.GetDerivation(firstKeyPath).ScriptPubKey)
return hinted; return hinted;
} }
throw new FormatException("Could not find any match"); throw new FormatException("Could not find any match");

2
BTCPayServer/Services/HardwareWalletService.cs
View File

@@ -34,7 +34,7 @@ namespace BTCPayServer.Services
public async Task<KeyPath> FindKeyPathFromDerivation(BTCPayNetwork network, DerivationStrategyBase derivationScheme, CancellationToken cancellation) public async Task<KeyPath> FindKeyPathFromDerivation(BTCPayNetwork network, DerivationStrategyBase derivationScheme, CancellationToken cancellation)
{ {
var pubKeys = derivationScheme.GetExtPubKeys().Select(k => k.GetPublicKey()).ToArray(); var pubKeys = derivationScheme.GetExtPubKeys().Select(k => k.GetPublicKey()).ToArray();
var derivation = derivationScheme.Derive(new KeyPath(0)); var derivation = derivationScheme.GetDerivation(new KeyPath(0));
List<KeyPath> derivations = new List<KeyPath>(); List<KeyPath> derivations = new List<KeyPath>();
if (network.NBitcoinNetwork.Consensus.SupportSegwit) if (network.NBitcoinNetwork.Consensus.SupportSegwit)
{ {