Add dummy policies field

Polis Integration

BTCPayServer.Tests/UnitTest1.cs

@@ -1325,6 +1325,8 @@ namespace BTCPayServer.Tests
                 var repo = tester.PayTester.GetService<InvoiceRepository>();
                 var ctx = tester.PayTester.GetService<ApplicationDbContextFactory>().CreateContext();
                 Assert.Equal(0, invoice.CryptoInfo[0].TxCount);
+                Assert.True(invoice.MinerFees.ContainsKey("BTC"));
+                Assert.Equal(100m, invoice.MinerFees["BTC"].SatoshiPerBytes);
                 Eventually(() =>
                 {
                     var textSearchResult = tester.PayTester.InvoiceRepository.GetInvoices(new InvoiceQuery()

BTCPayServer/BTCPayNetworkProvider.Polis.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
+using NBitcoin;
+using NBXplorer;
+
+namespace BTCPayServer
+{
+    public partial class BTCPayNetworkProvider
+    {
+        public void InitPolis()
+        {
+            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("POLIS");
+            Add(new BTCPayNetwork()
+            {
+                CryptoCode = nbxplorerNetwork.CryptoCode,
+                BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://insight.polispay.org/tx/{0}" : "https://insight.polispay.org/tx/{0}",
+                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
+                NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "polis",
+                DefaultRateRules = new[]
+                {
+                                "POLIS_X = POLIS_BTC * BTC_X",
+                                "POLIS_BTC = cryptopia(POLIS_BTC)"
+                },
+                CryptoImagePath = "imlegacy/polis.png",
+                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
+                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("1997'") : new KeyPath("1'")
+            });
+        }
+    }
+}

BTCPayServer/BTCPayNetworkProvider.cs

@@ -50,6 +50,7 @@ namespace BTCPayServer
             InitDogecoin();
             InitBitcoinGold();
             InitMonacoin();
+            InitPolis();
         }
 
         /// <summary>

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>1.0.2.26</Version>
+		<Version>1.0.2.29</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <ItemGroup>
@@ -40,8 +40,8 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.0-rc1-final" />
     <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.7" />
-    <PackageReference Include="NBitpayClient" Version="1.0.0.23" />	  
+    <PackageReference Include="NBitcoin" Version="4.1.1.8" />
+    <PackageReference Include="NBitpayClient" Version="1.0.0.25" />	  
     <PackageReference Include="DBreeze" Version="1.87.0" />
     <PackageReference Include="NBXplorer.Client" Version="1.0.2.8" />
     <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.1" />

BTCPayServer/Controllers/AccessTokenController.cs

@@ -77,6 +77,7 @@ namespace BTCPayServer.Controllers
                 {
                     new PairingCodeResponse()
                     {
+                        Policies = new Newtonsoft.Json.Linq.JArray(),
                         PairingCode = pairingEntity.Id,
                         PairingExpiration = pairingEntity.Expiration,
                         DateCreated = pairingEntity.CreatedTime,

BTCPayServer/Controllers/AppsController.PointOfSale.cs

@@ -101,7 +101,7 @@ namespace BTCPayServer.Controllers
                 vm.InvoiceUrl = appUrl + "invoices/SkdsDghkdP3D3qkj7bLq3";
             }
 
-            vm.ExampleCallback = "{\n  \"id\":\"SkdsDghkdP3D3qkj7bLq3\",\n  \"url\":\"https://btcpay.example.com/invoice?id=SkdsDghkdP3D3qkj7bLq3\",\n  \"status\":\"paid\",\n  \"price\":10,\n  \"currency\":\"EUR\",\n  \"invoiceTime\":1520373130312,\n  \"expirationTime\":1520374030312,\n  \"currentTime\":1520373179327,\n  \"exceptionStatus\":false,\n  \"buyerFields\":{\n    \"buyerEmail\":\"customer@example.com\",\n    \"buyerNotify\":false\n  },\n  \"paymentSubtotals\": {\n    \"BTC\":114700\n  },\n  \"paymentTotals\": {\n    \"BTC\":118400\n  },\n  \"transactionCurrency\": \"BCH\",\n  \"amountPaid\": \"1025900\",\n  \"exchangeRates\": {\n    \"BTC\": {\n      \"EUR\": 8721.690715789999,\n      \"USD\": 10817.99\n    }\n  }\n}";
+            vm.ExampleCallback = "{\n  \"id\":\"SkdsDghkdP3D3qkj7bLq3\",\n  \"url\":\"https://btcpay.example.com/invoice?id=SkdsDghkdP3D3qkj7bLq3\",\n  \"status\":\"paid\",\n  \"price\":10,\n  \"currency\":\"EUR\",\n  \"invoiceTime\":1520373130312,\n  \"expirationTime\":1520374030312,\n  \"currentTime\":1520373179327,\n  \"exceptionStatus\":false,\n  \"buyerFields\":{\n    \"buyerEmail\":\"customer@example.com\",\n    \"buyerNotify\":false\n  },\n  \"paymentSubtotals\": {\n    \"BTC\":114700\n  },\n  \"paymentTotals\": {\n    \"BTC\":118400\n  },\n  \"transactionCurrency\": \"BTC\",\n  \"amountPaid\": \"1025900\",\n  \"exchangeRates\": {\n    \"BTC\": {\n      \"EUR\": 8721.690715789999,\n      \"USD\": 10817.99\n    }\n  }\n}";
             return View(vm);
         }
         [HttpPost]
@@ -254,7 +254,8 @@ namespace BTCPayServer.Controllers
                 BuyerEmail = email,
                 OrderId = orderId,
                 NotificationURL = notificationUrl,
-                RedirectURL = redirectUrl
+                RedirectURL = redirectUrl,
+                FullNotifications = true
             }, store, HttpContext.Request.GetAbsoluteRoot());
             return Redirect(invoice.Data.Url);
         }

BTCPayServer/Models/InvoiceResponse.cs

@@ -235,7 +235,7 @@ namespace BTCPayServer.Models
         public long AmountPaid { get; set; }
 
         [JsonProperty("minerFees")]
-        public long MinerFees { get; set; }
+        public Dictionary<string, NBitpayClient.MinerFeeInfo> MinerFees { get; set; }
 
         [JsonProperty("exchangeRates")]
         public Dictionary<string, Dictionary<string, decimal>> ExchangeRates { get; set; }

BTCPayServer/Models/TokenRequest.cs

@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using NBitcoin;
+using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Models
 {
@@ -44,6 +45,9 @@ namespace BTCPayServer.Models
 
     public class PairingCodeResponse
     {
+        [JsonProperty(PropertyName = "pairingCode")]
+        public JArray Policies { get; set; }
+
         [JsonProperty(PropertyName = "pairingCode")]
         public string PairingCode
         {

BTCPayServer/Services/Invoices/InvoiceEntity.cs

@@ -13,6 +13,7 @@ using NBXplorer;
 using NBXplorer.DerivationStrategy;
 using BTCPayServer.Payments;
 using NBitpayClient;
+using BTCPayServer.Payments.Bitcoin;
 
 namespace BTCPayServer.Services.Invoices
 {
@@ -348,6 +349,7 @@ namespace BTCPayServer.Services.Invoices
 
             dto.Url = ServerUrl.WithTrailingSlash() + $"invoice?id=" + Id;
             dto.CryptoInfo = new List<NBitpayClient.InvoiceCryptoInfo>();
+            dto.MinerFees = new Dictionary<string, MinerFeeInfo>();
             foreach (var info in this.GetPaymentMethods(networkProvider))
             {
                 var accounting = info.Calculate();
@@ -381,6 +383,10 @@ namespace BTCPayServer.Services.Invoices
 
                 if (paymentId.PaymentType == PaymentTypes.BTCLike)
                 {
+                    var minerInfo = new MinerFeeInfo();
+                    minerInfo.TotalFee = accounting.NetworkFee.Satoshi;
+                    minerInfo.SatoshiPerBytes = ((BitcoinLikeOnChainPaymentMethod)info.GetPaymentMethodDetails()).FeeRate.GetFee(1).Satoshi;
+                    dto.MinerFees.TryAdd(paymentId.CryptoCode, minerInfo);
                     var cryptoSuffix = cryptoInfo.CryptoCode == "BTC" ? "" : "/" + cryptoInfo.CryptoCode;
                     cryptoInfo.PaymentUrls = new NBitpayClient.InvoicePaymentUrls()
                     {

BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml

@@ -48,16 +48,16 @@
                         }
                         @if(Model.Example2 != null)
                         {
-                            <span>For a specific item or your template</span>
+                            <span>For a specific item of your template</span>
                             <pre><code class="html">@Model.Example2</code></pre>
                         }
-                        <p>A <code>POST</code> callback will be sent to notification with the following form will be sent to <code>notificationUrl</code>:</p>
+                        <p>A <code>POST</code> callback will be sent to notification with the following form will be sent to <code>notificationUrl</code> once the enough is paid and once again once there is enough confirmations to the payment:</p>
                         <pre><code class="json">@Model.ExampleCallback</code></pre>
                         <p><strong>Never</strong> trust anything but <code>id</code>, <strong>ignore</strong> the other fields completely, an attacker can spoof those, they are present only for backward compatibility reason:</p>
                         <p>
                             <ul>
                                 <li><strong>Build the invoice's url by yourself</strong> do not trust the <code>url</code> field, this can be spoofed to use attacker's server.</li>
-                                <li>Send a the <code>GET</code> request to the invoice's url with <code>Content-Type: application/json</code></li>
+                                <li>Send a <code>GET</code> request to the invoice's url with <code>Content-Type: application/json</code></li>
                                 <li>Verify that the <code>orderId</code> is from your backend, that the <code>price</code> is correct and that <code>status</code> is either <code>confirmed</code> or <code>complete</code></li>
                                 <li>You can then ship your order</li>
                             </ul>

BTCPayServer/Views/Stores/AddLightningNode.cshtml

@@ -16,7 +16,7 @@
 <div class="alert alert-warning alert-dismissible" role="alert">
     <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
     <p>
-        <span>A connection to a lightning charge node or clightning unix socket is required to generate lignting network enabled invoices. <br /></span>
+        <span>A connection to a lightning charge node or clightning unix socket is required to generate lightning network enabled invoices. <br /></span>
         <span>This is experimental and not advised for production so keep in mind:</span>
     </p>
     <ul>

BTCPayServer/Views/Stores/UpdateStore.cshtml

@@ -96,7 +96,7 @@
                 <div class="form-group">
                     <h5>Lightning nodes (Experimental)</h5>
                     <p>
-                        <span>A connection to a lightning charge node is required to generate lignting network enabled invoices.<br /></span>
+                        <span>A connection to a lightning charge node is required to generate lightning network enabled invoices.<br /></span>
                         <span>This is experimental and not advised for production.</span>
                     </p>
                 </div>

Nuget.Config

@@ -5,4 +5,4 @@
 		<add key="aspnetcidev" value="https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json"/>
 		<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json"/>
 	</packageSources>
-</configuration>
+</configuration>