Nethermind UI

Author: benaadams

.gitignore

@@ -404,3 +404,5 @@ FodyWeavers.xsd
 ## Nethermind
 keystore/
 /.githooks
+bundle.js
+src/Nethermind/Nethermind.Runner/wwwroot/js.map

Dockerfile

@@ -9,6 +9,10 @@ ARG CI
 ARG COMMIT_HASH
 ARG TARGETARCH
 
+RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - 
+RUN apt-get install -y nodejs
+RUN npm install -g yarn
+
 COPY src/Nethermind src/Nethermind
 
 RUN arch=$([ "$TARGETARCH" = "amd64" ] && echo "x64" || echo "$TARGETARCH") && \

Dockerfile.chiseled

@@ -9,6 +9,10 @@ ARG CI
 ARG COMMIT_HASH
 ARG TARGETARCH
 
+RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - 
+RUN apt-get install -y nodejs
+RUN npm install -g yarn
+
 COPY src/Nethermind src/Nethermind
 
 RUN arch=$([ "$TARGETARCH" = "amd64" ] && echo "x64" || echo "$TARGETARCH") && \

src/Nethermind/Nethermind.Blockchain/BlockTree.cs

@@ -1580,6 +1580,7 @@ void SetTotalDifficultyDeep(BlockHeader current)
         public event EventHandler<BlockEventArgs>? NewSuggestedBlock;
 
         public event EventHandler<BlockEventArgs>? NewHeadBlock;
+        public event EventHandler<IBlockTree.ForkChoice>? OnForkChoiceUpdated;
 
         /// <summary>
         /// Can delete a slice of the chain (usually invoked when the chain is corrupted in the DB).
@@ -1704,6 +1705,11 @@ public void ForkChoiceUpdated(Hash256? finalizedBlockHash, Hash256? safeBlockHas
                 _metadataDb.Set(MetadataDbKeys.FinalizedBlockHash, Rlp.Encode(FinalizedHash!).Bytes);
                 _metadataDb.Set(MetadataDbKeys.SafeBlockHash, Rlp.Encode(SafeHash!).Bytes);
             }
+
+            var finalizedNumber = FindHeader(FinalizedHash, BlockTreeLookupOptions.DoNotCreateLevelIfMissing)?.Number;
+            var safeNumber = FindHeader(safeBlockHash, BlockTreeLookupOptions.DoNotCreateLevelIfMissing)?.Number;
+
+            OnForkChoiceUpdated?.Invoke(this, new(Head, safeNumber ?? 0, finalizedNumber ?? 0));
         }
     }
 }

src/Nethermind/Nethermind.Blockchain/BlockTreeOverlay.cs

@@ -217,6 +217,21 @@ public event EventHandler<OnUpdateMainChainArgs>? OnUpdateMainChain
         }
     }
 
+    public event EventHandler<IBlockTree.ForkChoice> OnForkChoiceUpdated
+    {
+        add
+        {
+            _baseTree.OnForkChoiceUpdated += value;
+            _overlayTree.OnForkChoiceUpdated += value;
+        }
+
+        remove
+        {
+            _baseTree.OnForkChoiceUpdated -= value;
+            _overlayTree.OnForkChoiceUpdated -= value;
+        }
+    }
+
     public int DeleteChainSlice(in long startNumber, long? endNumber = null, bool force = false) =>
         _overlayTree.DeleteChainSlice(startNumber, endNumber, force);
 

src/Nethermind/Nethermind.Blockchain/IBlockTree.cs

@@ -178,6 +178,7 @@ AddBlockResult Insert(Block block, BlockTreeInsertBlockOptions insertBlockOption
         /// the whole branch.
         /// </summary>
         event EventHandler<OnUpdateMainChainArgs> OnUpdateMainChain;
+        event EventHandler<ForkChoice> OnForkChoiceUpdated;
 
         int DeleteChainSlice(in long startNumber, long? endNumber = null, bool force = false);
 
@@ -195,5 +196,12 @@ AddBlockResult Insert(Block block, BlockTreeInsertBlockOptions insertBlockOption
         /// Before sync pivot, there is no guarantee that blocks and receipts are available or continuous.
         /// </summary>
         (long BlockNumber, Hash256 BlockHash) SyncPivot { get; set; }
+
+        public readonly struct ForkChoice(Block? head, long safe, long finalized)
+        {
+            public readonly Block? Head => head;
+            public readonly long Safe => safe;
+            public readonly long Finalized => finalized;
+        }
     }
 }

src/Nethermind/Nethermind.Blockchain/ReadOnlyBlockTree.cs

@@ -153,6 +153,12 @@ public event EventHandler<OnUpdateMainChainArgs>? OnUpdateMainChain
             remove { }
         }
 
+        event EventHandler<IBlockTree.ForkChoice> IBlockTree.OnForkChoiceUpdated
+        {
+            add { }
+            remove { }
+        }
+
         public int DeleteChainSlice(in long startNumber, long? endNumber = null, bool force = false)
         {
             var bestKnownNumber = BestKnownNumber;

src/Nethermind/Nethermind.Consensus/Processing/BlockchainProcessor.cs

@@ -77,6 +77,7 @@ public sealed class BlockchainProcessor : IBlockchainProcessor, IBlockProcessing
     private readonly Stopwatch _stopwatch = new();
 
     public event EventHandler<IBlockchainProcessor.InvalidBlockEventArgs>? InvalidBlock;
+    public event EventHandler<BlockStatistics>? NewProcessingStatistics;
 
     /// <summary>
     ///
@@ -106,8 +107,12 @@ public BlockchainProcessor(
         _blockTree.NewHeadBlock += OnNewHeadBlock;
 
         _stats = new ProcessingStats(stateReader, _logger);
+        _stats.NewProcessingStatistics += OnNewProcessingStatistics;
     }
 
+    private void OnNewProcessingStatistics(object? sender, BlockStatistics stats)
+        => NewProcessingStatistics?.Invoke(sender, stats);
+
     private void OnNewHeadBlock(object? sender, BlockEventArgs e)
     {
         _lastProcessedBlock = DateTime.UtcNow;
@@ -704,6 +709,7 @@ private bool RunSimpleChecksAheadOfProcessing(Block suggestedBlock, ProcessingOp
     public void Dispose()
     {
         _recoveryComplete = true;
+        _stats.NewProcessingStatistics -= OnNewProcessingStatistics;
         _recoveryQueue.Writer.TryComplete();
         _blockQueue.Writer.TryComplete();
         _loopCancellationSource?.Dispose();

src/Nethermind/Nethermind.Consensus/Processing/IBlockchainProcessor.cs

@@ -21,6 +21,7 @@ public interface IBlockchainProcessor : IDisposable
         bool IsProcessingBlocks(ulong? maxProcessingInterval);
 
         event EventHandler<InvalidBlockEventArgs> InvalidBlock;
+        event EventHandler<BlockStatistics> NewProcessingStatistics;
 
         public class InvalidBlockEventArgs : EventArgs
         {

src/Nethermind/Nethermind.Consensus/Processing/OneTimeProcessor.cs

@@ -52,6 +52,7 @@ public bool IsProcessingBlocks(ulong? maxProcessingInterval)
         public event EventHandler<BlockProcessedEventArgs> BlockProcessed;
         public event EventHandler<BlockProcessedEventArgs> BlockInvalid;
         public event EventHandler<IBlockchainProcessor.InvalidBlockEventArgs>? InvalidBlock;
+        public event EventHandler<BlockStatistics> NewProcessingStatistics;
 #pragma warning restore 67
 
         public void Dispose()