Merge release/1.0.9.6. to master (#791)

* Update CirrusDev.cs

* Add SignalR to CirrusMinerD (#700)

* Update ContractSwaggerController.cs (#702)

* Fix AddContractToSwagger method (#703)

* Fix Routing (#704)

Author: fassadlr

src/Stratis.Bitcoin.Features.SmartContracts/ReflectionExecutor/Controllers/ContractSwaggerController.cs

@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using CSharpFunctionalExtensions;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
 using Microsoft.OpenApi;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
@@ -23,15 +21,14 @@ namespace Stratis.Bitcoin.Features.SmartContracts.ReflectionExecutor.Controllers
     /// <summary>
     /// Controller for dynamically generating swagger documents for smart contract assemblies.
     /// </summary>
-    [Route("swagger/contracts")]
     public class ContractSwaggerController : Controller
     {
         private readonly SwaggerGeneratorOptions options;
         private readonly ILoader loader;
         private readonly IWalletManager walletmanager;
         private readonly IStateRepositoryRoot stateRepository;
         private readonly Network network;
-        private SwaggerUIOptions uiOptions;
+        private readonly SwaggerUIOptions uiOptions;
 
         public ContractSwaggerController(
             SwaggerGeneratorOptions options,
@@ -55,7 +52,7 @@ public ContractSwaggerController(
         /// <param name="address">The contract's address.</param>
         /// <returns>A <see cref="SwaggerDocument"/> model.</returns>
         /// <exception cref="Exception"></exception>
-        [Route("{address}")]
+        [Route("swagger/contracts/{address}")]
         [HttpGet]
         public async Task<IActionResult> ContractSwaggerDoc(string address)
         {
@@ -94,25 +91,35 @@ public async Task<IActionResult> ContractSwaggerDoc(string address)
         /// <param name="address">The contract's address.</param>
         /// <returns>A success response.</returns>
         [HttpPost]
-        public async Task<IActionResult> AddContractToSwagger([FromBody] string address)
+        [Route("api/swagger/contracts")]
+        public async Task<IActionResult> AddContractToSwagger([FromBody] AddContractRequest address)
         {
             // Check that the contract exists
-            var code = this.stateRepository.GetCode(address.ToUint160(this.network));
+            var code = this.stateRepository.GetCode(address.Address.ToUint160(this.network));
 
             if (code == null)
                 throw new Exception("Contract does not exist");
 
-            var newUrls = new List<UrlDescriptor>(this.uiOptions.ConfigObject.Urls);
-
-            newUrls.Add(new UrlDescriptor
+            var newUrls = new List<UrlDescriptor>(this.uiOptions.ConfigObject.Urls)
             {
-                Name = $"Contract {address}",
-                Url = $"/swagger/contracts/{address}"
-            });
+                new UrlDescriptor
+                {
+                    Name = $"Contract {address.Address}",
+                    Url = $"contracts/{address.Address}"
+                }
+            };
 
             this.uiOptions.ConfigObject.Urls = newUrls;
 
             return Ok();
         }
+
+        public class AddContractRequest
+        {
+            /// <summary>
+            /// The contract address to add.
+            /// </summary>
+            public string Address { get; set; }
+        }
     }
-}
+}

src/Stratis.CirrusMinerD/Program.cs

@@ -13,6 +13,7 @@
 using Stratis.Bitcoin.Features.Miner;
 using Stratis.Bitcoin.Features.Notifications;
 using Stratis.Bitcoin.Features.RPC;
+using Stratis.Bitcoin.Features.SignalR;
 using Stratis.Bitcoin.Features.SmartContracts;
 using Stratis.Bitcoin.Features.SmartContracts.PoA;
 using Stratis.Bitcoin.Features.SmartContracts.Wallet;
@@ -135,6 +136,10 @@ private static IFullNode BuildDevCirrusMiningNode(string[] args)
                 })
                 .UseSmartContractWallet()
                 .AddSQLiteWalletRepository()
+                .AddSignalR(options =>
+                {
+                    DaemonConfiguration.ConfigureSignalRForCirrus(options);
+                })
                 .Build();
 
             return node;

src/Stratis.CirrusMinerD/Stratis.CirrusMinerD.csproj

@@ -12,6 +12,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Stratis.Bitcoin.Features.Api\Stratis.Bitcoin.Features.Api.csproj" />
     <ProjectReference Include="..\Stratis.Bitcoin.Features.Notifications\Stratis.Bitcoin.Features.Notifications.csproj" />
+    <ProjectReference Include="..\Stratis.Bitcoin.Features.SignalR\Stratis.Bitcoin.Features.SignalR.csproj" />
     <ProjectReference Include="..\Stratis.Bitcoin.Networks\Stratis.Bitcoin.Networks.csproj" />
     <ProjectReference Include="..\Stratis.Features.Collateral\Stratis.Features.Collateral.csproj" />
     <ProjectReference Include="..\Stratis.Features.SQLiteWalletRepository\Stratis.Features.SQLiteWalletRepository.csproj" />

src/Stratis.Sidechains.Networks/CirrusDev.cs

@@ -35,6 +35,8 @@ public CirrusDev()
             this.DefaultMaxInboundConnections = 109;
             this.DefaultRPCPort = 26175;
             this.DefaultAPIPort = 38223;
+            this.DefaultAPIPort = 38223;
+            this.DefaultSignalRPort = 39823;
             this.MaxTipAge = 768; // 20% of the fastest time it takes for one MaxReorgLength of blocks to be mined.
             this.MinTxFee = 10000;
             this.FallbackFee = 10000;