Skip to content

Commit 4bb25cd

Browse files
authored
Add GasLimit to NewPayoad log (#7955)
1 parent 18fb523 commit 4bb25cd

File tree

2 files changed

+21
-6
lines changed

2 files changed

+21
-6
lines changed

src/Nethermind/Nethermind.Consensus/Processing/ProcessingStats.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ void Execute()
214214

215215
if (chunkBlocks > 1)
216216
{
217-
_logger.Info($"Processed {block.Number - chunkBlocks + 1,10}...{block.Number,9} | {chunkMs,10:N1} ms | slot {runMs,7:N0} ms |{blockGas}");
217+
_logger.Info($"Processed {block.Number - chunkBlocks + 1,10}...{block.Number,9} | {chunkMs,10:N1} ms | slot {runMs,11:N0} ms |{blockGas}");
218218
}
219219
else
220220
{
@@ -241,7 +241,7 @@ void Execute()
241241
< 2000 => orangeText,
242242
_ => redText
243243
};
244-
_logger.Info($"Processed {block.Number,10} | {chunkColor}{chunkMs,10:N1}{resetColor} ms | slot {runMs,7:N0} ms |{blockGas}");
244+
_logger.Info($"Processed {block.Number,10} | {chunkColor}{chunkMs,10:N1}{resetColor} ms | slot {runMs,11:N0} ms |{blockGas}");
245245
}
246246

247247
string mgasPerSecondColor = (mgasPerSecond / (block.GasLimit / 1_000_000.0)) switch
@@ -285,14 +285,14 @@ void Execute()
285285
var recoveryQueue = Metrics.RecoveryQueueSize;
286286
var processingQueue = Metrics.ProcessingQueueSize;
287287

288-
_logger.Info($" Block{(chunkBlocks > 1 ? $"s x{chunkBlocks,-9:N0} " : $"{(isMev ? " mev" : " ")} {rewards.ToDecimal(null) / weiToEth,5:N4}{BlocksConfig.GasTokenTicker,4}")}{(chunkBlocks == 1 ? mgasColor : "")} {chunkMGas,7:F2}{resetColor} MGas | {chunkTx,8:N0} txs | calls {callsColor}{chunkCalls,6:N0}{resetColor} {darkGreyText}({chunkEmptyCalls,3:N0}){resetColor} | sload {chunkSload,7:N0} | sstore {sstoreColor}{chunkSstore,6:N0}{resetColor} | create {createsColor}{chunkCreates,3:N0}{resetColor}{(_currentSelfDestructOps - _lastSelfDestructOps > 0 ? $"{darkGreyText}({-(_currentSelfDestructOps - _lastSelfDestructOps),3:N0}){resetColor}" : "")}");
288+
_logger.Info($" Block{(chunkBlocks > 1 ? $"s x{chunkBlocks,-9:N0} " : $"{(isMev ? " mev" : " ")} {rewards.ToDecimal(null) / weiToEth,5:N4}{BlocksConfig.GasTokenTicker,4}")}{(chunkBlocks == 1 ? mgasColor : "")} {chunkMGas,7:F2}{resetColor} MGas | {chunkTx,8:N0} txs | calls {callsColor}{chunkCalls,10:N0}{resetColor} {darkGreyText}({chunkEmptyCalls,3:N0}){resetColor} | sload {chunkSload,7:N0} | sstore {sstoreColor}{chunkSstore,6:N0}{resetColor} | create {createsColor}{chunkCreates,3:N0}{resetColor}{(_currentSelfDestructOps - _lastSelfDestructOps > 0 ? $"{darkGreyText}({-(_currentSelfDestructOps - _lastSelfDestructOps),3:N0}){resetColor}" : "")}");
289289
if (recoveryQueue > 0 || processingQueue > 0)
290290
{
291-
_logger.Info($" Block throughput {mgasPerSecondColor}{mgasPerSecond,11:F2}{resetColor} MGas/s{(mgasPerSecond > 1000 ? "🔥" : " ")}| {txps,10:N1} tps | {bps,7:F2} Blk/s | recover {recoveryQueue,5:N0} | process {processingQueue,5:N0}");
291+
_logger.Info($" Block throughput {mgasPerSecondColor}{mgasPerSecond,11:F2}{resetColor} MGas/s{(mgasPerSecond > 1000 ? "🔥" : " ")}| {txps,10:N1} tps | {bps,10:F2} Blk/s | recover {recoveryQueue,5:N0} | process {processingQueue,5:N0}");
292292
}
293293
else
294294
{
295-
_logger.Info($" Block throughput {mgasPerSecondColor}{mgasPerSecond,11:F2}{resetColor} MGas/s{(mgasPerSecond > 1000 ? "🔥" : " ")}| {txps,10:N1} tps | {bps,7:F2} Blk/s | exec code {resetColor} from cache {cachedContractsUsed,7:N0} |{resetColor} new {contractsAnalysed,6:N0}");
295+
_logger.Info($" Block throughput {mgasPerSecondColor}{mgasPerSecond,11:F2}{resetColor} MGas/s{(mgasPerSecond > 1000 ? "🔥" : " ")}| {txps,10:N1} tps | {bps,10:F2} Blk/s | exec code {resetColor} from cache {cachedContractsUsed,7:N0} |{resetColor} new {contractsAnalysed,6:N0}");
296296
}
297297
}
298298

src/Nethermind/Nethermind.Merge.Plugin/Handlers/NewPayloadHandler.cs

+16-1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ public class NewPayloadHandler : IAsyncHandler<ExecutionPayload, PayloadStatusV1
4747
private readonly ProcessingOptions _defaultProcessingOptions;
4848
private readonly TimeSpan _timeout;
4949

50+
private long _lastBlockNumber;
51+
private long _lastBlockGasLimit;
52+
5053
public NewPayloadHandler(
5154
IBlockValidator blockValidator,
5255
IBlockTree blockTree,
@@ -80,6 +83,16 @@ public NewPayloadHandler(
8083
_latestBlocks = new(cacheSize, 0, "LatestBlocks");
8184
}
8285

86+
private string GetGasChange(long blockGasLimit)
87+
{
88+
return (blockGasLimit - _lastBlockGasLimit) switch
89+
{
90+
> 0 => "👆",
91+
< 0 => "👇",
92+
_ => " "
93+
};
94+
}
95+
8396
/// <summary>
8497
/// Processes the execution payload and returns the <see cref="PayloadStatusV1"/>
8598
/// and the hash of the last valid block.
@@ -97,7 +110,9 @@ public async Task<ResultWrapper<PayloadStatusV1>> HandleAsync(ExecutionPayload r
97110
string requestStr = $"New Block: {request}";
98111
if (_logger.IsInfo)
99112
{
100-
_logger.Info($"Received {requestStr}, {block.ParsedExtraData()}");
113+
_logger.Info($"Received {requestStr} | limit {block.Header.GasLimit,13:N0} {GetGasChange(block.Number == _lastBlockNumber + 1 ? block.Header.GasLimit : _lastBlockGasLimit)} | {block.ParsedExtraData()}");
114+
_lastBlockNumber = block.Number;
115+
_lastBlockGasLimit = block.Header.GasLimit;
101116
}
102117

103118
if (!HeaderValidator.ValidateHash(block!.Header))

0 commit comments

Comments
 (0)