Merge pull request #9 from maftooh/master

change mine page - pow class

src/Features/Blockcore.Features.Miner/PowMining.cs

@@ -113,8 +113,8 @@ public PowMining(
         /// <inheritdoc/>
         public void Mine(Script reserveScript)
         {
-             
-          
+
+
             if (this.miningLoop != null)
                 return;
 
@@ -205,7 +205,7 @@ private bool ConsensusIsAtTip(MineBlockContext context)
         {
             // check null
 
-            if(this.miningCancellationTokenSource == null)
+            if (this.miningCancellationTokenSource == null)
             {
                 this.miningCancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(new[] { this.nodeLifetime.ApplicationStopping });
             }
@@ -254,6 +254,7 @@ private bool BuildBlock(MineBlockContext context)
         private bool MineBlock(MineBlockContext context)
         {
             context.ExtraNonce = this.IncrementExtraNonce(context.BlockTemplate.Block, context.ChainTip, context.ExtraNonce);
+
             Block block = context.BlockTemplate.Block;
             while ((context.MaxTries > 0) && (block.Header.Nonce < InnerLoopCount) && !block.CheckProofOfWork())
             {

src/Features/Blockcore.Features.Miner/UI/Pages/Mine.razor

@@ -11,17 +11,21 @@
 @using Blockcore.Networks
 @using NBitcoin
 @using System.Text
+
 @using static System.Net.WebRequestMethods
 
 @inject IWalletSyncManager WalletSyncManager
 @inject IWalletManager WalletManager
 @inject NavigationManager NavigationManager
 @inject MiningFeature MiningFeature
+
 @inject IPowMining PowMining
 @inject Network Network
 @inject Blockcore.Interfaces.IInitialBlockDownloadState InitialBlockDownloadState
 
 
+
+
 @if (!this.WalletManager.ContainsWallets)
 {
     <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pb-2 mb-3 border-bottom">
@@ -37,7 +41,10 @@ else
         <div class="btn-toolbar mb-2 mb-md-0">
         </div>
     </div>
+
+
     var wallets = ReadWallets();
+
     var totalConfirmed = wallets.Sum(w => w.Value.AmountConfirmed);
     var totalUnconfirmed = wallets.Sum(w => w.Value.AmountUnconfirmed);
 
@@ -82,18 +89,26 @@ else
             </div>
         </div>
     </div>
+
+
+
     <div class="row mb-3">
         <div class="col-xl-12 col-sm-12 ">
             <div class="card">
                 <div class="card-body">
                     <h4 class="card-title">Generate Mining</h4>
+
+
+
                     <div class="input-group">
                         @if (IsStarting)
                         {
                             <button class="btn btn-danger" @onclick="StopMining">
                                 <span class="spinner-border spinner-border-sm"></span>
                                 Stop Mining
                             </button>
+
+
                         }
                         else
                         {
@@ -105,25 +120,34 @@ else
                             </div>
 
                             <button class="btn btn-primary" @onclick="callStartMining">Start Mining</button>
+
                         }
-                    </div>
-                    <div class="row mt-3">
-                        <lable class="text-left text-danger">@Alert</lable>
+
+                        <div class="row mt-3">
+                            <lable class="text-left text-danger">@Alert</lable>
+                        </div>
+
                     </div>
                 </div>
             </div>
         </div>
     </div>
+
+
 }
+
+
 @code
 {
+
+
     Boolean MiningEnabled { get; set; }
     string StatusMining { get; set; }
     string Alert { get; set; }
     int blockCount { get; set; }
     protected override void OnInitialized()
     {
-        StatusMining = "Ready For Mine";
+        StatusMining = "Ready For Mines";
         Alert = "";
         MiningNotification.MiningChanged += MiningChanged;
         this.LoadStats();
@@ -181,8 +205,12 @@ else
             catch { }
         }
 
+
+
+
     }
 
+
     private Boolean CheckBeforMine()
     {
 
@@ -206,18 +234,26 @@ else
         return true;
     }
 
+
     private void StopMining()
     {
 
         this.PowMining?.StopMining();
 
+
+
+
+
         MiningNotification.MiningChanged(this, false);
         StatusMining = "stopped";
         Alert = "";
         IsStarting = false;
 
+
+
     }
 
+
     internal WalletAccountReference GetAccount()
     {
         string walletName = this.WalletManager.GetWalletsNames().FirstOrDefault();
@@ -228,6 +264,8 @@ else
 
     private async Task StartMining()
     {
+
+
         if (blockCount < 1) { this.Alert = " The number of blocks to mine must be higher than zero "; return; }
 
         if (!CheckBeforMine())
@@ -239,15 +277,15 @@ else
         StatusMining = "Mining...";
         IsStarting = true;
 
+
         try
         { 
             /// test
             
             StateHasChanged();
 
             await Task.Run(() => GenerateBlock());
-            IsStarting = false;
-            StatusMining = "The mine was completed";
+
 
             StateHasChanged();
         }
@@ -259,20 +297,37 @@ else
 
             return;
         }
+
+
+
         await Task.CompletedTask;
     }
+
+
     private void GenerateBlock()
     {
-        WalletAccountReference accountReference = this.GetAccount();
-        HdAddress address = this.WalletManager.GetUnusedAddress(accountReference);
+        try
+        {
 
-        var generateBlocksModel = new GenerateBlocksModel
-            {
-                Blocks = this.PowMining?.GenerateBlocks(new ReserveScript(address.Pubkey), (ulong)blockCount, int.MaxValue)
-            };
+            WalletAccountReference accountReference = this.GetAccount();
+            HdAddress address = this.WalletManager.GetUnusedAddress(accountReference);
+
+
+
+            var generateBlocksModel = new GenerateBlocksModel
+                {
+                    Blocks = this.PowMining?.GenerateBlocks(new ReserveScript(address.Pubkey), (ulong)blockCount, int.MaxValue)
+                };
+
+
+            IsStarting = false;
+            StatusMining = "The mine was completed";
+        }
+        catch (Exception _Ex)
+        {
+
+        }
 
-        IsStarting = false;
-        StatusMining = "The mine was completed";
     }
 
     private bool IsStarting { get; set; }