update lnd/clightning

Ref: #293

BTCPayServer.Tests/docker-compose.yml

@@ -97,10 +97,8 @@ services:
         rpcport=43782
         port=39388
         whitelist=0.0.0.0/0
-        zmqpubrawtx=tcp://0.0.0.0:28332
         zmqpubrawblock=tcp://0.0.0.0:28332
-        zmqpubrawtxlock=tcp://0.0.0.0:28332
-        zmqpubhashblock=tcp://0.0.0.0:28332
+        zmqpubrawtx=tcp://0.0.0.0:28333
     ports: 
       - "43782:43782"
       - "28332:28332"
@@ -111,7 +109,7 @@ services:
       - "bitcoin_datadir:/data"
 
   customer_lightningd:
-    image: nicolasdorier/clightning:634f19a7b230edc686be56ab950b80784e56252c-dev
+    image: nicolasdorier/clightning:v0.6.1-dev
     environment: 
       EXPOSE_TCP: "true"
       LIGHTNINGD_OPT: |
@@ -135,7 +133,7 @@ services:
       - bitcoind
 
   lightning-charged:
-    image: shesek/lightning-charge:0.3.15
+    image: shesek/lightning-charge:0.4.3
     environment:
       NETWORK: regtest
       API_TOKEN: foiewnccewuify
@@ -154,7 +152,7 @@ services:
       - merchant_lightningd
 
   merchant_lightningd:
-    image: nicolasdorier/clightning:634f19a7b230edc686be56ab950b80784e56252c-dev
+    image: nicolasdorier/clightning:v0.6.1-dev
     environment: 
       EXPOSE_TCP: "true"
       LIGHTNINGD_OPT: |
@@ -201,7 +199,7 @@ services:
       - "5432"
 
   merchant_lnd:
-    image: btcpayserver/lnd:0.4.2.0
+    image: btcpayserver/lnd:0.5-beta
     environment:
       LND_CHAIN: "btc"
       LND_ENVIRONMENT: "regtest"
@@ -209,11 +207,12 @@ services:
         restlisten=0.0.0.0:8080
         bitcoin.node=bitcoind
         bitcoind.rpchost=bitcoind:43782
-        bitcoind.zmqpath=tcp://bitcoind:28332
+        bitcoind.zmqpubrawblock=tcp://bitcoind:28332
+        bitcoind.zmqpubrawtx=tcp://bitcoind:28333
         externalip=merchant_lnd:9735
         no-macaroons=1
         debuglevel=debug
-        noencryptwallet=1
+        noseedbackup=1
         trickledelay=1000
     ports:
       - "53280:8080"
@@ -226,7 +225,7 @@ services:
       - bitcoind
 
   customer_lnd:
-    image: btcpayserver/lnd:0.4.2.0
+    image: btcpayserver/lnd:0.5-beta
     environment:
       LND_CHAIN: "btc"
       LND_ENVIRONMENT: "regtest"
@@ -234,11 +233,12 @@ services:
         restlisten=0.0.0.0:8080
         bitcoin.node=bitcoind
         bitcoind.rpchost=bitcoind:43782
-        bitcoind.zmqpath=tcp://bitcoind:28332
+        bitcoind.zmqpubrawblock=tcp://bitcoind:28332
+        bitcoind.zmqpubrawtx=tcp://bitcoind:28333
         externalip=customer_lnd:10009
         no-macaroons=1
         debuglevel=debug
-        noencryptwallet=1
+        noseedbackup=1
         trickledelay=1000
     ports:
       - "53281:8080"

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>1.0.2.104</Version>
+		<Version>1.0.2.106</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
@@ -33,25 +33,25 @@
     <EmbeddedResource Include="Currencies.txt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.0" />
+    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.1" />
     <PackageReference Include="BuildBundlerMinifier" Version="2.7.385" />
     <PackageReference Include="DigitalRuby.ExchangeSharp" Version="0.5.3" />
     <PackageReference Include="Hangfire" Version="1.6.19" />
     <PackageReference Include="Hangfire.MemoryStorage" Version="1.5.2" />
     <PackageReference Include="Hangfire.PostgreSql" Version="1.4.8.2" />
-    <PackageReference Include="LedgerWallet" Version="2.0.0.1" />
+    <PackageReference Include="LedgerWallet" Version="2.0.0.2" />
     <PackageReference Include="Meziantou.AspNetCore.BundleTagHelpers" Version="2.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />
     <PackageReference Include="Microsoft.NetCore.Analyzers" Version="2.6.0" />
-    <PackageReference Include="NBitcoin" Version="4.1.1.46" />
+    <PackageReference Include="NBitcoin" Version="4.1.1.48" />
     <PackageReference Include="NBitpayClient" Version="1.0.0.30" />	  
     <PackageReference Include="DBreeze" Version="1.87.0" />
-    <PackageReference Include="NBXplorer.Client" Version="1.0.2.18" />
+    <PackageReference Include="NBXplorer.Client" Version="1.0.2.19" />
     <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.2" />
     <PackageReference Include="NicolasDorier.CommandLine.Configuration" Version="1.0.0.3" />
     <PackageReference Include="NicolasDorier.RateLimits" Version="1.0.0.3" />
-    <PackageReference Include="NicolasDorier.StandardConfiguration" Version="1.0.0.17" />
+    <PackageReference Include="NicolasDorier.StandardConfiguration" Version="1.0.0.18" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.1.0" />
     <PackageReference Include="SSH.NET" Version="2016.1.0" />
     <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
@@ -59,9 +59,9 @@
   </ItemGroup>
 
 	<ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.1" />
-	<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version=" 2.1.1" PrivateAssets="All" />
-	<PackageReference Include="YamlDotNet" Version="4.3.1" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version=" 2.1.0" PrivateAssets="All" />
+		<PackageReference Include="YamlDotNet" Version="4.3.1" />
 	</ItemGroup>
 
 	<ItemGroup>

BTCPayServer/Services/Rates/RateProviderFactory.cs

@@ -105,7 +105,6 @@ namespace BTCPayServer.Services.Rates
             Providers.Add("cryptopia", new ExchangeSharpRateProvider("cryptopia", new ExchangeCryptopiaAPI(), false));
 
             // Handmade providers
-            Providers.Add("bitpay", new BitpayRateProvider(new NBitpayClient.Bitpay(new NBitcoin.Key(), new Uri("https://bitpay.com/"))));
             Providers.Add(QuadrigacxRateProvider.QuadrigacxName, new QuadrigacxRateProvider());
             Providers.Add(CoinAverageRateProvider.CoinAverageName, new CoinAverageRateProvider() { Exchange = CoinAverageRateProvider.CoinAverageName, HttpClient = _httpClientFactory?.CreateClient(), Authenticator = _CoinAverageSettings });
             Providers.Add("kraken", new KrakenExchangeRateProvider() { HttpClient = _httpClientFactory?.CreateClient() });

BTCPayServer/Views/AppsPublic/ViewPointOfSale.cshtml

@@ -21,7 +21,7 @@
             <h1 class="mb-4">@Model.Title</h1>
             <form method="post" asp-antiforgery="false">
                 <div class="row">
-                    @for(int i = 0; i < Model.Items.Length; i++)
+                    @for (int i = 0; i < Model.Items.Length; i++)
                     {
                         var className = (Model.Items.Length - i) > (Model.Items.Length % 3) ? "col-sm-4 mb-3" : "col align-self-center";
                         var item = Model.Items[i];
@@ -32,10 +32,11 @@
                     }
                 </div>
             </form>
-            @if(Model.ShowCustomAmount)
+            @if (Model.ShowCustomAmount)
             {
                 <div class="row mt-4">
-                    <div class="col-md-4 offset-md-4 col-sm-6 offset-sm-3">
+                    <div class="col-sm-3">&nbsp;</div>
+                    <div class="col-sm-6">
                         <form method="post" asp-antiforgery="false" data-buy>
                             <div class="input-group">
                                 <input class="form-control" type="number" min="0" step="@Model.Step" name="amount" placeholder="amount"><div class="input-group-append">
@@ -44,6 +45,7 @@
                             </div>
                         </form>
                     </div>
+                    <div class="col-sm-3">&nbsp;</div>
                 </div>
             }
         </div>

BTCPayServer/wwwroot/js/StoreAddDerivationScheme.js

@@ -64,7 +64,7 @@
             else {
                 bridge.sendCommand('test', null, 5)
                     .catch(function (reason) {
-                        if (reason.message === "Sign failed")
+                        if (reason.name === "TransportError")
                             reason = "Have you forgot to activate browser support in your ledger app?";
                         Write('hw', 'error', reason);
                     })

BTCPayServer/wwwroot/js/StoreWallet.js

@@ -61,7 +61,7 @@ $(function () {
         confirmButton.prop("disabled", true);
         confirmButton.addClass("disabled");
 
-        bridge.sendCommand('sendtoaddress', args, 60 * 5 /* timeout */)
+        bridge.sendCommand('sendtoaddress', args, 60 * 10 /* timeout */)
             .catch(function (reason) {
                 WriteAlert("danger", reason);
                 confirmButton.prop("disabled", false);
@@ -135,7 +135,7 @@ $(function () {
                 bridge.sendCommand('test', null, 5)
                     .catch(function (reason)
                     {
-                        if (reason.message === "Sign failed")
+                        if (reason.name === "TransportError")
                             reason = "Are you running the ledger app with version equals or above 1.2.4?";
                         Write('hw', 'error', reason);
                     })